From 679f1fc8f5899bf993ab83435af3b12df5f4e906 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Costin=20Caraba=C8=99?= <costin.carabas@gmail.com>
Date: Tue, 9 May 2023 11:54:50 +0300
Subject: [PATCH 0001/1254] 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<u8> {
     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<u8> {
     })
 }
 
+pub fn load_mxsc_file_json(mxsc_file_path: &str, context: &InterpreterContext) -> Vec<u8> {
+    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<u8> {
     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<u8> {
     match vst {
@@ -44,6 +44,7 @@ pub fn interpret_string(s: &str, context: &InterpreterContext) -> Vec<u8> {
     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<u8> {
     }
 
     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?= <costin.carabas@gmail.com>
Date: Tue, 9 May 2023 11:55:52 +0300
Subject: [PATCH 0002/1254] 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<u8> {
     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?= <costin.carabas@gmail.com>
Date: Tue, 9 May 2023 11:57:34 +0300
Subject: [PATCH 0003/1254] 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<u8> {
     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<u8> {
     }
 
     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?= <costin.carabas@gmail.com>
Date: Tue, 9 May 2023 12:20:28 +0300
Subject: [PATCH 0004/1254] 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?= <costin.carabas@gmail.com>
Date: Tue, 9 May 2023 14:12:16 +0300
Subject: [PATCH 0005/1254] 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<u8> {
     })
 }
 
-pub fn load_mxsc_file_json(mxsc_file_path: &str, context: &InterpreterContext) -> Vec<u8> {
-    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<u8> {
+    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<u8> {
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<u8> {
     }
 
     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?= <costin.carabas@gmail.com>
Date: Tue, 9 May 2023 14:19:12 +0300
Subject: [PATCH 0006/1254] 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<u8> {
     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<u8> {
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<u8> {
     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?= <costin.carabas@gmail.com>
Date: Mon, 15 May 2023 16:21:32 +0300
Subject: [PATCH 0007/1254] 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?= <costin.carabas@gmail.com>
Date: Mon, 15 May 2023 17:00:26 +0300
Subject: [PATCH 0008/1254] 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?= <costin.carabas@gmail.com>
Date: Tue, 16 May 2023 08:51:33 +0300
Subject: [PATCH 0009/1254] 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<u8> {
     })
 }
 
-pub fn load_mxsc_file_json(mxsc_file_path: &str) -> Vec<u8> {
-    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<u8> {
+    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<u8> {
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<u8> {
     }
 
     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?= <costin.carabas@gmail.com>
Date: Tue, 16 May 2023 08:55:25 +0300
Subject: [PATCH 0010/1254] 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?= <costin.carabas@gmail.com>
Date: Tue, 16 May 2023 09:35:20 +0300
Subject: [PATCH 0011/1254] 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?= <costin.carabas@gmail.com>
Date: Tue, 16 May 2023 09:39:51 +0300
Subject: [PATCH 0012/1254] 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?= <costin.carabas@gmail.com>
Date: Thu, 18 May 2023 17:10:54 +0300
Subject: [PATCH 0013/1254] 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<u8> {
 }
 
 pub fn load_mxsc_file_json(mxsc_file_path: &str, context: &InterpreterContext) -> Vec<u8> {
-    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?= <costin.carabas@gmail.com>
Date: Fri, 19 May 2023 08:35:49 +0300
Subject: [PATCH 0014/1254] 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<u8> {
+pub fn load_file<F: FnOnce(Vec<u8>) -> Vec<u8>>(
+    file_path: &str,
+    context: &InterpreterContext,
+    process_content: F,
+) -> Vec<u8> {
     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<u8> {
-    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<u8> {
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<u8> {
     }
 
     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 <andrei.marinica@multiversx.com>
Date: Fri, 1 Sep 2023 18:33:16 +0300
Subject: [PATCH 0015/1254] 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::<multisig::AbiProvider, _>(
-        "file:output/multisig.wasm",
+        "mxsc:output/multisig.mxsc.json",
         multisig::ContractBuilder,
         "multisig",
     );
     blockchain.register_partial_contract::<multisig::AbiProvider, _>(
-        "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::<multi_contract_features::AbiProvider, _>(
-        "file:output/multi-contract-features.wasm",
+        "mxsc:output/multi-contract-features.mxsc.json",
         multi_contract_features::ContractBuilder,
         "multi-contract-features",
     );
     blockchain.register_partial_contract::<multi_contract_features::AbiProvider, _>(
-        "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::<multi_contract_features::AbiProvider, _>(
-        "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::<panic_message_features::AbiProvider, _>(
-        "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 14132e92ac13bdd003a11edec3ab845dadf55c39 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Mon, 4 Sep 2023 15:54:11 +0300
Subject: [PATCH 0016/1254] event logs - data as list

---
 .../basic-features/scenarios/events.scen.json | 26 ++++++++++++++-----
 .../scenario/model/transaction/log_check.rs   |  4 +--
 .../src/scenario/model/transaction/tx_call.rs |  4 +--
 .../scenario/model/transaction/tx_deploy.rs   |  4 +--
 .../src/scenario/run_vm/tx_output_check.rs    | 10 +++----
 .../src/whitebox_legacy/raw_converter.rs      |  7 ++++-
 sdk/scenario-format/src/serde_raw/log_raw.rs  |  4 ++-
 .../serde_raw/transaction_raw/tx_call_raw.rs  |  5 +++-
 .../transaction_raw/tx_deploy_raw.rs          |  5 +++-
 vm/src/tx_mock/tx_log.rs                      |  2 +-
 vm/src/vm_hooks/vh_handler/vh_log.rs          |  4 +--
 11 files changed, 50 insertions(+), 25 deletions(-)

diff --git a/contracts/feature-tests/basic-features/scenarios/events.scen.json b/contracts/feature-tests/basic-features/scenarios/events.scen.json
index 4d1928e2d9..880a89d2fa 100644
--- a/contracts/feature-tests/basic-features/scenarios/events.scen.json
+++ b/contracts/feature-tests/basic-features/scenarios/events.scen.json
@@ -38,7 +38,9 @@
                         "topics": [
                             "str:event_a"
                         ],
-                        "data": "0"
+                        "data": [
+                            "0"
+                        ]
                     }
                 ],
                 "gas": "*",
@@ -68,7 +70,9 @@
                         "topics": [
                             "str:event_a"
                         ],
-                        "data": "0"
+                        "data": [
+                            "0"
+                        ]
                     },
                     {
                         "address": "*",
@@ -76,7 +80,9 @@
                         "topics": [
                             "str:event_a"
                         ],
-                        "data": "1"
+                        "data": [
+                            "1"
+                        ]
                     },
                     {
                         "address": "sc:basic-features",
@@ -84,7 +90,9 @@
                         "topics": [
                             "str:event_a"
                         ],
-                        "data": "2"
+                        "data": [
+                            "2"
+                        ]
                     }
                 ],
                 "gas": "*",
@@ -114,7 +122,9 @@
                         "topics": [
                             "str:event_a"
                         ],
-                        "data": "0"
+                        "data": [
+                            "0"
+                        ]
                     },
                     "+"
                 ],
@@ -151,8 +161,10 @@
                             "str:arg2_an_address_______________s3"
                         ],
                         "data": [
-                            "biguint:1",
-                            "biguint:2"
+                            [
+                                "biguint:1",
+                                "biguint:2"
+                            ]
                         ]
                     }
                 ],
diff --git a/framework/scenario/src/scenario/model/transaction/log_check.rs b/framework/scenario/src/scenario/model/transaction/log_check.rs
index f77d302a70..6145a9e161 100644
--- a/framework/scenario/src/scenario/model/transaction/log_check.rs
+++ b/framework/scenario/src/scenario/model/transaction/log_check.rs
@@ -11,7 +11,7 @@ pub struct CheckLog {
     pub address: CheckValue<BytesValue>,
     pub endpoint: CheckValue<BytesValue>,
     pub topics: CheckValueList,
-    pub data: CheckValue<BytesValue>,
+    pub data: CheckValueList,
 }
 
 impl InterpretableFrom<CheckLogRaw> for CheckLog {
@@ -20,7 +20,7 @@ impl InterpretableFrom<CheckLogRaw> for CheckLog {
             address: CheckValue::<BytesValue>::interpret_from(from.address, context),
             endpoint: CheckValue::<BytesValue>::interpret_from(from.endpoint, context),
             topics: CheckValueList::interpret_from(from.topics, context),
-            data: CheckValue::<BytesValue>::interpret_from(from.data, context),
+            data: CheckValueList::interpret_from(from.data, context),
         }
     }
 }
diff --git a/framework/scenario/src/scenario/model/transaction/tx_call.rs b/framework/scenario/src/scenario/model/transaction/tx_call.rs
index 1e14638169..102ef3ef4e 100644
--- a/framework/scenario/src/scenario/model/transaction/tx_call.rs
+++ b/framework/scenario/src/scenario/model/transaction/tx_call.rs
@@ -57,7 +57,7 @@ impl InterpretableFrom<TxCallRaw> for TxCall {
                 .map(|t| BytesValue::interpret_from(t, context))
                 .collect(),
             gas_limit: U64Value::interpret_from(from.gas_limit, context),
-            gas_price: U64Value::interpret_from(from.gas_price, context),
+            gas_price: U64Value::interpret_from(from.gas_price.unwrap_or_default(), context),
         }
     }
 }
@@ -81,7 +81,7 @@ impl IntoRaw<TxCallRaw> for TxCall {
                 .map(|arg| arg.into_raw())
                 .collect(),
             gas_limit: self.gas_limit.into_raw(),
-            gas_price: self.gas_price.into_raw(),
+            gas_price: self.gas_price.into_raw_opt(),
         }
     }
 }
diff --git a/framework/scenario/src/scenario/model/transaction/tx_deploy.rs b/framework/scenario/src/scenario/model/transaction/tx_deploy.rs
index 02396e99d1..77fb59cea8 100644
--- a/framework/scenario/src/scenario/model/transaction/tx_deploy.rs
+++ b/framework/scenario/src/scenario/model/transaction/tx_deploy.rs
@@ -47,7 +47,7 @@ impl InterpretableFrom<TxDeployRaw> for TxDeploy {
                 .map(|t| BytesValue::interpret_from(t, context))
                 .collect(),
             gas_limit: U64Value::interpret_from(from.gas_limit, context),
-            gas_price: U64Value::interpret_from(from.gas_price, context),
+            gas_price: U64Value::interpret_from(from.gas_price.unwrap_or_default(), context),
         }
     }
 }
@@ -65,7 +65,7 @@ impl IntoRaw<TxDeployRaw> for TxDeploy {
                 .map(|arg| arg.into_raw())
                 .collect(),
             gas_limit: self.gas_limit.into_raw(),
-            gas_price: self.gas_price.into_raw(),
+            gas_price: self.gas_price.into_raw_opt(),
         }
     }
 }
diff --git a/framework/scenario/src/scenario/run_vm/tx_output_check.rs b/framework/scenario/src/scenario/run_vm/tx_output_check.rs
index cfe220b968..93cdb456d5 100644
--- a/framework/scenario/src/scenario/run_vm/tx_output_check.rs
+++ b/framework/scenario/src/scenario/run_vm/tx_output_check.rs
@@ -1,7 +1,7 @@
 use crate::scenario::model::{CheckLogs, Checkable, TxExpect};
 
 use multiversx_chain_vm::{
-    display_util::{address_hex, verbose_hex, verbose_hex_list},
+    display_util::{address_hex, verbose_hex_list},
     tx_mock::{TxLog, TxResult},
 };
 
@@ -48,17 +48,17 @@ pub fn check_tx_output(tx_id: &str, tx_expect: &TxExpect, tx_result: &TxResult)
                     let expected_log = &expected_logs.list[i];
                     assert!(
                         scenario_check(actual_log, expected_log),
-                        "Logs do not match. Tx id: '{}'. Index: {}.\nWant: Address: {}, Endpoint: {}, Topics: {:?}, Data: {}\nHave: Address: {}, Endpoint: {}, Topics: {:?}, Data: {}",
+                        "Logs do not match. Tx id: '{}'. Index: {}.\nWant: Address: {}, Endpoint: {}, Topics: {:?}, Data: {:?}\nHave: Address: {}, Endpoint: {}, Topics: {:?}, Data: {}",
                         tx_id,
                         i,
                         &expected_log.address,
                         &expected_log.endpoint,
                         &expected_log.topics.pretty_str(),
-                        &expected_log.data,
+                        &expected_log.data.pretty_str(),
                         address_hex(&actual_log.address),
                     &actual_log.endpoint,
                         verbose_hex_list(actual_log.topics.as_slice()),
-                        verbose_hex(&actual_log.data),
+                        verbose_hex_list(&actual_log.data),
                     );
                 } else if !expected_logs.more_allowed_at_end {
                     panic!(
@@ -68,7 +68,7 @@ pub fn check_tx_output(tx_id: &str, tx_expect: &TxExpect, tx_result: &TxResult)
                         address_hex(&actual_log.address),
                         &actual_log.endpoint,
                         verbose_hex_list(actual_log.topics.as_slice()),
-                        verbose_hex(&actual_log.data),
+                        verbose_hex_list(&actual_log.data),
                     )
                 }
             }
diff --git a/framework/scenario/src/whitebox_legacy/raw_converter.rs b/framework/scenario/src/whitebox_legacy/raw_converter.rs
index c9a33b154b..503f55be97 100644
--- a/framework/scenario/src/whitebox_legacy/raw_converter.rs
+++ b/framework/scenario/src/whitebox_legacy/raw_converter.rs
@@ -9,6 +9,7 @@ use crate::{
         EsdtFullRaw, EsdtInstanceRaw, EsdtRaw, TxCallRaw, TxESDTRaw, TxExpectRaw, TxQueryRaw,
         ValueSubTree,
     },
+    scenario_model::U64Value,
 };
 use multiversx_chain_vm::{
     types::VMAddress,
@@ -123,7 +124,7 @@ pub(crate) fn tx_call_as_raw(tx_call: &ScCallMandos) -> TxCallRaw {
         function: tx_call.function.clone(),
         arguments: arguments_raw,
         gas_limit: u64_as_raw(tx_call.gas_limit),
-        gas_price: u64_as_raw(tx_call.gas_price),
+        gas_price: u64_as_raw_opt(tx_call.gas_price),
     }
 }
 
@@ -299,6 +300,10 @@ pub(crate) fn u64_as_raw(value: u64) -> ValueSubTree {
     ValueSubTree::Str(value.to_string())
 }
 
+pub(crate) fn u64_as_raw_opt(value: u64) -> Option<ValueSubTree> {
+    U64Value::from(value).into_raw_opt()
+}
+
 pub(crate) fn bytes_as_raw(bytes: &[u8]) -> ValueSubTree {
     ValueSubTree::Str(bytes_to_hex(bytes))
 }
diff --git a/sdk/scenario-format/src/serde_raw/log_raw.rs b/sdk/scenario-format/src/serde_raw/log_raw.rs
index b33135259d..4b38023f64 100644
--- a/sdk/scenario-format/src/serde_raw/log_raw.rs
+++ b/sdk/scenario-format/src/serde_raw/log_raw.rs
@@ -12,5 +12,7 @@ pub struct CheckLogRaw {
     #[serde(skip_serializing_if = "CheckValueListRaw::is_unspecified")]
     pub topics: CheckValueListRaw,
 
-    pub data: CheckBytesValueRaw,
+    #[serde(default)]
+    #[serde(skip_serializing_if = "CheckValueListRaw::is_unspecified")]
+    pub data: CheckValueListRaw,
 }
diff --git a/sdk/scenario-format/src/serde_raw/transaction_raw/tx_call_raw.rs b/sdk/scenario-format/src/serde_raw/transaction_raw/tx_call_raw.rs
index 7fe0d4fa91..f9804325f0 100644
--- a/sdk/scenario-format/src/serde_raw/transaction_raw/tx_call_raw.rs
+++ b/sdk/scenario-format/src/serde_raw/transaction_raw/tx_call_raw.rs
@@ -28,5 +28,8 @@ pub struct TxCallRaw {
     pub arguments: Vec<ValueSubTree>,
 
     pub gas_limit: ValueSubTree,
-    pub gas_price: ValueSubTree,
+
+    #[serde(default)]
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub gas_price: Option<ValueSubTree>,
 }
diff --git a/sdk/scenario-format/src/serde_raw/transaction_raw/tx_deploy_raw.rs b/sdk/scenario-format/src/serde_raw/transaction_raw/tx_deploy_raw.rs
index b4b58880dd..d21080a1a3 100644
--- a/sdk/scenario-format/src/serde_raw/transaction_raw/tx_deploy_raw.rs
+++ b/sdk/scenario-format/src/serde_raw/transaction_raw/tx_deploy_raw.rs
@@ -21,5 +21,8 @@ pub struct TxDeployRaw {
     pub arguments: Vec<ValueSubTree>,
 
     pub gas_limit: ValueSubTree,
-    pub gas_price: ValueSubTree,
+
+    #[serde(default)]
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub gas_price: Option<ValueSubTree>,
 }
diff --git a/vm/src/tx_mock/tx_log.rs b/vm/src/tx_mock/tx_log.rs
index d2a0a696da..26d61a81db 100644
--- a/vm/src/tx_mock/tx_log.rs
+++ b/vm/src/tx_mock/tx_log.rs
@@ -7,5 +7,5 @@ pub struct TxLog {
     pub address: VMAddress,
     pub endpoint: TxFunctionName,
     pub topics: Vec<Vec<u8>>,
-    pub data: Vec<u8>,
+    pub data: Vec<Vec<u8>>,
 }
diff --git a/vm/src/vm_hooks/vh_handler/vh_log.rs b/vm/src/vm_hooks/vh_handler/vh_log.rs
index f6320947e8..04f5825896 100644
--- a/vm/src/vm_hooks/vh_handler/vh_log.rs
+++ b/vm/src/vm_hooks/vh_handler/vh_log.rs
@@ -3,12 +3,12 @@ use crate::{tx_mock::TxLog, types::RawHandle, vm_hooks::VMHooksHandlerSource};
 pub trait VMHooksLog: VMHooksHandlerSource {
     fn managed_write_log(&self, topics_handle: RawHandle, data_handle: RawHandle) {
         let topics = self.m_types_lock().mb_get_vec_of_bytes(topics_handle);
-        let data = self.m_types_lock().mb_get(data_handle).to_vec();
+        let single_data_field = self.m_types_lock().mb_get(data_handle).to_vec();
         self.push_tx_log(TxLog {
             address: self.current_address().clone(),
             endpoint: self.input_ref().func_name.clone(),
             topics,
-            data,
+            data: vec![single_data_field],
         });
     }
 }

From e0c61ab546f9c67197a50d3e04d795873431ac76 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 13 Sep 2023 12:13:25 +0300
Subject: [PATCH 0017/1254] scenario check message improvement

---
 .../src/scenario/run_vm/tx_output_check.rs    | 65 +++++++++++++------
 1 file changed, 46 insertions(+), 19 deletions(-)

diff --git a/framework/scenario/src/scenario/run_vm/tx_output_check.rs b/framework/scenario/src/scenario/run_vm/tx_output_check.rs
index 93cdb456d5..eeec7a1c4e 100644
--- a/framework/scenario/src/scenario/run_vm/tx_output_check.rs
+++ b/framework/scenario/src/scenario/run_vm/tx_output_check.rs
@@ -46,20 +46,9 @@ pub fn check_tx_output(tx_id: &str, tx_expect: &TxExpect, tx_result: &TxResult)
             for (i, actual_log) in tx_result.result_logs.iter().enumerate() {
                 if i < expected_logs.list.len() {
                     let expected_log = &expected_logs.list[i];
-                    assert!(
-                        scenario_check(actual_log, expected_log),
-                        "Logs do not match. Tx id: '{}'. Index: {}.\nWant: Address: {}, Endpoint: {}, Topics: {:?}, Data: {:?}\nHave: Address: {}, Endpoint: {}, Topics: {:?}, Data: {}",
-                        tx_id,
-                        i,
-                        &expected_log.address,
-                        &expected_log.endpoint,
-                        &expected_log.topics.pretty_str(),
-                        &expected_log.data.pretty_str(),
-                        address_hex(&actual_log.address),
-                    &actual_log.endpoint,
-                        verbose_hex_list(actual_log.topics.as_slice()),
-                        verbose_hex_list(&actual_log.data),
-                    );
+                    if let Err(main_message) = scenario_check(actual_log, expected_log) {
+                        panic_log(main_message, tx_id, i, actual_log, expected_log);
+                    }
                 } else if !expected_logs.more_allowed_at_end {
                     panic!(
                         "Unexpected log. Tx id: '{}'. Index: {}.\nAddress: {}, Endpoint: {}, Topics: {:?}, Data: {}",
@@ -76,9 +65,47 @@ pub fn check_tx_output(tx_id: &str, tx_expect: &TxExpect, tx_result: &TxResult)
     }
 }
 
-fn scenario_check(tx_log: &TxLog, check_log: &crate::scenario::model::CheckLog) -> bool {
-    check_log.address.check(tx_log.address.as_bytes())
-        && check_log.endpoint.check(&tx_log.endpoint)
-        && check_log.topics.check(tx_log.topics.as_slice())
-        && check_log.data.check(tx_log.data.as_slice())
+fn scenario_check(
+    actual_log: &TxLog,
+    expected_log: &crate::scenario::model::CheckLog,
+) -> Result<(), &'static str> {
+    if !expected_log.address.check(actual_log.address.as_bytes()) {
+        return Err("Log address does not match");
+    }
+    if !expected_log.endpoint.check(&actual_log.endpoint) {
+        return Err("Log endpoint does not match");
+    }
+
+    if !expected_log.topics.check(actual_log.topics.as_slice()) {
+        return Err("Log topics do not match");
+    }
+
+    if !expected_log.data.check(actual_log.data.as_slice()) {
+        return Err("Log data does not match");
+    }
+
+    Ok(())
+}
+
+fn panic_log(
+    main_message: &str,
+    tx_id: &str,
+    log_index: usize,
+    actual_log: &TxLog,
+    expected_log: &crate::scenario::model::CheckLog,
+) -> ! {
+    panic!(
+        "{}. Tx id: '{}'. Index: {}.\nWant: Address: {}, Endpoint: {}, Topics: {:?}, Data: {:?}\nHave: Address: {}, Endpoint: {}, Topics: {:?}, Data: {}",
+        main_message,
+        tx_id,
+        log_index,
+        &expected_log.address,
+        &expected_log.endpoint,
+        &expected_log.topics.pretty_str(),
+        &expected_log.data.pretty_str(),
+        address_hex(&actual_log.address),
+        &actual_log.endpoint,
+        verbose_hex_list(actual_log.topics.as_slice()),
+        verbose_hex_list(&actual_log.data),
+    );
 }

From 6e9e2da25759deff6b03dc0a71dfcf04fc817123 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Sun, 17 Sep 2023 05:19:53 +0300
Subject: [PATCH 0018/1254] event log update, version 1

---
 .../forw_raw_async_accept_egld.scen.json      |  39 ++++--
 .../forw_raw_async_accept_esdt.scen.json      |  37 ++++-
 .../scenarios/forw_raw_async_echo.scen.json   |  45 +++++-
 ...in_nft_local_mint_via_async_call.scen.json |  19 ++-
 ...tin_nft_local_mint_via_sync_call.scen.json |   6 +-
 .../scenarios/forw_raw_direct_esdt.scen.json  |  11 +-
 .../forw_raw_init_sync_accept_egld.scen.json  |   2 +-
 .../forw_raw_init_sync_echo.scen.json         |  28 +++-
 .../scenarios/forw_raw_sync_echo.scen.json    |  84 +++++++++---
 .../forw_raw_sync_echo_caller.scen.json       |  36 +++++
 .../scenarios/forw_raw_sync_egld.scen.json    |  66 +++++----
 .../forw_raw_sync_same_context.scen.json      |  28 +++-
 ...rwarder_builtin_nft_add_quantity.scen.json |   2 +-
 .../forwarder_builtin_nft_burn.scen.json      |   2 +-
 .../forwarder_builtin_nft_create.scen.json    |   6 +-
 ...forwarder_builtin_nft_local_burn.scen.json |   2 +-
 ...forwarder_builtin_nft_local_mint.scen.json |   2 +-
 ...forwarder_call_async_accept_egld.scen.json |  29 +++-
 ...forwarder_call_async_accept_esdt.scen.json |  29 +++-
 .../forwarder_call_async_accept_nft.scen.json |  29 +++-
 ...rwarder_call_async_retrieve_egld.scen.json |  40 ++++--
 ...rwarder_call_async_retrieve_esdt.scen.json |  34 ++++-
 ...orwarder_call_async_retrieve_nft.scen.json |  34 ++++-
 .../forwarder_call_sync_accept_egld.scen.json |  22 +--
 .../forwarder_call_sync_accept_esdt.scen.json |  20 ++-
 ..._call_sync_accept_multi_transfer.scen.json |  61 ++++-----
 .../forwarder_call_sync_accept_nft.scen.json  |  22 ++-
 ..._call_sync_accept_then_read_egld.scen.json |  31 ++++-
 ..._call_sync_accept_then_read_esdt.scen.json |  29 +++-
 ...r_call_sync_accept_then_read_nft.scen.json |  29 +++-
 ...orwarder_call_sync_retrieve_egld.scen.json |  36 ++++-
 ...orwarder_call_sync_retrieve_esdt.scen.json |  30 +++-
 ...forwarder_call_sync_retrieve_nft.scen.json |  30 +++-
 ...der_call_transf_exec_accept_egld.scen.json |  18 ++-
 ...ll_transf_exec_accept_egld_twice.scen.json |  36 +++--
 ...der_call_transf_exec_accept_esdt.scen.json |  15 +-
 ...ll_transf_exec_accept_esdt_twice.scen.json |  30 ++--
 ...ransf_exec_accept_multi_transfer.scen.json |  46 ++++++-
 ...rder_call_transf_exec_accept_nft.scen.json |  15 +-
 ...transf_exec_accept_return_values.scen.json |  18 ++-
 ...all_transf_exec_accept_sft_twice.scen.json |  30 +++-
 .../forwarder_get_esdt_token_data.scen.json   |  27 ++++
 .../scenarios/forwarder_nft_add_uri.scen.json |   4 +-
 .../scenarios/forwarder_nft_create.scen.json  |   6 +-
 .../forwarder_nft_create_and_send.scen.json   |  21 ++-
 .../forwarder_nft_update_attributes.scen.json |   4 +-
 .../forwarder_send_twice_egld.scen.json       | 111 ---------------
 .../forwarder_send_twice_esdt.scen.json       | 128 ------------------
 .../scenarios/forwarder_sync_echo.scen.json   |  84 +++++++++---
 .../recursive_caller_egld_1.scen.json         |  39 ++++--
 .../recursive_caller_esdt_1.scen.json         |  35 ++++-
 .../scenarios/send_esdt.scen.json             |  21 +--
 .../transfer/esdt_multi_transfer_mock.rs      |  31 ++++-
 .../transfer/esdt_nft_transfer_mock.rs        |  30 +++-
 .../transfer/esdt_transfer_mock.rs            |  29 +++-
 .../transfer/transfer_common.rs               |  48 ++++---
 vm/src/tx_execution/exec_call.rs              |   8 +-
 vm/src/tx_execution/exec_general_tx.rs        |  50 ++++---
 vm/src/tx_mock.rs                             |   2 +
 vm/src/tx_mock/tx_async_call_data.rs          |   8 +-
 vm/src/tx_mock/tx_input.rs                    |   4 +-
 vm/src/tx_mock/tx_input_call_type.rs          |  24 ++++
 vm/src/tx_mock/tx_input_function.rs           |   4 +
 vm/src/vm_hooks/vh_impl/vh_debug_api.rs       |   8 +-
 64 files changed, 1250 insertions(+), 604 deletions(-)
 delete mode 100644 contracts/feature-tests/composability/scenarios/forwarder_send_twice_egld.scen.json
 delete mode 100644 contracts/feature-tests/composability/scenarios/forwarder_send_twice_esdt.scen.json
 create mode 100644 vm/src/tx_mock/tx_input_call_type.rs

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..6af57a7e65 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
@@ -40,14 +40,16 @@
                 "status": "0",
                 "logs": [
                     {
-                        "address": "*",
+                        "address": "sc:forwarder",
                         "endpoint": "str:transferValueOnly",
-                        "topics": [
-                            "sc:forwarder",
-                            "sc:vault",
-                            "1000"
+                        "topics": [                            
+                            "1000",
+                            "sc:vault"
                         ],
-                        "data": ""
+                        "data": [
+                            "str:AsyncCall",
+                            "str:accept_funds"
+                        ]
                     },
                     {
                         "address": "sc:vault",
@@ -56,7 +58,22 @@
                             "str:accept_funds",
                             "1000"
                         ],
-                        "data": ""
+                        "data": [
+                            ""
+                        ]
+                    },
+                    {
+                        "address": "sc:vault",
+                        "endpoint": "str:transferValueOnly",
+                        "topics": [                            
+                            "0",
+                            "sc:forwarder"
+                        ],
+                        "data": [
+                            "str:AsyncCallback",
+                            "str:callBack",
+                            "0x00"
+                        ]
                     },
                     {
                         "address": "sc:forwarder",
@@ -64,9 +81,11 @@
                         "topics": [
                             "str:callback_raw"
                         ],
-                        "data": {
-                            "0-status": "nested:0x00"
-                        }
+                        "data": [
+                            {
+                                "0-status": "nested:0x00"
+                            }
+                        ]
                     }
                 ],
                 "gas": "*",
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..7cad96c978 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
@@ -50,13 +50,19 @@
                     {
                         "address": "sc:forwarder",
                         "endpoint": "str:ESDTTransfer",
-                        "topics": [
+                        "topics": [                            
                             "str:TEST-TOKENA",
-                            "",
+                            "0",
                             "1000",
                             "sc:vault"
                         ],
-                        "data": ""
+                        "data": [
+                            "str:AsyncCall",
+                            "str:ESDTTransfer",
+                            "str:TEST-TOKENA",
+                            "1000",
+                            "str:accept_funds"
+                        ]
                     },
                     {
                         "address": "sc:vault",
@@ -68,7 +74,22 @@
                             "0",
                             "1000"
                         ],
-                        "data": ""
+                        "data": [
+                            ""
+                        ]
+                    },
+                    {
+                        "address": "sc:vault",
+                        "endpoint": "str:transferValueOnly",
+                        "topics": [                            
+                            "0",
+                            "sc:forwarder"
+                        ],
+                        "data": [
+                            "str:AsyncCallback",
+                            "str:callBack",
+                            "0x00"
+                        ]
                     },
                     {
                         "address": "sc:forwarder",
@@ -76,9 +97,11 @@
                         "topics": [
                             "str:callback_raw"
                         ],
-                        "data": {
-                            "0-status": "nested:0x00"
-                        }
+                        "data": [
+                            {
+                                "0-status": "nested:0x00"
+                            }
+                        ]
                     }
                 ],
                 "gas": "*",
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..15f7be6d06 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
@@ -43,19 +43,50 @@
                 ],
                 "status": "0",
                 "logs": [
+                    {
+                        "address": "sc:forwarder",
+                        "endpoint": "str:transferValueOnly",
+                        "topics": [                            
+                            "0",
+                            "sc:vault"
+                        ],
+                        "data": [
+                            "str:AsyncCall",
+                            "str:echo_arguments",
+                            "1",
+                            "2"
+                        ]
+                    },
+                    {
+                        "address": "sc:vault",
+                        "endpoint": "str:transferValueOnly",
+                        "topics": [                            
+                            "0",
+                            "sc:forwarder"
+                        ],
+                        "data": [
+                            "str:AsyncCallback",
+                            "str:callBack",
+                            "0x00",
+                            "1",
+                            "2"
+                        ]
+                    },
                     {
                         "address": "sc:forwarder",
                         "endpoint": "str:callBack",
                         "topics": [
                             "str:callback_raw"
                         ],
-                        "data": {
-                            "0-status": "nested:0x00",
-                            "1-echoed-args": [
-                                "biguint:1",
-                                "biguint:2"
-                            ]
-                        }
+                        "data": [
+                            {
+                                "0-status": "nested:0x00",
+                                "1-echoed-args": [
+                                    "biguint:1",
+                                    "biguint:2"
+                                ]
+                            }
+                        ]
                     }
                 ],
                 "gas": "*",
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..bc95dc2c90 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
@@ -52,7 +52,20 @@
                             "0",
                             "1200"
                         ],
-                        "data": ""
+                        "data": []
+                    },
+                    {
+                        "address": "sc:forwarder",
+                        "endpoint": "str:transferValueOnly",
+                        "topics": [
+                            "0",
+                            "sc:forwarder"
+                        ],
+                        "data": [
+                            "str:AsyncCallback",
+                            "str:callBack",
+                            "0x00"
+                        ]
                     },
                     {
                         "address": "sc:forwarder",
@@ -60,7 +73,9 @@
                         "topics": [
                             "str:callback_raw"
                         ],
-                        "data": "nested:0x00"
+                        "data": [
+                            "nested:0x00"
+                        ]
                     }
                 ],
                 "gas": "*",
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..4778336374 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
@@ -52,7 +52,7 @@
                             "0",
                             "1200"
                         ],
-                        "data": ""
+                        "data": []
                     },
                     {
                         "address": "sc:forwarder",
@@ -60,7 +60,9 @@
                         "topics": [
                             "str:execute_on_dest_context_result"
                         ],
-                        "data": ""
+                        "data": [
+                            ""
+                        ]
                     }
                 ],
                 "gas": "*",
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..62b5b00f4d 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
@@ -49,13 +49,18 @@
                     {
                         "address": "sc:forwarder",
                         "endpoint": "str:ESDTTransfer",
-                        "topics": [
+                        "topics": [                            
                             "str:TEST-TOKENA",
-                            "",
+                            "0",
                             "1000",
                             "sc:vault"
                         ],
-                        "data": ""
+                        "data": [
+                            "str:DirectCall",
+                            "str:ESDTTransfer",
+                            "str:TEST-TOKENA",
+                            "1000"
+                        ]
                     }
                 ],
                 "gas": "*",
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..5584ee3b22 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,8 +26,8 @@
             "id": "deploy",
             "tx": {
                 "from": "address:owner",
-                "contractCode": "file:../forwarder-raw/output/forwarder-raw-init-sync-call.wasm",
                 "egldValue": "1000",
+                "contractCode": "file:../forwarder-raw/output/forwarder-raw-init-sync-call.wasm",
                 "arguments": [
                     "sc:vault",
                     "str:accept_funds"
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..e5297f945b 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
@@ -43,18 +43,34 @@
                 ],
                 "status": "",
                 "logs": [
+                    {
+                        "address": "sc:forwarder",
+                        "endpoint": "str:transferValueOnly",
+                        "topics": [                            
+                            "0",
+                            "sc:vault"
+                        ],
+                        "data": [
+                            "str:ExecuteOnDestContext",
+                            "str:echo_arguments",
+                            "1",
+                            "2"
+                        ]
+                    },
                     {
                         "address": "sc:forwarder",
                         "endpoint": "",
                         "topics": [
                             "str:execute_on_dest_context_result"
                         ],
-                        "data": {
-                            "0-echoed-args": [
-                                "biguint:1",
-                                "biguint:2"
-                            ]
-                        }
+                        "data": [
+                            {
+                                "0-echoed-args": [
+                                    "biguint:1",
+                                    "biguint:2"
+                                ]
+                            }
+                        ]
                     }
                 ],
                 "gas": "*",
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..b06a6bc8ac 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
@@ -43,18 +43,34 @@
                 ],
                 "status": "0",
                 "logs": [
+                    {
+                        "address": "sc:forwarder",
+                        "endpoint": "str:transferValueOnly",
+                        "topics": [                            
+                            "0",
+                            "sc:vault"
+                        ],
+                        "data": [
+                            "str:ExecuteOnDestContext",
+                            "str:echo_arguments",
+                            "1",
+                            "2"
+                        ]
+                    },
                     {
                         "address": "sc:forwarder",
                         "endpoint": "str:call_execute_on_dest_context",
                         "topics": [
                             "str:execute_on_dest_context_result"
                         ],
-                        "data": {
-                            "0-echoed-args": [
-                                "biguint:1",
-                                "biguint:2"
-                            ]
-                        }
+                        "data": [
+                            {
+                                "0-echoed-args": [
+                                    "biguint:1",
+                                    "biguint:2"
+                                ]
+                            }
+                        ]
                     }
                 ],
                 "gas": "*",
@@ -86,18 +102,48 @@
                 ],
                 "status": "0",
                 "logs": [
+                    {
+                        "address": "sc:forwarder",
+                        "endpoint": "str:transferValueOnly",
+                        "topics": [                            
+                            "0",
+                            "sc:vault"
+                        ],
+                        "data": [
+                            "str:ExecuteOnDestContext",
+                            "str:echo_arguments",
+                            "1",
+                            "2"
+                        ]
+                    },
                     {
                         "address": "sc:forwarder",
                         "endpoint": "str:call_execute_on_dest_context_twice",
                         "topics": [
                             "str:execute_on_dest_context_result"
                         ],
-                        "data": {
-                            "0-echoed-args": [
-                                "biguint:1",
-                                "biguint:2"
-                            ]
-                        }
+                        "data": [
+                            {
+                                "0-echoed-args": [
+                                    "biguint:1",
+                                    "biguint:2"
+                                ]
+                            }
+                        ]
+                    },
+                    {
+                        "address": "sc:forwarder",
+                        "endpoint": "str:transferValueOnly",
+                        "topics": [                            
+                            "0",
+                            "sc:vault"
+                        ],
+                        "data": [
+                            "str:ExecuteOnDestContext",
+                            "str:echo_arguments",
+                            "1",
+                            "2"
+                        ]
                     },
                     {
                         "address": "sc:forwarder",
@@ -105,12 +151,14 @@
                         "topics": [
                             "str:execute_on_dest_context_result"
                         ],
-                        "data": {
-                            "0-echoed-args": [
-                                "biguint:1",
-                                "biguint:2"
-                            ]
-                        }
+                        "data": [
+                            {
+                                "0-echoed-args": [
+                                    "biguint:1",
+                                    "biguint:2"
+                                ]
+                            }
+                        ]
                     }
                 ],
                 "gas": "*",
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..a2e0a76402 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
@@ -40,6 +40,18 @@
                 ],
                 "status": "0",
                 "logs": [
+                    {
+                        "address": "sc:forwarder",
+                        "endpoint": "str:transferValueOnly",
+                        "topics": [                            
+                            "0",
+                            "sc:vault"
+                        ],
+                        "data": [
+                            "str:ExecuteOnDestContext",
+                            "str:echo_caller"
+                        ]
+                    },
                     {
                         "address": "sc:forwarder",
                         "endpoint": "str:call_execute_on_dest_context",
@@ -76,6 +88,18 @@
                 ],
                 "status": "0",
                 "logs": [
+                    {
+                        "address": "sc:forwarder",
+                        "endpoint": "str:transferValueOnly",
+                        "topics": [                            
+                            "0",
+                            "sc:vault"
+                        ],
+                        "data": [
+                            "str:ExecuteOnDestContext",
+                            "str:echo_caller"
+                        ]
+                    },
                     {
                         "address": "sc:forwarder",
                         "endpoint": "str:call_execute_on_dest_context_twice",
@@ -86,6 +110,18 @@
                             "nested:sc:forwarder"
                         ]
                     },
+                    {
+                        "address": "sc:forwarder",
+                        "endpoint": "str:transferValueOnly",
+                        "topics": [                            
+                            "0",
+                            "sc:vault"
+                        ],
+                        "data": [
+                            "str:ExecuteOnDestContext",
+                            "str:echo_caller"
+                        ]
+                    },
                     {
                         "address": "sc:forwarder",
                         "endpoint": "str:call_execute_on_dest_context_twice",
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..5f55799538 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
@@ -40,14 +40,16 @@
                 "status": "0",
                 "logs": [
                     {
-                        "address": "*",
+                        "address": "sc:forwarder",
                         "endpoint": "str:transferValueOnly",
-                        "topics": [
-                            "sc:forwarder",
-                            "sc:vault",
-                            "1000"
+                        "topics": [                            
+                            "1000",
+                            "sc:vault"
                         ],
-                        "data": ""
+                        "data": [
+                            "str:ExecuteOnDestContext",
+                            "str:accept_funds"
+                        ]
                     },
                     {
                         "address": "sc:vault",
@@ -56,7 +58,9 @@
                             "str:accept_funds",
                             "1000"
                         ],
-                        "data": ""
+                        "data": [
+                            ""
+                        ]
                     },
                     {
                         "address": "sc:forwarder",
@@ -64,7 +68,9 @@
                         "topics": [
                             "str:execute_on_dest_context_result"
                         ],
-                        "data": {}
+                        "data": [
+                            {}
+                        ]
                     }
                 ],
                 "gas": "*",
@@ -91,14 +97,16 @@
                 "status": "0",
                 "logs": [
                     {
-                        "address": "*",
+                        "address": "sc:forwarder",
                         "endpoint": "str:transferValueOnly",
-                        "topics": [
-                            "sc:forwarder",
-                            "sc:vault",
-                            "500"
+                        "topics": [                            
+                            "500",
+                            "sc:vault"
                         ],
-                        "data": ""
+                        "data": [
+                            "str:ExecuteOnDestContext",
+                            "str:accept_funds"
+                        ]
                     },
                     {
                         "address": "sc:vault",
@@ -107,7 +115,9 @@
                             "str:accept_funds",
                             "500"
                         ],
-                        "data": ""
+                        "data": [
+                            ""
+                        ]
                     },
                     {
                         "address": "sc:forwarder",
@@ -115,17 +125,21 @@
                         "topics": [
                             "str:execute_on_dest_context_result"
                         ],
-                        "data": {}
+                        "data": [
+                            {}
+                        ]
                     },
                     {
-                        "address": "*",
+                        "address": "sc:forwarder",
                         "endpoint": "str:transferValueOnly",
-                        "topics": [
-                            "sc:forwarder",
-                            "sc:vault",
-                            "500"
+                        "topics": [                            
+                            "500",
+                            "sc:vault"
                         ],
-                        "data": ""
+                        "data": [
+                            "str:ExecuteOnDestContext",
+                            "str:accept_funds"
+                        ]
                     },
                     {
                         "address": "sc:vault",
@@ -134,7 +148,9 @@
                             "str:accept_funds",
                             "500"
                         ],
-                        "data": ""
+                        "data": [
+                            ""
+                        ]
                     },
                     {
                         "address": "sc:forwarder",
@@ -142,7 +158,9 @@
                         "topics": [
                             "str:execute_on_dest_context_result"
                         ],
-                        "data": {}
+                        "data": [
+                            {}
+                        ]
                     }
                 ],
                 "gas": "*",
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..7abf87782f 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
@@ -44,18 +44,34 @@
                 ],
                 "status": "",
                 "logs": [
+                    {
+                        "address": "sc:forwarder",
+                        "endpoint": "str:transferValueOnly",
+                        "topics": [                            
+                            "0",
+                            "sc:forwarder"
+                        ],
+                        "data": [
+                            "str:ExecuteOnSameContext",
+                            "str:echo_arguments",
+                            "1",
+                            "2"
+                        ]
+                    },
                     {
                         "address": "sc:forwarder",
                         "endpoint": "str:call_execute_on_same_context",
                         "topics": [
                             "str:execute_on_same_context_result"
                         ],
-                        "data": {
-                            "0-echoed-args": [
-                                "biguint:1",
-                                "biguint:2"
-                            ]
-                        }
+                        "data": [
+                            {
+                                "0-echoed-args": [
+                                    "biguint:1",
+                                    "biguint:2"
+                                ]
+                            }
+                        ]
                     }
                 ],
                 "gas": "*",
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..8b67b5501b 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
@@ -82,7 +82,7 @@
                             "1",
                             "1200"
                         ],
-                        "data": ""
+                        "data": []
                     }
                 ],
                 "gas": "*",
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..5587b66fd5 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
@@ -82,7 +82,7 @@
                             "1",
                             "1200"
                         ],
-                        "data": ""
+                        "data": []
                     }
                 ],
                 "gas": "*",
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..69c00db008 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
@@ -90,7 +90,7 @@
                             "1",
                             "*"
                         ],
-                        "data": ""
+                        "data": []
                     },
                     {
                         "address": "sc:forwarder",
@@ -101,7 +101,9 @@
                             "2",
                             "1"
                         ],
-                        "data": ""
+                        "data": [
+                            ""
+                        ]
                     }
                 ],
                 "gas": "*",
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..83b57aca64 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
@@ -66,7 +66,7 @@
                             "0",
                             "2000"
                         ],
-                        "data": ""
+                        "data": []
                     }
                 ],
                 "gas": "*",
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..02c5e22e79 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
@@ -66,7 +66,7 @@
                             "0",
                             "1200"
                         ],
-                        "data": ""
+                        "data": []
                     }
                 ],
                 "gas": "*",
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..fa277fd1ec 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
@@ -39,14 +39,16 @@
                 "status": "0",
                 "logs": [
                     {
-                        "address": "*",
+                        "address": "sc:forwarder",
                         "endpoint": "str:transferValueOnly",
                         "topics": [
-                            "sc:forwarder",
-                            "sc:vault",
-                            "1000"
+                            "1000",
+                            "sc:vault"
                         ],
-                        "data": ""
+                        "data": [
+                            "str:AsyncCall",
+                            "str:accept_funds"
+                        ]
                     },
                     {
                         "address": "sc:vault",
@@ -55,7 +57,22 @@
                             "str:accept_funds",
                             "1000"
                         ],
-                        "data": ""
+                        "data": [
+                            ""
+                        ]
+                    },
+                    {
+                        "address": "sc:vault",
+                        "endpoint": "str:transferValueOnly",
+                        "topics": [                            
+                            "0",
+                            "sc:forwarder"
+                        ],
+                        "data": [
+                            "str:AsyncCallback",
+                            "str:callBack",
+                            "0x00"
+                        ]
                     }
                 ],
                 "gas": "*",
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..717af5faf8 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
@@ -49,13 +49,19 @@
                     {
                         "address": "sc:forwarder",
                         "endpoint": "str:ESDTTransfer",
-                        "topics": [
+                        "topics": [                            
                             "str:TEST-TOKENA",
-                            "",
+                            "0",
                             "1000",
                             "sc:vault"
                         ],
-                        "data": ""
+                        "data": [
+                            "str:AsyncCall",
+                            "str:ESDTTransfer",
+                            "str:TEST-TOKENA",
+                            "1000",
+                            "str:accept_funds"
+                        ]
                     },
                     {
                         "address": "sc:vault",
@@ -67,7 +73,22 @@
                             "0",
                             "1000"
                         ],
-                        "data": ""
+                        "data": [
+                            ""
+                        ]
+                    },
+                    {
+                        "address": "sc:vault",
+                        "endpoint": "str:transferValueOnly",
+                        "topics": [                            
+                            "0",
+                            "sc:forwarder"
+                        ],
+                        "data": [
+                            "str:AsyncCallback",
+                            "str:callBack",
+                            "0x00"
+                        ]
                     }
                 ],
                 "gas": "*",
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..243db87231 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
@@ -61,13 +61,21 @@
                     {
                         "address": "sc:forwarder",
                         "endpoint": "str:ESDTNFTTransfer",
-                        "topics": [
+                        "topics": [                            
                             "str:NFT-000001",
                             "5",
                             "01",
                             "sc:vault"
                         ],
-                        "data": ""
+                        "data": [
+                            "str:AsyncCall",
+                            "str:ESDTNFTTransfer",
+                            "str:NFT-000001",
+                            "5",
+                            "1",
+                            "sc:vault",
+                            "str:accept_funds"
+                        ]
                     },
                     {
                         "address": "sc:vault",
@@ -79,7 +87,22 @@
                             "5",
                             "1"
                         ],
-                        "data": ""
+                        "data": [
+                            ""
+                        ]
+                    },
+                    {
+                        "address": "sc:vault",
+                        "endpoint": "str:transferValueOnly",
+                        "topics": [                            
+                            "0",
+                            "sc:forwarder"
+                        ],
+                        "data": [
+                            "str:AsyncCallback",
+                            "str:callBack",
+                            "0x00"
+                        ]
                     }
                 ],
                 "gas": "*",
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..7537edd046 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
@@ -40,6 +40,21 @@
                 "out": [],
                 "status": "0",
                 "logs": [
+                    {
+                        "address": "sc:forwarder",
+                        "endpoint": "str:transferValueOnly",
+                        "topics": [                            
+                            "0",
+                            "sc:vault"
+                        ],
+                        "data": [
+                            "str:AsyncCall",
+                            "str:retrieve_funds",
+                            "str:EGLD",
+                            "0",
+                            "1000"
+                        ]
+                    },
                     {
                         "address": "sc:vault",
                         "endpoint": "str:retrieve_funds",
@@ -49,17 +64,24 @@
                             "0",
                             "1000"
                         ],
-                        "data": ""
+                        "data": [
+                            ""
+                        ]
                     },
                     {
-                        "address": "*",
+                        "address": "sc:vault",
                         "endpoint": "str:transferValueOnly",
-                        "topics": [
-                            "sc:vault",
-                            "sc:forwarder",
-                            "1000"
+                        "topics": [                            
+                            "1000",
+                            "sc:forwarder"
                         ],
-                        "data": ""
+                        "data": [
+                            "str:AsyncCall",
+                            "str:retrieve_funds",
+                            "str:EGLD",
+                            "0",
+                            "1000"
+                        ]
                     },
                     {
                         "address": "sc:forwarder",
@@ -70,7 +92,9 @@
                             "0",
                             "1000"
                         ],
-                        "data": ""
+                        "data": [
+                            ""
+                        ]
                     }
                 ],
                 "gas": "*",
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..af660b7cf7 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
@@ -43,6 +43,21 @@
                 "out": [],
                 "status": "0",
                 "logs": [
+                    {
+                        "address": "sc:forwarder",
+                        "endpoint": "str:transferValueOnly",
+                        "topics": [                            
+                            "",
+                            "sc:vault"
+                        ],
+                        "data": [
+                            "str:AsyncCall",
+                            "str:retrieve_funds",
+                            "str:TEST-TOKENA",
+                            "0",
+                            "1000"
+                        ]
+                    },
                     {
                         "address": "sc:vault",
                         "endpoint": "str:retrieve_funds",
@@ -52,18 +67,25 @@
                             "0",
                             "1000"
                         ],
-                        "data": ""
+                        "data": [
+                            ""
+                        ]
                     },
                     {
                         "address": "sc:vault",
                         "endpoint": "str:ESDTTransfer",
-                        "topics": [
+                        "topics": [                            
                             "str:TEST-TOKENA",
-                            "",
+                            "0",
                             "1000",
                             "sc:forwarder"
                         ],
-                        "data": ""
+                        "data": [
+                            "str:AsyncCall",
+                            "str:ESDTTransfer",
+                            "str:TEST-TOKENA",
+                            "1000"
+                        ]
                     },
                     {
                         "address": "sc:forwarder",
@@ -74,7 +96,9 @@
                             "0",
                             "1000"
                         ],
-                        "data": ""
+                        "data": [
+                            ""
+                        ]
                     }
                 ],
                 "gas": "*",
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..3362b0960c 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
@@ -50,6 +50,21 @@
                 "out": [],
                 "status": "0",
                 "logs": [
+                    {
+                        "address": "sc:forwarder",
+                        "endpoint": "str:transferValueOnly",
+                        "topics": [                            
+                            "",
+                            "sc:vault"
+                        ],
+                        "data": [
+                            "str:AsyncCall",
+                            "str:retrieve_funds",
+                            "str:NFT-000001",
+                            "5",
+                            "01"
+                        ]
+                    },
                     {
                         "address": "sc:vault",
                         "endpoint": "str:retrieve_funds",
@@ -59,18 +74,27 @@
                             "5",
                             "1"
                         ],
-                        "data": ""
+                        "data": [
+                            ""
+                        ]
                     },
                     {
                         "address": "sc:vault",
                         "endpoint": "str:ESDTNFTTransfer",
-                        "topics": [
+                        "topics": [                            
                             "str:NFT-000001",
                             "5",
                             "01",
                             "sc:forwarder"
                         ],
-                        "data": ""
+                        "data": [
+                            "str:AsyncCall",
+                            "str:ESDTNFTTransfer",
+                            "str:NFT-000001",
+                            "5",
+                            "01",
+                            "sc:forwarder"
+                        ]
                     },
                     {
                         "address": "sc:forwarder",
@@ -81,7 +105,9 @@
                             "*",
                             "*"
                         ],
-                        "data": ""
+                        "data": [
+                            ""
+                        ]
                     }
                 ],
                 "gas": "*",
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..a0648c109c 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
@@ -39,14 +39,16 @@
                 "status": "0",
                 "logs": [
                     {
-                        "address": "*",
+                        "address": "sc:forwarder",
                         "endpoint": "str:transferValueOnly",
-                        "topics": [
-                            "sc:forwarder",
-                            "sc:vault",
-                            "1000"
+                        "topics": [                            
+                            "1000",
+                            "sc:vault"
                         ],
-                        "data": ""
+                        "data": [
+                            "str:ExecuteOnDestContext",
+                            "str:accept_funds_echo_payment"
+                        ]
                     },
                     {
                         "address": "sc:vault",
@@ -55,7 +57,9 @@
                             "str:accept_funds",
                             "1000"
                         ],
-                        "data": ""
+                        "data": [
+                            ""
+                        ]
                     },
                     {
                         "address": "sc:forwarder",
@@ -64,7 +68,9 @@
                             "str:accept_funds_sync_result",
                             "1000"
                         ],
-                        "data": ""
+                        "data": [
+                            ""
+                        ]
                     }
                 ],
                 "gas": "*",
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..236d84fbc2 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
@@ -79,13 +79,19 @@
                     {
                         "address": "sc:forwarder",
                         "endpoint": "str:ESDTTransfer",
-                        "topics": [
+                        "topics": [                            
                             "str:TEST-TOKENA",
-                            "",
+                            "0",
                             "1000",
                             "sc:vault"
                         ],
-                        "data": ""
+                        "data": [
+                            "str:ExecuteOnDestContext",
+                            "str:ESDTTransfer",
+                            "str:TEST-TOKENA",
+                            "1000",
+                            "str:accept_funds_echo_payment"
+                        ]
                     },
                     {
                         "address": "sc:vault",
@@ -97,7 +103,9 @@
                             "0",
                             "1000"
                         ],
-                        "data": ""
+                        "data": [
+                            ""
+                        ]
                     },
                     {
                         "address": "sc:forwarder",
@@ -109,7 +117,9 @@
                             "0",
                             "1000"
                         ],
-                        "data": ""
+                        "data": [
+                            ""
+                        ]
                     }
                 ],
                 "gas": "*",
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..f846047f17 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
@@ -76,57 +76,46 @@
                     {
                         "address": "sc:forwarder",
                         "endpoint": "str:MultiESDTNFTTransfer",
-                        "topics": [
+                        "topics": [                            
                             "str:FWD-TOKEN",
                             "0",
                             "100",
-                            "sc:vault"
-                        ],
-                        "data": ""
-                    },
-                    {
-                        "address": "sc:forwarder",
-                        "endpoint": "str:MultiESDTNFTTransfer",
-                        "topics": [
                             "str:FWD-TOKEN",
                             "0",
                             "200",
-                            "sc:vault"
-                        ],
-                        "data": ""
-                    },
-                    {
-                        "address": "sc:forwarder",
-                        "endpoint": "str:MultiESDTNFTTransfer",
-                        "topics": [
                             "str:NFT-123456",
                             "1",
                             "1",
-                            "sc:vault"
-                        ],
-                        "data": ""
-                    },
-                    {
-                        "address": "sc:forwarder",
-                        "endpoint": "str:MultiESDTNFTTransfer",
-                        "topics": [
                             "str:SFT-456789",
                             "3",
                             "3",
-                            "sc:vault"
-                        ],
-                        "data": ""
-                    },
-                    {
-                        "address": "sc:forwarder",
-                        "endpoint": "str:MultiESDTNFTTransfer",
-                        "topics": [
                             "str:SFT-456789",
                             "3",
                             "4",
                             "sc:vault"
                         ],
-                        "data": ""
+                        "data": [
+                            "str:ExecuteOnDestContext",
+                            "str:MultiESDTNFTTransfer",
+                            "sc:vault",
+                            "5",
+                            "str:FWD-TOKEN",
+                            "0",
+                            "100",
+                            "str:FWD-TOKEN",
+                            "0",
+                            "200",
+                            "str:NFT-123456",
+                            "1",
+                            "1",
+                            "str:SFT-456789",
+                            "3",
+                            "3",
+                            "str:SFT-456789",
+                            "3",
+                            "4",
+                            "str:accept_funds"
+                        ]
                     },
                     {
                         "address": "sc:vault",
@@ -150,7 +139,9 @@
                             "3",
                             "4"
                         ],
-                        "data": ""
+                        "data": [
+                            ""
+                        ]
                     }
                 ],
                 "gas": "*",
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..3b458dc9a2 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
@@ -61,13 +61,21 @@
                     {
                         "address": "sc:forwarder",
                         "endpoint": "str:ESDTNFTTransfer",
-                        "topics": [
+                        "topics": [                            
                             "str:NFT-000001",
                             "5",
-                            "1",
+                            "01",
                             "sc:vault"
                         ],
-                        "data": ""
+                        "data": [
+                            "str:ExecuteOnDestContext",
+                            "str:ESDTNFTTransfer",
+                            "str:NFT-000001",
+                            "5",
+                            "1",
+                            "sc:vault",
+                            "str:accept_funds_echo_payment"
+                        ]
                     },
                     {
                         "address": "sc:vault",
@@ -79,7 +87,9 @@
                             "5",
                             "1"
                         ],
-                        "data": ""
+                        "data": [
+                            ""
+                        ]
                     },
                     {
                         "address": "sc:forwarder",
@@ -91,7 +101,9 @@
                             "5",
                             "1"
                         ],
-                        "data": ""
+                        "data": [
+                            ""
+                        ]
                     }
                 ],
                 "gas": "*",
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..20dd786e41 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
@@ -41,14 +41,16 @@
                 "status": "0",
                 "logs": [
                     {
-                        "address": "*",
+                        "address": "sc:forwarder",
                         "endpoint": "str:transferValueOnly",
-                        "topics": [
-                            "sc:forwarder",
-                            "sc:vault",
-                            "1000"
+                        "topics": [                            
+                            "1000",
+                            "sc:vault"
                         ],
-                        "data": ""
+                        "data": [
+                            "str:ExecuteOnDestContext",
+                            "str:accept_funds"
+                        ]
                     },
                     {
                         "address": "sc:vault",
@@ -57,7 +59,22 @@
                             "str:accept_funds",
                             "1000"
                         ],
-                        "data": ""
+                        "data": [
+                            ""
+                        ]
+                    },
+                    {
+                        "address": "sc:forwarder",
+                        "endpoint": "str:transferValueOnly",
+                        "topics": [                            
+                            "",
+                            "sc:vault"
+                        ],
+                        "data": [
+                            "str:ExecuteOnDestContext",
+                            "str:call_counts",
+                            "str:accept_funds"
+                        ]
                     }
                 ],
                 "gas": "*",
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..0d0ba011d5 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
@@ -51,13 +51,19 @@
                     {
                         "address": "sc:forwarder",
                         "endpoint": "str:ESDTTransfer",
-                        "topics": [
+                        "topics": [                            
                             "str:TEST-TOKENA",
-                            "",
+                            "0",
                             "1000",
                             "sc:vault"
                         ],
-                        "data": ""
+                        "data": [
+                            "str:ExecuteOnDestContext",
+                            "str:ESDTTransfer",
+                            "str:TEST-TOKENA",
+                            "1000",
+                            "str:accept_funds"
+                        ]
                     },
                     {
                         "address": "sc:vault",
@@ -69,7 +75,22 @@
                             "0",
                             "1000"
                         ],
-                        "data": ""
+                        "data": [
+                            ""
+                        ]
+                    },
+                    {
+                        "address": "sc:forwarder",
+                        "endpoint": "str:transferValueOnly",
+                        "topics": [                            
+                            "0",
+                            "sc:vault"
+                        ],
+                        "data": [
+                            "str:ExecuteOnDestContext",
+                            "str:call_counts",
+                            "str:accept_funds"
+                        ]
                     }
                 ],
                 "gas": "*",
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..c7745dc87e 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
@@ -63,13 +63,21 @@
                     {
                         "address": "sc:forwarder",
                         "endpoint": "str:ESDTNFTTransfer",
-                        "topics": [
+                        "topics": [                            
                             "str:NFT-000001",
                             "5",
                             "01",
                             "sc:vault"
                         ],
-                        "data": ""
+                        "data": [
+                            "str:ExecuteOnDestContext",
+                            "str:ESDTNFTTransfer",
+                            "str:NFT-000001",
+                            "5",
+                            "1",
+                            "sc:vault",
+                            "str:accept_funds"
+                        ]
                     },
                     {
                         "address": "sc:vault",
@@ -81,7 +89,22 @@
                             "5",
                             "1"
                         ],
-                        "data": ""
+                        "data": [
+                            ""
+                        ]
+                    },
+                    {
+                        "address": "sc:forwarder",
+                        "endpoint": "str:transferValueOnly",
+                        "topics": [                            
+                            "0",
+                            "sc:vault"
+                        ],
+                        "data": [
+                            "str:ExecuteOnDestContext",
+                            "str:call_counts",
+                            "str:accept_funds"
+                        ]
                     }
                 ],
                 "gas": "*",
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..b8e67c3651 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
@@ -40,6 +40,21 @@
                 "out": [],
                 "status": "0",
                 "logs": [
+                    {
+                        "address": "sc:forwarder",
+                        "endpoint": "str:transferValueOnly",
+                        "topics": [                            
+                            "0",
+                            "sc:vault"
+                        ],
+                        "data": [
+                            "str:ExecuteOnDestContext",
+                            "str:retrieve_funds",
+                            "str:EGLD",
+                            "0",
+                            "1000"
+                        ]
+                    },
                     {
                         "address": "sc:vault",
                         "endpoint": "str:retrieve_funds",
@@ -49,17 +64,24 @@
                             "0",
                             "1000"
                         ],
-                        "data": ""
+                        "data": [
+                            ""
+                        ]
                     },
                     {
-                        "address": "*",
+                        "address": "sc:vault",
                         "endpoint": "str:transferValueOnly",
-                        "topics": [
-                            "sc:vault",
-                            "sc:forwarder",
-                            "1000"
+                        "topics": [                            
+                            "1000",
+                            "sc:forwarder"
                         ],
-                        "data": ""
+                        "data": [
+                            "str:ExecuteOnDestContext",
+                            "str:retrieve_funds",
+                            "str:EGLD",
+                            "0",
+                            "1000"
+                        ]
                     }
                 ],
                 "gas": "*",
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..622c58b09e 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
@@ -43,6 +43,21 @@
                 "out": [],
                 "status": "0",
                 "logs": [
+                    {
+                        "address": "sc:forwarder",
+                        "endpoint": "str:transferValueOnly",
+                        "topics": [                            
+                            "",
+                            "sc:vault"
+                        ],
+                        "data": [
+                            "str:ExecuteOnDestContext",
+                            "str:retrieve_funds",
+                            "str:TEST-TOKENA",
+                            "0",
+                            "1000"
+                        ]
+                    },
                     {
                         "address": "sc:vault",
                         "endpoint": "str:retrieve_funds",
@@ -52,18 +67,25 @@
                             "0",
                             "1000"
                         ],
-                        "data": ""
+                        "data": [
+                            ""
+                        ]
                     },
                     {
                         "address": "sc:vault",
                         "endpoint": "str:ESDTTransfer",
-                        "topics": [
+                        "topics": [                            
                             "str:TEST-TOKENA",
-                            "",
+                            "0",
                             "1000",
                             "sc:forwarder"
                         ],
-                        "data": ""
+                        "data": [
+                            "str:ExecuteOnDestContext",
+                            "str:ESDTTransfer",
+                            "str:TEST-TOKENA",
+                            "1000"
+                        ]
                     }
                 ],
                 "gas": "*",
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..65aa6d891f 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
@@ -50,6 +50,21 @@
                 "out": [],
                 "status": "0",
                 "logs": [
+                    {
+                        "address": "sc:forwarder",
+                        "endpoint": "str:transferValueOnly",
+                        "topics": [                            
+                            "",
+                            "sc:vault"
+                        ],
+                        "data": [
+                            "str:ExecuteOnDestContext",
+                            "str:retrieve_funds",
+                            "str:NFT-000001",
+                            "5",
+                            "01"
+                        ]
+                    },
                     {
                         "address": "sc:vault",
                         "endpoint": "str:retrieve_funds",
@@ -59,18 +74,27 @@
                             "5",
                             "1"
                         ],
-                        "data": ""
+                        "data": [
+                            ""
+                        ]
                     },
                     {
                         "address": "sc:vault",
                         "endpoint": "str:ESDTNFTTransfer",
-                        "topics": [
+                        "topics": [                            
                             "str:NFT-000001",
                             "5",
                             "01",
                             "sc:forwarder"
                         ],
-                        "data": ""
+                        "data": [
+                            "str:ExecuteOnDestContext",
+                            "str:ESDTNFTTransfer",
+                            "str:NFT-000001",
+                            "5",
+                            "01",
+                            "sc:forwarder"
+                        ]
                     }
                 ],
                 "gas": "*",
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..ceb1c5333c 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
@@ -39,14 +39,16 @@
                 "status": "0",
                 "logs": [
                     {
-                        "address": "*",
+                        "address": "sc:forwarder",
                         "endpoint": "str:transferValueOnly",
-                        "topics": [
-                            "sc:forwarder",
-                            "sc:vault",
-                            "1000"
+                        "topics": [                            
+                            "1000",
+                            "sc:vault"
                         ],
-                        "data": ""
+                        "data": [
+                            "str:ExecuteOnDestContext",
+                            "str:accept_funds"
+                        ]
                     },
                     {
                         "address": "sc:vault",
@@ -55,7 +57,9 @@
                             "str:accept_funds",
                             "1000"
                         ],
-                        "data": ""
+                        "data": [
+                            ""
+                        ]
                     }
                 ],
                 "gas": "*",
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..9506a63afc 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
@@ -39,14 +39,16 @@
                 "status": "0",
                 "logs": [
                     {
-                        "address": "*",
+                        "address": "sc:forwarder",
                         "endpoint": "str:transferValueOnly",
-                        "topics": [
-                            "sc:forwarder",
-                            "sc:vault",
-                            "1000"
+                        "topics": [                            
+                            "1000",
+                            "sc:vault"
                         ],
-                        "data": ""
+                        "data": [
+                            "str:ExecuteOnDestContext",
+                            "str:accept_funds"
+                        ]
                     },
                     {
                         "address": "sc:vault",
@@ -55,17 +57,21 @@
                             "str:accept_funds",
                             "1000"
                         ],
-                        "data": ""
+                        "data": [
+                            ""
+                        ]
                     },
                     {
-                        "address": "*",
+                        "address": "sc:forwarder",
                         "endpoint": "str:transferValueOnly",
-                        "topics": [
-                            "sc:forwarder",
-                            "sc:vault",
-                            "1000"
+                        "topics": [                            
+                            "1000",
+                            "sc:vault"
                         ],
-                        "data": ""
+                        "data": [
+                            "str:ExecuteOnDestContext",
+                            "str:accept_funds"
+                        ]
                     },
                     {
                         "address": "sc:vault",
@@ -74,7 +80,9 @@
                             "str:accept_funds",
                             "1000"
                         ],
-                        "data": ""
+                        "data": [
+                            ""
+                        ]
                     }
                 ],
                 "gas": "*",
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..614365bcaa 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
@@ -49,13 +49,18 @@
                     {
                         "address": "sc:forwarder",
                         "endpoint": "str:ESDTTransfer",
-                        "topics": [
+                        "topics": [                            
                             "str:TEST-TOKENA",
-                            "",
+                            "0",
                             "1000",
                             "sc:vault"
                         ],
-                        "data": ""
+                        "data": [
+                            "str:DirectCall",
+                            "str:ESDTTransfer",
+                            "str:TEST-TOKENA",
+                            "1000"
+                        ]
                     },
                     {
                         "address": "sc:vault",
@@ -67,7 +72,9 @@
                             "0",
                             "1000"
                         ],
-                        "data": ""
+                        "data": [
+                            ""
+                        ]
                     }
                 ],
                 "gas": "*",
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..f5b6facdd6 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
@@ -49,13 +49,18 @@
                     {
                         "address": "sc:forwarder",
                         "endpoint": "str:ESDTTransfer",
-                        "topics": [
+                        "topics": [                            
                             "str:TEST-TOKENA",
-                            "",
+                            "0",
                             "1000",
                             "sc:vault"
                         ],
-                        "data": ""
+                        "data": [
+                            "str:DirectCall",
+                            "str:ESDTTransfer",
+                            "str:TEST-TOKENA",
+                            "1000"
+                        ]
                     },
                     {
                         "address": "sc:vault",
@@ -67,18 +72,25 @@
                             "0",
                             "1000"
                         ],
-                        "data": ""
+                        "data": [
+                            ""
+                        ]
                     },
                     {
                         "address": "sc:forwarder",
                         "endpoint": "str:ESDTTransfer",
-                        "topics": [
+                        "topics": [                            
                             "str:TEST-TOKENA",
-                            "",
+                            "0",
                             "1000",
                             "sc:vault"
                         ],
-                        "data": ""
+                        "data": [
+                            "str:DirectCall",
+                            "str:ESDTTransfer",
+                            "str:TEST-TOKENA",
+                            "1000"
+                        ]
                     },
                     {
                         "address": "sc:vault",
@@ -90,7 +102,9 @@
                             "0",
                             "1000"
                         ],
-                        "data": ""
+                        "data": [
+                            ""
+                        ]
                     }
                 ],
                 "gas": "*",
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..7896a3a7de 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
@@ -63,8 +63,50 @@
                 "out": [],
                 "status": "0",
                 "message": "",
-                "gas": "*",
-                "refund": "*"
+                "logs": [
+                    {
+                        "address": "sc:forwarder",
+                        "endpoint": "str:MultiESDTNFTTransfer",
+                        "topics": [                            
+                            "str:FWD-TOKEN",
+                            "0",
+                            "100",
+                            "str:FWD-TOKEN",
+                            "0",
+                            "200",
+                            "sc:vault"
+                        ],
+                        "data": [
+                            "str:DirectCall",
+                            "str:MultiESDTNFTTransfer",
+                            "sc:vault",
+                            "2",
+                            "str:FWD-TOKEN",
+                            "0",
+                            "100",
+                            "str:FWD-TOKEN",
+                            "0",
+                            "200"
+                        ]
+                    },
+                    {
+                        "address": "sc:vault",
+                        "endpoint": "str:accept_funds",
+                        "topics": [
+                            "str:accept_funds",
+                            "0",
+                            "str:FWD-TOKEN",
+                            "0",
+                            "100",
+                            "str:FWD-TOKEN",
+                            "0",
+                            "200"
+                        ],
+                        "data": [
+                            ""
+                        ]
+                    }
+                ]
             }
         },
         {
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..b76f0f3d7b 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
@@ -57,13 +57,20 @@
                     {
                         "address": "sc:forwarder",
                         "endpoint": "str:ESDTNFTTransfer",
-                        "topics": [
+                        "topics": [                            
                             "str:NFT-000001",
                             "5",
                             "01",
                             "sc:vault"
                         ],
-                        "data": ""
+                        "data": [
+                            "str:DirectCall",
+                            "str:ESDTNFTTransfer",
+                            "str:NFT-000001",
+                            "5",
+                            "1",
+                            "sc:vault"
+                        ]
                     },
                     {
                         "address": "sc:vault",
@@ -75,7 +82,9 @@
                             "5",
                             "1"
                         ],
-                        "data": ""
+                        "data": [
+                            ""
+                        ]
                     }
                 ],
                 "gas": "*",
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..e1cb0af7f3 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
@@ -44,14 +44,16 @@
                 "status": "0",
                 "logs": [
                     {
-                        "address": "*",
+                        "address": "sc:forwarder",
                         "endpoint": "str:transferValueOnly",
-                        "topics": [
-                            "sc:forwarder",
-                            "sc:vault",
-                            "1000"
+                        "topics": [                            
+                            "1000",
+                            "sc:vault"
                         ],
-                        "data": ""
+                        "data": [
+                            "str:ExecuteOnDestContext",
+                            "str:accept_funds"
+                        ]
                     },
                     {
                         "address": "sc:vault",
@@ -60,7 +62,9 @@
                             "str:accept_funds",
                             "1000"
                         ],
-                        "data": ""
+                        "data": [
+                            ""
+                        ]
                     }
                 ],
                 "gas": "*",
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..6a907dcdac 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
@@ -57,13 +57,20 @@
                     {
                         "address": "sc:forwarder",
                         "endpoint": "str:ESDTNFTTransfer",
-                        "topics": [
+                        "topics": [                            
                             "str:NFT-000001",
                             "5",
                             "01",
                             "sc:vault"
                         ],
-                        "data": ""
+                        "data": [
+                            "str:DirectCall",
+                            "str:ESDTNFTTransfer",
+                            "str:NFT-000001",
+                            "5",
+                            "1",
+                            "sc:vault"
+                        ]
                     },
                     {
                         "address": "sc:vault",
@@ -75,18 +82,27 @@
                             "5",
                             "1"
                         ],
-                        "data": ""
+                        "data": [
+                            ""
+                        ]
                     },
                     {
                         "address": "sc:forwarder",
                         "endpoint": "str:ESDTNFTTransfer",
-                        "topics": [
+                        "topics": [                            
                             "str:NFT-000001",
                             "5",
                             "01",
                             "sc:vault"
                         ],
-                        "data": ""
+                        "data": [
+                            "str:DirectCall",
+                            "str:ESDTNFTTransfer",
+                            "str:NFT-000001",
+                            "5",
+                            "1",
+                            "sc:vault"
+                        ]
                     },
                     {
                         "address": "sc:vault",
@@ -98,7 +114,9 @@
                             "5",
                             "1"
                         ],
-                        "data": ""
+                        "data": [
+                            ""
+                        ]
                     }
                 ],
                 "gas": "*",
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..9960030bbb 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
@@ -166,6 +166,33 @@
                 "status": "0"
             }
         },
+        {
+            "step": "scQuery",
+            "id": "missing-account",
+            "tx": {
+                "to": "sc:forwarder",
+                "function": "get_esdt_token_data",
+                "arguments": [
+                    "address:missing-account",
+                    "str:FUNG-00001",
+                    "0"
+                ]
+            },
+            "expect": {
+                "out": [
+                    "0",
+                    "0",
+                    "false",
+                    "",
+                    "",
+                    "",
+                    "0x0000000000000000000000000000000000000000000000000000000000000000",
+                    "",
+                    ""
+                ],
+                "status": "0"
+            }
+        },
         {
             "step": "scQuery",
             "id": "missing-token",
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..c9c8214759 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
@@ -56,7 +56,7 @@
                             "",
                             "str:new-uri-1"
                         ],
-                        "data": ""
+                        "data": []
                     }
                 ],
                 "gas": "*",
@@ -125,7 +125,7 @@
                             "str:new-uri-2",
                             "str:new-uri-3"
                         ],
-                        "data": ""
+                        "data": []
                     }
                 ],
                 "gas": "*",
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..e477b9a49a 100644
--- a/contracts/feature-tests/composability/scenarios/forwarder_nft_create.scen.json
+++ b/contracts/feature-tests/composability/scenarios/forwarder_nft_create.scen.json
@@ -74,7 +74,7 @@
                             "1",
                             "*"
                         ],
-                        "data": ""
+                        "data": []
                     },
                     {
                         "address": "sc:forwarder",
@@ -85,7 +85,9 @@
                             "2",
                             "1"
                         ],
-                        "data": ""
+                        "data": [
+                            ""
+                        ]
                     }
                 ],
                 "gas": "*",
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..7c59680884 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
@@ -72,7 +72,7 @@
                             "01",
                             "*"
                         ],
-                        "data": ""
+                        "data": []
                     },
                     {
                         "address": "sc:forwarder",
@@ -83,18 +83,27 @@
                             "2",
                             "1"
                         ],
-                        "data": ""
+                        "data": [
+                            ""
+                        ]
                     },
                     {
                         "address": "sc:forwarder",
                         "endpoint": "str:ESDTNFTTransfer",
-                        "topics": [
+                        "topics": [                            
                             "str:NFT-000001",
                             "2",
                             "01",
                             "address:a_user"
                         ],
-                        "data": ""
+                        "data": [
+                            "str:DirectCall",
+                            "str:ESDTNFTTransfer",
+                            "str:NFT-000001",
+                            "2",
+                            "01",
+                            "address:a_user"
+                        ]
                     },
                     {
                         "address": "sc:forwarder",
@@ -106,7 +115,9 @@
                             "2",
                             "1"
                         ],
-                        "data": ""
+                        "data": [
+                            ""
+                        ]
                     }
                 ],
                 "gas": "*",
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..d3daed649c 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
@@ -66,7 +66,7 @@
                             "",
                             "0x808080"
                         ],
-                        "data": ""
+                        "data": []
                     }
                 ],
                 "gas": "*",
@@ -143,7 +143,7 @@
                             "",
                             "0x909090"
                         ],
-                        "data": ""
+                        "data": []
                     }
                 ],
                 "gas": "*",
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
deleted file mode 100644
index e554b3c4d0..0000000000
--- a/contracts/feature-tests/composability/scenarios/forwarder_send_twice_egld.scen.json
+++ /dev/null
@@ -1,111 +0,0 @@
-{
-    "gasSchedule": "v3",
-    "steps": [
-        {
-            "step": "setState",
-            "accounts": {
-                "address:a_user": {
-                    "nonce": "0",
-                    "balance": "0"
-                },
-                "sc:vault": {
-                    "nonce": "0",
-                    "balance": "0",
-                    "code": "file:../vault/output/vault.wasm"
-                },
-                "sc:forwarder": {
-                    "nonce": "0",
-                    "balance": "1000",
-                    "code": "file:../forwarder/output/forwarder.wasm"
-                }
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "1",
-            "tx": {
-                "from": "address:a_user",
-                "to": "sc:forwarder",
-                "function": "send_funds_twice",
-                "arguments": [
-                    "sc:vault",
-                    "str:EGLD",
-                    "1"
-                ],
-                "gasLimit": "100,000,000",
-                "gasPrice": "0"
-            },
-            "expect": {
-                "out": [],
-                "status": "0",
-                "logs": [
-                    {
-                        "address": "*",
-                        "endpoint": "str:transferValueOnly",
-                        "topics": [
-                            "sc:forwarder",
-                            "sc:vault",
-                            "1"
-                        ],
-                        "data": ""
-                    },
-                    {
-                        "address": "sc:vault",
-                        "endpoint": "str:accept_funds",
-                        "topics": [
-                            "str:accept_funds",
-                            "1"
-                        ],
-                        "data": ""
-                    },
-                    {
-                        "address": "*",
-                        "endpoint": "str:transferValueOnly",
-                        "topics": [
-                            "sc:forwarder",
-                            "sc:vault",
-                            "1"
-                        ],
-                        "data": ""
-                    },
-                    {
-                        "address": "sc:vault",
-                        "endpoint": "str:accept_funds",
-                        "topics": [
-                            "str:accept_funds",
-                            "1"
-                        ],
-                        "data": ""
-                    }
-                ],
-                "gas": "*",
-                "refund": "*"
-            }
-        },
-        {
-            "step": "checkState",
-            "accounts": {
-                "address:a_user": {
-                    "nonce": "*",
-                    "balance": "0",
-                    "storage": {},
-                    "code": ""
-                },
-                "sc:vault": {
-                    "nonce": "0",
-                    "balance": "2",
-                    "storage": {
-                        "str:call_counts|nested:str:accept_funds": "2"
-                    },
-                    "code": "file:../vault/output/vault.wasm"
-                },
-                "sc:forwarder": {
-                    "nonce": "0",
-                    "balance": "998",
-                    "storage": {},
-                    "code": "file:../forwarder/output/forwarder.wasm"
-                }
-            }
-        }
-    ]
-}
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
deleted file mode 100644
index f3a5f6f53d..0000000000
--- a/contracts/feature-tests/composability/scenarios/forwarder_send_twice_esdt.scen.json
+++ /dev/null
@@ -1,128 +0,0 @@
-{
-    "gasSchedule": "v3",
-    "steps": [
-        {
-            "step": "setState",
-            "accounts": {
-                "address:a_user": {
-                    "nonce": "0",
-                    "balance": "0"
-                },
-                "sc:vault": {
-                    "nonce": "0",
-                    "balance": "0",
-                    "code": "file:../vault/output/vault.wasm"
-                },
-                "sc:forwarder": {
-                    "nonce": "0",
-                    "balance": "0",
-                    "esdt": {
-                        "str:FWD-TOKEN": "1000"
-                    },
-                    "code": "file:../forwarder/output/forwarder.wasm"
-                }
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "1",
-            "tx": {
-                "from": "address:a_user",
-                "to": "sc:forwarder",
-                "function": "send_funds_twice",
-                "arguments": [
-                    "sc:vault",
-                    "str:FWD-TOKEN",
-                    "1"
-                ],
-                "gasLimit": "100,000,000",
-                "gasPrice": "0"
-            },
-            "expect": {
-                "out": [],
-                "status": "0",
-                "logs": [
-                    {
-                        "address": "sc:forwarder",
-                        "endpoint": "str:ESDTTransfer",
-                        "topics": [
-                            "str:FWD-TOKEN",
-                            "",
-                            "1",
-                            "sc:vault"
-                        ],
-                        "data": ""
-                    },
-                    {
-                        "address": "sc:vault",
-                        "endpoint": "str:accept_funds",
-                        "topics": [
-                            "str:accept_funds",
-                            "0",
-                            "str:FWD-TOKEN",
-                            "0",
-                            "1"
-                        ],
-                        "data": ""
-                    },
-                    {
-                        "address": "sc:forwarder",
-                        "endpoint": "str:ESDTTransfer",
-                        "topics": [
-                            "str:FWD-TOKEN",
-                            "",
-                            "1",
-                            "sc:vault"
-                        ],
-                        "data": ""
-                    },
-                    {
-                        "address": "sc:vault",
-                        "endpoint": "str:accept_funds",
-                        "topics": [
-                            "str:accept_funds",
-                            "0",
-                            "str:FWD-TOKEN",
-                            "0",
-                            "1"
-                        ],
-                        "data": ""
-                    }
-                ],
-                "gas": "*",
-                "refund": "*"
-            }
-        },
-        {
-            "step": "checkState",
-            "accounts": {
-                "address:a_user": {
-                    "nonce": "*",
-                    "balance": "0",
-                    "storage": {},
-                    "code": ""
-                },
-                "sc:vault": {
-                    "nonce": "0",
-                    "balance": "0",
-                    "esdt": {
-                        "str:FWD-TOKEN": "2"
-                    },
-                    "storage": {
-                        "str:call_counts|nested:str:accept_funds": "2"
-                    },
-                    "code": "file:../vault/output/vault.wasm"
-                },
-                "sc:forwarder": {
-                    "nonce": "0",
-                    "balance": "0",
-                    "esdt": {
-                        "str:FWD-TOKEN": "998"
-                    },
-                    "storage": {},
-                    "code": "file:../forwarder/output/forwarder.wasm"
-                }
-            }
-        }
-    ]
-}
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..93c4d4bc3b 100644
--- a/contracts/feature-tests/composability/scenarios/forwarder_sync_echo.scen.json
+++ b/contracts/feature-tests/composability/scenarios/forwarder_sync_echo.scen.json
@@ -39,18 +39,34 @@
                 "out": [],
                 "status": "0",
                 "logs": [
+                    {
+                        "address": "sc:forwarder",
+                        "endpoint": "str:transferValueOnly",
+                        "topics": [                            
+                            "0",
+                            "sc:vault"
+                        ],
+                        "data": [
+                            "str:ExecuteOnDestContext",
+                            "str:echo_arguments",
+                            "1",
+                            "2"
+                        ]
+                    },
                     {
                         "address": "sc:forwarder",
                         "endpoint": "str:echo_arguments_sync",
                         "topics": [
                             "str:echo_arguments_sync_result"
                         ],
-                        "data": {
-                            "0-echoed-args": [
-                                "biguint:1",
-                                "biguint:2"
-                            ]
-                        }
+                        "data": [
+                            {
+                                "0-echoed-args": [
+                                    "biguint:1",
+                                    "biguint:2"
+                                ]
+                            }
+                        ]
                     }
                 ],
                 "gas": "*",
@@ -76,18 +92,48 @@
                 "out": [],
                 "status": "0",
                 "logs": [
+                    {
+                        "address": "sc:forwarder",
+                        "endpoint": "str:transferValueOnly",
+                        "topics": [                            
+                            "0",
+                            "sc:vault"
+                        ],
+                        "data": [
+                            "str:ExecuteOnDestContext",
+                            "str:echo_arguments",
+                            "1",
+                            "2"
+                        ]
+                    },
                     {
                         "address": "sc:forwarder",
                         "endpoint": "str:echo_arguments_sync_twice",
                         "topics": [
                             "str:echo_arguments_sync_result"
                         ],
-                        "data": {
-                            "0-echoed-args": [
-                                "biguint:1",
-                                "biguint:2"
-                            ]
-                        }
+                        "data": [
+                            {
+                                "0-echoed-args": [
+                                    "biguint:1",
+                                    "biguint:2"
+                                ]
+                            }
+                        ]
+                    },
+                    {
+                        "address": "sc:forwarder",
+                        "endpoint": "str:transferValueOnly",
+                        "topics": [                            
+                            "0",
+                            "sc:vault"
+                        ],
+                        "data": [
+                            "str:ExecuteOnDestContext",
+                            "str:echo_arguments",
+                            "1",
+                            "2"
+                        ]
                     },
                     {
                         "address": "sc:forwarder",
@@ -95,12 +141,14 @@
                         "topics": [
                             "str:echo_arguments_sync_result"
                         ],
-                        "data": {
-                            "0-echoed-args": [
-                                "biguint:1",
-                                "biguint:2"
-                            ]
-                        }
+                        "data": [
+                            {
+                                "0-echoed-args": [
+                                    "biguint:1",
+                                    "biguint:2"
+                                ]
+                            }
+                        ]
                     }
                 ],
                 "gas": "*",
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..7ebb0314f8 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
@@ -50,17 +50,21 @@
                             "str:EGLD",
                             "1"
                         ],
-                        "data": "1"
+                        "data": [
+                            "1"
+                        ]
                     },
                     {
-                        "address": "*",
+                        "address": "sc:recursive-caller",
                         "endpoint": "str:transferValueOnly",
-                        "topics": [
-                            "sc:recursive-caller",
-                            "sc:vault",
-                            "1"
+                        "topics": [                            
+                            "1",
+                            "sc:vault"
                         ],
-                        "data": ""
+                        "data": [
+                            "str:AsyncCall",
+                            "str:accept_funds"
+                        ]
                     },
                     {
                         "address": "sc:vault",
@@ -69,7 +73,22 @@
                             "str:accept_funds",
                             "1"
                         ],
-                        "data": ""
+                        "data": [
+                            ""
+                        ]
+                    },
+                    {
+                        "address": "sc:vault",
+                        "endpoint": "str:transferValueOnly",
+                        "topics": [                            
+                            "0",
+                            "sc:recursive-caller"
+                        ],
+                        "data": [
+                            "str:AsyncCallback",
+                            "str:callBack",
+                            "0x00"
+                        ]
                     },
                     {
                         "address": "sc:recursive-caller",
@@ -80,7 +99,9 @@
                             "str:EGLD",
                             "1"
                         ],
-                        "data": "1"
+                        "data": [
+                            "1"
+                        ]
                     }
                 ],
                 "gas": "*",
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..c510375757 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
@@ -53,18 +53,26 @@
                             "str:REC-TOKEN",
                             "1"
                         ],
-                        "data": "1"
+                        "data": [
+                            "1"
+                        ]
                     },
                     {
                         "address": "sc:recursive-caller",
                         "endpoint": "str:ESDTTransfer",
-                        "topics": [
+                        "topics": [                            
                             "str:REC-TOKEN",
                             "",
                             "1",
                             "sc:vault"
                         ],
-                        "data": ""
+                        "data": [
+                            "str:AsyncCall",
+                            "str:ESDTTransfer",
+                            "str:REC-TOKEN",
+                            "1",
+                            "str:accept_funds"
+                        ]
                     },
                     {
                         "address": "sc:vault",
@@ -76,7 +84,22 @@
                             "0",
                             "1"
                         ],
-                        "data": ""
+                        "data": [
+                            ""
+                        ]
+                    },
+                    {
+                        "address": "sc:vault",
+                        "endpoint": "str:transferValueOnly",
+                        "topics": [                            
+                            "0",
+                            "sc:recursive-caller"
+                        ],
+                        "data": [
+                            "str:AsyncCallback",
+                            "str:callBack",
+                            "0x00"
+                        ]
                     },
                     {
                         "address": "sc:recursive-caller",
@@ -87,7 +110,9 @@
                             "str:REC-TOKEN",
                             "1"
                         ],
-                        "data": "1"
+                        "data": [
+                            "1"
+                        ]
                     }
                 ],
                 "gas": "*",
diff --git a/contracts/feature-tests/composability/scenarios/send_esdt.scen.json b/contracts/feature-tests/composability/scenarios/send_esdt.scen.json
index 09b6573a82..2cb6e9a23f 100644
--- a/contracts/feature-tests/composability/scenarios/send_esdt.scen.json
+++ b/contracts/feature-tests/composability/scenarios/send_esdt.scen.json
@@ -5,7 +5,7 @@
         {
             "step": "setState",
             "accounts": {
-                "sc:basic-features": {
+                "sc:forwarder": {
                     "nonce": "1000",
                     "balance": "0",
                     "esdt": {
@@ -24,7 +24,7 @@
             "id": "not-enough",
             "tx": {
                 "from": "address:an_account",
-                "to": "sc:basic-features",
+                "to": "sc:forwarder",
                 "function": "send_esdt",
                 "arguments": [
                     "address:an_account",
@@ -46,7 +46,7 @@
             "id": "send_esdt-ok",
             "tx": {
                 "from": "address:an_account",
-                "to": "sc:basic-features",
+                "to": "sc:forwarder",
                 "function": "send_esdt",
                 "arguments": [
                     "address:an_account",
@@ -61,15 +61,20 @@
                 "status": "",
                 "logs": [
                     {
-                        "address": "sc:basic-features",
+                        "address": "sc:forwarder",
                         "endpoint": "str:ESDTTransfer",
-                        "topics": [
+                        "topics": [                            
                             "str:SENDESDT",
-                            "",
+                            "0",
                             "200",
                             "address:an_account"
                         ],
-                        "data": ""
+                        "data": [
+                            "str:DirectCall",
+                            "str:ESDTTransfer",
+                            "str:SENDESDT",
+                            "200"
+                        ]
                     }
                 ]
             }
@@ -77,7 +82,7 @@
         {
             "step": "checkState",
             "accounts": {
-                "sc:basic-features": {
+                "sc:forwarder": {
                     "nonce": "1000",
                     "balance": "0",
                     "esdt": {
diff --git a/vm/src/tx_execution/builtin_function_mocks/transfer/esdt_multi_transfer_mock.rs b/vm/src/tx_execution/builtin_function_mocks/transfer/esdt_multi_transfer_mock.rs
index ea891d8079..d08f955134 100644
--- a/vm/src/tx_execution/builtin_function_mocks/transfer/esdt_multi_transfer_mock.rs
+++ b/vm/src/tx_execution/builtin_function_mocks/transfer/esdt_multi_transfer_mock.rs
@@ -1,6 +1,7 @@
 use crate::{
     tx_execution::{builtin_function_names::ESDT_MULTI_TRANSFER_FUNC_NAME, BlockchainVMRef},
-    types::top_decode_u64,
+    tx_mock::TxLog,
+    types::{top_decode_u64, top_encode_u64},
 };
 
 use crate::{
@@ -12,8 +13,8 @@ use crate::{
 use super::{
     super::BuiltinFunction,
     transfer_common::{
-        execute_transfer_builtin_func, extract_transfer_info, ParsedTransferBuiltinFunCall,
-        RawEsdtTransfer,
+        execute_transfer_builtin_func, extract_transfer_info, push_func_name_if_necessary,
+        push_transfer_bytes, ParsedTransferBuiltinFunCall, RawEsdtTransfer,
     },
 };
 
@@ -44,7 +45,8 @@ impl BuiltinFunction for ESDTMultiTransfer {
     {
         match try_parse_input(&tx_input) {
             Ok(parsed_tx) => {
-                execute_transfer_builtin_func(vm, parsed_tx, self.name(), tx_input, tx_cache, f)
+                let log = build_log(&tx_input, &parsed_tx);
+                execute_transfer_builtin_func(vm, parsed_tx, tx_input, tx_cache, log, f)
             },
             Err(message) => {
                 let err_result = TxResult::from_vm_error(message);
@@ -54,6 +56,27 @@ impl BuiltinFunction for ESDTMultiTransfer {
     }
 }
 
+fn build_log(tx_input: &TxInput, call: &ParsedTransferBuiltinFunCall) -> TxLog {
+    let mut topics = Vec::new();
+    push_transfer_bytes(&call.raw_esdt_transfers, &mut topics);
+    topics.push(call.destination.to_vec());
+
+    let mut data = Vec::new();
+    data.push(tx_input.call_type.to_log_bytes());
+    data.push(ESDT_MULTI_TRANSFER_FUNC_NAME.into());
+    data.push(call.destination.to_vec());
+    data.push(top_encode_u64(call.raw_esdt_transfers.len() as u64));
+    push_transfer_bytes(&call.raw_esdt_transfers, &mut data);
+    push_func_name_if_necessary(tx_input.call_type, &call.func_name, &mut data);
+
+    TxLog {
+        address: tx_input.from.clone(),
+        endpoint: ESDT_MULTI_TRANSFER_FUNC_NAME.into(),
+        topics,
+        data,
+    }
+}
+
 fn try_parse_input(tx_input: &TxInput) -> Result<ParsedTransferBuiltinFunCall, &'static str> {
     if tx_input.args.len() < 2 {
         return Err("MultiESDTNFTTransfer too few arguments");
diff --git a/vm/src/tx_execution/builtin_function_mocks/transfer/esdt_nft_transfer_mock.rs b/vm/src/tx_execution/builtin_function_mocks/transfer/esdt_nft_transfer_mock.rs
index 9cd55bda73..08edf67227 100644
--- a/vm/src/tx_execution/builtin_function_mocks/transfer/esdt_nft_transfer_mock.rs
+++ b/vm/src/tx_execution/builtin_function_mocks/transfer/esdt_nft_transfer_mock.rs
@@ -3,15 +3,15 @@ use crate::{
         builtin_function_names::ESDT_NFT_TRANSFER_FUNC_NAME, BlockchainVMRef,
         BuiltinFunctionEsdtTransferInfo,
     },
-    tx_mock::{BlockchainUpdate, TxCache, TxInput, TxResult},
+    tx_mock::{BlockchainUpdate, TxCache, TxInput, TxLog, TxResult},
     types::VMAddress,
 };
 
 use super::{
     super::BuiltinFunction,
     transfer_common::{
-        execute_transfer_builtin_func, extract_transfer_info, ParsedTransferBuiltinFunCall,
-        RawEsdtTransfer,
+        execute_transfer_builtin_func, extract_transfer_info, push_func_name_if_necessary,
+        push_transfer_bytes, ParsedTransferBuiltinFunCall, RawEsdtTransfer,
     },
 };
 
@@ -42,7 +42,8 @@ impl BuiltinFunction for ESDTNftTransfer {
     {
         match try_parse_input(&tx_input) {
             Ok(parsed_tx) => {
-                execute_transfer_builtin_func(vm, parsed_tx, self.name(), tx_input, tx_cache, f)
+                let log = build_log(&tx_input, &parsed_tx);
+                execute_transfer_builtin_func(vm, parsed_tx, tx_input, tx_cache, log, f)
             },
             Err(message) => {
                 let err_result = TxResult::from_vm_error(message);
@@ -52,6 +53,27 @@ impl BuiltinFunction for ESDTNftTransfer {
     }
 }
 
+fn build_log(tx_input: &TxInput, call: &ParsedTransferBuiltinFunCall) -> TxLog {
+    let mut topics = Vec::new();
+    push_transfer_bytes(&call.raw_esdt_transfers, &mut topics);
+    topics.push(call.destination.to_vec());
+
+    let mut data = Vec::new();
+
+    data.push(tx_input.call_type.to_log_bytes());
+    data.push(ESDT_NFT_TRANSFER_FUNC_NAME.into());
+    push_transfer_bytes(&call.raw_esdt_transfers, &mut data);
+    data.push(call.destination.to_vec());
+    push_func_name_if_necessary(tx_input.call_type, &call.func_name, &mut data);
+
+    TxLog {
+        address: tx_input.from.clone(),
+        endpoint: ESDT_NFT_TRANSFER_FUNC_NAME.into(),
+        topics,
+        data,
+    }
+}
+
 fn try_parse_input(tx_input: &TxInput) -> Result<ParsedTransferBuiltinFunCall, &'static str> {
     if tx_input.args.len() < 4 {
         return Err("ESDTNFTTransfer too few arguments");
diff --git a/vm/src/tx_execution/builtin_function_mocks/transfer/esdt_transfer_mock.rs b/vm/src/tx_execution/builtin_function_mocks/transfer/esdt_transfer_mock.rs
index f9bd268ddf..7b811a6bd5 100644
--- a/vm/src/tx_execution/builtin_function_mocks/transfer/esdt_transfer_mock.rs
+++ b/vm/src/tx_execution/builtin_function_mocks/transfer/esdt_transfer_mock.rs
@@ -3,14 +3,14 @@ use crate::{
         builtin_function_names::ESDT_TRANSFER_FUNC_NAME, BlockchainVMRef,
         BuiltinFunctionEsdtTransferInfo,
     },
-    tx_mock::{BlockchainUpdate, TxCache, TxInput, TxResult},
+    tx_mock::{BlockchainUpdate, TxCache, TxInput, TxLog, TxResult},
 };
 
 use super::{
     super::builtin_func_trait::BuiltinFunction,
     transfer_common::{
-        execute_transfer_builtin_func, extract_transfer_info, ParsedTransferBuiltinFunCall,
-        RawEsdtTransfer,
+        execute_transfer_builtin_func, extract_transfer_info, push_func_name_if_necessary,
+        push_transfer_bytes, ParsedTransferBuiltinFunCall, RawEsdtTransfer,
     },
 };
 
@@ -41,7 +41,8 @@ impl BuiltinFunction for ESDTTransfer {
     {
         match try_parse_input(&tx_input) {
             Ok(parsed_tx) => {
-                execute_transfer_builtin_func(vm, parsed_tx, self.name(), tx_input, tx_cache, f)
+                let log = build_log(&tx_input, &parsed_tx);
+                execute_transfer_builtin_func(vm, parsed_tx, tx_input, tx_cache, log, f)
             },
             Err(message) => {
                 let err_result = TxResult::from_vm_error(message);
@@ -51,6 +52,26 @@ impl BuiltinFunction for ESDTTransfer {
     }
 }
 
+fn build_log(tx_input: &TxInput, call: &ParsedTransferBuiltinFunCall) -> TxLog {
+    let mut topics = Vec::new();
+    push_transfer_bytes(&call.raw_esdt_transfers, &mut topics);
+    topics.push(call.destination.to_vec());
+
+    let mut data = Vec::new();
+    data.push(tx_input.call_type.to_log_bytes());
+    data.push(ESDT_TRANSFER_FUNC_NAME.into());
+    data.push(call.raw_esdt_transfers[0].token_identifier.clone());
+    data.push(call.raw_esdt_transfers[0].value_bytes.clone());
+    push_func_name_if_necessary(tx_input.call_type, &call.func_name, &mut data);
+
+    TxLog {
+        address: tx_input.from.clone(),
+        endpoint: ESDT_TRANSFER_FUNC_NAME.into(),
+        topics,
+        data,
+    }
+}
+
 fn try_parse_input(tx_input: &TxInput) -> Result<ParsedTransferBuiltinFunCall, &'static str> {
     if tx_input.args.len() < 2 {
         return Err("ESDTTransfer too few arguments");
diff --git a/vm/src/tx_execution/builtin_function_mocks/transfer/transfer_common.rs b/vm/src/tx_execution/builtin_function_mocks/transfer/transfer_common.rs
index 089ca8e18e..b7023a965c 100644
--- a/vm/src/tx_execution/builtin_function_mocks/transfer/transfer_common.rs
+++ b/vm/src/tx_execution/builtin_function_mocks/transfer/transfer_common.rs
@@ -4,7 +4,8 @@ use crate::{
         BlockchainVMRef,
     },
     tx_mock::{
-        BlockchainUpdate, TxCache, TxFunctionName, TxInput, TxLog, TxResult, TxTokenTransfer,
+        BlockchainUpdate, CallType, TxCache, TxFunctionName, TxInput, TxLog, TxResult,
+        TxTokenTransfer,
     },
     types::{top_decode_u64, VMAddress},
 };
@@ -24,6 +25,15 @@ pub(super) struct RawEsdtTransfer {
     pub value_bytes: Vec<u8>,
 }
 
+/// Convenience function for populating log topics and data with transfer fields as bytes.
+pub(super) fn push_transfer_bytes(transfers: &[RawEsdtTransfer], dest: &mut Vec<Vec<u8>>) {
+    for transfer in transfers {
+        dest.push(transfer.token_identifier.clone());
+        dest.push(transfer.nonce_bytes.clone());
+        dest.push(transfer.value_bytes.clone());
+    }
+}
+
 pub(super) fn process_raw_esdt_transfer(raw_esdt_transfer: RawEsdtTransfer) -> TxTokenTransfer {
     TxTokenTransfer {
         token_identifier: raw_esdt_transfer.token_identifier,
@@ -51,29 +61,14 @@ pub(super) fn extract_transfer_info(
 pub(super) fn execute_transfer_builtin_func<F>(
     vm: &BlockchainVMRef,
     parsed_tx: ParsedTransferBuiltinFunCall,
-    builtin_function_name: &str,
     tx_input: TxInput,
     tx_cache: TxCache,
+    log: TxLog,
     f: F,
 ) -> (TxResult, BlockchainUpdate)
 where
     F: FnOnce(),
 {
-    let mut builtin_logs = Vec::new();
-    for raw_esdt_transfer in &parsed_tx.raw_esdt_transfers {
-        builtin_logs.push(TxLog {
-            address: tx_input.from.clone(),
-            endpoint: builtin_function_name.into(),
-            topics: vec![
-                raw_esdt_transfer.token_identifier.clone(),
-                raw_esdt_transfer.nonce_bytes.clone(),
-                raw_esdt_transfer.value_bytes.clone(),
-                parsed_tx.destination.to_vec(),
-            ],
-            data: vec![],
-        });
-    }
-
     let exec_input = TxInput {
         from: tx_input.from,
         to: parsed_tx.destination,
@@ -90,7 +85,24 @@ where
     let (mut tx_result, blockchain_updates) = vm.default_execution(exec_input, tx_cache, f);
 
     // prepends esdt log
-    tx_result.result_logs = [builtin_logs.as_slice(), tx_result.result_logs.as_slice()].concat();
+    // tx_result.result_logs = [builtin_logs.as_slice(), tx_result.result_logs.as_slice()].concat();
+    tx_result.result_logs.insert(0, log);
 
     (tx_result, blockchain_updates)
 }
+
+pub(super) fn push_func_name_if_necessary(
+    call_type: CallType,
+    func_name: &TxFunctionName,
+    data: &mut Vec<Vec<u8>>,
+) {
+    if call_type == CallType::DirectCall {
+        return;
+    }
+
+    if func_name.is_empty() {
+        return;
+    }
+
+    data.push(func_name.clone().into_bytes());
+}
diff --git a/vm/src/tx_execution/exec_call.rs b/vm/src/tx_execution/exec_call.rs
index 35d3536fe4..ca02d33f60 100644
--- a/vm/src/tx_execution/exec_call.rs
+++ b/vm/src/tx_execution/exec_call.rs
@@ -1,8 +1,8 @@
 use crate::{
     tx_mock::{
         async_call_tx_input, async_callback_tx_input, async_promise_tx_input, merge_results,
-        AsyncCallTxData, BlockchainUpdate, Promise, TxCache, TxContext, TxContextStack, TxInput,
-        TxPanic, TxResult, TxResultCalls,
+        AsyncCallTxData, BlockchainUpdate, CallType, Promise, TxCache, TxContext, TxContextStack,
+        TxInput, TxPanic, TxResult, TxResultCalls,
     },
     types::VMAddress,
     with_shared::Shareable,
@@ -105,7 +105,7 @@ impl BlockchainVMRef {
         state: &mut Shareable<BlockchainState>,
     ) -> (TxResult, TxResult) {
         if state.accounts.contains_key(&async_data.to) {
-            let async_input = async_call_tx_input(&async_data);
+            let async_input = async_call_tx_input(&async_data, CallType::AsyncCall);
 
             let async_result = self.sc_call_with_async_and_callback(
                 async_input,
@@ -188,7 +188,7 @@ impl BlockchainVMRef {
         state: &mut Shareable<BlockchainState>,
     ) -> (TxResult, TxResult) {
         if state.accounts.contains_key(&promise.call.to) {
-            let async_input = async_call_tx_input(&promise.call);
+            let async_input = async_call_tx_input(&promise.call, CallType::AsyncCall);
             let async_result = self.sc_call_with_async_and_callback(
                 async_input,
                 state,
diff --git a/vm/src/tx_execution/exec_general_tx.rs b/vm/src/tx_execution/exec_general_tx.rs
index 3fd572abd4..f2c76bdafb 100644
--- a/vm/src/tx_execution/exec_general_tx.rs
+++ b/vm/src/tx_execution/exec_general_tx.rs
@@ -3,10 +3,10 @@ use num_traits::Zero;
 use crate::{
     tx_execution::execute_system_sc,
     tx_mock::{
-        BlockchainUpdate, TxCache, TxContext, TxContextStack, TxFunctionName, TxInput, TxLog,
-        TxResult,
+        BlockchainUpdate, CallType, TxCache, TxContext, TxContextStack, TxFunctionName, TxInput,
+        TxLog, TxResult,
     },
-    types::VMAddress,
+    types::{top_encode_big_uint, VMAddress},
     with_shared::Shareable,
 };
 
@@ -27,6 +27,33 @@ fn should_execute_sc_call(tx_input: &TxInput) -> bool {
     !tx_input.func_name.is_empty()
 }
 
+fn should_add_transfer_value_log(tx_input: &TxInput) -> bool {
+    if tx_input.call_type != CallType::DirectCall {
+        return true;
+    }
+
+    // skip for transactions coming directly from scenario json, which should all be coming from user wallets
+    tx_input.from.is_smart_contract_address() && !tx_input.egld_value.is_zero()
+}
+
+fn create_transfer_value_log(tx_input: &TxInput) -> TxLog {
+    let mut data = vec![
+        tx_input.call_type.to_log_bytes(),
+        tx_input.func_name.to_bytes(),
+    ];
+    data.append(&mut tx_input.args.clone());
+
+    TxLog {
+        address: tx_input.from.clone(),
+        endpoint: "transferValueOnly".into(),
+        topics: vec![
+            top_encode_big_uint(&tx_input.egld_value),
+            tx_input.to.to_vec(),
+        ],
+        data,
+    }
+}
+
 impl BlockchainVMRef {
     /// Executes without builtin functions, directly on the contract or the given lambda closure.
     pub fn default_execution<F>(
@@ -44,21 +71,8 @@ impl BlockchainVMRef {
             return (TxResult::from_panic_obj(&err), BlockchainUpdate::empty());
         }
 
-        // skip for transactions coming directly from scenario json, which should all be coming from user wallets
-        // TODO: reorg context logic
-        let add_transfer_log =
-            tx_input.from.is_smart_contract_address() && !tx_input.egld_value.is_zero();
-        let transfer_value_log = if add_transfer_log {
-            Some(TxLog {
-                address: VMAddress::zero(), // TODO: figure out the real VM behavior
-                endpoint: "transferValueOnly".into(),
-                topics: vec![
-                    tx_input.from.to_vec(),
-                    tx_input.to.to_vec(),
-                    tx_input.egld_value.to_bytes_be(),
-                ],
-                data: Vec::new(),
-            })
+        let transfer_value_log = if should_add_transfer_value_log(&tx_input) {
+            Some(create_transfer_value_log(&tx_input))
         } else {
             None
         };
diff --git a/vm/src/tx_mock.rs b/vm/src/tx_mock.rs
index ae2697aad8..6c4415bcd4 100644
--- a/vm/src/tx_mock.rs
+++ b/vm/src/tx_mock.rs
@@ -11,6 +11,7 @@ mod tx_context;
 mod tx_context_ref;
 mod tx_context_stack;
 mod tx_input;
+mod tx_input_call_type;
 mod tx_input_function;
 mod tx_log;
 mod tx_managed_types;
@@ -28,6 +29,7 @@ pub use tx_context::*;
 pub use tx_context_ref::*;
 pub use tx_context_stack::*;
 pub use tx_input::*;
+pub use tx_input_call_type::CallType;
 pub use tx_input_function::*;
 pub use tx_log::*;
 pub use tx_managed_types::*;
diff --git a/vm/src/tx_mock/tx_async_call_data.rs b/vm/src/tx_mock/tx_async_call_data.rs
index 2a7e0af46e..d332643272 100644
--- a/vm/src/tx_mock/tx_async_call_data.rs
+++ b/vm/src/tx_mock/tx_async_call_data.rs
@@ -6,7 +6,7 @@ use crate::{
 
 use num_bigint::BigUint;
 
-use super::{CallbackPayments, Promise, TxFunctionName};
+use super::{CallType, CallbackPayments, Promise, TxFunctionName};
 
 #[derive(Debug, Clone)]
 pub struct AsyncCallTxData {
@@ -18,7 +18,7 @@ pub struct AsyncCallTxData {
     pub tx_hash: H256,
 }
 
-pub fn async_call_tx_input(async_call: &AsyncCallTxData) -> TxInput {
+pub fn async_call_tx_input(async_call: &AsyncCallTxData, call_type: CallType) -> TxInput {
     TxInput {
         from: async_call.from.clone(),
         to: async_call.to.clone(),
@@ -26,6 +26,7 @@ pub fn async_call_tx_input(async_call: &AsyncCallTxData) -> TxInput {
         esdt_values: Vec::new(),
         func_name: async_call.endpoint_name.clone(),
         args: async_call.arguments.clone(),
+        call_type,
         gas_limit: 1000,
         gas_price: 0,
         tx_hash: async_call.tx_hash.clone(),
@@ -61,6 +62,7 @@ pub fn async_callback_tx_input(
         esdt_values: Vec::new(),
         func_name: TxFunctionName::CALLBACK,
         args,
+        call_type: CallType::AsyncCallback,
         gas_limit: 1000,
         gas_price: 0,
         tx_hash: async_data.tx_hash.clone(),
@@ -76,7 +78,7 @@ fn extract_callback_payments(
 ) -> CallbackPayments {
     let mut callback_payments = CallbackPayments::default();
     for async_call in &async_result.all_calls {
-        let tx_input = async_call_tx_input(async_call);
+        let tx_input = async_call_tx_input(async_call, CallType::AsyncCall);
         let token_transfers = builtin_functions.extract_token_transfers(&tx_input);
         if &token_transfers.real_recipient == callback_contract_address {
             if !token_transfers.is_empty() {
diff --git a/vm/src/tx_mock/tx_input.rs b/vm/src/tx_mock/tx_input.rs
index cf16bbab8e..bbdfb93ae2 100644
--- a/vm/src/tx_mock/tx_input.rs
+++ b/vm/src/tx_mock/tx_input.rs
@@ -7,7 +7,7 @@ use crate::{
 };
 use std::fmt;
 
-use super::TxFunctionName;
+use super::{CallType, TxFunctionName};
 
 #[derive(Clone, Debug)]
 pub struct TxInput {
@@ -17,6 +17,7 @@ pub struct TxInput {
     pub esdt_values: Vec<TxTokenTransfer>,
     pub func_name: TxFunctionName,
     pub args: Vec<Vec<u8>>,
+    pub call_type: CallType,
     pub gas_limit: u64,
     pub gas_price: u64,
     pub tx_hash: H256,
@@ -33,6 +34,7 @@ impl Default for TxInput {
             esdt_values: Vec::new(),
             func_name: TxFunctionName::EMPTY,
             args: Vec::new(),
+            call_type: CallType::DirectCall,
             gas_limit: 0,
             gas_price: 0,
             tx_hash: H256::zero(),
diff --git a/vm/src/tx_mock/tx_input_call_type.rs b/vm/src/tx_mock/tx_input_call_type.rs
new file mode 100644
index 0000000000..1c9312173a
--- /dev/null
+++ b/vm/src/tx_mock/tx_input_call_type.rs
@@ -0,0 +1,24 @@
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum CallType {
+    DirectCall,
+    ExecuteOnDestContext,
+    AsyncCall,
+    AsyncCallback,
+    // TransferExecute,
+}
+
+impl CallType {
+    pub fn to_log_bytes(&self) -> Vec<u8> {
+        self.as_log_str().into()
+    }
+
+    fn as_log_str(&self) -> &'static str {
+        match self {
+            Self::DirectCall => "DirectCall",
+            Self::ExecuteOnDestContext => "ExecuteOnDestContext",
+            Self::AsyncCall => "AsyncCall",
+            Self::AsyncCallback => "AsyncCallback",
+            // Self::TransferExecute => "DirectCall",
+        }
+    }
+}
diff --git a/vm/src/tx_mock/tx_input_function.rs b/vm/src/tx_mock/tx_input_function.rs
index 7616ba5753..1988a02832 100644
--- a/vm/src/tx_mock/tx_input_function.rs
+++ b/vm/src/tx_mock/tx_input_function.rs
@@ -71,6 +71,10 @@ impl TxFunctionName {
         self.into_string().into_bytes()
     }
 
+    pub fn to_bytes(&self) -> Vec<u8> {
+        self.0.as_bytes().to_vec()
+    }
+
     pub fn as_str(&self) -> &str {
         &self.0
     }
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 b94aeecc2a..e5bddb3b24 100644
--- a/vm/src/vm_hooks/vh_impl/vh_debug_api.rs
+++ b/vm/src/vm_hooks/vh_impl/vh_debug_api.rs
@@ -5,8 +5,8 @@ use multiversx_chain_vm_executor::BreakpointValue;
 use crate::{
     tx_execution::execute_current_tx_context_input,
     tx_mock::{
-        async_call_tx_input, AsyncCallTxData, BlockchainUpdate, TxCache, TxContext, TxFunctionName,
-        TxInput, TxManagedTypes, TxPanic, TxResult,
+        async_call_tx_input, AsyncCallTxData, BlockchainUpdate, CallType, TxCache, TxContext,
+        TxFunctionName, TxInput, TxManagedTypes, TxPanic, TxResult,
     },
     types::{VMAddress, VMCodeMetadata},
     vm_err_msg,
@@ -114,7 +114,7 @@ impl VMHooksHandlerSource for DebugApiVMHooksHandler {
         arguments: Vec<Vec<u8>>,
     ) -> Vec<Vec<u8>> {
         let async_call_data = self.create_async_call_data(to, egld_value, func_name, arguments);
-        let tx_input = async_call_tx_input(&async_call_data);
+        let tx_input = async_call_tx_input(&async_call_data, CallType::ExecuteOnDestContext);
         let tx_cache = TxCache::new(self.0.blockchain_cache_arc());
         let (tx_result, blockchain_updates) = self.0.vm_ref.execute_builtin_function_or_default(
             tx_input,
@@ -179,7 +179,7 @@ impl VMHooksHandlerSource for DebugApiVMHooksHandler {
         arguments: Vec<Vec<u8>>,
     ) {
         let async_call_data = self.create_async_call_data(to, egld_value, func_name, arguments);
-        let tx_input = async_call_tx_input(&async_call_data);
+        let tx_input = async_call_tx_input(&async_call_data, CallType::DirectCall);
         let tx_cache = TxCache::new(self.0.blockchain_cache_arc());
         let (tx_result, blockchain_updates) = self.0.vm_ref.execute_builtin_function_or_default(
             tx_input,

From a9c21a2b6955b827b8ca0a897eba512640304dee Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Sun, 17 Sep 2023 05:21:43 +0300
Subject: [PATCH 0019/1254] event log update, version 2

---
 .../promises_call_async_accept_egld.scen.json |  20 ++--
 .../promises_call_async_accept_esdt.scen.json |  18 ++-
 ...romises_call_async_retrieve_egld.scen.json |  50 +++++++--
 ...romises_call_async_retrieve_esdt.scen.json |  36 +++++-
 .../promises_call_callback_directly.scen.json |   2 +-
 .../promises_multi_transfer.scen.json         | 103 +++++++++++++++++-
 .../promises_single_transfer.scen.json        |  86 +++++++++++++--
 .../promises_single_transfer_gas1.scen.json   |   2 +-
 .../promises_single_transfer_gas2.scen.json   |  26 ++++-
 ...rwarder_call_async_retrieve_egld.scen.json |  20 +++-
 ...rwarder_call_async_retrieve_esdt.scen.json |   2 +-
 ...orwarder_call_async_retrieve_nft.scen.json |   2 +-
 ...orwarder_call_sync_retrieve_egld.scen.json |   7 +-
 ...orwarder_call_sync_retrieve_esdt.scen.json |   2 +-
 ...forwarder_call_sync_retrieve_nft.scen.json |   2 +-
 ...der_call_transf_exec_accept_egld.scen.json |   2 +-
 ...ll_transf_exec_accept_egld_twice.scen.json |   4 +-
 ...der_call_transf_exec_accept_esdt.scen.json |   5 +-
 ...ll_transf_exec_accept_esdt_twice.scen.json |  10 +-
 ...ransf_exec_accept_multi_transfer.scen.json |   5 +-
 ...rder_call_transf_exec_accept_nft.scen.json |   5 +-
 ...transf_exec_accept_return_values.scen.json |   2 +-
 ...all_transf_exec_accept_sft_twice.scen.json |  10 +-
 .../transfer/esdt_multi_transfer_mock.rs      |  10 +-
 .../transfer/esdt_nft_transfer_mock.rs        |  10 +-
 .../transfer/esdt_transfer_mock.rs            |  10 +-
 .../transfer/transfer_common.rs               |  11 ++
 vm/src/tx_mock/tx_context.rs                  |   7 +-
 vm/src/tx_mock/tx_input_call_type.rs          |   4 +-
 29 files changed, 378 insertions(+), 95 deletions(-)

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..d1dd536084 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
@@ -21,7 +21,7 @@
         },
         {
             "step": "scCall",
-            "txId": "1",
+            "id": "1",
             "tx": {
                 "from": "address:a_user",
                 "to": "sc:forwarder",
@@ -38,14 +38,16 @@
                 "status": "0",
                 "logs": [
                     {
-                        "address": "sc:vault",
+                        "address": "sc:forwarder",
                         "endpoint": "str:transferValueOnly",
-                        "topics": [
-                            "sc:forwarder",
-                            "sc:vault",
-                            "1000"
+                        "topics": [                            
+                            "1000",
+                            "sc:vault"
                         ],
-                        "data": ""
+                        "data": [
+                            "str:AsyncCall",
+                            "str:accept_funds"
+                        ]
                     },
                     {
                         "address": "sc:vault",
@@ -54,7 +56,9 @@
                             "str:accept_funds",
                             "1000"
                         ],
-                        "data": ""
+                        "data": [
+                            ""
+                        ]
                     }
                 ],
                 "gas": "*",
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..b5b4fd302d 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
@@ -24,7 +24,7 @@
         },
         {
             "step": "scCall",
-            "txId": "1",
+            "id": "1",
             "tx": {
                 "from": "address:a_user",
                 "to": "sc:forwarder",
@@ -48,13 +48,19 @@
                     {
                         "address": "sc:forwarder",
                         "endpoint": "str:ESDTTransfer",
-                        "topics": [
+                        "topics": [                            
                             "str:TEST-TOKENA",
-                            "",
+                            "0",
                             "1000",
                             "sc:vault"
                         ],
-                        "data": ""
+                        "data": [
+                            "str:AsyncCall",
+                            "str:ESDTTransfer",
+                            "str:TEST-TOKENA",
+                            "1000",
+                            "str:accept_funds"
+                        ]
                     },
                     {
                         "address": "sc:vault",
@@ -66,7 +72,9 @@
                             "0",
                             "1000"
                         ],
-                        "data": ""
+                        "data": [
+                            ""
+                        ]
                     }
                 ],
                 "gas": "*",
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..de22eeabf2 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
@@ -21,7 +21,7 @@
         },
         {
             "step": "scCall",
-            "txId": "1",
+            "id": "1",
             "tx": {
                 "from": "address:a_user",
                 "to": "sc:forwarder",
@@ -39,6 +39,21 @@
                 "out": [],
                 "status": "0",
                 "logs": [
+                    {
+                        "address": "sc:forwarder",
+                        "endpoint": "str:transferValueOnly",
+                        "topics": [                            
+                            "0",
+                            "sc:vault"
+                        ],
+                        "data": [
+                            "str:AsyncCall",
+                            "str:retrieve_funds",
+                            "str:EGLD",
+                            "0",
+                            "1000"
+                        ]
+                    },
                     {
                         "address": "sc:vault",
                         "endpoint": "str:retrieve_funds",
@@ -48,17 +63,34 @@
                             "0",
                             "1000"
                         ],
-                        "data": ""
+                        "data": [
+                            ""
+                        ]
                     },
                     {
                         "address": "sc:vault",
                         "endpoint": "str:transferValueOnly",
-                        "topics": [
-                            "sc:vault",
-                            "sc:forwarder",
-                            "1000"
+                        "topics": [                            
+                            "1000",
+                            "sc:forwarder"
                         ],
-                        "data": ""
+                        "data": [
+                            "str:BackTransfer",
+                            ""
+                        ]
+                    },
+                    {
+                        "address": "sc:vault",
+                        "endpoint": "str:transferValueOnly",
+                        "topics": [                            
+                            "1000",
+                            "sc:forwarder"
+                        ],
+                        "data": [
+                            "str:AsyncCallback",
+                            "str:retrieve_funds_callback",
+                            "0x00"
+                        ]
                     },
                     {
                         "address": "sc:forwarder",
@@ -69,7 +101,9 @@
                             "0",
                             "1000"
                         ],
-                        "data": ""
+                        "data": [
+                            ""
+                        ]
                     }
                 ],
                 "gas": "*",
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..be292d045f 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
@@ -24,7 +24,7 @@
         },
         {
             "step": "scCall",
-            "txId": "1",
+            "id": "1",
             "tx": {
                 "from": "address:a_user",
                 "to": "sc:forwarder",
@@ -42,6 +42,21 @@
                 "out": [],
                 "status": "0",
                 "logs": [
+                    {
+                        "address": "sc:forwarder",
+                        "endpoint": "str:transferValueOnly",
+                        "topics": [                            
+                            "",
+                            "sc:vault"
+                        ],
+                        "data": [
+                            "str:AsyncCall",
+                            "str:retrieve_funds",
+                            "str:TEST-TOKENA",
+                            "0",
+                            "1000"
+                        ]
+                    },
                     {
                         "address": "sc:vault",
                         "endpoint": "str:retrieve_funds",
@@ -51,18 +66,25 @@
                             "0",
                             "1000"
                         ],
-                        "data": ""
+                        "data": [
+                            ""
+                        ]
                     },
                     {
                         "address": "sc:vault",
                         "endpoint": "str:ESDTTransfer",
-                        "topics": [
+                        "topics": [                            
                             "str:TEST-TOKENA",
-                            "",
+                            "0",
                             "1000",
                             "sc:forwarder"
                         ],
-                        "data": ""
+                        "data": [
+                            "str:BackTransfer",
+                            "str:ESDTTransfer",
+                            "str:TEST-TOKENA",
+                            "1000"
+                        ]
                     },
                     {
                         "address": "sc:forwarder",
@@ -73,7 +95,9 @@
                             "0",
                             "1000"
                         ],
-                        "data": ""
+                        "data": [
+                            ""
+                        ]
                     }
                 ],
                 "gas": "*",
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..52f9dba428 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
@@ -16,7 +16,7 @@
         },
         {
             "step": "scCall",
-            "txId": "1",
+            "id": "1",
             "tx": {
                 "from": "address:a_user",
                 "to": "sc:forwarder",
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..2efae80a87 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
@@ -77,8 +77,107 @@
                 ],
                 "status": "0",
                 "message": "",
-                "gas": "*",
-                "refund": "*"
+                "logs": [
+                    {
+                        "address": "sc:promises",
+                        "endpoint": "str:MultiESDTNFTTransfer",
+                        "topics": [                            
+                            "str:FWD-TOKEN",
+                            "0",
+                            "500",
+                            "str:NFT-123456",
+                            "1",
+                            "1",
+                            "str:SFT-456789",
+                            "3",
+                            "6",
+                            "sc:vault"
+                        ],
+                        "data": [
+                            "str:AsyncCall",
+                            "str:MultiESDTNFTTransfer",
+                            "sc:vault",
+                            "3",
+                            "str:FWD-TOKEN",
+                            "0",
+                            "500",
+                            "str:NFT-123456",
+                            "1",
+                            "1",
+                            "str:SFT-456789",
+                            "3",
+                            "6",
+                            "str:accept_funds_echo_payment"
+                        ]
+                    },
+                    {
+                        "address": "sc:vault",
+                        "endpoint": "str:accept_funds_echo_payment",
+                        "topics": [
+                            "str:accept_funds",
+                            "0",
+                            "str:FWD-TOKEN",
+                            "0",
+                            "500",
+                            "str:NFT-123456",
+                            "1",
+                            "1",
+                            "str:SFT-456789",
+                            "3",
+                            "6"
+                        ],
+                        "data": [
+                            ""
+                        ]
+                    },
+                    {
+                        "address": "sc:vault",
+                        "endpoint": "str:transferValueOnly",
+                        "topics": [                            
+                            "",
+                            "sc:promises"
+                        ],
+                        "data": [
+                            "str:AsyncCallback",
+                            "str:the_one_callback",
+                            "0x00",
+                            "0",
+                            "str:FWD-TOKEN",
+                            "0",
+                            "500",
+                            "str:NFT-123456",
+                            "1",
+                            "1",
+                            "str:SFT-456789",
+                            "3",
+                            "6"
+                        ]
+                    },
+                    {
+                        "address": "sc:promises",
+                        "endpoint": "str:the_one_callback",
+                        "topics": [
+                            "str:async_call_event_callback",
+                            "2001",
+                            "2002"
+                        ],
+                        "data": [
+                            [
+                                "nested:0x00",
+                                "nested:0",
+                                "nested:str:FWD-TOKEN",
+                                "nested:0",
+                                "nested:500",
+                                "nested:str:NFT-123456",
+                                "nested:1",
+                                "nested:1",
+                                "nested:str:SFT-456789",
+                                "nested:3",
+                                "nested:6"
+                            ]
+                        ]
+                    }
+                ]
             }
         },
         {
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..ef36828800 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
@@ -90,6 +90,35 @@
                 ],
                 "status": "0",
                 "logs": [
+                    {
+                        "address": "sc:promises",
+                        "endpoint": "str:transferValueOnly",
+                        "topics": [                            
+                            "0",
+                            "sc:vault"
+                        ],
+                        "data": [
+                            "str:AsyncCall",
+                            "str:echo_arguments",
+                            "1",
+                            "2"
+                        ]
+                    },
+                    {
+                        "address": "sc:vault",
+                        "endpoint": "str:transferValueOnly",
+                        "topics": [                                                        
+                            "0",
+                            "sc:promises"
+                        ],
+                        "data": [
+                            "str:AsyncCallback",
+                            "str:the_one_callback",
+                            "0x00",
+                            "1",
+                            "2"
+                        ]
+                    },
                     {
                         "address": "sc:promises",
                         "endpoint": "str:the_one_callback",
@@ -98,11 +127,13 @@
                             "1001",
                             "1002"
                         ],
-                        "data": {
-                            "0-status": "nested:0x00",
-                            "1-arg1": "biguint:1",
-                            "2-arg2": "biguint:2"
-                        }
+                        "data": [
+                            {
+                                "0-status": "nested:0x00",
+                                "1-arg1": "biguint:1",
+                                "2-arg2": "biguint:2"
+                            }
+                        ]
                     },
                     "+"
                 ],
@@ -154,6 +185,35 @@
                 ],
                 "status": "0",
                 "logs": [
+                    {
+                        "address": "sc:promises",
+                        "endpoint": "str:transferValueOnly",
+                        "topics": [                            
+                            "0",
+                            "sc:vault"
+                        ],
+                        "data": [
+                            "str:AsyncCall",
+                            "str:echo_arguments",
+                            "1",
+                            "2"
+                        ]
+                    },
+                    {
+                        "address": "sc:vault",
+                        "endpoint": "str:transferValueOnly",
+                        "topics": [                            
+                            "0",
+                            "sc:promises"
+                        ],
+                        "data": [
+                            "str:AsyncCallback",
+                            "str:the_one_callback",
+                            "0x00",
+                            "1",
+                            "2"
+                        ]
+                    },
                     {
                         "address": "sc:promises",
                         "endpoint": "str:the_one_callback",
@@ -162,13 +222,15 @@
                             "1001",
                             "1002"
                         ],
-                        "data": {
-                            "0-status": "nested:0x00",
-                            "1-echoed-args": [
-                                "biguint:1",
-                                "biguint:2"
-                            ]
-                        }
+                        "data": [
+                            {
+                                "0-status": "nested:0x00",
+                                "1-echoed-args": [
+                                    "biguint:1",
+                                    "biguint:2"
+                                ]
+                            }
+                        ]
                     }
                 ],
                 "gas": "*",
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..d8f1290ea2 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
@@ -21,7 +21,7 @@
         },
         {
             "step": "scCall",
-            "txId": "1",
+            "id": "1",
             "tx": {
                 "from": "address:a_user",
                 "to": "sc:promises",
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..7c3321c304 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
@@ -21,7 +21,7 @@
         },
         {
             "step": "scCall",
-            "txId": "2",
+            "id": "2",
             "tx": {
                 "from": "address:a_user",
                 "to": "sc:promises",
@@ -41,6 +41,20 @@
                 "out": [],
                 "status": "0",
                 "logs": [
+                    {
+                        "address": "sc:vault",
+                        "endpoint": "str:transferValueOnly",
+                        "topics": [                            
+                            "0",
+                            "sc:promises"
+                        ],
+                        "data": [
+                            "str:AsyncCallback",
+                            "str:the_one_callback",
+                            "0x05",
+                            "str:not enough gas"
+                        ]
+                    },
                     {
                         "address": "sc:promises",
                         "endpoint": "str:the_one_callback",
@@ -49,10 +63,12 @@
                             "1001",
                             "1002"
                         ],
-                        "data": {
-                            "0-status": "biguint:5",
-                            "1-message": "nested:str:not enough gas"
-                        }
+                        "data": [
+                            {
+                                "0-status": "biguint:5",
+                                "1-message": "nested:str:not enough gas"
+                            }
+                        ]
                     },
                     "+"
                 ],
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 7537edd046..ee603e98d1 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
@@ -76,11 +76,21 @@
                             "sc:forwarder"
                         ],
                         "data": [
-                            "str:AsyncCall",
-                            "str:retrieve_funds",
-                            "str:EGLD",
-                            "0",
-                            "1000"
+                            "str:BackTransfer",
+                            "0"
+                        ]
+                    },
+                    {
+                        "address": "sc:vault",
+                        "endpoint": "str:transferValueOnly",
+                        "topics": [                            
+                            "1000",
+                            "sc:forwarder"
+                        ],
+                        "data": [
+                            "str:AsyncCallback",
+                            "str:callBack",
+                            "0x00"
                         ]
                     },
                     {
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 af660b7cf7..0e386ad6da 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
@@ -81,7 +81,7 @@
                             "sc:forwarder"
                         ],
                         "data": [
-                            "str:AsyncCall",
+                            "str:BackTransfer",
                             "str:ESDTTransfer",
                             "str:TEST-TOKENA",
                             "1000"
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 3362b0960c..48a326c284 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
@@ -88,7 +88,7 @@
                             "sc:forwarder"
                         ],
                         "data": [
-                            "str:AsyncCall",
+                            "str:BackTransfer",
                             "str:ESDTNFTTransfer",
                             "str:NFT-000001",
                             "5",
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 b8e67c3651..38a45c7e24 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
@@ -76,11 +76,8 @@
                             "sc:forwarder"
                         ],
                         "data": [
-                            "str:ExecuteOnDestContext",
-                            "str:retrieve_funds",
-                            "str:EGLD",
-                            "0",
-                            "1000"
+                            "str:BackTransfer",
+                            "0"
                         ]
                     }
                 ],
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 622c58b09e..31ad91a9f4 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
@@ -81,7 +81,7 @@
                             "sc:forwarder"
                         ],
                         "data": [
-                            "str:ExecuteOnDestContext",
+                            "str:BackTransfer",
                             "str:ESDTTransfer",
                             "str:TEST-TOKENA",
                             "1000"
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 65aa6d891f..c326dbe987 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
@@ -88,7 +88,7 @@
                             "sc:forwarder"
                         ],
                         "data": [
-                            "str:ExecuteOnDestContext",
+                            "str:BackTransfer",
                             "str:ESDTNFTTransfer",
                             "str:NFT-000001",
                             "5",
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 ceb1c5333c..cba3a8d458 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
@@ -46,7 +46,7 @@
                             "sc:vault"
                         ],
                         "data": [
-                            "str:ExecuteOnDestContext",
+                            "str:TransferAndExecute",
                             "str:accept_funds"
                         ]
                     },
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 9506a63afc..f4e1776e6b 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
@@ -46,7 +46,7 @@
                             "sc:vault"
                         ],
                         "data": [
-                            "str:ExecuteOnDestContext",
+                            "str:TransferAndExecute",
                             "str:accept_funds"
                         ]
                     },
@@ -69,7 +69,7 @@
                             "sc:vault"
                         ],
                         "data": [
-                            "str:ExecuteOnDestContext",
+                            "str:TransferAndExecute",
                             "str:accept_funds"
                         ]
                     },
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 614365bcaa..80f8d48e0c 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
@@ -56,10 +56,11 @@
                             "sc:vault"
                         ],
                         "data": [
-                            "str:DirectCall",
+                            "str:TransferAndExecute",
                             "str:ESDTTransfer",
                             "str:TEST-TOKENA",
-                            "1000"
+                            "1000",
+                            "str:accept_funds"
                         ]
                     },
                     {
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 f5b6facdd6..2bce23a321 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
@@ -56,10 +56,11 @@
                             "sc:vault"
                         ],
                         "data": [
-                            "str:DirectCall",
+                            "str:TransferAndExecute",
                             "str:ESDTTransfer",
                             "str:TEST-TOKENA",
-                            "1000"
+                            "1000",
+                            "str:accept_funds"
                         ]
                     },
                     {
@@ -86,10 +87,11 @@
                             "sc:vault"
                         ],
                         "data": [
-                            "str:DirectCall",
+                            "str:TransferAndExecute",
                             "str:ESDTTransfer",
                             "str:TEST-TOKENA",
-                            "1000"
+                            "1000",
+                            "str:accept_funds"
                         ]
                     },
                     {
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 7896a3a7de..2c5afabb3e 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
@@ -77,7 +77,7 @@
                             "sc:vault"
                         ],
                         "data": [
-                            "str:DirectCall",
+                            "str:TransferAndExecute",
                             "str:MultiESDTNFTTransfer",
                             "sc:vault",
                             "2",
@@ -86,7 +86,8 @@
                             "100",
                             "str:FWD-TOKEN",
                             "0",
-                            "200"
+                            "200",
+                            "str:accept_funds"
                         ]
                     },
                     {
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 b76f0f3d7b..50be949687 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
@@ -64,12 +64,13 @@
                             "sc:vault"
                         ],
                         "data": [
-                            "str:DirectCall",
+                            "str:TransferAndExecute",
                             "str:ESDTNFTTransfer",
                             "str:NFT-000001",
                             "5",
                             "1",
-                            "sc:vault"
+                            "sc:vault",
+                            "str:accept_funds"
                         ]
                     },
                     {
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 e1cb0af7f3..48207088bf 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
@@ -51,7 +51,7 @@
                             "sc:vault"
                         ],
                         "data": [
-                            "str:ExecuteOnDestContext",
+                            "str:TransferAndExecute",
                             "str:accept_funds"
                         ]
                     },
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 6a907dcdac..9a4ad571df 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
@@ -64,12 +64,13 @@
                             "sc:vault"
                         ],
                         "data": [
-                            "str:DirectCall",
+                            "str:TransferAndExecute",
                             "str:ESDTNFTTransfer",
                             "str:NFT-000001",
                             "5",
                             "1",
-                            "sc:vault"
+                            "sc:vault",
+                            "str:accept_funds"
                         ]
                     },
                     {
@@ -96,12 +97,13 @@
                             "sc:vault"
                         ],
                         "data": [
-                            "str:DirectCall",
+                            "str:TransferAndExecute",
                             "str:ESDTNFTTransfer",
                             "str:NFT-000001",
                             "5",
                             "1",
-                            "sc:vault"
+                            "sc:vault",
+                            "str:accept_funds"
                         ]
                     },
                     {
diff --git a/vm/src/tx_execution/builtin_function_mocks/transfer/esdt_multi_transfer_mock.rs b/vm/src/tx_execution/builtin_function_mocks/transfer/esdt_multi_transfer_mock.rs
index d08f955134..7279d69a7d 100644
--- a/vm/src/tx_execution/builtin_function_mocks/transfer/esdt_multi_transfer_mock.rs
+++ b/vm/src/tx_execution/builtin_function_mocks/transfer/esdt_multi_transfer_mock.rs
@@ -13,8 +13,9 @@ use crate::{
 use super::{
     super::BuiltinFunction,
     transfer_common::{
-        execute_transfer_builtin_func, extract_transfer_info, push_func_name_if_necessary,
-        push_transfer_bytes, ParsedTransferBuiltinFunCall, RawEsdtTransfer,
+        adjust_call_type, execute_transfer_builtin_func, extract_transfer_info,
+        push_func_name_if_necessary, push_transfer_bytes, ParsedTransferBuiltinFunCall,
+        RawEsdtTransfer,
     },
 };
 
@@ -57,17 +58,18 @@ impl BuiltinFunction for ESDTMultiTransfer {
 }
 
 fn build_log(tx_input: &TxInput, call: &ParsedTransferBuiltinFunCall) -> TxLog {
+    let call_type = adjust_call_type(tx_input.call_type, call);
     let mut topics = Vec::new();
     push_transfer_bytes(&call.raw_esdt_transfers, &mut topics);
     topics.push(call.destination.to_vec());
 
     let mut data = Vec::new();
-    data.push(tx_input.call_type.to_log_bytes());
+    data.push(call_type.to_log_bytes());
     data.push(ESDT_MULTI_TRANSFER_FUNC_NAME.into());
     data.push(call.destination.to_vec());
     data.push(top_encode_u64(call.raw_esdt_transfers.len() as u64));
     push_transfer_bytes(&call.raw_esdt_transfers, &mut data);
-    push_func_name_if_necessary(tx_input.call_type, &call.func_name, &mut data);
+    push_func_name_if_necessary(call_type, &call.func_name, &mut data);
 
     TxLog {
         address: tx_input.from.clone(),
diff --git a/vm/src/tx_execution/builtin_function_mocks/transfer/esdt_nft_transfer_mock.rs b/vm/src/tx_execution/builtin_function_mocks/transfer/esdt_nft_transfer_mock.rs
index 08edf67227..24d5925662 100644
--- a/vm/src/tx_execution/builtin_function_mocks/transfer/esdt_nft_transfer_mock.rs
+++ b/vm/src/tx_execution/builtin_function_mocks/transfer/esdt_nft_transfer_mock.rs
@@ -10,8 +10,9 @@ use crate::{
 use super::{
     super::BuiltinFunction,
     transfer_common::{
-        execute_transfer_builtin_func, extract_transfer_info, push_func_name_if_necessary,
-        push_transfer_bytes, ParsedTransferBuiltinFunCall, RawEsdtTransfer,
+        adjust_call_type, execute_transfer_builtin_func, extract_transfer_info,
+        push_func_name_if_necessary, push_transfer_bytes, ParsedTransferBuiltinFunCall,
+        RawEsdtTransfer,
     },
 };
 
@@ -54,17 +55,18 @@ impl BuiltinFunction for ESDTNftTransfer {
 }
 
 fn build_log(tx_input: &TxInput, call: &ParsedTransferBuiltinFunCall) -> TxLog {
+    let call_type = adjust_call_type(tx_input.call_type, call);
     let mut topics = Vec::new();
     push_transfer_bytes(&call.raw_esdt_transfers, &mut topics);
     topics.push(call.destination.to_vec());
 
     let mut data = Vec::new();
 
-    data.push(tx_input.call_type.to_log_bytes());
+    data.push(call_type.to_log_bytes());
     data.push(ESDT_NFT_TRANSFER_FUNC_NAME.into());
     push_transfer_bytes(&call.raw_esdt_transfers, &mut data);
     data.push(call.destination.to_vec());
-    push_func_name_if_necessary(tx_input.call_type, &call.func_name, &mut data);
+    push_func_name_if_necessary(call_type, &call.func_name, &mut data);
 
     TxLog {
         address: tx_input.from.clone(),
diff --git a/vm/src/tx_execution/builtin_function_mocks/transfer/esdt_transfer_mock.rs b/vm/src/tx_execution/builtin_function_mocks/transfer/esdt_transfer_mock.rs
index 7b811a6bd5..48958e5bff 100644
--- a/vm/src/tx_execution/builtin_function_mocks/transfer/esdt_transfer_mock.rs
+++ b/vm/src/tx_execution/builtin_function_mocks/transfer/esdt_transfer_mock.rs
@@ -9,8 +9,9 @@ use crate::{
 use super::{
     super::builtin_func_trait::BuiltinFunction,
     transfer_common::{
-        execute_transfer_builtin_func, extract_transfer_info, push_func_name_if_necessary,
-        push_transfer_bytes, ParsedTransferBuiltinFunCall, RawEsdtTransfer,
+        adjust_call_type, execute_transfer_builtin_func, extract_transfer_info,
+        push_func_name_if_necessary, push_transfer_bytes, ParsedTransferBuiltinFunCall,
+        RawEsdtTransfer,
     },
 };
 
@@ -53,16 +54,17 @@ impl BuiltinFunction for ESDTTransfer {
 }
 
 fn build_log(tx_input: &TxInput, call: &ParsedTransferBuiltinFunCall) -> TxLog {
+    let call_type = adjust_call_type(tx_input.call_type, call);
     let mut topics = Vec::new();
     push_transfer_bytes(&call.raw_esdt_transfers, &mut topics);
     topics.push(call.destination.to_vec());
 
     let mut data = Vec::new();
-    data.push(tx_input.call_type.to_log_bytes());
+    data.push(call_type.to_log_bytes());
     data.push(ESDT_TRANSFER_FUNC_NAME.into());
     data.push(call.raw_esdt_transfers[0].token_identifier.clone());
     data.push(call.raw_esdt_transfers[0].value_bytes.clone());
-    push_func_name_if_necessary(tx_input.call_type, &call.func_name, &mut data);
+    push_func_name_if_necessary(call_type, &call.func_name, &mut data);
 
     TxLog {
         address: tx_input.from.clone(),
diff --git a/vm/src/tx_execution/builtin_function_mocks/transfer/transfer_common.rs b/vm/src/tx_execution/builtin_function_mocks/transfer/transfer_common.rs
index b7023a965c..635d1be258 100644
--- a/vm/src/tx_execution/builtin_function_mocks/transfer/transfer_common.rs
+++ b/vm/src/tx_execution/builtin_function_mocks/transfer/transfer_common.rs
@@ -91,6 +91,17 @@ where
     (tx_result, blockchain_updates)
 }
 
+pub(super) fn adjust_call_type(
+    call_type: CallType,
+    call: &ParsedTransferBuiltinFunCall,
+) -> CallType {
+    if call_type == CallType::TransferExecute && call.func_name.is_empty() {
+        CallType::DirectCall
+    } else {
+        call_type
+    }
+}
+
 pub(super) fn push_func_name_if_necessary(
     call_type: CallType,
     func_name: &TxFunctionName,
diff --git a/vm/src/tx_mock/tx_context.rs b/vm/src/tx_mock/tx_context.rs
index 8a61f9f39d..e8c75276f6 100644
--- a/vm/src/tx_mock/tx_context.rs
+++ b/vm/src/tx_mock/tx_context.rs
@@ -10,13 +10,16 @@ use std::{
     sync::{Arc, Mutex, MutexGuard},
 };
 
-use super::{BlockchainRng, BlockchainUpdate, TxCache, TxInput, TxManagedTypes, TxResult};
+use super::{
+    BackTransfers, BlockchainRng, BlockchainUpdate, TxCache, TxInput, TxManagedTypes, TxResult,
+};
 
 pub struct TxContext {
     pub vm_ref: BlockchainVMRef,
     pub tx_input_box: Box<TxInput>,
     pub tx_cache: Arc<TxCache>,
     pub managed_types: Mutex<TxManagedTypes>,
+    pub back_transfers: Mutex<BackTransfers>,
     pub tx_result_cell: Mutex<TxResult>,
     pub b_rng: Mutex<BlockchainRng>,
 }
@@ -29,6 +32,7 @@ impl TxContext {
             tx_input_box: Box::new(tx_input),
             tx_cache: Arc::new(tx_cache),
             managed_types: Mutex::new(TxManagedTypes::new()),
+            back_transfers: Mutex::default(),
             tx_result_cell: Mutex::new(TxResult::empty()),
             b_rng,
         }
@@ -62,6 +66,7 @@ impl TxContext {
             tx_input_box: Box::new(tx_input),
             tx_cache: Arc::new(tx_cache),
             managed_types: Mutex::new(TxManagedTypes::new()),
+            back_transfers: Mutex::default(),
             tx_result_cell: Mutex::new(TxResult::empty()),
             b_rng,
         }
diff --git a/vm/src/tx_mock/tx_input_call_type.rs b/vm/src/tx_mock/tx_input_call_type.rs
index 1c9312173a..7a95281589 100644
--- a/vm/src/tx_mock/tx_input_call_type.rs
+++ b/vm/src/tx_mock/tx_input_call_type.rs
@@ -4,7 +4,7 @@ pub enum CallType {
     ExecuteOnDestContext,
     AsyncCall,
     AsyncCallback,
-    // TransferExecute,
+    TransferExecute,
 }
 
 impl CallType {
@@ -18,7 +18,7 @@ impl CallType {
             Self::ExecuteOnDestContext => "ExecuteOnDestContext",
             Self::AsyncCall => "AsyncCall",
             Self::AsyncCallback => "AsyncCallback",
-            // Self::TransferExecute => "DirectCall",
+            Self::TransferExecute => "TransferAndExecute",
         }
     }
 }

From a07db3584864f31f7312425fa2bb105f74ae751b Mon Sep 17 00:00:00 2001
From: Alin Cruceat <alyn_509@yahoo.com>
Date: Tue, 10 Oct 2023 01:54:33 +0300
Subject: [PATCH 0020/1254] overflow + enable poe test on biguint

---
 .../scenarios/big_uint_overflow.scen.json     | 48 +++++++++++++++++++
 ...g_uint_pow.json => big_uint_pow.scen.json} |  0
 .../tests/basic_features_scenario_go_test.rs  | 10 ++++
 .../tests/basic_features_scenario_rs_test.rs  | 10 ++++
 4 files changed, 68 insertions(+)
 create mode 100644 contracts/feature-tests/basic-features/scenarios/big_uint_overflow.scen.json
 rename contracts/feature-tests/basic-features/scenarios/{big_uint_pow.json => big_uint_pow.scen.json} (100%)

diff --git a/contracts/feature-tests/basic-features/scenarios/big_uint_overflow.scen.json b/contracts/feature-tests/basic-features/scenarios/big_uint_overflow.scen.json
new file mode 100644
index 0000000000..c7cfe8dd09
--- /dev/null
+++ b/contracts/feature-tests/basic-features/scenarios/big_uint_overflow.scen.json
@@ -0,0 +1,48 @@
+{
+    "name": "overflow",
+    "gasSchedule": "v3",
+    "steps": [
+        {
+            "step": "setState",
+            "accounts": {
+                "sc:basic-features": {
+                    "nonce": "0",
+                    "balance": "0",
+                    "storage": {},
+                    "code": "file:../output/basic-features.wasm"
+                },
+                "address:an_account": {
+                    "nonce": "0",
+                    "balance": "0",
+                    "storage": {},
+                    "code": ""
+                }
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "pow",
+            "tx": {
+                "from": "address:an_account",
+                "to": "sc:basic-features",
+                "value": "0",
+                "function": "pow_big_uint",
+                "arguments": [
+                    "10",
+                    "80"
+                ],
+                "gasLimit": "50,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": [
+                    "100000000000000000000000000000000000000000000000000000000000000000000000000000000"
+                ],
+                "status": "0",
+                "logs": "*",
+                "gas": "*",
+                "refund": "*"
+            }
+        }
+    ]
+}
diff --git a/contracts/feature-tests/basic-features/scenarios/big_uint_pow.json b/contracts/feature-tests/basic-features/scenarios/big_uint_pow.scen.json
similarity index 100%
rename from contracts/feature-tests/basic-features/scenarios/big_uint_pow.json
rename to contracts/feature-tests/basic-features/scenarios/big_uint_pow.scen.json
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 95d0566f8b..55c4063c80 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
@@ -34,6 +34,16 @@ fn big_uint_sqrt_go() {
     world().run("scenarios/big_uint_sqrt.scen.json");
 }
 
+#[test]
+fn big_uint_pow_go() {
+    world().run("scenarios/big_uint_pow.scen.json");
+}
+
+#[test]
+fn big_uint_overflow_go() {
+    world().run("scenarios/big_uint_overflow.scen.json");
+}
+
 #[test]
 fn big_uint_to_u_64_go() {
     world().run("scenarios/big_uint_to_u64.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 de5da320e3..08283808b4 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
@@ -43,9 +43,19 @@ fn big_uint_from_u_64_rs() {
 
 #[test]
 fn big_uint_sqrt_rs() {
+    world().run("scenarios/big_uint_pow.scen.json");
+}
+
+#[test]
+fn big_uint_pow_rs() {
     world().run("scenarios/big_uint_sqrt.scen.json");
 }
 
+#[test]
+fn big_uint_overflow_rs() {
+    world().run("scenarios/big_uint_overflow.scen.json");
+}
+
 #[test]
 fn big_uint_to_u_64_rs() {
     world().run("scenarios/big_uint_to_u64.scen.json");

From e1939be8b11e72e35c6d49317b926314d98fd7b6 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 13 Oct 2023 10:22:24 +0300
Subject: [PATCH 0021/1254] backtransfers stub

---
 vm/src/tx_mock.rs                   |  2 ++
 vm/src/tx_mock/tx_back_transfers.rs | 52 +++++++++++++++++++++++++++++
 2 files changed, 54 insertions(+)
 create mode 100644 vm/src/tx_mock/tx_back_transfers.rs

diff --git a/vm/src/tx_mock.rs b/vm/src/tx_mock.rs
index 6c4415bcd4..d1da905113 100644
--- a/vm/src/tx_mock.rs
+++ b/vm/src/tx_mock.rs
@@ -4,6 +4,7 @@ mod blockchain_rng;
 mod blockchain_update;
 mod tx_async_call_data;
 mod tx_async_promise;
+mod tx_back_transfers;
 mod tx_cache;
 mod tx_cache_balance_util;
 mod tx_cache_source;
@@ -23,6 +24,7 @@ pub use blockchain_rng::*;
 pub use blockchain_update::BlockchainUpdate;
 pub use tx_async_call_data::*;
 pub use tx_async_promise::*;
+pub use tx_back_transfers::*;
 pub use tx_cache::TxCache;
 pub use tx_cache_source::*;
 pub use tx_context::*;
diff --git a/vm/src/tx_mock/tx_back_transfers.rs b/vm/src/tx_mock/tx_back_transfers.rs
new file mode 100644
index 0000000000..940c509aa8
--- /dev/null
+++ b/vm/src/tx_mock/tx_back_transfers.rs
@@ -0,0 +1,52 @@
+use num_bigint::BigUint;
+
+use super::{TxContext, TxResult, TxTokenTransfer};
+
+#[derive(Default)]
+pub struct BackTransfers {
+    pub call_value: BigUint,
+    pub esdt_transfers: Vec<TxTokenTransfer>,
+}
+
+impl BackTransfers {
+    pub fn append_from_result(&mut self, result: &TxResult) {
+        if result.result_status != 0 {
+            return;
+        }
+
+        for call in &result.all_calls {}
+    }
+}
+
+// func (host *vmHost) addNewBackTransfersFromVMOutput(vmOutput *vmcommon.VMOutput, parent, child []byte) {
+// 	if vmOutput == nil || vmOutput.ReturnCode != vmcommon.Ok {
+// 		return
+// 	}
+// 	callerOutAcc, ok := vmOutput.OutputAccounts[string(parent)]
+// 	if !ok {
+// 		return
+// 	}
+
+// 	for _, transfer := range callerOutAcc.OutputTransfers {
+// 		if !bytes.Equal(transfer.SenderAddress, child) {
+// 			continue
+// 		}
+// 		if transfer.CallType == vm.AsynchronousCallBack {
+// 			continue
+// 		}
+
+// 		if transfer.Value.Cmp(vmhost.Zero) > 0 {
+// 			if len(transfer.Data) == 0 {
+// 				host.managedTypesContext.AddValueOnlyBackTransfer(transfer.Value)
+// 			}
+// 			continue
+// 		}
+
+// 		esdtTransfers, isWithoutExec := host.isESDTTransferWithoutExecution(transfer.Data, parent, child)
+// 		if !isWithoutExec {
+// 			continue
+// 		}
+
+// 		host.managedTypesContext.AddBackTransfers(esdtTransfers.ESDTTransfers)
+// 	}
+// }

From 00a59cedf5c43cc8f539094303d6a4af8b22f401 Mon Sep 17 00:00:00 2001
From: Alin Cruceat <alyn_509@yahoo.com>
Date: Tue, 31 Oct 2023 07:16:57 +0200
Subject: [PATCH 0022/1254] more derives for EsdtTokenType

---
 ...scen.json => small_int_overflow.scen.json} |  0
 .../basic-features/src/basic_features_main.rs |  1 +
 .../src/small_num_overflow_test_ops.rs        | 31 +++++++++++++++++++
 3 files changed, 32 insertions(+)
 rename contracts/feature-tests/basic-features/scenarios/{big_uint_overflow.scen.json => small_int_overflow.scen.json} (100%)
 create mode 100644 contracts/feature-tests/basic-features/src/small_num_overflow_test_ops.rs

diff --git a/contracts/feature-tests/basic-features/scenarios/big_uint_overflow.scen.json b/contracts/feature-tests/basic-features/scenarios/small_int_overflow.scen.json
similarity index 100%
rename from contracts/feature-tests/basic-features/scenarios/big_uint_overflow.scen.json
rename to contracts/feature-tests/basic-features/scenarios/small_int_overflow.scen.json
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 56b1eb8bff..4111b7a5e7 100644
--- a/contracts/feature-tests/basic-features/src/basic_features_main.rs
+++ b/contracts/feature-tests/basic-features/src/basic_features_main.rs
@@ -18,6 +18,7 @@ pub mod managed_address_features;
 pub mod managed_buffer_features;
 pub mod managed_vec_features;
 pub mod non_zero_features;
+pub mod small_num_overflow_test_ops;
 pub mod storage_direct_load;
 pub mod storage_direct_store;
 pub mod storage_mapper_fungible_token;
diff --git a/contracts/feature-tests/basic-features/src/small_num_overflow_test_ops.rs b/contracts/feature-tests/basic-features/src/small_num_overflow_test_ops.rs
new file mode 100644
index 0000000000..466e55bfbd
--- /dev/null
+++ b/contracts/feature-tests/basic-features/src/small_num_overflow_test_ops.rs
@@ -0,0 +1,31 @@
+multiversx_sc::imports!();
+
+/// Checks that BigUint/BigInt operators work as expected.
+#[multiversx_sc::module]
+#[allow(clippy::redundant_clone)]
+pub trait SmallIntOperators {
+    #[endpoint]
+    fn add_usize(&self, a: usize, b: usize) -> usize {
+        a + b
+    }
+
+    #[endpoint]
+    fn add_u8(&self, a: u8, b: u8) -> u8 {
+        a + b
+    }
+
+    #[endpoint]
+    fn add_u16(&self, a: u16, b: u16) -> u16 {
+        a + b
+    }
+
+    #[endpoint]
+    fn add_u32(&self, a: u32, b: u32) -> u32 {
+        a + b
+    }
+
+    #[endpoint]
+    fn add_u64(&self, a: u64, b: u64) -> u64 {
+        a + b
+    }
+}

From b9dbee5981a7375eff7c9bdebac36fe402b90ae7 Mon Sep 17 00:00:00 2001
From: mihaicalinluca <mihaicalin.luca10@gmail.com>
Date: Fri, 3 Nov 2023 14:26:29 +0100
Subject: [PATCH 0023/1254] first draft

---
 .../derive/src/parse/attributes/attr_names.rs |  1 +
 .../src/parse/attributes/endpoint_attr.rs     |  4 +++
 framework/derive/src/parse/endpoint_parse.rs  | 25 ++++++++++++++++---
 framework/derive/src/parse/method_parse.rs    |  5 +++-
 4 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/framework/derive/src/parse/attributes/attr_names.rs b/framework/derive/src/parse/attributes/attr_names.rs
index 0b9bcf9c3c..8df56f06f6 100644
--- a/framework/derive/src/parse/attributes/attr_names.rs
+++ b/framework/derive/src/parse/attributes/attr_names.rs
@@ -26,3 +26,4 @@ pub(super) static ATTR_STORAGE_CLEAR: &str = "storage_clear";
 pub(super) static ATTR_PROXY: &str = "proxy";
 pub(super) static ATTR_LABEL: &str = "label";
 pub(super) static ATTR_ALLOW_MULTIPLE_VAR_ARGS: &str = "allow_multiple_var_args";
+pub(super) static ATTR_UPGRADE: &str = "upgrade";
diff --git a/framework/derive/src/parse/attributes/endpoint_attr.rs b/framework/derive/src/parse/attributes/endpoint_attr.rs
index 0e8f7b6840..678675b202 100644
--- a/framework/derive/src/parse/attributes/endpoint_attr.rs
+++ b/framework/derive/src/parse/attributes/endpoint_attr.rs
@@ -28,6 +28,10 @@ pub fn is_allow_multiple_var_args(attr: &syn::Attribute) -> bool {
     is_attribute_with_no_args(attr, ATTR_ALLOW_MULTIPLE_VAR_ARGS)
 }
 
+pub fn is_upgrade(attr: &syn::Attribute) -> bool {
+    is_attribute_with_no_args(attr, ATTR_UPGRADE)
+}
+
 #[derive(Clone, Debug)]
 pub struct EndpointAttribute {
     pub endpoint_name: Option<syn::Ident>,
diff --git a/framework/derive/src/parse/endpoint_parse.rs b/framework/derive/src/parse/endpoint_parse.rs
index 8c90f86717..c23cdb194f 100644
--- a/framework/derive/src/parse/endpoint_parse.rs
+++ b/framework/derive/src/parse/endpoint_parse.rs
@@ -1,12 +1,12 @@
 use crate::model::{
     CallbackMetadata, EndpointMetadata, EndpointMutabilityMetadata, InitMetadata, Method,
-    PublicRole,
+    PublicRole, MethodPayableMetadata,
 };
 
 use super::{
     attributes::{
         is_allow_multiple_var_args, is_callback_raw, is_init, is_only_admin, is_only_owner,
-        is_only_user_account, CallbackAttribute, EndpointAttribute, ExternalViewAttribute,
+        is_only_user_account, is_upgrade, CallbackAttribute, EndpointAttribute, ExternalViewAttribute,
         LabelAttribute, OutputNameAttribute, PromisesCallbackAttribute, ViewAttribute,
     },
     MethodAttributesPass1,
@@ -14,7 +14,7 @@ use super::{
 
 fn check_single_role(method: &Method) {
     assert!(matches!(method.public_role, PublicRole::Private),
-		"Can only annotate with one of the following arguments: `#[init]`, `#[endpoint]`, `#[view]`, `#[callback]`, `#[callback_raw]`."
+		"Can only annotate with one of the following arguments: `#[init]`, `#[endpoint]`, `#[view]`, `#[callback]`, `#[callback_raw]`, `#[upgrade]`."
 	);
 }
 
@@ -35,6 +35,23 @@ pub fn process_init_attribute(
     }
 }
 
+pub fn process_upgrade_attribute(attr: &syn::Attribute, first_pass_data: &MethodAttributesPass1, method: &mut Method) -> bool {
+    let has_attr = is_upgrade(attr);
+    if has_attr {
+        method.name = proc_macro2::Ident::new("upgrade", proc_macro2::Span::call_site());
+        let pass_1_data = MethodAttributesPass1 {
+            method_name: method.name.to_string(),
+            payable: MethodPayableMetadata::NotPayable,
+            only_owner: first_pass_data.only_owner,
+            only_admin: first_pass_data.only_admin,
+            only_user_account: first_pass_data.only_user_account,
+            allow_multiple_var_args: first_pass_data.allow_multiple_var_args,
+        };
+        return process_endpoint_attribute(attr, &pass_1_data, method);
+    }
+    false
+}
+
 pub fn process_allow_multiple_var_args_attribute(
     attr: &syn::Attribute,
     pass_1_data: &mut MethodAttributesPass1,
@@ -80,6 +97,8 @@ pub fn process_only_user_account_attribute(
     is_only_user_account
 }
 
+
+
 pub fn process_endpoint_attribute(
     attr: &syn::Attribute,
     pass_1_data: &MethodAttributesPass1,
diff --git a/framework/derive/src/parse/method_parse.rs b/framework/derive/src/parse/method_parse.rs
index 62eeed2470..360e501095 100644
--- a/framework/derive/src/parse/method_parse.rs
+++ b/framework/derive/src/parse/method_parse.rs
@@ -1,3 +1,4 @@
+
 use crate::model::{Method, MethodImpl, MethodPayableMetadata, PublicRole, TraitProperties};
 
 use super::{
@@ -12,7 +13,7 @@ use super::{
     process_init_attribute, process_label_names_attribute, process_only_admin_attribute,
     process_only_owner_attribute, process_only_user_account_attribute,
     process_output_names_attribute, process_payable_attribute, process_promises_callback_attribute,
-    process_view_attribute,
+    process_view_attribute, process_upgrade_attribute
 };
 pub struct MethodAttributesPass1 {
     pub method_name: String,
@@ -96,6 +97,7 @@ fn process_attribute_first_pass(
         || process_allow_multiple_var_args_attribute(attr, first_pass_data)
 }
 
+
 fn process_attributes_second_pass(
     attrs: &[syn::Attribute],
     first_pass_data: &MethodAttributesPass1,
@@ -116,6 +118,7 @@ fn process_attribute_second_pass(
 ) -> bool {
     process_init_attribute(attr, first_pass_data, method)
         || process_endpoint_attribute(attr, first_pass_data, method)
+        || process_upgrade_attribute(attr, first_pass_data, method)
         || process_view_attribute(attr, first_pass_data, method)
         || process_external_view_attribute(attr, first_pass_data, method)
         || process_callback_raw_attribute(attr, method)

From 8fd3cf4a92dc32ec452630ec66003f61a1437055 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 3 Nov 2023 18:20:53 +0200
Subject: [PATCH 0024/1254] upgrade contract test

---
 .../composability/vault/src/vault.rs          | 12 ++++++
 .../vault/wasm-vault-promises/src/lib.rs      |  5 ++-
 .../composability/vault/wasm/src/lib.rs       |  5 ++-
 framework/derive/src/parse/endpoint_parse.rs  | 37 +++++++++++--------
 4 files changed, 39 insertions(+), 20 deletions(-)

diff --git a/contracts/feature-tests/composability/vault/src/vault.rs b/contracts/feature-tests/composability/vault/src/vault.rs
index 4cebf5bc43..1583c117b0 100644
--- a/contracts/feature-tests/composability/vault/src/vault.rs
+++ b/contracts/feature-tests/composability/vault/src/vault.rs
@@ -14,6 +14,18 @@ pub trait Vault {
         opt_arg_to_echo
     }
 
+    #[upgrade]
+    fn upgrade(
+        &self,
+        opt_arg_to_echo: OptionalValue<ManagedBuffer>,
+    ) -> MultiValue2<&'static str, OptionalValue<ManagedBuffer>> {
+        self.upgraded_event();
+        ("upgraded", opt_arg_to_echo).into()
+    }
+
+    #[event("upgraded")]
+    fn upgraded_event(&self);
+
     #[endpoint]
     fn echo_arguments(
         &self,
diff --git a/contracts/feature-tests/composability/vault/wasm-vault-promises/src/lib.rs b/contracts/feature-tests/composability/vault/wasm-vault-promises/src/lib.rs
index 87c110bc70..35441b4627 100644
--- a/contracts/feature-tests/composability/vault/wasm-vault-promises/src/lib.rs
+++ b/contracts/feature-tests/composability/vault/wasm-vault-promises/src/lib.rs
@@ -5,9 +5,9 @@
 ////////////////////////////////////////////////////
 
 // Init:                                 1
-// Endpoints:                           16
+// Endpoints:                           17
 // Async Callback (empty):               1
-// Total number of exported functions:  18
+// Total number of exported functions:  19
 
 #![no_std]
 
@@ -22,6 +22,7 @@ multiversx_sc_wasm_adapter::endpoints! {
     vault
     (
         init => init
+        upgrade => upgrade
         echo_arguments => echo_arguments
         echo_arguments_without_storage => echo_arguments_without_storage
         echo_caller => echo_caller
diff --git a/contracts/feature-tests/composability/vault/wasm/src/lib.rs b/contracts/feature-tests/composability/vault/wasm/src/lib.rs
index d0e42574c2..1d6a0410f7 100644
--- a/contracts/feature-tests/composability/vault/wasm/src/lib.rs
+++ b/contracts/feature-tests/composability/vault/wasm/src/lib.rs
@@ -5,9 +5,9 @@
 ////////////////////////////////////////////////////
 
 // Init:                                 1
-// Endpoints:                           15
+// Endpoints:                           16
 // Async Callback (empty):               1
-// Total number of exported functions:  17
+// Total number of exported functions:  18
 
 #![no_std]
 
@@ -22,6 +22,7 @@ multiversx_sc_wasm_adapter::endpoints! {
     vault
     (
         init => init
+        upgrade => upgrade
         echo_arguments => echo_arguments
         echo_arguments_without_storage => echo_arguments_without_storage
         echo_caller => echo_caller
diff --git a/framework/derive/src/parse/endpoint_parse.rs b/framework/derive/src/parse/endpoint_parse.rs
index c23cdb194f..92fd4ff175 100644
--- a/framework/derive/src/parse/endpoint_parse.rs
+++ b/framework/derive/src/parse/endpoint_parse.rs
@@ -1,13 +1,14 @@
 use crate::model::{
     CallbackMetadata, EndpointMetadata, EndpointMutabilityMetadata, InitMetadata, Method,
-    PublicRole, MethodPayableMetadata,
+    PublicRole,
 };
 
 use super::{
     attributes::{
         is_allow_multiple_var_args, is_callback_raw, is_init, is_only_admin, is_only_owner,
-        is_only_user_account, is_upgrade, CallbackAttribute, EndpointAttribute, ExternalViewAttribute,
-        LabelAttribute, OutputNameAttribute, PromisesCallbackAttribute, ViewAttribute,
+        is_only_user_account, is_upgrade, CallbackAttribute, EndpointAttribute,
+        ExternalViewAttribute, LabelAttribute, OutputNameAttribute, PromisesCallbackAttribute,
+        ViewAttribute,
     },
     MethodAttributesPass1,
 };
@@ -35,21 +36,27 @@ pub fn process_init_attribute(
     }
 }
 
-pub fn process_upgrade_attribute(attr: &syn::Attribute, first_pass_data: &MethodAttributesPass1, method: &mut Method) -> bool {
+pub fn process_upgrade_attribute(
+    attr: &syn::Attribute,
+    first_pass_data: &MethodAttributesPass1,
+    method: &mut Method,
+) -> bool {
     let has_attr = is_upgrade(attr);
     if has_attr {
-        method.name = proc_macro2::Ident::new("upgrade", proc_macro2::Span::call_site());
-        let pass_1_data = MethodAttributesPass1 {
-            method_name: method.name.to_string(),
-            payable: MethodPayableMetadata::NotPayable,
-            only_owner: first_pass_data.only_owner,
-            only_admin: first_pass_data.only_admin,
-            only_user_account: first_pass_data.only_user_account,
+        check_single_role(&*method);
+        method.public_role = PublicRole::Endpoint(EndpointMetadata {
+            public_name: proc_macro2::Ident::new("upgrade", proc_macro2::Span::call_site()),
+            payable: first_pass_data.payable.clone(),
+            only_owner: false,
+            only_admin: false,
+            only_user_account: false,
+            mutability: EndpointMutabilityMetadata::Mutable,
             allow_multiple_var_args: first_pass_data.allow_multiple_var_args,
-        };
-        return process_endpoint_attribute(attr, &pass_1_data, method);
+        });
+        true
+    } else {
+        false
     }
-    false
 }
 
 pub fn process_allow_multiple_var_args_attribute(
@@ -97,8 +104,6 @@ pub fn process_only_user_account_attribute(
     is_only_user_account
 }
 
-
-
 pub fn process_endpoint_attribute(
     attr: &syn::Attribute,
     pass_1_data: &MethodAttributesPass1,

From e34027ea58e075f1a4b3a667d9f063ed20bd23bf Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 26 Oct 2023 19:01:25 +0300
Subject: [PATCH 0025/1254] unified tx syntax - prototype

---
 .../contract_base/wrappers/send_wrapper.rs    |   6 +
 .../src/types/interaction/function_call.rs    |  21 +-
 framework/base/src/types/interaction/mod.rs   |  12 +
 framework/base/src/types/interaction/tx.rs    | 327 ++++++++++++++++++
 .../base/src/types/interaction/tx_data.rs     |  38 ++
 .../base/src/types/interaction/tx_from.rs     |  26 ++
 .../base/src/types/interaction/tx_gas.rs      |   7 +
 .../types/interaction/tx_normalize_call.rs    |  91 +++++
 .../base/src/types/interaction/tx_payment.rs  | 209 +++++++++++
 framework/base/src/types/interaction/tx_to.rs |  18 +
 .../wrapped/egld_or_esdt_token_identifier.rs  |   2 +-
 .../wrapped/egld_or_esdt_token_payment.rs     |  23 ++
 .../src/types/managed/wrapped/egld_payment.rs |  30 ++
 .../types/managed/wrapped/managed_option.rs   |  15 +-
 .../base/src/types/managed/wrapped/mod.rs     |   2 +
 15 files changed, 809 insertions(+), 18 deletions(-)
 create mode 100644 framework/base/src/types/interaction/tx.rs
 create mode 100644 framework/base/src/types/interaction/tx_data.rs
 create mode 100644 framework/base/src/types/interaction/tx_from.rs
 create mode 100644 framework/base/src/types/interaction/tx_gas.rs
 create mode 100644 framework/base/src/types/interaction/tx_normalize_call.rs
 create mode 100644 framework/base/src/types/interaction/tx_payment.rs
 create mode 100644 framework/base/src/types/interaction/tx_to.rs
 create mode 100644 framework/base/src/types/managed/wrapped/egld_payment.rs

diff --git a/framework/base/src/contract_base/wrappers/send_wrapper.rs b/framework/base/src/contract_base/wrappers/send_wrapper.rs
index 78f4f045d6..aa7ae5c653 100644
--- a/framework/base/src/contract_base/wrappers/send_wrapper.rs
+++ b/framework/base/src/contract_base/wrappers/send_wrapper.rs
@@ -15,6 +15,7 @@ use crate::{
     types::{
         BigUint, ContractCall, ContractCallNoPayment, EgldOrEsdtTokenIdentifier, EsdtTokenPayment,
         ManagedAddress, ManagedArgBuffer, ManagedBuffer, ManagedType, ManagedVec, TokenIdentifier,
+        TxBase,
     },
 };
 
@@ -70,6 +71,11 @@ where
         ContractCallNoPayment::new(to, endpoint_name)
     }
 
+    #[inline]
+    pub fn tx(&self) -> TxBase<A> {
+        TxBase::new()
+    }
+
     /// Sends EGLD to a given address, directly.
     /// Used especially for sending EGLD to regular accounts.
     #[inline]
diff --git a/framework/base/src/types/interaction/function_call.rs b/framework/base/src/types/interaction/function_call.rs
index a2140f14fa..ae12687b26 100644
--- a/framework/base/src/types/interaction/function_call.rs
+++ b/framework/base/src/types/interaction/function_call.rs
@@ -9,11 +9,7 @@ use crate::{
         ManagedTypeApi, ESDT_MULTI_TRANSFER_FUNC_NAME, ESDT_NFT_TRANSFER_FUNC_NAME,
         ESDT_TRANSFER_FUNC_NAME,
     },
-    formatter::SCLowerHex,
-    types::{
-        EsdtTokenPayment, ManagedAddress, ManagedBuffer, ManagedBufferCachedBuilder, ManagedVec,
-        MultiValueEncoded,
-    },
+    types::{EsdtTokenPayment, ManagedAddress, ManagedBuffer, ManagedVec, MultiValueEncoded},
 };
 
 use super::ManagedArgBuffer;
@@ -62,15 +58,14 @@ where
         self.arg_buffer.push_multi_arg(arg);
         self
     }
+}
 
-    pub fn to_call_data_string(&self) -> ManagedBuffer<Api> {
-        let mut result = ManagedBufferCachedBuilder::default();
-        result.append_managed_buffer(&self.function_name);
-        for arg in self.arg_buffer.raw_arg_iter() {
-            result.append_bytes(b"@");
-            SCLowerHex::fmt(&*arg, &mut result);
-        }
-        result.into_managed_buffer()
+impl<Api> From<()> for FunctionCall<Api>
+where
+    Api: ManagedTypeApi,
+{
+    fn from(_: ()) -> Self {
+        FunctionCall::empty()
     }
 }
 
diff --git a/framework/base/src/types/interaction/mod.rs b/framework/base/src/types/interaction/mod.rs
index 3de007ee79..8efeba7b03 100644
--- a/framework/base/src/types/interaction/mod.rs
+++ b/framework/base/src/types/interaction/mod.rs
@@ -14,6 +14,12 @@ mod contract_call_with_multi_esdt;
 mod contract_deploy;
 mod function_call;
 mod managed_arg_buffer;
+mod tx;
+mod tx_data;
+mod tx_from;
+mod tx_gas;
+mod tx_payment;
+mod tx_to;
 
 pub use async_call::AsyncCall;
 pub use async_call_promises::AsyncCallPromises;
@@ -31,3 +37,9 @@ pub use contract_call_with_multi_esdt::ContractCallWithMultiEsdt;
 pub use contract_deploy::{new_contract_deploy, ContractDeploy};
 pub use function_call::FunctionCall;
 pub use managed_arg_buffer::ManagedArgBuffer;
+pub use tx::*;
+pub use tx_data::*;
+pub use tx_from::*;
+pub use tx_gas::*;
+pub use tx_payment::*;
+pub use tx_to::*;
diff --git a/framework/base/src/types/interaction/tx.rs b/framework/base/src/types/interaction/tx.rs
new file mode 100644
index 0000000000..7b1da10187
--- /dev/null
+++ b/framework/base/src/types/interaction/tx.rs
@@ -0,0 +1,327 @@
+use core::marker::PhantomData;
+
+use multiversx_sc_codec::TopEncodeMulti;
+
+use crate::{
+    api::CallTypeApi,
+    types::{
+        BigUint, EgldPayment, EsdtTokenPayment, ManagedAddress, ManagedBuffer, ManagedVec,
+        MultiEsdtPayment,
+    },
+};
+
+use super::{AsyncCall, ExplicitGas, FunctionCall, TxData, TxFrom, TxGas, TxPayment, TxTo};
+
+pub struct Tx<Api, From, To, Payment, Gas, Data>
+where
+    Api: CallTypeApi + 'static,
+    From: TxFrom<Api>,
+    To: TxTo<Api>,
+    Payment: TxPayment<Api>,
+    Gas: TxGas,
+    Data: TxData<Api>,
+{
+    pub(super) _phantom: PhantomData<Api>,
+    pub from: From,
+    pub to: To,
+    pub payment: Payment,
+    pub gas: Gas,
+    pub data: Data,
+}
+
+impl<Api, From, To, Payment, Gas, Data> Tx<Api, From, To, Payment, Gas, Data>
+where
+    Api: CallTypeApi + 'static,
+    From: TxFrom<Api>,
+    To: TxTo<Api>,
+    Payment: TxPayment<Api>,
+    Gas: TxGas,
+    Data: TxData<Api>,
+{
+    #[inline]
+    pub fn nothing(self) -> Tx<Api, From, To, Payment, Gas, Data> {
+        Tx {
+            _phantom: PhantomData,
+            from: self.from,
+            to: self.to,
+            payment: self.payment,
+            gas: self.gas,
+            data: self.data,
+        }
+    }
+}
+
+pub type TxBase<Api> = Tx<Api, (), (), (), (), ()>;
+
+impl<Api> TxBase<Api>
+where
+    Api: CallTypeApi + 'static,
+{
+    #[inline]
+    pub fn new() -> Self {
+        Tx {
+            _phantom: PhantomData,
+            from: (),
+            to: (),
+            payment: (),
+            gas: (),
+            data: (),
+        }
+    }
+}
+
+impl<Api, To, Payment, Gas, Data> Tx<Api, (), To, Payment, Gas, Data>
+where
+    Api: CallTypeApi + 'static,
+    To: TxTo<Api>,
+    Payment: TxPayment<Api>,
+    Gas: TxGas,
+    Data: TxData<Api>,
+{
+    #[inline]
+    pub fn from<From>(self, from: From) -> Tx<Api, From, To, Payment, Gas, Data>
+    where
+        From: TxFrom<Api>,
+    {
+        Tx {
+            _phantom: PhantomData,
+            from,
+            to: self.to,
+            payment: self.payment,
+            gas: self.gas,
+            data: self.data,
+        }
+    }
+}
+
+impl<Api, From, Payment, Gas, Data> Tx<Api, From, (), Payment, Gas, Data>
+where
+    Api: CallTypeApi + 'static,
+    From: TxFrom<Api>,
+    Payment: TxPayment<Api>,
+    Gas: TxGas,
+    Data: TxData<Api>,
+{
+    #[inline]
+    pub fn to<To>(self, to: To) -> Tx<Api, From, To, Payment, Gas, Data>
+    where
+        To: TxTo<Api>,
+    {
+        Tx {
+            _phantom: PhantomData,
+            from: self.from,
+            to,
+            payment: self.payment,
+            gas: self.gas,
+            data: self.data,
+        }
+    }
+}
+
+impl<Api, From, To, Gas, Data> Tx<Api, From, To, (), Gas, Data>
+where
+    Api: CallTypeApi + 'static,
+    From: TxFrom<Api>,
+    To: TxTo<Api>,
+    Gas: TxGas,
+    Data: TxData<Api>,
+{
+    #[inline]
+    pub fn with_egld_transfer(
+        self,
+        egld_amount: BigUint<Api>,
+    ) -> Tx<Api, From, To, EgldPayment<Api>, Gas, Data> {
+        Tx {
+            _phantom: PhantomData,
+            from: self.from,
+            to: self.to,
+            payment: EgldPayment { value: egld_amount },
+            gas: self.gas,
+            data: self.data,
+        }
+    }
+}
+
+impl<Api, From, To, Gas, Data> Tx<Api, From, To, (), Gas, Data>
+where
+    Api: CallTypeApi + 'static,
+    From: TxFrom<Api>,
+    To: TxTo<Api>,
+    Gas: TxGas,
+    Data: TxData<Api>,
+{
+    /// Adds a single ESDT token transfer to a contract call.
+    ///
+    /// Can be called multiple times on the same call.
+    #[inline]
+    pub fn with_esdt_transfer<P: Into<EsdtTokenPayment<Api>>>(
+        self,
+        payment: P,
+    ) -> Tx<Api, From, To, MultiEsdtPayment<Api>, Gas, Data> {
+        let mut payments = ManagedVec::new();
+        payments.push(payment.into());
+        Tx {
+            _phantom: PhantomData,
+            from: self.from,
+            to: self.to,
+            payment: payments,
+            gas: self.gas,
+            data: self.data,
+        }
+    }
+}
+
+impl<Api, From, To, Gas, Data> Tx<Api, From, To, MultiEsdtPayment<Api>, Gas, Data>
+where
+    Api: CallTypeApi + 'static,
+    From: TxFrom<Api>,
+    To: TxTo<Api>,
+    Gas: TxGas,
+    Data: TxData<Api>,
+{
+    /// Adds a single ESDT token transfer to a contract call.
+    ///
+    /// Can be called multiple times on the same call.
+    #[inline]
+    pub fn with_esdt_transfer<P: Into<EsdtTokenPayment<Api>>>(
+        mut self,
+        payment: P,
+    ) -> Tx<Api, From, To, MultiEsdtPayment<Api>, Gas, Data> {
+        self.payment.push(payment.into());
+        self
+    }
+}
+
+impl<Api, From, To, Payment, Data> Tx<Api, From, To, Payment, (), Data>
+where
+    Api: CallTypeApi + 'static,
+    From: TxFrom<Api>,
+    To: TxTo<Api>,
+    Payment: TxPayment<Api>,
+    Data: TxData<Api>,
+{
+    /// Sets an explicit gas limit to the call.
+    #[inline]
+    pub fn with_gas_limit(self, gas_limit: u64) -> Tx<Api, From, To, Payment, ExplicitGas, Data> {
+        Tx {
+            _phantom: PhantomData,
+            from: self.from,
+            to: self.to,
+            payment: self.payment,
+            gas: ExplicitGas(gas_limit),
+            data: self.data,
+        }
+    }
+}
+
+impl<Api, From, To, Payment, Gas> Tx<Api, From, To, Payment, Gas, ()>
+where
+    Api: CallTypeApi + 'static,
+    From: TxFrom<Api>,
+    To: TxTo<Api>,
+    Payment: TxPayment<Api>,
+    Gas: TxGas,
+{
+    #[inline]
+    pub fn call<F: Into<FunctionCall<Api>>>(
+        self,
+        call: F,
+    ) -> Tx<Api, From, To, Payment, Gas, FunctionCall<Api>> {
+        Tx {
+            _phantom: PhantomData,
+            from: self.from,
+            to: self.to,
+            payment: self.payment,
+            gas: self.gas,
+            data: call.into(),
+        }
+    }
+
+    #[inline]
+    pub fn function_name<N: Into<ManagedBuffer<Api>>>(
+        self,
+        function_name: N,
+    ) -> Tx<Api, From, To, Payment, Gas, FunctionCall<Api>> {
+        Tx {
+            _phantom: PhantomData,
+            from: self.from,
+            to: self.to,
+            payment: self.payment,
+            gas: self.gas,
+            data: FunctionCall::new(function_name),
+        }
+    }
+}
+
+impl<Api, From, To, Payment, Gas> Tx<Api, From, To, Payment, Gas, FunctionCall<Api>>
+where
+    Api: CallTypeApi + 'static,
+    From: TxFrom<Api>,
+    To: TxTo<Api>,
+    Payment: TxPayment<Api>,
+    Gas: TxGas,
+{
+    #[inline]
+    pub fn argument<T: TopEncodeMulti>(mut self, arg: &T) -> Self {
+        self.data = self.data.argument(arg);
+        self
+    }
+}
+
+impl<Api, From, Payment, Gas> Tx<Api, From, ManagedAddress<Api>, Payment, Gas, FunctionCall<Api>>
+where
+    Api: CallTypeApi + 'static,
+    From: TxFrom<Api>,
+    Payment: TxPayment<Api>,
+    Gas: TxGas,
+{
+    pub fn normalize_tx(
+        self,
+    ) -> Tx<Api, From, ManagedAddress<Api>, EgldPayment<Api>, Gas, FunctionCall<Api>> {
+        let result = self.payment.convert_tx_data(&self.from, self.to, self.data);
+        Tx {
+            _phantom: PhantomData,
+            from: self.from,
+            to: result.to,
+            payment: result.egld_payment,
+            gas: self.gas,
+            data: result.fc,
+        }
+    }
+}
+
+impl<Api, Payment> Tx<Api, (), ManagedAddress<Api>, Payment, (), FunctionCall<Api>>
+where
+    Api: CallTypeApi + 'static,
+    Payment: TxPayment<Api>,
+{
+    pub fn async_call(self) -> AsyncCall<Api> {
+        let normalized = self.normalize_tx();
+        AsyncCall {
+            to: normalized.to,
+            egld_payment: normalized.payment.value,
+            function_call: normalized.data,
+            callback_call: None,
+        }
+    }
+}
+
+impl<Api, Payment> Tx<Api, (), ManagedAddress<Api>, Payment, ExplicitGas, FunctionCall<Api>>
+where
+    Api: CallTypeApi + 'static,
+    Payment: TxPayment<Api>,
+{
+    #[cfg(feature = "promises")]
+    pub fn async_call_promise(self) -> super::AsyncCallPromises<Api> {
+        let explicit_gas_limit = self.gas.0;
+        let normalized = self.normalize_tx();
+        super::AsyncCallPromises {
+            to: normalized.to,
+            egld_payment: normalized.payment.value,
+            function_call: normalized.data,
+            explicit_gas_limit,
+            extra_gas_for_callback: 0,
+            callback_call: None,
+        }
+    }
+}
diff --git a/framework/base/src/types/interaction/tx_data.rs b/framework/base/src/types/interaction/tx_data.rs
new file mode 100644
index 0000000000..440cdbdcb3
--- /dev/null
+++ b/framework/base/src/types/interaction/tx_data.rs
@@ -0,0 +1,38 @@
+use crate::{
+    api::ManagedTypeApi,
+    formatter::SCLowerHex,
+    types::{ManagedBuffer, ManagedBufferCachedBuilder},
+};
+
+use super::FunctionCall;
+
+pub trait TxData<Api>
+where
+    Api: ManagedTypeApi,
+{
+    fn to_call_data_string(&self) -> ManagedBuffer<Api>;
+}
+
+impl<Api> TxData<Api> for ()
+where
+    Api: ManagedTypeApi,
+{
+    fn to_call_data_string(&self) -> ManagedBuffer<Api> {
+        ManagedBuffer::new()
+    }
+}
+
+impl<Api> TxData<Api> for FunctionCall<Api>
+where
+    Api: ManagedTypeApi,
+{
+    fn to_call_data_string(&self) -> ManagedBuffer<Api> {
+        let mut result = ManagedBufferCachedBuilder::default();
+        result.append_managed_buffer(&self.function_name);
+        for arg in self.arg_buffer.raw_arg_iter() {
+            result.append_bytes(b"@");
+            SCLowerHex::fmt(&*arg, &mut result);
+        }
+        result.into_managed_buffer()
+    }
+}
diff --git a/framework/base/src/types/interaction/tx_from.rs b/framework/base/src/types/interaction/tx_from.rs
new file mode 100644
index 0000000000..984f537ad1
--- /dev/null
+++ b/framework/base/src/types/interaction/tx_from.rs
@@ -0,0 +1,26 @@
+use crate::{api::CallTypeApi, contract_base::BlockchainWrapper, types::ManagedAddress};
+
+pub trait TxFrom<Api>
+where
+    Api: CallTypeApi,
+{
+    fn to_address(&self) -> ManagedAddress<Api>;
+}
+
+impl<Api> TxFrom<Api> for ()
+where
+    Api: CallTypeApi,
+{
+    fn to_address(&self) -> ManagedAddress<Api> {
+        BlockchainWrapper::<Api>::new().get_sc_address()
+    }
+}
+
+impl<Api> TxFrom<Api> for ManagedAddress<Api>
+where
+    Api: CallTypeApi,
+{
+    fn to_address(&self) -> ManagedAddress<Api> {
+        self.clone()
+    }
+}
diff --git a/framework/base/src/types/interaction/tx_gas.rs b/framework/base/src/types/interaction/tx_gas.rs
new file mode 100644
index 0000000000..475a15d1bf
--- /dev/null
+++ b/framework/base/src/types/interaction/tx_gas.rs
@@ -0,0 +1,7 @@
+pub trait TxGas {}
+
+impl TxGas for () {}
+
+pub struct ExplicitGas(pub u64);
+
+impl TxGas for ExplicitGas {}
diff --git a/framework/base/src/types/interaction/tx_normalize_call.rs b/framework/base/src/types/interaction/tx_normalize_call.rs
new file mode 100644
index 0000000000..8a9cfb4fde
--- /dev/null
+++ b/framework/base/src/types/interaction/tx_normalize_call.rs
@@ -0,0 +1,91 @@
+use core::marker::PhantomData;
+
+use crate::{
+    api::CallTypeApi,
+    types::{BigUint, EgldPayment, ManagedAddress},
+};
+
+use super::{AsyncCall, FunctionCall, Tx, TxData, TxFrom, TxGas};
+
+/// Encodes
+pub type NormalizedTx<Api, From, Gas> =
+    Tx<Api, From, ManagedAddress<Api>, EgldPayment<Api>, Gas, FunctionCall<Api>>;
+
+pub trait TxNormalizeCall<Api, From, Gas>
+where
+    Api: CallTypeApi + 'static,
+    From: TxFrom<Api>,
+    Gas: TxGas,
+{
+    fn normalize_call(self) -> NormalizedTx<Api, From, Gas>;
+}
+
+impl<Api, From, Gas, Call> TxNormalizeCall<Api, From, Gas>
+    for Tx<Api, From, ManagedAddress<Api>, (), Gas, Call>
+where
+    Api: CallTypeApi + 'static,
+    From: TxFrom<Api>,
+    Gas: TxGas,
+    Call: TxData<Api> + Into<FunctionCall<Api>>,
+{
+    fn normalize_call(self) -> NormalizedTx<Api, From, Gas> {
+        Tx {
+            _phantom: PhantomData,
+            from: self.from,
+            to: self.to,
+            payment: EgldPayment {
+                value: BigUint::zero(),
+            },
+            gas: self.gas,
+            data: self.data.into(),
+        }
+    }
+}
+
+impl<Api, From, Gas, Call> TxNormalizeCall<Api, From, Gas>
+    for Tx<Api, From, ManagedAddress<Api>, EgldPayment<Api>, Gas, Call>
+where
+    Api: CallTypeApi + 'static,
+    From: TxFrom<Api>,
+    Gas: TxGas,
+    Call: TxData<Api> + Into<FunctionCall<Api>>,
+{
+    fn normalize_call(self) -> NormalizedTx<Api, From, Gas> {
+        Tx {
+            _phantom: PhantomData,
+            from: self.from,
+            to: self.to,
+            payment: self.payment,
+            gas: self.gas,
+            data: self.data.into(),
+        }
+    }
+}
+
+impl<Api, From, Gas> NormalizedTx<Api, From, Gas>
+where
+    Api: CallTypeApi + 'static,
+    From: TxFrom<Api>,
+    Gas: TxGas,
+{
+    fn async_call(self) -> AsyncCall<Api> {
+        AsyncCall {
+            to: self.to,
+            egld_payment: self.payment.value,
+            function_call: self.data,
+            callback_call: None,
+        }
+    }
+
+    // #[cfg(feature = "promises")]
+    // fn async_call_promise(self) -> super::AsyncCallPromises<SA> {
+    //     super::AsyncCallPromises {
+    //         to: self.basic.to,
+    //         egld_payment: self.egld_payment,
+    //         function_call: self.basic.function_call,
+    //         explicit_gas_limit: self.basic.explicit_gas_limit,
+    //         extra_gas_for_callback: 0,
+    //         callback_call: None,
+    //     }
+    // }
+}
diff --git a/framework/base/src/types/interaction/tx_payment.rs b/framework/base/src/types/interaction/tx_payment.rs
new file mode 100644
index 0000000000..e36d43cfc5
--- /dev/null
+++ b/framework/base/src/types/interaction/tx_payment.rs
@@ -0,0 +1,209 @@
+use crate::{
+    api::{CallTypeApi, ManagedTypeApi},
+    types::{
+        EgldOrEsdtTokenPayment, EgldOrMultiEsdtPayment, EgldPayment, EsdtTokenPayment,
+        ManagedAddress, MultiEsdtPayment,
+    },
+};
+
+use super::{FunctionCall, TxFrom};
+
+/// Temporary structure for returning a normalized transfer.
+pub struct PaymentConversionResult<Api>
+where
+    Api: ManagedTypeApi,
+{
+    pub to: ManagedAddress<Api>,
+    pub egld_payment: EgldPayment<Api>,
+    pub fc: FunctionCall<Api>,
+}
+
+pub trait TxPayment<Api>
+where
+    Api: CallTypeApi,
+{
+    fn convert_tx_data<From>(
+        self,
+        from: &From,
+        to: ManagedAddress<Api>,
+        fc: FunctionCall<Api>,
+    ) -> PaymentConversionResult<Api>
+    where
+        From: TxFrom<Api>;
+}
+
+impl<Api> TxPayment<Api> for ()
+where
+    Api: CallTypeApi,
+{
+    fn convert_tx_data<From>(
+        self,
+        _from: &From,
+        to: ManagedAddress<Api>,
+        fc: FunctionCall<Api>,
+    ) -> PaymentConversionResult<Api>
+    where
+        From: TxFrom<Api>,
+    {
+        PaymentConversionResult {
+            to,
+            egld_payment: EgldPayment::no_payment(),
+            fc,
+        }
+    }
+}
+
+impl<Api> TxPayment<Api> for EgldPayment<Api>
+where
+    Api: CallTypeApi,
+{
+    fn convert_tx_data<From>(
+        self,
+        _from: &From,
+        to: ManagedAddress<Api>,
+        fc: FunctionCall<Api>,
+    ) -> PaymentConversionResult<Api>
+    where
+        From: TxFrom<Api>,
+    {
+        PaymentConversionResult {
+            to,
+            egld_payment: self,
+            fc,
+        }
+    }
+}
+
+impl<Api> TxPayment<Api> for EsdtTokenPayment<Api>
+where
+    Api: CallTypeApi,
+{
+    fn convert_tx_data<From>(
+        self,
+        from: &From,
+        to: ManagedAddress<Api>,
+        fc: FunctionCall<Api>,
+    ) -> PaymentConversionResult<Api>
+    where
+        From: TxFrom<Api>,
+    {
+        if self.token_nonce == 0 {
+            convert_tx_data_fungible(self, to, fc)
+        } else {
+            convert_tx_data_nft(self, from.to_address(), to, fc)
+        }
+    }
+}
+
+impl<Api> TxPayment<Api> for MultiEsdtPayment<Api>
+where
+    Api: CallTypeApi,
+{
+    fn convert_tx_data<From>(
+        self,
+        from: &From,
+        to: ManagedAddress<Api>,
+        fc: FunctionCall<Api>,
+    ) -> PaymentConversionResult<Api>
+    where
+        From: TxFrom<Api>,
+    {
+        match self.len() {
+            0 => ().convert_tx_data(from, to, fc),
+            1 => self.get(0).convert_tx_data(from, to, fc),
+            _ => convert_tx_data_multi(self, from.to_address(), to, fc),
+        }
+    }
+}
+
+impl<Api> TxPayment<Api> for EgldOrEsdtTokenPayment<Api>
+where
+    Api: CallTypeApi,
+{
+    fn convert_tx_data<From>(
+        self,
+        from: &From,
+        to: ManagedAddress<Api>,
+        fc: FunctionCall<Api>,
+    ) -> PaymentConversionResult<Api>
+    where
+        From: TxFrom<Api>,
+    {
+        self.map_egld_or_esdt(
+            (to, fc),
+            |(to, fc), amount| EgldPayment::from(amount).convert_tx_data(from, to, fc),
+            |(to, fc), esdt_payment| esdt_payment.convert_tx_data(from, to, fc),
+        )
+    }
+}
+
+impl<Api> TxPayment<Api> for EgldOrMultiEsdtPayment<Api>
+where
+    Api: CallTypeApi,
+{
+    fn convert_tx_data<From>(
+        self,
+        from: &From,
+        to: ManagedAddress<Api>,
+        fc: FunctionCall<Api>,
+    ) -> PaymentConversionResult<Api>
+    where
+        From: TxFrom<Api>,
+    {
+        match self {
+            EgldOrMultiEsdtPayment::Egld(egld_amount) => {
+                EgldPayment::from(egld_amount).convert_tx_data(from, to, fc)
+            },
+            EgldOrMultiEsdtPayment::MultiEsdt(multi_esdt_payment) => {
+                multi_esdt_payment.convert_tx_data(from, to, fc)
+            },
+        }
+    }
+}
+
+fn convert_tx_data_fungible<Api>(
+    payment: EsdtTokenPayment<Api>,
+    to: ManagedAddress<Api>,
+    fc: FunctionCall<Api>,
+) -> PaymentConversionResult<Api>
+where
+    Api: ManagedTypeApi,
+{
+    PaymentConversionResult {
+        to,
+        egld_payment: EgldPayment::no_payment(),
+        fc: fc.convert_to_single_transfer_fungible_call(payment),
+    }
+}
+
+fn convert_tx_data_nft<Api>(
+    payment: EsdtTokenPayment<Api>,
+    from: ManagedAddress<Api>,
+    to: ManagedAddress<Api>,
+    fc: FunctionCall<Api>,
+) -> PaymentConversionResult<Api>
+where
+    Api: ManagedTypeApi,
+{
+    PaymentConversionResult {
+        to: from,
+        egld_payment: EgldPayment::no_payment(),
+        fc: fc.convert_to_single_transfer_nft_call(&to, payment),
+    }
+}
+
+fn convert_tx_data_multi<Api>(
+    payment: MultiEsdtPayment<Api>,
+    from: ManagedAddress<Api>,
+    to: ManagedAddress<Api>,
+    fc: FunctionCall<Api>,
+) -> PaymentConversionResult<Api>
+where
+    Api: ManagedTypeApi,
+{
+    PaymentConversionResult {
+        to: from,
+        egld_payment: EgldPayment::no_payment(),
+        fc: fc.convert_to_multi_transfer_esdt_call(&to, payment),
+    }
+}
diff --git a/framework/base/src/types/interaction/tx_to.rs b/framework/base/src/types/interaction/tx_to.rs
new file mode 100644
index 0000000000..88d3e7a427
--- /dev/null
+++ b/framework/base/src/types/interaction/tx_to.rs
@@ -0,0 +1,18 @@
+use crate::{api::ManagedTypeApi, types::ManagedAddress};
+
+pub trait TxTo<Api>
+where
+    Api: ManagedTypeApi,
+{
+}
+
+impl<Api> TxTo<Api> for () where Api: ManagedTypeApi {}
+
+pub trait TxToSpecified<Api>: TxTo<Api>
+where
+    Api: ManagedTypeApi,
+{
+}
+
+impl<Api> TxTo<Api> for ManagedAddress<Api> where Api: ManagedTypeApi {}
+impl<Api> TxToSpecified<Api> for ManagedAddress<Api> where Api: ManagedTypeApi {}
diff --git a/framework/base/src/types/managed/wrapped/egld_or_esdt_token_identifier.rs b/framework/base/src/types/managed/wrapped/egld_or_esdt_token_identifier.rs
index 3e7ae8afb5..ed2c7083a7 100644
--- a/framework/base/src/types/managed/wrapped/egld_or_esdt_token_identifier.rs
+++ b/framework/base/src/types/managed/wrapped/egld_or_esdt_token_identifier.rs
@@ -26,7 +26,7 @@ use crate as multiversx_sc; // required by the ManagedVecItem derive
 #[repr(transparent)]
 #[derive(ManagedVecItem, Clone)]
 pub struct EgldOrEsdtTokenIdentifier<M: ManagedTypeApi> {
-    data: ManagedOption<M, TokenIdentifier<M>>,
+    pub(crate) data: ManagedOption<M, TokenIdentifier<M>>,
 }
 
 impl<M: ManagedTypeApi> EgldOrEsdtTokenIdentifier<M> {
diff --git a/framework/base/src/types/managed/wrapped/egld_or_esdt_token_payment.rs b/framework/base/src/types/managed/wrapped/egld_or_esdt_token_payment.rs
index ed76946617..8d5e692610 100644
--- a/framework/base/src/types/managed/wrapped/egld_or_esdt_token_payment.rs
+++ b/framework/base/src/types/managed/wrapped/egld_or_esdt_token_payment.rs
@@ -53,6 +53,29 @@ impl<M: ManagedTypeApi> EgldOrEsdtTokenPayment<M> {
         )
     }
 
+    /// Equivalent to a `match { Egld | Esdt }`.
+    ///
+    /// Context passed on from function to closures, to avoid ownership issues.
+    /// More precisely, since only one of the two closures `for_egld` and `for_esdt` is called,
+    /// it is ok for them to have fully owned access to anything from the environment.
+    /// The compiler doesn't know that only one of them can ever be called,
+    /// so if we pass context to both closures, it will complain that they are moved twice..
+    pub fn map_egld_or_esdt<Context, D, F, U>(self, context: Context, for_egld: D, for_esdt: F) -> U
+    where
+        D: FnOnce(Context, BigUint<M>) -> U,
+        F: FnOnce(Context, EsdtTokenPayment<M>) -> U,
+    {
+        if self.token_identifier.data.is_some() {
+            let token_identifier = unsafe { self.token_identifier.data.unwrap_no_check() };
+            for_esdt(
+                context,
+                EsdtTokenPayment::new(token_identifier, self.token_nonce, self.amount),
+            )
+        } else {
+            for_egld(context, self.amount)
+        }
+    }
+
     pub fn into_tuple(self) -> (EgldOrEsdtTokenIdentifier<M>, u64, BigUint<M>) {
         (self.token_identifier, self.token_nonce, self.amount)
     }
diff --git a/framework/base/src/types/managed/wrapped/egld_payment.rs b/framework/base/src/types/managed/wrapped/egld_payment.rs
new file mode 100644
index 0000000000..f4c190e899
--- /dev/null
+++ b/framework/base/src/types/managed/wrapped/egld_payment.rs
@@ -0,0 +1,30 @@
+use crate::{api::ManagedTypeApi, types::BigUint};
+
+/// Simple newtype wrapper around a BigUint value.
+///
+/// Its purpose is to indicate
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub struct EgldPayment<Api>
+where
+    Api: ManagedTypeApi + 'static,
+{
+    pub value: BigUint<Api>,
+}
+
+impl<Api> From<BigUint<Api>> for EgldPayment<Api>
+where
+    Api: ManagedTypeApi + 'static,
+{
+    fn from(value: BigUint<Api>) -> Self {
+        EgldPayment { value }
+    }
+}
+
+impl<Api> EgldPayment<Api>
+where
+    Api: ManagedTypeApi + 'static,
+{
+    pub fn no_payment() -> Self {
+        EgldPayment::from(BigUint::zero())
+    }
+}
diff --git a/framework/base/src/types/managed/wrapped/managed_option.rs b/framework/base/src/types/managed/wrapped/managed_option.rs
index 64766f43db..99160ff5cd 100644
--- a/framework/base/src/types/managed/wrapped/managed_option.rs
+++ b/framework/base/src/types/managed/wrapped/managed_option.rs
@@ -73,9 +73,16 @@ where
         !self.is_none()
     }
 
+    /// Assumes that value is Some and unwraps without checking.
+    ///
+    /// Must always be called under an `if` checking `.is_some()`, otherwise will lead to undefined behaviour.
+    pub unsafe fn unwrap_no_check(self) -> T {
+        T::from_handle(self.handle)
+    }
+
     pub fn into_option(self) -> Option<T> {
         if self.is_some() {
-            Some(T::from_handle(self.handle))
+            Some(unsafe { self.unwrap_no_check() })
         } else {
             None
         }
@@ -91,7 +98,7 @@ where
 
     pub fn unwrap_or_else<F: Fn() -> T>(self, f: F) -> T {
         if self.is_some() {
-            T::from_handle(self.handle)
+            unsafe { self.unwrap_no_check() }
         } else {
             f()
         }
@@ -107,7 +114,7 @@ where
         F: FnOnce(T) -> U,
     {
         if self.is_some() {
-            ManagedOption::<M, U>::some(f(T::from_handle(self.handle)))
+            ManagedOption::<M, U>::some(f(unsafe { self.unwrap_no_check() }))
         } else {
             ManagedOption::<M, U>::none()
         }
@@ -119,7 +126,7 @@ where
         F: FnOnce(T) -> U,
     {
         if self.is_some() {
-            f(T::from_handle(self.handle))
+            f(unsafe { self.unwrap_no_check() })
         } else {
             default()
         }
diff --git a/framework/base/src/types/managed/wrapped/mod.rs b/framework/base/src/types/managed/wrapped/mod.rs
index 8ac485fa38..dee1161f44 100644
--- a/framework/base/src/types/managed/wrapped/mod.rs
+++ b/framework/base/src/types/managed/wrapped/mod.rs
@@ -1,6 +1,7 @@
 mod egld_or_esdt_token_identifier;
 mod egld_or_esdt_token_payment;
 mod egld_or_multi_esdt_payment;
+mod egld_payment;
 mod encoded_managed_vec_item;
 mod esdt_token_data;
 mod esdt_token_payment;
@@ -21,6 +22,7 @@ mod token_identifier;
 pub use egld_or_esdt_token_identifier::EgldOrEsdtTokenIdentifier;
 pub use egld_or_esdt_token_payment::EgldOrEsdtTokenPayment;
 pub use egld_or_multi_esdt_payment::EgldOrMultiEsdtPayment;
+pub use egld_payment::EgldPayment;
 pub(crate) use encoded_managed_vec_item::EncodedManagedVecItem;
 pub use esdt_token_data::EsdtTokenData;
 pub use esdt_token_payment::{EsdtTokenPayment, MultiEsdtPayment};

From 669ff3a742f0a2f1715d22022e00a98b73dc590c Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 31 Oct 2023 12:37:15 +0200
Subject: [PATCH 0026/1254] unified tx syntax - transfer-execute

---
 .../src/rewards_distribution.rs               |  10 +-
 .../composability/vault/src/vault.rs          |  13 +-
 .../src/contract_base/contract_base_trait.rs  |   8 +-
 .../wrappers/send_raw_wrapper.rs              |  12 +-
 .../contract_base/wrappers/send_wrapper.rs    |   6 -
 .../interaction/contract_call_no_payment.rs   |   5 +
 framework/base/src/types/interaction/tx.rs    | 131 +++++++++++++++---
 .../base/src/types/interaction/tx_data.rs     |  10 ++
 .../base/src/types/interaction/tx_gas.rs      |  32 ++++-
 .../types/interaction/tx_normalize_call.rs    |  91 ------------
 .../base/src/types/interaction/tx_payment.rs  | 113 +++++++++++++++
 framework/base/src/types/interaction/tx_to.rs |  30 +++-
 .../wrapped/egld_or_multi_esdt_payment.rs     |   9 ++
 13 files changed, 330 insertions(+), 140 deletions(-)
 delete mode 100644 framework/base/src/types/interaction/tx_normalize_call.rs

diff --git a/contracts/examples/rewards-distribution/src/rewards_distribution.rs b/contracts/examples/rewards-distribution/src/rewards_distribution.rs
index 59672da272..da8492e19e 100644
--- a/contracts/examples/rewards-distribution/src/rewards_distribution.rs
+++ b/contracts/examples/rewards-distribution/src/rewards_distribution.rs
@@ -267,10 +267,12 @@ pub trait RewardsDistribution:
             }
         }
 
-        self.send()
-            .direct_non_zero_egld(&caller, &total_egld_reward);
-        self.send().direct_multi(&caller, &rewards);
-        self.send().direct_multi(&caller, &nfts);
+        self.tx().to(&caller).egld(total_egld_reward).transfer();
+        self.tx().to(&caller).multi_esdt(rewards).transfer();
+        self.tx()
+            .to(&caller)
+            .multi_esdt(nfts.clone_value())
+            .transfer();
     }
 
     fn claim_reward_token(
diff --git a/contracts/feature-tests/composability/vault/src/vault.rs b/contracts/feature-tests/composability/vault/src/vault.rs
index 4cebf5bc43..758aa4444b 100644
--- a/contracts/feature-tests/composability/vault/src/vault.rs
+++ b/contracts/feature-tests/composability/vault/src/vault.rs
@@ -151,10 +151,12 @@ pub trait Vault {
         let caller = self.blockchain().get_caller();
 
         if let Some(esdt_token_id) = token.into_esdt_option() {
-            self.send()
-                .direct_esdt(&caller, &esdt_token_id, nonce, &amount);
+            self.tx()
+                .to(caller)
+                .esdt((esdt_token_id, nonce, amount))
+                .transfer();
         } else {
-            self.send().direct_egld(&caller, &amount);
+            self.tx().to(caller).egld(amount).transfer();
         }
     }
 
@@ -172,7 +174,7 @@ pub trait Vault {
             all_payments.push(EsdtTokenPayment::new(token_id, nonce, amount));
         }
 
-        self.send().direct_multi(&caller, &all_payments);
+        self.tx().to(caller).multi_esdt(all_payments).transfer();
     }
 
     #[payable("*")]
@@ -210,8 +212,7 @@ pub trait Vault {
             ));
         }
 
-        self.send()
-            .direct_multi(&self.blockchain().get_caller(), &new_tokens);
+        self.tx().to_caller().multi_esdt(new_tokens).transfer();
     }
 
     #[event("accept_funds")]
diff --git a/framework/base/src/contract_base/contract_base_trait.rs b/framework/base/src/contract_base/contract_base_trait.rs
index cec45dfa0f..bf5fcc7654 100644
--- a/framework/base/src/contract_base/contract_base_trait.rs
+++ b/framework/base/src/contract_base/contract_base_trait.rs
@@ -2,7 +2,7 @@ use super::{
     BlockchainWrapper, CallValueWrapper, CryptoWrapper, ErrorHelper, ManagedSerializer,
     SendRawWrapper, SendWrapper, StorageRawWrapper,
 };
-use crate::api::VMApi;
+use crate::{api::VMApi, types::TxBase};
 
 /// Interface to be used by the actual smart contract code.
 ///
@@ -26,6 +26,12 @@ pub trait ContractBase: Sized {
         SendWrapper::new()
     }
 
+    /// Starts the declaration of a new transaction.
+    #[inline]
+    fn tx(&self) -> TxBase<Self::Api> {
+        TxBase::new()
+    }
+
     /// Low-level functionality related to sending transactions from the current contract.
     ///
     /// For almost all cases contracts should instead use `self.send()` and `ContractCall`.
diff --git a/framework/base/src/contract_base/wrappers/send_raw_wrapper.rs b/framework/base/src/contract_base/wrappers/send_raw_wrapper.rs
index 5635c0b44a..5d290369df 100644
--- a/framework/base/src/contract_base/wrappers/send_raw_wrapper.rs
+++ b/framework/base/src/contract_base/wrappers/send_raw_wrapper.rs
@@ -79,20 +79,12 @@ where
         &self,
         to: &ManagedAddress<A>,
         token: &TokenIdentifier<A>,
-        egld_value: &BigUint<A>,
+        value: &BigUint<A>,
         gas_limit: u64,
         endpoint_name: &ManagedBuffer<A>,
         arg_buffer: &ManagedArgBuffer<A>,
     ) -> Result<(), &'static [u8]> {
-        self.transfer_esdt_nft_execute(
-            to,
-            token,
-            0,
-            egld_value,
-            gas_limit,
-            endpoint_name,
-            arg_buffer,
-        )
+        self.transfer_esdt_nft_execute(to, token, 0, value, gas_limit, endpoint_name, arg_buffer)
     }
 
     #[allow(clippy::too_many_arguments)]
diff --git a/framework/base/src/contract_base/wrappers/send_wrapper.rs b/framework/base/src/contract_base/wrappers/send_wrapper.rs
index aa7ae5c653..78f4f045d6 100644
--- a/framework/base/src/contract_base/wrappers/send_wrapper.rs
+++ b/framework/base/src/contract_base/wrappers/send_wrapper.rs
@@ -15,7 +15,6 @@ use crate::{
     types::{
         BigUint, ContractCall, ContractCallNoPayment, EgldOrEsdtTokenIdentifier, EsdtTokenPayment,
         ManagedAddress, ManagedArgBuffer, ManagedBuffer, ManagedType, ManagedVec, TokenIdentifier,
-        TxBase,
     },
 };
 
@@ -71,11 +70,6 @@ where
         ContractCallNoPayment::new(to, endpoint_name)
     }
 
-    #[inline]
-    pub fn tx(&self) -> TxBase<A> {
-        TxBase::new()
-    }
-
     /// Sends EGLD to a given address, directly.
     /// Used especially for sending EGLD to regular accounts.
     #[inline]
diff --git a/framework/base/src/types/interaction/contract_call_no_payment.rs b/framework/base/src/types/interaction/contract_call_no_payment.rs
index 7198f71cd1..c8866ddf55 100644
--- a/framework/base/src/types/interaction/contract_call_no_payment.rs
+++ b/framework/base/src/types/interaction/contract_call_no_payment.rs
@@ -14,6 +14,7 @@ use super::{
     contract_call_exec::UNSPECIFIED_GAS_LIMIT, contract_call_with_egld::ContractCallWithEgld,
     contract_call_with_multi_esdt::ContractCallWithMultiEsdt, ContractCall,
     ContractCallWithAnyPayment, ContractCallWithEgldOrSingleEsdt, FunctionCall, ManagedArgBuffer,
+    Tx,
 };
 
 /// Holds metadata for calling another contract, without payments.
@@ -166,4 +167,8 @@ where
     pub fn into_function_call(self) -> FunctionCall<SA> {
         self.function_call
     }
+
+    pub fn tx(self) -> Tx<SA, (), (), (), (), FunctionCall<SA>> {
+        Tx::new().call(self.function_call)
+    }
 }
diff --git a/framework/base/src/types/interaction/tx.rs b/framework/base/src/types/interaction/tx.rs
index 7b1da10187..f173ef3dfb 100644
--- a/framework/base/src/types/interaction/tx.rs
+++ b/framework/base/src/types/interaction/tx.rs
@@ -4,13 +4,16 @@ use multiversx_sc_codec::TopEncodeMulti;
 
 use crate::{
     api::CallTypeApi,
+    contract_base::BlockchainWrapper,
     types::{
         BigUint, EgldPayment, EsdtTokenPayment, ManagedAddress, ManagedBuffer, ManagedVec,
         MultiEsdtPayment,
     },
 };
 
-use super::{AsyncCall, ExplicitGas, FunctionCall, TxData, TxFrom, TxGas, TxPayment, TxTo};
+use super::{
+    AsyncCall, ExplicitGas, FunctionCall, TxData, TxFrom, TxGas, TxPayment, TxTo, TxToSpecified,
+};
 
 pub struct Tx<Api, From, To, Payment, Gas, Data>
 where
@@ -38,6 +41,7 @@ where
     Gas: TxGas,
     Data: TxData<Api>,
 {
+    /// TODO: does nothing, delete, added for easier copy-paste.
     #[inline]
     pub fn nothing(self) -> Tx<Api, From, To, Payment, Gas, Data> {
         Tx {
@@ -53,12 +57,12 @@ where
 
 pub type TxBase<Api> = Tx<Api, (), (), (), (), ()>;
 
-impl<Api> TxBase<Api>
+impl<Api> Default for TxBase<Api>
 where
     Api: CallTypeApi + 'static,
 {
     #[inline]
-    pub fn new() -> Self {
+    fn default() -> Self {
         Tx {
             _phantom: PhantomData,
             from: (),
@@ -70,6 +74,16 @@ where
     }
 }
 
+impl<Api> TxBase<Api>
+where
+    Api: CallTypeApi + 'static,
+{
+    #[inline]
+    pub fn new() -> Self {
+        Self::default()
+    }
+}
+
 impl<Api, To, Payment, Gas, Data> Tx<Api, (), To, Payment, Gas, Data>
 where
     Api: CallTypeApi + 'static,
@@ -78,7 +92,6 @@ where
     Gas: TxGas,
     Data: TxData<Api>,
 {
-    #[inline]
     pub fn from<From>(self, from: From) -> Tx<Api, From, To, Payment, Gas, Data>
     where
         From: TxFrom<Api>,
@@ -102,7 +115,6 @@ where
     Gas: TxGas,
     Data: TxData<Api>,
 {
-    #[inline]
     pub fn to<To>(self, to: To) -> Tx<Api, From, To, Payment, Gas, Data>
     where
         To: TxTo<Api>,
@@ -116,6 +128,11 @@ where
             data: self.data,
         }
     }
+
+    pub fn to_caller(self) -> Tx<Api, From, ManagedAddress<Api>, Payment, Gas, Data> {
+        let caller = BlockchainWrapper::<Api>::new().get_caller();
+        self.to(caller)
+    }
 }
 
 impl<Api, From, To, Gas, Data> Tx<Api, From, To, (), Gas, Data>
@@ -126,11 +143,7 @@ where
     Gas: TxGas,
     Data: TxData<Api>,
 {
-    #[inline]
-    pub fn with_egld_transfer(
-        self,
-        egld_amount: BigUint<Api>,
-    ) -> Tx<Api, From, To, EgldPayment<Api>, Gas, Data> {
+    pub fn egld(self, egld_amount: BigUint<Api>) -> Tx<Api, From, To, EgldPayment<Api>, Gas, Data> {
         Tx {
             _phantom: PhantomData,
             from: self.from,
@@ -143,6 +156,47 @@ where
 }
 
 impl<Api, From, To, Gas, Data> Tx<Api, From, To, (), Gas, Data>
+where
+    Api: CallTypeApi + 'static,
+    From: TxFrom<Api>,
+    To: TxTo<Api>,
+    Gas: TxGas,
+    Data: TxData<Api>,
+{
+    /// Adds a single ESDT token transfer to a transaction.
+    ///
+    /// Since this is the first ESDT payment, a single payment tx is produced. Can be called again for multiple payments.
+    pub fn esdt<P: Into<EsdtTokenPayment<Api>>>(
+        self,
+        payment: P,
+    ) -> Tx<Api, From, To, EsdtTokenPayment<Api>, Gas, Data> {
+        Tx {
+            _phantom: PhantomData,
+            from: self.from,
+            to: self.to,
+            payment: payment.into(),
+            gas: self.gas,
+            data: self.data,
+        }
+    }
+
+    /// Adds a collection of ESDT payments to a transaction.
+    pub fn multi_esdt(
+        self,
+        payments: MultiEsdtPayment<Api>, // TODO: references
+    ) -> Tx<Api, From, To, MultiEsdtPayment<Api>, Gas, Data> {
+        Tx {
+            _phantom: PhantomData,
+            from: self.from,
+            to: self.to,
+            payment: payments,
+            gas: self.gas,
+            data: self.data,
+        }
+    }
+}
+
+impl<Api, From, To, Gas, Data> Tx<Api, From, To, EsdtTokenPayment<Api>, Gas, Data>
 where
     Api: CallTypeApi + 'static,
     From: TxFrom<Api>,
@@ -153,12 +207,12 @@ where
     /// Adds a single ESDT token transfer to a contract call.
     ///
     /// Can be called multiple times on the same call.
-    #[inline]
     pub fn with_esdt_transfer<P: Into<EsdtTokenPayment<Api>>>(
         self,
         payment: P,
     ) -> Tx<Api, From, To, MultiEsdtPayment<Api>, Gas, Data> {
         let mut payments = ManagedVec::new();
+        payments.push(self.payment);
         payments.push(payment.into());
         Tx {
             _phantom: PhantomData,
@@ -182,7 +236,6 @@ where
     /// Adds a single ESDT token transfer to a contract call.
     ///
     /// Can be called multiple times on the same call.
-    #[inline]
     pub fn with_esdt_transfer<P: Into<EsdtTokenPayment<Api>>>(
         mut self,
         payment: P,
@@ -223,9 +276,9 @@ where
     Gas: TxGas,
 {
     #[inline]
-    pub fn call<F: Into<FunctionCall<Api>>>(
+    pub fn call<FC: Into<FunctionCall<Api>>>(
         self,
-        call: F,
+        call: FC,
     ) -> Tx<Api, From, To, Payment, Gas, FunctionCall<Api>> {
         Tx {
             _phantom: PhantomData,
@@ -268,17 +321,20 @@ where
     }
 }
 
-impl<Api, From, Payment, Gas> Tx<Api, From, ManagedAddress<Api>, Payment, Gas, FunctionCall<Api>>
+impl<Api, From, To, Payment, Gas> Tx<Api, From, To, Payment, Gas, FunctionCall<Api>>
 where
     Api: CallTypeApi + 'static,
     From: TxFrom<Api>,
+    To: TxToSpecified<Api>,
     Payment: TxPayment<Api>,
     Gas: TxGas,
 {
     pub fn normalize_tx(
         self,
     ) -> Tx<Api, From, ManagedAddress<Api>, EgldPayment<Api>, Gas, FunctionCall<Api>> {
-        let result = self.payment.convert_tx_data(&self.from, self.to, self.data);
+        let result = self
+            .payment
+            .convert_tx_data(&self.from, self.to.into_address(), self.data);
         Tx {
             _phantom: PhantomData,
             from: self.from,
@@ -290,9 +346,10 @@ where
     }
 }
 
-impl<Api, Payment> Tx<Api, (), ManagedAddress<Api>, Payment, (), FunctionCall<Api>>
+impl<Api, To, Payment> Tx<Api, (), To, Payment, (), FunctionCall<Api>>
 where
     Api: CallTypeApi + 'static,
+    To: TxToSpecified<Api>,
     Payment: TxPayment<Api>,
 {
     pub fn async_call(self) -> AsyncCall<Api> {
@@ -306,9 +363,10 @@ where
     }
 }
 
-impl<Api, Payment> Tx<Api, (), ManagedAddress<Api>, Payment, ExplicitGas, FunctionCall<Api>>
+impl<Api, To, Payment> Tx<Api, (), To, Payment, ExplicitGas, FunctionCall<Api>>
 where
     Api: CallTypeApi + 'static,
+    To: TxToSpecified<Api>,
     Payment: TxPayment<Api>,
 {
     #[cfg(feature = "promises")]
@@ -325,3 +383,40 @@ where
         }
     }
 }
+
+impl<Api, From, To, Payment, Gas, FC> Tx<Api, From, To, Payment, Gas, FC>
+where
+    Api: CallTypeApi + 'static,
+    From: TxFrom<Api>,
+    To: TxToSpecified<Api>,
+    Payment: TxPayment<Api>,
+    Gas: TxGas,
+    FC: TxData<Api> + Into<FunctionCall<Api>>,
+{
+    pub fn transfer_execute(self) {
+        if self.payment.is_no_payment() && self.data.is_no_call() {
+            return;
+        }
+
+        let gas_limit = self.gas.resolve_gas::<Api>();
+        self.payment.perform_transfer_execute(
+            self.to.to_address_ref(),
+            gas_limit,
+            self.data.into(),
+        );
+    }
+}
+
+impl<Api, From, To, Payment, Gas> Tx<Api, From, To, Payment, Gas, ()>
+where
+    Api: CallTypeApi + 'static,
+    From: TxFrom<Api>,
+    To: TxToSpecified<Api>,
+    Payment: TxPayment<Api>,
+    Gas: TxGas,
+{
+    /// Syntactic sugar, only allowed for simple transfers.
+    pub fn transfer(self) {
+        self.transfer_execute()
+    }
+}
diff --git a/framework/base/src/types/interaction/tx_data.rs b/framework/base/src/types/interaction/tx_data.rs
index 440cdbdcb3..e49038a1f7 100644
--- a/framework/base/src/types/interaction/tx_data.rs
+++ b/framework/base/src/types/interaction/tx_data.rs
@@ -10,6 +10,8 @@ pub trait TxData<Api>
 where
     Api: ManagedTypeApi,
 {
+    fn is_no_call(&self) -> bool;
+
     fn to_call_data_string(&self) -> ManagedBuffer<Api>;
 }
 
@@ -17,6 +19,10 @@ impl<Api> TxData<Api> for ()
 where
     Api: ManagedTypeApi,
 {
+    fn is_no_call(&self) -> bool {
+        true
+    }
+
     fn to_call_data_string(&self) -> ManagedBuffer<Api> {
         ManagedBuffer::new()
     }
@@ -26,6 +32,10 @@ impl<Api> TxData<Api> for FunctionCall<Api>
 where
     Api: ManagedTypeApi,
 {
+    fn is_no_call(&self) -> bool {
+        self.is_empty()
+    }
+
     fn to_call_data_string(&self) -> ManagedBuffer<Api> {
         let mut result = ManagedBufferCachedBuilder::default();
         result.append_managed_buffer(&self.function_name);
diff --git a/framework/base/src/types/interaction/tx_gas.rs b/framework/base/src/types/interaction/tx_gas.rs
index 475a15d1bf..dcb37140b7 100644
--- a/framework/base/src/types/interaction/tx_gas.rs
+++ b/framework/base/src/types/interaction/tx_gas.rs
@@ -1,7 +1,33 @@
-pub trait TxGas {}
+use crate::api::{BlockchainApiImpl, CallTypeApi};
 
-impl TxGas for () {}
+use super::contract_call_exec::TRANSFER_EXECUTE_DEFAULT_LEFTOVER;
+
+pub trait TxGas {
+    fn resolve_gas<Api>(&self) -> u64
+    where
+        Api: CallTypeApi + 'static;
+}
+
+impl TxGas for () {
+    fn resolve_gas<Api>(&self) -> u64
+    where
+        Api: CallTypeApi + 'static,
+    {
+        let mut gas_left = Api::blockchain_api_impl().get_gas_left();
+        if gas_left > TRANSFER_EXECUTE_DEFAULT_LEFTOVER {
+            gas_left -= TRANSFER_EXECUTE_DEFAULT_LEFTOVER;
+        }
+        gas_left
+    }
+}
 
 pub struct ExplicitGas(pub u64);
 
-impl TxGas for ExplicitGas {}
+impl TxGas for ExplicitGas {
+    fn resolve_gas<Api>(&self) -> u64
+    where
+        Api: CallTypeApi + 'static,
+    {
+        self.0
+    }
+}
diff --git a/framework/base/src/types/interaction/tx_normalize_call.rs b/framework/base/src/types/interaction/tx_normalize_call.rs
deleted file mode 100644
index 8a9cfb4fde..0000000000
--- a/framework/base/src/types/interaction/tx_normalize_call.rs
+++ /dev/null
@@ -1,91 +0,0 @@
-use core::marker::PhantomData;
-
-use crate::{
-    api::CallTypeApi,
-    types::{BigUint, EgldPayment, ManagedAddress},
-};
-
-use super::{AsyncCall, FunctionCall, Tx, TxData, TxFrom, TxGas};
-
-/// Encodes
-pub type NormalizedTx<Api, From, Gas> =
-    Tx<Api, From, ManagedAddress<Api>, EgldPayment<Api>, Gas, FunctionCall<Api>>;
-
-pub trait TxNormalizeCall<Api, From, Gas>
-where
-    Api: CallTypeApi + 'static,
-    From: TxFrom<Api>,
-    Gas: TxGas,
-{
-    fn normalize_call(self) -> NormalizedTx<Api, From, Gas>;
-}
-
-impl<Api, From, Gas, Call> TxNormalizeCall<Api, From, Gas>
-    for Tx<Api, From, ManagedAddress<Api>, (), Gas, Call>
-where
-    Api: CallTypeApi + 'static,
-    From: TxFrom<Api>,
-    Gas: TxGas,
-    Call: TxData<Api> + Into<FunctionCall<Api>>,
-{
-    fn normalize_call(self) -> NormalizedTx<Api, From, Gas> {
-        Tx {
-            _phantom: PhantomData,
-            from: self.from,
-            to: self.to,
-            payment: EgldPayment {
-                value: BigUint::zero(),
-            },
-            gas: self.gas,
-            data: self.data.into(),
-        }
-    }
-}
-
-impl<Api, From, Gas, Call> TxNormalizeCall<Api, From, Gas>
-    for Tx<Api, From, ManagedAddress<Api>, EgldPayment<Api>, Gas, Call>
-where
-    Api: CallTypeApi + 'static,
-    From: TxFrom<Api>,
-    Gas: TxGas,
-    Call: TxData<Api> + Into<FunctionCall<Api>>,
-{
-    fn normalize_call(self) -> NormalizedTx<Api, From, Gas> {
-        Tx {
-            _phantom: PhantomData,
-            from: self.from,
-            to: self.to,
-            payment: self.payment,
-            gas: self.gas,
-            data: self.data.into(),
-        }
-    }
-}
-
-impl<Api, From, Gas> NormalizedTx<Api, From, Gas>
-where
-    Api: CallTypeApi + 'static,
-    From: TxFrom<Api>,
-    Gas: TxGas,
-{
-    fn async_call(self) -> AsyncCall<Api> {
-        AsyncCall {
-            to: self.to,
-            egld_payment: self.payment.value,
-            function_call: self.data,
-            callback_call: None,
-        }
-    }
-
-    // #[cfg(feature = "promises")]
-    // fn async_call_promise(self) -> super::AsyncCallPromises<SA> {
-    //     super::AsyncCallPromises {
-    //         to: self.basic.to,
-    //         egld_payment: self.egld_payment,
-    //         function_call: self.basic.function_call,
-    //         explicit_gas_limit: self.basic.explicit_gas_limit,
-    //         extra_gas_for_callback: 0,
-    //         callback_call: None,
-    //     }
-    // }
-}
diff --git a/framework/base/src/types/interaction/tx_payment.rs b/framework/base/src/types/interaction/tx_payment.rs
index e36d43cfc5..6daa4ebd27 100644
--- a/framework/base/src/types/interaction/tx_payment.rs
+++ b/framework/base/src/types/interaction/tx_payment.rs
@@ -1,5 +1,6 @@
 use crate::{
     api::{CallTypeApi, ManagedTypeApi},
+    contract_base::SendRawWrapper,
     types::{
         EgldOrEsdtTokenPayment, EgldOrMultiEsdtPayment, EgldPayment, EsdtTokenPayment,
         ManagedAddress, MultiEsdtPayment,
@@ -22,6 +23,8 @@ pub trait TxPayment<Api>
 where
     Api: CallTypeApi,
 {
+    fn is_no_payment(&self) -> bool;
+
     fn convert_tx_data<From>(
         self,
         from: &From,
@@ -30,12 +33,23 @@ where
     ) -> PaymentConversionResult<Api>
     where
         From: TxFrom<Api>;
+
+    fn perform_transfer_execute(
+        self,
+        to: &ManagedAddress<Api>,
+        gas_limit: u64,
+        fc: FunctionCall<Api>,
+    );
 }
 
 impl<Api> TxPayment<Api> for ()
 where
     Api: CallTypeApi,
 {
+    fn is_no_payment(&self) -> bool {
+        true
+    }
+
     fn convert_tx_data<From>(
         self,
         _from: &From,
@@ -51,12 +65,25 @@ where
             fc,
         }
     }
+
+    fn perform_transfer_execute(
+        self,
+        to: &ManagedAddress<Api>,
+        gas_limit: u64,
+        fc: FunctionCall<Api>,
+    ) {
+        EgldPayment::no_payment().perform_transfer_execute(to, gas_limit, fc);
+    }
 }
 
 impl<Api> TxPayment<Api> for EgldPayment<Api>
 where
     Api: CallTypeApi,
 {
+    fn is_no_payment(&self) -> bool {
+        self.value == 0u32
+    }
+
     fn convert_tx_data<From>(
         self,
         _from: &From,
@@ -72,12 +99,31 @@ where
             fc,
         }
     }
+
+    fn perform_transfer_execute(
+        self,
+        to: &ManagedAddress<Api>,
+        gas_limit: u64,
+        fc: FunctionCall<Api>,
+    ) {
+        let _ = SendRawWrapper::<Api>::new().direct_egld_execute(
+            to,
+            &self.value,
+            gas_limit,
+            &fc.function_name,
+            &fc.arg_buffer,
+        );
+    }
 }
 
 impl<Api> TxPayment<Api> for EsdtTokenPayment<Api>
 where
     Api: CallTypeApi,
 {
+    fn is_no_payment(&self) -> bool {
+        self.amount == 0u32
+    }
+
     fn convert_tx_data<From>(
         self,
         from: &From,
@@ -93,12 +139,25 @@ where
             convert_tx_data_nft(self, from.to_address(), to, fc)
         }
     }
+
+    fn perform_transfer_execute(
+        self,
+        to: &ManagedAddress<Api>,
+        gas_limit: u64,
+        fc: FunctionCall<Api>,
+    ) {
+        MultiEsdtPayment::from_single_item(self).perform_transfer_execute(to, gas_limit, fc)
+    }
 }
 
 impl<Api> TxPayment<Api> for MultiEsdtPayment<Api>
 where
     Api: CallTypeApi,
 {
+    fn is_no_payment(&self) -> bool {
+        self.is_empty()
+    }
+
     fn convert_tx_data<From>(
         self,
         from: &From,
@@ -114,12 +173,31 @@ where
             _ => convert_tx_data_multi(self, from.to_address(), to, fc),
         }
     }
+
+    fn perform_transfer_execute(
+        self,
+        to: &ManagedAddress<Api>,
+        gas_limit: u64,
+        fc: FunctionCall<Api>,
+    ) {
+        let _ = SendRawWrapper::<Api>::new().multi_esdt_transfer_execute(
+            to,
+            &self,
+            gas_limit,
+            &fc.function_name,
+            &fc.arg_buffer,
+        );
+    }
 }
 
 impl<Api> TxPayment<Api> for EgldOrEsdtTokenPayment<Api>
 where
     Api: CallTypeApi,
 {
+    fn is_no_payment(&self) -> bool {
+        self.amount == 0u32
+    }
+
     fn convert_tx_data<From>(
         self,
         from: &From,
@@ -135,12 +213,31 @@ where
             |(to, fc), esdt_payment| esdt_payment.convert_tx_data(from, to, fc),
         )
     }
+
+    fn perform_transfer_execute(
+        self,
+        to: &ManagedAddress<Api>,
+        gas_limit: u64,
+        fc: FunctionCall<Api>,
+    ) {
+        self.map_egld_or_esdt(
+            (to, fc),
+            |(to, fc), amount| {
+                EgldPayment::from(amount).perform_transfer_execute(to, gas_limit, fc)
+            },
+            |(to, fc), esdt_payment| esdt_payment.perform_transfer_execute(to, gas_limit, fc),
+        )
+    }
 }
 
 impl<Api> TxPayment<Api> for EgldOrMultiEsdtPayment<Api>
 where
     Api: CallTypeApi,
 {
+    fn is_no_payment(&self) -> bool {
+        self.is_empty()
+    }
+
     fn convert_tx_data<From>(
         self,
         from: &From,
@@ -159,6 +256,22 @@ where
             },
         }
     }
+
+    fn perform_transfer_execute(
+        self,
+        to: &ManagedAddress<Api>,
+        gas_limit: u64,
+        fc: FunctionCall<Api>,
+    ) {
+        match self {
+            EgldOrMultiEsdtPayment::Egld(egld_amount) => {
+                EgldPayment::from(egld_amount).perform_transfer_execute(to, gas_limit, fc)
+            },
+            EgldOrMultiEsdtPayment::MultiEsdt(multi_esdt_payment) => {
+                multi_esdt_payment.perform_transfer_execute(to, gas_limit, fc)
+            },
+        }
+    }
 }
 
 fn convert_tx_data_fungible<Api>(
diff --git a/framework/base/src/types/interaction/tx_to.rs b/framework/base/src/types/interaction/tx_to.rs
index 88d3e7a427..62aad803a7 100644
--- a/framework/base/src/types/interaction/tx_to.rs
+++ b/framework/base/src/types/interaction/tx_to.rs
@@ -12,7 +12,35 @@ pub trait TxToSpecified<Api>: TxTo<Api>
 where
     Api: ManagedTypeApi,
 {
+    fn to_address_ref(&self) -> &ManagedAddress<Api>;
+
+    fn into_address(self) -> ManagedAddress<Api>;
 }
 
 impl<Api> TxTo<Api> for ManagedAddress<Api> where Api: ManagedTypeApi {}
-impl<Api> TxToSpecified<Api> for ManagedAddress<Api> where Api: ManagedTypeApi {}
+impl<Api> TxToSpecified<Api> for ManagedAddress<Api>
+where
+    Api: ManagedTypeApi,
+{
+    fn to_address_ref(&self) -> &ManagedAddress<Api> {
+        self
+    }
+
+    fn into_address(self) -> ManagedAddress<Api> {
+        self
+    }
+}
+
+impl<Api> TxTo<Api> for &ManagedAddress<Api> where Api: ManagedTypeApi {}
+impl<Api> TxToSpecified<Api> for &ManagedAddress<Api>
+where
+    Api: ManagedTypeApi,
+{
+    fn to_address_ref(&self) -> &ManagedAddress<Api> {
+        self
+    }
+
+    fn into_address(self) -> ManagedAddress<Api> {
+        self.clone()
+    }
+}
diff --git a/framework/base/src/types/managed/wrapped/egld_or_multi_esdt_payment.rs b/framework/base/src/types/managed/wrapped/egld_or_multi_esdt_payment.rs
index c71aa249d7..730f7b22a9 100644
--- a/framework/base/src/types/managed/wrapped/egld_or_multi_esdt_payment.rs
+++ b/framework/base/src/types/managed/wrapped/egld_or_multi_esdt_payment.rs
@@ -24,3 +24,12 @@ pub enum EgldOrMultiEsdtPayment<M: ManagedTypeApi> {
 }
 
 impl<M> CodecFromSelf for EgldOrMultiEsdtPayment<M> where M: ManagedTypeApi {}
+
+impl<M: ManagedTypeApi> EgldOrMultiEsdtPayment<M> {
+    pub fn is_empty(&self) -> bool {
+        match self {
+            EgldOrMultiEsdtPayment::Egld(egld_value) => egld_value == &0u32,
+            EgldOrMultiEsdtPayment::MultiEsdt(esdt_payments) => esdt_payments.is_empty(),
+        }
+    }
+}

From ae054e168cbceb041382cc72101917257aa13e31 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Sun, 5 Nov 2023 02:30:54 +0200
Subject: [PATCH 0027/1254] unified tx syntax - blackbox prototype

---
 .../tests/adder_blackbox_with_values_test.rs  |  16 ++-
 .../base/src/types/interaction/annotated.rs   |  49 +++++++
 .../interaction/contract_call_no_payment.rs   |   2 +-
 .../src/types/interaction/expr_address.rs     |  85 ++++++++++++
 .../base/src/types/interaction/expr_sc.rs     | 109 +++++++++++++++
 .../src/types/interaction/function_call.rs    |  13 +-
 .../types/interaction/managed_arg_buffer.rs   |   4 +
 framework/base/src/types/interaction/mod.rs   |   8 ++
 framework/base/src/types/interaction/tx.rs    | 131 ++++++++++++------
 .../src/types/interaction/tx_environment.rs   |  66 +++++++++
 .../base/src/types/interaction/tx_from.rs     |  25 +++-
 .../base/src/types/interaction/tx_payment.rs  |   4 +-
 framework/base/src/types/interaction/tx_to.rs |  33 +----
 .../src/types/managed/basic/managed_buffer.rs |  20 +++
 .../types/managed/wrapped/managed_address.rs  |  12 +-
 framework/scenario/src/facade.rs              |   1 +
 .../scenario/src/facade/contract_info.rs      |  51 +++++++
 .../src/facade/scenario_world_steps_tx.rs     |  79 +++++++++++
 18 files changed, 623 insertions(+), 85 deletions(-)
 create mode 100644 framework/base/src/types/interaction/annotated.rs
 create mode 100644 framework/base/src/types/interaction/expr_address.rs
 create mode 100644 framework/base/src/types/interaction/expr_sc.rs
 create mode 100644 framework/base/src/types/interaction/tx_environment.rs
 create mode 100644 framework/scenario/src/facade/scenario_world_steps_tx.rs

diff --git a/contracts/examples/adder/tests/adder_blackbox_with_values_test.rs b/contracts/examples/adder/tests/adder_blackbox_with_values_test.rs
index 62173c5cce..061432c95f 100644
--- a/contracts/examples/adder/tests/adder_blackbox_with_values_test.rs
+++ b/contracts/examples/adder/tests/adder_blackbox_with_values_test.rs
@@ -1,5 +1,8 @@
 use adder::*;
-use multiversx_sc::storage::mappers::SingleValue;
+use multiversx_sc::{
+    storage::mappers::SingleValue,
+    types::{AddressExpr, ScExpr},
+};
 use multiversx_sc_scenario::{api::StaticApi, num_bigint::BigUint, scenario_model::*, *};
 
 const ADDER_PATH_EXPR: &str = "file:output/adder.wasm";
@@ -41,12 +44,11 @@ fn adder_blackbox_with_values() {
                 .call(adder_contract.sum())
                 .expect_value(SingleValue::from(BigUint::from(5u32))),
         )
-        .sc_call(
-            ScCallStep::new()
-                .from(owner_address)
-                .to(&adder_contract)
-                .call(adder_contract.add(3u32)),
-        )
+        .tx(|tx| {
+            tx.from(AddressExpr("owner"))
+                .to(ScExpr("adder"))
+                .call(adder_contract.add(3u32))
+        })
         .check_state_step(
             CheckStateStep::new()
                 .put_account(owner_address, CheckAccount::new())
diff --git a/framework/base/src/types/interaction/annotated.rs b/framework/base/src/types/interaction/annotated.rs
new file mode 100644
index 0000000000..2814f95444
--- /dev/null
+++ b/framework/base/src/types/interaction/annotated.rs
@@ -0,0 +1,49 @@
+use crate::{
+    api::ManagedTypeApi,
+    types::{ManagedAddress, ManagedBuffer},
+};
+
+pub trait AnnotatedValue<Api, T>
+where
+    Api: ManagedTypeApi,
+{
+    fn annotation(&self) -> ManagedBuffer<Api>;
+
+    fn into_value(self) -> T;
+
+    fn with_value_ref<F: FnOnce(&T)>(&self, f: F);
+}
+
+impl<Api> AnnotatedValue<Api, ManagedAddress<Api>> for ManagedAddress<Api>
+where
+    Api: ManagedTypeApi,
+{
+    fn annotation(&self) -> ManagedBuffer<Api> {
+        self.hex_expr()
+    }
+
+    fn into_value(self) -> ManagedAddress<Api> {
+        self
+    }
+
+    fn with_value_ref<F: FnOnce(&ManagedAddress<Api>)>(&self, f: F) {
+        f(self)
+    }
+}
+
+impl<Api> AnnotatedValue<Api, ManagedAddress<Api>> for &ManagedAddress<Api>
+where
+    Api: ManagedTypeApi,
+{
+    fn annotation(&self) -> crate::types::ManagedBuffer<Api> {
+        self.hex_expr()
+    }
+
+    fn into_value(self) -> ManagedAddress<Api> {
+        self.clone()
+    }
+
+    fn with_value_ref<F: FnOnce(&ManagedAddress<Api>)>(&self, f: F) {
+        f(self)
+    }
+}
diff --git a/framework/base/src/types/interaction/contract_call_no_payment.rs b/framework/base/src/types/interaction/contract_call_no_payment.rs
index c8866ddf55..5471c2a9e8 100644
--- a/framework/base/src/types/interaction/contract_call_no_payment.rs
+++ b/framework/base/src/types/interaction/contract_call_no_payment.rs
@@ -168,7 +168,7 @@ where
         self.function_call
     }
 
-    pub fn tx(self) -> Tx<SA, (), (), (), (), FunctionCall<SA>> {
+    pub fn tx(self) -> Tx<SA, (), (), (), (), (), FunctionCall<SA>> {
         Tx::new().call(self.function_call)
     }
 }
diff --git a/framework/base/src/types/interaction/expr_address.rs b/framework/base/src/types/interaction/expr_address.rs
new file mode 100644
index 0000000000..305d833cc8
--- /dev/null
+++ b/framework/base/src/types/interaction/expr_address.rs
@@ -0,0 +1,85 @@
+use core::ptr;
+
+use crate::{
+    api::CallTypeApi,
+    types::{ManagedAddress, ManagedBuffer},
+};
+
+use super::{AnnotatedValue, TxFrom, TxFromSpecified};
+
+const ADDRESS_PREFIX: &str = "address:";
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub struct AddressExpr(pub &'static str);
+
+impl<Api> AnnotatedValue<Api, ManagedAddress<Api>> for AddressExpr
+where
+    Api: CallTypeApi,
+{
+    fn annotation(&self) -> ManagedBuffer<Api> {
+        let mut result = ManagedBuffer::new_from_bytes(ADDRESS_PREFIX.as_bytes());
+        result.append_bytes(self.0.as_bytes());
+        result
+    }
+
+    fn into_value(self) -> ManagedAddress<Api> {
+        let expr: [u8; 32] = self.eval_to_array();
+        expr.into()
+    }
+
+    fn with_value_ref<F: FnOnce(&ManagedAddress<Api>)>(&self, f: F) {
+        let expr: [u8; 32] = self.eval_to_array();
+        let ma = expr.into();
+        f(&ma);
+    }
+}
+impl<Api> TxFrom<Api> for AddressExpr
+where
+    Api: CallTypeApi,
+{
+    fn resolve_address(&self) -> ManagedAddress<Api> {
+        let expr: [u8; 32] = self.eval_to_array();
+        expr.into()
+    }
+}
+impl<Api> TxFromSpecified<Api> for AddressExpr where Api: CallTypeApi {}
+
+impl AddressExpr {
+    pub const fn eval_to_array(&self) -> [u8; 32] {
+        let result = [b'_'; 32];
+        let expr_bytes = self.0.as_bytes();
+        let mut len = expr_bytes.len();
+        if len > 32 {
+            len = 32;
+        }
+        unsafe {
+            ptr::copy_nonoverlapping(expr_bytes.as_ptr(), result.as_ptr() as *mut u8, len);
+        }
+        result
+    }
+}
+
+#[cfg(test)]
+pub mod tests {
+    use super::*;
+
+    fn assert_eq_eval(expr: &'static str, expected: &[u8; 32]) {
+        assert_eq!(&AddressExpr(expr).eval_to_array(), expected);
+    }
+
+    #[test]
+    fn test_address_value() {
+        assert_eq_eval("", b"________________________________");
+        assert_eq_eval("a", b"a_______________________________");
+        assert_eq_eval("a\x05", b"a\x05______________________________");
+        assert_eq_eval("an_address", b"an_address______________________");
+        assert_eq_eval(
+            "12345678901234567890123456789012",
+            b"12345678901234567890123456789012",
+        );
+        assert_eq_eval(
+            "123456789012345678901234567890123",
+            b"12345678901234567890123456789012",
+        );
+    }
+}
diff --git a/framework/base/src/types/interaction/expr_sc.rs b/framework/base/src/types/interaction/expr_sc.rs
new file mode 100644
index 0000000000..f83bfe3149
--- /dev/null
+++ b/framework/base/src/types/interaction/expr_sc.rs
@@ -0,0 +1,109 @@
+use core::ptr;
+
+use crate::{
+    api::CallTypeApi,
+    types::{ManagedAddress, ManagedBuffer},
+};
+
+use super::{AnnotatedValue, TxFrom, TxFromSpecified, TxTo, TxToSpecified};
+
+const SC_PREFIX: &str = "sc:";
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub struct ScExpr<'a>(pub &'a str);
+
+impl<'a, Api> AnnotatedValue<Api, ManagedAddress<Api>> for ScExpr<'a>
+where
+    Api: CallTypeApi,
+{
+    fn annotation(&self) -> ManagedBuffer<Api> {
+        let mut result = ManagedBuffer::new_from_bytes(SC_PREFIX.as_bytes());
+        result.append_bytes(self.0.as_bytes());
+        result
+    }
+
+    fn into_value(self) -> ManagedAddress<Api> {
+        let expr: [u8; 32] = self.eval_to_array();
+        expr.into()
+    }
+
+    fn with_value_ref<F: FnOnce(&ManagedAddress<Api>)>(&self, f: F) {
+        let expr: [u8; 32] = self.eval_to_array();
+        let ma = expr.into();
+        f(&ma);
+    }
+}
+impl<'a, Api> TxFrom<Api> for ScExpr<'a>
+where
+    Api: CallTypeApi,
+{
+    fn resolve_address(&self) -> ManagedAddress<Api> {
+        let expr: [u8; 32] = self.eval_to_array();
+        expr.into()
+    }
+}
+impl<'a, Api> TxFromSpecified<Api> for ScExpr<'a> where Api: CallTypeApi {}
+impl<'a, Api> TxTo<Api> for ScExpr<'a> where Api: CallTypeApi {}
+impl<'a, Api> TxToSpecified<Api> for ScExpr<'a> where Api: CallTypeApi {}
+
+impl<'a> ScExpr<'a> {
+    pub const fn eval_to_array(&self) -> [u8; 32] {
+        let result = *b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00______________________";
+        let expr_bytes = self.0.as_bytes();
+        let mut len = expr_bytes.len();
+        if len > 22 {
+            len = 22;
+        }
+        unsafe {
+            ptr::copy_nonoverlapping(
+                expr_bytes.as_ptr(),
+                result.as_ptr().offset(10) as *mut u8,
+                len,
+            );
+        }
+        result
+    }
+}
+
+#[cfg(test)]
+pub mod tests {
+    use super::*;
+
+    fn assert_eq_eval(expr: &'static str, expected: &[u8; 32]) {
+        assert_eq!(&ScExpr(expr).eval_to_array(), expected);
+    }
+
+    #[test]
+    fn test_address_value() {
+        assert_eq_eval(
+            "",
+            b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00______________________",
+        );
+        assert_eq_eval(
+            "a",
+            b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00a_____________________",
+        );
+        assert_eq_eval(
+            "12345678901234567890120s",
+            b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x001234567890123456789012",
+        );
+    }
+
+    // #[test]
+    // fn test_sc_address() {
+    //     let context = InterpreterContext::default();
+    //     assert_eq!(
+    //         b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00a_____________________".to_vec(),
+    //         interpret_string("sc:a", &context)
+    //     );
+    //     assert_eq!(
+    //         b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x001234567890123456789012".to_vec(),
+    //         interpret_string("sc:12345678901234567890120s", &context)
+    //     );
+    //     // trims excess
+    //     assert_eq!(
+    //         b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x001234567890123456789012".to_vec(),
+    //         interpret_string("sc:12345678901234567890120sx", &context)
+    //     );
+    // }
+}
diff --git a/framework/base/src/types/interaction/function_call.rs b/framework/base/src/types/interaction/function_call.rs
index ae12687b26..bfe74958dc 100644
--- a/framework/base/src/types/interaction/function_call.rs
+++ b/framework/base/src/types/interaction/function_call.rs
@@ -6,13 +6,13 @@ use multiversx_sc_codec::{
 use crate::{
     abi::{TypeAbi, TypeName},
     api::{
-        ManagedTypeApi, ESDT_MULTI_TRANSFER_FUNC_NAME, ESDT_NFT_TRANSFER_FUNC_NAME,
+        CallTypeApi, ManagedTypeApi, ESDT_MULTI_TRANSFER_FUNC_NAME, ESDT_NFT_TRANSFER_FUNC_NAME,
         ESDT_TRANSFER_FUNC_NAME,
     },
     types::{EsdtTokenPayment, ManagedAddress, ManagedBuffer, ManagedVec, MultiValueEncoded},
 };
 
-use super::ManagedArgBuffer;
+use super::{ContractCallNoPayment, ManagedArgBuffer};
 
 /// Encodes a function call on the blockchain, composed of a function name and its encoded arguments.
 ///
@@ -69,6 +69,15 @@ where
     }
 }
 
+impl<Api, R> From<ContractCallNoPayment<Api, R>> for FunctionCall<Api>
+where
+    Api: CallTypeApi,
+{
+    fn from(ccnp: ContractCallNoPayment<Api, R>) -> Self {
+        ccnp.function_call
+    }
+}
+
 impl<Api> TopEncodeMulti for FunctionCall<Api>
 where
     Api: ManagedTypeApi,
diff --git a/framework/base/src/types/interaction/managed_arg_buffer.rs b/framework/base/src/types/interaction/managed_arg_buffer.rs
index b0cee5db30..7af6346c7b 100644
--- a/framework/base/src/types/interaction/managed_arg_buffer.rs
+++ b/framework/base/src/types/interaction/managed_arg_buffer.rs
@@ -172,6 +172,10 @@ where
     pub fn into_vec_of_buffers(self) -> ManagedVec<M, ManagedBuffer<M>> {
         self.data
     }
+
+    pub fn iter_buffers(&self) -> ManagedVecRefIterator<M, ManagedBuffer<M>> {
+        ManagedVecRefIterator::new(&self.data)
+    }
 }
 
 impl<M> ManagedArgBuffer<M>
diff --git a/framework/base/src/types/interaction/mod.rs b/framework/base/src/types/interaction/mod.rs
index 8efeba7b03..b44ff66d0f 100644
--- a/framework/base/src/types/interaction/mod.rs
+++ b/framework/base/src/types/interaction/mod.rs
@@ -1,3 +1,4 @@
+mod annotated;
 mod async_call;
 mod async_call_promises;
 mod back_transfers;
@@ -12,15 +13,19 @@ mod contract_call_with_egld;
 mod contract_call_with_egld_or_single_esdt;
 mod contract_call_with_multi_esdt;
 mod contract_deploy;
+mod expr_address;
+mod expr_sc;
 mod function_call;
 mod managed_arg_buffer;
 mod tx;
 mod tx_data;
+mod tx_environment;
 mod tx_from;
 mod tx_gas;
 mod tx_payment;
 mod tx_to;
 
+pub use annotated::*;
 pub use async_call::AsyncCall;
 pub use async_call_promises::AsyncCallPromises;
 pub use back_transfers::BackTransfers;
@@ -35,10 +40,13 @@ pub use contract_call_with_egld::ContractCallWithEgld;
 pub use contract_call_with_egld_or_single_esdt::ContractCallWithEgldOrSingleEsdt;
 pub use contract_call_with_multi_esdt::ContractCallWithMultiEsdt;
 pub use contract_deploy::{new_contract_deploy, ContractDeploy};
+pub use expr_address::AddressExpr;
+pub use expr_sc::ScExpr;
 pub use function_call::FunctionCall;
 pub use managed_arg_buffer::ManagedArgBuffer;
 pub use tx::*;
 pub use tx_data::*;
+pub use tx_environment::*;
 pub use tx_from::*;
 pub use tx_gas::*;
 pub use tx_payment::*;
diff --git a/framework/base/src/types/interaction/tx.rs b/framework/base/src/types/interaction/tx.rs
index f173ef3dfb..93d0ff6b04 100644
--- a/framework/base/src/types/interaction/tx.rs
+++ b/framework/base/src/types/interaction/tx.rs
@@ -12,12 +12,14 @@ use crate::{
 };
 
 use super::{
-    AsyncCall, ExplicitGas, FunctionCall, TxData, TxFrom, TxGas, TxPayment, TxTo, TxToSpecified,
+    AsyncCall, ExplicitGas, FunctionCall, TxData, TxEnvironemnt, TxFrom, TxGas, TxPayment, TxTo,
+    TxToSpecified, TxFromSpecified,
 };
 
-pub struct Tx<Api, From, To, Payment, Gas, Data>
+pub struct Tx<Api, Env, From, To, Payment, Gas, Data>
 where
     Api: CallTypeApi + 'static,
+    Env: TxEnvironemnt<Api>,
     From: TxFrom<Api>,
     To: TxTo<Api>,
     Payment: TxPayment<Api>,
@@ -25,6 +27,7 @@ where
     Data: TxData<Api>,
 {
     pub(super) _phantom: PhantomData<Api>,
+    pub env: Env,
     pub from: From,
     pub to: To,
     pub payment: Payment,
@@ -32,9 +35,10 @@ where
     pub data: Data,
 }
 
-impl<Api, From, To, Payment, Gas, Data> Tx<Api, From, To, Payment, Gas, Data>
+impl<Api, Env, From, To, Payment, Gas, Data> Tx<Api, Env, From, To, Payment, Gas, Data>
 where
     Api: CallTypeApi + 'static,
+    Env: TxEnvironemnt<Api>,
     From: TxFrom<Api>,
     To: TxTo<Api>,
     Payment: TxPayment<Api>,
@@ -43,9 +47,10 @@ where
 {
     /// TODO: does nothing, delete, added for easier copy-paste.
     #[inline]
-    pub fn nothing(self) -> Tx<Api, From, To, Payment, Gas, Data> {
+    pub fn nothing(self) -> Tx<Api, Env, From, To, Payment, Gas, Data> {
         Tx {
             _phantom: PhantomData,
+            env: self.env,
             from: self.from,
             to: self.to,
             payment: self.payment,
@@ -55,16 +60,18 @@ where
     }
 }
 
-pub type TxBase<Api> = Tx<Api, (), (), (), (), ()>;
+pub type TxBaseWithEnv<Api, Env> = Tx<Api, Env, (), (), (), (), ()>;
 
-impl<Api> Default for TxBase<Api>
+impl<Api, Env> TxBaseWithEnv<Api, Env>
 where
     Api: CallTypeApi + 'static,
+    Env: TxEnvironemnt<Api>,
 {
     #[inline]
-    fn default() -> Self {
+    pub fn new_with_env(env: Env) -> Self {
         Tx {
             _phantom: PhantomData,
+            env,
             from: (),
             to: (),
             payment: (),
@@ -74,6 +81,18 @@ where
     }
 }
 
+pub type TxBase<Api> = Tx<Api, (), (), (), (), (), ()>;
+
+impl<Api> Default for TxBase<Api>
+where
+    Api: CallTypeApi + 'static,
+{
+    #[inline]
+    fn default() -> Self {
+        Self::new_with_env(())
+    }
+}
+
 impl<Api> TxBase<Api>
 where
     Api: CallTypeApi + 'static,
@@ -84,20 +103,24 @@ where
     }
 }
 
-impl<Api, To, Payment, Gas, Data> Tx<Api, (), To, Payment, Gas, Data>
+impl<Api, Env, To, Payment, Gas, Data> Tx<Api, Env, (), To, Payment, Gas, Data>
 where
     Api: CallTypeApi + 'static,
+    Env: TxEnvironemnt<Api>,
     To: TxTo<Api>,
     Payment: TxPayment<Api>,
     Gas: TxGas,
     Data: TxData<Api>,
 {
-    pub fn from<From>(self, from: From) -> Tx<Api, From, To, Payment, Gas, Data>
+    pub fn from<From>(self, from: From) -> Tx<Api, Env, From, To, Payment, Gas, Data>
     where
-        From: TxFrom<Api>,
+        From: TxFromSpecified<Api>,
     {
+        let mut env = self.env;
+        env.annotate_from(&from);
         Tx {
             _phantom: PhantomData,
+            env,
             from,
             to: self.to,
             payment: self.payment,
@@ -107,20 +130,24 @@ where
     }
 }
 
-impl<Api, From, Payment, Gas, Data> Tx<Api, From, (), Payment, Gas, Data>
+impl<Api, Env, From, Payment, Gas, Data> Tx<Api, Env, From, (), Payment, Gas, Data>
 where
     Api: CallTypeApi + 'static,
+    Env: TxEnvironemnt<Api>,
     From: TxFrom<Api>,
     Payment: TxPayment<Api>,
     Gas: TxGas,
     Data: TxData<Api>,
 {
-    pub fn to<To>(self, to: To) -> Tx<Api, From, To, Payment, Gas, Data>
+    pub fn to<To>(self, to: To) -> Tx<Api, Env, From, To, Payment, Gas, Data>
     where
-        To: TxTo<Api>,
+        To: TxToSpecified<Api>,
     {
+        let mut env = self.env;
+        env.annotate_to(&to);
         Tx {
             _phantom: PhantomData,
+            env,
             from: self.from,
             to,
             payment: self.payment,
@@ -129,23 +156,28 @@ where
         }
     }
 
-    pub fn to_caller(self) -> Tx<Api, From, ManagedAddress<Api>, Payment, Gas, Data> {
+    pub fn to_caller(self) -> Tx<Api, Env, From, ManagedAddress<Api>, Payment, Gas, Data> {
         let caller = BlockchainWrapper::<Api>::new().get_caller();
         self.to(caller)
     }
 }
 
-impl<Api, From, To, Gas, Data> Tx<Api, From, To, (), Gas, Data>
+impl<Api, Env, From, To, Gas, Data> Tx<Api, Env, From, To, (), Gas, Data>
 where
     Api: CallTypeApi + 'static,
+    Env: TxEnvironemnt<Api>,
     From: TxFrom<Api>,
     To: TxTo<Api>,
     Gas: TxGas,
     Data: TxData<Api>,
 {
-    pub fn egld(self, egld_amount: BigUint<Api>) -> Tx<Api, From, To, EgldPayment<Api>, Gas, Data> {
+    pub fn egld(
+        self,
+        egld_amount: BigUint<Api>,
+    ) -> Tx<Api, Env, From, To, EgldPayment<Api>, Gas, Data> {
         Tx {
             _phantom: PhantomData,
+            env: self.env,
             from: self.from,
             to: self.to,
             payment: EgldPayment { value: egld_amount },
@@ -155,9 +187,10 @@ where
     }
 }
 
-impl<Api, From, To, Gas, Data> Tx<Api, From, To, (), Gas, Data>
+impl<Api, Env, From, To, Gas, Data> Tx<Api, Env, From, To, (), Gas, Data>
 where
     Api: CallTypeApi + 'static,
+    Env: TxEnvironemnt<Api>,
     From: TxFrom<Api>,
     To: TxTo<Api>,
     Gas: TxGas,
@@ -169,9 +202,10 @@ where
     pub fn esdt<P: Into<EsdtTokenPayment<Api>>>(
         self,
         payment: P,
-    ) -> Tx<Api, From, To, EsdtTokenPayment<Api>, Gas, Data> {
+    ) -> Tx<Api, Env, From, To, EsdtTokenPayment<Api>, Gas, Data> {
         Tx {
             _phantom: PhantomData,
+            env: self.env,
             from: self.from,
             to: self.to,
             payment: payment.into(),
@@ -184,9 +218,10 @@ where
     pub fn multi_esdt(
         self,
         payments: MultiEsdtPayment<Api>, // TODO: references
-    ) -> Tx<Api, From, To, MultiEsdtPayment<Api>, Gas, Data> {
+    ) -> Tx<Api, Env, From, To, MultiEsdtPayment<Api>, Gas, Data> {
         Tx {
             _phantom: PhantomData,
+            env: self.env,
             from: self.from,
             to: self.to,
             payment: payments,
@@ -196,9 +231,10 @@ where
     }
 }
 
-impl<Api, From, To, Gas, Data> Tx<Api, From, To, EsdtTokenPayment<Api>, Gas, Data>
+impl<Api, Env, From, To, Gas, Data> Tx<Api, Env, From, To, EsdtTokenPayment<Api>, Gas, Data>
 where
     Api: CallTypeApi + 'static,
+    Env: TxEnvironemnt<Api>,
     From: TxFrom<Api>,
     To: TxTo<Api>,
     Gas: TxGas,
@@ -210,12 +246,13 @@ where
     pub fn with_esdt_transfer<P: Into<EsdtTokenPayment<Api>>>(
         self,
         payment: P,
-    ) -> Tx<Api, From, To, MultiEsdtPayment<Api>, Gas, Data> {
+    ) -> Tx<Api, Env, From, To, MultiEsdtPayment<Api>, Gas, Data> {
         let mut payments = ManagedVec::new();
         payments.push(self.payment);
         payments.push(payment.into());
         Tx {
             _phantom: PhantomData,
+            env: self.env,
             from: self.from,
             to: self.to,
             payment: payments,
@@ -225,9 +262,10 @@ where
     }
 }
 
-impl<Api, From, To, Gas, Data> Tx<Api, From, To, MultiEsdtPayment<Api>, Gas, Data>
+impl<Api, Env, From, To, Gas, Data> Tx<Api, Env, From, To, MultiEsdtPayment<Api>, Gas, Data>
 where
     Api: CallTypeApi + 'static,
+    Env: TxEnvironemnt<Api>,
     From: TxFrom<Api>,
     To: TxTo<Api>,
     Gas: TxGas,
@@ -239,15 +277,16 @@ where
     pub fn with_esdt_transfer<P: Into<EsdtTokenPayment<Api>>>(
         mut self,
         payment: P,
-    ) -> Tx<Api, From, To, MultiEsdtPayment<Api>, Gas, Data> {
+    ) -> Tx<Api, Env, From, To, MultiEsdtPayment<Api>, Gas, Data> {
         self.payment.push(payment.into());
         self
     }
 }
 
-impl<Api, From, To, Payment, Data> Tx<Api, From, To, Payment, (), Data>
+impl<Api, Env, From, To, Payment, Data> Tx<Api, Env, From, To, Payment, (), Data>
 where
     Api: CallTypeApi + 'static,
+    Env: TxEnvironemnt<Api>,
     From: TxFrom<Api>,
     To: TxTo<Api>,
     Payment: TxPayment<Api>,
@@ -255,9 +294,13 @@ where
 {
     /// Sets an explicit gas limit to the call.
     #[inline]
-    pub fn with_gas_limit(self, gas_limit: u64) -> Tx<Api, From, To, Payment, ExplicitGas, Data> {
+    pub fn with_gas_limit(
+        self,
+        gas_limit: u64,
+    ) -> Tx<Api, Env, From, To, Payment, ExplicitGas, Data> {
         Tx {
             _phantom: PhantomData,
+            env: self.env,
             from: self.from,
             to: self.to,
             payment: self.payment,
@@ -267,9 +310,10 @@ where
     }
 }
 
-impl<Api, From, To, Payment, Gas> Tx<Api, From, To, Payment, Gas, ()>
+impl<Api, Env, From, To, Payment, Gas> Tx<Api, Env, From, To, Payment, Gas, ()>
 where
     Api: CallTypeApi + 'static,
+    Env: TxEnvironemnt<Api>,
     From: TxFrom<Api>,
     To: TxTo<Api>,
     Payment: TxPayment<Api>,
@@ -279,9 +323,10 @@ where
     pub fn call<FC: Into<FunctionCall<Api>>>(
         self,
         call: FC,
-    ) -> Tx<Api, From, To, Payment, Gas, FunctionCall<Api>> {
+    ) -> Tx<Api, Env, From, To, Payment, Gas, FunctionCall<Api>> {
         Tx {
             _phantom: PhantomData,
+            env: self.env,
             from: self.from,
             to: self.to,
             payment: self.payment,
@@ -294,9 +339,10 @@ where
     pub fn function_name<N: Into<ManagedBuffer<Api>>>(
         self,
         function_name: N,
-    ) -> Tx<Api, From, To, Payment, Gas, FunctionCall<Api>> {
+    ) -> Tx<Api, Env, From, To, Payment, Gas, FunctionCall<Api>> {
         Tx {
             _phantom: PhantomData,
+            env: self.env,
             from: self.from,
             to: self.to,
             payment: self.payment,
@@ -306,9 +352,10 @@ where
     }
 }
 
-impl<Api, From, To, Payment, Gas> Tx<Api, From, To, Payment, Gas, FunctionCall<Api>>
+impl<Api, Env, From, To, Payment, Gas> Tx<Api, Env, From, To, Payment, Gas, FunctionCall<Api>>
 where
     Api: CallTypeApi + 'static,
+    Env: TxEnvironemnt<Api>,
     From: TxFrom<Api>,
     To: TxTo<Api>,
     Payment: TxPayment<Api>,
@@ -321,9 +368,10 @@ where
     }
 }
 
-impl<Api, From, To, Payment, Gas> Tx<Api, From, To, Payment, Gas, FunctionCall<Api>>
+impl<Api, Env, From, To, Payment, Gas> Tx<Api, Env, From, To, Payment, Gas, FunctionCall<Api>>
 where
     Api: CallTypeApi + 'static,
+    Env: TxEnvironemnt<Api>,
     From: TxFrom<Api>,
     To: TxToSpecified<Api>,
     Payment: TxPayment<Api>,
@@ -331,12 +379,13 @@ where
 {
     pub fn normalize_tx(
         self,
-    ) -> Tx<Api, From, ManagedAddress<Api>, EgldPayment<Api>, Gas, FunctionCall<Api>> {
+    ) -> Tx<Api, Env, From, ManagedAddress<Api>, EgldPayment<Api>, Gas, FunctionCall<Api>> {
         let result = self
             .payment
-            .convert_tx_data(&self.from, self.to.into_address(), self.data);
+            .convert_tx_data(&self.from, self.to.into_value(), self.data);
         Tx {
             _phantom: PhantomData,
+            env: self.env,
             from: self.from,
             to: result.to,
             payment: result.egld_payment,
@@ -346,7 +395,7 @@ where
     }
 }
 
-impl<Api, To, Payment> Tx<Api, (), To, Payment, (), FunctionCall<Api>>
+impl<Api, To, Payment> Tx<Api, (), (), To, Payment, (), FunctionCall<Api>>
 where
     Api: CallTypeApi + 'static,
     To: TxToSpecified<Api>,
@@ -363,7 +412,7 @@ where
     }
 }
 
-impl<Api, To, Payment> Tx<Api, (), To, Payment, ExplicitGas, FunctionCall<Api>>
+impl<Api, To, Payment> Tx<Api, (), (), To, Payment, ExplicitGas, FunctionCall<Api>>
 where
     Api: CallTypeApi + 'static,
     To: TxToSpecified<Api>,
@@ -384,7 +433,7 @@ where
     }
 }
 
-impl<Api, From, To, Payment, Gas, FC> Tx<Api, From, To, Payment, Gas, FC>
+impl<Api, From, To, Payment, Gas, FC> Tx<Api, (), From, To, Payment, Gas, FC>
 where
     Api: CallTypeApi + 'static,
     From: TxFrom<Api>,
@@ -399,15 +448,15 @@ where
         }
 
         let gas_limit = self.gas.resolve_gas::<Api>();
-        self.payment.perform_transfer_execute(
-            self.to.to_address_ref(),
-            gas_limit,
-            self.data.into(),
-        );
+
+        self.to.with_value_ref(|to| {
+            self.payment
+                .perform_transfer_execute(to, gas_limit, self.data.into());
+        });
     }
 }
 
-impl<Api, From, To, Payment, Gas> Tx<Api, From, To, Payment, Gas, ()>
+impl<Api, From, To, Payment, Gas> Tx<Api, (), From, To, Payment, Gas, ()>
 where
     Api: CallTypeApi + 'static,
     From: TxFrom<Api>,
diff --git a/framework/base/src/types/interaction/tx_environment.rs b/framework/base/src/types/interaction/tx_environment.rs
new file mode 100644
index 0000000000..62c90ab47f
--- /dev/null
+++ b/framework/base/src/types/interaction/tx_environment.rs
@@ -0,0 +1,66 @@
+use core::marker::PhantomData;
+
+use crate::{
+    api::CallTypeApi,
+    types::{ManagedAddress, ManagedBuffer},
+};
+
+use super::AnnotatedValue;
+
+pub trait TxEnvironemnt<Api>
+where
+    Api: CallTypeApi,
+{
+    fn annotate_from<From>(&mut self, from: &From)
+    where
+        From: AnnotatedValue<Api, ManagedAddress<Api>>;
+
+    fn annotate_to<To>(&mut self, to: &To)
+    where
+        To: AnnotatedValue<Api, ManagedAddress<Api>>;
+}
+
+impl<Api> TxEnvironemnt<Api> for ()
+where
+    Api: CallTypeApi,
+{
+    fn annotate_from<From>(&mut self, _from: &From)
+    where
+        From: AnnotatedValue<Api, ManagedAddress<Api>>,
+    {
+    }
+
+    fn annotate_to<To>(&mut self, _to: &To)
+    where
+        To: AnnotatedValue<Api, ManagedAddress<Api>>,
+    {
+    }
+}
+
+pub struct TxTestingEnvironemnt<Api>
+where
+    Api: CallTypeApi,
+{
+    pub(super) _phantom: PhantomData<Api>,
+    pub from_annotation: ManagedBuffer<Api>,
+    pub to_annotation: ManagedBuffer<Api>,
+}
+
+impl<Api> TxEnvironemnt<Api> for TxTestingEnvironemnt<Api>
+where
+    Api: CallTypeApi,
+{
+    fn annotate_from<From>(&mut self, from: &From)
+    where
+        From: AnnotatedValue<Api, ManagedAddress<Api>>,
+    {
+        self.from_annotation = from.annotation();
+    }
+
+    fn annotate_to<To>(&mut self, to: &To)
+    where
+        To: AnnotatedValue<Api, ManagedAddress<Api>>,
+    {
+        self.to_annotation = to.annotation();
+    }
+}
diff --git a/framework/base/src/types/interaction/tx_from.rs b/framework/base/src/types/interaction/tx_from.rs
index 984f537ad1..5edba3f2a5 100644
--- a/framework/base/src/types/interaction/tx_from.rs
+++ b/framework/base/src/types/interaction/tx_from.rs
@@ -1,17 +1,25 @@
 use crate::{api::CallTypeApi, contract_base::BlockchainWrapper, types::ManagedAddress};
 
+use super::AnnotatedValue;
+
 pub trait TxFrom<Api>
 where
     Api: CallTypeApi,
 {
-    fn to_address(&self) -> ManagedAddress<Api>;
+    fn resolve_address(&self) -> ManagedAddress<Api>;
+}
+
+pub trait TxFromSpecified<Api>: TxFrom<Api> + AnnotatedValue<Api, ManagedAddress<Api>>
+where
+    Api: CallTypeApi,
+{
 }
 
 impl<Api> TxFrom<Api> for ()
 where
     Api: CallTypeApi,
 {
-    fn to_address(&self) -> ManagedAddress<Api> {
+    fn resolve_address(&self) -> ManagedAddress<Api> {
         BlockchainWrapper::<Api>::new().get_sc_address()
     }
 }
@@ -20,7 +28,18 @@ impl<Api> TxFrom<Api> for ManagedAddress<Api>
 where
     Api: CallTypeApi,
 {
-    fn to_address(&self) -> ManagedAddress<Api> {
+    fn resolve_address(&self) -> ManagedAddress<Api> {
         self.clone()
     }
 }
+impl<Api> TxFromSpecified<Api> for ManagedAddress<Api> where Api: CallTypeApi {}
+
+impl<Api> TxFrom<Api> for &ManagedAddress<Api>
+where
+    Api: CallTypeApi,
+{
+    fn resolve_address(&self) -> ManagedAddress<Api> {
+        (*self).clone()
+    }
+}
+impl<Api> TxFromSpecified<Api> for &ManagedAddress<Api> where Api: CallTypeApi {}
diff --git a/framework/base/src/types/interaction/tx_payment.rs b/framework/base/src/types/interaction/tx_payment.rs
index 6daa4ebd27..95ad62fae1 100644
--- a/framework/base/src/types/interaction/tx_payment.rs
+++ b/framework/base/src/types/interaction/tx_payment.rs
@@ -136,7 +136,7 @@ where
         if self.token_nonce == 0 {
             convert_tx_data_fungible(self, to, fc)
         } else {
-            convert_tx_data_nft(self, from.to_address(), to, fc)
+            convert_tx_data_nft(self, from.resolve_address(), to, fc)
         }
     }
 
@@ -170,7 +170,7 @@ where
         match self.len() {
             0 => ().convert_tx_data(from, to, fc),
             1 => self.get(0).convert_tx_data(from, to, fc),
-            _ => convert_tx_data_multi(self, from.to_address(), to, fc),
+            _ => convert_tx_data_multi(self, from.resolve_address(), to, fc),
         }
     }
 
diff --git a/framework/base/src/types/interaction/tx_to.rs b/framework/base/src/types/interaction/tx_to.rs
index 62aad803a7..bf7e44e2be 100644
--- a/framework/base/src/types/interaction/tx_to.rs
+++ b/framework/base/src/types/interaction/tx_to.rs
@@ -1,5 +1,7 @@
 use crate::{api::ManagedTypeApi, types::ManagedAddress};
 
+use super::AnnotatedValue;
+
 pub trait TxTo<Api>
 where
     Api: ManagedTypeApi,
@@ -8,39 +10,14 @@ where
 
 impl<Api> TxTo<Api> for () where Api: ManagedTypeApi {}
 
-pub trait TxToSpecified<Api>: TxTo<Api>
+pub trait TxToSpecified<Api>: TxTo<Api> + AnnotatedValue<Api, ManagedAddress<Api>>
 where
     Api: ManagedTypeApi,
 {
-    fn to_address_ref(&self) -> &ManagedAddress<Api>;
-
-    fn into_address(self) -> ManagedAddress<Api>;
 }
 
 impl<Api> TxTo<Api> for ManagedAddress<Api> where Api: ManagedTypeApi {}
-impl<Api> TxToSpecified<Api> for ManagedAddress<Api>
-where
-    Api: ManagedTypeApi,
-{
-    fn to_address_ref(&self) -> &ManagedAddress<Api> {
-        self
-    }
-
-    fn into_address(self) -> ManagedAddress<Api> {
-        self
-    }
-}
+impl<Api> TxToSpecified<Api> for ManagedAddress<Api> where Api: ManagedTypeApi {}
 
 impl<Api> TxTo<Api> for &ManagedAddress<Api> where Api: ManagedTypeApi {}
-impl<Api> TxToSpecified<Api> for &ManagedAddress<Api>
-where
-    Api: ManagedTypeApi,
-{
-    fn to_address_ref(&self) -> &ManagedAddress<Api> {
-        self
-    }
-
-    fn into_address(self) -> ManagedAddress<Api> {
-        self.clone()
-    }
-}
+impl<Api> TxToSpecified<Api> for &ManagedAddress<Api> where Api: ManagedTypeApi {}
diff --git a/framework/base/src/types/managed/basic/managed_buffer.rs b/framework/base/src/types/managed/basic/managed_buffer.rs
index 7c08f32699..3e4347aa1d 100644
--- a/framework/base/src/types/managed/basic/managed_buffer.rs
+++ b/framework/base/src/types/managed/basic/managed_buffer.rs
@@ -159,6 +159,26 @@ where
     }
 }
 
+impl<M> From<crate::types::heap::String> for ManagedBuffer<M>
+where
+    M: ManagedTypeApi,
+{
+    #[inline]
+    fn from(s: crate::types::heap::String) -> Self {
+        Self::new_from_bytes(s.as_bytes())
+    }
+}
+
+impl<M> From<&crate::types::heap::String> for ManagedBuffer<M>
+where
+    M: ManagedTypeApi,
+{
+    #[inline]
+    fn from(s: &crate::types::heap::String) -> Self {
+        Self::new_from_bytes(s.as_bytes())
+    }
+}
+
 impl<M: ManagedTypeApi> Default for ManagedBuffer<M> {
     #[inline]
     fn default() -> Self {
diff --git a/framework/base/src/types/managed/wrapped/managed_address.rs b/framework/base/src/types/managed/wrapped/managed_address.rs
index 1ce1524bb6..be24c8e99b 100644
--- a/framework/base/src/types/managed/wrapped/managed_address.rs
+++ b/framework/base/src/types/managed/wrapped/managed_address.rs
@@ -8,10 +8,12 @@ use crate::{
         NestedDecode, NestedDecodeInput, NestedEncode, NestedEncodeOutput, TopDecode,
         TopDecodeInput, TopEncode, TopEncodeOutput, TryStaticCast,
     },
-    formatter::{hex_util::encode_bytes_as_hex, FormatByteReceiver, SCLowerHex},
+    formatter::{hex_util::encode_bytes_as_hex, FormatBuffer, FormatByteReceiver, SCLowerHex},
     types::{heap::Address, ManagedBuffer, ManagedByteArray, ManagedType},
 };
 
+use super::ManagedBufferCachedBuilder;
+
 #[repr(transparent)]
 #[derive(Clone)]
 pub struct ManagedAddress<M: ManagedTypeApi> {
@@ -250,6 +252,14 @@ impl<M: ManagedTypeApi> SCLowerHex for ManagedAddress<M> {
     }
 }
 
+impl<M: ManagedTypeApi> ManagedAddress<M> {
+    pub fn hex_expr(&self) -> ManagedBuffer<M> {
+        let mut result = ManagedBufferCachedBuilder::new_from_slice(b"0x");
+        result.append_lower_hex(self);
+        result.into_managed_buffer()
+    }
+}
+
 impl<M: ManagedTypeApi> core::fmt::Debug for ManagedAddress<M> {
     fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
         f.debug_struct("ManagedAddress")
diff --git a/framework/scenario/src/facade.rs b/framework/scenario/src/facade.rs
index f53625895e..60fb9f4d83 100644
--- a/framework/scenario/src/facade.rs
+++ b/framework/scenario/src/facade.rs
@@ -4,6 +4,7 @@ mod scenario_world;
 mod scenario_world_runner;
 mod scenario_world_steps;
 mod scenario_world_steps_deprecated;
+mod scenario_world_steps_tx;
 mod scenario_world_whitebox;
 mod whitebox_contract;
 
diff --git a/framework/scenario/src/facade/contract_info.rs b/framework/scenario/src/facade/contract_info.rs
index 35b3ee1afb..0e4f2619d9 100644
--- a/framework/scenario/src/facade/contract_info.rs
+++ b/framework/scenario/src/facade/contract_info.rs
@@ -1,5 +1,10 @@
 use std::ops::{Deref, DerefMut};
 
+use multiversx_sc::{
+    api::CallTypeApi,
+    types::{AnnotatedValue, ManagedBuffer, TxFrom, TxFromSpecified, TxTo, TxToSpecified},
+};
+
 use crate::multiversx_sc::{
     api::ManagedTypeApi,
     codec::{CodecFrom, EncodeErrorHandler, TopEncode, TopEncodeOutput},
@@ -90,3 +95,49 @@ impl<P: ProxyObjBase> CodecFrom<ContractInfo<P>> for Address {}
 impl<P: ProxyObjBase> CodecFrom<&ContractInfo<P>> for Address {}
 impl<M: ManagedTypeApi, P: ProxyObjBase> CodecFrom<ContractInfo<P>> for ManagedAddress<M> {}
 impl<M: ManagedTypeApi, P: ProxyObjBase> CodecFrom<&ContractInfo<P>> for ManagedAddress<M> {}
+
+impl<Api, P> AnnotatedValue<Api, ManagedAddress<Api>> for &ContractInfo<P>
+where
+    Api: CallTypeApi,
+    P: ProxyObjBase,
+{
+    fn annotation(&self) -> ManagedBuffer<Api> {
+        self.scenario_address_expr.original.as_str().into()
+    }
+
+    fn into_value(self) -> ManagedAddress<Api> {
+        (&self.scenario_address_expr.value).into()
+    }
+
+    fn with_value_ref<F: FnOnce(&ManagedAddress<Api>)>(&self, f: F) {
+        let ma: ManagedAddress<Api> = (&self.scenario_address_expr.value).into();
+        f(&ma);
+    }
+}
+impl<P, Api> TxFrom<Api> for &ContractInfo<P>
+where
+    Api: CallTypeApi,
+    P: ProxyObjBase,
+{
+    fn resolve_address(&self) -> ManagedAddress<Api> {
+        (&self.scenario_address_expr.value).into()
+    }
+}
+impl<P, Api> TxFromSpecified<Api> for &ContractInfo<P>
+where
+    Api: CallTypeApi,
+    P: ProxyObjBase,
+{
+}
+impl<P, Api> TxTo<Api> for &ContractInfo<P>
+where
+    Api: CallTypeApi,
+    P: ProxyObjBase,
+{
+}
+impl<P, Api> TxToSpecified<Api> for &ContractInfo<P>
+where
+    Api: CallTypeApi,
+    P: ProxyObjBase,
+{
+}
diff --git a/framework/scenario/src/facade/scenario_world_steps_tx.rs b/framework/scenario/src/facade/scenario_world_steps_tx.rs
new file mode 100644
index 0000000000..be7763bd58
--- /dev/null
+++ b/framework/scenario/src/facade/scenario_world_steps_tx.rs
@@ -0,0 +1,79 @@
+use std::path::PathBuf;
+
+use multiversx_sc::types::{
+    AnnotatedValue, FunctionCall, ManagedAddress, Tx, TxBaseWithEnv, TxEnvironemnt,
+    TxFromSpecified, TxGas, TxPayment, TxToSpecified,
+};
+
+use crate::{api::StaticApi, facade::ScenarioWorld, scenario_model::ScCallStep};
+
+#[derive(Default, Debug, Clone)]
+pub struct ScenarioTxEnvironment {
+    pub context_path: PathBuf,
+    pub from_annotation: Option<String>,
+    pub to_annotation: Option<String>,
+}
+
+impl TxEnvironemnt<StaticApi> for ScenarioTxEnvironment {
+    fn annotate_from<From>(&mut self, to: &From)
+    where
+        From: AnnotatedValue<StaticApi, ManagedAddress<StaticApi>>,
+    {
+        self.from_annotation = Some(to.annotation().to_string())
+    }
+
+    fn annotate_to<To>(&mut self, to: &To)
+    where
+        To: AnnotatedValue<StaticApi, ManagedAddress<StaticApi>>,
+    {
+        self.to_annotation = Some(to.annotation().to_string())
+    }
+}
+
+pub type TxScenarioBase = TxBaseWithEnv<StaticApi, ScenarioTxEnvironment>;
+
+pub trait ScenarioTx {
+    fn run_as_scenario_step(self, world: &mut ScenarioWorld);
+}
+
+impl ScenarioWorld {
+    fn tx_env(&self) -> ScenarioTxEnvironment {
+        ScenarioTxEnvironment {
+            context_path: self.current_dir.clone(),
+            ..Default::default()
+        }
+    }
+
+    pub fn tx<STx, F>(&mut self, f: F) -> &mut Self
+    where
+        STx: ScenarioTx,
+        F: FnOnce(TxScenarioBase) -> STx,
+    {
+        let env = self.tx_env();
+        let tx_base = TxScenarioBase::new_with_env(env);
+        let tx = f(tx_base);
+        tx.run_as_scenario_step(self);
+        self
+    }
+}
+
+impl<From, To, Payment, Gas> ScenarioTx
+    for Tx<StaticApi, ScenarioTxEnvironment, From, To, Payment, Gas, FunctionCall<StaticApi>>
+where
+    From: TxFromSpecified<StaticApi>,
+    To: TxToSpecified<StaticApi>,
+    Payment: TxPayment<StaticApi>,
+    Gas: TxGas,
+{
+    fn run_as_scenario_step(self, world: &mut ScenarioWorld) {
+        let mut step = ScCallStep::new()
+            .from(self.env.from_annotation.unwrap().as_str())
+            .to(self.env.to_annotation.unwrap().as_str())
+            .function(self.data.function_name.to_string().as_str());
+        for arg in self.data.arg_buffer.iter_buffers() {
+            step = step.argument(arg.to_vec());
+        }
+
+        world.sc_call(step);
+    }
+}

From f53c4859c94ca7986646f59c237ebe27cd63de2a Mon Sep 17 00:00:00 2001
From: Alin Cruceat <alyn_509@yahoo.com>
Date: Mon, 6 Nov 2023 16:31:09 +0200
Subject: [PATCH 0028/1254] replaced staking functions with staking module

---
 contracts/core/price-aggregator/src/lib.rs    |  11 +-
 .../core/price-aggregator/src/staking.rs      | 176 ------------------
 .../tests/price_aggregator_blackbox_test.rs   |   3 +-
 .../tests/price_aggregator_whitebox_test.rs   |   6 +-
 .../core/price-aggregator/wasm/src/lib.rs     |   5 +-
 5 files changed, 14 insertions(+), 187 deletions(-)
 delete mode 100644 contracts/core/price-aggregator/src/staking.rs

diff --git a/contracts/core/price-aggregator/src/lib.rs b/contracts/core/price-aggregator/src/lib.rs
index 7aae1f2a1d..ff56601b8c 100644
--- a/contracts/core/price-aggregator/src/lib.rs
+++ b/contracts/core/price-aggregator/src/lib.rs
@@ -5,16 +5,17 @@ multiversx_sc::imports!();
 mod events;
 pub mod median;
 pub mod price_aggregator_data;
-pub mod staking;
 
+use multiversx_sc_modules::staking;
 use price_aggregator_data::{OracleStatus, PriceFeed, TimestampedPrice, TokenPair};
 
 const SUBMISSION_LIST_MAX_LEN: usize = 50;
+const SUBMISSION_LIST_MIN_LEN: usize = 3;
 const FIRST_SUBMISSION_TIMESTAMP_MAX_DIFF_SECONDS: u64 = 30;
 pub const MAX_ROUND_DURATION_SECONDS: u64 = 1_800; // 30 minutes
-static PAUSED_ERROR_MSG: &[u8] = b"Contract is paused";
-static PAIR_DECIMALS_NOT_CONFIGURED_ERROR: &[u8] = b"pair decimals not configured";
-static WRONG_NUMBER_OF_DECIMALS_ERROR: &[u8] = b"wrong number of decimals";
+const PAUSED_ERROR_MSG: &[u8] = b"Contract is paused";
+const PAIR_DECIMALS_NOT_CONFIGURED_ERROR: &[u8] = b"pair decimals not configured";
+const WRONG_NUMBER_OF_DECIMALS_ERROR: &[u8] = b"wrong number of decimals";
 
 #[multiversx_sc::contract]
 pub trait PriceAggregator:
@@ -204,7 +205,7 @@ pub trait PriceAggregator:
 
     fn require_valid_submission_count(&self, submission_count: usize) {
         require!(
-            submission_count >= 1
+            submission_count >= SUBMISSION_LIST_MIN_LEN
                 && submission_count <= self.oracle_status().len()
                 && submission_count <= SUBMISSION_LIST_MAX_LEN,
             "Invalid submission count"
diff --git a/contracts/core/price-aggregator/src/staking.rs b/contracts/core/price-aggregator/src/staking.rs
deleted file mode 100644
index 4ec2a25a00..0000000000
--- a/contracts/core/price-aggregator/src/staking.rs
+++ /dev/null
@@ -1,176 +0,0 @@
-// TODO: Replace with the one from multiversx_sc_modules on next release
-
-multiversx_sc::imports!();
-multiversx_sc::derive_imports!();
-
-#[derive(TopEncode, TopDecode)]
-pub struct TokenAmountPair<M: ManagedTypeApi> {
-    pub token_id: EgldOrEsdtTokenIdentifier<M>,
-    pub amount: BigUint<M>,
-}
-
-static NOT_ENOUGH_STAKE_ERR_MSG: &[u8] = b"Not enough stake";
-
-#[multiversx_sc::module]
-pub trait StakingModule {
-    fn init_staking_module(
-        &self,
-        staking_token: &EgldOrEsdtTokenIdentifier,
-        staking_amount: &BigUint,
-        slash_amount: &BigUint,
-        slash_quorum: usize,
-        user_whitelist: &ManagedVec<ManagedAddress>,
-    ) {
-        let nr_board_members = user_whitelist.len();
-        require!(nr_board_members > 0, "No board members");
-        require!(
-            slash_quorum <= nr_board_members,
-            "Quorum higher than total possible board members"
-        );
-        require!(
-            staking_amount > &0 && slash_amount > &0,
-            "Staking and slash amount cannot be 0"
-        );
-        require!(
-            slash_amount <= staking_amount,
-            "Slash amount cannot be higher than required stake"
-        );
-
-        self.staking_token().set(staking_token);
-        self.required_stake_amount().set(staking_amount);
-        self.slash_amount().set(slash_amount);
-        self.slash_quorum().set(slash_quorum);
-
-        for user in user_whitelist {
-            let _ = self.user_whitelist().insert(user);
-        }
-    }
-
-    #[payable("*")]
-    #[endpoint]
-    fn stake(&self) {
-        let (payment_token, payment_amount) = self.call_value().egld_or_single_fungible_esdt();
-        let staking_token = self.staking_token().get();
-        require!(payment_token == staking_token, "Invalid payment token");
-
-        let caller = self.blockchain().get_caller();
-        require!(
-            self.user_whitelist().contains(&caller),
-            "Only whitelisted members can stake"
-        );
-
-        self.staked_amount(&caller)
-            .update(|amt| *amt += payment_amount);
-    }
-
-    #[endpoint]
-    fn unstake(&self, unstake_amount: BigUint) {
-        let caller = self.blockchain().get_caller();
-        let staked_amount_mapper = self.staked_amount(&caller);
-        let staked_amount = staked_amount_mapper.get();
-        require!(unstake_amount <= staked_amount, NOT_ENOUGH_STAKE_ERR_MSG);
-
-        let leftover_amount = &staked_amount - &unstake_amount;
-        let required_stake_amount = self.required_stake_amount().get();
-        if self.user_whitelist().contains(&caller) {
-            require!(
-                leftover_amount >= required_stake_amount,
-                NOT_ENOUGH_STAKE_ERR_MSG
-            );
-        }
-
-        staked_amount_mapper.set(&leftover_amount);
-
-        let staking_token = self.staking_token().get();
-        self.send()
-            .direct(&caller, &staking_token, 0, &unstake_amount);
-    }
-
-    #[endpoint(voteSlashMember)]
-    fn vote_slash_member(&self, member_to_slash: ManagedAddress) {
-        require!(
-            self.is_staked_board_member(&member_to_slash),
-            "Voted user is not a staked board member"
-        );
-
-        let caller = self.blockchain().get_caller();
-        require!(
-            self.is_staked_board_member(&caller),
-            NOT_ENOUGH_STAKE_ERR_MSG
-        );
-
-        let _ = self
-            .slashing_proposal_voters(&member_to_slash)
-            .insert(caller);
-    }
-
-    #[endpoint(slashMember)]
-    fn slash_member(&self, member_to_slash: ManagedAddress) {
-        let quorum = self.slash_quorum().get();
-        let mut slashing_voters_mapper = self.slashing_proposal_voters(&member_to_slash);
-        require!(slashing_voters_mapper.len() >= quorum, "Quorum not reached");
-
-        let slash_amount = self.slash_amount().get();
-        self.staked_amount(&member_to_slash)
-            .update(|amt| *amt -= &slash_amount);
-        self.total_slashed_amount()
-            .update(|total| *total += slash_amount);
-
-        slashing_voters_mapper.clear();
-    }
-
-    fn is_staked_board_member(&self, user: &ManagedAddress) -> bool {
-        let required_stake = self.required_stake_amount().get();
-        let user_stake = self.staked_amount(user).get();
-
-        self.user_whitelist().contains(user) && user_stake >= required_stake
-    }
-
-    #[inline]
-    fn add_board_member(&self, user: ManagedAddress) {
-        let _ = self.user_whitelist().insert(user);
-    }
-
-    fn remove_board_member(&self, user: &ManagedAddress) {
-        let mut whitelist_mapper = self.user_whitelist();
-        let was_whitelisted = whitelist_mapper.swap_remove(user);
-        if !was_whitelisted {
-            return;
-        }
-
-        // remove user's votes as well
-        for board_member in whitelist_mapper.iter() {
-            let _ = self
-                .slashing_proposal_voters(&board_member)
-                .swap_remove(user);
-        }
-        self.slashing_proposal_voters(user).clear();
-    }
-
-    #[storage_mapper("staking_module:stakingToken")]
-    fn staking_token(&self) -> SingleValueMapper<EgldOrEsdtTokenIdentifier>;
-
-    #[storage_mapper("staking_module:requiredStakeAmount")]
-    fn required_stake_amount(&self) -> SingleValueMapper<BigUint>;
-
-    #[storage_mapper("staking_module:userWhitelist")]
-    fn user_whitelist(&self) -> UnorderedSetMapper<ManagedAddress>;
-
-    #[storage_mapper("staking_module:stakedAmount")]
-    fn staked_amount(&self, user: &ManagedAddress) -> SingleValueMapper<BigUint>;
-
-    #[storage_mapper("staking_module:slashingProposalVoters")]
-    fn slashing_proposal_voters(
-        &self,
-        slash_address: &ManagedAddress,
-    ) -> UnorderedSetMapper<ManagedAddress>;
-
-    #[storage_mapper("staking_module:slashQuorum")]
-    fn slash_quorum(&self) -> SingleValueMapper<usize>;
-
-    #[storage_mapper("staking_module:slashAmount")]
-    fn slash_amount(&self) -> SingleValueMapper<BigUint>;
-
-    #[storage_mapper("staking_module:totalSlashedAmount")]
-    fn total_slashed_amount(&self) -> SingleValueMapper<BigUint>;
-}
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 bc1078bb06..715823fc7d 100644
--- a/contracts/core/price-aggregator/tests/price_aggregator_blackbox_test.rs
+++ b/contracts/core/price-aggregator/tests/price_aggregator_blackbox_test.rs
@@ -1,13 +1,12 @@
 use multiversx_price_aggregator_sc::{
     price_aggregator_data::{OracleStatus, TimestampedPrice, TokenPair},
-    staking::ProxyTrait as _,
     ContractObj, PriceAggregator, ProxyTrait as _, MAX_ROUND_DURATION_SECONDS,
 };
 use multiversx_sc::{
     codec::multi_types::MultiValueVec,
     types::{Address, EgldOrEsdtTokenIdentifier},
 };
-use multiversx_sc_modules::pause::ProxyTrait;
+use multiversx_sc_modules::{pause::ProxyTrait, staking::ProxyTrait as _};
 use multiversx_sc_scenario::{
     api::StaticApi,
     managed_address, managed_biguint, managed_buffer,
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 a2ab56a22a..e07cadc19d 100644
--- a/contracts/core/price-aggregator/tests/price_aggregator_whitebox_test.rs
+++ b/contracts/core/price-aggregator/tests/price_aggregator_whitebox_test.rs
@@ -1,10 +1,12 @@
 use multiversx_price_aggregator_sc::{
     price_aggregator_data::{OracleStatus, TimestampedPrice, TokenPair},
-    staking::EndpointWrappers as StakingEndpointWrappers,
     PriceAggregator, MAX_ROUND_DURATION_SECONDS,
 };
 use multiversx_sc::types::{EgldOrEsdtTokenIdentifier, MultiValueEncoded};
-use multiversx_sc_modules::pause::EndpointWrappers as PauseEndpointWrappers;
+use multiversx_sc_modules::{
+    pause::EndpointWrappers as PauseEndpointWrappers,
+    staking::EndpointWrappers as StakingEndpointWrappers,
+};
 use multiversx_sc_scenario::{
     managed_address, managed_biguint, managed_buffer, scenario_model::*, WhiteboxContract, *,
 };
diff --git a/contracts/core/price-aggregator/wasm/src/lib.rs b/contracts/core/price-aggregator/wasm/src/lib.rs
index 9dbe38b27d..b95e17d571 100644
--- a/contracts/core/price-aggregator/wasm/src/lib.rs
+++ b/contracts/core/price-aggregator/wasm/src/lib.rs
@@ -5,9 +5,9 @@
 ////////////////////////////////////////////////////
 
 // Init:                                 1
-// Endpoints:                           19
+// Endpoints:                           20
 // Async Callback (empty):               1
-// Total number of exported functions:  21
+// Total number of exported functions:  22
 
 #![no_std]
 
@@ -40,6 +40,7 @@ multiversx_sc_wasm_adapter::endpoints! {
         stake => stake
         unstake => unstake
         voteSlashMember => vote_slash_member
+        cancelVoteSlashMember => cancel_vote_slash_member
         slashMember => slash_member
     )
 }

From 6d64ca67f4dc1bcf758ad20720419fe7067e879a Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Mon, 6 Nov 2023 19:16:32 +0200
Subject: [PATCH 0029/1254] abi validation - allow contracts without init but
 with upgrade

---
 .../contract/output_contract/oc_validate.rs   | 20 +++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/framework/meta/src/cmd/contract/output_contract/oc_validate.rs b/framework/meta/src/cmd/contract/output_contract/oc_validate.rs
index 81dcccc94f..f065456af3 100644
--- a/framework/meta/src/cmd/contract/output_contract/oc_validate.rs
+++ b/framework/meta/src/cmd/contract/output_contract/oc_validate.rs
@@ -10,10 +10,22 @@ pub fn validate_output_contract(output_contract: &OutputContract) -> Result<(),
 
 fn check_single_constructor(output_contract: &OutputContract) -> Result<(), String> {
     match output_contract.abi.constructors.len() {
-            0 => Err("Missing constructor. Add a method annotated with `#[init]`.".to_string()),
-            1 => Ok(()),
-            _ => Err("More than one contrctructor present. Exactly one method annotated with `#[init]` is required.".to_string()),
-        }
+        0 => if has_upgrade(output_contract) {
+            Ok(())
+        } else {
+            Err("Missing constructor. Add a method annotated with `#[init]`.".to_string())
+        },
+        1 => Ok(()),
+        _ => Err("More than one contrctructor present. Exactly one method annotated with `#[init]` is required.".to_string()),
+    }
+}
+
+fn has_upgrade(output_contract: &OutputContract) -> bool {
+    output_contract
+        .abi
+        .endpoints
+        .iter()
+        .any(|endpoint| endpoint.name == "upgrade")
 }
 
 /// Note: promise callbacks not included, since they have `#[call_value]` arguments, that are currently not modelled.

From 88e183ea7d1014ad5907ec97cea771b4e1a69547 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Mon, 6 Nov 2023 19:17:20 +0200
Subject: [PATCH 0030/1254] vault-upgrade contract

---
 .../composability/vault/sc-config.toml        |   8 +-
 .../composability/vault/src/vault.rs          |   1 +
 .../vault/wasm-vault-promises/Cargo.lock      |  15 +-
 .../vault/wasm-vault-promises/Cargo.toml      |   2 +
 .../vault/wasm-vault-promises/src/lib.rs      |   5 +-
 .../vault/wasm-vault-upgrade/Cargo.lock       | 248 ++++++++++++++++++
 .../vault/wasm-vault-upgrade/Cargo.toml       |  26 ++
 .../vault/wasm-vault-upgrade/src/lib.rs       |  28 ++
 .../composability/vault/wasm/Cargo.lock       |  15 +-
 .../composability/vault/wasm/src/lib.rs       |   2 +-
 10 files changed, 337 insertions(+), 13 deletions(-)
 create mode 100644 contracts/feature-tests/composability/vault/wasm-vault-upgrade/Cargo.lock
 create mode 100644 contracts/feature-tests/composability/vault/wasm-vault-upgrade/Cargo.toml
 create mode 100644 contracts/feature-tests/composability/vault/wasm-vault-upgrade/src/lib.rs

diff --git a/contracts/feature-tests/composability/vault/sc-config.toml b/contracts/feature-tests/composability/vault/sc-config.toml
index ba5b72985c..ca28ad38c1 100644
--- a/contracts/feature-tests/composability/vault/sc-config.toml
+++ b/contracts/feature-tests/composability/vault/sc-config.toml
@@ -4,8 +4,14 @@ main = "main"
 [contracts.main]
 name = "vault"
 add-unlabelled = true
+add-labels = ["upgrade"]
 
 [contracts.promises]
 name = "vault-promises"
 add-unlabelled = true
-add-labels = ["promises-endpoint"]
\ No newline at end of file
+add-labels = ["promises-endpoint"]
+
+[contracts.upgrade]
+name = "vault-upgrade"
+add-unlabelled = false
+add-labels = ["upgrade"]
\ No newline at end of file
diff --git a/contracts/feature-tests/composability/vault/src/vault.rs b/contracts/feature-tests/composability/vault/src/vault.rs
index 1583c117b0..9dfaa11a07 100644
--- a/contracts/feature-tests/composability/vault/src/vault.rs
+++ b/contracts/feature-tests/composability/vault/src/vault.rs
@@ -15,6 +15,7 @@ pub trait Vault {
     }
 
     #[upgrade]
+    #[label("upgrade")]
     fn upgrade(
         &self,
         opt_arg_to_echo: OptionalValue<ManagedBuffer>,
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 22133c868e..09da7d4c35 100644
--- a/contracts/feature-tests/composability/vault/wasm-vault-promises/Cargo.lock
+++ b/contracts/feature-tests/composability/vault/wasm-vault-promises/Cargo.lock
@@ -14,6 +14,12 @@ dependencies = [
  "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"
@@ -46,11 +52,12 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.13.2"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
  "ahash",
+ "allocator-api2",
 ]
 
 [[package]]
@@ -61,9 +68,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-literal"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
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 ce3f2a30b2..8e446dda29 100644
--- a/contracts/feature-tests/composability/vault/wasm-vault-promises/Cargo.toml
+++ b/contracts/feature-tests/composability/vault/wasm-vault-promises/Cargo.toml
@@ -7,12 +7,14 @@ publish = false
 
 [lib]
 crate-type = ["cdylib"]
+
 [profile.release]
 codegen-units = 1
 opt-level = "z"
 lto = true
 debug = false
 panic = "abort"
+
 [dependencies.vault]
 path = ".."
 
diff --git a/contracts/feature-tests/composability/vault/wasm-vault-promises/src/lib.rs b/contracts/feature-tests/composability/vault/wasm-vault-promises/src/lib.rs
index 35441b4627..87c110bc70 100644
--- a/contracts/feature-tests/composability/vault/wasm-vault-promises/src/lib.rs
+++ b/contracts/feature-tests/composability/vault/wasm-vault-promises/src/lib.rs
@@ -5,9 +5,9 @@
 ////////////////////////////////////////////////////
 
 // Init:                                 1
-// Endpoints:                           17
+// Endpoints:                           16
 // Async Callback (empty):               1
-// Total number of exported functions:  19
+// Total number of exported functions:  18
 
 #![no_std]
 
@@ -22,7 +22,6 @@ multiversx_sc_wasm_adapter::endpoints! {
     vault
     (
         init => init
-        upgrade => upgrade
         echo_arguments => echo_arguments
         echo_arguments_without_storage => echo_arguments_without_storage
         echo_caller => echo_caller
diff --git a/contracts/feature-tests/composability/vault/wasm-vault-upgrade/Cargo.lock b/contracts/feature-tests/composability/vault/wasm-vault-upgrade/Cargo.lock
new file mode 100644
index 0000000000..9086f87a5f
--- /dev/null
+++ b/contracts/feature-tests/composability/vault/wasm-vault-upgrade/Cargo.lock
@@ -0,0 +1,248 @@
+# This file is automatically @generated by Cargo.
+# 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"
+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 = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+
+[[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.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
+dependencies = [
+ "ahash",
+ "allocator-api2",
+]
+
+[[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.44.0"
+dependencies = [
+ "bitflags",
+ "hashbrown",
+ "hex-literal",
+ "multiversx-sc-codec",
+ "multiversx-sc-derive",
+ "num-traits",
+]
+
+[[package]]
+name = "multiversx-sc-codec"
+version = "0.18.1"
+dependencies = [
+ "arrayvec",
+ "multiversx-sc-codec-derive",
+]
+
+[[package]]
+name = "multiversx-sc-codec-derive"
+version = "0.18.1"
+dependencies = [
+ "hex",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "multiversx-sc-derive"
+version = "0.44.0"
+dependencies = [
+ "hex",
+ "proc-macro2",
+ "quote",
+ "radix_trie",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "multiversx-sc-wasm-adapter"
+version = "0.44.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 = "once_cell"
+version = "1.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.33"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+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.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
+
+[[package]]
+name = "syn"
+version = "1.0.109"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "syn"
+version = "2.0.39"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
+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"
+
+[[package]]
+name = "vault"
+version = "0.0.0"
+dependencies = [
+ "multiversx-sc",
+]
+
+[[package]]
+name = "vault-upgrade-wasm"
+version = "0.0.0"
+dependencies = [
+ "multiversx-sc-wasm-adapter",
+ "vault",
+]
+
+[[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.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8cd369a67c0edfef15010f980c3cbe45d7f651deac2cd67ce097cd801de16557"
+dependencies = [
+ "zerocopy-derive",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.7.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c2f140bda219a26ccc0cdb03dba58af72590c53b22642577d88a927bc5c87d6b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.39",
+]
diff --git a/contracts/feature-tests/composability/vault/wasm-vault-upgrade/Cargo.toml b/contracts/feature-tests/composability/vault/wasm-vault-upgrade/Cargo.toml
new file mode 100644
index 0000000000..0b0d4ad35c
--- /dev/null
+++ b/contracts/feature-tests/composability/vault/wasm-vault-upgrade/Cargo.toml
@@ -0,0 +1,26 @@
+[package]
+name = "vault-upgrade-wasm"
+version = "0.0.0"
+authors = ["Andrei Marinica <andrei.marinica@multiversx.com>"]
+edition = "2021"
+publish = false
+
+[lib]
+crate-type = ["cdylib"]
+
+[profile.release]
+codegen-units = 1
+opt-level = "z"
+lto = true
+debug = false
+panic = "abort"
+
+[dependencies.vault]
+path = ".."
+
+[dependencies.multiversx-sc-wasm-adapter]
+version = "0.44.0"
+path = "../../../../../framework/wasm-adapter"
+
+[workspace]
+members = ["."]
diff --git a/contracts/feature-tests/composability/vault/wasm-vault-upgrade/src/lib.rs b/contracts/feature-tests/composability/vault/wasm-vault-upgrade/src/lib.rs
new file mode 100644
index 0000000000..fa9bca4e20
--- /dev/null
+++ b/contracts/feature-tests/composability/vault/wasm-vault-upgrade/src/lib.rs
@@ -0,0 +1,28 @@
+// Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+
+////////////////////////////////////////////////////
+////////////////// AUTO-GENERATED //////////////////
+////////////////////////////////////////////////////
+
+// Init:                                 1
+// Endpoints:                            1
+// Async Callback (empty):               1
+// Total number of exported functions:   3
+
+#![no_std]
+
+// Configuration that works with rustc < 1.73.0.
+// TODO: Recommended rustc version: 1.73.0 or newer.
+#![feature(lang_items)]
+
+multiversx_sc_wasm_adapter::allocator!();
+multiversx_sc_wasm_adapter::panic_handler!();
+
+multiversx_sc_wasm_adapter::endpoints! {
+    vault
+    (
+        upgrade => upgrade
+    )
+}
+
+multiversx_sc_wasm_adapter::async_callback_empty! {}
diff --git a/contracts/feature-tests/composability/vault/wasm/Cargo.lock b/contracts/feature-tests/composability/vault/wasm/Cargo.lock
index 1ac6d18dda..9ddce778f8 100755
--- a/contracts/feature-tests/composability/vault/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/vault/wasm/Cargo.lock
@@ -14,6 +14,12 @@ dependencies = [
  "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"
@@ -46,11 +52,12 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.13.2"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
  "ahash",
+ "allocator-api2",
 ]
 
 [[package]]
@@ -61,9 +68,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-literal"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
diff --git a/contracts/feature-tests/composability/vault/wasm/src/lib.rs b/contracts/feature-tests/composability/vault/wasm/src/lib.rs
index 1d6a0410f7..b7546bcde3 100644
--- a/contracts/feature-tests/composability/vault/wasm/src/lib.rs
+++ b/contracts/feature-tests/composability/vault/wasm/src/lib.rs
@@ -22,7 +22,6 @@ multiversx_sc_wasm_adapter::endpoints! {
     vault
     (
         init => init
-        upgrade => upgrade
         echo_arguments => echo_arguments
         echo_arguments_without_storage => echo_arguments_without_storage
         echo_caller => echo_caller
@@ -38,6 +37,7 @@ multiversx_sc_wasm_adapter::endpoints! {
         call_counts => call_counts
         num_called_retrieve_funds_promises => num_called_retrieve_funds_promises
         num_async_calls_sent_from_child => num_async_calls_sent_from_child
+        upgrade => upgrade
     )
 }
 

From 83f52337f63eb885116171af24a391ec9cbbbd8d Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Mon, 6 Nov 2023 19:17:42 +0200
Subject: [PATCH 0031/1254] upgrade endpoint in contracts

---
 contracts/examples/adder/src/adder.rs             |  5 +++++
 contracts/examples/adder/wasm/src/lib.rs          |  5 +++--
 contracts/examples/multisig/src/multisig.rs       |  5 +++++
 .../multisig/wasm-multisig-full/src/lib.rs        |  5 +++--
 contracts/examples/multisig/wasm/src/lib.rs       |  5 +++--
 .../proxy-test-first/src/proxy-test-first.rs      |  2 +-
 .../proxy-test-first/wasm/Cargo.lock              | 15 +++++++++++----
 .../proxy-test-second/src/proxy-test-second.rs    |  6 ++++++
 .../proxy-test-second/wasm/Cargo.lock             | 15 +++++++++++----
 .../proxy-test-second/wasm/src/lib.rs             |  5 +++--
 10 files changed, 51 insertions(+), 17 deletions(-)

diff --git a/contracts/examples/adder/src/adder.rs b/contracts/examples/adder/src/adder.rs
index f7c47ab01a..3913efb519 100644
--- a/contracts/examples/adder/src/adder.rs
+++ b/contracts/examples/adder/src/adder.rs
@@ -15,6 +15,11 @@ pub trait Adder {
         self.sum().set(initial_value);
     }
 
+    #[upgrade]
+    fn upgrade(&self, initial_value: BigUint) {
+        self.init(initial_value);
+    }
+
     /// Add desired amount to the storage variable.
     #[endpoint]
     fn add(&self, value: BigUint) {
diff --git a/contracts/examples/adder/wasm/src/lib.rs b/contracts/examples/adder/wasm/src/lib.rs
index 9fef05476a..88d42d6996 100644
--- a/contracts/examples/adder/wasm/src/lib.rs
+++ b/contracts/examples/adder/wasm/src/lib.rs
@@ -5,9 +5,9 @@
 ////////////////////////////////////////////////////
 
 // Init:                                 1
-// Endpoints:                            2
+// Endpoints:                            3
 // Async Callback (empty):               1
-// Total number of exported functions:   4
+// Total number of exported functions:   5
 
 #![no_std]
 
@@ -23,6 +23,7 @@ multiversx_sc_wasm_adapter::endpoints! {
     (
         init => init
         getSum => sum
+        upgrade => upgrade
         add => add
     )
 }
diff --git a/contracts/examples/multisig/src/multisig.rs b/contracts/examples/multisig/src/multisig.rs
index d392cda5e8..fee8439656 100644
--- a/contracts/examples/multisig/src/multisig.rs
+++ b/contracts/examples/multisig/src/multisig.rs
@@ -41,6 +41,11 @@ pub trait Multisig:
         self.quorum().set(quorum);
     }
 
+    #[upgrade]
+    fn upgrade(&self, quorum: usize, board: MultiValueEncoded<ManagedAddress>) {
+        self.init(quorum, board)
+    }
+
     /// Allows the contract to receive funds even if it is marked as unpayable in the protocol.
     #[payable("*")]
     #[endpoint]
diff --git a/contracts/examples/multisig/wasm-multisig-full/src/lib.rs b/contracts/examples/multisig/wasm-multisig-full/src/lib.rs
index f06f1be4f6..5f7be5f3e5 100644
--- a/contracts/examples/multisig/wasm-multisig-full/src/lib.rs
+++ b/contracts/examples/multisig/wasm-multisig-full/src/lib.rs
@@ -5,9 +5,9 @@
 ////////////////////////////////////////////////////
 
 // Init:                                 1
-// Endpoints:                           28
+// Endpoints:                           29
 // Async Callback:                       1
-// Total number of exported functions:  30
+// Total number of exported functions:  31
 
 #![no_std]
 
@@ -22,6 +22,7 @@ multiversx_sc_wasm_adapter::endpoints! {
     multisig
     (
         init => init
+        upgrade => upgrade
         deposit => deposit
         signed => signed
         sign => sign
diff --git a/contracts/examples/multisig/wasm/src/lib.rs b/contracts/examples/multisig/wasm/src/lib.rs
index d62dd3d4c8..6b8766c013 100644
--- a/contracts/examples/multisig/wasm/src/lib.rs
+++ b/contracts/examples/multisig/wasm/src/lib.rs
@@ -5,9 +5,9 @@
 ////////////////////////////////////////////////////
 
 // Init:                                 1
-// Endpoints:                           20
+// Endpoints:                           21
 // Async Callback:                       1
-// Total number of exported functions:  22
+// Total number of exported functions:  23
 
 #![no_std]
 
@@ -22,6 +22,7 @@ multiversx_sc_wasm_adapter::endpoints! {
     multisig
     (
         init => init
+        upgrade => upgrade
         deposit => deposit
         signed => signed
         sign => sign
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 97dcf6f6f8..9b4b26ccb0 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
@@ -79,7 +79,7 @@ pub trait ProxyTestFirst {
 
         self.message_me_proxy()
             .contract(other_contract)
-            .init(456)
+            .init(456) // TODO: upgrade proxy
             .with_egld_transfer(payment.clone_value())
             .upgrade_contract(&code, CodeMetadata::DEFAULT);
     }
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 c6c817c156..54c856f14b 100755
--- a/contracts/feature-tests/composability/proxy-test-first/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/proxy-test-first/wasm/Cargo.lock
@@ -14,6 +14,12 @@ dependencies = [
  "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"
@@ -46,11 +52,12 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.13.2"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
  "ahash",
+ "allocator-api2",
 ]
 
 [[package]]
@@ -61,9 +68,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-literal"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
diff --git a/contracts/feature-tests/composability/proxy-test-second/src/proxy-test-second.rs b/contracts/feature-tests/composability/proxy-test-second/src/proxy-test-second.rs
index 3bf0e3f089..33f199cfb5 100644
--- a/contracts/feature-tests/composability/proxy-test-second/src/proxy-test-second.rs
+++ b/contracts/feature-tests/composability/proxy-test-second/src/proxy-test-second.rs
@@ -34,6 +34,12 @@ pub trait ProxyTestSecond {
         init_arg + 1
     }
 
+    #[upgrade]
+    #[payable("EGLD")]
+    fn upgrade(&self, init_arg: i32) -> i32 {
+        self.init(init_arg)
+    }
+
     #[payable("EGLD")]
     #[endpoint(payMe)]
     fn pay_me(&self, arg1: i64) {
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 2252a3249c..fc72c66d49 100755
--- a/contracts/feature-tests/composability/proxy-test-second/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/proxy-test-second/wasm/Cargo.lock
@@ -14,6 +14,12 @@ dependencies = [
  "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"
@@ -46,11 +52,12 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.13.2"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
  "ahash",
+ "allocator-api2",
 ]
 
 [[package]]
@@ -61,9 +68,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-literal"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
diff --git a/contracts/feature-tests/composability/proxy-test-second/wasm/src/lib.rs b/contracts/feature-tests/composability/proxy-test-second/wasm/src/lib.rs
index 0fa4134bbf..06a02e3986 100644
--- a/contracts/feature-tests/composability/proxy-test-second/wasm/src/lib.rs
+++ b/contracts/feature-tests/composability/proxy-test-second/wasm/src/lib.rs
@@ -5,9 +5,9 @@
 ////////////////////////////////////////////////////
 
 // Init:                                 1
-// Endpoints:                            3
+// Endpoints:                            4
 // Async Callback (empty):               1
-// Total number of exported functions:   5
+// Total number of exported functions:   6
 
 #![no_std]
 
@@ -22,6 +22,7 @@ multiversx_sc_wasm_adapter::endpoints! {
     proxy_test_second
     (
         init => init
+        upgrade => upgrade
         payMe => pay_me
         payMeWithResult => pay_me_with_result_endpoint
         messageMe => message_me

From 4d37d4a7b717e7e8110168f1b45621f879164351 Mon Sep 17 00:00:00 2001
From: Alin Cruceat <alyn_509@yahoo.com>
Date: Tue, 7 Nov 2023 01:45:53 +0200
Subject: [PATCH 0032/1254] change amount endpoint

---
 contracts/core/price-aggregator/src/lib.rs | 33 ++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/contracts/core/price-aggregator/src/lib.rs b/contracts/core/price-aggregator/src/lib.rs
index ff56601b8c..70c1f5b586 100644
--- a/contracts/core/price-aggregator/src/lib.rs
+++ b/contracts/core/price-aggregator/src/lib.rs
@@ -47,6 +47,39 @@ pub trait PriceAggregator:
         self.set_paused(true);
     }
 
+    #[only_owner]
+    #[endpoint(changeAmounts)]
+    fn change_amounts(&self, staking_amount: BigUint, slash_amount: BigUint) {
+        require!(
+            staking_amount > 0 && slash_amount > 0,
+            "Staking and slash amount cannot be 0"
+        );
+        require!(
+            slash_amount <= staking_amount,
+            "Slash amount cannot be higher than required stake"
+        );
+
+        let user_whitelist = self.user_whitelist();
+        let slash_quorum = self.slash_quorum().get();
+
+        let mut users_owning_new_amount = 0;
+        for user in user_whitelist.iter() {
+            if staking_amount < self.staked_amount(&user).get() {
+                users_owning_new_amount += 1;
+            }
+            if users_owning_new_amount > slash_quorum {
+                break;
+            }
+        }
+
+        require!(
+            users_owning_new_amount > slash_quorum,
+            "New staking amount is too big compared to members staked amount"
+        );
+        self.required_stake_amount().set(staking_amount);
+        self.slash_amount().set(slash_amount);
+    }
+
     #[only_owner]
     #[endpoint(addOracles)]
     fn add_oracles(&self, oracles: MultiValueEncoded<ManagedAddress>) {

From ddff31f757a5a5f9842c18333b40d0147cf48488 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Tue, 7 Nov 2023 22:46:22 +0200
Subject: [PATCH 0033/1254] Add template for ping-pong-egld.

---
 contracts/examples/ping-pong-egld/README.md   |  3 +++
 .../ping-pong-egld/mxsc-template.toml         | 19 +++++++++++++++++++
 framework/meta/tests/template_test.rs         |  6 ++++++
 3 files changed, 28 insertions(+)
 create mode 100644 contracts/examples/ping-pong-egld/README.md
 create mode 100644 contracts/examples/ping-pong-egld/mxsc-template.toml

diff --git a/contracts/examples/ping-pong-egld/README.md b/contracts/examples/ping-pong-egld/README.md
new file mode 100644
index 0000000000..7fadb4a01f
--- /dev/null
+++ b/contracts/examples/ping-pong-egld/README.md
@@ -0,0 +1,3 @@
+# PingPong
+
+`PingPong` is a simple Smart Contract.
diff --git a/contracts/examples/ping-pong-egld/mxsc-template.toml b/contracts/examples/ping-pong-egld/mxsc-template.toml
new file mode 100644
index 0000000000..a1fc2c6330
--- /dev/null
+++ b/contracts/examples/ping-pong-egld/mxsc-template.toml
@@ -0,0 +1,19 @@
+name = "ping-pong-egld"
+contract_trait = "PingPong"
+src_file = "ping_pong.rs"
+rename_pairs = [
+    [
+        "blockchain.set_current_dir_from_workspace(\"contracts/examples/ping-pong-egld\");",
+        "// blockchain.set_current_dir_from_workspace(\"relative path to your workspace, if applicable\");",
+    ],
+]
+files_include = [
+    "meta",
+    "scenarios",
+    "src",
+    "tests",
+    "wasm/Cargo.toml",
+    "Cargo.toml",
+    "README.md",
+    "multiversx.json",
+]
diff --git a/framework/meta/tests/template_test.rs b/framework/meta/tests/template_test.rs
index c6527990f5..0538e73143 100644
--- a/framework/meta/tests/template_test.rs
+++ b/framework/meta/tests/template_test.rs
@@ -47,6 +47,12 @@ fn template_current_empty() {
     template_test_current("empty", "examples", "new-empty");
 }
 
+#[test]
+#[cfg_attr(not(feature = "template-test-current"), ignore)]
+fn template_current_ping_pong_egld() {
+    template_test_current("ping-pong-egld", "examples", "new-ping-pong-egld");
+}
+
 /// Recreates the folder structure in `contracts`, on the same level.
 /// This way, the relative paths are still valid in this case,
 /// and we can test the templates with the framework version of the current branch.

From ab9a8661e265b2fc12a2e146ca1c8e16e2fecb90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Tue, 7 Nov 2023 22:46:37 +0200
Subject: [PATCH 0034/1254] But of cleanup in github workflows.

---
 .github/workflows/release-upload.yml         | 6 ------
 .github/workflows/template-test-current.yml  | 6 ------
 .github/workflows/template-test-released.yml | 6 ------
 3 files changed, 18 deletions(-)

diff --git a/.github/workflows/release-upload.yml b/.github/workflows/release-upload.yml
index c46bd4963c..a4be4368dd 100644
--- a/.github/workflows/release-upload.yml
+++ b/.github/workflows/release-upload.yml
@@ -43,12 +43,6 @@ jobs:
           which wasm2wat
           which run-scenarios
 
-      - name: Install libtinfo5
-        if: inputs.install-libtinfo5
-        run: |
-          sudo apt update
-          sudo apt install -y libtinfo5
-
       - name: Build project example outputs
         run: |
           ./zip-example-wasm.sh
diff --git a/.github/workflows/template-test-current.yml b/.github/workflows/template-test-current.yml
index 97f5e57ea5..aad48d8180 100644
--- a/.github/workflows/template-test-current.yml
+++ b/.github/workflows/template-test-current.yml
@@ -45,12 +45,6 @@ jobs:
           which wasm2wat
           which run-scenarios
 
-      - name: Install libtinfo5
-        if: inputs.install-libtinfo5
-        run: |
-          sudo apt update
-          sudo apt install -y libtinfo5
-
       - name: Run template tool test
         run: |
           cd framework/meta
diff --git a/.github/workflows/template-test-released.yml b/.github/workflows/template-test-released.yml
index 32ffaa4910..1b2561a488 100644
--- a/.github/workflows/template-test-released.yml
+++ b/.github/workflows/template-test-released.yml
@@ -45,12 +45,6 @@ jobs:
           which wasm2wat
           which run-scenarios
 
-      - name: Install libtinfo5
-        if: inputs.install-libtinfo5
-        run: |
-          sudo apt update
-          sudo apt install -y libtinfo5
-
       - name: Run template tool test
         run: |
           cd framework/meta

From e8c294580830741d36d6a55e4662c21404500edc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Tue, 7 Nov 2023 22:54:18 +0200
Subject: [PATCH 0035/1254] Fix unit test.

---
 framework/meta/tests/template_test.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/framework/meta/tests/template_test.rs b/framework/meta/tests/template_test.rs
index 0538e73143..fdc0c93e43 100644
--- a/framework/meta/tests/template_test.rs
+++ b/framework/meta/tests/template_test.rs
@@ -24,7 +24,8 @@ fn test_template_list() {
         [
             "adder".to_string(),
             "crypto-zombies".to_string(),
-            "empty".to_string()
+            "empty".to_string(),
+            "ping-pong-egld".to_string(),
         ]
     );
 }

From dc2d895d31103b85b30abb20cf6848a9e275d4c1 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 7 Nov 2023 23:11:50 +0200
Subject: [PATCH 0036/1254] unified tx syntax - tx env refactor

---
 .../src/contract_base/contract_base_trait.rs  |   9 +-
 .../base/src/types/interaction/annotated.rs   |  28 +-
 .../interaction/contract_call_no_payment.rs   |   6 +-
 .../src/types/interaction/expr_address.rs     |  20 +-
 .../base/src/types/interaction/expr_sc.rs     |  24 +-
 framework/base/src/types/interaction/mod.rs   |  10 +-
 framework/base/src/types/interaction/tx.rs    | 347 ++++++------------
 .../base/src/types/interaction/tx_data.rs     |  20 +-
 .../base/src/types/interaction/tx_env.rs      |  52 +++
 .../base/src/types/interaction/tx_env_sc.rs   | 145 ++++++++
 .../src/types/interaction/tx_environment.rs   |  66 ----
 .../base/src/types/interaction/tx_from.rs     |  37 +-
 .../base/src/types/interaction/tx_gas.rs      |  38 +-
 .../base/src/types/interaction/tx_payment.rs  | 165 +++++----
 framework/base/src/types/interaction/tx_to.rs |  20 +-
 .../scenario/src/facade/contract_info.rs      |  35 +-
 .../src/facade/scenario_world_steps_tx.rs     |  37 +-
 17 files changed, 558 insertions(+), 501 deletions(-)
 create mode 100644 framework/base/src/types/interaction/tx_env.rs
 create mode 100644 framework/base/src/types/interaction/tx_env_sc.rs
 delete mode 100644 framework/base/src/types/interaction/tx_environment.rs

diff --git a/framework/base/src/contract_base/contract_base_trait.rs b/framework/base/src/contract_base/contract_base_trait.rs
index bf5fcc7654..342b9ea61d 100644
--- a/framework/base/src/contract_base/contract_base_trait.rs
+++ b/framework/base/src/contract_base/contract_base_trait.rs
@@ -2,7 +2,10 @@ use super::{
     BlockchainWrapper, CallValueWrapper, CryptoWrapper, ErrorHelper, ManagedSerializer,
     SendRawWrapper, SendWrapper, StorageRawWrapper,
 };
-use crate::{api::VMApi, types::TxBase};
+use crate::{
+    api::VMApi,
+    types::{Tx, TxBaseWithEnv, TxScEnv},
+};
 
 /// Interface to be used by the actual smart contract code.
 ///
@@ -28,8 +31,8 @@ pub trait ContractBase: Sized {
 
     /// Starts the declaration of a new transaction.
     #[inline]
-    fn tx(&self) -> TxBase<Self::Api> {
-        TxBase::new()
+    fn tx(&self) -> TxBaseWithEnv<TxScEnv<Self::Api>> {
+        Tx::new_tx_from_sc()
     }
 
     /// Low-level functionality related to sending transactions from the current contract.
diff --git a/framework/base/src/types/interaction/annotated.rs b/framework/base/src/types/interaction/annotated.rs
index 2814f95444..9463ed7c12 100644
--- a/framework/base/src/types/interaction/annotated.rs
+++ b/framework/base/src/types/interaction/annotated.rs
@@ -3,47 +3,49 @@ use crate::{
     types::{ManagedAddress, ManagedBuffer},
 };
 
-pub trait AnnotatedValue<Api, T>
+use super::TxEnv;
+
+pub trait AnnotatedValue<Env, T>
 where
-    Api: ManagedTypeApi,
+    Env: TxEnv,
 {
-    fn annotation(&self) -> ManagedBuffer<Api>;
+    fn annotation(&self, _env: &Env) -> ManagedBuffer<Env::Api>;
 
     fn into_value(self) -> T;
 
     fn with_value_ref<F: FnOnce(&T)>(&self, f: F);
 }
 
-impl<Api> AnnotatedValue<Api, ManagedAddress<Api>> for ManagedAddress<Api>
+impl<Env> AnnotatedValue<Env, ManagedAddress<Env::Api>> for ManagedAddress<Env::Api>
 where
-    Api: ManagedTypeApi,
+    Env: TxEnv,
 {
-    fn annotation(&self) -> ManagedBuffer<Api> {
+    fn annotation(&self, _env: &Env) -> ManagedBuffer<Env::Api> {
         self.hex_expr()
     }
 
-    fn into_value(self) -> ManagedAddress<Api> {
+    fn into_value(self) -> ManagedAddress<Env::Api> {
         self
     }
 
-    fn with_value_ref<F: FnOnce(&ManagedAddress<Api>)>(&self, f: F) {
+    fn with_value_ref<F: FnOnce(&ManagedAddress<Env::Api>)>(&self, f: F) {
         f(self)
     }
 }
 
-impl<Api> AnnotatedValue<Api, ManagedAddress<Api>> for &ManagedAddress<Api>
+impl<Env> AnnotatedValue<Env, ManagedAddress<Env::Api>> for &ManagedAddress<Env::Api>
 where
-    Api: ManagedTypeApi,
+    Env: TxEnv,
 {
-    fn annotation(&self) -> crate::types::ManagedBuffer<Api> {
+    fn annotation(&self, _env: &Env) -> crate::types::ManagedBuffer<Env::Api> {
         self.hex_expr()
     }
 
-    fn into_value(self) -> ManagedAddress<Api> {
+    fn into_value(self) -> ManagedAddress<Env::Api> {
         self.clone()
     }
 
-    fn with_value_ref<F: FnOnce(&ManagedAddress<Api>)>(&self, f: F) {
+    fn with_value_ref<F: FnOnce(&ManagedAddress<Env::Api>)>(&self, f: F) {
         f(self)
     }
 }
diff --git a/framework/base/src/types/interaction/contract_call_no_payment.rs b/framework/base/src/types/interaction/contract_call_no_payment.rs
index 5471c2a9e8..69057da3e9 100644
--- a/framework/base/src/types/interaction/contract_call_no_payment.rs
+++ b/framework/base/src/types/interaction/contract_call_no_payment.rs
@@ -14,7 +14,7 @@ use super::{
     contract_call_exec::UNSPECIFIED_GAS_LIMIT, contract_call_with_egld::ContractCallWithEgld,
     contract_call_with_multi_esdt::ContractCallWithMultiEsdt, ContractCall,
     ContractCallWithAnyPayment, ContractCallWithEgldOrSingleEsdt, FunctionCall, ManagedArgBuffer,
-    Tx,
+    Tx, TxScEnv,
 };
 
 /// Holds metadata for calling another contract, without payments.
@@ -168,7 +168,7 @@ where
         self.function_call
     }
 
-    pub fn tx(self) -> Tx<SA, (), (), (), (), (), FunctionCall<SA>> {
-        Tx::new().call(self.function_call)
+    pub fn tx(self) -> Tx<TxScEnv<SA>, (), (), (), (), FunctionCall<SA>> {
+        Tx::new_tx_from_sc().call(self.function_call)
     }
 }
diff --git a/framework/base/src/types/interaction/expr_address.rs b/framework/base/src/types/interaction/expr_address.rs
index 305d833cc8..69a13cd6e3 100644
--- a/framework/base/src/types/interaction/expr_address.rs
+++ b/framework/base/src/types/interaction/expr_address.rs
@@ -5,44 +5,44 @@ use crate::{
     types::{ManagedAddress, ManagedBuffer},
 };
 
-use super::{AnnotatedValue, TxFrom, TxFromSpecified};
+use super::{AnnotatedValue, TxEnv, TxFrom, TxFromSpecified};
 
 const ADDRESS_PREFIX: &str = "address:";
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
 pub struct AddressExpr(pub &'static str);
 
-impl<Api> AnnotatedValue<Api, ManagedAddress<Api>> for AddressExpr
+impl<Env> AnnotatedValue<Env, ManagedAddress<Env::Api>> for AddressExpr
 where
-    Api: CallTypeApi,
+    Env: TxEnv,
 {
-    fn annotation(&self) -> ManagedBuffer<Api> {
+    fn annotation(&self, _env: &Env) -> ManagedBuffer<Env::Api> {
         let mut result = ManagedBuffer::new_from_bytes(ADDRESS_PREFIX.as_bytes());
         result.append_bytes(self.0.as_bytes());
         result
     }
 
-    fn into_value(self) -> ManagedAddress<Api> {
+    fn into_value(self) -> ManagedAddress<Env::Api> {
         let expr: [u8; 32] = self.eval_to_array();
         expr.into()
     }
 
-    fn with_value_ref<F: FnOnce(&ManagedAddress<Api>)>(&self, f: F) {
+    fn with_value_ref<F: FnOnce(&ManagedAddress<Env::Api>)>(&self, f: F) {
         let expr: [u8; 32] = self.eval_to_array();
         let ma = expr.into();
         f(&ma);
     }
 }
-impl<Api> TxFrom<Api> for AddressExpr
+impl<Env> TxFrom<Env> for AddressExpr
 where
-    Api: CallTypeApi,
+    Env: TxEnv,
 {
-    fn resolve_address(&self) -> ManagedAddress<Api> {
+    fn resolve_address(&self, _env: &Env) -> ManagedAddress<Env::Api> {
         let expr: [u8; 32] = self.eval_to_array();
         expr.into()
     }
 }
-impl<Api> TxFromSpecified<Api> for AddressExpr where Api: CallTypeApi {}
+impl<Env> TxFromSpecified<Env> for AddressExpr where Env: TxEnv {}
 
 impl AddressExpr {
     pub const fn eval_to_array(&self) -> [u8; 32] {
diff --git a/framework/base/src/types/interaction/expr_sc.rs b/framework/base/src/types/interaction/expr_sc.rs
index f83bfe3149..a5ba6a5e82 100644
--- a/framework/base/src/types/interaction/expr_sc.rs
+++ b/framework/base/src/types/interaction/expr_sc.rs
@@ -5,46 +5,46 @@ use crate::{
     types::{ManagedAddress, ManagedBuffer},
 };
 
-use super::{AnnotatedValue, TxFrom, TxFromSpecified, TxTo, TxToSpecified};
+use super::{AnnotatedValue, TxEnv, TxFrom, TxFromSpecified, TxTo, TxToSpecified};
 
 const SC_PREFIX: &str = "sc:";
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
 pub struct ScExpr<'a>(pub &'a str);
 
-impl<'a, Api> AnnotatedValue<Api, ManagedAddress<Api>> for ScExpr<'a>
+impl<'a, Env> AnnotatedValue<Env, ManagedAddress<Env::Api>> for ScExpr<'a>
 where
-    Api: CallTypeApi,
+    Env: TxEnv,
 {
-    fn annotation(&self) -> ManagedBuffer<Api> {
+    fn annotation(&self, _env: &Env) -> ManagedBuffer<Env::Api> {
         let mut result = ManagedBuffer::new_from_bytes(SC_PREFIX.as_bytes());
         result.append_bytes(self.0.as_bytes());
         result
     }
 
-    fn into_value(self) -> ManagedAddress<Api> {
+    fn into_value(self) -> ManagedAddress<Env::Api> {
         let expr: [u8; 32] = self.eval_to_array();
         expr.into()
     }
 
-    fn with_value_ref<F: FnOnce(&ManagedAddress<Api>)>(&self, f: F) {
+    fn with_value_ref<F: FnOnce(&ManagedAddress<Env::Api>)>(&self, f: F) {
         let expr: [u8; 32] = self.eval_to_array();
         let ma = expr.into();
         f(&ma);
     }
 }
-impl<'a, Api> TxFrom<Api> for ScExpr<'a>
+impl<'a, Env> TxFrom<Env> for ScExpr<'a>
 where
-    Api: CallTypeApi,
+    Env: TxEnv,
 {
-    fn resolve_address(&self) -> ManagedAddress<Api> {
+    fn resolve_address(&self, _env: &Env) -> ManagedAddress<Env::Api> {
         let expr: [u8; 32] = self.eval_to_array();
         expr.into()
     }
 }
-impl<'a, Api> TxFromSpecified<Api> for ScExpr<'a> where Api: CallTypeApi {}
-impl<'a, Api> TxTo<Api> for ScExpr<'a> where Api: CallTypeApi {}
-impl<'a, Api> TxToSpecified<Api> for ScExpr<'a> where Api: CallTypeApi {}
+impl<'a, Env> TxFromSpecified<Env> for ScExpr<'a> where Env: TxEnv {}
+impl<'a, Env> TxTo<Env> for ScExpr<'a> where Env: TxEnv {}
+impl<'a, Env> TxToSpecified<Env> for ScExpr<'a> where Env: TxEnv {}
 
 impl<'a> ScExpr<'a> {
     pub const fn eval_to_array(&self) -> [u8; 32] {
diff --git a/framework/base/src/types/interaction/mod.rs b/framework/base/src/types/interaction/mod.rs
index b44ff66d0f..f8589bbf0d 100644
--- a/framework/base/src/types/interaction/mod.rs
+++ b/framework/base/src/types/interaction/mod.rs
@@ -1,3 +1,5 @@
+#![allow(unused)] // TEMP
+
 mod annotated;
 mod async_call;
 mod async_call_promises;
@@ -19,7 +21,8 @@ mod function_call;
 mod managed_arg_buffer;
 mod tx;
 mod tx_data;
-mod tx_environment;
+mod tx_env;
+mod tx_env_sc;
 mod tx_from;
 mod tx_gas;
 mod tx_payment;
@@ -46,8 +49,11 @@ pub use function_call::FunctionCall;
 pub use managed_arg_buffer::ManagedArgBuffer;
 pub use tx::*;
 pub use tx_data::*;
-pub use tx_environment::*;
+pub use tx_env::*;
+pub use tx_env_sc::*;
 pub use tx_from::*;
 pub use tx_gas::*;
 pub use tx_payment::*;
 pub use tx_to::*;
+
+pub type TxScBase<Api> = TxBaseWithEnv<TxScEnv<Api>>;
diff --git a/framework/base/src/types/interaction/tx.rs b/framework/base/src/types/interaction/tx.rs
index 93d0ff6b04..60b26b71e1 100644
--- a/framework/base/src/types/interaction/tx.rs
+++ b/framework/base/src/types/interaction/tx.rs
@@ -12,21 +12,19 @@ use crate::{
 };
 
 use super::{
-    AsyncCall, ExplicitGas, FunctionCall, TxData, TxEnvironemnt, TxFrom, TxGas, TxPayment, TxTo,
-    TxToSpecified, TxFromSpecified,
+    AsyncCall, ExplicitGas, FunctionCall, TxData, TxEnv, TxFrom, TxFromSpecified, TxGas, TxPayment,
+    TxScEnv, TxTo, TxToSpecified,
 };
 
-pub struct Tx<Api, Env, From, To, Payment, Gas, Data>
+pub struct Tx<Env, From, To, Payment, Gas, Data>
 where
-    Api: CallTypeApi + 'static,
-    Env: TxEnvironemnt<Api>,
-    From: TxFrom<Api>,
-    To: TxTo<Api>,
-    Payment: TxPayment<Api>,
-    Gas: TxGas,
-    Data: TxData<Api>,
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Payment: TxPayment<Env>,
+    Gas: TxGas<Env>,
+    Data: TxData<Env>,
 {
-    pub(super) _phantom: PhantomData<Api>,
     pub env: Env,
     pub from: From,
     pub to: To,
@@ -35,21 +33,19 @@ where
     pub data: Data,
 }
 
-impl<Api, Env, From, To, Payment, Gas, Data> Tx<Api, Env, From, To, Payment, Gas, Data>
+impl<Env, From, To, Payment, Gas, Data> Tx<Env, From, To, Payment, Gas, Data>
 where
-    Api: CallTypeApi + 'static,
-    Env: TxEnvironemnt<Api>,
-    From: TxFrom<Api>,
-    To: TxTo<Api>,
-    Payment: TxPayment<Api>,
-    Gas: TxGas,
-    Data: TxData<Api>,
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Payment: TxPayment<Env>,
+    Gas: TxGas<Env>,
+    Data: TxData<Env>,
 {
     /// TODO: does nothing, delete, added for easier copy-paste.
     #[inline]
-    pub fn nothing(self) -> Tx<Api, Env, From, To, Payment, Gas, Data> {
+    pub fn nothing(self) -> Tx<Env, From, To, Payment, Gas, Data> {
         Tx {
-            _phantom: PhantomData,
             env: self.env,
             from: self.from,
             to: self.to,
@@ -60,17 +56,15 @@ where
     }
 }
 
-pub type TxBaseWithEnv<Api, Env> = Tx<Api, Env, (), (), (), (), ()>;
+pub type TxBaseWithEnv<Env> = Tx<Env, (), (), (), (), ()>;
 
-impl<Api, Env> TxBaseWithEnv<Api, Env>
+impl<Env> TxBaseWithEnv<Env>
 where
-    Api: CallTypeApi + 'static,
-    Env: TxEnvironemnt<Api>,
+    Env: TxEnv,
 {
     #[inline]
     pub fn new_with_env(env: Env) -> Self {
         Tx {
-            _phantom: PhantomData,
             env,
             from: (),
             to: (),
@@ -81,45 +75,35 @@ where
     }
 }
 
-pub type TxBase<Api> = Tx<Api, (), (), (), (), (), ()>;
+// impl Default for TxBaseWithEnv<()> {
+//     #[inline]
+//     fn default() -> Self {
+//         Self::new_with_env(())
+//     }
+// }
 
-impl<Api> Default for TxBase<Api>
-where
-    Api: CallTypeApi + 'static,
-{
-    #[inline]
-    fn default() -> Self {
-        Self::new_with_env(())
-    }
-}
-
-impl<Api> TxBase<Api>
-where
-    Api: CallTypeApi + 'static,
-{
-    #[inline]
-    pub fn new() -> Self {
-        Self::default()
-    }
-}
+// impl TxBaseWithEnv<()> {
+//     #[inline]
+//     pub fn new() -> Self {
+//         Self::default()
+//     }
+// }
 
-impl<Api, Env, To, Payment, Gas, Data> Tx<Api, Env, (), To, Payment, Gas, Data>
+impl<Env, To, Payment, Gas, Data> Tx<Env, (), To, Payment, Gas, Data>
 where
-    Api: CallTypeApi + 'static,
-    Env: TxEnvironemnt<Api>,
-    To: TxTo<Api>,
-    Payment: TxPayment<Api>,
-    Gas: TxGas,
-    Data: TxData<Api>,
+    Env: TxEnv,
+    To: TxTo<Env>,
+    Payment: TxPayment<Env>,
+    Gas: TxGas<Env>,
+    Data: TxData<Env>,
 {
-    pub fn from<From>(self, from: From) -> Tx<Api, Env, From, To, Payment, Gas, Data>
+    pub fn from<From>(self, from: From) -> Tx<Env, From, To, Payment, Gas, Data>
     where
-        From: TxFromSpecified<Api>,
+        From: TxFromSpecified<Env>,
     {
         let mut env = self.env;
         env.annotate_from(&from);
         Tx {
-            _phantom: PhantomData,
             env,
             from,
             to: self.to,
@@ -130,23 +114,21 @@ where
     }
 }
 
-impl<Api, Env, From, Payment, Gas, Data> Tx<Api, Env, From, (), Payment, Gas, Data>
+impl<Env, From, Payment, Gas, Data> Tx<Env, From, (), Payment, Gas, Data>
 where
-    Api: CallTypeApi + 'static,
-    Env: TxEnvironemnt<Api>,
-    From: TxFrom<Api>,
-    Payment: TxPayment<Api>,
-    Gas: TxGas,
-    Data: TxData<Api>,
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    Payment: TxPayment<Env>,
+    Gas: TxGas<Env>,
+    Data: TxData<Env>,
 {
-    pub fn to<To>(self, to: To) -> Tx<Api, Env, From, To, Payment, Gas, Data>
+    pub fn to<To>(self, to: To) -> Tx<Env, From, To, Payment, Gas, Data>
     where
-        To: TxToSpecified<Api>,
+        To: TxToSpecified<Env>,
     {
         let mut env = self.env;
         env.annotate_to(&to);
         Tx {
-            _phantom: PhantomData,
             env,
             from: self.from,
             to,
@@ -156,27 +138,25 @@ where
         }
     }
 
-    pub fn to_caller(self) -> Tx<Api, Env, From, ManagedAddress<Api>, Payment, Gas, Data> {
-        let caller = BlockchainWrapper::<Api>::new().get_caller();
+    pub fn to_caller(self) -> Tx<Env, From, ManagedAddress<Env::Api>, Payment, Gas, Data> {
+        let caller = BlockchainWrapper::<Env::Api>::new().get_caller();
         self.to(caller)
     }
 }
 
-impl<Api, Env, From, To, Gas, Data> Tx<Api, Env, From, To, (), Gas, Data>
+impl<Env, From, To, Gas, Data> Tx<Env, From, To, (), Gas, Data>
 where
-    Api: CallTypeApi + 'static,
-    Env: TxEnvironemnt<Api>,
-    From: TxFrom<Api>,
-    To: TxTo<Api>,
-    Gas: TxGas,
-    Data: TxData<Api>,
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+    Data: TxData<Env>,
 {
     pub fn egld(
         self,
-        egld_amount: BigUint<Api>,
-    ) -> Tx<Api, Env, From, To, EgldPayment<Api>, Gas, Data> {
+        egld_amount: BigUint<Env::Api>,
+    ) -> Tx<Env, From, To, EgldPayment<Env::Api>, Gas, Data> {
         Tx {
-            _phantom: PhantomData,
             env: self.env,
             from: self.from,
             to: self.to,
@@ -187,24 +167,22 @@ where
     }
 }
 
-impl<Api, Env, From, To, Gas, Data> Tx<Api, Env, From, To, (), Gas, Data>
+impl<Env, From, To, Gas, Data> Tx<Env, From, To, (), Gas, Data>
 where
-    Api: CallTypeApi + 'static,
-    Env: TxEnvironemnt<Api>,
-    From: TxFrom<Api>,
-    To: TxTo<Api>,
-    Gas: TxGas,
-    Data: TxData<Api>,
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+    Data: TxData<Env>,
 {
     /// Adds a single ESDT token transfer to a transaction.
     ///
     /// Since this is the first ESDT payment, a single payment tx is produced. Can be called again for multiple payments.
-    pub fn esdt<P: Into<EsdtTokenPayment<Api>>>(
+    pub fn esdt<P: Into<EsdtTokenPayment<Env::Api>>>(
         self,
         payment: P,
-    ) -> Tx<Api, Env, From, To, EsdtTokenPayment<Api>, Gas, Data> {
+    ) -> Tx<Env, From, To, EsdtTokenPayment<Env::Api>, Gas, Data> {
         Tx {
-            _phantom: PhantomData,
             env: self.env,
             from: self.from,
             to: self.to,
@@ -217,10 +195,9 @@ where
     /// Adds a collection of ESDT payments to a transaction.
     pub fn multi_esdt(
         self,
-        payments: MultiEsdtPayment<Api>, // TODO: references
-    ) -> Tx<Api, Env, From, To, MultiEsdtPayment<Api>, Gas, Data> {
+        payments: MultiEsdtPayment<Env::Api>, // TODO: references
+    ) -> Tx<Env, From, To, MultiEsdtPayment<Env::Api>, Gas, Data> {
         Tx {
-            _phantom: PhantomData,
             env: self.env,
             from: self.from,
             to: self.to,
@@ -231,27 +208,25 @@ where
     }
 }
 
-impl<Api, Env, From, To, Gas, Data> Tx<Api, Env, From, To, EsdtTokenPayment<Api>, Gas, Data>
+impl<Env, From, To, Gas, Data> Tx<Env, From, To, EsdtTokenPayment<Env::Api>, Gas, Data>
 where
-    Api: CallTypeApi + 'static,
-    Env: TxEnvironemnt<Api>,
-    From: TxFrom<Api>,
-    To: TxTo<Api>,
-    Gas: TxGas,
-    Data: TxData<Api>,
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+    Data: TxData<Env>,
 {
     /// Adds a single ESDT token transfer to a contract call.
     ///
     /// Can be called multiple times on the same call.
-    pub fn with_esdt_transfer<P: Into<EsdtTokenPayment<Api>>>(
+    pub fn with_esdt_transfer<P: Into<EsdtTokenPayment<Env::Api>>>(
         self,
         payment: P,
-    ) -> Tx<Api, Env, From, To, MultiEsdtPayment<Api>, Gas, Data> {
+    ) -> Tx<Env, From, To, MultiEsdtPayment<Env::Api>, Gas, Data> {
         let mut payments = ManagedVec::new();
         payments.push(self.payment);
         payments.push(payment.into());
         Tx {
-            _phantom: PhantomData,
             env: self.env,
             from: self.from,
             to: self.to,
@@ -262,44 +237,38 @@ where
     }
 }
 
-impl<Api, Env, From, To, Gas, Data> Tx<Api, Env, From, To, MultiEsdtPayment<Api>, Gas, Data>
+impl<Env, From, To, Gas, Data> Tx<Env, From, To, MultiEsdtPayment<Env::Api>, Gas, Data>
 where
-    Api: CallTypeApi + 'static,
-    Env: TxEnvironemnt<Api>,
-    From: TxFrom<Api>,
-    To: TxTo<Api>,
-    Gas: TxGas,
-    Data: TxData<Api>,
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+    Data: TxData<Env>,
 {
     /// Adds a single ESDT token transfer to a contract call.
     ///
     /// Can be called multiple times on the same call.
-    pub fn with_esdt_transfer<P: Into<EsdtTokenPayment<Api>>>(
+    pub fn with_esdt_transfer<P: Into<EsdtTokenPayment<Env::Api>>>(
         mut self,
         payment: P,
-    ) -> Tx<Api, Env, From, To, MultiEsdtPayment<Api>, Gas, Data> {
+    ) -> Tx<Env, From, To, MultiEsdtPayment<Env::Api>, Gas, Data> {
         self.payment.push(payment.into());
         self
     }
 }
 
-impl<Api, Env, From, To, Payment, Data> Tx<Api, Env, From, To, Payment, (), Data>
+impl<Env, From, To, Payment, Data> Tx<Env, From, To, Payment, (), Data>
 where
-    Api: CallTypeApi + 'static,
-    Env: TxEnvironemnt<Api>,
-    From: TxFrom<Api>,
-    To: TxTo<Api>,
-    Payment: TxPayment<Api>,
-    Data: TxData<Api>,
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Payment: TxPayment<Env>,
+    Data: TxData<Env>,
 {
     /// Sets an explicit gas limit to the call.
     #[inline]
-    pub fn with_gas_limit(
-        self,
-        gas_limit: u64,
-    ) -> Tx<Api, Env, From, To, Payment, ExplicitGas, Data> {
+    pub fn with_gas_limit(self, gas_limit: u64) -> Tx<Env, From, To, Payment, ExplicitGas, Data> {
         Tx {
-            _phantom: PhantomData,
             env: self.env,
             from: self.from,
             to: self.to,
@@ -310,22 +279,20 @@ where
     }
 }
 
-impl<Api, Env, From, To, Payment, Gas> Tx<Api, Env, From, To, Payment, Gas, ()>
+impl<Env, From, To, Payment, Gas> Tx<Env, From, To, Payment, Gas, ()>
 where
-    Api: CallTypeApi + 'static,
-    Env: TxEnvironemnt<Api>,
-    From: TxFrom<Api>,
-    To: TxTo<Api>,
-    Payment: TxPayment<Api>,
-    Gas: TxGas,
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Payment: TxPayment<Env>,
+    Gas: TxGas<Env>,
 {
     #[inline]
-    pub fn call<FC: Into<FunctionCall<Api>>>(
+    pub fn call<FC: Into<FunctionCall<Env::Api>>>(
         self,
         call: FC,
-    ) -> Tx<Api, Env, From, To, Payment, Gas, FunctionCall<Api>> {
+    ) -> Tx<Env, From, To, Payment, Gas, FunctionCall<Env::Api>> {
         Tx {
-            _phantom: PhantomData,
             env: self.env,
             from: self.from,
             to: self.to,
@@ -336,12 +303,11 @@ where
     }
 
     #[inline]
-    pub fn function_name<N: Into<ManagedBuffer<Api>>>(
+    pub fn function_name<N: Into<ManagedBuffer<Env::Api>>>(
         self,
         function_name: N,
-    ) -> Tx<Api, Env, From, To, Payment, Gas, FunctionCall<Api>> {
+    ) -> Tx<Env, From, To, Payment, Gas, FunctionCall<Env::Api>> {
         Tx {
-            _phantom: PhantomData,
             env: self.env,
             from: self.from,
             to: self.to,
@@ -352,14 +318,13 @@ where
     }
 }
 
-impl<Api, Env, From, To, Payment, Gas> Tx<Api, Env, From, To, Payment, Gas, FunctionCall<Api>>
+impl<Env, From, To, Payment, Gas> Tx<Env, From, To, Payment, Gas, FunctionCall<Env::Api>>
 where
-    Api: CallTypeApi + 'static,
-    Env: TxEnvironemnt<Api>,
-    From: TxFrom<Api>,
-    To: TxTo<Api>,
-    Payment: TxPayment<Api>,
-    Gas: TxGas,
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Payment: TxPayment<Env>,
+    Gas: TxGas<Env>,
 {
     #[inline]
     pub fn argument<T: TopEncodeMulti>(mut self, arg: &T) -> Self {
@@ -368,23 +333,22 @@ where
     }
 }
 
-impl<Api, Env, From, To, Payment, Gas> Tx<Api, Env, From, To, Payment, Gas, FunctionCall<Api>>
+impl<Env, From, To, Payment, Gas> Tx<Env, From, To, Payment, Gas, FunctionCall<Env::Api>>
 where
-    Api: CallTypeApi + 'static,
-    Env: TxEnvironemnt<Api>,
-    From: TxFrom<Api>,
-    To: TxToSpecified<Api>,
-    Payment: TxPayment<Api>,
-    Gas: TxGas,
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxToSpecified<Env>,
+    Payment: TxPayment<Env>,
+    Gas: TxGas<Env>,
 {
     pub fn normalize_tx(
         self,
-    ) -> Tx<Api, Env, From, ManagedAddress<Api>, EgldPayment<Api>, Gas, FunctionCall<Api>> {
-        let result = self
-            .payment
-            .convert_tx_data(&self.from, self.to.into_value(), self.data);
+    ) -> Tx<Env, From, ManagedAddress<Env::Api>, EgldPayment<Env::Api>, Gas, FunctionCall<Env::Api>>
+    {
+        let result =
+            self.payment
+                .convert_tx_data(&self.env, &self.from, self.to.into_value(), self.data);
         Tx {
-            _phantom: PhantomData,
             env: self.env,
             from: self.from,
             to: result.to,
@@ -394,78 +358,3 @@ where
         }
     }
 }
-
-impl<Api, To, Payment> Tx<Api, (), (), To, Payment, (), FunctionCall<Api>>
-where
-    Api: CallTypeApi + 'static,
-    To: TxToSpecified<Api>,
-    Payment: TxPayment<Api>,
-{
-    pub fn async_call(self) -> AsyncCall<Api> {
-        let normalized = self.normalize_tx();
-        AsyncCall {
-            to: normalized.to,
-            egld_payment: normalized.payment.value,
-            function_call: normalized.data,
-            callback_call: None,
-        }
-    }
-}
-
-impl<Api, To, Payment> Tx<Api, (), (), To, Payment, ExplicitGas, FunctionCall<Api>>
-where
-    Api: CallTypeApi + 'static,
-    To: TxToSpecified<Api>,
-    Payment: TxPayment<Api>,
-{
-    #[cfg(feature = "promises")]
-    pub fn async_call_promise(self) -> super::AsyncCallPromises<Api> {
-        let explicit_gas_limit = self.gas.0;
-        let normalized = self.normalize_tx();
-        super::AsyncCallPromises {
-            to: normalized.to,
-            egld_payment: normalized.payment.value,
-            function_call: normalized.data,
-            explicit_gas_limit,
-            extra_gas_for_callback: 0,
-            callback_call: None,
-        }
-    }
-}
-
-impl<Api, From, To, Payment, Gas, FC> Tx<Api, (), From, To, Payment, Gas, FC>
-where
-    Api: CallTypeApi + 'static,
-    From: TxFrom<Api>,
-    To: TxToSpecified<Api>,
-    Payment: TxPayment<Api>,
-    Gas: TxGas,
-    FC: TxData<Api> + Into<FunctionCall<Api>>,
-{
-    pub fn transfer_execute(self) {
-        if self.payment.is_no_payment() && self.data.is_no_call() {
-            return;
-        }
-
-        let gas_limit = self.gas.resolve_gas::<Api>();
-
-        self.to.with_value_ref(|to| {
-            self.payment
-                .perform_transfer_execute(to, gas_limit, self.data.into());
-        });
-    }
-}
-
-impl<Api, From, To, Payment, Gas> Tx<Api, (), From, To, Payment, Gas, ()>
-where
-    Api: CallTypeApi + 'static,
-    From: TxFrom<Api>,
-    To: TxToSpecified<Api>,
-    Payment: TxPayment<Api>,
-    Gas: TxGas,
-{
-    /// Syntactic sugar, only allowed for simple transfers.
-    pub fn transfer(self) {
-        self.transfer_execute()
-    }
-}
diff --git a/framework/base/src/types/interaction/tx_data.rs b/framework/base/src/types/interaction/tx_data.rs
index e49038a1f7..3f8da83eed 100644
--- a/framework/base/src/types/interaction/tx_data.rs
+++ b/framework/base/src/types/interaction/tx_data.rs
@@ -4,39 +4,39 @@ use crate::{
     types::{ManagedBuffer, ManagedBufferCachedBuilder},
 };
 
-use super::FunctionCall;
+use super::{FunctionCall, TxEnv};
 
-pub trait TxData<Api>
+pub trait TxData<Env>
 where
-    Api: ManagedTypeApi,
+    Env: TxEnv,
 {
     fn is_no_call(&self) -> bool;
 
-    fn to_call_data_string(&self) -> ManagedBuffer<Api>;
+    fn to_call_data_string(&self) -> ManagedBuffer<Env::Api>;
 }
 
-impl<Api> TxData<Api> for ()
+impl<Env> TxData<Env> for ()
 where
-    Api: ManagedTypeApi,
+    Env: TxEnv,
 {
     fn is_no_call(&self) -> bool {
         true
     }
 
-    fn to_call_data_string(&self) -> ManagedBuffer<Api> {
+    fn to_call_data_string(&self) -> ManagedBuffer<Env::Api> {
         ManagedBuffer::new()
     }
 }
 
-impl<Api> TxData<Api> for FunctionCall<Api>
+impl<Env> TxData<Env> for FunctionCall<Env::Api>
 where
-    Api: ManagedTypeApi,
+    Env: TxEnv,
 {
     fn is_no_call(&self) -> bool {
         self.is_empty()
     }
 
-    fn to_call_data_string(&self) -> ManagedBuffer<Api> {
+    fn to_call_data_string(&self) -> ManagedBuffer<Env::Api> {
         let mut result = ManagedBufferCachedBuilder::default();
         result.append_managed_buffer(&self.function_name);
         for arg in self.arg_buffer.raw_arg_iter() {
diff --git a/framework/base/src/types/interaction/tx_env.rs b/framework/base/src/types/interaction/tx_env.rs
new file mode 100644
index 0000000000..c9746b36aa
--- /dev/null
+++ b/framework/base/src/types/interaction/tx_env.rs
@@ -0,0 +1,52 @@
+use core::marker::PhantomData;
+
+use crate::{
+    api::CallTypeApi,
+    types::{ManagedAddress, ManagedBuffer},
+};
+
+use super::AnnotatedValue;
+
+pub trait TxEnv: Sized {
+    type Api: CallTypeApi;
+
+    fn annotate_from<From>(&mut self, from: &From)
+    where
+        From: AnnotatedValue<Self, ManagedAddress<Self::Api>>;
+
+    fn annotate_to<To>(&mut self, to: &To)
+    where
+        To: AnnotatedValue<Self, ManagedAddress<Self::Api>>;
+
+    fn resolve_sender_address(&self) -> ManagedAddress<Self::Api>;
+
+    fn default_gas(&self) -> u64;
+}
+
+// pub struct TxTestingEnvironemnt<Api>
+// where
+//     Api: CallTypeApi,
+// {
+//     pub(super) _phantom: PhantomData<Api>,
+//     pub from_annotation: ManagedBuffer<Api>,
+//     pub to_annotation: ManagedBuffer<Api>,
+// }
+
+// impl<Api> TxEnv<Api> for TxTestingEnvironemnt<Api>
+// where
+//     Api: CallTypeApi,
+// {
+//     fn annotate_from<From>(&mut self, from: &From)
+//     where
+//         From: AnnotatedValue<Api, ManagedAddress<Api>>,
+//     {
+//         self.from_annotation = from.annotation();
+//     }
+
+//     fn annotate_to<To>(&mut self, to: &To)
+//     where
+//         To: AnnotatedValue<Api, ManagedAddress<Api>>,
+//     {
+//         self.to_annotation = to.annotation();
+//     }
+// }
diff --git a/framework/base/src/types/interaction/tx_env_sc.rs b/framework/base/src/types/interaction/tx_env_sc.rs
new file mode 100644
index 0000000000..b7f5a18bb4
--- /dev/null
+++ b/framework/base/src/types/interaction/tx_env_sc.rs
@@ -0,0 +1,145 @@
+use core::marker::PhantomData;
+
+use crate::{
+    api::{BlockchainApiImpl, CallTypeApi},
+    contract_base::BlockchainWrapper,
+    types::{ManagedAddress, ManagedBuffer},
+};
+
+use super::{
+    contract_call_exec::TRANSFER_EXECUTE_DEFAULT_LEFTOVER, AnnotatedValue, AsyncCall, ExplicitGas,
+    FunctionCall, Tx, TxBaseWithEnv, TxData, TxEnv, TxFrom, TxGas, TxPayment, TxToSpecified,
+};
+
+pub struct TxScEnv<Api>
+where
+    Api: CallTypeApi,
+{
+    _phantom: PhantomData<Api>,
+}
+
+impl<Api> Default for TxScEnv<Api>
+where
+    Api: CallTypeApi,
+{
+    fn default() -> Self {
+        Self {
+            _phantom: PhantomData,
+        }
+    }
+}
+
+impl<Api> TxBaseWithEnv<TxScEnv<Api>>
+where
+    Api: CallTypeApi,
+{
+    pub fn new_tx_from_sc() -> Self {
+        Tx::new_with_env(TxScEnv::default())
+    }
+}
+
+impl<Api> TxEnv for TxScEnv<Api>
+where
+    Api: CallTypeApi,
+{
+    type Api = Api;
+
+    fn annotate_from<From>(&mut self, _from: &From)
+    where
+        From: AnnotatedValue<Self, ManagedAddress<Api>>,
+    {
+    }
+
+    fn annotate_to<To>(&mut self, _to: &To)
+    where
+        To: AnnotatedValue<Self, ManagedAddress<Api>>,
+    {
+    }
+
+    fn resolve_sender_address(&self) -> ManagedAddress<Api> {
+        BlockchainWrapper::<Api>::new().get_sc_address()
+    }
+
+    fn default_gas(&self) -> u64 {
+        let mut gas_left = Api::blockchain_api_impl().get_gas_left();
+        if gas_left > TRANSFER_EXECUTE_DEFAULT_LEFTOVER {
+            gas_left -= TRANSFER_EXECUTE_DEFAULT_LEFTOVER;
+        }
+        gas_left
+    }
+}
+
+impl<Api, To, Payment> Tx<TxScEnv<Api>, (), To, Payment, (), FunctionCall<Api>>
+where
+    Api: CallTypeApi,
+    To: TxToSpecified<TxScEnv<Api>>,
+    Payment: TxPayment<TxScEnv<Api>>,
+{
+    pub fn async_call(self) -> AsyncCall<Api> {
+        let normalized = self.normalize_tx();
+        AsyncCall {
+            to: normalized.to,
+            egld_payment: normalized.payment.value,
+            function_call: normalized.data,
+            callback_call: None,
+        }
+    }
+}
+
+impl<Api, To, Payment> Tx<TxScEnv<Api>, (), To, Payment, ExplicitGas, FunctionCall<Api>>
+where
+    Api: CallTypeApi,
+    To: TxToSpecified<TxScEnv<Api>>,
+    Payment: TxPayment<TxScEnv<Api>>,
+{
+    #[cfg(feature = "promises")]
+    pub fn async_call_promise(self) -> super::AsyncCallPromises<Api> {
+        let explicit_gas_limit = self.gas.0;
+        let normalized = self.normalize_tx();
+        super::AsyncCallPromises {
+            to: normalized.to,
+            egld_payment: normalized.payment.value,
+            function_call: normalized.data,
+            explicit_gas_limit,
+            extra_gas_for_callback: 0,
+            callback_call: None,
+        }
+    }
+}
+
+impl<Api, From, To, Payment, Gas, FC> Tx<TxScEnv<Api>, From, To, Payment, Gas, FC>
+where
+    Api: CallTypeApi,
+    From: TxFrom<TxScEnv<Api>>,
+    To: TxToSpecified<TxScEnv<Api>>,
+    Payment: TxPayment<TxScEnv<Api>>,
+    Gas: TxGas<TxScEnv<Api>>,
+    FC: TxData<TxScEnv<Api>> + Into<FunctionCall<Api>>,
+{
+    pub fn transfer_execute(self) {
+        if self.payment.is_no_payment() && self.data.is_no_call() {
+            return;
+        }
+
+        let gas_limit = self.gas.resolve_gas(&self.env);
+
+        self.to.with_value_ref(|to| {
+            self.payment
+                .perform_transfer_execute(&self.env, to, gas_limit, self.data.into());
+        });
+    }
+}
+
+impl<Api, From, To, Payment, Gas> Tx<TxScEnv<Api>, From, To, Payment, Gas, ()>
+where
+    Api: CallTypeApi,
+    From: TxFrom<TxScEnv<Api>>,
+    To: TxToSpecified<TxScEnv<Api>>,
+    Payment: TxPayment<TxScEnv<Api>>,
+    Gas: TxGas<TxScEnv<Api>>,
+{
+    /// Syntactic sugar, only allowed for simple transfers.
+    pub fn transfer(self) {
+        self.transfer_execute()
+    }
+}
diff --git a/framework/base/src/types/interaction/tx_environment.rs b/framework/base/src/types/interaction/tx_environment.rs
deleted file mode 100644
index 62c90ab47f..0000000000
--- a/framework/base/src/types/interaction/tx_environment.rs
+++ /dev/null
@@ -1,66 +0,0 @@
-use core::marker::PhantomData;
-
-use crate::{
-    api::CallTypeApi,
-    types::{ManagedAddress, ManagedBuffer},
-};
-
-use super::AnnotatedValue;
-
-pub trait TxEnvironemnt<Api>
-where
-    Api: CallTypeApi,
-{
-    fn annotate_from<From>(&mut self, from: &From)
-    where
-        From: AnnotatedValue<Api, ManagedAddress<Api>>;
-
-    fn annotate_to<To>(&mut self, to: &To)
-    where
-        To: AnnotatedValue<Api, ManagedAddress<Api>>;
-}
-
-impl<Api> TxEnvironemnt<Api> for ()
-where
-    Api: CallTypeApi,
-{
-    fn annotate_from<From>(&mut self, _from: &From)
-    where
-        From: AnnotatedValue<Api, ManagedAddress<Api>>,
-    {
-    }
-
-    fn annotate_to<To>(&mut self, _to: &To)
-    where
-        To: AnnotatedValue<Api, ManagedAddress<Api>>,
-    {
-    }
-}
-
-pub struct TxTestingEnvironemnt<Api>
-where
-    Api: CallTypeApi,
-{
-    pub(super) _phantom: PhantomData<Api>,
-    pub from_annotation: ManagedBuffer<Api>,
-    pub to_annotation: ManagedBuffer<Api>,
-}
-
-impl<Api> TxEnvironemnt<Api> for TxTestingEnvironemnt<Api>
-where
-    Api: CallTypeApi,
-{
-    fn annotate_from<From>(&mut self, from: &From)
-    where
-        From: AnnotatedValue<Api, ManagedAddress<Api>>,
-    {
-        self.from_annotation = from.annotation();
-    }
-
-    fn annotate_to<To>(&mut self, to: &To)
-    where
-        To: AnnotatedValue<Api, ManagedAddress<Api>>,
-    {
-        self.to_annotation = to.annotation();
-    }
-}
diff --git a/framework/base/src/types/interaction/tx_from.rs b/framework/base/src/types/interaction/tx_from.rs
index 5edba3f2a5..83db2cb85a 100644
--- a/framework/base/src/types/interaction/tx_from.rs
+++ b/framework/base/src/types/interaction/tx_from.rs
@@ -1,45 +1,46 @@
 use crate::{api::CallTypeApi, contract_base::BlockchainWrapper, types::ManagedAddress};
 
-use super::AnnotatedValue;
+use super::{AnnotatedValue, TxEnv};
 
-pub trait TxFrom<Api>
+pub trait TxFrom<Env>
 where
-    Api: CallTypeApi,
+    Env: TxEnv,
 {
-    fn resolve_address(&self) -> ManagedAddress<Api>;
+    fn resolve_address(&self, env: &Env) -> ManagedAddress<Env::Api>;
 }
 
-pub trait TxFromSpecified<Api>: TxFrom<Api> + AnnotatedValue<Api, ManagedAddress<Api>>
+pub trait TxFromSpecified<Env>:
+    TxFrom<Env> + AnnotatedValue<Env, ManagedAddress<Env::Api>>
 where
-    Api: CallTypeApi,
+    Env: TxEnv,
 {
 }
 
-impl<Api> TxFrom<Api> for ()
+impl<Env> TxFrom<Env> for ()
 where
-    Api: CallTypeApi,
+    Env: TxEnv,
 {
-    fn resolve_address(&self) -> ManagedAddress<Api> {
-        BlockchainWrapper::<Api>::new().get_sc_address()
+    fn resolve_address(&self, env: &Env) -> ManagedAddress<Env::Api> {
+        env.resolve_sender_address()
     }
 }
 
-impl<Api> TxFrom<Api> for ManagedAddress<Api>
+impl<Env> TxFrom<Env> for ManagedAddress<Env::Api>
 where
-    Api: CallTypeApi,
+    Env: TxEnv,
 {
-    fn resolve_address(&self) -> ManagedAddress<Api> {
+    fn resolve_address(&self, _env: &Env) -> ManagedAddress<Env::Api> {
         self.clone()
     }
 }
-impl<Api> TxFromSpecified<Api> for ManagedAddress<Api> where Api: CallTypeApi {}
+impl<Env> TxFromSpecified<Env> for ManagedAddress<Env::Api> where Env: TxEnv {}
 
-impl<Api> TxFrom<Api> for &ManagedAddress<Api>
+impl<Env> TxFrom<Env> for &ManagedAddress<Env::Api>
 where
-    Api: CallTypeApi,
+    Env: TxEnv,
 {
-    fn resolve_address(&self) -> ManagedAddress<Api> {
+    fn resolve_address(&self, _env: &Env) -> ManagedAddress<Env::Api> {
         (*self).clone()
     }
 }
-impl<Api> TxFromSpecified<Api> for &ManagedAddress<Api> where Api: CallTypeApi {}
+impl<Env> TxFromSpecified<Env> for &ManagedAddress<Env::Api> where Env: TxEnv {}
diff --git a/framework/base/src/types/interaction/tx_gas.rs b/framework/base/src/types/interaction/tx_gas.rs
index dcb37140b7..eec6693837 100644
--- a/framework/base/src/types/interaction/tx_gas.rs
+++ b/framework/base/src/types/interaction/tx_gas.rs
@@ -1,33 +1,31 @@
 use crate::api::{BlockchainApiImpl, CallTypeApi};
 
-use super::contract_call_exec::TRANSFER_EXECUTE_DEFAULT_LEFTOVER;
+use super::{contract_call_exec::TRANSFER_EXECUTE_DEFAULT_LEFTOVER, TxEnv};
 
-pub trait TxGas {
-    fn resolve_gas<Api>(&self) -> u64
-    where
-        Api: CallTypeApi + 'static;
+pub trait TxGas<Env>
+where
+    Env: TxEnv,
+{
+    fn resolve_gas(&self, env: &Env) -> u64;
 }
 
-impl TxGas for () {
-    fn resolve_gas<Api>(&self) -> u64
-    where
-        Api: CallTypeApi + 'static,
-    {
-        let mut gas_left = Api::blockchain_api_impl().get_gas_left();
-        if gas_left > TRANSFER_EXECUTE_DEFAULT_LEFTOVER {
-            gas_left -= TRANSFER_EXECUTE_DEFAULT_LEFTOVER;
-        }
-        gas_left
+impl<Env> TxGas<Env> for ()
+where
+    Env: TxEnv,
+{
+    fn resolve_gas(&self, env: &Env) -> u64 {
+        env.default_gas()
     }
 }
 
 pub struct ExplicitGas(pub u64);
 
-impl TxGas for ExplicitGas {
-    fn resolve_gas<Api>(&self) -> u64
-    where
-        Api: CallTypeApi + 'static,
-    {
+impl<Env> TxGas<Env> for ExplicitGas
+where
+    Env: TxEnv,
+{
+    #[inline]
+    fn resolve_gas(&self, _env: &Env) -> u64 {
         self.0
     }
 }
diff --git a/framework/base/src/types/interaction/tx_payment.rs b/framework/base/src/types/interaction/tx_payment.rs
index 95ad62fae1..747b6ac3bf 100644
--- a/framework/base/src/types/interaction/tx_payment.rs
+++ b/framework/base/src/types/interaction/tx_payment.rs
@@ -1,13 +1,15 @@
+use num_traits::Zero;
+
 use crate::{
     api::{CallTypeApi, ManagedTypeApi},
     contract_base::SendRawWrapper,
     types::{
-        EgldOrEsdtTokenPayment, EgldOrMultiEsdtPayment, EgldPayment, EsdtTokenPayment,
+        BigUint, EgldOrEsdtTokenPayment, EgldOrMultiEsdtPayment, EgldPayment, EsdtTokenPayment,
         ManagedAddress, MultiEsdtPayment,
     },
 };
 
-use super::{FunctionCall, TxFrom};
+use super::{FunctionCall, TxEnv, TxFrom};
 
 /// Temporary structure for returning a normalized transfer.
 pub struct PaymentConversionResult<Api>
@@ -19,32 +21,34 @@ where
     pub fc: FunctionCall<Api>,
 }
 
-pub trait TxPayment<Api>
+pub trait TxPayment<Env>
 where
-    Api: CallTypeApi,
+    Env: TxEnv,
 {
     fn is_no_payment(&self) -> bool;
 
     fn convert_tx_data<From>(
         self,
+        env: &Env,
         from: &From,
-        to: ManagedAddress<Api>,
-        fc: FunctionCall<Api>,
-    ) -> PaymentConversionResult<Api>
+        to: ManagedAddress<Env::Api>,
+        fc: FunctionCall<Env::Api>,
+    ) -> PaymentConversionResult<Env::Api>
     where
-        From: TxFrom<Api>;
+        From: TxFrom<Env>;
 
     fn perform_transfer_execute(
         self,
-        to: &ManagedAddress<Api>,
+        env: &Env,
+        to: &ManagedAddress<Env::Api>,
         gas_limit: u64,
-        fc: FunctionCall<Api>,
+        fc: FunctionCall<Env::Api>,
     );
 }
 
-impl<Api> TxPayment<Api> for ()
+impl<Env> TxPayment<Env> for ()
 where
-    Api: CallTypeApi,
+    Env: TxEnv,
 {
     fn is_no_payment(&self) -> bool {
         true
@@ -52,12 +56,13 @@ where
 
     fn convert_tx_data<From>(
         self,
+        _env: &Env,
         _from: &From,
-        to: ManagedAddress<Api>,
-        fc: FunctionCall<Api>,
-    ) -> PaymentConversionResult<Api>
+        to: ManagedAddress<Env::Api>,
+        fc: FunctionCall<Env::Api>,
+    ) -> PaymentConversionResult<Env::Api>
     where
-        From: TxFrom<Api>,
+        From: TxFrom<Env>,
     {
         PaymentConversionResult {
             to,
@@ -68,17 +73,19 @@ where
 
     fn perform_transfer_execute(
         self,
-        to: &ManagedAddress<Api>,
+        env: &Env,
+        to: &ManagedAddress<Env::Api>,
         gas_limit: u64,
-        fc: FunctionCall<Api>,
+        fc: FunctionCall<Env::Api>,
     ) {
-        EgldPayment::no_payment().perform_transfer_execute(to, gas_limit, fc);
+        EgldPayment::no_payment().perform_transfer_execute(env, to, gas_limit, fc);
+        // perform_transfer_execute_egld(BigUint::zero(), to, gas_limit, fc);
     }
 }
 
-impl<Api> TxPayment<Api> for EgldPayment<Api>
+impl<Env> TxPayment<Env> for EgldPayment<Env::Api>
 where
-    Api: CallTypeApi,
+    Env: TxEnv,
 {
     fn is_no_payment(&self) -> bool {
         self.value == 0u32
@@ -86,12 +93,13 @@ where
 
     fn convert_tx_data<From>(
         self,
+        _env: &Env,
         _from: &From,
-        to: ManagedAddress<Api>,
-        fc: FunctionCall<Api>,
-    ) -> PaymentConversionResult<Api>
+        to: ManagedAddress<Env::Api>,
+        fc: FunctionCall<Env::Api>,
+    ) -> PaymentConversionResult<Env::Api>
     where
-        From: TxFrom<Api>,
+        From: TxFrom<Env>,
     {
         PaymentConversionResult {
             to,
@@ -102,11 +110,12 @@ where
 
     fn perform_transfer_execute(
         self,
-        to: &ManagedAddress<Api>,
+        _env: &Env,
+        to: &ManagedAddress<Env::Api>,
         gas_limit: u64,
-        fc: FunctionCall<Api>,
+        fc: FunctionCall<Env::Api>,
     ) {
-        let _ = SendRawWrapper::<Api>::new().direct_egld_execute(
+        let _ = SendRawWrapper::<Env::Api>::new().direct_egld_execute(
             to,
             &self.value,
             gas_limit,
@@ -116,9 +125,9 @@ where
     }
 }
 
-impl<Api> TxPayment<Api> for EsdtTokenPayment<Api>
+impl<Env> TxPayment<Env> for EsdtTokenPayment<Env::Api>
 where
-    Api: CallTypeApi,
+    Env: TxEnv,
 {
     fn is_no_payment(&self) -> bool {
         self.amount == 0u32
@@ -126,33 +135,35 @@ where
 
     fn convert_tx_data<From>(
         self,
+        env: &Env,
         from: &From,
-        to: ManagedAddress<Api>,
-        fc: FunctionCall<Api>,
-    ) -> PaymentConversionResult<Api>
+        to: ManagedAddress<Env::Api>,
+        fc: FunctionCall<Env::Api>,
+    ) -> PaymentConversionResult<Env::Api>
     where
-        From: TxFrom<Api>,
+        From: TxFrom<Env>,
     {
         if self.token_nonce == 0 {
             convert_tx_data_fungible(self, to, fc)
         } else {
-            convert_tx_data_nft(self, from.resolve_address(), to, fc)
+            convert_tx_data_nft(self, from.resolve_address(env), to, fc)
         }
     }
 
     fn perform_transfer_execute(
         self,
-        to: &ManagedAddress<Api>,
+        env: &Env,
+        to: &ManagedAddress<Env::Api>,
         gas_limit: u64,
-        fc: FunctionCall<Api>,
+        fc: FunctionCall<Env::Api>,
     ) {
-        MultiEsdtPayment::from_single_item(self).perform_transfer_execute(to, gas_limit, fc)
+        MultiEsdtPayment::from_single_item(self).perform_transfer_execute(env, to, gas_limit, fc);
     }
 }
 
-impl<Api> TxPayment<Api> for MultiEsdtPayment<Api>
+impl<Env> TxPayment<Env> for MultiEsdtPayment<Env::Api>
 where
-    Api: CallTypeApi,
+    Env: TxEnv,
 {
     fn is_no_payment(&self) -> bool {
         self.is_empty()
@@ -160,27 +171,29 @@ where
 
     fn convert_tx_data<From>(
         self,
+        env: &Env,
         from: &From,
-        to: ManagedAddress<Api>,
-        fc: FunctionCall<Api>,
-    ) -> PaymentConversionResult<Api>
+        to: ManagedAddress<Env::Api>,
+        fc: FunctionCall<Env::Api>,
+    ) -> PaymentConversionResult<Env::Api>
     where
-        From: TxFrom<Api>,
+        From: TxFrom<Env>,
     {
         match self.len() {
-            0 => ().convert_tx_data(from, to, fc),
-            1 => self.get(0).convert_tx_data(from, to, fc),
-            _ => convert_tx_data_multi(self, from.resolve_address(), to, fc),
+            0 => ().convert_tx_data(env, from, to, fc),
+            1 => self.get(0).convert_tx_data(env, from, to, fc),
+            _ => convert_tx_data_multi(self, from.resolve_address(env), to, fc),
         }
     }
 
     fn perform_transfer_execute(
         self,
-        to: &ManagedAddress<Api>,
+        _env: &Env,
+        to: &ManagedAddress<Env::Api>,
         gas_limit: u64,
-        fc: FunctionCall<Api>,
+        fc: FunctionCall<Env::Api>,
     ) {
-        let _ = SendRawWrapper::<Api>::new().multi_esdt_transfer_execute(
+        let _ = SendRawWrapper::<Env::Api>::new().multi_esdt_transfer_execute(
             to,
             &self,
             gas_limit,
@@ -190,9 +203,9 @@ where
     }
 }
 
-impl<Api> TxPayment<Api> for EgldOrEsdtTokenPayment<Api>
+impl<Env> TxPayment<Env> for EgldOrEsdtTokenPayment<Env::Api>
 where
-    Api: CallTypeApi,
+    Env: TxEnv,
 {
     fn is_no_payment(&self) -> bool {
         self.amount == 0u32
@@ -200,39 +213,41 @@ where
 
     fn convert_tx_data<From>(
         self,
+        env: &Env,
         from: &From,
-        to: ManagedAddress<Api>,
-        fc: FunctionCall<Api>,
-    ) -> PaymentConversionResult<Api>
+        to: ManagedAddress<Env::Api>,
+        fc: FunctionCall<Env::Api>,
+    ) -> PaymentConversionResult<Env::Api>
     where
-        From: TxFrom<Api>,
+        From: TxFrom<Env>,
     {
         self.map_egld_or_esdt(
             (to, fc),
-            |(to, fc), amount| EgldPayment::from(amount).convert_tx_data(from, to, fc),
-            |(to, fc), esdt_payment| esdt_payment.convert_tx_data(from, to, fc),
+            |(to, fc), amount| EgldPayment::from(amount).convert_tx_data(env, from, to, fc),
+            |(to, fc), esdt_payment| esdt_payment.convert_tx_data(env, from, to, fc),
         )
     }
 
     fn perform_transfer_execute(
         self,
-        to: &ManagedAddress<Api>,
+        env: &Env,
+        to: &ManagedAddress<Env::Api>,
         gas_limit: u64,
-        fc: FunctionCall<Api>,
+        fc: FunctionCall<Env::Api>,
     ) {
         self.map_egld_or_esdt(
             (to, fc),
             |(to, fc), amount| {
-                EgldPayment::from(amount).perform_transfer_execute(to, gas_limit, fc)
+                EgldPayment::from(amount).perform_transfer_execute(env, to, gas_limit, fc)
             },
-            |(to, fc), esdt_payment| esdt_payment.perform_transfer_execute(to, gas_limit, fc),
+            |(to, fc), esdt_payment| esdt_payment.perform_transfer_execute(env, to, gas_limit, fc),
         )
     }
 }
 
-impl<Api> TxPayment<Api> for EgldOrMultiEsdtPayment<Api>
+impl<Env> TxPayment<Env> for EgldOrMultiEsdtPayment<Env::Api>
 where
-    Api: CallTypeApi,
+    Env: TxEnv,
 {
     fn is_no_payment(&self) -> bool {
         self.is_empty()
@@ -240,35 +255,37 @@ where
 
     fn convert_tx_data<From>(
         self,
+        env: &Env,
         from: &From,
-        to: ManagedAddress<Api>,
-        fc: FunctionCall<Api>,
-    ) -> PaymentConversionResult<Api>
+        to: ManagedAddress<Env::Api>,
+        fc: FunctionCall<Env::Api>,
+    ) -> PaymentConversionResult<Env::Api>
     where
-        From: TxFrom<Api>,
+        From: TxFrom<Env>,
     {
         match self {
             EgldOrMultiEsdtPayment::Egld(egld_amount) => {
-                EgldPayment::from(egld_amount).convert_tx_data(from, to, fc)
+                EgldPayment::from(egld_amount).convert_tx_data(env, from, to, fc)
             },
             EgldOrMultiEsdtPayment::MultiEsdt(multi_esdt_payment) => {
-                multi_esdt_payment.convert_tx_data(from, to, fc)
+                multi_esdt_payment.convert_tx_data(env, from, to, fc)
             },
         }
     }
 
     fn perform_transfer_execute(
         self,
-        to: &ManagedAddress<Api>,
+        env: &Env,
+        to: &ManagedAddress<Env::Api>,
         gas_limit: u64,
-        fc: FunctionCall<Api>,
+        fc: FunctionCall<Env::Api>,
     ) {
         match self {
             EgldOrMultiEsdtPayment::Egld(egld_amount) => {
-                EgldPayment::from(egld_amount).perform_transfer_execute(to, gas_limit, fc)
+                EgldPayment::from(egld_amount).perform_transfer_execute(env, to, gas_limit, fc)
             },
             EgldOrMultiEsdtPayment::MultiEsdt(multi_esdt_payment) => {
-                multi_esdt_payment.perform_transfer_execute(to, gas_limit, fc)
+                multi_esdt_payment.perform_transfer_execute(env, to, gas_limit, fc)
             },
         }
     }
diff --git a/framework/base/src/types/interaction/tx_to.rs b/framework/base/src/types/interaction/tx_to.rs
index bf7e44e2be..af733870dd 100644
--- a/framework/base/src/types/interaction/tx_to.rs
+++ b/framework/base/src/types/interaction/tx_to.rs
@@ -1,23 +1,23 @@
 use crate::{api::ManagedTypeApi, types::ManagedAddress};
 
-use super::AnnotatedValue;
+use super::{AnnotatedValue, TxEnv};
 
-pub trait TxTo<Api>
+pub trait TxTo<Env>
 where
-    Api: ManagedTypeApi,
+    Env: TxEnv,
 {
 }
 
-impl<Api> TxTo<Api> for () where Api: ManagedTypeApi {}
+impl<Env> TxTo<Env> for () where Env: TxEnv {}
 
-pub trait TxToSpecified<Api>: TxTo<Api> + AnnotatedValue<Api, ManagedAddress<Api>>
+pub trait TxToSpecified<Env>: TxTo<Env> + AnnotatedValue<Env, ManagedAddress<Env::Api>>
 where
-    Api: ManagedTypeApi,
+    Env: TxEnv,
 {
 }
 
-impl<Api> TxTo<Api> for ManagedAddress<Api> where Api: ManagedTypeApi {}
-impl<Api> TxToSpecified<Api> for ManagedAddress<Api> where Api: ManagedTypeApi {}
+impl<Env> TxTo<Env> for ManagedAddress<Env::Api> where Env: TxEnv {}
+impl<Env> TxToSpecified<Env> for ManagedAddress<Env::Api> where Env: TxEnv {}
 
-impl<Api> TxTo<Api> for &ManagedAddress<Api> where Api: ManagedTypeApi {}
-impl<Api> TxToSpecified<Api> for &ManagedAddress<Api> where Api: ManagedTypeApi {}
+impl<Env> TxTo<Env> for &ManagedAddress<Env::Api> where Env: TxEnv {}
+impl<Env> TxToSpecified<Env> for &ManagedAddress<Env::Api> where Env: TxEnv {}
diff --git a/framework/scenario/src/facade/contract_info.rs b/framework/scenario/src/facade/contract_info.rs
index 0e4f2619d9..8376e859f8 100644
--- a/framework/scenario/src/facade/contract_info.rs
+++ b/framework/scenario/src/facade/contract_info.rs
@@ -1,8 +1,7 @@
 use std::ops::{Deref, DerefMut};
 
-use multiversx_sc::{
-    api::CallTypeApi,
-    types::{AnnotatedValue, ManagedBuffer, TxFrom, TxFromSpecified, TxTo, TxToSpecified},
+use multiversx_sc::types::{
+    AnnotatedValue, ManagedBuffer, TxEnv, TxFrom, TxFromSpecified, TxTo, TxToSpecified,
 };
 
 use crate::multiversx_sc::{
@@ -96,48 +95,48 @@ impl<P: ProxyObjBase> CodecFrom<&ContractInfo<P>> for Address {}
 impl<M: ManagedTypeApi, P: ProxyObjBase> CodecFrom<ContractInfo<P>> for ManagedAddress<M> {}
 impl<M: ManagedTypeApi, P: ProxyObjBase> CodecFrom<&ContractInfo<P>> for ManagedAddress<M> {}
 
-impl<Api, P> AnnotatedValue<Api, ManagedAddress<Api>> for &ContractInfo<P>
+impl<Env, P> AnnotatedValue<Env, ManagedAddress<Env::Api>> for &ContractInfo<P>
 where
-    Api: CallTypeApi,
+    Env: TxEnv,
     P: ProxyObjBase,
 {
-    fn annotation(&self) -> ManagedBuffer<Api> {
+    fn annotation(&self, _env: &Env) -> ManagedBuffer<Env::Api> {
         self.scenario_address_expr.original.as_str().into()
     }
 
-    fn into_value(self) -> ManagedAddress<Api> {
+    fn into_value(self) -> ManagedAddress<Env::Api> {
         (&self.scenario_address_expr.value).into()
     }
 
-    fn with_value_ref<F: FnOnce(&ManagedAddress<Api>)>(&self, f: F) {
-        let ma: ManagedAddress<Api> = (&self.scenario_address_expr.value).into();
+    fn with_value_ref<F: FnOnce(&ManagedAddress<Env::Api>)>(&self, f: F) {
+        let ma: ManagedAddress<Env::Api> = (&self.scenario_address_expr.value).into();
         f(&ma);
     }
 }
-impl<P, Api> TxFrom<Api> for &ContractInfo<P>
+impl<P, Env> TxFrom<Env> for &ContractInfo<P>
 where
-    Api: CallTypeApi,
+    Env: TxEnv,
     P: ProxyObjBase,
 {
-    fn resolve_address(&self) -> ManagedAddress<Api> {
+    fn resolve_address(&self, _env: &Env) -> ManagedAddress<Env::Api> {
         (&self.scenario_address_expr.value).into()
     }
 }
-impl<P, Api> TxFromSpecified<Api> for &ContractInfo<P>
+impl<P, Env> TxFromSpecified<Env> for &ContractInfo<P>
 where
-    Api: CallTypeApi,
+    Env: TxEnv,
     P: ProxyObjBase,
 {
 }
-impl<P, Api> TxTo<Api> for &ContractInfo<P>
+impl<P, Env> TxTo<Env> for &ContractInfo<P>
 where
-    Api: CallTypeApi,
+    Env: TxEnv,
     P: ProxyObjBase,
 {
 }
-impl<P, Api> TxToSpecified<Api> for &ContractInfo<P>
+impl<P, Env> TxToSpecified<Env> for &ContractInfo<P>
 where
-    Api: CallTypeApi,
+    Env: TxEnv,
     P: ProxyObjBase,
 {
 }
diff --git a/framework/scenario/src/facade/scenario_world_steps_tx.rs b/framework/scenario/src/facade/scenario_world_steps_tx.rs
index be7763bd58..d0f6dcf499 100644
--- a/framework/scenario/src/facade/scenario_world_steps_tx.rs
+++ b/framework/scenario/src/facade/scenario_world_steps_tx.rs
@@ -1,8 +1,8 @@
 use std::path::PathBuf;
 
 use multiversx_sc::types::{
-    AnnotatedValue, FunctionCall, ManagedAddress, Tx, TxBaseWithEnv, TxEnvironemnt,
-    TxFromSpecified, TxGas, TxPayment, TxToSpecified,
+    AnnotatedValue, FunctionCall, ManagedAddress, Tx, TxBaseWithEnv, TxEnv, TxFromSpecified, TxGas,
+    TxPayment, TxToSpecified,
 };
 
 use crate::{api::StaticApi, facade::ScenarioWorld, scenario_model::ScCallStep};
@@ -14,23 +14,34 @@ pub struct ScenarioTxEnvironment {
     pub to_annotation: Option<String>,
 }
 
-impl TxEnvironemnt<StaticApi> for ScenarioTxEnvironment {
+impl TxEnv for ScenarioTxEnvironment {
+    type Api = StaticApi;
+
     fn annotate_from<From>(&mut self, to: &From)
     where
-        From: AnnotatedValue<StaticApi, ManagedAddress<StaticApi>>,
+        From: AnnotatedValue<ScenarioTxEnvironment, ManagedAddress<StaticApi>>,
     {
-        self.from_annotation = Some(to.annotation().to_string())
+        self.from_annotation = Some(to.annotation(self).to_string())
     }
 
     fn annotate_to<To>(&mut self, to: &To)
     where
-        To: AnnotatedValue<StaticApi, ManagedAddress<StaticApi>>,
+        To: AnnotatedValue<ScenarioTxEnvironment, ManagedAddress<StaticApi>>,
     {
-        self.to_annotation = Some(to.annotation().to_string())
+        self.to_annotation = Some(to.annotation(self).to_string())
+    }
+
+    fn resolve_sender_address(&self) -> ManagedAddress<Self::Api> {
+        panic!("Explicit sender address expected")
+    }
+
+    fn default_gas(&self) -> u64 {
+        // TODO: annotate
+        5_000_000
     }
 }
 
-pub type TxScenarioBase = TxBaseWithEnv<StaticApi, ScenarioTxEnvironment>;
+pub type TxScenarioBase = TxBaseWithEnv<ScenarioTxEnvironment>;
 
 pub trait ScenarioTx {
     fn run_as_scenario_step(self, world: &mut ScenarioWorld);
@@ -58,12 +69,12 @@ impl ScenarioWorld {
 }
 
 impl<From, To, Payment, Gas> ScenarioTx
-    for Tx<StaticApi, ScenarioTxEnvironment, From, To, Payment, Gas, FunctionCall<StaticApi>>
+    for Tx<ScenarioTxEnvironment, From, To, Payment, Gas, FunctionCall<StaticApi>>
 where
-    From: TxFromSpecified<StaticApi>,
-    To: TxToSpecified<StaticApi>,
-    Payment: TxPayment<StaticApi>,
-    Gas: TxGas,
+    From: TxFromSpecified<ScenarioTxEnvironment>,
+    To: TxToSpecified<ScenarioTxEnvironment>,
+    Payment: TxPayment<ScenarioTxEnvironment>,
+    Gas: TxGas<ScenarioTxEnvironment>,
 {
     fn run_as_scenario_step(self, world: &mut ScenarioWorld) {
         let mut step = ScCallStep::new()

From 75877a215b37e296239ba2b4cc52ec5e7f72b52c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Tue, 7 Nov 2023 23:57:39 +0200
Subject: [PATCH 0037/1254] Handle "*.step.json" files in template adjuster.

---
 framework/meta/src/template/template_adjuster.rs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/framework/meta/src/template/template_adjuster.rs b/framework/meta/src/template/template_adjuster.rs
index d0d4b05c90..ec742f2b15 100644
--- a/framework/meta/src/template/template_adjuster.rs
+++ b/framework/meta/src/template/template_adjuster.rs
@@ -163,6 +163,12 @@ impl TemplateAdjuster {
             &[Query::substring(&old_wasm, &new_wasm)][..],
         );
 
+        replace_in_files(
+            &self.target.contract_dir(),
+            "*.step.json",
+            &[Query::substring(&old_wasm, &new_wasm)][..],
+        );
+
         queries.push(Query::substring(&old_wasm, &new_wasm));
 
         replace_in_files(

From 535170941d7c20f4cdadf1653689d377a277977b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Wed, 8 Nov 2023 00:00:40 +0200
Subject: [PATCH 0038/1254] Fix extension.

---
 framework/meta/src/template/template_adjuster.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/framework/meta/src/template/template_adjuster.rs b/framework/meta/src/template/template_adjuster.rs
index ec742f2b15..9a3034562f 100644
--- a/framework/meta/src/template/template_adjuster.rs
+++ b/framework/meta/src/template/template_adjuster.rs
@@ -165,7 +165,7 @@ impl TemplateAdjuster {
 
         replace_in_files(
             &self.target.contract_dir(),
-            "*.step.json",
+            "*.steps.json",
             &[Query::substring(&old_wasm, &new_wasm)][..],
         );
 

From 2fc5e22d38d11e66cd62dd8be96de1db9af53b56 Mon Sep 17 00:00:00 2001
From: Alin Cruceat <alyn_509@yahoo.com>
Date: Wed, 8 Nov 2023 18:08:44 +0200
Subject: [PATCH 0039/1254] test updates

---
 .../tests/price_aggregator_blackbox_test.rs            |  3 ++-
 .../tests/price_aggregator_whitebox_test.rs            | 10 +++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

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 715823fc7d..2bed182903 100644
--- a/contracts/core/price-aggregator/tests/price_aggregator_blackbox_test.rs
+++ b/contracts/core/price-aggregator/tests/price_aggregator_blackbox_test.rs
@@ -21,7 +21,7 @@ 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 SLASH_AMOUNT: u64 = 10;
-const SLASH_QUORUM: usize = 2;
+const SLASH_QUORUM: usize = 3;
 const STAKE_AMOUNT: u64 = 20;
 const SUBMISSION_COUNT: usize = 3;
 const USD_TICKER: &[u8] = b"USDC";
@@ -368,6 +368,7 @@ fn test_price_aggregator_slashing() {
 
     state.vote_slash_member(&state.oracles[0].clone(), state.oracles[1].to_address());
     state.vote_slash_member(&state.oracles[2].clone(), state.oracles[1].to_address());
+    state.vote_slash_member(&state.oracles[3].clone(), state.oracles[1].to_address());
 
     state.world.sc_call(
         ScCallStep::new().from(&state.oracles[0]).call(
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 e07cadc19d..7416f5a472 100644
--- a/contracts/core/price-aggregator/tests/price_aggregator_whitebox_test.rs
+++ b/contracts/core/price-aggregator/tests/price_aggregator_whitebox_test.rs
@@ -15,7 +15,7 @@ pub const DECIMALS: u8 = 0;
 pub const EGLD_TICKER: &[u8] = b"EGLD";
 pub const NR_ORACLES: usize = 4;
 pub const SLASH_AMOUNT: u64 = 10;
-pub const SLASH_QUORUM: usize = 2;
+pub const SLASH_QUORUM: usize = 3;
 pub const STAKE_AMOUNT: u64 = 20;
 pub const SUBMISSION_COUNT: usize = 3;
 pub const USD_TICKER: &[u8] = b"USDC";
@@ -393,6 +393,14 @@ fn test_price_aggregator_slashing() {
         |sc| sc.call_vote_slash_member(),
     );
 
+    world.whitebox_call(
+        &price_aggregator_whitebox,
+        ScCallStep::new()
+            .from(&oracles[3])
+            .argument(BytesValue::from(oracles[1].to_address().as_bytes())),
+        |sc| sc.call_vote_slash_member(),
+    );
+
     world.whitebox_call(
         &price_aggregator_whitebox,
         ScCallStep::new()

From 32a0843336db55c09f22db585e909c72163fc230 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 9 Nov 2023 20:50:30 +0200
Subject: [PATCH 0040/1254] unified tx sytax - sc async callback

---
 .../contract_base/wrappers/send_wrapper.rs    |  22 ++-
 .../base/src/types/interaction/async_call.rs  |  62 +++-----
 .../src/types/interaction/callback_closure.rs |  13 +-
 .../types/interaction/contract_call_exec.rs   |  13 +-
 .../interaction/contract_call_no_payment.rs   |   2 +-
 framework/base/src/types/interaction/mod.rs   |   6 +
 framework/base/src/types/interaction/tx.rs    | 138 ++++++++++++++----
 .../src/types/interaction/tx_async_call.rs    |  65 +++++++++
 .../interaction/tx_async_call_promises.rs     | 119 +++++++++++++++
 .../base/src/types/interaction/tx_callback.rs |  28 ++++
 .../base/src/types/interaction/tx_data.rs     |   8 +
 .../base/src/types/interaction/tx_env_sc.rs   |  42 +-----
 .../src/facade/scenario_world_steps_tx.rs     |   4 +-
 13 files changed, 389 insertions(+), 133 deletions(-)
 create mode 100644 framework/base/src/types/interaction/tx_async_call.rs
 create mode 100644 framework/base/src/types/interaction/tx_async_call_promises.rs
 create mode 100644 framework/base/src/types/interaction/tx_callback.rs

diff --git a/framework/base/src/contract_base/wrappers/send_wrapper.rs b/framework/base/src/contract_base/wrappers/send_wrapper.rs
index 78f4f045d6..62f99b767c 100644
--- a/framework/base/src/contract_base/wrappers/send_wrapper.rs
+++ b/framework/base/src/contract_base/wrappers/send_wrapper.rs
@@ -15,6 +15,7 @@ use crate::{
     types::{
         BigUint, ContractCall, ContractCallNoPayment, EgldOrEsdtTokenIdentifier, EsdtTokenPayment,
         ManagedAddress, ManagedArgBuffer, ManagedBuffer, ManagedType, ManagedVec, TokenIdentifier,
+        Tx,
     },
 };
 
@@ -314,10 +315,10 @@ where
         nonce: u64,
         amount: BigUint<A>,
     ) -> ! {
-        ContractCallNoPayment::<A, ()>::new(to, ManagedBuffer::new())
-            .with_esdt_transfer((token, nonce, amount))
-            .async_call()
-            .call_and_exit_ignore_callback()
+        Tx::new_tx_from_sc()
+            .to(to)
+            .esdt((token, nonce, amount))
+            .async_call_and_exit()
     }
 
     /// Performs a simple ESDT/NFT transfer, but via async call.  
@@ -339,10 +340,7 @@ where
         if amount == 0 {
             return;
         }
-        ContractCallNoPayment::<A, ()>::new(to, ManagedBuffer::new())
-            .with_esdt_transfer((token, nonce, amount))
-            .async_call()
-            .call_and_exit_ignore_callback()
+        self.transfer_esdt_via_async_call(to, token, nonce, amount)
     }
 
     /// Sends multiple ESDT tokens to a target address, via an async call.
@@ -351,10 +349,10 @@ where
         to: ManagedAddress<A>,
         payments: ManagedVec<A, EsdtTokenPayment<A>>,
     ) -> ! {
-        ContractCallNoPayment::<A, ()>::new(to, ManagedBuffer::new())
-            .with_multi_token_transfer(payments)
-            .async_call()
-            .call_and_exit_ignore_callback()
+        Tx::new_tx_from_sc()
+            .to(to)
+            .multi_esdt(payments)
+            .async_call_and_exit()
     }
 
     /// Creates a call to the `ClaimDeveloperRewards` builtin function.
diff --git a/framework/base/src/types/interaction/async_call.rs b/framework/base/src/types/interaction/async_call.rs
index 9c5554baba..bcc07bcced 100644
--- a/framework/base/src/types/interaction/async_call.rs
+++ b/framework/base/src/types/interaction/async_call.rs
@@ -1,60 +1,46 @@
 use crate::{
     api::{CallTypeApi, StorageWriteApi},
     contract_base::SendRawWrapper,
-    types::{BigUint, CallbackClosure, ManagedAddress},
+    types::{BigUint, CallbackClosure, EgldPayment, ManagedAddress},
 };
 
-use super::FunctionCall;
+use super::{FunctionCall, Tx, TxAsyncCallCallback, TxScEnv};
 
-#[must_use]
-pub struct AsyncCall<SA>
-where
-    SA: CallTypeApi + 'static,
-{
-    pub(crate) to: ManagedAddress<SA>,
-    pub(crate) egld_payment: BigUint<SA>,
-    pub(crate) function_call: FunctionCall<SA>,
-    pub(crate) callback_call: Option<CallbackClosure<SA>>,
-}
+pub type AsyncCall<Api> = Tx<
+    TxScEnv<Api>,
+    (),
+    ManagedAddress<Api>,
+    EgldPayment<Api>,
+    (),
+    FunctionCall<Api>,
+    Option<CallbackClosure<Api>>,
+>;
 
 #[allow(clippy::return_self_not_must_use)]
-impl<SA> AsyncCall<SA>
+impl<Api> AsyncCall<Api>
 where
-    SA: CallTypeApi,
+    Api: CallTypeApi,
 {
-    pub fn with_callback(self, callback_call: CallbackClosure<SA>) -> Self {
-        AsyncCall {
-            callback_call: Some(callback_call),
-            ..self
-        }
+    pub fn with_callback(mut self, callback_call: CallbackClosure<Api>) -> Self {
+        self.callback = Some(callback_call);
+        self
     }
 }
 
-impl<SA> AsyncCall<SA>
+impl<Api> AsyncCall<Api>
 where
-    SA: CallTypeApi,
+    Api: CallTypeApi + StorageWriteApi,
 {
-    pub fn call_and_exit_ignore_callback(&self) -> ! {
-        SendRawWrapper::<SA>::new().async_call_raw(
-            &self.to,
-            &self.egld_payment,
-            &self.function_call.function_name,
-            &self.function_call.arg_buffer,
-        )
+    pub fn call_and_exit_ignore_callback(self) -> ! {
+        self.async_call_and_exit()
     }
 }
 
-impl<SA> AsyncCall<SA>
+impl<Api> AsyncCall<Api>
 where
-    SA: CallTypeApi + StorageWriteApi,
+    Api: CallTypeApi + StorageWriteApi,
 {
-    pub fn call_and_exit(&self) -> ! {
-        // first, save the callback closure
-        if let Some(callback_call) = &self.callback_call {
-            callback_call.save_to_storage::<SA>();
-        }
-
-        // last, send the async call, which will kill the execution
-        self.call_and_exit_ignore_callback()
+    pub fn call_and_exit(self) -> ! {
+        self.async_call_and_exit()
     }
 }
diff --git a/framework/base/src/types/interaction/callback_closure.rs b/framework/base/src/types/interaction/callback_closure.rs
index 98b6fece64..a8884695f7 100644
--- a/framework/base/src/types/interaction/callback_closure.rs
+++ b/framework/base/src/types/interaction/callback_closure.rs
@@ -28,11 +28,22 @@ pub const CALLBACK_CLOSURE_STORAGE_BASE_KEY: &[u8] = b"CB_CLOSURE";
 ///
 /// In both cases the framework hides all the magic, the developer shouldn't worry about it.
 #[derive(TopEncode)]
-pub struct CallbackClosure<M: ManagedTypeApi + ErrorApi> {
+pub struct CallbackClosure<M>
+where
+    M: ManagedTypeApi + ErrorApi,
+{
     pub(super) callback_name: &'static str,
     pub(super) closure_args: ManagedArgBuffer<M>,
 }
 
+pub struct CallbackClosureWithGas<M>
+where
+    M: ManagedTypeApi + ErrorApi,
+{
+    pub(super) closure: CallbackClosure<M>,
+    pub(super) gas_for_callback: u64,
+}
+
 /// Syntactical sugar to help macros to generate code easier.
 /// Unlike calling `CallbackClosure::<SA, R>::new`, here types can be inferred from the context.
 pub fn new_callback_call<A>(callback_name: &'static str) -> CallbackClosure<A>
diff --git a/framework/base/src/types/interaction/contract_call_exec.rs b/framework/base/src/types/interaction/contract_call_exec.rs
index f374d1801b..f5e875a41f 100644
--- a/framework/base/src/types/interaction/contract_call_exec.rs
+++ b/framework/base/src/types/interaction/contract_call_exec.rs
@@ -14,7 +14,7 @@ use crate::{
     },
 };
 
-use super::{AsyncCall, ContractCallNoPayment, ContractCallWithEgld};
+use super::{AsyncCall, ContractCallNoPayment, ContractCallWithEgld, Tx};
 use crate::api::managed_types::handles::HandleConstraints;
 
 /// Using max u64 to represent maximum possible gas,
@@ -66,12 +66,11 @@ where
     }
 
     pub(super) fn async_call(self) -> AsyncCall<SA> {
-        AsyncCall {
-            to: self.basic.to,
-            egld_payment: self.egld_payment,
-            function_call: self.basic.function_call,
-            callback_call: None,
-        }
+        Tx::new_tx_from_sc()
+            .to(self.basic.to)
+            .egld(self.egld_payment)
+            .call(self.basic.function_call)
+            .callback(None)
     }
 
     #[cfg(feature = "promises")]
diff --git a/framework/base/src/types/interaction/contract_call_no_payment.rs b/framework/base/src/types/interaction/contract_call_no_payment.rs
index 69057da3e9..4fc75125a5 100644
--- a/framework/base/src/types/interaction/contract_call_no_payment.rs
+++ b/framework/base/src/types/interaction/contract_call_no_payment.rs
@@ -168,7 +168,7 @@ where
         self.function_call
     }
 
-    pub fn tx(self) -> Tx<TxScEnv<SA>, (), (), (), (), FunctionCall<SA>> {
+    pub fn tx(self) -> Tx<TxScEnv<SA>, (), (), (), (), FunctionCall<SA>, ()> {
         Tx::new_tx_from_sc().call(self.function_call)
     }
 }
diff --git a/framework/base/src/types/interaction/mod.rs b/framework/base/src/types/interaction/mod.rs
index f8589bbf0d..8be51394e2 100644
--- a/framework/base/src/types/interaction/mod.rs
+++ b/framework/base/src/types/interaction/mod.rs
@@ -20,6 +20,9 @@ mod expr_sc;
 mod function_call;
 mod managed_arg_buffer;
 mod tx;
+mod tx_async_call;
+mod tx_async_call_promises;
+mod tx_callback;
 mod tx_data;
 mod tx_env;
 mod tx_env_sc;
@@ -48,6 +51,9 @@ pub use expr_sc::ScExpr;
 pub use function_call::FunctionCall;
 pub use managed_arg_buffer::ManagedArgBuffer;
 pub use tx::*;
+pub use tx_async_call::*;
+pub use tx_async_call_promises::*;
+pub use tx_callback::*;
 pub use tx_data::*;
 pub use tx_env::*;
 pub use tx_env_sc::*;
diff --git a/framework/base/src/types/interaction/tx.rs b/framework/base/src/types/interaction/tx.rs
index 60b26b71e1..e24fa6d539 100644
--- a/framework/base/src/types/interaction/tx.rs
+++ b/framework/base/src/types/interaction/tx.rs
@@ -12,11 +12,12 @@ use crate::{
 };
 
 use super::{
-    AsyncCall, ExplicitGas, FunctionCall, TxData, TxEnv, TxFrom, TxFromSpecified, TxGas, TxPayment,
-    TxScEnv, TxTo, TxToSpecified,
+    AsyncCall, ExplicitGas, FunctionCall, TxCallback, TxData, TxDataFunctionCall, TxEnv, TxFrom,
+    TxFromSpecified, TxGas, TxPayment, TxScEnv, TxTo, TxToSpecified,
 };
 
-pub struct Tx<Env, From, To, Payment, Gas, Data>
+#[must_use]
+pub struct Tx<Env, From, To, Payment, Gas, Data, Callback>
 where
     Env: TxEnv,
     From: TxFrom<Env>,
@@ -24,6 +25,7 @@ where
     Payment: TxPayment<Env>,
     Gas: TxGas<Env>,
     Data: TxData<Env>,
+    Callback: TxCallback<Env>,
 {
     pub env: Env,
     pub from: From,
@@ -31,9 +33,10 @@ where
     pub payment: Payment,
     pub gas: Gas,
     pub data: Data,
+    pub callback: Callback,
 }
 
-impl<Env, From, To, Payment, Gas, Data> Tx<Env, From, To, Payment, Gas, Data>
+impl<Env, From, To, Payment, Gas, Data, Callback> Tx<Env, From, To, Payment, Gas, Data, Callback>
 where
     Env: TxEnv,
     From: TxFrom<Env>,
@@ -41,10 +44,11 @@ where
     Payment: TxPayment<Env>,
     Gas: TxGas<Env>,
     Data: TxData<Env>,
+    Callback: TxCallback<Env>,
 {
     /// TODO: does nothing, delete, added for easier copy-paste.
     #[inline]
-    pub fn nothing(self) -> Tx<Env, From, To, Payment, Gas, Data> {
+    pub fn nothing(self) -> Tx<Env, From, To, Payment, Gas, Data, Callback> {
         Tx {
             env: self.env,
             from: self.from,
@@ -52,11 +56,12 @@ where
             payment: self.payment,
             gas: self.gas,
             data: self.data,
+            callback: self.callback,
         }
     }
 }
 
-pub type TxBaseWithEnv<Env> = Tx<Env, (), (), (), (), ()>;
+pub type TxBaseWithEnv<Env> = Tx<Env, (), (), (), (), (), ()>;
 
 impl<Env> TxBaseWithEnv<Env>
 where
@@ -71,6 +76,7 @@ where
             payment: (),
             gas: (),
             data: (),
+            callback: (),
         }
     }
 }
@@ -89,15 +95,16 @@ where
 //     }
 // }
 
-impl<Env, To, Payment, Gas, Data> Tx<Env, (), To, Payment, Gas, Data>
+impl<Env, To, Payment, Gas, Data, Callback> Tx<Env, (), To, Payment, Gas, Data, Callback>
 where
     Env: TxEnv,
     To: TxTo<Env>,
     Payment: TxPayment<Env>,
     Gas: TxGas<Env>,
     Data: TxData<Env>,
+    Callback: TxCallback<Env>,
 {
-    pub fn from<From>(self, from: From) -> Tx<Env, From, To, Payment, Gas, Data>
+    pub fn from<From>(self, from: From) -> Tx<Env, From, To, Payment, Gas, Data, Callback>
     where
         From: TxFromSpecified<Env>,
     {
@@ -110,19 +117,21 @@ where
             payment: self.payment,
             gas: self.gas,
             data: self.data,
+            callback: self.callback,
         }
     }
 }
 
-impl<Env, From, Payment, Gas, Data> Tx<Env, From, (), Payment, Gas, Data>
+impl<Env, From, Payment, Gas, Data, Callback> Tx<Env, From, (), Payment, Gas, Data, Callback>
 where
     Env: TxEnv,
     From: TxFrom<Env>,
     Payment: TxPayment<Env>,
     Gas: TxGas<Env>,
     Data: TxData<Env>,
+    Callback: TxCallback<Env>,
 {
-    pub fn to<To>(self, to: To) -> Tx<Env, From, To, Payment, Gas, Data>
+    pub fn to<To>(self, to: To) -> Tx<Env, From, To, Payment, Gas, Data, Callback>
     where
         To: TxToSpecified<Env>,
     {
@@ -135,27 +144,31 @@ where
             payment: self.payment,
             gas: self.gas,
             data: self.data,
+            callback: self.callback,
         }
     }
 
-    pub fn to_caller(self) -> Tx<Env, From, ManagedAddress<Env::Api>, Payment, Gas, Data> {
+    pub fn to_caller(
+        self,
+    ) -> Tx<Env, From, ManagedAddress<Env::Api>, Payment, Gas, Data, Callback> {
         let caller = BlockchainWrapper::<Env::Api>::new().get_caller();
         self.to(caller)
     }
 }
 
-impl<Env, From, To, Gas, Data> Tx<Env, From, To, (), Gas, Data>
+impl<Env, From, To, Gas, Data, Callback> Tx<Env, From, To, (), Gas, Data, Callback>
 where
     Env: TxEnv,
     From: TxFrom<Env>,
     To: TxTo<Env>,
     Gas: TxGas<Env>,
     Data: TxData<Env>,
+    Callback: TxCallback<Env>,
 {
     pub fn egld(
         self,
         egld_amount: BigUint<Env::Api>,
-    ) -> Tx<Env, From, To, EgldPayment<Env::Api>, Gas, Data> {
+    ) -> Tx<Env, From, To, EgldPayment<Env::Api>, Gas, Data, Callback> {
         Tx {
             env: self.env,
             from: self.from,
@@ -163,17 +176,19 @@ where
             payment: EgldPayment { value: egld_amount },
             gas: self.gas,
             data: self.data,
+            callback: self.callback,
         }
     }
 }
 
-impl<Env, From, To, Gas, Data> Tx<Env, From, To, (), Gas, Data>
+impl<Env, From, To, Gas, Data, Callback> Tx<Env, From, To, (), Gas, Data, Callback>
 where
     Env: TxEnv,
     From: TxFrom<Env>,
     To: TxTo<Env>,
     Gas: TxGas<Env>,
     Data: TxData<Env>,
+    Callback: TxCallback<Env>,
 {
     /// Adds a single ESDT token transfer to a transaction.
     ///
@@ -181,7 +196,7 @@ where
     pub fn esdt<P: Into<EsdtTokenPayment<Env::Api>>>(
         self,
         payment: P,
-    ) -> Tx<Env, From, To, EsdtTokenPayment<Env::Api>, Gas, Data> {
+    ) -> Tx<Env, From, To, EsdtTokenPayment<Env::Api>, Gas, Data, Callback> {
         Tx {
             env: self.env,
             from: self.from,
@@ -189,6 +204,7 @@ where
             payment: payment.into(),
             gas: self.gas,
             data: self.data,
+            callback: self.callback,
         }
     }
 
@@ -196,7 +212,7 @@ where
     pub fn multi_esdt(
         self,
         payments: MultiEsdtPayment<Env::Api>, // TODO: references
-    ) -> Tx<Env, From, To, MultiEsdtPayment<Env::Api>, Gas, Data> {
+    ) -> Tx<Env, From, To, MultiEsdtPayment<Env::Api>, Gas, Data, Callback> {
         Tx {
             env: self.env,
             from: self.from,
@@ -204,17 +220,20 @@ where
             payment: payments,
             gas: self.gas,
             data: self.data,
+            callback: self.callback,
         }
     }
 }
 
-impl<Env, From, To, Gas, Data> Tx<Env, From, To, EsdtTokenPayment<Env::Api>, Gas, Data>
+impl<Env, From, To, Gas, Data, Callback>
+    Tx<Env, From, To, EsdtTokenPayment<Env::Api>, Gas, Data, Callback>
 where
     Env: TxEnv,
     From: TxFrom<Env>,
     To: TxTo<Env>,
     Gas: TxGas<Env>,
     Data: TxData<Env>,
+    Callback: TxCallback<Env>,
 {
     /// Adds a single ESDT token transfer to a contract call.
     ///
@@ -222,7 +241,7 @@ where
     pub fn with_esdt_transfer<P: Into<EsdtTokenPayment<Env::Api>>>(
         self,
         payment: P,
-    ) -> Tx<Env, From, To, MultiEsdtPayment<Env::Api>, Gas, Data> {
+    ) -> Tx<Env, From, To, MultiEsdtPayment<Env::Api>, Gas, Data, Callback> {
         let mut payments = ManagedVec::new();
         payments.push(self.payment);
         payments.push(payment.into());
@@ -233,17 +252,20 @@ where
             payment: payments,
             gas: self.gas,
             data: self.data,
+            callback: self.callback,
         }
     }
 }
 
-impl<Env, From, To, Gas, Data> Tx<Env, From, To, MultiEsdtPayment<Env::Api>, Gas, Data>
+impl<Env, From, To, Gas, Data, Callback>
+    Tx<Env, From, To, MultiEsdtPayment<Env::Api>, Gas, Data, Callback>
 where
     Env: TxEnv,
     From: TxFrom<Env>,
     To: TxTo<Env>,
     Gas: TxGas<Env>,
     Data: TxData<Env>,
+    Callback: TxCallback<Env>,
 {
     /// Adds a single ESDT token transfer to a contract call.
     ///
@@ -251,23 +273,27 @@ where
     pub fn with_esdt_transfer<P: Into<EsdtTokenPayment<Env::Api>>>(
         mut self,
         payment: P,
-    ) -> Tx<Env, From, To, MultiEsdtPayment<Env::Api>, Gas, Data> {
+    ) -> Tx<Env, From, To, MultiEsdtPayment<Env::Api>, Gas, Data, Callback> {
         self.payment.push(payment.into());
         self
     }
 }
 
-impl<Env, From, To, Payment, Data> Tx<Env, From, To, Payment, (), Data>
+impl<Env, From, To, Payment, Data, Callback> Tx<Env, From, To, Payment, (), Data, Callback>
 where
     Env: TxEnv,
     From: TxFrom<Env>,
     To: TxTo<Env>,
     Payment: TxPayment<Env>,
     Data: TxData<Env>,
+    Callback: TxCallback<Env>,
 {
     /// Sets an explicit gas limit to the call.
     #[inline]
-    pub fn with_gas_limit(self, gas_limit: u64) -> Tx<Env, From, To, Payment, ExplicitGas, Data> {
+    pub fn with_gas_limit(
+        self,
+        gas_limit: u64,
+    ) -> Tx<Env, From, To, Payment, ExplicitGas, Data, Callback> {
         Tx {
             env: self.env,
             from: self.from,
@@ -275,23 +301,25 @@ where
             payment: self.payment,
             gas: ExplicitGas(gas_limit),
             data: self.data,
+            callback: self.callback,
         }
     }
 }
 
-impl<Env, From, To, Payment, Gas> Tx<Env, From, To, Payment, Gas, ()>
+impl<Env, From, To, Payment, Gas, Callback> Tx<Env, From, To, Payment, Gas, (), Callback>
 where
     Env: TxEnv,
     From: TxFrom<Env>,
     To: TxTo<Env>,
     Payment: TxPayment<Env>,
     Gas: TxGas<Env>,
+    Callback: TxCallback<Env>,
 {
     #[inline]
     pub fn call<FC: Into<FunctionCall<Env::Api>>>(
         self,
         call: FC,
-    ) -> Tx<Env, From, To, Payment, Gas, FunctionCall<Env::Api>> {
+    ) -> Tx<Env, From, To, Payment, Gas, FunctionCall<Env::Api>, Callback> {
         Tx {
             env: self.env,
             from: self.from,
@@ -299,6 +327,7 @@ where
             payment: self.payment,
             gas: self.gas,
             data: call.into(),
+            callback: self.callback,
         }
     }
 
@@ -306,7 +335,7 @@ where
     pub fn function_name<N: Into<ManagedBuffer<Env::Api>>>(
         self,
         function_name: N,
-    ) -> Tx<Env, From, To, Payment, Gas, FunctionCall<Env::Api>> {
+    ) -> Tx<Env, From, To, Payment, Gas, FunctionCall<Env::Api>, Callback> {
         Tx {
             env: self.env,
             from: self.from,
@@ -314,17 +343,20 @@ where
             payment: self.payment,
             gas: self.gas,
             data: FunctionCall::new(function_name),
+            callback: self.callback,
         }
     }
 }
 
-impl<Env, From, To, Payment, Gas> Tx<Env, From, To, Payment, Gas, FunctionCall<Env::Api>>
+impl<Env, From, To, Payment, Gas, Callback>
+    Tx<Env, From, To, Payment, Gas, FunctionCall<Env::Api>, Callback>
 where
     Env: TxEnv,
     From: TxFrom<Env>,
     To: TxTo<Env>,
     Payment: TxPayment<Env>,
     Gas: TxGas<Env>,
+    Callback: TxCallback<Env>,
 {
     #[inline]
     pub fn argument<T: TopEncodeMulti>(mut self, arg: &T) -> Self {
@@ -333,21 +365,62 @@ where
     }
 }
 
-impl<Env, From, To, Payment, Gas> Tx<Env, From, To, Payment, Gas, FunctionCall<Env::Api>>
+impl<Env, From, To, Payment, Gas, Data> Tx<Env, From, To, Payment, Gas, Data, ()>
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Payment: TxPayment<Env>,
+    Gas: TxGas<Env>,
+    Data: TxData<Env>,
+{
+    #[inline]
+    pub fn callback<Callback>(
+        self,
+        callback: Callback,
+    ) -> Tx<Env, From, To, Payment, Gas, Data, Callback>
+    where
+        Callback: TxCallback<Env>,
+    {
+        Tx {
+            env: self.env,
+            from: self.from,
+            to: self.to,
+            payment: self.payment,
+            gas: self.gas,
+            data: self.data,
+            callback,
+        }
+    }
+}
+
+impl<Env, From, To, Payment, Gas, FC, Callback> Tx<Env, From, To, Payment, Gas, FC, Callback>
 where
     Env: TxEnv,
     From: TxFrom<Env>,
     To: TxToSpecified<Env>,
     Payment: TxPayment<Env>,
     Gas: TxGas<Env>,
+    FC: TxDataFunctionCall<Env>,
+    Callback: TxCallback<Env>,
 {
     pub fn normalize_tx(
         self,
-    ) -> Tx<Env, From, ManagedAddress<Env::Api>, EgldPayment<Env::Api>, Gas, FunctionCall<Env::Api>>
-    {
-        let result =
-            self.payment
-                .convert_tx_data(&self.env, &self.from, self.to.into_value(), self.data);
+    ) -> Tx<
+        Env,
+        From,
+        ManagedAddress<Env::Api>,
+        EgldPayment<Env::Api>,
+        Gas,
+        FunctionCall<Env::Api>,
+        Callback,
+    > {
+        let result = self.payment.convert_tx_data(
+            &self.env,
+            &self.from,
+            self.to.into_value(),
+            self.data.into(),
+        );
         Tx {
             env: self.env,
             from: self.from,
@@ -355,6 +428,7 @@ where
             payment: result.egld_payment,
             gas: self.gas,
             data: result.fc,
+            callback: self.callback,
         }
     }
 }
diff --git a/framework/base/src/types/interaction/tx_async_call.rs b/framework/base/src/types/interaction/tx_async_call.rs
new file mode 100644
index 0000000000..27d6e2a194
--- /dev/null
+++ b/framework/base/src/types/interaction/tx_async_call.rs
@@ -0,0 +1,65 @@
+use crate::{
+    api::{CallTypeApi, StorageWriteApi},
+    contract_base::SendRawWrapper,
+    types::{BigUint, CallbackClosure, ManagedAddress},
+};
+
+use super::{
+    FunctionCall, Tx, TxCallback, TxDataFunctionCall, TxEnv, TxPayment, TxScEnv, TxToSpecified,
+};
+
+pub trait TxAsyncCallCallback<Api>: TxCallback<TxScEnv<Api>>
+where
+    Api: CallTypeApi,
+{
+    fn save_callback_closure_to_storage(&self);
+}
+
+impl<Api> TxAsyncCallCallback<Api> for ()
+where
+    Api: CallTypeApi,
+{
+    fn save_callback_closure_to_storage(&self) {}
+}
+
+impl<Api> TxCallback<TxScEnv<Api>> for CallbackClosure<Api> where Api: CallTypeApi {}
+impl<Api> TxAsyncCallCallback<Api> for CallbackClosure<Api>
+where
+    Api: CallTypeApi + StorageWriteApi,
+{
+    fn save_callback_closure_to_storage(&self) {
+        self.save_to_storage::<Api>();
+    }
+}
+
+impl<Api> TxCallback<TxScEnv<Api>> for Option<CallbackClosure<Api>> where Api: CallTypeApi {}
+impl<Api> TxAsyncCallCallback<Api> for Option<CallbackClosure<Api>>
+where
+    Api: CallTypeApi + StorageWriteApi,
+{
+    fn save_callback_closure_to_storage(&self) {
+        if let Some(closure) = self {
+            closure.save_callback_closure_to_storage();
+        }
+    }
+}
+
+impl<Api, To, Payment, FC, Callback> Tx<TxScEnv<Api>, (), To, Payment, (), FC, Callback>
+where
+    Api: CallTypeApi,
+    To: TxToSpecified<TxScEnv<Api>>,
+    Payment: TxPayment<TxScEnv<Api>>,
+    FC: TxDataFunctionCall<TxScEnv<Api>>,
+    Callback: TxAsyncCallCallback<Api>,
+{
+    pub fn async_call_and_exit(self) -> ! {
+        let normalized = self.normalize_tx();
+        normalized.callback.save_callback_closure_to_storage();
+        SendRawWrapper::<Api>::new().async_call_raw(
+            &normalized.to,
+            &normalized.payment.value,
+            &normalized.data.function_name,
+            &normalized.data.arg_buffer,
+        )
+    }
+}
diff --git a/framework/base/src/types/interaction/tx_async_call_promises.rs b/framework/base/src/types/interaction/tx_async_call_promises.rs
new file mode 100644
index 0000000000..55282d708a
--- /dev/null
+++ b/framework/base/src/types/interaction/tx_async_call_promises.rs
@@ -0,0 +1,119 @@
+use crate::{
+    api::{const_handles, CallTypeApi},
+    contract_base::SendRawWrapper,
+    types::{BigUint, CallbackClosure, ManagedAddress, ManagedBuffer, ManagedType},
+};
+
+use super::{
+    callback_closure::CallbackClosureWithGas, ExplicitGas, FunctionCall, Tx, TxCallback, TxGas,
+    TxPayment, TxScEnv, TxToSpecified,
+};
+
+pub trait TxPromisesCallback<Api>: TxCallback<TxScEnv<Api>>
+where
+    Api: CallTypeApi,
+{
+    fn callback_name(&self) -> &'static str;
+
+    fn overwrite_with_serialized_args(&self, cb_closure_args_serialized: &mut ManagedBuffer<Api>);
+
+    fn gas_for_callback(&self) -> u64;
+}
+
+impl<Api> TxPromisesCallback<Api> for ()
+where
+    Api: CallTypeApi,
+{
+    fn callback_name(&self) -> &'static str {
+        ""
+    }
+
+    fn overwrite_with_serialized_args(&self, cb_closure_args_serialized: &mut ManagedBuffer<Api>) {
+        cb_closure_args_serialized.overwrite(&[]);
+    }
+
+    fn gas_for_callback(&self) -> u64 {
+        0
+    }
+}
+
+impl<Api> TxCallback<TxScEnv<Api>> for CallbackClosureWithGas<Api> where Api: CallTypeApi {}
+impl<Api> TxPromisesCallback<Api> for CallbackClosureWithGas<Api>
+where
+    Api: CallTypeApi,
+{
+    fn callback_name(&self) -> &'static str {
+        self.closure.callback_name
+    }
+
+    fn overwrite_with_serialized_args(&self, cb_closure_args_serialized: &mut ManagedBuffer<Api>) {
+        self.closure
+            .closure_args
+            .serialize_overwrite(cb_closure_args_serialized);
+    }
+
+    fn gas_for_callback(&self) -> u64 {
+        self.gas_for_callback
+    }
+}
+
+impl<Api, To, Payment, Gas>
+    Tx<TxScEnv<Api>, (), To, Payment, Gas, FunctionCall<Api>, CallbackClosure<Api>>
+where
+    Api: CallTypeApi,
+    To: TxToSpecified<TxScEnv<Api>>,
+    Payment: TxPayment<TxScEnv<Api>>,
+    Gas: TxGas<TxScEnv<Api>>,
+{
+    pub fn gas_for_callback(
+        self,
+        gas: u64,
+    ) -> Tx<TxScEnv<Api>, (), To, Payment, Gas, FunctionCall<Api>, CallbackClosureWithGas<Api>>
+    {
+        Tx {
+            env: self.env,
+            from: self.from,
+            to: self.to,
+            payment: self.payment,
+            gas: self.gas,
+            data: self.data,
+            callback: CallbackClosureWithGas {
+                closure: self.callback,
+                gas_for_callback: gas,
+            },
+        }
+    }
+}
+
+impl<Api, To, Payment, Callback>
+    Tx<TxScEnv<Api>, (), To, Payment, ExplicitGas, FunctionCall<Api>, Callback>
+where
+    Api: CallTypeApi,
+    To: TxToSpecified<TxScEnv<Api>>,
+    Payment: TxPayment<TxScEnv<Api>>,
+    Callback: TxPromisesCallback<Api>,
+{
+    // #[cfg(feature = "promises")]
+    pub fn async_call_promise(self) {
+        let callback_name = self.callback.callback_name();
+        let mut cb_closure_args_serialized =
+            ManagedBuffer::<Api>::from_raw_handle(const_handles::MBUF_TEMPORARY_1);
+        self.callback
+            .overwrite_with_serialized_args(&mut cb_closure_args_serialized);
+        let extra_gas_for_callback = self.callback.gas_for_callback();
+
+        let normalized = self.normalize_tx();
+
+        SendRawWrapper::<Api>::new().create_async_call_raw(
+            &normalized.to,
+            &normalized.payment.value,
+            &normalized.data.function_name,
+            &normalized.data.arg_buffer,
+            callback_name,
+            callback_name,
+            normalized.gas.0,
+            extra_gas_for_callback,
+            &cb_closure_args_serialized,
+        )
+    }
+}
diff --git a/framework/base/src/types/interaction/tx_callback.rs b/framework/base/src/types/interaction/tx_callback.rs
new file mode 100644
index 0000000000..a7e5710e21
--- /dev/null
+++ b/framework/base/src/types/interaction/tx_callback.rs
@@ -0,0 +1,28 @@
+use crate::{
+    api::ManagedTypeApi,
+    formatter::SCLowerHex,
+    types::{ManagedBuffer, ManagedBufferCachedBuilder},
+};
+
+use super::{FunctionCall, TxEnv};
+
+pub trait TxCallback<Env>
+where
+    Env: TxEnv,
+{
+}
+
+pub trait TxRunnableCallback<Env>: TxCallback<Env>
+where
+    Env: TxEnv,
+{
+    fn run_callback(self, env: &Env);
+}
+
+impl<Env> TxCallback<Env> for () where Env: TxEnv {}
+impl<Env> TxRunnableCallback<Env> for ()
+where
+    Env: TxEnv,
+{
+    fn run_callback(self, _env: &Env) {}
+}
diff --git a/framework/base/src/types/interaction/tx_data.rs b/framework/base/src/types/interaction/tx_data.rs
index 3f8da83eed..f76f9edb4a 100644
--- a/framework/base/src/types/interaction/tx_data.rs
+++ b/framework/base/src/types/interaction/tx_data.rs
@@ -15,6 +15,12 @@ where
     fn to_call_data_string(&self) -> ManagedBuffer<Env::Api>;
 }
 
+pub trait TxDataFunctionCall<Env>: TxData<Env> + Into<FunctionCall<Env::Api>>
+where
+    Env: TxEnv,
+{
+}
+
 impl<Env> TxData<Env> for ()
 where
     Env: TxEnv,
@@ -27,6 +33,7 @@ where
         ManagedBuffer::new()
     }
 }
+impl<Env> TxDataFunctionCall<Env> for () where Env: TxEnv {}
 
 impl<Env> TxData<Env> for FunctionCall<Env::Api>
 where
@@ -46,3 +53,4 @@ where
         result.into_managed_buffer()
     }
 }
+impl<Env> TxDataFunctionCall<Env> for FunctionCall<Env::Api> where Env: TxEnv {}
diff --git a/framework/base/src/types/interaction/tx_env_sc.rs b/framework/base/src/types/interaction/tx_env_sc.rs
index b7f5a18bb4..16ef20b8ab 100644
--- a/framework/base/src/types/interaction/tx_env_sc.rs
+++ b/framework/base/src/types/interaction/tx_env_sc.rs
@@ -69,45 +69,7 @@ where
     }
 }
 
-impl<Api, To, Payment> Tx<TxScEnv<Api>, (), To, Payment, (), FunctionCall<Api>>
-where
-    Api: CallTypeApi,
-    To: TxToSpecified<TxScEnv<Api>>,
-    Payment: TxPayment<TxScEnv<Api>>,
-{
-    pub fn async_call(self) -> AsyncCall<Api> {
-        let normalized = self.normalize_tx();
-        AsyncCall {
-            to: normalized.to,
-            egld_payment: normalized.payment.value,
-            function_call: normalized.data,
-            callback_call: None,
-        }
-    }
-}
-
-impl<Api, To, Payment> Tx<TxScEnv<Api>, (), To, Payment, ExplicitGas, FunctionCall<Api>>
-where
-    Api: CallTypeApi,
-    To: TxToSpecified<TxScEnv<Api>>,
-    Payment: TxPayment<TxScEnv<Api>>,
-{
-    #[cfg(feature = "promises")]
-    pub fn async_call_promise(self) -> super::AsyncCallPromises<Api> {
-        let explicit_gas_limit = self.gas.0;
-        let normalized = self.normalize_tx();
-        super::AsyncCallPromises {
-            to: normalized.to,
-            egld_payment: normalized.payment.value,
-            function_call: normalized.data,
-            explicit_gas_limit,
-            extra_gas_for_callback: 0,
-            callback_call: None,
-        }
-    }
-}
-
-impl<Api, From, To, Payment, Gas, FC> Tx<TxScEnv<Api>, From, To, Payment, Gas, FC>
+impl<Api, From, To, Payment, Gas, FC> Tx<TxScEnv<Api>, From, To, Payment, Gas, FC, ()>
 where
     Api: CallTypeApi,
     From: TxFrom<TxScEnv<Api>>,
@@ -130,7 +92,7 @@ where
     }
 }
 
-impl<Api, From, To, Payment, Gas> Tx<TxScEnv<Api>, From, To, Payment, Gas, ()>
+impl<Api, From, To, Payment, Gas> Tx<TxScEnv<Api>, From, To, Payment, Gas, (), ()>
 where
     Api: CallTypeApi,
     From: TxFrom<TxScEnv<Api>>,
diff --git a/framework/scenario/src/facade/scenario_world_steps_tx.rs b/framework/scenario/src/facade/scenario_world_steps_tx.rs
index d0f6dcf499..436339cde4 100644
--- a/framework/scenario/src/facade/scenario_world_steps_tx.rs
+++ b/framework/scenario/src/facade/scenario_world_steps_tx.rs
@@ -69,7 +69,7 @@ impl ScenarioWorld {
 }
 
 impl<From, To, Payment, Gas> ScenarioTx
-    for Tx<ScenarioTxEnvironment, From, To, Payment, Gas, FunctionCall<StaticApi>>
+    for Tx<ScenarioTxEnvironment, From, To, Payment, Gas, FunctionCall<StaticApi>, ()>
 where
     From: TxFromSpecified<ScenarioTxEnvironment>,
     To: TxToSpecified<ScenarioTxEnvironment>,
@@ -85,6 +85,6 @@ where
             step = step.argument(arg.to_vec());
         }
 
-        world.sc_call(step);
+        world.sc_call(&mut step);
     }
 }

From 31c051eb2b99dd74fe722f286f3f7dd74b78501a Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 9 Nov 2023 20:51:34 +0200
Subject: [PATCH 0041/1254] clippy fix

---
 framework/base/src/types/managed/wrapped/managed_option.rs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/framework/base/src/types/managed/wrapped/managed_option.rs b/framework/base/src/types/managed/wrapped/managed_option.rs
index 99160ff5cd..1fe4366eb0 100644
--- a/framework/base/src/types/managed/wrapped/managed_option.rs
+++ b/framework/base/src/types/managed/wrapped/managed_option.rs
@@ -75,6 +75,8 @@ where
 
     /// Assumes that value is Some and unwraps without checking.
     ///
+    /// # Safety
+    ///
     /// Must always be called under an `if` checking `.is_some()`, otherwise will lead to undefined behaviour.
     pub unsafe fn unwrap_no_check(self) -> T {
         T::from_handle(self.handle)

From ea6c6bd321ad98506ad2d564dd827f13fad98012 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 10 Nov 2023 02:28:11 +0200
Subject: [PATCH 0042/1254] unified tx sytax - transfer-execute fix

---
 framework/base/src/types/interaction/mod.rs   |  1 +
 .../base/src/types/interaction/tx_async_te.rs | 58 +++++++++++++++++++
 .../base/src/types/interaction/tx_env_sc.rs   | 37 ------------
 3 files changed, 59 insertions(+), 37 deletions(-)
 create mode 100644 framework/base/src/types/interaction/tx_async_te.rs

diff --git a/framework/base/src/types/interaction/mod.rs b/framework/base/src/types/interaction/mod.rs
index 8be51394e2..ebb0d4d67f 100644
--- a/framework/base/src/types/interaction/mod.rs
+++ b/framework/base/src/types/interaction/mod.rs
@@ -22,6 +22,7 @@ mod managed_arg_buffer;
 mod tx;
 mod tx_async_call;
 mod tx_async_call_promises;
+mod tx_async_te;
 mod tx_callback;
 mod tx_data;
 mod tx_env;
diff --git a/framework/base/src/types/interaction/tx_async_te.rs b/framework/base/src/types/interaction/tx_async_te.rs
new file mode 100644
index 0000000000..4f7dfc292b
--- /dev/null
+++ b/framework/base/src/types/interaction/tx_async_te.rs
@@ -0,0 +1,58 @@
+use core::marker::PhantomData;
+
+use crate::{
+    api::{BlockchainApiImpl, CallTypeApi},
+    contract_base::BlockchainWrapper,
+    types::{ManagedAddress, ManagedBuffer},
+};
+
+use super::{
+    contract_call_exec::TRANSFER_EXECUTE_DEFAULT_LEFTOVER, AnnotatedValue, AsyncCall, ExplicitGas,
+    FunctionCall, Tx, TxBaseWithEnv, TxData, TxEnv, TxFrom, TxGas, TxPayment, TxScEnv,
+    TxToSpecified,
+};
+
+impl<Api, From, To, Payment, Gas, FC> Tx<TxScEnv<Api>, From, To, Payment, Gas, FC, ()>
+where
+    Api: CallTypeApi,
+    From: TxFrom<TxScEnv<Api>>,
+    To: TxToSpecified<TxScEnv<Api>>,
+    Payment: TxPayment<TxScEnv<Api>>,
+    Gas: TxGas<TxScEnv<Api>>,
+    FC: TxData<TxScEnv<Api>> + Into<FunctionCall<Api>>,
+{
+    fn transfer_execute_with_gas(self, gas_limit: u64) {
+        self.to.with_value_ref(|to| {
+            self.payment
+                .perform_transfer_execute(&self.env, to, gas_limit, self.data.into());
+        });
+    }
+
+    pub fn transfer_execute(self) {
+        let gas_limit: u64;
+        if self.data.is_no_call() {
+            if self.payment.is_no_payment() {
+                return;
+            } else {
+                gas_limit = 0;
+            }
+        } else {
+            gas_limit = self.gas.resolve_gas(&self.env);
+        }
+
+        self.transfer_execute_with_gas(gas_limit);
+    }
+}
+
+impl<Api, From, To, Payment> Tx<TxScEnv<Api>, From, To, Payment, (), (), ()>
+where
+    Api: CallTypeApi,
+    From: TxFrom<TxScEnv<Api>>,
+    To: TxToSpecified<TxScEnv<Api>>,
+    Payment: TxPayment<TxScEnv<Api>>,
+{
+    /// Only allowed for simple transfers.
+    pub fn transfer(self) {
+        self.transfer_execute_with_gas(0)
+    }
+}
diff --git a/framework/base/src/types/interaction/tx_env_sc.rs b/framework/base/src/types/interaction/tx_env_sc.rs
index 16ef20b8ab..05fa0265be 100644
--- a/framework/base/src/types/interaction/tx_env_sc.rs
+++ b/framework/base/src/types/interaction/tx_env_sc.rs
@@ -68,40 +68,3 @@ where
         gas_left
     }
 }
-
-impl<Api, From, To, Payment, Gas, FC> Tx<TxScEnv<Api>, From, To, Payment, Gas, FC, ()>
-where
-    Api: CallTypeApi,
-    From: TxFrom<TxScEnv<Api>>,
-    To: TxToSpecified<TxScEnv<Api>>,
-    Payment: TxPayment<TxScEnv<Api>>,
-    Gas: TxGas<TxScEnv<Api>>,
-    FC: TxData<TxScEnv<Api>> + Into<FunctionCall<Api>>,
-{
-    pub fn transfer_execute(self) {
-        if self.payment.is_no_payment() && self.data.is_no_call() {
-            return;
-        }
-
-        let gas_limit = self.gas.resolve_gas(&self.env);
-
-        self.to.with_value_ref(|to| {
-            self.payment
-                .perform_transfer_execute(&self.env, to, gas_limit, self.data.into());
-        });
-    }
-}
-
-impl<Api, From, To, Payment, Gas> Tx<TxScEnv<Api>, From, To, Payment, Gas, (), ()>
-where
-    Api: CallTypeApi,
-    From: TxFrom<TxScEnv<Api>>,
-    To: TxToSpecified<TxScEnv<Api>>,
-    Payment: TxPayment<TxScEnv<Api>>,
-    Gas: TxGas<TxScEnv<Api>>,
-{
-    /// Syntactic sugar, only allowed for simple transfers.
-    pub fn transfer(self) {
-        self.transfer_execute()
-    }
-}

From d8ebcf5cca385d11c5259f838bcaf8d06bbe9c6a Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 10 Nov 2023 18:07:46 +0200
Subject: [PATCH 0043/1254] unified tx sytax - test callback prototype

---
 .../tests/adder_blackbox_with_values_test.rs  |  3 +++
 framework/base/src/types/interaction/tx.rs    | 14 -------------
 framework/scenario/src/facade.rs              |  3 +++
 .../scenario/src/facade/scenario_callbacks.rs | 19 +++++++++++++++++
 .../src/facade/scenario_world_steps_tx.rs     | 21 +++++++++++++------
 framework/scenario/src/lib.rs                 |  2 +-
 6 files changed, 41 insertions(+), 21 deletions(-)
 create mode 100644 framework/scenario/src/facade/scenario_callbacks.rs

diff --git a/contracts/examples/adder/tests/adder_blackbox_with_values_test.rs b/contracts/examples/adder/tests/adder_blackbox_with_values_test.rs
index 061432c95f..62e74e77a8 100644
--- a/contracts/examples/adder/tests/adder_blackbox_with_values_test.rs
+++ b/contracts/examples/adder/tests/adder_blackbox_with_values_test.rs
@@ -48,6 +48,9 @@ fn adder_blackbox_with_values() {
             tx.from(AddressExpr("owner"))
                 .to(ScExpr("adder"))
                 .call(adder_contract.add(3u32))
+                .callback(WithTxResult(|response| {
+                    assert!(response.tx_error.is_success());
+                }))
         })
         .check_state_step(
             CheckStateStep::new()
diff --git a/framework/base/src/types/interaction/tx.rs b/framework/base/src/types/interaction/tx.rs
index e24fa6d539..b115b5e297 100644
--- a/framework/base/src/types/interaction/tx.rs
+++ b/framework/base/src/types/interaction/tx.rs
@@ -81,20 +81,6 @@ where
     }
 }
 
-// impl Default for TxBaseWithEnv<()> {
-//     #[inline]
-//     fn default() -> Self {
-//         Self::new_with_env(())
-//     }
-// }
-
-// impl TxBaseWithEnv<()> {
-//     #[inline]
-//     pub fn new() -> Self {
-//         Self::default()
-//     }
-// }
-
 impl<Env, To, Payment, Gas, Data, Callback> Tx<Env, (), To, Payment, Gas, Data, Callback>
 where
     Env: TxEnv,
diff --git a/framework/scenario/src/facade.rs b/framework/scenario/src/facade.rs
index 60fb9f4d83..b6e2eef3a8 100644
--- a/framework/scenario/src/facade.rs
+++ b/framework/scenario/src/facade.rs
@@ -1,5 +1,6 @@
 mod contract_info;
 mod debugger_backend;
+mod scenario_callbacks;
 mod scenario_world;
 mod scenario_world_runner;
 mod scenario_world_steps;
@@ -9,5 +10,7 @@ mod scenario_world_whitebox;
 mod whitebox_contract;
 
 pub use contract_info::ContractInfo;
+pub use scenario_callbacks::*;
 pub use scenario_world::ScenarioWorld;
+pub use scenario_world_steps_tx::*;
 pub use whitebox_contract::WhiteboxContract;
diff --git a/framework/scenario/src/facade/scenario_callbacks.rs b/framework/scenario/src/facade/scenario_callbacks.rs
new file mode 100644
index 0000000000..1429f7ed16
--- /dev/null
+++ b/framework/scenario/src/facade/scenario_callbacks.rs
@@ -0,0 +1,19 @@
+use multiversx_sc::types::{TxCallback, TxRunnableCallback};
+
+use crate::scenario_model::TxResponse;
+
+use super::ScenarioTxEnvironment;
+
+pub struct WithTxResult<F>(pub F)
+where
+    F: FnOnce(&TxResponse);
+
+impl<F> TxCallback<ScenarioTxEnvironment> for WithTxResult<F> where F: FnOnce(&TxResponse) {}
+impl<F> TxRunnableCallback<ScenarioTxEnvironment> for WithTxResult<F>
+where
+    F: FnOnce(&TxResponse),
+{
+    fn run_callback(self, env: &ScenarioTxEnvironment) {
+        (self.0)(env.response.as_ref().unwrap())
+    }
+}
diff --git a/framework/scenario/src/facade/scenario_world_steps_tx.rs b/framework/scenario/src/facade/scenario_world_steps_tx.rs
index 436339cde4..ad8134edca 100644
--- a/framework/scenario/src/facade/scenario_world_steps_tx.rs
+++ b/framework/scenario/src/facade/scenario_world_steps_tx.rs
@@ -2,16 +2,21 @@ use std::path::PathBuf;
 
 use multiversx_sc::types::{
     AnnotatedValue, FunctionCall, ManagedAddress, Tx, TxBaseWithEnv, TxEnv, TxFromSpecified, TxGas,
-    TxPayment, TxToSpecified,
+    TxPayment, TxRunnableCallback, TxToSpecified,
 };
 
-use crate::{api::StaticApi, facade::ScenarioWorld, scenario_model::ScCallStep};
+use crate::{
+    api::StaticApi,
+    facade::ScenarioWorld,
+    scenario_model::{ScCallStep, TxResponse},
+};
 
 #[derive(Default, Debug, Clone)]
 pub struct ScenarioTxEnvironment {
     pub context_path: PathBuf,
     pub from_annotation: Option<String>,
     pub to_annotation: Option<String>,
+    pub response: Option<TxResponse>,
 }
 
 impl TxEnv for ScenarioTxEnvironment {
@@ -68,23 +73,27 @@ impl ScenarioWorld {
     }
 }
 
-impl<From, To, Payment, Gas> ScenarioTx
-    for Tx<ScenarioTxEnvironment, From, To, Payment, Gas, FunctionCall<StaticApi>, ()>
+impl<From, To, Payment, Gas, Callback> ScenarioTx
+    for Tx<ScenarioTxEnvironment, From, To, Payment, Gas, FunctionCall<StaticApi>, Callback>
 where
     From: TxFromSpecified<ScenarioTxEnvironment>,
     To: TxToSpecified<ScenarioTxEnvironment>,
     Payment: TxPayment<ScenarioTxEnvironment>,
     Gas: TxGas<ScenarioTxEnvironment>,
+    Callback: TxRunnableCallback<ScenarioTxEnvironment>,
 {
     fn run_as_scenario_step(self, world: &mut ScenarioWorld) {
+        let mut env = self.env;
         let mut step = ScCallStep::new()
-            .from(self.env.from_annotation.unwrap().as_str())
-            .to(self.env.to_annotation.unwrap().as_str())
+            .from(env.from_annotation.as_ref().unwrap().as_str())
+            .to(env.to_annotation.as_ref().unwrap().as_str())
             .function(self.data.function_name.to_string().as_str());
         for arg in self.data.arg_buffer.iter_buffers() {
             step = step.argument(arg.to_vec());
         }
 
         world.sc_call(&mut step);
+        env.response = step.response;
+        self.callback.run_callback(&env);
     }
 }
diff --git a/framework/scenario/src/lib.rs b/framework/scenario/src/lib.rs
index d46d27fc68..17c13a2f5c 100644
--- a/framework/scenario/src/lib.rs
+++ b/framework/scenario/src/lib.rs
@@ -42,7 +42,7 @@ pub use crate::scenario as mandos_system;
 // Re-exporting the whole mandos crate for easier use in tests.
 pub use multiversx_chain_scenario_format as scenario_format;
 
-pub use facade::{ContractInfo, ScenarioWorld, WhiteboxContract};
+pub use facade::{ContractInfo, ScenarioWorld, WhiteboxContract, WithTxResult};
 
 use std::path::Path;
 

From acc071cccbe71bfebb7d755a94e0cec62f34e890 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Mon, 13 Nov 2023 16:47:03 +0200
Subject: [PATCH 0044/1254] Cargo.lock update

---
 .../wasm-forwarder-raw-init-async-call/Cargo.lock | 15 +++++++++++----
 .../wasm-forwarder-raw-init-async-call/Cargo.toml |  2 ++
 .../wasm-forwarder-raw-init-sync-call/Cargo.lock  | 15 +++++++++++----
 .../wasm-forwarder-raw-init-sync-call/Cargo.toml  |  2 ++
 .../composability/forwarder-raw/wasm/Cargo.lock   | 15 +++++++++++----
 .../composability/forwarder/wasm/Cargo.lock       | 15 +++++++++++----
 .../promises-features/wasm/Cargo.lock             | 15 +++++++++++----
 .../proxy-test-first/wasm/Cargo.lock              | 15 +++++++++++----
 .../proxy-test-second/wasm/Cargo.lock             | 15 +++++++++++----
 .../recursive-caller/wasm/Cargo.lock              | 15 +++++++++++----
 .../vault/wasm-vault-promises/Cargo.lock          | 15 +++++++++++----
 .../vault/wasm-vault-promises/Cargo.toml          |  2 ++
 .../composability/vault/wasm/Cargo.lock           | 15 +++++++++++----
 13 files changed, 116 insertions(+), 40 deletions(-)

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 bcb0c5879f..816690d047 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
@@ -14,6 +14,12 @@ dependencies = [
  "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"
@@ -61,11 +67,12 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.13.2"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
  "ahash",
+ "allocator-api2",
 ]
 
 [[package]]
@@ -76,9 +83,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-literal"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
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 9849a58667..0a9def0165 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
@@ -7,12 +7,14 @@ publish = false
 
 [lib]
 crate-type = ["cdylib"]
+
 [profile.release]
 codegen-units = 1
 opt-level = "z"
 lto = true
 debug = false
 panic = "abort"
+
 [dependencies.forwarder-raw]
 path = ".."
 
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 dfd4e61771..149c7da904 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
@@ -14,6 +14,12 @@ dependencies = [
  "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"
@@ -61,11 +67,12 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.13.2"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
  "ahash",
+ "allocator-api2",
 ]
 
 [[package]]
@@ -76,9 +83,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-literal"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
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 89f31d4bc4..b75eb233f9 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
@@ -7,12 +7,14 @@ publish = false
 
 [lib]
 crate-type = ["cdylib"]
+
 [profile.release]
 codegen-units = 1
 opt-level = "z"
 lto = true
 debug = false
 panic = "abort"
+
 [dependencies.forwarder-raw]
 path = ".."
 
diff --git a/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.lock
index ae1f0bc48f..bbdfcb9486 100755
--- a/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.lock
@@ -14,6 +14,12 @@ dependencies = [
  "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"
@@ -61,11 +67,12 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.13.2"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
  "ahash",
+ "allocator-api2",
 ]
 
 [[package]]
@@ -76,9 +83,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-literal"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
diff --git a/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock
index 332a8282e2..4a79fcb7d4 100755
--- a/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock
@@ -14,6 +14,12 @@ dependencies = [
  "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"
@@ -62,11 +68,12 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.13.2"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
  "ahash",
+ "allocator-api2",
 ]
 
 [[package]]
@@ -77,9 +84,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-literal"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
diff --git a/contracts/feature-tests/composability/promises-features/wasm/Cargo.lock b/contracts/feature-tests/composability/promises-features/wasm/Cargo.lock
index 3a6526a6b2..1b7b2b5a66 100644
--- a/contracts/feature-tests/composability/promises-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/promises-features/wasm/Cargo.lock
@@ -14,6 +14,12 @@ dependencies = [
  "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"
@@ -46,11 +52,12 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.13.2"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
  "ahash",
+ "allocator-api2",
 ]
 
 [[package]]
@@ -61,9 +68,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-literal"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
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 c6c817c156..54c856f14b 100755
--- a/contracts/feature-tests/composability/proxy-test-first/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/proxy-test-first/wasm/Cargo.lock
@@ -14,6 +14,12 @@ dependencies = [
  "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"
@@ -46,11 +52,12 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.13.2"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
  "ahash",
+ "allocator-api2",
 ]
 
 [[package]]
@@ -61,9 +68,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-literal"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
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 2252a3249c..fc72c66d49 100755
--- a/contracts/feature-tests/composability/proxy-test-second/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/proxy-test-second/wasm/Cargo.lock
@@ -14,6 +14,12 @@ dependencies = [
  "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"
@@ -46,11 +52,12 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.13.2"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
  "ahash",
+ "allocator-api2",
 ]
 
 [[package]]
@@ -61,9 +68,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-literal"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
diff --git a/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.lock b/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.lock
index 06a99b5731..384c5d024c 100755
--- a/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.lock
@@ -14,6 +14,12 @@ dependencies = [
  "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"
@@ -46,11 +52,12 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.13.2"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
  "ahash",
+ "allocator-api2",
 ]
 
 [[package]]
@@ -61,9 +68,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-literal"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
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 22133c868e..09da7d4c35 100644
--- a/contracts/feature-tests/composability/vault/wasm-vault-promises/Cargo.lock
+++ b/contracts/feature-tests/composability/vault/wasm-vault-promises/Cargo.lock
@@ -14,6 +14,12 @@ dependencies = [
  "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"
@@ -46,11 +52,12 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.13.2"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
  "ahash",
+ "allocator-api2",
 ]
 
 [[package]]
@@ -61,9 +68,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-literal"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
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 ce3f2a30b2..8e446dda29 100644
--- a/contracts/feature-tests/composability/vault/wasm-vault-promises/Cargo.toml
+++ b/contracts/feature-tests/composability/vault/wasm-vault-promises/Cargo.toml
@@ -7,12 +7,14 @@ publish = false
 
 [lib]
 crate-type = ["cdylib"]
+
 [profile.release]
 codegen-units = 1
 opt-level = "z"
 lto = true
 debug = false
 panic = "abort"
+
 [dependencies.vault]
 path = ".."
 
diff --git a/contracts/feature-tests/composability/vault/wasm/Cargo.lock b/contracts/feature-tests/composability/vault/wasm/Cargo.lock
index 1ac6d18dda..9ddce778f8 100755
--- a/contracts/feature-tests/composability/vault/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/vault/wasm/Cargo.lock
@@ -14,6 +14,12 @@ dependencies = [
  "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"
@@ -46,11 +52,12 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.13.2"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
  "ahash",
+ "allocator-api2",
 ]
 
 [[package]]
@@ -61,9 +68,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-literal"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"

From 109c0c9f791588d466981ca3d711a5ef50eb43b1 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Mon, 13 Nov 2023 19:35:49 +0200
Subject: [PATCH 0045/1254] callback log fix

---
 vm/src/tx_mock/tx_async_call_data.rs | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/vm/src/tx_mock/tx_async_call_data.rs b/vm/src/tx_mock/tx_async_call_data.rs
index d332643272..225e9afa1d 100644
--- a/vm/src/tx_mock/tx_async_call_data.rs
+++ b/vm/src/tx_mock/tx_async_call_data.rs
@@ -42,6 +42,15 @@ fn result_status_bytes(result_status: u64) -> Vec<u8> {
     }
 }
 
+fn real_recipient(
+    async_data: &AsyncCallTxData,
+    builtin_functions: &BuiltinFunctionContainer,
+) -> VMAddress {
+    let tx_input = async_call_tx_input(async_data, CallType::AsyncCall);
+    let transfers = builtin_functions.extract_token_transfers(&tx_input);
+    transfers.real_recipient
+}
+
 pub fn async_callback_tx_input(
     async_data: &AsyncCallTxData,
     async_result: &TxResult,
@@ -56,7 +65,7 @@ pub fn async_callback_tx_input(
     let callback_payments =
         extract_callback_payments(&async_data.from, async_result, builtin_functions);
     TxInput {
-        from: async_data.to.clone(),
+        from: real_recipient(async_data, builtin_functions),
         to: async_data.from.clone(),
         egld_value: 0u32.into(),
         esdt_values: Vec::new(),

From 07642df7bedfb644e441ed6c1ffc26930468ab6d Mon Sep 17 00:00:00 2001
From: Alin Cruceat <alyn_509@yahoo.com>
Date: Tue, 14 Nov 2023 14:18:16 +0200
Subject: [PATCH 0046/1254] stress test on submit

---
 .../scenarios/stress_submit_test.scen.json    | 2367 ++++++++++++++++
 ...ss_submit_with_gas_schedule_test.scen.json | 2370 +++++++++++++++++
 .../price_aggregator_scenario_go_test.rs      |   10 +
 .../tests/price_aggregator_stress_blackbox.rs |  223 ++
 4 files changed, 4970 insertions(+)
 create mode 100644 contracts/core/price-aggregator/scenarios/stress_submit_test.scen.json
 create mode 100644 contracts/core/price-aggregator/scenarios/stress_submit_with_gas_schedule_test.scen.json
 create mode 100644 contracts/core/price-aggregator/tests/price_aggregator_scenario_go_test.rs
 create mode 100644 contracts/core/price-aggregator/tests/price_aggregator_stress_blackbox.rs

diff --git a/contracts/core/price-aggregator/scenarios/stress_submit_test.scen.json b/contracts/core/price-aggregator/scenarios/stress_submit_test.scen.json
new file mode 100644
index 0000000000..95dba5d2f4
--- /dev/null
+++ b/contracts/core/price-aggregator/scenarios/stress_submit_test.scen.json
@@ -0,0 +1,2367 @@
+{
+    "steps": [
+        {
+            "step": "setState",
+            "accounts": {
+                "address:oracle1": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle10": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle11": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle12": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle13": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle14": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle15": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle16": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle17": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle18": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle19": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle2": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle20": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle21": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle22": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle23": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle24": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle25": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle26": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle27": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle28": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle29": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle3": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle30": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle31": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle32": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle33": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle34": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle35": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle36": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle37": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle38": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle39": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle4": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle40": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle41": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle42": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle43": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle44": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle45": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle46": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle47": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle48": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle49": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle5": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle50": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle51": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle52": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle53": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle54": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle55": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle6": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle7": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle8": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle9": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:owner": {
+                    "nonce": "1"
+                }
+            },
+            "newAddresses": [
+                {
+                    "creatorAddress": "address:owner",
+                    "creatorNonce": "1",
+                    "newAddress": "sc:price-aggregator"
+                }
+            ],
+            "currentBlockInfo": {
+                "blockTimestamp": "100"
+            }
+        },
+        {
+            "step": "scDeploy",
+            "id": "",
+            "tx": {
+                "from": "address:owner",
+                "contractCode": "file:output/multiversx-price-aggregator-sc.wasm",
+                "arguments": [
+                    "0x45474c44",
+                    "0x14",
+                    "0x0a",
+                    "0x32",
+                    "0x32",
+                    "0x6f7261636c65315f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c65325f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c65335f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c65345f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c65355f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c65365f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c65375f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c65385f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c65395f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6531305f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6531315f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6531325f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6531335f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6531345f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6531355f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6531365f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6531375f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6531385f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6531395f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6532305f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6532315f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6532325f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6532335f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6532345f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6532355f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6532365f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6532375f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6532385f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6532395f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6533305f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6533315f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6533325f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6533335f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6533345f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6533355f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6533365f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6533375f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6533385f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6533395f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6534305f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6534315f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6534325f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6534335f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6534345f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6534355f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6534365f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6534375f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6534385f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6534395f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6535305f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6535315f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6535325f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6535335f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6535345f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6535355f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f"
+                ],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle1",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle2",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle3",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle4",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle5",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle6",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle7",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle8",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle9",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle10",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle11",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle12",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle13",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle14",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle15",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle16",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle17",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle18",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle19",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle20",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle21",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle22",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle23",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle24",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle25",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle26",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle27",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle28",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle29",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle30",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle31",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle32",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle33",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle34",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle35",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle36",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle37",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle38",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle39",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle40",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle41",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle42",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle43",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle44",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle45",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle46",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle47",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle48",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle49",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle50",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle51",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle52",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle53",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle54",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle55",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:owner",
+                "to": "sc:price-aggregator",
+                "function": "setPairDecimals",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x"
+                ],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:owner",
+                "to": "sc:price-aggregator",
+                "function": "unpause",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle1",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x5f",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle2",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle3",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle4",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle5",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle6",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle7",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle8",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle9",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle10",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle11",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle12",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle13",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle14",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle15",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle16",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle17",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle18",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle19",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle20",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle21",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle22",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle23",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle24",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle25",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle26",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle27",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle28",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle29",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle30",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle31",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle32",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle33",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle34",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle35",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle36",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle37",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle38",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle39",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle40",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle41",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle42",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle43",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle44",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle45",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle46",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle47",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle48",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle49",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "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
new file mode 100644
index 0000000000..c877422dfa
--- /dev/null
+++ b/contracts/core/price-aggregator/scenarios/stress_submit_with_gas_schedule_test.scen.json
@@ -0,0 +1,2370 @@
+{
+    "name": "stress-submit-with-gas-schedule",
+    "traceGas": true,
+    "gasSchedule": "v4",
+    "steps": [
+        {
+            "step": "setState",
+            "accounts": {
+                "address:oracle1": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle10": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle11": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle12": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle13": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle14": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle15": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle16": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle17": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle18": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle19": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle2": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle20": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle21": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle22": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle23": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle24": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle25": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle26": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle27": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle28": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle29": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle3": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle30": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle31": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle32": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle33": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle34": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle35": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle36": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle37": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle38": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle39": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle4": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle40": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle41": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle42": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle43": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle44": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle45": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle46": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle47": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle48": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle49": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle5": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle50": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle51": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle52": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle53": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle54": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle55": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle6": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle7": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle8": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle9": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:owner": {
+                    "nonce": "1"
+                }
+            },
+            "newAddresses": [
+                {
+                    "creatorAddress": "address:owner",
+                    "creatorNonce": "1",
+                    "newAddress": "sc:price-aggregator"
+                }
+            ],
+            "currentBlockInfo": {
+                "blockTimestamp": "100"
+            }
+        },
+        {
+            "step": "scDeploy",
+            "id": "",
+            "tx": {
+                "from": "address:owner",
+                "contractCode": "file:output/multiversx-price-aggregator-sc.wasm",
+                "arguments": [
+                    "0x45474c44",
+                    "0x14",
+                    "0x0a",
+                    "0x32",
+                    "0x32",
+                    "0x6f7261636c65315f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c65325f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c65335f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c65345f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c65355f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c65365f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c65375f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c65385f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c65395f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6531305f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6531315f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6531325f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6531335f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6531345f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6531355f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6531365f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6531375f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6531385f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6531395f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6532305f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6532315f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6532325f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6532335f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6532345f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6532355f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6532365f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6532375f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6532385f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6532395f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6533305f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6533315f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6533325f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6533335f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6533345f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6533355f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6533365f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6533375f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6533385f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6533395f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6534305f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6534315f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6534325f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6534335f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6534345f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6534355f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6534365f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6534375f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6534385f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6534395f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6535305f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6535315f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6535325f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6535335f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6535345f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6535355f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f"
+                ],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle1",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle2",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle3",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle4",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle5",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle6",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle7",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle8",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle9",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle10",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle11",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle12",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle13",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle14",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle15",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle16",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle17",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle18",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle19",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle20",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle21",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle22",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle23",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle24",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle25",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle26",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle27",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle28",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle29",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle30",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle31",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle32",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle33",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle34",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle35",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle36",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle37",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle38",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle39",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle40",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle41",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle42",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle43",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle44",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle45",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle46",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle47",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle48",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle49",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle50",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle51",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle52",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle53",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle54",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle55",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:owner",
+                "to": "sc:price-aggregator",
+                "function": "setPairDecimals",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x"
+                ],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:owner",
+                "to": "sc:price-aggregator",
+                "function": "unpause",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle1",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x5f",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle2",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle3",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle4",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle5",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle6",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle7",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle8",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle9",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle10",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle11",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle12",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle13",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle14",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle15",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle16",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle17",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle18",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle19",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle20",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle21",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle22",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle23",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle24",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle25",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle26",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle27",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle28",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle29",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle30",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle31",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle32",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle33",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle34",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle35",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle36",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle37",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle38",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle39",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle40",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle41",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle42",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle43",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle44",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle45",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle46",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle47",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle48",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle49",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        }
+    ]
+}
diff --git a/contracts/core/price-aggregator/tests/price_aggregator_scenario_go_test.rs b/contracts/core/price-aggregator/tests/price_aggregator_scenario_go_test.rs
new file mode 100644
index 0000000000..659f0f4f45
--- /dev/null
+++ b/contracts/core/price-aggregator/tests/price_aggregator_scenario_go_test.rs
@@ -0,0 +1,10 @@
+use multiversx_sc_scenario::*;
+
+fn world() -> ScenarioWorld {
+    ScenarioWorld::vm_go()
+}
+
+#[test]
+fn price_aggregator_stress_submit_go() {
+    world().run("scenarios/stress_submit_with_test.scen.json");
+}
diff --git a/contracts/core/price-aggregator/tests/price_aggregator_stress_blackbox.rs b/contracts/core/price-aggregator/tests/price_aggregator_stress_blackbox.rs
new file mode 100644
index 0000000000..ad968e19f0
--- /dev/null
+++ b/contracts/core/price-aggregator/tests/price_aggregator_stress_blackbox.rs
@@ -0,0 +1,223 @@
+use multiversx_price_aggregator_sc::{
+    price_aggregator_data::{OracleStatus, TokenPair},
+    ContractObj, PriceAggregator, ProxyTrait as _,
+};
+use multiversx_sc::{
+    codec::multi_types::MultiValueVec, contract_base::ContractBase,
+    types::EgldOrEsdtTokenIdentifier,
+};
+use multiversx_sc_modules::{pause::ProxyTrait, staking::ProxyTrait as _};
+use multiversx_sc_scenario::{
+    api::StaticApi,
+    managed_address, managed_biguint, managed_buffer,
+    scenario_model::{Account, AddressValue, ScCallStep, ScDeployStep, SetStateStep, TxExpect},
+    ContractInfo, DebugApi, ScenarioWorld, WhiteboxContract,
+};
+
+const DECIMALS: u8 = 0;
+const EGLD_TICKER: &[u8] = b"EGLD";
+const NR_ORACLES: usize = 55;
+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 SLASH_AMOUNT: u64 = 10;
+const SLASH_QUORUM: usize = 50;
+const STAKE_AMOUNT: u64 = 20;
+const SUBMISSION_COUNT: usize = 50;
+const USD_TICKER: &[u8] = b"USDC";
+
+type PriceAggregatorContract = ContractInfo<multiversx_price_aggregator_sc::Proxy<StaticApi>>;
+
+fn world() -> ScenarioWorld {
+    let mut blockchain = ScenarioWorld::new();
+
+    blockchain.set_current_dir_from_workspace("contracts/core/price-aggregator");
+    blockchain.register_contract(
+        PRICE_AGGREGATOR_PATH_EXPR,
+        multiversx_price_aggregator_sc::ContractBuilder,
+    );
+
+    blockchain
+}
+
+struct PriceAggregatorTestState {
+    world: ScenarioWorld,
+    oracles: Vec<AddressValue>,
+    price_aggregator_contract: PriceAggregatorContract,
+    price_aggregator_whitebox: WhiteboxContract<ContractObj<DebugApi>>,
+}
+
+impl PriceAggregatorTestState {
+    fn new() -> Self {
+        let mut world = world();
+
+        let mut set_state_step = SetStateStep::new()
+            .put_account(OWNER_ADDRESS_EXPR, Account::new().nonce(1))
+            .new_address(OWNER_ADDRESS_EXPR, 1, PRICE_AGGREGATOR_ADDRESS_EXPR)
+            .block_timestamp(100);
+
+        let mut oracles = Vec::new();
+        for i in 1..=NR_ORACLES {
+            let address_expr = format!("address:oracle{}", i);
+            let address_value = AddressValue::from(address_expr.as_str());
+
+            set_state_step = set_state_step.put_account(
+                address_expr.as_str(),
+                Account::new().nonce(1).balance(STAKE_AMOUNT),
+            );
+
+            oracles.push(address_value);
+        }
+        world.start_trace().set_state_step(set_state_step);
+
+        let price_aggregator_contract = PriceAggregatorContract::new(PRICE_AGGREGATOR_ADDRESS_EXPR);
+        let price_aggregator_whitebox = WhiteboxContract::new(
+            PRICE_AGGREGATOR_ADDRESS_EXPR,
+            multiversx_price_aggregator_sc::contract_obj,
+        );
+
+        Self {
+            world,
+            oracles,
+            price_aggregator_contract,
+            price_aggregator_whitebox,
+        }
+    }
+
+    fn deploy(&mut self) -> &mut Self {
+        let price_aggregator_code = self.world.code_expression(PRICE_AGGREGATOR_PATH_EXPR);
+
+        let oracles = MultiValueVec::from(
+            self.oracles
+                .iter()
+                .map(|oracle| oracle.to_address())
+                .collect::<Vec<_>>(),
+        );
+
+        self.world.sc_deploy(
+            ScDeployStep::new()
+                .from(OWNER_ADDRESS_EXPR)
+                .code(price_aggregator_code)
+                .call(self.price_aggregator_contract.init(
+                    EgldOrEsdtTokenIdentifier::egld(),
+                    STAKE_AMOUNT,
+                    SLASH_AMOUNT,
+                    SLASH_QUORUM,
+                    SUBMISSION_COUNT,
+                    oracles,
+                )),
+        );
+
+        for address in self.oracles.iter() {
+            self.world.sc_call(
+                ScCallStep::new()
+                    .from(address)
+                    .egld_value(STAKE_AMOUNT)
+                    .call(self.price_aggregator_contract.stake()),
+            );
+        }
+
+        self
+    }
+
+    fn set_pair_decimals(&mut self) {
+        self.world.sc_call(
+            ScCallStep::new().from(OWNER_ADDRESS_EXPR).call(
+                self.price_aggregator_contract
+                    .set_pair_decimals(EGLD_TICKER, USD_TICKER, DECIMALS),
+            ),
+        );
+    }
+
+    fn unpause_endpoint(&mut self) {
+        self.world.sc_call(
+            ScCallStep::new()
+                .from(OWNER_ADDRESS_EXPR)
+                .call(self.price_aggregator_contract.unpause_endpoint()),
+        );
+    }
+
+    fn submit(&mut self, from: &AddressValue, submission_timestamp: u64, price: u64) {
+        self.world.sc_call(
+            ScCallStep::new()
+                .from(from)
+                .call(self.price_aggregator_contract.submit(
+                    EGLD_TICKER,
+                    USD_TICKER,
+                    submission_timestamp,
+                    price,
+                    DECIMALS,
+                ))
+                .expect(TxExpect::ok()),
+        );
+    }
+}
+
+#[test]
+fn test_price_aggregator_submit() {
+    let mut state = PriceAggregatorTestState::new();
+    state.deploy();
+
+    // configure the number of decimals
+    state.set_pair_decimals();
+
+    // unpause
+    state.unpause_endpoint();
+
+    state.submit(&state.oracles[0].clone(), 95, 100);
+
+    // submit ok
+    for index in 1..49 {
+        state.submit(&state.oracles[index].clone(), 100, 100);
+    }
+
+    let current_timestamp = 100;
+    state
+        .world
+        .whitebox_query(&state.price_aggregator_whitebox, |sc| {
+            let blockchain_timestamp = sc.blockchain().get_block_timestamp();
+
+            let token_pair = TokenPair {
+                from: managed_buffer!(EGLD_TICKER),
+                to: managed_buffer!(USD_TICKER),
+            };
+            assert_eq!(blockchain_timestamp, current_timestamp);
+
+            let submission_count = sc.submission_count().get();
+
+            assert_eq!(submission_count, 50);
+            assert_eq!(
+                sc.first_submission_timestamp(&token_pair).get(),
+                current_timestamp
+            );
+            assert_eq!(
+                sc.last_submission_timestamp(&token_pair).get(),
+                current_timestamp
+            );
+
+            let submissions = sc.submissions().get(&token_pair).unwrap();
+            assert_eq!(submissions.len(), 49);
+
+            for index in 0..49 {
+                assert_eq!(
+                    submissions
+                        .get(&managed_address!(&state.oracles[index].to_address()))
+                        .unwrap(),
+                    managed_biguint!(100)
+                );
+
+                assert_eq!(
+                    sc.oracle_status()
+                        .get(&managed_address!(&state.oracles[index].to_address()))
+                        .unwrap(),
+                    OracleStatus {
+                        total_submissions: 1,
+                        accepted_submissions: 1
+                    }
+                );
+            }
+        });
+    state
+        .world
+        .write_scenario_trace("scenarios/stress_submit_test.scen.json");
+}

From 8f56db585b588b50cb53070498cd1cae191c0bed Mon Sep 17 00:00:00 2001
From: Alin Cruceat <alyn_509@yahoo.com>
Date: Tue, 14 Nov 2023 14:36:32 +0200
Subject: [PATCH 0047/1254] fix test

---
 .../price-aggregator/tests/price_aggregator_scenario_go_test.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contracts/core/price-aggregator/tests/price_aggregator_scenario_go_test.rs b/contracts/core/price-aggregator/tests/price_aggregator_scenario_go_test.rs
index 659f0f4f45..87df4169f3 100644
--- a/contracts/core/price-aggregator/tests/price_aggregator_scenario_go_test.rs
+++ b/contracts/core/price-aggregator/tests/price_aggregator_scenario_go_test.rs
@@ -6,5 +6,5 @@ fn world() -> ScenarioWorld {
 
 #[test]
 fn price_aggregator_stress_submit_go() {
-    world().run("scenarios/stress_submit_with_test.scen.json");
+    world().run("scenarios/stress_submit_with_gas_schedule_test.scen.json");
 }

From 72bf63dc0a138a3d92cc21720943247f4027a45a Mon Sep 17 00:00:00 2001
From: Alin Cruceat <alyn_509@yahoo.com>
Date: Tue, 14 Nov 2023 14:50:25 +0200
Subject: [PATCH 0048/1254] update contractCode file location

---
 .../price-aggregator/scenarios/stress_submit_test.scen.json     | 2 +-
 .../scenarios/stress_submit_with_gas_schedule_test.scen.json    | 2 +-
 2 files changed, 2 insertions(+), 2 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 95dba5d2f4..7e07e93962 100644
--- a/contracts/core/price-aggregator/scenarios/stress_submit_test.scen.json
+++ b/contracts/core/price-aggregator/scenarios/stress_submit_test.scen.json
@@ -243,7 +243,7 @@
             "id": "",
             "tx": {
                 "from": "address:owner",
-                "contractCode": "file:output/multiversx-price-aggregator-sc.wasm",
+                "contractCode": "file:../output/multiversx-price-aggregator-sc.wasm",
                 "arguments": [
                     "0x45474c44",
                     "0x14",
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 c877422dfa..99e795593a 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
@@ -246,7 +246,7 @@
             "id": "",
             "tx": {
                 "from": "address:owner",
-                "contractCode": "file:output/multiversx-price-aggregator-sc.wasm",
+                "contractCode": "file:../output/multiversx-price-aggregator-sc.wasm",
                 "arguments": [
                     "0x45474c44",
                     "0x14",

From 6435c27138626e5512d1818c9ae02ef51aac795e Mon Sep 17 00:00:00 2001
From: Alin Cruceat <alyn_509@yahoo.com>
Date: Tue, 14 Nov 2023 14:53:45 +0200
Subject: [PATCH 0049/1254] blackbox path fix

---
 .../price-aggregator/tests/price_aggregator_stress_blackbox.rs  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 ad968e19f0..d730b281f9 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 = 55;
 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 = "file:../output/multiversx-price-aggregator-sc.wasm";
 const SLASH_AMOUNT: u64 = 10;
 const SLASH_QUORUM: usize = 50;
 const STAKE_AMOUNT: u64 = 20;

From 59ccc827298a5e10f5282eb1e30bc3fa7bf39122 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 14 Nov 2023 16:51:27 +0200
Subject: [PATCH 0050/1254] sync back-transfers & logs

---
 vm/src/tx_mock/tx_back_transfers.rs     | 40 +++++++++++++++++++++----
 vm/src/tx_mock/tx_input_call_type.rs    |  2 ++
 vm/src/vm_hooks/vh_impl/vh_debug_api.rs | 24 ++++++++++++++-
 3 files changed, 59 insertions(+), 7 deletions(-)

diff --git a/vm/src/tx_mock/tx_back_transfers.rs b/vm/src/tx_mock/tx_back_transfers.rs
index 4be32f05f3..c5d9b0ea6d 100644
--- a/vm/src/tx_mock/tx_back_transfers.rs
+++ b/vm/src/tx_mock/tx_back_transfers.rs
@@ -1,6 +1,8 @@
 use num_bigint::BigUint;
 
-use super::{TxResult, TxTokenTransfer};
+use crate::{tx_execution::BuiltinFunctionContainer, types::VMAddress};
+
+use super::{async_call_tx_input, CallType, TxResult, TxTokenTransfer};
 
 #[derive(Default)]
 pub struct BackTransfers {
@@ -9,16 +11,42 @@ pub struct BackTransfers {
 }
 
 impl BackTransfers {
-    pub fn append_from_result(&mut self, result: &TxResult) {
+    pub fn empty() -> Self {
+        BackTransfers::default()
+    }
+
+    pub fn new_from_result(
+        own_address: &VMAddress,
+        result: &TxResult,
+        builtin_functions: &BuiltinFunctionContainer,
+    ) -> Self {
+        let mut bt = BackTransfers::default();
+
         if result.result_status != 0 {
-            return;
+            return bt;
         }
 
-        for call in &result.all_calls {}
+        for call in &result.all_calls {
+            // TODO: refactor, check type
+
+            if call.endpoint_name.is_empty() {
+                bt.call_value += &call.call_value;
+                continue;
+            }
+
+            let tx_input = async_call_tx_input(call, CallType::BackTransfer);
+            let mut token_transfers = builtin_functions.extract_token_transfers(&tx_input);
+            if &token_transfers.real_recipient == own_address {
+                bt.esdt_transfers.append(&mut token_transfers.transfers);
+            }
+        }
+
+        bt
     }
 
-    pub fn empty() -> Self {
-        BackTransfers::default()
+    pub fn merge(&mut self, other: &BackTransfers) {
+        self.call_value += &other.call_value;
+        self.esdt_transfers.extend_from_slice(&other.esdt_transfers);
     }
 }
 
diff --git a/vm/src/tx_mock/tx_input_call_type.rs b/vm/src/tx_mock/tx_input_call_type.rs
index 7a95281589..1e2020aa50 100644
--- a/vm/src/tx_mock/tx_input_call_type.rs
+++ b/vm/src/tx_mock/tx_input_call_type.rs
@@ -5,6 +5,7 @@ pub enum CallType {
     AsyncCall,
     AsyncCallback,
     TransferExecute,
+    BackTransfer,
 }
 
 impl CallType {
@@ -19,6 +20,7 @@ impl CallType {
             Self::AsyncCall => "AsyncCall",
             Self::AsyncCallback => "AsyncCallback",
             Self::TransferExecute => "TransferAndExecute",
+            Self::BackTransfer => "BackTransfer",
         }
     }
 }
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 1947f33e7b..ac002ee99a 100644
--- a/vm/src/vm_hooks/vh_impl/vh_debug_api.rs
+++ b/vm/src/vm_hooks/vh_impl/vh_debug_api.rs
@@ -183,7 +183,11 @@ impl VMHooksHandlerSource for DebugApiVMHooksHandler {
         arguments: Vec<Vec<u8>>,
     ) {
         let async_call_data = self.create_async_call_data(to, egld_value, func_name, arguments);
-        let tx_input = async_call_tx_input(&async_call_data, CallType::DirectCall);
+        let mut tx_input = async_call_tx_input(&async_call_data, CallType::DirectCall);
+        if self.is_back_transfer(&tx_input) {
+            tx_input.call_type = CallType::BackTransfer;
+        }
+
         let tx_cache = TxCache::new(self.0.blockchain_cache_arc());
         let (tx_result, blockchain_updates) = self.0.vm_ref.execute_builtin_function_or_default(
             tx_input,
@@ -232,6 +236,13 @@ impl DebugApiVMHooksHandler {
 
         self.0.result_lock().merge_after_sync_call(&tx_result);
 
+        let contract_address = &self.0.input_ref().to;
+        let builtin_functions = &self.0.vm_ref.builtin_functions;
+        let current_back_transfers =
+            BackTransfers::new_from_result(contract_address, &tx_result, builtin_functions);
+
+        self.back_transfers_lock().merge(&current_back_transfers);
+
         tx_result.result_values
     }
 
@@ -240,6 +251,17 @@ impl DebugApiVMHooksHandler {
             self.vm_error("cannot write to storage under reserved key");
         }
     }
+
+    fn is_back_transfer(&self, tx_input: &TxInput) -> bool {
+        let caller_address = &self.0.input_ref().from;
+        if !caller_address.is_smart_contract_address() {
+            return false;
+        }
+
+        let builtin_functions = &self.0.vm_ref.builtin_functions;
+        let token_transfers = builtin_functions.extract_token_transfers(tx_input);
+        &token_transfers.real_recipient == caller_address
+    }
 }
 
 impl VMHooksBigInt for DebugApiVMHooksHandler {}

From 6a72124c8dc79bbca12df8b82832fb8694da46e4 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 14 Nov 2023 20:13:41 +0200
Subject: [PATCH 0051/1254] callback payment log fix

---
 vm/src/tx_execution/exec_general_tx.rs | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/vm/src/tx_execution/exec_general_tx.rs b/vm/src/tx_execution/exec_general_tx.rs
index f2c76bdafb..26ca1a01ee 100644
--- a/vm/src/tx_execution/exec_general_tx.rs
+++ b/vm/src/tx_execution/exec_general_tx.rs
@@ -28,6 +28,13 @@ fn should_execute_sc_call(tx_input: &TxInput) -> bool {
 }
 
 fn should_add_transfer_value_log(tx_input: &TxInput) -> bool {
+    if tx_input.call_type == CallType::AsyncCallback
+        && !tx_input.callback_payments.esdt_values.is_empty()
+    {
+        // edge case in the VM
+        return false;
+    }
+
     if tx_input.call_type != CallType::DirectCall {
         return true;
     }
@@ -43,13 +50,16 @@ fn create_transfer_value_log(tx_input: &TxInput) -> TxLog {
     ];
     data.append(&mut tx_input.args.clone());
 
+    let egld_value = if tx_input.call_type == CallType::AsyncCallback {
+        &tx_input.callback_payments.egld_value
+    } else {
+        &tx_input.egld_value
+    };
+
     TxLog {
         address: tx_input.from.clone(),
         endpoint: "transferValueOnly".into(),
-        topics: vec![
-            top_encode_big_uint(&tx_input.egld_value),
-            tx_input.to.to_vec(),
-        ],
+        topics: vec![top_encode_big_uint(egld_value), tx_input.to.to_vec()],
         data,
     }
 }

From fe28f2cb8648cfc02260d89cbcfddcbe60a080ad Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 14 Nov 2023 20:15:23 +0200
Subject: [PATCH 0052/1254] clippy fix

---
 .../transfer/esdt_multi_transfer_mock.rs              | 11 ++++++-----
 .../transfer/esdt_transfer_mock.rs                    | 11 ++++++-----
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/vm/src/tx_execution/builtin_function_mocks/transfer/esdt_multi_transfer_mock.rs b/vm/src/tx_execution/builtin_function_mocks/transfer/esdt_multi_transfer_mock.rs
index 7279d69a7d..183819f372 100644
--- a/vm/src/tx_execution/builtin_function_mocks/transfer/esdt_multi_transfer_mock.rs
+++ b/vm/src/tx_execution/builtin_function_mocks/transfer/esdt_multi_transfer_mock.rs
@@ -63,11 +63,12 @@ fn build_log(tx_input: &TxInput, call: &ParsedTransferBuiltinFunCall) -> TxLog {
     push_transfer_bytes(&call.raw_esdt_transfers, &mut topics);
     topics.push(call.destination.to_vec());
 
-    let mut data = Vec::new();
-    data.push(call_type.to_log_bytes());
-    data.push(ESDT_MULTI_TRANSFER_FUNC_NAME.into());
-    data.push(call.destination.to_vec());
-    data.push(top_encode_u64(call.raw_esdt_transfers.len() as u64));
+    let mut data = vec![
+        call_type.to_log_bytes(),
+        ESDT_MULTI_TRANSFER_FUNC_NAME.into(),
+        call.destination.to_vec(),
+        top_encode_u64(call.raw_esdt_transfers.len() as u64),
+    ];
     push_transfer_bytes(&call.raw_esdt_transfers, &mut data);
     push_func_name_if_necessary(call_type, &call.func_name, &mut data);
 
diff --git a/vm/src/tx_execution/builtin_function_mocks/transfer/esdt_transfer_mock.rs b/vm/src/tx_execution/builtin_function_mocks/transfer/esdt_transfer_mock.rs
index 48958e5bff..8f5a912a2a 100644
--- a/vm/src/tx_execution/builtin_function_mocks/transfer/esdt_transfer_mock.rs
+++ b/vm/src/tx_execution/builtin_function_mocks/transfer/esdt_transfer_mock.rs
@@ -59,11 +59,12 @@ fn build_log(tx_input: &TxInput, call: &ParsedTransferBuiltinFunCall) -> TxLog {
     push_transfer_bytes(&call.raw_esdt_transfers, &mut topics);
     topics.push(call.destination.to_vec());
 
-    let mut data = Vec::new();
-    data.push(call_type.to_log_bytes());
-    data.push(ESDT_TRANSFER_FUNC_NAME.into());
-    data.push(call.raw_esdt_transfers[0].token_identifier.clone());
-    data.push(call.raw_esdt_transfers[0].value_bytes.clone());
+    let mut data = vec![
+        call_type.to_log_bytes(),
+        ESDT_TRANSFER_FUNC_NAME.into(),
+        call.raw_esdt_transfers[0].token_identifier.clone(),
+        call.raw_esdt_transfers[0].value_bytes.clone(),
+    ];
     push_func_name_if_necessary(call_type, &call.func_name, &mut data);
 
     TxLog {

From 95a1c2192df98263fe9e61a53eb50adef04767d1 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 15 Nov 2023 10:17:56 +0200
Subject: [PATCH 0053/1254] log fix

---
 vm/src/vm_hooks/vh_impl/vh_debug_api.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 ac002ee99a..4c725b3992 100644
--- a/vm/src/vm_hooks/vh_impl/vh_debug_api.rs
+++ b/vm/src/vm_hooks/vh_impl/vh_debug_api.rs
@@ -183,7 +183,7 @@ impl VMHooksHandlerSource for DebugApiVMHooksHandler {
         arguments: Vec<Vec<u8>>,
     ) {
         let async_call_data = self.create_async_call_data(to, egld_value, func_name, arguments);
-        let mut tx_input = async_call_tx_input(&async_call_data, CallType::DirectCall);
+        let mut tx_input = async_call_tx_input(&async_call_data, CallType::TransferExecute);
         if self.is_back_transfer(&tx_input) {
             tx_input.call_type = CallType::BackTransfer;
         }

From 86dd1c77c8734ed7bada46a1d8e180c6bade6c45 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 15 Nov 2023 11:05:14 +0200
Subject: [PATCH 0054/1254] fixed get_esdt_token_data for missing account

---
 vm/src/tx_mock/tx_cache.rs                  | 19 ++++--
 vm/src/tx_mock/tx_context.rs                |  8 +++
 vm/src/vm_hooks/vh_handler/vh_blockchain.rs | 75 +++++++++------------
 vm/src/vm_hooks/vh_impl/vh_debug_api.rs     |  5 +-
 vm/src/vm_hooks/vh_impl/vh_single_tx_api.rs |  4 +-
 vm/src/vm_hooks/vh_impl/vh_static_api.rs    |  2 +-
 vm/src/vm_hooks/vh_source.rs                |  3 +-
 7 files changed, 64 insertions(+), 52 deletions(-)

diff --git a/vm/src/tx_mock/tx_cache.rs b/vm/src/tx_mock/tx_cache.rs
index a52fc998f5..6f7c73f17f 100644
--- a/vm/src/tx_mock/tx_cache.rs
+++ b/vm/src/tx_mock/tx_cache.rs
@@ -51,13 +51,24 @@ impl TxCache {
     pub fn with_account<R, F>(&self, address: &VMAddress, f: F) -> R
     where
         F: FnOnce(&AccountData) -> R,
+    {
+        self.with_account_or_else(address, f, || {
+            panic!("Account {} not found", address_hex(address))
+        })
+    }
+
+    pub fn with_account_or_else<R, F, Else>(&self, address: &VMAddress, f: F, or_else: Else) -> R
+    where
+        F: FnOnce(&AccountData) -> R,
+        Else: FnOnce() -> R,
     {
         self.load_account_if_necessary(address);
         let accounts = self.accounts.lock().unwrap();
-        let account = accounts
-            .get(address)
-            .unwrap_or_else(|| panic!("Account {} not found", address_hex(address)));
-        f(account)
+        if let Some(account) = accounts.get(address) {
+            f(account)
+        } else {
+            or_else()
+        }
     }
 
     pub fn with_account_mut<R, F>(&self, address: &VMAddress, f: F) -> R
diff --git a/vm/src/tx_mock/tx_context.rs b/vm/src/tx_mock/tx_context.rs
index ae60f232da..dd7db4b2f0 100644
--- a/vm/src/tx_mock/tx_context.rs
+++ b/vm/src/tx_mock/tx_context.rs
@@ -95,6 +95,14 @@ impl TxContext {
         self.tx_cache.with_account(address, f)
     }
 
+    pub fn with_account_or_else<R, F, Else>(&self, address: &VMAddress, f: F, or_else: Else) -> R
+    where
+        F: FnOnce(&AccountData) -> R,
+        Else: FnOnce() -> R,
+    {
+        self.tx_cache.with_account_or_else(address, f, or_else)
+    }
+
     pub fn with_contract_account<R, F>(&self, f: F) -> R
     where
         F: FnOnce(&AccountData) -> R,
diff --git a/vm/src/vm_hooks/vh_handler/vh_blockchain.rs b/vm/src/vm_hooks/vh_handler/vh_blockchain.rs
index d140f8c106..f6f722d6e8 100644
--- a/vm/src/vm_hooks/vh_handler/vh_blockchain.rs
+++ b/vm/src/vm_hooks/vh_handler/vh_blockchain.rs
@@ -155,48 +155,38 @@ pub trait VMHooksBlockchain: VMHooksHandlerSource {
     ) {
         let address = VMAddress::from_slice(self.m_types_lock().mb_get(address_handle));
         let token_id_bytes = self.m_types_lock().mb_get(token_id_handle).to_vec();
-        let account = self.account_data(&address);
 
-        if let Some(esdt_data) = account.esdt.get_by_identifier(token_id_bytes.as_slice()) {
-            if let Some(instance) = esdt_data.instances.get_by_nonce(nonce) {
-                self.set_esdt_data_values(
-                    esdt_data,
-                    instance,
-                    value_handle,
-                    properties_handle,
-                    hash_handle,
-                    name_handle,
-                    attributes_handle,
-                    creator_handle,
-                    royalties_handle,
-                    uris_handle,
-                )
-            } else {
-                // missing nonce
-                self.reset_esdt_data_values(
-                    value_handle,
-                    properties_handle,
-                    hash_handle,
-                    name_handle,
-                    attributes_handle,
-                    creator_handle,
-                    royalties_handle,
-                    uris_handle,
-                );
+        if let Some(account) = self.account_data(&address) {
+            if let Some(esdt_data) = account.esdt.get_by_identifier(token_id_bytes.as_slice()) {
+                if let Some(instance) = esdt_data.instances.get_by_nonce(nonce) {
+                    self.set_esdt_data_values(
+                        esdt_data,
+                        instance,
+                        value_handle,
+                        properties_handle,
+                        hash_handle,
+                        name_handle,
+                        attributes_handle,
+                        creator_handle,
+                        royalties_handle,
+                        uris_handle,
+                    );
+                    return;
+                }
             }
-        } else {
-            // missing token identifier
-            self.reset_esdt_data_values(
-                value_handle,
-                properties_handle,
-                hash_handle,
-                name_handle,
-                attributes_handle,
-                creator_handle,
-                royalties_handle,
-                uris_handle,
-            );
         }
+
+        // missing account/token identifier/nonce
+        self.reset_esdt_data_values(
+            value_handle,
+            properties_handle,
+            hash_handle,
+            name_handle,
+            attributes_handle,
+            creator_handle,
+            royalties_handle,
+            uris_handle,
+        );
     }
 
     fn managed_get_back_transfers(
@@ -221,9 +211,10 @@ pub trait VMHooksBlockchain: VMHooksHandlerSource {
     ) -> bool {
         let address = VMAddress::from_slice(self.m_types_lock().mb_get(address_handle));
         let token_id_bytes = self.m_types_lock().mb_get(token_id_handle).to_vec();
-        let account = self.account_data(&address);
-        if let Some(esdt_data) = account.esdt.get_by_identifier(token_id_bytes.as_slice()) {
-            return esdt_data.frozen;
+        if let Some(account) = self.account_data(&address) {
+            if let Some(esdt_data) = account.esdt.get_by_identifier(token_id_bytes.as_slice()) {
+                return esdt_data.frozen;
+            }
         }
 
         false
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 4c725b3992..cf950aff0b 100644
--- a/vm/src/vm_hooks/vh_impl/vh_debug_api.rs
+++ b/vm/src/vm_hooks/vh_impl/vh_debug_api.rs
@@ -83,8 +83,9 @@ impl VMHooksHandlerSource for DebugApiVMHooksHandler {
         self.0.back_transfers_lock()
     }
 
-    fn account_data(&self, address: &VMAddress) -> AccountData {
-        self.0.with_account(address, |account| account.clone())
+    fn account_data(&self, address: &VMAddress) -> Option<AccountData> {
+        self.0
+            .with_account_or_else(address, |account| Some(account.clone()), || None)
     }
 
     fn account_code(&self, address: &VMAddress) -> Vec<u8> {
diff --git a/vm/src/vm_hooks/vh_impl/vh_single_tx_api.rs b/vm/src/vm_hooks/vh_impl/vh_single_tx_api.rs
index 819e8c9e5c..27fa484a4a 100644
--- a/vm/src/vm_hooks/vh_impl/vh_single_tx_api.rs
+++ b/vm/src/vm_hooks/vh_impl/vh_single_tx_api.rs
@@ -97,8 +97,8 @@ impl VMHooksHandlerSource for SingleTxApiVMHooksHandler {
         panic!("cannot access back transfers in the SingleTxApi")
     }
 
-    fn account_data(&self, address: &VMAddress) -> AccountData {
-        self.0.with_account_mut(address, |account| account.clone())
+    fn account_data(&self, address: &VMAddress) -> Option<AccountData> {
+        Some(self.0.with_account_mut(address, |account| account.clone()))
     }
 
     fn account_code(&self, _address: &VMAddress) -> Vec<u8> {
diff --git a/vm/src/vm_hooks/vh_impl/vh_static_api.rs b/vm/src/vm_hooks/vh_impl/vh_static_api.rs
index ef4e4b5c6a..aba07908e0 100644
--- a/vm/src/vm_hooks/vh_impl/vh_static_api.rs
+++ b/vm/src/vm_hooks/vh_impl/vh_static_api.rs
@@ -72,7 +72,7 @@ impl VMHooksHandlerSource for StaticApiVMHooksHandler {
         panic!("cannot access the back transfers in the StaticApi")
     }
 
-    fn account_data(&self, _address: &VMAddress) -> AccountData {
+    fn account_data(&self, _address: &VMAddress) -> Option<AccountData> {
         panic!("cannot access account data in the StaticApi")
     }
 
diff --git a/vm/src/vm_hooks/vh_source.rs b/vm/src/vm_hooks/vh_source.rs
index ed66297c24..0ad2e59e2a 100644
--- a/vm/src/vm_hooks/vh_source.rs
+++ b/vm/src/vm_hooks/vh_source.rs
@@ -52,13 +52,14 @@ pub trait VMHooksHandlerSource: Debug {
     /// For ownership reasons, needs to return a clone.
     ///
     /// Can be optimized, but is not a priority right now.
-    fn account_data(&self, address: &VMAddress) -> AccountData;
+    fn account_data(&self, address: &VMAddress) -> Option<AccountData>;
 
     /// For ownership reasons, needs to return a clone.
     ///
     /// Can be optimized, but is not a priority right now.
     fn current_account_data(&self) -> AccountData {
         self.account_data(&self.input_ref().to)
+            .expect("missing current account")
     }
 
     fn account_code(&self, address: &VMAddress) -> Vec<u8>;

From bef3a63e840c52082b88fed3f7f97cb523da89e4 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 15 Nov 2023 11:11:51 +0200
Subject: [PATCH 0055/1254] temporarily ignored test

---
 .../composability/tests/composability_scenario_rs_test.rs        | 1 +
 1 file changed, 1 insertion(+)

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 463f336470..2be254ab57 100644
--- a/contracts/feature-tests/composability/tests/composability_scenario_rs_test.rs
+++ b/contracts/feature-tests/composability/tests/composability_scenario_rs_test.rs
@@ -63,6 +63,7 @@ fn builtin_func_set_user_name_rs() {
 }
 
 #[test]
+#[ignore = "pending integration in VM 1.5"]
 fn forw_queue_async_rs() {
     world().run("scenarios/forw_queue_async.scen.json");
 }

From b81d9759312a42b4f8a87032b72c9e997f3566ac Mon Sep 17 00:00:00 2001
From: Alin Cruceat <alyn_509@yahoo.com>
Date: Wed, 15 Nov 2023 11:12:25 +0200
Subject: [PATCH 0056/1254] update deploy gas

---
 .../scenarios/stress_submit_test.scen.json    | 1654 ++---------------
 ...ss_submit_with_gas_schedule_test.scen.json | 1654 ++---------------
 .../tests/price_aggregator_stress_blackbox.rs |   27 +-
 .../core/price-aggregator/wasm/src/lib.rs     |    5 +-
 4 files changed, 242 insertions(+), 3098 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 7e07e93962..38cd16c1df 100644
--- a/contracts/core/price-aggregator/scenarios/stress_submit_test.scen.json
+++ b/contracts/core/price-aggregator/scenarios/stress_submit_test.scen.json
@@ -55,158 +55,18 @@
                     "nonce": "1",
                     "balance": "20"
                 },
-                "address:oracle21": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle22": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle23": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle24": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle25": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle26": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle27": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle28": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle29": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
                 "address:oracle3": {
                     "nonce": "1",
                     "balance": "20"
                 },
-                "address:oracle30": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle31": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle32": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle33": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle34": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle35": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle36": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle37": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle38": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle39": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
                 "address:oracle4": {
                     "nonce": "1",
                     "balance": "20"
                 },
-                "address:oracle40": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle41": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle42": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle43": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle44": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle45": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle46": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle47": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle48": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle49": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
                 "address:oracle5": {
                     "nonce": "1",
                     "balance": "20"
                 },
-                "address:oracle50": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle51": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle52": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle53": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle54": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle55": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
                 "address:oracle6": {
                     "nonce": "1",
                     "balance": "20"
@@ -248,8 +108,8 @@
                     "0x45474c44",
                     "0x14",
                     "0x0a",
-                    "0x32",
-                    "0x32",
+                    "0x03",
+                    "0x14",
                     "0x6f7261636c65315f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
                     "0x6f7261636c65325f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
                     "0x6f7261636c65335f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
@@ -269,44 +129,9 @@
                     "0x6f7261636c6531375f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
                     "0x6f7261636c6531385f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
                     "0x6f7261636c6531395f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6532305f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6532315f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6532325f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6532335f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6532345f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6532355f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6532365f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6532375f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6532385f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6532395f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6533305f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6533315f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6533325f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6533335f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6533345f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6533355f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6533365f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6533375f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6533385f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6533395f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6534305f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6534315f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6534325f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6534335f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6534345f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6534355f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6534365f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6534375f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6534385f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6534395f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6535305f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6535315f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6535325f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6535335f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6535345f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6535355f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f"
+                    "0x6f7261636c6532305f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f"
                 ],
-                "gasLimit": "5,000,000",
+                "gasLimit": "120,000,000",
                 "gasPrice": ""
             },
             "expect": {
@@ -386,1183 +211,11 @@
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle5",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle6",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle7",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle8",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle9",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle10",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle11",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle12",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle13",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle14",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle15",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle16",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle17",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle18",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle19",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle20",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle21",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle22",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle23",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle24",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle25",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle26",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle27",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle28",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle29",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle30",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle31",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle32",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle33",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle34",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle35",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle36",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle37",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle38",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle39",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle40",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle41",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle42",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle43",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle44",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle45",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle46",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle47",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle48",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle49",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle50",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle51",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle52",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle53",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle54",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle55",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:owner",
-                "to": "sc:price-aggregator",
-                "function": "setPairDecimals",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x"
-                ],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:owner",
-                "to": "sc:price-aggregator",
-                "function": "unpause",
-                "arguments": [],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle1",
-                "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x5f",
-                    "0x64",
-                    "0x"
-                ],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle2",
-                "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x64",
-                    "0x64",
-                    "0x"
-                ],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle3",
-                "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x64",
-                    "0x64",
-                    "0x"
-                ],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle4",
-                "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x64",
-                    "0x64",
-                    "0x"
-                ],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle5",
-                "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x64",
-                    "0x64",
-                    "0x"
-                ],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle6",
-                "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x64",
-                    "0x64",
-                    "0x"
-                ],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle7",
-                "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x64",
-                    "0x64",
-                    "0x"
-                ],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle8",
-                "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x64",
-                    "0x64",
-                    "0x"
-                ],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle9",
-                "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x64",
-                    "0x64",
-                    "0x"
-                ],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle10",
-                "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x64",
-                    "0x64",
-                    "0x"
-                ],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle11",
-                "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x64",
-                    "0x64",
-                    "0x"
-                ],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle12",
-                "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x64",
-                    "0x64",
-                    "0x"
-                ],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle13",
+                "from": "address:oracle5",
                 "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x64",
-                    "0x64",
-                    "0x"
-                ],
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
                 "gasLimit": "5,000,000",
                 "gasPrice": ""
             },
@@ -1575,16 +228,11 @@
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle14",
+                "from": "address:oracle6",
                 "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x64",
-                    "0x64",
-                    "0x"
-                ],
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
                 "gasLimit": "5,000,000",
                 "gasPrice": ""
             },
@@ -1597,16 +245,11 @@
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle15",
+                "from": "address:oracle7",
                 "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x64",
-                    "0x64",
-                    "0x"
-                ],
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
                 "gasLimit": "5,000,000",
                 "gasPrice": ""
             },
@@ -1619,16 +262,11 @@
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle16",
+                "from": "address:oracle8",
                 "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x64",
-                    "0x64",
-                    "0x"
-                ],
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
                 "gasLimit": "5,000,000",
                 "gasPrice": ""
             },
@@ -1641,16 +279,11 @@
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle17",
+                "from": "address:oracle9",
                 "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x64",
-                    "0x64",
-                    "0x"
-                ],
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
                 "gasLimit": "5,000,000",
                 "gasPrice": ""
             },
@@ -1663,16 +296,11 @@
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle18",
+                "from": "address:oracle10",
                 "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x64",
-                    "0x64",
-                    "0x"
-                ],
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
                 "gasLimit": "5,000,000",
                 "gasPrice": ""
             },
@@ -1685,16 +313,11 @@
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle19",
+                "from": "address:oracle11",
                 "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x64",
-                    "0x64",
-                    "0x"
-                ],
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
                 "gasLimit": "5,000,000",
                 "gasPrice": ""
             },
@@ -1707,16 +330,11 @@
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle20",
+                "from": "address:oracle12",
                 "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x64",
-                    "0x64",
-                    "0x"
-                ],
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
                 "gasLimit": "5,000,000",
                 "gasPrice": ""
             },
@@ -1729,16 +347,11 @@
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle21",
+                "from": "address:oracle13",
                 "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x64",
-                    "0x64",
-                    "0x"
-                ],
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
                 "gasLimit": "5,000,000",
                 "gasPrice": ""
             },
@@ -1751,16 +364,11 @@
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle22",
+                "from": "address:oracle14",
                 "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x64",
-                    "0x64",
-                    "0x"
-                ],
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
                 "gasLimit": "5,000,000",
                 "gasPrice": ""
             },
@@ -1773,16 +381,11 @@
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle23",
+                "from": "address:oracle15",
                 "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x64",
-                    "0x64",
-                    "0x"
-                ],
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
                 "gasLimit": "5,000,000",
                 "gasPrice": ""
             },
@@ -1795,16 +398,11 @@
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle24",
+                "from": "address:oracle16",
                 "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x64",
-                    "0x64",
-                    "0x"
-                ],
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
                 "gasLimit": "5,000,000",
                 "gasPrice": ""
             },
@@ -1817,16 +415,11 @@
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle25",
+                "from": "address:oracle17",
                 "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x64",
-                    "0x64",
-                    "0x"
-                ],
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
                 "gasLimit": "5,000,000",
                 "gasPrice": ""
             },
@@ -1839,16 +432,11 @@
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle26",
+                "from": "address:oracle18",
                 "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x64",
-                    "0x64",
-                    "0x"
-                ],
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
                 "gasLimit": "5,000,000",
                 "gasPrice": ""
             },
@@ -1861,16 +449,11 @@
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle27",
+                "from": "address:oracle19",
                 "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x64",
-                    "0x64",
-                    "0x"
-                ],
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
                 "gasLimit": "5,000,000",
                 "gasPrice": ""
             },
@@ -1883,16 +466,11 @@
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle28",
+                "from": "address:oracle20",
                 "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x64",
-                    "0x64",
-                    "0x"
-                ],
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
                 "gasLimit": "5,000,000",
                 "gasPrice": ""
             },
@@ -1905,14 +483,12 @@
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle29",
+                "from": "address:owner",
                 "to": "sc:price-aggregator",
-                "function": "submit",
+                "function": "setPairDecimals",
                 "arguments": [
                     "0x45474c44",
                     "0x55534443",
-                    "0x64",
-                    "0x64",
                     "0x"
                 ],
                 "gasLimit": "5,000,000",
@@ -1927,16 +503,10 @@
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle30",
+                "from": "address:owner",
                 "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x64",
-                    "0x64",
-                    "0x"
-                ],
+                "function": "unpause",
+                "arguments": [],
                 "gasLimit": "5,000,000",
                 "gasPrice": ""
             },
@@ -1949,17 +519,17 @@
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle31",
+                "from": "address:oracle1",
                 "to": "sc:price-aggregator",
                 "function": "submit",
                 "arguments": [
                     "0x45474c44",
                     "0x55534443",
-                    "0x64",
+                    "0x5f",
                     "0x64",
                     "0x"
                 ],
-                "gasLimit": "5,000,000",
+                "gasLimit": "1,000,000,000",
                 "gasPrice": ""
             },
             "expect": {
@@ -1971,7 +541,7 @@
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle32",
+                "from": "address:oracle2",
                 "to": "sc:price-aggregator",
                 "function": "submit",
                 "arguments": [
@@ -1981,7 +551,7 @@
                     "0x64",
                     "0x"
                 ],
-                "gasLimit": "5,000,000",
+                "gasLimit": "1,000,000,000",
                 "gasPrice": ""
             },
             "expect": {
@@ -1993,7 +563,7 @@
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle33",
+                "from": "address:oracle3",
                 "to": "sc:price-aggregator",
                 "function": "submit",
                 "arguments": [
@@ -2003,7 +573,7 @@
                     "0x64",
                     "0x"
                 ],
-                "gasLimit": "5,000,000",
+                "gasLimit": "1,000,000,000",
                 "gasPrice": ""
             },
             "expect": {
@@ -2015,7 +585,7 @@
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle34",
+                "from": "address:oracle4",
                 "to": "sc:price-aggregator",
                 "function": "submit",
                 "arguments": [
@@ -2025,7 +595,7 @@
                     "0x64",
                     "0x"
                 ],
-                "gasLimit": "5,000,000",
+                "gasLimit": "1,000,000,000",
                 "gasPrice": ""
             },
             "expect": {
@@ -2037,7 +607,7 @@
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle35",
+                "from": "address:oracle5",
                 "to": "sc:price-aggregator",
                 "function": "submit",
                 "arguments": [
@@ -2047,7 +617,7 @@
                     "0x64",
                     "0x"
                 ],
-                "gasLimit": "5,000,000",
+                "gasLimit": "1,000,000,000",
                 "gasPrice": ""
             },
             "expect": {
@@ -2059,7 +629,7 @@
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle36",
+                "from": "address:oracle6",
                 "to": "sc:price-aggregator",
                 "function": "submit",
                 "arguments": [
@@ -2069,7 +639,7 @@
                     "0x64",
                     "0x"
                 ],
-                "gasLimit": "5,000,000",
+                "gasLimit": "1,000,000,000",
                 "gasPrice": ""
             },
             "expect": {
@@ -2081,7 +651,7 @@
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle37",
+                "from": "address:oracle7",
                 "to": "sc:price-aggregator",
                 "function": "submit",
                 "arguments": [
@@ -2091,7 +661,7 @@
                     "0x64",
                     "0x"
                 ],
-                "gasLimit": "5,000,000",
+                "gasLimit": "1,000,000,000",
                 "gasPrice": ""
             },
             "expect": {
@@ -2103,7 +673,7 @@
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle38",
+                "from": "address:oracle8",
                 "to": "sc:price-aggregator",
                 "function": "submit",
                 "arguments": [
@@ -2113,7 +683,7 @@
                     "0x64",
                     "0x"
                 ],
-                "gasLimit": "5,000,000",
+                "gasLimit": "1,000,000,000",
                 "gasPrice": ""
             },
             "expect": {
@@ -2125,7 +695,7 @@
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle39",
+                "from": "address:oracle9",
                 "to": "sc:price-aggregator",
                 "function": "submit",
                 "arguments": [
@@ -2135,7 +705,7 @@
                     "0x64",
                     "0x"
                 ],
-                "gasLimit": "5,000,000",
+                "gasLimit": "1,000,000,000",
                 "gasPrice": ""
             },
             "expect": {
@@ -2147,7 +717,7 @@
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle40",
+                "from": "address:oracle10",
                 "to": "sc:price-aggregator",
                 "function": "submit",
                 "arguments": [
@@ -2157,7 +727,7 @@
                     "0x64",
                     "0x"
                 ],
-                "gasLimit": "5,000,000",
+                "gasLimit": "1,000,000,000",
                 "gasPrice": ""
             },
             "expect": {
@@ -2169,7 +739,7 @@
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle41",
+                "from": "address:oracle11",
                 "to": "sc:price-aggregator",
                 "function": "submit",
                 "arguments": [
@@ -2179,7 +749,7 @@
                     "0x64",
                     "0x"
                 ],
-                "gasLimit": "5,000,000",
+                "gasLimit": "1,000,000,000",
                 "gasPrice": ""
             },
             "expect": {
@@ -2191,7 +761,7 @@
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle42",
+                "from": "address:oracle12",
                 "to": "sc:price-aggregator",
                 "function": "submit",
                 "arguments": [
@@ -2201,7 +771,7 @@
                     "0x64",
                     "0x"
                 ],
-                "gasLimit": "5,000,000",
+                "gasLimit": "1,000,000,000",
                 "gasPrice": ""
             },
             "expect": {
@@ -2213,7 +783,7 @@
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle43",
+                "from": "address:oracle13",
                 "to": "sc:price-aggregator",
                 "function": "submit",
                 "arguments": [
@@ -2223,7 +793,7 @@
                     "0x64",
                     "0x"
                 ],
-                "gasLimit": "5,000,000",
+                "gasLimit": "1,000,000,000",
                 "gasPrice": ""
             },
             "expect": {
@@ -2235,7 +805,7 @@
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle44",
+                "from": "address:oracle14",
                 "to": "sc:price-aggregator",
                 "function": "submit",
                 "arguments": [
@@ -2245,7 +815,7 @@
                     "0x64",
                     "0x"
                 ],
-                "gasLimit": "5,000,000",
+                "gasLimit": "1,000,000,000",
                 "gasPrice": ""
             },
             "expect": {
@@ -2257,7 +827,7 @@
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle45",
+                "from": "address:oracle15",
                 "to": "sc:price-aggregator",
                 "function": "submit",
                 "arguments": [
@@ -2267,7 +837,7 @@
                     "0x64",
                     "0x"
                 ],
-                "gasLimit": "5,000,000",
+                "gasLimit": "1,000,000,000",
                 "gasPrice": ""
             },
             "expect": {
@@ -2279,7 +849,7 @@
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle46",
+                "from": "address:oracle16",
                 "to": "sc:price-aggregator",
                 "function": "submit",
                 "arguments": [
@@ -2289,7 +859,7 @@
                     "0x64",
                     "0x"
                 ],
-                "gasLimit": "5,000,000",
+                "gasLimit": "1,000,000,000",
                 "gasPrice": ""
             },
             "expect": {
@@ -2301,7 +871,7 @@
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle47",
+                "from": "address:oracle17",
                 "to": "sc:price-aggregator",
                 "function": "submit",
                 "arguments": [
@@ -2311,7 +881,7 @@
                     "0x64",
                     "0x"
                 ],
-                "gasLimit": "5,000,000",
+                "gasLimit": "1,000,000,000",
                 "gasPrice": ""
             },
             "expect": {
@@ -2323,7 +893,7 @@
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle48",
+                "from": "address:oracle18",
                 "to": "sc:price-aggregator",
                 "function": "submit",
                 "arguments": [
@@ -2333,7 +903,7 @@
                     "0x64",
                     "0x"
                 ],
-                "gasLimit": "5,000,000",
+                "gasLimit": "1,000,000,000",
                 "gasPrice": ""
             },
             "expect": {
@@ -2345,7 +915,7 @@
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle49",
+                "from": "address:oracle19",
                 "to": "sc:price-aggregator",
                 "function": "submit",
                 "arguments": [
@@ -2355,7 +925,7 @@
                     "0x64",
                     "0x"
                 ],
-                "gasLimit": "5,000,000",
+                "gasLimit": "1,000,000,000",
                 "gasPrice": ""
             },
             "expect": {
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 99e795593a..963058fbb8 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
@@ -58,158 +58,18 @@
                     "nonce": "1",
                     "balance": "20"
                 },
-                "address:oracle21": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle22": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle23": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle24": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle25": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle26": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle27": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle28": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle29": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
                 "address:oracle3": {
                     "nonce": "1",
                     "balance": "20"
                 },
-                "address:oracle30": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle31": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle32": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle33": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle34": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle35": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle36": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle37": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle38": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle39": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
                 "address:oracle4": {
                     "nonce": "1",
                     "balance": "20"
                 },
-                "address:oracle40": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle41": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle42": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle43": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle44": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle45": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle46": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle47": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle48": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle49": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
                 "address:oracle5": {
                     "nonce": "1",
                     "balance": "20"
                 },
-                "address:oracle50": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle51": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle52": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle53": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle54": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle55": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
                 "address:oracle6": {
                     "nonce": "1",
                     "balance": "20"
@@ -251,8 +111,8 @@
                     "0x45474c44",
                     "0x14",
                     "0x0a",
-                    "0x32",
-                    "0x32",
+                    "0x03",
+                    "0x14",
                     "0x6f7261636c65315f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
                     "0x6f7261636c65325f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
                     "0x6f7261636c65335f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
@@ -272,44 +132,9 @@
                     "0x6f7261636c6531375f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
                     "0x6f7261636c6531385f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
                     "0x6f7261636c6531395f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6532305f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6532315f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6532325f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6532335f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6532345f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6532355f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6532365f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6532375f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6532385f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6532395f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6533305f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6533315f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6533325f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6533335f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6533345f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6533355f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6533365f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6533375f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6533385f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6533395f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6534305f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6534315f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6534325f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6534335f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6534345f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6534355f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6534365f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6534375f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6534385f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6534395f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6535305f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6535315f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6535325f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6535335f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6535345f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6535355f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f"
+                    "0x6f7261636c6532305f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f"
                 ],
-                "gasLimit": "5,000,000",
+                "gasLimit": "120,000,000",
                 "gasPrice": ""
             },
             "expect": {
@@ -389,1183 +214,11 @@
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle5",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle6",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle7",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle8",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle9",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle10",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle11",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle12",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle13",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle14",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle15",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle16",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle17",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle18",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle19",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle20",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle21",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle22",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle23",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle24",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle25",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle26",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle27",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle28",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle29",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle30",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle31",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle32",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle33",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle34",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle35",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle36",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle37",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle38",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle39",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle40",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle41",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle42",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle43",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle44",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle45",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle46",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle47",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle48",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle49",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle50",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle51",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle52",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle53",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle54",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle55",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:owner",
-                "to": "sc:price-aggregator",
-                "function": "setPairDecimals",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x"
-                ],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:owner",
-                "to": "sc:price-aggregator",
-                "function": "unpause",
-                "arguments": [],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle1",
-                "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x5f",
-                    "0x64",
-                    "0x"
-                ],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle2",
-                "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x64",
-                    "0x64",
-                    "0x"
-                ],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle3",
-                "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x64",
-                    "0x64",
-                    "0x"
-                ],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle4",
-                "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x64",
-                    "0x64",
-                    "0x"
-                ],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle5",
-                "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x64",
-                    "0x64",
-                    "0x"
-                ],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle6",
-                "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x64",
-                    "0x64",
-                    "0x"
-                ],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle7",
-                "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x64",
-                    "0x64",
-                    "0x"
-                ],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle8",
-                "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x64",
-                    "0x64",
-                    "0x"
-                ],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle9",
-                "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x64",
-                    "0x64",
-                    "0x"
-                ],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle10",
-                "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x64",
-                    "0x64",
-                    "0x"
-                ],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle11",
-                "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x64",
-                    "0x64",
-                    "0x"
-                ],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle12",
-                "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x64",
-                    "0x64",
-                    "0x"
-                ],
-                "gasLimit": "5,000,000",
-                "gasPrice": ""
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle13",
+                "from": "address:oracle5",
                 "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x64",
-                    "0x64",
-                    "0x"
-                ],
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
                 "gasLimit": "5,000,000",
                 "gasPrice": ""
             },
@@ -1578,16 +231,11 @@
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle14",
+                "from": "address:oracle6",
                 "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x64",
-                    "0x64",
-                    "0x"
-                ],
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
                 "gasLimit": "5,000,000",
                 "gasPrice": ""
             },
@@ -1600,16 +248,11 @@
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle15",
+                "from": "address:oracle7",
                 "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x64",
-                    "0x64",
-                    "0x"
-                ],
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
                 "gasLimit": "5,000,000",
                 "gasPrice": ""
             },
@@ -1622,16 +265,11 @@
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle16",
+                "from": "address:oracle8",
                 "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x64",
-                    "0x64",
-                    "0x"
-                ],
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
                 "gasLimit": "5,000,000",
                 "gasPrice": ""
             },
@@ -1644,16 +282,11 @@
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle17",
+                "from": "address:oracle9",
                 "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x64",
-                    "0x64",
-                    "0x"
-                ],
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
                 "gasLimit": "5,000,000",
                 "gasPrice": ""
             },
@@ -1666,16 +299,11 @@
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle18",
+                "from": "address:oracle10",
                 "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x64",
-                    "0x64",
-                    "0x"
-                ],
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
                 "gasLimit": "5,000,000",
                 "gasPrice": ""
             },
@@ -1688,16 +316,11 @@
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle19",
+                "from": "address:oracle11",
                 "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x64",
-                    "0x64",
-                    "0x"
-                ],
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
                 "gasLimit": "5,000,000",
                 "gasPrice": ""
             },
@@ -1710,16 +333,11 @@
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle20",
+                "from": "address:oracle12",
                 "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x64",
-                    "0x64",
-                    "0x"
-                ],
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
                 "gasLimit": "5,000,000",
                 "gasPrice": ""
             },
@@ -1732,16 +350,11 @@
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle21",
+                "from": "address:oracle13",
                 "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x64",
-                    "0x64",
-                    "0x"
-                ],
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
                 "gasLimit": "5,000,000",
                 "gasPrice": ""
             },
@@ -1754,16 +367,11 @@
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle22",
+                "from": "address:oracle14",
                 "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x64",
-                    "0x64",
-                    "0x"
-                ],
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
                 "gasLimit": "5,000,000",
                 "gasPrice": ""
             },
@@ -1776,16 +384,11 @@
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle23",
+                "from": "address:oracle15",
                 "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x64",
-                    "0x64",
-                    "0x"
-                ],
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
                 "gasLimit": "5,000,000",
                 "gasPrice": ""
             },
@@ -1798,16 +401,11 @@
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle24",
+                "from": "address:oracle16",
                 "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x64",
-                    "0x64",
-                    "0x"
-                ],
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
                 "gasLimit": "5,000,000",
                 "gasPrice": ""
             },
@@ -1820,16 +418,11 @@
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle25",
+                "from": "address:oracle17",
                 "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x64",
-                    "0x64",
-                    "0x"
-                ],
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
                 "gasLimit": "5,000,000",
                 "gasPrice": ""
             },
@@ -1842,16 +435,11 @@
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle26",
+                "from": "address:oracle18",
                 "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x64",
-                    "0x64",
-                    "0x"
-                ],
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
                 "gasLimit": "5,000,000",
                 "gasPrice": ""
             },
@@ -1864,16 +452,11 @@
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle27",
+                "from": "address:oracle19",
                 "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x64",
-                    "0x64",
-                    "0x"
-                ],
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
                 "gasLimit": "5,000,000",
                 "gasPrice": ""
             },
@@ -1886,16 +469,11 @@
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle28",
+                "from": "address:oracle20",
                 "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x64",
-                    "0x64",
-                    "0x"
-                ],
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
                 "gasLimit": "5,000,000",
                 "gasPrice": ""
             },
@@ -1908,14 +486,12 @@
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle29",
+                "from": "address:owner",
                 "to": "sc:price-aggregator",
-                "function": "submit",
+                "function": "setPairDecimals",
                 "arguments": [
                     "0x45474c44",
                     "0x55534443",
-                    "0x64",
-                    "0x64",
                     "0x"
                 ],
                 "gasLimit": "5,000,000",
@@ -1930,16 +506,10 @@
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle30",
+                "from": "address:owner",
                 "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x64",
-                    "0x64",
-                    "0x"
-                ],
+                "function": "unpause",
+                "arguments": [],
                 "gasLimit": "5,000,000",
                 "gasPrice": ""
             },
@@ -1952,17 +522,17 @@
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle31",
+                "from": "address:oracle1",
                 "to": "sc:price-aggregator",
                 "function": "submit",
                 "arguments": [
                     "0x45474c44",
                     "0x55534443",
-                    "0x64",
+                    "0x5f",
                     "0x64",
                     "0x"
                 ],
-                "gasLimit": "5,000,000",
+                "gasLimit": "1,000,000,000",
                 "gasPrice": ""
             },
             "expect": {
@@ -1974,7 +544,7 @@
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle32",
+                "from": "address:oracle2",
                 "to": "sc:price-aggregator",
                 "function": "submit",
                 "arguments": [
@@ -1984,7 +554,7 @@
                     "0x64",
                     "0x"
                 ],
-                "gasLimit": "5,000,000",
+                "gasLimit": "1,000,000,000",
                 "gasPrice": ""
             },
             "expect": {
@@ -1996,7 +566,7 @@
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle33",
+                "from": "address:oracle3",
                 "to": "sc:price-aggregator",
                 "function": "submit",
                 "arguments": [
@@ -2006,7 +576,7 @@
                     "0x64",
                     "0x"
                 ],
-                "gasLimit": "5,000,000",
+                "gasLimit": "1,000,000,000",
                 "gasPrice": ""
             },
             "expect": {
@@ -2018,7 +588,7 @@
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle34",
+                "from": "address:oracle4",
                 "to": "sc:price-aggregator",
                 "function": "submit",
                 "arguments": [
@@ -2028,7 +598,7 @@
                     "0x64",
                     "0x"
                 ],
-                "gasLimit": "5,000,000",
+                "gasLimit": "1,000,000,000",
                 "gasPrice": ""
             },
             "expect": {
@@ -2040,7 +610,7 @@
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle35",
+                "from": "address:oracle5",
                 "to": "sc:price-aggregator",
                 "function": "submit",
                 "arguments": [
@@ -2050,7 +620,7 @@
                     "0x64",
                     "0x"
                 ],
-                "gasLimit": "5,000,000",
+                "gasLimit": "1,000,000,000",
                 "gasPrice": ""
             },
             "expect": {
@@ -2062,7 +632,7 @@
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle36",
+                "from": "address:oracle6",
                 "to": "sc:price-aggregator",
                 "function": "submit",
                 "arguments": [
@@ -2072,7 +642,7 @@
                     "0x64",
                     "0x"
                 ],
-                "gasLimit": "5,000,000",
+                "gasLimit": "1,000,000,000",
                 "gasPrice": ""
             },
             "expect": {
@@ -2084,7 +654,7 @@
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle37",
+                "from": "address:oracle7",
                 "to": "sc:price-aggregator",
                 "function": "submit",
                 "arguments": [
@@ -2094,7 +664,7 @@
                     "0x64",
                     "0x"
                 ],
-                "gasLimit": "5,000,000",
+                "gasLimit": "1,000,000,000",
                 "gasPrice": ""
             },
             "expect": {
@@ -2106,7 +676,7 @@
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle38",
+                "from": "address:oracle8",
                 "to": "sc:price-aggregator",
                 "function": "submit",
                 "arguments": [
@@ -2116,7 +686,7 @@
                     "0x64",
                     "0x"
                 ],
-                "gasLimit": "5,000,000",
+                "gasLimit": "1,000,000,000",
                 "gasPrice": ""
             },
             "expect": {
@@ -2128,7 +698,7 @@
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle39",
+                "from": "address:oracle9",
                 "to": "sc:price-aggregator",
                 "function": "submit",
                 "arguments": [
@@ -2138,7 +708,7 @@
                     "0x64",
                     "0x"
                 ],
-                "gasLimit": "5,000,000",
+                "gasLimit": "1,000,000,000",
                 "gasPrice": ""
             },
             "expect": {
@@ -2150,7 +720,7 @@
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle40",
+                "from": "address:oracle10",
                 "to": "sc:price-aggregator",
                 "function": "submit",
                 "arguments": [
@@ -2160,7 +730,7 @@
                     "0x64",
                     "0x"
                 ],
-                "gasLimit": "5,000,000",
+                "gasLimit": "1,000,000,000",
                 "gasPrice": ""
             },
             "expect": {
@@ -2172,7 +742,7 @@
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle41",
+                "from": "address:oracle11",
                 "to": "sc:price-aggregator",
                 "function": "submit",
                 "arguments": [
@@ -2182,7 +752,7 @@
                     "0x64",
                     "0x"
                 ],
-                "gasLimit": "5,000,000",
+                "gasLimit": "1,000,000,000",
                 "gasPrice": ""
             },
             "expect": {
@@ -2194,7 +764,7 @@
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle42",
+                "from": "address:oracle12",
                 "to": "sc:price-aggregator",
                 "function": "submit",
                 "arguments": [
@@ -2204,7 +774,7 @@
                     "0x64",
                     "0x"
                 ],
-                "gasLimit": "5,000,000",
+                "gasLimit": "1,000,000,000",
                 "gasPrice": ""
             },
             "expect": {
@@ -2216,7 +786,7 @@
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle43",
+                "from": "address:oracle13",
                 "to": "sc:price-aggregator",
                 "function": "submit",
                 "arguments": [
@@ -2226,7 +796,7 @@
                     "0x64",
                     "0x"
                 ],
-                "gasLimit": "5,000,000",
+                "gasLimit": "1,000,000,000",
                 "gasPrice": ""
             },
             "expect": {
@@ -2238,7 +808,7 @@
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle44",
+                "from": "address:oracle14",
                 "to": "sc:price-aggregator",
                 "function": "submit",
                 "arguments": [
@@ -2248,7 +818,7 @@
                     "0x64",
                     "0x"
                 ],
-                "gasLimit": "5,000,000",
+                "gasLimit": "1,000,000,000",
                 "gasPrice": ""
             },
             "expect": {
@@ -2260,7 +830,7 @@
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle45",
+                "from": "address:oracle15",
                 "to": "sc:price-aggregator",
                 "function": "submit",
                 "arguments": [
@@ -2270,7 +840,7 @@
                     "0x64",
                     "0x"
                 ],
-                "gasLimit": "5,000,000",
+                "gasLimit": "1,000,000,000",
                 "gasPrice": ""
             },
             "expect": {
@@ -2282,7 +852,7 @@
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle46",
+                "from": "address:oracle16",
                 "to": "sc:price-aggregator",
                 "function": "submit",
                 "arguments": [
@@ -2292,7 +862,7 @@
                     "0x64",
                     "0x"
                 ],
-                "gasLimit": "5,000,000",
+                "gasLimit": "1,000,000,000",
                 "gasPrice": ""
             },
             "expect": {
@@ -2304,7 +874,7 @@
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle47",
+                "from": "address:oracle17",
                 "to": "sc:price-aggregator",
                 "function": "submit",
                 "arguments": [
@@ -2314,7 +884,7 @@
                     "0x64",
                     "0x"
                 ],
-                "gasLimit": "5,000,000",
+                "gasLimit": "1,000,000,000",
                 "gasPrice": ""
             },
             "expect": {
@@ -2326,7 +896,7 @@
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle48",
+                "from": "address:oracle18",
                 "to": "sc:price-aggregator",
                 "function": "submit",
                 "arguments": [
@@ -2336,7 +906,7 @@
                     "0x64",
                     "0x"
                 ],
-                "gasLimit": "5,000,000",
+                "gasLimit": "1,000,000,000",
                 "gasPrice": ""
             },
             "expect": {
@@ -2348,7 +918,7 @@
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle49",
+                "from": "address:oracle19",
                 "to": "sc:price-aggregator",
                 "function": "submit",
                 "arguments": [
@@ -2358,7 +928,7 @@
                     "0x64",
                     "0x"
                 ],
-                "gasLimit": "5,000,000",
+                "gasLimit": "1,000,000,000",
                 "gasPrice": ""
             },
             "expect": {
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 d730b281f9..522af7588f 100644
--- a/contracts/core/price-aggregator/tests/price_aggregator_stress_blackbox.rs
+++ b/contracts/core/price-aggregator/tests/price_aggregator_stress_blackbox.rs
@@ -10,20 +10,20 @@ use multiversx_sc_modules::{pause::ProxyTrait, staking::ProxyTrait as _};
 use multiversx_sc_scenario::{
     api::StaticApi,
     managed_address, managed_biguint, managed_buffer,
-    scenario_model::{Account, AddressValue, ScCallStep, ScDeployStep, SetStateStep, TxExpect},
+    scenario_model::{Account, AddressValue, ScCallStep, ScDeployStep, SetStateStep},
     ContractInfo, DebugApi, ScenarioWorld, WhiteboxContract,
 };
 
 const DECIMALS: u8 = 0;
 const EGLD_TICKER: &[u8] = b"EGLD";
-const NR_ORACLES: usize = 55;
+const NR_ORACLES: usize = 20;
 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 SLASH_AMOUNT: u64 = 10;
-const SLASH_QUORUM: usize = 50;
+const SLASH_QUORUM: usize = 3;
 const STAKE_AMOUNT: u64 = 20;
-const SUBMISSION_COUNT: usize = 50;
+const SUBMISSION_COUNT: usize = 20;
 const USD_TICKER: &[u8] = b"USDC";
 
 type PriceAggregatorContract = ContractInfo<multiversx_price_aggregator_sc::Proxy<StaticApi>>;
@@ -105,7 +105,8 @@ impl PriceAggregatorTestState {
                     SLASH_QUORUM,
                     SUBMISSION_COUNT,
                     oracles,
-                )),
+                ))
+                .gas_limit("120,000,000"),
         );
 
         for address in self.oracles.iter() {
@@ -113,7 +114,8 @@ impl PriceAggregatorTestState {
                 ScCallStep::new()
                     .from(address)
                     .egld_value(STAKE_AMOUNT)
-                    .call(self.price_aggregator_contract.stake()),
+                    .call(self.price_aggregator_contract.stake())
+                    .gas_limit("5,000,000"),
             );
         }
 
@@ -133,7 +135,8 @@ impl PriceAggregatorTestState {
         self.world.sc_call(
             ScCallStep::new()
                 .from(OWNER_ADDRESS_EXPR)
-                .call(self.price_aggregator_contract.unpause_endpoint()),
+                .call(self.price_aggregator_contract.unpause_endpoint())
+                .gas_limit("5,000,000"),
         );
     }
 
@@ -148,7 +151,7 @@ impl PriceAggregatorTestState {
                     price,
                     DECIMALS,
                 ))
-                .expect(TxExpect::ok()),
+                .gas_limit("1,000,000,000"),
         );
     }
 }
@@ -167,7 +170,7 @@ fn test_price_aggregator_submit() {
     state.submit(&state.oracles[0].clone(), 95, 100);
 
     // submit ok
-    for index in 1..49 {
+    for index in 1..SUBMISSION_COUNT - 1 {
         state.submit(&state.oracles[index].clone(), 100, 100);
     }
 
@@ -185,7 +188,7 @@ fn test_price_aggregator_submit() {
 
             let submission_count = sc.submission_count().get();
 
-            assert_eq!(submission_count, 50);
+            assert_eq!(submission_count, SUBMISSION_COUNT);
             assert_eq!(
                 sc.first_submission_timestamp(&token_pair).get(),
                 current_timestamp
@@ -196,9 +199,9 @@ fn test_price_aggregator_submit() {
             );
 
             let submissions = sc.submissions().get(&token_pair).unwrap();
-            assert_eq!(submissions.len(), 49);
+            assert_eq!(submissions.len(), SUBMISSION_COUNT - 1);
 
-            for index in 0..49 {
+            for index in 0..SUBMISSION_COUNT - 1 {
                 assert_eq!(
                     submissions
                         .get(&managed_address!(&state.oracles[index].to_address()))
diff --git a/contracts/core/price-aggregator/wasm/src/lib.rs b/contracts/core/price-aggregator/wasm/src/lib.rs
index b95e17d571..10fc81e5da 100644
--- a/contracts/core/price-aggregator/wasm/src/lib.rs
+++ b/contracts/core/price-aggregator/wasm/src/lib.rs
@@ -5,9 +5,9 @@
 ////////////////////////////////////////////////////
 
 // Init:                                 1
-// Endpoints:                           20
+// Endpoints:                           21
 // Async Callback (empty):               1
-// Total number of exported functions:  22
+// Total number of exported functions:  23
 
 #![no_std]
 
@@ -22,6 +22,7 @@ multiversx_sc_wasm_adapter::endpoints! {
     multiversx_price_aggregator_sc
     (
         init => init
+        changeAmounts => change_amounts
         addOracles => add_oracles
         removeOracles => remove_oracles
         submit => submit

From 87ac5bbea68afa035ff70b900f282140e93eeb46 Mon Sep 17 00:00:00 2001
From: Alin Cruceat <alyn_509@yahoo.com>
Date: Wed, 15 Nov 2023 11:59:09 +0200
Subject: [PATCH 0057/1254] gas updates and test pass

---
 .../scenarios/stress_submit_test.scen.json    | 1762 +++++++++++++++--
 ...ss_submit_with_gas_schedule_test.scen.json | 1762 +++++++++++++++--
 .../tests/price_aggregator_stress_blackbox.rs |    6 +-
 3 files changed, 3187 insertions(+), 343 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 38cd16c1df..f875317658 100644
--- a/contracts/core/price-aggregator/scenarios/stress_submit_test.scen.json
+++ b/contracts/core/price-aggregator/scenarios/stress_submit_test.scen.json
@@ -55,18 +55,138 @@
                     "nonce": "1",
                     "balance": "20"
                 },
+                "address:oracle21": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle22": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle23": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle24": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle25": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle26": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle27": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle28": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle29": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
                 "address:oracle3": {
                     "nonce": "1",
                     "balance": "20"
                 },
+                "address:oracle30": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle31": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle32": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle33": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle34": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle35": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle36": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle37": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle38": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle39": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
                 "address:oracle4": {
                     "nonce": "1",
                     "balance": "20"
                 },
+                "address:oracle40": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle41": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle42": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle43": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle44": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle45": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle46": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle47": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle48": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle49": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
                 "address:oracle5": {
                     "nonce": "1",
                     "balance": "20"
                 },
+                "address:oracle50": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
                 "address:oracle6": {
                     "nonce": "1",
                     "balance": "20"
@@ -109,7 +229,7 @@
                     "0x14",
                     "0x0a",
                     "0x03",
-                    "0x14",
+                    "0x32",
                     "0x6f7261636c65315f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
                     "0x6f7261636c65325f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
                     "0x6f7261636c65335f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
@@ -129,14 +249,45 @@
                     "0x6f7261636c6531375f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
                     "0x6f7261636c6531385f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
                     "0x6f7261636c6531395f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6532305f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f"
+                    "0x6f7261636c6532305f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6532315f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6532325f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6532335f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6532345f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6532355f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6532365f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6532375f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6532385f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6532395f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6533305f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6533315f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6533325f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6533335f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6533345f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6533355f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6533365f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6533375f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6533385f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6533395f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6534305f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6534315f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6534325f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6534335f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6534345f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6534355f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6534365f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6534375f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6534385f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6534395f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6535305f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f"
                 ],
                 "gasLimit": "120,000,000",
                 "gasPrice": ""
             },
             "expect": {
                 "out": [],
-                "status": "0"
+                "status": "0",
+                "refund": "*"
             }
         },
         {
@@ -153,7 +304,8 @@
             },
             "expect": {
                 "out": [],
-                "status": "0"
+                "status": "0",
+                "refund": "*"
             }
         },
         {
@@ -170,7 +322,8 @@
             },
             "expect": {
                 "out": [],
-                "status": "0"
+                "status": "0",
+                "refund": "*"
             }
         },
         {
@@ -187,7 +340,8 @@
             },
             "expect": {
                 "out": [],
-                "status": "0"
+                "status": "0",
+                "refund": "*"
             }
         },
         {
@@ -204,344 +358,1594 @@
             },
             "expect": {
                 "out": [],
-                "status": "0"
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle5",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle6",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle7",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle8",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle9",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle10",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle11",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle12",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle13",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle14",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle15",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle16",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle17",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle18",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle19",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle20",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle21",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle22",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle23",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle24",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle25",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle26",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle27",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle28",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle29",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle30",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle31",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle32",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle33",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle34",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle35",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle36",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle37",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle38",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle39",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle40",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle41",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle42",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle43",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle44",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle45",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle46",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle47",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle48",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle49",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle50",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:owner",
+                "to": "sc:price-aggregator",
+                "function": "setPairDecimals",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x"
+                ],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:owner",
+                "to": "sc:price-aggregator",
+                "function": "unpause",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle1",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x5f",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "7,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle2",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "7,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle3",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "7,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle4",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "7,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle5",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "7,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle6",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "7,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle7",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "7,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle8",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "7,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle9",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "7,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle10",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "7,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle11",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "7,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle12",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "7,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
             }
         },
         {
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle5",
+                "from": "address:oracle13",
                 "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "7,000,000",
                 "gasPrice": ""
             },
             "expect": {
                 "out": [],
-                "status": "0"
+                "status": "0",
+                "refund": "*"
             }
         },
         {
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle6",
+                "from": "address:oracle14",
                 "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "7,000,000",
                 "gasPrice": ""
             },
             "expect": {
                 "out": [],
-                "status": "0"
+                "status": "0",
+                "refund": "*"
             }
         },
         {
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle7",
+                "from": "address:oracle15",
                 "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "7,000,000",
                 "gasPrice": ""
             },
             "expect": {
                 "out": [],
-                "status": "0"
+                "status": "0",
+                "refund": "*"
             }
         },
         {
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle8",
+                "from": "address:oracle16",
                 "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "7,000,000",
                 "gasPrice": ""
             },
             "expect": {
                 "out": [],
-                "status": "0"
+                "status": "0",
+                "refund": "*"
             }
         },
         {
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle9",
+                "from": "address:oracle17",
                 "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "7,000,000",
                 "gasPrice": ""
             },
             "expect": {
                 "out": [],
-                "status": "0"
+                "status": "0",
+                "refund": "*"
             }
         },
         {
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle10",
+                "from": "address:oracle18",
                 "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "7,000,000",
                 "gasPrice": ""
             },
             "expect": {
                 "out": [],
-                "status": "0"
+                "status": "0",
+                "refund": "*"
             }
         },
         {
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle11",
+                "from": "address:oracle19",
                 "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "7,000,000",
                 "gasPrice": ""
             },
             "expect": {
                 "out": [],
-                "status": "0"
+                "status": "0",
+                "refund": "*"
             }
         },
         {
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle12",
+                "from": "address:oracle20",
                 "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "7,000,000",
                 "gasPrice": ""
             },
             "expect": {
                 "out": [],
-                "status": "0"
+                "status": "0",
+                "refund": "*"
             }
         },
         {
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle13",
+                "from": "address:oracle21",
                 "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "7,000,000",
                 "gasPrice": ""
             },
             "expect": {
                 "out": [],
-                "status": "0"
+                "status": "0",
+                "refund": "*"
             }
         },
         {
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle14",
+                "from": "address:oracle22",
                 "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "7,000,000",
                 "gasPrice": ""
             },
             "expect": {
                 "out": [],
-                "status": "0"
+                "status": "0",
+                "refund": "*"
             }
         },
         {
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle15",
+                "from": "address:oracle23",
                 "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "7,000,000",
                 "gasPrice": ""
             },
             "expect": {
                 "out": [],
-                "status": "0"
+                "status": "0",
+                "refund": "*"
             }
         },
         {
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle16",
+                "from": "address:oracle24",
                 "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "7,000,000",
                 "gasPrice": ""
             },
             "expect": {
                 "out": [],
-                "status": "0"
+                "status": "0",
+                "refund": "*"
             }
         },
         {
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle17",
+                "from": "address:oracle25",
                 "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "7,000,000",
                 "gasPrice": ""
             },
             "expect": {
                 "out": [],
-                "status": "0"
+                "status": "0",
+                "refund": "*"
             }
         },
         {
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle18",
+                "from": "address:oracle26",
                 "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "7,000,000",
                 "gasPrice": ""
             },
             "expect": {
                 "out": [],
-                "status": "0"
+                "status": "0",
+                "refund": "*"
             }
         },
         {
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle19",
+                "from": "address:oracle27",
                 "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "7,000,000",
                 "gasPrice": ""
             },
             "expect": {
                 "out": [],
-                "status": "0"
+                "status": "0",
+                "refund": "*"
             }
         },
         {
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle20",
+                "from": "address:oracle28",
                 "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "7,000,000",
                 "gasPrice": ""
             },
             "expect": {
                 "out": [],
-                "status": "0"
+                "status": "0",
+                "refund": "*"
             }
         },
         {
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:owner",
+                "from": "address:oracle29",
                 "to": "sc:price-aggregator",
-                "function": "setPairDecimals",
+                "function": "submit",
                 "arguments": [
                     "0x45474c44",
                     "0x55534443",
+                    "0x64",
+                    "0x64",
                     "0x"
                 ],
-                "gasLimit": "5,000,000",
+                "gasLimit": "7,000,000",
                 "gasPrice": ""
             },
             "expect": {
                 "out": [],
-                "status": "0"
+                "status": "0",
+                "refund": "*"
             }
         },
         {
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:owner",
+                "from": "address:oracle30",
                 "to": "sc:price-aggregator",
-                "function": "unpause",
-                "arguments": [],
-                "gasLimit": "5,000,000",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "7,000,000",
                 "gasPrice": ""
             },
             "expect": {
                 "out": [],
-                "status": "0"
+                "status": "0",
+                "refund": "*"
             }
         },
         {
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle1",
+                "from": "address:oracle31",
                 "to": "sc:price-aggregator",
                 "function": "submit",
                 "arguments": [
                     "0x45474c44",
                     "0x55534443",
-                    "0x5f",
+                    "0x64",
                     "0x64",
                     "0x"
                 ],
-                "gasLimit": "1,000,000,000",
+                "gasLimit": "7,000,000",
                 "gasPrice": ""
             },
             "expect": {
                 "out": [],
-                "status": "0"
+                "status": "0",
+                "refund": "*"
             }
         },
         {
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle2",
+                "from": "address:oracle32",
                 "to": "sc:price-aggregator",
                 "function": "submit",
                 "arguments": [
@@ -551,19 +1955,20 @@
                     "0x64",
                     "0x"
                 ],
-                "gasLimit": "1,000,000,000",
+                "gasLimit": "7,000,000",
                 "gasPrice": ""
             },
             "expect": {
                 "out": [],
-                "status": "0"
+                "status": "0",
+                "refund": "*"
             }
         },
         {
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle3",
+                "from": "address:oracle33",
                 "to": "sc:price-aggregator",
                 "function": "submit",
                 "arguments": [
@@ -573,19 +1978,20 @@
                     "0x64",
                     "0x"
                 ],
-                "gasLimit": "1,000,000,000",
+                "gasLimit": "7,000,000",
                 "gasPrice": ""
             },
             "expect": {
                 "out": [],
-                "status": "0"
+                "status": "0",
+                "refund": "*"
             }
         },
         {
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle4",
+                "from": "address:oracle34",
                 "to": "sc:price-aggregator",
                 "function": "submit",
                 "arguments": [
@@ -595,19 +2001,20 @@
                     "0x64",
                     "0x"
                 ],
-                "gasLimit": "1,000,000,000",
+                "gasLimit": "7,000,000",
                 "gasPrice": ""
             },
             "expect": {
                 "out": [],
-                "status": "0"
+                "status": "0",
+                "refund": "*"
             }
         },
         {
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle5",
+                "from": "address:oracle35",
                 "to": "sc:price-aggregator",
                 "function": "submit",
                 "arguments": [
@@ -617,19 +2024,20 @@
                     "0x64",
                     "0x"
                 ],
-                "gasLimit": "1,000,000,000",
+                "gasLimit": "7,000,000",
                 "gasPrice": ""
             },
             "expect": {
                 "out": [],
-                "status": "0"
+                "status": "0",
+                "refund": "*"
             }
         },
         {
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle6",
+                "from": "address:oracle36",
                 "to": "sc:price-aggregator",
                 "function": "submit",
                 "arguments": [
@@ -639,19 +2047,20 @@
                     "0x64",
                     "0x"
                 ],
-                "gasLimit": "1,000,000,000",
+                "gasLimit": "7,000,000",
                 "gasPrice": ""
             },
             "expect": {
                 "out": [],
-                "status": "0"
+                "status": "0",
+                "refund": "*"
             }
         },
         {
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle7",
+                "from": "address:oracle37",
                 "to": "sc:price-aggregator",
                 "function": "submit",
                 "arguments": [
@@ -661,19 +2070,20 @@
                     "0x64",
                     "0x"
                 ],
-                "gasLimit": "1,000,000,000",
+                "gasLimit": "7,000,000",
                 "gasPrice": ""
             },
             "expect": {
                 "out": [],
-                "status": "0"
+                "status": "0",
+                "refund": "*"
             }
         },
         {
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle8",
+                "from": "address:oracle38",
                 "to": "sc:price-aggregator",
                 "function": "submit",
                 "arguments": [
@@ -683,19 +2093,20 @@
                     "0x64",
                     "0x"
                 ],
-                "gasLimit": "1,000,000,000",
+                "gasLimit": "7,000,000",
                 "gasPrice": ""
             },
             "expect": {
                 "out": [],
-                "status": "0"
+                "status": "0",
+                "refund": "*"
             }
         },
         {
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle9",
+                "from": "address:oracle39",
                 "to": "sc:price-aggregator",
                 "function": "submit",
                 "arguments": [
@@ -705,19 +2116,20 @@
                     "0x64",
                     "0x"
                 ],
-                "gasLimit": "1,000,000,000",
+                "gasLimit": "7,000,000",
                 "gasPrice": ""
             },
             "expect": {
                 "out": [],
-                "status": "0"
+                "status": "0",
+                "refund": "*"
             }
         },
         {
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle10",
+                "from": "address:oracle40",
                 "to": "sc:price-aggregator",
                 "function": "submit",
                 "arguments": [
@@ -727,19 +2139,20 @@
                     "0x64",
                     "0x"
                 ],
-                "gasLimit": "1,000,000,000",
+                "gasLimit": "7,000,000",
                 "gasPrice": ""
             },
             "expect": {
                 "out": [],
-                "status": "0"
+                "status": "0",
+                "refund": "*"
             }
         },
         {
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle11",
+                "from": "address:oracle41",
                 "to": "sc:price-aggregator",
                 "function": "submit",
                 "arguments": [
@@ -749,19 +2162,20 @@
                     "0x64",
                     "0x"
                 ],
-                "gasLimit": "1,000,000,000",
+                "gasLimit": "7,000,000",
                 "gasPrice": ""
             },
             "expect": {
                 "out": [],
-                "status": "0"
+                "status": "0",
+                "refund": "*"
             }
         },
         {
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle12",
+                "from": "address:oracle42",
                 "to": "sc:price-aggregator",
                 "function": "submit",
                 "arguments": [
@@ -771,19 +2185,20 @@
                     "0x64",
                     "0x"
                 ],
-                "gasLimit": "1,000,000,000",
+                "gasLimit": "7,000,000",
                 "gasPrice": ""
             },
             "expect": {
                 "out": [],
-                "status": "0"
+                "status": "0",
+                "refund": "*"
             }
         },
         {
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle13",
+                "from": "address:oracle43",
                 "to": "sc:price-aggregator",
                 "function": "submit",
                 "arguments": [
@@ -793,19 +2208,20 @@
                     "0x64",
                     "0x"
                 ],
-                "gasLimit": "1,000,000,000",
+                "gasLimit": "7,000,000",
                 "gasPrice": ""
             },
             "expect": {
                 "out": [],
-                "status": "0"
+                "status": "0",
+                "refund": "*"
             }
         },
         {
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle14",
+                "from": "address:oracle44",
                 "to": "sc:price-aggregator",
                 "function": "submit",
                 "arguments": [
@@ -815,19 +2231,20 @@
                     "0x64",
                     "0x"
                 ],
-                "gasLimit": "1,000,000,000",
+                "gasLimit": "7,000,000",
                 "gasPrice": ""
             },
             "expect": {
                 "out": [],
-                "status": "0"
+                "status": "0",
+                "refund": "*"
             }
         },
         {
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle15",
+                "from": "address:oracle45",
                 "to": "sc:price-aggregator",
                 "function": "submit",
                 "arguments": [
@@ -837,19 +2254,20 @@
                     "0x64",
                     "0x"
                 ],
-                "gasLimit": "1,000,000,000",
+                "gasLimit": "7,000,000",
                 "gasPrice": ""
             },
             "expect": {
                 "out": [],
-                "status": "0"
+                "status": "0",
+                "refund": "*"
             }
         },
         {
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle16",
+                "from": "address:oracle46",
                 "to": "sc:price-aggregator",
                 "function": "submit",
                 "arguments": [
@@ -859,19 +2277,20 @@
                     "0x64",
                     "0x"
                 ],
-                "gasLimit": "1,000,000,000",
+                "gasLimit": "7,000,000",
                 "gasPrice": ""
             },
             "expect": {
                 "out": [],
-                "status": "0"
+                "status": "0",
+                "refund": "*"
             }
         },
         {
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle17",
+                "from": "address:oracle47",
                 "to": "sc:price-aggregator",
                 "function": "submit",
                 "arguments": [
@@ -881,19 +2300,20 @@
                     "0x64",
                     "0x"
                 ],
-                "gasLimit": "1,000,000,000",
+                "gasLimit": "7,000,000",
                 "gasPrice": ""
             },
             "expect": {
                 "out": [],
-                "status": "0"
+                "status": "0",
+                "refund": "*"
             }
         },
         {
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle18",
+                "from": "address:oracle48",
                 "to": "sc:price-aggregator",
                 "function": "submit",
                 "arguments": [
@@ -903,19 +2323,20 @@
                     "0x64",
                     "0x"
                 ],
-                "gasLimit": "1,000,000,000",
+                "gasLimit": "7,000,000",
                 "gasPrice": ""
             },
             "expect": {
                 "out": [],
-                "status": "0"
+                "status": "0",
+                "refund": "*"
             }
         },
         {
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle19",
+                "from": "address:oracle49",
                 "to": "sc:price-aggregator",
                 "function": "submit",
                 "arguments": [
@@ -925,12 +2346,13 @@
                     "0x64",
                     "0x"
                 ],
-                "gasLimit": "1,000,000,000",
+                "gasLimit": "7,000,000",
                 "gasPrice": ""
             },
             "expect": {
                 "out": [],
-                "status": "0"
+                "status": "0",
+                "refund": "*"
             }
         }
     ]
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 963058fbb8..c90029a105 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
@@ -58,18 +58,138 @@
                     "nonce": "1",
                     "balance": "20"
                 },
+                "address:oracle21": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle22": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle23": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle24": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle25": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle26": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle27": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle28": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle29": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
                 "address:oracle3": {
                     "nonce": "1",
                     "balance": "20"
                 },
+                "address:oracle30": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle31": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle32": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle33": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle34": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle35": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle36": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle37": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle38": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle39": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
                 "address:oracle4": {
                     "nonce": "1",
                     "balance": "20"
                 },
+                "address:oracle40": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle41": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle42": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle43": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle44": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle45": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle46": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle47": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle48": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
+                "address:oracle49": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
                 "address:oracle5": {
                     "nonce": "1",
                     "balance": "20"
                 },
+                "address:oracle50": {
+                    "nonce": "1",
+                    "balance": "20"
+                },
                 "address:oracle6": {
                     "nonce": "1",
                     "balance": "20"
@@ -112,7 +232,7 @@
                     "0x14",
                     "0x0a",
                     "0x03",
-                    "0x14",
+                    "0x32",
                     "0x6f7261636c65315f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
                     "0x6f7261636c65325f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
                     "0x6f7261636c65335f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
@@ -132,14 +252,45 @@
                     "0x6f7261636c6531375f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
                     "0x6f7261636c6531385f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
                     "0x6f7261636c6531395f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6532305f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f"
+                    "0x6f7261636c6532305f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6532315f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6532325f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6532335f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6532345f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6532355f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6532365f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6532375f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6532385f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6532395f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6533305f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6533315f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6533325f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6533335f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6533345f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6533355f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6533365f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6533375f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6533385f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6533395f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6534305f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6534315f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6534325f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6534335f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6534345f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6534355f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6534365f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6534375f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6534385f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6534395f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+                    "0x6f7261636c6535305f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f"
                 ],
                 "gasLimit": "120,000,000",
                 "gasPrice": ""
             },
             "expect": {
                 "out": [],
-                "status": "0"
+                "status": "0",
+                "refund": "*"
             }
         },
         {
@@ -156,7 +307,8 @@
             },
             "expect": {
                 "out": [],
-                "status": "0"
+                "status": "0",
+                "refund": "*"
             }
         },
         {
@@ -173,7 +325,8 @@
             },
             "expect": {
                 "out": [],
-                "status": "0"
+                "status": "0",
+                "refund": "*"
             }
         },
         {
@@ -190,7 +343,8 @@
             },
             "expect": {
                 "out": [],
-                "status": "0"
+                "status": "0",
+                "refund": "*"
             }
         },
         {
@@ -207,344 +361,1594 @@
             },
             "expect": {
                 "out": [],
-                "status": "0"
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle5",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle6",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle7",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle8",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle9",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle10",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle11",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle12",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle13",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle14",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle15",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle16",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle17",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle18",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle19",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle20",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle21",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle22",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle23",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle24",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle25",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle26",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle27",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle28",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle29",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle30",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle31",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle32",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle33",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle34",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle35",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle36",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle37",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle38",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle39",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle40",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle41",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle42",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle43",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle44",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle45",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle46",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle47",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle48",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle49",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle50",
+                "to": "sc:price-aggregator",
+                "egldValue": "20",
+                "function": "stake",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:owner",
+                "to": "sc:price-aggregator",
+                "function": "setPairDecimals",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x"
+                ],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:owner",
+                "to": "sc:price-aggregator",
+                "function": "unpause",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle1",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x5f",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "7,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle2",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "7,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle3",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "7,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle4",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "7,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle5",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "7,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle6",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "7,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle7",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "7,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle8",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "7,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle9",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "7,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle10",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "7,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle11",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "7,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle12",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "7,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
             }
         },
         {
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle5",
+                "from": "address:oracle13",
                 "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "7,000,000",
                 "gasPrice": ""
             },
             "expect": {
                 "out": [],
-                "status": "0"
+                "status": "0",
+                "refund": "*"
             }
         },
         {
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle6",
+                "from": "address:oracle14",
                 "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "7,000,000",
                 "gasPrice": ""
             },
             "expect": {
                 "out": [],
-                "status": "0"
+                "status": "0",
+                "refund": "*"
             }
         },
         {
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle7",
+                "from": "address:oracle15",
                 "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "7,000,000",
                 "gasPrice": ""
             },
             "expect": {
                 "out": [],
-                "status": "0"
+                "status": "0",
+                "refund": "*"
             }
         },
         {
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle8",
+                "from": "address:oracle16",
                 "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "7,000,000",
                 "gasPrice": ""
             },
             "expect": {
                 "out": [],
-                "status": "0"
+                "status": "0",
+                "refund": "*"
             }
         },
         {
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle9",
+                "from": "address:oracle17",
                 "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "7,000,000",
                 "gasPrice": ""
             },
             "expect": {
                 "out": [],
-                "status": "0"
+                "status": "0",
+                "refund": "*"
             }
         },
         {
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle10",
+                "from": "address:oracle18",
                 "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "7,000,000",
                 "gasPrice": ""
             },
             "expect": {
                 "out": [],
-                "status": "0"
+                "status": "0",
+                "refund": "*"
             }
         },
         {
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle11",
+                "from": "address:oracle19",
                 "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "7,000,000",
                 "gasPrice": ""
             },
             "expect": {
                 "out": [],
-                "status": "0"
+                "status": "0",
+                "refund": "*"
             }
         },
         {
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle12",
+                "from": "address:oracle20",
                 "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "7,000,000",
                 "gasPrice": ""
             },
             "expect": {
                 "out": [],
-                "status": "0"
+                "status": "0",
+                "refund": "*"
             }
         },
         {
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle13",
+                "from": "address:oracle21",
                 "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "7,000,000",
                 "gasPrice": ""
             },
             "expect": {
                 "out": [],
-                "status": "0"
+                "status": "0",
+                "refund": "*"
             }
         },
         {
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle14",
+                "from": "address:oracle22",
                 "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "7,000,000",
                 "gasPrice": ""
             },
             "expect": {
                 "out": [],
-                "status": "0"
+                "status": "0",
+                "refund": "*"
             }
         },
         {
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle15",
+                "from": "address:oracle23",
                 "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "7,000,000",
                 "gasPrice": ""
             },
             "expect": {
                 "out": [],
-                "status": "0"
+                "status": "0",
+                "refund": "*"
             }
         },
         {
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle16",
+                "from": "address:oracle24",
                 "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "7,000,000",
                 "gasPrice": ""
             },
             "expect": {
                 "out": [],
-                "status": "0"
+                "status": "0",
+                "refund": "*"
             }
         },
         {
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle17",
+                "from": "address:oracle25",
                 "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "7,000,000",
                 "gasPrice": ""
             },
             "expect": {
                 "out": [],
-                "status": "0"
+                "status": "0",
+                "refund": "*"
             }
         },
         {
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle18",
+                "from": "address:oracle26",
                 "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "7,000,000",
                 "gasPrice": ""
             },
             "expect": {
                 "out": [],
-                "status": "0"
+                "status": "0",
+                "refund": "*"
             }
         },
         {
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle19",
+                "from": "address:oracle27",
                 "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "7,000,000",
                 "gasPrice": ""
             },
             "expect": {
                 "out": [],
-                "status": "0"
+                "status": "0",
+                "refund": "*"
             }
         },
         {
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle20",
+                "from": "address:oracle28",
                 "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "7,000,000",
                 "gasPrice": ""
             },
             "expect": {
                 "out": [],
-                "status": "0"
+                "status": "0",
+                "refund": "*"
             }
         },
         {
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:owner",
+                "from": "address:oracle29",
                 "to": "sc:price-aggregator",
-                "function": "setPairDecimals",
+                "function": "submit",
                 "arguments": [
                     "0x45474c44",
                     "0x55534443",
+                    "0x64",
+                    "0x64",
                     "0x"
                 ],
-                "gasLimit": "5,000,000",
+                "gasLimit": "7,000,000",
                 "gasPrice": ""
             },
             "expect": {
                 "out": [],
-                "status": "0"
+                "status": "0",
+                "refund": "*"
             }
         },
         {
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:owner",
+                "from": "address:oracle30",
                 "to": "sc:price-aggregator",
-                "function": "unpause",
-                "arguments": [],
-                "gasLimit": "5,000,000",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "7,000,000",
                 "gasPrice": ""
             },
             "expect": {
                 "out": [],
-                "status": "0"
+                "status": "0",
+                "refund": "*"
             }
         },
         {
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle1",
+                "from": "address:oracle31",
                 "to": "sc:price-aggregator",
                 "function": "submit",
                 "arguments": [
                     "0x45474c44",
                     "0x55534443",
-                    "0x5f",
+                    "0x64",
                     "0x64",
                     "0x"
                 ],
-                "gasLimit": "1,000,000,000",
+                "gasLimit": "7,000,000",
                 "gasPrice": ""
             },
             "expect": {
                 "out": [],
-                "status": "0"
+                "status": "0",
+                "refund": "*"
             }
         },
         {
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle2",
+                "from": "address:oracle32",
                 "to": "sc:price-aggregator",
                 "function": "submit",
                 "arguments": [
@@ -554,19 +1958,20 @@
                     "0x64",
                     "0x"
                 ],
-                "gasLimit": "1,000,000,000",
+                "gasLimit": "7,000,000",
                 "gasPrice": ""
             },
             "expect": {
                 "out": [],
-                "status": "0"
+                "status": "0",
+                "refund": "*"
             }
         },
         {
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle3",
+                "from": "address:oracle33",
                 "to": "sc:price-aggregator",
                 "function": "submit",
                 "arguments": [
@@ -576,19 +1981,20 @@
                     "0x64",
                     "0x"
                 ],
-                "gasLimit": "1,000,000,000",
+                "gasLimit": "7,000,000",
                 "gasPrice": ""
             },
             "expect": {
                 "out": [],
-                "status": "0"
+                "status": "0",
+                "refund": "*"
             }
         },
         {
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle4",
+                "from": "address:oracle34",
                 "to": "sc:price-aggregator",
                 "function": "submit",
                 "arguments": [
@@ -598,19 +2004,20 @@
                     "0x64",
                     "0x"
                 ],
-                "gasLimit": "1,000,000,000",
+                "gasLimit": "7,000,000",
                 "gasPrice": ""
             },
             "expect": {
                 "out": [],
-                "status": "0"
+                "status": "0",
+                "refund": "*"
             }
         },
         {
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle5",
+                "from": "address:oracle35",
                 "to": "sc:price-aggregator",
                 "function": "submit",
                 "arguments": [
@@ -620,19 +2027,20 @@
                     "0x64",
                     "0x"
                 ],
-                "gasLimit": "1,000,000,000",
+                "gasLimit": "7,000,000",
                 "gasPrice": ""
             },
             "expect": {
                 "out": [],
-                "status": "0"
+                "status": "0",
+                "refund": "*"
             }
         },
         {
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle6",
+                "from": "address:oracle36",
                 "to": "sc:price-aggregator",
                 "function": "submit",
                 "arguments": [
@@ -642,19 +2050,20 @@
                     "0x64",
                     "0x"
                 ],
-                "gasLimit": "1,000,000,000",
+                "gasLimit": "7,000,000",
                 "gasPrice": ""
             },
             "expect": {
                 "out": [],
-                "status": "0"
+                "status": "0",
+                "refund": "*"
             }
         },
         {
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle7",
+                "from": "address:oracle37",
                 "to": "sc:price-aggregator",
                 "function": "submit",
                 "arguments": [
@@ -664,19 +2073,20 @@
                     "0x64",
                     "0x"
                 ],
-                "gasLimit": "1,000,000,000",
+                "gasLimit": "7,000,000",
                 "gasPrice": ""
             },
             "expect": {
                 "out": [],
-                "status": "0"
+                "status": "0",
+                "refund": "*"
             }
         },
         {
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle8",
+                "from": "address:oracle38",
                 "to": "sc:price-aggregator",
                 "function": "submit",
                 "arguments": [
@@ -686,19 +2096,20 @@
                     "0x64",
                     "0x"
                 ],
-                "gasLimit": "1,000,000,000",
+                "gasLimit": "7,000,000",
                 "gasPrice": ""
             },
             "expect": {
                 "out": [],
-                "status": "0"
+                "status": "0",
+                "refund": "*"
             }
         },
         {
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle9",
+                "from": "address:oracle39",
                 "to": "sc:price-aggregator",
                 "function": "submit",
                 "arguments": [
@@ -708,19 +2119,20 @@
                     "0x64",
                     "0x"
                 ],
-                "gasLimit": "1,000,000,000",
+                "gasLimit": "7,000,000",
                 "gasPrice": ""
             },
             "expect": {
                 "out": [],
-                "status": "0"
+                "status": "0",
+                "refund": "*"
             }
         },
         {
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle10",
+                "from": "address:oracle40",
                 "to": "sc:price-aggregator",
                 "function": "submit",
                 "arguments": [
@@ -730,19 +2142,20 @@
                     "0x64",
                     "0x"
                 ],
-                "gasLimit": "1,000,000,000",
+                "gasLimit": "7,000,000",
                 "gasPrice": ""
             },
             "expect": {
                 "out": [],
-                "status": "0"
+                "status": "0",
+                "refund": "*"
             }
         },
         {
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle11",
+                "from": "address:oracle41",
                 "to": "sc:price-aggregator",
                 "function": "submit",
                 "arguments": [
@@ -752,19 +2165,20 @@
                     "0x64",
                     "0x"
                 ],
-                "gasLimit": "1,000,000,000",
+                "gasLimit": "7,000,000",
                 "gasPrice": ""
             },
             "expect": {
                 "out": [],
-                "status": "0"
+                "status": "0",
+                "refund": "*"
             }
         },
         {
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle12",
+                "from": "address:oracle42",
                 "to": "sc:price-aggregator",
                 "function": "submit",
                 "arguments": [
@@ -774,19 +2188,20 @@
                     "0x64",
                     "0x"
                 ],
-                "gasLimit": "1,000,000,000",
+                "gasLimit": "7,000,000",
                 "gasPrice": ""
             },
             "expect": {
                 "out": [],
-                "status": "0"
+                "status": "0",
+                "refund": "*"
             }
         },
         {
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle13",
+                "from": "address:oracle43",
                 "to": "sc:price-aggregator",
                 "function": "submit",
                 "arguments": [
@@ -796,19 +2211,20 @@
                     "0x64",
                     "0x"
                 ],
-                "gasLimit": "1,000,000,000",
+                "gasLimit": "7,000,000",
                 "gasPrice": ""
             },
             "expect": {
                 "out": [],
-                "status": "0"
+                "status": "0",
+                "refund": "*"
             }
         },
         {
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle14",
+                "from": "address:oracle44",
                 "to": "sc:price-aggregator",
                 "function": "submit",
                 "arguments": [
@@ -818,19 +2234,20 @@
                     "0x64",
                     "0x"
                 ],
-                "gasLimit": "1,000,000,000",
+                "gasLimit": "7,000,000",
                 "gasPrice": ""
             },
             "expect": {
                 "out": [],
-                "status": "0"
+                "status": "0",
+                "refund": "*"
             }
         },
         {
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle15",
+                "from": "address:oracle45",
                 "to": "sc:price-aggregator",
                 "function": "submit",
                 "arguments": [
@@ -840,19 +2257,20 @@
                     "0x64",
                     "0x"
                 ],
-                "gasLimit": "1,000,000,000",
+                "gasLimit": "7,000,000",
                 "gasPrice": ""
             },
             "expect": {
                 "out": [],
-                "status": "0"
+                "status": "0",
+                "refund": "*"
             }
         },
         {
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle16",
+                "from": "address:oracle46",
                 "to": "sc:price-aggregator",
                 "function": "submit",
                 "arguments": [
@@ -862,19 +2280,20 @@
                     "0x64",
                     "0x"
                 ],
-                "gasLimit": "1,000,000,000",
+                "gasLimit": "7,000,000",
                 "gasPrice": ""
             },
             "expect": {
                 "out": [],
-                "status": "0"
+                "status": "0",
+                "refund": "*"
             }
         },
         {
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle17",
+                "from": "address:oracle47",
                 "to": "sc:price-aggregator",
                 "function": "submit",
                 "arguments": [
@@ -884,19 +2303,20 @@
                     "0x64",
                     "0x"
                 ],
-                "gasLimit": "1,000,000,000",
+                "gasLimit": "7,000,000",
                 "gasPrice": ""
             },
             "expect": {
                 "out": [],
-                "status": "0"
+                "status": "0",
+                "refund": "*"
             }
         },
         {
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle18",
+                "from": "address:oracle48",
                 "to": "sc:price-aggregator",
                 "function": "submit",
                 "arguments": [
@@ -906,19 +2326,20 @@
                     "0x64",
                     "0x"
                 ],
-                "gasLimit": "1,000,000,000",
+                "gasLimit": "7,000,000",
                 "gasPrice": ""
             },
             "expect": {
                 "out": [],
-                "status": "0"
+                "status": "0",
+                "refund": "*"
             }
         },
         {
             "step": "scCall",
             "id": "",
             "tx": {
-                "from": "address:oracle19",
+                "from": "address:oracle49",
                 "to": "sc:price-aggregator",
                 "function": "submit",
                 "arguments": [
@@ -928,12 +2349,13 @@
                     "0x64",
                     "0x"
                 ],
-                "gasLimit": "1,000,000,000",
+                "gasLimit": "7,000,000",
                 "gasPrice": ""
             },
             "expect": {
                 "out": [],
-                "status": "0"
+                "status": "0",
+                "refund": "*"
             }
         }
     ]
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 522af7588f..aa67b0411b 100644
--- a/contracts/core/price-aggregator/tests/price_aggregator_stress_blackbox.rs
+++ b/contracts/core/price-aggregator/tests/price_aggregator_stress_blackbox.rs
@@ -16,14 +16,14 @@ use multiversx_sc_scenario::{
 
 const DECIMALS: u8 = 0;
 const EGLD_TICKER: &[u8] = b"EGLD";
-const NR_ORACLES: usize = 20;
+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 SLASH_AMOUNT: u64 = 10;
 const SLASH_QUORUM: usize = 3;
 const STAKE_AMOUNT: u64 = 20;
-const SUBMISSION_COUNT: usize = 20;
+const SUBMISSION_COUNT: usize = 50;
 const USD_TICKER: &[u8] = b"USDC";
 
 type PriceAggregatorContract = ContractInfo<multiversx_price_aggregator_sc::Proxy<StaticApi>>;
@@ -151,7 +151,7 @@ impl PriceAggregatorTestState {
                     price,
                     DECIMALS,
                 ))
-                .gas_limit("1,000,000,000"),
+                .gas_limit("7,000,000"),
         );
     }
 }

From fcb65199701bf5ffe0a1c1a1d676efb1dbc42972 Mon Sep 17 00:00:00 2001
From: Alin Cruceat <alyn_509@yahoo.com>
Date: Wed, 15 Nov 2023 12:12:54 +0200
Subject: [PATCH 0058/1254] update test to contain 50 submissions

---
 .../scenarios/stress_submit_test.scen.json    | 23 +++++++++++++++++++
 ...ss_submit_with_gas_schedule_test.scen.json | 23 +++++++++++++++++++
 .../tests/price_aggregator_stress_blackbox.rs |  2 ++
 3 files changed, 48 insertions(+)

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 f875317658..c27614fca3 100644
--- a/contracts/core/price-aggregator/scenarios/stress_submit_test.scen.json
+++ b/contracts/core/price-aggregator/scenarios/stress_submit_test.scen.json
@@ -2354,6 +2354,29 @@
                 "status": "0",
                 "refund": "*"
             }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle50",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "50,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
         }
     ]
 }
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 c90029a105..7eeabd702f 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
@@ -2357,6 +2357,29 @@
                 "status": "0",
                 "refund": "*"
             }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:oracle50",
+                "to": "sc:price-aggregator",
+                "function": "submit",
+                "arguments": [
+                    "0x45474c44",
+                    "0x55534443",
+                    "0x64",
+                    "0x64",
+                    "0x"
+                ],
+                "gasLimit": "50,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "refund": "*"
+            }
         }
     ]
 }
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 aa67b0411b..e2f3f0b4f0 100644
--- a/contracts/core/price-aggregator/tests/price_aggregator_stress_blackbox.rs
+++ b/contracts/core/price-aggregator/tests/price_aggregator_stress_blackbox.rs
@@ -220,6 +220,8 @@ fn test_price_aggregator_submit() {
                 );
             }
         });
+
+    state.submit(&state.oracles[SUBMISSION_COUNT - 1].clone(), 100, 100);
     state
         .world
         .write_scenario_trace("scenarios/stress_submit_test.scen.json");

From d53e4b3b45765c758be2974517345e93014605be Mon Sep 17 00:00:00 2001
From: Alin Cruceat <alyn_509@yahoo.com>
Date: Wed, 15 Nov 2023 13:54:33 +0200
Subject: [PATCH 0059/1254] use rng for prices to simulate sorting

---
 Cargo.lock                                    |   1 +
 contracts/core/price-aggregator/Cargo.toml    |   1 +
 .../scenarios/stress_submit_test.scen.json    | 100 +++++++++---------
 ...ss_submit_with_gas_schedule_test.scen.json | 100 +++++++++---------
 .../tests/price_aggregator_stress_blackbox.rs |  21 ++--
 5 files changed, 112 insertions(+), 111 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index c66b0c8647..a3df268907 100755
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1990,6 +1990,7 @@ dependencies = [
  "multiversx-sc",
  "multiversx-sc-modules",
  "multiversx-sc-scenario",
+ "rand",
 ]
 
 [[package]]
diff --git a/contracts/core/price-aggregator/Cargo.toml b/contracts/core/price-aggregator/Cargo.toml
index ff7ab26714..fcd121225f 100644
--- a/contracts/core/price-aggregator/Cargo.toml
+++ b/contracts/core/price-aggregator/Cargo.toml
@@ -32,3 +32,4 @@ path = "../../../framework/scenario"
 
 [dependencies]
 arrayvec = { version = "0.7.1", default-features = false }
+rand = { version = "0.8.5" }
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 c27614fca3..e1eec1cc6a 100644
--- a/contracts/core/price-aggregator/scenarios/stress_submit_test.scen.json
+++ b/contracts/core/price-aggregator/scenarios/stress_submit_test.scen.json
@@ -1239,7 +1239,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x5f",
-                    "0x64",
+                    "0x619911dbb570258c",
                     "0x"
                 ],
                 "gasLimit": "7,000,000",
@@ -1262,7 +1262,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x64",
+                    "0x3cf8d3d3a05bf655",
                     "0x"
                 ],
                 "gasLimit": "7,000,000",
@@ -1285,7 +1285,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x64",
+                    "0x4d92440172e0bf71",
                     "0x"
                 ],
                 "gasLimit": "7,000,000",
@@ -1308,7 +1308,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x64",
+                    "0xd971ed41066daa08",
                     "0x"
                 ],
                 "gasLimit": "7,000,000",
@@ -1331,7 +1331,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x64",
+                    "0x34a9348cb04afbd1",
                     "0x"
                 ],
                 "gasLimit": "7,000,000",
@@ -1354,7 +1354,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x64",
+                    "0x6c01a77d55c0861f",
                     "0x"
                 ],
                 "gasLimit": "7,000,000",
@@ -1377,7 +1377,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x64",
+                    "0xea1e93f2b82ec0f6",
                     "0x"
                 ],
                 "gasLimit": "7,000,000",
@@ -1400,7 +1400,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x64",
+                    "0x2f067fee00bbd5bc",
                     "0x"
                 ],
                 "gasLimit": "7,000,000",
@@ -1423,7 +1423,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x64",
+                    "0x1706fe5397a21f74",
                     "0x"
                 ],
                 "gasLimit": "7,000,000",
@@ -1446,7 +1446,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x64",
+                    "0xbffd5631e9e448a8",
                     "0x"
                 ],
                 "gasLimit": "7,000,000",
@@ -1469,7 +1469,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x64",
+                    "0x1940496d3bc8934c",
                     "0x"
                 ],
                 "gasLimit": "7,000,000",
@@ -1492,7 +1492,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x64",
+                    "0xbd0af0d3aba30235",
                     "0x"
                 ],
                 "gasLimit": "7,000,000",
@@ -1515,7 +1515,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x64",
+                    "0xebcf9494ec0fac0c",
                     "0x"
                 ],
                 "gasLimit": "7,000,000",
@@ -1538,7 +1538,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x64",
+                    "0x7aeb67c3eabe498c",
                     "0x"
                 ],
                 "gasLimit": "7,000,000",
@@ -1561,7 +1561,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x64",
+                    "0x5c758d17b8445f7f",
                     "0x"
                 ],
                 "gasLimit": "7,000,000",
@@ -1584,7 +1584,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x64",
+                    "0x6978fe48b9a58974",
                     "0x"
                 ],
                 "gasLimit": "7,000,000",
@@ -1607,7 +1607,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x64",
+                    "0x8692c26f665bc7ad",
                     "0x"
                 ],
                 "gasLimit": "7,000,000",
@@ -1630,7 +1630,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x64",
+                    "0x2d3a93b7522e72b6",
                     "0x"
                 ],
                 "gasLimit": "7,000,000",
@@ -1653,7 +1653,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x64",
+                    "0x4faa49415e935688",
                     "0x"
                 ],
                 "gasLimit": "7,000,000",
@@ -1676,7 +1676,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x64",
+                    "0x5cbca2cc253dbf54",
                     "0x"
                 ],
                 "gasLimit": "7,000,000",
@@ -1699,7 +1699,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x64",
+                    "0xdd20d194dd695735",
                     "0x"
                 ],
                 "gasLimit": "7,000,000",
@@ -1722,7 +1722,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x64",
+                    "0x32f039c1765a2ec3",
                     "0x"
                 ],
                 "gasLimit": "7,000,000",
@@ -1745,7 +1745,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x64",
+                    "0x84372c9de3d535d9",
                     "0x"
                 ],
                 "gasLimit": "7,000,000",
@@ -1768,7 +1768,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x64",
+                    "0x91b23ed59de93417",
                     "0x"
                 ],
                 "gasLimit": "7,000,000",
@@ -1791,7 +1791,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x64",
+                    "0x4b81d1a55887f5f9",
                     "0x"
                 ],
                 "gasLimit": "7,000,000",
@@ -1814,7 +1814,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x64",
+                    "0xd88e348ef6679e1d",
                     "0x"
                 ],
                 "gasLimit": "7,000,000",
@@ -1837,7 +1837,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x64",
+                    "0x2557834dc8059cc7",
                     "0x"
                 ],
                 "gasLimit": "7,000,000",
@@ -1860,7 +1860,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x64",
+                    "0x22d86f8317546033",
                     "0x"
                 ],
                 "gasLimit": "7,000,000",
@@ -1883,7 +1883,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x64",
+                    "0x5a775ddd32ca5367",
                     "0x"
                 ],
                 "gasLimit": "7,000,000",
@@ -1906,7 +1906,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x64",
+                    "0x59f049471cd2662c",
                     "0x"
                 ],
                 "gasLimit": "7,000,000",
@@ -1929,7 +1929,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x64",
+                    "0xb59fdc2aedbf845f",
                     "0x"
                 ],
                 "gasLimit": "7,000,000",
@@ -1952,7 +1952,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x64",
+                    "0xab13e96eb802f883",
                     "0x"
                 ],
                 "gasLimit": "7,000,000",
@@ -1975,7 +1975,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x64",
+                    "0xf6f152ab53ad7170",
                     "0x"
                 ],
                 "gasLimit": "7,000,000",
@@ -1998,7 +1998,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x64",
+                    "0x5bae78b87d516979",
                     "0x"
                 ],
                 "gasLimit": "7,000,000",
@@ -2021,7 +2021,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x64",
+                    "0xe47859cc0fdb0abe",
                     "0x"
                 ],
                 "gasLimit": "7,000,000",
@@ -2044,7 +2044,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x64",
+                    "0x7c36ab1fa1a348b4",
                     "0x"
                 ],
                 "gasLimit": "7,000,000",
@@ -2067,7 +2067,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x64",
+                    "0x7fda3ef39b74e04b",
                     "0x"
                 ],
                 "gasLimit": "7,000,000",
@@ -2090,7 +2090,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x64",
+                    "0x461d81a84db50115",
                     "0x"
                 ],
                 "gasLimit": "7,000,000",
@@ -2113,7 +2113,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x64",
+                    "0xcc0ab8ccc363dd0c",
                     "0x"
                 ],
                 "gasLimit": "7,000,000",
@@ -2136,7 +2136,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x64",
+                    "0x11c15058c7c6c1fa",
                     "0x"
                 ],
                 "gasLimit": "7,000,000",
@@ -2159,7 +2159,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x64",
+                    "0x293b700535555d4f",
                     "0x"
                 ],
                 "gasLimit": "7,000,000",
@@ -2182,7 +2182,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x64",
+                    "0x4e8d04d2f0e53efd",
                     "0x"
                 ],
                 "gasLimit": "7,000,000",
@@ -2205,7 +2205,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x64",
+                    "0x42be3651d7b9499e",
                     "0x"
                 ],
                 "gasLimit": "7,000,000",
@@ -2228,7 +2228,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x64",
+                    "0xb82a437fc87cd8a0",
                     "0x"
                 ],
                 "gasLimit": "7,000,000",
@@ -2251,7 +2251,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x64",
+                    "0xb12ebd0d9ff3f396",
                     "0x"
                 ],
                 "gasLimit": "7,000,000",
@@ -2274,7 +2274,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x64",
+                    "0x85b4d01e5a20d445",
                     "0x"
                 ],
                 "gasLimit": "7,000,000",
@@ -2297,7 +2297,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x64",
+                    "0x92edaca582002375",
                     "0x"
                 ],
                 "gasLimit": "7,000,000",
@@ -2320,7 +2320,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x64",
+                    "0x351151b47fee6331",
                     "0x"
                 ],
                 "gasLimit": "7,000,000",
@@ -2343,7 +2343,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x64",
+                    "0x9155d2992ceb6beb",
                     "0x"
                 ],
                 "gasLimit": "7,000,000",
@@ -2366,7 +2366,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x64",
+                    "0xdbc0895ce5855dec",
                     "0x"
                 ],
                 "gasLimit": "50,000,000",
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 7eeabd702f..a6c97f5c6b 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
@@ -1242,7 +1242,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x5f",
-                    "0x64",
+                    "0x619911dbb570258c",
                     "0x"
                 ],
                 "gasLimit": "7,000,000",
@@ -1265,7 +1265,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x64",
+                    "0x3cf8d3d3a05bf655",
                     "0x"
                 ],
                 "gasLimit": "7,000,000",
@@ -1288,7 +1288,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x64",
+                    "0x4d92440172e0bf71",
                     "0x"
                 ],
                 "gasLimit": "7,000,000",
@@ -1311,7 +1311,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x64",
+                    "0xd971ed41066daa08",
                     "0x"
                 ],
                 "gasLimit": "7,000,000",
@@ -1334,7 +1334,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x64",
+                    "0x34a9348cb04afbd1",
                     "0x"
                 ],
                 "gasLimit": "7,000,000",
@@ -1357,7 +1357,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x64",
+                    "0x6c01a77d55c0861f",
                     "0x"
                 ],
                 "gasLimit": "7,000,000",
@@ -1380,7 +1380,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x64",
+                    "0xea1e93f2b82ec0f6",
                     "0x"
                 ],
                 "gasLimit": "7,000,000",
@@ -1403,7 +1403,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x64",
+                    "0x2f067fee00bbd5bc",
                     "0x"
                 ],
                 "gasLimit": "7,000,000",
@@ -1426,7 +1426,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x64",
+                    "0x1706fe5397a21f74",
                     "0x"
                 ],
                 "gasLimit": "7,000,000",
@@ -1449,7 +1449,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x64",
+                    "0xbffd5631e9e448a8",
                     "0x"
                 ],
                 "gasLimit": "7,000,000",
@@ -1472,7 +1472,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x64",
+                    "0x1940496d3bc8934c",
                     "0x"
                 ],
                 "gasLimit": "7,000,000",
@@ -1495,7 +1495,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x64",
+                    "0xbd0af0d3aba30235",
                     "0x"
                 ],
                 "gasLimit": "7,000,000",
@@ -1518,7 +1518,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x64",
+                    "0xebcf9494ec0fac0c",
                     "0x"
                 ],
                 "gasLimit": "7,000,000",
@@ -1541,7 +1541,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x64",
+                    "0x7aeb67c3eabe498c",
                     "0x"
                 ],
                 "gasLimit": "7,000,000",
@@ -1564,7 +1564,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x64",
+                    "0x5c758d17b8445f7f",
                     "0x"
                 ],
                 "gasLimit": "7,000,000",
@@ -1587,7 +1587,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x64",
+                    "0x6978fe48b9a58974",
                     "0x"
                 ],
                 "gasLimit": "7,000,000",
@@ -1610,7 +1610,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x64",
+                    "0x8692c26f665bc7ad",
                     "0x"
                 ],
                 "gasLimit": "7,000,000",
@@ -1633,7 +1633,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x64",
+                    "0x2d3a93b7522e72b6",
                     "0x"
                 ],
                 "gasLimit": "7,000,000",
@@ -1656,7 +1656,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x64",
+                    "0x4faa49415e935688",
                     "0x"
                 ],
                 "gasLimit": "7,000,000",
@@ -1679,7 +1679,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x64",
+                    "0x5cbca2cc253dbf54",
                     "0x"
                 ],
                 "gasLimit": "7,000,000",
@@ -1702,7 +1702,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x64",
+                    "0xdd20d194dd695735",
                     "0x"
                 ],
                 "gasLimit": "7,000,000",
@@ -1725,7 +1725,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x64",
+                    "0x32f039c1765a2ec3",
                     "0x"
                 ],
                 "gasLimit": "7,000,000",
@@ -1748,7 +1748,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x64",
+                    "0x84372c9de3d535d9",
                     "0x"
                 ],
                 "gasLimit": "7,000,000",
@@ -1771,7 +1771,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x64",
+                    "0x91b23ed59de93417",
                     "0x"
                 ],
                 "gasLimit": "7,000,000",
@@ -1794,7 +1794,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x64",
+                    "0x4b81d1a55887f5f9",
                     "0x"
                 ],
                 "gasLimit": "7,000,000",
@@ -1817,7 +1817,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x64",
+                    "0xd88e348ef6679e1d",
                     "0x"
                 ],
                 "gasLimit": "7,000,000",
@@ -1840,7 +1840,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x64",
+                    "0x2557834dc8059cc7",
                     "0x"
                 ],
                 "gasLimit": "7,000,000",
@@ -1863,7 +1863,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x64",
+                    "0x22d86f8317546033",
                     "0x"
                 ],
                 "gasLimit": "7,000,000",
@@ -1886,7 +1886,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x64",
+                    "0x5a775ddd32ca5367",
                     "0x"
                 ],
                 "gasLimit": "7,000,000",
@@ -1909,7 +1909,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x64",
+                    "0x59f049471cd2662c",
                     "0x"
                 ],
                 "gasLimit": "7,000,000",
@@ -1932,7 +1932,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x64",
+                    "0xb59fdc2aedbf845f",
                     "0x"
                 ],
                 "gasLimit": "7,000,000",
@@ -1955,7 +1955,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x64",
+                    "0xab13e96eb802f883",
                     "0x"
                 ],
                 "gasLimit": "7,000,000",
@@ -1978,7 +1978,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x64",
+                    "0xf6f152ab53ad7170",
                     "0x"
                 ],
                 "gasLimit": "7,000,000",
@@ -2001,7 +2001,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x64",
+                    "0x5bae78b87d516979",
                     "0x"
                 ],
                 "gasLimit": "7,000,000",
@@ -2024,7 +2024,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x64",
+                    "0xe47859cc0fdb0abe",
                     "0x"
                 ],
                 "gasLimit": "7,000,000",
@@ -2047,7 +2047,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x64",
+                    "0x7c36ab1fa1a348b4",
                     "0x"
                 ],
                 "gasLimit": "7,000,000",
@@ -2070,7 +2070,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x64",
+                    "0x7fda3ef39b74e04b",
                     "0x"
                 ],
                 "gasLimit": "7,000,000",
@@ -2093,7 +2093,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x64",
+                    "0x461d81a84db50115",
                     "0x"
                 ],
                 "gasLimit": "7,000,000",
@@ -2116,7 +2116,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x64",
+                    "0xcc0ab8ccc363dd0c",
                     "0x"
                 ],
                 "gasLimit": "7,000,000",
@@ -2139,7 +2139,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x64",
+                    "0x11c15058c7c6c1fa",
                     "0x"
                 ],
                 "gasLimit": "7,000,000",
@@ -2162,7 +2162,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x64",
+                    "0x293b700535555d4f",
                     "0x"
                 ],
                 "gasLimit": "7,000,000",
@@ -2185,7 +2185,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x64",
+                    "0x4e8d04d2f0e53efd",
                     "0x"
                 ],
                 "gasLimit": "7,000,000",
@@ -2208,7 +2208,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x64",
+                    "0x42be3651d7b9499e",
                     "0x"
                 ],
                 "gasLimit": "7,000,000",
@@ -2231,7 +2231,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x64",
+                    "0xb82a437fc87cd8a0",
                     "0x"
                 ],
                 "gasLimit": "7,000,000",
@@ -2254,7 +2254,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x64",
+                    "0xb12ebd0d9ff3f396",
                     "0x"
                 ],
                 "gasLimit": "7,000,000",
@@ -2277,7 +2277,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x64",
+                    "0x85b4d01e5a20d445",
                     "0x"
                 ],
                 "gasLimit": "7,000,000",
@@ -2300,7 +2300,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x64",
+                    "0x92edaca582002375",
                     "0x"
                 ],
                 "gasLimit": "7,000,000",
@@ -2323,7 +2323,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x64",
+                    "0x351151b47fee6331",
                     "0x"
                 ],
                 "gasLimit": "7,000,000",
@@ -2346,7 +2346,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x64",
+                    "0x9155d2992ceb6beb",
                     "0x"
                 ],
                 "gasLimit": "7,000,000",
@@ -2369,7 +2369,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x64",
+                    "0xdbc0895ce5855dec",
                     "0x"
                 ],
                 "gasLimit": "50,000,000",
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 e2f3f0b4f0..5141338e26 100644
--- a/contracts/core/price-aggregator/tests/price_aggregator_stress_blackbox.rs
+++ b/contracts/core/price-aggregator/tests/price_aggregator_stress_blackbox.rs
@@ -9,7 +9,7 @@ use multiversx_sc::{
 use multiversx_sc_modules::{pause::ProxyTrait, staking::ProxyTrait as _};
 use multiversx_sc_scenario::{
     api::StaticApi,
-    managed_address, managed_biguint, managed_buffer,
+    managed_address, managed_buffer,
     scenario_model::{Account, AddressValue, ScCallStep, ScDeployStep, SetStateStep},
     ContractInfo, DebugApi, ScenarioWorld, WhiteboxContract,
 };
@@ -167,11 +167,12 @@ fn test_price_aggregator_submit() {
     // unpause
     state.unpause_endpoint();
 
-    state.submit(&state.oracles[0].clone(), 95, 100);
+    // submit first
+    state.submit(&state.oracles[0].clone(), 95, rand::random::<u64>());
 
     // submit ok
     for index in 1..SUBMISSION_COUNT - 1 {
-        state.submit(&state.oracles[index].clone(), 100, 100);
+        state.submit(&state.oracles[index].clone(), 100, rand::random::<u64>());
     }
 
     let current_timestamp = 100;
@@ -202,13 +203,6 @@ fn test_price_aggregator_submit() {
             assert_eq!(submissions.len(), SUBMISSION_COUNT - 1);
 
             for index in 0..SUBMISSION_COUNT - 1 {
-                assert_eq!(
-                    submissions
-                        .get(&managed_address!(&state.oracles[index].to_address()))
-                        .unwrap(),
-                    managed_biguint!(100)
-                );
-
                 assert_eq!(
                     sc.oracle_status()
                         .get(&managed_address!(&state.oracles[index].to_address()))
@@ -221,7 +215,12 @@ fn test_price_aggregator_submit() {
             }
         });
 
-    state.submit(&state.oracles[SUBMISSION_COUNT - 1].clone(), 100, 100);
+    // submit last that resets the round
+    state.submit(
+        &state.oracles[SUBMISSION_COUNT - 1].clone(),
+        100,
+        rand::random::<u64>(),
+    );
     state
         .world
         .write_scenario_trace("scenarios/stress_submit_test.scen.json");

From 9f5513b6007284bfdc8fff3aeaf8f83efe8a5cdf Mon Sep 17 00:00:00 2001
From: Alin Cruceat <alyn_509@yahoo.com>
Date: Wed, 15 Nov 2023 14:22:12 +0200
Subject: [PATCH 0060/1254] fix dependencies for random

---
 Cargo.lock                                    |   3 +
 contracts/core/price-aggregator/Cargo.toml    |   1 +
 .../core/price-aggregator/wasm/Cargo.lock     | 138 ++++++++++++++++++
 3 files changed, 142 insertions(+)

diff --git a/Cargo.lock b/Cargo.lock
index a3df268907..9ff17f62f5 100755
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1327,8 +1327,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427"
 dependencies = [
  "cfg-if",
+ "js-sys",
  "libc",
  "wasi",
+ "wasm-bindgen",
 ]
 
 [[package]]
@@ -1987,6 +1989,7 @@ name = "multiversx-price-aggregator-sc"
 version = "0.44.0"
 dependencies = [
  "arrayvec",
+ "getrandom",
  "multiversx-sc",
  "multiversx-sc-modules",
  "multiversx-sc-scenario",
diff --git a/contracts/core/price-aggregator/Cargo.toml b/contracts/core/price-aggregator/Cargo.toml
index fcd121225f..a2237b89ec 100644
--- a/contracts/core/price-aggregator/Cargo.toml
+++ b/contracts/core/price-aggregator/Cargo.toml
@@ -33,3 +33,4 @@ path = "../../../framework/scenario"
 [dependencies]
 arrayvec = { version = "0.7.1", default-features = false }
 rand = { version = "0.8.5" }
+getrandom = { version = "0.2", features = ["js"] }
diff --git a/contracts/core/price-aggregator/wasm/Cargo.lock b/contracts/core/price-aggregator/wasm/Cargo.lock
index 88fcbd715b..12c1f932f4 100644
--- a/contracts/core/price-aggregator/wasm/Cargo.lock
+++ b/contracts/core/price-aggregator/wasm/Cargo.lock
@@ -32,6 +32,12 @@ version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
+[[package]]
+name = "bumpalo"
+version = "3.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec"
+
 [[package]]
 name = "cfg-if"
 version = "1.0.0"
@@ -44,6 +50,19 @@ version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
+[[package]]
+name = "getrandom"
+version = "0.2.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f"
+dependencies = [
+ "cfg-if",
+ "js-sys",
+ "libc",
+ "wasi",
+ "wasm-bindgen",
+]
+
 [[package]]
 name = "hashbrown"
 version = "0.13.2"
@@ -65,13 +84,36 @@ version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
 
+[[package]]
+name = "js-sys"
+version = "0.3.65"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "54c0c35952f67de54bb584e9fd912b3023117cbafc0a77d8f3dee1fb5f572fe8"
+dependencies = [
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "libc"
+version = "0.2.150"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c"
+
+[[package]]
+name = "log"
+version = "0.4.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
+
 [[package]]
 name = "multiversx-price-aggregator-sc"
 version = "0.44.0"
 dependencies = [
  "arrayvec",
+ "getrandom",
  "multiversx-sc",
  "multiversx-sc-modules",
+ "rand",
 ]
 
 [[package]]
@@ -161,6 +203,12 @@ version = "1.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
 
+[[package]]
+name = "ppv-lite86"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
+
 [[package]]
 name = "proc-macro2"
 version = "1.0.69"
@@ -189,6 +237,36 @@ dependencies = [
  "nibble_vec",
 ]
 
+[[package]]
+name = "rand"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
+dependencies = [
+ "libc",
+ "rand_chacha",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
+dependencies = [
+ "ppv-lite86",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+dependencies = [
+ "getrandom",
+]
+
 [[package]]
 name = "smallvec"
 version = "1.11.1"
@@ -229,6 +307,66 @@ version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
+[[package]]
+name = "wasi"
+version = "0.11.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.88"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7daec296f25a1bae309c0cd5c29c4b260e510e6d813c286b19eaadf409d40fce"
+dependencies = [
+ "cfg-if",
+ "wasm-bindgen-macro",
+]
+
+[[package]]
+name = "wasm-bindgen-backend"
+version = "0.2.88"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e397f4664c0e4e428e8313a469aaa58310d302159845980fd23b0f22a847f217"
+dependencies = [
+ "bumpalo",
+ "log",
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.38",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.88"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5961017b3b08ad5f3fe39f1e79877f8ee7c23c5e5fd5eb80de95abc41f1f16b2"
+dependencies = [
+ "quote",
+ "wasm-bindgen-macro-support",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.88"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c5353b8dab669f5e10f5bd76df26a9360c748f054f862ff5f3f8aae0c7fb3907"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.38",
+ "wasm-bindgen-backend",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.88"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0d046c5d029ba91a1ed14da14dca44b68bf2f124cfbaf741c54151fdb3e0750b"
+
 [[package]]
 name = "zerocopy"
 version = "0.7.24"

From 21b14d18c810f38882a7caf8586a21a2fbb8e116 Mon Sep 17 00:00:00 2001
From: Alin Cruceat <alyn_509@yahoo.com>
Date: Wed, 15 Nov 2023 15:31:28 +0200
Subject: [PATCH 0061/1254] small int overflow

---
 .../scenarios/small_int_overflow.scen.json    |  48 ---
 .../scenarios/small_num_overflow.scen.json    | 359 ++++++++++++++++++
 .../basic-features/src/basic_features_main.rs |   1 +
 .../src/small_num_overflow_test_ops.rs        | 108 +++++-
 .../tests/basic_features_scenario_rs_test.rs  |   5 +
 .../basic-features/wasm/src/lib.rs            |  24 +-
 6 files changed, 483 insertions(+), 62 deletions(-)
 delete mode 100644 contracts/feature-tests/basic-features/scenarios/small_int_overflow.scen.json
 create mode 100644 contracts/feature-tests/basic-features/scenarios/small_num_overflow.scen.json

diff --git a/contracts/feature-tests/basic-features/scenarios/small_int_overflow.scen.json b/contracts/feature-tests/basic-features/scenarios/small_int_overflow.scen.json
deleted file mode 100644
index c7cfe8dd09..0000000000
--- a/contracts/feature-tests/basic-features/scenarios/small_int_overflow.scen.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-    "name": "overflow",
-    "gasSchedule": "v3",
-    "steps": [
-        {
-            "step": "setState",
-            "accounts": {
-                "sc:basic-features": {
-                    "nonce": "0",
-                    "balance": "0",
-                    "storage": {},
-                    "code": "file:../output/basic-features.wasm"
-                },
-                "address:an_account": {
-                    "nonce": "0",
-                    "balance": "0",
-                    "storage": {},
-                    "code": ""
-                }
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "pow",
-            "tx": {
-                "from": "address:an_account",
-                "to": "sc:basic-features",
-                "value": "0",
-                "function": "pow_big_uint",
-                "arguments": [
-                    "10",
-                    "80"
-                ],
-                "gasLimit": "50,000,000",
-                "gasPrice": "0"
-            },
-            "expect": {
-                "out": [
-                    "100000000000000000000000000000000000000000000000000000000000000000000000000000000"
-                ],
-                "status": "0",
-                "logs": "*",
-                "gas": "*",
-                "refund": "*"
-            }
-        }
-    ]
-}
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
new file mode 100644
index 0000000000..fadfd8710a
--- /dev/null
+++ b/contracts/feature-tests/basic-features/scenarios/small_num_overflow.scen.json
@@ -0,0 +1,359 @@
+{
+    "name": "overflow",
+    "gasSchedule": "v3",
+    "steps": [
+        {
+            "step": "setState",
+            "accounts": {
+                "sc:basic-features": {
+                    "nonce": "0",
+                    "balance": "0",
+                    "storage": {},
+                    "code": "file:../output/basic-features.wasm"
+                },
+                "address:an_account": {
+                    "nonce": "0",
+                    "balance": "0",
+                    "storage": {},
+                    "code": ""
+                }
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "u8",
+            "tx": {
+                "from": "address:an_account",
+                "to": "sc:basic-features",
+                "value": "0",
+                "function": "u8",
+                "arguments": [],
+                "gasLimit": "50,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "status": "4",
+                "message": "str:panic occurred",
+                "logs": "*",
+                "gas": "*",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "u8_overflow",
+            "tx": {
+                "from": "address:an_account",
+                "to": "sc:basic-features",
+                "value": "0",
+                "function": "u8_overflow",
+                "arguments": [],
+                "gasLimit": "50,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": [
+                    "0"
+                ],
+                "status": "0",
+                "logs": "*",
+                "gas": "*",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "i8",
+            "tx": {
+                "from": "address:an_account",
+                "to": "sc:basic-features",
+                "value": "0",
+                "function": "i8",
+                "arguments": [],
+                "gasLimit": "50,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "status": "4",
+                "message": "str:panic occurred",
+                "logs": "*",
+                "gas": "*",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "i8_overflow",
+            "tx": {
+                "from": "address:an_account",
+                "to": "sc:basic-features",
+                "value": "0",
+                "function": "i8_overflow",
+                "arguments": [],
+                "gasLimit": "50,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": [
+                    "0x80"
+                ],
+                "status": "0",
+                "logs": "*",
+                "gas": "*",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "u16",
+            "tx": {
+                "from": "address:an_account",
+                "to": "sc:basic-features",
+                "value": "0",
+                "function": "u16",
+                "arguments": [],
+                "gasLimit": "50,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "status": "4",
+                "message": "str:panic occurred",
+                "logs": "*",
+                "gas": "*",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "u16_overflow",
+            "tx": {
+                "from": "address:an_account",
+                "to": "sc:basic-features",
+                "value": "0",
+                "function": "u16_overflow",
+                "arguments": [],
+                "gasLimit": "50,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": [
+                    "0"
+                ],
+                "status": "0",
+                "logs": "*",
+                "gas": "*",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "i16",
+            "tx": {
+                "from": "address:an_account",
+                "to": "sc:basic-features",
+                "value": "0",
+                "function": "i16",
+                "arguments": [],
+                "gasLimit": "50,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "status": "4",
+                "message": "str:panic occurred",
+                "logs": "*",
+                "gas": "*",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "i16_overflow",
+            "tx": {
+                "from": "address:an_account",
+                "to": "sc:basic-features",
+                "value": "0",
+                "function": "i16_overflow",
+                "arguments": [],
+                "gasLimit": "50,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": [
+                    "0x8000"
+                ],
+                "status": "0",
+                "logs": "*",
+                "gas": "*",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "u32",
+            "tx": {
+                "from": "address:an_account",
+                "to": "sc:basic-features",
+                "value": "0",
+                "function": "u32",
+                "arguments": [],
+                "gasLimit": "50,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "status": "4",
+                "message": "str:panic occurred",
+                "logs": "*",
+                "gas": "*",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "u32_overflow",
+            "tx": {
+                "from": "address:an_account",
+                "to": "sc:basic-features",
+                "value": "0",
+                "function": "u32_overflow",
+                "arguments": [],
+                "gasLimit": "50,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": [
+                    "0"
+                ],
+                "status": "0",
+                "logs": "*",
+                "gas": "*",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "i32",
+            "tx": {
+                "from": "address:an_account",
+                "to": "sc:basic-features",
+                "value": "0",
+                "function": "i32",
+                "arguments": [],
+                "gasLimit": "50,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "status": "4",
+                "message": "str:panic occurred",
+                "logs": "*",
+                "gas": "*",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "i32_overflow",
+            "tx": {
+                "from": "address:an_account",
+                "to": "sc:basic-features",
+                "value": "0",
+                "function": "i32_overflow",
+                "arguments": [],
+                "gasLimit": "50,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": [
+                    "0x80000000"
+                ],
+                "status": "0",
+                "logs": "*",
+                "gas": "*",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "u64",
+            "tx": {
+                "from": "address:an_account",
+                "to": "sc:basic-features",
+                "value": "0",
+                "function": "u64",
+                "arguments": [],
+                "gasLimit": "50,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "status": "4",
+                "message": "str:panic occurred",
+                "logs": "*",
+                "gas": "*",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "u64_overflow",
+            "tx": {
+                "from": "address:an_account",
+                "to": "sc:basic-features",
+                "value": "0",
+                "function": "u64_overflow",
+                "arguments": [],
+                "gasLimit": "50,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": [
+                    "0"
+                ],
+                "status": "0",
+                "logs": "*",
+                "gas": "*",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "i64",
+            "tx": {
+                "from": "address:an_account",
+                "to": "sc:basic-features",
+                "value": "0",
+                "function": "i64",
+                "arguments": [],
+                "gasLimit": "50,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "status": "4",
+                "message": "str:panic occurred",
+                "logs": "*",
+                "gas": "*",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "i64_overflow",
+            "tx": {
+                "from": "address:an_account",
+                "to": "sc:basic-features",
+                "value": "0",
+                "function": "i64_overflow",
+                "arguments": [],
+                "gasLimit": "50,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": [
+                    "0x8000000000000000"
+                ],
+                "status": "0",
+                "logs": "*",
+                "gas": "*",
+                "refund": "*"
+            }
+        }
+    ]
+}
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 4111b7a5e7..2523546192 100644
--- a/contracts/feature-tests/basic-features/src/basic_features_main.rs
+++ b/contracts/feature-tests/basic-features/src/basic_features_main.rs
@@ -70,6 +70,7 @@ pub trait BasicFeatures:
     + storage_mapper_non_fungible_token::NonFungibleTokenMapperFeatures
     + storage_mapper_unique_id_mapper::UniqueIdMapperFeatures
     + struct_eq::StructEquals
+    + small_num_overflow_test_ops::SmallIntOverflow
     + token_identifier_features::TokenIdentifierFeatures
     + non_zero_features::TypeFeatures
     + multiversx_sc_modules::default_issue_callbacks::DefaultIssueCallbacksModule
diff --git a/contracts/feature-tests/basic-features/src/small_num_overflow_test_ops.rs b/contracts/feature-tests/basic-features/src/small_num_overflow_test_ops.rs
index 466e55bfbd..23cdd4eca8 100644
--- a/contracts/feature-tests/basic-features/src/small_num_overflow_test_ops.rs
+++ b/contracts/feature-tests/basic-features/src/small_num_overflow_test_ops.rs
@@ -1,31 +1,115 @@
 multiversx_sc::imports!();
 
-/// Checks that BigUint/BigInt operators work as expected.
+/// Used for testing overflow on small int types
 #[multiversx_sc::module]
 #[allow(clippy::redundant_clone)]
-pub trait SmallIntOperators {
+pub trait SmallIntOverflow {
     #[endpoint]
-    fn add_usize(&self, a: usize, b: usize) -> usize {
-        a + b
+    #[allow(arithmetic_overflow)]
+    fn usize(&self) -> usize {
+        usize::MAX + 1
     }
 
     #[endpoint]
-    fn add_u8(&self, a: u8, b: u8) -> u8 {
-        a + b
+    #[allow(arithmetic_overflow)]
+    fn u8(&self) -> u8 {
+        u8::MAX + 1
     }
 
     #[endpoint]
-    fn add_u16(&self, a: u16, b: u16) -> u16 {
-        a + b
+    #[allow(arithmetic_overflow)]
+    fn u16(&self) -> u16 {
+        u16::MAX + 1
     }
 
     #[endpoint]
-    fn add_u32(&self, a: u32, b: u32) -> u32 {
-        a + b
+    #[allow(arithmetic_overflow)]
+    fn u32(&self) -> u32 {
+        u32::MAX + 1
     }
 
     #[endpoint]
-    fn add_u64(&self, a: u64, b: u64) -> u64 {
-        a + b
+    #[allow(arithmetic_overflow)]
+    fn u64(&self) -> u64 {
+        u64::MAX + 1
+    }
+    #[endpoint]
+    fn usize_overflow(&self) -> usize {
+        usize::MAX.wrapping_add(1)
+    }
+
+    #[endpoint]
+    fn u8_overflow(&self) -> u8 {
+        u8::MAX.wrapping_add(1)
+    }
+
+    #[endpoint]
+    fn u16_overflow(&self) -> u16 {
+        u16::MAX.wrapping_add(1)
+    }
+
+    #[endpoint]
+    fn u32_overflow(&self) -> u32 {
+        u32::MAX.wrapping_add(1)
+    }
+
+    #[endpoint]
+    fn u64_overflow(&self) -> u64 {
+        u64::MAX.wrapping_add(1)
+    }
+
+    #[endpoint]
+    #[allow(arithmetic_overflow)]
+    fn isize(&self) -> isize {
+        isize::MAX + 1
+    }
+
+    #[endpoint]
+    #[allow(arithmetic_overflow)]
+    fn i8(&self) -> i8 {
+        i8::MAX + 1
+    }
+
+    #[endpoint]
+    #[allow(arithmetic_overflow)]
+    fn i16(&self) -> i16 {
+        i16::MAX + 1
+    }
+
+    #[endpoint]
+    #[allow(arithmetic_overflow)]
+    fn i32(&self) -> i32 {
+        i32::MAX + 1
+    }
+
+    #[endpoint]
+    #[allow(arithmetic_overflow)]
+    fn i64(&self) -> i64 {
+        i64::MAX + 1
+    }
+
+    #[endpoint]
+    fn isize_overflow(&self) -> isize {
+        isize::MAX.wrapping_add(1)
+    }
+
+    #[endpoint]
+    fn i8_overflow(&self) -> i8 {
+        i8::MAX.wrapping_add(1)
+    }
+
+    #[endpoint]
+    fn i16_overflow(&self) -> i16 {
+        i16::MAX.wrapping_add(1)
+    }
+
+    #[endpoint]
+    fn i32_overflow(&self) -> i32 {
+        i32::MAX.wrapping_add(1)
+    }
+
+    #[endpoint]
+    fn i64_overflow(&self) -> i64 {
+        i64::MAX.wrapping_add(1)
     }
 }
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 08283808b4..c5ec7fee12 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
@@ -36,6 +36,11 @@ fn big_uint_eq_u_64_rs() {
     world().run("scenarios/big_uint_eq_u64.scen.json");
 }
 
+#[test]
+fn small_num_overflow_rs() {
+    world().run("scenarios/small_num_overflow.scen.json");
+}
+
 #[test]
 fn big_uint_from_u_64_rs() {
     world().run("scenarios/big_uint_from_u64.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 f0319f6e1f..243ed86d47 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:                          340
+// Endpoints:                          360
 // Async Callback:                       1
-// Total number of exported functions: 342
+// Total number of exported functions: 362
 
 #![no_std]
 
@@ -357,6 +357,26 @@ multiversx_sc_wasm_adapter::endpoints! {
         unique_id_mapper_set => unique_id_mapper_set
         unique_id_mapper => unique_id_mapper
         managed_struct_eq => managed_struct_eq
+        usize => usize
+        u8 => u8
+        u16 => u16
+        u32 => u32
+        u64 => u64
+        usize_overflow => usize_overflow
+        u8_overflow => u8_overflow
+        u16_overflow => u16_overflow
+        u32_overflow => u32_overflow
+        u64_overflow => u64_overflow
+        isize => isize
+        i8 => i8
+        i16 => i16
+        i32 => i32
+        i64 => i64
+        isize_overflow => isize_overflow
+        i8_overflow => i8_overflow
+        i16_overflow => i16_overflow
+        i32_overflow => i32_overflow
+        i64_overflow => i64_overflow
         token_identifier_egld => token_identifier_egld
         token_identifier_is_valid_1 => token_identifier_is_valid_1
         token_identifier_is_valid_2 => token_identifier_is_valid_2

From 15193a1bd2a219ca70eb8913e780c126c016ab24 Mon Sep 17 00:00:00 2001
From: Alin Cruceat <alyn_509@yahoo.com>
Date: Wed, 15 Nov 2023 15:36:23 +0200
Subject: [PATCH 0062/1254] test all int and uint types

---
 .../scenarios/small_num_overflow.scen.json    | 92 ++++++++++++++++++-
 .../src/small_num_overflow_test_ops.rs        | 20 ++--
 2 files changed, 98 insertions(+), 14 deletions(-)

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 fadfd8710a..3ec613769c 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
@@ -95,7 +95,7 @@
             },
             "expect": {
                 "out": [
-                    "0x80"
+                    "-2"
                 ],
                 "status": "0",
                 "logs": "*",
@@ -179,7 +179,7 @@
             },
             "expect": {
                 "out": [
-                    "0x8000"
+                    "-2"
                 ],
                 "status": "0",
                 "logs": "*",
@@ -263,7 +263,7 @@
             },
             "expect": {
                 "out": [
-                    "0x80000000"
+                    "-2"
                 ],
                 "status": "0",
                 "logs": "*",
@@ -347,7 +347,91 @@
             },
             "expect": {
                 "out": [
-                    "0x8000000000000000"
+                    "-2"
+                ],
+                "status": "0",
+                "logs": "*",
+                "gas": "*",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "usize",
+            "tx": {
+                "from": "address:an_account",
+                "to": "sc:basic-features",
+                "value": "0",
+                "function": "usize",
+                "arguments": [],
+                "gasLimit": "50,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "status": "4",
+                "message": "str:panic occurred",
+                "logs": "*",
+                "gas": "*",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "usize_overflow",
+            "tx": {
+                "from": "address:an_account",
+                "to": "sc:basic-features",
+                "value": "0",
+                "function": "usize_overflow",
+                "arguments": [],
+                "gasLimit": "50,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": [
+                    "0"
+                ],
+                "status": "0",
+                "logs": "*",
+                "gas": "*",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "isize",
+            "tx": {
+                "from": "address:an_account",
+                "to": "sc:basic-features",
+                "value": "0",
+                "function": "isize",
+                "arguments": [],
+                "gasLimit": "50,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "status": "4",
+                "message": "str:panic occurred",
+                "logs": "*",
+                "gas": "*",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "isize_overflow",
+            "tx": {
+                "from": "address:an_account",
+                "to": "sc:basic-features",
+                "value": "0",
+                "function": "isize_overflow",
+                "arguments": [],
+                "gasLimit": "50,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": [
+                    "-2"
                 ],
                 "status": "0",
                 "logs": "*",
diff --git a/contracts/feature-tests/basic-features/src/small_num_overflow_test_ops.rs b/contracts/feature-tests/basic-features/src/small_num_overflow_test_ops.rs
index 23cdd4eca8..58423fd404 100644
--- a/contracts/feature-tests/basic-features/src/small_num_overflow_test_ops.rs
+++ b/contracts/feature-tests/basic-features/src/small_num_overflow_test_ops.rs
@@ -61,55 +61,55 @@ pub trait SmallIntOverflow {
     #[endpoint]
     #[allow(arithmetic_overflow)]
     fn isize(&self) -> isize {
-        isize::MAX + 1
+        isize::MAX + isize::MAX
     }
 
     #[endpoint]
     #[allow(arithmetic_overflow)]
     fn i8(&self) -> i8 {
-        i8::MAX + 1
+        i8::MAX + i8::MAX
     }
 
     #[endpoint]
     #[allow(arithmetic_overflow)]
     fn i16(&self) -> i16 {
-        i16::MAX + 1
+        i16::MAX + i16::MAX
     }
 
     #[endpoint]
     #[allow(arithmetic_overflow)]
     fn i32(&self) -> i32 {
-        i32::MAX + 1
+        i32::MAX + i32::MAX
     }
 
     #[endpoint]
     #[allow(arithmetic_overflow)]
     fn i64(&self) -> i64 {
-        i64::MAX + 1
+        i64::MAX + i64::MAX
     }
 
     #[endpoint]
     fn isize_overflow(&self) -> isize {
-        isize::MAX.wrapping_add(1)
+        isize::MAX.wrapping_add(isize::MAX)
     }
 
     #[endpoint]
     fn i8_overflow(&self) -> i8 {
-        i8::MAX.wrapping_add(1)
+        i8::MAX.wrapping_add(i8::MAX)
     }
 
     #[endpoint]
     fn i16_overflow(&self) -> i16 {
-        i16::MAX.wrapping_add(1)
+        i16::MAX.wrapping_add(i16::MAX)
     }
 
     #[endpoint]
     fn i32_overflow(&self) -> i32 {
-        i32::MAX.wrapping_add(1)
+        i32::MAX.wrapping_add(i32::MAX)
     }
 
     #[endpoint]
     fn i64_overflow(&self) -> i64 {
-        i64::MAX.wrapping_add(1)
+        i64::MAX.wrapping_add(i64::MAX)
     }
 }

From 5464e24eb7ee9b452935a7e3684b75399b640653 Mon Sep 17 00:00:00 2001
From: Alin Cruceat <alyn_509@yahoo.com>
Date: Wed, 15 Nov 2023 16:05:48 +0200
Subject: [PATCH 0063/1254] remove missing test files

---
 .../basic-features/tests/basic_features_scenario_go_test.rs  | 5 -----
 .../basic-features/tests/basic_features_scenario_rs_test.rs  | 5 -----
 2 files changed, 10 deletions(-)

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 3f8a7e5964..8cc67d2be5 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
@@ -39,11 +39,6 @@ fn big_uint_pow_go() {
     world().run("scenarios/big_uint_pow.scen.json");
 }
 
-#[test]
-fn big_uint_overflow_go() {
-    world().run("scenarios/big_uint_overflow.scen.json");
-}
-
 #[test]
 fn big_uint_to_u_64_go() {
     world().run("scenarios/big_uint_to_u64.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 8604bd2261..3f39fd3b04 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
@@ -56,11 +56,6 @@ fn big_uint_pow_rs() {
     world().run("scenarios/big_uint_sqrt.scen.json");
 }
 
-#[test]
-fn big_uint_overflow_rs() {
-    world().run("scenarios/big_uint_overflow.scen.json");
-}
-
 #[test]
 fn big_uint_to_u_64_rs() {
     world().run("scenarios/big_uint_to_u64.scen.json");

From a52748fe5ce6238f4d141fa57171f1f3747d97d1 Mon Sep 17 00:00:00 2001
From: Alin Cruceat <alyn_509@yahoo.com>
Date: Wed, 15 Nov 2023 16:13:15 +0200
Subject: [PATCH 0064/1254] fix wasm + scenario names

---
 .../basic-features/tests/basic_features_scenario_rs_test.rs  | 4 ++--
 contracts/feature-tests/basic-features/wasm/src/lib.rs       | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

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 3f39fd3b04..3479b19680 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
@@ -48,12 +48,12 @@ fn big_uint_from_u_64_rs() {
 
 #[test]
 fn big_uint_sqrt_rs() {
-    world().run("scenarios/big_uint_pow.scen.json");
+    world().run("scenarios/big_uint_sqrt.scen.json");
 }
 
 #[test]
 fn big_uint_pow_rs() {
-    world().run("scenarios/big_uint_sqrt.scen.json");
+    world().run("scenarios/big_uint_pow.scen.json");
 }
 
 #[test]
diff --git a/contracts/feature-tests/basic-features/wasm/src/lib.rs b/contracts/feature-tests/basic-features/wasm/src/lib.rs
index c0223d5dcf..977a9832e0 100644
--- a/contracts/feature-tests/basic-features/wasm/src/lib.rs
+++ b/contracts/feature-tests/basic-features/wasm/src/lib.rs
@@ -5,10 +5,9 @@
 ////////////////////////////////////////////////////
 
 // Init:                                 1
-// Endpoints:                          360
+// Endpoints:                          368
 // Async Callback:                       1
-// Total number of exported functions: 362
-
+// Total number of exported functions: 370
 
 #![no_std]
 

From c85996973dc4cb144a37d156f9ce138e71a10bcb Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 15 Nov 2023 16:28:58 +0200
Subject: [PATCH 0065/1254] scenario log fix

---
 .../crowdfunding-claim-failed.scen.json       |  4 +--
 .../crowdfunding-claim-successful.scen.json   |  2 +-
 .../scenarios/rewardAndSendToWallet.scen.json |  2 +-
 .../scenarios/topUp_withdraw.scen.json        |  2 +-
 .../scenarios/withdraw_Ok.scen.json           |  2 +-
 .../multisig/scenarios/sendEsdt.scen.json     | 33 +++++++++----------
 .../recursive_caller_egld_2.scen.json         |  4 +--
 .../recursive_caller_esdt_2.scen.json         |  4 +--
 .../scenarios/forw_queue_async.scen.json      |  6 ++--
 .../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 ++-
 ...m_AllDistinct-BalanceEqAllowance.scen.json |  4 ++-
 ..._AllDistinct-BalanceNEqAllowance.scen.json |  4 ++-
 ...istinct-EntireBalanceEqAllowance.scen.json |  4 ++-
 ...nsferFrom_AllDistinct-NoOverflow.scen.json |  4 ++-
 ...From_AllDistinct-StillNoOverflow.scen.json |  4 ++-
 ...nsferFrom_AllEqual-EntireBalance.scen.json |  4 ++-
 ...rFrom_CallerEqFrom-EntireBalance.scen.json |  4 ++-
 ...m_CallerEqTo-BalanceNEqAllowance.scen.json |  4 ++-
 ...oratory-MultipleTransfersSucceed.scen.json | 16 ++++++---
 ...ploratory-MultipleTransfersThrow.scen.json | 12 +++++--
 ...From_FromEqTo-BalanceEqAllowance.scen.json |  4 ++-
 ...rom_FromEqTo-BalanceNEqAllowance.scen.json |  4 ++-
 ...romEqTo-EntireBalanceEqAllowance.scen.json |  4 ++-
 ...transferFrom_FromEqTo-NoOverflow.scen.json |  4 ++-
 ...nsfer_Caller-AllowanceIrrelevant.scen.json |  8 +++--
 .../transfer_Caller-EntireBalance.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 |  8 +++--
 .../transfer_Other-EntireBalance.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 ++-
 40 files changed, 142 insertions(+), 69 deletions(-)

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..8e619c9d67 100644
--- a/contracts/examples/crowdfunding-esdt/scenarios/crowdfunding-claim-failed.scen.json
+++ b/contracts/examples/crowdfunding-esdt/scenarios/crowdfunding-claim-failed.scen.json
@@ -113,7 +113,7 @@
                             "250,000,000,000",
                             "address:donor1"
                         ],
-                        "data": ""
+                        "data": "*"
                     }
                 ],
                 "gas": "*",
@@ -144,7 +144,7 @@
                             "200,000,000,000",
                             "address:donor2"
                         ],
-                        "data": ""
+                        "data": "*"
                     }
                 ],
                 "gas": "*",
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..02f3f5f183 100644
--- a/contracts/examples/crowdfunding-esdt/scenarios/crowdfunding-claim-successful.scen.json
+++ b/contracts/examples/crowdfunding-esdt/scenarios/crowdfunding-claim-successful.scen.json
@@ -131,7 +131,7 @@
                             "500,000,000,000",
                             "address:my_address"
                         ],
-                        "data": ""
+                        "data": "*"
                     }
                 ],
                 "gas": "*",
diff --git a/contracts/examples/crypto-bubbles/scenarios/rewardAndSendToWallet.scen.json b/contracts/examples/crypto-bubbles/scenarios/rewardAndSendToWallet.scen.json
index 57680af622..2b6920796d 100644
--- a/contracts/examples/crypto-bubbles/scenarios/rewardAndSendToWallet.scen.json
+++ b/contracts/examples/crypto-bubbles/scenarios/rewardAndSendToWallet.scen.json
@@ -62,7 +62,7 @@
                             "address:acc1",
                             "0x0200"
                         ],
-                        "data": ""
+                        "data": "*"
                     },
                     {
                         "address": "sc:crypto_bubbles",
diff --git a/contracts/examples/crypto-bubbles/scenarios/topUp_withdraw.scen.json b/contracts/examples/crypto-bubbles/scenarios/topUp_withdraw.scen.json
index bbcd965745..9daa7032c1 100644
--- a/contracts/examples/crypto-bubbles/scenarios/topUp_withdraw.scen.json
+++ b/contracts/examples/crypto-bubbles/scenarios/topUp_withdraw.scen.json
@@ -75,7 +75,7 @@
                             "address:acc1",
                             "0x4000000"
                         ],
-                        "data": ""
+                        "data": "*"
                     },
                     {
                         "address": "sc:crypto_bubbles",
diff --git a/contracts/examples/crypto-bubbles/scenarios/withdraw_Ok.scen.json b/contracts/examples/crypto-bubbles/scenarios/withdraw_Ok.scen.json
index 1db8bf7ea7..fe44f57689 100644
--- a/contracts/examples/crypto-bubbles/scenarios/withdraw_Ok.scen.json
+++ b/contracts/examples/crypto-bubbles/scenarios/withdraw_Ok.scen.json
@@ -48,7 +48,7 @@
                             "address:acc1",
                             "0x10"
                         ],
-                        "data": ""
+                        "data": "*"
                     },
                     {
                         "address": "sc:crypto_bubbles",
diff --git a/contracts/examples/multisig/scenarios/sendEsdt.scen.json b/contracts/examples/multisig/scenarios/sendEsdt.scen.json
index cc93103dc2..e30ae951c8 100644
--- a/contracts/examples/multisig/scenarios/sendEsdt.scen.json
+++ b/contracts/examples/multisig/scenarios/sendEsdt.scen.json
@@ -192,7 +192,7 @@
                             "3",
                             "10"
                         ],
-                        "data": ""
+                        "data": "*"
                     },
                     {
                         "address": "sc:multisig",
@@ -201,31 +201,28 @@
                             "str:FUNG-TOKEN",
                             "0",
                             "1000",
-                            "address:esdt-owner"
-                        ],
-                        "data": ""
-                    },
-                    {
-                        "address": "sc:multisig",
-                        "endpoint": "str:MultiESDTNFTTransfer",
-                        "topics": [
                             "str:NFT-123456",
                             "1",
                             "1",
+                            "str:SFT-456789",
+                            "3",
+                            "10",
                             "address:esdt-owner"
                         ],
-                        "data": ""
+                        "data": "*"
                     },
                     {
-                        "address": "sc:multisig",
-                        "endpoint": "str:MultiESDTNFTTransfer",
+                        "address": "address:esdt-owner",
+                        "endpoint": "str:transferValueOnly",
                         "topics": [
-                            "str:SFT-456789",
-                            "3",
-                            "10",
-                            "address:esdt-owner"
+                            "",
+                            "sc:multisig"
                         ],
-                        "data": ""
+                        "data": [
+                            "str:AsyncCallback",
+                            "str:callBack",
+                            "0x00"
+                        ]
                     },
                     {
                         "address": "sc:multisig",
@@ -233,7 +230,7 @@
                         "topics": [
                             "str:asyncCallSuccess"
                         ],
-                        "data": ""
+                        "data": "*"
                     }
                 ],
                 "gas": "*",
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..29a371107c 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
@@ -59,7 +59,7 @@
                             "1",
                             "0"
                         ],
-                        "data": ""
+                        "data": "*"
                     },
                     {
                         "address": "sc:recursive-caller",
@@ -90,7 +90,7 @@
                             "1",
                             "0"
                         ],
-                        "data": ""
+                        "data": "*"
                     },
                     {
                         "address": "sc:recursive-caller",
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..399f79511e 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
@@ -62,7 +62,7 @@
                             "1",
                             "0"
                         ],
-                        "data": ""
+                        "data": "*"
                     },
                     {
                         "address": "sc:recursive-caller",
@@ -93,7 +93,7 @@
                             "1",
                             "0"
                         ],
-                        "data": ""
+                        "data": "*"
                     },
                     {
                         "address": "sc:recursive-caller",
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..3451e69a76 100644
--- a/contracts/feature-tests/composability/scenarios/forw_queue_async.scen.json
+++ b/contracts/feature-tests/composability/scenarios/forw_queue_async.scen.json
@@ -62,7 +62,7 @@
                             "str:accept_funds",
                             "1000"
                         ],
-                        "data": ""
+                        "data": "*"
                     },
                     {
                         "address": "*",
@@ -72,7 +72,7 @@
                             "sc:vault",
                             "1000"
                         ],
-                        "data": ""
+                        "data": "*"
                     },
                     {
                         "address": "sc:vault",
@@ -81,7 +81,7 @@
                             "str:accept_funds",
                             "0x03e8"
                         ],
-                        "data": ""
+                        "data": "*"
                     }
                 ],
                 "gas": "*",
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..28d624fc4d 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
@@ -46,7 +46,9 @@
                             "address:account_1",
                             "address:account_1"
                         ],
-                        "data": "0x25"
+                        "data": [
+                            "0x25"
+                        ]
                     }
                 ],
                 "gas": "*",
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..a6d8a3996d 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
@@ -46,7 +46,9 @@
                             "address:account_1",
                             "address:account_1"
                         ],
-                        "data": "0"
+                        "data": [
+                            "0"
+                        ]
                     }
                 ],
                 "gas": "*",
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..fef56e078b 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
@@ -46,7 +46,9 @@
                             "address:account_1",
                             "address:account_2"
                         ],
-                        "data": "0x2a"
+                        "data": [
+                            "0x2a"
+                        ]
                     }
                 ],
                 "gas": "*",
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..9b88eac060 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
@@ -46,7 +46,9 @@
                             "address:account_1",
                             "address:account_2"
                         ],
-                        "data": "0"
+                        "data": [
+                            "0"
+                        ]
                     }
                 ],
                 "gas": "*",
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..5d9e46cb4e 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
@@ -74,7 +74,9 @@
                             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1000000000000000000000000",
                             "address:account_1"
                         ],
-                        "data": "0x19"
+                        "data": [
+                            "0x19"
+                        ]
                     }
                 ],
                 "gas": "*",
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..a39ac25cf1 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
@@ -48,7 +48,9 @@
                             "address:coin_holder_1",
                             "address:coin_holder_2"
                         ],
-                        "data": "0x17"
+                        "data": [
+                            "0x17"
+                        ]
                     }
                 ],
                 "gas": "*",
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..31b130ae47 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
@@ -48,7 +48,9 @@
                             "address:coin_holder_1",
                             "address:coin_holder_2"
                         ],
-                        "data": "0x17"
+                        "data": [
+                            "0x17"
+                        ]
                     }
                 ],
                 "gas": "*",
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..a2f0ed9671 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
@@ -48,7 +48,9 @@
                             "address:coin_holder_1",
                             "address:coin_holder_2"
                         ],
-                        "data": "0x2710"
+                        "data": [
+                            "0x2710"
+                        ]
                     }
                 ],
                 "gas": "*",
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..6069d16cbc 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
@@ -49,7 +49,9 @@
                             "address:coin_holder_1",
                             "address:account_2"
                         ],
-                        "data": "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff5"
+                        "data": [
+                            "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff5"
+                        ]
                     }
                 ],
                 "gas": "*",
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..538227348b 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
@@ -49,7 +49,9 @@
                             "address:coin_holder_1",
                             "address:account_2"
                         ],
-                        "data": "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6"
+                        "data": [
+                            "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6"
+                        ]
                     }
                 ],
                 "gas": "*",
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..bd770c78ba 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
@@ -48,7 +48,9 @@
                             "address:account_1",
                             "address:account_1"
                         ],
-                        "data": "0x2710"
+                        "data": [
+                            "0x2710"
+                        ]
                     }
                 ],
                 "gas": "*",
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..f2baa3c4be 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
@@ -48,7 +48,9 @@
                             "address:account_1",
                             "address:account_7"
                         ],
-                        "data": "0x2710"
+                        "data": [
+                            "0x2710"
+                        ]
                     }
                 ],
                 "gas": "*",
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..3680f505d6 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
@@ -48,7 +48,9 @@
                             "address:coin_holder_1",
                             "address:account_1"
                         ],
-                        "data": "0x17"
+                        "data": [
+                            "0x17"
+                        ]
                     }
                 ],
                 "gas": "*",
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..3ec37a1163 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
@@ -48,7 +48,9 @@
                             "address:coin_holder_1",
                             "address:coin_holder_2"
                         ],
-                        "data": "0x0a"
+                        "data": [
+                            "0x0a"
+                        ]
                     }
                 ],
                 "gas": "*",
@@ -82,7 +84,9 @@
                             "address:coin_holder_1",
                             "address:account_6"
                         ],
-                        "data": "0x0a"
+                        "data": [
+                            "0x0a"
+                        ]
                     }
                 ],
                 "gas": "*",
@@ -116,7 +120,9 @@
                             "address:coin_holder_1",
                             "address:coin_holder_1"
                         ],
-                        "data": "0x0a"
+                        "data": [
+                            "0x0a"
+                        ]
                     }
                 ],
                 "gas": "*",
@@ -150,7 +156,9 @@
                             "address:coin_holder_1",
                             "address:account_1"
                         ],
-                        "data": "0x0a"
+                        "data": [
+                            "0x0a"
+                        ]
                     }
                 ],
                 "gas": "*",
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..f6d5106eff 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
@@ -48,7 +48,9 @@
                             "address:coin_holder_1",
                             "address:coin_holder_2"
                         ],
-                        "data": "0x0a"
+                        "data": [
+                            "0x0a"
+                        ]
                     }
                 ],
                 "gas": "*",
@@ -82,7 +84,9 @@
                             "address:coin_holder_1",
                             "address:account_6"
                         ],
-                        "data": "0x0a"
+                        "data": [
+                            "0x0a"
+                        ]
                     }
                 ],
                 "gas": "*",
@@ -116,7 +120,9 @@
                             "address:coin_holder_1",
                             "address:coin_holder_1"
                         ],
-                        "data": "0x0a"
+                        "data": [
+                            "0x0a"
+                        ]
                     }
                 ],
                 "gas": "*",
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..bf224b1f23 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
@@ -48,7 +48,9 @@
                             "address:coin_holder_1",
                             "address:coin_holder_1"
                         ],
-                        "data": "0x17"
+                        "data": [
+                            "0x17"
+                        ]
                     }
                 ],
                 "gas": "*",
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..4eac2e2647 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
@@ -48,7 +48,9 @@
                             "address:coin_holder_1",
                             "address:coin_holder_1"
                         ],
-                        "data": "0x17"
+                        "data": [
+                            "0x17"
+                        ]
                     }
                 ],
                 "gas": "*",
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..3241707f76 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
@@ -48,7 +48,9 @@
                             "address:coin_holder_1",
                             "address:coin_holder_1"
                         ],
-                        "data": "0x2710"
+                        "data": [
+                            "0x2710"
+                        ]
                     }
                 ],
                 "gas": "*",
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..a0401cdc46 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
@@ -49,7 +49,9 @@
                             "address:coin_holder_1",
                             "address:account_2"
                         ],
-                        "data": "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff5"
+                        "data": [
+                            "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff5"
+                        ]
                     }
                 ],
                 "gas": "*",
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..38d1478cb6 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
@@ -46,7 +46,9 @@
                             "address:account_1",
                             "address:account_1"
                         ],
-                        "data": "0x14"
+                        "data": [
+                            "0x14"
+                        ]
                     }
                 ],
                 "gas": "*",
@@ -79,7 +81,9 @@
                             "address:account_1",
                             "address:account_1"
                         ],
-                        "data": "0x17"
+                        "data": [
+                            "0x17"
+                        ]
                     }
                 ],
                 "gas": "*",
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..94ca88cc1b 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
@@ -46,7 +46,9 @@
                             "address:account_1",
                             "address:account_1"
                         ],
-                        "data": "0x2710"
+                        "data": [
+                            "0x2710"
+                        ]
                     }
                 ],
                 "gas": "*",
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..3e0762cbf2 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
@@ -46,7 +46,9 @@
                             "address:account_1",
                             "address:account_1"
                         ],
-                        "data": "0x0a"
+                        "data": [
+                            "0x0a"
+                        ]
                     }
                 ],
                 "gas": "*",
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..c6191c0bc8 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
@@ -46,7 +46,9 @@
                             "address:account_1",
                             "address:account_1"
                         ],
-                        "data": "0x17"
+                        "data": [
+                            "0x17"
+                        ]
                     }
                 ],
                 "gas": "*",
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..40d378b857 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
@@ -46,7 +46,9 @@
                             "address:account_1",
                             "address:account_1"
                         ],
-                        "data": "0x0b"
+                        "data": [
+                            "0x0b"
+                        ]
                     }
                 ],
                 "gas": "*",
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..859756fa93 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
@@ -46,7 +46,9 @@
                             "address:account_1",
                             "address:account_1"
                         ],
-                        "data": "0"
+                        "data": [
+                            "0"
+                        ]
                     }
                 ],
                 "gas": "*",
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..59a5cda004 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
@@ -46,7 +46,9 @@
                             "address:account_1",
                             "address:account_1"
                         ],
-                        "data": "0x14"
+                        "data": [
+                            "0x14"
+                        ]
                     }
                 ],
                 "gas": "*",
@@ -79,7 +81,9 @@
                             "address:account_1",
                             "address:account_7"
                         ],
-                        "data": "0x17"
+                        "data": [
+                            "0x17"
+                        ]
                     }
                 ],
                 "gas": "*",
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..9cef139719 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
@@ -46,7 +46,9 @@
                             "address:account_1",
                             "address:account_7"
                         ],
-                        "data": "0x2710"
+                        "data": [
+                            "0x2710"
+                        ]
                     }
                 ],
                 "gas": "*",
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..c8a0cc091f 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
@@ -46,7 +46,9 @@
                             "address:account_1",
                             "address:account_2"
                         ],
-                        "data": "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+                        "data": [
+                            "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+                        ]
                     }
                 ],
                 "gas": "*",
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..536b7e3ecb 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
@@ -46,7 +46,9 @@
                             "address:account_1",
                             "address:account_7"
                         ],
-                        "data": "0x17"
+                        "data": [
+                            "0x17"
+                        ]
                     }
                 ],
                 "gas": "*",
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..a2721311a0 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
@@ -47,7 +47,9 @@
                             "address:account_1",
                             "address:account_2"
                         ],
-                        "data": "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff5"
+                        "data": [
+                            "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff5"
+                        ]
                     }
                 ],
                 "gas": "*",
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..8c48192e52 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
@@ -46,7 +46,9 @@
                             "address:account_1",
                             "address:account_7"
                         ],
-                        "data": "0"
+                        "data": [
+                            "0"
+                        ]
                     }
                 ],
                 "gas": "*",

From 7a77f3dbd1a0b9171a64dff53547ace6d8963874 Mon Sep 17 00:00:00 2001
From: Alin Cruceat <alyn_509@yahoo.com>
Date: Wed, 15 Nov 2023 18:35:12 +0200
Subject: [PATCH 0066/1254] fix after review

---
 .../scenarios/small_num_overflow.scen.json    | 80 +++++++++----------
 .../src/small_num_overflow_test_ops.rs        | 38 ++++-----
 .../basic-features/wasm/src/lib.rs            | 38 ++++-----
 3 files changed, 78 insertions(+), 78 deletions(-)

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 3ec613769c..992cc9f370 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
@@ -21,12 +21,12 @@
         },
         {
             "step": "scCall",
-            "id": "u8",
+            "id": "no_overflow_u8",
             "tx": {
                 "from": "address:an_account",
                 "to": "sc:basic-features",
                 "value": "0",
-                "function": "u8",
+                "function": "no_overflow_u8",
                 "arguments": [],
                 "gasLimit": "50,000,000",
                 "gasPrice": "0"
@@ -41,12 +41,12 @@
         },
         {
             "step": "scCall",
-            "id": "u8_overflow",
+            "id": "overflow_u8",
             "tx": {
                 "from": "address:an_account",
                 "to": "sc:basic-features",
                 "value": "0",
-                "function": "u8_overflow",
+                "function": "overflow_u8",
                 "arguments": [],
                 "gasLimit": "50,000,000",
                 "gasPrice": "0"
@@ -63,12 +63,12 @@
         },
         {
             "step": "scCall",
-            "id": "i8",
+            "id": "no_overflow_i8",
             "tx": {
                 "from": "address:an_account",
                 "to": "sc:basic-features",
                 "value": "0",
-                "function": "i8",
+                "function": "no_overflow_i8",
                 "arguments": [],
                 "gasLimit": "50,000,000",
                 "gasPrice": "0"
@@ -83,12 +83,12 @@
         },
         {
             "step": "scCall",
-            "id": "i8_overflow",
+            "id": "overflow_i8",
             "tx": {
                 "from": "address:an_account",
                 "to": "sc:basic-features",
                 "value": "0",
-                "function": "i8_overflow",
+                "function": "overflow_i8",
                 "arguments": [],
                 "gasLimit": "50,000,000",
                 "gasPrice": "0"
@@ -105,12 +105,12 @@
         },
         {
             "step": "scCall",
-            "id": "u16",
+            "id": "no_overflow_u16",
             "tx": {
                 "from": "address:an_account",
                 "to": "sc:basic-features",
                 "value": "0",
-                "function": "u16",
+                "function": "no_overflow_u16",
                 "arguments": [],
                 "gasLimit": "50,000,000",
                 "gasPrice": "0"
@@ -125,12 +125,12 @@
         },
         {
             "step": "scCall",
-            "id": "u16_overflow",
+            "id": "overflow_u16",
             "tx": {
                 "from": "address:an_account",
                 "to": "sc:basic-features",
                 "value": "0",
-                "function": "u16_overflow",
+                "function": "overflow_u16",
                 "arguments": [],
                 "gasLimit": "50,000,000",
                 "gasPrice": "0"
@@ -147,12 +147,12 @@
         },
         {
             "step": "scCall",
-            "id": "i16",
+            "id": "no_overflow_i16",
             "tx": {
                 "from": "address:an_account",
                 "to": "sc:basic-features",
                 "value": "0",
-                "function": "i16",
+                "function": "no_overflow_i16",
                 "arguments": [],
                 "gasLimit": "50,000,000",
                 "gasPrice": "0"
@@ -167,12 +167,12 @@
         },
         {
             "step": "scCall",
-            "id": "i16_overflow",
+            "id": "overflow_i16",
             "tx": {
                 "from": "address:an_account",
                 "to": "sc:basic-features",
                 "value": "0",
-                "function": "i16_overflow",
+                "function": "overflow_i16",
                 "arguments": [],
                 "gasLimit": "50,000,000",
                 "gasPrice": "0"
@@ -189,12 +189,12 @@
         },
         {
             "step": "scCall",
-            "id": "u32",
+            "id": "no_overflow_u32",
             "tx": {
                 "from": "address:an_account",
                 "to": "sc:basic-features",
                 "value": "0",
-                "function": "u32",
+                "function": "no_overflow_u32",
                 "arguments": [],
                 "gasLimit": "50,000,000",
                 "gasPrice": "0"
@@ -209,12 +209,12 @@
         },
         {
             "step": "scCall",
-            "id": "u32_overflow",
+            "id": "overflow_u32",
             "tx": {
                 "from": "address:an_account",
                 "to": "sc:basic-features",
                 "value": "0",
-                "function": "u32_overflow",
+                "function": "overflow_u32",
                 "arguments": [],
                 "gasLimit": "50,000,000",
                 "gasPrice": "0"
@@ -231,12 +231,12 @@
         },
         {
             "step": "scCall",
-            "id": "i32",
+            "id": "no_overflow_i32",
             "tx": {
                 "from": "address:an_account",
                 "to": "sc:basic-features",
                 "value": "0",
-                "function": "i32",
+                "function": "no_overflow_i32",
                 "arguments": [],
                 "gasLimit": "50,000,000",
                 "gasPrice": "0"
@@ -251,12 +251,12 @@
         },
         {
             "step": "scCall",
-            "id": "i32_overflow",
+            "id": "overflow_i32",
             "tx": {
                 "from": "address:an_account",
                 "to": "sc:basic-features",
                 "value": "0",
-                "function": "i32_overflow",
+                "function": "overflow_i32",
                 "arguments": [],
                 "gasLimit": "50,000,000",
                 "gasPrice": "0"
@@ -273,12 +273,12 @@
         },
         {
             "step": "scCall",
-            "id": "u64",
+            "id": "no_overflow_u64",
             "tx": {
                 "from": "address:an_account",
                 "to": "sc:basic-features",
                 "value": "0",
-                "function": "u64",
+                "function": "no_overflow_u64",
                 "arguments": [],
                 "gasLimit": "50,000,000",
                 "gasPrice": "0"
@@ -293,12 +293,12 @@
         },
         {
             "step": "scCall",
-            "id": "u64_overflow",
+            "id": "overflow_u64",
             "tx": {
                 "from": "address:an_account",
                 "to": "sc:basic-features",
                 "value": "0",
-                "function": "u64_overflow",
+                "function": "overflow_u64",
                 "arguments": [],
                 "gasLimit": "50,000,000",
                 "gasPrice": "0"
@@ -315,12 +315,12 @@
         },
         {
             "step": "scCall",
-            "id": "i64",
+            "id": "no_overflow_i64",
             "tx": {
                 "from": "address:an_account",
                 "to": "sc:basic-features",
                 "value": "0",
-                "function": "i64",
+                "function": "no_overflow_i64",
                 "arguments": [],
                 "gasLimit": "50,000,000",
                 "gasPrice": "0"
@@ -335,12 +335,12 @@
         },
         {
             "step": "scCall",
-            "id": "i64_overflow",
+            "id": "overflow_i64",
             "tx": {
                 "from": "address:an_account",
                 "to": "sc:basic-features",
                 "value": "0",
-                "function": "i64_overflow",
+                "function": "overflow_i64",
                 "arguments": [],
                 "gasLimit": "50,000,000",
                 "gasPrice": "0"
@@ -357,12 +357,12 @@
         },
         {
             "step": "scCall",
-            "id": "usize",
+            "id": "no_overflow_usize",
             "tx": {
                 "from": "address:an_account",
                 "to": "sc:basic-features",
                 "value": "0",
-                "function": "usize",
+                "function": "no_overflow_usize",
                 "arguments": [],
                 "gasLimit": "50,000,000",
                 "gasPrice": "0"
@@ -377,12 +377,12 @@
         },
         {
             "step": "scCall",
-            "id": "usize_overflow",
+            "id": "overflow_usize",
             "tx": {
                 "from": "address:an_account",
                 "to": "sc:basic-features",
                 "value": "0",
-                "function": "usize_overflow",
+                "function": "overflow_usize",
                 "arguments": [],
                 "gasLimit": "50,000,000",
                 "gasPrice": "0"
@@ -399,12 +399,12 @@
         },
         {
             "step": "scCall",
-            "id": "isize",
+            "id": "no_overflow_isize",
             "tx": {
                 "from": "address:an_account",
                 "to": "sc:basic-features",
                 "value": "0",
-                "function": "isize",
+                "function": "no_overflow_isize",
                 "arguments": [],
                 "gasLimit": "50,000,000",
                 "gasPrice": "0"
@@ -419,12 +419,12 @@
         },
         {
             "step": "scCall",
-            "id": "isize_overflow",
+            "id": "overflow_isize",
             "tx": {
                 "from": "address:an_account",
                 "to": "sc:basic-features",
                 "value": "0",
-                "function": "isize_overflow",
+                "function": "overflow_isize",
                 "arguments": [],
                 "gasLimit": "50,000,000",
                 "gasPrice": "0"
diff --git a/contracts/feature-tests/basic-features/src/small_num_overflow_test_ops.rs b/contracts/feature-tests/basic-features/src/small_num_overflow_test_ops.rs
index 58423fd404..574777beda 100644
--- a/contracts/feature-tests/basic-features/src/small_num_overflow_test_ops.rs
+++ b/contracts/feature-tests/basic-features/src/small_num_overflow_test_ops.rs
@@ -6,25 +6,25 @@ multiversx_sc::imports!();
 pub trait SmallIntOverflow {
     #[endpoint]
     #[allow(arithmetic_overflow)]
-    fn usize(&self) -> usize {
+    fn no_overflow_usize(&self) -> usize {
         usize::MAX + 1
     }
 
     #[endpoint]
     #[allow(arithmetic_overflow)]
-    fn u8(&self) -> u8 {
+    fn no_overflow_u8(&self) -> u8 {
         u8::MAX + 1
     }
 
     #[endpoint]
     #[allow(arithmetic_overflow)]
-    fn u16(&self) -> u16 {
+    fn no_overflow_u16(&self) -> u16 {
         u16::MAX + 1
     }
 
     #[endpoint]
     #[allow(arithmetic_overflow)]
-    fn u32(&self) -> u32 {
+    fn no_overflow_u32(&self) -> u32 {
         u32::MAX + 1
     }
 
@@ -34,82 +34,82 @@ pub trait SmallIntOverflow {
         u64::MAX + 1
     }
     #[endpoint]
-    fn usize_overflow(&self) -> usize {
+    fn overflow_usize(&self) -> usize {
         usize::MAX.wrapping_add(1)
     }
 
     #[endpoint]
-    fn u8_overflow(&self) -> u8 {
+    fn overflow_u8(&self) -> u8 {
         u8::MAX.wrapping_add(1)
     }
 
     #[endpoint]
-    fn u16_overflow(&self) -> u16 {
+    fn overflow_u16(&self) -> u16 {
         u16::MAX.wrapping_add(1)
     }
 
     #[endpoint]
-    fn u32_overflow(&self) -> u32 {
+    fn overflow_u32(&self) -> u32 {
         u32::MAX.wrapping_add(1)
     }
 
     #[endpoint]
-    fn u64_overflow(&self) -> u64 {
+    fn overflow_u64(&self) -> u64 {
         u64::MAX.wrapping_add(1)
     }
 
     #[endpoint]
     #[allow(arithmetic_overflow)]
-    fn isize(&self) -> isize {
+    fn no_overflow_isize(&self) -> isize {
         isize::MAX + isize::MAX
     }
 
     #[endpoint]
     #[allow(arithmetic_overflow)]
-    fn i8(&self) -> i8 {
+    fn no_overflow_i8(&self) -> i8 {
         i8::MAX + i8::MAX
     }
 
     #[endpoint]
     #[allow(arithmetic_overflow)]
-    fn i16(&self) -> i16 {
+    fn no_overflow_i16(&self) -> i16 {
         i16::MAX + i16::MAX
     }
 
     #[endpoint]
     #[allow(arithmetic_overflow)]
-    fn i32(&self) -> i32 {
+    fn no_overflow_i32(&self) -> i32 {
         i32::MAX + i32::MAX
     }
 
     #[endpoint]
     #[allow(arithmetic_overflow)]
-    fn i64(&self) -> i64 {
+    fn no_overflow_i64(&self) -> i64 {
         i64::MAX + i64::MAX
     }
 
     #[endpoint]
-    fn isize_overflow(&self) -> isize {
+    fn overflow_isize(&self) -> isize {
         isize::MAX.wrapping_add(isize::MAX)
     }
 
     #[endpoint]
-    fn i8_overflow(&self) -> i8 {
+    fn overflow_i8(&self) -> i8 {
         i8::MAX.wrapping_add(i8::MAX)
     }
 
     #[endpoint]
-    fn i16_overflow(&self) -> i16 {
+    fn overflow_i16(&self) -> i16 {
         i16::MAX.wrapping_add(i16::MAX)
     }
 
     #[endpoint]
-    fn i32_overflow(&self) -> i32 {
+    fn overflow_i32(&self) -> i32 {
         i32::MAX.wrapping_add(i32::MAX)
     }
 
     #[endpoint]
-    fn i64_overflow(&self) -> i64 {
+    fn overflow_i64(&self) -> i64 {
         i64::MAX.wrapping_add(i64::MAX)
     }
 }
diff --git a/contracts/feature-tests/basic-features/wasm/src/lib.rs b/contracts/feature-tests/basic-features/wasm/src/lib.rs
index 977a9832e0..f30e5c5447 100644
--- a/contracts/feature-tests/basic-features/wasm/src/lib.rs
+++ b/contracts/feature-tests/basic-features/wasm/src/lib.rs
@@ -365,26 +365,26 @@ multiversx_sc_wasm_adapter::endpoints! {
         unique_id_mapper_set => unique_id_mapper_set
         unique_id_mapper => unique_id_mapper
         managed_struct_eq => managed_struct_eq
-        usize => usize
-        u8 => u8
-        u16 => u16
-        u32 => u32
+        no_overflow_usize => no_overflow_usize
+        no_overflow_u8 => no_overflow_u8
+        no_overflow_u16 => no_overflow_u16
+        no_overflow_u32 => no_overflow_u32
         u64 => u64
-        usize_overflow => usize_overflow
-        u8_overflow => u8_overflow
-        u16_overflow => u16_overflow
-        u32_overflow => u32_overflow
-        u64_overflow => u64_overflow
-        isize => isize
-        i8 => i8
-        i16 => i16
-        i32 => i32
-        i64 => i64
-        isize_overflow => isize_overflow
-        i8_overflow => i8_overflow
-        i16_overflow => i16_overflow
-        i32_overflow => i32_overflow
-        i64_overflow => i64_overflow
+        overflow_usize => overflow_usize
+        overflow_u8 => overflow_u8
+        overflow_u16 => overflow_u16
+        overflow_u32 => overflow_u32
+        overflow_u64 => overflow_u64
+        no_overflow_isize => no_overflow_isize
+        no_overflow_i8 => no_overflow_i8
+        no_overflow_i16 => no_overflow_i16
+        no_overflow_i32 => no_overflow_i32
+        no_overflow_i64 => no_overflow_i64
+        overflow_isize => overflow_isize
+        overflow_i8 => overflow_i8
+        overflow_i16 => overflow_i16
+        overflow_i32 => overflow_i32
+        overflow_i64 => overflow_i64
         token_identifier_egld => token_identifier_egld
         token_identifier_is_valid_1 => token_identifier_is_valid_1
         token_identifier_is_valid_2 => token_identifier_is_valid_2

From 65de16118abcade55d1403f08eb5bd95ac73bd9c Mon Sep 17 00:00:00 2001
From: Alin Cruceat <alyn_509@yahoo.com>
Date: Wed, 15 Nov 2023 18:40:43 +0200
Subject: [PATCH 0067/1254] typo rename

---
 .../basic-features/src/small_num_overflow_test_ops.rs           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contracts/feature-tests/basic-features/src/small_num_overflow_test_ops.rs b/contracts/feature-tests/basic-features/src/small_num_overflow_test_ops.rs
index 574777beda..6104f00dbe 100644
--- a/contracts/feature-tests/basic-features/src/small_num_overflow_test_ops.rs
+++ b/contracts/feature-tests/basic-features/src/small_num_overflow_test_ops.rs
@@ -30,7 +30,7 @@ pub trait SmallIntOverflow {
 
     #[endpoint]
     #[allow(arithmetic_overflow)]
-    fn u64(&self) -> u64 {
+    fn no_overflow_u64(&self) -> u64 {
         u64::MAX + 1
     }
     #[endpoint]

From c53a8cad0d4917f85559894ad72a4acac67680cd Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 15 Nov 2023 19:33:40 +0200
Subject: [PATCH 0068/1254] scenario test fix

---
 .../scenarios/joinGame.scen.json              | 24 ++++++++++++++-----
 .../scenarios/rewardAndSendToWallet.scen.json | 15 +++++++-----
 .../scenarios/rewardWinner.scen.json          |  4 +++-
 .../scenarios/rewardWinner_Last.scen.json     |  4 +++-
 .../scenarios/topUp_ok.scen.json              |  8 +++++--
 .../scenarios/topUp_withdraw.scen.json        | 15 +++++++-----
 .../scenarios/withdraw_Ok.scen.json           | 11 +++++----
 .../scenarios/pause-and-unpause.scen.json     |  5 ----
 .../scenarios/auction_batch.scen.json         |  1 -
 .../auction_single_token_egld.scen.json       |  1 -
 .../scenarios/bid_first_egld.scen.json        |  1 -
 .../batch_transfer_both_types.scen.json       |  2 +-
 .../batch_transfer_both_types_to_sc.scen.json |  2 +-
 .../batch_transfer_fungible.scen.json         |  1 -
 .../batch_transfer_fungible_to_sc.scen.json   |  1 -
 .../batch_transfer_non_fungible.scen.json     |  1 -
 ...atch_transfer_non_fungible_to_sc.scen.json |  1 -
 .../erc1155/scenarios/burn_fungible.scen.json |  1 -
 ...te_one_fungible_one_non_fungible.scen.json |  1 -
 .../scenarios/create_token_fungible.scen.json |  1 -
 .../create_token_non_fungible.scen.json       |  1 -
 ..._both_fungible_different_creator.scen.json |  1 -
 ...okens_both_fungible_same_creator.scen.json |  1 -
 ...s_both_non_fungible_same_creator.scen.json |  1 -
 .../erc1155/scenarios/deploy.scen.json        |  1 -
 .../erc1155/scenarios/mint_fungible.scen.json |  1 -
 .../scenarios/mint_non_fungible.scen.json     |  1 -
 ...sfer_fungible_not_enough_balance.scen.json |  1 -
 .../scenarios/transfer_fungible_ok.scen.json  |  1 -
 .../transfer_fungible_ok_to_sc.scen.json      |  1 -
 .../transfer_non_fungible_ok.scen.json        |  1 -
 .../transfer_non_fungible_ok_to_sc.scen.json  |  1 -
 .../scenarios-io/example_normalized.scen.json | 13 +++++-----
 .../tests/scenarios-io/example_raw.scen.json  |  4 +++-
 .../builtin-func-esdt-transfer.scen.json      |  2 +-
 35 files changed, 66 insertions(+), 65 deletions(-)

diff --git a/contracts/examples/crypto-bubbles/scenarios/joinGame.scen.json b/contracts/examples/crypto-bubbles/scenarios/joinGame.scen.json
index aa224802ae..37d1911a0b 100644
--- a/contracts/examples/crypto-bubbles/scenarios/joinGame.scen.json
+++ b/contracts/examples/crypto-bubbles/scenarios/joinGame.scen.json
@@ -53,7 +53,9 @@
                             "str:top_up",
                             "address:acc1"
                         ],
-                        "data": "0x0200"
+                        "data": [
+                            "0x0200"
+                        ]
                     },
                     {
                         "address": "sc:crypto_bubbles",
@@ -63,7 +65,9 @@
                             "0x12",
                             "address:acc1"
                         ],
-                        "data": "0x200"
+                        "data": [
+                            "0x200"
+                        ]
                     }
                 ],
                 "gas": "*",
@@ -95,7 +99,9 @@
                             "str:top_up",
                             "address:acc2"
                         ],
-                        "data": "0x150"
+                        "data": [
+                            "0x150"
+                        ]
                     },
                     {
                         "address": "sc:crypto_bubbles",
@@ -105,7 +111,9 @@
                             "0x12",
                             "address:acc2"
                         ],
-                        "data": "0x150"
+                        "data": [
+                            "0x150"
+                        ]
                     }
                 ],
                 "gas": "*",
@@ -137,7 +145,9 @@
                             "str:top_up",
                             "address:acc2"
                         ],
-                        "data": "0x2000"
+                        "data": [
+                            "0x2000"
+                        ]
                     },
                     {
                         "address": "sc:crypto_bubbles",
@@ -147,7 +157,9 @@
                             "0x12",
                             "address:acc2"
                         ],
-                        "data": "0x2000"
+                        "data": [
+                            "0x2000"
+                        ]
                     }
                 ],
                 "gas": "*",
diff --git a/contracts/examples/crypto-bubbles/scenarios/rewardAndSendToWallet.scen.json b/contracts/examples/crypto-bubbles/scenarios/rewardAndSendToWallet.scen.json
index 2b6920796d..ed1cac7107 100644
--- a/contracts/examples/crypto-bubbles/scenarios/rewardAndSendToWallet.scen.json
+++ b/contracts/examples/crypto-bubbles/scenarios/rewardAndSendToWallet.scen.json
@@ -52,15 +52,16 @@
                             "0x12",
                             "address:acc1"
                         ],
-                        "data": "0x200"
+                        "data": [
+                            "0x200"
+                        ]
                     },
                     {
-                        "address": "*",
+                        "address": "sc:crypto_bubbles",
                         "endpoint": "str:transferValueOnly",
                         "topics": [
-                            "sc:crypto_bubbles",
-                            "address:acc1",
-                            "0x0200"
+                            "0x0200",
+                            "address:acc1"
                         ],
                         "data": "*"
                     },
@@ -71,7 +72,9 @@
                             "str:withdraw",
                             "address:acc1"
                         ],
-                        "data": "0x200"
+                        "data": [
+                            "0x200"
+                        ]
                     }
                 ],
                 "gas": "*",
diff --git a/contracts/examples/crypto-bubbles/scenarios/rewardWinner.scen.json b/contracts/examples/crypto-bubbles/scenarios/rewardWinner.scen.json
index e81668a0d4..4a563bc09b 100644
--- a/contracts/examples/crypto-bubbles/scenarios/rewardWinner.scen.json
+++ b/contracts/examples/crypto-bubbles/scenarios/rewardWinner.scen.json
@@ -48,7 +48,9 @@
                             "0x12",
                             "address:acc1"
                         ],
-                        "data": "0x200"
+                        "data": [
+                            "0x200"
+                        ]
                     }
                 ],
                 "gas": "*",
diff --git a/contracts/examples/crypto-bubbles/scenarios/rewardWinner_Last.scen.json b/contracts/examples/crypto-bubbles/scenarios/rewardWinner_Last.scen.json
index aa20252361..4a7926e799 100644
--- a/contracts/examples/crypto-bubbles/scenarios/rewardWinner_Last.scen.json
+++ b/contracts/examples/crypto-bubbles/scenarios/rewardWinner_Last.scen.json
@@ -48,7 +48,9 @@
                             "0x12",
                             "address:acc1"
                         ],
-                        "data": "0x1000"
+                        "data": [
+                            "0x1000"
+                        ]
                     }
                 ],
                 "gas": "*",
diff --git a/contracts/examples/crypto-bubbles/scenarios/topUp_ok.scen.json b/contracts/examples/crypto-bubbles/scenarios/topUp_ok.scen.json
index 40ca3ee88d..77717cf6e8 100644
--- a/contracts/examples/crypto-bubbles/scenarios/topUp_ok.scen.json
+++ b/contracts/examples/crypto-bubbles/scenarios/topUp_ok.scen.json
@@ -47,7 +47,9 @@
                             "str:top_up",
                             "address:acc1"
                         ],
-                        "data": "0x0100"
+                        "data": [
+                            "0x0100"
+                        ]
                     }
                 ],
                 "gas": "*",
@@ -77,7 +79,9 @@
                             "str:top_up",
                             "address:acc2"
                         ],
-                        "data": "0x0100"
+                        "data": [
+                            "0x0100"
+                        ]
                     }
                 ],
                 "gas": "*",
diff --git a/contracts/examples/crypto-bubbles/scenarios/topUp_withdraw.scen.json b/contracts/examples/crypto-bubbles/scenarios/topUp_withdraw.scen.json
index 9daa7032c1..32a175e854 100644
--- a/contracts/examples/crypto-bubbles/scenarios/topUp_withdraw.scen.json
+++ b/contracts/examples/crypto-bubbles/scenarios/topUp_withdraw.scen.json
@@ -43,7 +43,9 @@
                             "str:top_up",
                             "address:acc1"
                         ],
-                        "data": "0x4000000"
+                        "data": [
+                            "0x4000000"
+                        ]
                     }
                 ],
                 "gas": "*",
@@ -68,12 +70,11 @@
                 "status": "",
                 "logs": [
                     {
-                        "address": "*",
+                        "address": "sc:crypto_bubbles",
                         "endpoint": "str:transferValueOnly",
                         "topics": [
-                            "sc:crypto_bubbles",
-                            "address:acc1",
-                            "0x4000000"
+                            "0x4000000",
+                            "address:acc1"
                         ],
                         "data": "*"
                     },
@@ -84,7 +85,9 @@
                             "str:withdraw",
                             "address:acc1"
                         ],
-                        "data": "0x4000000"
+                        "data": [
+                            "0x4000000"
+                        ]
                     }
                 ],
                 "gas": "*",
diff --git a/contracts/examples/crypto-bubbles/scenarios/withdraw_Ok.scen.json b/contracts/examples/crypto-bubbles/scenarios/withdraw_Ok.scen.json
index fe44f57689..45fd1dad29 100644
--- a/contracts/examples/crypto-bubbles/scenarios/withdraw_Ok.scen.json
+++ b/contracts/examples/crypto-bubbles/scenarios/withdraw_Ok.scen.json
@@ -41,12 +41,11 @@
                 "status": "",
                 "logs": [
                     {
-                        "address": "*",
+                        "address": "sc:crypto_bubbles",
                         "endpoint": "str:transferValueOnly",
                         "topics": [
-                            "sc:crypto_bubbles",
-                            "address:acc1",
-                            "0x10"
+                            "0x10",
+                            "address:acc1"
                         ],
                         "data": "*"
                     },
@@ -57,7 +56,9 @@
                             "str:withdraw",
                             "address:acc1"
                         ],
-                        "data": "0x10"
+                        "data": [
+                            "0x10"
+                        ]
                     }
                 ],
                 "gas": "*",
diff --git a/contracts/examples/proxy-pause/scenarios/pause-and-unpause.scen.json b/contracts/examples/proxy-pause/scenarios/pause-and-unpause.scen.json
index 11ac973087..2204756cbf 100644
--- a/contracts/examples/proxy-pause/scenarios/pause-and-unpause.scen.json
+++ b/contracts/examples/proxy-pause/scenarios/pause-and-unpause.scen.json
@@ -22,7 +22,6 @@
                     "false"
                 ],
                 "status": "",
-                "logs": [],
                 "gas": "*",
                 "refund": "*"
             }
@@ -41,7 +40,6 @@
             "expect": {
                 "out": [],
                 "status": "",
-                "logs": [],
                 "gas": "*",
                 "refund": "*"
             }
@@ -62,7 +60,6 @@
                     "true"
                 ],
                 "status": "",
-                "logs": [],
                 "gas": "*",
                 "refund": "*"
             }
@@ -81,7 +78,6 @@
             "expect": {
                 "out": [],
                 "status": "",
-                "logs": [],
                 "gas": "*",
                 "refund": "*"
             }
@@ -102,7 +98,6 @@
                     "false"
                 ],
                 "status": "",
-                "logs": [],
                 "gas": "*",
                 "refund": "*"
             }
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..a148c4a50f 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
@@ -28,7 +28,6 @@
                 "out": [],
                 "status": "0",
                 "message": "",
-                "logs": [],
                 "gas": "*",
                 "refund": "*"
             }
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..b57ec896fa 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
@@ -28,7 +28,6 @@
                 "out": [],
                 "status": "0",
                 "message": "",
-                "logs": [],
                 "gas": "*",
                 "refund": "*"
             }
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..1e9c9ba4bd 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
@@ -25,7 +25,6 @@
                 "out": [],
                 "status": "0",
                 "message": "",
-                "logs": [],
                 "gas": "*",
                 "refund": "*"
             }
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..32f70d8a7c 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
@@ -27,7 +27,7 @@
                 "out": [],
                 "status": "0",
                 "message": "",
-                "logs": [],
+                "logs": "*",
                 "gas": "*",
                 "refund": "*"
             }
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..de31148193 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
@@ -37,7 +37,7 @@
                 "out": [],
                 "status": "0",
                 "message": "",
-                "logs": [],
+                "logs": "*",
                 "gas": "*",
                 "refund": "*"
             }
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..e67aefb23d 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
@@ -27,7 +27,6 @@
                 "out": [],
                 "status": "0",
                 "message": "",
-                "logs": [],
                 "gas": "*",
                 "refund": "*"
             }
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..57c4c72359 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
@@ -37,7 +37,6 @@
                 "out": [],
                 "status": "0",
                 "message": "",
-                "logs": [],
                 "gas": "*",
                 "refund": "*"
             }
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..da324de03f 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
@@ -27,7 +27,6 @@
                 "out": [],
                 "status": "0",
                 "message": "",
-                "logs": [],
                 "gas": "*",
                 "refund": "*"
             }
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..99d4146330 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
@@ -37,7 +37,6 @@
                 "out": [],
                 "status": "0",
                 "message": "",
-                "logs": [],
                 "gas": "*",
                 "refund": "*"
             }
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..6cd7c85720 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
@@ -24,7 +24,6 @@
                 "out": [],
                 "status": "0",
                 "message": "",
-                "logs": [],
                 "gas": "*",
                 "refund": "*"
             }
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..2e68f15850 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
@@ -27,7 +27,6 @@
                 ],
                 "status": "0",
                 "message": "",
-                "logs": [],
                 "gas": "*",
                 "refund": "*"
             }
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..412c2bfccf 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
@@ -36,7 +36,6 @@
                 ],
                 "status": "0",
                 "message": "",
-                "logs": [],
                 "gas": "*",
                 "refund": "*"
             }
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..4286ca06a7 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
@@ -36,7 +36,6 @@
                 ],
                 "status": "0",
                 "message": "",
-                "logs": [],
                 "gas": "*",
                 "refund": "*"
             }
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..3f7592367f 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
@@ -36,7 +36,6 @@
                 ],
                 "status": "0",
                 "message": "",
-                "logs": [],
                 "gas": "*",
                 "refund": "*"
             }
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..d2d8435b6c 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
@@ -27,7 +27,6 @@
                 ],
                 "status": "0",
                 "message": "",
-                "logs": [],
                 "gas": "*",
                 "refund": "*"
             }
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..b36a41358f 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
@@ -27,7 +27,6 @@
                 ],
                 "status": "0",
                 "message": "",
-                "logs": [],
                 "gas": "*",
                 "refund": "*"
             }
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..165e585b09 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
@@ -32,7 +32,6 @@
                 "out": [],
                 "status": "0",
                 "message": "",
-                "logs": [],
                 "gas": "*",
                 "refund": "*"
             }
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..a0467b528b 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
@@ -24,7 +24,6 @@
                 "out": [],
                 "status": "0",
                 "message": "",
-                "logs": [],
                 "gas": "*",
                 "refund": "*"
             }
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..4a89e304c9 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
@@ -24,7 +24,6 @@
                 "out": [],
                 "status": "0",
                 "message": "",
-                "logs": [],
                 "gas": "*",
                 "refund": "*"
             }
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..325866f14f 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
@@ -27,7 +27,6 @@
                 "out": [],
                 "status": "4",
                 "message": "str:Not enough balance for id",
-                "logs": "*",
                 "gas": "*",
                 "refund": "*"
             }
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..96dfbd51f6 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
@@ -27,7 +27,6 @@
                 "out": [],
                 "status": "0",
                 "message": "",
-                "logs": [],
                 "gas": "*",
                 "refund": "*"
             }
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..c64da4def2 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
@@ -37,7 +37,6 @@
                 "out": [],
                 "status": "0",
                 "message": "",
-                "logs": [],
                 "gas": "*",
                 "refund": "*"
             }
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..7b38401926 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
@@ -27,7 +27,6 @@
                 "out": [],
                 "status": "0",
                 "message": "",
-                "logs": [],
                 "gas": "*",
                 "refund": "*"
             }
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..cd827a5aa8 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
@@ -37,7 +37,6 @@
                 "out": [],
                 "status": "0",
                 "message": "",
-                "logs": [],
                 "gas": "*",
                 "refund": "*"
             }
diff --git a/framework/scenario/tests/scenarios-io/example_normalized.scen.json b/framework/scenario/tests/scenarios-io/example_normalized.scen.json
index e506eef27d..58faff2f25 100644
--- a/framework/scenario/tests/scenarios-io/example_normalized.scen.json
+++ b/framework/scenario/tests/scenarios-io/example_normalized.scen.json
@@ -233,7 +233,9 @@
                             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b000000000000000000000000",
                             "0x1234123400000000000000000000000000000000000000000000000000000004"
                         ],
-                        "data": "0x00"
+                        "data": [
+                            "0x00"
+                        ]
                     },
                     "+"
                 ],
@@ -255,8 +257,7 @@
                 ],
                 "function": "someFunctionName",
                 "arguments": [],
-                "gasLimit": "0x100000",
-                "gasPrice": "0"
+                "gasLimit": "0x100000"
             }
         },
         {
@@ -268,8 +269,7 @@
                 "to": "0x1000000000000000000000000000000000000000000000000000000000000000",
                 "function": "someFunctionName",
                 "arguments": [],
-                "gasLimit": "0x100000",
-                "gasPrice": "0"
+                "gasLimit": "0x100000"
             },
             "expect": {
                 "status": ""
@@ -284,8 +284,7 @@
                 "to": "0x1000000000000000000000000000000000000000000000000000000000000000",
                 "function": "someFunctionName",
                 "arguments": [],
-                "gasLimit": "0x100000",
-                "gasPrice": "0"
+                "gasLimit": "0x100000"
             },
             "expect": {
                 "out": [],
diff --git a/framework/scenario/tests/scenarios-io/example_raw.scen.json b/framework/scenario/tests/scenarios-io/example_raw.scen.json
index adcb971db3..cac6f9f888 100644
--- a/framework/scenario/tests/scenarios-io/example_raw.scen.json
+++ b/framework/scenario/tests/scenarios-io/example_raw.scen.json
@@ -235,7 +235,9 @@
                             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b000000000000000000000000",
                             "0x1234123400000000000000000000000000000000000000000000000000000004"
                         ],
-                        "data": "0x00"
+                        "data": [
+                            "0x00"
+                        ]
                     },
                     "+"
                 ],
diff --git a/framework/scenario/tests/scenarios-self/builtin-func-esdt-transfer.scen.json b/framework/scenario/tests/scenarios-self/builtin-func-esdt-transfer.scen.json
index 375b63b805..359182460a 100644
--- a/framework/scenario/tests/scenarios-self/builtin-func-esdt-transfer.scen.json
+++ b/framework/scenario/tests/scenarios-self/builtin-func-esdt-transfer.scen.json
@@ -42,7 +42,7 @@
                             "100",
                             "address:B"
                         ],
-                        "data": ""
+                        "data": "*"
                     }
                 ],
                 "gas": "*",

From 34b9349f8b94b4fa9db90d665bafb0cde72bfd06 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 15 Nov 2023 19:36:50 +0200
Subject: [PATCH 0069/1254] scenario fmt

---
 .../digital-cash/scenarios/claim-fees.scen.json  |  2 ++
 .../digital-cash/scenarios/forward.scen.json     |  6 ++----
 .../scenarios/pay-fee-and-fund-esdt.scen.json    |  4 ++--
 .../scenarios/test_subscription.scen.json        |  2 +-
 .../scenarios/get_shard_of_address.scen.json     |  8 ++++++--
 ...orwarder_call_sync_retrieve_egld_bt.scen.json |  4 ++--
 ...orwarder_call_sync_retrieve_esdt_bt.scen.json |  4 ++--
 ...forwarder_call_sync_retrieve_nft_bt.scen.json |  4 ++--
 .../promises_call_async_accept_egld.scen.json    |  2 +-
 .../promises_call_async_accept_esdt.scen.json    |  2 +-
 .../promises_call_async_retrieve_egld.scen.json  |  6 +++---
 .../promises_call_async_retrieve_esdt.scen.json  |  4 ++--
 .../promises_multi_transfer.scen.json            |  4 ++--
 .../promises_single_transfer.scen.json           |  8 ++++----
 .../promises_single_transfer_gas2.scen.json      |  2 +-
 .../recursive_caller_egld_2.scen.json            | 16 ++++++++++++----
 .../recursive_caller_esdt_2.scen.json            | 16 ++++++++++++----
 .../builtin_func_delete_user_name.scen.json      |  1 +
 .../builtin_func_set_user_name.scen.json         |  1 +
 .../scenarios/forw_queue_async.scen.json         |  3 +++
 .../forw_raw_async_accept_egld.scen.json         |  4 ++--
 .../forw_raw_async_accept_esdt.scen.json         |  4 ++--
 .../scenarios/forw_raw_async_echo.scen.json      |  4 ++--
 .../scenarios/forw_raw_direct_esdt.scen.json     |  2 +-
 .../scenarios/forw_raw_init_sync_echo.scen.json  |  2 +-
 .../scenarios/forw_raw_sync_echo.scen.json       |  6 +++---
 .../forw_raw_sync_echo_caller.scen.json          |  6 +++---
 .../scenarios/forw_raw_sync_egld.scen.json       |  6 +++---
 .../forw_raw_sync_same_context.scen.json         |  2 +-
 .../forwarder_call_async_accept_egld.scen.json   |  2 +-
 .../forwarder_call_async_accept_esdt.scen.json   |  4 ++--
 .../forwarder_call_async_accept_nft.scen.json    |  4 ++--
 .../forwarder_call_async_retrieve_egld.scen.json |  6 +++---
 .../forwarder_call_async_retrieve_esdt.scen.json |  4 ++--
 .../forwarder_call_async_retrieve_nft.scen.json  |  4 ++--
 .../forwarder_call_sync_accept_egld.scen.json    |  2 +-
 .../forwarder_call_sync_accept_esdt.scen.json    |  2 +-
 ...der_call_sync_accept_multi_transfer.scen.json |  2 +-
 .../forwarder_call_sync_accept_nft.scen.json     |  2 +-
 ...der_call_sync_accept_then_read_egld.scen.json |  4 ++--
 ...der_call_sync_accept_then_read_esdt.scen.json |  4 ++--
 ...rder_call_sync_accept_then_read_nft.scen.json |  4 ++--
 .../forwarder_call_sync_retrieve_egld.scen.json  |  4 ++--
 .../forwarder_call_sync_retrieve_esdt.scen.json  |  4 ++--
 .../forwarder_call_sync_retrieve_nft.scen.json   |  4 ++--
 ...warder_call_transf_exec_accept_egld.scen.json |  2 +-
 ..._call_transf_exec_accept_egld_twice.scen.json |  4 ++--
 ...warder_call_transf_exec_accept_esdt.scen.json |  2 +-
 ..._call_transf_exec_accept_esdt_twice.scen.json |  4 ++--
 ...l_transf_exec_accept_multi_transfer.scen.json |  2 +-
 ...rwarder_call_transf_exec_accept_nft.scen.json |  2 +-
 ...ll_transf_exec_accept_return_values.scen.json |  2 +-
 ...r_call_transf_exec_accept_sft_twice.scen.json |  4 ++--
 .../forwarder_nft_create_and_send.scen.json      |  2 +-
 .../scenarios/forwarder_sync_echo.scen.json      |  6 +++---
 .../scenarios/recursive_caller_egld_1.scen.json  |  4 ++--
 .../scenarios/recursive_caller_esdt_1.scen.json  |  4 ++--
 .../composability/scenarios/send_esdt.scen.json  |  2 +-
 .../scenarios/mmap_get.scen.json                 |  4 ++--
 .../scenarios/mmap_remove.scen.json              |  4 ++--
 .../scenarios/mcf-alt-init.scen.json             | 11 ++++++++---
 .../scenarios/mcf-example-feature.scen.json      |  6 ++++--
 .../scenarios/test.scen.json                     |  3 +--
 .../use_module_claim_developer_rewards.scen.json | 12 ++++++------
 64 files changed, 151 insertions(+), 120 deletions(-)

diff --git a/contracts/examples/digital-cash/scenarios/claim-fees.scen.json b/contracts/examples/digital-cash/scenarios/claim-fees.scen.json
index 78611be938..f1af0b06c1 100644
--- a/contracts/examples/digital-cash/scenarios/claim-fees.scen.json
+++ b/contracts/examples/digital-cash/scenarios/claim-fees.scen.json
@@ -12,6 +12,7 @@
                 "from": "address:acc2",
                 "to": "sc:the_digital_cash_contract",
                 "function": "claimFees",
+                "arguments": [],
                 "gasLimit": "500,000,000",
                 "gasPrice": "0"
             },
@@ -41,6 +42,7 @@
                 "from": "address:digital_cash_owner_address",
                 "to": "sc:the_digital_cash_contract",
                 "function": "claimFees",
+                "arguments": [],
                 "gasLimit": "500,000,000",
                 "gasPrice": "0"
             },
diff --git a/contracts/examples/digital-cash/scenarios/forward.scen.json b/contracts/examples/digital-cash/scenarios/forward.scen.json
index 44721e7f2f..502b6ea64d 100644
--- a/contracts/examples/digital-cash/scenarios/forward.scen.json
+++ b/contracts/examples/digital-cash/scenarios/forward.scen.json
@@ -11,7 +11,6 @@
             "tx": {
                 "from": "address:acc2",
                 "to": "sc:the_digital_cash_contract",
-                "egldValue": "0",
                 "function": "forward",
                 "arguments": [
                     "0xdb474a3a065d3f0c0a62ae680ef6435e48eb482899d2ae30ff7a3a4b0ef19c60",
@@ -59,7 +58,6 @@
             "tx": {
                 "from": "address:acc2",
                 "to": "sc:the_digital_cash_contract",
-                "egldValue": "0",
                 "function": "forward",
                 "arguments": [
                     "0xdb474a3a065d3f0c0a62ae680ef6435e48eb482899d2ae30ff7a3a4b0ef19c60",
@@ -106,8 +104,8 @@
             "tx": {
                 "from": "address:acc2",
                 "to": "sc:the_digital_cash_contract",
-                "function": "forward",
                 "egldValue": "500",
+                "function": "forward",
                 "arguments": [
                     "0x885532043a061e0c779e4064b85193f72cffd22c5bcc208c209128e60f21bf0d",
                     "0x885532043a061e0c779e4064b85193f72cffd22c5bcc208c209128e60f21bf0d",
@@ -131,8 +129,8 @@
             "tx": {
                 "from": "address:acc2",
                 "to": "sc:the_digital_cash_contract",
-                "function": "forward",
                 "egldValue": "500",
+                "function": "forward",
                 "arguments": [
                     "0x885532043a061e0c779e4064b85193f72cffd22c5bcc208c209128e60f21bf0d",
                     "0x8dc17613990e9b7476401a36d112d1a4d31190dec21e7e9a3c933872a27613ee",
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 6848eb9cd1..7bf2184f83 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
@@ -11,7 +11,6 @@
             "tx": {
                 "from": "address:acc3",
                 "to": "sc:the_digital_cash_contract",
-                "function": "payFeeAndFundESDT",
                 "esdtValue": [
                     {
                         "tokenIdentifier": "str:CASHTOKEN-445566",
@@ -22,6 +21,7 @@
                         "value": "50"
                     }
                 ],
+                "function": "payFeeAndFundESDT",
                 "arguments": [
                     "0xdb474a3a065d3f0c0a62ae680ef6435e48eb482899d2ae30ff7a3a4b0ef19c60",
                     "u64:100"
@@ -44,7 +44,6 @@
             "tx": {
                 "from": "address:acc3",
                 "to": "sc:the_digital_cash_contract",
-                "function": "payFeeAndFundESDT",
                 "esdtValue": [
                     {
                         "tokenIdentifier": "str:CASHTOKEN-778899",
@@ -55,6 +54,7 @@
                         "value": "50"
                     }
                 ],
+                "function": "payFeeAndFundESDT",
                 "arguments": [
                     "0xdb474a3a065d3f0c0a62ae680ef6435e48eb482899d2ae30ff7a3a4b0ef19c60",
                     "u64:100"
diff --git a/contracts/examples/nft-subscription/scenarios/test_subscription.scen.json b/contracts/examples/nft-subscription/scenarios/test_subscription.scen.json
index 7948b03bcc..8cec16fce7 100644
--- a/contracts/examples/nft-subscription/scenarios/test_subscription.scen.json
+++ b/contracts/examples/nft-subscription/scenarios/test_subscription.scen.json
@@ -212,4 +212,4 @@
             }
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/contracts/feature-tests/basic-features/scenarios/get_shard_of_address.scen.json b/contracts/feature-tests/basic-features/scenarios/get_shard_of_address.scen.json
index 55df0c8647..d8177c1aaa 100644
--- a/contracts/feature-tests/basic-features/scenarios/get_shard_of_address.scen.json
+++ b/contracts/feature-tests/basic-features/scenarios/get_shard_of_address.scen.json
@@ -23,7 +23,9 @@
                 "from": "address:an_account",
                 "to": "sc:basic-features",
                 "function": "get_shard_of_address",
-                "arguments": ["sc:basic-features"],
+                "arguments": [
+                    "sc:basic-features"
+                ],
                 "gasLimit": "50,000,000",
                 "gasPrice": "0"
             },
@@ -43,7 +45,9 @@
             "tx": {
                 "to": "sc:basic-features",
                 "function": "get_shard_of_address",
-                "arguments": ["sc:basic-features"]
+                "arguments": [
+                    "sc:basic-features"
+                ]
             },
             "expect": {
                 "out": [
diff --git a/contracts/feature-tests/composability/scenarios-promises/forwarder_call_sync_retrieve_egld_bt.scen.json b/contracts/feature-tests/composability/scenarios-promises/forwarder_call_sync_retrieve_egld_bt.scen.json
index 073adba08c..1c1b123171 100644
--- a/contracts/feature-tests/composability/scenarios-promises/forwarder_call_sync_retrieve_egld_bt.scen.json
+++ b/contracts/feature-tests/composability/scenarios-promises/forwarder_call_sync_retrieve_egld_bt.scen.json
@@ -43,7 +43,7 @@
                     {
                         "address": "sc:forwarder",
                         "endpoint": "str:transferValueOnly",
-                        "topics": [                            
+                        "topics": [
                             "0",
                             "sc:vault"
                         ],
@@ -71,7 +71,7 @@
                     {
                         "address": "sc:vault",
                         "endpoint": "str:transferValueOnly",
-                        "topics": [                            
+                        "topics": [
                             "1000",
                             "sc:forwarder"
                         ],
diff --git a/contracts/feature-tests/composability/scenarios-promises/forwarder_call_sync_retrieve_esdt_bt.scen.json b/contracts/feature-tests/composability/scenarios-promises/forwarder_call_sync_retrieve_esdt_bt.scen.json
index fb57d6d388..b98172a3b4 100644
--- a/contracts/feature-tests/composability/scenarios-promises/forwarder_call_sync_retrieve_esdt_bt.scen.json
+++ b/contracts/feature-tests/composability/scenarios-promises/forwarder_call_sync_retrieve_esdt_bt.scen.json
@@ -46,7 +46,7 @@
                     {
                         "address": "sc:forwarder",
                         "endpoint": "str:transferValueOnly",
-                        "topics": [                            
+                        "topics": [
                             "",
                             "sc:vault"
                         ],
@@ -74,7 +74,7 @@
                     {
                         "address": "sc:vault",
                         "endpoint": "str:ESDTTransfer",
-                        "topics": [                            
+                        "topics": [
                             "str:TEST-TOKENA",
                             "0",
                             "1000",
diff --git a/contracts/feature-tests/composability/scenarios-promises/forwarder_call_sync_retrieve_nft_bt.scen.json b/contracts/feature-tests/composability/scenarios-promises/forwarder_call_sync_retrieve_nft_bt.scen.json
index 87a1e4e70e..3762b59942 100644
--- a/contracts/feature-tests/composability/scenarios-promises/forwarder_call_sync_retrieve_nft_bt.scen.json
+++ b/contracts/feature-tests/composability/scenarios-promises/forwarder_call_sync_retrieve_nft_bt.scen.json
@@ -53,7 +53,7 @@
                     {
                         "address": "sc:forwarder",
                         "endpoint": "str:transferValueOnly",
-                        "topics": [                            
+                        "topics": [
                             "",
                             "sc:vault"
                         ],
@@ -81,7 +81,7 @@
                     {
                         "address": "sc:vault",
                         "endpoint": "str:ESDTNFTTransfer",
-                        "topics": [                            
+                        "topics": [
                             "str:NFT-000001",
                             "5",
                             "01",
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 d1dd536084..2e311e6013 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
@@ -40,7 +40,7 @@
                     {
                         "address": "sc:forwarder",
                         "endpoint": "str:transferValueOnly",
-                        "topics": [                            
+                        "topics": [
                             "1000",
                             "sc:vault"
                         ],
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 b5b4fd302d..17177f6118 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
@@ -48,7 +48,7 @@
                     {
                         "address": "sc:forwarder",
                         "endpoint": "str:ESDTTransfer",
-                        "topics": [                            
+                        "topics": [
                             "str:TEST-TOKENA",
                             "0",
                             "1000",
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 de22eeabf2..3d8fc1ac7a 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
@@ -42,7 +42,7 @@
                     {
                         "address": "sc:forwarder",
                         "endpoint": "str:transferValueOnly",
-                        "topics": [                            
+                        "topics": [
                             "0",
                             "sc:vault"
                         ],
@@ -70,7 +70,7 @@
                     {
                         "address": "sc:vault",
                         "endpoint": "str:transferValueOnly",
-                        "topics": [                            
+                        "topics": [
                             "1000",
                             "sc:forwarder"
                         ],
@@ -82,7 +82,7 @@
                     {
                         "address": "sc:vault",
                         "endpoint": "str:transferValueOnly",
-                        "topics": [                            
+                        "topics": [
                             "1000",
                             "sc:forwarder"
                         ],
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 be292d045f..bdc1c59c26 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
@@ -45,7 +45,7 @@
                     {
                         "address": "sc:forwarder",
                         "endpoint": "str:transferValueOnly",
-                        "topics": [                            
+                        "topics": [
                             "",
                             "sc:vault"
                         ],
@@ -73,7 +73,7 @@
                     {
                         "address": "sc:vault",
                         "endpoint": "str:ESDTTransfer",
-                        "topics": [                            
+                        "topics": [
                             "str:TEST-TOKENA",
                             "0",
                             "1000",
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 2efae80a87..f3ea391b5b 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
@@ -81,7 +81,7 @@
                     {
                         "address": "sc:promises",
                         "endpoint": "str:MultiESDTNFTTransfer",
-                        "topics": [                            
+                        "topics": [
                             "str:FWD-TOKEN",
                             "0",
                             "500",
@@ -133,7 +133,7 @@
                     {
                         "address": "sc:vault",
                         "endpoint": "str:transferValueOnly",
-                        "topics": [                            
+                        "topics": [
                             "",
                             "sc:promises"
                         ],
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 ef36828800..2e8a12e545 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
@@ -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"
                         ],
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 7c3321c304..9cbb7681dd 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
@@ -44,7 +44,7 @@
                     {
                         "address": "sc:vault",
                         "endpoint": "str:transferValueOnly",
-                        "topics": [                            
+                        "topics": [
                             "0",
                             "sc:promises"
                         ],
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 29a371107c..233eb93c27 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
@@ -48,7 +48,9 @@
                             "str:EGLD",
                             "1"
                         ],
-                        "data": "2"
+                        "data": [
+                            "2"
+                        ]
                     },
                     {
                         "address": "sc:vault",
@@ -69,7 +71,9 @@
                             "str:EGLD",
                             "1"
                         ],
-                        "data": "2"
+                        "data": [
+                            "2"
+                        ]
                     },
                     {
                         "address": "sc:recursive-caller",
@@ -79,7 +83,9 @@
                             "str:EGLD",
                             "1"
                         ],
-                        "data": "1"
+                        "data": [
+                            "1"
+                        ]
                     },
                     {
                         "address": "sc:vault",
@@ -100,7 +106,9 @@
                             "str:EGLD",
                             "1"
                         ],
-                        "data": "1"
+                        "data": [
+                            "1"
+                        ]
                     }
                 ],
                 "gas": "*",
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 399f79511e..6ec7f17627 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
@@ -51,7 +51,9 @@
                             "str:REC-TOKEN",
                             "1"
                         ],
-                        "data": "2"
+                        "data": [
+                            "2"
+                        ]
                     },
                     {
                         "address": "sc:vault",
@@ -72,7 +74,9 @@
                             "str:REC-TOKEN",
                             "1"
                         ],
-                        "data": "2"
+                        "data": [
+                            "2"
+                        ]
                     },
                     {
                         "address": "sc:recursive-caller",
@@ -82,7 +86,9 @@
                             "str:REC-TOKEN",
                             "1"
                         ],
-                        "data": "1"
+                        "data": [
+                            "1"
+                        ]
                     },
                     {
                         "address": "sc:vault",
@@ -103,7 +109,9 @@
                             "str:REC-TOKEN",
                             "1"
                         ],
-                        "data": "1"
+                        "data": [
+                            "1"
+                        ]
                     }
                 ],
                 "gas": "*",
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 7414fa5875..b93caef9b5 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
@@ -33,6 +33,7 @@
                 "gasPrice": "0"
             },
             "expect": {
+                "out": [],
                 "status": "0"
             }
         },
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 e52de6e930..cebd1d3f1f 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
@@ -33,6 +33,7 @@
                 "gasPrice": "0"
             },
             "expect": {
+                "out": [],
                 "status": "0"
             }
         },
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 3451e69a76..4b7d372805 100644
--- a/contracts/feature-tests/composability/scenarios/forw_queue_async.scen.json
+++ b/contracts/feature-tests/composability/scenarios/forw_queue_async.scen.json
@@ -36,6 +36,7 @@
                 "gasPrice": "0"
             },
             "expect": {
+                "out": [],
                 "status": "0"
             }
         },
@@ -46,10 +47,12 @@
                 "from": "address:a_user",
                 "to": "sc:forwarder-queue",
                 "function": "forward_queued_calls",
+                "arguments": [],
                 "gasLimit": "50,000,000",
                 "gasPrice": "0"
             },
             "expect": {
+                "out": [],
                 "status": "0",
                 "logs": [
                     {
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 6af57a7e65..7ef2d65146 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
@@ -42,7 +42,7 @@
                     {
                         "address": "sc:forwarder",
                         "endpoint": "str:transferValueOnly",
-                        "topics": [                            
+                        "topics": [
                             "1000",
                             "sc:vault"
                         ],
@@ -65,7 +65,7 @@
                     {
                         "address": "sc:vault",
                         "endpoint": "str:transferValueOnly",
-                        "topics": [                            
+                        "topics": [
                             "0",
                             "sc:forwarder"
                         ],
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 7cad96c978..a58e213fcc 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
@@ -50,7 +50,7 @@
                     {
                         "address": "sc:forwarder",
                         "endpoint": "str:ESDTTransfer",
-                        "topics": [                            
+                        "topics": [
                             "str:TEST-TOKENA",
                             "0",
                             "1000",
@@ -81,7 +81,7 @@
                     {
                         "address": "sc:vault",
                         "endpoint": "str:transferValueOnly",
-                        "topics": [                            
+                        "topics": [
                             "0",
                             "sc:forwarder"
                         ],
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 15f7be6d06..d01e926018 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
@@ -46,7 +46,7 @@
                     {
                         "address": "sc:forwarder",
                         "endpoint": "str:transferValueOnly",
-                        "topics": [                            
+                        "topics": [
                             "0",
                             "sc:vault"
                         ],
@@ -60,7 +60,7 @@
                     {
                         "address": "sc:vault",
                         "endpoint": "str:transferValueOnly",
-                        "topics": [                            
+                        "topics": [
                             "0",
                             "sc:forwarder"
                         ],
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 62b5b00f4d..ea3ac729d5 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
@@ -49,7 +49,7 @@
                     {
                         "address": "sc:forwarder",
                         "endpoint": "str:ESDTTransfer",
-                        "topics": [                            
+                        "topics": [
                             "str:TEST-TOKENA",
                             "0",
                             "1000",
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 e5297f945b..344180d243 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
@@ -46,7 +46,7 @@
                     {
                         "address": "sc:forwarder",
                         "endpoint": "str:transferValueOnly",
-                        "topics": [                            
+                        "topics": [
                             "0",
                             "sc:vault"
                         ],
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 b06a6bc8ac..038dbe24fe 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
@@ -46,7 +46,7 @@
                     {
                         "address": "sc:forwarder",
                         "endpoint": "str:transferValueOnly",
-                        "topics": [                            
+                        "topics": [
                             "0",
                             "sc:vault"
                         ],
@@ -105,7 +105,7 @@
                     {
                         "address": "sc:forwarder",
                         "endpoint": "str:transferValueOnly",
-                        "topics": [                            
+                        "topics": [
                             "0",
                             "sc:vault"
                         ],
@@ -134,7 +134,7 @@
                     {
                         "address": "sc:forwarder",
                         "endpoint": "str:transferValueOnly",
-                        "topics": [                            
+                        "topics": [
                             "0",
                             "sc:vault"
                         ],
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 a2e0a76402..a35fe621a5 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
@@ -43,7 +43,7 @@
                     {
                         "address": "sc:forwarder",
                         "endpoint": "str:transferValueOnly",
-                        "topics": [                            
+                        "topics": [
                             "0",
                             "sc:vault"
                         ],
@@ -91,7 +91,7 @@
                     {
                         "address": "sc:forwarder",
                         "endpoint": "str:transferValueOnly",
-                        "topics": [                            
+                        "topics": [
                             "0",
                             "sc:vault"
                         ],
@@ -113,7 +113,7 @@
                     {
                         "address": "sc:forwarder",
                         "endpoint": "str:transferValueOnly",
-                        "topics": [                            
+                        "topics": [
                             "0",
                             "sc:vault"
                         ],
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 5f55799538..3043b73fa9 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
@@ -42,7 +42,7 @@
                     {
                         "address": "sc:forwarder",
                         "endpoint": "str:transferValueOnly",
-                        "topics": [                            
+                        "topics": [
                             "1000",
                             "sc:vault"
                         ],
@@ -99,7 +99,7 @@
                     {
                         "address": "sc:forwarder",
                         "endpoint": "str:transferValueOnly",
-                        "topics": [                            
+                        "topics": [
                             "500",
                             "sc:vault"
                         ],
@@ -132,7 +132,7 @@
                     {
                         "address": "sc:forwarder",
                         "endpoint": "str:transferValueOnly",
-                        "topics": [                            
+                        "topics": [
                             "500",
                             "sc:vault"
                         ],
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 7abf87782f..c3b7c5ad7f 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
@@ -47,7 +47,7 @@
                     {
                         "address": "sc:forwarder",
                         "endpoint": "str:transferValueOnly",
-                        "topics": [                            
+                        "topics": [
                             "0",
                             "sc:forwarder"
                         ],
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 fa277fd1ec..e98911c2d0 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
@@ -64,7 +64,7 @@
                     {
                         "address": "sc:vault",
                         "endpoint": "str:transferValueOnly",
-                        "topics": [                            
+                        "topics": [
                             "0",
                             "sc:forwarder"
                         ],
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 717af5faf8..db0f77d8f7 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
@@ -49,7 +49,7 @@
                     {
                         "address": "sc:forwarder",
                         "endpoint": "str:ESDTTransfer",
-                        "topics": [                            
+                        "topics": [
                             "str:TEST-TOKENA",
                             "0",
                             "1000",
@@ -80,7 +80,7 @@
                     {
                         "address": "sc:vault",
                         "endpoint": "str:transferValueOnly",
-                        "topics": [                            
+                        "topics": [
                             "0",
                             "sc:forwarder"
                         ],
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 243db87231..05eb1adb73 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
@@ -61,7 +61,7 @@
                     {
                         "address": "sc:forwarder",
                         "endpoint": "str:ESDTNFTTransfer",
-                        "topics": [                            
+                        "topics": [
                             "str:NFT-000001",
                             "5",
                             "01",
@@ -94,7 +94,7 @@
                     {
                         "address": "sc:vault",
                         "endpoint": "str:transferValueOnly",
-                        "topics": [                            
+                        "topics": [
                             "0",
                             "sc:forwarder"
                         ],
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 ee603e98d1..4a7ae42782 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
@@ -43,7 +43,7 @@
                     {
                         "address": "sc:forwarder",
                         "endpoint": "str:transferValueOnly",
-                        "topics": [                            
+                        "topics": [
                             "0",
                             "sc:vault"
                         ],
@@ -71,7 +71,7 @@
                     {
                         "address": "sc:vault",
                         "endpoint": "str:transferValueOnly",
-                        "topics": [                            
+                        "topics": [
                             "1000",
                             "sc:forwarder"
                         ],
@@ -83,7 +83,7 @@
                     {
                         "address": "sc:vault",
                         "endpoint": "str:transferValueOnly",
-                        "topics": [                            
+                        "topics": [
                             "1000",
                             "sc:forwarder"
                         ],
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 0e386ad6da..11ff97be1c 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
@@ -46,7 +46,7 @@
                     {
                         "address": "sc:forwarder",
                         "endpoint": "str:transferValueOnly",
-                        "topics": [                            
+                        "topics": [
                             "",
                             "sc:vault"
                         ],
@@ -74,7 +74,7 @@
                     {
                         "address": "sc:vault",
                         "endpoint": "str:ESDTTransfer",
-                        "topics": [                            
+                        "topics": [
                             "str:TEST-TOKENA",
                             "0",
                             "1000",
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 48a326c284..2aaaa97d8a 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
@@ -53,7 +53,7 @@
                     {
                         "address": "sc:forwarder",
                         "endpoint": "str:transferValueOnly",
-                        "topics": [                            
+                        "topics": [
                             "",
                             "sc:vault"
                         ],
@@ -81,7 +81,7 @@
                     {
                         "address": "sc:vault",
                         "endpoint": "str:ESDTNFTTransfer",
-                        "topics": [                            
+                        "topics": [
                             "str:NFT-000001",
                             "5",
                             "01",
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 a0648c109c..e3c89d6578 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
@@ -41,7 +41,7 @@
                     {
                         "address": "sc:forwarder",
                         "endpoint": "str:transferValueOnly",
-                        "topics": [                            
+                        "topics": [
                             "1000",
                             "sc:vault"
                         ],
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 236d84fbc2..5abf06edfb 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
@@ -79,7 +79,7 @@
                     {
                         "address": "sc:forwarder",
                         "endpoint": "str:ESDTTransfer",
-                        "topics": [                            
+                        "topics": [
                             "str:TEST-TOKENA",
                             "0",
                             "1000",
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 f846047f17..667f54c6ca 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
@@ -76,7 +76,7 @@
                     {
                         "address": "sc:forwarder",
                         "endpoint": "str:MultiESDTNFTTransfer",
-                        "topics": [                            
+                        "topics": [
                             "str:FWD-TOKEN",
                             "0",
                             "100",
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 3b458dc9a2..f56f03ab62 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
@@ -61,7 +61,7 @@
                     {
                         "address": "sc:forwarder",
                         "endpoint": "str:ESDTNFTTransfer",
-                        "topics": [                            
+                        "topics": [
                             "str:NFT-000001",
                             "5",
                             "01",
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 20dd786e41..2e1a45d862 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
@@ -43,7 +43,7 @@
                     {
                         "address": "sc:forwarder",
                         "endpoint": "str:transferValueOnly",
-                        "topics": [                            
+                        "topics": [
                             "1000",
                             "sc:vault"
                         ],
@@ -66,7 +66,7 @@
                     {
                         "address": "sc:forwarder",
                         "endpoint": "str:transferValueOnly",
-                        "topics": [                            
+                        "topics": [
                             "",
                             "sc:vault"
                         ],
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 0d0ba011d5..9d929ce317 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
@@ -51,7 +51,7 @@
                     {
                         "address": "sc:forwarder",
                         "endpoint": "str:ESDTTransfer",
-                        "topics": [                            
+                        "topics": [
                             "str:TEST-TOKENA",
                             "0",
                             "1000",
@@ -82,7 +82,7 @@
                     {
                         "address": "sc:forwarder",
                         "endpoint": "str:transferValueOnly",
-                        "topics": [                            
+                        "topics": [
                             "0",
                             "sc:vault"
                         ],
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 c7745dc87e..b63cef0121 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
@@ -63,7 +63,7 @@
                     {
                         "address": "sc:forwarder",
                         "endpoint": "str:ESDTNFTTransfer",
-                        "topics": [                            
+                        "topics": [
                             "str:NFT-000001",
                             "5",
                             "01",
@@ -96,7 +96,7 @@
                     {
                         "address": "sc:forwarder",
                         "endpoint": "str:transferValueOnly",
-                        "topics": [                            
+                        "topics": [
                             "0",
                             "sc:vault"
                         ],
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 38a45c7e24..fbd135bd1c 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
@@ -43,7 +43,7 @@
                     {
                         "address": "sc:forwarder",
                         "endpoint": "str:transferValueOnly",
-                        "topics": [                            
+                        "topics": [
                             "0",
                             "sc:vault"
                         ],
@@ -71,7 +71,7 @@
                     {
                         "address": "sc:vault",
                         "endpoint": "str:transferValueOnly",
-                        "topics": [                            
+                        "topics": [
                             "1000",
                             "sc:forwarder"
                         ],
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 31ad91a9f4..ce3c486d4c 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
@@ -46,7 +46,7 @@
                     {
                         "address": "sc:forwarder",
                         "endpoint": "str:transferValueOnly",
-                        "topics": [                            
+                        "topics": [
                             "",
                             "sc:vault"
                         ],
@@ -74,7 +74,7 @@
                     {
                         "address": "sc:vault",
                         "endpoint": "str:ESDTTransfer",
-                        "topics": [                            
+                        "topics": [
                             "str:TEST-TOKENA",
                             "0",
                             "1000",
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 c326dbe987..4c5e8d3c0b 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
@@ -53,7 +53,7 @@
                     {
                         "address": "sc:forwarder",
                         "endpoint": "str:transferValueOnly",
-                        "topics": [                            
+                        "topics": [
                             "",
                             "sc:vault"
                         ],
@@ -81,7 +81,7 @@
                     {
                         "address": "sc:vault",
                         "endpoint": "str:ESDTNFTTransfer",
-                        "topics": [                            
+                        "topics": [
                             "str:NFT-000001",
                             "5",
                             "01",
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 cba3a8d458..41d67d6505 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
@@ -41,7 +41,7 @@
                     {
                         "address": "sc:forwarder",
                         "endpoint": "str:transferValueOnly",
-                        "topics": [                            
+                        "topics": [
                             "1000",
                             "sc:vault"
                         ],
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 f4e1776e6b..c1389b4588 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
@@ -41,7 +41,7 @@
                     {
                         "address": "sc:forwarder",
                         "endpoint": "str:transferValueOnly",
-                        "topics": [                            
+                        "topics": [
                             "1000",
                             "sc:vault"
                         ],
@@ -64,7 +64,7 @@
                     {
                         "address": "sc:forwarder",
                         "endpoint": "str:transferValueOnly",
-                        "topics": [                            
+                        "topics": [
                             "1000",
                             "sc:vault"
                         ],
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 80f8d48e0c..ae2740bddb 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
@@ -49,7 +49,7 @@
                     {
                         "address": "sc:forwarder",
                         "endpoint": "str:ESDTTransfer",
-                        "topics": [                            
+                        "topics": [
                             "str:TEST-TOKENA",
                             "0",
                             "1000",
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 2bce23a321..392815bb4b 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
@@ -49,7 +49,7 @@
                     {
                         "address": "sc:forwarder",
                         "endpoint": "str:ESDTTransfer",
-                        "topics": [                            
+                        "topics": [
                             "str:TEST-TOKENA",
                             "0",
                             "1000",
@@ -80,7 +80,7 @@
                     {
                         "address": "sc:forwarder",
                         "endpoint": "str:ESDTTransfer",
-                        "topics": [                            
+                        "topics": [
                             "str:TEST-TOKENA",
                             "0",
                             "1000",
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 2c5afabb3e..c735e51a26 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
@@ -67,7 +67,7 @@
                     {
                         "address": "sc:forwarder",
                         "endpoint": "str:MultiESDTNFTTransfer",
-                        "topics": [                            
+                        "topics": [
                             "str:FWD-TOKEN",
                             "0",
                             "100",
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 50be949687..2764d3ec4e 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
@@ -57,7 +57,7 @@
                     {
                         "address": "sc:forwarder",
                         "endpoint": "str:ESDTNFTTransfer",
-                        "topics": [                            
+                        "topics": [
                             "str:NFT-000001",
                             "5",
                             "01",
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 48207088bf..50e4d8e345 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
@@ -46,7 +46,7 @@
                     {
                         "address": "sc:forwarder",
                         "endpoint": "str:transferValueOnly",
-                        "topics": [                            
+                        "topics": [
                             "1000",
                             "sc:vault"
                         ],
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 9a4ad571df..a76b115597 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
@@ -57,7 +57,7 @@
                     {
                         "address": "sc:forwarder",
                         "endpoint": "str:ESDTNFTTransfer",
-                        "topics": [                            
+                        "topics": [
                             "str:NFT-000001",
                             "5",
                             "01",
@@ -90,7 +90,7 @@
                     {
                         "address": "sc:forwarder",
                         "endpoint": "str:ESDTNFTTransfer",
-                        "topics": [                            
+                        "topics": [
                             "str:NFT-000001",
                             "5",
                             "01",
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 7c59680884..44463b8d26 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
@@ -90,7 +90,7 @@
                     {
                         "address": "sc:forwarder",
                         "endpoint": "str:ESDTNFTTransfer",
-                        "topics": [                            
+                        "topics": [
                             "str:NFT-000001",
                             "2",
                             "01",
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 93c4d4bc3b..f326e6a977 100644
--- a/contracts/feature-tests/composability/scenarios/forwarder_sync_echo.scen.json
+++ b/contracts/feature-tests/composability/scenarios/forwarder_sync_echo.scen.json
@@ -42,7 +42,7 @@
                     {
                         "address": "sc:forwarder",
                         "endpoint": "str:transferValueOnly",
-                        "topics": [                            
+                        "topics": [
                             "0",
                             "sc:vault"
                         ],
@@ -95,7 +95,7 @@
                     {
                         "address": "sc:forwarder",
                         "endpoint": "str:transferValueOnly",
-                        "topics": [                            
+                        "topics": [
                             "0",
                             "sc:vault"
                         ],
@@ -124,7 +124,7 @@
                     {
                         "address": "sc:forwarder",
                         "endpoint": "str:transferValueOnly",
-                        "topics": [                            
+                        "topics": [
                             "0",
                             "sc:vault"
                         ],
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 7ebb0314f8..781fe0474e 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
@@ -57,7 +57,7 @@
                     {
                         "address": "sc:recursive-caller",
                         "endpoint": "str:transferValueOnly",
-                        "topics": [                            
+                        "topics": [
                             "1",
                             "sc:vault"
                         ],
@@ -80,7 +80,7 @@
                     {
                         "address": "sc:vault",
                         "endpoint": "str:transferValueOnly",
-                        "topics": [                            
+                        "topics": [
                             "0",
                             "sc:recursive-caller"
                         ],
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 c510375757..3d1c5fe969 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
@@ -60,7 +60,7 @@
                     {
                         "address": "sc:recursive-caller",
                         "endpoint": "str:ESDTTransfer",
-                        "topics": [                            
+                        "topics": [
                             "str:REC-TOKEN",
                             "",
                             "1",
@@ -91,7 +91,7 @@
                     {
                         "address": "sc:vault",
                         "endpoint": "str:transferValueOnly",
-                        "topics": [                            
+                        "topics": [
                             "0",
                             "sc:recursive-caller"
                         ],
diff --git a/contracts/feature-tests/composability/scenarios/send_esdt.scen.json b/contracts/feature-tests/composability/scenarios/send_esdt.scen.json
index 2cb6e9a23f..037f85ab2e 100644
--- a/contracts/feature-tests/composability/scenarios/send_esdt.scen.json
+++ b/contracts/feature-tests/composability/scenarios/send_esdt.scen.json
@@ -63,7 +63,7 @@
                     {
                         "address": "sc:forwarder",
                         "endpoint": "str:ESDTTransfer",
-                        "topics": [                            
+                        "topics": [
                             "str:SENDESDT",
                             "0",
                             "200",
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..9b2dd3d204 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,6 @@
                 "sc:mmap-features": {
                     "nonce": "0",
                     "balance": "0",
-                    "code": "file:../output/managed-map-features.wasm",
                     "storage": {
                         "str:num_entries": "3",
                         "str:key|u32:0": "str:key0",
@@ -15,7 +14,8 @@
                         "str:value|u32:1": "",
                         "str:key|u32:2": "",
                         "str:value|u32:2": "str:value2"
-                    }
+                    },
+                    "code": "file:../output/managed-map-features.wasm"
                 },
                 "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 f7cab94825..badd76e606 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,6 @@
                 "sc:mmap-features": {
                     "nonce": "0",
                     "balance": "0",
-                    "code": "file:../output/managed-map-features.wasm",
                     "storage": {
                         "str:num_entries": "4",
                         "str:key|u32:0": "str:key0",
@@ -17,7 +16,8 @@
                         "str:value|u32:2": "str:value2",
                         "str:key|u32:3": "str:key3",
                         "str:value|u32:3": "str:value3"
-                    }
+                    },
+                    "code": "file:../output/managed-map-features.wasm"
                 },
                 "address:an-account": {
                     "nonce": "0"
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..9942aa2ea6 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
@@ -24,7 +24,9 @@
                 "gasPrice": "0"
             },
             "expect": {
-                "out": [ "str:alternative init" ],
+                "out": [
+                    "str:alternative init"
+                ],
                 "status": "",
                 "logs": [],
                 "gas": "*",
@@ -36,10 +38,13 @@
             "id": "alt impl query",
             "tx": {
                 "to": "sc:mcf-alt-impl",
-                "function": "sample_value"
+                "function": "sample_value",
+                "arguments": []
             },
             "expect": {
-                "out": [ "str:alternative message instead of sample value" ],
+                "out": [
+                    "str:alternative message instead of sample value"
+                ],
                 "status": "",
                 "logs": [],
                 "gas": "*",
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..b169d32456 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
@@ -17,7 +17,8 @@
             "id": "example_feature_message",
             "tx": {
                 "to": "sc:mcf-example-feature",
-                "function": "example_feature_message"
+                "function": "example_feature_message",
+                "arguments": []
             },
             "expect": {
                 "out": [
@@ -30,7 +31,8 @@
             "id": "example_feature_message",
             "tx": {
                 "to": "sc:mcf",
-                "function": "example_feature_message"
+                "function": "example_feature_message",
+                "arguments": []
             },
             "expect": {
                 "out": [
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 571cfc7225..17477882fa 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
@@ -57,8 +57,7 @@
                 "arguments": [
                     "0x32"
                 ],
-                "gasLimit": "100000000",
-                "gasPrice": "0"
+                "gasLimit": "100000000"
             },
             "expect": {
                 "out": [],
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..e48ccf662c 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,14 +44,14 @@
             "accounts": {
                 "sc:child": {
                     "balance": "500",
-                    "owner": "sc:use_module",
                     "code": "file:../../composability/vault/output/vault.wasm",
+                    "owner": "sc:use_module",
                     "developerRewards": "100"
                 },
                 "sc:not_child": {
                     "balance": "500",
-                    "owner": "sc:not_owner",
-                    "code": "file:../../composability/vault/output/vault.wasm"
+                    "code": "file:../../composability/vault/output/vault.wasm",
+                    "owner": "sc:not_owner"
                 }
             }
         },
@@ -115,14 +115,14 @@
                 },
                 "sc:child": {
                     "balance": "500",
-                    "owner": "sc:use_module",
                     "code": "file:../../composability/vault/output/vault.wasm",
+                    "owner": "sc:use_module",
                     "developerRewards": "0"
                 },
                 "sc:not_child": {
                     "balance": "500",
-                    "owner": "sc:not_owner",
-                    "code": "file:../../composability/vault/output/vault.wasm"
+                    "code": "file:../../composability/vault/output/vault.wasm",
+                    "owner": "sc:not_owner"
                 }
             }
         }

From 922c0e66242ad4f2a093a1515c363be7c9ccb884 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 15 Nov 2023 19:43:03 +0200
Subject: [PATCH 0070/1254] github actions - VM 1.5.19

---
 .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 9439824cd6..f365a7322c 100644
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -16,7 +16,6 @@ jobs:
     uses: multiversx/mx-sc-actions/.github/workflows/contracts.yml@v2.3.3
     with:
       rust-toolchain: nightly-2023-05-26
-      vmtools-repository: "https://github.com/multiversx/mx-chain-vm-v1_4-go/archive/{TAG}.tar.gz"
-      vmtools-version: v1.4.89
+      vmtools-version: v1.5.19
     secrets:
       token: ${{ secrets.GITHUB_TOKEN }}

From 3fc4e3608c0a130cccad6c1cc9e688ab9faf2759 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 15 Nov 2023 19:43:47 +0200
Subject: [PATCH 0071/1254] vm-test-build-copy.sh update

---
 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 7ccd210ca0..d5d21c4c8d 100755
--- a/vm-test-build-copy.sh
+++ b/vm-test-build-copy.sh
@@ -61,6 +61,7 @@ build_and_copy_composability() {
 }
 
 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

From 7a399a525cebd85656ef26841b64d164f90279f2 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 15 Nov 2023 20:00:41 +0200
Subject: [PATCH 0072/1254] tool-update.sh update

---
 tool-update.sh | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/tool-update.sh b/tool-update.sh
index 2e84043a66..24f8e3eaf6 100755
--- a/tool-update.sh
+++ b/tool-update.sh
@@ -2,7 +2,7 @@
 
 # Locally update the VM version
 
-VM_TAG="v1.5.1"
+VM_TAG="v1.5.19"
 
 echo "Before:"
 mxpy config dump
@@ -11,7 +11,3 @@ echo "After:"
 mxpy config dump
 
 mxpy deps install vmtools --overwrite
-
-# Also update the Rust version
-
-mxpy deps install rust --tag="nightly" --overwrite

From ab25934be46f432dcb7f96c2ad0a158f1748f68b Mon Sep 17 00:00:00 2001
From: Alin Cruceat <alyn_509@yahoo.com>
Date: Wed, 15 Nov 2023 20:14:16 +0200
Subject: [PATCH 0073/1254] impl take for ManagedVec

---
 .../src/types/managed/wrapped/managed_vec.rs  |  6 ++++
 framework/scenario/tests/managed_vec_test.rs  | 28 +++++++++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/framework/base/src/types/managed/wrapped/managed_vec.rs b/framework/base/src/types/managed/wrapped/managed_vec.rs
index 12bbb94034..7447630553 100644
--- a/framework/base/src/types/managed/wrapped/managed_vec.rs
+++ b/framework/base/src/types/managed/wrapped/managed_vec.rs
@@ -229,6 +229,12 @@ where
         self.buffer.append(&part_after.buffer);
     }
 
+    pub fn take(&mut self, index: usize) -> T {
+        let item = unsafe { self.get_unsafe(index) };
+        self.remove(index);
+        item
+    }
+
     /// New `ManagedVec` instance with 1 element in it.
     pub fn from_single_item(item: T) -> Self {
         let mut result = ManagedVec::new();
diff --git a/framework/scenario/tests/managed_vec_test.rs b/framework/scenario/tests/managed_vec_test.rs
index 5ca2b8ef1b..284c89c43b 100644
--- a/framework/scenario/tests/managed_vec_test.rs
+++ b/framework/scenario/tests/managed_vec_test.rs
@@ -97,6 +97,34 @@ fn test_into_vec() {
     assert_eq!(vec, managed_vec.into_vec());
 }
 
+#[test]
+fn test_take_u64() {
+    let mut vec = Vec::<u64>::new();
+    let mut managed_vec = ManagedVec::<StaticApi, u64>::new();
+    for i in 20u64..=30u64 {
+        managed_vec.push(i);
+        vec.push(i);
+    }
+
+    assert_eq!(managed_vec.len(), 11);
+    assert_eq!(managed_vec.take(4), 24u64);
+    assert_eq!(managed_vec.len(), 10);
+}
+
+#[test]
+fn test_take_biguint() {
+    let mut vec = Vec::<BigUint<StaticApi>>::new();
+    let mut managed_vec = ManagedVec::<StaticApi, BigUint<StaticApi>>::new();
+    for i in 20u64..=30u64 {
+        let biguint = BigUint::<StaticApi>::from(i);
+        managed_vec.push(biguint.clone());
+        vec.push(biguint);
+    }
+    assert_eq!(managed_vec.len(), 11);
+    assert_eq!(managed_vec.take(4), BigUint::<StaticApi>::from(24u64));
+    assert_eq!(managed_vec.len(), 10);
+}
+
 #[test]
 fn test_sort_u64() {
     let mut vec = Vec::<u64>::new();

From f2b66fd6a7ae66552bc7fff11343d2e811234f64 Mon Sep 17 00:00:00 2001
From: Alin Cruceat <alyn_509@yahoo.com>
Date: Fri, 17 Nov 2023 14:55:38 +0200
Subject: [PATCH 0074/1254] contract changes

---
 .../src/crypto_kitties_proxy.rs               | 48 +++++++++++++++++++
 contracts/examples/crypto-zombies/src/lib.rs  |  1 +
 .../crypto-zombies/src/zombie_feeding.rs      | 35 +++-----------
 3 files changed, 55 insertions(+), 29 deletions(-)
 create mode 100644 contracts/examples/crypto-zombies/src/crypto_kitties_proxy.rs

diff --git a/contracts/examples/crypto-zombies/src/crypto_kitties_proxy.rs b/contracts/examples/crypto-zombies/src/crypto_kitties_proxy.rs
new file mode 100644
index 0000000000..805e9855e8
--- /dev/null
+++ b/contracts/examples/crypto-zombies/src/crypto_kitties_proxy.rs
@@ -0,0 +1,48 @@
+
+multiversx_sc::imports!();
+multiversx_sc::derive_imports!();
+
+#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, TypeAbi)]
+pub struct Kitty {
+    pub genes: KittyGenes,
+    pub birth_time: u64,   // timestamp
+    pub cooldown_end: u64, // timestamp, used for pregnancy timer and siring cooldown
+    pub matron_id: u32,
+    pub sire_id: u32,
+    pub siring_with_id: u32, // for pregnant cats, 0 otherwise
+    pub nr_children: u16,    // cooldown period increases exponentially with every breeding/siring
+    pub generation: u16,     // max(sire_gen, matron_gen) + 1. Generation also influences cooldown.
+}
+
+#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, TypeAbi)]
+pub struct KittyGenes {
+    pub fur_color: Color,
+    pub eye_color: Color,
+    pub meow_power: u8, // the higher the value, the louder the cat
+}
+
+#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, TypeAbi)]
+pub struct Color {
+    pub r: u8,
+    pub g: u8,
+    pub b: u8,
+}
+
+#[multiversx_sc::proxy]
+pub trait CryptoKitties {
+    #[endpoint]
+    fn get_kitty_by_id_endpoint(&self, kitty_id: u32) -> Kitty;
+}
+
+impl KittyGenes {
+    pub fn get_as_u64(&self) -> u64 {
+        (self.fur_color.as_u64() << 12 | self.eye_color.as_u64()) << 4
+            | self.meow_power.to_be() as u64
+    }
+}
+
+impl Color {
+    pub fn as_u64(&self) -> u64 {
+        ((self.r.to_be() as u64) << 4 | self.r.to_be() as u64) << 4 | self.r.to_be() as u64
+    }
+}
diff --git a/contracts/examples/crypto-zombies/src/lib.rs b/contracts/examples/crypto-zombies/src/lib.rs
index 6afd060d4f..80d7e2b9b0 100644
--- a/contracts/examples/crypto-zombies/src/lib.rs
+++ b/contracts/examples/crypto-zombies/src/lib.rs
@@ -3,6 +3,7 @@
 multiversx_sc::imports!();
 multiversx_sc::derive_imports!();
 
+mod crypto_kitties_proxy;
 mod storage;
 mod zombie;
 mod zombie_attack;
diff --git a/contracts/examples/crypto-zombies/src/zombie_feeding.rs b/contracts/examples/crypto-zombies/src/zombie_feeding.rs
index 07edcbe4e4..2aec821d58 100644
--- a/contracts/examples/crypto-zombies/src/zombie_feeding.rs
+++ b/contracts/examples/crypto-zombies/src/zombie_feeding.rs
@@ -1,33 +1,10 @@
 multiversx_sc::imports!();
 multiversx_sc::derive_imports!();
 
-use crate::{storage, zombie_factory, zombie_helper};
-use crypto_kitties_proxy::Kitty;
-
-mod crypto_kitties_proxy {
-    multiversx_sc::imports!();
-    multiversx_sc::derive_imports!();
-
-    #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, TypeAbi)]
-    pub struct Kitty {
-        pub is_gestating: bool,
-        pub is_ready: bool,
-        pub cooldown_index: u64,
-        pub next_action_at: u64,
-        pub siring_with_id: u64,
-        pub birth_time: u64,
-        pub matron_id: u64,
-        pub sire_id: u64,
-        pub generation: u64,
-        pub genes: u64,
-    }
-
-    #[multiversx_sc::proxy]
-    pub trait CryptoKitties {
-        #[endpoint]
-        fn get_kitty(&self, id: usize) -> Kitty;
-    }
-}
+use crate::{
+    crypto_kitties_proxy::{self, Kitty},
+    storage, zombie_factory, zombie_helper,
+};
 
 #[multiversx_sc::module]
 pub trait ZombieFeeding:
@@ -70,7 +47,7 @@ pub trait ZombieFeeding:
     ) {
         match result {
             ManagedAsyncCallResult::Ok(kitty) => {
-                let kitty_dna = kitty.genes;
+                let kitty_dna = kitty.genes.get_as_u64();
                 self.feed_and_multiply(zombie_id, kitty_dna, ManagedBuffer::from(b"kitty"));
             },
             ManagedAsyncCallResult::Err(_) => {},
@@ -81,7 +58,7 @@ pub trait ZombieFeeding:
     fn feed_on_kitty(&self, zombie_id: usize, kitty_id: usize) {
         let crypto_kitties_sc_address = self.crypto_kitties_sc_address().get();
         self.kitty_proxy(crypto_kitties_sc_address)
-            .get_kitty(kitty_id)
+            .get_kitty_by_id_endpoint(kitty_id as u32)
             .async_call()
             .with_callback(self.callbacks().get_kitty_callback(zombie_id))
             .call_and_exit();

From 4893fa9a8f8c6fd61f00423628bf1337cfdf2789 Mon Sep 17 00:00:00 2001
From: Alin Cruceat <alyn_509@yahoo.com>
Date: Fri, 17 Nov 2023 15:04:12 +0200
Subject: [PATCH 0075/1254] kitty_id as u32

---
 contracts/examples/crypto-zombies/src/zombie_feeding.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/contracts/examples/crypto-zombies/src/zombie_feeding.rs b/contracts/examples/crypto-zombies/src/zombie_feeding.rs
index 2aec821d58..df3a598779 100644
--- a/contracts/examples/crypto-zombies/src/zombie_feeding.rs
+++ b/contracts/examples/crypto-zombies/src/zombie_feeding.rs
@@ -55,10 +55,10 @@ pub trait ZombieFeeding:
     }
 
     #[endpoint]
-    fn feed_on_kitty(&self, zombie_id: usize, kitty_id: usize) {
+    fn feed_on_kitty(&self, zombie_id: usize, kitty_id: u32) {
         let crypto_kitties_sc_address = self.crypto_kitties_sc_address().get();
         self.kitty_proxy(crypto_kitties_sc_address)
-            .get_kitty_by_id_endpoint(kitty_id as u32)
+            .get_kitty_by_id_endpoint(kitty_id)
             .async_call()
             .with_callback(self.callbacks().get_kitty_callback(zombie_id))
             .call_and_exit();

From 72dbd6d2b232d86dfdbd41d117f223c828922d41 Mon Sep 17 00:00:00 2001
From: Alin Cruceat <alyn_509@yahoo.com>
Date: Fri, 17 Nov 2023 19:34:23 +0200
Subject: [PATCH 0076/1254] fix tests part 1

---
 .../examples/crowdfunding-esdt/wasm/Cargo.lock    | 15 +++++++++++----
 contracts/examples/digital-cash/wasm/Cargo.lock   | 15 +++++++++++----
 contracts/examples/factorial/wasm/Cargo.lock      | 15 +++++++++++----
 ...ing-pong-call-pong-all-interrupted-2.scen.json |  4 ++--
 contracts/examples/ping-pong-egld/wasm/Cargo.lock | 15 +++++++++++----
 .../feature-tests/alloc-features/wasm/Cargo.lock  | 15 +++++++++++----
 .../wasm-basic-features-storage-bytes/Cargo.lock  | 15 +++++++++++----
 .../wasm-basic-features-storage-bytes/Cargo.toml  |  2 ++
 .../feature-tests/basic-features/wasm/Cargo.lock  | 15 +++++++++++----
 .../big-float-features/wasm/Cargo.lock            | 15 +++++++++++----
 .../wasm-forwarder-queue-promises/Cargo.lock      | 15 +++++++++++----
 .../wasm-forwarder-queue-promises/Cargo.toml      |  2 ++
 .../composability/forwarder-queue/wasm/Cargo.lock | 15 +++++++++++----
 ...forwarder_call_sync_retrieve_egld_bt.scen.json |  4 ++--
 ...forwarder_call_sync_retrieve_esdt_bt.scen.json |  4 ++--
 .../forwarder_call_sync_retrieve_nft_bt.scen.json |  4 ++--
 .../promises_single_transfer.scen.json            |  5 +----
 .../scenarios/proxy_test_upgrade.scen.json        |  7 ++-----
 .../erc-style-contracts/erc20/wasm/Cargo.lock     | 15 +++++++++++----
 .../esdt-system-sc-mock/wasm/Cargo.lock           | 15 +++++++++++----
 .../formatted-message-features/wasm/Cargo.lock    | 15 +++++++++++----
 .../payable-features/wasm/Cargo.lock              | 15 +++++++++++----
 22 files changed, 169 insertions(+), 73 deletions(-)

diff --git a/contracts/examples/crowdfunding-esdt/wasm/Cargo.lock b/contracts/examples/crowdfunding-esdt/wasm/Cargo.lock
index 8a1910f612..61e5a6fa5f 100644
--- a/contracts/examples/crowdfunding-esdt/wasm/Cargo.lock
+++ b/contracts/examples/crowdfunding-esdt/wasm/Cargo.lock
@@ -14,6 +14,12 @@ dependencies = [
  "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"
@@ -61,11 +67,12 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.13.2"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
  "ahash",
+ "allocator-api2",
 ]
 
 [[package]]
@@ -76,9 +83,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-literal"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
diff --git a/contracts/examples/digital-cash/wasm/Cargo.lock b/contracts/examples/digital-cash/wasm/Cargo.lock
index 189bab2640..ad63f9057c 100644
--- a/contracts/examples/digital-cash/wasm/Cargo.lock
+++ b/contracts/examples/digital-cash/wasm/Cargo.lock
@@ -14,6 +14,12 @@ dependencies = [
  "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"
@@ -61,11 +67,12 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.13.2"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
  "ahash",
+ "allocator-api2",
 ]
 
 [[package]]
@@ -76,9 +83,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-literal"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
diff --git a/contracts/examples/factorial/wasm/Cargo.lock b/contracts/examples/factorial/wasm/Cargo.lock
index de78a7b2fb..ac470efb06 100755
--- a/contracts/examples/factorial/wasm/Cargo.lock
+++ b/contracts/examples/factorial/wasm/Cargo.lock
@@ -14,6 +14,12 @@ dependencies = [
  "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"
@@ -61,11 +67,12 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.13.2"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
  "ahash",
+ "allocator-api2",
 ]
 
 [[package]]
@@ -76,9 +83,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-literal"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
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..5a06b49981 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
@@ -44,7 +44,7 @@
                 },
                 "address:participant1": {
                     "nonce": "2",
-                    "balance": "1,800,000,000,000",
+                    "balance": "1,300,000,000,000",
                     "storage": {}
                 },
                 "address:participant2": {
@@ -54,7 +54,7 @@
                 },
                 "sc:ping-pong": {
                     "nonce": "0",
-                    "balance": "500,000,000,000",
+                    "balance": "1,000,000,000,000",
                     "storage": {
                         "str:pingAmount": "500,000,000,000",
                         "str:activationTimestamp": "780",
diff --git a/contracts/examples/ping-pong-egld/wasm/Cargo.lock b/contracts/examples/ping-pong-egld/wasm/Cargo.lock
index ab6919fbf0..3c60fbb605 100755
--- a/contracts/examples/ping-pong-egld/wasm/Cargo.lock
+++ b/contracts/examples/ping-pong-egld/wasm/Cargo.lock
@@ -14,6 +14,12 @@ dependencies = [
  "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"
@@ -46,11 +52,12 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.13.2"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
  "ahash",
+ "allocator-api2",
 ]
 
 [[package]]
@@ -61,9 +68,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-literal"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
diff --git a/contracts/feature-tests/alloc-features/wasm/Cargo.lock b/contracts/feature-tests/alloc-features/wasm/Cargo.lock
index a7d34893c8..7cebd29898 100644
--- a/contracts/feature-tests/alloc-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/alloc-features/wasm/Cargo.lock
@@ -29,6 +29,12 @@ dependencies = [
  "multiversx-sc-wasm-adapter",
 ]
 
+[[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"
@@ -61,11 +67,12 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.13.2"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
  "ahash",
+ "allocator-api2",
 ]
 
 [[package]]
@@ -76,9 +83,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-literal"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
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 c5cbaa694b..00dc76f87e 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
@@ -14,6 +14,12 @@ dependencies = [
  "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"
@@ -62,11 +68,12 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.13.2"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
  "ahash",
+ "allocator-api2",
 ]
 
 [[package]]
@@ -77,9 +84,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-literal"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
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 c1f9e3f5a4..a3c823d61d 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
@@ -7,12 +7,14 @@ publish = false
 
 [lib]
 crate-type = ["cdylib"]
+
 [profile.release]
 codegen-units = 1
 opt-level = "z"
 lto = true
 debug = false
 panic = "abort"
+
 [dependencies.basic-features]
 path = ".."
 
diff --git a/contracts/feature-tests/basic-features/wasm/Cargo.lock b/contracts/feature-tests/basic-features/wasm/Cargo.lock
index 403117034b..d77e2f803d 100755
--- a/contracts/feature-tests/basic-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/basic-features/wasm/Cargo.lock
@@ -14,6 +14,12 @@ dependencies = [
  "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"
@@ -62,11 +68,12 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.13.2"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
  "ahash",
+ "allocator-api2",
 ]
 
 [[package]]
@@ -77,9 +84,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-literal"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
diff --git a/contracts/feature-tests/big-float-features/wasm/Cargo.lock b/contracts/feature-tests/big-float-features/wasm/Cargo.lock
index 85fbf67e45..ef1fb93625 100644
--- a/contracts/feature-tests/big-float-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/big-float-features/wasm/Cargo.lock
@@ -14,6 +14,12 @@ dependencies = [
  "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"
@@ -61,11 +67,12 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.13.2"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
  "ahash",
+ "allocator-api2",
 ]
 
 [[package]]
@@ -76,9 +83,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-literal"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
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 2dc73f90f8..0d68eb00a4 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
@@ -14,6 +14,12 @@ dependencies = [
  "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"
@@ -62,11 +68,12 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.13.2"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
  "ahash",
+ "allocator-api2",
 ]
 
 [[package]]
@@ -77,9 +84,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-literal"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
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 7a11a330de..2d4fbf3345 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
@@ -7,12 +7,14 @@ publish = false
 
 [lib]
 crate-type = ["cdylib"]
+
 [profile.release]
 codegen-units = 1
 opt-level = "z"
 lto = true
 debug = false
 panic = "abort"
+
 [dependencies.forwarder-queue]
 path = ".."
 features = ["promises"]
diff --git a/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock
index ae4536abae..3aded43ee2 100644
--- a/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock
@@ -14,6 +14,12 @@ dependencies = [
  "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"
@@ -62,11 +68,12 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.13.2"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
  "ahash",
+ "allocator-api2",
 ]
 
 [[package]]
@@ -77,9 +84,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-literal"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
diff --git a/contracts/feature-tests/composability/scenarios-promises/forwarder_call_sync_retrieve_egld_bt.scen.json b/contracts/feature-tests/composability/scenarios-promises/forwarder_call_sync_retrieve_egld_bt.scen.json
index 1c1b123171..37492054e9 100644
--- a/contracts/feature-tests/composability/scenarios-promises/forwarder_call_sync_retrieve_egld_bt.scen.json
+++ b/contracts/feature-tests/composability/scenarios-promises/forwarder_call_sync_retrieve_egld_bt.scen.json
@@ -26,7 +26,7 @@
             "tx": {
                 "from": "address:a_user",
                 "to": "sc:forwarder",
-                "function": "forward_sync_retrieve_funds",
+                "function": "forward_sync_retrieve_funds_bt",
                 "arguments": [
                     "sc:vault",
                     "str:EGLD",
@@ -82,7 +82,7 @@
                     },
                     {
                         "address": "sc:forwarder",
-                        "endpoint": "str:forward_sync_retrieve_funds",
+                        "endpoint": "str:forward_sync_retrieve_funds_bt",
                         "topics": [
                             "str:back_tranfers",
                             "1000"
diff --git a/contracts/feature-tests/composability/scenarios-promises/forwarder_call_sync_retrieve_esdt_bt.scen.json b/contracts/feature-tests/composability/scenarios-promises/forwarder_call_sync_retrieve_esdt_bt.scen.json
index b98172a3b4..071238feb1 100644
--- a/contracts/feature-tests/composability/scenarios-promises/forwarder_call_sync_retrieve_esdt_bt.scen.json
+++ b/contracts/feature-tests/composability/scenarios-promises/forwarder_call_sync_retrieve_esdt_bt.scen.json
@@ -29,7 +29,7 @@
             "tx": {
                 "from": "address:a_user",
                 "to": "sc:forwarder",
-                "function": "forward_sync_retrieve_funds",
+                "function": "forward_sync_retrieve_funds_bt",
                 "arguments": [
                     "sc:vault",
                     "str:TEST-TOKENA",
@@ -89,7 +89,7 @@
                     },
                     {
                         "address": "sc:forwarder",
-                        "endpoint": "str:forward_sync_retrieve_funds",
+                        "endpoint": "str:forward_sync_retrieve_funds_bt",
                         "topics": [
                             "str:back_tranfers",
                             "0",
diff --git a/contracts/feature-tests/composability/scenarios-promises/forwarder_call_sync_retrieve_nft_bt.scen.json b/contracts/feature-tests/composability/scenarios-promises/forwarder_call_sync_retrieve_nft_bt.scen.json
index 3762b59942..56621a12d9 100644
--- a/contracts/feature-tests/composability/scenarios-promises/forwarder_call_sync_retrieve_nft_bt.scen.json
+++ b/contracts/feature-tests/composability/scenarios-promises/forwarder_call_sync_retrieve_nft_bt.scen.json
@@ -36,7 +36,7 @@
             "tx": {
                 "from": "address:a_user",
                 "to": "sc:forwarder",
-                "function": "forward_sync_retrieve_funds",
+                "function": "forward_sync_retrieve_funds_bt",
                 "arguments": [
                     "sc:vault",
                     "str:NFT-000001",
@@ -98,7 +98,7 @@
                     },
                     {
                         "address": "sc:forwarder",
-                        "endpoint": "str:forward_sync_retrieve_funds",
+                        "endpoint": "str:forward_sync_retrieve_funds_bt",
                         "topics": [
                             "str:back_tranfers",
                             "0",
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 2e8a12e545..6f7e26a21f 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
@@ -84,10 +84,7 @@
                 "gasPrice": "0"
             },
             "expect": {
-                "out": [
-                    "1",
-                    "2"
-                ],
+                "out": [],
                 "status": "0",
                 "logs": [
                     {
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..9f02a45b34 100644
--- a/contracts/feature-tests/composability/scenarios/proxy_test_upgrade.scen.json
+++ b/contracts/feature-tests/composability/scenarios/proxy_test_upgrade.scen.json
@@ -29,9 +29,6 @@
                 "gasPrice": "0"
             },
             "expect": {
-                "out": [
-                    "457"
-                ],
                 "status": "0",
                 "message": "",
                 "gas": "*",
@@ -49,7 +46,7 @@
                 },
                 "sc:proxy-first": {
                     "nonce": "1",
-                    "balance": "0",
+                    "balance": "200",
                     "storage": {
                         "str:other_contract": "sc:proxy-second"
                     },
@@ -57,7 +54,7 @@
                 },
                 "sc:proxy-second": {
                     "nonce": "0",
-                    "balance": "300",
+                    "balance": "100",
                     "storage": {
                         "str:init_arg": "456",
                         "str:last_payment": "200"
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 ef9978e123..762feef9ae 100644
--- a/contracts/feature-tests/erc-style-contracts/erc20/wasm/Cargo.lock
+++ b/contracts/feature-tests/erc-style-contracts/erc20/wasm/Cargo.lock
@@ -14,6 +14,12 @@ dependencies = [
  "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"
@@ -61,11 +67,12 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.13.2"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
  "ahash",
+ "allocator-api2",
 ]
 
 [[package]]
@@ -76,9 +83,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-literal"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
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 5c396a891e..b67cc74c48 100644
--- a/contracts/feature-tests/esdt-system-sc-mock/wasm/Cargo.lock
+++ b/contracts/feature-tests/esdt-system-sc-mock/wasm/Cargo.lock
@@ -14,6 +14,12 @@ dependencies = [
  "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"
@@ -61,11 +67,12 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.13.2"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
  "ahash",
+ "allocator-api2",
 ]
 
 [[package]]
@@ -76,9 +83,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-literal"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
diff --git a/contracts/feature-tests/formatted-message-features/wasm/Cargo.lock b/contracts/feature-tests/formatted-message-features/wasm/Cargo.lock
index 51c627a65e..814b5d8eda 100644
--- a/contracts/feature-tests/formatted-message-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/formatted-message-features/wasm/Cargo.lock
@@ -14,6 +14,12 @@ dependencies = [
  "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"
@@ -61,11 +67,12 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.13.2"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
  "ahash",
+ "allocator-api2",
 ]
 
 [[package]]
@@ -76,9 +83,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-literal"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
diff --git a/contracts/feature-tests/payable-features/wasm/Cargo.lock b/contracts/feature-tests/payable-features/wasm/Cargo.lock
index 1fd95978e7..7375bbaea8 100755
--- a/contracts/feature-tests/payable-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/payable-features/wasm/Cargo.lock
@@ -14,6 +14,12 @@ dependencies = [
  "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"
@@ -46,11 +52,12 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.13.2"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
  "ahash",
+ "allocator-api2",
 ]
 
 [[package]]
@@ -61,9 +68,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-literal"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"

From 63868bfee3184d86a5dea1affb506473109f3c10 Mon Sep 17 00:00:00 2001
From: Alin Cruceat <alyn_509@yahoo.com>
Date: Mon, 20 Nov 2023 13:25:18 +0200
Subject: [PATCH 0077/1254] fix tests part 2

---
 .../ping-pong-call-pong-all-interrupted-2.scen.json    |  5 ++---
 .../composability/scenarios/forw_queue_async.scen.json |  5 ++---
 .../scenarios/proxy_test_upgrade.scen.json             | 10 +++++-----
 3 files changed, 9 insertions(+), 11 deletions(-)

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 5a06b49981..02735fba35 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
@@ -61,12 +61,11 @@
                         "str:deadline": "123,780",
                         "str:user_address_to_id|address:participant1": "1",
                         "str:user_id_to_address|0x0000001": "address:participant1",
-                        "str:userStatus|0x0000001": "2",
+                        "str:userStatus|0x0000001": "1",
                         "str:user_address_to_id|address:participant2": "2",
                         "str:user_id_to_address|0x0000002": "address:participant2",
                         "str:userStatus|0x0000002": "1",
-                        "str:user_count": "2",
-                        "str:pongAllLastUser": "1"
+                        "str:user_count": "2"
                     },
                     "code": "file:../output/ping-pong-egld.wasm"
                 }
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 4b7d372805..d6d89c668f 100644
--- a/contracts/feature-tests/composability/scenarios/forw_queue_async.scen.json
+++ b/contracts/feature-tests/composability/scenarios/forw_queue_async.scen.json
@@ -71,9 +71,8 @@
                         "address": "*",
                         "endpoint": "str:transferValueOnly",
                         "topics": [
-                            "sc:forwarder-queue",
-                            "sc:vault",
-                            "1000"
+                            "1000",
+                            "sc:vault"
                         ],
                         "data": "*"
                     },
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 9f02a45b34..f87625a172 100644
--- a/contracts/feature-tests/composability/scenarios/proxy_test_upgrade.scen.json
+++ b/contracts/feature-tests/composability/scenarios/proxy_test_upgrade.scen.json
@@ -20,7 +20,7 @@
             "tx": {
                 "from": "address:a_user",
                 "to": "sc:proxy-first",
-                "egldValue": "200",
+                "egldValue": "0",
                 "function": "upgradeSecondContract",
                 "arguments": [
                     "file:../proxy-test-second/output/proxy-test-second.wasm"
@@ -40,13 +40,13 @@
             "accounts": {
                 "address:a_user": {
                     "nonce": "2",
-                    "balance": "0",
+                    "balance": "200",
                     "storage": {},
                     "code": ""
                 },
                 "sc:proxy-first": {
                     "nonce": "1",
-                    "balance": "200",
+                    "balance": "0",
                     "storage": {
                         "str:other_contract": "sc:proxy-second"
                     },
@@ -56,8 +56,8 @@
                     "nonce": "0",
                     "balance": "100",
                     "storage": {
-                        "str:init_arg": "456",
-                        "str:last_payment": "200"
+                        "str:init_arg": "123",
+                        "str:last_payment": "100"
                     },
                     "code": "file:../proxy-test-second/output/proxy-test-second.wasm"
                 }

From fc148c5fb10b6f1467d661ed579f7a813dd44650 Mon Sep 17 00:00:00 2001
From: Alin Cruceat <alyn_509@yahoo.com>
Date: Mon, 20 Nov 2023 13:59:07 +0200
Subject: [PATCH 0078/1254] fix tests part 3

---
 .../composability/scenarios/proxy_test_upgrade.scen.json        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 f87625a172..a262547fe8 100644
--- a/contracts/feature-tests/composability/scenarios/proxy_test_upgrade.scen.json
+++ b/contracts/feature-tests/composability/scenarios/proxy_test_upgrade.scen.json
@@ -56,7 +56,7 @@
                     "nonce": "0",
                     "balance": "100",
                     "storage": {
-                        "str:init_arg": "123",
+                        "str:init_arg": "456",
                         "str:last_payment": "100"
                     },
                     "code": "file:../proxy-test-second/output/proxy-test-second.wasm"

From c56d079915e14d383ca327d6ea8a38961214a6d9 Mon Sep 17 00:00:00 2001
From: Alin Cruceat <alyn_509@yahoo.com>
Date: Mon, 20 Nov 2023 17:59:57 +0200
Subject: [PATCH 0079/1254] remove mets renaming in template

---
 .../cmd/standalone/template/template_adjuster.rs    | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/framework/meta/src/cmd/standalone/template/template_adjuster.rs b/framework/meta/src/cmd/standalone/template/template_adjuster.rs
index 0cd3d97456..693b03faa7 100644
--- a/framework/meta/src/cmd/standalone/template/template_adjuster.rs
+++ b/framework/meta/src/cmd/standalone/template/template_adjuster.rs
@@ -10,7 +10,6 @@ use toml::value::Table;
 const TEST_DIRECTORY: &str = "./tests";
 const ROOT_CARGO_TOML: &str = "./Cargo.toml";
 const META_CARGO_TOML: &str = "./meta/Cargo.toml";
-const WASM_CARGO_TOML: &str = "./wasm/Cargo.toml";
 
 pub struct TemplateAdjuster {
     pub metadata: TemplateMetadata,
@@ -20,7 +19,6 @@ pub struct TemplateAdjuster {
 impl TemplateAdjuster {
     pub fn update_dependencies(&self) {
         self.update_dependencies_root();
-        self.update_dependencies_wasm();
         self.update_dependencies_meta();
     }
 
@@ -48,17 +46,6 @@ impl TemplateAdjuster {
         toml.save_to_file(&cargo_toml_path);
     }
 
-    fn update_dependencies_wasm(&self) {
-        let cargo_toml_path = self.target.contract_dir().join(WASM_CARGO_TOML);
-        let mut toml = CargoTomlContents::load_from_file(&cargo_toml_path);
-
-        if !self.keep_paths {
-            remove_paths_from_deps(&mut toml, &[&self.metadata.name]);
-        }
-
-        toml.save_to_file(&cargo_toml_path);
-    }
-
     pub fn rename_template_to(&self) {
         self.rename_trait_to();
         self.rename_in_cargo_toml_root();

From aed385f44462184e40795f5df3dd4429b0ab3930 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 21 Nov 2023 17:29:35 +0200
Subject: [PATCH 0080/1254] vm-test-build-copy.sh fix

---
 vm-test-build-copy.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/vm-test-build-copy.sh b/vm-test-build-copy.sh
index d5d21c4c8d..e04d128233 100755
--- a/vm-test-build-copy.sh
+++ b/vm-test-build-copy.sh
@@ -28,8 +28,12 @@ build_and_copy_with_scenarios() {
    rm -rf $vm_contract_path/scenarios
    cp $contract_path/output/*.wasm \
       $vm_contract_path/output
-   cp -R $contract_path/scenarios \
-      $vm_contract_path
+
+   # copying scenarios ...
+   rsync -av \
+      --exclude *_generated* \
+      $contract_path/scenarios/ \
+      $vm_contract_path/scenarios/
 }
 
 # building all contracts takes a lot of time, only the ones for the wasm-vm tests are built below

From 157a817c62e7d4d0083a46e86eed879dc46fae7c Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 21 Nov 2023 17:30:55 +0200
Subject: [PATCH 0081/1254] upgrade test fixes copied from VM

---
 .../promises_single_transfer.scen.json        | 17 +++---
 .../forw_raw_contract_upgrade.scen.json       | 13 ++--
 .../forw_raw_contract_upgrade_self.scen.json  | 16 ++---
 .../forwarder_contract_upgrade.scen.json      | 59 +++++++++++++++++--
 .../scenarios/proxy_test_upgrade.scen.json    | 11 ++--
 5 files changed, 88 insertions(+), 28 deletions(-)

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 6f7e26a21f..8cc1462294 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
@@ -75,8 +75,8 @@
                 "arguments": [
                     "sc:vault",
                     "str:echo_arguments",
-                    "3,000,000",
-                    "100,000,000",
+                    "10,000,000",
+                    "10,000,000",
                     "1",
                     "2"
                 ],
@@ -84,13 +84,16 @@
                 "gasPrice": "0"
             },
             "expect": {
-                "out": [],
+                "out": [
+                    "1",
+                    "2"
+                ],
                 "status": "0",
                 "logs": [
                     {
                         "address": "sc:promises",
                         "endpoint": "str:transferValueOnly",
-                        "topics": [
+                        "topics": [                            
                             "0",
                             "sc:vault"
                         ],
@@ -104,7 +107,7 @@
                     {
                         "address": "sc:vault",
                         "endpoint": "str:transferValueOnly",
-                        "topics": [
+                        "topics": [                                                        
                             "0",
                             "sc:promises"
                         ],
@@ -185,7 +188,7 @@
                     {
                         "address": "sc:promises",
                         "endpoint": "str:transferValueOnly",
-                        "topics": [
+                        "topics": [                            
                             "0",
                             "sc:vault"
                         ],
@@ -199,7 +202,7 @@
                     {
                         "address": "sc:vault",
                         "endpoint": "str:transferValueOnly",
-                        "topics": [
+                        "topics": [                            
                             "0",
                             "sc:promises"
                         ],
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..025d40985c 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
@@ -8,6 +8,9 @@
                 "sc:forwarder": {
                     "code": "file:../forwarder-raw/output/forwarder-raw.wasm"
                 },
+                "sc:reference": {
+                    "code": "file:../vault/output/vault-upgrade.wasm"
+                },
                 "sc:child": {
                     "code": "file:../vault/output/vault.wasm",
                     "owner": "sc:forwarder"
@@ -16,27 +19,28 @@
         },
         {
             "step": "scCall",
-            "id": "upgrade-vault-to-forwarder",
+            "id": "upgrade-vault-from-source",
             "tx": {
                 "from": "address:a_user",
                 "to": "sc:forwarder",
                 "function": "call_upgrade_from_source",
                 "arguments": [
                     "sc:child",
-                    "sc:forwarder"
+                    "sc:reference"
                 ],
                 "gasLimit": "500,000,000",
                 "gasPrice": "0"
             },
             "expect": {
-                "out": []
+                "out": "*",
+                "status": ""
             }
         },
         {
             "step": "checkState",
             "accounts": {
                 "sc:child": {
-                    "code": "file:../forwarder-raw/output/forwarder-raw.wasm"
+                    "code": "file:../vault/output/vault-upgrade.wasm"
                 },
                 "+": ""
             }
@@ -58,6 +62,7 @@
             },
             "expect": {
                 "out": [
+                    "str:upgraded",
                     "str:upgrade-init-arg"
                 ]
             }
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..488d3b24d0 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
@@ -9,8 +9,8 @@
                     "code": "file:../forwarder-raw/output/forwarder-raw.wasm",
                     "owner": "sc:forwarder"
                 },
-                "sc:vault": {
-                    "code": "file:../vault/output/vault.wasm"
+                "sc:reference": {
+                    "code": "file:../vault/output/vault-upgrade.wasm"
                 }
             }
         },
@@ -23,13 +23,15 @@
                 "function": "call_upgrade_from_source",
                 "arguments": [
                     "sc:forwarder",
-                    "sc:vault"
+                    "sc:reference"
                 ],
                 "gasLimit": "500,000,000",
                 "gasPrice": "0"
             },
             "expect": {
-                "out": []
+                "out": [
+                    "str:upgraded"
+                ]
             }
         },
         {
@@ -39,11 +41,11 @@
                     "nonce": "*"
                 },
                 "sc:forwarder": {
-                    "code": "file:../vault/output/vault.wasm",
+                    "code": "file:../vault/output/vault-upgrade.wasm",
                     "owner": "sc:forwarder"
                 },
-                "sc:vault": {
-                    "code": "file:../vault/output/vault.wasm"
+                "sc:reference": {
+                    "code": "file:../vault/output/vault-upgrade.wasm"
                 }
             }
         }
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..c4461a48dc 100644
--- a/contracts/feature-tests/composability/scenarios/forwarder_contract_upgrade.scen.json
+++ b/contracts/feature-tests/composability/scenarios/forwarder_contract_upgrade.scen.json
@@ -8,6 +8,9 @@
                 "sc:forwarder": {
                     "code": "file:../forwarder/output/forwarder.wasm"
                 },
+                "sc:reference": {
+                    "code": "file:../vault/output/vault-upgrade.wasm"
+                },
                 "sc:child": {
                     "code": "file:../vault/output/vault.wasm",
                     "owner": "sc:forwarder"
@@ -16,27 +19,28 @@
         },
         {
             "step": "scCall",
-            "id": "upgrade-vault-to-forwarder",
+            "id": "upgrade-vault-from-source",
             "tx": {
                 "from": "address:a_user",
                 "to": "sc:forwarder",
                 "function": "upgrade_vault_from_source",
                 "arguments": [
                     "sc:child",
-                    "sc:forwarder"
+                    "sc:reference"
                 ],
                 "gasLimit": "500,000,000",
                 "gasPrice": "0"
             },
             "expect": {
-                "out": []
+                "out": "*",
+                "status": ""
             }
         },
         {
             "step": "checkState",
             "accounts": {
                 "sc:child": {
-                    "code": "file:../forwarder/output/forwarder.wasm"
+                    "code": "file:../vault/output/vault-upgrade.wasm"
                 },
                 "+": ""
             }
@@ -51,13 +55,56 @@
                 "function": "upgradeVault",
                 "arguments": [
                     "sc:child",
-                    "file:../vault/output/vault.wasm"
+                    "file:../vault/output/vault.wasm",
+                    "str:arg"
                 ],
                 "gasLimit": "500,000,000",
                 "gasPrice": "0"
             },
             "expect": {
-                "out": []
+                "out": "*",
+                "logs": [
+                    {
+                        "address": "sc:forwarder",
+                        "endpoint": "str:transferValueOnly",
+                        "topics": [
+                            "",
+                            "sc:child"
+                        ],
+                        "data": [
+                            "str:UpgradeFromSource",
+                            "str:upgradeContract",
+                            "*",
+                            "0x0100",
+                            "str:arg"
+                        ]
+                    },
+                    {
+                        "address": "sc:child",
+                        "endpoint": "str:upgradeContract",
+                        "topics": [
+                            "str:upgraded"
+                        ],
+                        "data": [
+                            ""
+                        ]
+                    },
+                    {
+                        "address": "sc:child",
+                        "endpoint": "str:transferValueOnly",
+                        "topics": [
+                            "",
+                            "sc:forwarder"
+                        ],
+                        "data": [
+                            "str:AsyncCallback",
+                            "str:callBack",
+                            "0x00",
+                            "str:upgraded",
+                            "str:arg"
+                        ]
+                    }
+                ]
             }
         },
         {
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 a262547fe8..5c694b1a78 100644
--- a/contracts/feature-tests/composability/scenarios/proxy_test_upgrade.scen.json
+++ b/contracts/feature-tests/composability/scenarios/proxy_test_upgrade.scen.json
@@ -20,7 +20,7 @@
             "tx": {
                 "from": "address:a_user",
                 "to": "sc:proxy-first",
-                "egldValue": "0",
+                "egldValue": "200",
                 "function": "upgradeSecondContract",
                 "arguments": [
                     "file:../proxy-test-second/output/proxy-test-second.wasm"
@@ -29,6 +29,9 @@
                 "gasPrice": "0"
             },
             "expect": {
+                "out": [
+                    "457"
+                ],
                 "status": "0",
                 "message": "",
                 "gas": "*",
@@ -40,7 +43,7 @@
             "accounts": {
                 "address:a_user": {
                     "nonce": "2",
-                    "balance": "200",
+                    "balance": "0",
                     "storage": {},
                     "code": ""
                 },
@@ -54,10 +57,10 @@
                 },
                 "sc:proxy-second": {
                     "nonce": "0",
-                    "balance": "100",
+                    "balance": "300",
                     "storage": {
                         "str:init_arg": "456",
-                        "str:last_payment": "100"
+                        "str:last_payment": "200"
                     },
                     "code": "file:../proxy-test-second/output/proxy-test-second.wasm"
                 }

From 5fe36da7c7f4db2b15ec360dccedf6ec4e307063 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 21 Nov 2023 17:31:06 +0200
Subject: [PATCH 0082/1254] test fixes

---
 ...ping-pong-call-pong-all-interrupted-2.scen.json |  2 +-
 .../composability/forwarder-queue/sc-config.toml   |  1 +
 .../scenarios/forw_queue_async.scen.json           | 14 +++++++++++++-
 3 files changed, 15 insertions(+), 2 deletions(-)

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 02735fba35..6b13d97942 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
@@ -21,7 +21,7 @@
                 "to": "sc:ping-pong",
                 "function": "pongAll",
                 "arguments": [],
-                "gasLimit": "6,500,000",
+                "gasLimit": "6,100,000",
                 "gasPrice": "0"
             },
             "expect": {
diff --git a/contracts/feature-tests/composability/forwarder-queue/sc-config.toml b/contracts/feature-tests/composability/forwarder-queue/sc-config.toml
index 555b0da532..19bc470c67 100644
--- a/contracts/feature-tests/composability/forwarder-queue/sc-config.toml
+++ b/contracts/feature-tests/composability/forwarder-queue/sc-config.toml
@@ -8,3 +8,4 @@ name = "forwarder-queue"
 name = "forwarder-queue-promises"
 add-labels = ["promises-callback"]
 features = ["promises"]
+ei = "1.3"
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 d6d89c668f..dbd21b81ff 100644
--- a/contracts/feature-tests/composability/scenarios/forw_queue_async.scen.json
+++ b/contracts/feature-tests/composability/scenarios/forw_queue_async.scen.json
@@ -1,5 +1,4 @@
 {
-    "gasSchedule": "v3",
     "steps": [
         {
             "step": "setState",
@@ -84,6 +83,19 @@
                             "0x03e8"
                         ],
                         "data": "*"
+                    },
+                    {
+                        "address": "sc:vault",
+                        "endpoint": "str:transferValueOnly",
+                        "topics": [
+                            "0",
+                            "sc:forwarder-queue"
+                        ],
+                        "data": [
+                            "str:AsyncCallback",
+                            "str:callBack",
+                            "0x00"
+                        ]
                     }
                 ],
                 "gas": "*",

From dca875b15be7e33506d4cb1277313a7bf2dea3cf Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 21 Nov 2023 17:39:39 +0200
Subject: [PATCH 0083/1254] re-generated wasm crates

---
 build-wasm.sh                                 |  2 +-
 .../benchmarks/large-storage/wasm/Cargo.lock  | 33 ++++++++++-------
 .../benchmarks/large-storage/wasm/Cargo.toml  |  6 ++++
 .../linked-list-repeat/wasm/Cargo.lock        | 33 ++++++++++-------
 .../linked-list-repeat/wasm/Cargo.toml        |  6 ++++
 .../mappers/map-repeat/wasm/Cargo.lock        | 33 ++++++++++-------
 .../mappers/map-repeat/wasm/Cargo.toml        |  6 ++++
 .../mappers/queue-repeat/wasm/Cargo.lock      | 33 ++++++++++-------
 .../mappers/queue-repeat/wasm/Cargo.toml      |  6 ++++
 .../mappers/set-repeat/wasm/Cargo.lock        | 33 ++++++++++-------
 .../mappers/set-repeat/wasm/Cargo.toml        |  6 ++++
 .../single-value-repeat/wasm/Cargo.lock       | 33 ++++++++++-------
 .../single-value-repeat/wasm/Cargo.toml       |  6 ++++
 .../mappers/vec-repeat/wasm/Cargo.lock        | 33 ++++++++++-------
 .../mappers/vec-repeat/wasm/Cargo.toml        |  6 ++++
 .../benchmarks/send-tx-repeat/wasm/Cargo.lock | 33 ++++++++++-------
 .../benchmarks/send-tx-repeat/wasm/Cargo.toml |  6 ++++
 .../benchmarks/str-repeat/wasm/Cargo.lock     | 33 ++++++++++-------
 .../benchmarks/str-repeat/wasm/Cargo.toml     |  6 ++++
 .../core/price-aggregator/wasm/Cargo.lock     | 33 ++++++++++-------
 .../core/price-aggregator/wasm/Cargo.toml     |  6 ++++
 contracts/core/wegld-swap/wasm/Cargo.toml     |  6 ++++
 contracts/examples/adder/wasm/Cargo.lock      | 18 +++++-----
 contracts/examples/adder/wasm/Cargo.toml      |  7 +++-
 .../bonding-curve-contract/wasm/Cargo.lock    | 33 ++++++++++-------
 .../bonding-curve-contract/wasm/Cargo.toml    |  7 +++-
 .../examples/check-pause/wasm/Cargo.lock      | 33 ++++++++++-------
 .../examples/check-pause/wasm/Cargo.toml      | 17 +++++----
 .../crowdfunding-esdt/wasm/Cargo.lock         | 33 ++++++++++-------
 .../crowdfunding-esdt/wasm/Cargo.toml         |  7 +++-
 .../examples/crypto-bubbles/wasm/Cargo.lock   | 33 ++++++++++-------
 .../examples/crypto-bubbles/wasm/Cargo.toml   |  7 +++-
 .../kitty-auction/wasm/Cargo.lock             | 33 ++++++++++-------
 .../kitty-auction/wasm/Cargo.toml             | 14 +++++---
 .../kitty-genetic-alg/wasm/Cargo.lock         | 33 ++++++++++-------
 .../kitty-genetic-alg/wasm/Cargo.toml         | 14 +++++---
 .../kitty-ownership/wasm/Cargo.lock           | 33 ++++++++++-------
 .../kitty-ownership/wasm/Cargo.toml           | 14 +++++---
 .../examples/crypto-zombies/wasm/Cargo.lock   | 33 ++++++++++-------
 .../examples/crypto-zombies/wasm/Cargo.toml   |  8 ++++-
 .../examples/digital-cash/wasm/Cargo.lock     | 33 ++++++++++-------
 .../examples/digital-cash/wasm/Cargo.toml     | 17 +++++----
 contracts/examples/empty/wasm/Cargo.lock      | 33 ++++++++++-------
 contracts/examples/empty/wasm/Cargo.toml      |  6 ++++
 .../esdt-transfer-with-fee/wasm/Cargo.lock    | 33 ++++++++++-------
 .../esdt-transfer-with-fee/wasm/Cargo.toml    |  7 +++-
 contracts/examples/factorial/wasm/Cargo.lock  | 33 ++++++++++-------
 contracts/examples/factorial/wasm/Cargo.toml  |  7 +++-
 .../examples/fractional-nfts/wasm/Cargo.lock  | 33 ++++++++++-------
 .../examples/fractional-nfts/wasm/Cargo.toml  |  7 +++-
 .../examples/lottery-esdt/wasm/Cargo.lock     | 33 ++++++++++-------
 .../examples/lottery-esdt/wasm/Cargo.toml     |  9 +++--
 .../multisig/wasm-multisig-full/Cargo.lock    | 18 +++++-----
 .../multisig/wasm-multisig-view/Cargo.lock    | 18 +++++-----
 contracts/examples/multisig/wasm/Cargo.lock   | 18 +++++-----
 contracts/examples/nft-minter/wasm/Cargo.lock | 33 ++++++++++-------
 contracts/examples/nft-minter/wasm/Cargo.toml |  7 +++-
 .../nft-storage-prepay/wasm/Cargo.lock        | 33 ++++++++++-------
 .../nft-storage-prepay/wasm/Cargo.toml        | 17 +++++----
 .../examples/nft-subscription/wasm/Cargo.lock | 33 ++++++++++-------
 .../examples/nft-subscription/wasm/Cargo.toml |  7 +++-
 .../order-book/factory/wasm/Cargo.lock        | 33 ++++++++++-------
 .../order-book/factory/wasm/Cargo.toml        | 16 +++++----
 .../examples/order-book/pair/wasm/Cargo.lock  | 33 ++++++++++-------
 .../examples/order-book/pair/wasm/Cargo.toml  | 16 +++++----
 .../examples/ping-pong-egld/wasm/Cargo.lock   | 35 +++++++++++--------
 .../examples/ping-pong-egld/wasm/Cargo.toml   | 16 ++++++---
 .../examples/proxy-pause/wasm/Cargo.lock      | 33 ++++++++++-------
 .../examples/proxy-pause/wasm/Cargo.toml      | 17 +++++----
 .../rewards-distribution/wasm/Cargo.lock      | 33 ++++++++++-------
 .../rewards-distribution/wasm/Cargo.toml      | 15 ++++----
 .../examples/seed-nft-minter/wasm/Cargo.lock  | 33 ++++++++++-------
 .../examples/seed-nft-minter/wasm/Cargo.toml  | 17 +++++----
 .../examples/token-release/wasm/Cargo.lock    | 35 +++++++++++--------
 .../examples/token-release/wasm/Cargo.toml    | 16 ++++++---
 .../abi-tester/wasm-abi-tester-ev/Cargo.lock  | 33 ++++++++++-------
 .../abi-tester/wasm-abi-tester-ev/Cargo.toml  |  9 ++++-
 .../feature-tests/abi-tester/wasm/Cargo.lock  | 33 ++++++++++-------
 .../feature-tests/abi-tester/wasm/Cargo.toml  |  7 +++-
 .../alloc-features/wasm/Cargo.lock            | 33 ++++++++++-------
 .../alloc-features/wasm/Cargo.toml            |  7 +++-
 .../Cargo.lock                                | 33 ++++++++++-------
 .../Cargo.toml                                |  9 ++++-
 .../basic-features/wasm/Cargo.lock            | 33 ++++++++++-------
 .../basic-features/wasm/Cargo.toml            |  7 +++-
 .../big-float-features/wasm/Cargo.lock        | 33 ++++++++++-------
 .../big-float-features/wasm/Cargo.toml        |  7 +++-
 .../builtin-func-features/wasm/Cargo.lock     | 33 ++++++++++-------
 .../builtin-func-features/wasm/Cargo.toml     |  7 +++-
 .../first-contract/wasm/Cargo.lock            | 33 ++++++++++-------
 .../first-contract/wasm/Cargo.toml            |  7 +++-
 .../second-contract/wasm/Cargo.lock           | 33 ++++++++++-------
 .../second-contract/wasm/Cargo.toml           |  7 +++-
 .../child/wasm/Cargo.lock                     | 33 ++++++++++-------
 .../child/wasm/Cargo.toml                     |  7 +++-
 .../parent/wasm/Cargo.lock                    | 33 ++++++++++-------
 .../parent/wasm/Cargo.toml                    |  7 +++-
 .../wasm-forwarder-queue-promises/Cargo.lock  | 33 ++++++++++-------
 .../wasm-forwarder-queue-promises/Cargo.toml  |  9 ++++-
 .../forwarder-queue/wasm/Cargo.lock           | 33 ++++++++++-------
 .../forwarder-queue/wasm/Cargo.toml           |  7 +++-
 .../Cargo.lock                                | 33 ++++++++++-------
 .../Cargo.toml                                |  9 ++++-
 .../Cargo.lock                                | 33 ++++++++++-------
 .../Cargo.toml                                |  9 ++++-
 .../forwarder-raw/wasm/Cargo.lock             | 33 ++++++++++-------
 .../forwarder-raw/wasm/Cargo.toml             |  7 +++-
 .../composability/forwarder/wasm/Cargo.lock   | 33 ++++++++++-------
 .../composability/forwarder/wasm/Cargo.toml   |  7 +++-
 .../local-esdt-and-nft/wasm/Cargo.lock        | 33 ++++++++++-------
 .../local-esdt-and-nft/wasm/Cargo.toml        |  7 +++-
 .../promises-features/wasm/Cargo.lock         | 33 ++++++++++-------
 .../promises-features/wasm/Cargo.toml         |  7 +++-
 .../proxy-test-first/wasm/Cargo.lock          | 18 +++++-----
 .../proxy-test-first/wasm/Cargo.toml          |  7 +++-
 .../proxy-test-second/wasm/Cargo.lock         | 18 +++++-----
 .../proxy-test-second/wasm/Cargo.toml         |  7 +++-
 .../recursive-caller/wasm/Cargo.lock          | 33 ++++++++++-------
 .../recursive-caller/wasm/Cargo.toml          |  7 +++-
 .../transfer-role-features/wasm/Cargo.lock    | 33 ++++++++++-------
 .../transfer-role-features/wasm/Cargo.toml    |  7 +++-
 .../vault/wasm-vault-promises/Cargo.lock      | 18 +++++-----
 .../vault/wasm-vault-promises/Cargo.toml      |  7 +++-
 .../vault/wasm-vault-upgrade/Cargo.lock       | 12 +++----
 .../vault/wasm-vault-upgrade/Cargo.toml       |  7 +++-
 .../composability/vault/wasm/Cargo.lock       | 18 +++++-----
 .../composability/vault/wasm/Cargo.toml       |  7 +++-
 .../crowdfunding-erc20/wasm/Cargo.lock        | 33 ++++++++++-------
 .../crowdfunding-erc20/wasm/Cargo.toml        |  7 +++-
 .../erc1155-marketplace/wasm/Cargo.lock       | 33 ++++++++++-------
 .../erc1155-marketplace/wasm/Cargo.toml       |  7 +++-
 .../erc1155-user-mock/wasm/Cargo.lock         | 33 ++++++++++-------
 .../erc1155-user-mock/wasm/Cargo.toml         |  7 +++-
 .../erc1155/wasm/Cargo.lock                   | 33 ++++++++++-------
 .../erc1155/wasm/Cargo.toml                   |  7 +++-
 .../erc-style-contracts/erc20/wasm/Cargo.lock | 33 ++++++++++-------
 .../erc-style-contracts/erc20/wasm/Cargo.toml |  7 +++-
 .../erc721/wasm/Cargo.lock                    | 33 ++++++++++-------
 .../erc721/wasm/Cargo.toml                    | 14 +++++---
 .../lottery-erc20/wasm/Cargo.lock             | 33 ++++++++++-------
 .../lottery-erc20/wasm/Cargo.toml             | 15 +++++---
 .../esdt-system-sc-mock/wasm/Cargo.lock       | 33 ++++++++++-------
 .../esdt-system-sc-mock/wasm/Cargo.toml       |  7 +++-
 .../wasm/Cargo.lock                           | 33 ++++++++++-------
 .../wasm/Cargo.toml                           | 17 +++++----
 .../managed-map-features/wasm/Cargo.lock      | 33 ++++++++++-------
 .../managed-map-features/wasm/Cargo.toml      |  9 ++++-
 .../wasm-multi-contract-alt-impl/Cargo.lock   | 33 ++++++++++-------
 .../wasm-multi-contract-alt-impl/Cargo.toml   |  9 ++++-
 .../Cargo.lock                                | 33 ++++++++++-------
 .../Cargo.toml                                |  9 ++++-
 .../Cargo.lock                                | 33 ++++++++++-------
 .../Cargo.toml                                |  9 ++++-
 .../multi-contract-features/wasm/Cargo.lock   | 35 +++++++++++--------
 .../multi-contract-features/wasm/Cargo.toml   |  9 +++--
 .../panic-message-features/wasm/Cargo.lock    | 33 ++++++++++-------
 .../panic-message-features/wasm/Cargo.toml    |  7 +++-
 .../payable-features/wasm/Cargo.lock          | 33 ++++++++++-------
 .../payable-features/wasm/Cargo.toml          |  7 +++-
 .../wasm/Cargo.lock                           | 33 ++++++++++-------
 .../wasm/Cargo.toml                           |  7 +++-
 .../wasm/Cargo.lock                           | 33 ++++++++++-------
 .../wasm/Cargo.toml                           |  7 +++-
 .../wasm-use-module-view/Cargo.lock           | 33 ++++++++++-------
 .../wasm-use-module-view/Cargo.toml           |  9 ++++-
 .../feature-tests/use-module/wasm/Cargo.lock  | 33 ++++++++++-------
 .../feature-tests/use-module/wasm/Cargo.toml  |  7 +++-
 meta-run-all.sh                               |  2 +-
 168 files changed, 2163 insertions(+), 1205 deletions(-)

diff --git a/build-wasm.sh b/build-wasm.sh
index 0b17cd2a14..5b8eb8653a 100755
--- a/build-wasm.sh
+++ b/build-wasm.sh
@@ -6,4 +6,4 @@ cargo install multiversx-sc-meta
 
 TARGET_DIR=$PWD/target
 
-sc-meta all build --target-dir $TARGET_DIR --path ./contracts
+sc-meta all build --target-dir-all $TARGET_DIR --path ./contracts
diff --git a/contracts/benchmarks/large-storage/wasm/Cargo.lock b/contracts/benchmarks/large-storage/wasm/Cargo.lock
index f24122c5e7..cb11f30683 100755
--- a/contracts/benchmarks/large-storage/wasm/Cargo.lock
+++ b/contracts/benchmarks/large-storage/wasm/Cargo.lock
@@ -14,6 +14,12 @@ dependencies = [
  "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"
@@ -46,11 +52,12 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.13.2"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
  "ahash",
+ "allocator-api2",
 ]
 
 [[package]]
@@ -61,9 +68,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-literal"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "large-storage"
@@ -182,9 +189,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.1"
+version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
+checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
@@ -199,9 +206,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.38"
+version = "2.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
+checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -222,20 +229,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "092cd76b01a033a9965b9097da258689d9e17c69ded5dcf41bca001dd20ebc6d"
+checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a13a20a7c6a90e2034bcc65495799da92efcec6a8dd4f3fcb6f7a48988637ead"
+checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
diff --git a/contracts/benchmarks/large-storage/wasm/Cargo.toml b/contracts/benchmarks/large-storage/wasm/Cargo.toml
index 5a9476bb96..80263e304b 100644
--- a/contracts/benchmarks/large-storage/wasm/Cargo.toml
+++ b/contracts/benchmarks/large-storage/wasm/Cargo.toml
@@ -1,3 +1,9 @@
+# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+
+# ##########################################
+# ############## AUTO-GENERATED #############
+# ##########################################
+
 [package]
 name = "large-storage-wasm"
 version = "0.0.0"
diff --git a/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.lock
index 7b92f93847..27dfff6d02 100644
--- a/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.lock
+++ b/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.lock
@@ -14,6 +14,12 @@ dependencies = [
  "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"
@@ -53,11 +59,12 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.13.2"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
  "ahash",
+ "allocator-api2",
 ]
 
 [[package]]
@@ -68,9 +75,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-literal"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "linked-list-repeat"
@@ -190,9 +197,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.1"
+version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
+checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
@@ -207,9 +214,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.38"
+version = "2.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
+checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -230,20 +237,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "092cd76b01a033a9965b9097da258689d9e17c69ded5dcf41bca001dd20ebc6d"
+checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a13a20a7c6a90e2034bcc65495799da92efcec6a8dd4f3fcb6f7a48988637ead"
+checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
diff --git a/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.toml b/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.toml
index b2b4d83e44..9fad56175f 100644
--- a/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.toml
@@ -1,3 +1,9 @@
+# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+
+# ##########################################
+# ############## AUTO-GENERATED #############
+# ##########################################
+
 [package]
 name = "linked-list-repeat-wasm"
 version = "0.0.0"
diff --git a/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.lock
index 81b86a4e74..73d4531cf6 100644
--- a/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.lock
+++ b/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.lock
@@ -14,6 +14,12 @@ dependencies = [
  "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"
@@ -53,11 +59,12 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.13.2"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
  "ahash",
+ "allocator-api2",
 ]
 
 [[package]]
@@ -68,9 +75,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-literal"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "map-repeat"
@@ -190,9 +197,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.1"
+version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
+checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
@@ -207,9 +214,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.38"
+version = "2.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
+checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -230,20 +237,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "092cd76b01a033a9965b9097da258689d9e17c69ded5dcf41bca001dd20ebc6d"
+checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a13a20a7c6a90e2034bcc65495799da92efcec6a8dd4f3fcb6f7a48988637ead"
+checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
diff --git a/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.toml b/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.toml
index 69d9ed56e1..8fd41c1a8f 100644
--- a/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.toml
@@ -1,3 +1,9 @@
+# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+
+# ##########################################
+# ############## AUTO-GENERATED #############
+# ##########################################
+
 [package]
 name = "map-repeat-wasm"
 version = "0.0.0"
diff --git a/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.lock
index 838cffdea0..14e705a191 100644
--- a/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.lock
+++ b/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.lock
@@ -14,6 +14,12 @@ dependencies = [
  "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"
@@ -53,11 +59,12 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.13.2"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
  "ahash",
+ "allocator-api2",
 ]
 
 [[package]]
@@ -68,9 +75,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-literal"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
@@ -190,9 +197,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.1"
+version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
+checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
@@ -207,9 +214,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.38"
+version = "2.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
+checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -230,20 +237,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "092cd76b01a033a9965b9097da258689d9e17c69ded5dcf41bca001dd20ebc6d"
+checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a13a20a7c6a90e2034bcc65495799da92efcec6a8dd4f3fcb6f7a48988637ead"
+checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
diff --git a/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.toml b/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.toml
index 614762dbd7..5a34cfdaf3 100644
--- a/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.toml
@@ -1,3 +1,9 @@
+# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+
+# ##########################################
+# ############## AUTO-GENERATED #############
+# ##########################################
+
 [package]
 name = "queue-repeat-wasm"
 version = "0.0.0"
diff --git a/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.lock
index 21b202ad62..33d9d826cb 100644
--- a/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.lock
+++ b/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.lock
@@ -14,6 +14,12 @@ dependencies = [
  "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"
@@ -53,11 +59,12 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.13.2"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
  "ahash",
+ "allocator-api2",
 ]
 
 [[package]]
@@ -68,9 +75,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-literal"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
@@ -190,9 +197,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.1"
+version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
+checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
@@ -207,9 +214,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.38"
+version = "2.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
+checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -230,20 +237,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "092cd76b01a033a9965b9097da258689d9e17c69ded5dcf41bca001dd20ebc6d"
+checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a13a20a7c6a90e2034bcc65495799da92efcec6a8dd4f3fcb6f7a48988637ead"
+checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
diff --git a/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.toml b/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.toml
index 0f7a09bf34..b5458c7a24 100644
--- a/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.toml
@@ -1,3 +1,9 @@
+# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+
+# ##########################################
+# ############## AUTO-GENERATED #############
+# ##########################################
+
 [package]
 name = "set-repeat-wasm"
 version = "0.0.0"
diff --git a/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.lock
index 1a29c069f0..07a393aef1 100644
--- a/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.lock
+++ b/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.lock
@@ -14,6 +14,12 @@ dependencies = [
  "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"
@@ -53,11 +59,12 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.13.2"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
  "ahash",
+ "allocator-api2",
 ]
 
 [[package]]
@@ -68,9 +75,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-literal"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
@@ -190,9 +197,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.1"
+version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
+checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
@@ -207,9 +214,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.38"
+version = "2.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
+checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -230,20 +237,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "092cd76b01a033a9965b9097da258689d9e17c69ded5dcf41bca001dd20ebc6d"
+checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a13a20a7c6a90e2034bcc65495799da92efcec6a8dd4f3fcb6f7a48988637ead"
+checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
diff --git a/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.toml b/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.toml
index 51e214bf55..a54d8bc2c1 100644
--- a/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.toml
@@ -1,3 +1,9 @@
+# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+
+# ##########################################
+# ############## AUTO-GENERATED #############
+# ##########################################
+
 [package]
 name = "single-value-repeat-wasm"
 version = "0.0.0"
diff --git a/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.lock
index 171116c2c8..8777610ae1 100644
--- a/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.lock
+++ b/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.lock
@@ -14,6 +14,12 @@ dependencies = [
  "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"
@@ -53,11 +59,12 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.13.2"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
  "ahash",
+ "allocator-api2",
 ]
 
 [[package]]
@@ -68,9 +75,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-literal"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
@@ -174,9 +181,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.1"
+version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
+checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
@@ -191,9 +198,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.38"
+version = "2.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
+checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -230,20 +237,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "092cd76b01a033a9965b9097da258689d9e17c69ded5dcf41bca001dd20ebc6d"
+checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a13a20a7c6a90e2034bcc65495799da92efcec6a8dd4f3fcb6f7a48988637ead"
+checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
diff --git a/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.toml b/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.toml
index ec660aa75b..18c0472717 100644
--- a/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.toml
@@ -1,3 +1,9 @@
+# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+
+# ##########################################
+# ############## AUTO-GENERATED #############
+# ##########################################
+
 [package]
 name = "vec-repeat-wasm"
 version = "0.0.0"
diff --git a/contracts/benchmarks/send-tx-repeat/wasm/Cargo.lock b/contracts/benchmarks/send-tx-repeat/wasm/Cargo.lock
index 61ec3dd20e..717aba32de 100755
--- a/contracts/benchmarks/send-tx-repeat/wasm/Cargo.lock
+++ b/contracts/benchmarks/send-tx-repeat/wasm/Cargo.lock
@@ -14,6 +14,12 @@ dependencies = [
  "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"
@@ -46,11 +52,12 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.13.2"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
  "ahash",
+ "allocator-api2",
 ]
 
 [[package]]
@@ -61,9 +68,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-literal"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
@@ -182,9 +189,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.1"
+version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
+checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
@@ -199,9 +206,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.38"
+version = "2.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
+checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -222,20 +229,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "092cd76b01a033a9965b9097da258689d9e17c69ded5dcf41bca001dd20ebc6d"
+checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a13a20a7c6a90e2034bcc65495799da92efcec6a8dd4f3fcb6f7a48988637ead"
+checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
diff --git a/contracts/benchmarks/send-tx-repeat/wasm/Cargo.toml b/contracts/benchmarks/send-tx-repeat/wasm/Cargo.toml
index af2071217e..bedcb3a6a7 100644
--- a/contracts/benchmarks/send-tx-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/send-tx-repeat/wasm/Cargo.toml
@@ -1,3 +1,9 @@
+# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+
+# ##########################################
+# ############## AUTO-GENERATED #############
+# ##########################################
+
 [package]
 name = "send-tx-repeat-wasm"
 version = "0.0.0"
diff --git a/contracts/benchmarks/str-repeat/wasm/Cargo.lock b/contracts/benchmarks/str-repeat/wasm/Cargo.lock
index 802041f9f2..c41b809824 100755
--- a/contracts/benchmarks/str-repeat/wasm/Cargo.lock
+++ b/contracts/benchmarks/str-repeat/wasm/Cargo.lock
@@ -14,6 +14,12 @@ dependencies = [
  "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"
@@ -46,11 +52,12 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.13.2"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
  "ahash",
+ "allocator-api2",
 ]
 
 [[package]]
@@ -61,9 +68,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-literal"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
@@ -167,9 +174,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.1"
+version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
+checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "str-repeat"
@@ -199,9 +206,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.38"
+version = "2.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
+checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -222,20 +229,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "092cd76b01a033a9965b9097da258689d9e17c69ded5dcf41bca001dd20ebc6d"
+checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a13a20a7c6a90e2034bcc65495799da92efcec6a8dd4f3fcb6f7a48988637ead"
+checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
diff --git a/contracts/benchmarks/str-repeat/wasm/Cargo.toml b/contracts/benchmarks/str-repeat/wasm/Cargo.toml
index d24faec13c..8b67072ba8 100644
--- a/contracts/benchmarks/str-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/str-repeat/wasm/Cargo.toml
@@ -1,3 +1,9 @@
+# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+
+# ##########################################
+# ############## AUTO-GENERATED #############
+# ##########################################
+
 [package]
 name = "str-repeat-wasm"
 version = "0.0.0"
diff --git a/contracts/core/price-aggregator/wasm/Cargo.lock b/contracts/core/price-aggregator/wasm/Cargo.lock
index 88fcbd715b..4988efa300 100644
--- a/contracts/core/price-aggregator/wasm/Cargo.lock
+++ b/contracts/core/price-aggregator/wasm/Cargo.lock
@@ -14,6 +14,12 @@ dependencies = [
  "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"
@@ -46,11 +52,12 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.13.2"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
  "ahash",
+ "allocator-api2",
 ]
 
 [[package]]
@@ -61,9 +68,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-literal"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-price-aggregator-sc"
@@ -191,9 +198,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.1"
+version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
+checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
@@ -208,9 +215,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.38"
+version = "2.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
+checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -231,20 +238,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "092cd76b01a033a9965b9097da258689d9e17c69ded5dcf41bca001dd20ebc6d"
+checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a13a20a7c6a90e2034bcc65495799da92efcec6a8dd4f3fcb6f7a48988637ead"
+checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
diff --git a/contracts/core/price-aggregator/wasm/Cargo.toml b/contracts/core/price-aggregator/wasm/Cargo.toml
index 874009fd5e..20b3cd22a5 100644
--- a/contracts/core/price-aggregator/wasm/Cargo.toml
+++ b/contracts/core/price-aggregator/wasm/Cargo.toml
@@ -1,3 +1,9 @@
+# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+
+# ##########################################
+# ############## AUTO-GENERATED #############
+# ##########################################
+
 [package]
 name = "multiversx-price-aggregator-sc-wasm"
 version = "0.0.0"
diff --git a/contracts/core/wegld-swap/wasm/Cargo.toml b/contracts/core/wegld-swap/wasm/Cargo.toml
index e376a9fe50..b5852e8f24 100644
--- a/contracts/core/wegld-swap/wasm/Cargo.toml
+++ b/contracts/core/wegld-swap/wasm/Cargo.toml
@@ -1,3 +1,9 @@
+# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+
+# ##########################################
+# ############## AUTO-GENERATED #############
+# ##########################################
+
 [package]
 name = "multiversx-wegld-swap-sc-wasm"
 version = "0.0.0"
diff --git a/contracts/examples/adder/wasm/Cargo.lock b/contracts/examples/adder/wasm/Cargo.lock
index ce7beeabe9..73aa3cd4df 100755
--- a/contracts/examples/adder/wasm/Cargo.lock
+++ b/contracts/examples/adder/wasm/Cargo.lock
@@ -189,9 +189,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.1"
+version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
+checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
@@ -206,9 +206,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.38"
+version = "2.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
+checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -229,20 +229,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "092cd76b01a033a9965b9097da258689d9e17c69ded5dcf41bca001dd20ebc6d"
+checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a13a20a7c6a90e2034bcc65495799da92efcec6a8dd4f3fcb6f7a48988637ead"
+checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
diff --git a/contracts/examples/adder/wasm/Cargo.toml b/contracts/examples/adder/wasm/Cargo.toml
index 3a78d11702..d53dd7a061 100644
--- a/contracts/examples/adder/wasm/Cargo.toml
+++ b/contracts/examples/adder/wasm/Cargo.toml
@@ -1,7 +1,12 @@
+# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+
+# ##########################################
+# ############## AUTO-GENERATED #############
+# ##########################################
+
 [package]
 name = "adder-wasm"
 version = "0.0.0"
-authors = ["Andrei Marinica <andrei.marinica@multiversx.com>"]
 edition = "2021"
 publish = false
 
diff --git a/contracts/examples/bonding-curve-contract/wasm/Cargo.lock b/contracts/examples/bonding-curve-contract/wasm/Cargo.lock
index a1c180a8ac..f0e9529715 100644
--- a/contracts/examples/bonding-curve-contract/wasm/Cargo.lock
+++ b/contracts/examples/bonding-curve-contract/wasm/Cargo.lock
@@ -14,6 +14,12 @@ dependencies = [
  "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"
@@ -62,11 +68,12 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.13.2"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
  "ahash",
+ "allocator-api2",
 ]
 
 [[package]]
@@ -77,9 +84,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-literal"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
@@ -190,9 +197,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.1"
+version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
+checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
@@ -207,9 +214,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.38"
+version = "2.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
+checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -230,20 +237,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "092cd76b01a033a9965b9097da258689d9e17c69ded5dcf41bca001dd20ebc6d"
+checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a13a20a7c6a90e2034bcc65495799da92efcec6a8dd4f3fcb6f7a48988637ead"
+checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
diff --git a/contracts/examples/bonding-curve-contract/wasm/Cargo.toml b/contracts/examples/bonding-curve-contract/wasm/Cargo.toml
index de23cf6a3f..bb6994fd31 100644
--- a/contracts/examples/bonding-curve-contract/wasm/Cargo.toml
+++ b/contracts/examples/bonding-curve-contract/wasm/Cargo.toml
@@ -1,7 +1,12 @@
+# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+
+# ##########################################
+# ############## AUTO-GENERATED #############
+# ##########################################
+
 [package]
 name = "bonding-curve-contract-wasm"
 version = "0.0.0"
-authors = ["Alin Cruceat <alin.cruceat@multiversx.com>"]
 edition = "2021"
 publish = false
 
diff --git a/contracts/examples/check-pause/wasm/Cargo.lock b/contracts/examples/check-pause/wasm/Cargo.lock
index 1aa7a37392..de3d76c782 100644
--- a/contracts/examples/check-pause/wasm/Cargo.lock
+++ b/contracts/examples/check-pause/wasm/Cargo.lock
@@ -14,6 +14,12 @@ dependencies = [
  "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"
@@ -62,11 +68,12 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.13.2"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
  "ahash",
+ "allocator-api2",
 ]
 
 [[package]]
@@ -77,9 +84,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-literal"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
@@ -190,9 +197,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.1"
+version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
+checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
@@ -207,9 +214,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.38"
+version = "2.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
+checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -230,20 +237,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "092cd76b01a033a9965b9097da258689d9e17c69ded5dcf41bca001dd20ebc6d"
+checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a13a20a7c6a90e2034bcc65495799da92efcec6a8dd4f3fcb6f7a48988637ead"
+checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
diff --git a/contracts/examples/check-pause/wasm/Cargo.toml b/contracts/examples/check-pause/wasm/Cargo.toml
index 89090c06a3..c43bd0c650 100644
--- a/contracts/examples/check-pause/wasm/Cargo.toml
+++ b/contracts/examples/check-pause/wasm/Cargo.toml
@@ -1,17 +1,17 @@
+# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+
+# ##########################################
+# ############## AUTO-GENERATED #############
+# ##########################################
+
 [package]
 name = "check-pause-wasm"
 version = "0.0.0"
 edition = "2021"
-authors = ["Alin Cruceat <alin.cruceat@multiversx.com>"]
 publish = false
 
 [lib]
-crate-type = [ "cdylib",]
-
-[workspace]
-members = [".",]
-
-[dev-dependencies]
+crate-type = ["cdylib"]
 
 [profile.release]
 codegen-units = 1
@@ -26,3 +26,6 @@ path = ".."
 [dependencies.multiversx-sc-wasm-adapter]
 version = "0.44.0"
 path = "../../../../framework/wasm-adapter"
+
+[workspace]
+members = ["."]
diff --git a/contracts/examples/crowdfunding-esdt/wasm/Cargo.lock b/contracts/examples/crowdfunding-esdt/wasm/Cargo.lock
index 8a1910f612..95249df9ac 100644
--- a/contracts/examples/crowdfunding-esdt/wasm/Cargo.lock
+++ b/contracts/examples/crowdfunding-esdt/wasm/Cargo.lock
@@ -14,6 +14,12 @@ dependencies = [
  "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"
@@ -61,11 +67,12 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.13.2"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
  "ahash",
+ "allocator-api2",
 ]
 
 [[package]]
@@ -76,9 +83,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-literal"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
@@ -182,9 +189,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.1"
+version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
+checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
@@ -199,9 +206,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.38"
+version = "2.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
+checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -222,20 +229,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "092cd76b01a033a9965b9097da258689d9e17c69ded5dcf41bca001dd20ebc6d"
+checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a13a20a7c6a90e2034bcc65495799da92efcec6a8dd4f3fcb6f7a48988637ead"
+checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
diff --git a/contracts/examples/crowdfunding-esdt/wasm/Cargo.toml b/contracts/examples/crowdfunding-esdt/wasm/Cargo.toml
index 8e51c3d294..6e81a154e9 100644
--- a/contracts/examples/crowdfunding-esdt/wasm/Cargo.toml
+++ b/contracts/examples/crowdfunding-esdt/wasm/Cargo.toml
@@ -1,7 +1,12 @@
+# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+
+# ##########################################
+# ############## AUTO-GENERATED #############
+# ##########################################
+
 [package]
 name = "crowdfunding-esdt-wasm"
 version = "0.0.0"
-authors = ["Dorin Iancu <dorin.iancu@multiversx.com>"]
 edition = "2021"
 publish = false
 
diff --git a/contracts/examples/crypto-bubbles/wasm/Cargo.lock b/contracts/examples/crypto-bubbles/wasm/Cargo.lock
index 81c9afc9c1..d9d77d2114 100755
--- a/contracts/examples/crypto-bubbles/wasm/Cargo.lock
+++ b/contracts/examples/crypto-bubbles/wasm/Cargo.lock
@@ -14,6 +14,12 @@ dependencies = [
  "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"
@@ -61,11 +67,12 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.13.2"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
  "ahash",
+ "allocator-api2",
 ]
 
 [[package]]
@@ -76,9 +83,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-literal"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
@@ -182,9 +189,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.1"
+version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
+checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
@@ -199,9 +206,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.38"
+version = "2.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
+checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -222,20 +229,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "092cd76b01a033a9965b9097da258689d9e17c69ded5dcf41bca001dd20ebc6d"
+checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a13a20a7c6a90e2034bcc65495799da92efcec6a8dd4f3fcb6f7a48988637ead"
+checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
diff --git a/contracts/examples/crypto-bubbles/wasm/Cargo.toml b/contracts/examples/crypto-bubbles/wasm/Cargo.toml
index 0026097348..c585ee07de 100644
--- a/contracts/examples/crypto-bubbles/wasm/Cargo.toml
+++ b/contracts/examples/crypto-bubbles/wasm/Cargo.toml
@@ -1,7 +1,12 @@
+# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+
+# ##########################################
+# ############## AUTO-GENERATED #############
+# ##########################################
+
 [package]
 name = "crypto-bubbles-wasm"
 version = "0.0.0"
-authors = ["Andrei Marinica <andrei.marinica@multiversx.com>"]
 edition = "2021"
 publish = false
 
diff --git a/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.lock b/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.lock
index 626173fed6..b492e5de1c 100755
--- a/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.lock
+++ b/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.lock
@@ -14,6 +14,12 @@ dependencies = [
  "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"
@@ -46,11 +52,12 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.13.2"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
  "ahash",
+ "allocator-api2",
 ]
 
 [[package]]
@@ -61,9 +68,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-literal"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "kitty"
@@ -218,9 +225,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.1"
+version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
+checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
@@ -235,9 +242,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.38"
+version = "2.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
+checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -258,20 +265,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "092cd76b01a033a9965b9097da258689d9e17c69ded5dcf41bca001dd20ebc6d"
+checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a13a20a7c6a90e2034bcc65495799da92efcec6a8dd4f3fcb6f7a48988637ead"
+checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
diff --git a/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.toml b/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.toml
index 84aba96790..bbae5a5117 100644
--- a/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.toml
+++ b/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.toml
@@ -1,3 +1,9 @@
+# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+
+# ##########################################
+# ############## AUTO-GENERATED #############
+# ##########################################
+
 [package]
 name = "kitty-auction-wasm"
 version = "0.0.0"
@@ -5,10 +11,7 @@ edition = "2021"
 publish = false
 
 [lib]
-crate-type = [ "cdylib",]
-
-[workspace]
-members = ["."]
+crate-type = ["cdylib"]
 
 [profile.release]
 codegen-units = 1
@@ -23,3 +26,6 @@ path = ".."
 [dependencies.multiversx-sc-wasm-adapter]
 version = "0.44.0"
 path = "../../../../../framework/wasm-adapter"
+
+[workspace]
+members = ["."]
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 8115175f74..40c08a0f60 100755
--- a/contracts/examples/crypto-kitties/kitty-genetic-alg/wasm/Cargo.lock
+++ b/contracts/examples/crypto-kitties/kitty-genetic-alg/wasm/Cargo.lock
@@ -14,6 +14,12 @@ dependencies = [
  "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"
@@ -46,11 +52,12 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.13.2"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
  "ahash",
+ "allocator-api2",
 ]
 
 [[package]]
@@ -61,9 +68,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-literal"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "kitty"
@@ -199,9 +206,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.1"
+version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
+checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
@@ -216,9 +223,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.38"
+version = "2.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
+checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -239,20 +246,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "092cd76b01a033a9965b9097da258689d9e17c69ded5dcf41bca001dd20ebc6d"
+checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a13a20a7c6a90e2034bcc65495799da92efcec6a8dd4f3fcb6f7a48988637ead"
+checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
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 ea6a35ef1d..2659ed3926 100644
--- a/contracts/examples/crypto-kitties/kitty-genetic-alg/wasm/Cargo.toml
+++ b/contracts/examples/crypto-kitties/kitty-genetic-alg/wasm/Cargo.toml
@@ -1,3 +1,9 @@
+# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+
+# ##########################################
+# ############## AUTO-GENERATED #############
+# ##########################################
+
 [package]
 name = "kitty-genetic-alg-wasm"
 version = "0.0.0"
@@ -5,10 +11,7 @@ edition = "2021"
 publish = false
 
 [lib]
-crate-type = [ "cdylib",]
-
-[workspace]
-members = ["."]
+crate-type = ["cdylib"]
 
 [profile.release]
 codegen-units = 1
@@ -23,3 +26,6 @@ path = ".."
 [dependencies.multiversx-sc-wasm-adapter]
 version = "0.44.0"
 path = "../../../../../framework/wasm-adapter"
+
+[workspace]
+members = ["."]
diff --git a/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.lock b/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.lock
index f0e28bf790..bf4e6845e5 100755
--- a/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.lock
+++ b/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.lock
@@ -14,6 +14,12 @@ dependencies = [
  "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"
@@ -46,11 +52,12 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.13.2"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
  "ahash",
+ "allocator-api2",
 ]
 
 [[package]]
@@ -61,9 +68,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-literal"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "kitty"
@@ -209,9 +216,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.1"
+version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
+checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
@@ -226,9 +233,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.38"
+version = "2.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
+checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -249,20 +256,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "092cd76b01a033a9965b9097da258689d9e17c69ded5dcf41bca001dd20ebc6d"
+checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a13a20a7c6a90e2034bcc65495799da92efcec6a8dd4f3fcb6f7a48988637ead"
+checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
diff --git a/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.toml b/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.toml
index f4d5eb059b..257feee3f5 100644
--- a/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.toml
+++ b/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.toml
@@ -1,3 +1,9 @@
+# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+
+# ##########################################
+# ############## AUTO-GENERATED #############
+# ##########################################
+
 [package]
 name = "kitty-ownership-wasm"
 version = "0.0.0"
@@ -5,10 +11,7 @@ edition = "2021"
 publish = false
 
 [lib]
-crate-type = [ "cdylib",]
-
-[workspace]
-members = ["."]
+crate-type = ["cdylib"]
 
 [profile.release]
 codegen-units = 1
@@ -23,3 +26,6 @@ path = ".."
 [dependencies.multiversx-sc-wasm-adapter]
 version = "0.44.0"
 path = "../../../../../framework/wasm-adapter"
+
+[workspace]
+members = ["."]
diff --git a/contracts/examples/crypto-zombies/wasm/Cargo.lock b/contracts/examples/crypto-zombies/wasm/Cargo.lock
index d2c4310c96..12fdba2eeb 100755
--- a/contracts/examples/crypto-zombies/wasm/Cargo.lock
+++ b/contracts/examples/crypto-zombies/wasm/Cargo.lock
@@ -14,6 +14,12 @@ dependencies = [
  "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"
@@ -61,11 +67,12 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.13.2"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
  "ahash",
+ "allocator-api2",
 ]
 
 [[package]]
@@ -76,9 +83,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-literal"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
@@ -182,9 +189,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.1"
+version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
+checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
@@ -199,9 +206,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.38"
+version = "2.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
+checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -222,20 +229,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "092cd76b01a033a9965b9097da258689d9e17c69ded5dcf41bca001dd20ebc6d"
+checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a13a20a7c6a90e2034bcc65495799da92efcec6a8dd4f3fcb6f7a48988637ead"
+checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
diff --git a/contracts/examples/crypto-zombies/wasm/Cargo.toml b/contracts/examples/crypto-zombies/wasm/Cargo.toml
index f73d9e26a6..310ed278ea 100644
--- a/contracts/examples/crypto-zombies/wasm/Cargo.toml
+++ b/contracts/examples/crypto-zombies/wasm/Cargo.toml
@@ -1,12 +1,18 @@
+# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+
+# ##########################################
+# ############## AUTO-GENERATED #############
+# ##########################################
+
 [package]
 name = "crypto-zombies-wasm"
 version = "0.0.0"
-authors = ["Alin Cruceat <alin.cruceat@multiversx.com>"]
 edition = "2021"
 publish = false
 
 [lib]
 crate-type = ["cdylib"]
+
 [profile.release]
 codegen-units = 1
 opt-level = "z"
diff --git a/contracts/examples/digital-cash/wasm/Cargo.lock b/contracts/examples/digital-cash/wasm/Cargo.lock
index 189bab2640..a51dcfce38 100644
--- a/contracts/examples/digital-cash/wasm/Cargo.lock
+++ b/contracts/examples/digital-cash/wasm/Cargo.lock
@@ -14,6 +14,12 @@ dependencies = [
  "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"
@@ -61,11 +67,12 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.13.2"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
  "ahash",
+ "allocator-api2",
 ]
 
 [[package]]
@@ -76,9 +83,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-literal"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
@@ -182,9 +189,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.1"
+version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
+checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
@@ -199,9 +206,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.38"
+version = "2.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
+checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -222,20 +229,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "092cd76b01a033a9965b9097da258689d9e17c69ded5dcf41bca001dd20ebc6d"
+checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a13a20a7c6a90e2034bcc65495799da92efcec6a8dd4f3fcb6f7a48988637ead"
+checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
diff --git a/contracts/examples/digital-cash/wasm/Cargo.toml b/contracts/examples/digital-cash/wasm/Cargo.toml
index a7380c1009..291bc362e0 100644
--- a/contracts/examples/digital-cash/wasm/Cargo.toml
+++ b/contracts/examples/digital-cash/wasm/Cargo.toml
@@ -1,17 +1,17 @@
+# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+
+# ##########################################
+# ############## AUTO-GENERATED #############
+# ##########################################
+
 [package]
 name = "digital-cash-wasm"
 version = "0.0.0"
-authors = ["Valentin Craciun"]
 edition = "2021"
 publish = false
 
 [lib]
-crate-type = [ "cdylib",]
-
-[workspace]
-members = [ ".",]
-
-[dev-dependencies]
+crate-type = ["cdylib"]
 
 [profile.release]
 codegen-units = 1
@@ -26,3 +26,6 @@ path = ".."
 [dependencies.multiversx-sc-wasm-adapter]
 version = "0.44.0"
 path = "../../../../framework/wasm-adapter"
+
+[workspace]
+members = ["."]
diff --git a/contracts/examples/empty/wasm/Cargo.lock b/contracts/examples/empty/wasm/Cargo.lock
index a70ccc1183..5c53b776e2 100755
--- a/contracts/examples/empty/wasm/Cargo.lock
+++ b/contracts/examples/empty/wasm/Cargo.lock
@@ -14,6 +14,12 @@ dependencies = [
  "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"
@@ -61,11 +67,12 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.13.2"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
  "ahash",
+ "allocator-api2",
 ]
 
 [[package]]
@@ -76,9 +83,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-literal"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
@@ -182,9 +189,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.1"
+version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
+checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
@@ -199,9 +206,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.38"
+version = "2.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
+checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -222,20 +229,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "092cd76b01a033a9965b9097da258689d9e17c69ded5dcf41bca001dd20ebc6d"
+checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a13a20a7c6a90e2034bcc65495799da92efcec6a8dd4f3fcb6f7a48988637ead"
+checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
diff --git a/contracts/examples/empty/wasm/Cargo.toml b/contracts/examples/empty/wasm/Cargo.toml
index 2e5736423f..8504843376 100644
--- a/contracts/examples/empty/wasm/Cargo.toml
+++ b/contracts/examples/empty/wasm/Cargo.toml
@@ -1,3 +1,9 @@
+# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+
+# ##########################################
+# ############## AUTO-GENERATED #############
+# ##########################################
+
 [package]
 name = "empty-wasm"
 version = "0.0.0"
diff --git a/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.lock b/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.lock
index 10f2d10e7a..18d9c309a5 100644
--- a/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.lock
+++ b/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.lock
@@ -14,6 +14,12 @@ dependencies = [
  "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"
@@ -61,11 +67,12 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.13.2"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
  "ahash",
+ "allocator-api2",
 ]
 
 [[package]]
@@ -76,9 +83,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-literal"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
@@ -182,9 +189,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.1"
+version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
+checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
@@ -199,9 +206,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.38"
+version = "2.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
+checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -222,20 +229,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "092cd76b01a033a9965b9097da258689d9e17c69ded5dcf41bca001dd20ebc6d"
+checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a13a20a7c6a90e2034bcc65495799da92efcec6a8dd4f3fcb6f7a48988637ead"
+checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
diff --git a/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.toml b/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.toml
index 0995871399..00d12c4a42 100644
--- a/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.toml
+++ b/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.toml
@@ -1,7 +1,12 @@
+# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+
+# ##########################################
+# ############## AUTO-GENERATED #############
+# ##########################################
+
 [package]
 name = "esdt-transfer-with-fee-wasm"
 version = "0.0.0"
-authors = ["Alin Cruceat <alin.cruceat@multiversx.com>"]
 edition = "2021"
 publish = false
 
diff --git a/contracts/examples/factorial/wasm/Cargo.lock b/contracts/examples/factorial/wasm/Cargo.lock
index de78a7b2fb..7bac38bfe2 100755
--- a/contracts/examples/factorial/wasm/Cargo.lock
+++ b/contracts/examples/factorial/wasm/Cargo.lock
@@ -14,6 +14,12 @@ dependencies = [
  "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"
@@ -61,11 +67,12 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.13.2"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
  "ahash",
+ "allocator-api2",
 ]
 
 [[package]]
@@ -76,9 +83,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-literal"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
@@ -182,9 +189,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.1"
+version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
+checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
@@ -199,9 +206,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.38"
+version = "2.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
+checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -222,20 +229,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "092cd76b01a033a9965b9097da258689d9e17c69ded5dcf41bca001dd20ebc6d"
+checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a13a20a7c6a90e2034bcc65495799da92efcec6a8dd4f3fcb6f7a48988637ead"
+checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
diff --git a/contracts/examples/factorial/wasm/Cargo.toml b/contracts/examples/factorial/wasm/Cargo.toml
index e18bc372c5..07782aa316 100644
--- a/contracts/examples/factorial/wasm/Cargo.toml
+++ b/contracts/examples/factorial/wasm/Cargo.toml
@@ -1,7 +1,12 @@
+# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+
+# ##########################################
+# ############## AUTO-GENERATED #############
+# ##########################################
+
 [package]
 name = "factorial-wasm"
 version = "0.0.0"
-authors = ["Andrei Marinica <andrei.marinica@multiversx.com>"]
 edition = "2021"
 publish = false
 
diff --git a/contracts/examples/fractional-nfts/wasm/Cargo.lock b/contracts/examples/fractional-nfts/wasm/Cargo.lock
index aacd07f0fa..4c8c0ba223 100644
--- a/contracts/examples/fractional-nfts/wasm/Cargo.lock
+++ b/contracts/examples/fractional-nfts/wasm/Cargo.lock
@@ -14,6 +14,12 @@ dependencies = [
  "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"
@@ -62,11 +68,12 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.13.2"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
  "ahash",
+ "allocator-api2",
 ]
 
 [[package]]
@@ -77,9 +84,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-literal"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
@@ -190,9 +197,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.1"
+version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
+checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
@@ -207,9 +214,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.38"
+version = "2.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
+checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -230,20 +237,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "092cd76b01a033a9965b9097da258689d9e17c69ded5dcf41bca001dd20ebc6d"
+checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a13a20a7c6a90e2034bcc65495799da92efcec6a8dd4f3fcb6f7a48988637ead"
+checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
diff --git a/contracts/examples/fractional-nfts/wasm/Cargo.toml b/contracts/examples/fractional-nfts/wasm/Cargo.toml
index 312b335536..ae911d2867 100644
--- a/contracts/examples/fractional-nfts/wasm/Cargo.toml
+++ b/contracts/examples/fractional-nfts/wasm/Cargo.toml
@@ -1,7 +1,12 @@
+# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+
+# ##########################################
+# ############## AUTO-GENERATED #############
+# ##########################################
+
 [package]
 name = "fractional-nfts-wasm"
 version = "0.0.0"
-authors = ["Claudiu-Marcel Bruda <claudiu.bruda@multiversx.com>"]
 edition = "2021"
 publish = false
 
diff --git a/contracts/examples/lottery-esdt/wasm/Cargo.lock b/contracts/examples/lottery-esdt/wasm/Cargo.lock
index 8c52242bb4..a320165695 100755
--- a/contracts/examples/lottery-esdt/wasm/Cargo.lock
+++ b/contracts/examples/lottery-esdt/wasm/Cargo.lock
@@ -14,6 +14,12 @@ dependencies = [
  "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"
@@ -46,11 +52,12 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.13.2"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
  "ahash",
+ "allocator-api2",
 ]
 
 [[package]]
@@ -61,9 +68,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-literal"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "lottery-esdt"
@@ -182,9 +189,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.1"
+version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
+checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
@@ -199,9 +206,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.38"
+version = "2.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
+checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -222,20 +229,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "092cd76b01a033a9965b9097da258689d9e17c69ded5dcf41bca001dd20ebc6d"
+checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a13a20a7c6a90e2034bcc65495799da92efcec6a8dd4f3fcb6f7a48988637ead"
+checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
diff --git a/contracts/examples/lottery-esdt/wasm/Cargo.toml b/contracts/examples/lottery-esdt/wasm/Cargo.toml
index 8f592f6c05..00c372cdb0 100644
--- a/contracts/examples/lottery-esdt/wasm/Cargo.toml
+++ b/contracts/examples/lottery-esdt/wasm/Cargo.toml
@@ -1,12 +1,17 @@
+# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+
+# ##########################################
+# ############## AUTO-GENERATED #############
+# ##########################################
+
 [package]
 name = "lottery-esdt-wasm"
 version = "0.0.0"
-authors = [ "Dorin Iancu <dorin.iancu@multiversx.com>",]
 edition = "2021"
 publish = false
 
 [lib]
-crate-type = [ "cdylib",]
+crate-type = ["cdylib"]
 
 [profile.release]
 codegen-units = 1
diff --git a/contracts/examples/multisig/wasm-multisig-full/Cargo.lock b/contracts/examples/multisig/wasm-multisig-full/Cargo.lock
index a3c53028cf..431f114c80 100644
--- a/contracts/examples/multisig/wasm-multisig-full/Cargo.lock
+++ b/contracts/examples/multisig/wasm-multisig-full/Cargo.lock
@@ -197,9 +197,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.1"
+version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
+checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
@@ -214,9 +214,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.38"
+version = "2.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
+checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -237,20 +237,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "092cd76b01a033a9965b9097da258689d9e17c69ded5dcf41bca001dd20ebc6d"
+checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a13a20a7c6a90e2034bcc65495799da92efcec6a8dd4f3fcb6f7a48988637ead"
+checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
diff --git a/contracts/examples/multisig/wasm-multisig-view/Cargo.lock b/contracts/examples/multisig/wasm-multisig-view/Cargo.lock
index c78ebcfee8..7f0a62e0c0 100644
--- a/contracts/examples/multisig/wasm-multisig-view/Cargo.lock
+++ b/contracts/examples/multisig/wasm-multisig-view/Cargo.lock
@@ -197,9 +197,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.1"
+version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
+checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
@@ -214,9 +214,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.38"
+version = "2.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
+checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -237,20 +237,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "092cd76b01a033a9965b9097da258689d9e17c69ded5dcf41bca001dd20ebc6d"
+checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a13a20a7c6a90e2034bcc65495799da92efcec6a8dd4f3fcb6f7a48988637ead"
+checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
diff --git a/contracts/examples/multisig/wasm/Cargo.lock b/contracts/examples/multisig/wasm/Cargo.lock
index 2067a451d1..064fc86206 100755
--- a/contracts/examples/multisig/wasm/Cargo.lock
+++ b/contracts/examples/multisig/wasm/Cargo.lock
@@ -197,9 +197,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.1"
+version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
+checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
@@ -214,9 +214,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.38"
+version = "2.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
+checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -237,20 +237,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "092cd76b01a033a9965b9097da258689d9e17c69ded5dcf41bca001dd20ebc6d"
+checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a13a20a7c6a90e2034bcc65495799da92efcec6a8dd4f3fcb6f7a48988637ead"
+checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
diff --git a/contracts/examples/nft-minter/wasm/Cargo.lock b/contracts/examples/nft-minter/wasm/Cargo.lock
index 213f4e9cea..20246150d9 100644
--- a/contracts/examples/nft-minter/wasm/Cargo.lock
+++ b/contracts/examples/nft-minter/wasm/Cargo.lock
@@ -14,6 +14,12 @@ dependencies = [
  "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"
@@ -46,11 +52,12 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.13.2"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
  "ahash",
+ "allocator-api2",
 ]
 
 [[package]]
@@ -61,9 +68,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-literal"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
@@ -182,9 +189,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.1"
+version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
+checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
@@ -199,9 +206,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.38"
+version = "2.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
+checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -222,20 +229,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "092cd76b01a033a9965b9097da258689d9e17c69ded5dcf41bca001dd20ebc6d"
+checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a13a20a7c6a90e2034bcc65495799da92efcec6a8dd4f3fcb6f7a48988637ead"
+checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
diff --git a/contracts/examples/nft-minter/wasm/Cargo.toml b/contracts/examples/nft-minter/wasm/Cargo.toml
index d068d3fae9..ae4b732af0 100644
--- a/contracts/examples/nft-minter/wasm/Cargo.toml
+++ b/contracts/examples/nft-minter/wasm/Cargo.toml
@@ -1,7 +1,12 @@
+# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+
+# ##########################################
+# ############## AUTO-GENERATED #############
+# ##########################################
+
 [package]
 name = "nft-minter-wasm"
 version = "0.0.0"
-authors = ["Dorin Iancu <dorin.iancu@multiversx.com>"]
 edition = "2021"
 publish = false
 
diff --git a/contracts/examples/nft-storage-prepay/wasm/Cargo.lock b/contracts/examples/nft-storage-prepay/wasm/Cargo.lock
index 8ed048a096..4acea7c384 100755
--- a/contracts/examples/nft-storage-prepay/wasm/Cargo.lock
+++ b/contracts/examples/nft-storage-prepay/wasm/Cargo.lock
@@ -14,6 +14,12 @@ dependencies = [
  "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"
@@ -46,11 +52,12 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.13.2"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
  "ahash",
+ "allocator-api2",
 ]
 
 [[package]]
@@ -61,9 +68,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-literal"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
@@ -182,9 +189,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.1"
+version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
+checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
@@ -199,9 +206,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.38"
+version = "2.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
+checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -222,20 +229,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "092cd76b01a033a9965b9097da258689d9e17c69ded5dcf41bca001dd20ebc6d"
+checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a13a20a7c6a90e2034bcc65495799da92efcec6a8dd4f3fcb6f7a48988637ead"
+checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
diff --git a/contracts/examples/nft-storage-prepay/wasm/Cargo.toml b/contracts/examples/nft-storage-prepay/wasm/Cargo.toml
index 25e2ed96ea..fdb3d3f7f1 100644
--- a/contracts/examples/nft-storage-prepay/wasm/Cargo.toml
+++ b/contracts/examples/nft-storage-prepay/wasm/Cargo.toml
@@ -1,17 +1,17 @@
+# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+
+# ##########################################
+# ############## AUTO-GENERATED #############
+# ##########################################
+
 [package]
 name = "nft-storage-prepay-wasm"
 version = "0.0.0"
-authors = [ "Dorin Iancu <dorin.iancu@multiversx.com>",]
 edition = "2021"
 publish = false
 
 [lib]
-crate-type = [ "cdylib",]
-
-[workspace]
-members = [ ".",]
-
-[dev-dependencies]
+crate-type = ["cdylib"]
 
 [profile.release]
 codegen-units = 1
@@ -26,3 +26,6 @@ path = ".."
 [dependencies.multiversx-sc-wasm-adapter]
 version = "0.44.0"
 path = "../../../../framework/wasm-adapter"
+
+[workspace]
+members = ["."]
diff --git a/contracts/examples/nft-subscription/wasm/Cargo.lock b/contracts/examples/nft-subscription/wasm/Cargo.lock
index c28b59de7c..3e393895d9 100644
--- a/contracts/examples/nft-subscription/wasm/Cargo.lock
+++ b/contracts/examples/nft-subscription/wasm/Cargo.lock
@@ -14,6 +14,12 @@ dependencies = [
  "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"
@@ -46,11 +52,12 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.13.2"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
  "ahash",
+ "allocator-api2",
 ]
 
 [[package]]
@@ -61,9 +68,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-literal"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
@@ -190,9 +197,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.1"
+version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
+checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
@@ -207,9 +214,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.38"
+version = "2.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
+checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -230,20 +237,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "092cd76b01a033a9965b9097da258689d9e17c69ded5dcf41bca001dd20ebc6d"
+checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a13a20a7c6a90e2034bcc65495799da92efcec6a8dd4f3fcb6f7a48988637ead"
+checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
diff --git a/contracts/examples/nft-subscription/wasm/Cargo.toml b/contracts/examples/nft-subscription/wasm/Cargo.toml
index b746e31e95..2db05caeac 100644
--- a/contracts/examples/nft-subscription/wasm/Cargo.toml
+++ b/contracts/examples/nft-subscription/wasm/Cargo.toml
@@ -1,7 +1,12 @@
+# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+
+# ##########################################
+# ############## AUTO-GENERATED #############
+# ##########################################
+
 [package]
 name = "nft-subscription-wasm"
 version = "0.0.0"
-authors = ["Thouny <thouny@tuta.io>"]
 edition = "2021"
 publish = false
 
diff --git a/contracts/examples/order-book/factory/wasm/Cargo.lock b/contracts/examples/order-book/factory/wasm/Cargo.lock
index 22671739cd..d43120b040 100644
--- a/contracts/examples/order-book/factory/wasm/Cargo.lock
+++ b/contracts/examples/order-book/factory/wasm/Cargo.lock
@@ -14,6 +14,12 @@ dependencies = [
  "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"
@@ -46,11 +52,12 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.13.2"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
  "ahash",
+ "allocator-api2",
 ]
 
 [[package]]
@@ -61,9 +68,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-literal"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
@@ -182,9 +189,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.1"
+version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
+checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
@@ -199,9 +206,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.38"
+version = "2.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
+checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -222,20 +229,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "092cd76b01a033a9965b9097da258689d9e17c69ded5dcf41bca001dd20ebc6d"
+checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a13a20a7c6a90e2034bcc65495799da92efcec6a8dd4f3fcb6f7a48988637ead"
+checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
diff --git a/contracts/examples/order-book/factory/wasm/Cargo.toml b/contracts/examples/order-book/factory/wasm/Cargo.toml
index 58c01aab9a..f64497820e 100644
--- a/contracts/examples/order-book/factory/wasm/Cargo.toml
+++ b/contracts/examples/order-book/factory/wasm/Cargo.toml
@@ -1,3 +1,9 @@
+# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+
+# ##########################################
+# ############## AUTO-GENERATED #############
+# ##########################################
+
 [package]
 name = "order-book-factory-wasm"
 version = "0.0.0"
@@ -5,12 +11,7 @@ edition = "2021"
 publish = false
 
 [lib]
-crate-type = [ "cdylib",]
-
-[workspace]
-members = [ ".",]
-
-[dev-dependencies]
+crate-type = ["cdylib"]
 
 [profile.release]
 codegen-units = 1
@@ -25,3 +26,6 @@ path = ".."
 [dependencies.multiversx-sc-wasm-adapter]
 version = "0.44.0"
 path = "../../../../../framework/wasm-adapter"
+
+[workspace]
+members = ["."]
diff --git a/contracts/examples/order-book/pair/wasm/Cargo.lock b/contracts/examples/order-book/pair/wasm/Cargo.lock
index 5b12e0670c..4c16bccf95 100644
--- a/contracts/examples/order-book/pair/wasm/Cargo.lock
+++ b/contracts/examples/order-book/pair/wasm/Cargo.lock
@@ -14,6 +14,12 @@ dependencies = [
  "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"
@@ -46,11 +52,12 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.13.2"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
  "ahash",
+ "allocator-api2",
 ]
 
 [[package]]
@@ -61,9 +68,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-literal"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
@@ -182,9 +189,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.1"
+version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
+checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
@@ -199,9 +206,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.38"
+version = "2.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
+checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -222,20 +229,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "092cd76b01a033a9965b9097da258689d9e17c69ded5dcf41bca001dd20ebc6d"
+checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a13a20a7c6a90e2034bcc65495799da92efcec6a8dd4f3fcb6f7a48988637ead"
+checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
diff --git a/contracts/examples/order-book/pair/wasm/Cargo.toml b/contracts/examples/order-book/pair/wasm/Cargo.toml
index b2003b8cbd..8aa9771c35 100644
--- a/contracts/examples/order-book/pair/wasm/Cargo.toml
+++ b/contracts/examples/order-book/pair/wasm/Cargo.toml
@@ -1,3 +1,9 @@
+# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+
+# ##########################################
+# ############## AUTO-GENERATED #############
+# ##########################################
+
 [package]
 name = "order-book-pair-wasm"
 version = "0.0.0"
@@ -5,12 +11,7 @@ edition = "2021"
 publish = false
 
 [lib]
-crate-type = [ "cdylib",]
-
-[workspace]
-members = [ ".",]
-
-[dev-dependencies]
+crate-type = ["cdylib"]
 
 [profile.release]
 codegen-units = 1
@@ -25,3 +26,6 @@ path = ".."
 [dependencies.multiversx-sc-wasm-adapter]
 version = "0.44.0"
 path = "../../../../../framework/wasm-adapter"
+
+[workspace]
+members = ["."]
diff --git a/contracts/examples/ping-pong-egld/wasm/Cargo.lock b/contracts/examples/ping-pong-egld/wasm/Cargo.lock
index ab6919fbf0..1c18eda695 100755
--- a/contracts/examples/ping-pong-egld/wasm/Cargo.lock
+++ b/contracts/examples/ping-pong-egld/wasm/Cargo.lock
@@ -14,6 +14,12 @@ dependencies = [
  "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"
@@ -46,11 +52,12 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.13.2"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
  "ahash",
+ "allocator-api2",
 ]
 
 [[package]]
@@ -61,9 +68,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-literal"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
@@ -146,7 +153,7 @@ dependencies = [
 
 [[package]]
 name = "ping-pong-egld-wasm"
-version = "0.0.1"
+version = "0.0.0"
 dependencies = [
  "multiversx-sc-wasm-adapter",
  "ping-pong-egld",
@@ -182,9 +189,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.1"
+version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
+checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
@@ -199,9 +206,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.38"
+version = "2.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
+checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -222,20 +229,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "092cd76b01a033a9965b9097da258689d9e17c69ded5dcf41bca001dd20ebc6d"
+checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a13a20a7c6a90e2034bcc65495799da92efcec6a8dd4f3fcb6f7a48988637ead"
+checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
diff --git a/contracts/examples/ping-pong-egld/wasm/Cargo.toml b/contracts/examples/ping-pong-egld/wasm/Cargo.toml
index d1bb6ca604..55945000d6 100644
--- a/contracts/examples/ping-pong-egld/wasm/Cargo.toml
+++ b/contracts/examples/ping-pong-egld/wasm/Cargo.toml
@@ -1,14 +1,17 @@
+# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+
+# ##########################################
+# ############## AUTO-GENERATED #############
+# ##########################################
+
 [package]
 name = "ping-pong-egld-wasm"
-version = "0.0.1"
-authors = [ "Bruda Claudiu-Marcel <claudiu725@yahoo.com>",]
+version = "0.0.0"
 edition = "2021"
 publish = false
 
 [lib]
-crate-type = [ "cdylib",]
-
-[workspace]
+crate-type = ["cdylib"]
 
 [profile.release]
 codegen-units = 1
@@ -23,3 +26,6 @@ path = ".."
 [dependencies.multiversx-sc-wasm-adapter]
 version = "0.44.0"
 path = "../../../../framework/wasm-adapter"
+
+[workspace]
+members = ["."]
diff --git a/contracts/examples/proxy-pause/wasm/Cargo.lock b/contracts/examples/proxy-pause/wasm/Cargo.lock
index 54ae01c907..252d8ef386 100644
--- a/contracts/examples/proxy-pause/wasm/Cargo.lock
+++ b/contracts/examples/proxy-pause/wasm/Cargo.lock
@@ -14,6 +14,12 @@ dependencies = [
  "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"
@@ -46,11 +52,12 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.13.2"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
  "ahash",
+ "allocator-api2",
 ]
 
 [[package]]
@@ -61,9 +68,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-literal"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
@@ -182,9 +189,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.1"
+version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
+checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
@@ -199,9 +206,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.38"
+version = "2.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
+checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -222,20 +229,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "092cd76b01a033a9965b9097da258689d9e17c69ded5dcf41bca001dd20ebc6d"
+checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a13a20a7c6a90e2034bcc65495799da92efcec6a8dd4f3fcb6f7a48988637ead"
+checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
diff --git a/contracts/examples/proxy-pause/wasm/Cargo.toml b/contracts/examples/proxy-pause/wasm/Cargo.toml
index e52b262ecc..528afa412e 100644
--- a/contracts/examples/proxy-pause/wasm/Cargo.toml
+++ b/contracts/examples/proxy-pause/wasm/Cargo.toml
@@ -1,17 +1,17 @@
+# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+
+# ##########################################
+# ############## AUTO-GENERATED #############
+# ##########################################
+
 [package]
 name = "proxy-pause-wasm"
 version = "0.0.0"
-authors = [ "you",]
 edition = "2021"
 publish = false
 
 [lib]
-crate-type = [ "cdylib",]
-
-[workspace]
-members = [ ".",]
-
-[dev-dependencies]
+crate-type = ["cdylib"]
 
 [profile.release]
 codegen-units = 1
@@ -26,3 +26,6 @@ path = ".."
 [dependencies.multiversx-sc-wasm-adapter]
 version = "0.44.0"
 path = "../../../../framework/wasm-adapter"
+
+[workspace]
+members = ["."]
diff --git a/contracts/examples/rewards-distribution/wasm/Cargo.lock b/contracts/examples/rewards-distribution/wasm/Cargo.lock
index edc7d068be..436c36215a 100644
--- a/contracts/examples/rewards-distribution/wasm/Cargo.lock
+++ b/contracts/examples/rewards-distribution/wasm/Cargo.lock
@@ -14,6 +14,12 @@ dependencies = [
  "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"
@@ -46,11 +52,12 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.13.2"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
  "ahash",
+ "allocator-api2",
 ]
 
 [[package]]
@@ -61,9 +68,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-literal"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
@@ -190,9 +197,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.1"
+version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
+checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
@@ -207,9 +214,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.38"
+version = "2.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
+checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -230,20 +237,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "092cd76b01a033a9965b9097da258689d9e17c69ded5dcf41bca001dd20ebc6d"
+checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a13a20a7c6a90e2034bcc65495799da92efcec6a8dd4f3fcb6f7a48988637ead"
+checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
diff --git a/contracts/examples/rewards-distribution/wasm/Cargo.toml b/contracts/examples/rewards-distribution/wasm/Cargo.toml
index 652e0b9c93..60375aba0c 100644
--- a/contracts/examples/rewards-distribution/wasm/Cargo.toml
+++ b/contracts/examples/rewards-distribution/wasm/Cargo.toml
@@ -1,18 +1,18 @@
+# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+
+# ##########################################
+# ############## AUTO-GENERATED #############
+# ##########################################
+
 [package]
 name = "rewards-distribution-wasm"
 version = "0.0.0"
-authors = ["Claudiu-Marcel Bruda <claudiu.bruda@multiversx.com>"]
 edition = "2021"
 publish = false
 
 [lib]
 crate-type = ["cdylib"]
 
-[workspace]
-members = ["."]
-
-[dev-dependencies]
-
 [profile.release]
 codegen-units = 1
 opt-level = "z"
@@ -26,3 +26,6 @@ path = ".."
 [dependencies.multiversx-sc-wasm-adapter]
 version = "0.44.0"
 path = "../../../../framework/wasm-adapter"
+
+[workspace]
+members = ["."]
diff --git a/contracts/examples/seed-nft-minter/wasm/Cargo.lock b/contracts/examples/seed-nft-minter/wasm/Cargo.lock
index 057f9d9648..1573a6f3c6 100644
--- a/contracts/examples/seed-nft-minter/wasm/Cargo.lock
+++ b/contracts/examples/seed-nft-minter/wasm/Cargo.lock
@@ -14,6 +14,12 @@ dependencies = [
  "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"
@@ -46,11 +52,12 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.13.2"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
  "ahash",
+ "allocator-api2",
 ]
 
 [[package]]
@@ -61,9 +68,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-literal"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
@@ -190,9 +197,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.1"
+version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
+checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
@@ -207,9 +214,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.38"
+version = "2.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
+checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -230,20 +237,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "092cd76b01a033a9965b9097da258689d9e17c69ded5dcf41bca001dd20ebc6d"
+checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a13a20a7c6a90e2034bcc65495799da92efcec6a8dd4f3fcb6f7a48988637ead"
+checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
diff --git a/contracts/examples/seed-nft-minter/wasm/Cargo.toml b/contracts/examples/seed-nft-minter/wasm/Cargo.toml
index 2e8eb3ca47..504d90d97b 100644
--- a/contracts/examples/seed-nft-minter/wasm/Cargo.toml
+++ b/contracts/examples/seed-nft-minter/wasm/Cargo.toml
@@ -1,17 +1,17 @@
+# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+
+# ##########################################
+# ############## AUTO-GENERATED #############
+# ##########################################
+
 [package]
 name = "seed-nft-minter-wasm"
 version = "0.0.0"
-authors = ["Claudiu-Marcel Bruda <claudiu.bruda@multiversx.com>"]
 edition = "2021"
 publish = false
 
 [lib]
-crate-type = [ "cdylib",]
-
-[workspace]
-members = [ ".",]
-
-[dev-dependencies]
+crate-type = ["cdylib"]
 
 [profile.release]
 codegen-units = 1
@@ -26,3 +26,6 @@ path = ".."
 [dependencies.multiversx-sc-wasm-adapter]
 version = "0.44.0"
 path = "../../../../framework/wasm-adapter"
+
+[workspace]
+members = ["."]
diff --git a/contracts/examples/token-release/wasm/Cargo.lock b/contracts/examples/token-release/wasm/Cargo.lock
index bc79841bb7..12edfbb5a8 100644
--- a/contracts/examples/token-release/wasm/Cargo.lock
+++ b/contracts/examples/token-release/wasm/Cargo.lock
@@ -14,6 +14,12 @@ dependencies = [
  "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"
@@ -46,11 +52,12 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.13.2"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
  "ahash",
+ "allocator-api2",
 ]
 
 [[package]]
@@ -61,9 +68,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-literal"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
@@ -167,9 +174,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.1"
+version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
+checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
@@ -184,9 +191,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.38"
+version = "2.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
+checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -202,7 +209,7 @@ dependencies = [
 
 [[package]]
 name = "token-release-wasm"
-version = "0.0.1"
+version = "0.0.0"
 dependencies = [
  "multiversx-sc-wasm-adapter",
  "token-release",
@@ -222,20 +229,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "092cd76b01a033a9965b9097da258689d9e17c69ded5dcf41bca001dd20ebc6d"
+checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a13a20a7c6a90e2034bcc65495799da92efcec6a8dd4f3fcb6f7a48988637ead"
+checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
diff --git a/contracts/examples/token-release/wasm/Cargo.toml b/contracts/examples/token-release/wasm/Cargo.toml
index 806bcd2da3..64a17a6d98 100644
--- a/contracts/examples/token-release/wasm/Cargo.toml
+++ b/contracts/examples/token-release/wasm/Cargo.toml
@@ -1,14 +1,17 @@
+# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+
+# ##########################################
+# ############## AUTO-GENERATED #############
+# ##########################################
+
 [package]
 name = "token-release-wasm"
-version = "0.0.1"
-authors = [ "you",]
+version = "0.0.0"
 edition = "2021"
 publish = false
 
 [lib]
-crate-type = [ "cdylib",]
-
-[workspace]
+crate-type = ["cdylib"]
 
 [profile.release]
 codegen-units = 1
@@ -23,3 +26,6 @@ path = ".."
 [dependencies.multiversx-sc-wasm-adapter]
 version = "0.44.0"
 path = "../../../../framework/wasm-adapter"
+
+[workspace]
+members = ["."]
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 73e1f2fa60..b9d932b73e 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
@@ -29,6 +29,12 @@ dependencies = [
  "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"
@@ -61,11 +67,12 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.13.2"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
  "ahash",
+ "allocator-api2",
 ]
 
 [[package]]
@@ -76,9 +83,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-literal"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
@@ -182,9 +189,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.1"
+version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
+checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
@@ -199,9 +206,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.38"
+version = "2.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
+checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -222,20 +229,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "092cd76b01a033a9965b9097da258689d9e17c69ded5dcf41bca001dd20ebc6d"
+checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a13a20a7c6a90e2034bcc65495799da92efcec6a8dd4f3fcb6f7a48988637ead"
+checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
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 a8e0d34347..69e4adb5ea 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
@@ -1,18 +1,25 @@
+# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+
+# ##########################################
+# ############## AUTO-GENERATED #############
+# ##########################################
+
 [package]
 name = "abi-tester-ev-wasm"
 version = "0.0.0"
-authors = ["Andrei Marinica <andrei.marinica@multiversx.com>"]
 edition = "2021"
 publish = false
 
 [lib]
 crate-type = ["cdylib"]
+
 [profile.release]
 codegen-units = 1
 opt-level = "z"
 lto = true
 debug = false
 panic = "abort"
+
 [dependencies.abi-tester]
 path = ".."
 
diff --git a/contracts/feature-tests/abi-tester/wasm/Cargo.lock b/contracts/feature-tests/abi-tester/wasm/Cargo.lock
index 957adc05ec..88b5cb5213 100755
--- a/contracts/feature-tests/abi-tester/wasm/Cargo.lock
+++ b/contracts/feature-tests/abi-tester/wasm/Cargo.lock
@@ -29,6 +29,12 @@ dependencies = [
  "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"
@@ -61,11 +67,12 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.13.2"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
  "ahash",
+ "allocator-api2",
 ]
 
 [[package]]
@@ -76,9 +83,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-literal"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
@@ -182,9 +189,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.1"
+version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
+checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
@@ -199,9 +206,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.38"
+version = "2.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
+checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -222,20 +229,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "092cd76b01a033a9965b9097da258689d9e17c69ded5dcf41bca001dd20ebc6d"
+checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a13a20a7c6a90e2034bcc65495799da92efcec6a8dd4f3fcb6f7a48988637ead"
+checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
diff --git a/contracts/feature-tests/abi-tester/wasm/Cargo.toml b/contracts/feature-tests/abi-tester/wasm/Cargo.toml
index bac39df607..8fa9cea032 100644
--- a/contracts/feature-tests/abi-tester/wasm/Cargo.toml
+++ b/contracts/feature-tests/abi-tester/wasm/Cargo.toml
@@ -1,7 +1,12 @@
+# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+
+# ##########################################
+# ############## AUTO-GENERATED #############
+# ##########################################
+
 [package]
 name = "abi-tester-wasm"
 version = "0.0.0"
-authors = ["Andrei Marinica <andrei.marinica@multiversx.com>"]
 edition = "2021"
 publish = false
 
diff --git a/contracts/feature-tests/alloc-features/wasm/Cargo.lock b/contracts/feature-tests/alloc-features/wasm/Cargo.lock
index a7d34893c8..6d1c8ce392 100644
--- a/contracts/feature-tests/alloc-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/alloc-features/wasm/Cargo.lock
@@ -29,6 +29,12 @@ dependencies = [
  "multiversx-sc-wasm-adapter",
 ]
 
+[[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"
@@ -61,11 +67,12 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.13.2"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
  "ahash",
+ "allocator-api2",
 ]
 
 [[package]]
@@ -76,9 +83,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-literal"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
@@ -182,9 +189,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.1"
+version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
+checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
@@ -199,9 +206,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.38"
+version = "2.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
+checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -222,20 +229,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "092cd76b01a033a9965b9097da258689d9e17c69ded5dcf41bca001dd20ebc6d"
+checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a13a20a7c6a90e2034bcc65495799da92efcec6a8dd4f3fcb6f7a48988637ead"
+checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
diff --git a/contracts/feature-tests/alloc-features/wasm/Cargo.toml b/contracts/feature-tests/alloc-features/wasm/Cargo.toml
index 35a10e9264..15654c84b6 100644
--- a/contracts/feature-tests/alloc-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/alloc-features/wasm/Cargo.toml
@@ -1,7 +1,12 @@
+# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+
+# ##########################################
+# ############## AUTO-GENERATED #############
+# ##########################################
+
 [package]
 name = "alloc-features-wasm"
 version = "0.0.0"
-authors = ["Andrei Marinica <andrei.marinica@multiversx.com>"]
 edition = "2021"
 publish = false
 
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 c5cbaa694b..58851786d3 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
@@ -14,6 +14,12 @@ dependencies = [
  "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"
@@ -62,11 +68,12 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.13.2"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
  "ahash",
+ "allocator-api2",
 ]
 
 [[package]]
@@ -77,9 +84,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-literal"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
@@ -190,9 +197,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.1"
+version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
+checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
@@ -207,9 +214,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.38"
+version = "2.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
+checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -230,20 +237,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "092cd76b01a033a9965b9097da258689d9e17c69ded5dcf41bca001dd20ebc6d"
+checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a13a20a7c6a90e2034bcc65495799da92efcec6a8dd4f3fcb6f7a48988637ead"
+checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
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 c1f9e3f5a4..173ced3945 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
@@ -1,18 +1,25 @@
+# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+
+# ##########################################
+# ############## AUTO-GENERATED #############
+# ##########################################
+
 [package]
 name = "basic-features-storage-bytes-wasm"
 version = "0.0.0"
-authors = ["Andrei Marinica <andrei.marinica@multiversx.com>"]
 edition = "2021"
 publish = false
 
 [lib]
 crate-type = ["cdylib"]
+
 [profile.release]
 codegen-units = 1
 opt-level = "z"
 lto = true
 debug = false
 panic = "abort"
+
 [dependencies.basic-features]
 path = ".."
 
diff --git a/contracts/feature-tests/basic-features/wasm/Cargo.lock b/contracts/feature-tests/basic-features/wasm/Cargo.lock
index 403117034b..31c67e537a 100755
--- a/contracts/feature-tests/basic-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/basic-features/wasm/Cargo.lock
@@ -14,6 +14,12 @@ dependencies = [
  "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"
@@ -62,11 +68,12 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.13.2"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
  "ahash",
+ "allocator-api2",
 ]
 
 [[package]]
@@ -77,9 +84,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-literal"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
@@ -190,9 +197,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.1"
+version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
+checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
@@ -207,9 +214,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.38"
+version = "2.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
+checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -230,20 +237,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "092cd76b01a033a9965b9097da258689d9e17c69ded5dcf41bca001dd20ebc6d"
+checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a13a20a7c6a90e2034bcc65495799da92efcec6a8dd4f3fcb6f7a48988637ead"
+checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
diff --git a/contracts/feature-tests/basic-features/wasm/Cargo.toml b/contracts/feature-tests/basic-features/wasm/Cargo.toml
index c85c863d39..828889d167 100644
--- a/contracts/feature-tests/basic-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/basic-features/wasm/Cargo.toml
@@ -1,7 +1,12 @@
+# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+
+# ##########################################
+# ############## AUTO-GENERATED #############
+# ##########################################
+
 [package]
 name = "basic-features-wasm"
 version = "0.0.0"
-authors = ["Andrei Marinica <andrei.marinica@multiversx.com>"]
 edition = "2021"
 publish = false
 
diff --git a/contracts/feature-tests/big-float-features/wasm/Cargo.lock b/contracts/feature-tests/big-float-features/wasm/Cargo.lock
index 85fbf67e45..a289277dd0 100644
--- a/contracts/feature-tests/big-float-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/big-float-features/wasm/Cargo.lock
@@ -14,6 +14,12 @@ dependencies = [
  "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"
@@ -61,11 +67,12 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.13.2"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
  "ahash",
+ "allocator-api2",
 ]
 
 [[package]]
@@ -76,9 +83,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-literal"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
@@ -182,9 +189,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.1"
+version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
+checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
@@ -199,9 +206,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.38"
+version = "2.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
+checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -222,20 +229,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "092cd76b01a033a9965b9097da258689d9e17c69ded5dcf41bca001dd20ebc6d"
+checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a13a20a7c6a90e2034bcc65495799da92efcec6a8dd4f3fcb6f7a48988637ead"
+checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
diff --git a/contracts/feature-tests/big-float-features/wasm/Cargo.toml b/contracts/feature-tests/big-float-features/wasm/Cargo.toml
index 7810a2b849..13771460a5 100644
--- a/contracts/feature-tests/big-float-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/big-float-features/wasm/Cargo.toml
@@ -1,7 +1,12 @@
+# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+
+# ##########################################
+# ############## AUTO-GENERATED #############
+# ##########################################
+
 [package]
 name = "big-float-features-wasm"
 version = "0.0.0"
-authors = ["Andrei Marinica <andrei.marinica@multiversx.com>"]
 edition = "2021"
 publish = false
 
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 03717d93b7..151936987c 100644
--- a/contracts/feature-tests/composability/builtin-func-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/builtin-func-features/wasm/Cargo.lock
@@ -14,6 +14,12 @@ dependencies = [
  "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"
@@ -61,11 +67,12 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.13.2"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
  "ahash",
+ "allocator-api2",
 ]
 
 [[package]]
@@ -76,9 +83,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-literal"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
@@ -182,9 +189,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.1"
+version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
+checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
@@ -199,9 +206,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.38"
+version = "2.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
+checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -222,20 +229,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "092cd76b01a033a9965b9097da258689d9e17c69ded5dcf41bca001dd20ebc6d"
+checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a13a20a7c6a90e2034bcc65495799da92efcec6a8dd4f3fcb6f7a48988637ead"
+checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
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 ef0e8e3338..14c6141370 100644
--- a/contracts/feature-tests/composability/builtin-func-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/builtin-func-features/wasm/Cargo.toml
@@ -1,7 +1,12 @@
+# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+
+# ##########################################
+# ############## AUTO-GENERATED #############
+# ##########################################
+
 [package]
 name = "builtin-func-features-wasm"
 version = "0.0.0"
-authors = ["Andrei Marinica <andrei.marinica@multiversx.com>"]
 edition = "2021"
 publish = false
 
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 a6af7efb78..0d715fea34 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
@@ -14,6 +14,12 @@ dependencies = [
  "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"
@@ -61,11 +67,12 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.13.2"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
  "ahash",
+ "allocator-api2",
 ]
 
 [[package]]
@@ -76,9 +83,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-literal"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
@@ -182,9 +189,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.1"
+version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
+checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
@@ -199,9 +206,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.38"
+version = "2.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
+checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -222,20 +229,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "092cd76b01a033a9965b9097da258689d9e17c69ded5dcf41bca001dd20ebc6d"
+checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a13a20a7c6a90e2034bcc65495799da92efcec6a8dd4f3fcb6f7a48988637ead"
+checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
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 b1f778cc8f..2db6a9a553 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
@@ -1,7 +1,12 @@
+# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+
+# ##########################################
+# ############## AUTO-GENERATED #############
+# ##########################################
+
 [package]
 name = "first-contract-wasm"
 version = "0.0.0"
-authors = ["Dorin Iancu <dorin.iancu@multiversx.com>"]
 edition = "2021"
 publish = false
 
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 8c6e36092d..f4759ce532 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
@@ -14,6 +14,12 @@ dependencies = [
  "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"
@@ -46,11 +52,12 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.13.2"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
  "ahash",
+ "allocator-api2",
 ]
 
 [[package]]
@@ -61,9 +68,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-literal"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
@@ -182,9 +189,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.1"
+version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
+checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
@@ -199,9 +206,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.38"
+version = "2.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
+checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -222,20 +229,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "092cd76b01a033a9965b9097da258689d9e17c69ded5dcf41bca001dd20ebc6d"
+checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a13a20a7c6a90e2034bcc65495799da92efcec6a8dd4f3fcb6f7a48988637ead"
+checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
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 3fc674b727..7975a3ab9f 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
@@ -1,7 +1,12 @@
+# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+
+# ##########################################
+# ############## AUTO-GENERATED #############
+# ##########################################
+
 [package]
 name = "second-contract-wasm"
 version = "0.0.0"
-authors = ["Dorin Iancu <dorin.iancu@multiversx.com>"]
 edition = "2021"
 publish = false
 
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 070aefbb43..948a8c489f 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
@@ -14,6 +14,12 @@ dependencies = [
  "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"
@@ -61,11 +67,12 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.13.2"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
  "ahash",
+ "allocator-api2",
 ]
 
 [[package]]
@@ -76,9 +83,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-literal"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
@@ -182,9 +189,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.1"
+version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
+checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
@@ -199,9 +206,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.38"
+version = "2.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
+checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -222,20 +229,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "092cd76b01a033a9965b9097da258689d9e17c69ded5dcf41bca001dd20ebc6d"
+checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a13a20a7c6a90e2034bcc65495799da92efcec6a8dd4f3fcb6f7a48988637ead"
+checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
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 170ca72796..305e30007d 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
@@ -1,7 +1,12 @@
+# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+
+# ##########################################
+# ############## AUTO-GENERATED #############
+# ##########################################
+
 [package]
 name = "child-wasm"
 version = "0.0.0"
-authors = ["Dorin Iancu <dorin.iancu@multiversx.com>"]
 edition = "2021"
 publish = false
 
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 fce9414aba..c8ea60371a 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
@@ -14,6 +14,12 @@ dependencies = [
  "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"
@@ -53,11 +59,12 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.13.2"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
  "ahash",
+ "allocator-api2",
 ]
 
 [[package]]
@@ -68,9 +75,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-literal"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
@@ -190,9 +197,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.1"
+version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
+checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
@@ -207,9 +214,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.38"
+version = "2.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
+checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -230,20 +237,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "092cd76b01a033a9965b9097da258689d9e17c69ded5dcf41bca001dd20ebc6d"
+checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a13a20a7c6a90e2034bcc65495799da92efcec6a8dd4f3fcb6f7a48988637ead"
+checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
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 92f3b71dbe..19d5655df8 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
@@ -1,7 +1,12 @@
+# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+
+# ##########################################
+# ############## AUTO-GENERATED #############
+# ##########################################
+
 [package]
 name = "parent-wasm"
 version = "0.0.0"
-authors = ["Dorin Iancu <dorin.iancu@multiversx.com>"]
 edition = "2021"
 publish = false
 
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 2dc73f90f8..9c8916166f 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
@@ -14,6 +14,12 @@ dependencies = [
  "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"
@@ -62,11 +68,12 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.13.2"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
  "ahash",
+ "allocator-api2",
 ]
 
 [[package]]
@@ -77,9 +84,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-literal"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
@@ -183,9 +190,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.1"
+version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
+checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
@@ -200,9 +207,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.38"
+version = "2.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
+checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -230,20 +237,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "092cd76b01a033a9965b9097da258689d9e17c69ded5dcf41bca001dd20ebc6d"
+checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a13a20a7c6a90e2034bcc65495799da92efcec6a8dd4f3fcb6f7a48988637ead"
+checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
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 7a11a330de..466c17bc2c 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
@@ -1,18 +1,25 @@
+# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+
+# ##########################################
+# ############## AUTO-GENERATED #############
+# ##########################################
+
 [package]
 name = "forwarder-queue-promises-wasm"
 version = "0.0.0"
-authors = ["Costin Carabas <costin.carabas@multiversx.com>"]
 edition = "2021"
 publish = false
 
 [lib]
 crate-type = ["cdylib"]
+
 [profile.release]
 codegen-units = 1
 opt-level = "z"
 lto = true
 debug = false
 panic = "abort"
+
 [dependencies.forwarder-queue]
 path = ".."
 features = ["promises"]
diff --git a/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock
index ae4536abae..bf5ea50d2e 100644
--- a/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock
@@ -14,6 +14,12 @@ dependencies = [
  "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"
@@ -62,11 +68,12 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.13.2"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
  "ahash",
+ "allocator-api2",
 ]
 
 [[package]]
@@ -77,9 +84,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-literal"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
@@ -183,9 +190,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.1"
+version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
+checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
@@ -200,9 +207,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.38"
+version = "2.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
+checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -230,20 +237,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "092cd76b01a033a9965b9097da258689d9e17c69ded5dcf41bca001dd20ebc6d"
+checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a13a20a7c6a90e2034bcc65495799da92efcec6a8dd4f3fcb6f7a48988637ead"
+checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
diff --git a/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.toml b/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.toml
index 9ee761fea7..01a31d99f3 100644
--- a/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.toml
@@ -1,7 +1,12 @@
+# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+
+# ##########################################
+# ############## AUTO-GENERATED #############
+# ##########################################
+
 [package]
 name = "forwarder-queue-wasm"
 version = "0.0.0"
-authors = ["Costin Carabas <costin.carabas@multiversx.com>"]
 edition = "2021"
 publish = false
 
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 bcb0c5879f..e5f8c3c55c 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
@@ -14,6 +14,12 @@ dependencies = [
  "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"
@@ -61,11 +67,12 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.13.2"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
  "ahash",
+ "allocator-api2",
 ]
 
 [[package]]
@@ -76,9 +83,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-literal"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
@@ -182,9 +189,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.1"
+version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
+checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
@@ -199,9 +206,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.38"
+version = "2.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
+checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -222,20 +229,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "092cd76b01a033a9965b9097da258689d9e17c69ded5dcf41bca001dd20ebc6d"
+checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a13a20a7c6a90e2034bcc65495799da92efcec6a8dd4f3fcb6f7a48988637ead"
+checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
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 9849a58667..2e3aa780bb 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
@@ -1,18 +1,25 @@
+# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+
+# ##########################################
+# ############## AUTO-GENERATED #############
+# ##########################################
+
 [package]
 name = "forwarder-raw-init-async-call-wasm"
 version = "0.0.0"
-authors = ["Andrei Marinica <andrei.marinica@multiversx.com>"]
 edition = "2021"
 publish = false
 
 [lib]
 crate-type = ["cdylib"]
+
 [profile.release]
 codegen-units = 1
 opt-level = "z"
 lto = true
 debug = false
 panic = "abort"
+
 [dependencies.forwarder-raw]
 path = ".."
 
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 dfd4e61771..d60d23301b 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
@@ -14,6 +14,12 @@ dependencies = [
  "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"
@@ -61,11 +67,12 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.13.2"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
  "ahash",
+ "allocator-api2",
 ]
 
 [[package]]
@@ -76,9 +83,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-literal"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
@@ -182,9 +189,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.1"
+version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
+checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
@@ -199,9 +206,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.38"
+version = "2.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
+checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -222,20 +229,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "092cd76b01a033a9965b9097da258689d9e17c69ded5dcf41bca001dd20ebc6d"
+checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a13a20a7c6a90e2034bcc65495799da92efcec6a8dd4f3fcb6f7a48988637ead"
+checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
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 89f31d4bc4..b566681a28 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
@@ -1,18 +1,25 @@
+# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+
+# ##########################################
+# ############## AUTO-GENERATED #############
+# ##########################################
+
 [package]
 name = "forwarder-raw-init-sync-call-wasm"
 version = "0.0.0"
-authors = ["Andrei Marinica <andrei.marinica@multiversx.com>"]
 edition = "2021"
 publish = false
 
 [lib]
 crate-type = ["cdylib"]
+
 [profile.release]
 codegen-units = 1
 opt-level = "z"
 lto = true
 debug = false
 panic = "abort"
+
 [dependencies.forwarder-raw]
 path = ".."
 
diff --git a/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.lock
index ae1f0bc48f..8453378d4d 100755
--- a/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.lock
@@ -14,6 +14,12 @@ dependencies = [
  "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"
@@ -61,11 +67,12 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.13.2"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
  "ahash",
+ "allocator-api2",
 ]
 
 [[package]]
@@ -76,9 +83,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-literal"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
@@ -182,9 +189,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.1"
+version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
+checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
@@ -199,9 +206,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.38"
+version = "2.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
+checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -222,20 +229,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "092cd76b01a033a9965b9097da258689d9e17c69ded5dcf41bca001dd20ebc6d"
+checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a13a20a7c6a90e2034bcc65495799da92efcec6a8dd4f3fcb6f7a48988637ead"
+checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
diff --git a/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.toml b/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.toml
index 05dc8f3c2a..91948c1528 100644
--- a/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.toml
@@ -1,7 +1,12 @@
+# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+
+# ##########################################
+# ############## AUTO-GENERATED #############
+# ##########################################
+
 [package]
 name = "forwarder-raw-wasm"
 version = "0.0.0"
-authors = ["Andrei Marinica <andrei.marinica@multiversx.com>"]
 edition = "2021"
 publish = false
 
diff --git a/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock
index 332a8282e2..b103891010 100755
--- a/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock
@@ -14,6 +14,12 @@ dependencies = [
  "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"
@@ -62,11 +68,12 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.13.2"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
  "ahash",
+ "allocator-api2",
 ]
 
 [[package]]
@@ -77,9 +84,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-literal"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
@@ -183,9 +190,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.1"
+version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
+checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
@@ -200,9 +207,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.38"
+version = "2.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
+checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -230,20 +237,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "092cd76b01a033a9965b9097da258689d9e17c69ded5dcf41bca001dd20ebc6d"
+checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a13a20a7c6a90e2034bcc65495799da92efcec6a8dd4f3fcb6f7a48988637ead"
+checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
diff --git a/contracts/feature-tests/composability/forwarder/wasm/Cargo.toml b/contracts/feature-tests/composability/forwarder/wasm/Cargo.toml
index 1750f8bb52..c53fb9e79a 100644
--- a/contracts/feature-tests/composability/forwarder/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder/wasm/Cargo.toml
@@ -1,7 +1,12 @@
+# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+
+# ##########################################
+# ############## AUTO-GENERATED #############
+# ##########################################
+
 [package]
 name = "forwarder-wasm"
 version = "0.0.0"
-authors = ["Andrei Marinica <andrei.marinica@multiversx.com>"]
 edition = "2021"
 publish = false
 
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 7b73f9a2ae..6dd57d9df1 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
@@ -14,6 +14,12 @@ dependencies = [
  "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"
@@ -46,11 +52,12 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.13.2"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
  "ahash",
+ "allocator-api2",
 ]
 
 [[package]]
@@ -61,9 +68,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-literal"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "local-esdt-and-nft"
@@ -182,9 +189,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.1"
+version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
+checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
@@ -199,9 +206,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.38"
+version = "2.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
+checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -222,20 +229,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "092cd76b01a033a9965b9097da258689d9e17c69ded5dcf41bca001dd20ebc6d"
+checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a13a20a7c6a90e2034bcc65495799da92efcec6a8dd4f3fcb6f7a48988637ead"
+checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
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 9648aff7b2..463924237f 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
@@ -1,7 +1,12 @@
+# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+
+# ##########################################
+# ############## AUTO-GENERATED #############
+# ##########################################
+
 [package]
 name = "local-esdt-and-nft-wasm"
 version = "0.0.0"
-authors = ["Dorin Iancu <dorin.iancu@multiversx.com>"]
 edition = "2021"
 publish = false
 
diff --git a/contracts/feature-tests/composability/promises-features/wasm/Cargo.lock b/contracts/feature-tests/composability/promises-features/wasm/Cargo.lock
index 3a6526a6b2..fc6afa6184 100644
--- a/contracts/feature-tests/composability/promises-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/promises-features/wasm/Cargo.lock
@@ -14,6 +14,12 @@ dependencies = [
  "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"
@@ -46,11 +52,12 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.13.2"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
  "ahash",
+ "allocator-api2",
 ]
 
 [[package]]
@@ -61,9 +68,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-literal"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
@@ -183,9 +190,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.1"
+version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
+checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
@@ -200,9 +207,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.38"
+version = "2.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
+checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -230,20 +237,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "092cd76b01a033a9965b9097da258689d9e17c69ded5dcf41bca001dd20ebc6d"
+checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a13a20a7c6a90e2034bcc65495799da92efcec6a8dd4f3fcb6f7a48988637ead"
+checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
diff --git a/contracts/feature-tests/composability/promises-features/wasm/Cargo.toml b/contracts/feature-tests/composability/promises-features/wasm/Cargo.toml
index 2a17435262..3de0d641b3 100644
--- a/contracts/feature-tests/composability/promises-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/promises-features/wasm/Cargo.toml
@@ -1,7 +1,12 @@
+# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+
+# ##########################################
+# ############## AUTO-GENERATED #############
+# ##########################################
+
 [package]
 name = "promises-features-wasm"
 version = "0.0.0"
-authors = ["Andrei Marinica <andrei.marinica@multiversx.com>"]
 edition = "2021"
 publish = false
 
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 54c856f14b..7f2d0902c7 100755
--- a/contracts/feature-tests/composability/proxy-test-first/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/proxy-test-first/wasm/Cargo.lock
@@ -190,9 +190,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.1"
+version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
+checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
@@ -207,9 +207,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.38"
+version = "2.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
+checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -230,20 +230,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "092cd76b01a033a9965b9097da258689d9e17c69ded5dcf41bca001dd20ebc6d"
+checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a13a20a7c6a90e2034bcc65495799da92efcec6a8dd4f3fcb6f7a48988637ead"
+checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
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 d02b8366db..3cddf0a450 100644
--- a/contracts/feature-tests/composability/proxy-test-first/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/proxy-test-first/wasm/Cargo.toml
@@ -1,7 +1,12 @@
+# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+
+# ##########################################
+# ############## AUTO-GENERATED #############
+# ##########################################
+
 [package]
 name = "proxy-test-first-wasm"
 version = "0.0.0"
-authors = ["Andrei Marinica <andrei.marinica@multiversx.com>"]
 edition = "2021"
 publish = false
 
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 fc72c66d49..88752bbc0e 100755
--- a/contracts/feature-tests/composability/proxy-test-second/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/proxy-test-second/wasm/Cargo.lock
@@ -189,9 +189,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.1"
+version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
+checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
@@ -206,9 +206,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.38"
+version = "2.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
+checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -229,20 +229,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "092cd76b01a033a9965b9097da258689d9e17c69ded5dcf41bca001dd20ebc6d"
+checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a13a20a7c6a90e2034bcc65495799da92efcec6a8dd4f3fcb6f7a48988637ead"
+checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
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 62b788ae38..af070e7458 100644
--- a/contracts/feature-tests/composability/proxy-test-second/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/proxy-test-second/wasm/Cargo.toml
@@ -1,7 +1,12 @@
+# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+
+# ##########################################
+# ############## AUTO-GENERATED #############
+# ##########################################
+
 [package]
 name = "proxy-test-second-wasm"
 version = "0.0.0"
-authors = ["Andrei Marinica <andrei.marinica@multiversx.com>"]
 edition = "2021"
 publish = false
 
diff --git a/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.lock b/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.lock
index 06a99b5731..6e38079c1b 100755
--- a/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.lock
@@ -14,6 +14,12 @@ dependencies = [
  "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"
@@ -46,11 +52,12 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.13.2"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
  "ahash",
+ "allocator-api2",
 ]
 
 [[package]]
@@ -61,9 +68,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-literal"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
@@ -183,9 +190,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.1"
+version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
+checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
@@ -200,9 +207,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.38"
+version = "2.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
+checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -230,20 +237,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "092cd76b01a033a9965b9097da258689d9e17c69ded5dcf41bca001dd20ebc6d"
+checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a13a20a7c6a90e2034bcc65495799da92efcec6a8dd4f3fcb6f7a48988637ead"
+checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
diff --git a/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.toml b/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.toml
index c7545ec11e..788213c3c9 100644
--- a/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.toml
@@ -1,7 +1,12 @@
+# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+
+# ##########################################
+# ############## AUTO-GENERATED #############
+# ##########################################
+
 [package]
 name = "recursive-caller-wasm"
 version = "0.0.0"
-authors = ["Andrei Marinica <andrei.marinica@multiversx.com>"]
 edition = "2021"
 publish = false
 
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 87cd296179..3bf61db88a 100644
--- a/contracts/feature-tests/composability/transfer-role-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/transfer-role-features/wasm/Cargo.lock
@@ -14,6 +14,12 @@ dependencies = [
  "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"
@@ -46,11 +52,12 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.13.2"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
  "ahash",
+ "allocator-api2",
 ]
 
 [[package]]
@@ -61,9 +68,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-literal"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
@@ -174,9 +181,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.1"
+version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
+checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
@@ -191,9 +198,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.38"
+version = "2.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
+checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -230,20 +237,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "092cd76b01a033a9965b9097da258689d9e17c69ded5dcf41bca001dd20ebc6d"
+checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a13a20a7c6a90e2034bcc65495799da92efcec6a8dd4f3fcb6f7a48988637ead"
+checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
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 affff30336..f0ee8f759b 100644
--- a/contracts/feature-tests/composability/transfer-role-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/transfer-role-features/wasm/Cargo.toml
@@ -1,7 +1,12 @@
+# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+
+# ##########################################
+# ############## AUTO-GENERATED #############
+# ##########################################
+
 [package]
 name = "transfer-role-features-wasm"
 version = "0.0.0"
-authors = ["Dorin Marian Iancu <dorin.iancu@multiversx.com>"]
 edition = "2021"
 publish = false
 
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 09da7d4c35..2a444dde5f 100644
--- a/contracts/feature-tests/composability/vault/wasm-vault-promises/Cargo.lock
+++ b/contracts/feature-tests/composability/vault/wasm-vault-promises/Cargo.lock
@@ -174,9 +174,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.1"
+version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
+checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
@@ -191,9 +191,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.38"
+version = "2.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
+checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -229,20 +229,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "092cd76b01a033a9965b9097da258689d9e17c69ded5dcf41bca001dd20ebc6d"
+checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a13a20a7c6a90e2034bcc65495799da92efcec6a8dd4f3fcb6f7a48988637ead"
+checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
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 8e446dda29..fa540038c3 100644
--- a/contracts/feature-tests/composability/vault/wasm-vault-promises/Cargo.toml
+++ b/contracts/feature-tests/composability/vault/wasm-vault-promises/Cargo.toml
@@ -1,7 +1,12 @@
+# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+
+# ##########################################
+# ############## AUTO-GENERATED #############
+# ##########################################
+
 [package]
 name = "vault-promises-wasm"
 version = "0.0.0"
-authors = ["Andrei Marinica <andrei.marinica@multiversx.com>"]
 edition = "2021"
 publish = false
 
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 9086f87a5f..28a001574b 100644
--- a/contracts/feature-tests/composability/vault/wasm-vault-upgrade/Cargo.lock
+++ b/contracts/feature-tests/composability/vault/wasm-vault-upgrade/Cargo.lock
@@ -174,9 +174,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.1"
+version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
+checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
@@ -229,18 +229,18 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.25"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8cd369a67c0edfef15010f980c3cbe45d7f651deac2cd67ce097cd801de16557"
+checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.25"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2f140bda219a26ccc0cdb03dba58af72590c53b22642577d88a927bc5c87d6b"
+checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
 dependencies = [
  "proc-macro2",
  "quote",
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 0b0d4ad35c..7a1a7a0c7d 100644
--- a/contracts/feature-tests/composability/vault/wasm-vault-upgrade/Cargo.toml
+++ b/contracts/feature-tests/composability/vault/wasm-vault-upgrade/Cargo.toml
@@ -1,7 +1,12 @@
+# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+
+# ##########################################
+# ############## AUTO-GENERATED #############
+# ##########################################
+
 [package]
 name = "vault-upgrade-wasm"
 version = "0.0.0"
-authors = ["Andrei Marinica <andrei.marinica@multiversx.com>"]
 edition = "2021"
 publish = false
 
diff --git a/contracts/feature-tests/composability/vault/wasm/Cargo.lock b/contracts/feature-tests/composability/vault/wasm/Cargo.lock
index 9ddce778f8..8b204533e9 100755
--- a/contracts/feature-tests/composability/vault/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/vault/wasm/Cargo.lock
@@ -174,9 +174,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.1"
+version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
+checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
@@ -191,9 +191,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.38"
+version = "2.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
+checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -229,20 +229,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "092cd76b01a033a9965b9097da258689d9e17c69ded5dcf41bca001dd20ebc6d"
+checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a13a20a7c6a90e2034bcc65495799da92efcec6a8dd4f3fcb6f7a48988637ead"
+checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
diff --git a/contracts/feature-tests/composability/vault/wasm/Cargo.toml b/contracts/feature-tests/composability/vault/wasm/Cargo.toml
index bb620a8041..1b3d9cdc94 100644
--- a/contracts/feature-tests/composability/vault/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/vault/wasm/Cargo.toml
@@ -1,7 +1,12 @@
+# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+
+# ##########################################
+# ############## AUTO-GENERATED #############
+# ##########################################
+
 [package]
 name = "vault-wasm"
 version = "0.0.0"
-authors = ["Andrei Marinica <andrei.marinica@multiversx.com>"]
 edition = "2021"
 publish = false
 
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 513c9cf5e9..f01c7da953 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
@@ -14,6 +14,12 @@ dependencies = [
  "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"
@@ -69,11 +75,12 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.13.2"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
  "ahash",
+ "allocator-api2",
 ]
 
 [[package]]
@@ -84,9 +91,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-literal"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
@@ -190,9 +197,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.1"
+version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
+checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
@@ -207,9 +214,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.38"
+version = "2.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
+checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -230,20 +237,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "092cd76b01a033a9965b9097da258689d9e17c69ded5dcf41bca001dd20ebc6d"
+checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a13a20a7c6a90e2034bcc65495799da92efcec6a8dd4f3fcb6f7a48988637ead"
+checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
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 e468d01b1b..5a60d92a2f 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
@@ -1,7 +1,12 @@
+# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+
+# ##########################################
+# ############## AUTO-GENERATED #############
+# ##########################################
+
 [package]
 name = "crowdfunding-erc20-wasm"
 version = "0.0.0"
-authors = ["Dorin Iancu <dorin.iancu@multiversx.com>"]
 edition = "2021"
 publish = false
 
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 d9922cba7c..c3944518c9 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
@@ -14,6 +14,12 @@ dependencies = [
  "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"
@@ -69,11 +75,12 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.13.2"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
  "ahash",
+ "allocator-api2",
 ]
 
 [[package]]
@@ -84,9 +91,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-literal"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
@@ -190,9 +197,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.1"
+version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
+checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
@@ -207,9 +214,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.38"
+version = "2.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
+checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -230,20 +237,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "092cd76b01a033a9965b9097da258689d9e17c69ded5dcf41bca001dd20ebc6d"
+checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a13a20a7c6a90e2034bcc65495799da92efcec6a8dd4f3fcb6f7a48988637ead"
+checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
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 405198b3da..b5334df3c3 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
@@ -1,7 +1,12 @@
+# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+
+# ##########################################
+# ############## AUTO-GENERATED #############
+# ##########################################
+
 [package]
 name = "erc1155-marketplace-wasm"
 version = "0.0.0"
-authors = ["Dorin Iancu <dorin.iancu@multiversx.com>"]
 edition = "2021"
 publish = false
 
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 acd1cd77ac..76b620a235 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
@@ -14,6 +14,12 @@ dependencies = [
  "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"
@@ -61,11 +67,12 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.13.2"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
  "ahash",
+ "allocator-api2",
 ]
 
 [[package]]
@@ -76,9 +83,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-literal"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
@@ -182,9 +189,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.1"
+version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
+checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
@@ -199,9 +206,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.38"
+version = "2.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
+checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -222,20 +229,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "092cd76b01a033a9965b9097da258689d9e17c69ded5dcf41bca001dd20ebc6d"
+checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a13a20a7c6a90e2034bcc65495799da92efcec6a8dd4f3fcb6f7a48988637ead"
+checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
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 2bca4d45b7..9c2b9465fe 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
@@ -1,7 +1,12 @@
+# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+
+# ##########################################
+# ############## AUTO-GENERATED #############
+# ##########################################
+
 [package]
 name = "erc1155-user-mock-wasm"
 version = "0.0.0"
-authors = ["Dorin Iancu <dorin.iancu@multiversx.com>"]
 edition = "2021"
 publish = false
 
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 ebe32124a4..58e8028a64 100644
--- a/contracts/feature-tests/erc-style-contracts/erc1155/wasm/Cargo.lock
+++ b/contracts/feature-tests/erc-style-contracts/erc1155/wasm/Cargo.lock
@@ -14,6 +14,12 @@ dependencies = [
  "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"
@@ -61,11 +67,12 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.13.2"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
  "ahash",
+ "allocator-api2",
 ]
 
 [[package]]
@@ -76,9 +83,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-literal"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
@@ -182,9 +189,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.1"
+version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
+checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
@@ -199,9 +206,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.38"
+version = "2.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
+checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -222,20 +229,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "092cd76b01a033a9965b9097da258689d9e17c69ded5dcf41bca001dd20ebc6d"
+checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a13a20a7c6a90e2034bcc65495799da92efcec6a8dd4f3fcb6f7a48988637ead"
+checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
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 a1969e8051..fef776ef2e 100644
--- a/contracts/feature-tests/erc-style-contracts/erc1155/wasm/Cargo.toml
+++ b/contracts/feature-tests/erc-style-contracts/erc1155/wasm/Cargo.toml
@@ -1,7 +1,12 @@
+# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+
+# ##########################################
+# ############## AUTO-GENERATED #############
+# ##########################################
+
 [package]
 name = "erc1155-wasm"
 version = "0.0.0"
-authors = ["Dorin Iancu <dorin.iancu@multiversx.com>"]
 edition = "2021"
 publish = false
 
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 ef9978e123..ce1f7af93c 100644
--- a/contracts/feature-tests/erc-style-contracts/erc20/wasm/Cargo.lock
+++ b/contracts/feature-tests/erc-style-contracts/erc20/wasm/Cargo.lock
@@ -14,6 +14,12 @@ dependencies = [
  "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"
@@ -61,11 +67,12 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.13.2"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
  "ahash",
+ "allocator-api2",
 ]
 
 [[package]]
@@ -76,9 +83,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-literal"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
@@ -182,9 +189,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.1"
+version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
+checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
@@ -199,9 +206,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.38"
+version = "2.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
+checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -222,20 +229,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "092cd76b01a033a9965b9097da258689d9e17c69ded5dcf41bca001dd20ebc6d"
+checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a13a20a7c6a90e2034bcc65495799da92efcec6a8dd4f3fcb6f7a48988637ead"
+checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
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 45b8f256e7..7cb42fb7b4 100644
--- a/contracts/feature-tests/erc-style-contracts/erc20/wasm/Cargo.toml
+++ b/contracts/feature-tests/erc-style-contracts/erc20/wasm/Cargo.toml
@@ -1,7 +1,12 @@
+# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+
+# ##########################################
+# ############## AUTO-GENERATED #############
+# ##########################################
+
 [package]
 name = "erc20-wasm"
 version = "0.0.0"
-authors = ["Andrei Marinica <andrei.marinica@multiversx.com>"]
 edition = "2021"
 publish = false
 
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 7247bce086..372b2ef258 100644
--- a/contracts/feature-tests/erc-style-contracts/erc721/wasm/Cargo.lock
+++ b/contracts/feature-tests/erc-style-contracts/erc721/wasm/Cargo.lock
@@ -14,6 +14,12 @@ dependencies = [
  "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"
@@ -61,11 +67,12 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.13.2"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
  "ahash",
+ "allocator-api2",
 ]
 
 [[package]]
@@ -76,9 +83,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-literal"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
@@ -182,9 +189,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.1"
+version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
+checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
@@ -199,9 +206,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.38"
+version = "2.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
+checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -222,20 +229,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "092cd76b01a033a9965b9097da258689d9e17c69ded5dcf41bca001dd20ebc6d"
+checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a13a20a7c6a90e2034bcc65495799da92efcec6a8dd4f3fcb6f7a48988637ead"
+checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
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 27e84233bf..7a3aef340b 100644
--- a/contracts/feature-tests/erc-style-contracts/erc721/wasm/Cargo.toml
+++ b/contracts/feature-tests/erc-style-contracts/erc721/wasm/Cargo.toml
@@ -1,3 +1,9 @@
+# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+
+# ##########################################
+# ############## AUTO-GENERATED #############
+# ##########################################
+
 [package]
 name = "erc721-wasm"
 version = "0.0.0"
@@ -5,10 +11,7 @@ edition = "2021"
 publish = false
 
 [lib]
-crate-type = [ "cdylib",]
-
-[workspace]
-members = ["."]
+crate-type = ["cdylib"]
 
 [profile.release]
 codegen-units = 1
@@ -23,3 +26,6 @@ path = ".."
 [dependencies.multiversx-sc-wasm-adapter]
 version = "0.44.0"
 path = "../../../../../framework/wasm-adapter"
+
+[workspace]
+members = ["."]
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 1010aa90e6..e96930b658 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
@@ -14,6 +14,12 @@ dependencies = [
  "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"
@@ -53,11 +59,12 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.13.2"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
  "ahash",
+ "allocator-api2",
 ]
 
 [[package]]
@@ -68,9 +75,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-literal"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "lottery-erc20"
@@ -190,9 +197,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.1"
+version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
+checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
@@ -207,9 +214,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.38"
+version = "2.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
+checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -230,20 +237,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "092cd76b01a033a9965b9097da258689d9e17c69ded5dcf41bca001dd20ebc6d"
+checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a13a20a7c6a90e2034bcc65495799da92efcec6a8dd4f3fcb6f7a48988637ead"
+checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
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 79e1e8298d..424448a4ce 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
@@ -1,15 +1,17 @@
+# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+
+# ##########################################
+# ############## AUTO-GENERATED #############
+# ##########################################
+
 [package]
 name = "lottery-erc20-wasm"
 version = "0.0.0"
-authors = [ "Dorin Iancu <dorin.iancu@multiversx.com>",]
 edition = "2021"
 publish = false
 
 [lib]
-crate-type = [ "cdylib",]
-
-[workspace]
-members = ["."]
+crate-type = ["cdylib"]
 
 [profile.release]
 codegen-units = 1
@@ -24,3 +26,6 @@ path = ".."
 [dependencies.multiversx-sc-wasm-adapter]
 version = "0.44.0"
 path = "../../../../../framework/wasm-adapter"
+
+[workspace]
+members = ["."]
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 5c396a891e..f335ebd02a 100644
--- a/contracts/feature-tests/esdt-system-sc-mock/wasm/Cargo.lock
+++ b/contracts/feature-tests/esdt-system-sc-mock/wasm/Cargo.lock
@@ -14,6 +14,12 @@ dependencies = [
  "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"
@@ -61,11 +67,12 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.13.2"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
  "ahash",
+ "allocator-api2",
 ]
 
 [[package]]
@@ -76,9 +83,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-literal"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
@@ -182,9 +189,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.1"
+version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
+checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
@@ -199,9 +206,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.38"
+version = "2.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
+checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -222,20 +229,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "092cd76b01a033a9965b9097da258689d9e17c69ded5dcf41bca001dd20ebc6d"
+checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a13a20a7c6a90e2034bcc65495799da92efcec6a8dd4f3fcb6f7a48988637ead"
+checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
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 6bcfd5b662..bbc1fd101c 100644
--- a/contracts/feature-tests/esdt-system-sc-mock/wasm/Cargo.toml
+++ b/contracts/feature-tests/esdt-system-sc-mock/wasm/Cargo.toml
@@ -1,7 +1,12 @@
+# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+
+# ##########################################
+# ############## AUTO-GENERATED #############
+# ##########################################
+
 [package]
 name = "esdt-system-sc-mock-wasm"
 version = "0.0.0"
-authors = ["Dorin Marian Iancu <dorin.iancu@multiversx.com>"]
 edition = "2021"
 publish = false
 
diff --git a/contracts/feature-tests/formatted-message-features/wasm/Cargo.lock b/contracts/feature-tests/formatted-message-features/wasm/Cargo.lock
index 51c627a65e..4dfed7b91a 100644
--- a/contracts/feature-tests/formatted-message-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/formatted-message-features/wasm/Cargo.lock
@@ -14,6 +14,12 @@ dependencies = [
  "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"
@@ -61,11 +67,12 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.13.2"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
  "ahash",
+ "allocator-api2",
 ]
 
 [[package]]
@@ -76,9 +83,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-literal"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
@@ -182,9 +189,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.1"
+version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
+checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
@@ -199,9 +206,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.38"
+version = "2.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
+checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -222,20 +229,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "092cd76b01a033a9965b9097da258689d9e17c69ded5dcf41bca001dd20ebc6d"
+checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a13a20a7c6a90e2034bcc65495799da92efcec6a8dd4f3fcb6f7a48988637ead"
+checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
diff --git a/contracts/feature-tests/formatted-message-features/wasm/Cargo.toml b/contracts/feature-tests/formatted-message-features/wasm/Cargo.toml
index 7205ef8122..c1880543b4 100644
--- a/contracts/feature-tests/formatted-message-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/formatted-message-features/wasm/Cargo.toml
@@ -1,17 +1,17 @@
+# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+
+# ##########################################
+# ############## AUTO-GENERATED #############
+# ##########################################
+
 [package]
 name = "formatted-message-features-wasm"
 version = "0.0.0"
-authors = [ "you",]
 edition = "2021"
 publish = false
 
 [lib]
-crate-type = [ "cdylib",]
-
-[workspace]
-members = [ ".",]
-
-[dev-dependencies]
+crate-type = ["cdylib"]
 
 [profile.release]
 codegen-units = 1
@@ -26,3 +26,6 @@ path = ".."
 [dependencies.multiversx-sc-wasm-adapter]
 version = "0.44.0"
 path = "../../../../framework/wasm-adapter"
+
+[workspace]
+members = ["."]
diff --git a/contracts/feature-tests/managed-map-features/wasm/Cargo.lock b/contracts/feature-tests/managed-map-features/wasm/Cargo.lock
index a6d4a1bb1e..365f628f33 100644
--- a/contracts/feature-tests/managed-map-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/managed-map-features/wasm/Cargo.lock
@@ -14,6 +14,12 @@ dependencies = [
  "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"
@@ -46,11 +52,12 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.13.2"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
  "ahash",
+ "allocator-api2",
 ]
 
 [[package]]
@@ -61,9 +68,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-literal"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "managed-map-features"
@@ -182,9 +189,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.1"
+version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
+checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
@@ -199,9 +206,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.38"
+version = "2.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
+checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -222,20 +229,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "092cd76b01a033a9965b9097da258689d9e17c69ded5dcf41bca001dd20ebc6d"
+checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a13a20a7c6a90e2034bcc65495799da92efcec6a8dd4f3fcb6f7a48988637ead"
+checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
diff --git a/contracts/feature-tests/managed-map-features/wasm/Cargo.toml b/contracts/feature-tests/managed-map-features/wasm/Cargo.toml
index e22bd1fbcf..5f97da3f8a 100644
--- a/contracts/feature-tests/managed-map-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/managed-map-features/wasm/Cargo.toml
@@ -1,18 +1,25 @@
+# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+
+# ##########################################
+# ############## AUTO-GENERATED #############
+# ##########################################
+
 [package]
 name = "managed-map-features-wasm"
 version = "0.0.0"
-authors = ["Andrei Marinica <andrei.marinica@multiversx.com>"]
 edition = "2021"
 publish = false
 
 [lib]
 crate-type = ["cdylib"]
+
 [profile.release]
 codegen-units = 1
 opt-level = "z"
 lto = true
 debug = false
 panic = "abort"
+
 [dependencies.managed-map-features]
 path = ".."
 
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 0257408683..28e859057c 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
@@ -14,6 +14,12 @@ dependencies = [
  "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"
@@ -46,11 +52,12 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.13.2"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
  "ahash",
+ "allocator-api2",
 ]
 
 [[package]]
@@ -61,9 +68,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-literal"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multi-contract-alt-impl-wasm"
@@ -182,9 +189,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.1"
+version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
+checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
@@ -199,9 +206,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.38"
+version = "2.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
+checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -222,20 +229,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "092cd76b01a033a9965b9097da258689d9e17c69ded5dcf41bca001dd20ebc6d"
+checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a13a20a7c6a90e2034bcc65495799da92efcec6a8dd4f3fcb6f7a48988637ead"
+checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
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 1a9ac0c4c7..f84dd87e10 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
@@ -1,18 +1,25 @@
+# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+
+# ##########################################
+# ############## AUTO-GENERATED #############
+# ##########################################
+
 [package]
 name = "multi-contract-alt-impl-wasm"
 version = "0.0.0"
-authors = ["Andrei Marinica <andrei.marinica@multiversx.com>"]
 edition = "2021"
 publish = false
 
 [lib]
 crate-type = ["cdylib"]
+
 [profile.release]
 codegen-units = 1
 opt-level = "z"
 lto = true
 debug = false
 panic = "abort"
+
 [dependencies.multi-contract-features]
 path = ".."
 
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 bcf8fae85b..7c8be41c21 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
@@ -14,6 +14,12 @@ dependencies = [
  "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"
@@ -46,11 +52,12 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.13.2"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
  "ahash",
+ "allocator-api2",
 ]
 
 [[package]]
@@ -61,9 +68,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-literal"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multi-contract-example-feature-wasm"
@@ -182,9 +189,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.1"
+version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
+checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
@@ -199,9 +206,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.38"
+version = "2.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
+checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -222,20 +229,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "092cd76b01a033a9965b9097da258689d9e17c69ded5dcf41bca001dd20ebc6d"
+checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a13a20a7c6a90e2034bcc65495799da92efcec6a8dd4f3fcb6f7a48988637ead"
+checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
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 5c84a04128..7e7785378c 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
@@ -1,18 +1,25 @@
+# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+
+# ##########################################
+# ############## AUTO-GENERATED #############
+# ##########################################
+
 [package]
 name = "multi-contract-example-feature-wasm"
 version = "0.0.0"
-authors = ["Andrei Marinica <andrei.marinica@multiversx.com>"]
 edition = "2021"
 publish = false
 
 [lib]
 crate-type = ["cdylib"]
+
 [profile.release]
 codegen-units = 1
 opt-level = "z"
 lto = true
 debug = false
 panic = "abort"
+
 [dependencies.multi-contract-features]
 path = ".."
 features = ["example_feature"]
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 68f03600b5..fb77abf9ca 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
@@ -14,6 +14,12 @@ dependencies = [
  "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"
@@ -46,11 +52,12 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.13.2"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
  "ahash",
+ "allocator-api2",
 ]
 
 [[package]]
@@ -61,9 +68,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-literal"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multi-contract-features"
@@ -182,9 +189,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.1"
+version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
+checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
@@ -199,9 +206,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.38"
+version = "2.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
+checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -222,20 +229,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "092cd76b01a033a9965b9097da258689d9e17c69ded5dcf41bca001dd20ebc6d"
+checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a13a20a7c6a90e2034bcc65495799da92efcec6a8dd4f3fcb6f7a48988637ead"
+checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
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 59c81ee75f..d72ae28cb7 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
@@ -1,18 +1,25 @@
+# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+
+# ##########################################
+# ############## AUTO-GENERATED #############
+# ##########################################
+
 [package]
 name = "multi-contract-features-view-wasm"
 version = "0.0.0"
-authors = ["Andrei Marinica <andrei.marinica@multiversx.com>"]
 edition = "2021"
 publish = false
 
 [lib]
 crate-type = ["cdylib"]
+
 [profile.release]
 codegen-units = 1
 opt-level = "z"
 lto = true
 debug = false
 panic = "abort"
+
 [dependencies.multi-contract-features]
 path = ".."
 
diff --git a/contracts/feature-tests/multi-contract-features/wasm/Cargo.lock b/contracts/feature-tests/multi-contract-features/wasm/Cargo.lock
index 10cb55cb86..33eb5f4aa5 100755
--- a/contracts/feature-tests/multi-contract-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/multi-contract-features/wasm/Cargo.lock
@@ -14,6 +14,12 @@ dependencies = [
  "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"
@@ -46,11 +52,12 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.13.2"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
  "ahash",
+ "allocator-api2",
 ]
 
 [[package]]
@@ -61,9 +68,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-literal"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multi-contract-features"
@@ -73,7 +80,7 @@ dependencies = [
 ]
 
 [[package]]
-name = "multi-contract-features-custom-cargo-toml-name"
+name = "multi-contract-features-wasm"
 version = "0.0.0"
 dependencies = [
  "multi-contract-features",
@@ -182,9 +189,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.1"
+version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
+checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
@@ -199,9 +206,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.38"
+version = "2.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
+checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -222,20 +229,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "092cd76b01a033a9965b9097da258689d9e17c69ded5dcf41bca001dd20ebc6d"
+checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a13a20a7c6a90e2034bcc65495799da92efcec6a8dd4f3fcb6f7a48988637ead"
+checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
diff --git a/contracts/feature-tests/multi-contract-features/wasm/Cargo.toml b/contracts/feature-tests/multi-contract-features/wasm/Cargo.toml
index b942596c00..a0e4cd1862 100644
--- a/contracts/feature-tests/multi-contract-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/multi-contract-features/wasm/Cargo.toml
@@ -1,7 +1,12 @@
+# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+
+# ##########################################
+# ############## AUTO-GENERATED #############
+# ##########################################
+
 [package]
-name = "multi-contract-features-custom-cargo-toml-name"
+name = "multi-contract-features-wasm"
 version = "0.0.0"
-authors = ["Andrei Marinica <andrei.marinica@multiversx.com>"]
 edition = "2021"
 publish = false
 
diff --git a/contracts/feature-tests/panic-message-features/wasm/Cargo.lock b/contracts/feature-tests/panic-message-features/wasm/Cargo.lock
index e55c203e13..f7ee10c03f 100755
--- a/contracts/feature-tests/panic-message-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/panic-message-features/wasm/Cargo.lock
@@ -14,6 +14,12 @@ dependencies = [
  "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"
@@ -46,11 +52,12 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.13.2"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
  "ahash",
+ "allocator-api2",
 ]
 
 [[package]]
@@ -61,9 +68,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-literal"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
@@ -182,9 +189,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.1"
+version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
+checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
@@ -199,9 +206,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.38"
+version = "2.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
+checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -222,20 +229,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "092cd76b01a033a9965b9097da258689d9e17c69ded5dcf41bca001dd20ebc6d"
+checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a13a20a7c6a90e2034bcc65495799da92efcec6a8dd4f3fcb6f7a48988637ead"
+checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
diff --git a/contracts/feature-tests/panic-message-features/wasm/Cargo.toml b/contracts/feature-tests/panic-message-features/wasm/Cargo.toml
index 491944c165..7f25354ea8 100644
--- a/contracts/feature-tests/panic-message-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/panic-message-features/wasm/Cargo.toml
@@ -1,7 +1,12 @@
+# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+
+# ##########################################
+# ############## AUTO-GENERATED #############
+# ##########################################
+
 [package]
 name = "panic-message-features-wasm"
 version = "0.0.0"
-authors = ["Andrei Marinica <andrei.marinica@multiversx.com>"]
 edition = "2021"
 publish = false
 
diff --git a/contracts/feature-tests/payable-features/wasm/Cargo.lock b/contracts/feature-tests/payable-features/wasm/Cargo.lock
index 1fd95978e7..06934c8504 100755
--- a/contracts/feature-tests/payable-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/payable-features/wasm/Cargo.lock
@@ -14,6 +14,12 @@ dependencies = [
  "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"
@@ -46,11 +52,12 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.13.2"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
  "ahash",
+ "allocator-api2",
 ]
 
 [[package]]
@@ -61,9 +68,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-literal"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
@@ -182,9 +189,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.1"
+version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
+checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
@@ -199,9 +206,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.38"
+version = "2.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
+checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -222,20 +229,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "092cd76b01a033a9965b9097da258689d9e17c69ded5dcf41bca001dd20ebc6d"
+checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a13a20a7c6a90e2034bcc65495799da92efcec6a8dd4f3fcb6f7a48988637ead"
+checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
diff --git a/contracts/feature-tests/payable-features/wasm/Cargo.toml b/contracts/feature-tests/payable-features/wasm/Cargo.toml
index 52aa8d09bb..458d6c398c 100644
--- a/contracts/feature-tests/payable-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/payable-features/wasm/Cargo.toml
@@ -1,7 +1,12 @@
+# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+
+# ##########################################
+# ############## AUTO-GENERATED #############
+# ##########################################
+
 [package]
 name = "payable-features-wasm"
 version = "0.0.0"
-authors = ["Andrei Marinica <andrei.marinica@multiversx.com>"]
 edition = "2021"
 publish = false
 
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 72302d7658..4795d07864 100644
--- a/contracts/feature-tests/rust-snippets-generator-test/wasm/Cargo.lock
+++ b/contracts/feature-tests/rust-snippets-generator-test/wasm/Cargo.lock
@@ -14,6 +14,12 @@ dependencies = [
  "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"
@@ -46,11 +52,12 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.13.2"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
  "ahash",
+ "allocator-api2",
 ]
 
 [[package]]
@@ -61,9 +68,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-literal"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
@@ -182,9 +189,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.1"
+version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
+checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
@@ -199,9 +206,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.38"
+version = "2.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
+checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -222,20 +229,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "092cd76b01a033a9965b9097da258689d9e17c69ded5dcf41bca001dd20ebc6d"
+checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a13a20a7c6a90e2034bcc65495799da92efcec6a8dd4f3fcb6f7a48988637ead"
+checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
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 f9f4e9e3b1..64bd0b12da 100644
--- a/contracts/feature-tests/rust-snippets-generator-test/wasm/Cargo.toml
+++ b/contracts/feature-tests/rust-snippets-generator-test/wasm/Cargo.toml
@@ -1,7 +1,12 @@
+# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+
+# ##########################################
+# ############## AUTO-GENERATED #############
+# ##########################################
+
 [package]
 name = "rust-snippets-generator-test-wasm"
 version = "0.0.0"
-authors = ["Dorin Marian Iancu <dorin.iancu@multiversx.com>"]
 edition = "2021"
 publish = false
 
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 0679ad2e0d..1b5d368d74 100644
--- a/contracts/feature-tests/rust-testing-framework-tester/wasm/Cargo.lock
+++ b/contracts/feature-tests/rust-testing-framework-tester/wasm/Cargo.lock
@@ -14,6 +14,12 @@ dependencies = [
  "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"
@@ -46,11 +52,12 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.13.2"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
  "ahash",
+ "allocator-api2",
 ]
 
 [[package]]
@@ -61,9 +68,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-literal"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
@@ -182,9 +189,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.1"
+version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
+checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
@@ -199,9 +206,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.38"
+version = "2.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
+checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -222,20 +229,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "092cd76b01a033a9965b9097da258689d9e17c69ded5dcf41bca001dd20ebc6d"
+checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a13a20a7c6a90e2034bcc65495799da92efcec6a8dd4f3fcb6f7a48988637ead"
+checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
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 60c36b69ba..c471da62c3 100644
--- a/contracts/feature-tests/rust-testing-framework-tester/wasm/Cargo.toml
+++ b/contracts/feature-tests/rust-testing-framework-tester/wasm/Cargo.toml
@@ -1,7 +1,12 @@
+# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+
+# ##########################################
+# ############## AUTO-GENERATED #############
+# ##########################################
+
 [package]
 name = "rust-testing-framework-tester-wasm"
 version = "0.0.0"
-authors = ["Dorin Iancu <dorin.iancu@multiversx.com>"]
 edition = "2021"
 publish = false
 
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 8e295dcc87..2bea883881 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
@@ -14,6 +14,12 @@ dependencies = [
  "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"
@@ -46,11 +52,12 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.13.2"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
  "ahash",
+ "allocator-api2",
 ]
 
 [[package]]
@@ -61,9 +68,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-literal"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
@@ -174,9 +181,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.1"
+version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
+checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
@@ -191,9 +198,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.38"
+version = "2.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
+checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -230,20 +237,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "092cd76b01a033a9965b9097da258689d9e17c69ded5dcf41bca001dd20ebc6d"
+checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a13a20a7c6a90e2034bcc65495799da92efcec6a8dd4f3fcb6f7a48988637ead"
+checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
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 6e4576f438..4f345cd3af 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
@@ -1,18 +1,25 @@
+# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+
+# ##########################################
+# ############## AUTO-GENERATED #############
+# ##########################################
+
 [package]
 name = "use-module-view-wasm"
 version = "0.0.0"
-authors = ["Andrei Marinica <andrei.marinica@multiversx.com>"]
 edition = "2021"
 publish = false
 
 [lib]
 crate-type = ["cdylib"]
+
 [profile.release]
 codegen-units = 1
 opt-level = "z"
 lto = true
 debug = false
 panic = "abort"
+
 [dependencies.use-module]
 path = ".."
 
diff --git a/contracts/feature-tests/use-module/wasm/Cargo.lock b/contracts/feature-tests/use-module/wasm/Cargo.lock
index 4233793776..c126f67ede 100644
--- a/contracts/feature-tests/use-module/wasm/Cargo.lock
+++ b/contracts/feature-tests/use-module/wasm/Cargo.lock
@@ -14,6 +14,12 @@ dependencies = [
  "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"
@@ -46,11 +52,12 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.13.2"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
  "ahash",
+ "allocator-api2",
 ]
 
 [[package]]
@@ -61,9 +68,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-literal"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
@@ -174,9 +181,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.1"
+version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
+checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
@@ -191,9 +198,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.38"
+version = "2.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
+checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -230,20 +237,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "092cd76b01a033a9965b9097da258689d9e17c69ded5dcf41bca001dd20ebc6d"
+checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.24"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a13a20a7c6a90e2034bcc65495799da92efcec6a8dd4f3fcb6f7a48988637ead"
+checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
diff --git a/contracts/feature-tests/use-module/wasm/Cargo.toml b/contracts/feature-tests/use-module/wasm/Cargo.toml
index 11167ad61a..755bd606b2 100644
--- a/contracts/feature-tests/use-module/wasm/Cargo.toml
+++ b/contracts/feature-tests/use-module/wasm/Cargo.toml
@@ -1,7 +1,12 @@
+# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+
+# ##########################################
+# ############## AUTO-GENERATED #############
+# ##########################################
+
 [package]
 name = "use-module-wasm"
 version = "0.0.0"
-authors = ["Andrei Marinica <andrei.marinica@multiversx.com>"]
 edition = "2021"
 publish = false
 
diff --git a/meta-run-all.sh b/meta-run-all.sh
index 208af3cf83..7c71e7fe6c 100755
--- a/meta-run-all.sh
+++ b/meta-run-all.sh
@@ -4,4 +4,4 @@ cargo install multiversx-sc-meta
 
 TARGET_DIR=$PWD/target
 
-sc-meta all update --path ./contracts
+sc-meta all update --target-dir-all $TARGET_DIR --path ./contracts

From c8f9f98d8daa3c95be9eaa856a6accaab0a45ac7 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 21 Nov 2023 17:54:40 +0200
Subject: [PATCH 0084/1254] re-generated wasm crates, changed auto-gen header

---
 contracts/benchmarks/large-storage/wasm/Cargo.toml              | 2 +-
 contracts/benchmarks/large-storage/wasm/src/lib.rs              | 2 +-
 contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.toml | 2 +-
 contracts/benchmarks/mappers/linked-list-repeat/wasm/src/lib.rs | 2 +-
 contracts/benchmarks/mappers/map-repeat/wasm/Cargo.toml         | 2 +-
 contracts/benchmarks/mappers/map-repeat/wasm/src/lib.rs         | 2 +-
 contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.toml       | 2 +-
 contracts/benchmarks/mappers/queue-repeat/wasm/src/lib.rs       | 2 +-
 contracts/benchmarks/mappers/set-repeat/wasm/Cargo.toml         | 2 +-
 contracts/benchmarks/mappers/set-repeat/wasm/src/lib.rs         | 2 +-
 .../benchmarks/mappers/single-value-repeat/wasm/Cargo.toml      | 2 +-
 .../benchmarks/mappers/single-value-repeat/wasm/src/lib.rs      | 2 +-
 contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.toml         | 2 +-
 contracts/benchmarks/mappers/vec-repeat/wasm/src/lib.rs         | 2 +-
 contracts/benchmarks/send-tx-repeat/wasm/Cargo.toml             | 2 +-
 contracts/benchmarks/send-tx-repeat/wasm/src/lib.rs             | 2 +-
 contracts/benchmarks/str-repeat/wasm/Cargo.toml                 | 2 +-
 contracts/benchmarks/str-repeat/wasm/src/lib.rs                 | 2 +-
 contracts/core/price-aggregator/wasm/Cargo.toml                 | 2 +-
 contracts/core/price-aggregator/wasm/src/lib.rs                 | 2 +-
 contracts/core/wegld-swap/wasm/Cargo.toml                       | 2 +-
 contracts/core/wegld-swap/wasm/src/lib.rs                       | 2 +-
 contracts/examples/adder/wasm/Cargo.toml                        | 2 +-
 contracts/examples/adder/wasm/src/lib.rs                        | 2 +-
 contracts/examples/bonding-curve-contract/wasm/Cargo.toml       | 2 +-
 contracts/examples/bonding-curve-contract/wasm/src/lib.rs       | 2 +-
 contracts/examples/check-pause/wasm/Cargo.toml                  | 2 +-
 contracts/examples/check-pause/wasm/src/lib.rs                  | 2 +-
 contracts/examples/crowdfunding-esdt/wasm/Cargo.toml            | 2 +-
 contracts/examples/crowdfunding-esdt/wasm/src/lib.rs            | 2 +-
 contracts/examples/crypto-bubbles/wasm/Cargo.toml               | 2 +-
 contracts/examples/crypto-bubbles/wasm/src/lib.rs               | 2 +-
 contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.toml | 2 +-
 contracts/examples/crypto-kitties/kitty-auction/wasm/src/lib.rs | 2 +-
 .../examples/crypto-kitties/kitty-genetic-alg/wasm/Cargo.toml   | 2 +-
 .../examples/crypto-kitties/kitty-genetic-alg/wasm/src/lib.rs   | 2 +-
 .../examples/crypto-kitties/kitty-ownership/wasm/Cargo.toml     | 2 +-
 .../examples/crypto-kitties/kitty-ownership/wasm/src/lib.rs     | 2 +-
 contracts/examples/crypto-zombies/wasm/Cargo.toml               | 2 +-
 contracts/examples/crypto-zombies/wasm/src/lib.rs               | 2 +-
 contracts/examples/digital-cash/wasm/Cargo.toml                 | 2 +-
 contracts/examples/digital-cash/wasm/src/lib.rs                 | 2 +-
 contracts/examples/empty/wasm/Cargo.toml                        | 2 +-
 contracts/examples/empty/wasm/src/lib.rs                        | 2 +-
 contracts/examples/esdt-transfer-with-fee/wasm/Cargo.toml       | 2 +-
 contracts/examples/esdt-transfer-with-fee/wasm/src/lib.rs       | 2 +-
 contracts/examples/factorial/wasm/Cargo.toml                    | 2 +-
 contracts/examples/factorial/wasm/src/lib.rs                    | 2 +-
 contracts/examples/fractional-nfts/wasm/Cargo.toml              | 2 +-
 contracts/examples/fractional-nfts/wasm/src/lib.rs              | 2 +-
 contracts/examples/lottery-esdt/wasm/Cargo.toml                 | 2 +-
 contracts/examples/lottery-esdt/wasm/src/lib.rs                 | 2 +-
 contracts/examples/multisig/wasm-multisig-full/Cargo.toml       | 2 +-
 contracts/examples/multisig/wasm-multisig-full/src/lib.rs       | 2 +-
 contracts/examples/multisig/wasm-multisig-view/Cargo.toml       | 2 +-
 contracts/examples/multisig/wasm-multisig-view/src/lib.rs       | 2 +-
 contracts/examples/multisig/wasm/Cargo.toml                     | 2 +-
 contracts/examples/multisig/wasm/src/lib.rs                     | 2 +-
 contracts/examples/nft-minter/wasm/Cargo.toml                   | 2 +-
 contracts/examples/nft-minter/wasm/src/lib.rs                   | 2 +-
 contracts/examples/nft-storage-prepay/wasm/Cargo.toml           | 2 +-
 contracts/examples/nft-storage-prepay/wasm/src/lib.rs           | 2 +-
 contracts/examples/nft-subscription/wasm/Cargo.toml             | 2 +-
 contracts/examples/nft-subscription/wasm/src/lib.rs             | 2 +-
 contracts/examples/order-book/factory/wasm/Cargo.toml           | 2 +-
 contracts/examples/order-book/factory/wasm/src/lib.rs           | 2 +-
 contracts/examples/order-book/pair/wasm/Cargo.toml              | 2 +-
 contracts/examples/order-book/pair/wasm/src/lib.rs              | 2 +-
 contracts/examples/ping-pong-egld/wasm/Cargo.toml               | 2 +-
 contracts/examples/ping-pong-egld/wasm/src/lib.rs               | 2 +-
 contracts/examples/proxy-pause/wasm/Cargo.toml                  | 2 +-
 contracts/examples/proxy-pause/wasm/src/lib.rs                  | 2 +-
 contracts/examples/rewards-distribution/wasm/Cargo.toml         | 2 +-
 contracts/examples/rewards-distribution/wasm/src/lib.rs         | 2 +-
 contracts/examples/seed-nft-minter/wasm/Cargo.toml              | 2 +-
 contracts/examples/seed-nft-minter/wasm/src/lib.rs              | 2 +-
 contracts/examples/token-release/wasm/Cargo.toml                | 2 +-
 contracts/examples/token-release/wasm/src/lib.rs                | 2 +-
 .../feature-tests/abi-tester/wasm-abi-tester-ev/Cargo.toml      | 2 +-
 .../feature-tests/abi-tester/wasm-abi-tester-ev/src/lib.rs      | 2 +-
 contracts/feature-tests/abi-tester/wasm/Cargo.toml              | 2 +-
 contracts/feature-tests/abi-tester/wasm/src/lib.rs              | 2 +-
 contracts/feature-tests/alloc-features/wasm/Cargo.toml          | 2 +-
 contracts/feature-tests/alloc-features/wasm/src/lib.rs          | 2 +-
 .../basic-features/wasm-basic-features-storage-bytes/Cargo.toml | 2 +-
 .../basic-features/wasm-basic-features-storage-bytes/src/lib.rs | 2 +-
 contracts/feature-tests/basic-features/wasm/Cargo.toml          | 2 +-
 contracts/feature-tests/basic-features/wasm/src/lib.rs          | 2 +-
 contracts/feature-tests/big-float-features/wasm/Cargo.toml      | 2 +-
 contracts/feature-tests/big-float-features/wasm/src/lib.rs      | 2 +-
 .../composability/builtin-func-features/wasm/Cargo.toml         | 2 +-
 .../composability/builtin-func-features/wasm/src/lib.rs         | 2 +-
 .../esdt-contract-pair/first-contract/wasm/Cargo.toml           | 2 +-
 .../esdt-contract-pair/first-contract/wasm/src/lib.rs           | 2 +-
 .../esdt-contract-pair/second-contract/wasm/Cargo.toml          | 2 +-
 .../esdt-contract-pair/second-contract/wasm/src/lib.rs          | 2 +-
 .../execute-on-dest-esdt-issue-callback/child/wasm/Cargo.toml   | 2 +-
 .../execute-on-dest-esdt-issue-callback/child/wasm/src/lib.rs   | 2 +-
 .../execute-on-dest-esdt-issue-callback/parent/wasm/Cargo.toml  | 2 +-
 .../execute-on-dest-esdt-issue-callback/parent/wasm/src/lib.rs  | 2 +-
 .../forwarder-queue/wasm-forwarder-queue-promises/Cargo.toml    | 2 +-
 .../forwarder-queue/wasm-forwarder-queue-promises/src/lib.rs    | 2 +-
 .../feature-tests/composability/forwarder-queue/wasm/Cargo.toml | 2 +-
 .../feature-tests/composability/forwarder-queue/wasm/src/lib.rs | 2 +-
 .../forwarder-raw/wasm-forwarder-raw-init-async-call/Cargo.toml | 2 +-
 .../forwarder-raw/wasm-forwarder-raw-init-async-call/src/lib.rs | 2 +-
 .../forwarder-raw/wasm-forwarder-raw-init-sync-call/Cargo.toml  | 2 +-
 .../forwarder-raw/wasm-forwarder-raw-init-sync-call/src/lib.rs  | 2 +-
 .../feature-tests/composability/forwarder-raw/wasm/Cargo.toml   | 2 +-
 .../feature-tests/composability/forwarder-raw/wasm/src/lib.rs   | 2 +-
 contracts/feature-tests/composability/forwarder/wasm/Cargo.toml | 2 +-
 contracts/feature-tests/composability/forwarder/wasm/src/lib.rs | 2 +-
 .../composability/local-esdt-and-nft/wasm/Cargo.toml            | 2 +-
 .../composability/local-esdt-and-nft/wasm/src/lib.rs            | 2 +-
 .../composability/promises-features/wasm/Cargo.toml             | 2 +-
 .../composability/promises-features/wasm/src/lib.rs             | 2 +-
 .../composability/proxy-test-first/wasm/Cargo.toml              | 2 +-
 .../composability/proxy-test-first/wasm/src/lib.rs              | 2 +-
 .../composability/proxy-test-second/wasm/Cargo.toml             | 2 +-
 .../composability/proxy-test-second/wasm/src/lib.rs             | 2 +-
 .../composability/recursive-caller/wasm/Cargo.toml              | 2 +-
 .../composability/recursive-caller/wasm/src/lib.rs              | 2 +-
 .../composability/transfer-role-features/wasm/Cargo.toml        | 2 +-
 .../composability/transfer-role-features/wasm/src/lib.rs        | 2 +-
 .../composability/vault/wasm-vault-promises/Cargo.toml          | 2 +-
 .../composability/vault/wasm-vault-promises/src/lib.rs          | 2 +-
 .../composability/vault/wasm-vault-upgrade/Cargo.toml           | 2 +-
 .../composability/vault/wasm-vault-upgrade/src/lib.rs           | 2 +-
 contracts/feature-tests/composability/vault/wasm/Cargo.toml     | 2 +-
 contracts/feature-tests/composability/vault/wasm/src/lib.rs     | 2 +-
 .../erc-style-contracts/crowdfunding-erc20/wasm/Cargo.toml      | 2 +-
 .../erc-style-contracts/crowdfunding-erc20/wasm/src/lib.rs      | 2 +-
 .../erc-style-contracts/erc1155-marketplace/wasm/Cargo.toml     | 2 +-
 .../erc-style-contracts/erc1155-marketplace/wasm/src/lib.rs     | 2 +-
 .../erc-style-contracts/erc1155-user-mock/wasm/Cargo.toml       | 2 +-
 .../erc-style-contracts/erc1155-user-mock/wasm/src/lib.rs       | 2 +-
 .../feature-tests/erc-style-contracts/erc1155/wasm/Cargo.toml   | 2 +-
 .../feature-tests/erc-style-contracts/erc1155/wasm/src/lib.rs   | 2 +-
 .../feature-tests/erc-style-contracts/erc20/wasm/Cargo.toml     | 2 +-
 .../feature-tests/erc-style-contracts/erc20/wasm/src/lib.rs     | 2 +-
 .../feature-tests/erc-style-contracts/erc721/wasm/Cargo.toml    | 2 +-
 .../feature-tests/erc-style-contracts/erc721/wasm/src/lib.rs    | 2 +-
 .../erc-style-contracts/lottery-erc20/wasm/Cargo.toml           | 2 +-
 .../erc-style-contracts/lottery-erc20/wasm/src/lib.rs           | 2 +-
 contracts/feature-tests/esdt-system-sc-mock/wasm/Cargo.toml     | 2 +-
 contracts/feature-tests/esdt-system-sc-mock/wasm/src/lib.rs     | 2 +-
 .../feature-tests/formatted-message-features/wasm/Cargo.toml    | 2 +-
 .../feature-tests/formatted-message-features/wasm/src/lib.rs    | 2 +-
 contracts/feature-tests/managed-map-features/wasm/Cargo.toml    | 2 +-
 contracts/feature-tests/managed-map-features/wasm/src/lib.rs    | 2 +-
 .../wasm-multi-contract-alt-impl/Cargo.toml                     | 2 +-
 .../wasm-multi-contract-alt-impl/src/lib.rs                     | 2 +-
 .../wasm-multi-contract-example-feature/Cargo.toml              | 2 +-
 .../wasm-multi-contract-example-feature/src/lib.rs              | 2 +-
 .../wasm-multi-contract-features-view/Cargo.toml                | 2 +-
 .../wasm-multi-contract-features-view/src/lib.rs                | 2 +-
 contracts/feature-tests/multi-contract-features/wasm/Cargo.toml | 2 +-
 contracts/feature-tests/multi-contract-features/wasm/src/lib.rs | 2 +-
 contracts/feature-tests/panic-message-features/wasm/Cargo.toml  | 2 +-
 contracts/feature-tests/panic-message-features/wasm/src/lib.rs  | 2 +-
 contracts/feature-tests/payable-features/wasm/Cargo.toml        | 2 +-
 contracts/feature-tests/payable-features/wasm/src/lib.rs        | 2 +-
 .../feature-tests/rust-snippets-generator-test/wasm/Cargo.toml  | 2 +-
 .../feature-tests/rust-snippets-generator-test/wasm/src/lib.rs  | 2 +-
 .../feature-tests/rust-testing-framework-tester/wasm/Cargo.toml | 2 +-
 .../feature-tests/rust-testing-framework-tester/wasm/src/lib.rs | 2 +-
 .../feature-tests/use-module/wasm-use-module-view/Cargo.toml    | 2 +-
 .../feature-tests/use-module/wasm-use-module-view/src/lib.rs    | 2 +-
 contracts/feature-tests/use-module/wasm/Cargo.toml              | 2 +-
 contracts/feature-tests/use-module/wasm/src/lib.rs              | 2 +-
 framework/meta/src/cargo_toml_contents.rs                       | 2 +-
 framework/meta/src/cmd/contract/meta_config.rs                  | 2 +-
 framework/meta/src/cmd/contract/sc_config/wasm_crate_gen.rs     | 2 +-
 173 files changed, 173 insertions(+), 173 deletions(-)

diff --git a/contracts/benchmarks/large-storage/wasm/Cargo.toml b/contracts/benchmarks/large-storage/wasm/Cargo.toml
index 80263e304b..39fe674419 100644
--- a/contracts/benchmarks/large-storage/wasm/Cargo.toml
+++ b/contracts/benchmarks/large-storage/wasm/Cargo.toml
@@ -1,4 +1,4 @@
-# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+# Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 # ##########################################
 # ############## AUTO-GENERATED #############
diff --git a/contracts/benchmarks/large-storage/wasm/src/lib.rs b/contracts/benchmarks/large-storage/wasm/src/lib.rs
index 5782040aa7..1599c5009b 100644
--- a/contracts/benchmarks/large-storage/wasm/src/lib.rs
+++ b/contracts/benchmarks/large-storage/wasm/src/lib.rs
@@ -1,4 +1,4 @@
-// Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+// Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 ////////////////////////////////////////////////////
 ////////////////// AUTO-GENERATED //////////////////
diff --git a/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.toml b/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.toml
index 9fad56175f..38b0aa1023 100644
--- a/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.toml
@@ -1,4 +1,4 @@
-# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+# Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 # ##########################################
 # ############## AUTO-GENERATED #############
diff --git a/contracts/benchmarks/mappers/linked-list-repeat/wasm/src/lib.rs b/contracts/benchmarks/mappers/linked-list-repeat/wasm/src/lib.rs
index 30a4118efc..5f1783962e 100644
--- a/contracts/benchmarks/mappers/linked-list-repeat/wasm/src/lib.rs
+++ b/contracts/benchmarks/mappers/linked-list-repeat/wasm/src/lib.rs
@@ -1,4 +1,4 @@
-// Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+// Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 ////////////////////////////////////////////////////
 ////////////////// AUTO-GENERATED //////////////////
diff --git a/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.toml b/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.toml
index 8fd41c1a8f..75cad3d406 100644
--- a/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.toml
@@ -1,4 +1,4 @@
-# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+# Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 # ##########################################
 # ############## AUTO-GENERATED #############
diff --git a/contracts/benchmarks/mappers/map-repeat/wasm/src/lib.rs b/contracts/benchmarks/mappers/map-repeat/wasm/src/lib.rs
index b846960d7a..5ea8448e8f 100644
--- a/contracts/benchmarks/mappers/map-repeat/wasm/src/lib.rs
+++ b/contracts/benchmarks/mappers/map-repeat/wasm/src/lib.rs
@@ -1,4 +1,4 @@
-// Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+// Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 ////////////////////////////////////////////////////
 ////////////////// AUTO-GENERATED //////////////////
diff --git a/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.toml b/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.toml
index 5a34cfdaf3..b459e5a361 100644
--- a/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.toml
@@ -1,4 +1,4 @@
-# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+# Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 # ##########################################
 # ############## AUTO-GENERATED #############
diff --git a/contracts/benchmarks/mappers/queue-repeat/wasm/src/lib.rs b/contracts/benchmarks/mappers/queue-repeat/wasm/src/lib.rs
index 7d199710dd..714e3860f1 100644
--- a/contracts/benchmarks/mappers/queue-repeat/wasm/src/lib.rs
+++ b/contracts/benchmarks/mappers/queue-repeat/wasm/src/lib.rs
@@ -1,4 +1,4 @@
-// Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+// Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 ////////////////////////////////////////////////////
 ////////////////// AUTO-GENERATED //////////////////
diff --git a/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.toml b/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.toml
index b5458c7a24..56e1593625 100644
--- a/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.toml
@@ -1,4 +1,4 @@
-# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+# Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 # ##########################################
 # ############## AUTO-GENERATED #############
diff --git a/contracts/benchmarks/mappers/set-repeat/wasm/src/lib.rs b/contracts/benchmarks/mappers/set-repeat/wasm/src/lib.rs
index cb8be1c156..965890c862 100644
--- a/contracts/benchmarks/mappers/set-repeat/wasm/src/lib.rs
+++ b/contracts/benchmarks/mappers/set-repeat/wasm/src/lib.rs
@@ -1,4 +1,4 @@
-// Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+// Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 ////////////////////////////////////////////////////
 ////////////////// AUTO-GENERATED //////////////////
diff --git a/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.toml b/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.toml
index a54d8bc2c1..254dd0fac1 100644
--- a/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.toml
@@ -1,4 +1,4 @@
-# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+# Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 # ##########################################
 # ############## AUTO-GENERATED #############
diff --git a/contracts/benchmarks/mappers/single-value-repeat/wasm/src/lib.rs b/contracts/benchmarks/mappers/single-value-repeat/wasm/src/lib.rs
index c95dbbcb17..34160833c4 100644
--- a/contracts/benchmarks/mappers/single-value-repeat/wasm/src/lib.rs
+++ b/contracts/benchmarks/mappers/single-value-repeat/wasm/src/lib.rs
@@ -1,4 +1,4 @@
-// Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+// Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 ////////////////////////////////////////////////////
 ////////////////// AUTO-GENERATED //////////////////
diff --git a/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.toml b/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.toml
index 18c0472717..cab07ac1bb 100644
--- a/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.toml
@@ -1,4 +1,4 @@
-# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+# Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 # ##########################################
 # ############## AUTO-GENERATED #############
diff --git a/contracts/benchmarks/mappers/vec-repeat/wasm/src/lib.rs b/contracts/benchmarks/mappers/vec-repeat/wasm/src/lib.rs
index 1fe740202a..7d94c15f2b 100644
--- a/contracts/benchmarks/mappers/vec-repeat/wasm/src/lib.rs
+++ b/contracts/benchmarks/mappers/vec-repeat/wasm/src/lib.rs
@@ -1,4 +1,4 @@
-// Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+// Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 ////////////////////////////////////////////////////
 ////////////////// AUTO-GENERATED //////////////////
diff --git a/contracts/benchmarks/send-tx-repeat/wasm/Cargo.toml b/contracts/benchmarks/send-tx-repeat/wasm/Cargo.toml
index bedcb3a6a7..3eee56019d 100644
--- a/contracts/benchmarks/send-tx-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/send-tx-repeat/wasm/Cargo.toml
@@ -1,4 +1,4 @@
-# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+# Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 # ##########################################
 # ############## AUTO-GENERATED #############
diff --git a/contracts/benchmarks/send-tx-repeat/wasm/src/lib.rs b/contracts/benchmarks/send-tx-repeat/wasm/src/lib.rs
index 90b851fadd..6d447b6d11 100644
--- a/contracts/benchmarks/send-tx-repeat/wasm/src/lib.rs
+++ b/contracts/benchmarks/send-tx-repeat/wasm/src/lib.rs
@@ -1,4 +1,4 @@
-// Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+// Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 ////////////////////////////////////////////////////
 ////////////////// AUTO-GENERATED //////////////////
diff --git a/contracts/benchmarks/str-repeat/wasm/Cargo.toml b/contracts/benchmarks/str-repeat/wasm/Cargo.toml
index 8b67072ba8..059f79cd38 100644
--- a/contracts/benchmarks/str-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/str-repeat/wasm/Cargo.toml
@@ -1,4 +1,4 @@
-# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+# Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 # ##########################################
 # ############## AUTO-GENERATED #############
diff --git a/contracts/benchmarks/str-repeat/wasm/src/lib.rs b/contracts/benchmarks/str-repeat/wasm/src/lib.rs
index a1575e69aa..894a1bc4c0 100644
--- a/contracts/benchmarks/str-repeat/wasm/src/lib.rs
+++ b/contracts/benchmarks/str-repeat/wasm/src/lib.rs
@@ -1,4 +1,4 @@
-// Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+// Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 ////////////////////////////////////////////////////
 ////////////////// AUTO-GENERATED //////////////////
diff --git a/contracts/core/price-aggregator/wasm/Cargo.toml b/contracts/core/price-aggregator/wasm/Cargo.toml
index 20b3cd22a5..77eb6548b2 100644
--- a/contracts/core/price-aggregator/wasm/Cargo.toml
+++ b/contracts/core/price-aggregator/wasm/Cargo.toml
@@ -1,4 +1,4 @@
-# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+# Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 # ##########################################
 # ############## AUTO-GENERATED #############
diff --git a/contracts/core/price-aggregator/wasm/src/lib.rs b/contracts/core/price-aggregator/wasm/src/lib.rs
index 9dbe38b27d..8a56e7dbec 100644
--- a/contracts/core/price-aggregator/wasm/src/lib.rs
+++ b/contracts/core/price-aggregator/wasm/src/lib.rs
@@ -1,4 +1,4 @@
-// Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+// Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 ////////////////////////////////////////////////////
 ////////////////// AUTO-GENERATED //////////////////
diff --git a/contracts/core/wegld-swap/wasm/Cargo.toml b/contracts/core/wegld-swap/wasm/Cargo.toml
index b5852e8f24..72ff8087a7 100644
--- a/contracts/core/wegld-swap/wasm/Cargo.toml
+++ b/contracts/core/wegld-swap/wasm/Cargo.toml
@@ -1,4 +1,4 @@
-# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+# Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 # ##########################################
 # ############## AUTO-GENERATED #############
diff --git a/contracts/core/wegld-swap/wasm/src/lib.rs b/contracts/core/wegld-swap/wasm/src/lib.rs
index 8da5946179..76a43a0227 100644
--- a/contracts/core/wegld-swap/wasm/src/lib.rs
+++ b/contracts/core/wegld-swap/wasm/src/lib.rs
@@ -1,4 +1,4 @@
-// Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+// Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 ////////////////////////////////////////////////////
 ////////////////// AUTO-GENERATED //////////////////
diff --git a/contracts/examples/adder/wasm/Cargo.toml b/contracts/examples/adder/wasm/Cargo.toml
index d53dd7a061..c5f71868dc 100644
--- a/contracts/examples/adder/wasm/Cargo.toml
+++ b/contracts/examples/adder/wasm/Cargo.toml
@@ -1,4 +1,4 @@
-# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+# Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 # ##########################################
 # ############## AUTO-GENERATED #############
diff --git a/contracts/examples/adder/wasm/src/lib.rs b/contracts/examples/adder/wasm/src/lib.rs
index 88d42d6996..b364edf422 100644
--- a/contracts/examples/adder/wasm/src/lib.rs
+++ b/contracts/examples/adder/wasm/src/lib.rs
@@ -1,4 +1,4 @@
-// Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+// Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 ////////////////////////////////////////////////////
 ////////////////// AUTO-GENERATED //////////////////
diff --git a/contracts/examples/bonding-curve-contract/wasm/Cargo.toml b/contracts/examples/bonding-curve-contract/wasm/Cargo.toml
index bb6994fd31..d0b9c94e21 100644
--- a/contracts/examples/bonding-curve-contract/wasm/Cargo.toml
+++ b/contracts/examples/bonding-curve-contract/wasm/Cargo.toml
@@ -1,4 +1,4 @@
-# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+# Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 # ##########################################
 # ############## AUTO-GENERATED #############
diff --git a/contracts/examples/bonding-curve-contract/wasm/src/lib.rs b/contracts/examples/bonding-curve-contract/wasm/src/lib.rs
index c2e6df3377..31976155e8 100644
--- a/contracts/examples/bonding-curve-contract/wasm/src/lib.rs
+++ b/contracts/examples/bonding-curve-contract/wasm/src/lib.rs
@@ -1,4 +1,4 @@
-// Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+// Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 ////////////////////////////////////////////////////
 ////////////////// AUTO-GENERATED //////////////////
diff --git a/contracts/examples/check-pause/wasm/Cargo.toml b/contracts/examples/check-pause/wasm/Cargo.toml
index c43bd0c650..397cb79332 100644
--- a/contracts/examples/check-pause/wasm/Cargo.toml
+++ b/contracts/examples/check-pause/wasm/Cargo.toml
@@ -1,4 +1,4 @@
-# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+# Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 # ##########################################
 # ############## AUTO-GENERATED #############
diff --git a/contracts/examples/check-pause/wasm/src/lib.rs b/contracts/examples/check-pause/wasm/src/lib.rs
index 5ce44c370a..b3f3bdda8f 100644
--- a/contracts/examples/check-pause/wasm/src/lib.rs
+++ b/contracts/examples/check-pause/wasm/src/lib.rs
@@ -1,4 +1,4 @@
-// Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+// Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 ////////////////////////////////////////////////////
 ////////////////// AUTO-GENERATED //////////////////
diff --git a/contracts/examples/crowdfunding-esdt/wasm/Cargo.toml b/contracts/examples/crowdfunding-esdt/wasm/Cargo.toml
index 6e81a154e9..e87cbd66bb 100644
--- a/contracts/examples/crowdfunding-esdt/wasm/Cargo.toml
+++ b/contracts/examples/crowdfunding-esdt/wasm/Cargo.toml
@@ -1,4 +1,4 @@
-# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+# Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 # ##########################################
 # ############## AUTO-GENERATED #############
diff --git a/contracts/examples/crowdfunding-esdt/wasm/src/lib.rs b/contracts/examples/crowdfunding-esdt/wasm/src/lib.rs
index 44468e838e..192f0dfcd0 100644
--- a/contracts/examples/crowdfunding-esdt/wasm/src/lib.rs
+++ b/contracts/examples/crowdfunding-esdt/wasm/src/lib.rs
@@ -1,4 +1,4 @@
-// Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+// Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 ////////////////////////////////////////////////////
 ////////////////// AUTO-GENERATED //////////////////
diff --git a/contracts/examples/crypto-bubbles/wasm/Cargo.toml b/contracts/examples/crypto-bubbles/wasm/Cargo.toml
index c585ee07de..29ec806dda 100644
--- a/contracts/examples/crypto-bubbles/wasm/Cargo.toml
+++ b/contracts/examples/crypto-bubbles/wasm/Cargo.toml
@@ -1,4 +1,4 @@
-# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+# Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 # ##########################################
 # ############## AUTO-GENERATED #############
diff --git a/contracts/examples/crypto-bubbles/wasm/src/lib.rs b/contracts/examples/crypto-bubbles/wasm/src/lib.rs
index addf606a0a..842f0092af 100644
--- a/contracts/examples/crypto-bubbles/wasm/src/lib.rs
+++ b/contracts/examples/crypto-bubbles/wasm/src/lib.rs
@@ -1,4 +1,4 @@
-// Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+// Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 ////////////////////////////////////////////////////
 ////////////////// AUTO-GENERATED //////////////////
diff --git a/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.toml b/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.toml
index bbae5a5117..2f85102357 100644
--- a/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.toml
+++ b/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.toml
@@ -1,4 +1,4 @@
-# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+# Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 # ##########################################
 # ############## AUTO-GENERATED #############
diff --git a/contracts/examples/crypto-kitties/kitty-auction/wasm/src/lib.rs b/contracts/examples/crypto-kitties/kitty-auction/wasm/src/lib.rs
index d4dc345a46..d8a28c4c3a 100644
--- a/contracts/examples/crypto-kitties/kitty-auction/wasm/src/lib.rs
+++ b/contracts/examples/crypto-kitties/kitty-auction/wasm/src/lib.rs
@@ -1,4 +1,4 @@
-// Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+// Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 ////////////////////////////////////////////////////
 ////////////////// AUTO-GENERATED //////////////////
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 2659ed3926..0dc2490bb4 100644
--- a/contracts/examples/crypto-kitties/kitty-genetic-alg/wasm/Cargo.toml
+++ b/contracts/examples/crypto-kitties/kitty-genetic-alg/wasm/Cargo.toml
@@ -1,4 +1,4 @@
-# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+# Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 # ##########################################
 # ############## AUTO-GENERATED #############
diff --git a/contracts/examples/crypto-kitties/kitty-genetic-alg/wasm/src/lib.rs b/contracts/examples/crypto-kitties/kitty-genetic-alg/wasm/src/lib.rs
index 8f754d1cb5..b089f24620 100644
--- a/contracts/examples/crypto-kitties/kitty-genetic-alg/wasm/src/lib.rs
+++ b/contracts/examples/crypto-kitties/kitty-genetic-alg/wasm/src/lib.rs
@@ -1,4 +1,4 @@
-// Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+// Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 ////////////////////////////////////////////////////
 ////////////////// AUTO-GENERATED //////////////////
diff --git a/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.toml b/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.toml
index 257feee3f5..6e533f972d 100644
--- a/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.toml
+++ b/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.toml
@@ -1,4 +1,4 @@
-# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+# Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 # ##########################################
 # ############## AUTO-GENERATED #############
diff --git a/contracts/examples/crypto-kitties/kitty-ownership/wasm/src/lib.rs b/contracts/examples/crypto-kitties/kitty-ownership/wasm/src/lib.rs
index f739b7ee7c..d698271174 100644
--- a/contracts/examples/crypto-kitties/kitty-ownership/wasm/src/lib.rs
+++ b/contracts/examples/crypto-kitties/kitty-ownership/wasm/src/lib.rs
@@ -1,4 +1,4 @@
-// Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+// Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 ////////////////////////////////////////////////////
 ////////////////// AUTO-GENERATED //////////////////
diff --git a/contracts/examples/crypto-zombies/wasm/Cargo.toml b/contracts/examples/crypto-zombies/wasm/Cargo.toml
index 310ed278ea..53f45039e9 100644
--- a/contracts/examples/crypto-zombies/wasm/Cargo.toml
+++ b/contracts/examples/crypto-zombies/wasm/Cargo.toml
@@ -1,4 +1,4 @@
-# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+# Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 # ##########################################
 # ############## AUTO-GENERATED #############
diff --git a/contracts/examples/crypto-zombies/wasm/src/lib.rs b/contracts/examples/crypto-zombies/wasm/src/lib.rs
index b6dcbb65cf..c83aa5cca9 100644
--- a/contracts/examples/crypto-zombies/wasm/src/lib.rs
+++ b/contracts/examples/crypto-zombies/wasm/src/lib.rs
@@ -1,4 +1,4 @@
-// Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+// Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 ////////////////////////////////////////////////////
 ////////////////// AUTO-GENERATED //////////////////
diff --git a/contracts/examples/digital-cash/wasm/Cargo.toml b/contracts/examples/digital-cash/wasm/Cargo.toml
index 291bc362e0..adea4827e3 100644
--- a/contracts/examples/digital-cash/wasm/Cargo.toml
+++ b/contracts/examples/digital-cash/wasm/Cargo.toml
@@ -1,4 +1,4 @@
-# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+# Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 # ##########################################
 # ############## AUTO-GENERATED #############
diff --git a/contracts/examples/digital-cash/wasm/src/lib.rs b/contracts/examples/digital-cash/wasm/src/lib.rs
index 4225446734..1a6a435519 100644
--- a/contracts/examples/digital-cash/wasm/src/lib.rs
+++ b/contracts/examples/digital-cash/wasm/src/lib.rs
@@ -1,4 +1,4 @@
-// Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+// Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 ////////////////////////////////////////////////////
 ////////////////// AUTO-GENERATED //////////////////
diff --git a/contracts/examples/empty/wasm/Cargo.toml b/contracts/examples/empty/wasm/Cargo.toml
index 8504843376..b02f42b8e2 100644
--- a/contracts/examples/empty/wasm/Cargo.toml
+++ b/contracts/examples/empty/wasm/Cargo.toml
@@ -1,4 +1,4 @@
-# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+# Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 # ##########################################
 # ############## AUTO-GENERATED #############
diff --git a/contracts/examples/empty/wasm/src/lib.rs b/contracts/examples/empty/wasm/src/lib.rs
index 0f1e581eab..1988bb325d 100644
--- a/contracts/examples/empty/wasm/src/lib.rs
+++ b/contracts/examples/empty/wasm/src/lib.rs
@@ -1,4 +1,4 @@
-// Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+// Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 ////////////////////////////////////////////////////
 ////////////////// AUTO-GENERATED //////////////////
diff --git a/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.toml b/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.toml
index 00d12c4a42..ebea9abc1a 100644
--- a/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.toml
+++ b/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.toml
@@ -1,4 +1,4 @@
-# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+# Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 # ##########################################
 # ############## AUTO-GENERATED #############
diff --git a/contracts/examples/esdt-transfer-with-fee/wasm/src/lib.rs b/contracts/examples/esdt-transfer-with-fee/wasm/src/lib.rs
index 62d43c3c4f..a62fe60def 100644
--- a/contracts/examples/esdt-transfer-with-fee/wasm/src/lib.rs
+++ b/contracts/examples/esdt-transfer-with-fee/wasm/src/lib.rs
@@ -1,4 +1,4 @@
-// Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+// Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 ////////////////////////////////////////////////////
 ////////////////// AUTO-GENERATED //////////////////
diff --git a/contracts/examples/factorial/wasm/Cargo.toml b/contracts/examples/factorial/wasm/Cargo.toml
index 07782aa316..fdb5facbab 100644
--- a/contracts/examples/factorial/wasm/Cargo.toml
+++ b/contracts/examples/factorial/wasm/Cargo.toml
@@ -1,4 +1,4 @@
-# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+# Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 # ##########################################
 # ############## AUTO-GENERATED #############
diff --git a/contracts/examples/factorial/wasm/src/lib.rs b/contracts/examples/factorial/wasm/src/lib.rs
index 9f564de44b..4457ad1258 100644
--- a/contracts/examples/factorial/wasm/src/lib.rs
+++ b/contracts/examples/factorial/wasm/src/lib.rs
@@ -1,4 +1,4 @@
-// Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+// Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 ////////////////////////////////////////////////////
 ////////////////// AUTO-GENERATED //////////////////
diff --git a/contracts/examples/fractional-nfts/wasm/Cargo.toml b/contracts/examples/fractional-nfts/wasm/Cargo.toml
index ae911d2867..0b7edf6875 100644
--- a/contracts/examples/fractional-nfts/wasm/Cargo.toml
+++ b/contracts/examples/fractional-nfts/wasm/Cargo.toml
@@ -1,4 +1,4 @@
-# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+# Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 # ##########################################
 # ############## AUTO-GENERATED #############
diff --git a/contracts/examples/fractional-nfts/wasm/src/lib.rs b/contracts/examples/fractional-nfts/wasm/src/lib.rs
index 59e4a11f68..cab5796d1f 100644
--- a/contracts/examples/fractional-nfts/wasm/src/lib.rs
+++ b/contracts/examples/fractional-nfts/wasm/src/lib.rs
@@ -1,4 +1,4 @@
-// Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+// Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 ////////////////////////////////////////////////////
 ////////////////// AUTO-GENERATED //////////////////
diff --git a/contracts/examples/lottery-esdt/wasm/Cargo.toml b/contracts/examples/lottery-esdt/wasm/Cargo.toml
index 00c372cdb0..3f410a41b1 100644
--- a/contracts/examples/lottery-esdt/wasm/Cargo.toml
+++ b/contracts/examples/lottery-esdt/wasm/Cargo.toml
@@ -1,4 +1,4 @@
-# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+# Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 # ##########################################
 # ############## AUTO-GENERATED #############
diff --git a/contracts/examples/lottery-esdt/wasm/src/lib.rs b/contracts/examples/lottery-esdt/wasm/src/lib.rs
index 9e429a0c02..c4e5cc293a 100644
--- a/contracts/examples/lottery-esdt/wasm/src/lib.rs
+++ b/contracts/examples/lottery-esdt/wasm/src/lib.rs
@@ -1,4 +1,4 @@
-// Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+// Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 ////////////////////////////////////////////////////
 ////////////////// AUTO-GENERATED //////////////////
diff --git a/contracts/examples/multisig/wasm-multisig-full/Cargo.toml b/contracts/examples/multisig/wasm-multisig-full/Cargo.toml
index 7a42c9ae93..ab555f6672 100644
--- a/contracts/examples/multisig/wasm-multisig-full/Cargo.toml
+++ b/contracts/examples/multisig/wasm-multisig-full/Cargo.toml
@@ -1,4 +1,4 @@
-# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+# Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 # ##########################################
 # ############## AUTO-GENERATED #############
diff --git a/contracts/examples/multisig/wasm-multisig-full/src/lib.rs b/contracts/examples/multisig/wasm-multisig-full/src/lib.rs
index 5f7be5f3e5..0b0b4dda44 100644
--- a/contracts/examples/multisig/wasm-multisig-full/src/lib.rs
+++ b/contracts/examples/multisig/wasm-multisig-full/src/lib.rs
@@ -1,4 +1,4 @@
-// Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+// Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 ////////////////////////////////////////////////////
 ////////////////// AUTO-GENERATED //////////////////
diff --git a/contracts/examples/multisig/wasm-multisig-view/Cargo.toml b/contracts/examples/multisig/wasm-multisig-view/Cargo.toml
index 405b3e2a43..1f9cbad7ae 100644
--- a/contracts/examples/multisig/wasm-multisig-view/Cargo.toml
+++ b/contracts/examples/multisig/wasm-multisig-view/Cargo.toml
@@ -1,4 +1,4 @@
-# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+# Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 # ##########################################
 # ############## AUTO-GENERATED #############
diff --git a/contracts/examples/multisig/wasm-multisig-view/src/lib.rs b/contracts/examples/multisig/wasm-multisig-view/src/lib.rs
index baa4919742..10f8c64ee8 100644
--- a/contracts/examples/multisig/wasm-multisig-view/src/lib.rs
+++ b/contracts/examples/multisig/wasm-multisig-view/src/lib.rs
@@ -1,4 +1,4 @@
-// Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+// Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 ////////////////////////////////////////////////////
 ////////////////// AUTO-GENERATED //////////////////
diff --git a/contracts/examples/multisig/wasm/Cargo.toml b/contracts/examples/multisig/wasm/Cargo.toml
index 8d7b6a2f7c..fb06b58761 100644
--- a/contracts/examples/multisig/wasm/Cargo.toml
+++ b/contracts/examples/multisig/wasm/Cargo.toml
@@ -1,4 +1,4 @@
-# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+# Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 # ##########################################
 # ############## AUTO-GENERATED #############
diff --git a/contracts/examples/multisig/wasm/src/lib.rs b/contracts/examples/multisig/wasm/src/lib.rs
index 6b8766c013..ab2e3bbf14 100644
--- a/contracts/examples/multisig/wasm/src/lib.rs
+++ b/contracts/examples/multisig/wasm/src/lib.rs
@@ -1,4 +1,4 @@
-// Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+// Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 ////////////////////////////////////////////////////
 ////////////////// AUTO-GENERATED //////////////////
diff --git a/contracts/examples/nft-minter/wasm/Cargo.toml b/contracts/examples/nft-minter/wasm/Cargo.toml
index ae4b732af0..418f30a3ae 100644
--- a/contracts/examples/nft-minter/wasm/Cargo.toml
+++ b/contracts/examples/nft-minter/wasm/Cargo.toml
@@ -1,4 +1,4 @@
-# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+# Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 # ##########################################
 # ############## AUTO-GENERATED #############
diff --git a/contracts/examples/nft-minter/wasm/src/lib.rs b/contracts/examples/nft-minter/wasm/src/lib.rs
index 97063eb7a4..af2dcacef7 100644
--- a/contracts/examples/nft-minter/wasm/src/lib.rs
+++ b/contracts/examples/nft-minter/wasm/src/lib.rs
@@ -1,4 +1,4 @@
-// Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+// Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 ////////////////////////////////////////////////////
 ////////////////// AUTO-GENERATED //////////////////
diff --git a/contracts/examples/nft-storage-prepay/wasm/Cargo.toml b/contracts/examples/nft-storage-prepay/wasm/Cargo.toml
index fdb3d3f7f1..60fe73c2b0 100644
--- a/contracts/examples/nft-storage-prepay/wasm/Cargo.toml
+++ b/contracts/examples/nft-storage-prepay/wasm/Cargo.toml
@@ -1,4 +1,4 @@
-# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+# Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 # ##########################################
 # ############## AUTO-GENERATED #############
diff --git a/contracts/examples/nft-storage-prepay/wasm/src/lib.rs b/contracts/examples/nft-storage-prepay/wasm/src/lib.rs
index 6541f8b937..fc5bf5f24e 100644
--- a/contracts/examples/nft-storage-prepay/wasm/src/lib.rs
+++ b/contracts/examples/nft-storage-prepay/wasm/src/lib.rs
@@ -1,4 +1,4 @@
-// Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+// Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 ////////////////////////////////////////////////////
 ////////////////// AUTO-GENERATED //////////////////
diff --git a/contracts/examples/nft-subscription/wasm/Cargo.toml b/contracts/examples/nft-subscription/wasm/Cargo.toml
index 2db05caeac..786ebd45cb 100644
--- a/contracts/examples/nft-subscription/wasm/Cargo.toml
+++ b/contracts/examples/nft-subscription/wasm/Cargo.toml
@@ -1,4 +1,4 @@
-# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+# Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 # ##########################################
 # ############## AUTO-GENERATED #############
diff --git a/contracts/examples/nft-subscription/wasm/src/lib.rs b/contracts/examples/nft-subscription/wasm/src/lib.rs
index 76a79ce530..d6f5f32326 100644
--- a/contracts/examples/nft-subscription/wasm/src/lib.rs
+++ b/contracts/examples/nft-subscription/wasm/src/lib.rs
@@ -1,4 +1,4 @@
-// Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+// Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 ////////////////////////////////////////////////////
 ////////////////// AUTO-GENERATED //////////////////
diff --git a/contracts/examples/order-book/factory/wasm/Cargo.toml b/contracts/examples/order-book/factory/wasm/Cargo.toml
index f64497820e..7305c668b3 100644
--- a/contracts/examples/order-book/factory/wasm/Cargo.toml
+++ b/contracts/examples/order-book/factory/wasm/Cargo.toml
@@ -1,4 +1,4 @@
-# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+# Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 # ##########################################
 # ############## AUTO-GENERATED #############
diff --git a/contracts/examples/order-book/factory/wasm/src/lib.rs b/contracts/examples/order-book/factory/wasm/src/lib.rs
index 58288a47cc..f461820c6d 100644
--- a/contracts/examples/order-book/factory/wasm/src/lib.rs
+++ b/contracts/examples/order-book/factory/wasm/src/lib.rs
@@ -1,4 +1,4 @@
-// Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+// Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 ////////////////////////////////////////////////////
 ////////////////// AUTO-GENERATED //////////////////
diff --git a/contracts/examples/order-book/pair/wasm/Cargo.toml b/contracts/examples/order-book/pair/wasm/Cargo.toml
index 8aa9771c35..29e6074e5b 100644
--- a/contracts/examples/order-book/pair/wasm/Cargo.toml
+++ b/contracts/examples/order-book/pair/wasm/Cargo.toml
@@ -1,4 +1,4 @@
-# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+# Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 # ##########################################
 # ############## AUTO-GENERATED #############
diff --git a/contracts/examples/order-book/pair/wasm/src/lib.rs b/contracts/examples/order-book/pair/wasm/src/lib.rs
index 4342227175..3d808da449 100644
--- a/contracts/examples/order-book/pair/wasm/src/lib.rs
+++ b/contracts/examples/order-book/pair/wasm/src/lib.rs
@@ -1,4 +1,4 @@
-// Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+// Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 ////////////////////////////////////////////////////
 ////////////////// AUTO-GENERATED //////////////////
diff --git a/contracts/examples/ping-pong-egld/wasm/Cargo.toml b/contracts/examples/ping-pong-egld/wasm/Cargo.toml
index 55945000d6..60191b4636 100644
--- a/contracts/examples/ping-pong-egld/wasm/Cargo.toml
+++ b/contracts/examples/ping-pong-egld/wasm/Cargo.toml
@@ -1,4 +1,4 @@
-# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+# Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 # ##########################################
 # ############## AUTO-GENERATED #############
diff --git a/contracts/examples/ping-pong-egld/wasm/src/lib.rs b/contracts/examples/ping-pong-egld/wasm/src/lib.rs
index fffb64cbed..1f037d7fb9 100644
--- a/contracts/examples/ping-pong-egld/wasm/src/lib.rs
+++ b/contracts/examples/ping-pong-egld/wasm/src/lib.rs
@@ -1,4 +1,4 @@
-// Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+// Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 ////////////////////////////////////////////////////
 ////////////////// AUTO-GENERATED //////////////////
diff --git a/contracts/examples/proxy-pause/wasm/Cargo.toml b/contracts/examples/proxy-pause/wasm/Cargo.toml
index 528afa412e..8115bed9bc 100644
--- a/contracts/examples/proxy-pause/wasm/Cargo.toml
+++ b/contracts/examples/proxy-pause/wasm/Cargo.toml
@@ -1,4 +1,4 @@
-# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+# Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 # ##########################################
 # ############## AUTO-GENERATED #############
diff --git a/contracts/examples/proxy-pause/wasm/src/lib.rs b/contracts/examples/proxy-pause/wasm/src/lib.rs
index 74694867b2..1b7e037f97 100644
--- a/contracts/examples/proxy-pause/wasm/src/lib.rs
+++ b/contracts/examples/proxy-pause/wasm/src/lib.rs
@@ -1,4 +1,4 @@
-// Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+// Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 ////////////////////////////////////////////////////
 ////////////////// AUTO-GENERATED //////////////////
diff --git a/contracts/examples/rewards-distribution/wasm/Cargo.toml b/contracts/examples/rewards-distribution/wasm/Cargo.toml
index 60375aba0c..e551af4861 100644
--- a/contracts/examples/rewards-distribution/wasm/Cargo.toml
+++ b/contracts/examples/rewards-distribution/wasm/Cargo.toml
@@ -1,4 +1,4 @@
-# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+# Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 # ##########################################
 # ############## AUTO-GENERATED #############
diff --git a/contracts/examples/rewards-distribution/wasm/src/lib.rs b/contracts/examples/rewards-distribution/wasm/src/lib.rs
index c5ad2e090a..e570679594 100644
--- a/contracts/examples/rewards-distribution/wasm/src/lib.rs
+++ b/contracts/examples/rewards-distribution/wasm/src/lib.rs
@@ -1,4 +1,4 @@
-// Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+// Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 ////////////////////////////////////////////////////
 ////////////////// AUTO-GENERATED //////////////////
diff --git a/contracts/examples/seed-nft-minter/wasm/Cargo.toml b/contracts/examples/seed-nft-minter/wasm/Cargo.toml
index 504d90d97b..5b1b2cbcc1 100644
--- a/contracts/examples/seed-nft-minter/wasm/Cargo.toml
+++ b/contracts/examples/seed-nft-minter/wasm/Cargo.toml
@@ -1,4 +1,4 @@
-# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+# Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 # ##########################################
 # ############## AUTO-GENERATED #############
diff --git a/contracts/examples/seed-nft-minter/wasm/src/lib.rs b/contracts/examples/seed-nft-minter/wasm/src/lib.rs
index 4388b47b97..91faa4e839 100644
--- a/contracts/examples/seed-nft-minter/wasm/src/lib.rs
+++ b/contracts/examples/seed-nft-minter/wasm/src/lib.rs
@@ -1,4 +1,4 @@
-// Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+// Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 ////////////////////////////////////////////////////
 ////////////////// AUTO-GENERATED //////////////////
diff --git a/contracts/examples/token-release/wasm/Cargo.toml b/contracts/examples/token-release/wasm/Cargo.toml
index 64a17a6d98..d273fa664c 100644
--- a/contracts/examples/token-release/wasm/Cargo.toml
+++ b/contracts/examples/token-release/wasm/Cargo.toml
@@ -1,4 +1,4 @@
-# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+# Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 # ##########################################
 # ############## AUTO-GENERATED #############
diff --git a/contracts/examples/token-release/wasm/src/lib.rs b/contracts/examples/token-release/wasm/src/lib.rs
index 0e526c756c..85cfee011b 100644
--- a/contracts/examples/token-release/wasm/src/lib.rs
+++ b/contracts/examples/token-release/wasm/src/lib.rs
@@ -1,4 +1,4 @@
-// Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+// Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 ////////////////////////////////////////////////////
 ////////////////// AUTO-GENERATED //////////////////
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 69e4adb5ea..c1c96410be 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
@@ -1,4 +1,4 @@
-# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+# Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 # ##########################################
 # ############## AUTO-GENERATED #############
diff --git a/contracts/feature-tests/abi-tester/wasm-abi-tester-ev/src/lib.rs b/contracts/feature-tests/abi-tester/wasm-abi-tester-ev/src/lib.rs
index 18c772a83b..885e0856c6 100644
--- a/contracts/feature-tests/abi-tester/wasm-abi-tester-ev/src/lib.rs
+++ b/contracts/feature-tests/abi-tester/wasm-abi-tester-ev/src/lib.rs
@@ -1,4 +1,4 @@
-// Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+// Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 ////////////////////////////////////////////////////
 ////////////////// AUTO-GENERATED //////////////////
diff --git a/contracts/feature-tests/abi-tester/wasm/Cargo.toml b/contracts/feature-tests/abi-tester/wasm/Cargo.toml
index 8fa9cea032..0d9cd765c7 100644
--- a/contracts/feature-tests/abi-tester/wasm/Cargo.toml
+++ b/contracts/feature-tests/abi-tester/wasm/Cargo.toml
@@ -1,4 +1,4 @@
-# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+# Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 # ##########################################
 # ############## AUTO-GENERATED #############
diff --git a/contracts/feature-tests/abi-tester/wasm/src/lib.rs b/contracts/feature-tests/abi-tester/wasm/src/lib.rs
index 346df34aef..2aae446649 100644
--- a/contracts/feature-tests/abi-tester/wasm/src/lib.rs
+++ b/contracts/feature-tests/abi-tester/wasm/src/lib.rs
@@ -1,4 +1,4 @@
-// Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+// Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 ////////////////////////////////////////////////////
 ////////////////// AUTO-GENERATED //////////////////
diff --git a/contracts/feature-tests/alloc-features/wasm/Cargo.toml b/contracts/feature-tests/alloc-features/wasm/Cargo.toml
index 15654c84b6..7a3f4247b4 100644
--- a/contracts/feature-tests/alloc-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/alloc-features/wasm/Cargo.toml
@@ -1,4 +1,4 @@
-# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+# Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 # ##########################################
 # ############## AUTO-GENERATED #############
diff --git a/contracts/feature-tests/alloc-features/wasm/src/lib.rs b/contracts/feature-tests/alloc-features/wasm/src/lib.rs
index b9a70a4985..d94121084e 100644
--- a/contracts/feature-tests/alloc-features/wasm/src/lib.rs
+++ b/contracts/feature-tests/alloc-features/wasm/src/lib.rs
@@ -1,4 +1,4 @@
-// Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+// Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 ////////////////////////////////////////////////////
 ////////////////// AUTO-GENERATED //////////////////
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 173ced3945..c3bce1465f 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
@@ -1,4 +1,4 @@
-# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+# Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 # ##########################################
 # ############## AUTO-GENERATED #############
diff --git a/contracts/feature-tests/basic-features/wasm-basic-features-storage-bytes/src/lib.rs b/contracts/feature-tests/basic-features/wasm-basic-features-storage-bytes/src/lib.rs
index 9524057356..2e747a0fd4 100644
--- a/contracts/feature-tests/basic-features/wasm-basic-features-storage-bytes/src/lib.rs
+++ b/contracts/feature-tests/basic-features/wasm-basic-features-storage-bytes/src/lib.rs
@@ -1,4 +1,4 @@
-// Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+// Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 ////////////////////////////////////////////////////
 ////////////////// AUTO-GENERATED //////////////////
diff --git a/contracts/feature-tests/basic-features/wasm/Cargo.toml b/contracts/feature-tests/basic-features/wasm/Cargo.toml
index 828889d167..b6d82662bd 100644
--- a/contracts/feature-tests/basic-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/basic-features/wasm/Cargo.toml
@@ -1,4 +1,4 @@
-# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+# Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 # ##########################################
 # ############## AUTO-GENERATED #############
diff --git a/contracts/feature-tests/basic-features/wasm/src/lib.rs b/contracts/feature-tests/basic-features/wasm/src/lib.rs
index f097c6893f..16f16a8942 100644
--- a/contracts/feature-tests/basic-features/wasm/src/lib.rs
+++ b/contracts/feature-tests/basic-features/wasm/src/lib.rs
@@ -1,4 +1,4 @@
-// Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+// Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 ////////////////////////////////////////////////////
 ////////////////// AUTO-GENERATED //////////////////
diff --git a/contracts/feature-tests/big-float-features/wasm/Cargo.toml b/contracts/feature-tests/big-float-features/wasm/Cargo.toml
index 13771460a5..dd694d97d1 100644
--- a/contracts/feature-tests/big-float-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/big-float-features/wasm/Cargo.toml
@@ -1,4 +1,4 @@
-# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+# Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 # ##########################################
 # ############## AUTO-GENERATED #############
diff --git a/contracts/feature-tests/big-float-features/wasm/src/lib.rs b/contracts/feature-tests/big-float-features/wasm/src/lib.rs
index 1a809830a3..27657bc700 100644
--- a/contracts/feature-tests/big-float-features/wasm/src/lib.rs
+++ b/contracts/feature-tests/big-float-features/wasm/src/lib.rs
@@ -1,4 +1,4 @@
-// Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+// Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 ////////////////////////////////////////////////////
 ////////////////// AUTO-GENERATED //////////////////
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 14c6141370..807c270bdb 100644
--- a/contracts/feature-tests/composability/builtin-func-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/builtin-func-features/wasm/Cargo.toml
@@ -1,4 +1,4 @@
-# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+# Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 # ##########################################
 # ############## AUTO-GENERATED #############
diff --git a/contracts/feature-tests/composability/builtin-func-features/wasm/src/lib.rs b/contracts/feature-tests/composability/builtin-func-features/wasm/src/lib.rs
index 0e3168c02b..2594606e6f 100644
--- a/contracts/feature-tests/composability/builtin-func-features/wasm/src/lib.rs
+++ b/contracts/feature-tests/composability/builtin-func-features/wasm/src/lib.rs
@@ -1,4 +1,4 @@
-// Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+// Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 ////////////////////////////////////////////////////
 ////////////////// AUTO-GENERATED //////////////////
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 2db6a9a553..91737443a1 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
@@ -1,4 +1,4 @@
-# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+# Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 # ##########################################
 # ############## AUTO-GENERATED #############
diff --git a/contracts/feature-tests/composability/esdt-contract-pair/first-contract/wasm/src/lib.rs b/contracts/feature-tests/composability/esdt-contract-pair/first-contract/wasm/src/lib.rs
index 2d8aa35543..aa788dc33e 100644
--- a/contracts/feature-tests/composability/esdt-contract-pair/first-contract/wasm/src/lib.rs
+++ b/contracts/feature-tests/composability/esdt-contract-pair/first-contract/wasm/src/lib.rs
@@ -1,4 +1,4 @@
-// Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+// Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 ////////////////////////////////////////////////////
 ////////////////// AUTO-GENERATED //////////////////
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 7975a3ab9f..c52af71d3e 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
@@ -1,4 +1,4 @@
-# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+# Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 # ##########################################
 # ############## AUTO-GENERATED #############
diff --git a/contracts/feature-tests/composability/esdt-contract-pair/second-contract/wasm/src/lib.rs b/contracts/feature-tests/composability/esdt-contract-pair/second-contract/wasm/src/lib.rs
index c558f33b56..5497f2abd6 100644
--- a/contracts/feature-tests/composability/esdt-contract-pair/second-contract/wasm/src/lib.rs
+++ b/contracts/feature-tests/composability/esdt-contract-pair/second-contract/wasm/src/lib.rs
@@ -1,4 +1,4 @@
-// Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+// Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 ////////////////////////////////////////////////////
 ////////////////// AUTO-GENERATED //////////////////
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 305e30007d..40a3af7537 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
@@ -1,4 +1,4 @@
-# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+# Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 # ##########################################
 # ############## AUTO-GENERATED #############
diff --git a/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/child/wasm/src/lib.rs b/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/child/wasm/src/lib.rs
index 377ba27a6a..f98973d3c1 100644
--- a/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/child/wasm/src/lib.rs
+++ b/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/child/wasm/src/lib.rs
@@ -1,4 +1,4 @@
-// Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+// Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 ////////////////////////////////////////////////////
 ////////////////// AUTO-GENERATED //////////////////
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 19d5655df8..d328e9887d 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
@@ -1,4 +1,4 @@
-# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+# Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 # ##########################################
 # ############## AUTO-GENERATED #############
diff --git a/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/parent/wasm/src/lib.rs b/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/parent/wasm/src/lib.rs
index 4ac844b663..f2e699812b 100644
--- a/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/parent/wasm/src/lib.rs
+++ b/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/parent/wasm/src/lib.rs
@@ -1,4 +1,4 @@
-// Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+// Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 ////////////////////////////////////////////////////
 ////////////////// AUTO-GENERATED //////////////////
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 466c17bc2c..f2d361c59d 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
@@ -1,4 +1,4 @@
-# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+# Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 # ##########################################
 # ############## AUTO-GENERATED #############
diff --git a/contracts/feature-tests/composability/forwarder-queue/wasm-forwarder-queue-promises/src/lib.rs b/contracts/feature-tests/composability/forwarder-queue/wasm-forwarder-queue-promises/src/lib.rs
index 7fb7618e6f..52e2487f58 100644
--- a/contracts/feature-tests/composability/forwarder-queue/wasm-forwarder-queue-promises/src/lib.rs
+++ b/contracts/feature-tests/composability/forwarder-queue/wasm-forwarder-queue-promises/src/lib.rs
@@ -1,4 +1,4 @@
-// Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+// Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 ////////////////////////////////////////////////////
 ////////////////// AUTO-GENERATED //////////////////
diff --git a/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.toml b/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.toml
index 01a31d99f3..391ffba1be 100644
--- a/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.toml
@@ -1,4 +1,4 @@
-# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+# Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 # ##########################################
 # ############## AUTO-GENERATED #############
diff --git a/contracts/feature-tests/composability/forwarder-queue/wasm/src/lib.rs b/contracts/feature-tests/composability/forwarder-queue/wasm/src/lib.rs
index 56eb47bc23..5aba9d633d 100644
--- a/contracts/feature-tests/composability/forwarder-queue/wasm/src/lib.rs
+++ b/contracts/feature-tests/composability/forwarder-queue/wasm/src/lib.rs
@@ -1,4 +1,4 @@
-// Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+// Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 ////////////////////////////////////////////////////
 ////////////////// AUTO-GENERATED //////////////////
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 2e3aa780bb..8384a2a4ff 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
@@ -1,4 +1,4 @@
-# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+# Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 # ##########################################
 # ############## AUTO-GENERATED #############
diff --git a/contracts/feature-tests/composability/forwarder-raw/wasm-forwarder-raw-init-async-call/src/lib.rs b/contracts/feature-tests/composability/forwarder-raw/wasm-forwarder-raw-init-async-call/src/lib.rs
index 42d5439702..eed1607dd8 100644
--- a/contracts/feature-tests/composability/forwarder-raw/wasm-forwarder-raw-init-async-call/src/lib.rs
+++ b/contracts/feature-tests/composability/forwarder-raw/wasm-forwarder-raw-init-async-call/src/lib.rs
@@ -1,4 +1,4 @@
-// Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+// Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 ////////////////////////////////////////////////////
 ////////////////// AUTO-GENERATED //////////////////
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 b566681a28..5218b6a776 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
@@ -1,4 +1,4 @@
-# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+# Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 # ##########################################
 # ############## AUTO-GENERATED #############
diff --git a/contracts/feature-tests/composability/forwarder-raw/wasm-forwarder-raw-init-sync-call/src/lib.rs b/contracts/feature-tests/composability/forwarder-raw/wasm-forwarder-raw-init-sync-call/src/lib.rs
index df428ad9c6..f47232ca1a 100644
--- a/contracts/feature-tests/composability/forwarder-raw/wasm-forwarder-raw-init-sync-call/src/lib.rs
+++ b/contracts/feature-tests/composability/forwarder-raw/wasm-forwarder-raw-init-sync-call/src/lib.rs
@@ -1,4 +1,4 @@
-// Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+// Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 ////////////////////////////////////////////////////
 ////////////////// AUTO-GENERATED //////////////////
diff --git a/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.toml b/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.toml
index 91948c1528..21b14fcdb4 100644
--- a/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.toml
@@ -1,4 +1,4 @@
-# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+# Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 # ##########################################
 # ############## AUTO-GENERATED #############
diff --git a/contracts/feature-tests/composability/forwarder-raw/wasm/src/lib.rs b/contracts/feature-tests/composability/forwarder-raw/wasm/src/lib.rs
index 5e6fd99a6e..429013b1cb 100644
--- a/contracts/feature-tests/composability/forwarder-raw/wasm/src/lib.rs
+++ b/contracts/feature-tests/composability/forwarder-raw/wasm/src/lib.rs
@@ -1,4 +1,4 @@
-// Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+// Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 ////////////////////////////////////////////////////
 ////////////////// AUTO-GENERATED //////////////////
diff --git a/contracts/feature-tests/composability/forwarder/wasm/Cargo.toml b/contracts/feature-tests/composability/forwarder/wasm/Cargo.toml
index c53fb9e79a..335fa13611 100644
--- a/contracts/feature-tests/composability/forwarder/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder/wasm/Cargo.toml
@@ -1,4 +1,4 @@
-# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+# Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 # ##########################################
 # ############## AUTO-GENERATED #############
diff --git a/contracts/feature-tests/composability/forwarder/wasm/src/lib.rs b/contracts/feature-tests/composability/forwarder/wasm/src/lib.rs
index 7cba7cf2d2..04fa2abc7b 100644
--- a/contracts/feature-tests/composability/forwarder/wasm/src/lib.rs
+++ b/contracts/feature-tests/composability/forwarder/wasm/src/lib.rs
@@ -1,4 +1,4 @@
-// Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+// Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 ////////////////////////////////////////////////////
 ////////////////// AUTO-GENERATED //////////////////
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 463924237f..dd6242294d 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
@@ -1,4 +1,4 @@
-# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+# Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 # ##########################################
 # ############## AUTO-GENERATED #############
diff --git a/contracts/feature-tests/composability/local-esdt-and-nft/wasm/src/lib.rs b/contracts/feature-tests/composability/local-esdt-and-nft/wasm/src/lib.rs
index ca4aca4a95..afd8ad6608 100644
--- a/contracts/feature-tests/composability/local-esdt-and-nft/wasm/src/lib.rs
+++ b/contracts/feature-tests/composability/local-esdt-and-nft/wasm/src/lib.rs
@@ -1,4 +1,4 @@
-// Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+// Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 ////////////////////////////////////////////////////
 ////////////////// AUTO-GENERATED //////////////////
diff --git a/contracts/feature-tests/composability/promises-features/wasm/Cargo.toml b/contracts/feature-tests/composability/promises-features/wasm/Cargo.toml
index 3de0d641b3..2e74c0bfbb 100644
--- a/contracts/feature-tests/composability/promises-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/promises-features/wasm/Cargo.toml
@@ -1,4 +1,4 @@
-# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+# Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 # ##########################################
 # ############## AUTO-GENERATED #############
diff --git a/contracts/feature-tests/composability/promises-features/wasm/src/lib.rs b/contracts/feature-tests/composability/promises-features/wasm/src/lib.rs
index 73ec37b99a..635464981b 100644
--- a/contracts/feature-tests/composability/promises-features/wasm/src/lib.rs
+++ b/contracts/feature-tests/composability/promises-features/wasm/src/lib.rs
@@ -1,4 +1,4 @@
-// Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+// Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 ////////////////////////////////////////////////////
 ////////////////// AUTO-GENERATED //////////////////
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 3cddf0a450..db10ca7681 100644
--- a/contracts/feature-tests/composability/proxy-test-first/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/proxy-test-first/wasm/Cargo.toml
@@ -1,4 +1,4 @@
-# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+# Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 # ##########################################
 # ############## AUTO-GENERATED #############
diff --git a/contracts/feature-tests/composability/proxy-test-first/wasm/src/lib.rs b/contracts/feature-tests/composability/proxy-test-first/wasm/src/lib.rs
index aa2c820ac6..b81a67da53 100644
--- a/contracts/feature-tests/composability/proxy-test-first/wasm/src/lib.rs
+++ b/contracts/feature-tests/composability/proxy-test-first/wasm/src/lib.rs
@@ -1,4 +1,4 @@
-// Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+// Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 ////////////////////////////////////////////////////
 ////////////////// AUTO-GENERATED //////////////////
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 af070e7458..0ea29f6006 100644
--- a/contracts/feature-tests/composability/proxy-test-second/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/proxy-test-second/wasm/Cargo.toml
@@ -1,4 +1,4 @@
-# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+# Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 # ##########################################
 # ############## AUTO-GENERATED #############
diff --git a/contracts/feature-tests/composability/proxy-test-second/wasm/src/lib.rs b/contracts/feature-tests/composability/proxy-test-second/wasm/src/lib.rs
index 06a02e3986..309b27d9f8 100644
--- a/contracts/feature-tests/composability/proxy-test-second/wasm/src/lib.rs
+++ b/contracts/feature-tests/composability/proxy-test-second/wasm/src/lib.rs
@@ -1,4 +1,4 @@
-// Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+// Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 ////////////////////////////////////////////////////
 ////////////////// AUTO-GENERATED //////////////////
diff --git a/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.toml b/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.toml
index 788213c3c9..8d9ac9d073 100644
--- a/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.toml
@@ -1,4 +1,4 @@
-# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+# Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 # ##########################################
 # ############## AUTO-GENERATED #############
diff --git a/contracts/feature-tests/composability/recursive-caller/wasm/src/lib.rs b/contracts/feature-tests/composability/recursive-caller/wasm/src/lib.rs
index ec9e1f9a8c..04b323d337 100644
--- a/contracts/feature-tests/composability/recursive-caller/wasm/src/lib.rs
+++ b/contracts/feature-tests/composability/recursive-caller/wasm/src/lib.rs
@@ -1,4 +1,4 @@
-// Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+// Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 ////////////////////////////////////////////////////
 ////////////////// AUTO-GENERATED //////////////////
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 f0ee8f759b..1751a9fb23 100644
--- a/contracts/feature-tests/composability/transfer-role-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/transfer-role-features/wasm/Cargo.toml
@@ -1,4 +1,4 @@
-# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+# Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 # ##########################################
 # ############## AUTO-GENERATED #############
diff --git a/contracts/feature-tests/composability/transfer-role-features/wasm/src/lib.rs b/contracts/feature-tests/composability/transfer-role-features/wasm/src/lib.rs
index b7f5b995f7..068825a4b2 100644
--- a/contracts/feature-tests/composability/transfer-role-features/wasm/src/lib.rs
+++ b/contracts/feature-tests/composability/transfer-role-features/wasm/src/lib.rs
@@ -1,4 +1,4 @@
-// Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+// Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 ////////////////////////////////////////////////////
 ////////////////// AUTO-GENERATED //////////////////
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 fa540038c3..4ce110bab7 100644
--- a/contracts/feature-tests/composability/vault/wasm-vault-promises/Cargo.toml
+++ b/contracts/feature-tests/composability/vault/wasm-vault-promises/Cargo.toml
@@ -1,4 +1,4 @@
-# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+# Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 # ##########################################
 # ############## AUTO-GENERATED #############
diff --git a/contracts/feature-tests/composability/vault/wasm-vault-promises/src/lib.rs b/contracts/feature-tests/composability/vault/wasm-vault-promises/src/lib.rs
index 87c110bc70..c2b65bd9c2 100644
--- a/contracts/feature-tests/composability/vault/wasm-vault-promises/src/lib.rs
+++ b/contracts/feature-tests/composability/vault/wasm-vault-promises/src/lib.rs
@@ -1,4 +1,4 @@
-// Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+// Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 ////////////////////////////////////////////////////
 ////////////////// AUTO-GENERATED //////////////////
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 7a1a7a0c7d..bbdbad4c77 100644
--- a/contracts/feature-tests/composability/vault/wasm-vault-upgrade/Cargo.toml
+++ b/contracts/feature-tests/composability/vault/wasm-vault-upgrade/Cargo.toml
@@ -1,4 +1,4 @@
-# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+# Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 # ##########################################
 # ############## AUTO-GENERATED #############
diff --git a/contracts/feature-tests/composability/vault/wasm-vault-upgrade/src/lib.rs b/contracts/feature-tests/composability/vault/wasm-vault-upgrade/src/lib.rs
index fa9bca4e20..d64cc18792 100644
--- a/contracts/feature-tests/composability/vault/wasm-vault-upgrade/src/lib.rs
+++ b/contracts/feature-tests/composability/vault/wasm-vault-upgrade/src/lib.rs
@@ -1,4 +1,4 @@
-// Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+// Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 ////////////////////////////////////////////////////
 ////////////////// AUTO-GENERATED //////////////////
diff --git a/contracts/feature-tests/composability/vault/wasm/Cargo.toml b/contracts/feature-tests/composability/vault/wasm/Cargo.toml
index 1b3d9cdc94..30761c97db 100644
--- a/contracts/feature-tests/composability/vault/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/vault/wasm/Cargo.toml
@@ -1,4 +1,4 @@
-# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+# Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 # ##########################################
 # ############## AUTO-GENERATED #############
diff --git a/contracts/feature-tests/composability/vault/wasm/src/lib.rs b/contracts/feature-tests/composability/vault/wasm/src/lib.rs
index b7546bcde3..6c64caf1df 100644
--- a/contracts/feature-tests/composability/vault/wasm/src/lib.rs
+++ b/contracts/feature-tests/composability/vault/wasm/src/lib.rs
@@ -1,4 +1,4 @@
-// Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+// Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 ////////////////////////////////////////////////////
 ////////////////// AUTO-GENERATED //////////////////
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 5a60d92a2f..6b093e2f9f 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
@@ -1,4 +1,4 @@
-# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+# Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 # ##########################################
 # ############## AUTO-GENERATED #############
diff --git a/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/wasm/src/lib.rs b/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/wasm/src/lib.rs
index 694cb75b5f..5494a20b3f 100644
--- a/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/wasm/src/lib.rs
+++ b/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/wasm/src/lib.rs
@@ -1,4 +1,4 @@
-// Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+// Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 ////////////////////////////////////////////////////
 ////////////////// AUTO-GENERATED //////////////////
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 b5334df3c3..21febc24f1 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
@@ -1,4 +1,4 @@
-# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+# Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 # ##########################################
 # ############## AUTO-GENERATED #############
diff --git a/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/wasm/src/lib.rs b/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/wasm/src/lib.rs
index 86d821e06d..eb3bf2d67d 100644
--- a/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/wasm/src/lib.rs
+++ b/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/wasm/src/lib.rs
@@ -1,4 +1,4 @@
-// Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+// Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 ////////////////////////////////////////////////////
 ////////////////// AUTO-GENERATED //////////////////
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 9c2b9465fe..6d955ef10e 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
@@ -1,4 +1,4 @@
-# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+# Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 # ##########################################
 # ############## AUTO-GENERATED #############
diff --git a/contracts/feature-tests/erc-style-contracts/erc1155-user-mock/wasm/src/lib.rs b/contracts/feature-tests/erc-style-contracts/erc1155-user-mock/wasm/src/lib.rs
index c3e03c50ad..8b95e24b9e 100644
--- a/contracts/feature-tests/erc-style-contracts/erc1155-user-mock/wasm/src/lib.rs
+++ b/contracts/feature-tests/erc-style-contracts/erc1155-user-mock/wasm/src/lib.rs
@@ -1,4 +1,4 @@
-// Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+// Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 ////////////////////////////////////////////////////
 ////////////////// AUTO-GENERATED //////////////////
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 fef776ef2e..2d07e7549f 100644
--- a/contracts/feature-tests/erc-style-contracts/erc1155/wasm/Cargo.toml
+++ b/contracts/feature-tests/erc-style-contracts/erc1155/wasm/Cargo.toml
@@ -1,4 +1,4 @@
-# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+# Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 # ##########################################
 # ############## AUTO-GENERATED #############
diff --git a/contracts/feature-tests/erc-style-contracts/erc1155/wasm/src/lib.rs b/contracts/feature-tests/erc-style-contracts/erc1155/wasm/src/lib.rs
index 35b9cf3bc6..3572b4d421 100644
--- a/contracts/feature-tests/erc-style-contracts/erc1155/wasm/src/lib.rs
+++ b/contracts/feature-tests/erc-style-contracts/erc1155/wasm/src/lib.rs
@@ -1,4 +1,4 @@
-// Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+// Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 ////////////////////////////////////////////////////
 ////////////////// AUTO-GENERATED //////////////////
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 7cb42fb7b4..ef0f482771 100644
--- a/contracts/feature-tests/erc-style-contracts/erc20/wasm/Cargo.toml
+++ b/contracts/feature-tests/erc-style-contracts/erc20/wasm/Cargo.toml
@@ -1,4 +1,4 @@
-# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+# Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 # ##########################################
 # ############## AUTO-GENERATED #############
diff --git a/contracts/feature-tests/erc-style-contracts/erc20/wasm/src/lib.rs b/contracts/feature-tests/erc-style-contracts/erc20/wasm/src/lib.rs
index 44431a67da..0cc3385f58 100644
--- a/contracts/feature-tests/erc-style-contracts/erc20/wasm/src/lib.rs
+++ b/contracts/feature-tests/erc-style-contracts/erc20/wasm/src/lib.rs
@@ -1,4 +1,4 @@
-// Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+// Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 ////////////////////////////////////////////////////
 ////////////////// AUTO-GENERATED //////////////////
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 7a3aef340b..6b7170cd10 100644
--- a/contracts/feature-tests/erc-style-contracts/erc721/wasm/Cargo.toml
+++ b/contracts/feature-tests/erc-style-contracts/erc721/wasm/Cargo.toml
@@ -1,4 +1,4 @@
-# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+# Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 # ##########################################
 # ############## AUTO-GENERATED #############
diff --git a/contracts/feature-tests/erc-style-contracts/erc721/wasm/src/lib.rs b/contracts/feature-tests/erc-style-contracts/erc721/wasm/src/lib.rs
index bbb38f0df1..6ade00a28e 100644
--- a/contracts/feature-tests/erc-style-contracts/erc721/wasm/src/lib.rs
+++ b/contracts/feature-tests/erc-style-contracts/erc721/wasm/src/lib.rs
@@ -1,4 +1,4 @@
-// Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+// Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 ////////////////////////////////////////////////////
 ////////////////// AUTO-GENERATED //////////////////
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 424448a4ce..7458149418 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
@@ -1,4 +1,4 @@
-# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+# Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 # ##########################################
 # ############## AUTO-GENERATED #############
diff --git a/contracts/feature-tests/erc-style-contracts/lottery-erc20/wasm/src/lib.rs b/contracts/feature-tests/erc-style-contracts/lottery-erc20/wasm/src/lib.rs
index ce0717f548..ef13154bcd 100644
--- a/contracts/feature-tests/erc-style-contracts/lottery-erc20/wasm/src/lib.rs
+++ b/contracts/feature-tests/erc-style-contracts/lottery-erc20/wasm/src/lib.rs
@@ -1,4 +1,4 @@
-// Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+// Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 ////////////////////////////////////////////////////
 ////////////////// AUTO-GENERATED //////////////////
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 bbc1fd101c..79a50c3e0a 100644
--- a/contracts/feature-tests/esdt-system-sc-mock/wasm/Cargo.toml
+++ b/contracts/feature-tests/esdt-system-sc-mock/wasm/Cargo.toml
@@ -1,4 +1,4 @@
-# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+# Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 # ##########################################
 # ############## AUTO-GENERATED #############
diff --git a/contracts/feature-tests/esdt-system-sc-mock/wasm/src/lib.rs b/contracts/feature-tests/esdt-system-sc-mock/wasm/src/lib.rs
index 69f9df4bf5..789590294b 100644
--- a/contracts/feature-tests/esdt-system-sc-mock/wasm/src/lib.rs
+++ b/contracts/feature-tests/esdt-system-sc-mock/wasm/src/lib.rs
@@ -1,4 +1,4 @@
-// Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+// Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 ////////////////////////////////////////////////////
 ////////////////// AUTO-GENERATED //////////////////
diff --git a/contracts/feature-tests/formatted-message-features/wasm/Cargo.toml b/contracts/feature-tests/formatted-message-features/wasm/Cargo.toml
index c1880543b4..130076659f 100644
--- a/contracts/feature-tests/formatted-message-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/formatted-message-features/wasm/Cargo.toml
@@ -1,4 +1,4 @@
-# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+# Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 # ##########################################
 # ############## AUTO-GENERATED #############
diff --git a/contracts/feature-tests/formatted-message-features/wasm/src/lib.rs b/contracts/feature-tests/formatted-message-features/wasm/src/lib.rs
index 9aab5c626b..61194df882 100644
--- a/contracts/feature-tests/formatted-message-features/wasm/src/lib.rs
+++ b/contracts/feature-tests/formatted-message-features/wasm/src/lib.rs
@@ -1,4 +1,4 @@
-// Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+// Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 ////////////////////////////////////////////////////
 ////////////////// AUTO-GENERATED //////////////////
diff --git a/contracts/feature-tests/managed-map-features/wasm/Cargo.toml b/contracts/feature-tests/managed-map-features/wasm/Cargo.toml
index 5f97da3f8a..030a160f0d 100644
--- a/contracts/feature-tests/managed-map-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/managed-map-features/wasm/Cargo.toml
@@ -1,4 +1,4 @@
-# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+# Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 # ##########################################
 # ############## AUTO-GENERATED #############
diff --git a/contracts/feature-tests/managed-map-features/wasm/src/lib.rs b/contracts/feature-tests/managed-map-features/wasm/src/lib.rs
index 3976e5f8d1..88819f3209 100644
--- a/contracts/feature-tests/managed-map-features/wasm/src/lib.rs
+++ b/contracts/feature-tests/managed-map-features/wasm/src/lib.rs
@@ -1,4 +1,4 @@
-// Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+// Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 ////////////////////////////////////////////////////
 ////////////////// AUTO-GENERATED //////////////////
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 f84dd87e10..e68bdb55e7 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
@@ -1,4 +1,4 @@
-# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+# Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 # ##########################################
 # ############## AUTO-GENERATED #############
diff --git a/contracts/feature-tests/multi-contract-features/wasm-multi-contract-alt-impl/src/lib.rs b/contracts/feature-tests/multi-contract-features/wasm-multi-contract-alt-impl/src/lib.rs
index 2c0918a028..57979a3557 100644
--- a/contracts/feature-tests/multi-contract-features/wasm-multi-contract-alt-impl/src/lib.rs
+++ b/contracts/feature-tests/multi-contract-features/wasm-multi-contract-alt-impl/src/lib.rs
@@ -1,4 +1,4 @@
-// Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+// Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 ////////////////////////////////////////////////////
 ////////////////// AUTO-GENERATED //////////////////
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 7e7785378c..a8362ef59f 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
@@ -1,4 +1,4 @@
-# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+# Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 # ##########################################
 # ############## AUTO-GENERATED #############
diff --git a/contracts/feature-tests/multi-contract-features/wasm-multi-contract-example-feature/src/lib.rs b/contracts/feature-tests/multi-contract-features/wasm-multi-contract-example-feature/src/lib.rs
index 8cfb37b1bf..32c7c0cf3f 100644
--- a/contracts/feature-tests/multi-contract-features/wasm-multi-contract-example-feature/src/lib.rs
+++ b/contracts/feature-tests/multi-contract-features/wasm-multi-contract-example-feature/src/lib.rs
@@ -1,4 +1,4 @@
-// Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+// Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 ////////////////////////////////////////////////////
 ////////////////// AUTO-GENERATED //////////////////
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 d72ae28cb7..51c5154647 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
@@ -1,4 +1,4 @@
-# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+# Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 # ##########################################
 # ############## AUTO-GENERATED #############
diff --git a/contracts/feature-tests/multi-contract-features/wasm-multi-contract-features-view/src/lib.rs b/contracts/feature-tests/multi-contract-features/wasm-multi-contract-features-view/src/lib.rs
index 3fe1350380..cbf61c8513 100644
--- a/contracts/feature-tests/multi-contract-features/wasm-multi-contract-features-view/src/lib.rs
+++ b/contracts/feature-tests/multi-contract-features/wasm-multi-contract-features-view/src/lib.rs
@@ -1,4 +1,4 @@
-// Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+// Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 ////////////////////////////////////////////////////
 ////////////////// AUTO-GENERATED //////////////////
diff --git a/contracts/feature-tests/multi-contract-features/wasm/Cargo.toml b/contracts/feature-tests/multi-contract-features/wasm/Cargo.toml
index a0e4cd1862..fc6129bb5e 100644
--- a/contracts/feature-tests/multi-contract-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/multi-contract-features/wasm/Cargo.toml
@@ -1,4 +1,4 @@
-# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+# Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 # ##########################################
 # ############## AUTO-GENERATED #############
diff --git a/contracts/feature-tests/multi-contract-features/wasm/src/lib.rs b/contracts/feature-tests/multi-contract-features/wasm/src/lib.rs
index 8cfb37b1bf..32c7c0cf3f 100644
--- a/contracts/feature-tests/multi-contract-features/wasm/src/lib.rs
+++ b/contracts/feature-tests/multi-contract-features/wasm/src/lib.rs
@@ -1,4 +1,4 @@
-// Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+// Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 ////////////////////////////////////////////////////
 ////////////////// AUTO-GENERATED //////////////////
diff --git a/contracts/feature-tests/panic-message-features/wasm/Cargo.toml b/contracts/feature-tests/panic-message-features/wasm/Cargo.toml
index 7f25354ea8..2989fe2c95 100644
--- a/contracts/feature-tests/panic-message-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/panic-message-features/wasm/Cargo.toml
@@ -1,4 +1,4 @@
-# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+# Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 # ##########################################
 # ############## AUTO-GENERATED #############
diff --git a/contracts/feature-tests/panic-message-features/wasm/src/lib.rs b/contracts/feature-tests/panic-message-features/wasm/src/lib.rs
index 5a06957099..9a37cf6d1e 100644
--- a/contracts/feature-tests/panic-message-features/wasm/src/lib.rs
+++ b/contracts/feature-tests/panic-message-features/wasm/src/lib.rs
@@ -1,4 +1,4 @@
-// Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+// Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 ////////////////////////////////////////////////////
 ////////////////// AUTO-GENERATED //////////////////
diff --git a/contracts/feature-tests/payable-features/wasm/Cargo.toml b/contracts/feature-tests/payable-features/wasm/Cargo.toml
index 458d6c398c..ac40fb507b 100644
--- a/contracts/feature-tests/payable-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/payable-features/wasm/Cargo.toml
@@ -1,4 +1,4 @@
-# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+# Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 # ##########################################
 # ############## AUTO-GENERATED #############
diff --git a/contracts/feature-tests/payable-features/wasm/src/lib.rs b/contracts/feature-tests/payable-features/wasm/src/lib.rs
index 702bb4a549..eb058bd489 100644
--- a/contracts/feature-tests/payable-features/wasm/src/lib.rs
+++ b/contracts/feature-tests/payable-features/wasm/src/lib.rs
@@ -1,4 +1,4 @@
-// Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+// Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 ////////////////////////////////////////////////////
 ////////////////// AUTO-GENERATED //////////////////
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 64bd0b12da..d44081cfe1 100644
--- a/contracts/feature-tests/rust-snippets-generator-test/wasm/Cargo.toml
+++ b/contracts/feature-tests/rust-snippets-generator-test/wasm/Cargo.toml
@@ -1,4 +1,4 @@
-# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+# Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 # ##########################################
 # ############## AUTO-GENERATED #############
diff --git a/contracts/feature-tests/rust-snippets-generator-test/wasm/src/lib.rs b/contracts/feature-tests/rust-snippets-generator-test/wasm/src/lib.rs
index 31443ac81e..53c096de7f 100644
--- a/contracts/feature-tests/rust-snippets-generator-test/wasm/src/lib.rs
+++ b/contracts/feature-tests/rust-snippets-generator-test/wasm/src/lib.rs
@@ -1,4 +1,4 @@
-// Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+// Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 ////////////////////////////////////////////////////
 ////////////////// AUTO-GENERATED //////////////////
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 c471da62c3..bdd79b100c 100644
--- a/contracts/feature-tests/rust-testing-framework-tester/wasm/Cargo.toml
+++ b/contracts/feature-tests/rust-testing-framework-tester/wasm/Cargo.toml
@@ -1,4 +1,4 @@
-# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+# Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 # ##########################################
 # ############## AUTO-GENERATED #############
diff --git a/contracts/feature-tests/rust-testing-framework-tester/wasm/src/lib.rs b/contracts/feature-tests/rust-testing-framework-tester/wasm/src/lib.rs
index 2e106ce4a3..b38cf506c6 100644
--- a/contracts/feature-tests/rust-testing-framework-tester/wasm/src/lib.rs
+++ b/contracts/feature-tests/rust-testing-framework-tester/wasm/src/lib.rs
@@ -1,4 +1,4 @@
-// Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+// Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 ////////////////////////////////////////////////////
 ////////////////// AUTO-GENERATED //////////////////
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 4f345cd3af..4ad382d00e 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
@@ -1,4 +1,4 @@
-# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+# Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 # ##########################################
 # ############## AUTO-GENERATED #############
diff --git a/contracts/feature-tests/use-module/wasm-use-module-view/src/lib.rs b/contracts/feature-tests/use-module/wasm-use-module-view/src/lib.rs
index 87b8d984c8..c62b40af0a 100644
--- a/contracts/feature-tests/use-module/wasm-use-module-view/src/lib.rs
+++ b/contracts/feature-tests/use-module/wasm-use-module-view/src/lib.rs
@@ -1,4 +1,4 @@
-// Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+// Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 ////////////////////////////////////////////////////
 ////////////////// AUTO-GENERATED //////////////////
diff --git a/contracts/feature-tests/use-module/wasm/Cargo.toml b/contracts/feature-tests/use-module/wasm/Cargo.toml
index 755bd606b2..3a2b1c793e 100644
--- a/contracts/feature-tests/use-module/wasm/Cargo.toml
+++ b/contracts/feature-tests/use-module/wasm/Cargo.toml
@@ -1,4 +1,4 @@
-# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+# Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 # ##########################################
 # ############## AUTO-GENERATED #############
diff --git a/contracts/feature-tests/use-module/wasm/src/lib.rs b/contracts/feature-tests/use-module/wasm/src/lib.rs
index 97651ae723..a4e6609b89 100644
--- a/contracts/feature-tests/use-module/wasm/src/lib.rs
+++ b/contracts/feature-tests/use-module/wasm/src/lib.rs
@@ -1,4 +1,4 @@
-// Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+// Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 ////////////////////////////////////////////////////
 ////////////////// AUTO-GENERATED //////////////////
diff --git a/framework/meta/src/cargo_toml_contents.rs b/framework/meta/src/cargo_toml_contents.rs
index a1faa076d9..38c611e2ab 100644
--- a/framework/meta/src/cargo_toml_contents.rs
+++ b/framework/meta/src/cargo_toml_contents.rs
@@ -11,7 +11,7 @@ use crate::cmd::contract::sc_config::ContractVariantProfile;
 pub const CARGO_TOML_DEPENDENCIES: &str = "dependencies";
 pub const CARGO_TOML_DEV_DEPENDENCIES: &str = "dev-dependencies";
 const AUTO_GENERATED: &str =
-    "# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+    "# Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 # ##########################################
 # ############## AUTO-GENERATED #############
diff --git a/framework/meta/src/cmd/contract/meta_config.rs b/framework/meta/src/cmd/contract/meta_config.rs
index d94b444623..b8332caa14 100644
--- a/framework/meta/src/cmd/contract/meta_config.rs
+++ b/framework/meta/src/cmd/contract/meta_config.rs
@@ -160,7 +160,7 @@ mod tests {
     use crate::cmd::contract::sc_config::ContractVariantProfile;
 
     const EXPECTED_CARGO_TOML_CONTENTS: &str =
-        "# Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+        "# Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 # ##########################################
 # ############## AUTO-GENERATED #############
diff --git a/framework/meta/src/cmd/contract/sc_config/wasm_crate_gen.rs b/framework/meta/src/cmd/contract/sc_config/wasm_crate_gen.rs
index 141bc8a266..7dde9e9805 100644
--- a/framework/meta/src/cmd/contract/sc_config/wasm_crate_gen.rs
+++ b/framework/meta/src/cmd/contract/sc_config/wasm_crate_gen.rs
@@ -10,7 +10,7 @@ use std::{
 use super::ContractVariant;
 
 const PREFIX_AUTO_GENERATED: &str =
-    "// Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+    "// Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 ////////////////////////////////////////////////////
 ////////////////// AUTO-GENERATED //////////////////

From 6a98c20e107df92e57b40f7c714dce14d4f77924 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 21 Nov 2023 17:59:57 +0200
Subject: [PATCH 0085/1254] temporarily disabled upgrade tests

---
 .../composability/tests/composability_scenario_rs_test.rs      | 3 +++
 1 file changed, 3 insertions(+)

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 2be254ab57..ba148a19f9 100644
--- a/contracts/feature-tests/composability/tests/composability_scenario_rs_test.rs
+++ b/contracts/feature-tests/composability/tests/composability_scenario_rs_test.rs
@@ -109,11 +109,13 @@ fn forw_raw_contract_deploy_rs() {
 }
 
 #[test]
+#[ignore = "TODO: upgrade endpoint mechanism in Rust VM"]
 fn forw_raw_contract_upgrade_rs() {
     world().run("scenarios/forw_raw_contract_upgrade.scen.json");
 }
 
 #[test]
+#[ignore = "TODO: upgrade endpoint mechanism in Rust VM"]
 fn forw_raw_contract_upgrade_self_rs() {
     world().run("scenarios/forw_raw_contract_upgrade_self.scen.json");
 }
@@ -365,6 +367,7 @@ fn forwarder_contract_deploy_rs() {
 }
 
 #[test]
+#[ignore = "TODO: upgrade endpoint mechanism in Rust VM"]
 fn forwarder_contract_upgrade_rs() {
     world().run("scenarios/forwarder_contract_upgrade.scen.json");
 }

From 77039f272725a4f29f9230f85f8f47c2ca70131e Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 21 Nov 2023 18:17:20 +0200
Subject: [PATCH 0086/1254] un-ignored composability tests relying on VM 1.5

---
 .../tests/composability_scenario_go_test.rs     | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/contracts/feature-tests/composability/tests/composability_scenario_go_test.rs b/contracts/feature-tests/composability/tests/composability_scenario_go_test.rs
index d6b5acbf3f..c16a373593 100644
--- a/contracts/feature-tests/composability/tests/composability_scenario_go_test.rs
+++ b/contracts/feature-tests/composability/tests/composability_scenario_go_test.rs
@@ -4,20 +4,17 @@ fn world() -> ScenarioWorld {
     ScenarioWorld::vm_go()
 }
 
-#[ignore = "currently compatible with VM 1.5, not with VM 1.4"]
 #[test]
 fn promises_multi_transfer_go() {
     world().run("scenarios-promises/promises_multi_transfer.scen.json");
 }
 
-#[ignore = "currently compatible with VM 1.5, not with VM 1.4"]
 #[test]
 fn promises_single_transfer_go() {
     world().run("scenarios-promises/promises_single_transfer.scen.json");
 }
 
 #[test]
-#[ignore = "waiting for VM 1.5"]
 fn builtin_func_delete_user_name_go() {
     world().run("scenarios/builtin_func_delete_user_name.scen.json");
 }
@@ -48,7 +45,6 @@ fn forw_raw_async_echo_go() {
 }
 
 #[test]
-#[ignore = "currently compatible with VM 1.5, not with VM 1.4"]
 fn forw_raw_async_send_and_retrieve_multi_transfer_funds_go() {
     world().run("scenarios/forw_raw_async_send_and_retrieve_multi_transfer_funds.scen.json");
 }
@@ -64,7 +60,6 @@ fn forw_raw_builtin_nft_local_mint_via_sync_call_go() {
 }
 
 #[test]
-#[ignore = "currently compatible with VM 1.5, not with VM 1.4"]
 fn forw_raw_call_async_retrieve_multi_transfer_go() {
     world().run("scenarios/forw_raw_call_async_retrieve_multi_transfer.scen.json");
 }
@@ -100,7 +95,6 @@ fn forw_raw_direct_multi_esdt_go() {
 }
 
 #[test]
-#[ignore = "currently compatible with VM 1.5, not with VM 1.4"]
 fn forw_raw_init_async_go() {
     world().run("scenarios/forw_raw_init_async.scen.json");
 }
@@ -206,7 +200,6 @@ fn forwarder_call_async_retrieve_egld_go() {
 }
 
 #[test]
-#[ignore = "currently compatible with VM 1.5, not with VM 1.4"]
 fn forwarder_call_async_retrieve_esdt_go() {
     world().run("scenarios/forwarder_call_async_retrieve_esdt.scen.json");
 }
@@ -396,16 +389,6 @@ fn forwarder_send_esdt_multi_transfer_go() {
     world().run("scenarios/forwarder_send_esdt_multi_transfer.scen.json");
 }
 
-#[test]
-fn forwarder_send_twice_egld_go() {
-    world().run("scenarios/forwarder_send_twice_egld.scen.json");
-}
-
-#[test]
-fn forwarder_send_twice_esdt_go() {
-    world().run("scenarios/forwarder_send_twice_esdt.scen.json");
-}
-
 #[test]
 fn forwarder_sync_echo_go() {
     world().run("scenarios/forwarder_sync_echo.scen.json");

From 4d4b4fee58205d11abc8d049cdbb9408fda98fac Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 21 Nov 2023 18:17:36 +0200
Subject: [PATCH 0087/1254] test cleanup, ignore unsupported

---
 .../tests/basic_features_scenario_go_test.rs         |  1 +
 .../tests/composability_scenario_rs_test.rs          | 12 ------------
 2 files changed, 1 insertion(+), 12 deletions(-)

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 25d234ec9b..849575aa77 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
@@ -336,6 +336,7 @@ fn storage_map_3_go() {
 }
 
 #[test]
+#[ignore = "currently not supported. TODO: investigate"]
 fn storage_mapper_fungible_token_go() {
     world().run("scenarios/storage_mapper_fungible_token.scen.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 ba148a19f9..8b8c831340 100644
--- a/contracts/feature-tests/composability/tests/composability_scenario_rs_test.rs
+++ b/contracts/feature-tests/composability/tests/composability_scenario_rs_test.rs
@@ -437,18 +437,6 @@ fn forwarder_send_esdt_multi_transfer_rs() {
     world().run("scenarios/forwarder_send_esdt_multi_transfer.scen.json");
 }
 
-#[test]
-#[ignore]
-fn forwarder_send_twice_egld_rs() {
-    world().run("scenarios/forwarder_send_twice_egld.scen.json");
-}
-
-#[test]
-#[ignore]
-fn forwarder_send_twice_esdt_rs() {
-    world().run("scenarios/forwarder_send_twice_esdt.scen.json");
-}
-
 #[test]
 fn forwarder_sync_echo_rs() {
     world().run("scenarios/forwarder_sync_echo.scen.json");

From 4a46010771e2a9dc957aebba08aa6f2a53589b59 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 21 Nov 2023 19:40:53 +0200
Subject: [PATCH 0088/1254] fixed generated test gas

---
 .../crowdfunding-esdt/scenarios/_generated_fund.scen.json       | 2 +-
 .../crowdfunding-esdt/scenarios/_generated_sc_err.scen.json     | 2 +-
 framework/scenario/src/whitebox_legacy/contract_obj_wrapper.rs  | 2 +-
 vm-test-build-copy.sh                                           | 1 -
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/contracts/examples/crowdfunding-esdt/scenarios/_generated_fund.scen.json b/contracts/examples/crowdfunding-esdt/scenarios/_generated_fund.scen.json
index 3959ce0723..afd4bcaea6 100644
--- a/contracts/examples/crowdfunding-esdt/scenarios/_generated_fund.scen.json
+++ b/contracts/examples/crowdfunding-esdt/scenarios/_generated_fund.scen.json
@@ -109,7 +109,7 @@
                 ],
                 "function": "fund",
                 "arguments": [],
-                "gasLimit": "18446744073709551615",
+                "gasLimit": "100,000,000",
                 "gasPrice": "0"
             },
             "expect": {
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 b820dc1521..465bf2bdde 100644
--- a/contracts/examples/crowdfunding-esdt/scenarios/_generated_sc_err.scen.json
+++ b/contracts/examples/crowdfunding-esdt/scenarios/_generated_sc_err.scen.json
@@ -126,7 +126,7 @@
                 "egldValue": "1000",
                 "function": "fund",
                 "arguments": [],
-                "gasLimit": "18446744073709551615",
+                "gasLimit": "100,000,000",
                 "gasPrice": "0"
             },
             "expect": {
diff --git a/framework/scenario/src/whitebox_legacy/contract_obj_wrapper.rs b/framework/scenario/src/whitebox_legacy/contract_obj_wrapper.rs
index e4e91c7a52..edb4f8f019 100644
--- a/framework/scenario/src/whitebox_legacy/contract_obj_wrapper.rs
+++ b/framework/scenario/src/whitebox_legacy/contract_obj_wrapper.rs
@@ -686,7 +686,7 @@ impl BlockchainStateWrapper {
             .to(sc_wrapper.address_ref())
             .function(TxFunctionName::WHITEBOX_CALL.as_str())
             .egld_value(egld_payment)
-            .gas_limit(u64::MAX)
+            .gas_limit("100,000,000")
             .no_expect();
 
         sc_call_step.explicit_tx_hash = Some(H256::zero());
diff --git a/vm-test-build-copy.sh b/vm-test-build-copy.sh
index e04d128233..dd7aa7c83f 100755
--- a/vm-test-build-copy.sh
+++ b/vm-test-build-copy.sh
@@ -31,7 +31,6 @@ build_and_copy_with_scenarios() {
 
    # copying scenarios ...
    rsync -av \
-      --exclude *_generated* \
       $contract_path/scenarios/ \
       $vm_contract_path/scenarios/
 }

From 2b53f40bafed7e99cc84f8c4683caea511a7550e Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 22 Nov 2023 09:36:22 +0200
Subject: [PATCH 0089/1254] test fix

---
 .../multisig/test-contracts/adder.wasm         | Bin 3455 -> 697 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/contracts/examples/multisig/test-contracts/adder.wasm b/contracts/examples/multisig/test-contracts/adder.wasm
index edbbd78f59a40b8516b104c913cbd83c0a68e59e..ffb39b0d4e26f071164fbc6fac3f4800246f37ac 100755
GIT binary patch
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<dHBci=WfQ
zCi_~{Uu6BGs5V(4(@14aE{htd;r&e3w@rQmD?o!XBNe;PN|mbDUFEZ8wUX+-E|tjS
zw^F1)jP%Vwd@pBRrBj)noeu0=mHGep@xQjlUG|y&iIMeeU&{*4Of_%0mdovJc_;SW
z3}C=XKjVB;Y^wE3ealeiJr$)X*p#`5)`*%-YBvOG`=o{F_rYPqHM(=`T;`?P6R@;h
z4VSiF(0!A`6&2cK>@3A@HxtV(Oh(N^rbH^?(v9O()FPHeN`b}kT8f8wAu37H{e!ND
z*hau#g}@;IHZ|e%!7<-^0ugRQ_(%*h0geI8txrCS4q7nf1lViMbh-3;cv$+uCfY^A
zBtU+q<A8AcnvHu9q9>hA`RGOHM942Vdk36r6Q6m&9o^Ce=iKAxEJWIBpw}ShA>m%A
u>uPg1AYBFpWb8(_s~cl)f2p#_f}+V6QU&EI5W`PZReDusFlId;kH^3K_p3et

literal 3455
zcmZu!+m0MZ8UCxfdv<zj)~<~VI9?Dnom^N+ECmRQlq;7bZxn38g(Yrx+dJ*`&hE_Y
z&h)OaWHRG8V8Z!K0v19F;i$k(B*G2K18~CwaK$6=0Ob3sdiIcHrJk<(PxXKQsd}ZH
z43vndwa$i`s_8~L#h+~GDK~-#D~VKW5-{;nuQY3cl5B`<WK;u7|3jZis^Q_;t*U<c
zVBp7F2ZL%@Pb4ALOt!a%<?hw-cr=!jluzE=-g;?R-vGVpUAbFV*Q?=HeOrXgbCLOC
zb%H+;O;%@8kH+Ozbpx+TGLn`X()Cf<YpeuObAm1{O6Jk-%herOIC0L6)919wdMt{r
zZ4b96x1*Pmlkuq!`8G!yVKpcCUQbS%0g@NW-QBO1y9ZS?(+IvW*aNPopAu=eMe@bP
zHl7^MVuB~dvzUrf#^kxuq9t#onc7o%o+V0_TaPDG<!7_^#Z1M&_xg$V!rDS>Pz^@o
zyINYv$&G`7d?p2&T0WbUaIf3mghyA(%^fKg*VlVxU9MNdUZTwU`t7RRTfbROszm2!
zlz3&@&wlRnUs!$Sxi2n0_{39-;>7-NHk*kF%Rh(Z8Bm>a+Wt6f|E-joK7r*-yxl31
zC&N--c5-z|T;gO^r%quFlJ@B}5S35*ULX2tzYza_MN;D5z5o6UvTdq(UHkXAhrmS*
zY6k*oA3q)bwEO-Mx%MwS72YHlb!SyeM;UOT(bzhn<zJ&h{EcdUt`>x;X#3Ik2==G6
zZJq!)VzB{xK^$-&XWGA$f5A9q&I6hasGYpHBxjBNIeB7ovA>9`WnuQ<z~lCQq`aY2
z@^N7chrLRfBK6bj3>!%45|Y!+2r#uj3Eb@Jl7`nVjWNS3#V$h_5RlA1pwI<}Jh==y
zuf=U*-{9f|Sa|y;Nn-4;;`^Bf@<p9Syi7q6vKinr0LuP|!o~pDqX2B#{w}Hm^jmTD
zkP!Wwft}cIl2|DF1HQW&plEH*Mmc?pj0@(9*oQ$hf$PeCo9jlHgrlQTCGxzS1K4C$
zTkOI?i~<-T3ak_G#H`VPT#|Fl9?(D<;2_uWZ7vbpwUs{J_Ln@(P#U`+jk1d|Gv=$u
zh3<9=iN#`nLlrOfXMDqEyKjFTmlySU`}#5UQL}XOGJ6j8j?jwz9{D_aPP5-9#mkpN
zP5qG@F;7Z!qKYTl-v*(1lp}!iu<VcQ6k@+aAt$DHTy!6SaLQm;or2=k^YUp1<$R$-
zTD}_%675HDA>t^D|AxF<`zK0<UU>Ux_4~Mj)c=CinYk1w?*z)~yiZV0e~8k|9SWl9
zpMNQ(PxOz9*$B-dp;<T$7|l3qFlaDsbTe(#eA-|#VJIC>8;!Jc+Mps(Y8W;O`EQ2J
zJ9MKfgnvA4Fbj^x4QeT<q3ljhn??^q1A6V%IGivyj^+*W0yJtGiVj^LsyFpt$MB2Q
z`N}@37+5q1-MMA>frz3y1KQNzW9j;P`-Nu3>PrGQ_OC8sR<Mcz8mt6+cz~YrdVhtI
z03Ic=N*#c=A;-SagfYfcIST{!Z#;}~q_Bor3NTDwLq-gQ5X2BR0OYh6^Y-c7q%k**
zToHvk^aL4kdKVtfEVeUyZKcS3>QY4hV?v0)yEKMAAlD(!ibGLfkuRa6S(_QsiQ9$F
zdFe6;PKT-B6w#$eVK)y>yP3^P2pR|uN2~oS(HAX%&QR(gkwqVtV;SOvmdg-3N`PFn
zLTosawQKRb583Lr3{1^$8rL%aNz}p=#W3x6Gg@Pr>~t5916_Av1(EIM3GN_$+2xFW
z-c{TrB(R{09N7k)VP&QlVXWOR%#Lfnw3I=JmjrNQ>@B|<DklU8Xck?2$1Us^`B$KB
z!a*)`W`7AFT;5az`hbR65ICcocTxjhDAAlHnltk7YJNV%qGL_r8TbrLNYT9TngU9F
zvhQ-3r9qctAd|pz*px)(S@-R@p|v1i7&<~@xc|U2{u`lcg9$V{{p=)YFL)XBL*!r%
zeFCU-1|XDyPf&>+u+q(;a8&B*xYQe~vD6tA9*zujaP>v6o6s;Q?LM>HLPtbF3f*Uo
zAt0d>6<uJH;&5JN?8Nv*LA(J!<mhM!OH{)pJXeEK=sX01_M#k03_7vU@nMBv;AV?_
zZg884nP9qvI3R8{dM@!vjSmvlFL=o&*H-+)S=ukq8;6&rNc<F^F<x~wTMOSsb&(*;
z2}4I+B%fbt=nvSqx8F1y8x6ND4@bX=$;8i6lfn*u@RfvB@TK{@2(wDMNpcy6aJxX+
ztA3XQii3KI0mk!Bh0oIP;rp(-Gae1M-0)y<vl_e6EmzL}_m~_EHp{(obGyFlMu*k-
z*6!#|S=ZHIudaHo9=Up44kx#ub?ac*o4CX6(v@yF8eZBf@0K@rE7CXX?GgTU*&S_`
sT)B$>!|avA?M*k@+&mbMtDcA`JpAKZ<4N$Oc(Ufrbqmh|9(?G_2m3?C761SM


From 05816309fd0d04479541baf1bb57adbcf75fedbc Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 22 Nov 2023 12:46:41 +0200
Subject: [PATCH 0090/1254] test temporarily ignored

---
 .../use-module/tests/use_module_scenario_go_test.rs              | 1 +
 1 file changed, 1 insertion(+)

diff --git a/contracts/feature-tests/use-module/tests/use_module_scenario_go_test.rs b/contracts/feature-tests/use-module/tests/use_module_scenario_go_test.rs
index 6b077edad0..5767c9ea08 100644
--- a/contracts/feature-tests/use-module/tests/use_module_scenario_go_test.rs
+++ b/contracts/feature-tests/use-module/tests/use_module_scenario_go_test.rs
@@ -10,6 +10,7 @@ fn use_module_claim_developer_rewards_go() {
 }
 
 #[test]
+#[ignore = "uses multi-level async"]
 fn use_module_dns_register_go() {
     world().run("scenarios/use_module_dns_register.scen.json");
 }

From dc7f5fae63be706216ea7feb3184c1f99862f4b0 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 22 Nov 2023 13:02:20 +0200
Subject: [PATCH 0091/1254] tool-update.sh update

---
 tool-update.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tool-update.sh b/tool-update.sh
index 24f8e3eaf6..f4db0f552b 100755
--- a/tool-update.sh
+++ b/tool-update.sh
@@ -7,6 +7,7 @@ VM_TAG="v1.5.19"
 echo "Before:"
 mxpy config dump
 mxpy config set dependencies.vmtools.tag $VM_TAG
+mxpy config set dependencies.vmtools.urlTemplate.linux https://github.com/multiversx/mx-chain-vm-go/archive/{TAG}.tar.gz
 echo "After:"
 mxpy config dump
 

From f08e3b1b8904e7a6a080fab7288bd3b10e566b0c Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 22 Nov 2023 19:32:39 +0200
Subject: [PATCH 0092/1254] Rust VM upgrade builtin function logs

---
 .../tests/composability_scenario_rs_test.rs   | 17 ++++++++++---
 framework/meta/src/cargo_toml_contents.rs     |  3 +--
 .../scenario/src/facade/scenario_world.rs     | 23 ++++++++++++++---
 framework/scenario/src/lib.rs                 |  2 ++
 vm/src/tx_execution.rs                        |  2 +-
 .../general/upgrade_contract.rs               | 25 ++++++++++++++++---
 vm/src/tx_execution/exec_general_tx.rs        | 14 ++++++-----
 vm/src/tx_mock/tx_input_call_type.rs          |  2 ++
 vm/src/tx_mock/tx_input_function.rs           |  4 +++
 9 files changed, 71 insertions(+), 21 deletions(-)

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 8b8c831340..7e45bdc5ae 100644
--- a/contracts/feature-tests/composability/tests/composability_scenario_rs_test.rs
+++ b/contracts/feature-tests/composability/tests/composability_scenario_rs_test.rs
@@ -36,7 +36,19 @@ fn world() -> ScenarioWorld {
         "file:recursive-caller/output/recursive-caller.wasm",
         recursive_caller::ContractBuilder,
     );
-    blockchain.register_contract("file:vault/output/vault.wasm", vault::ContractBuilder);
+
+    let vault_sc_config =
+        meta::multi_contract_config::<vault::AbiProvider>(&blockchain.current_dir().join("vault"));
+    blockchain.register_contract_variant(
+        "file:vault/output/vault.wasm",
+        vault::ContractBuilder,
+        vault_sc_config.find_contract("vault"),
+    );
+    blockchain.register_contract_variant(
+        "file:vault/output/vault-upgrade.wasm",
+        vault::ContractBuilder,
+        vault_sc_config.find_contract("vault-upgrade"),
+    );
     blockchain
 }
 
@@ -109,13 +121,11 @@ fn forw_raw_contract_deploy_rs() {
 }
 
 #[test]
-#[ignore = "TODO: upgrade endpoint mechanism in Rust VM"]
 fn forw_raw_contract_upgrade_rs() {
     world().run("scenarios/forw_raw_contract_upgrade.scen.json");
 }
 
 #[test]
-#[ignore = "TODO: upgrade endpoint mechanism in Rust VM"]
 fn forw_raw_contract_upgrade_self_rs() {
     world().run("scenarios/forw_raw_contract_upgrade_self.scen.json");
 }
@@ -367,7 +377,6 @@ fn forwarder_contract_deploy_rs() {
 }
 
 #[test]
-#[ignore = "TODO: upgrade endpoint mechanism in Rust VM"]
 fn forwarder_contract_upgrade_rs() {
     world().run("scenarios/forwarder_contract_upgrade.scen.json");
 }
diff --git a/framework/meta/src/cargo_toml_contents.rs b/framework/meta/src/cargo_toml_contents.rs
index 38c611e2ab..0237621924 100644
--- a/framework/meta/src/cargo_toml_contents.rs
+++ b/framework/meta/src/cargo_toml_contents.rs
@@ -10,8 +10,7 @@ use crate::cmd::contract::sc_config::ContractVariantProfile;
 
 pub const CARGO_TOML_DEPENDENCIES: &str = "dependencies";
 pub const CARGO_TOML_DEV_DEPENDENCIES: &str = "dev-dependencies";
-const AUTO_GENERATED: &str =
-    "# Code generated by the multiversx-sc build system. DO NOT EDIT.
+const AUTO_GENERATED: &str = "# Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 # ##########################################
 # ############## AUTO-GENERATED #############
diff --git a/framework/scenario/src/facade/scenario_world.rs b/framework/scenario/src/facade/scenario_world.rs
index 2ed948e2db..aa6f2979b2 100644
--- a/framework/scenario/src/facade/scenario_world.rs
+++ b/framework/scenario/src/facade/scenario_world.rs
@@ -1,5 +1,6 @@
 use multiversx_chain_scenario_format::interpret_trait::InterpretableFrom;
 use multiversx_chain_vm::world_mock::BlockchainState;
+use multiversx_sc_meta::cmd::contract::sc_config::ContractVariant;
 
 use crate::{
     api::DebugApi,
@@ -187,8 +188,22 @@ impl ScenarioWorld {
     {
         let multi_contract_config =
             multiversx_sc_meta::multi_contract_config::<Abi>(self.current_dir.as_path());
-        let sub_contract = multi_contract_config.find_contract(sub_contract_name);
-        let contract_obj = if sub_contract.settings.external_view {
+        let contract_variant = multi_contract_config.find_contract(sub_contract_name);
+        self.register_contract_variant(expression, contract_builder, contract_variant);
+    }
+
+    /// Links a contract path in a test to a multi-contract output.
+    ///
+    /// This simulates the effects of building such a contract with only part of the endpoints.
+    pub fn register_contract_variant<B>(
+        &mut self,
+        expression: &str,
+        contract_builder: B,
+        contract_variant: &ContractVariant,
+    ) where
+        B: CallableContractBuilder,
+    {
+        let contract_obj = if contract_variant.settings.external_view {
             contract_builder.new_contract_obj::<api::ExternalViewApi<DebugApi>>()
         } else {
             contract_builder.new_contract_obj::<DebugApi>()
@@ -198,8 +213,8 @@ impl ScenarioWorld {
             expression,
             ContractContainer::new(
                 contract_obj,
-                Some(sub_contract.all_exported_function_names()),
-                sub_contract.settings.panic_message,
+                Some(contract_variant.all_exported_function_names()),
+                contract_variant.settings.panic_message,
             ),
         );
     }
diff --git a/framework/scenario/src/lib.rs b/framework/scenario/src/lib.rs
index d46d27fc68..0110147ed3 100644
--- a/framework/scenario/src/lib.rs
+++ b/framework/scenario/src/lib.rs
@@ -32,6 +32,8 @@ pub use num_bigint;
 
 pub use multiversx_sc;
 
+pub use multiversx_sc_meta as meta;
+
 /// Exposing the scenario model. Might be moved in the future,
 /// but the export will hopefully remain the same.
 pub use crate::scenario::model as scenario_model;
diff --git a/vm/src/tx_execution.rs b/vm/src/tx_execution.rs
index a3082074b9..e3dd718cc3 100644
--- a/vm/src/tx_execution.rs
+++ b/vm/src/tx_execution.rs
@@ -11,5 +11,5 @@ pub use builtin_function_mocks::*;
 pub use exec_call::*;
 pub use exec_contract_endpoint::*;
 pub use exec_create::*;
-pub use exec_general_tx::*;
+pub(crate) use exec_general_tx::*;
 pub use system_sc::*;
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 d72bb353ae..471c62455d 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
@@ -1,6 +1,8 @@
-use crate::tx_execution::{builtin_function_names::UPGRADE_CONTRACT_FUNC_NAME, BlockchainVMRef};
+use crate::tx_execution::{
+    builtin_function_names::UPGRADE_CONTRACT_FUNC_NAME, create_transfer_value_log, BlockchainVMRef,
+};
 
-use crate::tx_mock::{BlockchainUpdate, TxCache, TxFunctionName, TxInput, TxResult};
+use crate::tx_mock::{BlockchainUpdate, CallType, TxCache, TxFunctionName, TxInput, TxResult};
 
 use super::super::builtin_func_trait::BuiltinFunction;
 
@@ -43,19 +45,34 @@ impl BuiltinFunction for UpgradeContract {
             account.contract_path = Some(new_code);
         });
 
+        let transfer_value_log = create_transfer_value_log(&tx_input, CallType::UpgradeFromSource);
+
         let exec_input = TxInput {
             from: tx_input.from,
             to: tx_input.to,
             egld_value: tx_input.egld_value,
             esdt_values: Vec::new(),
-            func_name: TxFunctionName::INIT,
+            func_name: TxFunctionName::UPGRADE,
             args,
             gas_limit: tx_input.gas_limit,
             gas_price: tx_input.gas_price,
             tx_hash: tx_input.tx_hash,
+            call_type: CallType::UpgradeFromSource,
             ..Default::default()
         };
 
-        vm.default_execution(exec_input, tx_cache, f)
+        let (mut tx_result, blockchain_updates) = vm.default_execution(exec_input, tx_cache, f);
+        adjust_upgrade_log_endpoint(&mut tx_result);
+        tx_result.result_logs.insert(0, transfer_value_log);
+        (tx_result, blockchain_updates)
+    }
+}
+
+/// A small anomaly in the VM: logs from the "upgrade" function appear under "upgradeContract".
+fn adjust_upgrade_log_endpoint(tx_result: &mut TxResult) {
+    for log in &mut tx_result.result_logs {
+        if log.endpoint == TxFunctionName::UPGRADE {
+            log.endpoint = UPGRADE_CONTRACT_FUNC_NAME.into();
+        }
     }
 }
diff --git a/vm/src/tx_execution/exec_general_tx.rs b/vm/src/tx_execution/exec_general_tx.rs
index 26ca1a01ee..748b059db9 100644
--- a/vm/src/tx_execution/exec_general_tx.rs
+++ b/vm/src/tx_execution/exec_general_tx.rs
@@ -35,6 +35,11 @@ fn should_add_transfer_value_log(tx_input: &TxInput) -> bool {
         return false;
     }
 
+    if tx_input.call_type == CallType::UpgradeFromSource {
+        // already handled in upgradeContract builtin function
+        return false;
+    }
+
     if tx_input.call_type != CallType::DirectCall {
         return true;
     }
@@ -43,11 +48,8 @@ fn should_add_transfer_value_log(tx_input: &TxInput) -> bool {
     tx_input.from.is_smart_contract_address() && !tx_input.egld_value.is_zero()
 }
 
-fn create_transfer_value_log(tx_input: &TxInput) -> TxLog {
-    let mut data = vec![
-        tx_input.call_type.to_log_bytes(),
-        tx_input.func_name.to_bytes(),
-    ];
+pub(crate) fn create_transfer_value_log(tx_input: &TxInput, call_type: CallType) -> TxLog {
+    let mut data = vec![call_type.to_log_bytes(), tx_input.func_name.to_bytes()];
     data.append(&mut tx_input.args.clone());
 
     let egld_value = if tx_input.call_type == CallType::AsyncCallback {
@@ -82,7 +84,7 @@ impl BlockchainVMRef {
         }
 
         let transfer_value_log = if should_add_transfer_value_log(&tx_input) {
-            Some(create_transfer_value_log(&tx_input))
+            Some(create_transfer_value_log(&tx_input, tx_input.call_type))
         } else {
             None
         };
diff --git a/vm/src/tx_mock/tx_input_call_type.rs b/vm/src/tx_mock/tx_input_call_type.rs
index 1e2020aa50..a190908379 100644
--- a/vm/src/tx_mock/tx_input_call_type.rs
+++ b/vm/src/tx_mock/tx_input_call_type.rs
@@ -6,6 +6,7 @@ pub enum CallType {
     AsyncCallback,
     TransferExecute,
     BackTransfer,
+    UpgradeFromSource,
 }
 
 impl CallType {
@@ -21,6 +22,7 @@ impl CallType {
             Self::AsyncCallback => "AsyncCallback",
             Self::TransferExecute => "TransferAndExecute",
             Self::BackTransfer => "BackTransfer",
+            Self::UpgradeFromSource => "UpgradeFromSource",
         }
     }
 }
diff --git a/vm/src/tx_mock/tx_input_function.rs b/vm/src/tx_mock/tx_input_function.rs
index 1988a02832..7bc93179c4 100644
--- a/vm/src/tx_mock/tx_input_function.rs
+++ b/vm/src/tx_mock/tx_input_function.rs
@@ -53,6 +53,10 @@ impl TxFunctionName {
     /// The constructor name of any smart contract.
     pub const INIT: TxFunctionName = TxFunctionName::from_static("init");
 
+    /// Gets called exactly once when upgrading to a new version of a smart contract.
+    /// Can be viewed as an "upgrade constructor".
+    pub const UPGRADE: TxFunctionName = TxFunctionName::from_static("upgrade");
+
     /// The the legacy async central callback name of any smart contract.
     pub const CALLBACK: TxFunctionName = TxFunctionName::from_static("callBack");
 

From accb27c0ffdf7f1cf19acbcf888c9704da81ab06 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 22 Nov 2023 19:49:18 +0200
Subject: [PATCH 0093/1254] test fix

---
 contracts/examples/factorial/src/factorial.rs         | 3 +++
 framework/scenario/src/scenario/run_vm/check_state.rs | 5 +++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/contracts/examples/factorial/src/factorial.rs b/contracts/examples/factorial/src/factorial.rs
index 27771cbf1a..509666b86f 100644
--- a/contracts/examples/factorial/src/factorial.rs
+++ b/contracts/examples/factorial/src/factorial.rs
@@ -7,6 +7,9 @@ pub trait Factorial {
     #[init]
     fn init(&self) {}
 
+    #[upgrade]
+    fn upgrade(&self) {}
+
     #[endpoint]
     fn factorial(&self, value: BigUint) -> BigUint {
         let one = BigUint::from(1u32);
diff --git a/framework/scenario/src/scenario/run_vm/check_state.rs b/framework/scenario/src/scenario/run_vm/check_state.rs
index dfcceb5c73..fae07c3591 100644
--- a/framework/scenario/src/scenario/run_vm/check_state.rs
+++ b/framework/scenario/src/scenario/run_vm/check_state.rs
@@ -51,10 +51,11 @@ fn execute(state: &BlockchainState, accounts: &CheckAccounts) {
             let actual_code = account.contract_path.as_ref().unwrap_or(default_value);
             assert!(
                 expected_account.code.check(actual_code),
-                "bad account code. Address: {}. Want: {}. Have: {}",
+                "bad account code. Address: {}. Want: {}. Have: {} ({} bytes)",
                 expected_address,
                 expected_account.code,
-                std::str::from_utf8(actual_code.as_slice()).unwrap()
+                hex::encode(actual_code),
+                actual_code.len(),
             );
 
             assert!(

From cfc27c4eb125cd63ba3f071dac83d791080fccac Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 23 Nov 2023 00:00:24 +0200
Subject: [PATCH 0094/1254] test comment

---
 .../examples/multisig/tests/multisig_scenario_go_test.rs      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/contracts/examples/multisig/tests/multisig_scenario_go_test.rs b/contracts/examples/multisig/tests/multisig_scenario_go_test.rs
index 6e7fc7464e..d7d1dd523c 100644
--- a/contracts/examples/multisig/tests/multisig_scenario_go_test.rs
+++ b/contracts/examples/multisig/tests/multisig_scenario_go_test.rs
@@ -55,13 +55,13 @@ fn deploy_duplicate_bm_go() {
 }
 
 #[test]
-#[ignore = "system SC not yet implemented"]
+#[ignore = "missing 'newTokenIdentifiers' syntax"]
 fn interactor_nft_go() {
     world().run("scenarios/interactor_nft.scen.json");
 }
 
 #[test]
-#[ignore = "system SC not yet implemented"]
+#[ignore = "missing 'newTokenIdentifiers' syntax"]
 fn interactor_nft_all_roles_go() {
     world().run("scenarios/interactor_nft_all_roles.scen.json");
 }

From f3516679f3d2ee08459c2f5cf631a763577be3cd Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 23 Nov 2023 00:00:42 +0200
Subject: [PATCH 0095/1254] un-ignored more tests

---
 ...nario_go_test.rs => nft_minter_scenario_go_test.rs} |  0
 .../nft-minter/tests/nft_minter_scenario_rs_test.rs    | 10 +++++-----
 2 files changed, 5 insertions(+), 5 deletions(-)
 rename contracts/examples/nft-minter/tests/{scenario_go_test.rs => nft_minter_scenario_go_test.rs} (100%)

diff --git a/contracts/examples/nft-minter/tests/scenario_go_test.rs b/contracts/examples/nft-minter/tests/nft_minter_scenario_go_test.rs
similarity index 100%
rename from contracts/examples/nft-minter/tests/scenario_go_test.rs
rename to contracts/examples/nft-minter/tests/nft_minter_scenario_go_test.rs
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 3d3961f1a2..8497945d4e 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
@@ -1,23 +1,23 @@
 use multiversx_sc_scenario::*;
 
 fn world() -> ScenarioWorld {
-    todo!()
-}
+    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
+}
 #[test]
-#[ignore = "not supported"]
 fn buy_nft_rs() {
     world().run("scenarios/buy_nft.scen.json");
 }
 
 #[test]
-#[ignore = "not supported"]
 fn create_nft_rs() {
     world().run("scenarios/create_nft.scen.json");
 }
 
 #[test]
-#[ignore = "not supported"]
 fn init_rs() {
     world().run("scenarios/init.scen.json");
 }

From c71a4f1627def4d50bb8348a440729e5c383fe76 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 23 Nov 2023 00:03:04 +0200
Subject: [PATCH 0096/1254] un-ignored more tests

---
 .../nft-minter/tests/nft_minter_scenario_rs_test.rs  |  1 +
 .../tests/nft_subscription_scenario_rs_test.rs       | 12 ++++++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

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 8497945d4e..bf1c734f41 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
@@ -7,6 +7,7 @@ fn world() -> ScenarioWorld {
     blockchain.register_contract("file:output/nft-minter.wasm", nft_minter::ContractBuilder);
     blockchain
 }
+
 #[test]
 fn buy_nft_rs() {
     world().run("scenarios/buy_nft.scen.json");
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 d37faa2bca..19f11f9ce3 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
@@ -1,23 +1,27 @@
 use multiversx_sc_scenario::*;
 
 fn world() -> ScenarioWorld {
-    todo!()
+    let mut blockchain = ScenarioWorld::new();
+    blockchain.set_current_dir_from_workspace("contracts/examples/nft-subscription");
+
+    blockchain.register_contract(
+        "file:output/nft-subscription.wasm",
+        nft_subscription::ContractBuilder,
+    );
+    blockchain
 }
 
 #[test]
-#[ignore = "not supported"]
 fn test_subscription_rs() {
     world().run("scenarios/test_subscription.scen.json");
 }
 
 #[test]
-#[ignore = "not supported"]
 fn mint_nft_rs() {
     world().run("scenarios/mint_nft.scen.json");
 }
 
 #[test]
-#[ignore = "not supported"]
 fn init_rs() {
     world().run("scenarios/init.scen.json");
 }

From 21781a5b3588c8593be95b28a33e3a85af5a1fb7 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 23 Nov 2023 00:04:18 +0200
Subject: [PATCH 0097/1254] test cleanup

---
 ...io_go_test.rs => nft_subscription_scenario_go_test.rs} | 8 ++++----
 .../tests/nft_subscription_scenario_rs_test.rs            | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)
 rename contracts/examples/nft-subscription/tests/{scenario_go_test.rs => nft_subscription_scenario_go_test.rs} (100%)

diff --git a/contracts/examples/nft-subscription/tests/scenario_go_test.rs b/contracts/examples/nft-subscription/tests/nft_subscription_scenario_go_test.rs
similarity index 100%
rename from contracts/examples/nft-subscription/tests/scenario_go_test.rs
rename to contracts/examples/nft-subscription/tests/nft_subscription_scenario_go_test.rs
index 504c7992b0..d3cdc1eada 100644
--- a/contracts/examples/nft-subscription/tests/scenario_go_test.rs
+++ b/contracts/examples/nft-subscription/tests/nft_subscription_scenario_go_test.rs
@@ -5,8 +5,8 @@ fn world() -> ScenarioWorld {
 }
 
 #[test]
-fn test_subscription_go() {
-    world().run("scenarios/test_subscription.scen.json");
+fn init_go() {
+    world().run("scenarios/init.scen.json");
 }
 
 #[test]
@@ -15,6 +15,6 @@ fn mint_nft_go() {
 }
 
 #[test]
-fn init_go() {
-    world().run("scenarios/init.scen.json");
+fn test_subscription_go() {
+    world().run("scenarios/test_subscription.scen.json");
 }
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 19f11f9ce3..2a5f6f682c 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
@@ -12,8 +12,8 @@ fn world() -> ScenarioWorld {
 }
 
 #[test]
-fn test_subscription_rs() {
-    world().run("scenarios/test_subscription.scen.json");
+fn init_rs() {
+    world().run("scenarios/init.scen.json");
 }
 
 #[test]
@@ -22,6 +22,6 @@ fn mint_nft_rs() {
 }
 
 #[test]
-fn init_rs() {
-    world().run("scenarios/init.scen.json");
+fn test_subscription_rs() {
+    world().run("scenarios/test_subscription.scen.json");
 }

From 1f3794d580bdb7c44251d722321dcaa14c28879c Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 23 Nov 2023 00:13:40 +0200
Subject: [PATCH 0098/1254] un-ignored more tests

---
 .../tests/promises_feature_blackbox_test.rs            |  1 -
 .../tests/composability_scenario_rs_test.rs            |  1 -
 .../tests/esdt_system_sc_mock_scenario_go_test.rs      |  1 -
 .../tests/esdt_system_sc_mock_scenario_rs_test.rs      | 10 ++++++++--
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/contracts/feature-tests/composability/promises-features/tests/promises_feature_blackbox_test.rs b/contracts/feature-tests/composability/promises-features/tests/promises_feature_blackbox_test.rs
index f681c18f29..13323c4489 100644
--- a/contracts/feature-tests/composability/promises-features/tests/promises_feature_blackbox_test.rs
+++ b/contracts/feature-tests/composability/promises-features/tests/promises_feature_blackbox_test.rs
@@ -74,7 +74,6 @@ impl PromisesFeaturesTestState {
 }
 
 #[test]
-#[ignore = "waiting for vm1.5"]
 fn test_back_transfers() {
     let mut state = PromisesFeaturesTestState::new();
     let token_amount = BigUint::from(1000u64);
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 7e45bdc5ae..a6c9fe9eec 100644
--- a/contracts/feature-tests/composability/tests/composability_scenario_rs_test.rs
+++ b/contracts/feature-tests/composability/tests/composability_scenario_rs_test.rs
@@ -75,7 +75,6 @@ fn builtin_func_set_user_name_rs() {
 }
 
 #[test]
-#[ignore = "pending integration in VM 1.5"]
 fn forw_queue_async_rs() {
     world().run("scenarios/forw_queue_async.scen.json");
 }
diff --git a/contracts/feature-tests/esdt-system-sc-mock/tests/esdt_system_sc_mock_scenario_go_test.rs b/contracts/feature-tests/esdt-system-sc-mock/tests/esdt_system_sc_mock_scenario_go_test.rs
index 522ae1efd4..1566e8633f 100644
--- a/contracts/feature-tests/esdt-system-sc-mock/tests/esdt_system_sc_mock_scenario_go_test.rs
+++ b/contracts/feature-tests/esdt-system-sc-mock/tests/esdt_system_sc_mock_scenario_go_test.rs
@@ -5,7 +5,6 @@ fn world() -> ScenarioWorld {
 }
 
 #[test]
-#[ignore = "builtin SC not implemented"]
 fn esdt_system_sc_go() {
     world().run("scenarios/esdt_system_sc.scen.json");
 }
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 d6a56289bf..2ae12b5503 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
@@ -1,11 +1,17 @@
 use multiversx_sc_scenario::*;
 
 fn world() -> ScenarioWorld {
-    todo!()
+    let mut blockchain = ScenarioWorld::new();
+    blockchain.set_current_dir_from_workspace("contracts/feature-tests/esdt-system-sc-mock");
+
+    blockchain.register_contract(
+        "file:output/esdt-system-sc-mock.wasm",
+        esdt_system_sc_mock::ContractBuilder,
+    );
+    blockchain
 }
 
 #[test]
-#[ignore = "builtin SC not implemented"]
 fn esdt_system_sc_rs() {
     world().run("scenarios/esdt_system_sc.scen.json");
 }

From bc3ee518cefa9f27ba33dcb6db4070064bfa3a5c Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 23 Nov 2023 00:27:36 +0200
Subject: [PATCH 0099/1254] back transfer VM hook enabled, test cleanup

---
 Cargo.lock                                                  | 2 +-
 contracts/feature-tests/composability/Cargo.toml            | 5 +++++
 .../composability/promises-features/Cargo.toml              | 3 ---
 .../tests/promises_feature_blackbox_test.rs                 | 4 ++--
 vm/src/vm_hooks/vh_dispatcher.rs                            | 6 +++---
 5 files changed, 11 insertions(+), 9 deletions(-)
 rename contracts/feature-tests/composability/{promises-features => }/tests/promises_feature_blackbox_test.rs (94%)

diff --git a/Cargo.lock b/Cargo.lock
index 9dd97ceba2..722ad8b23a 100755
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -512,6 +512,7 @@ dependencies = [
  "forwarder",
  "forwarder-queue",
  "forwarder-raw",
+ "multiversx-sc",
  "multiversx-sc-scenario",
  "promises-features",
  "proxy-test-first",
@@ -2440,7 +2441,6 @@ name = "promises-features"
 version = "0.0.0"
 dependencies = [
  "multiversx-sc",
- "multiversx-sc-scenario",
  "vault",
 ]
 
diff --git a/contracts/feature-tests/composability/Cargo.toml b/contracts/feature-tests/composability/Cargo.toml
index 3e4c350910..50bf74e174 100644
--- a/contracts/feature-tests/composability/Cargo.toml
+++ b/contracts/feature-tests/composability/Cargo.toml
@@ -32,6 +32,11 @@ path = "recursive-caller"
 [dev-dependencies.vault]
 path = "vault"
 
+[dependencies.multiversx-sc]
+version = "0.44.0"
+path = "../../../framework/base"
+features = ["promises", "back-transfers"]
+
 [dev-dependencies.multiversx-sc-scenario]
 version = "0.44.0"
 path = "../../../framework/scenario"
diff --git a/contracts/feature-tests/composability/promises-features/Cargo.toml b/contracts/feature-tests/composability/promises-features/Cargo.toml
index 4a8deceba6..811d3546ac 100644
--- a/contracts/feature-tests/composability/promises-features/Cargo.toml
+++ b/contracts/feature-tests/composability/promises-features/Cargo.toml
@@ -16,6 +16,3 @@ version = "0.44.0"
 path = "../../../../framework/base"
 features = ["promises", "back-transfers"]
 
-[dev-dependencies.multiversx-sc-scenario]
-version = "0.44.0"
-path = "../../../../framework/scenario"
diff --git a/contracts/feature-tests/composability/promises-features/tests/promises_feature_blackbox_test.rs b/contracts/feature-tests/composability/tests/promises_feature_blackbox_test.rs
similarity index 94%
rename from contracts/feature-tests/composability/promises-features/tests/promises_feature_blackbox_test.rs
rename to contracts/feature-tests/composability/tests/promises_feature_blackbox_test.rs
index 13323c4489..eb04c5e19f 100644
--- a/contracts/feature-tests/composability/promises-features/tests/promises_feature_blackbox_test.rs
+++ b/contracts/feature-tests/composability/tests/promises_feature_blackbox_test.rs
@@ -9,7 +9,7 @@ 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:output/promises-feature.wasm";
+const PROMISES_FEATURES_PATH_EXPR: &str = "file:promises-features/output/promises-feature.wasm";
 const VAULT_ADDRESS_EXPR: &str = "sc:vault";
 const VAULT_PATH_EXPR: &str = "file:../vault/output/vault.wasm";
 
@@ -21,7 +21,7 @@ type VaultContract = ContractInfo<vault::Proxy<StaticApi>>;
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
-    blockchain.set_current_dir_from_workspace("contracts/composability/promises-feature");
+    blockchain.set_current_dir_from_workspace("contracts/feature-tests/composability");
 
     blockchain.register_contract(
         PROMISES_FEATURES_PATH_EXPR,
diff --git a/vm/src/vm_hooks/vh_dispatcher.rs b/vm/src/vm_hooks/vh_dispatcher.rs
index 694e65eead..a3aff887d1 100644
--- a/vm/src/vm_hooks/vh_dispatcher.rs
+++ b/vm/src/vm_hooks/vh_dispatcher.rs
@@ -699,10 +699,10 @@ impl VMHooks for VMHooksDispatcher {
 
     fn managed_get_back_transfers(
         &self,
-        _esdt_transfer_value_handle: i32,
-        _call_value_handle: i32,
+        esdt_transfer_value_handle: i32,
+        call_value_handle: i32,
     ) {
-        panic!("Unavailable: managed_get_back_transfers");
+        self.handler.managed_get_back_transfers(esdt_transfer_value_handle, call_value_handle);
     }
 
     fn managed_async_call(

From 7edb470678c99e95ff183072c58cd3fabcdc8237 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 23 Nov 2023 00:38:14 +0200
Subject: [PATCH 0100/1254] integrated promises tests

---
 ...arder_call_sync_retrieve_egld_bt.scen.json |  0
 ...arder_call_sync_retrieve_esdt_bt.scen.json |  0
 ...warder_call_sync_retrieve_nft_bt.scen.json |  0
 .../promises_call_async_accept_egld.scen.json |  0
 .../promises_call_async_accept_esdt.scen.json |  0
 ...romises_call_async_retrieve_egld.scen.json |  0
 ...romises_call_async_retrieve_esdt.scen.json |  0
 .../promises_call_callback_directly.scen.json |  0
 .../promises_multi_transfer.scen.json         |  0
 .../promises_single_transfer.scen.json        |  0
 .../promises_single_transfer_gas1.scen.json   |  0
 .../promises_single_transfer_gas2.scen.json   |  0
 .../tests/composability_scenario_go_test.rs   | 75 +++++++++++++++---
 .../tests/composability_scenario_rs_test.rs   | 78 ++++++++++++++++---
 14 files changed, 133 insertions(+), 20 deletions(-)
 rename contracts/feature-tests/composability/{scenarios-promises => scenarios}/forwarder_call_sync_retrieve_egld_bt.scen.json (100%)
 rename contracts/feature-tests/composability/{scenarios-promises => scenarios}/forwarder_call_sync_retrieve_esdt_bt.scen.json (100%)
 rename contracts/feature-tests/composability/{scenarios-promises => scenarios}/forwarder_call_sync_retrieve_nft_bt.scen.json (100%)
 rename contracts/feature-tests/composability/{scenarios-promises => scenarios}/promises_call_async_accept_egld.scen.json (100%)
 rename contracts/feature-tests/composability/{scenarios-promises => scenarios}/promises_call_async_accept_esdt.scen.json (100%)
 rename contracts/feature-tests/composability/{scenarios-promises => scenarios}/promises_call_async_retrieve_egld.scen.json (100%)
 rename contracts/feature-tests/composability/{scenarios-promises => scenarios}/promises_call_async_retrieve_esdt.scen.json (100%)
 rename contracts/feature-tests/composability/{scenarios-promises => scenarios}/promises_call_callback_directly.scen.json (100%)
 rename contracts/feature-tests/composability/{scenarios-promises => scenarios}/promises_multi_transfer.scen.json (100%)
 rename contracts/feature-tests/composability/{scenarios-promises => scenarios}/promises_single_transfer.scen.json (100%)
 rename contracts/feature-tests/composability/{scenarios-promises => scenarios}/promises_single_transfer_gas1.scen.json (100%)
 rename contracts/feature-tests/composability/{scenarios-promises => scenarios}/promises_single_transfer_gas2.scen.json (100%)

diff --git a/contracts/feature-tests/composability/scenarios-promises/forwarder_call_sync_retrieve_egld_bt.scen.json b/contracts/feature-tests/composability/scenarios/forwarder_call_sync_retrieve_egld_bt.scen.json
similarity index 100%
rename from contracts/feature-tests/composability/scenarios-promises/forwarder_call_sync_retrieve_egld_bt.scen.json
rename to contracts/feature-tests/composability/scenarios/forwarder_call_sync_retrieve_egld_bt.scen.json
diff --git a/contracts/feature-tests/composability/scenarios-promises/forwarder_call_sync_retrieve_esdt_bt.scen.json b/contracts/feature-tests/composability/scenarios/forwarder_call_sync_retrieve_esdt_bt.scen.json
similarity index 100%
rename from contracts/feature-tests/composability/scenarios-promises/forwarder_call_sync_retrieve_esdt_bt.scen.json
rename to contracts/feature-tests/composability/scenarios/forwarder_call_sync_retrieve_esdt_bt.scen.json
diff --git a/contracts/feature-tests/composability/scenarios-promises/forwarder_call_sync_retrieve_nft_bt.scen.json b/contracts/feature-tests/composability/scenarios/forwarder_call_sync_retrieve_nft_bt.scen.json
similarity index 100%
rename from contracts/feature-tests/composability/scenarios-promises/forwarder_call_sync_retrieve_nft_bt.scen.json
rename to contracts/feature-tests/composability/scenarios/forwarder_call_sync_retrieve_nft_bt.scen.json
diff --git a/contracts/feature-tests/composability/scenarios-promises/promises_call_async_accept_egld.scen.json b/contracts/feature-tests/composability/scenarios/promises_call_async_accept_egld.scen.json
similarity index 100%
rename from contracts/feature-tests/composability/scenarios-promises/promises_call_async_accept_egld.scen.json
rename to contracts/feature-tests/composability/scenarios/promises_call_async_accept_egld.scen.json
diff --git a/contracts/feature-tests/composability/scenarios-promises/promises_call_async_accept_esdt.scen.json b/contracts/feature-tests/composability/scenarios/promises_call_async_accept_esdt.scen.json
similarity index 100%
rename from contracts/feature-tests/composability/scenarios-promises/promises_call_async_accept_esdt.scen.json
rename to contracts/feature-tests/composability/scenarios/promises_call_async_accept_esdt.scen.json
diff --git a/contracts/feature-tests/composability/scenarios-promises/promises_call_async_retrieve_egld.scen.json b/contracts/feature-tests/composability/scenarios/promises_call_async_retrieve_egld.scen.json
similarity index 100%
rename from contracts/feature-tests/composability/scenarios-promises/promises_call_async_retrieve_egld.scen.json
rename to contracts/feature-tests/composability/scenarios/promises_call_async_retrieve_egld.scen.json
diff --git a/contracts/feature-tests/composability/scenarios-promises/promises_call_async_retrieve_esdt.scen.json b/contracts/feature-tests/composability/scenarios/promises_call_async_retrieve_esdt.scen.json
similarity index 100%
rename from contracts/feature-tests/composability/scenarios-promises/promises_call_async_retrieve_esdt.scen.json
rename to contracts/feature-tests/composability/scenarios/promises_call_async_retrieve_esdt.scen.json
diff --git a/contracts/feature-tests/composability/scenarios-promises/promises_call_callback_directly.scen.json b/contracts/feature-tests/composability/scenarios/promises_call_callback_directly.scen.json
similarity index 100%
rename from contracts/feature-tests/composability/scenarios-promises/promises_call_callback_directly.scen.json
rename to contracts/feature-tests/composability/scenarios/promises_call_callback_directly.scen.json
diff --git a/contracts/feature-tests/composability/scenarios-promises/promises_multi_transfer.scen.json b/contracts/feature-tests/composability/scenarios/promises_multi_transfer.scen.json
similarity index 100%
rename from contracts/feature-tests/composability/scenarios-promises/promises_multi_transfer.scen.json
rename to contracts/feature-tests/composability/scenarios/promises_multi_transfer.scen.json
diff --git a/contracts/feature-tests/composability/scenarios-promises/promises_single_transfer.scen.json b/contracts/feature-tests/composability/scenarios/promises_single_transfer.scen.json
similarity index 100%
rename from contracts/feature-tests/composability/scenarios-promises/promises_single_transfer.scen.json
rename to contracts/feature-tests/composability/scenarios/promises_single_transfer.scen.json
diff --git a/contracts/feature-tests/composability/scenarios-promises/promises_single_transfer_gas1.scen.json b/contracts/feature-tests/composability/scenarios/promises_single_transfer_gas1.scen.json
similarity index 100%
rename from contracts/feature-tests/composability/scenarios-promises/promises_single_transfer_gas1.scen.json
rename to contracts/feature-tests/composability/scenarios/promises_single_transfer_gas1.scen.json
diff --git a/contracts/feature-tests/composability/scenarios-promises/promises_single_transfer_gas2.scen.json b/contracts/feature-tests/composability/scenarios/promises_single_transfer_gas2.scen.json
similarity index 100%
rename from contracts/feature-tests/composability/scenarios-promises/promises_single_transfer_gas2.scen.json
rename to contracts/feature-tests/composability/scenarios/promises_single_transfer_gas2.scen.json
diff --git a/contracts/feature-tests/composability/tests/composability_scenario_go_test.rs b/contracts/feature-tests/composability/tests/composability_scenario_go_test.rs
index c16a373593..231390b7a8 100644
--- a/contracts/feature-tests/composability/tests/composability_scenario_go_test.rs
+++ b/contracts/feature-tests/composability/tests/composability_scenario_go_test.rs
@@ -4,15 +4,6 @@ fn world() -> ScenarioWorld {
     ScenarioWorld::vm_go()
 }
 
-#[test]
-fn promises_multi_transfer_go() {
-    world().run("scenarios-promises/promises_multi_transfer.scen.json");
-}
-
-#[test]
-fn promises_single_transfer_go() {
-    world().run("scenarios-promises/promises_single_transfer.scen.json");
-}
 
 #[test]
 fn builtin_func_delete_user_name_go() {
@@ -249,16 +240,31 @@ fn forwarder_call_sync_retrieve_egld_go() {
     world().run("scenarios/forwarder_call_sync_retrieve_egld.scen.json");
 }
 
+#[test]
+fn forwarder_call_sync_retrieve_egld_bt_go() {
+    world().run("scenarios/forwarder_call_sync_retrieve_egld_bt.scen.json");
+}
+
 #[test]
 fn forwarder_call_sync_retrieve_esdt_go() {
     world().run("scenarios/forwarder_call_sync_retrieve_esdt.scen.json");
 }
 
+#[test]
+fn forwarder_call_sync_retrieve_esdt_bt_go() {
+    world().run("scenarios/forwarder_call_sync_retrieve_esdt_bt.scen.json");
+}
+
 #[test]
 fn forwarder_call_sync_retrieve_nft_go() {
     world().run("scenarios/forwarder_call_sync_retrieve_nft.scen.json");
 }
 
+#[test]
+fn forwarder_call_sync_retrieve_nft_bt_go() {
+    world().run("scenarios/forwarder_call_sync_retrieve_nft_bt.scen.json");
+}
+
 #[test]
 fn forwarder_call_transf_exec_accept_egld_go() {
     world().run("scenarios/forwarder_call_transf_exec_accept_egld.scen.json");
@@ -404,6 +410,57 @@ fn forwarder_validate_token_identifier_go() {
     world().run("scenarios/forwarder_validate_token_identifier.scen.json");
 }
 
+#[test]
+fn promises_call_async_accept_egld_go() {
+    world().run("scenarios/promises_call_async_accept_egld.scen.json");
+}
+
+#[test]
+fn promises_call_async_accept_esdt_go() {
+    world().run("scenarios/promises_call_async_accept_esdt.scen.json");
+}
+
+#[test]
+#[ignore = "TODO"]
+fn promises_call_async_retrieve_egld_go() {
+    world().run("scenarios/promises_call_async_retrieve_egld.scen.json");
+}
+
+#[test]
+#[ignore = "TODO"]
+fn promises_call_async_retrieve_esdt_go() {
+    world().run("scenarios/promises_call_async_retrieve_esdt.scen.json");
+}
+
+#[test]
+#[ignore = "TODO"]
+fn promises_call_callback_directly_go() {
+    world().run("scenarios/promises_call_callback_directly.scen.json");
+}
+
+#[test]
+#[ignore = "TODO"]
+fn promises_multi_transfer_go() {
+    world().run("scenarios/promises_multi_transfer.scen.json");
+}
+
+#[test]
+fn promises_single_transfer_go() {
+    world().run("scenarios/promises_single_transfer.scen.json");
+}
+
+#[test]
+#[ignore = "gas"]
+fn promises_single_transfer_gas_1_go() {
+    world().run("scenarios/promises_single_transfer_gas1.scen.json");
+}
+
+#[test]
+#[ignore = "gas"]
+fn promises_single_transfer_gas_2_go() {
+    world().run("scenarios/promises_single_transfer_gas2.scen.json");
+}
+
 #[test]
 fn proxy_test_init_go() {
     world().run("scenarios/proxy_test_init.scen.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 a6c9fe9eec..0a896003e8 100644
--- a/contracts/feature-tests/composability/tests/composability_scenario_rs_test.rs
+++ b/contracts/feature-tests/composability/tests/composability_scenario_rs_test.rs
@@ -52,17 +52,6 @@ fn world() -> ScenarioWorld {
     blockchain
 }
 
-#[test]
-#[ignore = "not yet supported"]
-fn promises_multi_transfer_rs() {
-    world().run("scenarios-promises/promises_multi_transfer.scen.json");
-}
-
-#[test]
-#[ignore = "not yet supported"]
-fn promises_single_transfer_rs() {
-    world().run("scenarios-promises/promises_single_transfer.scen.json");
-}
 
 #[test]
 fn builtin_func_delete_user_name_rs() {
@@ -305,16 +294,31 @@ fn forwarder_call_sync_retrieve_egld_rs() {
     world().run("scenarios/forwarder_call_sync_retrieve_egld.scen.json");
 }
 
+#[test]
+fn forwarder_call_sync_retrieve_egld_bt_rs() {
+    world().run("scenarios/forwarder_call_sync_retrieve_egld_bt.scen.json");
+}
+
 #[test]
 fn forwarder_call_sync_retrieve_esdt_rs() {
     world().run("scenarios/forwarder_call_sync_retrieve_esdt.scen.json");
 }
 
+#[test]
+fn forwarder_call_sync_retrieve_esdt_bt_rs() {
+    world().run("scenarios/forwarder_call_sync_retrieve_esdt_bt.scen.json");
+}
+
 #[test]
 fn forwarder_call_sync_retrieve_nft_rs() {
     world().run("scenarios/forwarder_call_sync_retrieve_nft.scen.json");
 }
 
+#[test]
+fn forwarder_call_sync_retrieve_nft_bt_rs() {
+    world().run("scenarios/forwarder_call_sync_retrieve_nft_bt.scen.json");
+}
+
 #[test]
 fn forwarder_call_transf_exec_accept_egld_rs() {
     world().run("scenarios/forwarder_call_transf_exec_accept_egld.scen.json");
@@ -460,6 +464,58 @@ fn forwarder_validate_token_identifier_rs() {
     world().run("scenarios/forwarder_validate_token_identifier.scen.json");
 }
 
+#[test]
+fn promises_call_async_accept_egld_rs() {
+    world().run("scenarios/promises_call_async_accept_egld.scen.json");
+}
+
+#[test]
+fn promises_call_async_accept_esdt_rs() {
+    world().run("scenarios/promises_call_async_accept_esdt.scen.json");
+}
+
+#[test]
+#[ignore = "TODO"]
+fn promises_call_async_retrieve_egld_rs() {
+    world().run("scenarios/promises_call_async_retrieve_egld.scen.json");
+}
+
+#[test]
+#[ignore = "TODO"]
+fn promises_call_async_retrieve_esdt_rs() {
+    world().run("scenarios/promises_call_async_retrieve_esdt.scen.json");
+}
+
+#[test]
+#[ignore = "TODO"]
+fn promises_call_callback_directly_rs() {
+    world().run("scenarios/promises_call_callback_directly.scen.json");
+}
+
+#[test]
+#[ignore = "TODO"]
+fn promises_multi_transfer_rs() {
+    world().run("scenarios/promises_multi_transfer.scen.json");
+}
+
+#[test]
+#[ignore = "TODO"]
+fn promises_single_transfer_rs() {
+    world().run("scenarios/promises_single_transfer.scen.json");
+}
+
+#[test]
+#[ignore = "gas"]
+fn promises_single_transfer_gas_1_rs() {
+    world().run("scenarios/promises_single_transfer_gas1.scen.json");
+}
+
+#[test]
+#[ignore = "gas"]
+fn promises_single_transfer_gas_2_rs() {
+    world().run("scenarios/promises_single_transfer_gas2.scen.json");
+}
+
 #[test]
 fn proxy_test_init_rs() {
     world().run("scenarios/proxy_test_init.scen.json");

From cafe86606188f8ea72b89da1780654a3de9f34c2 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 23 Nov 2023 12:55:19 +0200
Subject: [PATCH 0101/1254] rust VM - cannot call callback directly

---
 .../tests/composability_scenario_go_test.rs              | 1 -
 .../tests/composability_scenario_rs_test.rs              | 2 --
 vm/src/tx_mock/tx_async_call_data.rs                     | 2 +-
 vm/src/tx_mock/tx_input.rs                               | 4 ++--
 vm/src/vm_err_msg.rs                                     | 3 +++
 vm/src/vm_hooks/vh_dispatcher.rs                         | 9 +++------
 vm/src/vm_hooks/vh_handler/vh_endpoint_arg.rs            | 9 ++++++---
 7 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/contracts/feature-tests/composability/tests/composability_scenario_go_test.rs b/contracts/feature-tests/composability/tests/composability_scenario_go_test.rs
index 231390b7a8..8f61befdbe 100644
--- a/contracts/feature-tests/composability/tests/composability_scenario_go_test.rs
+++ b/contracts/feature-tests/composability/tests/composability_scenario_go_test.rs
@@ -4,7 +4,6 @@ fn world() -> ScenarioWorld {
     ScenarioWorld::vm_go()
 }
 
-
 #[test]
 fn builtin_func_delete_user_name_go() {
     world().run("scenarios/builtin_func_delete_user_name.scen.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 0a896003e8..8d87a6f1fa 100644
--- a/contracts/feature-tests/composability/tests/composability_scenario_rs_test.rs
+++ b/contracts/feature-tests/composability/tests/composability_scenario_rs_test.rs
@@ -52,7 +52,6 @@ fn world() -> ScenarioWorld {
     blockchain
 }
 
-
 #[test]
 fn builtin_func_delete_user_name_rs() {
     world().run("scenarios/builtin_func_delete_user_name.scen.json");
@@ -487,7 +486,6 @@ fn promises_call_async_retrieve_esdt_rs() {
 }
 
 #[test]
-#[ignore = "TODO"]
 fn promises_call_callback_directly_rs() {
     world().run("scenarios/promises_call_callback_directly.scen.json");
 }
diff --git a/vm/src/tx_mock/tx_async_call_data.rs b/vm/src/tx_mock/tx_async_call_data.rs
index 225e9afa1d..52efa9c01c 100644
--- a/vm/src/tx_mock/tx_async_call_data.rs
+++ b/vm/src/tx_mock/tx_async_call_data.rs
@@ -127,7 +127,7 @@ pub fn async_promise_tx_input(
         gas_limit: 1000,
         gas_price: 0,
         tx_hash: promise.call.tx_hash.clone(),
-        promise_callback_closure_data: promise.callback_closure_data.clone(),
+        promise_callback_closure_data: Some(promise.callback_closure_data.clone()),
         ..Default::default()
     }
 }
diff --git a/vm/src/tx_mock/tx_input.rs b/vm/src/tx_mock/tx_input.rs
index bbdfb93ae2..1e7de12424 100644
--- a/vm/src/tx_mock/tx_input.rs
+++ b/vm/src/tx_mock/tx_input.rs
@@ -21,7 +21,7 @@ pub struct TxInput {
     pub gas_limit: u64,
     pub gas_price: u64,
     pub tx_hash: H256,
-    pub promise_callback_closure_data: Vec<u8>,
+    pub promise_callback_closure_data: Option<Vec<u8>>,
     pub callback_payments: CallbackPayments,
 }
 
@@ -38,7 +38,7 @@ impl Default for TxInput {
             gas_limit: 0,
             gas_price: 0,
             tx_hash: H256::zero(),
-            promise_callback_closure_data: Vec::new(),
+            promise_callback_closure_data: None,
             callback_payments: Default::default(),
         }
     }
diff --git a/vm/src/vm_err_msg.rs b/vm/src/vm_err_msg.rs
index 894bbfa654..339e926f4f 100644
--- a/vm/src/vm_err_msg.rs
+++ b/vm/src/vm_err_msg.rs
@@ -11,3 +11,6 @@ pub const NUMBER_IS_NOT_NORMAL: &str =
 pub const CANNOT_COMPARE_VALUES: &str = "values are not comparable";
 
 pub const ERROR_SIGNALLED_BY_SMARTCONTRACT: &str = "error signalled by smartcontract";
+
+pub const ERROR_NO_CALLBACK_CLOSURE: &str =
+    "no callback for closure, cannot call callback directly";
diff --git a/vm/src/vm_hooks/vh_dispatcher.rs b/vm/src/vm_hooks/vh_dispatcher.rs
index a3aff887d1..539e1170ca 100644
--- a/vm/src/vm_hooks/vh_dispatcher.rs
+++ b/vm/src/vm_hooks/vh_dispatcher.rs
@@ -697,12 +697,9 @@ impl VMHooks for VMHooksDispatcher {
         );
     }
 
-    fn managed_get_back_transfers(
-        &self,
-        esdt_transfer_value_handle: i32,
-        call_value_handle: i32,
-    ) {
-        self.handler.managed_get_back_transfers(esdt_transfer_value_handle, call_value_handle);
+    fn managed_get_back_transfers(&self, esdt_transfer_value_handle: i32, call_value_handle: i32) {
+        self.handler
+            .managed_get_back_transfers(esdt_transfer_value_handle, call_value_handle);
     }
 
     fn managed_async_call(
diff --git a/vm/src/vm_hooks/vh_handler/vh_endpoint_arg.rs b/vm/src/vm_hooks/vh_handler/vh_endpoint_arg.rs
index 8b7e9d053c..4feb3b8042 100644
--- a/vm/src/vm_hooks/vh_handler/vh_endpoint_arg.rs
+++ b/vm/src/vm_hooks/vh_handler/vh_endpoint_arg.rs
@@ -1,7 +1,7 @@
 use num_bigint::{BigInt, BigUint};
 use num_traits::ToPrimitive;
 
-use crate::vm_hooks::VMHooksHandlerSource;
+use crate::{vm_err_msg::ERROR_NO_CALLBACK_CLOSURE, vm_hooks::VMHooksHandlerSource};
 
 use crate::types::RawHandle;
 
@@ -47,7 +47,10 @@ pub trait VMHooksEndpointArgument: VMHooksHandlerSource + VMHooksManagedTypes {
     }
 
     fn load_callback_closure_buffer(&self, dest: RawHandle) {
-        let closure_data = self.input_ref().promise_callback_closure_data.clone();
-        self.m_types_lock().mb_set(dest, closure_data);
+        if let Some(closure_data) = &self.input_ref().promise_callback_closure_data {
+            self.m_types_lock().mb_set(dest, closure_data.clone());
+        } else {
+            self.vm_error(ERROR_NO_CALLBACK_CLOSURE);
+        }
     }
 }

From a15afdcf3389a65aa5b385b072e663fdb19909b9 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Thu, 23 Nov 2023 14:28:21 +0100
Subject: [PATCH 0102/1254] changed implementation for find_workspace, removed
 duplicated and added it to the build process

---
 .../src/cmd/contract/sc_config/wasm_build.rs  |  4 +++
 framework/meta/src/lib.rs                     |  1 +
 framework/meta/src/tools.rs                   |  1 +
 framework/meta/src/tools/find_workspace.rs    | 33 +++++++++++++++++++
 framework/meta/tests/template_test.rs         | 26 ++-------------
 .../scenario/src/facade/scenario_world.rs     | 17 +---------
 6 files changed, 43 insertions(+), 39 deletions(-)
 create mode 100644 framework/meta/src/tools/find_workspace.rs

diff --git a/framework/meta/src/cmd/contract/sc_config/wasm_build.rs b/framework/meta/src/cmd/contract/sc_config/wasm_build.rs
index 879a726a09..b2a39b12b6 100644
--- a/framework/meta/src/cmd/contract/sc_config/wasm_build.rs
+++ b/framework/meta/src/cmd/contract/sc_config/wasm_build.rs
@@ -5,6 +5,7 @@ use crate::{
     abi_json::ContractAbiJson,
     cli_args::BuildArgs,
     ei::EIVersion,
+    find_workspace::{find_workspace, print_searching_for_workspace},
     mxsc_file_json::{save_mxsc_file_json, MxscFileJson},
     print_util::*,
     tools,
@@ -37,6 +38,9 @@ impl ContractVariant {
         }
         if let Some(target_dir_wasm) = &build_args.target_dir_wasm {
             command.args(["--target-dir", target_dir_wasm]);
+        } else {
+            print_searching_for_workspace();
+            command.args(["--target-dir", find_workspace().to_str().unwrap()]);
         }
         let rustflags = self.compose_rustflags(build_args);
         if !rustflags.is_empty() {
diff --git a/framework/meta/src/lib.rs b/framework/meta/src/lib.rs
index e6dd8e9298..601021ae3d 100644
--- a/framework/meta/src/lib.rs
+++ b/framework/meta/src/lib.rs
@@ -8,6 +8,7 @@ pub mod folder_structure;
 mod mxsc_file_json;
 mod print_util;
 mod tools;
+pub use tools::find_workspace;
 pub mod version_history;
 
 #[macro_use]
diff --git a/framework/meta/src/tools.rs b/framework/meta/src/tools.rs
index c3bd3e6c84..6561a2e860 100644
--- a/framework/meta/src/tools.rs
+++ b/framework/meta/src/tools.rs
@@ -3,6 +3,7 @@ pub mod twiggy;
 mod wasm_imports;
 mod wasm_opt;
 mod wasm_to_wat;
+pub mod find_workspace;
 
 pub use git_describe::git_describe;
 pub use wasm_imports::extract_wasm_imports;
diff --git a/framework/meta/src/tools/find_workspace.rs b/framework/meta/src/tools/find_workspace.rs
new file mode 100644
index 0000000000..123beb847a
--- /dev/null
+++ b/framework/meta/src/tools/find_workspace.rs
@@ -0,0 +1,33 @@
+use std::path::{Path, PathBuf};
+
+use colored::Colorize;
+
+/// Finds the workspace by taking the `current_exe` and working its way up.
+/// Works in debug mode too.
+///
+pub fn find_workspace() -> PathBuf {
+    let output = std::process::Command::new(env!("CARGO"))
+        .arg("locate-project")
+        .arg("--workspace")
+        .arg("--message-format=plain")
+        .output()
+        .unwrap()
+        .stdout;
+    let cargo_path = Path::new(std::str::from_utf8(&output).unwrap().trim());
+    print_found_workspace(cargo_path.parent().unwrap());
+    cargo_path.parent().unwrap().to_path_buf()
+}
+
+pub fn print_searching_for_workspace() {
+    println!(
+        "{}",
+        format!("No --target-dir specified. Searching for workspace ...").yellow()
+    );
+}
+
+pub fn print_found_workspace(path: &Path) {
+    println!(
+        "{}",
+        format!("Workspace found: {} ...", path.display()).green()
+    );
+}
diff --git a/framework/meta/tests/template_test.rs b/framework/meta/tests/template_test.rs
index 9ef068ee42..1b72320ea2 100644
--- a/framework/meta/tests/template_test.rs
+++ b/framework/meta/tests/template_test.rs
@@ -1,14 +1,12 @@
+use std::{fs, process::Command};
+
 use multiversx_sc_meta::{
     cmd::standalone::template::{
         template_names_from_repo, ContractCreator, ContractCreatorTarget, RepoSource, RepoVersion,
     },
+    find_workspace::find_workspace,
     version_history,
 };
-use std::{
-    fs,
-    path::{Path, PathBuf},
-    process::Command,
-};
 
 const TEMPLATE_TEMP_DIR_NAME: &str = "template-test";
 const BUILD_CONTRACTS: bool = true;
@@ -181,21 +179,3 @@ pub fn build_contract(target: &ContractCreatorTarget) {
 
     assert!(exit_status.success(), "contract build process failed");
 }
-
-/// Finds the workspace by taking the `current_exe` and working its way up.
-/// Works in debug mode too.
-///
-/// TODO: duplicated code from scenario_world. De-duplicate after dependencies are reorganized.
-pub fn find_workspace() -> PathBuf {
-    let current_exe = std::env::current_exe().unwrap();
-    let mut path = current_exe.as_path();
-    while !is_target(path) {
-        path = path.parent().unwrap();
-    }
-
-    path.parent().unwrap().into()
-}
-
-fn is_target(path_buf: &Path) -> bool {
-    path_buf.file_name().unwrap() == "target"
-}
diff --git a/framework/scenario/src/facade/scenario_world.rs b/framework/scenario/src/facade/scenario_world.rs
index 2ed948e2db..9c4eeeba2e 100644
--- a/framework/scenario/src/facade/scenario_world.rs
+++ b/framework/scenario/src/facade/scenario_world.rs
@@ -1,6 +1,6 @@
 use multiversx_chain_scenario_format::interpret_trait::InterpretableFrom;
 use multiversx_chain_vm::world_mock::BlockchainState;
-
+use multiversx_sc_meta::find_workspace::find_workspace;
 use crate::{
     api::DebugApi,
     debug_executor::ContractContainer,
@@ -222,18 +222,3 @@ impl ScenarioWorld {
     }
 }
 
-/// Finds the workspace by taking the `current_exe` and working its way up.
-/// Works in debug mode too.
-pub fn find_workspace() -> PathBuf {
-    let current_exe = std::env::current_exe().unwrap();
-    let mut path = current_exe.as_path();
-    while !is_target(path) {
-        path = path.parent().unwrap();
-    }
-
-    path.parent().unwrap().into()
-}
-
-fn is_target(path_buf: &Path) -> bool {
-    path_buf.file_name().unwrap() == "target"
-}

From 12e531e58942ce7130a0ae915f5599da07ba84c4 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Thu, 23 Nov 2023 15:09:25 +0100
Subject: [PATCH 0103/1254] clippy, comment change and fmt

---
 framework/meta/src/tools.rs                     |  2 +-
 framework/meta/src/tools/find_workspace.rs      | 13 ++++++-------
 framework/scenario/src/facade/scenario_world.rs |  7 +++----
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/framework/meta/src/tools.rs b/framework/meta/src/tools.rs
index 6561a2e860..45ae256f2f 100644
--- a/framework/meta/src/tools.rs
+++ b/framework/meta/src/tools.rs
@@ -1,9 +1,9 @@
+pub mod find_workspace;
 mod git_describe;
 pub mod twiggy;
 mod wasm_imports;
 mod wasm_opt;
 mod wasm_to_wat;
-pub mod find_workspace;
 
 pub use git_describe::git_describe;
 pub use wasm_imports::extract_wasm_imports;
diff --git a/framework/meta/src/tools/find_workspace.rs b/framework/meta/src/tools/find_workspace.rs
index 123beb847a..b77035ae69 100644
--- a/framework/meta/src/tools/find_workspace.rs
+++ b/framework/meta/src/tools/find_workspace.rs
@@ -1,8 +1,7 @@
-use std::path::{Path, PathBuf};
-
 use colored::Colorize;
+use std::path::{Path, PathBuf};
 
-/// Finds the workspace by taking the `current_exe` and working its way up.
+/// Finds the workspace by searching for the workspace argument into the project's cargo.
 /// Works in debug mode too.
 ///
 pub fn find_workspace() -> PathBuf {
@@ -19,10 +18,10 @@ pub fn find_workspace() -> PathBuf {
 }
 
 pub fn print_searching_for_workspace() {
-    println!(
-        "{}",
-        format!("No --target-dir specified. Searching for workspace ...").yellow()
-    );
+    let to_show = "No --target-dir specified. Searching for workspace ..."
+        .to_string()
+        .yellow();
+    println!("{to_show}");
 }
 
 pub fn print_found_workspace(path: &Path) {
diff --git a/framework/scenario/src/facade/scenario_world.rs b/framework/scenario/src/facade/scenario_world.rs
index 9c4eeeba2e..516fde0290 100644
--- a/framework/scenario/src/facade/scenario_world.rs
+++ b/framework/scenario/src/facade/scenario_world.rs
@@ -1,6 +1,3 @@
-use multiversx_chain_scenario_format::interpret_trait::InterpretableFrom;
-use multiversx_chain_vm::world_mock::BlockchainState;
-use multiversx_sc_meta::find_workspace::find_workspace;
 use crate::{
     api::DebugApi,
     debug_executor::ContractContainer,
@@ -13,6 +10,9 @@ use crate::{
     scenario_model::BytesValue,
     vm_go_tool::run_vm_go_tool,
 };
+use multiversx_chain_scenario_format::interpret_trait::InterpretableFrom;
+use multiversx_chain_vm::world_mock::BlockchainState;
+use multiversx_sc_meta::find_workspace::find_workspace;
 use std::path::{Path, PathBuf};
 
 use super::debugger_backend::DebuggerBackend;
@@ -221,4 +221,3 @@ impl ScenarioWorld {
         self.write_scenario_trace(file_path);
     }
 }
-

From 34f03116fa3138737086d4708882d09bca593e69 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 23 Nov 2023 18:22:20 +0200
Subject: [PATCH 0104/1254] rust VM - promises fixes & cleanup

---
 .../tests/composability_scenario_rs_test.rs   |  5 +--
 vm/src/tx_execution/exec_call.rs              | 43 +++++++++++--------
 vm/src/tx_mock/tx_async_call_data.rs          | 27 +++---------
 vm/src/tx_mock/tx_async_promise.rs            |  6 +++
 4 files changed, 39 insertions(+), 42 deletions(-)

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 8d87a6f1fa..5fc1481438 100644
--- a/contracts/feature-tests/composability/tests/composability_scenario_rs_test.rs
+++ b/contracts/feature-tests/composability/tests/composability_scenario_rs_test.rs
@@ -474,13 +474,11 @@ fn promises_call_async_accept_esdt_rs() {
 }
 
 #[test]
-#[ignore = "TODO"]
 fn promises_call_async_retrieve_egld_rs() {
     world().run("scenarios/promises_call_async_retrieve_egld.scen.json");
 }
 
 #[test]
-#[ignore = "TODO"]
 fn promises_call_async_retrieve_esdt_rs() {
     world().run("scenarios/promises_call_async_retrieve_esdt.scen.json");
 }
@@ -491,13 +489,12 @@ fn promises_call_callback_directly_rs() {
 }
 
 #[test]
-#[ignore = "TODO"]
 fn promises_multi_transfer_rs() {
     world().run("scenarios/promises_multi_transfer.scen.json");
 }
 
 #[test]
-#[ignore = "TODO"]
+#[ignore = "gas"]
 fn promises_single_transfer_rs() {
     world().run("scenarios/promises_single_transfer.scen.json");
 }
diff --git a/vm/src/tx_execution/exec_call.rs b/vm/src/tx_execution/exec_call.rs
index ca02d33f60..6e69b7d9e0 100644
--- a/vm/src/tx_execution/exec_call.rs
+++ b/vm/src/tx_execution/exec_call.rs
@@ -1,10 +1,9 @@
 use crate::{
     tx_mock::{
-        async_call_tx_input, async_callback_tx_input, async_promise_tx_input, merge_results,
-        AsyncCallTxData, BlockchainUpdate, CallType, Promise, TxCache, TxContext, TxContextStack,
-        TxInput, TxPanic, TxResult, TxResultCalls,
+        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::VMAddress,
     with_shared::Shareable,
     world_mock::{AccountData, AccountEsdt, BlockchainState},
 };
@@ -148,7 +147,6 @@ impl BlockchainVMRef {
         F: FnOnce(),
     {
         // main call
-        let contract_address = tx_input.to.clone();
         let mut tx_result = self.execute_sc_call_lambda(tx_input, state, f);
 
         // take & clear pending calls
@@ -172,7 +170,7 @@ impl BlockchainVMRef {
         // the promises are also reset
         for promise in pending_calls.promises {
             let (async_result, callback_result) =
-                self.execute_promise_call_and_callback(&contract_address, &promise, state);
+                self.execute_promise_call_and_callback(&promise, state);
 
             tx_result = merge_results(tx_result, async_result.clone());
             tx_result = merge_results(tx_result, callback_result.clone());
@@ -183,7 +181,6 @@ impl BlockchainVMRef {
 
     pub fn execute_promise_call_and_callback(
         &self,
-        address: &VMAddress,
         promise: &Promise,
         state: &mut Shareable<BlockchainState>,
     ) -> (TxResult, TxResult) {
@@ -194,17 +191,7 @@ impl BlockchainVMRef {
                 state,
                 execute_current_tx_context_input,
             );
-
-            let callback_input = async_promise_tx_input(address, promise, &async_result);
-            let callback_result = self.execute_sc_call_lambda(
-                callback_input,
-                state,
-                execute_current_tx_context_input,
-            );
-            assert!(
-                callback_result.pending_calls.promises.is_empty(),
-                "successive promises currently not supported"
-            );
+            let callback_result = self.execute_promises_callback(&async_result, promise, state);
             (async_result, callback_result)
         } else {
             let result = self.insert_ghost_account(&promise.call, state);
@@ -218,6 +205,26 @@ impl BlockchainVMRef {
         }
     }
 
+    fn execute_promises_callback(
+        &self,
+        async_result: &TxResult,
+        promise: &Promise,
+        state: &mut Shareable<BlockchainState>,
+    ) -> TxResult {
+        if !promise.has_callback() {
+            return TxResult::empty();
+        }
+        let callback_input =
+            async_promise_callback_tx_input(promise, async_result, &self.builtin_functions);
+        let callback_result =
+            self.execute_sc_call_lambda(callback_input, state, execute_current_tx_context_input);
+        assert!(
+            callback_result.pending_calls.promises.is_empty(),
+            "successive promises currently not supported"
+        );
+        callback_result
+    }
+
     /// When calling a contract that is unknown to the state, we insert a ghost account.
     fn insert_ghost_account(
         &self,
diff --git a/vm/src/tx_mock/tx_async_call_data.rs b/vm/src/tx_mock/tx_async_call_data.rs
index 52efa9c01c..f30cd9a3c2 100644
--- a/vm/src/tx_mock/tx_async_call_data.rs
+++ b/vm/src/tx_mock/tx_async_call_data.rs
@@ -101,35 +101,22 @@ fn extract_callback_payments(
     callback_payments
 }
 
-pub fn async_promise_tx_input(
-    address: &VMAddress,
+pub fn async_promise_callback_tx_input(
     promise: &Promise,
     async_result: &TxResult,
+    builtin_functions: &BuiltinFunctionContainer,
 ) -> TxInput {
-    let mut args: Vec<Vec<u8>> = Vec::new();
-    let serialized_bytes = async_result.result_status.to_be_bytes().to_vec();
-    args.push(serialized_bytes);
     let callback_name = if async_result.result_status == 0 {
-        args.extend_from_slice(async_result.result_values.as_slice());
         promise.success_callback.clone()
     } else {
-        args.push(async_result.result_message.clone().into_bytes());
         promise.error_callback.clone()
     };
 
-    TxInput {
-        from: promise.call.from.clone(),
-        to: address.clone(),
-        egld_value: 0u32.into(),
-        esdt_values: Vec::new(),
-        func_name: callback_name,
-        args,
-        gas_limit: 1000,
-        gas_price: 0,
-        tx_hash: promise.call.tx_hash.clone(),
-        promise_callback_closure_data: Some(promise.callback_closure_data.clone()),
-        ..Default::default()
-    }
+    let mut callback_input =
+        async_callback_tx_input(&promise.call, async_result, builtin_functions);
+    callback_input.func_name = callback_name;
+    callback_input.promise_callback_closure_data = Some(promise.callback_closure_data.clone());
+    callback_input
 }
 
 pub fn merge_results(mut original: TxResult, mut new: TxResult) -> TxResult {
diff --git a/vm/src/tx_mock/tx_async_promise.rs b/vm/src/tx_mock/tx_async_promise.rs
index 8b32a8c23c..ae29dcfbcb 100644
--- a/vm/src/tx_mock/tx_async_promise.rs
+++ b/vm/src/tx_mock/tx_async_promise.rs
@@ -7,3 +7,9 @@ pub struct Promise {
     pub error_callback: TxFunctionName,
     pub callback_closure_data: Vec<u8>,
 }
+
+impl Promise {
+    pub fn has_callback(&self) -> bool {
+        !self.success_callback.is_empty() && !self.error_callback.is_empty()
+    }
+}

From 02d5e372a2e81783c92be10c8ae13e06df8e6cd4 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Thu, 23 Nov 2023 19:12:22 +0100
Subject: [PATCH 0105/1254] fix after review

---
 .../src/cmd/contract/sc_config/wasm_build.rs  |  8 ++--
 framework/meta/src/tools/find_workspace.rs    | 43 +++++++++++++------
 framework/meta/tests/template_test.rs         | 12 +++---
 .../scenario/src/facade/scenario_world.rs     |  4 +-
 4 files changed, 42 insertions(+), 25 deletions(-)

diff --git a/framework/meta/src/cmd/contract/sc_config/wasm_build.rs b/framework/meta/src/cmd/contract/sc_config/wasm_build.rs
index b2a39b12b6..1503ca7a5e 100644
--- a/framework/meta/src/cmd/contract/sc_config/wasm_build.rs
+++ b/framework/meta/src/cmd/contract/sc_config/wasm_build.rs
@@ -5,7 +5,7 @@ use crate::{
     abi_json::ContractAbiJson,
     cli_args::BuildArgs,
     ei::EIVersion,
-    find_workspace::{find_workspace, print_searching_for_workspace},
+    find_workspace::{find_current_workspace, print_found_workspace},
     mxsc_file_json::{save_mxsc_file_json, MxscFileJson},
     print_util::*,
     tools,
@@ -38,9 +38,9 @@ impl ContractVariant {
         }
         if let Some(target_dir_wasm) = &build_args.target_dir_wasm {
             command.args(["--target-dir", target_dir_wasm]);
-        } else {
-            print_searching_for_workspace();
-            command.args(["--target-dir", find_workspace().to_str().unwrap()]);
+        } else if let Some(workspace) = find_current_workspace() {
+            print_found_workspace(&workspace);
+            command.args(["--target-dir", workspace.join("target").to_str().unwrap()]);
         }
         let rustflags = self.compose_rustflags(build_args);
         if !rustflags.is_empty() {
diff --git a/framework/meta/src/tools/find_workspace.rs b/framework/meta/src/tools/find_workspace.rs
index b77035ae69..4d1d960369 100644
--- a/framework/meta/src/tools/find_workspace.rs
+++ b/framework/meta/src/tools/find_workspace.rs
@@ -4,29 +4,46 @@ use std::path::{Path, PathBuf};
 /// Finds the workspace by searching for the workspace argument into the project's cargo.
 /// Works in debug mode too.
 ///
-pub fn find_workspace() -> PathBuf {
-    let output = std::process::Command::new(env!("CARGO"))
+pub fn find_current_workspace() -> Option<PathBuf> {
+    if let Ok(output) = std::process::Command::new(env!("CARGO"))
         .arg("locate-project")
         .arg("--workspace")
         .arg("--message-format=plain")
         .output()
-        .unwrap()
-        .stdout;
-    let cargo_path = Path::new(std::str::from_utf8(&output).unwrap().trim());
-    print_found_workspace(cargo_path.parent().unwrap());
-    cargo_path.parent().unwrap().to_path_buf()
+    {
+        if let Ok(convert) = std::str::from_utf8(&output.stdout) {
+            let path = Path::new(convert.trim());
+            if let Some(parent) = path.parent() {
+                return Some(parent.to_path_buf());
+            }
+        }
+    }
+
+    None
 }
 
-pub fn print_searching_for_workspace() {
-    let to_show = "No --target-dir specified. Searching for workspace ..."
-        .to_string()
-        .yellow();
-    println!("{to_show}");
+pub fn find_workspace(path: &Path) -> Option<PathBuf> {
+    if let Ok(output) = std::process::Command::new(env!("CARGO"))
+        .arg(format!("-C {}", path.display()))
+        .arg("locate-project")
+        .arg("--workspace")
+        .arg("--message-format=plain")
+        .output()
+    {
+        if let Ok(convert) = std::str::from_utf8(&output.stdout) {
+            let path = Path::new(convert.trim());
+            if let Some(parent) = path.parent() {
+                return Some(parent.to_path_buf());
+            }
+        }
+    }
+
+    None
 }
 
 pub fn print_found_workspace(path: &Path) {
     println!(
         "{}",
-        format!("Workspace found: {} ...", path.display()).green()
+        format!("Using workspace target directory: {} ...", path.display()).green()
     );
 }
diff --git a/framework/meta/tests/template_test.rs b/framework/meta/tests/template_test.rs
index 1b72320ea2..edea8d311c 100644
--- a/framework/meta/tests/template_test.rs
+++ b/framework/meta/tests/template_test.rs
@@ -4,7 +4,7 @@ use multiversx_sc_meta::{
     cmd::standalone::template::{
         template_names_from_repo, ContractCreator, ContractCreatorTarget, RepoSource, RepoVersion,
     },
-    find_workspace::find_workspace,
+    find_workspace::{find_workspace, find_current_workspace},
     version_history,
 };
 
@@ -13,7 +13,7 @@ const BUILD_CONTRACTS: bool = true;
 
 #[test]
 fn test_template_list() {
-    let workspace_path = find_workspace();
+    let workspace_path = find_current_workspace().unwrap();
     let repo_source = RepoSource::from_local_path(workspace_path);
     let mut template_names = template_names_from_repo(&repo_source);
     template_names.sort();
@@ -49,7 +49,7 @@ fn template_current_empty() {
 /// This way, the relative paths are still valid in this case,
 /// and we can test the templates with the framework version of the current branch.
 fn template_test_current(template_name: &str, sub_path: &str, new_name: &str) {
-    let workspace_path = find_workspace();
+    let workspace_path = find_current_workspace().unwrap();
     let target = ContractCreatorTarget {
         target_path: workspace_path.join(TEMPLATE_TEMP_DIR_NAME).join(sub_path),
         new_name: new_name.to_string(),
@@ -97,7 +97,7 @@ fn template_released_empty() {
 /// - build the newly created contracts (to wasm)
 /// - run all tests (including Go scenarios) on them.
 fn template_test_released(template_name: &str, new_name: &str) {
-    let workspace_path = find_workspace();
+    let workspace_path = find_current_workspace().unwrap();
     let target = ContractCreatorTarget {
         target_path: workspace_path.join(TEMPLATE_TEMP_DIR_NAME),
         new_name: new_name.to_string(),
@@ -138,7 +138,7 @@ fn prepare_target_dir(target: &ContractCreatorTarget) {
 }
 
 pub fn cargo_test(target: &ContractCreatorTarget) {
-    let workspace_target_dir = find_workspace().join("target");
+    let workspace_target_dir = find_current_workspace().unwrap().join("target");
 
     let mut args = vec![
         "test",
@@ -162,7 +162,7 @@ pub fn cargo_test(target: &ContractCreatorTarget) {
 }
 
 pub fn build_contract(target: &ContractCreatorTarget) {
-    let workspace_target_dir = find_workspace().join("target");
+    let workspace_target_dir = find_current_workspace().unwrap().join("target");
 
     let exit_status = Command::new("cargo")
         .args([
diff --git a/framework/scenario/src/facade/scenario_world.rs b/framework/scenario/src/facade/scenario_world.rs
index 516fde0290..17957d4b82 100644
--- a/framework/scenario/src/facade/scenario_world.rs
+++ b/framework/scenario/src/facade/scenario_world.rs
@@ -12,7 +12,7 @@ use crate::{
 };
 use multiversx_chain_scenario_format::interpret_trait::InterpretableFrom;
 use multiversx_chain_vm::world_mock::BlockchainState;
-use multiversx_sc_meta::find_workspace::find_workspace;
+use multiversx_sc_meta::find_workspace::find_current_workspace;
 use std::path::{Path, PathBuf};
 
 use super::debugger_backend::DebuggerBackend;
@@ -114,7 +114,7 @@ impl ScenarioWorld {
     /// Tells the tests where the crate lies relative to the workspace.
     /// This ensures that the paths are set correctly, including in debug mode.
     pub fn set_current_dir_from_workspace(&mut self, relative_path: &str) -> &mut Self {
-        let mut path = find_workspace();
+        let mut path = find_current_workspace().unwrap();
         path.push(relative_path);
         self.current_dir = path;
         self

From 294e18682b7d5e767a418bfbcf8ef15901914e64 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Thu, 23 Nov 2023 19:30:10 +0100
Subject: [PATCH 0106/1254] fix after review

---
 .../src/cmd/contract/sc_config/wasm_build.rs  |  8 +++---
 framework/meta/src/print_util.rs              | 10 ++++++-
 framework/meta/src/tools/find_workspace.rs    | 28 +------------------
 framework/meta/tests/template_test.rs         | 12 ++++----
 .../scenario/src/facade/scenario_world.rs     |  4 +--
 5 files changed, 22 insertions(+), 40 deletions(-)

diff --git a/framework/meta/src/cmd/contract/sc_config/wasm_build.rs b/framework/meta/src/cmd/contract/sc_config/wasm_build.rs
index 1503ca7a5e..73349da4e6 100644
--- a/framework/meta/src/cmd/contract/sc_config/wasm_build.rs
+++ b/framework/meta/src/cmd/contract/sc_config/wasm_build.rs
@@ -5,7 +5,7 @@ use crate::{
     abi_json::ContractAbiJson,
     cli_args::BuildArgs,
     ei::EIVersion,
-    find_workspace::{find_current_workspace, print_found_workspace},
+    find_workspace::find_workspace,
     mxsc_file_json::{save_mxsc_file_json, MxscFileJson},
     print_util::*,
     tools,
@@ -37,9 +37,9 @@ impl ContractVariant {
             command.arg("--locked");
         }
         if let Some(target_dir_wasm) = &build_args.target_dir_wasm {
-            command.args(["--target-dir", target_dir_wasm]);
-        } else if let Some(workspace) = find_current_workspace() {
-            print_found_workspace(&workspace);
+            command.args(["--target-dir", target_dir_wasm]); ///////
+        } else if let Some(workspace) = find_workspace(&std::env::current_dir().unwrap()) {
+            print_workspace_target_dir(&workspace);
             command.args(["--target-dir", workspace.join("target").to_str().unwrap()]);
         }
         let rustflags = self.compose_rustflags(build_args);
diff --git a/framework/meta/src/print_util.rs b/framework/meta/src/print_util.rs
index 888951f829..7c9beda9f2 100644
--- a/framework/meta/src/print_util.rs
+++ b/framework/meta/src/print_util.rs
@@ -1,4 +1,4 @@
-use std::process::Command;
+use std::{process::Command, path::Path};
 
 use colored::Colorize;
 
@@ -89,3 +89,11 @@ pub fn print_check_ei_ok() {
 pub fn print_ignore_ei_check() {
     println!("{}", "EI version check explicitly ignored".yellow(),);
 }
+
+pub fn print_workspace_target_dir(path: &Path) {
+    println!(
+        "{}",
+        format!("Using workspace target directory: {} ...", path.display()).green()
+    );
+}
+
diff --git a/framework/meta/src/tools/find_workspace.rs b/framework/meta/src/tools/find_workspace.rs
index 4d1d960369..34d9c2e4f8 100644
--- a/framework/meta/src/tools/find_workspace.rs
+++ b/framework/meta/src/tools/find_workspace.rs
@@ -1,30 +1,11 @@
-use colored::Colorize;
 use std::path::{Path, PathBuf};
 
 /// Finds the workspace by searching for the workspace argument into the project's cargo.
 /// Works in debug mode too.
 ///
-pub fn find_current_workspace() -> Option<PathBuf> {
-    if let Ok(output) = std::process::Command::new(env!("CARGO"))
-        .arg("locate-project")
-        .arg("--workspace")
-        .arg("--message-format=plain")
-        .output()
-    {
-        if let Ok(convert) = std::str::from_utf8(&output.stdout) {
-            let path = Path::new(convert.trim());
-            if let Some(parent) = path.parent() {
-                return Some(parent.to_path_buf());
-            }
-        }
-    }
-
-    None
-}
-
 pub fn find_workspace(path: &Path) -> Option<PathBuf> {
     if let Ok(output) = std::process::Command::new(env!("CARGO"))
-        .arg(format!("-C {}", path.display()))
+        .current_dir(path)
         .arg("locate-project")
         .arg("--workspace")
         .arg("--message-format=plain")
@@ -40,10 +21,3 @@ pub fn find_workspace(path: &Path) -> Option<PathBuf> {
 
     None
 }
-
-pub fn print_found_workspace(path: &Path) {
-    println!(
-        "{}",
-        format!("Using workspace target directory: {} ...", path.display()).green()
-    );
-}
diff --git a/framework/meta/tests/template_test.rs b/framework/meta/tests/template_test.rs
index edea8d311c..096ebe1113 100644
--- a/framework/meta/tests/template_test.rs
+++ b/framework/meta/tests/template_test.rs
@@ -4,7 +4,7 @@ use multiversx_sc_meta::{
     cmd::standalone::template::{
         template_names_from_repo, ContractCreator, ContractCreatorTarget, RepoSource, RepoVersion,
     },
-    find_workspace::{find_workspace, find_current_workspace},
+    find_workspace::find_workspace,
     version_history,
 };
 
@@ -13,7 +13,7 @@ const BUILD_CONTRACTS: bool = true;
 
 #[test]
 fn test_template_list() {
-    let workspace_path = find_current_workspace().unwrap();
+    let workspace_path = find_workspace(&std::env::current_dir().unwrap()).unwrap();
     let repo_source = RepoSource::from_local_path(workspace_path);
     let mut template_names = template_names_from_repo(&repo_source);
     template_names.sort();
@@ -49,7 +49,7 @@ fn template_current_empty() {
 /// This way, the relative paths are still valid in this case,
 /// and we can test the templates with the framework version of the current branch.
 fn template_test_current(template_name: &str, sub_path: &str, new_name: &str) {
-    let workspace_path = find_current_workspace().unwrap();
+    let workspace_path = find_workspace(&std::env::current_dir().unwrap()).unwrap();
     let target = ContractCreatorTarget {
         target_path: workspace_path.join(TEMPLATE_TEMP_DIR_NAME).join(sub_path),
         new_name: new_name.to_string(),
@@ -97,7 +97,7 @@ fn template_released_empty() {
 /// - build the newly created contracts (to wasm)
 /// - run all tests (including Go scenarios) on them.
 fn template_test_released(template_name: &str, new_name: &str) {
-    let workspace_path = find_current_workspace().unwrap();
+    let workspace_path = find_workspace(&std::env::current_dir().unwrap()).unwrap();
     let target = ContractCreatorTarget {
         target_path: workspace_path.join(TEMPLATE_TEMP_DIR_NAME),
         new_name: new_name.to_string(),
@@ -138,7 +138,7 @@ fn prepare_target_dir(target: &ContractCreatorTarget) {
 }
 
 pub fn cargo_test(target: &ContractCreatorTarget) {
-    let workspace_target_dir = find_current_workspace().unwrap().join("target");
+    let workspace_target_dir = find_workspace(&std::env::current_dir().unwrap()).unwrap().join("target");
 
     let mut args = vec![
         "test",
@@ -162,7 +162,7 @@ pub fn cargo_test(target: &ContractCreatorTarget) {
 }
 
 pub fn build_contract(target: &ContractCreatorTarget) {
-    let workspace_target_dir = find_current_workspace().unwrap().join("target");
+    let workspace_target_dir = find_workspace(&std::env::current_dir().unwrap()).unwrap().join("target");
 
     let exit_status = Command::new("cargo")
         .args([
diff --git a/framework/scenario/src/facade/scenario_world.rs b/framework/scenario/src/facade/scenario_world.rs
index 17957d4b82..cdab313558 100644
--- a/framework/scenario/src/facade/scenario_world.rs
+++ b/framework/scenario/src/facade/scenario_world.rs
@@ -12,7 +12,7 @@ use crate::{
 };
 use multiversx_chain_scenario_format::interpret_trait::InterpretableFrom;
 use multiversx_chain_vm::world_mock::BlockchainState;
-use multiversx_sc_meta::find_workspace::find_current_workspace;
+use multiversx_sc_meta::find_workspace::find_workspace;
 use std::path::{Path, PathBuf};
 
 use super::debugger_backend::DebuggerBackend;
@@ -114,7 +114,7 @@ impl ScenarioWorld {
     /// Tells the tests where the crate lies relative to the workspace.
     /// This ensures that the paths are set correctly, including in debug mode.
     pub fn set_current_dir_from_workspace(&mut self, relative_path: &str) -> &mut Self {
-        let mut path = find_current_workspace().unwrap();
+        let mut path = find_workspace(&std::env::current_dir().unwrap()).unwrap();
         path.push(relative_path);
         self.current_dir = path;
         self

From e854c2d03cf24b9a0916f93192b917762ea80965 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Fri, 24 Nov 2023 09:13:30 +0100
Subject: [PATCH 0107/1254] brought back find_current_workspace

---
 .../meta/src/cmd/contract/sc_config/wasm_build.rs    |  4 ++--
 framework/meta/src/tools/find_workspace.rs           |  4 ++++
 framework/meta/tests/template_test.rs                | 12 ++++++------
 framework/scenario/src/facade/scenario_world.rs      |  4 ++--
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/framework/meta/src/cmd/contract/sc_config/wasm_build.rs b/framework/meta/src/cmd/contract/sc_config/wasm_build.rs
index 73349da4e6..7e4a5c65a3 100644
--- a/framework/meta/src/cmd/contract/sc_config/wasm_build.rs
+++ b/framework/meta/src/cmd/contract/sc_config/wasm_build.rs
@@ -5,7 +5,7 @@ use crate::{
     abi_json::ContractAbiJson,
     cli_args::BuildArgs,
     ei::EIVersion,
-    find_workspace::find_workspace,
+    find_workspace::find_current_workspace,
     mxsc_file_json::{save_mxsc_file_json, MxscFileJson},
     print_util::*,
     tools,
@@ -38,7 +38,7 @@ impl ContractVariant {
         }
         if let Some(target_dir_wasm) = &build_args.target_dir_wasm {
             command.args(["--target-dir", target_dir_wasm]); ///////
-        } else if let Some(workspace) = find_workspace(&std::env::current_dir().unwrap()) {
+        } else if let Some(workspace) = find_current_workspace() {
             print_workspace_target_dir(&workspace);
             command.args(["--target-dir", workspace.join("target").to_str().unwrap()]);
         }
diff --git a/framework/meta/src/tools/find_workspace.rs b/framework/meta/src/tools/find_workspace.rs
index 34d9c2e4f8..4a3b53c90f 100644
--- a/framework/meta/src/tools/find_workspace.rs
+++ b/framework/meta/src/tools/find_workspace.rs
@@ -21,3 +21,7 @@ pub fn find_workspace(path: &Path) -> Option<PathBuf> {
 
     None
 }
+
+pub fn find_current_workspace() -> Option<PathBuf> {
+    find_workspace(&std::env::current_dir().unwrap())
+}
diff --git a/framework/meta/tests/template_test.rs b/framework/meta/tests/template_test.rs
index 096ebe1113..edea8d311c 100644
--- a/framework/meta/tests/template_test.rs
+++ b/framework/meta/tests/template_test.rs
@@ -4,7 +4,7 @@ use multiversx_sc_meta::{
     cmd::standalone::template::{
         template_names_from_repo, ContractCreator, ContractCreatorTarget, RepoSource, RepoVersion,
     },
-    find_workspace::find_workspace,
+    find_workspace::{find_workspace, find_current_workspace},
     version_history,
 };
 
@@ -13,7 +13,7 @@ const BUILD_CONTRACTS: bool = true;
 
 #[test]
 fn test_template_list() {
-    let workspace_path = find_workspace(&std::env::current_dir().unwrap()).unwrap();
+    let workspace_path = find_current_workspace().unwrap();
     let repo_source = RepoSource::from_local_path(workspace_path);
     let mut template_names = template_names_from_repo(&repo_source);
     template_names.sort();
@@ -49,7 +49,7 @@ fn template_current_empty() {
 /// This way, the relative paths are still valid in this case,
 /// and we can test the templates with the framework version of the current branch.
 fn template_test_current(template_name: &str, sub_path: &str, new_name: &str) {
-    let workspace_path = find_workspace(&std::env::current_dir().unwrap()).unwrap();
+    let workspace_path = find_current_workspace().unwrap();
     let target = ContractCreatorTarget {
         target_path: workspace_path.join(TEMPLATE_TEMP_DIR_NAME).join(sub_path),
         new_name: new_name.to_string(),
@@ -97,7 +97,7 @@ fn template_released_empty() {
 /// - build the newly created contracts (to wasm)
 /// - run all tests (including Go scenarios) on them.
 fn template_test_released(template_name: &str, new_name: &str) {
-    let workspace_path = find_workspace(&std::env::current_dir().unwrap()).unwrap();
+    let workspace_path = find_current_workspace().unwrap();
     let target = ContractCreatorTarget {
         target_path: workspace_path.join(TEMPLATE_TEMP_DIR_NAME),
         new_name: new_name.to_string(),
@@ -138,7 +138,7 @@ fn prepare_target_dir(target: &ContractCreatorTarget) {
 }
 
 pub fn cargo_test(target: &ContractCreatorTarget) {
-    let workspace_target_dir = find_workspace(&std::env::current_dir().unwrap()).unwrap().join("target");
+    let workspace_target_dir = find_current_workspace().unwrap().join("target");
 
     let mut args = vec![
         "test",
@@ -162,7 +162,7 @@ pub fn cargo_test(target: &ContractCreatorTarget) {
 }
 
 pub fn build_contract(target: &ContractCreatorTarget) {
-    let workspace_target_dir = find_workspace(&std::env::current_dir().unwrap()).unwrap().join("target");
+    let workspace_target_dir = find_current_workspace().unwrap().join("target");
 
     let exit_status = Command::new("cargo")
         .args([
diff --git a/framework/scenario/src/facade/scenario_world.rs b/framework/scenario/src/facade/scenario_world.rs
index cdab313558..17957d4b82 100644
--- a/framework/scenario/src/facade/scenario_world.rs
+++ b/framework/scenario/src/facade/scenario_world.rs
@@ -12,7 +12,7 @@ use crate::{
 };
 use multiversx_chain_scenario_format::interpret_trait::InterpretableFrom;
 use multiversx_chain_vm::world_mock::BlockchainState;
-use multiversx_sc_meta::find_workspace::find_workspace;
+use multiversx_sc_meta::find_workspace::find_current_workspace;
 use std::path::{Path, PathBuf};
 
 use super::debugger_backend::DebuggerBackend;
@@ -114,7 +114,7 @@ impl ScenarioWorld {
     /// Tells the tests where the crate lies relative to the workspace.
     /// This ensures that the paths are set correctly, including in debug mode.
     pub fn set_current_dir_from_workspace(&mut self, relative_path: &str) -> &mut Self {
-        let mut path = find_workspace(&std::env::current_dir().unwrap()).unwrap();
+        let mut path = find_current_workspace().unwrap();
         path.push(relative_path);
         self.current_dir = path;
         self

From d541e25c70ecd09ec26f4ede1a49401e7214d5f5 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 24 Nov 2023 11:49:37 +0200
Subject: [PATCH 0108/1254] sc-meta adjust target dir if unspecified

---
 .../meta/src/cmd/contract/meta_config.rs      | 20 ++++++++++++++++++-
 .../src/cmd/contract/sc_config/wasm_build.rs  |  6 +-----
 framework/meta/src/print_util.rs              |  6 +++---
 3 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/framework/meta/src/cmd/contract/meta_config.rs b/framework/meta/src/cmd/contract/meta_config.rs
index b8332caa14..fee87b8d6e 100644
--- a/framework/meta/src/cmd/contract/meta_config.rs
+++ b/framework/meta/src/cmd/contract/meta_config.rs
@@ -2,7 +2,10 @@ use std::fs;
 
 use multiversx_sc::abi::ContractAbi;
 
-use crate::{cli_args::BuildArgs, tools::check_tools_installed, CargoTomlContents};
+use crate::{
+    cli_args::BuildArgs, find_workspace::find_current_workspace,
+    print_util::print_workspace_target_dir, tools::check_tools_installed, CargoTomlContents,
+};
 
 use super::{
     sc_config::ScConfig, wasm_cargo_toml_data::WasmCargoTomlData,
@@ -82,6 +85,7 @@ impl MetaConfig {
 
     pub fn build(&mut self, mut build_args: BuildArgs) {
         check_tools_installed(&mut build_args);
+        adjust_target_dir_wasm(&mut build_args);
 
         for contract_variant in &self.sc_config.contracts {
             contract_variant.build_contract(&build_args, self.output_dir.as_str());
@@ -147,6 +151,20 @@ impl MetaConfig {
     }
 }
 
+fn adjust_target_dir_wasm(build_args: &mut BuildArgs) {
+    if build_args.target_dir_wasm.is_some() {
+        return;
+    }
+
+    if let Some(workspace) = find_current_workspace() {
+        let target = workspace.join("target").canonicalize().unwrap();
+        if let Some(target_str) = target.as_os_str().to_str() {
+            build_args.target_dir_wasm = Some(target_str.to_string());
+            print_workspace_target_dir(target_str);
+        }
+    }
+}
+
 /// This one is useful for some of the special unmanaged EI tests in the framework.
 /// Will do nothing for regular contracts.
 fn copy_to_wasm_unmanaged_ei() {
diff --git a/framework/meta/src/cmd/contract/sc_config/wasm_build.rs b/framework/meta/src/cmd/contract/sc_config/wasm_build.rs
index 7e4a5c65a3..879a726a09 100644
--- a/framework/meta/src/cmd/contract/sc_config/wasm_build.rs
+++ b/framework/meta/src/cmd/contract/sc_config/wasm_build.rs
@@ -5,7 +5,6 @@ use crate::{
     abi_json::ContractAbiJson,
     cli_args::BuildArgs,
     ei::EIVersion,
-    find_workspace::find_current_workspace,
     mxsc_file_json::{save_mxsc_file_json, MxscFileJson},
     print_util::*,
     tools,
@@ -37,10 +36,7 @@ impl ContractVariant {
             command.arg("--locked");
         }
         if let Some(target_dir_wasm) = &build_args.target_dir_wasm {
-            command.args(["--target-dir", target_dir_wasm]); ///////
-        } else if let Some(workspace) = find_current_workspace() {
-            print_workspace_target_dir(&workspace);
-            command.args(["--target-dir", workspace.join("target").to_str().unwrap()]);
+            command.args(["--target-dir", target_dir_wasm]);
         }
         let rustflags = self.compose_rustflags(build_args);
         if !rustflags.is_empty() {
diff --git a/framework/meta/src/print_util.rs b/framework/meta/src/print_util.rs
index 4594c48ac6..f8ff2eba74 100644
--- a/framework/meta/src/print_util.rs
+++ b/framework/meta/src/print_util.rs
@@ -1,4 +1,4 @@
-use std::{path::Path, process::Command};
+use std::process::Command;
 
 use colored::Colorize;
 
@@ -90,9 +90,9 @@ pub fn print_ignore_ei_check() {
     println!("{}", "EI version check explicitly ignored".yellow(),);
 }
 
-pub fn print_workspace_target_dir(path: &Path) {
+pub fn print_workspace_target_dir(target_path_str: &str) {
     println!(
         "{}",
-        format!("Using workspace target directory: {} ...", path.display()).green()
+        format!("Using workspace target directory: {target_path_str} ...").green()
     );
 }

From 37865700dd258260c6cb0001d5d61e053230f2a6 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 24 Nov 2023 12:17:51 +0200
Subject: [PATCH 0109/1254] sc 0.45.0, vm 0.7.0, scenario-format 0.21.0, sdk
 0.3.0

---
 CHANGELOG.md                                         | 10 ++++++++++
 contracts/benchmarks/large-storage/Cargo.toml        |  4 ++--
 contracts/benchmarks/large-storage/meta/Cargo.toml   |  2 +-
 contracts/benchmarks/large-storage/wasm/Cargo.toml   |  2 +-
 .../benchmarks/mappers/benchmark-common/Cargo.toml   |  4 ++--
 .../benchmarks/mappers/linked-list-repeat/Cargo.toml |  4 ++--
 .../mappers/linked-list-repeat/meta/Cargo.toml       |  2 +-
 .../mappers/linked-list-repeat/wasm/Cargo.toml       |  2 +-
 contracts/benchmarks/mappers/map-repeat/Cargo.toml   |  4 ++--
 .../benchmarks/mappers/map-repeat/meta/Cargo.toml    |  2 +-
 .../benchmarks/mappers/map-repeat/wasm/Cargo.toml    |  2 +-
 contracts/benchmarks/mappers/queue-repeat/Cargo.toml |  4 ++--
 .../benchmarks/mappers/queue-repeat/meta/Cargo.toml  |  2 +-
 .../benchmarks/mappers/queue-repeat/wasm/Cargo.toml  |  2 +-
 contracts/benchmarks/mappers/set-repeat/Cargo.toml   |  4 ++--
 .../benchmarks/mappers/set-repeat/meta/Cargo.toml    |  2 +-
 .../benchmarks/mappers/set-repeat/wasm/Cargo.toml    |  2 +-
 .../mappers/single-value-repeat/Cargo.toml           |  4 ++--
 .../mappers/single-value-repeat/meta/Cargo.toml      |  2 +-
 .../mappers/single-value-repeat/wasm/Cargo.toml      |  2 +-
 contracts/benchmarks/mappers/vec-repeat/Cargo.toml   |  4 ++--
 .../benchmarks/mappers/vec-repeat/meta/Cargo.toml    |  2 +-
 .../benchmarks/mappers/vec-repeat/wasm/Cargo.toml    |  2 +-
 contracts/benchmarks/send-tx-repeat/Cargo.toml       |  4 ++--
 contracts/benchmarks/send-tx-repeat/meta/Cargo.toml  |  2 +-
 contracts/benchmarks/send-tx-repeat/wasm/Cargo.toml  |  2 +-
 contracts/benchmarks/str-repeat/Cargo.toml           |  4 ++--
 contracts/benchmarks/str-repeat/meta/Cargo.toml      |  2 +-
 contracts/benchmarks/str-repeat/wasm/Cargo.toml      |  2 +-
 contracts/core/price-aggregator/Cargo.toml           |  8 ++++----
 contracts/core/price-aggregator/meta/Cargo.toml      |  4 ++--
 contracts/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 +-
 contracts/examples/bonding-curve-contract/Cargo.toml |  6 +++---
 .../examples/bonding-curve-contract/meta/Cargo.toml  |  2 +-
 .../examples/bonding-curve-contract/wasm/Cargo.toml  |  2 +-
 contracts/examples/check-pause/Cargo.toml            |  6 +++---
 contracts/examples/check-pause/meta/Cargo.toml       |  2 +-
 contracts/examples/check-pause/wasm/Cargo.toml       |  2 +-
 contracts/examples/crowdfunding-esdt/Cargo.toml      |  4 ++--
 contracts/examples/crowdfunding-esdt/meta/Cargo.toml |  2 +-
 contracts/examples/crowdfunding-esdt/wasm/Cargo.toml |  2 +-
 contracts/examples/crypto-bubbles/Cargo.toml         |  4 ++--
 contracts/examples/crypto-bubbles/meta/Cargo.toml    |  2 +-
 contracts/examples/crypto-bubbles/wasm/Cargo.toml    |  2 +-
 .../examples/crypto-kitties/common/kitty/Cargo.toml  |  2 +-
 .../examples/crypto-kitties/common/random/Cargo.toml |  2 +-
 .../examples/crypto-kitties/kitty-auction/Cargo.toml |  4 ++--
 .../crypto-kitties/kitty-auction/meta/Cargo.toml     |  2 +-
 .../crypto-kitties/kitty-auction/wasm/Cargo.toml     |  2 +-
 .../crypto-kitties/kitty-genetic-alg/Cargo.toml      |  4 ++--
 .../crypto-kitties/kitty-genetic-alg/meta/Cargo.toml |  2 +-
 .../crypto-kitties/kitty-genetic-alg/wasm/Cargo.toml |  2 +-
 .../crypto-kitties/kitty-ownership/Cargo.toml        |  4 ++--
 .../crypto-kitties/kitty-ownership/meta/Cargo.toml   |  2 +-
 .../crypto-kitties/kitty-ownership/wasm/Cargo.toml   |  2 +-
 contracts/examples/crypto-zombies/Cargo.toml         |  4 ++--
 contracts/examples/crypto-zombies/meta/Cargo.toml    |  2 +-
 contracts/examples/crypto-zombies/wasm/Cargo.toml    |  2 +-
 contracts/examples/digital-cash/Cargo.toml           |  4 ++--
 contracts/examples/digital-cash/meta/Cargo.toml      |  2 +-
 contracts/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 +-
 contracts/examples/esdt-transfer-with-fee/Cargo.toml |  4 ++--
 .../examples/esdt-transfer-with-fee/meta/Cargo.toml  |  2 +-
 .../examples/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 +++---
 contracts/examples/fractional-nfts/meta/Cargo.toml   |  2 +-
 contracts/examples/fractional-nfts/wasm/Cargo.toml   |  2 +-
 contracts/examples/lottery-esdt/Cargo.toml           |  4 ++--
 contracts/examples/lottery-esdt/meta/Cargo.toml      |  2 +-
 contracts/examples/lottery-esdt/wasm/Cargo.toml      |  2 +-
 contracts/examples/multisig/Cargo.toml               |  8 ++++----
 contracts/examples/multisig/interact/Cargo.toml      |  6 +++---
 contracts/examples/multisig/meta/Cargo.toml          |  2 +-
 .../examples/multisig/wasm-multisig-full/Cargo.toml  |  2 +-
 .../examples/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 +-
 contracts/examples/nft-storage-prepay/Cargo.toml     |  4 ++--
 .../examples/nft-storage-prepay/meta/Cargo.toml      |  2 +-
 .../examples/nft-storage-prepay/wasm/Cargo.toml      |  2 +-
 contracts/examples/nft-subscription/Cargo.toml       |  6 +++---
 contracts/examples/nft-subscription/meta/Cargo.toml  |  2 +-
 contracts/examples/nft-subscription/wasm/Cargo.toml  |  2 +-
 contracts/examples/order-book/factory/Cargo.toml     |  4 ++--
 .../examples/order-book/factory/meta/Cargo.toml      |  2 +-
 .../examples/order-book/factory/wasm/Cargo.toml      |  2 +-
 contracts/examples/order-book/pair/Cargo.toml        |  4 ++--
 contracts/examples/order-book/pair/meta/Cargo.toml   |  2 +-
 contracts/examples/order-book/pair/wasm/Cargo.toml   |  2 +-
 contracts/examples/ping-pong-egld/Cargo.toml         |  4 ++--
 contracts/examples/ping-pong-egld/meta/Cargo.toml    |  2 +-
 contracts/examples/ping-pong-egld/wasm/Cargo.toml    |  2 +-
 contracts/examples/proxy-pause/Cargo.toml            |  4 ++--
 contracts/examples/proxy-pause/meta/Cargo.toml       |  2 +-
 contracts/examples/proxy-pause/wasm/Cargo.toml       |  2 +-
 contracts/examples/rewards-distribution/Cargo.toml   |  6 +++---
 .../examples/rewards-distribution/meta/Cargo.toml    |  2 +-
 .../examples/rewards-distribution/wasm/Cargo.toml    |  2 +-
 contracts/examples/seed-nft-minter/Cargo.toml        |  6 +++---
 contracts/examples/seed-nft-minter/meta/Cargo.toml   |  2 +-
 contracts/examples/seed-nft-minter/wasm/Cargo.toml   |  2 +-
 contracts/examples/token-release/Cargo.toml          |  4 ++--
 contracts/examples/token-release/meta/Cargo.toml     |  2 +-
 contracts/examples/token-release/wasm/Cargo.toml     |  2 +-
 contracts/feature-tests/abi-tester/Cargo.toml        |  6 +++---
 .../abi-tester/abi_tester_expected_main.abi.json     |  2 +-
 .../abi-tester/abi_tester_expected_view.abi.json     |  2 +-
 contracts/feature-tests/abi-tester/meta/Cargo.toml   |  2 +-
 .../abi-tester/wasm-abi-tester-ev/Cargo.toml         |  2 +-
 contracts/feature-tests/abi-tester/wasm/Cargo.toml   |  2 +-
 contracts/feature-tests/alloc-features/Cargo.toml    |  4 ++--
 .../feature-tests/alloc-features/meta/Cargo.toml     |  2 +-
 .../feature-tests/alloc-features/wasm/Cargo.toml     |  2 +-
 contracts/feature-tests/basic-features/Cargo.toml    |  6 +++---
 .../feature-tests/basic-features/interact/Cargo.toml |  2 +-
 .../feature-tests/basic-features/meta/Cargo.toml     |  2 +-
 .../wasm-basic-features-storage-bytes/Cargo.toml     |  2 +-
 .../feature-tests/basic-features/wasm/Cargo.toml     |  2 +-
 .../feature-tests/big-float-features/Cargo.toml      |  4 ++--
 .../feature-tests/big-float-features/meta/Cargo.toml |  2 +-
 .../feature-tests/big-float-features/wasm/Cargo.toml |  2 +-
 contracts/feature-tests/composability/Cargo.toml     |  4 ++--
 .../composability/builtin-func-features/Cargo.toml   |  4 ++--
 .../builtin-func-features/meta/Cargo.toml            |  2 +-
 .../builtin-func-features/wasm/Cargo.toml            |  2 +-
 .../composability/esdt-contract-pair/Cargo.toml      |  4 ++--
 .../esdt-contract-pair/first-contract/Cargo.toml     |  4 ++--
 .../first-contract/meta/Cargo.toml                   |  4 ++--
 .../first-contract/wasm/Cargo.toml                   |  2 +-
 .../esdt-contract-pair/second-contract/Cargo.toml    |  4 ++--
 .../second-contract/meta/Cargo.toml                  |  4 ++--
 .../second-contract/wasm/Cargo.toml                  |  2 +-
 .../execute-on-dest-esdt-issue-callback/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 +++---
 .../composability/forwarder-queue/meta/Cargo.toml    |  2 +-
 .../wasm-forwarder-queue-promises/Cargo.toml         |  2 +-
 .../composability/forwarder-queue/wasm/Cargo.toml    |  2 +-
 .../composability/forwarder-raw/Cargo.toml           |  4 ++--
 .../composability/forwarder-raw/meta/Cargo.toml      |  2 +-
 .../wasm-forwarder-raw-init-async-call/Cargo.toml    |  2 +-
 .../wasm-forwarder-raw-init-sync-call/Cargo.toml     |  2 +-
 .../composability/forwarder-raw/wasm/Cargo.toml      |  2 +-
 .../feature-tests/composability/forwarder/Cargo.toml |  4 ++--
 .../composability/forwarder/meta/Cargo.toml          |  2 +-
 .../composability/forwarder/wasm/Cargo.toml          |  2 +-
 .../feature-tests/composability/interact/Cargo.toml  |  4 ++--
 .../composability/local-esdt-and-nft/Cargo.toml      |  4 ++--
 .../composability/local-esdt-and-nft/meta/Cargo.toml |  2 +-
 .../composability/local-esdt-and-nft/wasm/Cargo.toml |  2 +-
 .../composability/promises-features/Cargo.toml       |  2 +-
 .../composability/promises-features/meta/Cargo.toml  |  2 +-
 .../composability/promises-features/wasm/Cargo.toml  |  2 +-
 .../composability/proxy-test-first/Cargo.toml        |  4 ++--
 .../composability/proxy-test-first/meta/Cargo.toml   |  2 +-
 .../composability/proxy-test-first/wasm/Cargo.toml   |  2 +-
 .../composability/proxy-test-second/Cargo.toml       |  4 ++--
 .../composability/proxy-test-second/meta/Cargo.toml  |  2 +-
 .../composability/proxy-test-second/wasm/Cargo.toml  |  2 +-
 .../composability/recursive-caller/Cargo.toml        |  4 ++--
 .../composability/recursive-caller/meta/Cargo.toml   |  2 +-
 .../composability/recursive-caller/wasm/Cargo.toml   |  2 +-
 .../composability/transfer-role-features/Cargo.toml  |  6 +++---
 .../transfer-role-features/meta/Cargo.toml           |  2 +-
 .../transfer-role-features/wasm/Cargo.toml           |  2 +-
 .../feature-tests/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 +-
 .../erc-style-contracts/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 ++--
 .../erc-style-contracts/erc1155/meta/Cargo.toml      |  2 +-
 .../erc-style-contracts/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 ++--
 .../erc-style-contracts/erc721/meta/Cargo.toml       |  2 +-
 .../erc-style-contracts/erc721/wasm/Cargo.toml       |  2 +-
 .../erc-style-contracts/lottery-erc20/Cargo.toml     |  4 ++--
 .../lottery-erc20/meta/Cargo.toml                    |  2 +-
 .../lottery-erc20/wasm/Cargo.toml                    |  2 +-
 .../feature-tests/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 ++--
 .../formatted-message-features/meta/Cargo.toml       |  2 +-
 .../formatted-message-features/wasm/Cargo.toml       |  2 +-
 .../feature-tests/managed-map-features/Cargo.toml    |  4 ++--
 .../managed-map-features/meta/Cargo.toml             |  2 +-
 .../managed-map-features/wasm/Cargo.toml             |  2 +-
 .../feature-tests/multi-contract-features/Cargo.toml |  4 ++--
 .../multi-contract-features/meta/Cargo.toml          |  2 +-
 .../wasm-multi-contract-alt-impl/Cargo.toml          |  2 +-
 .../wasm-multi-contract-example-feature/Cargo.toml   |  2 +-
 .../wasm-multi-contract-features-view/Cargo.toml     |  2 +-
 .../multi-contract-features/wasm/Cargo.toml          |  2 +-
 .../feature-tests/panic-message-features/Cargo.toml  |  4 ++--
 .../panic-message-features/meta/Cargo.toml           |  2 +-
 .../panic-message-features/wasm/Cargo.toml           |  2 +-
 contracts/feature-tests/payable-features/Cargo.toml  |  4 ++--
 .../feature-tests/payable-features/meta/Cargo.toml   |  2 +-
 .../feature-tests/payable-features/wasm/Cargo.toml   |  2 +-
 .../rust-snippets-generator-test/Cargo.toml          |  4 ++--
 .../interact-rs/Cargo.toml                           |  2 +-
 .../rust-snippets-generator-test/meta/Cargo.toml     |  2 +-
 .../rust-snippets-generator-test/src/lib.rs          |  2 +-
 .../rust-snippets-generator-test/wasm/Cargo.toml     |  2 +-
 .../rust-testing-framework-tester/Cargo.toml         |  4 ++--
 .../rust-testing-framework-tester/meta/Cargo.toml    |  2 +-
 .../rust-testing-framework-tester/wasm/Cargo.toml    |  2 +-
 contracts/feature-tests/use-module/Cargo.toml        |  8 ++++----
 contracts/feature-tests/use-module/meta/Cargo.toml   |  2 +-
 .../feature-tests/use-module/meta/abi/Cargo.toml     |  4 ++--
 .../use-module/use_module_expected_main.abi.json     |  2 +-
 .../use-module/use_module_expected_view.abi.json     |  2 +-
 .../use-module/wasm-use-module-view/Cargo.toml       |  2 +-
 contracts/feature-tests/use-module/wasm/Cargo.toml   |  2 +-
 contracts/modules/Cargo.toml                         |  4 ++--
 framework/base/Cargo.toml                            |  4 ++--
 framework/derive/Cargo.toml                          |  2 +-
 framework/meta/Cargo.toml                            |  4 ++--
 .../contract/generate_snippets/snippet_crate_gen.rs  |  2 +-
 framework/meta/src/cmd/contract/meta_config.rs       |  4 ++--
 .../src/cmd/standalone/upgrade/upgrade_selector.rs   |  2 +-
 framework/meta/src/version_history.rs                |  3 ++-
 framework/scenario/Cargo.toml                        | 12 ++++++------
 framework/snippets/Cargo.toml                        |  6 +++---
 framework/wasm-adapter/Cargo.toml                    |  4 ++--
 sdk/core/Cargo.toml                                  |  2 +-
 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 +-
 263 files changed, 390 insertions(+), 379 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f88e8ec907..cecffbabce 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,6 +26,16 @@ 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.45.0, vm 0.7.0, scenario-format 0.21.0, sdk 0.3.0] - 2023-11-24
+- Replicated VM 1.5 in the Rust VM. This includes support for:
+	- promises,
+	- back-transfers,
+	- modified event logs.
+- New endpoint annotation, `#[upgrade]`. Contract variants with upgrade endpoint, but without init now allowed.
+- Build system:
+	- `wasm` crates now fully generated based on data from `sc-config.toml` and root `Cargo.toml`.
+	- Setting wasm target dir automatically, if not specified, based on workspace.
+
 ## [sc 0.44.0, vm 0.6.0] - 2023-11-03
 - Back-transfer:
 	- API support in framework (not yet implemented in the Rust VM);
diff --git a/contracts/benchmarks/large-storage/Cargo.toml b/contracts/benchmarks/large-storage/Cargo.toml
index 09e805b4bb..45113cc89d 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.44.0"
+version = "0.45.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../framework/scenario"
diff --git a/contracts/benchmarks/large-storage/meta/Cargo.toml b/contracts/benchmarks/large-storage/meta/Cargo.toml
index c955b07f98..0d6b7ee6a4 100644
--- a/contracts/benchmarks/large-storage/meta/Cargo.toml
+++ b/contracts/benchmarks/large-storage/meta/Cargo.toml
@@ -8,5 +8,5 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../framework/meta"
diff --git a/contracts/benchmarks/large-storage/wasm/Cargo.toml b/contracts/benchmarks/large-storage/wasm/Cargo.toml
index 39fe674419..4acb58bd95 100644
--- a/contracts/benchmarks/large-storage/wasm/Cargo.toml
+++ b/contracts/benchmarks/large-storage/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.44.0"
+version = "0.45.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 e138fb7c33..0360717475 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.44.0"
+version = "0.45.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.44.0"
+version = "0.45.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 8b4f698626..6e422e0c38 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.44.0"
+version = "0.45.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.44.0"
+version = "0.45.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 8df0ef9269..fe883cd1af 100644
--- a/contracts/benchmarks/mappers/linked-list-repeat/meta/Cargo.toml
+++ b/contracts/benchmarks/mappers/linked-list-repeat/meta/Cargo.toml
@@ -9,5 +9,5 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../../framework/meta"
diff --git a/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.toml b/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.toml
index 38b0aa1023..ba1eab854e 100644
--- a/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.44.0"
+version = "0.45.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 02b871b1c1..4d75412858 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.44.0"
+version = "0.45.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.44.0"
+version = "0.45.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 2e25e13df3..5a920fef4e 100644
--- a/contracts/benchmarks/mappers/map-repeat/meta/Cargo.toml
+++ b/contracts/benchmarks/mappers/map-repeat/meta/Cargo.toml
@@ -9,5 +9,5 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../../framework/meta"
diff --git a/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.toml b/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.toml
index 75cad3d406..9f5fbcb184 100644
--- a/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.44.0"
+version = "0.45.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 b5ab2f42ec..ef8cd0946d 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.44.0"
+version = "0.45.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.44.0"
+version = "0.45.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 6439f63a35..34505d96d3 100644
--- a/contracts/benchmarks/mappers/queue-repeat/meta/Cargo.toml
+++ b/contracts/benchmarks/mappers/queue-repeat/meta/Cargo.toml
@@ -9,5 +9,5 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../../framework/meta"
diff --git a/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.toml b/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.toml
index b459e5a361..39a5ab6516 100644
--- a/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.44.0"
+version = "0.45.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 c4a99045ba..232f127310 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.44.0"
+version = "0.45.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.44.0"
+version = "0.45.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 f314b2e65f..006d36c4d1 100644
--- a/contracts/benchmarks/mappers/set-repeat/meta/Cargo.toml
+++ b/contracts/benchmarks/mappers/set-repeat/meta/Cargo.toml
@@ -9,5 +9,5 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../../framework/meta"
diff --git a/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.toml b/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.toml
index 56e1593625..b70ea01530 100644
--- a/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.44.0"
+version = "0.45.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 c70dd5534a..4ee01e7c86 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.44.0"
+version = "0.45.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.44.0"
+version = "0.45.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 0b20dec152..3abaea8bc9 100644
--- a/contracts/benchmarks/mappers/single-value-repeat/meta/Cargo.toml
+++ b/contracts/benchmarks/mappers/single-value-repeat/meta/Cargo.toml
@@ -9,5 +9,5 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../../framework/meta"
diff --git a/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.toml b/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.toml
index 254dd0fac1..95d2bea4f8 100644
--- a/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.44.0"
+version = "0.45.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 c4eab8f215..a604fedd0e 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.44.0"
+version = "0.45.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.44.0"
+version = "0.45.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 1f97d62445..400c8f82cc 100644
--- a/contracts/benchmarks/mappers/vec-repeat/meta/Cargo.toml
+++ b/contracts/benchmarks/mappers/vec-repeat/meta/Cargo.toml
@@ -8,5 +8,5 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../../framework/meta"
diff --git a/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.toml b/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.toml
index cab07ac1bb..6a1205b351 100644
--- a/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.44.0"
+version = "0.45.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 be39a720c1..728fe87a1e 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.44.0"
+version = "0.45.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.44.0"
+version = "0.45.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 d19c5334a7..0f1bf1d59c 100644
--- a/contracts/benchmarks/send-tx-repeat/meta/Cargo.toml
+++ b/contracts/benchmarks/send-tx-repeat/meta/Cargo.toml
@@ -8,5 +8,5 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../framework/meta"
diff --git a/contracts/benchmarks/send-tx-repeat/wasm/Cargo.toml b/contracts/benchmarks/send-tx-repeat/wasm/Cargo.toml
index 3eee56019d..9c8abf93f7 100644
--- a/contracts/benchmarks/send-tx-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/send-tx-repeat/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/str-repeat/Cargo.toml b/contracts/benchmarks/str-repeat/Cargo.toml
index f812530245..f71c24e4db 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.44.0"
+version = "0.45.0"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../framework/scenario"
diff --git a/contracts/benchmarks/str-repeat/meta/Cargo.toml b/contracts/benchmarks/str-repeat/meta/Cargo.toml
index 5aa0dee7e5..2f3e06fed9 100644
--- a/contracts/benchmarks/str-repeat/meta/Cargo.toml
+++ b/contracts/benchmarks/str-repeat/meta/Cargo.toml
@@ -8,5 +8,5 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../framework/meta"
diff --git a/contracts/benchmarks/str-repeat/wasm/Cargo.toml b/contracts/benchmarks/str-repeat/wasm/Cargo.toml
index 059f79cd38..2dee85f354 100644
--- a/contracts/benchmarks/str-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/str-repeat/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/core/price-aggregator/Cargo.toml b/contracts/core/price-aggregator/Cargo.toml
index ff7ab26714..ce1a43448d 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.44.0"
+version = "0.45.0"
 authors = [
     "Claudiu-Marcel Bruda <claudiu.bruda@multiversx.com>",
     "MultiversX <contact@multiversx.com>",
@@ -19,15 +19,15 @@ edition = "2021"
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../framework/scenario"
 
 [dependencies]
diff --git a/contracts/core/price-aggregator/meta/Cargo.toml b/contracts/core/price-aggregator/meta/Cargo.toml
index 78a5ab73fd..757a10d456 100644
--- a/contracts/core/price-aggregator/meta/Cargo.toml
+++ b/contracts/core/price-aggregator/meta/Cargo.toml
@@ -8,9 +8,9 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../framework/meta"
diff --git a/contracts/core/price-aggregator/wasm/Cargo.toml b/contracts/core/price-aggregator/wasm/Cargo.toml
index 77eb6548b2..51f6f66d07 100644
--- a/contracts/core/price-aggregator/wasm/Cargo.toml
+++ b/contracts/core/price-aggregator/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/core/wegld-swap/Cargo.toml b/contracts/core/wegld-swap/Cargo.toml
index 2716104f6d..ecb53b245e 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.44.0"
+version = "0.45.0"
 
 authors = [
     "Dorin Iancu <dorin.iancu@multiversx.com>",
@@ -20,13 +20,13 @@ edition = "2021"
 path = "src/wegld.rs"
 
 [dependencies.multiversx-sc]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../framework/scenario"
diff --git a/contracts/core/wegld-swap/meta/Cargo.toml b/contracts/core/wegld-swap/meta/Cargo.toml
index b4eb51d6e3..05488c3ac7 100644
--- a/contracts/core/wegld-swap/meta/Cargo.toml
+++ b/contracts/core/wegld-swap/meta/Cargo.toml
@@ -11,9 +11,9 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../framework/meta"
diff --git a/contracts/core/wegld-swap/wasm/Cargo.toml b/contracts/core/wegld-swap/wasm/Cargo.toml
index 72ff8087a7..00f1d1c30e 100644
--- a/contracts/core/wegld-swap/wasm/Cargo.toml
+++ b/contracts/core/wegld-swap/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/adder/Cargo.toml b/contracts/examples/adder/Cargo.toml
index 939efc2294..246e0eec44 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.44.0"
+version = "0.45.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/adder/interact/Cargo.toml b/contracts/examples/adder/interact/Cargo.toml
index 8771785c3f..703ac63013 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.44.0"
+version = "0.45.0"
 path = "../../../../framework/snippets"
diff --git a/contracts/examples/adder/meta/Cargo.toml b/contracts/examples/adder/meta/Cargo.toml
index 13056eb08d..84c9893536 100644
--- a/contracts/examples/adder/meta/Cargo.toml
+++ b/contracts/examples/adder/meta/Cargo.toml
@@ -8,5 +8,5 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../framework/meta"
diff --git a/contracts/examples/adder/wasm/Cargo.toml b/contracts/examples/adder/wasm/Cargo.toml
index c5f71868dc..b41451d7d4 100644
--- a/contracts/examples/adder/wasm/Cargo.toml
+++ b/contracts/examples/adder/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.44.0"
+version = "0.45.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 06ef5e4d57..a79732d941 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.44.0"
+version = "0.45.0"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.44.0"
+version = "0.45.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 a30043d140..585059fad2 100644
--- a/contracts/examples/bonding-curve-contract/meta/Cargo.toml
+++ b/contracts/examples/bonding-curve-contract/meta/Cargo.toml
@@ -9,5 +9,5 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../framework/meta"
diff --git a/contracts/examples/bonding-curve-contract/wasm/Cargo.toml b/contracts/examples/bonding-curve-contract/wasm/Cargo.toml
index d0b9c94e21..1ab0464579 100644
--- a/contracts/examples/bonding-curve-contract/wasm/Cargo.toml
+++ b/contracts/examples/bonding-curve-contract/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/check-pause/Cargo.toml b/contracts/examples/check-pause/Cargo.toml
index 98b482ee37..98e0dabdf3 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.2"
 
 [dependencies.multiversx-sc]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../framework/scenario"
 
diff --git a/contracts/examples/check-pause/meta/Cargo.toml b/contracts/examples/check-pause/meta/Cargo.toml
index cff9cdcce2..7fcf76fa82 100644
--- a/contracts/examples/check-pause/meta/Cargo.toml
+++ b/contracts/examples/check-pause/meta/Cargo.toml
@@ -9,5 +9,5 @@ authors = ["Alin Cruceat <alin.cruceat@multiversx.com>"]
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../framework/meta"
diff --git a/contracts/examples/check-pause/wasm/Cargo.toml b/contracts/examples/check-pause/wasm/Cargo.toml
index 397cb79332..d0422b18f1 100644
--- a/contracts/examples/check-pause/wasm/Cargo.toml
+++ b/contracts/examples/check-pause/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/crowdfunding-esdt/Cargo.toml b/contracts/examples/crowdfunding-esdt/Cargo.toml
index 6d9196cc84..22e8efa5e1 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.44.0"
+version = "0.45.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.44.0"
+version = "0.45.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 810bfe8264..67202ea503 100644
--- a/contracts/examples/crowdfunding-esdt/meta/Cargo.toml
+++ b/contracts/examples/crowdfunding-esdt/meta/Cargo.toml
@@ -9,5 +9,5 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../framework/meta"
diff --git a/contracts/examples/crowdfunding-esdt/wasm/Cargo.toml b/contracts/examples/crowdfunding-esdt/wasm/Cargo.toml
index e87cbd66bb..343396d29f 100644
--- a/contracts/examples/crowdfunding-esdt/wasm/Cargo.toml
+++ b/contracts/examples/crowdfunding-esdt/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/crypto-bubbles/Cargo.toml b/contracts/examples/crypto-bubbles/Cargo.toml
index fac4e5886b..cc4251fbc0 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.44.0"
+version = "0.45.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/crypto-bubbles/meta/Cargo.toml b/contracts/examples/crypto-bubbles/meta/Cargo.toml
index ddfaa8b38a..0bea0af18e 100644
--- a/contracts/examples/crypto-bubbles/meta/Cargo.toml
+++ b/contracts/examples/crypto-bubbles/meta/Cargo.toml
@@ -9,5 +9,5 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../framework/meta"
diff --git a/contracts/examples/crypto-bubbles/wasm/Cargo.toml b/contracts/examples/crypto-bubbles/wasm/Cargo.toml
index 29ec806dda..9151aba57e 100644
--- a/contracts/examples/crypto-bubbles/wasm/Cargo.toml
+++ b/contracts/examples/crypto-bubbles/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.44.0"
+version = "0.45.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 2b08bb831e..20a023570c 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.44.0"
+version = "0.45.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 6fd25727ad..cd9df56d7c 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.44.0"
+version = "0.45.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 430b3a3b92..4a46dd9e60 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.44.0"
+version = "0.45.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.44.0"
+version = "0.45.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 a6f07fe46c..fb3ad53512 100644
--- a/contracts/examples/crypto-kitties/kitty-auction/meta/Cargo.toml
+++ b/contracts/examples/crypto-kitties/kitty-auction/meta/Cargo.toml
@@ -8,5 +8,5 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../../framework/meta"
diff --git a/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.toml b/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.toml
index 2f85102357..2e0d793ad8 100644
--- a/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.toml
+++ b/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.44.0"
+version = "0.45.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 974e89d7c7..572608c92a 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.44.0"
+version = "0.45.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.44.0"
+version = "0.45.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 5f488283a8..d2963d6039 100644
--- a/contracts/examples/crypto-kitties/kitty-genetic-alg/meta/Cargo.toml
+++ b/contracts/examples/crypto-kitties/kitty-genetic-alg/meta/Cargo.toml
@@ -8,5 +8,5 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../../framework/meta"
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 0dc2490bb4..1a56230350 100644
--- a/contracts/examples/crypto-kitties/kitty-genetic-alg/wasm/Cargo.toml
+++ b/contracts/examples/crypto-kitties/kitty-genetic-alg/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.44.0"
+version = "0.45.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 cc1de09a53..ad1edcf521 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.44.0"
+version = "0.45.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.44.0"
+version = "0.45.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 d8567bbbe8..605244ad34 100644
--- a/contracts/examples/crypto-kitties/kitty-ownership/meta/Cargo.toml
+++ b/contracts/examples/crypto-kitties/kitty-ownership/meta/Cargo.toml
@@ -8,5 +8,5 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../../framework/meta"
diff --git a/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.toml b/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.toml
index 6e533f972d..a575e7faea 100644
--- a/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.toml
+++ b/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/crypto-zombies/Cargo.toml b/contracts/examples/crypto-zombies/Cargo.toml
index 8d9b9c36e8..b751df903e 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.44.0"
+version = "0.45.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/crypto-zombies/meta/Cargo.toml b/contracts/examples/crypto-zombies/meta/Cargo.toml
index 050741e87f..e5bdf52574 100644
--- a/contracts/examples/crypto-zombies/meta/Cargo.toml
+++ b/contracts/examples/crypto-zombies/meta/Cargo.toml
@@ -8,5 +8,5 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../framework/meta"
diff --git a/contracts/examples/crypto-zombies/wasm/Cargo.toml b/contracts/examples/crypto-zombies/wasm/Cargo.toml
index 53f45039e9..107f39b594 100644
--- a/contracts/examples/crypto-zombies/wasm/Cargo.toml
+++ b/contracts/examples/crypto-zombies/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/digital-cash/Cargo.toml b/contracts/examples/digital-cash/Cargo.toml
index c7e5fd954e..f81dd11db3 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.44.0"
+version = "0.45.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/digital-cash/meta/Cargo.toml b/contracts/examples/digital-cash/meta/Cargo.toml
index 991e62aa8c..34209efd8e 100644
--- a/contracts/examples/digital-cash/meta/Cargo.toml
+++ b/contracts/examples/digital-cash/meta/Cargo.toml
@@ -8,5 +8,5 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../framework/meta"
diff --git a/contracts/examples/digital-cash/wasm/Cargo.toml b/contracts/examples/digital-cash/wasm/Cargo.toml
index adea4827e3..b8c2583b9b 100644
--- a/contracts/examples/digital-cash/wasm/Cargo.toml
+++ b/contracts/examples/digital-cash/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/empty/Cargo.toml b/contracts/examples/empty/Cargo.toml
index 659973f49e..296884fe01 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.44.0"
+version = "0.45.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../framework/scenario"
 
 [dev-dependencies]
diff --git a/contracts/examples/empty/meta/Cargo.toml b/contracts/examples/empty/meta/Cargo.toml
index 79ef16718a..329fcaf74e 100644
--- a/contracts/examples/empty/meta/Cargo.toml
+++ b/contracts/examples/empty/meta/Cargo.toml
@@ -8,5 +8,5 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../framework/meta"
diff --git a/contracts/examples/empty/wasm/Cargo.toml b/contracts/examples/empty/wasm/Cargo.toml
index b02f42b8e2..a4065fe8b9 100644
--- a/contracts/examples/empty/wasm/Cargo.toml
+++ b/contracts/examples/empty/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.44.0"
+version = "0.45.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 dc0fb8ed37..d5aaa730b8 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.44.0"
+version = "0.45.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.44.0"
+version = "0.45.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 d59bb9fb1f..c3cf99f31a 100644
--- a/contracts/examples/esdt-transfer-with-fee/meta/Cargo.toml
+++ b/contracts/examples/esdt-transfer-with-fee/meta/Cargo.toml
@@ -8,5 +8,5 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../framework/meta"
diff --git a/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.toml b/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.toml
index ebea9abc1a..4afaf50232 100644
--- a/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.toml
+++ b/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/factorial/Cargo.toml b/contracts/examples/factorial/Cargo.toml
index 5dda7598f5..14d856071c 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.44.0"
+version = "0.45.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/factorial/meta/Cargo.toml b/contracts/examples/factorial/meta/Cargo.toml
index b11dd1b6a6..81d386adbd 100644
--- a/contracts/examples/factorial/meta/Cargo.toml
+++ b/contracts/examples/factorial/meta/Cargo.toml
@@ -9,5 +9,5 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../framework/meta"
diff --git a/contracts/examples/factorial/wasm/Cargo.toml b/contracts/examples/factorial/wasm/Cargo.toml
index fdb5facbab..216f51d7d7 100644
--- a/contracts/examples/factorial/wasm/Cargo.toml
+++ b/contracts/examples/factorial/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/fractional-nfts/Cargo.toml b/contracts/examples/fractional-nfts/Cargo.toml
index 1282388c4e..bd5b674aff 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.44.0"
+version = "0.45.0"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/fractional-nfts/meta/Cargo.toml b/contracts/examples/fractional-nfts/meta/Cargo.toml
index 6de05d00db..72612331e2 100644
--- a/contracts/examples/fractional-nfts/meta/Cargo.toml
+++ b/contracts/examples/fractional-nfts/meta/Cargo.toml
@@ -9,5 +9,5 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../framework/meta"
diff --git a/contracts/examples/fractional-nfts/wasm/Cargo.toml b/contracts/examples/fractional-nfts/wasm/Cargo.toml
index 0b7edf6875..1c2b4221fe 100644
--- a/contracts/examples/fractional-nfts/wasm/Cargo.toml
+++ b/contracts/examples/fractional-nfts/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/lottery-esdt/Cargo.toml b/contracts/examples/lottery-esdt/Cargo.toml
index 950e8a8f9c..2df5826319 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.44.0"
+version = "0.45.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/lottery-esdt/meta/Cargo.toml b/contracts/examples/lottery-esdt/meta/Cargo.toml
index 0720fcc97f..efb4ed8149 100644
--- a/contracts/examples/lottery-esdt/meta/Cargo.toml
+++ b/contracts/examples/lottery-esdt/meta/Cargo.toml
@@ -9,5 +9,5 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../framework/meta"
diff --git a/contracts/examples/lottery-esdt/wasm/Cargo.toml b/contracts/examples/lottery-esdt/wasm/Cargo.toml
index 3f410a41b1..5793e22cbe 100644
--- a/contracts/examples/lottery-esdt/wasm/Cargo.toml
+++ b/contracts/examples/lottery-esdt/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/multisig/Cargo.toml b/contracts/examples/multisig/Cargo.toml
index 44c15ef962..6ddaec9cf0 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.44.0"
+version = "0.45.0"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../framework/scenario"
 
 [dev-dependencies.adder]
@@ -27,7 +27,7 @@ path = "../adder"
 path = "../factorial"
 
 [dev-dependencies.multiversx-wegld-swap-sc]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../core/wegld-swap"
 
 [dev-dependencies]
diff --git a/contracts/examples/multisig/interact/Cargo.toml b/contracts/examples/multisig/interact/Cargo.toml
index 2cce4b8b83..cf37efd3e6 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.44.0"
+version = "0.45.0"
 path = "../../../../contracts/modules"
 
 [dependencies.multiversx-sc-snippets]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../framework/snippets"
 
 [dependencies.multiversx-sc-scenario]
-version = "=0.44.0"
+version = "=0.45.0"
 path = "../../../../framework/scenario"
diff --git a/contracts/examples/multisig/meta/Cargo.toml b/contracts/examples/multisig/meta/Cargo.toml
index 596c72b933..f472b84187 100644
--- a/contracts/examples/multisig/meta/Cargo.toml
+++ b/contracts/examples/multisig/meta/Cargo.toml
@@ -9,5 +9,5 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../framework/meta"
diff --git a/contracts/examples/multisig/wasm-multisig-full/Cargo.toml b/contracts/examples/multisig/wasm-multisig-full/Cargo.toml
index ab555f6672..f46d0bf4ab 100644
--- a/contracts/examples/multisig/wasm-multisig-full/Cargo.toml
+++ b/contracts/examples/multisig/wasm-multisig-full/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.44.0"
+version = "0.45.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 1f9cbad7ae..6ebc48642e 100644
--- a/contracts/examples/multisig/wasm-multisig-view/Cargo.toml
+++ b/contracts/examples/multisig/wasm-multisig-view/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/multisig/wasm/Cargo.toml b/contracts/examples/multisig/wasm/Cargo.toml
index fb06b58761..dc4bd6b92d 100644
--- a/contracts/examples/multisig/wasm/Cargo.toml
+++ b/contracts/examples/multisig/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/nft-minter/Cargo.toml b/contracts/examples/nft-minter/Cargo.toml
index 78c800f2a7..98d5f76b10 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.44.0"
+version = "0.45.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/nft-minter/meta/Cargo.toml b/contracts/examples/nft-minter/meta/Cargo.toml
index 0709b85822..1785a06c1c 100644
--- a/contracts/examples/nft-minter/meta/Cargo.toml
+++ b/contracts/examples/nft-minter/meta/Cargo.toml
@@ -9,5 +9,5 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../framework/meta"
diff --git a/contracts/examples/nft-minter/wasm/Cargo.toml b/contracts/examples/nft-minter/wasm/Cargo.toml
index 418f30a3ae..5198487f35 100644
--- a/contracts/examples/nft-minter/wasm/Cargo.toml
+++ b/contracts/examples/nft-minter/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.44.0"
+version = "0.45.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 95bad88322..cf1c492bd6 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.44.0"
+version = "0.45.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.44.0"
+version = "0.45.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 21c41731aa..1135c41f1d 100644
--- a/contracts/examples/nft-storage-prepay/meta/Cargo.toml
+++ b/contracts/examples/nft-storage-prepay/meta/Cargo.toml
@@ -11,5 +11,5 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../framework/meta"
diff --git a/contracts/examples/nft-storage-prepay/wasm/Cargo.toml b/contracts/examples/nft-storage-prepay/wasm/Cargo.toml
index 60fe73c2b0..a32fd404c5 100644
--- a/contracts/examples/nft-storage-prepay/wasm/Cargo.toml
+++ b/contracts/examples/nft-storage-prepay/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/nft-subscription/Cargo.toml b/contracts/examples/nft-subscription/Cargo.toml
index 8d0b7b383b..ec0cac0615 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.44.0"
+version = "0.45.0"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/nft-subscription/meta/Cargo.toml b/contracts/examples/nft-subscription/meta/Cargo.toml
index c8816b94be..b1921ea560 100644
--- a/contracts/examples/nft-subscription/meta/Cargo.toml
+++ b/contracts/examples/nft-subscription/meta/Cargo.toml
@@ -9,5 +9,5 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../framework/meta"
diff --git a/contracts/examples/nft-subscription/wasm/Cargo.toml b/contracts/examples/nft-subscription/wasm/Cargo.toml
index 786ebd45cb..d28eded9c7 100644
--- a/contracts/examples/nft-subscription/wasm/Cargo.toml
+++ b/contracts/examples/nft-subscription/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.44.0"
+version = "0.45.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 919c6bd2d4..07201f9c7c 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.44.0"
+version = "0.45.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.44.0"
+version = "0.45.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 36b341611f..f7d2f073a9 100644
--- a/contracts/examples/order-book/factory/meta/Cargo.toml
+++ b/contracts/examples/order-book/factory/meta/Cargo.toml
@@ -9,5 +9,5 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../../framework/meta"
diff --git a/contracts/examples/order-book/factory/wasm/Cargo.toml b/contracts/examples/order-book/factory/wasm/Cargo.toml
index 7305c668b3..d6ccc18244 100644
--- a/contracts/examples/order-book/factory/wasm/Cargo.toml
+++ b/contracts/examples/order-book/factory/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.44.0"
+version = "0.45.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 38ff196bae..cca4ea0509 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.44.0"
+version = "0.45.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.44.0"
+version = "0.45.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 18f4bf6e5a..f6ccdface0 100644
--- a/contracts/examples/order-book/pair/meta/Cargo.toml
+++ b/contracts/examples/order-book/pair/meta/Cargo.toml
@@ -9,5 +9,5 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../../framework/meta"
diff --git a/contracts/examples/order-book/pair/wasm/Cargo.toml b/contracts/examples/order-book/pair/wasm/Cargo.toml
index 29e6074e5b..30622ed8a9 100644
--- a/contracts/examples/order-book/pair/wasm/Cargo.toml
+++ b/contracts/examples/order-book/pair/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.44.0"
+version = "0.45.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 5b454c1745..57bdd120e9 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.44.0"
+version = "0.45.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.44.0"
+version = "0.45.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 2c49afb5ae..a8b240df0c 100644
--- a/contracts/examples/ping-pong-egld/meta/Cargo.toml
+++ b/contracts/examples/ping-pong-egld/meta/Cargo.toml
@@ -9,5 +9,5 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../framework/meta"
diff --git a/contracts/examples/ping-pong-egld/wasm/Cargo.toml b/contracts/examples/ping-pong-egld/wasm/Cargo.toml
index 60191b4636..4c8605e902 100644
--- a/contracts/examples/ping-pong-egld/wasm/Cargo.toml
+++ b/contracts/examples/ping-pong-egld/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/proxy-pause/Cargo.toml b/contracts/examples/proxy-pause/Cargo.toml
index 3a70ce4d61..60434b3125 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.44.0"
+version = "0.45.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.44.0"
+version = "0.45.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 3f6295b111..5bc778deb1 100644
--- a/contracts/examples/proxy-pause/meta/Cargo.toml
+++ b/contracts/examples/proxy-pause/meta/Cargo.toml
@@ -11,5 +11,5 @@ authors = [ "you",]
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../framework/meta"
diff --git a/contracts/examples/proxy-pause/wasm/Cargo.toml b/contracts/examples/proxy-pause/wasm/Cargo.toml
index 8115bed9bc..2dd42f0417 100644
--- a/contracts/examples/proxy-pause/wasm/Cargo.toml
+++ b/contracts/examples/proxy-pause/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/rewards-distribution/Cargo.toml b/contracts/examples/rewards-distribution/Cargo.toml
index 0a1d10b915..fc3bd1cbe2 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.44.0"
+version = "0.45.0"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/rewards-distribution/meta/Cargo.toml b/contracts/examples/rewards-distribution/meta/Cargo.toml
index 1056013f43..1b60aa789c 100644
--- a/contracts/examples/rewards-distribution/meta/Cargo.toml
+++ b/contracts/examples/rewards-distribution/meta/Cargo.toml
@@ -11,5 +11,5 @@ authors = ["Claudiu-Marcel Bruda <claudiu.bruda@multiversx.com>"]
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../framework/meta"
diff --git a/contracts/examples/rewards-distribution/wasm/Cargo.toml b/contracts/examples/rewards-distribution/wasm/Cargo.toml
index e551af4861..7680d9254a 100644
--- a/contracts/examples/rewards-distribution/wasm/Cargo.toml
+++ b/contracts/examples/rewards-distribution/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.44.0"
+version = "0.45.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 37bf288eee..c68e4afb14 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.44.0"
+version = "0.45.0"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.44.0"
+version = "0.45.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 491ee7ae83..cd1d9762f8 100644
--- a/contracts/examples/seed-nft-minter/meta/Cargo.toml
+++ b/contracts/examples/seed-nft-minter/meta/Cargo.toml
@@ -11,5 +11,5 @@ authors = ["Claudiu-Marcel Bruda <claudiu.bruda@multiversx.com>"]
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../framework/meta"
diff --git a/contracts/examples/seed-nft-minter/wasm/Cargo.toml b/contracts/examples/seed-nft-minter/wasm/Cargo.toml
index 5b1b2cbcc1..998375919f 100644
--- a/contracts/examples/seed-nft-minter/wasm/Cargo.toml
+++ b/contracts/examples/seed-nft-minter/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/token-release/Cargo.toml b/contracts/examples/token-release/Cargo.toml
index f0a3f35179..f808e09f15 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.44.0"
+version = "0.45.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../framework/scenario"
 
diff --git a/contracts/examples/token-release/meta/Cargo.toml b/contracts/examples/token-release/meta/Cargo.toml
index c88211b8ec..b06858c3bb 100644
--- a/contracts/examples/token-release/meta/Cargo.toml
+++ b/contracts/examples/token-release/meta/Cargo.toml
@@ -10,6 +10,6 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../framework/meta"
 
diff --git a/contracts/examples/token-release/wasm/Cargo.toml b/contracts/examples/token-release/wasm/Cargo.toml
index d273fa664c..febd248835 100644
--- a/contracts/examples/token-release/wasm/Cargo.toml
+++ b/contracts/examples/token-release/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.44.0"
+version = "0.45.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 fbd831887f..de05ce2a24 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.44.0"
+version = "0.45.0"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../framework/scenario"
 
 [dev-dependencies.multiversx-sc-meta]
-version = "0.44.0"
+version = "0.45.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 a3e8556834..3bcabf5ab8 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.44.0"
+            "version": "0.45.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 90266ddfde..60584c4254 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.44.0"
+            "version": "0.45.0"
         }
     },
     "docs": [
diff --git a/contracts/feature-tests/abi-tester/meta/Cargo.toml b/contracts/feature-tests/abi-tester/meta/Cargo.toml
index d47adc3d81..38f4343584 100644
--- a/contracts/feature-tests/abi-tester/meta/Cargo.toml
+++ b/contracts/feature-tests/abi-tester/meta/Cargo.toml
@@ -9,5 +9,5 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../framework/meta"
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 c1c96410be..9a8fc56c10 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
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.44.0"
+version = "0.45.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 0d9cd765c7..0e678d8524 100644
--- a/contracts/feature-tests/abi-tester/wasm/Cargo.toml
+++ b/contracts/feature-tests/abi-tester/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.44.0"
+version = "0.45.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 dbbd90397e..adcf61f847 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.44.0"
+version = "0.45.0"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.44.0"
+version = "0.45.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 ecce1af911..0368b7e715 100644
--- a/contracts/feature-tests/alloc-features/meta/Cargo.toml
+++ b/contracts/feature-tests/alloc-features/meta/Cargo.toml
@@ -9,5 +9,5 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../framework/meta"
diff --git a/contracts/feature-tests/alloc-features/wasm/Cargo.toml b/contracts/feature-tests/alloc-features/wasm/Cargo.toml
index 7a3f4247b4..1fac094754 100644
--- a/contracts/feature-tests/alloc-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/alloc-features/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.44.0"
+version = "0.45.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 f9a89b42dd..e36563b199 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.44.0"
+version = "0.45.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../framework/scenario"
 
 [dependencies.multiversx-sc-modules]
-version = "0.44.0"
+version = "0.45.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 3cc8861248..b5d156b70d 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.44.0"
+version = "0.45.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 e809ffdeec..1468e25291 100644
--- a/contracts/feature-tests/basic-features/meta/Cargo.toml
+++ b/contracts/feature-tests/basic-features/meta/Cargo.toml
@@ -9,5 +9,5 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../framework/meta"
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 c3bce1465f..78382de4ab 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
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.44.0"
+version = "0.45.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 b6d82662bd..8088bb970a 100644
--- a/contracts/feature-tests/basic-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/basic-features/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.44.0"
+version = "0.45.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 a0201dfb87..29c88ee8c1 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.44.0"
+version = "0.45.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.44.0"
+version = "0.45.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 e234ac8f02..7e3b09e14e 100644
--- a/contracts/feature-tests/big-float-features/meta/Cargo.toml
+++ b/contracts/feature-tests/big-float-features/meta/Cargo.toml
@@ -9,5 +9,5 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../framework/meta"
diff --git a/contracts/feature-tests/big-float-features/wasm/Cargo.toml b/contracts/feature-tests/big-float-features/wasm/Cargo.toml
index dd694d97d1..8fc99f50d7 100644
--- a/contracts/feature-tests/big-float-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/big-float-features/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/Cargo.toml b/contracts/feature-tests/composability/Cargo.toml
index 50bf74e174..37c6836827 100644
--- a/contracts/feature-tests/composability/Cargo.toml
+++ b/contracts/feature-tests/composability/Cargo.toml
@@ -33,10 +33,10 @@ path = "recursive-caller"
 path = "vault"
 
 [dependencies.multiversx-sc]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../framework/base"
 features = ["promises", "back-transfers"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.44.0"
+version = "0.45.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 a05475f257..f5d4196ed7 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.44.0"
+version = "0.45.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.44.0"
+version = "0.45.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 178d66ec84..71d806e192 100644
--- a/contracts/feature-tests/composability/builtin-func-features/meta/Cargo.toml
+++ b/contracts/feature-tests/composability/builtin-func-features/meta/Cargo.toml
@@ -8,5 +8,5 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../../framework/meta"
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 807c270bdb..cdf2e6c7f4 100644
--- a/contracts/feature-tests/composability/builtin-func-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/builtin-func-features/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.44.0"
+version = "0.45.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 2b6e75313b..bdd65883ba 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.44.0"
+version = "0.45.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.44.0"
+version = "0.45.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 3aaa278709..30e06ff33d 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.44.0"
+version = "0.45.0"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.44.0"
+version = "0.45.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 95824b1820..b1cb8c4458 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,9 +8,9 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../../../framework/meta"
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 91737443a1..06f6307482 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
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.44.0"
+version = "0.45.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 ed190c4d3c..60d6b5c578 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.44.0"
+version = "0.45.0"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.44.0"
+version = "0.45.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 9108cc04be..3b0eafe8da 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,9 +8,9 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../../../framework/meta"
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 c52af71d3e..dcde50f2f8 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
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.44.0"
+version = "0.45.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 67fcf6963a..0bc42d2035 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.44.0"
+version = "0.45.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.44.0"
+version = "0.45.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 e82d985363..9932d6be85 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.44.0"
+version = "0.45.0"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.44.0"
+version = "0.45.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 d9c2035b9d..ce40c8a88b 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,9 +8,9 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../../../framework/meta"
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 40a3af7537..963e768de6 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
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.44.0"
+version = "0.45.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 c48859a4eb..0a2d025fde 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.44.0"
+version = "0.45.0"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.44.0"
+version = "0.45.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 11033ce54b..ec32bc2d18 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,9 +8,9 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../../../framework/meta"
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 d328e9887d..09642993e1 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
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.44.0"
+version = "0.45.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 c207e48de5..d3cbdc4b34 100644
--- a/contracts/feature-tests/composability/forwarder-queue/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-queue/Cargo.toml
@@ -15,14 +15,14 @@ promises = ["multiversx-sc/promises"]
 path = "../vault"
 
 [dependencies.multiversx-sc]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../framework/wasm-adapter"
 optional = true
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.44.0"
+version = "0.45.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 1070c562f4..f84c8ca80d 100644
--- a/contracts/feature-tests/composability/forwarder-queue/meta/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-queue/meta/Cargo.toml
@@ -8,5 +8,5 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../../framework/meta"
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 f2d361c59d..f48c603bde 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 @@ path = ".."
 features = ["promises"]
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.44.0"
+version = "0.45.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 391ffba1be..203f4cf118 100644
--- a/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.44.0"
+version = "0.45.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 65c818508b..fa8b49f3bd 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.44.0"
+version = "0.45.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.44.0"
+version = "0.45.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 24d578f44c..7873a94c06 100644
--- a/contracts/feature-tests/composability/forwarder-raw/meta/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-raw/meta/Cargo.toml
@@ -8,5 +8,5 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../../framework/meta"
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 8384a2a4ff..0467316b0b 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
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.44.0"
+version = "0.45.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 5218b6a776..ee924036ea 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
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.44.0"
+version = "0.45.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 21b14fcdb4..88dafe71c1 100644
--- a/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.44.0"
+version = "0.45.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 250743e851..0b22a89320 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.44.0"
+version = "0.45.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.44.0"
+version = "0.45.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 75c8fc1966..fc78014015 100644
--- a/contracts/feature-tests/composability/forwarder/meta/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder/meta/Cargo.toml
@@ -8,5 +8,5 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../../framework/meta"
diff --git a/contracts/feature-tests/composability/forwarder/wasm/Cargo.toml b/contracts/feature-tests/composability/forwarder/wasm/Cargo.toml
index 335fa13611..85e63edb02 100644
--- a/contracts/feature-tests/composability/forwarder/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.44.0"
+version = "0.45.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 5bdd19d794..609a17e5fd 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.44.0"
+version = "0.45.0"
 path = "../../../../contracts/modules"
 
 [dependencies.multiversx-sc-snippets]
-version = "0.44.0"
+version = "0.45.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 b081c9eac9..c4c64476ea 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.44.0"
+version = "0.45.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.44.0"
+version = "0.45.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 6394075a8d..a1560252ee 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,5 +8,5 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../../framework/meta"
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 dd6242294d..6aa822239b 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
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.44.0"
+version = "0.45.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 811d3546ac..d5ce07c9bb 100644
--- a/contracts/feature-tests/composability/promises-features/Cargo.toml
+++ b/contracts/feature-tests/composability/promises-features/Cargo.toml
@@ -12,7 +12,7 @@ path = "src/promises_main.rs"
 path = "../vault"
 
 [dependencies.multiversx-sc]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../framework/base"
 features = ["promises", "back-transfers"]
 
diff --git a/contracts/feature-tests/composability/promises-features/meta/Cargo.toml b/contracts/feature-tests/composability/promises-features/meta/Cargo.toml
index af7925b6c7..fa91f6fc96 100644
--- a/contracts/feature-tests/composability/promises-features/meta/Cargo.toml
+++ b/contracts/feature-tests/composability/promises-features/meta/Cargo.toml
@@ -8,5 +8,5 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../../framework/meta"
diff --git a/contracts/feature-tests/composability/promises-features/wasm/Cargo.toml b/contracts/feature-tests/composability/promises-features/wasm/Cargo.toml
index 2e74c0bfbb..fa603bf497 100644
--- a/contracts/feature-tests/composability/promises-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/promises-features/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.44.0"
+version = "0.45.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 cbd52266d6..fbc3a0744f 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.44.0"
+version = "0.45.0"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.44.0"
+version = "0.45.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 eb0237f2a2..a3cff62b73 100644
--- a/contracts/feature-tests/composability/proxy-test-first/meta/Cargo.toml
+++ b/contracts/feature-tests/composability/proxy-test-first/meta/Cargo.toml
@@ -8,5 +8,5 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../../framework/meta"
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 db10ca7681..b800e96890 100644
--- a/contracts/feature-tests/composability/proxy-test-first/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/proxy-test-first/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.44.0"
+version = "0.45.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 9f9c6b7c16..6b5d7cf995 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.44.0"
+version = "0.45.0"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.44.0"
+version = "0.45.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 d2b627b2bc..ca5effd197 100644
--- a/contracts/feature-tests/composability/proxy-test-second/meta/Cargo.toml
+++ b/contracts/feature-tests/composability/proxy-test-second/meta/Cargo.toml
@@ -8,5 +8,5 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../../framework/meta"
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 0ea29f6006..714316fe0a 100644
--- a/contracts/feature-tests/composability/proxy-test-second/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/proxy-test-second/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.44.0"
+version = "0.45.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 b36a402f3c..68d62a7a44 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.44.0"
+version = "0.45.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.44.0"
+version = "0.45.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 7961ea007b..68781e58dd 100644
--- a/contracts/feature-tests/composability/recursive-caller/meta/Cargo.toml
+++ b/contracts/feature-tests/composability/recursive-caller/meta/Cargo.toml
@@ -8,5 +8,5 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../../framework/meta"
diff --git a/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.toml b/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.toml
index 8d9ac9d073..167158fe18 100644
--- a/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.44.0"
+version = "0.45.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 aae84869e0..95afa27a80 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.44.0"
+version = "0.45.0"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.44.0"
+version = "0.45.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 44fe4262cb..9c6caffa29 100644
--- a/contracts/feature-tests/composability/transfer-role-features/meta/Cargo.toml
+++ b/contracts/feature-tests/composability/transfer-role-features/meta/Cargo.toml
@@ -8,5 +8,5 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../../framework/meta"
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 1751a9fb23..ed27812367 100644
--- a/contracts/feature-tests/composability/transfer-role-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/transfer-role-features/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.44.0"
+version = "0.45.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 bb6b8ff9f5..4225f623c4 100644
--- a/contracts/feature-tests/composability/vault/Cargo.toml
+++ b/contracts/feature-tests/composability/vault/Cargo.toml
@@ -10,10 +10,10 @@ path = "src/vault.rs"
 
 
 [dependencies.multiversx-sc]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../framework/base"
 features = ["promises"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.44.0"
+version = "0.45.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 2eb89cd954..0a7f9f2a53 100644
--- a/contracts/feature-tests/composability/vault/meta/Cargo.toml
+++ b/contracts/feature-tests/composability/vault/meta/Cargo.toml
@@ -8,5 +8,5 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../../framework/meta"
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 4ce110bab7..81cf92de8f 100644
--- a/contracts/feature-tests/composability/vault/wasm-vault-promises/Cargo.toml
+++ b/contracts/feature-tests/composability/vault/wasm-vault-promises/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.44.0"
+version = "0.45.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 bbdbad4c77..2cad224c7b 100644
--- a/contracts/feature-tests/composability/vault/wasm-vault-upgrade/Cargo.toml
+++ b/contracts/feature-tests/composability/vault/wasm-vault-upgrade/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.44.0"
+version = "0.45.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 30761c97db..778f9cb325 100644
--- a/contracts/feature-tests/composability/vault/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/vault/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.44.0"
+version = "0.45.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 e8ab6103e6..2352483d8a 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.44.0"
+version = "0.45.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.44.0"
+version = "0.45.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 9b4262d404..29c7c2be95 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,5 +9,5 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../../framework/meta"
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 6b093e2f9f..e7dbaef76c 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
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.44.0"
+version = "0.45.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 8c7bd6581d..c7268af735 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.44.0"
+version = "0.45.0"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.44.0"
+version = "0.45.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 1be7cd4ddf..1d5bdc31d4 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,5 +9,5 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../../framework/meta"
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 21febc24f1..75fc913f74 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
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.44.0"
+version = "0.45.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 1b1b91239a..42db638f68 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.44.0"
+version = "0.45.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.44.0"
+version = "0.45.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 067bafd384..40ec48078f 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,5 +9,5 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../../framework/meta"
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 6d955ef10e..6958310dbe 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
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.44.0"
+version = "0.45.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 b4457a1f33..db17644f2c 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.44.0"
+version = "0.45.0"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.44.0"
+version = "0.45.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 e0b94e8390..19de4e17ca 100644
--- a/contracts/feature-tests/erc-style-contracts/erc1155/meta/Cargo.toml
+++ b/contracts/feature-tests/erc-style-contracts/erc1155/meta/Cargo.toml
@@ -9,5 +9,5 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../../framework/meta"
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 2d07e7549f..c019ee4f53 100644
--- a/contracts/feature-tests/erc-style-contracts/erc1155/wasm/Cargo.toml
+++ b/contracts/feature-tests/erc-style-contracts/erc1155/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.44.0"
+version = "0.45.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 24683d9b10..d4cbaeae62 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.44.0"
+version = "0.45.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.44.0"
+version = "0.45.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 a3f98845b4..d4dfacec1a 100644
--- a/contracts/feature-tests/erc-style-contracts/erc20/meta/Cargo.toml
+++ b/contracts/feature-tests/erc-style-contracts/erc20/meta/Cargo.toml
@@ -9,5 +9,5 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../../framework/meta"
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 ef0f482771..feaa6bf45c 100644
--- a/contracts/feature-tests/erc-style-contracts/erc20/wasm/Cargo.toml
+++ b/contracts/feature-tests/erc-style-contracts/erc20/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.44.0"
+version = "0.45.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 946e0e057e..2a9ac78a21 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.44.0"
+version = "0.45.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.44.0"
+version = "0.45.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 99183b8d4d..cfcce05a39 100644
--- a/contracts/feature-tests/erc-style-contracts/erc721/meta/Cargo.toml
+++ b/contracts/feature-tests/erc-style-contracts/erc721/meta/Cargo.toml
@@ -9,5 +9,5 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../../framework/meta"
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 6b7170cd10..ea944f1672 100644
--- a/contracts/feature-tests/erc-style-contracts/erc721/wasm/Cargo.toml
+++ b/contracts/feature-tests/erc-style-contracts/erc721/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.44.0"
+version = "0.45.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 5aa509c068..4d5d9204a9 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.44.0"
+version = "0.45.0"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.44.0"
+version = "0.45.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 f1c08c20b0..bd35283ad8 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,5 +9,5 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../../framework/meta"
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 7458149418..0526192b8a 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
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.44.0"
+version = "0.45.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 4a5f54df23..78901eb27d 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.44.0"
+version = "0.45.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.44.0"
+version = "0.45.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 ecb602a879..0df9b1b722 100644
--- a/contracts/feature-tests/esdt-system-sc-mock/meta/Cargo.toml
+++ b/contracts/feature-tests/esdt-system-sc-mock/meta/Cargo.toml
@@ -9,5 +9,5 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../framework/meta"
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 79a50c3e0a..d089d0ae83 100644
--- a/contracts/feature-tests/esdt-system-sc-mock/wasm/Cargo.toml
+++ b/contracts/feature-tests/esdt-system-sc-mock/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.44.0"
+version = "0.45.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 7ccfbcdbf5..2fad9f67b0 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.44.0"
+version = "0.45.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.44.0"
+version = "0.45.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 a000402366..c60c3f51bb 100644
--- a/contracts/feature-tests/formatted-message-features/meta/Cargo.toml
+++ b/contracts/feature-tests/formatted-message-features/meta/Cargo.toml
@@ -11,5 +11,5 @@ authors = [ "you",]
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../framework/meta"
diff --git a/contracts/feature-tests/formatted-message-features/wasm/Cargo.toml b/contracts/feature-tests/formatted-message-features/wasm/Cargo.toml
index 130076659f..f7cd22ecb2 100644
--- a/contracts/feature-tests/formatted-message-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/formatted-message-features/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.44.0"
+version = "0.45.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 a180f8b765..134e3376e3 100644
--- a/contracts/feature-tests/managed-map-features/Cargo.toml
+++ b/contracts/feature-tests/managed-map-features/Cargo.toml
@@ -8,13 +8,13 @@ publish = false
 [lib]
 path = "src/mmap_features.rs"
 [dependencies.multiversx-sc]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../framework/base"
 
 features = ["managed-map"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.44.0"
+version = "0.45.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 0cd5d1226d..74b62ad483 100644
--- a/contracts/feature-tests/managed-map-features/meta/Cargo.toml
+++ b/contracts/feature-tests/managed-map-features/meta/Cargo.toml
@@ -8,5 +8,5 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../framework/meta"
diff --git a/contracts/feature-tests/managed-map-features/wasm/Cargo.toml b/contracts/feature-tests/managed-map-features/wasm/Cargo.toml
index 030a160f0d..01026ed8ed 100644
--- a/contracts/feature-tests/managed-map-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/managed-map-features/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.44.0"
+version = "0.45.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 4123c9ecf5..f797c4de53 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.44.0"
+version = "0.45.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.44.0"
+version = "0.45.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 dfc9d778a0..9a6465697c 100644
--- a/contracts/feature-tests/multi-contract-features/meta/Cargo.toml
+++ b/contracts/feature-tests/multi-contract-features/meta/Cargo.toml
@@ -9,5 +9,5 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../framework/meta"
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 e68bdb55e7..c2aea2e6e2 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
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.44.0"
+version = "0.45.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 a8362ef59f..8f9898a268 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
@@ -25,7 +25,7 @@ path = ".."
 features = ["example_feature"]
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.44.0"
+version = "0.45.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 51c5154647..09394fd11e 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
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.44.0"
+version = "0.45.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 fc6129bb5e..851e4477dd 100644
--- a/contracts/feature-tests/multi-contract-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/multi-contract-features/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.44.0"
+version = "0.45.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 741e4099d3..7665e9d6bd 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.44.0"
+version = "0.45.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.44.0"
+version = "0.45.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 8cd54e1b05..1bd1bcf4e9 100644
--- a/contracts/feature-tests/panic-message-features/meta/Cargo.toml
+++ b/contracts/feature-tests/panic-message-features/meta/Cargo.toml
@@ -8,5 +8,5 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../framework/meta"
diff --git a/contracts/feature-tests/panic-message-features/wasm/Cargo.toml b/contracts/feature-tests/panic-message-features/wasm/Cargo.toml
index 2989fe2c95..8f389e3cf3 100644
--- a/contracts/feature-tests/panic-message-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/panic-message-features/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.44.0"
+version = "0.45.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 86f1f74cc0..f2f08f0f03 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.44.0"
+version = "0.45.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.44.0"
+version = "0.45.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 1ac4eb4ea0..d1b91a4c0c 100644
--- a/contracts/feature-tests/payable-features/meta/Cargo.toml
+++ b/contracts/feature-tests/payable-features/meta/Cargo.toml
@@ -9,5 +9,5 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../framework/meta"
diff --git a/contracts/feature-tests/payable-features/wasm/Cargo.toml b/contracts/feature-tests/payable-features/wasm/Cargo.toml
index ac40fb507b..0dfedc56a1 100644
--- a/contracts/feature-tests/payable-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/payable-features/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.44.0"
+version = "0.45.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 b1074829f7..fed0091490 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.44.0"
+version = "0.45.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.44.0"
+version = "0.45.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 10b1ae0e46..8415fb2a5b 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.44.0"
+version = "0.45.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 29bd3df007..3bf13b6571 100644
--- a/contracts/feature-tests/rust-snippets-generator-test/meta/Cargo.toml
+++ b/contracts/feature-tests/rust-snippets-generator-test/meta/Cargo.toml
@@ -9,5 +9,5 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../framework/meta"
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 cbc434df28..efd9775ba1 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.44.0"
+// version = "0.45.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 d44081cfe1..a12604aa4e 100644
--- a/contracts/feature-tests/rust-snippets-generator-test/wasm/Cargo.toml
+++ b/contracts/feature-tests/rust-snippets-generator-test/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.44.0"
+version = "0.45.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 7e7020f78a..bbf1288dfc 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.44.0"
+version = "0.45.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.44.0"
+version = "0.45.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 cbcd320fe2..4bbbb0bab6 100644
--- a/contracts/feature-tests/rust-testing-framework-tester/meta/Cargo.toml
+++ b/contracts/feature-tests/rust-testing-framework-tester/meta/Cargo.toml
@@ -8,5 +8,5 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../framework/meta"
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 bdd79b100c..6dce1fc054 100644
--- a/contracts/feature-tests/rust-testing-framework-tester/wasm/Cargo.toml
+++ b/contracts/feature-tests/rust-testing-framework-tester/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.44.0"
+version = "0.45.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 bfbcc29793..035e572e7c 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.44.0"
+version = "0.45.0"
 path = "../../../contracts/modules"
 
 [dependencies.multiversx-sc]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../framework/scenario"
 
 [dev-dependencies.multiversx-sc-meta]
-version = "0.44.0"
+version = "0.45.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 a3296948b4..c0476b4a45 100644
--- a/contracts/feature-tests/use-module/meta/Cargo.toml
+++ b/contracts/feature-tests/use-module/meta/Cargo.toml
@@ -9,5 +9,5 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../framework/meta"
diff --git a/contracts/feature-tests/use-module/meta/abi/Cargo.toml b/contracts/feature-tests/use-module/meta/abi/Cargo.toml
index bfe4d784c4..078daf42b0 100644
--- a/contracts/feature-tests/use-module/meta/abi/Cargo.toml
+++ b/contracts/feature-tests/use-module/meta/abi/Cargo.toml
@@ -9,9 +9,9 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../framework/meta"
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 f338e5af5d..89aa802177 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.44.0"
+            "version": "0.45.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 b1e820c4d9..56dfad5e84 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.44.0"
+            "version": "0.45.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 4ad382d00e..c5b2e34d00 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
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.44.0"
+version = "0.45.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 3a2b1c793e..b98c67f9b4 100644
--- a/contracts/feature-tests/use-module/wasm/Cargo.toml
+++ b/contracts/feature-tests/use-module/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/modules/Cargo.toml b/contracts/modules/Cargo.toml
index 22b841d8a8..6cd4a5dceb 100644
--- a/contracts/modules/Cargo.toml
+++ b/contracts/modules/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-modules"
-version = "0.44.0"
+version = "0.45.0"
 edition = "2021"
 
 authors = ["MultiversX <contact@multiversx.com>"]
@@ -17,5 +17,5 @@ categories = ["no-std", "wasm", "cryptography::cryptocurrencies"]
 alloc = ["multiversx-sc/alloc"]
 
 [dependencies.multiversx-sc]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../framework/base"
diff --git a/framework/base/Cargo.toml b/framework/base/Cargo.toml
index 09fbe0c73c..07056d4b06 100644
--- a/framework/base/Cargo.toml
+++ b/framework/base/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc"
-version = "0.44.0"
+version = "0.45.0"
 edition = "2021"
 
 authors = ["Andrei Marinica <andrei.marinica@multiversx.com>", "MultiversX <contact@multiversx.com>"]
@@ -31,7 +31,7 @@ bitflags = "1.3.2"
 num-traits = { version = "0.2", default-features = false }
 
 [dependencies.multiversx-sc-derive]
-version = "=0.44.0"
+version = "=0.45.0"
 path = "../derive"
 
 [dependencies.multiversx-sc-codec]
diff --git a/framework/derive/Cargo.toml b/framework/derive/Cargo.toml
index aa9b4c8c5a..af118e3777 100644
--- a/framework/derive/Cargo.toml
+++ b/framework/derive/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-derive"
-version = "0.44.0"
+version = "0.45.0"
 edition = "2021"
 
 authors = ["Andrei Marinica <andrei.marinica@multiversx.com>", "MultiversX <contact@multiversx.com>"]
diff --git a/framework/meta/Cargo.toml b/framework/meta/Cargo.toml
index 715d0d974f..949c1cc70d 100644
--- a/framework/meta/Cargo.toml
+++ b/framework/meta/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-meta"
-version = "0.44.0"
+version = "0.45.0"
 edition = "2021"
 
 authors = [
@@ -47,7 +47,7 @@ pathdiff = { version = "0.2.1", optional = true }
 common-path = { version = "1.0.0", optional = true }
 
 [dependencies.multiversx-sc]
-version = "=0.44.0"
+version = "=0.45.0"
 path = "../base"
 features = ["alloc", "num-bigint", "promises"]
 
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 5b61c1e4f6..9098b46145 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.44.0"
+version = "0.45.0"
 
 # [workspace]
 
diff --git a/framework/meta/src/cmd/contract/meta_config.rs b/framework/meta/src/cmd/contract/meta_config.rs
index fee87b8d6e..650daece25 100644
--- a/framework/meta/src/cmd/contract/meta_config.rs
+++ b/framework/meta/src/cmd/contract/meta_config.rs
@@ -204,7 +204,7 @@ panic = \"abort\"
 path = \"..\"
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = \"0.44.0\"
+version = \"0.45.0\"
 path = \"../../../../framework/wasm-adapter\"
 
 [workspace]
@@ -217,7 +217,7 @@ members = [\".\"]
             name: "test".to_string(),
             edition: "2021".to_string(),
             profile: ContractVariantProfile::default(),
-            framework_version: "0.44.0".to_string(),
+            framework_version: "0.45.0".to_string(),
             framework_path: Option::Some("../../../framework/base".to_string()),
             contract_features: Vec::<String>::new(),
         };
diff --git a/framework/meta/src/cmd/standalone/upgrade/upgrade_selector.rs b/framework/meta/src/cmd/standalone/upgrade/upgrade_selector.rs
index db8f0ef404..d708a7fd49 100644
--- a/framework/meta/src/cmd/standalone/upgrade/upgrade_selector.rs
+++ b/framework/meta/src/cmd/standalone/upgrade/upgrade_selector.rs
@@ -87,7 +87,7 @@ fn upgrade_post_processing(dir: &RelevantDirectory) {
         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.42.0")) | Some((_, "0.43.0")) | Some((_, "0.44.0")) | Some((_, "0.45.0")) => {
             print_post_processing(dir);
             cargo_check(dir);
         },
diff --git a/framework/meta/src/version_history.rs b/framework/meta/src/version_history.rs
index 206d8017ea..9bd280748e 100644
--- a/framework/meta/src/version_history.rs
+++ b/framework/meta/src/version_history.rs
@@ -1,7 +1,7 @@
 /// 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.44.0";
+pub const LAST_VERSION: &str = "0.45.0";
 
 /// Indicates where to stop with the upgrades.
 pub const LAST_UPGRADE_VERSION: &str = LAST_VERSION;
@@ -51,6 +51,7 @@ pub const VERSIONS: &[&str] = &[
     "0.43.4",
     "0.43.5",
     "0.44.0",
+    "0.45.0",
 ];
 
 /// We started supporting contract templates with version 0.43.0.
diff --git a/framework/scenario/Cargo.toml b/framework/scenario/Cargo.toml
index 99705270d2..931d126179 100644
--- a/framework/scenario/Cargo.toml
+++ b/framework/scenario/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-scenario"
-version = "0.44.0"
+version = "0.45.0"
 edition = "2021"
 
 authors = [
@@ -40,25 +40,25 @@ path = "src/main.rs"
 run-go-tests = []
 
 [dependencies.multiversx-sc]
-version = "=0.44.0"
+version = "=0.45.0"
 features = ["alloc", "num-bigint"]
 path = "../base"
 
 [dependencies.multiversx-sc-meta]
-version = "=0.44.0"
+version = "=0.45.0"
 path = "../meta"
 
 [dependencies.multiversx-chain-scenario-format]
-version = "0.20.0"
+version = "0.21.0"
 path = "../../sdk/scenario-format"
 
 [dependencies.multiversx-chain-vm-executor]
 version = "0.2.0"
 
 [dependencies.multiversx-chain-vm]
-version = "=0.6.0"
+version = "=0.7.0"
 path = "../../vm"
 
 [dependencies.multiversx-sdk]
-version = "=0.2.0"
+version = "=0.3.0"
 path = "../../sdk/core"
diff --git a/framework/snippets/Cargo.toml b/framework/snippets/Cargo.toml
index e9922919e7..0f2c80d9ba 100644
--- a/framework/snippets/Cargo.toml
+++ b/framework/snippets/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-snippets"
-version = "0.44.0"
+version = "0.45.0"
 edition = "2021"
 
 authors = ["MultiversX <contact@multiversx.com>"]
@@ -22,9 +22,9 @@ env_logger = "0.10"
 futures = "0.3"
 
 [dependencies.multiversx-sc-scenario]
-version = "=0.44.0"
+version = "=0.45.0"
 path = "../scenario"
 
 [dependencies.multiversx-sdk]
-version = "=0.2.0"
+version = "=0.3.0"
 path = "../../sdk/core"
diff --git a/framework/wasm-adapter/Cargo.toml b/framework/wasm-adapter/Cargo.toml
index e5049c88fd..a497e29b80 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.44.0"
+version = "0.45.0"
 edition = "2021"
 
 authors = [
@@ -22,5 +22,5 @@ categories = [
 ]
 
 [dependencies.multiversx-sc]
-version = "=0.44.0"
+version = "=0.45.0"
 path = "../base"
diff --git a/sdk/core/Cargo.toml b/sdk/core/Cargo.toml
index f3b22ad471..d7e9aefb93 100644
--- a/sdk/core/Cargo.toml
+++ b/sdk/core/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sdk"
-version = "0.2.0"
+version = "0.3.0"
 edition = "2021"
 
 authors = [
diff --git a/sdk/scenario-format/Cargo.toml b/sdk/scenario-format/Cargo.toml
index ee541dc856..ee69b43256 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.20.0"
+version = "0.21.0"
 edition = "2021"
 
 authors = ["Andrei Marinica <andrei.marinica@multiversx.com>", "MultiversX <contact@multiversx.com>"]
diff --git a/tools/mxpy-snippet-generator/Cargo.toml b/tools/mxpy-snippet-generator/Cargo.toml
index 04e71cffe5..5bc94d5d3e 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.44.0"
+version = "0.45.0"
 path = "../../framework/base"
 
 [dependencies]
diff --git a/tools/rust-debugger/format-tests/Cargo.toml b/tools/rust-debugger/format-tests/Cargo.toml
index af6c7a436d..aea6d00073 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.44.0"
+version = "0.45.0"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-scenario]
-version = "0.44.0"
+version = "0.45.0"
 path = "../../../framework/scenario"
 
 [dependencies.multiversx-chain-vm]
-version = "0.6.0"
+version = "0.7.0"
 path = "../../../vm"
 
 [dev-dependencies]
diff --git a/vm/Cargo.toml b/vm/Cargo.toml
index 860fb4a30d..450080de57 100644
--- a/vm/Cargo.toml
+++ b/vm/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-chain-vm"
-version = "0.6.0"
+version = "0.7.0"
 edition = "2021"
 
 authors = [

From 1525dd05d246ba4b24d00a9d27cc394b087f130d Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 24 Nov 2023 12:25:52 +0200
Subject: [PATCH 0110/1254] Cargo.lock update

---
 Cargo.lock                                    | 24 +++++++++----------
 .../benchmarks/large-storage/wasm/Cargo.lock  |  6 ++---
 .../linked-list-repeat/wasm/Cargo.lock        |  6 ++---
 .../mappers/map-repeat/wasm/Cargo.lock        |  6 ++---
 .../mappers/queue-repeat/wasm/Cargo.lock      |  6 ++---
 .../mappers/set-repeat/wasm/Cargo.lock        |  6 ++---
 .../single-value-repeat/wasm/Cargo.lock       |  6 ++---
 .../mappers/vec-repeat/wasm/Cargo.lock        |  6 ++---
 .../benchmarks/send-tx-repeat/wasm/Cargo.lock |  6 ++---
 .../benchmarks/str-repeat/wasm/Cargo.lock     |  6 ++---
 .../core/price-aggregator/wasm/Cargo.lock     | 10 ++++----
 contracts/examples/adder/wasm/Cargo.lock      |  6 ++---
 .../bonding-curve-contract/wasm/Cargo.lock    |  8 +++----
 .../examples/check-pause/wasm/Cargo.lock      |  8 +++----
 .../crowdfunding-esdt/wasm/Cargo.lock         |  6 ++---
 .../examples/crypto-bubbles/wasm/Cargo.lock   |  6 ++---
 .../kitty-auction/wasm/Cargo.lock             |  6 ++---
 .../kitty-genetic-alg/wasm/Cargo.lock         |  6 ++---
 .../kitty-ownership/wasm/Cargo.lock           |  6 ++---
 .../examples/crypto-zombies/wasm/Cargo.lock   |  6 ++---
 .../examples/digital-cash/wasm/Cargo.lock     |  6 ++---
 contracts/examples/empty/wasm/Cargo.lock      |  6 ++---
 .../esdt-transfer-with-fee/wasm/Cargo.lock    |  6 ++---
 contracts/examples/factorial/wasm/Cargo.lock  |  6 ++---
 contracts/examples/factorial/wasm/src/lib.rs  |  5 ++--
 .../examples/fractional-nfts/wasm/Cargo.lock  |  8 +++----
 .../examples/lottery-esdt/wasm/Cargo.lock     |  6 ++---
 .../multisig/wasm-multisig-full/Cargo.lock    |  8 +++----
 .../multisig/wasm-multisig-view/Cargo.lock    |  8 +++----
 contracts/examples/multisig/wasm/Cargo.lock   |  8 +++----
 contracts/examples/nft-minter/wasm/Cargo.lock |  6 ++---
 .../nft-storage-prepay/wasm/Cargo.lock        |  6 ++---
 .../examples/nft-subscription/wasm/Cargo.lock |  8 +++----
 .../order-book/factory/wasm/Cargo.lock        |  6 ++---
 .../examples/order-book/pair/wasm/Cargo.lock  |  6 ++---
 .../examples/ping-pong-egld/wasm/Cargo.lock   |  6 ++---
 .../examples/proxy-pause/wasm/Cargo.lock      |  6 ++---
 .../rewards-distribution/wasm/Cargo.lock      |  8 +++----
 .../examples/seed-nft-minter/wasm/Cargo.lock  |  8 +++----
 .../examples/token-release/wasm/Cargo.lock    |  6 ++---
 .../abi-tester/wasm-abi-tester-ev/Cargo.lock  |  6 ++---
 .../feature-tests/abi-tester/wasm/Cargo.lock  |  6 ++---
 .../alloc-features/wasm/Cargo.lock            |  6 ++---
 .../Cargo.lock                                |  8 +++----
 .../basic-features/wasm/Cargo.lock            |  8 +++----
 .../basic-features/wasm/src/lib.rs            |  2 +-
 .../big-float-features/wasm/Cargo.lock        |  6 ++---
 .../builtin-func-features/wasm/Cargo.lock     |  6 ++---
 .../first-contract/wasm/Cargo.lock            |  6 ++---
 .../second-contract/wasm/Cargo.lock           |  6 ++---
 .../child/wasm/Cargo.lock                     |  6 ++---
 .../parent/wasm/Cargo.lock                    |  6 ++---
 .../wasm-forwarder-queue-promises/Cargo.lock  |  6 ++---
 .../forwarder-queue/wasm/Cargo.lock           |  6 ++---
 .../Cargo.lock                                |  6 ++---
 .../Cargo.lock                                |  6 ++---
 .../forwarder-raw/wasm/Cargo.lock             |  6 ++---
 .../composability/forwarder/wasm/Cargo.lock   |  6 ++---
 .../local-esdt-and-nft/wasm/Cargo.lock        |  6 ++---
 .../promises-features/wasm/Cargo.lock         |  6 ++---
 .../proxy-test-first/wasm/Cargo.lock          |  6 ++---
 .../proxy-test-second/wasm/Cargo.lock         |  6 ++---
 .../recursive-caller/wasm/Cargo.lock          |  6 ++---
 .../transfer-role-features/wasm/Cargo.lock    |  8 +++----
 .../vault/wasm-vault-promises/Cargo.lock      |  6 ++---
 .../vault/wasm-vault-upgrade/Cargo.lock       |  6 ++---
 .../composability/vault/wasm/Cargo.lock       |  6 ++---
 .../crowdfunding-erc20/wasm/Cargo.lock        |  6 ++---
 .../erc1155-marketplace/wasm/Cargo.lock       |  6 ++---
 .../erc1155-user-mock/wasm/Cargo.lock         |  6 ++---
 .../erc1155/wasm/Cargo.lock                   |  6 ++---
 .../erc-style-contracts/erc20/wasm/Cargo.lock |  6 ++---
 .../erc721/wasm/Cargo.lock                    |  6 ++---
 .../lottery-erc20/wasm/Cargo.lock             |  6 ++---
 .../esdt-system-sc-mock/wasm/Cargo.lock       |  6 ++---
 .../wasm/Cargo.lock                           |  6 ++---
 .../managed-map-features/wasm/Cargo.lock      |  6 ++---
 .../wasm-multi-contract-alt-impl/Cargo.lock   |  6 ++---
 .../Cargo.lock                                |  6 ++---
 .../Cargo.lock                                |  6 ++---
 .../multi-contract-features/wasm/Cargo.lock   |  6 ++---
 .../panic-message-features/wasm/Cargo.lock    |  6 ++---
 .../payable-features/wasm/Cargo.lock          |  6 ++---
 .../wasm/Cargo.lock                           |  6 ++---
 .../wasm/Cargo.lock                           |  6 ++---
 .../wasm-use-module-view/Cargo.lock           |  8 +++----
 .../feature-tests/use-module/wasm/Cargo.lock  |  8 +++----
 87 files changed, 284 insertions(+), 283 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 722ad8b23a..15f7d3c6a3 100755
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1834,7 +1834,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-chain-scenario-format"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "bech32",
  "hex",
@@ -1847,7 +1847,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-chain-vm"
-version = "0.6.0"
+version = "0.7.0"
 dependencies = [
  "bitflags 1.3.2",
  "ed25519-dalek",
@@ -1871,7 +1871,7 @@ checksum = "b59072fa0624b55ae5ae3fa6bfa91515bbeb4ac440214bc4a509e2c8806d6e9f"
 
 [[package]]
 name = "multiversx-price-aggregator-sc"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc",
@@ -1890,7 +1890,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "bitflags 1.3.2",
  "hashbrown 0.14.2",
@@ -1921,7 +1921,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -1932,7 +1932,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-meta"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "clap",
  "colored",
@@ -1957,14 +1957,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-scenario"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "base64 0.13.1",
  "bech32",
@@ -1990,7 +1990,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-snippets"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "base64 0.13.1",
  "env_logger",
@@ -2004,14 +2004,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sdk"
-version = "0.2.0"
+version = "0.3.0"
 dependencies = [
  "anyhow",
  "base64 0.13.1",
@@ -2036,7 +2036,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-wegld-swap-sc"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "multiversx-sc",
  "multiversx-sc-modules",
diff --git a/contracts/benchmarks/large-storage/wasm/Cargo.lock b/contracts/benchmarks/large-storage/wasm/Cargo.lock
index cb11f30683..05baa28963 100755
--- a/contracts/benchmarks/large-storage/wasm/Cargo.lock
+++ b/contracts/benchmarks/large-storage/wasm/Cargo.lock
@@ -89,7 +89,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -119,7 +119,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -130,7 +130,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.lock
index 27dfff6d02..eddca98ed1 100644
--- a/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.lock
+++ b/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.lock
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -127,7 +127,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -138,7 +138,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.lock
index 73d4531cf6..01f2f320f3 100644
--- a/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.lock
+++ b/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.lock
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -127,7 +127,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -138,7 +138,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.lock
index 14e705a191..a9a72c8086 100644
--- a/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.lock
+++ b/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.lock
@@ -81,7 +81,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -111,7 +111,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -122,7 +122,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.lock
index 33d9d826cb..bd4fb6396b 100644
--- a/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.lock
+++ b/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.lock
@@ -81,7 +81,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -111,7 +111,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -122,7 +122,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.lock
index 07a393aef1..17a14d511a 100644
--- a/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.lock
+++ b/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.lock
@@ -81,7 +81,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -111,7 +111,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -122,7 +122,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.lock
index 8777610ae1..84151a41ef 100644
--- a/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.lock
+++ b/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.lock
@@ -81,7 +81,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -111,7 +111,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -122,7 +122,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/send-tx-repeat/wasm/Cargo.lock b/contracts/benchmarks/send-tx-repeat/wasm/Cargo.lock
index 717aba32de..bfa538d86c 100755
--- a/contracts/benchmarks/send-tx-repeat/wasm/Cargo.lock
+++ b/contracts/benchmarks/send-tx-repeat/wasm/Cargo.lock
@@ -74,7 +74,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -104,7 +104,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -115,7 +115,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/str-repeat/wasm/Cargo.lock b/contracts/benchmarks/str-repeat/wasm/Cargo.lock
index c41b809824..042599499a 100755
--- a/contracts/benchmarks/str-repeat/wasm/Cargo.lock
+++ b/contracts/benchmarks/str-repeat/wasm/Cargo.lock
@@ -74,7 +74,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -104,7 +104,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -115,7 +115,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/core/price-aggregator/wasm/Cargo.lock b/contracts/core/price-aggregator/wasm/Cargo.lock
index 4988efa300..397b58a0d0 100644
--- a/contracts/core/price-aggregator/wasm/Cargo.lock
+++ b/contracts/core/price-aggregator/wasm/Cargo.lock
@@ -74,7 +74,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-price-aggregator-sc"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc",
@@ -91,7 +91,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -121,7 +121,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -132,14 +132,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/adder/wasm/Cargo.lock b/contracts/examples/adder/wasm/Cargo.lock
index 73aa3cd4df..e5f4dfbedc 100755
--- a/contracts/examples/adder/wasm/Cargo.lock
+++ b/contracts/examples/adder/wasm/Cargo.lock
@@ -89,7 +89,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -119,7 +119,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -130,7 +130,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/bonding-curve-contract/wasm/Cargo.lock b/contracts/examples/bonding-curve-contract/wasm/Cargo.lock
index f0e9529715..198a14309e 100644
--- a/contracts/examples/bonding-curve-contract/wasm/Cargo.lock
+++ b/contracts/examples/bonding-curve-contract/wasm/Cargo.lock
@@ -90,7 +90,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -120,7 +120,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -131,14 +131,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/check-pause/wasm/Cargo.lock b/contracts/examples/check-pause/wasm/Cargo.lock
index de3d76c782..9c9e24a332 100644
--- a/contracts/examples/check-pause/wasm/Cargo.lock
+++ b/contracts/examples/check-pause/wasm/Cargo.lock
@@ -90,7 +90,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -120,7 +120,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -131,14 +131,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crowdfunding-esdt/wasm/Cargo.lock b/contracts/examples/crowdfunding-esdt/wasm/Cargo.lock
index 95249df9ac..a22a97caeb 100644
--- a/contracts/examples/crowdfunding-esdt/wasm/Cargo.lock
+++ b/contracts/examples/crowdfunding-esdt/wasm/Cargo.lock
@@ -89,7 +89,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -119,7 +119,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -130,7 +130,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crypto-bubbles/wasm/Cargo.lock b/contracts/examples/crypto-bubbles/wasm/Cargo.lock
index d9d77d2114..b876890b26 100755
--- a/contracts/examples/crypto-bubbles/wasm/Cargo.lock
+++ b/contracts/examples/crypto-bubbles/wasm/Cargo.lock
@@ -89,7 +89,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -119,7 +119,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -130,7 +130,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.lock b/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.lock
index b492e5de1c..86234e70f9 100755
--- a/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.lock
+++ b/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.lock
@@ -118,7 +118,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -148,7 +148,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -159,7 +159,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "multiversx-sc",
 ]
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 40c08a0f60..4644917866 100755
--- a/contracts/examples/crypto-kitties/kitty-genetic-alg/wasm/Cargo.lock
+++ b/contracts/examples/crypto-kitties/kitty-genetic-alg/wasm/Cargo.lock
@@ -99,7 +99,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -129,7 +129,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -140,7 +140,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.lock b/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.lock
index bf4e6845e5..49782e3733 100755
--- a/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.lock
+++ b/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.lock
@@ -109,7 +109,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -139,7 +139,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -150,7 +150,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crypto-zombies/wasm/Cargo.lock b/contracts/examples/crypto-zombies/wasm/Cargo.lock
index 12fdba2eeb..36491698f7 100755
--- a/contracts/examples/crypto-zombies/wasm/Cargo.lock
+++ b/contracts/examples/crypto-zombies/wasm/Cargo.lock
@@ -89,7 +89,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -119,7 +119,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -130,7 +130,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/digital-cash/wasm/Cargo.lock b/contracts/examples/digital-cash/wasm/Cargo.lock
index a51dcfce38..5c7242a6b3 100644
--- a/contracts/examples/digital-cash/wasm/Cargo.lock
+++ b/contracts/examples/digital-cash/wasm/Cargo.lock
@@ -89,7 +89,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -119,7 +119,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -130,7 +130,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/empty/wasm/Cargo.lock b/contracts/examples/empty/wasm/Cargo.lock
index 5c53b776e2..3fe87101c3 100755
--- a/contracts/examples/empty/wasm/Cargo.lock
+++ b/contracts/examples/empty/wasm/Cargo.lock
@@ -89,7 +89,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -119,7 +119,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -130,7 +130,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.lock b/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.lock
index 18d9c309a5..ccf3b2d6a4 100644
--- a/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.lock
+++ b/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.lock
@@ -89,7 +89,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -119,7 +119,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -130,7 +130,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/factorial/wasm/Cargo.lock b/contracts/examples/factorial/wasm/Cargo.lock
index 7bac38bfe2..3642ff9ade 100755
--- a/contracts/examples/factorial/wasm/Cargo.lock
+++ b/contracts/examples/factorial/wasm/Cargo.lock
@@ -89,7 +89,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -119,7 +119,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -130,7 +130,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/factorial/wasm/src/lib.rs b/contracts/examples/factorial/wasm/src/lib.rs
index 4457ad1258..177016639e 100644
--- a/contracts/examples/factorial/wasm/src/lib.rs
+++ b/contracts/examples/factorial/wasm/src/lib.rs
@@ -5,9 +5,9 @@
 ////////////////////////////////////////////////////
 
 // Init:                                 1
-// Endpoints:                            1
+// Endpoints:                            2
 // Async Callback (empty):               1
-// Total number of exported functions:   3
+// Total number of exported functions:   4
 
 #![no_std]
 
@@ -22,6 +22,7 @@ multiversx_sc_wasm_adapter::endpoints! {
     factorial
     (
         init => init
+        upgrade => upgrade
         factorial => factorial
     )
 }
diff --git a/contracts/examples/fractional-nfts/wasm/Cargo.lock b/contracts/examples/fractional-nfts/wasm/Cargo.lock
index 4c8c0ba223..1ed02d4285 100644
--- a/contracts/examples/fractional-nfts/wasm/Cargo.lock
+++ b/contracts/examples/fractional-nfts/wasm/Cargo.lock
@@ -90,7 +90,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -120,7 +120,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -131,14 +131,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/lottery-esdt/wasm/Cargo.lock b/contracts/examples/lottery-esdt/wasm/Cargo.lock
index a320165695..d9d65def88 100755
--- a/contracts/examples/lottery-esdt/wasm/Cargo.lock
+++ b/contracts/examples/lottery-esdt/wasm/Cargo.lock
@@ -89,7 +89,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -119,7 +119,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -130,7 +130,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/multisig/wasm-multisig-full/Cargo.lock b/contracts/examples/multisig/wasm-multisig-full/Cargo.lock
index 431f114c80..313437bcc7 100644
--- a/contracts/examples/multisig/wasm-multisig-full/Cargo.lock
+++ b/contracts/examples/multisig/wasm-multisig-full/Cargo.lock
@@ -90,7 +90,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -120,7 +120,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -131,14 +131,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/multisig/wasm-multisig-view/Cargo.lock b/contracts/examples/multisig/wasm-multisig-view/Cargo.lock
index 7f0a62e0c0..6b844db782 100644
--- a/contracts/examples/multisig/wasm-multisig-view/Cargo.lock
+++ b/contracts/examples/multisig/wasm-multisig-view/Cargo.lock
@@ -90,7 +90,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -120,7 +120,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -131,14 +131,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/multisig/wasm/Cargo.lock b/contracts/examples/multisig/wasm/Cargo.lock
index 064fc86206..831ce8f217 100755
--- a/contracts/examples/multisig/wasm/Cargo.lock
+++ b/contracts/examples/multisig/wasm/Cargo.lock
@@ -90,7 +90,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -120,7 +120,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -131,14 +131,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/nft-minter/wasm/Cargo.lock b/contracts/examples/nft-minter/wasm/Cargo.lock
index 20246150d9..557d717c03 100644
--- a/contracts/examples/nft-minter/wasm/Cargo.lock
+++ b/contracts/examples/nft-minter/wasm/Cargo.lock
@@ -74,7 +74,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -104,7 +104,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -115,7 +115,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/nft-storage-prepay/wasm/Cargo.lock b/contracts/examples/nft-storage-prepay/wasm/Cargo.lock
index 4acea7c384..0d8304ba07 100755
--- a/contracts/examples/nft-storage-prepay/wasm/Cargo.lock
+++ b/contracts/examples/nft-storage-prepay/wasm/Cargo.lock
@@ -74,7 +74,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -104,7 +104,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -115,7 +115,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/nft-subscription/wasm/Cargo.lock b/contracts/examples/nft-subscription/wasm/Cargo.lock
index 3e393895d9..7613419c36 100644
--- a/contracts/examples/nft-subscription/wasm/Cargo.lock
+++ b/contracts/examples/nft-subscription/wasm/Cargo.lock
@@ -74,7 +74,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -104,7 +104,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -115,14 +115,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/order-book/factory/wasm/Cargo.lock b/contracts/examples/order-book/factory/wasm/Cargo.lock
index d43120b040..922d9195e1 100644
--- a/contracts/examples/order-book/factory/wasm/Cargo.lock
+++ b/contracts/examples/order-book/factory/wasm/Cargo.lock
@@ -74,7 +74,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -104,7 +104,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -115,7 +115,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/order-book/pair/wasm/Cargo.lock b/contracts/examples/order-book/pair/wasm/Cargo.lock
index 4c16bccf95..7e7df6e78b 100644
--- a/contracts/examples/order-book/pair/wasm/Cargo.lock
+++ b/contracts/examples/order-book/pair/wasm/Cargo.lock
@@ -74,7 +74,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -104,7 +104,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -115,7 +115,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/ping-pong-egld/wasm/Cargo.lock b/contracts/examples/ping-pong-egld/wasm/Cargo.lock
index 1c18eda695..66d74fe6f7 100755
--- a/contracts/examples/ping-pong-egld/wasm/Cargo.lock
+++ b/contracts/examples/ping-pong-egld/wasm/Cargo.lock
@@ -74,7 +74,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -104,7 +104,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -115,7 +115,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/proxy-pause/wasm/Cargo.lock b/contracts/examples/proxy-pause/wasm/Cargo.lock
index 252d8ef386..0e9d9f4dd8 100644
--- a/contracts/examples/proxy-pause/wasm/Cargo.lock
+++ b/contracts/examples/proxy-pause/wasm/Cargo.lock
@@ -74,7 +74,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -104,7 +104,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -115,7 +115,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/rewards-distribution/wasm/Cargo.lock b/contracts/examples/rewards-distribution/wasm/Cargo.lock
index 436c36215a..0cb69d1d96 100644
--- a/contracts/examples/rewards-distribution/wasm/Cargo.lock
+++ b/contracts/examples/rewards-distribution/wasm/Cargo.lock
@@ -74,7 +74,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -104,7 +104,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -115,14 +115,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/seed-nft-minter/wasm/Cargo.lock b/contracts/examples/seed-nft-minter/wasm/Cargo.lock
index 1573a6f3c6..e0f2a90b65 100644
--- a/contracts/examples/seed-nft-minter/wasm/Cargo.lock
+++ b/contracts/examples/seed-nft-minter/wasm/Cargo.lock
@@ -74,7 +74,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -104,7 +104,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -115,14 +115,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/token-release/wasm/Cargo.lock b/contracts/examples/token-release/wasm/Cargo.lock
index 12edfbb5a8..e63355c0b9 100644
--- a/contracts/examples/token-release/wasm/Cargo.lock
+++ b/contracts/examples/token-release/wasm/Cargo.lock
@@ -74,7 +74,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -104,7 +104,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -115,7 +115,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "multiversx-sc",
 ]
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 b9d932b73e..b857d8e096 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
@@ -89,7 +89,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -119,7 +119,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -130,7 +130,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/abi-tester/wasm/Cargo.lock b/contracts/feature-tests/abi-tester/wasm/Cargo.lock
index 88b5cb5213..1effe495c0 100755
--- a/contracts/feature-tests/abi-tester/wasm/Cargo.lock
+++ b/contracts/feature-tests/abi-tester/wasm/Cargo.lock
@@ -89,7 +89,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -119,7 +119,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -130,7 +130,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/alloc-features/wasm/Cargo.lock b/contracts/feature-tests/alloc-features/wasm/Cargo.lock
index 6d1c8ce392..ce0c9a98d7 100644
--- a/contracts/feature-tests/alloc-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/alloc-features/wasm/Cargo.lock
@@ -89,7 +89,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -119,7 +119,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -130,7 +130,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "multiversx-sc",
 ]
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 58851786d3..c4cd92a1f0 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
@@ -90,7 +90,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -120,7 +120,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -131,14 +131,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/basic-features/wasm/Cargo.lock b/contracts/feature-tests/basic-features/wasm/Cargo.lock
index 31c67e537a..b9e953cb2a 100755
--- a/contracts/feature-tests/basic-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/basic-features/wasm/Cargo.lock
@@ -90,7 +90,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -120,7 +120,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -131,14 +131,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/basic-features/wasm/src/lib.rs b/contracts/feature-tests/basic-features/wasm/src/lib.rs
index 5a46c4a6ce..bced862b54 100644
--- a/contracts/feature-tests/basic-features/wasm/src/lib.rs
+++ b/contracts/feature-tests/basic-features/wasm/src/lib.rs
@@ -369,7 +369,7 @@ multiversx_sc_wasm_adapter::endpoints! {
         no_overflow_u8 => no_overflow_u8
         no_overflow_u16 => no_overflow_u16
         no_overflow_u32 => no_overflow_u32
-        u64 => u64
+        no_overflow_u64 => no_overflow_u64
         overflow_usize => overflow_usize
         overflow_u8 => overflow_u8
         overflow_u16 => overflow_u16
diff --git a/contracts/feature-tests/big-float-features/wasm/Cargo.lock b/contracts/feature-tests/big-float-features/wasm/Cargo.lock
index a289277dd0..01d4c627da 100644
--- a/contracts/feature-tests/big-float-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/big-float-features/wasm/Cargo.lock
@@ -89,7 +89,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -119,7 +119,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -130,7 +130,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "multiversx-sc",
 ]
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 151936987c..4e28c0e577 100644
--- a/contracts/feature-tests/composability/builtin-func-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/builtin-func-features/wasm/Cargo.lock
@@ -89,7 +89,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -119,7 +119,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -130,7 +130,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "multiversx-sc",
 ]
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 0d715fea34..98cad26c1e 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
@@ -89,7 +89,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -119,7 +119,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -130,7 +130,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "multiversx-sc",
 ]
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 f4759ce532..e79c560792 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
@@ -74,7 +74,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -104,7 +104,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -115,7 +115,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "multiversx-sc",
 ]
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 948a8c489f..85f365c847 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
@@ -89,7 +89,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -119,7 +119,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -130,7 +130,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "multiversx-sc",
 ]
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 c8ea60371a..0ece06c354 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
@@ -81,7 +81,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -111,7 +111,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -122,7 +122,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "multiversx-sc",
 ]
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 9c8916166f..d74e462d20 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
@@ -90,7 +90,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -120,7 +120,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -131,7 +131,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock
index bf5ea50d2e..29f4cbe309 100644
--- a/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock
@@ -90,7 +90,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -120,7 +120,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -131,7 +131,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "multiversx-sc",
 ]
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 e5f8c3c55c..a332c9cb03 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
@@ -89,7 +89,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -119,7 +119,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -130,7 +130,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "multiversx-sc",
 ]
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 d60d23301b..1e3af44d8d 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
@@ -89,7 +89,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -119,7 +119,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -130,7 +130,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.lock
index 8453378d4d..3f04bcc98a 100755
--- a/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.lock
@@ -89,7 +89,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -119,7 +119,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -130,7 +130,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock
index b103891010..b0ef4012f1 100755
--- a/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock
@@ -90,7 +90,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -120,7 +120,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -131,7 +131,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "multiversx-sc",
 ]
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 6dd57d9df1..26a3c3ab6c 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
@@ -89,7 +89,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -119,7 +119,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -130,7 +130,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/promises-features/wasm/Cargo.lock b/contracts/feature-tests/composability/promises-features/wasm/Cargo.lock
index fc6afa6184..cc4a69f5cd 100644
--- a/contracts/feature-tests/composability/promises-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/promises-features/wasm/Cargo.lock
@@ -74,7 +74,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -104,7 +104,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -115,7 +115,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "multiversx-sc",
 ]
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 7f2d0902c7..d103f209d7 100755
--- a/contracts/feature-tests/composability/proxy-test-first/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/proxy-test-first/wasm/Cargo.lock
@@ -74,7 +74,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -104,7 +104,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -115,7 +115,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "multiversx-sc",
 ]
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 88752bbc0e..4b8e84bb0d 100755
--- a/contracts/feature-tests/composability/proxy-test-second/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/proxy-test-second/wasm/Cargo.lock
@@ -74,7 +74,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -104,7 +104,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -115,7 +115,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.lock b/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.lock
index 6e38079c1b..406f6c382f 100755
--- a/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.lock
@@ -74,7 +74,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -104,7 +104,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -115,7 +115,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "multiversx-sc",
 ]
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 3bf61db88a..7e538ab58f 100644
--- a/contracts/feature-tests/composability/transfer-role-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/transfer-role-features/wasm/Cargo.lock
@@ -74,7 +74,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -104,7 +104,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -115,14 +115,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "multiversx-sc",
 ]
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 2a444dde5f..a9e528946e 100644
--- a/contracts/feature-tests/composability/vault/wasm-vault-promises/Cargo.lock
+++ b/contracts/feature-tests/composability/vault/wasm-vault-promises/Cargo.lock
@@ -74,7 +74,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -104,7 +104,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -115,7 +115,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "multiversx-sc",
 ]
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 28a001574b..1ee2ed9eef 100644
--- a/contracts/feature-tests/composability/vault/wasm-vault-upgrade/Cargo.lock
+++ b/contracts/feature-tests/composability/vault/wasm-vault-upgrade/Cargo.lock
@@ -74,7 +74,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -104,7 +104,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -115,7 +115,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/vault/wasm/Cargo.lock b/contracts/feature-tests/composability/vault/wasm/Cargo.lock
index 8b204533e9..6d4875cffc 100755
--- a/contracts/feature-tests/composability/vault/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/vault/wasm/Cargo.lock
@@ -74,7 +74,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -104,7 +104,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -115,7 +115,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "multiversx-sc",
 ]
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 f01c7da953..25edb40235 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
@@ -97,7 +97,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -127,7 +127,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -138,7 +138,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "multiversx-sc",
 ]
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 c3944518c9..56dd5b8b9e 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
@@ -97,7 +97,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -127,7 +127,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -138,7 +138,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "multiversx-sc",
 ]
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 76b620a235..9f563672ed 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
@@ -89,7 +89,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -119,7 +119,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -130,7 +130,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "multiversx-sc",
 ]
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 58e8028a64..b33155a57e 100644
--- a/contracts/feature-tests/erc-style-contracts/erc1155/wasm/Cargo.lock
+++ b/contracts/feature-tests/erc-style-contracts/erc1155/wasm/Cargo.lock
@@ -89,7 +89,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -119,7 +119,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -130,7 +130,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "multiversx-sc",
 ]
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 ce1f7af93c..b206673717 100644
--- a/contracts/feature-tests/erc-style-contracts/erc20/wasm/Cargo.lock
+++ b/contracts/feature-tests/erc-style-contracts/erc20/wasm/Cargo.lock
@@ -89,7 +89,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -119,7 +119,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -130,7 +130,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "multiversx-sc",
 ]
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 372b2ef258..b65f6536c3 100644
--- a/contracts/feature-tests/erc-style-contracts/erc721/wasm/Cargo.lock
+++ b/contracts/feature-tests/erc-style-contracts/erc721/wasm/Cargo.lock
@@ -89,7 +89,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -119,7 +119,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -130,7 +130,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "multiversx-sc",
 ]
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 e96930b658..2c0a9ec430 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
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -127,7 +127,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -138,7 +138,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "multiversx-sc",
 ]
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 f335ebd02a..8ba4742362 100644
--- a/contracts/feature-tests/esdt-system-sc-mock/wasm/Cargo.lock
+++ b/contracts/feature-tests/esdt-system-sc-mock/wasm/Cargo.lock
@@ -89,7 +89,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -119,7 +119,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -130,7 +130,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/formatted-message-features/wasm/Cargo.lock b/contracts/feature-tests/formatted-message-features/wasm/Cargo.lock
index 4dfed7b91a..bd0d621b51 100644
--- a/contracts/feature-tests/formatted-message-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/formatted-message-features/wasm/Cargo.lock
@@ -89,7 +89,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -119,7 +119,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -130,7 +130,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/managed-map-features/wasm/Cargo.lock b/contracts/feature-tests/managed-map-features/wasm/Cargo.lock
index 365f628f33..0589d44e6f 100644
--- a/contracts/feature-tests/managed-map-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/managed-map-features/wasm/Cargo.lock
@@ -89,7 +89,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -119,7 +119,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -130,7 +130,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "multiversx-sc",
 ]
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 28e859057c..bc36cad138 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
@@ -89,7 +89,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -119,7 +119,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -130,7 +130,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "multiversx-sc",
 ]
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 7c8be41c21..bea508502d 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
@@ -89,7 +89,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -119,7 +119,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -130,7 +130,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "multiversx-sc",
 ]
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 fb77abf9ca..b182575cc0 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
@@ -89,7 +89,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -119,7 +119,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -130,7 +130,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/multi-contract-features/wasm/Cargo.lock b/contracts/feature-tests/multi-contract-features/wasm/Cargo.lock
index 33eb5f4aa5..2ef1c5fa5c 100755
--- a/contracts/feature-tests/multi-contract-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/multi-contract-features/wasm/Cargo.lock
@@ -89,7 +89,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -119,7 +119,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -130,7 +130,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/panic-message-features/wasm/Cargo.lock b/contracts/feature-tests/panic-message-features/wasm/Cargo.lock
index f7ee10c03f..a2213426f2 100755
--- a/contracts/feature-tests/panic-message-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/panic-message-features/wasm/Cargo.lock
@@ -74,7 +74,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -104,7 +104,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -115,7 +115,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/payable-features/wasm/Cargo.lock b/contracts/feature-tests/payable-features/wasm/Cargo.lock
index 06934c8504..c45249705b 100755
--- a/contracts/feature-tests/payable-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/payable-features/wasm/Cargo.lock
@@ -74,7 +74,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -104,7 +104,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -115,7 +115,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "multiversx-sc",
 ]
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 4795d07864..0e55ec5bdc 100644
--- a/contracts/feature-tests/rust-snippets-generator-test/wasm/Cargo.lock
+++ b/contracts/feature-tests/rust-snippets-generator-test/wasm/Cargo.lock
@@ -74,7 +74,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -104,7 +104,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -115,7 +115,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "multiversx-sc",
 ]
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 1b5d368d74..de8a3d2b9d 100644
--- a/contracts/feature-tests/rust-testing-framework-tester/wasm/Cargo.lock
+++ b/contracts/feature-tests/rust-testing-framework-tester/wasm/Cargo.lock
@@ -74,7 +74,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -104,7 +104,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -115,7 +115,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "multiversx-sc",
 ]
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 2bea883881..9bec4151b4 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
@@ -74,7 +74,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -104,7 +104,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -115,14 +115,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/use-module/wasm/Cargo.lock b/contracts/feature-tests/use-module/wasm/Cargo.lock
index c126f67ede..0a38d57e4f 100644
--- a/contracts/feature-tests/use-module/wasm/Cargo.lock
+++ b/contracts/feature-tests/use-module/wasm/Cargo.lock
@@ -74,7 +74,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -104,7 +104,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -115,14 +115,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "multiversx-sc",
 ]

From b379adb18eb6d2727c9ab4c82fe24815420fd96a Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 24 Nov 2023 13:55:53 +0200
Subject: [PATCH 0111/1254] sc-meta feature fix

---
 framework/meta/Cargo.toml                     |  4 +++
 framework/meta/src/cmd/standalone/upgrade.rs  |  1 +
 .../cmd/standalone/upgrade/upgrade_0_45.rs    | 36 +++++++++++++++++++
 .../standalone/upgrade/upgrade_selector.rs    |  4 +++
 4 files changed, 45 insertions(+)
 create mode 100644 framework/meta/src/cmd/standalone/upgrade/upgrade_0_45.rs

diff --git a/framework/meta/Cargo.toml b/framework/meta/Cargo.toml
index 949c1cc70d..a0e7a47c95 100644
--- a/framework/meta/Cargo.toml
+++ b/framework/meta/Cargo.toml
@@ -26,6 +26,10 @@ standalone = ["ruplacer", "reqwest", "zip", "copy_dir", "pathdiff", "common-path
 template-test-current = []
 template-test-released = []
 
+# no other way to have a default feature in bin at the moment
+# contract meta crates should add `default-features = false`
+default = ["standalone"]
+
 [dependencies]
 clap = { version = "4.4.7", features = ["derive"] }
 serde = { version = "1.0", features = ["derive"] }
diff --git a/framework/meta/src/cmd/standalone/upgrade.rs b/framework/meta/src/cmd/standalone/upgrade.rs
index c54d8e85dc..0763cc734e 100644
--- a/framework/meta/src/cmd/standalone/upgrade.rs
+++ b/framework/meta/src/cmd/standalone/upgrade.rs
@@ -1,6 +1,7 @@
 mod upgrade_0_31;
 mod upgrade_0_32;
 mod upgrade_0_39;
+mod upgrade_0_45;
 pub(crate) mod upgrade_common;
 mod upgrade_print;
 mod upgrade_selector;
diff --git a/framework/meta/src/cmd/standalone/upgrade/upgrade_0_45.rs b/framework/meta/src/cmd/standalone/upgrade/upgrade_0_45.rs
new file mode 100644
index 0000000000..b573820c6f
--- /dev/null
+++ b/framework/meta/src/cmd/standalone/upgrade/upgrade_0_45.rs
@@ -0,0 +1,36 @@
+use std::path::Path;
+
+use super::upgrade_common::version_bump_in_cargo_toml;
+use crate::{
+    folder_structure::{DirectoryType, RelevantDirectory},
+    CargoTomlContents,
+};
+use toml::Value;
+
+/// Migrate `0.44.0` to `0.45.0`, including the version bump.
+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);
+}
+
+fn v_0_45_prepare_meta(sc_crate_path: &Path) {
+    let cargo_toml_path = sc_crate_path.join("meta/Cargo.toml");
+    assert!(
+        cargo_toml_path.exists(),
+        "SC crate Cargo.toml not found: {}",
+        cargo_toml_path.display()
+    );
+    let mut meta_cargo_toml = CargoTomlContents::load_from_file(&cargo_toml_path);
+    let deps = meta_cargo_toml.dependencies_mut();
+    if let Some(meta_dep) = deps.get_mut("multiversx-sc-meta") {
+        let meta_dep_table = meta_dep
+            .as_table_mut()
+            .expect("multiversx-sc-meta dependency expected to be given as a table");
+        meta_dep_table.remove("default-features");
+        meta_dep_table.insert("default-features".to_string(), Value::Boolean(false));
+    }
+    meta_cargo_toml.save_to_file(&cargo_toml_path);
+}
diff --git a/framework/meta/src/cmd/standalone/upgrade/upgrade_selector.rs b/framework/meta/src/cmd/standalone/upgrade/upgrade_selector.rs
index d708a7fd49..1d131807ea 100644
--- a/framework/meta/src/cmd/standalone/upgrade/upgrade_selector.rs
+++ b/framework/meta/src/cmd/standalone/upgrade/upgrade_selector.rs
@@ -8,6 +8,7 @@ use super::{
     upgrade_0_31::upgrade_to_31_0,
     upgrade_0_32::upgrade_to_32_0,
     upgrade_0_39::{postprocessing_after_39_0, upgrade_to_39_0},
+    upgrade_0_45::upgrade_to_45_0,
     upgrade_common::{cargo_check, version_bump_in_cargo_toml},
     upgrade_print::*,
 };
@@ -75,6 +76,9 @@ fn upgrade_function_selector(dir: &RelevantDirectory) {
         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);
         },

From 2af45dea4fcf9b905ffd681fed54f87689bd9c17 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 24 Nov 2023 14:01:35 +0200
Subject: [PATCH 0112/1254] contract multiversx-sc-meta default-features =
 false

---
 contracts/benchmarks/large-storage/meta/Cargo.toml               | 1 +
 contracts/benchmarks/mappers/linked-list-repeat/meta/Cargo.toml  | 1 +
 contracts/benchmarks/mappers/map-repeat/meta/Cargo.toml          | 1 +
 contracts/benchmarks/mappers/queue-repeat/meta/Cargo.toml        | 1 +
 contracts/benchmarks/mappers/set-repeat/meta/Cargo.toml          | 1 +
 contracts/benchmarks/mappers/single-value-repeat/meta/Cargo.toml | 1 +
 contracts/benchmarks/mappers/vec-repeat/meta/Cargo.toml          | 1 +
 contracts/benchmarks/send-tx-repeat/meta/Cargo.toml              | 1 +
 contracts/benchmarks/str-repeat/meta/Cargo.toml                  | 1 +
 contracts/core/price-aggregator/meta/Cargo.toml                  | 1 +
 contracts/core/wegld-swap/meta/Cargo.toml                        | 1 +
 contracts/examples/adder/meta/Cargo.toml                         | 1 +
 contracts/examples/bonding-curve-contract/meta/Cargo.toml        | 1 +
 contracts/examples/check-pause/meta/Cargo.toml                   | 1 +
 contracts/examples/crowdfunding-esdt/meta/Cargo.toml             | 1 +
 contracts/examples/crypto-bubbles/meta/Cargo.toml                | 1 +
 contracts/examples/crypto-kitties/kitty-auction/meta/Cargo.toml  | 1 +
 .../examples/crypto-kitties/kitty-genetic-alg/meta/Cargo.toml    | 1 +
 .../examples/crypto-kitties/kitty-ownership/meta/Cargo.toml      | 1 +
 contracts/examples/crypto-zombies/meta/Cargo.toml                | 1 +
 contracts/examples/digital-cash/meta/Cargo.toml                  | 1 +
 contracts/examples/empty/meta/Cargo.toml                         | 1 +
 contracts/examples/esdt-transfer-with-fee/meta/Cargo.toml        | 1 +
 contracts/examples/factorial/meta/Cargo.toml                     | 1 +
 contracts/examples/fractional-nfts/meta/Cargo.toml               | 1 +
 contracts/examples/lottery-esdt/meta/Cargo.toml                  | 1 +
 contracts/examples/multisig/meta/Cargo.toml                      | 1 +
 contracts/examples/nft-minter/meta/Cargo.toml                    | 1 +
 contracts/examples/nft-storage-prepay/meta/Cargo.toml            | 1 +
 contracts/examples/nft-subscription/meta/Cargo.toml              | 1 +
 contracts/examples/order-book/factory/meta/Cargo.toml            | 1 +
 contracts/examples/order-book/pair/meta/Cargo.toml               | 1 +
 contracts/examples/ping-pong-egld/meta/Cargo.toml                | 1 +
 contracts/examples/proxy-pause/meta/Cargo.toml                   | 1 +
 contracts/examples/rewards-distribution/meta/Cargo.toml          | 1 +
 contracts/examples/seed-nft-minter/meta/Cargo.toml               | 1 +
 contracts/examples/token-release/meta/Cargo.toml                 | 1 +
 contracts/feature-tests/abi-tester/meta/Cargo.toml               | 1 +
 contracts/feature-tests/alloc-features/meta/Cargo.toml           | 1 +
 contracts/feature-tests/basic-features/meta/Cargo.toml           | 1 +
 contracts/feature-tests/big-float-features/meta/Cargo.toml       | 1 +
 .../composability/builtin-func-features/meta/Cargo.toml          | 1 +
 .../esdt-contract-pair/first-contract/meta/Cargo.toml            | 1 +
 .../esdt-contract-pair/second-contract/meta/Cargo.toml           | 1 +
 .../execute-on-dest-esdt-issue-callback/child/meta/Cargo.toml    | 1 +
 .../execute-on-dest-esdt-issue-callback/parent/meta/Cargo.toml   | 1 +
 .../feature-tests/composability/forwarder-queue/meta/Cargo.toml  | 1 +
 .../feature-tests/composability/forwarder-raw/meta/Cargo.toml    | 1 +
 contracts/feature-tests/composability/forwarder/meta/Cargo.toml  | 1 +
 .../composability/local-esdt-and-nft/meta/Cargo.toml             | 1 +
 .../composability/promises-features/meta/Cargo.toml              | 1 +
 .../feature-tests/composability/proxy-test-first/meta/Cargo.toml | 1 +
 .../composability/proxy-test-second/meta/Cargo.toml              | 1 +
 .../feature-tests/composability/recursive-caller/meta/Cargo.toml | 1 +
 .../composability/transfer-role-features/meta/Cargo.toml         | 1 +
 contracts/feature-tests/composability/vault/meta/Cargo.toml      | 1 +
 .../erc-style-contracts/crowdfunding-erc20/meta/Cargo.toml       | 1 +
 .../erc-style-contracts/erc1155-marketplace/meta/Cargo.toml      | 1 +
 .../erc-style-contracts/erc1155-user-mock/meta/Cargo.toml        | 1 +
 .../feature-tests/erc-style-contracts/erc1155/meta/Cargo.toml    | 1 +
 .../feature-tests/erc-style-contracts/erc20/meta/Cargo.toml      | 1 +
 .../feature-tests/erc-style-contracts/erc721/meta/Cargo.toml     | 1 +
 .../erc-style-contracts/lottery-erc20/meta/Cargo.toml            | 1 +
 contracts/feature-tests/esdt-system-sc-mock/meta/Cargo.toml      | 1 +
 .../feature-tests/formatted-message-features/meta/Cargo.toml     | 1 +
 contracts/feature-tests/managed-map-features/meta/Cargo.toml     | 1 +
 contracts/feature-tests/multi-contract-features/meta/Cargo.toml  | 1 +
 contracts/feature-tests/panic-message-features/meta/Cargo.toml   | 1 +
 contracts/feature-tests/payable-features/meta/Cargo.toml         | 1 +
 .../feature-tests/rust-snippets-generator-test/meta/Cargo.toml   | 1 +
 .../feature-tests/rust-testing-framework-tester/meta/Cargo.toml  | 1 +
 contracts/feature-tests/use-module/meta/Cargo.toml               | 1 +
 contracts/feature-tests/use-module/meta/abi/Cargo.toml           | 1 +
 73 files changed, 73 insertions(+)

diff --git a/contracts/benchmarks/large-storage/meta/Cargo.toml b/contracts/benchmarks/large-storage/meta/Cargo.toml
index 0d6b7ee6a4..a2615ea766 100644
--- a/contracts/benchmarks/large-storage/meta/Cargo.toml
+++ b/contracts/benchmarks/large-storage/meta/Cargo.toml
@@ -10,3 +10,4 @@ path = ".."
 [dependencies.multiversx-sc-meta]
 version = "0.45.0"
 path = "../../../../framework/meta"
+default-features = false
diff --git a/contracts/benchmarks/mappers/linked-list-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/linked-list-repeat/meta/Cargo.toml
index fe883cd1af..82cc1fcaf1 100644
--- a/contracts/benchmarks/mappers/linked-list-repeat/meta/Cargo.toml
+++ b/contracts/benchmarks/mappers/linked-list-repeat/meta/Cargo.toml
@@ -11,3 +11,4 @@ path = ".."
 [dependencies.multiversx-sc-meta]
 version = "0.45.0"
 path = "../../../../../framework/meta"
+default-features = false
diff --git a/contracts/benchmarks/mappers/map-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/map-repeat/meta/Cargo.toml
index 5a920fef4e..edeb7350f0 100644
--- a/contracts/benchmarks/mappers/map-repeat/meta/Cargo.toml
+++ b/contracts/benchmarks/mappers/map-repeat/meta/Cargo.toml
@@ -11,3 +11,4 @@ path = ".."
 [dependencies.multiversx-sc-meta]
 version = "0.45.0"
 path = "../../../../../framework/meta"
+default-features = false
diff --git a/contracts/benchmarks/mappers/queue-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/queue-repeat/meta/Cargo.toml
index 34505d96d3..b94aca64fc 100644
--- a/contracts/benchmarks/mappers/queue-repeat/meta/Cargo.toml
+++ b/contracts/benchmarks/mappers/queue-repeat/meta/Cargo.toml
@@ -11,3 +11,4 @@ path = ".."
 [dependencies.multiversx-sc-meta]
 version = "0.45.0"
 path = "../../../../../framework/meta"
+default-features = false
diff --git a/contracts/benchmarks/mappers/set-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/set-repeat/meta/Cargo.toml
index 006d36c4d1..5428f873a3 100644
--- a/contracts/benchmarks/mappers/set-repeat/meta/Cargo.toml
+++ b/contracts/benchmarks/mappers/set-repeat/meta/Cargo.toml
@@ -11,3 +11,4 @@ path = ".."
 [dependencies.multiversx-sc-meta]
 version = "0.45.0"
 path = "../../../../../framework/meta"
+default-features = false
diff --git a/contracts/benchmarks/mappers/single-value-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/single-value-repeat/meta/Cargo.toml
index 3abaea8bc9..8dd5acfa69 100644
--- a/contracts/benchmarks/mappers/single-value-repeat/meta/Cargo.toml
+++ b/contracts/benchmarks/mappers/single-value-repeat/meta/Cargo.toml
@@ -11,3 +11,4 @@ path = ".."
 [dependencies.multiversx-sc-meta]
 version = "0.45.0"
 path = "../../../../../framework/meta"
+default-features = false
diff --git a/contracts/benchmarks/mappers/vec-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/vec-repeat/meta/Cargo.toml
index 400c8f82cc..33debe3fd9 100644
--- a/contracts/benchmarks/mappers/vec-repeat/meta/Cargo.toml
+++ b/contracts/benchmarks/mappers/vec-repeat/meta/Cargo.toml
@@ -10,3 +10,4 @@ path = ".."
 [dependencies.multiversx-sc-meta]
 version = "0.45.0"
 path = "../../../../../framework/meta"
+default-features = false
diff --git a/contracts/benchmarks/send-tx-repeat/meta/Cargo.toml b/contracts/benchmarks/send-tx-repeat/meta/Cargo.toml
index 0f1bf1d59c..fdf06577e8 100644
--- a/contracts/benchmarks/send-tx-repeat/meta/Cargo.toml
+++ b/contracts/benchmarks/send-tx-repeat/meta/Cargo.toml
@@ -10,3 +10,4 @@ path = ".."
 [dependencies.multiversx-sc-meta]
 version = "0.45.0"
 path = "../../../../framework/meta"
+default-features = false
diff --git a/contracts/benchmarks/str-repeat/meta/Cargo.toml b/contracts/benchmarks/str-repeat/meta/Cargo.toml
index 2f3e06fed9..2fd1872139 100644
--- a/contracts/benchmarks/str-repeat/meta/Cargo.toml
+++ b/contracts/benchmarks/str-repeat/meta/Cargo.toml
@@ -10,3 +10,4 @@ path = ".."
 [dependencies.multiversx-sc-meta]
 version = "0.45.0"
 path = "../../../../framework/meta"
+default-features = false
diff --git a/contracts/core/price-aggregator/meta/Cargo.toml b/contracts/core/price-aggregator/meta/Cargo.toml
index 757a10d456..8a6580f590 100644
--- a/contracts/core/price-aggregator/meta/Cargo.toml
+++ b/contracts/core/price-aggregator/meta/Cargo.toml
@@ -14,3 +14,4 @@ path = "../../../../framework/base"
 [dependencies.multiversx-sc-meta]
 version = "0.45.0"
 path = "../../../../framework/meta"
+default-features = false
diff --git a/contracts/core/wegld-swap/meta/Cargo.toml b/contracts/core/wegld-swap/meta/Cargo.toml
index 05488c3ac7..3cd043f97b 100644
--- a/contracts/core/wegld-swap/meta/Cargo.toml
+++ b/contracts/core/wegld-swap/meta/Cargo.toml
@@ -17,3 +17,4 @@ path = "../../../../framework/base"
 [dependencies.multiversx-sc-meta]
 version = "0.45.0"
 path = "../../../../framework/meta"
+default-features = false
diff --git a/contracts/examples/adder/meta/Cargo.toml b/contracts/examples/adder/meta/Cargo.toml
index 84c9893536..8173715d30 100644
--- a/contracts/examples/adder/meta/Cargo.toml
+++ b/contracts/examples/adder/meta/Cargo.toml
@@ -10,3 +10,4 @@ path = ".."
 [dependencies.multiversx-sc-meta]
 version = "0.45.0"
 path = "../../../../framework/meta"
+default-features = false
diff --git a/contracts/examples/bonding-curve-contract/meta/Cargo.toml b/contracts/examples/bonding-curve-contract/meta/Cargo.toml
index 585059fad2..d04710d8b4 100644
--- a/contracts/examples/bonding-curve-contract/meta/Cargo.toml
+++ b/contracts/examples/bonding-curve-contract/meta/Cargo.toml
@@ -11,3 +11,4 @@ path = ".."
 [dependencies.multiversx-sc-meta]
 version = "0.45.0"
 path = "../../../../framework/meta"
+default-features = false
diff --git a/contracts/examples/check-pause/meta/Cargo.toml b/contracts/examples/check-pause/meta/Cargo.toml
index 7fcf76fa82..85c25e7d60 100644
--- a/contracts/examples/check-pause/meta/Cargo.toml
+++ b/contracts/examples/check-pause/meta/Cargo.toml
@@ -11,3 +11,4 @@ path = ".."
 [dependencies.multiversx-sc-meta]
 version = "0.45.0"
 path = "../../../../framework/meta"
+default-features = false
diff --git a/contracts/examples/crowdfunding-esdt/meta/Cargo.toml b/contracts/examples/crowdfunding-esdt/meta/Cargo.toml
index 67202ea503..fe19c04798 100644
--- a/contracts/examples/crowdfunding-esdt/meta/Cargo.toml
+++ b/contracts/examples/crowdfunding-esdt/meta/Cargo.toml
@@ -11,3 +11,4 @@ path = ".."
 [dependencies.multiversx-sc-meta]
 version = "0.45.0"
 path = "../../../../framework/meta"
+default-features = false
diff --git a/contracts/examples/crypto-bubbles/meta/Cargo.toml b/contracts/examples/crypto-bubbles/meta/Cargo.toml
index 0bea0af18e..3d5961f8ec 100644
--- a/contracts/examples/crypto-bubbles/meta/Cargo.toml
+++ b/contracts/examples/crypto-bubbles/meta/Cargo.toml
@@ -11,3 +11,4 @@ path = ".."
 [dependencies.multiversx-sc-meta]
 version = "0.45.0"
 path = "../../../../framework/meta"
+default-features = false
diff --git a/contracts/examples/crypto-kitties/kitty-auction/meta/Cargo.toml b/contracts/examples/crypto-kitties/kitty-auction/meta/Cargo.toml
index fb3ad53512..c62639dcc4 100644
--- a/contracts/examples/crypto-kitties/kitty-auction/meta/Cargo.toml
+++ b/contracts/examples/crypto-kitties/kitty-auction/meta/Cargo.toml
@@ -10,3 +10,4 @@ path = ".."
 [dependencies.multiversx-sc-meta]
 version = "0.45.0"
 path = "../../../../../framework/meta"
+default-features = false
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 d2963d6039..7f58179842 100644
--- a/contracts/examples/crypto-kitties/kitty-genetic-alg/meta/Cargo.toml
+++ b/contracts/examples/crypto-kitties/kitty-genetic-alg/meta/Cargo.toml
@@ -10,3 +10,4 @@ path = ".."
 [dependencies.multiversx-sc-meta]
 version = "0.45.0"
 path = "../../../../../framework/meta"
+default-features = false
diff --git a/contracts/examples/crypto-kitties/kitty-ownership/meta/Cargo.toml b/contracts/examples/crypto-kitties/kitty-ownership/meta/Cargo.toml
index 605244ad34..dd88ab234e 100644
--- a/contracts/examples/crypto-kitties/kitty-ownership/meta/Cargo.toml
+++ b/contracts/examples/crypto-kitties/kitty-ownership/meta/Cargo.toml
@@ -10,3 +10,4 @@ path = ".."
 [dependencies.multiversx-sc-meta]
 version = "0.45.0"
 path = "../../../../../framework/meta"
+default-features = false
diff --git a/contracts/examples/crypto-zombies/meta/Cargo.toml b/contracts/examples/crypto-zombies/meta/Cargo.toml
index e5bdf52574..b090066dc2 100644
--- a/contracts/examples/crypto-zombies/meta/Cargo.toml
+++ b/contracts/examples/crypto-zombies/meta/Cargo.toml
@@ -10,3 +10,4 @@ path = ".."
 [dependencies.multiversx-sc-meta]
 version = "0.45.0"
 path = "../../../../framework/meta"
+default-features = false
diff --git a/contracts/examples/digital-cash/meta/Cargo.toml b/contracts/examples/digital-cash/meta/Cargo.toml
index 34209efd8e..3bd8135c0a 100644
--- a/contracts/examples/digital-cash/meta/Cargo.toml
+++ b/contracts/examples/digital-cash/meta/Cargo.toml
@@ -10,3 +10,4 @@ path = ".."
 [dependencies.multiversx-sc-meta]
 version = "0.45.0"
 path = "../../../../framework/meta"
+default-features = false
diff --git a/contracts/examples/empty/meta/Cargo.toml b/contracts/examples/empty/meta/Cargo.toml
index 329fcaf74e..18b112a683 100644
--- a/contracts/examples/empty/meta/Cargo.toml
+++ b/contracts/examples/empty/meta/Cargo.toml
@@ -10,3 +10,4 @@ path = ".."
 [dependencies.multiversx-sc-meta]
 version = "0.45.0"
 path = "../../../../framework/meta"
+default-features = false
diff --git a/contracts/examples/esdt-transfer-with-fee/meta/Cargo.toml b/contracts/examples/esdt-transfer-with-fee/meta/Cargo.toml
index c3cf99f31a..cc250d645e 100644
--- a/contracts/examples/esdt-transfer-with-fee/meta/Cargo.toml
+++ b/contracts/examples/esdt-transfer-with-fee/meta/Cargo.toml
@@ -10,3 +10,4 @@ path = ".."
 [dependencies.multiversx-sc-meta]
 version = "0.45.0"
 path = "../../../../framework/meta"
+default-features = false
diff --git a/contracts/examples/factorial/meta/Cargo.toml b/contracts/examples/factorial/meta/Cargo.toml
index 81d386adbd..0c6d5b85e0 100644
--- a/contracts/examples/factorial/meta/Cargo.toml
+++ b/contracts/examples/factorial/meta/Cargo.toml
@@ -11,3 +11,4 @@ path = ".."
 [dependencies.multiversx-sc-meta]
 version = "0.45.0"
 path = "../../../../framework/meta"
+default-features = false
diff --git a/contracts/examples/fractional-nfts/meta/Cargo.toml b/contracts/examples/fractional-nfts/meta/Cargo.toml
index 72612331e2..399588cf5b 100644
--- a/contracts/examples/fractional-nfts/meta/Cargo.toml
+++ b/contracts/examples/fractional-nfts/meta/Cargo.toml
@@ -11,3 +11,4 @@ path = ".."
 [dependencies.multiversx-sc-meta]
 version = "0.45.0"
 path = "../../../../framework/meta"
+default-features = false
diff --git a/contracts/examples/lottery-esdt/meta/Cargo.toml b/contracts/examples/lottery-esdt/meta/Cargo.toml
index efb4ed8149..a8b0b18a3f 100644
--- a/contracts/examples/lottery-esdt/meta/Cargo.toml
+++ b/contracts/examples/lottery-esdt/meta/Cargo.toml
@@ -11,3 +11,4 @@ path = ".."
 [dependencies.multiversx-sc-meta]
 version = "0.45.0"
 path = "../../../../framework/meta"
+default-features = false
diff --git a/contracts/examples/multisig/meta/Cargo.toml b/contracts/examples/multisig/meta/Cargo.toml
index f472b84187..b923d8bece 100644
--- a/contracts/examples/multisig/meta/Cargo.toml
+++ b/contracts/examples/multisig/meta/Cargo.toml
@@ -11,3 +11,4 @@ path = ".."
 [dependencies.multiversx-sc-meta]
 version = "0.45.0"
 path = "../../../../framework/meta"
+default-features = false
diff --git a/contracts/examples/nft-minter/meta/Cargo.toml b/contracts/examples/nft-minter/meta/Cargo.toml
index 1785a06c1c..4295de3686 100644
--- a/contracts/examples/nft-minter/meta/Cargo.toml
+++ b/contracts/examples/nft-minter/meta/Cargo.toml
@@ -11,3 +11,4 @@ path = ".."
 [dependencies.multiversx-sc-meta]
 version = "0.45.0"
 path = "../../../../framework/meta"
+default-features = false
diff --git a/contracts/examples/nft-storage-prepay/meta/Cargo.toml b/contracts/examples/nft-storage-prepay/meta/Cargo.toml
index 1135c41f1d..534932ef67 100644
--- a/contracts/examples/nft-storage-prepay/meta/Cargo.toml
+++ b/contracts/examples/nft-storage-prepay/meta/Cargo.toml
@@ -13,3 +13,4 @@ path = ".."
 [dependencies.multiversx-sc-meta]
 version = "0.45.0"
 path = "../../../../framework/meta"
+default-features = false
diff --git a/contracts/examples/nft-subscription/meta/Cargo.toml b/contracts/examples/nft-subscription/meta/Cargo.toml
index b1921ea560..4016b9cc86 100644
--- a/contracts/examples/nft-subscription/meta/Cargo.toml
+++ b/contracts/examples/nft-subscription/meta/Cargo.toml
@@ -11,3 +11,4 @@ path = ".."
 [dependencies.multiversx-sc-meta]
 version = "0.45.0"
 path = "../../../../framework/meta"
+default-features = false
diff --git a/contracts/examples/order-book/factory/meta/Cargo.toml b/contracts/examples/order-book/factory/meta/Cargo.toml
index f7d2f073a9..38b707a293 100644
--- a/contracts/examples/order-book/factory/meta/Cargo.toml
+++ b/contracts/examples/order-book/factory/meta/Cargo.toml
@@ -11,3 +11,4 @@ path = ".."
 [dependencies.multiversx-sc-meta]
 version = "0.45.0"
 path = "../../../../../framework/meta"
+default-features = false
diff --git a/contracts/examples/order-book/pair/meta/Cargo.toml b/contracts/examples/order-book/pair/meta/Cargo.toml
index f6ccdface0..1d1d9004b1 100644
--- a/contracts/examples/order-book/pair/meta/Cargo.toml
+++ b/contracts/examples/order-book/pair/meta/Cargo.toml
@@ -11,3 +11,4 @@ path = ".."
 [dependencies.multiversx-sc-meta]
 version = "0.45.0"
 path = "../../../../../framework/meta"
+default-features = false
diff --git a/contracts/examples/ping-pong-egld/meta/Cargo.toml b/contracts/examples/ping-pong-egld/meta/Cargo.toml
index a8b240df0c..397e445ec5 100644
--- a/contracts/examples/ping-pong-egld/meta/Cargo.toml
+++ b/contracts/examples/ping-pong-egld/meta/Cargo.toml
@@ -11,3 +11,4 @@ path = ".."
 [dependencies.multiversx-sc-meta]
 version = "0.45.0"
 path = "../../../../framework/meta"
+default-features = false
diff --git a/contracts/examples/proxy-pause/meta/Cargo.toml b/contracts/examples/proxy-pause/meta/Cargo.toml
index 5bc778deb1..8097d60e2b 100644
--- a/contracts/examples/proxy-pause/meta/Cargo.toml
+++ b/contracts/examples/proxy-pause/meta/Cargo.toml
@@ -13,3 +13,4 @@ path = ".."
 [dependencies.multiversx-sc-meta]
 version = "0.45.0"
 path = "../../../../framework/meta"
+default-features = false
diff --git a/contracts/examples/rewards-distribution/meta/Cargo.toml b/contracts/examples/rewards-distribution/meta/Cargo.toml
index 1b60aa789c..defaa7e718 100644
--- a/contracts/examples/rewards-distribution/meta/Cargo.toml
+++ b/contracts/examples/rewards-distribution/meta/Cargo.toml
@@ -13,3 +13,4 @@ path = ".."
 [dependencies.multiversx-sc-meta]
 version = "0.45.0"
 path = "../../../../framework/meta"
+default-features = false
diff --git a/contracts/examples/seed-nft-minter/meta/Cargo.toml b/contracts/examples/seed-nft-minter/meta/Cargo.toml
index cd1d9762f8..3c1d143e86 100644
--- a/contracts/examples/seed-nft-minter/meta/Cargo.toml
+++ b/contracts/examples/seed-nft-minter/meta/Cargo.toml
@@ -13,3 +13,4 @@ path = ".."
 [dependencies.multiversx-sc-meta]
 version = "0.45.0"
 path = "../../../../framework/meta"
+default-features = false
diff --git a/contracts/examples/token-release/meta/Cargo.toml b/contracts/examples/token-release/meta/Cargo.toml
index b06858c3bb..e16be1dd0e 100644
--- a/contracts/examples/token-release/meta/Cargo.toml
+++ b/contracts/examples/token-release/meta/Cargo.toml
@@ -12,4 +12,5 @@ path = ".."
 [dependencies.multiversx-sc-meta]
 version = "0.45.0"
 path = "../../../../framework/meta"
+default-features = false
 
diff --git a/contracts/feature-tests/abi-tester/meta/Cargo.toml b/contracts/feature-tests/abi-tester/meta/Cargo.toml
index 38f4343584..92846aecc5 100644
--- a/contracts/feature-tests/abi-tester/meta/Cargo.toml
+++ b/contracts/feature-tests/abi-tester/meta/Cargo.toml
@@ -11,3 +11,4 @@ path = ".."
 [dependencies.multiversx-sc-meta]
 version = "0.45.0"
 path = "../../../../framework/meta"
+default-features = false
diff --git a/contracts/feature-tests/alloc-features/meta/Cargo.toml b/contracts/feature-tests/alloc-features/meta/Cargo.toml
index 0368b7e715..98cf5bacd4 100644
--- a/contracts/feature-tests/alloc-features/meta/Cargo.toml
+++ b/contracts/feature-tests/alloc-features/meta/Cargo.toml
@@ -11,3 +11,4 @@ path = ".."
 [dependencies.multiversx-sc-meta]
 version = "0.45.0"
 path = "../../../../framework/meta"
+default-features = false
diff --git a/contracts/feature-tests/basic-features/meta/Cargo.toml b/contracts/feature-tests/basic-features/meta/Cargo.toml
index 1468e25291..799e99de70 100644
--- a/contracts/feature-tests/basic-features/meta/Cargo.toml
+++ b/contracts/feature-tests/basic-features/meta/Cargo.toml
@@ -11,3 +11,4 @@ path = ".."
 [dependencies.multiversx-sc-meta]
 version = "0.45.0"
 path = "../../../../framework/meta"
+default-features = false
diff --git a/contracts/feature-tests/big-float-features/meta/Cargo.toml b/contracts/feature-tests/big-float-features/meta/Cargo.toml
index 7e3b09e14e..ccc6ef2309 100644
--- a/contracts/feature-tests/big-float-features/meta/Cargo.toml
+++ b/contracts/feature-tests/big-float-features/meta/Cargo.toml
@@ -11,3 +11,4 @@ path = ".."
 [dependencies.multiversx-sc-meta]
 version = "0.45.0"
 path = "../../../../framework/meta"
+default-features = false
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 71d806e192..c4dccfcd2e 100644
--- a/contracts/feature-tests/composability/builtin-func-features/meta/Cargo.toml
+++ b/contracts/feature-tests/composability/builtin-func-features/meta/Cargo.toml
@@ -10,3 +10,4 @@ path = ".."
 [dependencies.multiversx-sc-meta]
 version = "0.45.0"
 path = "../../../../../framework/meta"
+default-features = false
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 b1cb8c4458..a5965c888f 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
@@ -14,3 +14,4 @@ path = "../../../../../../framework/base"
 [dependencies.multiversx-sc-meta]
 version = "0.45.0"
 path = "../../../../../../framework/meta"
+default-features = false
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 3b0eafe8da..1ebf897295 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
@@ -14,3 +14,4 @@ path = "../../../../../../framework/base"
 [dependencies.multiversx-sc-meta]
 version = "0.45.0"
 path = "../../../../../../framework/meta"
+default-features = false
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 ce40c8a88b..fd31a54f11 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
@@ -14,3 +14,4 @@ path = "../../../../../../framework/base"
 [dependencies.multiversx-sc-meta]
 version = "0.45.0"
 path = "../../../../../../framework/meta"
+default-features = false
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 ec32bc2d18..d74273ed55 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
@@ -14,3 +14,4 @@ path = "../../../../../../framework/base"
 [dependencies.multiversx-sc-meta]
 version = "0.45.0"
 path = "../../../../../../framework/meta"
+default-features = false
diff --git a/contracts/feature-tests/composability/forwarder-queue/meta/Cargo.toml b/contracts/feature-tests/composability/forwarder-queue/meta/Cargo.toml
index f84c8ca80d..fde69e5038 100644
--- a/contracts/feature-tests/composability/forwarder-queue/meta/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-queue/meta/Cargo.toml
@@ -10,3 +10,4 @@ path = ".."
 [dependencies.multiversx-sc-meta]
 version = "0.45.0"
 path = "../../../../../framework/meta"
+default-features = false
diff --git a/contracts/feature-tests/composability/forwarder-raw/meta/Cargo.toml b/contracts/feature-tests/composability/forwarder-raw/meta/Cargo.toml
index 7873a94c06..d05698aa5e 100644
--- a/contracts/feature-tests/composability/forwarder-raw/meta/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-raw/meta/Cargo.toml
@@ -10,3 +10,4 @@ path = ".."
 [dependencies.multiversx-sc-meta]
 version = "0.45.0"
 path = "../../../../../framework/meta"
+default-features = false
diff --git a/contracts/feature-tests/composability/forwarder/meta/Cargo.toml b/contracts/feature-tests/composability/forwarder/meta/Cargo.toml
index fc78014015..e3d17000b6 100644
--- a/contracts/feature-tests/composability/forwarder/meta/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder/meta/Cargo.toml
@@ -10,3 +10,4 @@ path = ".."
 [dependencies.multiversx-sc-meta]
 version = "0.45.0"
 path = "../../../../../framework/meta"
+default-features = false
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 a1560252ee..a4452cf49b 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
@@ -10,3 +10,4 @@ path = ".."
 [dependencies.multiversx-sc-meta]
 version = "0.45.0"
 path = "../../../../../framework/meta"
+default-features = false
diff --git a/contracts/feature-tests/composability/promises-features/meta/Cargo.toml b/contracts/feature-tests/composability/promises-features/meta/Cargo.toml
index fa91f6fc96..1c25ce5141 100644
--- a/contracts/feature-tests/composability/promises-features/meta/Cargo.toml
+++ b/contracts/feature-tests/composability/promises-features/meta/Cargo.toml
@@ -10,3 +10,4 @@ path = ".."
 [dependencies.multiversx-sc-meta]
 version = "0.45.0"
 path = "../../../../../framework/meta"
+default-features = false
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 a3cff62b73..bec70cfe59 100644
--- a/contracts/feature-tests/composability/proxy-test-first/meta/Cargo.toml
+++ b/contracts/feature-tests/composability/proxy-test-first/meta/Cargo.toml
@@ -10,3 +10,4 @@ path = ".."
 [dependencies.multiversx-sc-meta]
 version = "0.45.0"
 path = "../../../../../framework/meta"
+default-features = false
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 ca5effd197..2a8fcb08b6 100644
--- a/contracts/feature-tests/composability/proxy-test-second/meta/Cargo.toml
+++ b/contracts/feature-tests/composability/proxy-test-second/meta/Cargo.toml
@@ -10,3 +10,4 @@ path = ".."
 [dependencies.multiversx-sc-meta]
 version = "0.45.0"
 path = "../../../../../framework/meta"
+default-features = false
diff --git a/contracts/feature-tests/composability/recursive-caller/meta/Cargo.toml b/contracts/feature-tests/composability/recursive-caller/meta/Cargo.toml
index 68781e58dd..5fc3591b5a 100644
--- a/contracts/feature-tests/composability/recursive-caller/meta/Cargo.toml
+++ b/contracts/feature-tests/composability/recursive-caller/meta/Cargo.toml
@@ -10,3 +10,4 @@ path = ".."
 [dependencies.multiversx-sc-meta]
 version = "0.45.0"
 path = "../../../../../framework/meta"
+default-features = false
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 9c6caffa29..a46ec28484 100644
--- a/contracts/feature-tests/composability/transfer-role-features/meta/Cargo.toml
+++ b/contracts/feature-tests/composability/transfer-role-features/meta/Cargo.toml
@@ -10,3 +10,4 @@ path = ".."
 [dependencies.multiversx-sc-meta]
 version = "0.45.0"
 path = "../../../../../framework/meta"
+default-features = false
diff --git a/contracts/feature-tests/composability/vault/meta/Cargo.toml b/contracts/feature-tests/composability/vault/meta/Cargo.toml
index 0a7f9f2a53..d4b43b306a 100644
--- a/contracts/feature-tests/composability/vault/meta/Cargo.toml
+++ b/contracts/feature-tests/composability/vault/meta/Cargo.toml
@@ -10,3 +10,4 @@ path = ".."
 [dependencies.multiversx-sc-meta]
 version = "0.45.0"
 path = "../../../../../framework/meta"
+default-features = false
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 29c7c2be95..b6fd4a9bae 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
@@ -11,3 +11,4 @@ path = ".."
 [dependencies.multiversx-sc-meta]
 version = "0.45.0"
 path = "../../../../../framework/meta"
+default-features = false
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 1d5bdc31d4..0f33b4b211 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
@@ -11,3 +11,4 @@ path = ".."
 [dependencies.multiversx-sc-meta]
 version = "0.45.0"
 path = "../../../../../framework/meta"
+default-features = false
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 40ec48078f..f5f3267328 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
@@ -11,3 +11,4 @@ path = ".."
 [dependencies.multiversx-sc-meta]
 version = "0.45.0"
 path = "../../../../../framework/meta"
+default-features = false
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 19de4e17ca..f0cb744375 100644
--- a/contracts/feature-tests/erc-style-contracts/erc1155/meta/Cargo.toml
+++ b/contracts/feature-tests/erc-style-contracts/erc1155/meta/Cargo.toml
@@ -11,3 +11,4 @@ path = ".."
 [dependencies.multiversx-sc-meta]
 version = "0.45.0"
 path = "../../../../../framework/meta"
+default-features = false
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 d4dfacec1a..036082ac0a 100644
--- a/contracts/feature-tests/erc-style-contracts/erc20/meta/Cargo.toml
+++ b/contracts/feature-tests/erc-style-contracts/erc20/meta/Cargo.toml
@@ -11,3 +11,4 @@ path = ".."
 [dependencies.multiversx-sc-meta]
 version = "0.45.0"
 path = "../../../../../framework/meta"
+default-features = false
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 cfcce05a39..0523d309dc 100644
--- a/contracts/feature-tests/erc-style-contracts/erc721/meta/Cargo.toml
+++ b/contracts/feature-tests/erc-style-contracts/erc721/meta/Cargo.toml
@@ -11,3 +11,4 @@ path = ".."
 [dependencies.multiversx-sc-meta]
 version = "0.45.0"
 path = "../../../../../framework/meta"
+default-features = false
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 bd35283ad8..c643954ce7 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
@@ -11,3 +11,4 @@ path = ".."
 [dependencies.multiversx-sc-meta]
 version = "0.45.0"
 path = "../../../../../framework/meta"
+default-features = false
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 0df9b1b722..1cae497de4 100644
--- a/contracts/feature-tests/esdt-system-sc-mock/meta/Cargo.toml
+++ b/contracts/feature-tests/esdt-system-sc-mock/meta/Cargo.toml
@@ -11,3 +11,4 @@ path = ".."
 [dependencies.multiversx-sc-meta]
 version = "0.45.0"
 path = "../../../../framework/meta"
+default-features = false
diff --git a/contracts/feature-tests/formatted-message-features/meta/Cargo.toml b/contracts/feature-tests/formatted-message-features/meta/Cargo.toml
index c60c3f51bb..ec97db718a 100644
--- a/contracts/feature-tests/formatted-message-features/meta/Cargo.toml
+++ b/contracts/feature-tests/formatted-message-features/meta/Cargo.toml
@@ -13,3 +13,4 @@ path = ".."
 [dependencies.multiversx-sc-meta]
 version = "0.45.0"
 path = "../../../../framework/meta"
+default-features = false
diff --git a/contracts/feature-tests/managed-map-features/meta/Cargo.toml b/contracts/feature-tests/managed-map-features/meta/Cargo.toml
index 74b62ad483..5672341314 100644
--- a/contracts/feature-tests/managed-map-features/meta/Cargo.toml
+++ b/contracts/feature-tests/managed-map-features/meta/Cargo.toml
@@ -10,3 +10,4 @@ path = ".."
 [dependencies.multiversx-sc-meta]
 version = "0.45.0"
 path = "../../../../framework/meta"
+default-features = false
diff --git a/contracts/feature-tests/multi-contract-features/meta/Cargo.toml b/contracts/feature-tests/multi-contract-features/meta/Cargo.toml
index 9a6465697c..d50c77cf64 100644
--- a/contracts/feature-tests/multi-contract-features/meta/Cargo.toml
+++ b/contracts/feature-tests/multi-contract-features/meta/Cargo.toml
@@ -11,3 +11,4 @@ path = ".."
 [dependencies.multiversx-sc-meta]
 version = "0.45.0"
 path = "../../../../framework/meta"
+default-features = false
diff --git a/contracts/feature-tests/panic-message-features/meta/Cargo.toml b/contracts/feature-tests/panic-message-features/meta/Cargo.toml
index 1bd1bcf4e9..2ab7bc227a 100644
--- a/contracts/feature-tests/panic-message-features/meta/Cargo.toml
+++ b/contracts/feature-tests/panic-message-features/meta/Cargo.toml
@@ -10,3 +10,4 @@ path = ".."
 [dependencies.multiversx-sc-meta]
 version = "0.45.0"
 path = "../../../../framework/meta"
+default-features = false
diff --git a/contracts/feature-tests/payable-features/meta/Cargo.toml b/contracts/feature-tests/payable-features/meta/Cargo.toml
index d1b91a4c0c..69efe48582 100644
--- a/contracts/feature-tests/payable-features/meta/Cargo.toml
+++ b/contracts/feature-tests/payable-features/meta/Cargo.toml
@@ -11,3 +11,4 @@ path = ".."
 [dependencies.multiversx-sc-meta]
 version = "0.45.0"
 path = "../../../../framework/meta"
+default-features = false
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 3bf13b6571..76a1692ddc 100644
--- a/contracts/feature-tests/rust-snippets-generator-test/meta/Cargo.toml
+++ b/contracts/feature-tests/rust-snippets-generator-test/meta/Cargo.toml
@@ -11,3 +11,4 @@ path = ".."
 [dependencies.multiversx-sc-meta]
 version = "0.45.0"
 path = "../../../../framework/meta"
+default-features = false
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 4bbbb0bab6..aabb7f53a6 100644
--- a/contracts/feature-tests/rust-testing-framework-tester/meta/Cargo.toml
+++ b/contracts/feature-tests/rust-testing-framework-tester/meta/Cargo.toml
@@ -10,3 +10,4 @@ path = ".."
 [dependencies.multiversx-sc-meta]
 version = "0.45.0"
 path = "../../../../framework/meta"
+default-features = false
diff --git a/contracts/feature-tests/use-module/meta/Cargo.toml b/contracts/feature-tests/use-module/meta/Cargo.toml
index c0476b4a45..0d7cf6d649 100644
--- a/contracts/feature-tests/use-module/meta/Cargo.toml
+++ b/contracts/feature-tests/use-module/meta/Cargo.toml
@@ -11,3 +11,4 @@ path = ".."
 [dependencies.multiversx-sc-meta]
 version = "0.45.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 078daf42b0..60f245502e 100644
--- a/contracts/feature-tests/use-module/meta/abi/Cargo.toml
+++ b/contracts/feature-tests/use-module/meta/abi/Cargo.toml
@@ -15,3 +15,4 @@ path = "../../../../framework/base"
 [dependencies.multiversx-sc-meta]
 version = "0.45.0"
 path = "../../../../framework/meta"
+default-features = false

From 3ec5e06d61fb9ff6d4d95969fdc8b571b7605366 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 24 Nov 2023 14:07:30 +0200
Subject: [PATCH 0113/1254] removed unused dependency

---
 Cargo.lock          | 20 ++------------------
 sdk/core/Cargo.toml |  1 -
 2 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 15f7d3c6a3..ea4c01435f 100755
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -749,15 +749,6 @@ dependencies = [
  "multiversx-sc-meta",
 ]
 
-[[package]]
-name = "ed25519"
-version = "1.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91cff35c70bba8a626e3185d8cd48cc11b5437e1a5bcd15b9b5fa3c64b6dfee7"
-dependencies = [
- "signature 1.6.4",
-]
-
 [[package]]
 name = "ed25519"
 version = "2.2.3"
@@ -765,7 +756,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53"
 dependencies = [
  "pkcs8",
- "signature 2.1.0",
+ "signature",
 ]
 
 [[package]]
@@ -775,7 +766,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7277392b266383ef8396db7fdeb1e77b6c52fed775f5df15bb24f35b72156980"
 dependencies = [
  "curve25519-dalek",
- "ed25519 2.2.3",
+ "ed25519",
  "serde",
  "sha2 0.10.8",
  "zeroize",
@@ -2017,7 +2008,6 @@ dependencies = [
  "base64 0.13.1",
  "bech32",
  "bip39",
- "ed25519 1.5.3",
  "hex",
  "hmac",
  "itertools",
@@ -3020,12 +3010,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "signature"
-version = "1.6.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c"
-
 [[package]]
 name = "signature"
 version = "2.1.0"
diff --git a/sdk/core/Cargo.toml b/sdk/core/Cargo.toml
index d7e9aefb93..5298c0cb80 100644
--- a/sdk/core/Cargo.toml
+++ b/sdk/core/Cargo.toml
@@ -29,7 +29,6 @@ sha3 = "0.9.1"
 hmac = { version = "0.11.0", features = ["std"] }
 hex = "0.4.3"
 base64 = "0.13.0"
-ed25519 = "1.2.0"
 pbkdf2 = { version = "0.9.0", default-features = false }
 zeroize = "1.4.2"
 bech32 = "0.9"

From 2b5d2b706b1ad0ee1396f75c5c65a326b98f6c03 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 24 Nov 2023 14:39:07 +0200
Subject: [PATCH 0114/1254] codec derive hygiene

---
 data/codec-derive/src/nested_de_derive.rs | 12 ++++++------
 data/codec-derive/src/nested_en_derive.rs |  8 ++++----
 data/codec-derive/src/top_de_derive.rs    | 16 ++++++++--------
 data/codec-derive/src/top_en_derive.rs    | 22 +++++++++++-----------
 data/codec/tests/derive_hygiene.rs        |  6 ++++++
 5 files changed, 35 insertions(+), 29 deletions(-)

diff --git a/data/codec-derive/src/nested_de_derive.rs b/data/codec-derive/src/nested_de_derive.rs
index bbd358e80d..e9f8a489d0 100644
--- a/data/codec-derive/src/nested_de_derive.rs
+++ b/data/codec-derive/src/nested_de_derive.rs
@@ -11,11 +11,11 @@ pub fn dep_decode_snippet(
     let ty = &field.ty;
     if let Some(ident) = &field.ident {
         quote! {
-            #ident: <#ty as codec::NestedDecode>::dep_decode_or_handle_err(#input_value, h)?
+            #ident: <#ty as codec::NestedDecode>::dep_decode_or_handle_err(#input_value, __h__)?
         }
     } else {
         quote! {
-            <#ty as codec::NestedDecode>::dep_decode_or_handle_err(#input_value, h)?
+            <#ty as codec::NestedDecode>::dep_decode_or_handle_err(#input_value, __h__)?
         }
     }
 }
@@ -53,7 +53,7 @@ pub fn nested_decode_impl(ast: &syn::DeriveInput) -> TokenStream {
                 });
             quote! {
                 impl #impl_generics codec::NestedDecode for #name #ty_generics #where_clause {
-                    fn dep_decode_or_handle_err<I, H>(input: &mut I, h: H) -> core::result::Result<Self, H::HandledErr>
+                    fn dep_decode_or_handle_err<I, H>(input: &mut I, __h__: H) -> core::result::Result<Self, H::HandledErr>
                     where
                         I: codec::NestedDecodeInput,
                         H: codec::DecodeErrorHandler,
@@ -75,14 +75,14 @@ pub fn nested_decode_impl(ast: &syn::DeriveInput) -> TokenStream {
 
             quote! {
                 impl #impl_generics codec::NestedDecode for #name #ty_generics #where_clause {
-                    fn dep_decode_or_handle_err<I, H>(input: &mut I, h: H) -> core::result::Result<Self, H::HandledErr>
+                    fn dep_decode_or_handle_err<I, H>(input: &mut I, __h__: H) -> core::result::Result<Self, H::HandledErr>
                     where
                         I: codec::NestedDecodeInput,
                         H: codec::DecodeErrorHandler,
                     {
-                        match <u8 as codec::NestedDecode>::dep_decode_or_handle_err(input, h)? {
+                        match <u8 as codec::NestedDecode>::dep_decode_or_handle_err(input, __h__)? {
                             #(#variant_dep_decode_snippets)*
-                            _ => core::result::Result::Err(h.handle_error(codec::DecodeError::INVALID_VALUE)),
+                            _ => core::result::Result::Err(__h__.handle_error(codec::DecodeError::INVALID_VALUE)),
                         }
                     }
                 }
diff --git a/data/codec-derive/src/nested_en_derive.rs b/data/codec-derive/src/nested_en_derive.rs
index 97e70dd977..096f6a04bc 100644
--- a/data/codec-derive/src/nested_en_derive.rs
+++ b/data/codec-derive/src/nested_en_derive.rs
@@ -4,7 +4,7 @@ use quote::quote;
 
 pub fn dep_encode_snippet(value: &proc_macro2::TokenStream) -> proc_macro2::TokenStream {
     quote! {
-        codec::NestedEncode::dep_encode_or_handle_err(&#value, dest, h)?;
+        codec::NestedEncode::dep_encode_or_handle_err(&#value, __dest__, __h__)?;
     }
 }
 
@@ -26,7 +26,7 @@ fn variant_dep_encode_snippets(
             });
             quote! {
                 #name::#variant_ident #local_var_declarations => {
-                    codec::NestedEncode::dep_encode_or_handle_err(&#variant_index_u8, dest, h)?;
+                    codec::NestedEncode::dep_encode_or_handle_err(&#variant_index_u8, __dest__, __h__)?;
                     #(#variant_field_snippets)*
                 },
             }
@@ -44,7 +44,7 @@ pub fn nested_encode_impl(ast: &syn::DeriveInput) -> TokenStream {
             });
             quote! {
                 impl #impl_generics codec::NestedEncode for #name #ty_generics #where_clause {
-                    fn dep_encode_or_handle_err<O, H>(&self, dest: &mut O, h: H) -> core::result::Result<(), H::HandledErr>
+                    fn dep_encode_or_handle_err<O, H>(&self, __dest__: &mut O, __h__: H) -> core::result::Result<(), H::HandledErr>
                     where
                         O: codec::NestedEncodeOutput,
                         H: codec::EncodeErrorHandler,
@@ -64,7 +64,7 @@ pub fn nested_encode_impl(ast: &syn::DeriveInput) -> TokenStream {
 
             quote! {
                 impl #impl_generics codec::NestedEncode for #name #ty_generics #where_clause {
-                    fn dep_encode_or_handle_err<O, H>(&self, dest: &mut O, h: H) -> core::result::Result<(), H::HandledErr>
+                    fn dep_encode_or_handle_err<O, H>(&self, __dest__: &mut O, __h__: H) -> core::result::Result<(), H::HandledErr>
                     where
                         O: codec::NestedEncodeOutput,
                         H: codec::EncodeErrorHandler,
diff --git a/data/codec-derive/src/top_de_derive.rs b/data/codec-derive/src/top_de_derive.rs
index 30e79e1362..c5ec4cbfa4 100644
--- a/data/codec-derive/src/top_de_derive.rs
+++ b/data/codec-derive/src/top_de_derive.rs
@@ -61,7 +61,7 @@ fn top_decode_method_body(ast: &syn::DeriveInput) -> proc_macro2::TokenStream {
                 let mut nested_buffer = top_input.into_nested_buffer();
                 let result = #name #field_dep_decode_snippets ;
                 if !codec::NestedDecodeInput::is_depleted(&nested_buffer) {
-                    return core::result::Result::Err(h.handle_error(codec::DecodeError::INPUT_TOO_LONG));
+                    return core::result::Result::Err(__h__.handle_error(codec::DecodeError::INPUT_TOO_LONG));
                 }
                 core::result::Result::Ok(result)
             }
@@ -75,9 +75,9 @@ fn top_decode_method_body(ast: &syn::DeriveInput) -> proc_macro2::TokenStream {
                 // 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);
                 quote! {
-                    match <u8 as codec::TopDecode>::top_decode_or_handle_err(top_input, h)? {
+                    match <u8 as codec::TopDecode>::top_decode_or_handle_err(top_input, __h__)? {
                         #(#top_decode_arms)*
-                        _ => core::result::Result::Err(h.handle_error(codec::DecodeError::INVALID_VALUE)),
+                        _ => core::result::Result::Err(__h__.handle_error(codec::DecodeError::INVALID_VALUE)),
                     }
                 }
             } else {
@@ -86,15 +86,15 @@ fn top_decode_method_body(ast: &syn::DeriveInput) -> proc_macro2::TokenStream {
 
                 quote! {
                     let mut nested_buffer = top_input.into_nested_buffer();
-                    let result = match <u8 as codec::NestedDecode>::dep_decode_or_handle_err(&mut nested_buffer, h)? {
+                    let result = match <u8 as codec::NestedDecode>::dep_decode_or_handle_err(&mut nested_buffer, __h__)? {
                         #(#variant_dep_decode_snippets)*
                         _ => core::result::Result::Err(
-                            h.handle_error(codec::DecodeError::INVALID_VALUE),
+                            __h__.handle_error(codec::DecodeError::INVALID_VALUE),
                         ),
                     };
                     if !codec::NestedDecodeInput::is_depleted(&nested_buffer) {
                         return core::result::Result::Err(
-                            h.handle_error(codec::DecodeError::INPUT_TOO_LONG),
+                            __h__.handle_error(codec::DecodeError::INPUT_TOO_LONG),
                         );
                     }
                     result
@@ -113,7 +113,7 @@ pub fn top_decode_impl(ast: &syn::DeriveInput) -> TokenStream {
 
     let gen = quote! {
         impl #impl_generics codec::TopDecode for #name #ty_generics #where_clause {
-            fn top_decode_or_handle_err<I, H>(top_input: I, h: H) -> core::result::Result<Self, H::HandledErr>
+            fn top_decode_or_handle_err<I, H>(top_input: I, __h__: H) -> core::result::Result<Self, H::HandledErr>
             where
                 I: codec::TopDecodeInput,
                 H: codec::DecodeErrorHandler,
@@ -134,7 +134,7 @@ pub fn top_decode_or_default_impl(ast: &syn::DeriveInput) -> TokenStream {
 
     let gen = quote! {
         impl #impl_generics codec::TopDecode for #name #ty_generics #where_clause {
-            fn top_decode_or_handle_err<I, H>(top_input: I, h: H) -> core::result::Result<Self, H::HandledErr>
+            fn top_decode_or_handle_err<I, H>(top_input: I, __h__: H) -> core::result::Result<Self, H::HandledErr>
             where
                 I: codec::TopDecodeInput,
                 H: codec::DecodeErrorHandler,
diff --git a/data/codec-derive/src/top_en_derive.rs b/data/codec-derive/src/top_en_derive.rs
index 448a283c74..732d421285 100644
--- a/data/codec-derive/src/top_en_derive.rs
+++ b/data/codec-derive/src/top_en_derive.rs
@@ -12,13 +12,13 @@ pub fn variant_top_encode_snippets(
         .iter()
         .enumerate()
         .map(|(variant_index, variant)| {
-            let variant_index_u8 = variant_index as u8;
+            let discriminant_u8 = variant_index as u8;
             let variant_ident = &variant.ident;
             if variant.fields.is_empty() {
                 // top-encode discriminant directly
                 quote! {
                     #name::#variant_ident =>
-                        codec::TopEncode::top_encode_or_handle_err(&#variant_index_u8, output, h),
+                        codec::TopEncode::top_encode_or_handle_err(&#discriminant_u8, output, __h__),
                 }
             } else {
                 // dep-encode to buffer first
@@ -29,11 +29,11 @@ pub fn variant_top_encode_snippets(
                 });
                 quote! {
                     #name::#variant_ident #local_var_declarations => {
-                        let mut buffer = output.start_nested_encode();
-                        let dest = &mut buffer;
-                        codec::NestedEncode::dep_encode_or_handle_err(&#variant_index_u8, dest, h)?;
+                        let mut __buffer__ = output.start_nested_encode();
+                        let __dest__ = &mut __buffer__;
+                        codec::NestedEncode::dep_encode_or_handle_err(&#discriminant_u8, __dest__, __h__)?;
                         #(#variant_field_snippets)*
-                        output.finalize_nested_encode(buffer);
+                        output.finalize_nested_encode(__buffer__);
                         core::result::Result::Ok(())
                     },
                 }
@@ -51,10 +51,10 @@ fn top_encode_method_body(ast: &syn::DeriveInput) -> proc_macro2::TokenStream {
                 dep_encode_snippet(&self_field_expr(index, field))
             });
             quote! {
-                let mut buffer = output.start_nested_encode();
-                let dest = &mut buffer;
+                let mut __buffer__ = output.start_nested_encode();
+                let __dest__ = &mut __buffer__;
                 #(#field_dep_encode_snippets)*
-                output.finalize_nested_encode(buffer);
+                output.finalize_nested_encode(__buffer__);
                 core::result::Result::Ok(())
             }
         },
@@ -82,7 +82,7 @@ pub fn top_encode_impl(ast: &syn::DeriveInput) -> TokenStream {
 
     let gen = quote! {
         impl #impl_generics codec::TopEncode for #name #ty_generics #where_clause {
-            fn top_encode_or_handle_err<O, H>(&self, output: O, h: H) -> core::result::Result<(), H::HandledErr>
+            fn top_encode_or_handle_err<O, H>(&self, output: O, __h__: H) -> core::result::Result<(), H::HandledErr>
             where
                 O: codec::TopEncodeOutput,
                 H: codec::EncodeErrorHandler,
@@ -101,7 +101,7 @@ pub fn top_encode_or_default_impl(ast: &syn::DeriveInput) -> TokenStream {
 
     let gen = quote! {
         impl #impl_generics codec::TopEncode for #name #ty_generics #where_clause {
-            fn top_encode_or_handle_err<O, H>(&self, output: O, h: H) -> core::result::Result<(), H::HandledErr>
+            fn top_encode_or_handle_err<O, H>(&self, output: O, __h__: H) -> core::result::Result<(), H::HandledErr>
             where
                 O: codec::TopEncodeOutput,
                 H: codec::EncodeErrorHandler,
diff --git a/data/codec/tests/derive_hygiene.rs b/data/codec/tests/derive_hygiene.rs
index 9013e2838c..4f9cc5e1f9 100644
--- a/data/codec/tests/derive_hygiene.rs
+++ b/data/codec/tests/derive_hygiene.rs
@@ -51,6 +51,9 @@ pub struct Struct {
     pub another_byte: u8,
     pub uint_32: u32,
     pub uint_64: u64,
+    buffer: bool, // used to occur in derive implementation
+    dest: bool,   // used to occur in derive implementation
+    h: bool,      // used to occur in derive implementation
 }
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, PartialEq, Eq, Clone, Debug)]
@@ -78,6 +81,9 @@ enum EnumWithEverything {
         another_byte: u8,
         uint_32: u32,
         uint_64: u64,
+        buffer: bool, // used to occur in derive implementation
+        dest: bool,   // used to occur in derive implementation
+        h: bool,      // used to occur in derive implementation
     },
 }
 

From 475a617b5907cf3485eb65bda77613009be64a42 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 24 Nov 2023 15:53:26 +0200
Subject: [PATCH 0115/1254] un-ignored test

---
 .../basic-features/tests/basic_features_scenario_go_test.rs      | 1 -
 1 file changed, 1 deletion(-)

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 4254f89649..0e64374c03 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
@@ -417,7 +417,6 @@ fn storage_raw_api_features_go() {
 }
 
 #[test]
-#[ignore = "the error message has changed, re-enable when we move to VM 1.5"]
 fn storage_reserved_go() {
     world().run("scenarios/storage_reserved.scen.json");
 }

From 347c0e27c0a0a6e42af959cb85431754ffbdb15f Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 24 Nov 2023 16:03:48 +0200
Subject: [PATCH 0116/1254] sc 0.45.1, codec 0.18.2

---
 CHANGELOG.md                                  |  4 ++++
 Cargo.lock                                    | 22 +++++++++----------
 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 ++--
 .../standalone/upgrade/upgrade_selector.rs    |  2 +-
 framework/meta/src/version_history.rs         |  3 ++-
 framework/scenario/Cargo.toml                 |  6 ++---
 framework/snippets/Cargo.toml                 |  4 ++--
 framework/wasm-adapter/Cargo.toml             |  4 ++--
 tools/mxpy-snippet-generator/Cargo.toml       |  2 +-
 tools/rust-debugger/format-tests/Cargo.toml   |  4 ++--
 263 files changed, 392 insertions(+), 387 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cecffbabce..d3e4b1cb54 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,6 +26,10 @@ 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.45.1, codec 0.18.2] - 2023-11-24
+- Fixed sc-meta standalone install backwards compatibility.
+- Better hygiene in codec derive.
+
 ## [sc 0.45.0, vm 0.7.0, scenario-format 0.21.0, sdk 0.3.0] - 2023-11-24
 - Replicated VM 1.5 in the Rust VM. This includes support for:
 	- promises,
diff --git a/Cargo.lock b/Cargo.lock
index ea4c01435f..f865845761 100755
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1862,7 +1862,7 @@ checksum = "b59072fa0624b55ae5ae3fa6bfa91515bbeb4ac440214bc4a509e2c8806d6e9f"
 
 [[package]]
 name = "multiversx-price-aggregator-sc"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "arrayvec",
  "multiversx-sc",
@@ -1881,7 +1881,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "bitflags 1.3.2",
  "hashbrown 0.14.2",
@@ -1893,7 +1893,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -1902,7 +1902,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -1912,7 +1912,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -1923,7 +1923,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-meta"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "clap",
  "colored",
@@ -1948,14 +1948,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-scenario"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "base64 0.13.1",
  "bech32",
@@ -1981,7 +1981,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-snippets"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "base64 0.13.1",
  "env_logger",
@@ -1995,7 +1995,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -2026,7 +2026,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-wegld-swap-sc"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "multiversx-sc",
  "multiversx-sc-modules",
diff --git a/contracts/benchmarks/large-storage/Cargo.toml b/contracts/benchmarks/large-storage/Cargo.toml
index 45113cc89d..6b75e45656 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.45.0"
+version = "0.45.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.0"
+version = "0.45.1"
 path = "../../../framework/scenario"
diff --git a/contracts/benchmarks/large-storage/meta/Cargo.toml b/contracts/benchmarks/large-storage/meta/Cargo.toml
index a2615ea766..b03b66ea75 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.45.0"
+version = "0.45.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 4acb58bd95..9646a43cc5 100644
--- a/contracts/benchmarks/large-storage/wasm/Cargo.toml
+++ b/contracts/benchmarks/large-storage/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.45.0"
+version = "0.45.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 0360717475..ef3d247425 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.45.0"
+version = "0.45.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.0"
+version = "0.45.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 6e422e0c38..61cdfa8f88 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.45.0"
+version = "0.45.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.0"
+version = "0.45.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 82cc1fcaf1..790d8f5692 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.45.0"
+version = "0.45.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 ba1eab854e..b9717c7416 100644
--- a/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.45.0"
+version = "0.45.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 4d75412858..11eeb01fa0 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.45.0"
+version = "0.45.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.0"
+version = "0.45.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 edeb7350f0..b04da7c3df 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.45.0"
+version = "0.45.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 9f5fbcb184..962b7f6ca8 100644
--- a/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.45.0"
+version = "0.45.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 ef8cd0946d..9387ca1607 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.45.0"
+version = "0.45.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.0"
+version = "0.45.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 b94aca64fc..e2454aaa81 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.45.0"
+version = "0.45.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 39a5ab6516..224cdad279 100644
--- a/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.45.0"
+version = "0.45.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 232f127310..e6827a291b 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.45.0"
+version = "0.45.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.0"
+version = "0.45.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 5428f873a3..b0c4814cc0 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.45.0"
+version = "0.45.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 b70ea01530..238fe51254 100644
--- a/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.45.0"
+version = "0.45.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 4ee01e7c86..290564277f 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.45.0"
+version = "0.45.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.0"
+version = "0.45.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 8dd5acfa69..cb09e7f9d4 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.45.0"
+version = "0.45.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 95d2bea4f8..746bb853ab 100644
--- a/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.45.0"
+version = "0.45.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 a604fedd0e..8ebc933939 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.45.0"
+version = "0.45.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.0"
+version = "0.45.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 33debe3fd9..c49c477b38 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.45.0"
+version = "0.45.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 6a1205b351..757a17cbab 100644
--- a/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.45.0"
+version = "0.45.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 728fe87a1e..caebc904a3 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.45.0"
+version = "0.45.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.0"
+version = "0.45.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 fdf06577e8..e761451121 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.45.0"
+version = "0.45.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 9c8abf93f7..e2cf6366fb 100644
--- a/contracts/benchmarks/send-tx-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/send-tx-repeat/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.45.0"
+version = "0.45.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/str-repeat/Cargo.toml b/contracts/benchmarks/str-repeat/Cargo.toml
index f71c24e4db..82493c31f2 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.45.0"
+version = "0.45.1"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.0"
+version = "0.45.1"
 path = "../../../framework/scenario"
diff --git a/contracts/benchmarks/str-repeat/meta/Cargo.toml b/contracts/benchmarks/str-repeat/meta/Cargo.toml
index 2fd1872139..ac217c265e 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.45.0"
+version = "0.45.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 2dee85f354..44607c30c2 100644
--- a/contracts/benchmarks/str-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/str-repeat/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.45.0"
+version = "0.45.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/core/price-aggregator/Cargo.toml b/contracts/core/price-aggregator/Cargo.toml
index ce1a43448d..1622f19ad6 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.45.0"
+version = "0.45.1"
 authors = [
     "Claudiu-Marcel Bruda <claudiu.bruda@multiversx.com>",
     "MultiversX <contact@multiversx.com>",
@@ -19,15 +19,15 @@ edition = "2021"
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "0.45.0"
+version = "0.45.1"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.45.0"
+version = "0.45.1"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.0"
+version = "0.45.1"
 path = "../../../framework/scenario"
 
 [dependencies]
diff --git a/contracts/core/price-aggregator/meta/Cargo.toml b/contracts/core/price-aggregator/meta/Cargo.toml
index 8a6580f590..f8ffff8574 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.45.0"
+version = "0.45.1"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.45.0"
+version = "0.45.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 51f6f66d07..5df3869737 100644
--- a/contracts/core/price-aggregator/wasm/Cargo.toml
+++ b/contracts/core/price-aggregator/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.45.0"
+version = "0.45.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/core/wegld-swap/Cargo.toml b/contracts/core/wegld-swap/Cargo.toml
index ecb53b245e..e014098f66 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.45.0"
+version = "0.45.1"
 
 authors = [
     "Dorin Iancu <dorin.iancu@multiversx.com>",
@@ -20,13 +20,13 @@ edition = "2021"
 path = "src/wegld.rs"
 
 [dependencies.multiversx-sc]
-version = "0.45.0"
+version = "0.45.1"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.45.0"
+version = "0.45.1"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.0"
+version = "0.45.1"
 path = "../../../framework/scenario"
diff --git a/contracts/core/wegld-swap/meta/Cargo.toml b/contracts/core/wegld-swap/meta/Cargo.toml
index 3cd043f97b..3e74c5ff58 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.45.0"
+version = "0.45.1"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.45.0"
+version = "0.45.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 00f1d1c30e..bbe7d11e8b 100644
--- a/contracts/core/wegld-swap/wasm/Cargo.toml
+++ b/contracts/core/wegld-swap/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.45.0"
+version = "0.45.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/adder/Cargo.toml b/contracts/examples/adder/Cargo.toml
index 246e0eec44..86ddaacf1f 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.45.0"
+version = "0.45.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.0"
+version = "0.45.1"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/adder/interact/Cargo.toml b/contracts/examples/adder/interact/Cargo.toml
index 703ac63013..43a19c8b56 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.45.0"
+version = "0.45.1"
 path = "../../../../framework/snippets"
diff --git a/contracts/examples/adder/meta/Cargo.toml b/contracts/examples/adder/meta/Cargo.toml
index 8173715d30..a119436851 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.45.0"
+version = "0.45.1"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/examples/adder/wasm/Cargo.toml b/contracts/examples/adder/wasm/Cargo.toml
index b41451d7d4..ef2669d399 100644
--- a/contracts/examples/adder/wasm/Cargo.toml
+++ b/contracts/examples/adder/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.45.0"
+version = "0.45.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 a79732d941..36a964b152 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.45.0"
+version = "0.45.1"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.45.0"
+version = "0.45.1"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.0"
+version = "0.45.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 d04710d8b4..491b2fda90 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.45.0"
+version = "0.45.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 1ab0464579..b5d95b347d 100644
--- a/contracts/examples/bonding-curve-contract/wasm/Cargo.toml
+++ b/contracts/examples/bonding-curve-contract/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.45.0"
+version = "0.45.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/check-pause/Cargo.toml b/contracts/examples/check-pause/Cargo.toml
index 98e0dabdf3..949b152008 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.2"
 
 [dependencies.multiversx-sc]
-version = "0.45.0"
+version = "0.45.1"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.45.0"
+version = "0.45.1"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.0"
+version = "0.45.1"
 path = "../../../framework/scenario"
 
diff --git a/contracts/examples/check-pause/meta/Cargo.toml b/contracts/examples/check-pause/meta/Cargo.toml
index 85c25e7d60..aa7e6ae568 100644
--- a/contracts/examples/check-pause/meta/Cargo.toml
+++ b/contracts/examples/check-pause/meta/Cargo.toml
@@ -9,6 +9,6 @@ authors = ["Alin Cruceat <alin.cruceat@multiversx.com>"]
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.45.0"
+version = "0.45.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 d0422b18f1..1d3bf8256f 100644
--- a/contracts/examples/check-pause/wasm/Cargo.toml
+++ b/contracts/examples/check-pause/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.45.0"
+version = "0.45.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/crowdfunding-esdt/Cargo.toml b/contracts/examples/crowdfunding-esdt/Cargo.toml
index 22e8efa5e1..a64e5640b8 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.45.0"
+version = "0.45.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.0"
+version = "0.45.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 fe19c04798..d6de491036 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.45.0"
+version = "0.45.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 343396d29f..8dac512528 100644
--- a/contracts/examples/crowdfunding-esdt/wasm/Cargo.toml
+++ b/contracts/examples/crowdfunding-esdt/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.45.0"
+version = "0.45.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/crypto-bubbles/Cargo.toml b/contracts/examples/crypto-bubbles/Cargo.toml
index cc4251fbc0..c5a850ac8d 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.45.0"
+version = "0.45.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.0"
+version = "0.45.1"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/crypto-bubbles/meta/Cargo.toml b/contracts/examples/crypto-bubbles/meta/Cargo.toml
index 3d5961f8ec..70aa5e402b 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.45.0"
+version = "0.45.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 9151aba57e..876e1c6aa8 100644
--- a/contracts/examples/crypto-bubbles/wasm/Cargo.toml
+++ b/contracts/examples/crypto-bubbles/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.45.0"
+version = "0.45.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 20a023570c..952035d940 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.45.0"
+version = "0.45.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 cd9df56d7c..b9b0fd202f 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.45.0"
+version = "0.45.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 4a46dd9e60..d081d6fe77 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.45.0"
+version = "0.45.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.0"
+version = "0.45.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 c62639dcc4..84cef80eb3 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.45.0"
+version = "0.45.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 2e0d793ad8..79f1abb02e 100644
--- a/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.toml
+++ b/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.45.0"
+version = "0.45.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 572608c92a..d9a0ffa8f3 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.45.0"
+version = "0.45.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.0"
+version = "0.45.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 7f58179842..979540ee72 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.45.0"
+version = "0.45.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 1a56230350..825a01cc8b 100644
--- a/contracts/examples/crypto-kitties/kitty-genetic-alg/wasm/Cargo.toml
+++ b/contracts/examples/crypto-kitties/kitty-genetic-alg/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.45.0"
+version = "0.45.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 ad1edcf521..bd2476f14b 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.45.0"
+version = "0.45.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.0"
+version = "0.45.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 dd88ab234e..c5294fa06d 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.45.0"
+version = "0.45.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 a575e7faea..17dddfecc1 100644
--- a/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.toml
+++ b/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.45.0"
+version = "0.45.1"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/crypto-zombies/Cargo.toml b/contracts/examples/crypto-zombies/Cargo.toml
index b751df903e..e40aee5de8 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.45.0"
+version = "0.45.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.0"
+version = "0.45.1"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/crypto-zombies/meta/Cargo.toml b/contracts/examples/crypto-zombies/meta/Cargo.toml
index b090066dc2..50692919f0 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.45.0"
+version = "0.45.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 107f39b594..9f87ea2615 100644
--- a/contracts/examples/crypto-zombies/wasm/Cargo.toml
+++ b/contracts/examples/crypto-zombies/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.45.0"
+version = "0.45.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/digital-cash/Cargo.toml b/contracts/examples/digital-cash/Cargo.toml
index f81dd11db3..2fa46e4b68 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.45.0"
+version = "0.45.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.0"
+version = "0.45.1"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/digital-cash/meta/Cargo.toml b/contracts/examples/digital-cash/meta/Cargo.toml
index 3bd8135c0a..4443fd2ad1 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.45.0"
+version = "0.45.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 b8c2583b9b..94030b2413 100644
--- a/contracts/examples/digital-cash/wasm/Cargo.toml
+++ b/contracts/examples/digital-cash/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.45.0"
+version = "0.45.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/empty/Cargo.toml b/contracts/examples/empty/Cargo.toml
index 296884fe01..fc8dca2979 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.45.0"
+version = "0.45.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.0"
+version = "0.45.1"
 path = "../../../framework/scenario"
 
 [dev-dependencies]
diff --git a/contracts/examples/empty/meta/Cargo.toml b/contracts/examples/empty/meta/Cargo.toml
index 18b112a683..ef6c3175a1 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.45.0"
+version = "0.45.1"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/examples/empty/wasm/Cargo.toml b/contracts/examples/empty/wasm/Cargo.toml
index a4065fe8b9..7e7e98b268 100644
--- a/contracts/examples/empty/wasm/Cargo.toml
+++ b/contracts/examples/empty/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.45.0"
+version = "0.45.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 d5aaa730b8..89331f0bd0 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.45.0"
+version = "0.45.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.0"
+version = "0.45.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 cc250d645e..aec0c60a06 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.45.0"
+version = "0.45.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 4afaf50232..c4a21abb67 100644
--- a/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.toml
+++ b/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.45.0"
+version = "0.45.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/factorial/Cargo.toml b/contracts/examples/factorial/Cargo.toml
index 14d856071c..806d802663 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.45.0"
+version = "0.45.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.0"
+version = "0.45.1"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/factorial/meta/Cargo.toml b/contracts/examples/factorial/meta/Cargo.toml
index 0c6d5b85e0..b1f2c260ce 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.45.0"
+version = "0.45.1"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/examples/factorial/wasm/Cargo.toml b/contracts/examples/factorial/wasm/Cargo.toml
index 216f51d7d7..1558fa5b4b 100644
--- a/contracts/examples/factorial/wasm/Cargo.toml
+++ b/contracts/examples/factorial/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.45.0"
+version = "0.45.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/fractional-nfts/Cargo.toml b/contracts/examples/fractional-nfts/Cargo.toml
index bd5b674aff..2d22fa6c03 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.45.0"
+version = "0.45.1"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.45.0"
+version = "0.45.1"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.0"
+version = "0.45.1"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/fractional-nfts/meta/Cargo.toml b/contracts/examples/fractional-nfts/meta/Cargo.toml
index 399588cf5b..fa1ca764c6 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.45.0"
+version = "0.45.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 1c2b4221fe..546c47a103 100644
--- a/contracts/examples/fractional-nfts/wasm/Cargo.toml
+++ b/contracts/examples/fractional-nfts/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.45.0"
+version = "0.45.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/lottery-esdt/Cargo.toml b/contracts/examples/lottery-esdt/Cargo.toml
index 2df5826319..8d2f68a1eb 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.45.0"
+version = "0.45.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.0"
+version = "0.45.1"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/lottery-esdt/meta/Cargo.toml b/contracts/examples/lottery-esdt/meta/Cargo.toml
index a8b0b18a3f..415553109c 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.45.0"
+version = "0.45.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 5793e22cbe..9ae4de7870 100644
--- a/contracts/examples/lottery-esdt/wasm/Cargo.toml
+++ b/contracts/examples/lottery-esdt/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.45.0"
+version = "0.45.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/multisig/Cargo.toml b/contracts/examples/multisig/Cargo.toml
index 6ddaec9cf0..049d63fbbe 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.45.0"
+version = "0.45.1"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.45.0"
+version = "0.45.1"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.0"
+version = "0.45.1"
 path = "../../../framework/scenario"
 
 [dev-dependencies.adder]
@@ -27,7 +27,7 @@ path = "../adder"
 path = "../factorial"
 
 [dev-dependencies.multiversx-wegld-swap-sc]
-version = "0.45.0"
+version = "0.45.1"
 path = "../../core/wegld-swap"
 
 [dev-dependencies]
diff --git a/contracts/examples/multisig/interact/Cargo.toml b/contracts/examples/multisig/interact/Cargo.toml
index cf37efd3e6..49f2e7ec63 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.45.0"
+version = "0.45.1"
 path = "../../../../contracts/modules"
 
 [dependencies.multiversx-sc-snippets]
-version = "0.45.0"
+version = "0.45.1"
 path = "../../../../framework/snippets"
 
 [dependencies.multiversx-sc-scenario]
-version = "=0.45.0"
+version = "=0.45.1"
 path = "../../../../framework/scenario"
diff --git a/contracts/examples/multisig/meta/Cargo.toml b/contracts/examples/multisig/meta/Cargo.toml
index b923d8bece..97f8ba3c56 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.45.0"
+version = "0.45.1"
 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 f46d0bf4ab..c37ff0c068 100644
--- a/contracts/examples/multisig/wasm-multisig-full/Cargo.toml
+++ b/contracts/examples/multisig/wasm-multisig-full/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.45.0"
+version = "0.45.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 6ebc48642e..070480fcfb 100644
--- a/contracts/examples/multisig/wasm-multisig-view/Cargo.toml
+++ b/contracts/examples/multisig/wasm-multisig-view/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.45.0"
+version = "0.45.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/multisig/wasm/Cargo.toml b/contracts/examples/multisig/wasm/Cargo.toml
index dc4bd6b92d..bc6e0ff71b 100644
--- a/contracts/examples/multisig/wasm/Cargo.toml
+++ b/contracts/examples/multisig/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.45.0"
+version = "0.45.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/nft-minter/Cargo.toml b/contracts/examples/nft-minter/Cargo.toml
index 98d5f76b10..8ca07a1dca 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.45.0"
+version = "0.45.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.0"
+version = "0.45.1"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/nft-minter/meta/Cargo.toml b/contracts/examples/nft-minter/meta/Cargo.toml
index 4295de3686..fdf3e608fe 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.45.0"
+version = "0.45.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 5198487f35..5c2addf1cb 100644
--- a/contracts/examples/nft-minter/wasm/Cargo.toml
+++ b/contracts/examples/nft-minter/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.45.0"
+version = "0.45.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 cf1c492bd6..2f94507f73 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.45.0"
+version = "0.45.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.0"
+version = "0.45.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 534932ef67..e460258715 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.45.0"
+version = "0.45.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 a32fd404c5..60ff271f59 100644
--- a/contracts/examples/nft-storage-prepay/wasm/Cargo.toml
+++ b/contracts/examples/nft-storage-prepay/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.45.0"
+version = "0.45.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/nft-subscription/Cargo.toml b/contracts/examples/nft-subscription/Cargo.toml
index ec0cac0615..71c29fb9a6 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.45.0"
+version = "0.45.1"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.45.0"
+version = "0.45.1"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.0"
+version = "0.45.1"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/nft-subscription/meta/Cargo.toml b/contracts/examples/nft-subscription/meta/Cargo.toml
index 4016b9cc86..1273128dc6 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.45.0"
+version = "0.45.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 d28eded9c7..b20f15dd14 100644
--- a/contracts/examples/nft-subscription/wasm/Cargo.toml
+++ b/contracts/examples/nft-subscription/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.45.0"
+version = "0.45.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 07201f9c7c..94fc6b3a2b 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.45.0"
+version = "0.45.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.0"
+version = "0.45.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 38b707a293..f14ebabf6d 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.45.0"
+version = "0.45.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 d6ccc18244..8a1cee0396 100644
--- a/contracts/examples/order-book/factory/wasm/Cargo.toml
+++ b/contracts/examples/order-book/factory/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.45.0"
+version = "0.45.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 cca4ea0509..7306324c72 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.45.0"
+version = "0.45.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.0"
+version = "0.45.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 1d1d9004b1..12b0529386 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.45.0"
+version = "0.45.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 30622ed8a9..02d6648340 100644
--- a/contracts/examples/order-book/pair/wasm/Cargo.toml
+++ b/contracts/examples/order-book/pair/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.45.0"
+version = "0.45.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 57bdd120e9..68ba97776f 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.45.0"
+version = "0.45.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.0"
+version = "0.45.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 397e445ec5..965739c7ef 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.45.0"
+version = "0.45.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 4c8605e902..a80cb8866d 100644
--- a/contracts/examples/ping-pong-egld/wasm/Cargo.toml
+++ b/contracts/examples/ping-pong-egld/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.45.0"
+version = "0.45.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/proxy-pause/Cargo.toml b/contracts/examples/proxy-pause/Cargo.toml
index 60434b3125..de71a09c0e 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.45.0"
+version = "0.45.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.0"
+version = "0.45.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 8097d60e2b..84250adaab 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.45.0"
+version = "0.45.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 2dd42f0417..ee95ab1d4e 100644
--- a/contracts/examples/proxy-pause/wasm/Cargo.toml
+++ b/contracts/examples/proxy-pause/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.45.0"
+version = "0.45.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/rewards-distribution/Cargo.toml b/contracts/examples/rewards-distribution/Cargo.toml
index fc3bd1cbe2..5ca84b36b1 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.45.0"
+version = "0.45.1"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.45.0"
+version = "0.45.1"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.0"
+version = "0.45.1"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/rewards-distribution/meta/Cargo.toml b/contracts/examples/rewards-distribution/meta/Cargo.toml
index defaa7e718..2a90587b28 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 <claudiu.bruda@multiversx.com>"]
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.45.0"
+version = "0.45.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 7680d9254a..b5c85a65a3 100644
--- a/contracts/examples/rewards-distribution/wasm/Cargo.toml
+++ b/contracts/examples/rewards-distribution/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.45.0"
+version = "0.45.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 c68e4afb14..8153fb29e2 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.45.0"
+version = "0.45.1"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.45.0"
+version = "0.45.1"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.0"
+version = "0.45.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 3c1d143e86..160410604e 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 <claudiu.bruda@multiversx.com>"]
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.45.0"
+version = "0.45.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 998375919f..bd7dbdc996 100644
--- a/contracts/examples/seed-nft-minter/wasm/Cargo.toml
+++ b/contracts/examples/seed-nft-minter/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.45.0"
+version = "0.45.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/token-release/Cargo.toml b/contracts/examples/token-release/Cargo.toml
index f808e09f15..7b26030ec5 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.45.0"
+version = "0.45.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.0"
+version = "0.45.1"
 path = "../../../framework/scenario"
 
diff --git a/contracts/examples/token-release/meta/Cargo.toml b/contracts/examples/token-release/meta/Cargo.toml
index e16be1dd0e..0320ccabf2 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.45.0"
+version = "0.45.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 febd248835..48d4c968eb 100644
--- a/contracts/examples/token-release/wasm/Cargo.toml
+++ b/contracts/examples/token-release/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.45.0"
+version = "0.45.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 de05ce2a24..2b10d30712 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.45.0"
+version = "0.45.1"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.0"
+version = "0.45.1"
 path = "../../../framework/scenario"
 
 [dev-dependencies.multiversx-sc-meta]
-version = "0.45.0"
+version = "0.45.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 3bcabf5ab8..321b4091b4 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.45.0"
+            "version": "0.45.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 60584c4254..c13d6c7d07 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.45.0"
+            "version": "0.45.1"
         }
     },
     "docs": [
diff --git a/contracts/feature-tests/abi-tester/meta/Cargo.toml b/contracts/feature-tests/abi-tester/meta/Cargo.toml
index 92846aecc5..3d0d82ffa3 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.45.0"
+version = "0.45.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 9a8fc56c10..29c1c18f9d 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
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.45.0"
+version = "0.45.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 0e678d8524..606de879e3 100644
--- a/contracts/feature-tests/abi-tester/wasm/Cargo.toml
+++ b/contracts/feature-tests/abi-tester/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.45.0"
+version = "0.45.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 adcf61f847..db968dd312 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.45.0"
+version = "0.45.1"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.0"
+version = "0.45.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 98cf5bacd4..c2e5d979ba 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.45.0"
+version = "0.45.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 1fac094754..1f3362d017 100644
--- a/contracts/feature-tests/alloc-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/alloc-features/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.45.0"
+version = "0.45.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 e36563b199..341b0e656f 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.45.0"
+version = "0.45.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.0"
+version = "0.45.1"
 path = "../../../framework/scenario"
 
 [dependencies.multiversx-sc-modules]
-version = "0.45.0"
+version = "0.45.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 b5d156b70d..7b731f1e14 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.45.0"
+version = "0.45.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 799e99de70..6ab0e1702d 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.45.0"
+version = "0.45.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 78382de4ab..6a7bc102f0 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
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.45.0"
+version = "0.45.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 8088bb970a..fb5035216a 100644
--- a/contracts/feature-tests/basic-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/basic-features/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.45.0"
+version = "0.45.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 29c88ee8c1..f218062b53 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.45.0"
+version = "0.45.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.0"
+version = "0.45.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 ccc6ef2309..c2dd8c2577 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.45.0"
+version = "0.45.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 8fc99f50d7..8f09b6e0ce 100644
--- a/contracts/feature-tests/big-float-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/big-float-features/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.45.0"
+version = "0.45.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/Cargo.toml b/contracts/feature-tests/composability/Cargo.toml
index 37c6836827..925187f480 100644
--- a/contracts/feature-tests/composability/Cargo.toml
+++ b/contracts/feature-tests/composability/Cargo.toml
@@ -33,10 +33,10 @@ path = "recursive-caller"
 path = "vault"
 
 [dependencies.multiversx-sc]
-version = "0.45.0"
+version = "0.45.1"
 path = "../../../framework/base"
 features = ["promises", "back-transfers"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.0"
+version = "0.45.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 f5d4196ed7..829cb90272 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.45.0"
+version = "0.45.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.0"
+version = "0.45.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 c4dccfcd2e..412cb7acd0 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.45.0"
+version = "0.45.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 cdf2e6c7f4..2a6b6935ef 100644
--- a/contracts/feature-tests/composability/builtin-func-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/builtin-func-features/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.45.0"
+version = "0.45.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 bdd65883ba..84c46a6cd4 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.45.0"
+version = "0.45.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.0"
+version = "0.45.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 30e06ff33d..8995810ceb 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.45.0"
+version = "0.45.1"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.0"
+version = "0.45.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 a5965c888f..9198c7a296 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.45.0"
+version = "0.45.1"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.45.0"
+version = "0.45.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 06f6307482..a16d77a499 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
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.45.0"
+version = "0.45.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 60d6b5c578..6853bff05c 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.45.0"
+version = "0.45.1"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.0"
+version = "0.45.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 1ebf897295..0ab51cf72c 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.45.0"
+version = "0.45.1"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.45.0"
+version = "0.45.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 dcde50f2f8..e7f71104a5 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
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.45.0"
+version = "0.45.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 0bc42d2035..6451528fd2 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.45.0"
+version = "0.45.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.0"
+version = "0.45.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 9932d6be85..6f933b6250 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.45.0"
+version = "0.45.1"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.0"
+version = "0.45.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 fd31a54f11..c78646dd03 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.45.0"
+version = "0.45.1"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.45.0"
+version = "0.45.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 963e768de6..ff5e6fff78 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
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.45.0"
+version = "0.45.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 0a2d025fde..d38d0b0779 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.45.0"
+version = "0.45.1"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.0"
+version = "0.45.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 d74273ed55..785d4ac8ff 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.45.0"
+version = "0.45.1"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.45.0"
+version = "0.45.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 09642993e1..27c78fd060 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
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.45.0"
+version = "0.45.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 d3cbdc4b34..90c5b3e4f6 100644
--- a/contracts/feature-tests/composability/forwarder-queue/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-queue/Cargo.toml
@@ -15,14 +15,14 @@ promises = ["multiversx-sc/promises"]
 path = "../vault"
 
 [dependencies.multiversx-sc]
-version = "0.45.0"
+version = "0.45.1"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.45.0"
+version = "0.45.1"
 path = "../../../../framework/wasm-adapter"
 optional = true
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.0"
+version = "0.45.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 fde69e5038..25a35818d5 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.45.0"
+version = "0.45.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 f48c603bde..479d11ca70 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 @@ path = ".."
 features = ["promises"]
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.45.0"
+version = "0.45.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 203f4cf118..e3444842a8 100644
--- a/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.45.0"
+version = "0.45.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 fa8b49f3bd..2c1af762c9 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.45.0"
+version = "0.45.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.0"
+version = "0.45.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 d05698aa5e..b7d84785dd 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.45.0"
+version = "0.45.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 0467316b0b..b3451dbbae 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
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.45.0"
+version = "0.45.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 ee924036ea..e62fb7097b 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
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.45.0"
+version = "0.45.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 88dafe71c1..0c89f04ef7 100644
--- a/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.45.0"
+version = "0.45.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 0b22a89320..04745f6470 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.45.0"
+version = "0.45.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.0"
+version = "0.45.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 e3d17000b6..c02beb2026 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.45.0"
+version = "0.45.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 85e63edb02..433323f4f9 100644
--- a/contracts/feature-tests/composability/forwarder/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.45.0"
+version = "0.45.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 609a17e5fd..9a01ea2796 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.45.0"
+version = "0.45.1"
 path = "../../../../contracts/modules"
 
 [dependencies.multiversx-sc-snippets]
-version = "0.45.0"
+version = "0.45.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 c4c64476ea..990b687d2f 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.45.0"
+version = "0.45.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.0"
+version = "0.45.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 a4452cf49b..9e42039629 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.45.0"
+version = "0.45.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 6aa822239b..8cec0fec55 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
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.45.0"
+version = "0.45.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 d5ce07c9bb..2bb960bb81 100644
--- a/contracts/feature-tests/composability/promises-features/Cargo.toml
+++ b/contracts/feature-tests/composability/promises-features/Cargo.toml
@@ -12,7 +12,7 @@ path = "src/promises_main.rs"
 path = "../vault"
 
 [dependencies.multiversx-sc]
-version = "0.45.0"
+version = "0.45.1"
 path = "../../../../framework/base"
 features = ["promises", "back-transfers"]
 
diff --git a/contracts/feature-tests/composability/promises-features/meta/Cargo.toml b/contracts/feature-tests/composability/promises-features/meta/Cargo.toml
index 1c25ce5141..476d07c9d0 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.45.0"
+version = "0.45.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 fa603bf497..8a7bcdd8ff 100644
--- a/contracts/feature-tests/composability/promises-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/promises-features/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.45.0"
+version = "0.45.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 fbc3a0744f..31f4092767 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.45.0"
+version = "0.45.1"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.0"
+version = "0.45.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 bec70cfe59..9141ffc729 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.45.0"
+version = "0.45.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 b800e96890..5195b3fb17 100644
--- a/contracts/feature-tests/composability/proxy-test-first/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/proxy-test-first/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.45.0"
+version = "0.45.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 6b5d7cf995..f9c1d0ae1a 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.45.0"
+version = "0.45.1"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.0"
+version = "0.45.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 2a8fcb08b6..e48ef1b899 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.45.0"
+version = "0.45.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 714316fe0a..f9fbed954c 100644
--- a/contracts/feature-tests/composability/proxy-test-second/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/proxy-test-second/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.45.0"
+version = "0.45.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 68d62a7a44..189665f4c7 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.45.0"
+version = "0.45.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.0"
+version = "0.45.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 5fc3591b5a..f106df9c92 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.45.0"
+version = "0.45.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 167158fe18..dd2116c95b 100644
--- a/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.45.0"
+version = "0.45.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 95afa27a80..0a4c7f6612 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.45.0"
+version = "0.45.1"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.45.0"
+version = "0.45.1"
 path = "../../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.0"
+version = "0.45.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 a46ec28484..7dc4c8e881 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.45.0"
+version = "0.45.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 ed27812367..ed0af30bf8 100644
--- a/contracts/feature-tests/composability/transfer-role-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/transfer-role-features/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.45.0"
+version = "0.45.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 4225f623c4..d91b3f97e2 100644
--- a/contracts/feature-tests/composability/vault/Cargo.toml
+++ b/contracts/feature-tests/composability/vault/Cargo.toml
@@ -10,10 +10,10 @@ path = "src/vault.rs"
 
 
 [dependencies.multiversx-sc]
-version = "0.45.0"
+version = "0.45.1"
 path = "../../../../framework/base"
 features = ["promises"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.0"
+version = "0.45.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 d4b43b306a..c540e98be3 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.45.0"
+version = "0.45.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 81cf92de8f..d5fea1493a 100644
--- a/contracts/feature-tests/composability/vault/wasm-vault-promises/Cargo.toml
+++ b/contracts/feature-tests/composability/vault/wasm-vault-promises/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.45.0"
+version = "0.45.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 2cad224c7b..6af3f6fe9b 100644
--- a/contracts/feature-tests/composability/vault/wasm-vault-upgrade/Cargo.toml
+++ b/contracts/feature-tests/composability/vault/wasm-vault-upgrade/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.45.0"
+version = "0.45.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 778f9cb325..1ffc150d0c 100644
--- a/contracts/feature-tests/composability/vault/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/vault/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.45.0"
+version = "0.45.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 2352483d8a..b9d36e8125 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.45.0"
+version = "0.45.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.0"
+version = "0.45.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 b6fd4a9bae..0c6e3cca16 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.45.0"
+version = "0.45.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 e7dbaef76c..636bb9ee44 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
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.45.0"
+version = "0.45.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 c7268af735..2f010d140e 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.45.0"
+version = "0.45.1"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.0"
+version = "0.45.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 0f33b4b211..ecb0cea3da 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.45.0"
+version = "0.45.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 75fc913f74..b65cb0ab68 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
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.45.0"
+version = "0.45.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 42db638f68..ef00813f83 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.45.0"
+version = "0.45.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.0"
+version = "0.45.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 f5f3267328..8813f92d39 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.45.0"
+version = "0.45.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 6958310dbe..75ee151a1c 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
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.45.0"
+version = "0.45.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 db17644f2c..3083198a27 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.45.0"
+version = "0.45.1"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.0"
+version = "0.45.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 f0cb744375..b68393fa46 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.45.0"
+version = "0.45.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 c019ee4f53..9364a33e99 100644
--- a/contracts/feature-tests/erc-style-contracts/erc1155/wasm/Cargo.toml
+++ b/contracts/feature-tests/erc-style-contracts/erc1155/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.45.0"
+version = "0.45.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 d4cbaeae62..db52e2e801 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.45.0"
+version = "0.45.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.0"
+version = "0.45.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 036082ac0a..3cb820d3a2 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.45.0"
+version = "0.45.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 feaa6bf45c..2ed66d4cf2 100644
--- a/contracts/feature-tests/erc-style-contracts/erc20/wasm/Cargo.toml
+++ b/contracts/feature-tests/erc-style-contracts/erc20/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.45.0"
+version = "0.45.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 2a9ac78a21..215db619c4 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.45.0"
+version = "0.45.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.0"
+version = "0.45.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 0523d309dc..14b07b1f49 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.45.0"
+version = "0.45.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 ea944f1672..369fba44a2 100644
--- a/contracts/feature-tests/erc-style-contracts/erc721/wasm/Cargo.toml
+++ b/contracts/feature-tests/erc-style-contracts/erc721/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.45.0"
+version = "0.45.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 4d5d9204a9..81218e46db 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.45.0"
+version = "0.45.1"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.0"
+version = "0.45.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 c643954ce7..c0f856c47c 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.45.0"
+version = "0.45.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 0526192b8a..74bbacee39 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
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.45.0"
+version = "0.45.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 78901eb27d..43b9031e62 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.45.0"
+version = "0.45.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.0"
+version = "0.45.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 1cae497de4..6a08727d39 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.45.0"
+version = "0.45.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 d089d0ae83..7b9722647c 100644
--- a/contracts/feature-tests/esdt-system-sc-mock/wasm/Cargo.toml
+++ b/contracts/feature-tests/esdt-system-sc-mock/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.45.0"
+version = "0.45.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 2fad9f67b0..fab7395462 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.45.0"
+version = "0.45.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.0"
+version = "0.45.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 ec97db718a..ceb6059a77 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.45.0"
+version = "0.45.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 f7cd22ecb2..81f101b3a8 100644
--- a/contracts/feature-tests/formatted-message-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/formatted-message-features/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.45.0"
+version = "0.45.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 134e3376e3..67a0f4a0ce 100644
--- a/contracts/feature-tests/managed-map-features/Cargo.toml
+++ b/contracts/feature-tests/managed-map-features/Cargo.toml
@@ -8,13 +8,13 @@ publish = false
 [lib]
 path = "src/mmap_features.rs"
 [dependencies.multiversx-sc]
-version = "0.45.0"
+version = "0.45.1"
 path = "../../../framework/base"
 
 features = ["managed-map"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.0"
+version = "0.45.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 5672341314..71e3d5ab5e 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.45.0"
+version = "0.45.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 01026ed8ed..fbbf981040 100644
--- a/contracts/feature-tests/managed-map-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/managed-map-features/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.45.0"
+version = "0.45.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 f797c4de53..368fee9bd7 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.45.0"
+version = "0.45.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.0"
+version = "0.45.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 d50c77cf64..4c3f700741 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.45.0"
+version = "0.45.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 c2aea2e6e2..a98eb7e15a 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
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.45.0"
+version = "0.45.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 8f9898a268..1260271c36 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
@@ -25,7 +25,7 @@ path = ".."
 features = ["example_feature"]
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.45.0"
+version = "0.45.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 09394fd11e..2e0a978910 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
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.45.0"
+version = "0.45.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 851e4477dd..08a6e6f793 100644
--- a/contracts/feature-tests/multi-contract-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/multi-contract-features/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.45.0"
+version = "0.45.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 7665e9d6bd..a35b828f67 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.45.0"
+version = "0.45.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.0"
+version = "0.45.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 2ab7bc227a..5499fd074c 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.45.0"
+version = "0.45.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 8f389e3cf3..e92045c1c8 100644
--- a/contracts/feature-tests/panic-message-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/panic-message-features/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.45.0"
+version = "0.45.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 f2f08f0f03..35385978fd 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.45.0"
+version = "0.45.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.0"
+version = "0.45.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 69efe48582..b7ded9bd6d 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.45.0"
+version = "0.45.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 0dfedc56a1..527a928391 100644
--- a/contracts/feature-tests/payable-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/payable-features/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.45.0"
+version = "0.45.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 fed0091490..3b0621599e 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.45.0"
+version = "0.45.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.0"
+version = "0.45.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 8415fb2a5b..7ce2127a77 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.45.0"
+version = "0.45.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 76a1692ddc..a16b366ab8 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.45.0"
+version = "0.45.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 efd9775ba1..c25cfe0088 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.45.0"
+// version = "0.45.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 a12604aa4e..ffe20412e5 100644
--- a/contracts/feature-tests/rust-snippets-generator-test/wasm/Cargo.toml
+++ b/contracts/feature-tests/rust-snippets-generator-test/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.45.0"
+version = "0.45.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 bbf1288dfc..20d2a1c444 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.45.0"
+version = "0.45.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.45.0"
+version = "0.45.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 aabb7f53a6..d87adf1402 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.45.0"
+version = "0.45.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 6dce1fc054..9f871bf4f3 100644
--- a/contracts/feature-tests/rust-testing-framework-tester/wasm/Cargo.toml
+++ b/contracts/feature-tests/rust-testing-framework-tester/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.45.0"
+version = "0.45.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 035e572e7c..a2e7377719 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.45.0"
+version = "0.45.1"
 path = "../../../contracts/modules"
 
 [dependencies.multiversx-sc]
-version = "0.45.0"
+version = "0.45.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.0"
+version = "0.45.1"
 path = "../../../framework/scenario"
 
 [dev-dependencies.multiversx-sc-meta]
-version = "0.45.0"
+version = "0.45.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 0d7cf6d649..ade7357238 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.45.0"
+version = "0.45.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 60f245502e..6e7af7af50 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.45.0"
+version = "0.45.1"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.45.0"
+version = "0.45.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 89aa802177..dcd1cc623f 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.45.0"
+            "version": "0.45.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 56dfad5e84..f59784cb20 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.45.0"
+            "version": "0.45.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 c5b2e34d00..eca878c53d 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
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.45.0"
+version = "0.45.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 b98c67f9b4..30239b22e0 100644
--- a/contracts/feature-tests/use-module/wasm/Cargo.toml
+++ b/contracts/feature-tests/use-module/wasm/Cargo.toml
@@ -24,7 +24,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.45.0"
+version = "0.45.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/modules/Cargo.toml b/contracts/modules/Cargo.toml
index 6cd4a5dceb..11bdb99e7a 100644
--- a/contracts/modules/Cargo.toml
+++ b/contracts/modules/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-modules"
-version = "0.45.0"
+version = "0.45.1"
 edition = "2021"
 
 authors = ["MultiversX <contact@multiversx.com>"]
@@ -17,5 +17,5 @@ categories = ["no-std", "wasm", "cryptography::cryptocurrencies"]
 alloc = ["multiversx-sc/alloc"]
 
 [dependencies.multiversx-sc]
-version = "0.45.0"
+version = "0.45.1"
 path = "../../framework/base"
diff --git a/data/codec-derive/Cargo.toml b/data/codec-derive/Cargo.toml
index 1d0c2c6591..4401637ee9 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.1"
+version = "0.18.2"
 edition = "2021"
 
 authors = ["dorin.iancu <dorin.iancu@multiversx.com>", "Andrei Marinica <andrei.marinica@multiversx.com>", "MultiversX <contact@multiversx.com>"]
diff --git a/data/codec/Cargo.toml b/data/codec/Cargo.toml
index e834e76b5e..fe252c81da 100644
--- a/data/codec/Cargo.toml
+++ b/data/codec/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-codec"
-version = "0.18.1"
+version = "0.18.2"
 edition = "2021"
 
 authors = ["Andrei Marinica <andrei.marinica@multiversx.com>", "MultiversX <contact@multiversx.com>"]
@@ -19,7 +19,7 @@ alloc = []
 
 [dependencies.multiversx-sc-codec-derive]
 path = "../codec-derive"
-version = "=0.18.1"
+version = "=0.18.2"
 optional = true
 
 [dependencies]
@@ -28,4 +28,4 @@ num-bigint = { version = "0.4.2", optional = true } # can only be used in std co
 
 [dev-dependencies.multiversx-sc-codec-derive]
 path = "../codec-derive"
-version = "=0.18.1"
+version = "=0.18.2"
diff --git a/framework/base/Cargo.toml b/framework/base/Cargo.toml
index 07056d4b06..561de474b3 100644
--- a/framework/base/Cargo.toml
+++ b/framework/base/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc"
-version = "0.45.0"
+version = "0.45.1"
 edition = "2021"
 
 authors = ["Andrei Marinica <andrei.marinica@multiversx.com>", "MultiversX <contact@multiversx.com>"]
@@ -31,10 +31,10 @@ bitflags = "1.3.2"
 num-traits = { version = "0.2", default-features = false }
 
 [dependencies.multiversx-sc-derive]
-version = "=0.45.0"
+version = "=0.45.1"
 path = "../derive"
 
 [dependencies.multiversx-sc-codec]
-version = "=0.18.1"
+version = "=0.18.2"
 path = "../../data/codec"
 features = ["derive"]
diff --git a/framework/derive/Cargo.toml b/framework/derive/Cargo.toml
index af118e3777..a16254e975 100644
--- a/framework/derive/Cargo.toml
+++ b/framework/derive/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-derive"
-version = "0.45.0"
+version = "0.45.1"
 edition = "2021"
 
 authors = ["Andrei Marinica <andrei.marinica@multiversx.com>", "MultiversX <contact@multiversx.com>"]
diff --git a/framework/meta/Cargo.toml b/framework/meta/Cargo.toml
index a0e7a47c95..651aabbb16 100644
--- a/framework/meta/Cargo.toml
+++ b/framework/meta/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-meta"
-version = "0.45.0"
+version = "0.45.1"
 edition = "2021"
 
 authors = [
@@ -51,7 +51,7 @@ pathdiff = { version = "0.2.1", optional = true }
 common-path = { version = "1.0.0", optional = true }
 
 [dependencies.multiversx-sc]
-version = "=0.45.0"
+version = "=0.45.1"
 path = "../base"
 features = ["alloc", "num-bigint", "promises"]
 
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 9098b46145..f527cc5ae9 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.45.0"
+version = "0.45.1"
 
 # [workspace]
 
diff --git a/framework/meta/src/cmd/contract/meta_config.rs b/framework/meta/src/cmd/contract/meta_config.rs
index 650daece25..e5beeac415 100644
--- a/framework/meta/src/cmd/contract/meta_config.rs
+++ b/framework/meta/src/cmd/contract/meta_config.rs
@@ -204,7 +204,7 @@ panic = \"abort\"
 path = \"..\"
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = \"0.45.0\"
+version = \"0.45.1\"
 path = \"../../../../framework/wasm-adapter\"
 
 [workspace]
@@ -217,7 +217,7 @@ members = [\".\"]
             name: "test".to_string(),
             edition: "2021".to_string(),
             profile: ContractVariantProfile::default(),
-            framework_version: "0.45.0".to_string(),
+            framework_version: "0.45.1".to_string(),
             framework_path: Option::Some("../../../framework/base".to_string()),
             contract_features: Vec::<String>::new(),
         };
diff --git a/framework/meta/src/cmd/standalone/upgrade/upgrade_selector.rs b/framework/meta/src/cmd/standalone/upgrade/upgrade_selector.rs
index 1d131807ea..997469c713 100644
--- a/framework/meta/src/cmd/standalone/upgrade/upgrade_selector.rs
+++ b/framework/meta/src/cmd/standalone/upgrade/upgrade_selector.rs
@@ -91,7 +91,7 @@ fn upgrade_post_processing(dir: &RelevantDirectory) {
         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.0")) => {
+        | Some((_, "0.42.0")) | Some((_, "0.43.0")) | Some((_, "0.44.0")) | Some((_, "0.45.1")) => {
             print_post_processing(dir);
             cargo_check(dir);
         },
diff --git a/framework/meta/src/version_history.rs b/framework/meta/src/version_history.rs
index 9bd280748e..16105463b7 100644
--- a/framework/meta/src/version_history.rs
+++ b/framework/meta/src/version_history.rs
@@ -1,7 +1,7 @@
 /// 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.0";
+pub const LAST_VERSION: &str = "0.45.1";
 
 /// Indicates where to stop with the upgrades.
 pub const LAST_UPGRADE_VERSION: &str = LAST_VERSION;
@@ -52,6 +52,7 @@ pub const VERSIONS: &[&str] = &[
     "0.43.5",
     "0.44.0",
     "0.45.0",
+    "0.45.1",
 ];
 
 /// We started supporting contract templates with version 0.43.0.
diff --git a/framework/scenario/Cargo.toml b/framework/scenario/Cargo.toml
index 931d126179..43593cd420 100644
--- a/framework/scenario/Cargo.toml
+++ b/framework/scenario/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-scenario"
-version = "0.45.0"
+version = "0.45.1"
 edition = "2021"
 
 authors = [
@@ -40,12 +40,12 @@ path = "src/main.rs"
 run-go-tests = []
 
 [dependencies.multiversx-sc]
-version = "=0.45.0"
+version = "=0.45.1"
 features = ["alloc", "num-bigint"]
 path = "../base"
 
 [dependencies.multiversx-sc-meta]
-version = "=0.45.0"
+version = "=0.45.1"
 path = "../meta"
 
 [dependencies.multiversx-chain-scenario-format]
diff --git a/framework/snippets/Cargo.toml b/framework/snippets/Cargo.toml
index 0f2c80d9ba..c3cb7ef7e2 100644
--- a/framework/snippets/Cargo.toml
+++ b/framework/snippets/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-snippets"
-version = "0.45.0"
+version = "0.45.1"
 edition = "2021"
 
 authors = ["MultiversX <contact@multiversx.com>"]
@@ -22,7 +22,7 @@ env_logger = "0.10"
 futures = "0.3"
 
 [dependencies.multiversx-sc-scenario]
-version = "=0.45.0"
+version = "=0.45.1"
 path = "../scenario"
 
 [dependencies.multiversx-sdk]
diff --git a/framework/wasm-adapter/Cargo.toml b/framework/wasm-adapter/Cargo.toml
index a497e29b80..fd83f9fdaa 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.45.0"
+version = "0.45.1"
 edition = "2021"
 
 authors = [
@@ -22,5 +22,5 @@ categories = [
 ]
 
 [dependencies.multiversx-sc]
-version = "=0.45.0"
+version = "=0.45.1"
 path = "../base"
diff --git a/tools/mxpy-snippet-generator/Cargo.toml b/tools/mxpy-snippet-generator/Cargo.toml
index 5bc94d5d3e..5b30bd61d0 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.45.0"
+version = "0.45.1"
 path = "../../framework/base"
 
 [dependencies]
diff --git a/tools/rust-debugger/format-tests/Cargo.toml b/tools/rust-debugger/format-tests/Cargo.toml
index aea6d00073..906f64bb06 100644
--- a/tools/rust-debugger/format-tests/Cargo.toml
+++ b/tools/rust-debugger/format-tests/Cargo.toml
@@ -9,11 +9,11 @@ name = "format-tests"
 path = "src/format_tests.rs"
 
 [dependencies.multiversx-sc]
-version = "0.45.0"
+version = "0.45.1"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-scenario]
-version = "0.45.0"
+version = "0.45.1"
 path = "../../../framework/scenario"
 
 [dependencies.multiversx-chain-vm]

From 627dc1e62e964b9108f0c3c2bfe808663b974726 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 24 Nov 2023 16:28:52 +0200
Subject: [PATCH 0117/1254] Cargo.lock update

---
 contracts/benchmarks/large-storage/wasm/Cargo.lock | 10 +++++-----
 .../mappers/linked-list-repeat/wasm/Cargo.lock     | 10 +++++-----
 .../benchmarks/mappers/map-repeat/wasm/Cargo.lock  | 10 +++++-----
 .../mappers/queue-repeat/wasm/Cargo.lock           | 10 +++++-----
 .../benchmarks/mappers/set-repeat/wasm/Cargo.lock  | 10 +++++-----
 .../mappers/single-value-repeat/wasm/Cargo.lock    | 10 +++++-----
 .../benchmarks/mappers/vec-repeat/wasm/Cargo.lock  | 10 +++++-----
 .../benchmarks/send-tx-repeat/wasm/Cargo.lock      | 10 +++++-----
 contracts/benchmarks/str-repeat/wasm/Cargo.lock    | 10 +++++-----
 contracts/core/price-aggregator/wasm/Cargo.lock    | 14 +++++++-------
 contracts/examples/adder/wasm/Cargo.lock           | 10 +++++-----
 .../bonding-curve-contract/wasm/Cargo.lock         | 12 ++++++------
 contracts/examples/check-pause/wasm/Cargo.lock     | 12 ++++++------
 .../examples/crowdfunding-esdt/wasm/Cargo.lock     | 10 +++++-----
 contracts/examples/crypto-bubbles/wasm/Cargo.lock  | 10 +++++-----
 .../crypto-kitties/kitty-auction/wasm/Cargo.lock   | 10 +++++-----
 .../kitty-genetic-alg/wasm/Cargo.lock              | 10 +++++-----
 .../crypto-kitties/kitty-ownership/wasm/Cargo.lock | 10 +++++-----
 contracts/examples/crypto-zombies/wasm/Cargo.lock  | 10 +++++-----
 contracts/examples/digital-cash/wasm/Cargo.lock    | 10 +++++-----
 contracts/examples/empty/wasm/Cargo.lock           | 10 +++++-----
 .../esdt-transfer-with-fee/wasm/Cargo.lock         | 10 +++++-----
 contracts/examples/factorial/wasm/Cargo.lock       | 10 +++++-----
 contracts/examples/fractional-nfts/wasm/Cargo.lock | 12 ++++++------
 contracts/examples/lottery-esdt/wasm/Cargo.lock    | 10 +++++-----
 .../multisig/wasm-multisig-full/Cargo.lock         | 12 ++++++------
 .../multisig/wasm-multisig-view/Cargo.lock         | 12 ++++++------
 contracts/examples/multisig/wasm/Cargo.lock        | 12 ++++++------
 contracts/examples/nft-minter/wasm/Cargo.lock      | 10 +++++-----
 .../examples/nft-storage-prepay/wasm/Cargo.lock    | 10 +++++-----
 .../examples/nft-subscription/wasm/Cargo.lock      | 12 ++++++------
 .../examples/order-book/factory/wasm/Cargo.lock    | 10 +++++-----
 contracts/examples/order-book/pair/wasm/Cargo.lock | 10 +++++-----
 contracts/examples/ping-pong-egld/wasm/Cargo.lock  | 10 +++++-----
 contracts/examples/proxy-pause/wasm/Cargo.lock     | 10 +++++-----
 .../examples/rewards-distribution/wasm/Cargo.lock  | 12 ++++++------
 contracts/examples/seed-nft-minter/wasm/Cargo.lock | 12 ++++++------
 contracts/examples/token-release/wasm/Cargo.lock   | 10 +++++-----
 .../abi-tester/wasm-abi-tester-ev/Cargo.lock       | 10 +++++-----
 contracts/feature-tests/abi-tester/wasm/Cargo.lock | 10 +++++-----
 .../feature-tests/alloc-features/wasm/Cargo.lock   | 10 +++++-----
 .../wasm-basic-features-storage-bytes/Cargo.lock   | 12 ++++++------
 .../feature-tests/basic-features/wasm/Cargo.lock   | 12 ++++++------
 .../big-float-features/wasm/Cargo.lock             | 10 +++++-----
 .../builtin-func-features/wasm/Cargo.lock          | 10 +++++-----
 .../first-contract/wasm/Cargo.lock                 | 10 +++++-----
 .../second-contract/wasm/Cargo.lock                | 10 +++++-----
 .../child/wasm/Cargo.lock                          | 10 +++++-----
 .../parent/wasm/Cargo.lock                         | 10 +++++-----
 .../wasm-forwarder-queue-promises/Cargo.lock       | 10 +++++-----
 .../composability/forwarder-queue/wasm/Cargo.lock  | 10 +++++-----
 .../wasm-forwarder-raw-init-async-call/Cargo.lock  | 10 +++++-----
 .../wasm-forwarder-raw-init-sync-call/Cargo.lock   | 10 +++++-----
 .../composability/forwarder-raw/wasm/Cargo.lock    | 10 +++++-----
 .../composability/forwarder/wasm/Cargo.lock        | 10 +++++-----
 .../local-esdt-and-nft/wasm/Cargo.lock             | 10 +++++-----
 .../promises-features/wasm/Cargo.lock              | 10 +++++-----
 .../composability/proxy-test-first/wasm/Cargo.lock | 10 +++++-----
 .../proxy-test-second/wasm/Cargo.lock              | 10 +++++-----
 .../composability/recursive-caller/wasm/Cargo.lock | 10 +++++-----
 .../transfer-role-features/wasm/Cargo.lock         | 12 ++++++------
 .../vault/wasm-vault-promises/Cargo.lock           | 10 +++++-----
 .../vault/wasm-vault-upgrade/Cargo.lock            | 10 +++++-----
 .../composability/vault/wasm/Cargo.lock            | 10 +++++-----
 .../crowdfunding-erc20/wasm/Cargo.lock             | 10 +++++-----
 .../erc1155-marketplace/wasm/Cargo.lock            | 10 +++++-----
 .../erc1155-user-mock/wasm/Cargo.lock              | 10 +++++-----
 .../erc-style-contracts/erc1155/wasm/Cargo.lock    | 10 +++++-----
 .../erc-style-contracts/erc20/wasm/Cargo.lock      | 10 +++++-----
 .../erc-style-contracts/erc721/wasm/Cargo.lock     | 10 +++++-----
 .../lottery-erc20/wasm/Cargo.lock                  | 10 +++++-----
 .../esdt-system-sc-mock/wasm/Cargo.lock            | 10 +++++-----
 .../formatted-message-features/wasm/Cargo.lock     | 10 +++++-----
 .../managed-map-features/wasm/Cargo.lock           | 10 +++++-----
 .../wasm-multi-contract-alt-impl/Cargo.lock        | 10 +++++-----
 .../wasm-multi-contract-example-feature/Cargo.lock | 10 +++++-----
 .../wasm-multi-contract-features-view/Cargo.lock   | 10 +++++-----
 .../multi-contract-features/wasm/Cargo.lock        | 10 +++++-----
 .../panic-message-features/wasm/Cargo.lock         | 10 +++++-----
 .../feature-tests/payable-features/wasm/Cargo.lock | 10 +++++-----
 .../rust-snippets-generator-test/wasm/Cargo.lock   | 10 +++++-----
 .../rust-testing-framework-tester/wasm/Cargo.lock  | 10 +++++-----
 .../use-module/wasm-use-module-view/Cargo.lock     | 12 ++++++------
 contracts/feature-tests/use-module/wasm/Cargo.lock | 12 ++++++------
 84 files changed, 436 insertions(+), 436 deletions(-)

diff --git a/contracts/benchmarks/large-storage/wasm/Cargo.lock b/contracts/benchmarks/large-storage/wasm/Cargo.lock
index 05baa28963..d4b8b2d564 100755
--- a/contracts/benchmarks/large-storage/wasm/Cargo.lock
+++ b/contracts/benchmarks/large-storage/wasm/Cargo.lock
@@ -89,7 +89,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -101,7 +101,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -109,7 +109,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -119,7 +119,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -130,7 +130,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.lock
index eddca98ed1..1f495f097b 100644
--- a/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.lock
+++ b/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.lock
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -109,7 +109,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -117,7 +117,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -127,7 +127,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -138,7 +138,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.lock
index 01f2f320f3..18ec0ebfec 100644
--- a/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.lock
+++ b/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.lock
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -109,7 +109,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -117,7 +117,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -127,7 +127,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -138,7 +138,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.lock
index a9a72c8086..31bd71f2e6 100644
--- a/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.lock
+++ b/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.lock
@@ -81,7 +81,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -93,7 +93,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -101,7 +101,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -111,7 +111,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -122,7 +122,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.lock
index bd4fb6396b..df098fca1b 100644
--- a/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.lock
+++ b/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.lock
@@ -81,7 +81,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -93,7 +93,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -101,7 +101,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -111,7 +111,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -122,7 +122,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.lock
index 17a14d511a..489f1699b5 100644
--- a/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.lock
+++ b/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.lock
@@ -81,7 +81,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -93,7 +93,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -101,7 +101,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -111,7 +111,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -122,7 +122,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.lock
index 84151a41ef..cf5fe0c9b4 100644
--- a/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.lock
+++ b/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.lock
@@ -81,7 +81,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -93,7 +93,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -101,7 +101,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -111,7 +111,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -122,7 +122,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/send-tx-repeat/wasm/Cargo.lock b/contracts/benchmarks/send-tx-repeat/wasm/Cargo.lock
index bfa538d86c..e4660dc801 100755
--- a/contracts/benchmarks/send-tx-repeat/wasm/Cargo.lock
+++ b/contracts/benchmarks/send-tx-repeat/wasm/Cargo.lock
@@ -74,7 +74,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -104,7 +104,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -115,7 +115,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/str-repeat/wasm/Cargo.lock b/contracts/benchmarks/str-repeat/wasm/Cargo.lock
index 042599499a..b2fc5abf37 100755
--- a/contracts/benchmarks/str-repeat/wasm/Cargo.lock
+++ b/contracts/benchmarks/str-repeat/wasm/Cargo.lock
@@ -74,7 +74,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -104,7 +104,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -115,7 +115,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/core/price-aggregator/wasm/Cargo.lock b/contracts/core/price-aggregator/wasm/Cargo.lock
index 397b58a0d0..fe6c2ca401 100644
--- a/contracts/core/price-aggregator/wasm/Cargo.lock
+++ b/contracts/core/price-aggregator/wasm/Cargo.lock
@@ -74,7 +74,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-price-aggregator-sc"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "arrayvec",
  "multiversx-sc",
@@ -91,7 +91,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -103,7 +103,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -111,7 +111,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -121,7 +121,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -132,14 +132,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/adder/wasm/Cargo.lock b/contracts/examples/adder/wasm/Cargo.lock
index e5f4dfbedc..04da89c898 100755
--- a/contracts/examples/adder/wasm/Cargo.lock
+++ b/contracts/examples/adder/wasm/Cargo.lock
@@ -89,7 +89,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -101,7 +101,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -109,7 +109,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -119,7 +119,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -130,7 +130,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/bonding-curve-contract/wasm/Cargo.lock b/contracts/examples/bonding-curve-contract/wasm/Cargo.lock
index 198a14309e..102a8e2f9f 100644
--- a/contracts/examples/bonding-curve-contract/wasm/Cargo.lock
+++ b/contracts/examples/bonding-curve-contract/wasm/Cargo.lock
@@ -90,7 +90,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -102,7 +102,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -110,7 +110,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -120,7 +120,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -131,14 +131,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/check-pause/wasm/Cargo.lock b/contracts/examples/check-pause/wasm/Cargo.lock
index 9c9e24a332..73b6315dfe 100644
--- a/contracts/examples/check-pause/wasm/Cargo.lock
+++ b/contracts/examples/check-pause/wasm/Cargo.lock
@@ -90,7 +90,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -102,7 +102,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -110,7 +110,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -120,7 +120,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -131,14 +131,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crowdfunding-esdt/wasm/Cargo.lock b/contracts/examples/crowdfunding-esdt/wasm/Cargo.lock
index a22a97caeb..aed11fe8ec 100644
--- a/contracts/examples/crowdfunding-esdt/wasm/Cargo.lock
+++ b/contracts/examples/crowdfunding-esdt/wasm/Cargo.lock
@@ -89,7 +89,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -101,7 +101,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -109,7 +109,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -119,7 +119,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -130,7 +130,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crypto-bubbles/wasm/Cargo.lock b/contracts/examples/crypto-bubbles/wasm/Cargo.lock
index b876890b26..607e62bee5 100755
--- a/contracts/examples/crypto-bubbles/wasm/Cargo.lock
+++ b/contracts/examples/crypto-bubbles/wasm/Cargo.lock
@@ -89,7 +89,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -101,7 +101,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -109,7 +109,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -119,7 +119,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -130,7 +130,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.lock b/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.lock
index 86234e70f9..ebb9503820 100755
--- a/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.lock
+++ b/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.lock
@@ -118,7 +118,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -130,7 +130,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -138,7 +138,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -148,7 +148,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -159,7 +159,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "multiversx-sc",
 ]
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 4644917866..d6445a405e 100755
--- a/contracts/examples/crypto-kitties/kitty-genetic-alg/wasm/Cargo.lock
+++ b/contracts/examples/crypto-kitties/kitty-genetic-alg/wasm/Cargo.lock
@@ -99,7 +99,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -111,7 +111,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -119,7 +119,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -129,7 +129,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -140,7 +140,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.lock b/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.lock
index 49782e3733..b54190e1ce 100755
--- a/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.lock
+++ b/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.lock
@@ -109,7 +109,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -121,7 +121,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -129,7 +129,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -139,7 +139,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -150,7 +150,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crypto-zombies/wasm/Cargo.lock b/contracts/examples/crypto-zombies/wasm/Cargo.lock
index 36491698f7..2d5adff123 100755
--- a/contracts/examples/crypto-zombies/wasm/Cargo.lock
+++ b/contracts/examples/crypto-zombies/wasm/Cargo.lock
@@ -89,7 +89,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -101,7 +101,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -109,7 +109,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -119,7 +119,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -130,7 +130,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/digital-cash/wasm/Cargo.lock b/contracts/examples/digital-cash/wasm/Cargo.lock
index 5c7242a6b3..2f033aabfa 100644
--- a/contracts/examples/digital-cash/wasm/Cargo.lock
+++ b/contracts/examples/digital-cash/wasm/Cargo.lock
@@ -89,7 +89,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -101,7 +101,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -109,7 +109,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -119,7 +119,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -130,7 +130,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/empty/wasm/Cargo.lock b/contracts/examples/empty/wasm/Cargo.lock
index 3fe87101c3..0c7c012589 100755
--- a/contracts/examples/empty/wasm/Cargo.lock
+++ b/contracts/examples/empty/wasm/Cargo.lock
@@ -89,7 +89,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -101,7 +101,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -109,7 +109,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -119,7 +119,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -130,7 +130,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.lock b/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.lock
index ccf3b2d6a4..502134d522 100644
--- a/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.lock
+++ b/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.lock
@@ -89,7 +89,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -101,7 +101,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -109,7 +109,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -119,7 +119,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -130,7 +130,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/factorial/wasm/Cargo.lock b/contracts/examples/factorial/wasm/Cargo.lock
index 3642ff9ade..bf916d4e7d 100755
--- a/contracts/examples/factorial/wasm/Cargo.lock
+++ b/contracts/examples/factorial/wasm/Cargo.lock
@@ -89,7 +89,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -101,7 +101,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -109,7 +109,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -119,7 +119,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -130,7 +130,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/fractional-nfts/wasm/Cargo.lock b/contracts/examples/fractional-nfts/wasm/Cargo.lock
index 1ed02d4285..275e5c8e85 100644
--- a/contracts/examples/fractional-nfts/wasm/Cargo.lock
+++ b/contracts/examples/fractional-nfts/wasm/Cargo.lock
@@ -90,7 +90,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -102,7 +102,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -110,7 +110,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -120,7 +120,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -131,14 +131,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/lottery-esdt/wasm/Cargo.lock b/contracts/examples/lottery-esdt/wasm/Cargo.lock
index d9d65def88..6edac2b36f 100755
--- a/contracts/examples/lottery-esdt/wasm/Cargo.lock
+++ b/contracts/examples/lottery-esdt/wasm/Cargo.lock
@@ -89,7 +89,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -101,7 +101,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -109,7 +109,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -119,7 +119,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -130,7 +130,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/multisig/wasm-multisig-full/Cargo.lock b/contracts/examples/multisig/wasm-multisig-full/Cargo.lock
index 313437bcc7..3cb7422187 100644
--- a/contracts/examples/multisig/wasm-multisig-full/Cargo.lock
+++ b/contracts/examples/multisig/wasm-multisig-full/Cargo.lock
@@ -90,7 +90,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -102,7 +102,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -110,7 +110,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -120,7 +120,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -131,14 +131,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/multisig/wasm-multisig-view/Cargo.lock b/contracts/examples/multisig/wasm-multisig-view/Cargo.lock
index 6b844db782..f03a3728f0 100644
--- a/contracts/examples/multisig/wasm-multisig-view/Cargo.lock
+++ b/contracts/examples/multisig/wasm-multisig-view/Cargo.lock
@@ -90,7 +90,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -102,7 +102,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -110,7 +110,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -120,7 +120,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -131,14 +131,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/multisig/wasm/Cargo.lock b/contracts/examples/multisig/wasm/Cargo.lock
index 831ce8f217..3108bf0e90 100755
--- a/contracts/examples/multisig/wasm/Cargo.lock
+++ b/contracts/examples/multisig/wasm/Cargo.lock
@@ -90,7 +90,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -102,7 +102,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -110,7 +110,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -120,7 +120,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -131,14 +131,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/nft-minter/wasm/Cargo.lock b/contracts/examples/nft-minter/wasm/Cargo.lock
index 557d717c03..0a00b732da 100644
--- a/contracts/examples/nft-minter/wasm/Cargo.lock
+++ b/contracts/examples/nft-minter/wasm/Cargo.lock
@@ -74,7 +74,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -104,7 +104,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -115,7 +115,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/nft-storage-prepay/wasm/Cargo.lock b/contracts/examples/nft-storage-prepay/wasm/Cargo.lock
index 0d8304ba07..3f2ce4ad08 100755
--- a/contracts/examples/nft-storage-prepay/wasm/Cargo.lock
+++ b/contracts/examples/nft-storage-prepay/wasm/Cargo.lock
@@ -74,7 +74,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -104,7 +104,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -115,7 +115,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/nft-subscription/wasm/Cargo.lock b/contracts/examples/nft-subscription/wasm/Cargo.lock
index 7613419c36..5001bbc884 100644
--- a/contracts/examples/nft-subscription/wasm/Cargo.lock
+++ b/contracts/examples/nft-subscription/wasm/Cargo.lock
@@ -74,7 +74,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -104,7 +104,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -115,14 +115,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/order-book/factory/wasm/Cargo.lock b/contracts/examples/order-book/factory/wasm/Cargo.lock
index 922d9195e1..88f1f682d2 100644
--- a/contracts/examples/order-book/factory/wasm/Cargo.lock
+++ b/contracts/examples/order-book/factory/wasm/Cargo.lock
@@ -74,7 +74,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -104,7 +104,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -115,7 +115,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/order-book/pair/wasm/Cargo.lock b/contracts/examples/order-book/pair/wasm/Cargo.lock
index 7e7df6e78b..01801561bd 100644
--- a/contracts/examples/order-book/pair/wasm/Cargo.lock
+++ b/contracts/examples/order-book/pair/wasm/Cargo.lock
@@ -74,7 +74,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -104,7 +104,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -115,7 +115,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/ping-pong-egld/wasm/Cargo.lock b/contracts/examples/ping-pong-egld/wasm/Cargo.lock
index 66d74fe6f7..6fc0160fd7 100755
--- a/contracts/examples/ping-pong-egld/wasm/Cargo.lock
+++ b/contracts/examples/ping-pong-egld/wasm/Cargo.lock
@@ -74,7 +74,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -104,7 +104,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -115,7 +115,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/proxy-pause/wasm/Cargo.lock b/contracts/examples/proxy-pause/wasm/Cargo.lock
index 0e9d9f4dd8..7153293940 100644
--- a/contracts/examples/proxy-pause/wasm/Cargo.lock
+++ b/contracts/examples/proxy-pause/wasm/Cargo.lock
@@ -74,7 +74,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -104,7 +104,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -115,7 +115,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/rewards-distribution/wasm/Cargo.lock b/contracts/examples/rewards-distribution/wasm/Cargo.lock
index 0cb69d1d96..aa49200631 100644
--- a/contracts/examples/rewards-distribution/wasm/Cargo.lock
+++ b/contracts/examples/rewards-distribution/wasm/Cargo.lock
@@ -74,7 +74,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -104,7 +104,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -115,14 +115,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/seed-nft-minter/wasm/Cargo.lock b/contracts/examples/seed-nft-minter/wasm/Cargo.lock
index e0f2a90b65..30a69a6e86 100644
--- a/contracts/examples/seed-nft-minter/wasm/Cargo.lock
+++ b/contracts/examples/seed-nft-minter/wasm/Cargo.lock
@@ -74,7 +74,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -104,7 +104,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -115,14 +115,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/token-release/wasm/Cargo.lock b/contracts/examples/token-release/wasm/Cargo.lock
index e63355c0b9..f84462d10d 100644
--- a/contracts/examples/token-release/wasm/Cargo.lock
+++ b/contracts/examples/token-release/wasm/Cargo.lock
@@ -74,7 +74,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -104,7 +104,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -115,7 +115,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "multiversx-sc",
 ]
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 b857d8e096..2d16421bf5 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
@@ -89,7 +89,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -101,7 +101,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -109,7 +109,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -119,7 +119,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -130,7 +130,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/abi-tester/wasm/Cargo.lock b/contracts/feature-tests/abi-tester/wasm/Cargo.lock
index 1effe495c0..858df67e37 100755
--- a/contracts/feature-tests/abi-tester/wasm/Cargo.lock
+++ b/contracts/feature-tests/abi-tester/wasm/Cargo.lock
@@ -89,7 +89,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -101,7 +101,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -109,7 +109,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -119,7 +119,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -130,7 +130,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/alloc-features/wasm/Cargo.lock b/contracts/feature-tests/alloc-features/wasm/Cargo.lock
index ce0c9a98d7..cc386d95b2 100644
--- a/contracts/feature-tests/alloc-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/alloc-features/wasm/Cargo.lock
@@ -89,7 +89,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -101,7 +101,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -109,7 +109,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -119,7 +119,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -130,7 +130,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "multiversx-sc",
 ]
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 c4cd92a1f0..d207f939bf 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
@@ -90,7 +90,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -102,7 +102,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -110,7 +110,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -120,7 +120,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -131,14 +131,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/basic-features/wasm/Cargo.lock b/contracts/feature-tests/basic-features/wasm/Cargo.lock
index b9e953cb2a..3fd51a2b04 100755
--- a/contracts/feature-tests/basic-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/basic-features/wasm/Cargo.lock
@@ -90,7 +90,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -102,7 +102,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -110,7 +110,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -120,7 +120,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -131,14 +131,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/big-float-features/wasm/Cargo.lock b/contracts/feature-tests/big-float-features/wasm/Cargo.lock
index 01d4c627da..69807bf0c1 100644
--- a/contracts/feature-tests/big-float-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/big-float-features/wasm/Cargo.lock
@@ -89,7 +89,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -101,7 +101,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -109,7 +109,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -119,7 +119,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -130,7 +130,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "multiversx-sc",
 ]
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 4e28c0e577..a7cade4753 100644
--- a/contracts/feature-tests/composability/builtin-func-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/builtin-func-features/wasm/Cargo.lock
@@ -89,7 +89,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -101,7 +101,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -109,7 +109,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -119,7 +119,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -130,7 +130,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "multiversx-sc",
 ]
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 98cad26c1e..a66a27b0a6 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
@@ -89,7 +89,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -101,7 +101,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -109,7 +109,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -119,7 +119,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -130,7 +130,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "multiversx-sc",
 ]
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 e79c560792..f7f359ceb2 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
@@ -74,7 +74,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -104,7 +104,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -115,7 +115,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "multiversx-sc",
 ]
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 85f365c847..e09c6e731a 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
@@ -89,7 +89,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -101,7 +101,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -109,7 +109,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -119,7 +119,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -130,7 +130,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "multiversx-sc",
 ]
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 0ece06c354..65aa527929 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
@@ -81,7 +81,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -93,7 +93,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -101,7 +101,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -111,7 +111,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -122,7 +122,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "multiversx-sc",
 ]
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 d74e462d20..e84b93c9c1 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
@@ -90,7 +90,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -102,7 +102,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -110,7 +110,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -120,7 +120,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -131,7 +131,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock
index 29f4cbe309..ed8d3d793f 100644
--- a/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock
@@ -90,7 +90,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -102,7 +102,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -110,7 +110,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -120,7 +120,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -131,7 +131,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "multiversx-sc",
 ]
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 a332c9cb03..ee0b5e7485 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
@@ -89,7 +89,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -101,7 +101,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -109,7 +109,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -119,7 +119,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -130,7 +130,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "multiversx-sc",
 ]
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 1e3af44d8d..04fc6448ab 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
@@ -89,7 +89,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -101,7 +101,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -109,7 +109,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -119,7 +119,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -130,7 +130,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.lock
index 3f04bcc98a..3168e81e59 100755
--- a/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.lock
@@ -89,7 +89,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -101,7 +101,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -109,7 +109,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -119,7 +119,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -130,7 +130,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock
index b0ef4012f1..dbcd39cde2 100755
--- a/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock
@@ -90,7 +90,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -102,7 +102,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -110,7 +110,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -120,7 +120,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -131,7 +131,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "multiversx-sc",
 ]
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 26a3c3ab6c..bc2bc5b549 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
@@ -89,7 +89,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -101,7 +101,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -109,7 +109,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -119,7 +119,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -130,7 +130,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/promises-features/wasm/Cargo.lock b/contracts/feature-tests/composability/promises-features/wasm/Cargo.lock
index cc4a69f5cd..8be4c86972 100644
--- a/contracts/feature-tests/composability/promises-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/promises-features/wasm/Cargo.lock
@@ -74,7 +74,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -104,7 +104,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -115,7 +115,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "multiversx-sc",
 ]
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 d103f209d7..1b22948f63 100755
--- a/contracts/feature-tests/composability/proxy-test-first/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/proxy-test-first/wasm/Cargo.lock
@@ -74,7 +74,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -104,7 +104,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -115,7 +115,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "multiversx-sc",
 ]
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 4b8e84bb0d..e7d0f2d1a6 100755
--- a/contracts/feature-tests/composability/proxy-test-second/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/proxy-test-second/wasm/Cargo.lock
@@ -74,7 +74,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -104,7 +104,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -115,7 +115,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.lock b/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.lock
index 406f6c382f..ebcd3dd5e1 100755
--- a/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.lock
@@ -74,7 +74,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -104,7 +104,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -115,7 +115,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "multiversx-sc",
 ]
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 7e538ab58f..fe3fd5c897 100644
--- a/contracts/feature-tests/composability/transfer-role-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/transfer-role-features/wasm/Cargo.lock
@@ -74,7 +74,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -104,7 +104,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -115,14 +115,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "multiversx-sc",
 ]
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 a9e528946e..e5ae17b824 100644
--- a/contracts/feature-tests/composability/vault/wasm-vault-promises/Cargo.lock
+++ b/contracts/feature-tests/composability/vault/wasm-vault-promises/Cargo.lock
@@ -74,7 +74,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -104,7 +104,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -115,7 +115,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "multiversx-sc",
 ]
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 1ee2ed9eef..391e38e40b 100644
--- a/contracts/feature-tests/composability/vault/wasm-vault-upgrade/Cargo.lock
+++ b/contracts/feature-tests/composability/vault/wasm-vault-upgrade/Cargo.lock
@@ -74,7 +74,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -104,7 +104,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -115,7 +115,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/vault/wasm/Cargo.lock b/contracts/feature-tests/composability/vault/wasm/Cargo.lock
index 6d4875cffc..638877dd4a 100755
--- a/contracts/feature-tests/composability/vault/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/vault/wasm/Cargo.lock
@@ -74,7 +74,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -104,7 +104,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -115,7 +115,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "multiversx-sc",
 ]
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 25edb40235..94d93cecf9 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
@@ -97,7 +97,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -109,7 +109,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -117,7 +117,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -127,7 +127,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -138,7 +138,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "multiversx-sc",
 ]
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 56dd5b8b9e..953b8be20e 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
@@ -97,7 +97,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -109,7 +109,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -117,7 +117,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -127,7 +127,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -138,7 +138,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "multiversx-sc",
 ]
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 9f563672ed..3863364399 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
@@ -89,7 +89,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -101,7 +101,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -109,7 +109,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -119,7 +119,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -130,7 +130,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "multiversx-sc",
 ]
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 b33155a57e..7b597e8a6e 100644
--- a/contracts/feature-tests/erc-style-contracts/erc1155/wasm/Cargo.lock
+++ b/contracts/feature-tests/erc-style-contracts/erc1155/wasm/Cargo.lock
@@ -89,7 +89,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -101,7 +101,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -109,7 +109,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -119,7 +119,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -130,7 +130,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "multiversx-sc",
 ]
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 b206673717..d2ea170316 100644
--- a/contracts/feature-tests/erc-style-contracts/erc20/wasm/Cargo.lock
+++ b/contracts/feature-tests/erc-style-contracts/erc20/wasm/Cargo.lock
@@ -89,7 +89,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -101,7 +101,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -109,7 +109,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -119,7 +119,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -130,7 +130,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "multiversx-sc",
 ]
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 b65f6536c3..b1b7876d09 100644
--- a/contracts/feature-tests/erc-style-contracts/erc721/wasm/Cargo.lock
+++ b/contracts/feature-tests/erc-style-contracts/erc721/wasm/Cargo.lock
@@ -89,7 +89,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -101,7 +101,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -109,7 +109,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -119,7 +119,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -130,7 +130,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "multiversx-sc",
 ]
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 2c0a9ec430..e4c5144ad7 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
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -109,7 +109,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -117,7 +117,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -127,7 +127,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -138,7 +138,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "multiversx-sc",
 ]
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 8ba4742362..7e345efb2e 100644
--- a/contracts/feature-tests/esdt-system-sc-mock/wasm/Cargo.lock
+++ b/contracts/feature-tests/esdt-system-sc-mock/wasm/Cargo.lock
@@ -89,7 +89,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -101,7 +101,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -109,7 +109,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -119,7 +119,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -130,7 +130,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/formatted-message-features/wasm/Cargo.lock b/contracts/feature-tests/formatted-message-features/wasm/Cargo.lock
index bd0d621b51..f8e8c96632 100644
--- a/contracts/feature-tests/formatted-message-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/formatted-message-features/wasm/Cargo.lock
@@ -89,7 +89,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -101,7 +101,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -109,7 +109,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -119,7 +119,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -130,7 +130,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/managed-map-features/wasm/Cargo.lock b/contracts/feature-tests/managed-map-features/wasm/Cargo.lock
index 0589d44e6f..c249f24988 100644
--- a/contracts/feature-tests/managed-map-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/managed-map-features/wasm/Cargo.lock
@@ -89,7 +89,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -101,7 +101,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -109,7 +109,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -119,7 +119,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -130,7 +130,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "multiversx-sc",
 ]
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 bc36cad138..e9f8a9a811 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
@@ -89,7 +89,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -101,7 +101,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -109,7 +109,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -119,7 +119,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -130,7 +130,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "multiversx-sc",
 ]
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 bea508502d..40f8b6f1f7 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
@@ -89,7 +89,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -101,7 +101,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -109,7 +109,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -119,7 +119,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -130,7 +130,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "multiversx-sc",
 ]
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 b182575cc0..5e35e86680 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
@@ -89,7 +89,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -101,7 +101,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -109,7 +109,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -119,7 +119,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -130,7 +130,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/multi-contract-features/wasm/Cargo.lock b/contracts/feature-tests/multi-contract-features/wasm/Cargo.lock
index 2ef1c5fa5c..3103aaba03 100755
--- a/contracts/feature-tests/multi-contract-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/multi-contract-features/wasm/Cargo.lock
@@ -89,7 +89,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -101,7 +101,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -109,7 +109,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -119,7 +119,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -130,7 +130,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/panic-message-features/wasm/Cargo.lock b/contracts/feature-tests/panic-message-features/wasm/Cargo.lock
index a2213426f2..aded2bc72b 100755
--- a/contracts/feature-tests/panic-message-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/panic-message-features/wasm/Cargo.lock
@@ -74,7 +74,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -104,7 +104,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -115,7 +115,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/payable-features/wasm/Cargo.lock b/contracts/feature-tests/payable-features/wasm/Cargo.lock
index c45249705b..c825158f1a 100755
--- a/contracts/feature-tests/payable-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/payable-features/wasm/Cargo.lock
@@ -74,7 +74,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -104,7 +104,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -115,7 +115,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "multiversx-sc",
 ]
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 0e55ec5bdc..2a7afe3873 100644
--- a/contracts/feature-tests/rust-snippets-generator-test/wasm/Cargo.lock
+++ b/contracts/feature-tests/rust-snippets-generator-test/wasm/Cargo.lock
@@ -74,7 +74,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -104,7 +104,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -115,7 +115,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "multiversx-sc",
 ]
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 de8a3d2b9d..16f4a4d43b 100644
--- a/contracts/feature-tests/rust-testing-framework-tester/wasm/Cargo.lock
+++ b/contracts/feature-tests/rust-testing-framework-tester/wasm/Cargo.lock
@@ -74,7 +74,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -104,7 +104,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -115,7 +115,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "multiversx-sc",
 ]
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 9bec4151b4..54758b3fdb 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
@@ -74,7 +74,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -104,7 +104,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -115,14 +115,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/use-module/wasm/Cargo.lock b/contracts/feature-tests/use-module/wasm/Cargo.lock
index 0a38d57e4f..88e3ec2d6b 100644
--- a/contracts/feature-tests/use-module/wasm/Cargo.lock
+++ b/contracts/feature-tests/use-module/wasm/Cargo.lock
@@ -74,7 +74,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -104,7 +104,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -115,14 +115,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "multiversx-sc",
 ]

From bdca39c93438608b6946738823043b8333566950 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Mon, 27 Nov 2023 13:10:22 +0100
Subject: [PATCH 0118/1254] upgrading syn library from 1.0 to 2.0.39

---
 Cargo.lock                                    | 39 +++++++------------
 data/codec-derive/Cargo.toml                  |  2 +-
 framework/derive/Cargo.toml                   |  2 +-
 .../derive/src/generate/auto_impl_proxy.rs    |  4 +-
 framework/derive/src/macro_module.rs          |  6 +++
 framework/derive/src/model/supertrait.rs      |  4 +-
 framework/derive/src/parse/argument_parse.rs  |  4 +-
 .../derive/src/parse/attributes/doc_attr.rs   |  4 +-
 .../src/parse/attributes/payable_attr.rs      |  4 +-
 framework/derive/src/parse/attributes/util.rs | 16 ++++----
 .../derive/src/parse/contract_trait_parse.rs  |  4 +-
 framework/derive/src/parse/method_parse.rs    |  2 +-
 framework/derive/src/parse/split_path.rs      |  4 +-
 13 files changed, 45 insertions(+), 50 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f865845761..c5fbd9a2e8 100755
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -472,7 +472,7 @@ dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn",
 ]
 
 [[package]]
@@ -701,7 +701,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn",
 ]
 
 [[package]]
@@ -1196,7 +1196,7 @@ checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn",
 ]
 
 [[package]]
@@ -1907,7 +1907,7 @@ dependencies = [
  "hex",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
@@ -1918,7 +1918,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "radix_trie",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
@@ -2213,7 +2213,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn",
 ]
 
 [[package]]
@@ -2891,7 +2891,7 @@ checksum = "67c5609f394e5c2bd7fc51efda478004ea80ef42fee983d5c67a65e34f32c0e3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn",
 ]
 
 [[package]]
@@ -2914,7 +2914,7 @@ checksum = "3081f5ffbb02284dda55132aa26daecedd7372a42417bbbab6f14ab7d6bb9145"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn",
 ]
 
 [[package]]
@@ -3108,20 +3108,9 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
 
 [[package]]
 name = "syn"
-version = "1.0.109"
+version = "2.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.38"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
+checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3239,7 +3228,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn",
 ]
 
 [[package]]
@@ -3509,7 +3498,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn",
  "wasm-bindgen-shared",
 ]
 
@@ -3543,7 +3532,7 @@ checksum = "c5353b8dab669f5e10f5bd76df26a9360c748f054f862ff5f3f8aae0c7fb3907"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -3717,7 +3706,7 @@ checksum = "c2f140bda219a26ccc0cdb03dba58af72590c53b22642577d88a927bc5c87d6b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn",
 ]
 
 [[package]]
diff --git a/data/codec-derive/Cargo.toml b/data/codec-derive/Cargo.toml
index 4401637ee9..5b845dd421 100644
--- a/data/codec-derive/Cargo.toml
+++ b/data/codec-derive/Cargo.toml
@@ -23,5 +23,5 @@ default = ["syn/full", "syn/parsing", "syn/extra-traits"]
 [dependencies]
 proc-macro2 = "1.0.66"
 quote = "1.0.33"
-syn = "1.0"
+syn = "2.0.39"
 hex = "0.4"
diff --git a/framework/derive/Cargo.toml b/framework/derive/Cargo.toml
index a16254e975..b029fa42aa 100644
--- a/framework/derive/Cargo.toml
+++ b/framework/derive/Cargo.toml
@@ -16,7 +16,7 @@ categories = ["cryptography::cryptocurrencies", "development-tools::procedural-m
 [dependencies]
 proc-macro2 = "1.0.66"
 quote = "1.0.33"
-syn = "1.0"
+syn = "2.0.39"
 hex = "0.4"
 radix_trie = "0.2.1"
 
diff --git a/framework/derive/src/generate/auto_impl_proxy.rs b/framework/derive/src/generate/auto_impl_proxy.rs
index a60c97832d..7590b57b63 100644
--- a/framework/derive/src/generate/auto_impl_proxy.rs
+++ b/framework/derive/src/generate/auto_impl_proxy.rs
@@ -3,10 +3,10 @@ use crate::{
     model::{AutoImpl, ContractTrait, Method, MethodImpl},
     parse::split_path_last,
 };
-use syn::{punctuated::Punctuated, token::Colon2};
+use syn::{punctuated::Punctuated, token::PathSep};
 
 /// Path to a Rust module containing a contract call proxy.
-pub type ProxyModulePath = Punctuated<syn::PathSegment, Colon2>;
+pub type ProxyModulePath = Punctuated<syn::PathSegment, PathSep>;
 
 pub struct ProxyGetterReturnType {
     pub module_path: ProxyModulePath,
diff --git a/framework/derive/src/macro_module.rs b/framework/derive/src/macro_module.rs
index 9c696e2387..f7da38c98e 100644
--- a/framework/derive/src/macro_module.rs
+++ b/framework/derive/src/macro_module.rs
@@ -8,9 +8,15 @@ pub fn process_module(
     input: proc_macro::TokenStream,
 ) -> proc_macro::TokenStream {
     let new_input = trait_preprocessing(input);
+    println!("args are: {:#?}", args);
     let args_input = parse_macro_input!(args as syn::AttributeArgs);
     let proc_input = &parse_macro_input!(new_input as syn::ItemTrait);
 
+    // let attribute = match syn::parse::<syn::Attribute>(args.clone()) {
+    //     Ok(val) => {},
+    //     Err(err) => {},
+    // };
+
     let contract = parse_contract_trait(args_input, proc_input);
     validate_contract(&contract);
 
diff --git a/framework/derive/src/model/supertrait.rs b/framework/derive/src/model/supertrait.rs
index 34a413a9b1..a8775ac417 100644
--- a/framework/derive/src/model/supertrait.rs
+++ b/framework/derive/src/model/supertrait.rs
@@ -1,7 +1,7 @@
-use syn::{punctuated::Punctuated, token::Colon2};
+use syn::{punctuated::Punctuated, token::Colon};
 
 /// Path to a Rust module containing a contract module.
-pub type ModulePath = Punctuated<syn::PathSegment, Colon2>;
+pub type ModulePath = Punctuated<syn::PathSegment, Colon>;
 
 #[derive(Clone, Debug)]
 pub struct Supertrait {
diff --git a/framework/derive/src/parse/argument_parse.rs b/framework/derive/src/parse/argument_parse.rs
index 9e18e94040..b3bd37912c 100644
--- a/framework/derive/src/parse/argument_parse.rs
+++ b/framework/derive/src/parse/argument_parse.rs
@@ -1,7 +1,7 @@
 use super::attributes::*;
 use crate::model::{ArgMetadata, ArgPaymentMetadata, MethodArgument};
 
-pub fn extract_method_args(m: &syn::TraitItemMethod) -> Vec<MethodArgument> {
+pub fn extract_method_args(m: &syn::TraitItemFn) -> Vec<MethodArgument> {
     if m.sig.inputs.is_empty() {
         missing_self_panic(m);
     }
@@ -29,7 +29,7 @@ pub fn extract_method_args(m: &syn::TraitItemMethod) -> Vec<MethodArgument> {
         .collect()
 }
 
-fn missing_self_panic(m: &syn::TraitItemMethod) -> ! {
+fn missing_self_panic(m: &syn::TraitItemFn) -> ! {
     panic!(
         "Trait method `{}` must have `&self` as its first argument.",
         m.sig.ident
diff --git a/framework/derive/src/parse/attributes/doc_attr.rs b/framework/derive/src/parse/attributes/doc_attr.rs
index 57c7fcdd2d..d01730faef 100644
--- a/framework/derive/src/parse/attributes/doc_attr.rs
+++ b/framework/derive/src/parse/attributes/doc_attr.rs
@@ -10,14 +10,14 @@ pub fn extract_doc(attrs: &[syn::Attribute]) -> Vec<String> {
     attrs
         .iter()
         .filter(|attr| {
-            if let Some(first_seg) = attr.path.segments.first() {
+            if let Some(first_seg) = attr.path().segments.first() {
                 first_seg.ident == ATTR_DOC
             } else {
                 false
             }
         })
         .map(|attr| {
-            let mut tokens_iter = attr.clone().tokens.into_iter();
+            let mut tokens_iter = attr.clone().parse_args().into_iter();
 
             // checking punctuation, the first token is '='
             if let Some(proc_macro2::TokenTree::Punct(punct)) = tokens_iter.next() {
diff --git a/framework/derive/src/parse/attributes/payable_attr.rs b/framework/derive/src/parse/attributes/payable_attr.rs
index 0c84bfbca4..738e3b10a4 100644
--- a/framework/derive/src/parse/attributes/payable_attr.rs
+++ b/framework/derive/src/parse/attributes/payable_attr.rs
@@ -6,7 +6,7 @@ pub struct PayableAttribute {
 
 impl PayableAttribute {
     pub fn parse(attr: &syn::Attribute) -> Option<PayableAttribute> {
-        if let Some(first_seg) = attr.path.segments.first() {
+        if let Some(first_seg) = attr.path().segments.first() {
             if first_seg.ident == ATTR_PAYABLE {
                 Some(PayableAttribute {
                     identifier: extract_token_identifier(attr),
@@ -23,7 +23,7 @@ impl PayableAttribute {
 /// Current implementation only works with 1 token name.
 /// Might be extended in the future.
 fn extract_token_identifier(attr: &syn::Attribute) -> Option<String> {
-    let mut iter = attr.clone().tokens.into_iter();
+    let mut iter = attr.clone().parse_args().into_iter();
     let result_str = match iter.next() {
         Some(proc_macro2::TokenTree::Group(group)) => {
             assert!(
diff --git a/framework/derive/src/parse/attributes/util.rs b/framework/derive/src/parse/attributes/util.rs
index f10865717f..d12e338234 100644
--- a/framework/derive/src/parse/attributes/util.rs
+++ b/framework/derive/src/parse/attributes/util.rs
@@ -2,10 +2,10 @@ use crate::model::EsdtAttribute;
 use proc_macro2::TokenTree;
 
 pub(super) fn is_attribute_with_no_args(attr: &syn::Attribute, name: &str) -> bool {
-    if let Some(first_seg) = attr.path.segments.first() {
+    if let Some(first_seg) = attr.path().segments.first() {
         if first_seg.ident == name {
             assert!(
-                attr.path.segments.len() == 1,
+                attr.path().segments.len() == 1,
                 "no arguments allowed for attribute `{name}`"
             );
             return true;
@@ -19,10 +19,10 @@ pub(super) fn get_attribute_with_one_type_arg(
     attr: &syn::Attribute,
     name: &str,
 ) -> Option<EsdtAttribute> {
-    let attr_path = &attr.path;
+    let attr_path = &attr.path();
     if let Some(first_seg) = attr_path.segments.first() {
         if first_seg.ident == name {
-            let mut tokens = attr.tokens.clone().into_iter();
+            let mut tokens = attr.parse_args().clone().into_iter();
             let group = match tokens.next() {
                 Some(TokenTree::Group(group_val)) => group_val,
                 _ => panic!("Expected a group as attribute argument"),
@@ -74,7 +74,7 @@ pub(super) fn get_attribute_with_one_type_arg(
 
 pub(super) fn attr_one_string_arg(attr: &syn::Attribute) -> String {
     let result_str: String;
-    let mut iter = attr.clone().tokens.into_iter();
+    let mut iter = attr.clone().parse_args().into_iter();
     match iter.next() {
         Some(proc_macro2::TokenTree::Group(group)) => {
             assert!(
@@ -107,7 +107,7 @@ pub(super) fn attr_one_string_arg(attr: &syn::Attribute) -> String {
 }
 
 pub(super) fn is_attr_one_string_arg(attr: &syn::Attribute, attr_name: &str) -> Option<String> {
-    if let Some(first_seg) = attr.path.segments.first() {
+    if let Some(first_seg) = attr.path().segments.first() {
         if first_seg.ident == attr_name {
             Some(attr_one_string_arg(attr))
         } else {
@@ -119,7 +119,7 @@ pub(super) fn is_attr_one_string_arg(attr: &syn::Attribute, attr_name: &str) ->
 }
 
 fn attr_one_opt_token_tree_arg(attr: &syn::Attribute) -> Option<proc_macro2::TokenTree> {
-    let mut iter = attr.clone().tokens.into_iter();
+    let mut iter = attr.clone().parse_args().into_iter();
     let arg_token_tree: Option<proc_macro2::TokenTree> = match iter.next() {
         Some(proc_macro2::TokenTree::Group(group)) => {
             assert!(
@@ -147,7 +147,7 @@ pub(super) fn is_attr_with_one_opt_token_tree_arg(
     attr: &syn::Attribute,
     attr_name: &str,
 ) -> Option<Option<proc_macro2::TokenTree>> {
-    if let Some(first_seg) = attr.path.segments.first() {
+    if let Some(first_seg) = attr.path().segments.first() {
         if first_seg.ident == attr_name {
             Some(attr_one_opt_token_tree_arg(attr))
         } else {
diff --git a/framework/derive/src/parse/contract_trait_parse.rs b/framework/derive/src/parse/contract_trait_parse.rs
index 91c6f2c487..29a793e102 100644
--- a/framework/derive/src/parse/contract_trait_parse.rs
+++ b/framework/derive/src/parse/contract_trait_parse.rs
@@ -8,7 +8,7 @@ use crate::{
 };
 
 pub fn parse_contract_trait(
-    args: syn::AttributeArgs,
+    args: syn::MetaList,
     contract_trait: &syn::ItemTrait,
 ) -> ContractTrait {
     validate_attribute_args(args);
@@ -34,7 +34,7 @@ pub fn parse_contract_trait(
         .items
         .iter()
         .map(|itm| match itm {
-            syn::TraitItem::Method(m) => process_method(m, &trait_attributes),
+            syn::TraitItem::Fn(m) => process_method(m, &trait_attributes),
             _ => panic!("Only methods allowed in contract traits"),
         })
         .collect();
diff --git a/framework/derive/src/parse/method_parse.rs b/framework/derive/src/parse/method_parse.rs
index 7ef6c1ba1e..267e9faa7b 100644
--- a/framework/derive/src/parse/method_parse.rs
+++ b/framework/derive/src/parse/method_parse.rs
@@ -23,7 +23,7 @@ pub struct MethodAttributesPass1 {
     pub allow_multiple_var_args: bool,
 }
 
-pub fn process_method(m: &syn::TraitItemMethod, trait_attributes: &TraitProperties) -> Method {
+pub fn process_method(m: &syn::TraitItemFn, trait_attributes: &TraitProperties) -> Method {
     let method_args = extract_method_args(m);
 
     let implementation = if let Some(body) = m.default.clone() {
diff --git a/framework/derive/src/parse/split_path.rs b/framework/derive/src/parse/split_path.rs
index 23e7db26c3..f80c2c89f6 100644
--- a/framework/derive/src/parse/split_path.rs
+++ b/framework/derive/src/parse/split_path.rs
@@ -1,4 +1,4 @@
-use syn::{punctuated::Punctuated, token::Colon2};
+use syn::{punctuated::Punctuated, token::PathSep};
 
 /// Splits off the last part of a path from the rest.
 /// e.g. `some::module::Item` will be split into `some::module::` and `Item`.
@@ -7,7 +7,7 @@ use syn::{punctuated::Punctuated, token::Colon2};
 /// The method is designed for contexts where explicit module specification is required.
 pub fn split_path_last(
     path: &syn::Path,
-) -> Option<(Punctuated<syn::PathSegment, Colon2>, syn::PathSegment)> {
+) -> Option<(Punctuated<syn::PathSegment, PathSep>, syn::PathSegment)> {
     if path.segments.len() >= 2 {
         let mut leading_segments = path.segments.clone();
         let last_segment = leading_segments.pop().unwrap().into_value();

From 099ffdf5b269c710d1acbe3c7d6c6c09cd7b4916 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Mon, 27 Nov 2023 15:19:30 +0100
Subject: [PATCH 0119/1254] changed AttributeArgs to MetaList

---
 framework/derive/src/macro_contract.rs             | 8 ++++++--
 framework/derive/src/macro_module.rs               | 8 +-------
 framework/derive/src/macro_proxy.rs                | 5 ++++-
 framework/derive/src/model/supertrait.rs           | 4 ++--
 framework/derive/src/parse/contract_trait_parse.rs | 3 ++-
 framework/derive/src/parse/parse_util.rs           | 4 ++--
 6 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/framework/derive/src/macro_contract.rs b/framework/derive/src/macro_contract.rs
index 1333a4310b..47aad731c7 100644
--- a/framework/derive/src/macro_contract.rs
+++ b/framework/derive/src/macro_contract.rs
@@ -8,9 +8,13 @@ pub fn process_contract(
     input: proc_macro::TokenStream,
 ) -> proc_macro::TokenStream {
     let new_input = trait_preprocessing(input);
-    let args_input = parse_macro_input!(args as syn::AttributeArgs);
-    let proc_input = &parse_macro_input!(new_input as syn::ItemTrait);
+    // let args_input = parse_macro_input!(args as syn::AttributeArgs);
+
+    println!("process_contract args are: {:#?}", args);
+    let args_input = parse_macro_input!(args as syn::MetaList);
 
+    println!("process_contract args_input are: {:#?}", args_input);
+    let proc_input = &parse_macro_input!(new_input as syn::ItemTrait);
     let contract = parse_contract_trait(args_input, proc_input);
     validate_contract(&contract);
 
diff --git a/framework/derive/src/macro_module.rs b/framework/derive/src/macro_module.rs
index f7da38c98e..e00d911d0b 100644
--- a/framework/derive/src/macro_module.rs
+++ b/framework/derive/src/macro_module.rs
@@ -8,15 +8,9 @@ pub fn process_module(
     input: proc_macro::TokenStream,
 ) -> proc_macro::TokenStream {
     let new_input = trait_preprocessing(input);
-    println!("args are: {:#?}", args);
-    let args_input = parse_macro_input!(args as syn::AttributeArgs);
+    let args_input = parse_macro_input!(args as syn::MetaList);
     let proc_input = &parse_macro_input!(new_input as syn::ItemTrait);
 
-    // let attribute = match syn::parse::<syn::Attribute>(args.clone()) {
-    //     Ok(val) => {},
-    //     Err(err) => {},
-    // };
-
     let contract = parse_contract_trait(args_input, proc_input);
     validate_contract(&contract);
 
diff --git a/framework/derive/src/macro_proxy.rs b/framework/derive/src/macro_proxy.rs
index 9612167bc6..521fe15e0a 100644
--- a/framework/derive/src/macro_proxy.rs
+++ b/framework/derive/src/macro_proxy.rs
@@ -11,7 +11,10 @@ pub fn process_proxy(
     input: proc_macro::TokenStream,
 ) -> proc_macro::TokenStream {
     let new_input = trait_preprocessing(input);
-    let args_input = parse_macro_input!(args as syn::AttributeArgs);
+
+    let args_input = parse_macro_input!(args as syn::MetaList);
+
+    // let args_input = parse_macro_input!(args as syn::AttributeArgs);
     let proc_input = parse_macro_input!(new_input as syn::ItemTrait);
 
     let contract = parse_contract_trait(args_input, &proc_input);
diff --git a/framework/derive/src/model/supertrait.rs b/framework/derive/src/model/supertrait.rs
index a8775ac417..428bb5ea9c 100644
--- a/framework/derive/src/model/supertrait.rs
+++ b/framework/derive/src/model/supertrait.rs
@@ -1,7 +1,7 @@
-use syn::{punctuated::Punctuated, token::Colon};
+use syn::{punctuated::Punctuated, token::PathSep};
 
 /// Path to a Rust module containing a contract module.
-pub type ModulePath = Punctuated<syn::PathSegment, Colon>;
+pub type ModulePath = Punctuated<syn::PathSegment, PathSep>;
 
 #[derive(Clone, Debug)]
 pub struct Supertrait {
diff --git a/framework/derive/src/parse/contract_trait_parse.rs b/framework/derive/src/parse/contract_trait_parse.rs
index 29a793e102..a8bf37b876 100644
--- a/framework/derive/src/parse/contract_trait_parse.rs
+++ b/framework/derive/src/parse/contract_trait_parse.rs
@@ -1,5 +1,6 @@
 use super::{
-    attributes::extract_doc, method_parse::process_method, parse_util::validate_attribute_args,
+    attributes::extract_doc, method_parse::process_method, 
+    parse_util::validate_attribute_args,
     supertrait_parse::parse_supertrait,
 };
 use crate::{
diff --git a/framework/derive/src/parse/parse_util.rs b/framework/derive/src/parse/parse_util.rs
index 45d834ac8a..3cf731b7e2 100644
--- a/framework/derive/src/parse/parse_util.rs
+++ b/framework/derive/src/parse/parse_util.rs
@@ -1,6 +1,6 @@
-pub fn validate_attribute_args(args: syn::AttributeArgs) {
+pub fn validate_attribute_args(args: syn::MetaList) {
     assert!(
-        args.is_empty(),
+        args.tokens.is_empty(),
         "No arguments expected in contract, module or proxy annotation."
     );
 }

From 3b1f9140b494305efd8d776c283634d13a895ee0 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Mon, 27 Nov 2023 18:15:29 +0200
Subject: [PATCH 0120/1254] cleanup

---
 .../base/src/types/interaction/expr_sc.rs      | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/framework/base/src/types/interaction/expr_sc.rs b/framework/base/src/types/interaction/expr_sc.rs
index a5ba6a5e82..56fed5a5e3 100644
--- a/framework/base/src/types/interaction/expr_sc.rs
+++ b/framework/base/src/types/interaction/expr_sc.rs
@@ -88,22 +88,4 @@ pub mod tests {
             b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x001234567890123456789012",
         );
     }
-
-    // #[test]
-    // fn test_sc_address() {
-    //     let context = InterpreterContext::default();
-    //     assert_eq!(
-    //         b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00a_____________________".to_vec(),
-    //         interpret_string("sc:a", &context)
-    //     );
-    //     assert_eq!(
-    //         b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x001234567890123456789012".to_vec(),
-    //         interpret_string("sc:12345678901234567890120s", &context)
-    //     );
-    //     // trims excess
-    //     assert_eq!(
-    //         b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x001234567890123456789012".to_vec(),
-    //         interpret_string("sc:12345678901234567890120sx", &context)
-    //     );
-    // }
 }

From b7102b273db13f55d362df489bea4b33a66be8df Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Mon, 27 Nov 2023 18:34:24 +0200
Subject: [PATCH 0121/1254] cleanup

---
 framework/base/src/types/interaction/tx_payment.rs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/framework/base/src/types/interaction/tx_payment.rs b/framework/base/src/types/interaction/tx_payment.rs
index 747b6ac3bf..66fa7b6785 100644
--- a/framework/base/src/types/interaction/tx_payment.rs
+++ b/framework/base/src/types/interaction/tx_payment.rs
@@ -79,7 +79,6 @@ where
         fc: FunctionCall<Env::Api>,
     ) {
         EgldPayment::no_payment().perform_transfer_execute(env, to, gas_limit, fc);
-        // perform_transfer_execute_egld(BigUint::zero(), to, gas_limit, fc);
     }
 }
 

From 9639b7fa6028f04dcc1ce0e72eaa3ef2432771cb Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Mon, 27 Nov 2023 18:45:05 +0200
Subject: [PATCH 0122/1254] cleanup

---
 .../base/src/types/interaction/tx_env.rs      | 28 -------------------
 1 file changed, 28 deletions(-)

diff --git a/framework/base/src/types/interaction/tx_env.rs b/framework/base/src/types/interaction/tx_env.rs
index c9746b36aa..59e5406970 100644
--- a/framework/base/src/types/interaction/tx_env.rs
+++ b/framework/base/src/types/interaction/tx_env.rs
@@ -22,31 +22,3 @@ pub trait TxEnv: Sized {
 
     fn default_gas(&self) -> u64;
 }
-
-// pub struct TxTestingEnvironemnt<Api>
-// where
-//     Api: CallTypeApi,
-// {
-//     pub(super) _phantom: PhantomData<Api>,
-//     pub from_annotation: ManagedBuffer<Api>,
-//     pub to_annotation: ManagedBuffer<Api>,
-// }
-
-// impl<Api> TxEnv<Api> for TxTestingEnvironemnt<Api>
-// where
-//     Api: CallTypeApi,
-// {
-//     fn annotate_from<From>(&mut self, from: &From)
-//     where
-//         From: AnnotatedValue<Api, ManagedAddress<Api>>,
-//     {
-//         self.from_annotation = from.annotation();
-//     }
-
-//     fn annotate_to<To>(&mut self, to: &To)
-//     where
-//         To: AnnotatedValue<Api, ManagedAddress<Api>>,
-//     {
-//         self.to_annotation = to.annotation();
-//     }
-// }

From 2fc6e805cd2080af8caee9482cb09d0951b9060d Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Tue, 28 Nov 2023 09:12:58 +0100
Subject: [PATCH 0123/1254] added prints

---
 contracts/examples/adder/src/adder.rs         |  19 +-
 contracts/examples/adder/src/some_file.rs     | 819 ++++++++++++++++++
 framework/derive/src/lib.rs                   |  17 +-
 framework/derive/src/macro_contract.rs        |  16 +-
 .../derive/src/parse/attributes/doc_attr.rs   |  15 +-
 framework/derive/src/type_abi_derive.rs       |   1 +
 6 files changed, 864 insertions(+), 23 deletions(-)
 create mode 100644 contracts/examples/adder/src/some_file.rs

diff --git a/contracts/examples/adder/src/adder.rs b/contracts/examples/adder/src/adder.rs
index 3913efb519..6eb6c2b710 100644
--- a/contracts/examples/adder/src/adder.rs
+++ b/contracts/examples/adder/src/adder.rs
@@ -6,23 +6,6 @@ multiversx_sc::imports!();
 /// it holds a single variable in storage, which anyone can increment.
 #[multiversx_sc::contract]
 pub trait Adder {
-    #[view(getSum)]
-    #[storage_mapper("sum")]
-    fn sum(&self) -> SingleValueMapper<BigUint>;
-
     #[init]
-    fn init(&self, initial_value: BigUint) {
-        self.sum().set(initial_value);
-    }
-
-    #[upgrade]
-    fn upgrade(&self, initial_value: BigUint) {
-        self.init(initial_value);
-    }
-
-    /// Add desired amount to the storage variable.
-    #[endpoint]
-    fn add(&self, value: BigUint) {
-        self.sum().update(|sum| *sum += value);
-    }
+    fn init(&self) {}
 }
diff --git a/contracts/examples/adder/src/some_file.rs b/contracts/examples/adder/src/some_file.rs
new file mode 100644
index 0000000000..1ae88fa5ba
--- /dev/null
+++ b/contracts/examples/adder/src/some_file.rs
@@ -0,0 +1,819 @@
+impl multiversx_sc::abi::TypeAbi for EsdtLocalRole {
+    fn type_name() -> multiversx_sc::abi::TypeName {
+        "EsdtLocalRole".into()
+    }
+    fn provide_type_descriptions<TDC: multiversx_sc::abi::TypeDescriptionContainer>(
+        accumulator: &mut TDC,
+    ) {
+        let type_name = Self::type_name();
+        if !accumulator.contains_type(&type_name) {
+            accumulator.reserve_type_name(type_name.clone());
+            let mut variant_descriptions = multiversx_sc::types::heap::Vec::new();
+            let mut field_descriptions = multiversx_sc::types::heap::Vec::new();
+            variant_descriptions.push(multiversx_sc::abi::EnumVariantDescription::new(
+                &[],
+                "None",
+                0usize,
+                field_descriptions,
+            ));
+            let mut field_descriptions = multiversx_sc::types::heap::Vec::new();
+            variant_descriptions.push(multiversx_sc::abi::EnumVariantDescription::new(
+                &[],
+                "Mint",
+                1usize,
+                field_descriptions,
+            ));
+            let mut field_descriptions = multiversx_sc::types::heap::Vec::new();
+            variant_descriptions.push(multiversx_sc::abi::EnumVariantDescription::new(
+                &[],
+                "Burn",
+                2usize,
+                field_descriptions,
+            ));
+            let mut field_descriptions = multiversx_sc::types::heap::Vec::new();
+            variant_descriptions.push(multiversx_sc::abi::EnumVariantDescription::new(
+                &[],
+                "NftCreate",
+                3usize,
+                field_descriptions,
+            ));
+            let mut field_descriptions = multiversx_sc::types::heap::Vec::new();
+            variant_descriptions.push(multiversx_sc::abi::EnumVariantDescription::new(
+                &[],
+                "NftAddQuantity",
+                4usize,
+                field_descriptions,
+            ));
+            let mut field_descriptions = multiversx_sc::types::heap::Vec::new();
+            variant_descriptions.push(multiversx_sc::abi::EnumVariantDescription::new(
+                &[],
+                "NftBurn",
+                5usize,
+                field_descriptions,
+            ));
+            let mut field_descriptions = multiversx_sc::types::heap::Vec::new();
+            variant_descriptions.push(multiversx_sc::abi::EnumVariantDescription::new(
+                &[],
+                "NftAddUri",
+                6usize,
+                field_descriptions,
+            ));
+            let mut field_descriptions = multiversx_sc::types::heap::Vec::new();
+            variant_descriptions.push(multiversx_sc::abi::EnumVariantDescription::new(
+                &[],
+                "NftUpdateAttributes",
+                7usize,
+                field_descriptions,
+            ));
+            let mut field_descriptions = multiversx_sc::types::heap::Vec::new();
+            variant_descriptions.push(multiversx_sc::abi::EnumVariantDescription::new(
+                &[],
+                "Transfer",
+                8usize,
+                field_descriptions,
+            ));
+            accumulator.insert(
+                type_name.clone(),
+                multiversx_sc::abi::TypeDescription::new(
+                    &[],
+                    type_name,
+                    multiversx_sc::abi::TypeContents::Enum(variant_descriptions),
+                ),
+            );
+        }
+    }
+}
+impl multiversx_sc::abi::TypeAbi for EsdtTokenType {
+    fn type_name() -> multiversx_sc::abi::TypeName {
+        "EsdtTokenType".into()
+    }
+    fn provide_type_descriptions<TDC: multiversx_sc::abi::TypeDescriptionContainer>(
+        accumulator: &mut TDC,
+    ) {
+        let type_name = Self::type_name();
+        if !accumulator.contains_type(&type_name) {
+            accumulator.reserve_type_name(type_name.clone());
+            let mut variant_descriptions = multiversx_sc::types::heap::Vec::new();
+            let mut field_descriptions = multiversx_sc::types::heap::Vec::new();
+            variant_descriptions.push(multiversx_sc::abi::EnumVariantDescription::new(
+                &[],
+                "Fungible",
+                0usize,
+                field_descriptions,
+            ));
+            let mut field_descriptions = multiversx_sc::types::heap::Vec::new();
+            variant_descriptions.push(multiversx_sc::abi::EnumVariantDescription::new(
+                &[],
+                "NonFungible",
+                1usize,
+                field_descriptions,
+            ));
+            let mut field_descriptions = multiversx_sc::types::heap::Vec::new();
+            variant_descriptions.push(multiversx_sc::abi::EnumVariantDescription::new(
+                &[],
+                "SemiFungible",
+                2usize,
+                field_descriptions,
+            ));
+            let mut field_descriptions = multiversx_sc::types::heap::Vec::new();
+            variant_descriptions.push(multiversx_sc::abi::EnumVariantDescription::new(
+                &[],
+                "Meta",
+                3usize,
+                field_descriptions,
+            ));
+            let mut field_descriptions = multiversx_sc::types::heap::Vec::new();
+            variant_descriptions.push(multiversx_sc::abi::EnumVariantDescription::new(
+                &[],
+                "Invalid",
+                4usize,
+                field_descriptions,
+            ));
+            accumulator.insert(
+                type_name.clone(),
+                multiversx_sc::abi::TypeDescription::new(
+                    &[],
+                    type_name,
+                    multiversx_sc::abi::TypeContents::Enum(variant_descriptions),
+                ),
+            );
+        }
+    }
+}
+impl multiversx_sc::types::ManagedVecItem for EsdtTokenType {
+    const PAYLOAD_SIZE: usize = 1;
+    const SKIPS_RESERIALIZATION: bool = true;
+    type Ref<'a> = Self;
+    fn from_byte_reader<Reader: FnMut(&mut [u8])>(mut reader: Reader) -> Self {
+        let mut arr: [u8; 1] = [0u8; 1];
+        reader(&mut arr[..]);
+        match arr[0] {
+            0u8 => EsdtTokenType::Fungible,
+            1u8 => EsdtTokenType::NonFungible,
+            2u8 => EsdtTokenType::SemiFungible,
+            3u8 => EsdtTokenType::Meta,
+            4u8 => EsdtTokenType::Invalid,
+            _ => EsdtTokenType::Fungible,
+        }
+    }
+    unsafe fn from_byte_reader_as_borrow<'a, Reader: FnMut(&mut [u8])>(
+        reader: Reader,
+    ) -> Self::Ref<'a> {
+        Self::from_byte_reader(reader)
+    }
+    fn to_byte_writer<R, Writer: FnMut(&[u8]) -> R>(&self, mut writer: Writer) -> R {
+        let mut arr: [u8; 1] = [0u8; 1];
+        arr[0] = match self {
+            EsdtTokenType::Fungible => 0u8,
+            EsdtTokenType::NonFungible => 1u8,
+            EsdtTokenType::SemiFungible => 2u8,
+            EsdtTokenType::Meta => 3u8,
+            EsdtTokenType::Invalid => 4u8,
+        };
+        writer(&arr[..])
+    }
+}
+impl<M: ManagedTypeApi> multiversx_sc::types::ManagedVecItem for EgldOrEsdtTokenIdentifier<M> {
+    const PAYLOAD_SIZE : usize = < ManagedOption < M, TokenIdentifier < M > >
+    as multiversx_sc :: types :: ManagedVecItem > :: PAYLOAD_SIZE ;
+    const
+    SKIPS_RESERIALIZATION : bool = < ManagedOption < M, TokenIdentifier < M >
+    > as multiversx_sc :: types :: ManagedVecItem > :: SKIPS_RESERIALIZATION ;
+    type Ref<'a> = Self;
+    fn from_byte_reader<Reader: FnMut(&mut [u8])>(mut reader: Reader) -> Self {
+        const SELF_PAYLOAD_SIZE: usize = <EgldOrEsdtTokenIdentifier<
+            multiversx_sc::api::uncallable::UncallableApi,
+        > as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
+        let mut arr: [u8; SELF_PAYLOAD_SIZE] = [0u8; SELF_PAYLOAD_SIZE];
+        reader(&mut arr[..]);
+        let mut index = 0;
+        EgldOrEsdtTokenIdentifier {
+            data: multiversx_sc::types::ManagedVecItem::from_byte_reader(|bytes| {
+                let next_index = index + < ManagedOption < M, TokenIdentifier
+                < M > > as multiversx_sc :: types :: ManagedVecItem > ::
+                PAYLOAD_SIZE ;
+                bytes.copy_from_slice(&arr[index..next_index]);
+                index = next_index;
+            }),
+        }
+    }
+    unsafe fn from_byte_reader_as_borrow<'a, Reader: FnMut(&mut [u8])>(
+        reader: Reader,
+    ) -> Self::Ref<'a> {
+        Self::from_byte_reader(reader)
+    }
+    fn to_byte_writer<R, Writer: FnMut(&[u8]) -> R>(&self, mut writer: Writer) -> R {
+        const SELF_PAYLOAD_SIZE: usize = <EgldOrEsdtTokenIdentifier<
+            multiversx_sc::api::uncallable::UncallableApi,
+        > as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
+        let mut arr: [u8; SELF_PAYLOAD_SIZE] = [0u8; SELF_PAYLOAD_SIZE];
+        let mut index = 0;
+        multiversx_sc::types::ManagedVecItem::to_byte_writer(&self.data, |bytes| {
+            let next_index = index + < ManagedOption < M, TokenIdentifier < M
+            > > as multiversx_sc :: types :: ManagedVecItem > :: PAYLOAD_SIZE
+            ;
+            arr[index..next_index].copy_from_slice(bytes);
+            index = next_index;
+        });
+        writer(&arr[..])
+    }
+}
+impl<M: ManagedTypeApi> multiversx_sc::abi::TypeAbi for EgldOrEsdtTokenPayment<M> {
+    fn type_name() -> multiversx_sc::abi::TypeName {
+        "EgldOrEsdtTokenPayment".into()
+    }
+    fn provide_type_descriptions<TDC: multiversx_sc::abi::TypeDescriptionContainer>(
+        accumulator: &mut TDC,
+    ) {
+        let type_name = Self::type_name();
+        if !accumulator.contains_type(&type_name) {
+            accumulator.reserve_type_name(type_name.clone());
+            let mut field_descriptions = multiversx_sc::types::heap::Vec::new();
+            field_descriptions.push(multiversx_sc::abi::StructFieldDescription::new(
+                &[],
+                "token_identifier",
+                <EgldOrEsdtTokenIdentifier<M>>::type_name(),
+            ));
+            <EgldOrEsdtTokenIdentifier<M>>::provide_type_descriptions(accumulator);
+            field_descriptions.push(multiversx_sc::abi::StructFieldDescription::new(
+                &[],
+                "token_nonce",
+                <u64>::type_name(),
+            ));
+            <u64>::provide_type_descriptions(accumulator);
+            field_descriptions.push(multiversx_sc::abi::StructFieldDescription::new(
+                &[],
+                "amount",
+                <BigUint<M>>::type_name(),
+            ));
+            <BigUint<M>>::provide_type_descriptions(accumulator);
+            accumulator.insert(
+                type_name.clone(),
+                multiversx_sc::abi::TypeDescription::new(
+                    &[],
+                    type_name,
+                    multiversx_sc::abi::TypeContents::Struct(field_descriptions),
+                ),
+            );
+        }
+    }
+}
+impl<M: ManagedTypeApi> multiversx_sc::abi::TypeAbi for EsdtTokenData<M> {
+    fn type_name() -> multiversx_sc::abi::TypeName {
+        "EsdtTokenData".into()
+    }
+    fn provide_type_descriptions<TDC: multiversx_sc::abi::TypeDescriptionContainer>(
+        accumulator: &mut TDC,
+    ) {
+        let type_name = Self::type_name();
+        if !accumulator.contains_type(&type_name) {
+            accumulator.reserve_type_name(type_name.clone());
+            let mut field_descriptions = multiversx_sc::types::heap::Vec::new();
+            field_descriptions.push(multiversx_sc::abi::StructFieldDescription::new(
+                &[],
+                "token_type",
+                <EsdtTokenType>::type_name(),
+            ));
+            <EsdtTokenType>::provide_type_descriptions(accumulator);
+            field_descriptions.push(multiversx_sc::abi::StructFieldDescription::new(
+                &[],
+                "amount",
+                <BigUint<M>>::type_name(),
+            ));
+            <BigUint<M>>::provide_type_descriptions(accumulator);
+            field_descriptions.push(multiversx_sc::abi::StructFieldDescription::new(
+                &[],
+                "frozen",
+                <bool>::type_name(),
+            ));
+            <bool>::provide_type_descriptions(accumulator);
+            field_descriptions.push(multiversx_sc::abi::StructFieldDescription::new(
+                &[],
+                "hash",
+                <ManagedBuffer<M>>::type_name(),
+            ));
+            <ManagedBuffer<M>>::provide_type_descriptions(accumulator);
+            field_descriptions.push(multiversx_sc::abi::StructFieldDescription::new(
+                &[],
+                "name",
+                <ManagedBuffer<M>>::type_name(),
+            ));
+            <ManagedBuffer<M>>::provide_type_descriptions(accumulator);
+            field_descriptions.push(multiversx_sc::abi::StructFieldDescription::new(
+                &[],
+                "attributes",
+                <ManagedBuffer<M>>::type_name(),
+            ));
+            <ManagedBuffer<M>>::provide_type_descriptions(accumulator);
+            field_descriptions.push(multiversx_sc::abi::StructFieldDescription::new(
+                &[],
+                "creator",
+                <ManagedAddress<M>>::type_name(),
+            ));
+            <ManagedAddress<M>>::provide_type_descriptions(accumulator);
+            field_descriptions.push(multiversx_sc::abi::StructFieldDescription::new(
+                &[],
+                "royalties",
+                <BigUint<M>>::type_name(),
+            ));
+            <BigUint<M>>::provide_type_descriptions(accumulator);
+            field_descriptions.push(multiversx_sc::abi::StructFieldDescription::new(
+                &[],
+                "uris",
+                <ManagedVec<M, ManagedBuffer<M>>>::type_name(),
+            ));
+            <ManagedVec<M, ManagedBuffer<M>>>::provide_type_descriptions(accumulator);
+            accumulator.insert(
+                type_name.clone(),
+                multiversx_sc::abi::TypeDescription::new(
+                    &[],
+                    type_name,
+                    multiversx_sc::abi::TypeContents::Struct(field_descriptions),
+                ),
+            );
+        }
+    }
+}
+impl<M: ManagedTypeApi> multiversx_sc::types::ManagedVecItem for EsdtTokenData<M> {
+    const PAYLOAD_SIZE : usize = < EsdtTokenType as multiversx_sc :: types ::
+    ManagedVecItem > :: PAYLOAD_SIZE + < BigUint < M > as multiversx_sc ::
+    types :: ManagedVecItem > :: PAYLOAD_SIZE + < bool as multiversx_sc ::
+    types :: ManagedVecItem > :: PAYLOAD_SIZE + < ManagedBuffer < M > as
+    multiversx_sc :: types :: ManagedVecItem > :: PAYLOAD_SIZE + <
+    ManagedBuffer < M > as multiversx_sc :: types :: ManagedVecItem > ::
+    PAYLOAD_SIZE + < ManagedBuffer < M > as multiversx_sc :: types ::
+    ManagedVecItem > :: PAYLOAD_SIZE + < ManagedAddress < M > as multiversx_sc
+    :: types :: ManagedVecItem > :: PAYLOAD_SIZE + < BigUint < M > as
+    multiversx_sc :: types :: ManagedVecItem > :: PAYLOAD_SIZE + < ManagedVec
+    < M, ManagedBuffer < M > > as multiversx_sc :: types :: ManagedVecItem >
+    :: PAYLOAD_SIZE ;
+    const SKIPS_RESERIALIZATION : bool = < EsdtTokenType as
+    multiversx_sc :: types :: ManagedVecItem > :: SKIPS_RESERIALIZATION && <
+    BigUint < M > as multiversx_sc :: types :: ManagedVecItem > ::
+    SKIPS_RESERIALIZATION && < bool as multiversx_sc :: types ::
+    ManagedVecItem > :: SKIPS_RESERIALIZATION && < ManagedBuffer < M > as
+    multiversx_sc :: types :: ManagedVecItem > :: SKIPS_RESERIALIZATION && <
+    ManagedBuffer < M > as multiversx_sc :: types :: ManagedVecItem > ::
+    SKIPS_RESERIALIZATION && < ManagedBuffer < M > as multiversx_sc :: types
+    :: ManagedVecItem > :: SKIPS_RESERIALIZATION && < ManagedAddress < M > as
+    multiversx_sc :: types :: ManagedVecItem > :: SKIPS_RESERIALIZATION && <
+    BigUint < M > as multiversx_sc :: types :: ManagedVecItem > ::
+    SKIPS_RESERIALIZATION && < ManagedVec < M, ManagedBuffer < M > > as
+    multiversx_sc :: types :: ManagedVecItem > :: SKIPS_RESERIALIZATION ;
+    type Ref<'a> = Self;
+    fn from_byte_reader<Reader: FnMut(&mut [u8])>(mut reader: Reader) -> Self {
+        const SELF_PAYLOAD_SIZE: usize = <EsdtTokenData<
+            multiversx_sc::api::uncallable::UncallableApi,
+        > as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
+        let mut arr: [u8; SELF_PAYLOAD_SIZE] = [0u8; SELF_PAYLOAD_SIZE];
+        reader(&mut arr[..]);
+        let mut index = 0;
+        EsdtTokenData {
+            token_type: multiversx_sc::types::ManagedVecItem::from_byte_reader(|bytes| {
+                let next_index =
+                    index + <EsdtTokenType as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
+                bytes.copy_from_slice(&arr[index..next_index]);
+                index = next_index;
+            }),
+            amount: multiversx_sc::types::ManagedVecItem::from_byte_reader(|bytes| {
+                let next_index =
+                    index + <BigUint<M> as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
+                bytes.copy_from_slice(&arr[index..next_index]);
+                index = next_index;
+            }),
+            frozen: multiversx_sc::types::ManagedVecItem::from_byte_reader(|bytes| {
+                let next_index =
+                    index + <bool as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
+                bytes.copy_from_slice(&arr[index..next_index]);
+                index = next_index;
+            }),
+            hash: multiversx_sc::types::ManagedVecItem::from_byte_reader(|bytes| {
+                let next_index = index
+                    + <ManagedBuffer<M> as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
+                bytes.copy_from_slice(&arr[index..next_index]);
+                index = next_index;
+            }),
+            name: multiversx_sc::types::ManagedVecItem::from_byte_reader(|bytes| {
+                let next_index = index
+                    + <ManagedBuffer<M> as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
+                bytes.copy_from_slice(&arr[index..next_index]);
+                index = next_index;
+            }),
+            attributes: multiversx_sc::types::ManagedVecItem::from_byte_reader(|bytes| {
+                let next_index = index
+                    + <ManagedBuffer<M> as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
+                bytes.copy_from_slice(&arr[index..next_index]);
+                index = next_index;
+            }),
+            creator: multiversx_sc::types::ManagedVecItem::from_byte_reader(|bytes| {
+                let next_index = index
+                    + <ManagedAddress<M> as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
+                bytes.copy_from_slice(&arr[index..next_index]);
+                index = next_index;
+            }),
+            royalties: multiversx_sc::types::ManagedVecItem::from_byte_reader(|bytes| {
+                let next_index =
+                    index + <BigUint<M> as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
+                bytes.copy_from_slice(&arr[index..next_index]);
+                index = next_index;
+            }),
+            uris: multiversx_sc::types::ManagedVecItem::from_byte_reader(|bytes| {
+                let next_index = index + < ManagedVec < M, ManagedBuffer < M >
+                > as multiversx_sc :: types :: ManagedVecItem > ::
+                PAYLOAD_SIZE ;
+                bytes.copy_from_slice(&arr[index..next_index]);
+                index = next_index;
+            }),
+        }
+    }
+    unsafe fn from_byte_reader_as_borrow<'a, Reader: FnMut(&mut [u8])>(
+        reader: Reader,
+    ) -> Self::Ref<'a> {
+        Self::from_byte_reader(reader)
+    }
+    fn to_byte_writer<R, Writer: FnMut(&[u8]) -> R>(&self, mut writer: Writer) -> R {
+        const SELF_PAYLOAD_SIZE: usize = <EsdtTokenData<
+            multiversx_sc::api::uncallable::UncallableApi,
+        > as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
+        let mut arr: [u8; SELF_PAYLOAD_SIZE] = [0u8; SELF_PAYLOAD_SIZE];
+        let mut index = 0;
+        multiversx_sc::types::ManagedVecItem::to_byte_writer(&self.token_type, |bytes| {
+            let next_index =
+                index + <EsdtTokenType as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
+            arr[index..next_index].copy_from_slice(bytes);
+            index = next_index;
+        });
+        multiversx_sc::types::ManagedVecItem::to_byte_writer(&self.amount, |bytes| {
+            let next_index =
+                index + <BigUint<M> as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
+            arr[index..next_index].copy_from_slice(bytes);
+            index = next_index;
+        });
+        multiversx_sc::types::ManagedVecItem::to_byte_writer(&self.frozen, |bytes| {
+            let next_index = index + <bool as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
+            arr[index..next_index].copy_from_slice(bytes);
+            index = next_index;
+        });
+        multiversx_sc::types::ManagedVecItem::to_byte_writer(&self.hash, |bytes| {
+            let next_index =
+                index + <ManagedBuffer<M> as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
+            arr[index..next_index].copy_from_slice(bytes);
+            index = next_index;
+        });
+        multiversx_sc::types::ManagedVecItem::to_byte_writer(&self.name, |bytes| {
+            let next_index =
+                index + <ManagedBuffer<M> as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
+            arr[index..next_index].copy_from_slice(bytes);
+            index = next_index;
+        });
+        multiversx_sc::types::ManagedVecItem::to_byte_writer(&self.attributes, |bytes| {
+            let next_index =
+                index + <ManagedBuffer<M> as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
+            arr[index..next_index].copy_from_slice(bytes);
+            index = next_index;
+        });
+        multiversx_sc::types::ManagedVecItem::to_byte_writer(&self.creator, |bytes| {
+            let next_index =
+                index + <ManagedAddress<M> as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
+            arr[index..next_index].copy_from_slice(bytes);
+            index = next_index;
+        });
+        multiversx_sc::types::ManagedVecItem::to_byte_writer(&self.royalties, |bytes| {
+            let next_index =
+                index + <BigUint<M> as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
+            arr[index..next_index].copy_from_slice(bytes);
+            index = next_index;
+        });
+        multiversx_sc::types::ManagedVecItem::to_byte_writer(&self.uris, |bytes| {
+            let next_index = index + < ManagedVec < M, ManagedBuffer < M > >
+            as multiversx_sc :: types :: ManagedVecItem > :: PAYLOAD_SIZE ;
+            arr[index..next_index].copy_from_slice(bytes);
+            index = next_index;
+        });
+        writer(&arr[..])
+    }
+}
+impl<M: ManagedTypeApi> multiversx_sc::abi::TypeAbi for EsdtTokenPayment<M> {
+    fn type_name() -> multiversx_sc::abi::TypeName {
+        "EsdtTokenPayment".into()
+    }
+    fn provide_type_descriptions<TDC: multiversx_sc::abi::TypeDescriptionContainer>(
+        accumulator: &mut TDC,
+    ) {
+        let type_name = Self::type_name();
+        if !accumulator.contains_type(&type_name) {
+            accumulator.reserve_type_name(type_name.clone());
+            let mut field_descriptions = multiversx_sc::types::heap::Vec::new();
+            field_descriptions.push(multiversx_sc::abi::StructFieldDescription::new(
+                &[],
+                "token_identifier",
+                <TokenIdentifier<M>>::type_name(),
+            ));
+            <TokenIdentifier<M>>::provide_type_descriptions(accumulator);
+            field_descriptions.push(multiversx_sc::abi::StructFieldDescription::new(
+                &[],
+                "token_nonce",
+                <u64>::type_name(),
+            ));
+            <u64>::provide_type_descriptions(accumulator);
+            field_descriptions.push(multiversx_sc::abi::StructFieldDescription::new(
+                &[],
+                "amount",
+                <BigUint<M>>::type_name(),
+            ));
+            <BigUint<M>>::provide_type_descriptions(accumulator);
+            accumulator.insert(
+                type_name.clone(),
+                multiversx_sc::abi::TypeDescription::new(
+                    &[],
+                    type_name,
+                    multiversx_sc::abi::TypeContents::Struct(field_descriptions),
+                ),
+            );
+        }
+    }
+}
+
+/// One of the simplest smart contracts possible,
+/// it holds a single variable in storage, which anyone can increment.
+pub trait Adder {
+    #[init]
+    fn init(&self) {}
+}
+
+impl<M: ManagedTypeApi> multiversx_sc::abi::TypeAbi for EsdtTokenData<M> {
+    fn type_name() -> multiversx_sc::abi::TypeName {
+        "EsdtTokenData".into()
+    }
+    fn provide_type_descriptions<TDC: multiversx_sc::abi::TypeDescriptionContainer>(
+        accumulator: &mut TDC,
+    ) {
+        let type_name = Self::type_name();
+        if !accumulator.contains_type(&type_name) {
+            accumulator.reserve_type_name(type_name.clone());
+            let mut field_descriptions = multiversx_sc::types::heap::Vec::new();
+            field_descriptions.push(multiversx_sc::abi::StructFieldDescription::new(
+                &[],
+                "token_type",
+                <EsdtTokenType>::type_name(),
+            ));
+            <EsdtTokenType>::provide_type_descriptions(accumulator);
+            field_descriptions.push(multiversx_sc::abi::StructFieldDescription::new(
+                &[],
+                "amount",
+                <BigUint<M>>::type_name(),
+            ));
+            <BigUint<M>>::provide_type_descriptions(accumulator);
+            field_descriptions.push(multiversx_sc::abi::StructFieldDescription::new(
+                &[],
+                "frozen",
+                <bool>::type_name(),
+            ));
+            <bool>::provide_type_descriptions(accumulator);
+            field_descriptions.push(multiversx_sc::abi::StructFieldDescription::new(
+                &[],
+                "hash",
+                <ManagedBuffer<M>>::type_name(),
+            ));
+            <ManagedBuffer<M>>::provide_type_descriptions(accumulator);
+            field_descriptions.push(multiversx_sc::abi::StructFieldDescription::new(
+                &[],
+                "name",
+                <ManagedBuffer<M>>::type_name(),
+            ));
+            <ManagedBuffer<M>>::provide_type_descriptions(accumulator);
+            field_descriptions.push(multiversx_sc::abi::StructFieldDescription::new(
+                &[],
+                "attributes",
+                <ManagedBuffer<M>>::type_name(),
+            ));
+            <ManagedBuffer<M>>::provide_type_descriptions(accumulator);
+            field_descriptions.push(multiversx_sc::abi::StructFieldDescription::new(
+                &[],
+                "creator",
+                <ManagedAddress<M>>::type_name(),
+            ));
+            <ManagedAddress<M>>::provide_type_descriptions(accumulator);
+            field_descriptions.push(multiversx_sc::abi::StructFieldDescription::new(
+                &[],
+                "royalties",
+                <BigUint<M>>::type_name(),
+            ));
+            <BigUint<M>>::provide_type_descriptions(accumulator);
+            field_descriptions.push(multiversx_sc::abi::StructFieldDescription::new(
+                &[],
+                "uris",
+                <ManagedVec<M, ManagedBuffer<M>>>::type_name(),
+            ));
+            <ManagedVec<M, ManagedBuffer<M>>>::provide_type_descriptions(accumulator);
+            accumulator.insert(
+                type_name.clone(),
+                multiversx_sc::abi::TypeDescription::new(
+                    &[],
+                    type_name,
+                    multiversx_sc::abi::TypeContents::Struct(field_descriptions),
+                ),
+            );
+        }
+    }
+}
+
+impl<M: ManagedTypeApi> multiversx_sc::types::ManagedVecItem for EsdtTokenData<M> {
+    const PAYLOAD_SIZE : usize = < EsdtTokenType as multiversx_sc :: types ::
+    ManagedVecItem > :: PAYLOAD_SIZE + < BigUint < M > as multiversx_sc ::
+    types :: ManagedVecItem > :: PAYLOAD_SIZE + < bool as multiversx_sc ::
+    types :: ManagedVecItem > :: PAYLOAD_SIZE + < ManagedBuffer < M > as
+    multiversx_sc :: types :: ManagedVecItem > :: PAYLOAD_SIZE + <
+    ManagedBuffer < M > as multiversx_sc :: types :: ManagedVecItem > ::
+    PAYLOAD_SIZE + < ManagedBuffer < M > as multiversx_sc :: types ::
+    ManagedVecItem > :: PAYLOAD_SIZE + < ManagedAddress < M > as multiversx_sc
+    :: types :: ManagedVecItem > :: PAYLOAD_SIZE + < BigUint < M > as
+    multiversx_sc :: types :: ManagedVecItem > :: PAYLOAD_SIZE + < ManagedVec
+    < M, ManagedBuffer < M > > as multiversx_sc :: types :: ManagedVecItem >
+    :: PAYLOAD_SIZE ;
+    const SKIPS_RESERIALIZATION : bool = < EsdtTokenType as
+    multiversx_sc :: types :: ManagedVecItem > :: SKIPS_RESERIALIZATION && <
+    BigUint < M > as multiversx_sc :: types :: ManagedVecItem > ::
+    SKIPS_RESERIALIZATION && < bool as multiversx_sc :: types ::
+    ManagedVecItem > :: SKIPS_RESERIALIZATION && < ManagedBuffer < M > as
+    multiversx_sc :: types :: ManagedVecItem > :: SKIPS_RESERIALIZATION && <
+    ManagedBuffer < M > as multiversx_sc :: types :: ManagedVecItem > ::
+    SKIPS_RESERIALIZATION && < ManagedBuffer < M > as multiversx_sc :: types
+    :: ManagedVecItem > :: SKIPS_RESERIALIZATION && < ManagedAddress < M > as
+    multiversx_sc :: types :: ManagedVecItem > :: SKIPS_RESERIALIZATION && <
+    BigUint < M > as multiversx_sc :: types :: ManagedVecItem > ::
+    SKIPS_RESERIALIZATION && < ManagedVec < M, ManagedBuffer < M > > as
+    multiversx_sc :: types :: ManagedVecItem > :: SKIPS_RESERIALIZATION ;
+    type Ref<'a> = Self;
+    fn from_byte_reader<Reader: FnMut(&mut [u8])>(mut reader: Reader) -> Self {
+        const SELF_PAYLOAD_SIZE: usize = <EsdtTokenData<
+            multiversx_sc::api::uncallable::UncallableApi,
+        > as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
+        let mut arr: [u8; SELF_PAYLOAD_SIZE] = [0u8; SELF_PAYLOAD_SIZE];
+        reader(&mut arr[..]);
+        let mut index = 0;
+        EsdtTokenData {
+            token_type: multiversx_sc::types::ManagedVecItem::from_byte_reader(|bytes| {
+                let next_index =
+                    index + <EsdtTokenType as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
+                bytes.copy_from_slice(&arr[index..next_index]);
+                index = next_index;
+            }),
+            amount: multiversx_sc::types::ManagedVecItem::from_byte_reader(|bytes| {
+                let next_index =
+                    index + <BigUint<M> as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
+                bytes.copy_from_slice(&arr[index..next_index]);
+                index = next_index;
+            }),
+            frozen: multiversx_sc::types::ManagedVecItem::from_byte_reader(|bytes| {
+                let next_index =
+                    index + <bool as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
+                bytes.copy_from_slice(&arr[index..next_index]);
+                index = next_index;
+            }),
+            hash: multiversx_sc::types::ManagedVecItem::from_byte_reader(|bytes| {
+                let next_index = index
+                    + <ManagedBuffer<M> as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
+                bytes.copy_from_slice(&arr[index..next_index]);
+                index = next_index;
+            }),
+            name: multiversx_sc::types::ManagedVecItem::from_byte_reader(|bytes| {
+                let next_index = index
+                    + <ManagedBuffer<M> as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
+                bytes.copy_from_slice(&arr[index..next_index]);
+                index = next_index;
+            }),
+            attributes: multiversx_sc::types::ManagedVecItem::from_byte_reader(|bytes| {
+                let next_index = index
+                    + <ManagedBuffer<M> as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
+                bytes.copy_from_slice(&arr[index..next_index]);
+                index = next_index;
+            }),
+            creator: multiversx_sc::types::ManagedVecItem::from_byte_reader(|bytes| {
+                let next_index = index
+                    + <ManagedAddress<M> as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
+                bytes.copy_from_slice(&arr[index..next_index]);
+                index = next_index;
+            }),
+            royalties: multiversx_sc::types::ManagedVecItem::from_byte_reader(|bytes| {
+                let next_index =
+                    index + <BigUint<M> as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
+                bytes.copy_from_slice(&arr[index..next_index]);
+                index = next_index;
+            }),
+            uris: multiversx_sc::types::ManagedVecItem::from_byte_reader(|bytes| {
+                let next_index = index + < ManagedVec < M, ManagedBuffer < M >
+                > as multiversx_sc :: types :: ManagedVecItem > ::
+                PAYLOAD_SIZE ;
+                bytes.copy_from_slice(&arr[index..next_index]);
+                index = next_index;
+            }),
+        }
+    }
+    unsafe fn from_byte_reader_as_borrow<'a, Reader: FnMut(&mut [u8])>(
+        reader: Reader,
+    ) -> Self::Ref<'a> {
+        Self::from_byte_reader(reader)
+    }
+    fn to_byte_writer<R, Writer: FnMut(&[u8]) -> R>(&self, mut writer: Writer) -> R {
+        const SELF_PAYLOAD_SIZE: usize = <EsdtTokenData<
+            multiversx_sc::api::uncallable::UncallableApi,
+        > as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
+        let mut arr: [u8; SELF_PAYLOAD_SIZE] = [0u8; SELF_PAYLOAD_SIZE];
+        let mut index = 0;
+        multiversx_sc::types::ManagedVecItem::to_byte_writer(&self.token_type, |bytes| {
+            let next_index =
+                index + <EsdtTokenType as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
+            arr[index..next_index].copy_from_slice(bytes);
+            index = next_index;
+        });
+        multiversx_sc::types::ManagedVecItem::to_byte_writer(&self.amount, |bytes| {
+            let next_index =
+                index + <BigUint<M> as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
+            arr[index..next_index].copy_from_slice(bytes);
+            index = next_index;
+        });
+        multiversx_sc::types::ManagedVecItem::to_byte_writer(&self.frozen, |bytes| {
+            let next_index = index + <bool as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
+            arr[index..next_index].copy_from_slice(bytes);
+            index = next_index;
+        });
+        multiversx_sc::types::ManagedVecItem::to_byte_writer(&self.hash, |bytes| {
+            let next_index =
+                index + <ManagedBuffer<M> as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
+            arr[index..next_index].copy_from_slice(bytes);
+            index = next_index;
+        });
+        multiversx_sc::types::ManagedVecItem::to_byte_writer(&self.name, |bytes| {
+            let next_index =
+                index + <ManagedBuffer<M> as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
+            arr[index..next_index].copy_from_slice(bytes);
+            index = next_index;
+        });
+        multiversx_sc::types::ManagedVecItem::to_byte_writer(&self.attributes, |bytes| {
+            let next_index =
+                index + <ManagedBuffer<M> as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
+            arr[index..next_index].copy_from_slice(bytes);
+            index = next_index;
+        });
+        multiversx_sc::types::ManagedVecItem::to_byte_writer(&self.creator, |bytes| {
+            let next_index =
+                index + <ManagedAddress<M> as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
+            arr[index..next_index].copy_from_slice(bytes);
+            index = next_index;
+        });
+        multiversx_sc::types::ManagedVecItem::to_byte_writer(&self.royalties, |bytes| {
+            let next_index =
+                index + <BigUint<M> as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
+            arr[index..next_index].copy_from_slice(bytes);
+            index = next_index;
+        });
+        multiversx_sc::types::ManagedVecItem::to_byte_writer(&self.uris, |bytes| {
+            let next_index = index + < ManagedVec < M, ManagedBuffer < M > >
+            as multiversx_sc :: types :: ManagedVecItem > :: PAYLOAD_SIZE ;
+            arr[index..next_index].copy_from_slice(bytes);
+            index = next_index;
+        });
+        writer(&arr[..])
+    }
+}
+impl<M: ManagedTypeApi> multiversx_sc::abi::TypeAbi for EsdtTokenPayment<M> {
+    fn type_name() -> multiversx_sc::abi::TypeName {
+        "EsdtTokenPayment".into()
+    }
+    fn provide_type_descriptions<TDC: multiversx_sc::abi::TypeDescriptionContainer>(
+        accumulator: &mut TDC,
+    ) {
+        let type_name = Self::type_name();
+        if !accumulator.contains_type(&type_name) {
+            accumulator.reserve_type_name(type_name.clone());
+            let mut field_descriptions = multiversx_sc::types::heap::Vec::new();
+            field_descriptions.push(multiversx_sc::abi::StructFieldDescription::new(
+                &[],
+                "token_identifier",
+                <TokenIdentifier<M>>::type_name(),
+            ));
+            <TokenIdentifier<M>>::provide_type_descriptions(accumulator);
+            field_descriptions.push(multiversx_sc::abi::StructFieldDescription::new(
+                &[],
+                "token_nonce",
+                <u64>::type_name(),
+            ));
+            <u64>::provide_type_descriptions(accumulator);
+            field_descriptions.push(multiversx_sc::abi::StructFieldDescription::new(
+                &[],
+                "amount",
+                <BigUint<M>>::type_name(),
+            ));
+            <BigUint<M>>::provide_type_descriptions(accumulator);
+            accumulator.insert(
+                type_name.clone(),
+                multiversx_sc::abi::TypeDescription::new(
+                    &[],
+                    type_name,
+                    multiversx_sc::abi::TypeContents::Struct(field_descriptions),
+                ),
+            );
+        }
+    }
+}
diff --git a/framework/derive/src/lib.rs b/framework/derive/src/lib.rs
index 08c5b19cd1..3fd8dc9c6f 100644
--- a/framework/derive/src/lib.rs
+++ b/framework/derive/src/lib.rs
@@ -27,6 +27,10 @@ pub fn contract(
     args: proc_macro::TokenStream,
     input: proc_macro::TokenStream,
 ) -> proc_macro::TokenStream {
+    // println!("macro contract: {}", macro_contract::process_contract(args.clone(), input.clone()));
+
+    println!("macro contract args are {}", args.clone());
+    println!("macro contract input is {}", input.clone());
     macro_contract::process_contract(args, input)
 }
 
@@ -35,6 +39,11 @@ pub fn module(
     args: proc_macro::TokenStream,
     input: proc_macro::TokenStream,
 ) -> proc_macro::TokenStream {
+    println!(
+        "module {}",
+        macro_module::process_module(args.clone(), input.clone())
+    );
+
     macro_module::process_module(args, input)
 }
 
@@ -43,13 +52,17 @@ pub fn proxy(
     args: proc_macro::TokenStream,
     input: proc_macro::TokenStream,
 ) -> proc_macro::TokenStream {
+    println!(
+        "proxy {}",
+        macro_proxy::process_proxy(args.clone(), input.clone())
+    );
     macro_proxy::process_proxy(args, input)
 }
 
 #[proc_macro_derive(TypeAbi)]
 pub fn type_abi_derive(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
     let ast = syn::parse(input).unwrap();
-
+    println!("type abi {}", type_abi_derive::type_abi_derive(&ast));
     type_abi_derive::type_abi_derive(&ast)
 }
 
@@ -57,6 +70,8 @@ pub fn type_abi_derive(input: proc_macro::TokenStream) -> proc_macro::TokenStrea
 pub fn managed_vec_item_derive(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
     let ast = syn::parse(input).unwrap();
 
+    println!("managed vec item {}", managed_vec_item_derive::managed_vec_item_derive(&ast));
+
     managed_vec_item_derive::managed_vec_item_derive(&ast)
 }
 
diff --git a/framework/derive/src/macro_contract.rs b/framework/derive/src/macro_contract.rs
index 47aad731c7..7e2418b026 100644
--- a/framework/derive/src/macro_contract.rs
+++ b/framework/derive/src/macro_contract.rs
@@ -3,17 +3,27 @@ use crate::{
     parse::parse_contract_trait, preprocessing::trait_preprocessing, validate::validate_contract,
 };
 
+// #[derive(Debug)]
+// pub struct X {
+//     pub field: Vec<syn::MetaNameValue>,
+// }
+
+// impl syn::parse::Parse for X {
+//     fn parse(input: syn::parse::ParseStream) -> syn::Result<Self> {
+//         Result::Ok(X { field: Vec::new() })
+//     }
+// }
+
 pub fn process_contract(
     args: proc_macro::TokenStream,
     input: proc_macro::TokenStream,
 ) -> proc_macro::TokenStream {
     let new_input = trait_preprocessing(input);
-    // let args_input = parse_macro_input!(args as syn::AttributeArgs);
 
-    println!("process_contract args are: {:#?}", args);
+    // println!("process_contract args are: {:#?}", args);
     let args_input = parse_macro_input!(args as syn::MetaList);
 
-    println!("process_contract args_input are: {:#?}", args_input);
+    // println!("process_contract args_input are: {:#?}", args_input);
     let proc_input = &parse_macro_input!(new_input as syn::ItemTrait);
     let contract = parse_contract_trait(args_input, proc_input);
     validate_contract(&contract);
diff --git a/framework/derive/src/parse/attributes/doc_attr.rs b/framework/derive/src/parse/attributes/doc_attr.rs
index d01730faef..5d9d99095f 100644
--- a/framework/derive/src/parse/attributes/doc_attr.rs
+++ b/framework/derive/src/parse/attributes/doc_attr.rs
@@ -11,18 +11,30 @@ pub fn extract_doc(attrs: &[syn::Attribute]) -> Vec<String> {
         .iter()
         .filter(|attr| {
             if let Some(first_seg) = attr.path().segments.first() {
+                println!("first seg is {:#?}", first_seg);
                 first_seg.ident == ATTR_DOC
             } else {
                 false
             }
         })
         .map(|attr| {
-            let mut tokens_iter = attr.clone().parse_args().into_iter();
+            //this doesn't work
+            //"expected parentheses: #[doc(...)]",
+            let mut tokens_iter = attr.clone().parse_args().into_iter(); 
+
+
+            println!("this the attribute {:#?}", attr);
+            println!("this the token iter {:#?}", tokens_iter);
+            println!(
+                "this the parse args {:#?}",
+                attr.clone().parse_args::<proc_macro2::TokenTree>()
+            );
 
             // checking punctuation, the first token is '='
             if let Some(proc_macro2::TokenTree::Punct(punct)) = tokens_iter.next() {
                 assert_eq!(punct.as_char(), '=');
             } else {
+                println!("shit popped here {:#?}", tokens_iter.next());
                 panic!("malformed doc attribute");
             }
 
@@ -45,6 +57,7 @@ pub fn extract_doc(attrs: &[syn::Attribute]) -> Vec<String> {
                 // also unescape escaped single and double quotes
                 message_slice.replace("\\\"", "\"").replace("\\'", "'")
             } else {
+                println!("shit actually popped here {:#?}", tokens_iter.next());
                 panic!("malformed doc attribute");
             }
         })
diff --git a/framework/derive/src/type_abi_derive.rs b/framework/derive/src/type_abi_derive.rs
index d64c932e22..79b81e8678 100644
--- a/framework/derive/src/type_abi_derive.rs
+++ b/framework/derive/src/type_abi_derive.rs
@@ -40,6 +40,7 @@ fn fields_snippets(fields: &syn::Fields) -> Vec<proc_macro2::TokenStream> {
 
 pub fn type_abi_derive(ast: &syn::DeriveInput) -> TokenStream {
     let type_docs = extract_doc(ast.attrs.as_slice());
+    // let type_docs = Vec::<String>::new();
     let type_description_impl = match &ast.data {
         syn::Data::Struct(data_struct) => {
             let struct_field_snippets = fields_snippets(&data_struct.fields);

From 11cd0caec52a2413f7a6f88ebdd8a341be2c46b0 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Tue, 28 Nov 2023 12:11:28 +0100
Subject: [PATCH 0124/1254] more organized logs, impl typeAbi for
 egldOrMultiEsdt

---
 contracts/examples/adder/src/somefile.rs      | 544 ++++++++++++++++++
 .../wrapped/egld_or_multi_esdt_payment.rs     |  62 +-
 framework/derive/src/lib.rs                   |  25 +-
 framework/derive/src/macro_contract.rs        |  13 +-
 framework/derive/src/macro_proxy.rs           |   3 -
 .../derive/src/parse/attributes/doc_attr.rs   |  22 +-
 .../src/parse/attributes/payable_attr.rs      |   8 +-
 framework/derive/src/parse/attributes/util.rs |  27 +-
 framework/derive/src/parse/parse_util.rs      |   2 +
 9 files changed, 665 insertions(+), 41 deletions(-)
 create mode 100644 contracts/examples/adder/src/somefile.rs

diff --git a/contracts/examples/adder/src/somefile.rs b/contracts/examples/adder/src/somefile.rs
new file mode 100644
index 0000000000..439e043e21
--- /dev/null
+++ b/contracts/examples/adder/src/somefile.rs
@@ -0,0 +1,544 @@
+//// TYPE ABI ////
+impl multiversx_sc::abi::TypeAbi for EsdtLocalRole {
+    fn type_name() -> multiversx_sc::abi::TypeName {
+        "EsdtLocalRole".into()
+    }
+    fn provide_type_descriptions<TDC: multiversx_sc::abi::TypeDescriptionContainer>(
+        accumulator: &mut TDC,
+    ) {
+        let type_name = Self::type_name();
+        if !accumulator.contains_type(&type_name) {
+            accumulator.reserve_type_name(type_name.clone());
+            let mut variant_descriptions = multiversx_sc::types::heap::Vec::new();
+            let mut field_descriptions = multiversx_sc::types::heap::Vec::new();
+            variant_descriptions.push(multiversx_sc::abi::EnumVariantDescription::new(
+                &[],
+                "None",
+                0usize,
+                field_descriptions,
+            ));
+            let mut field_descriptions = multiversx_sc::types::heap::Vec::new();
+            variant_descriptions.push(multiversx_sc::abi::EnumVariantDescription::new(
+                &[],
+                "Mint",
+                1usize,
+                field_descriptions,
+            ));
+            let mut field_descriptions = multiversx_sc::types::heap::Vec::new();
+            variant_descriptions.push(multiversx_sc::abi::EnumVariantDescription::new(
+                &[],
+                "Burn",
+                2usize,
+                field_descriptions,
+            ));
+            let mut field_descriptions = multiversx_sc::types::heap::Vec::new();
+            variant_descriptions.push(multiversx_sc::abi::EnumVariantDescription::new(
+                &[],
+                "NftCreate",
+                3usize,
+                field_descriptions,
+            ));
+            let mut field_descriptions = multiversx_sc::types::heap::Vec::new();
+            variant_descriptions.push(multiversx_sc::abi::EnumVariantDescription::new(
+                &[],
+                "NftAddQuantity",
+                4usize,
+                field_descriptions,
+            ));
+            let mut field_descriptions = multiversx_sc::types::heap::Vec::new();
+            variant_descriptions.push(multiversx_sc::abi::EnumVariantDescription::new(
+                &[],
+                "NftBurn",
+                5usize,
+                field_descriptions,
+            ));
+            let mut field_descriptions = multiversx_sc::types::heap::Vec::new();
+            variant_descriptions.push(multiversx_sc::abi::EnumVariantDescription::new(
+                &[],
+                "NftAddUri",
+                6usize,
+                field_descriptions,
+            ));
+            let mut field_descriptions = multiversx_sc::types::heap::Vec::new();
+            variant_descriptions.push(multiversx_sc::abi::EnumVariantDescription::new(
+                &[],
+                "NftUpdateAttributes",
+                7usize,
+                field_descriptions,
+            ));
+            let mut field_descriptions = multiversx_sc::types::heap::Vec::new();
+            variant_descriptions.push(multiversx_sc::abi::EnumVariantDescription::new(
+                &[],
+                "Transfer",
+                8usize,
+                field_descriptions,
+            ));
+            accumulator.insert(
+                type_name.clone(),
+                multiversx_sc::abi::TypeDescription::new(
+                    &[],
+                    type_name,
+                    multiversx_sc::abi::TypeContents::Enum(variant_descriptions),
+                ),
+            );
+        }
+    }
+}
+//// TYPE ABI ////
+impl multiversx_sc::abi::TypeAbi for EsdtTokenType {
+    fn type_name() -> multiversx_sc::abi::TypeName {
+        "EsdtTokenType".into()
+    }
+    fn provide_type_descriptions<TDC: multiversx_sc::abi::TypeDescriptionContainer>(
+        accumulator: &mut TDC,
+    ) {
+        let type_name = Self::type_name();
+        if !accumulator.contains_type(&type_name) {
+            accumulator.reserve_type_name(type_name.clone());
+            let mut variant_descriptions = multiversx_sc::types::heap::Vec::new();
+            let mut field_descriptions = multiversx_sc::types::heap::Vec::new();
+            variant_descriptions.push(multiversx_sc::abi::EnumVariantDescription::new(
+                &[],
+                "Fungible",
+                0usize,
+                field_descriptions,
+            ));
+            let mut field_descriptions = multiversx_sc::types::heap::Vec::new();
+            variant_descriptions.push(multiversx_sc::abi::EnumVariantDescription::new(
+                &[],
+                "NonFungible",
+                1usize,
+                field_descriptions,
+            ));
+            let mut field_descriptions = multiversx_sc::types::heap::Vec::new();
+            variant_descriptions.push(multiversx_sc::abi::EnumVariantDescription::new(
+                &[],
+                "SemiFungible",
+                2usize,
+                field_descriptions,
+            ));
+            let mut field_descriptions = multiversx_sc::types::heap::Vec::new();
+            variant_descriptions.push(multiversx_sc::abi::EnumVariantDescription::new(
+                &[],
+                "Meta",
+                3usize,
+                field_descriptions,
+            ));
+            let mut field_descriptions = multiversx_sc::types::heap::Vec::new();
+            variant_descriptions.push(multiversx_sc::abi::EnumVariantDescription::new(
+                &[],
+                "Invalid",
+                4usize,
+                field_descriptions,
+            ));
+            accumulator.insert(
+                type_name.clone(),
+                multiversx_sc::abi::TypeDescription::new(
+                    &[],
+                    type_name,
+                    multiversx_sc::abi::TypeContents::Enum(variant_descriptions),
+                ),
+            );
+        }
+    }
+}
+//// MANAGED VEC ITEM ////
+impl multiversx_sc::types::ManagedVecItem for EsdtTokenType {
+    const PAYLOAD_SIZE: usize = 1;
+    const SKIPS_RESERIALIZATION: bool = true;
+    type Ref<'a> = Self;
+    fn from_byte_reader<Reader: FnMut(&mut [u8])>(mut reader: Reader) -> Self {
+        let mut arr: [u8; 1] = [0u8; 1];
+        reader(&mut arr[..]);
+        match arr[0] {
+            0u8 => EsdtTokenType::Fungible,
+            1u8 => EsdtTokenType::NonFungible,
+            2u8 => EsdtTokenType::SemiFungible,
+            3u8 => EsdtTokenType::Meta,
+            4u8 => EsdtTokenType::Invalid,
+            _ => EsdtTokenType::Fungible,
+        }
+    }
+    unsafe fn from_byte_reader_as_borrow<'a, Reader: FnMut(&mut [u8])>(
+        reader: Reader,
+    ) -> Self::Ref<'a> {
+        Self::from_byte_reader(reader)
+    }
+    fn to_byte_writer<R, Writer: FnMut(&[u8]) -> R>(&self, mut writer: Writer) -> R {
+        let mut arr: [u8; 1] = [0u8; 1];
+        arr[0] = match self {
+            EsdtTokenType::Fungible => 0u8,
+            EsdtTokenType::NonFungible => 1u8,
+            EsdtTokenType::SemiFungible => 2u8,
+            EsdtTokenType::Meta => 3u8,
+            EsdtTokenType::Invalid => 4u8,
+        };
+        writer(&arr[..])
+    }
+}
+//// MANAGED VEC ITEM ////
+impl<M: ManagedTypeApi> multiversx_sc::types::ManagedVecItem for EgldOrEsdtTokenIdentifier<M> {
+    const PAYLOAD_SIZE : usize = < ManagedOption < M, TokenIdentifier < M > >
+    as multiversx_sc :: types :: ManagedVecItem > :: PAYLOAD_SIZE ;
+    const
+    SKIPS_RESERIALIZATION : bool = < ManagedOption < M, TokenIdentifier < M >
+    > as multiversx_sc :: types :: ManagedVecItem > :: SKIPS_RESERIALIZATION ;
+    type Ref<'a> = Self;
+    fn from_byte_reader<Reader: FnMut(&mut [u8])>(mut reader: Reader) -> Self {
+        const SELF_PAYLOAD_SIZE: usize = <EgldOrEsdtTokenIdentifier<
+            multiversx_sc::api::uncallable::UncallableApi,
+        > as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
+        let mut arr: [u8; SELF_PAYLOAD_SIZE] = [0u8; SELF_PAYLOAD_SIZE];
+        reader(&mut arr[..]);
+        let mut index = 0;
+        EgldOrEsdtTokenIdentifier {
+            data: multiversx_sc::types::ManagedVecItem::from_byte_reader(|bytes| {
+                let next_index = index + < ManagedOption < M, TokenIdentifier
+                < M > > as multiversx_sc :: types :: ManagedVecItem > ::
+                PAYLOAD_SIZE ;
+                bytes.copy_from_slice(&arr[index..next_index]);
+                index = next_index;
+            }),
+        }
+    }
+    unsafe fn from_byte_reader_as_borrow<'a, Reader: FnMut(&mut [u8])>(
+        reader: Reader,
+    ) -> Self::Ref<'a> {
+        Self::from_byte_reader(reader)
+    }
+    fn to_byte_writer<R, Writer: FnMut(&[u8]) -> R>(&self, mut writer: Writer) -> R {
+        const SELF_PAYLOAD_SIZE: usize = <EgldOrEsdtTokenIdentifier<
+            multiversx_sc::api::uncallable::UncallableApi,
+        > as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
+        let mut arr: [u8; SELF_PAYLOAD_SIZE] = [0u8; SELF_PAYLOAD_SIZE];
+        let mut index = 0;
+        multiversx_sc::types::ManagedVecItem::to_byte_writer(&self.data, |bytes| {
+            let next_index = index + < ManagedOption < M, TokenIdentifier < M
+            > > as multiversx_sc :: types :: ManagedVecItem > :: PAYLOAD_SIZE
+            ;
+            arr[index..next_index].copy_from_slice(bytes);
+            index = next_index;
+        });
+        writer(&arr[..])
+    }
+}
+//// TYPE ABI ////
+impl<M: ManagedTypeApi> multiversx_sc::abi::TypeAbi for EgldOrEsdtTokenPayment<M> {
+    fn type_name() -> multiversx_sc::abi::TypeName {
+        "EgldOrEsdtTokenPayment".into()
+    }
+    fn provide_type_descriptions<TDC: multiversx_sc::abi::TypeDescriptionContainer>(
+        accumulator: &mut TDC,
+    ) {
+        let type_name = Self::type_name();
+        if !accumulator.contains_type(&type_name) {
+            accumulator.reserve_type_name(type_name.clone());
+            let mut field_descriptions = multiversx_sc::types::heap::Vec::new();
+            field_descriptions.push(multiversx_sc::abi::StructFieldDescription::new(
+                &[],
+                "token_identifier",
+                <EgldOrEsdtTokenIdentifier<M>>::type_name(),
+            ));
+            <EgldOrEsdtTokenIdentifier<M>>::provide_type_descriptions(accumulator);
+            field_descriptions.push(multiversx_sc::abi::StructFieldDescription::new(
+                &[],
+                "token_nonce",
+                <u64>::type_name(),
+            ));
+            <u64>::provide_type_descriptions(accumulator);
+            field_descriptions.push(multiversx_sc::abi::StructFieldDescription::new(
+                &[],
+                "amount",
+                <BigUint<M>>::type_name(),
+            ));
+            <BigUint<M>>::provide_type_descriptions(accumulator);
+            accumulator.insert(
+                type_name.clone(),
+                multiversx_sc::abi::TypeDescription::new(
+                    &[],
+                    type_name,
+                    multiversx_sc::abi::TypeContents::Struct(field_descriptions),
+                ),
+            );
+        }
+    }
+}
+
+//// TYPE ABI ////
+impl<M: ManagedTypeApi> multiversx_sc::abi::TypeAbi for EsdtTokenData<M> {
+    fn type_name() -> multiversx_sc::abi::TypeName {
+        "EsdtTokenData".into()
+    }
+    fn provide_type_descriptions<TDC: multiversx_sc::abi::TypeDescriptionContainer>(
+        accumulator: &mut TDC,
+    ) {
+        let type_name = Self::type_name();
+        if !accumulator.contains_type(&type_name) {
+            accumulator.reserve_type_name(type_name.clone());
+            let mut field_descriptions = multiversx_sc::types::heap::Vec::new();
+            field_descriptions.push(multiversx_sc::abi::StructFieldDescription::new(
+                &[],
+                "token_type",
+                <EsdtTokenType>::type_name(),
+            ));
+            <EsdtTokenType>::provide_type_descriptions(accumulator);
+            field_descriptions.push(multiversx_sc::abi::StructFieldDescription::new(
+                &[],
+                "amount",
+                <BigUint<M>>::type_name(),
+            ));
+            <BigUint<M>>::provide_type_descriptions(accumulator);
+            field_descriptions.push(multiversx_sc::abi::StructFieldDescription::new(
+                &[],
+                "frozen",
+                <bool>::type_name(),
+            ));
+            <bool>::provide_type_descriptions(accumulator);
+            field_descriptions.push(multiversx_sc::abi::StructFieldDescription::new(
+                &[],
+                "hash",
+                <ManagedBuffer<M>>::type_name(),
+            ));
+            <ManagedBuffer<M>>::provide_type_descriptions(accumulator);
+            field_descriptions.push(multiversx_sc::abi::StructFieldDescription::new(
+                &[],
+                "name",
+                <ManagedBuffer<M>>::type_name(),
+            ));
+            <ManagedBuffer<M>>::provide_type_descriptions(accumulator);
+            field_descriptions.push(multiversx_sc::abi::StructFieldDescription::new(
+                &[],
+                "attributes",
+                <ManagedBuffer<M>>::type_name(),
+            ));
+            <ManagedBuffer<M>>::provide_type_descriptions(accumulator);
+            field_descriptions.push(multiversx_sc::abi::StructFieldDescription::new(
+                &[],
+                "creator",
+                <ManagedAddress<M>>::type_name(),
+            ));
+            <ManagedAddress<M>>::provide_type_descriptions(accumulator);
+            field_descriptions.push(multiversx_sc::abi::StructFieldDescription::new(
+                &[],
+                "royalties",
+                <BigUint<M>>::type_name(),
+            ));
+            <BigUint<M>>::provide_type_descriptions(accumulator);
+            field_descriptions.push(multiversx_sc::abi::StructFieldDescription::new(
+                &[],
+                "uris",
+                <ManagedVec<M, ManagedBuffer<M>>>::type_name(),
+            ));
+            <ManagedVec<M, ManagedBuffer<M>>>::provide_type_descriptions(accumulator);
+            accumulator.insert(
+                type_name.clone(),
+                multiversx_sc::abi::TypeDescription::new(
+                    &[],
+                    type_name,
+                    multiversx_sc::abi::TypeContents::Struct(field_descriptions),
+                ),
+            );
+        }
+    }
+}
+//// MANAGED VEC ITEM ////
+impl<M: ManagedTypeApi> multiversx_sc::types::ManagedVecItem for EsdtTokenData<M> {
+    const PAYLOAD_SIZE : usize = < EsdtTokenType as multiversx_sc :: types ::
+    ManagedVecItem > :: PAYLOAD_SIZE + < BigUint < M > as multiversx_sc ::
+    types :: ManagedVecItem > :: PAYLOAD_SIZE + < bool as multiversx_sc ::
+    types :: ManagedVecItem > :: PAYLOAD_SIZE + < ManagedBuffer < M > as
+    multiversx_sc :: types :: ManagedVecItem > :: PAYLOAD_SIZE + <
+    ManagedBuffer < M > as multiversx_sc :: types :: ManagedVecItem > ::
+    PAYLOAD_SIZE + < ManagedBuffer < M > as multiversx_sc :: types ::
+    ManagedVecItem > :: PAYLOAD_SIZE + < ManagedAddress < M > as multiversx_sc
+    :: types :: ManagedVecItem > :: PAYLOAD_SIZE + < BigUint < M > as
+    multiversx_sc :: types :: ManagedVecItem > :: PAYLOAD_SIZE + < ManagedVec
+    < M, ManagedBuffer < M > > as multiversx_sc :: types :: ManagedVecItem >
+    :: PAYLOAD_SIZE ;
+    const SKIPS_RESERIALIZATION : bool = < EsdtTokenType as
+    multiversx_sc :: types :: ManagedVecItem > :: SKIPS_RESERIALIZATION && <
+    BigUint < M > as multiversx_sc :: types :: ManagedVecItem > ::
+    SKIPS_RESERIALIZATION && < bool as multiversx_sc :: types ::
+    ManagedVecItem > :: SKIPS_RESERIALIZATION && < ManagedBuffer < M > as
+    multiversx_sc :: types :: ManagedVecItem > :: SKIPS_RESERIALIZATION && <
+    ManagedBuffer < M > as multiversx_sc :: types :: ManagedVecItem > ::
+    SKIPS_RESERIALIZATION && < ManagedBuffer < M > as multiversx_sc :: types
+    :: ManagedVecItem > :: SKIPS_RESERIALIZATION && < ManagedAddress < M > as
+    multiversx_sc :: types :: ManagedVecItem > :: SKIPS_RESERIALIZATION && <
+    BigUint < M > as multiversx_sc :: types :: ManagedVecItem > ::
+    SKIPS_RESERIALIZATION && < ManagedVec < M, ManagedBuffer < M > > as
+    multiversx_sc :: types :: ManagedVecItem > :: SKIPS_RESERIALIZATION ;
+    type Ref<'a> = Self;
+    fn from_byte_reader<Reader: FnMut(&mut [u8])>(mut reader: Reader) -> Self {
+        const SELF_PAYLOAD_SIZE: usize = <EsdtTokenData<
+            multiversx_sc::api::uncallable::UncallableApi,
+        > as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
+        let mut arr: [u8; SELF_PAYLOAD_SIZE] = [0u8; SELF_PAYLOAD_SIZE];
+        reader(&mut arr[..]);
+        let mut index = 0;
+        EsdtTokenData {
+            token_type: multiversx_sc::types::ManagedVecItem::from_byte_reader(|bytes| {
+                let next_index =
+                    index + <EsdtTokenType as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
+                bytes.copy_from_slice(&arr[index..next_index]);
+                index = next_index;
+            }),
+            amount: multiversx_sc::types::ManagedVecItem::from_byte_reader(|bytes| {
+                let next_index =
+                    index + <BigUint<M> as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
+                bytes.copy_from_slice(&arr[index..next_index]);
+                index = next_index;
+            }),
+            frozen: multiversx_sc::types::ManagedVecItem::from_byte_reader(|bytes| {
+                let next_index =
+                    index + <bool as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
+                bytes.copy_from_slice(&arr[index..next_index]);
+                index = next_index;
+            }),
+            hash: multiversx_sc::types::ManagedVecItem::from_byte_reader(|bytes| {
+                let next_index = index
+                    + <ManagedBuffer<M> as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
+                bytes.copy_from_slice(&arr[index..next_index]);
+                index = next_index;
+            }),
+            name: multiversx_sc::types::ManagedVecItem::from_byte_reader(|bytes| {
+                let next_index = index
+                    + <ManagedBuffer<M> as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
+                bytes.copy_from_slice(&arr[index..next_index]);
+                index = next_index;
+            }),
+            attributes: multiversx_sc::types::ManagedVecItem::from_byte_reader(|bytes| {
+                let next_index = index
+                    + <ManagedBuffer<M> as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
+                bytes.copy_from_slice(&arr[index..next_index]);
+                index = next_index;
+            }),
+            creator: multiversx_sc::types::ManagedVecItem::from_byte_reader(|bytes| {
+                let next_index = index
+                    + <ManagedAddress<M> as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
+                bytes.copy_from_slice(&arr[index..next_index]);
+                index = next_index;
+            }),
+            royalties: multiversx_sc::types::ManagedVecItem::from_byte_reader(|bytes| {
+                let next_index =
+                    index + <BigUint<M> as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
+                bytes.copy_from_slice(&arr[index..next_index]);
+                index = next_index;
+            }),
+            uris: multiversx_sc::types::ManagedVecItem::from_byte_reader(|bytes| {
+                let next_index = index + < ManagedVec < M, ManagedBuffer < M >
+                > as multiversx_sc :: types :: ManagedVecItem > ::
+                PAYLOAD_SIZE ;
+                bytes.copy_from_slice(&arr[index..next_index]);
+                index = next_index;
+            }),
+        }
+    }
+    unsafe fn from_byte_reader_as_borrow<'a, Reader: FnMut(&mut [u8])>(
+        reader: Reader,
+    ) -> Self::Ref<'a> {
+        Self::from_byte_reader(reader)
+    }
+    fn to_byte_writer<R, Writer: FnMut(&[u8]) -> R>(&self, mut writer: Writer) -> R {
+        const SELF_PAYLOAD_SIZE: usize = <EsdtTokenData<
+            multiversx_sc::api::uncallable::UncallableApi,
+        > as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
+        let mut arr: [u8; SELF_PAYLOAD_SIZE] = [0u8; SELF_PAYLOAD_SIZE];
+        let mut index = 0;
+        multiversx_sc::types::ManagedVecItem::to_byte_writer(&self.token_type, |bytes| {
+            let next_index =
+                index + <EsdtTokenType as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
+            arr[index..next_index].copy_from_slice(bytes);
+            index = next_index;
+        });
+        multiversx_sc::types::ManagedVecItem::to_byte_writer(&self.amount, |bytes| {
+            let next_index =
+                index + <BigUint<M> as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
+            arr[index..next_index].copy_from_slice(bytes);
+            index = next_index;
+        });
+        multiversx_sc::types::ManagedVecItem::to_byte_writer(&self.frozen, |bytes| {
+            let next_index = index + <bool as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
+            arr[index..next_index].copy_from_slice(bytes);
+            index = next_index;
+        });
+        multiversx_sc::types::ManagedVecItem::to_byte_writer(&self.hash, |bytes| {
+            let next_index =
+                index + <ManagedBuffer<M> as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
+            arr[index..next_index].copy_from_slice(bytes);
+            index = next_index;
+        });
+        multiversx_sc::types::ManagedVecItem::to_byte_writer(&self.name, |bytes| {
+            let next_index =
+                index + <ManagedBuffer<M> as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
+            arr[index..next_index].copy_from_slice(bytes);
+            index = next_index;
+        });
+        multiversx_sc::types::ManagedVecItem::to_byte_writer(&self.attributes, |bytes| {
+            let next_index =
+                index + <ManagedBuffer<M> as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
+            arr[index..next_index].copy_from_slice(bytes);
+            index = next_index;
+        });
+        multiversx_sc::types::ManagedVecItem::to_byte_writer(&self.creator, |bytes| {
+            let next_index =
+                index + <ManagedAddress<M> as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
+            arr[index..next_index].copy_from_slice(bytes);
+            index = next_index;
+        });
+        multiversx_sc::types::ManagedVecItem::to_byte_writer(&self.royalties, |bytes| {
+            let next_index =
+                index + <BigUint<M> as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
+            arr[index..next_index].copy_from_slice(bytes);
+            index = next_index;
+        });
+        multiversx_sc::types::ManagedVecItem::to_byte_writer(&self.uris, |bytes| {
+            let next_index = index + < ManagedVec < M, ManagedBuffer < M > >
+            as multiversx_sc :: types :: ManagedVecItem > :: PAYLOAD_SIZE ;
+            arr[index..next_index].copy_from_slice(bytes);
+            index = next_index;
+        });
+        writer(&arr[..])
+    }
+}
+//// TYPE ABI ////
+impl<M: ManagedTypeApi> multiversx_sc::abi::TypeAbi for EsdtTokenPayment<M> {
+    fn type_name() -> multiversx_sc::abi::TypeName {
+        "EsdtTokenPayment".into()
+    }
+    fn provide_type_descriptions<TDC: multiversx_sc::abi::TypeDescriptionContainer>(
+        accumulator: &mut TDC,
+    ) {
+        let type_name = Self::type_name();
+        if !accumulator.contains_type(&type_name) {
+            accumulator.reserve_type_name(type_name.clone());
+            let mut field_descriptions = multiversx_sc::types::heap::Vec::new();
+            field_descriptions.push(multiversx_sc::abi::StructFieldDescription::new(
+                &[],
+                "token_identifier",
+                <TokenIdentifier<M>>::type_name(),
+            ));
+            <TokenIdentifier<M>>::provide_type_descriptions(accumulator);
+            field_descriptions.push(multiversx_sc::abi::StructFieldDescription::new(
+                &[],
+                "token_nonce",
+                <u64>::type_name(),
+            ));
+            <u64>::provide_type_descriptions(accumulator);
+            field_descriptions.push(multiversx_sc::abi::StructFieldDescription::new(
+                &[],
+                "amount",
+                <BigUint<M>>::type_name(),
+            ));
+            <BigUint<M>>::provide_type_descriptions(accumulator);
+            accumulator.insert(
+                type_name.clone(),
+                multiversx_sc::abi::TypeDescription::new(
+                    &[],
+                    type_name,
+                    multiversx_sc::abi::TypeContents::Struct(field_descriptions),
+                ),
+            );
+        }
+    }
+}
diff --git a/framework/base/src/types/managed/wrapped/egld_or_multi_esdt_payment.rs b/framework/base/src/types/managed/wrapped/egld_or_multi_esdt_payment.rs
index c71aa249d7..5016f24b6a 100644
--- a/framework/base/src/types/managed/wrapped/egld_or_multi_esdt_payment.rs
+++ b/framework/base/src/types/managed/wrapped/egld_or_multi_esdt_payment.rs
@@ -15,12 +15,68 @@ use crate::derive::TypeAbi;
 /// Encodes any type of payment, which either:
 /// - EGLD (can be zero in case of no payment whatsoever);
 /// - Multi-ESDT (one or more ESDT transfers).
-#[derive(
-    TopDecode, TopEncode, NestedDecode, NestedEncode, TypeAbi, Clone, PartialEq, Eq, Debug,
-)]
+#[derive(TopDecode, TopEncode, NestedDecode, NestedEncode, Clone, PartialEq, Eq, Debug)]
 pub enum EgldOrMultiEsdtPayment<M: ManagedTypeApi> {
     Egld(BigUint<M>),
     MultiEsdt(ManagedVec<M, EsdtTokenPayment<M>>),
 }
 
+impl<M: ManagedTypeApi> multiversx_sc::abi::TypeAbi for EgldOrMultiEsdtPayment<M> {
+    fn type_name() -> multiversx_sc::abi::TypeName {
+        "EgldOrMultiEsdtPayment".into()
+    }
+
+    fn provide_type_descriptions<TDC: multiversx_sc::abi::TypeDescriptionContainer>(
+        accumulator: &mut TDC,
+    ) {
+        let type_name = Self::type_name();
+        if !accumulator.contains_type(&type_name) {
+            accumulator.reserve_type_name(type_name.clone());
+
+            let mut field_descriptions = multiversx_sc::types::heap::Vec::new();
+
+            let inner_biguint =
+                multiversx_sc::abi::StructFieldDescription::new(&[], "", <BigUint<M>>::type_name());
+            let mut inner_vec =
+                multiversx_sc::types::Vec::<multiversx_sc::abi::StructFieldDescription>::new();
+            inner_vec.push(inner_biguint);
+
+            field_descriptions.push(multiversx_sc::abi::EnumVariantDescription::new(
+                &[],
+                "Egld",
+                0usize,
+                inner_vec,
+            ));
+            <BigUint<M>>::provide_type_descriptions(accumulator);
+
+            let mut inner_vec_managed =
+                multiversx_sc::types::Vec::<multiversx_sc::abi::StructFieldDescription>::new();
+            let inner_vec_managed_struct = multiversx_sc::abi::StructFieldDescription::new(
+                &[],
+                "",
+                multiversx_sc::types::ManagedVec::<M, multiversx_sc::types::EsdtTokenPayment<M>>::type_name(),
+            );
+            inner_vec_managed.push(inner_vec_managed_struct);
+
+            field_descriptions.push(multiversx_sc::abi::EnumVariantDescription::new(
+                &[],
+                "MultiEsdt",
+                1usize,
+                inner_vec_managed,
+            ));
+            <multiversx_sc::types::EsdtTokenPayment<M>>::provide_type_descriptions(accumulator);
+            <multiversx_sc::types::ManagedVec::<M, multiversx_sc::types::EsdtTokenPayment<M>>>::provide_type_descriptions(accumulator);
+
+            accumulator.insert(
+                type_name.clone(),
+                multiversx_sc::abi::TypeDescription::new(
+                    &[],
+                    type_name,
+                    multiversx_sc::abi::TypeContents::Enum(field_descriptions),
+                ),
+            );
+        }
+    }
+}
+
 impl<M> CodecFromSelf for EgldOrMultiEsdtPayment<M> where M: ManagedTypeApi {}
diff --git a/framework/derive/src/lib.rs b/framework/derive/src/lib.rs
index 3fd8dc9c6f..11181a793d 100644
--- a/framework/derive/src/lib.rs
+++ b/framework/derive/src/lib.rs
@@ -27,10 +27,10 @@ pub fn contract(
     args: proc_macro::TokenStream,
     input: proc_macro::TokenStream,
 ) -> proc_macro::TokenStream {
-    // println!("macro contract: {}", macro_contract::process_contract(args.clone(), input.clone()));
-
-    println!("macro contract args are {}", args.clone());
-    println!("macro contract input is {}", input.clone());
+    println!(
+        "//// CONTRACT //// {}",
+        macro_contract::process_contract(args.clone(), input.clone())
+    );
     macro_contract::process_contract(args, input)
 }
 
@@ -40,10 +40,9 @@ pub fn module(
     input: proc_macro::TokenStream,
 ) -> proc_macro::TokenStream {
     println!(
-        "module {}",
+        "//// MODULE //// {}",
         macro_module::process_module(args.clone(), input.clone())
     );
-
     macro_module::process_module(args, input)
 }
 
@@ -53,7 +52,7 @@ pub fn proxy(
     input: proc_macro::TokenStream,
 ) -> proc_macro::TokenStream {
     println!(
-        "proxy {}",
+        "//// PROXY //// {}",
         macro_proxy::process_proxy(args.clone(), input.clone())
     );
     macro_proxy::process_proxy(args, input)
@@ -62,16 +61,20 @@ pub fn proxy(
 #[proc_macro_derive(TypeAbi)]
 pub fn type_abi_derive(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
     let ast = syn::parse(input).unwrap();
-    println!("type abi {}", type_abi_derive::type_abi_derive(&ast));
+    println!(
+        "//// TYPE ABI //// {}",
+        type_abi_derive::type_abi_derive(&ast)
+    );
     type_abi_derive::type_abi_derive(&ast)
 }
 
 #[proc_macro_derive(ManagedVecItem)]
 pub fn managed_vec_item_derive(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
     let ast = syn::parse(input).unwrap();
-
-    println!("managed vec item {}", managed_vec_item_derive::managed_vec_item_derive(&ast));
-
+    println!(
+        "//// MANAGED VEC ITEM //// {}",
+        managed_vec_item_derive::managed_vec_item_derive(&ast)
+    );
     managed_vec_item_derive::managed_vec_item_derive(&ast)
 }
 
diff --git a/framework/derive/src/macro_contract.rs b/framework/derive/src/macro_contract.rs
index 7e2418b026..e14c2a8e27 100644
--- a/framework/derive/src/macro_contract.rs
+++ b/framework/derive/src/macro_contract.rs
@@ -19,11 +19,16 @@ pub fn process_contract(
     input: proc_macro::TokenStream,
 ) -> proc_macro::TokenStream {
     let new_input = trait_preprocessing(input);
+    // let args_input = parse_macro_input!(args as syn::MetaList);
+    let args_input = syn::MetaList {
+        path: syn::Path {
+            leading_colon: Some(syn::token::PathSep::default()),
+            segments: syn::punctuated::Punctuated::<syn::PathSegment, syn::token::PathSep>::default()
+        },
+        delimiter: syn::MacroDelimiter::Paren(syn::token::Paren::default()),
+        tokens: proc_macro2::TokenStream::new()
+    };
 
-    // println!("process_contract args are: {:#?}", args);
-    let args_input = parse_macro_input!(args as syn::MetaList);
-
-    // println!("process_contract args_input are: {:#?}", args_input);
     let proc_input = &parse_macro_input!(new_input as syn::ItemTrait);
     let contract = parse_contract_trait(args_input, proc_input);
     validate_contract(&contract);
diff --git a/framework/derive/src/macro_proxy.rs b/framework/derive/src/macro_proxy.rs
index 521fe15e0a..f685115162 100644
--- a/framework/derive/src/macro_proxy.rs
+++ b/framework/derive/src/macro_proxy.rs
@@ -11,10 +11,7 @@ pub fn process_proxy(
     input: proc_macro::TokenStream,
 ) -> proc_macro::TokenStream {
     let new_input = trait_preprocessing(input);
-
     let args_input = parse_macro_input!(args as syn::MetaList);
-
-    // let args_input = parse_macro_input!(args as syn::AttributeArgs);
     let proc_input = parse_macro_input!(new_input as syn::ItemTrait);
 
     let contract = parse_contract_trait(args_input, &proc_input);
diff --git a/framework/derive/src/parse/attributes/doc_attr.rs b/framework/derive/src/parse/attributes/doc_attr.rs
index 5d9d99095f..4aaf9c41c3 100644
--- a/framework/derive/src/parse/attributes/doc_attr.rs
+++ b/framework/derive/src/parse/attributes/doc_attr.rs
@@ -11,31 +11,24 @@ pub fn extract_doc(attrs: &[syn::Attribute]) -> Vec<String> {
         .iter()
         .filter(|attr| {
             if let Some(first_seg) = attr.path().segments.first() {
-                println!("first seg is {:#?}", first_seg);
                 first_seg.ident == ATTR_DOC
             } else {
                 false
             }
         })
         .map(|attr| {
-            //this doesn't work
-            //"expected parentheses: #[doc(...)]",
-            let mut tokens_iter = attr.clone().parse_args().into_iter(); 
-
-
-            println!("this the attribute {:#?}", attr);
-            println!("this the token iter {:#?}", tokens_iter);
-            println!(
-                "this the parse args {:#?}",
-                attr.clone().parse_args::<proc_macro2::TokenTree>()
-            );
+            let mut tokens_iter;
+            let tokens: Result<proc_macro2::TokenStream, syn::Error> = attr.clone().parse_args();
+            match tokens {
+                Ok(val) => tokens_iter = val.into_iter(),
+                Err(err) => panic!("failed to parse arguments: {}", err),
+            }
 
             // checking punctuation, the first token is '='
             if let Some(proc_macro2::TokenTree::Punct(punct)) = tokens_iter.next() {
                 assert_eq!(punct.as_char(), '=');
             } else {
-                println!("shit popped here {:#?}", tokens_iter.next());
-                panic!("malformed doc attribute");
+                panic!("malformed doc attribute, the first token should be '='");
             }
 
             if let Some(proc_macro2::TokenTree::Literal(lit)) = tokens_iter.next() {
@@ -57,7 +50,6 @@ pub fn extract_doc(attrs: &[syn::Attribute]) -> Vec<String> {
                 // also unescape escaped single and double quotes
                 message_slice.replace("\\\"", "\"").replace("\\'", "'")
             } else {
-                println!("shit actually popped here {:#?}", tokens_iter.next());
                 panic!("malformed doc attribute");
             }
         })
diff --git a/framework/derive/src/parse/attributes/payable_attr.rs b/framework/derive/src/parse/attributes/payable_attr.rs
index 738e3b10a4..cbb4c5f019 100644
--- a/framework/derive/src/parse/attributes/payable_attr.rs
+++ b/framework/derive/src/parse/attributes/payable_attr.rs
@@ -23,7 +23,13 @@ impl PayableAttribute {
 /// Current implementation only works with 1 token name.
 /// Might be extended in the future.
 fn extract_token_identifier(attr: &syn::Attribute) -> Option<String> {
-    let mut iter = attr.clone().parse_args().into_iter();
+    let mut iter;
+    let tokens: Result<proc_macro2::TokenStream, syn::Error> = attr.clone().parse_args();
+    match tokens {
+        Ok(val) => iter = val.into_iter(),
+        Err(err) => panic!("failed to parse arguments: {}", err),
+    }
+
     let result_str = match iter.next() {
         Some(proc_macro2::TokenTree::Group(group)) => {
             assert!(
diff --git a/framework/derive/src/parse/attributes/util.rs b/framework/derive/src/parse/attributes/util.rs
index d12e338234..69783374e7 100644
--- a/framework/derive/src/parse/attributes/util.rs
+++ b/framework/derive/src/parse/attributes/util.rs
@@ -22,8 +22,14 @@ pub(super) fn get_attribute_with_one_type_arg(
     let attr_path = &attr.path();
     if let Some(first_seg) = attr_path.segments.first() {
         if first_seg.ident == name {
-            let mut tokens = attr.parse_args().clone().into_iter();
-            let group = match tokens.next() {
+            let mut tokens_iter;
+            let tokens: Result<proc_macro2::TokenStream, syn::Error> = attr.clone().parse_args();
+            match tokens {
+                Ok(val) => tokens_iter = val.into_iter(),
+                Err(err) => panic!("failed to parse arguments: {}", err),
+            }
+
+            let group = match tokens_iter.next() {
                 Some(TokenTree::Group(group_val)) => group_val,
                 _ => panic!("Expected a group as attribute argument"),
             };
@@ -74,7 +80,14 @@ pub(super) fn get_attribute_with_one_type_arg(
 
 pub(super) fn attr_one_string_arg(attr: &syn::Attribute) -> String {
     let result_str: String;
-    let mut iter = attr.clone().parse_args().into_iter();
+
+    let mut iter;
+    let tokens: Result<proc_macro2::TokenStream, syn::Error> = attr.clone().parse_args();
+    match tokens {
+        Ok(val) => iter = val.into_iter(),
+        Err(err) => panic!("failed to parse arguments: {}", err),
+    }
+
     match iter.next() {
         Some(proc_macro2::TokenTree::Group(group)) => {
             assert!(
@@ -119,7 +132,13 @@ pub(super) fn is_attr_one_string_arg(attr: &syn::Attribute, attr_name: &str) ->
 }
 
 fn attr_one_opt_token_tree_arg(attr: &syn::Attribute) -> Option<proc_macro2::TokenTree> {
-    let mut iter = attr.clone().parse_args().into_iter();
+    let mut iter;
+    let tokens: Result<proc_macro2::TokenStream, syn::Error> = attr.clone().parse_args();
+    match tokens {
+        Ok(val) => iter = val.into_iter(),
+        Err(err) => panic!("failed to parse arguments: {}", err),
+    }
+
     let arg_token_tree: Option<proc_macro2::TokenTree> = match iter.next() {
         Some(proc_macro2::TokenTree::Group(group)) => {
             assert!(
diff --git a/framework/derive/src/parse/parse_util.rs b/framework/derive/src/parse/parse_util.rs
index 3cf731b7e2..3a0715a282 100644
--- a/framework/derive/src/parse/parse_util.rs
+++ b/framework/derive/src/parse/parse_util.rs
@@ -4,3 +4,5 @@ pub fn validate_attribute_args(args: syn::MetaList) {
         "No arguments expected in contract, module or proxy annotation."
     );
 }
+
+

From eca2d892cc03171209854583af7be0df448715ce Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Tue, 28 Nov 2023 13:17:04 +0100
Subject: [PATCH 0125/1254] updated libraries: sha2, sha3, itertools, hmac,
 pem, pbkdf2

---
 Cargo.lock                     | 113 +++++++--------------------------
 framework/scenario/Cargo.toml  |   2 +-
 sdk/core/Cargo.toml            |  12 ++--
 sdk/core/src/wallet.rs         |   6 +-
 sdk/scenario-format/Cargo.toml |   2 +-
 vm/Cargo.toml                  |   2 +-
 6 files changed, 36 insertions(+), 101 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f865845761..03768ad86a 100755
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -305,16 +305,6 @@ version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
 
-[[package]]
-name = "block-buffer"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4"
-dependencies = [
- "block-padding",
- "generic-array",
-]
-
 [[package]]
 name = "block-buffer"
 version = "0.10.4"
@@ -324,12 +314,6 @@ dependencies = [
  "generic-array",
 ]
 
-[[package]]
-name = "block-padding"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae"
-
 [[package]]
 name = "bonding-curve-contract"
 version = "0.0.0"
@@ -650,16 +634,6 @@ dependencies = [
  "typenum",
 ]
 
-[[package]]
-name = "crypto-mac"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714"
-dependencies = [
- "generic-array",
- "subtle",
-]
-
 [[package]]
 name = "crypto-zombies"
 version = "0.0.0"
@@ -685,7 +659,7 @@ dependencies = [
  "cfg-if",
  "cpufeatures",
  "curve25519-dalek-derive",
- "digest 0.10.7",
+ "digest",
  "fiat-crypto",
  "platforms",
  "rustc_version",
@@ -714,23 +688,15 @@ dependencies = [
  "zeroize",
 ]
 
-[[package]]
-name = "digest"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066"
-dependencies = [
- "generic-array",
-]
-
 [[package]]
 name = "digest"
 version = "0.10.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
 dependencies = [
- "block-buffer 0.10.4",
+ "block-buffer",
  "crypto-common",
+ "subtle",
 ]
 
 [[package]]
@@ -768,7 +734,7 @@ dependencies = [
  "curve25519-dalek",
  "ed25519",
  "serde",
- "sha2 0.10.8",
+ "sha2",
  "zeroize",
 ]
 
@@ -1330,12 +1296,11 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "hmac"
-version = "0.11.0"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a2a2320eb7ec0ebe8da8f744d7812d9fc4cb4d09344ac01898dbcb6a20ae69b"
+checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
 dependencies = [
- "crypto-mac",
- "digest 0.9.0",
+ "digest",
 ]
 
 [[package]]
@@ -1495,9 +1460,9 @@ dependencies = [
 
 [[package]]
 name = "itertools"
-version = "0.11.0"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57"
+checksum = "25db6b064527c5d482d0423354fcd07a89a2dfe07b67892e62411946db7f07b0"
 dependencies = [
  "either",
 ]
@@ -1833,7 +1798,7 @@ dependencies = [
  "num-traits",
  "serde",
  "serde_json",
- "sha3 0.9.1",
+ "sha3",
 ]
 
 [[package]]
@@ -1850,8 +1815,8 @@ dependencies = [
  "num-traits",
  "rand",
  "rand_seeder",
- "sha2 0.10.8",
- "sha3 0.10.8",
+ "sha2",
+ "sha3",
 ]
 
 [[package]]
@@ -1975,7 +1940,7 @@ dependencies = [
  "pathdiff",
  "serde",
  "serde_json",
- "sha2 0.10.8",
+ "sha2",
  "tokio",
 ]
 
@@ -2018,8 +1983,8 @@ dependencies = [
  "serde",
  "serde_json",
  "serde_repr",
- "sha2 0.9.9",
- "sha3 0.9.1",
+ "sha2",
+ "sha3",
  "tokio",
  "zeroize",
 ]
@@ -2184,12 +2149,6 @@ version = "1.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
 
-[[package]]
-name = "opaque-debug"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
-
 [[package]]
 name = "openssl"
 version = "0.10.59"
@@ -2339,20 +2298,21 @@ dependencies = [
 
 [[package]]
 name = "pbkdf2"
-version = "0.9.0"
+version = "0.12.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f05894bce6a1ba4be299d0c5f29563e08af2bc18bb7d48313113bed71e904739"
+checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2"
 dependencies = [
- "crypto-mac",
+ "digest",
 ]
 
 [[package]]
 name = "pem"
-version = "1.1.1"
+version = "3.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8835c273a76a90455d7344889b0964598e3316e2a79ede8e36f16bdcf2228b8"
+checksum = "3163d2912b7c3b52d651a055f2c7eec9ba5cd22d26ef75b8dd3a59980b185923"
 dependencies = [
- "base64 0.13.1",
+ "base64 0.21.5",
+ "serde",
 ]
 
 [[package]]
@@ -2955,19 +2915,6 @@ dependencies = [
  "set-repeat",
 ]
 
-[[package]]
-name = "sha2"
-version = "0.9.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800"
-dependencies = [
- "block-buffer 0.9.0",
- "cfg-if",
- "cpufeatures",
- "digest 0.9.0",
- "opaque-debug",
-]
-
 [[package]]
 name = "sha2"
 version = "0.10.8"
@@ -2976,19 +2923,7 @@ checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
 dependencies = [
  "cfg-if",
  "cpufeatures",
- "digest 0.10.7",
-]
-
-[[package]]
-name = "sha3"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f81199417d4e5de3f04b1e871023acea7389672c4135918f05aa9cbf2f2fa809"
-dependencies = [
- "block-buffer 0.9.0",
- "digest 0.9.0",
- "keccak",
- "opaque-debug",
+ "digest",
 ]
 
 [[package]]
@@ -2997,7 +2932,7 @@ version = "0.10.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60"
 dependencies = [
- "digest 0.10.7",
+ "digest",
  "keccak",
 ]
 
diff --git a/framework/scenario/Cargo.toml b/framework/scenario/Cargo.toml
index 43593cd420..4d6b2cb1bc 100644
--- a/framework/scenario/Cargo.toml
+++ b/framework/scenario/Cargo.toml
@@ -27,7 +27,7 @@ sha2 = "0.10.6"
 serde = "1.0"
 serde_json = "1.0"
 pathdiff = "0.2.1"
-itertools = "0.11"
+itertools = "0.12.0"
 colored = "2.0"
 clap = { version = "4.4.7", features = ["derive"] }
 tokio = { version = "1.24", features = ["full"] }
diff --git a/sdk/core/Cargo.toml b/sdk/core/Cargo.toml
index 5298c0cb80..a5cbe7ddd3 100644
--- a/sdk/core/Cargo.toml
+++ b/sdk/core/Cargo.toml
@@ -24,13 +24,13 @@ serde_repr = "0.1.8"
 anyhow = "1.0.44"
 rand = "0.8.5"
 bip39 = { version = "2.0.0", features = ["rand"] }
-sha2 = "0.9.8"
-sha3 = "0.9.1"
-hmac = { version = "0.11.0", features = ["std"] }
+sha2 = "0.10.8"
+sha3 = "0.10.8"
+hmac = { version = "0.12.1", features = ["std"] }
 hex = "0.4.3"
 base64 = "0.13.0"
-pbkdf2 = { version = "0.9.0", default-features = false }
+pbkdf2 = { version = "0.12.2", default-features = false }
 zeroize = "1.4.2"
 bech32 = "0.9"
-itertools = "0.11"
-pem = "1.0.1"
+itertools = "0.12.0"
+pem = "3.0.2"
diff --git a/sdk/core/src/wallet.rs b/sdk/core/src/wallet.rs
index 469f4be106..ab1b0a2f37 100644
--- a/sdk/core/src/wallet.rs
+++ b/sdk/core/src/wallet.rs
@@ -2,7 +2,7 @@ extern crate rand;
 
 use anyhow::Result;
 use bip39::{Language, Mnemonic};
-use hmac::{Hmac, Mac, NewMac};
+use hmac::{Hmac, Mac};
 use pbkdf2::pbkdf2;
 use serde_json::json;
 use sha2::{Digest, Sha512};
@@ -40,7 +40,7 @@ impl Wallet {
 
         let mut seed = [0u8; 64];
 
-        pbkdf2::<Hmac<Sha512>>(
+        let _ = pbkdf2::<Hmac<Sha512>>(
             mnemonic.to_string().as_bytes(),
             salt.as_bytes(),
             2048,
@@ -105,7 +105,7 @@ impl Wallet {
 
     pub fn from_pem_file_contents(contents: String) -> Result<Self> {
         let x = pem::parse(contents)?;
-        let x = x.contents[..PRIVATE_KEY_LENGTH].to_vec();
+        let x = x.contents()[..PRIVATE_KEY_LENGTH].to_vec();
         let priv_key_str = std::str::from_utf8(x.as_slice())?;
         let pri_key = PrivateKey::from_hex_str(priv_key_str)?;
         Ok(Self { priv_key: pri_key })
diff --git a/sdk/scenario-format/Cargo.toml b/sdk/scenario-format/Cargo.toml
index ee69b43256..76f0751bdc 100644
--- a/sdk/scenario-format/Cargo.toml
+++ b/sdk/scenario-format/Cargo.toml
@@ -19,5 +19,5 @@ serde_json = "1.0"
 num-bigint = "0.4"
 num-traits = "0.2"
 hex = "0.4"
-sha3 = "0.9"
+sha3 = "0.10.8"
 bech32 = "0.9.0"
diff --git a/vm/Cargo.toml b/vm/Cargo.toml
index 450080de57..08e964a8aa 100644
--- a/vm/Cargo.toml
+++ b/vm/Cargo.toml
@@ -25,7 +25,7 @@ sha3 = "0.10.6"
 rand = "0.8.5"
 rand_seeder = "0.2.2"
 ed25519-dalek = "2.0.0"
-itertools = "0.11"
+itertools = "0.12.0"
 hex-literal = "0.4.1"
 bitflags = "1.3.2"
 

From 9dafcd83bab1e69b43ff849454f60932a576034c Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Tue, 28 Nov 2023 15:09:48 +0100
Subject: [PATCH 0126/1254] updated library base64 to 0.21.5

---
 Cargo.lock                                       | 16 +++++-----------
 framework/scenario/Cargo.toml                    |  2 +-
 .../scenario/model/transaction/tx_response.rs    | 16 +++++++++++++---
 framework/snippets/Cargo.toml                    |  2 +-
 framework/snippets/src/interactor_sc_call.rs     | 10 +++++++++-
 framework/snippets/src/interactor_sc_deploy.rs   |  3 ++-
 framework/snippets/src/interactor_vm_query.rs    |  7 ++++++-
 sdk/core/Cargo.toml                              |  2 +-
 8 files changed, 38 insertions(+), 20 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 03768ad86a..71d7ef0266 100755
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -196,12 +196,6 @@ dependencies = [
  "rustc-demangle",
 ]
 
-[[package]]
-name = "base64"
-version = "0.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
-
 [[package]]
 name = "base64"
 version = "0.21.5"
@@ -1922,7 +1916,7 @@ dependencies = [
 name = "multiversx-sc-scenario"
 version = "0.45.1"
 dependencies = [
- "base64 0.13.1",
+ "base64",
  "bech32",
  "clap",
  "colored",
@@ -1948,7 +1942,7 @@ dependencies = [
 name = "multiversx-sc-snippets"
 version = "0.45.1"
 dependencies = [
- "base64 0.13.1",
+ "base64",
  "env_logger",
  "futures",
  "hex",
@@ -1970,7 +1964,7 @@ name = "multiversx-sdk"
 version = "0.3.0"
 dependencies = [
  "anyhow",
- "base64 0.13.1",
+ "base64",
  "bech32",
  "bip39",
  "hex",
@@ -2311,7 +2305,7 @@ version = "3.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3163d2912b7c3b52d651a055f2c7eec9ba5cd22d26ef75b8dd3a59980b185923"
 dependencies = [
- "base64 0.21.5",
+ "base64",
  "serde",
 ]
 
@@ -2595,7 +2589,7 @@ version = "0.11.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b"
 dependencies = [
- "base64 0.21.5",
+ "base64",
  "bytes",
  "encoding_rs",
  "futures-core",
diff --git a/framework/scenario/Cargo.toml b/framework/scenario/Cargo.toml
index 4d6b2cb1bc..55ba7885e9 100644
--- a/framework/scenario/Cargo.toml
+++ b/framework/scenario/Cargo.toml
@@ -17,7 +17,7 @@ keywords = ["multiversx", "blockchain", "contract", "debug"]
 categories = ["cryptography::cryptocurrencies", "development-tools::debugging"]
 
 [dependencies]
-base64 = "0.13.0"
+base64 = "0.21.5"
 num-bigint = "0.4"
 num-traits = "0.2"
 hex = "0.4"
diff --git a/framework/scenario/src/scenario/model/transaction/tx_response.rs b/framework/scenario/src/scenario/model/transaction/tx_response.rs
index 68167affdb..db5f880c02 100644
--- a/framework/scenario/src/scenario/model/transaction/tx_response.rs
+++ b/framework/scenario/src/scenario/model/transaction/tx_response.rs
@@ -4,6 +4,8 @@ use multiversx_sdk::data::transaction::{
     ApiLogs, ApiSmartContractResult, Events, TransactionOnNetwork,
 };
 
+use base64::{engine::general_purpose, Engine as _};
+
 use super::{
     decode_scr_data_or_panic, is_out_scr, process_topics_error, Log, TxExpect, TxResponseStatus,
 };
@@ -108,7 +110,10 @@ impl TxResponse {
                 return TxResponseStatus::signal_error(&error);
             }
 
-            let error_raw = base64::decode(topics.unwrap().get(1).unwrap()).unwrap();
+            let error_raw = general_purpose::STANDARD
+                .decode(topics.unwrap().get(1).unwrap())
+                .unwrap();
+
             let error = String::from_utf8(error_raw).unwrap();
             return TxResponseStatus::signal_error(&error);
         }
@@ -140,7 +145,9 @@ impl TxResponse {
                 if event.identifier == "writeLog" {
                     if let Some(data) = &event.data {
                         let decoded_data =
-                            String::from_utf8(base64::decode(data).unwrap()).unwrap();
+                            String::from_utf8(general_purpose::STANDARD.decode(data).unwrap())
+                                .unwrap();
+
                         if decoded_data.starts_with('@') {
                             let out = decode_scr_data_or_panic(decoded_data.as_str());
                             return Some(out);
@@ -162,7 +169,10 @@ impl TxResponse {
                 return self;
             }
 
-            let address_raw = base64::decode(topics.unwrap().get(0).unwrap()).unwrap();
+            let address_raw = general_purpose::STANDARD
+                .decode(topics.unwrap().get(0).unwrap())
+                .unwrap();
+
             let address: Address = Address::from_slice(address_raw.as_slice());
             self.new_deployed_address = Some(address);
         }
diff --git a/framework/snippets/Cargo.toml b/framework/snippets/Cargo.toml
index c3cb7ef7e2..05175bee45 100644
--- a/framework/snippets/Cargo.toml
+++ b/framework/snippets/Cargo.toml
@@ -16,7 +16,7 @@ categories = ["cryptography::cryptocurrencies"]
 [dependencies]
 tokio = { version = "1.24", features = ["full"] }
 hex = "0.4"
-base64 = "0.13.0"
+base64 = "0.21.5"
 log = "0.4.17"
 env_logger = "0.10"
 futures = "0.3"
diff --git a/framework/snippets/src/interactor_sc_call.rs b/framework/snippets/src/interactor_sc_call.rs
index e7ab40d419..c042f57097 100644
--- a/framework/snippets/src/interactor_sc_call.rs
+++ b/framework/snippets/src/interactor_sc_call.rs
@@ -1,4 +1,5 @@
 use crate::{address_h256_to_erdrs, mandos_to_erdrs_address, Interactor};
+use base64::{engine::general_purpose, Engine as _};
 use log::info;
 use multiversx_sc_scenario::{
     api::StaticApi,
@@ -51,7 +52,14 @@ impl Interactor {
         let data = if contract_call_tx_data.is_empty() {
             None
         } else {
-            Some(base64::encode(contract_call_tx_data))
+            Some(
+                String::from_utf8(
+                    general_purpose::STANDARD
+                        .encode(contract_call_tx_data)
+                        .into(),
+                )
+                .unwrap(),
+            )
         };
 
         Transaction {
diff --git a/framework/snippets/src/interactor_sc_deploy.rs b/framework/snippets/src/interactor_sc_deploy.rs
index f2808fb9ee..e34f64ccca 100644
--- a/framework/snippets/src/interactor_sc_deploy.rs
+++ b/framework/snippets/src/interactor_sc_deploy.rs
@@ -1,4 +1,5 @@
 use crate::{mandos_to_erdrs_address, Interactor};
+use base64::{engine::general_purpose, Engine as _};
 use log::info;
 use multiversx_sc_scenario::{
     bech32,
@@ -18,7 +19,7 @@ impl Interactor {
             receiver: ErdrsAddress::from_bytes(DEPLOY_RECEIVER),
             gas_price: self.network_config.min_gas_price,
             gas_limit: sc_deploy_step.tx.gas_limit.value,
-            data: Some(base64::encode(sc_deploy_step.tx.to_tx_data())),
+            data: Some(general_purpose::STANDARD.encode(sc_deploy_step.tx.to_tx_data())),
             signature: None,
             chain_id: self.network_config.chain_id.clone(),
             version: self.network_config.min_transaction_version,
diff --git a/framework/snippets/src/interactor_vm_query.rs b/framework/snippets/src/interactor_vm_query.rs
index f4b21e2594..cf03a12b99 100644
--- a/framework/snippets/src/interactor_vm_query.rs
+++ b/framework/snippets/src/interactor_vm_query.rs
@@ -1,4 +1,5 @@
 use crate::{address_h256_to_erdrs, Interactor};
+use base64::{engine::general_purpose, Engine as _};
 use log::info;
 use multiversx_sc_scenario::{
     api::StaticApi,
@@ -43,7 +44,11 @@ impl Interactor {
             .data
             .return_data
             .iter()
-            .map(|result| base64::decode(result).expect("query result base64 decode error"))
+            .map(|result| {
+                general_purpose::STANDARD
+                    .decode(result)
+                    .expect("query result base64 decode error")
+            })
             .collect();
         step.save_response(TxResponse::from_raw_results(raw_results));
 
diff --git a/sdk/core/Cargo.toml b/sdk/core/Cargo.toml
index a5cbe7ddd3..b276349cf2 100644
--- a/sdk/core/Cargo.toml
+++ b/sdk/core/Cargo.toml
@@ -28,7 +28,7 @@ sha2 = "0.10.8"
 sha3 = "0.10.8"
 hmac = { version = "0.12.1", features = ["std"] }
 hex = "0.4.3"
-base64 = "0.13.0"
+base64 = "0.21.5"
 pbkdf2 = { version = "0.12.2", default-features = false }
 zeroize = "1.4.2"
 bech32 = "0.9"

From 569f6c7f2600531336b35faf335afc4d52c6bd1e Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Tue, 28 Nov 2023 15:47:34 +0100
Subject: [PATCH 0127/1254] updated bitflags library to 2.4.1, made changes to
 multisig, codeMetadata and esdtLocalRoleFlags

---
 Cargo.lock                                             |  2 +-
 contracts/examples/multisig/src/multisig_perform.rs    |  4 ++--
 framework/base/Cargo.toml                              |  2 +-
 framework/base/src/types/flags/code_metadata.rs        | 10 +++++-----
 .../base/src/types/flags/esdt_local_role_flags.rs      |  3 ++-
 .../scenario/src/api/core_api_vh/blockchain_api_vh.rs  |  4 +++-
 6 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 71d7ef0266..2feda8631b 100755
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1842,7 +1842,7 @@ dependencies = [
 name = "multiversx-sc"
 version = "0.45.1"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.4.1",
  "hashbrown 0.14.2",
  "hex-literal",
  "multiversx-sc-codec",
diff --git a/contracts/examples/multisig/src/multisig_perform.rs b/contracts/examples/multisig/src/multisig_perform.rs
index 4769923423..94bcd41d26 100644
--- a/contracts/examples/multisig/src/multisig_perform.rs
+++ b/contracts/examples/multisig/src/multisig_perform.rs
@@ -208,7 +208,7 @@ pub trait MultisigPerformModule:
                     action_id,
                     &amount,
                     &source,
-                    code_metadata,
+                    code_metadata.clone(),
                     gas_left,
                     arguments.as_multi(),
                 );
@@ -234,7 +234,7 @@ pub trait MultisigPerformModule:
                     &sc_address,
                     &amount,
                     &source,
-                    code_metadata,
+                    code_metadata.clone(),
                     gas_left,
                     arguments.as_multi(),
                 );
diff --git a/framework/base/Cargo.toml b/framework/base/Cargo.toml
index 561de474b3..043ef72138 100644
--- a/framework/base/Cargo.toml
+++ b/framework/base/Cargo.toml
@@ -27,7 +27,7 @@ esdt-token-payment-legacy-decode = []
 [dependencies]
 hashbrown = "0.14.2"
 hex-literal = "0.4.1"
-bitflags = "1.3.2"
+bitflags = "2.4.1"
 num-traits = { version = "0.2", default-features = false }
 
 [dependencies.multiversx-sc-derive]
diff --git a/framework/base/src/types/flags/code_metadata.rs b/framework/base/src/types/flags/code_metadata.rs
index d18895d11a..fcee264ab2 100644
--- a/framework/base/src/types/flags/code_metadata.rs
+++ b/framework/base/src/types/flags/code_metadata.rs
@@ -14,7 +14,7 @@ const PAYABLE_BY_SC_STRING: &[u8] = b"PayableBySC";
 const DEFAULT_STRING: &[u8] = b"Default";
 
 bitflags! {
-    #[derive(Default)]
+    #[derive(Default, PartialEq, Debug, Clone)]
     pub struct CodeMetadata: u16 {
         const DEFAULT = 0;
         const UPGRADEABLE = 0b0000_0001_0000_0000; // LSB of first byte
@@ -26,19 +26,19 @@ bitflags! {
 
 impl CodeMetadata {
     pub fn is_upgradeable(&self) -> bool {
-        *self & CodeMetadata::UPGRADEABLE != CodeMetadata::DEFAULT
+        self.bits() & CodeMetadata::UPGRADEABLE.bits() != CodeMetadata::DEFAULT.bits()
     }
 
     pub fn is_payable(&self) -> bool {
-        *self & CodeMetadata::PAYABLE != CodeMetadata::DEFAULT
+        self.bits() & CodeMetadata::PAYABLE.bits() != CodeMetadata::DEFAULT.bits()
     }
 
     pub fn is_payable_by_sc(&self) -> bool {
-        *self & CodeMetadata::PAYABLE_BY_SC != CodeMetadata::DEFAULT
+        self.bits() & CodeMetadata::PAYABLE_BY_SC.bits() != CodeMetadata::DEFAULT.bits()
     }
 
     pub fn is_readable(&self) -> bool {
-        *self & CodeMetadata::READABLE != CodeMetadata::DEFAULT
+        self.bits() & CodeMetadata::READABLE.bits() != CodeMetadata::DEFAULT.bits()
     }
 
     #[inline]
diff --git a/framework/base/src/types/flags/esdt_local_role_flags.rs b/framework/base/src/types/flags/esdt_local_role_flags.rs
index 7be536e349..b147499165 100644
--- a/framework/base/src/types/flags/esdt_local_role_flags.rs
+++ b/framework/base/src/types/flags/esdt_local_role_flags.rs
@@ -4,6 +4,7 @@ use super::EsdtLocalRole;
 use bitflags::bitflags;
 
 bitflags! {
+    #[derive(PartialEq)]
     pub struct EsdtLocalRoleFlags: u64 {
         const NONE                  = 0b00000000;
         const MINT                  = 0b00000001;
@@ -19,7 +20,7 @@ bitflags! {
 
 impl EsdtLocalRoleFlags {
     pub fn has_role(&self, role: &EsdtLocalRole) -> bool {
-        *self & role.to_flag() != EsdtLocalRoleFlags::NONE
+        self.bits() & role.to_flag().bits() != EsdtLocalRoleFlags::NONE.bits()
     }
 
     pub fn iter_roles(&self) -> impl Iterator<Item = &EsdtLocalRole> {
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 fa723dd273..1bc6dd6693 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
@@ -264,6 +264,8 @@ impl<VHB: VMHooksApiBackend> BlockchainApiImpl for VMHooksApi<VHB> {
         let result = self.with_vm_hooks(|vh| {
             vh.get_esdt_local_roles(token_id_handle.get_raw_handle_unchecked())
         });
-        unsafe { EsdtLocalRoleFlags::from_bits_unchecked(result as u64) }
+        unsafe { 
+            multiversx_sc::types::EsdtLocalRoleFlags::from_bits_unchecked(result as u64) 
+        }
     }
 }

From db90b08dd2786a35899d7a028dd6081f0e71f357 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Tue, 28 Nov 2023 15:53:31 +0100
Subject: [PATCH 0128/1254] added bitflags update to the vm

---
 Cargo.lock                               |  2 +-
 vm/Cargo.toml                            |  2 +-
 vm/src/types/vm_code_metadata.rs         | 10 +++++-----
 vm/src/types/vm_esdt_local_role_flags.rs |  2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 2feda8631b..7e73d818b0 100755
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1799,7 +1799,7 @@ dependencies = [
 name = "multiversx-chain-vm"
 version = "0.7.0"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.4.1",
  "ed25519-dalek",
  "hex",
  "hex-literal",
diff --git a/vm/Cargo.toml b/vm/Cargo.toml
index 08e964a8aa..a26e59dfd8 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 = "1.3.2"
+bitflags = "2.4.1"
 
 [dependencies.multiversx-chain-vm-executor]
 version = "0.2.0"
diff --git a/vm/src/types/vm_code_metadata.rs b/vm/src/types/vm_code_metadata.rs
index 27f54f0277..607b4196a9 100644
--- a/vm/src/types/vm_code_metadata.rs
+++ b/vm/src/types/vm_code_metadata.rs
@@ -3,7 +3,7 @@
 use bitflags::bitflags;
 
 bitflags! {
-    #[derive(Default)]
+    #[derive(Default, PartialEq, Debug)]
     pub struct VMCodeMetadata: u16 {
         const DEFAULT = 0;
         const UPGRADEABLE = 0b0000_0001_0000_0000; // LSB of first byte
@@ -15,19 +15,19 @@ bitflags! {
 
 impl VMCodeMetadata {
     pub fn is_upgradeable(&self) -> bool {
-        *self & VMCodeMetadata::UPGRADEABLE != VMCodeMetadata::DEFAULT
+        self.bits() & VMCodeMetadata::UPGRADEABLE.bits() != VMCodeMetadata::DEFAULT.bits()
     }
 
     pub fn is_payable(&self) -> bool {
-        *self & VMCodeMetadata::PAYABLE != VMCodeMetadata::DEFAULT
+        self.bits() & VMCodeMetadata::PAYABLE.bits() != VMCodeMetadata::DEFAULT.bits()
     }
 
     pub fn is_payable_by_sc(&self) -> bool {
-        *self & VMCodeMetadata::PAYABLE_BY_SC != VMCodeMetadata::DEFAULT
+        self.bits() & VMCodeMetadata::PAYABLE_BY_SC.bits() != VMCodeMetadata::DEFAULT.bits()
     }
 
     pub fn is_readable(&self) -> bool {
-        *self & VMCodeMetadata::READABLE != VMCodeMetadata::DEFAULT
+        self.bits() & VMCodeMetadata::READABLE.bits() != VMCodeMetadata::DEFAULT.bits()
     }
 
     pub fn to_byte_array(&self) -> [u8; 2] {
diff --git a/vm/src/types/vm_esdt_local_role_flags.rs b/vm/src/types/vm_esdt_local_role_flags.rs
index e386db5917..742f907177 100644
--- a/vm/src/types/vm_esdt_local_role_flags.rs
+++ b/vm/src/types/vm_esdt_local_role_flags.rs
@@ -24,7 +24,7 @@ bitflags! {
 
 impl EsdtLocalRoleFlags {
     pub fn has_role(&self, role: &EsdtLocalRole) -> bool {
-        *self & role.to_flag() != EsdtLocalRoleFlags::NONE
+        self.bits() & role.to_flag().bits() != EsdtLocalRoleFlags::NONE.bits()
     }
 
     pub fn iter_roles(&self) -> impl Iterator<Item = &EsdtLocalRole> {

From cb498850d7796a099937b7d5816999c2d16acc64 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Tue, 28 Nov 2023 16:22:25 +0100
Subject: [PATCH 0129/1254] fixed from_bits_unchecked, replaced with from_bits

---
 .../scenario/src/api/core_api_vh/blockchain_api_vh.rs    | 5 ++---
 framework/wasm-adapter/src/api/blockchain_api_node.rs    | 9 ++++-----
 2 files changed, 6 insertions(+), 8 deletions(-)

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 1bc6dd6693..00e182f690 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
@@ -264,8 +264,7 @@ impl<VHB: VMHooksApiBackend> BlockchainApiImpl for VMHooksApi<VHB> {
         let result = self.with_vm_hooks(|vh| {
             vh.get_esdt_local_roles(token_id_handle.get_raw_handle_unchecked())
         });
-        unsafe { 
-            multiversx_sc::types::EsdtLocalRoleFlags::from_bits_unchecked(result as u64) 
-        }
+
+        multiversx_sc::types::EsdtLocalRoleFlags::from_bits(result as u64).unwrap()
     }
 }
diff --git a/framework/wasm-adapter/src/api/blockchain_api_node.rs b/framework/wasm-adapter/src/api/blockchain_api_node.rs
index 011d4e4e05..f80c4da8c9 100644
--- a/framework/wasm-adapter/src/api/blockchain_api_node.rs
+++ b/framework/wasm-adapter/src/api/blockchain_api_node.rs
@@ -356,10 +356,9 @@ impl BlockchainApiImpl for VmApiImpl {
         &self,
         token_id_handle: Self::ManagedBufferHandle,
     ) -> multiversx_sc::types::EsdtLocalRoleFlags {
-        unsafe {
-            multiversx_sc::types::EsdtLocalRoleFlags::from_bits_unchecked(getESDTLocalRoles(
-                token_id_handle,
-            ) as u64)
-        }
+        multiversx_sc::types::EsdtLocalRoleFlags::from_bits(unsafe {
+            getESDTLocalRoles(token_id_handle)
+        } as u64)
+        .unwrap()
     }
 }

From bf0f1fed8c76207c69ba01533889b22ff43fb7b6 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Tue, 28 Nov 2023 17:46:09 +0100
Subject: [PATCH 0130/1254] few more tries, small fix in egldOrMultiEsdt

---
 contracts/examples/adder/src/somefile.rs      | 38 +++++++++++++++++++
 .../wrapped/egld_or_multi_esdt_payment.rs     |  4 +-
 framework/derive/src/lib.rs                   |  3 ++
 framework/derive/src/macro_contract.rs        | 24 ++++++------
 framework/derive/src/macro_module.rs          |  4 +-
 framework/derive/src/parse/parse_util.rs      |  2 -
 6 files changed, 58 insertions(+), 17 deletions(-)

diff --git a/contracts/examples/adder/src/somefile.rs b/contracts/examples/adder/src/somefile.rs
index 439e043e21..7976de1fd9 100644
--- a/contracts/examples/adder/src/somefile.rs
+++ b/contracts/examples/adder/src/somefile.rs
@@ -1,3 +1,32 @@
+#![feature(prelude_import)]
+#![no_std]
+#[prelude_import]
+use core::prelude::rust_2021::*;
+#[macro_use]
+extern crate core;
+#[macro_use]
+extern crate compiler_builtins;
+use core::ops::{
+    Add, AddAssign, BitAnd, BitAndAssign, BitOr, BitOrAssign, BitXor, BitXorAssign, Div,
+    DivAssign, Mul, MulAssign, Rem, RemAssign, Shl, ShlAssign, Shr, ShrAssign, Sub,
+    SubAssign,
+};
+use multiversx_sc::{
+    abi::TypeAbi, api::{ErrorApiImpl, ManagedTypeApi},
+    arrayvec::ArrayVec,
+    codec::{
+        multi_types::*, DecodeError, IntoMultiValue, NestedDecode, NestedEncode,
+        TopDecode, TopEncode,
+    },
+    contract_base::{ContractBase, ProxyObjBase},
+    err_msg, esdt::*, io::*, non_zero_usize, non_zero_util::*, require, require_old,
+    sc_error, sc_format, sc_panic, sc_print, storage::mappers::*,
+    types::{
+        SCResult::{Err, Ok},
+        *,
+    },
+};
+
 //// TYPE ABI ////
 impl multiversx_sc::abi::TypeAbi for EsdtLocalRole {
     fn type_name() -> multiversx_sc::abi::TypeName {
@@ -542,3 +571,12 @@ impl<M: ManagedTypeApi> multiversx_sc::abi::TypeAbi for EsdtTokenPayment<M> {
         }
     }
 }
+
+/// One of the simplest smart contracts possible,
+/// it holds a single variable in storage, which anyone can increment.
+pub trait Adder {
+    #[init]
+    fn init(&self) {}
+}
+
+
diff --git a/framework/base/src/types/managed/wrapped/egld_or_multi_esdt_payment.rs b/framework/base/src/types/managed/wrapped/egld_or_multi_esdt_payment.rs
index 5016f24b6a..6d543b94db 100644
--- a/framework/base/src/types/managed/wrapped/egld_or_multi_esdt_payment.rs
+++ b/framework/base/src/types/managed/wrapped/egld_or_multi_esdt_payment.rs
@@ -38,7 +38,7 @@ impl<M: ManagedTypeApi> multiversx_sc::abi::TypeAbi for EgldOrMultiEsdtPayment<M
             let inner_biguint =
                 multiversx_sc::abi::StructFieldDescription::new(&[], "", <BigUint<M>>::type_name());
             let mut inner_vec =
-                multiversx_sc::types::Vec::<multiversx_sc::abi::StructFieldDescription>::new();
+                crate::types::heap::Vec::<multiversx_sc::abi::StructFieldDescription>::new();
             inner_vec.push(inner_biguint);
 
             field_descriptions.push(multiversx_sc::abi::EnumVariantDescription::new(
@@ -50,7 +50,7 @@ impl<M: ManagedTypeApi> multiversx_sc::abi::TypeAbi for EgldOrMultiEsdtPayment<M
             <BigUint<M>>::provide_type_descriptions(accumulator);
 
             let mut inner_vec_managed =
-                multiversx_sc::types::Vec::<multiversx_sc::abi::StructFieldDescription>::new();
+            crate::types::heap::Vec::<multiversx_sc::abi::StructFieldDescription>::new();
             let inner_vec_managed_struct = multiversx_sc::abi::StructFieldDescription::new(
                 &[],
                 "",
diff --git a/framework/derive/src/lib.rs b/framework/derive/src/lib.rs
index 11181a793d..b082a892b3 100644
--- a/framework/derive/src/lib.rs
+++ b/framework/derive/src/lib.rs
@@ -27,11 +27,14 @@ pub fn contract(
     args: proc_macro::TokenStream,
     input: proc_macro::TokenStream,
 ) -> proc_macro::TokenStream {
+    println!(" args {}", args.clone());
+    println!(" input {}", input.clone());
     println!(
         "//// CONTRACT //// {}",
         macro_contract::process_contract(args.clone(), input.clone())
     );
     macro_contract::process_contract(args, input)
+    // proc_macro::TokenStream::new()
 }
 
 #[proc_macro_attribute]
diff --git a/framework/derive/src/macro_contract.rs b/framework/derive/src/macro_contract.rs
index e14c2a8e27..a3c5ce0614 100644
--- a/framework/derive/src/macro_contract.rs
+++ b/framework/derive/src/macro_contract.rs
@@ -3,23 +3,25 @@ use crate::{
     parse::parse_contract_trait, preprocessing::trait_preprocessing, validate::validate_contract,
 };
 
-// #[derive(Debug)]
-// pub struct X {
-//     pub field: Vec<syn::MetaNameValue>,
-// }
-
-// impl syn::parse::Parse for X {
-//     fn parse(input: syn::parse::ParseStream) -> syn::Result<Self> {
-//         Result::Ok(X { field: Vec::new() })
-//     }
-// }
-
 pub fn process_contract(
     args: proc_macro::TokenStream,
     input: proc_macro::TokenStream,
 ) -> proc_macro::TokenStream {
     let new_input = trait_preprocessing(input);
+
+    //if empty => parse error
     // let args_input = parse_macro_input!(args as syn::MetaList);
+
+    // let list;
+    // match args_input {
+    //     syn::Meta::Path(_) => panic!("path"),
+    //     syn::Meta::List(metalist) => {
+    //         list = metalist;
+    //         println!("metalist")
+    //     },
+    //     syn::Meta::NameValue(_) => panic!("namevalue"),
+    // };
+
     let args_input = syn::MetaList {
         path: syn::Path {
             leading_colon: Some(syn::token::PathSep::default()),
diff --git a/framework/derive/src/macro_module.rs b/framework/derive/src/macro_module.rs
index e00d911d0b..19a32b25dd 100644
--- a/framework/derive/src/macro_module.rs
+++ b/framework/derive/src/macro_module.rs
@@ -8,9 +8,9 @@ pub fn process_module(
     input: proc_macro::TokenStream,
 ) -> proc_macro::TokenStream {
     let new_input = trait_preprocessing(input);
-    let args_input = parse_macro_input!(args as syn::MetaList);
     let proc_input = &parse_macro_input!(new_input as syn::ItemTrait);
-
+    let args_input = parse_macro_input!(args as syn::MetaList);
+    
     let contract = parse_contract_trait(args_input, proc_input);
     validate_contract(&contract);
 
diff --git a/framework/derive/src/parse/parse_util.rs b/framework/derive/src/parse/parse_util.rs
index 3a0715a282..3cf731b7e2 100644
--- a/framework/derive/src/parse/parse_util.rs
+++ b/framework/derive/src/parse/parse_util.rs
@@ -4,5 +4,3 @@ pub fn validate_attribute_args(args: syn::MetaList) {
         "No arguments expected in contract, module or proxy annotation."
     );
 }
-
-

From f019165aafb459a4a2f14c67b160308c1aa4ad1f Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Tue, 28 Nov 2023 19:24:43 +0100
Subject: [PATCH 0131/1254] added check for args

---
 framework/derive/src/lib.rs                   | 23 ------------
 framework/derive/src/macro_contract.rs        | 37 ++++++++-----------
 framework/derive/src/macro_module.rs          | 18 ++++++++-
 framework/derive/src/macro_proxy.rs           | 16 +++++++-
 .../derive/src/parse/attributes/doc_attr.rs   |  5 ++-
 .../derive/src/parse/contract_trait_parse.rs  |  8 +---
 6 files changed, 51 insertions(+), 56 deletions(-)

diff --git a/framework/derive/src/lib.rs b/framework/derive/src/lib.rs
index b082a892b3..95d98b09a4 100644
--- a/framework/derive/src/lib.rs
+++ b/framework/derive/src/lib.rs
@@ -27,14 +27,7 @@ pub fn contract(
     args: proc_macro::TokenStream,
     input: proc_macro::TokenStream,
 ) -> proc_macro::TokenStream {
-    println!(" args {}", args.clone());
-    println!(" input {}", input.clone());
-    println!(
-        "//// CONTRACT //// {}",
-        macro_contract::process_contract(args.clone(), input.clone())
-    );
     macro_contract::process_contract(args, input)
-    // proc_macro::TokenStream::new()
 }
 
 #[proc_macro_attribute]
@@ -42,10 +35,6 @@ pub fn module(
     args: proc_macro::TokenStream,
     input: proc_macro::TokenStream,
 ) -> proc_macro::TokenStream {
-    println!(
-        "//// MODULE //// {}",
-        macro_module::process_module(args.clone(), input.clone())
-    );
     macro_module::process_module(args, input)
 }
 
@@ -54,30 +43,18 @@ pub fn proxy(
     args: proc_macro::TokenStream,
     input: proc_macro::TokenStream,
 ) -> proc_macro::TokenStream {
-    println!(
-        "//// PROXY //// {}",
-        macro_proxy::process_proxy(args.clone(), input.clone())
-    );
     macro_proxy::process_proxy(args, input)
 }
 
 #[proc_macro_derive(TypeAbi)]
 pub fn type_abi_derive(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
     let ast = syn::parse(input).unwrap();
-    println!(
-        "//// TYPE ABI //// {}",
-        type_abi_derive::type_abi_derive(&ast)
-    );
     type_abi_derive::type_abi_derive(&ast)
 }
 
 #[proc_macro_derive(ManagedVecItem)]
 pub fn managed_vec_item_derive(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
     let ast = syn::parse(input).unwrap();
-    println!(
-        "//// MANAGED VEC ITEM //// {}",
-        managed_vec_item_derive::managed_vec_item_derive(&ast)
-    );
     managed_vec_item_derive::managed_vec_item_derive(&ast)
 }
 
diff --git a/framework/derive/src/macro_contract.rs b/framework/derive/src/macro_contract.rs
index a3c5ce0614..022d0eb2ca 100644
--- a/framework/derive/src/macro_contract.rs
+++ b/framework/derive/src/macro_contract.rs
@@ -8,30 +8,23 @@ pub fn process_contract(
     input: proc_macro::TokenStream,
 ) -> proc_macro::TokenStream {
     let new_input = trait_preprocessing(input);
+    let proc_input = &parse_macro_input!(new_input as syn::ItemTrait);
 
-    //if empty => parse error
-    // let args_input = parse_macro_input!(args as syn::MetaList);
-
-    // let list;
-    // match args_input {
-    //     syn::Meta::Path(_) => panic!("path"),
-    //     syn::Meta::List(metalist) => {
-    //         list = metalist;
-    //         println!("metalist")
-    //     },
-    //     syn::Meta::NameValue(_) => panic!("namevalue"),
-    // };
-
-    let args_input = syn::MetaList {
-        path: syn::Path {
-            leading_colon: Some(syn::token::PathSep::default()),
-            segments: syn::punctuated::Punctuated::<syn::PathSegment, syn::token::PathSep>::default()
-        },
-        delimiter: syn::MacroDelimiter::Paren(syn::token::Paren::default()),
-        tokens: proc_macro2::TokenStream::new()
-    };
+    let args_input;
+    if args.is_empty() {
+        args_input = syn::MetaList {
+            path: syn::Path {
+                leading_colon: Some(syn::token::PathSep::default()),
+                segments:
+                    syn::punctuated::Punctuated::<syn::PathSegment, syn::token::PathSep>::default(),
+            },
+            delimiter: syn::MacroDelimiter::Paren(syn::token::Paren::default()),
+            tokens: proc_macro2::TokenStream::new(),
+        };
+    } else {
+        args_input = parse_macro_input!(args as syn::MetaList);
+    }
 
-    let proc_input = &parse_macro_input!(new_input as syn::ItemTrait);
     let contract = parse_contract_trait(args_input, proc_input);
     validate_contract(&contract);
 
diff --git a/framework/derive/src/macro_module.rs b/framework/derive/src/macro_module.rs
index 19a32b25dd..e18a901dca 100644
--- a/framework/derive/src/macro_module.rs
+++ b/framework/derive/src/macro_module.rs
@@ -9,8 +9,22 @@ pub fn process_module(
 ) -> proc_macro::TokenStream {
     let new_input = trait_preprocessing(input);
     let proc_input = &parse_macro_input!(new_input as syn::ItemTrait);
-    let args_input = parse_macro_input!(args as syn::MetaList);
-    
+
+    let args_input;
+    if args.is_empty() {
+        args_input = syn::MetaList {
+            path: syn::Path {
+                leading_colon: Some(syn::token::PathSep::default()),
+                segments:
+                    syn::punctuated::Punctuated::<syn::PathSegment, syn::token::PathSep>::default(),
+            },
+            delimiter: syn::MacroDelimiter::Paren(syn::token::Paren::default()),
+            tokens: proc_macro2::TokenStream::new(),
+        };
+    } else {
+        args_input = parse_macro_input!(args as syn::MetaList);
+    }
+
     let contract = parse_contract_trait(args_input, proc_input);
     validate_contract(&contract);
 
diff --git a/framework/derive/src/macro_proxy.rs b/framework/derive/src/macro_proxy.rs
index f685115162..8a8fc24cd5 100644
--- a/framework/derive/src/macro_proxy.rs
+++ b/framework/derive/src/macro_proxy.rs
@@ -11,9 +11,23 @@ pub fn process_proxy(
     input: proc_macro::TokenStream,
 ) -> proc_macro::TokenStream {
     let new_input = trait_preprocessing(input);
-    let args_input = parse_macro_input!(args as syn::MetaList);
     let proc_input = parse_macro_input!(new_input as syn::ItemTrait);
 
+    let args_input;
+    if args.is_empty() {
+        args_input = syn::MetaList {
+            path: syn::Path {
+                leading_colon: Some(syn::token::PathSep::default()),
+                segments:
+                    syn::punctuated::Punctuated::<syn::PathSegment, syn::token::PathSep>::default(),
+            },
+            delimiter: syn::MacroDelimiter::Paren(syn::token::Paren::default()),
+            tokens: proc_macro2::TokenStream::new(),
+        };
+    } else {
+        args_input = parse_macro_input!(args as syn::MetaList);
+    }
+
     let contract = parse_contract_trait(args_input, &proc_input);
     validate_contract(&contract);
 
diff --git a/framework/derive/src/parse/attributes/doc_attr.rs b/framework/derive/src/parse/attributes/doc_attr.rs
index 4aaf9c41c3..58c75c1680 100644
--- a/framework/derive/src/parse/attributes/doc_attr.rs
+++ b/framework/derive/src/parse/attributes/doc_attr.rs
@@ -2,7 +2,7 @@ use super::{attr_names::*, util::*};
 
 /// unlike the others, this is standard Rust,
 /// all doc comments get automatically transformed into "doc" attributes
-static ATTR_DOC: &str = "doc";
+static ATTR_DOC: &str = "[doc]";
 
 /// Doc comments are actually syntactic sugar for doc attributes,
 /// so extracting doc comments means parsing "doc" attributes.
@@ -18,7 +18,8 @@ pub fn extract_doc(attrs: &[syn::Attribute]) -> Vec<String> {
         })
         .map(|attr| {
             let mut tokens_iter;
-            let tokens: Result<proc_macro2::TokenStream, syn::Error> = attr.clone().parse_args();
+            let tokens: Result<proc_macro2::TokenStream, syn::Error> = attr.parse_args();
+
             match tokens {
                 Ok(val) => tokens_iter = val.into_iter(),
                 Err(err) => panic!("failed to parse arguments: {}", err),
diff --git a/framework/derive/src/parse/contract_trait_parse.rs b/framework/derive/src/parse/contract_trait_parse.rs
index a8bf37b876..b2930e44b5 100644
--- a/framework/derive/src/parse/contract_trait_parse.rs
+++ b/framework/derive/src/parse/contract_trait_parse.rs
@@ -1,6 +1,5 @@
 use super::{
-    attributes::extract_doc, method_parse::process_method, 
-    parse_util::validate_attribute_args,
+    attributes::extract_doc, method_parse::process_method, parse_util::validate_attribute_args,
     supertrait_parse::parse_supertrait,
 };
 use crate::{
@@ -8,10 +7,7 @@ use crate::{
     parse::{is_contract_base, process_trait_arguments},
 };
 
-pub fn parse_contract_trait(
-    args: syn::MetaList,
-    contract_trait: &syn::ItemTrait,
-) -> ContractTrait {
+pub fn parse_contract_trait(args: syn::MetaList, contract_trait: &syn::ItemTrait) -> ContractTrait {
     validate_attribute_args(args);
 
     let docs = extract_doc(contract_trait.attrs.as_slice());

From c49caf8b254242a8a134f0350c5e68495d739188 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Wed, 29 Nov 2023 12:40:32 +0100
Subject: [PATCH 0132/1254] fixed for one optional token tree arg (such as
 endpoint)

---
 framework/derive/src/macro_contract.rs        | 11 ++--
 framework/derive/src/macro_module.rs          | 11 ++--
 framework/derive/src/macro_proxy.rs           | 11 ++--
 framework/derive/src/parse/attributes/util.rs | 58 ++++++++++++-------
 4 files changed, 53 insertions(+), 38 deletions(-)

diff --git a/framework/derive/src/macro_contract.rs b/framework/derive/src/macro_contract.rs
index 022d0eb2ca..3f39a940f6 100644
--- a/framework/derive/src/macro_contract.rs
+++ b/framework/derive/src/macro_contract.rs
@@ -10,9 +10,8 @@ pub fn process_contract(
     let new_input = trait_preprocessing(input);
     let proc_input = &parse_macro_input!(new_input as syn::ItemTrait);
 
-    let args_input;
-    if args.is_empty() {
-        args_input = syn::MetaList {
+    let args_input = if args.is_empty() {
+        syn::MetaList {
             path: syn::Path {
                 leading_colon: Some(syn::token::PathSep::default()),
                 segments:
@@ -20,10 +19,10 @@ pub fn process_contract(
             },
             delimiter: syn::MacroDelimiter::Paren(syn::token::Paren::default()),
             tokens: proc_macro2::TokenStream::new(),
-        };
+        }
     } else {
-        args_input = parse_macro_input!(args as syn::MetaList);
-    }
+        parse_macro_input!(args as syn::MetaList)
+    };
 
     let contract = parse_contract_trait(args_input, proc_input);
     validate_contract(&contract);
diff --git a/framework/derive/src/macro_module.rs b/framework/derive/src/macro_module.rs
index e18a901dca..da80a4b90a 100644
--- a/framework/derive/src/macro_module.rs
+++ b/framework/derive/src/macro_module.rs
@@ -10,9 +10,8 @@ pub fn process_module(
     let new_input = trait_preprocessing(input);
     let proc_input = &parse_macro_input!(new_input as syn::ItemTrait);
 
-    let args_input;
-    if args.is_empty() {
-        args_input = syn::MetaList {
+    let args_input = if args.is_empty() {
+        syn::MetaList {
             path: syn::Path {
                 leading_colon: Some(syn::token::PathSep::default()),
                 segments:
@@ -20,10 +19,10 @@ pub fn process_module(
             },
             delimiter: syn::MacroDelimiter::Paren(syn::token::Paren::default()),
             tokens: proc_macro2::TokenStream::new(),
-        };
+        }
     } else {
-        args_input = parse_macro_input!(args as syn::MetaList);
-    }
+        parse_macro_input!(args as syn::MetaList)
+    };
 
     let contract = parse_contract_trait(args_input, proc_input);
     validate_contract(&contract);
diff --git a/framework/derive/src/macro_proxy.rs b/framework/derive/src/macro_proxy.rs
index 8a8fc24cd5..e76ef2c27d 100644
--- a/framework/derive/src/macro_proxy.rs
+++ b/framework/derive/src/macro_proxy.rs
@@ -13,9 +13,8 @@ pub fn process_proxy(
     let new_input = trait_preprocessing(input);
     let proc_input = parse_macro_input!(new_input as syn::ItemTrait);
 
-    let args_input;
-    if args.is_empty() {
-        args_input = syn::MetaList {
+    let args_input =if args.is_empty() {
+        syn::MetaList {
             path: syn::Path {
                 leading_colon: Some(syn::token::PathSep::default()),
                 segments:
@@ -23,10 +22,10 @@ pub fn process_proxy(
             },
             delimiter: syn::MacroDelimiter::Paren(syn::token::Paren::default()),
             tokens: proc_macro2::TokenStream::new(),
-        };
+        }
     } else {
-        args_input = parse_macro_input!(args as syn::MetaList);
-    }
+      parse_macro_input!(args as syn::MetaList)
+    };
 
     let contract = parse_contract_trait(args_input, &proc_input);
     validate_contract(&contract);
diff --git a/framework/derive/src/parse/attributes/util.rs b/framework/derive/src/parse/attributes/util.rs
index 69783374e7..9b6dec85a9 100644
--- a/framework/derive/src/parse/attributes/util.rs
+++ b/framework/derive/src/parse/attributes/util.rs
@@ -132,32 +132,50 @@ pub(super) fn is_attr_one_string_arg(attr: &syn::Attribute, attr_name: &str) ->
 }
 
 fn attr_one_opt_token_tree_arg(attr: &syn::Attribute) -> Option<proc_macro2::TokenTree> {
-    let mut iter;
-    let tokens: Result<proc_macro2::TokenStream, syn::Error> = attr.clone().parse_args();
-    match tokens {
-        Ok(val) => iter = val.into_iter(),
-        Err(err) => panic!("failed to parse arguments: {}", err),
-    }
+    //it can be only Meta::Path == "endpoint" (or other macro) and can exist without paren
+    //OR Meta::List(path + paren delimiter + only one token)
+    //maybe use a different parser than parse_args(), manually create one
+    println!("attribute is {:#?}", attr);
+
+    match attr.clone().meta {
+        syn::Meta::Path(val) => {
+            let mut iter = val.segments.into_iter();
+            let arg_token_tree: Option<proc_macro2::TokenTree> = match iter.next() {
+                Some(syn::PathSegment {
+                    ident: val,
+                    arguments: syn::PathArguments::None,
+                }) => Some(proc_macro2::TokenTree::Ident(val)),
+                Some(_) => panic!("unexpected attribute argument tokens"),
+                None => None,
+            };
 
-    let arg_token_tree: Option<proc_macro2::TokenTree> = match iter.next() {
-        Some(proc_macro2::TokenTree::Group(group)) => {
+            arg_token_tree
+        },
+        syn::Meta::List(val) => {
             assert!(
-                group.delimiter() == proc_macro2::Delimiter::Parenthesis,
+                val.delimiter == syn::MacroDelimiter::Paren(syn::token::Paren::default()),
                 "attribute paranthesis expected"
             );
-            let mut iter2 = group.stream().into_iter();
-            match iter2.next() {
-                Some(token_tree) => Some(token_tree),
-                _ => panic!("attribute argument expected"),
-            }
-        },
-        Some(_) => panic!("unexpected attribute argument tokens"),
-        None => None,
-    };
 
-    assert!(iter.next().is_none(), "too many tokens in attribute");
+            assert!(
+                !val.tokens.is_empty(),
+                "attribute needs to have at least one argument"
+            );
 
-    arg_token_tree
+            let mut iter = val.tokens.into_iter();
+            let arg_token_tree: Option<proc_macro2::TokenTree> = match iter.next() {
+                Some(proc_macro2::TokenTree::Ident(ident)) => {
+                    Some(proc_macro2::TokenTree::Ident(ident))
+                },
+                Some(_) => panic!("unexpected attribute argument tokens"),
+                None => None,
+            };
+
+            assert!(iter.next().is_none(), "too many tokens in attribute");
+            arg_token_tree
+        },
+        syn::Meta::NameValue(_) => panic!("unexpected attribute argument tokens"),
+    }
 }
 
 /// Finds a method attribute with given name and 1 single optional argument.

From 075492a9b5f2e9821b56785c74eec677eaff0deb Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Wed, 29 Nov 2023 17:02:23 +0100
Subject: [PATCH 0133/1254] fixed one string argument and one type argument
 parsing functions, used in storage_mapper and esdt_attribute

---
 framework/derive/src/parse/attributes/util.rs | 164 +++++++++---------
 1 file changed, 82 insertions(+), 82 deletions(-)

diff --git a/framework/derive/src/parse/attributes/util.rs b/framework/derive/src/parse/attributes/util.rs
index 9b6dec85a9..f4d04b67be 100644
--- a/framework/derive/src/parse/attributes/util.rs
+++ b/framework/derive/src/parse/attributes/util.rs
@@ -1,5 +1,4 @@
 use crate::model::EsdtAttribute;
-use proc_macro2::TokenTree;
 
 pub(super) fn is_attribute_with_no_args(attr: &syn::Attribute, name: &str) -> bool {
     if let Some(first_seg) = attr.path().segments.first() {
@@ -22,54 +21,53 @@ pub(super) fn get_attribute_with_one_type_arg(
     let attr_path = &attr.path();
     if let Some(first_seg) = attr_path.segments.first() {
         if first_seg.ident == name {
-            let mut tokens_iter;
-            let tokens: Result<proc_macro2::TokenStream, syn::Error> = attr.clone().parse_args();
-            match tokens {
-                Ok(val) => tokens_iter = val.into_iter(),
-                Err(err) => panic!("failed to parse arguments: {}", err),
-            }
-
-            let group = match tokens_iter.next() {
-                Some(TokenTree::Group(group_val)) => group_val,
-                _ => panic!("Expected a group as attribute argument"),
-            };
-
-            let mut iter = group.stream().into_iter();
-
-            let first_literal = match iter.next() {
-                Some(TokenTree::Literal(literal)) => literal.to_string(),
-                _ => panic!("Expected a literal as the first token in the attribute argument"),
+            let (ticker, ty) = match attr.meta.clone() {
+                syn::Meta::Path(_) => {
+                    panic!("attribute needs 2 arguments: ticker (string) and type")
+                },
+                syn::Meta::List(list) => {
+                    assert!(!list.tokens.is_empty(), "argument can not be empty. attribute needs 2 arguments: ticker (string) and type");
+
+                    let mut iter = list.tokens.into_iter();
+
+                    let first_literal = match iter.next() {
+                        Some(proc_macro2::TokenTree::Literal(literal)) => literal.to_string(),
+                        _ => {
+                            panic!("expected a string as the first token in the attribute argument")
+                        },
+                    };
+
+                    let ticker = first_literal.trim_matches('\"').to_string();
+
+                    let _ = match iter.next() {
+                        Some(proc_macro2::TokenTree::Punct(punct)) => punct,
+                        _ => panic!("expected a punctuation token after the first literal"),
+                    };
+
+                    let mut ty = proc_macro2::TokenStream::new();
+
+                    for token in &mut iter {
+                        match token {
+                            proc_macro2::TokenTree::Punct(punct) => {
+                                ty.extend(quote! { #punct });
+                            },
+                            proc_macro2::TokenTree::Ident(ident) => {
+                                ty.extend(quote! { #ident });
+                            },
+                            _ => break,
+                        }
+                    }
+
+                    if ticker.trim().is_empty() {
+                        panic!("ticker field can't be empty");
+                    }
+
+                    (ticker, ty)
+                },
+                syn::Meta::NameValue(_) => panic!("arguments can not be name value"),
             };
 
-            let symbol = first_literal.trim_matches('\"').to_string();
-
-            let _ = match iter.next() {
-                Some(TokenTree::Punct(punct)) => punct,
-                _ => panic!("Expected a punctuation token after the literal"),
-            };
-
-            let mut chosen_type = proc_macro2::TokenStream::new();
-
-            for token in &mut iter {
-                match token {
-                    TokenTree::Punct(punct) => {
-                        chosen_type.extend(quote! { #punct });
-                    },
-                    TokenTree::Ident(ident) => {
-                        chosen_type.extend(quote! { #ident });
-                    },
-                    _ => break,
-                }
-            }
-
-            if symbol.is_empty() {
-                panic!("Ticker field can't be empty");
-            }
-
-            let esdt_attribute = EsdtAttribute {
-                ticker: symbol,
-                ty: chosen_type,
-            };
+            let esdt_attribute = EsdtAttribute { ticker, ty };
 
             return Some(esdt_attribute);
         }
@@ -79,44 +77,51 @@ pub(super) fn get_attribute_with_one_type_arg(
 }
 
 pub(super) fn attr_one_string_arg(attr: &syn::Attribute) -> String {
-    let result_str: String;
-
-    let mut iter;
-    let tokens: Result<proc_macro2::TokenStream, syn::Error> = attr.clone().parse_args();
-    match tokens {
-        Ok(val) => iter = val.into_iter(),
-        Err(err) => panic!("failed to parse arguments: {}", err),
-    }
+    match attr.meta.clone() {
+        syn::Meta::Path(path) => {
+            let mut iter = path.segments.into_iter();
+            match iter.next() {
+                Some(syn::PathSegment {
+                    ident: _,
+                    arguments: syn::PathArguments::None,
+                }) => String::new(),
+                Some(_) => panic!("unexpected attribute argument tokens"),
+                None => panic!("unexpected attribute argument tokens"),
+            }
+        },
+        syn::Meta::List(list) => {
+            assert!(
+                list.delimiter == syn::MacroDelimiter::Paren(syn::token::Paren::default()),
+                "attribute paranthesis expected"
+            );
 
-    match iter.next() {
-        Some(proc_macro2::TokenTree::Group(group)) => {
             assert!(
-                group.delimiter() == proc_macro2::Delimiter::Parenthesis,
-                "annotation paranthesis expected (check events and storage)"
+                !list.tokens.is_empty(),
+                "attribute needs to have at least one argument"
             );
-            let mut iter2 = group.stream().into_iter();
-            match iter2.next() {
-                Some(proc_macro2::TokenTree::Literal(lit)) => {
-                    let str_val = lit.to_string();
+
+            let mut iter = list.tokens.into_iter();
+            let arg_token_tree = match iter.next() {
+                Some(proc_macro2::TokenTree::Literal(literal)) => {
                     assert!(
-                        str_val.starts_with('\"') && str_val.ends_with('\"'),
-                        "string literal expected as attribute argument (check events and storage)"
+                        !literal.to_string().trim_matches('"').trim().is_empty(),
+                        "the argument can not be an empty string or whitespace"
                     );
-                    let substr = &str_val[1..str_val.len() - 1];
-                    result_str = substr.to_string();
+                    literal.to_string()
                 },
-                _ => panic!("literal expected as annotation identifier (check events and storage)"),
-            }
+                Some(_) => {
+                    panic!("unexpected attribute argument tokens: attribute has to be a string")
+                },
+                None => panic!("attribute needs to have at least one argument"),
+            };
+
+            assert!(iter.next().is_none(), "too many tokens in attribute");
+            arg_token_tree
+        },
+        syn::Meta::NameValue(_) => {
+            panic!("unexpected attribute argument tokens: argument can not be name value")
         },
-        _ => panic!("missing annotation identifier (check events and storage)"),
     }
-
-    assert!(
-        iter.next().is_none(),
-        "too many tokens in attribute (check events and storage)"
-    );
-
-    result_str
 }
 
 pub(super) fn is_attr_one_string_arg(attr: &syn::Attribute, attr_name: &str) -> Option<String> {
@@ -132,11 +137,6 @@ pub(super) fn is_attr_one_string_arg(attr: &syn::Attribute, attr_name: &str) ->
 }
 
 fn attr_one_opt_token_tree_arg(attr: &syn::Attribute) -> Option<proc_macro2::TokenTree> {
-    //it can be only Meta::Path == "endpoint" (or other macro) and can exist without paren
-    //OR Meta::List(path + paren delimiter + only one token)
-    //maybe use a different parser than parse_args(), manually create one
-    println!("attribute is {:#?}", attr);
-
     match attr.clone().meta {
         syn::Meta::Path(val) => {
             let mut iter = val.segments.into_iter();

From f83c7988c26be84fdad1d8f256a97bcaa133ad1c Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Wed, 29 Nov 2023 18:14:32 +0100
Subject: [PATCH 0134/1254] fixed extract token identifier used in the payable
 attribute

---
 contracts/examples/adder/src/adder.rs         |  20 +-
 contracts/examples/adder/src/some_file.rs     | 819 ------------------
 contracts/examples/adder/src/somefile.rs      | 582 -------------
 contracts/examples/adder/wasm/Cargo.lock      |  17 +-
 contracts/examples/adder/wasm/src/lib.rs      |   9 +-
 .../wrapped/egld_or_multi_esdt_payment.rs     | 107 +--
 framework/derive/src/macro_proxy.rs           |   4 +-
 .../src/parse/attributes/payable_attr.rs      |  58 +-
 8 files changed, 107 insertions(+), 1509 deletions(-)
 delete mode 100644 contracts/examples/adder/src/some_file.rs
 delete mode 100644 contracts/examples/adder/src/somefile.rs

diff --git a/contracts/examples/adder/src/adder.rs b/contracts/examples/adder/src/adder.rs
index 6eb6c2b710..9b261c5aa8 100644
--- a/contracts/examples/adder/src/adder.rs
+++ b/contracts/examples/adder/src/adder.rs
@@ -1,11 +1,27 @@
 #![no_std]
 
 multiversx_sc::imports!();
-
 /// One of the simplest smart contracts possible,
 /// it holds a single variable in storage, which anyone can increment.
 #[multiversx_sc::contract]
 pub trait Adder {
+    #[view(getSum)]
+    #[storage_mapper("sum")]
+    fn sum(&self) -> SingleValueMapper<BigUint>;
+
     #[init]
-    fn init(&self) {}
+    fn init(&self, initial_value: BigUint) {
+        self.sum().set(initial_value);
+    }
+
+    #[upgrade]
+    fn upgrade(&self, initial_value: BigUint) {
+        self.init(initial_value);
+    }
+
+    /// Add desired amount to the storage variable.
+    #[endpoint]
+    fn add(&self, value: BigUint) {
+        self.sum().update(|sum| *sum += value);
+    }
 }
diff --git a/contracts/examples/adder/src/some_file.rs b/contracts/examples/adder/src/some_file.rs
deleted file mode 100644
index 1ae88fa5ba..0000000000
--- a/contracts/examples/adder/src/some_file.rs
+++ /dev/null
@@ -1,819 +0,0 @@
-impl multiversx_sc::abi::TypeAbi for EsdtLocalRole {
-    fn type_name() -> multiversx_sc::abi::TypeName {
-        "EsdtLocalRole".into()
-    }
-    fn provide_type_descriptions<TDC: multiversx_sc::abi::TypeDescriptionContainer>(
-        accumulator: &mut TDC,
-    ) {
-        let type_name = Self::type_name();
-        if !accumulator.contains_type(&type_name) {
-            accumulator.reserve_type_name(type_name.clone());
-            let mut variant_descriptions = multiversx_sc::types::heap::Vec::new();
-            let mut field_descriptions = multiversx_sc::types::heap::Vec::new();
-            variant_descriptions.push(multiversx_sc::abi::EnumVariantDescription::new(
-                &[],
-                "None",
-                0usize,
-                field_descriptions,
-            ));
-            let mut field_descriptions = multiversx_sc::types::heap::Vec::new();
-            variant_descriptions.push(multiversx_sc::abi::EnumVariantDescription::new(
-                &[],
-                "Mint",
-                1usize,
-                field_descriptions,
-            ));
-            let mut field_descriptions = multiversx_sc::types::heap::Vec::new();
-            variant_descriptions.push(multiversx_sc::abi::EnumVariantDescription::new(
-                &[],
-                "Burn",
-                2usize,
-                field_descriptions,
-            ));
-            let mut field_descriptions = multiversx_sc::types::heap::Vec::new();
-            variant_descriptions.push(multiversx_sc::abi::EnumVariantDescription::new(
-                &[],
-                "NftCreate",
-                3usize,
-                field_descriptions,
-            ));
-            let mut field_descriptions = multiversx_sc::types::heap::Vec::new();
-            variant_descriptions.push(multiversx_sc::abi::EnumVariantDescription::new(
-                &[],
-                "NftAddQuantity",
-                4usize,
-                field_descriptions,
-            ));
-            let mut field_descriptions = multiversx_sc::types::heap::Vec::new();
-            variant_descriptions.push(multiversx_sc::abi::EnumVariantDescription::new(
-                &[],
-                "NftBurn",
-                5usize,
-                field_descriptions,
-            ));
-            let mut field_descriptions = multiversx_sc::types::heap::Vec::new();
-            variant_descriptions.push(multiversx_sc::abi::EnumVariantDescription::new(
-                &[],
-                "NftAddUri",
-                6usize,
-                field_descriptions,
-            ));
-            let mut field_descriptions = multiversx_sc::types::heap::Vec::new();
-            variant_descriptions.push(multiversx_sc::abi::EnumVariantDescription::new(
-                &[],
-                "NftUpdateAttributes",
-                7usize,
-                field_descriptions,
-            ));
-            let mut field_descriptions = multiversx_sc::types::heap::Vec::new();
-            variant_descriptions.push(multiversx_sc::abi::EnumVariantDescription::new(
-                &[],
-                "Transfer",
-                8usize,
-                field_descriptions,
-            ));
-            accumulator.insert(
-                type_name.clone(),
-                multiversx_sc::abi::TypeDescription::new(
-                    &[],
-                    type_name,
-                    multiversx_sc::abi::TypeContents::Enum(variant_descriptions),
-                ),
-            );
-        }
-    }
-}
-impl multiversx_sc::abi::TypeAbi for EsdtTokenType {
-    fn type_name() -> multiversx_sc::abi::TypeName {
-        "EsdtTokenType".into()
-    }
-    fn provide_type_descriptions<TDC: multiversx_sc::abi::TypeDescriptionContainer>(
-        accumulator: &mut TDC,
-    ) {
-        let type_name = Self::type_name();
-        if !accumulator.contains_type(&type_name) {
-            accumulator.reserve_type_name(type_name.clone());
-            let mut variant_descriptions = multiversx_sc::types::heap::Vec::new();
-            let mut field_descriptions = multiversx_sc::types::heap::Vec::new();
-            variant_descriptions.push(multiversx_sc::abi::EnumVariantDescription::new(
-                &[],
-                "Fungible",
-                0usize,
-                field_descriptions,
-            ));
-            let mut field_descriptions = multiversx_sc::types::heap::Vec::new();
-            variant_descriptions.push(multiversx_sc::abi::EnumVariantDescription::new(
-                &[],
-                "NonFungible",
-                1usize,
-                field_descriptions,
-            ));
-            let mut field_descriptions = multiversx_sc::types::heap::Vec::new();
-            variant_descriptions.push(multiversx_sc::abi::EnumVariantDescription::new(
-                &[],
-                "SemiFungible",
-                2usize,
-                field_descriptions,
-            ));
-            let mut field_descriptions = multiversx_sc::types::heap::Vec::new();
-            variant_descriptions.push(multiversx_sc::abi::EnumVariantDescription::new(
-                &[],
-                "Meta",
-                3usize,
-                field_descriptions,
-            ));
-            let mut field_descriptions = multiversx_sc::types::heap::Vec::new();
-            variant_descriptions.push(multiversx_sc::abi::EnumVariantDescription::new(
-                &[],
-                "Invalid",
-                4usize,
-                field_descriptions,
-            ));
-            accumulator.insert(
-                type_name.clone(),
-                multiversx_sc::abi::TypeDescription::new(
-                    &[],
-                    type_name,
-                    multiversx_sc::abi::TypeContents::Enum(variant_descriptions),
-                ),
-            );
-        }
-    }
-}
-impl multiversx_sc::types::ManagedVecItem for EsdtTokenType {
-    const PAYLOAD_SIZE: usize = 1;
-    const SKIPS_RESERIALIZATION: bool = true;
-    type Ref<'a> = Self;
-    fn from_byte_reader<Reader: FnMut(&mut [u8])>(mut reader: Reader) -> Self {
-        let mut arr: [u8; 1] = [0u8; 1];
-        reader(&mut arr[..]);
-        match arr[0] {
-            0u8 => EsdtTokenType::Fungible,
-            1u8 => EsdtTokenType::NonFungible,
-            2u8 => EsdtTokenType::SemiFungible,
-            3u8 => EsdtTokenType::Meta,
-            4u8 => EsdtTokenType::Invalid,
-            _ => EsdtTokenType::Fungible,
-        }
-    }
-    unsafe fn from_byte_reader_as_borrow<'a, Reader: FnMut(&mut [u8])>(
-        reader: Reader,
-    ) -> Self::Ref<'a> {
-        Self::from_byte_reader(reader)
-    }
-    fn to_byte_writer<R, Writer: FnMut(&[u8]) -> R>(&self, mut writer: Writer) -> R {
-        let mut arr: [u8; 1] = [0u8; 1];
-        arr[0] = match self {
-            EsdtTokenType::Fungible => 0u8,
-            EsdtTokenType::NonFungible => 1u8,
-            EsdtTokenType::SemiFungible => 2u8,
-            EsdtTokenType::Meta => 3u8,
-            EsdtTokenType::Invalid => 4u8,
-        };
-        writer(&arr[..])
-    }
-}
-impl<M: ManagedTypeApi> multiversx_sc::types::ManagedVecItem for EgldOrEsdtTokenIdentifier<M> {
-    const PAYLOAD_SIZE : usize = < ManagedOption < M, TokenIdentifier < M > >
-    as multiversx_sc :: types :: ManagedVecItem > :: PAYLOAD_SIZE ;
-    const
-    SKIPS_RESERIALIZATION : bool = < ManagedOption < M, TokenIdentifier < M >
-    > as multiversx_sc :: types :: ManagedVecItem > :: SKIPS_RESERIALIZATION ;
-    type Ref<'a> = Self;
-    fn from_byte_reader<Reader: FnMut(&mut [u8])>(mut reader: Reader) -> Self {
-        const SELF_PAYLOAD_SIZE: usize = <EgldOrEsdtTokenIdentifier<
-            multiversx_sc::api::uncallable::UncallableApi,
-        > as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
-        let mut arr: [u8; SELF_PAYLOAD_SIZE] = [0u8; SELF_PAYLOAD_SIZE];
-        reader(&mut arr[..]);
-        let mut index = 0;
-        EgldOrEsdtTokenIdentifier {
-            data: multiversx_sc::types::ManagedVecItem::from_byte_reader(|bytes| {
-                let next_index = index + < ManagedOption < M, TokenIdentifier
-                < M > > as multiversx_sc :: types :: ManagedVecItem > ::
-                PAYLOAD_SIZE ;
-                bytes.copy_from_slice(&arr[index..next_index]);
-                index = next_index;
-            }),
-        }
-    }
-    unsafe fn from_byte_reader_as_borrow<'a, Reader: FnMut(&mut [u8])>(
-        reader: Reader,
-    ) -> Self::Ref<'a> {
-        Self::from_byte_reader(reader)
-    }
-    fn to_byte_writer<R, Writer: FnMut(&[u8]) -> R>(&self, mut writer: Writer) -> R {
-        const SELF_PAYLOAD_SIZE: usize = <EgldOrEsdtTokenIdentifier<
-            multiversx_sc::api::uncallable::UncallableApi,
-        > as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
-        let mut arr: [u8; SELF_PAYLOAD_SIZE] = [0u8; SELF_PAYLOAD_SIZE];
-        let mut index = 0;
-        multiversx_sc::types::ManagedVecItem::to_byte_writer(&self.data, |bytes| {
-            let next_index = index + < ManagedOption < M, TokenIdentifier < M
-            > > as multiversx_sc :: types :: ManagedVecItem > :: PAYLOAD_SIZE
-            ;
-            arr[index..next_index].copy_from_slice(bytes);
-            index = next_index;
-        });
-        writer(&arr[..])
-    }
-}
-impl<M: ManagedTypeApi> multiversx_sc::abi::TypeAbi for EgldOrEsdtTokenPayment<M> {
-    fn type_name() -> multiversx_sc::abi::TypeName {
-        "EgldOrEsdtTokenPayment".into()
-    }
-    fn provide_type_descriptions<TDC: multiversx_sc::abi::TypeDescriptionContainer>(
-        accumulator: &mut TDC,
-    ) {
-        let type_name = Self::type_name();
-        if !accumulator.contains_type(&type_name) {
-            accumulator.reserve_type_name(type_name.clone());
-            let mut field_descriptions = multiversx_sc::types::heap::Vec::new();
-            field_descriptions.push(multiversx_sc::abi::StructFieldDescription::new(
-                &[],
-                "token_identifier",
-                <EgldOrEsdtTokenIdentifier<M>>::type_name(),
-            ));
-            <EgldOrEsdtTokenIdentifier<M>>::provide_type_descriptions(accumulator);
-            field_descriptions.push(multiversx_sc::abi::StructFieldDescription::new(
-                &[],
-                "token_nonce",
-                <u64>::type_name(),
-            ));
-            <u64>::provide_type_descriptions(accumulator);
-            field_descriptions.push(multiversx_sc::abi::StructFieldDescription::new(
-                &[],
-                "amount",
-                <BigUint<M>>::type_name(),
-            ));
-            <BigUint<M>>::provide_type_descriptions(accumulator);
-            accumulator.insert(
-                type_name.clone(),
-                multiversx_sc::abi::TypeDescription::new(
-                    &[],
-                    type_name,
-                    multiversx_sc::abi::TypeContents::Struct(field_descriptions),
-                ),
-            );
-        }
-    }
-}
-impl<M: ManagedTypeApi> multiversx_sc::abi::TypeAbi for EsdtTokenData<M> {
-    fn type_name() -> multiversx_sc::abi::TypeName {
-        "EsdtTokenData".into()
-    }
-    fn provide_type_descriptions<TDC: multiversx_sc::abi::TypeDescriptionContainer>(
-        accumulator: &mut TDC,
-    ) {
-        let type_name = Self::type_name();
-        if !accumulator.contains_type(&type_name) {
-            accumulator.reserve_type_name(type_name.clone());
-            let mut field_descriptions = multiversx_sc::types::heap::Vec::new();
-            field_descriptions.push(multiversx_sc::abi::StructFieldDescription::new(
-                &[],
-                "token_type",
-                <EsdtTokenType>::type_name(),
-            ));
-            <EsdtTokenType>::provide_type_descriptions(accumulator);
-            field_descriptions.push(multiversx_sc::abi::StructFieldDescription::new(
-                &[],
-                "amount",
-                <BigUint<M>>::type_name(),
-            ));
-            <BigUint<M>>::provide_type_descriptions(accumulator);
-            field_descriptions.push(multiversx_sc::abi::StructFieldDescription::new(
-                &[],
-                "frozen",
-                <bool>::type_name(),
-            ));
-            <bool>::provide_type_descriptions(accumulator);
-            field_descriptions.push(multiversx_sc::abi::StructFieldDescription::new(
-                &[],
-                "hash",
-                <ManagedBuffer<M>>::type_name(),
-            ));
-            <ManagedBuffer<M>>::provide_type_descriptions(accumulator);
-            field_descriptions.push(multiversx_sc::abi::StructFieldDescription::new(
-                &[],
-                "name",
-                <ManagedBuffer<M>>::type_name(),
-            ));
-            <ManagedBuffer<M>>::provide_type_descriptions(accumulator);
-            field_descriptions.push(multiversx_sc::abi::StructFieldDescription::new(
-                &[],
-                "attributes",
-                <ManagedBuffer<M>>::type_name(),
-            ));
-            <ManagedBuffer<M>>::provide_type_descriptions(accumulator);
-            field_descriptions.push(multiversx_sc::abi::StructFieldDescription::new(
-                &[],
-                "creator",
-                <ManagedAddress<M>>::type_name(),
-            ));
-            <ManagedAddress<M>>::provide_type_descriptions(accumulator);
-            field_descriptions.push(multiversx_sc::abi::StructFieldDescription::new(
-                &[],
-                "royalties",
-                <BigUint<M>>::type_name(),
-            ));
-            <BigUint<M>>::provide_type_descriptions(accumulator);
-            field_descriptions.push(multiversx_sc::abi::StructFieldDescription::new(
-                &[],
-                "uris",
-                <ManagedVec<M, ManagedBuffer<M>>>::type_name(),
-            ));
-            <ManagedVec<M, ManagedBuffer<M>>>::provide_type_descriptions(accumulator);
-            accumulator.insert(
-                type_name.clone(),
-                multiversx_sc::abi::TypeDescription::new(
-                    &[],
-                    type_name,
-                    multiversx_sc::abi::TypeContents::Struct(field_descriptions),
-                ),
-            );
-        }
-    }
-}
-impl<M: ManagedTypeApi> multiversx_sc::types::ManagedVecItem for EsdtTokenData<M> {
-    const PAYLOAD_SIZE : usize = < EsdtTokenType as multiversx_sc :: types ::
-    ManagedVecItem > :: PAYLOAD_SIZE + < BigUint < M > as multiversx_sc ::
-    types :: ManagedVecItem > :: PAYLOAD_SIZE + < bool as multiversx_sc ::
-    types :: ManagedVecItem > :: PAYLOAD_SIZE + < ManagedBuffer < M > as
-    multiversx_sc :: types :: ManagedVecItem > :: PAYLOAD_SIZE + <
-    ManagedBuffer < M > as multiversx_sc :: types :: ManagedVecItem > ::
-    PAYLOAD_SIZE + < ManagedBuffer < M > as multiversx_sc :: types ::
-    ManagedVecItem > :: PAYLOAD_SIZE + < ManagedAddress < M > as multiversx_sc
-    :: types :: ManagedVecItem > :: PAYLOAD_SIZE + < BigUint < M > as
-    multiversx_sc :: types :: ManagedVecItem > :: PAYLOAD_SIZE + < ManagedVec
-    < M, ManagedBuffer < M > > as multiversx_sc :: types :: ManagedVecItem >
-    :: PAYLOAD_SIZE ;
-    const SKIPS_RESERIALIZATION : bool = < EsdtTokenType as
-    multiversx_sc :: types :: ManagedVecItem > :: SKIPS_RESERIALIZATION && <
-    BigUint < M > as multiversx_sc :: types :: ManagedVecItem > ::
-    SKIPS_RESERIALIZATION && < bool as multiversx_sc :: types ::
-    ManagedVecItem > :: SKIPS_RESERIALIZATION && < ManagedBuffer < M > as
-    multiversx_sc :: types :: ManagedVecItem > :: SKIPS_RESERIALIZATION && <
-    ManagedBuffer < M > as multiversx_sc :: types :: ManagedVecItem > ::
-    SKIPS_RESERIALIZATION && < ManagedBuffer < M > as multiversx_sc :: types
-    :: ManagedVecItem > :: SKIPS_RESERIALIZATION && < ManagedAddress < M > as
-    multiversx_sc :: types :: ManagedVecItem > :: SKIPS_RESERIALIZATION && <
-    BigUint < M > as multiversx_sc :: types :: ManagedVecItem > ::
-    SKIPS_RESERIALIZATION && < ManagedVec < M, ManagedBuffer < M > > as
-    multiversx_sc :: types :: ManagedVecItem > :: SKIPS_RESERIALIZATION ;
-    type Ref<'a> = Self;
-    fn from_byte_reader<Reader: FnMut(&mut [u8])>(mut reader: Reader) -> Self {
-        const SELF_PAYLOAD_SIZE: usize = <EsdtTokenData<
-            multiversx_sc::api::uncallable::UncallableApi,
-        > as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
-        let mut arr: [u8; SELF_PAYLOAD_SIZE] = [0u8; SELF_PAYLOAD_SIZE];
-        reader(&mut arr[..]);
-        let mut index = 0;
-        EsdtTokenData {
-            token_type: multiversx_sc::types::ManagedVecItem::from_byte_reader(|bytes| {
-                let next_index =
-                    index + <EsdtTokenType as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
-                bytes.copy_from_slice(&arr[index..next_index]);
-                index = next_index;
-            }),
-            amount: multiversx_sc::types::ManagedVecItem::from_byte_reader(|bytes| {
-                let next_index =
-                    index + <BigUint<M> as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
-                bytes.copy_from_slice(&arr[index..next_index]);
-                index = next_index;
-            }),
-            frozen: multiversx_sc::types::ManagedVecItem::from_byte_reader(|bytes| {
-                let next_index =
-                    index + <bool as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
-                bytes.copy_from_slice(&arr[index..next_index]);
-                index = next_index;
-            }),
-            hash: multiversx_sc::types::ManagedVecItem::from_byte_reader(|bytes| {
-                let next_index = index
-                    + <ManagedBuffer<M> as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
-                bytes.copy_from_slice(&arr[index..next_index]);
-                index = next_index;
-            }),
-            name: multiversx_sc::types::ManagedVecItem::from_byte_reader(|bytes| {
-                let next_index = index
-                    + <ManagedBuffer<M> as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
-                bytes.copy_from_slice(&arr[index..next_index]);
-                index = next_index;
-            }),
-            attributes: multiversx_sc::types::ManagedVecItem::from_byte_reader(|bytes| {
-                let next_index = index
-                    + <ManagedBuffer<M> as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
-                bytes.copy_from_slice(&arr[index..next_index]);
-                index = next_index;
-            }),
-            creator: multiversx_sc::types::ManagedVecItem::from_byte_reader(|bytes| {
-                let next_index = index
-                    + <ManagedAddress<M> as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
-                bytes.copy_from_slice(&arr[index..next_index]);
-                index = next_index;
-            }),
-            royalties: multiversx_sc::types::ManagedVecItem::from_byte_reader(|bytes| {
-                let next_index =
-                    index + <BigUint<M> as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
-                bytes.copy_from_slice(&arr[index..next_index]);
-                index = next_index;
-            }),
-            uris: multiversx_sc::types::ManagedVecItem::from_byte_reader(|bytes| {
-                let next_index = index + < ManagedVec < M, ManagedBuffer < M >
-                > as multiversx_sc :: types :: ManagedVecItem > ::
-                PAYLOAD_SIZE ;
-                bytes.copy_from_slice(&arr[index..next_index]);
-                index = next_index;
-            }),
-        }
-    }
-    unsafe fn from_byte_reader_as_borrow<'a, Reader: FnMut(&mut [u8])>(
-        reader: Reader,
-    ) -> Self::Ref<'a> {
-        Self::from_byte_reader(reader)
-    }
-    fn to_byte_writer<R, Writer: FnMut(&[u8]) -> R>(&self, mut writer: Writer) -> R {
-        const SELF_PAYLOAD_SIZE: usize = <EsdtTokenData<
-            multiversx_sc::api::uncallable::UncallableApi,
-        > as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
-        let mut arr: [u8; SELF_PAYLOAD_SIZE] = [0u8; SELF_PAYLOAD_SIZE];
-        let mut index = 0;
-        multiversx_sc::types::ManagedVecItem::to_byte_writer(&self.token_type, |bytes| {
-            let next_index =
-                index + <EsdtTokenType as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
-            arr[index..next_index].copy_from_slice(bytes);
-            index = next_index;
-        });
-        multiversx_sc::types::ManagedVecItem::to_byte_writer(&self.amount, |bytes| {
-            let next_index =
-                index + <BigUint<M> as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
-            arr[index..next_index].copy_from_slice(bytes);
-            index = next_index;
-        });
-        multiversx_sc::types::ManagedVecItem::to_byte_writer(&self.frozen, |bytes| {
-            let next_index = index + <bool as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
-            arr[index..next_index].copy_from_slice(bytes);
-            index = next_index;
-        });
-        multiversx_sc::types::ManagedVecItem::to_byte_writer(&self.hash, |bytes| {
-            let next_index =
-                index + <ManagedBuffer<M> as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
-            arr[index..next_index].copy_from_slice(bytes);
-            index = next_index;
-        });
-        multiversx_sc::types::ManagedVecItem::to_byte_writer(&self.name, |bytes| {
-            let next_index =
-                index + <ManagedBuffer<M> as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
-            arr[index..next_index].copy_from_slice(bytes);
-            index = next_index;
-        });
-        multiversx_sc::types::ManagedVecItem::to_byte_writer(&self.attributes, |bytes| {
-            let next_index =
-                index + <ManagedBuffer<M> as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
-            arr[index..next_index].copy_from_slice(bytes);
-            index = next_index;
-        });
-        multiversx_sc::types::ManagedVecItem::to_byte_writer(&self.creator, |bytes| {
-            let next_index =
-                index + <ManagedAddress<M> as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
-            arr[index..next_index].copy_from_slice(bytes);
-            index = next_index;
-        });
-        multiversx_sc::types::ManagedVecItem::to_byte_writer(&self.royalties, |bytes| {
-            let next_index =
-                index + <BigUint<M> as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
-            arr[index..next_index].copy_from_slice(bytes);
-            index = next_index;
-        });
-        multiversx_sc::types::ManagedVecItem::to_byte_writer(&self.uris, |bytes| {
-            let next_index = index + < ManagedVec < M, ManagedBuffer < M > >
-            as multiversx_sc :: types :: ManagedVecItem > :: PAYLOAD_SIZE ;
-            arr[index..next_index].copy_from_slice(bytes);
-            index = next_index;
-        });
-        writer(&arr[..])
-    }
-}
-impl<M: ManagedTypeApi> multiversx_sc::abi::TypeAbi for EsdtTokenPayment<M> {
-    fn type_name() -> multiversx_sc::abi::TypeName {
-        "EsdtTokenPayment".into()
-    }
-    fn provide_type_descriptions<TDC: multiversx_sc::abi::TypeDescriptionContainer>(
-        accumulator: &mut TDC,
-    ) {
-        let type_name = Self::type_name();
-        if !accumulator.contains_type(&type_name) {
-            accumulator.reserve_type_name(type_name.clone());
-            let mut field_descriptions = multiversx_sc::types::heap::Vec::new();
-            field_descriptions.push(multiversx_sc::abi::StructFieldDescription::new(
-                &[],
-                "token_identifier",
-                <TokenIdentifier<M>>::type_name(),
-            ));
-            <TokenIdentifier<M>>::provide_type_descriptions(accumulator);
-            field_descriptions.push(multiversx_sc::abi::StructFieldDescription::new(
-                &[],
-                "token_nonce",
-                <u64>::type_name(),
-            ));
-            <u64>::provide_type_descriptions(accumulator);
-            field_descriptions.push(multiversx_sc::abi::StructFieldDescription::new(
-                &[],
-                "amount",
-                <BigUint<M>>::type_name(),
-            ));
-            <BigUint<M>>::provide_type_descriptions(accumulator);
-            accumulator.insert(
-                type_name.clone(),
-                multiversx_sc::abi::TypeDescription::new(
-                    &[],
-                    type_name,
-                    multiversx_sc::abi::TypeContents::Struct(field_descriptions),
-                ),
-            );
-        }
-    }
-}
-
-/// One of the simplest smart contracts possible,
-/// it holds a single variable in storage, which anyone can increment.
-pub trait Adder {
-    #[init]
-    fn init(&self) {}
-}
-
-impl<M: ManagedTypeApi> multiversx_sc::abi::TypeAbi for EsdtTokenData<M> {
-    fn type_name() -> multiversx_sc::abi::TypeName {
-        "EsdtTokenData".into()
-    }
-    fn provide_type_descriptions<TDC: multiversx_sc::abi::TypeDescriptionContainer>(
-        accumulator: &mut TDC,
-    ) {
-        let type_name = Self::type_name();
-        if !accumulator.contains_type(&type_name) {
-            accumulator.reserve_type_name(type_name.clone());
-            let mut field_descriptions = multiversx_sc::types::heap::Vec::new();
-            field_descriptions.push(multiversx_sc::abi::StructFieldDescription::new(
-                &[],
-                "token_type",
-                <EsdtTokenType>::type_name(),
-            ));
-            <EsdtTokenType>::provide_type_descriptions(accumulator);
-            field_descriptions.push(multiversx_sc::abi::StructFieldDescription::new(
-                &[],
-                "amount",
-                <BigUint<M>>::type_name(),
-            ));
-            <BigUint<M>>::provide_type_descriptions(accumulator);
-            field_descriptions.push(multiversx_sc::abi::StructFieldDescription::new(
-                &[],
-                "frozen",
-                <bool>::type_name(),
-            ));
-            <bool>::provide_type_descriptions(accumulator);
-            field_descriptions.push(multiversx_sc::abi::StructFieldDescription::new(
-                &[],
-                "hash",
-                <ManagedBuffer<M>>::type_name(),
-            ));
-            <ManagedBuffer<M>>::provide_type_descriptions(accumulator);
-            field_descriptions.push(multiversx_sc::abi::StructFieldDescription::new(
-                &[],
-                "name",
-                <ManagedBuffer<M>>::type_name(),
-            ));
-            <ManagedBuffer<M>>::provide_type_descriptions(accumulator);
-            field_descriptions.push(multiversx_sc::abi::StructFieldDescription::new(
-                &[],
-                "attributes",
-                <ManagedBuffer<M>>::type_name(),
-            ));
-            <ManagedBuffer<M>>::provide_type_descriptions(accumulator);
-            field_descriptions.push(multiversx_sc::abi::StructFieldDescription::new(
-                &[],
-                "creator",
-                <ManagedAddress<M>>::type_name(),
-            ));
-            <ManagedAddress<M>>::provide_type_descriptions(accumulator);
-            field_descriptions.push(multiversx_sc::abi::StructFieldDescription::new(
-                &[],
-                "royalties",
-                <BigUint<M>>::type_name(),
-            ));
-            <BigUint<M>>::provide_type_descriptions(accumulator);
-            field_descriptions.push(multiversx_sc::abi::StructFieldDescription::new(
-                &[],
-                "uris",
-                <ManagedVec<M, ManagedBuffer<M>>>::type_name(),
-            ));
-            <ManagedVec<M, ManagedBuffer<M>>>::provide_type_descriptions(accumulator);
-            accumulator.insert(
-                type_name.clone(),
-                multiversx_sc::abi::TypeDescription::new(
-                    &[],
-                    type_name,
-                    multiversx_sc::abi::TypeContents::Struct(field_descriptions),
-                ),
-            );
-        }
-    }
-}
-
-impl<M: ManagedTypeApi> multiversx_sc::types::ManagedVecItem for EsdtTokenData<M> {
-    const PAYLOAD_SIZE : usize = < EsdtTokenType as multiversx_sc :: types ::
-    ManagedVecItem > :: PAYLOAD_SIZE + < BigUint < M > as multiversx_sc ::
-    types :: ManagedVecItem > :: PAYLOAD_SIZE + < bool as multiversx_sc ::
-    types :: ManagedVecItem > :: PAYLOAD_SIZE + < ManagedBuffer < M > as
-    multiversx_sc :: types :: ManagedVecItem > :: PAYLOAD_SIZE + <
-    ManagedBuffer < M > as multiversx_sc :: types :: ManagedVecItem > ::
-    PAYLOAD_SIZE + < ManagedBuffer < M > as multiversx_sc :: types ::
-    ManagedVecItem > :: PAYLOAD_SIZE + < ManagedAddress < M > as multiversx_sc
-    :: types :: ManagedVecItem > :: PAYLOAD_SIZE + < BigUint < M > as
-    multiversx_sc :: types :: ManagedVecItem > :: PAYLOAD_SIZE + < ManagedVec
-    < M, ManagedBuffer < M > > as multiversx_sc :: types :: ManagedVecItem >
-    :: PAYLOAD_SIZE ;
-    const SKIPS_RESERIALIZATION : bool = < EsdtTokenType as
-    multiversx_sc :: types :: ManagedVecItem > :: SKIPS_RESERIALIZATION && <
-    BigUint < M > as multiversx_sc :: types :: ManagedVecItem > ::
-    SKIPS_RESERIALIZATION && < bool as multiversx_sc :: types ::
-    ManagedVecItem > :: SKIPS_RESERIALIZATION && < ManagedBuffer < M > as
-    multiversx_sc :: types :: ManagedVecItem > :: SKIPS_RESERIALIZATION && <
-    ManagedBuffer < M > as multiversx_sc :: types :: ManagedVecItem > ::
-    SKIPS_RESERIALIZATION && < ManagedBuffer < M > as multiversx_sc :: types
-    :: ManagedVecItem > :: SKIPS_RESERIALIZATION && < ManagedAddress < M > as
-    multiversx_sc :: types :: ManagedVecItem > :: SKIPS_RESERIALIZATION && <
-    BigUint < M > as multiversx_sc :: types :: ManagedVecItem > ::
-    SKIPS_RESERIALIZATION && < ManagedVec < M, ManagedBuffer < M > > as
-    multiversx_sc :: types :: ManagedVecItem > :: SKIPS_RESERIALIZATION ;
-    type Ref<'a> = Self;
-    fn from_byte_reader<Reader: FnMut(&mut [u8])>(mut reader: Reader) -> Self {
-        const SELF_PAYLOAD_SIZE: usize = <EsdtTokenData<
-            multiversx_sc::api::uncallable::UncallableApi,
-        > as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
-        let mut arr: [u8; SELF_PAYLOAD_SIZE] = [0u8; SELF_PAYLOAD_SIZE];
-        reader(&mut arr[..]);
-        let mut index = 0;
-        EsdtTokenData {
-            token_type: multiversx_sc::types::ManagedVecItem::from_byte_reader(|bytes| {
-                let next_index =
-                    index + <EsdtTokenType as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
-                bytes.copy_from_slice(&arr[index..next_index]);
-                index = next_index;
-            }),
-            amount: multiversx_sc::types::ManagedVecItem::from_byte_reader(|bytes| {
-                let next_index =
-                    index + <BigUint<M> as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
-                bytes.copy_from_slice(&arr[index..next_index]);
-                index = next_index;
-            }),
-            frozen: multiversx_sc::types::ManagedVecItem::from_byte_reader(|bytes| {
-                let next_index =
-                    index + <bool as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
-                bytes.copy_from_slice(&arr[index..next_index]);
-                index = next_index;
-            }),
-            hash: multiversx_sc::types::ManagedVecItem::from_byte_reader(|bytes| {
-                let next_index = index
-                    + <ManagedBuffer<M> as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
-                bytes.copy_from_slice(&arr[index..next_index]);
-                index = next_index;
-            }),
-            name: multiversx_sc::types::ManagedVecItem::from_byte_reader(|bytes| {
-                let next_index = index
-                    + <ManagedBuffer<M> as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
-                bytes.copy_from_slice(&arr[index..next_index]);
-                index = next_index;
-            }),
-            attributes: multiversx_sc::types::ManagedVecItem::from_byte_reader(|bytes| {
-                let next_index = index
-                    + <ManagedBuffer<M> as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
-                bytes.copy_from_slice(&arr[index..next_index]);
-                index = next_index;
-            }),
-            creator: multiversx_sc::types::ManagedVecItem::from_byte_reader(|bytes| {
-                let next_index = index
-                    + <ManagedAddress<M> as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
-                bytes.copy_from_slice(&arr[index..next_index]);
-                index = next_index;
-            }),
-            royalties: multiversx_sc::types::ManagedVecItem::from_byte_reader(|bytes| {
-                let next_index =
-                    index + <BigUint<M> as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
-                bytes.copy_from_slice(&arr[index..next_index]);
-                index = next_index;
-            }),
-            uris: multiversx_sc::types::ManagedVecItem::from_byte_reader(|bytes| {
-                let next_index = index + < ManagedVec < M, ManagedBuffer < M >
-                > as multiversx_sc :: types :: ManagedVecItem > ::
-                PAYLOAD_SIZE ;
-                bytes.copy_from_slice(&arr[index..next_index]);
-                index = next_index;
-            }),
-        }
-    }
-    unsafe fn from_byte_reader_as_borrow<'a, Reader: FnMut(&mut [u8])>(
-        reader: Reader,
-    ) -> Self::Ref<'a> {
-        Self::from_byte_reader(reader)
-    }
-    fn to_byte_writer<R, Writer: FnMut(&[u8]) -> R>(&self, mut writer: Writer) -> R {
-        const SELF_PAYLOAD_SIZE: usize = <EsdtTokenData<
-            multiversx_sc::api::uncallable::UncallableApi,
-        > as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
-        let mut arr: [u8; SELF_PAYLOAD_SIZE] = [0u8; SELF_PAYLOAD_SIZE];
-        let mut index = 0;
-        multiversx_sc::types::ManagedVecItem::to_byte_writer(&self.token_type, |bytes| {
-            let next_index =
-                index + <EsdtTokenType as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
-            arr[index..next_index].copy_from_slice(bytes);
-            index = next_index;
-        });
-        multiversx_sc::types::ManagedVecItem::to_byte_writer(&self.amount, |bytes| {
-            let next_index =
-                index + <BigUint<M> as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
-            arr[index..next_index].copy_from_slice(bytes);
-            index = next_index;
-        });
-        multiversx_sc::types::ManagedVecItem::to_byte_writer(&self.frozen, |bytes| {
-            let next_index = index + <bool as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
-            arr[index..next_index].copy_from_slice(bytes);
-            index = next_index;
-        });
-        multiversx_sc::types::ManagedVecItem::to_byte_writer(&self.hash, |bytes| {
-            let next_index =
-                index + <ManagedBuffer<M> as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
-            arr[index..next_index].copy_from_slice(bytes);
-            index = next_index;
-        });
-        multiversx_sc::types::ManagedVecItem::to_byte_writer(&self.name, |bytes| {
-            let next_index =
-                index + <ManagedBuffer<M> as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
-            arr[index..next_index].copy_from_slice(bytes);
-            index = next_index;
-        });
-        multiversx_sc::types::ManagedVecItem::to_byte_writer(&self.attributes, |bytes| {
-            let next_index =
-                index + <ManagedBuffer<M> as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
-            arr[index..next_index].copy_from_slice(bytes);
-            index = next_index;
-        });
-        multiversx_sc::types::ManagedVecItem::to_byte_writer(&self.creator, |bytes| {
-            let next_index =
-                index + <ManagedAddress<M> as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
-            arr[index..next_index].copy_from_slice(bytes);
-            index = next_index;
-        });
-        multiversx_sc::types::ManagedVecItem::to_byte_writer(&self.royalties, |bytes| {
-            let next_index =
-                index + <BigUint<M> as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
-            arr[index..next_index].copy_from_slice(bytes);
-            index = next_index;
-        });
-        multiversx_sc::types::ManagedVecItem::to_byte_writer(&self.uris, |bytes| {
-            let next_index = index + < ManagedVec < M, ManagedBuffer < M > >
-            as multiversx_sc :: types :: ManagedVecItem > :: PAYLOAD_SIZE ;
-            arr[index..next_index].copy_from_slice(bytes);
-            index = next_index;
-        });
-        writer(&arr[..])
-    }
-}
-impl<M: ManagedTypeApi> multiversx_sc::abi::TypeAbi for EsdtTokenPayment<M> {
-    fn type_name() -> multiversx_sc::abi::TypeName {
-        "EsdtTokenPayment".into()
-    }
-    fn provide_type_descriptions<TDC: multiversx_sc::abi::TypeDescriptionContainer>(
-        accumulator: &mut TDC,
-    ) {
-        let type_name = Self::type_name();
-        if !accumulator.contains_type(&type_name) {
-            accumulator.reserve_type_name(type_name.clone());
-            let mut field_descriptions = multiversx_sc::types::heap::Vec::new();
-            field_descriptions.push(multiversx_sc::abi::StructFieldDescription::new(
-                &[],
-                "token_identifier",
-                <TokenIdentifier<M>>::type_name(),
-            ));
-            <TokenIdentifier<M>>::provide_type_descriptions(accumulator);
-            field_descriptions.push(multiversx_sc::abi::StructFieldDescription::new(
-                &[],
-                "token_nonce",
-                <u64>::type_name(),
-            ));
-            <u64>::provide_type_descriptions(accumulator);
-            field_descriptions.push(multiversx_sc::abi::StructFieldDescription::new(
-                &[],
-                "amount",
-                <BigUint<M>>::type_name(),
-            ));
-            <BigUint<M>>::provide_type_descriptions(accumulator);
-            accumulator.insert(
-                type_name.clone(),
-                multiversx_sc::abi::TypeDescription::new(
-                    &[],
-                    type_name,
-                    multiversx_sc::abi::TypeContents::Struct(field_descriptions),
-                ),
-            );
-        }
-    }
-}
diff --git a/contracts/examples/adder/src/somefile.rs b/contracts/examples/adder/src/somefile.rs
deleted file mode 100644
index 7976de1fd9..0000000000
--- a/contracts/examples/adder/src/somefile.rs
+++ /dev/null
@@ -1,582 +0,0 @@
-#![feature(prelude_import)]
-#![no_std]
-#[prelude_import]
-use core::prelude::rust_2021::*;
-#[macro_use]
-extern crate core;
-#[macro_use]
-extern crate compiler_builtins;
-use core::ops::{
-    Add, AddAssign, BitAnd, BitAndAssign, BitOr, BitOrAssign, BitXor, BitXorAssign, Div,
-    DivAssign, Mul, MulAssign, Rem, RemAssign, Shl, ShlAssign, Shr, ShrAssign, Sub,
-    SubAssign,
-};
-use multiversx_sc::{
-    abi::TypeAbi, api::{ErrorApiImpl, ManagedTypeApi},
-    arrayvec::ArrayVec,
-    codec::{
-        multi_types::*, DecodeError, IntoMultiValue, NestedDecode, NestedEncode,
-        TopDecode, TopEncode,
-    },
-    contract_base::{ContractBase, ProxyObjBase},
-    err_msg, esdt::*, io::*, non_zero_usize, non_zero_util::*, require, require_old,
-    sc_error, sc_format, sc_panic, sc_print, storage::mappers::*,
-    types::{
-        SCResult::{Err, Ok},
-        *,
-    },
-};
-
-//// TYPE ABI ////
-impl multiversx_sc::abi::TypeAbi for EsdtLocalRole {
-    fn type_name() -> multiversx_sc::abi::TypeName {
-        "EsdtLocalRole".into()
-    }
-    fn provide_type_descriptions<TDC: multiversx_sc::abi::TypeDescriptionContainer>(
-        accumulator: &mut TDC,
-    ) {
-        let type_name = Self::type_name();
-        if !accumulator.contains_type(&type_name) {
-            accumulator.reserve_type_name(type_name.clone());
-            let mut variant_descriptions = multiversx_sc::types::heap::Vec::new();
-            let mut field_descriptions = multiversx_sc::types::heap::Vec::new();
-            variant_descriptions.push(multiversx_sc::abi::EnumVariantDescription::new(
-                &[],
-                "None",
-                0usize,
-                field_descriptions,
-            ));
-            let mut field_descriptions = multiversx_sc::types::heap::Vec::new();
-            variant_descriptions.push(multiversx_sc::abi::EnumVariantDescription::new(
-                &[],
-                "Mint",
-                1usize,
-                field_descriptions,
-            ));
-            let mut field_descriptions = multiversx_sc::types::heap::Vec::new();
-            variant_descriptions.push(multiversx_sc::abi::EnumVariantDescription::new(
-                &[],
-                "Burn",
-                2usize,
-                field_descriptions,
-            ));
-            let mut field_descriptions = multiversx_sc::types::heap::Vec::new();
-            variant_descriptions.push(multiversx_sc::abi::EnumVariantDescription::new(
-                &[],
-                "NftCreate",
-                3usize,
-                field_descriptions,
-            ));
-            let mut field_descriptions = multiversx_sc::types::heap::Vec::new();
-            variant_descriptions.push(multiversx_sc::abi::EnumVariantDescription::new(
-                &[],
-                "NftAddQuantity",
-                4usize,
-                field_descriptions,
-            ));
-            let mut field_descriptions = multiversx_sc::types::heap::Vec::new();
-            variant_descriptions.push(multiversx_sc::abi::EnumVariantDescription::new(
-                &[],
-                "NftBurn",
-                5usize,
-                field_descriptions,
-            ));
-            let mut field_descriptions = multiversx_sc::types::heap::Vec::new();
-            variant_descriptions.push(multiversx_sc::abi::EnumVariantDescription::new(
-                &[],
-                "NftAddUri",
-                6usize,
-                field_descriptions,
-            ));
-            let mut field_descriptions = multiversx_sc::types::heap::Vec::new();
-            variant_descriptions.push(multiversx_sc::abi::EnumVariantDescription::new(
-                &[],
-                "NftUpdateAttributes",
-                7usize,
-                field_descriptions,
-            ));
-            let mut field_descriptions = multiversx_sc::types::heap::Vec::new();
-            variant_descriptions.push(multiversx_sc::abi::EnumVariantDescription::new(
-                &[],
-                "Transfer",
-                8usize,
-                field_descriptions,
-            ));
-            accumulator.insert(
-                type_name.clone(),
-                multiversx_sc::abi::TypeDescription::new(
-                    &[],
-                    type_name,
-                    multiversx_sc::abi::TypeContents::Enum(variant_descriptions),
-                ),
-            );
-        }
-    }
-}
-//// TYPE ABI ////
-impl multiversx_sc::abi::TypeAbi for EsdtTokenType {
-    fn type_name() -> multiversx_sc::abi::TypeName {
-        "EsdtTokenType".into()
-    }
-    fn provide_type_descriptions<TDC: multiversx_sc::abi::TypeDescriptionContainer>(
-        accumulator: &mut TDC,
-    ) {
-        let type_name = Self::type_name();
-        if !accumulator.contains_type(&type_name) {
-            accumulator.reserve_type_name(type_name.clone());
-            let mut variant_descriptions = multiversx_sc::types::heap::Vec::new();
-            let mut field_descriptions = multiversx_sc::types::heap::Vec::new();
-            variant_descriptions.push(multiversx_sc::abi::EnumVariantDescription::new(
-                &[],
-                "Fungible",
-                0usize,
-                field_descriptions,
-            ));
-            let mut field_descriptions = multiversx_sc::types::heap::Vec::new();
-            variant_descriptions.push(multiversx_sc::abi::EnumVariantDescription::new(
-                &[],
-                "NonFungible",
-                1usize,
-                field_descriptions,
-            ));
-            let mut field_descriptions = multiversx_sc::types::heap::Vec::new();
-            variant_descriptions.push(multiversx_sc::abi::EnumVariantDescription::new(
-                &[],
-                "SemiFungible",
-                2usize,
-                field_descriptions,
-            ));
-            let mut field_descriptions = multiversx_sc::types::heap::Vec::new();
-            variant_descriptions.push(multiversx_sc::abi::EnumVariantDescription::new(
-                &[],
-                "Meta",
-                3usize,
-                field_descriptions,
-            ));
-            let mut field_descriptions = multiversx_sc::types::heap::Vec::new();
-            variant_descriptions.push(multiversx_sc::abi::EnumVariantDescription::new(
-                &[],
-                "Invalid",
-                4usize,
-                field_descriptions,
-            ));
-            accumulator.insert(
-                type_name.clone(),
-                multiversx_sc::abi::TypeDescription::new(
-                    &[],
-                    type_name,
-                    multiversx_sc::abi::TypeContents::Enum(variant_descriptions),
-                ),
-            );
-        }
-    }
-}
-//// MANAGED VEC ITEM ////
-impl multiversx_sc::types::ManagedVecItem for EsdtTokenType {
-    const PAYLOAD_SIZE: usize = 1;
-    const SKIPS_RESERIALIZATION: bool = true;
-    type Ref<'a> = Self;
-    fn from_byte_reader<Reader: FnMut(&mut [u8])>(mut reader: Reader) -> Self {
-        let mut arr: [u8; 1] = [0u8; 1];
-        reader(&mut arr[..]);
-        match arr[0] {
-            0u8 => EsdtTokenType::Fungible,
-            1u8 => EsdtTokenType::NonFungible,
-            2u8 => EsdtTokenType::SemiFungible,
-            3u8 => EsdtTokenType::Meta,
-            4u8 => EsdtTokenType::Invalid,
-            _ => EsdtTokenType::Fungible,
-        }
-    }
-    unsafe fn from_byte_reader_as_borrow<'a, Reader: FnMut(&mut [u8])>(
-        reader: Reader,
-    ) -> Self::Ref<'a> {
-        Self::from_byte_reader(reader)
-    }
-    fn to_byte_writer<R, Writer: FnMut(&[u8]) -> R>(&self, mut writer: Writer) -> R {
-        let mut arr: [u8; 1] = [0u8; 1];
-        arr[0] = match self {
-            EsdtTokenType::Fungible => 0u8,
-            EsdtTokenType::NonFungible => 1u8,
-            EsdtTokenType::SemiFungible => 2u8,
-            EsdtTokenType::Meta => 3u8,
-            EsdtTokenType::Invalid => 4u8,
-        };
-        writer(&arr[..])
-    }
-}
-//// MANAGED VEC ITEM ////
-impl<M: ManagedTypeApi> multiversx_sc::types::ManagedVecItem for EgldOrEsdtTokenIdentifier<M> {
-    const PAYLOAD_SIZE : usize = < ManagedOption < M, TokenIdentifier < M > >
-    as multiversx_sc :: types :: ManagedVecItem > :: PAYLOAD_SIZE ;
-    const
-    SKIPS_RESERIALIZATION : bool = < ManagedOption < M, TokenIdentifier < M >
-    > as multiversx_sc :: types :: ManagedVecItem > :: SKIPS_RESERIALIZATION ;
-    type Ref<'a> = Self;
-    fn from_byte_reader<Reader: FnMut(&mut [u8])>(mut reader: Reader) -> Self {
-        const SELF_PAYLOAD_SIZE: usize = <EgldOrEsdtTokenIdentifier<
-            multiversx_sc::api::uncallable::UncallableApi,
-        > as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
-        let mut arr: [u8; SELF_PAYLOAD_SIZE] = [0u8; SELF_PAYLOAD_SIZE];
-        reader(&mut arr[..]);
-        let mut index = 0;
-        EgldOrEsdtTokenIdentifier {
-            data: multiversx_sc::types::ManagedVecItem::from_byte_reader(|bytes| {
-                let next_index = index + < ManagedOption < M, TokenIdentifier
-                < M > > as multiversx_sc :: types :: ManagedVecItem > ::
-                PAYLOAD_SIZE ;
-                bytes.copy_from_slice(&arr[index..next_index]);
-                index = next_index;
-            }),
-        }
-    }
-    unsafe fn from_byte_reader_as_borrow<'a, Reader: FnMut(&mut [u8])>(
-        reader: Reader,
-    ) -> Self::Ref<'a> {
-        Self::from_byte_reader(reader)
-    }
-    fn to_byte_writer<R, Writer: FnMut(&[u8]) -> R>(&self, mut writer: Writer) -> R {
-        const SELF_PAYLOAD_SIZE: usize = <EgldOrEsdtTokenIdentifier<
-            multiversx_sc::api::uncallable::UncallableApi,
-        > as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
-        let mut arr: [u8; SELF_PAYLOAD_SIZE] = [0u8; SELF_PAYLOAD_SIZE];
-        let mut index = 0;
-        multiversx_sc::types::ManagedVecItem::to_byte_writer(&self.data, |bytes| {
-            let next_index = index + < ManagedOption < M, TokenIdentifier < M
-            > > as multiversx_sc :: types :: ManagedVecItem > :: PAYLOAD_SIZE
-            ;
-            arr[index..next_index].copy_from_slice(bytes);
-            index = next_index;
-        });
-        writer(&arr[..])
-    }
-}
-//// TYPE ABI ////
-impl<M: ManagedTypeApi> multiversx_sc::abi::TypeAbi for EgldOrEsdtTokenPayment<M> {
-    fn type_name() -> multiversx_sc::abi::TypeName {
-        "EgldOrEsdtTokenPayment".into()
-    }
-    fn provide_type_descriptions<TDC: multiversx_sc::abi::TypeDescriptionContainer>(
-        accumulator: &mut TDC,
-    ) {
-        let type_name = Self::type_name();
-        if !accumulator.contains_type(&type_name) {
-            accumulator.reserve_type_name(type_name.clone());
-            let mut field_descriptions = multiversx_sc::types::heap::Vec::new();
-            field_descriptions.push(multiversx_sc::abi::StructFieldDescription::new(
-                &[],
-                "token_identifier",
-                <EgldOrEsdtTokenIdentifier<M>>::type_name(),
-            ));
-            <EgldOrEsdtTokenIdentifier<M>>::provide_type_descriptions(accumulator);
-            field_descriptions.push(multiversx_sc::abi::StructFieldDescription::new(
-                &[],
-                "token_nonce",
-                <u64>::type_name(),
-            ));
-            <u64>::provide_type_descriptions(accumulator);
-            field_descriptions.push(multiversx_sc::abi::StructFieldDescription::new(
-                &[],
-                "amount",
-                <BigUint<M>>::type_name(),
-            ));
-            <BigUint<M>>::provide_type_descriptions(accumulator);
-            accumulator.insert(
-                type_name.clone(),
-                multiversx_sc::abi::TypeDescription::new(
-                    &[],
-                    type_name,
-                    multiversx_sc::abi::TypeContents::Struct(field_descriptions),
-                ),
-            );
-        }
-    }
-}
-
-//// TYPE ABI ////
-impl<M: ManagedTypeApi> multiversx_sc::abi::TypeAbi for EsdtTokenData<M> {
-    fn type_name() -> multiversx_sc::abi::TypeName {
-        "EsdtTokenData".into()
-    }
-    fn provide_type_descriptions<TDC: multiversx_sc::abi::TypeDescriptionContainer>(
-        accumulator: &mut TDC,
-    ) {
-        let type_name = Self::type_name();
-        if !accumulator.contains_type(&type_name) {
-            accumulator.reserve_type_name(type_name.clone());
-            let mut field_descriptions = multiversx_sc::types::heap::Vec::new();
-            field_descriptions.push(multiversx_sc::abi::StructFieldDescription::new(
-                &[],
-                "token_type",
-                <EsdtTokenType>::type_name(),
-            ));
-            <EsdtTokenType>::provide_type_descriptions(accumulator);
-            field_descriptions.push(multiversx_sc::abi::StructFieldDescription::new(
-                &[],
-                "amount",
-                <BigUint<M>>::type_name(),
-            ));
-            <BigUint<M>>::provide_type_descriptions(accumulator);
-            field_descriptions.push(multiversx_sc::abi::StructFieldDescription::new(
-                &[],
-                "frozen",
-                <bool>::type_name(),
-            ));
-            <bool>::provide_type_descriptions(accumulator);
-            field_descriptions.push(multiversx_sc::abi::StructFieldDescription::new(
-                &[],
-                "hash",
-                <ManagedBuffer<M>>::type_name(),
-            ));
-            <ManagedBuffer<M>>::provide_type_descriptions(accumulator);
-            field_descriptions.push(multiversx_sc::abi::StructFieldDescription::new(
-                &[],
-                "name",
-                <ManagedBuffer<M>>::type_name(),
-            ));
-            <ManagedBuffer<M>>::provide_type_descriptions(accumulator);
-            field_descriptions.push(multiversx_sc::abi::StructFieldDescription::new(
-                &[],
-                "attributes",
-                <ManagedBuffer<M>>::type_name(),
-            ));
-            <ManagedBuffer<M>>::provide_type_descriptions(accumulator);
-            field_descriptions.push(multiversx_sc::abi::StructFieldDescription::new(
-                &[],
-                "creator",
-                <ManagedAddress<M>>::type_name(),
-            ));
-            <ManagedAddress<M>>::provide_type_descriptions(accumulator);
-            field_descriptions.push(multiversx_sc::abi::StructFieldDescription::new(
-                &[],
-                "royalties",
-                <BigUint<M>>::type_name(),
-            ));
-            <BigUint<M>>::provide_type_descriptions(accumulator);
-            field_descriptions.push(multiversx_sc::abi::StructFieldDescription::new(
-                &[],
-                "uris",
-                <ManagedVec<M, ManagedBuffer<M>>>::type_name(),
-            ));
-            <ManagedVec<M, ManagedBuffer<M>>>::provide_type_descriptions(accumulator);
-            accumulator.insert(
-                type_name.clone(),
-                multiversx_sc::abi::TypeDescription::new(
-                    &[],
-                    type_name,
-                    multiversx_sc::abi::TypeContents::Struct(field_descriptions),
-                ),
-            );
-        }
-    }
-}
-//// MANAGED VEC ITEM ////
-impl<M: ManagedTypeApi> multiversx_sc::types::ManagedVecItem for EsdtTokenData<M> {
-    const PAYLOAD_SIZE : usize = < EsdtTokenType as multiversx_sc :: types ::
-    ManagedVecItem > :: PAYLOAD_SIZE + < BigUint < M > as multiversx_sc ::
-    types :: ManagedVecItem > :: PAYLOAD_SIZE + < bool as multiversx_sc ::
-    types :: ManagedVecItem > :: PAYLOAD_SIZE + < ManagedBuffer < M > as
-    multiversx_sc :: types :: ManagedVecItem > :: PAYLOAD_SIZE + <
-    ManagedBuffer < M > as multiversx_sc :: types :: ManagedVecItem > ::
-    PAYLOAD_SIZE + < ManagedBuffer < M > as multiversx_sc :: types ::
-    ManagedVecItem > :: PAYLOAD_SIZE + < ManagedAddress < M > as multiversx_sc
-    :: types :: ManagedVecItem > :: PAYLOAD_SIZE + < BigUint < M > as
-    multiversx_sc :: types :: ManagedVecItem > :: PAYLOAD_SIZE + < ManagedVec
-    < M, ManagedBuffer < M > > as multiversx_sc :: types :: ManagedVecItem >
-    :: PAYLOAD_SIZE ;
-    const SKIPS_RESERIALIZATION : bool = < EsdtTokenType as
-    multiversx_sc :: types :: ManagedVecItem > :: SKIPS_RESERIALIZATION && <
-    BigUint < M > as multiversx_sc :: types :: ManagedVecItem > ::
-    SKIPS_RESERIALIZATION && < bool as multiversx_sc :: types ::
-    ManagedVecItem > :: SKIPS_RESERIALIZATION && < ManagedBuffer < M > as
-    multiversx_sc :: types :: ManagedVecItem > :: SKIPS_RESERIALIZATION && <
-    ManagedBuffer < M > as multiversx_sc :: types :: ManagedVecItem > ::
-    SKIPS_RESERIALIZATION && < ManagedBuffer < M > as multiversx_sc :: types
-    :: ManagedVecItem > :: SKIPS_RESERIALIZATION && < ManagedAddress < M > as
-    multiversx_sc :: types :: ManagedVecItem > :: SKIPS_RESERIALIZATION && <
-    BigUint < M > as multiversx_sc :: types :: ManagedVecItem > ::
-    SKIPS_RESERIALIZATION && < ManagedVec < M, ManagedBuffer < M > > as
-    multiversx_sc :: types :: ManagedVecItem > :: SKIPS_RESERIALIZATION ;
-    type Ref<'a> = Self;
-    fn from_byte_reader<Reader: FnMut(&mut [u8])>(mut reader: Reader) -> Self {
-        const SELF_PAYLOAD_SIZE: usize = <EsdtTokenData<
-            multiversx_sc::api::uncallable::UncallableApi,
-        > as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
-        let mut arr: [u8; SELF_PAYLOAD_SIZE] = [0u8; SELF_PAYLOAD_SIZE];
-        reader(&mut arr[..]);
-        let mut index = 0;
-        EsdtTokenData {
-            token_type: multiversx_sc::types::ManagedVecItem::from_byte_reader(|bytes| {
-                let next_index =
-                    index + <EsdtTokenType as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
-                bytes.copy_from_slice(&arr[index..next_index]);
-                index = next_index;
-            }),
-            amount: multiversx_sc::types::ManagedVecItem::from_byte_reader(|bytes| {
-                let next_index =
-                    index + <BigUint<M> as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
-                bytes.copy_from_slice(&arr[index..next_index]);
-                index = next_index;
-            }),
-            frozen: multiversx_sc::types::ManagedVecItem::from_byte_reader(|bytes| {
-                let next_index =
-                    index + <bool as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
-                bytes.copy_from_slice(&arr[index..next_index]);
-                index = next_index;
-            }),
-            hash: multiversx_sc::types::ManagedVecItem::from_byte_reader(|bytes| {
-                let next_index = index
-                    + <ManagedBuffer<M> as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
-                bytes.copy_from_slice(&arr[index..next_index]);
-                index = next_index;
-            }),
-            name: multiversx_sc::types::ManagedVecItem::from_byte_reader(|bytes| {
-                let next_index = index
-                    + <ManagedBuffer<M> as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
-                bytes.copy_from_slice(&arr[index..next_index]);
-                index = next_index;
-            }),
-            attributes: multiversx_sc::types::ManagedVecItem::from_byte_reader(|bytes| {
-                let next_index = index
-                    + <ManagedBuffer<M> as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
-                bytes.copy_from_slice(&arr[index..next_index]);
-                index = next_index;
-            }),
-            creator: multiversx_sc::types::ManagedVecItem::from_byte_reader(|bytes| {
-                let next_index = index
-                    + <ManagedAddress<M> as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
-                bytes.copy_from_slice(&arr[index..next_index]);
-                index = next_index;
-            }),
-            royalties: multiversx_sc::types::ManagedVecItem::from_byte_reader(|bytes| {
-                let next_index =
-                    index + <BigUint<M> as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
-                bytes.copy_from_slice(&arr[index..next_index]);
-                index = next_index;
-            }),
-            uris: multiversx_sc::types::ManagedVecItem::from_byte_reader(|bytes| {
-                let next_index = index + < ManagedVec < M, ManagedBuffer < M >
-                > as multiversx_sc :: types :: ManagedVecItem > ::
-                PAYLOAD_SIZE ;
-                bytes.copy_from_slice(&arr[index..next_index]);
-                index = next_index;
-            }),
-        }
-    }
-    unsafe fn from_byte_reader_as_borrow<'a, Reader: FnMut(&mut [u8])>(
-        reader: Reader,
-    ) -> Self::Ref<'a> {
-        Self::from_byte_reader(reader)
-    }
-    fn to_byte_writer<R, Writer: FnMut(&[u8]) -> R>(&self, mut writer: Writer) -> R {
-        const SELF_PAYLOAD_SIZE: usize = <EsdtTokenData<
-            multiversx_sc::api::uncallable::UncallableApi,
-        > as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
-        let mut arr: [u8; SELF_PAYLOAD_SIZE] = [0u8; SELF_PAYLOAD_SIZE];
-        let mut index = 0;
-        multiversx_sc::types::ManagedVecItem::to_byte_writer(&self.token_type, |bytes| {
-            let next_index =
-                index + <EsdtTokenType as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
-            arr[index..next_index].copy_from_slice(bytes);
-            index = next_index;
-        });
-        multiversx_sc::types::ManagedVecItem::to_byte_writer(&self.amount, |bytes| {
-            let next_index =
-                index + <BigUint<M> as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
-            arr[index..next_index].copy_from_slice(bytes);
-            index = next_index;
-        });
-        multiversx_sc::types::ManagedVecItem::to_byte_writer(&self.frozen, |bytes| {
-            let next_index = index + <bool as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
-            arr[index..next_index].copy_from_slice(bytes);
-            index = next_index;
-        });
-        multiversx_sc::types::ManagedVecItem::to_byte_writer(&self.hash, |bytes| {
-            let next_index =
-                index + <ManagedBuffer<M> as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
-            arr[index..next_index].copy_from_slice(bytes);
-            index = next_index;
-        });
-        multiversx_sc::types::ManagedVecItem::to_byte_writer(&self.name, |bytes| {
-            let next_index =
-                index + <ManagedBuffer<M> as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
-            arr[index..next_index].copy_from_slice(bytes);
-            index = next_index;
-        });
-        multiversx_sc::types::ManagedVecItem::to_byte_writer(&self.attributes, |bytes| {
-            let next_index =
-                index + <ManagedBuffer<M> as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
-            arr[index..next_index].copy_from_slice(bytes);
-            index = next_index;
-        });
-        multiversx_sc::types::ManagedVecItem::to_byte_writer(&self.creator, |bytes| {
-            let next_index =
-                index + <ManagedAddress<M> as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
-            arr[index..next_index].copy_from_slice(bytes);
-            index = next_index;
-        });
-        multiversx_sc::types::ManagedVecItem::to_byte_writer(&self.royalties, |bytes| {
-            let next_index =
-                index + <BigUint<M> as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
-            arr[index..next_index].copy_from_slice(bytes);
-            index = next_index;
-        });
-        multiversx_sc::types::ManagedVecItem::to_byte_writer(&self.uris, |bytes| {
-            let next_index = index + < ManagedVec < M, ManagedBuffer < M > >
-            as multiversx_sc :: types :: ManagedVecItem > :: PAYLOAD_SIZE ;
-            arr[index..next_index].copy_from_slice(bytes);
-            index = next_index;
-        });
-        writer(&arr[..])
-    }
-}
-//// TYPE ABI ////
-impl<M: ManagedTypeApi> multiversx_sc::abi::TypeAbi for EsdtTokenPayment<M> {
-    fn type_name() -> multiversx_sc::abi::TypeName {
-        "EsdtTokenPayment".into()
-    }
-    fn provide_type_descriptions<TDC: multiversx_sc::abi::TypeDescriptionContainer>(
-        accumulator: &mut TDC,
-    ) {
-        let type_name = Self::type_name();
-        if !accumulator.contains_type(&type_name) {
-            accumulator.reserve_type_name(type_name.clone());
-            let mut field_descriptions = multiversx_sc::types::heap::Vec::new();
-            field_descriptions.push(multiversx_sc::abi::StructFieldDescription::new(
-                &[],
-                "token_identifier",
-                <TokenIdentifier<M>>::type_name(),
-            ));
-            <TokenIdentifier<M>>::provide_type_descriptions(accumulator);
-            field_descriptions.push(multiversx_sc::abi::StructFieldDescription::new(
-                &[],
-                "token_nonce",
-                <u64>::type_name(),
-            ));
-            <u64>::provide_type_descriptions(accumulator);
-            field_descriptions.push(multiversx_sc::abi::StructFieldDescription::new(
-                &[],
-                "amount",
-                <BigUint<M>>::type_name(),
-            ));
-            <BigUint<M>>::provide_type_descriptions(accumulator);
-            accumulator.insert(
-                type_name.clone(),
-                multiversx_sc::abi::TypeDescription::new(
-                    &[],
-                    type_name,
-                    multiversx_sc::abi::TypeContents::Struct(field_descriptions),
-                ),
-            );
-        }
-    }
-}
-
-/// One of the simplest smart contracts possible,
-/// it holds a single variable in storage, which anyone can increment.
-pub trait Adder {
-    #[init]
-    fn init(&self) {}
-}
-
-
diff --git a/contracts/examples/adder/wasm/Cargo.lock b/contracts/examples/adder/wasm/Cargo.lock
index 04da89c898..d1bf10562e 100755
--- a/contracts/examples/adder/wasm/Cargo.lock
+++ b/contracts/examples/adder/wasm/Cargo.lock
@@ -114,7 +114,7 @@ dependencies = [
  "hex",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
@@ -125,7 +125,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "radix_trie",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
@@ -193,17 +193,6 @@ version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
-[[package]]
-name = "syn"
-version = "1.0.109"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
 [[package]]
 name = "syn"
 version = "2.0.39"
@@ -244,5 +233,5 @@ checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn",
 ]
diff --git a/contracts/examples/adder/wasm/src/lib.rs b/contracts/examples/adder/wasm/src/lib.rs
index b364edf422..b81a2ed0d7 100644
--- a/contracts/examples/adder/wasm/src/lib.rs
+++ b/contracts/examples/adder/wasm/src/lib.rs
@@ -5,9 +5,9 @@
 ////////////////////////////////////////////////////
 
 // Init:                                 1
-// Endpoints:                            3
+// Endpoints:                            2
 // Async Callback (empty):               1
-// Total number of exported functions:   5
+// Total number of exported functions:   4
 
 #![no_std]
 
@@ -22,9 +22,8 @@ multiversx_sc_wasm_adapter::endpoints! {
     adder
     (
         init => init
-        getSum => sum
-        upgrade => upgrade
-        add => add
+        endpoint => try_s
+        end => end
     )
 }
 
diff --git a/framework/base/src/types/managed/wrapped/egld_or_multi_esdt_payment.rs b/framework/base/src/types/managed/wrapped/egld_or_multi_esdt_payment.rs
index 6d543b94db..fa23a582ac 100644
--- a/framework/base/src/types/managed/wrapped/egld_or_multi_esdt_payment.rs
+++ b/framework/base/src/types/managed/wrapped/egld_or_multi_esdt_payment.rs
@@ -15,68 +15,71 @@ use crate::derive::TypeAbi;
 /// Encodes any type of payment, which either:
 /// - EGLD (can be zero in case of no payment whatsoever);
 /// - Multi-ESDT (one or more ESDT transfers).
-#[derive(TopDecode, TopEncode, NestedDecode, NestedEncode, Clone, PartialEq, Eq, Debug)]
+#[derive(
+    TopDecode, TopEncode, TypeAbi, NestedDecode, NestedEncode, Clone, PartialEq, Eq, Debug,
+)]
 pub enum EgldOrMultiEsdtPayment<M: ManagedTypeApi> {
     Egld(BigUint<M>),
     MultiEsdt(ManagedVec<M, EsdtTokenPayment<M>>),
 }
 
-impl<M: ManagedTypeApi> multiversx_sc::abi::TypeAbi for EgldOrMultiEsdtPayment<M> {
-    fn type_name() -> multiversx_sc::abi::TypeName {
-        "EgldOrMultiEsdtPayment".into()
-    }
+impl<M> CodecFromSelf for EgldOrMultiEsdtPayment<M> where M: ManagedTypeApi {}
 
-    fn provide_type_descriptions<TDC: multiversx_sc::abi::TypeDescriptionContainer>(
-        accumulator: &mut TDC,
-    ) {
-        let type_name = Self::type_name();
-        if !accumulator.contains_type(&type_name) {
-            accumulator.reserve_type_name(type_name.clone());
+// Manual TypeAbi impl for EgldOrMultiEsdtPayment
+// impl<M: ManagedTypeApi> multiversx_sc::abi::TypeAbi for EgldOrMultiEsdtPayment<M> {
+//     fn type_name() -> multiversx_sc::abi::TypeName {
+//         "EgldOrMultiEsdtPayment".into()
+//     }
 
-            let mut field_descriptions = multiversx_sc::types::heap::Vec::new();
+//     fn provide_type_descriptions<TDC: multiversx_sc::abi::TypeDescriptionContainer>(
+//         accumulator: &mut TDC,
+//     ) {
+//         let type_name = Self::type_name();
+//         if !accumulator.contains_type(&type_name) {
+//             accumulator.reserve_type_name(type_name.clone());
 
-            let inner_biguint =
-                multiversx_sc::abi::StructFieldDescription::new(&[], "", <BigUint<M>>::type_name());
-            let mut inner_vec =
-                crate::types::heap::Vec::<multiversx_sc::abi::StructFieldDescription>::new();
-            inner_vec.push(inner_biguint);
+//             let mut field_descriptions = multiversx_sc::types::heap::Vec::new();
 
-            field_descriptions.push(multiversx_sc::abi::EnumVariantDescription::new(
-                &[],
-                "Egld",
-                0usize,
-                inner_vec,
-            ));
-            <BigUint<M>>::provide_type_descriptions(accumulator);
+//             let inner_biguint =
+//                 multiversx_sc::abi::StructFieldDescription::new(&[], "", <BigUint<M>>::type_name());
+//             let mut inner_vec =
+//                 crate::types::heap::Vec::<multiversx_sc::abi::StructFieldDescription>::new();
+//             inner_vec.push(inner_biguint);
 
-            let mut inner_vec_managed =
-            crate::types::heap::Vec::<multiversx_sc::abi::StructFieldDescription>::new();
-            let inner_vec_managed_struct = multiversx_sc::abi::StructFieldDescription::new(
-                &[],
-                "",
-                multiversx_sc::types::ManagedVec::<M, multiversx_sc::types::EsdtTokenPayment<M>>::type_name(),
-            );
-            inner_vec_managed.push(inner_vec_managed_struct);
+//             field_descriptions.push(multiversx_sc::abi::EnumVariantDescription::new(
+//                 &[],
+//                 "Egld",
+//                 0usize,
+//                 inner_vec,
+//             ));
+//             <BigUint<M>>::provide_type_descriptions(accumulator);
 
-            field_descriptions.push(multiversx_sc::abi::EnumVariantDescription::new(
-                &[],
-                "MultiEsdt",
-                1usize,
-                inner_vec_managed,
-            ));
-            <multiversx_sc::types::EsdtTokenPayment<M>>::provide_type_descriptions(accumulator);
-            <multiversx_sc::types::ManagedVec::<M, multiversx_sc::types::EsdtTokenPayment<M>>>::provide_type_descriptions(accumulator);
+//             let mut inner_vec_managed =
+//             crate::types::heap::Vec::<multiversx_sc::abi::StructFieldDescription>::new();
+//             let inner_vec_managed_struct = multiversx_sc::abi::StructFieldDescription::new(
+//                 &[],
+//                 "",
+//                 multiversx_sc::types::ManagedVec::<M, multiversx_sc::types::EsdtTokenPayment<M>>::type_name(),
+//             );
+//             inner_vec_managed.push(inner_vec_managed_struct);
 
-            accumulator.insert(
-                type_name.clone(),
-                multiversx_sc::abi::TypeDescription::new(
-                    &[],
-                    type_name,
-                    multiversx_sc::abi::TypeContents::Enum(field_descriptions),
-                ),
-            );
-        }
-    }
-}
+//             field_descriptions.push(multiversx_sc::abi::EnumVariantDescription::new(
+//                 &[],
+//                 "MultiEsdt",
+//                 1usize,
+//                 inner_vec_managed,
+//             ));
+//             <multiversx_sc::types::EsdtTokenPayment<M>>::provide_type_descriptions(accumulator);
+//             <multiversx_sc::types::ManagedVec::<M, multiversx_sc::types::EsdtTokenPayment<M>>>::provide_type_descriptions(accumulator);
 
-impl<M> CodecFromSelf for EgldOrMultiEsdtPayment<M> where M: ManagedTypeApi {}
+//             accumulator.insert(
+//                 type_name.clone(),
+//                 multiversx_sc::abi::TypeDescription::new(
+//                     &[],
+//                     type_name,
+//                     multiversx_sc::abi::TypeContents::Enum(field_descriptions),
+//                 ),
+//             );
+//         }
+//     }
+// }
diff --git a/framework/derive/src/macro_proxy.rs b/framework/derive/src/macro_proxy.rs
index e76ef2c27d..9c2c86dd4c 100644
--- a/framework/derive/src/macro_proxy.rs
+++ b/framework/derive/src/macro_proxy.rs
@@ -13,7 +13,7 @@ pub fn process_proxy(
     let new_input = trait_preprocessing(input);
     let proc_input = parse_macro_input!(new_input as syn::ItemTrait);
 
-    let args_input =if args.is_empty() {
+    let args_input = if args.is_empty() {
         syn::MetaList {
             path: syn::Path {
                 leading_colon: Some(syn::token::PathSep::default()),
@@ -24,7 +24,7 @@ pub fn process_proxy(
             tokens: proc_macro2::TokenStream::new(),
         }
     } else {
-      parse_macro_input!(args as syn::MetaList)
+        parse_macro_input!(args as syn::MetaList)
     };
 
     let contract = parse_contract_trait(args_input, &proc_input);
diff --git a/framework/derive/src/parse/attributes/payable_attr.rs b/framework/derive/src/parse/attributes/payable_attr.rs
index cbb4c5f019..194c4d19b5 100644
--- a/framework/derive/src/parse/attributes/payable_attr.rs
+++ b/framework/derive/src/parse/attributes/payable_attr.rs
@@ -23,41 +23,33 @@ impl PayableAttribute {
 /// Current implementation only works with 1 token name.
 /// Might be extended in the future.
 fn extract_token_identifier(attr: &syn::Attribute) -> Option<String> {
-    let mut iter;
-    let tokens: Result<proc_macro2::TokenStream, syn::Error> = attr.clone().parse_args();
-    match tokens {
-        Ok(val) => iter = val.into_iter(),
-        Err(err) => panic!("failed to parse arguments: {}", err),
-    }
-
-    let result_str = match iter.next() {
-        Some(proc_macro2::TokenTree::Group(group)) => {
-            assert!(
-                group.delimiter() == proc_macro2::Delimiter::Parenthesis,
-                "payable token name must be specified in parantheses"
-            );
-            let mut iter2 = group.stream().into_iter();
-            match iter2.next() {
-                Some(proc_macro2::TokenTree::Literal(lit)) => {
-                    let str_val = lit.to_string();
+    match attr.meta.clone() {
+        syn::Meta::Path(_) => {
+            panic!("attribute needs 1 string argument: Replace with #[payable(\"*\")] or #[payable(\"EGLD\")]")
+        },
+        syn::Meta::List(list) => {
+            let mut iter = list.tokens.into_iter();
+            let ticker = match iter.next() {
+                Some(proc_macro2::TokenTree::Literal(literal)) => {
+                    let clean = literal.to_string().trim_matches('\"').trim().to_string();
                     assert!(
-                        str_val.starts_with('\"') && str_val.ends_with('\"'),
-                        "string literal expected as attribute argument"
+                        !clean.is_empty(),
+                        "ticker can not be empty. attribute needs 1 string argument: Replace with #[payable(\"*\")] or #[payable(\"EGLD\")"
                     );
-                    let substr = &str_val[1..str_val.len() - 1];
-                    Some(substr.to_string())
+                    clean
                 },
-                _ => panic!("literal expected as event identifier"),
-            }
-        },
-        None => None,
-        _ => panic!("unexpected payable attribute format"),
-    };
-
-    assert!(
-        iter.next().is_none(),
-        "event too many tokens in event attribute"
-    );
+                Some(_) => panic!("expected a string as argument"),
+                None => panic!("argument can not be empty. attribute needs 1 string argument: Replace with #[payable(\"*\")] or #[payable(\"EGLD\")"),
+            };
 
-    result_str
+            assert!(
+                iter.next().is_none(),
+                "too many tokens in attribute argument"
+            );
+            Some(ticker)
+        },
+        syn::Meta::NameValue(_) => panic!(
+            "attribute can not be name value. attribute needs 1 string argument: \"*\" or \"EGLD\""
+        ),
+    }
 }

From ff0045eb3debadd9b79046569cbb0616ae8b45c2 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Wed, 29 Nov 2023 18:26:05 +0100
Subject: [PATCH 0135/1254] fixed issue in attr_one_opt_token_tree_arg when it
 returned endpoint instead of method name for endpoints without argument

---
 contracts/core/price-aggregator/wasm/Cargo.lock | 17 +++--------------
 framework/derive/src/parse/attributes/util.rs   |  4 ++--
 2 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/contracts/core/price-aggregator/wasm/Cargo.lock b/contracts/core/price-aggregator/wasm/Cargo.lock
index fe6c2ca401..27e9364d8d 100644
--- a/contracts/core/price-aggregator/wasm/Cargo.lock
+++ b/contracts/core/price-aggregator/wasm/Cargo.lock
@@ -116,7 +116,7 @@ dependencies = [
  "hex",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
@@ -127,7 +127,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "radix_trie",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
@@ -202,17 +202,6 @@ version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
-[[package]]
-name = "syn"
-version = "1.0.109"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
 [[package]]
 name = "syn"
 version = "2.0.39"
@@ -253,5 +242,5 @@ checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn",
 ]
diff --git a/framework/derive/src/parse/attributes/util.rs b/framework/derive/src/parse/attributes/util.rs
index f4d04b67be..40d581f252 100644
--- a/framework/derive/src/parse/attributes/util.rs
+++ b/framework/derive/src/parse/attributes/util.rs
@@ -142,9 +142,9 @@ fn attr_one_opt_token_tree_arg(attr: &syn::Attribute) -> Option<proc_macro2::Tok
             let mut iter = val.segments.into_iter();
             let arg_token_tree: Option<proc_macro2::TokenTree> = match iter.next() {
                 Some(syn::PathSegment {
-                    ident: val,
+                    ident: _,
                     arguments: syn::PathArguments::None,
-                }) => Some(proc_macro2::TokenTree::Ident(val)),
+                }) => None,
                 Some(_) => panic!("unexpected attribute argument tokens"),
                 None => None,
             };

From e79f3d4c07e5e45dd5716224e2983dacb4696f67 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Wed, 29 Nov 2023 22:21:31 +0100
Subject: [PATCH 0136/1254] fixed doc attribute

---
 ...bi_tester_expected_esdt_attr.esdt-abi.json |  2 +-
 .../derive/src/parse/attributes/doc_attr.rs   | 58 +++++++------------
 2 files changed, 22 insertions(+), 38 deletions(-)

diff --git a/contracts/feature-tests/abi-tester/abi_tester_expected_esdt_attr.esdt-abi.json b/contracts/feature-tests/abi-tester/abi_tester_expected_esdt_attr.esdt-abi.json
index c1fcdf278d..d96d3badee 100644
--- a/contracts/feature-tests/abi-tester/abi_tester_expected_esdt_attr.esdt-abi.json
+++ b/contracts/feature-tests/abi-tester/abi_tester_expected_esdt_attr.esdt-abi.json
@@ -7,7 +7,7 @@
         "OnlyShowsUpAsNested10": {
             "type": "struct",
             "docs": [
-                "Tests that the ABI generator also fetches types that only appear as fields."
+                " Tests that the ABI generator also fetches types that only appear as fields."
             ]
         },
         "OnlyShowsUpInEsdtAttr": {
diff --git a/framework/derive/src/parse/attributes/doc_attr.rs b/framework/derive/src/parse/attributes/doc_attr.rs
index 58c75c1680..05549002ad 100644
--- a/framework/derive/src/parse/attributes/doc_attr.rs
+++ b/framework/derive/src/parse/attributes/doc_attr.rs
@@ -1,8 +1,10 @@
+use quote::ToTokens;
+
 use super::{attr_names::*, util::*};
 
 /// unlike the others, this is standard Rust,
 /// all doc comments get automatically transformed into "doc" attributes
-static ATTR_DOC: &str = "[doc]";
+static ATTR_DOC: &str = "doc";
 
 /// Doc comments are actually syntactic sugar for doc attributes,
 /// so extracting doc comments means parsing "doc" attributes.
@@ -16,43 +18,25 @@ pub fn extract_doc(attrs: &[syn::Attribute]) -> Vec<String> {
                 false
             }
         })
-        .map(|attr| {
-            let mut tokens_iter;
-            let tokens: Result<proc_macro2::TokenStream, syn::Error> = attr.parse_args();
-
-            match tokens {
-                Ok(val) => tokens_iter = val.into_iter(),
-                Err(err) => panic!("failed to parse arguments: {}", err),
-            }
-
-            // checking punctuation, the first token is '='
-            if let Some(proc_macro2::TokenTree::Punct(punct)) = tokens_iter.next() {
-                assert_eq!(punct.as_char(), '=');
-            } else {
-                panic!("malformed doc attribute, the first token should be '='");
-            }
-
-            if let Some(proc_macro2::TokenTree::Literal(lit)) = tokens_iter.next() {
-                let lit_str = lit.to_string();
-                let mut message_slice = lit_str.as_str();
-
-                // the useful part of the message is between quotes
-                assert!(
-                    message_slice.starts_with('\"') && message_slice.ends_with('\"'),
-                    "malformed doc attribute: string literal expected"
-                );
-                message_slice = &message_slice[1..message_slice.len() - 1];
-
-                // most doc comments start with a space, so remove that too
-                if message_slice.starts_with(' ') {
-                    message_slice = &message_slice[1..];
+        .map(|attr| match attr.meta.clone() {
+            syn::Meta::Path(_) => panic!("wrong format. expected name value, received path"),
+            syn::Meta::List(_) => panic!("wrong format. expected name value, received list"),
+            syn::Meta::NameValue(meta_name_value) => {
+                if let syn::Expr::Lit(lit_str) = meta_name_value.value {
+                    if meta_name_value.path.is_ident("doc") {
+                        let value = lit_str.lit;
+                        value
+                            .to_token_stream()
+                            .to_string()
+                            .trim_matches('\"')
+                            .to_string()
+                    } else {
+                        panic!("Attribute doesn't have the 'doc' identifier");
+                    }
+                } else {
+                    panic!("Value is not a string literal");
                 }
-
-                // also unescape escaped single and double quotes
-                message_slice.replace("\\\"", "\"").replace("\\'", "'")
-            } else {
-                panic!("malformed doc attribute");
-            }
+            },
         })
         .collect()
 }

From f1a1d082e3bb7fdc04aca0745fc7a559dd80abda Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Wed, 29 Nov 2023 22:51:14 +0100
Subject: [PATCH 0137/1254] fix after review

---
 contracts/examples/multisig/src/multisig_perform.rs | 4 ++--
 framework/base/src/types/flags/code_metadata.rs     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/contracts/examples/multisig/src/multisig_perform.rs b/contracts/examples/multisig/src/multisig_perform.rs
index 94bcd41d26..4769923423 100644
--- a/contracts/examples/multisig/src/multisig_perform.rs
+++ b/contracts/examples/multisig/src/multisig_perform.rs
@@ -208,7 +208,7 @@ pub trait MultisigPerformModule:
                     action_id,
                     &amount,
                     &source,
-                    code_metadata.clone(),
+                    code_metadata,
                     gas_left,
                     arguments.as_multi(),
                 );
@@ -234,7 +234,7 @@ pub trait MultisigPerformModule:
                     &sc_address,
                     &amount,
                     &source,
-                    code_metadata.clone(),
+                    code_metadata,
                     gas_left,
                     arguments.as_multi(),
                 );
diff --git a/framework/base/src/types/flags/code_metadata.rs b/framework/base/src/types/flags/code_metadata.rs
index fcee264ab2..23bf0d84fa 100644
--- a/framework/base/src/types/flags/code_metadata.rs
+++ b/framework/base/src/types/flags/code_metadata.rs
@@ -14,7 +14,7 @@ const PAYABLE_BY_SC_STRING: &[u8] = b"PayableBySC";
 const DEFAULT_STRING: &[u8] = b"Default";
 
 bitflags! {
-    #[derive(Default, PartialEq, Debug, Clone)]
+    #[derive(Default, PartialEq, Debug, Clone, Copy)]
     pub struct CodeMetadata: u16 {
         const DEFAULT = 0;
         const UPGRADEABLE = 0b0000_0001_0000_0000; // LSB of first byte

From 306d0f88557a5bbde8531f6dc0bc8df43a05b7a9 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Wed, 29 Nov 2023 23:30:46 +0100
Subject: [PATCH 0138/1254] fix after review

---
 .../scenario/model/transaction/tx_response.rs    | 14 +++++---------
 framework/snippets/src/interactor_sc_deploy.rs   |  8 +++++---
 sdk/core/examples/tx_cost.rs                     |  3 ++-
 sdk/core/src/lib.rs                              |  1 +
 sdk/core/src/utils.rs                            | 16 ++++++++++++++++
 5 files changed, 29 insertions(+), 13 deletions(-)
 create mode 100644 sdk/core/src/utils.rs

diff --git a/framework/scenario/src/scenario/model/transaction/tx_response.rs b/framework/scenario/src/scenario/model/transaction/tx_response.rs
index db5f880c02..f8e98a50c3 100644
--- a/framework/scenario/src/scenario/model/transaction/tx_response.rs
+++ b/framework/scenario/src/scenario/model/transaction/tx_response.rs
@@ -1,7 +1,8 @@
 use crate::multiversx_sc::types::Address;
 use multiversx_chain_vm::tx_mock::TxResult;
-use multiversx_sdk::data::transaction::{
-    ApiLogs, ApiSmartContractResult, Events, TransactionOnNetwork,
+use multiversx_sdk::{
+    data::transaction::{ApiLogs, ApiSmartContractResult, Events, TransactionOnNetwork},
+    utils::base64_decode,
 };
 
 use base64::{engine::general_purpose, Engine as _};
@@ -110,10 +111,7 @@ impl TxResponse {
                 return TxResponseStatus::signal_error(&error);
             }
 
-            let error_raw = general_purpose::STANDARD
-                .decode(topics.unwrap().get(1).unwrap())
-                .unwrap();
-
+            let error_raw = base64_decode(topics.unwrap().get(1).unwrap());
             let error = String::from_utf8(error_raw).unwrap();
             return TxResponseStatus::signal_error(&error);
         }
@@ -144,9 +142,7 @@ impl TxResponse {
             logs.events.iter().rev().find_map(|event| {
                 if event.identifier == "writeLog" {
                     if let Some(data) = &event.data {
-                        let decoded_data =
-                            String::from_utf8(general_purpose::STANDARD.decode(data).unwrap())
-                                .unwrap();
+                        let decoded_data = String::from_utf8(base64_decode(data)).unwrap();
 
                         if decoded_data.starts_with('@') {
                             let out = decode_scr_data_or_panic(decoded_data.as_str());
diff --git a/framework/snippets/src/interactor_sc_deploy.rs b/framework/snippets/src/interactor_sc_deploy.rs
index e34f64ccca..63e8ae80db 100644
--- a/framework/snippets/src/interactor_sc_deploy.rs
+++ b/framework/snippets/src/interactor_sc_deploy.rs
@@ -1,12 +1,14 @@
 use crate::{mandos_to_erdrs_address, Interactor};
-use base64::{engine::general_purpose, Engine as _};
 use log::info;
 use multiversx_sc_scenario::{
     bech32,
     mandos_system::ScenarioRunner,
     scenario_model::{ScDeployStep, SetStateStep, TxResponse},
 };
-use multiversx_sdk::data::{address::Address as ErdrsAddress, transaction::Transaction};
+use multiversx_sdk::{
+    data::{address::Address as ErdrsAddress, transaction::Transaction},
+    utils::base64_encode,
+};
 
 const DEPLOY_RECEIVER: [u8; 32] = [0u8; 32];
 
@@ -19,7 +21,7 @@ impl Interactor {
             receiver: ErdrsAddress::from_bytes(DEPLOY_RECEIVER),
             gas_price: self.network_config.min_gas_price,
             gas_limit: sc_deploy_step.tx.gas_limit.value,
-            data: Some(general_purpose::STANDARD.encode(sc_deploy_step.tx.to_tx_data())),
+            data: Some(base64_encode(sc_deploy_step.tx.to_tx_data())),
             signature: None,
             chain_id: self.network_config.chain_id.clone(),
             version: self.network_config.min_transaction_version,
diff --git a/sdk/core/examples/tx_cost.rs b/sdk/core/examples/tx_cost.rs
index 88b5c01fd9..521ea51e50 100644
--- a/sdk/core/examples/tx_cost.rs
+++ b/sdk/core/examples/tx_cost.rs
@@ -1,6 +1,7 @@
 use multiversx_sdk::{
     blockchain::{CommunicationProxy, DEVNET_GATEWAY},
     data::{address::Address, transaction::Transaction},
+    utils::base64_encode
 };
 
 #[tokio::main]
@@ -16,7 +17,7 @@ async fn main() {
             "erd1rh5ws22jxm9pe7dtvhfy6j3uttuupkepferdwtmslms5fydtrh5sx3xr8r",
         )
         .unwrap(),
-        data: Some(base64::encode("hello")),
+        data: Some(base64_encode("hello")),
         chain_id: "1".to_string(),
         version: 1,
         options: 0,
diff --git a/sdk/core/src/lib.rs b/sdk/core/src/lib.rs
index 8a7b931a56..b59dbd4da6 100644
--- a/sdk/core/src/lib.rs
+++ b/sdk/core/src/lib.rs
@@ -2,3 +2,4 @@ pub mod blockchain;
 pub mod crypto;
 pub mod data;
 pub mod wallet;
+pub mod utils;
diff --git a/sdk/core/src/utils.rs b/sdk/core/src/utils.rs
new file mode 100644
index 0000000000..f76ee1db41
--- /dev/null
+++ b/sdk/core/src/utils.rs
@@ -0,0 +1,16 @@
+
+use base64::{engine::general_purpose, Engine as _};
+
+pub fn base64_decode<T>(to_decode: T) -> Vec<u8>
+where
+    T: AsRef<[u8]>,
+{
+    general_purpose::STANDARD.decode(to_decode).unwrap()
+}
+
+pub fn base64_encode<T>(to_encode: T) -> String
+where
+    T: AsRef<[u8]>,
+{
+    general_purpose::STANDARD.encode(to_encode)
+}
\ No newline at end of file

From 7ea12beedc56d504029aa2dbc091cc0bee353883 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Tue, 5 Dec 2023 09:48:41 +0100
Subject: [PATCH 0139/1254] fix after review more cleanup

---
 .../src/scenario/model/transaction/tx_response.rs  |  6 +-----
 framework/snippets/src/interactor_sc_call.rs       | 12 ++----------
 framework/snippets/src/interactor_vm_query.rs      | 14 ++------------
 sdk/core/examples/tx_cost.rs                       |  2 +-
 sdk/core/src/lib.rs                                |  2 +-
 sdk/core/src/utils.rs                              |  3 +--
 6 files changed, 8 insertions(+), 31 deletions(-)

diff --git a/framework/scenario/src/scenario/model/transaction/tx_response.rs b/framework/scenario/src/scenario/model/transaction/tx_response.rs
index f8e98a50c3..065d51f9cc 100644
--- a/framework/scenario/src/scenario/model/transaction/tx_response.rs
+++ b/framework/scenario/src/scenario/model/transaction/tx_response.rs
@@ -5,8 +5,6 @@ use multiversx_sdk::{
     utils::base64_decode,
 };
 
-use base64::{engine::general_purpose, Engine as _};
-
 use super::{
     decode_scr_data_or_panic, is_out_scr, process_topics_error, Log, TxExpect, TxResponseStatus,
 };
@@ -165,9 +163,7 @@ impl TxResponse {
                 return self;
             }
 
-            let address_raw = general_purpose::STANDARD
-                .decode(topics.unwrap().get(0).unwrap())
-                .unwrap();
+            let address_raw = base64_decode(topics.unwrap().get(0).unwrap());
 
             let address: Address = Address::from_slice(address_raw.as_slice());
             self.new_deployed_address = Some(address);
diff --git a/framework/snippets/src/interactor_sc_call.rs b/framework/snippets/src/interactor_sc_call.rs
index c042f57097..a0e0498ae9 100644
--- a/framework/snippets/src/interactor_sc_call.rs
+++ b/framework/snippets/src/interactor_sc_call.rs
@@ -1,5 +1,4 @@
 use crate::{address_h256_to_erdrs, mandos_to_erdrs_address, Interactor};
-use base64::{engine::general_purpose, Engine as _};
 use log::info;
 use multiversx_sc_scenario::{
     api::StaticApi,
@@ -7,7 +6,7 @@ use multiversx_sc_scenario::{
     scenario::ScenarioRunner,
     scenario_model::{ScCallStep, SetStateStep, TxCall, TxResponse},
 };
-use multiversx_sdk::data::transaction::Transaction;
+use multiversx_sdk::{data::transaction::Transaction, utils::base64_encode};
 
 impl Interactor {
     pub async fn sc_call<S>(&mut self, mut sc_call_step: S)
@@ -52,14 +51,7 @@ impl Interactor {
         let data = if contract_call_tx_data.is_empty() {
             None
         } else {
-            Some(
-                String::from_utf8(
-                    general_purpose::STANDARD
-                        .encode(contract_call_tx_data)
-                        .into(),
-                )
-                .unwrap(),
-            )
+            Some(String::from_utf8(base64_encode(contract_call_tx_data).into()).unwrap())
         };
 
         Transaction {
diff --git a/framework/snippets/src/interactor_vm_query.rs b/framework/snippets/src/interactor_vm_query.rs
index cf03a12b99..56a54961d2 100644
--- a/framework/snippets/src/interactor_vm_query.rs
+++ b/framework/snippets/src/interactor_vm_query.rs
@@ -1,5 +1,4 @@
 use crate::{address_h256_to_erdrs, Interactor};
-use base64::{engine::general_purpose, Engine as _};
 use log::info;
 use multiversx_sc_scenario::{
     api::StaticApi,
@@ -7,7 +6,7 @@ use multiversx_sc_scenario::{
     multiversx_sc::{codec::CodecFrom, types::ContractCall},
     scenario_model::{ScQueryStep, TxResponse},
 };
-use multiversx_sdk::data::vm::VmValueRequest;
+use multiversx_sdk::{data::vm::VmValueRequest, utils::base64_decode};
 
 impl Interactor {
     pub async fn sc_query<S>(&mut self, mut step: S) -> &mut Self
@@ -40,16 +39,7 @@ impl Interactor {
 
         info!("{:#?}", result);
 
-        let raw_results: Vec<Vec<u8>> = result
-            .data
-            .return_data
-            .iter()
-            .map(|result| {
-                general_purpose::STANDARD
-                    .decode(result)
-                    .expect("query result base64 decode error")
-            })
-            .collect();
+        let raw_results: Vec<Vec<u8>> = result.data.return_data.iter().map(base64_decode).collect();
         step.save_response(TxResponse::from_raw_results(raw_results));
 
         self.pre_runners.run_sc_query_step(step);
diff --git a/sdk/core/examples/tx_cost.rs b/sdk/core/examples/tx_cost.rs
index 521ea51e50..b98cbd2e4b 100644
--- a/sdk/core/examples/tx_cost.rs
+++ b/sdk/core/examples/tx_cost.rs
@@ -1,7 +1,7 @@
 use multiversx_sdk::{
     blockchain::{CommunicationProxy, DEVNET_GATEWAY},
     data::{address::Address, transaction::Transaction},
-    utils::base64_encode
+    utils::base64_encode,
 };
 
 #[tokio::main]
diff --git a/sdk/core/src/lib.rs b/sdk/core/src/lib.rs
index b59dbd4da6..f37f2197e5 100644
--- a/sdk/core/src/lib.rs
+++ b/sdk/core/src/lib.rs
@@ -1,5 +1,5 @@
 pub mod blockchain;
 pub mod crypto;
 pub mod data;
-pub mod wallet;
 pub mod utils;
+pub mod wallet;
diff --git a/sdk/core/src/utils.rs b/sdk/core/src/utils.rs
index f76ee1db41..faada02b4f 100644
--- a/sdk/core/src/utils.rs
+++ b/sdk/core/src/utils.rs
@@ -1,4 +1,3 @@
-
 use base64::{engine::general_purpose, Engine as _};
 
 pub fn base64_decode<T>(to_decode: T) -> Vec<u8>
@@ -13,4 +12,4 @@ where
     T: AsRef<[u8]>,
 {
     general_purpose::STANDARD.encode(to_encode)
-}
\ No newline at end of file
+}

From 62cb68f29931b3a54a96f1d5c4cf1d568312bbcd Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 5 Dec 2023 15:06:45 +0200
Subject: [PATCH 0140/1254] sc-config - overflow-checks flag

---
 framework/meta/src/cargo_toml_contents.rs                       | 1 +
 framework/meta/src/cmd/contract/meta_config.rs                  | 1 +
 .../meta/src/cmd/contract/sc_config/multi_contract_serde.rs     | 2 ++
 3 files changed, 4 insertions(+)

diff --git a/framework/meta/src/cargo_toml_contents.rs b/framework/meta/src/cargo_toml_contents.rs
index 0237621924..ea0697c2d2 100644
--- a/framework/meta/src/cargo_toml_contents.rs
+++ b/framework/meta/src/cargo_toml_contents.rs
@@ -213,6 +213,7 @@ impl CargoTomlContents {
             "panic".to_string(),
             Value::String(contract_profile.panic.to_owned()),
         );
+        profile_props.insert("overflow-checks".to_string(), Value::Boolean(contract_profile.overflow_checks));
 
         let mut toml_table = toml::map::Map::new();
         toml_table.insert("release".to_string(), toml::Value::Table(profile_props));
diff --git a/framework/meta/src/cmd/contract/meta_config.rs b/framework/meta/src/cmd/contract/meta_config.rs
index e5beeac415..36b963e1d6 100644
--- a/framework/meta/src/cmd/contract/meta_config.rs
+++ b/framework/meta/src/cmd/contract/meta_config.rs
@@ -199,6 +199,7 @@ opt-level = \"z\"
 lto = true
 debug = false
 panic = \"abort\"
+overflow-checks = true
 
 [dependencies.test-crate-name]
 path = \"..\"
diff --git a/framework/meta/src/cmd/contract/sc_config/multi_contract_serde.rs b/framework/meta/src/cmd/contract/sc_config/multi_contract_serde.rs
index e671fb485a..fa733e6597 100644
--- a/framework/meta/src/cmd/contract/sc_config/multi_contract_serde.rs
+++ b/framework/meta/src/cmd/contract/sc_config/multi_contract_serde.rs
@@ -68,6 +68,7 @@ pub struct ContractVariantProfile {
     pub lto: bool,
     pub debug: bool,
     pub panic: String,
+    pub overflow_checks: bool,
 }
 
 impl Default for ContractVariantProfile {
@@ -78,6 +79,7 @@ impl Default for ContractVariantProfile {
             lto: true,
             debug: false,
             panic: "abort".to_owned(),
+            overflow_checks: true,
         }
     }
 }

From a54512097b0b1eadae5af767943439403a7c2250 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 5 Dec 2023 16:25:38 +0200
Subject: [PATCH 0141/1254] sc-config - profile refactor

---
 .../basic-features/sc-config.toml             |  3 +-
 .../Cargo.toml                                |  1 +
 .../basic-features/wasm/Cargo.toml            |  1 +
 .../multicontract.toml                        |  9 +++
 .../wasm-multi-contract-alt-impl/Cargo.toml   |  1 +
 .../Cargo.toml                                |  1 +
 .../Cargo.toml                                |  1 +
 .../multi-contract-features/wasm/Cargo.toml   |  1 +
 framework/meta/src/cargo_toml_contents.rs     |  5 +-
 .../meta/src/cmd/contract/meta_config.rs      |  4 +-
 framework/meta/src/cmd/contract/sc_config.rs  |  9 +--
 .../sc_config/multi_contract_serde.rs         | 43 +++++++-------
 .../src/cmd/contract/sc_config/oc_builder.rs  |  9 +--
 .../src/cmd/contract/sc_config/oc_settings.rs | 56 ++++++++++++++++++-
 14 files changed, 106 insertions(+), 38 deletions(-)

diff --git a/contracts/feature-tests/basic-features/sc-config.toml b/contracts/feature-tests/basic-features/sc-config.toml
index c4bbf5062d..c870fda7cb 100644
--- a/contracts/feature-tests/basic-features/sc-config.toml
+++ b/contracts/feature-tests/basic-features/sc-config.toml
@@ -1,7 +1,8 @@
 [settings]
 main = "basic-features"
 
-[contracts.basic-features]
+[contracts.basic-features.profile]
+overflow-checks = true # needed for overflow tests
 
 [contracts.basic-features-storage-bytes]
 add-unlabelled = 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 6a7bc102f0..61086000d0 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
@@ -19,6 +19,7 @@ opt-level = "z"
 lto = true
 debug = false
 panic = "abort"
+overflow-checks = false
 
 [dependencies.basic-features]
 path = ".."
diff --git a/contracts/feature-tests/basic-features/wasm/Cargo.toml b/contracts/feature-tests/basic-features/wasm/Cargo.toml
index fb5035216a..56809696b4 100644
--- a/contracts/feature-tests/basic-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/basic-features/wasm/Cargo.toml
@@ -19,6 +19,7 @@ opt-level = "z"
 lto = true
 debug = false
 panic = "abort"
+overflow-checks = true
 
 [dependencies.basic-features]
 path = ".."
diff --git a/contracts/feature-tests/multi-contract-features/multicontract.toml b/contracts/feature-tests/multi-contract-features/multicontract.toml
index 912c030c26..879c8dfb42 100644
--- a/contracts/feature-tests/multi-contract-features/multicontract.toml
+++ b/contracts/feature-tests/multi-contract-features/multicontract.toml
@@ -7,6 +7,15 @@ main = "multi-contract-main"
 # main contract can have any id and any name
 name = "multi-contract-features"
 
+[contracts.multi-contract-main.profile]
+# these are just the defaults, checking that parsing works fine
+codegen-units = 1  
+opt-level = "z"
+lto = true
+debug = false
+panic = "abort"
+overflow-checks = false
+
 [contracts.multi-contract-features-view]
 # name is optional, if missing this ^^^ id will be used
 external-view = true
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 a98eb7e15a..3f0d6eab36 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
@@ -19,6 +19,7 @@ opt-level = "z"
 lto = true
 debug = false
 panic = "abort"
+overflow-checks = false
 
 [dependencies.multi-contract-features]
 path = ".."
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 1260271c36..cc08b85433 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
@@ -19,6 +19,7 @@ opt-level = "z"
 lto = true
 debug = false
 panic = "abort"
+overflow-checks = false
 
 [dependencies.multi-contract-features]
 path = ".."
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 2e0a978910..7132841cfa 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
@@ -19,6 +19,7 @@ opt-level = "z"
 lto = true
 debug = false
 panic = "abort"
+overflow-checks = false
 
 [dependencies.multi-contract-features]
 path = ".."
diff --git a/contracts/feature-tests/multi-contract-features/wasm/Cargo.toml b/contracts/feature-tests/multi-contract-features/wasm/Cargo.toml
index 08a6e6f793..ca65dc3a71 100644
--- a/contracts/feature-tests/multi-contract-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/multi-contract-features/wasm/Cargo.toml
@@ -19,6 +19,7 @@ opt-level = "z"
 lto = true
 debug = false
 panic = "abort"
+overflow-checks = false
 
 [dependencies.multi-contract-features]
 path = ".."
diff --git a/framework/meta/src/cargo_toml_contents.rs b/framework/meta/src/cargo_toml_contents.rs
index ea0697c2d2..1a6596a68d 100644
--- a/framework/meta/src/cargo_toml_contents.rs
+++ b/framework/meta/src/cargo_toml_contents.rs
@@ -213,7 +213,10 @@ impl CargoTomlContents {
             "panic".to_string(),
             Value::String(contract_profile.panic.to_owned()),
         );
-        profile_props.insert("overflow-checks".to_string(), Value::Boolean(contract_profile.overflow_checks));
+        profile_props.insert(
+            "overflow-checks".to_string(),
+            Value::Boolean(contract_profile.overflow_checks),
+        );
 
         let mut toml_table = toml::map::Map::new();
         toml_table.insert("release".to_string(), toml::Value::Table(profile_props));
diff --git a/framework/meta/src/cmd/contract/meta_config.rs b/framework/meta/src/cmd/contract/meta_config.rs
index 36b963e1d6..808411eaff 100644
--- a/framework/meta/src/cmd/contract/meta_config.rs
+++ b/framework/meta/src/cmd/contract/meta_config.rs
@@ -65,7 +65,7 @@ impl MetaConfig {
             let cargo_toml_data = WasmCargoTomlData {
                 name: contract.wasm_crate_name.clone(),
                 edition: main_cargo_toml_contents.package_edition(),
-                profile: contract.settings.contract_variant_profile.clone(),
+                profile: contract.settings.profile.clone(),
                 framework_version: main_cargo_toml_contents.dependency_version(FRAMEWORK_NAME_BASE),
                 framework_path: main_cargo_toml_contents.dependency_path(FRAMEWORK_NAME_BASE),
                 contract_features: contract.settings.features.clone(),
@@ -199,7 +199,7 @@ opt-level = \"z\"
 lto = true
 debug = false
 panic = \"abort\"
-overflow-checks = true
+overflow-checks = false
 
 [dependencies.test-crate-name]
 path = \"..\"
diff --git a/framework/meta/src/cmd/contract/sc_config.rs b/framework/meta/src/cmd/contract/sc_config.rs
index e28adf5d01..3aaabba27d 100644
--- a/framework/meta/src/cmd/contract/sc_config.rs
+++ b/framework/meta/src/cmd/contract/sc_config.rs
@@ -9,9 +9,10 @@ mod wasm_clean;
 mod wasm_crate_gen;
 mod wasm_update;
 
-pub use multi_contract_serde::*;
-pub use oc_builder::*;
+pub use multi_contract_serde::{
+    ContractVariantProfileSerde, ContractVariantSerde, MultiContractConfigSerde,
+    MultiContractGeneralSettingsSerde,
+};
 pub use oc_config::ContractVariant;
 pub use oc_global_config::ScConfig;
-pub use oc_settings::ContractVariantSettings;
-pub use wasm_build::*;
+pub use oc_settings::{ContractVariantProfile, ContractVariantSettings};
diff --git a/framework/meta/src/cmd/contract/sc_config/multi_contract_serde.rs b/framework/meta/src/cmd/contract/sc_config/multi_contract_serde.rs
index fa733e6597..04fd5e14d4 100644
--- a/framework/meta/src/cmd/contract/sc_config/multi_contract_serde.rs
+++ b/framework/meta/src/cmd/contract/sc_config/multi_contract_serde.rs
@@ -53,7 +53,7 @@ pub struct ContractVariantSerde {
     pub kill_legacy_callback: bool,
 
     #[serde(default)]
-    pub contract_variant_profile: Option<ContractVariantProfile>,
+    pub profile: Option<ContractVariantProfileSerde>,
 }
 
 #[derive(Deserialize, Default, Debug)]
@@ -61,25 +61,26 @@ pub struct MultiContractGeneralSettingsSerde {
     pub main: Option<String>,
 }
 
-#[derive(Deserialize, Debug, Clone, PartialEq, Eq)]
-pub struct ContractVariantProfile {
-    pub codegen_units: u8,
-    pub opt_level: String,
-    pub lto: bool,
-    pub debug: bool,
-    pub panic: String,
-    pub overflow_checks: bool,
-}
+#[derive(Deserialize, Default, Debug, Clone, PartialEq, Eq)]
+pub struct ContractVariantProfileSerde {
+    #[serde(default)]
+    #[serde(rename = "codegen-units")]
+    pub codegen_units: Option<u8>,
+
+    #[serde(default)]
+    #[serde(rename = "opt-level")]
+    pub opt_level: Option<String>,
+
+    #[serde(default)]
+    pub lto: Option<bool>,
 
-impl Default for ContractVariantProfile {
-    fn default() -> ContractVariantProfile {
-        ContractVariantProfile {
-            codegen_units: 1u8,
-            opt_level: "z".to_owned(),
-            lto: true,
-            debug: false,
-            panic: "abort".to_owned(),
-            overflow_checks: true,
-        }
-    }
+    #[serde(default)]
+    pub debug: Option<bool>,
+
+    #[serde(default)]
+    pub panic: Option<String>,
+
+    #[serde(default)]
+    #[serde(rename = "overflow-checks")]
+    pub overflow_checks: Option<bool>,
 }
diff --git a/framework/meta/src/cmd/contract/sc_config/oc_builder.rs b/framework/meta/src/cmd/contract/sc_config/oc_builder.rs
index 882039f469..30ada842d1 100644
--- a/framework/meta/src/cmd/contract/sc_config/oc_builder.rs
+++ b/framework/meta/src/cmd/contract/sc_config/oc_builder.rs
@@ -8,8 +8,8 @@ use std::{
 use super::{
     oc_global_config::SC_CONFIG_FILE_NAMES,
     oc_settings::{parse_allocator, parse_check_ei, parse_stack_size},
-    ContractVariant, ContractVariantSerde, ContractVariantSettings, MultiContractConfigSerde,
-    ScConfig,
+    ContractVariant, ContractVariantProfile, ContractVariantSerde, ContractVariantSettings,
+    MultiContractConfigSerde, ScConfig,
 };
 
 /// Temporary structure, to help create instances of `ContractVariant`. Not publicly exposed.
@@ -75,10 +75,7 @@ impl ContractVariantBuilder {
                     stack_size: parse_stack_size(&cms.stack_size),
                     features: cms.features.clone(),
                     kill_legacy_callback: cms.kill_legacy_callback,
-                    contract_variant_profile: cms
-                        .contract_variant_profile
-                        .clone()
-                        .unwrap_or(default.settings.contract_variant_profile),
+                    profile: ContractVariantProfile::from_serde(&cms.profile),
                 },
                 ..default
             },
diff --git a/framework/meta/src/cmd/contract/sc_config/oc_settings.rs b/framework/meta/src/cmd/contract/sc_config/oc_settings.rs
index 91e8782154..48aee04399 100644
--- a/framework/meta/src/cmd/contract/sc_config/oc_settings.rs
+++ b/framework/meta/src/cmd/contract/sc_config/oc_settings.rs
@@ -8,7 +8,7 @@ pub use oc_parse_stack_size::*;
 
 use crate::ei::EIVersion;
 
-use super::ContractVariantProfile;
+use super::ContractVariantProfileSerde;
 
 /// Collection of flags, specified in the multicontract config.
 #[derive(Clone, PartialEq, Eq, Debug)]
@@ -34,7 +34,7 @@ pub struct ContractVariantSettings {
     /// Forcibly remove the original contrct legacy callback.
     pub kill_legacy_callback: bool,
 
-    pub contract_variant_profile: ContractVariantProfile,
+    pub profile: ContractVariantProfile,
 }
 
 impl Default for ContractVariantSettings {
@@ -47,7 +47,57 @@ impl Default for ContractVariantSettings {
             stack_size: DEFAULT_STACK_SIZE,
             features: Default::default(),
             kill_legacy_callback: false,
-            contract_variant_profile: Default::default(),
+            profile: Default::default(),
         }
     }
 }
+
+#[derive(Clone, PartialEq, Eq, Debug)]
+pub struct ContractVariantProfile {
+    pub codegen_units: u8,
+    pub opt_level: String,
+    pub lto: bool,
+    pub debug: bool,
+    pub panic: String,
+    pub overflow_checks: bool,
+}
+
+impl Default for ContractVariantProfile {
+    fn default() -> ContractVariantProfile {
+        ContractVariantProfile {
+            codegen_units: 1u8,
+            opt_level: "z".to_owned(),
+            lto: true,
+            debug: false,
+            panic: "abort".to_owned(),
+            overflow_checks: false,
+        }
+    }
+}
+
+impl ContractVariantProfile {
+    pub fn from_serde(opt_serde_profile: &Option<ContractVariantProfileSerde>) -> Self {
+        let mut result = Self::default();
+        if let Some(serde_profile) = opt_serde_profile {
+            if let Some(codegen_units) = serde_profile.codegen_units {
+                result.codegen_units = codegen_units;
+            }
+            if let Some(opt_level) = &serde_profile.opt_level {
+                result.opt_level = opt_level.clone();
+            }
+            if let Some(lto) = serde_profile.lto {
+                result.lto = lto;
+            }
+            if let Some(debug) = serde_profile.debug {
+                result.debug = debug;
+            }
+            if let Some(panic) = &serde_profile.panic {
+                result.panic = panic.clone();
+            }
+            if let Some(overflow_checks) = serde_profile.overflow_checks {
+                result.overflow_checks = overflow_checks;
+            }
+        }
+        result
+    }
+}

From ec58e8865ea666ccfdfd97dec6557e67f08184ef Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 5 Dec 2023 16:25:52 +0200
Subject: [PATCH 0142/1254] basic-features test cleanup

---
 .../tests/basic_features_scenario_go_test.rs  | 23 +++++++++------
 .../tests/basic_features_scenario_rs_test.rs  | 28 +++++++++----------
 2 files changed, 28 insertions(+), 23 deletions(-)

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 0e64374c03..ab96b331d6 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
@@ -30,13 +30,13 @@ fn big_uint_from_u_64_go() {
 }
 
 #[test]
-fn big_uint_sqrt_go() {
-    world().run("scenarios/big_uint_sqrt.scen.json");
+fn big_uint_pow_go() {
+    world().run("scenarios/big_uint_pow.scen.json");
 }
 
 #[test]
-fn big_uint_pow_go() {
-    world().run("scenarios/big_uint_pow.scen.json");
+fn big_uint_sqrt_go() {
+    world().run("scenarios/big_uint_sqrt.scen.json");
 }
 
 #[test]
@@ -285,6 +285,11 @@ fn sc_properties_go() {
     world().run("scenarios/sc_properties.scen.json");
 }
 
+#[test]
+fn small_num_overflow_go() {
+    world().run("scenarios/small_num_overflow.scen.json");
+}
+
 #[test]
 fn storage_big_int_go() {
     world().run("scenarios/storage_big_int.scen.json");
@@ -341,14 +346,14 @@ fn storage_map_3_go() {
 }
 
 #[test]
-#[ignore = "currently not supported. TODO: investigate"]
-fn storage_mapper_fungible_token_go() {
-    world().run("scenarios/storage_mapper_fungible_token.scen.json");
+fn storage_mapper_address_to_id_go() {
+    world().run("scenarios/storage_mapper_address_to_id.scen.json");
 }
 
 #[test]
-fn storage_mapper_address_to_id_go() {
-    world().run("scenarios/storage_mapper_address_to_id.scen.json");
+#[ignore = "currently not supported. TODO: investigate"]
+fn storage_mapper_fungible_token_go() {
+    world().run("scenarios/storage_mapper_fungible_token.scen.json");
 }
 
 #[test]
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 3479b19680..1762570d20 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
@@ -36,24 +36,19 @@ fn big_uint_eq_u_64_rs() {
     world().run("scenarios/big_uint_eq_u64.scen.json");
 }
 
-#[test]
-fn small_num_overflow_rs() {
-    world().run("scenarios/small_num_overflow.scen.json");
-}
-
 #[test]
 fn big_uint_from_u_64_rs() {
     world().run("scenarios/big_uint_from_u64.scen.json");
 }
 
 #[test]
-fn big_uint_sqrt_rs() {
-    world().run("scenarios/big_uint_sqrt.scen.json");
+fn big_uint_pow_rs() {
+    world().run("scenarios/big_uint_pow.scen.json");
 }
 
 #[test]
-fn big_uint_pow_rs() {
-    world().run("scenarios/big_uint_pow.scen.json");
+fn big_uint_sqrt_rs() {
+    world().run("scenarios/big_uint_sqrt.scen.json");
 }
 
 #[test]
@@ -308,6 +303,11 @@ fn sc_properties_rs() {
     world().run("scenarios/sc_properties.scen.json");
 }
 
+#[test]
+fn small_num_overflow_rs() {
+    world().run("scenarios/small_num_overflow.scen.json");
+}
+
 #[test]
 fn storage_big_int_rs() {
     world().run("scenarios/storage_big_int.scen.json");
@@ -364,14 +364,14 @@ fn storage_map_3_rs() {
 }
 
 #[test]
-#[ignore]
-fn storage_mapper_fungible_token_rs() {
-    world().run("scenarios/storage_mapper_fungible_token.scen.json");
+fn storage_mapper_address_to_id_rs() {
+    world().run("scenarios/storage_mapper_address_to_id.scen.json");
 }
 
 #[test]
-fn storage_mapper_address_to_id_rs() {
-    world().run("scenarios/storage_mapper_address_to_id.scen.json");
+#[ignore]
+fn storage_mapper_fungible_token_rs() {
+    world().run("scenarios/storage_mapper_fungible_token.scen.json");
 }
 
 #[test]

From 8a1ab52891b12f1dbb047e5059059fbca79b5e08 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 5 Dec 2023 16:30:55 +0200
Subject: [PATCH 0143/1254] vm-test-build-copy.sh

---
 vm-test-build-copy.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/vm-test-build-copy.sh b/vm-test-build-copy.sh
index dd7aa7c83f..87507942e5 100755
--- a/vm-test-build-copy.sh
+++ b/vm-test-build-copy.sh
@@ -75,5 +75,3 @@ build_and_copy ./contracts/feature-tests/composability/vault             $VM_REP
 rm -f $VM_REPO_PATH/test/features/composability/scenarios/*
 cp -R contracts/feature-tests/composability/scenarios \
    $VM_REPO_PATH/test/features/composability
-cp -R contracts/feature-tests/composability/scenarios-promises \
-   $VM_REPO_PATH/test/features/composability

From 34b4a6f32cf6a0be2ef88217095e602f6f848e3b Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 5 Dec 2023 16:45:46 +0200
Subject: [PATCH 0144/1254] re-generated wasm Cargo.toml

---
 contracts/benchmarks/large-storage/wasm/Cargo.toml               | 1 +
 contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.toml  | 1 +
 contracts/benchmarks/mappers/map-repeat/wasm/Cargo.toml          | 1 +
 contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.toml        | 1 +
 contracts/benchmarks/mappers/set-repeat/wasm/Cargo.toml          | 1 +
 contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.toml | 1 +
 contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.toml          | 1 +
 contracts/benchmarks/send-tx-repeat/wasm/Cargo.toml              | 1 +
 contracts/benchmarks/str-repeat/wasm/Cargo.toml                  | 1 +
 contracts/core/price-aggregator/wasm/Cargo.toml                  | 1 +
 contracts/core/wegld-swap/wasm/Cargo.toml                        | 1 +
 contracts/examples/adder/wasm/Cargo.toml                         | 1 +
 contracts/examples/bonding-curve-contract/wasm/Cargo.toml        | 1 +
 contracts/examples/check-pause/wasm/Cargo.toml                   | 1 +
 contracts/examples/crowdfunding-esdt/wasm/Cargo.toml             | 1 +
 contracts/examples/crypto-bubbles/wasm/Cargo.toml                | 1 +
 contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.toml  | 1 +
 .../examples/crypto-kitties/kitty-genetic-alg/wasm/Cargo.toml    | 1 +
 .../examples/crypto-kitties/kitty-ownership/wasm/Cargo.toml      | 1 +
 contracts/examples/crypto-zombies/wasm/Cargo.toml                | 1 +
 contracts/examples/digital-cash/wasm/Cargo.toml                  | 1 +
 contracts/examples/empty/wasm/Cargo.toml                         | 1 +
 contracts/examples/esdt-transfer-with-fee/wasm/Cargo.toml        | 1 +
 contracts/examples/factorial/wasm/Cargo.toml                     | 1 +
 contracts/examples/fractional-nfts/wasm/Cargo.toml               | 1 +
 contracts/examples/lottery-esdt/wasm/Cargo.toml                  | 1 +
 contracts/examples/multisig/wasm-multisig-full/Cargo.toml        | 1 +
 contracts/examples/multisig/wasm-multisig-view/Cargo.toml        | 1 +
 contracts/examples/multisig/wasm/Cargo.toml                      | 1 +
 contracts/examples/nft-minter/wasm/Cargo.toml                    | 1 +
 contracts/examples/nft-storage-prepay/wasm/Cargo.toml            | 1 +
 contracts/examples/nft-subscription/wasm/Cargo.toml              | 1 +
 contracts/examples/order-book/factory/wasm/Cargo.toml            | 1 +
 contracts/examples/order-book/pair/wasm/Cargo.toml               | 1 +
 contracts/examples/ping-pong-egld/wasm/Cargo.toml                | 1 +
 contracts/examples/proxy-pause/wasm/Cargo.toml                   | 1 +
 contracts/examples/rewards-distribution/wasm/Cargo.toml          | 1 +
 contracts/examples/seed-nft-minter/wasm/Cargo.toml               | 1 +
 contracts/examples/token-release/wasm/Cargo.toml                 | 1 +
 contracts/feature-tests/abi-tester/wasm-abi-tester-ev/Cargo.toml | 1 +
 contracts/feature-tests/abi-tester/wasm/Cargo.toml               | 1 +
 contracts/feature-tests/alloc-features/wasm/Cargo.toml           | 1 +
 contracts/feature-tests/big-float-features/wasm/Cargo.toml       | 1 +
 .../composability/builtin-func-features/wasm/Cargo.toml          | 1 +
 .../esdt-contract-pair/first-contract/wasm/Cargo.toml            | 1 +
 .../esdt-contract-pair/second-contract/wasm/Cargo.toml           | 1 +
 .../execute-on-dest-esdt-issue-callback/child/wasm/Cargo.toml    | 1 +
 .../execute-on-dest-esdt-issue-callback/parent/wasm/Cargo.toml   | 1 +
 .../forwarder-queue/wasm-forwarder-queue-promises/Cargo.toml     | 1 +
 .../feature-tests/composability/forwarder-queue/wasm/Cargo.toml  | 1 +
 .../forwarder-raw/wasm-forwarder-raw-init-async-call/Cargo.toml  | 1 +
 .../forwarder-raw/wasm-forwarder-raw-init-sync-call/Cargo.toml   | 1 +
 .../feature-tests/composability/forwarder-raw/wasm/Cargo.toml    | 1 +
 contracts/feature-tests/composability/forwarder/wasm/Cargo.toml  | 1 +
 .../composability/local-esdt-and-nft/wasm/Cargo.toml             | 1 +
 .../composability/promises-features/wasm/Cargo.toml              | 1 +
 .../feature-tests/composability/proxy-test-first/wasm/Cargo.toml | 1 +
 .../composability/proxy-test-second/wasm/Cargo.toml              | 1 +
 .../feature-tests/composability/recursive-caller/wasm/Cargo.toml | 1 +
 .../composability/transfer-role-features/wasm/Cargo.toml         | 1 +
 .../composability/vault/wasm-vault-promises/Cargo.toml           | 1 +
 .../composability/vault/wasm-vault-upgrade/Cargo.toml            | 1 +
 contracts/feature-tests/composability/vault/wasm/Cargo.toml      | 1 +
 .../erc-style-contracts/crowdfunding-erc20/wasm/Cargo.toml       | 1 +
 .../erc-style-contracts/erc1155-marketplace/wasm/Cargo.toml      | 1 +
 .../erc-style-contracts/erc1155-user-mock/wasm/Cargo.toml        | 1 +
 .../feature-tests/erc-style-contracts/erc1155/wasm/Cargo.toml    | 1 +
 .../feature-tests/erc-style-contracts/erc20/wasm/Cargo.toml      | 1 +
 .../feature-tests/erc-style-contracts/erc721/wasm/Cargo.toml     | 1 +
 .../erc-style-contracts/lottery-erc20/wasm/Cargo.toml            | 1 +
 contracts/feature-tests/esdt-system-sc-mock/wasm/Cargo.toml      | 1 +
 .../feature-tests/formatted-message-features/wasm/Cargo.toml     | 1 +
 contracts/feature-tests/managed-map-features/wasm/Cargo.toml     | 1 +
 contracts/feature-tests/panic-message-features/wasm/Cargo.toml   | 1 +
 contracts/feature-tests/payable-features/wasm/Cargo.toml         | 1 +
 .../feature-tests/rust-snippets-generator-test/wasm/Cargo.toml   | 1 +
 .../feature-tests/rust-testing-framework-tester/wasm/Cargo.toml  | 1 +
 .../feature-tests/use-module/wasm-use-module-view/Cargo.toml     | 1 +
 contracts/feature-tests/use-module/wasm/Cargo.toml               | 1 +
 79 files changed, 79 insertions(+)

diff --git a/contracts/benchmarks/large-storage/wasm/Cargo.toml b/contracts/benchmarks/large-storage/wasm/Cargo.toml
index 9646a43cc5..4eeba6519c 100644
--- a/contracts/benchmarks/large-storage/wasm/Cargo.toml
+++ b/contracts/benchmarks/large-storage/wasm/Cargo.toml
@@ -19,6 +19,7 @@ opt-level = "z"
 lto = true
 debug = false
 panic = "abort"
+overflow-checks = false
 
 [dependencies.large-storage]
 path = ".."
diff --git a/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.toml b/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.toml
index b9717c7416..f4cf1b1baf 100644
--- a/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.toml
@@ -19,6 +19,7 @@ opt-level = "z"
 lto = true
 debug = false
 panic = "abort"
+overflow-checks = false
 
 [dependencies.linked-list-repeat]
 path = ".."
diff --git a/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.toml b/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.toml
index 962b7f6ca8..79cd9c7913 100644
--- a/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.toml
@@ -19,6 +19,7 @@ opt-level = "z"
 lto = true
 debug = false
 panic = "abort"
+overflow-checks = false
 
 [dependencies.map-repeat]
 path = ".."
diff --git a/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.toml b/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.toml
index 224cdad279..a89049710b 100644
--- a/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.toml
@@ -19,6 +19,7 @@ opt-level = "z"
 lto = true
 debug = false
 panic = "abort"
+overflow-checks = false
 
 [dependencies.queue-repeat]
 path = ".."
diff --git a/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.toml b/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.toml
index 238fe51254..09274940f6 100644
--- a/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.toml
@@ -19,6 +19,7 @@ opt-level = "z"
 lto = true
 debug = false
 panic = "abort"
+overflow-checks = false
 
 [dependencies.set-repeat]
 path = ".."
diff --git a/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.toml b/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.toml
index 746bb853ab..634984ab85 100644
--- a/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.toml
@@ -19,6 +19,7 @@ opt-level = "z"
 lto = true
 debug = false
 panic = "abort"
+overflow-checks = false
 
 [dependencies.single-value-repeat]
 path = ".."
diff --git a/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.toml b/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.toml
index 757a17cbab..04eb1f4d3d 100644
--- a/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.toml
@@ -19,6 +19,7 @@ opt-level = "z"
 lto = true
 debug = false
 panic = "abort"
+overflow-checks = false
 
 [dependencies.vec-repeat]
 path = ".."
diff --git a/contracts/benchmarks/send-tx-repeat/wasm/Cargo.toml b/contracts/benchmarks/send-tx-repeat/wasm/Cargo.toml
index e2cf6366fb..fd52858cfa 100644
--- a/contracts/benchmarks/send-tx-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/send-tx-repeat/wasm/Cargo.toml
@@ -19,6 +19,7 @@ opt-level = "z"
 lto = true
 debug = false
 panic = "abort"
+overflow-checks = false
 
 [dependencies.send-tx-repeat]
 path = ".."
diff --git a/contracts/benchmarks/str-repeat/wasm/Cargo.toml b/contracts/benchmarks/str-repeat/wasm/Cargo.toml
index 44607c30c2..95f1ea9125 100644
--- a/contracts/benchmarks/str-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/str-repeat/wasm/Cargo.toml
@@ -19,6 +19,7 @@ opt-level = "z"
 lto = true
 debug = false
 panic = "abort"
+overflow-checks = false
 
 [dependencies.str-repeat]
 path = ".."
diff --git a/contracts/core/price-aggregator/wasm/Cargo.toml b/contracts/core/price-aggregator/wasm/Cargo.toml
index 5df3869737..652cb2f09f 100644
--- a/contracts/core/price-aggregator/wasm/Cargo.toml
+++ b/contracts/core/price-aggregator/wasm/Cargo.toml
@@ -19,6 +19,7 @@ opt-level = "z"
 lto = true
 debug = false
 panic = "abort"
+overflow-checks = false
 
 [dependencies.multiversx-price-aggregator-sc]
 path = ".."
diff --git a/contracts/core/wegld-swap/wasm/Cargo.toml b/contracts/core/wegld-swap/wasm/Cargo.toml
index bbe7d11e8b..9219c23545 100644
--- a/contracts/core/wegld-swap/wasm/Cargo.toml
+++ b/contracts/core/wegld-swap/wasm/Cargo.toml
@@ -19,6 +19,7 @@ opt-level = "z"
 lto = true
 debug = false
 panic = "abort"
+overflow-checks = false
 
 [dependencies.multiversx-wegld-swap-sc]
 path = ".."
diff --git a/contracts/examples/adder/wasm/Cargo.toml b/contracts/examples/adder/wasm/Cargo.toml
index ef2669d399..3fb317c54e 100644
--- a/contracts/examples/adder/wasm/Cargo.toml
+++ b/contracts/examples/adder/wasm/Cargo.toml
@@ -19,6 +19,7 @@ opt-level = "z"
 lto = true
 debug = false
 panic = "abort"
+overflow-checks = false
 
 [dependencies.adder]
 path = ".."
diff --git a/contracts/examples/bonding-curve-contract/wasm/Cargo.toml b/contracts/examples/bonding-curve-contract/wasm/Cargo.toml
index b5d95b347d..52a63f3ec1 100644
--- a/contracts/examples/bonding-curve-contract/wasm/Cargo.toml
+++ b/contracts/examples/bonding-curve-contract/wasm/Cargo.toml
@@ -19,6 +19,7 @@ opt-level = "z"
 lto = true
 debug = false
 panic = "abort"
+overflow-checks = false
 
 [dependencies.bonding-curve-contract]
 path = ".."
diff --git a/contracts/examples/check-pause/wasm/Cargo.toml b/contracts/examples/check-pause/wasm/Cargo.toml
index 1d3bf8256f..e49eeb14c7 100644
--- a/contracts/examples/check-pause/wasm/Cargo.toml
+++ b/contracts/examples/check-pause/wasm/Cargo.toml
@@ -19,6 +19,7 @@ opt-level = "z"
 lto = true
 debug = false
 panic = "abort"
+overflow-checks = false
 
 [dependencies.check-pause]
 path = ".."
diff --git a/contracts/examples/crowdfunding-esdt/wasm/Cargo.toml b/contracts/examples/crowdfunding-esdt/wasm/Cargo.toml
index 8dac512528..b11fb67e7a 100644
--- a/contracts/examples/crowdfunding-esdt/wasm/Cargo.toml
+++ b/contracts/examples/crowdfunding-esdt/wasm/Cargo.toml
@@ -19,6 +19,7 @@ opt-level = "z"
 lto = true
 debug = false
 panic = "abort"
+overflow-checks = false
 
 [dependencies.crowdfunding-esdt]
 path = ".."
diff --git a/contracts/examples/crypto-bubbles/wasm/Cargo.toml b/contracts/examples/crypto-bubbles/wasm/Cargo.toml
index 876e1c6aa8..727fedd249 100644
--- a/contracts/examples/crypto-bubbles/wasm/Cargo.toml
+++ b/contracts/examples/crypto-bubbles/wasm/Cargo.toml
@@ -19,6 +19,7 @@ opt-level = "z"
 lto = true
 debug = false
 panic = "abort"
+overflow-checks = false
 
 [dependencies.crypto-bubbles]
 path = ".."
diff --git a/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.toml b/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.toml
index 79f1abb02e..41cec69b5d 100644
--- a/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.toml
+++ b/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.toml
@@ -19,6 +19,7 @@ opt-level = "z"
 lto = true
 debug = false
 panic = "abort"
+overflow-checks = false
 
 [dependencies.kitty-auction]
 path = ".."
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 825a01cc8b..6cd371e9fe 100644
--- a/contracts/examples/crypto-kitties/kitty-genetic-alg/wasm/Cargo.toml
+++ b/contracts/examples/crypto-kitties/kitty-genetic-alg/wasm/Cargo.toml
@@ -19,6 +19,7 @@ opt-level = "z"
 lto = true
 debug = false
 panic = "abort"
+overflow-checks = false
 
 [dependencies.kitty-genetic-alg]
 path = ".."
diff --git a/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.toml b/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.toml
index 17dddfecc1..af6c874a99 100644
--- a/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.toml
+++ b/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.toml
@@ -19,6 +19,7 @@ opt-level = "z"
 lto = true
 debug = false
 panic = "abort"
+overflow-checks = false
 
 [dependencies.kitty-ownership]
 path = ".."
diff --git a/contracts/examples/crypto-zombies/wasm/Cargo.toml b/contracts/examples/crypto-zombies/wasm/Cargo.toml
index 9f87ea2615..7ce067b89e 100644
--- a/contracts/examples/crypto-zombies/wasm/Cargo.toml
+++ b/contracts/examples/crypto-zombies/wasm/Cargo.toml
@@ -19,6 +19,7 @@ opt-level = "z"
 lto = true
 debug = false
 panic = "abort"
+overflow-checks = false
 
 [dependencies.crypto-zombies]
 path = ".."
diff --git a/contracts/examples/digital-cash/wasm/Cargo.toml b/contracts/examples/digital-cash/wasm/Cargo.toml
index 94030b2413..c09b152e3d 100644
--- a/contracts/examples/digital-cash/wasm/Cargo.toml
+++ b/contracts/examples/digital-cash/wasm/Cargo.toml
@@ -19,6 +19,7 @@ opt-level = "z"
 lto = true
 debug = false
 panic = "abort"
+overflow-checks = false
 
 [dependencies.digital-cash]
 path = ".."
diff --git a/contracts/examples/empty/wasm/Cargo.toml b/contracts/examples/empty/wasm/Cargo.toml
index 7e7e98b268..f32728c2d7 100644
--- a/contracts/examples/empty/wasm/Cargo.toml
+++ b/contracts/examples/empty/wasm/Cargo.toml
@@ -19,6 +19,7 @@ opt-level = "z"
 lto = true
 debug = false
 panic = "abort"
+overflow-checks = false
 
 [dependencies.empty]
 path = ".."
diff --git a/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.toml b/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.toml
index c4a21abb67..1b9cf33794 100644
--- a/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.toml
+++ b/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.toml
@@ -19,6 +19,7 @@ opt-level = "z"
 lto = true
 debug = false
 panic = "abort"
+overflow-checks = false
 
 [dependencies.esdt-transfer-with-fee]
 path = ".."
diff --git a/contracts/examples/factorial/wasm/Cargo.toml b/contracts/examples/factorial/wasm/Cargo.toml
index 1558fa5b4b..bb481ab787 100644
--- a/contracts/examples/factorial/wasm/Cargo.toml
+++ b/contracts/examples/factorial/wasm/Cargo.toml
@@ -19,6 +19,7 @@ opt-level = "z"
 lto = true
 debug = false
 panic = "abort"
+overflow-checks = false
 
 [dependencies.factorial]
 path = ".."
diff --git a/contracts/examples/fractional-nfts/wasm/Cargo.toml b/contracts/examples/fractional-nfts/wasm/Cargo.toml
index 546c47a103..8bdea1677d 100644
--- a/contracts/examples/fractional-nfts/wasm/Cargo.toml
+++ b/contracts/examples/fractional-nfts/wasm/Cargo.toml
@@ -19,6 +19,7 @@ opt-level = "z"
 lto = true
 debug = false
 panic = "abort"
+overflow-checks = false
 
 [dependencies.fractional-nfts]
 path = ".."
diff --git a/contracts/examples/lottery-esdt/wasm/Cargo.toml b/contracts/examples/lottery-esdt/wasm/Cargo.toml
index 9ae4de7870..c189e174a6 100644
--- a/contracts/examples/lottery-esdt/wasm/Cargo.toml
+++ b/contracts/examples/lottery-esdt/wasm/Cargo.toml
@@ -19,6 +19,7 @@ opt-level = "z"
 lto = true
 debug = false
 panic = "abort"
+overflow-checks = false
 
 [dependencies.lottery-esdt]
 path = ".."
diff --git a/contracts/examples/multisig/wasm-multisig-full/Cargo.toml b/contracts/examples/multisig/wasm-multisig-full/Cargo.toml
index c37ff0c068..55dec0eb2e 100644
--- a/contracts/examples/multisig/wasm-multisig-full/Cargo.toml
+++ b/contracts/examples/multisig/wasm-multisig-full/Cargo.toml
@@ -19,6 +19,7 @@ opt-level = "z"
 lto = true
 debug = false
 panic = "abort"
+overflow-checks = false
 
 [dependencies.multisig]
 path = ".."
diff --git a/contracts/examples/multisig/wasm-multisig-view/Cargo.toml b/contracts/examples/multisig/wasm-multisig-view/Cargo.toml
index 070480fcfb..8d41d2053e 100644
--- a/contracts/examples/multisig/wasm-multisig-view/Cargo.toml
+++ b/contracts/examples/multisig/wasm-multisig-view/Cargo.toml
@@ -19,6 +19,7 @@ opt-level = "z"
 lto = true
 debug = false
 panic = "abort"
+overflow-checks = false
 
 [dependencies.multisig]
 path = ".."
diff --git a/contracts/examples/multisig/wasm/Cargo.toml b/contracts/examples/multisig/wasm/Cargo.toml
index bc6e0ff71b..a5c70d2a49 100644
--- a/contracts/examples/multisig/wasm/Cargo.toml
+++ b/contracts/examples/multisig/wasm/Cargo.toml
@@ -19,6 +19,7 @@ opt-level = "z"
 lto = true
 debug = false
 panic = "abort"
+overflow-checks = false
 
 [dependencies.multisig]
 path = ".."
diff --git a/contracts/examples/nft-minter/wasm/Cargo.toml b/contracts/examples/nft-minter/wasm/Cargo.toml
index 5c2addf1cb..566c592ad6 100644
--- a/contracts/examples/nft-minter/wasm/Cargo.toml
+++ b/contracts/examples/nft-minter/wasm/Cargo.toml
@@ -19,6 +19,7 @@ opt-level = "z"
 lto = true
 debug = false
 panic = "abort"
+overflow-checks = false
 
 [dependencies.nft-minter]
 path = ".."
diff --git a/contracts/examples/nft-storage-prepay/wasm/Cargo.toml b/contracts/examples/nft-storage-prepay/wasm/Cargo.toml
index 60ff271f59..d44f39bba8 100644
--- a/contracts/examples/nft-storage-prepay/wasm/Cargo.toml
+++ b/contracts/examples/nft-storage-prepay/wasm/Cargo.toml
@@ -19,6 +19,7 @@ opt-level = "z"
 lto = true
 debug = false
 panic = "abort"
+overflow-checks = false
 
 [dependencies.nft-storage-prepay]
 path = ".."
diff --git a/contracts/examples/nft-subscription/wasm/Cargo.toml b/contracts/examples/nft-subscription/wasm/Cargo.toml
index b20f15dd14..3f67bde2f2 100644
--- a/contracts/examples/nft-subscription/wasm/Cargo.toml
+++ b/contracts/examples/nft-subscription/wasm/Cargo.toml
@@ -19,6 +19,7 @@ opt-level = "z"
 lto = true
 debug = false
 panic = "abort"
+overflow-checks = false
 
 [dependencies.nft-subscription]
 path = ".."
diff --git a/contracts/examples/order-book/factory/wasm/Cargo.toml b/contracts/examples/order-book/factory/wasm/Cargo.toml
index 8a1cee0396..0c9d3460d7 100644
--- a/contracts/examples/order-book/factory/wasm/Cargo.toml
+++ b/contracts/examples/order-book/factory/wasm/Cargo.toml
@@ -19,6 +19,7 @@ opt-level = "z"
 lto = true
 debug = false
 panic = "abort"
+overflow-checks = false
 
 [dependencies.order-book-factory]
 path = ".."
diff --git a/contracts/examples/order-book/pair/wasm/Cargo.toml b/contracts/examples/order-book/pair/wasm/Cargo.toml
index 02d6648340..9bf76142a6 100644
--- a/contracts/examples/order-book/pair/wasm/Cargo.toml
+++ b/contracts/examples/order-book/pair/wasm/Cargo.toml
@@ -19,6 +19,7 @@ opt-level = "z"
 lto = true
 debug = false
 panic = "abort"
+overflow-checks = false
 
 [dependencies.order-book-pair]
 path = ".."
diff --git a/contracts/examples/ping-pong-egld/wasm/Cargo.toml b/contracts/examples/ping-pong-egld/wasm/Cargo.toml
index a80cb8866d..49cd896f5c 100644
--- a/contracts/examples/ping-pong-egld/wasm/Cargo.toml
+++ b/contracts/examples/ping-pong-egld/wasm/Cargo.toml
@@ -19,6 +19,7 @@ opt-level = "z"
 lto = true
 debug = false
 panic = "abort"
+overflow-checks = false
 
 [dependencies.ping-pong-egld]
 path = ".."
diff --git a/contracts/examples/proxy-pause/wasm/Cargo.toml b/contracts/examples/proxy-pause/wasm/Cargo.toml
index ee95ab1d4e..70c445cd05 100644
--- a/contracts/examples/proxy-pause/wasm/Cargo.toml
+++ b/contracts/examples/proxy-pause/wasm/Cargo.toml
@@ -19,6 +19,7 @@ opt-level = "z"
 lto = true
 debug = false
 panic = "abort"
+overflow-checks = false
 
 [dependencies.proxy-pause]
 path = ".."
diff --git a/contracts/examples/rewards-distribution/wasm/Cargo.toml b/contracts/examples/rewards-distribution/wasm/Cargo.toml
index b5c85a65a3..6747bb0e62 100644
--- a/contracts/examples/rewards-distribution/wasm/Cargo.toml
+++ b/contracts/examples/rewards-distribution/wasm/Cargo.toml
@@ -19,6 +19,7 @@ opt-level = "z"
 lto = true
 debug = false
 panic = "abort"
+overflow-checks = false
 
 [dependencies.rewards-distribution]
 path = ".."
diff --git a/contracts/examples/seed-nft-minter/wasm/Cargo.toml b/contracts/examples/seed-nft-minter/wasm/Cargo.toml
index bd7dbdc996..3777108bd5 100644
--- a/contracts/examples/seed-nft-minter/wasm/Cargo.toml
+++ b/contracts/examples/seed-nft-minter/wasm/Cargo.toml
@@ -19,6 +19,7 @@ opt-level = "z"
 lto = true
 debug = false
 panic = "abort"
+overflow-checks = false
 
 [dependencies.seed-nft-minter]
 path = ".."
diff --git a/contracts/examples/token-release/wasm/Cargo.toml b/contracts/examples/token-release/wasm/Cargo.toml
index 48d4c968eb..2be751e3a6 100644
--- a/contracts/examples/token-release/wasm/Cargo.toml
+++ b/contracts/examples/token-release/wasm/Cargo.toml
@@ -19,6 +19,7 @@ opt-level = "z"
 lto = true
 debug = false
 panic = "abort"
+overflow-checks = false
 
 [dependencies.token-release]
 path = ".."
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 29c1c18f9d..ab8327f277 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
@@ -19,6 +19,7 @@ opt-level = "z"
 lto = true
 debug = false
 panic = "abort"
+overflow-checks = false
 
 [dependencies.abi-tester]
 path = ".."
diff --git a/contracts/feature-tests/abi-tester/wasm/Cargo.toml b/contracts/feature-tests/abi-tester/wasm/Cargo.toml
index 606de879e3..b7cdb1ff03 100644
--- a/contracts/feature-tests/abi-tester/wasm/Cargo.toml
+++ b/contracts/feature-tests/abi-tester/wasm/Cargo.toml
@@ -19,6 +19,7 @@ opt-level = "z"
 lto = true
 debug = false
 panic = "abort"
+overflow-checks = false
 
 [dependencies.abi-tester]
 path = ".."
diff --git a/contracts/feature-tests/alloc-features/wasm/Cargo.toml b/contracts/feature-tests/alloc-features/wasm/Cargo.toml
index 1f3362d017..9385697cbb 100644
--- a/contracts/feature-tests/alloc-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/alloc-features/wasm/Cargo.toml
@@ -19,6 +19,7 @@ opt-level = "z"
 lto = true
 debug = false
 panic = "abort"
+overflow-checks = false
 
 [dependencies.alloc-features]
 path = ".."
diff --git a/contracts/feature-tests/big-float-features/wasm/Cargo.toml b/contracts/feature-tests/big-float-features/wasm/Cargo.toml
index 8f09b6e0ce..900a3a908a 100644
--- a/contracts/feature-tests/big-float-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/big-float-features/wasm/Cargo.toml
@@ -19,6 +19,7 @@ opt-level = "z"
 lto = true
 debug = false
 panic = "abort"
+overflow-checks = false
 
 [dependencies.big-float-features]
 path = ".."
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 2a6b6935ef..0087000a8c 100644
--- a/contracts/feature-tests/composability/builtin-func-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/builtin-func-features/wasm/Cargo.toml
@@ -19,6 +19,7 @@ opt-level = "z"
 lto = true
 debug = false
 panic = "abort"
+overflow-checks = false
 
 [dependencies.builtin-func-features]
 path = ".."
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 a16d77a499..0058de92e4 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
@@ -19,6 +19,7 @@ opt-level = "z"
 lto = true
 debug = false
 panic = "abort"
+overflow-checks = false
 
 [dependencies.first-contract]
 path = ".."
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 e7f71104a5..9483b4f2b6 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
@@ -19,6 +19,7 @@ opt-level = "z"
 lto = true
 debug = false
 panic = "abort"
+overflow-checks = false
 
 [dependencies.second-contract]
 path = ".."
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 ff5e6fff78..966689edb3 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
@@ -19,6 +19,7 @@ opt-level = "z"
 lto = true
 debug = false
 panic = "abort"
+overflow-checks = false
 
 [dependencies.child]
 path = ".."
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 27c78fd060..afaa953a46 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
@@ -19,6 +19,7 @@ opt-level = "z"
 lto = true
 debug = false
 panic = "abort"
+overflow-checks = false
 
 [dependencies.parent]
 path = ".."
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 479d11ca70..c0b3648410 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
@@ -19,6 +19,7 @@ opt-level = "z"
 lto = true
 debug = false
 panic = "abort"
+overflow-checks = false
 
 [dependencies.forwarder-queue]
 path = ".."
diff --git a/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.toml b/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.toml
index e3444842a8..b02a57eb39 100644
--- a/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.toml
@@ -19,6 +19,7 @@ opt-level = "z"
 lto = true
 debug = false
 panic = "abort"
+overflow-checks = false
 
 [dependencies.forwarder-queue]
 path = ".."
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 b3451dbbae..6a3ac64f0d 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
@@ -19,6 +19,7 @@ opt-level = "z"
 lto = true
 debug = false
 panic = "abort"
+overflow-checks = false
 
 [dependencies.forwarder-raw]
 path = ".."
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 e62fb7097b..f69f1146d7 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
@@ -19,6 +19,7 @@ opt-level = "z"
 lto = true
 debug = false
 panic = "abort"
+overflow-checks = false
 
 [dependencies.forwarder-raw]
 path = ".."
diff --git a/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.toml b/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.toml
index 0c89f04ef7..7252010edb 100644
--- a/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.toml
@@ -19,6 +19,7 @@ opt-level = "z"
 lto = true
 debug = false
 panic = "abort"
+overflow-checks = false
 
 [dependencies.forwarder-raw]
 path = ".."
diff --git a/contracts/feature-tests/composability/forwarder/wasm/Cargo.toml b/contracts/feature-tests/composability/forwarder/wasm/Cargo.toml
index 433323f4f9..ce0ba1b826 100644
--- a/contracts/feature-tests/composability/forwarder/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder/wasm/Cargo.toml
@@ -19,6 +19,7 @@ opt-level = "z"
 lto = true
 debug = false
 panic = "abort"
+overflow-checks = false
 
 [dependencies.forwarder]
 path = ".."
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 8cec0fec55..65ad4ebd26 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
@@ -19,6 +19,7 @@ opt-level = "z"
 lto = true
 debug = false
 panic = "abort"
+overflow-checks = false
 
 [dependencies.local-esdt-and-nft]
 path = ".."
diff --git a/contracts/feature-tests/composability/promises-features/wasm/Cargo.toml b/contracts/feature-tests/composability/promises-features/wasm/Cargo.toml
index 8a7bcdd8ff..23a3b1240c 100644
--- a/contracts/feature-tests/composability/promises-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/promises-features/wasm/Cargo.toml
@@ -19,6 +19,7 @@ opt-level = "z"
 lto = true
 debug = false
 panic = "abort"
+overflow-checks = false
 
 [dependencies.promises-features]
 path = ".."
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 5195b3fb17..b1381808fb 100644
--- a/contracts/feature-tests/composability/proxy-test-first/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/proxy-test-first/wasm/Cargo.toml
@@ -19,6 +19,7 @@ opt-level = "z"
 lto = true
 debug = false
 panic = "abort"
+overflow-checks = false
 
 [dependencies.proxy-test-first]
 path = ".."
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 f9fbed954c..6035bca036 100644
--- a/contracts/feature-tests/composability/proxy-test-second/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/proxy-test-second/wasm/Cargo.toml
@@ -19,6 +19,7 @@ opt-level = "z"
 lto = true
 debug = false
 panic = "abort"
+overflow-checks = false
 
 [dependencies.proxy-test-second]
 path = ".."
diff --git a/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.toml b/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.toml
index dd2116c95b..1eada817c8 100644
--- a/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.toml
@@ -19,6 +19,7 @@ opt-level = "z"
 lto = true
 debug = false
 panic = "abort"
+overflow-checks = false
 
 [dependencies.recursive-caller]
 path = ".."
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 ed0af30bf8..325cca984d 100644
--- a/contracts/feature-tests/composability/transfer-role-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/transfer-role-features/wasm/Cargo.toml
@@ -19,6 +19,7 @@ opt-level = "z"
 lto = true
 debug = false
 panic = "abort"
+overflow-checks = false
 
 [dependencies.transfer-role-features]
 path = ".."
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 d5fea1493a..a7b692f00d 100644
--- a/contracts/feature-tests/composability/vault/wasm-vault-promises/Cargo.toml
+++ b/contracts/feature-tests/composability/vault/wasm-vault-promises/Cargo.toml
@@ -19,6 +19,7 @@ opt-level = "z"
 lto = true
 debug = false
 panic = "abort"
+overflow-checks = false
 
 [dependencies.vault]
 path = ".."
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 6af3f6fe9b..ddb806ac2c 100644
--- a/contracts/feature-tests/composability/vault/wasm-vault-upgrade/Cargo.toml
+++ b/contracts/feature-tests/composability/vault/wasm-vault-upgrade/Cargo.toml
@@ -19,6 +19,7 @@ opt-level = "z"
 lto = true
 debug = false
 panic = "abort"
+overflow-checks = false
 
 [dependencies.vault]
 path = ".."
diff --git a/contracts/feature-tests/composability/vault/wasm/Cargo.toml b/contracts/feature-tests/composability/vault/wasm/Cargo.toml
index 1ffc150d0c..f7e8fa0d83 100644
--- a/contracts/feature-tests/composability/vault/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/vault/wasm/Cargo.toml
@@ -19,6 +19,7 @@ opt-level = "z"
 lto = true
 debug = false
 panic = "abort"
+overflow-checks = false
 
 [dependencies.vault]
 path = ".."
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 636bb9ee44..5e62ab0428 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
@@ -19,6 +19,7 @@ opt-level = "z"
 lto = true
 debug = false
 panic = "abort"
+overflow-checks = false
 
 [dependencies.crowdfunding-erc20]
 path = ".."
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 b65cb0ab68..ac54720bd9 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
@@ -19,6 +19,7 @@ opt-level = "z"
 lto = true
 debug = false
 panic = "abort"
+overflow-checks = false
 
 [dependencies.erc1155-marketplace]
 path = ".."
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 75ee151a1c..f1338be353 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
@@ -19,6 +19,7 @@ opt-level = "z"
 lto = true
 debug = false
 panic = "abort"
+overflow-checks = false
 
 [dependencies.erc1155-user-mock]
 path = ".."
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 9364a33e99..460766fdf6 100644
--- a/contracts/feature-tests/erc-style-contracts/erc1155/wasm/Cargo.toml
+++ b/contracts/feature-tests/erc-style-contracts/erc1155/wasm/Cargo.toml
@@ -19,6 +19,7 @@ opt-level = "z"
 lto = true
 debug = false
 panic = "abort"
+overflow-checks = false
 
 [dependencies.erc1155]
 path = ".."
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 2ed66d4cf2..42bf5e2098 100644
--- a/contracts/feature-tests/erc-style-contracts/erc20/wasm/Cargo.toml
+++ b/contracts/feature-tests/erc-style-contracts/erc20/wasm/Cargo.toml
@@ -19,6 +19,7 @@ opt-level = "z"
 lto = true
 debug = false
 panic = "abort"
+overflow-checks = false
 
 [dependencies.erc20]
 path = ".."
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 369fba44a2..a90fc174e1 100644
--- a/contracts/feature-tests/erc-style-contracts/erc721/wasm/Cargo.toml
+++ b/contracts/feature-tests/erc-style-contracts/erc721/wasm/Cargo.toml
@@ -19,6 +19,7 @@ opt-level = "z"
 lto = true
 debug = false
 panic = "abort"
+overflow-checks = false
 
 [dependencies.erc721]
 path = ".."
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 74bbacee39..d1d980894e 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
@@ -19,6 +19,7 @@ opt-level = "z"
 lto = true
 debug = false
 panic = "abort"
+overflow-checks = false
 
 [dependencies.lottery-erc20]
 path = ".."
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 7b9722647c..cc81487e0d 100644
--- a/contracts/feature-tests/esdt-system-sc-mock/wasm/Cargo.toml
+++ b/contracts/feature-tests/esdt-system-sc-mock/wasm/Cargo.toml
@@ -19,6 +19,7 @@ opt-level = "z"
 lto = true
 debug = false
 panic = "abort"
+overflow-checks = false
 
 [dependencies.esdt-system-sc-mock]
 path = ".."
diff --git a/contracts/feature-tests/formatted-message-features/wasm/Cargo.toml b/contracts/feature-tests/formatted-message-features/wasm/Cargo.toml
index 81f101b3a8..fea7b07461 100644
--- a/contracts/feature-tests/formatted-message-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/formatted-message-features/wasm/Cargo.toml
@@ -19,6 +19,7 @@ opt-level = "z"
 lto = true
 debug = false
 panic = "abort"
+overflow-checks = false
 
 [dependencies.formatted-message-features]
 path = ".."
diff --git a/contracts/feature-tests/managed-map-features/wasm/Cargo.toml b/contracts/feature-tests/managed-map-features/wasm/Cargo.toml
index fbbf981040..dd0c0fdf89 100644
--- a/contracts/feature-tests/managed-map-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/managed-map-features/wasm/Cargo.toml
@@ -19,6 +19,7 @@ opt-level = "z"
 lto = true
 debug = false
 panic = "abort"
+overflow-checks = false
 
 [dependencies.managed-map-features]
 path = ".."
diff --git a/contracts/feature-tests/panic-message-features/wasm/Cargo.toml b/contracts/feature-tests/panic-message-features/wasm/Cargo.toml
index e92045c1c8..6c8c7c1a55 100644
--- a/contracts/feature-tests/panic-message-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/panic-message-features/wasm/Cargo.toml
@@ -19,6 +19,7 @@ opt-level = "z"
 lto = true
 debug = false
 panic = "abort"
+overflow-checks = false
 
 [dependencies.panic-message-features]
 path = ".."
diff --git a/contracts/feature-tests/payable-features/wasm/Cargo.toml b/contracts/feature-tests/payable-features/wasm/Cargo.toml
index 527a928391..4391446d9f 100644
--- a/contracts/feature-tests/payable-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/payable-features/wasm/Cargo.toml
@@ -19,6 +19,7 @@ opt-level = "z"
 lto = true
 debug = false
 panic = "abort"
+overflow-checks = false
 
 [dependencies.payable-features]
 path = ".."
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 ffe20412e5..6bd75a6d5c 100644
--- a/contracts/feature-tests/rust-snippets-generator-test/wasm/Cargo.toml
+++ b/contracts/feature-tests/rust-snippets-generator-test/wasm/Cargo.toml
@@ -19,6 +19,7 @@ opt-level = "z"
 lto = true
 debug = false
 panic = "abort"
+overflow-checks = false
 
 [dependencies.rust-snippets-generator-test]
 path = ".."
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 9f871bf4f3..c3341837f9 100644
--- a/contracts/feature-tests/rust-testing-framework-tester/wasm/Cargo.toml
+++ b/contracts/feature-tests/rust-testing-framework-tester/wasm/Cargo.toml
@@ -19,6 +19,7 @@ opt-level = "z"
 lto = true
 debug = false
 panic = "abort"
+overflow-checks = false
 
 [dependencies.rust-testing-framework-tester]
 path = ".."
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 eca878c53d..48e691cebd 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
@@ -19,6 +19,7 @@ opt-level = "z"
 lto = true
 debug = false
 panic = "abort"
+overflow-checks = false
 
 [dependencies.use-module]
 path = ".."
diff --git a/contracts/feature-tests/use-module/wasm/Cargo.toml b/contracts/feature-tests/use-module/wasm/Cargo.toml
index 30239b22e0..fa061fc598 100644
--- a/contracts/feature-tests/use-module/wasm/Cargo.toml
+++ b/contracts/feature-tests/use-module/wasm/Cargo.toml
@@ -19,6 +19,7 @@ opt-level = "z"
 lto = true
 debug = false
 panic = "abort"
+overflow-checks = false
 
 [dependencies.use-module]
 path = ".."

From 300dcec8464d5eb03b3673d9c996ecddcc153f4d Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Tue, 5 Dec 2023 20:27:38 +0100
Subject: [PATCH 0145/1254] fixed wrong spacing and extra characters

---
 .../abi_tester_expected_esdt_attr.esdt-abi.json        |  2 +-
 framework/derive/src/parse/attributes/doc_attr.rs      | 10 +++++++---
 framework/derive/src/parse/attributes/util.rs          |  2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/contracts/feature-tests/abi-tester/abi_tester_expected_esdt_attr.esdt-abi.json b/contracts/feature-tests/abi-tester/abi_tester_expected_esdt_attr.esdt-abi.json
index d96d3badee..c1fcdf278d 100644
--- a/contracts/feature-tests/abi-tester/abi_tester_expected_esdt_attr.esdt-abi.json
+++ b/contracts/feature-tests/abi-tester/abi_tester_expected_esdt_attr.esdt-abi.json
@@ -7,7 +7,7 @@
         "OnlyShowsUpAsNested10": {
             "type": "struct",
             "docs": [
-                " Tests that the ABI generator also fetches types that only appear as fields."
+                "Tests that the ABI generator also fetches types that only appear as fields."
             ]
         },
         "OnlyShowsUpInEsdtAttr": {
diff --git a/framework/derive/src/parse/attributes/doc_attr.rs b/framework/derive/src/parse/attributes/doc_attr.rs
index 05549002ad..7488496e12 100644
--- a/framework/derive/src/parse/attributes/doc_attr.rs
+++ b/framework/derive/src/parse/attributes/doc_attr.rs
@@ -25,11 +25,15 @@ pub fn extract_doc(attrs: &[syn::Attribute]) -> Vec<String> {
                 if let syn::Expr::Lit(lit_str) = meta_name_value.value {
                     if meta_name_value.path.is_ident("doc") {
                         let value = lit_str.lit;
-                        value
+                        if let Some(tuple) = value
                             .to_token_stream()
                             .to_string()
-                            .trim_matches('\"')
-                            .to_string()
+                            .split_once(char::is_whitespace)
+                        {
+                            tuple.1.trim_matches('\"').to_string()
+                        } else {
+                            String::new()
+                        }
                     } else {
                         panic!("Attribute doesn't have the 'doc' identifier");
                     }
diff --git a/framework/derive/src/parse/attributes/util.rs b/framework/derive/src/parse/attributes/util.rs
index 40d581f252..586bc1030f 100644
--- a/framework/derive/src/parse/attributes/util.rs
+++ b/framework/derive/src/parse/attributes/util.rs
@@ -107,7 +107,7 @@ pub(super) fn attr_one_string_arg(attr: &syn::Attribute) -> String {
                         !literal.to_string().trim_matches('"').trim().is_empty(),
                         "the argument can not be an empty string or whitespace"
                     );
-                    literal.to_string()
+                    literal.to_string().trim_matches('\"').to_string()
                 },
                 Some(_) => {
                     panic!("unexpected attribute argument tokens: attribute has to be a string")

From 29d3a64d77240be398a0d9d4c036e2339c735988 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Wed, 6 Dec 2023 16:00:25 +0200
Subject: [PATCH 0146/1254] removed bits() function call from code metadata

---
 framework/base/src/types/flags/code_metadata.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/framework/base/src/types/flags/code_metadata.rs b/framework/base/src/types/flags/code_metadata.rs
index 23bf0d84fa..89df4b91de 100644
--- a/framework/base/src/types/flags/code_metadata.rs
+++ b/framework/base/src/types/flags/code_metadata.rs
@@ -26,19 +26,19 @@ bitflags! {
 
 impl CodeMetadata {
     pub fn is_upgradeable(&self) -> bool {
-        self.bits() & CodeMetadata::UPGRADEABLE.bits() != CodeMetadata::DEFAULT.bits()
+        *self & CodeMetadata::UPGRADEABLE != CodeMetadata::DEFAULT
     }
 
     pub fn is_payable(&self) -> bool {
-        self.bits() & CodeMetadata::PAYABLE.bits() != CodeMetadata::DEFAULT.bits()
+        *self & CodeMetadata::PAYABLE != CodeMetadata::DEFAULT
     }
 
     pub fn is_payable_by_sc(&self) -> bool {
-        self.bits() & CodeMetadata::PAYABLE_BY_SC.bits() != CodeMetadata::DEFAULT.bits()
+        *self & CodeMetadata::PAYABLE_BY_SC != CodeMetadata::DEFAULT
     }
 
     pub fn is_readable(&self) -> bool {
-        self.bits() & CodeMetadata::READABLE.bits() != CodeMetadata::DEFAULT.bits()
+        *self & CodeMetadata::READABLE != CodeMetadata::DEFAULT
     }
 
     #[inline]

From 2ec60a359151572c1737ceea9145aab48d4c2e6b Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Wed, 6 Dec 2023 16:11:56 +0200
Subject: [PATCH 0147/1254] create parameter to make optional cargo check after
 upgrade

---
 framework/meta/src/cli_args/cli_args_standalone.rs    |  4 ++++
 framework/meta/src/cmd/standalone/upgrade.rs          |  1 +
 .../meta/src/cmd/standalone/upgrade/upgrade_common.rs |  8 ++++++--
 .../src/cmd/standalone/upgrade/upgrade_selector.rs    | 11 +++++++----
 .../src/cmd/standalone/upgrade/upgrade_settings.rs    |  9 +++++++++
 5 files changed, 27 insertions(+), 6 deletions(-)
 create mode 100644 framework/meta/src/cmd/standalone/upgrade/upgrade_settings.rs

diff --git a/framework/meta/src/cli_args/cli_args_standalone.rs b/framework/meta/src/cli_args/cli_args_standalone.rs
index dab29f2119..51b678c3ec 100644
--- a/framework/meta/src/cli_args/cli_args_standalone.rs
+++ b/framework/meta/src/cli_args/cli_args_standalone.rs
@@ -185,6 +185,10 @@ pub struct UpgradeArgs {
     /// By default it will be the last version out.
     #[arg(long = "to", verbatim_doc_comment)]
     pub override_target_version: Option<String>,
+
+    /// Skips 'cargo check' after upgrade
+    #[arg(short, long, default_value = "false", verbatim_doc_comment)]
+    pub no_check: bool,
 }
 
 #[derive(Default, Clone, PartialEq, Eq, Debug, Args)]
diff --git a/framework/meta/src/cmd/standalone/upgrade.rs b/framework/meta/src/cmd/standalone/upgrade.rs
index 0763cc734e..d7ced05dba 100644
--- a/framework/meta/src/cmd/standalone/upgrade.rs
+++ b/framework/meta/src/cmd/standalone/upgrade.rs
@@ -5,6 +5,7 @@ mod upgrade_0_45;
 pub(crate) mod upgrade_common;
 mod upgrade_print;
 mod upgrade_selector;
+mod upgrade_settings;
 
 pub use upgrade_print::print_tree_dir_metadata;
 pub use upgrade_selector::upgrade_sc;
diff --git a/framework/meta/src/cmd/standalone/upgrade/upgrade_common.rs b/framework/meta/src/cmd/standalone/upgrade/upgrade_common.rs
index 6015e08631..757c7b23d2 100644
--- a/framework/meta/src/cmd/standalone/upgrade/upgrade_common.rs
+++ b/framework/meta/src/cmd/standalone/upgrade/upgrade_common.rs
@@ -15,7 +15,7 @@ use crate::{
     CargoTomlContents,
 };
 
-use super::upgrade_print::*;
+use super::{upgrade_print::*, upgrade_settings::UpgradeSettings};
 
 /// Uses ruplacer.
 pub(crate) fn replace_in_files(sc_crate_path: &Path, file_type: &str, queries: &[Query]) {
@@ -200,7 +200,11 @@ pub fn re_generate_wasm_crate(dir: &RelevantDirectory) {
     );
 }
 
-pub fn cargo_check(dir: &RelevantDirectory) {
+pub fn cargo_check(dir: &RelevantDirectory, settings: &UpgradeSettings) {
+    if settings.no_check {
+        return;
+    }
+
     print_cargo_check(dir);
 
     let result = Command::new("cargo")
diff --git a/framework/meta/src/cmd/standalone/upgrade/upgrade_selector.rs b/framework/meta/src/cmd/standalone/upgrade/upgrade_selector.rs
index 997469c713..2a864c8d82 100644
--- a/framework/meta/src/cmd/standalone/upgrade/upgrade_selector.rs
+++ b/framework/meta/src/cmd/standalone/upgrade/upgrade_selector.rs
@@ -1,5 +1,6 @@
 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},
 };
@@ -20,6 +21,8 @@ pub fn upgrade_sc(args: &UpgradeArgs) {
         "./"
     };
 
+    let settings = UpgradeSettings::new(args.no_check);
+
     let last_version = args
         .override_target_version
         .clone()
@@ -52,7 +55,7 @@ pub fn upgrade_sc(args: &UpgradeArgs) {
         }
 
         for dir in dirs.iter_version(from_version) {
-            upgrade_post_processing(dir);
+            upgrade_post_processing(dir, &settings);
         }
 
         // // change the version in memory for the next iteration (dirs is not reloaded from disk)
@@ -86,19 +89,19 @@ fn upgrade_function_selector(dir: &RelevantDirectory) {
     }
 }
 
-fn upgrade_post_processing(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.1")) => {
             print_post_processing(dir);
-            cargo_check(dir);
+            cargo_check(dir, settings);
         },
         Some((_, "0.39.0")) => {
             print_post_processing(dir);
             postprocessing_after_39_0(dir);
-            cargo_check(dir);
+            cargo_check(dir, settings);
         },
         _ => {},
     }
diff --git a/framework/meta/src/cmd/standalone/upgrade/upgrade_settings.rs b/framework/meta/src/cmd/standalone/upgrade/upgrade_settings.rs
new file mode 100644
index 0000000000..8706de4613
--- /dev/null
+++ b/framework/meta/src/cmd/standalone/upgrade/upgrade_settings.rs
@@ -0,0 +1,9 @@
+pub struct UpgradeSettings {
+    pub no_check: bool,
+}
+
+impl UpgradeSettings {
+    pub fn new(no_check: bool) -> Self {
+        UpgradeSettings { no_check }
+    }
+}

From 58791df8ec56496ee474f3435ae6e40db9db4f7e Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Thu, 7 Dec 2023 15:21:03 +0200
Subject: [PATCH 0148/1254] removed bits() function for all

---
 .../base/src/types/flags/esdt_local_role_flags.rs      |  4 ++--
 vm/src/types/vm_code_metadata.rs                       | 10 +++++-----
 vm/src/types/vm_esdt_local_role_flags.rs               |  3 ++-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/framework/base/src/types/flags/esdt_local_role_flags.rs b/framework/base/src/types/flags/esdt_local_role_flags.rs
index b147499165..29be64aba2 100644
--- a/framework/base/src/types/flags/esdt_local_role_flags.rs
+++ b/framework/base/src/types/flags/esdt_local_role_flags.rs
@@ -4,7 +4,7 @@ use super::EsdtLocalRole;
 use bitflags::bitflags;
 
 bitflags! {
-    #[derive(PartialEq)]
+    #[derive(PartialEq, Clone, Copy)]
     pub struct EsdtLocalRoleFlags: u64 {
         const NONE                  = 0b00000000;
         const MINT                  = 0b00000001;
@@ -20,7 +20,7 @@ bitflags! {
 
 impl EsdtLocalRoleFlags {
     pub fn has_role(&self, role: &EsdtLocalRole) -> bool {
-        self.bits() & role.to_flag().bits() != EsdtLocalRoleFlags::NONE.bits()
+        *self & role.to_flag() != EsdtLocalRoleFlags::NONE
     }
 
     pub fn iter_roles(&self) -> impl Iterator<Item = &EsdtLocalRole> {
diff --git a/vm/src/types/vm_code_metadata.rs b/vm/src/types/vm_code_metadata.rs
index 607b4196a9..207d523c37 100644
--- a/vm/src/types/vm_code_metadata.rs
+++ b/vm/src/types/vm_code_metadata.rs
@@ -3,7 +3,7 @@
 use bitflags::bitflags;
 
 bitflags! {
-    #[derive(Default, PartialEq, Debug)]
+    #[derive(Default, PartialEq, Debug, Clone, Copy)]
     pub struct VMCodeMetadata: u16 {
         const DEFAULT = 0;
         const UPGRADEABLE = 0b0000_0001_0000_0000; // LSB of first byte
@@ -15,19 +15,19 @@ bitflags! {
 
 impl VMCodeMetadata {
     pub fn is_upgradeable(&self) -> bool {
-        self.bits() & VMCodeMetadata::UPGRADEABLE.bits() != VMCodeMetadata::DEFAULT.bits()
+        *self & VMCodeMetadata::UPGRADEABLE != VMCodeMetadata::DEFAULT
     }
 
     pub fn is_payable(&self) -> bool {
-        self.bits() & VMCodeMetadata::PAYABLE.bits() != VMCodeMetadata::DEFAULT.bits()
+        *self & VMCodeMetadata::PAYABLE != VMCodeMetadata::DEFAULT
     }
 
     pub fn is_payable_by_sc(&self) -> bool {
-        self.bits() & VMCodeMetadata::PAYABLE_BY_SC.bits() != VMCodeMetadata::DEFAULT.bits()
+        *self & VMCodeMetadata::PAYABLE_BY_SC != VMCodeMetadata::DEFAULT
     }
 
     pub fn is_readable(&self) -> bool {
-        self.bits() & VMCodeMetadata::READABLE.bits() != VMCodeMetadata::DEFAULT.bits()
+        *self & VMCodeMetadata::READABLE != VMCodeMetadata::DEFAULT
     }
 
     pub fn to_byte_array(&self) -> [u8; 2] {
diff --git a/vm/src/types/vm_esdt_local_role_flags.rs b/vm/src/types/vm_esdt_local_role_flags.rs
index 742f907177..2b47879ec8 100644
--- a/vm/src/types/vm_esdt_local_role_flags.rs
+++ b/vm/src/types/vm_esdt_local_role_flags.rs
@@ -9,6 +9,7 @@ bitflags! {
     /// There is another near-identical implementation in the framework, used for communicating with the VM.
     ///
     /// It might be a good idea to move it to some "common ground" crate, between the framework and the VM.
+    #[derive(PartialEq, Clone, Copy)]
     pub struct EsdtLocalRoleFlags: u64 {
         const NONE                  = 0b00000000;
         const MINT                  = 0b00000001;
@@ -24,7 +25,7 @@ bitflags! {
 
 impl EsdtLocalRoleFlags {
     pub fn has_role(&self, role: &EsdtLocalRole) -> bool {
-        self.bits() & role.to_flag().bits() != EsdtLocalRoleFlags::NONE.bits()
+        *self & role.to_flag() != EsdtLocalRoleFlags::NONE
     }
 
     pub fn iter_roles(&self) -> impl Iterator<Item = &EsdtLocalRole> {

From d255dcb83b696f924a18f48328bd8981916e8133 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Mon, 11 Dec 2023 10:54:41 +0200
Subject: [PATCH 0149/1254] deleted extra backslashes

---
 framework/derive/src/parse/attributes/doc_attr.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/framework/derive/src/parse/attributes/doc_attr.rs b/framework/derive/src/parse/attributes/doc_attr.rs
index 7488496e12..b984fb1479 100644
--- a/framework/derive/src/parse/attributes/doc_attr.rs
+++ b/framework/derive/src/parse/attributes/doc_attr.rs
@@ -30,7 +30,7 @@ pub fn extract_doc(attrs: &[syn::Attribute]) -> Vec<String> {
                             .to_string()
                             .split_once(char::is_whitespace)
                         {
-                            tuple.1.trim_matches('\"').to_string()
+                            tuple.1.replace('\\', "").trim_matches('\"').to_string()
                         } else {
                             String::new()
                         }

From da3e05fd357d8ef969044f701adf9472ed6695ab Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Mon, 11 Dec 2023 12:02:58 +0200
Subject: [PATCH 0150/1254] fix after review, changed load_esdt_local_roles to
 not panic if None

---
 .../src/api/blockchain_api_node.rs            | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/framework/wasm-adapter/src/api/blockchain_api_node.rs b/framework/wasm-adapter/src/api/blockchain_api_node.rs
index f80c4da8c9..384769bbe9 100644
--- a/framework/wasm-adapter/src/api/blockchain_api_node.rs
+++ b/framework/wasm-adapter/src/api/blockchain_api_node.rs
@@ -1,8 +1,11 @@
-use crate::api::{
-    managed_types::managed_buffer_api_node::{
-        unsafe_buffer_load_address, unsafe_buffer_load_token_identifier,
+use crate::{
+    api::{
+        managed_types::managed_buffer_api_node::{
+            unsafe_buffer_load_address, unsafe_buffer_load_token_identifier,
+        },
+        VmApiImpl,
     },
-    VmApiImpl,
+    error_hook,
 };
 use multiversx_sc::{
     api::{BlockchainApi, BlockchainApiImpl, ManagedBufferApiImpl, RawHandle},
@@ -356,9 +359,14 @@ impl BlockchainApiImpl for VmApiImpl {
         &self,
         token_id_handle: Self::ManagedBufferHandle,
     ) -> multiversx_sc::types::EsdtLocalRoleFlags {
-        multiversx_sc::types::EsdtLocalRoleFlags::from_bits(unsafe {
+        match multiversx_sc::types::EsdtLocalRoleFlags::from_bits(unsafe {
             getESDTLocalRoles(token_id_handle)
         } as u64)
-        .unwrap()
+        {
+            Some(flags) => flags,
+            None => error_hook::signal_error(
+                alloc::format!("no local esdt role flags found for {token_id_handle}").as_bytes(),
+            ),
+        }
     }
 }

From fec0c758f5a9ca694dfe31d825c2ae3d65441e5c Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Mon, 11 Dec 2023 12:05:43 +0200
Subject: [PATCH 0151/1254] unwrap or else

---
 framework/wasm-adapter/src/api/blockchain_api_node.rs | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/framework/wasm-adapter/src/api/blockchain_api_node.rs b/framework/wasm-adapter/src/api/blockchain_api_node.rs
index 384769bbe9..e7a2f34949 100644
--- a/framework/wasm-adapter/src/api/blockchain_api_node.rs
+++ b/framework/wasm-adapter/src/api/blockchain_api_node.rs
@@ -359,14 +359,13 @@ impl BlockchainApiImpl for VmApiImpl {
         &self,
         token_id_handle: Self::ManagedBufferHandle,
     ) -> multiversx_sc::types::EsdtLocalRoleFlags {
-        match multiversx_sc::types::EsdtLocalRoleFlags::from_bits(unsafe {
+        multiversx_sc::types::EsdtLocalRoleFlags::from_bits(unsafe {
             getESDTLocalRoles(token_id_handle)
         } as u64)
-        {
-            Some(flags) => flags,
-            None => error_hook::signal_error(
+        .unwrap_or_else(|| {
+            error_hook::signal_error(
                 alloc::format!("no local esdt role flags found for {token_id_handle}").as_bytes(),
-            ),
-        }
+            )
+        })
     }
 }

From 9ea8feb4f380dd62c3c3d5ad741b070b589b92ca Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Mon, 11 Dec 2023 12:24:55 +0200
Subject: [PATCH 0152/1254] removed alloc

---
 framework/wasm-adapter/src/api/blockchain_api_node.rs | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/framework/wasm-adapter/src/api/blockchain_api_node.rs b/framework/wasm-adapter/src/api/blockchain_api_node.rs
index e7a2f34949..1438ae68f0 100644
--- a/framework/wasm-adapter/src/api/blockchain_api_node.rs
+++ b/framework/wasm-adapter/src/api/blockchain_api_node.rs
@@ -362,10 +362,6 @@ impl BlockchainApiImpl for VmApiImpl {
         multiversx_sc::types::EsdtLocalRoleFlags::from_bits(unsafe {
             getESDTLocalRoles(token_id_handle)
         } as u64)
-        .unwrap_or_else(|| {
-            error_hook::signal_error(
-                alloc::format!("no local esdt role flags found for {token_id_handle}").as_bytes(),
-            )
-        })
+        .unwrap_or_else(|| error_hook::signal_error(b"no local esdt role flags found for"))
     }
 }

From b9a35342b0cc91a65eab09fab62ce67ce547c0d3 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Mon, 11 Dec 2023 15:10:43 +0200
Subject: [PATCH 0153/1254] fix after review

---
 contracts/examples/adder/wasm/src/lib.rs      |  9 +--
 .../wrapped/egld_or_multi_esdt_payment.rs     | 58 -------------------
 framework/derive/src/macro_contract.rs        | 20 ++-----
 framework/derive/src/macro_module.rs          | 15 +----
 framework/derive/src/macro_proxy.rs           | 16 +----
 .../derive/src/parse/attributes/doc_attr.rs   |  6 +-
 .../derive/src/parse/contract_trait_parse.rs  |  7 ++-
 framework/derive/src/parse/parse_util.rs      |  6 +-
 framework/derive/src/type_abi_derive.rs       |  1 -
 9 files changed, 24 insertions(+), 114 deletions(-)

diff --git a/contracts/examples/adder/wasm/src/lib.rs b/contracts/examples/adder/wasm/src/lib.rs
index b81a2ed0d7..b364edf422 100644
--- a/contracts/examples/adder/wasm/src/lib.rs
+++ b/contracts/examples/adder/wasm/src/lib.rs
@@ -5,9 +5,9 @@
 ////////////////////////////////////////////////////
 
 // Init:                                 1
-// Endpoints:                            2
+// Endpoints:                            3
 // Async Callback (empty):               1
-// Total number of exported functions:   4
+// Total number of exported functions:   5
 
 #![no_std]
 
@@ -22,8 +22,9 @@ multiversx_sc_wasm_adapter::endpoints! {
     adder
     (
         init => init
-        endpoint => try_s
-        end => end
+        getSum => sum
+        upgrade => upgrade
+        add => add
     )
 }
 
diff --git a/framework/base/src/types/managed/wrapped/egld_or_multi_esdt_payment.rs b/framework/base/src/types/managed/wrapped/egld_or_multi_esdt_payment.rs
index fa23a582ac..1365a2854b 100644
--- a/framework/base/src/types/managed/wrapped/egld_or_multi_esdt_payment.rs
+++ b/framework/base/src/types/managed/wrapped/egld_or_multi_esdt_payment.rs
@@ -25,61 +25,3 @@ pub enum EgldOrMultiEsdtPayment<M: ManagedTypeApi> {
 
 impl<M> CodecFromSelf for EgldOrMultiEsdtPayment<M> where M: ManagedTypeApi {}
 
-// Manual TypeAbi impl for EgldOrMultiEsdtPayment
-// impl<M: ManagedTypeApi> multiversx_sc::abi::TypeAbi for EgldOrMultiEsdtPayment<M> {
-//     fn type_name() -> multiversx_sc::abi::TypeName {
-//         "EgldOrMultiEsdtPayment".into()
-//     }
-
-//     fn provide_type_descriptions<TDC: multiversx_sc::abi::TypeDescriptionContainer>(
-//         accumulator: &mut TDC,
-//     ) {
-//         let type_name = Self::type_name();
-//         if !accumulator.contains_type(&type_name) {
-//             accumulator.reserve_type_name(type_name.clone());
-
-//             let mut field_descriptions = multiversx_sc::types::heap::Vec::new();
-
-//             let inner_biguint =
-//                 multiversx_sc::abi::StructFieldDescription::new(&[], "", <BigUint<M>>::type_name());
-//             let mut inner_vec =
-//                 crate::types::heap::Vec::<multiversx_sc::abi::StructFieldDescription>::new();
-//             inner_vec.push(inner_biguint);
-
-//             field_descriptions.push(multiversx_sc::abi::EnumVariantDescription::new(
-//                 &[],
-//                 "Egld",
-//                 0usize,
-//                 inner_vec,
-//             ));
-//             <BigUint<M>>::provide_type_descriptions(accumulator);
-
-//             let mut inner_vec_managed =
-//             crate::types::heap::Vec::<multiversx_sc::abi::StructFieldDescription>::new();
-//             let inner_vec_managed_struct = multiversx_sc::abi::StructFieldDescription::new(
-//                 &[],
-//                 "",
-//                 multiversx_sc::types::ManagedVec::<M, multiversx_sc::types::EsdtTokenPayment<M>>::type_name(),
-//             );
-//             inner_vec_managed.push(inner_vec_managed_struct);
-
-//             field_descriptions.push(multiversx_sc::abi::EnumVariantDescription::new(
-//                 &[],
-//                 "MultiEsdt",
-//                 1usize,
-//                 inner_vec_managed,
-//             ));
-//             <multiversx_sc::types::EsdtTokenPayment<M>>::provide_type_descriptions(accumulator);
-//             <multiversx_sc::types::ManagedVec::<M, multiversx_sc::types::EsdtTokenPayment<M>>>::provide_type_descriptions(accumulator);
-
-//             accumulator.insert(
-//                 type_name.clone(),
-//                 multiversx_sc::abi::TypeDescription::new(
-//                     &[],
-//                     type_name,
-//                     multiversx_sc::abi::TypeContents::Enum(field_descriptions),
-//                 ),
-//             );
-//         }
-//     }
-// }
diff --git a/framework/derive/src/macro_contract.rs b/framework/derive/src/macro_contract.rs
index 3f39a940f6..d47b7b873e 100644
--- a/framework/derive/src/macro_contract.rs
+++ b/framework/derive/src/macro_contract.rs
@@ -7,24 +7,12 @@ pub fn process_contract(
     args: proc_macro::TokenStream,
     input: proc_macro::TokenStream,
 ) -> proc_macro::TokenStream {
-    let new_input = trait_preprocessing(input);
-    let proc_input = &parse_macro_input!(new_input as syn::ItemTrait);
 
-    let args_input = if args.is_empty() {
-        syn::MetaList {
-            path: syn::Path {
-                leading_colon: Some(syn::token::PathSep::default()),
-                segments:
-                    syn::punctuated::Punctuated::<syn::PathSegment, syn::token::PathSep>::default(),
-            },
-            delimiter: syn::MacroDelimiter::Paren(syn::token::Paren::default()),
-            tokens: proc_macro2::TokenStream::new(),
-        }
-    } else {
-        parse_macro_input!(args as syn::MetaList)
-    };
+    let new_input = trait_preprocessing(input);
+    let proc_input = parse_macro_input!(new_input as syn::ItemTrait);
+    
+    let contract = parse_contract_trait(args, &proc_input);
 
-    let contract = parse_contract_trait(args_input, proc_input);
     validate_contract(&contract);
 
     let contract_impl = contract_implementation(&contract, true);
diff --git a/framework/derive/src/macro_module.rs b/framework/derive/src/macro_module.rs
index da80a4b90a..5e026f438a 100644
--- a/framework/derive/src/macro_module.rs
+++ b/framework/derive/src/macro_module.rs
@@ -10,21 +10,8 @@ pub fn process_module(
     let new_input = trait_preprocessing(input);
     let proc_input = &parse_macro_input!(new_input as syn::ItemTrait);
 
-    let args_input = if args.is_empty() {
-        syn::MetaList {
-            path: syn::Path {
-                leading_colon: Some(syn::token::PathSep::default()),
-                segments:
-                    syn::punctuated::Punctuated::<syn::PathSegment, syn::token::PathSep>::default(),
-            },
-            delimiter: syn::MacroDelimiter::Paren(syn::token::Paren::default()),
-            tokens: proc_macro2::TokenStream::new(),
-        }
-    } else {
-        parse_macro_input!(args as syn::MetaList)
-    };
 
-    let contract = parse_contract_trait(args_input, proc_input);
+    let contract = parse_contract_trait(args, proc_input);
     validate_contract(&contract);
 
     let contract_impl = contract_implementation(&contract, false);
diff --git a/framework/derive/src/macro_proxy.rs b/framework/derive/src/macro_proxy.rs
index 9c2c86dd4c..d88f3116fc 100644
--- a/framework/derive/src/macro_proxy.rs
+++ b/framework/derive/src/macro_proxy.rs
@@ -13,21 +13,7 @@ pub fn process_proxy(
     let new_input = trait_preprocessing(input);
     let proc_input = parse_macro_input!(new_input as syn::ItemTrait);
 
-    let args_input = if args.is_empty() {
-        syn::MetaList {
-            path: syn::Path {
-                leading_colon: Some(syn::token::PathSep::default()),
-                segments:
-                    syn::punctuated::Punctuated::<syn::PathSegment, syn::token::PathSep>::default(),
-            },
-            delimiter: syn::MacroDelimiter::Paren(syn::token::Paren::default()),
-            tokens: proc_macro2::TokenStream::new(),
-        }
-    } else {
-        parse_macro_input!(args as syn::MetaList)
-    };
-
-    let contract = parse_contract_trait(args_input, &proc_input);
+    let contract = parse_contract_trait(args, &proc_input);
     validate_contract(&contract);
 
     let proxy_impl = proxy_implementation(&contract, true);
diff --git a/framework/derive/src/parse/attributes/doc_attr.rs b/framework/derive/src/parse/attributes/doc_attr.rs
index b984fb1479..b554f5d936 100644
--- a/framework/derive/src/parse/attributes/doc_attr.rs
+++ b/framework/derive/src/parse/attributes/doc_attr.rs
@@ -30,7 +30,7 @@ pub fn extract_doc(attrs: &[syn::Attribute]) -> Vec<String> {
                             .to_string()
                             .split_once(char::is_whitespace)
                         {
-                            tuple.1.replace('\\', "").trim_matches('\"').to_string()
+                            remove_backslashes(tuple.1)
                         } else {
                             String::new()
                         }
@@ -45,6 +45,10 @@ pub fn extract_doc(attrs: &[syn::Attribute]) -> Vec<String> {
         .collect()
 }
 
+fn remove_backslashes(input: &str) -> String {
+    input.replace("\\\"", "\"").replace("\\'", "'").to_string()
+}
+
 pub struct OutputNameAttribute {
     pub output_name: String,
 }
diff --git a/framework/derive/src/parse/contract_trait_parse.rs b/framework/derive/src/parse/contract_trait_parse.rs
index b2930e44b5..1928687be5 100644
--- a/framework/derive/src/parse/contract_trait_parse.rs
+++ b/framework/derive/src/parse/contract_trait_parse.rs
@@ -7,7 +7,10 @@ use crate::{
     parse::{is_contract_base, process_trait_arguments},
 };
 
-pub fn parse_contract_trait(args: syn::MetaList, contract_trait: &syn::ItemTrait) -> ContractTrait {
+pub fn parse_contract_trait(
+    args: proc_macro::TokenStream,
+    contract_trait: &syn::ItemTrait,
+) -> ContractTrait{
     validate_attribute_args(args);
 
     let docs = extract_doc(contract_trait.attrs.as_slice());
@@ -45,4 +48,4 @@ pub fn parse_contract_trait(args: syn::MetaList, contract_trait: &syn::ItemTrait
         methods,
         trait_attributes,
     }
-}
+}
\ No newline at end of file
diff --git a/framework/derive/src/parse/parse_util.rs b/framework/derive/src/parse/parse_util.rs
index 3cf731b7e2..3b63574afe 100644
--- a/framework/derive/src/parse/parse_util.rs
+++ b/framework/derive/src/parse/parse_util.rs
@@ -1,6 +1,6 @@
-pub fn validate_attribute_args(args: syn::MetaList) {
+pub fn validate_attribute_args(args: proc_macro::TokenStream) {
     assert!(
-        args.tokens.is_empty(),
+        args.is_empty(),
         "No arguments expected in contract, module or proxy annotation."
     );
-}
+}
\ No newline at end of file
diff --git a/framework/derive/src/type_abi_derive.rs b/framework/derive/src/type_abi_derive.rs
index 79b81e8678..d64c932e22 100644
--- a/framework/derive/src/type_abi_derive.rs
+++ b/framework/derive/src/type_abi_derive.rs
@@ -40,7 +40,6 @@ fn fields_snippets(fields: &syn::Fields) -> Vec<proc_macro2::TokenStream> {
 
 pub fn type_abi_derive(ast: &syn::DeriveInput) -> TokenStream {
     let type_docs = extract_doc(ast.attrs.as_slice());
-    // let type_docs = Vec::<String>::new();
     let type_description_impl = match &ast.data {
         syn::Data::Struct(data_struct) => {
             let struct_field_snippets = fields_snippets(&data_struct.fields);

From c1e43c229fd7dd831a25adf15acaf6734b99339b Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Mon, 11 Dec 2023 15:23:39 +0200
Subject: [PATCH 0154/1254] changed from_bits into from_bits_retain

---
 framework/scenario/src/api/core_api_vh/blockchain_api_vh.rs | 2 +-
 framework/wasm-adapter/src/api/blockchain_api_node.rs       | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

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 00e182f690..03c3861bf5 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
@@ -265,6 +265,6 @@ impl<VHB: VMHooksApiBackend> BlockchainApiImpl for VMHooksApi<VHB> {
             vh.get_esdt_local_roles(token_id_handle.get_raw_handle_unchecked())
         });
 
-        multiversx_sc::types::EsdtLocalRoleFlags::from_bits(result as u64).unwrap()
+        multiversx_sc::types::EsdtLocalRoleFlags::from_bits_retain(result as u64)
     }
 }
diff --git a/framework/wasm-adapter/src/api/blockchain_api_node.rs b/framework/wasm-adapter/src/api/blockchain_api_node.rs
index 1438ae68f0..cd04d8f291 100644
--- a/framework/wasm-adapter/src/api/blockchain_api_node.rs
+++ b/framework/wasm-adapter/src/api/blockchain_api_node.rs
@@ -359,9 +359,8 @@ impl BlockchainApiImpl for VmApiImpl {
         &self,
         token_id_handle: Self::ManagedBufferHandle,
     ) -> multiversx_sc::types::EsdtLocalRoleFlags {
-        multiversx_sc::types::EsdtLocalRoleFlags::from_bits(unsafe {
+        multiversx_sc::types::EsdtLocalRoleFlags::from_bits_retain(unsafe {
             getESDTLocalRoles(token_id_handle)
         } as u64)
-        .unwrap_or_else(|| error_hook::signal_error(b"no local esdt role flags found for"))
     }
 }

From 26fd487ef1d830ad4cdae6e81466bc49a1b5a7a1 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Mon, 11 Dec 2023 16:12:43 +0200
Subject: [PATCH 0155/1254] fixed remove backslashes

---
 .../src/types/managed/wrapped/egld_or_multi_esdt_payment.rs  | 1 -
 framework/derive/src/macro_contract.rs                       | 3 +--
 framework/derive/src/macro_module.rs                         | 1 -
 framework/derive/src/parse/attributes/doc_attr.rs            | 5 ++++-
 framework/derive/src/parse/contract_trait_parse.rs           | 4 ++--
 framework/derive/src/parse/parse_util.rs                     | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/framework/base/src/types/managed/wrapped/egld_or_multi_esdt_payment.rs b/framework/base/src/types/managed/wrapped/egld_or_multi_esdt_payment.rs
index 1365a2854b..653b76d5a0 100644
--- a/framework/base/src/types/managed/wrapped/egld_or_multi_esdt_payment.rs
+++ b/framework/base/src/types/managed/wrapped/egld_or_multi_esdt_payment.rs
@@ -24,4 +24,3 @@ pub enum EgldOrMultiEsdtPayment<M: ManagedTypeApi> {
 }
 
 impl<M> CodecFromSelf for EgldOrMultiEsdtPayment<M> where M: ManagedTypeApi {}
-
diff --git a/framework/derive/src/macro_contract.rs b/framework/derive/src/macro_contract.rs
index d47b7b873e..06a3be7d03 100644
--- a/framework/derive/src/macro_contract.rs
+++ b/framework/derive/src/macro_contract.rs
@@ -7,10 +7,9 @@ pub fn process_contract(
     args: proc_macro::TokenStream,
     input: proc_macro::TokenStream,
 ) -> proc_macro::TokenStream {
-
     let new_input = trait_preprocessing(input);
     let proc_input = parse_macro_input!(new_input as syn::ItemTrait);
-    
+
     let contract = parse_contract_trait(args, &proc_input);
 
     validate_contract(&contract);
diff --git a/framework/derive/src/macro_module.rs b/framework/derive/src/macro_module.rs
index 5e026f438a..68ea095f0a 100644
--- a/framework/derive/src/macro_module.rs
+++ b/framework/derive/src/macro_module.rs
@@ -10,7 +10,6 @@ pub fn process_module(
     let new_input = trait_preprocessing(input);
     let proc_input = &parse_macro_input!(new_input as syn::ItemTrait);
 
-
     let contract = parse_contract_trait(args, proc_input);
     validate_contract(&contract);
 
diff --git a/framework/derive/src/parse/attributes/doc_attr.rs b/framework/derive/src/parse/attributes/doc_attr.rs
index b554f5d936..c2a670abb5 100644
--- a/framework/derive/src/parse/attributes/doc_attr.rs
+++ b/framework/derive/src/parse/attributes/doc_attr.rs
@@ -46,7 +46,10 @@ pub fn extract_doc(attrs: &[syn::Attribute]) -> Vec<String> {
 }
 
 fn remove_backslashes(input: &str) -> String {
-    input.replace("\\\"", "\"").replace("\\'", "'").to_string()
+    input
+        .trim_matches('\"')
+        .replace("\\\"", "\"")
+        .replace("\\'", "'")
 }
 
 pub struct OutputNameAttribute {
diff --git a/framework/derive/src/parse/contract_trait_parse.rs b/framework/derive/src/parse/contract_trait_parse.rs
index 1928687be5..2600b21fb4 100644
--- a/framework/derive/src/parse/contract_trait_parse.rs
+++ b/framework/derive/src/parse/contract_trait_parse.rs
@@ -10,7 +10,7 @@ use crate::{
 pub fn parse_contract_trait(
     args: proc_macro::TokenStream,
     contract_trait: &syn::ItemTrait,
-) -> ContractTrait{
+) -> ContractTrait {
     validate_attribute_args(args);
 
     let docs = extract_doc(contract_trait.attrs.as_slice());
@@ -48,4 +48,4 @@ pub fn parse_contract_trait(
         methods,
         trait_attributes,
     }
-}
\ No newline at end of file
+}
diff --git a/framework/derive/src/parse/parse_util.rs b/framework/derive/src/parse/parse_util.rs
index 3b63574afe..ddc47c6c8f 100644
--- a/framework/derive/src/parse/parse_util.rs
+++ b/framework/derive/src/parse/parse_util.rs
@@ -3,4 +3,4 @@ pub fn validate_attribute_args(args: proc_macro::TokenStream) {
         args.is_empty(),
         "No arguments expected in contract, module or proxy annotation."
     );
-}
\ No newline at end of file
+}

From 8711ee587ebe503233cb13e125897fb6e7d7095b Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Mon, 11 Dec 2023 16:16:39 +0200
Subject: [PATCH 0156/1254] clippy and fmt

---
 framework/wasm-adapter/src/api/blockchain_api_node.rs | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/framework/wasm-adapter/src/api/blockchain_api_node.rs b/framework/wasm-adapter/src/api/blockchain_api_node.rs
index cd04d8f291..e5a5d55f79 100644
--- a/framework/wasm-adapter/src/api/blockchain_api_node.rs
+++ b/framework/wasm-adapter/src/api/blockchain_api_node.rs
@@ -1,11 +1,8 @@
-use crate::{
-    api::{
-        managed_types::managed_buffer_api_node::{
-            unsafe_buffer_load_address, unsafe_buffer_load_token_identifier,
-        },
-        VmApiImpl,
+use crate::api::{
+    managed_types::managed_buffer_api_node::{
+        unsafe_buffer_load_address, unsafe_buffer_load_token_identifier,
     },
-    error_hook,
+    VmApiImpl,
 };
 use multiversx_sc::{
     api::{BlockchainApi, BlockchainApiImpl, ManagedBufferApiImpl, RawHandle},

From 3e912f254cc1d4cb340aff768417783531d8b6fa Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 12 Dec 2023 17:02:03 +0200
Subject: [PATCH 0157/1254] github actions rust version update

---
 .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 f365a7322c..22607fe88f 100644
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -15,7 +15,7 @@ jobs:
     name: Contracts
     uses: multiversx/mx-sc-actions/.github/workflows/contracts.yml@v2.3.3
     with:
-      rust-toolchain: nightly-2023-05-26
+      rust-toolchain: nightly-2023-12-11
       vmtools-version: v1.5.19
     secrets:
       token: ${{ secrets.GITHUB_TOKEN }}

From 35dec3f23279ba838dd3a163b7ec210df9dabb8c Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 12 Dec 2023 17:39:03 +0200
Subject: [PATCH 0158/1254] cleanup

---
 contracts/examples/digital-cash/src/signature_operations.rs     | 2 +-
 framework/meta/src/abi_json/contract_abi_json.rs                | 2 +-
 framework/meta/src/cmd/standalone/template/template_source.rs   | 2 +-
 .../scenario/src/scenario/model/transaction/tx_response.rs      | 2 +-
 vm/src/tx_execution.rs                                          | 2 --
 5 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/contracts/examples/digital-cash/src/signature_operations.rs b/contracts/examples/digital-cash/src/signature_operations.rs
index f02c1c7cb8..865276fb72 100644
--- a/contracts/examples/digital-cash/src/signature_operations.rs
+++ b/contracts/examples/digital-cash/src/signature_operations.rs
@@ -3,7 +3,7 @@ multiversx_sc::derive_imports!();
 
 use crate::{constants::*, helpers, storage};
 
-pub use multiversx_sc::api::{ED25519_KEY_BYTE_LEN, ED25519_SIGNATURE_BYTE_LEN};
+pub use multiversx_sc::api::ED25519_SIGNATURE_BYTE_LEN;
 
 #[multiversx_sc::module]
 pub trait SignatureOperationsModule: storage::StorageModule + helpers::HelpersModule {
diff --git a/framework/meta/src/abi_json/contract_abi_json.rs b/framework/meta/src/abi_json/contract_abi_json.rs
index 6bb5dfeecf..c4f62916c3 100644
--- a/framework/meta/src/abi_json/contract_abi_json.rs
+++ b/framework/meta/src/abi_json/contract_abi_json.rs
@@ -47,7 +47,7 @@ impl From<&ContractAbi> for ContractAbiJson {
             build_info: Some(BuildInfoAbiJson::from(&abi.build_info)),
             docs: abi.docs.iter().map(|d| d.to_string()).collect(),
             name: abi.name.to_string(),
-            constructor: abi.constructors.get(0).map(ConstructorAbiJson::from),
+            constructor: abi.constructors.first().map(ConstructorAbiJson::from),
             endpoints: abi.endpoints.iter().map(EndpointAbiJson::from).collect(),
             promises_callback_names: abi
                 .promise_callbacks
diff --git a/framework/meta/src/cmd/standalone/template/template_source.rs b/framework/meta/src/cmd/standalone/template/template_source.rs
index 94032a9398..4637d26b11 100644
--- a/framework/meta/src/cmd/standalone/template/template_source.rs
+++ b/framework/meta/src/cmd/standalone/template/template_source.rs
@@ -28,7 +28,7 @@ impl<'a> TemplateSource<'a> {
 
 pub fn template_sources(repo_temp_dir: &RepoSource) -> Vec<TemplateSource<'_>> {
     let templates_path = repo_temp_dir.repo_path().join(TEMPLATES_PATH_IN_REPO);
-    let dirs = RelevantDirectories::find_all(&templates_path, &[]);
+    let dirs = RelevantDirectories::find_all(templates_path, &[]);
     let mut sources = Vec::new();
     for dir in dirs.iter_contract_crates() {
         let template_metadata_path = dir.path.join(TEMPLATE_TOML_FILE_NAME);
diff --git a/framework/scenario/src/scenario/model/transaction/tx_response.rs b/framework/scenario/src/scenario/model/transaction/tx_response.rs
index 065d51f9cc..ef9891b4f2 100644
--- a/framework/scenario/src/scenario/model/transaction/tx_response.rs
+++ b/framework/scenario/src/scenario/model/transaction/tx_response.rs
@@ -163,7 +163,7 @@ impl TxResponse {
                 return self;
             }
 
-            let address_raw = base64_decode(topics.unwrap().get(0).unwrap());
+            let address_raw = base64_decode(topics.unwrap().first().unwrap());
 
             let address: Address = Address::from_slice(address_raw.as_slice());
             self.new_deployed_address = Some(address);
diff --git a/vm/src/tx_execution.rs b/vm/src/tx_execution.rs
index e3dd718cc3..f81b94ffce 100644
--- a/vm/src/tx_execution.rs
+++ b/vm/src/tx_execution.rs
@@ -9,7 +9,5 @@ mod system_sc;
 pub use blockchain_vm::{BlockchainVM, BlockchainVMRef};
 pub use builtin_function_mocks::*;
 pub use exec_call::*;
-pub use exec_contract_endpoint::*;
-pub use exec_create::*;
 pub(crate) use exec_general_tx::*;
 pub use system_sc::*;

From 02d1084b4adbba9e27d46a507bd5a569f6df5989 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 12 Dec 2023 18:22:10 +0200
Subject: [PATCH 0159/1254] upgrade wasmparser to 0.118.1

---
 Cargo.lock                | 455 ++++++++++++++++++++++----------------
 framework/meta/Cargo.toml |   2 +-
 2 files changed, 266 insertions(+), 191 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6f31de5275..2ce7f45c8a 100755
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -117,9 +117,9 @@ checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5"
 
 [[package]]
 name = "anstream"
-version = "0.6.4"
+version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44"
+checksum = "d664a92ecae85fd0a7392615844904654d1d5f5514837f471ddef4a057aba1b6"
 dependencies = [
  "anstyle",
  "anstyle-parse",
@@ -137,30 +137,30 @@ checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87"
 
 [[package]]
 name = "anstyle-parse"
-version = "0.2.2"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140"
+checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c"
 dependencies = [
  "utf8parse",
 ]
 
 [[package]]
 name = "anstyle-query"
-version = "1.0.0"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b"
+checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648"
 dependencies = [
- "windows-sys",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "anstyle-wincon"
-version = "3.0.1"
+version = "3.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628"
+checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7"
 dependencies = [
  "anstyle",
- "windows-sys",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -327,9 +327,9 @@ dependencies = [
 
 [[package]]
 name = "bstr"
-version = "1.7.0"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c79ad7fb2dd38f3dabd76b09c6a5a20c038fc0213ef1e9afd30eb777f120f019"
+checksum = "542f33a8835a0884b006a0c3df3dadd99c0c3f296ed26c2fdc8028e01ad6230c"
 dependencies = [
  "memchr",
  "serde",
@@ -421,9 +421,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.4.7"
+version = "4.4.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac495e00dcec98c83465d5ad66c5c4fabd652fd6686e7c6269b117e729a6f17b"
+checksum = "bfaff671f6b22ca62406885ece523383b9b64022e341e53e009a62ebc47a45f2"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -431,9 +431,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.4.7"
+version = "4.4.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c77ed9a32a62e6ca27175d00d29d05ca32e396ea1eb5fb01d8256b669cec7663"
+checksum = "a216b506622bb1d316cd51328dce24e07bdff4a6128a47c7e7fad11878d5adbb"
 dependencies = [
  "anstream",
  "anstyle",
@@ -467,13 +467,12 @@ checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
 
 [[package]]
 name = "colored"
-version = "2.0.4"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2674ec482fbc38012cf31e6c42ba0177b431a0cb6f15fe40efa5aab1bda516f6"
+checksum = "cbf2150cce219b664a8a70df7a1f933836724b503f8a413af9365b4dcc4d90b8"
 dependencies = [
- "is-terminal",
  "lazy_static",
- "windows-sys",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -525,9 +524,9 @@ dependencies = [
 
 [[package]]
 name = "core-foundation"
-version = "0.9.3"
+version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146"
+checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -535,9 +534,9 @@ dependencies = [
 
 [[package]]
 name = "core-foundation-sys"
-version = "0.8.4"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"
+checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
 
 [[package]]
 name = "cpufeatures"
@@ -557,6 +556,30 @@ dependencies = [
  "cfg-if",
 ]
 
+[[package]]
+name = "crossbeam-deque"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef"
+dependencies = [
+ "cfg-if",
+ "crossbeam-epoch",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-epoch"
+version = "0.9.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7"
+dependencies = [
+ "autocfg",
+ "cfg-if",
+ "crossbeam-utils",
+ "memoffset",
+ "scopeguard",
+]
+
 [[package]]
 name = "crossbeam-utils"
 version = "0.8.16"
@@ -721,14 +744,15 @@ dependencies = [
 
 [[package]]
 name = "ed25519-dalek"
-version = "2.0.0"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7277392b266383ef8396db7fdeb1e77b6c52fed775f5df15bb24f35b72156980"
+checksum = "1f628eaec48bfd21b865dc2950cfa014450c01d2fa2b69a86c2fd5844ec523c0"
 dependencies = [
  "curve25519-dalek",
  "ed25519",
  "serde",
  "sha2",
+ "subtle",
  "zeroize",
 ]
 
@@ -772,9 +796,9 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "env_logger"
-version = "0.10.0"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0"
+checksum = "95b3f3e67048839cb0d0781f445682a35113da7121f7c949db0e2be96a4fbece"
 dependencies = [
  "humantime",
  "is-terminal",
@@ -873,12 +897,12 @@ dependencies = [
 
 [[package]]
 name = "errno"
-version = "0.3.5"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860"
+checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245"
 dependencies = [
  "libc",
- "windows-sys",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -955,9 +979,9 @@ checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5"
 
 [[package]]
 name = "fiat-crypto"
-version = "0.2.2"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a481586acf778f1b1455424c343f71124b048ffa5f4fc3f8f6ae9dc432dcb3c7"
+checksum = "27573eac26f4dd11e2b1916c3fe1baa56407c83c71a773a8ba17ec0bca03b6b7"
 
 [[package]]
 name = "first-contract"
@@ -1009,9 +1033,9 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
 
 [[package]]
 name = "form_urlencoded"
-version = "1.2.0"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652"
+checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456"
 dependencies = [
  "percent-encoding",
 ]
@@ -1201,9 +1225,9 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.2.10"
+version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427"
+checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -1214,28 +1238,28 @@ dependencies = [
 
 [[package]]
 name = "gimli"
-version = "0.28.0"
+version = "0.28.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0"
+checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
 
 [[package]]
 name = "globset"
-version = "0.4.13"
+version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "759c97c1e17c55525b57192c06a267cda0ac5210b222d6b82189a2338fa1c13d"
+checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1"
 dependencies = [
  "aho-corasick",
  "bstr",
- "fnv",
  "log",
- "regex",
+ "regex-automata",
+ "regex-syntax",
 ]
 
 [[package]]
 name = "h2"
-version = "0.3.21"
+version = "0.3.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833"
+checksum = "4d6250322ef6e60f93f9a2162799302cd6f68f79f6e5d85c8c16f14d1d958178"
 dependencies = [
  "bytes",
  "fnv",
@@ -1243,7 +1267,7 @@ dependencies = [
  "futures-sink",
  "futures-util",
  "http",
- "indexmap 1.9.3",
+ "indexmap",
  "slab",
  "tokio",
  "tokio-util",
@@ -1252,15 +1276,9 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.12.3"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
-
-[[package]]
-name = "hashbrown"
-version = "0.14.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 dependencies = [
  "ahash",
  "allocator-api2",
@@ -1301,9 +1319,9 @@ dependencies = [
 
 [[package]]
 name = "http"
-version = "0.2.9"
+version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482"
+checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb"
 dependencies = [
  "bytes",
  "fnv",
@@ -1312,9 +1330,9 @@ dependencies = [
 
 [[package]]
 name = "http-body"
-version = "0.4.5"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1"
+checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2"
 dependencies = [
  "bytes",
  "http",
@@ -1378,9 +1396,9 @@ dependencies = [
 
 [[package]]
 name = "idna"
-version = "0.4.0"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c"
+checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
 dependencies = [
  "unicode-bidi",
  "unicode-normalization",
@@ -1388,31 +1406,20 @@ dependencies = [
 
 [[package]]
 name = "ignore"
-version = "0.4.20"
+version = "0.4.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbe7873dab538a9a44ad79ede1faf5f30d49f9a5c883ddbab48bce81b64b7492"
+checksum = "747ad1b4ae841a78e8aba0d63adbfbeaea26b517b63705d47856b73015d27060"
 dependencies = [
+ "crossbeam-deque",
  "globset",
- "lazy_static",
  "log",
  "memchr",
- "regex",
+ "regex-automata",
  "same-file",
- "thread_local",
  "walkdir",
  "winapi-util",
 ]
 
-[[package]]
-name = "indexmap"
-version = "1.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
-dependencies = [
- "autocfg",
- "hashbrown 0.12.3",
-]
-
 [[package]]
 name = "indexmap"
 version = "2.1.0"
@@ -1420,7 +1427,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f"
 dependencies = [
  "equivalent",
- "hashbrown 0.14.2",
+ "hashbrown",
 ]
 
 [[package]]
@@ -1451,7 +1458,7 @@ checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b"
 dependencies = [
  "hermit-abi",
  "rustix",
- "windows-sys",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -1465,15 +1472,15 @@ dependencies = [
 
 [[package]]
 name = "itoa"
-version = "1.0.9"
+version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38"
+checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c"
 
 [[package]]
 name = "js-sys"
-version = "0.3.65"
+version = "0.3.66"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54c0c35952f67de54bb584e9fd912b3023117cbafc0a77d8f3dee1fb5f572fe8"
+checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -1574,9 +1581,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
 name = "libc"
-version = "0.2.149"
+version = "0.2.151"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b"
+checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4"
 
 [[package]]
 name = "linked-list-repeat"
@@ -1597,9 +1604,9 @@ dependencies = [
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.4.10"
+version = "0.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f"
+checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456"
 
 [[package]]
 name = "local-esdt-and-nft"
@@ -1706,6 +1713,15 @@ version = "2.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167"
 
+[[package]]
+name = "memoffset"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c"
+dependencies = [
+ "autocfg",
+]
+
 [[package]]
 name = "mime"
 version = "0.3.17"
@@ -1723,13 +1739,13 @@ dependencies = [
 
 [[package]]
 name = "mio"
-version = "0.8.9"
+version = "0.8.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0"
+checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09"
 dependencies = [
  "libc",
  "wasi",
- "windows-sys",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -1847,7 +1863,7 @@ name = "multiversx-sc"
 version = "0.45.1"
 dependencies = [
  "bitflags 2.4.1",
- "hashbrown 0.14.2",
+ "hashbrown",
  "hex-literal",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
@@ -2143,15 +2159,15 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "openssl"
-version = "0.10.59"
+version = "0.10.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a257ad03cd8fb16ad4172fedf8094451e1af1c4b70097636ef2eac9a5f0cc33"
+checksum = "6b8419dc8cc6d866deb801274bba2e6f8f6108c1bb7fcc10ee5ab864931dbb45"
 dependencies = [
  "bitflags 2.4.1",
  "cfg-if",
@@ -2181,9 +2197,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.95"
+version = "0.9.97"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40a4130519a360279579c2053038317e40eff64d13fd3f004f9e1b72b8a6aaf9"
+checksum = "c3eaad34cdd97d81de97964fc7f29e2d104f483840d906ef56daa1912338460b"
 dependencies = [
  "cc",
  "libc",
@@ -2269,7 +2285,7 @@ dependencies = [
  "libc",
  "redox_syscall",
  "smallvec",
- "windows-targets",
+ "windows-targets 0.48.5",
 ]
 
 [[package]]
@@ -2305,9 +2321,9 @@ dependencies = [
 
 [[package]]
 name = "pem"
-version = "3.0.2"
+version = "3.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3163d2912b7c3b52d651a055f2c7eec9ba5cd22d26ef75b8dd3a59980b185923"
+checksum = "1b8fcc794035347fb64beda2d3b462595dd2753e3f268d89c5aae77e8cf2c310"
 dependencies = [
  "base64",
  "serde",
@@ -2315,9 +2331,9 @@ dependencies = [
 
 [[package]]
 name = "percent-encoding"
-version = "2.3.0"
+version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94"
+checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
 
 [[package]]
 name = "pin-project-lite"
@@ -2377,9 +2393,9 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.69"
+version = "1.0.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
 dependencies = [
  "unicode-ident",
 ]
@@ -2712,22 +2728,22 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.38.21"
+version = "0.38.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3"
+checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316"
 dependencies = [
  "bitflags 2.4.1",
  "errno",
  "libc",
  "linux-raw-sys",
- "windows-sys",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "ryu"
-version = "1.0.15"
+version = "1.0.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741"
+checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c"
 
 [[package]]
 name = "same-file"
@@ -2744,7 +2760,7 @@ version = "0.1.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88"
 dependencies = [
- "windows-sys",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -2834,18 +2850,18 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.190"
+version = "1.0.193"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91d3c334ca1ee894a2c6f6ad698fe8c435b76d504b13d436f0685d648d6d96f7"
+checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.190"
+version = "1.0.193"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67c5609f394e5c2bd7fc51efda478004ea80ef42fee983d5c67a65e34f32c0e3"
+checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2858,7 +2874,7 @@ version = "1.0.108"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b"
 dependencies = [
- "indexmap 2.1.0",
+ "indexmap",
  "itoa",
  "ryu",
  "serde",
@@ -2945,9 +2961,12 @@ dependencies = [
 
 [[package]]
 name = "signature"
-version = "2.1.0"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e1788eed21689f9cf370582dfc467ef36ed9c707f073528ddafa8d83e3b8500"
+checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de"
+dependencies = [
+ "rand_core",
+]
 
 [[package]]
 name = "single-value-repeat"
@@ -2977,9 +2996,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.1"
+version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
+checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "socket2"
@@ -2998,14 +3017,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9"
 dependencies = [
  "libc",
- "windows-sys",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
 name = "spki"
-version = "0.7.2"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d1e996ef02c474957d681f1b05213dfb0abab947b446a62d37770b23500184a"
+checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d"
 dependencies = [
  "base64ct",
  "der",
@@ -3035,15 +3054,15 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
 
 [[package]]
 name = "subtle"
-version = "2.4.1"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
+checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc"
 
 [[package]]
 name = "syn"
-version = "2.0.39"
+version = "2.0.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
+checksum = "13fa70a4ee923979ffb522cacce59d34421ebdea5625e1073c4326ef9d2dd42e"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3081,28 +3100,18 @@ dependencies = [
  "fastrand",
  "redox_syscall",
  "rustix",
- "windows-sys",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
 name = "termcolor"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6093bad37da69aab9d123a8091e4be0aa4a03e4d601ec641c327398315f62b64"
+checksum = "ff1bc3d3f05aff0403e8ac0d92ced918ec05b666a43f83297ccef5bea8a3d449"
 dependencies = [
  "winapi-util",
 ]
 
-[[package]]
-name = "thread_local"
-version = "1.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152"
-dependencies = [
- "cfg-if",
- "once_cell",
-]
-
 [[package]]
 name = "tinyvec"
 version = "1.6.0"
@@ -3136,9 +3145,9 @@ dependencies = [
 
 [[package]]
 name = "tokio"
-version = "1.33.0"
+version = "1.35.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653"
+checksum = "841d45b238a16291a4e1584e61820b8ae57d696cc5015c459c229ccc6990cc1c"
 dependencies = [
  "backtrace",
  "bytes",
@@ -3150,14 +3159,14 @@ dependencies = [
  "signal-hook-registry",
  "socket2 0.5.5",
  "tokio-macros",
- "windows-sys",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
 name = "tokio-macros"
-version = "2.1.0"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
+checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3190,11 +3199,11 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.8.6"
+version = "0.8.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ff9e3abce27ee2c9a37f9ad37238c1bdd4e789c84ba37df76aa4d528f5072cc"
+checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35"
 dependencies = [
- "indexmap 2.1.0",
+ "indexmap",
  "serde",
  "serde_spanned",
  "toml_datetime",
@@ -3212,11 +3221,11 @@ dependencies = [
 
 [[package]]
 name = "toml_edit"
-version = "0.20.7"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81"
+checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03"
 dependencies = [
- "indexmap 2.1.0",
+ "indexmap",
  "serde",
  "serde_spanned",
  "toml_datetime",
@@ -3268,9 +3277,9 @@ dependencies = [
 
 [[package]]
 name = "try-lock"
-version = "0.2.4"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed"
+checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
 
 [[package]]
 name = "typenum"
@@ -3280,9 +3289,9 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
 
 [[package]]
 name = "unicode-bidi"
-version = "0.3.13"
+version = "0.3.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460"
+checksum = "6f2528f27a9eb2b21e69c95319b30bd0efd85d09c379741b0f78ea1d86be2416"
 
 [[package]]
 name = "unicode-ident"
@@ -3307,9 +3316,9 @@ checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36"
 
 [[package]]
 name = "url"
-version = "2.4.1"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5"
+checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633"
 dependencies = [
  "form_urlencoded",
  "idna",
@@ -3412,9 +3421,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.88"
+version = "0.2.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7daec296f25a1bae309c0cd5c29c4b260e510e6d813c286b19eaadf409d40fce"
+checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e"
 dependencies = [
  "cfg-if",
  "wasm-bindgen-macro",
@@ -3422,9 +3431,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.88"
+version = "0.2.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e397f4664c0e4e428e8313a469aaa58310d302159845980fd23b0f22a847f217"
+checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826"
 dependencies = [
  "bumpalo",
  "log",
@@ -3437,9 +3446,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.38"
+version = "0.4.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9afec9963e3d0994cac82455b2b3502b81a7f40f9a0d32181f7528d9f4b43e02"
+checksum = "ac36a15a220124ac510204aec1c3e5db8a22ab06fd6706d881dc6149f8ed9a12"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -3449,9 +3458,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.88"
+version = "0.2.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5961017b3b08ad5f3fe39f1e79877f8ee7c23c5e5fd5eb80de95abc41f1f16b2"
+checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -3459,9 +3468,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.88"
+version = "0.2.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5353b8dab669f5e10f5bd76df26a9360c748f054f862ff5f3f8aae0c7fb3907"
+checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3472,25 +3481,25 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.88"
+version = "0.2.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d046c5d029ba91a1ed14da14dca44b68bf2f124cfbaf741c54151fdb3e0750b"
+checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f"
 
 [[package]]
 name = "wasmparser"
-version = "0.116.0"
+version = "0.118.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53290b1276c5c2d47d694fb1a920538c01f51690e7e261acbe1d10c5fc306ea1"
+checksum = "95ee9723b928e735d53000dec9eae7b07a60e490c85ab54abb66659fc61bfcd9"
 dependencies = [
- "indexmap 2.1.0",
+ "indexmap",
  "semver",
 ]
 
 [[package]]
 name = "wasmprinter"
-version = "0.2.71"
+version = "0.2.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f98260aa20f939518bcec1fac32c78898d5c68872e7363a4651f21f791b6c7e"
+checksum = "3d027eb8294904fc715ac0870cebe6b0271e96b90605ee21511e7565c4ce568c"
 dependencies = [
  "anyhow",
  "wasmparser",
@@ -3498,9 +3507,9 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.65"
+version = "0.3.66"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5db499c5f66323272151db0e666cd34f78617522fb0c1604d31a27c50c206a85"
+checksum = "50c24a44ec86bb68fbecd1b3efed7e85ea5621b39b35ef2766b66cd984f8010f"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -3543,7 +3552,16 @@ version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
 dependencies = [
- "windows-targets",
+ "windows-targets 0.48.5",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+dependencies = [
+ "windows-targets 0.52.0",
 ]
 
 [[package]]
@@ -3552,13 +3570,28 @@ version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
 dependencies = [
- "windows_aarch64_gnullvm",
- "windows_aarch64_msvc",
- "windows_i686_gnu",
- "windows_i686_msvc",
- "windows_x86_64_gnu",
- "windows_x86_64_gnullvm",
- "windows_x86_64_msvc",
+ "windows_aarch64_gnullvm 0.48.5",
+ "windows_aarch64_msvc 0.48.5",
+ "windows_i686_gnu 0.48.5",
+ "windows_i686_msvc 0.48.5",
+ "windows_x86_64_gnu 0.48.5",
+ "windows_x86_64_gnullvm 0.48.5",
+ "windows_x86_64_msvc 0.48.5",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd"
+dependencies = [
+ "windows_aarch64_gnullvm 0.52.0",
+ "windows_aarch64_msvc 0.52.0",
+ "windows_i686_gnu 0.52.0",
+ "windows_i686_msvc 0.52.0",
+ "windows_x86_64_gnu 0.52.0",
+ "windows_x86_64_gnullvm 0.52.0",
+ "windows_x86_64_msvc 0.52.0",
 ]
 
 [[package]]
@@ -3567,47 +3600,89 @@ version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
 
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea"
+
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
 
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef"
+
 [[package]]
 name = "windows_i686_gnu"
 version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
 
+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313"
+
 [[package]]
 name = "windows_i686_msvc"
 version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
 
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a"
+
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
 
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd"
+
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
 
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e"
+
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
 
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
+
 [[package]]
 name = "winnow"
-version = "0.5.19"
+version = "0.5.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "829846f3e3db426d4cee4510841b71a8e58aa2a76b1132579487ae430ccd9c7b"
+checksum = "6c830786f7720c2fd27a1a0e27a709dbd3c4d009b56d098fc742d4f4eab91fe2"
 dependencies = [
  "memchr",
 ]
@@ -3619,23 +3694,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1"
 dependencies = [
  "cfg-if",
- "windows-sys",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
 name = "zerocopy"
-version = "0.7.25"
+version = "0.7.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8cd369a67c0edfef15010f980c3cbe45d7f651deac2cd67ce097cd801de16557"
+checksum = "306dca4455518f1f31635ec308b6b3e4eb1b11758cefafc782827d0aa7acb5c7"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.25"
+version = "0.7.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2f140bda219a26ccc0cdb03dba58af72590c53b22642577d88a927bc5c87d6b"
+checksum = "be912bf68235a88fbefd1b73415cb218405958d1655b2ece9035a19920bdf6ba"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3644,9 +3719,9 @@ dependencies = [
 
 [[package]]
 name = "zeroize"
-version = "1.6.0"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9"
+checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d"
 
 [[package]]
 name = "zip"
diff --git a/framework/meta/Cargo.toml b/framework/meta/Cargo.toml
index 651aabbb16..3bf45cb721 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.116.0"
+wasmparser = "0.118.1"
 wasmprinter = "0.2.71"
 
 ruplacer = { version = "0.8.1", default-features = false, optional = true }

From 2ff60c44c892d60dff784a1631dec6b627d83ffc Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Wed, 13 Dec 2023 22:42:31 +0200
Subject: [PATCH 0160/1254] Update wasm crate manually for version < 0.45.1.

---
 .../standalone/template/contract_creator.rs   | 11 +++----
 .../cmd/standalone/template/repo_version.rs   |  9 ++++++
 .../standalone/template/template_adjuster.rs  | 30 ++++++++++++++++++-
 framework/meta/tests/template_test.rs         |  6 ++--
 4 files changed, 47 insertions(+), 9 deletions(-)

diff --git a/framework/meta/src/cmd/standalone/template/contract_creator.rs b/framework/meta/src/cmd/standalone/template/contract_creator.rs
index 5b7932492e..d8f1caabd2 100644
--- a/framework/meta/src/cmd/standalone/template/contract_creator.rs
+++ b/framework/meta/src/cmd/standalone/template/contract_creator.rs
@@ -11,12 +11,13 @@ 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 repo_temp_download = RepoSource::download_from_github(version, std::env::temp_dir());
     let target = target_from_args(args);
 
     let creator = ContractCreator::new(&repo_temp_download, args.template.clone(), target, false);
 
-    creator.create_contract();
+    creator.create_contract(version_tag);
 }
 
 fn target_from_args(args: &TemplateArgs) -> ContractCreatorTarget {
@@ -71,9 +72,9 @@ impl<'a> ContractCreator<'a> {
         }
     }
 
-    pub fn create_contract(&self) {
+    pub fn create_contract(&self, args_tag: String) {
         self.copy_template();
-        self.update_dependencies();
+        self.update_dependencies(args_tag);
         self.rename_template();
     }
 
@@ -82,8 +83,8 @@ impl<'a> ContractCreator<'a> {
             .copy_template(self.target.contract_dir());
     }
 
-    pub fn update_dependencies(&self) {
-        self.adjuster.update_dependencies();
+    pub fn update_dependencies(&self, args_tag: String) {
+        self.adjuster.update_dependencies(args_tag);
     }
 
     pub fn rename_template(&self) {
diff --git a/framework/meta/src/cmd/standalone/template/repo_version.rs b/framework/meta/src/cmd/standalone/template/repo_version.rs
index 3eb798a66f..150c2bebc3 100644
--- a/framework/meta/src/cmd/standalone/template/repo_version.rs
+++ b/framework/meta/src/cmd/standalone/template/repo_version.rs
@@ -1,3 +1,5 @@
+use crate::version_history::LAST_TEMPLATE_VERSION;
+
 pub enum RepoVersion {
     Master,
     Tag(String),
@@ -23,4 +25,11 @@ impl RepoVersion {
             },
         }
     }
+
+    pub fn get_tag(&self) -> String {
+        match self {
+            RepoVersion::Master => LAST_TEMPLATE_VERSION.to_string(),
+            RepoVersion::Tag(tag) => tag.to_string(),
+        }
+    }
 }
diff --git a/framework/meta/src/cmd/standalone/template/template_adjuster.rs b/framework/meta/src/cmd/standalone/template/template_adjuster.rs
index 188871f0e0..7c23471766 100644
--- a/framework/meta/src/cmd/standalone/template/template_adjuster.rs
+++ b/framework/meta/src/cmd/standalone/template/template_adjuster.rs
@@ -5,11 +5,14 @@ use crate::{
 };
 use convert_case::{Case, Casing};
 use ruplacer::Query;
+use rustc_version::Version;
 use toml::value::Table;
 
 const TEST_DIRECTORY: &str = "./tests";
 const ROOT_CARGO_TOML: &str = "./Cargo.toml";
 const META_CARGO_TOML: &str = "./meta/Cargo.toml";
+const WASM_CARGO_TOML: &str = "./wasm/Cargo.toml";
+const TARGET_VERSION_0_45_1: Version = Version::new(0, 45, 1);
 
 pub struct TemplateAdjuster {
     pub metadata: TemplateMetadata,
@@ -17,9 +20,10 @@ pub struct TemplateAdjuster {
     pub keep_paths: bool,
 }
 impl TemplateAdjuster {
-    pub fn update_dependencies(&self) {
+    pub fn update_dependencies(&self, args_tag: String) {
         self.update_dependencies_root();
         self.update_dependencies_meta();
+        self.update_dependencies_wasm(args_tag);
     }
 
     fn update_dependencies_root(&self) {
@@ -46,6 +50,23 @@ impl TemplateAdjuster {
         toml.save_to_file(&cargo_toml_path);
     }
 
+    fn update_dependencies_wasm(&self, args_tag: String) {
+        if is_version_at_least_0_45_1(args_tag) {
+            println!(">>>>>>>>>>>>YES");
+            return;
+        }
+        println!(">>>>>>>>>>>>YESSSSSSS");
+
+        let cargo_toml_path = self.target.contract_dir().join(WASM_CARGO_TOML);
+        let mut toml = CargoTomlContents::load_from_file(&cargo_toml_path);
+
+        if !self.keep_paths {
+            remove_paths_from_deps(&mut toml, &[&self.metadata.name]);
+        }
+
+        toml.save_to_file(&cargo_toml_path);
+    }
+
     pub fn rename_template_to(&self) {
         self.rename_trait_to();
         self.rename_in_cargo_toml_root();
@@ -177,6 +198,13 @@ impl TemplateAdjuster {
     }
 }
 
+fn is_version_at_least_0_45_1(args_tag: String) -> bool {
+    match Version::parse(&args_tag) {
+        Ok(version) => version >= TARGET_VERSION_0_45_1,
+        Err(_error) => false,
+    }
+}
+
 fn wasm_file_name(name: &str) -> String {
     format!("{name}.wasm",)
 }
diff --git a/framework/meta/tests/template_test.rs b/framework/meta/tests/template_test.rs
index e7fc4b0230..631664361b 100644
--- a/framework/meta/tests/template_test.rs
+++ b/framework/meta/tests/template_test.rs
@@ -5,7 +5,7 @@ use multiversx_sc_meta::{
         template_names_from_repo, ContractCreator, ContractCreatorTarget, RepoSource, RepoVersion,
     },
     find_workspace::find_current_workspace,
-    version_history,
+    version_history::{self, LAST_TEMPLATE_VERSION},
 };
 
 const TEMPLATE_TEMP_DIR_NAME: &str = "template-test";
@@ -72,7 +72,7 @@ fn template_test_current(template_name: &str, sub_path: &str, new_name: &str) {
         target.clone(),
         true,
     )
-    .create_contract();
+    .create_contract(LAST_TEMPLATE_VERSION.to_string());
 
     if BUILD_CONTRACTS {
         build_contract(&target);
@@ -127,7 +127,7 @@ fn template_test_released(template_name: &str, new_name: &str) {
         target.clone(),
         false,
     )
-    .create_contract();
+    .create_contract(LAST_TEMPLATE_VERSION.to_string());
 
     if BUILD_CONTRACTS {
         build_contract(&target);

From 199f4e1775153ed2fd40139f671f0529c86cdd78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Costin=20Caraba=C8=99?= <costin.carabas@gmail.com>
Date: Thu, 14 Dec 2023 12:27:33 +0200
Subject: [PATCH 0161/1254] Back transfers: Add test that catches the problem

The bug is when making multiple sync calls, the esdts from back transfers are not cleaned.
---
 .../promises-features/src/call_sync_bt.rs     | 46 +++++++++++++++++++
 .../tests/promises_feature_blackbox_test.rs   | 28 +++++++++++
 2 files changed, 74 insertions(+)

diff --git a/contracts/feature-tests/composability/promises-features/src/call_sync_bt.rs b/contracts/feature-tests/composability/promises-features/src/call_sync_bt.rs
index 9c9b293bbc..2476ab482d 100644
--- a/contracts/feature-tests/composability/promises-features/src/call_sync_bt.rs
+++ b/contracts/feature-tests/composability/promises-features/src/call_sync_bt.rs
@@ -14,12 +14,58 @@ pub trait BackTransfersFeatureModule {
         token_nonce: u64,
         amount: BigUint,
     ) {
+        let ((), back_transfers) = self
+            .vault_proxy()
+            .contract(to.clone())
+            .retrieve_funds(token.clone(), token_nonce, amount.clone())
+            .execute_on_dest_context_with_back_transfers::<()>();
+
+        require!(
+            back_transfers.esdt_payments.len() == 1,
+            "Only one ESDT payment expected"
+        );
+
+        self.back_transfers_event(
+            &back_transfers.total_egld_amount,
+            &back_transfers.esdt_payments.into_multi_value(),
+        );
+    }
+
+    #[endpoint]
+    fn forward_sync_retrieve_funds_multi_call_bt(
+        &self,
+        to: ManagedAddress,
+        token: EgldOrEsdtTokenIdentifier,
+        token_nonce: u64,
+        amount: BigUint,
+    ) {
+        let ((), back_transfers) = self
+            .vault_proxy()
+            .contract(to.clone())
+            .retrieve_funds(token.clone(), token_nonce, amount.clone())
+            .execute_on_dest_context_with_back_transfers::<()>();
+
+        require!(
+            back_transfers.esdt_payments.len() == 1,
+            "Only one ESDT payment expected"
+        );
+
+        self.back_transfers_event(
+            &back_transfers.total_egld_amount,
+            &back_transfers.esdt_payments.into_multi_value(),
+        );
+
         let ((), back_transfers) = self
             .vault_proxy()
             .contract(to)
             .retrieve_funds(token, token_nonce, amount)
             .execute_on_dest_context_with_back_transfers::<()>();
 
+        require!(
+            back_transfers.esdt_payments.len() == 1,
+            "Only one ESDT payment expected"
+        );
+
         self.back_transfers_event(
             &back_transfers.total_egld_amount,
             &back_transfers.esdt_payments.into_multi_value(),
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 eb04c5e19f..4da6461dca 100644
--- a/contracts/feature-tests/composability/tests/promises_feature_blackbox_test.rs
+++ b/contracts/feature-tests/composability/tests/promises_feature_blackbox_test.rs
@@ -98,3 +98,31 @@ fn test_back_transfers() {
             CheckAccount::new().esdt_balance(TOKEN_ID_EXPR, token_amount),
         ));
 }
+
+#[test]
+fn test_multi_call_back_transfers() {
+    let mut state = PromisesFeaturesTestState::new();
+    let token_amount = BigUint::from(1000u64);
+    let half_token_amount = token_amount.clone() / 2u64;
+    let vault_address = state.vault_contract.to_address();
+
+    state.world.sc_call(
+        ScCallStep::new().from(USER_ADDRESS_EXPR).call(
+            state
+                .promises_features_contract
+                .forward_sync_retrieve_funds_multi_call_bt(
+                    vault_address.clone(),
+                    TOKEN_ID,
+                    0u64,
+                    &half_token_amount,
+                ),
+        ),
+    );
+
+    state
+        .world
+        .check_state_step(CheckStateStep::new().put_account(
+            state.promises_features_contract,
+            CheckAccount::new().esdt_balance(TOKEN_ID_EXPR, token_amount),
+        ));
+}

From 10d48c1b1a8e90fd01a3638ed699c8f31370c55c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Costin=20Caraba=C8=99?= <costin.carabas@gmail.com>
Date: Thu, 14 Dec 2023 13:06:27 +0200
Subject: [PATCH 0162/1254] Fix test

---
 .../composability/promises-features/src/call_sync_bt.rs     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/contracts/feature-tests/composability/promises-features/src/call_sync_bt.rs b/contracts/feature-tests/composability/promises-features/src/call_sync_bt.rs
index 2476ab482d..bc94257c6e 100644
--- a/contracts/feature-tests/composability/promises-features/src/call_sync_bt.rs
+++ b/contracts/feature-tests/composability/promises-features/src/call_sync_bt.rs
@@ -21,7 +21,7 @@ pub trait BackTransfersFeatureModule {
             .execute_on_dest_context_with_back_transfers::<()>();
 
         require!(
-            back_transfers.esdt_payments.len() == 1,
+            back_transfers.esdt_payments.len() == 1 || back_transfers.total_egld_amount != 0,
             "Only one ESDT payment expected"
         );
 
@@ -46,7 +46,7 @@ pub trait BackTransfersFeatureModule {
             .execute_on_dest_context_with_back_transfers::<()>();
 
         require!(
-            back_transfers.esdt_payments.len() == 1,
+            back_transfers.esdt_payments.len() == 1 || back_transfers.total_egld_amount != 0,
             "Only one ESDT payment expected"
         );
 
@@ -62,7 +62,7 @@ pub trait BackTransfersFeatureModule {
             .execute_on_dest_context_with_back_transfers::<()>();
 
         require!(
-            back_transfers.esdt_payments.len() == 1,
+            back_transfers.esdt_payments.len() == 1 || back_transfers.total_egld_amount != 0,
             "Only one ESDT payment expected"
         );
 

From db4078bc8839657323704b39e25bde26bf89d97c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Costin=20Caraba=C8=99?= <costin.carabas@gmail.com>
Date: Thu, 14 Dec 2023 13:07:17 +0200
Subject: [PATCH 0163/1254] back-transfers fix: do not of merge back transfers

Instead of merge back transfers, create a new one.
---
 vm/src/tx_mock/tx_back_transfers.rs     | 16 +++++-----------
 vm/src/vm_hooks/vh_impl/vh_debug_api.rs |  5 +----
 2 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/vm/src/tx_mock/tx_back_transfers.rs b/vm/src/tx_mock/tx_back_transfers.rs
index c5d9b0ea6d..4f7921bf69 100644
--- a/vm/src/tx_mock/tx_back_transfers.rs
+++ b/vm/src/tx_mock/tx_back_transfers.rs
@@ -16,16 +16,13 @@ impl BackTransfers {
     }
 
     pub fn new_from_result(
+        &mut self,
         own_address: &VMAddress,
         result: &TxResult,
         builtin_functions: &BuiltinFunctionContainer,
-    ) -> Self {
+    ) {
         let mut bt = BackTransfers::default();
 
-        if result.result_status != 0 {
-            return bt;
-        }
-
         for call in &result.all_calls {
             // TODO: refactor, check type
 
@@ -41,13 +38,10 @@ impl BackTransfers {
             }
         }
 
-        bt
-    }
-
-    pub fn merge(&mut self, other: &BackTransfers) {
-        self.call_value += &other.call_value;
-        self.esdt_transfers.extend_from_slice(&other.esdt_transfers);
+        self.call_value = bt.call_value;
+        self.esdt_transfers = bt.esdt_transfers;
     }
+    
 }
 
 // func (host *vmHost) addNewBackTransfersFromVMOutput(vmOutput *vmcommon.VMOutput, parent, child []byte) {
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 cf950aff0b..004ab5cb82 100644
--- a/vm/src/vm_hooks/vh_impl/vh_debug_api.rs
+++ b/vm/src/vm_hooks/vh_impl/vh_debug_api.rs
@@ -239,10 +239,7 @@ impl DebugApiVMHooksHandler {
 
         let contract_address = &self.0.input_ref().to;
         let builtin_functions = &self.0.vm_ref.builtin_functions;
-        let current_back_transfers =
-            BackTransfers::new_from_result(contract_address, &tx_result, builtin_functions);
-
-        self.back_transfers_lock().merge(&current_back_transfers);
+        self.back_transfers_lock().new_from_result(contract_address, &tx_result, builtin_functions);
 
         tx_result.result_values
     }

From f27f67fe6d92b7d7f4fcc6b33b9765d08408b1d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Costin=20Caraba=C8=99?= <costin.carabas@gmail.com>
Date: Thu, 14 Dec 2023 19:27:30 +0200
Subject: [PATCH 0164/1254] Fixes after review

---
 .../promises-features/src/call_sync_bt.rs     |  2 +-
 .../tests/promises_feature_blackbox_test.rs   |  2 +-
 vm/src/tx_mock/tx_back_transfers.rs           | 33 -------------------
 3 files changed, 2 insertions(+), 35 deletions(-)

diff --git a/contracts/feature-tests/composability/promises-features/src/call_sync_bt.rs b/contracts/feature-tests/composability/promises-features/src/call_sync_bt.rs
index bc94257c6e..b8417acd2a 100644
--- a/contracts/feature-tests/composability/promises-features/src/call_sync_bt.rs
+++ b/contracts/feature-tests/composability/promises-features/src/call_sync_bt.rs
@@ -32,7 +32,7 @@ pub trait BackTransfersFeatureModule {
     }
 
     #[endpoint]
-    fn forward_sync_retrieve_funds_multi_call_bt(
+    fn forward_sync_retrieve_funds_bt_twice(
         &self,
         to: ManagedAddress,
         token: EgldOrEsdtTokenIdentifier,
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 4da6461dca..87b682a53f 100644
--- a/contracts/feature-tests/composability/tests/promises_feature_blackbox_test.rs
+++ b/contracts/feature-tests/composability/tests/promises_feature_blackbox_test.rs
@@ -110,7 +110,7 @@ fn test_multi_call_back_transfers() {
         ScCallStep::new().from(USER_ADDRESS_EXPR).call(
             state
                 .promises_features_contract
-                .forward_sync_retrieve_funds_multi_call_bt(
+                .forward_sync_retrieve_funds_bt_twice(
                     vault_address.clone(),
                     TOKEN_ID,
                     0u64,
diff --git a/vm/src/tx_mock/tx_back_transfers.rs b/vm/src/tx_mock/tx_back_transfers.rs
index 4f7921bf69..b6ed57600e 100644
--- a/vm/src/tx_mock/tx_back_transfers.rs
+++ b/vm/src/tx_mock/tx_back_transfers.rs
@@ -43,36 +43,3 @@ impl BackTransfers {
     }
     
 }
-
-// func (host *vmHost) addNewBackTransfersFromVMOutput(vmOutput *vmcommon.VMOutput, parent, child []byte) {
-// 	if vmOutput == nil || vmOutput.ReturnCode != vmcommon.Ok {
-// 		return
-// 	}
-// 	callerOutAcc, ok := vmOutput.OutputAccounts[string(parent)]
-// 	if !ok {
-// 		return
-// 	}
-
-// 	for _, transfer := range callerOutAcc.OutputTransfers {
-// 		if !bytes.Equal(transfer.SenderAddress, child) {
-// 			continue
-// 		}
-// 		if transfer.CallType == vm.AsynchronousCallBack {
-// 			continue
-// 		}
-
-// 		if transfer.Value.Cmp(vmhost.Zero) > 0 {
-// 			if len(transfer.Data) == 0 {
-// 				host.managedTypesContext.AddValueOnlyBackTransfer(transfer.Value)
-// 			}
-// 			continue
-// 		}
-
-// 		esdtTransfers, isWithoutExec := host.isESDTTransferWithoutExecution(transfer.Data, parent, child)
-// 		if !isWithoutExec {
-// 			continue
-// 		}
-
-// 		host.managedTypesContext.AddBackTransfers(esdtTransfers.ESDTTransfers)
-// 	}
-// }

From cbd778ee65e0a32d8f1c8a898542c774b882db7d Mon Sep 17 00:00:00 2001
From: Sorin Petreasca <petreasca.sorin@gmail.com>
Date: Fri, 15 Dec 2023 02:30:01 +0200
Subject: [PATCH 0165/1254] Make NULL_ID public in addressToId mapper

---
 framework/base/src/storage/mappers.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/framework/base/src/storage/mappers.rs b/framework/base/src/storage/mappers.rs
index a34a175352..5b39315922 100644
--- a/framework/base/src/storage/mappers.rs
+++ b/framework/base/src/storage/mappers.rs
@@ -14,7 +14,7 @@ mod user_mapper;
 mod vec_mapper;
 mod whitelist_mapper;
 
-pub use address_to_id_mapper::{AddressId, AddressToIdMapper};
+pub use address_to_id_mapper::{AddressToIdMapper, AddressId, NULL_ID};
 pub use bi_di_mapper::BiDiMapper;
 pub use linked_list_mapper::{LinkedListMapper, LinkedListNode};
 pub use map_mapper::MapMapper;

From 8ec8bd6614b3102f63d3c1878c3040e7079825f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Costin=20Caraba=C8=99?= <costin.carabas@gmail.com>
Date: Fri, 15 Dec 2023 08:42:29 +0200
Subject: [PATCH 0166/1254] Fix clippy on test

---
 .../composability/promises-features/src/call_sync_bt.rs       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/contracts/feature-tests/composability/promises-features/src/call_sync_bt.rs b/contracts/feature-tests/composability/promises-features/src/call_sync_bt.rs
index b8417acd2a..d3cc048ccc 100644
--- a/contracts/feature-tests/composability/promises-features/src/call_sync_bt.rs
+++ b/contracts/feature-tests/composability/promises-features/src/call_sync_bt.rs
@@ -16,8 +16,8 @@ pub trait BackTransfersFeatureModule {
     ) {
         let ((), back_transfers) = self
             .vault_proxy()
-            .contract(to.clone())
-            .retrieve_funds(token.clone(), token_nonce, amount.clone())
+            .contract(to)
+            .retrieve_funds(token, token_nonce, amount)
             .execute_on_dest_context_with_back_transfers::<()>();
 
         require!(

From 3b0cd7a95a3cb881d0454e141880eaf133313397 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Fri, 15 Dec 2023 15:22:34 +0200
Subject: [PATCH 0167/1254] Add multiversx.json for <v0.44.0 and refactor
 version parser

---
 contracts/examples/adder/mxsc-template.toml   |  1 -
 .../crypto-zombies/mxsc-template.toml         |  1 -
 contracts/examples/empty/mxsc-template.toml   |  1 -
 .../ping-pong-egld/mxsc-template.toml         |  1 -
 .../standalone/template/contract_creator.rs   | 17 ++++++---
 .../src/cmd/standalone/template/copy_util.rs  | 37 ++++++++++++++++++-
 .../standalone/template/template_adjuster.rs  | 17 +++------
 .../standalone/template/template_source.rs    |  3 +-
 framework/meta/src/version_history.rs         | 31 ++++++++++++----
 9 files changed, 76 insertions(+), 33 deletions(-)

diff --git a/contracts/examples/adder/mxsc-template.toml b/contracts/examples/adder/mxsc-template.toml
index 538afb1137..59d08379d0 100644
--- a/contracts/examples/adder/mxsc-template.toml
+++ b/contracts/examples/adder/mxsc-template.toml
@@ -12,7 +12,6 @@ files_include = [
     "scenarios",
     "src",
     "tests",
-    "wasm/Cargo.toml",
     "Cargo.toml",
     "README.md",
     "multiversx.json",
diff --git a/contracts/examples/crypto-zombies/mxsc-template.toml b/contracts/examples/crypto-zombies/mxsc-template.toml
index 38ef0ca7f5..ef01adab57 100644
--- a/contracts/examples/crypto-zombies/mxsc-template.toml
+++ b/contracts/examples/crypto-zombies/mxsc-template.toml
@@ -7,7 +7,6 @@ files_include = [
     "scenarios",
     "src",
     "tests",
-    "wasm/Cargo.toml",
     "Cargo.toml",
     "multiversx.json",
 ]
diff --git a/contracts/examples/empty/mxsc-template.toml b/contracts/examples/empty/mxsc-template.toml
index 441addd7b6..ca202e5c31 100644
--- a/contracts/examples/empty/mxsc-template.toml
+++ b/contracts/examples/empty/mxsc-template.toml
@@ -12,7 +12,6 @@ files_include = [
     "scenarios",
     "src",
     "tests",
-    "wasm/Cargo.toml",
     "Cargo.toml",
     "multiversx.json",
 ]
diff --git a/contracts/examples/ping-pong-egld/mxsc-template.toml b/contracts/examples/ping-pong-egld/mxsc-template.toml
index a1fc2c6330..403b768403 100644
--- a/contracts/examples/ping-pong-egld/mxsc-template.toml
+++ b/contracts/examples/ping-pong-egld/mxsc-template.toml
@@ -12,7 +12,6 @@ files_include = [
     "scenarios",
     "src",
     "tests",
-    "wasm/Cargo.toml",
     "Cargo.toml",
     "README.md",
     "multiversx.json",
diff --git a/framework/meta/src/cmd/standalone/template/contract_creator.rs b/framework/meta/src/cmd/standalone/template/contract_creator.rs
index d8f1caabd2..b71e0420f2 100644
--- a/framework/meta/src/cmd/standalone/template/contract_creator.rs
+++ b/framework/meta/src/cmd/standalone/template/contract_creator.rs
@@ -8,6 +8,8 @@ use super::{
     ContractCreatorTarget, RepoSource, RepoVersion, TemplateAdjuster,
 };
 
+const VERSION_0_43_0: usize = 33;
+
 /// 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);
@@ -31,7 +33,10 @@ fn target_from_args(args: &TemplateArgs) -> ContractCreatorTarget {
 
 pub(crate) fn get_repo_version(args_tag: &Option<String>) -> RepoVersion {
     if let Some(tag) = args_tag {
-        assert!(validate_template_tag(tag), "invalid template tag");
+        assert!(
+            validate_template_tag(VERSION_0_43_0, tag),
+            "invalid template tag"
+        );
         RepoVersion::Tag(tag.clone())
     } else {
         RepoVersion::Tag(LAST_TEMPLATE_VERSION.to_string())
@@ -73,17 +78,17 @@ impl<'a> ContractCreator<'a> {
     }
 
     pub fn create_contract(&self, args_tag: String) {
-        self.copy_template();
-        self.update_dependencies(args_tag);
+        self.copy_template(&args_tag);
+        self.update_dependencies(&args_tag);
         self.rename_template();
     }
 
-    pub fn copy_template(&self) {
+    pub fn copy_template(&self, args_tag: &str) {
         self.template_source
-            .copy_template(self.target.contract_dir());
+            .copy_template(self.target.contract_dir(), args_tag);
     }
 
-    pub fn update_dependencies(&self, args_tag: String) {
+    pub fn update_dependencies(&self, args_tag: &str) {
         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 2d324a5e56..1f9cfae1d2 100644
--- a/framework/meta/src/cmd/standalone/template/copy_util.rs
+++ b/framework/meta/src/cmd/standalone/template/copy_util.rs
@@ -1,8 +1,13 @@
 use std::{
-    fs::{self},
+    fs::{self, OpenOptions},
+    io::{BufWriter, Write},
     path::{Path, PathBuf},
 };
 
+use crate::version_history::validate_template_tag;
+
+const VERSION_0_44_0: usize = 39;
+
 /// Will copy an entire folder according to a whitelist of allowed paths.
 ///
 /// The whitelist is expected to contain paths relative from the source path.
@@ -10,8 +15,14 @@ use std::{
 /// If a folder is whitelisted, then everything in the folder is considered whitelisted too.
 ///
 /// The function creates all necessary folder structure in the target, no additional preparation required.
-pub fn whitelisted_deep_copy(source_root: &Path, target_root: &Path, whitelist: &[String]) {
+pub fn whitelisted_deep_copy(
+    source_root: &Path,
+    target_root: &Path,
+    whitelist: &[String],
+    args_tag: &str,
+) {
     perform_file_copy(source_root, &PathBuf::new(), target_root, whitelist);
+    create_multiversx_json_file(target_root, args_tag);
 }
 
 fn is_whitelisted(path: &Path, whitelist: &[String]) -> bool {
@@ -72,6 +83,28 @@ fn perform_file_copy(
     }
 }
 
+fn create_multiversx_json_file(target_root: &Path, args_tag: &str) {
+    if validate_template_tag(VERSION_0_44_0, args_tag) {
+        return;
+    }
+
+    let file = OpenOptions::new()
+        .write(true)
+        .create(true)
+        .open(target_root.join("multiversx.json"))
+        .expect("Failed to open multiversx.json file");
+
+    let mut writer = BufWriter::new(file);
+
+    writer
+        .write_all(
+            br#"{
+        "language": "rust"
+}"#,
+        )
+        .unwrap();
+}
+
 #[cfg(test)]
 mod test {
     use super::is_whitelisted;
diff --git a/framework/meta/src/cmd/standalone/template/template_adjuster.rs b/framework/meta/src/cmd/standalone/template/template_adjuster.rs
index 4f4bea7765..038082f811 100644
--- a/framework/meta/src/cmd/standalone/template/template_adjuster.rs
+++ b/framework/meta/src/cmd/standalone/template/template_adjuster.rs
@@ -1,18 +1,18 @@
 use super::{template_metadata::TemplateMetadata, ContractCreatorTarget};
 use crate::{
     cmd::standalone::upgrade::upgrade_common::{rename_files, replace_in_files},
+    version_history::validate_template_tag,
     CargoTomlContents,
 };
 use convert_case::{Case, Casing};
 use ruplacer::Query;
-use rustc_version::Version;
 use toml::value::Table;
 
 const TEST_DIRECTORY: &str = "./tests";
 const ROOT_CARGO_TOML: &str = "./Cargo.toml";
 const META_CARGO_TOML: &str = "./meta/Cargo.toml";
 const WASM_CARGO_TOML: &str = "./wasm/Cargo.toml";
-const TARGET_VERSION_0_45_0: Version = Version::new(0, 45, 0);
+const VERSION_0_45_0: usize = 40;
 
 pub struct TemplateAdjuster {
     pub metadata: TemplateMetadata,
@@ -20,7 +20,7 @@ pub struct TemplateAdjuster {
     pub keep_paths: bool,
 }
 impl TemplateAdjuster {
-    pub fn update_dependencies(&self, args_tag: String) {
+    pub fn update_dependencies(&self, args_tag: &str) {
         self.update_dependencies_root();
         self.update_dependencies_meta();
         self.update_dependencies_wasm(args_tag);
@@ -50,8 +50,8 @@ impl TemplateAdjuster {
         toml.save_to_file(&cargo_toml_path);
     }
 
-    fn update_dependencies_wasm(&self, args_tag: String) {
-        if is_version_at_least_0_45_0(args_tag) {
+    fn update_dependencies_wasm(&self, args_tag: &str) {
+        if validate_template_tag(VERSION_0_45_0, args_tag) {
             return;
         }
 
@@ -196,13 +196,6 @@ impl TemplateAdjuster {
     }
 }
 
-fn is_version_at_least_0_45_0(args_tag: String) -> bool {
-    match Version::parse(&args_tag) {
-        Ok(version) => version >= TARGET_VERSION_0_45_0,
-        Err(_error) => false,
-    }
-}
-
 fn wasm_file_name(name: &str) -> String {
     format!("{name}.wasm",)
 }
diff --git a/framework/meta/src/cmd/standalone/template/template_source.rs b/framework/meta/src/cmd/standalone/template/template_source.rs
index 4637d26b11..e728bbddee 100644
--- a/framework/meta/src/cmd/standalone/template/template_source.rs
+++ b/framework/meta/src/cmd/standalone/template/template_source.rs
@@ -17,11 +17,12 @@ pub struct TemplateSource<'a> {
 }
 
 impl<'a> TemplateSource<'a> {
-    pub fn copy_template(&self, target_path: impl AsRef<Path>) {
+    pub fn copy_template(&self, target_path: impl AsRef<Path>, args_tag: &str) {
         whitelisted_deep_copy(
             &self.source_path,
             target_path.as_ref(),
             &self.metadata.files_include,
+            args_tag
         );
     }
 }
diff --git a/framework/meta/src/version_history.rs b/framework/meta/src/version_history.rs
index 16105463b7..16bed180c4 100644
--- a/framework/meta/src/version_history.rs
+++ b/framework/meta/src/version_history.rs
@@ -55,13 +55,12 @@ pub const VERSIONS: &[&str] = &[
     "0.45.1",
 ];
 
-/// We started supporting contract templates with version 0.43.0.
-pub fn template_versions() -> &'static [&'static str] {
-    &VERSIONS[33..]
+pub fn template_versions(start: usize) -> &'static [&'static str] {
+    &VERSIONS[start..]
 }
 
-pub fn validate_template_tag(tag: &str) -> bool {
-    let versions = template_versions();
+pub fn validate_template_tag(start: usize, tag: &str) -> bool {
+    let versions = template_versions(start);
     versions.iter().any(|&tt| tt == tag)
 }
 
@@ -110,9 +109,25 @@ pub mod tests {
 
     #[test]
     fn template_versions_test() {
-        assert_eq!(template_versions()[0], "0.43.0");
+        assert_eq!(template_versions(33)[0], "0.43.0");
 
-        assert!(validate_template_tag("0.43.0"));
-        assert!(!validate_template_tag("0.42.0"));
+        assert!(validate_template_tag(33, "0.43.0"));
+        assert!(!validate_template_tag(33, "0.42.0"));
+    }
+
+    #[test]
+    fn template_versions_with_autogenerated_wasm() {
+        assert_eq!(template_versions(40)[0], "0.45.0");
+
+        assert!(validate_template_tag(40, "0.45.0"));
+        assert!(!validate_template_tag(40, "0.44.0"));
+    }
+
+    #[test]
+    fn template_versions_with_autogenerated_multiversx_json() {
+        assert_eq!(template_versions(39)[0], "0.44.0");
+
+        assert!(validate_template_tag(39, "0.44.0"));
+        assert!(!validate_template_tag(39, "0.43.0"));
     }
 }

From b77734c4b820d4dcdcaaa7b4d31297b2e9fc41af Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Mon, 18 Dec 2023 16:36:12 +0200
Subject: [PATCH 0168/1254] Refactor version functions and how it's added
 multiversx.json

---
 .../standalone/template/contract_creator.rs   |  6 +--
 .../src/cmd/standalone/template/copy_util.rs  | 38 ++++----------
 .../standalone/template/template_adjuster.rs  |  5 +-
 .../standalone/template/template_source.rs    |  2 +-
 framework/meta/src/version_history.rs         | 51 +++++++++++++------
 5 files changed, 50 insertions(+), 52 deletions(-)

diff --git a/framework/meta/src/cmd/standalone/template/contract_creator.rs b/framework/meta/src/cmd/standalone/template/contract_creator.rs
index b71e0420f2..391eeabeeb 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, TEMPLATE_VERSIONS},
 };
 
 use super::{
@@ -8,8 +8,6 @@ use super::{
     ContractCreatorTarget, RepoSource, RepoVersion, TemplateAdjuster,
 };
 
-const VERSION_0_43_0: usize = 33;
-
 /// 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);
@@ -34,7 +32,7 @@ fn target_from_args(args: &TemplateArgs) -> ContractCreatorTarget {
 pub(crate) fn get_repo_version(args_tag: &Option<String>) -> RepoVersion {
     if let Some(tag) = args_tag {
         assert!(
-            validate_template_tag(VERSION_0_43_0, tag),
+            validate_template_tag(tag, TEMPLATE_VERSIONS),
             "invalid template tag"
         );
         RepoVersion::Tag(tag.clone())
diff --git a/framework/meta/src/cmd/standalone/template/copy_util.rs b/framework/meta/src/cmd/standalone/template/copy_util.rs
index 1f9cfae1d2..9baf487a79 100644
--- a/framework/meta/src/cmd/standalone/template/copy_util.rs
+++ b/framework/meta/src/cmd/standalone/template/copy_util.rs
@@ -1,12 +1,9 @@
 use std::{
-    fs::{self, OpenOptions},
-    io::{BufWriter, Write},
+    fs::{self},
     path::{Path, PathBuf},
 };
 
-use crate::version_history::validate_template_tag;
-
-const VERSION_0_44_0: usize = 39;
+use crate::version_history::{validate_template_tag, AUTOGENERATED_JSON};
 
 /// Will copy an entire folder according to a whitelist of allowed paths.
 ///
@@ -21,8 +18,13 @@ pub fn whitelisted_deep_copy(
     whitelist: &[String],
     args_tag: &str,
 ) {
-    perform_file_copy(source_root, &PathBuf::new(), target_root, whitelist);
-    create_multiversx_json_file(target_root, args_tag);
+    if validate_template_tag(args_tag, AUTOGENERATED_JSON) {
+        perform_file_copy(source_root, &PathBuf::new(), target_root, whitelist);
+    } else {
+        let mut tmp_whitelist = whitelist.to_vec();
+        tmp_whitelist.push("multiversx.json".into());
+        perform_file_copy(source_root, &PathBuf::new(), target_root, &tmp_whitelist);
+    }
 }
 
 fn is_whitelisted(path: &Path, whitelist: &[String]) -> bool {
@@ -83,28 +85,6 @@ fn perform_file_copy(
     }
 }
 
-fn create_multiversx_json_file(target_root: &Path, args_tag: &str) {
-    if validate_template_tag(VERSION_0_44_0, args_tag) {
-        return;
-    }
-
-    let file = OpenOptions::new()
-        .write(true)
-        .create(true)
-        .open(target_root.join("multiversx.json"))
-        .expect("Failed to open multiversx.json file");
-
-    let mut writer = BufWriter::new(file);
-
-    writer
-        .write_all(
-            br#"{
-        "language": "rust"
-}"#,
-        )
-        .unwrap();
-}
-
 #[cfg(test)]
 mod test {
     use super::is_whitelisted;
diff --git a/framework/meta/src/cmd/standalone/template/template_adjuster.rs b/framework/meta/src/cmd/standalone/template/template_adjuster.rs
index 038082f811..da2d5877eb 100644
--- a/framework/meta/src/cmd/standalone/template/template_adjuster.rs
+++ b/framework/meta/src/cmd/standalone/template/template_adjuster.rs
@@ -1,7 +1,7 @@
 use super::{template_metadata::TemplateMetadata, ContractCreatorTarget};
 use crate::{
     cmd::standalone::upgrade::upgrade_common::{rename_files, replace_in_files},
-    version_history::validate_template_tag,
+    version_history::{validate_template_tag, AUTOGENERATED_WASM},
     CargoTomlContents,
 };
 use convert_case::{Case, Casing};
@@ -12,7 +12,6 @@ const TEST_DIRECTORY: &str = "./tests";
 const ROOT_CARGO_TOML: &str = "./Cargo.toml";
 const META_CARGO_TOML: &str = "./meta/Cargo.toml";
 const WASM_CARGO_TOML: &str = "./wasm/Cargo.toml";
-const VERSION_0_45_0: usize = 40;
 
 pub struct TemplateAdjuster {
     pub metadata: TemplateMetadata,
@@ -51,7 +50,7 @@ impl TemplateAdjuster {
     }
 
     fn update_dependencies_wasm(&self, args_tag: &str) {
-        if validate_template_tag(VERSION_0_45_0, args_tag) {
+        if validate_template_tag(args_tag, AUTOGENERATED_WASM) {
             return;
         }
 
diff --git a/framework/meta/src/cmd/standalone/template/template_source.rs b/framework/meta/src/cmd/standalone/template/template_source.rs
index e728bbddee..eb71ec31eb 100644
--- a/framework/meta/src/cmd/standalone/template/template_source.rs
+++ b/framework/meta/src/cmd/standalone/template/template_source.rs
@@ -22,7 +22,7 @@ impl<'a> TemplateSource<'a> {
             &self.source_path,
             target_path.as_ref(),
             &self.metadata.files_include,
-            args_tag
+            args_tag,
         );
     }
 }
diff --git a/framework/meta/src/version_history.rs b/framework/meta/src/version_history.rs
index 16bed180c4..4f04b5c726 100644
--- a/framework/meta/src/version_history.rs
+++ b/framework/meta/src/version_history.rs
@@ -8,6 +8,12 @@ pub const LAST_UPGRADE_VERSION: &str = LAST_VERSION;
 
 pub const LAST_TEMPLATE_VERSION: &str = LAST_VERSION;
 
+pub const TEMPLATE_VERSIONS: &str = "template_version";
+
+pub const AUTOGENERATED_WASM: &str = "autogenerated_wasm";
+
+pub const AUTOGENERATED_JSON: &str = "autogenerated_json";
+
 /// Known versions for the upgrader.
 #[rustfmt::skip]
 pub const VERSIONS: &[&str] = &[
@@ -55,12 +61,27 @@ pub const VERSIONS: &[&str] = &[
     "0.45.1",
 ];
 
-pub fn template_versions(start: usize) -> &'static [&'static str] {
-    &VERSIONS[start..]
+/// We started supporting contract templates with version 0.43.0.
+pub fn template_versions() -> &'static [&'static str] {
+    &VERSIONS[33..]
+}
+
+pub fn template_versions_with_autogenerated_wasm() -> &'static [&'static str] {
+    &VERSIONS[40..]
+}
+
+pub fn template_versions_with_autogenerated_json() -> &'static [&'static str] {
+    &VERSIONS[39..]
 }
 
-pub fn validate_template_tag(start: usize, tag: &str) -> bool {
-    let versions = template_versions(start);
+pub fn validate_template_tag(tag: &str, versions_provider: &str) -> bool {
+    let versions = match versions_provider {
+        TEMPLATE_VERSIONS => template_versions(),
+        AUTOGENERATED_WASM => template_versions_with_autogenerated_wasm(),
+        AUTOGENERATED_JSON => template_versions_with_autogenerated_json(),
+        _ => return false,
+    };
+
     versions.iter().any(|&tt| tt == tag)
 }
 
@@ -109,25 +130,25 @@ pub mod tests {
 
     #[test]
     fn template_versions_test() {
-        assert_eq!(template_versions(33)[0], "0.43.0");
+        assert_eq!(template_versions()[0], "0.43.0");
 
-        assert!(validate_template_tag(33, "0.43.0"));
-        assert!(!validate_template_tag(33, "0.42.0"));
+        assert!(validate_template_tag("0.43.0", TEMPLATE_VERSIONS));
+        assert!(!validate_template_tag("0.42.0", TEMPLATE_VERSIONS));
     }
 
     #[test]
-    fn template_versions_with_autogenerated_wasm() {
-        assert_eq!(template_versions(40)[0], "0.45.0");
+    fn template_versions_with_autogenerated_wasm_test() {
+        assert_eq!(template_versions_with_autogenerated_wasm()[0], "0.45.0");
 
-        assert!(validate_template_tag(40, "0.45.0"));
-        assert!(!validate_template_tag(40, "0.44.0"));
+        assert!(validate_template_tag("0.45.0", AUTOGENERATED_WASM));
+        assert!(!validate_template_tag("0.44.0", AUTOGENERATED_WASM));
     }
 
     #[test]
-    fn template_versions_with_autogenerated_multiversx_json() {
-        assert_eq!(template_versions(39)[0], "0.44.0");
+    fn template_versions_with_autogenerated_json_test() {
+        assert_eq!(template_versions_with_autogenerated_json()[0], "0.44.0");
 
-        assert!(validate_template_tag(39, "0.44.0"));
-        assert!(!validate_template_tag(39, "0.43.0"));
+        assert!(validate_template_tag("0.44.0", AUTOGENERATED_JSON));
+        assert!(!validate_template_tag("0.43.0", AUTOGENERATED_JSON));
     }
 }

From 16071048b7ef9b352d1f6469cca7638694726990 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Mon, 18 Dec 2023 17:15:11 +0200
Subject: [PATCH 0169/1254] Refactor version functions

---
 .../standalone/template/contract_creator.rs   |  7 +---
 .../src/cmd/standalone/template/copy_util.rs  |  4 +-
 .../standalone/template/template_adjuster.rs  |  4 +-
 framework/meta/src/version_history.rs         | 41 +++++++++----------
 4 files changed, 26 insertions(+), 30 deletions(-)

diff --git a/framework/meta/src/cmd/standalone/template/contract_creator.rs b/framework/meta/src/cmd/standalone/template/contract_creator.rs
index 391eeabeeb..9b493b89fc 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, TEMPLATE_VERSIONS},
+    version_history::{validate_template_tag, LAST_TEMPLATE_VERSION},
 };
 
 use super::{
@@ -31,10 +31,7 @@ fn target_from_args(args: &TemplateArgs) -> ContractCreatorTarget {
 
 pub(crate) fn get_repo_version(args_tag: &Option<String>) -> RepoVersion {
     if let Some(tag) = args_tag {
-        assert!(
-            validate_template_tag(tag, TEMPLATE_VERSIONS),
-            "invalid template tag"
-        );
+        assert!(validate_template_tag(tag), "invalid template tag");
         RepoVersion::Tag(tag.clone())
     } else {
         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 9baf487a79..6297a57682 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::{validate_template_tag, AUTOGENERATED_JSON};
+use crate::version_history::validate_template_with_autogenerated_json;
 
 /// Will copy an entire folder according to a whitelist of allowed paths.
 ///
@@ -18,7 +18,7 @@ pub fn whitelisted_deep_copy(
     whitelist: &[String],
     args_tag: &str,
 ) {
-    if validate_template_tag(args_tag, AUTOGENERATED_JSON) {
+    if validate_template_with_autogenerated_json(args_tag) {
         perform_file_copy(source_root, &PathBuf::new(), target_root, whitelist);
     } else {
         let mut tmp_whitelist = whitelist.to_vec();
diff --git a/framework/meta/src/cmd/standalone/template/template_adjuster.rs b/framework/meta/src/cmd/standalone/template/template_adjuster.rs
index da2d5877eb..0075d522aa 100644
--- a/framework/meta/src/cmd/standalone/template/template_adjuster.rs
+++ b/framework/meta/src/cmd/standalone/template/template_adjuster.rs
@@ -1,7 +1,7 @@
 use super::{template_metadata::TemplateMetadata, ContractCreatorTarget};
 use crate::{
     cmd::standalone::upgrade::upgrade_common::{rename_files, replace_in_files},
-    version_history::{validate_template_tag, AUTOGENERATED_WASM},
+    version_history::validate_template_with_autogenerated_wasm,
     CargoTomlContents,
 };
 use convert_case::{Case, Casing};
@@ -50,7 +50,7 @@ impl TemplateAdjuster {
     }
 
     fn update_dependencies_wasm(&self, args_tag: &str) {
-        if validate_template_tag(args_tag, AUTOGENERATED_WASM) {
+        if validate_template_with_autogenerated_wasm(args_tag) {
             return;
         }
 
diff --git a/framework/meta/src/version_history.rs b/framework/meta/src/version_history.rs
index 4f04b5c726..d753d4c1c5 100644
--- a/framework/meta/src/version_history.rs
+++ b/framework/meta/src/version_history.rs
@@ -8,12 +8,6 @@ pub const LAST_UPGRADE_VERSION: &str = LAST_VERSION;
 
 pub const LAST_TEMPLATE_VERSION: &str = LAST_VERSION;
 
-pub const TEMPLATE_VERSIONS: &str = "template_version";
-
-pub const AUTOGENERATED_WASM: &str = "autogenerated_wasm";
-
-pub const AUTOGENERATED_JSON: &str = "autogenerated_json";
-
 /// Known versions for the upgrader.
 #[rustfmt::skip]
 pub const VERSIONS: &[&str] = &[
@@ -66,23 +60,28 @@ pub fn template_versions() -> &'static [&'static str] {
     &VERSIONS[33..]
 }
 
+pub fn validate_template_tag(tag: &str) -> bool {
+    template_versions().iter().any(|&tt| tt == tag)
+}
+
 pub fn template_versions_with_autogenerated_wasm() -> &'static [&'static str] {
     &VERSIONS[40..]
 }
 
+pub fn validate_template_with_autogenerated_wasm(tag: &str) -> bool {
+    template_versions_with_autogenerated_wasm()
+        .iter()
+        .any(|&tt| tt == tag)
+}
+
 pub fn template_versions_with_autogenerated_json() -> &'static [&'static str] {
     &VERSIONS[39..]
 }
 
-pub fn validate_template_tag(tag: &str, versions_provider: &str) -> bool {
-    let versions = match versions_provider {
-        TEMPLATE_VERSIONS => template_versions(),
-        AUTOGENERATED_WASM => template_versions_with_autogenerated_wasm(),
-        AUTOGENERATED_JSON => template_versions_with_autogenerated_json(),
-        _ => return false,
-    };
-
-    versions.iter().any(|&tt| tt == tag)
+pub fn validate_template_with_autogenerated_json(tag: &str) -> bool {
+    template_versions_with_autogenerated_json()
+        .iter()
+        .any(|&tt| tt == tag)
 }
 
 pub struct VersionIterator {
@@ -132,23 +131,23 @@ pub mod tests {
     fn template_versions_test() {
         assert_eq!(template_versions()[0], "0.43.0");
 
-        assert!(validate_template_tag("0.43.0", TEMPLATE_VERSIONS));
-        assert!(!validate_template_tag("0.42.0", TEMPLATE_VERSIONS));
+        assert!(validate_template_tag("0.43.0"));
+        assert!(!validate_template_tag("0.42.0"));
     }
 
     #[test]
     fn template_versions_with_autogenerated_wasm_test() {
         assert_eq!(template_versions_with_autogenerated_wasm()[0], "0.45.0");
 
-        assert!(validate_template_tag("0.45.0", AUTOGENERATED_WASM));
-        assert!(!validate_template_tag("0.44.0", AUTOGENERATED_WASM));
+        assert!(validate_template_with_autogenerated_wasm("0.45.0"));
+        assert!(!validate_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");
 
-        assert!(validate_template_tag("0.44.0", AUTOGENERATED_JSON));
-        assert!(!validate_template_tag("0.43.0", AUTOGENERATED_JSON));
+        assert!(validate_template_with_autogenerated_json("0.44.0"));
+        assert!(!validate_template_with_autogenerated_json("0.43.0"));
     }
 }

From 209c02e21b627dea907b2d3521f65fef820a9016 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Mon, 18 Dec 2023 17:32:19 +0200
Subject: [PATCH 0170/1254] Rename version functions

---
 .../meta/src/cmd/standalone/template/copy_util.rs    |  4 ++--
 .../src/cmd/standalone/template/template_adjuster.rs |  4 ++--
 framework/meta/src/version_history.rs                | 12 ++++++------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/framework/meta/src/cmd/standalone/template/copy_util.rs b/framework/meta/src/cmd/standalone/template/copy_util.rs
index 6297a57682..f49911b6f1 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::validate_template_with_autogenerated_json;
+use crate::version_history::is_template_with_autogenerated_json;
 
 /// Will copy an entire folder according to a whitelist of allowed paths.
 ///
@@ -18,7 +18,7 @@ pub fn whitelisted_deep_copy(
     whitelist: &[String],
     args_tag: &str,
 ) {
-    if validate_template_with_autogenerated_json(args_tag) {
+    if is_template_with_autogenerated_json(args_tag) {
         perform_file_copy(source_root, &PathBuf::new(), target_root, whitelist);
     } else {
         let mut tmp_whitelist = whitelist.to_vec();
diff --git a/framework/meta/src/cmd/standalone/template/template_adjuster.rs b/framework/meta/src/cmd/standalone/template/template_adjuster.rs
index 0075d522aa..afaa20aebf 100644
--- a/framework/meta/src/cmd/standalone/template/template_adjuster.rs
+++ b/framework/meta/src/cmd/standalone/template/template_adjuster.rs
@@ -1,7 +1,7 @@
 use super::{template_metadata::TemplateMetadata, ContractCreatorTarget};
 use crate::{
     cmd::standalone::upgrade::upgrade_common::{rename_files, replace_in_files},
-    version_history::validate_template_with_autogenerated_wasm,
+    version_history::is_template_with_autogenerated_wasm,
     CargoTomlContents,
 };
 use convert_case::{Case, Casing};
@@ -50,7 +50,7 @@ impl TemplateAdjuster {
     }
 
     fn update_dependencies_wasm(&self, args_tag: &str) {
-        if validate_template_with_autogenerated_wasm(args_tag) {
+        if is_template_with_autogenerated_wasm(args_tag) {
             return;
         }
 
diff --git a/framework/meta/src/version_history.rs b/framework/meta/src/version_history.rs
index d753d4c1c5..f2fb34c545 100644
--- a/framework/meta/src/version_history.rs
+++ b/framework/meta/src/version_history.rs
@@ -68,7 +68,7 @@ pub fn template_versions_with_autogenerated_wasm() -> &'static [&'static str] {
     &VERSIONS[40..]
 }
 
-pub fn validate_template_with_autogenerated_wasm(tag: &str) -> bool {
+pub fn is_template_with_autogenerated_wasm(tag: &str) -> bool {
     template_versions_with_autogenerated_wasm()
         .iter()
         .any(|&tt| tt == tag)
@@ -78,7 +78,7 @@ pub fn template_versions_with_autogenerated_json() -> &'static [&'static str] {
     &VERSIONS[39..]
 }
 
-pub fn validate_template_with_autogenerated_json(tag: &str) -> bool {
+pub fn is_template_with_autogenerated_json(tag: &str) -> bool {
     template_versions_with_autogenerated_json()
         .iter()
         .any(|&tt| tt == tag)
@@ -139,15 +139,15 @@ pub mod tests {
     fn template_versions_with_autogenerated_wasm_test() {
         assert_eq!(template_versions_with_autogenerated_wasm()[0], "0.45.0");
 
-        assert!(validate_template_with_autogenerated_wasm("0.45.0"));
-        assert!(!validate_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");
 
-        assert!(validate_template_with_autogenerated_json("0.44.0"));
-        assert!(!validate_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"));
     }
 }

From b2fb4a584ca52aa10f7419b712382a77e4fc8ab2 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Mon, 18 Dec 2023 18:06:45 +0200
Subject: [PATCH 0171/1254] sc 0.45.2, codec 0.18.3, vm 0.7.1, scenario-format
 0.21.1, sdk 0.3.1

---
 CHANGELOG.md                                  |  7 +++++
 Cargo.lock                                    | 28 +++++++++----------
 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 +--
 .../standalone/upgrade/upgrade_selector.rs    |  2 +-
 framework/meta/src/version_history.rs         |  4 +--
 framework/scenario/Cargo.toml                 | 12 ++++----
 framework/snippets/Cargo.toml                 |  6 ++--
 framework/wasm-adapter/Cargo.toml             |  4 +--
 sdk/core/Cargo.toml                           |  2 +-
 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, 406 insertions(+), 399 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d3e4b1cb54..432c8a39ee 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,6 +26,13 @@ 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.45.2, codec 0.18.3, vm 0.7.1, scenario-format 0.21.1, sdk 0.3.1] - 2023-12-18
+- Updated framework dependencies to the latest versions: syn, bitflags, wasmparser, base64, sha2, sha3, itertools, hmac, pem, pbkdf2, etc.
+- `sc-meta` improvements:
+	- `overflow-checks` field in `sc-config.toml`;
+	- Upgrade: new `--no-check` flag, which disables the compile check after major version upgrades;
+	- Template: `wasm` crates no longer copied for new versions; retroactively patched missing `multiversx.json` file for older versions.
+
 ## [sc 0.45.1, codec 0.18.2] - 2023-11-24
 - Fixed sc-meta standalone install backwards compatibility.
 - Better hygiene in codec derive.
diff --git a/Cargo.lock b/Cargo.lock
index 2ce7f45c8a..8b7954e320 100755
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1802,7 +1802,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-chain-scenario-format"
-version = "0.21.0"
+version = "0.21.1"
 dependencies = [
  "bech32",
  "hex",
@@ -1815,7 +1815,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-chain-vm"
-version = "0.7.0"
+version = "0.7.1"
 dependencies = [
  "bitflags 2.4.1",
  "ed25519-dalek",
@@ -1839,7 +1839,7 @@ checksum = "b59072fa0624b55ae5ae3fa6bfa91515bbeb4ac440214bc4a509e2c8806d6e9f"
 
 [[package]]
 name = "multiversx-price-aggregator-sc"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "arrayvec",
  "getrandom",
@@ -1860,7 +1860,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "bitflags 2.4.1",
  "hashbrown",
@@ -1872,7 +1872,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -1881,7 +1881,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -1891,7 +1891,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -1902,7 +1902,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-meta"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "clap",
  "colored",
@@ -1927,14 +1927,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-scenario"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "base64",
  "bech32",
@@ -1960,7 +1960,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-snippets"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "base64",
  "env_logger",
@@ -1974,14 +1974,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sdk"
-version = "0.3.0"
+version = "0.3.1"
 dependencies = [
  "anyhow",
  "base64",
@@ -2005,7 +2005,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-wegld-swap-sc"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "multiversx-sc",
  "multiversx-sc-modules",
diff --git a/contracts/benchmarks/large-storage/Cargo.toml b/contracts/benchmarks/large-storage/Cargo.toml
index 6b75e45656..e4af3803f7 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.45.1"
+version = "0.45.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.1"
+version = "0.45.2"
 path = "../../../framework/scenario"
diff --git a/contracts/benchmarks/large-storage/meta/Cargo.toml b/contracts/benchmarks/large-storage/meta/Cargo.toml
index b03b66ea75..b21bb5db8d 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.45.1"
+version = "0.45.2"
 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 4eeba6519c..b11cf2a180 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.45.1"
+version = "0.45.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/mappers/benchmark-common/Cargo.toml b/contracts/benchmarks/mappers/benchmark-common/Cargo.toml
index ef3d247425..8399221c43 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.45.1"
+version = "0.45.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.1"
+version = "0.45.2"
 path = "../../../../framework/scenario"
diff --git a/contracts/benchmarks/mappers/linked-list-repeat/Cargo.toml b/contracts/benchmarks/mappers/linked-list-repeat/Cargo.toml
index 61cdfa8f88..c7695636da 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.45.1"
+version = "0.45.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.1"
+version = "0.45.2"
 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 790d8f5692..e4261f8468 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.45.1"
+version = "0.45.2"
 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 f4cf1b1baf..ba2960c5ac 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.45.1"
+version = "0.45.2"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/mappers/map-repeat/Cargo.toml b/contracts/benchmarks/mappers/map-repeat/Cargo.toml
index 11eeb01fa0..9ed2f3d4d0 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.45.1"
+version = "0.45.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.1"
+version = "0.45.2"
 path = "../../../../framework/scenario"
diff --git a/contracts/benchmarks/mappers/map-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/map-repeat/meta/Cargo.toml
index b04da7c3df..62c1c661d7 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.45.1"
+version = "0.45.2"
 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 79cd9c7913..7d72fc9729 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.45.1"
+version = "0.45.2"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/mappers/queue-repeat/Cargo.toml b/contracts/benchmarks/mappers/queue-repeat/Cargo.toml
index 9387ca1607..76633b641c 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.45.1"
+version = "0.45.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.1"
+version = "0.45.2"
 path = "../../../../framework/scenario"
diff --git a/contracts/benchmarks/mappers/queue-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/queue-repeat/meta/Cargo.toml
index e2454aaa81..c1833db42a 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.45.1"
+version = "0.45.2"
 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 a89049710b..93cf0dff89 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.45.1"
+version = "0.45.2"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/mappers/set-repeat/Cargo.toml b/contracts/benchmarks/mappers/set-repeat/Cargo.toml
index e6827a291b..393fde1d66 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.45.1"
+version = "0.45.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.1"
+version = "0.45.2"
 path = "../../../../framework/scenario"
diff --git a/contracts/benchmarks/mappers/set-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/set-repeat/meta/Cargo.toml
index b0c4814cc0..fcfef7d952 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.45.1"
+version = "0.45.2"
 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 09274940f6..3d2aacc53f 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.45.1"
+version = "0.45.2"
 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 290564277f..e56c982a30 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.45.1"
+version = "0.45.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.1"
+version = "0.45.2"
 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 cb09e7f9d4..46412af1e3 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.45.1"
+version = "0.45.2"
 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 634984ab85..8468cca74f 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.45.1"
+version = "0.45.2"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/mappers/vec-repeat/Cargo.toml b/contracts/benchmarks/mappers/vec-repeat/Cargo.toml
index 8ebc933939..b6b69bd5fb 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.45.1"
+version = "0.45.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.1"
+version = "0.45.2"
 path = "../../../../framework/scenario"
diff --git a/contracts/benchmarks/mappers/vec-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/vec-repeat/meta/Cargo.toml
index c49c477b38..1c16bc04cd 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.45.1"
+version = "0.45.2"
 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 04eb1f4d3d..f05da70d34 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.45.1"
+version = "0.45.2"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/send-tx-repeat/Cargo.toml b/contracts/benchmarks/send-tx-repeat/Cargo.toml
index caebc904a3..75d94e96cd 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.45.1"
+version = "0.45.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.1"
+version = "0.45.2"
 path = "../../../framework/scenario"
diff --git a/contracts/benchmarks/send-tx-repeat/meta/Cargo.toml b/contracts/benchmarks/send-tx-repeat/meta/Cargo.toml
index e761451121..c52cc67363 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.45.1"
+version = "0.45.2"
 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 fd52858cfa..c819e701ad 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.45.1"
+version = "0.45.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/str-repeat/Cargo.toml b/contracts/benchmarks/str-repeat/Cargo.toml
index 82493c31f2..06a55ad89b 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.45.1"
+version = "0.45.2"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.1"
+version = "0.45.2"
 path = "../../../framework/scenario"
diff --git a/contracts/benchmarks/str-repeat/meta/Cargo.toml b/contracts/benchmarks/str-repeat/meta/Cargo.toml
index ac217c265e..dca3fb7193 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.45.1"
+version = "0.45.2"
 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 95f1ea9125..d9fab04324 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.45.1"
+version = "0.45.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/core/price-aggregator/Cargo.toml b/contracts/core/price-aggregator/Cargo.toml
index fdd577414b..8a0a1a91bf 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.45.1"
+version = "0.45.2"
 authors = [
     "Claudiu-Marcel Bruda <claudiu.bruda@multiversx.com>",
     "MultiversX <contact@multiversx.com>",
@@ -19,15 +19,15 @@ edition = "2021"
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "0.45.1"
+version = "0.45.2"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.45.1"
+version = "0.45.2"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.1"
+version = "0.45.2"
 path = "../../../framework/scenario"
 
 [dependencies]
diff --git a/contracts/core/price-aggregator/meta/Cargo.toml b/contracts/core/price-aggregator/meta/Cargo.toml
index f8ffff8574..f4cb2f2795 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.45.1"
+version = "0.45.2"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.45.1"
+version = "0.45.2"
 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 652cb2f09f..e115f06e38 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.45.1"
+version = "0.45.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/core/wegld-swap/Cargo.toml b/contracts/core/wegld-swap/Cargo.toml
index e014098f66..0131f4fed9 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.45.1"
+version = "0.45.2"
 
 authors = [
     "Dorin Iancu <dorin.iancu@multiversx.com>",
@@ -20,13 +20,13 @@ edition = "2021"
 path = "src/wegld.rs"
 
 [dependencies.multiversx-sc]
-version = "0.45.1"
+version = "0.45.2"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.45.1"
+version = "0.45.2"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.1"
+version = "0.45.2"
 path = "../../../framework/scenario"
diff --git a/contracts/core/wegld-swap/meta/Cargo.toml b/contracts/core/wegld-swap/meta/Cargo.toml
index 3e74c5ff58..fadf051d77 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.45.1"
+version = "0.45.2"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.45.1"
+version = "0.45.2"
 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 9219c23545..52ebcb2a18 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.45.1"
+version = "0.45.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/adder/Cargo.toml b/contracts/examples/adder/Cargo.toml
index 86ddaacf1f..32c87b650e 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.45.1"
+version = "0.45.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.1"
+version = "0.45.2"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/adder/interact/Cargo.toml b/contracts/examples/adder/interact/Cargo.toml
index 43a19c8b56..ed210ad0f8 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.45.1"
+version = "0.45.2"
 path = "../../../../framework/snippets"
diff --git a/contracts/examples/adder/meta/Cargo.toml b/contracts/examples/adder/meta/Cargo.toml
index a119436851..2fdc37ecf9 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.45.1"
+version = "0.45.2"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/examples/adder/wasm/Cargo.toml b/contracts/examples/adder/wasm/Cargo.toml
index 3fb317c54e..4d1beb4c5e 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.45.1"
+version = "0.45.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/bonding-curve-contract/Cargo.toml b/contracts/examples/bonding-curve-contract/Cargo.toml
index 36a964b152..e94de23300 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.45.1"
+version = "0.45.2"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.45.1"
+version = "0.45.2"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.1"
+version = "0.45.2"
 path = "../../../framework/scenario"
 
diff --git a/contracts/examples/bonding-curve-contract/meta/Cargo.toml b/contracts/examples/bonding-curve-contract/meta/Cargo.toml
index 491b2fda90..9e6ed5a545 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.45.1"
+version = "0.45.2"
 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 52a63f3ec1..e9e84e003f 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.45.1"
+version = "0.45.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/check-pause/Cargo.toml b/contracts/examples/check-pause/Cargo.toml
index 949b152008..17e6ebbdfb 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.2"
 
 [dependencies.multiversx-sc]
-version = "0.45.1"
+version = "0.45.2"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.45.1"
+version = "0.45.2"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.1"
+version = "0.45.2"
 path = "../../../framework/scenario"
 
diff --git a/contracts/examples/check-pause/meta/Cargo.toml b/contracts/examples/check-pause/meta/Cargo.toml
index aa7e6ae568..981339b5a3 100644
--- a/contracts/examples/check-pause/meta/Cargo.toml
+++ b/contracts/examples/check-pause/meta/Cargo.toml
@@ -9,6 +9,6 @@ authors = ["Alin Cruceat <alin.cruceat@multiversx.com>"]
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.45.1"
+version = "0.45.2"
 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 e49eeb14c7..9718d08e59 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.45.1"
+version = "0.45.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/crowdfunding-esdt/Cargo.toml b/contracts/examples/crowdfunding-esdt/Cargo.toml
index a64e5640b8..6d67d2cf48 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.45.1"
+version = "0.45.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.1"
+version = "0.45.2"
 path = "../../../framework/scenario"
 
 [dev-dependencies]
diff --git a/contracts/examples/crowdfunding-esdt/meta/Cargo.toml b/contracts/examples/crowdfunding-esdt/meta/Cargo.toml
index d6de491036..e3214ba99a 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.45.1"
+version = "0.45.2"
 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 b11fb67e7a..ac110390bf 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.45.1"
+version = "0.45.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/crypto-bubbles/Cargo.toml b/contracts/examples/crypto-bubbles/Cargo.toml
index c5a850ac8d..1ed7cabd95 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.45.1"
+version = "0.45.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.1"
+version = "0.45.2"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/crypto-bubbles/meta/Cargo.toml b/contracts/examples/crypto-bubbles/meta/Cargo.toml
index 70aa5e402b..bf17e888ad 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.45.1"
+version = "0.45.2"
 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 727fedd249..50dc9c9db3 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.45.1"
+version = "0.45.2"
 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 952035d940..a31fe30967 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.45.1"
+version = "0.45.2"
 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 b9b0fd202f..7cd1287752 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.45.1"
+version = "0.45.2"
 path = "../../../../../framework/base"
diff --git a/contracts/examples/crypto-kitties/kitty-auction/Cargo.toml b/contracts/examples/crypto-kitties/kitty-auction/Cargo.toml
index d081d6fe77..876e14a450 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.45.1"
+version = "0.45.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.1"
+version = "0.45.2"
 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 84cef80eb3..4c587af3cd 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.45.1"
+version = "0.45.2"
 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 41cec69b5d..43a7459eb4 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.45.1"
+version = "0.45.2"
 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 d9a0ffa8f3..234fbd3adf 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.45.1"
+version = "0.45.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.1"
+version = "0.45.2"
 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 979540ee72..7c96b75f98 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.45.1"
+version = "0.45.2"
 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 6cd371e9fe..498165a3ce 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.45.1"
+version = "0.45.2"
 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 bd2476f14b..9873f6a23b 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.45.1"
+version = "0.45.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.1"
+version = "0.45.2"
 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 c5294fa06d..28fcee49eb 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.45.1"
+version = "0.45.2"
 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 af6c874a99..7ddc2696a2 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.45.1"
+version = "0.45.2"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/crypto-zombies/Cargo.toml b/contracts/examples/crypto-zombies/Cargo.toml
index e40aee5de8..47a8f07e00 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.45.1"
+version = "0.45.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.1"
+version = "0.45.2"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/crypto-zombies/meta/Cargo.toml b/contracts/examples/crypto-zombies/meta/Cargo.toml
index 50692919f0..a5b1282fc7 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.45.1"
+version = "0.45.2"
 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 7ce067b89e..547d27b57d 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.45.1"
+version = "0.45.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/digital-cash/Cargo.toml b/contracts/examples/digital-cash/Cargo.toml
index 2fa46e4b68..eb288a6ac9 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.45.1"
+version = "0.45.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.1"
+version = "0.45.2"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/digital-cash/meta/Cargo.toml b/contracts/examples/digital-cash/meta/Cargo.toml
index 4443fd2ad1..e2063be9e9 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.45.1"
+version = "0.45.2"
 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 c09b152e3d..348ba5fcf7 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.45.1"
+version = "0.45.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/empty/Cargo.toml b/contracts/examples/empty/Cargo.toml
index fc8dca2979..f94bf26451 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.45.1"
+version = "0.45.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.1"
+version = "0.45.2"
 path = "../../../framework/scenario"
 
 [dev-dependencies]
diff --git a/contracts/examples/empty/meta/Cargo.toml b/contracts/examples/empty/meta/Cargo.toml
index ef6c3175a1..a2b771af37 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.45.1"
+version = "0.45.2"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/examples/empty/wasm/Cargo.toml b/contracts/examples/empty/wasm/Cargo.toml
index f32728c2d7..0e8dc925dd 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.45.1"
+version = "0.45.2"
 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 89331f0bd0..4794e9a418 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.45.1"
+version = "0.45.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.1"
+version = "0.45.2"
 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 aec0c60a06..46b7b5bdcd 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.45.1"
+version = "0.45.2"
 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 1b9cf33794..af15c13c33 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.45.1"
+version = "0.45.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/factorial/Cargo.toml b/contracts/examples/factorial/Cargo.toml
index 806d802663..474b76bc72 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.45.1"
+version = "0.45.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.1"
+version = "0.45.2"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/factorial/meta/Cargo.toml b/contracts/examples/factorial/meta/Cargo.toml
index b1f2c260ce..dd26c0ec5c 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.45.1"
+version = "0.45.2"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/examples/factorial/wasm/Cargo.toml b/contracts/examples/factorial/wasm/Cargo.toml
index bb481ab787..43303d79fe 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.45.1"
+version = "0.45.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/fractional-nfts/Cargo.toml b/contracts/examples/fractional-nfts/Cargo.toml
index 2d22fa6c03..b19e6c1a07 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.45.1"
+version = "0.45.2"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.45.1"
+version = "0.45.2"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.1"
+version = "0.45.2"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/fractional-nfts/meta/Cargo.toml b/contracts/examples/fractional-nfts/meta/Cargo.toml
index fa1ca764c6..9cbdc8712b 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.45.1"
+version = "0.45.2"
 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 8bdea1677d..94fe937202 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.45.1"
+version = "0.45.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/lottery-esdt/Cargo.toml b/contracts/examples/lottery-esdt/Cargo.toml
index 8d2f68a1eb..e51f5db0ef 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.45.1"
+version = "0.45.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.1"
+version = "0.45.2"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/lottery-esdt/meta/Cargo.toml b/contracts/examples/lottery-esdt/meta/Cargo.toml
index 415553109c..115303ab39 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.45.1"
+version = "0.45.2"
 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 c189e174a6..6bb715a325 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.45.1"
+version = "0.45.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/multisig/Cargo.toml b/contracts/examples/multisig/Cargo.toml
index 049d63fbbe..42e5cc0c67 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.45.1"
+version = "0.45.2"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.45.1"
+version = "0.45.2"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.1"
+version = "0.45.2"
 path = "../../../framework/scenario"
 
 [dev-dependencies.adder]
@@ -27,7 +27,7 @@ path = "../adder"
 path = "../factorial"
 
 [dev-dependencies.multiversx-wegld-swap-sc]
-version = "0.45.1"
+version = "0.45.2"
 path = "../../core/wegld-swap"
 
 [dev-dependencies]
diff --git a/contracts/examples/multisig/interact/Cargo.toml b/contracts/examples/multisig/interact/Cargo.toml
index 49f2e7ec63..014fe3c036 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.45.1"
+version = "0.45.2"
 path = "../../../../contracts/modules"
 
 [dependencies.multiversx-sc-snippets]
-version = "0.45.1"
+version = "0.45.2"
 path = "../../../../framework/snippets"
 
 [dependencies.multiversx-sc-scenario]
-version = "=0.45.1"
+version = "=0.45.2"
 path = "../../../../framework/scenario"
diff --git a/contracts/examples/multisig/meta/Cargo.toml b/contracts/examples/multisig/meta/Cargo.toml
index 97f8ba3c56..fcf8c09cb3 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.45.1"
+version = "0.45.2"
 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 55dec0eb2e..74fb0563e8 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.45.1"
+version = "0.45.2"
 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 8d41d2053e..79fe547e95 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.45.1"
+version = "0.45.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/multisig/wasm/Cargo.toml b/contracts/examples/multisig/wasm/Cargo.toml
index a5c70d2a49..90c58025ae 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.45.1"
+version = "0.45.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/nft-minter/Cargo.toml b/contracts/examples/nft-minter/Cargo.toml
index 8ca07a1dca..75a241a54d 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.45.1"
+version = "0.45.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.1"
+version = "0.45.2"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/nft-minter/meta/Cargo.toml b/contracts/examples/nft-minter/meta/Cargo.toml
index fdf3e608fe..b3b146aea6 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.45.1"
+version = "0.45.2"
 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 566c592ad6..4e1391504c 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.45.1"
+version = "0.45.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/nft-storage-prepay/Cargo.toml b/contracts/examples/nft-storage-prepay/Cargo.toml
index 2f94507f73..6fd4983a93 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.45.1"
+version = "0.45.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.1"
+version = "0.45.2"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/nft-storage-prepay/meta/Cargo.toml b/contracts/examples/nft-storage-prepay/meta/Cargo.toml
index e460258715..ba0d7b4a4d 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.45.1"
+version = "0.45.2"
 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 d44f39bba8..6a508a116a 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.45.1"
+version = "0.45.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/nft-subscription/Cargo.toml b/contracts/examples/nft-subscription/Cargo.toml
index 71c29fb9a6..51cbf856e6 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.45.1"
+version = "0.45.2"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.45.1"
+version = "0.45.2"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.1"
+version = "0.45.2"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/nft-subscription/meta/Cargo.toml b/contracts/examples/nft-subscription/meta/Cargo.toml
index 1273128dc6..c4e2919d0e 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.45.1"
+version = "0.45.2"
 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 3f67bde2f2..0cca5f05a1 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.45.1"
+version = "0.45.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/order-book/factory/Cargo.toml b/contracts/examples/order-book/factory/Cargo.toml
index 94fc6b3a2b..9c2bcbe6ab 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.45.1"
+version = "0.45.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.1"
+version = "0.45.2"
 path = "../../../../framework/scenario"
 
diff --git a/contracts/examples/order-book/factory/meta/Cargo.toml b/contracts/examples/order-book/factory/meta/Cargo.toml
index f14ebabf6d..b712633964 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.45.1"
+version = "0.45.2"
 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 0c9d3460d7..9899c3460a 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.45.1"
+version = "0.45.2"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/order-book/pair/Cargo.toml b/contracts/examples/order-book/pair/Cargo.toml
index 7306324c72..9b5a07300f 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.45.1"
+version = "0.45.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.1"
+version = "0.45.2"
 path = "../../../../framework/scenario"
diff --git a/contracts/examples/order-book/pair/meta/Cargo.toml b/contracts/examples/order-book/pair/meta/Cargo.toml
index 12b0529386..56d68ac0de 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.45.1"
+version = "0.45.2"
 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 9bf76142a6..3e8a20583b 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.45.1"
+version = "0.45.2"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/ping-pong-egld/Cargo.toml b/contracts/examples/ping-pong-egld/Cargo.toml
index 68ba97776f..364fd72212 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.45.1"
+version = "0.45.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.1"
+version = "0.45.2"
 path = "../../../framework/scenario"
 
diff --git a/contracts/examples/ping-pong-egld/meta/Cargo.toml b/contracts/examples/ping-pong-egld/meta/Cargo.toml
index 965739c7ef..fa762a2b3e 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.45.1"
+version = "0.45.2"
 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 49cd896f5c..6c91ad0361 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.45.1"
+version = "0.45.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/proxy-pause/Cargo.toml b/contracts/examples/proxy-pause/Cargo.toml
index de71a09c0e..9c71f5bdb7 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.45.1"
+version = "0.45.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.1"
+version = "0.45.2"
 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 84250adaab..20118a54c8 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.45.1"
+version = "0.45.2"
 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 70c445cd05..b7817cceaf 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.45.1"
+version = "0.45.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/rewards-distribution/Cargo.toml b/contracts/examples/rewards-distribution/Cargo.toml
index 5ca84b36b1..8986593584 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.45.1"
+version = "0.45.2"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.45.1"
+version = "0.45.2"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.1"
+version = "0.45.2"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/rewards-distribution/meta/Cargo.toml b/contracts/examples/rewards-distribution/meta/Cargo.toml
index 2a90587b28..446f491c5a 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 <claudiu.bruda@multiversx.com>"]
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.45.1"
+version = "0.45.2"
 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 6747bb0e62..b2d160707d 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.45.1"
+version = "0.45.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/seed-nft-minter/Cargo.toml b/contracts/examples/seed-nft-minter/Cargo.toml
index 8153fb29e2..1e743ea99e 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.45.1"
+version = "0.45.2"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.45.1"
+version = "0.45.2"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.1"
+version = "0.45.2"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/seed-nft-minter/meta/Cargo.toml b/contracts/examples/seed-nft-minter/meta/Cargo.toml
index 160410604e..edd93330f4 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 <claudiu.bruda@multiversx.com>"]
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.45.1"
+version = "0.45.2"
 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 3777108bd5..7a381864c0 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.45.1"
+version = "0.45.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/token-release/Cargo.toml b/contracts/examples/token-release/Cargo.toml
index 7b26030ec5..372f38ab0b 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.45.1"
+version = "0.45.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.1"
+version = "0.45.2"
 path = "../../../framework/scenario"
 
diff --git a/contracts/examples/token-release/meta/Cargo.toml b/contracts/examples/token-release/meta/Cargo.toml
index 0320ccabf2..7a3d220cc7 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.45.1"
+version = "0.45.2"
 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 2be751e3a6..fe05211f13 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.45.1"
+version = "0.45.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/abi-tester/Cargo.toml b/contracts/feature-tests/abi-tester/Cargo.toml
index 2b10d30712..0192ad173a 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.45.1"
+version = "0.45.2"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.1"
+version = "0.45.2"
 path = "../../../framework/scenario"
 
 [dev-dependencies.multiversx-sc-meta]
-version = "0.45.1"
+version = "0.45.2"
 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 321b4091b4..9fe2c0459d 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.45.1"
+            "version": "0.45.2"
         }
     },
     "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 c13d6c7d07..19a20678ee 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.45.1"
+            "version": "0.45.2"
         }
     },
     "docs": [
diff --git a/contracts/feature-tests/abi-tester/meta/Cargo.toml b/contracts/feature-tests/abi-tester/meta/Cargo.toml
index 3d0d82ffa3..33337d99bc 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.45.1"
+version = "0.45.2"
 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 ab8327f277..f4f9b54e3b 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.45.1"
+version = "0.45.2"
 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 b7cdb1ff03..8aa1833237 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.45.1"
+version = "0.45.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/alloc-features/Cargo.toml b/contracts/feature-tests/alloc-features/Cargo.toml
index db968dd312..62650a2ea4 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.45.1"
+version = "0.45.2"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.1"
+version = "0.45.2"
 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 c2e5d979ba..bb5c73f486 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.45.1"
+version = "0.45.2"
 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 9385697cbb..cb4709308e 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.45.1"
+version = "0.45.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/basic-features/Cargo.toml b/contracts/feature-tests/basic-features/Cargo.toml
index 341b0e656f..814d131e17 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.45.1"
+version = "0.45.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.1"
+version = "0.45.2"
 path = "../../../framework/scenario"
 
 [dependencies.multiversx-sc-modules]
-version = "0.45.1"
+version = "0.45.2"
 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 7b731f1e14..e602559e15 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.45.1"
+version = "0.45.2"
 path = "../../../../framework/snippets"
diff --git a/contracts/feature-tests/basic-features/meta/Cargo.toml b/contracts/feature-tests/basic-features/meta/Cargo.toml
index 6ab0e1702d..5b4d8cc387 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.45.1"
+version = "0.45.2"
 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 61086000d0..f9b5f066c5 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.45.1"
+version = "0.45.2"
 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 56809696b4..51b5f99eb3 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.45.1"
+version = "0.45.2"
 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 f218062b53..3a666b46d0 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.45.1"
+version = "0.45.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.1"
+version = "0.45.2"
 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 c2dd8c2577..30e334a463 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.45.1"
+version = "0.45.2"
 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 900a3a908a..94d59e9a59 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.45.1"
+version = "0.45.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/Cargo.toml b/contracts/feature-tests/composability/Cargo.toml
index 925187f480..69b3096d30 100644
--- a/contracts/feature-tests/composability/Cargo.toml
+++ b/contracts/feature-tests/composability/Cargo.toml
@@ -33,10 +33,10 @@ path = "recursive-caller"
 path = "vault"
 
 [dependencies.multiversx-sc]
-version = "0.45.1"
+version = "0.45.2"
 path = "../../../framework/base"
 features = ["promises", "back-transfers"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.1"
+version = "0.45.2"
 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 829cb90272..397e4771b2 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.45.1"
+version = "0.45.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.1"
+version = "0.45.2"
 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 412cb7acd0..f1ea45c792 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.45.1"
+version = "0.45.2"
 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 0087000a8c..aaffa0307e 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.45.1"
+version = "0.45.2"
 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 84c46a6cd4..8c60d7a8b1 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.45.1"
+version = "0.45.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.1"
+version = "0.45.2"
 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 8995810ceb..339a0af287 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.45.1"
+version = "0.45.2"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.1"
+version = "0.45.2"
 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 9198c7a296..3c0a27bfb2 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.45.1"
+version = "0.45.2"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.45.1"
+version = "0.45.2"
 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 0058de92e4..201fbd2017 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.45.1"
+version = "0.45.2"
 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 6853bff05c..26975b1a16 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.45.1"
+version = "0.45.2"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.1"
+version = "0.45.2"
 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 0ab51cf72c..1087d19e66 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.45.1"
+version = "0.45.2"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.45.1"
+version = "0.45.2"
 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 9483b4f2b6..1c2b54fa36 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.45.1"
+version = "0.45.2"
 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 6451528fd2..52b3347cd6 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.45.1"
+version = "0.45.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.1"
+version = "0.45.2"
 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 6f933b6250..952a9c9bd3 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.45.1"
+version = "0.45.2"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.1"
+version = "0.45.2"
 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 c78646dd03..2e10a84ea2 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.45.1"
+version = "0.45.2"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.45.1"
+version = "0.45.2"
 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 966689edb3..0d607ef86d 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.45.1"
+version = "0.45.2"
 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 d38d0b0779..882568bce5 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.45.1"
+version = "0.45.2"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.1"
+version = "0.45.2"
 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 785d4ac8ff..5b99afe25b 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.45.1"
+version = "0.45.2"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.45.1"
+version = "0.45.2"
 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 afaa953a46..ea9a40d476 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.45.1"
+version = "0.45.2"
 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 90c5b3e4f6..d740647caf 100644
--- a/contracts/feature-tests/composability/forwarder-queue/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-queue/Cargo.toml
@@ -15,14 +15,14 @@ promises = ["multiversx-sc/promises"]
 path = "../vault"
 
 [dependencies.multiversx-sc]
-version = "0.45.1"
+version = "0.45.2"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.45.1"
+version = "0.45.2"
 path = "../../../../framework/wasm-adapter"
 optional = true
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.1"
+version = "0.45.2"
 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 25a35818d5..b95717a5a5 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.45.1"
+version = "0.45.2"
 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 c0b3648410..0033ab4698 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
@@ -26,7 +26,7 @@ path = ".."
 features = ["promises"]
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.45.1"
+version = "0.45.2"
 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 b02a57eb39..859fb03f56 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.45.1"
+version = "0.45.2"
 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 2c1af762c9..6e591ce9a6 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.45.1"
+version = "0.45.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.1"
+version = "0.45.2"
 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 b7d84785dd..f0ea5f9d41 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.45.1"
+version = "0.45.2"
 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 6a3ac64f0d..6025ce10ae 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.45.1"
+version = "0.45.2"
 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 f69f1146d7..255065dac9 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.45.1"
+version = "0.45.2"
 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 7252010edb..34ea5887fd 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.45.1"
+version = "0.45.2"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/forwarder/Cargo.toml b/contracts/feature-tests/composability/forwarder/Cargo.toml
index 04745f6470..a42cd6136f 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.45.1"
+version = "0.45.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.1"
+version = "0.45.2"
 path = "../../../../framework/scenario"
 
diff --git a/contracts/feature-tests/composability/forwarder/meta/Cargo.toml b/contracts/feature-tests/composability/forwarder/meta/Cargo.toml
index c02beb2026..eb4f54d18b 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.45.1"
+version = "0.45.2"
 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 ce0ba1b826..478c447ded 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.45.1"
+version = "0.45.2"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/interact/Cargo.toml b/contracts/feature-tests/composability/interact/Cargo.toml
index 9a01ea2796..506efb6dc3 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.45.1"
+version = "0.45.2"
 path = "../../../../contracts/modules"
 
 [dependencies.multiversx-sc-snippets]
-version = "0.45.1"
+version = "0.45.2"
 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 990b687d2f..2011a8354a 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.45.1"
+version = "0.45.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.1"
+version = "0.45.2"
 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 9e42039629..8452880a99 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.45.1"
+version = "0.45.2"
 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 65ad4ebd26..69bd443957 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.45.1"
+version = "0.45.2"
 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 2bb960bb81..e33304a3f9 100644
--- a/contracts/feature-tests/composability/promises-features/Cargo.toml
+++ b/contracts/feature-tests/composability/promises-features/Cargo.toml
@@ -12,7 +12,7 @@ path = "src/promises_main.rs"
 path = "../vault"
 
 [dependencies.multiversx-sc]
-version = "0.45.1"
+version = "0.45.2"
 path = "../../../../framework/base"
 features = ["promises", "back-transfers"]
 
diff --git a/contracts/feature-tests/composability/promises-features/meta/Cargo.toml b/contracts/feature-tests/composability/promises-features/meta/Cargo.toml
index 476d07c9d0..b7c546fe15 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.45.1"
+version = "0.45.2"
 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 23a3b1240c..af03baf284 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.45.1"
+version = "0.45.2"
 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 31f4092767..fa67239a13 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.45.1"
+version = "0.45.2"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.1"
+version = "0.45.2"
 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 9141ffc729..d9c4007cf1 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.45.1"
+version = "0.45.2"
 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 b1381808fb..e23bfc783a 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.45.1"
+version = "0.45.2"
 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 f9c1d0ae1a..4c6ed498d9 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.45.1"
+version = "0.45.2"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.1"
+version = "0.45.2"
 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 e48ef1b899..2e7b0e9f78 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.45.1"
+version = "0.45.2"
 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 6035bca036..beaa16da5d 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.45.1"
+version = "0.45.2"
 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 189665f4c7..5f9090844f 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.45.1"
+version = "0.45.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.1"
+version = "0.45.2"
 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 f106df9c92..262fdcd0f4 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.45.1"
+version = "0.45.2"
 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 1eada817c8..ee1d240dbd 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.45.1"
+version = "0.45.2"
 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 0a4c7f6612..13d8ef1bf8 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.45.1"
+version = "0.45.2"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.45.1"
+version = "0.45.2"
 path = "../../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.1"
+version = "0.45.2"
 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 7dc4c8e881..9629a13885 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.45.1"
+version = "0.45.2"
 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 325cca984d..665891f8b6 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.45.1"
+version = "0.45.2"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/vault/Cargo.toml b/contracts/feature-tests/composability/vault/Cargo.toml
index d91b3f97e2..277bc56f48 100644
--- a/contracts/feature-tests/composability/vault/Cargo.toml
+++ b/contracts/feature-tests/composability/vault/Cargo.toml
@@ -10,10 +10,10 @@ path = "src/vault.rs"
 
 
 [dependencies.multiversx-sc]
-version = "0.45.1"
+version = "0.45.2"
 path = "../../../../framework/base"
 features = ["promises"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.1"
+version = "0.45.2"
 path = "../../../../framework/scenario"
diff --git a/contracts/feature-tests/composability/vault/meta/Cargo.toml b/contracts/feature-tests/composability/vault/meta/Cargo.toml
index c540e98be3..c46d5fe0ea 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.45.1"
+version = "0.45.2"
 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 a7b692f00d..5d59a5e436 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.45.1"
+version = "0.45.2"
 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 ddb806ac2c..85e2506af6 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.45.1"
+version = "0.45.2"
 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 f7e8fa0d83..54e7941bd8 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.45.1"
+version = "0.45.2"
 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 b9d36e8125..86b1869509 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.45.1"
+version = "0.45.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.1"
+version = "0.45.2"
 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 0c6e3cca16..4c9121c045 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.45.1"
+version = "0.45.2"
 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 5e62ab0428..cf9c8f6da9 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.45.1"
+version = "0.45.2"
 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 2f010d140e..bfa34ef0be 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.45.1"
+version = "0.45.2"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.1"
+version = "0.45.2"
 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 ecb0cea3da..a8ce770d4d 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.45.1"
+version = "0.45.2"
 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 ac54720bd9..2a16379f23 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.45.1"
+version = "0.45.2"
 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 ef00813f83..2d2b20f749 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.45.1"
+version = "0.45.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.1"
+version = "0.45.2"
 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 8813f92d39..35f57330b2 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.45.1"
+version = "0.45.2"
 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 f1338be353..cd7d89f6d4 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.45.1"
+version = "0.45.2"
 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 3083198a27..e17744681c 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.45.1"
+version = "0.45.2"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.1"
+version = "0.45.2"
 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 b68393fa46..ca8d2ff274 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.45.1"
+version = "0.45.2"
 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 460766fdf6..39ddd43a08 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.45.1"
+version = "0.45.2"
 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 db52e2e801..22b92a8336 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.45.1"
+version = "0.45.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.1"
+version = "0.45.2"
 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 3cb820d3a2..1f4f09b80d 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.45.1"
+version = "0.45.2"
 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 42bf5e2098..e7a0ca8304 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.45.1"
+version = "0.45.2"
 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 215db619c4..1d233d3542 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.45.1"
+version = "0.45.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.1"
+version = "0.45.2"
 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 14b07b1f49..8890631888 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.45.1"
+version = "0.45.2"
 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 a90fc174e1..140e93df6b 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.45.1"
+version = "0.45.2"
 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 81218e46db..a9bcc2ff86 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.45.1"
+version = "0.45.2"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.1"
+version = "0.45.2"
 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 c0f856c47c..787a96f6c9 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.45.1"
+version = "0.45.2"
 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 d1d980894e..f56a20bff3 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.45.1"
+version = "0.45.2"
 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 43b9031e62..4bd3883cbd 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.45.1"
+version = "0.45.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.1"
+version = "0.45.2"
 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 6a08727d39..6b7ff0047b 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.45.1"
+version = "0.45.2"
 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 cc81487e0d..28763e7469 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.45.1"
+version = "0.45.2"
 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 fab7395462..02d8f60c60 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.45.1"
+version = "0.45.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.1"
+version = "0.45.2"
 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 ceb6059a77..5f17994525 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.45.1"
+version = "0.45.2"
 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 fea7b07461..58cbedfef4 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.45.1"
+version = "0.45.2"
 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 67a0f4a0ce..301e99d23e 100644
--- a/contracts/feature-tests/managed-map-features/Cargo.toml
+++ b/contracts/feature-tests/managed-map-features/Cargo.toml
@@ -8,13 +8,13 @@ publish = false
 [lib]
 path = "src/mmap_features.rs"
 [dependencies.multiversx-sc]
-version = "0.45.1"
+version = "0.45.2"
 path = "../../../framework/base"
 
 features = ["managed-map"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.1"
+version = "0.45.2"
 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 71e3d5ab5e..0f2ef250d9 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.45.1"
+version = "0.45.2"
 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 dd0c0fdf89..e37f0ad37b 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.45.1"
+version = "0.45.2"
 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 368fee9bd7..f8d022bc55 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.45.1"
+version = "0.45.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.1"
+version = "0.45.2"
 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 4c3f700741..06fd0aeb9b 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.45.1"
+version = "0.45.2"
 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 3f0d6eab36..f8d413565c 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.45.1"
+version = "0.45.2"
 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 cc08b85433..79660a3ed7 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.45.1"
+version = "0.45.2"
 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 7132841cfa..3a4a60fadb 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.45.1"
+version = "0.45.2"
 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 ca65dc3a71..7a47f4567d 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.45.1"
+version = "0.45.2"
 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 a35b828f67..f0c956a7f6 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.45.1"
+version = "0.45.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.1"
+version = "0.45.2"
 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 5499fd074c..60faa9bd75 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.45.1"
+version = "0.45.2"
 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 6c8c7c1a55..c33d0fd63d 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.45.1"
+version = "0.45.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/payable-features/Cargo.toml b/contracts/feature-tests/payable-features/Cargo.toml
index 35385978fd..5dfb5c49af 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.45.1"
+version = "0.45.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.1"
+version = "0.45.2"
 path = "../../../framework/scenario"
diff --git a/contracts/feature-tests/payable-features/meta/Cargo.toml b/contracts/feature-tests/payable-features/meta/Cargo.toml
index b7ded9bd6d..fd97bbd632 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.45.1"
+version = "0.45.2"
 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 4391446d9f..1272f6e3a8 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.45.1"
+version = "0.45.2"
 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 3b0621599e..ea100398ac 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.45.1"
+version = "0.45.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.1"
+version = "0.45.2"
 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 7ce2127a77..c7c382914c 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.45.1"
+version = "0.45.2"
 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 a16b366ab8..706dadf86e 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.45.1"
+version = "0.45.2"
 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 c25cfe0088..401456d956 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.45.1"
+// version = "0.45.2"
 // 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 6bd75a6d5c..0270b64d7e 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.45.1"
+version = "0.45.2"
 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 20d2a1c444..37f329b178 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.45.1"
+version = "0.45.2"
 path = "../../../framework/base"
 features = [ "alloc" ]
 
@@ -17,7 +17,7 @@ path = "../../examples/adder"
 path = "../../feature-tests/basic-features"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.1"
+version = "0.45.2"
 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 d87adf1402..d1a2dd9a13 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.45.1"
+version = "0.45.2"
 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 c3341837f9..c740b38556 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.45.1"
+version = "0.45.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/use-module/Cargo.toml b/contracts/feature-tests/use-module/Cargo.toml
index a2e7377719..6933b409e6 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.45.1"
+version = "0.45.2"
 path = "../../../contracts/modules"
 
 [dependencies.multiversx-sc]
-version = "0.45.1"
+version = "0.45.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.1"
+version = "0.45.2"
 path = "../../../framework/scenario"
 
 [dev-dependencies.multiversx-sc-meta]
-version = "0.45.1"
+version = "0.45.2"
 path = "../../../framework/meta"
diff --git a/contracts/feature-tests/use-module/meta/Cargo.toml b/contracts/feature-tests/use-module/meta/Cargo.toml
index ade7357238..36dcd64adf 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.45.1"
+version = "0.45.2"
 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 6e7af7af50..8a2d79a521 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.45.1"
+version = "0.45.2"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.45.1"
+version = "0.45.2"
 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 dcd1cc623f..c75a525106 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.45.1"
+            "version": "0.45.2"
         }
     },
     "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 f59784cb20..2c860fa52c 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.45.1"
+            "version": "0.45.2"
         }
     },
     "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 48e691cebd..7ec5e85cee 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.45.1"
+version = "0.45.2"
 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 fa061fc598..a8e17e3dad 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.45.1"
+version = "0.45.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/modules/Cargo.toml b/contracts/modules/Cargo.toml
index 11bdb99e7a..3885147310 100644
--- a/contracts/modules/Cargo.toml
+++ b/contracts/modules/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-modules"
-version = "0.45.1"
+version = "0.45.2"
 edition = "2021"
 
 authors = ["MultiversX <contact@multiversx.com>"]
@@ -17,5 +17,5 @@ categories = ["no-std", "wasm", "cryptography::cryptocurrencies"]
 alloc = ["multiversx-sc/alloc"]
 
 [dependencies.multiversx-sc]
-version = "0.45.1"
+version = "0.45.2"
 path = "../../framework/base"
diff --git a/data/codec-derive/Cargo.toml b/data/codec-derive/Cargo.toml
index 5b845dd421..ffa8ae4d13 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.2"
+version = "0.18.3"
 edition = "2021"
 
 authors = ["dorin.iancu <dorin.iancu@multiversx.com>", "Andrei Marinica <andrei.marinica@multiversx.com>", "MultiversX <contact@multiversx.com>"]
diff --git a/data/codec/Cargo.toml b/data/codec/Cargo.toml
index fe252c81da..6ff2fbdf9c 100644
--- a/data/codec/Cargo.toml
+++ b/data/codec/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-codec"
-version = "0.18.2"
+version = "0.18.3"
 edition = "2021"
 
 authors = ["Andrei Marinica <andrei.marinica@multiversx.com>", "MultiversX <contact@multiversx.com>"]
@@ -19,7 +19,7 @@ alloc = []
 
 [dependencies.multiversx-sc-codec-derive]
 path = "../codec-derive"
-version = "=0.18.2"
+version = "=0.18.3"
 optional = true
 
 [dependencies]
@@ -28,4 +28,4 @@ num-bigint = { version = "0.4.2", optional = true } # can only be used in std co
 
 [dev-dependencies.multiversx-sc-codec-derive]
 path = "../codec-derive"
-version = "=0.18.2"
+version = "=0.18.3"
diff --git a/framework/base/Cargo.toml b/framework/base/Cargo.toml
index 043ef72138..3c3f001f69 100644
--- a/framework/base/Cargo.toml
+++ b/framework/base/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc"
-version = "0.45.1"
+version = "0.45.2"
 edition = "2021"
 
 authors = ["Andrei Marinica <andrei.marinica@multiversx.com>", "MultiversX <contact@multiversx.com>"]
@@ -31,10 +31,10 @@ bitflags = "2.4.1"
 num-traits = { version = "0.2", default-features = false }
 
 [dependencies.multiversx-sc-derive]
-version = "=0.45.1"
+version = "=0.45.2"
 path = "../derive"
 
 [dependencies.multiversx-sc-codec]
-version = "=0.18.2"
+version = "=0.18.3"
 path = "../../data/codec"
 features = ["derive"]
diff --git a/framework/derive/Cargo.toml b/framework/derive/Cargo.toml
index b029fa42aa..a3c389a810 100644
--- a/framework/derive/Cargo.toml
+++ b/framework/derive/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-derive"
-version = "0.45.1"
+version = "0.45.2"
 edition = "2021"
 
 authors = ["Andrei Marinica <andrei.marinica@multiversx.com>", "MultiversX <contact@multiversx.com>"]
diff --git a/framework/meta/Cargo.toml b/framework/meta/Cargo.toml
index 3bf45cb721..7a832566d9 100644
--- a/framework/meta/Cargo.toml
+++ b/framework/meta/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-meta"
-version = "0.45.1"
+version = "0.45.2"
 edition = "2021"
 
 authors = [
@@ -51,7 +51,7 @@ pathdiff = { version = "0.2.1", optional = true }
 common-path = { version = "1.0.0", optional = true }
 
 [dependencies.multiversx-sc]
-version = "=0.45.1"
+version = "=0.45.2"
 path = "../base"
 features = ["alloc", "num-bigint", "promises"]
 
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 f527cc5ae9..59933e1a69 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.45.1"
+version = "0.45.2"
 
 # [workspace]
 
diff --git a/framework/meta/src/cmd/contract/meta_config.rs b/framework/meta/src/cmd/contract/meta_config.rs
index 808411eaff..4b979a6b02 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.45.1\"
+version = \"0.45.2\"
 path = \"../../../../framework/wasm-adapter\"
 
 [workspace]
@@ -218,7 +218,7 @@ members = [\".\"]
             name: "test".to_string(),
             edition: "2021".to_string(),
             profile: ContractVariantProfile::default(),
-            framework_version: "0.45.1".to_string(),
+            framework_version: "0.45.2".to_string(),
             framework_path: Option::Some("../../../framework/base".to_string()),
             contract_features: Vec::<String>::new(),
         };
diff --git a/framework/meta/src/cmd/standalone/upgrade/upgrade_selector.rs b/framework/meta/src/cmd/standalone/upgrade/upgrade_selector.rs
index 2a864c8d82..17114bdb49 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_post_processing(dir: &RelevantDirectory, settings: &UpgradeSettings)
         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.1")) => {
+        | Some((_, "0.42.0")) | Some((_, "0.43.0")) | Some((_, "0.44.0")) | Some((_, "0.45.2")) => {
             print_post_processing(dir);
             cargo_check(dir, settings);
         },
diff --git a/framework/meta/src/version_history.rs b/framework/meta/src/version_history.rs
index f2fb34c545..3bbe74cef2 100644
--- a/framework/meta/src/version_history.rs
+++ b/framework/meta/src/version_history.rs
@@ -1,7 +1,7 @@
 /// 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.1";
+pub const LAST_VERSION: &str = "0.45.2";
 
 /// Indicates where to stop with the upgrades.
 pub const LAST_UPGRADE_VERSION: &str = LAST_VERSION;
@@ -52,7 +52,7 @@ pub const VERSIONS: &[&str] = &[
     "0.43.5",
     "0.44.0",
     "0.45.0",
-    "0.45.1",
+    "0.45.2",
 ];
 
 /// We started supporting contract templates with version 0.43.0.
diff --git a/framework/scenario/Cargo.toml b/framework/scenario/Cargo.toml
index 55ba7885e9..bcfbea0499 100644
--- a/framework/scenario/Cargo.toml
+++ b/framework/scenario/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-scenario"
-version = "0.45.1"
+version = "0.45.2"
 edition = "2021"
 
 authors = [
@@ -40,25 +40,25 @@ path = "src/main.rs"
 run-go-tests = []
 
 [dependencies.multiversx-sc]
-version = "=0.45.1"
+version = "=0.45.2"
 features = ["alloc", "num-bigint"]
 path = "../base"
 
 [dependencies.multiversx-sc-meta]
-version = "=0.45.1"
+version = "=0.45.2"
 path = "../meta"
 
 [dependencies.multiversx-chain-scenario-format]
-version = "0.21.0"
+version = "0.21.1"
 path = "../../sdk/scenario-format"
 
 [dependencies.multiversx-chain-vm-executor]
 version = "0.2.0"
 
 [dependencies.multiversx-chain-vm]
-version = "=0.7.0"
+version = "=0.7.1"
 path = "../../vm"
 
 [dependencies.multiversx-sdk]
-version = "=0.3.0"
+version = "=0.3.1"
 path = "../../sdk/core"
diff --git a/framework/snippets/Cargo.toml b/framework/snippets/Cargo.toml
index 05175bee45..0bbefbea3c 100644
--- a/framework/snippets/Cargo.toml
+++ b/framework/snippets/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-snippets"
-version = "0.45.1"
+version = "0.45.2"
 edition = "2021"
 
 authors = ["MultiversX <contact@multiversx.com>"]
@@ -22,9 +22,9 @@ env_logger = "0.10"
 futures = "0.3"
 
 [dependencies.multiversx-sc-scenario]
-version = "=0.45.1"
+version = "=0.45.2"
 path = "../scenario"
 
 [dependencies.multiversx-sdk]
-version = "=0.3.0"
+version = "=0.3.1"
 path = "../../sdk/core"
diff --git a/framework/wasm-adapter/Cargo.toml b/framework/wasm-adapter/Cargo.toml
index fd83f9fdaa..c93dea85ad 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.45.1"
+version = "0.45.2"
 edition = "2021"
 
 authors = [
@@ -22,5 +22,5 @@ categories = [
 ]
 
 [dependencies.multiversx-sc]
-version = "=0.45.1"
+version = "=0.45.2"
 path = "../base"
diff --git a/sdk/core/Cargo.toml b/sdk/core/Cargo.toml
index b276349cf2..8227e5422e 100644
--- a/sdk/core/Cargo.toml
+++ b/sdk/core/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sdk"
-version = "0.3.0"
+version = "0.3.1"
 edition = "2021"
 
 authors = [
diff --git a/sdk/scenario-format/Cargo.toml b/sdk/scenario-format/Cargo.toml
index 76f0751bdc..ffa5140a1a 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.0"
+version = "0.21.1"
 edition = "2021"
 
 authors = ["Andrei Marinica <andrei.marinica@multiversx.com>", "MultiversX <contact@multiversx.com>"]
diff --git a/tools/mxpy-snippet-generator/Cargo.toml b/tools/mxpy-snippet-generator/Cargo.toml
index 5b30bd61d0..3a273a4947 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.45.1"
+version = "0.45.2"
 path = "../../framework/base"
 
 [dependencies]
diff --git a/tools/rust-debugger/format-tests/Cargo.toml b/tools/rust-debugger/format-tests/Cargo.toml
index 906f64bb06..9a490a0249 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.45.1"
+version = "0.45.2"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-scenario]
-version = "0.45.1"
+version = "0.45.2"
 path = "../../../framework/scenario"
 
 [dependencies.multiversx-chain-vm]
-version = "0.7.0"
+version = "0.7.1"
 path = "../../../vm"
 
 [dev-dependencies]
diff --git a/vm/Cargo.toml b/vm/Cargo.toml
index a26e59dfd8..6e3ffa45bf 100644
--- a/vm/Cargo.toml
+++ b/vm/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-chain-vm"
-version = "0.7.0"
+version = "0.7.1"
 edition = "2021"
 
 authors = [

From ac89cbf0fcfa1007225fc02270e56450d0f15375 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Mon, 18 Dec 2023 18:13:29 +0200
Subject: [PATCH 0172/1254] wasm crate update

---
 .../benchmarks/large-storage/wasm/Cargo.lock  | 55 ++++++--------
 .../benchmarks/large-storage/wasm/src/lib.rs  |  4 +-
 .../linked-list-repeat/wasm/Cargo.lock        | 55 ++++++--------
 .../linked-list-repeat/wasm/src/lib.rs        |  4 +-
 .../mappers/map-repeat/wasm/Cargo.lock        | 55 ++++++--------
 .../mappers/map-repeat/wasm/src/lib.rs        |  4 +-
 .../mappers/queue-repeat/wasm/Cargo.lock      | 55 ++++++--------
 .../mappers/queue-repeat/wasm/src/lib.rs      |  4 +-
 .../mappers/set-repeat/wasm/Cargo.lock        | 55 ++++++--------
 .../mappers/set-repeat/wasm/src/lib.rs        |  4 +-
 .../single-value-repeat/wasm/Cargo.lock       | 55 ++++++--------
 .../single-value-repeat/wasm/src/lib.rs       |  4 +-
 .../mappers/vec-repeat/wasm/Cargo.lock        | 55 ++++++--------
 .../mappers/vec-repeat/wasm/src/lib.rs        |  4 +-
 .../benchmarks/send-tx-repeat/wasm/Cargo.lock | 55 ++++++--------
 .../benchmarks/send-tx-repeat/wasm/src/lib.rs |  4 +-
 .../benchmarks/str-repeat/wasm/Cargo.lock     | 55 ++++++--------
 .../benchmarks/str-repeat/wasm/src/lib.rs     |  4 +-
 .../core/price-aggregator/wasm/Cargo.lock     | 74 +++++++++----------
 .../core/price-aggregator/wasm/src/lib.rs     |  4 +-
 contracts/core/wegld-swap/wasm/src/lib.rs     |  4 +-
 contracts/examples/adder/wasm/Cargo.lock      | 38 +++++-----
 contracts/examples/adder/wasm/src/lib.rs      |  4 +-
 .../bonding-curve-contract/wasm/Cargo.lock    | 57 ++++++--------
 .../bonding-curve-contract/wasm/src/lib.rs    |  4 +-
 .../examples/check-pause/wasm/Cargo.lock      | 57 ++++++--------
 .../examples/check-pause/wasm/src/lib.rs      |  4 +-
 .../crowdfunding-esdt/wasm/Cargo.lock         | 55 ++++++--------
 .../crowdfunding-esdt/wasm/src/lib.rs         |  4 +-
 .../examples/crypto-bubbles/wasm/Cargo.lock   | 55 ++++++--------
 .../examples/crypto-bubbles/wasm/src/lib.rs   |  4 +-
 .../kitty-auction/wasm/Cargo.lock             | 55 ++++++--------
 .../kitty-auction/wasm/src/lib.rs             |  4 +-
 .../kitty-genetic-alg/wasm/Cargo.lock         | 55 ++++++--------
 .../kitty-genetic-alg/wasm/src/lib.rs         |  4 +-
 .../kitty-ownership/wasm/Cargo.lock           | 55 ++++++--------
 .../kitty-ownership/wasm/src/lib.rs           |  4 +-
 .../examples/crypto-zombies/wasm/Cargo.lock   | 55 ++++++--------
 .../examples/crypto-zombies/wasm/src/lib.rs   |  4 +-
 .../examples/digital-cash/wasm/Cargo.lock     | 55 ++++++--------
 .../examples/digital-cash/wasm/src/lib.rs     |  4 +-
 contracts/examples/empty/wasm/Cargo.lock      | 55 ++++++--------
 contracts/examples/empty/wasm/src/lib.rs      |  4 +-
 .../esdt-transfer-with-fee/wasm/Cargo.lock    | 55 ++++++--------
 .../esdt-transfer-with-fee/wasm/src/lib.rs    |  4 +-
 contracts/examples/factorial/wasm/Cargo.lock  | 55 ++++++--------
 contracts/examples/factorial/wasm/src/lib.rs  |  4 +-
 .../examples/fractional-nfts/wasm/Cargo.lock  | 57 ++++++--------
 .../examples/fractional-nfts/wasm/src/lib.rs  |  4 +-
 .../examples/lottery-esdt/wasm/Cargo.lock     | 55 ++++++--------
 .../examples/lottery-esdt/wasm/src/lib.rs     |  4 +-
 .../multisig/wasm-multisig-full/Cargo.lock    | 57 ++++++--------
 .../multisig/wasm-multisig-full/src/lib.rs    |  4 +-
 .../multisig/wasm-multisig-view/Cargo.lock    | 57 ++++++--------
 .../multisig/wasm-multisig-view/src/lib.rs    |  4 +-
 contracts/examples/multisig/wasm/Cargo.lock   | 57 ++++++--------
 contracts/examples/multisig/wasm/src/lib.rs   |  4 +-
 contracts/examples/nft-minter/wasm/Cargo.lock | 55 ++++++--------
 contracts/examples/nft-minter/wasm/src/lib.rs |  4 +-
 .../nft-storage-prepay/wasm/Cargo.lock        | 55 ++++++--------
 .../nft-storage-prepay/wasm/src/lib.rs        |  4 +-
 .../examples/nft-subscription/wasm/Cargo.lock | 57 ++++++--------
 .../examples/nft-subscription/wasm/src/lib.rs |  4 +-
 .../order-book/factory/wasm/Cargo.lock        | 55 ++++++--------
 .../order-book/factory/wasm/src/lib.rs        |  4 +-
 .../examples/order-book/pair/wasm/Cargo.lock  | 55 ++++++--------
 .../examples/order-book/pair/wasm/src/lib.rs  |  4 +-
 .../examples/ping-pong-egld/wasm/Cargo.lock   | 55 ++++++--------
 .../examples/ping-pong-egld/wasm/src/lib.rs   |  4 +-
 .../examples/proxy-pause/wasm/Cargo.lock      | 55 ++++++--------
 .../examples/proxy-pause/wasm/src/lib.rs      |  4 +-
 .../rewards-distribution/wasm/Cargo.lock      | 57 ++++++--------
 .../rewards-distribution/wasm/src/lib.rs      |  4 +-
 .../examples/seed-nft-minter/wasm/Cargo.lock  | 57 ++++++--------
 .../examples/seed-nft-minter/wasm/src/lib.rs  |  4 +-
 .../examples/token-release/wasm/Cargo.lock    | 55 ++++++--------
 .../examples/token-release/wasm/src/lib.rs    |  4 +-
 .../abi-tester/wasm-abi-tester-ev/Cargo.lock  | 55 ++++++--------
 .../abi-tester/wasm-abi-tester-ev/src/lib.rs  |  4 +-
 .../feature-tests/abi-tester/wasm/Cargo.lock  | 55 ++++++--------
 .../feature-tests/abi-tester/wasm/src/lib.rs  |  4 +-
 .../alloc-features/wasm/Cargo.lock            | 55 ++++++--------
 .../alloc-features/wasm/src/lib.rs            |  4 +-
 .../Cargo.lock                                | 57 ++++++--------
 .../src/lib.rs                                |  4 +-
 .../basic-features/wasm/Cargo.lock            | 57 ++++++--------
 .../basic-features/wasm/src/lib.rs            |  4 +-
 .../big-float-features/wasm/Cargo.lock        | 55 ++++++--------
 .../big-float-features/wasm/src/lib.rs        |  4 +-
 .../builtin-func-features/wasm/Cargo.lock     | 55 ++++++--------
 .../builtin-func-features/wasm/src/lib.rs     |  4 +-
 .../first-contract/wasm/Cargo.lock            | 55 ++++++--------
 .../first-contract/wasm/src/lib.rs            |  4 +-
 .../second-contract/wasm/Cargo.lock           | 55 ++++++--------
 .../second-contract/wasm/src/lib.rs           |  4 +-
 .../child/wasm/Cargo.lock                     | 55 ++++++--------
 .../child/wasm/src/lib.rs                     |  4 +-
 .../parent/wasm/Cargo.lock                    | 55 ++++++--------
 .../parent/wasm/src/lib.rs                    |  4 +-
 .../wasm-forwarder-queue-promises/Cargo.lock  | 55 ++++++--------
 .../wasm-forwarder-queue-promises/src/lib.rs  |  4 +-
 .../forwarder-queue/wasm/Cargo.lock           | 55 ++++++--------
 .../forwarder-queue/wasm/src/lib.rs           |  4 +-
 .../Cargo.lock                                | 55 ++++++--------
 .../src/lib.rs                                |  4 +-
 .../Cargo.lock                                | 55 ++++++--------
 .../src/lib.rs                                |  4 +-
 .../forwarder-raw/wasm/Cargo.lock             | 55 ++++++--------
 .../forwarder-raw/wasm/src/lib.rs             |  4 +-
 .../composability/forwarder/wasm/Cargo.lock   | 55 ++++++--------
 .../composability/forwarder/wasm/src/lib.rs   |  4 +-
 .../local-esdt-and-nft/wasm/Cargo.lock        | 55 ++++++--------
 .../local-esdt-and-nft/wasm/src/lib.rs        |  4 +-
 .../promises-features/wasm/Cargo.lock         | 55 ++++++--------
 .../promises-features/wasm/src/lib.rs         |  9 +--
 .../proxy-test-first/wasm/Cargo.lock          | 55 ++++++--------
 .../proxy-test-first/wasm/src/lib.rs          |  4 +-
 .../proxy-test-second/wasm/Cargo.lock         | 55 ++++++--------
 .../proxy-test-second/wasm/src/lib.rs         |  4 +-
 .../recursive-caller/wasm/Cargo.lock          | 55 ++++++--------
 .../recursive-caller/wasm/src/lib.rs          |  4 +-
 .../transfer-role-features/wasm/Cargo.lock    | 57 ++++++--------
 .../transfer-role-features/wasm/src/lib.rs    |  4 +-
 .../vault/wasm-vault-promises/Cargo.lock      | 55 ++++++--------
 .../vault/wasm-vault-promises/src/lib.rs      |  4 +-
 .../vault/wasm-vault-upgrade/Cargo.lock       | 55 ++++++--------
 .../vault/wasm-vault-upgrade/src/lib.rs       |  4 +-
 .../composability/vault/wasm/Cargo.lock       | 55 ++++++--------
 .../composability/vault/wasm/src/lib.rs       |  4 +-
 .../crowdfunding-erc20/wasm/Cargo.lock        | 55 ++++++--------
 .../crowdfunding-erc20/wasm/src/lib.rs        |  4 +-
 .../erc1155-marketplace/wasm/Cargo.lock       | 55 ++++++--------
 .../erc1155-marketplace/wasm/src/lib.rs       |  4 +-
 .../erc1155-user-mock/wasm/Cargo.lock         | 55 ++++++--------
 .../erc1155-user-mock/wasm/src/lib.rs         |  4 +-
 .../erc1155/wasm/Cargo.lock                   | 55 ++++++--------
 .../erc1155/wasm/src/lib.rs                   |  4 +-
 .../erc-style-contracts/erc20/wasm/Cargo.lock | 55 ++++++--------
 .../erc-style-contracts/erc20/wasm/src/lib.rs |  4 +-
 .../erc721/wasm/Cargo.lock                    | 55 ++++++--------
 .../erc721/wasm/src/lib.rs                    |  4 +-
 .../lottery-erc20/wasm/Cargo.lock             | 55 ++++++--------
 .../lottery-erc20/wasm/src/lib.rs             |  4 +-
 .../esdt-system-sc-mock/wasm/Cargo.lock       | 55 ++++++--------
 .../esdt-system-sc-mock/wasm/src/lib.rs       |  4 +-
 .../wasm/Cargo.lock                           | 55 ++++++--------
 .../wasm/src/lib.rs                           |  4 +-
 .../managed-map-features/wasm/Cargo.lock      | 55 ++++++--------
 .../managed-map-features/wasm/src/lib.rs      |  4 +-
 .../wasm-multi-contract-alt-impl/Cargo.lock   | 55 ++++++--------
 .../wasm-multi-contract-alt-impl/src/lib.rs   |  4 +-
 .../Cargo.lock                                | 55 ++++++--------
 .../src/lib.rs                                |  4 +-
 .../Cargo.lock                                | 55 ++++++--------
 .../src/lib.rs                                |  4 +-
 .../multi-contract-features/wasm/Cargo.lock   | 55 ++++++--------
 .../multi-contract-features/wasm/src/lib.rs   |  4 +-
 .../panic-message-features/wasm/Cargo.lock    | 55 ++++++--------
 .../panic-message-features/wasm/src/lib.rs    |  4 +-
 .../payable-features/wasm/Cargo.lock          | 55 ++++++--------
 .../payable-features/wasm/src/lib.rs          |  4 +-
 .../wasm/Cargo.lock                           | 55 ++++++--------
 .../wasm/src/lib.rs                           |  4 +-
 .../wasm/Cargo.lock                           | 55 ++++++--------
 .../wasm/src/lib.rs                           |  4 +-
 .../wasm-use-module-view/Cargo.lock           | 57 ++++++--------
 .../wasm-use-module-view/src/lib.rs           |  4 +-
 .../feature-tests/use-module/wasm/Cargo.lock  | 57 ++++++--------
 .../feature-tests/use-module/wasm/src/lib.rs  |  4 +-
 169 files changed, 1962 insertions(+), 3033 deletions(-)

diff --git a/contracts/benchmarks/large-storage/wasm/Cargo.lock b/contracts/benchmarks/large-storage/wasm/Cargo.lock
index d4b8b2d564..cfdaf85f15 100755
--- a/contracts/benchmarks/large-storage/wasm/Cargo.lock
+++ b/contracts/benchmarks/large-storage/wasm/Cargo.lock
@@ -34,9 +34,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "bitflags"
-version = "1.3.2"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
 
 [[package]]
 name = "cfg-if"
@@ -52,9 +52,9 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.14.2"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 dependencies = [
  "ahash",
  "allocator-api2",
@@ -89,7 +89,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -101,7 +101,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -109,28 +109,28 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
  "radix_trie",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "multiversx-sc",
 ]
@@ -155,15 +155,15 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.69"
+version = "1.0.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
 dependencies = [
  "unicode-ident",
 ]
@@ -195,20 +195,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "1.0.109"
+version = "2.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.39"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
+checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -229,20 +218,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
+checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
+checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn",
 ]
diff --git a/contracts/benchmarks/large-storage/wasm/src/lib.rs b/contracts/benchmarks/large-storage/wasm/src/lib.rs
index 1599c5009b..7637992615 100644
--- a/contracts/benchmarks/large-storage/wasm/src/lib.rs
+++ b/contracts/benchmarks/large-storage/wasm/src/lib.rs
@@ -10,9 +10,7 @@
 // Total number of exported functions:   4
 
 #![no_std]
-
-// Configuration that works with rustc < 1.73.0.
-// TODO: Recommended rustc version: 1.73.0 or newer.
+#![allow(internal_features)]
 #![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
diff --git a/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.lock
index 1f495f097b..4c4b300512 100644
--- a/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.lock
+++ b/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.lock
@@ -41,9 +41,9 @@ dependencies = [
 
 [[package]]
 name = "bitflags"
-version = "1.3.2"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
 
 [[package]]
 name = "cfg-if"
@@ -59,9 +59,9 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.14.2"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 dependencies = [
  "ahash",
  "allocator-api2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -109,7 +109,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -117,28 +117,28 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
  "radix_trie",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "multiversx-sc",
 ]
@@ -163,15 +163,15 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.69"
+version = "1.0.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
 dependencies = [
  "unicode-ident",
 ]
@@ -203,20 +203,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "1.0.109"
+version = "2.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.39"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
+checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -237,20 +226,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
+checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
+checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn",
 ]
diff --git a/contracts/benchmarks/mappers/linked-list-repeat/wasm/src/lib.rs b/contracts/benchmarks/mappers/linked-list-repeat/wasm/src/lib.rs
index 5f1783962e..626c63d138 100644
--- a/contracts/benchmarks/mappers/linked-list-repeat/wasm/src/lib.rs
+++ b/contracts/benchmarks/mappers/linked-list-repeat/wasm/src/lib.rs
@@ -10,9 +10,7 @@
 // Total number of exported functions:  10
 
 #![no_std]
-
-// Configuration that works with rustc < 1.73.0.
-// TODO: Recommended rustc version: 1.73.0 or newer.
+#![allow(internal_features)]
 #![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
diff --git a/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.lock
index 18ec0ebfec..52c3365196 100644
--- a/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.lock
+++ b/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.lock
@@ -41,9 +41,9 @@ dependencies = [
 
 [[package]]
 name = "bitflags"
-version = "1.3.2"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
 
 [[package]]
 name = "cfg-if"
@@ -59,9 +59,9 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.14.2"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 dependencies = [
  "ahash",
  "allocator-api2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -109,7 +109,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -117,28 +117,28 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
  "radix_trie",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "multiversx-sc",
 ]
@@ -163,15 +163,15 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.69"
+version = "1.0.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
 dependencies = [
  "unicode-ident",
 ]
@@ -203,20 +203,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "1.0.109"
+version = "2.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.39"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
+checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -237,20 +226,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
+checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
+checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn",
 ]
diff --git a/contracts/benchmarks/mappers/map-repeat/wasm/src/lib.rs b/contracts/benchmarks/mappers/map-repeat/wasm/src/lib.rs
index 5ea8448e8f..cd006d5384 100644
--- a/contracts/benchmarks/mappers/map-repeat/wasm/src/lib.rs
+++ b/contracts/benchmarks/mappers/map-repeat/wasm/src/lib.rs
@@ -10,9 +10,7 @@
 // Total number of exported functions:   8
 
 #![no_std]
-
-// Configuration that works with rustc < 1.73.0.
-// TODO: Recommended rustc version: 1.73.0 or newer.
+#![allow(internal_features)]
 #![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
diff --git a/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.lock
index 31bd71f2e6..a5a929e029 100644
--- a/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.lock
+++ b/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.lock
@@ -41,9 +41,9 @@ dependencies = [
 
 [[package]]
 name = "bitflags"
-version = "1.3.2"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
 
 [[package]]
 name = "cfg-if"
@@ -59,9 +59,9 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.14.2"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 dependencies = [
  "ahash",
  "allocator-api2",
@@ -81,7 +81,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -93,7 +93,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -101,28 +101,28 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
  "radix_trie",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "multiversx-sc",
 ]
@@ -147,15 +147,15 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.69"
+version = "1.0.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
 dependencies = [
  "unicode-ident",
 ]
@@ -203,20 +203,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "1.0.109"
+version = "2.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.39"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
+checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -237,20 +226,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
+checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
+checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn",
 ]
diff --git a/contracts/benchmarks/mappers/queue-repeat/wasm/src/lib.rs b/contracts/benchmarks/mappers/queue-repeat/wasm/src/lib.rs
index 714e3860f1..9eb5f3ac5b 100644
--- a/contracts/benchmarks/mappers/queue-repeat/wasm/src/lib.rs
+++ b/contracts/benchmarks/mappers/queue-repeat/wasm/src/lib.rs
@@ -10,9 +10,7 @@
 // Total number of exported functions:  10
 
 #![no_std]
-
-// Configuration that works with rustc < 1.73.0.
-// TODO: Recommended rustc version: 1.73.0 or newer.
+#![allow(internal_features)]
 #![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
diff --git a/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.lock
index df098fca1b..839ad62528 100644
--- a/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.lock
+++ b/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.lock
@@ -41,9 +41,9 @@ dependencies = [
 
 [[package]]
 name = "bitflags"
-version = "1.3.2"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
 
 [[package]]
 name = "cfg-if"
@@ -59,9 +59,9 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.14.2"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 dependencies = [
  "ahash",
  "allocator-api2",
@@ -81,7 +81,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -93,7 +93,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -101,28 +101,28 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
  "radix_trie",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "multiversx-sc",
 ]
@@ -147,15 +147,15 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.69"
+version = "1.0.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
 dependencies = [
  "unicode-ident",
 ]
@@ -203,20 +203,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "1.0.109"
+version = "2.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.39"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
+checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -237,20 +226,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
+checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
+checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn",
 ]
diff --git a/contracts/benchmarks/mappers/set-repeat/wasm/src/lib.rs b/contracts/benchmarks/mappers/set-repeat/wasm/src/lib.rs
index 965890c862..26158eb9da 100644
--- a/contracts/benchmarks/mappers/set-repeat/wasm/src/lib.rs
+++ b/contracts/benchmarks/mappers/set-repeat/wasm/src/lib.rs
@@ -10,9 +10,7 @@
 // Total number of exported functions:  10
 
 #![no_std]
-
-// Configuration that works with rustc < 1.73.0.
-// TODO: Recommended rustc version: 1.73.0 or newer.
+#![allow(internal_features)]
 #![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
diff --git a/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.lock
index 489f1699b5..5fbfb62193 100644
--- a/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.lock
+++ b/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.lock
@@ -41,9 +41,9 @@ dependencies = [
 
 [[package]]
 name = "bitflags"
-version = "1.3.2"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
 
 [[package]]
 name = "cfg-if"
@@ -59,9 +59,9 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.14.2"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 dependencies = [
  "ahash",
  "allocator-api2",
@@ -81,7 +81,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -93,7 +93,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -101,28 +101,28 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
  "radix_trie",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "multiversx-sc",
 ]
@@ -147,15 +147,15 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.69"
+version = "1.0.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
 dependencies = [
  "unicode-ident",
 ]
@@ -203,20 +203,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "1.0.109"
+version = "2.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.39"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
+checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -237,20 +226,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
+checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
+checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn",
 ]
diff --git a/contracts/benchmarks/mappers/single-value-repeat/wasm/src/lib.rs b/contracts/benchmarks/mappers/single-value-repeat/wasm/src/lib.rs
index 34160833c4..ced8d7e061 100644
--- a/contracts/benchmarks/mappers/single-value-repeat/wasm/src/lib.rs
+++ b/contracts/benchmarks/mappers/single-value-repeat/wasm/src/lib.rs
@@ -10,9 +10,7 @@
 // Total number of exported functions:   8
 
 #![no_std]
-
-// Configuration that works with rustc < 1.73.0.
-// TODO: Recommended rustc version: 1.73.0 or newer.
+#![allow(internal_features)]
 #![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
diff --git a/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.lock
index cf5fe0c9b4..b7fee88c63 100644
--- a/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.lock
+++ b/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.lock
@@ -41,9 +41,9 @@ dependencies = [
 
 [[package]]
 name = "bitflags"
-version = "1.3.2"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
 
 [[package]]
 name = "cfg-if"
@@ -59,9 +59,9 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.14.2"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 dependencies = [
  "ahash",
  "allocator-api2",
@@ -81,7 +81,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -93,7 +93,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -101,28 +101,28 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
  "radix_trie",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "multiversx-sc",
 ]
@@ -147,15 +147,15 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.69"
+version = "1.0.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
 dependencies = [
  "unicode-ident",
 ]
@@ -187,20 +187,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "1.0.109"
+version = "2.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.39"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
+checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -237,20 +226,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
+checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
+checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn",
 ]
diff --git a/contracts/benchmarks/mappers/vec-repeat/wasm/src/lib.rs b/contracts/benchmarks/mappers/vec-repeat/wasm/src/lib.rs
index 7d94c15f2b..353338d425 100644
--- a/contracts/benchmarks/mappers/vec-repeat/wasm/src/lib.rs
+++ b/contracts/benchmarks/mappers/vec-repeat/wasm/src/lib.rs
@@ -10,9 +10,7 @@
 // Total number of exported functions:  10
 
 #![no_std]
-
-// Configuration that works with rustc < 1.73.0.
-// TODO: Recommended rustc version: 1.73.0 or newer.
+#![allow(internal_features)]
 #![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
diff --git a/contracts/benchmarks/send-tx-repeat/wasm/Cargo.lock b/contracts/benchmarks/send-tx-repeat/wasm/Cargo.lock
index e4660dc801..415e994327 100755
--- a/contracts/benchmarks/send-tx-repeat/wasm/Cargo.lock
+++ b/contracts/benchmarks/send-tx-repeat/wasm/Cargo.lock
@@ -34,9 +34,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "bitflags"
-version = "1.3.2"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
 
 [[package]]
 name = "cfg-if"
@@ -52,9 +52,9 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.14.2"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 dependencies = [
  "ahash",
  "allocator-api2",
@@ -74,7 +74,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -94,28 +94,28 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
  "radix_trie",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "multiversx-sc",
 ]
@@ -140,15 +140,15 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.69"
+version = "1.0.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
 dependencies = [
  "unicode-ident",
 ]
@@ -195,20 +195,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "1.0.109"
+version = "2.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.39"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
+checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -229,20 +218,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
+checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
+checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn",
 ]
diff --git a/contracts/benchmarks/send-tx-repeat/wasm/src/lib.rs b/contracts/benchmarks/send-tx-repeat/wasm/src/lib.rs
index 6d447b6d11..756fb62d43 100644
--- a/contracts/benchmarks/send-tx-repeat/wasm/src/lib.rs
+++ b/contracts/benchmarks/send-tx-repeat/wasm/src/lib.rs
@@ -10,9 +10,7 @@
 // Total number of exported functions:   3
 
 #![no_std]
-
-// Configuration that works with rustc < 1.73.0.
-// TODO: Recommended rustc version: 1.73.0 or newer.
+#![allow(internal_features)]
 #![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
diff --git a/contracts/benchmarks/str-repeat/wasm/Cargo.lock b/contracts/benchmarks/str-repeat/wasm/Cargo.lock
index b2fc5abf37..737f08c8fc 100755
--- a/contracts/benchmarks/str-repeat/wasm/Cargo.lock
+++ b/contracts/benchmarks/str-repeat/wasm/Cargo.lock
@@ -34,9 +34,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "bitflags"
-version = "1.3.2"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
 
 [[package]]
 name = "cfg-if"
@@ -52,9 +52,9 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.14.2"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 dependencies = [
  "ahash",
  "allocator-api2",
@@ -74,7 +74,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -94,28 +94,28 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
  "radix_trie",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "multiversx-sc",
 ]
@@ -140,15 +140,15 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.69"
+version = "1.0.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
 dependencies = [
  "unicode-ident",
 ]
@@ -195,20 +195,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "1.0.109"
+version = "2.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.39"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
+checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -229,20 +218,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
+checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
+checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn",
 ]
diff --git a/contracts/benchmarks/str-repeat/wasm/src/lib.rs b/contracts/benchmarks/str-repeat/wasm/src/lib.rs
index 894a1bc4c0..45af6112da 100644
--- a/contracts/benchmarks/str-repeat/wasm/src/lib.rs
+++ b/contracts/benchmarks/str-repeat/wasm/src/lib.rs
@@ -10,9 +10,7 @@
 // Total number of exported functions:   5
 
 #![no_std]
-
-// Configuration that works with rustc < 1.73.0.
-// TODO: Recommended rustc version: 1.73.0 or newer.
+#![allow(internal_features)]
 #![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!(leaking);
diff --git a/contracts/core/price-aggregator/wasm/Cargo.lock b/contracts/core/price-aggregator/wasm/Cargo.lock
index 34d7a4b381..9dfe2520af 100644
--- a/contracts/core/price-aggregator/wasm/Cargo.lock
+++ b/contracts/core/price-aggregator/wasm/Cargo.lock
@@ -34,9 +34,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "bitflags"
-version = "1.3.2"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
 
 [[package]]
 name = "bumpalo"
@@ -71,9 +71,9 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.14.2"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 dependencies = [
  "ahash",
  "allocator-api2",
@@ -93,18 +93,18 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "js-sys"
-version = "0.3.65"
+version = "0.3.66"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54c0c35952f67de54bb584e9fd912b3023117cbafc0a77d8f3dee1fb5f572fe8"
+checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca"
 dependencies = [
  "wasm-bindgen",
 ]
 
 [[package]]
 name = "libc"
-version = "0.2.150"
+version = "0.2.151"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c"
+checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4"
 
 [[package]]
 name = "log"
@@ -114,7 +114,7 @@ checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
 
 [[package]]
 name = "multiversx-price-aggregator-sc"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "arrayvec",
  "getrandom",
@@ -133,7 +133,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -145,7 +145,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -153,7 +153,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -163,7 +163,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -174,14 +174,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "multiversx-sc",
 ]
@@ -206,9 +206,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "ppv-lite86"
@@ -218,9 +218,9 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.69"
+version = "1.0.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
 dependencies = [
  "unicode-ident",
 ]
@@ -282,9 +282,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "2.0.39"
+version = "2.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
+checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -311,9 +311,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.88"
+version = "0.2.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7daec296f25a1bae309c0cd5c29c4b260e510e6d813c286b19eaadf409d40fce"
+checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e"
 dependencies = [
  "cfg-if",
  "wasm-bindgen-macro",
@@ -321,24 +321,24 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.88"
+version = "0.2.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e397f4664c0e4e428e8313a469aaa58310d302159845980fd23b0f22a847f217"
+checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826"
 dependencies = [
  "bumpalo",
  "log",
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.88"
+version = "0.2.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5961017b3b08ad5f3fe39f1e79877f8ee7c23c5e5fd5eb80de95abc41f1f16b2"
+checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -346,37 +346,37 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.88"
+version = "0.2.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5353b8dab669f5e10f5bd76df26a9360c748f054f862ff5f3f8aae0c7fb3907"
+checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.88"
+version = "0.2.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d046c5d029ba91a1ed14da14dca44b68bf2f124cfbaf741c54151fdb3e0750b"
+checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
+checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
+checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/core/price-aggregator/wasm/src/lib.rs b/contracts/core/price-aggregator/wasm/src/lib.rs
index 1c133766d6..54fe29d855 100644
--- a/contracts/core/price-aggregator/wasm/src/lib.rs
+++ b/contracts/core/price-aggregator/wasm/src/lib.rs
@@ -10,9 +10,7 @@
 // Total number of exported functions:  23
 
 #![no_std]
-
-// Configuration that works with rustc < 1.73.0.
-// TODO: Recommended rustc version: 1.73.0 or newer.
+#![allow(internal_features)]
 #![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
diff --git a/contracts/core/wegld-swap/wasm/src/lib.rs b/contracts/core/wegld-swap/wasm/src/lib.rs
index 76a43a0227..40848a69a7 100644
--- a/contracts/core/wegld-swap/wasm/src/lib.rs
+++ b/contracts/core/wegld-swap/wasm/src/lib.rs
@@ -10,9 +10,7 @@
 // Total number of exported functions:   9
 
 #![no_std]
-
-// Configuration that works with rustc < 1.73.0.
-// TODO: Recommended rustc version: 1.73.0 or newer.
+#![allow(internal_features)]
 #![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
diff --git a/contracts/examples/adder/wasm/Cargo.lock b/contracts/examples/adder/wasm/Cargo.lock
index d1bf10562e..d513059fde 100755
--- a/contracts/examples/adder/wasm/Cargo.lock
+++ b/contracts/examples/adder/wasm/Cargo.lock
@@ -49,9 +49,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "bitflags"
-version = "1.3.2"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
 
 [[package]]
 name = "cfg-if"
@@ -67,9 +67,9 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.14.2"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 dependencies = [
  "ahash",
  "allocator-api2",
@@ -89,7 +89,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -101,7 +101,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -109,7 +109,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -119,7 +119,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -130,7 +130,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "multiversx-sc",
 ]
@@ -155,15 +155,15 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.69"
+version = "1.0.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
 dependencies = [
  "unicode-ident",
 ]
@@ -195,9 +195,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "2.0.39"
+version = "2.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
+checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -218,18 +218,18 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
+checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
+checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/adder/wasm/src/lib.rs b/contracts/examples/adder/wasm/src/lib.rs
index b364edf422..13bb12ad6e 100644
--- a/contracts/examples/adder/wasm/src/lib.rs
+++ b/contracts/examples/adder/wasm/src/lib.rs
@@ -10,9 +10,7 @@
 // Total number of exported functions:   5
 
 #![no_std]
-
-// Configuration that works with rustc < 1.73.0.
-// TODO: Recommended rustc version: 1.73.0 or newer.
+#![allow(internal_features)]
 #![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
diff --git a/contracts/examples/bonding-curve-contract/wasm/Cargo.lock b/contracts/examples/bonding-curve-contract/wasm/Cargo.lock
index 102a8e2f9f..1a2abf2d5a 100644
--- a/contracts/examples/bonding-curve-contract/wasm/Cargo.lock
+++ b/contracts/examples/bonding-curve-contract/wasm/Cargo.lock
@@ -34,9 +34,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "bitflags"
-version = "1.3.2"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
 
 [[package]]
 name = "bonding-curve-contract"
@@ -68,9 +68,9 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.14.2"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 dependencies = [
  "ahash",
  "allocator-api2",
@@ -90,7 +90,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -102,7 +102,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -110,35 +110,35 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
  "radix_trie",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "multiversx-sc",
 ]
@@ -163,15 +163,15 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.69"
+version = "1.0.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
 dependencies = [
  "unicode-ident",
 ]
@@ -203,20 +203,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "1.0.109"
+version = "2.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.39"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
+checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -237,20 +226,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
+checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
+checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn",
 ]
diff --git a/contracts/examples/bonding-curve-contract/wasm/src/lib.rs b/contracts/examples/bonding-curve-contract/wasm/src/lib.rs
index 31976155e8..ca35cf266b 100644
--- a/contracts/examples/bonding-curve-contract/wasm/src/lib.rs
+++ b/contracts/examples/bonding-curve-contract/wasm/src/lib.rs
@@ -10,9 +10,7 @@
 // Total number of exported functions:  12
 
 #![no_std]
-
-// Configuration that works with rustc < 1.73.0.
-// TODO: Recommended rustc version: 1.73.0 or newer.
+#![allow(internal_features)]
 #![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
diff --git a/contracts/examples/check-pause/wasm/Cargo.lock b/contracts/examples/check-pause/wasm/Cargo.lock
index 73b6315dfe..21a5c737dd 100644
--- a/contracts/examples/check-pause/wasm/Cargo.lock
+++ b/contracts/examples/check-pause/wasm/Cargo.lock
@@ -34,9 +34,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "bitflags"
-version = "1.3.2"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
 
 [[package]]
 name = "cfg-if"
@@ -68,9 +68,9 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.14.2"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 dependencies = [
  "ahash",
  "allocator-api2",
@@ -90,7 +90,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -102,7 +102,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -110,35 +110,35 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
  "radix_trie",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "multiversx-sc",
 ]
@@ -163,15 +163,15 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.69"
+version = "1.0.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
 dependencies = [
  "unicode-ident",
 ]
@@ -203,20 +203,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "1.0.109"
+version = "2.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.39"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
+checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -237,20 +226,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
+checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
+checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn",
 ]
diff --git a/contracts/examples/check-pause/wasm/src/lib.rs b/contracts/examples/check-pause/wasm/src/lib.rs
index b3f3bdda8f..550768b6ee 100644
--- a/contracts/examples/check-pause/wasm/src/lib.rs
+++ b/contracts/examples/check-pause/wasm/src/lib.rs
@@ -10,9 +10,7 @@
 // Total number of exported functions:   6
 
 #![no_std]
-
-// Configuration that works with rustc < 1.73.0.
-// TODO: Recommended rustc version: 1.73.0 or newer.
+#![allow(internal_features)]
 #![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
diff --git a/contracts/examples/crowdfunding-esdt/wasm/Cargo.lock b/contracts/examples/crowdfunding-esdt/wasm/Cargo.lock
index aed11fe8ec..c1ab00b824 100644
--- a/contracts/examples/crowdfunding-esdt/wasm/Cargo.lock
+++ b/contracts/examples/crowdfunding-esdt/wasm/Cargo.lock
@@ -34,9 +34,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "bitflags"
-version = "1.3.2"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
 
 [[package]]
 name = "cfg-if"
@@ -67,9 +67,9 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.14.2"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 dependencies = [
  "ahash",
  "allocator-api2",
@@ -89,7 +89,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -101,7 +101,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -109,28 +109,28 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
  "radix_trie",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "multiversx-sc",
 ]
@@ -155,15 +155,15 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.69"
+version = "1.0.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
 dependencies = [
  "unicode-ident",
 ]
@@ -195,20 +195,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "1.0.109"
+version = "2.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.39"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
+checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -229,20 +218,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
+checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
+checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn",
 ]
diff --git a/contracts/examples/crowdfunding-esdt/wasm/src/lib.rs b/contracts/examples/crowdfunding-esdt/wasm/src/lib.rs
index 192f0dfcd0..6a27253313 100644
--- a/contracts/examples/crowdfunding-esdt/wasm/src/lib.rs
+++ b/contracts/examples/crowdfunding-esdt/wasm/src/lib.rs
@@ -10,9 +10,7 @@
 // Total number of exported functions:  10
 
 #![no_std]
-
-// Configuration that works with rustc < 1.73.0.
-// TODO: Recommended rustc version: 1.73.0 or newer.
+#![allow(internal_features)]
 #![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
diff --git a/contracts/examples/crypto-bubbles/wasm/Cargo.lock b/contracts/examples/crypto-bubbles/wasm/Cargo.lock
index 607e62bee5..65d36c5e62 100755
--- a/contracts/examples/crypto-bubbles/wasm/Cargo.lock
+++ b/contracts/examples/crypto-bubbles/wasm/Cargo.lock
@@ -34,9 +34,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "bitflags"
-version = "1.3.2"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
 
 [[package]]
 name = "cfg-if"
@@ -67,9 +67,9 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.14.2"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 dependencies = [
  "ahash",
  "allocator-api2",
@@ -89,7 +89,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -101,7 +101,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -109,28 +109,28 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
  "radix_trie",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "multiversx-sc",
 ]
@@ -155,15 +155,15 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.69"
+version = "1.0.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
 dependencies = [
  "unicode-ident",
 ]
@@ -195,20 +195,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "1.0.109"
+version = "2.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.39"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
+checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -229,20 +218,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
+checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
+checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn",
 ]
diff --git a/contracts/examples/crypto-bubbles/wasm/src/lib.rs b/contracts/examples/crypto-bubbles/wasm/src/lib.rs
index 842f0092af..97bc42e80e 100644
--- a/contracts/examples/crypto-bubbles/wasm/src/lib.rs
+++ b/contracts/examples/crypto-bubbles/wasm/src/lib.rs
@@ -10,9 +10,7 @@
 // Total number of exported functions:   8
 
 #![no_std]
-
-// Configuration that works with rustc < 1.73.0.
-// TODO: Recommended rustc version: 1.73.0 or newer.
+#![allow(internal_features)]
 #![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
diff --git a/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.lock b/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.lock
index ebb9503820..c42bb11e81 100755
--- a/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.lock
+++ b/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.lock
@@ -34,9 +34,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "bitflags"
-version = "1.3.2"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
 
 [[package]]
 name = "cfg-if"
@@ -52,9 +52,9 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.14.2"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 dependencies = [
  "ahash",
  "allocator-api2",
@@ -118,7 +118,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -130,7 +130,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -138,28 +138,28 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
  "radix_trie",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "multiversx-sc",
 ]
@@ -184,15 +184,15 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.69"
+version = "1.0.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
 dependencies = [
  "unicode-ident",
 ]
@@ -231,20 +231,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "1.0.109"
+version = "2.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.39"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
+checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -265,20 +254,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
+checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
+checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn",
 ]
diff --git a/contracts/examples/crypto-kitties/kitty-auction/wasm/src/lib.rs b/contracts/examples/crypto-kitties/kitty-auction/wasm/src/lib.rs
index d8a28c4c3a..7101d00f12 100644
--- a/contracts/examples/crypto-kitties/kitty-auction/wasm/src/lib.rs
+++ b/contracts/examples/crypto-kitties/kitty-auction/wasm/src/lib.rs
@@ -10,9 +10,7 @@
 // Total number of exported functions:  11
 
 #![no_std]
-
-// Configuration that works with rustc < 1.73.0.
-// TODO: Recommended rustc version: 1.73.0 or newer.
+#![allow(internal_features)]
 #![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
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 d6445a405e..25481f9670 100755
--- a/contracts/examples/crypto-kitties/kitty-genetic-alg/wasm/Cargo.lock
+++ b/contracts/examples/crypto-kitties/kitty-genetic-alg/wasm/Cargo.lock
@@ -34,9 +34,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "bitflags"
-version = "1.3.2"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
 
 [[package]]
 name = "cfg-if"
@@ -52,9 +52,9 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.14.2"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 dependencies = [
  "ahash",
  "allocator-api2",
@@ -99,7 +99,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -111,7 +111,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -119,28 +119,28 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
  "radix_trie",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "multiversx-sc",
 ]
@@ -165,15 +165,15 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.69"
+version = "1.0.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
 dependencies = [
  "unicode-ident",
 ]
@@ -212,20 +212,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "1.0.109"
+version = "2.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.39"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
+checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -246,20 +235,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
+checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
+checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn",
 ]
diff --git a/contracts/examples/crypto-kitties/kitty-genetic-alg/wasm/src/lib.rs b/contracts/examples/crypto-kitties/kitty-genetic-alg/wasm/src/lib.rs
index b089f24620..3bee7743a1 100644
--- a/contracts/examples/crypto-kitties/kitty-genetic-alg/wasm/src/lib.rs
+++ b/contracts/examples/crypto-kitties/kitty-genetic-alg/wasm/src/lib.rs
@@ -10,9 +10,7 @@
 // Total number of exported functions:   3
 
 #![no_std]
-
-// Configuration that works with rustc < 1.73.0.
-// TODO: Recommended rustc version: 1.73.0 or newer.
+#![allow(internal_features)]
 #![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
diff --git a/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.lock b/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.lock
index b54190e1ce..d70e00ff12 100755
--- a/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.lock
+++ b/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.lock
@@ -34,9 +34,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "bitflags"
-version = "1.3.2"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
 
 [[package]]
 name = "cfg-if"
@@ -52,9 +52,9 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.14.2"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 dependencies = [
  "ahash",
  "allocator-api2",
@@ -109,7 +109,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -121,7 +121,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -129,28 +129,28 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
  "radix_trie",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "multiversx-sc",
 ]
@@ -175,15 +175,15 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.69"
+version = "1.0.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
 dependencies = [
  "unicode-ident",
 ]
@@ -222,20 +222,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "1.0.109"
+version = "2.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.39"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
+checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -256,20 +245,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
+checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
+checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn",
 ]
diff --git a/contracts/examples/crypto-kitties/kitty-ownership/wasm/src/lib.rs b/contracts/examples/crypto-kitties/kitty-ownership/wasm/src/lib.rs
index d698271174..9154e40f13 100644
--- a/contracts/examples/crypto-kitties/kitty-ownership/wasm/src/lib.rs
+++ b/contracts/examples/crypto-kitties/kitty-ownership/wasm/src/lib.rs
@@ -10,9 +10,7 @@
 // Total number of exported functions:  23
 
 #![no_std]
-
-// Configuration that works with rustc < 1.73.0.
-// TODO: Recommended rustc version: 1.73.0 or newer.
+#![allow(internal_features)]
 #![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
diff --git a/contracts/examples/crypto-zombies/wasm/Cargo.lock b/contracts/examples/crypto-zombies/wasm/Cargo.lock
index 2d5adff123..f02c01f3e9 100755
--- a/contracts/examples/crypto-zombies/wasm/Cargo.lock
+++ b/contracts/examples/crypto-zombies/wasm/Cargo.lock
@@ -34,9 +34,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "bitflags"
-version = "1.3.2"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
 
 [[package]]
 name = "cfg-if"
@@ -67,9 +67,9 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.14.2"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 dependencies = [
  "ahash",
  "allocator-api2",
@@ -89,7 +89,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -101,7 +101,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -109,28 +109,28 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
  "radix_trie",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "multiversx-sc",
 ]
@@ -155,15 +155,15 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.69"
+version = "1.0.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
 dependencies = [
  "unicode-ident",
 ]
@@ -195,20 +195,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "1.0.109"
+version = "2.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.39"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
+checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -229,20 +218,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
+checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
+checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn",
 ]
diff --git a/contracts/examples/crypto-zombies/wasm/src/lib.rs b/contracts/examples/crypto-zombies/wasm/src/lib.rs
index c83aa5cca9..ddffa98fa8 100644
--- a/contracts/examples/crypto-zombies/wasm/src/lib.rs
+++ b/contracts/examples/crypto-zombies/wasm/src/lib.rs
@@ -10,9 +10,7 @@
 // Total number of exported functions:  19
 
 #![no_std]
-
-// Configuration that works with rustc < 1.73.0.
-// TODO: Recommended rustc version: 1.73.0 or newer.
+#![allow(internal_features)]
 #![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
diff --git a/contracts/examples/digital-cash/wasm/Cargo.lock b/contracts/examples/digital-cash/wasm/Cargo.lock
index 2f033aabfa..4841e17292 100644
--- a/contracts/examples/digital-cash/wasm/Cargo.lock
+++ b/contracts/examples/digital-cash/wasm/Cargo.lock
@@ -34,9 +34,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "bitflags"
-version = "1.3.2"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
 
 [[package]]
 name = "cfg-if"
@@ -67,9 +67,9 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.14.2"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 dependencies = [
  "ahash",
  "allocator-api2",
@@ -89,7 +89,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -101,7 +101,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -109,28 +109,28 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
  "radix_trie",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "multiversx-sc",
 ]
@@ -155,15 +155,15 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.69"
+version = "1.0.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
 dependencies = [
  "unicode-ident",
 ]
@@ -195,20 +195,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "1.0.109"
+version = "2.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.39"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
+checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -229,20 +218,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
+checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
+checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn",
 ]
diff --git a/contracts/examples/digital-cash/wasm/src/lib.rs b/contracts/examples/digital-cash/wasm/src/lib.rs
index 1a6a435519..728d658a67 100644
--- a/contracts/examples/digital-cash/wasm/src/lib.rs
+++ b/contracts/examples/digital-cash/wasm/src/lib.rs
@@ -10,9 +10,7 @@
 // Total number of exported functions:  14
 
 #![no_std]
-
-// Configuration that works with rustc < 1.73.0.
-// TODO: Recommended rustc version: 1.73.0 or newer.
+#![allow(internal_features)]
 #![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
diff --git a/contracts/examples/empty/wasm/Cargo.lock b/contracts/examples/empty/wasm/Cargo.lock
index 0c7c012589..43f8b304a3 100755
--- a/contracts/examples/empty/wasm/Cargo.lock
+++ b/contracts/examples/empty/wasm/Cargo.lock
@@ -34,9 +34,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "bitflags"
-version = "1.3.2"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
 
 [[package]]
 name = "cfg-if"
@@ -67,9 +67,9 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.14.2"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 dependencies = [
  "ahash",
  "allocator-api2",
@@ -89,7 +89,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -101,7 +101,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -109,28 +109,28 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
  "radix_trie",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "multiversx-sc",
 ]
@@ -155,15 +155,15 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.69"
+version = "1.0.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
 dependencies = [
  "unicode-ident",
 ]
@@ -195,20 +195,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "1.0.109"
+version = "2.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.39"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
+checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -229,20 +218,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
+checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
+checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn",
 ]
diff --git a/contracts/examples/empty/wasm/src/lib.rs b/contracts/examples/empty/wasm/src/lib.rs
index 1988bb325d..15644e786d 100644
--- a/contracts/examples/empty/wasm/src/lib.rs
+++ b/contracts/examples/empty/wasm/src/lib.rs
@@ -10,9 +10,7 @@
 // Total number of exported functions:   2
 
 #![no_std]
-
-// Configuration that works with rustc < 1.73.0.
-// TODO: Recommended rustc version: 1.73.0 or newer.
+#![allow(internal_features)]
 #![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
diff --git a/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.lock b/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.lock
index 502134d522..8363c8eff2 100644
--- a/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.lock
+++ b/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.lock
@@ -34,9 +34,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "bitflags"
-version = "1.3.2"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
 
 [[package]]
 name = "cfg-if"
@@ -67,9 +67,9 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.14.2"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 dependencies = [
  "ahash",
  "allocator-api2",
@@ -89,7 +89,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -101,7 +101,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -109,28 +109,28 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
  "radix_trie",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "multiversx-sc",
 ]
@@ -155,15 +155,15 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.69"
+version = "1.0.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
 dependencies = [
  "unicode-ident",
 ]
@@ -195,20 +195,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "1.0.109"
+version = "2.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.39"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
+checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -229,20 +218,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
+checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
+checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn",
 ]
diff --git a/contracts/examples/esdt-transfer-with-fee/wasm/src/lib.rs b/contracts/examples/esdt-transfer-with-fee/wasm/src/lib.rs
index a62fe60def..879ee2a1af 100644
--- a/contracts/examples/esdt-transfer-with-fee/wasm/src/lib.rs
+++ b/contracts/examples/esdt-transfer-with-fee/wasm/src/lib.rs
@@ -10,9 +10,7 @@
 // Total number of exported functions:   8
 
 #![no_std]
-
-// Configuration that works with rustc < 1.73.0.
-// TODO: Recommended rustc version: 1.73.0 or newer.
+#![allow(internal_features)]
 #![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
diff --git a/contracts/examples/factorial/wasm/Cargo.lock b/contracts/examples/factorial/wasm/Cargo.lock
index bf916d4e7d..3ef3f314c6 100755
--- a/contracts/examples/factorial/wasm/Cargo.lock
+++ b/contracts/examples/factorial/wasm/Cargo.lock
@@ -34,9 +34,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "bitflags"
-version = "1.3.2"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
 
 [[package]]
 name = "cfg-if"
@@ -67,9 +67,9 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.14.2"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 dependencies = [
  "ahash",
  "allocator-api2",
@@ -89,7 +89,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -101,7 +101,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -109,28 +109,28 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
  "radix_trie",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "multiversx-sc",
 ]
@@ -155,15 +155,15 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.69"
+version = "1.0.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
 dependencies = [
  "unicode-ident",
 ]
@@ -195,20 +195,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "1.0.109"
+version = "2.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.39"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
+checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -229,20 +218,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
+checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
+checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn",
 ]
diff --git a/contracts/examples/factorial/wasm/src/lib.rs b/contracts/examples/factorial/wasm/src/lib.rs
index 177016639e..7819e0b34f 100644
--- a/contracts/examples/factorial/wasm/src/lib.rs
+++ b/contracts/examples/factorial/wasm/src/lib.rs
@@ -10,9 +10,7 @@
 // Total number of exported functions:   4
 
 #![no_std]
-
-// Configuration that works with rustc < 1.73.0.
-// TODO: Recommended rustc version: 1.73.0 or newer.
+#![allow(internal_features)]
 #![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
diff --git a/contracts/examples/fractional-nfts/wasm/Cargo.lock b/contracts/examples/fractional-nfts/wasm/Cargo.lock
index 275e5c8e85..007aa9d1fa 100644
--- a/contracts/examples/fractional-nfts/wasm/Cargo.lock
+++ b/contracts/examples/fractional-nfts/wasm/Cargo.lock
@@ -34,9 +34,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "bitflags"
-version = "1.3.2"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
 
 [[package]]
 name = "cfg-if"
@@ -68,9 +68,9 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.14.2"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 dependencies = [
  "ahash",
  "allocator-api2",
@@ -90,7 +90,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -102,7 +102,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -110,35 +110,35 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
  "radix_trie",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "multiversx-sc",
 ]
@@ -163,15 +163,15 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.69"
+version = "1.0.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
 dependencies = [
  "unicode-ident",
 ]
@@ -203,20 +203,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "1.0.109"
+version = "2.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.39"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
+checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -237,20 +226,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
+checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
+checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn",
 ]
diff --git a/contracts/examples/fractional-nfts/wasm/src/lib.rs b/contracts/examples/fractional-nfts/wasm/src/lib.rs
index cab5796d1f..2af55430fa 100644
--- a/contracts/examples/fractional-nfts/wasm/src/lib.rs
+++ b/contracts/examples/fractional-nfts/wasm/src/lib.rs
@@ -10,9 +10,7 @@
 // Total number of exported functions:   6
 
 #![no_std]
-
-// Configuration that works with rustc < 1.73.0.
-// TODO: Recommended rustc version: 1.73.0 or newer.
+#![allow(internal_features)]
 #![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
diff --git a/contracts/examples/lottery-esdt/wasm/Cargo.lock b/contracts/examples/lottery-esdt/wasm/Cargo.lock
index 6edac2b36f..64cb0b10dc 100755
--- a/contracts/examples/lottery-esdt/wasm/Cargo.lock
+++ b/contracts/examples/lottery-esdt/wasm/Cargo.lock
@@ -34,9 +34,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "bitflags"
-version = "1.3.2"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
 
 [[package]]
 name = "cfg-if"
@@ -52,9 +52,9 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.14.2"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 dependencies = [
  "ahash",
  "allocator-api2",
@@ -89,7 +89,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -101,7 +101,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -109,28 +109,28 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
  "radix_trie",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "multiversx-sc",
 ]
@@ -155,15 +155,15 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.69"
+version = "1.0.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
 dependencies = [
  "unicode-ident",
 ]
@@ -195,20 +195,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "1.0.109"
+version = "2.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.39"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
+checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -229,20 +218,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
+checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
+checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn",
 ]
diff --git a/contracts/examples/lottery-esdt/wasm/src/lib.rs b/contracts/examples/lottery-esdt/wasm/src/lib.rs
index c4e5cc293a..71be1abb68 100644
--- a/contracts/examples/lottery-esdt/wasm/src/lib.rs
+++ b/contracts/examples/lottery-esdt/wasm/src/lib.rs
@@ -10,9 +10,7 @@
 // Total number of exported functions:   9
 
 #![no_std]
-
-// Configuration that works with rustc < 1.73.0.
-// TODO: Recommended rustc version: 1.73.0 or newer.
+#![allow(internal_features)]
 #![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
diff --git a/contracts/examples/multisig/wasm-multisig-full/Cargo.lock b/contracts/examples/multisig/wasm-multisig-full/Cargo.lock
index 3cb7422187..61b961d909 100644
--- a/contracts/examples/multisig/wasm-multisig-full/Cargo.lock
+++ b/contracts/examples/multisig/wasm-multisig-full/Cargo.lock
@@ -34,9 +34,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "bitflags"
-version = "1.3.2"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
 
 [[package]]
 name = "cfg-if"
@@ -52,9 +52,9 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.14.2"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 dependencies = [
  "ahash",
  "allocator-api2",
@@ -90,7 +90,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -102,7 +102,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -110,35 +110,35 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
  "radix_trie",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "multiversx-sc",
 ]
@@ -163,15 +163,15 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.69"
+version = "1.0.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
 dependencies = [
  "unicode-ident",
 ]
@@ -203,20 +203,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "1.0.109"
+version = "2.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.39"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
+checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -237,20 +226,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
+checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
+checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn",
 ]
diff --git a/contracts/examples/multisig/wasm-multisig-full/src/lib.rs b/contracts/examples/multisig/wasm-multisig-full/src/lib.rs
index 0b0b4dda44..b3f9a29bee 100644
--- a/contracts/examples/multisig/wasm-multisig-full/src/lib.rs
+++ b/contracts/examples/multisig/wasm-multisig-full/src/lib.rs
@@ -10,9 +10,7 @@
 // Total number of exported functions:  31
 
 #![no_std]
-
-// Configuration that works with rustc < 1.73.0.
-// TODO: Recommended rustc version: 1.73.0 or newer.
+#![allow(internal_features)]
 #![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
diff --git a/contracts/examples/multisig/wasm-multisig-view/Cargo.lock b/contracts/examples/multisig/wasm-multisig-view/Cargo.lock
index f03a3728f0..8c38f2f1d6 100644
--- a/contracts/examples/multisig/wasm-multisig-view/Cargo.lock
+++ b/contracts/examples/multisig/wasm-multisig-view/Cargo.lock
@@ -34,9 +34,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "bitflags"
-version = "1.3.2"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
 
 [[package]]
 name = "cfg-if"
@@ -52,9 +52,9 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.14.2"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 dependencies = [
  "ahash",
  "allocator-api2",
@@ -90,7 +90,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -102,7 +102,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -110,35 +110,35 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
  "radix_trie",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "multiversx-sc",
 ]
@@ -163,15 +163,15 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.69"
+version = "1.0.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
 dependencies = [
  "unicode-ident",
 ]
@@ -203,20 +203,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "1.0.109"
+version = "2.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.39"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
+checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -237,20 +226,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
+checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
+checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn",
 ]
diff --git a/contracts/examples/multisig/wasm-multisig-view/src/lib.rs b/contracts/examples/multisig/wasm-multisig-view/src/lib.rs
index 10f8c64ee8..c01d319c88 100644
--- a/contracts/examples/multisig/wasm-multisig-view/src/lib.rs
+++ b/contracts/examples/multisig/wasm-multisig-view/src/lib.rs
@@ -10,9 +10,7 @@
 // Total number of exported functions:  10
 
 #![no_std]
-
-// Configuration that works with rustc < 1.73.0.
-// TODO: Recommended rustc version: 1.73.0 or newer.
+#![allow(internal_features)]
 #![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
diff --git a/contracts/examples/multisig/wasm/Cargo.lock b/contracts/examples/multisig/wasm/Cargo.lock
index 3108bf0e90..93d7a27bd7 100755
--- a/contracts/examples/multisig/wasm/Cargo.lock
+++ b/contracts/examples/multisig/wasm/Cargo.lock
@@ -34,9 +34,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "bitflags"
-version = "1.3.2"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
 
 [[package]]
 name = "cfg-if"
@@ -52,9 +52,9 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.14.2"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 dependencies = [
  "ahash",
  "allocator-api2",
@@ -90,7 +90,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -102,7 +102,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -110,35 +110,35 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
  "radix_trie",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "multiversx-sc",
 ]
@@ -163,15 +163,15 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.69"
+version = "1.0.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
 dependencies = [
  "unicode-ident",
 ]
@@ -203,20 +203,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "1.0.109"
+version = "2.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.39"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
+checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -237,20 +226,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
+checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
+checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn",
 ]
diff --git a/contracts/examples/multisig/wasm/src/lib.rs b/contracts/examples/multisig/wasm/src/lib.rs
index ab2e3bbf14..0bb7178ce4 100644
--- a/contracts/examples/multisig/wasm/src/lib.rs
+++ b/contracts/examples/multisig/wasm/src/lib.rs
@@ -10,9 +10,7 @@
 // Total number of exported functions:  23
 
 #![no_std]
-
-// Configuration that works with rustc < 1.73.0.
-// TODO: Recommended rustc version: 1.73.0 or newer.
+#![allow(internal_features)]
 #![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
diff --git a/contracts/examples/nft-minter/wasm/Cargo.lock b/contracts/examples/nft-minter/wasm/Cargo.lock
index 0a00b732da..4754c03894 100644
--- a/contracts/examples/nft-minter/wasm/Cargo.lock
+++ b/contracts/examples/nft-minter/wasm/Cargo.lock
@@ -34,9 +34,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "bitflags"
-version = "1.3.2"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
 
 [[package]]
 name = "cfg-if"
@@ -52,9 +52,9 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.14.2"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 dependencies = [
  "ahash",
  "allocator-api2",
@@ -74,7 +74,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -94,28 +94,28 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
  "radix_trie",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "multiversx-sc",
 ]
@@ -155,15 +155,15 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.69"
+version = "1.0.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
 dependencies = [
  "unicode-ident",
 ]
@@ -195,20 +195,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "1.0.109"
+version = "2.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.39"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
+checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -229,20 +218,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
+checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
+checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn",
 ]
diff --git a/contracts/examples/nft-minter/wasm/src/lib.rs b/contracts/examples/nft-minter/wasm/src/lib.rs
index af2dcacef7..aab639db54 100644
--- a/contracts/examples/nft-minter/wasm/src/lib.rs
+++ b/contracts/examples/nft-minter/wasm/src/lib.rs
@@ -10,9 +10,7 @@
 // Total number of exported functions:   8
 
 #![no_std]
-
-// Configuration that works with rustc < 1.73.0.
-// TODO: Recommended rustc version: 1.73.0 or newer.
+#![allow(internal_features)]
 #![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
diff --git a/contracts/examples/nft-storage-prepay/wasm/Cargo.lock b/contracts/examples/nft-storage-prepay/wasm/Cargo.lock
index 3f2ce4ad08..e254199fbd 100755
--- a/contracts/examples/nft-storage-prepay/wasm/Cargo.lock
+++ b/contracts/examples/nft-storage-prepay/wasm/Cargo.lock
@@ -34,9 +34,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "bitflags"
-version = "1.3.2"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
 
 [[package]]
 name = "cfg-if"
@@ -52,9 +52,9 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.14.2"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 dependencies = [
  "ahash",
  "allocator-api2",
@@ -74,7 +74,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -94,28 +94,28 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
  "radix_trie",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "multiversx-sc",
 ]
@@ -155,15 +155,15 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.69"
+version = "1.0.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
 dependencies = [
  "unicode-ident",
 ]
@@ -195,20 +195,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "1.0.109"
+version = "2.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.39"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
+checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -229,20 +218,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
+checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
+checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn",
 ]
diff --git a/contracts/examples/nft-storage-prepay/wasm/src/lib.rs b/contracts/examples/nft-storage-prepay/wasm/src/lib.rs
index fc5bf5f24e..4f9e57e282 100644
--- a/contracts/examples/nft-storage-prepay/wasm/src/lib.rs
+++ b/contracts/examples/nft-storage-prepay/wasm/src/lib.rs
@@ -10,9 +10,7 @@
 // Total number of exported functions:  10
 
 #![no_std]
-
-// Configuration that works with rustc < 1.73.0.
-// TODO: Recommended rustc version: 1.73.0 or newer.
+#![allow(internal_features)]
 #![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
diff --git a/contracts/examples/nft-subscription/wasm/Cargo.lock b/contracts/examples/nft-subscription/wasm/Cargo.lock
index 5001bbc884..d658685e6e 100644
--- a/contracts/examples/nft-subscription/wasm/Cargo.lock
+++ b/contracts/examples/nft-subscription/wasm/Cargo.lock
@@ -34,9 +34,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "bitflags"
-version = "1.3.2"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
 
 [[package]]
 name = "cfg-if"
@@ -52,9 +52,9 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.14.2"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 dependencies = [
  "ahash",
  "allocator-api2",
@@ -74,7 +74,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -94,35 +94,35 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
  "radix_trie",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "multiversx-sc",
 ]
@@ -163,15 +163,15 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.69"
+version = "1.0.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
 dependencies = [
  "unicode-ident",
 ]
@@ -203,20 +203,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "1.0.109"
+version = "2.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.39"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
+checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -237,20 +226,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
+checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
+checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn",
 ]
diff --git a/contracts/examples/nft-subscription/wasm/src/lib.rs b/contracts/examples/nft-subscription/wasm/src/lib.rs
index d6f5f32326..2c95afe219 100644
--- a/contracts/examples/nft-subscription/wasm/src/lib.rs
+++ b/contracts/examples/nft-subscription/wasm/src/lib.rs
@@ -10,9 +10,7 @@
 // Total number of exported functions:   7
 
 #![no_std]
-
-// Configuration that works with rustc < 1.73.0.
-// TODO: Recommended rustc version: 1.73.0 or newer.
+#![allow(internal_features)]
 #![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
diff --git a/contracts/examples/order-book/factory/wasm/Cargo.lock b/contracts/examples/order-book/factory/wasm/Cargo.lock
index 88f1f682d2..451bcf63d7 100644
--- a/contracts/examples/order-book/factory/wasm/Cargo.lock
+++ b/contracts/examples/order-book/factory/wasm/Cargo.lock
@@ -34,9 +34,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "bitflags"
-version = "1.3.2"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
 
 [[package]]
 name = "cfg-if"
@@ -52,9 +52,9 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.14.2"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 dependencies = [
  "ahash",
  "allocator-api2",
@@ -74,7 +74,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -94,28 +94,28 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
  "radix_trie",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "multiversx-sc",
 ]
@@ -140,9 +140,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "order-book-factory"
@@ -161,9 +161,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.69"
+version = "1.0.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
 dependencies = [
  "unicode-ident",
 ]
@@ -195,20 +195,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "1.0.109"
+version = "2.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.39"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
+checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -229,20 +218,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
+checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
+checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn",
 ]
diff --git a/contracts/examples/order-book/factory/wasm/src/lib.rs b/contracts/examples/order-book/factory/wasm/src/lib.rs
index f461820c6d..97a9ff166d 100644
--- a/contracts/examples/order-book/factory/wasm/src/lib.rs
+++ b/contracts/examples/order-book/factory/wasm/src/lib.rs
@@ -10,9 +10,7 @@
 // Total number of exported functions:   4
 
 #![no_std]
-
-// Configuration that works with rustc < 1.73.0.
-// TODO: Recommended rustc version: 1.73.0 or newer.
+#![allow(internal_features)]
 #![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
diff --git a/contracts/examples/order-book/pair/wasm/Cargo.lock b/contracts/examples/order-book/pair/wasm/Cargo.lock
index 01801561bd..fe0574a9a5 100644
--- a/contracts/examples/order-book/pair/wasm/Cargo.lock
+++ b/contracts/examples/order-book/pair/wasm/Cargo.lock
@@ -34,9 +34,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "bitflags"
-version = "1.3.2"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
 
 [[package]]
 name = "cfg-if"
@@ -52,9 +52,9 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.14.2"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 dependencies = [
  "ahash",
  "allocator-api2",
@@ -74,7 +74,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -94,28 +94,28 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
  "radix_trie",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "multiversx-sc",
 ]
@@ -140,9 +140,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "order-book-pair"
@@ -161,9 +161,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.69"
+version = "1.0.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
 dependencies = [
  "unicode-ident",
 ]
@@ -195,20 +195,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "1.0.109"
+version = "2.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.39"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
+checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -229,20 +218,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
+checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
+checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn",
 ]
diff --git a/contracts/examples/order-book/pair/wasm/src/lib.rs b/contracts/examples/order-book/pair/wasm/src/lib.rs
index 3d808da449..ba30c0e8e9 100644
--- a/contracts/examples/order-book/pair/wasm/src/lib.rs
+++ b/contracts/examples/order-book/pair/wasm/src/lib.rs
@@ -10,9 +10,7 @@
 // Total number of exported functions:  15
 
 #![no_std]
-
-// Configuration that works with rustc < 1.73.0.
-// TODO: Recommended rustc version: 1.73.0 or newer.
+#![allow(internal_features)]
 #![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
diff --git a/contracts/examples/ping-pong-egld/wasm/Cargo.lock b/contracts/examples/ping-pong-egld/wasm/Cargo.lock
index 6fc0160fd7..7b6021ab6d 100755
--- a/contracts/examples/ping-pong-egld/wasm/Cargo.lock
+++ b/contracts/examples/ping-pong-egld/wasm/Cargo.lock
@@ -34,9 +34,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "bitflags"
-version = "1.3.2"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
 
 [[package]]
 name = "cfg-if"
@@ -52,9 +52,9 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.14.2"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 dependencies = [
  "ahash",
  "allocator-api2",
@@ -74,7 +74,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -94,28 +94,28 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
  "radix_trie",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "multiversx-sc",
 ]
@@ -140,9 +140,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "ping-pong-egld"
@@ -161,9 +161,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.69"
+version = "1.0.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
 dependencies = [
  "unicode-ident",
 ]
@@ -195,20 +195,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "1.0.109"
+version = "2.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.39"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
+checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -229,20 +218,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
+checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
+checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn",
 ]
diff --git a/contracts/examples/ping-pong-egld/wasm/src/lib.rs b/contracts/examples/ping-pong-egld/wasm/src/lib.rs
index 1f037d7fb9..5e3d5faca6 100644
--- a/contracts/examples/ping-pong-egld/wasm/src/lib.rs
+++ b/contracts/examples/ping-pong-egld/wasm/src/lib.rs
@@ -10,9 +10,7 @@
 // Total number of exported functions:  12
 
 #![no_std]
-
-// Configuration that works with rustc < 1.73.0.
-// TODO: Recommended rustc version: 1.73.0 or newer.
+#![allow(internal_features)]
 #![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
diff --git a/contracts/examples/proxy-pause/wasm/Cargo.lock b/contracts/examples/proxy-pause/wasm/Cargo.lock
index 7153293940..f928799b5b 100644
--- a/contracts/examples/proxy-pause/wasm/Cargo.lock
+++ b/contracts/examples/proxy-pause/wasm/Cargo.lock
@@ -34,9 +34,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "bitflags"
-version = "1.3.2"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
 
 [[package]]
 name = "cfg-if"
@@ -52,9 +52,9 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.14.2"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 dependencies = [
  "ahash",
  "allocator-api2",
@@ -74,7 +74,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -94,28 +94,28 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
  "radix_trie",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "multiversx-sc",
 ]
@@ -140,15 +140,15 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.69"
+version = "1.0.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
 dependencies = [
  "unicode-ident",
 ]
@@ -195,20 +195,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "1.0.109"
+version = "2.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.39"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
+checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -229,20 +218,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
+checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
+checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn",
 ]
diff --git a/contracts/examples/proxy-pause/wasm/src/lib.rs b/contracts/examples/proxy-pause/wasm/src/lib.rs
index 1b7e037f97..62e1c633ca 100644
--- a/contracts/examples/proxy-pause/wasm/src/lib.rs
+++ b/contracts/examples/proxy-pause/wasm/src/lib.rs
@@ -10,9 +10,7 @@
 // Total number of exported functions:  10
 
 #![no_std]
-
-// Configuration that works with rustc < 1.73.0.
-// TODO: Recommended rustc version: 1.73.0 or newer.
+#![allow(internal_features)]
 #![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
diff --git a/contracts/examples/rewards-distribution/wasm/Cargo.lock b/contracts/examples/rewards-distribution/wasm/Cargo.lock
index aa49200631..7c2e24c5af 100644
--- a/contracts/examples/rewards-distribution/wasm/Cargo.lock
+++ b/contracts/examples/rewards-distribution/wasm/Cargo.lock
@@ -34,9 +34,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "bitflags"
-version = "1.3.2"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
 
 [[package]]
 name = "cfg-if"
@@ -52,9 +52,9 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.14.2"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 dependencies = [
  "ahash",
  "allocator-api2",
@@ -74,7 +74,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -94,35 +94,35 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
  "radix_trie",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "multiversx-sc",
 ]
@@ -147,15 +147,15 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.69"
+version = "1.0.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
 dependencies = [
  "unicode-ident",
 ]
@@ -203,20 +203,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "1.0.109"
+version = "2.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.39"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
+checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -237,20 +226,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
+checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
+checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn",
 ]
diff --git a/contracts/examples/rewards-distribution/wasm/src/lib.rs b/contracts/examples/rewards-distribution/wasm/src/lib.rs
index e570679594..b41b365c4e 100644
--- a/contracts/examples/rewards-distribution/wasm/src/lib.rs
+++ b/contracts/examples/rewards-distribution/wasm/src/lib.rs
@@ -10,9 +10,7 @@
 // Total number of exported functions:  15
 
 #![no_std]
-
-// Configuration that works with rustc < 1.73.0.
-// TODO: Recommended rustc version: 1.73.0 or newer.
+#![allow(internal_features)]
 #![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
diff --git a/contracts/examples/seed-nft-minter/wasm/Cargo.lock b/contracts/examples/seed-nft-minter/wasm/Cargo.lock
index 30a69a6e86..36248a7547 100644
--- a/contracts/examples/seed-nft-minter/wasm/Cargo.lock
+++ b/contracts/examples/seed-nft-minter/wasm/Cargo.lock
@@ -34,9 +34,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "bitflags"
-version = "1.3.2"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
 
 [[package]]
 name = "cfg-if"
@@ -52,9 +52,9 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.14.2"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 dependencies = [
  "ahash",
  "allocator-api2",
@@ -74,7 +74,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -94,35 +94,35 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
  "radix_trie",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "multiversx-sc",
 ]
@@ -147,15 +147,15 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.69"
+version = "1.0.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
 dependencies = [
  "unicode-ident",
 ]
@@ -203,20 +203,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "1.0.109"
+version = "2.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.39"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
+checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -237,20 +226,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
+checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
+checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn",
 ]
diff --git a/contracts/examples/seed-nft-minter/wasm/src/lib.rs b/contracts/examples/seed-nft-minter/wasm/src/lib.rs
index 91faa4e839..e4aec1825d 100644
--- a/contracts/examples/seed-nft-minter/wasm/src/lib.rs
+++ b/contracts/examples/seed-nft-minter/wasm/src/lib.rs
@@ -10,9 +10,7 @@
 // Total number of exported functions:  11
 
 #![no_std]
-
-// Configuration that works with rustc < 1.73.0.
-// TODO: Recommended rustc version: 1.73.0 or newer.
+#![allow(internal_features)]
 #![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
diff --git a/contracts/examples/token-release/wasm/Cargo.lock b/contracts/examples/token-release/wasm/Cargo.lock
index f84462d10d..312fd04983 100644
--- a/contracts/examples/token-release/wasm/Cargo.lock
+++ b/contracts/examples/token-release/wasm/Cargo.lock
@@ -34,9 +34,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "bitflags"
-version = "1.3.2"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
 
 [[package]]
 name = "cfg-if"
@@ -52,9 +52,9 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.14.2"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 dependencies = [
  "ahash",
  "allocator-api2",
@@ -74,7 +74,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -94,28 +94,28 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
  "radix_trie",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "multiversx-sc",
 ]
@@ -140,15 +140,15 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.69"
+version = "1.0.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
 dependencies = [
  "unicode-ident",
 ]
@@ -180,20 +180,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "1.0.109"
+version = "2.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.39"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
+checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -229,20 +218,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
+checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
+checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn",
 ]
diff --git a/contracts/examples/token-release/wasm/src/lib.rs b/contracts/examples/token-release/wasm/src/lib.rs
index 85cfee011b..be580b5ccd 100644
--- a/contracts/examples/token-release/wasm/src/lib.rs
+++ b/contracts/examples/token-release/wasm/src/lib.rs
@@ -10,9 +10,7 @@
 // Total number of exported functions:  15
 
 #![no_std]
-
-// Configuration that works with rustc < 1.73.0.
-// TODO: Recommended rustc version: 1.73.0 or newer.
+#![allow(internal_features)]
 #![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
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 2d16421bf5..3263e1d811 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
@@ -49,9 +49,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "bitflags"
-version = "1.3.2"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
 
 [[package]]
 name = "cfg-if"
@@ -67,9 +67,9 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.14.2"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 dependencies = [
  "ahash",
  "allocator-api2",
@@ -89,7 +89,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -101,7 +101,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -109,28 +109,28 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
  "radix_trie",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "multiversx-sc",
 ]
@@ -155,15 +155,15 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.69"
+version = "1.0.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
 dependencies = [
  "unicode-ident",
 ]
@@ -195,20 +195,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "1.0.109"
+version = "2.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.39"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
+checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -229,20 +218,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
+checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
+checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn",
 ]
diff --git a/contracts/feature-tests/abi-tester/wasm-abi-tester-ev/src/lib.rs b/contracts/feature-tests/abi-tester/wasm-abi-tester-ev/src/lib.rs
index 885e0856c6..5fe18202f2 100644
--- a/contracts/feature-tests/abi-tester/wasm-abi-tester-ev/src/lib.rs
+++ b/contracts/feature-tests/abi-tester/wasm-abi-tester-ev/src/lib.rs
@@ -10,9 +10,7 @@
 // Total number of exported functions:   5
 
 #![no_std]
-
-// Configuration that works with rustc < 1.73.0.
-// TODO: Recommended rustc version: 1.73.0 or newer.
+#![allow(internal_features)]
 #![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
diff --git a/contracts/feature-tests/abi-tester/wasm/Cargo.lock b/contracts/feature-tests/abi-tester/wasm/Cargo.lock
index 858df67e37..a366767ec4 100755
--- a/contracts/feature-tests/abi-tester/wasm/Cargo.lock
+++ b/contracts/feature-tests/abi-tester/wasm/Cargo.lock
@@ -49,9 +49,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "bitflags"
-version = "1.3.2"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
 
 [[package]]
 name = "cfg-if"
@@ -67,9 +67,9 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.14.2"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 dependencies = [
  "ahash",
  "allocator-api2",
@@ -89,7 +89,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -101,7 +101,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -109,28 +109,28 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
  "radix_trie",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "multiversx-sc",
 ]
@@ -155,15 +155,15 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.69"
+version = "1.0.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
 dependencies = [
  "unicode-ident",
 ]
@@ -195,20 +195,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "1.0.109"
+version = "2.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.39"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
+checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -229,20 +218,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
+checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
+checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn",
 ]
diff --git a/contracts/feature-tests/abi-tester/wasm/src/lib.rs b/contracts/feature-tests/abi-tester/wasm/src/lib.rs
index 2aae446649..6a15c9899b 100644
--- a/contracts/feature-tests/abi-tester/wasm/src/lib.rs
+++ b/contracts/feature-tests/abi-tester/wasm/src/lib.rs
@@ -10,9 +10,7 @@
 // Total number of exported functions:  29
 
 #![no_std]
-
-// Configuration that works with rustc < 1.73.0.
-// TODO: Recommended rustc version: 1.73.0 or newer.
+#![allow(internal_features)]
 #![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
diff --git a/contracts/feature-tests/alloc-features/wasm/Cargo.lock b/contracts/feature-tests/alloc-features/wasm/Cargo.lock
index cc386d95b2..1bf718f630 100644
--- a/contracts/feature-tests/alloc-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/alloc-features/wasm/Cargo.lock
@@ -49,9 +49,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "bitflags"
-version = "1.3.2"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
 
 [[package]]
 name = "cfg-if"
@@ -67,9 +67,9 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.14.2"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 dependencies = [
  "ahash",
  "allocator-api2",
@@ -89,7 +89,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -101,7 +101,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -109,28 +109,28 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
  "radix_trie",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "multiversx-sc",
 ]
@@ -155,15 +155,15 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.69"
+version = "1.0.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
 dependencies = [
  "unicode-ident",
 ]
@@ -195,20 +195,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "1.0.109"
+version = "2.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.39"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
+checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -229,20 +218,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
+checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
+checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn",
 ]
diff --git a/contracts/feature-tests/alloc-features/wasm/src/lib.rs b/contracts/feature-tests/alloc-features/wasm/src/lib.rs
index d94121084e..f01cc37f8b 100644
--- a/contracts/feature-tests/alloc-features/wasm/src/lib.rs
+++ b/contracts/feature-tests/alloc-features/wasm/src/lib.rs
@@ -10,9 +10,7 @@
 // Total number of exported functions:  66
 
 #![no_std]
-
-// Configuration that works with rustc < 1.73.0.
-// TODO: Recommended rustc version: 1.73.0 or newer.
+#![allow(internal_features)]
 #![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!(static64k);
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 d207f939bf..1a71600472 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
@@ -50,9 +50,9 @@ dependencies = [
 
 [[package]]
 name = "bitflags"
-version = "1.3.2"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
 
 [[package]]
 name = "cfg-if"
@@ -68,9 +68,9 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.14.2"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 dependencies = [
  "ahash",
  "allocator-api2",
@@ -90,7 +90,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -102,7 +102,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -110,35 +110,35 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
  "radix_trie",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "multiversx-sc",
 ]
@@ -163,15 +163,15 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.69"
+version = "1.0.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
 dependencies = [
  "unicode-ident",
 ]
@@ -203,20 +203,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "1.0.109"
+version = "2.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.39"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
+checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -237,20 +226,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
+checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
+checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn",
 ]
diff --git a/contracts/feature-tests/basic-features/wasm-basic-features-storage-bytes/src/lib.rs b/contracts/feature-tests/basic-features/wasm-basic-features-storage-bytes/src/lib.rs
index 2e747a0fd4..af26877c00 100644
--- a/contracts/feature-tests/basic-features/wasm-basic-features-storage-bytes/src/lib.rs
+++ b/contracts/feature-tests/basic-features/wasm-basic-features-storage-bytes/src/lib.rs
@@ -10,9 +10,7 @@
 // Total number of exported functions:   4
 
 #![no_std]
-
-// Configuration that works with rustc < 1.73.0.
-// TODO: Recommended rustc version: 1.73.0 or newer.
+#![allow(internal_features)]
 #![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
diff --git a/contracts/feature-tests/basic-features/wasm/Cargo.lock b/contracts/feature-tests/basic-features/wasm/Cargo.lock
index 3fd51a2b04..8a7789f299 100755
--- a/contracts/feature-tests/basic-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/basic-features/wasm/Cargo.lock
@@ -50,9 +50,9 @@ dependencies = [
 
 [[package]]
 name = "bitflags"
-version = "1.3.2"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
 
 [[package]]
 name = "cfg-if"
@@ -68,9 +68,9 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.14.2"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 dependencies = [
  "ahash",
  "allocator-api2",
@@ -90,7 +90,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -102,7 +102,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -110,35 +110,35 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
  "radix_trie",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "multiversx-sc",
 ]
@@ -163,15 +163,15 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.69"
+version = "1.0.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
 dependencies = [
  "unicode-ident",
 ]
@@ -203,20 +203,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "1.0.109"
+version = "2.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.39"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
+checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -237,20 +226,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
+checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
+checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn",
 ]
diff --git a/contracts/feature-tests/basic-features/wasm/src/lib.rs b/contracts/feature-tests/basic-features/wasm/src/lib.rs
index bced862b54..531da8b0bb 100644
--- a/contracts/feature-tests/basic-features/wasm/src/lib.rs
+++ b/contracts/feature-tests/basic-features/wasm/src/lib.rs
@@ -10,9 +10,7 @@
 // Total number of exported functions: 370
 
 #![no_std]
-
-// Configuration that works with rustc < 1.73.0.
-// TODO: Recommended rustc version: 1.73.0 or newer.
+#![allow(internal_features)]
 #![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
diff --git a/contracts/feature-tests/big-float-features/wasm/Cargo.lock b/contracts/feature-tests/big-float-features/wasm/Cargo.lock
index 69807bf0c1..f7a615833b 100644
--- a/contracts/feature-tests/big-float-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/big-float-features/wasm/Cargo.lock
@@ -49,9 +49,9 @@ dependencies = [
 
 [[package]]
 name = "bitflags"
-version = "1.3.2"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
 
 [[package]]
 name = "cfg-if"
@@ -67,9 +67,9 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.14.2"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 dependencies = [
  "ahash",
  "allocator-api2",
@@ -89,7 +89,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -101,7 +101,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -109,28 +109,28 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
  "radix_trie",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "multiversx-sc",
 ]
@@ -155,15 +155,15 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.69"
+version = "1.0.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
 dependencies = [
  "unicode-ident",
 ]
@@ -195,20 +195,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "1.0.109"
+version = "2.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.39"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
+checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -229,20 +218,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
+checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
+checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn",
 ]
diff --git a/contracts/feature-tests/big-float-features/wasm/src/lib.rs b/contracts/feature-tests/big-float-features/wasm/src/lib.rs
index 27657bc700..1219ed8ad0 100644
--- a/contracts/feature-tests/big-float-features/wasm/src/lib.rs
+++ b/contracts/feature-tests/big-float-features/wasm/src/lib.rs
@@ -10,9 +10,7 @@
 // Total number of exported functions:  72
 
 #![no_std]
-
-// Configuration that works with rustc < 1.73.0.
-// TODO: Recommended rustc version: 1.73.0 or newer.
+#![allow(internal_features)]
 #![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
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 a7cade4753..6084042838 100644
--- a/contracts/feature-tests/composability/builtin-func-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/builtin-func-features/wasm/Cargo.lock
@@ -34,9 +34,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "bitflags"
-version = "1.3.2"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
 
 [[package]]
 name = "builtin-func-features"
@@ -67,9 +67,9 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.14.2"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 dependencies = [
  "ahash",
  "allocator-api2",
@@ -89,7 +89,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -101,7 +101,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -109,28 +109,28 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
  "radix_trie",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "multiversx-sc",
 ]
@@ -155,15 +155,15 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.69"
+version = "1.0.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
 dependencies = [
  "unicode-ident",
 ]
@@ -195,20 +195,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "1.0.109"
+version = "2.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.39"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
+checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -229,20 +218,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
+checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
+checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn",
 ]
diff --git a/contracts/feature-tests/composability/builtin-func-features/wasm/src/lib.rs b/contracts/feature-tests/composability/builtin-func-features/wasm/src/lib.rs
index 2594606e6f..b6175c29b0 100644
--- a/contracts/feature-tests/composability/builtin-func-features/wasm/src/lib.rs
+++ b/contracts/feature-tests/composability/builtin-func-features/wasm/src/lib.rs
@@ -10,9 +10,7 @@
 // Total number of exported functions:   4
 
 #![no_std]
-
-// Configuration that works with rustc < 1.73.0.
-// TODO: Recommended rustc version: 1.73.0 or newer.
+#![allow(internal_features)]
 #![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
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 a66a27b0a6..5217a79872 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
@@ -34,9 +34,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "bitflags"
-version = "1.3.2"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
 
 [[package]]
 name = "cfg-if"
@@ -67,9 +67,9 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.14.2"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 dependencies = [
  "ahash",
  "allocator-api2",
@@ -89,7 +89,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -101,7 +101,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -109,28 +109,28 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
  "radix_trie",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "multiversx-sc",
 ]
@@ -155,15 +155,15 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.69"
+version = "1.0.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
 dependencies = [
  "unicode-ident",
 ]
@@ -195,20 +195,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "1.0.109"
+version = "2.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.39"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
+checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -229,20 +218,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
+checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
+checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn",
 ]
diff --git a/contracts/feature-tests/composability/esdt-contract-pair/first-contract/wasm/src/lib.rs b/contracts/feature-tests/composability/esdt-contract-pair/first-contract/wasm/src/lib.rs
index aa788dc33e..163070bd0a 100644
--- a/contracts/feature-tests/composability/esdt-contract-pair/first-contract/wasm/src/lib.rs
+++ b/contracts/feature-tests/composability/esdt-contract-pair/first-contract/wasm/src/lib.rs
@@ -10,9 +10,7 @@
 // Total number of exported functions:   9
 
 #![no_std]
-
-// Configuration that works with rustc < 1.73.0.
-// TODO: Recommended rustc version: 1.73.0 or newer.
+#![allow(internal_features)]
 #![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
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 f7f359ceb2..c11813891a 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
@@ -34,9 +34,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "bitflags"
-version = "1.3.2"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
 
 [[package]]
 name = "cfg-if"
@@ -52,9 +52,9 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.14.2"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 dependencies = [
  "ahash",
  "allocator-api2",
@@ -74,7 +74,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -94,28 +94,28 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
  "radix_trie",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "multiversx-sc",
 ]
@@ -140,15 +140,15 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.69"
+version = "1.0.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
 dependencies = [
  "unicode-ident",
 ]
@@ -195,20 +195,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "1.0.109"
+version = "2.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.39"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
+checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -229,20 +218,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
+checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
+checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn",
 ]
diff --git a/contracts/feature-tests/composability/esdt-contract-pair/second-contract/wasm/src/lib.rs b/contracts/feature-tests/composability/esdt-contract-pair/second-contract/wasm/src/lib.rs
index 5497f2abd6..574e5e91d2 100644
--- a/contracts/feature-tests/composability/esdt-contract-pair/second-contract/wasm/src/lib.rs
+++ b/contracts/feature-tests/composability/esdt-contract-pair/second-contract/wasm/src/lib.rs
@@ -10,9 +10,7 @@
 // Total number of exported functions:   5
 
 #![no_std]
-
-// Configuration that works with rustc < 1.73.0.
-// TODO: Recommended rustc version: 1.73.0 or newer.
+#![allow(internal_features)]
 #![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
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 e09c6e731a..284791d67a 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
@@ -34,9 +34,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "bitflags"
-version = "1.3.2"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
 
 [[package]]
 name = "cfg-if"
@@ -67,9 +67,9 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.14.2"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 dependencies = [
  "ahash",
  "allocator-api2",
@@ -89,7 +89,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -101,7 +101,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -109,28 +109,28 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
  "radix_trie",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "multiversx-sc",
 ]
@@ -155,15 +155,15 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.69"
+version = "1.0.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
 dependencies = [
  "unicode-ident",
 ]
@@ -195,20 +195,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "1.0.109"
+version = "2.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.39"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
+checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -229,20 +218,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
+checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
+checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn",
 ]
diff --git a/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/child/wasm/src/lib.rs b/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/child/wasm/src/lib.rs
index f98973d3c1..0610352c5f 100644
--- a/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/child/wasm/src/lib.rs
+++ b/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/child/wasm/src/lib.rs
@@ -10,9 +10,7 @@
 // Total number of exported functions:   4
 
 #![no_std]
-
-// Configuration that works with rustc < 1.73.0.
-// TODO: Recommended rustc version: 1.73.0 or newer.
+#![allow(internal_features)]
 #![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
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 65aa527929..9b23faa0a8 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
@@ -34,9 +34,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "bitflags"
-version = "1.3.2"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
 
 [[package]]
 name = "cfg-if"
@@ -59,9 +59,9 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.14.2"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 dependencies = [
  "ahash",
  "allocator-api2",
@@ -81,7 +81,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -93,7 +93,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -101,28 +101,28 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
  "radix_trie",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "multiversx-sc",
 ]
@@ -147,9 +147,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "parent"
@@ -169,9 +169,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.69"
+version = "1.0.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
 dependencies = [
  "unicode-ident",
 ]
@@ -203,20 +203,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "1.0.109"
+version = "2.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.39"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
+checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -237,20 +226,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
+checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
+checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn",
 ]
diff --git a/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/parent/wasm/src/lib.rs b/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/parent/wasm/src/lib.rs
index f2e699812b..6af21719dc 100644
--- a/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/parent/wasm/src/lib.rs
+++ b/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/parent/wasm/src/lib.rs
@@ -10,9 +10,7 @@
 // Total number of exported functions:   6
 
 #![no_std]
-
-// Configuration that works with rustc < 1.73.0.
-// TODO: Recommended rustc version: 1.73.0 or newer.
+#![allow(internal_features)]
 #![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
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 e84b93c9c1..485022632a 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
@@ -34,9 +34,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "bitflags"
-version = "1.3.2"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
 
 [[package]]
 name = "cfg-if"
@@ -68,9 +68,9 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.14.2"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 dependencies = [
  "ahash",
  "allocator-api2",
@@ -90,7 +90,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -102,7 +102,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -110,28 +110,28 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
  "radix_trie",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "multiversx-sc",
 ]
@@ -156,15 +156,15 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.69"
+version = "1.0.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
 dependencies = [
  "unicode-ident",
 ]
@@ -196,20 +196,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "1.0.109"
+version = "2.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.39"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
+checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -237,20 +226,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
+checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
+checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn",
 ]
diff --git a/contracts/feature-tests/composability/forwarder-queue/wasm-forwarder-queue-promises/src/lib.rs b/contracts/feature-tests/composability/forwarder-queue/wasm-forwarder-queue-promises/src/lib.rs
index 52e2487f58..639d22d1e1 100644
--- a/contracts/feature-tests/composability/forwarder-queue/wasm-forwarder-queue-promises/src/lib.rs
+++ b/contracts/feature-tests/composability/forwarder-queue/wasm-forwarder-queue-promises/src/lib.rs
@@ -11,9 +11,7 @@
 // Total number of exported functions:  13
 
 #![no_std]
-
-// Configuration that works with rustc < 1.73.0.
-// TODO: Recommended rustc version: 1.73.0 or newer.
+#![allow(internal_features)]
 #![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
diff --git a/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock
index ed8d3d793f..b530d6b411 100644
--- a/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock
@@ -34,9 +34,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "bitflags"
-version = "1.3.2"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
 
 [[package]]
 name = "cfg-if"
@@ -68,9 +68,9 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.14.2"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 dependencies = [
  "ahash",
  "allocator-api2",
@@ -90,7 +90,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -102,7 +102,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -110,28 +110,28 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
  "radix_trie",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "multiversx-sc",
 ]
@@ -156,15 +156,15 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.69"
+version = "1.0.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
 dependencies = [
  "unicode-ident",
 ]
@@ -196,20 +196,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "1.0.109"
+version = "2.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.39"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
+checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -237,20 +226,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
+checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
+checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn",
 ]
diff --git a/contracts/feature-tests/composability/forwarder-queue/wasm/src/lib.rs b/contracts/feature-tests/composability/forwarder-queue/wasm/src/lib.rs
index 5aba9d633d..45c5b3c92f 100644
--- a/contracts/feature-tests/composability/forwarder-queue/wasm/src/lib.rs
+++ b/contracts/feature-tests/composability/forwarder-queue/wasm/src/lib.rs
@@ -10,9 +10,7 @@
 // Total number of exported functions:  12
 
 #![no_std]
-
-// Configuration that works with rustc < 1.73.0.
-// TODO: Recommended rustc version: 1.73.0 or newer.
+#![allow(internal_features)]
 #![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
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 ee0b5e7485..17fd6449d5 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
@@ -34,9 +34,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "bitflags"
-version = "1.3.2"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
 
 [[package]]
 name = "cfg-if"
@@ -67,9 +67,9 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.14.2"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 dependencies = [
  "ahash",
  "allocator-api2",
@@ -89,7 +89,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -101,7 +101,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -109,28 +109,28 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
  "radix_trie",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "multiversx-sc",
 ]
@@ -155,15 +155,15 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.69"
+version = "1.0.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
 dependencies = [
  "unicode-ident",
 ]
@@ -195,20 +195,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "1.0.109"
+version = "2.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.39"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
+checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -229,20 +218,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
+checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
+checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn",
 ]
diff --git a/contracts/feature-tests/composability/forwarder-raw/wasm-forwarder-raw-init-async-call/src/lib.rs b/contracts/feature-tests/composability/forwarder-raw/wasm-forwarder-raw-init-async-call/src/lib.rs
index eed1607dd8..01c9657fd7 100644
--- a/contracts/feature-tests/composability/forwarder-raw/wasm-forwarder-raw-init-async-call/src/lib.rs
+++ b/contracts/feature-tests/composability/forwarder-raw/wasm-forwarder-raw-init-async-call/src/lib.rs
@@ -10,9 +10,7 @@
 // Total number of exported functions:   3
 
 #![no_std]
-
-// Configuration that works with rustc < 1.73.0.
-// TODO: Recommended rustc version: 1.73.0 or newer.
+#![allow(internal_features)]
 #![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
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 04fc6448ab..cbf4970aed 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
@@ -34,9 +34,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "bitflags"
-version = "1.3.2"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
 
 [[package]]
 name = "cfg-if"
@@ -67,9 +67,9 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.14.2"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 dependencies = [
  "ahash",
  "allocator-api2",
@@ -89,7 +89,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -101,7 +101,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -109,28 +109,28 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
  "radix_trie",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "multiversx-sc",
 ]
@@ -155,15 +155,15 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.69"
+version = "1.0.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
 dependencies = [
  "unicode-ident",
 ]
@@ -195,20 +195,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "1.0.109"
+version = "2.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.39"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
+checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -229,20 +218,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
+checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
+checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn",
 ]
diff --git a/contracts/feature-tests/composability/forwarder-raw/wasm-forwarder-raw-init-sync-call/src/lib.rs b/contracts/feature-tests/composability/forwarder-raw/wasm-forwarder-raw-init-sync-call/src/lib.rs
index f47232ca1a..dd5b4bb3b1 100644
--- a/contracts/feature-tests/composability/forwarder-raw/wasm-forwarder-raw-init-sync-call/src/lib.rs
+++ b/contracts/feature-tests/composability/forwarder-raw/wasm-forwarder-raw-init-sync-call/src/lib.rs
@@ -10,9 +10,7 @@
 // Total number of exported functions:   2
 
 #![no_std]
-
-// Configuration that works with rustc < 1.73.0.
-// TODO: Recommended rustc version: 1.73.0 or newer.
+#![allow(internal_features)]
 #![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
diff --git a/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.lock
index 3168e81e59..579c3f25a9 100755
--- a/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.lock
@@ -34,9 +34,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "bitflags"
-version = "1.3.2"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
 
 [[package]]
 name = "cfg-if"
@@ -67,9 +67,9 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.14.2"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 dependencies = [
  "ahash",
  "allocator-api2",
@@ -89,7 +89,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -101,7 +101,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -109,28 +109,28 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
  "radix_trie",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "multiversx-sc",
 ]
@@ -155,15 +155,15 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.69"
+version = "1.0.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
 dependencies = [
  "unicode-ident",
 ]
@@ -195,20 +195,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "1.0.109"
+version = "2.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.39"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
+checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -229,20 +218,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
+checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
+checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn",
 ]
diff --git a/contracts/feature-tests/composability/forwarder-raw/wasm/src/lib.rs b/contracts/feature-tests/composability/forwarder-raw/wasm/src/lib.rs
index 429013b1cb..980ea6ce70 100644
--- a/contracts/feature-tests/composability/forwarder-raw/wasm/src/lib.rs
+++ b/contracts/feature-tests/composability/forwarder-raw/wasm/src/lib.rs
@@ -10,9 +10,7 @@
 // Total number of exported functions:  27
 
 #![no_std]
-
-// Configuration that works with rustc < 1.73.0.
-// TODO: Recommended rustc version: 1.73.0 or newer.
+#![allow(internal_features)]
 #![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
diff --git a/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock
index dbcd39cde2..6400b3010e 100755
--- a/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock
@@ -34,9 +34,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "bitflags"
-version = "1.3.2"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
 
 [[package]]
 name = "cfg-if"
@@ -68,9 +68,9 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.14.2"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 dependencies = [
  "ahash",
  "allocator-api2",
@@ -90,7 +90,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -102,7 +102,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -110,28 +110,28 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
  "radix_trie",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "multiversx-sc",
 ]
@@ -156,15 +156,15 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.69"
+version = "1.0.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
 dependencies = [
  "unicode-ident",
 ]
@@ -196,20 +196,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "1.0.109"
+version = "2.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.39"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
+checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -237,20 +226,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
+checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
+checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn",
 ]
diff --git a/contracts/feature-tests/composability/forwarder/wasm/src/lib.rs b/contracts/feature-tests/composability/forwarder/wasm/src/lib.rs
index 04fa2abc7b..2fe9d2486c 100644
--- a/contracts/feature-tests/composability/forwarder/wasm/src/lib.rs
+++ b/contracts/feature-tests/composability/forwarder/wasm/src/lib.rs
@@ -10,9 +10,7 @@
 // Total number of exported functions:  68
 
 #![no_std]
-
-// Configuration that works with rustc < 1.73.0.
-// TODO: Recommended rustc version: 1.73.0 or newer.
+#![allow(internal_features)]
 #![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
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 bc2bc5b549..fffe5c9cb6 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
@@ -34,9 +34,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "bitflags"
-version = "1.3.2"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
 
 [[package]]
 name = "cfg-if"
@@ -52,9 +52,9 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.14.2"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 dependencies = [
  "ahash",
  "allocator-api2",
@@ -89,7 +89,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -101,7 +101,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -109,28 +109,28 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
  "radix_trie",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "multiversx-sc",
 ]
@@ -155,15 +155,15 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.69"
+version = "1.0.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
 dependencies = [
  "unicode-ident",
 ]
@@ -195,20 +195,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "1.0.109"
+version = "2.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.39"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
+checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -229,20 +218,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
+checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
+checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn",
 ]
diff --git a/contracts/feature-tests/composability/local-esdt-and-nft/wasm/src/lib.rs b/contracts/feature-tests/composability/local-esdt-and-nft/wasm/src/lib.rs
index afd8ad6608..5bd9fa54c0 100644
--- a/contracts/feature-tests/composability/local-esdt-and-nft/wasm/src/lib.rs
+++ b/contracts/feature-tests/composability/local-esdt-and-nft/wasm/src/lib.rs
@@ -10,9 +10,7 @@
 // Total number of exported functions:  20
 
 #![no_std]
-
-// Configuration that works with rustc < 1.73.0.
-// TODO: Recommended rustc version: 1.73.0 or newer.
+#![allow(internal_features)]
 #![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
diff --git a/contracts/feature-tests/composability/promises-features/wasm/Cargo.lock b/contracts/feature-tests/composability/promises-features/wasm/Cargo.lock
index 8be4c86972..7fd1a45912 100644
--- a/contracts/feature-tests/composability/promises-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/promises-features/wasm/Cargo.lock
@@ -34,9 +34,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "bitflags"
-version = "1.3.2"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
 
 [[package]]
 name = "cfg-if"
@@ -52,9 +52,9 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.14.2"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 dependencies = [
  "ahash",
  "allocator-api2",
@@ -74,7 +74,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -94,28 +94,28 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
  "radix_trie",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "multiversx-sc",
 ]
@@ -140,15 +140,15 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.69"
+version = "1.0.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
 dependencies = [
  "unicode-ident",
 ]
@@ -196,20 +196,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "1.0.109"
+version = "2.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.39"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
+checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -237,20 +226,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
+checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
+checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn",
 ]
diff --git a/contracts/feature-tests/composability/promises-features/wasm/src/lib.rs b/contracts/feature-tests/composability/promises-features/wasm/src/lib.rs
index 635464981b..e9b079caf6 100644
--- a/contracts/feature-tests/composability/promises-features/wasm/src/lib.rs
+++ b/contracts/feature-tests/composability/promises-features/wasm/src/lib.rs
@@ -5,15 +5,13 @@
 ////////////////////////////////////////////////////
 
 // Init:                                 1
-// Endpoints:                            9
+// Endpoints:                           10
 // Async Callback (empty):               1
 // Promise callbacks:                    3
-// Total number of exported functions:  14
+// Total number of exported functions:  15
 
 #![no_std]
-
-// Configuration that works with rustc < 1.73.0.
-// TODO: Recommended rustc version: 1.73.0 or newer.
+#![allow(internal_features)]
 #![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
@@ -31,6 +29,7 @@ multiversx_sc_wasm_adapter::endpoints! {
         promise_raw_single_token => promise_raw_single_token
         promise_raw_multi_transfer => promise_raw_multi_transfer
         forward_sync_retrieve_funds_bt => forward_sync_retrieve_funds_bt
+        forward_sync_retrieve_funds_bt_twice => forward_sync_retrieve_funds_bt_twice
         forward_promise_retrieve_funds_back_transfers => forward_promise_retrieve_funds_back_transfers
         retrieve_funds_callback => retrieve_funds_callback
         the_one_callback => the_one_callback
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 1b22948f63..d1490ec6ad 100755
--- a/contracts/feature-tests/composability/proxy-test-first/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/proxy-test-first/wasm/Cargo.lock
@@ -34,9 +34,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "bitflags"
-version = "1.3.2"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
 
 [[package]]
 name = "cfg-if"
@@ -52,9 +52,9 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.14.2"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 dependencies = [
  "ahash",
  "allocator-api2",
@@ -74,7 +74,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -94,28 +94,28 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
  "radix_trie",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "multiversx-sc",
 ]
@@ -140,15 +140,15 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.69"
+version = "1.0.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
 dependencies = [
  "unicode-ident",
 ]
@@ -196,20 +196,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "1.0.109"
+version = "2.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.39"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
+checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -230,20 +219,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
+checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
+checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn",
 ]
diff --git a/contracts/feature-tests/composability/proxy-test-first/wasm/src/lib.rs b/contracts/feature-tests/composability/proxy-test-first/wasm/src/lib.rs
index b81a67da53..f9ce7c6833 100644
--- a/contracts/feature-tests/composability/proxy-test-first/wasm/src/lib.rs
+++ b/contracts/feature-tests/composability/proxy-test-first/wasm/src/lib.rs
@@ -10,9 +10,7 @@
 // Total number of exported functions:   8
 
 #![no_std]
-
-// Configuration that works with rustc < 1.73.0.
-// TODO: Recommended rustc version: 1.73.0 or newer.
+#![allow(internal_features)]
 #![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!(static64k);
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 e7d0f2d1a6..f02283fb0e 100755
--- a/contracts/feature-tests/composability/proxy-test-second/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/proxy-test-second/wasm/Cargo.lock
@@ -34,9 +34,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "bitflags"
-version = "1.3.2"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
 
 [[package]]
 name = "cfg-if"
@@ -52,9 +52,9 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.14.2"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 dependencies = [
  "ahash",
  "allocator-api2",
@@ -74,7 +74,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -94,28 +94,28 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
  "radix_trie",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "multiversx-sc",
 ]
@@ -140,15 +140,15 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.69"
+version = "1.0.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
 dependencies = [
  "unicode-ident",
 ]
@@ -195,20 +195,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "1.0.109"
+version = "2.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.39"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
+checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -229,20 +218,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
+checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
+checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn",
 ]
diff --git a/contracts/feature-tests/composability/proxy-test-second/wasm/src/lib.rs b/contracts/feature-tests/composability/proxy-test-second/wasm/src/lib.rs
index 309b27d9f8..e10ed79624 100644
--- a/contracts/feature-tests/composability/proxy-test-second/wasm/src/lib.rs
+++ b/contracts/feature-tests/composability/proxy-test-second/wasm/src/lib.rs
@@ -10,9 +10,7 @@
 // Total number of exported functions:   6
 
 #![no_std]
-
-// Configuration that works with rustc < 1.73.0.
-// TODO: Recommended rustc version: 1.73.0 or newer.
+#![allow(internal_features)]
 #![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!(static64k);
diff --git a/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.lock b/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.lock
index ebcd3dd5e1..c3dc36f878 100755
--- a/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.lock
@@ -34,9 +34,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "bitflags"
-version = "1.3.2"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
 
 [[package]]
 name = "cfg-if"
@@ -52,9 +52,9 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.14.2"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 dependencies = [
  "ahash",
  "allocator-api2",
@@ -74,7 +74,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -94,28 +94,28 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
  "radix_trie",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "multiversx-sc",
 ]
@@ -140,15 +140,15 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.69"
+version = "1.0.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
 dependencies = [
  "unicode-ident",
 ]
@@ -196,20 +196,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "1.0.109"
+version = "2.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.39"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
+checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -237,20 +226,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
+checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
+checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn",
 ]
diff --git a/contracts/feature-tests/composability/recursive-caller/wasm/src/lib.rs b/contracts/feature-tests/composability/recursive-caller/wasm/src/lib.rs
index 04b323d337..3e2da1f9b6 100644
--- a/contracts/feature-tests/composability/recursive-caller/wasm/src/lib.rs
+++ b/contracts/feature-tests/composability/recursive-caller/wasm/src/lib.rs
@@ -10,9 +10,7 @@
 // Total number of exported functions:   3
 
 #![no_std]
-
-// Configuration that works with rustc < 1.73.0.
-// TODO: Recommended rustc version: 1.73.0 or newer.
+#![allow(internal_features)]
 #![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
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 fe3fd5c897..5919831cbd 100644
--- a/contracts/feature-tests/composability/transfer-role-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/transfer-role-features/wasm/Cargo.lock
@@ -34,9 +34,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "bitflags"
-version = "1.3.2"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
 
 [[package]]
 name = "cfg-if"
@@ -52,9 +52,9 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.14.2"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 dependencies = [
  "ahash",
  "allocator-api2",
@@ -74,7 +74,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -94,35 +94,35 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
  "radix_trie",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "multiversx-sc",
 ]
@@ -147,15 +147,15 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.69"
+version = "1.0.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
 dependencies = [
  "unicode-ident",
 ]
@@ -187,20 +187,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "1.0.109"
+version = "2.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.39"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
+checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -237,20 +226,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
+checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
+checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn",
 ]
diff --git a/contracts/feature-tests/composability/transfer-role-features/wasm/src/lib.rs b/contracts/feature-tests/composability/transfer-role-features/wasm/src/lib.rs
index 068825a4b2..317595fcea 100644
--- a/contracts/feature-tests/composability/transfer-role-features/wasm/src/lib.rs
+++ b/contracts/feature-tests/composability/transfer-role-features/wasm/src/lib.rs
@@ -10,9 +10,7 @@
 // Total number of exported functions:   3
 
 #![no_std]
-
-// Configuration that works with rustc < 1.73.0.
-// TODO: Recommended rustc version: 1.73.0 or newer.
+#![allow(internal_features)]
 #![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
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 e5ae17b824..4669986f17 100644
--- a/contracts/feature-tests/composability/vault/wasm-vault-promises/Cargo.lock
+++ b/contracts/feature-tests/composability/vault/wasm-vault-promises/Cargo.lock
@@ -34,9 +34,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "bitflags"
-version = "1.3.2"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
 
 [[package]]
 name = "cfg-if"
@@ -52,9 +52,9 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.14.2"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 dependencies = [
  "ahash",
  "allocator-api2",
@@ -74,7 +74,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -94,28 +94,28 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
  "radix_trie",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "multiversx-sc",
 ]
@@ -140,15 +140,15 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.69"
+version = "1.0.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
 dependencies = [
  "unicode-ident",
 ]
@@ -180,20 +180,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "1.0.109"
+version = "2.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.39"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
+checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -229,20 +218,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
+checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
+checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn",
 ]
diff --git a/contracts/feature-tests/composability/vault/wasm-vault-promises/src/lib.rs b/contracts/feature-tests/composability/vault/wasm-vault-promises/src/lib.rs
index c2b65bd9c2..f1a599dafe 100644
--- a/contracts/feature-tests/composability/vault/wasm-vault-promises/src/lib.rs
+++ b/contracts/feature-tests/composability/vault/wasm-vault-promises/src/lib.rs
@@ -10,9 +10,7 @@
 // Total number of exported functions:  18
 
 #![no_std]
-
-// Configuration that works with rustc < 1.73.0.
-// TODO: Recommended rustc version: 1.73.0 or newer.
+#![allow(internal_features)]
 #![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
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 391e38e40b..b3126fba48 100644
--- a/contracts/feature-tests/composability/vault/wasm-vault-upgrade/Cargo.lock
+++ b/contracts/feature-tests/composability/vault/wasm-vault-upgrade/Cargo.lock
@@ -34,9 +34,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "bitflags"
-version = "1.3.2"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
 
 [[package]]
 name = "cfg-if"
@@ -52,9 +52,9 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.14.2"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 dependencies = [
  "ahash",
  "allocator-api2",
@@ -74,7 +74,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -94,28 +94,28 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
  "radix_trie",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "multiversx-sc",
 ]
@@ -140,15 +140,15 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.69"
+version = "1.0.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
 dependencies = [
  "unicode-ident",
 ]
@@ -180,20 +180,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "1.0.109"
+version = "2.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.39"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
+checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -229,20 +218,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
+checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
+checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn",
 ]
diff --git a/contracts/feature-tests/composability/vault/wasm-vault-upgrade/src/lib.rs b/contracts/feature-tests/composability/vault/wasm-vault-upgrade/src/lib.rs
index d64cc18792..904a343933 100644
--- a/contracts/feature-tests/composability/vault/wasm-vault-upgrade/src/lib.rs
+++ b/contracts/feature-tests/composability/vault/wasm-vault-upgrade/src/lib.rs
@@ -10,9 +10,7 @@
 // Total number of exported functions:   3
 
 #![no_std]
-
-// Configuration that works with rustc < 1.73.0.
-// TODO: Recommended rustc version: 1.73.0 or newer.
+#![allow(internal_features)]
 #![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
diff --git a/contracts/feature-tests/composability/vault/wasm/Cargo.lock b/contracts/feature-tests/composability/vault/wasm/Cargo.lock
index 638877dd4a..2e77f9ff9c 100755
--- a/contracts/feature-tests/composability/vault/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/vault/wasm/Cargo.lock
@@ -34,9 +34,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "bitflags"
-version = "1.3.2"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
 
 [[package]]
 name = "cfg-if"
@@ -52,9 +52,9 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.14.2"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 dependencies = [
  "ahash",
  "allocator-api2",
@@ -74,7 +74,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -94,28 +94,28 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
  "radix_trie",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "multiversx-sc",
 ]
@@ -140,15 +140,15 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.69"
+version = "1.0.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
 dependencies = [
  "unicode-ident",
 ]
@@ -180,20 +180,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "1.0.109"
+version = "2.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.39"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
+checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -229,20 +218,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
+checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
+checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn",
 ]
diff --git a/contracts/feature-tests/composability/vault/wasm/src/lib.rs b/contracts/feature-tests/composability/vault/wasm/src/lib.rs
index 6c64caf1df..3ef976396a 100644
--- a/contracts/feature-tests/composability/vault/wasm/src/lib.rs
+++ b/contracts/feature-tests/composability/vault/wasm/src/lib.rs
@@ -10,9 +10,7 @@
 // Total number of exported functions:  18
 
 #![no_std]
-
-// Configuration that works with rustc < 1.73.0.
-// TODO: Recommended rustc version: 1.73.0 or newer.
+#![allow(internal_features)]
 #![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
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 94d93cecf9..f799d981a5 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
@@ -34,9 +34,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "bitflags"
-version = "1.3.2"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
 
 [[package]]
 name = "cfg-if"
@@ -75,9 +75,9 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.14.2"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 dependencies = [
  "ahash",
  "allocator-api2",
@@ -97,7 +97,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -109,7 +109,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -117,28 +117,28 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
  "radix_trie",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "multiversx-sc",
 ]
@@ -163,15 +163,15 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.69"
+version = "1.0.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
 dependencies = [
  "unicode-ident",
 ]
@@ -203,20 +203,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "1.0.109"
+version = "2.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.39"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
+checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -237,20 +226,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
+checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
+checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn",
 ]
diff --git a/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/wasm/src/lib.rs b/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/wasm/src/lib.rs
index 5494a20b3f..d71ab01834 100644
--- a/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/wasm/src/lib.rs
+++ b/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/wasm/src/lib.rs
@@ -10,9 +10,7 @@
 // Total number of exported functions:  10
 
 #![no_std]
-
-// Configuration that works with rustc < 1.73.0.
-// TODO: Recommended rustc version: 1.73.0 or newer.
+#![allow(internal_features)]
 #![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
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 953b8be20e..dfec6d25d2 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
@@ -34,9 +34,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "bitflags"
-version = "1.3.2"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
 
 [[package]]
 name = "cfg-if"
@@ -75,9 +75,9 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.14.2"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 dependencies = [
  "ahash",
  "allocator-api2",
@@ -97,7 +97,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -109,7 +109,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -117,28 +117,28 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
  "radix_trie",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "multiversx-sc",
 ]
@@ -163,15 +163,15 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.69"
+version = "1.0.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
 dependencies = [
  "unicode-ident",
 ]
@@ -203,20 +203,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "1.0.109"
+version = "2.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.39"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
+checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -237,20 +226,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
+checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
+checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn",
 ]
diff --git a/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/wasm/src/lib.rs b/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/wasm/src/lib.rs
index eb3bf2d67d..442a245237 100644
--- a/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/wasm/src/lib.rs
+++ b/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/wasm/src/lib.rs
@@ -10,9 +10,7 @@
 // Total number of exported functions:  14
 
 #![no_std]
-
-// Configuration that works with rustc < 1.73.0.
-// TODO: Recommended rustc version: 1.73.0 or newer.
+#![allow(internal_features)]
 #![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!(static64k);
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 3863364399..5714090106 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
@@ -34,9 +34,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "bitflags"
-version = "1.3.2"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
 
 [[package]]
 name = "cfg-if"
@@ -67,9 +67,9 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.14.2"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 dependencies = [
  "ahash",
  "allocator-api2",
@@ -89,7 +89,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -101,7 +101,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -109,28 +109,28 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
  "radix_trie",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "multiversx-sc",
 ]
@@ -155,15 +155,15 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.69"
+version = "1.0.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
 dependencies = [
  "unicode-ident",
 ]
@@ -195,20 +195,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "1.0.109"
+version = "2.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.39"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
+checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -229,20 +218,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
+checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
+checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn",
 ]
diff --git a/contracts/feature-tests/erc-style-contracts/erc1155-user-mock/wasm/src/lib.rs b/contracts/feature-tests/erc-style-contracts/erc1155-user-mock/wasm/src/lib.rs
index 8b95e24b9e..f3281811d5 100644
--- a/contracts/feature-tests/erc-style-contracts/erc1155-user-mock/wasm/src/lib.rs
+++ b/contracts/feature-tests/erc-style-contracts/erc1155-user-mock/wasm/src/lib.rs
@@ -10,9 +10,7 @@
 // Total number of exported functions:   4
 
 #![no_std]
-
-// Configuration that works with rustc < 1.73.0.
-// TODO: Recommended rustc version: 1.73.0 or newer.
+#![allow(internal_features)]
 #![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
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 7b597e8a6e..d123164d86 100644
--- a/contracts/feature-tests/erc-style-contracts/erc1155/wasm/Cargo.lock
+++ b/contracts/feature-tests/erc-style-contracts/erc1155/wasm/Cargo.lock
@@ -34,9 +34,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "bitflags"
-version = "1.3.2"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
 
 [[package]]
 name = "cfg-if"
@@ -67,9 +67,9 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.14.2"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 dependencies = [
  "ahash",
  "allocator-api2",
@@ -89,7 +89,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -101,7 +101,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -109,28 +109,28 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
  "radix_trie",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "multiversx-sc",
 ]
@@ -155,15 +155,15 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.69"
+version = "1.0.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
 dependencies = [
  "unicode-ident",
 ]
@@ -195,20 +195,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "1.0.109"
+version = "2.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.39"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
+checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -229,20 +218,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
+checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
+checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn",
 ]
diff --git a/contracts/feature-tests/erc-style-contracts/erc1155/wasm/src/lib.rs b/contracts/feature-tests/erc-style-contracts/erc1155/wasm/src/lib.rs
index 3572b4d421..051c2d54fa 100644
--- a/contracts/feature-tests/erc-style-contracts/erc1155/wasm/src/lib.rs
+++ b/contracts/feature-tests/erc-style-contracts/erc1155/wasm/src/lib.rs
@@ -10,9 +10,7 @@
 // Total number of exported functions:  15
 
 #![no_std]
-
-// Configuration that works with rustc < 1.73.0.
-// TODO: Recommended rustc version: 1.73.0 or newer.
+#![allow(internal_features)]
 #![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!(static64k);
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 d2ea170316..90d846c87d 100644
--- a/contracts/feature-tests/erc-style-contracts/erc20/wasm/Cargo.lock
+++ b/contracts/feature-tests/erc-style-contracts/erc20/wasm/Cargo.lock
@@ -34,9 +34,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "bitflags"
-version = "1.3.2"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
 
 [[package]]
 name = "cfg-if"
@@ -67,9 +67,9 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.14.2"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 dependencies = [
  "ahash",
  "allocator-api2",
@@ -89,7 +89,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -101,7 +101,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -109,28 +109,28 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
  "radix_trie",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "multiversx-sc",
 ]
@@ -155,15 +155,15 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.69"
+version = "1.0.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
 dependencies = [
  "unicode-ident",
 ]
@@ -195,20 +195,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "1.0.109"
+version = "2.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.39"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
+checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -229,20 +218,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
+checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
+checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn",
 ]
diff --git a/contracts/feature-tests/erc-style-contracts/erc20/wasm/src/lib.rs b/contracts/feature-tests/erc-style-contracts/erc20/wasm/src/lib.rs
index 0cc3385f58..22fe14729a 100644
--- a/contracts/feature-tests/erc-style-contracts/erc20/wasm/src/lib.rs
+++ b/contracts/feature-tests/erc-style-contracts/erc20/wasm/src/lib.rs
@@ -10,9 +10,7 @@
 // Total number of exported functions:   8
 
 #![no_std]
-
-// Configuration that works with rustc < 1.73.0.
-// TODO: Recommended rustc version: 1.73.0 or newer.
+#![allow(internal_features)]
 #![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
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 b1b7876d09..eecbad209d 100644
--- a/contracts/feature-tests/erc-style-contracts/erc721/wasm/Cargo.lock
+++ b/contracts/feature-tests/erc-style-contracts/erc721/wasm/Cargo.lock
@@ -34,9 +34,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "bitflags"
-version = "1.3.2"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
 
 [[package]]
 name = "cfg-if"
@@ -67,9 +67,9 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.14.2"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 dependencies = [
  "ahash",
  "allocator-api2",
@@ -89,7 +89,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -101,7 +101,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -109,28 +109,28 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
  "radix_trie",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "multiversx-sc",
 ]
@@ -155,15 +155,15 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.69"
+version = "1.0.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
 dependencies = [
  "unicode-ident",
 ]
@@ -195,20 +195,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "1.0.109"
+version = "2.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.39"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
+checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -229,20 +218,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
+checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
+checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn",
 ]
diff --git a/contracts/feature-tests/erc-style-contracts/erc721/wasm/src/lib.rs b/contracts/feature-tests/erc-style-contracts/erc721/wasm/src/lib.rs
index 6ade00a28e..1f97c9968b 100644
--- a/contracts/feature-tests/erc-style-contracts/erc721/wasm/src/lib.rs
+++ b/contracts/feature-tests/erc-style-contracts/erc721/wasm/src/lib.rs
@@ -10,9 +10,7 @@
 // Total number of exported functions:  10
 
 #![no_std]
-
-// Configuration that works with rustc < 1.73.0.
-// TODO: Recommended rustc version: 1.73.0 or newer.
+#![allow(internal_features)]
 #![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
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 e4c5144ad7..777c70a99a 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
@@ -34,9 +34,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "bitflags"
-version = "1.3.2"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
 
 [[package]]
 name = "cfg-if"
@@ -59,9 +59,9 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.14.2"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 dependencies = [
  "ahash",
  "allocator-api2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -109,7 +109,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -117,28 +117,28 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
  "radix_trie",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "multiversx-sc",
 ]
@@ -163,15 +163,15 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.69"
+version = "1.0.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
 dependencies = [
  "unicode-ident",
 ]
@@ -203,20 +203,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "1.0.109"
+version = "2.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.39"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
+checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -237,20 +226,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
+checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
+checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn",
 ]
diff --git a/contracts/feature-tests/erc-style-contracts/lottery-erc20/wasm/src/lib.rs b/contracts/feature-tests/erc-style-contracts/lottery-erc20/wasm/src/lib.rs
index ef13154bcd..ff416cf4b9 100644
--- a/contracts/feature-tests/erc-style-contracts/lottery-erc20/wasm/src/lib.rs
+++ b/contracts/feature-tests/erc-style-contracts/lottery-erc20/wasm/src/lib.rs
@@ -10,9 +10,7 @@
 // Total number of exported functions:   9
 
 #![no_std]
-
-// Configuration that works with rustc < 1.73.0.
-// TODO: Recommended rustc version: 1.73.0 or newer.
+#![allow(internal_features)]
 #![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!(static64k);
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 7e345efb2e..cf3714d7ef 100644
--- a/contracts/feature-tests/esdt-system-sc-mock/wasm/Cargo.lock
+++ b/contracts/feature-tests/esdt-system-sc-mock/wasm/Cargo.lock
@@ -34,9 +34,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "bitflags"
-version = "1.3.2"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
 
 [[package]]
 name = "cfg-if"
@@ -67,9 +67,9 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.14.2"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 dependencies = [
  "ahash",
  "allocator-api2",
@@ -89,7 +89,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -101,7 +101,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -109,28 +109,28 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
  "radix_trie",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "multiversx-sc",
 ]
@@ -155,15 +155,15 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.69"
+version = "1.0.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
 dependencies = [
  "unicode-ident",
 ]
@@ -195,20 +195,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "1.0.109"
+version = "2.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.39"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
+checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -229,20 +218,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
+checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
+checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn",
 ]
diff --git a/contracts/feature-tests/esdt-system-sc-mock/wasm/src/lib.rs b/contracts/feature-tests/esdt-system-sc-mock/wasm/src/lib.rs
index 789590294b..24e6d08cd1 100644
--- a/contracts/feature-tests/esdt-system-sc-mock/wasm/src/lib.rs
+++ b/contracts/feature-tests/esdt-system-sc-mock/wasm/src/lib.rs
@@ -10,9 +10,7 @@
 // Total number of exported functions:   8
 
 #![no_std]
-
-// Configuration that works with rustc < 1.73.0.
-// TODO: Recommended rustc version: 1.73.0 or newer.
+#![allow(internal_features)]
 #![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
diff --git a/contracts/feature-tests/formatted-message-features/wasm/Cargo.lock b/contracts/feature-tests/formatted-message-features/wasm/Cargo.lock
index f8e8c96632..c0e7684add 100644
--- a/contracts/feature-tests/formatted-message-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/formatted-message-features/wasm/Cargo.lock
@@ -34,9 +34,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "bitflags"
-version = "1.3.2"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
 
 [[package]]
 name = "cfg-if"
@@ -67,9 +67,9 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.14.2"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 dependencies = [
  "ahash",
  "allocator-api2",
@@ -89,7 +89,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -101,7 +101,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -109,28 +109,28 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
  "radix_trie",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "multiversx-sc",
 ]
@@ -155,15 +155,15 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.69"
+version = "1.0.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
 dependencies = [
  "unicode-ident",
 ]
@@ -195,20 +195,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "1.0.109"
+version = "2.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.39"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
+checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -229,20 +218,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
+checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
+checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn",
 ]
diff --git a/contracts/feature-tests/formatted-message-features/wasm/src/lib.rs b/contracts/feature-tests/formatted-message-features/wasm/src/lib.rs
index 61194df882..7a07a6ec82 100644
--- a/contracts/feature-tests/formatted-message-features/wasm/src/lib.rs
+++ b/contracts/feature-tests/formatted-message-features/wasm/src/lib.rs
@@ -10,9 +10,7 @@
 // Total number of exported functions:  18
 
 #![no_std]
-
-// Configuration that works with rustc < 1.73.0.
-// TODO: Recommended rustc version: 1.73.0 or newer.
+#![allow(internal_features)]
 #![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
diff --git a/contracts/feature-tests/managed-map-features/wasm/Cargo.lock b/contracts/feature-tests/managed-map-features/wasm/Cargo.lock
index c249f24988..f930299567 100644
--- a/contracts/feature-tests/managed-map-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/managed-map-features/wasm/Cargo.lock
@@ -34,9 +34,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "bitflags"
-version = "1.3.2"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
 
 [[package]]
 name = "cfg-if"
@@ -52,9 +52,9 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.14.2"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 dependencies = [
  "ahash",
  "allocator-api2",
@@ -89,7 +89,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -101,7 +101,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -109,28 +109,28 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
  "radix_trie",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "multiversx-sc",
 ]
@@ -155,15 +155,15 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.69"
+version = "1.0.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
 dependencies = [
  "unicode-ident",
 ]
@@ -195,20 +195,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "1.0.109"
+version = "2.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.39"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
+checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -229,20 +218,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
+checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
+checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn",
 ]
diff --git a/contracts/feature-tests/managed-map-features/wasm/src/lib.rs b/contracts/feature-tests/managed-map-features/wasm/src/lib.rs
index 88819f3209..2f32f8bf49 100644
--- a/contracts/feature-tests/managed-map-features/wasm/src/lib.rs
+++ b/contracts/feature-tests/managed-map-features/wasm/src/lib.rs
@@ -10,9 +10,7 @@
 // Total number of exported functions:   5
 
 #![no_std]
-
-// Configuration that works with rustc < 1.73.0.
-// TODO: Recommended rustc version: 1.73.0 or newer.
+#![allow(internal_features)]
 #![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
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 e9f8a9a811..44bcbbd746 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
@@ -34,9 +34,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "bitflags"
-version = "1.3.2"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
 
 [[package]]
 name = "cfg-if"
@@ -52,9 +52,9 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.14.2"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 dependencies = [
  "ahash",
  "allocator-api2",
@@ -89,7 +89,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -101,7 +101,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -109,28 +109,28 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
  "radix_trie",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "multiversx-sc",
 ]
@@ -155,15 +155,15 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.69"
+version = "1.0.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
 dependencies = [
  "unicode-ident",
 ]
@@ -195,20 +195,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "1.0.109"
+version = "2.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.39"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
+checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -229,20 +218,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
+checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
+checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn",
 ]
diff --git a/contracts/feature-tests/multi-contract-features/wasm-multi-contract-alt-impl/src/lib.rs b/contracts/feature-tests/multi-contract-features/wasm-multi-contract-alt-impl/src/lib.rs
index 57979a3557..ba8838b6e4 100644
--- a/contracts/feature-tests/multi-contract-features/wasm-multi-contract-alt-impl/src/lib.rs
+++ b/contracts/feature-tests/multi-contract-features/wasm-multi-contract-alt-impl/src/lib.rs
@@ -10,9 +10,7 @@
 // Total number of exported functions:   3
 
 #![no_std]
-
-// Configuration that works with rustc < 1.73.0.
-// TODO: Recommended rustc version: 1.73.0 or newer.
+#![allow(internal_features)]
 #![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
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 40f8b6f1f7..e6af798ecc 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
@@ -34,9 +34,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "bitflags"
-version = "1.3.2"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
 
 [[package]]
 name = "cfg-if"
@@ -52,9 +52,9 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.14.2"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 dependencies = [
  "ahash",
  "allocator-api2",
@@ -89,7 +89,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -101,7 +101,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -109,28 +109,28 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
  "radix_trie",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "multiversx-sc",
 ]
@@ -155,15 +155,15 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.69"
+version = "1.0.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
 dependencies = [
  "unicode-ident",
 ]
@@ -195,20 +195,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "1.0.109"
+version = "2.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.39"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
+checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -229,20 +218,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
+checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
+checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn",
 ]
diff --git a/contracts/feature-tests/multi-contract-features/wasm-multi-contract-example-feature/src/lib.rs b/contracts/feature-tests/multi-contract-features/wasm-multi-contract-example-feature/src/lib.rs
index 32c7c0cf3f..655e83240c 100644
--- a/contracts/feature-tests/multi-contract-features/wasm-multi-contract-example-feature/src/lib.rs
+++ b/contracts/feature-tests/multi-contract-features/wasm-multi-contract-example-feature/src/lib.rs
@@ -10,9 +10,7 @@
 // Total number of exported functions:   4
 
 #![no_std]
-
-// Configuration that works with rustc < 1.73.0.
-// TODO: Recommended rustc version: 1.73.0 or newer.
+#![allow(internal_features)]
 #![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
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 5e35e86680..e34bbb2216 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
@@ -34,9 +34,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "bitflags"
-version = "1.3.2"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
 
 [[package]]
 name = "cfg-if"
@@ -52,9 +52,9 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.14.2"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 dependencies = [
  "ahash",
  "allocator-api2",
@@ -89,7 +89,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -101,7 +101,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -109,28 +109,28 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
  "radix_trie",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "multiversx-sc",
 ]
@@ -155,15 +155,15 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.69"
+version = "1.0.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
 dependencies = [
  "unicode-ident",
 ]
@@ -195,20 +195,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "1.0.109"
+version = "2.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.39"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
+checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -229,20 +218,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
+checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
+checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn",
 ]
diff --git a/contracts/feature-tests/multi-contract-features/wasm-multi-contract-features-view/src/lib.rs b/contracts/feature-tests/multi-contract-features/wasm-multi-contract-features-view/src/lib.rs
index cbf61c8513..871bfb5bca 100644
--- a/contracts/feature-tests/multi-contract-features/wasm-multi-contract-features-view/src/lib.rs
+++ b/contracts/feature-tests/multi-contract-features/wasm-multi-contract-features-view/src/lib.rs
@@ -10,9 +10,7 @@
 // Total number of exported functions:   5
 
 #![no_std]
-
-// Configuration that works with rustc < 1.73.0.
-// TODO: Recommended rustc version: 1.73.0 or newer.
+#![allow(internal_features)]
 #![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
diff --git a/contracts/feature-tests/multi-contract-features/wasm/Cargo.lock b/contracts/feature-tests/multi-contract-features/wasm/Cargo.lock
index 3103aaba03..3a97b53282 100755
--- a/contracts/feature-tests/multi-contract-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/multi-contract-features/wasm/Cargo.lock
@@ -34,9 +34,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "bitflags"
-version = "1.3.2"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
 
 [[package]]
 name = "cfg-if"
@@ -52,9 +52,9 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.14.2"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 dependencies = [
  "ahash",
  "allocator-api2",
@@ -89,7 +89,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -101,7 +101,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -109,28 +109,28 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
  "radix_trie",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "multiversx-sc",
 ]
@@ -155,15 +155,15 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.69"
+version = "1.0.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
 dependencies = [
  "unicode-ident",
 ]
@@ -195,20 +195,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "1.0.109"
+version = "2.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.39"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
+checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -229,20 +218,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
+checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
+checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn",
 ]
diff --git a/contracts/feature-tests/multi-contract-features/wasm/src/lib.rs b/contracts/feature-tests/multi-contract-features/wasm/src/lib.rs
index 32c7c0cf3f..655e83240c 100644
--- a/contracts/feature-tests/multi-contract-features/wasm/src/lib.rs
+++ b/contracts/feature-tests/multi-contract-features/wasm/src/lib.rs
@@ -10,9 +10,7 @@
 // Total number of exported functions:   4
 
 #![no_std]
-
-// Configuration that works with rustc < 1.73.0.
-// TODO: Recommended rustc version: 1.73.0 or newer.
+#![allow(internal_features)]
 #![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
diff --git a/contracts/feature-tests/panic-message-features/wasm/Cargo.lock b/contracts/feature-tests/panic-message-features/wasm/Cargo.lock
index aded2bc72b..6e4cf5e40c 100755
--- a/contracts/feature-tests/panic-message-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/panic-message-features/wasm/Cargo.lock
@@ -34,9 +34,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "bitflags"
-version = "1.3.2"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
 
 [[package]]
 name = "cfg-if"
@@ -52,9 +52,9 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.14.2"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 dependencies = [
  "ahash",
  "allocator-api2",
@@ -74,7 +74,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -94,28 +94,28 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
  "radix_trie",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "multiversx-sc",
 ]
@@ -140,9 +140,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "panic-message-features"
@@ -161,9 +161,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.69"
+version = "1.0.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
 dependencies = [
  "unicode-ident",
 ]
@@ -195,20 +195,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "1.0.109"
+version = "2.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.39"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
+checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -229,20 +218,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
+checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
+checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn",
 ]
diff --git a/contracts/feature-tests/panic-message-features/wasm/src/lib.rs b/contracts/feature-tests/panic-message-features/wasm/src/lib.rs
index 9a37cf6d1e..2a024b15d2 100644
--- a/contracts/feature-tests/panic-message-features/wasm/src/lib.rs
+++ b/contracts/feature-tests/panic-message-features/wasm/src/lib.rs
@@ -10,9 +10,7 @@
 // Total number of exported functions:   4
 
 #![no_std]
-
-// Configuration that works with rustc < 1.73.0.
-// TODO: Recommended rustc version: 1.73.0 or newer.
+#![allow(internal_features)]
 #![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
diff --git a/contracts/feature-tests/payable-features/wasm/Cargo.lock b/contracts/feature-tests/payable-features/wasm/Cargo.lock
index c825158f1a..8720ec1216 100755
--- a/contracts/feature-tests/payable-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/payable-features/wasm/Cargo.lock
@@ -34,9 +34,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "bitflags"
-version = "1.3.2"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
 
 [[package]]
 name = "cfg-if"
@@ -52,9 +52,9 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.14.2"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 dependencies = [
  "ahash",
  "allocator-api2",
@@ -74,7 +74,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -94,28 +94,28 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
  "radix_trie",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "multiversx-sc",
 ]
@@ -140,9 +140,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "payable-features"
@@ -161,9 +161,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.69"
+version = "1.0.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
 dependencies = [
  "unicode-ident",
 ]
@@ -195,20 +195,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "1.0.109"
+version = "2.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.39"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
+checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -229,20 +218,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
+checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
+checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn",
 ]
diff --git a/contracts/feature-tests/payable-features/wasm/src/lib.rs b/contracts/feature-tests/payable-features/wasm/src/lib.rs
index eb058bd489..9614f000c0 100644
--- a/contracts/feature-tests/payable-features/wasm/src/lib.rs
+++ b/contracts/feature-tests/payable-features/wasm/src/lib.rs
@@ -10,9 +10,7 @@
 // Total number of exported functions:  17
 
 #![no_std]
-
-// Configuration that works with rustc < 1.73.0.
-// TODO: Recommended rustc version: 1.73.0 or newer.
+#![allow(internal_features)]
 #![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
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 2a7afe3873..e97356cc67 100644
--- a/contracts/feature-tests/rust-snippets-generator-test/wasm/Cargo.lock
+++ b/contracts/feature-tests/rust-snippets-generator-test/wasm/Cargo.lock
@@ -34,9 +34,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "bitflags"
-version = "1.3.2"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
 
 [[package]]
 name = "cfg-if"
@@ -52,9 +52,9 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.14.2"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 dependencies = [
  "ahash",
  "allocator-api2",
@@ -74,7 +74,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -94,28 +94,28 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
  "radix_trie",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "multiversx-sc",
 ]
@@ -140,15 +140,15 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.69"
+version = "1.0.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
 dependencies = [
  "unicode-ident",
 ]
@@ -195,20 +195,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "1.0.109"
+version = "2.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.39"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
+checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -229,20 +218,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
+checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
+checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn",
 ]
diff --git a/contracts/feature-tests/rust-snippets-generator-test/wasm/src/lib.rs b/contracts/feature-tests/rust-snippets-generator-test/wasm/src/lib.rs
index 53c096de7f..d4405d49e8 100644
--- a/contracts/feature-tests/rust-snippets-generator-test/wasm/src/lib.rs
+++ b/contracts/feature-tests/rust-snippets-generator-test/wasm/src/lib.rs
@@ -10,9 +10,7 @@
 // Total number of exported functions:  18
 
 #![no_std]
-
-// Configuration that works with rustc < 1.73.0.
-// TODO: Recommended rustc version: 1.73.0 or newer.
+#![allow(internal_features)]
 #![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
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 16f4a4d43b..1153cfc396 100644
--- a/contracts/feature-tests/rust-testing-framework-tester/wasm/Cargo.lock
+++ b/contracts/feature-tests/rust-testing-framework-tester/wasm/Cargo.lock
@@ -34,9 +34,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "bitflags"
-version = "1.3.2"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
 
 [[package]]
 name = "cfg-if"
@@ -52,9 +52,9 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.14.2"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 dependencies = [
  "ahash",
  "allocator-api2",
@@ -74,7 +74,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -94,28 +94,28 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
  "radix_trie",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "multiversx-sc",
 ]
@@ -140,15 +140,15 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.69"
+version = "1.0.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
 dependencies = [
  "unicode-ident",
 ]
@@ -195,20 +195,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "1.0.109"
+version = "2.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.39"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
+checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -229,20 +218,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
+checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
+checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn",
 ]
diff --git a/contracts/feature-tests/rust-testing-framework-tester/wasm/src/lib.rs b/contracts/feature-tests/rust-testing-framework-tester/wasm/src/lib.rs
index b38cf506c6..e8aaa36184 100644
--- a/contracts/feature-tests/rust-testing-framework-tester/wasm/src/lib.rs
+++ b/contracts/feature-tests/rust-testing-framework-tester/wasm/src/lib.rs
@@ -10,9 +10,7 @@
 // Total number of exported functions:  28
 
 #![no_std]
-
-// Configuration that works with rustc < 1.73.0.
-// TODO: Recommended rustc version: 1.73.0 or newer.
+#![allow(internal_features)]
 #![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!(static64k);
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 54758b3fdb..8f19cb5289 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
@@ -34,9 +34,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "bitflags"
-version = "1.3.2"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
 
 [[package]]
 name = "cfg-if"
@@ -52,9 +52,9 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.14.2"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 dependencies = [
  "ahash",
  "allocator-api2",
@@ -74,7 +74,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -94,35 +94,35 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
  "radix_trie",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "multiversx-sc",
 ]
@@ -147,15 +147,15 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.69"
+version = "1.0.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
 dependencies = [
  "unicode-ident",
 ]
@@ -187,20 +187,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "1.0.109"
+version = "2.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.39"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
+checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -237,20 +226,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
+checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
+checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn",
 ]
diff --git a/contracts/feature-tests/use-module/wasm-use-module-view/src/lib.rs b/contracts/feature-tests/use-module/wasm-use-module-view/src/lib.rs
index c62b40af0a..b1ea58a65a 100644
--- a/contracts/feature-tests/use-module/wasm-use-module-view/src/lib.rs
+++ b/contracts/feature-tests/use-module/wasm-use-module-view/src/lib.rs
@@ -10,9 +10,7 @@
 // Total number of exported functions:   4
 
 #![no_std]
-
-// Configuration that works with rustc < 1.73.0.
-// TODO: Recommended rustc version: 1.73.0 or newer.
+#![allow(internal_features)]
 #![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
diff --git a/contracts/feature-tests/use-module/wasm/Cargo.lock b/contracts/feature-tests/use-module/wasm/Cargo.lock
index 88e3ec2d6b..1d1012fa02 100644
--- a/contracts/feature-tests/use-module/wasm/Cargo.lock
+++ b/contracts/feature-tests/use-module/wasm/Cargo.lock
@@ -34,9 +34,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "bitflags"
-version = "1.3.2"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
 
 [[package]]
 name = "cfg-if"
@@ -52,9 +52,9 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "hashbrown"
-version = "0.14.2"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 dependencies = [
  "ahash",
  "allocator-api2",
@@ -74,7 +74,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -94,35 +94,35 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
  "radix_trie",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "multiversx-sc",
 ]
@@ -147,15 +147,15 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.69"
+version = "1.0.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
 dependencies = [
  "unicode-ident",
 ]
@@ -187,20 +187,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "1.0.109"
+version = "2.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.39"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
+checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -237,20 +226,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
+checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.26"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
+checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn",
 ]
diff --git a/contracts/feature-tests/use-module/wasm/src/lib.rs b/contracts/feature-tests/use-module/wasm/src/lib.rs
index a4e6609b89..88422e3c83 100644
--- a/contracts/feature-tests/use-module/wasm/src/lib.rs
+++ b/contracts/feature-tests/use-module/wasm/src/lib.rs
@@ -10,9 +10,7 @@
 // Total number of exported functions:  65
 
 #![no_std]
-
-// Configuration that works with rustc < 1.73.0.
-// TODO: Recommended rustc version: 1.73.0 or newer.
+#![allow(internal_features)]
 #![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();

From 91ebdc7348a5883cc1068888240666095e97f7b2 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Mon, 18 Dec 2023 22:12:46 +0200
Subject: [PATCH 0173/1254] cargo update

---
 Cargo.lock | 47 ++++++++++++++++++-----------------------------
 1 file changed, 18 insertions(+), 29 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 8b7954e320..125e16d31b 100755
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -500,9 +500,9 @@ dependencies = [
 
 [[package]]
 name = "const-oid"
-version = "0.9.5"
+version = "0.9.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28c122c3980598d243d63d9a704629a2d748d101f278052ff068be5a4423ab6f"
+checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8"
 
 [[package]]
 name = "convert_case"
@@ -558,9 +558,9 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-deque"
-version = "0.8.3"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef"
+checksum = "fca89a0e215bab21874660c67903c5f143333cab1da83d041c7ded6053774751"
 dependencies = [
  "cfg-if",
  "crossbeam-epoch",
@@ -569,22 +569,21 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-epoch"
-version = "0.9.15"
+version = "0.9.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7"
+checksum = "2d2fe95351b870527a5d09bf563ed3c97c0cffb87cf1c78a591bf48bb218d9aa"
 dependencies = [
  "autocfg",
  "cfg-if",
  "crossbeam-utils",
  "memoffset",
- "scopeguard",
 ]
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.8.16"
+version = "0.8.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294"
+checksum = "c06d96137f14f244c37f989d9fff8f95e6c18b918e71f36638f8c49112e4c78f"
 dependencies = [
  "cfg-if",
 ]
@@ -1359,9 +1358,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
 
 [[package]]
 name = "hyper"
-version = "0.14.27"
+version = "0.14.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468"
+checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -1374,7 +1373,7 @@ dependencies = [
  "httpdate",
  "itoa",
  "pin-project-lite",
- "socket2 0.4.10",
+ "socket2",
  "tokio",
  "tower-service",
  "tracing",
@@ -3000,16 +2999,6 @@ version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
-[[package]]
-name = "socket2"
-version = "0.4.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d"
-dependencies = [
- "libc",
- "winapi",
-]
-
 [[package]]
 name = "socket2"
 version = "0.5.5"
@@ -3060,9 +3049,9 @@ checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc"
 
 [[package]]
 name = "syn"
-version = "2.0.40"
+version = "2.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13fa70a4ee923979ffb522cacce59d34421ebdea5625e1073c4326ef9d2dd42e"
+checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3157,7 +3146,7 @@ dependencies = [
  "parking_lot",
  "pin-project-lite",
  "signal-hook-registry",
- "socket2 0.5.5",
+ "socket2",
  "tokio-macros",
  "windows-sys 0.48.0",
 ]
@@ -3699,18 +3688,18 @@ dependencies = [
 
 [[package]]
 name = "zerocopy"
-version = "0.7.30"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "306dca4455518f1f31635ec308b6b3e4eb1b11758cefafc782827d0aa7acb5c7"
+checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.30"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be912bf68235a88fbefd1b73415cb218405958d1655b2ece9035a19920bdf6ba"
+checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a"
 dependencies = [
  "proc-macro2",
  "quote",

From bb2b97ed716d0113fcdb6d1e6153d2dc3b33d81d Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Wed, 20 Dec 2023 13:57:28 +0200
Subject: [PATCH 0174/1254] 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 8b89a391c7d0c978fa278b738976b81f7a8fb4fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Sun, 31 Dec 2023 12:41:01 +0200
Subject: [PATCH 0175/1254] Allow some workflows to be ran on demand.

---
 .github/workflows/actions.yml              | 1 +
 .github/workflows/lldb-formatter-tests.yml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
index 22607fe88f..624241fde4 100644
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -5,6 +5,7 @@ on:
     branches:
       - master
   pull_request:
+  workflow_dispatch:
 
 permissions:
   checks: write
diff --git a/.github/workflows/lldb-formatter-tests.yml b/.github/workflows/lldb-formatter-tests.yml
index c4f0419846..37c256ced2 100644
--- a/.github/workflows/lldb-formatter-tests.yml
+++ b/.github/workflows/lldb-formatter-tests.yml
@@ -5,6 +5,7 @@ on:
     branches:
       - master
   pull_request:
+  workflow_dispatch:
 
 jobs:
   format_tests:

From 9b9e6177e64008ee34ff014a0856c3f0751dc273 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Wed, 3 Jan 2024 09:53:25 +0200
Subject: [PATCH 0176/1254] 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<proc_macro::TokenTree> = format_tokenize::tokenize(input);
+
+    let collected_tokens: Vec<proc_macro::TokenStream> = 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 8dc830cdb3cda96aa5dc5664287d1d87e93d46f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Wed, 3 Jan 2024 10:36:31 +0200
Subject: [PATCH 0177/1254] Use newer CI.

---
 .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 624241fde4..da0eb08d28 100644
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -14,7 +14,7 @@ permissions:
 jobs:
   contracts:
     name: Contracts
-    uses: multiversx/mx-sc-actions/.github/workflows/contracts.yml@v2.3.3
+    uses: multiversx/mx-sc-actions/.github/workflows/contracts.yml@v2.3.5
     with:
       rust-toolchain: nightly-2023-12-11
       vmtools-version: v1.5.19

From 1d9f5d0694419c191b2c8155ed2c2de2cdcb01f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Wed, 3 Jan 2024 10:38:19 +0200
Subject: [PATCH 0178/1254] Fix Rust version.

---
 .github/workflows/lldb-formatter-tests.yml   | 2 +-
 .github/workflows/release-upload.yml         | 2 +-
 .github/workflows/template-test-current.yml  | 2 +-
 .github/workflows/template-test-released.yml | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/lldb-formatter-tests.yml b/.github/workflows/lldb-formatter-tests.yml
index 37c256ced2..36f2d29f08 100644
--- a/.github/workflows/lldb-formatter-tests.yml
+++ b/.github/workflows/lldb-formatter-tests.yml
@@ -16,7 +16,7 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           default: true
-          toolchain: nightly-2023-05-26
+          toolchain: nightly-2023-12-11
 
       - name: Download vscode-lldb
         uses: robinraju/release-downloader@v1.5
diff --git a/.github/workflows/release-upload.yml b/.github/workflows/release-upload.yml
index a4be4368dd..6031a5d427 100644
--- a/.github/workflows/release-upload.yml
+++ b/.github/workflows/release-upload.yml
@@ -20,7 +20,7 @@ jobs:
         uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
           default: true
-          toolchain: nightly-2023-05-26
+          toolchain: nightly-2023-12-11
           target: wasm32-unknown-unknown
 
       - name: Setup the PATH variable
diff --git a/.github/workflows/template-test-current.yml b/.github/workflows/template-test-current.yml
index aad48d8180..9832ef2212 100644
--- a/.github/workflows/template-test-current.yml
+++ b/.github/workflows/template-test-current.yml
@@ -22,7 +22,7 @@ jobs:
         uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
           default: true
-          toolchain: nightly-2023-05-26
+          toolchain: nightly-2023-12-11
           target: wasm32-unknown-unknown
 
       - name: Setup the PATH variable
diff --git a/.github/workflows/template-test-released.yml b/.github/workflows/template-test-released.yml
index 1b2561a488..88f409d24f 100644
--- a/.github/workflows/template-test-released.yml
+++ b/.github/workflows/template-test-released.yml
@@ -22,7 +22,7 @@ jobs:
         uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
           default: true
-          toolchain: nightly-2023-05-26
+          toolchain: nightly-2023-12-11
           target: wasm32-unknown-unknown
 
       - name: Setup the PATH variable

From 9d2aa13f24893c160734886fd1ed816b6c0e8c7e Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Wed, 3 Jan 2024 20:33:23 +0200
Subject: [PATCH 0179/1254] 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 5871ccc739ebc0e695ec5e51e8596ea592a6b754 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 4 Jan 2024 10:53:20 +0200
Subject: [PATCH 0180/1254] promises callback memory fix

---
 .../src/call_promise_direct.rs                |   8 +-
 framework/base/src/contract_base/wrappers.rs  |   2 -
 .../wrappers/callback_args_wrapper.rs         | 100 ------------------
 framework/base/src/io/arg_nested_tuple.rs     |  29 +++--
 4 files changed, 26 insertions(+), 113 deletions(-)
 delete mode 100644 framework/base/src/contract_base/wrappers/callback_args_wrapper.rs

diff --git a/contracts/feature-tests/composability/promises-features/src/call_promise_direct.rs b/contracts/feature-tests/composability/promises-features/src/call_promise_direct.rs
index 6b3dcaebb0..8ce47a10c3 100644
--- a/contracts/feature-tests/composability/promises-features/src/call_promise_direct.rs
+++ b/contracts/feature-tests/composability/promises-features/src/call_promise_direct.rs
@@ -24,7 +24,7 @@ pub trait CallPromisesDirectModule {
             .with_gas_limit(gas_limit)
             .async_call_promise()
             .with_extra_gas_for_callback(extra_gas_for_callback)
-            .with_callback(self.callbacks().the_one_callback(1001, 1002))
+            .with_callback(self.callbacks().the_one_callback(1001, 1002u32.into()))
             .register_promise();
     }
 
@@ -49,7 +49,7 @@ pub trait CallPromisesDirectModule {
             .with_gas_limit(gas_limit)
             .async_call_promise()
             .with_extra_gas_for_callback(extra_gas_for_callback)
-            .with_callback(self.callbacks().the_one_callback(2001, 2002))
+            .with_callback(self.callbacks().the_one_callback(2001, 2002u32.into()))
             .register_promise();
     }
 
@@ -58,7 +58,7 @@ pub trait CallPromisesDirectModule {
         &self,
         #[call_result] result: MultiValueEncoded<ManagedBuffer>,
         arg1: usize,
-        arg2: usize,
+        arg2: BigUint,
     ) {
         self.async_call_event_callback(arg1, arg2, &result.into_vec_of_buffers());
     }
@@ -67,7 +67,7 @@ pub trait CallPromisesDirectModule {
     fn async_call_event_callback(
         &self,
         #[indexed] arg1: usize,
-        #[indexed] arg2: usize,
+        #[indexed] arg2: BigUint,
         arguments: &ManagedVec<Self::Api, ManagedBuffer>,
     );
 }
diff --git a/framework/base/src/contract_base/wrappers.rs b/framework/base/src/contract_base/wrappers.rs
index 4a32bf0a7b..e90e5dbcc2 100644
--- a/framework/base/src/contract_base/wrappers.rs
+++ b/framework/base/src/contract_base/wrappers.rs
@@ -1,6 +1,5 @@
 mod blockchain_wrapper;
 mod call_value_wrapper;
-mod callback_args_wrapper;
 mod crypto_wrapper;
 mod error_helper;
 mod send_raw_wrapper;
@@ -10,7 +9,6 @@ mod storage_raw_wrapper;
 
 pub use blockchain_wrapper::BlockchainWrapper;
 pub use call_value_wrapper::CallValueWrapper;
-pub use callback_args_wrapper::CallbackArgApiWrapper;
 pub use crypto_wrapper::CryptoWrapper;
 pub use error_helper::ErrorHelper;
 pub use send_raw_wrapper::SendRawWrapper;
diff --git a/framework/base/src/contract_base/wrappers/callback_args_wrapper.rs b/framework/base/src/contract_base/wrappers/callback_args_wrapper.rs
deleted file mode 100644
index 2baef24c70..0000000000
--- a/framework/base/src/contract_base/wrappers/callback_args_wrapper.rs
+++ /dev/null
@@ -1,100 +0,0 @@
-use core::marker::PhantomData;
-
-use crate::{
-    api::{
-        const_handles, use_raw_handle, EndpointArgumentApi, EndpointArgumentApiImpl, ErrorApi,
-        HandleTypeInfo, ManagedBufferApiImpl, ManagedTypeApi, StaticVarApi, VMApi,
-    },
-    types::{ManagedArgBuffer, ManagedBuffer, ManagedType},
-};
-
-/// Replaces the EndpointArgumentApi inside a promises callback,
-/// and causes it to read arguments from the callback data instead of the regular tx input.
-#[derive(Clone, Default)]
-pub struct CallbackArgApiWrapper<A: VMApi> {
-    _phantom: PhantomData<A>,
-}
-
-impl<A: VMApi> CallbackArgApiWrapper<A> {
-    pub fn new() -> Self {
-        CallbackArgApiWrapper {
-            _phantom: PhantomData,
-        }
-    }
-}
-
-impl<A> HandleTypeInfo for CallbackArgApiWrapper<A>
-where
-    A: VMApi,
-{
-    type ManagedBufferHandle = <A as HandleTypeInfo>::ManagedBufferHandle;
-
-    type BigIntHandle = <A as HandleTypeInfo>::BigIntHandle;
-
-    type BigFloatHandle = <A as HandleTypeInfo>::BigFloatHandle;
-
-    type EllipticCurveHandle = <A as HandleTypeInfo>::EllipticCurveHandle;
-
-    type ManagedMapHandle = <A as HandleTypeInfo>::ManagedMapHandle;
-}
-
-impl<A: VMApi> ErrorApi for CallbackArgApiWrapper<A> {
-    type ErrorApiImpl = A::ErrorApiImpl;
-
-    fn error_api_impl() -> Self::ErrorApiImpl {
-        A::error_api_impl()
-    }
-}
-
-impl<A: VMApi> StaticVarApi for CallbackArgApiWrapper<A> {
-    type StaticVarApiImpl = A::StaticVarApiImpl;
-
-    fn static_var_api_impl() -> Self::StaticVarApiImpl {
-        A::static_var_api_impl()
-    }
-}
-
-impl<A: VMApi> ManagedTypeApi for CallbackArgApiWrapper<A> {
-    type ManagedTypeApiImpl = A::ManagedTypeApiImpl;
-
-    fn managed_type_impl() -> Self::ManagedTypeApiImpl {
-        A::managed_type_impl()
-    }
-}
-
-impl<A: VMApi> EndpointArgumentApi for CallbackArgApiWrapper<A> {
-    type EndpointArgumentApiImpl = Self;
-
-    fn argument_api_impl() -> Self::EndpointArgumentApiImpl {
-        Self::new()
-    }
-}
-
-impl<A: VMApi> EndpointArgumentApiImpl for CallbackArgApiWrapper<A> {
-    fn endpoint_init(&self) {
-        A::argument_api_impl()
-            .load_callback_closure_buffer(use_raw_handle(const_handles::MBUF_TEMPORARY_1));
-        let cb_closure_args_serialized =
-            ManagedBuffer::<A>::from_raw_handle(const_handles::MBUF_TEMPORARY_1);
-        let mut cb_closure_args_buffer =
-            ManagedArgBuffer::<A>::from_raw_handle(const_handles::CALLBACK_CLOSURE_ARGS_BUFFER);
-        cb_closure_args_buffer.deserialize_overwrite(cb_closure_args_serialized);
-    }
-
-    fn get_num_arguments(&self) -> i32 {
-        ManagedArgBuffer::<Self>::from_raw_handle(const_handles::CALLBACK_CLOSURE_ARGS_BUFFER).len()
-            as i32
-    }
-
-    fn load_argument_managed_buffer(&self, arg_index: i32, dest: Self::ManagedBufferHandle) {
-        let cb_closure_args_buffer =
-            ManagedArgBuffer::<Self>::from_raw_handle(const_handles::CALLBACK_CLOSURE_ARGS_BUFFER);
-        let item_buffer = cb_closure_args_buffer.get(arg_index as usize);
-        A::managed_type_impl().mb_overwrite(dest.clone(), &[]);
-        A::managed_type_impl().mb_append(dest, item_buffer.get_handle());
-    }
-
-    fn load_callback_closure_buffer(&self, dest: Self::ManagedBufferHandle) {
-        A::argument_api_impl().load_callback_closure_buffer(dest);
-    }
-}
diff --git a/framework/base/src/io/arg_nested_tuple.rs b/framework/base/src/io/arg_nested_tuple.rs
index 1766e0ec78..c3838766e3 100644
--- a/framework/base/src/io/arg_nested_tuple.rs
+++ b/framework/base/src/io/arg_nested_tuple.rs
@@ -1,13 +1,13 @@
-use super::{EndpointDynArgLoader, EndpointSingleArgLoader};
+use super::{EndpointDynArgLoader, EndpointSingleArgLoader, ManagedResultArgLoader};
 use crate::{
     api::{
-        EndpointArgumentApi, EndpointArgumentApiImpl, ErrorApi, ErrorApiImpl, ManagedTypeApi,
-        StaticVarApiImpl, VMApi,
+        const_handles, use_raw_handle, EndpointArgumentApi, EndpointArgumentApiImpl, ErrorApi,
+        ErrorApiImpl, ManagedTypeApi, StaticVarApiImpl, VMApi,
     },
     codec::{DecodeError, TopDecodeMulti, TopDecodeMultiInput},
-    contract_base::CallbackArgApiWrapper,
     err_msg,
     io::{ArgErrorHandler, ArgId},
+    types::{ManagedArgBuffer, ManagedBuffer, ManagedType},
 };
 
 /// Argument count cannot change during execution, and it can get queried multiple times,
@@ -177,10 +177,10 @@ where
 pub fn load_callback_closure_args<AA, N>(arg_names: N::ArgNames) -> N
 where
     AA: VMApi,
-    N: ArgNestedTuple<CallbackArgApiWrapper<AA>>,
+    N: ArgNestedTuple<AA>,
 {
-    CallbackArgApiWrapper::<AA>::argument_api_impl().endpoint_init();
-    load_endpoint_args::<CallbackArgApiWrapper<AA>, N>(arg_names)
+    let loader = callback_closure_args_loader::<AA>();
+    N::next_multi_arg(loader, arg_names)
 }
 
 /// Currently used for the callback closure. No distinction there for single values.
@@ -194,3 +194,18 @@ where
     init_arguments_static_data::<AA>();
     N::next_multi_arg(loader, arg_names)
 }
+
+fn callback_closure_args_loader<AA>() -> ManagedResultArgLoader<AA>
+where
+    AA: VMApi,
+{
+    AA::argument_api_impl()
+        .load_callback_closure_buffer(use_raw_handle(const_handles::MBUF_TEMPORARY_1));
+    let cb_closure_args_serialized =
+        ManagedBuffer::<AA>::from_raw_handle(const_handles::MBUF_TEMPORARY_1);
+    let mut cb_closure_args_buffer =
+        ManagedArgBuffer::<AA>::from_raw_handle(const_handles::CALLBACK_CLOSURE_ARGS_BUFFER);
+    cb_closure_args_buffer.deserialize_overwrite(cb_closure_args_serialized);
+
+    ManagedResultArgLoader::new(cb_closure_args_buffer.into_vec_of_buffers())
+}

From 28641236c272d130746b10860fc6cf6a89972bf3 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 4 Jan 2024 10:53:30 +0200
Subject: [PATCH 0181/1254] fmt

---
 framework/base/src/storage/mappers.rs   | 2 +-
 vm/src/tx_mock/tx_back_transfers.rs     | 1 -
 vm/src/vm_hooks/vh_impl/vh_debug_api.rs | 3 ++-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/framework/base/src/storage/mappers.rs b/framework/base/src/storage/mappers.rs
index 5b39315922..5b220073b8 100644
--- a/framework/base/src/storage/mappers.rs
+++ b/framework/base/src/storage/mappers.rs
@@ -14,7 +14,7 @@ mod user_mapper;
 mod vec_mapper;
 mod whitelist_mapper;
 
-pub use address_to_id_mapper::{AddressToIdMapper, AddressId, NULL_ID};
+pub use address_to_id_mapper::{AddressId, AddressToIdMapper, NULL_ID};
 pub use bi_di_mapper::BiDiMapper;
 pub use linked_list_mapper::{LinkedListMapper, LinkedListNode};
 pub use map_mapper::MapMapper;
diff --git a/vm/src/tx_mock/tx_back_transfers.rs b/vm/src/tx_mock/tx_back_transfers.rs
index b6ed57600e..19a5ed2ca3 100644
--- a/vm/src/tx_mock/tx_back_transfers.rs
+++ b/vm/src/tx_mock/tx_back_transfers.rs
@@ -41,5 +41,4 @@ impl BackTransfers {
         self.call_value = bt.call_value;
         self.esdt_transfers = bt.esdt_transfers;
     }
-    
 }
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 004ab5cb82..6596842838 100644
--- a/vm/src/vm_hooks/vh_impl/vh_debug_api.rs
+++ b/vm/src/vm_hooks/vh_impl/vh_debug_api.rs
@@ -239,7 +239,8 @@ impl DebugApiVMHooksHandler {
 
         let contract_address = &self.0.input_ref().to;
         let builtin_functions = &self.0.vm_ref.builtin_functions;
-        self.back_transfers_lock().new_from_result(contract_address, &tx_result, builtin_functions);
+        self.back_transfers_lock()
+            .new_from_result(contract_address, &tx_result, builtin_functions);
 
         tx_result.result_values
     }

From 2447d3f0df26c6cc86cd6d027bff874d86d931d6 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Thu, 4 Jan 2024 15:44:55 +0200
Subject: [PATCH 0182/1254] removed hashbrown dependency

---
 Cargo.lock                                    | 43 -------------------
 framework/base/Cargo.toml                     |  1 -
 .../src/abi/type_description_container.rs     | 20 ++++++---
 3 files changed, 14 insertions(+), 50 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 125e16d31b..72fe0455c6 100755
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -71,18 +71,6 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
 
-[[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 = "aho-corasick"
 version = "1.1.2"
@@ -109,12 +97,6 @@ dependencies = [
  "multiversx-sc-meta",
 ]
 
-[[package]]
-name = "allocator-api2"
-version = "0.2.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5"
-
 [[package]]
 name = "anstream"
 version = "0.6.5"
@@ -1278,10 +1260,6 @@ name = "hashbrown"
 version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
-dependencies = [
- "ahash",
- "allocator-api2",
-]
 
 [[package]]
 name = "heck"
@@ -1862,7 +1840,6 @@ name = "multiversx-sc"
 version = "0.45.2"
 dependencies = [
  "bitflags 2.4.1",
- "hashbrown",
  "hex-literal",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
@@ -3686,26 +3663,6 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
-[[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",
-]
-
 [[package]]
 name = "zeroize"
 version = "1.7.0"
diff --git a/framework/base/Cargo.toml b/framework/base/Cargo.toml
index 3c3f001f69..667e81fdbe 100644
--- a/framework/base/Cargo.toml
+++ b/framework/base/Cargo.toml
@@ -25,7 +25,6 @@ back-transfers = []
 esdt-token-payment-legacy-decode = []
 
 [dependencies]
-hashbrown = "0.14.2"
 hex-literal = "0.4.1"
 bitflags = "2.4.1"
 num-traits = { version = "0.2", default-features = false }
diff --git a/framework/base/src/abi/type_description_container.rs b/framework/base/src/abi/type_description_container.rs
index 00a86e9578..7b9c0e892c 100644
--- a/framework/base/src/abi/type_description_container.rs
+++ b/framework/base/src/abi/type_description_container.rs
@@ -1,5 +1,5 @@
 use super::*;
-use hashbrown::HashMap;
+use multiversx_sc_codec::Vec;
 
 pub trait TypeDescriptionContainer {
     fn new() -> Self;
@@ -18,24 +18,32 @@ pub trait TypeDescriptionContainer {
 }
 
 #[derive(Clone, Default, Debug)]
-pub struct TypeDescriptionContainerImpl(pub HashMap<TypeName, TypeDescription>);
+pub struct TypeDescriptionContainerImpl(pub Vec<(TypeName, TypeDescription)>);
 
 impl TypeDescriptionContainer for TypeDescriptionContainerImpl {
     fn new() -> Self {
-        TypeDescriptionContainerImpl(HashMap::new())
+        TypeDescriptionContainerImpl(Vec::new())
     }
 
     fn contains_type(&self, type_name: &str) -> bool {
-        self.0.contains_key(type_name)
+        self.0
+            .iter()
+            .any(|(existing_type_name, _)| existing_type_name == type_name)
     }
 
     fn insert(&mut self, type_name: TypeName, type_description: TypeDescription) {
-        self.0.insert(type_name, type_description);
+        if let Some((_existing_type_name, exisiting_type_description)) =
+            self.0.iter_mut().find(|(name, _)| name == &type_name)
+        {
+            *exisiting_type_description = type_description;
+        } else {
+            self.0.push((type_name, type_description));
+        }
     }
 
     fn insert_all(&mut self, other: &Self) {
         for (key, value) in other.0.iter() {
-            self.0.insert(key.clone(), value.clone());
+            self.insert(key.clone(), value.clone());
         }
     }
 }

From c18f627b0a88f120c85b9550bf826a34383268bc Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 4 Jan 2024 17:22:33 +0200
Subject: [PATCH 0183/1254] cleanup

---
 framework/base/src/api/endpoint_arg_api.rs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/framework/base/src/api/endpoint_arg_api.rs b/framework/base/src/api/endpoint_arg_api.rs
index 7779d3106c..aa3201a07f 100644
--- a/framework/base/src/api/endpoint_arg_api.rs
+++ b/framework/base/src/api/endpoint_arg_api.rs
@@ -20,8 +20,6 @@ pub trait EndpointArgumentApi: HandleTypeInfo {
 /// Interface to only be used by code generated by the macros.
 /// The smart contract code doesn't have access to these methods directly.
 pub trait EndpointArgumentApiImpl: ErrorApi + ManagedTypeApi {
-    fn endpoint_init(&self) {}
-
     fn get_num_arguments(&self) -> i32;
 
     fn load_argument_managed_buffer(&self, arg_index: i32, dest: Self::ManagedBufferHandle);

From a8fc98e99aaf60c3b836e9ec8942196129fb5f08 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 5 Jan 2024 09:53:19 +0200
Subject: [PATCH 0184/1254] removed features: promises, managed-map,
 back-transfers

---
 contracts/feature-tests/composability/Cargo.toml       |  1 -
 .../composability/forwarder-queue/Cargo.toml           |  3 ---
 .../composability/forwarder-queue/sc-config.toml       |  1 -
 .../forwarder-queue/src/forwarder_queue.rs             |  1 -
 .../wasm-forwarder-queue-promises/Cargo.toml           |  1 -
 .../composability/promises-features/Cargo.toml         |  1 -
 contracts/feature-tests/composability/vault/Cargo.toml |  1 -
 .../feature-tests/managed-map-features/Cargo.toml      |  3 +--
 framework/base/Cargo.toml                              |  3 ---
 .../src/contract_base/wrappers/blockchain_wrapper.rs   | 10 +++++-----
 .../base/src/types/interaction/contract_call_exec.rs   |  1 -
 .../base/src/types/interaction/contract_call_trait.rs  |  2 --
 framework/base/src/types/managed/basic/mod.rs          |  5 +----
 framework/meta/Cargo.toml                              |  2 +-
 14 files changed, 8 insertions(+), 27 deletions(-)

diff --git a/contracts/feature-tests/composability/Cargo.toml b/contracts/feature-tests/composability/Cargo.toml
index 69b3096d30..94ad2e73e7 100644
--- a/contracts/feature-tests/composability/Cargo.toml
+++ b/contracts/feature-tests/composability/Cargo.toml
@@ -35,7 +35,6 @@ path = "vault"
 [dependencies.multiversx-sc]
 version = "0.45.2"
 path = "../../../framework/base"
-features = ["promises", "back-transfers"]
 
 [dev-dependencies.multiversx-sc-scenario]
 version = "0.45.2"
diff --git a/contracts/feature-tests/composability/forwarder-queue/Cargo.toml b/contracts/feature-tests/composability/forwarder-queue/Cargo.toml
index d740647caf..54b0f7964d 100644
--- a/contracts/feature-tests/composability/forwarder-queue/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-queue/Cargo.toml
@@ -8,9 +8,6 @@ publish = false
 [lib]
 path = "src/forwarder_queue.rs"
 
-[features]
-promises = ["multiversx-sc/promises"]
-
 [dependencies.vault]
 path = "../vault"
 
diff --git a/contracts/feature-tests/composability/forwarder-queue/sc-config.toml b/contracts/feature-tests/composability/forwarder-queue/sc-config.toml
index 19bc470c67..7ace04ba7c 100644
--- a/contracts/feature-tests/composability/forwarder-queue/sc-config.toml
+++ b/contracts/feature-tests/composability/forwarder-queue/sc-config.toml
@@ -7,5 +7,4 @@ name = "forwarder-queue"
 [contracts.promises]
 name = "forwarder-queue-promises"
 add-labels = ["promises-callback"]
-features = ["promises"]
 ei = "1.3"
diff --git a/contracts/feature-tests/composability/forwarder-queue/src/forwarder_queue.rs b/contracts/feature-tests/composability/forwarder-queue/src/forwarder_queue.rs
index 1ef735ad6a..66595bc54f 100644
--- a/contracts/feature-tests/composability/forwarder-queue/src/forwarder_queue.rs
+++ b/contracts/feature-tests/composability/forwarder-queue/src/forwarder_queue.rs
@@ -191,7 +191,6 @@ pub trait ForwarderQueue {
                         .transfer_execute();
                 },
                 QueuedCallType::Promise => {
-                    #[cfg(feature = "promises")]
                     contract_call
                         .with_gas_limit(call.gas_limit)
                         .with_raw_arguments(call.args)
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 0033ab4698..da376b12a6 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
@@ -23,7 +23,6 @@ overflow-checks = false
 
 [dependencies.forwarder-queue]
 path = ".."
-features = ["promises"]
 
 [dependencies.multiversx-sc-wasm-adapter]
 version = "0.45.2"
diff --git a/contracts/feature-tests/composability/promises-features/Cargo.toml b/contracts/feature-tests/composability/promises-features/Cargo.toml
index e33304a3f9..d1a9bb9285 100644
--- a/contracts/feature-tests/composability/promises-features/Cargo.toml
+++ b/contracts/feature-tests/composability/promises-features/Cargo.toml
@@ -14,5 +14,4 @@ path = "../vault"
 [dependencies.multiversx-sc]
 version = "0.45.2"
 path = "../../../../framework/base"
-features = ["promises", "back-transfers"]
 
diff --git a/contracts/feature-tests/composability/vault/Cargo.toml b/contracts/feature-tests/composability/vault/Cargo.toml
index 277bc56f48..4ecc06d31b 100644
--- a/contracts/feature-tests/composability/vault/Cargo.toml
+++ b/contracts/feature-tests/composability/vault/Cargo.toml
@@ -12,7 +12,6 @@ path = "src/vault.rs"
 [dependencies.multiversx-sc]
 version = "0.45.2"
 path = "../../../../framework/base"
-features = ["promises"]
 
 [dev-dependencies.multiversx-sc-scenario]
 version = "0.45.2"
diff --git a/contracts/feature-tests/managed-map-features/Cargo.toml b/contracts/feature-tests/managed-map-features/Cargo.toml
index 301e99d23e..2695d52f44 100644
--- a/contracts/feature-tests/managed-map-features/Cargo.toml
+++ b/contracts/feature-tests/managed-map-features/Cargo.toml
@@ -7,12 +7,11 @@ publish = false
 
 [lib]
 path = "src/mmap_features.rs"
+
 [dependencies.multiversx-sc]
 version = "0.45.2"
 path = "../../../framework/base"
 
-features = ["managed-map"]
-
 [dev-dependencies.multiversx-sc-scenario]
 version = "0.45.2"
 path = "../../../framework/scenario"
diff --git a/framework/base/Cargo.toml b/framework/base/Cargo.toml
index 667e81fdbe..379f256c65 100644
--- a/framework/base/Cargo.toml
+++ b/framework/base/Cargo.toml
@@ -19,9 +19,6 @@ all-features = true
 [features]
 num-bigint = ["multiversx-sc-codec/num-bigint"]
 alloc = ["multiversx-sc-codec/alloc"]
-promises = []
-managed-map = []
-back-transfers = []
 esdt-token-payment-legacy-decode = []
 
 [dependencies]
diff --git a/framework/base/src/contract_base/wrappers/blockchain_wrapper.rs b/framework/base/src/contract_base/wrappers/blockchain_wrapper.rs
index ec80ca9cc1..f39f803b06 100644
--- a/framework/base/src/contract_base/wrappers/blockchain_wrapper.rs
+++ b/framework/base/src/contract_base/wrappers/blockchain_wrapper.rs
@@ -10,8 +10,9 @@ use crate::{
     err_msg::{ONLY_OWNER_CALLER, ONLY_USER_ACCOUNT_CALLER},
     storage::{self},
     types::{
-        BigUint, EgldOrEsdtTokenIdentifier, EsdtLocalRoleFlags, EsdtTokenData, EsdtTokenType,
-        ManagedAddress, ManagedBuffer, ManagedByteArray, ManagedType, ManagedVec, TokenIdentifier,
+        BackTransfers, BigUint, EgldOrEsdtTokenIdentifier, EsdtLocalRoleFlags, EsdtTokenData,
+        EsdtTokenType, ManagedAddress, ManagedBuffer, ManagedByteArray, ManagedType, ManagedVec,
+        TokenIdentifier,
     },
 };
 
@@ -347,8 +348,7 @@ where
     /// Works after:
     /// - synchronous calls
     /// - asynchronous calls too, in callbacks.
-    #[cfg(feature = "back-transfers")]
-    pub fn get_back_transfers(&self) -> crate::types::BackTransfers<A> {
+    pub fn get_back_transfers(&self) -> BackTransfers<A> {
         let esdt_transfer_value_handle: A::BigIntHandle =
             use_raw_handle(A::static_var_api_impl().next_handle());
         let call_value_handle: A::BigIntHandle =
@@ -359,7 +359,7 @@ where
             call_value_handle.get_raw_handle(),
         );
 
-        crate::types::BackTransfers {
+        BackTransfers {
             total_egld_amount: BigUint::from_raw_handle(call_value_handle.get_raw_handle()),
             esdt_payments: ManagedVec::from_raw_handle(esdt_transfer_value_handle.get_raw_handle()),
         }
diff --git a/framework/base/src/types/interaction/contract_call_exec.rs b/framework/base/src/types/interaction/contract_call_exec.rs
index f374d1801b..260897e1a6 100644
--- a/framework/base/src/types/interaction/contract_call_exec.rs
+++ b/framework/base/src/types/interaction/contract_call_exec.rs
@@ -74,7 +74,6 @@ where
         }
     }
 
-    #[cfg(feature = "promises")]
     pub(super) fn async_call_promise(self) -> super::AsyncCallPromises<SA> {
         super::AsyncCallPromises {
             to: self.basic.to,
diff --git a/framework/base/src/types/interaction/contract_call_trait.rs b/framework/base/src/types/interaction/contract_call_trait.rs
index cc84493962..073dae603d 100644
--- a/framework/base/src/types/interaction/contract_call_trait.rs
+++ b/framework/base/src/types/interaction/contract_call_trait.rs
@@ -80,7 +80,6 @@ where
 
     /// Converts to an async promise.
     #[inline]
-    #[cfg(feature = "promises")]
     fn async_call_promise(self) -> super::AsyncCallPromises<SA> {
         self.into_normalized().async_call_promise()
     }
@@ -98,7 +97,6 @@ where
     /// Executes immediately, synchronously, and returns contract call result.
     /// Only works if the target contract is in the same shard.
     #[inline]
-    #[cfg(feature = "back-transfers")]
     fn execute_on_dest_context_with_back_transfers<RequestedResult>(
         self,
     ) -> (RequestedResult, super::BackTransfers<SA>)
diff --git a/framework/base/src/types/managed/basic/mod.rs b/framework/base/src/types/managed/basic/mod.rs
index 71b45b0478..124fd1df55 100644
--- a/framework/base/src/types/managed/basic/mod.rs
+++ b/framework/base/src/types/managed/basic/mod.rs
@@ -12,6 +12,7 @@ mod big_uint_operators;
 mod cast_to_i64;
 mod elliptic_curve;
 mod managed_buffer;
+mod managed_map;
 
 pub use big_float::BigFloat;
 pub use big_int::BigInt;
@@ -19,8 +20,4 @@ pub use big_int_sign::Sign;
 pub use big_uint::BigUint;
 pub use elliptic_curve::{EllipticCurve, EllipticCurveComponents};
 pub use managed_buffer::ManagedBuffer;
-
-#[cfg(feature = "managed-map")]
-mod managed_map;
-#[cfg(feature = "managed-map")]
 pub use managed_map::ManagedMap;
diff --git a/framework/meta/Cargo.toml b/framework/meta/Cargo.toml
index 7a832566d9..90cdfe4032 100644
--- a/framework/meta/Cargo.toml
+++ b/framework/meta/Cargo.toml
@@ -53,7 +53,7 @@ common-path = { version = "1.0.0", optional = true }
 [dependencies.multiversx-sc]
 version = "=0.45.2"
 path = "../base"
-features = ["alloc", "num-bigint", "promises"]
+features = ["alloc", "num-bigint"]
 
 [dev-dependencies]
 multiversx-sc-meta = { path = ".", features = ["standalone"] }

From 373447191d5bb241b5f447add31125c55f2d73c6 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 5 Jan 2024 10:31:23 +0200
Subject: [PATCH 0185/1254] ei version default 1.3

---
 framework/meta/src/ei/ei_version.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/framework/meta/src/ei/ei_version.rs b/framework/meta/src/ei/ei_version.rs
index 513fb71a66..edcc2eeed7 100644
--- a/framework/meta/src/ei/ei_version.rs
+++ b/framework/meta/src/ei/ei_version.rs
@@ -21,12 +21,12 @@ pub enum EIVersion {
     /// - more managed crypto hooks
     /// - big floats
     /// - some managed ESDT properties.
-    #[default]
     V1_2,
 
-    /// VM Hooks version planned to be released with VM 1.5 in Q2 2023.
+    /// Latest VM Hooks version, released with VM 1.5 in January 2024.
     ///
     /// It adds the new async call functionality (promises).
+    #[default]
     V1_3,
 }
 

From b6773560e13965deb799367fe1cd5defabea7beb Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 5 Jan 2024 10:31:38 +0200
Subject: [PATCH 0186/1254] sc-config.toml strict parsing

---
 .../multi-contract-features/multicontract.toml            | 8 ++++++++
 .../src/cmd/contract/sc_config/multi_contract_serde.rs    | 4 ++++
 .../contract/sc_config/oc_settings/oc_parse_stack_size.rs | 3 +++
 3 files changed, 15 insertions(+)

diff --git a/contracts/feature-tests/multi-contract-features/multicontract.toml b/contracts/feature-tests/multi-contract-features/multicontract.toml
index 879c8dfb42..b6c3c8efb1 100644
--- a/contracts/feature-tests/multi-contract-features/multicontract.toml
+++ b/contracts/feature-tests/multi-contract-features/multicontract.toml
@@ -7,6 +7,14 @@ main = "multi-contract-main"
 # main contract can have any id and any name
 name = "multi-contract-features"
 
+# all default values below:
+external-view = false
+panic-message = false
+ei = "1.3"
+allocator = "fail"
+stack-size = "64k"
+features = []
+
 [contracts.multi-contract-main.profile]
 # these are just the defaults, checking that parsing works fine
 codegen-units = 1  
diff --git a/framework/meta/src/cmd/contract/sc_config/multi_contract_serde.rs b/framework/meta/src/cmd/contract/sc_config/multi_contract_serde.rs
index 04fd5e14d4..b118804791 100644
--- a/framework/meta/src/cmd/contract/sc_config/multi_contract_serde.rs
+++ b/framework/meta/src/cmd/contract/sc_config/multi_contract_serde.rs
@@ -2,6 +2,7 @@ use serde::Deserialize;
 use std::collections::HashMap;
 
 #[derive(Deserialize, Debug)]
+#[serde(deny_unknown_fields)]
 pub struct MultiContractConfigSerde {
     #[serde(default)]
     pub settings: MultiContractGeneralSettingsSerde,
@@ -13,6 +14,7 @@ pub struct MultiContractConfigSerde {
 }
 
 #[derive(Deserialize, Debug)]
+#[serde(deny_unknown_fields)]
 pub struct ContractVariantSerde {
     pub name: Option<String>,
 
@@ -57,11 +59,13 @@ pub struct ContractVariantSerde {
 }
 
 #[derive(Deserialize, Default, Debug)]
+#[serde(deny_unknown_fields)]
 pub struct MultiContractGeneralSettingsSerde {
     pub main: Option<String>,
 }
 
 #[derive(Deserialize, Default, Debug, Clone, PartialEq, Eq)]
+#[serde(deny_unknown_fields)]
 pub struct ContractVariantProfileSerde {
     #[serde(default)]
     #[serde(rename = "codegen-units")]
diff --git a/framework/meta/src/cmd/contract/sc_config/oc_settings/oc_parse_stack_size.rs b/framework/meta/src/cmd/contract/sc_config/oc_settings/oc_parse_stack_size.rs
index 6e0ddb3fd7..0ad4eda7af 100644
--- a/framework/meta/src/cmd/contract/sc_config/oc_settings/oc_parse_stack_size.rs
+++ b/framework/meta/src/cmd/contract/sc_config/oc_settings/oc_parse_stack_size.rs
@@ -44,5 +44,8 @@ mod tests {
         assert_eq!(parse_stack_size_expr("1 pages"), 65536);
         assert_eq!(parse_stack_size_expr("2 pages"), 65536 * 2);
         assert_eq!(parse_stack_size_expr("10 pages"), 65536 * 10);
+
+        assert_eq!(parse_stack_size_expr("128k"), DEFAULT_STACK_SIZE);
+        assert_eq!(parse_stack_size_expr("2 pages"), DEFAULT_STACK_SIZE);
     }
 }

From a22f6a15cddb390f707b28137b95189ca5507bcf Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 5 Jan 2024 10:44:50 +0200
Subject: [PATCH 0187/1254] code reorg in meta crate

---
 framework/meta/src/cmd/contract/sc_config.rs  | 24 +++++++++----------
 .../{oc_config.rs => contract_variant.rs}     |  0
 ...builder.rs => contract_variant_builder.rs} | 12 ++++++----
 ...ttings.rs => contract_variant_settings.rs} | 10 ++++----
 .../contract_allocator.rs}                    |  7 ++++++
 .../stack_size.rs}                            |  0
 ...lidate.rs => contract_variant_validate.rs} |  0
 .../sc_config/oc_settings/oc_parse.rs         | 24 -------------------
 ...oc_global_config.rs => sc_config_model.rs} |  2 +-
 ...i_contract_serde.rs => sc_config_serde.rs} |  2 +-
 framework/meta/src/ei.rs                      |  2 +-
 framework/meta/src/ei/ei_version.rs           | 15 ++++++++++++
 framework/meta/tests/multi_contract_test.rs   |  4 ++--
 13 files changed, 50 insertions(+), 52 deletions(-)
 rename framework/meta/src/cmd/contract/sc_config/{oc_config.rs => contract_variant.rs} (100%)
 rename framework/meta/src/cmd/contract/sc_config/{oc_builder.rs => contract_variant_builder.rs} (97%)
 rename framework/meta/src/cmd/contract/sc_config/{oc_settings.rs => contract_variant_settings.rs} (95%)
 rename framework/meta/src/cmd/contract/sc_config/{oc_settings/oc_allocator.rs => contract_variant_settings/contract_allocator.rs} (89%)
 rename framework/meta/src/cmd/contract/sc_config/{oc_settings/oc_parse_stack_size.rs => contract_variant_settings/stack_size.rs} (100%)
 rename framework/meta/src/cmd/contract/sc_config/{oc_validate.rs => contract_variant_validate.rs} (100%)
 delete mode 100644 framework/meta/src/cmd/contract/sc_config/oc_settings/oc_parse.rs
 rename framework/meta/src/cmd/contract/sc_config/{oc_global_config.rs => sc_config_model.rs} (97%)
 rename framework/meta/src/cmd/contract/sc_config/{multi_contract_serde.rs => sc_config_serde.rs} (98%)

diff --git a/framework/meta/src/cmd/contract/sc_config.rs b/framework/meta/src/cmd/contract/sc_config.rs
index 3aaabba27d..16ac60826e 100644
--- a/framework/meta/src/cmd/contract/sc_config.rs
+++ b/framework/meta/src/cmd/contract/sc_config.rs
@@ -1,18 +1,18 @@
-mod multi_contract_serde;
-mod oc_builder;
-mod oc_config;
-mod oc_global_config;
-mod oc_settings;
-mod oc_validate;
+mod contract_variant;
+mod contract_variant_builder;
+mod contract_variant_settings;
+mod contract_variant_validate;
+mod sc_config_model;
+mod sc_config_serde;
 mod wasm_build;
 mod wasm_clean;
 mod wasm_crate_gen;
 mod wasm_update;
 
-pub use multi_contract_serde::{
-    ContractVariantProfileSerde, ContractVariantSerde, MultiContractConfigSerde,
-    MultiContractGeneralSettingsSerde,
+pub use contract_variant::ContractVariant;
+pub use contract_variant_settings::{ContractVariantProfile, ContractVariantSettings};
+pub use sc_config_model::ScConfig;
+pub use sc_config_serde::{
+    ContractVariantProfileSerde, ContractVariantSerde, MultiContractGeneralSettingsSerde,
+    ScConfigSerde,
 };
-pub use oc_config::ContractVariant;
-pub use oc_global_config::ScConfig;
-pub use oc_settings::{ContractVariantProfile, ContractVariantSettings};
diff --git a/framework/meta/src/cmd/contract/sc_config/oc_config.rs b/framework/meta/src/cmd/contract/sc_config/contract_variant.rs
similarity index 100%
rename from framework/meta/src/cmd/contract/sc_config/oc_config.rs
rename to framework/meta/src/cmd/contract/sc_config/contract_variant.rs
diff --git a/framework/meta/src/cmd/contract/sc_config/oc_builder.rs b/framework/meta/src/cmd/contract/sc_config/contract_variant_builder.rs
similarity index 97%
rename from framework/meta/src/cmd/contract/sc_config/oc_builder.rs
rename to framework/meta/src/cmd/contract/sc_config/contract_variant_builder.rs
index 30ada842d1..d447ab4a0a 100644
--- a/framework/meta/src/cmd/contract/sc_config/oc_builder.rs
+++ b/framework/meta/src/cmd/contract/sc_config/contract_variant_builder.rs
@@ -5,11 +5,13 @@ use std::{
     path::{Path, PathBuf},
 };
 
+use crate::ei::parse_check_ei;
+
 use super::{
-    oc_global_config::SC_CONFIG_FILE_NAMES,
-    oc_settings::{parse_allocator, parse_check_ei, parse_stack_size},
+    contract_variant_settings::{parse_allocator, parse_stack_size},
+    sc_config_model::SC_CONFIG_FILE_NAMES,
     ContractVariant, ContractVariantProfile, ContractVariantSerde, ContractVariantSettings,
-    MultiContractConfigSerde, ScConfig,
+    ScConfig, ScConfigSerde,
 };
 
 /// Temporary structure, to help create instances of `ContractVariant`. Not publicly exposed.
@@ -252,7 +254,7 @@ impl ScConfig {
     /// Assembles an `ContractVariantConfig` from a raw config object that was loaded via Serde.
     ///
     /// In most cases the config will be loaded from a .toml file, use `load_from_file` for that.
-    pub fn load_from_config(config: &MultiContractConfigSerde, original_abi: &ContractAbi) -> Self {
+    pub fn load_from_config(config: &ScConfigSerde, original_abi: &ContractAbi) -> Self {
         let mut contract_builders: HashMap<String, ContractVariantBuilder> = config
             .contracts
             .iter()
@@ -297,7 +299,7 @@ impl ScConfig {
     pub fn load_from_file<P: AsRef<Path>>(path: P, original_abi: &ContractAbi) -> Option<Self> {
         match fs::read_to_string(path.as_ref()) {
             Ok(s) => {
-                let config_serde: MultiContractConfigSerde = toml::from_str(s.as_str())
+                let config_serde: ScConfigSerde = toml::from_str(s.as_str())
                     .unwrap_or_else(|error| panic!("error parsing multicontract.toml: {error}"));
                 Some(Self::load_from_config(&config_serde, original_abi))
             },
diff --git a/framework/meta/src/cmd/contract/sc_config/oc_settings.rs b/framework/meta/src/cmd/contract/sc_config/contract_variant_settings.rs
similarity index 95%
rename from framework/meta/src/cmd/contract/sc_config/oc_settings.rs
rename to framework/meta/src/cmd/contract/sc_config/contract_variant_settings.rs
index 48aee04399..a6a40a4142 100644
--- a/framework/meta/src/cmd/contract/sc_config/oc_settings.rs
+++ b/framework/meta/src/cmd/contract/sc_config/contract_variant_settings.rs
@@ -1,10 +1,8 @@
-mod oc_allocator;
-mod oc_parse;
-mod oc_parse_stack_size;
+mod contract_allocator;
+mod stack_size;
 
-pub use oc_allocator::ContractAllocator;
-pub use oc_parse::*;
-pub use oc_parse_stack_size::*;
+pub use contract_allocator::{parse_allocator, ContractAllocator};
+pub use stack_size::*;
 
 use crate::ei::EIVersion;
 
diff --git a/framework/meta/src/cmd/contract/sc_config/oc_settings/oc_allocator.rs b/framework/meta/src/cmd/contract/sc_config/contract_variant_settings/contract_allocator.rs
similarity index 89%
rename from framework/meta/src/cmd/contract/sc_config/oc_settings/oc_allocator.rs
rename to framework/meta/src/cmd/contract/sc_config/contract_variant_settings/contract_allocator.rs
index 14441dca02..6a5cc68c75 100644
--- a/framework/meta/src/cmd/contract/sc_config/oc_settings/oc_allocator.rs
+++ b/framework/meta/src/cmd/contract/sc_config/contract_variant_settings/contract_allocator.rs
@@ -44,3 +44,10 @@ impl ContractAllocator {
         }
     }
 }
+
+pub fn parse_allocator(allocator: &Option<String>) -> ContractAllocator {
+    allocator
+        .as_ref()
+        .map(|s| ContractAllocator::parse_or_panic(s))
+        .unwrap_or_default()
+}
diff --git a/framework/meta/src/cmd/contract/sc_config/oc_settings/oc_parse_stack_size.rs b/framework/meta/src/cmd/contract/sc_config/contract_variant_settings/stack_size.rs
similarity index 100%
rename from framework/meta/src/cmd/contract/sc_config/oc_settings/oc_parse_stack_size.rs
rename to framework/meta/src/cmd/contract/sc_config/contract_variant_settings/stack_size.rs
diff --git a/framework/meta/src/cmd/contract/sc_config/oc_validate.rs b/framework/meta/src/cmd/contract/sc_config/contract_variant_validate.rs
similarity index 100%
rename from framework/meta/src/cmd/contract/sc_config/oc_validate.rs
rename to framework/meta/src/cmd/contract/sc_config/contract_variant_validate.rs
diff --git a/framework/meta/src/cmd/contract/sc_config/oc_settings/oc_parse.rs b/framework/meta/src/cmd/contract/sc_config/oc_settings/oc_parse.rs
deleted file mode 100644
index b3fb5ef27d..0000000000
--- a/framework/meta/src/cmd/contract/sc_config/oc_settings/oc_parse.rs
+++ /dev/null
@@ -1,24 +0,0 @@
-use crate::ei::EIVersion;
-
-use super::ContractAllocator;
-
-pub fn parse_check_ei(ei: &Option<String>) -> Option<EIVersion> {
-    if let Some(ei_name) = ei {
-        if ei_name == "ignore" {
-            None
-        } else {
-            let ei_version = EIVersion::from_name(ei_name)
-                .unwrap_or_else(|| panic!("invalid EI version: {ei_name}"));
-            Some(ei_version)
-        }
-    } else {
-        Some(EIVersion::default())
-    }
-}
-
-pub fn parse_allocator(allocator: &Option<String>) -> ContractAllocator {
-    allocator
-        .as_ref()
-        .map(|s| ContractAllocator::parse_or_panic(s))
-        .unwrap_or_default()
-}
diff --git a/framework/meta/src/cmd/contract/sc_config/oc_global_config.rs b/framework/meta/src/cmd/contract/sc_config/sc_config_model.rs
similarity index 97%
rename from framework/meta/src/cmd/contract/sc_config/oc_global_config.rs
rename to framework/meta/src/cmd/contract/sc_config/sc_config_model.rs
index 1bfb2ffa71..7f9ddbf5a9 100644
--- a/framework/meta/src/cmd/contract/sc_config/oc_global_config.rs
+++ b/framework/meta/src/cmd/contract/sc_config/sc_config_model.rs
@@ -1,4 +1,4 @@
-use super::{oc_validate::validate_contract_variant, ContractVariant};
+use super::{contract_variant_validate::validate_contract_variant, ContractVariant};
 
 /// Allowed file names for the SC config.
 ///
diff --git a/framework/meta/src/cmd/contract/sc_config/multi_contract_serde.rs b/framework/meta/src/cmd/contract/sc_config/sc_config_serde.rs
similarity index 98%
rename from framework/meta/src/cmd/contract/sc_config/multi_contract_serde.rs
rename to framework/meta/src/cmd/contract/sc_config/sc_config_serde.rs
index b118804791..4813fcfb09 100644
--- a/framework/meta/src/cmd/contract/sc_config/multi_contract_serde.rs
+++ b/framework/meta/src/cmd/contract/sc_config/sc_config_serde.rs
@@ -3,7 +3,7 @@ use std::collections::HashMap;
 
 #[derive(Deserialize, Debug)]
 #[serde(deny_unknown_fields)]
-pub struct MultiContractConfigSerde {
+pub struct ScConfigSerde {
     #[serde(default)]
     pub settings: MultiContractGeneralSettingsSerde,
     #[serde(default)]
diff --git a/framework/meta/src/ei.rs b/framework/meta/src/ei.rs
index 8198d69c87..77b84b2aba 100644
--- a/framework/meta/src/ei.rs
+++ b/framework/meta/src/ei.rs
@@ -8,4 +8,4 @@ pub use ei_1_0::EI_1_0_NAMES;
 pub use ei_1_1::EI_1_1_NAMES;
 pub use ei_1_2::EI_1_2_NAMES;
 pub use ei_1_3::EI_1_3_NAMES;
-pub use ei_version::EIVersion;
+pub use ei_version::{parse_check_ei, EIVersion};
diff --git a/framework/meta/src/ei/ei_version.rs b/framework/meta/src/ei/ei_version.rs
index edcc2eeed7..e1b9f345e7 100644
--- a/framework/meta/src/ei/ei_version.rs
+++ b/framework/meta/src/ei/ei_version.rs
@@ -63,3 +63,18 @@ impl EIVersion {
         self.vm_hook_names().contains(&vm_hook_names)
     }
 }
+
+/// Parses an EIVersion, or returns None, if "ignore" was specifically stated.
+pub fn parse_check_ei(ei: &Option<String>) -> Option<EIVersion> {
+    if let Some(ei_name) = ei {
+        if ei_name == "ignore" {
+            None
+        } else {
+            let ei_version = EIVersion::from_name(ei_name)
+                .unwrap_or_else(|| panic!("invalid EI version: {ei_name}"));
+            Some(ei_version)
+        }
+    } else {
+        Some(EIVersion::default())
+    }
+}
diff --git a/framework/meta/tests/multi_contract_test.rs b/framework/meta/tests/multi_contract_test.rs
index 7a7959fd21..a9896eb72c 100644
--- a/framework/meta/tests/multi_contract_test.rs
+++ b/framework/meta/tests/multi_contract_test.rs
@@ -1,7 +1,7 @@
 use multiversx_sc::abi::{ContractAbi, EndpointAbi};
-use multiversx_sc_meta::cmd::contract::sc_config::{MultiContractConfigSerde, ScConfig};
+use multiversx_sc_meta::cmd::contract::sc_config::{ScConfig, ScConfigSerde};
 
-fn get_serialized_toml() -> MultiContractConfigSerde {
+fn get_serialized_toml() -> ScConfigSerde {
     toml::from_str(
         r#"
         [settings]

From 2fefeb4d41feea53195268b493db4dee792868dd Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 5 Jan 2024 12:19:43 +0200
Subject: [PATCH 0188/1254] 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<proc_macro::TokenTree> = format_tokenize::tokenize(input);
 
-    let collected_tokens: Vec<proc_macro::TokenStream> = 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 0d4788eafedf2e3c5c9bad2abcb6753323ec38b2 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Fri, 5 Jan 2024 16:26:38 +0200
Subject: [PATCH 0189/1254] Sorted import names alphabetically

---
 framework/meta/src/tools/wasm_imports.rs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/framework/meta/src/tools/wasm_imports.rs b/framework/meta/src/tools/wasm_imports.rs
index 64d8d68b8f..7aaa7904bd 100644
--- a/framework/meta/src/tools/wasm_imports.rs
+++ b/framework/meta/src/tools/wasm_imports.rs
@@ -21,5 +21,7 @@ fn parse_wasm_imports(wasm_data: Vec<u8>) -> Result<Vec<String>, BinaryReaderErr
         }
     }
 
+    import_names.sort();
+
     Ok(import_names)
 }

From 0083e55c8c6cdfc90df4ba5df5c96feebfddb4fa Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 5 Jan 2024 17:29:45 +0200
Subject: [PATCH 0190/1254] sc 0.46.0

---
 CHANGELOG.md                                  |   6 +
 Cargo.lock                                    | 182 +++++++++---------
 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 +-
 framework/base/Cargo.toml                     |   4 +-
 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 +-
 .../standalone/upgrade/upgrade_selector.rs    |   3 +-
 framework/meta/src/version_history.rs         |   3 +-
 framework/scenario/Cargo.toml                 |   6 +-
 framework/snippets/Cargo.toml                 |   4 +-
 framework/wasm-adapter/Cargo.toml             |   4 +-
 tools/mxpy-snippet-generator/Cargo.toml       |   2 +-
 tools/rust-debugger/format-tests/Cargo.toml   |   4 +-
 261 files changed, 465 insertions(+), 467 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 432c8a39ee..61ada9879f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,6 +26,12 @@ 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.46.0] - 2024-01-05
+- Promises callback memory allocator bugfix.
+- Removed features: `promises`, `managed-map`, `back-transfers`.
+- Removed `hashbrown` dependency from framework.
+- Imports in output now sorted.
+
 ## [sc 0.45.2, codec 0.18.3, vm 0.7.1, scenario-format 0.21.1, sdk 0.3.1] - 2023-12-18
 - Updated framework dependencies to the latest versions: syn, bitflags, wasmparser, base64, sha2, sha3, itertools, hmac, pem, pbkdf2, etc.
 - `sc-meta` improvements:
diff --git a/Cargo.lock b/Cargo.lock
index 72fe0455c6..15373715ca 100755
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -147,9 +147,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.75"
+version = "1.0.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6"
+checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca"
 
 [[package]]
 name = "arrayvec"
@@ -309,9 +309,9 @@ dependencies = [
 
 [[package]]
 name = "bstr"
-version = "1.8.0"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "542f33a8835a0884b006a0c3df3dadd99c0c3f296ed26c2fdc8028e01ad6230c"
+checksum = "c48f0051a4b4c5e0b6d365cd04af53aeaa209e3cc15ec2cdb69e73cc87fbd0dc"
 dependencies = [
  "memchr",
  "serde",
@@ -403,9 +403,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.4.11"
+version = "4.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfaff671f6b22ca62406885ece523383b9b64022e341e53e009a62ebc47a45f2"
+checksum = "52bdc885e4cacc7f7c9eedc1ef6da641603180c783c41a15c264944deeaab642"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -413,9 +413,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.4.11"
+version = "4.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a216b506622bb1d316cd51328dce24e07bdff4a6128a47c7e7fad11878d5adbb"
+checksum = "fb7fb5e4e979aec3be7791562fcba452f94ad85e954da024396433e0e25a79e9"
 dependencies = [
  "anstream",
  "anstyle",
@@ -522,9 +522,9 @@ checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
 
 [[package]]
 name = "cpufeatures"
-version = "0.2.11"
+version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0"
+checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504"
 dependencies = [
  "libc",
 ]
@@ -551,21 +551,20 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-epoch"
-version = "0.9.16"
+version = "0.9.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d2fe95351b870527a5d09bf563ed3c97c0cffb87cf1c78a591bf48bb218d9aa"
+checksum = "0e3681d554572a651dda4186cd47240627c3d0114d45a95f6ad27f2f22e7548d"
 dependencies = [
  "autocfg",
  "cfg-if",
  "crossbeam-utils",
- "memoffset",
 ]
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.8.17"
+version = "0.8.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c06d96137f14f244c37f989d9fff8f95e6c18b918e71f36638f8c49112e4c78f"
+checksum = "c3a430a770ebd84726f584a90ee7f020d28db52c6d02138900f22341f866d39c"
 dependencies = [
  "cfg-if",
 ]
@@ -1107,9 +1106,9 @@ dependencies = [
 
 [[package]]
 name = "futures"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335"
+checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -1122,9 +1121,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb"
+checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -1132,15 +1131,15 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c"
+checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
 
 [[package]]
 name = "futures-executor"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc"
+checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -1149,15 +1148,15 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa"
+checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
 
 [[package]]
 name = "futures-macro"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb"
+checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1166,21 +1165,21 @@ dependencies = [
 
 [[package]]
 name = "futures-sink"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817"
+checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
 
 [[package]]
 name = "futures-task"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2"
+checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
 
 [[package]]
 name = "futures-util"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104"
+checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -1429,13 +1428,13 @@ checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3"
 
 [[package]]
 name = "is-terminal"
-version = "0.4.9"
+version = "0.4.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b"
+checksum = "0bad00257d07be169d870ab665980b06cdb366d792ad690bf2e76876dc503455"
 dependencies = [
  "hermit-abi",
  "rustix",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -1686,18 +1685,9 @@ dependencies = [
 
 [[package]]
 name = "memchr"
-version = "2.6.4"
+version = "2.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167"
-
-[[package]]
-name = "memoffset"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c"
-dependencies = [
- "autocfg",
-]
+checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149"
 
 [[package]]
 name = "mime"
@@ -1816,7 +1806,7 @@ checksum = "b59072fa0624b55ae5ae3fa6bfa91515bbeb4ac440214bc4a509e2c8806d6e9f"
 
 [[package]]
 name = "multiversx-price-aggregator-sc"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "arrayvec",
  "getrandom",
@@ -1837,7 +1827,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "bitflags 2.4.1",
  "hex-literal",
@@ -1867,7 +1857,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -1878,7 +1868,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-meta"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "clap",
  "colored",
@@ -1903,14 +1893,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-scenario"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "base64",
  "bech32",
@@ -1936,7 +1926,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-snippets"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "base64",
  "env_logger",
@@ -1950,7 +1940,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -1981,7 +1971,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-wegld-swap-sc"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "multiversx-sc",
  "multiversx-sc-modules",
@@ -2126,9 +2116,9 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.32.1"
+version = "0.32.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0"
+checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441"
 dependencies = [
  "memchr",
 ]
@@ -2141,9 +2131,9 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "openssl"
-version = "0.10.61"
+version = "0.10.62"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b8419dc8cc6d866deb801274bba2e6f8f6108c1bb7fcc10ee5ab864931dbb45"
+checksum = "8cde4d2d9200ad5909f8dac647e29482e07c3a35de8a13fce7c9c7747ad9f671"
 dependencies = [
  "bitflags 2.4.1",
  "cfg-if",
@@ -2173,9 +2163,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.97"
+version = "0.9.98"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3eaad34cdd97d81de97964fc7f29e2d104f483840d906ef56daa1912338460b"
+checksum = "c1665caf8ab2dc9aef43d1c0023bd904633a6a05cb30b0ad59bec2ae986e57a7"
 dependencies = [
  "cc",
  "libc",
@@ -2351,15 +2341,15 @@ dependencies = [
 
 [[package]]
 name = "pkg-config"
-version = "0.3.27"
+version = "0.3.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964"
+checksum = "69d3587f8a9e599cc7ec2c00e331f71c4e69a5f9a4b8a6efd5b07466b9736f9a"
 
 [[package]]
 name = "platforms"
-version = "3.2.0"
+version = "3.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14e6ab3f592e6fb464fc9712d8d6e6912de6473954635fd76a589d832cffcbb0"
+checksum = "626dec3cac7cc0e1577a2ec3fc496277ec2baa084bebad95bb6fdbfae235f84c"
 
 [[package]]
 name = "ppv-lite86"
@@ -2369,9 +2359,9 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.70"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
+checksum = "907a61bd0f64c2f29cd1cf1dc34d05176426a3f504a78010f08416ddb7b13708"
 dependencies = [
  "unicode-ident",
 ]
@@ -2461,9 +2451,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
@@ -2581,9 +2571,9 @@ checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
 
 [[package]]
 name = "reqwest"
-version = "0.11.22"
+version = "0.11.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b"
+checksum = "37b1ae8d9ac08420c66222fb9096fc5de435c3c48542bc5336c51892cffafb41"
 dependencies = [
  "base64",
  "bytes",
@@ -2732,11 +2722,11 @@ dependencies = [
 
 [[package]]
 name = "schannel"
-version = "0.1.22"
+version = "0.1.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88"
+checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534"
 dependencies = [
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -2804,9 +2794,9 @@ dependencies = [
 
 [[package]]
 name = "semver"
-version = "1.0.20"
+version = "1.0.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090"
+checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0"
 
 [[package]]
 name = "send-tx-repeat"
@@ -2826,18 +2816,18 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.193"
+version = "1.0.194"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89"
+checksum = "0b114498256798c94a0689e1a15fec6005dee8ac1f41de56404b67afc2a4b773"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.193"
+version = "1.0.194"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3"
+checksum = "a3385e45322e8f9931410f01b3031ec534c3947d0e94c18049af4d9f9907d4e0"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2846,9 +2836,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.108"
+version = "1.0.111"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b"
+checksum = "176e46fa42316f18edd598015a5166857fc835ec732f5215eac6b7bdbf0a84f4"
 dependencies = [
  "indexmap",
  "itoa",
@@ -2858,9 +2848,9 @@ dependencies = [
 
 [[package]]
 name = "serde_repr"
-version = "0.1.17"
+version = "0.1.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3081f5ffbb02284dda55132aa26daecedd7372a42417bbbab6f14ab7d6bb9145"
+checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2869,9 +2859,9 @@ dependencies = [
 
 [[package]]
 name = "serde_spanned"
-version = "0.6.4"
+version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80"
+checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1"
 dependencies = [
  "serde",
 ]
@@ -3026,9 +3016,9 @@ checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc"
 
 [[package]]
 name = "syn"
-version = "2.0.41"
+version = "2.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3058,15 +3048,15 @@ dependencies = [
 
 [[package]]
 name = "tempfile"
-version = "3.8.1"
+version = "3.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5"
+checksum = "01ce4141aa927a6d1bd34a041795abd0db1cccba5d5f24b009f694bdf3a1f3fa"
 dependencies = [
  "cfg-if",
  "fastrand",
  "redox_syscall",
  "rustix",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -3111,9 +3101,9 @@ dependencies = [
 
 [[package]]
 name = "tokio"
-version = "1.35.0"
+version = "1.35.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "841d45b238a16291a4e1584e61820b8ae57d696cc5015c459c229ccc6990cc1c"
+checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104"
 dependencies = [
  "backtrace",
  "bytes",
@@ -3646,9 +3636,9 @@ checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
 
 [[package]]
 name = "winnow"
-version = "0.5.28"
+version = "0.5.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c830786f7720c2fd27a1a0e27a709dbd3c4d009b56d098fc742d4f4eab91fe2"
+checksum = "8434aeec7b290e8da5c3f0d628cb0eac6cabcb31d14bb74f779a08109a5914d6"
 dependencies = [
  "memchr",
 ]
diff --git a/contracts/benchmarks/large-storage/Cargo.toml b/contracts/benchmarks/large-storage/Cargo.toml
index e4af3803f7..095b8f8966 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.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/benchmarks/large-storage/meta/Cargo.toml b/contracts/benchmarks/large-storage/meta/Cargo.toml
index b21bb5db8d..ef488e5042 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.45.2"
+version = "0.46.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 b11cf2a180..302889eb5d 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.45.2"
+version = "0.46.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 8399221c43..c6f143a006 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.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/benchmarks/mappers/linked-list-repeat/Cargo.toml b/contracts/benchmarks/mappers/linked-list-repeat/Cargo.toml
index c7695636da..b2ef479ef6 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.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/benchmarks/mappers/linked-list-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/linked-list-repeat/meta/Cargo.toml
index e4261f8468..9d5050e9d9 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.45.2"
+version = "0.46.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 ba2960c5ac..1c7d490263 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.45.2"
+version = "0.46.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 9ed2f3d4d0..0a20075f7e 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.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/benchmarks/mappers/map-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/map-repeat/meta/Cargo.toml
index 62c1c661d7..7433a8ba2b 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.45.2"
+version = "0.46.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 7d72fc9729..ed9b0fb929 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.45.2"
+version = "0.46.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 76633b641c..fa50397ee3 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.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/benchmarks/mappers/queue-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/queue-repeat/meta/Cargo.toml
index c1833db42a..977d320861 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.45.2"
+version = "0.46.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 93cf0dff89..5c464f422d 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.45.2"
+version = "0.46.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 393fde1d66..a1049d091d 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.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/benchmarks/mappers/set-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/set-repeat/meta/Cargo.toml
index fcfef7d952..30c567a5ee 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.45.2"
+version = "0.46.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 3d2aacc53f..a947731c16 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.45.2"
+version = "0.46.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 e56c982a30..b61db05c08 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.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/benchmarks/mappers/single-value-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/single-value-repeat/meta/Cargo.toml
index 46412af1e3..c1f03d9cb7 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.45.2"
+version = "0.46.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 8468cca74f..932be1c440 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.45.2"
+version = "0.46.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 b6b69bd5fb..d933a5b67e 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.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/benchmarks/mappers/vec-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/vec-repeat/meta/Cargo.toml
index 1c16bc04cd..2427a3b678 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.45.2"
+version = "0.46.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 f05da70d34..bf88aaaef7 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.45.2"
+version = "0.46.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 75d94e96cd..d13f94813a 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.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/benchmarks/send-tx-repeat/meta/Cargo.toml b/contracts/benchmarks/send-tx-repeat/meta/Cargo.toml
index c52cc67363..d4b4a888dd 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.45.2"
+version = "0.46.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 c819e701ad..51815bc4c3 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.45.2"
+version = "0.46.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/str-repeat/Cargo.toml b/contracts/benchmarks/str-repeat/Cargo.toml
index 06a55ad89b..cc99841a81 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.45.2"
+version = "0.46.0"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.2"
+version = "0.46.0"
 path = "../../../framework/scenario"
diff --git a/contracts/benchmarks/str-repeat/meta/Cargo.toml b/contracts/benchmarks/str-repeat/meta/Cargo.toml
index dca3fb7193..f3cf22d29b 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.45.2"
+version = "0.46.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 d9fab04324..88496fb32a 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.45.2"
+version = "0.46.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/core/price-aggregator/Cargo.toml b/contracts/core/price-aggregator/Cargo.toml
index 8a0a1a91bf..e30ea79f42 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.45.2"
+version = "0.46.0"
 authors = [
     "Claudiu-Marcel Bruda <claudiu.bruda@multiversx.com>",
     "MultiversX <contact@multiversx.com>",
@@ -19,15 +19,15 @@ edition = "2021"
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "0.45.2"
+version = "0.46.0"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.45.2"
+version = "0.46.0"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.2"
+version = "0.46.0"
 path = "../../../framework/scenario"
 
 [dependencies]
diff --git a/contracts/core/price-aggregator/meta/Cargo.toml b/contracts/core/price-aggregator/meta/Cargo.toml
index f4cb2f2795..e9bdc28455 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.45.2"
+version = "0.46.0"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.45.2"
+version = "0.46.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 e115f06e38..ac8cee2be3 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.45.2"
+version = "0.46.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/core/wegld-swap/Cargo.toml b/contracts/core/wegld-swap/Cargo.toml
index 0131f4fed9..9172eaa176 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.45.2"
+version = "0.46.0"
 
 authors = [
     "Dorin Iancu <dorin.iancu@multiversx.com>",
@@ -20,13 +20,13 @@ edition = "2021"
 path = "src/wegld.rs"
 
 [dependencies.multiversx-sc]
-version = "0.45.2"
+version = "0.46.0"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.45.2"
+version = "0.46.0"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.2"
+version = "0.46.0"
 path = "../../../framework/scenario"
diff --git a/contracts/core/wegld-swap/meta/Cargo.toml b/contracts/core/wegld-swap/meta/Cargo.toml
index fadf051d77..3b44728989 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.45.2"
+version = "0.46.0"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.45.2"
+version = "0.46.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 52ebcb2a18..ab063e4f0f 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.45.2"
+version = "0.46.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/adder/Cargo.toml b/contracts/examples/adder/Cargo.toml
index 32c87b650e..67e280fe98 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.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/examples/adder/interact/Cargo.toml b/contracts/examples/adder/interact/Cargo.toml
index ed210ad0f8..a6c1b7dafe 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.45.2"
+version = "0.46.0"
 path = "../../../../framework/snippets"
diff --git a/contracts/examples/adder/meta/Cargo.toml b/contracts/examples/adder/meta/Cargo.toml
index 2fdc37ecf9..0c21a7bd14 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.45.2"
+version = "0.46.0"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/examples/adder/wasm/Cargo.toml b/contracts/examples/adder/wasm/Cargo.toml
index 4d1beb4c5e..8d41bd837b 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.45.2"
+version = "0.46.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 e94de23300..3325de0455 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.45.2"
+version = "0.46.0"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.45.2"
+version = "0.46.0"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.2"
+version = "0.46.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 9e6ed5a545..fcaaf8b382 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.45.2"
+version = "0.46.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 e9e84e003f..d2d1a12cda 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.45.2"
+version = "0.46.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/check-pause/Cargo.toml b/contracts/examples/check-pause/Cargo.toml
index 17e6ebbdfb..95c00649ce 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.2"
 
 [dependencies.multiversx-sc]
-version = "0.45.2"
+version = "0.46.0"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.45.2"
+version = "0.46.0"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.2"
+version = "0.46.0"
 path = "../../../framework/scenario"
 
diff --git a/contracts/examples/check-pause/meta/Cargo.toml b/contracts/examples/check-pause/meta/Cargo.toml
index 981339b5a3..efbc1317cf 100644
--- a/contracts/examples/check-pause/meta/Cargo.toml
+++ b/contracts/examples/check-pause/meta/Cargo.toml
@@ -9,6 +9,6 @@ authors = ["Alin Cruceat <alin.cruceat@multiversx.com>"]
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.45.2"
+version = "0.46.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 9718d08e59..a72c232c92 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.45.2"
+version = "0.46.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/crowdfunding-esdt/Cargo.toml b/contracts/examples/crowdfunding-esdt/Cargo.toml
index 6d67d2cf48..b3cc3dff75 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.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"
 
 [dev-dependencies]
diff --git a/contracts/examples/crowdfunding-esdt/meta/Cargo.toml b/contracts/examples/crowdfunding-esdt/meta/Cargo.toml
index e3214ba99a..9571ae4df3 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.45.2"
+version = "0.46.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 ac110390bf..76d6cc4e0b 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.45.2"
+version = "0.46.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/crypto-bubbles/Cargo.toml b/contracts/examples/crypto-bubbles/Cargo.toml
index 1ed7cabd95..0c8e64b3af 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.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/examples/crypto-bubbles/meta/Cargo.toml b/contracts/examples/crypto-bubbles/meta/Cargo.toml
index bf17e888ad..204031769e 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.45.2"
+version = "0.46.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 50dc9c9db3..b313a6bcf7 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.45.2"
+version = "0.46.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 a31fe30967..2da3741c3e 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.45.2"
+version = "0.46.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 7cd1287752..b682c64f86 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.45.2"
+version = "0.46.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 876e14a450..27cdd2f367 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.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/examples/crypto-kitties/kitty-auction/meta/Cargo.toml b/contracts/examples/crypto-kitties/kitty-auction/meta/Cargo.toml
index 4c587af3cd..da369710d6 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.45.2"
+version = "0.46.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 43a7459eb4..5a6f6b3e4a 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.45.2"
+version = "0.46.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 234fbd3adf..a7f71e14e9 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.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/examples/crypto-kitties/kitty-genetic-alg/meta/Cargo.toml b/contracts/examples/crypto-kitties/kitty-genetic-alg/meta/Cargo.toml
index 7c96b75f98..3ee2652b77 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.45.2"
+version = "0.46.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 498165a3ce..e85e41bf42 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.45.2"
+version = "0.46.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 9873f6a23b..13060ff19d 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.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/examples/crypto-kitties/kitty-ownership/meta/Cargo.toml b/contracts/examples/crypto-kitties/kitty-ownership/meta/Cargo.toml
index 28fcee49eb..38281bf82a 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.45.2"
+version = "0.46.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 7ddc2696a2..488affa2af 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.45.2"
+version = "0.46.0"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/crypto-zombies/Cargo.toml b/contracts/examples/crypto-zombies/Cargo.toml
index 47a8f07e00..630fe05b9b 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.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/examples/crypto-zombies/meta/Cargo.toml b/contracts/examples/crypto-zombies/meta/Cargo.toml
index a5b1282fc7..c78822117f 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.45.2"
+version = "0.46.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 547d27b57d..15b06938f2 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.45.2"
+version = "0.46.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/digital-cash/Cargo.toml b/contracts/examples/digital-cash/Cargo.toml
index eb288a6ac9..412c0b661e 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.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/examples/digital-cash/meta/Cargo.toml b/contracts/examples/digital-cash/meta/Cargo.toml
index e2063be9e9..4accbfa9bd 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.45.2"
+version = "0.46.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 348ba5fcf7..77f1949163 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.45.2"
+version = "0.46.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/empty/Cargo.toml b/contracts/examples/empty/Cargo.toml
index f94bf26451..02b4d749da 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.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"
 
 [dev-dependencies]
diff --git a/contracts/examples/empty/meta/Cargo.toml b/contracts/examples/empty/meta/Cargo.toml
index a2b771af37..88e7526f2b 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.45.2"
+version = "0.46.0"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/examples/empty/wasm/Cargo.toml b/contracts/examples/empty/wasm/Cargo.toml
index 0e8dc925dd..bfdac5ecd6 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.45.2"
+version = "0.46.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 4794e9a418..639f3b0e3a 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.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/examples/esdt-transfer-with-fee/meta/Cargo.toml b/contracts/examples/esdt-transfer-with-fee/meta/Cargo.toml
index 46b7b5bdcd..5d097387ca 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.45.2"
+version = "0.46.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 af15c13c33..f6120fb10f 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.45.2"
+version = "0.46.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/factorial/Cargo.toml b/contracts/examples/factorial/Cargo.toml
index 474b76bc72..b7903ac353 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.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/examples/factorial/meta/Cargo.toml b/contracts/examples/factorial/meta/Cargo.toml
index dd26c0ec5c..0f7afefd81 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.45.2"
+version = "0.46.0"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/examples/factorial/wasm/Cargo.toml b/contracts/examples/factorial/wasm/Cargo.toml
index 43303d79fe..641d68c77b 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.45.2"
+version = "0.46.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/fractional-nfts/Cargo.toml b/contracts/examples/fractional-nfts/Cargo.toml
index b19e6c1a07..8ab84c3569 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.45.2"
+version = "0.46.0"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.45.2"
+version = "0.46.0"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.2"
+version = "0.46.0"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/fractional-nfts/meta/Cargo.toml b/contracts/examples/fractional-nfts/meta/Cargo.toml
index 9cbdc8712b..4ab25cdb0b 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.45.2"
+version = "0.46.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 94fe937202..86db13a906 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.45.2"
+version = "0.46.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/lottery-esdt/Cargo.toml b/contracts/examples/lottery-esdt/Cargo.toml
index e51f5db0ef..372f3d167e 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.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/examples/lottery-esdt/meta/Cargo.toml b/contracts/examples/lottery-esdt/meta/Cargo.toml
index 115303ab39..1cfcf17030 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.45.2"
+version = "0.46.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 6bb715a325..fb562ffe88 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.45.2"
+version = "0.46.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/multisig/Cargo.toml b/contracts/examples/multisig/Cargo.toml
index 42e5cc0c67..9b7053e9f2 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.45.2"
+version = "0.46.0"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.45.2"
+version = "0.46.0"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.2"
+version = "0.46.0"
 path = "../../../framework/scenario"
 
 [dev-dependencies.adder]
@@ -27,7 +27,7 @@ path = "../adder"
 path = "../factorial"
 
 [dev-dependencies.multiversx-wegld-swap-sc]
-version = "0.45.2"
+version = "0.46.0"
 path = "../../core/wegld-swap"
 
 [dev-dependencies]
diff --git a/contracts/examples/multisig/interact/Cargo.toml b/contracts/examples/multisig/interact/Cargo.toml
index 014fe3c036..0a9b11e7ba 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.45.2"
+version = "0.46.0"
 path = "../../../../contracts/modules"
 
 [dependencies.multiversx-sc-snippets]
-version = "0.45.2"
+version = "0.46.0"
 path = "../../../../framework/snippets"
 
 [dependencies.multiversx-sc-scenario]
-version = "=0.45.2"
+version = "=0.46.0"
 path = "../../../../framework/scenario"
diff --git a/contracts/examples/multisig/meta/Cargo.toml b/contracts/examples/multisig/meta/Cargo.toml
index fcf8c09cb3..706c119f56 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.45.2"
+version = "0.46.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 74fb0563e8..71616d7d85 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.45.2"
+version = "0.46.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 79fe547e95..63a279dfb0 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.45.2"
+version = "0.46.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/multisig/wasm/Cargo.toml b/contracts/examples/multisig/wasm/Cargo.toml
index 90c58025ae..883c777800 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.45.2"
+version = "0.46.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/nft-minter/Cargo.toml b/contracts/examples/nft-minter/Cargo.toml
index 75a241a54d..1b63485299 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.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/examples/nft-minter/meta/Cargo.toml b/contracts/examples/nft-minter/meta/Cargo.toml
index b3b146aea6..5dd730453b 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.45.2"
+version = "0.46.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 4e1391504c..f97ca02219 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.45.2"
+version = "0.46.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 6fd4983a93..bdbe02b9ac 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.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/examples/nft-storage-prepay/meta/Cargo.toml b/contracts/examples/nft-storage-prepay/meta/Cargo.toml
index ba0d7b4a4d..2d43cf3570 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.45.2"
+version = "0.46.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 6a508a116a..387d48d049 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.45.2"
+version = "0.46.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/nft-subscription/Cargo.toml b/contracts/examples/nft-subscription/Cargo.toml
index 51cbf856e6..36b39091d6 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.45.2"
+version = "0.46.0"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.45.2"
+version = "0.46.0"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.2"
+version = "0.46.0"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/nft-subscription/meta/Cargo.toml b/contracts/examples/nft-subscription/meta/Cargo.toml
index c4e2919d0e..843e12cafa 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.45.2"
+version = "0.46.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 0cca5f05a1..f7f101935e 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.45.2"
+version = "0.46.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 9c2bcbe6ab..ae33f7f9f2 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.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/examples/order-book/factory/meta/Cargo.toml b/contracts/examples/order-book/factory/meta/Cargo.toml
index b712633964..24ded66cb8 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.45.2"
+version = "0.46.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 9899c3460a..65ae77ff63 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.45.2"
+version = "0.46.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 9b5a07300f..0eb8f8eff9 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.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/examples/order-book/pair/meta/Cargo.toml b/contracts/examples/order-book/pair/meta/Cargo.toml
index 56d68ac0de..ad70da4d2d 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.45.2"
+version = "0.46.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 3e8a20583b..2696ebd635 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.45.2"
+version = "0.46.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 364fd72212..0390640c07 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.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/examples/ping-pong-egld/meta/Cargo.toml b/contracts/examples/ping-pong-egld/meta/Cargo.toml
index fa762a2b3e..68c184074b 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.45.2"
+version = "0.46.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 6c91ad0361..736863185a 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.45.2"
+version = "0.46.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/proxy-pause/Cargo.toml b/contracts/examples/proxy-pause/Cargo.toml
index 9c71f5bdb7..28eeed4797 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.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"
 
 [dev-dependencies.check-pause]
diff --git a/contracts/examples/proxy-pause/meta/Cargo.toml b/contracts/examples/proxy-pause/meta/Cargo.toml
index 20118a54c8..f4337c4dbc 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.45.2"
+version = "0.46.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 b7817cceaf..2362b7ee10 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.45.2"
+version = "0.46.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/rewards-distribution/Cargo.toml b/contracts/examples/rewards-distribution/Cargo.toml
index 8986593584..ceaf0c62b2 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.45.2"
+version = "0.46.0"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.45.2"
+version = "0.46.0"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.2"
+version = "0.46.0"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/rewards-distribution/meta/Cargo.toml b/contracts/examples/rewards-distribution/meta/Cargo.toml
index 446f491c5a..24afade8fb 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 <claudiu.bruda@multiversx.com>"]
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.45.2"
+version = "0.46.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 b2d160707d..e275dba640 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.45.2"
+version = "0.46.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 1e743ea99e..002a8acda4 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.45.2"
+version = "0.46.0"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.45.2"
+version = "0.46.0"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.2"
+version = "0.46.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 edd93330f4..e9b80a5f2e 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 <claudiu.bruda@multiversx.com>"]
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.45.2"
+version = "0.46.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 7a381864c0..6db397cce1 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.45.2"
+version = "0.46.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/token-release/Cargo.toml b/contracts/examples/token-release/Cargo.toml
index 372f38ab0b..24d9d149ae 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.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/examples/token-release/meta/Cargo.toml b/contracts/examples/token-release/meta/Cargo.toml
index 7a3d220cc7..3b0d3149b4 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.45.2"
+version = "0.46.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 fe05211f13..5e18129926 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.45.2"
+version = "0.46.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 0192ad173a..6c906da7ca 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.45.2"
+version = "0.46.0"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.2"
+version = "0.46.0"
 path = "../../../framework/scenario"
 
 [dev-dependencies.multiversx-sc-meta]
-version = "0.45.2"
+version = "0.46.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 9fe2c0459d..03bf68740e 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.45.2"
+            "version": "0.46.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 19a20678ee..fa9d9a489e 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.45.2"
+            "version": "0.46.0"
         }
     },
     "docs": [
diff --git a/contracts/feature-tests/abi-tester/meta/Cargo.toml b/contracts/feature-tests/abi-tester/meta/Cargo.toml
index 33337d99bc..c93ef2dffa 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.45.2"
+version = "0.46.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 f4f9b54e3b..222dd16ddf 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.45.2"
+version = "0.46.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 8aa1833237..6374241623 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.45.2"
+version = "0.46.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 62650a2ea4..bdb316342f 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.45.2"
+version = "0.46.0"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.2"
+version = "0.46.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 bb5c73f486..db35b321ce 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.45.2"
+version = "0.46.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 cb4709308e..8e9ad1996a 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.45.2"
+version = "0.46.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 814d131e17..d3d07c889f 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.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"
 
 [dependencies.multiversx-sc-modules]
-version = "0.45.2"
+version = "0.46.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 e602559e15..3959d56804 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.45.2"
+version = "0.46.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 5b4d8cc387..678ee79784 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.45.2"
+version = "0.46.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 f9b5f066c5..49be67b33a 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.45.2"
+version = "0.46.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 51b5f99eb3..db0032cdb6 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.45.2"
+version = "0.46.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 3a666b46d0..0dcdbb592f 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.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"
 
 [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 30e334a463..e6ea495bed 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.45.2"
+version = "0.46.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 94d59e9a59..09d5575d7e 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.45.2"
+version = "0.46.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/Cargo.toml b/contracts/feature-tests/composability/Cargo.toml
index 94ad2e73e7..feb14f3bfe 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.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/composability/builtin-func-features/Cargo.toml b/contracts/feature-tests/composability/builtin-func-features/Cargo.toml
index 397e4771b2..da7473859e 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.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/composability/builtin-func-features/meta/Cargo.toml b/contracts/feature-tests/composability/builtin-func-features/meta/Cargo.toml
index f1ea45c792..0009c8ad3a 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.45.2"
+version = "0.46.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 aaffa0307e..1342427c92 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.45.2"
+version = "0.46.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 8c60d7a8b1..0d90baa395 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.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/composability/esdt-contract-pair/first-contract/Cargo.toml b/contracts/feature-tests/composability/esdt-contract-pair/first-contract/Cargo.toml
index 339a0af287..e1fcbc1a1c 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.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/composability/esdt-contract-pair/first-contract/meta/Cargo.toml b/contracts/feature-tests/composability/esdt-contract-pair/first-contract/meta/Cargo.toml
index 3c0a27bfb2..b52ab91889 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.45.2"
+version = "0.46.0"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.45.2"
+version = "0.46.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 201fbd2017..fbd72d5ebd 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.45.2"
+version = "0.46.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 26975b1a16..71588d4fef 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.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/composability/esdt-contract-pair/second-contract/meta/Cargo.toml b/contracts/feature-tests/composability/esdt-contract-pair/second-contract/meta/Cargo.toml
index 1087d19e66..e177661dc2 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.45.2"
+version = "0.46.0"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.45.2"
+version = "0.46.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 1c2b54fa36..21a1f1057e 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.45.2"
+version = "0.46.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 52b3347cd6..330b1aa37b 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.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/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 952a9c9bd3..2c4771981b 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.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/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 2e10a84ea2..8e5a4fbd68 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.45.2"
+version = "0.46.0"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.45.2"
+version = "0.46.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 0d607ef86d..e04b0a687a 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.45.2"
+version = "0.46.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 882568bce5..1322cfdd97 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.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/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 5b99afe25b..4e4038be9a 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.45.2"
+version = "0.46.0"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.45.2"
+version = "0.46.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 ea9a40d476..d3467c2dfa 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.45.2"
+version = "0.46.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 54b0f7964d..3f77beb9e9 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.45.2"
+version = "0.46.0"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.45.2"
+version = "0.46.0"
 path = "../../../../framework/wasm-adapter"
 optional = true
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.2"
+version = "0.46.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 b95717a5a5..634415366d 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.45.2"
+version = "0.46.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 da376b12a6..fd05ad55cf 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.45.2"
+version = "0.46.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 859fb03f56..7dbbee780e 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.45.2"
+version = "0.46.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 6e591ce9a6..3cfed5c21b 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.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/composability/forwarder-raw/meta/Cargo.toml b/contracts/feature-tests/composability/forwarder-raw/meta/Cargo.toml
index f0ea5f9d41..18bd1d716b 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.45.2"
+version = "0.46.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 6025ce10ae..11c5cfce27 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.45.2"
+version = "0.46.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 255065dac9..c77e5ce85e 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.45.2"
+version = "0.46.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 34ea5887fd..d525382eb0 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.45.2"
+version = "0.46.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 a42cd6136f..99edb41076 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.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/composability/forwarder/meta/Cargo.toml b/contracts/feature-tests/composability/forwarder/meta/Cargo.toml
index eb4f54d18b..5083c192af 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.45.2"
+version = "0.46.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 478c447ded..29ee198587 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.45.2"
+version = "0.46.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 506efb6dc3..8cd130cbdc 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.45.2"
+version = "0.46.0"
 path = "../../../../contracts/modules"
 
 [dependencies.multiversx-sc-snippets]
-version = "0.45.2"
+version = "0.46.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 2011a8354a..cf76fe461e 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.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/composability/local-esdt-and-nft/meta/Cargo.toml b/contracts/feature-tests/composability/local-esdt-and-nft/meta/Cargo.toml
index 8452880a99..7a1f27c826 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.45.2"
+version = "0.46.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 69bd443957..be4755626f 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.45.2"
+version = "0.46.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 d1a9bb9285..9f066562c3 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.45.2"
+version = "0.46.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 b7c546fe15..72a7c27109 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.45.2"
+version = "0.46.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 af03baf284..90078b8bc0 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.45.2"
+version = "0.46.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 fa67239a13..f44cea94af 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.45.2"
+version = "0.46.0"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.2"
+version = "0.46.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 d9c4007cf1..b2842355bf 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.45.2"
+version = "0.46.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 e23bfc783a..a33a28dabb 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.45.2"
+version = "0.46.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 4c6ed498d9..0471700645 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.45.2"
+version = "0.46.0"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.2"
+version = "0.46.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 2e7b0e9f78..dd64784600 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.45.2"
+version = "0.46.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 beaa16da5d..50873f6cad 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.45.2"
+version = "0.46.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 5f9090844f..ec65c7c3ce 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.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/composability/recursive-caller/meta/Cargo.toml b/contracts/feature-tests/composability/recursive-caller/meta/Cargo.toml
index 262fdcd0f4..2235b679f0 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.45.2"
+version = "0.46.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 ee1d240dbd..3b77408eec 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.45.2"
+version = "0.46.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 13d8ef1bf8..b0a2ee3024 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.45.2"
+version = "0.46.0"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.45.2"
+version = "0.46.0"
 path = "../../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.2"
+version = "0.46.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 9629a13885..02a9892c9b 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.45.2"
+version = "0.46.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 665891f8b6..f7932c1dad 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.45.2"
+version = "0.46.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 4ecc06d31b..c8d893c118 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.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/composability/vault/meta/Cargo.toml b/contracts/feature-tests/composability/vault/meta/Cargo.toml
index c46d5fe0ea..25ca088cf0 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.45.2"
+version = "0.46.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 5d59a5e436..61574104b3 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.45.2"
+version = "0.46.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 85e2506af6..a8ca7e6132 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.45.2"
+version = "0.46.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 54e7941bd8..3814231bc8 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.45.2"
+version = "0.46.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 86b1869509..7d9013351c 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.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/erc-style-contracts/crowdfunding-erc20/meta/Cargo.toml b/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/meta/Cargo.toml
index 4c9121c045..1741e4efc7 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.45.2"
+version = "0.46.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 cf9c8f6da9..c5a374fdd6 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.45.2"
+version = "0.46.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 bfa34ef0be..98bf4401bb 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.45.2"
+version = "0.46.0"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.2"
+version = "0.46.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 a8ce770d4d..7641906c0f 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.45.2"
+version = "0.46.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 2a16379f23..fead100fc5 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.45.2"
+version = "0.46.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 2d2b20f749..4b38bcfaac 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.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/erc-style-contracts/erc1155-user-mock/meta/Cargo.toml b/contracts/feature-tests/erc-style-contracts/erc1155-user-mock/meta/Cargo.toml
index 35f57330b2..ef5f43dfa5 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.45.2"
+version = "0.46.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 cd7d89f6d4..bef5f84d7a 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.45.2"
+version = "0.46.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 e17744681c..225792b4e6 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.45.2"
+version = "0.46.0"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.2"
+version = "0.46.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 ca8d2ff274..031b524b46 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.45.2"
+version = "0.46.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 39ddd43a08..811ca4bd9b 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.45.2"
+version = "0.46.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 22b92a8336..f076ae9421 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.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/erc-style-contracts/erc20/meta/Cargo.toml b/contracts/feature-tests/erc-style-contracts/erc20/meta/Cargo.toml
index 1f4f09b80d..12fa1b1f8e 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.45.2"
+version = "0.46.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 e7a0ca8304..a05835ea31 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.45.2"
+version = "0.46.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 1d233d3542..834d0efb1c 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.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/erc-style-contracts/erc721/meta/Cargo.toml b/contracts/feature-tests/erc-style-contracts/erc721/meta/Cargo.toml
index 8890631888..8f93d367a8 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.45.2"
+version = "0.46.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 140e93df6b..f592746cc2 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.45.2"
+version = "0.46.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 a9bcc2ff86..cb8e382e95 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.45.2"
+version = "0.46.0"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.45.2"
+version = "0.46.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 787a96f6c9..b80d83c2d6 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.45.2"
+version = "0.46.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 f56a20bff3..c4adb4779c 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.45.2"
+version = "0.46.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 4bd3883cbd..a02f338bb3 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.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/esdt-system-sc-mock/meta/Cargo.toml b/contracts/feature-tests/esdt-system-sc-mock/meta/Cargo.toml
index 6b7ff0047b..633fc522af 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.45.2"
+version = "0.46.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 28763e7469..abb9606505 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.45.2"
+version = "0.46.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 02d8f60c60..3a2d2e0565 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.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/formatted-message-features/meta/Cargo.toml b/contracts/feature-tests/formatted-message-features/meta/Cargo.toml
index 5f17994525..8de3e68482 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.45.2"
+version = "0.46.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 58cbedfef4..29fb281836 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.45.2"
+version = "0.46.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 2695d52f44..b3b3079d97 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.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"
 
 [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 0f2ef250d9..d7984b7e22 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.45.2"
+version = "0.46.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 e37f0ad37b..c0840b07b0 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.45.2"
+version = "0.46.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 f8d022bc55..94d2121d52 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.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/multi-contract-features/meta/Cargo.toml b/contracts/feature-tests/multi-contract-features/meta/Cargo.toml
index 06fd0aeb9b..c8a61186d4 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.45.2"
+version = "0.46.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 f8d413565c..ae5f96e3ec 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.45.2"
+version = "0.46.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 79660a3ed7..a0602921e6 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.45.2"
+version = "0.46.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 3a4a60fadb..d4f0e5572b 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.45.2"
+version = "0.46.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 7a47f4567d..d9d9bbaa39 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.45.2"
+version = "0.46.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 f0c956a7f6..cc02363abb 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.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/panic-message-features/meta/Cargo.toml b/contracts/feature-tests/panic-message-features/meta/Cargo.toml
index 60faa9bd75..2999fecfa4 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.45.2"
+version = "0.46.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 c33d0fd63d..0f4005de0a 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.45.2"
+version = "0.46.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 5dfb5c49af..95f4c56a40 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.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/payable-features/meta/Cargo.toml b/contracts/feature-tests/payable-features/meta/Cargo.toml
index fd97bbd632..e0c366c41e 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.45.2"
+version = "0.46.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 1272f6e3a8..174321c3d0 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.45.2"
+version = "0.46.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 ea100398ac..df08c26c99 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.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/rust-snippets-generator-test/interact-rs/Cargo.toml b/contracts/feature-tests/rust-snippets-generator-test/interact-rs/Cargo.toml
index c7c382914c..b1170fcb9a 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.45.2"
+version = "0.46.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 706dadf86e..2f25864270 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.45.2"
+version = "0.46.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 401456d956..f7c91a8dbc 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.45.2"
+// version = "0.46.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 0270b64d7e..21c51611c8 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.45.2"
+version = "0.46.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 37f329b178..09ba8074ca 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.45.2"
+version = "0.46.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.45.2"
+version = "0.46.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 d1a2dd9a13..89e4afc993 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.45.2"
+version = "0.46.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 c740b38556..60e559ed10 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.45.2"
+version = "0.46.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 6933b409e6..70a56322e3 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.45.2"
+version = "0.46.0"
 path = "../../../contracts/modules"
 
 [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"
 
 [dev-dependencies.multiversx-sc-meta]
-version = "0.45.2"
+version = "0.46.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 36dcd64adf..423757096b 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.45.2"
+version = "0.46.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 8a2d79a521..6d57ba2907 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.45.2"
+version = "0.46.0"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.45.2"
+version = "0.46.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 c75a525106..b057b7400f 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.45.2"
+            "version": "0.46.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 2c860fa52c..c525166edd 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.45.2"
+            "version": "0.46.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 7ec5e85cee..62cb812406 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.45.2"
+version = "0.46.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 a8e17e3dad..daa47af3b6 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.45.2"
+version = "0.46.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/modules/Cargo.toml b/contracts/modules/Cargo.toml
index 3885147310..0805864547 100644
--- a/contracts/modules/Cargo.toml
+++ b/contracts/modules/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-modules"
-version = "0.45.2"
+version = "0.46.0"
 edition = "2021"
 
 authors = ["MultiversX <contact@multiversx.com>"]
@@ -17,5 +17,5 @@ categories = ["no-std", "wasm", "cryptography::cryptocurrencies"]
 alloc = ["multiversx-sc/alloc"]
 
 [dependencies.multiversx-sc]
-version = "0.45.2"
+version = "0.46.0"
 path = "../../framework/base"
diff --git a/framework/base/Cargo.toml b/framework/base/Cargo.toml
index 379f256c65..1cd3dc6d58 100644
--- a/framework/base/Cargo.toml
+++ b/framework/base/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc"
-version = "0.45.2"
+version = "0.46.0"
 edition = "2021"
 
 authors = ["Andrei Marinica <andrei.marinica@multiversx.com>", "MultiversX <contact@multiversx.com>"]
@@ -27,7 +27,7 @@ bitflags = "2.4.1"
 num-traits = { version = "0.2", default-features = false }
 
 [dependencies.multiversx-sc-derive]
-version = "=0.45.2"
+version = "=0.46.0"
 path = "../derive"
 
 [dependencies.multiversx-sc-codec]
diff --git a/framework/derive/Cargo.toml b/framework/derive/Cargo.toml
index a3c389a810..c1b9080316 100644
--- a/framework/derive/Cargo.toml
+++ b/framework/derive/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-derive"
-version = "0.45.2"
+version = "0.46.0"
 edition = "2021"
 
 authors = ["Andrei Marinica <andrei.marinica@multiversx.com>", "MultiversX <contact@multiversx.com>"]
diff --git a/framework/meta/Cargo.toml b/framework/meta/Cargo.toml
index 90cdfe4032..66b45a9624 100644
--- a/framework/meta/Cargo.toml
+++ b/framework/meta/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-meta"
-version = "0.45.2"
+version = "0.46.0"
 edition = "2021"
 
 authors = [
@@ -51,7 +51,7 @@ pathdiff = { version = "0.2.1", optional = true }
 common-path = { version = "1.0.0", optional = true }
 
 [dependencies.multiversx-sc]
-version = "=0.45.2"
+version = "=0.46.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 59933e1a69..a66e66fcaa 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.45.2"
+version = "0.46.0"
 
 # [workspace]
 
diff --git a/framework/meta/src/cmd/contract/meta_config.rs b/framework/meta/src/cmd/contract/meta_config.rs
index 4b979a6b02..617a03ff7b 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.45.2\"
+version = \"0.46.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.45.2".to_string(),
+            framework_version: "0.46.0".to_string(),
             framework_path: Option::Some("../../../framework/base".to_string()),
             contract_features: Vec::<String>::new(),
         };
diff --git a/framework/meta/src/cmd/standalone/upgrade/upgrade_selector.rs b/framework/meta/src/cmd/standalone/upgrade/upgrade_selector.rs
index 17114bdb49..c07e7bc0ec 100644
--- a/framework/meta/src/cmd/standalone/upgrade/upgrade_selector.rs
+++ b/framework/meta/src/cmd/standalone/upgrade/upgrade_selector.rs
@@ -94,7 +94,8 @@ fn upgrade_post_processing(dir: &RelevantDirectory, settings: &UpgradeSettings)
         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((_, "0.42.0")) | Some((_, "0.43.0")) | Some((_, "0.44.0")) | Some((_, "0.45.2"))
+        | Some((_, "0.46.0")) => {
             print_post_processing(dir);
             cargo_check(dir, settings);
         },
diff --git a/framework/meta/src/version_history.rs b/framework/meta/src/version_history.rs
index 3bbe74cef2..d64494f15f 100644
--- a/framework/meta/src/version_history.rs
+++ b/framework/meta/src/version_history.rs
@@ -1,7 +1,7 @@
 /// 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: &str = "0.46.0";
 
 /// Indicates where to stop with the upgrades.
 pub const LAST_UPGRADE_VERSION: &str = LAST_VERSION;
@@ -53,6 +53,7 @@ pub const VERSIONS: &[&str] = &[
     "0.44.0",
     "0.45.0",
     "0.45.2",
+    "0.46.0",
 ];
 
 /// We started supporting contract templates with version 0.43.0.
diff --git a/framework/scenario/Cargo.toml b/framework/scenario/Cargo.toml
index bcfbea0499..088cb3e711 100644
--- a/framework/scenario/Cargo.toml
+++ b/framework/scenario/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-scenario"
-version = "0.45.2"
+version = "0.46.0"
 edition = "2021"
 
 authors = [
@@ -40,12 +40,12 @@ path = "src/main.rs"
 run-go-tests = []
 
 [dependencies.multiversx-sc]
-version = "=0.45.2"
+version = "=0.46.0"
 features = ["alloc", "num-bigint"]
 path = "../base"
 
 [dependencies.multiversx-sc-meta]
-version = "=0.45.2"
+version = "=0.46.0"
 path = "../meta"
 
 [dependencies.multiversx-chain-scenario-format]
diff --git a/framework/snippets/Cargo.toml b/framework/snippets/Cargo.toml
index 0bbefbea3c..cb5d99c0c0 100644
--- a/framework/snippets/Cargo.toml
+++ b/framework/snippets/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-snippets"
-version = "0.45.2"
+version = "0.46.0"
 edition = "2021"
 
 authors = ["MultiversX <contact@multiversx.com>"]
@@ -22,7 +22,7 @@ env_logger = "0.10"
 futures = "0.3"
 
 [dependencies.multiversx-sc-scenario]
-version = "=0.45.2"
+version = "=0.46.0"
 path = "../scenario"
 
 [dependencies.multiversx-sdk]
diff --git a/framework/wasm-adapter/Cargo.toml b/framework/wasm-adapter/Cargo.toml
index c93dea85ad..45051c31c4 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.45.2"
+version = "0.46.0"
 edition = "2021"
 
 authors = [
@@ -22,5 +22,5 @@ categories = [
 ]
 
 [dependencies.multiversx-sc]
-version = "=0.45.2"
+version = "=0.46.0"
 path = "../base"
diff --git a/tools/mxpy-snippet-generator/Cargo.toml b/tools/mxpy-snippet-generator/Cargo.toml
index 3a273a4947..afb2cb9052 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.45.2"
+version = "0.46.0"
 path = "../../framework/base"
 
 [dependencies]
diff --git a/tools/rust-debugger/format-tests/Cargo.toml b/tools/rust-debugger/format-tests/Cargo.toml
index 9a490a0249..37b652f11d 100644
--- a/tools/rust-debugger/format-tests/Cargo.toml
+++ b/tools/rust-debugger/format-tests/Cargo.toml
@@ -9,11 +9,11 @@ name = "format-tests"
 path = "src/format_tests.rs"
 
 [dependencies.multiversx-sc]
-version = "0.45.2"
+version = "0.46.0"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-scenario]
-version = "0.45.2"
+version = "0.46.0"
 path = "../../../framework/scenario"
 
 [dependencies.multiversx-chain-vm]

From 06675f86edeb69945644063633dc35b9e043269a Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 5 Jan 2024 17:38:22 +0200
Subject: [PATCH 0191/1254] Cargo.lock update

---
 .../benchmarks/large-storage/wasm/Cargo.lock  | 85 ++----------------
 .../linked-list-repeat/wasm/Cargo.lock        | 85 ++----------------
 .../mappers/map-repeat/wasm/Cargo.lock        | 85 ++----------------
 .../mappers/queue-repeat/wasm/Cargo.lock      | 85 ++----------------
 .../mappers/set-repeat/wasm/Cargo.lock        | 85 ++----------------
 .../single-value-repeat/wasm/Cargo.lock       | 85 ++----------------
 .../mappers/vec-repeat/wasm/Cargo.lock        | 85 ++----------------
 .../benchmarks/send-tx-repeat/wasm/Cargo.lock | 85 ++----------------
 .../benchmarks/str-repeat/wasm/Cargo.lock     | 85 ++----------------
 .../core/price-aggregator/wasm/Cargo.lock     | 77 +++-------------
 contracts/examples/adder/wasm/Cargo.lock      | 85 ++----------------
 .../bonding-curve-contract/wasm/Cargo.lock    | 87 +++----------------
 .../examples/check-pause/wasm/Cargo.lock      | 87 +++----------------
 .../crowdfunding-esdt/wasm/Cargo.lock         | 85 ++----------------
 .../examples/crypto-bubbles/wasm/Cargo.lock   | 85 ++----------------
 .../kitty-auction/wasm/Cargo.lock             | 85 ++----------------
 .../kitty-genetic-alg/wasm/Cargo.lock         | 85 ++----------------
 .../kitty-ownership/wasm/Cargo.lock           | 85 ++----------------
 .../examples/crypto-zombies/wasm/Cargo.lock   | 85 ++----------------
 .../examples/digital-cash/wasm/Cargo.lock     | 85 ++----------------
 contracts/examples/empty/wasm/Cargo.lock      | 85 ++----------------
 .../esdt-transfer-with-fee/wasm/Cargo.lock    | 85 ++----------------
 contracts/examples/factorial/wasm/Cargo.lock  | 85 ++----------------
 .../examples/fractional-nfts/wasm/Cargo.lock  | 87 +++----------------
 .../examples/lottery-esdt/wasm/Cargo.lock     | 85 ++----------------
 .../multisig/wasm-multisig-full/Cargo.lock    | 87 +++----------------
 .../multisig/wasm-multisig-view/Cargo.lock    | 87 +++----------------
 contracts/examples/multisig/wasm/Cargo.lock   | 87 +++----------------
 contracts/examples/nft-minter/wasm/Cargo.lock | 85 ++----------------
 .../nft-storage-prepay/wasm/Cargo.lock        | 85 ++----------------
 .../examples/nft-subscription/wasm/Cargo.lock | 87 +++----------------
 .../order-book/factory/wasm/Cargo.lock        | 85 ++----------------
 .../examples/order-book/pair/wasm/Cargo.lock  | 85 ++----------------
 .../examples/ping-pong-egld/wasm/Cargo.lock   | 85 ++----------------
 .../examples/proxy-pause/wasm/Cargo.lock      | 85 ++----------------
 .../rewards-distribution/wasm/Cargo.lock      | 87 +++----------------
 .../examples/seed-nft-minter/wasm/Cargo.lock  | 87 +++----------------
 .../examples/token-release/wasm/Cargo.lock    | 85 ++----------------
 .../abi-tester/wasm-abi-tester-ev/Cargo.lock  | 85 ++----------------
 .../feature-tests/abi-tester/wasm/Cargo.lock  | 85 ++----------------
 .../alloc-features/wasm/Cargo.lock            | 85 ++----------------
 .../Cargo.lock                                | 87 +++----------------
 .../basic-features/wasm/Cargo.lock            | 87 +++----------------
 .../big-float-features/wasm/Cargo.lock        | 85 ++----------------
 .../builtin-func-features/wasm/Cargo.lock     | 85 ++----------------
 .../first-contract/wasm/Cargo.lock            | 85 ++----------------
 .../second-contract/wasm/Cargo.lock           | 85 ++----------------
 .../child/wasm/Cargo.lock                     | 85 ++----------------
 .../parent/wasm/Cargo.lock                    | 85 ++----------------
 .../wasm-forwarder-queue-promises/Cargo.lock  | 85 ++----------------
 .../forwarder-queue/wasm/Cargo.lock           | 85 ++----------------
 .../Cargo.lock                                | 85 ++----------------
 .../Cargo.lock                                | 85 ++----------------
 .../forwarder-raw/wasm/Cargo.lock             | 85 ++----------------
 .../composability/forwarder/wasm/Cargo.lock   | 85 ++----------------
 .../local-esdt-and-nft/wasm/Cargo.lock        | 85 ++----------------
 .../promises-features/wasm/Cargo.lock         | 85 ++----------------
 .../proxy-test-first/wasm/Cargo.lock          | 85 ++----------------
 .../proxy-test-second/wasm/Cargo.lock         | 85 ++----------------
 .../recursive-caller/wasm/Cargo.lock          | 85 ++----------------
 .../transfer-role-features/wasm/Cargo.lock    | 87 +++----------------
 .../vault/wasm-vault-promises/Cargo.lock      | 85 ++----------------
 .../vault/wasm-vault-upgrade/Cargo.lock       | 85 ++----------------
 .../composability/vault/wasm/Cargo.lock       | 85 ++----------------
 .../crowdfunding-erc20/wasm/Cargo.lock        | 85 ++----------------
 .../erc1155-marketplace/wasm/Cargo.lock       | 85 ++----------------
 .../erc1155-user-mock/wasm/Cargo.lock         | 85 ++----------------
 .../erc1155/wasm/Cargo.lock                   | 85 ++----------------
 .../erc-style-contracts/erc20/wasm/Cargo.lock | 85 ++----------------
 .../erc721/wasm/Cargo.lock                    | 85 ++----------------
 .../lottery-erc20/wasm/Cargo.lock             | 85 ++----------------
 .../esdt-system-sc-mock/wasm/Cargo.lock       | 85 ++----------------
 .../wasm/Cargo.lock                           | 85 ++----------------
 .../managed-map-features/wasm/Cargo.lock      | 85 ++----------------
 .../wasm-multi-contract-alt-impl/Cargo.lock   | 85 ++----------------
 .../Cargo.lock                                | 85 ++----------------
 .../Cargo.lock                                | 85 ++----------------
 .../multi-contract-features/wasm/Cargo.lock   | 85 ++----------------
 .../panic-message-features/wasm/Cargo.lock    | 85 ++----------------
 .../payable-features/wasm/Cargo.lock          | 85 ++----------------
 .../wasm/Cargo.lock                           | 85 ++----------------
 .../wasm/Cargo.lock                           | 85 ++----------------
 .../wasm-use-module-view/Cargo.lock           | 87 +++----------------
 .../feature-tests/use-module/wasm/Cargo.lock  | 87 +++----------------
 84 files changed, 772 insertions(+), 6388 deletions(-)

diff --git a/contracts/benchmarks/large-storage/wasm/Cargo.lock b/contracts/benchmarks/large-storage/wasm/Cargo.lock
index cfdaf85f15..62a9b3b0cd 100755
--- a/contracts/benchmarks/large-storage/wasm/Cargo.lock
+++ b/contracts/benchmarks/large-storage/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"
@@ -38,28 +20,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"
@@ -89,10 +55,9 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "bitflags",
- "hashbrown",
  "hex-literal",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
@@ -119,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -130,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -153,26 +118,20 @@ 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"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
+checksum = "907a61bd0f64c2f29cd1cf1dc34d05176426a3f504a78010f08416ddb7b13708"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
@@ -195,9 +154,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "2.0.41"
+version = "2.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -209,29 +168,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/benchmarks/mappers/linked-list-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.lock
index 4c4b300512..1be3a80866 100644
--- a/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.lock
+++ b/contracts/benchmarks/mappers/linked-list-repeat/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"
@@ -45,28 +27,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"
@@ -97,10 +63,9 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "bitflags",
- "hashbrown",
  "hex-literal",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
@@ -127,7 +92,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -138,7 +103,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -161,26 +126,20 @@ 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"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
+checksum = "907a61bd0f64c2f29cd1cf1dc34d05176426a3f504a78010f08416ddb7b13708"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
@@ -203,9 +162,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "2.0.41"
+version = "2.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -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/benchmarks/mappers/map-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.lock
index 52c3365196..1360076bc7 100644
--- a/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.lock
+++ b/contracts/benchmarks/mappers/map-repeat/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"
@@ -45,28 +27,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"
@@ -97,10 +63,9 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "bitflags",
- "hashbrown",
  "hex-literal",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
@@ -127,7 +92,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -138,7 +103,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -161,26 +126,20 @@ 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"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
+checksum = "907a61bd0f64c2f29cd1cf1dc34d05176426a3f504a78010f08416ddb7b13708"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
@@ -203,9 +162,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "2.0.41"
+version = "2.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -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/benchmarks/mappers/queue-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.lock
index a5a929e029..70006738ac 100644
--- a/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.lock
+++ b/contracts/benchmarks/mappers/queue-repeat/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"
@@ -45,28 +27,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"
@@ -81,10 +47,9 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "bitflags",
- "hashbrown",
  "hex-literal",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
@@ -111,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -122,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -145,17 +110,11 @@ 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"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
+checksum = "907a61bd0f64c2f29cd1cf1dc34d05176426a3f504a78010f08416ddb7b13708"
 dependencies = [
  "unicode-ident",
 ]
@@ -178,9 +137,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
@@ -203,9 +162,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "2.0.41"
+version = "2.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -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/benchmarks/mappers/set-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.lock
index 839ad62528..0de929de46 100644
--- a/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.lock
+++ b/contracts/benchmarks/mappers/set-repeat/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"
@@ -45,28 +27,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"
@@ -81,10 +47,9 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "bitflags",
- "hashbrown",
  "hex-literal",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
@@ -111,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -122,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -145,26 +110,20 @@ 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"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
+checksum = "907a61bd0f64c2f29cd1cf1dc34d05176426a3f504a78010f08416ddb7b13708"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
@@ -203,9 +162,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "2.0.41"
+version = "2.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -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/benchmarks/mappers/single-value-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.lock
index 5fbfb62193..fdb834b1ed 100644
--- a/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.lock
+++ b/contracts/benchmarks/mappers/single-value-repeat/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"
@@ -45,28 +27,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"
@@ -81,10 +47,9 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "bitflags",
- "hashbrown",
  "hex-literal",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
@@ -111,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -122,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -145,26 +110,20 @@ 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"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
+checksum = "907a61bd0f64c2f29cd1cf1dc34d05176426a3f504a78010f08416ddb7b13708"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
@@ -203,9 +162,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "2.0.41"
+version = "2.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -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/benchmarks/mappers/vec-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.lock
index b7fee88c63..4ed628d0e9 100644
--- a/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.lock
+++ b/contracts/benchmarks/mappers/vec-repeat/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"
@@ -45,28 +27,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"
@@ -81,10 +47,9 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "bitflags",
- "hashbrown",
  "hex-literal",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
@@ -111,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -122,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -145,26 +110,20 @@ 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"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
+checksum = "907a61bd0f64c2f29cd1cf1dc34d05176426a3f504a78010f08416ddb7b13708"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
@@ -187,9 +146,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "2.0.41"
+version = "2.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -217,29 +176,3 @@ dependencies = [
  "multiversx-sc-wasm-adapter",
  "vec-repeat",
 ]
-
-[[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/benchmarks/send-tx-repeat/wasm/Cargo.lock b/contracts/benchmarks/send-tx-repeat/wasm/Cargo.lock
index 415e994327..ce6b9830de 100755
--- a/contracts/benchmarks/send-tx-repeat/wasm/Cargo.lock
+++ b/contracts/benchmarks/send-tx-repeat/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"
@@ -38,28 +20,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"
@@ -74,10 +40,9 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "bitflags",
- "hashbrown",
  "hex-literal",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
@@ -104,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -115,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -138,26 +103,20 @@ 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"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
+checksum = "907a61bd0f64c2f29cd1cf1dc34d05176426a3f504a78010f08416ddb7b13708"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
@@ -195,9 +154,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "2.0.41"
+version = "2.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -209,29 +168,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/benchmarks/str-repeat/wasm/Cargo.lock b/contracts/benchmarks/str-repeat/wasm/Cargo.lock
index 737f08c8fc..8ab3459f0b 100755
--- a/contracts/benchmarks/str-repeat/wasm/Cargo.lock
+++ b/contracts/benchmarks/str-repeat/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"
@@ -38,28 +20,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"
@@ -74,10 +40,9 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "bitflags",
- "hashbrown",
  "hex-literal",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
@@ -104,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -115,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -138,26 +103,20 @@ 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"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
+checksum = "907a61bd0f64c2f29cd1cf1dc34d05176426a3f504a78010f08416ddb7b13708"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
@@ -195,9 +154,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.41"
+version = "2.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -209,29 +168,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/core/price-aggregator/wasm/Cargo.lock b/contracts/core/price-aggregator/wasm/Cargo.lock
index 9dfe2520af..70ece89e77 100644
--- a/contracts/core/price-aggregator/wasm/Cargo.lock
+++ b/contracts/core/price-aggregator/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"
@@ -69,16 +51,6 @@ dependencies = [
  "wasm-bindgen",
 ]
 
-[[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"
@@ -114,7 +86,7 @@ checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
 
 [[package]]
 name = "multiversx-price-aggregator-sc"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "arrayvec",
  "getrandom",
@@ -133,10 +105,9 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "bitflags",
- "hashbrown",
  "hex-literal",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
@@ -163,7 +134,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -174,14 +145,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -218,18 +189,18 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.70"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
+checksum = "907a61bd0f64c2f29cd1cf1dc34d05176426a3f504a78010f08416ddb7b13708"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
@@ -282,9 +253,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "2.0.41"
+version = "2.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -297,12 +268,6 @@ 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 = "wasi"
 version = "0.11.0+wasi-snapshot-preview1"
@@ -362,23 +327,3 @@ name = "wasm-bindgen-shared"
 version = "0.2.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f"
-
-[[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/examples/adder/wasm/Cargo.lock b/contracts/examples/adder/wasm/Cargo.lock
index d513059fde..71b185caec 100755
--- a/contracts/examples/adder/wasm/Cargo.lock
+++ b/contracts/examples/adder/wasm/Cargo.lock
@@ -17,24 +17,6 @@ dependencies = [
  "multiversx-sc-wasm-adapter",
 ]
 
-[[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"
@@ -53,28 +35,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"
@@ -89,10 +55,9 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "bitflags",
- "hashbrown",
  "hex-literal",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
@@ -119,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -130,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -153,26 +118,20 @@ 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"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
+checksum = "907a61bd0f64c2f29cd1cf1dc34d05176426a3f504a78010f08416ddb7b13708"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
@@ -195,9 +154,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "2.0.41"
+version = "2.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -209,29 +168,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/examples/bonding-curve-contract/wasm/Cargo.lock b/contracts/examples/bonding-curve-contract/wasm/Cargo.lock
index 1a2abf2d5a..8ded0d0f89 100644
--- a/contracts/examples/bonding-curve-contract/wasm/Cargo.lock
+++ b/contracts/examples/bonding-curve-contract/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 @@ dependencies = [
  "multiversx-sc-wasm-adapter",
 ]
 
-[[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"
@@ -90,10 +56,9 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "bitflags",
- "hashbrown",
  "hex-literal",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
@@ -120,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -131,14 +96,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -161,26 +126,20 @@ 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"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
+checksum = "907a61bd0f64c2f29cd1cf1dc34d05176426a3f504a78010f08416ddb7b13708"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
@@ -203,9 +162,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "2.0.41"
+version = "2.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -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/examples/check-pause/wasm/Cargo.lock b/contracts/examples/check-pause/wasm/Cargo.lock
index 21a5c737dd..d3ca59018b 100644
--- a/contracts/examples/check-pause/wasm/Cargo.lock
+++ b/contracts/examples/check-pause/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"
@@ -38,12 +20,6 @@ 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 = "check-pause"
 version = "0.0.0"
@@ -66,16 +42,6 @@ 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"
@@ -90,10 +56,9 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "bitflags",
- "hashbrown",
  "hex-literal",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
@@ -120,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -131,14 +96,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -161,26 +126,20 @@ 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"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
+checksum = "907a61bd0f64c2f29cd1cf1dc34d05176426a3f504a78010f08416ddb7b13708"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
@@ -203,9 +162,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "2.0.41"
+version = "2.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -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/examples/crowdfunding-esdt/wasm/Cargo.lock b/contracts/examples/crowdfunding-esdt/wasm/Cargo.lock
index c1ab00b824..f60ea5da26 100644
--- a/contracts/examples/crowdfunding-esdt/wasm/Cargo.lock
+++ b/contracts/examples/crowdfunding-esdt/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"
@@ -38,12 +20,6 @@ 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 = "crowdfunding-esdt"
 version = "0.0.0"
@@ -65,16 +41,6 @@ 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"
@@ -89,10 +55,9 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "bitflags",
- "hashbrown",
  "hex-literal",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
@@ -119,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -130,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -153,26 +118,20 @@ 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"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
+checksum = "907a61bd0f64c2f29cd1cf1dc34d05176426a3f504a78010f08416ddb7b13708"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
@@ -195,9 +154,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "2.0.41"
+version = "2.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -209,29 +168,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/examples/crypto-bubbles/wasm/Cargo.lock b/contracts/examples/crypto-bubbles/wasm/Cargo.lock
index 65d36c5e62..c330459913 100755
--- a/contracts/examples/crypto-bubbles/wasm/Cargo.lock
+++ b/contracts/examples/crypto-bubbles/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"
@@ -38,12 +20,6 @@ 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 = "crypto-bubbles"
 version = "0.0.0"
@@ -65,16 +41,6 @@ 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"
@@ -89,10 +55,9 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "bitflags",
- "hashbrown",
  "hex-literal",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
@@ -119,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -130,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -153,26 +118,20 @@ 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"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
+checksum = "907a61bd0f64c2f29cd1cf1dc34d05176426a3f504a78010f08416ddb7b13708"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
@@ -195,9 +154,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "2.0.41"
+version = "2.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -209,29 +168,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/examples/crypto-kitties/kitty-auction/wasm/Cargo.lock b/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.lock
index c42bb11e81..43fc44ce4a 100755
--- a/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.lock
+++ b/contracts/examples/crypto-kitties/kitty-auction/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"
@@ -38,28 +20,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"
@@ -118,10 +84,9 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "bitflags",
- "hashbrown",
  "hex-literal",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
@@ -148,7 +113,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -159,7 +124,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -182,26 +147,20 @@ 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"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
+checksum = "907a61bd0f64c2f29cd1cf1dc34d05176426a3f504a78010f08416ddb7b13708"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
@@ -231,9 +190,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "2.0.41"
+version = "2.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -245,29 +204,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/examples/crypto-kitties/kitty-genetic-alg/wasm/Cargo.lock b/contracts/examples/crypto-kitties/kitty-genetic-alg/wasm/Cargo.lock
index 25481f9670..4b4ca68f36 100755
--- a/contracts/examples/crypto-kitties/kitty-genetic-alg/wasm/Cargo.lock
+++ b/contracts/examples/crypto-kitties/kitty-genetic-alg/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"
@@ -38,28 +20,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"
@@ -99,10 +65,9 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "bitflags",
- "hashbrown",
  "hex-literal",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
@@ -129,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -140,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -163,26 +128,20 @@ 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"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
+checksum = "907a61bd0f64c2f29cd1cf1dc34d05176426a3f504a78010f08416ddb7b13708"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
@@ -212,9 +171,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "2.0.41"
+version = "2.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -226,29 +185,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/examples/crypto-kitties/kitty-ownership/wasm/Cargo.lock b/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.lock
index d70e00ff12..2421c43d25 100755
--- a/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.lock
+++ b/contracts/examples/crypto-kitties/kitty-ownership/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"
@@ -38,28 +20,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"
@@ -109,10 +75,9 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "bitflags",
- "hashbrown",
  "hex-literal",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
@@ -139,7 +104,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -150,7 +115,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -173,26 +138,20 @@ 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"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
+checksum = "907a61bd0f64c2f29cd1cf1dc34d05176426a3f504a78010f08416ddb7b13708"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
@@ -222,9 +181,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "2.0.41"
+version = "2.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -236,29 +195,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/examples/crypto-zombies/wasm/Cargo.lock b/contracts/examples/crypto-zombies/wasm/Cargo.lock
index f02c01f3e9..1b66c359ca 100755
--- a/contracts/examples/crypto-zombies/wasm/Cargo.lock
+++ b/contracts/examples/crypto-zombies/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"
@@ -38,12 +20,6 @@ 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 = "crypto-zombies"
 version = "0.0.0"
@@ -65,16 +41,6 @@ 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"
@@ -89,10 +55,9 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "bitflags",
- "hashbrown",
  "hex-literal",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
@@ -119,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -130,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -153,26 +118,20 @@ 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"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
+checksum = "907a61bd0f64c2f29cd1cf1dc34d05176426a3f504a78010f08416ddb7b13708"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
@@ -195,9 +154,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "2.0.41"
+version = "2.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -209,29 +168,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/examples/digital-cash/wasm/Cargo.lock b/contracts/examples/digital-cash/wasm/Cargo.lock
index 4841e17292..1e664ecbfe 100644
--- a/contracts/examples/digital-cash/wasm/Cargo.lock
+++ b/contracts/examples/digital-cash/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"
@@ -38,12 +20,6 @@ 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 = "digital-cash"
 version = "0.0.0"
@@ -65,16 +41,6 @@ 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"
@@ -89,10 +55,9 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "bitflags",
- "hashbrown",
  "hex-literal",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
@@ -119,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -130,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -153,26 +118,20 @@ 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"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
+checksum = "907a61bd0f64c2f29cd1cf1dc34d05176426a3f504a78010f08416ddb7b13708"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
@@ -195,9 +154,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "2.0.41"
+version = "2.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -209,29 +168,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/examples/empty/wasm/Cargo.lock b/contracts/examples/empty/wasm/Cargo.lock
index 43f8b304a3..07a104e2ca 100755
--- a/contracts/examples/empty/wasm/Cargo.lock
+++ b/contracts/examples/empty/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"
@@ -38,12 +20,6 @@ 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 = "empty"
 version = "0.0.0"
@@ -65,16 +41,6 @@ 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"
@@ -89,10 +55,9 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "bitflags",
- "hashbrown",
  "hex-literal",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
@@ -119,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -130,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -153,26 +118,20 @@ 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"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
+checksum = "907a61bd0f64c2f29cd1cf1dc34d05176426a3f504a78010f08416ddb7b13708"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
@@ -195,9 +154,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "2.0.41"
+version = "2.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -209,29 +168,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/examples/esdt-transfer-with-fee/wasm/Cargo.lock b/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.lock
index 8363c8eff2..d0a983bc5e 100644
--- a/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.lock
+++ b/contracts/examples/esdt-transfer-with-fee/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"
@@ -38,12 +20,6 @@ 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"
@@ -65,16 +41,6 @@ dependencies = [
  "multiversx-sc-wasm-adapter",
 ]
 
-[[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"
@@ -89,10 +55,9 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "bitflags",
- "hashbrown",
  "hex-literal",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
@@ -119,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -130,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -153,26 +118,20 @@ 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"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
+checksum = "907a61bd0f64c2f29cd1cf1dc34d05176426a3f504a78010f08416ddb7b13708"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
@@ -195,9 +154,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "2.0.41"
+version = "2.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -209,29 +168,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/examples/factorial/wasm/Cargo.lock b/contracts/examples/factorial/wasm/Cargo.lock
index 3ef3f314c6..7c900b9bbb 100755
--- a/contracts/examples/factorial/wasm/Cargo.lock
+++ b/contracts/examples/factorial/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"
@@ -38,12 +20,6 @@ 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"
@@ -65,16 +41,6 @@ dependencies = [
  "multiversx-sc-wasm-adapter",
 ]
 
-[[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"
@@ -89,10 +55,9 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "bitflags",
- "hashbrown",
  "hex-literal",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
@@ -119,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -130,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -153,26 +118,20 @@ 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"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
+checksum = "907a61bd0f64c2f29cd1cf1dc34d05176426a3f504a78010f08416ddb7b13708"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
@@ -195,9 +154,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "2.0.41"
+version = "2.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -209,29 +168,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/examples/fractional-nfts/wasm/Cargo.lock b/contracts/examples/fractional-nfts/wasm/Cargo.lock
index 007aa9d1fa..7bc5f90bd8 100644
--- a/contracts/examples/fractional-nfts/wasm/Cargo.lock
+++ b/contracts/examples/fractional-nfts/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"
@@ -38,12 +20,6 @@ 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"
@@ -66,16 +42,6 @@ dependencies = [
  "multiversx-sc-wasm-adapter",
 ]
 
-[[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"
@@ -90,10 +56,9 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "bitflags",
- "hashbrown",
  "hex-literal",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
@@ -120,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -131,14 +96,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -161,26 +126,20 @@ 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"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
+checksum = "907a61bd0f64c2f29cd1cf1dc34d05176426a3f504a78010f08416ddb7b13708"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
@@ -203,9 +162,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "2.0.41"
+version = "2.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -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/examples/lottery-esdt/wasm/Cargo.lock b/contracts/examples/lottery-esdt/wasm/Cargo.lock
index 64cb0b10dc..731ecb8789 100755
--- a/contracts/examples/lottery-esdt/wasm/Cargo.lock
+++ b/contracts/examples/lottery-esdt/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"
@@ -38,28 +20,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"
@@ -89,10 +55,9 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "bitflags",
- "hashbrown",
  "hex-literal",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
@@ -119,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -130,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -153,26 +118,20 @@ 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"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
+checksum = "907a61bd0f64c2f29cd1cf1dc34d05176426a3f504a78010f08416ddb7b13708"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
@@ -195,9 +154,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "2.0.41"
+version = "2.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -209,29 +168,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/examples/multisig/wasm-multisig-full/Cargo.lock b/contracts/examples/multisig/wasm-multisig-full/Cargo.lock
index 61b961d909..34a4c491bb 100644
--- a/contracts/examples/multisig/wasm-multisig-full/Cargo.lock
+++ b/contracts/examples/multisig/wasm-multisig-full/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"
@@ -38,28 +20,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"
@@ -90,10 +56,9 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "bitflags",
- "hashbrown",
  "hex-literal",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
@@ -120,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -131,14 +96,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -161,26 +126,20 @@ 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"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
+checksum = "907a61bd0f64c2f29cd1cf1dc34d05176426a3f504a78010f08416ddb7b13708"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
@@ -203,9 +162,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "2.0.41"
+version = "2.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -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/examples/multisig/wasm-multisig-view/Cargo.lock b/contracts/examples/multisig/wasm-multisig-view/Cargo.lock
index 8c38f2f1d6..19dc24f2f8 100644
--- a/contracts/examples/multisig/wasm-multisig-view/Cargo.lock
+++ b/contracts/examples/multisig/wasm-multisig-view/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"
@@ -38,28 +20,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"
@@ -90,10 +56,9 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "bitflags",
- "hashbrown",
  "hex-literal",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
@@ -120,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -131,14 +96,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -161,26 +126,20 @@ 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"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
+checksum = "907a61bd0f64c2f29cd1cf1dc34d05176426a3f504a78010f08416ddb7b13708"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
@@ -203,9 +162,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "2.0.41"
+version = "2.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -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/examples/multisig/wasm/Cargo.lock b/contracts/examples/multisig/wasm/Cargo.lock
index 93d7a27bd7..9b8243c2f0 100755
--- a/contracts/examples/multisig/wasm/Cargo.lock
+++ b/contracts/examples/multisig/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"
@@ -38,28 +20,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"
@@ -90,10 +56,9 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "bitflags",
- "hashbrown",
  "hex-literal",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
@@ -120,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -131,14 +96,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -161,26 +126,20 @@ 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"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
+checksum = "907a61bd0f64c2f29cd1cf1dc34d05176426a3f504a78010f08416ddb7b13708"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
@@ -203,9 +162,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "2.0.41"
+version = "2.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -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/examples/nft-minter/wasm/Cargo.lock b/contracts/examples/nft-minter/wasm/Cargo.lock
index 4754c03894..35c8e0b197 100644
--- a/contracts/examples/nft-minter/wasm/Cargo.lock
+++ b/contracts/examples/nft-minter/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"
@@ -38,28 +20,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"
@@ -74,10 +40,9 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "bitflags",
- "hashbrown",
  "hex-literal",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
@@ -104,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -115,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -153,26 +118,20 @@ 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"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
+checksum = "907a61bd0f64c2f29cd1cf1dc34d05176426a3f504a78010f08416ddb7b13708"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
@@ -195,9 +154,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "2.0.41"
+version = "2.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -209,29 +168,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/examples/nft-storage-prepay/wasm/Cargo.lock b/contracts/examples/nft-storage-prepay/wasm/Cargo.lock
index e254199fbd..29d629ebdb 100755
--- a/contracts/examples/nft-storage-prepay/wasm/Cargo.lock
+++ b/contracts/examples/nft-storage-prepay/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"
@@ -38,28 +20,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"
@@ -74,10 +40,9 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "bitflags",
- "hashbrown",
  "hex-literal",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
@@ -104,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -115,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -153,26 +118,20 @@ 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"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
+checksum = "907a61bd0f64c2f29cd1cf1dc34d05176426a3f504a78010f08416ddb7b13708"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
@@ -195,9 +154,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "2.0.41"
+version = "2.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -209,29 +168,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/examples/nft-subscription/wasm/Cargo.lock b/contracts/examples/nft-subscription/wasm/Cargo.lock
index d658685e6e..ccf6c5e372 100644
--- a/contracts/examples/nft-subscription/wasm/Cargo.lock
+++ b/contracts/examples/nft-subscription/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"
@@ -38,28 +20,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"
@@ -74,10 +40,9 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "bitflags",
- "hashbrown",
  "hex-literal",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
@@ -104,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -115,14 +80,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -161,26 +126,20 @@ 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"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
+checksum = "907a61bd0f64c2f29cd1cf1dc34d05176426a3f504a78010f08416ddb7b13708"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
@@ -203,9 +162,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "2.0.41"
+version = "2.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -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/examples/order-book/factory/wasm/Cargo.lock b/contracts/examples/order-book/factory/wasm/Cargo.lock
index 451bcf63d7..a5a8f7ac19 100644
--- a/contracts/examples/order-book/factory/wasm/Cargo.lock
+++ b/contracts/examples/order-book/factory/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"
@@ -38,28 +20,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"
@@ -74,10 +40,9 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "bitflags",
- "hashbrown",
  "hex-literal",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
@@ -104,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -115,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -138,12 +103,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 = "order-book-factory"
 version = "0.0.0"
@@ -161,18 +120,18 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.70"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
+checksum = "907a61bd0f64c2f29cd1cf1dc34d05176426a3f504a78010f08416ddb7b13708"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
@@ -195,9 +154,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "2.0.41"
+version = "2.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -209,29 +168,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/examples/order-book/pair/wasm/Cargo.lock b/contracts/examples/order-book/pair/wasm/Cargo.lock
index fe0574a9a5..80f51ad0d3 100644
--- a/contracts/examples/order-book/pair/wasm/Cargo.lock
+++ b/contracts/examples/order-book/pair/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"
@@ -38,28 +20,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"
@@ -74,10 +40,9 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "bitflags",
- "hashbrown",
  "hex-literal",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
@@ -104,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -115,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -138,12 +103,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 = "order-book-pair"
 version = "0.0.0"
@@ -161,18 +120,18 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.70"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
+checksum = "907a61bd0f64c2f29cd1cf1dc34d05176426a3f504a78010f08416ddb7b13708"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
@@ -195,9 +154,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "2.0.41"
+version = "2.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -209,29 +168,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/examples/ping-pong-egld/wasm/Cargo.lock b/contracts/examples/ping-pong-egld/wasm/Cargo.lock
index 7b6021ab6d..c38022f42c 100755
--- a/contracts/examples/ping-pong-egld/wasm/Cargo.lock
+++ b/contracts/examples/ping-pong-egld/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"
@@ -38,28 +20,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"
@@ -74,10 +40,9 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "bitflags",
- "hashbrown",
  "hex-literal",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
@@ -104,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -115,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -138,12 +103,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 = "ping-pong-egld"
 version = "0.0.2"
@@ -161,18 +120,18 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.70"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
+checksum = "907a61bd0f64c2f29cd1cf1dc34d05176426a3f504a78010f08416ddb7b13708"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
@@ -195,9 +154,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "2.0.41"
+version = "2.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -209,29 +168,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/examples/proxy-pause/wasm/Cargo.lock b/contracts/examples/proxy-pause/wasm/Cargo.lock
index f928799b5b..0f9fe1c73c 100644
--- a/contracts/examples/proxy-pause/wasm/Cargo.lock
+++ b/contracts/examples/proxy-pause/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"
@@ -38,28 +20,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"
@@ -74,10 +40,9 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "bitflags",
- "hashbrown",
  "hex-literal",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
@@ -104,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -115,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -138,17 +103,11 @@ 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"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
+checksum = "907a61bd0f64c2f29cd1cf1dc34d05176426a3f504a78010f08416ddb7b13708"
 dependencies = [
  "unicode-ident",
 ]
@@ -170,9 +129,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
@@ -195,9 +154,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "2.0.41"
+version = "2.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -209,29 +168,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/examples/rewards-distribution/wasm/Cargo.lock b/contracts/examples/rewards-distribution/wasm/Cargo.lock
index 7c2e24c5af..8bb64c5c43 100644
--- a/contracts/examples/rewards-distribution/wasm/Cargo.lock
+++ b/contracts/examples/rewards-distribution/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"
@@ -38,28 +20,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"
@@ -74,10 +40,9 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "bitflags",
- "hashbrown",
  "hex-literal",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
@@ -104,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -115,14 +80,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -145,26 +110,20 @@ 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"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
+checksum = "907a61bd0f64c2f29cd1cf1dc34d05176426a3f504a78010f08416ddb7b13708"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
@@ -203,9 +162,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "2.0.41"
+version = "2.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -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/examples/seed-nft-minter/wasm/Cargo.lock b/contracts/examples/seed-nft-minter/wasm/Cargo.lock
index 36248a7547..8fefd33a6d 100644
--- a/contracts/examples/seed-nft-minter/wasm/Cargo.lock
+++ b/contracts/examples/seed-nft-minter/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"
@@ -38,28 +20,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"
@@ -74,10 +40,9 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "bitflags",
- "hashbrown",
  "hex-literal",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
@@ -104,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -115,14 +80,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -145,26 +110,20 @@ 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"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
+checksum = "907a61bd0f64c2f29cd1cf1dc34d05176426a3f504a78010f08416ddb7b13708"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
@@ -203,9 +162,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "2.0.41"
+version = "2.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -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/examples/token-release/wasm/Cargo.lock b/contracts/examples/token-release/wasm/Cargo.lock
index 312fd04983..c494baf824 100644
--- a/contracts/examples/token-release/wasm/Cargo.lock
+++ b/contracts/examples/token-release/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"
@@ -38,28 +20,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"
@@ -74,10 +40,9 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "bitflags",
- "hashbrown",
  "hex-literal",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
@@ -104,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -115,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -138,26 +103,20 @@ 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"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
+checksum = "907a61bd0f64c2f29cd1cf1dc34d05176426a3f504a78010f08416ddb7b13708"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
@@ -180,9 +139,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "2.0.41"
+version = "2.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -209,29 +168,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/abi-tester/wasm-abi-tester-ev/Cargo.lock b/contracts/feature-tests/abi-tester/wasm-abi-tester-ev/Cargo.lock
index 3263e1d811..44eec18224 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
@@ -17,24 +17,6 @@ dependencies = [
  "multiversx-sc-wasm-adapter",
 ]
 
-[[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"
@@ -53,28 +35,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"
@@ -89,10 +55,9 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "bitflags",
- "hashbrown",
  "hex-literal",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
@@ -119,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -130,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -153,26 +118,20 @@ 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"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
+checksum = "907a61bd0f64c2f29cd1cf1dc34d05176426a3f504a78010f08416ddb7b13708"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
@@ -195,9 +154,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "2.0.41"
+version = "2.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -209,29 +168,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/abi-tester/wasm/Cargo.lock b/contracts/feature-tests/abi-tester/wasm/Cargo.lock
index a366767ec4..703633cd37 100755
--- a/contracts/feature-tests/abi-tester/wasm/Cargo.lock
+++ b/contracts/feature-tests/abi-tester/wasm/Cargo.lock
@@ -17,24 +17,6 @@ dependencies = [
  "multiversx-sc-wasm-adapter",
 ]
 
-[[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"
@@ -53,28 +35,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"
@@ -89,10 +55,9 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "bitflags",
- "hashbrown",
  "hex-literal",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
@@ -119,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -130,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -153,26 +118,20 @@ 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"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
+checksum = "907a61bd0f64c2f29cd1cf1dc34d05176426a3f504a78010f08416ddb7b13708"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
@@ -195,9 +154,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "2.0.41"
+version = "2.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -209,29 +168,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/alloc-features/wasm/Cargo.lock b/contracts/feature-tests/alloc-features/wasm/Cargo.lock
index 1bf718f630..14b5077ae5 100644
--- a/contracts/feature-tests/alloc-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/alloc-features/wasm/Cargo.lock
@@ -2,18 +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 = "alloc-features"
 version = "0.0.0"
@@ -29,12 +17,6 @@ dependencies = [
  "multiversx-sc-wasm-adapter",
 ]
 
-[[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"
@@ -53,28 +35,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"
@@ -89,10 +55,9 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "bitflags",
- "hashbrown",
  "hex-literal",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
@@ -119,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -130,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -153,26 +118,20 @@ 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"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
+checksum = "907a61bd0f64c2f29cd1cf1dc34d05176426a3f504a78010f08416ddb7b13708"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
@@ -195,9 +154,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "2.0.41"
+version = "2.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -209,29 +168,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-basic-features-storage-bytes/Cargo.lock b/contracts/feature-tests/basic-features/wasm-basic-features-storage-bytes/Cargo.lock
index 1a71600472..49b3025615 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"
@@ -90,10 +56,9 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "bitflags",
- "hashbrown",
  "hex-literal",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
@@ -120,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -131,14 +96,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -161,26 +126,20 @@ 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"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
+checksum = "907a61bd0f64c2f29cd1cf1dc34d05176426a3f504a78010f08416ddb7b13708"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
@@ -203,9 +162,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "2.0.41"
+version = "2.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -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..c09ff6c10d 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"
@@ -90,10 +56,9 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "bitflags",
- "hashbrown",
  "hex-literal",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
@@ -120,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -131,14 +96,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -161,26 +126,20 @@ 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"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
+checksum = "907a61bd0f64c2f29cd1cf1dc34d05176426a3f504a78010f08416ddb7b13708"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
@@ -203,9 +162,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "2.0.41"
+version = "2.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -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/big-float-features/wasm/Cargo.lock b/contracts/feature-tests/big-float-features/wasm/Cargo.lock
index f7a615833b..1d60ce2897 100644
--- a/contracts/feature-tests/big-float-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/big-float-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"
@@ -53,28 +35,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"
@@ -89,10 +55,9 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "bitflags",
- "hashbrown",
  "hex-literal",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
@@ -119,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -130,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -153,26 +118,20 @@ 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"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
+checksum = "907a61bd0f64c2f29cd1cf1dc34d05176426a3f504a78010f08416ddb7b13708"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
@@ -195,9 +154,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "2.0.41"
+version = "2.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -209,29 +168,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/composability/builtin-func-features/wasm/Cargo.lock b/contracts/feature-tests/composability/builtin-func-features/wasm/Cargo.lock
index 6084042838..89b5d72d19 100644
--- a/contracts/feature-tests/composability/builtin-func-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/builtin-func-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"
@@ -53,28 +35,12 @@ dependencies = [
  "multiversx-sc-wasm-adapter",
 ]
 
-[[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"
@@ -89,10 +55,9 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "bitflags",
- "hashbrown",
  "hex-literal",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
@@ -119,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -130,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -153,26 +118,20 @@ 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"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
+checksum = "907a61bd0f64c2f29cd1cf1dc34d05176426a3f504a78010f08416ddb7b13708"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
@@ -195,9 +154,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "2.0.41"
+version = "2.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -209,29 +168,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/composability/esdt-contract-pair/first-contract/wasm/Cargo.lock b/contracts/feature-tests/composability/esdt-contract-pair/first-contract/wasm/Cargo.lock
index 5217a79872..74ea616d67 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
@@ -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"
@@ -38,12 +20,6 @@ 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"
@@ -65,16 +41,6 @@ dependencies = [
  "multiversx-sc-wasm-adapter",
 ]
 
-[[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"
@@ -89,10 +55,9 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "bitflags",
- "hashbrown",
  "hex-literal",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
@@ -119,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -130,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -153,26 +118,20 @@ 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"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
+checksum = "907a61bd0f64c2f29cd1cf1dc34d05176426a3f504a78010f08416ddb7b13708"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
@@ -195,9 +154,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "2.0.41"
+version = "2.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -209,29 +168,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/composability/esdt-contract-pair/second-contract/wasm/Cargo.lock b/contracts/feature-tests/composability/esdt-contract-pair/second-contract/wasm/Cargo.lock
index c11813891a..1a69044e83 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
@@ -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"
@@ -38,28 +20,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"
@@ -74,10 +40,9 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "bitflags",
- "hashbrown",
  "hex-literal",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
@@ -104,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -115,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -138,26 +103,20 @@ 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"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
+checksum = "907a61bd0f64c2f29cd1cf1dc34d05176426a3f504a78010f08416ddb7b13708"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
@@ -195,9 +154,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "2.0.41"
+version = "2.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -209,29 +168,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/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 284791d67a..fd461778db 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
@@ -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"
@@ -38,12 +20,6 @@ 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 = "child"
 version = "0.0.0"
@@ -65,16 +41,6 @@ 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"
@@ -89,10 +55,9 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "bitflags",
- "hashbrown",
  "hex-literal",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
@@ -119,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -130,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -153,26 +118,20 @@ 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"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
+checksum = "907a61bd0f64c2f29cd1cf1dc34d05176426a3f504a78010f08416ddb7b13708"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
@@ -195,9 +154,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "2.0.41"
+version = "2.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -209,29 +168,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/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 9b23faa0a8..b7bf51d258 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
@@ -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"
@@ -38,12 +20,6 @@ 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 = "child"
 version = "0.0.0"
@@ -57,16 +33,6 @@ 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"
@@ -81,10 +47,9 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "bitflags",
- "hashbrown",
  "hex-literal",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
@@ -111,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -122,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -145,12 +110,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 = "parent"
 version = "0.0.0"
@@ -169,18 +128,18 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.70"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
+checksum = "907a61bd0f64c2f29cd1cf1dc34d05176426a3f504a78010f08416ddb7b13708"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
@@ -203,9 +162,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "2.0.41"
+version = "2.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -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/composability/forwarder-queue/wasm-forwarder-queue-promises/Cargo.lock b/contracts/feature-tests/composability/forwarder-queue/wasm-forwarder-queue-promises/Cargo.lock
index 485022632a..d54f7ff7d5 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
@@ -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"
@@ -38,12 +20,6 @@ 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"
@@ -66,16 +42,6 @@ dependencies = [
  "multiversx-sc-wasm-adapter",
 ]
 
-[[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"
@@ -90,10 +56,9 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "bitflags",
- "hashbrown",
  "hex-literal",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
@@ -120,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -131,7 +96,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -154,26 +119,20 @@ 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"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
+checksum = "907a61bd0f64c2f29cd1cf1dc34d05176426a3f504a78010f08416ddb7b13708"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
@@ -196,9 +155,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "2.0.41"
+version = "2.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -217,29 +176,3 @@ version = "0.0.0"
 dependencies = [
  "multiversx-sc",
 ]
-
-[[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/composability/forwarder-queue/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock
index b530d6b411..60e00321de 100644
--- a/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/forwarder-queue/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"
@@ -38,12 +20,6 @@ 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"
@@ -66,16 +42,6 @@ dependencies = [
  "multiversx-sc-wasm-adapter",
 ]
 
-[[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"
@@ -90,10 +56,9 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "bitflags",
- "hashbrown",
  "hex-literal",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
@@ -120,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -131,7 +96,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -154,26 +119,20 @@ 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"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
+checksum = "907a61bd0f64c2f29cd1cf1dc34d05176426a3f504a78010f08416ddb7b13708"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
@@ -196,9 +155,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "2.0.41"
+version = "2.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -217,29 +176,3 @@ version = "0.0.0"
 dependencies = [
  "multiversx-sc",
 ]
-
-[[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/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 17fd6449d5..329ddce911 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
@@ -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"
@@ -38,12 +20,6 @@ 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"
@@ -65,16 +41,6 @@ dependencies = [
  "multiversx-sc-wasm-adapter",
 ]
 
-[[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"
@@ -89,10 +55,9 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "bitflags",
- "hashbrown",
  "hex-literal",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
@@ -119,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -130,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -153,26 +118,20 @@ 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"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
+checksum = "907a61bd0f64c2f29cd1cf1dc34d05176426a3f504a78010f08416ddb7b13708"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
@@ -195,9 +154,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "2.0.41"
+version = "2.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -209,29 +168,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/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 cbf4970aed..0c4e2cf748 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
@@ -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"
@@ -38,12 +20,6 @@ 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"
@@ -65,16 +41,6 @@ dependencies = [
  "multiversx-sc-wasm-adapter",
 ]
 
-[[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"
@@ -89,10 +55,9 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "bitflags",
- "hashbrown",
  "hex-literal",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
@@ -119,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -130,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -153,26 +118,20 @@ 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"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
+checksum = "907a61bd0f64c2f29cd1cf1dc34d05176426a3f504a78010f08416ddb7b13708"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
@@ -195,9 +154,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "2.0.41"
+version = "2.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -209,29 +168,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/composability/forwarder-raw/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.lock
index 579c3f25a9..0e1abae5ee 100755
--- a/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/forwarder-raw/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"
@@ -38,12 +20,6 @@ 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"
@@ -65,16 +41,6 @@ dependencies = [
  "multiversx-sc-wasm-adapter",
 ]
 
-[[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"
@@ -89,10 +55,9 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "bitflags",
- "hashbrown",
  "hex-literal",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
@@ -119,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -130,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -153,26 +118,20 @@ 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"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
+checksum = "907a61bd0f64c2f29cd1cf1dc34d05176426a3f504a78010f08416ddb7b13708"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
@@ -195,9 +154,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "2.0.41"
+version = "2.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -209,29 +168,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/composability/forwarder/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock
index 6400b3010e..529a36765f 100755
--- a/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/forwarder/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"
@@ -38,12 +20,6 @@ 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"
@@ -66,16 +42,6 @@ dependencies = [
  "multiversx-sc-wasm-adapter",
 ]
 
-[[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"
@@ -90,10 +56,9 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "bitflags",
- "hashbrown",
  "hex-literal",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
@@ -120,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -131,7 +96,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -154,26 +119,20 @@ 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"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
+checksum = "907a61bd0f64c2f29cd1cf1dc34d05176426a3f504a78010f08416ddb7b13708"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
@@ -196,9 +155,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "2.0.41"
+version = "2.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -217,29 +176,3 @@ version = "0.0.0"
 dependencies = [
  "multiversx-sc",
 ]
-
-[[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/composability/local-esdt-and-nft/wasm/Cargo.lock b/contracts/feature-tests/composability/local-esdt-and-nft/wasm/Cargo.lock
index fffe5c9cb6..fc183b7feb 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
@@ -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"
@@ -38,28 +20,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"
@@ -89,10 +55,9 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "bitflags",
- "hashbrown",
  "hex-literal",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
@@ -119,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -130,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -153,26 +118,20 @@ 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"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
+checksum = "907a61bd0f64c2f29cd1cf1dc34d05176426a3f504a78010f08416ddb7b13708"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
@@ -195,9 +154,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "2.0.41"
+version = "2.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -209,29 +168,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/composability/promises-features/wasm/Cargo.lock b/contracts/feature-tests/composability/promises-features/wasm/Cargo.lock
index 7fd1a45912..b6a7a48b45 100644
--- a/contracts/feature-tests/composability/promises-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/promises-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"
@@ -38,28 +20,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"
@@ -74,10 +40,9 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "bitflags",
- "hashbrown",
  "hex-literal",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
@@ -104,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -115,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -138,17 +103,11 @@ 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"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
+checksum = "907a61bd0f64c2f29cd1cf1dc34d05176426a3f504a78010f08416ddb7b13708"
 dependencies = [
  "unicode-ident",
 ]
@@ -171,9 +130,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
@@ -196,9 +155,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "2.0.41"
+version = "2.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -217,29 +176,3 @@ version = "0.0.0"
 dependencies = [
  "multiversx-sc",
 ]
-
-[[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/composability/proxy-test-first/wasm/Cargo.lock b/contracts/feature-tests/composability/proxy-test-first/wasm/Cargo.lock
index d1490ec6ad..58274960e9 100755
--- a/contracts/feature-tests/composability/proxy-test-first/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/proxy-test-first/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"
@@ -38,28 +20,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"
@@ -74,10 +40,9 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "bitflags",
- "hashbrown",
  "hex-literal",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
@@ -104,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -115,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -138,17 +103,11 @@ 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"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
+checksum = "907a61bd0f64c2f29cd1cf1dc34d05176426a3f504a78010f08416ddb7b13708"
 dependencies = [
  "unicode-ident",
 ]
@@ -171,9 +130,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
@@ -196,9 +155,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "2.0.41"
+version = "2.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -210,29 +169,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/composability/proxy-test-second/wasm/Cargo.lock b/contracts/feature-tests/composability/proxy-test-second/wasm/Cargo.lock
index f02283fb0e..e7a9edc71c 100755
--- a/contracts/feature-tests/composability/proxy-test-second/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/proxy-test-second/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"
@@ -38,28 +20,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"
@@ -74,10 +40,9 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "bitflags",
- "hashbrown",
  "hex-literal",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
@@ -104,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -115,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -138,17 +103,11 @@ 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"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
+checksum = "907a61bd0f64c2f29cd1cf1dc34d05176426a3f504a78010f08416ddb7b13708"
 dependencies = [
  "unicode-ident",
 ]
@@ -170,9 +129,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
@@ -195,9 +154,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "2.0.41"
+version = "2.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -209,29 +168,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/composability/recursive-caller/wasm/Cargo.lock b/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.lock
index c3dc36f878..ecf088cbfa 100755
--- a/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/recursive-caller/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"
@@ -38,28 +20,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"
@@ -74,10 +40,9 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "bitflags",
- "hashbrown",
  "hex-literal",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
@@ -104,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -115,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -138,26 +103,20 @@ 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"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
+checksum = "907a61bd0f64c2f29cd1cf1dc34d05176426a3f504a78010f08416ddb7b13708"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
@@ -196,9 +155,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "2.0.41"
+version = "2.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -217,29 +176,3 @@ version = "0.0.0"
 dependencies = [
  "multiversx-sc",
 ]
-
-[[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/composability/transfer-role-features/wasm/Cargo.lock b/contracts/feature-tests/composability/transfer-role-features/wasm/Cargo.lock
index 5919831cbd..777491b60e 100644
--- a/contracts/feature-tests/composability/transfer-role-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/transfer-role-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"
@@ -38,28 +20,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"
@@ -74,10 +40,9 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "bitflags",
- "hashbrown",
  "hex-literal",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
@@ -104,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -115,14 +80,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -145,26 +110,20 @@ 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"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
+checksum = "907a61bd0f64c2f29cd1cf1dc34d05176426a3f504a78010f08416ddb7b13708"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
@@ -187,9 +146,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "2.0.41"
+version = "2.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -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/composability/vault/wasm-vault-promises/Cargo.lock b/contracts/feature-tests/composability/vault/wasm-vault-promises/Cargo.lock
index 4669986f17..0c9ec11311 100644
--- a/contracts/feature-tests/composability/vault/wasm-vault-promises/Cargo.lock
+++ b/contracts/feature-tests/composability/vault/wasm-vault-promises/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"
@@ -38,28 +20,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"
@@ -74,10 +40,9 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "bitflags",
- "hashbrown",
  "hex-literal",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
@@ -104,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -115,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -138,26 +103,20 @@ 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"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
+checksum = "907a61bd0f64c2f29cd1cf1dc34d05176426a3f504a78010f08416ddb7b13708"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
@@ -180,9 +139,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "2.0.41"
+version = "2.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -209,29 +168,3 @@ dependencies = [
  "multiversx-sc-wasm-adapter",
  "vault",
 ]
-
-[[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/composability/vault/wasm-vault-upgrade/Cargo.lock b/contracts/feature-tests/composability/vault/wasm-vault-upgrade/Cargo.lock
index b3126fba48..fee1a244dd 100644
--- a/contracts/feature-tests/composability/vault/wasm-vault-upgrade/Cargo.lock
+++ b/contracts/feature-tests/composability/vault/wasm-vault-upgrade/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"
@@ -38,28 +20,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"
@@ -74,10 +40,9 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "bitflags",
- "hashbrown",
  "hex-literal",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
@@ -104,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -115,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -138,26 +103,20 @@ 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"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
+checksum = "907a61bd0f64c2f29cd1cf1dc34d05176426a3f504a78010f08416ddb7b13708"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
@@ -180,9 +139,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "2.0.41"
+version = "2.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -209,29 +168,3 @@ dependencies = [
  "multiversx-sc-wasm-adapter",
  "vault",
 ]
-
-[[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/composability/vault/wasm/Cargo.lock b/contracts/feature-tests/composability/vault/wasm/Cargo.lock
index 2e77f9ff9c..a542d8c073 100755
--- a/contracts/feature-tests/composability/vault/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/vault/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"
@@ -38,28 +20,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"
@@ -74,10 +40,9 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "bitflags",
- "hashbrown",
  "hex-literal",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
@@ -104,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -115,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -138,26 +103,20 @@ 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"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
+checksum = "907a61bd0f64c2f29cd1cf1dc34d05176426a3f504a78010f08416ddb7b13708"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
@@ -180,9 +139,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "2.0.41"
+version = "2.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -209,29 +168,3 @@ dependencies = [
  "multiversx-sc-wasm-adapter",
  "vault",
 ]
-
-[[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/erc-style-contracts/crowdfunding-erc20/wasm/Cargo.lock b/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/wasm/Cargo.lock
index f799d981a5..7d74090fae 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
@@ -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"
@@ -38,12 +20,6 @@ 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 = "crowdfunding-erc20"
 version = "0.0.0"
@@ -73,16 +49,6 @@ dependencies = [
  "multiversx-sc",
 ]
 
-[[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"
@@ -97,10 +63,9 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "bitflags",
- "hashbrown",
  "hex-literal",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
@@ -127,7 +92,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -138,7 +103,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -161,26 +126,20 @@ 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"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
+checksum = "907a61bd0f64c2f29cd1cf1dc34d05176426a3f504a78010f08416ddb7b13708"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
@@ -203,9 +162,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "2.0.41"
+version = "2.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -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/erc-style-contracts/erc1155-marketplace/wasm/Cargo.lock b/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/wasm/Cargo.lock
index dfec6d25d2..4d26a1b652 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
@@ -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"
@@ -38,12 +20,6 @@ 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"
@@ -73,16 +49,6 @@ dependencies = [
  "multiversx-sc-wasm-adapter",
 ]
 
-[[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"
@@ -97,10 +63,9 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "bitflags",
- "hashbrown",
  "hex-literal",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
@@ -127,7 +92,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -138,7 +103,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -161,26 +126,20 @@ 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"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
+checksum = "907a61bd0f64c2f29cd1cf1dc34d05176426a3f504a78010f08416ddb7b13708"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
@@ -203,9 +162,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "2.0.41"
+version = "2.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -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/erc-style-contracts/erc1155-user-mock/wasm/Cargo.lock b/contracts/feature-tests/erc-style-contracts/erc1155-user-mock/wasm/Cargo.lock
index 5714090106..e87aa86eef 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
@@ -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"
@@ -38,12 +20,6 @@ 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"
@@ -65,16 +41,6 @@ dependencies = [
  "multiversx-sc-wasm-adapter",
 ]
 
-[[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"
@@ -89,10 +55,9 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "bitflags",
- "hashbrown",
  "hex-literal",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
@@ -119,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -130,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -153,26 +118,20 @@ 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"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
+checksum = "907a61bd0f64c2f29cd1cf1dc34d05176426a3f504a78010f08416ddb7b13708"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
@@ -195,9 +154,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "2.0.41"
+version = "2.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -209,29 +168,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/erc-style-contracts/erc1155/wasm/Cargo.lock b/contracts/feature-tests/erc-style-contracts/erc1155/wasm/Cargo.lock
index d123164d86..f933f3fd5e 100644
--- a/contracts/feature-tests/erc-style-contracts/erc1155/wasm/Cargo.lock
+++ b/contracts/feature-tests/erc-style-contracts/erc1155/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"
@@ -38,12 +20,6 @@ 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"
@@ -65,16 +41,6 @@ dependencies = [
  "multiversx-sc-wasm-adapter",
 ]
 
-[[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"
@@ -89,10 +55,9 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "bitflags",
- "hashbrown",
  "hex-literal",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
@@ -119,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -130,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -153,26 +118,20 @@ 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"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
+checksum = "907a61bd0f64c2f29cd1cf1dc34d05176426a3f504a78010f08416ddb7b13708"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
@@ -195,9 +154,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "2.0.41"
+version = "2.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -209,29 +168,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/erc-style-contracts/erc20/wasm/Cargo.lock b/contracts/feature-tests/erc-style-contracts/erc20/wasm/Cargo.lock
index 90d846c87d..637ca4e1bf 100644
--- a/contracts/feature-tests/erc-style-contracts/erc20/wasm/Cargo.lock
+++ b/contracts/feature-tests/erc-style-contracts/erc20/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"
@@ -38,12 +20,6 @@ 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"
@@ -65,16 +41,6 @@ dependencies = [
  "multiversx-sc-wasm-adapter",
 ]
 
-[[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"
@@ -89,10 +55,9 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "bitflags",
- "hashbrown",
  "hex-literal",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
@@ -119,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -130,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -153,26 +118,20 @@ 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"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
+checksum = "907a61bd0f64c2f29cd1cf1dc34d05176426a3f504a78010f08416ddb7b13708"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
@@ -195,9 +154,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "2.0.41"
+version = "2.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -209,29 +168,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/erc-style-contracts/erc721/wasm/Cargo.lock b/contracts/feature-tests/erc-style-contracts/erc721/wasm/Cargo.lock
index eecbad209d..ce98725ca0 100644
--- a/contracts/feature-tests/erc-style-contracts/erc721/wasm/Cargo.lock
+++ b/contracts/feature-tests/erc-style-contracts/erc721/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"
@@ -38,12 +20,6 @@ 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"
@@ -65,16 +41,6 @@ dependencies = [
  "multiversx-sc-wasm-adapter",
 ]
 
-[[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"
@@ -89,10 +55,9 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "bitflags",
- "hashbrown",
  "hex-literal",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
@@ -119,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -130,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -153,26 +118,20 @@ 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"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
+checksum = "907a61bd0f64c2f29cd1cf1dc34d05176426a3f504a78010f08416ddb7b13708"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
@@ -195,9 +154,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "2.0.41"
+version = "2.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -209,29 +168,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/erc-style-contracts/lottery-erc20/wasm/Cargo.lock b/contracts/feature-tests/erc-style-contracts/lottery-erc20/wasm/Cargo.lock
index 777c70a99a..c6a9ca3b55 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
@@ -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"
@@ -38,12 +20,6 @@ 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"
@@ -57,16 +33,6 @@ dependencies = [
  "multiversx-sc",
 ]
 
-[[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"
@@ -97,10 +63,9 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "bitflags",
- "hashbrown",
  "hex-literal",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
@@ -127,7 +92,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -138,7 +103,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -161,26 +126,20 @@ 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"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
+checksum = "907a61bd0f64c2f29cd1cf1dc34d05176426a3f504a78010f08416ddb7b13708"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
@@ -203,9 +162,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "2.0.41"
+version = "2.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -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/esdt-system-sc-mock/wasm/Cargo.lock b/contracts/feature-tests/esdt-system-sc-mock/wasm/Cargo.lock
index cf3714d7ef..cafffd0911 100644
--- a/contracts/feature-tests/esdt-system-sc-mock/wasm/Cargo.lock
+++ b/contracts/feature-tests/esdt-system-sc-mock/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"
@@ -38,12 +20,6 @@ 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"
@@ -65,16 +41,6 @@ dependencies = [
  "multiversx-sc-wasm-adapter",
 ]
 
-[[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"
@@ -89,10 +55,9 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "bitflags",
- "hashbrown",
  "hex-literal",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
@@ -119,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -130,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -153,26 +118,20 @@ 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"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
+checksum = "907a61bd0f64c2f29cd1cf1dc34d05176426a3f504a78010f08416ddb7b13708"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
@@ -195,9 +154,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "2.0.41"
+version = "2.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -209,29 +168,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/formatted-message-features/wasm/Cargo.lock b/contracts/feature-tests/formatted-message-features/wasm/Cargo.lock
index c0e7684add..0ea2e253d3 100644
--- a/contracts/feature-tests/formatted-message-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/formatted-message-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"
@@ -38,12 +20,6 @@ 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"
@@ -65,16 +41,6 @@ dependencies = [
  "multiversx-sc-wasm-adapter",
 ]
 
-[[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"
@@ -89,10 +55,9 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "bitflags",
- "hashbrown",
  "hex-literal",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
@@ -119,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -130,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -153,26 +118,20 @@ 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"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
+checksum = "907a61bd0f64c2f29cd1cf1dc34d05176426a3f504a78010f08416ddb7b13708"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
@@ -195,9 +154,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "2.0.41"
+version = "2.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -209,29 +168,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/managed-map-features/wasm/Cargo.lock b/contracts/feature-tests/managed-map-features/wasm/Cargo.lock
index f930299567..989ed67040 100644
--- a/contracts/feature-tests/managed-map-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/managed-map-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"
@@ -38,28 +20,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"
@@ -89,10 +55,9 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "bitflags",
- "hashbrown",
  "hex-literal",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
@@ -119,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -130,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -153,26 +118,20 @@ 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"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
+checksum = "907a61bd0f64c2f29cd1cf1dc34d05176426a3f504a78010f08416ddb7b13708"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
@@ -195,9 +154,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "2.0.41"
+version = "2.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -209,29 +168,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/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 44bcbbd746..aa5eba60ce 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
@@ -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"
@@ -38,28 +20,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"
@@ -89,10 +55,9 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "bitflags",
- "hashbrown",
  "hex-literal",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
@@ -119,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -130,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -153,26 +118,20 @@ 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"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
+checksum = "907a61bd0f64c2f29cd1cf1dc34d05176426a3f504a78010f08416ddb7b13708"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
@@ -195,9 +154,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "2.0.41"
+version = "2.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -209,29 +168,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/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 e6af798ecc..d23c61c0da 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
@@ -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"
@@ -38,28 +20,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"
@@ -89,10 +55,9 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "bitflags",
- "hashbrown",
  "hex-literal",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
@@ -119,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -130,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -153,26 +118,20 @@ 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"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
+checksum = "907a61bd0f64c2f29cd1cf1dc34d05176426a3f504a78010f08416ddb7b13708"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
@@ -195,9 +154,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "2.0.41"
+version = "2.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -209,29 +168,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/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 e34bbb2216..a99bdf9c44 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
@@ -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"
@@ -38,28 +20,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"
@@ -89,10 +55,9 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "bitflags",
- "hashbrown",
  "hex-literal",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
@@ -119,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -130,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -153,26 +118,20 @@ 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"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
+checksum = "907a61bd0f64c2f29cd1cf1dc34d05176426a3f504a78010f08416ddb7b13708"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
@@ -195,9 +154,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "2.0.41"
+version = "2.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -209,29 +168,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/multi-contract-features/wasm/Cargo.lock b/contracts/feature-tests/multi-contract-features/wasm/Cargo.lock
index 3a97b53282..4fa79ed219 100755
--- a/contracts/feature-tests/multi-contract-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/multi-contract-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"
@@ -38,28 +20,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"
@@ -89,10 +55,9 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "bitflags",
- "hashbrown",
  "hex-literal",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
@@ -119,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -130,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -153,26 +118,20 @@ 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"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
+checksum = "907a61bd0f64c2f29cd1cf1dc34d05176426a3f504a78010f08416ddb7b13708"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
@@ -195,9 +154,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "2.0.41"
+version = "2.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -209,29 +168,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/panic-message-features/wasm/Cargo.lock b/contracts/feature-tests/panic-message-features/wasm/Cargo.lock
index 6e4cf5e40c..81c7d2923b 100755
--- a/contracts/feature-tests/panic-message-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/panic-message-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"
@@ -38,28 +20,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"
@@ -74,10 +40,9 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "bitflags",
- "hashbrown",
  "hex-literal",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
@@ -104,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -115,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -138,12 +103,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 = "panic-message-features"
 version = "0.0.0"
@@ -161,18 +120,18 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.70"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
+checksum = "907a61bd0f64c2f29cd1cf1dc34d05176426a3f504a78010f08416ddb7b13708"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
@@ -195,9 +154,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "2.0.41"
+version = "2.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -209,29 +168,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/payable-features/wasm/Cargo.lock b/contracts/feature-tests/payable-features/wasm/Cargo.lock
index 8720ec1216..b52f28f509 100755
--- a/contracts/feature-tests/payable-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/payable-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"
@@ -38,28 +20,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"
@@ -74,10 +40,9 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "bitflags",
- "hashbrown",
  "hex-literal",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
@@ -104,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -115,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -138,12 +103,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 = "payable-features"
 version = "0.0.0"
@@ -161,18 +120,18 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.70"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
+checksum = "907a61bd0f64c2f29cd1cf1dc34d05176426a3f504a78010f08416ddb7b13708"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
@@ -195,9 +154,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "2.0.41"
+version = "2.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -209,29 +168,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/rust-snippets-generator-test/wasm/Cargo.lock b/contracts/feature-tests/rust-snippets-generator-test/wasm/Cargo.lock
index e97356cc67..f5493e460b 100644
--- a/contracts/feature-tests/rust-snippets-generator-test/wasm/Cargo.lock
+++ b/contracts/feature-tests/rust-snippets-generator-test/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"
@@ -38,28 +20,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"
@@ -74,10 +40,9 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "bitflags",
- "hashbrown",
  "hex-literal",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
@@ -104,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -115,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -138,26 +103,20 @@ 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"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
+checksum = "907a61bd0f64c2f29cd1cf1dc34d05176426a3f504a78010f08416ddb7b13708"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
@@ -195,9 +154,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "2.0.41"
+version = "2.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -209,29 +168,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/rust-testing-framework-tester/wasm/Cargo.lock b/contracts/feature-tests/rust-testing-framework-tester/wasm/Cargo.lock
index 1153cfc396..f5cd720715 100644
--- a/contracts/feature-tests/rust-testing-framework-tester/wasm/Cargo.lock
+++ b/contracts/feature-tests/rust-testing-framework-tester/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"
@@ -38,28 +20,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"
@@ -74,10 +40,9 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "bitflags",
- "hashbrown",
  "hex-literal",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
@@ -104,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -115,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -138,26 +103,20 @@ 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"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
+checksum = "907a61bd0f64c2f29cd1cf1dc34d05176426a3f504a78010f08416ddb7b13708"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
@@ -195,9 +154,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "2.0.41"
+version = "2.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -209,29 +168,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/use-module/wasm-use-module-view/Cargo.lock b/contracts/feature-tests/use-module/wasm-use-module-view/Cargo.lock
index 8f19cb5289..9d0c10ba92 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
@@ -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"
@@ -38,28 +20,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"
@@ -74,10 +40,9 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "bitflags",
- "hashbrown",
  "hex-literal",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
@@ -104,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -115,14 +80,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -145,26 +110,20 @@ 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"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
+checksum = "907a61bd0f64c2f29cd1cf1dc34d05176426a3f504a78010f08416ddb7b13708"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
@@ -187,9 +146,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "2.0.41"
+version = "2.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -217,29 +176,3 @@ dependencies = [
  "multiversx-sc-wasm-adapter",
  "use-module",
 ]
-
-[[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/use-module/wasm/Cargo.lock b/contracts/feature-tests/use-module/wasm/Cargo.lock
index 1d1012fa02..1887025b85 100644
--- a/contracts/feature-tests/use-module/wasm/Cargo.lock
+++ b/contracts/feature-tests/use-module/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"
@@ -38,28 +20,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"
@@ -74,10 +40,9 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "bitflags",
- "hashbrown",
  "hex-literal",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
@@ -104,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -115,14 +80,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -145,26 +110,20 @@ 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"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
+checksum = "907a61bd0f64c2f29cd1cf1dc34d05176426a3f504a78010f08416ddb7b13708"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
@@ -187,9 +146,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "syn"
-version = "2.0.41"
+version = "2.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -217,29 +176,3 @@ dependencies = [
  "multiversx-sc-wasm-adapter",
  "use-module",
 ]
-
-[[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",
-]

From 014c738f0cd175f3fe9098ffcedb21e0c07bb025 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Fri, 5 Jan 2024 18:13:51 +0200
Subject: [PATCH 0192/1254] 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<Ordering> {
+        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 e4c63be2e8e857474581860cee0370c5d7b98f5c Mon Sep 17 00:00:00 2001
From: Fusee <quentus123@orange.fr>
Date: Mon, 8 Jan 2024 16:05:28 +0100
Subject: [PATCH 0193/1254] fixed the process_new_issued_token_identifier
 function and added tests to it

---
 .../scenario/model/transaction/tx_response.rs | 1206 ++++++++++++++++-
 1 file changed, 1192 insertions(+), 14 deletions(-)

diff --git a/framework/scenario/src/scenario/model/transaction/tx_response.rs b/framework/scenario/src/scenario/model/transaction/tx_response.rs
index ef9891b4f2..14cdc7cd9e 100644
--- a/framework/scenario/src/scenario/model/transaction/tx_response.rs
+++ b/framework/scenario/src/scenario/model/transaction/tx_response.rs
@@ -173,23 +173,41 @@ impl TxResponse {
     }
 
     fn process_new_issued_token_identifier(mut self) -> Self {
-        let token_identifier_issue_scr: Option<&ApiSmartContractResult> = self
-            .api_scrs
-            .iter()
-            .find(|scr| scr.sender.to_string() == SYSTEM_SC_BECH32 && scr.data.starts_with("@00@"));
+        for scr in self.api_scrs.iter() {
+            if scr.sender.to_string() != SYSTEM_SC_BECH32 {
+                continue
+            }
 
-        if token_identifier_issue_scr.is_none() {
-            return self;
-        }
+            let Some(prev_tx) = self.api_scrs.iter().find(|e| e.hash == scr.prev_tx_hash) else {
+                continue
+            };
 
-        let token_identifier_issue_scr = token_identifier_issue_scr.unwrap();
-        let encoded_tid = token_identifier_issue_scr.data.split('@').nth(2);
-        if encoded_tid.is_none() {
-            return self;
-        }
+            let is_issue_fungible = prev_tx.data.starts_with("issue@");
+            let is_issue_semi_fungible = prev_tx.data.starts_with("issueSemiFungible@");
+            let is_issue_non_fungible = prev_tx.data.starts_with("issueNonFungible@");
+            let is_register_meta_esdt = prev_tx.data.starts_with("registerMetaESDT@");
 
-        self.new_issued_token_identifier =
-            Some(String::from_utf8(hex::decode(encoded_tid.unwrap()).unwrap()).unwrap());
+            if !is_issue_fungible && !is_issue_semi_fungible && !is_issue_non_fungible && !is_register_meta_esdt {
+                continue
+            }
+
+            if scr.data.starts_with("ESDTTransfer@") {
+                let encoded_tid = scr.data.split('@').nth(1);
+                if encoded_tid.is_none() {
+                    return self;
+                }
+
+                self.new_issued_token_identifier = Some(String::from_utf8(hex::decode(encoded_tid.unwrap()).unwrap()).unwrap());
+            } else if scr.data.starts_with("@00@") {
+                let encoded_tid = scr.data.split('@').nth(2);
+                if encoded_tid.is_none() {
+                    return self;
+                }
+
+                self.new_issued_token_identifier =
+                    Some(String::from_utf8(hex::decode(encoded_tid.unwrap()).unwrap()).unwrap());
+            }
+        }
 
         self
     }
@@ -1032,4 +1050,1164 @@ mod tests {
 
         assert_eq!(tx_response.out, expected)
     }
+
+    #[test]
+    fn test_process_issued_token_identifier_fungible() {
+        let data = r#"
+        {
+  "data": {
+    "transaction": {
+      "type": "normal",
+      "processingTypeOnSource": "SCInvoking",
+      "processingTypeOnDestination": "SCInvoking",
+      "hash": "b78170cc5ca5ba441ea46fe84540db9610ccab243ccd4cd3cd976e170c4864c8",
+      "nonce": 61,
+      "round": 173598,
+      "epoch": 72,
+      "value": "50000000000000000",
+      "receiver": "erd1qqqqqqqqqqqqqpgqa7hv0nahgsl8tz0psat46x0tchm0wuyc0n4s6q28ad",
+      "sender": "erd1x39tc3q3nn72ecjnmcz7x0qp09kp97t080x99dgyhx7zh95j0n4szskhlv",
+      "gasPrice": 1000000000,
+      "gasLimit": 100000000,
+      "gasUsed": 100000000,
+      "data": "aXNzdWVMcFRva2VuQDAwMDAwMDAwMDAwMDAwMDAwNTAwMTM5ZWQ3YWU0YWEwMzc5MmU2YmNiMzMyMzk0YTQwZmU3NDZlZWZhNDdjZWJANDU0NzRjNDQ0ZDQ1NTg0YzUwQDQ1NDc0YzQ0NGQ0NTU4",
+      "signature": "b5049d2906adc1305a6a8d0f42749254ca6259c6996d9a35e7dc7528b3c87b48a421879aff70bc6d81483a7559b75e5dcf9be499dcb7d57aa9f25c79ac2ad40d",
+      "sourceShard": 1,
+      "destinationShard": 1,
+      "blockNonce": 173354,
+      "blockHash": "09d85ac264a54e12e7613395211c53fe0ee5a7d3b7111bf5fec1d02794caaacd",
+      "notarizedAtSourceInMetaNonce": 173321,
+      "NotarizedAtSourceInMetaHash": "64a83759da97fe8305cd4cda4b518f2d41ef0a8f3995d264460821edad45e09e",
+      "notarizedAtDestinationInMetaNonce": 173321,
+      "notarizedAtDestinationInMetaHash": "64a83759da97fe8305cd4cda4b518f2d41ef0a8f3995d264460821edad45e09e",
+      "miniblockType": "TxBlock",
+      "miniblockHash": "7f45eee4e35ffc1fbce66b92e4dd2aeae2acb092416aa5aa775b96493256b81d",
+      "hyperblockNonce": 173321,
+      "hyperblockHash": "64a83759da97fe8305cd4cda4b518f2d41ef0a8f3995d264460821edad45e09e",
+      "timestamp": 1695041588,
+      "smartContractResults": [
+        {
+          "hash": "bce3d0dceb0b3e5c8c5780d7da3755c3f7492d551685d493a73bf66ebd36754b",
+          "nonce": 0,
+          "value": 50000000000000000,
+          "receiver": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
+          "sender": "erd1qqqqqqqqqqqqqpgqa7hv0nahgsl8tz0psat46x0tchm0wuyc0n4s6q28ad",
+          "data": "issue@45474c444d45584c50@45474c444d4558@03e8@12@63616e467265657a65@74727565@63616e57697065@74727565@63616e5061757365@74727565@63616e4d696e74@74727565@63616e4275726e@74727565@63616e4368616e67654f776e6572@74727565@63616e55706772616465@74727565@63616e4164645370656369616c526f6c6573@74727565@65ba30",
+          "prevTxHash": "b78170cc5ca5ba441ea46fe84540db9610ccab243ccd4cd3cd976e170c4864c8",
+          "originalTxHash": "b78170cc5ca5ba441ea46fe84540db9610ccab243ccd4cd3cd976e170c4864c8",
+          "gasLimit": 89624222,
+          "gasPrice": 1000000000,
+          "callType": 1,
+          "originalSender": "erd1x39tc3q3nn72ecjnmcz7x0qp09kp97t080x99dgyhx7zh95j0n4szskhlv",
+          "operation": "transfer",
+          "function": "issue"
+        },
+        {
+          "hash": "2a452ff652791d79be5f6933fb583cc5503e876893e54b3b51381a92aa2e904d",
+          "nonce": 0,
+          "value": 0,
+          "receiver": "erd1llllllllllllllllllllllllllllllllllllllllllllllllluqsl6e366",
+          "sender": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
+          "data": "ESDTSetBurnRoleForAll@45474c444d45582d393563366435",
+          "prevTxHash": "bce3d0dceb0b3e5c8c5780d7da3755c3f7492d551685d493a73bf66ebd36754b",
+          "originalTxHash": "b78170cc5ca5ba441ea46fe84540db9610ccab243ccd4cd3cd976e170c4864c8",
+          "gasLimit": 0,
+          "gasPrice": 1000000000,
+          "callType": 0,
+          "logs": {
+            "address": "erd1llllllllllllllllllllllllllllllllllllllllllllllllluqsl6e366",
+            "events": [
+              {
+                "address": "erd1llllllllllllllllllllllllllllllllllllllllllllllllluqsl6e366",
+                "identifier": "completedTxEvent",
+                "topics": [
+                  "vOPQ3OsLPlyMV4DX2jdVw/dJLVUWhdSTpzv2br02dUs="
+                ],
+                "data": null,
+                "additionalData": null
+              }
+            ]
+          },
+          "operation": "transfer"
+        },
+        {
+          "hash": "2c84740ccb3376ea9fa00dab6c6c93fe7a35ee0a1d6dbfa0a1e61064853b0874",
+          "nonce": 0,
+          "value": 0,
+          "receiver": "erd1qqqqqqqqqqqqqpgqa7hv0nahgsl8tz0psat46x0tchm0wuyc0n4s6q28ad",
+          "sender": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
+          "data": "ESDTTransfer@45474c444d45582d393563366435@03e8@00",
+          "prevTxHash": "bce3d0dceb0b3e5c8c5780d7da3755c3f7492d551685d493a73bf66ebd36754b",
+          "originalTxHash": "b78170cc5ca5ba441ea46fe84540db9610ccab243ccd4cd3cd976e170c4864c8",
+          "gasLimit": 39624222,
+          "gasPrice": 1000000000,
+          "callType": 2,
+          "logs": {
+            "address": "erd1qqqqqqqqqqqqqpgqa7hv0nahgsl8tz0psat46x0tchm0wuyc0n4s6q28ad",
+            "events": [
+              {
+                "address": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
+                "identifier": "ESDTTransfer",
+                "topics": [
+                  "RUdMRE1FWC05NWM2ZDU=",
+                  "",
+                  "A+g=",
+                  "AAAAAAAAAAAFAO+ux8+3RD51ieGHV10Z68X293CYfOs="
+                ],
+                "data": null,
+                "additionalData": null
+              },
+              {
+                "address": "erd1qqqqqqqqqqqqqpgqa7hv0nahgsl8tz0psat46x0tchm0wuyc0n4s6q28ad",
+                "identifier": "completedTxEvent",
+                "topics": [
+                  "vOPQ3OsLPlyMV4DX2jdVw/dJLVUWhdSTpzv2br02dUs="
+                ],
+                "data": null,
+                "additionalData": null
+              }
+            ]
+          },
+          "tokens": [
+            "EGLDMEX-95c6d5"
+          ],
+          "esdtValues": [
+            "1000"
+          ],
+          "operation": "ESDTTransfer",
+          "function": "\u0000"
+        },
+        {
+          "hash": "c9dfc4de3c3cee319123087a4f5dd03cc051e728ec6070707a63ea977b535227",
+          "nonce": 0,
+          "value": 0,
+          "receiver": "erd1qqqqqqqqqqqqqpgqa7hv0nahgsl8tz0psat46x0tchm0wuyc0n4s6q28ad",
+          "sender": "erd1qqqqqqqqqqqqqpgqa7hv0nahgsl8tz0psat46x0tchm0wuyc0n4s6q28ad",
+          "data": "\u0000",
+          "prevTxHash": "2c84740ccb3376ea9fa00dab6c6c93fe7a35ee0a1d6dbfa0a1e61064853b0874",
+          "originalTxHash": "b78170cc5ca5ba441ea46fe84540db9610ccab243ccd4cd3cd976e170c4864c8",
+          "gasLimit": 39424222,
+          "gasPrice": 1000000000,
+          "callType": 2,
+          "operation": "transfer",
+          "function": "\u0000"
+        },
+        {
+          "hash": "609c3a8e1903680fef1f6d9e47527b1b5c1259664b868af600162120ce0b8192",
+          "nonce": 1,
+          "value": 300925400000000,
+          "receiver": "erd1qqqqqqqqqqqqqpgqa7hv0nahgsl8tz0psat46x0tchm0wuyc0n4s6q28ad",
+          "sender": "erd1qqqqqqqqqqqqqpgqa7hv0nahgsl8tz0psat46x0tchm0wuyc0n4s6q28ad",
+          "data": "@6f6b",
+          "prevTxHash": "2c84740ccb3376ea9fa00dab6c6c93fe7a35ee0a1d6dbfa0a1e61064853b0874",
+          "originalTxHash": "b78170cc5ca5ba441ea46fe84540db9610ccab243ccd4cd3cd976e170c4864c8",
+          "gasLimit": 0,
+          "gasPrice": 1000000000,
+          "callType": 0,
+          "operation": "transfer",
+          "isRefund": true
+        }
+      ],
+      "logs": {
+        "address": "erd1qqqqqqqqqqqqqpgqa7hv0nahgsl8tz0psat46x0tchm0wuyc0n4s6q28ad",
+        "events": [
+          {
+            "address": "erd1qqqqqqqqqqqqqpgqa7hv0nahgsl8tz0psat46x0tchm0wuyc0n4s6q28ad",
+            "identifier": "transferValueOnly",
+            "topics": [
+              "AAAAAAAAAAAFAO+ux8+3RD51ieGHV10Z68X293CYfOs=",
+              "AAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAC//8=",
+              "saK8LsUAAA=="
+            ],
+            "data": null,
+            "additionalData": null
+          },
+          {
+            "address": "erd1qqqqqqqqqqqqqpgqa7hv0nahgsl8tz0psat46x0tchm0wuyc0n4s6q28ad",
+            "identifier": "writeLog",
+            "topics": [
+              "NEq8RBGc/KziU94F4zwBeWwS+W87zFK1BLm8K5aSfOs="
+            ],
+            "data": "QDZmNmI=",
+            "additionalData": null
+          }
+        ]
+      },
+      "status": "success",
+      "operation": "transfer",
+      "function": "issueLpToken",
+      "initiallyPaidFee": "1214335000000000",
+      "fee": "1214335000000000",
+      "chainID": "D",
+      "version": 2,
+      "options": 0
+    }
+  },
+  "error": "",
+  "code": "successful"
+}
+      "#;
+
+        let tx_on_network: TransactionOnNetwork = serde_json::from_str::<TransactionInfo>(data)
+            .unwrap()
+            .data
+            .unwrap()
+            .transaction;
+        let tx_response = TxResponse::from_network_tx(tx_on_network);
+
+        let expected: Option<String> = Some("EGLDMEX-95c6d5".to_string());
+
+        assert_eq!(tx_response.new_issued_token_identifier, expected)
+
+    }
+
+    #[test]
+    fn test_process_issued_token_identifier_semi_fungible() {
+        let data = r#"
+        {
+  "data": {
+    "transaction": {
+      "type": "normal",
+      "processingTypeOnSource": "SCInvoking",
+      "processingTypeOnDestination": "SCInvoking",
+      "hash": "0634b9c1db9fd6bfa065fc937d51cec37958fd5d33d0c934a0da3d27776a33ae",
+      "nonce": 65,
+      "round": 8422527,
+      "epoch": 584,
+      "value": "50000000000000000",
+      "receiver": "erd1qqqqqqqqqqqqqpgq06w7lq7relxyh2h6xzh98q8x24psf3fqssvqn4ptek",
+      "sender": "erd1x3g000ew7zzv6kyqhj9jl2wy5g6cc72qahvvxz29zv76jwq6ssvqt0d998",
+      "gasPrice": 1000000000,
+      "gasLimit": 80000000,
+      "gasUsed": 80000000,
+      "data": "aXNzdWVUb2tlbkA0NDZmNzA2NTU0NjU3Mzc0QDQ0NGY1MDQ1NTQ0NTUzNTQ=",
+      "signature": "0191848976e930996f6c62d4921e732f9b0ada8b41ca3b5b63d6bfd304fd44c2a1e8e6643479618ba4a764a36e87f53882b4f707600d5b7d476f2fdd2bac040e",
+      "sourceShard": 0,
+      "destinationShard": 0,
+      "blockNonce": 8420241,
+      "blockHash": "4d302220f6015876c95e7961b770cc67f8ab63c5f0ab69b4d6c2fb15c8bc23bd",
+      "notarizedAtSourceInMetaNonce": 8403647,
+      "NotarizedAtSourceInMetaHash": "f8b83b6d38fa45dacc167b15c93dd07ee5c40db906de34f26e11e7a24f539e30",
+      "notarizedAtDestinationInMetaNonce": 8403647,
+      "notarizedAtDestinationInMetaHash": "f8b83b6d38fa45dacc167b15c93dd07ee5c40db906de34f26e11e7a24f539e30",
+      "miniblockType": "TxBlock",
+      "miniblockHash": "b7b8fc9f3b81d7daae1113cbf73457e16ee31f3a864ef3729a1a21f3a929e112",
+      "hyperblockNonce": 8403647,
+      "hyperblockHash": "f8b83b6d38fa45dacc167b15c93dd07ee5c40db906de34f26e11e7a24f539e30",
+      "timestamp": 1646652762,
+      "smartContractResults": [
+        {
+          "hash": "9aecf3bd5dd5c706a28d1cc7059ac20db74340f136816f667dbefcc58daa3aba",
+          "nonce": 0,
+          "value": 50000000000000000,
+          "receiver": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
+          "sender": "erd1qqqqqqqqqqqqqpgq06w7lq7relxyh2h6xzh98q8x24psf3fqssvqn4ptek",
+          "data": "issueSemiFungible@446f706554657374@444f504554455354@63616e467265657a65@74727565@63616e57697065@74727565@63616e5061757365@74727565@63616e4368616e67654f776e6572@74727565@63616e55706772616465@74727565@63616e4164645370656369616c526f6c6573@74727565@5ca148",
+          "prevTxHash": "0634b9c1db9fd6bfa065fc937d51cec37958fd5d33d0c934a0da3d27776a33ae",
+          "originalTxHash": "0634b9c1db9fd6bfa065fc937d51cec37958fd5d33d0c934a0da3d27776a33ae",
+          "gasLimit": 75958360,
+          "gasPrice": 1000000000,
+          "callType": 1,
+          "originalSender": "erd1x3g000ew7zzv6kyqhj9jl2wy5g6cc72qahvvxz29zv76jwq6ssvqt0d998",
+          "operation": "transfer",
+          "function": "issueSemiFungible"
+        },
+        {
+          "hash": "aacfe9088bb9d2d5b3fbe9cab2b2f1c6a7e9cbab2f1a41020e2c819fc9b43570",
+          "nonce": 66,
+          "value": 0,
+          "receiver": "erd1x3g000ew7zzv6kyqhj9jl2wy5g6cc72qahvvxz29zv76jwq6ssvqt0d998",
+          "sender": "erd1qqqqqqqqqqqqqpgq06w7lq7relxyh2h6xzh98q8x24psf3fqssvqn4ptek",
+          "data": "@6f6b",
+          "prevTxHash": "0634b9c1db9fd6bfa065fc937d51cec37958fd5d33d0c934a0da3d27776a33ae",
+          "originalTxHash": "0634b9c1db9fd6bfa065fc937d51cec37958fd5d33d0c934a0da3d27776a33ae",
+          "gasLimit": 0,
+          "gasPrice": 1000000000,
+          "callType": 0,
+          "operation": "transfer"
+        },
+        {
+          "hash": "3f6f0f3de9e942884e7e1592823a7db7ce935a3f9d3359d8c1ee98a5645332d8",
+          "nonce": 0,
+          "value": 0,
+          "receiver": "erd1qqqqqqqqqqqqqpgq06w7lq7relxyh2h6xzh98q8x24psf3fqssvqn4ptek",
+          "sender": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
+          "data": "@00@444f5045544553542d373732303063",
+          "prevTxHash": "9aecf3bd5dd5c706a28d1cc7059ac20db74340f136816f667dbefcc58daa3aba",
+          "originalTxHash": "0634b9c1db9fd6bfa065fc937d51cec37958fd5d33d0c934a0da3d27776a33ae",
+          "gasLimit": 25958360,
+          "gasPrice": 1000000000,
+          "callType": 2,
+          "originalSender": "erd1qqqqqqqqqqqqqpgq06w7lq7relxyh2h6xzh98q8x24psf3fqssvqn4ptek",
+          "logs": {
+            "address": "erd1qqqqqqqqqqqqqpgq06w7lq7relxyh2h6xzh98q8x24psf3fqssvqn4ptek",
+            "events": [
+              {
+                "address": "erd1qqqqqqqqqqqqqpgq06w7lq7relxyh2h6xzh98q8x24psf3fqssvqn4ptek",
+                "identifier": "completedTxEvent",
+                "topics": [
+                  "muzzvV3VxwaijRzHBZrCDbdDQPE2gW9mfb78xY2qOro="
+                ],
+                "data": null
+              }
+            ]
+          },
+          "operation": "transfer"
+        },
+        {
+          "hash": "c6e4f7c5da455009fb4f6967ce8a273a97b826aa617fa798ffd0cf17bde6b97a",
+          "nonce": 1,
+          "value": 225516180000000,
+          "receiver": "erd1qqqqqqqqqqqqqpgq06w7lq7relxyh2h6xzh98q8x24psf3fqssvqn4ptek",
+          "sender": "erd1qqqqqqqqqqqqqpgq06w7lq7relxyh2h6xzh98q8x24psf3fqssvqn4ptek",
+          "data": "@6f6b",
+          "prevTxHash": "3f6f0f3de9e942884e7e1592823a7db7ce935a3f9d3359d8c1ee98a5645332d8",
+          "originalTxHash": "0634b9c1db9fd6bfa065fc937d51cec37958fd5d33d0c934a0da3d27776a33ae",
+          "gasLimit": 0,
+          "gasPrice": 1000000000,
+          "callType": 0,
+          "operation": "transfer",
+          "isRefund": true
+        }
+      ],
+      "logs": {
+        "address": "erd1qqqqqqqqqqqqqpgq06w7lq7relxyh2h6xzh98q8x24psf3fqssvqn4ptek",
+        "events": [
+          {
+            "address": "erd1qqqqqqqqqqqqqpgq06w7lq7relxyh2h6xzh98q8x24psf3fqssvqn4ptek",
+            "identifier": "transferValueOnly",
+            "topics": [
+              "AAAAAAAAAAAFAH6d74PDz8xLqvowrlOA5lVDBMUghBg=",
+              "AAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAC//8=",
+              "saK8LsUAAA=="
+            ],
+            "data": null
+          },
+          {
+            "address": "erd1qqqqqqqqqqqqqpgq06w7lq7relxyh2h6xzh98q8x24psf3fqssvqn4ptek",
+            "identifier": "writeLog",
+            "topics": [
+              "NFD3vy7whM1YgLyLL6nEojWMeUDt2MMJRRM9qTgahBg="
+            ],
+            "data": "QDZmNmI="
+          }
+        ]
+      },
+      "status": "success",
+      "operation": "transfer",
+      "function": "issueToken",
+      "initiallyPaidFee": "914840000000000",
+      "fee": "914840000000000",
+      "chainID": "1",
+      "version": 1,
+      "options": 0
+    }
+  },
+  "error": "",
+  "code": "successful"
+}
+        "#;
+
+        let tx_on_network: TransactionOnNetwork = serde_json::from_str::<TransactionInfo>(data)
+            .unwrap()
+            .data
+            .unwrap()
+            .transaction;
+        let tx_response = TxResponse::from_network_tx(tx_on_network);
+
+        let expected: Option<String> = Some("DOPETEST-77200c".to_string());
+
+        assert_eq!(tx_response.new_issued_token_identifier, expected)
+    }
+
+    #[test]
+    fn test_process_issued_token_identifier_non_fungible() {
+        let data = r#"
+        {
+  "data": {
+    "transaction": {
+      "type": "normal",
+      "processingTypeOnSource": "SCInvoking",
+      "processingTypeOnDestination": "SCInvoking",
+      "hash": "d296186b432d7e7937bde37d725cd52b765ef334c00b95adcb079933bc2277bb",
+      "nonce": 16,
+      "round": 820170,
+      "epoch": 341,
+      "value": "50000000000000000",
+      "receiver": "erd1qqqqqqqqqqqqqpgqmegl4z2rcfhxjv6pn7dm0n4hndllfaam4fdqwqxld8",
+      "sender": "erd162knt53z7m0f9jjms9wxphr3q9d7zu4ky85xs2cc0ekrqz7k4fdq85lkuc",
+      "gasPrice": 1000000000,
+      "gasLimit": 200000000,
+      "gasUsed": 200000000,
+      "data": "aXNzdWVUb2tlbkA2NzY1NmU2NTdhNzk3M0A0NzQ1NGU=",
+      "signature": "e80d45f4de419799a2bbff1cae1235521c8eef1853ee45b02f95c2da74ce50d241bf75b6ab0c650245562700862ea9759caad40f3e381ac0c4d82cfe56e67c09",
+      "sourceShard": 2,
+      "destinationShard": 2,
+      "blockNonce": 819313,
+      "blockHash": "a1db4ef13f07b86678000df9cc78f244d83dcc35ae51de545f333bf616930d39",
+      "notarizedAtSourceInMetaNonce": 819396,
+      "NotarizedAtSourceInMetaHash": "6d9e511e46d318aa5b77cbfdfde14d2ce8515ce4e954b286f130a6b518ddf26a",
+      "notarizedAtDestinationInMetaNonce": 819396,
+      "notarizedAtDestinationInMetaHash": "6d9e511e46d318aa5b77cbfdfde14d2ce8515ce4e954b286f130a6b518ddf26a",
+      "miniblockType": "TxBlock",
+      "miniblockHash": "afdb278522181aeb9b12f08840e6c534e398e6af9c7f757548308e300e7ec4e9",
+      "hyperblockNonce": 819396,
+      "hyperblockHash": "6d9e511e46d318aa5b77cbfdfde14d2ce8515ce4e954b286f130a6b518ddf26a",
+      "timestamp": 1698921020,
+      "smartContractResults": [
+        {
+          "hash": "6fe0cc002802af1744f394eee4a69224b5e775961d8386e04e7a5b9242f7ff65",
+          "nonce": 0,
+          "value": 50000000000000000,
+          "receiver": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
+          "sender": "erd1qqqqqqqqqqqqqpgqmegl4z2rcfhxjv6pn7dm0n4hndllfaam4fdqwqxld8",
+          "data": "issueNonFungible@67656e657a7973@47454e@63616e467265657a65@74727565@63616e57697065@74727565@63616e5061757365@74727565@63616e5472616e736665724e4654437265617465526f6c65@74727565@63616e4368616e67654f776e6572@66616c7365@63616e55706772616465@66616c7365@63616e4164645370656369616c526f6c6573@74727565@5e30e4",
+          "prevTxHash": "d296186b432d7e7937bde37d725cd52b765ef334c00b95adcb079933bc2277bb",
+          "originalTxHash": "d296186b432d7e7937bde37d725cd52b765ef334c00b95adcb079933bc2277bb",
+          "gasLimit": 196098365,
+          "gasPrice": 1000000000,
+          "callType": 1,
+          "originalSender": "erd162knt53z7m0f9jjms9wxphr3q9d7zu4ky85xs2cc0ekrqz7k4fdq85lkuc",
+          "operation": "transfer",
+          "function": "issueNonFungible"
+        },
+        {
+          "hash": "98afe82512c79f1caaf171bd5919ee469d11ba0c4f725aefcab834278c0f1e58",
+          "nonce": 0,
+          "value": 0,
+          "receiver": "erd1lllllllllllllllllllllllllllllllllllllllllllllllllupq9x7ny0",
+          "sender": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
+          "data": "ESDTSetBurnRoleForAll@47454e2d383638353933",
+          "prevTxHash": "6fe0cc002802af1744f394eee4a69224b5e775961d8386e04e7a5b9242f7ff65",
+          "originalTxHash": "d296186b432d7e7937bde37d725cd52b765ef334c00b95adcb079933bc2277bb",
+          "gasLimit": 0,
+          "gasPrice": 1000000000,
+          "callType": 0,
+          "logs": {
+            "address": "erd1lllllllllllllllllllllllllllllllllllllllllllllllllupq9x7ny0",
+            "events": [
+              {
+                "address": "erd1lllllllllllllllllllllllllllllllllllllllllllllllllupq9x7ny0",
+                "identifier": "completedTxEvent",
+                "topics": [
+                  "b+DMACgCrxdE85Tu5KaSJLXndZYdg4bgTnpbkkL3/2U="
+                ],
+                "data": null,
+                "additionalData": null
+              }
+            ]
+          },
+          "operation": "transfer"
+        },
+        {
+          "hash": "83494ad9369738b574a7266cbfb12ce63ccf634950cd6b0ec16107b8fb42f8f6",
+          "nonce": 0,
+          "value": 0,
+          "receiver": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
+          "sender": "erd1qqqqqqqqqqqqqpgqmegl4z2rcfhxjv6pn7dm0n4hndllfaam4fdqwqxld8",
+          "data": "setSpecialRole@47454e2d383638353933@00000000000000000500de51fa8943c26e6933419f9bb7ceb79b7ff4f7bbaa5a@45534454526f6c654e4654437265617465@5e30e4",
+          "prevTxHash": "112d18ec0364b4700b1bfb3df517c80dba547a53373ece2a9e71acd5266e7b64",
+          "originalTxHash": "d296186b432d7e7937bde37d725cd52b765ef334c00b95adcb079933bc2277bb",
+          "gasLimit": 142399698,
+          "gasPrice": 1000000000,
+          "callType": 1,
+          "operation": "transfer",
+          "function": "setSpecialRole"
+        },
+        {
+          "hash": "112d18ec0364b4700b1bfb3df517c80dba547a53373ece2a9e71acd5266e7b64",
+          "nonce": 0,
+          "value": 0,
+          "receiver": "erd1qqqqqqqqqqqqqpgqmegl4z2rcfhxjv6pn7dm0n4hndllfaam4fdqwqxld8",
+          "sender": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
+          "data": "@00@47454e2d383638353933",
+          "prevTxHash": "6fe0cc002802af1744f394eee4a69224b5e775961d8386e04e7a5b9242f7ff65",
+          "originalTxHash": "d296186b432d7e7937bde37d725cd52b765ef334c00b95adcb079933bc2277bb",
+          "gasLimit": 146098365,
+          "gasPrice": 1000000000,
+          "callType": 2,
+          "originalSender": "erd1qqqqqqqqqqqqqpgqmegl4z2rcfhxjv6pn7dm0n4hndllfaam4fdqwqxld8",
+          "logs": {
+            "address": "erd1qqqqqqqqqqqqqpgqmegl4z2rcfhxjv6pn7dm0n4hndllfaam4fdqwqxld8",
+            "events": [
+              {
+                "address": "erd1qqqqqqqqqqqqqpgqmegl4z2rcfhxjv6pn7dm0n4hndllfaam4fdqwqxld8",
+                "identifier": "writeLog",
+                "topics": [
+                  "AAAAAAAAAAAFAN5R+olDwm5pM0Gfm7fOt5t/9Pe7qlo="
+                ],
+                "data": "QDZmNmI=",
+                "additionalData": null
+              }
+            ]
+          },
+          "operation": "transfer"
+        },
+        {
+          "hash": "db5d74970374337956fa61fb4fd90057b3f6a82ea3e259b389934b71a1652e5f",
+          "nonce": 0,
+          "value": 0,
+          "receiver": "erd1qqqqqqqqqqqqqpgqmegl4z2rcfhxjv6pn7dm0n4hndllfaam4fdqwqxld8",
+          "sender": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
+          "data": "ESDTSetRole@47454e2d383638353933@45534454526f6c654e4654437265617465",
+          "prevTxHash": "83494ad9369738b574a7266cbfb12ce63ccf634950cd6b0ec16107b8fb42f8f6",
+          "originalTxHash": "d296186b432d7e7937bde37d725cd52b765ef334c00b95adcb079933bc2277bb",
+          "gasLimit": 0,
+          "gasPrice": 1000000000,
+          "callType": 0,
+          "logs": {
+            "address": "erd1qqqqqqqqqqqqqpgqmegl4z2rcfhxjv6pn7dm0n4hndllfaam4fdqwqxld8",
+            "events": [
+              {
+                "address": "erd1qqqqqqqqqqqqqpgqmegl4z2rcfhxjv6pn7dm0n4hndllfaam4fdqwqxld8",
+                "identifier": "ESDTSetRole",
+                "topics": [
+                  "R0VOLTg2ODU5Mw==",
+                  "",
+                  "",
+                  "RVNEVFJvbGVORlRDcmVhdGU="
+                ],
+                "data": null,
+                "additionalData": null
+              },
+              {
+                "address": "erd1qqqqqqqqqqqqqpgqmegl4z2rcfhxjv6pn7dm0n4hndllfaam4fdqwqxld8",
+                "identifier": "completedTxEvent",
+                "topics": [
+                  "g0lK2TaXOLV0pyZsv7Es5jzPY0lQzWsOwWEHuPtC+PY="
+                ],
+                "data": null,
+                "additionalData": null
+              }
+            ]
+          },
+          "operation": "ESDTSetRole",
+          "function": "ESDTSetRole"
+        },
+        {
+          "hash": "a6a665f47977a59c4c2baf460281fc938e04ae0f87ac2e78040a14ae27822701",
+          "nonce": 0,
+          "value": 0,
+          "receiver": "erd1qqqqqqqqqqqqqpgqmegl4z2rcfhxjv6pn7dm0n4hndllfaam4fdqwqxld8",
+          "sender": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
+          "data": "@00",
+          "prevTxHash": "83494ad9369738b574a7266cbfb12ce63ccf634950cd6b0ec16107b8fb42f8f6",
+          "originalTxHash": "d296186b432d7e7937bde37d725cd52b765ef334c00b95adcb079933bc2277bb",
+          "gasLimit": 92399698,
+          "gasPrice": 1000000000,
+          "callType": 2,
+          "originalSender": "erd1qqqqqqqqqqqqqpgqmegl4z2rcfhxjv6pn7dm0n4hndllfaam4fdqwqxld8",
+          "logs": {
+            "address": "erd1qqqqqqqqqqqqqpgqmegl4z2rcfhxjv6pn7dm0n4hndllfaam4fdqwqxld8",
+            "events": [
+              {
+                "address": "erd1qqqqqqqqqqqqqpgqmegl4z2rcfhxjv6pn7dm0n4hndllfaam4fdqwqxld8",
+                "identifier": "writeLog",
+                "topics": [
+                  "AAAAAAAAAAAFAN5R+olDwm5pM0Gfm7fOt5t/9Pe7qlo=",
+                  "QHRvbyBtdWNoIGdhcyBwcm92aWRlZCBmb3IgcHJvY2Vzc2luZzogZ2FzIHByb3ZpZGVkID0gOTIzOTk2OTgsIGdhcyB1c2VkID0gMzE0MTg4MA=="
+                ],
+                "data": "QDZmNmI=",
+                "additionalData": null
+              },
+              {
+                "address": "erd1qqqqqqqqqqqqqpgqmegl4z2rcfhxjv6pn7dm0n4hndllfaam4fdqwqxld8",
+                "identifier": "completedTxEvent",
+                "topics": [
+                  "g0lK2TaXOLV0pyZsv7Es5jzPY0lQzWsOwWEHuPtC+PY="
+                ],
+                "data": null,
+                "additionalData": null
+              }
+            ]
+          },
+          "operation": "transfer"
+        }
+      ],
+      "logs": {
+        "address": "erd1qqqqqqqqqqqqqpgqmegl4z2rcfhxjv6pn7dm0n4hndllfaam4fdqwqxld8",
+        "events": [
+          {
+            "address": "erd1qqqqqqqqqqqqqpgqmegl4z2rcfhxjv6pn7dm0n4hndllfaam4fdqwqxld8",
+            "identifier": "transferValueOnly",
+            "topics": [
+              "AAAAAAAAAAAFAN5R+olDwm5pM0Gfm7fOt5t/9Pe7qlo=",
+              "AAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAC//8=",
+              "saK8LsUAAA=="
+            ],
+            "data": null,
+            "additionalData": null
+          },
+          {
+            "address": "erd1qqqqqqqqqqqqqpgqmegl4z2rcfhxjv6pn7dm0n4hndllfaam4fdqwqxld8",
+            "identifier": "writeLog",
+            "topics": [
+              "0q010iL23pLKW4FcYNxxAVvhcrYh6GgrGH5sMAvWqlo="
+            ],
+            "data": "QDZmNmI=",
+            "additionalData": null
+          }
+        ]
+      },
+      "status": "success",
+      "operation": "transfer",
+      "function": "issueToken",
+      "initiallyPaidFee": "2097020000000000",
+      "fee": "2097020000000000",
+      "chainID": "D",
+      "version": 1,
+      "options": 0
+    }
+  },
+  "error": "",
+  "code": "successful"
+}
+        "#;
+
+        let tx_on_network: TransactionOnNetwork = serde_json::from_str::<TransactionInfo>(data)
+            .unwrap()
+            .data
+            .unwrap()
+            .transaction;
+        let tx_response = TxResponse::from_network_tx(tx_on_network);
+
+        let expected: Option<String> = Some("GEN-868593".to_string());
+
+        assert_eq!(tx_response.new_issued_token_identifier, expected)
+    }
+
+    #[test]
+    fn test_process_issued_token_identifier_meta_esdt() {
+        let data = r#"
+        {
+  "data": {
+    "transaction": {
+      "type": "normal",
+      "processingTypeOnSource": "SCInvoking",
+      "processingTypeOnDestination": "SCInvoking",
+      "hash": "408433c5db749f4666bee6a8b599944071bf493c43ff5f01282a74c22ea2ea43",
+      "nonce": 419,
+      "round": 1787093,
+      "epoch": 744,
+      "value": "50000000000000000",
+      "receiver": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
+      "sender": "erd1j6kua7p67qnaw3y4sudmk25xsuv4k8ws6pwvax8fd2vtmuc3q33s840l87",
+      "gasPrice": 1000000000,
+      "gasLimit": 600000000,
+      "gasUsed": 157220928,
+      "data": "ZGVwbG95QXNoc3dhcExQQUNTdHJhdGVneUA0MTRjNTAyZDYzNjE2NTYxNjMzNUA0MTU0NTMyZDM0NjMzMDM5MzIzMEAwM2U4QDAzZThAQDNiOWFjYTAwQDAwMDAwMDAwMDAwMDAwMDAwNTAwOTU3MzkwYWVkYTQzMmY1MmE0MTFkNTE5NzRmZTkzZDQwZDI3NzMzZTA0NjNAMDAwMDAwMDAwMDAwMDAwMDA1MDBkMTJjYzczY2JkYTZmMjY1OWM5NTllNWQ1NzU4YWY5MmNhMTM4NDg2NTIzM0AwMDAwMDAwMDAwMDAwMDAwMDUwMDUxZGY3MTc1OGNmMmFjYTViNDZkZWQ4MTU1OGI1NTE1ZGMyOWYzZjM1MjMzQEAwMDAwMDAwMDAwMDAwMDAwMDUwMDdlNGExZGZjNDM3Y2VkNDlkYjlmMTYzNzk4NDE2Yjg0YWMyMWQ0Yzk3Y2ViMDAwMDAwMGM1NzQ1NDc0YzQ0MmQ2MTMyMzg2MzM1MzkwMDAwMDAwMDAwMDAwMDAwMDUwMGE4YmE5ZTY4NjI2YmJjOTkzZmQ3OTVlOGJiNmY0Nzk0M2IyZjVmZmE3Y2ViMDAwMDAwMGE1NTU0NGIyZDMxMzQ2NDM1Mzc2NEAwMDAwMDAwMTAwMDAwMDAwMDAwMDAwMDAwNTAwNTFkZjcxNzU4Y2YyYWNhNWI0NmRlZDgxNTU4YjU1MTVkYzI5ZjNmMzUyMzMwMDAwMDAwYjQyNTU1MzQ0MmQ2NDM0NjMzMDMxMzQwMDAwMDAwMDAwQDAxODZhMEAyNzEw",
+      "signature": "4648af0b96eb430e4986b9fb760549742de09c809b46b984e5d995c898d80c25bfc0717c30da34bd89cd3005d98ee895afa39ee588b7b74b4807c63cbeade807",
+      "sourceShard": 1,
+      "destinationShard": 1,
+      "blockNonce": 1785520,
+      "blockHash": "8f926a5d79fa84bc69949a21bfbba17447091a8a074ac172fa0b88e4475a1214",
+      "notarizedAtSourceInMetaNonce": 1785568,
+      "NotarizedAtSourceInMetaHash": "eebd1aa5c3dde083f9c367242c054affedd36bfc95f7bcc1d4e2d90beb5754e9",
+      "notarizedAtDestinationInMetaNonce": 1785568,
+      "notarizedAtDestinationInMetaHash": "eebd1aa5c3dde083f9c367242c054affedd36bfc95f7bcc1d4e2d90beb5754e9",
+      "miniblockType": "TxBlock",
+      "miniblockHash": "b85d82db6d69cbc1911b3455d2837eeb3170b391926efa2eacb4d9c8e3c96ee4",
+      "hyperblockNonce": 1785568,
+      "hyperblockHash": "eebd1aa5c3dde083f9c367242c054affedd36bfc95f7bcc1d4e2d90beb5754e9",
+      "timestamp": 1704722558,
+      "smartContractResults": [
+        {
+          "hash": "ea9a96c079e66249e6b73c0341991dad96ca81f855f2fc4abe0d432be117a882",
+          "nonce": 420,
+          "value": 4427790720000000,
+          "receiver": "erd1j6kua7p67qnaw3y4sudmk25xsuv4k8ws6pwvax8fd2vtmuc3q33s840l87",
+          "sender": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
+          "data": "@6f6b",
+          "prevTxHash": "408433c5db749f4666bee6a8b599944071bf493c43ff5f01282a74c22ea2ea43",
+          "originalTxHash": "408433c5db749f4666bee6a8b599944071bf493c43ff5f01282a74c22ea2ea43",
+          "gasLimit": 0,
+          "gasPrice": 1000000000,
+          "callType": 0,
+          "operation": "transfer",
+          "isRefund": true
+        },
+        {
+          "hash": "6082975132a2c9d8197dfd0f9852b454ad344740eebdbdf93f620b2796ab723b",
+          "nonce": 0,
+          "value": 50000000000000000,
+          "receiver": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
+          "sender": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
+          "data": "registerMetaESDT@415453417368537761704c5041435661756c74@4156415348@12@63616e467265657a65@66616c7365@63616e57697065@66616c7365@63616e5061757365@66616c7365@63616e5472616e736665724e4654437265617465526f6c65@66616c7365@63616e4368616e67654f776e6572@66616c7365@63616e55706772616465@66616c7365@63616e4164645370656369616c526f6c6573@74727565@9eb30a87c92674ab1469700c0b385b3850e86de80f87dec6cf3213c7e379a646@408433c5db749f4666bee6a8b599944071bf493c43ff5f01282a74c22ea2ea43@03eb4a30",
+          "prevTxHash": "408433c5db749f4666bee6a8b599944071bf493c43ff5f01282a74c22ea2ea43",
+          "originalTxHash": "408433c5db749f4666bee6a8b599944071bf493c43ff5f01282a74c22ea2ea43",
+          "gasLimit": 125751600,
+          "gasPrice": 1000000000,
+          "callType": 1,
+          "originalSender": "erd1j6kua7p67qnaw3y4sudmk25xsuv4k8ws6pwvax8fd2vtmuc3q33s840l87",
+          "operation": "transfer",
+          "function": "registerMetaESDT"
+        },
+        {
+          "hash": "290f85d7ec2f7d5797510290358e9e0f76bb880451efaacb0d69280b8d94c67a",
+          "nonce": 0,
+          "value": 0,
+          "receiver": "erd1llllllllllllllllllllllllllllllllllllllllllllllllluqsl6e366",
+          "sender": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
+          "data": "ESDTSetBurnRoleForAll@41564153482d376438623564",
+          "prevTxHash": "6082975132a2c9d8197dfd0f9852b454ad344740eebdbdf93f620b2796ab723b",
+          "originalTxHash": "408433c5db749f4666bee6a8b599944071bf493c43ff5f01282a74c22ea2ea43",
+          "gasLimit": 0,
+          "gasPrice": 1000000000,
+          "callType": 0,
+          "originalSender": "erd1j6kua7p67qnaw3y4sudmk25xsuv4k8ws6pwvax8fd2vtmuc3q33s840l87",
+          "logs": {
+            "address": "erd1llllllllllllllllllllllllllllllllllllllllllllllllluqsl6e366",
+            "events": [
+              {
+                "address": "erd1llllllllllllllllllllllllllllllllllllllllllllllllluqsl6e366",
+                "identifier": "completedTxEvent",
+                "topics": [
+                  "YIKXUTKiydgZff0PmFK0VK00R0Duvb35P2ILJ5arcjs="
+                ],
+                "data": null,
+                "additionalData": null
+              }
+            ]
+          },
+          "operation": "transfer"
+        },
+        {
+          "hash": "1aa62a6251edd216bd4e5ae59f7e676d5d2f88597685e0ec0e25ac4434bfccdb",
+          "nonce": 0,
+          "value": 0,
+          "receiver": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
+          "sender": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
+          "data": "@00@41564153482d376438623564@d0644194444642fd16ee156307f6fda0e8f8baf4c496e1a1dc85e027ecc08a4a@9eb30a87c92674ab1469700c0b385b3850e86de80f87dec6cf3213c7e379a646@408433c5db749f4666bee6a8b599944071bf493c43ff5f01282a74c22ea2ea43@00",
+          "prevTxHash": "6082975132a2c9d8197dfd0f9852b454ad344740eebdbdf93f620b2796ab723b",
+          "originalTxHash": "408433c5db749f4666bee6a8b599944071bf493c43ff5f01282a74c22ea2ea43",
+          "gasLimit": 75751600,
+          "gasPrice": 1000000000,
+          "callType": 2,
+          "originalSender": "erd1j6kua7p67qnaw3y4sudmk25xsuv4k8ws6pwvax8fd2vtmuc3q33s840l87",
+          "logs": {
+            "address": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
+            "events": [
+              {
+                "address": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
+                "identifier": "writeLog",
+                "topics": [
+                  "AAAAAAAAAAAFAH6UefeHERqHcLpMz2gC3xXGhFsJBGM=",
+                  "QHRvbyBtdWNoIGdhcyBwcm92aWRlZCBmb3IgcHJvY2Vzc2luZzogZ2FzIHByb3ZpZGVkID0gNzU3NTE2MDAsIGdhcyB1c2VkID0gNDE3NjA1OQ=="
+                ],
+                "data": "QDZmNmI=",
+                "additionalData": [
+                  "QDZmNmI="
+                ]
+              },
+              {
+                "address": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
+                "identifier": "completedTxEvent",
+                "topics": [
+                  "YIKXUTKiydgZff0PmFK0VK00R0Duvb35P2ILJ5arcjs="
+                ],
+                "data": null,
+                "additionalData": null
+              }
+            ]
+          },
+          "operation": "transfer"
+        }
+      ],
+      "logs": {
+        "address": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
+        "events": [
+          {
+            "address": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
+            "identifier": "transferValueOnly",
+            "topics": [
+              "",
+              "AAAAAAAAAAAFANAMwOY4h/9reS00I0pE56xrV11LBGM="
+            ],
+            "data": "RGVwbG95RnJvbVNvdXJjZQ==",
+            "additionalData": [
+              "RGVwbG95RnJvbVNvdXJjZQ==",
+              "aW5pdA==",
+              "QUxQLWNhZWFjNQ==",
+              "QVRTLTRjMDkyMA==",
+              "A+g=",
+              "A+g=",
+              "",
+              "O5rKAA=="
+            ]
+          },
+          {
+            "address": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
+            "identifier": "transferValueOnly",
+            "topics": [
+              "",
+              "AAAAAAAAAAAFADJ0SE0vUW6bO5SurLeFIMfK/HtBBGM="
+            ],
+            "data": "RGVwbG95RnJvbVNvdXJjZQ==",
+            "additionalData": [
+              "RGVwbG95RnJvbVNvdXJjZQ==",
+              "aW5pdA==",
+              "AAAAAAAAAAAFANAMwOY4h/9reS00I0pE56xrV11LBGM=",
+              "AAAAAAAAAAAFAJVzkK7aQy9SpBHVGXT+k9QNJ3M+BGM=",
+              "AAAAAAAAAAAFANEsxzy9pvJlnJWeXVdYr5LKE4SGUjM=",
+              "AAAAAAAAAAAFAFHfcXWM8qyltG3tgVWLVRXcKfPzUjM=",
+              "",
+              "AAAAAAAAAAAFAH5KHfxDfO1J258WN5hBa4SsIdTJfOsAAAAMV0VHTEQtYTI4YzU5AAAAAAAAAAAFAKi6nmhia7yZP9eV6LtvR5Q7L1/6fOsAAAAKVVRLLTE0ZDU3ZA==",
+              "AAAAAQAAAAAAAAAABQBR33F1jPKspbRt7YFVi1UV3Cnz81IzAAAAC0JVU0QtZDRjMDE0AAAAAAA=",
+              "AYag",
+              "JxA="
+            ]
+          },
+          {
+            "address": "erd1qqqqqqqqqqqqqpgqxf6ysnf029hfkwu546kt0pfqcl90c76pq33s0a320f",
+            "identifier": "transferValueOnly",
+            "topics": [
+              "",
+              "AAAAAAAAAAAFANEsxzy9pvJlnJWeXVdYr5LKE4SGUjM="
+            ],
+            "data": "RXhlY3V0ZU9uRGVzdENvbnRleHQ=",
+            "additionalData": [
+              "RXhlY3V0ZU9uRGVzdENvbnRleHQ=",
+              "Z2V0RmFybWluZ1Rva2VuSWQ="
+            ]
+          },
+          {
+            "address": "erd1qqqqqqqqqqqqqpgqxf6ysnf029hfkwu546kt0pfqcl90c76pq33s0a320f",
+            "identifier": "transferValueOnly",
+            "topics": [
+              "",
+              "AAAAAAAAAAAFANEsxzy9pvJlnJWeXVdYr5LKE4SGUjM="
+            ],
+            "data": "RXhlY3V0ZU9uRGVzdENvbnRleHQ=",
+            "additionalData": [
+              "RXhlY3V0ZU9uRGVzdENvbnRleHQ=",
+              "Z2V0RmFybVRva2VuSWQ="
+            ]
+          },
+          {
+            "address": "erd1qqqqqqqqqqqqqpgqxf6ysnf029hfkwu546kt0pfqcl90c76pq33s0a320f",
+            "identifier": "transferValueOnly",
+            "topics": [
+              "",
+              "AAAAAAAAAAAFANEsxzy9pvJlnJWeXVdYr5LKE4SGUjM="
+            ],
+            "data": "RXhlY3V0ZU9uRGVzdENvbnRleHQ=",
+            "additionalData": [
+              "RXhlY3V0ZU9uRGVzdENvbnRleHQ=",
+              "Z2V0UmV3YXJkVG9rZW5JZA=="
+            ]
+          },
+          {
+            "address": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
+            "identifier": "transferValueOnly",
+            "topics": [
+              "saK8LsUAAA==",
+              "AAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAC//8="
+            ],
+            "data": "QXN5bmNDYWxs",
+            "additionalData": [
+              "QXN5bmNDYWxs",
+              "cmVnaXN0ZXJNZXRhRVNEVA==",
+              "QVRTQXNoU3dhcExQQUNWYXVsdA==",
+              "QVZBU0g=",
+              "Eg==",
+              "Y2FuRnJlZXpl",
+              "ZmFsc2U=",
+              "Y2FuV2lwZQ==",
+              "ZmFsc2U=",
+              "Y2FuUGF1c2U=",
+              "ZmFsc2U=",
+              "Y2FuVHJhbnNmZXJORlRDcmVhdGVSb2xl",
+              "ZmFsc2U=",
+              "Y2FuQ2hhbmdlT3duZXI=",
+              "ZmFsc2U=",
+              "Y2FuVXBncmFkZQ==",
+              "ZmFsc2U=",
+              "Y2FuQWRkU3BlY2lhbFJvbGVz",
+              "dHJ1ZQ=="
+            ]
+          },
+          {
+            "address": "erd1qqqqqqqqqqqqqpgqxf6ysnf029hfkwu546kt0pfqcl90c76pq33s0a320f",
+            "identifier": "SCDeploy",
+            "topics": [
+              "AAAAAAAAAAAFADJ0SE0vUW6bO5SurLeFIMfK/HtBBGM=",
+              "AAAAAAAAAAAFAH6UefeHERqHcLpMz2gC3xXGhFsJBGM=",
+              "fvRqbue54Womde/CN2IkRGkrx8tsU+xkLvi3+uwMkhY="
+            ],
+            "data": null,
+            "additionalData": null
+          },
+          {
+            "address": "erd1qqqqqqqqqqqqqpgq6qxvpe3csllkk7fdxs3553884344wh2tq33sakulat",
+            "identifier": "SCDeploy",
+            "topics": [
+              "AAAAAAAAAAAFANAMwOY4h/9reS00I0pE56xrV11LBGM=",
+              "AAAAAAAAAAAFAH6UefeHERqHcLpMz2gC3xXGhFsJBGM=",
+              "E3blQfRJfCKLWDr06Od703DSZenIzq8KND+xUjmGY/M="
+            ],
+            "data": null,
+            "additionalData": null
+          }
+        ]
+      },
+      "status": "success",
+      "operation": "transfer",
+      "function": "deployAshswapLPACStrategy",
+      "initiallyPaidFee": "6936045000000000",
+      "fee": "2508254280000000",
+      "chainID": "D",
+      "version": 1,
+      "options": 0
+    }
+  },
+  "error": "",
+  "code": "successful"
+}
+        "#;
+
+        let tx_on_network: TransactionOnNetwork = serde_json::from_str::<TransactionInfo>(data)
+            .unwrap()
+            .data
+            .unwrap()
+            .transaction;
+        let tx_response = TxResponse::from_network_tx(tx_on_network);
+
+        let expected: Option<String> = Some("AVASH-7d8b5d".to_string());
+
+        assert_eq!(tx_response.new_issued_token_identifier, expected)
+
+    }
+
+    #[test]
+    fn test_set_special_roles_should_not_process_issued_token_identifier() {
+        let data = r#"
+        {
+  "data": {
+    "transaction": {
+      "type": "normal",
+      "processingTypeOnSource": "SCInvoking",
+      "processingTypeOnDestination": "SCInvoking",
+      "hash": "cbb1f866da564a04332297dfc4f637be2e50e62bbf4441bf42247ad429747ce0",
+      "nonce": 420,
+      "round": 1787109,
+      "epoch": 744,
+      "value": "0",
+      "receiver": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
+      "sender": "erd1j6kua7p67qnaw3y4sudmk25xsuv4k8ws6pwvax8fd2vtmuc3q33s840l87",
+      "gasPrice": 1000000000,
+      "gasLimit": 600000000,
+      "gasUsed": 129636807,
+      "data": "ZmluaXNoVmF1bHREZXBsb3ltZW50cw==",
+      "signature": "dca943ef1a788bfa6cb0e9aa3900b8340e4908075cbfefaa2a66688f6f0c0fed349edb2eb48eec427cd9098822fba875e4d66072fbdb44cb7f4c1a416736e20c",
+      "sourceShard": 1,
+      "destinationShard": 1,
+      "blockNonce": 1785536,
+      "blockHash": "93ca539e81612768b67a85b7135f7c104e76bec031a758a6b1782910ae49dd8f",
+      "notarizedAtSourceInMetaNonce": 1785584,
+      "NotarizedAtSourceInMetaHash": "71d17afe660282bb42de1ea3eec3e3534a179bd32aa1471c2861ce411bf30552",
+      "notarizedAtDestinationInMetaNonce": 1785584,
+      "notarizedAtDestinationInMetaHash": "71d17afe660282bb42de1ea3eec3e3534a179bd32aa1471c2861ce411bf30552",
+      "miniblockType": "TxBlock",
+      "miniblockHash": "f8c60565af746e92d2c9c09a92734e5eb8da7e42c67a86854c93b349bfe287eb",
+      "hyperblockNonce": 1785584,
+      "hyperblockHash": "71d17afe660282bb42de1ea3eec3e3534a179bd32aa1471c2861ce411bf30552",
+      "timestamp": 1704722654,
+      "smartContractResults": [
+        {
+          "hash": "c3ce9c364de3823ffae250c2bfb40aaf2b18f771ed4bd37bf788ad83a2c651f3",
+          "nonce": 421,
+          "value": 4703631930000000,
+          "receiver": "erd1j6kua7p67qnaw3y4sudmk25xsuv4k8ws6pwvax8fd2vtmuc3q33s840l87",
+          "sender": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
+          "data": "@6f6b",
+          "prevTxHash": "cbb1f866da564a04332297dfc4f637be2e50e62bbf4441bf42247ad429747ce0",
+          "originalTxHash": "cbb1f866da564a04332297dfc4f637be2e50e62bbf4441bf42247ad429747ce0",
+          "gasLimit": 0,
+          "gasPrice": 1000000000,
+          "callType": 0,
+          "operation": "transfer",
+          "isRefund": true
+        },
+        {
+          "hash": "50f9c25a1402ce6d87ae9f890659c8a67462292e471e02c74d64ff7ba1995e60",
+          "nonce": 0,
+          "value": 0,
+          "receiver": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
+          "sender": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
+          "data": "setSpecialRole@41564153482d376438623564@00000000000000000500d00cc0e63887ff6b792d34234a44e7ac6b575d4b0463@45534454526f6c654e4654437265617465@45534454526f6c654e46544164645175616e74697479@45534454526f6c654e46544275726e@0192c6db2c69f50b6968fb22ac558337a851719519cfd1e6bbf79a07bbcf18bc@cbb1f866da564a04332297dfc4f637be2e50e62bbf4441bf42247ad429747ce0@03eb4a30",
+          "prevTxHash": "cbb1f866da564a04332297dfc4f637be2e50e62bbf4441bf42247ad429747ce0",
+          "originalTxHash": "cbb1f866da564a04332297dfc4f637be2e50e62bbf4441bf42247ad429747ce0",
+          "gasLimit": 125751600,
+          "gasPrice": 1000000000,
+          "callType": 1,
+          "originalSender": "erd1j6kua7p67qnaw3y4sudmk25xsuv4k8ws6pwvax8fd2vtmuc3q33s840l87",
+          "operation": "transfer",
+          "function": "setSpecialRole"
+        },
+        {
+          "hash": "d6a5824a60b6c9050462c3f5a02ace00c36e8b4ba1958d132bd394e2ed1e7226",
+          "nonce": 0,
+          "value": 0,
+          "receiver": "erd1qqqqqqqqqqqqqpgq6qxvpe3csllkk7fdxs3553884344wh2tq33sakulat",
+          "sender": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
+          "data": "ESDTSetRole@41564153482d376438623564@45534454526f6c654e4654437265617465@45534454526f6c654e46544164645175616e74697479@45534454526f6c654e46544275726e",
+          "prevTxHash": "50f9c25a1402ce6d87ae9f890659c8a67462292e471e02c74d64ff7ba1995e60",
+          "originalTxHash": "cbb1f866da564a04332297dfc4f637be2e50e62bbf4441bf42247ad429747ce0",
+          "gasLimit": 0,
+          "gasPrice": 1000000000,
+          "callType": 0,
+          "originalSender": "erd1j6kua7p67qnaw3y4sudmk25xsuv4k8ws6pwvax8fd2vtmuc3q33s840l87",
+          "logs": {
+            "address": "erd1qqqqqqqqqqqqqpgq6qxvpe3csllkk7fdxs3553884344wh2tq33sakulat",
+            "events": [
+              {
+                "address": "erd1qqqqqqqqqqqqqpgq6qxvpe3csllkk7fdxs3553884344wh2tq33sakulat",
+                "identifier": "ESDTSetRole",
+                "topics": [
+                  "QVZBU0gtN2Q4YjVk",
+                  "",
+                  "",
+                  "RVNEVFJvbGVORlRDcmVhdGU=",
+                  "RVNEVFJvbGVORlRBZGRRdWFudGl0eQ==",
+                  "RVNEVFJvbGVORlRCdXJu"
+                ],
+                "data": null,
+                "additionalData": null
+              },
+              {
+                "address": "erd1qqqqqqqqqqqqqpgq6qxvpe3csllkk7fdxs3553884344wh2tq33sakulat",
+                "identifier": "completedTxEvent",
+                "topics": [
+                  "UPnCWhQCzm2Hrp+JBlnIpnRiKS5HHgLHTWT/e6GZXmA="
+                ],
+                "data": null,
+                "additionalData": null
+              }
+            ]
+          },
+          "operation": "ESDTSetRole",
+          "function": "ESDTSetRole"
+        },
+        {
+          "hash": "bf1b8b4b301ff548368dfd972896489d5e2a088d5cbdfa1bfe2421cc7f641f7a",
+          "nonce": 0,
+          "value": 0,
+          "receiver": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
+          "sender": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
+          "data": "@00@a68d44c751eba85db0713db8dc9c10c78749189ec0d6f1af5fc67bb656c1254b@0192c6db2c69f50b6968fb22ac558337a851719519cfd1e6bbf79a07bbcf18bc@cbb1f866da564a04332297dfc4f637be2e50e62bbf4441bf42247ad429747ce0@00",
+          "prevTxHash": "50f9c25a1402ce6d87ae9f890659c8a67462292e471e02c74d64ff7ba1995e60",
+          "originalTxHash": "cbb1f866da564a04332297dfc4f637be2e50e62bbf4441bf42247ad429747ce0",
+          "gasLimit": 75751600,
+          "gasPrice": 1000000000,
+          "callType": 2,
+          "originalSender": "erd1j6kua7p67qnaw3y4sudmk25xsuv4k8ws6pwvax8fd2vtmuc3q33s840l87",
+          "logs": {
+            "address": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
+            "events": [
+              {
+                "address": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
+                "identifier": "transferValueOnly",
+                "topics": [
+                  "",
+                  "AAAAAAAAAAAFANAMwOY4h/9reS00I0pE56xrV11LBGM="
+                ],
+                "data": "RXhlY3V0ZU9uRGVzdENvbnRleHQ=",
+                "additionalData": [
+                  "RXhlY3V0ZU9uRGVzdENvbnRleHQ=",
+                  "c2V0U2hhcmVUb2tlbklkZW50aWZpZXI=",
+                  "QVZBU0gtN2Q4YjVk"
+                ]
+              },
+              {
+                "address": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
+                "identifier": "transferValueOnly",
+                "topics": [
+                  "",
+                  "AAAAAAAAAAAFANAMwOY4h/9reS00I0pE56xrV11LBGM="
+                ],
+                "data": "RXhlY3V0ZU9uRGVzdENvbnRleHQ=",
+                "additionalData": [
+                  "RXhlY3V0ZU9uRGVzdENvbnRleHQ=",
+                  "c2V0U3RyYXRlZ3lBZGRyZXNz",
+                  "AAAAAAAAAAAFADJ0SE0vUW6bO5SurLeFIMfK/HtBBGM="
+                ]
+              },
+              {
+                "address": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
+                "identifier": "completedTxEvent",
+                "topics": [
+                  "UPnCWhQCzm2Hrp+JBlnIpnRiKS5HHgLHTWT/e6GZXmA="
+                ],
+                "data": null,
+                "additionalData": null
+              }
+            ]
+          },
+          "operation": "transfer"
+        },
+        {
+          "hash": "9d75a398545f488d4764149245e6ec3101debfce99477c353ac11c3239acd897",
+          "nonce": 1,
+          "value": 648519550000000,
+          "receiver": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
+          "sender": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
+          "data": "@6f6b",
+          "prevTxHash": "bf1b8b4b301ff548368dfd972896489d5e2a088d5cbdfa1bfe2421cc7f641f7a",
+          "originalTxHash": "cbb1f866da564a04332297dfc4f637be2e50e62bbf4441bf42247ad429747ce0",
+          "gasLimit": 0,
+          "gasPrice": 1000000000,
+          "callType": 0,
+          "operation": "transfer",
+          "isRefund": true
+        }
+      ],
+      "logs": {
+        "address": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
+        "events": [
+          {
+            "address": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
+            "identifier": "transferValueOnly",
+            "topics": [
+              "",
+              "AAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAC//8="
+            ],
+            "data": "QXN5bmNDYWxs",
+            "additionalData": [
+              "QXN5bmNDYWxs",
+              "c2V0U3BlY2lhbFJvbGU=",
+              "QVZBU0gtN2Q4YjVk",
+              "AAAAAAAAAAAFANAMwOY4h/9reS00I0pE56xrV11LBGM=",
+              "RVNEVFJvbGVORlRDcmVhdGU=",
+              "RVNEVFJvbGVORlRBZGRRdWFudGl0eQ==",
+              "RVNEVFJvbGVORlRCdXJu"
+            ]
+          }
+        ]
+      },
+      "status": "success",
+      "operation": "transfer",
+      "function": "finishVaultDeployments",
+      "initiallyPaidFee": "6082170000000000",
+      "fee": "1378538070000000",
+      "chainID": "D",
+      "version": 1,
+      "options": 0
+    }
+  },
+  "error": "",
+  "code": "successful"
+}
+        "#;
+
+        let tx_on_network: TransactionOnNetwork = serde_json::from_str::<TransactionInfo>(data)
+            .unwrap()
+            .data
+            .unwrap()
+            .transaction;
+        let tx_response = TxResponse::from_network_tx(tx_on_network);
+
+        let expected: Option<String> = None;
+
+        assert_eq!(tx_response.new_issued_token_identifier, expected)
+    }
 }

From 2763bc3d48c4ae45ccc3c40d9e5a7d48c9b5c163 Mon Sep 17 00:00:00 2001
From: Fusee <quentus123@orange.fr>
Date: Mon, 8 Jan 2024 16:15:21 +0100
Subject: [PATCH 0194/1254] fixes

---
 .../src/scenario/model/transaction/tx_response.rs        | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/framework/scenario/src/scenario/model/transaction/tx_response.rs b/framework/scenario/src/scenario/model/transaction/tx_response.rs
index 14cdc7cd9e..1f34d6c12e 100644
--- a/framework/scenario/src/scenario/model/transaction/tx_response.rs
+++ b/framework/scenario/src/scenario/model/transaction/tx_response.rs
@@ -188,7 +188,7 @@ impl TxResponse {
             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 {
-                continue
+                continue;
             }
 
             if scr.data.starts_with("ESDTTransfer@") {
@@ -198,14 +198,17 @@ impl TxResponse {
                 }
 
                 self.new_issued_token_identifier = Some(String::from_utf8(hex::decode(encoded_tid.unwrap()).unwrap()).unwrap());
+
+                break;
             } else if scr.data.starts_with("@00@") {
                 let encoded_tid = scr.data.split('@').nth(2);
                 if encoded_tid.is_none() {
                     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;
             }
         }
 

From 48726dad9291bfa5264f05353ad43637f2f5a006 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Tue, 9 Jan 2024 08:17:57 +0200
Subject: [PATCH 0195/1254] 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<String>) -> 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 <mihaicalin.luca10@gmail.com>
Date: Tue, 9 Jan 2024 13:25:34 +0200
Subject: [PATCH 0196/1254] 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<u32>;
+
+   #[storage_mapper("contract_address")]
+   fn contract_address(&self) -> SingleValueMapper<ManagedAddress>;
+
+   #[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 <andrei.marinica@multiversx.com>"]
+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::<get_at_address::AbiProvider>();
+}
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<u32>;
+
+    #[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<SA>) -> 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<SA>) -> 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<SA>) -> 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 <mihaicalin.luca10@gmail.com>
Date: Tue, 9 Jan 2024 14:01:04 +0200
Subject: [PATCH 0197/1254] 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 6fb3aedadbedc0347610c48191297e96f453a0a8 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 10 Jan 2024 13:59:31 +0200
Subject: [PATCH 0198/1254] sc 0.46.1

---
 CHANGELOG.md                                   |  3 +++
 Cargo.lock                                     | 18 +++++++++---------
 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 ++--
 .../mappers/linked-list-repeat/meta/Cargo.toml |  2 +-
 .../mappers/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 +-
 .../benchmarks/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 +-
 contracts/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 +-
 .../examples/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 +++---
 contracts/examples/check-pause/meta/Cargo.toml |  2 +-
 contracts/examples/check-pause/wasm/Cargo.toml |  2 +-
 .../examples/crowdfunding-esdt/Cargo.toml      |  4 ++--
 .../examples/crowdfunding-esdt/meta/Cargo.toml |  2 +-
 .../examples/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 +-
 .../examples/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 +-
 contracts/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 ++--
 contracts/examples/proxy-pause/meta/Cargo.toml |  2 +-
 contracts/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 +-
 .../composability/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 +-
 .../composability/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 ++--
 .../erc-style-contracts/erc721/meta/Cargo.toml |  2 +-
 .../erc-style-contracts/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 ++--
 .../formatted-message-features/meta/Cargo.toml |  2 +-
 .../formatted-message-features/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 +-
 .../use-module/wasm-use-module-view/Cargo.toml |  2 +-
 .../feature-tests/use-module/wasm/Cargo.toml   |  2 +-
 contracts/modules/Cargo.toml                   |  4 ++--
 framework/base/Cargo.toml                      |  4 ++--
 framework/derive/Cargo.toml                    |  2 +-
 framework/meta/Cargo.toml                      |  4 ++--
 .../generate_snippets/snippet_crate_gen.rs     |  2 +-
 framework/meta/src/cmd/contract/meta_config.rs |  4 ++--
 framework/meta/src/version_history.rs          |  3 ++-
 framework/scenario/Cargo.toml                  |  6 +++---
 framework/snippets/Cargo.toml                  |  4 ++--
 framework/wasm-adapter/Cargo.toml              |  4 ++--
 tools/mxpy-snippet-generator/Cargo.toml        |  2 +-
 tools/rust-debugger/format-tests/Cargo.toml    |  4 ++--
 260 files changed, 383 insertions(+), 379 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 61ada9879f..1d9dcae087 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,6 +26,9 @@ 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.46.1] - 2024-01-10
+- Interactor: fixed parsing of newly issued token identifier.
+
 ## [sc 0.46.0] - 2024-01-05
 - Promises callback memory allocator bugfix.
 - Removed features: `promises`, `managed-map`, `back-transfers`.
diff --git a/Cargo.lock b/Cargo.lock
index 15373715ca..677d15ee9a 100755
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1806,7 +1806,7 @@ checksum = "b59072fa0624b55ae5ae3fa6bfa91515bbeb4ac440214bc4a509e2c8806d6e9f"
 
 [[package]]
 name = "multiversx-price-aggregator-sc"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "arrayvec",
  "getrandom",
@@ -1827,7 +1827,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "bitflags 2.4.1",
  "hex-literal",
@@ -1857,7 +1857,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -1868,7 +1868,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-meta"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "clap",
  "colored",
@@ -1893,14 +1893,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-scenario"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "base64",
  "bech32",
@@ -1926,7 +1926,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-snippets"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "base64",
  "env_logger",
@@ -1940,7 +1940,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -1971,7 +1971,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-wegld-swap-sc"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "multiversx-sc",
  "multiversx-sc-modules",
diff --git a/contracts/benchmarks/large-storage/Cargo.toml b/contracts/benchmarks/large-storage/Cargo.toml
index 095b8f8966..616e4a4aa9 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.0"
+version = "0.46.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.46.0"
+version = "0.46.1"
 path = "../../../framework/scenario"
diff --git a/contracts/benchmarks/large-storage/meta/Cargo.toml b/contracts/benchmarks/large-storage/meta/Cargo.toml
index ef488e5042..e1825f7996 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.0"
+version = "0.46.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 302889eb5d..8228e7662f 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.0"
+version = "0.46.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 c6f143a006..deb18f54c0 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.0"
+version = "0.46.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.46.0"
+version = "0.46.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 b2ef479ef6..011f6a1d18 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.0"
+version = "0.46.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.46.0"
+version = "0.46.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 9d5050e9d9..d49df9aeba 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.0"
+version = "0.46.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 1c7d490263..51d18fad4b 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.0"
+version = "0.46.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 0a20075f7e..a1c62a5428 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.0"
+version = "0.46.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.46.0"
+version = "0.46.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 7433a8ba2b..4763e21ab5 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.0"
+version = "0.46.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 ed9b0fb929..de90d27a20 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.0"
+version = "0.46.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 fa50397ee3..79e2227247 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.0"
+version = "0.46.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.46.0"
+version = "0.46.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 977d320861..8eac576d3e 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.0"
+version = "0.46.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 5c464f422d..ad801d723b 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.0"
+version = "0.46.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 a1049d091d..0e7d4596c7 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.0"
+version = "0.46.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.46.0"
+version = "0.46.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 30c567a5ee..0f86849de3 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.0"
+version = "0.46.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 a947731c16..f2d76867de 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.0"
+version = "0.46.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 b61db05c08..87e530d256 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.0"
+version = "0.46.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.46.0"
+version = "0.46.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 c1f03d9cb7..a73b25c35d 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.0"
+version = "0.46.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 932be1c440..ccd3360305 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.0"
+version = "0.46.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 d933a5b67e..c4da5ccdfd 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.0"
+version = "0.46.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.46.0"
+version = "0.46.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 2427a3b678..dc768d71c8 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.0"
+version = "0.46.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 bf88aaaef7..6f49d499b8 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.0"
+version = "0.46.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 d13f94813a..dc13322fb8 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.0"
+version = "0.46.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.46.0"
+version = "0.46.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 d4b4a888dd..5683b9bf84 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.0"
+version = "0.46.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 51815bc4c3..2a0b54cc9c 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.0"
+version = "0.46.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/str-repeat/Cargo.toml b/contracts/benchmarks/str-repeat/Cargo.toml
index cc99841a81..1b2418fee9 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.0"
+version = "0.46.1"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.46.0"
+version = "0.46.1"
 path = "../../../framework/scenario"
diff --git a/contracts/benchmarks/str-repeat/meta/Cargo.toml b/contracts/benchmarks/str-repeat/meta/Cargo.toml
index f3cf22d29b..d4d268d2dd 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.0"
+version = "0.46.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 88496fb32a..5ffbe9738a 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.0"
+version = "0.46.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/core/price-aggregator/Cargo.toml b/contracts/core/price-aggregator/Cargo.toml
index e30ea79f42..58fd5c9646 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.0"
+version = "0.46.1"
 authors = [
     "Claudiu-Marcel Bruda <claudiu.bruda@multiversx.com>",
     "MultiversX <contact@multiversx.com>",
@@ -19,15 +19,15 @@ edition = "2021"
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "0.46.0"
+version = "0.46.1"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.46.0"
+version = "0.46.1"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.46.0"
+version = "0.46.1"
 path = "../../../framework/scenario"
 
 [dependencies]
diff --git a/contracts/core/price-aggregator/meta/Cargo.toml b/contracts/core/price-aggregator/meta/Cargo.toml
index e9bdc28455..1a2a9591a5 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.0"
+version = "0.46.1"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.46.0"
+version = "0.46.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 ac8cee2be3..ddfa805307 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.0"
+version = "0.46.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/core/wegld-swap/Cargo.toml b/contracts/core/wegld-swap/Cargo.toml
index 9172eaa176..50bb126f86 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.0"
+version = "0.46.1"
 
 authors = [
     "Dorin Iancu <dorin.iancu@multiversx.com>",
@@ -20,13 +20,13 @@ edition = "2021"
 path = "src/wegld.rs"
 
 [dependencies.multiversx-sc]
-version = "0.46.0"
+version = "0.46.1"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.46.0"
+version = "0.46.1"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.46.0"
+version = "0.46.1"
 path = "../../../framework/scenario"
diff --git a/contracts/core/wegld-swap/meta/Cargo.toml b/contracts/core/wegld-swap/meta/Cargo.toml
index 3b44728989..75a5b34182 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.0"
+version = "0.46.1"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.46.0"
+version = "0.46.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 ab063e4f0f..21b157d302 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.0"
+version = "0.46.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/adder/Cargo.toml b/contracts/examples/adder/Cargo.toml
index 67e280fe98..a7f6eabe69 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.0"
+version = "0.46.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.46.0"
+version = "0.46.1"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/adder/interact/Cargo.toml b/contracts/examples/adder/interact/Cargo.toml
index a6c1b7dafe..8a95fb0248 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.0"
+version = "0.46.1"
 path = "../../../../framework/snippets"
diff --git a/contracts/examples/adder/meta/Cargo.toml b/contracts/examples/adder/meta/Cargo.toml
index 0c21a7bd14..da86deb2ab 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.0"
+version = "0.46.1"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/examples/adder/wasm/Cargo.toml b/contracts/examples/adder/wasm/Cargo.toml
index 8d41bd837b..8b4e884edd 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.0"
+version = "0.46.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 3325de0455..b553a1c8d9 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.0"
+version = "0.46.1"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.46.0"
+version = "0.46.1"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.46.0"
+version = "0.46.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 fcaaf8b382..fd4151e114 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.0"
+version = "0.46.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 d2d1a12cda..bda3731c13 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.0"
+version = "0.46.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/check-pause/Cargo.toml b/contracts/examples/check-pause/Cargo.toml
index 95c00649ce..1378777b4e 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.2"
 
 [dependencies.multiversx-sc]
-version = "0.46.0"
+version = "0.46.1"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.46.0"
+version = "0.46.1"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.46.0"
+version = "0.46.1"
 path = "../../../framework/scenario"
 
diff --git a/contracts/examples/check-pause/meta/Cargo.toml b/contracts/examples/check-pause/meta/Cargo.toml
index efbc1317cf..24da55db06 100644
--- a/contracts/examples/check-pause/meta/Cargo.toml
+++ b/contracts/examples/check-pause/meta/Cargo.toml
@@ -9,6 +9,6 @@ authors = ["Alin Cruceat <alin.cruceat@multiversx.com>"]
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.46.0"
+version = "0.46.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 a72c232c92..21bfd086a0 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.0"
+version = "0.46.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/crowdfunding-esdt/Cargo.toml b/contracts/examples/crowdfunding-esdt/Cargo.toml
index b3cc3dff75..280017fbc0 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.0"
+version = "0.46.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.46.0"
+version = "0.46.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 9571ae4df3..8fb9bcd423 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.0"
+version = "0.46.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 76d6cc4e0b..a6dac769e1 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.0"
+version = "0.46.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/crypto-bubbles/Cargo.toml b/contracts/examples/crypto-bubbles/Cargo.toml
index 0c8e64b3af..cc1d7744b9 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.0"
+version = "0.46.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.46.0"
+version = "0.46.1"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/crypto-bubbles/meta/Cargo.toml b/contracts/examples/crypto-bubbles/meta/Cargo.toml
index 204031769e..67534658b5 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.0"
+version = "0.46.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 b313a6bcf7..808699992d 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.0"
+version = "0.46.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 2da3741c3e..7e528d577e 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.0"
+version = "0.46.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 b682c64f86..39b6d766e5 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.0"
+version = "0.46.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 27cdd2f367..241510001e 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.0"
+version = "0.46.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.46.0"
+version = "0.46.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 da369710d6..b4428e3811 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.0"
+version = "0.46.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 5a6f6b3e4a..cf220dd031 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.0"
+version = "0.46.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 a7f71e14e9..eaad664db8 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.0"
+version = "0.46.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.46.0"
+version = "0.46.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 3ee2652b77..da1806d6dc 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.0"
+version = "0.46.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 e85e41bf42..24e9f3137f 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.0"
+version = "0.46.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 13060ff19d..2d175a06b1 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.0"
+version = "0.46.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.46.0"
+version = "0.46.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 38281bf82a..249f0fb633 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.0"
+version = "0.46.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 488affa2af..85c4f8554f 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.0"
+version = "0.46.1"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/crypto-zombies/Cargo.toml b/contracts/examples/crypto-zombies/Cargo.toml
index 630fe05b9b..a251101033 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.0"
+version = "0.46.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.46.0"
+version = "0.46.1"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/crypto-zombies/meta/Cargo.toml b/contracts/examples/crypto-zombies/meta/Cargo.toml
index c78822117f..7ad5efebe7 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.0"
+version = "0.46.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 15b06938f2..a22fa1734a 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.0"
+version = "0.46.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/digital-cash/Cargo.toml b/contracts/examples/digital-cash/Cargo.toml
index 412c0b661e..1adf0a5682 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.0"
+version = "0.46.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.46.0"
+version = "0.46.1"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/digital-cash/meta/Cargo.toml b/contracts/examples/digital-cash/meta/Cargo.toml
index 4accbfa9bd..d1dcf286b8 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.0"
+version = "0.46.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 77f1949163..44f82033d5 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.0"
+version = "0.46.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/empty/Cargo.toml b/contracts/examples/empty/Cargo.toml
index 02b4d749da..10eda8b158 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.0"
+version = "0.46.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.46.0"
+version = "0.46.1"
 path = "../../../framework/scenario"
 
 [dev-dependencies]
diff --git a/contracts/examples/empty/meta/Cargo.toml b/contracts/examples/empty/meta/Cargo.toml
index 88e7526f2b..91ff306727 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.0"
+version = "0.46.1"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/examples/empty/wasm/Cargo.toml b/contracts/examples/empty/wasm/Cargo.toml
index bfdac5ecd6..ffa9bcd8ce 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.0"
+version = "0.46.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 639f3b0e3a..791bbe437d 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.0"
+version = "0.46.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.46.0"
+version = "0.46.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 5d097387ca..d843ec3b77 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.0"
+version = "0.46.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 f6120fb10f..a30a4a19bd 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.0"
+version = "0.46.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/factorial/Cargo.toml b/contracts/examples/factorial/Cargo.toml
index b7903ac353..f907a0a2ff 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.0"
+version = "0.46.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.46.0"
+version = "0.46.1"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/factorial/meta/Cargo.toml b/contracts/examples/factorial/meta/Cargo.toml
index 0f7afefd81..1b22f34de0 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.0"
+version = "0.46.1"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/examples/factorial/wasm/Cargo.toml b/contracts/examples/factorial/wasm/Cargo.toml
index 641d68c77b..9b6f25697b 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.0"
+version = "0.46.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/fractional-nfts/Cargo.toml b/contracts/examples/fractional-nfts/Cargo.toml
index 8ab84c3569..71d6992524 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.0"
+version = "0.46.1"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.46.0"
+version = "0.46.1"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.46.0"
+version = "0.46.1"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/fractional-nfts/meta/Cargo.toml b/contracts/examples/fractional-nfts/meta/Cargo.toml
index 4ab25cdb0b..d162b6b6f6 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.0"
+version = "0.46.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 86db13a906..b49d51c6df 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.0"
+version = "0.46.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/lottery-esdt/Cargo.toml b/contracts/examples/lottery-esdt/Cargo.toml
index 372f3d167e..ab90dd3620 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.0"
+version = "0.46.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.46.0"
+version = "0.46.1"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/lottery-esdt/meta/Cargo.toml b/contracts/examples/lottery-esdt/meta/Cargo.toml
index 1cfcf17030..f1d406cac3 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.0"
+version = "0.46.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 fb562ffe88..450e70f182 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.0"
+version = "0.46.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/multisig/Cargo.toml b/contracts/examples/multisig/Cargo.toml
index 9b7053e9f2..d203bf5adc 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.0"
+version = "0.46.1"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.46.0"
+version = "0.46.1"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.46.0"
+version = "0.46.1"
 path = "../../../framework/scenario"
 
 [dev-dependencies.adder]
@@ -27,7 +27,7 @@ path = "../adder"
 path = "../factorial"
 
 [dev-dependencies.multiversx-wegld-swap-sc]
-version = "0.46.0"
+version = "0.46.1"
 path = "../../core/wegld-swap"
 
 [dev-dependencies]
diff --git a/contracts/examples/multisig/interact/Cargo.toml b/contracts/examples/multisig/interact/Cargo.toml
index 0a9b11e7ba..bd4732c608 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.0"
+version = "0.46.1"
 path = "../../../../contracts/modules"
 
 [dependencies.multiversx-sc-snippets]
-version = "0.46.0"
+version = "0.46.1"
 path = "../../../../framework/snippets"
 
 [dependencies.multiversx-sc-scenario]
-version = "=0.46.0"
+version = "=0.46.1"
 path = "../../../../framework/scenario"
diff --git a/contracts/examples/multisig/meta/Cargo.toml b/contracts/examples/multisig/meta/Cargo.toml
index 706c119f56..a3e66f60af 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.0"
+version = "0.46.1"
 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 71616d7d85..d1efc0a4db 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.0"
+version = "0.46.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 63a279dfb0..1b277ddfb7 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.0"
+version = "0.46.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/multisig/wasm/Cargo.toml b/contracts/examples/multisig/wasm/Cargo.toml
index 883c777800..8d2391d13d 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.0"
+version = "0.46.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/nft-minter/Cargo.toml b/contracts/examples/nft-minter/Cargo.toml
index 1b63485299..21238c553e 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.0"
+version = "0.46.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.46.0"
+version = "0.46.1"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/nft-minter/meta/Cargo.toml b/contracts/examples/nft-minter/meta/Cargo.toml
index 5dd730453b..cb17d26f6c 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.0"
+version = "0.46.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 f97ca02219..1befc72add 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.0"
+version = "0.46.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 bdbe02b9ac..89aa8971e3 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.0"
+version = "0.46.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.46.0"
+version = "0.46.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 2d43cf3570..b97f5bdced 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.0"
+version = "0.46.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 387d48d049..ce4ca239fe 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.0"
+version = "0.46.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/nft-subscription/Cargo.toml b/contracts/examples/nft-subscription/Cargo.toml
index 36b39091d6..389b6727e2 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.0"
+version = "0.46.1"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.46.0"
+version = "0.46.1"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.46.0"
+version = "0.46.1"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/nft-subscription/meta/Cargo.toml b/contracts/examples/nft-subscription/meta/Cargo.toml
index 843e12cafa..60b1af5068 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.0"
+version = "0.46.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 f7f101935e..e3834dfb65 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.0"
+version = "0.46.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 ae33f7f9f2..2263959005 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.0"
+version = "0.46.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.46.0"
+version = "0.46.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 24ded66cb8..a0ce1ce88c 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.0"
+version = "0.46.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 65ae77ff63..2fba463c57 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.0"
+version = "0.46.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 0eb8f8eff9..98a2d6cd8b 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.0"
+version = "0.46.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.46.0"
+version = "0.46.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 ad70da4d2d..040e647433 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.0"
+version = "0.46.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 2696ebd635..b34a58683b 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.0"
+version = "0.46.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 0390640c07..25613e64c2 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.0"
+version = "0.46.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.46.0"
+version = "0.46.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 68c184074b..16c6aea5c0 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.0"
+version = "0.46.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 736863185a..023c891956 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.0"
+version = "0.46.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/proxy-pause/Cargo.toml b/contracts/examples/proxy-pause/Cargo.toml
index 28eeed4797..7d39859b34 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.0"
+version = "0.46.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.46.0"
+version = "0.46.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 f4337c4dbc..32e1ce4833 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.0"
+version = "0.46.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 2362b7ee10..c020d87b3c 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.0"
+version = "0.46.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/rewards-distribution/Cargo.toml b/contracts/examples/rewards-distribution/Cargo.toml
index ceaf0c62b2..25029a5c99 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.0"
+version = "0.46.1"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.46.0"
+version = "0.46.1"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.46.0"
+version = "0.46.1"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/rewards-distribution/meta/Cargo.toml b/contracts/examples/rewards-distribution/meta/Cargo.toml
index 24afade8fb..5b3508d378 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 <claudiu.bruda@multiversx.com>"]
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.46.0"
+version = "0.46.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 e275dba640..68c12fe80b 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.0"
+version = "0.46.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 002a8acda4..4a26325d1b 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.0"
+version = "0.46.1"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.46.0"
+version = "0.46.1"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.46.0"
+version = "0.46.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 e9b80a5f2e..a253203454 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 <claudiu.bruda@multiversx.com>"]
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.46.0"
+version = "0.46.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 6db397cce1..bb8e2dc0db 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.0"
+version = "0.46.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/token-release/Cargo.toml b/contracts/examples/token-release/Cargo.toml
index 24d9d149ae..0458a49ddd 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.0"
+version = "0.46.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.46.0"
+version = "0.46.1"
 path = "../../../framework/scenario"
 
diff --git a/contracts/examples/token-release/meta/Cargo.toml b/contracts/examples/token-release/meta/Cargo.toml
index 3b0d3149b4..61cda75c98 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.0"
+version = "0.46.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 5e18129926..03d1261c0d 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.0"
+version = "0.46.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 6c906da7ca..1217ce3c8c 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.0"
+version = "0.46.1"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.46.0"
+version = "0.46.1"
 path = "../../../framework/scenario"
 
 [dev-dependencies.multiversx-sc-meta]
-version = "0.46.0"
+version = "0.46.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 03bf68740e..2a9de1527d 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.0"
+            "version": "0.46.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 fa9d9a489e..30d8e7f58d 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.0"
+            "version": "0.46.1"
         }
     },
     "docs": [
diff --git a/contracts/feature-tests/abi-tester/meta/Cargo.toml b/contracts/feature-tests/abi-tester/meta/Cargo.toml
index c93ef2dffa..d52f68889c 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.0"
+version = "0.46.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 222dd16ddf..9766d69d28 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.0"
+version = "0.46.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 6374241623..76d9c1a01d 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.0"
+version = "0.46.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 bdb316342f..50c8c2ad87 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.0"
+version = "0.46.1"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.46.0"
+version = "0.46.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 db35b321ce..1dfe74407a 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.0"
+version = "0.46.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 8e9ad1996a..f125091fd8 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.0"
+version = "0.46.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 d3d07c889f..c01fa98822 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.0"
+version = "0.46.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.46.0"
+version = "0.46.1"
 path = "../../../framework/scenario"
 
 [dependencies.multiversx-sc-modules]
-version = "0.46.0"
+version = "0.46.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 3959d56804..9b34b416c6 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.0"
+version = "0.46.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 678ee79784..1675897713 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.0"
+version = "0.46.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 49be67b33a..fca80f6aa9 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.0"
+version = "0.46.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 db0032cdb6..133da213b9 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.0"
+version = "0.46.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 0dcdbb592f..49dc8e6729 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.0"
+version = "0.46.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.46.0"
+version = "0.46.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 e6ea495bed..34f5528c00 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.0"
+version = "0.46.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 09d5575d7e..f1f6216573 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.0"
+version = "0.46.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/Cargo.toml b/contracts/feature-tests/composability/Cargo.toml
index feb14f3bfe..74472682d0 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.0"
+version = "0.46.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.46.0"
+version = "0.46.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 da7473859e..485248d298 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.0"
+version = "0.46.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.46.0"
+version = "0.46.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 0009c8ad3a..a025ae72da 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.0"
+version = "0.46.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 1342427c92..6adddc3b8c 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.0"
+version = "0.46.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 0d90baa395..e45f14a213 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.0"
+version = "0.46.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.46.0"
+version = "0.46.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 e1fcbc1a1c..9fd0596897 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.0"
+version = "0.46.1"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.46.0"
+version = "0.46.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 b52ab91889..cbb62f3515 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.0"
+version = "0.46.1"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.46.0"
+version = "0.46.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 fbd72d5ebd..dc0a6a2ce1 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.0"
+version = "0.46.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 71588d4fef..1399239192 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.0"
+version = "0.46.1"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.46.0"
+version = "0.46.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 e177661dc2..d4a374b79c 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.0"
+version = "0.46.1"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.46.0"
+version = "0.46.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 21a1f1057e..677b2667e4 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.0"
+version = "0.46.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 330b1aa37b..8ca892d28e 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.0"
+version = "0.46.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.46.0"
+version = "0.46.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 2c4771981b..c638a9c34f 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.0"
+version = "0.46.1"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.46.0"
+version = "0.46.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 8e5a4fbd68..3d0a5f684a 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.0"
+version = "0.46.1"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.46.0"
+version = "0.46.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 e04b0a687a..3d5ff4c574 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.0"
+version = "0.46.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 1322cfdd97..6a388ab1f8 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.0"
+version = "0.46.1"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.46.0"
+version = "0.46.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 4e4038be9a..11e25c29bf 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.0"
+version = "0.46.1"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.46.0"
+version = "0.46.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 d3467c2dfa..46713895e2 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.0"
+version = "0.46.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 3f77beb9e9..516513a5e7 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.0"
+version = "0.46.1"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.46.0"
+version = "0.46.1"
 path = "../../../../framework/wasm-adapter"
 optional = true
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.46.0"
+version = "0.46.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 634415366d..354bfc2f96 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.0"
+version = "0.46.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 fd05ad55cf..d96030219c 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.0"
+version = "0.46.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 7dbbee780e..f68bbba63a 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.0"
+version = "0.46.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 3cfed5c21b..b91d621066 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.0"
+version = "0.46.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.46.0"
+version = "0.46.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 18bd1d716b..f7b76873e5 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.0"
+version = "0.46.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 11c5cfce27..c3f72c4aa4 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.0"
+version = "0.46.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 c77e5ce85e..152d8161a9 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.0"
+version = "0.46.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 d525382eb0..6d76b5c4ae 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.0"
+version = "0.46.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 99edb41076..456ebd4920 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.0"
+version = "0.46.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.46.0"
+version = "0.46.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 5083c192af..557790209e 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.0"
+version = "0.46.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 29ee198587..0f9355e90c 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.0"
+version = "0.46.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 8cd130cbdc..dc84fddef2 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.0"
+version = "0.46.1"
 path = "../../../../contracts/modules"
 
 [dependencies.multiversx-sc-snippets]
-version = "0.46.0"
+version = "0.46.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 cf76fe461e..6cb0139bde 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.0"
+version = "0.46.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.46.0"
+version = "0.46.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 7a1f27c826..e6831ee1ca 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.0"
+version = "0.46.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 be4755626f..3fb303cfc4 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.0"
+version = "0.46.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 9f066562c3..5043d3c56b 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.0"
+version = "0.46.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 72a7c27109..89aa0110e2 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.0"
+version = "0.46.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 90078b8bc0..827ddd5e0e 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.0"
+version = "0.46.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 f44cea94af..eaece5d3c2 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.0"
+version = "0.46.1"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.46.0"
+version = "0.46.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 b2842355bf..4ffbc98f16 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.0"
+version = "0.46.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 a33a28dabb..276861d5b9 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.0"
+version = "0.46.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 0471700645..0e92effc1e 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.0"
+version = "0.46.1"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.46.0"
+version = "0.46.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 dd64784600..343c49181e 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.0"
+version = "0.46.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 50873f6cad..0c15dac478 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.0"
+version = "0.46.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 ec65c7c3ce..5cce43a5f4 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.0"
+version = "0.46.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.46.0"
+version = "0.46.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 2235b679f0..7bdd7583b3 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.0"
+version = "0.46.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 3b77408eec..b16c60a97a 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.0"
+version = "0.46.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 b0a2ee3024..5cba837377 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.0"
+version = "0.46.1"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.46.0"
+version = "0.46.1"
 path = "../../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.46.0"
+version = "0.46.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 02a9892c9b..46ef668c4e 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.0"
+version = "0.46.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 f7932c1dad..3d1aee2774 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.0"
+version = "0.46.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 c8d893c118..ad923b72d3 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.0"
+version = "0.46.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.46.0"
+version = "0.46.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 25ca088cf0..2e329b816e 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.0"
+version = "0.46.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 61574104b3..dcfcd7545b 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.0"
+version = "0.46.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 a8ca7e6132..bef8e687e1 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.0"
+version = "0.46.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 3814231bc8..2e4b6ee644 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.0"
+version = "0.46.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 7d9013351c..49b40adc7f 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.0"
+version = "0.46.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.46.0"
+version = "0.46.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 1741e4efc7..24d3a8f5c7 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.0"
+version = "0.46.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 c5a374fdd6..73de96fbcb 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.0"
+version = "0.46.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 98bf4401bb..b5bd2db425 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.0"
+version = "0.46.1"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.46.0"
+version = "0.46.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 7641906c0f..f5b81a3c6a 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.0"
+version = "0.46.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 fead100fc5..5a759c87ac 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.0"
+version = "0.46.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 4b38bcfaac..9bb37dbbd8 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.0"
+version = "0.46.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.46.0"
+version = "0.46.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 ef5f43dfa5..88d23e7d2f 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.0"
+version = "0.46.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 bef5f84d7a..75e84418e9 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.0"
+version = "0.46.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 225792b4e6..b77348cd15 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.0"
+version = "0.46.1"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.46.0"
+version = "0.46.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 031b524b46..1bc26453c2 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.0"
+version = "0.46.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 811ca4bd9b..4c3d62ca4f 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.0"
+version = "0.46.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 f076ae9421..6d65368cd1 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.0"
+version = "0.46.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.46.0"
+version = "0.46.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 12fa1b1f8e..53c92eae17 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.0"
+version = "0.46.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 a05835ea31..3561b76504 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.0"
+version = "0.46.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 834d0efb1c..46c9989289 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.0"
+version = "0.46.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.46.0"
+version = "0.46.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 8f93d367a8..ea33576f66 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.0"
+version = "0.46.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 f592746cc2..c883148c4e 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.0"
+version = "0.46.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 cb8e382e95..5ee180b734 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.0"
+version = "0.46.1"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.46.0"
+version = "0.46.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 b80d83c2d6..55204d48ab 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.0"
+version = "0.46.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 c4adb4779c..58a74b12d6 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.0"
+version = "0.46.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 a02f338bb3..0043d34cf4 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.0"
+version = "0.46.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.46.0"
+version = "0.46.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 633fc522af..39808fb3c9 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.0"
+version = "0.46.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 abb9606505..cf2ee68945 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.0"
+version = "0.46.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 3a2d2e0565..1fb7dbca00 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.0"
+version = "0.46.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.46.0"
+version = "0.46.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 8de3e68482..a02b4344a6 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.0"
+version = "0.46.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 29fb281836..bceba46295 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.0"
+version = "0.46.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 b3b3079d97..fd78964f33 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.0"
+version = "0.46.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.46.0"
+version = "0.46.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 d7984b7e22..2b4fe87241 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.0"
+version = "0.46.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 c0840b07b0..6f425763a9 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.0"
+version = "0.46.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 94d2121d52..5a4fc048d3 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.0"
+version = "0.46.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.46.0"
+version = "0.46.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 c8a61186d4..4a6322bf67 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.0"
+version = "0.46.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 ae5f96e3ec..bda2fd6065 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.0"
+version = "0.46.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 a0602921e6..c5fc7ebc98 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.0"
+version = "0.46.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 d4f0e5572b..1bfb9d2e98 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.0"
+version = "0.46.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 d9d9bbaa39..2b96113f8e 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.0"
+version = "0.46.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 cc02363abb..8cd27efa9e 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.0"
+version = "0.46.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.46.0"
+version = "0.46.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 2999fecfa4..412052f0ef 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.0"
+version = "0.46.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 0f4005de0a..cc76e9c5c8 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.0"
+version = "0.46.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 95f4c56a40..79ee585ba9 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.0"
+version = "0.46.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.46.0"
+version = "0.46.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 e0c366c41e..187650e97a 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.0"
+version = "0.46.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 174321c3d0..0aa622b098 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.0"
+version = "0.46.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 df08c26c99..a2a0072182 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.0"
+version = "0.46.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.46.0"
+version = "0.46.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 b1170fcb9a..0103880792 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.0"
+version = "0.46.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 2f25864270..e648a91630 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.0"
+version = "0.46.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 f7c91a8dbc..5c2b4c93ee 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.0"
+// version = "0.46.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 21c51611c8..5dda345223 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.0"
+version = "0.46.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 09ba8074ca..0ca8591668 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.0"
+version = "0.46.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.46.0"
+version = "0.46.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 89e4afc993..a6a3d4d578 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.0"
+version = "0.46.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 60e559ed10..18a72e91bc 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.0"
+version = "0.46.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 70a56322e3..27a7cfe93f 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.0"
+version = "0.46.1"
 path = "../../../contracts/modules"
 
 [dependencies.multiversx-sc]
-version = "0.46.0"
+version = "0.46.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.46.0"
+version = "0.46.1"
 path = "../../../framework/scenario"
 
 [dev-dependencies.multiversx-sc-meta]
-version = "0.46.0"
+version = "0.46.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 423757096b..6e4b463d33 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.0"
+version = "0.46.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 6d57ba2907..de07a67e9d 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.0"
+version = "0.46.1"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.46.0"
+version = "0.46.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 b057b7400f..edd5662ec7 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.0"
+            "version": "0.46.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 c525166edd..96de21a497 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.0"
+            "version": "0.46.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 62cb812406..6bd043c988 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.0"
+version = "0.46.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 daa47af3b6..1a40c8133a 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.0"
+version = "0.46.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/modules/Cargo.toml b/contracts/modules/Cargo.toml
index 0805864547..e7e33ea731 100644
--- a/contracts/modules/Cargo.toml
+++ b/contracts/modules/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-modules"
-version = "0.46.0"
+version = "0.46.1"
 edition = "2021"
 
 authors = ["MultiversX <contact@multiversx.com>"]
@@ -17,5 +17,5 @@ categories = ["no-std", "wasm", "cryptography::cryptocurrencies"]
 alloc = ["multiversx-sc/alloc"]
 
 [dependencies.multiversx-sc]
-version = "0.46.0"
+version = "0.46.1"
 path = "../../framework/base"
diff --git a/framework/base/Cargo.toml b/framework/base/Cargo.toml
index 1cd3dc6d58..75afbeaadf 100644
--- a/framework/base/Cargo.toml
+++ b/framework/base/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc"
-version = "0.46.0"
+version = "0.46.1"
 edition = "2021"
 
 authors = ["Andrei Marinica <andrei.marinica@multiversx.com>", "MultiversX <contact@multiversx.com>"]
@@ -27,7 +27,7 @@ bitflags = "2.4.1"
 num-traits = { version = "0.2", default-features = false }
 
 [dependencies.multiversx-sc-derive]
-version = "=0.46.0"
+version = "=0.46.1"
 path = "../derive"
 
 [dependencies.multiversx-sc-codec]
diff --git a/framework/derive/Cargo.toml b/framework/derive/Cargo.toml
index c1b9080316..b2c88fcedb 100644
--- a/framework/derive/Cargo.toml
+++ b/framework/derive/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-derive"
-version = "0.46.0"
+version = "0.46.1"
 edition = "2021"
 
 authors = ["Andrei Marinica <andrei.marinica@multiversx.com>", "MultiversX <contact@multiversx.com>"]
diff --git a/framework/meta/Cargo.toml b/framework/meta/Cargo.toml
index 66b45a9624..eb3a2ec73d 100644
--- a/framework/meta/Cargo.toml
+++ b/framework/meta/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-meta"
-version = "0.46.0"
+version = "0.46.1"
 edition = "2021"
 
 authors = [
@@ -51,7 +51,7 @@ pathdiff = { version = "0.2.1", optional = true }
 common-path = { version = "1.0.0", optional = true }
 
 [dependencies.multiversx-sc]
-version = "=0.46.0"
+version = "=0.46.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 a66e66fcaa..04c549bc3e 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.0"
+version = "0.46.1"
 
 # [workspace]
 
diff --git a/framework/meta/src/cmd/contract/meta_config.rs b/framework/meta/src/cmd/contract/meta_config.rs
index 617a03ff7b..60c02533ac 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.0\"
+version = \"0.46.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.46.0".to_string(),
+            framework_version: "0.46.1".to_string(),
             framework_path: Option::Some("../../../framework/base".to_string()),
             contract_features: Vec::<String>::new(),
         };
diff --git a/framework/meta/src/version_history.rs b/framework/meta/src/version_history.rs
index d64494f15f..7c9b2884ad 100644
--- a/framework/meta/src/version_history.rs
+++ b/framework/meta/src/version_history.rs
@@ -1,7 +1,7 @@
 /// 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.46.0";
+pub const LAST_VERSION: &str = "0.46.1";
 
 /// Indicates where to stop with the upgrades.
 pub const LAST_UPGRADE_VERSION: &str = LAST_VERSION;
@@ -54,6 +54,7 @@ pub const VERSIONS: &[&str] = &[
     "0.45.0",
     "0.45.2",
     "0.46.0",
+    "0.46.1",
 ];
 
 /// We started supporting contract templates with version 0.43.0.
diff --git a/framework/scenario/Cargo.toml b/framework/scenario/Cargo.toml
index 088cb3e711..58d10c8e60 100644
--- a/framework/scenario/Cargo.toml
+++ b/framework/scenario/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-scenario"
-version = "0.46.0"
+version = "0.46.1"
 edition = "2021"
 
 authors = [
@@ -40,12 +40,12 @@ path = "src/main.rs"
 run-go-tests = []
 
 [dependencies.multiversx-sc]
-version = "=0.46.0"
+version = "=0.46.1"
 features = ["alloc", "num-bigint"]
 path = "../base"
 
 [dependencies.multiversx-sc-meta]
-version = "=0.46.0"
+version = "=0.46.1"
 path = "../meta"
 
 [dependencies.multiversx-chain-scenario-format]
diff --git a/framework/snippets/Cargo.toml b/framework/snippets/Cargo.toml
index cb5d99c0c0..d4ae1f888e 100644
--- a/framework/snippets/Cargo.toml
+++ b/framework/snippets/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-snippets"
-version = "0.46.0"
+version = "0.46.1"
 edition = "2021"
 
 authors = ["MultiversX <contact@multiversx.com>"]
@@ -22,7 +22,7 @@ env_logger = "0.10"
 futures = "0.3"
 
 [dependencies.multiversx-sc-scenario]
-version = "=0.46.0"
+version = "=0.46.1"
 path = "../scenario"
 
 [dependencies.multiversx-sdk]
diff --git a/framework/wasm-adapter/Cargo.toml b/framework/wasm-adapter/Cargo.toml
index 45051c31c4..3fd08172df 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.0"
+version = "0.46.1"
 edition = "2021"
 
 authors = [
@@ -22,5 +22,5 @@ categories = [
 ]
 
 [dependencies.multiversx-sc]
-version = "=0.46.0"
+version = "=0.46.1"
 path = "../base"
diff --git a/tools/mxpy-snippet-generator/Cargo.toml b/tools/mxpy-snippet-generator/Cargo.toml
index afb2cb9052..3580d6fd32 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.0"
+version = "0.46.1"
 path = "../../framework/base"
 
 [dependencies]
diff --git a/tools/rust-debugger/format-tests/Cargo.toml b/tools/rust-debugger/format-tests/Cargo.toml
index 37b652f11d..b628bad206 100644
--- a/tools/rust-debugger/format-tests/Cargo.toml
+++ b/tools/rust-debugger/format-tests/Cargo.toml
@@ -9,11 +9,11 @@ name = "format-tests"
 path = "src/format_tests.rs"
 
 [dependencies.multiversx-sc]
-version = "0.46.0"
+version = "0.46.1"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-scenario]
-version = "0.46.0"
+version = "0.46.1"
 path = "../../../framework/scenario"
 
 [dependencies.multiversx-chain-vm]

From fa497ead0a16b2a15b7c5c834526ffeeb6467891 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 10 Jan 2024 14:20:00 +0200
Subject: [PATCH 0199/1254] Cargo.lock update

---
 .../benchmarks/large-storage/wasm/Cargo.lock  | 10 ++++-----
 .../linked-list-repeat/wasm/Cargo.lock        | 10 ++++-----
 .../mappers/map-repeat/wasm/Cargo.lock        | 10 ++++-----
 .../mappers/queue-repeat/wasm/Cargo.lock      | 10 ++++-----
 .../mappers/set-repeat/wasm/Cargo.lock        | 10 ++++-----
 .../single-value-repeat/wasm/Cargo.lock       | 10 ++++-----
 .../mappers/vec-repeat/wasm/Cargo.lock        | 10 ++++-----
 .../benchmarks/send-tx-repeat/wasm/Cargo.lock | 10 ++++-----
 .../benchmarks/str-repeat/wasm/Cargo.lock     | 10 ++++-----
 .../core/price-aggregator/wasm/Cargo.lock     | 22 +++++++++----------
 contracts/examples/adder/wasm/Cargo.lock      | 10 ++++-----
 .../bonding-curve-contract/wasm/Cargo.lock    | 12 +++++-----
 .../examples/check-pause/wasm/Cargo.lock      | 12 +++++-----
 .../crowdfunding-esdt/wasm/Cargo.lock         | 10 ++++-----
 .../examples/crypto-bubbles/wasm/Cargo.lock   | 10 ++++-----
 .../kitty-auction/wasm/Cargo.lock             | 10 ++++-----
 .../kitty-genetic-alg/wasm/Cargo.lock         | 10 ++++-----
 .../kitty-ownership/wasm/Cargo.lock           | 10 ++++-----
 .../examples/crypto-zombies/wasm/Cargo.lock   | 10 ++++-----
 .../examples/digital-cash/wasm/Cargo.lock     | 10 ++++-----
 contracts/examples/empty/wasm/Cargo.lock      | 10 ++++-----
 .../esdt-transfer-with-fee/wasm/Cargo.lock    | 10 ++++-----
 contracts/examples/factorial/wasm/Cargo.lock  | 10 ++++-----
 .../examples/fractional-nfts/wasm/Cargo.lock  | 12 +++++-----
 .../examples/lottery-esdt/wasm/Cargo.lock     | 10 ++++-----
 .../multisig/wasm-multisig-full/Cargo.lock    | 12 +++++-----
 .../multisig/wasm-multisig-view/Cargo.lock    | 12 +++++-----
 contracts/examples/multisig/wasm/Cargo.lock   | 12 +++++-----
 contracts/examples/nft-minter/wasm/Cargo.lock | 10 ++++-----
 .../nft-storage-prepay/wasm/Cargo.lock        | 10 ++++-----
 .../examples/nft-subscription/wasm/Cargo.lock | 12 +++++-----
 .../order-book/factory/wasm/Cargo.lock        | 10 ++++-----
 .../examples/order-book/pair/wasm/Cargo.lock  | 10 ++++-----
 .../examples/ping-pong-egld/wasm/Cargo.lock   | 10 ++++-----
 .../examples/proxy-pause/wasm/Cargo.lock      | 10 ++++-----
 .../rewards-distribution/wasm/Cargo.lock      | 12 +++++-----
 .../examples/seed-nft-minter/wasm/Cargo.lock  | 12 +++++-----
 .../examples/token-release/wasm/Cargo.lock    | 10 ++++-----
 .../abi-tester/wasm-abi-tester-ev/Cargo.lock  | 10 ++++-----
 .../feature-tests/abi-tester/wasm/Cargo.lock  | 10 ++++-----
 .../alloc-features/wasm/Cargo.lock            | 10 ++++-----
 .../Cargo.lock                                | 12 +++++-----
 .../basic-features/wasm/Cargo.lock            | 12 +++++-----
 .../big-float-features/wasm/Cargo.lock        | 10 ++++-----
 .../builtin-func-features/wasm/Cargo.lock     | 10 ++++-----
 .../first-contract/wasm/Cargo.lock            | 10 ++++-----
 .../second-contract/wasm/Cargo.lock           | 10 ++++-----
 .../child/wasm/Cargo.lock                     | 10 ++++-----
 .../parent/wasm/Cargo.lock                    | 10 ++++-----
 .../wasm-forwarder-queue-promises/Cargo.lock  | 10 ++++-----
 .../forwarder-queue/wasm/Cargo.lock           | 10 ++++-----
 .../Cargo.lock                                | 10 ++++-----
 .../Cargo.lock                                | 10 ++++-----
 .../forwarder-raw/wasm/Cargo.lock             | 10 ++++-----
 .../composability/forwarder/wasm/Cargo.lock   | 10 ++++-----
 .../local-esdt-and-nft/wasm/Cargo.lock        | 10 ++++-----
 .../promises-features/wasm/Cargo.lock         | 10 ++++-----
 .../proxy-test-first/wasm/Cargo.lock          | 10 ++++-----
 .../proxy-test-second/wasm/Cargo.lock         | 10 ++++-----
 .../recursive-caller/wasm/Cargo.lock          | 10 ++++-----
 .../transfer-role-features/wasm/Cargo.lock    | 12 +++++-----
 .../vault/wasm-vault-promises/Cargo.lock      | 10 ++++-----
 .../vault/wasm-vault-upgrade/Cargo.lock       | 10 ++++-----
 .../composability/vault/wasm/Cargo.lock       | 10 ++++-----
 .../crowdfunding-erc20/wasm/Cargo.lock        | 10 ++++-----
 .../erc1155-marketplace/wasm/Cargo.lock       | 10 ++++-----
 .../erc1155-user-mock/wasm/Cargo.lock         | 10 ++++-----
 .../erc1155/wasm/Cargo.lock                   | 10 ++++-----
 .../erc-style-contracts/erc20/wasm/Cargo.lock | 10 ++++-----
 .../erc721/wasm/Cargo.lock                    | 10 ++++-----
 .../lottery-erc20/wasm/Cargo.lock             | 10 ++++-----
 .../esdt-system-sc-mock/wasm/Cargo.lock       | 10 ++++-----
 .../wasm/Cargo.lock                           | 10 ++++-----
 .../managed-map-features/wasm/Cargo.lock      | 10 ++++-----
 .../wasm-multi-contract-alt-impl/Cargo.lock   | 10 ++++-----
 .../Cargo.lock                                | 10 ++++-----
 .../Cargo.lock                                | 10 ++++-----
 .../multi-contract-features/wasm/Cargo.lock   | 10 ++++-----
 .../panic-message-features/wasm/Cargo.lock    | 10 ++++-----
 .../payable-features/wasm/Cargo.lock          | 10 ++++-----
 .../wasm/Cargo.lock                           | 10 ++++-----
 .../wasm/Cargo.lock                           | 10 ++++-----
 .../wasm-use-module-view/Cargo.lock           | 12 +++++-----
 .../feature-tests/use-module/wasm/Cargo.lock  | 12 +++++-----
 84 files changed, 440 insertions(+), 440 deletions(-)

diff --git a/contracts/benchmarks/large-storage/wasm/Cargo.lock b/contracts/benchmarks/large-storage/wasm/Cargo.lock
index 62a9b3b0cd..f7578c17eb 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.0"
+version = "0.46.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -120,9 +120,9 @@ dependencies = [
 
 [[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/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.lock
index 1be3a80866..865feb06b2 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.0"
+version = "0.46.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -92,7 +92,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -103,7 +103,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -128,9 +128,9 @@ dependencies = [
 
 [[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/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.lock
index 1360076bc7..a305fb4d84 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.0"
+version = "0.46.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -92,7 +92,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -103,7 +103,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -128,9 +128,9 @@ dependencies = [
 
 [[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/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.lock
index 70006738ac..0b6767056b 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.0"
+version = "0.46.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -112,9 +112,9 @@ dependencies = [
 
 [[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/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.lock
index 0de929de46..b46b5963ae 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.0"
+version = "0.46.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -112,9 +112,9 @@ dependencies = [
 
 [[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/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.lock
index fdb834b1ed..f30ce455cc 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.0"
+version = "0.46.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -112,9 +112,9 @@ dependencies = [
 
 [[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/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.lock
index 4ed628d0e9..f444221a6d 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.0"
+version = "0.46.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -112,9 +112,9 @@ dependencies = [
 
 [[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/contracts/benchmarks/send-tx-repeat/wasm/Cargo.lock b/contracts/benchmarks/send-tx-repeat/wasm/Cargo.lock
index ce6b9830de..6f4aad21af 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.0"
+version = "0.46.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -105,9 +105,9 @@ dependencies = [
 
 [[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/contracts/benchmarks/str-repeat/wasm/Cargo.lock b/contracts/benchmarks/str-repeat/wasm/Cargo.lock
index 8ab3459f0b..85971db909 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.0"
+version = "0.46.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -105,9 +105,9 @@ dependencies = [
 
 [[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/contracts/core/price-aggregator/wasm/Cargo.lock b/contracts/core/price-aggregator/wasm/Cargo.lock
index 70ece89e77..4c20eeb801 100644
--- a/contracts/core/price-aggregator/wasm/Cargo.lock
+++ b/contracts/core/price-aggregator/wasm/Cargo.lock
@@ -40,9 +40,9 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "getrandom"
-version = "0.2.11"
+version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f"
+checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -74,9 +74,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.151"
+version = "0.2.152"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4"
+checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7"
 
 [[package]]
 name = "log"
@@ -86,7 +86,7 @@ checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
 
 [[package]]
 name = "multiversx-price-aggregator-sc"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "arrayvec",
  "getrandom",
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -134,7 +134,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -145,14 +145,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -189,9 +189,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/contracts/examples/adder/wasm/Cargo.lock b/contracts/examples/adder/wasm/Cargo.lock
index 71b185caec..d5ccf9fe95 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.0"
+version = "0.46.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -120,9 +120,9 @@ dependencies = [
 
 [[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/contracts/examples/bonding-curve-contract/wasm/Cargo.lock b/contracts/examples/bonding-curve-contract/wasm/Cargo.lock
index 8ded0d0f89..f316b29a68 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.0"
+version = "0.46.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,14 +96,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -128,9 +128,9 @@ dependencies = [
 
 [[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/contracts/examples/check-pause/wasm/Cargo.lock b/contracts/examples/check-pause/wasm/Cargo.lock
index d3ca59018b..b93cb593fa 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.0"
+version = "0.46.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,14 +96,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -128,9 +128,9 @@ dependencies = [
 
 [[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/contracts/examples/crowdfunding-esdt/wasm/Cargo.lock b/contracts/examples/crowdfunding-esdt/wasm/Cargo.lock
index f60ea5da26..b9da01b4cf 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.0"
+version = "0.46.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -120,9 +120,9 @@ dependencies = [
 
 [[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/contracts/examples/crypto-bubbles/wasm/Cargo.lock b/contracts/examples/crypto-bubbles/wasm/Cargo.lock
index c330459913..36badd1ea7 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.0"
+version = "0.46.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -120,9 +120,9 @@ dependencies = [
 
 [[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/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.lock b/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.lock
index 43fc44ce4a..7597118097 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.0"
+version = "0.46.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -113,7 +113,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -124,7 +124,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -149,9 +149,9 @@ dependencies = [
 
 [[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/contracts/examples/crypto-kitties/kitty-genetic-alg/wasm/Cargo.lock b/contracts/examples/crypto-kitties/kitty-genetic-alg/wasm/Cargo.lock
index 4b4ca68f36..7df64103d0 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.0"
+version = "0.46.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -130,9 +130,9 @@ dependencies = [
 
 [[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/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.lock b/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.lock
index 2421c43d25..54cd6e89c8 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.0"
+version = "0.46.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -104,7 +104,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -115,7 +115,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -140,9 +140,9 @@ dependencies = [
 
 [[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/contracts/examples/crypto-zombies/wasm/Cargo.lock b/contracts/examples/crypto-zombies/wasm/Cargo.lock
index 1b66c359ca..fdc153930c 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.0"
+version = "0.46.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -120,9 +120,9 @@ dependencies = [
 
 [[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/contracts/examples/digital-cash/wasm/Cargo.lock b/contracts/examples/digital-cash/wasm/Cargo.lock
index 1e664ecbfe..7000e06c0e 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.0"
+version = "0.46.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -120,9 +120,9 @@ dependencies = [
 
 [[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/contracts/examples/empty/wasm/Cargo.lock b/contracts/examples/empty/wasm/Cargo.lock
index 07a104e2ca..22d503edb5 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.0"
+version = "0.46.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -120,9 +120,9 @@ dependencies = [
 
 [[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/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.lock b/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.lock
index d0a983bc5e..1562988c6f 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.0"
+version = "0.46.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -120,9 +120,9 @@ dependencies = [
 
 [[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/contracts/examples/factorial/wasm/Cargo.lock b/contracts/examples/factorial/wasm/Cargo.lock
index 7c900b9bbb..1e6b404d24 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.0"
+version = "0.46.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -120,9 +120,9 @@ dependencies = [
 
 [[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/contracts/examples/fractional-nfts/wasm/Cargo.lock b/contracts/examples/fractional-nfts/wasm/Cargo.lock
index 7bc5f90bd8..28932ba2e1 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.0"
+version = "0.46.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,14 +96,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -128,9 +128,9 @@ dependencies = [
 
 [[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/contracts/examples/lottery-esdt/wasm/Cargo.lock b/contracts/examples/lottery-esdt/wasm/Cargo.lock
index 731ecb8789..009a98f9a5 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.0"
+version = "0.46.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -120,9 +120,9 @@ dependencies = [
 
 [[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/contracts/examples/multisig/wasm-multisig-full/Cargo.lock b/contracts/examples/multisig/wasm-multisig-full/Cargo.lock
index 34a4c491bb..ad9b78e465 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.0"
+version = "0.46.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,14 +96,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -128,9 +128,9 @@ dependencies = [
 
 [[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/contracts/examples/multisig/wasm-multisig-view/Cargo.lock b/contracts/examples/multisig/wasm-multisig-view/Cargo.lock
index 19dc24f2f8..eae75c8b53 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.0"
+version = "0.46.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,14 +96,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -128,9 +128,9 @@ dependencies = [
 
 [[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/contracts/examples/multisig/wasm/Cargo.lock b/contracts/examples/multisig/wasm/Cargo.lock
index 9b8243c2f0..0e7f91fa9a 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.0"
+version = "0.46.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,14 +96,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -128,9 +128,9 @@ dependencies = [
 
 [[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/contracts/examples/nft-minter/wasm/Cargo.lock b/contracts/examples/nft-minter/wasm/Cargo.lock
index 35c8e0b197..67427fb777 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.0"
+version = "0.46.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -120,9 +120,9 @@ dependencies = [
 
 [[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/contracts/examples/nft-storage-prepay/wasm/Cargo.lock b/contracts/examples/nft-storage-prepay/wasm/Cargo.lock
index 29d629ebdb..d3ef1a1857 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.0"
+version = "0.46.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -120,9 +120,9 @@ dependencies = [
 
 [[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/contracts/examples/nft-subscription/wasm/Cargo.lock b/contracts/examples/nft-subscription/wasm/Cargo.lock
index ccf6c5e372..47282821fb 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.0"
+version = "0.46.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,14 +80,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -128,9 +128,9 @@ dependencies = [
 
 [[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/contracts/examples/order-book/factory/wasm/Cargo.lock b/contracts/examples/order-book/factory/wasm/Cargo.lock
index a5a8f7ac19..a9bd9059b8 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.0"
+version = "0.46.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -120,9 +120,9 @@ dependencies = [
 
 [[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/contracts/examples/order-book/pair/wasm/Cargo.lock b/contracts/examples/order-book/pair/wasm/Cargo.lock
index 80f51ad0d3..d462ec308d 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.0"
+version = "0.46.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -120,9 +120,9 @@ dependencies = [
 
 [[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/contracts/examples/ping-pong-egld/wasm/Cargo.lock b/contracts/examples/ping-pong-egld/wasm/Cargo.lock
index c38022f42c..bea6aeaad2 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.0"
+version = "0.46.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -120,9 +120,9 @@ dependencies = [
 
 [[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/contracts/examples/proxy-pause/wasm/Cargo.lock b/contracts/examples/proxy-pause/wasm/Cargo.lock
index 0f9fe1c73c..229ad39851 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.0"
+version = "0.46.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -105,9 +105,9 @@ dependencies = [
 
 [[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/contracts/examples/rewards-distribution/wasm/Cargo.lock b/contracts/examples/rewards-distribution/wasm/Cargo.lock
index 8bb64c5c43..0de4c30fe4 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.0"
+version = "0.46.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,14 +80,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -112,9 +112,9 @@ dependencies = [
 
 [[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/contracts/examples/seed-nft-minter/wasm/Cargo.lock b/contracts/examples/seed-nft-minter/wasm/Cargo.lock
index 8fefd33a6d..894b478a10 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.0"
+version = "0.46.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,14 +80,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -112,9 +112,9 @@ dependencies = [
 
 [[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/contracts/examples/token-release/wasm/Cargo.lock b/contracts/examples/token-release/wasm/Cargo.lock
index c494baf824..d35c83d474 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.0"
+version = "0.46.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -105,9 +105,9 @@ dependencies = [
 
 [[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/contracts/feature-tests/abi-tester/wasm-abi-tester-ev/Cargo.lock b/contracts/feature-tests/abi-tester/wasm-abi-tester-ev/Cargo.lock
index 44eec18224..e9b109f695 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.0"
+version = "0.46.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -120,9 +120,9 @@ dependencies = [
 
 [[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/contracts/feature-tests/abi-tester/wasm/Cargo.lock b/contracts/feature-tests/abi-tester/wasm/Cargo.lock
index 703633cd37..e1dc4c8202 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.0"
+version = "0.46.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -120,9 +120,9 @@ dependencies = [
 
 [[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/contracts/feature-tests/alloc-features/wasm/Cargo.lock b/contracts/feature-tests/alloc-features/wasm/Cargo.lock
index 14b5077ae5..4c596241a5 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.0"
+version = "0.46.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -120,9 +120,9 @@ dependencies = [
 
 [[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/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 49b3025615..be10760fe0 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.0"
+version = "0.46.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,14 +96,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -128,9 +128,9 @@ dependencies = [
 
 [[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/contracts/feature-tests/basic-features/wasm/Cargo.lock b/contracts/feature-tests/basic-features/wasm/Cargo.lock
index c09ff6c10d..8b7ca698fe 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.0"
+version = "0.46.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,14 +96,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -128,9 +128,9 @@ dependencies = [
 
 [[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/contracts/feature-tests/big-float-features/wasm/Cargo.lock b/contracts/feature-tests/big-float-features/wasm/Cargo.lock
index 1d60ce2897..50766e3e47 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.0"
+version = "0.46.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -120,9 +120,9 @@ dependencies = [
 
 [[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/contracts/feature-tests/composability/builtin-func-features/wasm/Cargo.lock b/contracts/feature-tests/composability/builtin-func-features/wasm/Cargo.lock
index 89b5d72d19..3ba60b74da 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.0"
+version = "0.46.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -120,9 +120,9 @@ dependencies = [
 
 [[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/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 74ea616d67..c5b7487dfa 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.0"
+version = "0.46.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -120,9 +120,9 @@ dependencies = [
 
 [[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/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 1a69044e83..10e0439758 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.0"
+version = "0.46.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -105,9 +105,9 @@ dependencies = [
 
 [[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/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 fd461778db..13707243be 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.0"
+version = "0.46.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -120,9 +120,9 @@ dependencies = [
 
 [[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/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 b7bf51d258..f7fb9fc4a4 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.0"
+version = "0.46.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -128,9 +128,9 @@ dependencies = [
 
 [[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/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 d54f7ff7d5..44f527c903 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.0"
+version = "0.46.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,7 +96,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -121,9 +121,9 @@ dependencies = [
 
 [[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/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock
index 60e00321de..0b1c9ad4bd 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.0"
+version = "0.46.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,7 +96,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -121,9 +121,9 @@ dependencies = [
 
 [[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/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 329ddce911..be1230e15d 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.0"
+version = "0.46.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -120,9 +120,9 @@ dependencies = [
 
 [[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/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 0c4e2cf748..e445a2c209 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.0"
+version = "0.46.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -120,9 +120,9 @@ dependencies = [
 
 [[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/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.lock
index 0e1abae5ee..1e93b51559 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.0"
+version = "0.46.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -120,9 +120,9 @@ dependencies = [
 
 [[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/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock
index 529a36765f..eda27af4b8 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.0"
+version = "0.46.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,7 +96,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -121,9 +121,9 @@ dependencies = [
 
 [[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/contracts/feature-tests/composability/local-esdt-and-nft/wasm/Cargo.lock b/contracts/feature-tests/composability/local-esdt-and-nft/wasm/Cargo.lock
index fc183b7feb..ba0cba5dcf 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.0"
+version = "0.46.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -120,9 +120,9 @@ dependencies = [
 
 [[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/contracts/feature-tests/composability/promises-features/wasm/Cargo.lock b/contracts/feature-tests/composability/promises-features/wasm/Cargo.lock
index b6a7a48b45..269e6986bb 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.0"
+version = "0.46.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -105,9 +105,9 @@ dependencies = [
 
 [[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/contracts/feature-tests/composability/proxy-test-first/wasm/Cargo.lock b/contracts/feature-tests/composability/proxy-test-first/wasm/Cargo.lock
index 58274960e9..6144fd2d4a 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.0"
+version = "0.46.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -105,9 +105,9 @@ dependencies = [
 
 [[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/contracts/feature-tests/composability/proxy-test-second/wasm/Cargo.lock b/contracts/feature-tests/composability/proxy-test-second/wasm/Cargo.lock
index e7a9edc71c..02e2b79acd 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.0"
+version = "0.46.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -105,9 +105,9 @@ dependencies = [
 
 [[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/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.lock b/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.lock
index ecf088cbfa..b62cc90d95 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.0"
+version = "0.46.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -105,9 +105,9 @@ dependencies = [
 
 [[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/contracts/feature-tests/composability/transfer-role-features/wasm/Cargo.lock b/contracts/feature-tests/composability/transfer-role-features/wasm/Cargo.lock
index 777491b60e..188013b157 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.0"
+version = "0.46.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,14 +80,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -112,9 +112,9 @@ dependencies = [
 
 [[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/contracts/feature-tests/composability/vault/wasm-vault-promises/Cargo.lock b/contracts/feature-tests/composability/vault/wasm-vault-promises/Cargo.lock
index 0c9ec11311..32b6d926b2 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.0"
+version = "0.46.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -105,9 +105,9 @@ dependencies = [
 
 [[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/contracts/feature-tests/composability/vault/wasm-vault-upgrade/Cargo.lock b/contracts/feature-tests/composability/vault/wasm-vault-upgrade/Cargo.lock
index fee1a244dd..25368cfe90 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.0"
+version = "0.46.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -105,9 +105,9 @@ dependencies = [
 
 [[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/contracts/feature-tests/composability/vault/wasm/Cargo.lock b/contracts/feature-tests/composability/vault/wasm/Cargo.lock
index a542d8c073..6ad1368d39 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.0"
+version = "0.46.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -105,9 +105,9 @@ dependencies = [
 
 [[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/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/wasm/Cargo.lock b/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/wasm/Cargo.lock
index 7d74090fae..5c8aababa7 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.0"
+version = "0.46.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -92,7 +92,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -103,7 +103,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -128,9 +128,9 @@ dependencies = [
 
 [[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/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/wasm/Cargo.lock b/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/wasm/Cargo.lock
index 4d26a1b652..44a611cda6 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.0"
+version = "0.46.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -92,7 +92,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -103,7 +103,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -128,9 +128,9 @@ dependencies = [
 
 [[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/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 e87aa86eef..3d48bf1334 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.0"
+version = "0.46.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -120,9 +120,9 @@ dependencies = [
 
 [[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/contracts/feature-tests/erc-style-contracts/erc1155/wasm/Cargo.lock b/contracts/feature-tests/erc-style-contracts/erc1155/wasm/Cargo.lock
index f933f3fd5e..0e30e1ec3f 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.0"
+version = "0.46.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -120,9 +120,9 @@ dependencies = [
 
 [[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/contracts/feature-tests/erc-style-contracts/erc20/wasm/Cargo.lock b/contracts/feature-tests/erc-style-contracts/erc20/wasm/Cargo.lock
index 637ca4e1bf..1a5ad7c5cd 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.0"
+version = "0.46.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -120,9 +120,9 @@ dependencies = [
 
 [[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/contracts/feature-tests/erc-style-contracts/erc721/wasm/Cargo.lock b/contracts/feature-tests/erc-style-contracts/erc721/wasm/Cargo.lock
index ce98725ca0..302082f4e3 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.0"
+version = "0.46.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -120,9 +120,9 @@ dependencies = [
 
 [[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/contracts/feature-tests/erc-style-contracts/lottery-erc20/wasm/Cargo.lock b/contracts/feature-tests/erc-style-contracts/lottery-erc20/wasm/Cargo.lock
index c6a9ca3b55..24e6d7623f 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.0"
+version = "0.46.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -92,7 +92,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -103,7 +103,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -128,9 +128,9 @@ dependencies = [
 
 [[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/contracts/feature-tests/esdt-system-sc-mock/wasm/Cargo.lock b/contracts/feature-tests/esdt-system-sc-mock/wasm/Cargo.lock
index cafffd0911..d249a2fe5d 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.0"
+version = "0.46.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -120,9 +120,9 @@ dependencies = [
 
 [[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/contracts/feature-tests/formatted-message-features/wasm/Cargo.lock b/contracts/feature-tests/formatted-message-features/wasm/Cargo.lock
index 0ea2e253d3..571af529d1 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.0"
+version = "0.46.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -120,9 +120,9 @@ dependencies = [
 
 [[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/contracts/feature-tests/managed-map-features/wasm/Cargo.lock b/contracts/feature-tests/managed-map-features/wasm/Cargo.lock
index 989ed67040..f60d76c934 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.0"
+version = "0.46.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -120,9 +120,9 @@ dependencies = [
 
 [[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/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 aa5eba60ce..a55956cd2a 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.0"
+version = "0.46.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -120,9 +120,9 @@ dependencies = [
 
 [[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/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 d23c61c0da..3b4bb140a7 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.0"
+version = "0.46.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -120,9 +120,9 @@ dependencies = [
 
 [[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/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 a99bdf9c44..b059708f67 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.0"
+version = "0.46.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -120,9 +120,9 @@ dependencies = [
 
 [[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/contracts/feature-tests/multi-contract-features/wasm/Cargo.lock b/contracts/feature-tests/multi-contract-features/wasm/Cargo.lock
index 4fa79ed219..9a50257f17 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.0"
+version = "0.46.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -120,9 +120,9 @@ dependencies = [
 
 [[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/contracts/feature-tests/panic-message-features/wasm/Cargo.lock b/contracts/feature-tests/panic-message-features/wasm/Cargo.lock
index 81c7d2923b..fcc135d4a0 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.0"
+version = "0.46.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -120,9 +120,9 @@ dependencies = [
 
 [[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/contracts/feature-tests/payable-features/wasm/Cargo.lock b/contracts/feature-tests/payable-features/wasm/Cargo.lock
index b52f28f509..e31c56c011 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.0"
+version = "0.46.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -120,9 +120,9 @@ dependencies = [
 
 [[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/contracts/feature-tests/rust-snippets-generator-test/wasm/Cargo.lock b/contracts/feature-tests/rust-snippets-generator-test/wasm/Cargo.lock
index f5493e460b..c6280034d7 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.0"
+version = "0.46.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -105,9 +105,9 @@ dependencies = [
 
 [[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/contracts/feature-tests/rust-testing-framework-tester/wasm/Cargo.lock b/contracts/feature-tests/rust-testing-framework-tester/wasm/Cargo.lock
index f5cd720715..aeb7dd06a1 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.0"
+version = "0.46.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -105,9 +105,9 @@ dependencies = [
 
 [[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/contracts/feature-tests/use-module/wasm-use-module-view/Cargo.lock b/contracts/feature-tests/use-module/wasm-use-module-view/Cargo.lock
index 9d0c10ba92..05ccfe3dd3 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.0"
+version = "0.46.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,14 +80,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -112,9 +112,9 @@ dependencies = [
 
 [[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/contracts/feature-tests/use-module/wasm/Cargo.lock b/contracts/feature-tests/use-module/wasm/Cargo.lock
index 1887025b85..40021a38d6 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.0"
+version = "0.46.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,14 +80,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -112,9 +112,9 @@ dependencies = [
 
 [[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",
 ]

From 5049648649608ff1700d757c677e756cdbea5df1 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Wed, 10 Jan 2024 21:47:05 +0200
Subject: [PATCH 0200/1254] 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<SA, K, V>
+pub struct MapMapper<SA, A, K, V>
 where
     SA: StorageMapperApi,
     K: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static,
+    A: StorageAddress<SA>,
     V: TopEncode + TopDecode + 'static,
 {
     _phantom_api: PhantomData<SA>,
     base_key: StorageKey<SA>,
-    keys_set: SetMapper<SA, K>,
+    keys_set: SetMapper<SA, A, K>,
     _phantom_value: PhantomData<V>,
 }
 
-impl<SA, K, V> StorageMapper<SA> for MapMapper<SA, K, V>
+impl<SA, K, V> StorageMapper<SA> for MapMapper<SA, StorageSCAddress, K, V>
 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::<SA, K>::new(base_key),
+            keys_set: SetMapper::new(base_key),
             _phantom_value: PhantomData,
         }
     }
 }
 
-impl<SA, K, V> StorageClearable for MapMapper<SA, K, V>
+impl<SA, K, V> StorageClearable for MapMapper<SA, StorageSCAddress, K, V>
 where
     SA: StorageMapperApi,
     K: TopEncode + TopDecode + NestedEncode + NestedDecode,
@@ -57,7 +61,7 @@ where
     }
 }
 
-impl<SA, K, V> MapMapper<SA, K, V>
+impl<SA, K, V> MapMapper<SA, StorageSCAddress, K, V>
 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<SA, K, V> {
+    pub fn values(&self) -> Values<SA, StorageSCAddress, 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<SA, K, V> {
+    pub fn iter(&self) -> Iter<SA, StorageSCAddress, K, V> {
         Iter::new(self)
     }
 }
 
-impl<'a, SA, K, V> IntoIterator for &'a MapMapper<SA, K, V>
+impl<SA, K, V> MapMapper<SA, ManagedAddress<SA>, K, V>
+where
+    SA: StorageMapperApi,
+    K: TopEncode + TopDecode + NestedEncode + NestedDecode + ManagedTypeApi,
+    V: TopEncode + TopDecode,
+{
+    fn build_named_key(&self, name: &[u8], key: &K) -> StorageKey<SA> {
+        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<SA>, 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<V> {
+        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<SA, K> {
+    //     self.keys_set.iter()
+    // }
+
+    // An iterator visiting all values in arbitrary order.
+    // The iterator element type is `&'a V`.
+    // pub fn values(&self) -> Values<SA, ManagedAddress<SA>, 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<SA, A, K, V> {
+    //     Iter::new(self)
+    // }
+}
+
+impl<'a, SA,  K, V> IntoIterator for &'a MapMapper<SA, StorageSCAddress, K, V>
 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<SA>,
     V: TopEncode + TopDecode + 'static,
 {
     key_iter: Keys<'a, SA, K>,
-    hash_map: &'a MapMapper<SA, K, V>,
+    hash_map: &'a MapMapper<SA, A, K, V>,
 }
 
-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<SA, K, V>) -> Iter<'a, SA, K, V> {
+    fn new(hash_map: &'a MapMapper<SA, StorageSCAddress, K, V>) -> 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<SA>,
     V: TopEncode + TopDecode + 'static,
 {
     key_iter: Keys<'a, SA, K>,
-    hash_map: &'a MapMapper<SA, K, V>,
+    hash_map: &'a MapMapper<SA, A, K, V>,
 }
 
-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<SA, K, V>) -> Values<'a, SA, K, V> {
+    fn new(hash_map: &'a MapMapper<SA, StorageSCAddress, K, V>) -> 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<SA>,
     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<SA>,
     V: TopEncode + TopDecode + 'static,
 {
     pub(super) key: K,
-    pub(super) map: &'a mut MapMapper<SA, K, V>,
+    pub(super) map: &'a mut MapMapper<SA, A, K, V>,
 
     // 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<SA>,
     V: TopEncode + TopDecode + 'static,
 {
     pub(super) key: K,
-    pub(super) map: &'a mut MapMapper<SA, K, V>,
+    pub(super) map: &'a mut MapMapper<SA, A, K, V>,
 
     // 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<F: FnOnce() -> V>(self, default: F) -> OccupiedEntry<'a, SA, K, V> {
+    pub fn or_insert_with<F: FnOnce() -> 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<F: FnOnce(&K) -> V>(self, default: F) -> OccupiedEntry<'a, SA, K, V> {
+    pub fn or_insert_with_key<F: FnOnce(&K) -> 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<MultiValue2<K, V>> when an endpoint result.
-impl<SA, K, V> TopEncodeMulti for MapMapper<SA, K, V>
+impl<SA, K, V> TopEncodeMulti for MapMapper<SA, StorageSCAddress, K, V>
 where
     SA: StorageMapperApi,
     K: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static,
@@ -469,7 +557,7 @@ where
     }
 }
 
-impl<SA, K, V> CodecFrom<MapMapper<SA, K, V>> for MultiValueEncoded<SA, MultiValue2<K, V>>
+impl<SA, K, V> CodecFrom<MapMapper<SA, StorageSCAddress, K, V>> for MultiValueEncoded<SA, MultiValue2<K, V>>
 where
     SA: StorageMapperApi,
     K: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static,
@@ -478,7 +566,7 @@ where
 }
 
 /// Behaves like a MultiResultVec<MultiValue<K, V>> when an endpoint result.
-impl<SA, K, V> TypeAbi for MapMapper<SA, K, V>
+impl<SA, K, V> TypeAbi for MapMapper<SA, StorageSCAddress, K, V>
 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<SA, K, V>
+pub struct MapStorageMapper<SA, A, K, V>
 where
     SA: StorageMapperApi,
     K: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static,
+    A: StorageAddress<SA>,
     V: StorageMapper<SA> + StorageClearable,
 {
     _phantom_api: PhantomData<SA>,
     base_key: StorageKey<SA>,
-    keys_set: SetMapper<SA, K>,
+    keys_set: SetMapper<SA, A, K>,
     _phantom_value: PhantomData<V>,
 }
 
-impl<SA, K, V> StorageMapper<SA> for MapStorageMapper<SA, K, V>
+impl<SA, K, V> StorageMapper<SA> for MapStorageMapper<SA, StorageSCAddress, K, V>
 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::<SA, K>::new(base_key),
+            keys_set: SetMapper::new(base_key),
             _phantom_value: PhantomData,
         }
     }
 }
 
-impl<SA, K, V> StorageClearable for MapStorageMapper<SA, K, V>
+impl<SA, K, V> StorageClearable for MapStorageMapper<SA, StorageSCAddress, K, V>
 where
     SA: StorageMapperApi,
     K: TopEncode + TopDecode + NestedEncode + NestedDecode,
@@ -52,7 +56,7 @@ where
     }
 }
 
-impl<SA, K, V> MapStorageMapper<SA, K, V>
+impl<SA, K, V> MapStorageMapper<SA, StorageSCAddress, K, V>
 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<SA, K, V> {
+    pub fn entry(&mut self, key: K) -> Entry<SA, StorageSCAddress, K, V> {
         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<SA, K, V> {
+    pub fn values(&self) -> Values<SA, StorageSCAddress, 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<SA, K, V> {
+    pub fn iter(&self) -> Iter<SA, StorageSCAddress, K, V> {
         Iter::new(self)
     }
 }
 
-impl<'a, SA, K, V> IntoIterator for &'a MapStorageMapper<SA, K, V>
+impl<SA, K, V> MapStorageMapper<SA, ManagedAddress<SA>, K, V>
+where
+    SA: StorageMapperApi,
+    K: TopEncode + TopDecode + NestedEncode + NestedDecode + ManagedTypeApi,
+    V: StorageMapper<SA> + StorageClearable,
+{
+    fn build_named_key(&self, name: &[u8], key: &K) -> StorageKey<SA> {
+        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);
+        <V as storage::mappers::StorageMapper<SA>>::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<V> {
+        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<SA, ManagedAddress<SA>, 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<SA, StorageSCAddress, K, V>
 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<SA>,
     V: StorageMapper<SA> + StorageClearable,
 {
     key_iter: Keys<'a, SA, K>,
-    hash_map: &'a MapStorageMapper<SA, K, V>,
+    hash_map: &'a MapStorageMapper<SA, A, K, V>,
 }
 
-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<SA> + StorageClearable,
 {
-    fn new(hash_map: &'a MapStorageMapper<SA, K, V>) -> Iter<'a, SA, K, V> {
+    fn new(
+        hash_map: &'a MapStorageMapper<SA, StorageSCAddress, K, V>,
+    ) -> 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<SA>,
     V: StorageMapper<SA> + StorageClearable,
 {
     key_iter: Keys<'a, SA, K>,
-    hash_map: &'a MapStorageMapper<SA, K, V>,
+    hash_map: &'a MapStorageMapper<SA, A, K, V>,
 }
 
-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<SA> + StorageClearable,
 {
-    fn new(hash_map: &'a MapStorageMapper<SA, K, V>) -> Values<'a, SA, K, V> {
+    fn new(hash_map: &'a MapStorageMapper<SA, StorageSCAddress, K, V>) -> 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<SA>,
     V: StorageMapper<SA> + 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<SA>,
     V: StorageMapper<SA> + StorageClearable,
 {
     pub(super) key: K,
-    pub(super) map: &'a mut MapStorageMapper<SA, K, V>,
+    pub(super) map: &'a mut MapStorageMapper<SA, A, K, V>,
 
     // 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<SA>,
     V: StorageMapper<SA> + StorageClearable,
 {
     pub(super) key: K,
-    pub(super) map: &'a mut MapStorageMapper<SA, K, V>,
+    pub(super) map: &'a mut MapStorageMapper<SA, A, K, V>,
 
     // 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<SA, T>
+pub struct QueueMapper<SA, A, T>
 where
     SA: StorageMapperApi,
-    T: TopEncode + TopDecode + 'static,
+    A: StorageAddress<SA>,
+    T: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static,
 {
     _phantom_api: PhantomData<SA>,
+    address: A,
     base_key: StorageKey<SA>,
     _phantom_item: PhantomData<T>,
 }
 
-impl<SA, T> StorageMapper<SA> for QueueMapper<SA, T>
+impl<SA, T> StorageMapper<SA> for QueueMapper<SA, StorageSCAddress, T>
 where
     SA: StorageMapperApi,
-    T: TopEncode + TopDecode,
+    T: TopEncode + TopDecode + NestedEncode + NestedDecode,
 {
     fn new(base_key: StorageKey<SA>) -> Self {
         QueueMapper {
             _phantom_api: PhantomData,
+            address: StorageSCAddress,
             base_key,
             _phantom_item: PhantomData,
         }
     }
 }
 
-impl<SA, T> StorageClearable for QueueMapper<SA, T>
+impl<SA, T> StorageClearable for QueueMapper<SA, StorageSCAddress, T>
 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<SA, T> QueueMapper<SA, T>
+impl<SA, T> QueueMapper<SA, StorageSCAddress, T>
 where
     SA: StorageMapperApi,
-    T: TopEncode + TopDecode,
+    T: TopEncode + TopDecode + NestedEncode + NestedDecode,
 {
     fn build_node_id_named_key(&self, name: &[u8], node_id: u32) -> StorageKey<SA> {
         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<SA>) -> 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<SA>) -> 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<SA, T>
+impl<SA, T> QueueMapper<SA, ManagedAddress<SA>, T>
+where
+    SA: StorageMapperApi,
+    T: TopEncode + TopDecode + NestedEncode + NestedDecode + ManagedTypeApi,
+{
+    fn build_node_id_named_key(&self, name: &[u8], node_id: u32) -> StorageKey<SA> {
+        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<SA> {
+        let mut name_key = self.base_key.clone();
+        name_key.append_bytes(name);
+        name_key
+    }
+
+    pub fn new_from_address(address: ManagedAddress<SA>, base_key: StorageKey<SA>) -> Self {
+        QueueMapper {
+            _phantom_api: PhantomData::<SA>,
+            address,
+            base_key: base_key.clone(),
+            _phantom_item: PhantomData::<T>,
+        }
+    }
+
+    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<T> {
+        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<T> {
+        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<T> {
+        self.get_value_option(self.get_info().back)
+    }
+
+    // Provides a forward iterator.
+    // pub fn iter(&self) -> Iter<SA, T> {
+    //     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<u32> = 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<SA, StorageSCAddress, T>
 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<SA, T>,
+    queue: &'a QueueMapper<SA, StorageSCAddress, T>,
 }
 
 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<SA, T>) -> Iter<'a, SA, T> {
+    fn new(queue: &'a QueueMapper<SA, StorageSCAddress, T>) -> 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<SA, T> TopEncodeMulti for QueueMapper<SA, T>
+impl<SA, T> TopEncodeMulti for QueueMapper<SA, StorageSCAddress, T>
 where
     SA: StorageMapperApi,
-    T: TopEncode + TopDecode,
+    T: TopEncode + TopDecode + NestedEncode + NestedDecode,
 {
     fn multi_encode_or_handle_err<O, H>(&self, output: &mut O, h: H) -> Result<(), H::HandledErr>
     where
@@ -492,18 +650,18 @@ where
     }
 }
 
-impl<SA, T> CodecFrom<QueueMapper<SA, T>> for MultiValueEncoded<SA, T>
+impl<SA, T> CodecFrom<QueueMapper<SA, StorageSCAddress, T>> for MultiValueEncoded<SA, T>
 where
     SA: StorageMapperApi,
-    T: TopEncode + TopDecode,
+    T: TopEncode + TopDecode + NestedEncode + NestedDecode,
 {
 }
 
 /// Behaves like a MultiResultVec when an endpoint result.
-impl<SA, T> TypeAbi for QueueMapper<SA, T>
+impl<SA, T> TypeAbi for QueueMapper<SA, StorageSCAddress, T>
 where
     SA: StorageMapperApi,
-    T: TopEncode + TopDecode + TypeAbi,
+    T: TopEncode + TopDecode + NestedEncode + NestedDecode + TypeAbi,
 {
     fn type_name() -> TypeName {
         crate::abi::type_name_variadic::<T>()
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<SA, T>
+pub trait StorageAddress<SA>
+where
+    SA: StorageMapperApi ,
+{
+    fn address_storage_get<T: TopDecode>(&self, key: ManagedRef<'_, SA, StorageKey<SA>>) -> T;
+}
+
+pub struct StorageSCAddress;
+
+impl<SA> StorageAddress<SA> for StorageSCAddress
+where
+    SA: StorageMapperApi,
+{
+    fn address_storage_get<T: TopDecode>(&self, key: ManagedRef<'_, SA, StorageKey<SA>>) -> T {
+        storage_get(key)
+    }
+}
+
+impl<SA> StorageAddress<SA> for ManagedAddress<SA>
 where
     SA: StorageMapperApi,
+{
+    fn address_storage_get<T: TopDecode>(&self, key: ManagedRef<'_, SA, StorageKey<SA>>) -> T {
+        storage_get_from_address(self.as_ref(), key)
+    }
+}
+
+pub struct SetMapper<SA, A, T>
+where
+    SA: StorageMapperApi,
+    A: StorageAddress<SA>,
     T: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static,
 {
     _phantom_api: PhantomData<SA>,
+    address: A,
     base_key: StorageKey<SA>,
-    queue_mapper: QueueMapper<SA, T>,
+    queue_mapper: QueueMapper<SA, A, T>,
 }
 
-impl<SA, T> StorageMapper<SA> for SetMapper<SA, T>
+impl<SA, T> StorageMapper<SA> for SetMapper<SA, StorageSCAddress, T>
 where
     SA: StorageMapperApi,
     T: TopEncode + TopDecode + NestedEncode + NestedDecode,
@@ -34,13 +64,14 @@ where
     fn new(base_key: StorageKey<SA>) -> Self {
         SetMapper {
             _phantom_api: PhantomData,
+            address: StorageSCAddress,
             base_key: base_key.clone(),
-            queue_mapper: QueueMapper::<SA, T>::new(base_key),
+            queue_mapper: QueueMapper::new(base_key),
         }
     }
 }
 
-impl<SA, T> StorageClearable for SetMapper<SA, T>
+impl<SA, T> StorageClearable for SetMapper<SA, StorageSCAddress, T>
 where
     SA: StorageMapperApi,
     T: TopEncode + TopDecode + NestedEncode + NestedDecode,
@@ -53,25 +84,67 @@ where
     }
 }
 
-impl<SA, T> SetMapper<SA, T>
+impl<SA, T> SetMapper<SA, ManagedAddress<SA>, 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<SA> {
+    pub fn build_named_value_key(&self, name: &[u8], value: &T) -> StorageKey<SA> {
         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<SA>, base_key: StorageKey<SA>) -> 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<SA, T> SetMapper<SA, StorageSCAddress, T>
+where
+    SA: StorageMapperApi,
+    T: TopEncode + TopDecode + NestedEncode + NestedDecode,
+{
+    pub fn build_named_value_key(&self, name: &[u8], value: &T) -> StorageKey<SA> {
+        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<SA>) -> 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<SA, T>
+impl<'a, SA, T> IntoIterator for &'a SetMapper<SA, StorageSCAddress, T>
 where
     SA: StorageMapperApi,
     T: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static,
@@ -168,7 +244,7 @@ where
     }
 }
 
-impl<SA, T> Extend<T> for SetMapper<SA, T>
+impl<SA, T> Extend<T> for SetMapper<SA, StorageSCAddress, T>
 where
     SA: StorageMapperApi,
     T: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static,
@@ -184,7 +260,7 @@ where
 }
 
 /// Behaves like a MultiResultVec when an endpoint result.
-impl<SA, T> TopEncodeMulti for SetMapper<SA, T>
+impl<SA, T> TopEncodeMulti for SetMapper<SA, StorageSCAddress, T>
 where
     SA: StorageMapperApi,
     T: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static,
@@ -198,7 +274,7 @@ where
     }
 }
 
-impl<SA, T> CodecFrom<SetMapper<SA, T>> for MultiValueEncoded<SA, T>
+impl<SA, T> CodecFrom<SetMapper<SA, StorageSCAddress, T>> for MultiValueEncoded<SA, T>
 where
     SA: StorageMapperApi,
     T: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static,
@@ -206,7 +282,7 @@ where
 }
 
 /// Behaves like a MultiResultVec when an endpoint result.
-impl<SA, T> TypeAbi for SetMapper<SA, T>
+impl<SA, T> TypeAbi for SetMapper<SA, StorageSCAddress, T>
 where
     SA: StorageMapperApi,
     T: TopEncode + TopDecode + NestedEncode + NestedDecode + TypeAbi,

From c998343ebbf8cb2e72e180c512f39076097f2442 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Thu, 11 Jan 2024 11:07:00 +0200
Subject: [PATCH 0201/1254] 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<SA, A, K, V>
+pub struct MapMapper<SA, K, V, A = StorageSCAddress>
 where
     SA: StorageMapperApi,
     K: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static,
@@ -27,11 +27,11 @@ where
 {
     _phantom_api: PhantomData<SA>,
     base_key: StorageKey<SA>,
-    keys_set: SetMapper<SA, A, K>,
+    keys_set: SetMapper<SA, K, A>,
     _phantom_value: PhantomData<V>,
 }
 
-impl<SA, K, V> StorageMapper<SA> for MapMapper<SA, StorageSCAddress, K, V>
+impl<SA, K, V> StorageMapper<SA> for MapMapper<SA, K, V, StorageSCAddress>
 where
     SA: StorageMapperApi,
     K: TopEncode + TopDecode + NestedEncode + NestedDecode,
@@ -47,7 +47,7 @@ where
     }
 }
 
-impl<SA, K, V> StorageClearable for MapMapper<SA, StorageSCAddress, K, V>
+impl<SA, K, V> StorageClearable for MapMapper<SA, K, V, StorageSCAddress>
 where
     SA: StorageMapperApi,
     K: TopEncode + TopDecode + NestedEncode + NestedDecode,
@@ -61,7 +61,7 @@ where
     }
 }
 
-impl<SA, K, V> MapMapper<SA, StorageSCAddress, K, V>
+impl<SA, K, V> MapMapper<SA, K, V, StorageSCAddress>
 where
     SA: StorageMapperApi,
     K: TopEncode + TopDecode + NestedEncode + NestedDecode,
@@ -166,10 +166,10 @@ where
     }
 }
 
-impl<SA, K, V> MapMapper<SA, ManagedAddress<SA>, K, V>
+impl<SA, K, V> MapMapper<SA, K, V, ManagedAddress<SA>>
 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<SA> {
@@ -242,7 +242,7 @@ where
     // }
 }
 
-impl<'a, SA,  K, V> IntoIterator for &'a MapMapper<SA, StorageSCAddress, K, V>
+impl<'a, SA, K, V> IntoIterator for &'a MapMapper<SA, K, V, StorageSCAddress>
 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<SA, A, K, V>,
+    hash_map: &'a MapMapper<SA, K, V, A>,
 }
 
 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<SA, StorageSCAddress, K, V>) -> Iter<'a, SA, StorageSCAddress, K, V> {
+    fn new(
+        hash_map: &'a MapMapper<SA, K, V, StorageSCAddress>,
+    ) -> 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<SA, A, K, V>,
+    hash_map: &'a MapMapper<SA, K, V, A>,
 }
 
 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<SA, StorageSCAddress, K, V>) -> Values<'a, SA, StorageSCAddress, K, V> {
+    fn new(
+        hash_map: &'a MapMapper<SA, K, V, StorageSCAddress>,
+    ) -> 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<SA, A, K, V>,
+    pub(super) map: &'a mut MapMapper<SA, K, V, A>,
 
     // 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<SA, A, K, V>,
+    pub(super) map: &'a mut MapMapper<SA, K, V, A>,
 
     // 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<F: FnOnce() -> V>(self, default: F) -> OccupiedEntry<'a, SA, StorageSCAddress, K, V> {
+    pub fn or_insert_with<F: FnOnce() -> 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<MultiValue2<K, V>> when an endpoint result.
-impl<SA, K, V> TopEncodeMulti for MapMapper<SA, StorageSCAddress, K, V>
+impl<SA, K, V> TopEncodeMulti for MapMapper<SA, K, V, StorageSCAddress>
 where
     SA: StorageMapperApi,
     K: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static,
@@ -557,7 +564,8 @@ where
     }
 }
 
-impl<SA, K, V> CodecFrom<MapMapper<SA, StorageSCAddress, K, V>> for MultiValueEncoded<SA, MultiValue2<K, V>>
+impl<SA, K, V> CodecFrom<MapMapper<SA, K, V, StorageSCAddress>>
+    for MultiValueEncoded<SA, MultiValue2<K, V>>
 where
     SA: StorageMapperApi,
     K: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static,
@@ -566,7 +574,7 @@ where
 }
 
 /// Behaves like a MultiResultVec<MultiValue<K, V>> when an endpoint result.
-impl<SA, K, V> TypeAbi for MapMapper<SA, StorageSCAddress, K, V>
+impl<SA, K, V> TypeAbi for MapMapper<SA, K, V, StorageSCAddress>
 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<SA, A, K, V>
+pub struct MapStorageMapper<SA, K, V, A = StorageSCAddress>
 where
     SA: StorageMapperApi,
     K: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static,
@@ -22,11 +22,11 @@ where
 {
     _phantom_api: PhantomData<SA>,
     base_key: StorageKey<SA>,
-    keys_set: SetMapper<SA, A, K>,
+    keys_set: SetMapper<SA, K, A>,
     _phantom_value: PhantomData<V>,
 }
 
-impl<SA, K, V> StorageMapper<SA> for MapStorageMapper<SA, StorageSCAddress, K, V>
+impl<SA, K, V> StorageMapper<SA> for MapStorageMapper<SA, K, V, StorageSCAddress>
 where
     SA: StorageMapperApi,
     K: TopEncode + TopDecode + NestedEncode + NestedDecode,
@@ -42,7 +42,7 @@ where
     }
 }
 
-impl<SA, K, V> StorageClearable for MapStorageMapper<SA, StorageSCAddress, K, V>
+impl<SA, K, V> StorageClearable for MapStorageMapper<SA, K, V, StorageSCAddress>
 where
     SA: StorageMapperApi,
     K: TopEncode + TopDecode + NestedEncode + NestedDecode,
@@ -56,7 +56,7 @@ where
     }
 }
 
-impl<SA, K, V> MapStorageMapper<SA, StorageSCAddress, K, V>
+impl<SA, K, V> MapStorageMapper<SA, K, V, StorageSCAddress>
 where
     SA: StorageMapperApi,
     K: TopEncode + TopDecode + NestedEncode + NestedDecode,
@@ -155,10 +155,10 @@ where
     }
 }
 
-impl<SA, K, V> MapStorageMapper<SA, ManagedAddress<SA>, K, V>
+impl<SA, K, V> MapStorageMapper<SA, K, V, ManagedAddress<SA>>
 where
     SA: StorageMapperApi,
-    K: TopEncode + TopDecode + NestedEncode + NestedDecode + ManagedTypeApi,
+    K: TopEncode + TopDecode + NestedEncode + NestedDecode,
     V: StorageMapper<SA> + StorageClearable,
 {
     fn build_named_key(&self, name: &[u8], key: &K) -> StorageKey<SA> {
@@ -216,7 +216,7 @@ where
     
 }
 
-impl<'a, SA, K, V> IntoIterator for &'a MapStorageMapper<SA, StorageSCAddress, K, V>
+impl<'a, SA, K, V> IntoIterator for &'a MapStorageMapper<SA, K, V, StorageSCAddress>
 where
     SA: StorageMapperApi,
     K: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static,
@@ -239,7 +239,7 @@ where
     V: StorageMapper<SA> + StorageClearable,
 {
     key_iter: Keys<'a, SA, K>,
-    hash_map: &'a MapStorageMapper<SA, A, K, V>,
+    hash_map: &'a MapStorageMapper<SA, K, V, A>,
 }
 
 impl<'a, SA, K, V> Iter<'a, SA, StorageSCAddress, K, V>
@@ -249,7 +249,7 @@ where
     V: StorageMapper<SA> + StorageClearable,
 {
     fn new(
-        hash_map: &'a MapStorageMapper<SA, StorageSCAddress, K, V>,
+        hash_map: &'a MapStorageMapper<SA, K, V, StorageSCAddress>,
     ) -> Iter<'a, SA, StorageSCAddress, K, V> {
         Iter {
             key_iter: hash_map.keys(),
@@ -284,7 +284,7 @@ where
     V: StorageMapper<SA> + StorageClearable,
 {
     key_iter: Keys<'a, SA, K>,
-    hash_map: &'a MapStorageMapper<SA, A, K, V>,
+    hash_map: &'a MapStorageMapper<SA, K, V, A>,
 }
 
 impl<'a, SA, K, V> Values<'a, SA, StorageSCAddress, K, V>
@@ -293,7 +293,7 @@ where
     K: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static,
     V: StorageMapper<SA> + StorageClearable,
 {
-    fn new(hash_map: &'a MapStorageMapper<SA, StorageSCAddress, K, V>) -> Values<'a, SA, StorageSCAddress, K, V> {
+    fn new(hash_map: &'a MapStorageMapper<SA, K, V, StorageSCAddress>) -> Values<'a, SA, StorageSCAddress, K, V> {
         Values {
             key_iter: hash_map.keys(),
             hash_map,
@@ -343,7 +343,7 @@ where
     V: StorageMapper<SA> + StorageClearable,
 {
     pub(super) key: K,
-    pub(super) map: &'a mut MapStorageMapper<SA, A, K, V>,
+    pub(super) map: &'a mut MapStorageMapper<SA, K, V, A>,
 
     // Be invariant in `K` and `V`
     pub(super) _marker: PhantomData<&'a mut (K, V)>,
@@ -359,7 +359,7 @@ where
     V: StorageMapper<SA> + StorageClearable,
 {
     pub(super) key: K,
-    pub(super) map: &'a mut MapStorageMapper<SA, A, K, V>,
+    pub(super) map: &'a mut MapStorageMapper<SA, K, V, A>,
 
     // 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<SA, A, T>
+pub struct QueueMapper<SA, T, A = StorageSCAddress>
 where
     SA: StorageMapperApi,
     A: StorageAddress<SA>,
@@ -86,7 +85,7 @@ where
     _phantom_item: PhantomData<T>,
 }
 
-impl<SA, T> StorageMapper<SA> for QueueMapper<SA, StorageSCAddress, T>
+impl<SA, T> StorageMapper<SA> for QueueMapper<SA, T, StorageSCAddress>
 where
     SA: StorageMapperApi,
     T: TopEncode + TopDecode + NestedEncode + NestedDecode,
@@ -101,7 +100,7 @@ where
     }
 }
 
-impl<SA, T> StorageClearable for QueueMapper<SA, StorageSCAddress, T>
+impl<SA, T> StorageClearable for QueueMapper<SA, T, StorageSCAddress>
 where
     SA: StorageMapperApi,
     T: TopEncode + TopDecode + NestedEncode + NestedDecode,
@@ -119,7 +118,7 @@ where
     }
 }
 
-impl<SA, T> QueueMapper<SA, StorageSCAddress, T>
+impl<SA, T> QueueMapper<SA, T, StorageSCAddress>
 where
     SA: StorageMapperApi,
     T: TopEncode + TopDecode + NestedEncode + NestedDecode,
@@ -421,10 +420,10 @@ where
     }
 }
 
-impl<SA, T> QueueMapper<SA, ManagedAddress<SA>, T>
+impl<SA, T> QueueMapper<SA, T, ManagedAddress<SA>>
 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<SA> {
         let mut named_key = self.base_key.clone();
@@ -577,7 +576,7 @@ where
     }
 }
 
-impl<'a, SA, T> IntoIterator for &'a QueueMapper<SA, StorageSCAddress, T>
+impl<'a, SA, T> IntoIterator for &'a QueueMapper<SA, T, StorageSCAddress>
 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<SA, StorageSCAddress, T>,
+    queue: &'a QueueMapper<SA, T, StorageSCAddress>,
 }
 
 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<SA, StorageSCAddress, T>) -> Iter<'a, SA, T> {
+    fn new(queue: &'a QueueMapper<SA, T, StorageSCAddress>) -> 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<SA, T> TopEncodeMulti for QueueMapper<SA, StorageSCAddress, T>
+impl<SA, T> TopEncodeMulti for QueueMapper<SA, T, StorageSCAddress>
 where
     SA: StorageMapperApi,
     T: TopEncode + TopDecode + NestedEncode + NestedDecode,
@@ -650,7 +649,7 @@ where
     }
 }
 
-impl<SA, T> CodecFrom<QueueMapper<SA, StorageSCAddress, T>> for MultiValueEncoded<SA, T>
+impl<SA, T> CodecFrom<QueueMapper<SA, T, StorageSCAddress>> for MultiValueEncoded<SA, T>
 where
     SA: StorageMapperApi,
     T: TopEncode + TopDecode + NestedEncode + NestedDecode,
@@ -658,7 +657,7 @@ where
 }
 
 /// Behaves like a MultiResultVec when an endpoint result.
-impl<SA, T> TypeAbi for QueueMapper<SA, StorageSCAddress, T>
+impl<SA, T> TypeAbi for QueueMapper<SA, T, StorageSCAddress>
 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<SA>
 where
-    SA: StorageMapperApi ,
+    SA: StorageMapperApi,
 {
     fn address_storage_get<T: TopDecode>(&self, key: ManagedRef<'_, SA, StorageKey<SA>>) -> T;
 }
@@ -44,7 +44,7 @@ where
     }
 }
 
-pub struct SetMapper<SA, A, T>
+pub struct SetMapper<SA, T, A = StorageSCAddress>
 where
     SA: StorageMapperApi,
     A: StorageAddress<SA>,
@@ -53,10 +53,10 @@ where
     _phantom_api: PhantomData<SA>,
     address: A,
     base_key: StorageKey<SA>,
-    queue_mapper: QueueMapper<SA, A, T>,
+    queue_mapper: QueueMapper<SA, T, A>,
 }
 
-impl<SA, T> StorageMapper<SA> for SetMapper<SA, StorageSCAddress, T>
+impl<SA, T> StorageMapper<SA> for SetMapper<SA, T, StorageSCAddress>
 where
     SA: StorageMapperApi,
     T: TopEncode + TopDecode + NestedEncode + NestedDecode,
@@ -71,7 +71,7 @@ where
     }
 }
 
-impl<SA, T> StorageClearable for SetMapper<SA, StorageSCAddress, T>
+impl<SA, T> StorageClearable for SetMapper<SA, T, StorageSCAddress>
 where
     SA: StorageMapperApi,
     T: TopEncode + TopDecode + NestedEncode + NestedDecode,
@@ -84,10 +84,10 @@ where
     }
 }
 
-impl<SA, T> SetMapper<SA, ManagedAddress<SA>, T>
+impl<SA, T> SetMapper<SA, T, ManagedAddress<SA>>
 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<SA> {
         let mut named_key = self.base_key.clone();
@@ -96,12 +96,12 @@ where
         named_key
     }
 
-    fn new_from_address(&self, address: ManagedAddress<SA>, base_key: StorageKey<SA>) -> Self {
+    pub fn new_from_address(address: ManagedAddress<SA>, base_key: StorageKey<SA>) -> 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<SA, T> SetMapper<SA, StorageSCAddress, T>
+impl<SA, T> SetMapper<SA, T, StorageSCAddress>
 where
     SA: StorageMapperApi,
     T: TopEncode + TopDecode + NestedEncode + NestedDecode,
@@ -230,7 +230,7 @@ where
     }
 }
 
-impl<'a, SA, T> IntoIterator for &'a SetMapper<SA, StorageSCAddress, T>
+impl<'a, SA, T> IntoIterator for &'a SetMapper<SA, T, StorageSCAddress>
 where
     SA: StorageMapperApi,
     T: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static,
@@ -244,7 +244,7 @@ where
     }
 }
 
-impl<SA, T> Extend<T> for SetMapper<SA, StorageSCAddress, T>
+impl<SA, T> Extend<T> for SetMapper<SA, T, StorageSCAddress>
 where
     SA: StorageMapperApi,
     T: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static,
@@ -260,7 +260,7 @@ where
 }
 
 /// Behaves like a MultiResultVec when an endpoint result.
-impl<SA, T> TopEncodeMulti for SetMapper<SA, StorageSCAddress, T>
+impl<SA, T> TopEncodeMulti for SetMapper<SA, T, StorageSCAddress>
 where
     SA: StorageMapperApi,
     T: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static,
@@ -274,7 +274,7 @@ where
     }
 }
 
-impl<SA, T> CodecFrom<SetMapper<SA, StorageSCAddress, T>> for MultiValueEncoded<SA, T>
+impl<SA, T> CodecFrom<SetMapper<SA, T, StorageSCAddress>> for MultiValueEncoded<SA, T>
 where
     SA: StorageMapperApi,
     T: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static,
@@ -282,7 +282,7 @@ where
 }
 
 /// Behaves like a MultiResultVec when an endpoint result.
-impl<SA, T> TypeAbi for SetMapper<SA, StorageSCAddress, T>
+impl<SA, T> TypeAbi for SetMapper<SA, T, StorageSCAddress>
 where
     SA: StorageMapperApi,
     T: TopEncode + TopDecode + NestedEncode + NestedDecode + TypeAbi,

From 705a85b575483b36cfd66ce9ef8ee2f6f549ab9e Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Thu, 11 Jan 2024 15:43:40 +0200
Subject: [PATCH 0202/1254] 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<u32>;
+    #[storage_mapper("contract_address")]
+    fn contract_address(&self) -> SingleValueMapper<ManagedAddress>;
+
+    #[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<u32, _> =
+            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<u32, _> =
+            SetMapper::new_from_address(address, StorageKey::from("set_mapper"));
+        mapper.contains(&item)
+    }
 
-   #[storage_mapper("contract_address")]
-   fn contract_address(&self) -> SingleValueMapper<ManagedAddress>;
+    #[endpoint]
+    fn len_at_address(&self) -> usize {
+        let address = self.contract_address().get();
+        let mapper: SetMapper<u32, _> =
+            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<u32, _> =
+            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 <bianca.ialangi@multiversx.com>
Date: Fri, 12 Jan 2024 13:04:17 +0200
Subject: [PATCH 0203/1254] 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<String>) -> 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<Path>, args_tag: &str) {
+    pub fn copy_template(&self, target_path: impl AsRef<Path>, 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<Item = &RelevantDirectory> {
         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<Self::Item> {
         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 97288da4a45a2cb4fcce3efea2135486fa96f140 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 12 Dec 2023 14:35:35 +0200
Subject: [PATCH 0204/1254] unified syntax - tx result prototype

---
 .../base/src/types/interaction/async_call.rs  |   2 +-
 framework/base/src/types/interaction/mod.rs   |  10 +-
 framework/base/src/types/interaction/tx.rs    | 118 +++++++++---------
 .../src/types/interaction/tx_async_call.rs    |  15 +--
 .../interaction/tx_async_call_promises.rs     |  16 +--
 .../{tx_callback.rs => tx_result_handler.rs}  |   7 +-
 .../base/src/types/interaction/tx_return.rs   |  50 ++++++++
 .../src/types/interaction/tx_sync_call.rs     |  37 ++++++
 .../types/interaction/typed_function_call.rs  |  32 +++++
 .../scenario/src/facade/scenario_callbacks.rs |   4 +-
 .../src/facade/scenario_world_steps_tx.rs     |   2 +-
 11 files changed, 210 insertions(+), 83 deletions(-)
 rename framework/base/src/types/interaction/{tx_callback.rs => tx_result_handler.rs} (71%)
 create mode 100644 framework/base/src/types/interaction/tx_return.rs
 create mode 100644 framework/base/src/types/interaction/tx_sync_call.rs
 create mode 100644 framework/base/src/types/interaction/typed_function_call.rs

diff --git a/framework/base/src/types/interaction/async_call.rs b/framework/base/src/types/interaction/async_call.rs
index bcc07bcced..2ef3a61c43 100644
--- a/framework/base/src/types/interaction/async_call.rs
+++ b/framework/base/src/types/interaction/async_call.rs
@@ -22,7 +22,7 @@ where
     Api: CallTypeApi,
 {
     pub fn with_callback(mut self, callback_call: CallbackClosure<Api>) -> Self {
-        self.callback = Some(callback_call);
+        self.result_handler = Some(callback_call);
         self
     }
 }
diff --git a/framework/base/src/types/interaction/mod.rs b/framework/base/src/types/interaction/mod.rs
index ebb0d4d67f..c63f3de7b7 100644
--- a/framework/base/src/types/interaction/mod.rs
+++ b/framework/base/src/types/interaction/mod.rs
@@ -23,14 +23,17 @@ mod tx;
 mod tx_async_call;
 mod tx_async_call_promises;
 mod tx_async_te;
-mod tx_callback;
 mod tx_data;
 mod tx_env;
 mod tx_env_sc;
 mod tx_from;
 mod tx_gas;
 mod tx_payment;
+mod tx_result_handler;
+mod tx_return;
+mod tx_sync_call;
 mod tx_to;
+mod typed_function_call;
 
 pub use annotated::*;
 pub use async_call::AsyncCall;
@@ -54,13 +57,16 @@ pub use managed_arg_buffer::ManagedArgBuffer;
 pub use tx::*;
 pub use tx_async_call::*;
 pub use tx_async_call_promises::*;
-pub use tx_callback::*;
 pub use tx_data::*;
 pub use tx_env::*;
 pub use tx_env_sc::*;
 pub use tx_from::*;
 pub use tx_gas::*;
 pub use tx_payment::*;
+pub use tx_result_handler::*;
+pub use tx_return::*;
+pub use tx_sync_call::*;
 pub use tx_to::*;
+pub use typed_function_call::*;
 
 pub type TxScBase<Api> = TxBaseWithEnv<TxScEnv<Api>>;
diff --git a/framework/base/src/types/interaction/tx.rs b/framework/base/src/types/interaction/tx.rs
index b115b5e297..50db05407a 100644
--- a/framework/base/src/types/interaction/tx.rs
+++ b/framework/base/src/types/interaction/tx.rs
@@ -12,12 +12,12 @@ use crate::{
 };
 
 use super::{
-    AsyncCall, ExplicitGas, FunctionCall, TxCallback, TxData, TxDataFunctionCall, TxEnv, TxFrom,
+    AsyncCall, ExplicitGas, FunctionCall, TxResultHandler, TxData, TxDataFunctionCall, TxEnv, TxFrom,
     TxFromSpecified, TxGas, TxPayment, TxScEnv, TxTo, TxToSpecified,
 };
 
 #[must_use]
-pub struct Tx<Env, From, To, Payment, Gas, Data, Callback>
+pub struct Tx<Env, From, To, Payment, Gas, Data, RH>
 where
     Env: TxEnv,
     From: TxFrom<Env>,
@@ -25,7 +25,7 @@ where
     Payment: TxPayment<Env>,
     Gas: TxGas<Env>,
     Data: TxData<Env>,
-    Callback: TxCallback<Env>,
+    RH: TxResultHandler<Env>,
 {
     pub env: Env,
     pub from: From,
@@ -33,10 +33,10 @@ where
     pub payment: Payment,
     pub gas: Gas,
     pub data: Data,
-    pub callback: Callback,
+    pub result_handler: RH,
 }
 
-impl<Env, From, To, Payment, Gas, Data, Callback> Tx<Env, From, To, Payment, Gas, Data, Callback>
+impl<Env, From, To, Payment, Gas, Data, RH> Tx<Env, From, To, Payment, Gas, Data, RH>
 where
     Env: TxEnv,
     From: TxFrom<Env>,
@@ -44,11 +44,11 @@ where
     Payment: TxPayment<Env>,
     Gas: TxGas<Env>,
     Data: TxData<Env>,
-    Callback: TxCallback<Env>,
+    RH: TxResultHandler<Env>,
 {
     /// TODO: does nothing, delete, added for easier copy-paste.
     #[inline]
-    pub fn nothing(self) -> Tx<Env, From, To, Payment, Gas, Data, Callback> {
+    pub fn nothing(self) -> Tx<Env, From, To, Payment, Gas, Data, RH> {
         Tx {
             env: self.env,
             from: self.from,
@@ -56,7 +56,7 @@ where
             payment: self.payment,
             gas: self.gas,
             data: self.data,
-            callback: self.callback,
+            result_handler: self.result_handler,
         }
     }
 }
@@ -76,21 +76,21 @@ where
             payment: (),
             gas: (),
             data: (),
-            callback: (),
+            result_handler: (),
         }
     }
 }
 
-impl<Env, To, Payment, Gas, Data, Callback> Tx<Env, (), To, Payment, Gas, Data, Callback>
+impl<Env, To, Payment, Gas, Data, RH> Tx<Env, (), To, Payment, Gas, Data, RH>
 where
     Env: TxEnv,
     To: TxTo<Env>,
     Payment: TxPayment<Env>,
     Gas: TxGas<Env>,
     Data: TxData<Env>,
-    Callback: TxCallback<Env>,
+    RH: TxResultHandler<Env>,
 {
-    pub fn from<From>(self, from: From) -> Tx<Env, From, To, Payment, Gas, Data, Callback>
+    pub fn from<From>(self, from: From) -> Tx<Env, From, To, Payment, Gas, Data, RH>
     where
         From: TxFromSpecified<Env>,
     {
@@ -103,21 +103,21 @@ where
             payment: self.payment,
             gas: self.gas,
             data: self.data,
-            callback: self.callback,
+            result_handler: self.result_handler,
         }
     }
 }
 
-impl<Env, From, Payment, Gas, Data, Callback> Tx<Env, From, (), Payment, Gas, Data, Callback>
+impl<Env, From, Payment, Gas, Data, RH> Tx<Env, From, (), Payment, Gas, Data, RH>
 where
     Env: TxEnv,
     From: TxFrom<Env>,
     Payment: TxPayment<Env>,
     Gas: TxGas<Env>,
     Data: TxData<Env>,
-    Callback: TxCallback<Env>,
+    RH: TxResultHandler<Env>,
 {
-    pub fn to<To>(self, to: To) -> Tx<Env, From, To, Payment, Gas, Data, Callback>
+    pub fn to<To>(self, to: To) -> Tx<Env, From, To, Payment, Gas, Data, RH>
     where
         To: TxToSpecified<Env>,
     {
@@ -130,31 +130,31 @@ where
             payment: self.payment,
             gas: self.gas,
             data: self.data,
-            callback: self.callback,
+            result_handler: self.result_handler,
         }
     }
 
     pub fn to_caller(
         self,
-    ) -> Tx<Env, From, ManagedAddress<Env::Api>, Payment, Gas, Data, Callback> {
+    ) -> Tx<Env, From, ManagedAddress<Env::Api>, Payment, Gas, Data, RH> {
         let caller = BlockchainWrapper::<Env::Api>::new().get_caller();
         self.to(caller)
     }
 }
 
-impl<Env, From, To, Gas, Data, Callback> Tx<Env, From, To, (), Gas, Data, Callback>
+impl<Env, From, To, Gas, Data, RH> Tx<Env, From, To, (), Gas, Data, RH>
 where
     Env: TxEnv,
     From: TxFrom<Env>,
     To: TxTo<Env>,
     Gas: TxGas<Env>,
     Data: TxData<Env>,
-    Callback: TxCallback<Env>,
+    RH: TxResultHandler<Env>,
 {
     pub fn egld(
         self,
         egld_amount: BigUint<Env::Api>,
-    ) -> Tx<Env, From, To, EgldPayment<Env::Api>, Gas, Data, Callback> {
+    ) -> Tx<Env, From, To, EgldPayment<Env::Api>, Gas, Data, RH> {
         Tx {
             env: self.env,
             from: self.from,
@@ -162,19 +162,19 @@ where
             payment: EgldPayment { value: egld_amount },
             gas: self.gas,
             data: self.data,
-            callback: self.callback,
+            result_handler: self.result_handler,
         }
     }
 }
 
-impl<Env, From, To, Gas, Data, Callback> Tx<Env, From, To, (), Gas, Data, Callback>
+impl<Env, From, To, Gas, Data, RH> Tx<Env, From, To, (), Gas, Data, RH>
 where
     Env: TxEnv,
     From: TxFrom<Env>,
     To: TxTo<Env>,
     Gas: TxGas<Env>,
     Data: TxData<Env>,
-    Callback: TxCallback<Env>,
+    RH: TxResultHandler<Env>,
 {
     /// Adds a single ESDT token transfer to a transaction.
     ///
@@ -182,7 +182,7 @@ where
     pub fn esdt<P: Into<EsdtTokenPayment<Env::Api>>>(
         self,
         payment: P,
-    ) -> Tx<Env, From, To, EsdtTokenPayment<Env::Api>, Gas, Data, Callback> {
+    ) -> Tx<Env, From, To, EsdtTokenPayment<Env::Api>, Gas, Data, RH> {
         Tx {
             env: self.env,
             from: self.from,
@@ -190,7 +190,7 @@ where
             payment: payment.into(),
             gas: self.gas,
             data: self.data,
-            callback: self.callback,
+            result_handler: self.result_handler,
         }
     }
 
@@ -198,7 +198,7 @@ where
     pub fn multi_esdt(
         self,
         payments: MultiEsdtPayment<Env::Api>, // TODO: references
-    ) -> Tx<Env, From, To, MultiEsdtPayment<Env::Api>, Gas, Data, Callback> {
+    ) -> Tx<Env, From, To, MultiEsdtPayment<Env::Api>, Gas, Data, RH> {
         Tx {
             env: self.env,
             from: self.from,
@@ -206,20 +206,20 @@ where
             payment: payments,
             gas: self.gas,
             data: self.data,
-            callback: self.callback,
+            result_handler: self.result_handler,
         }
     }
 }
 
-impl<Env, From, To, Gas, Data, Callback>
-    Tx<Env, From, To, EsdtTokenPayment<Env::Api>, Gas, Data, Callback>
+impl<Env, From, To, Gas, Data, RH>
+    Tx<Env, From, To, EsdtTokenPayment<Env::Api>, Gas, Data, RH>
 where
     Env: TxEnv,
     From: TxFrom<Env>,
     To: TxTo<Env>,
     Gas: TxGas<Env>,
     Data: TxData<Env>,
-    Callback: TxCallback<Env>,
+    RH: TxResultHandler<Env>,
 {
     /// Adds a single ESDT token transfer to a contract call.
     ///
@@ -227,7 +227,7 @@ where
     pub fn with_esdt_transfer<P: Into<EsdtTokenPayment<Env::Api>>>(
         self,
         payment: P,
-    ) -> Tx<Env, From, To, MultiEsdtPayment<Env::Api>, Gas, Data, Callback> {
+    ) -> Tx<Env, From, To, MultiEsdtPayment<Env::Api>, Gas, Data, RH> {
         let mut payments = ManagedVec::new();
         payments.push(self.payment);
         payments.push(payment.into());
@@ -238,20 +238,20 @@ where
             payment: payments,
             gas: self.gas,
             data: self.data,
-            callback: self.callback,
+            result_handler: self.result_handler,
         }
     }
 }
 
-impl<Env, From, To, Gas, Data, Callback>
-    Tx<Env, From, To, MultiEsdtPayment<Env::Api>, Gas, Data, Callback>
+impl<Env, From, To, Gas, Data, RH>
+    Tx<Env, From, To, MultiEsdtPayment<Env::Api>, Gas, Data, RH>
 where
     Env: TxEnv,
     From: TxFrom<Env>,
     To: TxTo<Env>,
     Gas: TxGas<Env>,
     Data: TxData<Env>,
-    Callback: TxCallback<Env>,
+    RH: TxResultHandler<Env>,
 {
     /// Adds a single ESDT token transfer to a contract call.
     ///
@@ -259,27 +259,27 @@ where
     pub fn with_esdt_transfer<P: Into<EsdtTokenPayment<Env::Api>>>(
         mut self,
         payment: P,
-    ) -> Tx<Env, From, To, MultiEsdtPayment<Env::Api>, Gas, Data, Callback> {
+    ) -> Tx<Env, From, To, MultiEsdtPayment<Env::Api>, Gas, Data, RH> {
         self.payment.push(payment.into());
         self
     }
 }
 
-impl<Env, From, To, Payment, Data, Callback> Tx<Env, From, To, Payment, (), Data, Callback>
+impl<Env, From, To, Payment, Data, RH> Tx<Env, From, To, Payment, (), Data, RH>
 where
     Env: TxEnv,
     From: TxFrom<Env>,
     To: TxTo<Env>,
     Payment: TxPayment<Env>,
     Data: TxData<Env>,
-    Callback: TxCallback<Env>,
+    RH: TxResultHandler<Env>,
 {
     /// Sets an explicit gas limit to the call.
     #[inline]
     pub fn with_gas_limit(
         self,
         gas_limit: u64,
-    ) -> Tx<Env, From, To, Payment, ExplicitGas, Data, Callback> {
+    ) -> Tx<Env, From, To, Payment, ExplicitGas, Data, RH> {
         Tx {
             env: self.env,
             from: self.from,
@@ -287,25 +287,25 @@ where
             payment: self.payment,
             gas: ExplicitGas(gas_limit),
             data: self.data,
-            callback: self.callback,
+            result_handler: self.result_handler,
         }
     }
 }
 
-impl<Env, From, To, Payment, Gas, Callback> Tx<Env, From, To, Payment, Gas, (), Callback>
+impl<Env, From, To, Payment, Gas, RH> Tx<Env, From, To, Payment, Gas, (), RH>
 where
     Env: TxEnv,
     From: TxFrom<Env>,
     To: TxTo<Env>,
     Payment: TxPayment<Env>,
     Gas: TxGas<Env>,
-    Callback: TxCallback<Env>,
+    RH: TxResultHandler<Env>,
 {
     #[inline]
     pub fn call<FC: Into<FunctionCall<Env::Api>>>(
         self,
         call: FC,
-    ) -> Tx<Env, From, To, Payment, Gas, FunctionCall<Env::Api>, Callback> {
+    ) -> Tx<Env, From, To, Payment, Gas, FunctionCall<Env::Api>, RH> {
         Tx {
             env: self.env,
             from: self.from,
@@ -313,7 +313,7 @@ where
             payment: self.payment,
             gas: self.gas,
             data: call.into(),
-            callback: self.callback,
+            result_handler: self.result_handler,
         }
     }
 
@@ -321,7 +321,7 @@ where
     pub fn function_name<N: Into<ManagedBuffer<Env::Api>>>(
         self,
         function_name: N,
-    ) -> Tx<Env, From, To, Payment, Gas, FunctionCall<Env::Api>, Callback> {
+    ) -> Tx<Env, From, To, Payment, Gas, FunctionCall<Env::Api>, RH> {
         Tx {
             env: self.env,
             from: self.from,
@@ -329,20 +329,20 @@ where
             payment: self.payment,
             gas: self.gas,
             data: FunctionCall::new(function_name),
-            callback: self.callback,
+            result_handler: self.result_handler,
         }
     }
 }
 
-impl<Env, From, To, Payment, Gas, Callback>
-    Tx<Env, From, To, Payment, Gas, FunctionCall<Env::Api>, Callback>
+impl<Env, From, To, Payment, Gas, RH>
+    Tx<Env, From, To, Payment, Gas, FunctionCall<Env::Api>, RH>
 where
     Env: TxEnv,
     From: TxFrom<Env>,
     To: TxTo<Env>,
     Payment: TxPayment<Env>,
     Gas: TxGas<Env>,
-    Callback: TxCallback<Env>,
+    RH: TxResultHandler<Env>,
 {
     #[inline]
     pub fn argument<T: TopEncodeMulti>(mut self, arg: &T) -> Self {
@@ -361,12 +361,12 @@ where
     Data: TxData<Env>,
 {
     #[inline]
-    pub fn callback<Callback>(
+    pub fn callback<RH>(
         self,
-        callback: Callback,
-    ) -> Tx<Env, From, To, Payment, Gas, Data, Callback>
+        callback: RH,
+    ) -> Tx<Env, From, To, Payment, Gas, Data, RH>
     where
-        Callback: TxCallback<Env>,
+        RH: TxResultHandler<Env>,
     {
         Tx {
             env: self.env,
@@ -375,12 +375,12 @@ where
             payment: self.payment,
             gas: self.gas,
             data: self.data,
-            callback,
+            result_handler: callback,
         }
     }
 }
 
-impl<Env, From, To, Payment, Gas, FC, Callback> Tx<Env, From, To, Payment, Gas, FC, Callback>
+impl<Env, From, To, Payment, Gas, FC, RH> Tx<Env, From, To, Payment, Gas, FC, RH>
 where
     Env: TxEnv,
     From: TxFrom<Env>,
@@ -388,7 +388,7 @@ where
     Payment: TxPayment<Env>,
     Gas: TxGas<Env>,
     FC: TxDataFunctionCall<Env>,
-    Callback: TxCallback<Env>,
+    RH: TxResultHandler<Env>,
 {
     pub fn normalize_tx(
         self,
@@ -399,7 +399,7 @@ where
         EgldPayment<Env::Api>,
         Gas,
         FunctionCall<Env::Api>,
-        Callback,
+        RH,
     > {
         let result = self.payment.convert_tx_data(
             &self.env,
@@ -414,7 +414,7 @@ where
             payment: result.egld_payment,
             gas: self.gas,
             data: result.fc,
-            callback: self.callback,
+            result_handler: self.result_handler,
         }
     }
 }
diff --git a/framework/base/src/types/interaction/tx_async_call.rs b/framework/base/src/types/interaction/tx_async_call.rs
index 27d6e2a194..5ee7ed8bac 100644
--- a/framework/base/src/types/interaction/tx_async_call.rs
+++ b/framework/base/src/types/interaction/tx_async_call.rs
@@ -5,10 +5,10 @@ use crate::{
 };
 
 use super::{
-    FunctionCall, Tx, TxCallback, TxDataFunctionCall, TxEnv, TxPayment, TxScEnv, TxToSpecified,
+    FunctionCall, Tx, TxDataFunctionCall, TxEnv, TxPayment, TxResultHandler, TxScEnv, TxToSpecified,
 };
 
-pub trait TxAsyncCallCallback<Api>: TxCallback<TxScEnv<Api>>
+pub trait TxAsyncCallCallback<Api>: TxResultHandler<TxScEnv<Api>>
 where
     Api: CallTypeApi,
 {
@@ -22,7 +22,8 @@ where
     fn save_callback_closure_to_storage(&self) {}
 }
 
-impl<Api> TxCallback<TxScEnv<Api>> for CallbackClosure<Api> where Api: CallTypeApi {}
+impl<Api> TxResultHandler<TxScEnv<Api>> for CallbackClosure<Api> where Api: CallTypeApi {}
+
 impl<Api> TxAsyncCallCallback<Api> for CallbackClosure<Api>
 where
     Api: CallTypeApi + StorageWriteApi,
@@ -32,7 +33,7 @@ where
     }
 }
 
-impl<Api> TxCallback<TxScEnv<Api>> for Option<CallbackClosure<Api>> where Api: CallTypeApi {}
+impl<Api> TxResultHandler<TxScEnv<Api>> for Option<CallbackClosure<Api>> where Api: CallTypeApi {}
 impl<Api> TxAsyncCallCallback<Api> for Option<CallbackClosure<Api>>
 where
     Api: CallTypeApi + StorageWriteApi,
@@ -44,17 +45,17 @@ where
     }
 }
 
-impl<Api, To, Payment, FC, Callback> Tx<TxScEnv<Api>, (), To, Payment, (), FC, Callback>
+impl<Api, To, Payment, FC, RH> Tx<TxScEnv<Api>, (), To, Payment, (), FC, RH>
 where
     Api: CallTypeApi,
     To: TxToSpecified<TxScEnv<Api>>,
     Payment: TxPayment<TxScEnv<Api>>,
     FC: TxDataFunctionCall<TxScEnv<Api>>,
-    Callback: TxAsyncCallCallback<Api>,
+    RH: TxAsyncCallCallback<Api>,
 {
     pub fn async_call_and_exit(self) -> ! {
         let normalized = self.normalize_tx();
-        normalized.callback.save_callback_closure_to_storage();
+        normalized.result_handler.save_callback_closure_to_storage();
         SendRawWrapper::<Api>::new().async_call_raw(
             &normalized.to,
             &normalized.payment.value,
diff --git a/framework/base/src/types/interaction/tx_async_call_promises.rs b/framework/base/src/types/interaction/tx_async_call_promises.rs
index 55282d708a..9a7907b03e 100644
--- a/framework/base/src/types/interaction/tx_async_call_promises.rs
+++ b/framework/base/src/types/interaction/tx_async_call_promises.rs
@@ -5,11 +5,11 @@ use crate::{
 };
 
 use super::{
-    callback_closure::CallbackClosureWithGas, ExplicitGas, FunctionCall, Tx, TxCallback, TxGas,
+    callback_closure::CallbackClosureWithGas, ExplicitGas, FunctionCall, Tx, TxResultHandler, TxGas,
     TxPayment, TxScEnv, TxToSpecified,
 };
 
-pub trait TxPromisesCallback<Api>: TxCallback<TxScEnv<Api>>
+pub trait TxPromisesCallback<Api>: TxResultHandler<TxScEnv<Api>>
 where
     Api: CallTypeApi,
 {
@@ -37,7 +37,7 @@ where
     }
 }
 
-impl<Api> TxCallback<TxScEnv<Api>> for CallbackClosureWithGas<Api> where Api: CallTypeApi {}
+impl<Api> TxResultHandler<TxScEnv<Api>> for CallbackClosureWithGas<Api> where Api: CallTypeApi {}
 impl<Api> TxPromisesCallback<Api> for CallbackClosureWithGas<Api>
 where
     Api: CallTypeApi,
@@ -77,8 +77,8 @@ where
             payment: self.payment,
             gas: self.gas,
             data: self.data,
-            callback: CallbackClosureWithGas {
-                closure: self.callback,
+            result_handler: CallbackClosureWithGas {
+                closure: self.result_handler,
                 gas_for_callback: gas,
             },
         }
@@ -95,12 +95,12 @@ where
 {
     // #[cfg(feature = "promises")]
     pub fn async_call_promise(self) {
-        let callback_name = self.callback.callback_name();
+        let callback_name = self.result_handler.callback_name();
         let mut cb_closure_args_serialized =
             ManagedBuffer::<Api>::from_raw_handle(const_handles::MBUF_TEMPORARY_1);
-        self.callback
+        self.result_handler
             .overwrite_with_serialized_args(&mut cb_closure_args_serialized);
-        let extra_gas_for_callback = self.callback.gas_for_callback();
+        let extra_gas_for_callback = self.result_handler.gas_for_callback();
 
         let normalized = self.normalize_tx();
 
diff --git a/framework/base/src/types/interaction/tx_callback.rs b/framework/base/src/types/interaction/tx_result_handler.rs
similarity index 71%
rename from framework/base/src/types/interaction/tx_callback.rs
rename to framework/base/src/types/interaction/tx_result_handler.rs
index a7e5710e21..1b28d5fd97 100644
--- a/framework/base/src/types/interaction/tx_callback.rs
+++ b/framework/base/src/types/interaction/tx_result_handler.rs
@@ -6,20 +6,21 @@ use crate::{
 
 use super::{FunctionCall, TxEnv};
 
-pub trait TxCallback<Env>
+pub trait TxResultHandler<Env>
 where
     Env: TxEnv,
 {
 }
 
-pub trait TxRunnableCallback<Env>: TxCallback<Env>
+pub trait TxRunnableCallback<Env>: TxResultHandler<Env>
 where
     Env: TxEnv,
 {
     fn run_callback(self, env: &Env);
 }
 
-impl<Env> TxCallback<Env> for () where Env: TxEnv {}
+impl<Env> TxResultHandler<Env> for () where Env: TxEnv {}
+
 impl<Env> TxRunnableCallback<Env> for ()
 where
     Env: TxEnv,
diff --git a/framework/base/src/types/interaction/tx_return.rs b/framework/base/src/types/interaction/tx_return.rs
new file mode 100644
index 0000000000..3a29be5b6a
--- /dev/null
+++ b/framework/base/src/types/interaction/tx_return.rs
@@ -0,0 +1,50 @@
+use crate::{
+    api::ManagedTypeApi,
+    formatter::SCLowerHex,
+    types::{ManagedBuffer, ManagedBufferCachedBuilder, ManagedVec},
+};
+
+use super::{FunctionCall, TxEnv, TxResultHandler};
+
+pub trait TxReturn<Env>: TxResultHandler<Env>
+where
+    Env: TxEnv,
+{
+    type Returned;
+
+    fn sync_call_result(
+        self,
+        raw_results: &ManagedVec<Env::Api, ManagedBuffer<Env::Api>>,
+    ) -> Self::Returned;
+}
+
+impl<Env> TxReturn<Env> for ()
+where
+    Env: TxEnv,
+{
+    type Returned = ();
+
+    fn sync_call_result(
+        self,
+        raw_results: &ManagedVec<Env::Api, ManagedBuffer<Env::Api>>,
+    ) -> Self::Returned {
+    }
+}
+
+pub struct ReturnRaw;
+
+impl<Env> TxResultHandler<Env> for ReturnRaw where Env: TxEnv {}
+
+impl<Env> TxReturn<Env> for ReturnRaw
+where
+    Env: TxEnv,
+{
+    type Returned = ManagedVec<Env::Api, ManagedBuffer<Env::Api>>;
+
+    fn sync_call_result(
+        self,
+        raw_results: &ManagedVec<Env::Api, ManagedBuffer<Env::Api>>,
+    ) -> Self::Returned {
+        raw_results.clone()
+    }
+}
diff --git a/framework/base/src/types/interaction/tx_sync_call.rs b/framework/base/src/types/interaction/tx_sync_call.rs
new file mode 100644
index 0000000000..0f5815a185
--- /dev/null
+++ b/framework/base/src/types/interaction/tx_sync_call.rs
@@ -0,0 +1,37 @@
+use crate::{
+    api::{CallTypeApi, StorageWriteApi},
+    contract_base::SendRawWrapper,
+    types::{BigUint, CallbackClosure, ManagedAddress},
+};
+
+use super::{
+    FunctionCall, Tx, TxDataFunctionCall, TxEnv, TxPayment, TxResultHandler, TxReturn, TxScEnv,
+    TxToSpecified, TxGas,
+};
+
+impl<Api, To, Payment, Gas, FC, RH> Tx<TxScEnv<Api>, (), To, Payment, Gas, FC, RH>
+where
+    Api: CallTypeApi,
+    To: TxToSpecified<TxScEnv<Api>>,
+    Payment: TxPayment<TxScEnv<Api>>,
+    Gas: TxGas<TxScEnv<Api>>,
+    FC: TxDataFunctionCall<TxScEnv<Api>>,
+    RH: TxReturn<TxScEnv<Api>>,
+{
+    pub fn execute_on_dest_context(self) -> RH::Returned {
+        let gas_limit = self.gas.resolve_gas(&self.env);
+        let normalized = self.normalize_tx();
+
+        let raw_result = SendRawWrapper::<Api>::new().execute_on_dest_context_raw(
+            gas_limit,
+            &normalized.to,
+            &normalized.payment.value,
+            &normalized.data.function_name,
+            &normalized.data.arg_buffer,
+        );
+
+        SendRawWrapper::<Api>::new().clean_return_data();
+
+        normalized.result_handler.sync_call_result(&raw_result)
+    }
+}
diff --git a/framework/base/src/types/interaction/typed_function_call.rs b/framework/base/src/types/interaction/typed_function_call.rs
new file mode 100644
index 0000000000..dcb2be5052
--- /dev/null
+++ b/framework/base/src/types/interaction/typed_function_call.rs
@@ -0,0 +1,32 @@
+use core::marker::PhantomData;
+
+use crate::{
+    abi::{TypeAbi, TypeName},
+    api::{CallTypeApi, ManagedTypeApi},
+    types::{EsdtTokenPayment, ManagedAddress, ManagedBuffer, ManagedVec, MultiValueEncoded},
+};
+
+use super::{ContractCallNoPayment, FunctionCall, ManagedArgBuffer};
+
+/// Encodes a function call on the blockchain, together with the original result type.
+///
+/// Can be used as a multi-argument, to embed a call within a call.
+pub struct TypedFunctionCall<Api, OriginalResult>
+where
+    Api: ManagedTypeApi,
+{
+    pub function_call: FunctionCall<Api>,
+    _return_type: PhantomData<OriginalResult>,
+}
+
+impl<Api, OriginalResult> From<FunctionCall<Api>> for TypedFunctionCall<Api, OriginalResult>
+where
+    Api: ManagedTypeApi,
+{
+    fn from(function_call: FunctionCall<Api>) -> Self {
+        TypedFunctionCall {
+            function_call,
+            _return_type: PhantomData,
+        }
+    }
+}
diff --git a/framework/scenario/src/facade/scenario_callbacks.rs b/framework/scenario/src/facade/scenario_callbacks.rs
index 1429f7ed16..e55f4bdec5 100644
--- a/framework/scenario/src/facade/scenario_callbacks.rs
+++ b/framework/scenario/src/facade/scenario_callbacks.rs
@@ -1,4 +1,4 @@
-use multiversx_sc::types::{TxCallback, TxRunnableCallback};
+use multiversx_sc::types::{TxResultHandler, TxRunnableCallback};
 
 use crate::scenario_model::TxResponse;
 
@@ -8,7 +8,7 @@ pub struct WithTxResult<F>(pub F)
 where
     F: FnOnce(&TxResponse);
 
-impl<F> TxCallback<ScenarioTxEnvironment> for WithTxResult<F> where F: FnOnce(&TxResponse) {}
+impl<F> TxResultHandler<ScenarioTxEnvironment> for WithTxResult<F> where F: FnOnce(&TxResponse) {}
 impl<F> TxRunnableCallback<ScenarioTxEnvironment> for WithTxResult<F>
 where
     F: FnOnce(&TxResponse),
diff --git a/framework/scenario/src/facade/scenario_world_steps_tx.rs b/framework/scenario/src/facade/scenario_world_steps_tx.rs
index ad8134edca..1b2f84d40b 100644
--- a/framework/scenario/src/facade/scenario_world_steps_tx.rs
+++ b/framework/scenario/src/facade/scenario_world_steps_tx.rs
@@ -94,6 +94,6 @@ where
 
         world.sc_call(&mut step);
         env.response = step.response;
-        self.callback.run_callback(&env);
+        self.result_handler.run_callback(&env);
     }
 }

From fbf62b3da54b95eef39e3700070f297fbbf37855 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 13 Dec 2023 10:11:41 +0200
Subject: [PATCH 0205/1254] unified syntax - file renames

---
 framework/base/src/types/interaction/mod.rs        | 14 +++++++-------
 .../{tx_async_call.rs => tx_call_async.rs}         |  0
 ..._call_promises.rs => tx_call_async_promises.rs} |  0
 .../{tx_sync_call.rs => tx_call_sync.rs}           |  0
 .../interaction/{tx_async_te.rs => tx_call_te.rs}  |  0
 5 files changed, 7 insertions(+), 7 deletions(-)
 rename framework/base/src/types/interaction/{tx_async_call.rs => tx_call_async.rs} (100%)
 rename framework/base/src/types/interaction/{tx_async_call_promises.rs => tx_call_async_promises.rs} (100%)
 rename framework/base/src/types/interaction/{tx_sync_call.rs => tx_call_sync.rs} (100%)
 rename framework/base/src/types/interaction/{tx_async_te.rs => tx_call_te.rs} (100%)

diff --git a/framework/base/src/types/interaction/mod.rs b/framework/base/src/types/interaction/mod.rs
index c63f3de7b7..2c7672566d 100644
--- a/framework/base/src/types/interaction/mod.rs
+++ b/framework/base/src/types/interaction/mod.rs
@@ -20,9 +20,10 @@ mod expr_sc;
 mod function_call;
 mod managed_arg_buffer;
 mod tx;
-mod tx_async_call;
-mod tx_async_call_promises;
-mod tx_async_te;
+mod tx_call_async;
+mod tx_call_async_promises;
+mod tx_call_sync;
+mod tx_call_te;
 mod tx_data;
 mod tx_env;
 mod tx_env_sc;
@@ -31,7 +32,6 @@ mod tx_gas;
 mod tx_payment;
 mod tx_result_handler;
 mod tx_return;
-mod tx_sync_call;
 mod tx_to;
 mod typed_function_call;
 
@@ -55,8 +55,9 @@ pub use expr_sc::ScExpr;
 pub use function_call::FunctionCall;
 pub use managed_arg_buffer::ManagedArgBuffer;
 pub use tx::*;
-pub use tx_async_call::*;
-pub use tx_async_call_promises::*;
+pub use tx_call_async::*;
+pub use tx_call_async_promises::*;
+pub use tx_call_sync::*;
 pub use tx_data::*;
 pub use tx_env::*;
 pub use tx_env_sc::*;
@@ -65,7 +66,6 @@ pub use tx_gas::*;
 pub use tx_payment::*;
 pub use tx_result_handler::*;
 pub use tx_return::*;
-pub use tx_sync_call::*;
 pub use tx_to::*;
 pub use typed_function_call::*;
 
diff --git a/framework/base/src/types/interaction/tx_async_call.rs b/framework/base/src/types/interaction/tx_call_async.rs
similarity index 100%
rename from framework/base/src/types/interaction/tx_async_call.rs
rename to framework/base/src/types/interaction/tx_call_async.rs
diff --git a/framework/base/src/types/interaction/tx_async_call_promises.rs b/framework/base/src/types/interaction/tx_call_async_promises.rs
similarity index 100%
rename from framework/base/src/types/interaction/tx_async_call_promises.rs
rename to framework/base/src/types/interaction/tx_call_async_promises.rs
diff --git a/framework/base/src/types/interaction/tx_sync_call.rs b/framework/base/src/types/interaction/tx_call_sync.rs
similarity index 100%
rename from framework/base/src/types/interaction/tx_sync_call.rs
rename to framework/base/src/types/interaction/tx_call_sync.rs
diff --git a/framework/base/src/types/interaction/tx_async_te.rs b/framework/base/src/types/interaction/tx_call_te.rs
similarity index 100%
rename from framework/base/src/types/interaction/tx_async_te.rs
rename to framework/base/src/types/interaction/tx_call_te.rs

From 26ab1b96fe8e4db47bbe7d74092596be9fb8d3d3 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Sun, 14 Jan 2024 05:14:25 +0200
Subject: [PATCH 0206/1254] unified syntax - result handling core

---
 framework/base/src/lib.rs                     |   1 +
 framework/base/src/tuple_util.rs              |   3 +
 .../base/src/tuple_util/nested_tuples.rs      | 137 +++++++++
 .../types/interaction/contract_call_exec.rs   |   2 +-
 .../src/types/interaction/function_call.rs    |  14 +-
 framework/base/src/types/interaction/mod.rs   |   6 +
 framework/base/src/types/interaction/tx.rs    | 116 ++++++--
 .../src/types/interaction/tx_call_async.rs    |  15 +-
 .../interaction/tx_call_async_promises.rs     |  12 +-
 .../src/types/interaction/tx_call_sync.rs     |  89 +++++-
 .../types/interaction/tx_result_handler.rs    |  19 +-
 .../base/src/types/interaction/tx_return.rs   |  41 +--
 .../src/types/interaction/tx_return_sync.rs   |  46 +++
 .../interaction/tx_return_type_marker.rs      |  28 ++
 .../base/src/types/interaction/tx_rh_list.rs  |  13 +
 .../interaction/tx_rh_list/returns_bt.rs      |  27 ++
 .../interaction/tx_rh_list/returns_exact.rs   |  46 +++
 .../interaction/tx_rh_list/returns_raw.rs     |  40 +++
 .../interaction/tx_rh_list/returns_similar.rs |  39 +++
 .../interaction/tx_rh_list/tx_rh_list_cons.rs | 275 ++++++++++++++++++
 .../interaction/tx_rh_list/tx_rh_list_item.rs |  18 ++
 .../scenario/src/facade/scenario_callbacks.rs |   8 +-
 22 files changed, 932 insertions(+), 63 deletions(-)
 create mode 100644 framework/base/src/tuple_util.rs
 create mode 100644 framework/base/src/tuple_util/nested_tuples.rs
 create mode 100644 framework/base/src/types/interaction/tx_return_sync.rs
 create mode 100644 framework/base/src/types/interaction/tx_return_type_marker.rs
 create mode 100644 framework/base/src/types/interaction/tx_rh_list.rs
 create mode 100644 framework/base/src/types/interaction/tx_rh_list/returns_bt.rs
 create mode 100644 framework/base/src/types/interaction/tx_rh_list/returns_exact.rs
 create mode 100644 framework/base/src/types/interaction/tx_rh_list/returns_raw.rs
 create mode 100644 framework/base/src/types/interaction/tx_rh_list/returns_similar.rs
 create mode 100644 framework/base/src/types/interaction/tx_rh_list/tx_rh_list_cons.rs
 create mode 100644 framework/base/src/types/interaction/tx_rh_list/tx_rh_list_item.rs

diff --git a/framework/base/src/lib.rs b/framework/base/src/lib.rs
index b90cb89409..4a15ecb657 100644
--- a/framework/base/src/lib.rs
+++ b/framework/base/src/lib.rs
@@ -36,6 +36,7 @@ pub mod log_util;
 mod macros;
 pub mod non_zero_util;
 pub mod storage;
+pub mod tuple_util;
 pub mod types;
 
 pub use hex_call_data::*;
diff --git a/framework/base/src/tuple_util.rs b/framework/base/src/tuple_util.rs
new file mode 100644
index 0000000000..717058e641
--- /dev/null
+++ b/framework/base/src/tuple_util.rs
@@ -0,0 +1,3 @@
+mod nested_tuples;
+
+pub use nested_tuples::*;
diff --git a/framework/base/src/tuple_util/nested_tuples.rs b/framework/base/src/tuple_util/nested_tuples.rs
new file mode 100644
index 0000000000..9b7844389c
--- /dev/null
+++ b/framework/base/src/tuple_util/nested_tuples.rs
@@ -0,0 +1,137 @@
+/// A tuple of the form (A, (B, (... (N, ())))).
+///
+/// It is always terminated with a unit.
+pub trait NestedTuple {}
+
+impl NestedTuple for () {}
+
+impl<Head, Tail> NestedTuple for (Head, Tail) where Tail: NestedTuple {}
+
+/// Allows to append at the end of a nested tuple list.
+pub trait NestedTupleAppend<T> {
+    type Output;
+
+    fn append(self, t: T) -> Self::Output;
+}
+
+impl<T> NestedTupleAppend<T> for () {
+    type Output = (T, ());
+
+    fn append(self, t: T) -> Self::Output {
+        (t, ())
+    }
+}
+
+impl<Head, Tail, T> NestedTupleAppend<T> for (Head, Tail)
+where
+    Tail: NestedTupleAppend<T>,
+{
+    type Output = (Head, Tail::Output);
+
+    fn append(self, t: T) -> Self::Output {
+        (self.0, self.1.append(t))
+    }
+}
+
+/// Defines conversion of a nested tuple list to a regular tuple.
+pub trait NestedTupleFlatten: NestedTuple {
+    type Flattened;
+    type Unpacked;
+
+    /// Converts a nested tuple list to a regular tuple.
+    fn flatten(self) -> Self::Flattened;
+
+    /// Same as `flatten`, converts a nested tuple list to a regular tuple,
+    /// but additionally, it unpacks singleton tuples into their content (`(item,)` -> `item`).
+    fn flatten_unpack(self) -> Self::Unpacked;
+}
+
+impl NestedTupleFlatten for () {
+    type Flattened = ();
+    type Unpacked = ();
+
+    fn flatten(self) -> Self::Flattened {}
+    fn flatten_unpack(self) -> Self::Unpacked {}
+}
+
+impl<T> NestedTupleFlatten for (T, ()) {
+    type Flattened = (T,);
+    type Unpacked = T;
+
+    fn flatten(self) -> Self::Flattened {
+        (self.0,)
+    }
+
+    fn flatten_unpack(self) -> Self::Unpacked {
+        self.0
+    }
+}
+
+macro_rules! tuple_list_type {
+    () => ( () );
+    ($i:ty)  => ( ($i, ()) );
+    ($i:ty, $($e:ty),*)  => ( ($i, tuple_list_type!($($e),*)) );
+}
+
+macro_rules! unnest {
+    (($layer:expr); ($($v:expr),*); ($u:ident, $($us:ident,)*)) => {
+        unnest!(($layer . 1); ($($v,)* $layer . 0); ($($us,)*))
+    };
+    (($layer:expr); ($($v:expr),*); ()) => { ($($v,)*) };
+}
+
+macro_rules! flatten_impl {
+    ($(($t:ident $($ts:ident)+))+) => {
+        $(
+            impl<$t,$($ts),+> Flatten for tuple_list_type!($t,$($ts),+) {
+                type Flattened = ($t,$($ts),+);
+                type Unpacked = ($t,$($ts),+);
+
+                fn flatten(self) -> Self::Flattened {
+                    unnest!((self); (); ($t, $($ts,)*))
+                }
+
+                fn flatten_unpack(self) -> Self::Unpacked {
+                    self.flatten()
+                }
+            }
+        )+
+    }
+}
+
+flatten_impl! {
+    (T1 T2)
+    (T1 T2 T3)
+    (T1 T2 T3 T4)
+    (T1 T2 T3 T4 T5)
+    (T1 T2 T3 T4 T5 T6)
+    (T1 T2 T3 T4 T5 T6 T7)
+    (T1 T2 T3 T4 T5 T6 T7 T8)
+    (T1 T2 T3 T4 T5 T6 T7 T8 T9)
+    (T1 T2 T3 T4 T5 T6 T7 T8 T9 T10)
+    (T1 T2 T3 T4 T5 T6 T7 T8 T9 T10 T11)
+    (T1 T2 T3 T4 T5 T6 T7 T8 T9 T10 T11 T12)
+    (T1 T2 T3 T4 T5 T6 T7 T8 T9 T10 T11 T12 T13)
+    (T1 T2 T3 T4 T5 T6 T7 T8 T9 T10 T11 T12 T13 T14)
+    (T1 T2 T3 T4 T5 T6 T7 T8 T9 T10 T11 T12 T13 T14 T15)
+    (T1 T2 T3 T4 T5 T6 T7 T8 T9 T10 T11 T12 T13 T14 T15 T16)
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+
+    #[test]
+    fn test_flatten() {
+        let flat2 = (1, (2, ())).flatten();
+        assert_eq!(flat2, (1, 2));
+
+        let n3 = (1u8, (2u16, (3u32, ())));
+        let flat3 = n3.flatten();
+        assert_eq!(flat3, (1u8, 2u16, 3u32));
+
+        let n4 = n3.append(4u64);
+        let flat4 = n4.flatten();
+        assert_eq!(flat4, (1u8, 2u16, 3u32, 4u64));
+    }
+}
diff --git a/framework/base/src/types/interaction/contract_call_exec.rs b/framework/base/src/types/interaction/contract_call_exec.rs
index b32f143fdc..c8c49f69bc 100644
--- a/framework/base/src/types/interaction/contract_call_exec.rs
+++ b/framework/base/src/types/interaction/contract_call_exec.rs
@@ -215,7 +215,7 @@ where
     }
 }
 
-fn decode_result<SA, RequestedResult>(
+pub(super) fn decode_result<SA, RequestedResult>(
     raw_result: ManagedVec<SA, ManagedBuffer<SA>>,
 ) -> RequestedResult
 where
diff --git a/framework/base/src/types/interaction/function_call.rs b/framework/base/src/types/interaction/function_call.rs
index bfe74958dc..376aec879b 100644
--- a/framework/base/src/types/interaction/function_call.rs
+++ b/framework/base/src/types/interaction/function_call.rs
@@ -12,7 +12,7 @@ use crate::{
     types::{EsdtTokenPayment, ManagedAddress, ManagedBuffer, ManagedVec, MultiValueEncoded},
 };
 
-use super::{ContractCallNoPayment, ManagedArgBuffer};
+use super::{ContractCallNoPayment, ManagedArgBuffer, TypedFunctionCall};
 
 /// Encodes a function call on the blockchain, composed of a function name and its encoded arguments.
 ///
@@ -58,6 +58,18 @@ where
         self.arg_buffer.push_multi_arg(arg);
         self
     }
+
+    pub fn arguments_raw(mut self, raw: ManagedArgBuffer<Api>) -> Self {
+        self.arg_buffer = raw;
+        self
+    }
+
+    pub fn typed_result<R>(self) -> TypedFunctionCall<Api, R>
+    where
+        R: TopEncodeMulti + TopDecodeMulti,
+    {
+        self.into()
+    }
 }
 
 impl<Api> From<()> for FunctionCall<Api>
diff --git a/framework/base/src/types/interaction/mod.rs b/framework/base/src/types/interaction/mod.rs
index 2c7672566d..455f383f40 100644
--- a/framework/base/src/types/interaction/mod.rs
+++ b/framework/base/src/types/interaction/mod.rs
@@ -32,6 +32,9 @@ mod tx_gas;
 mod tx_payment;
 mod tx_result_handler;
 mod tx_return;
+mod tx_return_sync;
+mod tx_return_type_marker;
+mod tx_rh_list;
 mod tx_to;
 mod typed_function_call;
 
@@ -66,6 +69,9 @@ pub use tx_gas::*;
 pub use tx_payment::*;
 pub use tx_result_handler::*;
 pub use tx_return::*;
+pub use tx_return_sync::*;
+pub use tx_return_type_marker::*;
+pub use tx_rh_list::*;
 pub use tx_to::*;
 pub use typed_function_call::*;
 
diff --git a/framework/base/src/types/interaction/tx.rs b/framework/base/src/types/interaction/tx.rs
index 50db05407a..315ee8593d 100644
--- a/framework/base/src/types/interaction/tx.rs
+++ b/framework/base/src/types/interaction/tx.rs
@@ -12,8 +12,10 @@ use crate::{
 };
 
 use super::{
-    AsyncCall, ExplicitGas, FunctionCall, TxResultHandler, TxData, TxDataFunctionCall, TxEnv, TxFrom,
-    TxFromSpecified, TxGas, TxPayment, TxScEnv, TxTo, TxToSpecified,
+    AsyncCall, ExplicitGas, FunctionCall, ManagedArgBuffer, OriginalResultMarker, RHList,
+    RHListAppendNoRet, RHListAppendRet, RHListItem, ReturnTypeMarker, TxData, TxDataFunctionCall,
+    TxEnv, TxFrom, TxFromSpecified, TxGas, TxPayment, TxResultHandler, TxReturn, TxScEnv, TxTo,
+    TxToSpecified,
 };
 
 #[must_use]
@@ -134,9 +136,7 @@ where
         }
     }
 
-    pub fn to_caller(
-        self,
-    ) -> Tx<Env, From, ManagedAddress<Env::Api>, Payment, Gas, Data, RH> {
+    pub fn to_caller(self) -> Tx<Env, From, ManagedAddress<Env::Api>, Payment, Gas, Data, RH> {
         let caller = BlockchainWrapper::<Env::Api>::new().get_caller();
         self.to(caller)
     }
@@ -211,8 +211,7 @@ where
     }
 }
 
-impl<Env, From, To, Gas, Data, RH>
-    Tx<Env, From, To, EsdtTokenPayment<Env::Api>, Gas, Data, RH>
+impl<Env, From, To, Gas, Data, RH> Tx<Env, From, To, EsdtTokenPayment<Env::Api>, Gas, Data, RH>
 where
     Env: TxEnv,
     From: TxFrom<Env>,
@@ -243,8 +242,7 @@ where
     }
 }
 
-impl<Env, From, To, Gas, Data, RH>
-    Tx<Env, From, To, MultiEsdtPayment<Env::Api>, Gas, Data, RH>
+impl<Env, From, To, Gas, Data, RH> Tx<Env, From, To, MultiEsdtPayment<Env::Api>, Gas, Data, RH>
 where
     Env: TxEnv,
     From: TxFrom<Env>,
@@ -292,20 +290,19 @@ where
     }
 }
 
-impl<Env, From, To, Payment, Gas, RH> Tx<Env, From, To, Payment, Gas, (), RH>
+impl<Env, From, To, Payment, Gas> Tx<Env, From, To, Payment, Gas, (), ()>
 where
     Env: TxEnv,
     From: TxFrom<Env>,
     To: TxTo<Env>,
     Payment: TxPayment<Env>,
     Gas: TxGas<Env>,
-    RH: TxResultHandler<Env>,
 {
     #[inline]
     pub fn call<FC: Into<FunctionCall<Env::Api>>>(
         self,
         call: FC,
-    ) -> Tx<Env, From, To, Payment, Gas, FunctionCall<Env::Api>, RH> {
+    ) -> Tx<Env, From, To, Payment, Gas, FunctionCall<Env::Api>, ()> {
         Tx {
             env: self.env,
             from: self.from,
@@ -313,7 +310,7 @@ where
             payment: self.payment,
             gas: self.gas,
             data: call.into(),
-            result_handler: self.result_handler,
+            result_handler: (),
         }
     }
 
@@ -321,7 +318,7 @@ where
     pub fn function_name<N: Into<ManagedBuffer<Env::Api>>>(
         self,
         function_name: N,
-    ) -> Tx<Env, From, To, Payment, Gas, FunctionCall<Env::Api>, RH> {
+    ) -> Tx<Env, From, To, Payment, Gas, FunctionCall<Env::Api>, ()> {
         Tx {
             env: self.env,
             from: self.from,
@@ -329,13 +326,12 @@ where
             payment: self.payment,
             gas: self.gas,
             data: FunctionCall::new(function_name),
-            result_handler: self.result_handler,
+            result_handler: (),
         }
     }
 }
 
-impl<Env, From, To, Payment, Gas, RH>
-    Tx<Env, From, To, Payment, Gas, FunctionCall<Env::Api>, RH>
+impl<Env, From, To, Payment, Gas, RH> Tx<Env, From, To, Payment, Gas, FunctionCall<Env::Api>, RH>
 where
     Env: TxEnv,
     From: TxFrom<Env>,
@@ -349,6 +345,12 @@ where
         self.data = self.data.argument(arg);
         self
     }
+
+    #[inline]
+    pub fn arguments_raw(mut self, raw: ManagedArgBuffer<Env::Api>) -> Self {
+        self.data.arg_buffer = raw;
+        self
+    }
 }
 
 impl<Env, From, To, Payment, Gas, Data> Tx<Env, From, To, Payment, Gas, Data, ()>
@@ -361,10 +363,84 @@ where
     Data: TxData<Env>,
 {
     #[inline]
-    pub fn callback<RH>(
+    pub fn original_result<OriginalResult>(
+        self,
+    ) -> Tx<Env, From, To, Payment, Gas, Data, OriginalResultMarker<OriginalResult>> {
+        Tx {
+            env: self.env,
+            from: self.from,
+            to: self.to,
+            payment: self.payment,
+            gas: self.gas,
+            data: self.data,
+            result_handler: OriginalResultMarker::new(),
+        }
+    }
+}
+
+impl<Env, From, To, Payment, Gas, Data, ResultList>
+    Tx<Env, From, To, Payment, Gas, Data, ResultList>
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Payment: TxPayment<Env>,
+    Gas: TxGas<Env>,
+    Data: TxData<Env>,
+    ResultList: RHList<Env>,
+{
+    #[inline]
+    pub fn result_handler<RH>(
+        self,
+        item: RH,
+    ) -> Tx<Env, From, To, Payment, Gas, Data, ResultList::NoRetOutput>
+    where
+        RH: RHListItem<Env, ResultList::OriginalResult, Returns = ()>,
+        ResultList: RHListAppendNoRet<Env, RH>,
+    {
+        Tx {
+            env: self.env,
+            from: self.from,
+            to: self.to,
+            payment: self.payment,
+            gas: self.gas,
+            data: self.data,
+            result_handler: self.result_handler.append_no_ret(item),
+        }
+    }
+
+    #[inline]
+    pub fn returns<RH>(
         self,
-        callback: RH,
-    ) -> Tx<Env, From, To, Payment, Gas, Data, RH>
+        item: RH,
+    ) -> Tx<Env, From, To, Payment, Gas, Data, ResultList::RetOutput>
+    where
+        RH: RHListItem<Env, ResultList::OriginalResult>,
+        ResultList: RHListAppendRet<Env, RH>,
+    {
+        Tx {
+            env: self.env,
+            from: self.from,
+            to: self.to,
+            payment: self.payment,
+            gas: self.gas,
+            data: self.data,
+            result_handler: self.result_handler.append_ret(item),
+        }
+    }
+}
+
+impl<Env, From, To, Payment, Gas, Data> Tx<Env, From, To, Payment, Gas, Data, ()>
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Payment: TxPayment<Env>,
+    Gas: TxGas<Env>,
+    Data: TxData<Env>,
+{
+    #[inline]
+    pub fn callback<RH>(self, callback: RH) -> Tx<Env, From, To, Payment, Gas, Data, RH>
     where
         RH: TxResultHandler<Env>,
     {
diff --git a/framework/base/src/types/interaction/tx_call_async.rs b/framework/base/src/types/interaction/tx_call_async.rs
index 5ee7ed8bac..6907e97d1f 100644
--- a/framework/base/src/types/interaction/tx_call_async.rs
+++ b/framework/base/src/types/interaction/tx_call_async.rs
@@ -22,7 +22,12 @@ where
     fn save_callback_closure_to_storage(&self) {}
 }
 
-impl<Api> TxResultHandler<TxScEnv<Api>> for CallbackClosure<Api> where Api: CallTypeApi {}
+impl<Api> TxResultHandler<TxScEnv<Api>> for CallbackClosure<Api>
+where
+    Api: CallTypeApi,
+{
+    type OriginalResult = ();
+}
 
 impl<Api> TxAsyncCallCallback<Api> for CallbackClosure<Api>
 where
@@ -33,7 +38,13 @@ where
     }
 }
 
-impl<Api> TxResultHandler<TxScEnv<Api>> for Option<CallbackClosure<Api>> where Api: CallTypeApi {}
+impl<Api> TxResultHandler<TxScEnv<Api>> for Option<CallbackClosure<Api>>
+where
+    Api: CallTypeApi,
+{
+    type OriginalResult = ();
+}
+
 impl<Api> TxAsyncCallCallback<Api> for Option<CallbackClosure<Api>>
 where
     Api: CallTypeApi + StorageWriteApi,
diff --git a/framework/base/src/types/interaction/tx_call_async_promises.rs b/framework/base/src/types/interaction/tx_call_async_promises.rs
index 9a7907b03e..f43ca0bab4 100644
--- a/framework/base/src/types/interaction/tx_call_async_promises.rs
+++ b/framework/base/src/types/interaction/tx_call_async_promises.rs
@@ -5,8 +5,8 @@ use crate::{
 };
 
 use super::{
-    callback_closure::CallbackClosureWithGas, ExplicitGas, FunctionCall, Tx, TxResultHandler, TxGas,
-    TxPayment, TxScEnv, TxToSpecified,
+    callback_closure::CallbackClosureWithGas, ExplicitGas, FunctionCall, Tx, TxGas, TxPayment,
+    TxResultHandler, TxScEnv, TxToSpecified,
 };
 
 pub trait TxPromisesCallback<Api>: TxResultHandler<TxScEnv<Api>>
@@ -37,7 +37,13 @@ where
     }
 }
 
-impl<Api> TxResultHandler<TxScEnv<Api>> for CallbackClosureWithGas<Api> where Api: CallTypeApi {}
+impl<Api> TxResultHandler<TxScEnv<Api>> for CallbackClosureWithGas<Api>
+where
+    Api: CallTypeApi,
+{
+    type OriginalResult = ();
+}
+
 impl<Api> TxPromisesCallback<Api> for CallbackClosureWithGas<Api>
 where
     Api: CallTypeApi,
diff --git a/framework/base/src/types/interaction/tx_call_sync.rs b/framework/base/src/types/interaction/tx_call_sync.rs
index 0f5815a185..e7dcabc4fb 100644
--- a/framework/base/src/types/interaction/tx_call_sync.rs
+++ b/framework/base/src/types/interaction/tx_call_sync.rs
@@ -1,14 +1,89 @@
 use crate::{
     api::{CallTypeApi, StorageWriteApi},
     contract_base::SendRawWrapper,
-    types::{BigUint, CallbackClosure, ManagedAddress},
+    tuple_util::NestedTupleFlatten,
+    types::{BigUint, CallbackClosure, ManagedAddress, ManagedBuffer, ManagedVec},
 };
 
 use super::{
-    FunctionCall, Tx, TxDataFunctionCall, TxEnv, TxPayment, TxResultHandler, TxReturn, TxScEnv,
-    TxToSpecified, TxGas,
+    ConsNoRet, ConsRet, FunctionCall, OriginalResultMarker, RHList, RHListItem, Tx,
+    TxDataFunctionCall, TxEnv, TxGas, TxPayment, TxResultHandler, TxReturn, TxReturnSync, TxScEnv,
+    TxToSpecified,
 };
 
+pub trait RHListItemSync<Env, Original>: RHListItem<Env, Original>
+where
+    Env: TxEnv,
+{
+    fn item_sync_call_result(
+        self,
+        raw_results: &ManagedVec<Env::Api, ManagedBuffer<Env::Api>>,
+    ) -> Self::Returns;
+}
+
+pub trait RHListSync<Env>: RHList<Env>
+where
+    Env: TxEnv,
+{
+    fn list_sync_call_result(
+        self,
+        raw_results: &ManagedVec<Env::Api, ManagedBuffer<Env::Api>>,
+    ) -> Self::ListReturns;
+}
+
+impl<Env> RHListSync<Env> for ()
+where
+    Env: TxEnv,
+{
+    fn list_sync_call_result(
+        self,
+        raw_results: &ManagedVec<Env::Api, ManagedBuffer<Env::Api>>,
+    ) -> Self::ListReturns {
+    }
+}
+
+impl<Env, O> RHListSync<Env> for OriginalResultMarker<O>
+where
+    Env: TxEnv,
+{
+    fn list_sync_call_result(
+        self,
+        raw_results: &ManagedVec<Env::Api, ManagedBuffer<Env::Api>>,
+    ) -> Self::ListReturns {
+    }
+}
+
+impl<Env, Head, Tail> RHListSync<Env> for ConsRet<Env, Head, Tail>
+where
+    Env: TxEnv,
+    Head: RHListItemSync<Env, Tail::OriginalResult>,
+    Tail: RHListSync<Env>,
+{
+    fn list_sync_call_result(
+        self,
+        raw_results: &ManagedVec<Env::Api, ManagedBuffer<Env::Api>>,
+    ) -> Self::ListReturns {
+        let head_result = self.head.item_sync_call_result(raw_results);
+        let tail_result = self.tail.list_sync_call_result(raw_results);
+        (head_result, tail_result)
+    }
+}
+
+impl<Env, Head, Tail> RHListSync<Env> for ConsNoRet<Env, Head, Tail>
+where
+    Env: TxEnv,
+    Head: RHListItemSync<Env, Tail::OriginalResult, Returns = ()>,
+    Tail: RHListSync<Env>,
+{
+    fn list_sync_call_result(
+        self,
+        raw_results: &ManagedVec<Env::Api, ManagedBuffer<Env::Api>>,
+    ) -> Self::ListReturns {
+        self.head.item_sync_call_result(raw_results);
+        self.tail.list_sync_call_result(raw_results)
+    }
+}
+
 impl<Api, To, Payment, Gas, FC, RH> Tx<TxScEnv<Api>, (), To, Payment, Gas, FC, RH>
 where
     Api: CallTypeApi,
@@ -16,9 +91,10 @@ where
     Payment: TxPayment<TxScEnv<Api>>,
     Gas: TxGas<TxScEnv<Api>>,
     FC: TxDataFunctionCall<TxScEnv<Api>>,
-    RH: TxReturn<TxScEnv<Api>>,
+    RH: RHListSync<TxScEnv<Api>>,
+    RH::ListReturns: NestedTupleFlatten,
 {
-    pub fn execute_on_dest_context(self) -> RH::Returned {
+    pub fn execute_on_dest_context(self) -> <RH::ListReturns as NestedTupleFlatten>::Unpacked {
         let gas_limit = self.gas.resolve_gas(&self.env);
         let normalized = self.normalize_tx();
 
@@ -32,6 +108,7 @@ where
 
         SendRawWrapper::<Api>::new().clean_return_data();
 
-        normalized.result_handler.sync_call_result(&raw_result)
+        let tuple_result = normalized.result_handler.list_sync_call_result(&raw_result);
+        tuple_result.flatten_unpack()
     }
 }
diff --git a/framework/base/src/types/interaction/tx_result_handler.rs b/framework/base/src/types/interaction/tx_result_handler.rs
index 1b28d5fd97..8cc0b06bbf 100644
--- a/framework/base/src/types/interaction/tx_result_handler.rs
+++ b/framework/base/src/types/interaction/tx_result_handler.rs
@@ -10,8 +10,25 @@ pub trait TxResultHandler<Env>
 where
     Env: TxEnv,
 {
+    type OriginalResult;
 }
 
+impl<Env> TxResultHandler<Env> for ()
+where
+    Env: TxEnv,
+{
+    type OriginalResult = ();
+}
+
+// impl<Env, Head, Tail> TxResultHandler<Env> for (Head, Tail)
+// where
+//     Env: TxEnv,
+//     Head: TxResultHandler<Env>,
+//     Tail: TxResultHandler<Env>,
+// {
+//     type OriginalResult = Tail::OriginalResult;
+// }
+
 pub trait TxRunnableCallback<Env>: TxResultHandler<Env>
 where
     Env: TxEnv,
@@ -19,8 +36,6 @@ where
     fn run_callback(self, env: &Env);
 }
 
-impl<Env> TxResultHandler<Env> for () where Env: TxEnv {}
-
 impl<Env> TxRunnableCallback<Env> for ()
 where
     Env: TxEnv,
diff --git a/framework/base/src/types/interaction/tx_return.rs b/framework/base/src/types/interaction/tx_return.rs
index 3a29be5b6a..176d0a56a3 100644
--- a/framework/base/src/types/interaction/tx_return.rs
+++ b/framework/base/src/types/interaction/tx_return.rs
@@ -4,47 +4,34 @@ use crate::{
     types::{ManagedBuffer, ManagedBufferCachedBuilder, ManagedVec},
 };
 
-use super::{FunctionCall, TxEnv, TxResultHandler};
+use super::{FunctionCall, ReturnTypeMarker, TxEnv, TxResultHandler};
 
 pub trait TxReturn<Env>: TxResultHandler<Env>
 where
     Env: TxEnv,
 {
-    type Returned;
-
-    fn sync_call_result(
-        self,
-        raw_results: &ManagedVec<Env::Api, ManagedBuffer<Env::Api>>,
-    ) -> Self::Returned;
+    type Returns;
 }
 
 impl<Env> TxReturn<Env> for ()
 where
     Env: TxEnv,
 {
-    type Returned = ();
-
-    fn sync_call_result(
-        self,
-        raw_results: &ManagedVec<Env::Api, ManagedBuffer<Env::Api>>,
-    ) -> Self::Returned {
-    }
+    type Returns = ();
 }
 
-pub struct ReturnRaw;
-
-impl<Env> TxResultHandler<Env> for ReturnRaw where Env: TxEnv {}
-
-impl<Env> TxReturn<Env> for ReturnRaw
+impl<Env, OriginalResult> TxReturn<Env> for ReturnTypeMarker<OriginalResult>
 where
     Env: TxEnv,
 {
-    type Returned = ManagedVec<Env::Api, ManagedBuffer<Env::Api>>;
-
-    fn sync_call_result(
-        self,
-        raw_results: &ManagedVec<Env::Api, ManagedBuffer<Env::Api>>,
-    ) -> Self::Returned {
-        raw_results.clone()
-    }
+    type Returns = ();
 }
+
+// impl<Env, Head, Tail> TxReturn<Env> for (Head, Tail)
+// where
+//     Env: TxEnv,
+//     Head: TxReturn<Env>,
+//     Tail: TxReturn<Env, Returns = ()>,
+// {
+//     type Returns = Head::Returns;
+// }
diff --git a/framework/base/src/types/interaction/tx_return_sync.rs b/framework/base/src/types/interaction/tx_return_sync.rs
new file mode 100644
index 0000000000..b1811c6aeb
--- /dev/null
+++ b/framework/base/src/types/interaction/tx_return_sync.rs
@@ -0,0 +1,46 @@
+use crate::{
+    api::ManagedTypeApi,
+    formatter::SCLowerHex,
+    types::{ManagedBuffer, ManagedBufferCachedBuilder, ManagedVec},
+};
+
+use super::{FunctionCall, TxData, TxEnv, TxReturn};
+
+pub trait TxReturnSync<Env>: TxReturn<Env>
+where
+    Env: TxEnv,
+{
+    fn sync_call_result(
+        self,
+        raw_results: &ManagedVec<Env::Api, ManagedBuffer<Env::Api>>,
+    ) -> Self::Returns;
+}
+
+impl<Env> TxReturnSync<Env> for ()
+where
+    Env: TxEnv,
+{
+    fn sync_call_result(
+        self,
+        raw_results: &ManagedVec<Env::Api, ManagedBuffer<Env::Api>>,
+    ) -> Self::Returns {
+    }
+}
+
+// impl<Env, Head, Tail> TxReturnSync<Env> for (Head, Tail)
+// where
+//     Env: TxEnv,
+//     Head: TxReturnSync<Env>,
+//     Tail: TxReturnSync<Env, Returns = ()>,
+// {
+//     fn sync_call_result(
+//         self,
+//         raw_results: &ManagedVec<Env::Api, ManagedBuffer<Env::Api>>,
+//     ) -> Self::Returns {
+//         // tail first
+//         self.1.sync_call_result(raw_results);
+
+//         // head at last, which also has a chance of returning
+//         self.0.sync_call_result(raw_results)
+//     }
+// }
diff --git a/framework/base/src/types/interaction/tx_return_type_marker.rs b/framework/base/src/types/interaction/tx_return_type_marker.rs
new file mode 100644
index 0000000000..a798ec7ddd
--- /dev/null
+++ b/framework/base/src/types/interaction/tx_return_type_marker.rs
@@ -0,0 +1,28 @@
+use core::marker::PhantomData;
+
+use crate::{
+    api::ManagedTypeApi,
+    formatter::SCLowerHex,
+    types::{ManagedBuffer, ManagedBufferCachedBuilder, ManagedVec},
+};
+
+use super::{FunctionCall, TxData, TxEnv, TxResultHandler, TxReturn};
+
+pub struct ReturnTypeMarker<OriginalResult> {
+    _return_type: PhantomData<OriginalResult>,
+}
+
+impl<OriginalResult> Default for ReturnTypeMarker<OriginalResult> {
+    fn default() -> Self {
+        Self {
+            _return_type: PhantomData,
+        }
+    }
+}
+
+impl<Env, OriginalResult> TxResultHandler<Env> for ReturnTypeMarker<OriginalResult>
+where
+    Env: TxEnv,
+{
+    type OriginalResult = OriginalResult;
+}
diff --git a/framework/base/src/types/interaction/tx_rh_list.rs b/framework/base/src/types/interaction/tx_rh_list.rs
new file mode 100644
index 0000000000..43aacfbc67
--- /dev/null
+++ b/framework/base/src/types/interaction/tx_rh_list.rs
@@ -0,0 +1,13 @@
+mod returns_bt;
+mod returns_exact;
+mod returns_raw;
+mod returns_similar;
+mod tx_rh_list_cons;
+mod tx_rh_list_item;
+
+pub use returns_bt::*;
+pub use returns_exact::*;
+pub use returns_raw::*;
+pub use returns_similar::*;
+pub use tx_rh_list_cons::*;
+pub use tx_rh_list_item::*;
diff --git a/framework/base/src/types/interaction/tx_rh_list/returns_bt.rs b/framework/base/src/types/interaction/tx_rh_list/returns_bt.rs
new file mode 100644
index 0000000000..03b695d6f6
--- /dev/null
+++ b/framework/base/src/types/interaction/tx_rh_list/returns_bt.rs
@@ -0,0 +1,27 @@
+use crate::{
+    contract_base::BlockchainWrapper,
+    types::{BackTransfers, ManagedBuffer, ManagedVec, RHListItemSync, TxEnv},
+};
+
+use super::RHListItem;
+
+pub struct ReturnsBackTransfers;
+
+impl<Env, Original> RHListItem<Env, Original> for ReturnsBackTransfers
+where
+    Env: TxEnv,
+{
+    type Returns = BackTransfers<Env::Api>;
+}
+
+impl<Env, Original> RHListItemSync<Env, Original> for ReturnsBackTransfers
+where
+    Env: TxEnv,
+{
+    fn item_sync_call_result(
+        self,
+        _raw_results: &ManagedVec<Env::Api, ManagedBuffer<Env::Api>>,
+    ) -> Self::Returns {
+        BlockchainWrapper::<Env::Api>::new().get_back_transfers()
+    }
+}
diff --git a/framework/base/src/types/interaction/tx_rh_list/returns_exact.rs b/framework/base/src/types/interaction/tx_rh_list/returns_exact.rs
new file mode 100644
index 0000000000..ef1d2eb6fb
--- /dev/null
+++ b/framework/base/src/types/interaction/tx_rh_list/returns_exact.rs
@@ -0,0 +1,46 @@
+use multiversx_sc_codec::TopDecodeMulti;
+
+use crate::types::{
+    interaction::contract_call_exec::decode_result, ManagedBuffer, ManagedVec, RHListItemSync,
+    TxEnv,
+};
+
+use super::RHListItem;
+
+pub struct ReturnsExact;
+
+impl<Env, Original> RHListItem<Env, Original> for ReturnsExact
+where
+    Env: TxEnv,
+{
+    type Returns = Original;
+}
+
+impl<Env, Original> RHListItemSync<Env, Original> for ReturnsExact
+where
+    Env: TxEnv,
+    Original: TopDecodeMulti,
+{
+    fn item_sync_call_result(
+        self,
+        raw_results: &ManagedVec<Env::Api, ManagedBuffer<Env::Api>>,
+    ) -> Self::Returns {
+        decode_result::<Env::Api, Original>(raw_results.clone())
+    }
+}
+
+// impl<Env> TxResultHandler<Env> for ReturnRaw where Env: TxEnv {}
+
+// impl<Env> TxReturn<Env> for ReturnRaw
+// where
+//     Env: TxEnv,
+// {
+//     type Returned = ManagedVec<Env::Api, ManagedBuffer<Env::Api>>;
+
+//     fn sync_call_result(
+//         self,
+//         raw_results: &ManagedVec<Env::Api, ManagedBuffer<Env::Api>>,
+//     ) -> Self::Returned {
+//         raw_results.clone()
+//     }
+// }
diff --git a/framework/base/src/types/interaction/tx_rh_list/returns_raw.rs b/framework/base/src/types/interaction/tx_rh_list/returns_raw.rs
new file mode 100644
index 0000000000..f9651240a4
--- /dev/null
+++ b/framework/base/src/types/interaction/tx_rh_list/returns_raw.rs
@@ -0,0 +1,40 @@
+use crate::types::{ManagedBuffer, ManagedVec, RHListItemSync, TxEnv};
+
+use super::RHListItem;
+
+pub struct ReturnsRaw;
+
+impl<Env, Original> RHListItem<Env, Original> for ReturnsRaw
+where
+    Env: TxEnv,
+{
+    type Returns = ManagedVec<Env::Api, ManagedBuffer<Env::Api>>;
+}
+
+impl<Env, Original> RHListItemSync<Env, Original> for ReturnsRaw
+where
+    Env: TxEnv,
+{
+    fn item_sync_call_result(
+        self,
+        raw_results: &ManagedVec<Env::Api, ManagedBuffer<Env::Api>>,
+    ) -> Self::Returns {
+        raw_results.clone()
+    }
+}
+
+// impl<Env> TxResultHandler<Env> for ReturnRaw where Env: TxEnv {}
+
+// impl<Env> TxReturn<Env> for ReturnRaw
+// where
+//     Env: TxEnv,
+// {
+//     type Returned = ManagedVec<Env::Api, ManagedBuffer<Env::Api>>;
+
+//     fn sync_call_result(
+//         self,
+//         raw_results: &ManagedVec<Env::Api, ManagedBuffer<Env::Api>>,
+//     ) -> Self::Returned {
+//         raw_results.clone()
+//     }
+// }
diff --git a/framework/base/src/types/interaction/tx_rh_list/returns_similar.rs b/framework/base/src/types/interaction/tx_rh_list/returns_similar.rs
new file mode 100644
index 0000000000..5709e68f8d
--- /dev/null
+++ b/framework/base/src/types/interaction/tx_rh_list/returns_similar.rs
@@ -0,0 +1,39 @@
+use core::marker::PhantomData;
+
+use crate::types::TxEnv;
+
+use super::RHListItem;
+
+pub struct ReturnSimilar<T> {
+    _phantom: PhantomData<T>,
+}
+
+impl<T> Default for ReturnSimilar<T> {
+    fn default() -> Self {
+        Self {
+            _phantom: Default::default(),
+        }
+    }
+}
+
+impl<T> ReturnSimilar<T> {
+    fn new() -> Self {
+        Self::default()
+    }
+}
+
+// impl<Env> TxResultHandler<Env> for ReturnRaw where Env: TxEnv {}
+
+// impl<Env> TxReturn<Env> for ReturnRaw
+// where
+//     Env: TxEnv,
+// {
+//     type Returned = ManagedVec<Env::Api, ManagedBuffer<Env::Api>>;
+
+//     fn sync_call_result(
+//         self,
+//         raw_results: &ManagedVec<Env::Api, ManagedBuffer<Env::Api>>,
+//     ) -> Self::Returned {
+//         raw_results.clone()
+//     }
+// }
diff --git a/framework/base/src/types/interaction/tx_rh_list/tx_rh_list_cons.rs b/framework/base/src/types/interaction/tx_rh_list/tx_rh_list_cons.rs
new file mode 100644
index 0000000000..ad841ed6e8
--- /dev/null
+++ b/framework/base/src/types/interaction/tx_rh_list/tx_rh_list_cons.rs
@@ -0,0 +1,275 @@
+use core::marker::PhantomData;
+
+use crate::types::{TxEnv, TxResultHandler};
+
+use super::RHListItem;
+
+pub trait RHList<Env>: TxResultHandler<Env>
+where
+    Env: TxEnv,
+{
+    type ListReturns;
+}
+
+pub trait RHListAppendRet<Env, T>: RHList<Env>
+where
+    Env: TxEnv,
+    T: RHListItem<Env, Self::OriginalResult>,
+{
+    type RetOutput: RHList<Env, OriginalResult = Self::OriginalResult>;
+
+    fn append_ret(self, t: T) -> Self::RetOutput;
+}
+
+pub trait RHListAppendNoRet<Env, T>: RHList<Env>
+where
+    Env: TxEnv,
+    T: RHListItem<Env, Self::OriginalResult, Returns = ()>,
+{
+    type NoRetOutput: RHList<Env, OriginalResult = Self::OriginalResult>;
+
+    fn append_no_ret(self, t: T) -> Self::NoRetOutput;
+}
+
+impl<Env> RHList<Env> for ()
+where
+    Env: TxEnv,
+{
+    type ListReturns = ();
+}
+
+impl<Env, T> RHListAppendRet<Env, T> for ()
+where
+    Env: TxEnv,
+    T: RHListItem<Env, ()>,
+{
+    type RetOutput = ConsRet<Env, T, ()>;
+
+    fn append_ret(self, t: T) -> Self::RetOutput {
+        ConsRet::new(t, self)
+    }
+}
+
+impl<Env, T> RHListAppendNoRet<Env, T> for ()
+where
+    Env: TxEnv,
+    T: RHListItem<Env, (), Returns = ()>,
+{
+    type NoRetOutput = ConsNoRet<Env, T, ()>;
+
+    fn append_no_ret(self, t: T) -> Self::NoRetOutput {
+        ConsNoRet::new(t, self)
+    }
+}
+
+pub struct OriginalResultMarker<O> {
+    _phantom: PhantomData<O>,
+}
+
+impl<O> Default for OriginalResultMarker<O> {
+    fn default() -> Self {
+        Self {
+            _phantom: Default::default(),
+        }
+    }
+}
+
+impl<O> OriginalResultMarker<O> {
+    pub fn new() -> Self {
+        Self::default()
+    }
+}
+
+impl<Env, O> TxResultHandler<Env> for OriginalResultMarker<O>
+where
+    Env: TxEnv,
+{
+    type OriginalResult = O;
+}
+
+impl<Env, O> RHList<Env> for OriginalResultMarker<O>
+where
+    Env: TxEnv,
+{
+    type ListReturns = ();
+}
+
+impl<Env, O, T> RHListAppendRet<Env, T> for OriginalResultMarker<O>
+where
+    Env: TxEnv,
+    T: RHListItem<Env, O>,
+{
+    type RetOutput = ConsRet<Env, T, OriginalResultMarker<O>>;
+
+    fn append_ret(self, t: T) -> Self::RetOutput {
+        ConsRet::new(t, self)
+    }
+}
+
+impl<Env, O, T> RHListAppendNoRet<Env, T> for OriginalResultMarker<O>
+where
+    Env: TxEnv,
+    T: RHListItem<Env, O, Returns = ()>,
+{
+    type NoRetOutput = ConsNoRet<Env, T, OriginalResultMarker<O>>;
+
+    fn append_no_ret(self, t: T) -> Self::NoRetOutput {
+        ConsNoRet::new(t, self)
+    }
+}
+
+pub struct ConsRet<Env, Head, Tail>
+where
+    Env: TxEnv,
+    Head: RHListItem<Env, Tail::OriginalResult>,
+    Tail: RHList<Env>,
+{
+    _phantom: PhantomData<Env>,
+    pub head: Head,
+    pub tail: Tail,
+}
+
+impl<Env, Head, Tail> ConsRet<Env, Head, Tail>
+where
+    Env: TxEnv,
+    Head: RHListItem<Env, Tail::OriginalResult>,
+    Tail: RHList<Env>,
+{
+    fn new(head: Head, tail: Tail) -> Self {
+        ConsRet {
+            _phantom: PhantomData,
+            head,
+            tail,
+        }
+    }
+}
+
+impl<Env, Head, Tail> TxResultHandler<Env> for ConsRet<Env, Head, Tail>
+where
+    Env: TxEnv,
+    Head: RHListItem<Env, Tail::OriginalResult>,
+    Tail: RHList<Env>,
+{
+    type OriginalResult = Tail::OriginalResult;
+}
+
+impl<Env, Head, Tail> RHList<Env> for ConsRet<Env, Head, Tail>
+where
+    Env: TxEnv,
+    Head: RHListItem<Env, Tail::OriginalResult>,
+    Tail: RHList<Env>,
+{
+    type ListReturns = (Head::Returns, Tail::ListReturns);
+
+    // fn list_return(&self) -> Self::ListReturn {
+    //     let head_ret = self.head.single_return();
+    //     let tail_ret = self.tail.list_return();
+    //     (head_ret, tail_ret)
+    // }
+}
+
+impl<Env, Head, Tail, T> RHListAppendRet<Env, T> for ConsRet<Env, Head, Tail>
+where
+    Env: TxEnv,
+    Head: RHListItem<Env, Tail::OriginalResult>,
+    Tail: RHList<Env> + RHListAppendRet<Env, T>,
+    T: RHListItem<Env, Tail::OriginalResult>,
+{
+    type RetOutput = ConsRet<Env, Head, <Tail as RHListAppendRet<Env, T>>::RetOutput>;
+
+    fn append_ret(self, t: T) -> Self::RetOutput {
+        ConsRet::new(self.head, self.tail.append_ret(t))
+    }
+}
+
+impl<Env, Head, Tail, T> RHListAppendNoRet<Env, T> for ConsRet<Env, Head, Tail>
+where
+    Env: TxEnv,
+    Head: RHListItem<Env, Tail::OriginalResult>,
+    Tail: RHList<Env> + RHListAppendNoRet<Env, T>,
+    T: RHListItem<Env, Tail::OriginalResult, Returns = ()>,
+{
+    type NoRetOutput = ConsRet<Env, Head, <Tail as RHListAppendNoRet<Env, T>>::NoRetOutput>;
+
+    fn append_no_ret(self, t: T) -> Self::NoRetOutput {
+        ConsRet::new(self.head, self.tail.append_no_ret(t))
+    }
+}
+
+/// Handlers that return nothing.
+pub struct ConsNoRet<Env, Head, Tail>
+where
+    Env: TxEnv,
+    Head: RHListItem<Env, Tail::OriginalResult, Returns = ()>,
+    Tail: RHList<Env>,
+{
+    _phantom: PhantomData<Env>,
+    pub head: Head,
+    pub tail: Tail,
+}
+
+impl<Env, Head, Tail> ConsNoRet<Env, Head, Tail>
+where
+    Env: TxEnv,
+    Head: RHListItem<Env, Tail::OriginalResult, Returns = ()>,
+    Tail: RHList<Env>,
+{
+    fn new(head: Head, tail: Tail) -> Self {
+        ConsNoRet {
+            _phantom: PhantomData,
+            head,
+            tail,
+        }
+    }
+}
+
+impl<Env, Head, Tail> TxResultHandler<Env> for ConsNoRet<Env, Head, Tail>
+where
+    Env: TxEnv,
+    Head: RHListItem<Env, Tail::OriginalResult, Returns = ()>,
+    Tail: RHList<Env>,
+{
+    type OriginalResult = Tail::OriginalResult;
+}
+
+impl<Env, Head, Tail> RHList<Env> for ConsNoRet<Env, Head, Tail>
+where
+    Env: TxEnv,
+    Head: RHListItem<Env, Tail::OriginalResult, Returns = ()>,
+    Tail: RHList<Env>,
+{
+    type ListReturns = Tail::ListReturns;
+
+    // fn list_return(&self) -> Self::ListReturn {
+    //     self.head.single_return();
+    //     self.tail.list_return()
+    // }
+}
+
+impl<Env, Head, Tail, T> RHListAppendRet<Env, T> for ConsNoRet<Env, Head, Tail>
+where
+    Env: TxEnv,
+    Head: RHListItem<Env, Tail::OriginalResult, Returns = ()>,
+    Tail: RHList<Env> + RHListAppendRet<Env, T>,
+    T: RHListItem<Env, Tail::OriginalResult>,
+{
+    type RetOutput = ConsNoRet<Env, Head, <Tail as RHListAppendRet<Env, T>>::RetOutput>;
+
+    fn append_ret(self, t: T) -> Self::RetOutput {
+        ConsNoRet::new(self.head, self.tail.append_ret(t))
+    }
+}
+
+impl<Env, Head, Tail, T> RHListAppendNoRet<Env, T> for ConsNoRet<Env, Head, Tail>
+where
+    Env: TxEnv,
+    Head: RHListItem<Env, Tail::OriginalResult, Returns = ()>,
+    Tail: RHList<Env> + RHListAppendNoRet<Env, T>,
+    T: RHListItem<Env, Tail::OriginalResult, Returns = ()>,
+{
+    type NoRetOutput = ConsNoRet<Env, Head, <Tail as RHListAppendNoRet<Env, T>>::NoRetOutput>;
+
+    fn append_no_ret(self, t: T) -> Self::NoRetOutput {
+        ConsNoRet::new(self.head, self.tail.append_no_ret(t))
+    }
+}
diff --git a/framework/base/src/types/interaction/tx_rh_list/tx_rh_list_item.rs b/framework/base/src/types/interaction/tx_rh_list/tx_rh_list_item.rs
new file mode 100644
index 0000000000..8430b91b79
--- /dev/null
+++ b/framework/base/src/types/interaction/tx_rh_list/tx_rh_list_item.rs
@@ -0,0 +1,18 @@
+use crate::types::{ManagedBuffer, ManagedVec, TxEnv};
+
+/// Result handler list item.
+///
+/// It acts as a result handler that produces a single result.
+pub trait RHListItem<Env, Original>
+where
+    Env: TxEnv,
+{
+    type Returns;
+}
+
+impl<Env, Original> RHListItem<Env, Original> for ()
+where
+    Env: TxEnv,
+{
+    type Returns = ();
+}
diff --git a/framework/scenario/src/facade/scenario_callbacks.rs b/framework/scenario/src/facade/scenario_callbacks.rs
index e55f4bdec5..ffbf569de0 100644
--- a/framework/scenario/src/facade/scenario_callbacks.rs
+++ b/framework/scenario/src/facade/scenario_callbacks.rs
@@ -8,7 +8,13 @@ pub struct WithTxResult<F>(pub F)
 where
     F: FnOnce(&TxResponse);
 
-impl<F> TxResultHandler<ScenarioTxEnvironment> for WithTxResult<F> where F: FnOnce(&TxResponse) {}
+impl<F> TxResultHandler<ScenarioTxEnvironment> for WithTxResult<F>
+where
+    F: FnOnce(&TxResponse),
+{
+    type OriginalResult = ();
+}
+
 impl<F> TxRunnableCallback<ScenarioTxEnvironment> for WithTxResult<F>
 where
     F: FnOnce(&TxResponse),

From 7c1d3902e8a7d0b7c89ee1a8afc55faf66805891 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Sun, 14 Jan 2024 05:14:38 +0200
Subject: [PATCH 0207/1254] unified syntax - execute_on_dest_context example

---
 .../forwarder-raw/src/forwarder_raw_sync.rs    | 18 ++++++++++--------
 .../scenarios/forw_raw_sync_echo.scen.json     |  5 +----
 .../forw_raw_sync_echo_caller.scen.json        |  4 +---
 3 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/contracts/feature-tests/composability/forwarder-raw/src/forwarder_raw_sync.rs b/contracts/feature-tests/composability/forwarder-raw/src/forwarder_raw_sync.rs
index d01245ca59..c77fd503f9 100644
--- a/contracts/feature-tests/composability/forwarder-raw/src/forwarder_raw_sync.rs
+++ b/contracts/feature-tests/composability/forwarder-raw/src/forwarder_raw_sync.rs
@@ -10,15 +10,17 @@ pub trait ForwarderRawSync: super::forwarder_raw_common::ForwarderRawCommon {
         endpoint_name: ManagedBuffer,
         args: MultiValueEncoded<ManagedBuffer>,
     ) {
-        let payment = self.call_value().egld_value();
+        let payment = self.call_value().egld_value().clone_value();
         let half_gas = self.blockchain().get_gas_left() / 2;
-        let result = self.send_raw().execute_on_dest_context_raw(
-            half_gas,
-            &to,
-            &payment,
-            &endpoint_name,
-            &args.to_arg_buffer(),
-        );
+        let result = self
+            .tx()
+            .to(to)
+            .egld(payment)
+            .function_name(endpoint_name)
+            .argument(&args)
+            .with_gas_limit(half_gas)
+            .returns(ReturnsRaw)
+            .execute_on_dest_context();
 
         self.execute_on_dest_context_result(result);
     }
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 038dbe24fe..38c3527948 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
@@ -37,10 +37,7 @@
                 "gasPrice": "0"
             },
             "expect": {
-                "out": [
-                    "1",
-                    "2"
-                ],
+                "out": [],
                 "status": "0",
                 "logs": [
                     {
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 a35fe621a5..a287422099 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
@@ -35,9 +35,7 @@
                 "gasPrice": "0"
             },
             "expect": {
-                "out": [
-                    "sc:forwarder"
-                ],
+                "out": [],
                 "status": "0",
                 "logs": [
                     {

From cf9540b0cae9ed9d08cea06a3003d511806f43d1 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Sun, 14 Jan 2024 12:43:48 +0200
Subject: [PATCH 0208/1254] rename fix

---
 framework/base/src/tuple_util/nested_tuples.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/framework/base/src/tuple_util/nested_tuples.rs b/framework/base/src/tuple_util/nested_tuples.rs
index 9b7844389c..a6dda04391 100644
--- a/framework/base/src/tuple_util/nested_tuples.rs
+++ b/framework/base/src/tuple_util/nested_tuples.rs
@@ -83,7 +83,7 @@ macro_rules! unnest {
 macro_rules! flatten_impl {
     ($(($t:ident $($ts:ident)+))+) => {
         $(
-            impl<$t,$($ts),+> Flatten for tuple_list_type!($t,$($ts),+) {
+            impl<$t,$($ts),+> NestedTupleFlatten for tuple_list_type!($t,$($ts),+) {
                 type Flattened = ($t,$($ts),+);
                 type Unpacked = ($t,$($ts),+);
 

From 0915f300b7134053b4063160e942847c8db3e5ac Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Mon, 15 Jan 2024 09:40:05 +0200
Subject: [PATCH 0209/1254] cleanup

---
 .../base/src/types/interaction/annotated.rs   |  5 +-
 .../base/src/types/interaction/async_call.rs  |  5 +-
 .../src/types/interaction/expr_address.rs     |  5 +-
 .../base/src/types/interaction/expr_sc.rs     |  5 +-
 framework/base/src/types/interaction/mod.rs   |  6 ---
 framework/base/src/types/interaction/tx.rs    | 10 ++--
 .../src/types/interaction/tx_call_async.rs    |  6 +--
 .../interaction/tx_call_async_promises.rs     |  2 +-
 .../src/types/interaction/tx_call_sync.rs     | 13 +++---
 .../base/src/types/interaction/tx_call_te.rs  | 14 +-----
 .../base/src/types/interaction/tx_data.rs     |  1 -
 .../base/src/types/interaction/tx_env.rs      |  7 +--
 .../base/src/types/interaction/tx_env_sc.rs   |  5 +-
 .../base/src/types/interaction/tx_from.rs     |  2 +-
 .../base/src/types/interaction/tx_gas.rs      |  4 +-
 .../base/src/types/interaction/tx_payment.rs  |  6 +--
 .../types/interaction/tx_result_handler.rs    |  8 +---
 .../base/src/types/interaction/tx_return.rs   | 37 ---------------
 .../src/types/interaction/tx_return_sync.rs   | 46 -------------------
 .../interaction/tx_return_type_marker.rs      | 28 -----------
 .../interaction/tx_rh_list/returns_exact.rs   | 16 -------
 .../interaction/tx_rh_list/returns_raw.rs     | 16 -------
 .../interaction/tx_rh_list/returns_similar.rs | 22 +--------
 .../interaction/tx_rh_list/tx_rh_list_item.rs |  2 +-
 framework/base/src/types/interaction/tx_to.rs |  2 +-
 .../types/interaction/typed_function_call.rs  |  8 +---
 26 files changed, 32 insertions(+), 249 deletions(-)
 delete mode 100644 framework/base/src/types/interaction/tx_return.rs
 delete mode 100644 framework/base/src/types/interaction/tx_return_sync.rs
 delete mode 100644 framework/base/src/types/interaction/tx_return_type_marker.rs

diff --git a/framework/base/src/types/interaction/annotated.rs b/framework/base/src/types/interaction/annotated.rs
index 9463ed7c12..bf01d4a4f9 100644
--- a/framework/base/src/types/interaction/annotated.rs
+++ b/framework/base/src/types/interaction/annotated.rs
@@ -1,7 +1,4 @@
-use crate::{
-    api::ManagedTypeApi,
-    types::{ManagedAddress, ManagedBuffer},
-};
+use crate::types::{ManagedAddress, ManagedBuffer};
 
 use super::TxEnv;
 
diff --git a/framework/base/src/types/interaction/async_call.rs b/framework/base/src/types/interaction/async_call.rs
index 2ef3a61c43..5c3b57c5c8 100644
--- a/framework/base/src/types/interaction/async_call.rs
+++ b/framework/base/src/types/interaction/async_call.rs
@@ -1,10 +1,9 @@
 use crate::{
     api::{CallTypeApi, StorageWriteApi},
-    contract_base::SendRawWrapper,
-    types::{BigUint, CallbackClosure, EgldPayment, ManagedAddress},
+    types::{CallbackClosure, EgldPayment, ManagedAddress},
 };
 
-use super::{FunctionCall, Tx, TxAsyncCallCallback, TxScEnv};
+use super::{FunctionCall, Tx, TxScEnv};
 
 pub type AsyncCall<Api> = Tx<
     TxScEnv<Api>,
diff --git a/framework/base/src/types/interaction/expr_address.rs b/framework/base/src/types/interaction/expr_address.rs
index 69a13cd6e3..c450d49043 100644
--- a/framework/base/src/types/interaction/expr_address.rs
+++ b/framework/base/src/types/interaction/expr_address.rs
@@ -1,9 +1,6 @@
 use core::ptr;
 
-use crate::{
-    api::CallTypeApi,
-    types::{ManagedAddress, ManagedBuffer},
-};
+use crate::types::{ManagedAddress, ManagedBuffer};
 
 use super::{AnnotatedValue, TxEnv, TxFrom, TxFromSpecified};
 
diff --git a/framework/base/src/types/interaction/expr_sc.rs b/framework/base/src/types/interaction/expr_sc.rs
index 56fed5a5e3..cf1fa47914 100644
--- a/framework/base/src/types/interaction/expr_sc.rs
+++ b/framework/base/src/types/interaction/expr_sc.rs
@@ -1,9 +1,6 @@
 use core::ptr;
 
-use crate::{
-    api::CallTypeApi,
-    types::{ManagedAddress, ManagedBuffer},
-};
+use crate::types::{ManagedAddress, ManagedBuffer};
 
 use super::{AnnotatedValue, TxEnv, TxFrom, TxFromSpecified, TxTo, TxToSpecified};
 
diff --git a/framework/base/src/types/interaction/mod.rs b/framework/base/src/types/interaction/mod.rs
index 455f383f40..be3ff25608 100644
--- a/framework/base/src/types/interaction/mod.rs
+++ b/framework/base/src/types/interaction/mod.rs
@@ -31,9 +31,6 @@ mod tx_from;
 mod tx_gas;
 mod tx_payment;
 mod tx_result_handler;
-mod tx_return;
-mod tx_return_sync;
-mod tx_return_type_marker;
 mod tx_rh_list;
 mod tx_to;
 mod typed_function_call;
@@ -68,9 +65,6 @@ pub use tx_from::*;
 pub use tx_gas::*;
 pub use tx_payment::*;
 pub use tx_result_handler::*;
-pub use tx_return::*;
-pub use tx_return_sync::*;
-pub use tx_return_type_marker::*;
 pub use tx_rh_list::*;
 pub use tx_to::*;
 pub use typed_function_call::*;
diff --git a/framework/base/src/types/interaction/tx.rs b/framework/base/src/types/interaction/tx.rs
index 315ee8593d..d28b054b5e 100644
--- a/framework/base/src/types/interaction/tx.rs
+++ b/framework/base/src/types/interaction/tx.rs
@@ -1,9 +1,6 @@
-use core::marker::PhantomData;
-
 use multiversx_sc_codec::TopEncodeMulti;
 
 use crate::{
-    api::CallTypeApi,
     contract_base::BlockchainWrapper,
     types::{
         BigUint, EgldPayment, EsdtTokenPayment, ManagedAddress, ManagedBuffer, ManagedVec,
@@ -12,10 +9,9 @@ use crate::{
 };
 
 use super::{
-    AsyncCall, ExplicitGas, FunctionCall, ManagedArgBuffer, OriginalResultMarker, RHList,
-    RHListAppendNoRet, RHListAppendRet, RHListItem, ReturnTypeMarker, TxData, TxDataFunctionCall,
-    TxEnv, TxFrom, TxFromSpecified, TxGas, TxPayment, TxResultHandler, TxReturn, TxScEnv, TxTo,
-    TxToSpecified,
+    ExplicitGas, FunctionCall, ManagedArgBuffer, OriginalResultMarker, RHList, RHListAppendNoRet,
+    RHListAppendRet, RHListItem, TxData, TxDataFunctionCall, TxEnv, TxFrom, TxFromSpecified, TxGas,
+    TxPayment, TxResultHandler, TxTo, TxToSpecified,
 };
 
 #[must_use]
diff --git a/framework/base/src/types/interaction/tx_call_async.rs b/framework/base/src/types/interaction/tx_call_async.rs
index 6907e97d1f..45aeea6cb1 100644
--- a/framework/base/src/types/interaction/tx_call_async.rs
+++ b/framework/base/src/types/interaction/tx_call_async.rs
@@ -1,12 +1,10 @@
 use crate::{
     api::{CallTypeApi, StorageWriteApi},
     contract_base::SendRawWrapper,
-    types::{BigUint, CallbackClosure, ManagedAddress},
+    types::CallbackClosure,
 };
 
-use super::{
-    FunctionCall, Tx, TxDataFunctionCall, TxEnv, TxPayment, TxResultHandler, TxScEnv, TxToSpecified,
-};
+use super::{Tx, TxDataFunctionCall, TxPayment, TxResultHandler, TxScEnv, TxToSpecified};
 
 pub trait TxAsyncCallCallback<Api>: TxResultHandler<TxScEnv<Api>>
 where
diff --git a/framework/base/src/types/interaction/tx_call_async_promises.rs b/framework/base/src/types/interaction/tx_call_async_promises.rs
index f43ca0bab4..7e7fbfefac 100644
--- a/framework/base/src/types/interaction/tx_call_async_promises.rs
+++ b/framework/base/src/types/interaction/tx_call_async_promises.rs
@@ -1,7 +1,7 @@
 use crate::{
     api::{const_handles, CallTypeApi},
     contract_base::SendRawWrapper,
-    types::{BigUint, CallbackClosure, ManagedAddress, ManagedBuffer, ManagedType},
+    types::{CallbackClosure, ManagedBuffer, ManagedType},
 };
 
 use super::{
diff --git a/framework/base/src/types/interaction/tx_call_sync.rs b/framework/base/src/types/interaction/tx_call_sync.rs
index e7dcabc4fb..c02452baae 100644
--- a/framework/base/src/types/interaction/tx_call_sync.rs
+++ b/framework/base/src/types/interaction/tx_call_sync.rs
@@ -1,14 +1,13 @@
 use crate::{
-    api::{CallTypeApi, StorageWriteApi},
+    api::CallTypeApi,
     contract_base::SendRawWrapper,
     tuple_util::NestedTupleFlatten,
-    types::{BigUint, CallbackClosure, ManagedAddress, ManagedBuffer, ManagedVec},
+    types::{ManagedBuffer, ManagedVec},
 };
 
 use super::{
-    ConsNoRet, ConsRet, FunctionCall, OriginalResultMarker, RHList, RHListItem, Tx,
-    TxDataFunctionCall, TxEnv, TxGas, TxPayment, TxResultHandler, TxReturn, TxReturnSync, TxScEnv,
-    TxToSpecified,
+    ConsNoRet, ConsRet, OriginalResultMarker, RHList, RHListItem, Tx, TxDataFunctionCall, TxEnv,
+    TxGas, TxPayment, TxScEnv, TxToSpecified,
 };
 
 pub trait RHListItemSync<Env, Original>: RHListItem<Env, Original>
@@ -37,7 +36,7 @@ where
 {
     fn list_sync_call_result(
         self,
-        raw_results: &ManagedVec<Env::Api, ManagedBuffer<Env::Api>>,
+        _raw_results: &ManagedVec<Env::Api, ManagedBuffer<Env::Api>>,
     ) -> Self::ListReturns {
     }
 }
@@ -48,7 +47,7 @@ where
 {
     fn list_sync_call_result(
         self,
-        raw_results: &ManagedVec<Env::Api, ManagedBuffer<Env::Api>>,
+        _raw_results: &ManagedVec<Env::Api, ManagedBuffer<Env::Api>>,
     ) -> Self::ListReturns {
     }
 }
diff --git a/framework/base/src/types/interaction/tx_call_te.rs b/framework/base/src/types/interaction/tx_call_te.rs
index 4f7dfc292b..9a08d5cbb5 100644
--- a/framework/base/src/types/interaction/tx_call_te.rs
+++ b/framework/base/src/types/interaction/tx_call_te.rs
@@ -1,16 +1,6 @@
-use core::marker::PhantomData;
+use crate::api::CallTypeApi;
 
-use crate::{
-    api::{BlockchainApiImpl, CallTypeApi},
-    contract_base::BlockchainWrapper,
-    types::{ManagedAddress, ManagedBuffer},
-};
-
-use super::{
-    contract_call_exec::TRANSFER_EXECUTE_DEFAULT_LEFTOVER, AnnotatedValue, AsyncCall, ExplicitGas,
-    FunctionCall, Tx, TxBaseWithEnv, TxData, TxEnv, TxFrom, TxGas, TxPayment, TxScEnv,
-    TxToSpecified,
-};
+use super::{FunctionCall, Tx, TxData, TxFrom, TxGas, TxPayment, TxScEnv, TxToSpecified};
 
 impl<Api, From, To, Payment, Gas, FC> Tx<TxScEnv<Api>, From, To, Payment, Gas, FC, ()>
 where
diff --git a/framework/base/src/types/interaction/tx_data.rs b/framework/base/src/types/interaction/tx_data.rs
index f76f9edb4a..4119f04b1a 100644
--- a/framework/base/src/types/interaction/tx_data.rs
+++ b/framework/base/src/types/interaction/tx_data.rs
@@ -1,5 +1,4 @@
 use crate::{
-    api::ManagedTypeApi,
     formatter::SCLowerHex,
     types::{ManagedBuffer, ManagedBufferCachedBuilder},
 };
diff --git a/framework/base/src/types/interaction/tx_env.rs b/framework/base/src/types/interaction/tx_env.rs
index 59e5406970..fd47db3287 100644
--- a/framework/base/src/types/interaction/tx_env.rs
+++ b/framework/base/src/types/interaction/tx_env.rs
@@ -1,9 +1,4 @@
-use core::marker::PhantomData;
-
-use crate::{
-    api::CallTypeApi,
-    types::{ManagedAddress, ManagedBuffer},
-};
+use crate::{api::CallTypeApi, types::ManagedAddress};
 
 use super::AnnotatedValue;
 
diff --git a/framework/base/src/types/interaction/tx_env_sc.rs b/framework/base/src/types/interaction/tx_env_sc.rs
index 05fa0265be..0fa61eb44a 100644
--- a/framework/base/src/types/interaction/tx_env_sc.rs
+++ b/framework/base/src/types/interaction/tx_env_sc.rs
@@ -3,12 +3,11 @@ use core::marker::PhantomData;
 use crate::{
     api::{BlockchainApiImpl, CallTypeApi},
     contract_base::BlockchainWrapper,
-    types::{ManagedAddress, ManagedBuffer},
+    types::ManagedAddress,
 };
 
 use super::{
-    contract_call_exec::TRANSFER_EXECUTE_DEFAULT_LEFTOVER, AnnotatedValue, AsyncCall, ExplicitGas,
-    FunctionCall, Tx, TxBaseWithEnv, TxData, TxEnv, TxFrom, TxGas, TxPayment, TxToSpecified,
+    contract_call_exec::TRANSFER_EXECUTE_DEFAULT_LEFTOVER, AnnotatedValue, Tx, TxBaseWithEnv, TxEnv,
 };
 
 pub struct TxScEnv<Api>
diff --git a/framework/base/src/types/interaction/tx_from.rs b/framework/base/src/types/interaction/tx_from.rs
index 83db2cb85a..ef6cbb1462 100644
--- a/framework/base/src/types/interaction/tx_from.rs
+++ b/framework/base/src/types/interaction/tx_from.rs
@@ -1,4 +1,4 @@
-use crate::{api::CallTypeApi, contract_base::BlockchainWrapper, types::ManagedAddress};
+use crate::types::ManagedAddress;
 
 use super::{AnnotatedValue, TxEnv};
 
diff --git a/framework/base/src/types/interaction/tx_gas.rs b/framework/base/src/types/interaction/tx_gas.rs
index eec6693837..621ed86303 100644
--- a/framework/base/src/types/interaction/tx_gas.rs
+++ b/framework/base/src/types/interaction/tx_gas.rs
@@ -1,6 +1,4 @@
-use crate::api::{BlockchainApiImpl, CallTypeApi};
-
-use super::{contract_call_exec::TRANSFER_EXECUTE_DEFAULT_LEFTOVER, TxEnv};
+use super::TxEnv;
 
 pub trait TxGas<Env>
 where
diff --git a/framework/base/src/types/interaction/tx_payment.rs b/framework/base/src/types/interaction/tx_payment.rs
index 66fa7b6785..8f2c3397bf 100644
--- a/framework/base/src/types/interaction/tx_payment.rs
+++ b/framework/base/src/types/interaction/tx_payment.rs
@@ -1,10 +1,8 @@
-use num_traits::Zero;
-
 use crate::{
-    api::{CallTypeApi, ManagedTypeApi},
+    api::ManagedTypeApi,
     contract_base::SendRawWrapper,
     types::{
-        BigUint, EgldOrEsdtTokenPayment, EgldOrMultiEsdtPayment, EgldPayment, EsdtTokenPayment,
+        EgldOrEsdtTokenPayment, EgldOrMultiEsdtPayment, EgldPayment, EsdtTokenPayment,
         ManagedAddress, MultiEsdtPayment,
     },
 };
diff --git a/framework/base/src/types/interaction/tx_result_handler.rs b/framework/base/src/types/interaction/tx_result_handler.rs
index 8cc0b06bbf..cf1d42ad06 100644
--- a/framework/base/src/types/interaction/tx_result_handler.rs
+++ b/framework/base/src/types/interaction/tx_result_handler.rs
@@ -1,10 +1,4 @@
-use crate::{
-    api::ManagedTypeApi,
-    formatter::SCLowerHex,
-    types::{ManagedBuffer, ManagedBufferCachedBuilder},
-};
-
-use super::{FunctionCall, TxEnv};
+use super::TxEnv;
 
 pub trait TxResultHandler<Env>
 where
diff --git a/framework/base/src/types/interaction/tx_return.rs b/framework/base/src/types/interaction/tx_return.rs
deleted file mode 100644
index 176d0a56a3..0000000000
--- a/framework/base/src/types/interaction/tx_return.rs
+++ /dev/null
@@ -1,37 +0,0 @@
-use crate::{
-    api::ManagedTypeApi,
-    formatter::SCLowerHex,
-    types::{ManagedBuffer, ManagedBufferCachedBuilder, ManagedVec},
-};
-
-use super::{FunctionCall, ReturnTypeMarker, TxEnv, TxResultHandler};
-
-pub trait TxReturn<Env>: TxResultHandler<Env>
-where
-    Env: TxEnv,
-{
-    type Returns;
-}
-
-impl<Env> TxReturn<Env> for ()
-where
-    Env: TxEnv,
-{
-    type Returns = ();
-}
-
-impl<Env, OriginalResult> TxReturn<Env> for ReturnTypeMarker<OriginalResult>
-where
-    Env: TxEnv,
-{
-    type Returns = ();
-}
-
-// impl<Env, Head, Tail> TxReturn<Env> for (Head, Tail)
-// where
-//     Env: TxEnv,
-//     Head: TxReturn<Env>,
-//     Tail: TxReturn<Env, Returns = ()>,
-// {
-//     type Returns = Head::Returns;
-// }
diff --git a/framework/base/src/types/interaction/tx_return_sync.rs b/framework/base/src/types/interaction/tx_return_sync.rs
deleted file mode 100644
index b1811c6aeb..0000000000
--- a/framework/base/src/types/interaction/tx_return_sync.rs
+++ /dev/null
@@ -1,46 +0,0 @@
-use crate::{
-    api::ManagedTypeApi,
-    formatter::SCLowerHex,
-    types::{ManagedBuffer, ManagedBufferCachedBuilder, ManagedVec},
-};
-
-use super::{FunctionCall, TxData, TxEnv, TxReturn};
-
-pub trait TxReturnSync<Env>: TxReturn<Env>
-where
-    Env: TxEnv,
-{
-    fn sync_call_result(
-        self,
-        raw_results: &ManagedVec<Env::Api, ManagedBuffer<Env::Api>>,
-    ) -> Self::Returns;
-}
-
-impl<Env> TxReturnSync<Env> for ()
-where
-    Env: TxEnv,
-{
-    fn sync_call_result(
-        self,
-        raw_results: &ManagedVec<Env::Api, ManagedBuffer<Env::Api>>,
-    ) -> Self::Returns {
-    }
-}
-
-// impl<Env, Head, Tail> TxReturnSync<Env> for (Head, Tail)
-// where
-//     Env: TxEnv,
-//     Head: TxReturnSync<Env>,
-//     Tail: TxReturnSync<Env, Returns = ()>,
-// {
-//     fn sync_call_result(
-//         self,
-//         raw_results: &ManagedVec<Env::Api, ManagedBuffer<Env::Api>>,
-//     ) -> Self::Returns {
-//         // tail first
-//         self.1.sync_call_result(raw_results);
-
-//         // head at last, which also has a chance of returning
-//         self.0.sync_call_result(raw_results)
-//     }
-// }
diff --git a/framework/base/src/types/interaction/tx_return_type_marker.rs b/framework/base/src/types/interaction/tx_return_type_marker.rs
deleted file mode 100644
index a798ec7ddd..0000000000
--- a/framework/base/src/types/interaction/tx_return_type_marker.rs
+++ /dev/null
@@ -1,28 +0,0 @@
-use core::marker::PhantomData;
-
-use crate::{
-    api::ManagedTypeApi,
-    formatter::SCLowerHex,
-    types::{ManagedBuffer, ManagedBufferCachedBuilder, ManagedVec},
-};
-
-use super::{FunctionCall, TxData, TxEnv, TxResultHandler, TxReturn};
-
-pub struct ReturnTypeMarker<OriginalResult> {
-    _return_type: PhantomData<OriginalResult>,
-}
-
-impl<OriginalResult> Default for ReturnTypeMarker<OriginalResult> {
-    fn default() -> Self {
-        Self {
-            _return_type: PhantomData,
-        }
-    }
-}
-
-impl<Env, OriginalResult> TxResultHandler<Env> for ReturnTypeMarker<OriginalResult>
-where
-    Env: TxEnv,
-{
-    type OriginalResult = OriginalResult;
-}
diff --git a/framework/base/src/types/interaction/tx_rh_list/returns_exact.rs b/framework/base/src/types/interaction/tx_rh_list/returns_exact.rs
index ef1d2eb6fb..edbc82144d 100644
--- a/framework/base/src/types/interaction/tx_rh_list/returns_exact.rs
+++ b/framework/base/src/types/interaction/tx_rh_list/returns_exact.rs
@@ -28,19 +28,3 @@ where
         decode_result::<Env::Api, Original>(raw_results.clone())
     }
 }
-
-// impl<Env> TxResultHandler<Env> for ReturnRaw where Env: TxEnv {}
-
-// impl<Env> TxReturn<Env> for ReturnRaw
-// where
-//     Env: TxEnv,
-// {
-//     type Returned = ManagedVec<Env::Api, ManagedBuffer<Env::Api>>;
-
-//     fn sync_call_result(
-//         self,
-//         raw_results: &ManagedVec<Env::Api, ManagedBuffer<Env::Api>>,
-//     ) -> Self::Returned {
-//         raw_results.clone()
-//     }
-// }
diff --git a/framework/base/src/types/interaction/tx_rh_list/returns_raw.rs b/framework/base/src/types/interaction/tx_rh_list/returns_raw.rs
index f9651240a4..b4fa56479f 100644
--- a/framework/base/src/types/interaction/tx_rh_list/returns_raw.rs
+++ b/framework/base/src/types/interaction/tx_rh_list/returns_raw.rs
@@ -22,19 +22,3 @@ where
         raw_results.clone()
     }
 }
-
-// impl<Env> TxResultHandler<Env> for ReturnRaw where Env: TxEnv {}
-
-// impl<Env> TxReturn<Env> for ReturnRaw
-// where
-//     Env: TxEnv,
-// {
-//     type Returned = ManagedVec<Env::Api, ManagedBuffer<Env::Api>>;
-
-//     fn sync_call_result(
-//         self,
-//         raw_results: &ManagedVec<Env::Api, ManagedBuffer<Env::Api>>,
-//     ) -> Self::Returned {
-//         raw_results.clone()
-//     }
-// }
diff --git a/framework/base/src/types/interaction/tx_rh_list/returns_similar.rs b/framework/base/src/types/interaction/tx_rh_list/returns_similar.rs
index 5709e68f8d..07929d122f 100644
--- a/framework/base/src/types/interaction/tx_rh_list/returns_similar.rs
+++ b/framework/base/src/types/interaction/tx_rh_list/returns_similar.rs
@@ -1,9 +1,5 @@
 use core::marker::PhantomData;
 
-use crate::types::TxEnv;
-
-use super::RHListItem;
-
 pub struct ReturnSimilar<T> {
     _phantom: PhantomData<T>,
 }
@@ -17,23 +13,7 @@ impl<T> Default for ReturnSimilar<T> {
 }
 
 impl<T> ReturnSimilar<T> {
-    fn new() -> Self {
+    pub fn new() -> Self {
         Self::default()
     }
 }
-
-// impl<Env> TxResultHandler<Env> for ReturnRaw where Env: TxEnv {}
-
-// impl<Env> TxReturn<Env> for ReturnRaw
-// where
-//     Env: TxEnv,
-// {
-//     type Returned = ManagedVec<Env::Api, ManagedBuffer<Env::Api>>;
-
-//     fn sync_call_result(
-//         self,
-//         raw_results: &ManagedVec<Env::Api, ManagedBuffer<Env::Api>>,
-//     ) -> Self::Returned {
-//         raw_results.clone()
-//     }
-// }
diff --git a/framework/base/src/types/interaction/tx_rh_list/tx_rh_list_item.rs b/framework/base/src/types/interaction/tx_rh_list/tx_rh_list_item.rs
index 8430b91b79..54e1d0cfa3 100644
--- a/framework/base/src/types/interaction/tx_rh_list/tx_rh_list_item.rs
+++ b/framework/base/src/types/interaction/tx_rh_list/tx_rh_list_item.rs
@@ -1,4 +1,4 @@
-use crate::types::{ManagedBuffer, ManagedVec, TxEnv};
+use crate::types::TxEnv;
 
 /// Result handler list item.
 ///
diff --git a/framework/base/src/types/interaction/tx_to.rs b/framework/base/src/types/interaction/tx_to.rs
index af733870dd..bbf520c8ef 100644
--- a/framework/base/src/types/interaction/tx_to.rs
+++ b/framework/base/src/types/interaction/tx_to.rs
@@ -1,4 +1,4 @@
-use crate::{api::ManagedTypeApi, types::ManagedAddress};
+use crate::types::ManagedAddress;
 
 use super::{AnnotatedValue, TxEnv};
 
diff --git a/framework/base/src/types/interaction/typed_function_call.rs b/framework/base/src/types/interaction/typed_function_call.rs
index dcb2be5052..39679247fc 100644
--- a/framework/base/src/types/interaction/typed_function_call.rs
+++ b/framework/base/src/types/interaction/typed_function_call.rs
@@ -1,12 +1,8 @@
 use core::marker::PhantomData;
 
-use crate::{
-    abi::{TypeAbi, TypeName},
-    api::{CallTypeApi, ManagedTypeApi},
-    types::{EsdtTokenPayment, ManagedAddress, ManagedBuffer, ManagedVec, MultiValueEncoded},
-};
+use crate::api::ManagedTypeApi;
 
-use super::{ContractCallNoPayment, FunctionCall, ManagedArgBuffer};
+use super::FunctionCall;
 
 /// Encodes a function call on the blockchain, together with the original result type.
 ///

From a38f35abd1913f8cecaf8ac4a57008acb79bfe06 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Mon, 15 Jan 2024 10:18:33 +0200
Subject: [PATCH 0210/1254] 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 <bianca.ialangi@multiversx.com>
Date: Mon, 15 Jan 2024 14:37:55 +0200
Subject: [PATCH 0211/1254] 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 <mihaicalin.luca10@gmail.com>
Date: Tue, 16 Jan 2024 10:29:49 +0100
Subject: [PATCH 0212/1254] 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<SA, K, V, StorageSCAddress>
@@ -293,7 +292,9 @@ where
     K: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static,
     V: StorageMapper<SA> + StorageClearable,
 {
-    fn new(hash_map: &'a MapStorageMapper<SA, K, V, StorageSCAddress>) -> Values<'a, SA, StorageSCAddress, K, V> {
+    fn new(
+        hash_map: &'a MapStorageMapper<SA, K, V, StorageSCAddress>,
+    ) -> 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<SA, T, A = StorageSCAddress>
 where
     SA: StorageMapperApi,
     A: StorageAddress<SA>,
-    T: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static,
+    T: TopEncode + TopDecode + 'static,
 {
     _phantom_api: PhantomData<SA>,
     address: A,
@@ -88,7 +80,7 @@ where
 impl<SA, T> StorageMapper<SA> for QueueMapper<SA, T, StorageSCAddress>
 where
     SA: StorageMapperApi,
-    T: TopEncode + TopDecode + NestedEncode + NestedDecode,
+    T: TopEncode + TopDecode,
 {
     fn new(base_key: StorageKey<SA>) -> Self {
         QueueMapper {
@@ -103,7 +95,7 @@ where
 impl<SA, T> StorageClearable for QueueMapper<SA, T, StorageSCAddress>
 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<SA, T> QueueMapper<SA, T, StorageSCAddress>
 where
     SA: StorageMapperApi,
-    T: TopEncode + TopDecode + NestedEncode + NestedDecode,
+    T: TopEncode + TopDecode,
 {
     fn build_node_id_named_key(&self, name: &[u8], node_id: u32) -> StorageKey<SA> {
         let mut named_key = self.base_key.clone();
@@ -423,7 +415,7 @@ where
 impl<SA, T> QueueMapper<SA, T, ManagedAddress<SA>>
 where
     SA: StorageMapperApi,
-    T: TopEncode + TopDecode + NestedEncode + NestedDecode,
+    T: TopEncode + TopDecode,
 {
     fn build_node_id_named_key(&self, name: &[u8], node_id: u32) -> StorageKey<SA> {
         let mut named_key = self.base_key.clone();
@@ -579,7 +571,7 @@ where
 impl<'a, SA, T> IntoIterator for &'a QueueMapper<SA, T, StorageSCAddress>
 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<SA, T, StorageSCAddress>,
@@ -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<SA, T, StorageSCAddress>) -> 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<SA, T> TopEncodeMulti for QueueMapper<SA, T, StorageSCAddress>
 where
     SA: StorageMapperApi,
-    T: TopEncode + TopDecode + NestedEncode + NestedDecode,
+    T: TopEncode + TopDecode,
 {
     fn multi_encode_or_handle_err<O, H>(&self, output: &mut O, h: H) -> Result<(), H::HandledErr>
     where
@@ -652,7 +644,7 @@ where
 impl<SA, T> CodecFrom<QueueMapper<SA, T, StorageSCAddress>> for MultiValueEncoded<SA, T>
 where
     SA: StorageMapperApi,
-    T: TopEncode + TopDecode + NestedEncode + NestedDecode,
+    T: TopEncode + TopDecode,
 {
 }
 
@@ -660,7 +652,7 @@ where
 impl<SA, T> TypeAbi for QueueMapper<SA, T, StorageSCAddress>
 where
     SA: StorageMapperApi,
-    T: TopEncode + TopDecode + NestedEncode + NestedDecode + TypeAbi,
+    T: TopEncode + TopDecode + TypeAbi,
 {
     fn type_name() -> TypeName {
         crate::abi::type_name_variadic::<T>()

From e182e94337b9623542ad686992032f813305caae Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Tue, 16 Jan 2024 13:29:48 +0200
Subject: [PATCH 0213/1254] 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<proc_macro::TokenTree> = 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<String>) -> 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 <bianca.ialangi@multiversx.com>
Date: Tue, 16 Jan 2024 15:58:53 +0200
Subject: [PATCH 0214/1254] 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 <bianca.ialangi@multiversx.com>
Date: Tue, 16 Jan 2024 16:07:47 +0200
Subject: [PATCH 0215/1254] 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 367cf909374fe7ae6c392b5f19a94eb800dfb203 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Wed, 17 Jan 2024 01:27:04 +0100
Subject: [PATCH 0216/1254] created generate mock address function

---
 Cargo.lock                                    |  1 +
 .../scenario/model/transaction/tx_response.rs | 18 ++++++----
 vm/Cargo.toml                                 |  1 +
 vm/src/tx_mock/tx_cache.rs                    | 33 ++++++++++++++++++-
 4 files changed, 45 insertions(+), 8 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 677d15ee9a..87464e2151 100755
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1785,6 +1785,7 @@ name = "multiversx-chain-vm"
 version = "0.7.1"
 dependencies = [
  "bitflags 2.4.1",
+ "colored",
  "ed25519-dalek",
  "hex",
  "hex-literal",
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<String> = Some("EGLDMEX-95c6d5".to_string());
 
         assert_eq!(tx_response.new_issued_token_identifier, expected)
-
     }
 
     #[test]
@@ -1978,7 +1983,6 @@ mod tests {
         let expected: Option<String> = Some("AVASH-7d8b5d".to_string());
 
         assert_eq!(tx_response.new_issued_token_identifier, expected)
-
     }
 
     #[test]
diff --git a/vm/Cargo.toml b/vm/Cargo.toml
index 6e3ffa45bf..23f574f8fb 100644
--- a/vm/Cargo.toml
+++ b/vm/Cargo.toml
@@ -28,6 +28,7 @@ ed25519-dalek = "2.0.0"
 itertools = "0.12.0"
 hex-literal = "0.4.1"
 bitflags = "2.4.1"
+colored = "2.0"
 
 [dependencies.multiversx-chain-vm-executor]
 version = "0.2.0"
diff --git a/vm/src/tx_mock/tx_cache.rs b/vm/src/tx_mock/tx_cache.rs
index 6f7c73f17f..f9f077080f 100644
--- a/vm/src/tx_mock/tx_cache.rs
+++ b/vm/src/tx_mock/tx_cache.rs
@@ -4,6 +4,8 @@ use std::{
     sync::{Arc, Mutex},
 };
 
+use colored::Colorize;
+
 use crate::{
     display_util::address_hex,
     types::VMAddress,
@@ -12,6 +14,10 @@ use crate::{
 
 use super::{BlockchainUpdate, TxCacheSource};
 
+pub const NUM_INT_CHARACTERS_FOR_ADDRESS: usize = 10;
+pub const VM_TYPE_LEN: usize = 2;
+pub const DEFAULT_VM_TYPE: &[u8] = &[0xF, 0xF];
+
 pub struct TxCache {
     source_ref: Arc<dyn TxCacheSource>,
     pub(super) accounts: Mutex<HashMap<VMAddress, AccountData>>,
@@ -102,10 +108,35 @@ impl TxCache {
         self.blockchain_ref()
             .get_new_address(creator_address.clone(), current_nonce - 1)
             .unwrap_or_else(|| {
-                panic!("Missing new address. Only explicit new deploy addresses supported")
+                let new_mock_address =
+                    self.generate_mock_address(&creator_address.to_vec(), current_nonce - 1);
+                println!(
+                    "{}",
+                    format!(
+                        "Missing new address for {:?}.\nCreating a new mock address...: {:?}",
+                        address_hex(creator_address),
+                        address_hex(&new_mock_address)
+                    )
+                    .yellow()
+                );
+                new_mock_address
             })
     }
 
+    fn generate_mock_address(&self, creator_address: &[u8], creator_nonce: u64) -> VMAddress {
+        let mut result = [0x11; 32];
+
+        result[14..29].copy_from_slice(&creator_address[..15]);
+        result[29] = creator_nonce as u8;
+        result[30..].copy_from_slice(&creator_address[30..]);
+
+        let vm_type = DEFAULT_VM_TYPE;
+        let start_index = NUM_INT_CHARACTERS_FOR_ADDRESS - VM_TYPE_LEN;
+        result[start_index..(start_index + 2)].copy_from_slice(vm_type);
+
+        VMAddress::from(result)
+    }
+
     pub fn get_new_token_identifiers(&self) -> Vec<String> {
         self.blockchain_ref().get_new_token_identifiers()
     }

From ba34dd82dd5523f3d6aa1142dafb80e5e3d08d4b Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Wed, 17 Jan 2024 10:50:03 +0100
Subject: [PATCH 0217/1254] added unit test, moved logic inside vmAddress

---
 vm/src/tx_mock/tx_cache.rs | 20 +-------------------
 vm/src/types/vm_address.rs | 37 +++++++++++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 19 deletions(-)

diff --git a/vm/src/tx_mock/tx_cache.rs b/vm/src/tx_mock/tx_cache.rs
index f9f077080f..5925f3dd20 100644
--- a/vm/src/tx_mock/tx_cache.rs
+++ b/vm/src/tx_mock/tx_cache.rs
@@ -14,10 +14,6 @@ use crate::{
 
 use super::{BlockchainUpdate, TxCacheSource};
 
-pub const NUM_INT_CHARACTERS_FOR_ADDRESS: usize = 10;
-pub const VM_TYPE_LEN: usize = 2;
-pub const DEFAULT_VM_TYPE: &[u8] = &[0xF, 0xF];
-
 pub struct TxCache {
     source_ref: Arc<dyn TxCacheSource>,
     pub(super) accounts: Mutex<HashMap<VMAddress, AccountData>>,
@@ -109,7 +105,7 @@ impl TxCache {
             .get_new_address(creator_address.clone(), current_nonce - 1)
             .unwrap_or_else(|| {
                 let new_mock_address =
-                    self.generate_mock_address(&creator_address.to_vec(), current_nonce - 1);
+                    VMAddress::generate_mock_address(&creator_address.to_vec(), current_nonce - 1);
                 println!(
                     "{}",
                     format!(
@@ -123,20 +119,6 @@ impl TxCache {
             })
     }
 
-    fn generate_mock_address(&self, creator_address: &[u8], creator_nonce: u64) -> VMAddress {
-        let mut result = [0x11; 32];
-
-        result[14..29].copy_from_slice(&creator_address[..15]);
-        result[29] = creator_nonce as u8;
-        result[30..].copy_from_slice(&creator_address[30..]);
-
-        let vm_type = DEFAULT_VM_TYPE;
-        let start_index = NUM_INT_CHARACTERS_FOR_ADDRESS - VM_TYPE_LEN;
-        result[start_index..(start_index + 2)].copy_from_slice(vm_type);
-
-        VMAddress::from(result)
-    }
-
     pub fn get_new_token_identifiers(&self) -> Vec<String> {
         self.blockchain_ref().get_new_token_identifiers()
     }
diff --git a/vm/src/types/vm_address.rs b/vm/src/types/vm_address.rs
index 044e49509e..3cd3ef783e 100644
--- a/vm/src/types/vm_address.rs
+++ b/vm/src/types/vm_address.rs
@@ -4,6 +4,10 @@ use core::fmt::Debug;
 
 const SC_ADDRESS_NUM_LEADING_ZEROS: u8 = 8;
 
+pub const NUM_INT_CHARACTERS_FOR_ADDRESS: usize = 10;
+pub const VM_TYPE_LEN: usize = 2;
+pub const DEFAULT_VM_TYPE: &[u8] = &[0xF, 0xF];
+
 /// Address type being used in the VM only.
 ///
 /// Its implementation is similar to that of the heap Address in the framework,
@@ -15,6 +19,20 @@ impl VMAddress {
     pub const fn new(bytes: [u8; 32]) -> Self {
         VMAddress(H256::new(bytes))
     }
+
+    pub fn generate_mock_address(creator_address: &[u8], creator_nonce: u64) -> Self {
+        let mut result = [0x11; 32];
+
+        result[14..29].copy_from_slice(&creator_address[..15]);
+        result[29] = creator_nonce as u8;
+        result[30..].copy_from_slice(&creator_address[30..]);
+
+        let vm_type = DEFAULT_VM_TYPE;
+        let start_index = NUM_INT_CHARACTERS_FOR_ADDRESS - VM_TYPE_LEN;
+        result[start_index..(start_index + 2)].copy_from_slice(vm_type);
+
+        VMAddress::from(result)
+    }
 }
 
 impl From<H256> for VMAddress {
@@ -111,3 +129,22 @@ impl VMAddress {
             .all(|item| item == &0u8)
     }
 }
+
+
+#[cfg(test)]
+mod tests {
+    use crate::{display_util::address_hex, types::VMAddress};
+
+    #[test]
+    fn generate_mock_address_test() {
+        let creator_address = VMAddress::new([
+            111, 119, 110, 101, 114, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95,
+            95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95,
+        ]);
+        let mock_address = VMAddress::generate_mock_address(&creator_address.to_vec(), 1u64);
+        assert_eq!(
+            address_hex(&mock_address),
+            "0x11111111111111110f0f111111116f776e65725f5f5f5f5f5f5f5f5f5f015f5f"
+        );
+    }
+}

From 912bbde86fc36a0a59596a8f222acb360ca7be57 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Wed, 17 Jan 2024 12:42:08 +0200
Subject: [PATCH 0218/1254] 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 <bianca.ialangi@multiversx.com>
Date: Wed, 17 Jan 2024 13:09:01 +0200
Subject: [PATCH 0219/1254] 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 <andrei.marinica@multiversx.com>
Date: Wed, 17 Jan 2024 13:20:37 +0200
Subject: [PATCH 0220/1254] 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<ManagedBuffer>,
     ) -> MultiValue2<ManagedAddress, ManagedVec<Self::Api, ManagedBuffer>> {
         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<ManagedBuffer>,
     ) -> 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<ManagedBuffer>,
     ) {
         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<ManagedBuffer>,
     ) {
         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::<i32>(&code, CodeMetadata::DEFAULT);
+            .deploy_contract::<i32>(&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 345d13d3f54b152311869b1eff147ae7e45a0fe5 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Wed, 17 Jan 2024 19:23:56 +0100
Subject: [PATCH 0221/1254] unit tests & mandos rust and go

---
 .../scenarios/new_address.scen.json           | 66 +++++++++++++++++++
 .../basic_features_new_address_go_test.rs     | 10 +++
 .../basic_features_new_address_rust_test.rs   | 17 +++++
 vm/src/types/vm_address.rs                    | 13 ++--
 4 files changed, 101 insertions(+), 5 deletions(-)
 create mode 100644 contracts/feature-tests/basic-features/scenarios/new_address.scen.json
 create mode 100644 contracts/feature-tests/basic-features/tests/basic_features_new_address_go_test.rs
 create mode 100644 contracts/feature-tests/basic-features/tests/basic_features_new_address_rust_test.rs

diff --git a/contracts/feature-tests/basic-features/scenarios/new_address.scen.json b/contracts/feature-tests/basic-features/scenarios/new_address.scen.json
new file mode 100644
index 0000000000..b0ad7302d2
--- /dev/null
+++ b/contracts/feature-tests/basic-features/scenarios/new_address.scen.json
@@ -0,0 +1,66 @@
+{
+    "gasSchedule": "v3",
+    "steps": [
+        {
+            "step": "setState",
+            "accounts": {
+                "sc:basic-features": {
+                    "nonce": "0",
+                    "balance": "0",
+                    "code": "file:../output/basic-features.wasm"
+                },
+                "address:an_account": {
+                    "nonce": "0",
+                    "balance": "0"
+                }
+            }
+        },
+        {
+            "step": "scDeploy",
+            "id": "deploy",
+            "tx": {
+                "from": "address:an_account",
+                "contractCode": "file:../output/basic-features.wasm",
+                "arguments": [],
+                "gasLimit": "200,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": [],
+                "status": "",
+                "logs": [],
+                "gas": "*",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "dumpState",
+            "comment": "all accounts beginning"
+        },
+        {
+            "step": "scCall",
+            "id": "call to basic features",
+            "tx": {
+                "from": "address:an_account",
+                "to": "sc:basic-features",
+                "function": "token_identifier_egld",
+                "arguments": [],
+                "gasLimit": "50,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": [
+                    "str:EGLD"
+                ],
+                "status": "",
+                "logs": "*",
+                "gas": "*",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "dumpState",
+            "comment": "all accounts end"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/contracts/feature-tests/basic-features/tests/basic_features_new_address_go_test.rs b/contracts/feature-tests/basic-features/tests/basic_features_new_address_go_test.rs
new file mode 100644
index 0000000000..1c9774beb9
--- /dev/null
+++ b/contracts/feature-tests/basic-features/tests/basic_features_new_address_go_test.rs
@@ -0,0 +1,10 @@
+use multiversx_sc_scenario::*;
+
+fn world() -> ScenarioWorld {
+    ScenarioWorld::vm_go()
+}
+
+#[test]
+fn new_address_go_test() {
+    world().run("scenarios/new_address.scen.json");
+}
diff --git a/contracts/feature-tests/basic-features/tests/basic_features_new_address_rust_test.rs b/contracts/feature-tests/basic-features/tests/basic_features_new_address_rust_test.rs
new file mode 100644
index 0000000000..766c130721
--- /dev/null
+++ b/contracts/feature-tests/basic-features/tests/basic_features_new_address_rust_test.rs
@@ -0,0 +1,17 @@
+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(
+        "file:output/basic-features.wasm",
+        basic_features::ContractBuilder,
+    );
+    blockchain
+}
+
+#[test]
+fn basic_features_new_address_rs_test() {
+    world().run("scenarios/new_address.scen.json");
+}
diff --git a/vm/src/types/vm_address.rs b/vm/src/types/vm_address.rs
index 3cd3ef783e..181e0ea1ef 100644
--- a/vm/src/types/vm_address.rs
+++ b/vm/src/types/vm_address.rs
@@ -21,15 +21,19 @@ impl VMAddress {
     }
 
     pub fn generate_mock_address(creator_address: &[u8], creator_nonce: u64) -> Self {
-        let mut result = [0x11; 32];
+        let mut result = [0x00; 32];
+
+        result[10] = 0x11;
+        result[11] = 0x11;
+        result[12] = 0x11;
+        result[13] = 0x11;
 
         result[14..29].copy_from_slice(&creator_address[..15]);
         result[29] = creator_nonce as u8;
         result[30..].copy_from_slice(&creator_address[30..]);
 
-        let vm_type = DEFAULT_VM_TYPE;
         let start_index = NUM_INT_CHARACTERS_FOR_ADDRESS - VM_TYPE_LEN;
-        result[start_index..(start_index + 2)].copy_from_slice(vm_type);
+        result[start_index..(start_index + DEFAULT_VM_TYPE.len())].copy_from_slice(DEFAULT_VM_TYPE);
 
         VMAddress::from(result)
     }
@@ -130,7 +134,6 @@ impl VMAddress {
     }
 }
 
-
 #[cfg(test)]
 mod tests {
     use crate::{display_util::address_hex, types::VMAddress};
@@ -144,7 +147,7 @@ mod tests {
         let mock_address = VMAddress::generate_mock_address(&creator_address.to_vec(), 1u64);
         assert_eq!(
             address_hex(&mock_address),
-            "0x11111111111111110f0f111111116f776e65725f5f5f5f5f5f5f5f5f5f015f5f"
+            "0x00000000000000000f0f111111116f776e65725f5f5f5f5f5f5f5f5f5f015f5f"
         );
     }
 }

From d146c7441cd2ea650796006fb5254e27b7170b38 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 18 Jan 2024 10:00:26 +0200
Subject: [PATCH 0222/1254] 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<BytesValue>,
     pub storage: BTreeMap<BytesKey, BytesValue>,
     pub code: Option<BytesValue>,
+    pub code_metadata: Option<BytesValue>,
     pub owner: Option<AddressValue>,
     pub developer_rewards: Option<BigUintValue>,
 }
@@ -210,6 +211,9 @@ impl InterpretableFrom<AccountRaw> 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<AccountRaw> 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<BytesValue>,
     pub storage: CheckStorage,
     pub code: CheckValue<BytesValue>,
+    pub code_metadata: CheckValue<BytesValue>,
     pub owner: CheckValue<BytesValue>, // WARNING! Not currently checked. TODO: implement check
     pub developer_rewards: CheckValue<BigUintValue>,
     pub async_call_data: CheckValue<BytesValue>,
@@ -175,6 +176,7 @@ impl InterpretableFrom<Box<CheckAccountRaw>> for CheckAccount {
             username: CheckValue::<BytesValue>::interpret_from(from.username, context),
             storage: CheckStorage::interpret_from(from.storage, context),
             code: CheckValue::<BytesValue>::interpret_from(from.code, context),
+            code_metadata: CheckValue::<BytesValue>::interpret_from(from.code_metadata, context),
             owner: CheckValue::<BytesValue>::interpret_from(from.owner, context),
             developer_rewards: CheckValue::<BigUintValue>::interpret_from(
                 from.developer_rewards,
@@ -198,6 +200,7 @@ impl IntoRaw<CheckAccountRaw> 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<BytesValue>,
     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<String> = Some("EGLDMEX-95c6d5".to_string());
 
         assert_eq!(tx_response.new_issued_token_identifier, expected)
-
     }
 
     #[test]
@@ -1978,7 +1983,6 @@ mod tests {
         let expected: Option<String> = 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<ValueSubTree> {
     U64Value::from(value).into_raw_opt()
 }
 
-pub(crate) fn bytes_as_raw(bytes: &[u8]) -> ValueSubTree {
+pub(crate) fn bytes_as_raw<B>(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<B>(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<ValueSubTree>,
 
+    #[serde(default)]
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub code_metadata: Option<ValueSubTree>,
+
     #[serde(default)]
     #[serde(skip_serializing_if = "Option::is_none")]
     pub owner: Option<ValueSubTree>,
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<BlockchainState>,
         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<u8>,
+        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<u8>,
+        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<u8>> for VMCodeMetadata {
+    fn from(v: &Vec<u8>) -> Self {
+        VMCodeMetadata::from(v.as_slice())
+    }
+}
+
 impl From<u16> 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<u8>,
-        _code_metadata: VMCodeMetadata,
+        code_metadata: VMCodeMetadata,
         args: Vec<Vec<u8>>,
     ) -> (VMAddress, Vec<Vec<u8>>) {
         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<u8>, Vec<u8>>;
@@ -16,6 +19,7 @@ pub struct AccountData {
     pub storage: AccountStorage,
     pub username: Vec<u8>,
     pub contract_path: Option<Vec<u8>>,
+    pub code_metadata: VMCodeMetadata,
     pub contract_owner: Option<VMAddress>,
     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 <andrei.marinica@multiversx.com>
Date: Thu, 18 Jan 2024 10:02:48 +0200
Subject: [PATCH 0223/1254] 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 ed63c6515053654c89d4908bf568cfb37fb005df Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Thu, 18 Jan 2024 10:16:29 +0100
Subject: [PATCH 0224/1254] mandos fix

---
 .../scenarios/new_address.scen.json           | 37 +++++++------------
 1 file changed, 14 insertions(+), 23 deletions(-)

diff --git a/contracts/feature-tests/basic-features/scenarios/new_address.scen.json b/contracts/feature-tests/basic-features/scenarios/new_address.scen.json
index b0ad7302d2..96db921544 100644
--- a/contracts/feature-tests/basic-features/scenarios/new_address.scen.json
+++ b/contracts/feature-tests/basic-features/scenarios/new_address.scen.json
@@ -4,11 +4,6 @@
         {
             "step": "setState",
             "accounts": {
-                "sc:basic-features": {
-                    "nonce": "0",
-                    "balance": "0",
-                    "code": "file:../output/basic-features.wasm"
-                },
                 "address:an_account": {
                     "nonce": "0",
                     "balance": "0"
@@ -38,24 +33,20 @@
             "comment": "all accounts beginning"
         },
         {
-            "step": "scCall",
-            "id": "call to basic features",
-            "tx": {
-                "from": "address:an_account",
-                "to": "sc:basic-features",
-                "function": "token_identifier_egld",
-                "arguments": [],
-                "gasLimit": "50,000,000",
-                "gasPrice": "0"
-            },
-            "expect": {
-                "out": [
-                    "str:EGLD"
-                ],
-                "status": "",
-                "logs": "*",
-                "gas": "*",
-                "refund": "*"
+            "step": "checkState",
+            "accounts": {
+                "address:an_account": {
+                    "nonce": "*",
+                    "balance": "0",
+                    "storage": {},
+                    "code": ""
+                },
+                "0x00000000000000000f0f11111111616e5f6163636f756e745f5f5f5f5f005f5f": {
+                    "nonce": "0",
+                    "balance": "0",
+                    "storage": {},
+                    "code": "file:../output/basic-features.wasm"
+                }
             }
         },
         {

From e64336b422f2b5efc0e26866d0dfaff372036b93 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 18 Jan 2024 12:42:02 +0200
Subject: [PATCH 0225/1254] 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 <mihaicalin.luca10@gmail.com>
Date: Thu, 18 Jan 2024 12:44:13 +0100
Subject: [PATCH 0226/1254] 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<String> = Some("EGLDMEX-95c6d5".to_string());
 
         assert_eq!(tx_response.new_issued_token_identifier, expected)
-
     }
 
     #[test]
@@ -1978,7 +1983,6 @@ mod tests {
         let expected: Option<String> = 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 <mihaicalin.luca10@gmail.com>
Date: Thu, 18 Jan 2024 15:30:15 +0100
Subject: [PATCH 0227/1254] 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 <mihaicalin.luca10@gmail.com>
Date: Thu, 18 Jan 2024 16:20:10 +0100
Subject: [PATCH 0228/1254] 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 <andrei.marinica@multiversx.com>
Date: Fri, 19 Jan 2024 12:02:13 +0200
Subject: [PATCH 0229/1254] 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<String>,
+}
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<String>,
+    zip_name: String,
+    user_agent: String,
+    temp_dir_path: PathBuf,
+    cargo_bin_folder: PathBuf,
+}
+
+impl ScenarioGoInstaller {
+    pub fn new(tag: Option<String>) -> 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<String, reqwest::Error> {
+        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 <andrei.marinica@multiversx.com>
Date: Fri, 19 Jan 2024 12:14:04 +0200
Subject: [PATCH 0230/1254] 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<InstallCommand>,
+}
 
+#[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<String>,
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 <mihaicalin.luca10@gmail.com>
Date: Fri, 19 Jan 2024 14:18:28 +0100
Subject: [PATCH 0231/1254] 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 <andrei.marinica@multiversx.com>
Date: Sun, 21 Jan 2024 12:01:54 +0200
Subject: [PATCH 0232/1254] 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, &quote! {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<Variant, Comma>) {
+    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 7ca38952f9d1cc3de1ef7a2255bdf11b9be9c143 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Mon, 22 Jan 2024 10:35:21 +0200
Subject: [PATCH 0233/1254] panic when FailAllocator is triggered

---
 contracts/examples/adder/src/adder.rs    |  2 ++
 framework/meta/src/tools/wasm_imports.rs | 22 ++++++++++++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/contracts/examples/adder/src/adder.rs b/contracts/examples/adder/src/adder.rs
index 9b261c5aa8..409da966bd 100644
--- a/contracts/examples/adder/src/adder.rs
+++ b/contracts/examples/adder/src/adder.rs
@@ -1,4 +1,5 @@
 #![no_std]
+use crate::heap::Box;
 
 multiversx_sc::imports!();
 /// One of the simplest smart contracts possible,
@@ -11,6 +12,7 @@ pub trait Adder {
 
     #[init]
     fn init(&self, initial_value: BigUint) {
+        let _buffer = Box::new([0u8; 1024]);
         self.sum().set(initial_value);
     }
 
diff --git a/framework/meta/src/tools/wasm_imports.rs b/framework/meta/src/tools/wasm_imports.rs
index 7aaa7904bd..f667da0189 100644
--- a/framework/meta/src/tools/wasm_imports.rs
+++ b/framework/meta/src/tools/wasm_imports.rs
@@ -6,6 +6,7 @@ pub fn extract_wasm_imports(output_wasm_path: &str) -> Vec<String> {
     let wasm_data = fs::read(output_wasm_path)
         .expect("error occured while extracting imports from .wasm: file not found");
 
+    parse_wasm_extract_fail_allocator_error(wasm_data.clone());
     parse_wasm_imports(wasm_data).expect("error occured while extracting imports from .wasm ")
 }
 
@@ -25,3 +26,24 @@ fn parse_wasm_imports(wasm_data: Vec<u8>) -> Result<Vec<String>, BinaryReaderErr
 
     Ok(import_names)
 }
+
+fn parse_wasm_extract_fail_allocator_error(wasm_data: Vec<u8>) {
+    let parser = Parser::new(0);
+
+    for payload in parser.parse_all(&wasm_data).flatten() {
+        if let Payload::DataSection(data_section) = payload {
+            for data in data_section.into_iter() {
+                match data {
+                    Ok(data) => {
+                        if let Ok(utf8_str) = std::str::from_utf8(data.data) {
+                            if utf8_str.contains("memory allocation forbidden") {
+                                panic!("FailAllocator")
+                            }
+                        }
+                    },
+                    Err(_err) => {},
+                }
+            }
+        }
+    }
+}

From e46578b09f5f72604c25f962a74533098c86fc55 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Mon, 22 Jan 2024 13:30:08 +0200
Subject: [PATCH 0234/1254] unified syntax - blackbox call results

---
 .../multisig/tests/multisig_blackbox_test.rs  | 21 ++--
 framework/base/src/types/interaction/tx.rs    | 10 +-
 .../base/src/types/interaction/tx_rh_list.rs  |  2 +
 .../tx_rh_list/with_result_exact.rs           | 53 ++++++++++
 .../interaction/tx_rh_list/with_result_raw.rs | 48 +++++++++
 framework/scenario/src/facade.rs              |  6 +-
 .../scenario/src/facade/scenario_callbacks.rs | 25 -----
 .../src/facade/scenario_world_steps_tx.rs     | 99 -------------------
 framework/scenario/src/facade/world_tx.rs     | 11 +++
 .../src/facade/world_tx/scenario_env.rs       | 42 ++++++++
 .../src/facade/world_tx/scenario_rh_list.rs   | 40 ++++++++
 .../facade/world_tx/scenario_rh_list_item.rs  | 24 +++++
 .../src/facade/world_tx/scenario_tx.rs        | 73 ++++++++++++++
 .../world_tx/scenario_world_steps_tx.rs       | 16 +++
 framework/scenario/src/lib.rs                 |  2 +-
 15 files changed, 331 insertions(+), 141 deletions(-)
 create mode 100644 framework/base/src/types/interaction/tx_rh_list/with_result_exact.rs
 create mode 100644 framework/base/src/types/interaction/tx_rh_list/with_result_raw.rs
 delete mode 100644 framework/scenario/src/facade/scenario_callbacks.rs
 delete mode 100644 framework/scenario/src/facade/scenario_world_steps_tx.rs
 create mode 100644 framework/scenario/src/facade/world_tx.rs
 create mode 100644 framework/scenario/src/facade/world_tx/scenario_env.rs
 create mode 100644 framework/scenario/src/facade/world_tx/scenario_rh_list.rs
 create mode 100644 framework/scenario/src/facade/world_tx/scenario_rh_list_item.rs
 create mode 100644 framework/scenario/src/facade/world_tx/scenario_tx.rs
 create mode 100644 framework/scenario/src/facade/world_tx/scenario_world_steps_tx.rs

diff --git a/contracts/examples/multisig/tests/multisig_blackbox_test.rs b/contracts/examples/multisig/tests/multisig_blackbox_test.rs
index ce2a522fcb..0bf49301d4 100644
--- a/contracts/examples/multisig/tests/multisig_blackbox_test.rs
+++ b/contracts/examples/multisig/tests/multisig_blackbox_test.rs
@@ -9,7 +9,10 @@ use multiversx_sc::{
         test_util::top_encode_to_vec_u8_or_panic,
     },
     storage::mappers::SingleValue,
-    types::{Address, CodeMetadata, ContractCallNoPayment, FunctionCall},
+    types::{
+        Address, AddressExpr, CodeMetadata, ContractCallNoPayment, FunctionCall, ReturnsExact,
+        ScExpr,
+    },
 };
 use multiversx_sc_scenario::{
     api::StaticApi,
@@ -124,12 +127,16 @@ impl MultisigTestState {
     }
 
     fn propose_add_board_member(&mut self, board_member_address: Address) -> usize {
-        self.world.sc_call_get_result(
-            ScCallStep::new().from(PROPOSER_ADDRESS_EXPR).call(
-                self.multisig_contract
-                    .propose_add_board_member(board_member_address),
-            ),
-        )
+        self.world.run_tx(|tx| {
+            tx.from(AddressExpr("proposer"))
+                .to(ScExpr("multisig"))
+                .call(
+                    self.multisig_contract
+                        .propose_add_board_member(board_member_address),
+                )
+                .original_result::<usize>()
+                .returns(ReturnsExact)
+        })
     }
 
     fn propose_add_proposer(&mut self, proposer_address: Address) -> usize {
diff --git a/framework/base/src/types/interaction/tx.rs b/framework/base/src/types/interaction/tx.rs
index d28b054b5e..47bc884bea 100644
--- a/framework/base/src/types/interaction/tx.rs
+++ b/framework/base/src/types/interaction/tx.rs
@@ -386,13 +386,13 @@ where
     ResultList: RHList<Env>,
 {
     #[inline]
-    pub fn result_handler<RH>(
+    pub fn with_result<ResultHandler>(
         self,
-        item: RH,
+        result_handler: ResultHandler,
     ) -> Tx<Env, From, To, Payment, Gas, Data, ResultList::NoRetOutput>
     where
-        RH: RHListItem<Env, ResultList::OriginalResult, Returns = ()>,
-        ResultList: RHListAppendNoRet<Env, RH>,
+        ResultHandler: RHListItem<Env, ResultList::OriginalResult, Returns = ()>,
+        ResultList: RHListAppendNoRet<Env, ResultHandler>,
     {
         Tx {
             env: self.env,
@@ -401,7 +401,7 @@ where
             payment: self.payment,
             gas: self.gas,
             data: self.data,
-            result_handler: self.result_handler.append_no_ret(item),
+            result_handler: self.result_handler.append_no_ret(result_handler),
         }
     }
 
diff --git a/framework/base/src/types/interaction/tx_rh_list.rs b/framework/base/src/types/interaction/tx_rh_list.rs
index 43aacfbc67..85b5c3d51a 100644
--- a/framework/base/src/types/interaction/tx_rh_list.rs
+++ b/framework/base/src/types/interaction/tx_rh_list.rs
@@ -4,6 +4,8 @@ mod returns_raw;
 mod returns_similar;
 mod tx_rh_list_cons;
 mod tx_rh_list_item;
+mod with_result_exact;
+mod with_result_raw;
 
 pub use returns_bt::*;
 pub use returns_exact::*;
diff --git a/framework/base/src/types/interaction/tx_rh_list/with_result_exact.rs b/framework/base/src/types/interaction/tx_rh_list/with_result_exact.rs
new file mode 100644
index 0000000000..f3319c5a07
--- /dev/null
+++ b/framework/base/src/types/interaction/tx_rh_list/with_result_exact.rs
@@ -0,0 +1,53 @@
+use core::marker::PhantomData;
+
+use multiversx_sc_codec::TopDecodeMulti;
+
+use crate::types::{
+    interaction::contract_call_exec::decode_result, ManagedBuffer, ManagedVec, RHListItemSync,
+    TxEnv,
+};
+
+use super::RHListItem;
+
+pub struct WithResultExact<T, F>
+where
+    F: FnOnce(T),
+{
+    _phantom: PhantomData<T>,
+    f: F,
+}
+
+impl<T, F> WithResultExact<T, F>
+where
+    F: FnOnce(T),
+{
+    pub fn new(f: F) -> Self {
+        WithResultExact {
+            _phantom: PhantomData,
+            f,
+        }
+    }
+}
+
+impl<Env, Original, F> RHListItem<Env, Original> for WithResultExact<Original, F>
+where
+    Env: TxEnv,
+    F: FnOnce(Original),
+{
+    type Returns = ();
+}
+
+impl<Env, Original, F> RHListItemSync<Env, Original> for WithResultExact<Original, F>
+where
+    Env: TxEnv,
+    Original: TopDecodeMulti,
+    F: FnOnce(Original),
+{
+    fn item_sync_call_result(
+        self,
+        raw_results: &ManagedVec<Env::Api, ManagedBuffer<Env::Api>>,
+    ) -> Self::Returns {
+        let t = decode_result::<Env::Api, Original>(raw_results.clone());
+        (self.f)(t)
+    }
+}
diff --git a/framework/base/src/types/interaction/tx_rh_list/with_result_raw.rs b/framework/base/src/types/interaction/tx_rh_list/with_result_raw.rs
new file mode 100644
index 0000000000..8f288604be
--- /dev/null
+++ b/framework/base/src/types/interaction/tx_rh_list/with_result_raw.rs
@@ -0,0 +1,48 @@
+use core::marker::PhantomData;
+
+use crate::types::{ManagedBuffer, ManagedVec, RHListItemSync, TxEnv};
+
+use super::RHListItem;
+
+pub struct WithResultRaw<Env, F>
+where
+    Env: TxEnv,
+    F: FnOnce(&ManagedVec<Env::Api, ManagedBuffer<Env::Api>>),
+{
+    _phantom: PhantomData<Env>,
+    f: F,
+}
+
+impl<Env, F> WithResultRaw<Env, F>
+where
+    Env: TxEnv,
+    F: FnOnce(&ManagedVec<Env::Api, ManagedBuffer<Env::Api>>),
+{
+    pub fn new(f: F) -> Self {
+        WithResultRaw {
+            _phantom: PhantomData,
+            f,
+        }
+    }
+}
+
+impl<Env, F, Original> RHListItem<Env, Original> for WithResultRaw<Env, F>
+where
+    Env: TxEnv,
+    F: FnOnce(&ManagedVec<Env::Api, ManagedBuffer<Env::Api>>),
+{
+    type Returns = ();
+}
+
+impl<Env, F, Original> RHListItemSync<Env, Original> for WithResultRaw<Env, F>
+where
+    Env: TxEnv,
+    F: FnOnce(&ManagedVec<Env::Api, ManagedBuffer<Env::Api>>),
+{
+    fn item_sync_call_result(
+        self,
+        raw_results: &ManagedVec<Env::Api, ManagedBuffer<Env::Api>>,
+    ) -> Self::Returns {
+        (self.f)(raw_results)
+    }
+}
diff --git a/framework/scenario/src/facade.rs b/framework/scenario/src/facade.rs
index b6e2eef3a8..4f56063404 100644
--- a/framework/scenario/src/facade.rs
+++ b/framework/scenario/src/facade.rs
@@ -1,16 +1,14 @@
 mod contract_info;
 mod debugger_backend;
-mod scenario_callbacks;
 mod scenario_world;
 mod scenario_world_runner;
 mod scenario_world_steps;
 mod scenario_world_steps_deprecated;
-mod scenario_world_steps_tx;
 mod scenario_world_whitebox;
 mod whitebox_contract;
+mod world_tx;
 
 pub use contract_info::ContractInfo;
-pub use scenario_callbacks::*;
 pub use scenario_world::ScenarioWorld;
-pub use scenario_world_steps_tx::*;
 pub use whitebox_contract::WhiteboxContract;
+pub use world_tx::*;
diff --git a/framework/scenario/src/facade/scenario_callbacks.rs b/framework/scenario/src/facade/scenario_callbacks.rs
deleted file mode 100644
index ffbf569de0..0000000000
--- a/framework/scenario/src/facade/scenario_callbacks.rs
+++ /dev/null
@@ -1,25 +0,0 @@
-use multiversx_sc::types::{TxResultHandler, TxRunnableCallback};
-
-use crate::scenario_model::TxResponse;
-
-use super::ScenarioTxEnvironment;
-
-pub struct WithTxResult<F>(pub F)
-where
-    F: FnOnce(&TxResponse);
-
-impl<F> TxResultHandler<ScenarioTxEnvironment> for WithTxResult<F>
-where
-    F: FnOnce(&TxResponse),
-{
-    type OriginalResult = ();
-}
-
-impl<F> TxRunnableCallback<ScenarioTxEnvironment> for WithTxResult<F>
-where
-    F: FnOnce(&TxResponse),
-{
-    fn run_callback(self, env: &ScenarioTxEnvironment) {
-        (self.0)(env.response.as_ref().unwrap())
-    }
-}
diff --git a/framework/scenario/src/facade/scenario_world_steps_tx.rs b/framework/scenario/src/facade/scenario_world_steps_tx.rs
deleted file mode 100644
index 1b2f84d40b..0000000000
--- a/framework/scenario/src/facade/scenario_world_steps_tx.rs
+++ /dev/null
@@ -1,99 +0,0 @@
-use std::path::PathBuf;
-
-use multiversx_sc::types::{
-    AnnotatedValue, FunctionCall, ManagedAddress, Tx, TxBaseWithEnv, TxEnv, TxFromSpecified, TxGas,
-    TxPayment, TxRunnableCallback, TxToSpecified,
-};
-
-use crate::{
-    api::StaticApi,
-    facade::ScenarioWorld,
-    scenario_model::{ScCallStep, TxResponse},
-};
-
-#[derive(Default, Debug, Clone)]
-pub struct ScenarioTxEnvironment {
-    pub context_path: PathBuf,
-    pub from_annotation: Option<String>,
-    pub to_annotation: Option<String>,
-    pub response: Option<TxResponse>,
-}
-
-impl TxEnv for ScenarioTxEnvironment {
-    type Api = StaticApi;
-
-    fn annotate_from<From>(&mut self, to: &From)
-    where
-        From: AnnotatedValue<ScenarioTxEnvironment, ManagedAddress<StaticApi>>,
-    {
-        self.from_annotation = Some(to.annotation(self).to_string())
-    }
-
-    fn annotate_to<To>(&mut self, to: &To)
-    where
-        To: AnnotatedValue<ScenarioTxEnvironment, ManagedAddress<StaticApi>>,
-    {
-        self.to_annotation = Some(to.annotation(self).to_string())
-    }
-
-    fn resolve_sender_address(&self) -> ManagedAddress<Self::Api> {
-        panic!("Explicit sender address expected")
-    }
-
-    fn default_gas(&self) -> u64 {
-        // TODO: annotate
-        5_000_000
-    }
-}
-
-pub type TxScenarioBase = TxBaseWithEnv<ScenarioTxEnvironment>;
-
-pub trait ScenarioTx {
-    fn run_as_scenario_step(self, world: &mut ScenarioWorld);
-}
-
-impl ScenarioWorld {
-    fn tx_env(&self) -> ScenarioTxEnvironment {
-        ScenarioTxEnvironment {
-            context_path: self.current_dir.clone(),
-            ..Default::default()
-        }
-    }
-
-    pub fn tx<STx, F>(&mut self, f: F) -> &mut Self
-    where
-        STx: ScenarioTx,
-        F: FnOnce(TxScenarioBase) -> STx,
-    {
-        let env = self.tx_env();
-        let tx_base = TxScenarioBase::new_with_env(env);
-        let tx = f(tx_base);
-        tx.run_as_scenario_step(self);
-        self
-    }
-}
-
-impl<From, To, Payment, Gas, Callback> ScenarioTx
-    for Tx<ScenarioTxEnvironment, From, To, Payment, Gas, FunctionCall<StaticApi>, Callback>
-where
-    From: TxFromSpecified<ScenarioTxEnvironment>,
-    To: TxToSpecified<ScenarioTxEnvironment>,
-    Payment: TxPayment<ScenarioTxEnvironment>,
-    Gas: TxGas<ScenarioTxEnvironment>,
-    Callback: TxRunnableCallback<ScenarioTxEnvironment>,
-{
-    fn run_as_scenario_step(self, world: &mut ScenarioWorld) {
-        let mut env = self.env;
-        let mut step = ScCallStep::new()
-            .from(env.from_annotation.as_ref().unwrap().as_str())
-            .to(env.to_annotation.as_ref().unwrap().as_str())
-            .function(self.data.function_name.to_string().as_str());
-        for arg in self.data.arg_buffer.iter_buffers() {
-            step = step.argument(arg.to_vec());
-        }
-
-        world.sc_call(&mut step);
-        env.response = step.response;
-        self.result_handler.run_callback(&env);
-    }
-}
diff --git a/framework/scenario/src/facade/world_tx.rs b/framework/scenario/src/facade/world_tx.rs
new file mode 100644
index 0000000000..55e7720e16
--- /dev/null
+++ b/framework/scenario/src/facade/world_tx.rs
@@ -0,0 +1,11 @@
+#![allow(unused)] // TEMP
+
+mod scenario_env;
+mod scenario_rh_list;
+mod scenario_rh_list_item;
+mod scenario_tx;
+
+pub use scenario_env::*;
+pub use scenario_rh_list::*;
+pub use scenario_rh_list_item::*;
+pub use scenario_tx::*;
diff --git a/framework/scenario/src/facade/world_tx/scenario_env.rs b/framework/scenario/src/facade/world_tx/scenario_env.rs
new file mode 100644
index 0000000000..16e92e2ee1
--- /dev/null
+++ b/framework/scenario/src/facade/world_tx/scenario_env.rs
@@ -0,0 +1,42 @@
+use std::path::PathBuf;
+
+use multiversx_sc::types::{AnnotatedValue, ManagedAddress, TxBaseWithEnv, TxEnv};
+
+use crate::{api::StaticApi, scenario_model::TxResponse};
+
+pub type TxScenarioBase = TxBaseWithEnv<ScenarioTxEnvironment>;
+
+#[derive(Default, Debug, Clone)]
+pub struct ScenarioTxEnvironment {
+    pub context_path: PathBuf,
+    pub from_annotation: Option<String>,
+    pub to_annotation: Option<String>,
+    pub response: Option<TxResponse>,
+}
+
+impl TxEnv for ScenarioTxEnvironment {
+    type Api = StaticApi;
+
+    fn annotate_from<From>(&mut self, to: &From)
+    where
+        From: AnnotatedValue<ScenarioTxEnvironment, ManagedAddress<StaticApi>>,
+    {
+        self.from_annotation = Some(to.annotation(self).to_string())
+    }
+
+    fn annotate_to<To>(&mut self, to: &To)
+    where
+        To: AnnotatedValue<ScenarioTxEnvironment, ManagedAddress<StaticApi>>,
+    {
+        self.to_annotation = Some(to.annotation(self).to_string())
+    }
+
+    fn resolve_sender_address(&self) -> ManagedAddress<Self::Api> {
+        panic!("Explicit sender address expected")
+    }
+
+    fn default_gas(&self) -> u64 {
+        // TODO: annotate
+        5_000_000
+    }
+}
diff --git a/framework/scenario/src/facade/world_tx/scenario_rh_list.rs b/framework/scenario/src/facade/world_tx/scenario_rh_list.rs
new file mode 100644
index 0000000000..e86bb6910f
--- /dev/null
+++ b/framework/scenario/src/facade/world_tx/scenario_rh_list.rs
@@ -0,0 +1,40 @@
+use multiversx_sc::types::{ConsNoRet, ConsRet, OriginalResultMarker, RHList, RHListItem, TxEnv};
+
+use crate::scenario_model::TxResponse;
+
+use super::{RHListItemScenario, ScenarioTxEnvironment};
+
+pub trait RHListScenario: RHList<ScenarioTxEnvironment> {
+    fn item_scenario_result(self, tx_response: &TxResponse) -> Self::ListReturns;
+}
+
+impl RHListScenario for () {
+    fn item_scenario_result(self, tx_response: &TxResponse) -> Self::ListReturns {}
+}
+
+impl<O> RHListScenario for OriginalResultMarker<O> {
+    fn item_scenario_result(self, tx_response: &TxResponse) -> Self::ListReturns {}
+}
+
+impl<Head, Tail> RHListScenario for ConsRet<ScenarioTxEnvironment, Head, Tail>
+where
+    Head: RHListItemScenario<Tail::OriginalResult>,
+    Tail: RHListScenario,
+{
+    fn item_scenario_result(self, tx_response: &TxResponse) -> Self::ListReturns {
+        let head_result = self.head.item_scenario_result(tx_response);
+        let tail_result = self.tail.item_scenario_result(tx_response);
+        (head_result, tail_result)
+    }
+}
+
+impl<Head, Tail> RHListScenario for ConsNoRet<ScenarioTxEnvironment, Head, Tail>
+where
+    Head: RHListItemScenario<Tail::OriginalResult, Returns = ()>,
+    Tail: RHListScenario,
+{
+    fn item_scenario_result(self, tx_response: &TxResponse) -> Self::ListReturns {
+        self.head.item_scenario_result(tx_response);
+        self.tail.item_scenario_result(tx_response)
+    }
+}
diff --git a/framework/scenario/src/facade/world_tx/scenario_rh_list_item.rs b/framework/scenario/src/facade/world_tx/scenario_rh_list_item.rs
new file mode 100644
index 0000000000..57ba631911
--- /dev/null
+++ b/framework/scenario/src/facade/world_tx/scenario_rh_list_item.rs
@@ -0,0 +1,24 @@
+use multiversx_sc::{
+    codec::TopDecodeMulti,
+    types::{RHList, RHListItem, ReturnsExact, TxEnv},
+};
+
+use crate::scenario_model::{TxResponse, TypedResponse};
+
+use super::ScenarioTxEnvironment;
+
+pub trait RHListItemScenario<Original>: RHListItem<ScenarioTxEnvironment, Original> {
+    fn item_scenario_result(self, tx_response: &TxResponse) -> Self::Returns;
+}
+
+impl<Original> RHListItemScenario<Original> for ReturnsExact
+where
+    Original: TopDecodeMulti,
+{
+    fn item_scenario_result(self, tx_response: &TxResponse) -> Self::Returns {
+        let response = TypedResponse::<Original>::from_raw(tx_response);
+        response
+            .result
+            .expect("ReturnsExact expects that transaction is successful")
+    }
+}
diff --git a/framework/scenario/src/facade/world_tx/scenario_tx.rs b/framework/scenario/src/facade/world_tx/scenario_tx.rs
new file mode 100644
index 0000000000..783675b50b
--- /dev/null
+++ b/framework/scenario/src/facade/world_tx/scenario_tx.rs
@@ -0,0 +1,73 @@
+use multiversx_sc::{
+    tuple_util::NestedTupleFlatten,
+    types::{FunctionCall, RHListSync, Tx, TxFromSpecified, TxGas, TxPayment, TxToSpecified},
+};
+
+use crate::{api::StaticApi, scenario_model::ScCallStep, ScenarioWorld};
+
+use super::{RHListScenario, ScenarioTxEnvironment, TxScenarioBase};
+
+impl ScenarioWorld {
+    fn tx_env(&self) -> ScenarioTxEnvironment {
+        ScenarioTxEnvironment {
+            context_path: self.current_dir.clone(),
+            ..Default::default()
+        }
+    }
+
+    pub fn run_tx<STx, F>(&mut self, f: F) -> STx::Returns
+    where
+        STx: ScenarioTx,
+        F: FnOnce(TxScenarioBase) -> STx,
+    {
+        let env = self.tx_env();
+        let tx_base = TxScenarioBase::new_with_env(env);
+        let tx = f(tx_base);
+        tx.run_as_scenario_step(self)
+    }
+
+    pub fn tx<STx, F>(&mut self, f: F) -> &mut Self
+    where
+        STx: ScenarioTx,
+        F: FnOnce(TxScenarioBase) -> STx,
+    {
+        let _ = self.run_tx(f);
+        self
+    }
+}
+
+pub trait ScenarioTx {
+    type Returns;
+
+    fn run_as_scenario_step(self, world: &mut ScenarioWorld) -> Self::Returns;
+}
+
+impl<From, To, Payment, Gas, RH> ScenarioTx
+    for Tx<ScenarioTxEnvironment, From, To, Payment, Gas, FunctionCall<StaticApi>, RH>
+where
+    From: TxFromSpecified<ScenarioTxEnvironment>,
+    To: TxToSpecified<ScenarioTxEnvironment>,
+    Payment: TxPayment<ScenarioTxEnvironment>,
+    Gas: TxGas<ScenarioTxEnvironment>,
+    RH: RHListScenario,
+    RH::ListReturns: NestedTupleFlatten,
+{
+    type Returns = <RH::ListReturns as NestedTupleFlatten>::Unpacked;
+
+    fn run_as_scenario_step(self, world: &mut ScenarioWorld) -> Self::Returns {
+        let mut env = self.env;
+        let mut step = ScCallStep::new()
+            .from(env.from_annotation.as_ref().unwrap().as_str())
+            .to(env.to_annotation.as_ref().unwrap().as_str())
+            .function(self.data.function_name.to_string().as_str());
+        for arg in self.data.arg_buffer.iter_buffers() {
+            step = step.argument(arg.to_vec());
+        }
+
+        world.sc_call(&mut step);
+        let response = step.response.expect("step did not return result");
+
+        let tuple_result = self.result_handler.item_scenario_result(&response);
+        tuple_result.flatten_unpack()
+    }
+}
diff --git a/framework/scenario/src/facade/world_tx/scenario_world_steps_tx.rs b/framework/scenario/src/facade/world_tx/scenario_world_steps_tx.rs
new file mode 100644
index 0000000000..93508e08bb
--- /dev/null
+++ b/framework/scenario/src/facade/world_tx/scenario_world_steps_tx.rs
@@ -0,0 +1,16 @@
+use std::path::PathBuf;
+
+use multiversx_sc::types::{
+    AnnotatedValue, FunctionCall, ManagedAddress, Tx, TxBaseWithEnv, TxEnv, TxFromSpecified, TxGas,
+    TxPayment, TxRunnableCallback, TxToSpecified,
+};
+
+use crate::{
+    api::StaticApi,
+    facade::ScenarioWorld,
+    scenario_model::{ScCallStep, TxResponse},
+};
+
+
+
+
diff --git a/framework/scenario/src/lib.rs b/framework/scenario/src/lib.rs
index 8f240fe3ee..0110147ed3 100644
--- a/framework/scenario/src/lib.rs
+++ b/framework/scenario/src/lib.rs
@@ -44,7 +44,7 @@ pub use crate::scenario as mandos_system;
 // Re-exporting the whole mandos crate for easier use in tests.
 pub use multiversx_chain_scenario_format as scenario_format;
 
-pub use facade::{ContractInfo, ScenarioWorld, WhiteboxContract, WithTxResult};
+pub use facade::{ContractInfo, ScenarioWorld, WhiteboxContract};
 
 use std::path::Path;
 

From b7f60224a5d45fb8b81d1591baa5e73177ac64f3 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Mon, 22 Jan 2024 14:43:30 +0200
Subject: [PATCH 0235/1254] 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<String>) -> 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 <andrei.marinica@multiversx.com>
Date: Mon, 22 Jan 2024 14:46:41 +0200
Subject: [PATCH 0236/1254] 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 <mihaicalin.luca10@gmail.com>
Date: Mon, 22 Jan 2024 13:59:55 +0100
Subject: [PATCH 0237/1254] 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<u32, _> =
-            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 <andrei.marinica@multiversx.com>
Date: Mon, 22 Jan 2024 15:48:58 +0200
Subject: [PATCH 0238/1254] 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<Output, Error>) -> 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 <mihaicalin.luca10@gmail.com>
Date: Mon, 22 Jan 2024 15:17:04 +0100
Subject: [PATCH 0239/1254] 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<u32>;
+
+    #[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 <andrei.marinica@multiversx.com>"]
-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::<get_at_address::AbiProvider>();
-}
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<u32>;
-
-    #[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<SingleTxApi, u64> {
     SetMapper::new(base_key)
 }
 
+fn create_set_at_address(
+    address: ManagedAddress<SingleTxApi>,
+) -> SetMapper<SingleTxApi, u64, ManagedAddress<SingleTxApi>> {
+    let base_key = StorageKey::new(&b"my_remote_set"[..]);
+    SetMapper::new_from_address(address, base_key)
+}
+
 fn check_set(set: &SetMapper<SingleTxApi, u64>, expected: Vec<u64>) {
     assert_eq!(set.len(), expected.len());
     assert!(set.check_internal_consistency());
@@ -16,6 +26,14 @@ fn check_set(set: &SetMapper<SingleTxApi, u64>, expected: Vec<u64>) {
     assert_eq!(actual, expected);
 }
 
+fn check_set_at_address(
+    set: &SetMapper<SingleTxApi, u64, ManagedAddress<SingleTxApi>>,
+    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 <andrei.marinica@multiversx.com>
Date: Mon, 22 Jan 2024 16:27:14 +0200
Subject: [PATCH 0240/1254] 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 <andrei.marinica@multiversx.com>
Date: Mon, 22 Jan 2024 16:53:02 +0200
Subject: [PATCH 0241/1254] 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?= <andrei.bancioiu@gmail.com>
Date: Mon, 22 Jan 2024 17:14:07 +0200
Subject: [PATCH 0242/1254] 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?= <andrei.bancioiu@gmail.com>
Date: Mon, 22 Jan 2024 17:18:00 +0200
Subject: [PATCH 0243/1254] 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?= <andrei.bancioiu@gmail.com>
Date: Mon, 22 Jan 2024 17:19:32 +0200
Subject: [PATCH 0244/1254] 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?= <andrei.bancioiu@gmail.com>
Date: Mon, 22 Jan 2024 17:29:56 +0200
Subject: [PATCH 0245/1254] 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?= <andrei.bancioiu@gmail.com>
Date: Mon, 22 Jan 2024 17:48:18 +0200
Subject: [PATCH 0246/1254] 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 949af270e8efbcf1cb00c5fba84b1c232a3a9677 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Tue, 23 Jan 2024 08:06:18 +0200
Subject: [PATCH 0247/1254] needs to develop test

---
 contracts/examples/adder/src/adder.rs         |  3 +-
 .../alloc-features/sc-config.toml             |  2 +-
 .../alloc-features/src/echo_alloc.rs          |  6 ++
 .../alloc-features/wasm/src/lib.rs            | 11 ++-
 .../src/cmd/contract/sc_config/wasm_build.rs  | 26 ++++--
 framework/meta/src/tools.rs                   |  4 +-
 framework/meta/src/tools/wasm_extractor.rs    | 83 +++++++++++++++++++
 framework/meta/src/tools/wasm_imports.rs      | 49 -----------
 8 files changed, 120 insertions(+), 64 deletions(-)
 create mode 100644 framework/meta/src/tools/wasm_extractor.rs
 delete mode 100644 framework/meta/src/tools/wasm_imports.rs

diff --git a/contracts/examples/adder/src/adder.rs b/contracts/examples/adder/src/adder.rs
index 409da966bd..f815f48d29 100644
--- a/contracts/examples/adder/src/adder.rs
+++ b/contracts/examples/adder/src/adder.rs
@@ -1,5 +1,5 @@
 #![no_std]
-use crate::heap::Box;
+// use crate::heap::Box;
 
 multiversx_sc::imports!();
 /// One of the simplest smart contracts possible,
@@ -12,7 +12,6 @@ pub trait Adder {
 
     #[init]
     fn init(&self, initial_value: BigUint) {
-        let _buffer = Box::new([0u8; 1024]);
         self.sum().set(initial_value);
     }
 
diff --git a/contracts/feature-tests/alloc-features/sc-config.toml b/contracts/feature-tests/alloc-features/sc-config.toml
index d16a678ca5..291a01c507 100644
--- a/contracts/feature-tests/alloc-features/sc-config.toml
+++ b/contracts/feature-tests/alloc-features/sc-config.toml
@@ -4,5 +4,5 @@ main = "alloc-features"
 # the only purpose of this config is to specify the allocator
 [contracts.alloc-features]
 add-unlabelled = true
-allocator = "static64k"
+allocator = "fail"
 stack-size = "32k"
diff --git a/contracts/feature-tests/alloc-features/src/echo_alloc.rs b/contracts/feature-tests/alloc-features/src/echo_alloc.rs
index 22e334c229..1999bd3623 100644
--- a/contracts/feature-tests/alloc-features/src/echo_alloc.rs
+++ b/contracts/feature-tests/alloc-features/src/echo_alloc.rs
@@ -10,6 +10,7 @@ use multiversx_sc::types::String;
 pub trait EchoAllocTypes {
     #[endpoint]
     fn echo_h256(&self, h: H256) -> H256 {
+        let _buffer = Box::new([0u8; 1024]);
         h
     }
 
@@ -87,4 +88,9 @@ pub trait EchoAllocTypes {
     fn echo_ser_example_1(&self, se: StructExampleAlloc) -> StructExampleAlloc {
         se
     }
+
+    #[endpoint]
+    fn trigger_fail_allocator(&self, se: StructExampleAlloc) -> StructExampleAlloc {
+        se
+    }
 }
diff --git a/contracts/feature-tests/alloc-features/wasm/src/lib.rs b/contracts/feature-tests/alloc-features/wasm/src/lib.rs
index f01cc37f8b..83250d14fd 100644
--- a/contracts/feature-tests/alloc-features/wasm/src/lib.rs
+++ b/contracts/feature-tests/alloc-features/wasm/src/lib.rs
@@ -5,15 +5,17 @@
 ////////////////////////////////////////////////////
 
 // Init:                                 1
-// Endpoints:                           64
+// Endpoints:                           65
 // Async Callback (empty):               1
-// Total number of exported functions:  66
+// Total number of exported functions:  67
 
 #![no_std]
-#![allow(internal_features)]
+
+// Configuration that works with rustc < 1.73.0.
+// TODO: Recommended rustc version: 1.73.0 or newer.
 #![feature(lang_items)]
 
-multiversx_sc_wasm_adapter::allocator!(static64k);
+multiversx_sc_wasm_adapter::allocator!();
 multiversx_sc_wasm_adapter::panic_handler!();
 
 multiversx_sc_wasm_adapter::endpoints! {
@@ -33,6 +35,7 @@ multiversx_sc_wasm_adapter::endpoints! {
         echo_boxed_ser_example_1 => echo_boxed_ser_example_1
         echo_multi_value_tuples => echo_multi_value_tuples
         echo_ser_example_1 => echo_ser_example_1
+        trigger_fail_allocator => trigger_fail_allocator
         echo_vec_of_managed_buffer => echo_vec_of_managed_buffer
         echo_big_int_vec => echo_big_int_vec
         echo_varags_u32 => echo_varags_u32
diff --git a/framework/meta/src/cmd/contract/sc_config/wasm_build.rs b/framework/meta/src/cmd/contract/sc_config/wasm_build.rs
index 879a726a09..648ab7ad5c 100644
--- a/framework/meta/src/cmd/contract/sc_config/wasm_build.rs
+++ b/framework/meta/src/cmd/contract/sc_config/wasm_build.rs
@@ -7,7 +7,7 @@ use crate::{
     ei::EIVersion,
     mxsc_file_json::{save_mxsc_file_json, MxscFileJson},
     print_util::*,
-    tools,
+    tools::{self, WasmInfo},
 };
 
 impl ContractVariant {
@@ -24,6 +24,10 @@ impl ContractVariant {
 
         assert!(exit_status.success(), "contract build process failed");
 
+        // let output_wasm_path = format!("{output_path}/{}", self.wasm_output_name(build_args));
+        // println!(">>>>>>>>output_wasm_path {}", output_wasm_path);
+        // let wasm_data = WasmInfo::build_wasm_info(&output_wasm_path);
+
         self.finalize_build(build_args, output_path);
     }
 
@@ -69,13 +73,20 @@ impl ContractVariant {
 
     fn finalize_build(&self, build_args: &BuildArgs, output_path: &str) {
         self.copy_contracts_to_output(build_args, output_path);
+        let wasm_data = self.build_wasm_info(build_args, output_path);
         self.run_wasm_opt(build_args, output_path);
         self.run_wasm2wat(build_args, output_path);
-        self.extract_imports(build_args, output_path);
+        self.extract_imports(build_args, output_path, wasm_data);
         self.run_twiggy(build_args, output_path);
         self.pack_mxsc_file(build_args, output_path);
     }
 
+    fn build_wasm_info(&self, build_args: &BuildArgs, output_path: &str) -> WasmInfo {
+        let output_wasm_path = format!("{output_path}/{}", self.wasm_output_name(build_args));
+
+        WasmInfo::build_wasm_info(&output_wasm_path)
+    }
+
     fn copy_contracts_to_output(&self, build_args: &BuildArgs, output_path: &str) {
         let source_wasm_path = self.wasm_compilation_output_path(&build_args.target_dir_wasm);
         let output_wasm_path = format!("{output_path}/{}", self.wasm_output_name(build_args));
@@ -123,7 +134,7 @@ impl ContractVariant {
         tools::wasm_to_wat(output_wasm_path.as_str(), output_wat_path.as_str());
     }
 
-    fn extract_imports(&self, build_args: &BuildArgs, output_path: &str) {
+    fn extract_imports(&self, build_args: &BuildArgs, output_path: &str, mut wasm_data: WasmInfo) {
         if !build_args.extract_imports {
             return;
         }
@@ -135,9 +146,12 @@ impl ContractVariant {
             self.imports_json_output_name(build_args)
         );
         print_extract_imports(&output_imports_json_path);
-        let import_names = tools::extract_wasm_imports(&output_wasm_path);
-        write_imports_output(output_imports_json_path.as_str(), import_names.as_slice());
-        validate_ei(&import_names, &self.settings.check_ei);
+        wasm_data.set_imports(&output_wasm_path);
+        write_imports_output(
+            output_imports_json_path.as_str(),
+            wasm_data.imports.as_slice(),
+        );
+        validate_ei(&wasm_data.imports, &self.settings.check_ei);
     }
 }
 
diff --git a/framework/meta/src/tools.rs b/framework/meta/src/tools.rs
index 45ae256f2f..5bf45930ce 100644
--- a/framework/meta/src/tools.rs
+++ b/framework/meta/src/tools.rs
@@ -1,12 +1,12 @@
 pub mod find_workspace;
 mod git_describe;
 pub mod twiggy;
-mod wasm_imports;
+mod wasm_extractor;
 mod wasm_opt;
 mod wasm_to_wat;
 
 pub use git_describe::git_describe;
-pub use wasm_imports::extract_wasm_imports;
+pub use wasm_extractor::WasmInfo;
 pub use wasm_opt::run_wasm_opt;
 pub use wasm_to_wat::wasm_to_wat;
 
diff --git a/framework/meta/src/tools/wasm_extractor.rs b/framework/meta/src/tools/wasm_extractor.rs
new file mode 100644
index 0000000000..7a64cdf2b4
--- /dev/null
+++ b/framework/meta/src/tools/wasm_extractor.rs
@@ -0,0 +1,83 @@
+use std::{fs, str::from_utf8};
+use wasmparser::{BinaryReaderError, Parser, Payload};
+
+pub struct WasmInfo {
+    pub imports: Vec<String>,
+    pub allocator_trigger: bool,
+}
+
+impl WasmInfo {
+    const fn new() -> Self {
+        WasmInfo {
+            imports: Vec::new(),
+            allocator_trigger: false,
+        }
+    }
+
+    pub fn set_imports(&mut self, output_wasm_path: &str) {
+        let wasm_data = fs::read(output_wasm_path)
+            .expect("error occured while extracting imports from .wasm: file not found");
+
+        let imports = parse_wasm_imports(wasm_data)
+            .expect("error occured while extracting imports from .wasm ");
+
+        self.imports = imports;
+    }
+
+    pub fn build_wasm_info(output_wasm_path: &str) -> Self {
+        let wasm_data = fs::read(output_wasm_path).expect(
+            "error occured while extracting memory allocation information from .wasm: file not found",
+        );
+
+        let allocator_trigger = is_memory_allocation(wasm_data)
+            .expect("error occured while extracting memory allocation information from .wasm ");
+
+        if allocator_trigger {
+            panic!("FailAllocator triggered: memory allocation forbidden");
+        }
+
+        Self::new()
+    }
+}
+
+fn parse_wasm_imports(wasm_data: Vec<u8>) -> Result<Vec<String>, BinaryReaderError> {
+    let mut import_names = Vec::new();
+
+    let parser = Parser::new(0);
+    for payload in parser.parse_all(&wasm_data) {
+        if let Payload::ImportSection(import_section) = payload? {
+            for import in import_section {
+                import_names.push(import?.name.to_string());
+            }
+        }
+    }
+
+    import_names.sort();
+
+    Ok(import_names)
+}
+
+pub fn is_memory_allocation(wasm_data: Vec<u8>) -> Result<bool, BinaryReaderError> {
+    let parser = Parser::new(0);
+
+    for payload in parser.parse_all(&wasm_data).flatten() {
+        if let Payload::DataSection(data_section) = payload {
+            for data_fragment in data_section {
+                let cleaned_data_fragment: Vec<u8> = data_fragment?
+                    .data
+                    .iter()
+                    .filter(|&&b| b < 128)
+                    .cloned()
+                    .collect();
+
+                if let Ok(data_fragment_str) = from_utf8(&cleaned_data_fragment) {
+                    if data_fragment_str.contains("memory allocation forbidden") {
+                        return Ok(true);
+                    }
+                }
+            }
+        }
+    }
+
+    Ok(false)
+}
diff --git a/framework/meta/src/tools/wasm_imports.rs b/framework/meta/src/tools/wasm_imports.rs
deleted file mode 100644
index f667da0189..0000000000
--- a/framework/meta/src/tools/wasm_imports.rs
+++ /dev/null
@@ -1,49 +0,0 @@
-use std::fs;
-use wasmparser::{BinaryReaderError, Parser, Payload};
-
-/// Parses the WebAssembly code and extracts all the import names.
-pub fn extract_wasm_imports(output_wasm_path: &str) -> Vec<String> {
-    let wasm_data = fs::read(output_wasm_path)
-        .expect("error occured while extracting imports from .wasm: file not found");
-
-    parse_wasm_extract_fail_allocator_error(wasm_data.clone());
-    parse_wasm_imports(wasm_data).expect("error occured while extracting imports from .wasm ")
-}
-
-fn parse_wasm_imports(wasm_data: Vec<u8>) -> Result<Vec<String>, BinaryReaderError> {
-    let mut import_names = Vec::new();
-
-    let parser = Parser::new(0);
-    for payload in parser.parse_all(&wasm_data) {
-        if let Payload::ImportSection(import_section) = payload? {
-            for import in import_section {
-                import_names.push(import?.name.to_string());
-            }
-        }
-    }
-
-    import_names.sort();
-
-    Ok(import_names)
-}
-
-fn parse_wasm_extract_fail_allocator_error(wasm_data: Vec<u8>) {
-    let parser = Parser::new(0);
-
-    for payload in parser.parse_all(&wasm_data).flatten() {
-        if let Payload::DataSection(data_section) = payload {
-            for data in data_section.into_iter() {
-                match data {
-                    Ok(data) => {
-                        if let Ok(utf8_str) = std::str::from_utf8(data.data) {
-                            if utf8_str.contains("memory allocation forbidden") {
-                                panic!("FailAllocator")
-                            }
-                        }
-                    },
-                    Err(_err) => {},
-                }
-            }
-        }
-    }
-}

From 1b162b8fb505156e3424356fef4f68c3ea7ed7a9 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 23 Jan 2024 10:36:21 +0200
Subject: [PATCH 0248/1254] 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 <mihaicalin.luca10@gmail.com>
Date: Tue, 23 Jan 2024 12:04:53 +0100
Subject: [PATCH 0249/1254] 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<u32>;
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<SA, K, V, A = StorageSCAddress>
 where
@@ -67,17 +67,6 @@ where
     K: TopEncode + TopDecode + NestedEncode + NestedDecode,
     V: TopEncode + TopDecode,
 {
-    fn build_named_key(&self, name: &[u8], key: &K) -> StorageKey<SA> {
-        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<V> {
-        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<V> {
         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<SA, K> {
-        self.keys_set.iter()
+impl<SA, K, V> MapMapper<SA, K, V, ManagedAddress<SA>>
+where
+    SA: StorageMapperApi,
+    K: TopEncode + TopDecode + NestedEncode + NestedDecode,
+    V: TopEncode + TopDecode,
+{
+    pub fn new_from_address(address: ManagedAddress<SA>, base_key: StorageKey<SA>) -> 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<SA, StorageSCAddress, K, V> {
-        Values::new(self)
-    }
+impl<'a, SA, A, K, V> IntoIterator for &'a MapMapper<SA, K, V, A>
+where
+    SA: StorageMapperApi,
+    A: StorageAddress<SA>,
+    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<SA, StorageSCAddress, K, V> {
-        Iter::new(self)
+    type IntoIter = Iter<'a, SA, A, K, V>;
+
+    fn into_iter(self) -> Self::IntoIter {
+        self.iter()
     }
 }
 
-impl<SA, K, V> MapMapper<SA, K, V, ManagedAddress<SA>>
+impl<SA, A, K, V> MapMapper<SA, K, V, A>
 where
     SA: StorageMapperApi,
     K: TopEncode + TopDecode + NestedEncode + NestedDecode,
+    A: StorageAddress<SA>,
     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<SA> {
         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<V> {
+        if self.keys_set.contains(k) {
+            return Some(self.get_mapped_value(k));
+        }
+        None
+    }
+
+    pub fn keys(&self) -> Keys<SA, A, K> {
+        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<SA>, 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<V> {
-        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<SA, A, K, V> {
+        Values::new(self)
     }
 
-    // An iterator visiting all keys in arbitrary order.
-    // The iterator element type is `&'a K`.
-    // pub fn keys(&self) -> Keys<SA, K> {
-    //     self.keys_set.iter()
-    // }
-
-    // An iterator visiting all values in arbitrary order.
-    // The iterator element type is `&'a V`.
-    // pub fn values(&self) -> Values<SA, ManagedAddress<SA>, 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<SA, A, K, V> {
-    //     Iter::new(self)
-    // }
-}
-
-impl<'a, SA, K, V> IntoIterator for &'a MapMapper<SA, K, V, StorageSCAddress>
-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<SA, A, K, V> {
+        Iter::new(self)
     }
 }
 
@@ -264,19 +211,18 @@ where
     A: StorageAddress<SA>,
     V: TopEncode + TopDecode + 'static,
 {
-    key_iter: Keys<'a, SA, K>,
+    key_iter: Keys<'a, SA, A, K>,
     hash_map: &'a MapMapper<SA, K, V, A>,
 }
 
-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<SA>,
     K: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static,
     V: TopEncode + TopDecode + 'static,
 {
-    fn new(
-        hash_map: &'a MapMapper<SA, K, V, StorageSCAddress>,
-    ) -> Iter<'a, SA, StorageSCAddress, K, V> {
+    fn new(hash_map: &'a MapMapper<SA, K, V, A>) -> 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<SA>,
     K: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static,
     V: TopEncode + TopDecode + 'static,
 {
@@ -309,19 +256,18 @@ where
     A: StorageAddress<SA>,
     V: TopEncode + TopDecode + 'static,
 {
-    key_iter: Keys<'a, SA, K>,
+    key_iter: Keys<'a, SA, A, K>,
     hash_map: &'a MapMapper<SA, K, V, A>,
 }
 
-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<SA>,
     K: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static,
     V: TopEncode + TopDecode + 'static,
 {
-    fn new(
-        hash_map: &'a MapMapper<SA, K, V, StorageSCAddress>,
-    ) -> Values<'a, SA, StorageSCAddress, K, V> {
+    fn new(hash_map: &'a MapMapper<SA, K, V, A>) -> 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<SA>,
     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<SA>,
+    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<F>(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<SA>,
     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<SA>,
     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<SA, K, V, A = StorageSCAddress>
 where
@@ -63,58 +63,6 @@ where
     K: TopEncode + TopDecode + NestedEncode + NestedDecode,
     V: StorageMapper<SA> + StorageClearable,
 {
-    fn build_named_key(&self, name: &[u8], key: &K) -> StorageKey<SA> {
-        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);
-        <V as storage::mappers::StorageMapper<SA>>::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<V> {
-        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<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,
-            })
-        }
-    }
-
     /// 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<SA, K> {
-        self.keys_set.iter()
-    }
-
-    /// An iterator visiting all values in arbitrary order.
-    /// The iterator element type is `&'a V`.
-    pub fn values(&self) -> Values<SA, StorageSCAddress, 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<SA, StorageSCAddress, K, V> {
-        Iter::new(self)
+impl<SA, K, V> MapStorageMapper<SA, K, V, ManagedAddress<SA>>
+where
+    SA: StorageMapperApi,
+    K: TopEncode + TopDecode + NestedEncode + NestedDecode,
+    V: StorageMapper<SA> + StorageClearable,
+{
+    pub fn new_from_address(address: ManagedAddress<SA>, base_key: StorageKey<SA>) -> Self {
+        MapStorageMapper {
+            _phantom_api: PhantomData,
+            base_key: base_key.clone(),
+            keys_set: SetMapper::new_from_address(address, base_key),
+            _phantom_value: PhantomData,
+        }
     }
 }
 
-impl<SA, K, V> MapStorageMapper<SA, K, V, ManagedAddress<SA>>
+impl<SA, A, K, V> MapStorageMapper<SA, K, V, A>
 where
     SA: StorageMapperApi,
+    A: StorageAddress<SA>,
     K: TopEncode + TopDecode + NestedEncode + NestedDecode,
     V: StorageMapper<SA> + StorageClearable,
 {
@@ -174,6 +121,18 @@ where
         <V as storage::mappers::StorageMapper<SA>>::new(key)
     }
 
+    /// Gets a reference to the value in the entry.
+    pub fn get(&self, k: &K) -> Option<V> {
+        if self.keys_set.contains(k) {
+            return Some(self.get_mapped_storage_value(k));
+        }
+        None
+    }
+
+    pub fn keys(&self) -> Keys<SA, A, K> {
+        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<V> {
-        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<SA, ManagedAddress<SA>, K, V> {
+    pub fn entry(&mut self, key: K) -> Entry<SA, A, K, V> {
         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<SA, A, 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<SA, A, K, V> {
+        Iter::new(self)
+    }
 }
 
-impl<'a, SA, K, V> IntoIterator for &'a MapStorageMapper<SA, K, V, StorageSCAddress>
+impl<'a, SA, A, K, V> IntoIterator for &'a MapStorageMapper<SA, K, V, A>
 where
     SA: StorageMapperApi,
+    A: StorageAddress<SA>,
     K: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static,
     V: StorageMapper<SA> + 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<SA>,
     V: StorageMapper<SA> + StorageClearable,
 {
-    key_iter: Keys<'a, SA, K>,
+    key_iter: Keys<'a, SA, A, K>,
     hash_map: &'a MapStorageMapper<SA, K, V, A>,
 }
 
-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<SA>,
     K: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static,
     V: StorageMapper<SA> + StorageClearable,
 {
-    fn new(
-        hash_map: &'a MapStorageMapper<SA, K, V, StorageSCAddress>,
-    ) -> Iter<'a, SA, StorageSCAddress, K, V> {
+    fn new(hash_map: &'a MapStorageMapper<SA, K, V, A>) -> 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<SA>,
     K: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static,
     V: StorageMapper<SA> + StorageClearable,
 {
@@ -282,19 +246,18 @@ where
     A: StorageAddress<SA>,
     V: StorageMapper<SA> + StorageClearable,
 {
-    key_iter: Keys<'a, SA, K>,
+    key_iter: Keys<'a, SA, A, K>,
     hash_map: &'a MapStorageMapper<SA, K, V, A>,
 }
 
-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<SA>,
     K: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static,
     V: StorageMapper<SA> + StorageClearable,
 {
-    fn new(
-        hash_map: &'a MapStorageMapper<SA, K, V, StorageSCAddress>,
-    ) -> Values<'a, SA, StorageSCAddress, K, V> {
+    fn new(hash_map: &'a MapStorageMapper<SA, K, V, A>) -> 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<SA>,
     K: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static,
     V: StorageMapper<SA> + 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<SA>,
     K: TopEncode + TopDecode + NestedEncode + NestedDecode + Clone + 'static,
     V: StorageMapper<SA> + 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<SA> + 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<SA>,
     K: TopEncode + TopDecode + NestedEncode + NestedDecode + Clone + 'static,
     V: StorageMapper<SA> + 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<SA> + 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<SA> {
-        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<SA> {
-        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<T> {
-        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<T> {
-        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<T> {
-        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<SA, T> {
-        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<u32> = 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<SA, T> QueueMapper<SA, T, ManagedAddress<SA>>
+where
+    SA: StorageMapperApi,
+    T: TopEncode + TopDecode,
+{
+    pub fn new_from_address(address: ManagedAddress<SA>, base_key: StorageKey<SA>) -> Self {
+        QueueMapper {
+            _phantom_api: PhantomData::<SA>,
+            address,
+            base_key: base_key.clone(),
+            _phantom_item: PhantomData::<T>,
         }
     }
 }
 
-impl<SA, T> QueueMapper<SA, T, ManagedAddress<SA>>
+impl<SA, A, T> QueueMapper<SA, T, A>
 where
     SA: StorageMapperApi,
-    T: TopEncode + TopDecode,
+    A: StorageAddress<SA>,
+    T: TopEncode + TopDecode + 'static,
 {
     fn build_node_id_named_key(&self, name: &[u8], node_id: u32) -> StorageKey<SA> {
         let mut named_key = self.base_key.clone();
@@ -430,13 +305,8 @@ where
         name_key
     }
 
-    pub fn new_from_address(address: ManagedAddress<SA>, base_key: StorageKey<SA>) -> Self {
-        QueueMapper {
-            _phantom_api: PhantomData::<SA>,
-            address,
-            base_key: base_key.clone(),
-            _phantom_item: PhantomData::<T>,
-        }
+    pub fn iter(&self) -> Iter<SA, A, T> {
+        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<SA, T> {
-    //     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<SA, T, StorageSCAddress>
+impl<'a, SA, A, T> IntoIterator for &'a QueueMapper<SA, T, A>
 where
     SA: StorageMapperApi,
+    A: StorageAddress<SA>,
     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<SA>,
     T: TopEncode + TopDecode + 'static,
 {
     node_id: u32,
-    queue: &'a QueueMapper<SA, T, StorageSCAddress>,
+    queue: &'a QueueMapper<SA, T, A>,
 }
 
-impl<'a, SA, T> Iter<'a, SA, T>
+impl<'a, SA, A, T> Iter<'a, SA, A, T>
 where
     SA: StorageMapperApi,
+    A: StorageAddress<SA>,
     T: TopEncode + TopDecode + 'static,
 {
-    fn new(queue: &'a QueueMapper<SA, T, StorageSCAddress>) -> Iter<'a, SA, T> {
+    fn new(queue: &'a QueueMapper<SA, T, A>) -> 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<SA>,
     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<SA> {
-        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<SA>, base_key: StorageKey<SA>) -> 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<SA, T> SetMapper<SA, T, StorageSCAddress>
@@ -138,13 +104,6 @@ where
     SA: StorageMapperApi,
     T: TopEncode + TopDecode + NestedEncode + NestedDecode,
 {
-    pub fn build_named_value_key(&self, name: &[u8], value: &T) -> StorageKey<SA> {
-        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<SA, A, T> SetMapper<SA, T, A>
+where
+    SA: StorageMapperApi,
+    A: StorageAddress<SA>,
+    T: TopEncode + TopDecode + NestedEncode + NestedDecode,
+{
+    pub fn build_named_value_key(&self, name: &[u8], value: &T) -> StorageKey<SA> {
+        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<SA, T> {
+    pub fn iter(&self) -> Iter<SA, A, T> {
         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<SA, T, StorageSCAddress>
+impl<'a, SA, A, T> IntoIterator for &'a SetMapper<SA, T, A>
 where
     SA: StorageMapperApi,
+    A: StorageAddress<SA>,
     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 <mihaicalin.luca10@gmail.com>
Date: Tue, 23 Jan 2024 12:36:25 +0100
Subject: [PATCH 0250/1254] 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<SA, K, V, A = StorageSCAddress>
+pub struct MapMapper<SA, K, V, A = CurrentStorage>
 where
     SA: StorageMapperApi,
     K: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static,
@@ -31,7 +31,7 @@ where
     _phantom_value: PhantomData<V>,
 }
 
-impl<SA, K, V> StorageMapper<SA> for MapMapper<SA, K, V, StorageSCAddress>
+impl<SA, K, V> StorageMapper<SA> for MapMapper<SA, K, V, CurrentStorage>
 where
     SA: StorageMapperApi,
     K: TopEncode + TopDecode + NestedEncode + NestedDecode,
@@ -47,7 +47,7 @@ where
     }
 }
 
-impl<SA, K, V> StorageClearable for MapMapper<SA, K, V, StorageSCAddress>
+impl<SA, K, V> StorageClearable for MapMapper<SA, K, V, CurrentStorage>
 where
     SA: StorageMapperApi,
     K: TopEncode + TopDecode + NestedEncode + NestedDecode,
@@ -61,7 +61,7 @@ where
     }
 }
 
-impl<SA, K, V> MapMapper<SA, K, V, StorageSCAddress>
+impl<SA, K, V> MapMapper<SA, K, V, CurrentStorage>
 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<F: FnOnce() -> 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<F: FnOnce(&K) -> 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<MultiValue2<K, V>> when an endpoint result.
-impl<SA, K, V> TopEncodeMulti for MapMapper<SA, K, V, StorageSCAddress>
+impl<SA, K, V> TopEncodeMulti for MapMapper<SA, K, V, CurrentStorage>
 where
     SA: StorageMapperApi,
     K: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static,
@@ -535,7 +535,7 @@ where
     }
 }
 
-impl<SA, K, V> CodecFrom<MapMapper<SA, K, V, StorageSCAddress>>
+impl<SA, K, V> CodecFrom<MapMapper<SA, K, V, CurrentStorage>>
     for MultiValueEncoded<SA, MultiValue2<K, V>>
 where
     SA: StorageMapperApi,
@@ -545,7 +545,7 @@ where
 }
 
 /// Behaves like a MultiResultVec<MultiValue<K, V>> when an endpoint result.
-impl<SA, K, V> TypeAbi for MapMapper<SA, K, V, StorageSCAddress>
+impl<SA, K, V> TypeAbi for MapMapper<SA, K, V, CurrentStorage>
 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<SA, K, V, A = StorageSCAddress>
+pub struct MapStorageMapper<SA, K, V, A = CurrentStorage>
 where
     SA: StorageMapperApi,
     K: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static,
@@ -27,7 +27,7 @@ where
     _phantom_value: PhantomData<V>,
 }
 
-impl<SA, K, V> StorageMapper<SA> for MapStorageMapper<SA, K, V, StorageSCAddress>
+impl<SA, K, V> StorageMapper<SA> for MapStorageMapper<SA, K, V, CurrentStorage>
 where
     SA: StorageMapperApi,
     K: TopEncode + TopDecode + NestedEncode + NestedDecode,
@@ -43,7 +43,7 @@ where
     }
 }
 
-impl<SA, K, V> StorageClearable for MapStorageMapper<SA, K, V, StorageSCAddress>
+impl<SA, K, V> StorageClearable for MapStorageMapper<SA, K, V, CurrentStorage>
 where
     SA: StorageMapperApi,
     K: TopEncode + TopDecode + NestedEncode + NestedDecode,
@@ -57,7 +57,7 @@ where
     }
 }
 
-impl<SA, K, V> MapStorageMapper<SA, K, V, StorageSCAddress>
+impl<SA, K, V> MapStorageMapper<SA, K, V, CurrentStorage>
 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<SA, T, A = StorageSCAddress>
+pub struct QueueMapper<SA, T, A = CurrentStorage>
 where
     SA: StorageMapperApi,
     A: StorageAddress<SA>,
@@ -77,7 +77,7 @@ where
     _phantom_item: PhantomData<T>,
 }
 
-impl<SA, T> StorageMapper<SA> for QueueMapper<SA, T, StorageSCAddress>
+impl<SA, T> StorageMapper<SA> for QueueMapper<SA, T, CurrentStorage>
 where
     SA: StorageMapperApi,
     T: TopEncode + TopDecode,
@@ -85,14 +85,14 @@ where
     fn new(base_key: StorageKey<SA>) -> Self {
         QueueMapper {
             _phantom_api: PhantomData,
-            address: StorageSCAddress,
+            address: CurrentStorage,
             base_key,
             _phantom_item: PhantomData,
         }
     }
 }
 
-impl<SA, T> StorageClearable for QueueMapper<SA, T, StorageSCAddress>
+impl<SA, T> StorageClearable for QueueMapper<SA, T, CurrentStorage>
 where
     SA: StorageMapperApi,
     T: TopEncode + TopDecode,
@@ -110,7 +110,7 @@ where
     }
 }
 
-impl<SA, T> QueueMapper<SA, T, StorageSCAddress>
+impl<SA, T> QueueMapper<SA, T, CurrentStorage>
 where
     SA: StorageMapperApi,
     T: TopEncode + TopDecode,
@@ -496,7 +496,7 @@ where
 }
 
 /// Behaves like a MultiResultVec when an endpoint result.
-impl<SA, T> TopEncodeMulti for QueueMapper<SA, T, StorageSCAddress>
+impl<SA, T> TopEncodeMulti for QueueMapper<SA, T, CurrentStorage>
 where
     SA: StorageMapperApi,
     T: TopEncode + TopDecode,
@@ -510,7 +510,7 @@ where
     }
 }
 
-impl<SA, T> CodecFrom<QueueMapper<SA, T, StorageSCAddress>> for MultiValueEncoded<SA, T>
+impl<SA, T> CodecFrom<QueueMapper<SA, T, CurrentStorage>> for MultiValueEncoded<SA, T>
 where
     SA: StorageMapperApi,
     T: TopEncode + TopDecode,
@@ -518,7 +518,7 @@ where
 }
 
 /// Behaves like a MultiResultVec when an endpoint result.
-impl<SA, T> TypeAbi for QueueMapper<SA, T, StorageSCAddress>
+impl<SA, T> TypeAbi for QueueMapper<SA, T, CurrentStorage>
 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<T: TopDecode>(&self, key: ManagedRef<'_, SA, StorageKey<SA>>) -> T;
 }
 
-pub struct StorageSCAddress;
+pub struct CurrentStorage;
 
-impl<SA> StorageAddress<SA> for StorageSCAddress
+impl<SA> StorageAddress<SA> for CurrentStorage
 where
     SA: StorageMapperApi,
 {
@@ -44,7 +44,7 @@ where
     }
 }
 
-pub struct SetMapper<SA, T, A = StorageSCAddress>
+pub struct SetMapper<SA, T, A = CurrentStorage>
 where
     SA: StorageMapperApi,
     A: StorageAddress<SA>,
@@ -56,7 +56,7 @@ where
     queue_mapper: QueueMapper<SA, T, A>,
 }
 
-impl<SA, T> StorageMapper<SA> for SetMapper<SA, T, StorageSCAddress>
+impl<SA, T> StorageMapper<SA> for SetMapper<SA, T, CurrentStorage>
 where
     SA: StorageMapperApi,
     T: TopEncode + TopDecode + NestedEncode + NestedDecode,
@@ -64,14 +64,14 @@ where
     fn new(base_key: StorageKey<SA>) -> Self {
         SetMapper {
             _phantom_api: PhantomData,
-            address: StorageSCAddress,
+            address: CurrentStorage,
             base_key: base_key.clone(),
             queue_mapper: QueueMapper::new(base_key),
         }
     }
 }
 
-impl<SA, T> StorageClearable for SetMapper<SA, T, StorageSCAddress>
+impl<SA, T> StorageClearable for SetMapper<SA, T, CurrentStorage>
 where
     SA: StorageMapperApi,
     T: TopEncode + TopDecode + NestedEncode + NestedDecode,
@@ -99,7 +99,7 @@ where
     }
 }
 
-impl<SA, T> SetMapper<SA, T, StorageSCAddress>
+impl<SA, T> SetMapper<SA, T, CurrentStorage>
 where
     SA: StorageMapperApi,
     T: TopEncode + TopDecode + NestedEncode + NestedDecode,
@@ -218,7 +218,7 @@ where
     }
 }
 
-impl<SA, T> Extend<T> for SetMapper<SA, T, StorageSCAddress>
+impl<SA, T> Extend<T> for SetMapper<SA, T, CurrentStorage>
 where
     SA: StorageMapperApi,
     T: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static,
@@ -234,7 +234,7 @@ where
 }
 
 /// Behaves like a MultiResultVec when an endpoint result.
-impl<SA, T> TopEncodeMulti for SetMapper<SA, T, StorageSCAddress>
+impl<SA, T> TopEncodeMulti for SetMapper<SA, T, CurrentStorage>
 where
     SA: StorageMapperApi,
     T: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static,
@@ -248,7 +248,7 @@ where
     }
 }
 
-impl<SA, T> CodecFrom<SetMapper<SA, T, StorageSCAddress>> for MultiValueEncoded<SA, T>
+impl<SA, T> CodecFrom<SetMapper<SA, T, CurrentStorage>> for MultiValueEncoded<SA, T>
 where
     SA: StorageMapperApi,
     T: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static,
@@ -256,7 +256,7 @@ where
 }
 
 /// Behaves like a MultiResultVec when an endpoint result.
-impl<SA, T> TypeAbi for SetMapper<SA, T, StorageSCAddress>
+impl<SA, T> TypeAbi for SetMapper<SA, T, CurrentStorage>
 where
     SA: StorageMapperApi,
     T: TopEncode + TopDecode + NestedEncode + NestedDecode + TypeAbi,

From 0eef8894e6c4d7db12738790d3e3557f035a4699 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 23 Jan 2024 14:09:19 +0200
Subject: [PATCH 0251/1254] 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 <andrei.marinica@multiversx.com>
Date: Tue, 23 Jan 2024 14:10:03 +0200
Subject: [PATCH 0252/1254] 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 <claudiu.bruda@multiversx.com>",
     "MultiversX <contact@multiversx.com>",
@@ -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 <dorin.iancu@multiversx.com>",
@@ -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 <alin.cruceat@multiversx.com>"]
 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 <claudiu.bruda@multiversx.com>"]
 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 <claudiu.bruda@multiversx.com>"]
 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 <contact@multiversx.com>"]
@@ -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 <dorin.iancu@multiversx.com>", "Andrei Marinica <andrei.marinica@multiversx.com>", "MultiversX <contact@multiversx.com>"]
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 <andrei.marinica@multiversx.com>", "MultiversX <contact@multiversx.com>"]
@@ -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 <andrei.marinica@multiversx.com>", "MultiversX <contact@multiversx.com>"]
@@ -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 <andrei.marinica@multiversx.com>", "MultiversX <contact@multiversx.com>"]
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::<String>::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 <contact@multiversx.com>"]
@@ -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 <andrei.marinica@multiversx.com>", "MultiversX <contact@multiversx.com>"]
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 <andrei.marinica@multiversx.com>
Date: Tue, 23 Jan 2024 14:13:17 +0200
Subject: [PATCH 0253/1254] 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 <andrei.marinica@multiversx.com>
Date: Tue, 23 Jan 2024 14:18:46 +0200
Subject: [PATCH 0254/1254] 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 35e24d725342a05f8555c72dffe0404788e0ee3c Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Tue, 23 Jan 2024 15:01:40 +0100
Subject: [PATCH 0255/1254] merge

---
 vm/Cargo.toml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vm/Cargo.toml b/vm/Cargo.toml
index 23f574f8fb..bae2507ce7 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"
 colored = "2.0"
 
 [dependencies.multiversx-chain-vm-executor]

From c7a42e4a09b968574c71abb1a8fa31c8d1835cef Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 23 Jan 2024 16:42:54 +0200
Subject: [PATCH 0256/1254] 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 674a4d210d89d3841d4bf5303e8516d2ca49ccaa Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Wed, 24 Jan 2024 16:27:19 +0200
Subject: [PATCH 0257/1254] add tests

---
 .../alloc-features/sc-config.toml             |   2 +-
 .../multicontract.toml                        |  12 ++
 .../scenarios/mcf-fail-memory.scen.json       |  39 ++++
 .../scenarios/mcf-leaking-memory.scen.json    |  40 +++++
 .../scenarios/mcf-static64k-memory.scen.json  |  40 +++++
 .../src/multi_contract_features.rs            |  23 ++-
 .../tests/multi_contract_scenario_go_test.rs  |  15 ++
 .../wasm-multi-contract-alt-impl/src/lib.rs   |   4 +-
 .../src/lib.rs                                |   4 +-
 .../Cargo.lock                                | 170 ++++++++++++++++++
 .../Cargo.toml                                |  32 ++++
 .../src/lib.rs                                |  31 ++++
 .../src/lib.rs                                |   4 +-
 .../Cargo.lock                                | 170 ++++++++++++++++++
 .../Cargo.toml                                |  32 ++++
 .../src/lib.rs                                |  31 ++++
 .../Cargo.lock                                | 170 ++++++++++++++++++
 .../Cargo.toml                                |  32 ++++
 .../src/lib.rs                                |  31 ++++
 .../multi-contract-features/wasm/src/lib.rs   |   4 +-
 20 files changed, 880 insertions(+), 6 deletions(-)
 create mode 100644 contracts/feature-tests/multi-contract-features/scenarios/mcf-fail-memory.scen.json
 create mode 100644 contracts/feature-tests/multi-contract-features/scenarios/mcf-leaking-memory.scen.json
 create mode 100644 contracts/feature-tests/multi-contract-features/scenarios/mcf-static64k-memory.scen.json
 create mode 100644 contracts/feature-tests/multi-contract-features/wasm-multi-contract-fail-memory/Cargo.lock
 create mode 100644 contracts/feature-tests/multi-contract-features/wasm-multi-contract-fail-memory/Cargo.toml
 create mode 100644 contracts/feature-tests/multi-contract-features/wasm-multi-contract-fail-memory/src/lib.rs
 create mode 100644 contracts/feature-tests/multi-contract-features/wasm-multi-contract-leaking-memory/Cargo.lock
 create mode 100644 contracts/feature-tests/multi-contract-features/wasm-multi-contract-leaking-memory/Cargo.toml
 create mode 100644 contracts/feature-tests/multi-contract-features/wasm-multi-contract-leaking-memory/src/lib.rs
 create mode 100644 contracts/feature-tests/multi-contract-features/wasm-multi-contract-static64k-memory/Cargo.lock
 create mode 100644 contracts/feature-tests/multi-contract-features/wasm-multi-contract-static64k-memory/Cargo.toml
 create mode 100644 contracts/feature-tests/multi-contract-features/wasm-multi-contract-static64k-memory/src/lib.rs

diff --git a/contracts/feature-tests/alloc-features/sc-config.toml b/contracts/feature-tests/alloc-features/sc-config.toml
index 291a01c507..d16a678ca5 100644
--- a/contracts/feature-tests/alloc-features/sc-config.toml
+++ b/contracts/feature-tests/alloc-features/sc-config.toml
@@ -4,5 +4,5 @@ main = "alloc-features"
 # the only purpose of this config is to specify the allocator
 [contracts.alloc-features]
 add-unlabelled = true
-allocator = "fail"
+allocator = "static64k"
 stack-size = "32k"
diff --git a/contracts/feature-tests/multi-contract-features/multicontract.toml b/contracts/feature-tests/multi-contract-features/multicontract.toml
index b6c3c8efb1..769f1a0267 100644
--- a/contracts/feature-tests/multi-contract-features/multicontract.toml
+++ b/contracts/feature-tests/multi-contract-features/multicontract.toml
@@ -37,3 +37,15 @@ features = ["example_feature"]
 [contracts.multi-contract-alt-impl]
 add-unlabelled = false
 add-labels = ["alt-impl"]
+
+[contracts.multi-contract-fail-memory]
+allocator = "fail"
+add-labels = ["fail-memory"]
+
+[contracts.multi-contract-leaking-memory]
+allocator = "leaking"
+add-labels = ["leaking-memory"]
+
+[contracts.multi-contract-static64k-memory]
+allocator = "static64k"
+add-labels = ["static64k-memory"]
\ No newline at end of file
diff --git a/contracts/feature-tests/multi-contract-features/scenarios/mcf-fail-memory.scen.json b/contracts/feature-tests/multi-contract-features/scenarios/mcf-fail-memory.scen.json
new file mode 100644
index 0000000000..e3710c89d7
--- /dev/null
+++ b/contracts/feature-tests/multi-contract-features/scenarios/mcf-fail-memory.scen.json
@@ -0,0 +1,39 @@
+{
+    "gasSchedule": "v3",
+    "steps": [
+        {
+            "step": "setState",
+            "accounts": {
+                "sc:multi-contract-fail-memory": {
+                    "nonce": "0",
+                    "balance": "0",
+                    "code": "file:../output/multi-contract-fail-memory.wasm"
+                },
+                "address:an_account": {
+                    "nonce": "0",
+                    "balance": "0"
+                }
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "1",
+            "tx": {
+                "from": "address:an_account",
+                "to": "sc:multi-contract-fail-memory",
+                "function": "alloc_with_fail_memory",
+                "arguments": [],
+                "gasLimit": "50,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": "",
+                "status": "4",
+                "message": "str:memory allocation forbidden",
+                "logs": "*",
+                "gas": "*",
+                "refund": "*"
+            }
+        }
+    ]
+}
diff --git a/contracts/feature-tests/multi-contract-features/scenarios/mcf-leaking-memory.scen.json b/contracts/feature-tests/multi-contract-features/scenarios/mcf-leaking-memory.scen.json
new file mode 100644
index 0000000000..652e664c11
--- /dev/null
+++ b/contracts/feature-tests/multi-contract-features/scenarios/mcf-leaking-memory.scen.json
@@ -0,0 +1,40 @@
+{
+    "gasSchedule": "v3",
+    "steps": [
+        {
+            "step": "setState",
+            "accounts": {
+                "sc:multi-contract-leaking-memory": {
+                    "nonce": "0",
+                    "balance": "0",
+                    "code": "file:../output/multi-contract-leaking-memory.wasm"
+                },
+                "address:an_account": {
+                    "nonce": "0",
+                    "balance": "0"
+                }
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "1",
+            "tx": {
+                "from": "address:an_account",
+                "to": "sc:multi-contract-leaking-memory",
+                "function": "alloc_with_leaking_memory",
+                "arguments": [],
+                "gasLimit": "50,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": [
+                    "1"
+                ],
+                "status": "",
+                "logs": "*",
+                "gas": "*",
+                "refund": "*"
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/contracts/feature-tests/multi-contract-features/scenarios/mcf-static64k-memory.scen.json b/contracts/feature-tests/multi-contract-features/scenarios/mcf-static64k-memory.scen.json
new file mode 100644
index 0000000000..95fd84b7c4
--- /dev/null
+++ b/contracts/feature-tests/multi-contract-features/scenarios/mcf-static64k-memory.scen.json
@@ -0,0 +1,40 @@
+{
+    "gasSchedule": "v3",
+    "steps": [
+        {
+            "step": "setState",
+            "accounts": {
+                "sc:multi-contract-static64k-memory": {
+                    "nonce": "0",
+                    "balance": "0",
+                    "code": "file:../output/multi-contract-static64k-memory.wasm"
+                },
+                "address:an_account": {
+                    "nonce": "0",
+                    "balance": "0"
+                }
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "1",
+            "tx": {
+                "from": "address:an_account",
+                "to": "sc:multi-contract-static64k-memory",
+                "function": "alloc_with_static64k_memory",
+                "arguments": [],
+                "gasLimit": "50,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": [
+                    "1"
+                ],
+                "status": "",
+                "logs": "*",
+                "gas": "*",
+                "refund": "*"
+            }
+        }
+    ]
+}
diff --git a/contracts/feature-tests/multi-contract-features/src/multi_contract_features.rs b/contracts/feature-tests/multi-contract-features/src/multi_contract_features.rs
index 86b34b270a..873c9421e3 100644
--- a/contracts/feature-tests/multi-contract-features/src/multi_contract_features.rs
+++ b/contracts/feature-tests/multi-contract-features/src/multi_contract_features.rs
@@ -1,5 +1,5 @@
 #![no_std]
-
+use crate::heap::Box;
 multiversx_sc::imports!();
 
 #[multiversx_sc::contract]
@@ -45,6 +45,27 @@ pub trait MultiContractFeatures {
         self.sample_value().set(sample_value);
     }
 
+    #[endpoint]
+    #[label("fail-memory")]
+    fn alloc_with_fail_memory(&self) -> i32 {
+        let _ = Box::new([0u8; 1024]);
+        1
+    }
+
+    #[endpoint]
+    #[label("leaking-memory")]
+    fn alloc_with_leaking_memory(&self) -> i32 {
+        let _ = Box::new(42);
+        1
+    }
+
+    #[endpoint]
+    #[label("static64k-memory")]
+    fn alloc_with_static64k_memory(&self) -> i32 {
+        let _ = Box::new([0u8; 1024]);
+        1
+    }
+
     #[view]
     fn example_feature_message(&self) -> &'static str {
         example_feature_message()
diff --git a/contracts/feature-tests/multi-contract-features/tests/multi_contract_scenario_go_test.rs b/contracts/feature-tests/multi-contract-features/tests/multi_contract_scenario_go_test.rs
index 0d92295170..e72966608f 100644
--- a/contracts/feature-tests/multi-contract-features/tests/multi_contract_scenario_go_test.rs
+++ b/contracts/feature-tests/multi-contract-features/tests/multi_contract_scenario_go_test.rs
@@ -23,3 +23,18 @@ fn mcf_external_get_go() {
 fn mcf_external_pure_go() {
     world().run("scenarios/mcf-external-pure.scen.json");
 }
+
+#[test]
+fn mcf_fail_memory_go() {
+    world().run("scenarios/mcf-fail-memory.scen.json");
+}
+
+#[test]
+fn mcf_leaking_memory_go() {
+    world().run("scenarios/mcf-leaking-memory.scen.json");
+}
+
+#[test]
+fn mcf_static64k_memory_go() {
+    world().run("scenarios/mcf-static64k-memory.scen.json");
+}
diff --git a/contracts/feature-tests/multi-contract-features/wasm-multi-contract-alt-impl/src/lib.rs b/contracts/feature-tests/multi-contract-features/wasm-multi-contract-alt-impl/src/lib.rs
index ba8838b6e4..57979a3557 100644
--- a/contracts/feature-tests/multi-contract-features/wasm-multi-contract-alt-impl/src/lib.rs
+++ b/contracts/feature-tests/multi-contract-features/wasm-multi-contract-alt-impl/src/lib.rs
@@ -10,7 +10,9 @@
 // Total number of exported functions:   3
 
 #![no_std]
-#![allow(internal_features)]
+
+// Configuration that works with rustc < 1.73.0.
+// TODO: Recommended rustc version: 1.73.0 or newer.
 #![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
diff --git a/contracts/feature-tests/multi-contract-features/wasm-multi-contract-example-feature/src/lib.rs b/contracts/feature-tests/multi-contract-features/wasm-multi-contract-example-feature/src/lib.rs
index 655e83240c..32c7c0cf3f 100644
--- a/contracts/feature-tests/multi-contract-features/wasm-multi-contract-example-feature/src/lib.rs
+++ b/contracts/feature-tests/multi-contract-features/wasm-multi-contract-example-feature/src/lib.rs
@@ -10,7 +10,9 @@
 // Total number of exported functions:   4
 
 #![no_std]
-#![allow(internal_features)]
+
+// Configuration that works with rustc < 1.73.0.
+// TODO: Recommended rustc version: 1.73.0 or newer.
 #![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
diff --git a/contracts/feature-tests/multi-contract-features/wasm-multi-contract-fail-memory/Cargo.lock b/contracts/feature-tests/multi-contract-features/wasm-multi-contract-fail-memory/Cargo.lock
new file mode 100644
index 0000000000..4477ef4e33
--- /dev/null
+++ b/contracts/feature-tests/multi-contract-features/wasm-multi-contract-fail-memory/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 = "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 = "multi-contract-fail-memory-wasm"
+version = "0.0.0"
+dependencies = [
+ "multi-contract-features",
+ "multiversx-sc-wasm-adapter",
+]
+
+[[package]]
+name = "multi-contract-features"
+version = "0.0.0"
+dependencies = [
+ "multiversx-sc",
+]
+
+[[package]]
+name = "multiversx-sc"
+version = "0.47.0"
+dependencies = [
+ "bitflags",
+ "hex-literal",
+ "multiversx-sc-codec",
+ "multiversx-sc-derive",
+ "num-traits",
+]
+
+[[package]]
+name = "multiversx-sc-codec"
+version = "0.18.4"
+dependencies = [
+ "arrayvec",
+ "multiversx-sc-codec-derive",
+]
+
+[[package]]
+name = "multiversx-sc-codec-derive"
+version = "0.18.4"
+dependencies = [
+ "hex",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "multiversx-sc-derive"
+version = "0.47.0"
+dependencies = [
+ "hex",
+ "proc-macro2",
+ "quote",
+ "radix_trie",
+ "syn",
+]
+
+[[package]]
+name = "multiversx-sc-wasm-adapter"
+version = "0.47.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.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+
+[[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/multi-contract-features/wasm-multi-contract-fail-memory/Cargo.toml b/contracts/feature-tests/multi-contract-features/wasm-multi-contract-fail-memory/Cargo.toml
new file mode 100644
index 0000000000..55fda5c436
--- /dev/null
+++ b/contracts/feature-tests/multi-contract-features/wasm-multi-contract-fail-memory/Cargo.toml
@@ -0,0 +1,32 @@
+# Code generated by the multiversx-sc build system. DO NOT EDIT.
+
+# ##########################################
+# ############## AUTO-GENERATED #############
+# ##########################################
+
+[package]
+name = "multi-contract-fail-memory-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.multi-contract-features]
+path = ".."
+
+[dependencies.multiversx-sc-wasm-adapter]
+version = "0.47.0"
+path = "../../../../framework/wasm-adapter"
+
+[workspace]
+members = ["."]
diff --git a/contracts/feature-tests/multi-contract-features/wasm-multi-contract-fail-memory/src/lib.rs b/contracts/feature-tests/multi-contract-features/wasm-multi-contract-fail-memory/src/lib.rs
new file mode 100644
index 0000000000..1f1d3fe30f
--- /dev/null
+++ b/contracts/feature-tests/multi-contract-features/wasm-multi-contract-fail-memory/src/lib.rs
@@ -0,0 +1,31 @@
+// Code generated by the multiversx-sc build system. DO NOT EDIT.
+
+////////////////////////////////////////////////////
+////////////////// AUTO-GENERATED //////////////////
+////////////////////////////////////////////////////
+
+// Init:                                 1
+// Endpoints:                            3
+// Async Callback (empty):               1
+// Total number of exported functions:   5
+
+#![no_std]
+
+// Configuration that works with rustc < 1.73.0.
+// TODO: Recommended rustc version: 1.73.0 or newer.
+#![feature(lang_items)]
+
+multiversx_sc_wasm_adapter::allocator!();
+multiversx_sc_wasm_adapter::panic_handler!();
+
+multiversx_sc_wasm_adapter::endpoints! {
+    multi_contract_features
+    (
+        init => default_init
+        sample_value => sample_value
+        example_feature_message => example_feature_message
+        alloc_with_fail_memory => alloc_with_fail_memory
+    )
+}
+
+multiversx_sc_wasm_adapter::async_callback_empty! {}
diff --git a/contracts/feature-tests/multi-contract-features/wasm-multi-contract-features-view/src/lib.rs b/contracts/feature-tests/multi-contract-features/wasm-multi-contract-features-view/src/lib.rs
index 871bfb5bca..cbf61c8513 100644
--- a/contracts/feature-tests/multi-contract-features/wasm-multi-contract-features-view/src/lib.rs
+++ b/contracts/feature-tests/multi-contract-features/wasm-multi-contract-features-view/src/lib.rs
@@ -10,7 +10,9 @@
 // Total number of exported functions:   5
 
 #![no_std]
-#![allow(internal_features)]
+
+// Configuration that works with rustc < 1.73.0.
+// TODO: Recommended rustc version: 1.73.0 or newer.
 #![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
diff --git a/contracts/feature-tests/multi-contract-features/wasm-multi-contract-leaking-memory/Cargo.lock b/contracts/feature-tests/multi-contract-features/wasm-multi-contract-leaking-memory/Cargo.lock
new file mode 100644
index 0000000000..3b53d73d13
--- /dev/null
+++ b/contracts/feature-tests/multi-contract-features/wasm-multi-contract-leaking-memory/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 = "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 = "multi-contract-features"
+version = "0.0.0"
+dependencies = [
+ "multiversx-sc",
+]
+
+[[package]]
+name = "multi-contract-leaking-memory-wasm"
+version = "0.0.0"
+dependencies = [
+ "multi-contract-features",
+ "multiversx-sc-wasm-adapter",
+]
+
+[[package]]
+name = "multiversx-sc"
+version = "0.47.0"
+dependencies = [
+ "bitflags",
+ "hex-literal",
+ "multiversx-sc-codec",
+ "multiversx-sc-derive",
+ "num-traits",
+]
+
+[[package]]
+name = "multiversx-sc-codec"
+version = "0.18.4"
+dependencies = [
+ "arrayvec",
+ "multiversx-sc-codec-derive",
+]
+
+[[package]]
+name = "multiversx-sc-codec-derive"
+version = "0.18.4"
+dependencies = [
+ "hex",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "multiversx-sc-derive"
+version = "0.47.0"
+dependencies = [
+ "hex",
+ "proc-macro2",
+ "quote",
+ "radix_trie",
+ "syn",
+]
+
+[[package]]
+name = "multiversx-sc-wasm-adapter"
+version = "0.47.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.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+
+[[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/multi-contract-features/wasm-multi-contract-leaking-memory/Cargo.toml b/contracts/feature-tests/multi-contract-features/wasm-multi-contract-leaking-memory/Cargo.toml
new file mode 100644
index 0000000000..86bac344a3
--- /dev/null
+++ b/contracts/feature-tests/multi-contract-features/wasm-multi-contract-leaking-memory/Cargo.toml
@@ -0,0 +1,32 @@
+# Code generated by the multiversx-sc build system. DO NOT EDIT.
+
+# ##########################################
+# ############## AUTO-GENERATED #############
+# ##########################################
+
+[package]
+name = "multi-contract-leaking-memory-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.multi-contract-features]
+path = ".."
+
+[dependencies.multiversx-sc-wasm-adapter]
+version = "0.47.0"
+path = "../../../../framework/wasm-adapter"
+
+[workspace]
+members = ["."]
diff --git a/contracts/feature-tests/multi-contract-features/wasm-multi-contract-leaking-memory/src/lib.rs b/contracts/feature-tests/multi-contract-features/wasm-multi-contract-leaking-memory/src/lib.rs
new file mode 100644
index 0000000000..7bc00703df
--- /dev/null
+++ b/contracts/feature-tests/multi-contract-features/wasm-multi-contract-leaking-memory/src/lib.rs
@@ -0,0 +1,31 @@
+// Code generated by the multiversx-sc build system. DO NOT EDIT.
+
+////////////////////////////////////////////////////
+////////////////// AUTO-GENERATED //////////////////
+////////////////////////////////////////////////////
+
+// Init:                                 1
+// Endpoints:                            3
+// Async Callback (empty):               1
+// Total number of exported functions:   5
+
+#![no_std]
+
+// Configuration that works with rustc < 1.73.0.
+// TODO: Recommended rustc version: 1.73.0 or newer.
+#![feature(lang_items)]
+
+multiversx_sc_wasm_adapter::allocator!(leaking);
+multiversx_sc_wasm_adapter::panic_handler!();
+
+multiversx_sc_wasm_adapter::endpoints! {
+    multi_contract_features
+    (
+        init => default_init
+        sample_value => sample_value
+        example_feature_message => example_feature_message
+        alloc_with_leaking_memory => alloc_with_leaking_memory
+    )
+}
+
+multiversx_sc_wasm_adapter::async_callback_empty! {}
diff --git a/contracts/feature-tests/multi-contract-features/wasm-multi-contract-static64k-memory/Cargo.lock b/contracts/feature-tests/multi-contract-features/wasm-multi-contract-static64k-memory/Cargo.lock
new file mode 100644
index 0000000000..986ac28f03
--- /dev/null
+++ b/contracts/feature-tests/multi-contract-features/wasm-multi-contract-static64k-memory/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 = "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 = "multi-contract-features"
+version = "0.0.0"
+dependencies = [
+ "multiversx-sc",
+]
+
+[[package]]
+name = "multi-contract-static64k-memory-wasm"
+version = "0.0.0"
+dependencies = [
+ "multi-contract-features",
+ "multiversx-sc-wasm-adapter",
+]
+
+[[package]]
+name = "multiversx-sc"
+version = "0.47.0"
+dependencies = [
+ "bitflags",
+ "hex-literal",
+ "multiversx-sc-codec",
+ "multiversx-sc-derive",
+ "num-traits",
+]
+
+[[package]]
+name = "multiversx-sc-codec"
+version = "0.18.4"
+dependencies = [
+ "arrayvec",
+ "multiversx-sc-codec-derive",
+]
+
+[[package]]
+name = "multiversx-sc-codec-derive"
+version = "0.18.4"
+dependencies = [
+ "hex",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "multiversx-sc-derive"
+version = "0.47.0"
+dependencies = [
+ "hex",
+ "proc-macro2",
+ "quote",
+ "radix_trie",
+ "syn",
+]
+
+[[package]]
+name = "multiversx-sc-wasm-adapter"
+version = "0.47.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.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+
+[[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/multi-contract-features/wasm-multi-contract-static64k-memory/Cargo.toml b/contracts/feature-tests/multi-contract-features/wasm-multi-contract-static64k-memory/Cargo.toml
new file mode 100644
index 0000000000..dff9fb1987
--- /dev/null
+++ b/contracts/feature-tests/multi-contract-features/wasm-multi-contract-static64k-memory/Cargo.toml
@@ -0,0 +1,32 @@
+# Code generated by the multiversx-sc build system. DO NOT EDIT.
+
+# ##########################################
+# ############## AUTO-GENERATED #############
+# ##########################################
+
+[package]
+name = "multi-contract-static64k-memory-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.multi-contract-features]
+path = ".."
+
+[dependencies.multiversx-sc-wasm-adapter]
+version = "0.47.0"
+path = "../../../../framework/wasm-adapter"
+
+[workspace]
+members = ["."]
diff --git a/contracts/feature-tests/multi-contract-features/wasm-multi-contract-static64k-memory/src/lib.rs b/contracts/feature-tests/multi-contract-features/wasm-multi-contract-static64k-memory/src/lib.rs
new file mode 100644
index 0000000000..7abd3ebff3
--- /dev/null
+++ b/contracts/feature-tests/multi-contract-features/wasm-multi-contract-static64k-memory/src/lib.rs
@@ -0,0 +1,31 @@
+// Code generated by the multiversx-sc build system. DO NOT EDIT.
+
+////////////////////////////////////////////////////
+////////////////// AUTO-GENERATED //////////////////
+////////////////////////////////////////////////////
+
+// Init:                                 1
+// Endpoints:                            3
+// Async Callback (empty):               1
+// Total number of exported functions:   5
+
+#![no_std]
+
+// Configuration that works with rustc < 1.73.0.
+// TODO: Recommended rustc version: 1.73.0 or newer.
+#![feature(lang_items)]
+
+multiversx_sc_wasm_adapter::allocator!(static64k);
+multiversx_sc_wasm_adapter::panic_handler!();
+
+multiversx_sc_wasm_adapter::endpoints! {
+    multi_contract_features
+    (
+        init => default_init
+        sample_value => sample_value
+        example_feature_message => example_feature_message
+        alloc_with_static64k_memory => alloc_with_static64k_memory
+    )
+}
+
+multiversx_sc_wasm_adapter::async_callback_empty! {}
diff --git a/contracts/feature-tests/multi-contract-features/wasm/src/lib.rs b/contracts/feature-tests/multi-contract-features/wasm/src/lib.rs
index 655e83240c..32c7c0cf3f 100644
--- a/contracts/feature-tests/multi-contract-features/wasm/src/lib.rs
+++ b/contracts/feature-tests/multi-contract-features/wasm/src/lib.rs
@@ -10,7 +10,9 @@
 // Total number of exported functions:   4
 
 #![no_std]
-#![allow(internal_features)]
+
+// Configuration that works with rustc < 1.73.0.
+// TODO: Recommended rustc version: 1.73.0 or newer.
 #![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();

From b2476a5d94c3d0524b63c89cf32a3e33afd4bc2b Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 24 Jan 2024 22:17:06 +0200
Subject: [PATCH 0258/1254] 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<rewards_distribution::Proxy<StaticApi>>;
 type SeedNFTMinterContract = ContractInfo<mock_seed_nft_minter::Proxy<StaticApi>>;
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::<vault::AbiProvider>(&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<transfer_role_features::Proxy<StaticApi>>;
 
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 <andrei.marinica@multiversx.com>
Date: Wed, 24 Jan 2024 22:18:16 +0200
Subject: [PATCH 0259/1254] 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 <andrei.marinica@multiversx.com>
Date: Wed, 24 Jan 2024 22:29:10 +0200
Subject: [PATCH 0260/1254] 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<dHBci=WfQ
zCi_~{Uu6BGs5V(4(@14aE{htd;r&e3w@rQmD?o!XBNe;PN|mbDUFEZ8wUX+-E|tjS
zw^F1)jP%Vwd@pBRrBj)noeu0=mHGep@xQjlUG|y&iIMeeU&{*4Of_%0mdovJc_;SW
z3}C=XKjVB;Y^wE3ealeiJr$)X*p#`5)`*%-YBvOG`=o{F_rYPqHM(=`T;`?P6R@;h
z4VSiF(0!A`6&2cK>@3A@HxtV(Oh(N^rbH^?(v9O()FPHeN`b}kT8f8wAu37H{e!ND
z*hau#g}@;IHZ|e%!7<-^0ugRQ_(%*h0geI8txrCS4q7nf1lViMbh-3;cv$+uCfY^A
zBtU+q<A8AcnvHu9q9>hA`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<PqYvS!}%o0(_JAj=E^0Q-Ame2Mj#)HRIJE}K{gc6qhq0LU+FdrDul
zC&~Oon=^F@;4m$dxt8fsQRD@nV-6a{NSUEb)2A}66p)?LVYUFz;r+QXXH_POd6g+`
zO7I=q+m=7kuD6Oef~Ni2z@sXK)=pOu#|^&K)E_50DbF`8tN|MOK@bqTg1~R#0ufst
zLO1AnHHzi(H_#fy-`%)341!E$d2vO+xBU#T_DoJqUL-Pw?v1HE-#|`Zz(E*Au{1JL
zI`)u8(Yca~Xd+AHk?;=*Ll_`i+7D<K+^i*t`|On?fZju_2heQyfn7V6Jm9e5*lWiK
zIPJhbWnY@2Hn2}kcH4^C8<%q!tt8*JlJ8AsXZ~Ex>}_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}Q<LQSvdHzE>nfXAaX#a6^XUEog!I$*


From c1a8c1975ce8d4aa0d5d9b1bac8eea4dc41d5f3d Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 24 Jan 2024 22:32:38 +0200
Subject: [PATCH 0261/1254] 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 <andrei.marinica@multiversx.com>
Date: Wed, 24 Jan 2024 22:36:53 +0200
Subject: [PATCH 0262/1254] 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 <andrei.marinica@multiversx.com>
Date: Thu, 25 Jan 2024 00:54:59 +0200
Subject: [PATCH 0263/1254] 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 <mihaicalin.luca10@gmail.com>
Date: Fri, 26 Jan 2024 12:12:02 +0100
Subject: [PATCH 0264/1254] 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<A>) -> CodeMetadata {
+        A::blockchain_api_impl().get_code_metadata(address.get_handle())
+    }
+
     #[inline]
     pub fn get_sc_balance(&self, token: &EgldOrEsdtTokenIdentifier<A>, nonce: u64) -> BigUint<A> {
         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<VHB: VMHooksApiBackend> BlockchainApiImpl for VMHooksApi<VHB> {
 
         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 <andrei.marinica@multiversx.com>
Date: Fri, 26 Jan 2024 14:10:14 +0200
Subject: [PATCH 0265/1254] 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<A>) -> 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::<A>::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<VHB: VMHooksApiBackend> BlockchainApiImpl for VMHooksApi<VHB> {
         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 <andrei.marinica@multiversx.com>
Date: Fri, 26 Jan 2024 14:10:23 +0200
Subject: [PATCH 0266/1254] 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 <andrei.marinica@multiversx.com>
Date: Sun, 28 Jan 2024 22:24:05 +0200
Subject: [PATCH 0267/1254] 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 <andrei.marinica@multiversx.com>
Date: Mon, 29 Jan 2024 09:45:41 +0200
Subject: [PATCH 0268/1254] 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 5328ff0e79195629e9c6e1bae81b0075b0c13dff Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Mon, 29 Jan 2024 10:11:07 +0100
Subject: [PATCH 0269/1254] new structure impl on vecmapper,
 unorderedsetmapper, bidimapper

---
 .../base/src/storage/mappers/bi_di_mapper.rs  | 156 +++++++++-----
 .../storage/mappers/unordered_set_mapper.rs   | 105 ++++-----
 .../base/src/storage/mappers/vec_mapper.rs    | 204 +++++++++---------
 3 files changed, 252 insertions(+), 213 deletions(-)

diff --git a/framework/base/src/storage/mappers/bi_di_mapper.rs b/framework/base/src/storage/mappers/bi_di_mapper.rs
index 15503955d5..42c55e5275 100644
--- a/framework/base/src/storage/mappers/bi_di_mapper.rs
+++ b/framework/base/src/storage/mappers/bi_di_mapper.rs
@@ -1,15 +1,21 @@
 use core::marker::PhantomData;
 
-use crate::codec::{
-    multi_encode_iter_or_handle_err, multi_types::MultiValue2, CodecFrom, EncodeErrorHandler,
-    NestedDecode, NestedEncode, TopDecode, TopEncode, TopEncodeMulti, TopEncodeMultiOutput,
+use crate::{
+    codec::{
+        multi_encode_iter_or_handle_err, multi_types::MultiValue2, CodecFrom, EncodeErrorHandler,
+        NestedDecode, NestedEncode, TopDecode, TopEncode, TopEncodeMulti, TopEncodeMultiOutput,
+    },
+    types::ManagedAddress,
 };
 
-use super::{unordered_set_mapper, StorageMapper, UnorderedSetMapper};
+use super::{
+    set_mapper::{CurrentStorage, StorageAddress},
+    unordered_set_mapper, StorageMapper, UnorderedSetMapper,
+};
 use crate::{
     abi::{TypeAbi, TypeDescriptionContainer, TypeName},
     api::StorageMapperApi,
-    storage::{storage_get, storage_set, StorageKey},
+    storage::{storage_set, StorageKey},
     storage_clear,
     types::{ManagedType, MultiValueEncoded},
 };
@@ -19,23 +25,25 @@ const ID_SUFIX: &[u8] = b"_id";
 const VALUE_TO_ID_SUFFIX: &[u8] = b"_value_to_id";
 const ID_TO_VALUE_SUFFIX: &[u8] = b"_id_to_value";
 
-type Keys<'a, SA, T> = unordered_set_mapper::Iter<'a, SA, T>;
+type Keys<'a, SA, T, A> = unordered_set_mapper::Iter<'a, SA, T, A>;
 
 /// A bi-directional map, from values to ids and viceversa.
 /// The mapper is based on UnorderedSetMapper, reason why the remove is done by swap_remove
-pub struct BiDiMapper<SA, K, V>
+pub struct BiDiMapper<SA, K, V, A = CurrentStorage>
 where
     SA: StorageMapperApi,
+    A: StorageAddress<SA>,
     K: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static + Default + PartialEq,
     V: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static + Default + PartialEq,
 {
     _phantom_api: PhantomData<SA>,
-    id_set_mapper: UnorderedSetMapper<SA, K>,
-    value_set_mapper: UnorderedSetMapper<SA, V>,
+    address: A,
+    id_set_mapper: UnorderedSetMapper<SA, K, A>,
+    value_set_mapper: UnorderedSetMapper<SA, V, A>,
     base_key: StorageKey<SA>,
 }
 
-impl<SA, K, V> StorageMapper<SA> for BiDiMapper<SA, K, V>
+impl<SA, K, V> StorageMapper<SA> for BiDiMapper<SA, K, V, CurrentStorage>
 where
     SA: StorageMapperApi,
     K: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static + Default + PartialEq,
@@ -49,6 +57,7 @@ where
         value_key.append_bytes(VALUE_SUFIX);
         BiDiMapper {
             _phantom_api: PhantomData,
+            address: CurrentStorage,
             id_set_mapper: UnorderedSetMapper::<SA, K>::new(id_key),
             value_set_mapper: UnorderedSetMapper::<SA, V>::new(value_key),
             base_key,
@@ -56,11 +65,34 @@ where
     }
 }
 
-impl<SA, K, V> BiDiMapper<SA, K, V>
+impl<SA, K, V> BiDiMapper<SA, K, V, ManagedAddress<SA>>
 where
     SA: StorageMapperApi,
     K: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static + Default + PartialEq,
     V: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static + Default + PartialEq,
+{
+    pub fn new_from_address(address: ManagedAddress<SA>, base_key: StorageKey<SA>) -> Self {
+        let mut id_key = base_key.clone();
+        id_key.append_bytes(ID_SUFIX);
+
+        let mut value_key = base_key.clone();
+        value_key.append_bytes(VALUE_SUFIX);
+        BiDiMapper {
+            _phantom_api: PhantomData,
+            address: address.clone(),
+            id_set_mapper: UnorderedSetMapper::new_from_address(address.clone(), id_key),
+            value_set_mapper: UnorderedSetMapper::new_from_address(address, value_key),
+            base_key,
+        }
+    }
+}
+
+impl<SA, K, V, A> BiDiMapper<SA, K, V, A>
+where
+    SA: StorageMapperApi,
+    A: StorageAddress<SA>,
+    K: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static + Default + PartialEq,
+    V: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static + Default + PartialEq,
 {
     fn get_id_key(&self, value: &V) -> StorageKey<SA> {
         let mut key = self.base_key.clone();
@@ -77,15 +109,52 @@ where
     }
 
     pub fn get_id(&self, value: &V) -> K {
-        storage_get(self.get_id_key(value).as_ref())
+        self.address
+            .address_storage_get(self.get_id_key(value).as_ref())
     }
 
-    fn set_id(&mut self, value: &V, id: &K) {
-        storage_set(self.get_id_key(value).as_ref(), id);
+    pub fn get_value(&self, id: &K) -> V {
+        self.address
+            .address_storage_get(self.get_value_key(id).as_ref())
     }
 
-    pub fn get_value(&self, id: &K) -> V {
-        storage_get(self.get_value_key(id).as_ref())
+    pub fn contains_id(&self, id: &K) -> bool {
+        self.id_set_mapper.contains(id)
+    }
+
+    pub fn contains_value(&self, value: &V) -> bool {
+        self.value_set_mapper.contains(value)
+    }
+
+    pub fn get_all_values(&self) -> unordered_set_mapper::Iter<SA, V, A> {
+        self.value_set_mapper.iter()
+    }
+
+    pub fn get_all_ids(&self) -> unordered_set_mapper::Iter<SA, K, A> {
+        self.id_set_mapper.iter()
+    }
+
+    pub fn iter(&self) -> Iter<SA, K, V, A> {
+        Iter::new(self)
+    }
+
+    pub fn is_empty(&self) -> bool {
+        self.value_set_mapper.is_empty()
+    }
+
+    pub fn len(&self) -> usize {
+        self.value_set_mapper.len()
+    }
+}
+
+impl<SA, K, V> BiDiMapper<SA, K, V, CurrentStorage>
+where
+    SA: StorageMapperApi,
+    K: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static + Default + PartialEq,
+    V: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static + Default + PartialEq,
+{
+    fn set_id(&mut self, value: &V, id: &K) {
+        storage_set(self.get_id_key(value).as_ref(), id);
     }
 
     fn set_value(&mut self, id: &K, value: &V) {
@@ -99,14 +168,6 @@ where
         storage_clear(self.get_value_key(id).as_ref());
     }
 
-    pub fn contains_id(&self, id: &K) -> bool {
-        self.id_set_mapper.contains(id)
-    }
-
-    pub fn contains_value(&self, value: &V) -> bool {
-        self.value_set_mapper.contains(value)
-    }
-
     pub fn insert(&mut self, id: K, value: V) -> bool {
         if self.contains_id(&id) || self.contains_value(&value) {
             return false;
@@ -158,60 +219,43 @@ where
             self.remove_by_value(&item);
         }
     }
-
-    pub fn get_all_values(&self) -> unordered_set_mapper::Iter<SA, V> {
-        self.value_set_mapper.iter()
-    }
-
-    pub fn get_all_ids(&self) -> unordered_set_mapper::Iter<SA, K> {
-        self.id_set_mapper.iter()
-    }
-
-    pub fn iter(&self) -> Iter<SA, K, V> {
-        Iter::new(self)
-    }
-
-    pub fn is_empty(&self) -> bool {
-        self.value_set_mapper.is_empty()
-    }
-
-    pub fn len(&self) -> usize {
-        self.value_set_mapper.len()
-    }
 }
 
-impl<'a, SA, K, V> IntoIterator for &'a BiDiMapper<SA, K, V>
+impl<'a, SA, K, V, A> IntoIterator for &'a BiDiMapper<SA, K, V, A>
 where
     SA: StorageMapperApi,
+    A: StorageAddress<SA>,
     K: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static + Default + PartialEq,
     V: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static + Default + PartialEq,
 {
     type Item = (K, V);
 
-    type IntoIter = Iter<'a, SA, K, V>;
+    type IntoIter = Iter<'a, SA, K, V, A>;
 
     fn into_iter(self) -> Self::IntoIter {
         self.iter()
     }
 }
 
-pub struct Iter<'a, SA, K, V>
+pub struct Iter<'a, SA, K, V, A>
 where
     SA: StorageMapperApi,
+    A: StorageAddress<SA>,
     K: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static + Default + PartialEq,
     V: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static + Default + PartialEq,
 {
-    key_iter: Keys<'a, SA, K>,
-    hash_map: &'a BiDiMapper<SA, K, V>,
+    key_iter: Keys<'a, SA, K, A>,
+    hash_map: &'a BiDiMapper<SA, K, V, A>,
 }
 
-impl<'a, SA, K, V> Iter<'a, SA, K, V>
+impl<'a, SA, K, V, A> Iter<'a, SA, K, V, A>
 where
     SA: StorageMapperApi,
+    A: StorageAddress<SA>,
     K: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static + Default + PartialEq,
     V: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static + Default + PartialEq,
 {
-    fn new(hash_map: &'a BiDiMapper<SA, K, V>) -> Iter<'a, SA, K, V> {
+    fn new(hash_map: &'a BiDiMapper<SA, K, V, A>) -> Iter<'a, SA, K, V, A> {
         Iter {
             key_iter: hash_map.get_all_ids(),
             hash_map,
@@ -219,9 +263,10 @@ where
     }
 }
 
-impl<'a, SA, K, V> Iterator for Iter<'a, SA, K, V>
+impl<'a, SA, K, V, A> Iterator for Iter<'a, SA, K, V, A>
 where
     SA: StorageMapperApi,
+    A: StorageAddress<SA>,
     K: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static + Default + PartialEq,
     V: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static + Default + PartialEq,
 {
@@ -237,7 +282,7 @@ where
     }
 }
 
-impl<SA, K, V> TopEncodeMulti for BiDiMapper<SA, K, V>
+impl<SA, K, V> TopEncodeMulti for BiDiMapper<SA, K, V, CurrentStorage>
 where
     SA: StorageMapperApi,
     K: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static + Default + PartialEq,
@@ -253,7 +298,8 @@ where
     }
 }
 
-impl<SA, K, V> CodecFrom<BiDiMapper<SA, K, V>> for MultiValueEncoded<SA, MultiValue2<K, V>>
+impl<SA, K, V> CodecFrom<BiDiMapper<SA, K, V, CurrentStorage>>
+    for MultiValueEncoded<SA, MultiValue2<K, V>>
 where
     SA: StorageMapperApi,
     K: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static + Default + PartialEq,
@@ -261,7 +307,7 @@ where
 {
 }
 
-impl<SA, K, V> TypeAbi for BiDiMapper<SA, K, V>
+impl<SA, K, V> TypeAbi for BiDiMapper<SA, K, V, CurrentStorage>
 where
     SA: StorageMapperApi,
     K: TopEncode
diff --git a/framework/base/src/storage/mappers/unordered_set_mapper.rs b/framework/base/src/storage/mappers/unordered_set_mapper.rs
index 6e52d62662..fa151759ea 100644
--- a/framework/base/src/storage/mappers/unordered_set_mapper.rs
+++ b/framework/base/src/storage/mappers/unordered_set_mapper.rs
@@ -1,7 +1,10 @@
 use core::marker::PhantomData;
 
 pub use super::vec_mapper::Iter;
-use super::{StorageClearable, StorageMapper, VecMapper};
+use super::{
+    set_mapper::{CurrentStorage, StorageAddress},
+    StorageClearable, StorageMapper, VecMapper,
+};
 use crate::{
     abi::{TypeAbi, TypeDescriptionContainer, TypeName},
     api::StorageMapperApi,
@@ -9,25 +12,27 @@ use crate::{
         multi_encode_iter_or_handle_err, CodecFrom, EncodeErrorHandler, NestedDecode, NestedEncode,
         TopDecode, TopEncode, TopEncodeMulti, TopEncodeMultiOutput,
     },
-    storage::{storage_get_from_address, StorageKey},
-    storage_clear, storage_get, storage_set,
+    storage::StorageKey,
+    storage_clear, storage_set,
     types::{ManagedAddress, ManagedType, MultiValueEncoded},
 };
 
 const ITEM_INDEX: &[u8] = b".index";
 const NULL_ENTRY: usize = 0;
 
-pub struct UnorderedSetMapper<SA, T>
+pub struct UnorderedSetMapper<SA, T, A = CurrentStorage>
 where
     SA: StorageMapperApi,
+    A: StorageAddress<SA>,
     T: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static,
 {
     _phantom_api: PhantomData<SA>,
+    address: A,
     base_key: StorageKey<SA>,
-    vec_mapper: VecMapper<SA, T>,
+    vec_mapper: VecMapper<SA, T, A>,
 }
 
-impl<SA, T> StorageMapper<SA> for UnorderedSetMapper<SA, T>
+impl<SA, T> StorageMapper<SA> for UnorderedSetMapper<SA, T, CurrentStorage>
 where
     SA: StorageMapperApi,
     T: TopEncode + TopDecode + NestedEncode + NestedDecode,
@@ -35,13 +40,29 @@ where
     fn new(base_key: StorageKey<SA>) -> Self {
         UnorderedSetMapper {
             _phantom_api: PhantomData,
+            address: CurrentStorage,
             base_key: base_key.clone(),
             vec_mapper: VecMapper::<SA, T>::new(base_key),
         }
     }
 }
 
-impl<SA, T> StorageClearable for UnorderedSetMapper<SA, T>
+impl<SA, T> UnorderedSetMapper<SA, T, ManagedAddress<SA>>
+where
+    SA: StorageMapperApi,
+    T: TopEncode + TopDecode + NestedEncode + NestedDecode,
+{
+    pub fn new_from_address(address: ManagedAddress<SA>, base_key: StorageKey<SA>) -> Self {
+        UnorderedSetMapper {
+            _phantom_api: PhantomData,
+            address: address.clone(),
+            base_key: base_key.clone(),
+            vec_mapper: VecMapper::new_from_address(address, base_key),
+        }
+    }
+}
+
+impl<SA, T> StorageClearable for UnorderedSetMapper<SA, T, CurrentStorage>
 where
     SA: StorageMapperApi,
     T: TopEncode + TopDecode + NestedEncode + NestedDecode,
@@ -54,9 +75,10 @@ where
     }
 }
 
-impl<SA, T> UnorderedSetMapper<SA, T>
+impl<SA, T, A> UnorderedSetMapper<SA, T, A>
 where
     SA: StorageMapperApi,
+    A: StorageAddress<SA>,
     T: TopEncode + TopDecode + NestedEncode + NestedDecode,
 {
     fn item_index_key(&self, value: &T) -> StorageKey<SA> {
@@ -66,64 +88,52 @@ where
         item_key
     }
 
-    pub fn get_index(&self, value: &T) -> usize {
-        storage_get(self.item_index_key(value).as_ref())
-    }
-
     /// Gets the item's index at the given address' mapper.
     /// Returns `0` if the item is not in the list.
-    pub fn get_index_at_address(&self, address: &ManagedAddress<SA>, value: &T) -> usize {
-        storage_get_from_address(address.as_ref(), self.item_index_key(value).as_ref())
+    pub fn get_index(&self, value: &T) -> usize {
+        self.address
+            .address_storage_get(self.item_index_key(value).as_ref())
     }
 
-    /// Get item at index from storage.
+    /// Get item at index from the given address.
     /// Index must be valid (1 <= index <= count).
     pub fn get_by_index(&self, index: usize) -> T {
         self.vec_mapper.get(index)
     }
 
-    /// Gets the item by index from the given address.
-    /// Index must be valid (1 <= index <= count).
-    pub fn get_by_index_at_address(&self, address: &ManagedAddress<SA>, index: usize) -> T {
-        self.vec_mapper.get_at_address(address, index)
-    }
-
-    fn set_index(&self, value: &T, index: usize) {
-        storage_set(self.item_index_key(value).as_ref(), &index);
-    }
-
-    fn clear_index(&self, value: &T) {
-        storage_clear(self.item_index_key(value).as_ref());
-    }
-
     /// Returns `true` if the set contains no elements.
     pub fn is_empty(&self) -> bool {
         self.vec_mapper.is_empty()
     }
 
-    /// Returns `true` if the address' mapper contains no elements.
-    pub fn is_empty_at_address(&self, address: &ManagedAddress<SA>) -> bool {
-        self.vec_mapper.is_empty_at_address(address)
-    }
-
     /// Returns the number of elements in the set.
     pub fn len(&self) -> usize {
         self.vec_mapper.len()
     }
 
-    /// Returns the number of elements contained in the given address' mapper.
-    pub fn len_at_address(&self, address: &ManagedAddress<SA>) -> usize {
-        self.vec_mapper.len_at_address(address)
-    }
-
     /// Returns `true` if the set contains a value.
     pub fn contains(&self, value: &T) -> bool {
         self.get_index(value) != NULL_ENTRY
     }
 
-    /// Returns `true` if the mapper at the given address contains the value.
-    pub fn contains_at_address(&self, address: &ManagedAddress<SA>, value: &T) -> bool {
-        self.get_index_at_address(address, value) != NULL_ENTRY
+    /// An iterator visiting all elements in arbitrary order.
+    /// The iterator element type is `&'a T`.
+    pub fn iter(&self) -> Iter<SA, T, A> {
+        self.vec_mapper.iter()
+    }
+}
+
+impl<SA, T> UnorderedSetMapper<SA, T, CurrentStorage>
+where
+    SA: StorageMapperApi,
+    T: TopEncode + TopDecode + NestedEncode + NestedDecode,
+{
+    fn set_index(&self, value: &T, index: usize) {
+        storage_set(self.item_index_key(value).as_ref(), &index);
+    }
+
+    fn clear_index(&self, value: &T) {
+        storage_clear(self.item_index_key(value).as_ref());
     }
 
     /// Adds a value to the set.
@@ -168,22 +178,17 @@ where
         self.set_index(&value2, index1);
         true
     }
-
-    /// An iterator visiting all elements in arbitrary order.
-    /// The iterator element type is `&'a T`.
-    pub fn iter(&self) -> Iter<SA, T> {
-        self.vec_mapper.iter()
-    }
 }
 
-impl<'a, SA, T> IntoIterator for &'a UnorderedSetMapper<SA, T>
+impl<'a, SA, T, A> IntoIterator for &'a UnorderedSetMapper<SA, T, A>
 where
     SA: StorageMapperApi,
+    A: StorageAddress<SA>,
     T: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static,
 {
     type Item = T;
 
-    type IntoIter = Iter<'a, SA, T>;
+    type IntoIter = Iter<'a, SA, T, A>;
 
     fn into_iter(self) -> Self::IntoIter {
         self.iter()
diff --git a/framework/base/src/storage/mappers/vec_mapper.rs b/framework/base/src/storage/mappers/vec_mapper.rs
index f0c761067f..683d33aa04 100644
--- a/framework/base/src/storage/mappers/vec_mapper.rs
+++ b/framework/base/src/storage/mappers/vec_mapper.rs
@@ -1,4 +1,7 @@
-use super::{StorageClearable, StorageMapper};
+use super::{
+    set_mapper::{CurrentStorage, StorageAddress},
+    StorageClearable, StorageMapper,
+};
 use crate::{
     abi::{TypeAbi, TypeDescriptionContainer, TypeName},
     api::{ErrorApiImpl, StorageMapperApi},
@@ -6,14 +9,11 @@ use crate::{
         multi_encode_iter_or_handle_err, CodecFrom, EncodeErrorHandler, TopDecode, TopEncode,
         TopEncodeMulti, TopEncodeMultiOutput,
     },
-    storage::{
-        storage_clear, storage_get, storage_get_from_address, storage_get_len, storage_set,
-        StorageKey,
-    },
+    storage::{storage_clear, storage_set, StorageKey},
+    storage_get_len,
     types::{ManagedAddress, ManagedType, MultiValueEncoded},
 };
 use core::{marker::PhantomData, usize};
-use storage_get_from_address::storage_get_len_from_address;
 
 const ITEM_SUFFIX: &[u8] = b".item";
 const LEN_SUFFIX: &[u8] = b".len";
@@ -26,18 +26,19 @@ static INDEX_OUT_OF_RANGE_ERR_MSG: &[u8] = b"index out of range";
 /// Indexes start from 1, instead of 0. (We avoid 0-value indexes to prevent confusion between an uninitialized variable and zero.)
 /// It also stores the count separately, at what would be index 0.
 /// The count is always kept in sync automatically.
-pub struct VecMapper<SA, T>
+pub struct VecMapper<SA, T, A = CurrentStorage>
 where
     SA: StorageMapperApi,
     T: TopEncode + TopDecode + 'static,
 {
     _phantom_api: PhantomData<SA>,
+    address: A,
     base_key: StorageKey<SA>,
     len_key: StorageKey<SA>,
     _phantom_item: PhantomData<T>,
 }
 
-impl<SA, T> StorageMapper<SA> for VecMapper<SA, T>
+impl<SA, T> StorageMapper<SA> for VecMapper<SA, T, CurrentStorage>
 where
     SA: StorageMapperApi,
     T: TopEncode + TopDecode,
@@ -48,6 +49,7 @@ where
 
         VecMapper {
             _phantom_api: PhantomData,
+            address: CurrentStorage,
             base_key,
             len_key,
             _phantom_item: PhantomData,
@@ -55,7 +57,26 @@ where
     }
 }
 
-impl<SA, T> StorageClearable for VecMapper<SA, T>
+impl<SA, T> VecMapper<SA, T, ManagedAddress<SA>>
+where
+    SA: StorageMapperApi,
+    T: TopEncode + TopDecode,
+{
+    pub fn new_from_address(address: ManagedAddress<SA>, base_key: StorageKey<SA>) -> Self {
+        let mut len_key = base_key.clone();
+        len_key.append_bytes(LEN_SUFFIX);
+
+        VecMapper {
+            _phantom_api: PhantomData,
+            address,
+            base_key,
+            len_key,
+            _phantom_item: PhantomData,
+        }
+    }
+}
+
+impl<SA, T> StorageClearable for VecMapper<SA, T, CurrentStorage>
 where
     SA: StorageMapperApi,
     T: TopEncode + TopDecode,
@@ -65,9 +86,10 @@ where
     }
 }
 
-impl<SA, T> VecMapper<SA, T>
+impl<SA, T, A> VecMapper<SA, T, A>
 where
     SA: StorageMapperApi,
+    A: StorageAddress<SA>,
     T: TopEncode + TopDecode,
 {
     fn item_key(&self, index: usize) -> StorageKey<SA> {
@@ -77,18 +99,9 @@ where
         item_key
     }
 
-    fn save_count(&self, new_len: usize) {
-        storage_set(self.len_key.as_ref(), &new_len);
-    }
-
     /// Number of items managed by the mapper.
     pub fn len(&self) -> usize {
-        storage_get(self.len_key.as_ref())
-    }
-
-    /// Number of items in the mapper at the given address.
-    pub fn len_at_address(&self, address: &ManagedAddress<SA>) -> usize {
-        storage_get_from_address(address.as_ref(), self.len_key.as_ref())
+        self.address.address_storage_get(self.len_key.as_ref())
     }
 
     /// True if no items present in the mapper.
@@ -96,33 +109,6 @@ where
         self.len() == 0
     }
 
-    pub fn is_empty_at_address(&self, address: &ManagedAddress<SA>) -> bool {
-        self.len_at_address(address) == 0
-    }
-
-    /// Add one item at the end of the list.
-    /// Returns the index of the newly inserted item, which is also equal to the new number of elements.
-    pub fn push(&mut self, item: &T) -> usize {
-        let mut len = self.len();
-        len += 1;
-        storage_set(self.item_key(len).as_ref(), item);
-        self.save_count(len);
-        len
-    }
-
-    /// Adds multiple items at the end of the list.
-    /// Cheaper than multiple `push`-es because the count only gets updated once at the end.
-    /// Returns the index of the last inserted item, which is also equal to the new number of elements.
-    pub fn extend_from_slice(&mut self, items: &[T]) -> usize {
-        let mut len = self.len();
-        for item in items {
-            len += 1;
-            storage_set(self.item_key(len).as_ref(), item);
-        }
-        self.save_count(len);
-        len
-    }
-
     /// Get item at index from storage.
     /// Index must be valid (1 <= index <= count).
     pub fn get(&self, index: usize) -> T {
@@ -132,26 +118,12 @@ where
         self.get_unchecked(index)
     }
 
-    /// Get the item at index from the target's storage.
-    /// Index must be valid (1 <= index <= count).
-    pub fn get_at_address(&self, address: &ManagedAddress<SA>, index: usize) -> T {
-        if index == 0 || index > self.len_at_address(address) {
-            SA::error_api_impl().signal_error(INDEX_OUT_OF_RANGE_ERR_MSG);
-        }
-        self.get_unchecked_at_address(address, index)
-    }
-
     /// Get item at index from storage.
     /// There are no restrictions on the index,
     /// calling for an invalid index will simply return the zero-value.
     pub fn get_unchecked(&self, index: usize) -> T {
-        storage_get(self.item_key(index).as_ref())
-    }
-
-    /// Gets the item without checking index bounds.
-    /// Prefer using `get_at_address` instead.
-    pub fn get_unchecked_at_address(&self, address: &ManagedAddress<SA>, index: usize) -> T {
-        storage_get_from_address(address.as_ref(), self.item_key(index).as_ref())
+        self.address
+            .address_storage_get(self.item_key(index).as_ref())
     }
 
     /// Get item at index from storage.
@@ -166,6 +138,15 @@ where
         }
     }
 
+    /// Checks whether or not there is anything ins storage at index.
+    /// Index must be valid (1 <= index <= count).
+    pub fn item_is_empty(&self, index: usize) -> bool {
+        if index == 0 || index > self.len() {
+            SA::error_api_impl().signal_error(INDEX_OUT_OF_RANGE_ERR_MSG);
+        }
+        self.item_is_empty_unchecked(index)
+    }
+
     /// Checks whether or not there is anything in storage at index.
     /// There are no restrictions on the index,
     /// calling for an invalid index will simply return `true`.
@@ -173,34 +154,49 @@ where
         storage_get_len(self.item_key(index).as_ref()) == 0
     }
 
-    /// Checks if the mapper at the given address stores anything at this index.
-    /// Does not check index bounds.
-    /// Prefer using `item_is_empty` instead.
-    pub fn item_is_empty_unchecked_at_address(
-        &self,
-        address: &ManagedAddress<SA>,
-        index: usize,
-    ) -> bool {
-        let len = storage_get_len_from_address(address.as_ref(), self.item_key(index).as_ref());
-        len == 0
+    /// Loads all items from storage and places them in a Vec.
+    /// Can easily consume a lot of gas.
+    #[cfg(feature = "alloc")]
+    pub fn load_as_vec(&self) -> alloc::vec::Vec<T> {
+        self.iter().collect()
     }
 
-    /// Checks whether or not there is anything ins storage at index.
-    /// Index must be valid (1 <= index <= count).
-    pub fn item_is_empty(&self, index: usize) -> bool {
-        if index == 0 || index > self.len() {
-            SA::error_api_impl().signal_error(INDEX_OUT_OF_RANGE_ERR_MSG);
-        }
-        self.item_is_empty_unchecked(index)
+    /// Provides a forward iterator.
+    pub fn iter(&self) -> Iter<SA, T, A> {
+        Iter::new(self)
     }
+}
 
-    /// Checks if the mapper at the given address stores anything at this index.
-    /// Index must be valid (1 <= index <= count).
-    pub fn item_is_empty_at_address(&self, address: &ManagedAddress<SA>, index: usize) -> bool {
-        if index == 0 || index > self.len_at_address(address) {
-            SA::error_api_impl().signal_error(INDEX_OUT_OF_RANGE_ERR_MSG);
+impl<SA, T> VecMapper<SA, T, CurrentStorage>
+where
+    SA: StorageMapperApi,
+    T: TopEncode + TopDecode,
+{
+    fn save_count(&self, new_len: usize) {
+        storage_set(self.len_key.as_ref(), &new_len);
+    }
+
+    /// Add one item at the end of the list.
+    /// Returns the index of the newly inserted item, which is also equal to the new number of elements.
+    pub fn push(&mut self, item: &T) -> usize {
+        let mut len = self.len();
+        len += 1;
+        storage_set(self.item_key(len).as_ref(), item);
+        self.save_count(len);
+        len
+    }
+
+    /// Adds multiple items at the end of the list.
+    /// Cheaper than multiple `push`-es because the count only gets updated once at the end.
+    /// Returns the index of the last inserted item, which is also equal to the new number of elements.
+    pub fn extend_from_slice(&mut self, items: &[T]) -> usize {
+        let mut len = self.len();
+        for item in items {
+            len += 1;
+            storage_set(self.item_key(len).as_ref(), item);
         }
-        self.item_is_empty_unchecked_at_address(address, index)
+        self.save_count(len);
+        len
     }
 
     /// Set item at index in storage.
@@ -257,13 +253,6 @@ where
         last_item_as_option
     }
 
-    /// Loads all items from storage and places them in a Vec.
-    /// Can easily consume a lot of gas.
-    #[cfg(feature = "alloc")]
-    pub fn load_as_vec(&self) -> alloc::vec::Vec<T> {
-        self.iter().collect()
-    }
-
     /// Deletes all contents form storage and sets count to 0.
     /// Can easily consume a lot of gas.
     pub fn clear(&mut self) {
@@ -273,21 +262,17 @@ where
         }
         self.save_count(0);
     }
-
-    /// Provides a forward iterator.
-    pub fn iter(&self) -> Iter<SA, T> {
-        Iter::new(self)
-    }
 }
 
-impl<'a, SA, T> IntoIterator for &'a VecMapper<SA, T>
+impl<'a, SA, T, A> IntoIterator for &'a VecMapper<SA, T, A>
 where
     SA: StorageMapperApi,
+    A: StorageAddress<SA>,
     T: TopEncode + TopDecode + 'static,
 {
     type Item = T;
 
-    type IntoIter = Iter<'a, SA, T>;
+    type IntoIter = Iter<'a, SA, T, A>;
 
     fn into_iter(self) -> Self::IntoIter {
         self.iter()
@@ -298,22 +283,24 @@ where
 ///
 /// This `struct` is created by [`VecMapper::iter()`]. See its
 /// documentation for more.
-pub struct Iter<'a, SA, T>
+pub struct Iter<'a, SA, T, A>
 where
     SA: StorageMapperApi,
+    A: StorageAddress<SA>,
     T: TopEncode + TopDecode + 'static,
 {
     index: usize,
     len: usize,
-    vec: &'a VecMapper<SA, T>,
+    vec: &'a VecMapper<SA, T, A>,
 }
 
-impl<'a, SA, T> Iter<'a, SA, T>
+impl<'a, SA, T, A> Iter<'a, SA, T, A>
 where
     SA: StorageMapperApi,
+    A: StorageAddress<SA>,
     T: TopEncode + TopDecode + 'static,
 {
-    fn new(vec: &'a VecMapper<SA, T>) -> Iter<'a, SA, T> {
+    fn new(vec: &'a VecMapper<SA, T, A>) -> Iter<'a, SA, T, A> {
         Iter {
             index: 1,
             len: vec.len(),
@@ -322,9 +309,10 @@ where
     }
 }
 
-impl<'a, SA, T> Iterator for Iter<'a, SA, T>
+impl<'a, SA, T, A> Iterator for Iter<'a, SA, T, A>
 where
     SA: StorageMapperApi,
+    A: StorageAddress<SA>,
     T: TopEncode + TopDecode + 'static,
 {
     type Item = T;
@@ -341,7 +329,7 @@ where
 }
 
 /// Behaves like a MultiResultVec when an endpoint result.
-impl<SA, T> TopEncodeMulti for VecMapper<SA, T>
+impl<SA, T> TopEncodeMulti for VecMapper<SA, T, CurrentStorage>
 where
     SA: StorageMapperApi,
     T: TopEncode + TopDecode,
@@ -355,7 +343,7 @@ where
     }
 }
 
-impl<SA, T> CodecFrom<VecMapper<SA, T>> for MultiValueEncoded<SA, T>
+impl<SA, T> CodecFrom<VecMapper<SA, T, CurrentStorage>> for MultiValueEncoded<SA, T>
 where
     SA: StorageMapperApi,
     T: TopEncode + TopDecode,
@@ -363,7 +351,7 @@ where
 }
 
 /// Behaves like a MultiResultVec when an endpoint result.
-impl<SA, T> TypeAbi for VecMapper<SA, T>
+impl<SA, T> TypeAbi for VecMapper<SA, T, CurrentStorage>
 where
     SA: StorageMapperApi,
     T: TopEncode + TopDecode + TypeAbi,

From 74d9d486444dd2e558375956c850c50341635ce7 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Mon, 29 Jan 2024 11:03:09 +0100
Subject: [PATCH 0270/1254] 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<VHB: VMHooksApiBackend> BlockchainApiImpl for VMHooksApi<VHB> {
         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 <mihaicalin.luca10@gmail.com>
Date: Mon, 29 Jan 2024 11:53:52 +0100
Subject: [PATCH 0271/1254] 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<A>) -> bool {
+        A::blockchain_api_impl().managed_is_builtin_function(function_name.get_handle())
+    }
+
     #[inline]
     pub fn get_sc_balance(&self, token: &EgldOrEsdtTokenIdentifier<A>, nonce: u64) -> BigUint<A> {
         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 <andrei.marinica@multiversx.com>
Date: Mon, 29 Jan 2024 13:21:50 +0200
Subject: [PATCH 0272/1254] 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 <andrei.marinica@multiversx.com>
Date: Mon, 29 Jan 2024 13:24:04 +0200
Subject: [PATCH 0273/1254] 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 <andrei.marinica@multiversx.com>
Date: Mon, 29 Jan 2024 13:25:06 +0200
Subject: [PATCH 0274/1254] 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 4db16b156c909173468823eb0efbe8635c218528 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Mon, 29 Jan 2024 12:37:40 +0100
Subject: [PATCH 0275/1254] test fix for vecmapper

---
 .../basic-features/src/storage_mapper_vec.rs             | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/contracts/feature-tests/basic-features/src/storage_mapper_vec.rs b/contracts/feature-tests/basic-features/src/storage_mapper_vec.rs
index 6f05c290b4..e8854806cb 100644
--- a/contracts/feature-tests/basic-features/src/storage_mapper_vec.rs
+++ b/contracts/feature-tests/basic-features/src/storage_mapper_vec.rs
@@ -1,3 +1,5 @@
+use multiversx_sc::storage::StorageKey;
+
 multiversx_sc::imports!();
 
 /// Storage mapper test.
@@ -20,7 +22,8 @@ pub trait VecMapperFeatures {
 
     #[view]
     fn vec_mapper_get_at_address(&self, address: ManagedAddress, index: usize) -> u32 {
-        self.vec_mapper().get_at_address(&address, index)
+        let mapper = VecMapper::new_from_address(address, StorageKey::from("vec_mapper"));
+        mapper.get(index)
     }
 
     #[view]
@@ -30,6 +33,8 @@ pub trait VecMapperFeatures {
 
     #[view]
     fn vec_mapper_len_at_address(&self, address: ManagedAddress) -> usize {
-        self.vec_mapper().len_at_address(&address)
+        let mapper: VecMapper<Self::Api, u32, _> =
+            VecMapper::new_from_address(address, StorageKey::from("vec_mapper"));
+        mapper.len()
     }
 }

From 73dd0518ee9295fbad5e1393a9c78e39054a5a37 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Mon, 29 Jan 2024 14:09:09 +0200
Subject: [PATCH 0276/1254] 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 <andrei.marinica@multiversx.com>
Date: Mon, 29 Jan 2024 14:12:30 +0200
Subject: [PATCH 0277/1254] 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 <claudiu.bruda@multiversx.com>",
     "MultiversX <contact@multiversx.com>",
@@ -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 <dorin.iancu@multiversx.com>",
@@ -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 <alin.cruceat@multiversx.com>"]
 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 <claudiu.bruda@multiversx.com>"]
 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 <claudiu.bruda@multiversx.com>"]
 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 <contact@multiversx.com>"]
@@ -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 <dorin.iancu@multiversx.com>", "Andrei Marinica <andrei.marinica@multiversx.com>", "MultiversX <contact@multiversx.com>"]
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 <andrei.marinica@multiversx.com>", "MultiversX <contact@multiversx.com>"]
@@ -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 <andrei.marinica@multiversx.com>", "MultiversX <contact@multiversx.com>"]
@@ -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 <andrei.marinica@multiversx.com>", "MultiversX <contact@multiversx.com>"]
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::<String>::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 <contact@multiversx.com>"]
@@ -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 <andrei.marinica@multiversx.com>", "MultiversX <contact@multiversx.com>"]
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 <andrei.marinica@multiversx.com>
Date: Mon, 29 Jan 2024 14:21:01 +0200
Subject: [PATCH 0278/1254] 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",
 ]

From a9ba0129f9d84ca1294284e38e5608f6ec7df71c Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Mon, 29 Jan 2024 14:40:37 +0200
Subject: [PATCH 0279/1254] add report in mxsc.json

---
 .../base/src/storage/mappers/queue_mapper.rs  |  2 +-
 .../src/cmd/contract/sc_config/wasm_build.rs  | 36 ++++++++++++++-----
 framework/meta/src/ei_check_json.rs           | 29 +++++++++++++++
 framework/meta/src/lib.rs                     |  2 ++
 framework/meta/src/mxsc_file_json.rs          |  6 +++-
 framework/meta/src/report_info_json.rs        | 28 +++++++++++++++
 6 files changed, 92 insertions(+), 11 deletions(-)
 create mode 100644 framework/meta/src/ei_check_json.rs
 create mode 100644 framework/meta/src/report_info_json.rs

diff --git a/framework/base/src/storage/mappers/queue_mapper.rs b/framework/base/src/storage/mappers/queue_mapper.rs
index 0a20c1495a..124584ea0a 100644
--- a/framework/base/src/storage/mappers/queue_mapper.rs
+++ b/framework/base/src/storage/mappers/queue_mapper.rs
@@ -280,7 +280,7 @@ where
         QueueMapper {
             _phantom_api: PhantomData::<SA>,
             address,
-            base_key: base_key.clone(),
+            base_key,
             _phantom_item: PhantomData::<T>,
         }
     }
diff --git a/framework/meta/src/cmd/contract/sc_config/wasm_build.rs b/framework/meta/src/cmd/contract/sc_config/wasm_build.rs
index 368b0d0ed6..7132374ce7 100644
--- a/framework/meta/src/cmd/contract/sc_config/wasm_build.rs
+++ b/framework/meta/src/cmd/contract/sc_config/wasm_build.rs
@@ -5,8 +5,10 @@ use crate::{
     abi_json::ContractAbiJson,
     cli_args::BuildArgs,
     ei::EIVersion,
+    ei_check_json::EiCheckJson,
     mxsc_file_json::{save_mxsc_file_json, MxscFileJson},
     print_util::*,
+    report_info_json::ReportInfoJson,
     tools::{self, WasmInfo},
 };
 
@@ -69,12 +71,12 @@ impl ContractVariant {
 
     fn finalize_build(&self, build_args: &BuildArgs, output_path: &str) {
         self.copy_contracts_to_output(build_args, output_path);
-        let wasm_data = self.build_wasm_info(build_args, output_path);
+        let mut wasm_data = self.build_wasm_info(build_args, output_path);
         self.run_wasm_opt(build_args, output_path);
         self.run_wasm2wat(build_args, output_path);
-        self.extract_imports(build_args, output_path, wasm_data);
+        let ei_check = self.extract_imports(build_args, output_path, &mut wasm_data);
         self.run_twiggy(build_args, output_path);
-        self.pack_mxsc_file(build_args, output_path);
+        self.pack_mxsc_file(build_args, output_path, wasm_data, ei_check);
     }
 
     fn build_wasm_info(&self, build_args: &BuildArgs, output_path: &str) -> WasmInfo {
@@ -91,7 +93,13 @@ impl ContractVariant {
             .expect("failed to copy compiled contract to output directory");
     }
 
-    fn pack_mxsc_file(&self, build_args: &BuildArgs, output_path: &str) {
+    fn pack_mxsc_file(
+        &self,
+        build_args: &BuildArgs,
+        output_path: &str,
+        wasm_info: WasmInfo,
+        ei_check: Option<EiCheckJson>,
+    ) {
         let output_wasm_path = format!("{output_path}/{}", self.wasm_output_name(build_args));
         let compiled_bytes = fs::read(output_wasm_path).expect("failed to open compiled contract");
         let output_mxsc_path = format!("{output_path}/{}", self.mxsc_file_output_name(build_args));
@@ -99,11 +107,13 @@ impl ContractVariant {
         print_contract_size(compiled_bytes.len());
         let mut abi = ContractAbiJson::from(&self.abi);
         let build_info = core::mem::take(&mut abi.build_info).unwrap();
+        let report = ReportInfoJson::new(&wasm_info, ei_check);
         let mxsc_file_json = MxscFileJson {
             build_info,
             abi,
             size: compiled_bytes.len(),
             code: hex::encode(compiled_bytes),
+            report,
         };
 
         save_mxsc_file_json(&mxsc_file_json, output_mxsc_path);
@@ -130,9 +140,14 @@ impl ContractVariant {
         tools::wasm_to_wat(output_wasm_path.as_str(), output_wat_path.as_str());
     }
 
-    fn extract_imports(&self, build_args: &BuildArgs, output_path: &str, mut wasm_data: WasmInfo) {
+    fn extract_imports(
+        &self,
+        build_args: &BuildArgs,
+        output_path: &str,
+        wasm_data: &mut WasmInfo,
+    ) -> Option<EiCheckJson> {
         if !build_args.extract_imports {
-            return;
+            return None;
         }
 
         let output_wasm_path = format!("{output_path}/{}", self.wasm_output_name(build_args));
@@ -147,7 +162,7 @@ impl ContractVariant {
             output_imports_json_path.as_str(),
             wasm_data.imports.as_slice(),
         );
-        validate_ei(&wasm_data.imports, &self.settings.check_ei);
+        validate_ei(&wasm_data.imports, &self.settings.check_ei)
     }
 }
 
@@ -156,9 +171,9 @@ fn write_imports_output(dest_path: &str, import_names: &[String]) {
     fs::write(dest_path, json).expect("failed to write imports json file");
 }
 
-fn validate_ei(import_names: &[String], check_ei: &Option<EIVersion>) {
+fn validate_ei(import_names: &[String], check_ei: &Option<EIVersion>) -> Option<EiCheckJson> {
     if let Some(ei) = check_ei {
-        print_check_ei(ei.name());
+        print_check_ei(ei.name()); //
         let mut num_errors = 0;
         for import_name in import_names {
             if !ei.contains_vm_hook(import_name) {
@@ -168,9 +183,12 @@ fn validate_ei(import_names: &[String], check_ei: &Option<EIVersion>) {
         }
         if num_errors == 0 {
             print_check_ei_ok();
+            return Some(EiCheckJson::new(check_ei, true));
         }
+        Some(EiCheckJson::new(check_ei, false))
     } else {
         print_ignore_ei_check();
+        None
     }
 }
 
diff --git a/framework/meta/src/ei_check_json.rs b/framework/meta/src/ei_check_json.rs
new file mode 100644
index 0000000000..02b0372d34
--- /dev/null
+++ b/framework/meta/src/ei_check_json.rs
@@ -0,0 +1,29 @@
+use serde::{Deserialize, Serialize};
+
+use crate::ei::EIVersion;
+
+#[derive(Serialize, Deserialize, Default)]
+#[serde(rename_all = "camelCase")]
+pub struct EiCheckJson {
+    #[serde(default)]
+    pub ei_version: String,
+
+    #[serde(default)]
+    pub ok: bool,
+}
+
+impl EiCheckJson {
+    pub fn new(check_ei: &Option<EIVersion>, status: bool) -> Self {
+        EiCheckJson {
+            ei_version: get_ei_version(check_ei),
+            ok: status,
+        }
+    }
+}
+
+fn get_ei_version(check_ei: &Option<EIVersion>) -> String {
+    match check_ei {
+        Some(ei) => ei.name().to_string(),
+        None => "ignore".to_string(),
+    }
+}
diff --git a/framework/meta/src/lib.rs b/framework/meta/src/lib.rs
index f543392f2a..718ad4eea9 100644
--- a/framework/meta/src/lib.rs
+++ b/framework/meta/src/lib.rs
@@ -3,10 +3,12 @@ mod cargo_toml_contents;
 pub mod cli_args;
 pub mod cmd;
 pub mod ei;
+mod ei_check_json;
 pub mod esdt_attr_file_json;
 pub mod folder_structure;
 mod mxsc_file_json;
 mod print_util;
+mod report_info_json;
 mod tools;
 pub use tools::find_workspace;
 pub mod version;
diff --git a/framework/meta/src/mxsc_file_json.rs b/framework/meta/src/mxsc_file_json.rs
index b2181fa6e1..47cf44ca28 100644
--- a/framework/meta/src/mxsc_file_json.rs
+++ b/framework/meta/src/mxsc_file_json.rs
@@ -1,7 +1,10 @@
 use serde::{Deserialize, Serialize};
 use std::{fs::File, io::Write, path::Path};
 
-use crate::abi_json::{BuildInfoAbiJson, ContractAbiJson};
+use crate::{
+    abi_json::{BuildInfoAbiJson, ContractAbiJson},
+    report_info_json::ReportInfoJson,
+};
 
 #[derive(Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
@@ -10,6 +13,7 @@ pub struct MxscFileJson {
     pub abi: ContractAbiJson,
     pub size: usize,
     pub code: String,
+    pub report: ReportInfoJson,
 }
 
 pub fn serialize_mxsc_file_json(mxsc_file_json: &MxscFileJson) -> String {
diff --git a/framework/meta/src/report_info_json.rs b/framework/meta/src/report_info_json.rs
new file mode 100644
index 0000000000..d3c7008585
--- /dev/null
+++ b/framework/meta/src/report_info_json.rs
@@ -0,0 +1,28 @@
+use serde::{Deserialize, Serialize};
+
+use crate::{ei_check_json::EiCheckJson, tools::WasmInfo};
+
+#[derive(Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct ReportInfoJson {
+    #[serde(default)]
+    #[serde(skip_serializing_if = "Vec::is_empty")]
+    pub imports: Vec<String>,
+
+    #[serde(default)]
+    pub memory_allocation_error: bool,
+
+    #[serde(default)]
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub ei_check: Option<EiCheckJson>,
+}
+
+impl ReportInfoJson {
+    pub fn new(wasm_info: &WasmInfo, ei_check_info: Option<EiCheckJson>) -> Self {
+        ReportInfoJson {
+            imports: wasm_info.imports.iter().map(|i| i.to_string()).collect(),
+            memory_allocation_error: wasm_info.allocator_trigger,
+            ei_check: ei_check_info,
+        }
+    }
+}

From 236a4798c58b4c66390c0ff64d046dacf2f5b2ce Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Mon, 29 Jan 2024 14:53:10 +0100
Subject: [PATCH 0280/1254] single value mapper and whitelist mapper

---
 .../src/storage_mapper_single.rs              | 10 +-
 .../src/storage_mapper_whitelist.rs           | 11 ++-
 .../storage/mappers/single_value_mapper.rs    | 95 ++++++++++++-------
 .../src/storage/mappers/whitelist_mapper.rs   | 77 +++++++++++----
 4 files changed, 132 insertions(+), 61 deletions(-)

diff --git a/contracts/feature-tests/basic-features/src/storage_mapper_single.rs b/contracts/feature-tests/basic-features/src/storage_mapper_single.rs
index 64972340d5..f4604e3e73 100644
--- a/contracts/feature-tests/basic-features/src/storage_mapper_single.rs
+++ b/contracts/feature-tests/basic-features/src/storage_mapper_single.rs
@@ -1,3 +1,5 @@
+use multiversx_sc::storage::StorageKey;
+
 multiversx_sc::imports!();
 
 /// Storage mapper test.
@@ -53,8 +55,12 @@ pub trait SingleValueMapperFeatures {
 
     #[endpoint]
     fn is_empty_at_address_single_value_mapper(&self, address: ManagedAddress) -> bool {
-        self.map_my_single_value_mapper()
-            .is_empty_at_address(&address)
+        let mapper: SingleValueMapper<Self::Api, BigInt, _> = SingleValueMapper::new_from_address(
+            address,
+            StorageKey::from("my_single_value_mapper"),
+        );
+
+        mapper.is_empty()
     }
 
     #[endpoint]
diff --git a/contracts/feature-tests/basic-features/src/storage_mapper_whitelist.rs b/contracts/feature-tests/basic-features/src/storage_mapper_whitelist.rs
index 7a0974f370..a02e706b91 100644
--- a/contracts/feature-tests/basic-features/src/storage_mapper_whitelist.rs
+++ b/contracts/feature-tests/basic-features/src/storage_mapper_whitelist.rs
@@ -1,3 +1,5 @@
+use multiversx_sc::storage::StorageKey;
+
 multiversx_sc::imports!();
 
 #[multiversx_sc::module]
@@ -19,7 +21,9 @@ pub trait StorageMapperWhitelistFeatures {
 
     #[endpoint]
     fn check_contains_at_address(&self, address: ManagedAddress, item: ManagedBuffer) -> bool {
-        self.whitelist_mapper().contains_at_address(&address, &item)
+        let mapper =
+            WhitelistMapper::new_from_address(address, StorageKey::from("whitelistMapper"));
+        mapper.contains(&item)
     }
 
     #[endpoint]
@@ -29,8 +33,9 @@ pub trait StorageMapperWhitelistFeatures {
 
     #[endpoint]
     fn require_contains_at_address(&self, address: ManagedAddress, item: ManagedBuffer) {
-        self.whitelist_mapper()
-            .require_whitelisted_at_address(&address, &item);
+        let mapper =
+            WhitelistMapper::new_from_address(address, StorageKey::from("whitelistMapper"));
+        mapper.require_whitelisted(&item)
     }
 
     #[storage_mapper("whitelistMapper")]
diff --git a/framework/base/src/storage/mappers/single_value_mapper.rs b/framework/base/src/storage/mappers/single_value_mapper.rs
index cc6763e9be..e7b2ab20f4 100644
--- a/framework/base/src/storage/mappers/single_value_mapper.rs
+++ b/framework/base/src/storage/mappers/single_value_mapper.rs
@@ -1,6 +1,9 @@
 use core::{borrow::Borrow, marker::PhantomData};
 
-use super::StorageMapper;
+use super::{
+    set_mapper::{CurrentStorage, StorageAddress},
+    StorageMapper,
+};
 use crate::{
     abi::{TypeAbi, TypeDescriptionContainer, TypeName},
     api::StorageMapperApi,
@@ -9,26 +12,24 @@ use crate::{
         EncodeErrorHandler, TopDecode, TopDecodeInput, TopEncode, TopEncodeMulti,
         TopEncodeMultiOutput, TopEncodeOutput,
     },
-    storage::{
-        storage_clear, storage_get, storage_get_from_address, storage_get_len, storage_set,
-        StorageKey,
-    },
+    storage::{storage_clear, storage_get_len, storage_set, StorageKey},
     types::{ManagedAddress, ManagedType},
 };
-use storage_get_from_address::storage_get_len_from_address;
 
 /// Manages a single serializable item in storage.
-pub struct SingleValueMapper<SA, T>
+pub struct SingleValueMapper<SA, T, A = CurrentStorage>
 where
     SA: StorageMapperApi,
+    A: StorageAddress<SA>,
     T: TopEncode + TopDecode + 'static,
 {
+    address: A,
     key: StorageKey<SA>,
     _phantom_api: PhantomData<SA>,
     _phantom_item: PhantomData<T>,
 }
 
-impl<SA, T> StorageMapper<SA> for SingleValueMapper<SA, T>
+impl<SA, T> StorageMapper<SA> for SingleValueMapper<SA, T, CurrentStorage>
 where
     SA: StorageMapperApi,
     T: TopEncode + TopDecode,
@@ -36,6 +37,7 @@ where
     #[inline]
     fn new(base_key: StorageKey<SA>) -> Self {
         SingleValueMapper {
+            address: CurrentStorage,
             key: base_key,
             _phantom_api: PhantomData,
             _phantom_item: PhantomData,
@@ -43,19 +45,31 @@ where
     }
 }
 
-impl<SA, T> SingleValueMapper<SA, T>
+impl<SA, T> SingleValueMapper<SA, T, ManagedAddress<SA>>
 where
     SA: StorageMapperApi,
     T: TopEncode + TopDecode,
 {
-    /// Retrieves current value from storage.
-    pub fn get(&self) -> T {
-        storage_get(self.key.as_ref())
+    #[inline]
+    pub fn new_from_address(address: ManagedAddress<SA>, base_key: StorageKey<SA>) -> Self {
+        SingleValueMapper {
+            address,
+            key: base_key,
+            _phantom_api: PhantomData,
+            _phantom_item: PhantomData,
+        }
     }
+}
 
-    /// Gets the value from the given address. Both adresses have to be in the same shard.
-    pub fn get_from_address(&self, address: &ManagedAddress<SA>) -> T {
-        storage_get_from_address(address.as_ref(), self.key.as_ref())
+impl<SA, T, A> SingleValueMapper<SA, T, A>
+where
+    SA: StorageMapperApi,
+    A: StorageAddress<SA>,
+    T: TopEncode + TopDecode,
+{
+    /// Retrieves current value from storage.
+    pub fn get(&self) -> T {
+        self.address.address_storage_get(self.key.as_ref())
     }
 
     /// Returns whether the storage managed by this mapper is empty.
@@ -63,13 +77,16 @@ where
         self.raw_byte_length() == 0
     }
 
-    /// Returns whether the storage at the given key is empty at the given address.
-    /// Both adresses have to be in the same shard.
-    pub fn is_empty_at_address(&self, address: &ManagedAddress<SA>) -> bool {
-        let len = storage_get_len_from_address(address.as_ref(), self.key.as_ref());
-        len == 0
+    pub fn raw_byte_length(&self) -> usize {
+        storage_get_len(self.key.as_ref())
     }
+}
 
+impl<SA, T> SingleValueMapper<SA, T, CurrentStorage>
+where
+    SA: StorageMapperApi,
+    T: TopEncode + TopDecode,
+{
     /// Saves argument to storage.
     ///
     /// Accepts owned item of type `T`, or any borrowed form of it, such as `&T`.
@@ -107,10 +124,6 @@ where
         result
     }
 
-    pub fn raw_byte_length(&self) -> usize {
-        storage_get_len(self.key.as_ref())
-    }
-
     /// Takes the value out of the storage, clearing it in the process.
     pub fn take(&self) -> T {
         let value = self.get();
@@ -129,7 +142,7 @@ where
     }
 }
 
-impl<SA, T> TopEncodeMulti for SingleValueMapper<SA, T>
+impl<SA, T> TopEncodeMulti for SingleValueMapper<SA, T, CurrentStorage>
 where
     SA: StorageMapperApi,
     T: TopEncode + TopDecode,
@@ -146,9 +159,14 @@ where
 /// Intermediary type for deserializing the result of an endpoint that returns a `SingleValueMapper`.
 ///
 /// Necessary because we cannot implement `CodecFrom` directly on `T`.
-pub struct SingleValue<T: TopDecode>(T);
+pub struct SingleValue<T: TopDecode, SA: StorageMapperApi, A: StorageAddress<SA>>(
+    T,
+    PhantomData<(SA, A)>,
+);
 
-impl<T: TopEncode + TopDecode> TopEncode for SingleValue<T> {
+impl<T: TopEncode + TopDecode, SA: StorageMapperApi> TopEncode
+    for SingleValue<T, SA, CurrentStorage>
+{
     fn top_encode_or_handle_err<O, H>(&self, output: O, h: H) -> Result<(), H::HandledErr>
     where
         O: TopEncodeOutput,
@@ -158,37 +176,44 @@ impl<T: TopEncode + TopDecode> TopEncode for SingleValue<T> {
     }
 }
 
-impl<T: TopDecode> TopDecode for SingleValue<T> {
+impl<T: TopDecode, SA: StorageMapperApi, A: StorageAddress<SA>> TopDecode
+    for SingleValue<T, SA, A>
+{
     fn top_decode_or_handle_err<I, H>(input: I, h: H) -> Result<Self, H::HandledErr>
     where
         I: TopDecodeInput,
         H: DecodeErrorHandler,
     {
-        Ok(SingleValue(T::top_decode_or_handle_err(input, h)?))
+        Ok(SingleValue::<T, SA, A>(
+            T::top_decode_or_handle_err(input, h)?,
+            PhantomData,
+        ))
     }
 }
 
-impl<T: TopDecode> From<T> for SingleValue<T> {
+impl<T: TopDecode, SA: StorageMapperApi, A: StorageAddress<SA>> From<T> for SingleValue<T, SA, A> {
     fn from(value: T) -> Self {
-        SingleValue(value)
+        SingleValue::<T, SA, A>(value, PhantomData)
     }
 }
 
-impl<T: TopDecode> SingleValue<T> {
+impl<T: TopDecode, SA: StorageMapperApi, A: StorageAddress<SA>> SingleValue<T, SA, A> {
     #[inline]
     pub fn into(self) -> T {
         self.0
     }
 }
 
-impl<SA, T> !CodecFromSelf for SingleValueMapper<SA, T>
+impl<SA, T, A> !CodecFromSelf for SingleValueMapper<SA, T, A>
 where
     SA: StorageMapperApi,
+    A: StorageAddress<SA>,
     T: TopEncode + TopDecode,
 {
 }
 
-impl<SA, T, R> CodecFrom<SingleValueMapper<SA, T>> for SingleValue<R>
+impl<SA, T, R> CodecFrom<SingleValueMapper<SA, T, CurrentStorage>>
+    for SingleValue<R, SA, CurrentStorage>
 where
     SA: StorageMapperApi,
     T: TopEncode + TopDecode,
@@ -203,7 +228,7 @@ where
 {
 }
 
-impl<SA, T> TypeAbi for SingleValueMapper<SA, T>
+impl<SA, T> TypeAbi for SingleValueMapper<SA, T, CurrentStorage>
 where
     SA: StorageMapperApi,
     T: TopEncode + TopDecode + TypeAbi,
diff --git a/framework/base/src/storage/mappers/whitelist_mapper.rs b/framework/base/src/storage/mappers/whitelist_mapper.rs
index 339929a468..ac9ea7ea41 100644
--- a/framework/base/src/storage/mappers/whitelist_mapper.rs
+++ b/framework/base/src/storage/mappers/whitelist_mapper.rs
@@ -1,6 +1,11 @@
 use core::marker::PhantomData;
 
-use super::{SingleValueMapper, StorageMapper};
+use multiversx_sc_codec::{TopDecode, TopEncode};
+
+use super::{
+    set_mapper::{CurrentStorage, StorageAddress},
+    SingleValueMapper, StorageMapper,
+};
 use crate::{
     api::{ErrorApiImpl, StorageMapperApi},
     codec::NestedEncode,
@@ -8,58 +13,84 @@ use crate::{
     types::ManagedAddress,
 };
 
-type FlagMapper<SA> = SingleValueMapper<SA, bool>;
+type FlagMapper<SA, A> = SingleValueMapper<SA, bool, A>;
 
 static ITEM_NOT_WHITELISTED_ERR_MSG: &[u8] = b"Item not whitelisted";
 
 /// A non-iterable whitelist mapper.
 /// Very efficient for storing a whitelist, as each item requires only one storage key.
 /// If you need to iterate over the keys, use UnorderedSetMapper or SetMapper instead.
-pub struct WhitelistMapper<SA, T>
+pub struct WhitelistMapper<SA, T, A = CurrentStorage>
 where
     SA: StorageMapperApi,
+    A: StorageAddress<SA>,
     T: NestedEncode + 'static,
 {
+    address: A,
     base_key: StorageKey<SA>,
     _phantom: PhantomData<T>,
 }
 
-impl<SA, T> StorageMapper<SA> for WhitelistMapper<SA, T>
+impl<SA, T> StorageMapper<SA> for WhitelistMapper<SA, T, CurrentStorage>
 where
     SA: StorageMapperApi,
     T: NestedEncode + 'static,
 {
     fn new(base_key: StorageKey<SA>) -> Self {
         Self {
+            address: CurrentStorage,
             base_key,
             _phantom: PhantomData,
         }
     }
 }
 
-impl<SA, T> WhitelistMapper<SA, T>
+impl<SA, T> WhitelistMapper<SA, T, ManagedAddress<SA>>
 where
     SA: StorageMapperApi,
     T: NestedEncode + 'static,
 {
-    pub fn add(&self, item: &T) {
-        let mapper = self.build_mapper_for_item(item);
-        mapper.set(true);
-    }
-
-    pub fn remove(&self, item: &T) {
-        let mapper = self.build_mapper_for_item(item);
-        mapper.clear();
+    pub fn new_from_address(address: ManagedAddress<SA>, base_key: StorageKey<SA>) -> Self {
+        Self {
+            address,
+            base_key,
+            _phantom: PhantomData,
+        }
     }
+}
 
+impl<SA, T> WhitelistMapper<SA, T, ManagedAddress<SA>>
+where
+    SA: StorageMapperApi,
+    T: TopDecode + TopEncode + NestedEncode + 'static,
+{
     pub fn contains(&self, item: &T) -> bool {
         let mapper = self.build_mapper_for_item(item);
         !mapper.is_empty()
     }
 
-    pub fn contains_at_address(&self, address: &ManagedAddress<SA>, item: &T) -> bool {
+    pub fn require_whitelisted(&self, item: &T) {
+        if !self.contains(item) {
+            SA::error_api_impl().signal_error(ITEM_NOT_WHITELISTED_ERR_MSG);
+        }
+    }
+
+    fn build_mapper_for_item(&self, item: &T) -> FlagMapper<SA, ManagedAddress<SA>> {
+        let mut key = self.base_key.clone();
+        key.append_item(item);
+
+        FlagMapper::<SA, ManagedAddress<SA>>::new_from_address(self.address.clone(), key)
+    }
+}
+
+impl<SA, T> WhitelistMapper<SA, T, CurrentStorage>
+where
+    SA: StorageMapperApi,
+    T: TopDecode + TopEncode + NestedEncode + 'static,
+{
+    pub fn contains(&self, item: &T) -> bool {
         let mapper = self.build_mapper_for_item(item);
-        !mapper.is_empty_at_address(address)
+        !mapper.is_empty()
     }
 
     pub fn require_whitelisted(&self, item: &T) {
@@ -68,16 +99,20 @@ where
         }
     }
 
-    pub fn require_whitelisted_at_address(&self, address: &ManagedAddress<SA>, item: &T) {
-        if !self.contains_at_address(address, item) {
-            SA::error_api_impl().signal_error(ITEM_NOT_WHITELISTED_ERR_MSG);
-        }
+    pub fn add(&self, item: &T) {
+        let mapper = self.build_mapper_for_item(item);
+        mapper.set(true);
+    }
+
+    pub fn remove(&self, item: &T) {
+        let mapper = self.build_mapper_for_item(item);
+        mapper.clear();
     }
 
-    fn build_mapper_for_item(&self, item: &T) -> FlagMapper<SA> {
+    fn build_mapper_for_item(&self, item: &T) -> FlagMapper<SA, CurrentStorage> {
         let mut key = self.base_key.clone();
         key.append_item(item);
 
-        FlagMapper::<SA>::new(key)
+        FlagMapper::<SA, CurrentStorage>::new(key)
     }
 }

From 6eb3bdbb572ea349956a1d673b7dd3a939e9f8d8 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Mon, 29 Jan 2024 15:10:43 +0100
Subject: [PATCH 0281/1254] single value fix

---
 .../storage/mappers/single_value_mapper.rs    | 27 ++++++-------------
 1 file changed, 8 insertions(+), 19 deletions(-)

diff --git a/framework/base/src/storage/mappers/single_value_mapper.rs b/framework/base/src/storage/mappers/single_value_mapper.rs
index e7b2ab20f4..bb3cfd3259 100644
--- a/framework/base/src/storage/mappers/single_value_mapper.rs
+++ b/framework/base/src/storage/mappers/single_value_mapper.rs
@@ -159,14 +159,9 @@ where
 /// Intermediary type for deserializing the result of an endpoint that returns a `SingleValueMapper`.
 ///
 /// Necessary because we cannot implement `CodecFrom` directly on `T`.
-pub struct SingleValue<T: TopDecode, SA: StorageMapperApi, A: StorageAddress<SA>>(
-    T,
-    PhantomData<(SA, A)>,
-);
+pub struct SingleValue<T: TopDecode>(T);
 
-impl<T: TopEncode + TopDecode, SA: StorageMapperApi> TopEncode
-    for SingleValue<T, SA, CurrentStorage>
-{
+impl<T: TopEncode + TopDecode> TopEncode for SingleValue<T> {
     fn top_encode_or_handle_err<O, H>(&self, output: O, h: H) -> Result<(), H::HandledErr>
     where
         O: TopEncodeOutput,
@@ -176,28 +171,23 @@ impl<T: TopEncode + TopDecode, SA: StorageMapperApi> TopEncode
     }
 }
 
-impl<T: TopDecode, SA: StorageMapperApi, A: StorageAddress<SA>> TopDecode
-    for SingleValue<T, SA, A>
-{
+impl<T: TopDecode> TopDecode for SingleValue<T> {
     fn top_decode_or_handle_err<I, H>(input: I, h: H) -> Result<Self, H::HandledErr>
     where
         I: TopDecodeInput,
         H: DecodeErrorHandler,
     {
-        Ok(SingleValue::<T, SA, A>(
-            T::top_decode_or_handle_err(input, h)?,
-            PhantomData,
-        ))
+        Ok(SingleValue::<T>(T::top_decode_or_handle_err(input, h)?))
     }
 }
 
-impl<T: TopDecode, SA: StorageMapperApi, A: StorageAddress<SA>> From<T> for SingleValue<T, SA, A> {
+impl<T: TopDecode> From<T> for SingleValue<T> {
     fn from(value: T) -> Self {
-        SingleValue::<T, SA, A>(value, PhantomData)
+        SingleValue::<T>(value)
     }
 }
 
-impl<T: TopDecode, SA: StorageMapperApi, A: StorageAddress<SA>> SingleValue<T, SA, A> {
+impl<T: TopDecode> SingleValue<T> {
     #[inline]
     pub fn into(self) -> T {
         self.0
@@ -212,8 +202,7 @@ where
 {
 }
 
-impl<SA, T, R> CodecFrom<SingleValueMapper<SA, T, CurrentStorage>>
-    for SingleValue<R, SA, CurrentStorage>
+impl<SA, T, R> CodecFrom<SingleValueMapper<SA, T, CurrentStorage>> for SingleValue<R>
 where
     SA: StorageMapperApi,
     T: TopEncode + TopDecode,

From cd01cc7a2539ea46e687d8e60be60401c2b84b1b Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Mon, 29 Jan 2024 15:38:21 +0100
Subject: [PATCH 0282/1254] address storage get len

---
 .../base/src/storage/mappers/set_mapper.rs    | 20 ++++++++++++-------
 .../storage/mappers/single_value_mapper.rs    |  4 ++--
 .../base/src/storage/mappers/vec_mapper.rs    |  5 +++--
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/framework/base/src/storage/mappers/set_mapper.rs b/framework/base/src/storage/mappers/set_mapper.rs
index f8e2bab25b..cfb9e4d97b 100644
--- a/framework/base/src/storage/mappers/set_mapper.rs
+++ b/framework/base/src/storage/mappers/set_mapper.rs
@@ -1,17 +1,14 @@
 use core::marker::PhantomData;
 
+use storage_get_from_address::storage_get_len_from_address;
+
 pub use super::queue_mapper::Iter;
 use super::{QueueMapper, StorageClearable, StorageMapper};
 use crate::{
-    abi::{TypeAbi, TypeDescriptionContainer, TypeName},
-    api::StorageMapperApi,
-    codec::{
+    abi::{TypeAbi, TypeDescriptionContainer, TypeName}, 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},
+    }, storage::{storage_get_from_address, storage_set, StorageKey}, storage_get, storage_get_len, types::{ManagedAddress, ManagedRef, ManagedType, MultiValueEncoded}
 };
 
 const NULL_ENTRY: u32 = 0;
@@ -22,6 +19,7 @@ where
     SA: StorageMapperApi,
 {
     fn address_storage_get<T: TopDecode>(&self, key: ManagedRef<'_, SA, StorageKey<SA>>) -> T;
+    fn address_storage_get_len(&self, key: ManagedRef<'_, SA, StorageKey<SA>>) -> usize;
 }
 
 pub struct CurrentStorage;
@@ -33,6 +31,10 @@ where
     fn address_storage_get<T: TopDecode>(&self, key: ManagedRef<'_, SA, StorageKey<SA>>) -> T {
         storage_get(key)
     }
+
+    fn address_storage_get_len(&self, key: ManagedRef<'_, SA, StorageKey<SA>>) -> usize {
+        storage_get_len(key)
+    }
 }
 
 impl<SA> StorageAddress<SA> for ManagedAddress<SA>
@@ -42,6 +44,10 @@ where
     fn address_storage_get<T: TopDecode>(&self, key: ManagedRef<'_, SA, StorageKey<SA>>) -> T {
         storage_get_from_address(self.as_ref(), key)
     }
+
+    fn address_storage_get_len(&self, key: ManagedRef<'_, SA, StorageKey<SA>>) -> usize {
+        storage_get_len_from_address(self.as_ref(), key)
+    }
 }
 
 pub struct SetMapper<SA, T, A = CurrentStorage>
diff --git a/framework/base/src/storage/mappers/single_value_mapper.rs b/framework/base/src/storage/mappers/single_value_mapper.rs
index bb3cfd3259..b00d605542 100644
--- a/framework/base/src/storage/mappers/single_value_mapper.rs
+++ b/framework/base/src/storage/mappers/single_value_mapper.rs
@@ -12,7 +12,7 @@ use crate::{
         EncodeErrorHandler, TopDecode, TopDecodeInput, TopEncode, TopEncodeMulti,
         TopEncodeMultiOutput, TopEncodeOutput,
     },
-    storage::{storage_clear, storage_get_len, storage_set, StorageKey},
+    storage::{storage_clear, storage_set, StorageKey},
     types::{ManagedAddress, ManagedType},
 };
 
@@ -78,7 +78,7 @@ where
     }
 
     pub fn raw_byte_length(&self) -> usize {
-        storage_get_len(self.key.as_ref())
+        self.address.address_storage_get_len(self.key.as_ref())
     }
 }
 
diff --git a/framework/base/src/storage/mappers/vec_mapper.rs b/framework/base/src/storage/mappers/vec_mapper.rs
index 683d33aa04..49c9c159cc 100644
--- a/framework/base/src/storage/mappers/vec_mapper.rs
+++ b/framework/base/src/storage/mappers/vec_mapper.rs
@@ -10,7 +10,6 @@ use crate::{
         TopEncodeMulti, TopEncodeMultiOutput,
     },
     storage::{storage_clear, storage_set, StorageKey},
-    storage_get_len,
     types::{ManagedAddress, ManagedType, MultiValueEncoded},
 };
 use core::{marker::PhantomData, usize};
@@ -151,7 +150,9 @@ where
     /// There are no restrictions on the index,
     /// calling for an invalid index will simply return `true`.
     pub fn item_is_empty_unchecked(&self, index: usize) -> bool {
-        storage_get_len(self.item_key(index).as_ref()) == 0
+        self.address
+            .address_storage_get_len(self.item_key(index).as_ref())
+            == 0
     }
 
     /// Loads all items from storage and places them in a Vec.

From 4fbce54ab6b5167c851404c5faa0480ae18c9bb1 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Mon, 29 Jan 2024 16:06:43 +0100
Subject: [PATCH 0283/1254] user mapper

---
 .../base/src/storage/mappers/user_mapper.rs   | 116 +++++++++++-------
 1 file changed, 72 insertions(+), 44 deletions(-)

diff --git a/framework/base/src/storage/mappers/user_mapper.rs b/framework/base/src/storage/mappers/user_mapper.rs
index d088f94604..bbfdcfb27b 100644
--- a/framework/base/src/storage/mappers/user_mapper.rs
+++ b/framework/base/src/storage/mappers/user_mapper.rs
@@ -5,11 +5,14 @@ use crate::codec::{
     TopEncodeMultiOutput,
 };
 
-use super::StorageMapper;
+use super::{
+    set_mapper::{CurrentStorage, StorageAddress},
+    StorageMapper,
+};
 use crate::{
     abi::{TypeAbi, TypeName},
     api::StorageMapperApi,
-    storage::{storage_get, storage_get_len, storage_set, StorageKey},
+    storage::{storage_set, StorageKey},
     types::{ManagedAddress, ManagedType, ManagedVec, MultiValueEncoded},
 };
 
@@ -26,11 +29,13 @@ const COUNT_SUFFIX: &[u8] = b"_count";
 /// user data other than address/id.
 ///
 /// It also doesn't allow removing users. Once in, their ids are reserved forever.
-pub struct UserMapper<SA>
+pub struct UserMapper<SA, A = CurrentStorage>
 where
     SA: StorageMapperApi,
+    A: StorageAddress<SA>,
 {
     _phantom_api: PhantomData<SA>,
+    address: A,
     base_key: StorageKey<SA>,
 }
 
@@ -41,14 +46,29 @@ where
     fn new(base_key: StorageKey<SA>) -> Self {
         UserMapper {
             _phantom_api: PhantomData,
+            address: CurrentStorage,
             base_key,
         }
     }
 }
 
-impl<SA> UserMapper<SA>
+impl<SA> UserMapper<SA, ManagedAddress<SA>>
 where
     SA: StorageMapperApi,
+{
+    pub fn new_from_address(address: ManagedAddress<SA>, base_key: StorageKey<SA>) -> Self {
+        UserMapper {
+            _phantom_api: PhantomData,
+            address,
+            base_key,
+        }
+    }
+}
+
+impl<SA, A> UserMapper<SA, A>
+where
+    SA: StorageMapperApi,
+    A: StorageAddress<SA>,
 {
     fn get_user_id_key(&self, address: &ManagedAddress<SA>) -> StorageKey<SA> {
         let mut user_id_key = self.base_key.clone();
@@ -73,11 +93,8 @@ where
     /// Yields the user id for a given address.
     /// Will return 0 if the address is not known to the contract.
     pub fn get_user_id(&self, address: &ManagedAddress<SA>) -> usize {
-        storage_get(self.get_user_id_key(address).as_ref())
-    }
-
-    fn set_user_id(&self, address: &ManagedAddress<SA>, id: usize) {
-        storage_set(self.get_user_id_key(address).as_ref(), &id);
+        self.address
+            .address_storage_get(self.get_user_id_key(address).as_ref())
     }
 
     /// Yields the user address for a given id, if the id is valid.
@@ -85,8 +102,8 @@ where
         let key = self.get_user_address_key(id);
         // TODO: optimize, storage_load_managed_buffer_len is currently called twice
 
-        if storage_get_len(key.as_ref()) > 0 {
-            Some(storage_get(key.as_ref()))
+        if self.address.address_storage_get_len(key.as_ref()) > 0 {
+            Some(self.address.address_storage_get(key.as_ref()))
         } else {
             None
         }
@@ -95,7 +112,8 @@ where
     /// Yields the user address for a given id.
     /// Will cause a deserialization error if the id is invalid.
     pub fn get_user_address_unchecked(&self, id: usize) -> ManagedAddress<SA> {
-        storage_get(self.get_user_address_key(id).as_ref())
+        self.address
+            .address_storage_get(self.get_user_address_key(id).as_ref())
     }
 
     /// Yields the user address for a given id, if the id is valid.
@@ -103,38 +121,45 @@ where
     pub fn get_user_address_or_zero(&self, id: usize) -> ManagedAddress<SA> {
         let key = self.get_user_address_key(id);
         // TODO: optimize, storage_load_managed_buffer_len is currently called twice
-        if storage_get_len(key.as_ref()) > 0 {
-            storage_get(key.as_ref())
+        if self.address.address_storage_get_len(key.as_ref()) > 0 {
+            self.address.address_storage_get(key.as_ref())
         } else {
             ManagedAddress::zero()
         }
     }
 
-    fn set_user_address(&self, id: usize, address: &ManagedAddress<SA>) {
-        storage_set(self.get_user_address_key(id).as_ref(), address);
-    }
-
     /// Number of users.
     pub fn get_user_count(&self) -> usize {
-        storage_get(self.get_user_count_key().as_ref())
+        self.address
+            .address_storage_get(self.get_user_count_key().as_ref())
     }
 
-    fn set_user_count(&self, user_count: usize) {
-        storage_set(self.get_user_count_key().as_ref(), &user_count);
+    /// Loads all addresses from storage and places them in a ManagedVec.
+    /// Can easily consume a lot of gas.
+    pub fn get_all_addresses(&self) -> ManagedVec<SA, ManagedAddress<SA>> {
+        let user_count = self.get_user_count();
+        let mut result = ManagedVec::new();
+        for i in 1..=user_count {
+            result.push(self.get_user_address_or_zero(i));
+        }
+        result
     }
+}
 
-    /// Yields the user id for a given address, or creates a new user id if there isn't one.
-    /// Will safely keep the user count in sync.
-    pub fn get_or_create_user(&self, address: &ManagedAddress<SA>) -> usize {
-        let mut user_id = self.get_user_id(address);
-        if user_id == 0 {
-            let next_user_count = self.get_user_count() + 1;
-            self.set_user_count(next_user_count);
-            user_id = next_user_count;
-            self.set_user_id(address, user_id);
-            self.set_user_address(user_id, address);
-        }
-        user_id
+impl<SA> UserMapper<SA, CurrentStorage>
+where
+    SA: StorageMapperApi,
+{
+    fn set_user_id(&self, address: &ManagedAddress<SA>, id: usize) {
+        storage_set(self.get_user_id_key(address).as_ref(), &id);
+    }
+
+    fn set_user_address(&self, id: usize, address: &ManagedAddress<SA>) {
+        storage_set(self.get_user_address_key(id).as_ref(), address);
+    }
+
+    fn set_user_count(&self, user_count: usize) {
+        storage_set(self.get_user_count_key().as_ref(), &user_count);
     }
 
     /// Tries to insert a number of addresses.
@@ -163,21 +188,24 @@ where
         self.set_user_count(user_count);
     }
 
-    /// Loads all addresses from storage and places them in a ManagedVec.
-    /// Can easily consume a lot of gas.
-    pub fn get_all_addresses(&self) -> ManagedVec<SA, ManagedAddress<SA>> {
-        let user_count = self.get_user_count();
-        let mut result = ManagedVec::new();
-        for i in 1..=user_count {
-            result.push(self.get_user_address_or_zero(i));
+    /// Yields the user id for a given address, or creates a new user id if there isn't one.
+    /// Will safely keep the user count in sync.
+    pub fn get_or_create_user(&self, address: &ManagedAddress<SA>) -> usize {
+        let mut user_id = self.get_user_id(address);
+        if user_id == 0 {
+            let next_user_count = self.get_user_count() + 1;
+            self.set_user_count(next_user_count);
+            user_id = next_user_count;
+            self.set_user_id(address, user_id);
+            self.set_user_address(user_id, address);
         }
-        result
+        user_id
     }
 }
 
 /// Behaves like a MultiResultVec<Address> when an endpoint result,
 /// and lists all users addresses.
-impl<SA> TopEncodeMulti for UserMapper<SA>
+impl<SA> TopEncodeMulti for UserMapper<SA, CurrentStorage>
 where
     SA: StorageMapperApi,
 {
@@ -191,13 +219,13 @@ where
     }
 }
 
-impl<SA> CodecFrom<UserMapper<SA>> for MultiValueEncoded<SA, ManagedAddress<SA>> where
+impl<SA> CodecFrom<UserMapper<SA, CurrentStorage>> for MultiValueEncoded<SA, ManagedAddress<SA>> where
     SA: StorageMapperApi
 {
 }
 
 /// Behaves like a MultiResultVec when an endpoint result.
-impl<SA> TypeAbi for UserMapper<SA>
+impl<SA> TypeAbi for UserMapper<SA, CurrentStorage>
 where
     SA: StorageMapperApi,
 {

From 7520a35397784a5c4574972c9768292ff99c52ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Costin=20Caraba=C8=99?= <costin.carabas@gmail.com>
Date: Mon, 29 Jan 2024 17:08:13 +0200
Subject: [PATCH 0284/1254] Add code_metadata check support for CheckAccount

---
 .../src/scenario/model/account_data/account_check.rs  | 11 +++++++++++
 1 file changed, 11 insertions(+)

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 901d224541..c7c244d20f 100644
--- a/framework/scenario/src/scenario/model/account_data/account_check.rs
+++ b/framework/scenario/src/scenario/model/account_data/account_check.rs
@@ -66,6 +66,17 @@ impl CheckAccount {
         self
     }
 
+    pub fn code_metadata<V>(mut self, code_metadata_expr: V) -> Self
+    where
+        BytesValue: InterpretableFrom<V>,
+    {
+        self.code_metadata = CheckValue::Equal(BytesValue::interpret_from(
+            code_metadata_expr,
+            &InterpreterContext::default(),
+        ));
+        self
+    }
+
     pub fn esdt_balance<K, V>(mut self, token_id_expr: K, balance_expr: V) -> Self
     where
         BytesKey: From<K>,

From 261e7fc0de2ffe5b4f449f9844955e24be6790e4 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Mon, 29 Jan 2024 16:58:20 +0100
Subject: [PATCH 0285/1254] unique id mapper

---
 .../src/storage/mappers/unique_id_mapper.rs   | 93 +++++++++++++------
 1 file changed, 64 insertions(+), 29 deletions(-)

diff --git a/framework/base/src/storage/mappers/unique_id_mapper.rs b/framework/base/src/storage/mappers/unique_id_mapper.rs
index 1d5b5df391..779e1a1b71 100644
--- a/framework/base/src/storage/mappers/unique_id_mapper.rs
+++ b/framework/base/src/storage/mappers/unique_id_mapper.rs
@@ -1,9 +1,15 @@
-use crate::codec::{
-    multi_encode_iter_or_handle_err, CodecFrom, EncodeErrorHandler, TopEncodeMulti,
-    TopEncodeMultiOutput,
+use crate::{
+    codec::{
+        multi_encode_iter_or_handle_err, CodecFrom, EncodeErrorHandler, TopEncodeMulti,
+        TopEncodeMultiOutput,
+    },
+    types::ManagedAddress,
 };
 
-use super::{StorageMapper, VecMapper};
+use super::{
+    set_mapper::{CurrentStorage, StorageAddress},
+    StorageMapper, VecMapper,
+};
 use crate::{
     abi::{TypeAbi, TypeDescriptionContainer, TypeName},
     api::{ErrorApiImpl, StorageMapperApi},
@@ -18,39 +24,47 @@ const EMPTY_ENTRY: UniqueId = 0;
 /// Holds the values from 1 to N with as little storage interaction as possible
 /// If Mapper[i] = i, then it stores nothing, i.e. "0"
 /// If Mapper[i] is equal to another value, then it stores the value
-pub struct UniqueIdMapper<SA>
+pub struct UniqueIdMapper<SA, A = CurrentStorage>
 where
     SA: StorageMapperApi,
+    A: StorageAddress<SA>,
 {
+    _address: A,
     base_key: StorageKey<SA>,
-    vec_mapper: VecMapper<SA, UniqueId>,
+    vec_mapper: VecMapper<SA, UniqueId, A>,
 }
 
-impl<SA> StorageMapper<SA> for UniqueIdMapper<SA>
+impl<SA> StorageMapper<SA> for UniqueIdMapper<SA, CurrentStorage>
 where
     SA: StorageMapperApi,
 {
     fn new(base_key: StorageKey<SA>) -> Self {
         Self {
+            _address: CurrentStorage,
             base_key: base_key.clone(),
             vec_mapper: VecMapper::new(base_key),
         }
     }
 }
 
-impl<SA> UniqueIdMapper<SA>
+impl<SA> UniqueIdMapper<SA, ManagedAddress<SA>>
 where
     SA: StorageMapperApi,
 {
-    /// Initializes the mapper's length. This may not be set again afterwards.
-    pub fn set_initial_len(&mut self, len: usize) {
-        if !self.vec_mapper.is_empty() {
-            SA::error_api_impl().signal_error(b"len already set");
+    pub fn new_from_address(address: ManagedAddress<SA>, base_key: StorageKey<SA>) -> Self {
+        Self {
+            _address: address.clone(),
+            base_key: base_key.clone(),
+            vec_mapper: VecMapper::new_from_address(address, base_key),
         }
-
-        self.set_internal_mapper_len(len);
     }
+}
 
+impl<SA, A> UniqueIdMapper<SA, A>
+where
+    SA: StorageMapperApi,
+    A: StorageAddress<SA>,
+{
     #[inline]
     pub fn len(&self) -> usize {
         self.vec_mapper.len()
@@ -71,6 +85,25 @@ where
         }
     }
 
+    /// Provides a forward iterator.
+    pub fn iter(&self) -> Iter<SA, A> {
+        Iter::new(self)
+    }
+}
+
+impl<SA> UniqueIdMapper<SA, CurrentStorage>
+where
+    SA: StorageMapperApi,
+{
+    /// Initializes the mapper's length. This may not be set again afterwards.
+    pub fn set_initial_len(&mut self, len: usize) {
+        if !self.vec_mapper.is_empty() {
+            SA::error_api_impl().signal_error(b"len already set");
+        }
+
+        self.set_internal_mapper_len(len);
+    }
+
     /// Gets the value from the index and removes it.
     /// The value is replaced by the last item, and length is decremented.
     pub fn swap_remove(&mut self, index: usize) -> UniqueId {
@@ -107,40 +140,38 @@ where
         len_key.append_bytes(&b".len"[..]);
         storage_set(len_key.as_ref(), &new_len);
     }
-
-    /// Provides a forward iterator.
-    pub fn iter(&self) -> Iter<SA> {
-        Iter::new(self)
-    }
 }
 
-impl<'a, SA> IntoIterator for &'a UniqueIdMapper<SA>
+impl<'a, SA, A> IntoIterator for &'a UniqueIdMapper<SA, A>
 where
     SA: StorageMapperApi,
+    A: StorageAddress<SA>,
 {
     type Item = usize;
 
-    type IntoIter = Iter<'a, SA>;
+    type IntoIter = Iter<'a, SA, A>;
 
     fn into_iter(self) -> Self::IntoIter {
         self.iter()
     }
 }
 
-pub struct Iter<'a, SA>
+pub struct Iter<'a, SA, A>
 where
     SA: StorageMapperApi,
+    A: StorageAddress<SA>,
 {
     index: usize,
     len: usize,
-    id_mapper: &'a UniqueIdMapper<SA>,
+    id_mapper: &'a UniqueIdMapper<SA, A>,
 }
 
-impl<'a, SA> Iter<'a, SA>
+impl<'a, SA, A> Iter<'a, SA, A>
 where
     SA: StorageMapperApi,
+    A: StorageAddress<SA>,
 {
-    fn new(id_mapper: &'a UniqueIdMapper<SA>) -> Iter<'a, SA> {
+    fn new(id_mapper: &'a UniqueIdMapper<SA, A>) -> Iter<'a, SA, A> {
         Iter {
             index: 1,
             len: id_mapper.len(),
@@ -149,9 +180,10 @@ where
     }
 }
 
-impl<'a, SA> Iterator for Iter<'a, SA>
+impl<'a, SA, A> Iterator for Iter<'a, SA, A>
 where
     SA: StorageMapperApi,
+    A: StorageAddress<SA>,
 {
     type Item = usize;
 
@@ -168,7 +200,7 @@ where
 }
 
 /// Behaves like a MultiResultVec when an endpoint result.
-impl<SA> TopEncodeMulti for UniqueIdMapper<SA>
+impl<SA> TopEncodeMulti for UniqueIdMapper<SA, CurrentStorage>
 where
     SA: StorageMapperApi,
 {
@@ -181,10 +213,13 @@ where
     }
 }
 
-impl<SA> CodecFrom<UniqueIdMapper<SA>> for MultiValueEncoded<SA, usize> where SA: StorageMapperApi {}
+impl<SA> CodecFrom<UniqueIdMapper<SA, CurrentStorage>> for MultiValueEncoded<SA, usize> where
+    SA: StorageMapperApi
+{
+}
 
 /// Behaves like a MultiResultVec when an endpoint result.
-impl<SA> TypeAbi for UniqueIdMapper<SA>
+impl<SA> TypeAbi for UniqueIdMapper<SA, CurrentStorage>
 where
     SA: StorageMapperApi,
 {

From 1248fd1c3ccff3a2f3ce3cfc31622e50ef533287 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Mon, 29 Jan 2024 17:46:31 +0100
Subject: [PATCH 0286/1254] address to id mapper

---
 .../storage/mappers/address_to_id_mapper.rs   | 158 ++++++++----------
 1 file changed, 73 insertions(+), 85 deletions(-)

diff --git a/framework/base/src/storage/mappers/address_to_id_mapper.rs b/framework/base/src/storage/mappers/address_to_id_mapper.rs
index 2d02854d12..da487fa415 100644
--- a/framework/base/src/storage/mappers/address_to_id_mapper.rs
+++ b/framework/base/src/storage/mappers/address_to_id_mapper.rs
@@ -1,15 +1,14 @@
 use core::marker::PhantomData;
 
-use super::StorageMapper;
+use super::{
+    set_mapper::{CurrentStorage, StorageAddress},
+    StorageMapper,
+};
 use crate::{
     api::{ErrorApiImpl, StorageMapperApi},
-    storage::{
-        storage_clear, storage_get, storage_get_from_address, storage_get_len, storage_set,
-        StorageKey,
-    },
+    storage::{storage_clear, storage_set, StorageKey},
     types::{ManagedAddress, ManagedType},
 };
-use storage_get_from_address::storage_get_len_from_address;
 
 static ID_SUFFIX: &[u8] = b"addrId";
 static ADDRESS_SUFFIX: &[u8] = b"addr";
@@ -20,11 +19,13 @@ static UNKNOWN_ADDR_ERR_MSG: &[u8] = b"Unknown address";
 pub type AddressId = u64;
 pub const NULL_ID: AddressId = 0;
 
-pub struct AddressToIdMapper<SA>
+pub struct AddressToIdMapper<SA, A = CurrentStorage>
 where
     SA: StorageMapperApi,
+    A: StorageAddress<SA>,
 {
     _phantom_api: PhantomData<SA>,
+    address: A,
     base_key: StorageKey<SA>,
 }
 
@@ -35,32 +36,38 @@ where
     fn new(base_key: StorageKey<SA>) -> Self {
         AddressToIdMapper {
             _phantom_api: PhantomData,
+            address: CurrentStorage,
             base_key,
         }
     }
 }
 
-impl<SA> AddressToIdMapper<SA>
+impl<SA> AddressToIdMapper<SA, ManagedAddress<SA>>
 where
     SA: StorageMapperApi,
+{
+    pub fn new_from_address(address: ManagedAddress<SA>, base_key: StorageKey<SA>) -> Self {
+        AddressToIdMapper {
+            _phantom_api: PhantomData,
+            address,
+            base_key,
+        }
+    }
+}
+
+impl<SA, A> AddressToIdMapper<SA, A>
+where
+    SA: StorageMapperApi,
+    A: StorageAddress<SA>,
 {
     pub fn contains_id(&self, id: AddressId) -> bool {
         let key = self.id_to_address_key(id);
-        storage_get_len(key.as_ref()) != 0
+        self.address.address_storage_get_len(key.as_ref()) != 0
     }
 
     pub fn get_id(&self, address: &ManagedAddress<SA>) -> AddressId {
         let key = self.address_to_id_key(address);
-        storage_get(key.as_ref())
-    }
-
-    pub fn get_id_at_address(
-        &self,
-        sc_address: &ManagedAddress<SA>,
-        address_to_find: &ManagedAddress<SA>,
-    ) -> AddressId {
-        let key = self.address_to_id_key(address_to_find);
-        storage_get_from_address(sc_address.as_ref(), key.as_ref())
+        self.address.address_storage_get(key.as_ref())
     }
 
     pub fn get_id_non_zero(&self, address: &ManagedAddress<SA>) -> AddressId {
@@ -72,54 +79,53 @@ where
         id
     }
 
-    pub fn get_id_at_address_non_zero(
-        &self,
-        sc_address: &ManagedAddress<SA>,
-        address_to_find: &ManagedAddress<SA>,
-    ) -> AddressId {
-        let id = self.get_id_at_address(sc_address, address_to_find);
-        if id == NULL_ID {
-            SA::error_api_impl().signal_error(UNKNOWN_ADDR_ERR_MSG);
+    pub fn get_address(&self, id: AddressId) -> Option<ManagedAddress<SA>> {
+        let key = self.id_to_address_key(id);
+        if self.address.address_storage_get_len(key.as_ref()) == 0 {
+            return None;
         }
 
-        id
+        let addr = self.address.address_storage_get(key.as_ref());
+        Some(addr)
     }
 
-    pub fn insert_new(&self, address: &ManagedAddress<SA>) -> AddressId {
-        let existing_id = self.get_id(address);
-        if existing_id != NULL_ID {
-            SA::error_api_impl().signal_error(b"Address already registered");
-        }
+    fn id_to_address_key(&self, id: AddressId) -> StorageKey<SA> {
+        let mut item_key = self.base_key.clone();
+        item_key.append_bytes(ID_SUFFIX);
+        item_key.append_item(&id);
 
-        self.insert_address(address)
+        item_key
     }
 
-    pub fn get_address(&self, id: AddressId) -> Option<ManagedAddress<SA>> {
-        let key = self.id_to_address_key(id);
-        if storage_get_len(key.as_ref()) == 0 {
-            return None;
-        }
+    fn address_to_id_key(&self, address: &ManagedAddress<SA>) -> StorageKey<SA> {
+        let mut item_key = self.base_key.clone();
+        item_key.append_bytes(ADDRESS_SUFFIX);
+        item_key.append_item(address);
 
-        let addr = storage_get(key.as_ref());
-        Some(addr)
+        item_key
     }
 
-    pub fn get_address_at_address(
-        &self,
-        sc_address: &ManagedAddress<SA>,
-        id: AddressId,
-    ) -> Option<ManagedAddress<SA>> {
-        let key = self.id_to_address_key(id);
-        if storage_get_len_from_address(sc_address.as_ref(), key.as_ref()) == 0 {
-            return None;
-        }
+    fn last_id_key(&self) -> StorageKey<SA> {
+        let mut item_key = self.base_key.clone();
+        item_key.append_bytes(LAST_ID_SUFFIX);
 
-        let addr = storage_get_from_address(sc_address.as_ref(), key.as_ref());
-        Some(addr)
+        item_key
     }
 
+    pub fn get_last_id(&self) -> AddressId {
+        self.address
+            .address_storage_get(self.last_id_key().as_ref())
+    }
+}
+
+impl<SA> AddressToIdMapper<SA, CurrentStorage>
+where
+    SA: StorageMapperApi,
+{
     pub fn get_id_or_insert(&self, address: &ManagedAddress<SA>) -> AddressId {
-        let current_id = storage_get(self.address_to_id_key(address).as_ref());
+        let current_id = self
+            .address
+            .address_storage_get(self.address_to_id_key(address).as_ref());
         if current_id != 0 {
             return current_id;
         }
@@ -127,6 +133,15 @@ where
         self.insert_address(address)
     }
 
+    pub fn insert_new(&self, address: &ManagedAddress<SA>) -> AddressId {
+        let existing_id = self.get_id(address);
+        if existing_id != NULL_ID {
+            SA::error_api_impl().signal_error(b"Address already registered");
+        }
+
+        self.insert_address(address)
+    }
+
     pub fn remove_by_id(&self, id: AddressId) -> Option<ManagedAddress<SA>> {
         let address = self.get_address(id)?;
         self.remove_entry(id, &address);
@@ -153,38 +168,6 @@ where
         new_id
     }
 
-    fn remove_entry(&self, id: AddressId, address: &ManagedAddress<SA>) {
-        storage_clear(self.address_to_id_key(address).as_ref());
-        storage_clear(self.id_to_address_key(id).as_ref());
-    }
-
-    fn id_to_address_key(&self, id: AddressId) -> StorageKey<SA> {
-        let mut item_key = self.base_key.clone();
-        item_key.append_bytes(ID_SUFFIX);
-        item_key.append_item(&id);
-
-        item_key
-    }
-
-    fn address_to_id_key(&self, address: &ManagedAddress<SA>) -> StorageKey<SA> {
-        let mut item_key = self.base_key.clone();
-        item_key.append_bytes(ADDRESS_SUFFIX);
-        item_key.append_item(address);
-
-        item_key
-    }
-
-    fn last_id_key(&self) -> StorageKey<SA> {
-        let mut item_key = self.base_key.clone();
-        item_key.append_bytes(LAST_ID_SUFFIX);
-
-        item_key
-    }
-
-    pub fn get_last_id(&self) -> AddressId {
-        storage_get(self.last_id_key().as_ref())
-    }
-
     fn set_last_id(&self, last_id: AddressId) {
         if last_id == 0 {
             SA::error_api_impl().signal_error(b"ID Overflow");
@@ -192,4 +175,9 @@ where
 
         storage_set(self.last_id_key().as_ref(), &last_id);
     }
+
+    fn remove_entry(&self, id: AddressId, address: &ManagedAddress<SA>) {
+        storage_clear(self.address_to_id_key(address).as_ref());
+        storage_clear(self.id_to_address_key(id).as_ref());
+    }
 }

From 064d6e30ebe0333a5ba98ef5eb507e225326409e Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Mon, 29 Jan 2024 18:07:53 +0100
Subject: [PATCH 0287/1254] linked list mapper

---
 .../src/storage/mappers/linked_list_mapper.rs | 263 ++++++++++--------
 1 file changed, 149 insertions(+), 114 deletions(-)

diff --git a/framework/base/src/storage/mappers/linked_list_mapper.rs b/framework/base/src/storage/mappers/linked_list_mapper.rs
index 30869451f1..d58c0ad19d 100644
--- a/framework/base/src/storage/mappers/linked_list_mapper.rs
+++ b/framework/base/src/storage/mappers/linked_list_mapper.rs
@@ -1,6 +1,9 @@
 use core::marker::PhantomData;
 
-use super::{StorageClearable, StorageMapper};
+use super::{
+    set_mapper::{CurrentStorage, StorageAddress},
+    StorageClearable, StorageMapper,
+};
 use crate::{
     abi::{TypeAbi, TypeDescriptionContainer, TypeName},
     api::StorageMapperApi,
@@ -13,11 +16,10 @@ use crate::{
         CodecFrom, DecodeDefault, EncodeDefault, EncodeErrorHandler, NestedDecode, NestedEncode,
         TopDecode, TopEncode, TopEncodeMulti, TopEncodeMultiOutput,
     },
-    storage::{storage_get, storage_set, StorageKey},
-    types::{heap::BoxedBytes, ManagedType, MultiValueEncoded},
+    storage::{storage_set, StorageKey},
+    types::{heap::BoxedBytes, ManagedAddress, ManagedType, MultiValueEncoded},
 };
 use alloc::vec::Vec;
-use storage_get::storage_get_len;
 
 const NULL_ENTRY: u32 = 0;
 const INFO_IDENTIFIER: &[u8] = b".info";
@@ -89,17 +91,19 @@ impl LinkedListInfo {
     }
 }
 
-pub struct LinkedListMapper<SA, T>
+pub struct LinkedListMapper<SA, T, A = CurrentStorage>
 where
     SA: StorageMapperApi,
+    A: StorageAddress<SA>,
     T: TopEncode + TopDecode + NestedEncode + NestedDecode + Clone + 'static,
 {
     _phantom_api: PhantomData<SA>,
+    address: A,
     base_key: StorageKey<SA>,
     _phantom_item: PhantomData<T>,
 }
 
-impl<SA, T> StorageMapper<SA> for LinkedListMapper<SA, T>
+impl<SA, T> StorageMapper<SA> for LinkedListMapper<SA, T, CurrentStorage>
 where
     SA: StorageMapperApi,
     T: TopEncode + TopDecode + NestedEncode + NestedDecode + Clone,
@@ -107,6 +111,22 @@ where
     fn new(base_key: StorageKey<SA>) -> Self {
         LinkedListMapper {
             _phantom_api: PhantomData,
+            address: CurrentStorage,
+            base_key,
+            _phantom_item: PhantomData,
+        }
+    }
+}
+
+impl<SA, T> LinkedListMapper<SA, T, ManagedAddress<SA>>
+where
+    SA: StorageMapperApi,
+    T: TopEncode + TopDecode + NestedEncode + NestedDecode + Clone,
+{
+    pub fn new_from_address(address: ManagedAddress<SA>, base_key: StorageKey<SA>) -> Self {
+        LinkedListMapper {
+            _phantom_api: PhantomData,
+            address,
             base_key,
             _phantom_item: PhantomData,
         }
@@ -132,9 +152,10 @@ where
     }
 }
 
-impl<SA, T> LinkedListMapper<SA, T>
+impl<SA, T, A> LinkedListMapper<SA, T, A>
 where
     SA: StorageMapperApi,
+    A: StorageAddress<SA>,
     T: TopEncode + TopDecode + NestedEncode + NestedDecode + Clone,
 {
     fn build_node_id_named_key(&self, name: &[u8], node_id: u32) -> StorageKey<SA> {
@@ -151,43 +172,24 @@ where
     }
 
     fn get_info(&self) -> LinkedListInfo {
-        storage_get(self.build_name_key(INFO_IDENTIFIER).as_ref())
-    }
-
-    fn set_info(&mut self, value: LinkedListInfo) {
-        storage_set(self.build_name_key(INFO_IDENTIFIER).as_ref(), &value);
+        self.address
+            .address_storage_get(self.build_name_key(INFO_IDENTIFIER).as_ref())
     }
 
     fn get_node(&self, node_id: u32) -> LinkedListNode<T> {
-        storage_get(
+        self.address.address_storage_get(
             self.build_node_id_named_key(NODE_IDENTIFIER, node_id)
                 .as_ref(),
         )
     }
 
     fn is_empty_node(&self, node_id: u32) -> bool {
-        storage_get_len(
+        self.address.address_storage_get_len(
             self.build_node_id_named_key(NODE_IDENTIFIER, node_id)
                 .as_ref(),
         ) == 0
     }
 
-    fn set_node(&mut self, node_id: u32, item: &LinkedListNode<T>) {
-        storage_set(
-            self.build_node_id_named_key(NODE_IDENTIFIER, node_id)
-                .as_ref(),
-            item,
-        );
-    }
-
-    fn clear_node(&mut self, node_id: u32) {
-        storage_set(
-            self.build_node_id_named_key(NODE_IDENTIFIER, node_id)
-                .as_ref(),
-            &BoxedBytes::empty(),
-        );
-    }
-
     pub fn is_empty(&self) -> bool {
         self.get_info().len == 0
     }
@@ -208,6 +210,108 @@ where
         self.get_node_by_id(info.back)
     }
 
+    pub fn get_node_by_id(&self, node_id: u32) -> Option<LinkedListNode<T>> {
+        if self.is_empty_node(node_id) {
+            return None;
+        }
+
+        Some(self.get_node(node_id))
+    }
+
+    pub fn iter(&self) -> Iter<SA, T, A> {
+        Iter::new(self)
+    }
+
+    pub fn iter_from_node_id(&self, node_id: u32) -> Iter<SA, T, A> {
+        Iter::new_from_node_id(self, node_id)
+    }
+
+    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 front != NULL_ENTRY {
+                return false;
+            }
+            if back != NULL_ENTRY {
+                return false;
+            }
+            true
+        } else {
+            if front == NULL_ENTRY {
+                return false;
+            }
+            if back == NULL_ENTRY {
+                return false;
+            }
+
+            if self.get_node(front).prev_id != NULL_ENTRY {
+                return false;
+            }
+            if self.get_node(back).next_id != NULL_ENTRY {
+                return false;
+            }
+
+            let mut forwards = Vec::new();
+            while front != NULL_ENTRY {
+                forwards.push(front);
+                front = self.get_node(front).next_id;
+            }
+            if forwards.len() != info.len as usize {
+                return false;
+            }
+
+            let mut backwards = Vec::new();
+            while back != NULL_ENTRY {
+                backwards.push(back);
+                back = self.get_node(back).prev_id;
+            }
+            if backwards.len() != info.len as usize {
+                return false;
+            }
+
+            let backwards_reversed: Vec<u32> = backwards.iter().rev().cloned().collect();
+            if forwards != backwards_reversed {
+                return false;
+            }
+
+            forwards.sort_unstable();
+            forwards.dedup();
+            if forwards.len() != info.len as usize {
+                return false;
+            }
+            true
+        }
+    }
+}
+
+impl<SA, T> LinkedListMapper<SA, T, CurrentStorage>
+where
+    SA: StorageMapperApi,
+    T: TopEncode + TopDecode + NestedEncode + NestedDecode + Clone,
+{
+    fn set_info(&mut self, value: LinkedListInfo) {
+        storage_set(self.build_name_key(INFO_IDENTIFIER).as_ref(), &value);
+    }
+
+    fn set_node(&mut self, node_id: u32, item: &LinkedListNode<T>) {
+        storage_set(
+            self.build_node_id_named_key(NODE_IDENTIFIER, node_id)
+                .as_ref(),
+            item,
+        );
+    }
+
+    fn clear_node(&mut self, node_id: u32) {
+        storage_set(
+            self.build_node_id_named_key(NODE_IDENTIFIER, node_id)
+                .as_ref(),
+            &BoxedBytes::empty(),
+        );
+    }
+
     pub fn pop_back(&mut self) -> Option<LinkedListNode<T>> {
         let info = self.get_info();
 
@@ -423,120 +527,50 @@ where
         self.remove_node(&node);
         Some(node)
     }
-
-    pub fn get_node_by_id(&self, node_id: u32) -> Option<LinkedListNode<T>> {
-        if self.is_empty_node(node_id) {
-            return None;
-        }
-
-        Some(self.get_node(node_id))
-    }
-
-    pub fn iter(&self) -> Iter<SA, T> {
-        Iter::new(self)
-    }
-
-    pub fn iter_from_node_id(&self, node_id: u32) -> Iter<SA, T> {
-        Iter::new_from_node_id(self, node_id)
-    }
-
-    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 front != NULL_ENTRY {
-                return false;
-            }
-            if back != NULL_ENTRY {
-                return false;
-            }
-            true
-        } else {
-            if front == NULL_ENTRY {
-                return false;
-            }
-            if back == NULL_ENTRY {
-                return false;
-            }
-
-            if self.get_node(front).prev_id != NULL_ENTRY {
-                return false;
-            }
-            if self.get_node(back).next_id != NULL_ENTRY {
-                return false;
-            }
-
-            let mut forwards = Vec::new();
-            while front != NULL_ENTRY {
-                forwards.push(front);
-                front = self.get_node(front).next_id;
-            }
-            if forwards.len() != info.len as usize {
-                return false;
-            }
-
-            let mut backwards = Vec::new();
-            while back != NULL_ENTRY {
-                backwards.push(back);
-                back = self.get_node(back).prev_id;
-            }
-            if backwards.len() != info.len as usize {
-                return false;
-            }
-
-            let backwards_reversed: Vec<u32> = backwards.iter().rev().cloned().collect();
-            if forwards != backwards_reversed {
-                return false;
-            }
-
-            forwards.sort_unstable();
-            forwards.dedup();
-            if forwards.len() != info.len as usize {
-                return false;
-            }
-            true
-        }
-    }
 }
 
-impl<'a, SA, T> IntoIterator for &'a LinkedListMapper<SA, T>
+impl<'a, SA, T, A> IntoIterator for &'a LinkedListMapper<SA, T, A>
 where
     SA: StorageMapperApi,
+    A: StorageAddress<SA>,
     T: TopEncode + TopDecode + NestedEncode + NestedDecode + Clone + 'static,
 {
     type Item = LinkedListNode<T>;
 
-    type IntoIter = Iter<'a, SA, T>;
+    type IntoIter = Iter<'a, SA, T, A>;
 
     fn into_iter(self) -> Self::IntoIter {
         self.iter()
     }
 }
 
-pub struct Iter<'a, SA, T>
+pub struct Iter<'a, SA, T, A>
 where
     SA: StorageMapperApi,
+    A: StorageAddress<SA>,
     T: TopEncode + TopDecode + NestedEncode + NestedDecode + Clone + 'static,
 {
     node_opt: Option<LinkedListNode<T>>,
-    linked_list: &'a LinkedListMapper<SA, T>,
+    linked_list: &'a LinkedListMapper<SA, T, A>,
 }
 
-impl<'a, SA, T> Iter<'a, SA, T>
+impl<'a, SA, T, A> Iter<'a, SA, T, A>
 where
     SA: StorageMapperApi,
+    A: StorageAddress<SA>,
     T: TopEncode + TopDecode + NestedEncode + NestedDecode + Clone,
 {
-    fn new(linked_list: &'a LinkedListMapper<SA, T>) -> Iter<'a, SA, T> {
+    fn new(linked_list: &'a LinkedListMapper<SA, T, A>) -> Iter<'a, SA, T, A> {
         Iter {
             node_opt: linked_list.front(),
             linked_list,
         }
     }
 
-    fn new_from_node_id(linked_list: &'a LinkedListMapper<SA, T>, node_id: u32) -> Iter<'a, SA, T> {
+    fn new_from_node_id(
+        linked_list: &'a LinkedListMapper<SA, T, A>,
+        node_id: u32,
+    ) -> Iter<'a, SA, T, A> {
         Iter {
             node_opt: linked_list.get_node_by_id(node_id),
             linked_list,
@@ -544,9 +578,10 @@ where
     }
 }
 
-impl<'a, SA, T> Iterator for Iter<'a, SA, T>
+impl<'a, SA, T, A> Iterator for Iter<'a, SA, T, A>
 where
     SA: StorageMapperApi,
+    A: StorageAddress<SA>,
     T: TopEncode + TopDecode + NestedEncode + NestedDecode + Clone + 'static,
 {
     type Item = LinkedListNode<T>;

From 9d3d04feec78857111fea0171ae3d41cdf293d17 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Tue, 30 Jan 2024 12:34:54 +0200
Subject: [PATCH 0288/1254] loop unrolling instead of while

---
 data/codec/src/num_conv.rs                    | 26 ++++++++++++-------
 .../base/src/storage/mappers/queue_mapper.rs  |  2 +-
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/data/codec/src/num_conv.rs b/data/codec/src/num_conv.rs
index 8d79597b8d..baf56d5f94 100644
--- a/data/codec/src/num_conv.rs
+++ b/data/codec/src/num_conv.rs
@@ -22,15 +22,23 @@ pub fn top_encode_number(x: u64, signed: bool, buffer: &mut [u8; 8]) -> &[u8] {
     let irrelevant_byte = if negative { 0xffu8 } else { 0x00u8 };
 
     let mut offset = 0usize;
-    while buffer[offset] == irrelevant_byte {
-        debug_assert!(offset < 7);
-        offset += 1;
-    }
-
-    if signed && buffer[offset] >> 7 != negative as u8 {
-        debug_assert!(offset > 0);
-        offset -= 1;
-    }
+    let mut cursor = 1usize;
+    cursor &= (buffer[0] == irrelevant_byte) as usize;
+    offset += cursor;
+    cursor &= (buffer[1] == irrelevant_byte) as usize;
+    offset += cursor;
+    cursor &= (buffer[2] == irrelevant_byte) as usize;
+    offset += cursor;
+    cursor &= (buffer[3] == irrelevant_byte) as usize;
+    offset += cursor;
+    cursor &= (buffer[4] == irrelevant_byte) as usize;
+    offset += cursor;
+    cursor &= (buffer[5] == irrelevant_byte) as usize;
+    offset += cursor;
+    cursor &= (buffer[6] == irrelevant_byte) as usize;
+    offset += cursor;
+    cursor &= (buffer[7] == irrelevant_byte) as usize;
+    offset += cursor;
 
     &buffer[offset..]
 }
diff --git a/framework/base/src/storage/mappers/queue_mapper.rs b/framework/base/src/storage/mappers/queue_mapper.rs
index 0a20c1495a..124584ea0a 100644
--- a/framework/base/src/storage/mappers/queue_mapper.rs
+++ b/framework/base/src/storage/mappers/queue_mapper.rs
@@ -280,7 +280,7 @@ where
         QueueMapper {
             _phantom_api: PhantomData::<SA>,
             address,
-            base_key: base_key.clone(),
+            base_key,
             _phantom_item: PhantomData::<T>,
         }
     }

From b28a2432196a1e1bfdf9ec4b5e10aca4bfb7632d Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Tue, 30 Jan 2024 13:04:55 +0100
Subject: [PATCH 0289/1254] build fix

---
 Cargo.lock    | 1 +
 vm/Cargo.toml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/Cargo.lock b/Cargo.lock
index aa857f5105..a2fa485542 100755
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1784,6 +1784,7 @@ name = "multiversx-chain-vm"
 version = "0.8.1"
 dependencies = [
  "bitflags 2.4.2",
+ "colored",
  "ed25519-dalek",
  "hex",
  "hex-literal",
diff --git a/vm/Cargo.toml b/vm/Cargo.toml
index 6b2b6ec3ba..ab2f2e5f21 100644
--- a/vm/Cargo.toml
+++ b/vm/Cargo.toml
@@ -28,6 +28,7 @@ ed25519-dalek = "2.0.0"
 itertools = "0.12.0"
 hex-literal = "=0.4.1"
 bitflags = "=2.4.2"
+colored = "2.1.0"
 
 [dependencies.multiversx-chain-vm-executor]
 version = "0.2.0"

From 9f3fe80b3b9e5f63846ada3fe769ac1c9020d4c9 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 30 Jan 2024 14:05:52 +0200
Subject: [PATCH 0290/1254] codec num conversion unit test

---
 data/codec/src/num_conv.rs | 58 ++++++++++++++++++++++++++++++++++++--
 1 file changed, 56 insertions(+), 2 deletions(-)

diff --git a/data/codec/src/num_conv.rs b/data/codec/src/num_conv.rs
index 8d79597b8d..88beb8b169 100644
--- a/data/codec/src/num_conv.rs
+++ b/data/codec/src/num_conv.rs
@@ -17,7 +17,7 @@ pub fn top_encode_number(x: u64, signed: bool, buffer: &mut [u8; 8]) -> &[u8] {
     }
 
     let negative = signed &&  // only possible when signed flag
-		buffer[0] > 0x7fu8; // most significant bit is 1
+        msb_is_one(buffer[0]); // most significant bit is 1
 
     let irrelevant_byte = if negative { 0xffu8 } else { 0x00u8 };
 
@@ -44,7 +44,7 @@ pub fn universal_decode_number(bytes: &[u8], signed: bool) -> u64 {
     if bytes.is_empty() {
         return 0;
     }
-    let negative = signed && bytes[0] >> 7 == 1;
+    let negative = signed && msb_is_one(bytes[0]);
     let mut result = if negative {
         // start with all bits set to 1,
         // to ensure that if there are fewer bytes than the result type width,
@@ -59,3 +59,57 @@ pub fn universal_decode_number(bytes: &[u8], signed: bool) -> u64 {
     }
     result
 }
+
+/// Most significant bit is 1.
+#[inline]
+fn msb_is_one(byte: u8) -> bool {
+    byte >= 0b1000_0000u8
+}
+
+#[cfg(test)]
+#[rustfmt::skip]
+mod test {
+    use super::*;
+
+    fn test_encode_decode(x: u64, signed: bool, bytes: &[u8]) {
+        let mut buffer = [0u8; 8];
+        assert_eq!(top_encode_number(x, signed, &mut buffer), bytes);
+        assert_eq!(universal_decode_number(bytes, signed,), x);
+    }
+
+    #[test]
+    fn test_top_encode_number() {
+        // unsigned
+        test_encode_decode(0x00, false, &[]);
+        test_encode_decode(0x01, false, &[1]);
+        test_encode_decode(0x7f, false, &[0x7f]);
+        test_encode_decode(0x80, false, &[0x80]);
+        test_encode_decode(0xff, false, &[0xff]);
+        test_encode_decode(0x0100, false, &[1, 0]);
+        test_encode_decode(0xff00, false, &[0xff, 0]);
+        test_encode_decode(0xffff, false, &[0xff, 0xff]);
+        test_encode_decode(0xffffffffffffffff, false, &[0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff]);
+
+        // signed, positive
+        test_encode_decode(0x00, true, &[]);
+        test_encode_decode(0x01, true, &[1]);
+        test_encode_decode(0x7f, true, &[0x7f]);
+        test_encode_decode(0x80, true, &[0x00, 0x80]);
+        test_encode_decode(0x0100, true, &[1, 0]);
+        test_encode_decode(0xff00, true, &[0x00, 0xff, 0]);
+        test_encode_decode(0xffff, true, &[0x00, 0xff, 0xff]);
+        test_encode_decode(0x7fffffffffffffff, true, &[0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff]);
+        test_encode_decode(0x8000000000000000, true, &[0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00]);
+
+        // signed, negative
+        test_encode_decode(-1i64 as u64, true, &[0xff]);
+        test_encode_decode(-2i64 as u64, true, &[0xfe]);
+        test_encode_decode(-126i64 as u64, true, &[0x82]);
+        test_encode_decode(-127i64 as u64, true, &[0x81]);
+        test_encode_decode(-128i64 as u64, true, &[0x80]);
+        test_encode_decode(-129i64 as u64, true, &[0xff, 0x7f]);
+        test_encode_decode(-255i64 as u64, true, &[0xff, 0x01]);
+        test_encode_decode(-256i64 as u64, true, &[0xff, 0x00]);
+        test_encode_decode(-257i64 as u64, true, &[0xfe, 0xff]);
+    }
+}

From 864764222299d9c467a3ba9b7ffc28649970a786 Mon Sep 17 00:00:00 2001
From: Alin Cruceat <alyn_509@yahoo.com>
Date: Tue, 30 Jan 2024 14:17:03 +0200
Subject: [PATCH 0291/1254] sorted dedup

---
 .../src/types/managed/wrapped/managed_vec.rs     | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/framework/base/src/types/managed/wrapped/managed_vec.rs b/framework/base/src/types/managed/wrapped/managed_vec.rs
index 7447630553..3d2b345341 100644
--- a/framework/base/src/types/managed/wrapped/managed_vec.rs
+++ b/framework/base/src/types/managed/wrapped/managed_vec.rs
@@ -460,6 +460,22 @@ where
         })
     }
 }
+impl<M, T> ManagedVec<M, T>
+where
+    M: ManagedTypeApi,
+    T: ManagedVecItem + PartialEq + Debug + Ord,
+{
+    pub fn sorted_dedup(&mut self)
+    where
+        [(); T::PAYLOAD_SIZE]:,
+    {
+        self.with_self_as_slice_mut(|slice| {
+            let (dedup, _) = slice.partition_dedup();
+            dedup.sort();
+            dedup
+        })
+    }
+}
 
 impl<M, T> Clone for ManagedVec<M, T>
 where

From 4605a811f5e0b407b42901ac772493a1f9bcc7f5 Mon Sep 17 00:00:00 2001
From: Alin Cruceat <alyn_509@yahoo.com>
Date: Wed, 31 Jan 2024 09:48:24 +0200
Subject: [PATCH 0292/1254] remove #![feature(slice_partition_dedup)]

---
 framework/base/src/lib.rs                     |  1 -
 .../src/types/managed/wrapped/managed_vec.rs  | 47 ++++++++++++-------
 2 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/framework/base/src/lib.rs b/framework/base/src/lib.rs
index b90cb89409..dfc55d6b71 100644
--- a/framework/base/src/lib.rs
+++ b/framework/base/src/lib.rs
@@ -10,7 +10,6 @@
 #![feature(negative_impls)]
 #![feature(generic_const_exprs)]
 #![allow(incomplete_features)]
-#![feature(slice_partition_dedup)]
 #![feature(is_sorted)]
 pub use multiversx_sc_derive::{self as derive, contract, module, proxy};
 
diff --git a/framework/base/src/types/managed/wrapped/managed_vec.rs b/framework/base/src/types/managed/wrapped/managed_vec.rs
index 3d2b345341..84df8edbd9 100644
--- a/framework/base/src/types/managed/wrapped/managed_vec.rs
+++ b/framework/base/src/types/managed/wrapped/managed_vec.rs
@@ -12,7 +12,9 @@ use crate::{
     },
 };
 use alloc::vec::Vec;
-use core::{borrow::Borrow, cmp::Ordering, fmt::Debug, iter::FromIterator, marker::PhantomData};
+use core::{
+    borrow::Borrow, cmp::Ordering, fmt::Debug, iter::FromIterator, marker::PhantomData, mem,
+};
 
 use super::EncodedManagedVecItem;
 
@@ -455,23 +457,32 @@ where
         [(); T::PAYLOAD_SIZE]:,
     {
         self.with_self_as_slice_mut(|slice| {
-            let (dedup, _) = slice.partition_dedup();
-            dedup
-        })
-    }
-}
-impl<M, T> ManagedVec<M, T>
-where
-    M: ManagedTypeApi,
-    T: ManagedVecItem + PartialEq + Debug + Ord,
-{
-    pub fn sorted_dedup(&mut self)
-    where
-        [(); T::PAYLOAD_SIZE]:,
-    {
-        self.with_self_as_slice_mut(|slice| {
-            let (dedup, _) = slice.partition_dedup();
-            dedup.sort();
+            let same_bucket = |a, b| a == b;
+            let len = slice.len();
+            if len <= 1 {
+                return slice;
+            }
+
+            let ptr = slice.as_mut_ptr();
+            let mut next_read: usize = 1;
+            let mut next_write: usize = 1;
+            unsafe {
+                // Avoid bounds checks by using raw pointers.
+                while next_read < len {
+                    let ptr_read = ptr.add(next_read);
+                    let prev_ptr_write = ptr.add(next_write - 1);
+                    if !same_bucket(&mut *ptr_read, &mut *prev_ptr_write) {
+                        if next_read != next_write {
+                            let ptr_write = prev_ptr_write.add(1);
+                            mem::swap(&mut *ptr_read, &mut *ptr_write);
+                        }
+                        next_write += 1;
+                    }
+                    next_read += 1;
+                }
+            }
+
+            let (dedup, _) = slice.split_at_mut(next_write);
             dedup
         })
     }

From 03ca3d5de0a9fb21e252cab914471d11363ce817 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 31 Jan 2024 09:51:30 +0200
Subject: [PATCH 0293/1254] top_encode_number no if/loop

---
 data/codec/src/num_conv.rs             | 163 ++++++++++++++++++++-----
 data/codec/src/single/top_en_output.rs |   7 +-
 2 files changed, 138 insertions(+), 32 deletions(-)

diff --git a/data/codec/src/num_conv.rs b/data/codec/src/num_conv.rs
index 380e453fa1..f426fc3f50 100644
--- a/data/codec/src/num_conv.rs
+++ b/data/codec/src/num_conv.rs
@@ -1,46 +1,101 @@
+pub const TOP_ENCODE_NUMBER_BUFFER_SIZE: usize = 9;
+
 /// Encodes number to minimimum number of bytes (top-encoding).
 ///
 /// Smaller types need to be converted to u64 before using this function.
 ///
 /// No generics here, we avoid monomorphization to make the SC binary as small as possible.
-pub fn top_encode_number(x: u64, signed: bool, buffer: &mut [u8; 8]) -> &[u8] {
-    *buffer = x.to_be_bytes();
-    if x == 0 {
-        // 0 is a special case
-        return &[];
-    }
+pub fn top_encode_number(
+    x: u64,
+    signed: bool,
+    buffer: &mut [u8; TOP_ENCODE_NUMBER_BUFFER_SIZE],
+) -> &[u8] {
+    let offset = fill_buffer_find_offset(x, signed, buffer);
 
-    if signed && x == u64::MAX {
-        // -1 is a special case
-        // will return a single 0xFF byte
-        return &buffer[7..];
-    }
+    debug_assert!(offset < 9);
 
-    let negative = signed &&  // only possible when signed flag
-        msb_is_one(buffer[0]); // most significant bit is 1
+    unsafe { buffer.get_unchecked(offset..8) }
+}
 
-    let irrelevant_byte = if negative { 0xffu8 } else { 0x00u8 };
+/// At the same time fills the buffer,
+/// and performs the algorithm that tells us how many bytes can be skipped.
+///
+/// Everything done in one function instead of 2, to avoid any unwanted bounds checks.
+///
+/// This function is hyper-optimized to not contain any jumps. There are no ifs or loops in this,
+/// the entire algorithm is performed via arithmetic, boolean and bitwise operations.
+fn fill_buffer_find_offset(
+    x: u64,
+    signed: bool,
+    buffer: &mut [u8; TOP_ENCODE_NUMBER_BUFFER_SIZE],
+) -> usize {
+    let b0 = (x >> 56 & 0xff) as u8;
+
+    let negative = signed && msbit_is_one(b0);
+    let skippable_byte = skippable_byte(negative);
 
     let mut offset = 0usize;
     let mut cursor = 1usize;
-    cursor &= (buffer[0] == irrelevant_byte) as usize;
+
+    change_one_to_zero_unless(&mut cursor, b0 == skippable_byte);
     offset += cursor;
-    cursor &= (buffer[1] == irrelevant_byte) as usize;
+
+    let b1 = (x >> 48 & 0xff) as u8;
+    change_one_to_zero_unless(&mut cursor, b1 == skippable_byte);
     offset += cursor;
-    cursor &= (buffer[2] == irrelevant_byte) as usize;
+
+    let b2 = (x >> 40 & 0xff) as u8;
+    change_one_to_zero_unless(&mut cursor, b2 == skippable_byte);
     offset += cursor;
-    cursor &= (buffer[3] == irrelevant_byte) as usize;
+
+    let b3 = (x >> 32 & 0xff) as u8;
+    change_one_to_zero_unless(&mut cursor, b3 == skippable_byte);
     offset += cursor;
-    cursor &= (buffer[4] == irrelevant_byte) as usize;
+
+    let b4 = (x >> 24 & 0xff) as u8;
+    change_one_to_zero_unless(&mut cursor, b4 == skippable_byte);
     offset += cursor;
-    cursor &= (buffer[5] == irrelevant_byte) as usize;
+
+    let b5 = (x >> 16 & 0xff) as u8;
+    change_one_to_zero_unless(&mut cursor, b5 == skippable_byte);
     offset += cursor;
-    cursor &= (buffer[6] == irrelevant_byte) as usize;
+
+    let b6 = (x >> 8 & 0xff) as u8;
+    change_one_to_zero_unless(&mut cursor, b6 == skippable_byte);
     offset += cursor;
-    cursor &= (buffer[7] == irrelevant_byte) as usize;
+
+    let b7 = (x & 0xff) as u8;
+    change_one_to_zero_unless(&mut cursor, b7 == skippable_byte);
     offset += cursor;
 
-    &buffer[offset..]
+    buffer[0] = b0;
+    buffer[1] = b1;
+    buffer[2] = b2;
+    buffer[3] = b3;
+    buffer[4] = b4;
+    buffer[5] = b5;
+    buffer[6] = b6;
+    buffer[7] = b7;
+    buffer[8] = 0;
+
+    // For signed numbers, it can sometimes happen that we are skipping too many bytes,
+    // and the most significant bit ends up different than what we started with.
+    // In this case we need to backtrack one step.
+    // e.g. 255: [255] -> [0, 255]
+    // e.g. -129: [0x7f] -> [0xff, 0x7f]
+    cursor = 1;
+    change_one_to_zero_unless(&mut cursor, signed);
+    change_one_to_zero_unless(&mut cursor, offset > 0);
+    let msbit_corrupted =
+        msbit_is_one(unsafe { *buffer.get_unchecked(offset) }) != msbit_is_one(b0);
+    change_one_to_zero_unless(&mut cursor, msbit_corrupted);
+
+    // According to this algorithm, it should be impossible to underflow
+    // using wrapping_sub to avoid unnecessary underflow check
+    debug_assert!(offset >= cursor);
+    offset = offset.wrapping_sub(cursor);
+
+    offset
 }
 
 /// Handles both top-encoding and nested-encoding, signed and unsigned, of any length.
@@ -52,7 +107,7 @@ pub fn universal_decode_number(bytes: &[u8], signed: bool) -> u64 {
     if bytes.is_empty() {
         return 0;
     }
-    let negative = signed && msb_is_one(bytes[0]);
+    let negative = signed && msbit_is_one(bytes[0]);
     let mut result = if negative {
         // start with all bits set to 1,
         // to ensure that if there are fewer bytes than the result type width,
@@ -70,22 +125,72 @@ pub fn universal_decode_number(bytes: &[u8], signed: bool) -> u64 {
 
 /// Most significant bit is 1.
 #[inline]
-fn msb_is_one(byte: u8) -> bool {
+fn msbit_is_one(byte: u8) -> bool {
     byte >= 0b1000_0000u8
 }
 
+#[inline]
+fn change_one_to_zero_unless(x: &mut usize, condition: bool) {
+    debug_assert!(*x <= 1);
+    *x &= condition as usize;
+}
+
+/// For negative = true, yields 0xff.
+///
+/// For negative = true, yields 0x00.
+///
+/// Has no if, doesn't branch.
+#[inline]
+fn skippable_byte(negative: bool) -> u8 {
+    0u8.wrapping_sub(negative as u8)
+}
+
 #[cfg(test)]
-#[rustfmt::skip]
 mod test {
     use super::*;
 
+    #[test]
+    fn test_set_to_zero_unless() {
+        let mut x = 1;
+        change_one_to_zero_unless(&mut x, true);
+        assert_eq!(x, 1);
+        change_one_to_zero_unless(&mut x, false);
+        assert_eq!(x, 0);
+    }
+
+    #[test]
+    fn test_skippable_byte() {
+        assert_eq!(skippable_byte(true), 0xffu8);
+        assert_eq!(skippable_byte(false), 0x00u8);
+    }
+
+    /// Only checks the filling out of the buffer.
+    #[test]
+    fn test_populate_buffer() {
+        let mut buffer = [0u8; TOP_ENCODE_NUMBER_BUFFER_SIZE];
+        let _ = fill_buffer_find_offset(0x12345678abcdef12, false, &mut buffer);
+        assert_eq!(
+            buffer,
+            [0x12, 0x34, 0x56, 0x78, 0xab, 0xcd, 0xef, 0x12, 0x00]
+        );
+    }
+
     fn test_encode_decode(x: u64, signed: bool, bytes: &[u8]) {
-        let mut buffer = [0u8; 8];
-        assert_eq!(top_encode_number(x, signed, &mut buffer), bytes);
-        assert_eq!(universal_decode_number(bytes, signed,), x);
+        let mut buffer = [0u8; TOP_ENCODE_NUMBER_BUFFER_SIZE];
+        assert_eq!(
+            top_encode_number(x, signed, &mut buffer),
+            bytes,
+            "encode failed for {x}"
+        );
+        assert_eq!(
+            universal_decode_number(bytes, signed,),
+            x,
+            "decode failed for {x}"
+        );
     }
 
     #[test]
+    #[rustfmt::skip]
     fn test_top_encode_number() {
         // unsigned
         test_encode_decode(0x00, false, &[]);
diff --git a/data/codec/src/single/top_en_output.rs b/data/codec/src/single/top_en_output.rs
index d409a9e4c1..b79d393cad 100644
--- a/data/codec/src/single/top_en_output.rs
+++ b/data/codec/src/single/top_en_output.rs
@@ -1,5 +1,6 @@
 use crate::{
-    num_conv::top_encode_number, EncodeError, EncodeErrorHandler, NestedEncodeOutput, TryStaticCast,
+    num_conv::{top_encode_number, TOP_ENCODE_NUMBER_BUFFER_SIZE},
+    EncodeError, EncodeErrorHandler, NestedEncodeOutput, TryStaticCast,
 };
 use alloc::vec::Vec;
 
@@ -20,13 +21,13 @@ pub trait TopEncodeOutput: Sized {
     fn set_slice_u8(self, bytes: &[u8]);
 
     fn set_u64(self, value: u64) {
-        let mut buffer = [0u8; 8];
+        let mut buffer = [0u8; TOP_ENCODE_NUMBER_BUFFER_SIZE];
         let slice = top_encode_number(value, false, &mut buffer);
         self.set_slice_u8(slice);
     }
 
     fn set_i64(self, value: i64) {
-        let mut buffer = [0u8; 8];
+        let mut buffer = [0u8; TOP_ENCODE_NUMBER_BUFFER_SIZE];
         let slice = top_encode_number(value as u64, true, &mut buffer);
         self.set_slice_u8(slice);
     }

From a5974e0bdf11816e3e699142e1c974785500c05a Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 31 Jan 2024 09:54:49 +0200
Subject: [PATCH 0294/1254] top_encode_number buffer refactor

---
 data/codec/src/num_conv.rs             | 22 +++++++++-------------
 data/codec/src/single/top_en_output.rs |  6 +++---
 2 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/data/codec/src/num_conv.rs b/data/codec/src/num_conv.rs
index f426fc3f50..0a947b574b 100644
--- a/data/codec/src/num_conv.rs
+++ b/data/codec/src/num_conv.rs
@@ -1,15 +1,15 @@
-pub const TOP_ENCODE_NUMBER_BUFFER_SIZE: usize = 9;
+pub type TopEncodeNumberBuffer = [u8; 9];
+
+pub const fn top_encode_number_buffer() -> TopEncodeNumberBuffer {
+    [0u8; 9]
+}
 
 /// Encodes number to minimimum number of bytes (top-encoding).
 ///
 /// Smaller types need to be converted to u64 before using this function.
 ///
 /// No generics here, we avoid monomorphization to make the SC binary as small as possible.
-pub fn top_encode_number(
-    x: u64,
-    signed: bool,
-    buffer: &mut [u8; TOP_ENCODE_NUMBER_BUFFER_SIZE],
-) -> &[u8] {
+pub fn top_encode_number(x: u64, signed: bool, buffer: &mut TopEncodeNumberBuffer) -> &[u8] {
     let offset = fill_buffer_find_offset(x, signed, buffer);
 
     debug_assert!(offset < 9);
@@ -24,11 +24,7 @@ pub fn top_encode_number(
 ///
 /// This function is hyper-optimized to not contain any jumps. There are no ifs or loops in this,
 /// the entire algorithm is performed via arithmetic, boolean and bitwise operations.
-fn fill_buffer_find_offset(
-    x: u64,
-    signed: bool,
-    buffer: &mut [u8; TOP_ENCODE_NUMBER_BUFFER_SIZE],
-) -> usize {
+fn fill_buffer_find_offset(x: u64, signed: bool, buffer: &mut TopEncodeNumberBuffer) -> usize {
     let b0 = (x >> 56 & 0xff) as u8;
 
     let negative = signed && msbit_is_one(b0);
@@ -167,7 +163,7 @@ mod test {
     /// Only checks the filling out of the buffer.
     #[test]
     fn test_populate_buffer() {
-        let mut buffer = [0u8; TOP_ENCODE_NUMBER_BUFFER_SIZE];
+        let mut buffer = top_encode_number_buffer();
         let _ = fill_buffer_find_offset(0x12345678abcdef12, false, &mut buffer);
         assert_eq!(
             buffer,
@@ -176,7 +172,7 @@ mod test {
     }
 
     fn test_encode_decode(x: u64, signed: bool, bytes: &[u8]) {
-        let mut buffer = [0u8; TOP_ENCODE_NUMBER_BUFFER_SIZE];
+        let mut buffer = top_encode_number_buffer();
         assert_eq!(
             top_encode_number(x, signed, &mut buffer),
             bytes,
diff --git a/data/codec/src/single/top_en_output.rs b/data/codec/src/single/top_en_output.rs
index b79d393cad..4f955ca2f2 100644
--- a/data/codec/src/single/top_en_output.rs
+++ b/data/codec/src/single/top_en_output.rs
@@ -1,5 +1,5 @@
 use crate::{
-    num_conv::{top_encode_number, TOP_ENCODE_NUMBER_BUFFER_SIZE},
+    num_conv::{top_encode_number, top_encode_number_buffer},
     EncodeError, EncodeErrorHandler, NestedEncodeOutput, TryStaticCast,
 };
 use alloc::vec::Vec;
@@ -21,13 +21,13 @@ pub trait TopEncodeOutput: Sized {
     fn set_slice_u8(self, bytes: &[u8]);
 
     fn set_u64(self, value: u64) {
-        let mut buffer = [0u8; TOP_ENCODE_NUMBER_BUFFER_SIZE];
+        let mut buffer = top_encode_number_buffer();
         let slice = top_encode_number(value, false, &mut buffer);
         self.set_slice_u8(slice);
     }
 
     fn set_i64(self, value: i64) {
-        let mut buffer = [0u8; TOP_ENCODE_NUMBER_BUFFER_SIZE];
+        let mut buffer = top_encode_number_buffer();
         let slice = top_encode_number(value as u64, true, &mut buffer);
         self.set_slice_u8(slice);
     }

From ffd2189b32107d3c5b06880434583aead794ed25 Mon Sep 17 00:00:00 2001
From: Alin Cruceat <alyn_509@yahoo.com>
Date: Wed, 31 Jan 2024 09:55:32 +0200
Subject: [PATCH 0295/1254] remove #![feature(is_sorted)]

---
 framework/base/src/lib.rs                     |  1 -
 .../src/types/managed/wrapped/managed_vec.rs  | 37 +++++++++++--------
 2 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/framework/base/src/lib.rs b/framework/base/src/lib.rs
index dfc55d6b71..8d45f7dff1 100644
--- a/framework/base/src/lib.rs
+++ b/framework/base/src/lib.rs
@@ -10,7 +10,6 @@
 #![feature(negative_impls)]
 #![feature(generic_const_exprs)]
 #![allow(incomplete_features)]
-#![feature(is_sorted)]
 pub use multiversx_sc_derive::{self as derive, contract, module, proxy};
 
 // re-export basic heap types
diff --git a/framework/base/src/types/managed/wrapped/managed_vec.rs b/framework/base/src/types/managed/wrapped/managed_vec.rs
index 84df8edbd9..6182dea325 100644
--- a/framework/base/src/types/managed/wrapped/managed_vec.rs
+++ b/framework/base/src/types/managed/wrapped/managed_vec.rs
@@ -426,24 +426,29 @@ where
     }
 
     pub fn is_sorted(&self) -> bool {
-        self.with_self_as_slice(|slice| slice.is_sorted())
-    }
-
-    pub fn is_sorted_by<F>(&self, mut compare: F) -> bool
-    where
-        F: FnMut(&T, &T) -> Option<Ordering>,
-    {
         self.with_self_as_slice(|slice| {
-            slice.is_sorted_by(|a, b| compare(&a.decode(), &b.decode()))
-        })
-    }
+            let mut slice_iter = slice.iter();
+            #[inline]
+            fn check<'a, T>(
+                last: &'a mut T,
+                mut compare: impl FnMut(&T, &T) -> Option<Ordering> + 'a,
+            ) -> impl FnMut(T) -> bool + 'a {
+                move |curr| {
+                    if let Some(Ordering::Greater) | None = compare(&last, &curr) {
+                        return false;
+                    }
+                    *last = curr;
+                    true
+                }
+            }
 
-    pub fn is_sorted_by_key<K, F>(&self, mut f: F) -> bool
-    where
-        F: FnMut(&T) -> K,
-        K: Ord,
-    {
-        self.with_self_as_slice(|slice| slice.is_sorted_by_key(|a| f(&a.decode())))
+            let mut last = match slice_iter.next() {
+                Some(e) => e,
+                None => return true,
+            };
+
+            slice_iter.all(check(&mut last, PartialOrd::partial_cmp))
+        })
     }
 }
 

From 2d8881b3e2eefffffda5ce85914bcef81f5eb456 Mon Sep 17 00:00:00 2001
From: Alin Cruceat <alyn_509@yahoo.com>
Date: Wed, 31 Jan 2024 10:01:21 +0200
Subject: [PATCH 0296/1254] remove tests of removed features

---
 framework/scenario/tests/managed_vec_test.rs | 36 --------------------
 1 file changed, 36 deletions(-)

diff --git a/framework/scenario/tests/managed_vec_test.rs b/framework/scenario/tests/managed_vec_test.rs
index 284c89c43b..90fa88c376 100644
--- a/framework/scenario/tests/managed_vec_test.rs
+++ b/framework/scenario/tests/managed_vec_test.rs
@@ -135,8 +135,6 @@ fn test_sort_u64() {
     }
 
     assert!(!managed_vec.is_sorted());
-    assert!(managed_vec.is_sorted_by(|a, b| Some(a.cmp(&(b * 10u64)))));
-    assert!(managed_vec.is_sorted_by_key(|d| d / 10u64 > 1u64));
     managed_vec.sort();
     vec.sort();
 
@@ -178,13 +176,11 @@ fn test_sort_by_u64() {
 
     assert!(!managed_vec.is_sorted());
 
-    assert!(!managed_vec.is_sorted_by(|a, b| Some(flip(a).cmp(&flip(b)))));
     managed_vec.sort_by(|a, b| flip(a).cmp(&flip(b)));
     vec.sort_by_key(flip);
 
     assert!(!managed_vec.is_sorted());
 
-    assert!(managed_vec.is_sorted_by(|a, b| Some(flip(a).cmp(&flip(b)))));
     assert_eq!(vec, managed_vec.into_vec());
 }
 
@@ -200,11 +196,6 @@ fn test_sort_by_biguint() {
 
     assert!(!managed_vec.is_sorted());
 
-    assert!(!managed_vec.is_sorted_by(|a, b| {
-        let a_u64 = a.to_u64().unwrap();
-        let b_u64 = b.to_u64().unwrap();
-        Some(flip(&a_u64).cmp(&flip(&b_u64)))
-    }));
     managed_vec.sort_by(|a, b| {
         let a_u64 = a.to_u64().unwrap();
         let b_u64 = b.to_u64().unwrap();
@@ -218,11 +209,6 @@ fn test_sort_by_biguint() {
 
     assert!(!managed_vec.is_sorted());
 
-    assert!(managed_vec.is_sorted_by(|a, b| {
-        let a_u64 = a.to_u64().unwrap();
-        let b_u64 = b.to_u64().unwrap();
-        Some(flip(&a_u64).cmp(&flip(&b_u64)))
-    }));
     assert_eq!(vec, managed_vec.into_vec());
 }
 
@@ -237,13 +223,11 @@ fn test_sort_by_key_u64() {
 
     assert!(!managed_vec.is_sorted());
 
-    assert!(!managed_vec.is_sorted_by_key(|a| a.to_string().len()));
     managed_vec.sort_by_key(|a| a.to_string().len());
     vec.sort_by_key(|a| a.to_string().len());
 
     assert!(managed_vec.is_sorted());
 
-    assert!(managed_vec.is_sorted_by_key(|a| a.to_string().len()));
     assert_eq!(vec, managed_vec.into_vec());
 }
 
@@ -259,13 +243,11 @@ fn test_sort_by_key_biguint() {
 
     assert!(!managed_vec.is_sorted());
 
-    assert!(!managed_vec.is_sorted_by_key(|a| a.to_u64().unwrap().to_string().len()));
     managed_vec.sort_by_key(|a| a.to_u64().unwrap().to_string().len());
     vec.sort_by_key(|a| a.to_u64().unwrap().to_string().len());
 
     assert!(managed_vec.is_sorted());
 
-    assert!(managed_vec.is_sorted_by_key(|a| a.to_u64().unwrap().to_string().len()));
     assert_eq!(vec, managed_vec.into_vec());
 }
 
@@ -280,7 +262,6 @@ fn test_sort_by_cached_key_u64() {
 
     managed_vec.sort_by_cached_key(|a| a.to_string());
     vec.sort_by_cached_key(|a| a.to_string());
-    assert!(managed_vec.is_sorted_by_key(|a| a.to_string()));
     let managed_vec_as_vec = managed_vec.into_vec();
     assert_eq!(managed_vec_as_vec, [1111u64, 222u64, 33u64, 4u64]);
     assert_eq!(vec, managed_vec_as_vec);
@@ -298,7 +279,6 @@ fn test_sort_by_cached_key_biguint() {
 
     managed_vec.sort_by_cached_key(|a| a.to_u64().unwrap().to_string());
     vec.sort_by_cached_key(|a| a.to_u64().unwrap().to_string());
-    assert!(managed_vec.is_sorted_by_key(|a| a.to_u64().unwrap().to_string()));
     let managed_vec_as_vec = managed_vec.into_vec();
     assert_eq!(managed_vec_as_vec, [1111u64, 222u64, 33u64, 4u64]);
     assert_eq!(vec, managed_vec_as_vec);
@@ -344,13 +324,11 @@ fn test_sort_unstable_by_u64() {
 
     assert!(!managed_vec.is_sorted());
 
-    assert!(!managed_vec.is_sorted_by(|a, b| Some(flip(a).cmp(&flip(b)))));
     managed_vec.sort_unstable_by(|a, b| flip(a).cmp(&flip(b)));
     vec.sort_unstable_by_key(flip);
 
     assert!(!managed_vec.is_sorted());
 
-    assert!(managed_vec.is_sorted_by(|a, b| Some(flip(a).cmp(&flip(b)))));
     assert_eq!(vec, managed_vec.into_vec());
 }
 
@@ -366,11 +344,6 @@ fn test_sort_unstable_by_biguint() {
 
     assert!(!managed_vec.is_sorted());
 
-    assert!(!managed_vec.is_sorted_by(|a, b| {
-        let a_u64 = a.to_u64().unwrap();
-        let b_u64 = b.to_u64().unwrap();
-        Some(flip(&a_u64).cmp(&flip(&b_u64)))
-    }));
     managed_vec.sort_unstable_by(|a, b| {
         let a_u64 = a.to_u64().unwrap();
         let b_u64 = b.to_u64().unwrap();
@@ -384,11 +357,6 @@ fn test_sort_unstable_by_biguint() {
 
     assert!(!managed_vec.is_sorted());
 
-    assert!(managed_vec.is_sorted_by(|a, b| {
-        let a_u64 = a.to_u64().unwrap();
-        let b_u64 = b.to_u64().unwrap();
-        Some(flip(&a_u64).cmp(&flip(&b_u64)))
-    }));
     assert_eq!(vec, managed_vec.into_vec());
 }
 
@@ -403,13 +371,11 @@ fn test_sort_unstable_by_key_u64() {
 
     assert!(!managed_vec.is_sorted());
 
-    assert!(!managed_vec.is_sorted_by_key(|a| a.to_string().len()));
     managed_vec.sort_unstable_by_key(|a| a.to_string().len());
     vec.sort_unstable_by_key(|a| a.to_string().len());
 
     assert!(managed_vec.is_sorted());
 
-    assert!(managed_vec.is_sorted_by_key(|a| a.to_string().len()));
     assert_eq!(vec, managed_vec.into_vec());
 }
 
@@ -425,13 +391,11 @@ fn test_sort_unstable_by_key_biguint() {
 
     assert!(!managed_vec.is_sorted());
 
-    assert!(!managed_vec.is_sorted_by_key(|a| a.to_u64().unwrap().to_string().len()));
     managed_vec.sort_unstable_by_key(|a| a.to_u64().unwrap().to_string().len());
     vec.sort_unstable_by_key(|a| a.to_u64().unwrap().to_string().len());
 
     assert!(managed_vec.is_sorted());
 
-    assert!(managed_vec.is_sorted_by_key(|a| a.to_u64().unwrap().to_string().len()));
     assert_eq!(vec, managed_vec.into_vec());
 }
 

From daca9c059d1d5b2e9b6f6ec66c68c98bd3a941a8 Mon Sep 17 00:00:00 2001
From: Alin Cruceat <alyn_509@yahoo.com>
Date: Wed, 31 Jan 2024 10:11:32 +0200
Subject: [PATCH 0297/1254] clippy

---
 framework/base/src/types/managed/wrapped/managed_vec.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/framework/base/src/types/managed/wrapped/managed_vec.rs b/framework/base/src/types/managed/wrapped/managed_vec.rs
index 6182dea325..29b7bb2467 100644
--- a/framework/base/src/types/managed/wrapped/managed_vec.rs
+++ b/framework/base/src/types/managed/wrapped/managed_vec.rs
@@ -434,7 +434,7 @@ where
                 mut compare: impl FnMut(&T, &T) -> Option<Ordering> + 'a,
             ) -> impl FnMut(T) -> bool + 'a {
                 move |curr| {
-                    if let Some(Ordering::Greater) | None = compare(&last, &curr) {
+                    if let Some(Ordering::Greater) | None = compare(last, &curr) {
                         return false;
                     }
                     *last = curr;
@@ -479,7 +479,7 @@ where
                     if !same_bucket(&mut *ptr_read, &mut *prev_ptr_write) {
                         if next_read != next_write {
                             let ptr_write = prev_ptr_write.add(1);
-                            mem::swap(&mut *ptr_read, &mut *ptr_write);
+                            core::ptr::swap(ptr_read, ptr_write);
                         }
                         next_write += 1;
                     }

From 8542d6c97d2adb029bb83e2ec68de77c509a869d Mon Sep 17 00:00:00 2001
From: Alin Cruceat <alyn_509@yahoo.com>
Date: Wed, 31 Jan 2024 10:15:15 +0200
Subject: [PATCH 0298/1254] cleanup

---
 framework/base/src/types/managed/wrapped/managed_vec.rs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/framework/base/src/types/managed/wrapped/managed_vec.rs b/framework/base/src/types/managed/wrapped/managed_vec.rs
index 29b7bb2467..6a938c6412 100644
--- a/framework/base/src/types/managed/wrapped/managed_vec.rs
+++ b/framework/base/src/types/managed/wrapped/managed_vec.rs
@@ -12,9 +12,7 @@ use crate::{
     },
 };
 use alloc::vec::Vec;
-use core::{
-    borrow::Borrow, cmp::Ordering, fmt::Debug, iter::FromIterator, marker::PhantomData, mem,
-};
+use core::{borrow::Borrow, cmp::Ordering, fmt::Debug, iter::FromIterator, marker::PhantomData};
 
 use super::EncodedManagedVecItem;
 

From 4fcb39b9db55fb21963859f7e166d49c99e8769e Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 31 Jan 2024 11:15:22 +0200
Subject: [PATCH 0299/1254] top_encode_number cleaned up edge case

---
 data/codec/src/num_conv.rs | 31 +++++++++++++++++++------------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/data/codec/src/num_conv.rs b/data/codec/src/num_conv.rs
index 0a947b574b..cfca20180b 100644
--- a/data/codec/src/num_conv.rs
+++ b/data/codec/src/num_conv.rs
@@ -1,7 +1,10 @@
-pub type TopEncodeNumberBuffer = [u8; 9];
+pub type TopEncodeNumberBuffer = [u8; 8];
 
+/// This buffer is needed to provide some underlying structure on stack off which to build a variable-length slice.
+///
+/// Its length is 9 (one more than necessary, to elegantly deal with the edge case "-1").
 pub const fn top_encode_number_buffer() -> TopEncodeNumberBuffer {
-    [0u8; 9]
+    [0u8; 8]
 }
 
 /// Encodes number to minimimum number of bytes (top-encoding).
@@ -14,7 +17,7 @@ pub fn top_encode_number(x: u64, signed: bool, buffer: &mut TopEncodeNumberBuffe
 
     debug_assert!(offset < 9);
 
-    unsafe { buffer.get_unchecked(offset..8) }
+    unsafe { buffer.get_unchecked(offset..) }
 }
 
 /// At the same time fills the buffer,
@@ -60,8 +63,11 @@ fn fill_buffer_find_offset(x: u64, signed: bool, buffer: &mut TopEncodeNumberBuf
     change_one_to_zero_unless(&mut cursor, b6 == skippable_byte);
     offset += cursor;
 
+    // The last byte: it can only get skipped for the number 0.
+    // Writing `b7 == skippable_byte` instead would also have caught -1,
+    // but that is an edge case where we do not want the last byte skipped.
     let b7 = (x & 0xff) as u8;
-    change_one_to_zero_unless(&mut cursor, b7 == skippable_byte);
+    change_one_to_zero_unless(&mut cursor, x == 0);
     offset += cursor;
 
     buffer[0] = b0;
@@ -72,7 +78,6 @@ fn fill_buffer_find_offset(x: u64, signed: bool, buffer: &mut TopEncodeNumberBuf
     buffer[5] = b5;
     buffer[6] = b6;
     buffer[7] = b7;
-    buffer[8] = 0;
 
     // For signed numbers, it can sometimes happen that we are skipping too many bytes,
     // and the most significant bit ends up different than what we started with.
@@ -82,8 +87,13 @@ fn fill_buffer_find_offset(x: u64, signed: bool, buffer: &mut TopEncodeNumberBuf
     cursor = 1;
     change_one_to_zero_unless(&mut cursor, signed);
     change_one_to_zero_unless(&mut cursor, offset > 0);
-    let msbit_corrupted =
-        msbit_is_one(unsafe { *buffer.get_unchecked(offset) }) != msbit_is_one(b0);
+
+    // The only time when the offset can be 8 (and thus out of bounds)
+    // is for the number 0. Conveniently, for 0 all bytes are 0, so applying modulo 8 does not change the outcome.
+    let byte_at_offset = buffer[offset % 8];
+
+    // The main condition for stepping back one step: the most significant bit changed in the process.
+    let msbit_corrupted = msbit_is_one(byte_at_offset) != msbit_is_one(b0);
     change_one_to_zero_unless(&mut cursor, msbit_corrupted);
 
     // According to this algorithm, it should be impossible to underflow
@@ -133,7 +143,7 @@ fn change_one_to_zero_unless(x: &mut usize, condition: bool) {
 
 /// For negative = true, yields 0xff.
 ///
-/// For negative = true, yields 0x00.
+/// For negative = false, yields 0x00.
 ///
 /// Has no if, doesn't branch.
 #[inline]
@@ -165,10 +175,7 @@ mod test {
     fn test_populate_buffer() {
         let mut buffer = top_encode_number_buffer();
         let _ = fill_buffer_find_offset(0x12345678abcdef12, false, &mut buffer);
-        assert_eq!(
-            buffer,
-            [0x12, 0x34, 0x56, 0x78, 0xab, 0xcd, 0xef, 0x12, 0x00]
-        );
+        assert_eq!(buffer, [0x12, 0x34, 0x56, 0x78, 0xab, 0xcd, 0xef, 0x12]);
     }
 
     fn test_encode_decode(x: u64, signed: bool, bytes: &[u8]) {

From d1ad9774605c38c7d84f4c0d41b11333f44f5a15 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 31 Jan 2024 13:27:42 +0200
Subject: [PATCH 0300/1254] mock address function fix

---
 .../scenarios/new_address.scen.json             | 17 ++++-------------
 .../tests/basic_features_new_address_go_test.rs | 10 ----------
 .../basic_features_new_address_rust_test.rs     | 17 -----------------
 .../tests/basic_features_scenario_go_test.rs    |  5 +++++
 .../tests/basic_features_scenario_rs_test.rs    |  5 +++++
 vm/src/types/vm_address.rs                      |  2 +-
 6 files changed, 15 insertions(+), 41 deletions(-)
 delete mode 100644 contracts/feature-tests/basic-features/tests/basic_features_new_address_go_test.rs
 delete mode 100644 contracts/feature-tests/basic-features/tests/basic_features_new_address_rust_test.rs

diff --git a/contracts/feature-tests/basic-features/scenarios/new_address.scen.json b/contracts/feature-tests/basic-features/scenarios/new_address.scen.json
index 96db921544..1b5e61fdec 100644
--- a/contracts/feature-tests/basic-features/scenarios/new_address.scen.json
+++ b/contracts/feature-tests/basic-features/scenarios/new_address.scen.json
@@ -1,5 +1,4 @@
 {
-    "gasSchedule": "v3",
     "steps": [
         {
             "step": "setState",
@@ -15,7 +14,7 @@
             "id": "deploy",
             "tx": {
                 "from": "address:an_account",
-                "contractCode": "file:../output/basic-features.wasm",
+                "contractCode": "mxsc:../output/basic-features.mxsc.json",
                 "arguments": [],
                 "gasLimit": "200,000,000",
                 "gasPrice": "0"
@@ -28,10 +27,6 @@
                 "refund": "*"
             }
         },
-        {
-            "step": "dumpState",
-            "comment": "all accounts beginning"
-        },
         {
             "step": "checkState",
             "accounts": {
@@ -41,17 +36,13 @@
                     "storage": {},
                     "code": ""
                 },
-                "0x00000000000000000f0f11111111616e5f6163636f756e745f5f5f5f5f005f5f": {
+                "0x0000000000000000000011111111616e5f6163636f756e745f5f5f5f5f005f5f": {
                     "nonce": "0",
                     "balance": "0",
                     "storage": {},
-                    "code": "file:../output/basic-features.wasm"
+                    "code": "mxsc:../output/basic-features.mxsc.json"
                 }
             }
-        },
-        {
-            "step": "dumpState",
-            "comment": "all accounts end"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/contracts/feature-tests/basic-features/tests/basic_features_new_address_go_test.rs b/contracts/feature-tests/basic-features/tests/basic_features_new_address_go_test.rs
deleted file mode 100644
index 1c9774beb9..0000000000
--- a/contracts/feature-tests/basic-features/tests/basic_features_new_address_go_test.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-use multiversx_sc_scenario::*;
-
-fn world() -> ScenarioWorld {
-    ScenarioWorld::vm_go()
-}
-
-#[test]
-fn new_address_go_test() {
-    world().run("scenarios/new_address.scen.json");
-}
diff --git a/contracts/feature-tests/basic-features/tests/basic_features_new_address_rust_test.rs b/contracts/feature-tests/basic-features/tests/basic_features_new_address_rust_test.rs
deleted file mode 100644
index 766c130721..0000000000
--- a/contracts/feature-tests/basic-features/tests/basic_features_new_address_rust_test.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-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(
-        "file:output/basic-features.wasm",
-        basic_features::ContractBuilder,
-    );
-    blockchain
-}
-
-#[test]
-fn basic_features_new_address_rs_test() {
-    world().run("scenarios/new_address.scen.json");
-}
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 94a4a73811..3c75401525 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
@@ -265,6 +265,11 @@ fn managed_vec_biguint_push_go() {
     world().run("scenarios/managed_vec_biguint_push.scen.json");
 }
 
+#[test]
+fn new_address_go() {
+    world().run("scenarios/new_address.scen.json");
+}
+
 #[test]
 fn only_owner_go() {
     world().run("scenarios/only_owner.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 d66a52cbf4..0129da845e 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
@@ -281,6 +281,11 @@ fn managed_vec_biguint_push_rs() {
     world().run("scenarios/managed_vec_biguint_push.scen.json");
 }
 
+#[test]
+fn new_address_rs() {
+    world().run("scenarios/new_address.scen.json");
+}
+
 #[test]
 fn only_owner_rs() {
     world().run("scenarios/only_owner.scen.json");
diff --git a/vm/src/types/vm_address.rs b/vm/src/types/vm_address.rs
index 181e0ea1ef..81ecf6e61a 100644
--- a/vm/src/types/vm_address.rs
+++ b/vm/src/types/vm_address.rs
@@ -6,7 +6,7 @@ const SC_ADDRESS_NUM_LEADING_ZEROS: u8 = 8;
 
 pub const NUM_INT_CHARACTERS_FOR_ADDRESS: usize = 10;
 pub const VM_TYPE_LEN: usize = 2;
-pub const DEFAULT_VM_TYPE: &[u8] = &[0xF, 0xF];
+pub const DEFAULT_VM_TYPE: &[u8] = &[0, 0];
 
 /// Address type being used in the VM only.
 ///

From 49004dce7ddb4ee36124b6fc57eb5e5e2da2af5c Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 31 Jan 2024 13:47:23 +0200
Subject: [PATCH 0301/1254] test fix

---
 vm/src/types/vm_address.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vm/src/types/vm_address.rs b/vm/src/types/vm_address.rs
index 81ecf6e61a..1cec796983 100644
--- a/vm/src/types/vm_address.rs
+++ b/vm/src/types/vm_address.rs
@@ -147,7 +147,7 @@ mod tests {
         let mock_address = VMAddress::generate_mock_address(&creator_address.to_vec(), 1u64);
         assert_eq!(
             address_hex(&mock_address),
-            "0x00000000000000000f0f111111116f776e65725f5f5f5f5f5f5f5f5f5f015f5f"
+            "0x00000000000000000000111111116f776e65725f5f5f5f5f5f5f5f5f5f015f5f"
         );
     }
 }

From 5e8db7eb7f79ba194556144d9e00926b4138b4a3 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 1 Feb 2024 11:50:32 +0200
Subject: [PATCH 0302/1254] codec example: structure with optional field, top
 encoded

---
 .../tests/explicit_impl_struct_opt_field.rs   | 64 +++++++++++++++++++
 1 file changed, 64 insertions(+)
 create mode 100644 data/codec/tests/explicit_impl_struct_opt_field.rs

diff --git a/data/codec/tests/explicit_impl_struct_opt_field.rs b/data/codec/tests/explicit_impl_struct_opt_field.rs
new file mode 100644
index 0000000000..0149ac7e2e
--- /dev/null
+++ b/data/codec/tests/explicit_impl_struct_opt_field.rs
@@ -0,0 +1,64 @@
+use multiversx_sc_codec as codec;
+
+// Some structures with explicit encode/decode, for testing.
+use codec::{
+    test_util::check_top_encode_decode, DecodeErrorHandler, EncodeErrorHandler, NestedDecode,
+    NestedDecodeInput, NestedEncode, TopDecode, TopDecodeInput, TopEncode, TopEncodeOutput,
+};
+use core::fmt::Debug;
+
+#[derive(PartialEq, Eq, Debug, Clone)]
+pub struct StructOptField {
+    pub field: u32,
+    pub opt_items: Vec<u8>,
+}
+
+impl TopEncode for StructOptField {
+    fn top_encode_or_handle_err<O, H>(&self, output: O, h: H) -> Result<(), H::HandledErr>
+    where
+        O: TopEncodeOutput,
+        H: EncodeErrorHandler,
+    {
+        let mut nested_buffer = output.start_nested_encode();
+        self.field.dep_encode_or_handle_err(&mut nested_buffer, h)?;
+        for opt_item in &self.opt_items {
+            opt_item.dep_encode_or_handle_err(&mut nested_buffer, h)?;
+        }
+        output.finalize_nested_encode(nested_buffer);
+        Ok(())
+    }
+}
+
+impl TopDecode for StructOptField {
+    fn top_decode_or_handle_err<I, H>(input: I, h: H) -> Result<Self, H::HandledErr>
+    where
+        I: TopDecodeInput,
+        H: DecodeErrorHandler,
+    {
+        let mut nested_buffer = input.into_nested_buffer();
+        let field = u32::dep_decode_or_handle_err(&mut nested_buffer, h)?;
+        let mut opt_items = Vec::new();
+        while !nested_buffer.is_depleted() {
+            opt_items.push(u8::dep_decode_or_handle_err(&mut nested_buffer, h)?);
+        }
+        Ok(StructOptField { field, opt_items })
+    }
+}
+
+#[test]
+fn test_struct_opt_field_1() {
+    let test = StructOptField {
+        field: 0x01020304,
+        opt_items: vec![],
+    };
+    check_top_encode_decode(test, &[1, 2, 3, 4]);
+}
+
+#[test]
+fn test_struct_opt_field_2() {
+    let test = StructOptField {
+        field: 0x01020304,
+        opt_items: vec![5, 6, 7],
+    };
+    check_top_encode_decode(test, &[1, 2, 3, 4, 5, 6, 7]);
+}

From db20858bc8c8d3d15bd7349f8b41822c8f84a444 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Tue, 30 Jan 2024 10:41:49 +0200
Subject: [PATCH 0303/1254] fix issues

---
 .../alloc-features/sc-config.toml             |   8 +
 .../scenarios/fail-memory.scen.json           |  39 ++++
 .../scenarios/leaking-memory.scen.json        |  40 +++++
 .../alloc-features/src/alloc_features_main.rs |   2 +
 .../alloc-features/src/memory_types.rs        |  20 +++
 .../tests/alloc_features_scenario_go_test.rs  |  10 ++
 .../tests/alloc_features_scenario_rs_test.rs  |  11 ++
 .../Cargo.lock                                | 170 ++++++++++++++++++
 .../Cargo.toml                                |  32 ++++
 .../src/lib.rs                                |  93 ++++++++++
 .../Cargo.lock                                | 170 ++++++++++++++++++
 .../Cargo.toml                                |  32 ++++
 .../src/lib.rs                                |  93 ++++++++++
 .../alloc-features/wasm/src/lib.rs            |   2 +-
 .../multicontract.toml                        |  12 --
 .../src/multi_contract_features.rs            |  22 ---
 .../tests/multi_contract_scenario_go_test.rs  |  15 --
 framework/meta/src/tools/wasm_extractor.rs    |  19 +-
 18 files changed, 729 insertions(+), 61 deletions(-)
 create mode 100644 contracts/feature-tests/alloc-features/scenarios/fail-memory.scen.json
 create mode 100644 contracts/feature-tests/alloc-features/scenarios/leaking-memory.scen.json
 create mode 100644 contracts/feature-tests/alloc-features/src/memory_types.rs
 create mode 100644 contracts/feature-tests/alloc-features/wasm-alloc-features-fail-memory/Cargo.lock
 create mode 100644 contracts/feature-tests/alloc-features/wasm-alloc-features-fail-memory/Cargo.toml
 create mode 100644 contracts/feature-tests/alloc-features/wasm-alloc-features-fail-memory/src/lib.rs
 create mode 100644 contracts/feature-tests/alloc-features/wasm-alloc-features-leaking-memory/Cargo.lock
 create mode 100644 contracts/feature-tests/alloc-features/wasm-alloc-features-leaking-memory/Cargo.toml
 create mode 100644 contracts/feature-tests/alloc-features/wasm-alloc-features-leaking-memory/src/lib.rs

diff --git a/contracts/feature-tests/alloc-features/sc-config.toml b/contracts/feature-tests/alloc-features/sc-config.toml
index d16a678ca5..c1871faf69 100644
--- a/contracts/feature-tests/alloc-features/sc-config.toml
+++ b/contracts/feature-tests/alloc-features/sc-config.toml
@@ -6,3 +6,11 @@ main = "alloc-features"
 add-unlabelled = true
 allocator = "static64k"
 stack-size = "32k"
+
+[contracts.alloc-features-fail-memory]
+allocator = "fail"
+add-labels = ["fail-memory"]
+
+[contracts.alloc-features-leaking-memory]
+allocator = "leaking"
+add-labels = ["leaking-memory"]
\ No newline at end of file
diff --git a/contracts/feature-tests/alloc-features/scenarios/fail-memory.scen.json b/contracts/feature-tests/alloc-features/scenarios/fail-memory.scen.json
new file mode 100644
index 0000000000..f4d2259a1a
--- /dev/null
+++ b/contracts/feature-tests/alloc-features/scenarios/fail-memory.scen.json
@@ -0,0 +1,39 @@
+{
+    "gasSchedule": "v3",
+    "steps": [
+        {
+            "step": "setState",
+            "accounts": {
+                "sc:alloc-features-fail-memory": {
+                    "nonce": "0",
+                    "balance": "0",
+                    "code": "file:../output/alloc-features-fail-memory.wasm"
+                },
+                "address:an_account": {
+                    "nonce": "0",
+                    "balance": "0"
+                }
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "1",
+            "tx": {
+                "from": "address:an_account",
+                "to": "sc:alloc-features-fail-memory",
+                "function": "alloc_with_fail_memory",
+                "arguments": [],
+                "gasLimit": "50,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": "",
+                "status": "4",
+                "message": "str:memory allocation forbidden",
+                "logs": "*",
+                "gas": "*",
+                "refund": "*"
+            }
+        }
+    ]
+}
diff --git a/contracts/feature-tests/alloc-features/scenarios/leaking-memory.scen.json b/contracts/feature-tests/alloc-features/scenarios/leaking-memory.scen.json
new file mode 100644
index 0000000000..46efb1d16c
--- /dev/null
+++ b/contracts/feature-tests/alloc-features/scenarios/leaking-memory.scen.json
@@ -0,0 +1,40 @@
+{
+    "gasSchedule": "v3",
+    "steps": [
+        {
+            "step": "setState",
+            "accounts": {
+                "sc:alloc-features-leaking-memory": {
+                    "nonce": "0",
+                    "balance": "0",
+                    "code": "file:../output/alloc-features-leaking-memory.wasm"
+                },
+                "address:an_account": {
+                    "nonce": "0",
+                    "balance": "0"
+                }
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "1",
+            "tx": {
+                "from": "address:an_account",
+                "to": "sc:alloc-features-leaking-memory",
+                "function": "alloc_with_leaking_memory",
+                "arguments": [],
+                "gasLimit": "50,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": [
+                    "1"
+                ],
+                "status": "",
+                "logs": "*",
+                "gas": "*",
+                "refund": "*"
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/contracts/feature-tests/alloc-features/src/alloc_features_main.rs b/contracts/feature-tests/alloc-features/src/alloc_features_main.rs
index 75485d8796..de8c7f5067 100644
--- a/contracts/feature-tests/alloc-features/src/alloc_features_main.rs
+++ b/contracts/feature-tests/alloc-features/src/alloc_features_main.rs
@@ -12,6 +12,7 @@ pub mod storage_direct_load_alloc;
 pub mod storage_direct_store_alloc;
 pub mod type_features_alloc;
 pub mod types;
+pub mod memory_types;
 
 /// Features of the framework/VM that use the heap allocator.
 ///
@@ -30,6 +31,7 @@ pub trait AllocFeatures:
     + storage_direct_load_alloc::StorageLoadFeatures
     + storage_direct_store_alloc::StorageStoreFeatures
     + type_features_alloc::AllocTypeFeatures
+    + memory_types:: MemoryTypes
 {
     #[init]
     fn init(&self) {}
diff --git a/contracts/feature-tests/alloc-features/src/memory_types.rs b/contracts/feature-tests/alloc-features/src/memory_types.rs
new file mode 100644
index 0000000000..5add334660
--- /dev/null
+++ b/contracts/feature-tests/alloc-features/src/memory_types.rs
@@ -0,0 +1,20 @@
+multiversx_sc::imports!();
+
+/// Storage tests: direct load from storage to the heap.
+#[multiversx_sc::module]
+pub trait MemoryTypes {
+    #[endpoint]
+    #[label("fail-memory")]
+    fn alloc_with_fail_memory(&self) -> i32 {
+        let _ = Box::new([0u8; 1024]);
+        1
+    }
+
+    #[endpoint]
+    #[label("leaking-memory")]
+    fn alloc_with_leaking_memory(&self) -> i32 {
+        let _ = Box::new(42);
+        1
+    }
+
+}
diff --git a/contracts/feature-tests/alloc-features/tests/alloc_features_scenario_go_test.rs b/contracts/feature-tests/alloc-features/tests/alloc_features_scenario_go_test.rs
index 107a2aba38..1120c29f78 100644
--- a/contracts/feature-tests/alloc-features/tests/alloc_features_scenario_go_test.rs
+++ b/contracts/feature-tests/alloc-features/tests/alloc_features_scenario_go_test.rs
@@ -64,6 +64,16 @@ fn echo_vec_u_8_go() {
     world().run("scenarios/echo_vec_u8.scen.json");
 }
 
+#[test]
+fn fail_memory_go() {
+    world().run("scenarios/fail-memory.scen.json");
+}
+
+// #[test]
+// fn leaking_memory_go() {
+//     world().run("scenarios/leaking-memory.scen.json");
+// }
+
 #[test]
 fn managed_buffer_concat_2_go() {
     world().run("scenarios/managed_buffer_concat_2.scen.json");
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 1a8f09c226..ba6ede986a 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
@@ -71,6 +71,17 @@ fn echo_vec_u_8_rs() {
     world().run("scenarios/echo_vec_u8.scen.json");
 }
 
+#[test]
+fn fail_memory_rs() {
+    world().run("scenarios/fail-memory.scen.json");
+}
+
+// #[test]
+// fn leaking_memory_rs() {
+//     world().run("scenarios/leaking-memory.scen.json");
+// }
+
+// #[test]
 #[test]
 fn managed_buffer_concat_2_rs() {
     world().run("scenarios/managed_buffer_concat_2.scen.json");
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-features-fail-memory/Cargo.lock b/contracts/feature-tests/alloc-features/wasm-alloc-features-fail-memory/Cargo.lock
new file mode 100644
index 0000000000..656a9ada55
--- /dev/null
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-features-fail-memory/Cargo.lock
@@ -0,0 +1,170 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "alloc-features"
+version = "0.0.0"
+dependencies = [
+ "multiversx-sc",
+]
+
+[[package]]
+name = "alloc-features-fail-memory-wasm"
+version = "0.0.0"
+dependencies = [
+ "alloc-features",
+ "multiversx-sc-wasm-adapter",
+]
+
+[[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 = "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.47.0"
+dependencies = [
+ "bitflags",
+ "hex-literal",
+ "multiversx-sc-codec",
+ "multiversx-sc-derive",
+ "num-traits",
+]
+
+[[package]]
+name = "multiversx-sc-codec"
+version = "0.18.4"
+dependencies = [
+ "arrayvec",
+ "multiversx-sc-codec-derive",
+]
+
+[[package]]
+name = "multiversx-sc-codec-derive"
+version = "0.18.4"
+dependencies = [
+ "hex",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "multiversx-sc-derive"
+version = "0.47.0"
+dependencies = [
+ "hex",
+ "proc-macro2",
+ "quote",
+ "radix_trie",
+ "syn",
+]
+
+[[package]]
+name = "multiversx-sc-wasm-adapter"
+version = "0.47.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.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+
+[[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/alloc-features/wasm-alloc-features-fail-memory/Cargo.toml b/contracts/feature-tests/alloc-features/wasm-alloc-features-fail-memory/Cargo.toml
new file mode 100644
index 0000000000..13c4a17422
--- /dev/null
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-features-fail-memory/Cargo.toml
@@ -0,0 +1,32 @@
+# Code generated by the multiversx-sc build system. DO NOT EDIT.
+
+# ##########################################
+# ############## AUTO-GENERATED #############
+# ##########################################
+
+[package]
+name = "alloc-features-fail-memory-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.alloc-features]
+path = ".."
+
+[dependencies.multiversx-sc-wasm-adapter]
+version = "0.47.0"
+path = "../../../../framework/wasm-adapter"
+
+[workspace]
+members = ["."]
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-features-fail-memory/src/lib.rs b/contracts/feature-tests/alloc-features/wasm-alloc-features-fail-memory/src/lib.rs
new file mode 100644
index 0000000000..2e095ac2e9
--- /dev/null
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-features-fail-memory/src/lib.rs
@@ -0,0 +1,93 @@
+// Code generated by the multiversx-sc build system. DO NOT EDIT.
+
+////////////////////////////////////////////////////
+////////////////// AUTO-GENERATED //////////////////
+////////////////////////////////////////////////////
+
+// Init:                                 1
+// Endpoints:                           65
+// Async Callback (empty):               1
+// Total number of exported functions:  67
+
+#![no_std]
+
+// Configuration that works with rustc < 1.73.0.
+// TODO: Recommended rustc version: 1.73.0 or newer.
+#![feature(lang_items)]
+
+multiversx_sc_wasm_adapter::allocator!();
+multiversx_sc_wasm_adapter::panic_handler!();
+
+multiversx_sc_wasm_adapter::endpoints! {
+    alloc_features
+    (
+        init => init
+        echo_h256 => echo_h256
+        echo_boxed_array_u8 => echo_boxed_array_u8
+        echo_boxed_bytes => echo_boxed_bytes
+        echo_slice_u8 => echo_slice_u8
+        echo_vec_u8 => echo_vec_u8
+        echo_string => echo_string
+        echo_str => echo_str
+        echo_str_box => echo_str_box
+        echo_async_result_empty => echo_async_result_empty
+        echo_large_boxed_byte_array => echo_large_boxed_byte_array
+        echo_boxed_ser_example_1 => echo_boxed_ser_example_1
+        echo_multi_value_tuples => echo_multi_value_tuples
+        echo_ser_example_1 => echo_ser_example_1
+        echo_vec_of_managed_buffer => echo_vec_of_managed_buffer
+        echo_big_int_vec => echo_big_int_vec
+        echo_varags_u32 => echo_varags_u32
+        echo_varags_big_uint => echo_varags_big_uint
+        compute_get_values => compute_get_values
+        compute_create_ec => compute_create_ec
+        compute_get_ec_length => compute_get_ec_length
+        compute_get_priv_key_byte_length => compute_get_priv_key_byte_length
+        compute_ec_add => compute_ec_add
+        compute_ec_double => compute_ec_double
+        compute_is_on_curve_ec => compute_is_on_curve_ec
+        compute_scalar_mult => compute_scalar_mult
+        compute_scalar_base_mult => compute_scalar_base_mult
+        compute_marshal_ec => compute_marshal_ec
+        compute_marshal_compressed_ec => compute_marshal_compressed_ec
+        compute_unmarshal_ec => compute_unmarshal_ec
+        compute_unmarshal_compressed_ec => compute_unmarshal_compressed_ec
+        compute_generate_key_ec => compute_generate_key_ec
+        only_owner_legacy => only_owner_legacy
+        return_sc_error => return_sc_error
+        result_ok => result_ok
+        result_err_from_bytes_1 => result_err_from_bytes_1
+        result_err_from_bytes_2 => result_err_from_bytes_2
+        result_err_from_bytes_3 => result_err_from_bytes_3
+        result_err_from_string => result_err_from_string
+        result_err_from_str => result_err_from_str
+        result_echo => result_echo
+        result_echo_2 => result_echo_2
+        result_echo_3 => result_echo_3
+        mbuffer_from_slice => mbuffer_from_slice
+        mbuffer_from_boxed_bytes => mbuffer_from_boxed_bytes
+        mbuffer_overwrite => mbuffer_overwrite
+        mbuffer_append_bytes => mbuffer_append_bytes
+        mbuffer_load_slice => mbuffer_load_slice
+        mbuffer_set_slice => mbuffer_set_slice
+        managed_address_from => managed_address_from
+        load_vec_u8 => load_vec_u8
+        load_addr => load_addr
+        load_opt_addr => load_opt_addr
+        is_empty_opt_addr => is_empty_opt_addr
+        load_ser_1 => load_ser_1
+        store_vec_u8 => store_vec_u8
+        store_addr => store_addr
+        store_opt_addr => store_opt_addr
+        store_ser_1 => store_ser_1
+        compare_h256 => compare_h256
+        h256_is_zero => h256_is_zero
+        boxed_bytes_zeros => boxed_bytes_zeros
+        boxed_bytes_concat_2 => boxed_bytes_concat_2
+        boxed_bytes_split => boxed_bytes_split
+        vec_concat_const => vec_concat_const
+        alloc_with_fail_memory => alloc_with_fail_memory
+    )
+}
+
+multiversx_sc_wasm_adapter::async_callback_empty! {}
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-features-leaking-memory/Cargo.lock b/contracts/feature-tests/alloc-features/wasm-alloc-features-leaking-memory/Cargo.lock
new file mode 100644
index 0000000000..7fd7622206
--- /dev/null
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-features-leaking-memory/Cargo.lock
@@ -0,0 +1,170 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "alloc-features"
+version = "0.0.0"
+dependencies = [
+ "multiversx-sc",
+]
+
+[[package]]
+name = "alloc-features-leaking-memory-wasm"
+version = "0.0.0"
+dependencies = [
+ "alloc-features",
+ "multiversx-sc-wasm-adapter",
+]
+
+[[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 = "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.47.0"
+dependencies = [
+ "bitflags",
+ "hex-literal",
+ "multiversx-sc-codec",
+ "multiversx-sc-derive",
+ "num-traits",
+]
+
+[[package]]
+name = "multiversx-sc-codec"
+version = "0.18.4"
+dependencies = [
+ "arrayvec",
+ "multiversx-sc-codec-derive",
+]
+
+[[package]]
+name = "multiversx-sc-codec-derive"
+version = "0.18.4"
+dependencies = [
+ "hex",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "multiversx-sc-derive"
+version = "0.47.0"
+dependencies = [
+ "hex",
+ "proc-macro2",
+ "quote",
+ "radix_trie",
+ "syn",
+]
+
+[[package]]
+name = "multiversx-sc-wasm-adapter"
+version = "0.47.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.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+
+[[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/alloc-features/wasm-alloc-features-leaking-memory/Cargo.toml b/contracts/feature-tests/alloc-features/wasm-alloc-features-leaking-memory/Cargo.toml
new file mode 100644
index 0000000000..40be5f78a0
--- /dev/null
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-features-leaking-memory/Cargo.toml
@@ -0,0 +1,32 @@
+# Code generated by the multiversx-sc build system. DO NOT EDIT.
+
+# ##########################################
+# ############## AUTO-GENERATED #############
+# ##########################################
+
+[package]
+name = "alloc-features-leaking-memory-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.alloc-features]
+path = ".."
+
+[dependencies.multiversx-sc-wasm-adapter]
+version = "0.47.0"
+path = "../../../../framework/wasm-adapter"
+
+[workspace]
+members = ["."]
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-features-leaking-memory/src/lib.rs b/contracts/feature-tests/alloc-features/wasm-alloc-features-leaking-memory/src/lib.rs
new file mode 100644
index 0000000000..073c8d90a5
--- /dev/null
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-features-leaking-memory/src/lib.rs
@@ -0,0 +1,93 @@
+// Code generated by the multiversx-sc build system. DO NOT EDIT.
+
+////////////////////////////////////////////////////
+////////////////// AUTO-GENERATED //////////////////
+////////////////////////////////////////////////////
+
+// Init:                                 1
+// Endpoints:                           65
+// Async Callback (empty):               1
+// Total number of exported functions:  67
+
+#![no_std]
+
+// Configuration that works with rustc < 1.73.0.
+// TODO: Recommended rustc version: 1.73.0 or newer.
+#![feature(lang_items)]
+
+multiversx_sc_wasm_adapter::allocator!(leaking);
+multiversx_sc_wasm_adapter::panic_handler!();
+
+multiversx_sc_wasm_adapter::endpoints! {
+    alloc_features
+    (
+        init => init
+        echo_h256 => echo_h256
+        echo_boxed_array_u8 => echo_boxed_array_u8
+        echo_boxed_bytes => echo_boxed_bytes
+        echo_slice_u8 => echo_slice_u8
+        echo_vec_u8 => echo_vec_u8
+        echo_string => echo_string
+        echo_str => echo_str
+        echo_str_box => echo_str_box
+        echo_async_result_empty => echo_async_result_empty
+        echo_large_boxed_byte_array => echo_large_boxed_byte_array
+        echo_boxed_ser_example_1 => echo_boxed_ser_example_1
+        echo_multi_value_tuples => echo_multi_value_tuples
+        echo_ser_example_1 => echo_ser_example_1
+        echo_vec_of_managed_buffer => echo_vec_of_managed_buffer
+        echo_big_int_vec => echo_big_int_vec
+        echo_varags_u32 => echo_varags_u32
+        echo_varags_big_uint => echo_varags_big_uint
+        compute_get_values => compute_get_values
+        compute_create_ec => compute_create_ec
+        compute_get_ec_length => compute_get_ec_length
+        compute_get_priv_key_byte_length => compute_get_priv_key_byte_length
+        compute_ec_add => compute_ec_add
+        compute_ec_double => compute_ec_double
+        compute_is_on_curve_ec => compute_is_on_curve_ec
+        compute_scalar_mult => compute_scalar_mult
+        compute_scalar_base_mult => compute_scalar_base_mult
+        compute_marshal_ec => compute_marshal_ec
+        compute_marshal_compressed_ec => compute_marshal_compressed_ec
+        compute_unmarshal_ec => compute_unmarshal_ec
+        compute_unmarshal_compressed_ec => compute_unmarshal_compressed_ec
+        compute_generate_key_ec => compute_generate_key_ec
+        only_owner_legacy => only_owner_legacy
+        return_sc_error => return_sc_error
+        result_ok => result_ok
+        result_err_from_bytes_1 => result_err_from_bytes_1
+        result_err_from_bytes_2 => result_err_from_bytes_2
+        result_err_from_bytes_3 => result_err_from_bytes_3
+        result_err_from_string => result_err_from_string
+        result_err_from_str => result_err_from_str
+        result_echo => result_echo
+        result_echo_2 => result_echo_2
+        result_echo_3 => result_echo_3
+        mbuffer_from_slice => mbuffer_from_slice
+        mbuffer_from_boxed_bytes => mbuffer_from_boxed_bytes
+        mbuffer_overwrite => mbuffer_overwrite
+        mbuffer_append_bytes => mbuffer_append_bytes
+        mbuffer_load_slice => mbuffer_load_slice
+        mbuffer_set_slice => mbuffer_set_slice
+        managed_address_from => managed_address_from
+        load_vec_u8 => load_vec_u8
+        load_addr => load_addr
+        load_opt_addr => load_opt_addr
+        is_empty_opt_addr => is_empty_opt_addr
+        load_ser_1 => load_ser_1
+        store_vec_u8 => store_vec_u8
+        store_addr => store_addr
+        store_opt_addr => store_opt_addr
+        store_ser_1 => store_ser_1
+        compare_h256 => compare_h256
+        h256_is_zero => h256_is_zero
+        boxed_bytes_zeros => boxed_bytes_zeros
+        boxed_bytes_concat_2 => boxed_bytes_concat_2
+        boxed_bytes_split => boxed_bytes_split
+        vec_concat_const => vec_concat_const
+        alloc_with_leaking_memory => alloc_with_leaking_memory
+    )
+}
+
+multiversx_sc_wasm_adapter::async_callback_empty! {}
diff --git a/contracts/feature-tests/alloc-features/wasm/src/lib.rs b/contracts/feature-tests/alloc-features/wasm/src/lib.rs
index 95cd3d3dcf..d94121084e 100644
--- a/contracts/feature-tests/alloc-features/wasm/src/lib.rs
+++ b/contracts/feature-tests/alloc-features/wasm/src/lib.rs
@@ -15,7 +15,7 @@
 // TODO: Recommended rustc version: 1.73.0 or newer.
 #![feature(lang_items)]
 
-multiversx_sc_wasm_adapter::allocator!();
+multiversx_sc_wasm_adapter::allocator!(static64k);
 multiversx_sc_wasm_adapter::panic_handler!();
 
 multiversx_sc_wasm_adapter::endpoints! {
diff --git a/contracts/feature-tests/multi-contract-features/multicontract.toml b/contracts/feature-tests/multi-contract-features/multicontract.toml
index 769f1a0267..b6c3c8efb1 100644
--- a/contracts/feature-tests/multi-contract-features/multicontract.toml
+++ b/contracts/feature-tests/multi-contract-features/multicontract.toml
@@ -37,15 +37,3 @@ features = ["example_feature"]
 [contracts.multi-contract-alt-impl]
 add-unlabelled = false
 add-labels = ["alt-impl"]
-
-[contracts.multi-contract-fail-memory]
-allocator = "fail"
-add-labels = ["fail-memory"]
-
-[contracts.multi-contract-leaking-memory]
-allocator = "leaking"
-add-labels = ["leaking-memory"]
-
-[contracts.multi-contract-static64k-memory]
-allocator = "static64k"
-add-labels = ["static64k-memory"]
\ No newline at end of file
diff --git a/contracts/feature-tests/multi-contract-features/src/multi_contract_features.rs b/contracts/feature-tests/multi-contract-features/src/multi_contract_features.rs
index 873c9421e3..d337169f9e 100644
--- a/contracts/feature-tests/multi-contract-features/src/multi_contract_features.rs
+++ b/contracts/feature-tests/multi-contract-features/src/multi_contract_features.rs
@@ -1,5 +1,4 @@
 #![no_std]
-use crate::heap::Box;
 multiversx_sc::imports!();
 
 #[multiversx_sc::contract]
@@ -45,27 +44,6 @@ pub trait MultiContractFeatures {
         self.sample_value().set(sample_value);
     }
 
-    #[endpoint]
-    #[label("fail-memory")]
-    fn alloc_with_fail_memory(&self) -> i32 {
-        let _ = Box::new([0u8; 1024]);
-        1
-    }
-
-    #[endpoint]
-    #[label("leaking-memory")]
-    fn alloc_with_leaking_memory(&self) -> i32 {
-        let _ = Box::new(42);
-        1
-    }
-
-    #[endpoint]
-    #[label("static64k-memory")]
-    fn alloc_with_static64k_memory(&self) -> i32 {
-        let _ = Box::new([0u8; 1024]);
-        1
-    }
-
     #[view]
     fn example_feature_message(&self) -> &'static str {
         example_feature_message()
diff --git a/contracts/feature-tests/multi-contract-features/tests/multi_contract_scenario_go_test.rs b/contracts/feature-tests/multi-contract-features/tests/multi_contract_scenario_go_test.rs
index e72966608f..0d92295170 100644
--- a/contracts/feature-tests/multi-contract-features/tests/multi_contract_scenario_go_test.rs
+++ b/contracts/feature-tests/multi-contract-features/tests/multi_contract_scenario_go_test.rs
@@ -23,18 +23,3 @@ fn mcf_external_get_go() {
 fn mcf_external_pure_go() {
     world().run("scenarios/mcf-external-pure.scen.json");
 }
-
-#[test]
-fn mcf_fail_memory_go() {
-    world().run("scenarios/mcf-fail-memory.scen.json");
-}
-
-#[test]
-fn mcf_leaking_memory_go() {
-    world().run("scenarios/mcf-leaking-memory.scen.json");
-}
-
-#[test]
-fn mcf_static64k_memory_go() {
-    world().run("scenarios/mcf-static64k-memory.scen.json");
-}
diff --git a/framework/meta/src/tools/wasm_extractor.rs b/framework/meta/src/tools/wasm_extractor.rs
index c1be583a97..f554f5dadd 100644
--- a/framework/meta/src/tools/wasm_extractor.rs
+++ b/framework/meta/src/tools/wasm_extractor.rs
@@ -1,7 +1,9 @@
 use colored::Colorize;
-use std::{fs, str::from_utf8};
+use std::fs;
 use wasmparser::{BinaryReaderError, Parser, Payload};
 
+const ERROR_FAIL_ALLOCATOR: &[u8; 27] = b"memory allocation forbidden";
+
 pub struct WasmInfo {
     pub imports: Vec<String>,
     pub allocator_trigger: bool,
@@ -70,17 +72,12 @@ pub fn is_memory_allocation(wasm_data: Vec<u8>) -> Result<bool, BinaryReaderErro
     for payload in parser.parse_all(&wasm_data).flatten() {
         if let Payload::DataSection(data_section) = payload {
             for data_fragment in data_section {
-                let cleaned_data_fragment: Vec<u8> = data_fragment?
+                if data_fragment?
                     .data
-                    .iter()
-                    .filter(|&&b| b < 128)
-                    .cloned()
-                    .collect();
-
-                if let Ok(data_fragment_str) = from_utf8(&cleaned_data_fragment) {
-                    if data_fragment_str.contains("memory allocation forbidden") {
-                        return Ok(true);
-                    }
+                    .windows(ERROR_FAIL_ALLOCATOR.len())
+                    .any(|data| data == ERROR_FAIL_ALLOCATOR)
+                {
+                    return Ok(true);
                 }
             }
         }

From a2236b45a41d0ff1e81bc12f8c0c4d3ba58a94e0 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Thu, 1 Feb 2024 17:03:07 +0200
Subject: [PATCH 0304/1254] change tests

---
 .../alloc-features/sc-config.toml             |   5 +-
 .../scenarios/fail-memory.scen.json           |  10 +-
 .../scenarios/leaking-memory.scen.json        |  40 -----
 .../alloc-features/src/memory_types.rs        |   8 -
 .../tests/alloc_features_scenario_rs_test.rs  |  21 ++-
 .../Cargo.lock                                | 170 ------------------
 .../Cargo.toml                                |  32 ----
 .../src/lib.rs                                |  93 ----------
 .../Cargo.lock                                |  16 +-
 .../Cargo.toml                                |   2 +-
 .../src/lib.rs                                |   0
 .../scenarios/mcf-fail-memory.scen.json       |  39 ----
 .../scenarios/mcf-leaking-memory.scen.json    |  40 -----
 .../scenarios/mcf-static64k-memory.scen.json  |  40 -----
 .../wasm-multi-contract-alt-impl/src/lib.rs   |   4 +-
 .../src/lib.rs                                |   4 +-
 .../Cargo.lock                                | 170 ------------------
 .../Cargo.toml                                |  32 ----
 .../src/lib.rs                                |  31 ----
 .../src/lib.rs                                |   4 +-
 .../Cargo.lock                                | 170 ------------------
 .../Cargo.toml                                |  32 ----
 .../src/lib.rs                                |  31 ----
 .../Cargo.lock                                | 170 ------------------
 .../Cargo.toml                                |  32 ----
 .../src/lib.rs                                |  31 ----
 framework/meta/src/tools/wasm_extractor.rs    |   2 +-
 27 files changed, 33 insertions(+), 1196 deletions(-)
 delete mode 100644 contracts/feature-tests/alloc-features/scenarios/leaking-memory.scen.json
 delete mode 100644 contracts/feature-tests/alloc-features/wasm-alloc-features-leaking-memory/Cargo.lock
 delete mode 100644 contracts/feature-tests/alloc-features/wasm-alloc-features-leaking-memory/Cargo.toml
 delete mode 100644 contracts/feature-tests/alloc-features/wasm-alloc-features-leaking-memory/src/lib.rs
 rename contracts/feature-tests/alloc-features/{wasm-alloc-features-fail-memory => wasm-fail-memory}/Cargo.lock (98%)
 rename contracts/feature-tests/alloc-features/{wasm-alloc-features-fail-memory => wasm-fail-memory}/Cargo.toml (93%)
 rename contracts/feature-tests/alloc-features/{wasm-alloc-features-fail-memory => wasm-fail-memory}/src/lib.rs (100%)
 delete mode 100644 contracts/feature-tests/multi-contract-features/scenarios/mcf-fail-memory.scen.json
 delete mode 100644 contracts/feature-tests/multi-contract-features/scenarios/mcf-leaking-memory.scen.json
 delete mode 100644 contracts/feature-tests/multi-contract-features/scenarios/mcf-static64k-memory.scen.json
 delete mode 100644 contracts/feature-tests/multi-contract-features/wasm-multi-contract-fail-memory/Cargo.lock
 delete mode 100644 contracts/feature-tests/multi-contract-features/wasm-multi-contract-fail-memory/Cargo.toml
 delete mode 100644 contracts/feature-tests/multi-contract-features/wasm-multi-contract-fail-memory/src/lib.rs
 delete mode 100644 contracts/feature-tests/multi-contract-features/wasm-multi-contract-leaking-memory/Cargo.lock
 delete mode 100644 contracts/feature-tests/multi-contract-features/wasm-multi-contract-leaking-memory/Cargo.toml
 delete mode 100644 contracts/feature-tests/multi-contract-features/wasm-multi-contract-leaking-memory/src/lib.rs
 delete mode 100644 contracts/feature-tests/multi-contract-features/wasm-multi-contract-static64k-memory/Cargo.lock
 delete mode 100644 contracts/feature-tests/multi-contract-features/wasm-multi-contract-static64k-memory/Cargo.toml
 delete mode 100644 contracts/feature-tests/multi-contract-features/wasm-multi-contract-static64k-memory/src/lib.rs

diff --git a/contracts/feature-tests/alloc-features/sc-config.toml b/contracts/feature-tests/alloc-features/sc-config.toml
index c1871faf69..4da34c6235 100644
--- a/contracts/feature-tests/alloc-features/sc-config.toml
+++ b/contracts/feature-tests/alloc-features/sc-config.toml
@@ -8,9 +8,6 @@ allocator = "static64k"
 stack-size = "32k"
 
 [contracts.alloc-features-fail-memory]
+name = "fail-memory"
 allocator = "fail"
 add-labels = ["fail-memory"]
-
-[contracts.alloc-features-leaking-memory]
-allocator = "leaking"
-add-labels = ["leaking-memory"]
\ No newline at end of file
diff --git a/contracts/feature-tests/alloc-features/scenarios/fail-memory.scen.json b/contracts/feature-tests/alloc-features/scenarios/fail-memory.scen.json
index f4d2259a1a..a3e1ffc6dd 100644
--- a/contracts/feature-tests/alloc-features/scenarios/fail-memory.scen.json
+++ b/contracts/feature-tests/alloc-features/scenarios/fail-memory.scen.json
@@ -4,10 +4,10 @@
         {
             "step": "setState",
             "accounts": {
-                "sc:alloc-features-fail-memory": {
+                "sc:fail-memory": {
                     "nonce": "0",
                     "balance": "0",
-                    "code": "file:../output/alloc-features-fail-memory.wasm"
+                    "code": "file:../output/alloc-features.wasm"
                 },
                 "address:an_account": {
                     "nonce": "0",
@@ -20,7 +20,7 @@
             "id": "1",
             "tx": {
                 "from": "address:an_account",
-                "to": "sc:alloc-features-fail-memory",
+                "to": "sc:fail_memory",
                 "function": "alloc_with_fail_memory",
                 "arguments": [],
                 "gasLimit": "50,000,000",
@@ -29,11 +29,11 @@
             "expect": {
                 "out": "",
                 "status": "4",
-                "message": "str:memory allocation forbidden",
+                "message": "str:yess",
                 "logs": "*",
                 "gas": "*",
                 "refund": "*"
             }
         }
     ]
-}
+}
\ No newline at end of file
diff --git a/contracts/feature-tests/alloc-features/scenarios/leaking-memory.scen.json b/contracts/feature-tests/alloc-features/scenarios/leaking-memory.scen.json
deleted file mode 100644
index 46efb1d16c..0000000000
--- a/contracts/feature-tests/alloc-features/scenarios/leaking-memory.scen.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-    "gasSchedule": "v3",
-    "steps": [
-        {
-            "step": "setState",
-            "accounts": {
-                "sc:alloc-features-leaking-memory": {
-                    "nonce": "0",
-                    "balance": "0",
-                    "code": "file:../output/alloc-features-leaking-memory.wasm"
-                },
-                "address:an_account": {
-                    "nonce": "0",
-                    "balance": "0"
-                }
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "1",
-            "tx": {
-                "from": "address:an_account",
-                "to": "sc:alloc-features-leaking-memory",
-                "function": "alloc_with_leaking_memory",
-                "arguments": [],
-                "gasLimit": "50,000,000",
-                "gasPrice": "0"
-            },
-            "expect": {
-                "out": [
-                    "1"
-                ],
-                "status": "",
-                "logs": "*",
-                "gas": "*",
-                "refund": "*"
-            }
-        }
-    ]
-}
\ No newline at end of file
diff --git a/contracts/feature-tests/alloc-features/src/memory_types.rs b/contracts/feature-tests/alloc-features/src/memory_types.rs
index 5add334660..c27227f46a 100644
--- a/contracts/feature-tests/alloc-features/src/memory_types.rs
+++ b/contracts/feature-tests/alloc-features/src/memory_types.rs
@@ -9,12 +9,4 @@ pub trait MemoryTypes {
         let _ = Box::new([0u8; 1024]);
         1
     }
-
-    #[endpoint]
-    #[label("leaking-memory")]
-    fn alloc_with_leaking_memory(&self) -> i32 {
-        let _ = Box::new(42);
-        1
-    }
-
 }
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 ba6ede986a..7411fddc1e 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
@@ -4,13 +4,26 @@ fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
     blockchain.set_current_dir_from_workspace("contracts/feature-tests/alloc-features");
 
-    blockchain.register_contract(
+    blockchain.register_partial_contract::<alloc_features::AbiProvider, _>(
         "mxsc:output/alloc-features.mxsc.json",
         alloc_features::ContractBuilder,
+        "alloc-features"
     );
 
+    blockchain.register_partial_contract::<alloc_features::AbiProvider, _>(
+        "mxsc:output/fail-memory.mxsc.json",
+        alloc_features::ContractBuilder,
+        "fail-memory",
+    );
+    // blockchain.register_partial_contract::<alloc_features::AbiProvider, _>(
+    //     "mxsc:output/multi-contract-features-view.mxsc.json",
+    //     alloc_features::ContractBuilder,
+    //     "alloc-features-fail-memory",
+    // );
+
     blockchain
 }
+
 #[test]
 fn boxed_bytes_zeros_rs() {
     world().run("scenarios/boxed_bytes_zeros.scen.json");
@@ -76,12 +89,6 @@ fn fail_memory_rs() {
     world().run("scenarios/fail-memory.scen.json");
 }
 
-// #[test]
-// fn leaking_memory_rs() {
-//     world().run("scenarios/leaking-memory.scen.json");
-// }
-
-// #[test]
 #[test]
 fn managed_buffer_concat_2_rs() {
     world().run("scenarios/managed_buffer_concat_2.scen.json");
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-features-leaking-memory/Cargo.lock b/contracts/feature-tests/alloc-features/wasm-alloc-features-leaking-memory/Cargo.lock
deleted file mode 100644
index 7fd7622206..0000000000
--- a/contracts/feature-tests/alloc-features/wasm-alloc-features-leaking-memory/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 = "alloc-features"
-version = "0.0.0"
-dependencies = [
- "multiversx-sc",
-]
-
-[[package]]
-name = "alloc-features-leaking-memory-wasm"
-version = "0.0.0"
-dependencies = [
- "alloc-features",
- "multiversx-sc-wasm-adapter",
-]
-
-[[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 = "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.47.0"
-dependencies = [
- "bitflags",
- "hex-literal",
- "multiversx-sc-codec",
- "multiversx-sc-derive",
- "num-traits",
-]
-
-[[package]]
-name = "multiversx-sc-codec"
-version = "0.18.4"
-dependencies = [
- "arrayvec",
- "multiversx-sc-codec-derive",
-]
-
-[[package]]
-name = "multiversx-sc-codec-derive"
-version = "0.18.4"
-dependencies = [
- "hex",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "multiversx-sc-derive"
-version = "0.47.0"
-dependencies = [
- "hex",
- "proc-macro2",
- "quote",
- "radix_trie",
- "syn",
-]
-
-[[package]]
-name = "multiversx-sc-wasm-adapter"
-version = "0.47.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.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
-
-[[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/alloc-features/wasm-alloc-features-leaking-memory/Cargo.toml b/contracts/feature-tests/alloc-features/wasm-alloc-features-leaking-memory/Cargo.toml
deleted file mode 100644
index 40be5f78a0..0000000000
--- a/contracts/feature-tests/alloc-features/wasm-alloc-features-leaking-memory/Cargo.toml
+++ /dev/null
@@ -1,32 +0,0 @@
-# Code generated by the multiversx-sc build system. DO NOT EDIT.
-
-# ##########################################
-# ############## AUTO-GENERATED #############
-# ##########################################
-
-[package]
-name = "alloc-features-leaking-memory-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.alloc-features]
-path = ".."
-
-[dependencies.multiversx-sc-wasm-adapter]
-version = "0.47.0"
-path = "../../../../framework/wasm-adapter"
-
-[workspace]
-members = ["."]
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-features-leaking-memory/src/lib.rs b/contracts/feature-tests/alloc-features/wasm-alloc-features-leaking-memory/src/lib.rs
deleted file mode 100644
index 073c8d90a5..0000000000
--- a/contracts/feature-tests/alloc-features/wasm-alloc-features-leaking-memory/src/lib.rs
+++ /dev/null
@@ -1,93 +0,0 @@
-// Code generated by the multiversx-sc build system. DO NOT EDIT.
-
-////////////////////////////////////////////////////
-////////////////// AUTO-GENERATED //////////////////
-////////////////////////////////////////////////////
-
-// Init:                                 1
-// Endpoints:                           65
-// Async Callback (empty):               1
-// Total number of exported functions:  67
-
-#![no_std]
-
-// Configuration that works with rustc < 1.73.0.
-// TODO: Recommended rustc version: 1.73.0 or newer.
-#![feature(lang_items)]
-
-multiversx_sc_wasm_adapter::allocator!(leaking);
-multiversx_sc_wasm_adapter::panic_handler!();
-
-multiversx_sc_wasm_adapter::endpoints! {
-    alloc_features
-    (
-        init => init
-        echo_h256 => echo_h256
-        echo_boxed_array_u8 => echo_boxed_array_u8
-        echo_boxed_bytes => echo_boxed_bytes
-        echo_slice_u8 => echo_slice_u8
-        echo_vec_u8 => echo_vec_u8
-        echo_string => echo_string
-        echo_str => echo_str
-        echo_str_box => echo_str_box
-        echo_async_result_empty => echo_async_result_empty
-        echo_large_boxed_byte_array => echo_large_boxed_byte_array
-        echo_boxed_ser_example_1 => echo_boxed_ser_example_1
-        echo_multi_value_tuples => echo_multi_value_tuples
-        echo_ser_example_1 => echo_ser_example_1
-        echo_vec_of_managed_buffer => echo_vec_of_managed_buffer
-        echo_big_int_vec => echo_big_int_vec
-        echo_varags_u32 => echo_varags_u32
-        echo_varags_big_uint => echo_varags_big_uint
-        compute_get_values => compute_get_values
-        compute_create_ec => compute_create_ec
-        compute_get_ec_length => compute_get_ec_length
-        compute_get_priv_key_byte_length => compute_get_priv_key_byte_length
-        compute_ec_add => compute_ec_add
-        compute_ec_double => compute_ec_double
-        compute_is_on_curve_ec => compute_is_on_curve_ec
-        compute_scalar_mult => compute_scalar_mult
-        compute_scalar_base_mult => compute_scalar_base_mult
-        compute_marshal_ec => compute_marshal_ec
-        compute_marshal_compressed_ec => compute_marshal_compressed_ec
-        compute_unmarshal_ec => compute_unmarshal_ec
-        compute_unmarshal_compressed_ec => compute_unmarshal_compressed_ec
-        compute_generate_key_ec => compute_generate_key_ec
-        only_owner_legacy => only_owner_legacy
-        return_sc_error => return_sc_error
-        result_ok => result_ok
-        result_err_from_bytes_1 => result_err_from_bytes_1
-        result_err_from_bytes_2 => result_err_from_bytes_2
-        result_err_from_bytes_3 => result_err_from_bytes_3
-        result_err_from_string => result_err_from_string
-        result_err_from_str => result_err_from_str
-        result_echo => result_echo
-        result_echo_2 => result_echo_2
-        result_echo_3 => result_echo_3
-        mbuffer_from_slice => mbuffer_from_slice
-        mbuffer_from_boxed_bytes => mbuffer_from_boxed_bytes
-        mbuffer_overwrite => mbuffer_overwrite
-        mbuffer_append_bytes => mbuffer_append_bytes
-        mbuffer_load_slice => mbuffer_load_slice
-        mbuffer_set_slice => mbuffer_set_slice
-        managed_address_from => managed_address_from
-        load_vec_u8 => load_vec_u8
-        load_addr => load_addr
-        load_opt_addr => load_opt_addr
-        is_empty_opt_addr => is_empty_opt_addr
-        load_ser_1 => load_ser_1
-        store_vec_u8 => store_vec_u8
-        store_addr => store_addr
-        store_opt_addr => store_opt_addr
-        store_ser_1 => store_ser_1
-        compare_h256 => compare_h256
-        h256_is_zero => h256_is_zero
-        boxed_bytes_zeros => boxed_bytes_zeros
-        boxed_bytes_concat_2 => boxed_bytes_concat_2
-        boxed_bytes_split => boxed_bytes_split
-        vec_concat_const => vec_concat_const
-        alloc_with_leaking_memory => alloc_with_leaking_memory
-    )
-}
-
-multiversx_sc_wasm_adapter::async_callback_empty! {}
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-features-fail-memory/Cargo.lock b/contracts/feature-tests/alloc-features/wasm-fail-memory/Cargo.lock
similarity index 98%
rename from contracts/feature-tests/alloc-features/wasm-alloc-features-fail-memory/Cargo.lock
rename to contracts/feature-tests/alloc-features/wasm-fail-memory/Cargo.lock
index 656a9ada55..a306cbd963 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-features-fail-memory/Cargo.lock
+++ b/contracts/feature-tests/alloc-features/wasm-fail-memory/Cargo.lock
@@ -9,14 +9,6 @@ dependencies = [
  "multiversx-sc",
 ]
 
-[[package]]
-name = "alloc-features-fail-memory-wasm"
-version = "0.0.0"
-dependencies = [
- "alloc-features",
- "multiversx-sc-wasm-adapter",
-]
-
 [[package]]
 name = "arrayvec"
 version = "0.7.4"
@@ -41,6 +33,14 @@ version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
+[[package]]
+name = "fail-memory-wasm"
+version = "0.0.0"
+dependencies = [
+ "alloc-features",
+ "multiversx-sc-wasm-adapter",
+]
+
 [[package]]
 name = "hex"
 version = "0.4.3"
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-features-fail-memory/Cargo.toml b/contracts/feature-tests/alloc-features/wasm-fail-memory/Cargo.toml
similarity index 93%
rename from contracts/feature-tests/alloc-features/wasm-alloc-features-fail-memory/Cargo.toml
rename to contracts/feature-tests/alloc-features/wasm-fail-memory/Cargo.toml
index 13c4a17422..ebe61883f6 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-features-fail-memory/Cargo.toml
+++ b/contracts/feature-tests/alloc-features/wasm-fail-memory/Cargo.toml
@@ -5,7 +5,7 @@
 # ##########################################
 
 [package]
-name = "alloc-features-fail-memory-wasm"
+name = "fail-memory-wasm"
 version = "0.0.0"
 edition = "2021"
 publish = false
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-features-fail-memory/src/lib.rs b/contracts/feature-tests/alloc-features/wasm-fail-memory/src/lib.rs
similarity index 100%
rename from contracts/feature-tests/alloc-features/wasm-alloc-features-fail-memory/src/lib.rs
rename to contracts/feature-tests/alloc-features/wasm-fail-memory/src/lib.rs
diff --git a/contracts/feature-tests/multi-contract-features/scenarios/mcf-fail-memory.scen.json b/contracts/feature-tests/multi-contract-features/scenarios/mcf-fail-memory.scen.json
deleted file mode 100644
index e3710c89d7..0000000000
--- a/contracts/feature-tests/multi-contract-features/scenarios/mcf-fail-memory.scen.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-    "gasSchedule": "v3",
-    "steps": [
-        {
-            "step": "setState",
-            "accounts": {
-                "sc:multi-contract-fail-memory": {
-                    "nonce": "0",
-                    "balance": "0",
-                    "code": "file:../output/multi-contract-fail-memory.wasm"
-                },
-                "address:an_account": {
-                    "nonce": "0",
-                    "balance": "0"
-                }
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "1",
-            "tx": {
-                "from": "address:an_account",
-                "to": "sc:multi-contract-fail-memory",
-                "function": "alloc_with_fail_memory",
-                "arguments": [],
-                "gasLimit": "50,000,000",
-                "gasPrice": "0"
-            },
-            "expect": {
-                "out": "",
-                "status": "4",
-                "message": "str:memory allocation forbidden",
-                "logs": "*",
-                "gas": "*",
-                "refund": "*"
-            }
-        }
-    ]
-}
diff --git a/contracts/feature-tests/multi-contract-features/scenarios/mcf-leaking-memory.scen.json b/contracts/feature-tests/multi-contract-features/scenarios/mcf-leaking-memory.scen.json
deleted file mode 100644
index 652e664c11..0000000000
--- a/contracts/feature-tests/multi-contract-features/scenarios/mcf-leaking-memory.scen.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-    "gasSchedule": "v3",
-    "steps": [
-        {
-            "step": "setState",
-            "accounts": {
-                "sc:multi-contract-leaking-memory": {
-                    "nonce": "0",
-                    "balance": "0",
-                    "code": "file:../output/multi-contract-leaking-memory.wasm"
-                },
-                "address:an_account": {
-                    "nonce": "0",
-                    "balance": "0"
-                }
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "1",
-            "tx": {
-                "from": "address:an_account",
-                "to": "sc:multi-contract-leaking-memory",
-                "function": "alloc_with_leaking_memory",
-                "arguments": [],
-                "gasLimit": "50,000,000",
-                "gasPrice": "0"
-            },
-            "expect": {
-                "out": [
-                    "1"
-                ],
-                "status": "",
-                "logs": "*",
-                "gas": "*",
-                "refund": "*"
-            }
-        }
-    ]
-}
\ No newline at end of file
diff --git a/contracts/feature-tests/multi-contract-features/scenarios/mcf-static64k-memory.scen.json b/contracts/feature-tests/multi-contract-features/scenarios/mcf-static64k-memory.scen.json
deleted file mode 100644
index 95fd84b7c4..0000000000
--- a/contracts/feature-tests/multi-contract-features/scenarios/mcf-static64k-memory.scen.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-    "gasSchedule": "v3",
-    "steps": [
-        {
-            "step": "setState",
-            "accounts": {
-                "sc:multi-contract-static64k-memory": {
-                    "nonce": "0",
-                    "balance": "0",
-                    "code": "file:../output/multi-contract-static64k-memory.wasm"
-                },
-                "address:an_account": {
-                    "nonce": "0",
-                    "balance": "0"
-                }
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "1",
-            "tx": {
-                "from": "address:an_account",
-                "to": "sc:multi-contract-static64k-memory",
-                "function": "alloc_with_static64k_memory",
-                "arguments": [],
-                "gasLimit": "50,000,000",
-                "gasPrice": "0"
-            },
-            "expect": {
-                "out": [
-                    "1"
-                ],
-                "status": "",
-                "logs": "*",
-                "gas": "*",
-                "refund": "*"
-            }
-        }
-    ]
-}
diff --git a/contracts/feature-tests/multi-contract-features/wasm-multi-contract-alt-impl/src/lib.rs b/contracts/feature-tests/multi-contract-features/wasm-multi-contract-alt-impl/src/lib.rs
index 57979a3557..ba8838b6e4 100644
--- a/contracts/feature-tests/multi-contract-features/wasm-multi-contract-alt-impl/src/lib.rs
+++ b/contracts/feature-tests/multi-contract-features/wasm-multi-contract-alt-impl/src/lib.rs
@@ -10,9 +10,7 @@
 // Total number of exported functions:   3
 
 #![no_std]
-
-// Configuration that works with rustc < 1.73.0.
-// TODO: Recommended rustc version: 1.73.0 or newer.
+#![allow(internal_features)]
 #![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
diff --git a/contracts/feature-tests/multi-contract-features/wasm-multi-contract-example-feature/src/lib.rs b/contracts/feature-tests/multi-contract-features/wasm-multi-contract-example-feature/src/lib.rs
index 32c7c0cf3f..655e83240c 100644
--- a/contracts/feature-tests/multi-contract-features/wasm-multi-contract-example-feature/src/lib.rs
+++ b/contracts/feature-tests/multi-contract-features/wasm-multi-contract-example-feature/src/lib.rs
@@ -10,9 +10,7 @@
 // Total number of exported functions:   4
 
 #![no_std]
-
-// Configuration that works with rustc < 1.73.0.
-// TODO: Recommended rustc version: 1.73.0 or newer.
+#![allow(internal_features)]
 #![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
diff --git a/contracts/feature-tests/multi-contract-features/wasm-multi-contract-fail-memory/Cargo.lock b/contracts/feature-tests/multi-contract-features/wasm-multi-contract-fail-memory/Cargo.lock
deleted file mode 100644
index 4477ef4e33..0000000000
--- a/contracts/feature-tests/multi-contract-features/wasm-multi-contract-fail-memory/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 = "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 = "multi-contract-fail-memory-wasm"
-version = "0.0.0"
-dependencies = [
- "multi-contract-features",
- "multiversx-sc-wasm-adapter",
-]
-
-[[package]]
-name = "multi-contract-features"
-version = "0.0.0"
-dependencies = [
- "multiversx-sc",
-]
-
-[[package]]
-name = "multiversx-sc"
-version = "0.47.0"
-dependencies = [
- "bitflags",
- "hex-literal",
- "multiversx-sc-codec",
- "multiversx-sc-derive",
- "num-traits",
-]
-
-[[package]]
-name = "multiversx-sc-codec"
-version = "0.18.4"
-dependencies = [
- "arrayvec",
- "multiversx-sc-codec-derive",
-]
-
-[[package]]
-name = "multiversx-sc-codec-derive"
-version = "0.18.4"
-dependencies = [
- "hex",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "multiversx-sc-derive"
-version = "0.47.0"
-dependencies = [
- "hex",
- "proc-macro2",
- "quote",
- "radix_trie",
- "syn",
-]
-
-[[package]]
-name = "multiversx-sc-wasm-adapter"
-version = "0.47.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.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
-
-[[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/multi-contract-features/wasm-multi-contract-fail-memory/Cargo.toml b/contracts/feature-tests/multi-contract-features/wasm-multi-contract-fail-memory/Cargo.toml
deleted file mode 100644
index 55fda5c436..0000000000
--- a/contracts/feature-tests/multi-contract-features/wasm-multi-contract-fail-memory/Cargo.toml
+++ /dev/null
@@ -1,32 +0,0 @@
-# Code generated by the multiversx-sc build system. DO NOT EDIT.
-
-# ##########################################
-# ############## AUTO-GENERATED #############
-# ##########################################
-
-[package]
-name = "multi-contract-fail-memory-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.multi-contract-features]
-path = ".."
-
-[dependencies.multiversx-sc-wasm-adapter]
-version = "0.47.0"
-path = "../../../../framework/wasm-adapter"
-
-[workspace]
-members = ["."]
diff --git a/contracts/feature-tests/multi-contract-features/wasm-multi-contract-fail-memory/src/lib.rs b/contracts/feature-tests/multi-contract-features/wasm-multi-contract-fail-memory/src/lib.rs
deleted file mode 100644
index 1f1d3fe30f..0000000000
--- a/contracts/feature-tests/multi-contract-features/wasm-multi-contract-fail-memory/src/lib.rs
+++ /dev/null
@@ -1,31 +0,0 @@
-// Code generated by the multiversx-sc build system. DO NOT EDIT.
-
-////////////////////////////////////////////////////
-////////////////// AUTO-GENERATED //////////////////
-////////////////////////////////////////////////////
-
-// Init:                                 1
-// Endpoints:                            3
-// Async Callback (empty):               1
-// Total number of exported functions:   5
-
-#![no_std]
-
-// Configuration that works with rustc < 1.73.0.
-// TODO: Recommended rustc version: 1.73.0 or newer.
-#![feature(lang_items)]
-
-multiversx_sc_wasm_adapter::allocator!();
-multiversx_sc_wasm_adapter::panic_handler!();
-
-multiversx_sc_wasm_adapter::endpoints! {
-    multi_contract_features
-    (
-        init => default_init
-        sample_value => sample_value
-        example_feature_message => example_feature_message
-        alloc_with_fail_memory => alloc_with_fail_memory
-    )
-}
-
-multiversx_sc_wasm_adapter::async_callback_empty! {}
diff --git a/contracts/feature-tests/multi-contract-features/wasm-multi-contract-features-view/src/lib.rs b/contracts/feature-tests/multi-contract-features/wasm-multi-contract-features-view/src/lib.rs
index cbf61c8513..871bfb5bca 100644
--- a/contracts/feature-tests/multi-contract-features/wasm-multi-contract-features-view/src/lib.rs
+++ b/contracts/feature-tests/multi-contract-features/wasm-multi-contract-features-view/src/lib.rs
@@ -10,9 +10,7 @@
 // Total number of exported functions:   5
 
 #![no_std]
-
-// Configuration that works with rustc < 1.73.0.
-// TODO: Recommended rustc version: 1.73.0 or newer.
+#![allow(internal_features)]
 #![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
diff --git a/contracts/feature-tests/multi-contract-features/wasm-multi-contract-leaking-memory/Cargo.lock b/contracts/feature-tests/multi-contract-features/wasm-multi-contract-leaking-memory/Cargo.lock
deleted file mode 100644
index 3b53d73d13..0000000000
--- a/contracts/feature-tests/multi-contract-features/wasm-multi-contract-leaking-memory/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 = "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 = "multi-contract-features"
-version = "0.0.0"
-dependencies = [
- "multiversx-sc",
-]
-
-[[package]]
-name = "multi-contract-leaking-memory-wasm"
-version = "0.0.0"
-dependencies = [
- "multi-contract-features",
- "multiversx-sc-wasm-adapter",
-]
-
-[[package]]
-name = "multiversx-sc"
-version = "0.47.0"
-dependencies = [
- "bitflags",
- "hex-literal",
- "multiversx-sc-codec",
- "multiversx-sc-derive",
- "num-traits",
-]
-
-[[package]]
-name = "multiversx-sc-codec"
-version = "0.18.4"
-dependencies = [
- "arrayvec",
- "multiversx-sc-codec-derive",
-]
-
-[[package]]
-name = "multiversx-sc-codec-derive"
-version = "0.18.4"
-dependencies = [
- "hex",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "multiversx-sc-derive"
-version = "0.47.0"
-dependencies = [
- "hex",
- "proc-macro2",
- "quote",
- "radix_trie",
- "syn",
-]
-
-[[package]]
-name = "multiversx-sc-wasm-adapter"
-version = "0.47.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.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
-
-[[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/multi-contract-features/wasm-multi-contract-leaking-memory/Cargo.toml b/contracts/feature-tests/multi-contract-features/wasm-multi-contract-leaking-memory/Cargo.toml
deleted file mode 100644
index 86bac344a3..0000000000
--- a/contracts/feature-tests/multi-contract-features/wasm-multi-contract-leaking-memory/Cargo.toml
+++ /dev/null
@@ -1,32 +0,0 @@
-# Code generated by the multiversx-sc build system. DO NOT EDIT.
-
-# ##########################################
-# ############## AUTO-GENERATED #############
-# ##########################################
-
-[package]
-name = "multi-contract-leaking-memory-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.multi-contract-features]
-path = ".."
-
-[dependencies.multiversx-sc-wasm-adapter]
-version = "0.47.0"
-path = "../../../../framework/wasm-adapter"
-
-[workspace]
-members = ["."]
diff --git a/contracts/feature-tests/multi-contract-features/wasm-multi-contract-leaking-memory/src/lib.rs b/contracts/feature-tests/multi-contract-features/wasm-multi-contract-leaking-memory/src/lib.rs
deleted file mode 100644
index 7bc00703df..0000000000
--- a/contracts/feature-tests/multi-contract-features/wasm-multi-contract-leaking-memory/src/lib.rs
+++ /dev/null
@@ -1,31 +0,0 @@
-// Code generated by the multiversx-sc build system. DO NOT EDIT.
-
-////////////////////////////////////////////////////
-////////////////// AUTO-GENERATED //////////////////
-////////////////////////////////////////////////////
-
-// Init:                                 1
-// Endpoints:                            3
-// Async Callback (empty):               1
-// Total number of exported functions:   5
-
-#![no_std]
-
-// Configuration that works with rustc < 1.73.0.
-// TODO: Recommended rustc version: 1.73.0 or newer.
-#![feature(lang_items)]
-
-multiversx_sc_wasm_adapter::allocator!(leaking);
-multiversx_sc_wasm_adapter::panic_handler!();
-
-multiversx_sc_wasm_adapter::endpoints! {
-    multi_contract_features
-    (
-        init => default_init
-        sample_value => sample_value
-        example_feature_message => example_feature_message
-        alloc_with_leaking_memory => alloc_with_leaking_memory
-    )
-}
-
-multiversx_sc_wasm_adapter::async_callback_empty! {}
diff --git a/contracts/feature-tests/multi-contract-features/wasm-multi-contract-static64k-memory/Cargo.lock b/contracts/feature-tests/multi-contract-features/wasm-multi-contract-static64k-memory/Cargo.lock
deleted file mode 100644
index 986ac28f03..0000000000
--- a/contracts/feature-tests/multi-contract-features/wasm-multi-contract-static64k-memory/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 = "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 = "multi-contract-features"
-version = "0.0.0"
-dependencies = [
- "multiversx-sc",
-]
-
-[[package]]
-name = "multi-contract-static64k-memory-wasm"
-version = "0.0.0"
-dependencies = [
- "multi-contract-features",
- "multiversx-sc-wasm-adapter",
-]
-
-[[package]]
-name = "multiversx-sc"
-version = "0.47.0"
-dependencies = [
- "bitflags",
- "hex-literal",
- "multiversx-sc-codec",
- "multiversx-sc-derive",
- "num-traits",
-]
-
-[[package]]
-name = "multiversx-sc-codec"
-version = "0.18.4"
-dependencies = [
- "arrayvec",
- "multiversx-sc-codec-derive",
-]
-
-[[package]]
-name = "multiversx-sc-codec-derive"
-version = "0.18.4"
-dependencies = [
- "hex",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "multiversx-sc-derive"
-version = "0.47.0"
-dependencies = [
- "hex",
- "proc-macro2",
- "quote",
- "radix_trie",
- "syn",
-]
-
-[[package]]
-name = "multiversx-sc-wasm-adapter"
-version = "0.47.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.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
-
-[[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/multi-contract-features/wasm-multi-contract-static64k-memory/Cargo.toml b/contracts/feature-tests/multi-contract-features/wasm-multi-contract-static64k-memory/Cargo.toml
deleted file mode 100644
index dff9fb1987..0000000000
--- a/contracts/feature-tests/multi-contract-features/wasm-multi-contract-static64k-memory/Cargo.toml
+++ /dev/null
@@ -1,32 +0,0 @@
-# Code generated by the multiversx-sc build system. DO NOT EDIT.
-
-# ##########################################
-# ############## AUTO-GENERATED #############
-# ##########################################
-
-[package]
-name = "multi-contract-static64k-memory-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.multi-contract-features]
-path = ".."
-
-[dependencies.multiversx-sc-wasm-adapter]
-version = "0.47.0"
-path = "../../../../framework/wasm-adapter"
-
-[workspace]
-members = ["."]
diff --git a/contracts/feature-tests/multi-contract-features/wasm-multi-contract-static64k-memory/src/lib.rs b/contracts/feature-tests/multi-contract-features/wasm-multi-contract-static64k-memory/src/lib.rs
deleted file mode 100644
index 7abd3ebff3..0000000000
--- a/contracts/feature-tests/multi-contract-features/wasm-multi-contract-static64k-memory/src/lib.rs
+++ /dev/null
@@ -1,31 +0,0 @@
-// Code generated by the multiversx-sc build system. DO NOT EDIT.
-
-////////////////////////////////////////////////////
-////////////////// AUTO-GENERATED //////////////////
-////////////////////////////////////////////////////
-
-// Init:                                 1
-// Endpoints:                            3
-// Async Callback (empty):               1
-// Total number of exported functions:   5
-
-#![no_std]
-
-// Configuration that works with rustc < 1.73.0.
-// TODO: Recommended rustc version: 1.73.0 or newer.
-#![feature(lang_items)]
-
-multiversx_sc_wasm_adapter::allocator!(static64k);
-multiversx_sc_wasm_adapter::panic_handler!();
-
-multiversx_sc_wasm_adapter::endpoints! {
-    multi_contract_features
-    (
-        init => default_init
-        sample_value => sample_value
-        example_feature_message => example_feature_message
-        alloc_with_static64k_memory => alloc_with_static64k_memory
-    )
-}
-
-multiversx_sc_wasm_adapter::async_callback_empty! {}
diff --git a/framework/meta/src/tools/wasm_extractor.rs b/framework/meta/src/tools/wasm_extractor.rs
index f554f5dadd..7ff6b452a5 100644
--- a/framework/meta/src/tools/wasm_extractor.rs
+++ b/framework/meta/src/tools/wasm_extractor.rs
@@ -38,7 +38,7 @@ impl WasmInfo {
         if allocator_trigger {
             println!(
                 "{}",
-                "FailAllocator triggered: memory allocation forbidden"
+                "FailAllocator used while memory allocation is accessible in code. Contract may fail unexpectedly when memory allocation is attempted"
                     .to_string()
                     .red()
                     .bold()

From 60e1a4e6ae97cd7b76236b6020fc529c60afc420 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Thu, 1 Feb 2024 18:45:21 +0200
Subject: [PATCH 0305/1254] same test on rust doesnt work

---
 .../scenarios/fail-memory.scen.json               | 10 +++++-----
 .../alloc-features/src/memory_types.rs            |  2 +-
 .../tests/alloc_features_scenario_rs_test.rs      | 15 ++++++---------
 3 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/contracts/feature-tests/alloc-features/scenarios/fail-memory.scen.json b/contracts/feature-tests/alloc-features/scenarios/fail-memory.scen.json
index a3e1ffc6dd..bbd9cb55b2 100644
--- a/contracts/feature-tests/alloc-features/scenarios/fail-memory.scen.json
+++ b/contracts/feature-tests/alloc-features/scenarios/fail-memory.scen.json
@@ -4,10 +4,10 @@
         {
             "step": "setState",
             "accounts": {
-                "sc:fail-memory": {
+                "sc:fail_memory": {
                     "nonce": "0",
                     "balance": "0",
-                    "code": "file:../output/alloc-features.wasm"
+                    "code": "file:../output/fail-memory.wasm"
                 },
                 "address:an_account": {
                     "nonce": "0",
@@ -27,13 +27,13 @@
                 "gasPrice": "0"
             },
             "expect": {
-                "out": "",
+                "out": [],
                 "status": "4",
-                "message": "str:yess",
+                "message": "str:memory allocation forbidden",
                 "logs": "*",
                 "gas": "*",
                 "refund": "*"
             }
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/contracts/feature-tests/alloc-features/src/memory_types.rs b/contracts/feature-tests/alloc-features/src/memory_types.rs
index c27227f46a..1e43479ebe 100644
--- a/contracts/feature-tests/alloc-features/src/memory_types.rs
+++ b/contracts/feature-tests/alloc-features/src/memory_types.rs
@@ -6,7 +6,7 @@ pub trait MemoryTypes {
     #[endpoint]
     #[label("fail-memory")]
     fn alloc_with_fail_memory(&self) -> i32 {
-        let _ = Box::new([0u8; 1024]);
+        let _x = String::from("H");
         1
     }
 }
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 7411fddc1e..d1969c19e7 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
@@ -15,15 +15,15 @@ fn world() -> ScenarioWorld {
         alloc_features::ContractBuilder,
         "fail-memory",
     );
-    // blockchain.register_partial_contract::<alloc_features::AbiProvider, _>(
-    //     "mxsc:output/multi-contract-features-view.mxsc.json",
-    //     alloc_features::ContractBuilder,
-    //     "alloc-features-fail-memory",
-    // );
 
     blockchain
 }
 
+#[test]
+fn fail_memory_rs() {
+    world().run("scenarios/fail-memory.scen.json");
+}
+
 #[test]
 fn boxed_bytes_zeros_rs() {
     world().run("scenarios/boxed_bytes_zeros.scen.json");
@@ -84,10 +84,7 @@ fn echo_vec_u_8_rs() {
     world().run("scenarios/echo_vec_u8.scen.json");
 }
 
-#[test]
-fn fail_memory_rs() {
-    world().run("scenarios/fail-memory.scen.json");
-}
+
 
 #[test]
 fn managed_buffer_concat_2_rs() {

From d5275845858ac3dd9dd6aa0d09150c96f570b5c1 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 2 Feb 2024 00:02:07 +0200
Subject: [PATCH 0306/1254] comment

---
 data/codec/tests/explicit_impl_struct_opt_field.rs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/data/codec/tests/explicit_impl_struct_opt_field.rs b/data/codec/tests/explicit_impl_struct_opt_field.rs
index 0149ac7e2e..7be9b0e2c7 100644
--- a/data/codec/tests/explicit_impl_struct_opt_field.rs
+++ b/data/codec/tests/explicit_impl_struct_opt_field.rs
@@ -7,6 +7,9 @@ use codec::{
 };
 use core::fmt::Debug;
 
+/// Example of how to have an optional, or variable-length field at the end of a structure.
+///
+/// Careful! This is non-standard and is not really friendly to nested encoding.
 #[derive(PartialEq, Eq, Debug, Clone)]
 pub struct StructOptField {
     pub field: u32,

From 21c9a729eab40420f4631026c518282e7447fd7e Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 2 Feb 2024 01:00:33 +0200
Subject: [PATCH 0307/1254] unified syntax - cleaned up callbacks

---
 .../tests/adder_blackbox_with_values_test.rs  |  2 +-
 .../multisig/tests/multisig_blackbox_test.rs  |  2 +-
 .../types/interaction/contract_call_exec.rs   | 12 ++++++-
 framework/base/src/types/interaction/mod.rs   |  2 ++
 framework/base/src/types/interaction/tx.rs    | 26 --------------
 .../src/types/interaction/tx_call_async.rs    | 31 ++++++++++++++++-
 .../interaction/tx_call_async_promises.rs     |  1 -
 .../types/interaction/tx_result_handler.rs    | 23 -------------
 .../interaction/tx_rh_list/tx_rh_list_cons.rs | 27 +--------------
 .../interaction/tx_rh_original_result.rs      | 34 +++++++++++++++++++
 framework/scenario/src/facade.rs              |  3 +-
 framework/scenario/src/facade/world_tx.rs     |  2 ++
 .../src/facade/world_tx/scenario_tx.rs        |  6 ++--
 .../world_tx/scenario_world_steps_tx.rs       |  6 +---
 .../facade/world_tx/with_tx_raw_response.rs   | 29 ++++++++++++++++
 framework/scenario/src/lib.rs                 |  2 +-
 16 files changed, 117 insertions(+), 91 deletions(-)
 create mode 100644 framework/base/src/types/interaction/tx_rh_original_result.rs
 create mode 100644 framework/scenario/src/facade/world_tx/with_tx_raw_response.rs

diff --git a/contracts/examples/adder/tests/adder_blackbox_with_values_test.rs b/contracts/examples/adder/tests/adder_blackbox_with_values_test.rs
index 62e74e77a8..32b4e8bcdb 100644
--- a/contracts/examples/adder/tests/adder_blackbox_with_values_test.rs
+++ b/contracts/examples/adder/tests/adder_blackbox_with_values_test.rs
@@ -48,7 +48,7 @@ fn adder_blackbox_with_values() {
             tx.from(AddressExpr("owner"))
                 .to(ScExpr("adder"))
                 .call(adder_contract.add(3u32))
-                .callback(WithTxResult(|response| {
+                .with_result(WithRawTxResponse(|response| {
                     assert!(response.tx_error.is_success());
                 }))
         })
diff --git a/contracts/examples/multisig/tests/multisig_blackbox_test.rs b/contracts/examples/multisig/tests/multisig_blackbox_test.rs
index 0bf49301d4..1d34fa5b79 100644
--- a/contracts/examples/multisig/tests/multisig_blackbox_test.rs
+++ b/contracts/examples/multisig/tests/multisig_blackbox_test.rs
@@ -127,7 +127,7 @@ impl MultisigTestState {
     }
 
     fn propose_add_board_member(&mut self, board_member_address: Address) -> usize {
-        self.world.run_tx(|tx| {
+        self.world.tx_return(|tx| {
             tx.from(AddressExpr("proposer"))
                 .to(ScExpr("multisig"))
                 .call(
diff --git a/framework/base/src/types/interaction/contract_call_exec.rs b/framework/base/src/types/interaction/contract_call_exec.rs
index c8c49f69bc..3cdaaffe3f 100644
--- a/framework/base/src/types/interaction/contract_call_exec.rs
+++ b/framework/base/src/types/interaction/contract_call_exec.rs
@@ -1,5 +1,5 @@
 use crate::{
-    api::{use_raw_handle, StaticVarApiImpl},
+    api::{use_raw_handle, StaticVarApiImpl, StorageWriteApi},
     codec::TopDecodeMulti,
 };
 
@@ -64,7 +64,12 @@ where
         }
         result.into_managed_buffer()
     }
+}
 
+impl<SA, OriginalResult> ContractCallWithEgld<SA, OriginalResult>
+where
+    SA: CallTypeApi + StorageWriteApi + 'static,
+{
     pub(super) fn async_call(self) -> AsyncCall<SA> {
         Tx::new_tx_from_sc()
             .to(self.basic.to)
@@ -72,7 +77,12 @@ where
             .call(self.basic.function_call)
             .callback(None)
     }
+}
 
+impl<SA, OriginalResult> ContractCallWithEgld<SA, OriginalResult>
+where
+    SA: CallTypeApi + 'static,
+{
     pub(super) fn async_call_promise(self) -> super::AsyncCallPromises<SA> {
         super::AsyncCallPromises {
             to: self.basic.to,
diff --git a/framework/base/src/types/interaction/mod.rs b/framework/base/src/types/interaction/mod.rs
index be3ff25608..52ae318321 100644
--- a/framework/base/src/types/interaction/mod.rs
+++ b/framework/base/src/types/interaction/mod.rs
@@ -32,6 +32,7 @@ mod tx_gas;
 mod tx_payment;
 mod tx_result_handler;
 mod tx_rh_list;
+mod tx_rh_original_result;
 mod tx_to;
 mod typed_function_call;
 
@@ -66,6 +67,7 @@ pub use tx_gas::*;
 pub use tx_payment::*;
 pub use tx_result_handler::*;
 pub use tx_rh_list::*;
+pub use tx_rh_original_result::*;
 pub use tx_to::*;
 pub use typed_function_call::*;
 
diff --git a/framework/base/src/types/interaction/tx.rs b/framework/base/src/types/interaction/tx.rs
index 47bc884bea..df1249bbe7 100644
--- a/framework/base/src/types/interaction/tx.rs
+++ b/framework/base/src/types/interaction/tx.rs
@@ -426,32 +426,6 @@ where
     }
 }
 
-impl<Env, From, To, Payment, Gas, Data> Tx<Env, From, To, Payment, Gas, Data, ()>
-where
-    Env: TxEnv,
-    From: TxFrom<Env>,
-    To: TxTo<Env>,
-    Payment: TxPayment<Env>,
-    Gas: TxGas<Env>,
-    Data: TxData<Env>,
-{
-    #[inline]
-    pub fn callback<RH>(self, callback: RH) -> Tx<Env, From, To, Payment, Gas, Data, RH>
-    where
-        RH: TxResultHandler<Env>,
-    {
-        Tx {
-            env: self.env,
-            from: self.from,
-            to: self.to,
-            payment: self.payment,
-            gas: self.gas,
-            data: self.data,
-            result_handler: callback,
-        }
-    }
-}
-
 impl<Env, From, To, Payment, Gas, FC, RH> Tx<Env, From, To, Payment, Gas, FC, RH>
 where
     Env: TxEnv,
diff --git a/framework/base/src/types/interaction/tx_call_async.rs b/framework/base/src/types/interaction/tx_call_async.rs
index 45aeea6cb1..c1035b902b 100644
--- a/framework/base/src/types/interaction/tx_call_async.rs
+++ b/framework/base/src/types/interaction/tx_call_async.rs
@@ -4,7 +4,10 @@ use crate::{
     types::CallbackClosure,
 };
 
-use super::{Tx, TxDataFunctionCall, TxPayment, TxResultHandler, TxScEnv, TxToSpecified};
+use super::{
+    Tx, TxData, TxDataFunctionCall, TxEnv, TxFrom, TxGas, TxPayment, TxResultHandler, TxScEnv,
+    TxTo, TxToSpecified,
+};
 
 pub trait TxAsyncCallCallback<Api>: TxResultHandler<TxScEnv<Api>>
 where
@@ -54,6 +57,32 @@ where
     }
 }
 
+impl<Api, From, To, Payment, Gas, Data> Tx<TxScEnv<Api>, From, To, Payment, Gas, Data, ()>
+where
+    Api: CallTypeApi,
+    From: TxFrom<TxScEnv<Api>>,
+    To: TxTo<TxScEnv<Api>>,
+    Payment: TxPayment<TxScEnv<Api>>,
+    Gas: TxGas<TxScEnv<Api>>,
+    Data: TxData<TxScEnv<Api>>,
+{
+    #[inline]
+    pub fn callback<RH>(self, callback: RH) -> Tx<TxScEnv<Api>, From, To, Payment, Gas, Data, RH>
+    where
+        RH: TxAsyncCallCallback<Api>,
+    {
+        Tx {
+            env: self.env,
+            from: self.from,
+            to: self.to,
+            payment: self.payment,
+            gas: self.gas,
+            data: self.data,
+            result_handler: callback,
+        }
+    }
+}
+
 impl<Api, To, Payment, FC, RH> Tx<TxScEnv<Api>, (), To, Payment, (), FC, RH>
 where
     Api: CallTypeApi,
diff --git a/framework/base/src/types/interaction/tx_call_async_promises.rs b/framework/base/src/types/interaction/tx_call_async_promises.rs
index 7e7fbfefac..a97fdeb858 100644
--- a/framework/base/src/types/interaction/tx_call_async_promises.rs
+++ b/framework/base/src/types/interaction/tx_call_async_promises.rs
@@ -99,7 +99,6 @@ where
     Payment: TxPayment<TxScEnv<Api>>,
     Callback: TxPromisesCallback<Api>,
 {
-    // #[cfg(feature = "promises")]
     pub fn async_call_promise(self) {
         let callback_name = self.result_handler.callback_name();
         let mut cb_closure_args_serialized =
diff --git a/framework/base/src/types/interaction/tx_result_handler.rs b/framework/base/src/types/interaction/tx_result_handler.rs
index cf1d42ad06..838e9fa4d8 100644
--- a/framework/base/src/types/interaction/tx_result_handler.rs
+++ b/framework/base/src/types/interaction/tx_result_handler.rs
@@ -13,26 +13,3 @@ where
 {
     type OriginalResult = ();
 }
-
-// impl<Env, Head, Tail> TxResultHandler<Env> for (Head, Tail)
-// where
-//     Env: TxEnv,
-//     Head: TxResultHandler<Env>,
-//     Tail: TxResultHandler<Env>,
-// {
-//     type OriginalResult = Tail::OriginalResult;
-// }
-
-pub trait TxRunnableCallback<Env>: TxResultHandler<Env>
-where
-    Env: TxEnv,
-{
-    fn run_callback(self, env: &Env);
-}
-
-impl<Env> TxRunnableCallback<Env> for ()
-where
-    Env: TxEnv,
-{
-    fn run_callback(self, _env: &Env) {}
-}
diff --git a/framework/base/src/types/interaction/tx_rh_list/tx_rh_list_cons.rs b/framework/base/src/types/interaction/tx_rh_list/tx_rh_list_cons.rs
index ad841ed6e8..f4d4133b19 100644
--- a/framework/base/src/types/interaction/tx_rh_list/tx_rh_list_cons.rs
+++ b/framework/base/src/types/interaction/tx_rh_list/tx_rh_list_cons.rs
@@ -1,6 +1,6 @@
 use core::marker::PhantomData;
 
-use crate::types::{TxEnv, TxResultHandler};
+use crate::types::{OriginalResultMarker, TxEnv, TxResultHandler};
 
 use super::RHListItem;
 
@@ -62,31 +62,6 @@ where
     }
 }
 
-pub struct OriginalResultMarker<O> {
-    _phantom: PhantomData<O>,
-}
-
-impl<O> Default for OriginalResultMarker<O> {
-    fn default() -> Self {
-        Self {
-            _phantom: Default::default(),
-        }
-    }
-}
-
-impl<O> OriginalResultMarker<O> {
-    pub fn new() -> Self {
-        Self::default()
-    }
-}
-
-impl<Env, O> TxResultHandler<Env> for OriginalResultMarker<O>
-where
-    Env: TxEnv,
-{
-    type OriginalResult = O;
-}
-
 impl<Env, O> RHList<Env> for OriginalResultMarker<O>
 where
     Env: TxEnv,
diff --git a/framework/base/src/types/interaction/tx_rh_original_result.rs b/framework/base/src/types/interaction/tx_rh_original_result.rs
new file mode 100644
index 0000000000..e402b1686a
--- /dev/null
+++ b/framework/base/src/types/interaction/tx_rh_original_result.rs
@@ -0,0 +1,34 @@
+use core::marker::PhantomData;
+
+use super::{TxEnv, TxResultHandler};
+
+/// Contains no data.
+///
+/// Indicates to the compiler the original result type expected from a transaction.
+///
+/// Note that the transaction result might be interpreted as a different type,
+/// but the originally declared type is required to perform any type checking.
+pub struct OriginalResultMarker<O> {
+    _phantom: PhantomData<O>,
+}
+
+impl<O> Default for OriginalResultMarker<O> {
+    fn default() -> Self {
+        Self {
+            _phantom: Default::default(),
+        }
+    }
+}
+
+impl<O> OriginalResultMarker<O> {
+    pub fn new() -> Self {
+        Self::default()
+    }
+}
+
+impl<Env, O> TxResultHandler<Env> for OriginalResultMarker<O>
+where
+    Env: TxEnv,
+{
+    type OriginalResult = O;
+}
diff --git a/framework/scenario/src/facade.rs b/framework/scenario/src/facade.rs
index 4f56063404..51989165df 100644
--- a/framework/scenario/src/facade.rs
+++ b/framework/scenario/src/facade.rs
@@ -6,9 +6,8 @@ mod scenario_world_steps;
 mod scenario_world_steps_deprecated;
 mod scenario_world_whitebox;
 mod whitebox_contract;
-mod world_tx;
+pub(crate) mod world_tx;
 
 pub use contract_info::ContractInfo;
 pub use scenario_world::ScenarioWorld;
 pub use whitebox_contract::WhiteboxContract;
-pub use world_tx::*;
diff --git a/framework/scenario/src/facade/world_tx.rs b/framework/scenario/src/facade/world_tx.rs
index 55e7720e16..f0891db9cb 100644
--- a/framework/scenario/src/facade/world_tx.rs
+++ b/framework/scenario/src/facade/world_tx.rs
@@ -4,8 +4,10 @@ mod scenario_env;
 mod scenario_rh_list;
 mod scenario_rh_list_item;
 mod scenario_tx;
+mod with_tx_raw_response;
 
 pub use scenario_env::*;
 pub use scenario_rh_list::*;
 pub use scenario_rh_list_item::*;
 pub use scenario_tx::*;
+pub use with_tx_raw_response::WithRawTxResponse;
diff --git a/framework/scenario/src/facade/world_tx/scenario_tx.rs b/framework/scenario/src/facade/world_tx/scenario_tx.rs
index 783675b50b..64c8dc9c55 100644
--- a/framework/scenario/src/facade/world_tx/scenario_tx.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_tx.rs
@@ -15,7 +15,7 @@ impl ScenarioWorld {
         }
     }
 
-    pub fn run_tx<STx, F>(&mut self, f: F) -> STx::Returns
+    pub fn tx_return<STx, F>(&mut self, f: F) -> STx::Returns
     where
         STx: ScenarioTx,
         F: FnOnce(TxScenarioBase) -> STx,
@@ -28,10 +28,10 @@ impl ScenarioWorld {
 
     pub fn tx<STx, F>(&mut self, f: F) -> &mut Self
     where
-        STx: ScenarioTx,
+        STx: ScenarioTx<Returns = ()>,
         F: FnOnce(TxScenarioBase) -> STx,
     {
-        let _ = self.run_tx(f);
+        let () = self.tx_return(f);
         self
     }
 }
diff --git a/framework/scenario/src/facade/world_tx/scenario_world_steps_tx.rs b/framework/scenario/src/facade/world_tx/scenario_world_steps_tx.rs
index 93508e08bb..566caf319e 100644
--- a/framework/scenario/src/facade/world_tx/scenario_world_steps_tx.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_world_steps_tx.rs
@@ -2,7 +2,7 @@ use std::path::PathBuf;
 
 use multiversx_sc::types::{
     AnnotatedValue, FunctionCall, ManagedAddress, Tx, TxBaseWithEnv, TxEnv, TxFromSpecified, TxGas,
-    TxPayment, TxRunnableCallback, TxToSpecified,
+    TxPayment, TxToSpecified,
 };
 
 use crate::{
@@ -10,7 +10,3 @@ use crate::{
     facade::ScenarioWorld,
     scenario_model::{ScCallStep, TxResponse},
 };
-
-
-
-
diff --git a/framework/scenario/src/facade/world_tx/with_tx_raw_response.rs b/framework/scenario/src/facade/world_tx/with_tx_raw_response.rs
new file mode 100644
index 0000000000..8b63cfdfcc
--- /dev/null
+++ b/framework/scenario/src/facade/world_tx/with_tx_raw_response.rs
@@ -0,0 +1,29 @@
+use core::marker::PhantomData;
+
+use multiversx_sc::{codec::TopDecodeMulti, types::RHListItem};
+
+use crate::scenario_model::TxResponse;
+
+use super::{RHListItemScenario, ScenarioTxEnvironment};
+
+/// Wraps a closure that handles a `TxResponse` object.
+pub struct WithRawTxResponse<F>(pub F)
+where
+    F: FnOnce(&TxResponse);
+
+impl<F, Original> RHListItem<ScenarioTxEnvironment, Original> for WithRawTxResponse<F>
+where
+    F: FnOnce(&TxResponse),
+{
+    type Returns = ();
+}
+
+impl<Original, F> RHListItemScenario<Original> for WithRawTxResponse<F>
+where
+    Original: TopDecodeMulti,
+    F: FnOnce(&TxResponse),
+{
+    fn item_scenario_result(self, tx_response: &TxResponse) -> Self::Returns {
+        (self.0)(tx_response)
+    }
+}
diff --git a/framework/scenario/src/lib.rs b/framework/scenario/src/lib.rs
index 0110147ed3..dc1f0589b5 100644
--- a/framework/scenario/src/lib.rs
+++ b/framework/scenario/src/lib.rs
@@ -44,7 +44,7 @@ pub use crate::scenario as mandos_system;
 // Re-exporting the whole mandos crate for easier use in tests.
 pub use multiversx_chain_scenario_format as scenario_format;
 
-pub use facade::{ContractInfo, ScenarioWorld, WhiteboxContract};
+pub use facade::{world_tx::*, ContractInfo, ScenarioWorld, WhiteboxContract};
 
 use std::path::Path;
 

From cf2b7b27e7377f1b4b3b62f4d1db574f049b9adb Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 2 Feb 2024 12:07:30 +0200
Subject: [PATCH 0308/1254] default VM type 0x0500

---
 .../basic-features/scenarios/get_code_metadata.scen.json  | 2 +-
 .../basic-features/scenarios/new_address.scen.json        | 2 +-
 .../src/value_interpreter/vm_identifier.rs                | 8 +++++++-
 vm/src/types/vm_address.rs                                | 2 +-
 4 files changed, 10 insertions(+), 4 deletions(-)

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 fdd4d68cb1..e60601f359 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
@@ -83,7 +83,7 @@
             "expect": {
                 "out": [],
                 "status": "10",
-                "message": "str:account not found: 000000000000000000006d697373696e675f5f5f5f5f5f5f5f5f5f5f5f5f5f5f"
+                "message": "str:account not found: 000000000000000005006d697373696e675f5f5f5f5f5f5f5f5f5f5f5f5f5f5f"
             }
         }
     ]
diff --git a/contracts/feature-tests/basic-features/scenarios/new_address.scen.json b/contracts/feature-tests/basic-features/scenarios/new_address.scen.json
index 1b5e61fdec..a37eb2db30 100644
--- a/contracts/feature-tests/basic-features/scenarios/new_address.scen.json
+++ b/contracts/feature-tests/basic-features/scenarios/new_address.scen.json
@@ -36,7 +36,7 @@
                     "storage": {},
                     "code": ""
                 },
-                "0x0000000000000000000011111111616e5f6163636f756e745f5f5f5f5f005f5f": {
+                "0x0000000000000000050011111111616e5f6163636f756e745f5f5f5f5f005f5f": {
                     "nonce": "0",
                     "balance": "0",
                     "storage": {},
diff --git a/sdk/scenario-format/src/value_interpreter/vm_identifier.rs b/sdk/scenario-format/src/value_interpreter/vm_identifier.rs
index a3c533b137..33eb933ef1 100644
--- a/sdk/scenario-format/src/value_interpreter/vm_identifier.rs
+++ b/sdk/scenario-format/src/value_interpreter/vm_identifier.rs
@@ -1,6 +1,12 @@
 pub const VM_TYPE_LENGTH: usize = 2;
 
-#[derive(Default, Clone, Copy)]
+#[derive(Clone, Copy)]
 pub struct VMIdentifier {
     pub vm_type: [u8; VM_TYPE_LENGTH],
 }
+
+impl Default for VMIdentifier {
+    fn default() -> Self {
+        Self { vm_type: [5, 0] }
+    }
+}
diff --git a/vm/src/types/vm_address.rs b/vm/src/types/vm_address.rs
index 1cec796983..b8dd39d641 100644
--- a/vm/src/types/vm_address.rs
+++ b/vm/src/types/vm_address.rs
@@ -6,7 +6,7 @@ const SC_ADDRESS_NUM_LEADING_ZEROS: u8 = 8;
 
 pub const NUM_INT_CHARACTERS_FOR_ADDRESS: usize = 10;
 pub const VM_TYPE_LEN: usize = 2;
-pub const DEFAULT_VM_TYPE: &[u8] = &[0, 0];
+pub const DEFAULT_VM_TYPE: &[u8] = &[5, 0];
 
 /// Address type being used in the VM only.
 ///

From 61635f15e6bddfd2ed99383e9ef506c1a933f55e Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 2 Feb 2024 12:23:47 +0200
Subject: [PATCH 0309/1254] test fix

---
 vm/src/types/vm_address.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vm/src/types/vm_address.rs b/vm/src/types/vm_address.rs
index b8dd39d641..75786787cc 100644
--- a/vm/src/types/vm_address.rs
+++ b/vm/src/types/vm_address.rs
@@ -147,7 +147,7 @@ mod tests {
         let mock_address = VMAddress::generate_mock_address(&creator_address.to_vec(), 1u64);
         assert_eq!(
             address_hex(&mock_address),
-            "0x00000000000000000000111111116f776e65725f5f5f5f5f5f5f5f5f5f015f5f"
+            "0x00000000000000000500111111116f776e65725f5f5f5f5f5f5f5f5f5f015f5f"
         );
     }
 }

From e7c78f07b36ea15487823833f6cbc44dab44cd5d Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 2 Feb 2024 12:24:04 +0200
Subject: [PATCH 0310/1254] CI mx-scenario-go upgrade

---
 .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 a70099b29d..9aa9fdcee4 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 v2.0.0
+          sc-meta install mx-scenario-go --tag v2.1.0-alpha
 
           which mxpy
           which wasm-opt

From 8832917b99142df42557fd0ae454850fa6b8fc14 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 2 Feb 2024 12:31:51 +0200
Subject: [PATCH 0311/1254] test fix

---
 sdk/scenario-format/tests/interpreter_test.rs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/sdk/scenario-format/tests/interpreter_test.rs b/sdk/scenario-format/tests/interpreter_test.rs
index 2e41d0db1c..b3a455a9ff 100644
--- a/sdk/scenario-format/tests/interpreter_test.rs
+++ b/sdk/scenario-format/tests/interpreter_test.rs
@@ -108,16 +108,16 @@ fn test_address_with_shard_id() {
 fn test_sc_address() {
     let context = InterpreterContext::default();
     assert_eq!(
-        b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00a_____________________".to_vec(),
+        b"\x00\x00\x00\x00\x00\x00\x00\x00\x05\x00a_____________________".to_vec(),
         interpret_string("sc:a", &context)
     );
     assert_eq!(
-        b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x001234567890123456789012".to_vec(),
+        b"\x00\x00\x00\x00\x00\x00\x00\x00\x05\x001234567890123456789012".to_vec(),
         interpret_string("sc:12345678901234567890120s", &context)
     );
     // trims excess
     assert_eq!(
-        b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x001234567890123456789012".to_vec(),
+        b"\x00\x00\x00\x00\x00\x00\x00\x00\x05\x001234567890123456789012".to_vec(),
         interpret_string("sc:12345678901234567890120sx", &context)
     );
 }
@@ -126,16 +126,16 @@ fn test_sc_address() {
 fn test_sc_address_with_shard_id() {
     let context = InterpreterContext::default();
     assert_eq!(
-        b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00a____________________\x44".to_vec(),
+        b"\x00\x00\x00\x00\x00\x00\x00\x00\x05\x00a____________________\x44".to_vec(),
         interpret_string("sc:a#44", &context)
     );
     assert_eq!(
-        b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00123456789012345678901\x88".to_vec(),
+        b"\x00\x00\x00\x00\x00\x00\x00\x00\x05\x00123456789012345678901\x88".to_vec(),
         interpret_string("sc:12345678901234567890120#88", &context)
     );
     // trims excess
     assert_eq!(
-        b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00123456789012345678901\x88".to_vec(),
+        b"\x00\x00\x00\x00\x00\x00\x00\x00\x05\x00123456789012345678901\x88".to_vec(),
         interpret_string("sc:12345678901234567890120x#88", &context)
     );
 }

From 3a55562bd6ecdc8b2f62de0a65c6f19eec7d9db6 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Fri, 2 Feb 2024 12:07:35 +0100
Subject: [PATCH 0312/1254] explicit discriminants for enum

---
 .../abi_tester_expected_main.abi.json         | 82 ++++++++++++++++++-
 .../abi_tester_expected_view.abi.json         | 82 ++++++++++++++++++-
 .../feature-tests/abi-tester/src/abi_enum.rs  | 21 +++++
 .../abi-tester/src/abi_tester.rs              |  4 +-
 data/codec-derive/src/nested_de_derive.rs     |  5 +-
 data/codec-derive/src/nested_en_derive.rs     |  5 +-
 data/codec-derive/src/top_de_derive.rs        |  5 +-
 data/codec-derive/src/top_en_derive.rs        |  7 +-
 data/codec-derive/src/util.rs                 | 48 +++++++++++
 framework/derive/src/type_abi_derive.rs       | 53 +++++++++++-
 10 files changed, 299 insertions(+), 13 deletions(-)

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 04fb495ff4..b92a7bbed9 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
@@ -19,7 +19,7 @@
     },
     "docs": [
         "Contract whose sole purpose is to verify that",
-        "the ABI generation framework works sa expected.",
+        "the ABI generation framework works as expected.",
         "",
         "Note: any change in this contract must also be reflected in `abi_test_expected.abi.json`,",
         "including Rust docs."
@@ -446,6 +446,14 @@
         {
             "ticker": "OnlyInEsdt",
             "type": "OnlyShowsUpInEsdtAttr"
+        },
+        {
+            "ticker": "ExplicitDiscriminant",
+            "type": "ExplicitDiscriminant"
+        },
+        {
+            "ticker": "ExplicitDiscriminantMixed",
+            "type": "ExplicitDiscriminantMixed"
         }
     ],
     "hasCallback": false,
@@ -690,6 +698,78 @@
                 }
             ]
         },
+        "ExplicitDiscriminant": {
+            "type": "enum",
+            "docs": [
+                "An enum with similar explicit discriminants"
+            ],
+            "variants": [
+                {
+                    "name": "Zero",
+                    "discriminant": 0
+                },
+                {
+                    "name": "Thirty",
+                    "discriminant": 30
+                },
+                {
+                    "name": "Twelve",
+                    "discriminant": 12
+                },
+                {
+                    "name": "Fifty",
+                    "discriminant": 50
+                },
+                {
+                    "name": "FiftyOne",
+                    "discriminant": 51
+                }
+            ]
+        },
+        "ExplicitDiscriminantMixed": {
+            "type": "enum",
+            "docs": [
+                "An enum with different explicit discriminants"
+            ],
+            "variants": [
+                {
+                    "name": "Zero",
+                    "discriminant": 0
+                },
+                {
+                    "name": "Unit",
+                    "discriminant": 3
+                },
+                {
+                    "name": "Tuple",
+                    "discriminant": 4,
+                    "fields": [
+                        {
+                            "name": "0",
+                            "type": "u16"
+                        }
+                    ]
+                },
+                {
+                    "name": "Five",
+                    "discriminant": 5
+                },
+                {
+                    "name": "Struct",
+                    "discriminant": 1,
+                    "fields": [
+                        {
+                            "name": "a",
+                            "type": "u8"
+                        },
+                        {
+                            "name": "b",
+                            "type": "u16"
+                        }
+                    ]
+                }
+            ]
+        },
         "OnlyShowsUpAsNested01": {
             "type": "struct",
             "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 79ccd76043..d694d773b0 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
@@ -19,7 +19,7 @@
     },
     "docs": [
         "Contract whose sole purpose is to verify that",
-        "the ABI generation framework works sa expected.",
+        "the ABI generation framework works as expected.",
         "",
         "Note: any change in this contract must also be reflected in `abi_test_expected.abi.json`,",
         "including Rust docs."
@@ -123,6 +123,14 @@
         {
             "ticker": "OnlyInEsdt",
             "type": "OnlyShowsUpInEsdtAttr"
+        },
+        {
+            "ticker": "ExplicitDiscriminant",
+            "type": "ExplicitDiscriminant"
+        },
+        {
+            "ticker": "ExplicitDiscriminantMixed",
+            "type": "ExplicitDiscriminantMixed"
         }
     ],
     "hasCallback": false,
@@ -367,6 +375,78 @@
                 }
             ]
         },
+        "ExplicitDiscriminant": {
+            "type": "enum",
+            "docs": [
+                "An enum with similar explicit discriminants"
+            ],
+            "variants": [
+                {
+                    "name": "Zero",
+                    "discriminant": 0
+                },
+                {
+                    "name": "Thirty",
+                    "discriminant": 30
+                },
+                {
+                    "name": "Twelve",
+                    "discriminant": 12
+                },
+                {
+                    "name": "Fifty",
+                    "discriminant": 50
+                },
+                {
+                    "name": "FiftyOne",
+                    "discriminant": 51
+                }
+            ]
+        },
+        "ExplicitDiscriminantMixed": {
+            "type": "enum",
+            "docs": [
+                "An enum with different explicit discriminants"
+            ],
+            "variants": [
+                {
+                    "name": "Zero",
+                    "discriminant": 0
+                },
+                {
+                    "name": "Unit",
+                    "discriminant": 3
+                },
+                {
+                    "name": "Tuple",
+                    "discriminant": 4,
+                    "fields": [
+                        {
+                            "name": "0",
+                            "type": "u16"
+                        }
+                    ]
+                },
+                {
+                    "name": "Five",
+                    "discriminant": 5
+                },
+                {
+                    "name": "Struct",
+                    "discriminant": 1,
+                    "fields": [
+                        {
+                            "name": "a",
+                            "type": "u8"
+                        },
+                        {
+                            "name": "b",
+                            "type": "u16"
+                        }
+                    ]
+                }
+            ]
+        },
         "OnlyShowsUpAsNested01": {
             "type": "struct",
             "docs": [
diff --git a/contracts/feature-tests/abi-tester/src/abi_enum.rs b/contracts/feature-tests/abi-tester/src/abi_enum.rs
index c43f0c4d0a..3b8db35407 100644
--- a/contracts/feature-tests/abi-tester/src/abi_enum.rs
+++ b/contracts/feature-tests/abi-tester/src/abi_enum.rs
@@ -9,3 +9,24 @@ pub enum AbiEnum {
     SomethingMore(u8, OnlyShowsUpAsNested08),
     SomeStruct { a: u16, b: OnlyShowsUpAsNested09 },
 }
+
+/// An enum with similar explicit discriminants
+#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, TypeAbi)]
+pub enum ExplicitDiscriminant {
+    Zero,
+    Thirty = 30,
+    Twelve = 12,
+    Fifty = 50,
+    FiftyOne,
+}
+
+/// An enum with different explicit discriminants
+#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, TypeAbi)]
+#[repr(u8)]
+pub enum ExplicitDiscriminantMixed {
+    Zero,
+    Unit = 3,
+    Tuple(u16),
+    Five,
+    Struct { a: u8, b: u16 } = 1,
+}
diff --git a/contracts/feature-tests/abi-tester/src/abi_tester.rs b/contracts/feature-tests/abi-tester/src/abi_tester.rs
index 71e3b680fd..a68ea341a3 100644
--- a/contracts/feature-tests/abi-tester/src/abi_tester.rs
+++ b/contracts/feature-tests/abi-tester/src/abi_tester.rs
@@ -11,7 +11,7 @@ use abi_test_type::*;
 use only_nested::*;
 
 /// Contract whose sole purpose is to verify that
-/// the ABI generation framework works sa expected.
+/// the ABI generation framework works as expected.
 ///
 /// Note: any change in this contract must also be reflected in `abi_test_expected.abi.json`,
 /// including Rust docs.
@@ -22,6 +22,8 @@ use only_nested::*;
 #[esdt_attribute("STRUCT1", AbiEnum)]
 #[esdt_attribute("STRUCT2", AbiManagedType<Self::Api>)]
 #[esdt_attribute("OnlyInEsdt", OnlyShowsUpInEsdtAttr)]
+#[esdt_attribute["ExplicitDiscriminant", ExplicitDiscriminant]]
+#[esdt_attribute["ExplicitDiscriminantMixed", ExplicitDiscriminantMixed]]
 pub trait AbiTester {
     /// Contract constructor.
     #[init]
diff --git a/data/codec-derive/src/nested_de_derive.rs b/data/codec-derive/src/nested_de_derive.rs
index 838107da04..2eb9d18f41 100644
--- a/data/codec-derive/src/nested_de_derive.rs
+++ b/data/codec-derive/src/nested_de_derive.rs
@@ -25,18 +25,19 @@ pub fn variant_dep_decode_snippets(
     data_enum: &syn::DataEnum,
     input_value: &proc_macro2::TokenStream,
 ) -> Vec<proc_macro2::TokenStream> {
+    let mut previous_disc: Vec<ExplicitDiscriminant> = Vec::new();
     data_enum
 		.variants
 		.iter()
 		.enumerate()
 		.map(|(variant_index, variant)| {
-			let variant_index_u8 = variant_index as u8;
+            let variant_discriminant = get_discriminant(variant_index, variant, &mut previous_disc);
 			let variant_ident = &variant.ident;
 			let variant_field_snippets = fields_decl_syntax(&variant.fields, |index, field| {
 				dep_decode_snippet(index, field, input_value)
 			});
 			quote! {
-				#variant_index_u8 => core::result::Result::Ok( #name::#variant_ident #variant_field_snippets ),
+                #variant_discriminant => core::result::Result::Ok( #name::#variant_ident #variant_field_snippets ),
 			}
 		})
 		.collect()
diff --git a/data/codec-derive/src/nested_en_derive.rs b/data/codec-derive/src/nested_en_derive.rs
index 11d28e3f07..7a716d2d8d 100644
--- a/data/codec-derive/src/nested_en_derive.rs
+++ b/data/codec-derive/src/nested_en_derive.rs
@@ -12,12 +12,13 @@ fn variant_dep_encode_snippets(
     name: &syn::Ident,
     data_enum: &syn::DataEnum,
 ) -> Vec<proc_macro2::TokenStream> {
+    let mut previous_disc: Vec<ExplicitDiscriminant> = Vec::new();
     data_enum
         .variants
         .iter()
         .enumerate()
         .map(|(variant_index, variant)| {
-            let variant_index_u8 = variant_index as u8;
+            let variant_discriminant = get_discriminant(variant_index, variant, &mut previous_disc);
             let variant_ident = &variant.ident;
             let local_var_declarations =
                 fields_decl_syntax(&variant.fields, local_variable_for_field);
@@ -26,7 +27,7 @@ fn variant_dep_encode_snippets(
             });
             quote! {
                 #name::#variant_ident #local_var_declarations => {
-                    codec::NestedEncode::dep_encode_or_handle_err(&#variant_index_u8, __dest__, __h__)?;
+                    codec::NestedEncode::dep_encode_or_handle_err(&#variant_discriminant, __dest__, __h__)?;
                     #(#variant_field_snippets)*
                 },
             }
diff --git a/data/codec-derive/src/top_de_derive.rs b/data/codec-derive/src/top_de_derive.rs
index 59c1dad6fb..9c6245210d 100644
--- a/data/codec-derive/src/top_de_derive.rs
+++ b/data/codec-derive/src/top_de_derive.rs
@@ -7,15 +7,16 @@ fn fieldless_enum_match_arm_result_ok(
     name: &syn::Ident,
     data_enum: &syn::DataEnum,
 ) -> Vec<proc_macro2::TokenStream> {
+    let mut previous_disc: Vec<ExplicitDiscriminant> = Vec::new();
     data_enum
         .variants
         .iter()
         .enumerate()
         .map(|(variant_index, variant)| {
-            let variant_index_u8 = variant_index as u8;
+            let variant_discriminant = get_discriminant(variant_index, variant, &mut previous_disc);
             let variant_ident = &variant.ident;
             quote! {
-                #variant_index_u8 => core::result::Result::Ok( #name::#variant_ident ),
+                #variant_discriminant => core::result::Result::Ok( #name::#variant_ident ),
             }
         })
         .collect()
diff --git a/data/codec-derive/src/top_en_derive.rs b/data/codec-derive/src/top_en_derive.rs
index 35a46c5346..ccaccb7da5 100644
--- a/data/codec-derive/src/top_en_derive.rs
+++ b/data/codec-derive/src/top_en_derive.rs
@@ -7,18 +7,19 @@ pub fn variant_top_encode_snippets(
     name: &syn::Ident,
     data_enum: &syn::DataEnum,
 ) -> Vec<proc_macro2::TokenStream> {
+    let mut previous_disc: Vec<ExplicitDiscriminant> = Vec::new();
     data_enum
         .variants
         .iter()
         .enumerate()
         .map(|(variant_index, variant)| {
-            let discriminant_u8 = variant_index as u8;
+            let variant_discriminant = get_discriminant(variant_index, variant, &mut previous_disc);
             let variant_ident = &variant.ident;
             if variant.fields.is_empty() {
                 // top-encode discriminant directly
                 quote! {
                     #name::#variant_ident =>
-                        codec::TopEncode::top_encode_or_handle_err(&#discriminant_u8, output, __h__),
+                        codec::TopEncode::top_encode_or_handle_err(&#variant_discriminant, output, __h__),
                 }
             } else {
                 // dep-encode to buffer first
@@ -31,7 +32,7 @@ pub fn variant_top_encode_snippets(
                     #name::#variant_ident #local_var_declarations => {
                         let mut __buffer__ = output.start_nested_encode();
                         let __dest__ = &mut __buffer__;
-                        codec::NestedEncode::dep_encode_or_handle_err(&#discriminant_u8, __dest__, __h__)?;
+                        codec::NestedEncode::dep_encode_or_handle_err(&#variant_discriminant, __dest__, __h__)?;
                         #(#variant_field_snippets)*
                         output.finalize_nested_encode(__buffer__);
                         core::result::Result::Ok(())
diff --git a/data/codec-derive/src/util.rs b/data/codec-derive/src/util.rs
index 92f9106fa1..e2e7f93acd 100644
--- a/data/codec-derive/src/util.rs
+++ b/data/codec-derive/src/util.rs
@@ -1,6 +1,11 @@
 use quote::quote;
 use syn::{punctuated::Punctuated, token::Comma, Variant};
 
+pub struct ExplicitDiscriminant {
+    pub variant_index: usize,
+    pub value: u8,
+}
+
 pub fn is_fieldless_enum(data_enum: &syn::DataEnum) -> bool {
     data_enum
         .variants
@@ -93,3 +98,46 @@ pub fn validate_enum_variants(variants: &Punctuated<Variant, Comma>) {
         "enums with more than 256 variants not supported"
     );
 }
+
+pub fn get_discriminant(
+    variant_index: usize,
+    variant: &syn::Variant,
+    previous_disc: &mut Vec<ExplicitDiscriminant>,
+) -> proc_macro2::TokenStream {
+    // if it has explicit discriminant
+    if let Some((_, syn::Expr::Lit(expr))) = &variant.discriminant {
+        let lit = match &expr.lit {
+            syn::Lit::Int(val) => {
+                let value = val.base10_parse().unwrap_or_else(|_| {
+                    panic!("Can not unwrap int value from explicit discriminant")
+                });
+                previous_disc.push(ExplicitDiscriminant {
+                    variant_index,
+                    value,
+                });
+                value
+            },
+            _ => panic!("Only integer values as discriminants"), // theoretically covered by the compiler
+        };
+        return quote! { #lit};
+    }
+
+    // if no explicit discriminant, check previous discriminants
+    // get previous explicit + 1 if there has been any explicit before
+    let next_value = match previous_disc.last() {
+        //there are previous explicit discriminants
+        Some(ExplicitDiscriminant {
+            variant_index: prev_index,
+            value: prev_value,
+        }) if *prev_index < variant_index - 1 => prev_value + (variant_index - prev_index) as u8,
+        Some(ExplicitDiscriminant {
+            variant_index: _,
+            value: prev_value,
+        }) => prev_value + 1,
+
+        // vec is empty, return index
+        None => variant_index as u8,
+    };
+
+    quote! { #next_value}
+}
diff --git a/framework/derive/src/type_abi_derive.rs b/framework/derive/src/type_abi_derive.rs
index d64c932e22..efef94acb6 100644
--- a/framework/derive/src/type_abi_derive.rs
+++ b/framework/derive/src/type_abi_derive.rs
@@ -2,6 +2,11 @@ use super::parse::attributes::extract_doc;
 use proc_macro::TokenStream;
 use quote::quote;
 
+pub struct ExplicitDiscriminant {
+    pub variant_index: usize,
+    pub value: usize,
+}
+
 fn field_snippet(index: usize, field: &syn::Field) -> proc_macro2::TokenStream {
     let field_docs = extract_doc(field.attrs.as_slice());
     let field_name_str = if let Some(ident) = &field.ident {
@@ -63,6 +68,7 @@ pub fn type_abi_derive(ast: &syn::DeriveInput) -> TokenStream {
             }
         },
         syn::Data::Enum(data_enum) => {
+            let mut previous_disc: Vec<ExplicitDiscriminant> = Vec::new();
             let enum_variant_snippets: Vec<proc_macro2::TokenStream> = data_enum
                 .variants
                 .iter()
@@ -71,13 +77,15 @@ pub fn type_abi_derive(ast: &syn::DeriveInput) -> TokenStream {
                     let variant_docs = extract_doc(variant.attrs.as_slice());
                     let variant_name_str = variant.ident.to_string();
                     let variant_field_snippets = fields_snippets(&variant.fields);
+                    let variant_discriminant =
+                        get_discriminant(variant_index, variant, &mut previous_disc);
                     quote! {
                         let mut field_descriptions = multiversx_sc::types::heap::Vec::new();
                         #(#variant_field_snippets)*
                         variant_descriptions.push(multiversx_sc::abi::EnumVariantDescription::new(
                             &[ #(#variant_docs),* ],
                             #variant_name_str,
-                            #variant_index,
+                            #variant_discriminant,
                             field_descriptions,
                         ));
                     }
@@ -119,3 +127,46 @@ pub fn type_abi_derive(ast: &syn::DeriveInput) -> TokenStream {
     };
     type_abi_impl.into()
 }
+
+pub fn get_discriminant(
+    variant_index: usize,
+    variant: &syn::Variant,
+    previous_disc: &mut Vec<ExplicitDiscriminant>,
+) -> proc_macro2::TokenStream {
+    // if it has explicit discriminant
+    if let Some((_, syn::Expr::Lit(expr))) = &variant.discriminant {
+        let lit = match &expr.lit {
+            syn::Lit::Int(val) => {
+                let value = val.base10_parse().unwrap_or_else(|_| {
+                    panic!("Can not unwrap int value from explicit discriminant")
+                });
+                previous_disc.push(ExplicitDiscriminant {
+                    variant_index,
+                    value,
+                });
+                value
+            },
+            _ => panic!("Only integer values as discriminants"), // theoretically covered by the compiler
+        };
+        return quote! { #lit};
+    }
+
+    // if no explicit discriminant, check previous discriminants
+    // get previous explicit + 1 if there has been any explicit before
+    let next_value = match previous_disc.last() {
+        // there are previous explicit discriminants
+        Some(ExplicitDiscriminant {
+            variant_index: prev_index,
+            value: prev_value,
+        }) if *prev_index < variant_index - 1 => prev_value + variant_index - prev_index,
+        Some(ExplicitDiscriminant {
+            variant_index: _,
+            value: prev_value,
+        }) => prev_value + 1,
+
+        // vec is empty, return index
+        None => variant_index,
+    };
+
+    quote! { #next_value}
+}

From d7de63e07053ae7abbaff8ce9f5265170adc8b54 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Fri, 2 Feb 2024 15:33:13 +0200
Subject: [PATCH 0313/1254] rafactor

---
 .../alloc-features/sc-config.toml             |   5 +
 .../scenarios/leaking-memory.scen.json        |  40 +++++
 .../alloc-features/src/memory_types.rs        |   7 +
 .../tests/alloc_features_scenario_go_test.rs  |   8 +-
 .../tests/alloc_features_scenario_rs_test.rs  |  19 +-
 .../wasm-fail-memory/Cargo.lock               |  18 +-
 .../wasm-fail-memory/Cargo.toml               |   2 +-
 .../wasm-leaking-memory/Cargo.lock            | 170 ++++++++++++++++++
 .../wasm-leaking-memory/Cargo.toml            |  32 ++++
 .../wasm-leaking-memory/src/lib.rs            |  93 ++++++++++
 .../src/cmd/contract/sc_config/wasm_build.rs  |  21 ++-
 framework/meta/src/tools/wasm_extractor.rs    | 102 ++++++-----
 12 files changed, 438 insertions(+), 79 deletions(-)
 create mode 100644 contracts/feature-tests/alloc-features/scenarios/leaking-memory.scen.json
 create mode 100644 contracts/feature-tests/alloc-features/wasm-leaking-memory/Cargo.lock
 create mode 100644 contracts/feature-tests/alloc-features/wasm-leaking-memory/Cargo.toml
 create mode 100644 contracts/feature-tests/alloc-features/wasm-leaking-memory/src/lib.rs

diff --git a/contracts/feature-tests/alloc-features/sc-config.toml b/contracts/feature-tests/alloc-features/sc-config.toml
index 4da34c6235..dd27adc5df 100644
--- a/contracts/feature-tests/alloc-features/sc-config.toml
+++ b/contracts/feature-tests/alloc-features/sc-config.toml
@@ -11,3 +11,8 @@ stack-size = "32k"
 name = "fail-memory"
 allocator = "fail"
 add-labels = ["fail-memory"]
+
+[contracts.alloc-features-leaking-memory]
+name = "leaking-memory"
+allocator = "leaking"
+add-labels = ["leaking-memory"]
diff --git a/contracts/feature-tests/alloc-features/scenarios/leaking-memory.scen.json b/contracts/feature-tests/alloc-features/scenarios/leaking-memory.scen.json
new file mode 100644
index 0000000000..6d98fa3c76
--- /dev/null
+++ b/contracts/feature-tests/alloc-features/scenarios/leaking-memory.scen.json
@@ -0,0 +1,40 @@
+{
+    "gasSchedule": "v3",
+    "steps": [
+        {
+            "step": "setState",
+            "accounts": {
+                "sc:leaking_memory": {
+                    "nonce": "0",
+                    "balance": "0",
+                    "code": "file:../output/leaking-memory.wasm"
+                },
+                "address:an_account": {
+                    "nonce": "0",
+                    "balance": "0"
+                }
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "1",
+            "tx": {
+                "from": "address:an_account",
+                "to": "sc:leaking_memory",
+                "function": "alloc_with_leaking_memory",
+                "arguments": [],
+                "gasLimit": "50,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": [
+                    "1"
+                ],
+                "status": "",
+                "logs": "*",
+                "gas": "*",
+                "refund": "*"
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/contracts/feature-tests/alloc-features/src/memory_types.rs b/contracts/feature-tests/alloc-features/src/memory_types.rs
index 1e43479ebe..76ecbc606c 100644
--- a/contracts/feature-tests/alloc-features/src/memory_types.rs
+++ b/contracts/feature-tests/alloc-features/src/memory_types.rs
@@ -9,4 +9,11 @@ pub trait MemoryTypes {
         let _x = String::from("H");
         1
     }
+
+    #[endpoint]
+    #[label("leaking-memory")]
+    fn alloc_with_leaking_memory(&self) -> i32 {
+        let _ = Box::new(42);
+        1
+    }
 }
diff --git a/contracts/feature-tests/alloc-features/tests/alloc_features_scenario_go_test.rs b/contracts/feature-tests/alloc-features/tests/alloc_features_scenario_go_test.rs
index 1120c29f78..170a6eb9ea 100644
--- a/contracts/feature-tests/alloc-features/tests/alloc_features_scenario_go_test.rs
+++ b/contracts/feature-tests/alloc-features/tests/alloc_features_scenario_go_test.rs
@@ -69,10 +69,10 @@ fn fail_memory_go() {
     world().run("scenarios/fail-memory.scen.json");
 }
 
-// #[test]
-// fn leaking_memory_go() {
-//     world().run("scenarios/leaking-memory.scen.json");
-// }
+#[test]
+fn leaking_memory_go() {
+    world().run("scenarios/leaking-memory.scen.json");
+}
 
 #[test]
 fn managed_buffer_concat_2_go() {
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 d1969c19e7..a37391190b 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
@@ -14,16 +14,17 @@ fn world() -> ScenarioWorld {
         "mxsc:output/fail-memory.mxsc.json",
         alloc_features::ContractBuilder,
         "fail-memory",
+    );    
+    
+    blockchain.register_partial_contract::<alloc_features::AbiProvider, _>(
+        "mxsc:output/leaking-memory.mxsc.json",
+        alloc_features::ContractBuilder,
+        "leaking-memory",
     );
 
     blockchain
 }
 
-#[test]
-fn fail_memory_rs() {
-    world().run("scenarios/fail-memory.scen.json");
-}
-
 #[test]
 fn boxed_bytes_zeros_rs() {
     world().run("scenarios/boxed_bytes_zeros.scen.json");
@@ -84,7 +85,15 @@ fn echo_vec_u_8_rs() {
     world().run("scenarios/echo_vec_u8.scen.json");
 }
 
+// #[test]
+// fn fail_memory_rs() {
+//     world().run("scenarios/fail-memory.scen.json");
+// }
 
+#[test]
+fn leaking_memory_rs() {
+    world().run("scenarios/leaking-memory.scen.json");
+}
 
 #[test]
 fn managed_buffer_concat_2_rs() {
diff --git a/contracts/feature-tests/alloc-features/wasm-fail-memory/Cargo.lock b/contracts/feature-tests/alloc-features/wasm-fail-memory/Cargo.lock
index a306cbd963..fb66e31973 100644
--- a/contracts/feature-tests/alloc-features/wasm-fail-memory/Cargo.lock
+++ b/contracts/feature-tests/alloc-features/wasm-fail-memory/Cargo.lock
@@ -23,9 +23,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-fail-memory/Cargo.toml b/contracts/feature-tests/alloc-features/wasm-fail-memory/Cargo.toml
index ebe61883f6..c6a7393892 100644
--- a/contracts/feature-tests/alloc-features/wasm-fail-memory/Cargo.toml
+++ b/contracts/feature-tests/alloc-features/wasm-fail-memory/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/wasm-leaking-memory/Cargo.lock b/contracts/feature-tests/alloc-features/wasm-leaking-memory/Cargo.lock
new file mode 100644
index 0000000000..89b4d1f83e
--- /dev/null
+++ b/contracts/feature-tests/alloc-features/wasm-leaking-memory/Cargo.lock
@@ -0,0 +1,170 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "alloc-features"
+version = "0.0.0"
+dependencies = [
+ "multiversx-sc",
+]
+
+[[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.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+
+[[package]]
+name = "endian-type"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
+
+[[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 = "leaking-memory-wasm"
+version = "0.0.0"
+dependencies = [
+ "alloc-features",
+ "multiversx-sc-wasm-adapter",
+]
+
+[[package]]
+name = "multiversx-sc"
+version = "0.47.1"
+dependencies = [
+ "bitflags",
+ "hex-literal",
+ "multiversx-sc-codec",
+ "multiversx-sc-derive",
+ "num-traits",
+]
+
+[[package]]
+name = "multiversx-sc-codec"
+version = "0.18.5"
+dependencies = [
+ "arrayvec",
+ "multiversx-sc-codec-derive",
+]
+
+[[package]]
+name = "multiversx-sc-codec-derive"
+version = "0.18.5"
+dependencies = [
+ "hex",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "multiversx-sc-derive"
+version = "0.47.1"
+dependencies = [
+ "hex",
+ "proc-macro2",
+ "quote",
+ "radix_trie",
+ "syn",
+]
+
+[[package]]
+name = "multiversx-sc-wasm-adapter"
+version = "0.47.1"
+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.78"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+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.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+
+[[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/alloc-features/wasm-leaking-memory/Cargo.toml b/contracts/feature-tests/alloc-features/wasm-leaking-memory/Cargo.toml
new file mode 100644
index 0000000000..eb5797ef47
--- /dev/null
+++ b/contracts/feature-tests/alloc-features/wasm-leaking-memory/Cargo.toml
@@ -0,0 +1,32 @@
+# Code generated by the multiversx-sc build system. DO NOT EDIT.
+
+# ##########################################
+# ############## AUTO-GENERATED #############
+# ##########################################
+
+[package]
+name = "leaking-memory-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.alloc-features]
+path = ".."
+
+[dependencies.multiversx-sc-wasm-adapter]
+version = "0.47.1"
+path = "../../../../framework/wasm-adapter"
+
+[workspace]
+members = ["."]
diff --git a/contracts/feature-tests/alloc-features/wasm-leaking-memory/src/lib.rs b/contracts/feature-tests/alloc-features/wasm-leaking-memory/src/lib.rs
new file mode 100644
index 0000000000..073c8d90a5
--- /dev/null
+++ b/contracts/feature-tests/alloc-features/wasm-leaking-memory/src/lib.rs
@@ -0,0 +1,93 @@
+// Code generated by the multiversx-sc build system. DO NOT EDIT.
+
+////////////////////////////////////////////////////
+////////////////// AUTO-GENERATED //////////////////
+////////////////////////////////////////////////////
+
+// Init:                                 1
+// Endpoints:                           65
+// Async Callback (empty):               1
+// Total number of exported functions:  67
+
+#![no_std]
+
+// Configuration that works with rustc < 1.73.0.
+// TODO: Recommended rustc version: 1.73.0 or newer.
+#![feature(lang_items)]
+
+multiversx_sc_wasm_adapter::allocator!(leaking);
+multiversx_sc_wasm_adapter::panic_handler!();
+
+multiversx_sc_wasm_adapter::endpoints! {
+    alloc_features
+    (
+        init => init
+        echo_h256 => echo_h256
+        echo_boxed_array_u8 => echo_boxed_array_u8
+        echo_boxed_bytes => echo_boxed_bytes
+        echo_slice_u8 => echo_slice_u8
+        echo_vec_u8 => echo_vec_u8
+        echo_string => echo_string
+        echo_str => echo_str
+        echo_str_box => echo_str_box
+        echo_async_result_empty => echo_async_result_empty
+        echo_large_boxed_byte_array => echo_large_boxed_byte_array
+        echo_boxed_ser_example_1 => echo_boxed_ser_example_1
+        echo_multi_value_tuples => echo_multi_value_tuples
+        echo_ser_example_1 => echo_ser_example_1
+        echo_vec_of_managed_buffer => echo_vec_of_managed_buffer
+        echo_big_int_vec => echo_big_int_vec
+        echo_varags_u32 => echo_varags_u32
+        echo_varags_big_uint => echo_varags_big_uint
+        compute_get_values => compute_get_values
+        compute_create_ec => compute_create_ec
+        compute_get_ec_length => compute_get_ec_length
+        compute_get_priv_key_byte_length => compute_get_priv_key_byte_length
+        compute_ec_add => compute_ec_add
+        compute_ec_double => compute_ec_double
+        compute_is_on_curve_ec => compute_is_on_curve_ec
+        compute_scalar_mult => compute_scalar_mult
+        compute_scalar_base_mult => compute_scalar_base_mult
+        compute_marshal_ec => compute_marshal_ec
+        compute_marshal_compressed_ec => compute_marshal_compressed_ec
+        compute_unmarshal_ec => compute_unmarshal_ec
+        compute_unmarshal_compressed_ec => compute_unmarshal_compressed_ec
+        compute_generate_key_ec => compute_generate_key_ec
+        only_owner_legacy => only_owner_legacy
+        return_sc_error => return_sc_error
+        result_ok => result_ok
+        result_err_from_bytes_1 => result_err_from_bytes_1
+        result_err_from_bytes_2 => result_err_from_bytes_2
+        result_err_from_bytes_3 => result_err_from_bytes_3
+        result_err_from_string => result_err_from_string
+        result_err_from_str => result_err_from_str
+        result_echo => result_echo
+        result_echo_2 => result_echo_2
+        result_echo_3 => result_echo_3
+        mbuffer_from_slice => mbuffer_from_slice
+        mbuffer_from_boxed_bytes => mbuffer_from_boxed_bytes
+        mbuffer_overwrite => mbuffer_overwrite
+        mbuffer_append_bytes => mbuffer_append_bytes
+        mbuffer_load_slice => mbuffer_load_slice
+        mbuffer_set_slice => mbuffer_set_slice
+        managed_address_from => managed_address_from
+        load_vec_u8 => load_vec_u8
+        load_addr => load_addr
+        load_opt_addr => load_opt_addr
+        is_empty_opt_addr => is_empty_opt_addr
+        load_ser_1 => load_ser_1
+        store_vec_u8 => store_vec_u8
+        store_addr => store_addr
+        store_opt_addr => store_opt_addr
+        store_ser_1 => store_ser_1
+        compare_h256 => compare_h256
+        h256_is_zero => h256_is_zero
+        boxed_bytes_zeros => boxed_bytes_zeros
+        boxed_bytes_concat_2 => boxed_bytes_concat_2
+        boxed_bytes_split => boxed_bytes_split
+        vec_concat_const => vec_concat_const
+        alloc_with_leaking_memory => alloc_with_leaking_memory
+    )
+}
+
+multiversx_sc_wasm_adapter::async_callback_empty! {}
diff --git a/framework/meta/src/cmd/contract/sc_config/wasm_build.rs b/framework/meta/src/cmd/contract/sc_config/wasm_build.rs
index 368b0d0ed6..5907f55c72 100644
--- a/framework/meta/src/cmd/contract/sc_config/wasm_build.rs
+++ b/framework/meta/src/cmd/contract/sc_config/wasm_build.rs
@@ -69,20 +69,13 @@ impl ContractVariant {
 
     fn finalize_build(&self, build_args: &BuildArgs, output_path: &str) {
         self.copy_contracts_to_output(build_args, output_path);
-        let wasm_data = self.build_wasm_info(build_args, output_path);
         self.run_wasm_opt(build_args, output_path);
         self.run_wasm2wat(build_args, output_path);
-        self.extract_imports(build_args, output_path, wasm_data);
+        self.extract_wasm_info(build_args, output_path);
         self.run_twiggy(build_args, output_path);
         self.pack_mxsc_file(build_args, output_path);
     }
 
-    fn build_wasm_info(&self, build_args: &BuildArgs, output_path: &str) -> WasmInfo {
-        let output_wasm_path = format!("{output_path}/{}", self.wasm_output_name(build_args));
-
-        WasmInfo::build_wasm_info(&output_wasm_path)
-    }
-
     fn copy_contracts_to_output(&self, build_args: &BuildArgs, output_path: &str) {
         let source_wasm_path = self.wasm_compilation_output_path(&build_args.target_dir_wasm);
         let output_wasm_path = format!("{output_path}/{}", self.wasm_output_name(build_args));
@@ -130,19 +123,25 @@ impl ContractVariant {
         tools::wasm_to_wat(output_wasm_path.as_str(), output_wat_path.as_str());
     }
 
-    fn extract_imports(&self, build_args: &BuildArgs, output_path: &str, mut wasm_data: WasmInfo) {
+    fn extract_wasm_info(&self, build_args: &BuildArgs, output_path: &str) {
+        let output_wasm_path = format!("{output_path}/{}", self.wasm_output_name(build_args));
+
         if !build_args.extract_imports {
+            WasmInfo::extract_wasm_info(&output_wasm_path, build_args.extract_imports)
+                .expect("error occured while extracting imports from .wasm ");
             return;
         }
 
-        let output_wasm_path = format!("{output_path}/{}", self.wasm_output_name(build_args));
         let output_imports_json_path = format!(
             "{}/{}",
             output_path,
             self.imports_json_output_name(build_args)
         );
         print_extract_imports(&output_imports_json_path);
-        wasm_data.set_imports(&output_wasm_path);
+
+        let wasm_data = WasmInfo::extract_wasm_info(&output_wasm_path, true)
+            .expect("error occured while extracting imports from .wasm ");
+
         write_imports_output(
             output_imports_json_path.as_str(),
             wasm_data.imports.as_slice(),
diff --git a/framework/meta/src/tools/wasm_extractor.rs b/framework/meta/src/tools/wasm_extractor.rs
index 7ff6b452a5..fb4233ae78 100644
--- a/framework/meta/src/tools/wasm_extractor.rs
+++ b/framework/meta/src/tools/wasm_extractor.rs
@@ -1,6 +1,6 @@
 use colored::Colorize;
 use std::fs;
-use wasmparser::{BinaryReaderError, Parser, Payload};
+use wasmparser::{BinaryReaderError, DataSectionReader, ImportSectionReader, Parser, Payload};
 
 const ERROR_FAIL_ALLOCATOR: &[u8; 27] = b"memory allocation forbidden";
 
@@ -10,32 +10,54 @@ pub struct WasmInfo {
 }
 
 impl WasmInfo {
-    const fn new() -> Self {
+    const fn new(imports: Vec<String>, allocator_trigger: bool) -> Self {
         WasmInfo {
-            imports: Vec::new(),
-            allocator_trigger: false,
+            imports,
+            allocator_trigger,
         }
     }
 
-    pub fn set_imports(&mut self, output_wasm_path: &str) {
+    pub fn extract_wasm_info(
+        output_wasm_path: &str,
+        extract_imports_enabled: bool,
+    ) -> Result<WasmInfo, BinaryReaderError> {
         let wasm_data = fs::read(output_wasm_path)
-            .expect("error occured while extracting imports from .wasm: file not found");
+            .expect("error occured while extracting information from .wasm: file not found");
 
-        let imports = parse_wasm_imports(wasm_data)
-            .expect("error occured while extracting imports from .wasm ");
-
-        self.imports = imports;
+        populate_wasm_info(wasm_data, extract_imports_enabled)
     }
+}
+
+fn populate_wasm_info(
+    wasm_data: Vec<u8>,
+    extract_imports_enabled: bool,
+) -> Result<WasmInfo, BinaryReaderError> {
+    let mut imports = Vec::new();
+    let mut allocator_triggered = false;
 
-    pub fn build_wasm_info(output_wasm_path: &str) -> Self {
-        let wasm_data = fs::read(output_wasm_path).expect(
-            "error occured while extracting memory allocation information from .wasm: file not found",
-        );
+    let parser = Parser::new(0);
+    for payload in parser.parse_all(&wasm_data) {
+        match payload? {
+            Payload::ImportSection(import_section) => {
+                imports = extract_imports(import_section, extract_imports_enabled);
+            },
+            Payload::DataSection(data_section) => {
+                allocator_triggered = is_fail_allocator_triggered(data_section);
+            },
+            _ => (),
+        }
+    }
 
-        let allocator_trigger = is_memory_allocation(wasm_data)
-            .expect("error occured while extracting memory allocation information from .wasm ");
+    Ok(WasmInfo::new(imports, allocator_triggered))
+}
 
-        if allocator_trigger {
+fn is_fail_allocator_triggered(data_section: DataSectionReader) -> bool {
+    for data_fragment in data_section.into_iter().flatten() {
+        if data_fragment
+            .data
+            .windows(ERROR_FAIL_ALLOCATOR.len())
+            .any(|data| data == ERROR_FAIL_ALLOCATOR)
+        {
             println!(
                 "{}",
                 "FailAllocator used while memory allocation is accessible in code. Contract may fail unexpectedly when memory allocation is attempted"
@@ -43,45 +65,27 @@ impl WasmInfo {
                     .red()
                     .bold()
             );
+            return true;
         }
-
-        Self::new()
     }
+
+    false
 }
 
-fn parse_wasm_imports(wasm_data: Vec<u8>) -> Result<Vec<String>, BinaryReaderError> {
-    let mut import_names = Vec::new();
+pub fn extract_imports(
+    import_section: ImportSectionReader,
+    import_extraction_enabled: bool,
+) -> Vec<String> {
+    if !import_extraction_enabled {
+        return Vec::new();
+    }
 
-    let parser = Parser::new(0);
-    for payload in parser.parse_all(&wasm_data) {
-        if let Payload::ImportSection(import_section) = payload? {
-            for import in import_section {
-                import_names.push(import?.name.to_string());
-            }
-        }
+    let mut import_names = Vec::new();
+    for import in import_section.into_iter().flatten() {
+        import_names.push(import.name.to_string());
     }
 
     import_names.sort();
 
-    Ok(import_names)
-}
-
-pub fn is_memory_allocation(wasm_data: Vec<u8>) -> Result<bool, BinaryReaderError> {
-    let parser = Parser::new(0);
-
-    for payload in parser.parse_all(&wasm_data).flatten() {
-        if let Payload::DataSection(data_section) = payload {
-            for data_fragment in data_section {
-                if data_fragment?
-                    .data
-                    .windows(ERROR_FAIL_ALLOCATOR.len())
-                    .any(|data| data == ERROR_FAIL_ALLOCATOR)
-                {
-                    return Ok(true);
-                }
-            }
-        }
-    }
-
-    Ok(false)
+    import_names
 }

From 3318481a61877583086042bd560d60852860dc33 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Fri, 2 Feb 2024 15:57:14 +0200
Subject: [PATCH 0314/1254] ignore rust tests

---
 .../tests/alloc_features_scenario_rs_test.rs              | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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 a37391190b..e20d4f7145 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
@@ -90,10 +90,10 @@ fn echo_vec_u_8_rs() {
 //     world().run("scenarios/fail-memory.scen.json");
 // }
 
-#[test]
-fn leaking_memory_rs() {
-    world().run("scenarios/leaking-memory.scen.json");
-}
+// #[test]
+// fn leaking_memory_rs() {
+//     world().run("scenarios/leaking-memory.scen.json");
+// }
 
 #[test]
 fn managed_buffer_concat_2_rs() {

From f2d5dc860f02245b0307b90678c66912835da79b Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 2 Feb 2024 17:56:05 +0200
Subject: [PATCH 0315/1254] sc 0.47.2, codec 0.18.6, vm 0.8.2, scenario-format
 0.22.2

---
 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         |  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 +-
 264 files changed, 404 insertions(+), 394 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ef5e27e856..43a1f1f873 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.2, codec 0.18.6, vm 0.8.2, scenario-format 0.22.2] - 2024-02-02
+- Scenario testing infrastructure:
+	- The Rust VM can generate mock addresses, if not specified in advance.
+	- The `sc:` syntax now generates addresses with VM type 0x0500, same as the latest version of mx-scenario-go.
+	- Rust test support for checking `code_metadata`.
+- Explicit discriminants supported for enums.
+- Optimized `top_encode_number` function. It no longer contains branches or loops.
+- Removed reliance on Rust nightly features `is_sorted` and `slice_partition_dedup`.
+
 ## [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.
diff --git a/Cargo.lock b/Cargo.lock
index a2fa485542..75a443f4a3 100755
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1768,7 +1768,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-chain-scenario-format"
-version = "0.22.1"
+version = "0.22.2"
 dependencies = [
  "bech32",
  "hex",
@@ -1781,7 +1781,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-chain-vm"
-version = "0.8.1"
+version = "0.8.2"
 dependencies = [
  "bitflags 2.4.2",
  "colored",
@@ -1806,7 +1806,7 @@ checksum = "b59072fa0624b55ae5ae3fa6bfa91515bbeb4ac440214bc4a509e2c8806d6e9f"
 
 [[package]]
 name = "multiversx-price-aggregator-sc"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "arrayvec",
  "getrandom",
@@ -1827,7 +1827,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "bitflags 2.4.2",
  "hex-literal",
@@ -1838,7 +1838,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -1847,7 +1847,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -1857,7 +1857,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -1868,7 +1868,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-meta"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "clap",
  "colored",
@@ -1894,14 +1894,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-scenario"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "base64",
  "bech32",
@@ -1927,7 +1927,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-snippets"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "base64",
  "env_logger",
@@ -1941,7 +1941,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "multiversx-sc",
 ]
@@ -1972,7 +1972,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-wegld-swap-sc"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "multiversx-sc",
  "multiversx-sc-modules",
diff --git a/contracts/benchmarks/large-storage/Cargo.toml b/contracts/benchmarks/large-storage/Cargo.toml
index dcc2b99c46..f85db8478b 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.1"
+version = "0.47.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.1"
+version = "0.47.2"
 path = "../../../framework/scenario"
diff --git a/contracts/benchmarks/large-storage/meta/Cargo.toml b/contracts/benchmarks/large-storage/meta/Cargo.toml
index fb280c1436..583e2c8b6c 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.1"
+version = "0.47.2"
 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 e4fe6ef421..a3842fe54c 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.1"
+version = "0.47.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/mappers/benchmark-common/Cargo.toml b/contracts/benchmarks/mappers/benchmark-common/Cargo.toml
index 2d826d0401..19c3ab2e7d 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.1"
+version = "0.47.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.1"
+version = "0.47.2"
 path = "../../../../framework/scenario"
diff --git a/contracts/benchmarks/mappers/linked-list-repeat/Cargo.toml b/contracts/benchmarks/mappers/linked-list-repeat/Cargo.toml
index 0580096a7a..9e0a0a83bc 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.1"
+version = "0.47.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.1"
+version = "0.47.2"
 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 2e1780052e..fad64d1361 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.1"
+version = "0.47.2"
 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 6e13eb452c..236f8e02cc 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.1"
+version = "0.47.2"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/mappers/map-repeat/Cargo.toml b/contracts/benchmarks/mappers/map-repeat/Cargo.toml
index abb009e915..82d70bcf73 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.1"
+version = "0.47.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.1"
+version = "0.47.2"
 path = "../../../../framework/scenario"
diff --git a/contracts/benchmarks/mappers/map-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/map-repeat/meta/Cargo.toml
index 309a30f7dc..30c525b138 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.1"
+version = "0.47.2"
 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 c263c199cf..78ce3b4a3b 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.1"
+version = "0.47.2"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/mappers/queue-repeat/Cargo.toml b/contracts/benchmarks/mappers/queue-repeat/Cargo.toml
index eb5be92b63..1484246588 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.1"
+version = "0.47.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.1"
+version = "0.47.2"
 path = "../../../../framework/scenario"
diff --git a/contracts/benchmarks/mappers/queue-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/queue-repeat/meta/Cargo.toml
index ac43f6aaad..8c3c2bb394 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.1"
+version = "0.47.2"
 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 1eff603231..795b0b2382 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.1"
+version = "0.47.2"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/mappers/set-repeat/Cargo.toml b/contracts/benchmarks/mappers/set-repeat/Cargo.toml
index 27be5f3f04..089861f131 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.1"
+version = "0.47.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.1"
+version = "0.47.2"
 path = "../../../../framework/scenario"
diff --git a/contracts/benchmarks/mappers/set-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/set-repeat/meta/Cargo.toml
index d6faaf64ee..819d75d12d 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.1"
+version = "0.47.2"
 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 05ba0ef635..6ef9181b7b 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.1"
+version = "0.47.2"
 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 545d820868..6e13b51603 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.1"
+version = "0.47.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.1"
+version = "0.47.2"
 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 f6e07ca08b..33fa092828 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.1"
+version = "0.47.2"
 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 fc2c731517..bee4ca4536 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.1"
+version = "0.47.2"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/mappers/vec-repeat/Cargo.toml b/contracts/benchmarks/mappers/vec-repeat/Cargo.toml
index 1e83d4b57f..55a08cfc5d 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.1"
+version = "0.47.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.1"
+version = "0.47.2"
 path = "../../../../framework/scenario"
diff --git a/contracts/benchmarks/mappers/vec-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/vec-repeat/meta/Cargo.toml
index 9dd9e7997b..b0b82ba301 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.1"
+version = "0.47.2"
 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 aac858ec65..b10ebda8cd 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.1"
+version = "0.47.2"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/send-tx-repeat/Cargo.toml b/contracts/benchmarks/send-tx-repeat/Cargo.toml
index 977428ca63..7eed5b74f1 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.1"
+version = "0.47.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.1"
+version = "0.47.2"
 path = "../../../framework/scenario"
diff --git a/contracts/benchmarks/send-tx-repeat/meta/Cargo.toml b/contracts/benchmarks/send-tx-repeat/meta/Cargo.toml
index 176b5a3f74..dce1898e68 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.1"
+version = "0.47.2"
 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 7196dbedaa..add8c1b0e0 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.1"
+version = "0.47.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/str-repeat/Cargo.toml b/contracts/benchmarks/str-repeat/Cargo.toml
index a2a9ca0aca..9833ab6929 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.1"
+version = "0.47.2"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.1"
+version = "0.47.2"
 path = "../../../framework/scenario"
diff --git a/contracts/benchmarks/str-repeat/meta/Cargo.toml b/contracts/benchmarks/str-repeat/meta/Cargo.toml
index b89106f227..aaec1ac65e 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.1"
+version = "0.47.2"
 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 2305e9ff72..e46b5aa6f0 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.1"
+version = "0.47.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/core/price-aggregator/Cargo.toml b/contracts/core/price-aggregator/Cargo.toml
index c4ab3d995d..d0df8089e7 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.1"
+version = "0.47.2"
 authors = [
     "Claudiu-Marcel Bruda <claudiu.bruda@multiversx.com>",
     "MultiversX <contact@multiversx.com>",
@@ -19,15 +19,15 @@ edition = "2021"
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "0.47.1"
+version = "0.47.2"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.47.1"
+version = "0.47.2"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.1"
+version = "0.47.2"
 path = "../../../framework/scenario"
 
 [dependencies]
diff --git a/contracts/core/price-aggregator/meta/Cargo.toml b/contracts/core/price-aggregator/meta/Cargo.toml
index a04867e9c6..19a340dcf7 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.1"
+version = "0.47.2"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.47.1"
+version = "0.47.2"
 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 5181448483..f45ea0e3e1 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.1"
+version = "0.47.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/core/wegld-swap/Cargo.toml b/contracts/core/wegld-swap/Cargo.toml
index 18b2dbb46b..4112372bab 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.1"
+version = "0.47.2"
 
 authors = [
     "Dorin Iancu <dorin.iancu@multiversx.com>",
@@ -20,13 +20,13 @@ edition = "2021"
 path = "src/wegld.rs"
 
 [dependencies.multiversx-sc]
-version = "0.47.1"
+version = "0.47.2"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.47.1"
+version = "0.47.2"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.1"
+version = "0.47.2"
 path = "../../../framework/scenario"
diff --git a/contracts/core/wegld-swap/meta/Cargo.toml b/contracts/core/wegld-swap/meta/Cargo.toml
index c0b4076004..780bf4fe0f 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.1"
+version = "0.47.2"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.47.1"
+version = "0.47.2"
 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 d2523b2e41..ad53575289 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.1"
+version = "0.47.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/adder/Cargo.toml b/contracts/examples/adder/Cargo.toml
index 3453f909c3..b0ea47a52d 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.1"
+version = "0.47.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.1"
+version = "0.47.2"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/adder/interact/Cargo.toml b/contracts/examples/adder/interact/Cargo.toml
index 052466fb49..a2a43fb777 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.1"
+version = "0.47.2"
 path = "../../../../framework/snippets"
diff --git a/contracts/examples/adder/meta/Cargo.toml b/contracts/examples/adder/meta/Cargo.toml
index e5afa09028..3a7da5730e 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.1"
+version = "0.47.2"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/examples/adder/wasm/Cargo.toml b/contracts/examples/adder/wasm/Cargo.toml
index bc17f7dfd9..cd8802d2b5 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.1"
+version = "0.47.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/bonding-curve-contract/Cargo.toml b/contracts/examples/bonding-curve-contract/Cargo.toml
index a8faa2a881..3ee19b1bc1 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.1"
+version = "0.47.2"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.47.1"
+version = "0.47.2"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.1"
+version = "0.47.2"
 path = "../../../framework/scenario"
 
diff --git a/contracts/examples/bonding-curve-contract/meta/Cargo.toml b/contracts/examples/bonding-curve-contract/meta/Cargo.toml
index e8e9baf42c..2ef6b9fc50 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.1"
+version = "0.47.2"
 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 4d44db4b9b..557f54d775 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.1"
+version = "0.47.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/check-pause/Cargo.toml b/contracts/examples/check-pause/Cargo.toml
index 50e8387c37..1cd55c395d 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.1"
+version = "0.47.2"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.47.1"
+version = "0.47.2"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.1"
+version = "0.47.2"
 path = "../../../framework/scenario"
 
diff --git a/contracts/examples/check-pause/meta/Cargo.toml b/contracts/examples/check-pause/meta/Cargo.toml
index 866646fb08..fc756ec1c4 100644
--- a/contracts/examples/check-pause/meta/Cargo.toml
+++ b/contracts/examples/check-pause/meta/Cargo.toml
@@ -9,6 +9,6 @@ authors = ["Alin Cruceat <alin.cruceat@multiversx.com>"]
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.47.1"
+version = "0.47.2"
 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 9855084f0d..6329b40073 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.1"
+version = "0.47.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/crowdfunding-esdt/Cargo.toml b/contracts/examples/crowdfunding-esdt/Cargo.toml
index cb376a1743..9cfad8ecb3 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.1"
+version = "0.47.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.1"
+version = "0.47.2"
 path = "../../../framework/scenario"
 
 [dev-dependencies]
diff --git a/contracts/examples/crowdfunding-esdt/meta/Cargo.toml b/contracts/examples/crowdfunding-esdt/meta/Cargo.toml
index e5dab04398..c4c73bcca7 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.1"
+version = "0.47.2"
 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 a2e3b7d9cc..3a01d7d539 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.1"
+version = "0.47.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/crypto-bubbles/Cargo.toml b/contracts/examples/crypto-bubbles/Cargo.toml
index 20d48fe501..409cb4214e 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.1"
+version = "0.47.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.1"
+version = "0.47.2"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/crypto-bubbles/meta/Cargo.toml b/contracts/examples/crypto-bubbles/meta/Cargo.toml
index 9c7003e8ea..5ede89a5c1 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.1"
+version = "0.47.2"
 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 7a3483d93e..8dc95f386a 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.1"
+version = "0.47.2"
 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 bb4ec07418..1028f93b24 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.1"
+version = "0.47.2"
 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 16e916b399..c2a2274eb5 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.1"
+version = "0.47.2"
 path = "../../../../../framework/base"
diff --git a/contracts/examples/crypto-kitties/kitty-auction/Cargo.toml b/contracts/examples/crypto-kitties/kitty-auction/Cargo.toml
index 8bc113a7bb..16b1af2bbe 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.1"
+version = "0.47.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.1"
+version = "0.47.2"
 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 d74d3e6b7a..bb4e48b29c 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.1"
+version = "0.47.2"
 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 7fac9843c5..098f0d5cfc 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.1"
+version = "0.47.2"
 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 591e93123e..f5794b604d 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.1"
+version = "0.47.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.1"
+version = "0.47.2"
 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 013fd1aa08..d3292ecc24 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.1"
+version = "0.47.2"
 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 fe6f5c2581..63099cadcd 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.1"
+version = "0.47.2"
 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 821fe10561..f9d480a2ae 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.1"
+version = "0.47.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.1"
+version = "0.47.2"
 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 309c539e80..fe09d0341a 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.1"
+version = "0.47.2"
 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 25432641ec..fb94073cd1 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.1"
+version = "0.47.2"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/crypto-zombies/Cargo.toml b/contracts/examples/crypto-zombies/Cargo.toml
index 43a35eecf1..4f22670c5b 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.1"
+version = "0.47.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.1"
+version = "0.47.2"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/crypto-zombies/meta/Cargo.toml b/contracts/examples/crypto-zombies/meta/Cargo.toml
index ddd117f91d..4c63cb1bb8 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.1"
+version = "0.47.2"
 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 6ebdb049be..91245a915b 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.1"
+version = "0.47.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/digital-cash/Cargo.toml b/contracts/examples/digital-cash/Cargo.toml
index bf896193d3..3755bb44ad 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.1"
+version = "0.47.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.1"
+version = "0.47.2"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/digital-cash/meta/Cargo.toml b/contracts/examples/digital-cash/meta/Cargo.toml
index 527cd0a2d7..dc7282fb52 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.1"
+version = "0.47.2"
 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 1284590460..3621d24deb 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.1"
+version = "0.47.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/empty/Cargo.toml b/contracts/examples/empty/Cargo.toml
index f44ef249be..e0c864133b 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.1"
+version = "0.47.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.1"
+version = "0.47.2"
 path = "../../../framework/scenario"
 
 [dev-dependencies]
diff --git a/contracts/examples/empty/meta/Cargo.toml b/contracts/examples/empty/meta/Cargo.toml
index 49477a946b..2b86ae4709 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.1"
+version = "0.47.2"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/examples/empty/wasm/Cargo.toml b/contracts/examples/empty/wasm/Cargo.toml
index 91173bb778..fce843d84c 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.1"
+version = "0.47.2"
 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 bd2df5a7c4..278ec3d48e 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.1"
+version = "0.47.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.1"
+version = "0.47.2"
 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 31ac3774e6..6db901c05f 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.1"
+version = "0.47.2"
 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 c3ea31e4bb..b9e6f20b79 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.1"
+version = "0.47.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/factorial/Cargo.toml b/contracts/examples/factorial/Cargo.toml
index b70f5ab41c..dda46719f0 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.1"
+version = "0.47.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.1"
+version = "0.47.2"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/factorial/meta/Cargo.toml b/contracts/examples/factorial/meta/Cargo.toml
index ce5e1352ae..effe9f182d 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.1"
+version = "0.47.2"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/examples/factorial/wasm/Cargo.toml b/contracts/examples/factorial/wasm/Cargo.toml
index 2027996e93..e71ab45a37 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.1"
+version = "0.47.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/fractional-nfts/Cargo.toml b/contracts/examples/fractional-nfts/Cargo.toml
index eff1cf0b15..43f4ab5208 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.1"
+version = "0.47.2"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.47.1"
+version = "0.47.2"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.1"
+version = "0.47.2"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/fractional-nfts/meta/Cargo.toml b/contracts/examples/fractional-nfts/meta/Cargo.toml
index a6f26df7da..89760d434c 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.1"
+version = "0.47.2"
 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 5f475377d7..38b654d67b 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.1"
+version = "0.47.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/lottery-esdt/Cargo.toml b/contracts/examples/lottery-esdt/Cargo.toml
index 6198d750d4..2cf4480bd4 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.1"
+version = "0.47.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.1"
+version = "0.47.2"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/lottery-esdt/meta/Cargo.toml b/contracts/examples/lottery-esdt/meta/Cargo.toml
index 5eec36802f..dbea213543 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.1"
+version = "0.47.2"
 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 3414255cd9..80a88a8498 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.1"
+version = "0.47.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/multisig/Cargo.toml b/contracts/examples/multisig/Cargo.toml
index 6d67a0f922..c60a79a1f3 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.1"
+version = "0.47.2"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.47.1"
+version = "0.47.2"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.1"
+version = "0.47.2"
 path = "../../../framework/scenario"
 
 [dev-dependencies.adder]
@@ -27,7 +27,7 @@ path = "../adder"
 path = "../factorial"
 
 [dev-dependencies.multiversx-wegld-swap-sc]
-version = "0.47.1"
+version = "0.47.2"
 path = "../../core/wegld-swap"
 
 [dev-dependencies]
diff --git a/contracts/examples/multisig/interact/Cargo.toml b/contracts/examples/multisig/interact/Cargo.toml
index 4febd898ee..daa917618b 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.1"
+version = "0.47.2"
 path = "../../../../contracts/modules"
 
 [dependencies.multiversx-sc-snippets]
-version = "0.47.1"
+version = "0.47.2"
 path = "../../../../framework/snippets"
 
 [dependencies.multiversx-sc-scenario]
-version = "=0.47.1"
+version = "=0.47.2"
 path = "../../../../framework/scenario"
diff --git a/contracts/examples/multisig/meta/Cargo.toml b/contracts/examples/multisig/meta/Cargo.toml
index b538ab5cdf..c0f669414a 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.1"
+version = "0.47.2"
 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 a02ca050d5..945b04a8d5 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.1"
+version = "0.47.2"
 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 2fe5644122..3333a29e86 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.1"
+version = "0.47.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/multisig/wasm/Cargo.toml b/contracts/examples/multisig/wasm/Cargo.toml
index df8063533d..7486ac8bbf 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.1"
+version = "0.47.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/nft-minter/Cargo.toml b/contracts/examples/nft-minter/Cargo.toml
index 5053f9b981..ffd702c5f7 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.1"
+version = "0.47.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.1"
+version = "0.47.2"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/nft-minter/meta/Cargo.toml b/contracts/examples/nft-minter/meta/Cargo.toml
index 903749a9a2..0f1fdec9ba 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.1"
+version = "0.47.2"
 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 e17a49c3bf..a0bd23ba33 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.1"
+version = "0.47.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/nft-storage-prepay/Cargo.toml b/contracts/examples/nft-storage-prepay/Cargo.toml
index a51be91582..ad71ccf5fe 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.1"
+version = "0.47.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.1"
+version = "0.47.2"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/nft-storage-prepay/meta/Cargo.toml b/contracts/examples/nft-storage-prepay/meta/Cargo.toml
index 981325cd64..860846d93b 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.1"
+version = "0.47.2"
 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 afc95ae9ca..a1e808e20f 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.1"
+version = "0.47.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/nft-subscription/Cargo.toml b/contracts/examples/nft-subscription/Cargo.toml
index a1a9e931c7..854cf4d284 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.1"
+version = "0.47.2"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.47.1"
+version = "0.47.2"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.1"
+version = "0.47.2"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/nft-subscription/meta/Cargo.toml b/contracts/examples/nft-subscription/meta/Cargo.toml
index 71675f12c4..57800d5546 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.1"
+version = "0.47.2"
 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 de7aab241f..ab27abeacd 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.1"
+version = "0.47.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/order-book/factory/Cargo.toml b/contracts/examples/order-book/factory/Cargo.toml
index 9d1de4ddfe..aa632d4468 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.1"
+version = "0.47.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.1"
+version = "0.47.2"
 path = "../../../../framework/scenario"
 
diff --git a/contracts/examples/order-book/factory/meta/Cargo.toml b/contracts/examples/order-book/factory/meta/Cargo.toml
index 96dfc3918f..632ab30c4f 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.1"
+version = "0.47.2"
 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 c07282d124..a63666fead 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.1"
+version = "0.47.2"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/order-book/pair/Cargo.toml b/contracts/examples/order-book/pair/Cargo.toml
index 66caf024c6..fce8fae450 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.1"
+version = "0.47.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.1"
+version = "0.47.2"
 path = "../../../../framework/scenario"
diff --git a/contracts/examples/order-book/pair/meta/Cargo.toml b/contracts/examples/order-book/pair/meta/Cargo.toml
index 25f67e5b2b..a2b7d88477 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.1"
+version = "0.47.2"
 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 491836ce6b..1b64d7cf3b 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.1"
+version = "0.47.2"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/ping-pong-egld/Cargo.toml b/contracts/examples/ping-pong-egld/Cargo.toml
index 5e095b9761..36d8410254 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.1"
+version = "0.47.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.1"
+version = "0.47.2"
 path = "../../../framework/scenario"
 
diff --git a/contracts/examples/ping-pong-egld/meta/Cargo.toml b/contracts/examples/ping-pong-egld/meta/Cargo.toml
index 1ed1b9bddf..0301baf6fc 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.1"
+version = "0.47.2"
 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 f6ec748b6f..e86d72d827 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.1"
+version = "0.47.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/proxy-pause/Cargo.toml b/contracts/examples/proxy-pause/Cargo.toml
index f18ec51bdf..0503566a0d 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.1"
+version = "0.47.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.1"
+version = "0.47.2"
 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 2e6fa608e8..480ed26122 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.1"
+version = "0.47.2"
 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 be039beed4..3738823a6c 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.1"
+version = "0.47.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/rewards-distribution/Cargo.toml b/contracts/examples/rewards-distribution/Cargo.toml
index 8e4152c212..c1f0feafe4 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.1"
+version = "0.47.2"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.47.1"
+version = "0.47.2"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.1"
+version = "0.47.2"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/rewards-distribution/meta/Cargo.toml b/contracts/examples/rewards-distribution/meta/Cargo.toml
index 397e895fcb..3be9b2ba00 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 <claudiu.bruda@multiversx.com>"]
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.47.1"
+version = "0.47.2"
 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 e0a51c654e..a7e683f016 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.1"
+version = "0.47.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/seed-nft-minter/Cargo.toml b/contracts/examples/seed-nft-minter/Cargo.toml
index 9eedf28061..bfec6baf81 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.1"
+version = "0.47.2"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.47.1"
+version = "0.47.2"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.1"
+version = "0.47.2"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/seed-nft-minter/meta/Cargo.toml b/contracts/examples/seed-nft-minter/meta/Cargo.toml
index 839ec9e833..cc7977a48e 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 <claudiu.bruda@multiversx.com>"]
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.47.1"
+version = "0.47.2"
 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 e8110675a1..a7c3d5f893 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.1"
+version = "0.47.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/token-release/Cargo.toml b/contracts/examples/token-release/Cargo.toml
index c56fac2a99..add9f8665b 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.1"
+version = "0.47.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.1"
+version = "0.47.2"
 path = "../../../framework/scenario"
 
diff --git a/contracts/examples/token-release/meta/Cargo.toml b/contracts/examples/token-release/meta/Cargo.toml
index bd49f3c8e8..9fbcc3154e 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.1"
+version = "0.47.2"
 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 d397c09e87..e5cfcef205 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.1"
+version = "0.47.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/abi-tester/Cargo.toml b/contracts/feature-tests/abi-tester/Cargo.toml
index 4b598ebebf..f4c68b8836 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.1"
+version = "0.47.2"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.1"
+version = "0.47.2"
 path = "../../../framework/scenario"
 
 [dev-dependencies.multiversx-sc-meta]
-version = "0.47.1"
+version = "0.47.2"
 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 b92a7bbed9..e14f13d3ef 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.1"
+            "version": "0.47.2"
         }
     },
     "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 d694d773b0..b0dd789802 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.1"
+            "version": "0.47.2"
         }
     },
     "docs": [
diff --git a/contracts/feature-tests/abi-tester/meta/Cargo.toml b/contracts/feature-tests/abi-tester/meta/Cargo.toml
index 21c17e0ccd..31cee6dcac 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.1"
+version = "0.47.2"
 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 1ad38af5f7..db0ef53086 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.1"
+version = "0.47.2"
 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 9da2c8e8ac..561bc4f1c7 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.1"
+version = "0.47.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/alloc-features/Cargo.toml b/contracts/feature-tests/alloc-features/Cargo.toml
index 553a8a3d60..8c78b91481 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.1"
+version = "0.47.2"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.1"
+version = "0.47.2"
 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 0dd7aeabe4..7080977fa2 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.1"
+version = "0.47.2"
 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 f7f487967e..9df0376315 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.1"
+version = "0.47.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/basic-features/Cargo.toml b/contracts/feature-tests/basic-features/Cargo.toml
index 50118386e8..8cb71d6641 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.1"
+version = "0.47.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.1"
+version = "0.47.2"
 path = "../../../framework/scenario"
 
 [dependencies.multiversx-sc-modules]
-version = "0.47.1"
+version = "0.47.2"
 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 39419a6215..947717e511 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.1"
+version = "0.47.2"
 path = "../../../../framework/snippets"
diff --git a/contracts/feature-tests/basic-features/meta/Cargo.toml b/contracts/feature-tests/basic-features/meta/Cargo.toml
index 830fefe878..5ebb9dcd5a 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.1"
+version = "0.47.2"
 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 f5e488a954..da3a981344 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.1"
+version = "0.47.2"
 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 7b23ae0164..0c7ec4f4f5 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.1"
+version = "0.47.2"
 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 25d5647588..d0c94d7780 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.1"
+version = "0.47.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.1"
+version = "0.47.2"
 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 2463ba91e7..5aed077964 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.1"
+version = "0.47.2"
 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 132193065d..80f6c171fe 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.1"
+version = "0.47.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/Cargo.toml b/contracts/feature-tests/composability/Cargo.toml
index 247a731013..c3a4534a0d 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.1"
+version = "0.47.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.1"
+version = "0.47.2"
 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 e60d45cf7e..c02dc0f411 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.1"
+version = "0.47.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.1"
+version = "0.47.2"
 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 ca6783ebcc..280e054390 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.1"
+version = "0.47.2"
 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 eb2034f615..0c05b89486 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.1"
+version = "0.47.2"
 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 1c928ad193..d9e303934a 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.1"
+version = "0.47.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.1"
+version = "0.47.2"
 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 d272e93172..23ebde7219 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.1"
+version = "0.47.2"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.1"
+version = "0.47.2"
 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 0cab01a143..64bef88d0d 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.1"
+version = "0.47.2"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.47.1"
+version = "0.47.2"
 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 fa0534c66c..072f1edc7d 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.1"
+version = "0.47.2"
 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 84eba95f83..1a78069422 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.1"
+version = "0.47.2"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.1"
+version = "0.47.2"
 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 c94908d049..8901156bcb 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.1"
+version = "0.47.2"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.47.1"
+version = "0.47.2"
 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 3e703b3e8c..65d8d7e506 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.1"
+version = "0.47.2"
 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 c47fe60462..35372e74bf 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.1"
+version = "0.47.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.1"
+version = "0.47.2"
 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 6512cc5bba..a52a5def70 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.1"
+version = "0.47.2"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.1"
+version = "0.47.2"
 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 9277421608..adce020c48 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.1"
+version = "0.47.2"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.47.1"
+version = "0.47.2"
 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 cfbb8605e8..9eecdeac0c 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.1"
+version = "0.47.2"
 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 663aa5ec06..d8fc4b645b 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.1"
+version = "0.47.2"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.1"
+version = "0.47.2"
 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 e60933dfd7..e63da2fa95 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.1"
+version = "0.47.2"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.47.1"
+version = "0.47.2"
 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 2a5a61c375..8eb9bfe8b1 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.1"
+version = "0.47.2"
 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 3277930049..ef513e1fdf 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.1"
+version = "0.47.2"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.47.1"
+version = "0.47.2"
 path = "../../../../framework/wasm-adapter"
 optional = true
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.1"
+version = "0.47.2"
 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 9f836462e0..42cc515f0f 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.1"
+version = "0.47.2"
 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 4bf40d8ddd..8e5564562c 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.1"
+version = "0.47.2"
 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 14fbea5818..0f266b7c18 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.1"
+version = "0.47.2"
 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 26d9678659..eba1eac5c7 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.1"
+version = "0.47.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.1"
+version = "0.47.2"
 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 b0b907da41..955058bbe4 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.1"
+version = "0.47.2"
 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 a7f13613f0..38680ad536 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.1"
+version = "0.47.2"
 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 8d90109e08..b8cf1ce484 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.1"
+version = "0.47.2"
 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 e9592d82a9..e4a78866a8 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.1"
+version = "0.47.2"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/forwarder/Cargo.toml b/contracts/feature-tests/composability/forwarder/Cargo.toml
index eb886f44da..7375c9c8de 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.1"
+version = "0.47.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.1"
+version = "0.47.2"
 path = "../../../../framework/scenario"
 
diff --git a/contracts/feature-tests/composability/forwarder/meta/Cargo.toml b/contracts/feature-tests/composability/forwarder/meta/Cargo.toml
index dfa66eef23..ab98e1932c 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.1"
+version = "0.47.2"
 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 785bcf53e6..4a2cd6f91a 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.1"
+version = "0.47.2"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/interact/Cargo.toml b/contracts/feature-tests/composability/interact/Cargo.toml
index 649fa1a7b1..172fa89ec6 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.1"
+version = "0.47.2"
 path = "../../../../contracts/modules"
 
 [dependencies.multiversx-sc-snippets]
-version = "0.47.1"
+version = "0.47.2"
 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 0d9c2d7917..9501956727 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.1"
+version = "0.47.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.1"
+version = "0.47.2"
 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 0a41e43c31..68e423f91c 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.1"
+version = "0.47.2"
 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 478b0493b8..6695cf6487 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.1"
+version = "0.47.2"
 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 623e214e1d..9b2565cafc 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.1"
+version = "0.47.2"
 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 f26fc33605..3a40cb8d80 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.1"
+version = "0.47.2"
 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 69ae8675dd..78dd2025d6 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.1"
+version = "0.47.2"
 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 2dfcbb3224..6427124e1a 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.1"
+version = "0.47.2"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.1"
+version = "0.47.2"
 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 c868baef5b..6038a93374 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.1"
+version = "0.47.2"
 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 0611cf2acf..37c65391b8 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.1"
+version = "0.47.2"
 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 f8740e8aa2..3a91dd9747 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.1"
+version = "0.47.2"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.1"
+version = "0.47.2"
 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 89ca1b9c7f..1ad424a970 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.1"
+version = "0.47.2"
 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 98d327d1e3..233e6b5093 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.1"
+version = "0.47.2"
 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 b3c88f3b17..af326fe6b8 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.1"
+version = "0.47.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.1"
+version = "0.47.2"
 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 2995fc704e..a3be121851 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.1"
+version = "0.47.2"
 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 0d2bff26e5..4ff374c8aa 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.1"
+version = "0.47.2"
 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 e8908cf9db..ed4c388960 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.1"
+version = "0.47.2"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.47.1"
+version = "0.47.2"
 path = "../../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.1"
+version = "0.47.2"
 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 defa1e0461..be869432b5 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.1"
+version = "0.47.2"
 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 c283927675..5137f97465 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.1"
+version = "0.47.2"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/vault/Cargo.toml b/contracts/feature-tests/composability/vault/Cargo.toml
index f9a8eeb0bc..9298828f06 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.1"
+version = "0.47.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.1"
+version = "0.47.2"
 path = "../../../../framework/scenario"
diff --git a/contracts/feature-tests/composability/vault/meta/Cargo.toml b/contracts/feature-tests/composability/vault/meta/Cargo.toml
index 29198ee0e3..a5af858084 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.1"
+version = "0.47.2"
 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 8b860b4ed7..a063c162f1 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.1"
+version = "0.47.2"
 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 37e13b92e3..3541992a2c 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.1"
+version = "0.47.2"
 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 781829beaa..3e0e9d60b1 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.1"
+version = "0.47.2"
 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 86329a1554..bdc82a0466 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.1"
+version = "0.47.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.1"
+version = "0.47.2"
 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 befcc30fb5..5ba1aa6034 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.1"
+version = "0.47.2"
 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 07b13875a2..341ad900b0 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.1"
+version = "0.47.2"
 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 81dca0438e..4e30fdcbf7 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.1"
+version = "0.47.2"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.1"
+version = "0.47.2"
 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 1cdd916052..471632ecf4 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.1"
+version = "0.47.2"
 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 e17d1648eb..9d8ab647af 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.1"
+version = "0.47.2"
 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 ba70c6acae..cf70a46c2b 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.1"
+version = "0.47.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.1"
+version = "0.47.2"
 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 5c6b8d9d48..5999677fef 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.1"
+version = "0.47.2"
 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 0ed8cb2802..208d696b15 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.1"
+version = "0.47.2"
 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 61708001f7..e2152a3138 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.1"
+version = "0.47.2"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.1"
+version = "0.47.2"
 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 d8ed97e86c..0184649670 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.1"
+version = "0.47.2"
 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 b742ba9432..5d175af1b4 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.1"
+version = "0.47.2"
 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 4050fe2714..0e0ab79462 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.1"
+version = "0.47.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.1"
+version = "0.47.2"
 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 622f882afd..9f981e3334 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.1"
+version = "0.47.2"
 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 7f2c7fe992..0bd037179a 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.1"
+version = "0.47.2"
 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 18fee9e1fc..e2653b547a 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.1"
+version = "0.47.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.1"
+version = "0.47.2"
 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 106683f95c..dc7a215017 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.1"
+version = "0.47.2"
 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 0d0440343d..bdf6645315 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.1"
+version = "0.47.2"
 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 ef27c4759c..fcb0bbbf4c 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.1"
+version = "0.47.2"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.1"
+version = "0.47.2"
 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 8d24426dc5..361d26d8ac 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.1"
+version = "0.47.2"
 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 3b2c3c247f..c878a42e94 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.1"
+version = "0.47.2"
 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 8c6b82c751..a53ad0778e 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.1"
+version = "0.47.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.1"
+version = "0.47.2"
 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 e2e3d9cb63..fb6e72b524 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.1"
+version = "0.47.2"
 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 e8d4caae68..fff72fee8b 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.1"
+version = "0.47.2"
 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 f1ed4c9e6f..ef497095d6 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.1"
+version = "0.47.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.1"
+version = "0.47.2"
 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 d864e830e0..447b961217 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.1"
+version = "0.47.2"
 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 c1822c5857..8ab6f75df7 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.1"
+version = "0.47.2"
 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 9b626a3395..36b788e9cd 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.1"
+version = "0.47.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.1"
+version = "0.47.2"
 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 8bbd8e7c03..8115b51c98 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.1"
+version = "0.47.2"
 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 1080429913..7600c77903 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.1"
+version = "0.47.2"
 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 0b799047e7..4f1a4f4245 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.1"
+version = "0.47.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.1"
+version = "0.47.2"
 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 49fbb992cd..e1f3e58d62 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.1"
+version = "0.47.2"
 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 66a0d67b3c..e5653ccacb 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.1"
+version = "0.47.2"
 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 80a4f0bd1e..8824f0119c 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.1"
+version = "0.47.2"
 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 de98ea2f36..5582c7f4a8 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.1"
+version = "0.47.2"
 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 a8a301d155..91daf465e2 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.1"
+version = "0.47.2"
 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 710fcbd478..9e70ba9750 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.1"
+version = "0.47.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.1"
+version = "0.47.2"
 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 18f7d5ef79..d28f91c110 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.1"
+version = "0.47.2"
 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 e5bdbaf3ff..d913e97a43 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.1"
+version = "0.47.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/payable-features/Cargo.toml b/contracts/feature-tests/payable-features/Cargo.toml
index 2f83a8dd84..ce012e2df8 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.1"
+version = "0.47.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.1"
+version = "0.47.2"
 path = "../../../framework/scenario"
diff --git a/contracts/feature-tests/payable-features/meta/Cargo.toml b/contracts/feature-tests/payable-features/meta/Cargo.toml
index 2f08a04930..7bf4ed7807 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.1"
+version = "0.47.2"
 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 2a6fbe6674..db21aeef89 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.1"
+version = "0.47.2"
 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 22b1dece33..255f6b22cd 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.1"
+version = "0.47.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.1"
+version = "0.47.2"
 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 372254ba06..08b1ab89ba 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.1"
+version = "0.47.2"
 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 c27fcc1c43..f3023fe098 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.1"
+version = "0.47.2"
 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 320864a567..4d51dd0485 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.1"
+// version = "0.47.2"
 // 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 f82667bd4e..0af5bc88a1 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.1"
+version = "0.47.2"
 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 e5e7bee8bf..ac69dc8f67 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.1"
+version = "0.47.2"
 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.1"
+version = "0.47.2"
 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 8b1bc5d08c..cdd5cbf0d8 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.1"
+version = "0.47.2"
 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 270fad79b3..e4bb06e1d1 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.1"
+version = "0.47.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/use-module/Cargo.toml b/contracts/feature-tests/use-module/Cargo.toml
index fc781a8530..41d3418aa9 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.1"
+version = "0.47.2"
 path = "../../../contracts/modules"
 
 [dependencies.multiversx-sc]
-version = "0.47.1"
+version = "0.47.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.1"
+version = "0.47.2"
 path = "../../../framework/scenario"
 
 [dev-dependencies.multiversx-sc-meta]
-version = "0.47.1"
+version = "0.47.2"
 path = "../../../framework/meta"
diff --git a/contracts/feature-tests/use-module/meta/Cargo.toml b/contracts/feature-tests/use-module/meta/Cargo.toml
index 5126421875..13751ede31 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.1"
+version = "0.47.2"
 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 eaf0d5f5a9..7305a94f2d 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.1"
+version = "0.47.2"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.47.1"
+version = "0.47.2"
 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 ed1d7ecf3f..1001951c08 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.1"
+            "version": "0.47.2"
         }
     },
     "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 0e48138077..875d6d83ea 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.1"
+            "version": "0.47.2"
         }
     },
     "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 cb56270dcd..340045b8cb 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.1"
+version = "0.47.2"
 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 211d09316f..0819741645 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.1"
+version = "0.47.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/modules/Cargo.toml b/contracts/modules/Cargo.toml
index a9633722f7..40bc436291 100644
--- a/contracts/modules/Cargo.toml
+++ b/contracts/modules/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-modules"
-version = "0.47.1"
+version = "0.47.2"
 edition = "2021"
 
 authors = ["MultiversX <contact@multiversx.com>"]
@@ -17,5 +17,5 @@ categories = ["no-std", "wasm", "cryptography::cryptocurrencies"]
 alloc = ["multiversx-sc/alloc"]
 
 [dependencies.multiversx-sc]
-version = "0.47.1"
+version = "0.47.2"
 path = "../../framework/base"
diff --git a/data/codec-derive/Cargo.toml b/data/codec-derive/Cargo.toml
index a6fd9279a0..f0911eb9d6 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.5"
+version = "0.18.6"
 edition = "2021"
 
 authors = ["dorin.iancu <dorin.iancu@multiversx.com>", "Andrei Marinica <andrei.marinica@multiversx.com>", "MultiversX <contact@multiversx.com>"]
diff --git a/data/codec/Cargo.toml b/data/codec/Cargo.toml
index 74480be9c0..b42b2051b5 100644
--- a/data/codec/Cargo.toml
+++ b/data/codec/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-codec"
-version = "0.18.5"
+version = "0.18.6"
 edition = "2021"
 
 authors = ["Andrei Marinica <andrei.marinica@multiversx.com>", "MultiversX <contact@multiversx.com>"]
@@ -19,7 +19,7 @@ alloc = []
 
 [dependencies.multiversx-sc-codec-derive]
 path = "../codec-derive"
-version = "=0.18.5"
+version = "=0.18.6"
 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.5"
+version = "=0.18.6"
diff --git a/framework/base/Cargo.toml b/framework/base/Cargo.toml
index d5698c326d..527a6ba1ff 100644
--- a/framework/base/Cargo.toml
+++ b/framework/base/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc"
-version = "0.47.1"
+version = "0.47.2"
 edition = "2021"
 
 authors = ["Andrei Marinica <andrei.marinica@multiversx.com>", "MultiversX <contact@multiversx.com>"]
@@ -27,10 +27,10 @@ bitflags = "=2.4.2"
 num-traits = { version = "=0.2.17", default-features = false }
 
 [dependencies.multiversx-sc-derive]
-version = "=0.47.1"
+version = "=0.47.2"
 path = "../derive"
 
 [dependencies.multiversx-sc-codec]
-version = "=0.18.5"
+version = "=0.18.6"
 path = "../../data/codec"
 features = ["derive"]
diff --git a/framework/derive/Cargo.toml b/framework/derive/Cargo.toml
index 4c22676fc0..cdd6f10d5c 100644
--- a/framework/derive/Cargo.toml
+++ b/framework/derive/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-derive"
-version = "0.47.1"
+version = "0.47.2"
 edition = "2021"
 
 authors = ["Andrei Marinica <andrei.marinica@multiversx.com>", "MultiversX <contact@multiversx.com>"]
diff --git a/framework/meta/Cargo.toml b/framework/meta/Cargo.toml
index 4746c5e5a8..e2cd353cf3 100644
--- a/framework/meta/Cargo.toml
+++ b/framework/meta/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-meta"
-version = "0.47.1"
+version = "0.47.2"
 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.1"
+version = "=0.47.2"
 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 852072ab2b..2d67fe44c4 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.1"
+version = "0.47.2"
 
 # [workspace]
 
diff --git a/framework/meta/src/cmd/contract/meta_config.rs b/framework/meta/src/cmd/contract/meta_config.rs
index 07b7d3735b..14938b1989 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.1\"
+version = \"0.47.2\"
 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.1".to_string(),
+            framework_version: "0.47.2".to_string(),
             framework_path: Option::Some("../../../framework/base".to_string()),
             contract_features: Vec::<String>::new(),
         };
diff --git a/framework/meta/src/version_history.rs b/framework/meta/src/version_history.rs
index 30e72ec7da..fc82b2e482 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.1);
+pub const LAST_VERSION: FrameworkVersion = framework_version!(0.47.2);
 
 /// Indicates where to stop with the upgrades.
 pub const LAST_UPGRADE_VERSION: FrameworkVersion = LAST_VERSION;
@@ -59,6 +59,7 @@ pub const VERSIONS: &[FrameworkVersion] = framework_versions![
     0.46.1,
     0.47.0,
     0.47.1,
+    0.47.2,
 ];
 
 #[rustfmt::skip]
@@ -80,7 +81,7 @@ pub const CHECK_AFTER_UPGRADE_TO: &[FrameworkVersion] = framework_versions![
     0.44.0,
     0.45.2,
     0.46.0,
-    0.47.1,
+    0.47.2,
 ];
 
 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 a9fbeec30b..bf070ffa09 100644
--- a/framework/scenario/Cargo.toml
+++ b/framework/scenario/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-scenario"
-version = "0.47.1"
+version = "0.47.2"
 edition = "2021"
 
 authors = [
@@ -40,23 +40,23 @@ path = "src/main.rs"
 run-go-tests = []
 
 [dependencies.multiversx-sc]
-version = "=0.47.1"
+version = "=0.47.2"
 features = ["alloc", "num-bigint"]
 path = "../base"
 
 [dependencies.multiversx-sc-meta]
-version = "=0.47.1"
+version = "=0.47.2"
 path = "../meta"
 
 [dependencies.multiversx-chain-scenario-format]
-version = "0.22.1"
+version = "0.22.2"
 path = "../../sdk/scenario-format"
 
 [dependencies.multiversx-chain-vm-executor]
 version = "0.2.0"
 
 [dependencies.multiversx-chain-vm]
-version = "=0.8.1"
+version = "=0.8.2"
 path = "../../vm"
 
 [dependencies.multiversx-sdk]
diff --git a/framework/snippets/Cargo.toml b/framework/snippets/Cargo.toml
index b2863f67fb..8cb12f1a60 100644
--- a/framework/snippets/Cargo.toml
+++ b/framework/snippets/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-snippets"
-version = "0.47.1"
+version = "0.47.2"
 edition = "2021"
 
 authors = ["MultiversX <contact@multiversx.com>"]
@@ -22,7 +22,7 @@ env_logger = "0.11"
 futures = "0.3"
 
 [dependencies.multiversx-sc-scenario]
-version = "=0.47.1"
+version = "=0.47.2"
 path = "../scenario"
 
 [dependencies.multiversx-sdk]
diff --git a/framework/wasm-adapter/Cargo.toml b/framework/wasm-adapter/Cargo.toml
index d471cdd226..5072877adb 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.1"
+version = "0.47.2"
 edition = "2021"
 
 authors = [
@@ -22,5 +22,5 @@ categories = [
 ]
 
 [dependencies.multiversx-sc]
-version = "=0.47.1"
+version = "=0.47.2"
 path = "../base"
diff --git a/sdk/scenario-format/Cargo.toml b/sdk/scenario-format/Cargo.toml
index 8bfef0f49e..08c131e9a1 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.1"
+version = "0.22.2"
 edition = "2021"
 
 authors = ["Andrei Marinica <andrei.marinica@multiversx.com>", "MultiversX <contact@multiversx.com>"]
diff --git a/tools/mxpy-snippet-generator/Cargo.toml b/tools/mxpy-snippet-generator/Cargo.toml
index baf2719afe..278ec0c270 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.1"
+version = "0.47.2"
 path = "../../framework/base"
 
 [dependencies]
diff --git a/tools/rust-debugger/format-tests/Cargo.toml b/tools/rust-debugger/format-tests/Cargo.toml
index 20a0be3e12..6bcfb53f5c 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.1"
+version = "0.47.2"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-scenario]
-version = "0.47.1"
+version = "0.47.2"
 path = "../../../framework/scenario"
 
 [dependencies.multiversx-chain-vm]
-version = "0.8.1"
+version = "0.8.2"
 path = "../../../vm"
 
 [dev-dependencies]
diff --git a/vm/Cargo.toml b/vm/Cargo.toml
index ab2f2e5f21..7cda7fb483 100644
--- a/vm/Cargo.toml
+++ b/vm/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-chain-vm"
-version = "0.8.1"
+version = "0.8.2"
 edition = "2021"
 
 authors = [

From d8a7ec8a2416d3dc8e54e22ff6f6ecd5de522f06 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 2 Feb 2024 18:07:27 +0200
Subject: [PATCH 0316/1254] Cargo.lock update

---
 .../benchmarks/large-storage/wasm/Cargo.lock   | 10 +++++-----
 .../mappers/linked-list-repeat/wasm/Cargo.lock | 10 +++++-----
 .../mappers/map-repeat/wasm/Cargo.lock         | 10 +++++-----
 .../mappers/queue-repeat/wasm/Cargo.lock       | 10 +++++-----
 .../mappers/set-repeat/wasm/Cargo.lock         | 10 +++++-----
 .../single-value-repeat/wasm/Cargo.lock        | 10 +++++-----
 .../mappers/vec-repeat/wasm/Cargo.lock         | 10 +++++-----
 .../benchmarks/send-tx-repeat/wasm/Cargo.lock  | 10 +++++-----
 .../benchmarks/str-repeat/wasm/Cargo.lock      | 10 +++++-----
 .../core/price-aggregator/wasm/Cargo.lock      | 18 +++++++++---------
 contracts/examples/adder/wasm/Cargo.lock       | 10 +++++-----
 .../bonding-curve-contract/wasm/Cargo.lock     | 12 ++++++------
 contracts/examples/check-pause/wasm/Cargo.lock | 12 ++++++------
 .../examples/crowdfunding-esdt/wasm/Cargo.lock | 10 +++++-----
 .../examples/crypto-bubbles/wasm/Cargo.lock    | 10 +++++-----
 .../kitty-auction/wasm/Cargo.lock              | 10 +++++-----
 .../kitty-genetic-alg/wasm/Cargo.lock          | 10 +++++-----
 .../kitty-ownership/wasm/Cargo.lock            | 10 +++++-----
 .../examples/crypto-zombies/wasm/Cargo.lock    | 10 +++++-----
 .../examples/digital-cash/wasm/Cargo.lock      | 10 +++++-----
 contracts/examples/empty/wasm/Cargo.lock       | 10 +++++-----
 .../esdt-transfer-with-fee/wasm/Cargo.lock     | 10 +++++-----
 contracts/examples/factorial/wasm/Cargo.lock   | 10 +++++-----
 .../examples/fractional-nfts/wasm/Cargo.lock   | 12 ++++++------
 .../examples/lottery-esdt/wasm/Cargo.lock      | 10 +++++-----
 .../multisig/wasm-multisig-full/Cargo.lock     | 12 ++++++------
 .../multisig/wasm-multisig-view/Cargo.lock     | 12 ++++++------
 contracts/examples/multisig/wasm/Cargo.lock    | 12 ++++++------
 contracts/examples/nft-minter/wasm/Cargo.lock  | 10 +++++-----
 .../nft-storage-prepay/wasm/Cargo.lock         | 10 +++++-----
 .../examples/nft-subscription/wasm/Cargo.lock  | 12 ++++++------
 .../order-book/factory/wasm/Cargo.lock         | 10 +++++-----
 .../examples/order-book/pair/wasm/Cargo.lock   | 10 +++++-----
 .../examples/ping-pong-egld/wasm/Cargo.lock    | 10 +++++-----
 contracts/examples/proxy-pause/wasm/Cargo.lock | 10 +++++-----
 .../rewards-distribution/wasm/Cargo.lock       | 12 ++++++------
 .../examples/seed-nft-minter/wasm/Cargo.lock   | 12 ++++++------
 .../examples/token-release/wasm/Cargo.lock     | 10 +++++-----
 .../abi-tester/wasm-abi-tester-ev/Cargo.lock   | 10 +++++-----
 .../feature-tests/abi-tester/wasm/Cargo.lock   | 10 +++++-----
 .../alloc-features/wasm/Cargo.lock             | 10 +++++-----
 .../Cargo.lock                                 | 12 ++++++------
 .../basic-features/wasm/Cargo.lock             | 12 ++++++------
 .../big-float-features/wasm/Cargo.lock         | 10 +++++-----
 .../builtin-func-features/wasm/Cargo.lock      | 10 +++++-----
 .../first-contract/wasm/Cargo.lock             | 10 +++++-----
 .../second-contract/wasm/Cargo.lock            | 10 +++++-----
 .../child/wasm/Cargo.lock                      | 10 +++++-----
 .../parent/wasm/Cargo.lock                     | 10 +++++-----
 .../wasm-forwarder-queue-promises/Cargo.lock   | 10 +++++-----
 .../forwarder-queue/wasm/Cargo.lock            | 10 +++++-----
 .../Cargo.lock                                 | 10 +++++-----
 .../Cargo.lock                                 | 10 +++++-----
 .../forwarder-raw/wasm/Cargo.lock              | 10 +++++-----
 .../composability/forwarder/wasm/Cargo.lock    | 10 +++++-----
 .../local-esdt-and-nft/wasm/Cargo.lock         | 10 +++++-----
 .../promises-features/wasm/Cargo.lock          | 10 +++++-----
 .../proxy-test-first/wasm/Cargo.lock           | 10 +++++-----
 .../proxy-test-second/wasm/Cargo.lock          | 10 +++++-----
 .../recursive-caller/wasm/Cargo.lock           | 10 +++++-----
 .../transfer-role-features/wasm/Cargo.lock     | 12 ++++++------
 .../vault/wasm-vault-promises/Cargo.lock       | 10 +++++-----
 .../vault/wasm-vault-upgrade/Cargo.lock        | 10 +++++-----
 .../composability/vault/wasm/Cargo.lock        | 10 +++++-----
 .../crowdfunding-erc20/wasm/Cargo.lock         | 10 +++++-----
 .../erc1155-marketplace/wasm/Cargo.lock        | 10 +++++-----
 .../erc1155-user-mock/wasm/Cargo.lock          | 10 +++++-----
 .../erc1155/wasm/Cargo.lock                    | 10 +++++-----
 .../erc-style-contracts/erc20/wasm/Cargo.lock  | 10 +++++-----
 .../erc-style-contracts/erc721/wasm/Cargo.lock | 10 +++++-----
 .../lottery-erc20/wasm/Cargo.lock              | 10 +++++-----
 .../esdt-system-sc-mock/wasm/Cargo.lock        | 10 +++++-----
 .../formatted-message-features/wasm/Cargo.lock | 10 +++++-----
 .../managed-map-features/wasm/Cargo.lock       | 10 +++++-----
 .../wasm-multi-contract-alt-impl/Cargo.lock    | 10 +++++-----
 .../Cargo.lock                                 | 10 +++++-----
 .../Cargo.lock                                 | 10 +++++-----
 .../multi-contract-features/wasm/Cargo.lock    | 10 +++++-----
 .../panic-message-features/wasm/Cargo.lock     | 10 +++++-----
 .../payable-features/wasm/Cargo.lock           | 10 +++++-----
 .../wasm/Cargo.lock                            | 10 +++++-----
 .../wasm/Cargo.lock                            | 10 +++++-----
 .../use-module/wasm-use-module-view/Cargo.lock | 12 ++++++------
 .../feature-tests/use-module/wasm/Cargo.lock   | 12 ++++++------
 84 files changed, 438 insertions(+), 438 deletions(-)

diff --git a/contracts/benchmarks/large-storage/wasm/Cargo.lock b/contracts/benchmarks/large-storage/wasm/Cargo.lock
index e602c0bbba..b0d5dc98c4 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.47.1"
+version = "0.47.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.lock
index fac205b7f5..9b6ea53636 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.47.1"
+version = "0.47.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -92,7 +92,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -103,7 +103,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.lock
index 10a38dcf4b..f4f9af0e22 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.47.1"
+version = "0.47.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -92,7 +92,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -103,7 +103,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.lock
index 58f5e19dd2..4a6bf582ab 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.47.1"
+version = "0.47.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -58,7 +58,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.lock
index e11a8ccda8..6dae67e28b 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.47.1"
+version = "0.47.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -58,7 +58,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.lock
index b25811540f..3a644997a0 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.47.1"
+version = "0.47.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -58,7 +58,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.lock
index 0510eca71f..c74a8c9474 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.47.1"
+version = "0.47.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -58,7 +58,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/send-tx-repeat/wasm/Cargo.lock b/contracts/benchmarks/send-tx-repeat/wasm/Cargo.lock
index c0616fd1e5..4a9aada393 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.47.1"
+version = "0.47.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -51,7 +51,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -59,7 +59,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/str-repeat/wasm/Cargo.lock b/contracts/benchmarks/str-repeat/wasm/Cargo.lock
index e0db118b39..1e7a383860 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.47.1"
+version = "0.47.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -51,7 +51,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -59,7 +59,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/core/price-aggregator/wasm/Cargo.lock b/contracts/core/price-aggregator/wasm/Cargo.lock
index 3e683fa768..bed6e748ce 100644
--- a/contracts/core/price-aggregator/wasm/Cargo.lock
+++ b/contracts/core/price-aggregator/wasm/Cargo.lock
@@ -74,9 +74,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.152"
+version = "0.2.153"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7"
+checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
 
 [[package]]
 name = "log"
@@ -86,7 +86,7 @@ checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
 
 [[package]]
 name = "multiversx-price-aggregator-sc"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "arrayvec",
  "getrandom",
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -116,7 +116,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -124,7 +124,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -134,7 +134,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -145,14 +145,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/adder/wasm/Cargo.lock b/contracts/examples/adder/wasm/Cargo.lock
index 7676166ecf..87424c0f25 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.47.1"
+version = "0.47.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/bonding-curve-contract/wasm/Cargo.lock b/contracts/examples/bonding-curve-contract/wasm/Cargo.lock
index 3f2a2c82b8..838e83b2a4 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.47.1"
+version = "0.47.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -75,7 +75,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,14 +96,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/check-pause/wasm/Cargo.lock b/contracts/examples/check-pause/wasm/Cargo.lock
index 86f60e811b..c8dc112ab5 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.47.1"
+version = "0.47.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -75,7 +75,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,14 +96,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crowdfunding-esdt/wasm/Cargo.lock b/contracts/examples/crowdfunding-esdt/wasm/Cargo.lock
index 1fe6ea1692..2cab0566ac 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.47.1"
+version = "0.47.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crypto-bubbles/wasm/Cargo.lock b/contracts/examples/crypto-bubbles/wasm/Cargo.lock
index fd5f1dbb97..c0ac92098b 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.47.1"
+version = "0.47.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.lock b/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.lock
index cfcd3e21b7..e7c7e0d5df 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.47.1"
+version = "0.47.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -103,7 +103,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -113,7 +113,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -124,7 +124,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "multiversx-sc",
 ]
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 c9f90f6d4b..205601516f 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.47.1"
+version = "0.47.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.lock b/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.lock
index aa34daf004..0e1c938e5a 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.47.1"
+version = "0.47.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -104,7 +104,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -115,7 +115,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crypto-zombies/wasm/Cargo.lock b/contracts/examples/crypto-zombies/wasm/Cargo.lock
index 3e0ae1457b..426468847e 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.47.1"
+version = "0.47.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/digital-cash/wasm/Cargo.lock b/contracts/examples/digital-cash/wasm/Cargo.lock
index 165a6838af..38ba116686 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.47.1"
+version = "0.47.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/empty/wasm/Cargo.lock b/contracts/examples/empty/wasm/Cargo.lock
index 1e4e713ec1..02d683e8e1 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.47.1"
+version = "0.47.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.lock b/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.lock
index 892566c322..1fa90e2cdb 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.47.1"
+version = "0.47.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/factorial/wasm/Cargo.lock b/contracts/examples/factorial/wasm/Cargo.lock
index db7055dc6d..8ec0d73e06 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.47.1"
+version = "0.47.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/fractional-nfts/wasm/Cargo.lock b/contracts/examples/fractional-nfts/wasm/Cargo.lock
index 9c9ef6fa7a..26389281dd 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.47.1"
+version = "0.47.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -75,7 +75,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,14 +96,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/lottery-esdt/wasm/Cargo.lock b/contracts/examples/lottery-esdt/wasm/Cargo.lock
index 439ed4a52f..7d0b196ef5 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.47.1"
+version = "0.47.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/multisig/wasm-multisig-full/Cargo.lock b/contracts/examples/multisig/wasm-multisig-full/Cargo.lock
index 55847eee03..034effb093 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.47.1"
+version = "0.47.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -75,7 +75,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,14 +96,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/multisig/wasm-multisig-view/Cargo.lock b/contracts/examples/multisig/wasm-multisig-view/Cargo.lock
index c5f60fbd42..7de79104d4 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.47.1"
+version = "0.47.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -75,7 +75,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,14 +96,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/multisig/wasm/Cargo.lock b/contracts/examples/multisig/wasm/Cargo.lock
index f1ac79d9e3..adcd4070d5 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.47.1"
+version = "0.47.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -75,7 +75,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,14 +96,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/nft-minter/wasm/Cargo.lock b/contracts/examples/nft-minter/wasm/Cargo.lock
index 7bb1201618..cb13e69fc3 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.47.1"
+version = "0.47.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -51,7 +51,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -59,7 +59,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/nft-storage-prepay/wasm/Cargo.lock b/contracts/examples/nft-storage-prepay/wasm/Cargo.lock
index a50fed5343..09ebc8d20b 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.47.1"
+version = "0.47.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -51,7 +51,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -59,7 +59,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/nft-subscription/wasm/Cargo.lock b/contracts/examples/nft-subscription/wasm/Cargo.lock
index 3daf9d535d..5fd9cdcf01 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.47.1"
+version = "0.47.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -51,7 +51,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -59,7 +59,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,14 +80,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/order-book/factory/wasm/Cargo.lock b/contracts/examples/order-book/factory/wasm/Cargo.lock
index 1be32d48ba..05c81a6ae4 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.47.1"
+version = "0.47.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -51,7 +51,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -59,7 +59,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/order-book/pair/wasm/Cargo.lock b/contracts/examples/order-book/pair/wasm/Cargo.lock
index 45be0e29cc..1642e9662e 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.47.1"
+version = "0.47.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -51,7 +51,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -59,7 +59,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/ping-pong-egld/wasm/Cargo.lock b/contracts/examples/ping-pong-egld/wasm/Cargo.lock
index 94d8f84e33..c4323a01e1 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.47.1"
+version = "0.47.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -51,7 +51,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -59,7 +59,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/proxy-pause/wasm/Cargo.lock b/contracts/examples/proxy-pause/wasm/Cargo.lock
index 626b0cfa44..6ae5d8a527 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.47.1"
+version = "0.47.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -51,7 +51,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -59,7 +59,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/rewards-distribution/wasm/Cargo.lock b/contracts/examples/rewards-distribution/wasm/Cargo.lock
index 8266a18374..f922a0bf3c 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.47.1"
+version = "0.47.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -51,7 +51,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -59,7 +59,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,14 +80,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/seed-nft-minter/wasm/Cargo.lock b/contracts/examples/seed-nft-minter/wasm/Cargo.lock
index 6f42d76fae..f29f3fc3d3 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.47.1"
+version = "0.47.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -51,7 +51,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -59,7 +59,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,14 +80,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/token-release/wasm/Cargo.lock b/contracts/examples/token-release/wasm/Cargo.lock
index 12df3cc3cd..f179940ab2 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.47.1"
+version = "0.47.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -51,7 +51,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -59,7 +59,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "multiversx-sc",
 ]
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 d819003e67..a01d3eab5e 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.47.1"
+version = "0.47.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/abi-tester/wasm/Cargo.lock b/contracts/feature-tests/abi-tester/wasm/Cargo.lock
index 0dc322e54e..852b8903f2 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.47.1"
+version = "0.47.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/alloc-features/wasm/Cargo.lock b/contracts/feature-tests/alloc-features/wasm/Cargo.lock
index d6a29f27e2..3f18f2ff37 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.47.1"
+version = "0.47.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "multiversx-sc",
 ]
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 8630b3620a..fa0c705fb0 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.47.1"
+version = "0.47.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -75,7 +75,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,14 +96,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/basic-features/wasm/Cargo.lock b/contracts/feature-tests/basic-features/wasm/Cargo.lock
index e5f39c5dd5..8072ac0272 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.47.1"
+version = "0.47.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -75,7 +75,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,14 +96,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/big-float-features/wasm/Cargo.lock b/contracts/feature-tests/big-float-features/wasm/Cargo.lock
index 74fe4ed6af..9371e6c673 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.47.1"
+version = "0.47.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "multiversx-sc",
 ]
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 09417708f1..03c114fb07 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.47.1"
+version = "0.47.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "multiversx-sc",
 ]
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 2206451e39..e4531fe8fc 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.47.1"
+version = "0.47.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "multiversx-sc",
 ]
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 5ef0439068..d7ef86e524 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.47.1"
+version = "0.47.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -51,7 +51,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -59,7 +59,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "multiversx-sc",
 ]
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 583778886d..b99b1d23a4 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.47.1"
+version = "0.47.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "multiversx-sc",
 ]
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 8bc9376dda..bff8dc0ae4 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.47.1"
+version = "0.47.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -58,7 +58,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "multiversx-sc",
 ]
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 8b7f676d60..acf0176f05 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.47.1"
+version = "0.47.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -75,7 +75,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,7 +96,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock
index 33754112ee..a8a4009fc5 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.47.1"
+version = "0.47.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -75,7 +75,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,7 +96,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "multiversx-sc",
 ]
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 4317077a2a..33f7ed43de 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.47.1"
+version = "0.47.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "multiversx-sc",
 ]
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 551409f823..44a0fabbd6 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.47.1"
+version = "0.47.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.lock
index 1c07e82cb7..653cef8d89 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.47.1"
+version = "0.47.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock
index 36bf150762..5d415ecb4f 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.47.1"
+version = "0.47.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -75,7 +75,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,7 +96,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "multiversx-sc",
 ]
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 9c4b61ac4c..ecbdecfeff 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.47.1"
+version = "0.47.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/promises-features/wasm/Cargo.lock b/contracts/feature-tests/composability/promises-features/wasm/Cargo.lock
index 7ca754c57a..bb0124a03d 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.47.1"
+version = "0.47.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -51,7 +51,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -59,7 +59,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "multiversx-sc",
 ]
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 8f8ea2eab0..a58e520ded 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.47.1"
+version = "0.47.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -51,7 +51,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -59,7 +59,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "multiversx-sc",
 ]
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 8cd5a962ce..adae09cc71 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.47.1"
+version = "0.47.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -51,7 +51,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -59,7 +59,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.lock b/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.lock
index 851a166443..f777cafcd6 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.47.1"
+version = "0.47.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -51,7 +51,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -59,7 +59,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "multiversx-sc",
 ]
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 386e7b1a7d..287030bd35 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.47.1"
+version = "0.47.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -51,7 +51,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -59,7 +59,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,14 +80,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "multiversx-sc",
 ]
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 6a116eb039..f1af95e185 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.47.1"
+version = "0.47.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -51,7 +51,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -59,7 +59,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "multiversx-sc",
 ]
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 386aecb456..8f8415824f 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.47.1"
+version = "0.47.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -51,7 +51,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -59,7 +59,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/vault/wasm/Cargo.lock b/contracts/feature-tests/composability/vault/wasm/Cargo.lock
index c9cf8e35a8..f9b1a9908a 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.47.1"
+version = "0.47.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -51,7 +51,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -59,7 +59,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "multiversx-sc",
 ]
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 5f4e5c6a13..23a61410c0 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.47.1"
+version = "0.47.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -92,7 +92,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -103,7 +103,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "multiversx-sc",
 ]
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 ae4c7c7721..3574277328 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.47.1"
+version = "0.47.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -92,7 +92,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -103,7 +103,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "multiversx-sc",
 ]
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 2423e95623..044758e9a0 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.47.1"
+version = "0.47.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "multiversx-sc",
 ]
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 d820b817a2..1d22e4d8ac 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.47.1"
+version = "0.47.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "multiversx-sc",
 ]
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 9439d10b90..9b6aba8a51 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.47.1"
+version = "0.47.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "multiversx-sc",
 ]
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 f00729126f..aef8b209f1 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.47.1"
+version = "0.47.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "multiversx-sc",
 ]
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 2828c2d4ad..a9c11a015f 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.47.1"
+version = "0.47.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -92,7 +92,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -103,7 +103,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "multiversx-sc",
 ]
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 dce1f23a00..7716b96ff3 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.47.1"
+version = "0.47.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/formatted-message-features/wasm/Cargo.lock b/contracts/feature-tests/formatted-message-features/wasm/Cargo.lock
index 261249a735..60b58bf37b 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.47.1"
+version = "0.47.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/managed-map-features/wasm/Cargo.lock b/contracts/feature-tests/managed-map-features/wasm/Cargo.lock
index c9c8b04f01..ea67433217 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.47.1"
+version = "0.47.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "multiversx-sc",
 ]
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 aaa30e9c0b..3ebb8ea84a 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.47.1"
+version = "0.47.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "multiversx-sc",
 ]
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 474e3abf41..96763ef26d 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.47.1"
+version = "0.47.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "multiversx-sc",
 ]
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 3869ff2385..a0dd0093e6 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.47.1"
+version = "0.47.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/multi-contract-features/wasm/Cargo.lock b/contracts/feature-tests/multi-contract-features/wasm/Cargo.lock
index 255bf06db1..5f9d536467 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.47.1"
+version = "0.47.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/panic-message-features/wasm/Cargo.lock b/contracts/feature-tests/panic-message-features/wasm/Cargo.lock
index ff0a4b03fb..c893bab211 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.47.1"
+version = "0.47.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -51,7 +51,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -59,7 +59,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/payable-features/wasm/Cargo.lock b/contracts/feature-tests/payable-features/wasm/Cargo.lock
index 34d89e5270..7bb49ddb7b 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.47.1"
+version = "0.47.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -51,7 +51,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -59,7 +59,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "multiversx-sc",
 ]
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 0202737332..d988e88d93 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.47.1"
+version = "0.47.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -51,7 +51,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -59,7 +59,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "multiversx-sc",
 ]
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 e12d1ac376..d04e6f35bd 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.47.1"
+version = "0.47.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -51,7 +51,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -59,7 +59,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "multiversx-sc",
 ]
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 6268078b64..386412b436 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.47.1"
+version = "0.47.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -51,7 +51,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -59,7 +59,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,14 +80,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/use-module/wasm/Cargo.lock b/contracts/feature-tests/use-module/wasm/Cargo.lock
index 0399a6fe2c..430481c2ef 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.47.1"
+version = "0.47.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -51,7 +51,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -59,7 +59,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,14 +80,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.1"
+version = "0.47.2"
 dependencies = [
  "multiversx-sc",
 ]

From ad699e1717f16e5e8a07333816f03651f5dd5fbb Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Sat, 3 Feb 2024 14:22:13 +0200
Subject: [PATCH 0317/1254] cleanup

---
 .../types/interaction/tx_rh_list/tx_rh_list_cons.rs   | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/framework/base/src/types/interaction/tx_rh_list/tx_rh_list_cons.rs b/framework/base/src/types/interaction/tx_rh_list/tx_rh_list_cons.rs
index f4d4133b19..86a24e8a19 100644
--- a/framework/base/src/types/interaction/tx_rh_list/tx_rh_list_cons.rs
+++ b/framework/base/src/types/interaction/tx_rh_list/tx_rh_list_cons.rs
@@ -135,12 +135,6 @@ where
     Tail: RHList<Env>,
 {
     type ListReturns = (Head::Returns, Tail::ListReturns);
-
-    // fn list_return(&self) -> Self::ListReturn {
-    //     let head_ret = self.head.single_return();
-    //     let tail_ret = self.tail.list_return();
-    //     (head_ret, tail_ret)
-    // }
 }
 
 impl<Env, Head, Tail, T> RHListAppendRet<Env, T> for ConsRet<Env, Head, Tail>
@@ -214,11 +208,6 @@ where
     Tail: RHList<Env>,
 {
     type ListReturns = Tail::ListReturns;
-
-    // fn list_return(&self) -> Self::ListReturn {
-    //     self.head.single_return();
-    //     self.tail.list_return()
-    // }
 }
 
 impl<Env, Head, Tail, T> RHListAppendRet<Env, T> for ConsNoRet<Env, Head, Tail>

From 4c76db138d32ca2a02dfc01cde9751b37c5c9db6 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Mon, 5 Feb 2024 10:32:14 +0200
Subject: [PATCH 0318/1254] rename contracts

---
 .../alloc-features/sc-config.toml             | 12 +--
 ...ory.scen.json => alloc_mem_fail.scen.json} |  8 +-
 ....scen.json => alloc_mem_leaking.scen.json} |  6 +-
 .../alloc-features/src/memory_types.rs        |  4 +-
 .../tests/alloc_features_scenario_go_test.rs  |  4 +-
 .../tests/alloc_features_scenario_rs_test.rs  | 32 ++++---
 .../Cargo.lock                                | 16 ++--
 .../Cargo.toml                                |  2 +-
 .../Cargo.lock                                | 16 ++--
 .../Cargo.toml                                |  2 +-
 .../wasm-fail-memory/src/lib.rs               | 93 -------------------
 .../wasm-leaking-memory/src/lib.rs            | 93 -------------------
 12 files changed, 52 insertions(+), 236 deletions(-)
 rename contracts/feature-tests/alloc-features/scenarios/{fail-memory.scen.json => alloc_mem_fail.scen.json} (86%)
 rename contracts/feature-tests/alloc-features/scenarios/{leaking-memory.scen.json => alloc_mem_leaking.scen.json} (85%)
 rename contracts/feature-tests/alloc-features/{wasm-leaking-memory => wasm-alloc-mem-fail}/Cargo.lock (99%)
 rename contracts/feature-tests/alloc-features/{wasm-leaking-memory => wasm-alloc-mem-fail}/Cargo.toml (95%)
 rename contracts/feature-tests/alloc-features/{wasm-fail-memory => wasm-alloc-mem-leaking}/Cargo.lock (99%)
 rename contracts/feature-tests/alloc-features/{wasm-fail-memory => wasm-alloc-mem-leaking}/Cargo.toml (94%)
 delete mode 100644 contracts/feature-tests/alloc-features/wasm-fail-memory/src/lib.rs
 delete mode 100644 contracts/feature-tests/alloc-features/wasm-leaking-memory/src/lib.rs

diff --git a/contracts/feature-tests/alloc-features/sc-config.toml b/contracts/feature-tests/alloc-features/sc-config.toml
index dd27adc5df..afa78b123b 100644
--- a/contracts/feature-tests/alloc-features/sc-config.toml
+++ b/contracts/feature-tests/alloc-features/sc-config.toml
@@ -7,12 +7,12 @@ add-unlabelled = true
 allocator = "static64k"
 stack-size = "32k"
 
-[contracts.alloc-features-fail-memory]
-name = "fail-memory"
+[contracts.alloc-mem-fail]
+name = "alloc-mem-fail"
 allocator = "fail"
-add-labels = ["fail-memory"]
+add-labels = ["alloc-mem-fail"]
 
-[contracts.alloc-features-leaking-memory]
-name = "leaking-memory"
+[contracts.alloc-mem-leaking]
+name = "alloc-mem-leaking"
 allocator = "leaking"
-add-labels = ["leaking-memory"]
+add-labels = ["alloc-mem-leaking"]
diff --git a/contracts/feature-tests/alloc-features/scenarios/fail-memory.scen.json b/contracts/feature-tests/alloc-features/scenarios/alloc_mem_fail.scen.json
similarity index 86%
rename from contracts/feature-tests/alloc-features/scenarios/fail-memory.scen.json
rename to contracts/feature-tests/alloc-features/scenarios/alloc_mem_fail.scen.json
index bbd9cb55b2..0925fbf76f 100644
--- a/contracts/feature-tests/alloc-features/scenarios/fail-memory.scen.json
+++ b/contracts/feature-tests/alloc-features/scenarios/alloc_mem_fail.scen.json
@@ -4,10 +4,10 @@
         {
             "step": "setState",
             "accounts": {
-                "sc:fail_memory": {
+                "sc:alloc-mem-fail": {
                     "nonce": "0",
                     "balance": "0",
-                    "code": "file:../output/fail-memory.wasm"
+                    "code": "file:../output/alloc-mem-fail.wasm"
                 },
                 "address:an_account": {
                     "nonce": "0",
@@ -20,7 +20,7 @@
             "id": "1",
             "tx": {
                 "from": "address:an_account",
-                "to": "sc:fail_memory",
+                "to": "sc:alloc-mem-fail",
                 "function": "alloc_with_fail_memory",
                 "arguments": [],
                 "gasLimit": "50,000,000",
@@ -36,4 +36,4 @@
             }
         }
     ]
-}
+}
\ No newline at end of file
diff --git a/contracts/feature-tests/alloc-features/scenarios/leaking-memory.scen.json b/contracts/feature-tests/alloc-features/scenarios/alloc_mem_leaking.scen.json
similarity index 85%
rename from contracts/feature-tests/alloc-features/scenarios/leaking-memory.scen.json
rename to contracts/feature-tests/alloc-features/scenarios/alloc_mem_leaking.scen.json
index 6d98fa3c76..d45bf922ac 100644
--- a/contracts/feature-tests/alloc-features/scenarios/leaking-memory.scen.json
+++ b/contracts/feature-tests/alloc-features/scenarios/alloc_mem_leaking.scen.json
@@ -4,10 +4,10 @@
         {
             "step": "setState",
             "accounts": {
-                "sc:leaking_memory": {
+                "sc:alloc-mem-leaking": {
                     "nonce": "0",
                     "balance": "0",
-                    "code": "file:../output/leaking-memory.wasm"
+                    "code": "file:../output/alloc-mem-leaking.wasm"
                 },
                 "address:an_account": {
                     "nonce": "0",
@@ -20,7 +20,7 @@
             "id": "1",
             "tx": {
                 "from": "address:an_account",
-                "to": "sc:leaking_memory",
+                "to": "sc:alloc-mem-leaking",
                 "function": "alloc_with_leaking_memory",
                 "arguments": [],
                 "gasLimit": "50,000,000",
diff --git a/contracts/feature-tests/alloc-features/src/memory_types.rs b/contracts/feature-tests/alloc-features/src/memory_types.rs
index 76ecbc606c..50ee7ed4bb 100644
--- a/contracts/feature-tests/alloc-features/src/memory_types.rs
+++ b/contracts/feature-tests/alloc-features/src/memory_types.rs
@@ -4,14 +4,14 @@ multiversx_sc::imports!();
 #[multiversx_sc::module]
 pub trait MemoryTypes {
     #[endpoint]
-    #[label("fail-memory")]
+    #[label("alloc-mem-fail")]
     fn alloc_with_fail_memory(&self) -> i32 {
         let _x = String::from("H");
         1
     }
 
     #[endpoint]
-    #[label("leaking-memory")]
+    #[label("alloc-mem-leaking")]
     fn alloc_with_leaking_memory(&self) -> i32 {
         let _ = Box::new(42);
         1
diff --git a/contracts/feature-tests/alloc-features/tests/alloc_features_scenario_go_test.rs b/contracts/feature-tests/alloc-features/tests/alloc_features_scenario_go_test.rs
index 170a6eb9ea..b7c52c6c04 100644
--- a/contracts/feature-tests/alloc-features/tests/alloc_features_scenario_go_test.rs
+++ b/contracts/feature-tests/alloc-features/tests/alloc_features_scenario_go_test.rs
@@ -66,12 +66,12 @@ fn echo_vec_u_8_go() {
 
 #[test]
 fn fail_memory_go() {
-    world().run("scenarios/fail-memory.scen.json");
+    world().run("scenarios/alloc_mem_fail.scen.json");
 }
 
 #[test]
 fn leaking_memory_go() {
-    world().run("scenarios/leaking-memory.scen.json");
+    world().run("scenarios/alloc_mem_leaking.scen.json");
 }
 
 #[test]
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 e20d4f7145..1d1cee1936 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
@@ -7,19 +7,19 @@ fn world() -> ScenarioWorld {
     blockchain.register_partial_contract::<alloc_features::AbiProvider, _>(
         "mxsc:output/alloc-features.mxsc.json",
         alloc_features::ContractBuilder,
-        "alloc-features"
+        "alloc-features",
     );
 
     blockchain.register_partial_contract::<alloc_features::AbiProvider, _>(
-        "mxsc:output/fail-memory.mxsc.json",
+        "mxsc:output/alloc-mem-fail.mxsc.json",
         alloc_features::ContractBuilder,
-        "fail-memory",
-    );    
-    
+        "alloc-mem-fail",
+    );
+
     blockchain.register_partial_contract::<alloc_features::AbiProvider, _>(
-        "mxsc:output/leaking-memory.mxsc.json",
+        "mxsc:output/alloc-mem-leaking.mxsc.json",
         alloc_features::ContractBuilder,
-        "leaking-memory",
+        "alloc-mem-leaking",
     );
 
     blockchain
@@ -85,15 +85,17 @@ fn echo_vec_u_8_rs() {
     world().run("scenarios/echo_vec_u8.scen.json");
 }
 
-// #[test]
-// fn fail_memory_rs() {
-//     world().run("scenarios/fail-memory.scen.json");
-// }
+#[test]
+#[ignore]
+fn fail_memory_rs() {
+    world().run("scenarios/alloc_mem_fail.scen.json");
+}
 
-// #[test]
-// fn leaking_memory_rs() {
-//     world().run("scenarios/leaking-memory.scen.json");
-// }
+#[test]
+#[ignore]
+fn leaking_memory_rs() {
+    world().run("scenarios/alloc_mem_leaking.scen.json");
+}
 
 #[test]
 fn managed_buffer_concat_2_rs() {
diff --git a/contracts/feature-tests/alloc-features/wasm-leaking-memory/Cargo.lock b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock
similarity index 99%
rename from contracts/feature-tests/alloc-features/wasm-leaking-memory/Cargo.lock
rename to contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock
index 89b4d1f83e..0d04c6f00f 100644
--- a/contracts/feature-tests/alloc-features/wasm-leaking-memory/Cargo.lock
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock
@@ -9,6 +9,14 @@ dependencies = [
  "multiversx-sc",
 ]
 
+[[package]]
+name = "alloc-mem-fail-wasm"
+version = "0.0.0"
+dependencies = [
+ "alloc-features",
+ "multiversx-sc-wasm-adapter",
+]
+
 [[package]]
 name = "arrayvec"
 version = "0.7.4"
@@ -45,14 +53,6 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
-[[package]]
-name = "leaking-memory-wasm"
-version = "0.0.0"
-dependencies = [
- "alloc-features",
- "multiversx-sc-wasm-adapter",
-]
-
 [[package]]
 name = "multiversx-sc"
 version = "0.47.1"
diff --git a/contracts/feature-tests/alloc-features/wasm-leaking-memory/Cargo.toml b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml
similarity index 95%
rename from contracts/feature-tests/alloc-features/wasm-leaking-memory/Cargo.toml
rename to contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml
index eb5797ef47..9799d2a803 100644
--- a/contracts/feature-tests/alloc-features/wasm-leaking-memory/Cargo.toml
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml
@@ -5,7 +5,7 @@
 # ##########################################
 
 [package]
-name = "leaking-memory-wasm"
+name = "alloc-mem-fail-wasm"
 version = "0.0.0"
 edition = "2021"
 publish = false
diff --git a/contracts/feature-tests/alloc-features/wasm-fail-memory/Cargo.lock b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.lock
similarity index 99%
rename from contracts/feature-tests/alloc-features/wasm-fail-memory/Cargo.lock
rename to contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.lock
index fb66e31973..5a9846cf0e 100644
--- a/contracts/feature-tests/alloc-features/wasm-fail-memory/Cargo.lock
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.lock
@@ -9,6 +9,14 @@ dependencies = [
  "multiversx-sc",
 ]
 
+[[package]]
+name = "alloc-mem-leaking-wasm"
+version = "0.0.0"
+dependencies = [
+ "alloc-features",
+ "multiversx-sc-wasm-adapter",
+]
+
 [[package]]
 name = "arrayvec"
 version = "0.7.4"
@@ -33,14 +41,6 @@ version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
-[[package]]
-name = "fail-memory-wasm"
-version = "0.0.0"
-dependencies = [
- "alloc-features",
- "multiversx-sc-wasm-adapter",
-]
-
 [[package]]
 name = "hex"
 version = "0.4.3"
diff --git a/contracts/feature-tests/alloc-features/wasm-fail-memory/Cargo.toml b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml
similarity index 94%
rename from contracts/feature-tests/alloc-features/wasm-fail-memory/Cargo.toml
rename to contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml
index c6a7393892..8d4db63187 100644
--- a/contracts/feature-tests/alloc-features/wasm-fail-memory/Cargo.toml
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml
@@ -5,7 +5,7 @@
 # ##########################################
 
 [package]
-name = "fail-memory-wasm"
+name = "alloc-mem-leaking-wasm"
 version = "0.0.0"
 edition = "2021"
 publish = false
diff --git a/contracts/feature-tests/alloc-features/wasm-fail-memory/src/lib.rs b/contracts/feature-tests/alloc-features/wasm-fail-memory/src/lib.rs
deleted file mode 100644
index 2e095ac2e9..0000000000
--- a/contracts/feature-tests/alloc-features/wasm-fail-memory/src/lib.rs
+++ /dev/null
@@ -1,93 +0,0 @@
-// Code generated by the multiversx-sc build system. DO NOT EDIT.
-
-////////////////////////////////////////////////////
-////////////////// AUTO-GENERATED //////////////////
-////////////////////////////////////////////////////
-
-// Init:                                 1
-// Endpoints:                           65
-// Async Callback (empty):               1
-// Total number of exported functions:  67
-
-#![no_std]
-
-// Configuration that works with rustc < 1.73.0.
-// TODO: Recommended rustc version: 1.73.0 or newer.
-#![feature(lang_items)]
-
-multiversx_sc_wasm_adapter::allocator!();
-multiversx_sc_wasm_adapter::panic_handler!();
-
-multiversx_sc_wasm_adapter::endpoints! {
-    alloc_features
-    (
-        init => init
-        echo_h256 => echo_h256
-        echo_boxed_array_u8 => echo_boxed_array_u8
-        echo_boxed_bytes => echo_boxed_bytes
-        echo_slice_u8 => echo_slice_u8
-        echo_vec_u8 => echo_vec_u8
-        echo_string => echo_string
-        echo_str => echo_str
-        echo_str_box => echo_str_box
-        echo_async_result_empty => echo_async_result_empty
-        echo_large_boxed_byte_array => echo_large_boxed_byte_array
-        echo_boxed_ser_example_1 => echo_boxed_ser_example_1
-        echo_multi_value_tuples => echo_multi_value_tuples
-        echo_ser_example_1 => echo_ser_example_1
-        echo_vec_of_managed_buffer => echo_vec_of_managed_buffer
-        echo_big_int_vec => echo_big_int_vec
-        echo_varags_u32 => echo_varags_u32
-        echo_varags_big_uint => echo_varags_big_uint
-        compute_get_values => compute_get_values
-        compute_create_ec => compute_create_ec
-        compute_get_ec_length => compute_get_ec_length
-        compute_get_priv_key_byte_length => compute_get_priv_key_byte_length
-        compute_ec_add => compute_ec_add
-        compute_ec_double => compute_ec_double
-        compute_is_on_curve_ec => compute_is_on_curve_ec
-        compute_scalar_mult => compute_scalar_mult
-        compute_scalar_base_mult => compute_scalar_base_mult
-        compute_marshal_ec => compute_marshal_ec
-        compute_marshal_compressed_ec => compute_marshal_compressed_ec
-        compute_unmarshal_ec => compute_unmarshal_ec
-        compute_unmarshal_compressed_ec => compute_unmarshal_compressed_ec
-        compute_generate_key_ec => compute_generate_key_ec
-        only_owner_legacy => only_owner_legacy
-        return_sc_error => return_sc_error
-        result_ok => result_ok
-        result_err_from_bytes_1 => result_err_from_bytes_1
-        result_err_from_bytes_2 => result_err_from_bytes_2
-        result_err_from_bytes_3 => result_err_from_bytes_3
-        result_err_from_string => result_err_from_string
-        result_err_from_str => result_err_from_str
-        result_echo => result_echo
-        result_echo_2 => result_echo_2
-        result_echo_3 => result_echo_3
-        mbuffer_from_slice => mbuffer_from_slice
-        mbuffer_from_boxed_bytes => mbuffer_from_boxed_bytes
-        mbuffer_overwrite => mbuffer_overwrite
-        mbuffer_append_bytes => mbuffer_append_bytes
-        mbuffer_load_slice => mbuffer_load_slice
-        mbuffer_set_slice => mbuffer_set_slice
-        managed_address_from => managed_address_from
-        load_vec_u8 => load_vec_u8
-        load_addr => load_addr
-        load_opt_addr => load_opt_addr
-        is_empty_opt_addr => is_empty_opt_addr
-        load_ser_1 => load_ser_1
-        store_vec_u8 => store_vec_u8
-        store_addr => store_addr
-        store_opt_addr => store_opt_addr
-        store_ser_1 => store_ser_1
-        compare_h256 => compare_h256
-        h256_is_zero => h256_is_zero
-        boxed_bytes_zeros => boxed_bytes_zeros
-        boxed_bytes_concat_2 => boxed_bytes_concat_2
-        boxed_bytes_split => boxed_bytes_split
-        vec_concat_const => vec_concat_const
-        alloc_with_fail_memory => alloc_with_fail_memory
-    )
-}
-
-multiversx_sc_wasm_adapter::async_callback_empty! {}
diff --git a/contracts/feature-tests/alloc-features/wasm-leaking-memory/src/lib.rs b/contracts/feature-tests/alloc-features/wasm-leaking-memory/src/lib.rs
deleted file mode 100644
index 073c8d90a5..0000000000
--- a/contracts/feature-tests/alloc-features/wasm-leaking-memory/src/lib.rs
+++ /dev/null
@@ -1,93 +0,0 @@
-// Code generated by the multiversx-sc build system. DO NOT EDIT.
-
-////////////////////////////////////////////////////
-////////////////// AUTO-GENERATED //////////////////
-////////////////////////////////////////////////////
-
-// Init:                                 1
-// Endpoints:                           65
-// Async Callback (empty):               1
-// Total number of exported functions:  67
-
-#![no_std]
-
-// Configuration that works with rustc < 1.73.0.
-// TODO: Recommended rustc version: 1.73.0 or newer.
-#![feature(lang_items)]
-
-multiversx_sc_wasm_adapter::allocator!(leaking);
-multiversx_sc_wasm_adapter::panic_handler!();
-
-multiversx_sc_wasm_adapter::endpoints! {
-    alloc_features
-    (
-        init => init
-        echo_h256 => echo_h256
-        echo_boxed_array_u8 => echo_boxed_array_u8
-        echo_boxed_bytes => echo_boxed_bytes
-        echo_slice_u8 => echo_slice_u8
-        echo_vec_u8 => echo_vec_u8
-        echo_string => echo_string
-        echo_str => echo_str
-        echo_str_box => echo_str_box
-        echo_async_result_empty => echo_async_result_empty
-        echo_large_boxed_byte_array => echo_large_boxed_byte_array
-        echo_boxed_ser_example_1 => echo_boxed_ser_example_1
-        echo_multi_value_tuples => echo_multi_value_tuples
-        echo_ser_example_1 => echo_ser_example_1
-        echo_vec_of_managed_buffer => echo_vec_of_managed_buffer
-        echo_big_int_vec => echo_big_int_vec
-        echo_varags_u32 => echo_varags_u32
-        echo_varags_big_uint => echo_varags_big_uint
-        compute_get_values => compute_get_values
-        compute_create_ec => compute_create_ec
-        compute_get_ec_length => compute_get_ec_length
-        compute_get_priv_key_byte_length => compute_get_priv_key_byte_length
-        compute_ec_add => compute_ec_add
-        compute_ec_double => compute_ec_double
-        compute_is_on_curve_ec => compute_is_on_curve_ec
-        compute_scalar_mult => compute_scalar_mult
-        compute_scalar_base_mult => compute_scalar_base_mult
-        compute_marshal_ec => compute_marshal_ec
-        compute_marshal_compressed_ec => compute_marshal_compressed_ec
-        compute_unmarshal_ec => compute_unmarshal_ec
-        compute_unmarshal_compressed_ec => compute_unmarshal_compressed_ec
-        compute_generate_key_ec => compute_generate_key_ec
-        only_owner_legacy => only_owner_legacy
-        return_sc_error => return_sc_error
-        result_ok => result_ok
-        result_err_from_bytes_1 => result_err_from_bytes_1
-        result_err_from_bytes_2 => result_err_from_bytes_2
-        result_err_from_bytes_3 => result_err_from_bytes_3
-        result_err_from_string => result_err_from_string
-        result_err_from_str => result_err_from_str
-        result_echo => result_echo
-        result_echo_2 => result_echo_2
-        result_echo_3 => result_echo_3
-        mbuffer_from_slice => mbuffer_from_slice
-        mbuffer_from_boxed_bytes => mbuffer_from_boxed_bytes
-        mbuffer_overwrite => mbuffer_overwrite
-        mbuffer_append_bytes => mbuffer_append_bytes
-        mbuffer_load_slice => mbuffer_load_slice
-        mbuffer_set_slice => mbuffer_set_slice
-        managed_address_from => managed_address_from
-        load_vec_u8 => load_vec_u8
-        load_addr => load_addr
-        load_opt_addr => load_opt_addr
-        is_empty_opt_addr => is_empty_opt_addr
-        load_ser_1 => load_ser_1
-        store_vec_u8 => store_vec_u8
-        store_addr => store_addr
-        store_opt_addr => store_opt_addr
-        store_ser_1 => store_ser_1
-        compare_h256 => compare_h256
-        h256_is_zero => h256_is_zero
-        boxed_bytes_zeros => boxed_bytes_zeros
-        boxed_bytes_concat_2 => boxed_bytes_concat_2
-        boxed_bytes_split => boxed_bytes_split
-        vec_concat_const => vec_concat_const
-        alloc_with_leaking_memory => alloc_with_leaking_memory
-    )
-}
-
-multiversx_sc_wasm_adapter::async_callback_empty! {}

From 812388767f2de50d57f91448f9eed3425b6f9178 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Mon, 5 Feb 2024 11:29:02 +0200
Subject: [PATCH 0319/1254] async call fix

---
 framework/base/src/api/composite_api.rs                     | 2 +-
 framework/base/src/types/interaction/contract_call_exec.rs  | 4 ++--
 framework/base/src/types/interaction/contract_call_trait.rs | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/framework/base/src/api/composite_api.rs b/framework/base/src/api/composite_api.rs
index bf197ade59..d1ca8413d8 100644
--- a/framework/base/src/api/composite_api.rs
+++ b/framework/base/src/api/composite_api.rs
@@ -2,7 +2,7 @@ use super::{ErrorApi, ManagedTypeApi, SendApi, StorageReadApi, StorageWriteApi};
 
 /// Provided for convenience.
 /// Designed to be used in any types that send tokens or calls.
-pub trait CallTypeApi: SendApi + ManagedTypeApi + ErrorApi {}
+pub trait CallTypeApi: SendApi + ManagedTypeApi + StorageWriteApi + ErrorApi {}
 
 /// Provided for convenience.
 /// Designed to be used in storage mappers.
diff --git a/framework/base/src/types/interaction/contract_call_exec.rs b/framework/base/src/types/interaction/contract_call_exec.rs
index 3cdaaffe3f..e5df812886 100644
--- a/framework/base/src/types/interaction/contract_call_exec.rs
+++ b/framework/base/src/types/interaction/contract_call_exec.rs
@@ -70,7 +70,7 @@ impl<SA, OriginalResult> ContractCallWithEgld<SA, OriginalResult>
 where
     SA: CallTypeApi + StorageWriteApi + 'static,
 {
-    pub(super) fn async_call(self) -> AsyncCall<SA> {
+    pub(super) fn build_async_call(self) -> AsyncCall<SA> {
         Tx::new_tx_from_sc()
             .to(self.basic.to)
             .egld(self.egld_payment)
@@ -83,7 +83,7 @@ impl<SA, OriginalResult> ContractCallWithEgld<SA, OriginalResult>
 where
     SA: CallTypeApi + 'static,
 {
-    pub(super) fn async_call_promise(self) -> super::AsyncCallPromises<SA> {
+    pub(super) fn build_async_call_promise(self) -> super::AsyncCallPromises<SA> {
         super::AsyncCallPromises {
             to: self.basic.to,
             egld_payment: self.egld_payment,
diff --git a/framework/base/src/types/interaction/contract_call_trait.rs b/framework/base/src/types/interaction/contract_call_trait.rs
index 073dae603d..f29d711847 100644
--- a/framework/base/src/types/interaction/contract_call_trait.rs
+++ b/framework/base/src/types/interaction/contract_call_trait.rs
@@ -75,13 +75,13 @@ where
     /// Converts to a legacy async call.
     #[inline]
     fn async_call(self) -> AsyncCall<SA> {
-        self.into_normalized().async_call()
+        self.into_normalized().build_async_call()
     }
 
     /// Converts to an async promise.
     #[inline]
     fn async_call_promise(self) -> super::AsyncCallPromises<SA> {
-        self.into_normalized().async_call_promise()
+        self.into_normalized().build_async_call_promise()
     }
 
     /// Executes immediately, synchronously, and returns contract call result.

From c8017588097bd49f44b40a5582676ac5cd7e0a36 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Mon, 5 Feb 2024 11:46:48 +0200
Subject: [PATCH 0320/1254] clippy fix

---
 framework/scenario/src/facade/world_tx/scenario_tx.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/framework/scenario/src/facade/world_tx/scenario_tx.rs b/framework/scenario/src/facade/world_tx/scenario_tx.rs
index 64c8dc9c55..cfad562838 100644
--- a/framework/scenario/src/facade/world_tx/scenario_tx.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_tx.rs
@@ -31,7 +31,7 @@ impl ScenarioWorld {
         STx: ScenarioTx<Returns = ()>,
         F: FnOnce(TxScenarioBase) -> STx,
     {
-        let () = self.tx_return(f);
+        self.tx_return(f);
         self
     }
 }

From fc1ade3eba7af45ca47c944b67744fba2adb6fa4 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Mon, 5 Feb 2024 14:28:09 +0000
Subject: [PATCH 0321/1254] impl iter from value, front, back, previous, next
 and tests from an older PR

---
 .../scenarios/storage_mapper_set.scen.json    | 205 +++++++++++++++++-
 .../basic-features/src/storage_mapper_set.rs  |  35 +++
 .../basic-features/wasm/src/lib.rs            |   9 +-
 .../base/src/storage/mappers/queue_mapper.rs  |  12 +-
 .../base/src/storage/mappers/set_mapper.rs    |  35 +++
 5 files changed, 291 insertions(+), 5 deletions(-)

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 0bdd153812..c4c91aaf58 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
@@ -298,6 +298,209 @@
                 "gas": "*",
                 "refund": "*"
             }
+        },
+        {
+            "step": "scCall",
+            "id": "first-insert",
+            "tx": {
+                "from": "address:an_account",
+                "to": "sc:basic-features",
+                "function": "set_mapper_insert",
+                "arguments": [
+                    "111"
+                ],
+                "gasLimit": "50,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": [
+                    "true"
+                ],
+                "status": "",
+                "logs": "*",
+                "gas": "*",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "second-insert",
+            "tx": {
+                "from": "address:an_account",
+                "to": "sc:basic-features",
+                "function": "set_mapper_insert",
+                "arguments": [
+                    "222"
+                ],
+                "gasLimit": "50,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": [
+                    "true"
+                ],
+                "status": "",
+                "logs": "*",
+                "gas": "*",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "third-insert",
+            "tx": {
+                "from": "address:an_account",
+                "to": "sc:basic-features",
+                "function": "set_mapper_insert",
+                "arguments": [
+                    "333"
+                ],
+                "gasLimit": "50,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": [
+                    "true"
+                ],
+                "status": "",
+                "logs": "*",
+                "gas": "*",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "check-front",
+            "tx": {
+                "from": "address:an_account",
+                "to": "sc:basic-features",
+                "function": "set_mapper_front",
+                "arguments": [],
+                "gasLimit": "50,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": [
+                    "111"
+                ],
+                "status": "",
+                "logs": "*",
+                "gas": "*",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "check-back",
+            "tx": {
+                "from": "address:an_account",
+                "to": "sc:basic-features",
+                "function": "set_mapper_back",
+                "arguments": [],
+                "gasLimit": "50,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": [
+                    "333"
+                ],
+                "status": "",
+                "logs": "*",
+                "gas": "*",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "check-next",
+            "tx": {
+                "from": "address:an_account",
+                "to": "sc:basic-features",
+                "function": "set_mapper_next",
+                "arguments": [
+                    "222"
+                ],
+                "gasLimit": "50,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": [
+                    "333"
+                ],
+                "status": "",
+                "logs": "*",
+                "gas": "*",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "check-next-out-of-bounds",
+            "tx": {
+                "from": "address:an_account",
+                "to": "sc:basic-features",
+                "function": "set_mapper_next",
+                "arguments": [
+                    "333"
+                ],
+                "gasLimit": "50,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": [
+                    "0"
+                ],
+                "status": "",
+                "logs": "*",
+                "gas": "*",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "check-previous",
+            "tx": {
+                "from": "address:an_account",
+                "to": "sc:basic-features",
+                "function": "set_mapper_previous",
+                "arguments": [
+                    "222"
+                ],
+                "gasLimit": "50,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": [
+                    "111"
+                ],
+                "status": "",
+                "logs": "*",
+                "gas": "*",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "check-iter-from",
+            "tx": {
+                "from": "address:an_account",
+                "to": "sc:basic-features",
+                "function": "set_mapper_iter_from_and_count",
+                "arguments": [
+                    "222"
+                ],
+                "gasLimit": "50,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": [
+                    "2"
+                ],
+                "status": "",
+                "logs": "*",
+                "gas": "*",
+                "refund": "*"
+            }
         }
     ]
-}
+}
\ No newline at end of file
diff --git a/contracts/feature-tests/basic-features/src/storage_mapper_set.rs b/contracts/feature-tests/basic-features/src/storage_mapper_set.rs
index b77004f3ab..8a7771f90a 100644
--- a/contracts/feature-tests/basic-features/src/storage_mapper_set.rs
+++ b/contracts/feature-tests/basic-features/src/storage_mapper_set.rs
@@ -24,4 +24,39 @@ pub trait SetMapperFeatures {
         let mut set_mapper = self.set_mapper();
         set_mapper.remove(&item)
     }
+
+    #[endpoint]
+    fn set_mapper_front(&self) -> u32 {
+        let set_mapper = self.set_mapper();
+        set_mapper.front().unwrap_or_default()
+    }
+
+    #[endpoint]
+    fn set_mapper_back(&self) -> u32 {
+        let set_mapper = self.set_mapper();
+        set_mapper.back().unwrap_or_default()
+    }
+
+    #[endpoint]
+    fn set_mapper_next(&self, item: u32) -> u32 {
+        let set_mapper = self.set_mapper();
+        set_mapper.next(&item).unwrap_or_default()
+    }
+
+    #[endpoint]
+    fn set_mapper_previous(&self, item: u32) -> u32 {
+        let set_mapper = self.set_mapper();
+        set_mapper.previous(&item).unwrap_or_default()
+    }
+
+    #[endpoint]
+    fn set_mapper_iter_from_and_count(&self, item: u32) -> u32 {
+        let set_mapper = self.set_mapper();
+        let mut count = 0;
+        for _element in set_mapper.iter_from(&item) {
+            count += 1;
+        }
+
+        count
+    }
 }
diff --git a/contracts/feature-tests/basic-features/wasm/src/lib.rs b/contracts/feature-tests/basic-features/wasm/src/lib.rs
index e546f06cab..21f0a23780 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:                          375
+// Endpoints:                          380
 // Async Callback:                       1
-// Total number of exported functions: 377
+// Total number of exported functions: 382
 
 #![no_std]
 #![allow(internal_features)]
@@ -310,6 +310,11 @@ multiversx_sc_wasm_adapter::endpoints! {
         set_mapper_insert => set_mapper_insert
         set_mapper_contains => set_mapper_contains
         set_mapper_remove => set_mapper_remove
+        set_mapper_front => set_mapper_front
+        set_mapper_back => set_mapper_back
+        set_mapper_next => set_mapper_next
+        set_mapper_previous => set_mapper_previous
+        set_mapper_iter_from_and_count => set_mapper_iter_from_and_count
         map_my_single_value_mapper => map_my_single_value_mapper
         my_single_value_mapper_increment_1 => my_single_value_mapper_increment_1
         my_single_value_mapper_increment_2 => my_single_value_mapper_increment_2
diff --git a/framework/base/src/storage/mappers/queue_mapper.rs b/framework/base/src/storage/mappers/queue_mapper.rs
index 124584ea0a..79ac5f37d7 100644
--- a/framework/base/src/storage/mappers/queue_mapper.rs
+++ b/framework/base/src/storage/mappers/queue_mapper.rs
@@ -309,12 +309,16 @@ where
         Iter::new(self)
     }
 
+    pub fn iter_from_node_id(&self, node_id: u32) -> Iter<SA, A, T> {
+        Iter::new_from_node_id(self, node_id)
+    }
+
     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 {
+    pub 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(),
@@ -328,7 +332,7 @@ where
         )
     }
 
-    fn get_value_option(&self, node_id: u32) -> Option<T> {
+    pub fn get_value_option(&self, node_id: u32) -> Option<T> {
         if node_id == NULL_ENTRY {
             return None;
         }
@@ -474,6 +478,10 @@ where
             queue,
         }
     }
+
+    pub fn new_from_node_id(queue: &'a QueueMapper<SA, T, A>, node_id: u32) -> Iter<'a, SA, A, T> {
+        Iter { node_id, queue }
+    }
 }
 
 impl<'a, SA, A, T> Iterator for Iter<'a, SA, A, T>
diff --git a/framework/base/src/storage/mappers/set_mapper.rs b/framework/base/src/storage/mappers/set_mapper.rs
index f8e2bab25b..365e4a06fd 100644
--- a/framework/base/src/storage/mappers/set_mapper.rs
+++ b/framework/base/src/storage/mappers/set_mapper.rs
@@ -175,6 +175,11 @@ where
         self.queue_mapper.iter()
     }
 
+    pub fn iter_from(&self, value: &T) -> Iter<SA, A, T> {
+        let node_id = self.get_node_id(value);
+        self.queue_mapper.iter_from_node_id(node_id)
+    }
+
     fn get_node_id(&self, value: &T) -> u32 {
         self.address.address_storage_get(
             self.build_named_value_key(NODE_ID_IDENTIFIER, value)
@@ -201,6 +206,36 @@ where
     pub fn check_internal_consistency(&self) -> bool {
         self.queue_mapper.check_internal_consistency()
     }
+
+    pub fn next(&self, value: &T) -> Option<T> {
+        let node_id = self.get_node_id(value);
+        if node_id == NULL_ENTRY {
+            return None;
+        }
+
+        let next_node_id = self.queue_mapper.get_node(node_id).next;
+
+        self.queue_mapper.get_value_option(next_node_id)
+    }
+
+    pub fn previous(&self, value: &T) -> Option<T> {
+        let node_id = self.get_node_id(value);
+        if node_id == NULL_ENTRY {
+            return None;
+        }
+
+        let next_node_id = self.queue_mapper.get_node(node_id).previous;
+
+        self.queue_mapper.get_value_option(next_node_id)
+    }
+
+    pub fn front(&self) -> Option<T> {
+        self.queue_mapper.front()
+    }
+
+    pub fn back(&self) -> Option<T> {
+        self.queue_mapper.back()
+    }
 }
 
 impl<'a, SA, A, T> IntoIterator for &'a SetMapper<SA, T, A>

From 2474374293d7a18667d199c533d8bcbcdce27071 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Mon, 5 Feb 2024 15:18:28 +0000
Subject: [PATCH 0322/1254] read at address tests + fmt all

---
 .../alloc-features/src/alloc_features_main.rs |  4 +-
 .../storage_mapper_get_at_address.scen.json   | 90 ++++++++++++++++++-
 .../src/storage_mapper_get_at_address.rs      | 32 +++++++
 .../basic-features/wasm/src/lib.rs            |  8 +-
 4 files changed, 129 insertions(+), 5 deletions(-)

diff --git a/contracts/feature-tests/alloc-features/src/alloc_features_main.rs b/contracts/feature-tests/alloc-features/src/alloc_features_main.rs
index de8c7f5067..d744d2195c 100644
--- a/contracts/feature-tests/alloc-features/src/alloc_features_main.rs
+++ b/contracts/feature-tests/alloc-features/src/alloc_features_main.rs
@@ -8,11 +8,11 @@ pub mod echo_managed_alloc;
 pub mod elliptic_curve_features_legacy;
 pub mod macro_features_legacy;
 pub mod managed_buffer_features_alloc;
+pub mod memory_types;
 pub mod storage_direct_load_alloc;
 pub mod storage_direct_store_alloc;
 pub mod type_features_alloc;
 pub mod types;
-pub mod memory_types;
 
 /// Features of the framework/VM that use the heap allocator.
 ///
@@ -31,7 +31,7 @@ pub trait AllocFeatures:
     + storage_direct_load_alloc::StorageLoadFeatures
     + storage_direct_store_alloc::StorageStoreFeatures
     + type_features_alloc::AllocTypeFeatures
-    + memory_types:: MemoryTypes
+    + memory_types::MemoryTypes
 {
     #[init]
     fn init(&self) {}
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 7577d8d5ba..bec03acdf9 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,6 +152,94 @@
                 "gas": "*",
                 "refund": "*"
             }
+        },
+        {
+            "step": "scCall",
+            "id": "next at address",
+            "tx": {
+                "from": "address:an_account",
+                "to": "sc:caller",
+                "function": "next_at_address",
+                "arguments": [
+                    "5"
+                ],
+                "gasLimit": "50,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": [
+                    "6"
+                ],
+                "status": "",
+                "logs": "*",
+                "gas": "*",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "previous at address",
+            "tx": {
+                "from": "address:an_account",
+                "to": "sc:caller",
+                "function": "previous_at_address",
+                "arguments": [
+                    "5"
+                ],
+                "gasLimit": "50,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": [
+                    "4"
+                ],
+                "status": "",
+                "logs": "*",
+                "gas": "*",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "front at address",
+            "tx": {
+                "from": "address:an_account",
+                "to": "sc:caller",
+                "function": "front_at_address",
+                "arguments": [],
+                "gasLimit": "50,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": [
+                    "1"
+                ],
+                "status": "",
+                "logs": "*",
+                "gas": "*",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "back at address",
+            "tx": {
+                "from": "address:an_account",
+                "to": "sc:caller",
+                "function": "back_at_address",
+                "arguments": [],
+                "gasLimit": "50,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": [
+                    "10"
+                ],
+                "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 601c0d8eec..7fc07d48eb 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,6 +38,38 @@ pub trait StorageMapperGetAtAddress {
         mapper.len()
     }
 
+    #[endpoint]
+    fn next_at_address(&self, item: u32) -> u32 {
+        let address = self.contract_address().get();
+        let mapper: SetMapper<u32, _> =
+            SetMapper::new_from_address(address, StorageKey::from("set_mapper"));
+        mapper.next(&item).unwrap()
+    }
+
+    #[endpoint]
+    fn previous_at_address(&self, item: u32) -> u32 {
+        let address = self.contract_address().get();
+        let mapper: SetMapper<u32, _> =
+            SetMapper::new_from_address(address, StorageKey::from("set_mapper"));
+        mapper.previous(&item).unwrap()
+    }
+
+    #[endpoint]
+    fn front_at_address(&self) -> u32 {
+        let address = self.contract_address().get();
+        let mapper: SetMapper<u32, _> =
+            SetMapper::new_from_address(address, StorageKey::from("set_mapper"));
+        mapper.front().unwrap()
+    }
+
+    #[endpoint]
+    fn back_at_address(&self) -> u32 {
+        let address = self.contract_address().get();
+        let mapper: SetMapper<u32, _> =
+            SetMapper::new_from_address(address, StorageKey::from("set_mapper"));
+        mapper.back().unwrap()
+    }
+
     /// Storage to be called. For testing, this contract is deployed twice,
     /// and this module acts both as caller and receiver
     #[storage_mapper("set_mapper")]
diff --git a/contracts/feature-tests/basic-features/wasm/src/lib.rs b/contracts/feature-tests/basic-features/wasm/src/lib.rs
index 21f0a23780..e87654cc7e 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:                          380
+// Endpoints:                          384
 // Async Callback:                       1
-// Total number of exported functions: 382
+// Total number of exported functions: 386
 
 #![no_std]
 #![allow(internal_features)]
@@ -399,6 +399,10 @@ 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
+        next_at_address => next_at_address
+        previous_at_address => previous_at_address
+        front_at_address => front_at_address
+        back_at_address => back_at_address
         fill_set_mapper => fill_set_mapper
     )
 }

From ce7ead83e6973950c12213744639c537ff9b6ce7 Mon Sep 17 00:00:00 2001
From: Fusee <quentus123@orange.fr>
Date: Mon, 5 Feb 2024 19:39:33 +0100
Subject: [PATCH 0323/1254] changed the way to retrieve the new deployed
 address after a sc deployment

---
 .../scenario/model/transaction/tx_response.rs | 179 ++++++++++++++++--
 sdk/core/src/data/transaction.rs              |   1 +
 2 files changed, 165 insertions(+), 15 deletions(-)

diff --git a/framework/scenario/src/scenario/model/transaction/tx_response.rs b/framework/scenario/src/scenario/model/transaction/tx_response.rs
index f73641c9c9..c4aac6bc9e 100644
--- a/framework/scenario/src/scenario/model/transaction/tx_response.rs
+++ b/framework/scenario/src/scenario/model/transaction/tx_response.rs
@@ -1,5 +1,6 @@
-use crate::multiversx_sc::types::Address;
+use multiversx_chain_vm::crypto_functions::keccak256;
 use multiversx_chain_vm::tx_mock::TxResult;
+use multiversx_sc::types::Address;
 use multiversx_sdk::{
     data::transaction::{ApiLogs, ApiSmartContractResult, Events, TransactionOnNetwork},
     utils::base64_decode,
@@ -9,7 +10,7 @@ use super::{
     decode_scr_data_or_panic, is_out_scr, process_topics_error, Log, TxExpect, TxResponseStatus,
 };
 
-const LOG_IDENTIFIER_SC_DEPLOY: &str = "SCDeploy";
+const SC_DEPLOY_PROCESSING_TYPE: &str = "SCDeployment";
 const LOG_IDENTIFIER_SIGNAL_ERROR: &str = "signalError";
 
 const SYSTEM_SC_BECH32: &str = "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u";
@@ -63,7 +64,11 @@ impl TxResponse {
             return response;
         }
 
-        response.process()
+        response.process(
+            tx.sender.to_bytes(),
+            tx.nonce,
+            tx.processing_type_on_destination
+        )
     }
 
     /// Creates a [`TxResponse`] from raw results.
@@ -117,9 +122,14 @@ impl TxResponse {
         TxResponseStatus::default()
     }
 
-    fn process(self) -> Self {
+    fn process(
+        self,
+        sender_address: [u8; 32],
+        nonce: u64,
+        processing_type_on_destination: String
+    ) -> Self {
         self.process_out()
-            .process_new_deployed_address()
+            .process_new_deployed_address(sender_address, nonce, processing_type_on_destination)
             .process_new_issued_token_identifier()
     }
 
@@ -156,18 +166,31 @@ impl TxResponse {
         }
     }
 
-    fn process_new_deployed_address(mut self) -> Self {
-        if let Some(event) = self.find_log(LOG_IDENTIFIER_SC_DEPLOY).cloned() {
-            let topics = event.topics.as_ref();
-            if process_topics_error(topics).is_some() {
-                return self;
-            }
+    fn process_new_deployed_address(
+        mut self,
+        sender_address_bytes: [u8; 32],
+        nonce: u64,
+        processing_type_on_destination: String
+    ) -> Self {
+        if processing_type_on_destination != SC_DEPLOY_PROCESSING_TYPE {
+            return self
+        }
 
-            let address_raw = base64_decode(topics.unwrap().first().unwrap());
+        let sender_nonce_bytes = nonce.to_le_bytes();
+        let mut bytes_to_hash: Vec<u8> = Vec::new();
+        bytes_to_hash.extend_from_slice(&sender_address_bytes);
+        bytes_to_hash.extend_from_slice(&sender_nonce_bytes);
 
-            let address: Address = Address::from_slice(address_raw.as_slice());
-            self.new_deployed_address = Some(address);
-        }
+        let address_keccak = keccak256(&bytes_to_hash);
+
+        let mut address = [0u8; 32];
+
+        address[0..8].copy_from_slice(&[0u8; 8]);
+        address[8..10].copy_from_slice(&[5, 0]);
+        address[10..30].copy_from_slice(&address_keccak[10..30]);
+        address[30..32].copy_from_slice(&sender_address_bytes[30..32]);
+
+        self.new_deployed_address = Some(Address::from(address));
 
         self
     }
@@ -234,9 +257,135 @@ impl TxResponse {
 
 #[cfg(test)]
 mod tests {
+    use multiversx_sc::types::Address;
     use crate::scenario_model::TxResponse;
     use multiversx_sdk::data::transaction::{TransactionInfo, TransactionOnNetwork};
 
+    #[test]
+    fn test_deployed_address() {
+        let data = r#"
+        {
+  "data": {
+    "transaction": {
+      "type": "normal",
+      "processingTypeOnSource": "SCDeployment",
+      "processingTypeOnDestination": "SCDeployment",
+      "hash": "07a176d1734d1901d396be344f97e1d80f076269e9559f9b2110f6f11c4f74de",
+      "nonce": 427,
+      "round": 2190715,
+      "epoch": 887,
+      "value": "0",
+      "receiver": "erd1qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqq6gq4hu",
+      "sender": "erd1j6kua7p67qnaw3y4sudmk25xsuv4k8ws6pwvax8fd2vtmuc3q33s840l87",
+      "gasPrice": 1000000000,
+      "gasLimit": 600000000,
+      "data": "0061736d010000000198011960027f7f0060017f017f6000006000017f60027f7f017f60037f7f7f0060017f0060047f7f7f7f0060057f7f7f7f7f0060037f7f7f017f60047f7f7f7f017f60027f7e0060017f017e60027f7f017e60057f7f7e7f7f017f60067e7f7f7f7f7f017f60017e006000017e60017e017f60047f7f7e7f0060057e7f7f7f7f017f60047f7f7f7e0060017e017e60047f7e7f7f0060027e7f0002c1072903656e76126d616e616765645369676e616c4572726f72000603656e760e626967496e74536574496e743634000b03656e7609626967496e74416464000503656e760b7369676e616c4572726f72000003656e760a6d4275666665724e6577000303656e760d6d427566666572417070656e64000403656e76096d4275666665724571000403656e760d6d42756666657246696e697368000103656e76226d616e616765644d756c74695472616e73666572455344544e465445786563757465000e03656e761b6d616e61676564457865637574654f6e44657374436f6e74657874000f03656e760d6d616e6167656443616c6c6572000603656e76106d616e61676564534341646472657373000603656e76136d616e616765644f776e657241646472657373000603656e761c6d616e616765644765744d756c74694553445443616c6c56616c7565000603656e76126d427566666572476574417267756d656e74000403656e76126d427566666572417070656e644279746573000903656e7619626967496e74476574556e7369676e6564417267756d656e74000003656e761b736d616c6c496e74476574556e7369676e6564417267756d656e74000c03656e76106d4275666665724765744c656e677468000103656e760f6765744e756d417267756d656e7473000303656e7616736d616c6c496e7446696e697368556e7369676e6564001003656e7609626967496e74537562000503656e760a6765744761734c656674001103656e760f636c65616e52657475726e44617461000203656e760f6d4275666665725365744279746573000903656e7609626967496e74436d70000403656e760a626967496e7454446976000503656e7609626967496e744d756c000503656e76196d42756666657246726f6d426967496e74556e7369676e6564000403656e76176d427566666572546f426967496e74556e7369676e6564000403656e7609626967496e74506f77000503656e76146d427566666572436f707942797465536c696365000a03656e76126d42756666657253746f726167654c6f6164000403656e76136d42756666657253746f7261676553746f7265000403656e760e636865636b4e6f5061796d656e74000203656e76176d616e616765644765744261636b5472616e7366657273000003656e760f6d616e6167656457726974654c6f67000003656e7614626967496e7446696e697368556e7369676e6564000603656e760666696e697368000003656e760a626967496e745369676e000103656e76136d42756666657247657442797465536c696365000a03d301d1010103080201120104000107060606000401090100010000000013030014030303020301070400030901090909000707010006060106060c0501080500010b00080715070808000a0016010106010000000500000103000601001705050a070400040a00040404000404040404010100040d070707080a000501010505060101000b0b0101010101050d0105000000050500000000000c070707070000081803030300030300010407030303030101030303030202020202020202020202020202020202020202020202020202020202080805030100030616037f01418080080b7f0041e9db080b7f0041f0db080b07c70520066d656d6f7279020004696e697400db01077570677261646500dc01076465706f73697400dd0108776974686472617700de0108636f6d706f756e6400df010e676574546f74616c41737365747300e0010f6765745661756c744164647265737300e101176765744173736574546f6b656e4964656e74696669657200e2011d6765744d6f6e65794d61726b6574546f6b656e4964656e74696669657200e301226765744d6f6e65794d61726b6574556e6465726c79696e674964656e74696669657200e4011f676574426f6f737465725374616b6564546f6b656e4964656e74696669657200e50114676574436f6e74726f6c6c65724164647265737300e601156765744d6f6e65794d61726b65744164647265737300e7011d6765745772617070656445676c64436f6e74726163744164647265737300e8011d6765745772617070656445676c64546f6b656e4964656e74696669657200e90111676574426f6f737465724164647265737300ea0119676574436f6d706f756e645845786368616e6765537761707300eb0117676574436f6d706f756e6441736873776170537761707300ec0116676574436f6d706f756e644665657350657263656e7400ed0119676574506572666f726d616e63654665657350657263656e7400ee010e7374616b65496e426f6f7374657200ef011b726562616c616e6365506f7274666f6c696f496e426f6f7374657200f00112756e7374616b6546726f6d426f6f7374657200f10118636c61696d4d756c7469706c6546726f6d426f6f7374657200f20119736574506572666f726d616e63654665657350657263656e7400f30116736574436f6d706f756e644665657350657263656e7400f40110736574436f6d706f756e64537761707300f5010d6765744e61747572616c41505900f6010863616c6c4261636b00f7010a5f5f646174615f656e6403010b5f5f686561705f6261736503020a9aa901d1011601017f102a220142001001200120012000100220010b1901017f41c88d0841c88d0828020041016b220036020020000b2e000240200120024d0440200220044d0d01102c000b102c000b2000200220016b3602042000200120036a3602000b0b0041b88d08410e1003000b1301017f102a22012000ad42ff0183100120010b2101017f102a21012000420053044041b2850841111003000b20012000100120010b0f01017f10042201200010051a20010b0b0020002001100641004a0b2d01017f230041206b2202240020022000103241c08008410810332002200136021820021034200241206a24000b1900200041feffffff0746044041c8800841191003000b20000b2a0020022003104d2102104321032000427f3703082000200336020420002002360200200020013602100b7d01037f230041106b22012400200029030810712000280210200028021820002802002000280204104521021017410021002002101221032001410036020c200120023602042001200341027622023602080340200020024f450440200141046a10751a20012802082102200128020c21000c010b0b200141106a24000b3601027f230041106b22012400200141086a103620012802082102200020012d000c4101713a000420002002360200200141106a24000b6d01027f230041106b220124002000027f41e0db082d0000220245044041e0db0841013a000041dcdb084100360200200141086a4100109f012001280208200128020c41b88d084100105710430c010b41b88d084100104d0b360200200020024101733a0004200141106a24000b0b0020002001103810071a0b4901017f230041106b22022400200220013a000c20022000360208200241086a10a501200228020820022d000c044041dcdb08410036020041e0db0841003a00000b200241106a24000b0e002000418a8508410b103a103b0b130020002000200120021052200120021085010b0d002000102a2200101d1a20000b0a002000103d2001103e0b0f01017f102a22012000101c1a20010b5101027f230041106b22022400200220001012220341187420034180fe03714108747220034108764180fe03712003411876727236020c20012002410c6a410410a3012001200010bd01200241106a24000b0a002000103d200110400b5101027f230041106b22022400200220001012220341187420034180fe03714108747220034108764180fe03712003411876727236020c20012002410c6a4104100f1a20012000108b01200241106a24000b0900200020011003000b5001047f1043210610432107230041106b22042400104321052001102f210120042003102936020c20042002370300200420013602082005200410442000200542002006200710081a200441106a24000b1301017f102a220041b88d08410010181a20000bd20102027f017e230041106b2203240020032001280208220241187420024180fe03714108747220024108764180fe0371200241187672723602002003200128020c220241187420024180fe03714108747220024108764180fe03712002411876727236020c20032001290300220442388620044280fe0383422886842004428080fc0783421886200442808080f80f834208868484200442088842808080f80f832004421888428080fc07838420044228884280fe03832004423888848484370204200020034110100f1a200341106a24000b150020002001200220032004102a220110091a20010b0c01017f102a2200100a20000b0c01017f102a2200100b20000b0c01017f102a2200100c20000b150010481046103004400f0b41928d0841241003000b2b01017f41e8db082d000022000440416b41ffffffff0720001b0f0b41e8db0841013a0000416b100d416b0b0d002000102a2200100e1a20000b2e01017f41d583084117104d220420002001100f1a200441ec83084103100f1a200420022003100f1a20041000000b1101017f102a22022000200110181a20020b4601017f230041106b220224002002200141187420014180fe03714108747220014108764180fe03712001411876727236020c20002002410c6a4104100f1a200241106a24000b0e01017f4100102a2200101020000b1f002000104b2200101241204704402001200241b086084110104c000b20000bd90301097f230041406a220124002000104b210210432106200210122100200141246a41003a0000200141206a20003602002001200236021c200120003602182001410036021441002102037f2000200246047f20012d0024044041dcdb08410036020041e0db0841003a00000b200141406b2400200605200141146a2200419787084116103a210420004197870841161052210010432103034020000440200141146a2205419787084116105221072005419787084116105321082005419787084116103a2109410021020240024002402005419787084116105441ff01710e020201000b41978708411641ed8608410d104c000b410121020b200120023a0034200120093602302001200836022c200120073602282003200141286a1055200041016b21000c010b0b200142003703282001200441187420044180fe03714108747220044108764180fe03712004411876727236023c200141086a200141286a22004100410410562001280208200128020c2001413c6a2202410410572001200341187420034180fe03714108747220034108764180fe03712003411876727236023c2001200041044108105620012802002001280204200241041057200620004108100f1a20012802142102200128021821000c010b0b0b3702017f017e230041106b220324002003410036020c20002003410c6a220041042001200210c5012000410410b101200341106a2400a70b0d0020004120200120021085010b3001017f230041106b22032400200341003a000f20002003410f6a41012001200210c50120032d000f200341106a24000bf60201057f230041d0006b22022400200242003700352002420037033020022001280200220341187420034180fe03714108747220034108764180fe037120034118767272360240200241286a200241306a220541004104109b012002280228200228022c200241406b220441041057200241c8006a41003a00002002420037034020022001280204220341187420034180fe03714108747220034108764180fe03712003411876727236024c200241206a200441004104109c0120022802202002280224200241cc006a2206410410572002200141086a280200220341187420034180fe03714108747220034108764180fe03712003411876727236024c200241186a200441044108109c012002280218200228021c20064104105720022001410c6a2d00003a004c200241106a200441084109109c0120022802102002280214200641011057200241086a20054104410d109b012002280208200228020c20044109105720002005410d100f1a200241d0006a24000b0f002000200120022003410810f9010bb50201067f200120034604402001220341104f04402000410020006b41037122046a210520040440200221010340200020012d00003a0000200141016a2101200041016a22002005490d000b0b2005200320046b2203417c7122066a21000240200220046a22044103710440200641004c0d012004410374220141187121072004417c71220841046a2102410020016b4118712109200828020021010340200520012007762002280200220120097472360200200241046a2102200541046a22052000490d000b0c010b200641004c0d0020042102034020052002280200360200200241046a2102200541046a22052000490d000b0b20034103712103200420066a21020b20030440200020036a21010340200020022d00003a0000200241016a2102200041016a22002001490d000b0b0f0b102c000ba20301077f230041406a220124002000104b2102104321052002101221002001412c6a41003a0000200141286a200036020020012002360224200120003602202001410036021c41002102037f2000200246047f20012d002c044041dcdb08410036020041e0db0841003a00000b200141406b24002005052001411c6a220041ad87084118103a2103200041ad8708411810522100104321020340200004402001411c6a220441ad8708411810522106200441ad8708411810532107200441ad87084118103a21042001200636023820012004360234200120073602302002200141306a1059200041016b21000c010b0b200142003703302001200341187420034180fe03714108747220034108764180fe03712003411876727236023c200141106a200141306a2200410041041056200128021020012802142001413c6a2203410410572001200241187420024180fe03714108747220024108764180fe03712002411876727236023c200141086a20004104410810562001280208200128020c200341041057200520004108100f1a200128021c2102200128022021000c010b0b0bb80201047f230041406a22022400200241286a41003602002002420037032020022001280208220341187420034180fe03714108747220034108764180fe037120034118767272360230200241186a200241206a220541004104109a012002280218200228021c200241306a2204410410572002420037033020022001280200220341187420034180fe03714108747220034108764180fe03712003411876727236023c200241106a2004410041041056200228021020022802142002413c6a22034104105720022001280204220141187420014180fe03714108747220014108764180fe03712001411876727236023c200241086a20044104410810562002280208200228020c200341041057200220054104410c109a012002280200200228020420044108105720002005410c100f1a200241406b24000b1400101320004604400f0b4192840841191003000b09002000105c10071a0b1d00200010a70122001012412047044041b086084110108801000b20000b0a00200010a70110071a0b08002000105f10140b6102027f017e230041106b2201240020014200370308200010a70122001012220241094f044041958508410e108801000b2001200141086a200210b001200041002001280200220020012802042202108a011a2000200210b101200141106a24000b1f0020002001200210152000106141ff017104400f0b41ab840841301003000b1500410241012000102722001b4100200041004e1b0bf80101047f230041d0006b2205240020052004360228200541206a41db840841141063200528022021072005280224220620031064200410652103104322082003ad106620062008104e200520041012360234200541003602302005200541286a36022c0340200541386a2005412c6a10672005290338500440200520072006200120021068200528020421012000200528020036020020002001360204200541d0006a240005200528024c2103200541186a2007200620052802481069200541106a2005280218200528021c2005290340106a200541086a200528021020052802142003106b200528020c2106200528020821070c010b0b0b180020012002104d210120001043360204200020013602000b100010431a20002001280200102f104e0b0900200010124104760b3801017f230041106b2202240020024200370308200220014100200241086a10820120002002280200200228020410181a200241106a24000ba70102057f017e230041206b2202240020002001280204220441106a220520012802084d047e2001280200200241106a4200370300200242003703082802002004200241086a22034110106f1a2002410036021c20032002411c6a22061098012104200320061099012107200041146a200241086a2002411c6a109801360200200041106a2004360200200020073703082001200536020442010542000b370300200241206a24000b910101037f230041106b22052400024020031012450d0020022003106e200410122106410021030340200341046a220720064b0d012005410036020c200420032005410c6a4104106f1a2002200528020c220341187420034180fe03714108747220034108764180fe037120034118767272106e200721030c000b000b2000200236020420002001360200200541106a24000b160020022003106e20002002360204200020013602000b2001017f104322042003106620022004104e20002002360204200020013602000b160020032002107020002002360204200020013602000ba30101027f230041306b22052400200541286a41ef8408410f1063200541206a2005280228200528022c20042802081069200541186a200528022020052802242004290300106a200541106a2005280218200528021c200428020c106b200528021021042005280214210610431a20062003102f104e200541086a20042006200120021068200528020c21012000200528020836020020002001360204200541306a24000b7101017f230041206b22052400200541186a41fe8408410c1063200541106a2005280218200528021c20031069200541086a200528021020052802142004106b20052005280208200528020c200120021068200528020421012000200528020036020020002001360204200541206a24000b0d0010431a20002001102f104e0b0d002000200120022003108a010b0d0010431a20012000103d104e0b0f002000427f51047e10160520000b0b3001017e20002903082201427f51047e10160520010b20002802102000280218200028020020002802041045101710730b3b01027f230041106b220124002000101221022001410036020c2001200036020420012002410276360208200141046a1075103b200141106a24000b24002000290308107120002802102000280218200028020020002802041045101710121a0b7d01037f230041106b22012400200028020821032001410036020c200028020020034102742001410c6a4104106f450440200128020c21022000200341016a360208200241187420024180fe03714108747220024108764180fe037120024118767272102f200141106a24000f0b418a8508410b41ef83084111104c000b900202027f017e230041d0006b2202240020012903082204427f51047e10160520040b2001280210200128021820012802002001280204104521011017200110122103200241003602142002200136020c200220034102763602102002410c6a10752203101221012002413c6a41003a0000200241386a200136020020022003360234200220013602302002410036022c200241406b2002412c6a10772002280230200228022c460440200241206a2201200241c8006a2903003703002002200229034037031820022d003c044041dcdb08410036020041e0db0841003a00000b20002002290318370300200041086a2001290300370300200241d0006a24000f0b418a8508410b41958508410e104c000b3002017f017e2001418a8508410b103a2102200110be01210320002001103936020c20002002360208200020033703000b100010431a20002001280200103d104e0b0e0020014504402002200010700b0b810101057f230041106b220324001043102f210420012802001012210503402005200241046a22064f04402003410036020c200128020020022003410c6a4104106f1a200328020c220241187420024180fe03714108747220024108764180fe0371200241187672722004103f200621020c010b0b20002004104e200341106a24000b820101057f230041106b220324001043102f210420012802001012210503402005200241046a22064f04402003410036020c200128020020022003410c6a4104106f1a2004200328020c220241187420024180fe03714108747220024108764180fe03712002411876727210051a200621020c010b0b20002004104e200341106a24000b4d01027f230041206b22012400107d2102200141106a200041106a290300370300200141086a200041086a290300370300200120023602182001200029030037030020011072200141206a24000b0e01017f102a22004200100120000b4f01027f230041206b22022400107d2103200241106a200141106a290300370300200241086a200141086a2903003703002002200336021820022001290300370300200020021076200241206a24000b4d01027f230041206b22012400107d2102200141106a200041106a290300370300200141086a200041086a290300370300200120023602182001200029030037030020011034200141206a24000b7602057f017e230041106b22012400107d210220002802102103200028020421042000280200210520002903082206427f51047e10160520060b20032002200520041045210010172000101221022001410036020c2001200036020420012002410276360208200141046a1075102f200141106a24000b4701027f230041106b22022400104321032002420037030820022001ad42ff01834101200241086a10820120032002280200200228020410181a20002003104e200241106a24000b8f0202047f017e2003200142388620014280fe0383422886842001428080fc0783421886200142808080f80f834208868484200142088842808080f80f832001421888428080fc0783842001423888220820014228884280fe03838484843700000240200150044041b88d0821030c010b200204402001427f510440200341076a2103410121040c020b2008a7c022054107752106200541004821050b200641ff0171210603400240024020044108470440200320046a2d000022072006460d02200245200741077620054672450440200441016b220441094f0d020b200320046a2103410820046b21040c040b102c000b102c000b200441016a21040c000b000b20002004360204200020033602000ba30102037f017e230041106b22032400027f2002290300500440200128021021042003200128020020012802042002280208200228020c106d2003280200210520032802040c010b10472104200341086a2001280200200128020420012802102002106c20032802082105200328020c0b2102200129030821062000107d36021820002004360210200020063703082000200236020420002005360200200341106a24000b3f01017f1043210320002001290300370300200041106a200141106a290300370300200041086a200141086a290300370300200320021044200020033602180b5201027f230041106b22042400200441086a200028020820002802002205200110860120042802084101460440200428020c2000200120056a360200200441106a24000f0b2002200341a38508410f104c000b1f0020012002200310042201101f21022000200136020420002002453602000b4f01037f230041106b22022400200241086a200028020820002802002203200110860120022802084101460440200228020c2000200120036a360200200241106a24000f0b41a38508410f108801000b1a01017f41f185084116104d220220002001100f1a20021000000b1500417f200020011019220041004720004100481b0b0f00200020012003200210284100470b09002000200110051a0b0c00200020002001100220000b0c00200020002001101a20000b0c00200020002001101b20000b0a0020002000200110020b0c00200020002001106020000b1001017f102a220220002001100220020b1001017f102a220220002001101b20020b1001017f102a220220002001106020020b1901017f102a210241722001ad1001200220004172101e20020b0e01017f104322012000104420010b4c01027f230041106b22012400104321022001200041187420004180fe03714108747220004108764180fe03712000411876727236020c20022001410c6a4104100f1a200141106a240020020b840102047f017e230041206b22022400200241106a42003703002002420037030820014100200241086a22034110106f2002410036021c20032002411c6a22041098012105200320041099012106200241086a2002411c6a1098012103044041c38508411d1003000b2000200336020c2000200536020820002006370300200241206a24000b7401017f230041106b220224002002410036020c20022000411020012802002200200041046a2200109d012002410c6a410420022802002002280204105720012000360200200228020c2100200241106a2400200041187420004180fe03714108747220004108764180fe0371200041187672720ba80102017e017f230041106b220324002003420037030820032000411020012802002200200041086a2200109d01200341086a41082003280200200328020410572001200036020020032903082102200341106a2400200242388620024280fe0383422886842002428080fc0783421886200242808080f80f834208868484200242088842808080f80f832002421888428080fc07838420024228884280fe038320024238888484840b0f002000200120022003410c10f9010b0f002000200120022003410d10f9010b0f002000200120022003410910f9010b2f000240200320044d044020022004490d012000200420036b3602042000200120036a3602000f0b102c000b102c000bb40101037f230041106b22042400027f024020002d000845044020002802002205101222064190ce004b0d0141e0db082d00000d0141dcdb08200636020041e0db0841013a0000200441086a2006109f01200541002004280208200428020c106f1a200041013a00080b4101200120036a220041dcdb082802004b0d011a20042001200010a0012002200320042802002004280204105741000c010b200041003a00082005200120022003106f0b200441106a24000b3e01017f230041106b22022400200241086a41cc8d084190ce00200110d001200228020c21012000200228020836020020002001360204200241106a24000b32000240200120024d044020024190ce004d0d01102c000b102c000b2000200220016b3602042000200141cc8d086a3602000b1900200041feffffff0746044041e08508410d1003000b20000b4d01017f230041106b220124002000101241044604402001410036020c200041002001410c6a4104108a011a41feffffff072000200128020c41c58eb1a204461b21000b200141106a240020000b800101027f230041106b220324000240024020002d000404404190ce0041dcdb0828020022046b2002490d01200341086a2004200220046a220010a4012003280208200328020c20012002105741dcdb0820003602000c020b200028020020012002100f1a0c010b200010a501200028020020012002100f1a0b200341106a24000b3f01017f230041106b22032400200341086a2001200241cc8d084190ce00102b200328020c21012000200328020836020020002001360204200341106a24000b5801027f230041106b2201240020002d0004200041003a00040440200141086a410041dcdb0828020010a00120002802002001280208200128020c100f1a41dcdb08410036020041e0db0841003a00000b200141106a24000b0d002000416710201a416710120b0d002000102a220010201a20000b1200200010a6014504402000200110211a0b0b1200200010a6014504402000200110aa010b0b3801017f230041106b2202240020024200370308200220014100200241086a10820120002002280200200228020410b801200241106a24000b0a00200010a70110a2010bb90101047f230041206b22012400200010a701210210432104200210122100200141106a41003a00002001410c6a2000360200200120023602082001200036020420014100360200037f2000200346047f20012d0010044041dcdb08410036020041e0db0841003a00000b200141206a2400200405200110ad012100200110ae012102200110af0121032001200036021c20012003360218200120023602142004200141146a105920012802002103200128020421000c010b0b0b3302017f017e230041106b220124002001410036020c20002001410c6a2200410410b3012000410410b101200141106a2400a70b0900200041201087010b0c002000200010ad011087010b3a01017f230041106b22032400200341086a20014108200210d001200328020c21012000200328020836020020002001360204200341106a24000b3401017e02402001450d0003402001450d01200141016b210120003100002002420886842102200041016a21000c000b000b20020bfd0101067f230041306b22012400200010a701210210432104200210122100200141186a41003a0000200141146a2000360200200120023602102001200036020c20014100360208037f2000200346047f20012d0018044041dcdb08410036020041e0db0841003a00000b200141306a2400200405200141086a220210ad012103200210ae012105200210af01210641002100200141003a002f20022001412f6a410110b30102400240024020012d002f0e020201000b41ed8608410d108801000b410121000b200120003a002820012006360224200120053602202001200336021c20042001411c6a105520012802082103200128020c21000c010b0b0b2d00200041086a200028020020012002109e01044041a38508410f108801000b2000200028020020026a3602000b870101017f230041306b220224002002200136020820021035200220022d00043a00102002200228020036020c20022001101236021c200241003602182002200241086a3602140340200241206a200241146a10b50120022d002c410246450440200241206a2002410c6a10b6010c010b0b2000200228020c20022d001010b701200241306a24000bc50301077f230041d0006b22022400024020012802042204410d6a220820012802084d0440200128020020024200370035200242003703302802002004200241306a2203410d106f1a20024100360240200241286a20034100410410bf01200241406b220541042002280228200228022c105720022802402104200241c8006a41003a000020024200370340200241206a20034104410d10bf01200541092002280220200228022410572002410036024c200241186a20054100410410c001200241cc006a220741042002280218200228021c1057200228024c21032002410036024c200241106a20054104410810c00120074104200228021020022802141057200228024c2106200241003a004c200241086a20054108410910c001200741012002280208200228020c1057200020022d004c4100473a000c2000200641187420064180fe03714108747220064108764180fe0371200641187672723602082000200341187420034180fe03714108747220034108764180fe0371200341187672723602042000200441187420044180fe03714108747220044108764180fe037120044118767272360200200120083602040c010b200041023a000c0b200241d0006a24000b4d01017f230041106b220224002000280200200110bc012001200028020410bd01200041086a2802002001103e20022000410c6a2d00003a000f20012002410f6a410110a301200241106a24000b0d00200020012002103810211a0b0d00200020012002104d10211a0b870101017f230041306b220224002002200136020820021035200220022d00043a00102002200228020036020c20022001101236021c200241003602182002200241086a360214200241246a21010340200241206a200241146a10ba012002280220044020012002410c6a10bb010c010b0b2000200228020c20022d001010b701200241306a24000b890301067f230041406a22022400200020012802042203410c6a220620012802084d047f2001280200200241286a4100360200200242003703202802002003200241206a2203410c106f1a20024100360230200241186a20034100410410c101200241306a220541042002280218200228021c10572002280230210420024200370330200241106a20034104410c10c101200541082002280210200228021410572002410036023c200241086a20054100410410c2012002413c6a220741042002280208200228020c1057200228023c21032002410036023c200220054104410810c20120074104200228020020022802041057200228023c21052000410c6a200441187420044180fe03714108747220044108764180fe0371200441187672723602002000200341187420034180fe03714108747220034108764180fe03712003411876727236020420012006360204200041086a200541187420054180fe03714108747220054108764180fe03712005411876727236020041010541000b360200200241406b24000b1f002000280208200110bc012001200028020010bd0120002802042001103e0b4601017f230041106b220224002002200041187420004180fe03714108747220004108764180fe03712000411876727236020c20012002410c6a410410a301200241106a24000b810101037f230041106b220224000240024020002d000404402001101222044190ce0041dcdb0828020022036b4b0d01200241086a2003200320046a220010a401200141002002280208200228020c106f1a41dcdb0820003602000c020b20002802002001108b010c010b200010a50120002802002001108b010b200241106a24000b3802017f017e230041106b22012400200142003703082000200141086a22004108418a8508410b10c5012000410810b101200141106a24000b0f002000200120022003410d10f8010b0f002000200120022003410910f8010b0f002000200120022003410c10f8010b0f002000200120022003410810f8010b800201057f230041206b2202240020002001280204220341086a220520012802084d047f2001280200200242003703102802002003200241106a22034108106f1a2002410036021c200241086a20034100410410c2012002411c6a220641042002280208200228020c1057200228021c21042002410036021c200220034104410810c20120064104200228020020022802041057200228021c21032000200441187420044180fe03714108747220044108764180fe03712004411876727236020420012005360204200041086a200341187420034180fe03714108747220034108764180fe03712003411876727236020041010541000b360200200241206a24000b8a0101047f230041106b220324002001280204220241046a220420012802084b047f41000520012802002003410036020c28020020022003410c6a4104106f1a200328020c210220012004360204200241187420024180fe03714108747220024108764180fe037120024118767272210241010b21012000200236020420002001360200200341106a24000b3000200041086a200028020020012002109e0104402003200441a38508410f104c000b2000200028020020026a3602000b7801017f230041106b220224002002200042388620004280fe0383422886842000428080fc0783421886200042808080f80f834208868484200042088842808080f80f832000421888428080fc07838420004228884280fe038320004238888484843703082001200241086a410810a301200241106a24000bd60101067f230041406a2200240010c801105c2101200010c901105c3602082000104736020c200041286a22022001103241f7800841101033200028022c2201200041086a106420012000410c6a1064200041206a2201200041386a2203290300370300200041186a2204200041306a2205290300370300200020002903283703102000200041106a107c360204200210c901105c103241f5810841181033200028022c200041046a1078200120032903003703002004200529030037030020002000290328370310200041106a107c200041406b24000b0a00419588084112104d0b0a00418188084114104d0ba90302057f017e23004180016b2202240010cb0110ab012103200128020c210420012903002107200128020821010240200341feffffff07460440200141feffffff07460d01200110a101210120022004360214200220073703082002200136021010cc01105c2103200410292104200241e0006a22012003103241a18008410a1033200241406b22032001200241086a1084012001200310cd01200110344200210741feffffff0721010b200241e0006a2000103241c081084112103320022802641a200241286a2200200241f0006a2205290300370300200241206a2203200241e8006a2206290300370300200220022903603703180240200141feffffff074704402005200029030037030020062003290300370300200220022903183703602002107d360278200110a10121002002200436023c2002200737033020022000360238200241406b200241e0006a200241306a1083010c010b200241d0006a2000290300370300200241c8006a200329030037030020022002290318370340200220043602580b200241e0006a200241406b107620024180016a24000f0b41ca8808411f1041000b0a0041e88c084122104d0b0a0041fa8608411d104d0bff0202037f027e230041d0006b22022400200241306a2204200141106a290300370300200241286a2203200141086a290300370300200220012903003703202002107d36023802400240024002402001280218220110650e020102000b10472103200241086a2002280220200228022420042001106220022903082105200229032821062000107d3602182000200336021020002006370308200020053703000c020b20002002290320370300200041186a200241386a290300370300200041106a2004290300370300200041086a20032903003703000c010b200241406b2001109701027f200229034050044020022802302101200241106a200228022020022802242002280248200228024c106d2002280210210320022802140c010b10472101200241186a200228022020022802242002280230200241406b106c20022802182103200228021c0b2104200229032821052000107d360218200020013602102000200537030820002004360204200020033602000b200241d0006a24000b0d002000106141ff017141014b0b17002000280200200128020010890141ff017141ff01460b3b01017f230041106b22042400200441086a4100200320012002102b200428020c21012000200428020836020020002001360204200441106a24000b0a0041bd8808410d104d0b0a0041f28708410f104d0b0a0041dd87084115104d0b0a0041a788084116104d0b1901017f419787084116104d210120002802002001104020010b1901017f41ad87084118104d210120002802002001104020010b0a0041c587084118104d0b0a00418f8c08411d104d0b0a0041ac8c08411d104d0b0a0041c98c08411f104d0ba705020d7f027e230041406a220024001022410a105a410041bd8808410d105021094101104b210241024195880841121050210a410341818808411410502105410441f28708410f1050210641051011210d41061011210e410710582107410810512108410941fa8608411d10502104200020083602102000200736020c2005102f1032210141e68108410f104d21031043210b107d210c10162001200c2003200b10452101101720011012210320004100360230200020013602282000200341027636022c200041286a22031075102f10a201210120032004102f102f103241ab8008411510332003108001210302400240200141feffffff074704402001102f10a101200210300d0141e9880841d1001041000b200220031030450d010b10cc01200410a80110d901200310a801024010cb01220410a6010d00200141feffffff074704402004200110211a0c010b200441ed8508410410b8010b10d101200910a80110d401200210a80110c801200a10a80110c9012005102f10a80110d801200041286a22012005103241b68108410a1033200110800110a80110d2012006102f10a80110da0120012006103241868308410f1033200110800110a80120002007101236021c2000410036021820002000410c6a36021403400240200041286a200041146a10c301200028022845044020002008101236021c200041003602182000200041106a3602140340200041286a200041146a10c3012000280228450d022000200028023022013602242000200028022c360220200041206a10d501220210a6010d002002200110b4010c000b000b2000200028023022013602242000200028022c360220200041206a10d601220210a6010d012002200110b9010c010b0b10d301200d10a90110d701200e10a901200041406b24000f0b41ba890841c8001041000b080010224100105a0bc70101057f230041306b220024004100105a02400240104610d101105c10300440104610d101105c1030450d012000104a220136020810d40110a701210210c901105c2103200020011012360214200041003602102000200041086a36020c200041206a210103400240200041186a2000410c6a10672000290318500d00200028022c200028022820021030450d0410ce01450d042003102f200110ca010c010b0b200041306a24000f0b41828a0841161041000b41828a0841161041000b41988a08410d1041000bc70702097f017e23004180016b2200240010224101105a2000104f36022c10d101105c210102400240024010462207200110300440200010c901105c2201360234200041e0006a22022001102f1032418d82084118103320002802642000412c6a1078200041d8006a2201200041f0006a2206290300370300200041d0006a2203200041e8006a220429030037030020002000290360370348200041c8006a2205107c2108200210c801105c103241e18008410a103320002802642202200041346a10642002410020081079200120062903003703002003200429030037030020002000290360370348200041386a2005107e200028024410ce01450d0120002802341032210141a582084106104d21041043220341012000107910432202200041386a1044200020013602702000427f37036820002003360264200020043602602000107d22053602780240024002400240200210650e020200010b200041c8006a2002109701027f2000290348500440200041186a2004200320002802502000280254106d20002802182104200028021c0c010b1047200041206a200420032001200041c8006a106c20002802202104210120002802240b2103107d21050c010b10472101200041106a20042003200620021062200029036821092000280214210320002802102104107d21052009427f520d010b101621090b2009200120052004200310452101101720011012210220004100360250200020013602482000200241027636024c200041c8006a1075220210122101200041f0006a41003a0000200041ec006a2001360200200020023602682000200136026420004100360260200041e0006a2201418a8508410b103a10a2012102200110be01210920011039210120002802642000280260470d0220002d0070044041dcdb08410036020041e0db0841003a00000b0240200241feffffff07470440200210a10121030c010b10d90110a701210310cc01105c200110291031420021090b200110ce01450d03200720032009200110422000200136026c20002003360268200020093703602000200041e0006a1095012201360230200041086a1035200020002d000c3a003c200020002802083602382000200110123602502000410036024c2000200041306a3602480340200041e0006a200041c8006a106720002903605045044020002802742000280270200041386a2201103e2000290368200110c6012001103c0c010b0b200028023820002d003c103720004180016a24000f0b41828a0841161041000b41e78a08411f1041000b418a8508410b41958508410e104c000b41868b08411a1041000bf31d02167f027e230041a0026b2200240010224100105a10c801105c2101200010c901105c2214102f1096013602f001200010433602a00120004180026a22092001103241eb8008410c10332000280284022201410010810120014101108101200141001081012001200041f0016a2211107b2001200041a0016a2207107b200041e0016a220520004190026a2204290300370300200041d8016a220220004188026a220329030037030020002000290380023703d001200041d0016a2206107f10d201105c210120002014102f1096013602f001200010433602a00120092001103241eb8008410c10332000280284022201410010810120012011107b20012007107b2001410120001079200520042903003703002002200329030037030020002000290380023703d0012006107f102a2203102a22061023200610ce01044010cc01105c20061029103110d90110a70121012000200636028c0220004200370380022000200136028802200320004180026a10440b200020033602900102400240024020031065044010d40110a701210e107d210d2000200028029001101236029c012000410036029801200020004190016a3602940120004190026a210a200041c0016a210f200041a8016a21150340200041a0016a20004194016a106720002903a00150044042808090bbbad6adf00d102e2101200d10d301105f102e1092012001108d012205200d10d701105f102e1092012001108d012206109101200d10890141ff01714102490d05200d200510930120061090012102200e102f210120002002102936028c0220004200370380022000200136028802201420004180026a10ca01200e102f2101200510ce010440104620014200200510420b200610ce0104401048200e4200200610420b104321041043102f2106200141feffffff07460d032001200610400c040b200f201541086a290300370300200020152903003703b801200f10d60110ac012112200f10d50110b2012113200f280200210c20002802c401210420002903b801211620121012210120131012410d6e2001410c6e6a21114100210103400240024020012011470440200141016a2106410021022012101221050240024003402002410c6a220320054b0d0120004188026a2209410036020020004200370380022012200220004180026a2202410c108a011a200041003602d00120004188016a20024100410410c101200041d0016a22074104200028028801200028028c01105720002802d0012108200042003703d00120004180016a20024104410c10c101200741082000280280012000280284011057200041003602f001200041f8006a20074100410410c201200041f0016a220241042000280278200028027c105720002802f001210b200041003602f001200041f0006a20074104410810c2012002410420002802702000280274105720032102200841187420084180fe03714108747220084108764180fe0371200841187672722001470d000b20002802f0012103200b411874200b4180fe037141087472200b4108764180fe0371200b4118767272102f2101200341187420034180fe03714108747220034108764180fe0371200341187672722207102f21054101102d20004180026a22032001103241d986084114103320002802840222012005106e20011070200041e0016a2202200a290300370300200041d8016a2201200929030037030020002000290380023703d001104321052000200436028c022000200c360288022000201637038002200520031044200a200229030037030020092001290300370300200020002903d001370380022000107d360298020240024002400240200510650e020102000b10472101200041e8006a200028028002200028028402200a200510622000290368211720002903880221162000107d3602e801200020013602e001200020163703d801200020173703d0010c020b200041e8016a20004198026a2903003703002002200a2903003703002001200929030037030020002000290380023703d0010c010b200041f0016a22012005109701200041d0016a20004180026a20011083010b20004180026a200041d0016a1076200028028802220c20071030450d01200028028c0221042000290380022116200621010c050b4100210220131012210503402002410d6a220320054b0d03200042003700850220004200370380022013200220004180026a2202410d108a011a200041003602d001200041e0006a20024100410410bf01200041d0016a2208410420002802602000280264105720002802d0012109200041d8016a220b41003a0000200042003703d001200041d8006a20024104410d10bf01200841092000280258200028025c1057200041003602f001200041d0006a20084100410410c001200041f0016a2202410420002802502000280254105720002802f0012110200041003602f001200041c8006a20084104410810c001200241042000280248200028024c105720002802f0012107200041003a00f001200041406b20084108410910c0012002410120002802402000280244105720032102200941187420094180fe03714108747220094108764180fe0371200941187672722001470d000b20002d00f001200741187420074180fe03714108747220074108764180fe0371200741187672722108200c102f2109200410292107201041187420104180fe03714108747220104108764180fe037120104118767272102f21054504404101102d20004180026a22012005103241a88608410810332000280284021070200041e0016a2202200a290300370300200b20004188026a220329030037030020002000290380023703d001104321042000200736028c0220002009360288022000201637038002200420011044200a20022903003703002003200b290300370300200020002903d001370380022000107d360298020240024002400240200410650e020102000b10472101200041106a200028028002200028028402200a200410622000290310211720002903880221162000107d3602e801200020013602e001200020163703d801200020173703d0010c020b200041e8016a20004198026a2903003703002002200a290300370300200b200329030037030020002000290380023703d0010c010b200041f0016a2004109701027f20002903f0015004402000280290022103200041186a20002802800220002802840220002802f80120002802fc01106d200028021c210220002802180c010b10472103200041206a200028028002200028028402200028029002200041f0016a106c2000280224210220002802200b210120002903880221162000107d3602e801200020033602e001200020163703d801200020023602d401200020013602d0010b200041d0016a107221032008102f21012000200336028c022000420037038002200020013602880220004180026a10950121010c040b2008102f21044101102d20051032210341a886084108104d2101104322052004106e20051070104321042000200736028c0220002009360288022000201637038002200420004180026a104420002003360290022000427f37038802200020053602840220002001360280022000107d36029802027f027e024002400240200410650e020102000b10472102200041286a200028028002200028028402200a20041062200028022c2103200028022821012000290388020c020b20002802900221022000290388022116200028028402210320002802800221012000280298020c020b200041d0016a2004109701027f20002903d0015004402000280290022102200041306a20002802800220002802840220002802d80120002802dc01106d2000280234210320002802300c010b10472102200041386a200028028002200028028402200028029002200041d0016a106c200028023c210320002802380b21012000290388020b2116107d0b21042016427f51047e10160520160b200220042001200310452103101741002102200310122101200041003602f801200020033602f001200020014102763602f401200041f0016a1075102f210410432101200410122103200041003a0090022000200336028c0220002004360288022000200336028402200041003602800203402002200346044020002d009002450d0541dcdb08410036020041e0db0841003a00000c0505200041d0016a220320004180026a1077200120031044200028028002210220002802840221030c010b000b000b41c0860841191041000b200c200e10300440200d2004108f010c040b41d48a0841131041000b200041086a1036200020002d000c3a008402200020002802083602800220004180026a220641808008412110a301230041406a220324002003410020036b41037122046a210720040440200321020340200241003a0000200241016a22022007490d000b0b200741c00020046b2205417c7122046a2102200441004a0440034020074100360200200741046a22072002490d000b0b200541037122040440200220046a21040340200241003a0000200241016a22022004490d000b0b20062003027f200104402001ad2116413f2101024003402016500d012001413f4d0440200120036a20162016420a802216420a7e7da74130723a0000200141016b21010c010b0b102c000b200141016a0c010b200341303a003f413f0b22016a41c00020016b10a301200341406b240020002802800220002d00840210381000000b200020013602cc01107d2102107d21042000200110123602d801200041003602d4012000200041cc016a3602d00102400340024020004180026a200041d0016a1067200029038002500d002000280294022105200221032000280290022201200c103045044020042103200120081030450d030b20032005108f010c010b0b2008102f210c42002116200621010c010b0b0b4187860841211041000b41a58a0841151041000b200041808080203602d0012006200041d0016a4104100f1a200641ed85084104100f1a0b200042003703d0012006200041d0016a22034108100f1a20052006103f20042006104e10c70110432201418a8d084108104d104e20021043102f2202103f2002103f200120021024200020043602d00120002004101236028802200041003602840220002003360280020340200020004180026a10c40120002802000440200028020410071a0c010b0b200041a0026a24000f0b41ba8a08411a1041000b0d0010224100105a10c70110250b0d0010224100105a10d101105b0b0d0010224100105a10d401105d0b0d0010224100105a10d801105d0b2a01017f10224100105a10cb0110ab01220041feffffff07470440200010071a0f0b41ed8508410410260b0d0010224100105a10da01105d0b0d0010224100105a10c801105b0b0d0010224100105a10c901105b0b0d0010224100105a10cc01105b0b0d0010224100105a10d901105d0b0d0010224100105a10d201105b0ba10101027f230041406a2200240010224101105a20004100104b3602142000200041146a10d60110ac012201360218200041086a1035200020002d000c3a00202000200028020836021c20002001101236022c200041003602282000200041186a360224200041346a21010340200041306a200041246a10ba012000280230044020012000411c6a10bb010c010b0b200028021c20002d00201037200041406b24000ba00101027f230041406a2200240010224101105a20004100104b3602142000200041146a10d50110b2012201360218200041086a1035200020002d000c3a00202000200028020836021c20002001101236022c200041003602282000200041186a3602240340200041306a200041246a10b50120002d003c4102470440200041306a2000411c6a10b6010c010b0b200028021c20002d00201037200041406b24000b0d0010224100105a10d301105e0b0d0010224100105a10d701105e0be30302057f027e23004190016b2200240010494100105a2000104a2201360214024020011065410146044020011012210120004100360234200020013602302000410036022c2000200041146a3602282000413c6a2102200041f4006a2103200041f8006a21010340200041f0006a200041286a10672000290370500d02200041e0006a200141086a290300220537030020002001290300220637035820002000280234220441016a360234200341086a200537020020032006370200200041406b2001290200370300200041c8006a20004180016a280200360200200020002902703703382004450440200041206a200241086a290200370300200020022902003703180c010b0b102c000b41b3830841221003000b200041086a2201200041206a2903003703002000200029031837030010da0110a701210220012802002002103045044041988a08410d1041000b10d201105c21022000104336021820001043360228200041f0006a22012002103241a783084105103320002802742202200041186a107b2002200041286a107a200041e8006a20004180016a290300370300200041e0006a200041f8006a29030037030020002000290370370358200041386a2202200041d8006a20001084012001200210cd012001107420004190016a24000b8c0101027f230041406a2200240010494100105a10d201105c21012000104336020020001043360204200041086a200110324195830841121033200028020c22012000107b2001200041046a107a200041306a200041186a290300370300200041286a200041106a290300370300200020002903083703202000107d360238200041206a1074200041406b24000bff0102057f017e230041306b22002400102210494101105a2000104f36021010d201105c20001043360214200010433602181032210241ac83084107104d210310432201200041106a10782001200041146a107b2001200041186a107a107d210410162002200420032001104521011017200110122102200041003602242000200136021c200020024102763602202000411c6a107521012000420037032820011012220241094904400240200041086a200041286a200210b0012001410020002802082201200028020c2202108a011a2001200210b10122054280808080105a0d0020051014200041306a24000f0b0b418a8508410b41958508410e104c000b980302057f017e230041e0006b220024001022104941e4db08101336020041e4db08280200410048044041ef830841111003000b2000410036023810432103200041386a22042802002101034041e4db0828020020014a04402004200141016a220236020020032001104b104e200221010c010b0b2003210141e4db0828020020002802384a04404180840841121003000b2000200136021c200410d201105c103241f98208410d103320002001101236025c2000410036025820002000411c6a360254200028023c21010340200041106a200041d4006a10c4012000280210044020012000280214106e0c010b0b200041286a200041406b290300370300200041306a200041c8006a29030037030020002000290338370320200041386a200041206a107e02402000280244220110ce01450440200028024021020c010b1046200028024022024200200110420b2000290338200041086a1035200020002d000c3a003c200020002802083602382002200041386a2202103e200210c60120012002103c200028023820002d003c1037200041e0006a24000b3101017e102210494101105a41001011220042818090bbbad6adf00d5a044041ef8b0841201041000b10d701200010aa010b3101017e102210494101105a41001011220042818090bbbad6adf00d5a044041d28b08411d1041000b10d301200010aa010be30101037f230041306b22002400102210494102105a410010582101200041011051220236020c20002001360208200020011012360218200041003602142000200041086a36021003402000411c6a200041106a10c301200028021c044020002000280224220136022c20002000280220360228200041286a10d601200110b9010c01052000200210123602182000410036021420002000410c6a36021003402000411c6a200041106a10c301200028021c044020002000280224220136022c20002000280220360228200041286a10d501200110b4010c010b0b200041306a24000b0b0baa07020b7f017e230041306b2200240010224100105a10c901105c2209102f1032210141d281084114104d210210432106107d21071016200120072002200610452101101720011012210220004100360210200020013602082000200241027636020c200041086a1075220210122101200041286a41003a0000200041246a2001360200200020023602202000200136021c200041003602180240027f024002402001450d00024002400240200041186a418a8508410b105441ff01710e020201000b418a8508410b41ed8608410d104c000b41012103200041186a418a8508410b105321010b200028021c2000280218470d0320002d0028044041dcdb08410036020041e0db0841003a00000b2003450d00200041186a22042001102f103241e482084115103320002004107c220336020020042001102f103241b28208410b1033200041186a107c42be8a860f102e108e01210620042001102f103241c98208410d1033200041186a107c200310920142be8a860f102e108e01410a102d4112109401108d01210720042001102f103241bd8208410c1033200041186a107c410a102d41121094012003109001108e0142be8a860f102e108e01410a102d4112109401108d01210a20042009102f2202102f103241878108410f10332000200041186a107c220536021420042002102f103241ab820841071033200041186a107c210820042002103241a6810841101033200041186a107c2102200020082005109101200210900136020820042001103241d68208410e1033200028021c2201200041146a10782001200041086a107820002802282102200028021821052000290320107d21081071200220082005200110452101101720002001107336020442808090bbbad6adf00d102e21022000107d360218200041046a200410cf012105107d220120050d021a2001200028020410890141016a41ff017141014d0440200041046a200010cf010d02200028020021030b20002802042003109301200a108e012101410a102d4112109401200028020010900121032006200210920120072002109201108c0120012002108e012003108d01108c010c020b41a08b0841321041000b2000280204200710920121012006200210920120012002108e012000280200108d01108c010b2101200041186a22032009103241968108411010332003107c2102410a102d411210940121032000280204200110920120032002109301108e0120034103109401108d011025200041306a24000f0b418a8508410b41958508410e104c000b0300010b3c01017f230041106b22052400200541086a2001200420022003109d01200528020c21012000200528020836020020002001360204200541106a24000b3b01017f230041106b22052400200541086a2002200320012004102b200528020c21012000200528020836020020002001360204200541106a24000b0bda0d0200418080080bc60d4e6f2073776170206f7065726174696f6e20666f756e6420617420696e64657820756e7772617045676c646765745772617070656445676c64546f6b656e49647772617045676c64726563697069656e742061646472657373206e6f7420736574657869744d61726b6574636c61696d526577617264736765744163636f756e74546f6b656e73676574546f74616c426f72726f777367657452657365727665466163746f72676574546f74616c5265736572766573676574546f6b656e49646d696e74416e64456e7465724d61726b6574676574496e746572657374526174654d6f64656c676574556e6465726c79696e674964746f6b656e73546f556e6465726c79696e67416d6f756e74756e6465726c79696e67416d6f756e74546f546f6b656e7372656465656d6765744361736867657442617365526174656765744c617374536c6f70656765744669727374536c6f70656765745574696c697a6174696f6e6765744f7074696d616c5574696c697a6174696f6e636c61696d4d756c7469706c656765745374616b65546f6b656e4964726562616c616e6365506f7274666f6c696f7374616b65756e7374616b65696e636f7272656374206e756d626572206f662045534454207472616e7366657273617267756d656e74206465636f6465206572726f722028293a20746f6f2066657720617267756d656e7473746f6f206d616e7920617267756d656e747377726f6e67206e756d626572206f6620617267756d656e747363616e6e6f74207375627472616374206265636175736520726573756c7420776f756c64206265206e656761746976654d756c7469455344544e46545472616e73666572455344544e46545472616e73666572455344545472616e7366657273796e6320726573756c74696e70757420746f6f206c6f6e67696e70757420746f6f2073686f72746361737420746f20693634206572726f724d616e6167656456656320696e646578206f7574206f662072616e67654553445420657870656374656445474c4473746f72616765206465636f6465206572726f723a20756e6b6e6f776e20726563656976656420746f6b656e206166746572207377617065786368616e6765626164206172726179206c656e67746877726f6e672072657475726e6564207377617020746f6b656e73776170546f6b656e734669786564496e707574696e76616c69642076616c7565777261707065645f65676c645f636f6e74726163745f61646472657373636f6d706f756e645f617368737761705f7377617073636f6d706f756e645f7865786368616e67655f7377617073706572666f726d616e63655f666565735f70657263656e74636f6d706f756e645f666565735f70657263656e74626f6f737465725f616464726573736d6f6e65795f6d61726b65745f61646472657373636f6e74726f6c6c65725f6164647265737361737365745f746f6b656e5f6964656e7469666965727661756c745f616464726573737061796d656e742073686f756c6420626520616e204553445420746f6b656e54686520617373657420746f6b656e206964656e74696669657220616e6420746865206d6f6e6579206d61726b657420756e6465726c79696e67206964656e74696669657220646f6e2774206d617463685768656e20746172676574696e6720616e2045474c44206d61726b65742074686520617373657420746f6b656e206964656e7469666965722073686f756c64206265205745474c4443616c6c65722073686f756c64206265207661756c7477726f6e67207061796d656e746e6f2072657761726420746f20636f6d706f756e646e6f206c65667420616d6f756e7420746f20636f6d706f756e6477726f6e67207377617070656420746f6b656e6e6f2065786974206d61726b6574207061796d656e742072656365697665646e6f2072656465656d207061796d656e742072656365697665644e6f20696e7465726573742072617465206d6f64656c2070726573656e74206f6e20746865206d6f6e6579206d61726b65746e657720636f6d706f756e6420666565732065786365656420313030256e657720706572666f726d616e636520666565732065786365656420313030256d6f6e65795f6d61726b65745f746f6b656e5f6964656e746966696572777261707065645f65676c645f746f6b656e5f6964656e746966696572626f6f737465725f7374616b65645f746f6b656e5f6964656e7469666965726d6f6e65795f6d61726b65745f756e6465726c79696e675f6964656e746966696572636f6d706f756e64456e64706f696e742063616e206f6e6c792062652063616c6c6564206279206f776e6572000070616e6963206f636375727265640041c88d080b049cffffff@0500@0100@0000000000000000000000000000000000000000000000000000000000000000@5745474c442d613238633539@00000000000000000500a3b666902d5f4bbf0ff93748fb915aeb43124cbf6509@0000000000000000050032de4f40f17a2f41c4e40c21f596e36a846994e36509@00000000000000000500f8836686f7c6c0f13d7275151b78f59f8f2f729a6509@@@@@000000000000000005000b1e5b244325095849f4e37134661d5bfdcd925e7ceb",
+      "signature": "edf0ec99b6f60414fa5e36d40cfb1d0075d01fd7c4ad7ba59bbe62b8b48eb892beb0c18bba203ff32b83827c3953847b190cdc89a4806f4615565dc2b3b5940f",
+      "sourceShard": 1,
+      "destinationShard": 1,
+      "blockNonce": 2127577,
+      "blockHash": "e3aea17b5345b45f61b233834d3b4ba0ac6f2b7d53eb3f1b1cf2bf0534ba567f",
+      "notarizedAtSourceInMetaNonce": 2129029,
+      "NotarizedAtSourceInMetaHash": "73ee8458f55bf5c9ea4a9974c0c838ced51a236c2b13238761f444598f40575e",
+      "notarizedAtDestinationInMetaNonce": 2129029,
+      "notarizedAtDestinationInMetaHash": "73ee8458f55bf5c9ea4a9974c0c838ced51a236c2b13238761f444598f40575e",
+      "miniblockType": "TxBlock",
+      "miniblockHash": "cc7e81e68269c2c633daf997fd2d52fc82d8ba3bb699d7e75250008bd9b7aa29",
+      "hyperblockNonce": 2129029,
+      "hyperblockHash": "73ee8458f55bf5c9ea4a9974c0c838ced51a236c2b13238761f444598f40575e",
+      "timestamp": 1707144290,
+      "status": "success",
+      "operation": "scDeploy",
+      "initiallyPaidFee": "82333950000000000",
+      "chainID": "D",
+      "version": 1,
+      "options": 0
+    }
+  },
+  "error": "",
+  "code": "successful"
+}
+        "#;
+
+        let tx_on_network: TransactionOnNetwork = serde_json::from_str::<TransactionInfo>(data)
+            .unwrap()
+            .data
+            .unwrap()
+            .transaction;
+        let tx_response = TxResponse::from_network_tx(tx_on_network);
+        let opt_address = tx_response.new_deployed_address.map(|e| multiversx_sdk::data::address::Address::from_bytes(e.as_array().clone()).to_bech32_string().unwrap());
+
+        let expected = Some("erd1qqqqqqqqqqqqqpgqwpdf84ggxzqzmr2zmw959q4nlf9nz562q33sak25ze".to_string());
+
+        assert_eq!(opt_address, expected)
+    }
+
+    #[test]
+    fn test_deployed_address_should_be_none_if_not_a_sc_deployment_tx() {
+        let data = r#"
+        {
+  "data": {
+    "transaction": {
+      "type": "normal",
+      "processingTypeOnSource": "BuiltInFunctionCall",
+      "processingTypeOnDestination": "SCInvoking",
+      "hash": "238ad6dbe75dab1d53caeb9cabd584aabc6fc113c849a983afef5a5e439ce9e5",
+      "nonce": 13,
+      "round": 2192628,
+      "epoch": 888,
+      "value": "0",
+      "receiver": "erd1qqqqqqqqqqqqqpgqydwpdrplefjlwp3sp9xmn3vevdxdelfkwmfsw6e5xw",
+      "sender": "erd179xw6t04ug48m74jzyw9zq028hv66jhqayelzpzvgds0ptnzmckq2jf07f",
+      "gasPrice": 1000000000,
+      "gasLimit": 20000000,
+      "data": "RVNEVFRyYW5zZmVyQDRmNTU1MjRmMmQ2NDM4MzEzNzMxNjZAMDI0NmQyZDBiNmI1ZjBANjI3NTc5QDFiYzE2ZDY3NGVjODAwMDA=",
+      "signature": "ce984b4d785ccc7aca4b1cdea57ddcd568a502209f81e6b5bc678e1dd52b78d764fe46ea3ff77b926eb9f70eb52ae8f3f2afa2e9d0efa82655e361641458b900",
+      "sourceShard": 0,
+      "destinationShard": 1,
+      "blockNonce": 2129490,
+      "blockHash": "0ab10909b27565c5b7b59e8e1ee4a68d7046f49225fcde4c12d4b1ea3f512b8a",
+      "notarizedAtSourceInMetaNonce": 2130938,
+      "NotarizedAtSourceInMetaHash": "0c545160fd37f09f0196505b9cd2e730596bcd99438978a5bb415b9e1be1849d",
+      "notarizedAtDestinationInMetaNonce": 2130942,
+      "notarizedAtDestinationInMetaHash": "1ddd6b7aeeff824b5d11f2936a6284e470fc5abe41e34a8df229b719dc1a537d",
+      "miniblockType": "TxBlock",
+      "miniblockHash": "dc8ae41e1ae321c0fccbeb807194d11ff6e0f4ed71163764d850f1daaa60bd22",
+      "hyperblockNonce": 2130942,
+      "hyperblockHash": "1ddd6b7aeeff824b5d11f2936a6284e470fc5abe41e34a8df229b719dc1a537d",
+      "timestamp": 1707155768,
+      "status": "success",
+      "tokens": [
+        "OURO-d8171f"
+      ],
+      "esdtValues": [
+        "640821212132848"
+      ],
+      "operation": "ESDTTransfer",
+      "function": "buy",
+      "initiallyPaidFee": "359390000000000",
+      "chainID": "D",
+      "version": 1,
+      "options": 0
+    }
+  },
+  "error": "",
+  "code": "successful"
+}
+        "#;
+
+        let tx_on_network: TransactionOnNetwork = serde_json::from_str::<TransactionInfo>(data)
+            .unwrap()
+            .data
+            .unwrap()
+            .transaction;
+        let tx_response = TxResponse::from_network_tx(tx_on_network);
+        let opt_address = tx_response.new_deployed_address;
+
+        let expected: Option<Address> = None;
+
+        assert_eq!(opt_address, expected)
+    }
+
     #[test]
     fn test_with_tx_that_has_sc_result() {
         // transaction data from the devnet, an artificial "10" result has been appended on the original result
diff --git a/sdk/core/src/data/transaction.rs b/sdk/core/src/data/transaction.rs
index 585cdb49ca..452f0d3679 100644
--- a/sdk/core/src/data/transaction.rs
+++ b/sdk/core/src/data/transaction.rs
@@ -72,6 +72,7 @@ pub struct TransactionOnNetwork {
     pub notarized_at_source_in_meta_hash: String,
     pub notarized_at_destination_in_meta_nonce: u64,
     pub notarized_at_destination_in_meta_hash: String,
+    pub processing_type_on_destination: String,
     pub miniblock_type: String,
     pub miniblock_hash: String,
     pub timestamp: u64,

From 44337948fe91817fffc52cec33447ad9a4f50640 Mon Sep 17 00:00:00 2001
From: Fusee <quentus123@orange.fr>
Date: Tue, 6 Feb 2024 10:07:43 +0100
Subject: [PATCH 0324/1254] clippy

---
 .../scenario/src/scenario/model/transaction/tx_response.rs      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/framework/scenario/src/scenario/model/transaction/tx_response.rs b/framework/scenario/src/scenario/model/transaction/tx_response.rs
index c4aac6bc9e..0f738c26dc 100644
--- a/framework/scenario/src/scenario/model/transaction/tx_response.rs
+++ b/framework/scenario/src/scenario/model/transaction/tx_response.rs
@@ -313,7 +313,7 @@ mod tests {
             .unwrap()
             .transaction;
         let tx_response = TxResponse::from_network_tx(tx_on_network);
-        let opt_address = tx_response.new_deployed_address.map(|e| multiversx_sdk::data::address::Address::from_bytes(e.as_array().clone()).to_bech32_string().unwrap());
+        let opt_address = tx_response.new_deployed_address.map(|e| multiversx_sdk::data::address::Address::from_bytes(*e.as_array()).to_bech32_string().unwrap());
 
         let expected = Some("erd1qqqqqqqqqqqqqpgqwpdf84ggxzqzmr2zmw959q4nlf9nz562q33sak25ze".to_string());
 

From 9f684a81ac78b2a8efe6d45c4ff7c70dce745943 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 6 Feb 2024 12:39:11 +0200
Subject: [PATCH 0325/1254] unified syntax - deploy functionality in contracts

---
 .../src/forwarder_raw_deploy_upgrade.rs       |  17 +--
 .../forw_raw_contract_deploy.scen.json        |   1 -
 .../base/src/types/interaction/deploy_call.rs |  63 ++++++++++
 framework/base/src/types/interaction/mod.rs   |   3 +
 framework/base/src/types/interaction/tx.rs    |  89 +++++++++++--
 .../src/types/interaction/tx_call_deploy.rs   | 119 ++++++++++++++++++
 .../base/src/types/interaction/tx_data.rs     |  10 +-
 .../base/src/types/interaction/tx_payment.rs  |  28 +++++
 .../base/src/types/interaction/tx_rh_list.rs  |   2 +
 .../interaction/tx_rh_list/returns_bt.rs      |  18 ++-
 .../tx_rh_list/returns_new_address.rs         |  31 +++++
 .../interaction/tx_rh_list/returns_raw.rs     |  18 ++-
 12 files changed, 378 insertions(+), 21 deletions(-)
 create mode 100644 framework/base/src/types/interaction/deploy_call.rs
 create mode 100644 framework/base/src/types/interaction/tx_call_deploy.rs
 create mode 100644 framework/base/src/types/interaction/tx_rh_list/returns_new_address.rs

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 1f89186e0e..da9684608a 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
@@ -9,14 +9,15 @@ pub trait ForwarderRawDeployUpgrade {
         code_metadata: CodeMetadata,
         args: MultiValueEncoded<ManagedBuffer>,
     ) -> MultiValue2<ManagedAddress, ManagedVec<Self::Api, ManagedBuffer>> {
-        self.send_raw()
-            .deploy_contract(
-                self.blockchain().get_gas_left(),
-                &BigUint::zero(),
-                &code,
-                code_metadata,
-                &args.to_arg_buffer(),
-            )
+        self.tx()
+            .deploy()
+            .code(code)
+            .code_metadata(code_metadata)
+            .arguments_raw(args.to_arg_buffer())
+            .with_gas_limit(self.blockchain().get_gas_left())
+            .returns(ReturnsNewAddress)
+            .returns(ReturnsRaw)
+            .execute_deploy()
             .into()
     }
 
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 dfaf89f427..641dd34347 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
@@ -88,7 +88,6 @@
             },
             "expect": {
                 "out": [
-                    "str:some_argument",
                     "sc:child-with-arg",
                     "nested:str:some_argument"
                 ],
diff --git a/framework/base/src/types/interaction/deploy_call.rs b/framework/base/src/types/interaction/deploy_call.rs
new file mode 100644
index 0000000000..ae7c2c9541
--- /dev/null
+++ b/framework/base/src/types/interaction/deploy_call.rs
@@ -0,0 +1,63 @@
+use multiversx_sc_codec::TopEncodeMulti;
+
+use crate::types::{CodeMetadata, ManagedBuffer, ManagedBufferCachedBuilder};
+
+use super::{FunctionCall, ManagedArgBuffer, Tx, TxData, TxEnv, TxFrom, TxGas, TxPayment, TxTo};
+
+/// Holds deploy data: code, code metadata, and arguments.
+pub struct DeployCall<Env>
+where
+    Env: TxEnv,
+{
+    pub code: ManagedBuffer<Env::Api>,
+    pub code_metadata: CodeMetadata,
+    pub arg_buffer: ManagedArgBuffer<Env::Api>,
+}
+
+impl<Env> Default for DeployCall<Env>
+where
+    Env: TxEnv,
+{
+    fn default() -> DeployCall<Env> {
+        DeployCall {
+            code: ManagedBuffer::new(),
+            code_metadata: CodeMetadata::DEFAULT,
+            arg_buffer: ManagedArgBuffer::new(),
+        }
+    }
+}
+
+impl<Env> TxData<Env> for DeployCall<Env>
+where
+    Env: TxEnv,
+{
+    fn is_no_call(&self) -> bool {
+        false
+    }
+
+    fn to_call_data_string(&self) -> ManagedBuffer<Env::Api> {
+        // Implement as needed for deployment-specific data
+        let mut result = ManagedBufferCachedBuilder::default();
+        result.append_managed_buffer(&self.code);
+        // Add other fields as needed
+        result.into_managed_buffer()
+    }
+}
+
+impl<Env> DeployCall<Env>
+where
+    Env: TxEnv,
+{
+    /// Adds an argument of any serializable type.
+    ///
+    /// Multi-values are accepted. No type checking performed.
+    pub fn argument<T: TopEncodeMulti>(mut self, arg: &T) -> Self {
+        self.arg_buffer.push_multi_arg(arg);
+        self
+    }
+
+    pub fn arguments_raw(mut self, raw: ManagedArgBuffer<Env::Api>) -> Self {
+        self.arg_buffer = raw;
+        self
+    }
+}
diff --git a/framework/base/src/types/interaction/mod.rs b/framework/base/src/types/interaction/mod.rs
index 52ae318321..ebacd944c6 100644
--- a/framework/base/src/types/interaction/mod.rs
+++ b/framework/base/src/types/interaction/mod.rs
@@ -15,6 +15,7 @@ mod contract_call_with_egld;
 mod contract_call_with_egld_or_single_esdt;
 mod contract_call_with_multi_esdt;
 mod contract_deploy;
+mod deploy_call;
 mod expr_address;
 mod expr_sc;
 mod function_call;
@@ -22,6 +23,7 @@ mod managed_arg_buffer;
 mod tx;
 mod tx_call_async;
 mod tx_call_async_promises;
+mod tx_call_deploy;
 mod tx_call_sync;
 mod tx_call_te;
 mod tx_data;
@@ -51,6 +53,7 @@ pub use contract_call_with_egld::ContractCallWithEgld;
 pub use contract_call_with_egld_or_single_esdt::ContractCallWithEgldOrSingleEsdt;
 pub use contract_call_with_multi_esdt::ContractCallWithMultiEsdt;
 pub use contract_deploy::{new_contract_deploy, ContractDeploy};
+pub use deploy_call::*;
 pub use expr_address::AddressExpr;
 pub use expr_sc::ScExpr;
 pub use function_call::FunctionCall;
diff --git a/framework/base/src/types/interaction/tx.rs b/framework/base/src/types/interaction/tx.rs
index df1249bbe7..283a1c656d 100644
--- a/framework/base/src/types/interaction/tx.rs
+++ b/framework/base/src/types/interaction/tx.rs
@@ -1,17 +1,19 @@
-use multiversx_sc_codec::TopEncodeMulti;
-
 use crate::{
-    contract_base::BlockchainWrapper,
+    api::{self, CallTypeApi, ManagedTypeApi},
+    contract_base::{BlockchainWrapper, SendRawWrapper},
     types::{
-        BigUint, EgldPayment, EsdtTokenPayment, ManagedAddress, ManagedBuffer, ManagedVec,
-        MultiEsdtPayment,
+        BigUint, CodeMetadata, EgldPayment, EsdtTokenPayment, ManagedAddress, ManagedBuffer,
+        ManagedVec, MultiEsdtPayment,
     },
 };
+use alloc::boxed::Box;
+use multiversx_sc_codec::TopEncodeMulti;
 
 use super::{
-    ExplicitGas, FunctionCall, ManagedArgBuffer, OriginalResultMarker, RHList, RHListAppendNoRet,
-    RHListAppendRet, RHListItem, TxData, TxDataFunctionCall, TxEnv, TxFrom, TxFromSpecified, TxGas,
-    TxPayment, TxResultHandler, TxTo, TxToSpecified,
+    AsyncCall, DeployCall, ExplicitGas, FunctionCall, ManagedArgBuffer, OriginalResultMarker,
+    RHList, RHListAppendNoRet, RHListAppendRet, RHListItem, TxData, TxDataFunctionCall, TxEnv,
+    TxFrom, TxFromSpecified, TxGas, TxPayment, TxPaymentEgldOnly, TxResultHandler, TxScEnv, TxTo,
+    TxToSpecified,
 };
 
 #[must_use]
@@ -464,3 +466,74 @@ where
         }
     }
 }
+
+impl<Env, Payment, Gas, Data> Tx<Env, (), (), Payment, Gas, Data, ()>
+where
+    Env: TxEnv,
+    Payment: TxPaymentEgldOnly<Env>,
+    Gas: TxGas<Env>,
+    Data: TxData<Env>,
+{
+    pub fn deploy(self) -> Tx<Env, (), (), Payment, Gas, DeployCall<Env>, ()> {
+        Tx {
+            env: self.env,
+            from: self.from,
+            to: self.to,
+            payment: self.payment,
+            gas: self.gas,
+            data: DeployCall::default(),
+            result_handler: self.result_handler,
+        }
+    }
+}
+
+impl<Env, Payment, Gas> Tx<Env, (), (), Payment, Gas, DeployCall<Env>, ()>
+where
+    Env: TxEnv,
+    Payment: TxPaymentEgldOnly<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn code(
+        mut self,
+        code: ManagedBuffer<Env::Api>,
+    ) -> Tx<Env, (), (), Payment, Gas, DeployCall<Env>, ()> {
+        self.data.code = code;
+        Tx {
+            env: self.env,
+            from: self.from,
+            to: self.to,
+            payment: self.payment,
+            gas: self.gas,
+            data: self.data,
+            result_handler: self.result_handler,
+        }
+    }
+
+    pub fn code_metadata(
+        mut self,
+        code_metadata: CodeMetadata,
+    ) -> Tx<Env, (), (), Payment, Gas, DeployCall<Env>, ()> {
+        self.data.code_metadata = code_metadata;
+        Tx {
+            env: self.env,
+            from: self.from,
+            to: self.to,
+            payment: self.payment,
+            gas: self.gas,
+            data: self.data,
+            result_handler: self.result_handler,
+        }
+    }
+
+    #[inline]
+    pub fn argument<T: TopEncodeMulti>(mut self, arg: &T) -> Self {
+        self.data = self.data.argument(arg);
+        self
+    }
+
+    #[inline]
+    pub fn arguments_raw(mut self, raw: ManagedArgBuffer<Env::Api>) -> Self {
+        self.data.arg_buffer = raw;
+        self
+    }
+}
diff --git a/framework/base/src/types/interaction/tx_call_deploy.rs b/framework/base/src/types/interaction/tx_call_deploy.rs
new file mode 100644
index 0000000000..9d57e362e3
--- /dev/null
+++ b/framework/base/src/types/interaction/tx_call_deploy.rs
@@ -0,0 +1,119 @@
+use crate::{
+    api::CallTypeApi,
+    contract_base::SendRawWrapper,
+    tuple_util::NestedTupleFlatten,
+    types::{ManagedAddress, ManagedBuffer, ManagedVec},
+};
+
+use super::{
+    ConsNoRet, ConsRet, DeployCall, OriginalResultMarker, RHList, RHListItem, Tx,
+    TxDataFunctionCall, TxEnv, TxGas, TxPayment, TxPaymentEgldOnly, TxScEnv, TxToSpecified,
+};
+
+pub trait RHListItemDeploy<Env, Original>: RHListItem<Env, Original>
+where
+    Env: TxEnv,
+{
+    fn item_deploy_result(
+        self,
+        new_address: &ManagedAddress<Env::Api>,
+        raw_results: &ManagedVec<Env::Api, ManagedBuffer<Env::Api>>,
+    ) -> Self::Returns;
+}
+
+pub trait RHListDeploy<Env>: RHList<Env>
+where
+    Env: TxEnv,
+{
+    fn list_deploy_result(
+        self,
+        new_address: &ManagedAddress<Env::Api>,
+        raw_results: &ManagedVec<Env::Api, ManagedBuffer<Env::Api>>,
+    ) -> Self::ListReturns;
+}
+
+impl<Env> RHListDeploy<Env> for ()
+where
+    Env: TxEnv,
+{
+    fn list_deploy_result(
+        self,
+        _new_address: &ManagedAddress<Env::Api>,
+        _raw_results: &ManagedVec<Env::Api, ManagedBuffer<Env::Api>>,
+    ) -> Self::ListReturns {
+    }
+}
+
+impl<Env, O> RHListDeploy<Env> for OriginalResultMarker<O>
+where
+    Env: TxEnv,
+{
+    fn list_deploy_result(
+        self,
+        _new_address: &ManagedAddress<Env::Api>,
+        _raw_results: &ManagedVec<Env::Api, ManagedBuffer<Env::Api>>,
+    ) -> Self::ListReturns {
+    }
+}
+
+impl<Env, Head, Tail> RHListDeploy<Env> for ConsRet<Env, Head, Tail>
+where
+    Env: TxEnv,
+    Head: RHListItemDeploy<Env, Tail::OriginalResult>,
+    Tail: RHListDeploy<Env>,
+{
+    fn list_deploy_result(
+        self,
+        new_address: &ManagedAddress<Env::Api>,
+        raw_results: &ManagedVec<Env::Api, ManagedBuffer<Env::Api>>,
+    ) -> Self::ListReturns {
+        let head_result = self.head.item_deploy_result(new_address, raw_results);
+        let tail_result = self.tail.list_deploy_result(new_address, raw_results);
+        (head_result, tail_result)
+    }
+}
+
+impl<Env, Head, Tail> RHListDeploy<Env> for ConsNoRet<Env, Head, Tail>
+where
+    Env: TxEnv,
+    Head: RHListItemDeploy<Env, Tail::OriginalResult, Returns = ()>,
+    Tail: RHListDeploy<Env>,
+{
+    fn list_deploy_result(
+        self,
+        new_address: &ManagedAddress<Env::Api>,
+        raw_results: &ManagedVec<Env::Api, ManagedBuffer<Env::Api>>,
+    ) -> Self::ListReturns {
+        self.head.item_deploy_result(new_address, raw_results);
+        self.tail.list_deploy_result(new_address, raw_results)
+    }
+}
+
+impl<Api, Payment, Gas, RH> Tx<TxScEnv<Api>, (), (), Payment, Gas, DeployCall<TxScEnv<Api>>, RH>
+where
+    Api: CallTypeApi,
+    Payment: TxPaymentEgldOnly<TxScEnv<Api>>,
+    Gas: TxGas<TxScEnv<Api>>,
+    RH: RHListDeploy<TxScEnv<Api>>,
+    RH::ListReturns: NestedTupleFlatten,
+{
+    pub fn execute_deploy(self) -> <RH::ListReturns as NestedTupleFlatten>::Unpacked {
+        let gas_limit = self.gas.resolve_gas(&self.env);
+        let egld_payment = self.payment.to_egld_payment();
+
+        let (new_address, raw_results) = SendRawWrapper::<Api>::new().deploy_contract(
+            gas_limit,
+            &egld_payment.value,
+            &self.data.code,
+            self.data.code_metadata,
+            &self.data.arg_buffer,
+        );
+
+        SendRawWrapper::<Api>::new().clean_return_data();
+
+        let tuple_result = self
+            .result_handler
+            .list_deploy_result(&new_address, &raw_results);
+        tuple_result.flatten_unpack()
+    }
+}
diff --git a/framework/base/src/types/interaction/tx_data.rs b/framework/base/src/types/interaction/tx_data.rs
index 4119f04b1a..c4a679401f 100644
--- a/framework/base/src/types/interaction/tx_data.rs
+++ b/framework/base/src/types/interaction/tx_data.rs
@@ -1,9 +1,14 @@
 use crate::{
+    api::ManagedTypeApi,
+    contract_base::SendRawWrapper,
     formatter::SCLowerHex,
-    types::{ManagedBuffer, ManagedBufferCachedBuilder},
+    types::{
+        CodeMetadata, EgldPayment, ManagedAddress, ManagedBuffer, ManagedBufferCachedBuilder,
+        ManagedVec,
+    },
 };
 
-use super::{FunctionCall, TxEnv};
+use super::{FunctionCall, ManagedArgBuffer, Tx, TxEnv, TxFrom, TxGas, TxPayment, TxTo};
 
 pub trait TxData<Env>
 where
@@ -32,6 +37,7 @@ where
         ManagedBuffer::new()
     }
 }
+
 impl<Env> TxDataFunctionCall<Env> for () where Env: TxEnv {}
 
 impl<Env> TxData<Env> for FunctionCall<Env::Api>
diff --git a/framework/base/src/types/interaction/tx_payment.rs b/framework/base/src/types/interaction/tx_payment.rs
index 8f2c3397bf..0f50f50e53 100644
--- a/framework/base/src/types/interaction/tx_payment.rs
+++ b/framework/base/src/types/interaction/tx_payment.rs
@@ -19,9 +19,11 @@ where
     pub fc: FunctionCall<Api>,
 }
 
+/// Describes a payment that is part of a transaction.
 pub trait TxPayment<Env>
 where
     Env: TxEnv,
+    Self: Clone,
 {
     fn is_no_payment(&self) -> bool;
 
@@ -44,6 +46,14 @@ where
     );
 }
 
+/// Marks a payment object that only contains EGLD or nothing at all.
+pub trait TxPaymentEgldOnly<Env>: TxPayment<Env>
+where
+    Env: TxEnv,
+{
+    fn to_egld_payment(self) -> EgldPayment<Env::Api>;
+}
+
 impl<Env> TxPayment<Env> for ()
 where
     Env: TxEnv,
@@ -80,6 +90,15 @@ where
     }
 }
 
+impl<Env> TxPaymentEgldOnly<Env> for ()
+where
+    Env: TxEnv,
+{
+    fn to_egld_payment(self) -> EgldPayment<Env::Api> {
+        EgldPayment::no_payment()
+    }
+}
+
 impl<Env> TxPayment<Env> for EgldPayment<Env::Api>
 where
     Env: TxEnv,
@@ -122,6 +141,15 @@ where
     }
 }
 
+impl<Env> TxPaymentEgldOnly<Env> for EgldPayment<Env::Api>
+where
+    Env: TxEnv,
+{
+    fn to_egld_payment(self) -> EgldPayment<Env::Api> {
+        self
+    }
+}
+
 impl<Env> TxPayment<Env> for EsdtTokenPayment<Env::Api>
 where
     Env: TxEnv,
diff --git a/framework/base/src/types/interaction/tx_rh_list.rs b/framework/base/src/types/interaction/tx_rh_list.rs
index 85b5c3d51a..f34e0295a5 100644
--- a/framework/base/src/types/interaction/tx_rh_list.rs
+++ b/framework/base/src/types/interaction/tx_rh_list.rs
@@ -1,5 +1,6 @@
 mod returns_bt;
 mod returns_exact;
+mod returns_new_address;
 mod returns_raw;
 mod returns_similar;
 mod tx_rh_list_cons;
@@ -9,6 +10,7 @@ mod with_result_raw;
 
 pub use returns_bt::*;
 pub use returns_exact::*;
+pub use returns_new_address::*;
 pub use returns_raw::*;
 pub use returns_similar::*;
 pub use tx_rh_list_cons::*;
diff --git a/framework/base/src/types/interaction/tx_rh_list/returns_bt.rs b/framework/base/src/types/interaction/tx_rh_list/returns_bt.rs
index 03b695d6f6..1f1be042e5 100644
--- a/framework/base/src/types/interaction/tx_rh_list/returns_bt.rs
+++ b/framework/base/src/types/interaction/tx_rh_list/returns_bt.rs
@@ -1,6 +1,9 @@
 use crate::{
     contract_base::BlockchainWrapper,
-    types::{BackTransfers, ManagedBuffer, ManagedVec, RHListItemSync, TxEnv},
+    types::{
+        interaction::tx_call_deploy::RHListItemDeploy, BackTransfers, ManagedAddress,
+        ManagedBuffer, ManagedVec, RHListItemSync, TxEnv,
+    },
 };
 
 use super::RHListItem;
@@ -25,3 +28,16 @@ where
         BlockchainWrapper::<Env::Api>::new().get_back_transfers()
     }
 }
+
+impl<Env, Original> RHListItemDeploy<Env, Original> for ReturnsBackTransfers
+where
+    Env: TxEnv,
+{
+    fn item_deploy_result(
+        self,
+        _new_address: &ManagedAddress<Env::Api>,
+        _raw_results: &ManagedVec<Env::Api, ManagedBuffer<Env::Api>>,
+    ) -> Self::Returns {
+        BlockchainWrapper::<Env::Api>::new().get_back_transfers()
+    }
+}
diff --git a/framework/base/src/types/interaction/tx_rh_list/returns_new_address.rs b/framework/base/src/types/interaction/tx_rh_list/returns_new_address.rs
new file mode 100644
index 0000000000..fee76c5e1f
--- /dev/null
+++ b/framework/base/src/types/interaction/tx_rh_list/returns_new_address.rs
@@ -0,0 +1,31 @@
+use crate::{
+    contract_base::BlockchainWrapper,
+    types::{
+        interaction::tx_call_deploy::RHListItemDeploy, BackTransfers, ManagedAddress,
+        ManagedBuffer, ManagedVec, RHListItemSync, TxEnv,
+    },
+};
+
+use super::RHListItem;
+
+pub struct ReturnsNewAddress;
+
+impl<Env, Original> RHListItem<Env, Original> for ReturnsNewAddress
+where
+    Env: TxEnv,
+{
+    type Returns = ManagedAddress<Env::Api>;
+}
+
+impl<Env, Original> RHListItemDeploy<Env, Original> for ReturnsNewAddress
+where
+    Env: TxEnv,
+{
+    fn item_deploy_result(
+        self,
+        new_address: &ManagedAddress<Env::Api>,
+        _raw_results: &ManagedVec<Env::Api, ManagedBuffer<Env::Api>>,
+    ) -> Self::Returns {
+        new_address.clone()
+    }
+}
diff --git a/framework/base/src/types/interaction/tx_rh_list/returns_raw.rs b/framework/base/src/types/interaction/tx_rh_list/returns_raw.rs
index b4fa56479f..5f709c04a6 100644
--- a/framework/base/src/types/interaction/tx_rh_list/returns_raw.rs
+++ b/framework/base/src/types/interaction/tx_rh_list/returns_raw.rs
@@ -1,4 +1,7 @@
-use crate::types::{ManagedBuffer, ManagedVec, RHListItemSync, TxEnv};
+use crate::types::{
+    interaction::tx_call_deploy::RHListItemDeploy, ManagedAddress, ManagedBuffer, ManagedVec,
+    RHListItemSync, TxEnv,
+};
 
 use super::RHListItem;
 
@@ -22,3 +25,16 @@ where
         raw_results.clone()
     }
 }
+
+impl<Env, Original> RHListItemDeploy<Env, Original> for ReturnsRaw
+where
+    Env: TxEnv,
+{
+    fn item_deploy_result(
+        self,
+        _new_address: &ManagedAddress<Env::Api>,
+        raw_results: &ManagedVec<Env::Api, ManagedBuffer<Env::Api>>,
+    ) -> Self::Returns {
+        raw_results.clone()
+    }
+}

From 10a51ade45ee40edce300fe169bba32166636ff1 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 6 Feb 2024 13:47:31 +0200
Subject: [PATCH 0326/1254] cargo fmt

---
 .../base/src/storage/mappers/set_mapper.rs    |  9 +++++--
 .../scenario/model/transaction/tx_response.rs | 24 +++++++++++--------
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/framework/base/src/storage/mappers/set_mapper.rs b/framework/base/src/storage/mappers/set_mapper.rs
index f4c12807d7..28941a7a8c 100644
--- a/framework/base/src/storage/mappers/set_mapper.rs
+++ b/framework/base/src/storage/mappers/set_mapper.rs
@@ -5,10 +5,15 @@ use storage_get_from_address::storage_get_len_from_address;
 pub use super::queue_mapper::Iter;
 use super::{QueueMapper, StorageClearable, StorageMapper};
 use crate::{
-    abi::{TypeAbi, TypeDescriptionContainer, TypeName}, api::StorageMapperApi, codec::{
+    abi::{TypeAbi, TypeDescriptionContainer, TypeName},
+    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, storage_get_len, types::{ManagedAddress, ManagedRef, ManagedType, MultiValueEncoded}
+    },
+    storage::{storage_get_from_address, storage_set, StorageKey},
+    storage_get, storage_get_len,
+    types::{ManagedAddress, ManagedRef, ManagedType, MultiValueEncoded},
 };
 
 const NULL_ENTRY: u32 = 0;
diff --git a/framework/scenario/src/scenario/model/transaction/tx_response.rs b/framework/scenario/src/scenario/model/transaction/tx_response.rs
index 0f738c26dc..440db8258a 100644
--- a/framework/scenario/src/scenario/model/transaction/tx_response.rs
+++ b/framework/scenario/src/scenario/model/transaction/tx_response.rs
@@ -1,5 +1,4 @@
-use multiversx_chain_vm::crypto_functions::keccak256;
-use multiversx_chain_vm::tx_mock::TxResult;
+use multiversx_chain_vm::{crypto_functions::keccak256, tx_mock::TxResult};
 use multiversx_sc::types::Address;
 use multiversx_sdk::{
     data::transaction::{ApiLogs, ApiSmartContractResult, Events, TransactionOnNetwork},
@@ -67,7 +66,7 @@ impl TxResponse {
         response.process(
             tx.sender.to_bytes(),
             tx.nonce,
-            tx.processing_type_on_destination
+            tx.processing_type_on_destination,
         )
     }
 
@@ -126,7 +125,7 @@ impl TxResponse {
         self,
         sender_address: [u8; 32],
         nonce: u64,
-        processing_type_on_destination: String
+        processing_type_on_destination: String,
     ) -> Self {
         self.process_out()
             .process_new_deployed_address(sender_address, nonce, processing_type_on_destination)
@@ -170,10 +169,10 @@ impl TxResponse {
         mut self,
         sender_address_bytes: [u8; 32],
         nonce: u64,
-        processing_type_on_destination: String
+        processing_type_on_destination: String,
     ) -> Self {
         if processing_type_on_destination != SC_DEPLOY_PROCESSING_TYPE {
-            return self
+            return self;
         }
 
         let sender_nonce_bytes = nonce.to_le_bytes();
@@ -257,8 +256,8 @@ impl TxResponse {
 
 #[cfg(test)]
 mod tests {
-    use multiversx_sc::types::Address;
     use crate::scenario_model::TxResponse;
+    use multiversx_sc::types::Address;
     use multiversx_sdk::data::transaction::{TransactionInfo, TransactionOnNetwork};
 
     #[test]
@@ -313,9 +312,14 @@ mod tests {
             .unwrap()
             .transaction;
         let tx_response = TxResponse::from_network_tx(tx_on_network);
-        let opt_address = tx_response.new_deployed_address.map(|e| multiversx_sdk::data::address::Address::from_bytes(*e.as_array()).to_bech32_string().unwrap());
-
-        let expected = Some("erd1qqqqqqqqqqqqqpgqwpdf84ggxzqzmr2zmw959q4nlf9nz562q33sak25ze".to_string());
+        let opt_address = tx_response.new_deployed_address.map(|e| {
+            multiversx_sdk::data::address::Address::from_bytes(*e.as_array())
+                .to_bech32_string()
+                .unwrap()
+        });
+
+        let expected =
+            Some("erd1qqqqqqqqqqqqqpgqwpdf84ggxzqzmr2zmw959q4nlf9nz562q33sak25ze".to_string());
 
         assert_eq!(opt_address, expected)
     }

From abc8f9674fcd6dc9e1fafbb6b989cadde3f536b9 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 6 Feb 2024 13:47:56 +0200
Subject: [PATCH 0327/1254] scenario fmt

---
 .../scenarios/storage_mapper_get_at_address.scen.json           | 2 +-
 .../basic-features/scenarios/storage_mapper_set.scen.json       | 2 +-
 2 files changed, 2 insertions(+), 2 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 bec03acdf9..e2beefa293 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
@@ -242,4 +242,4 @@
             }
         }
     ]
-}
\ No newline at end of file
+}
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 c4c91aaf58..3e5b59ed9d 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
@@ -503,4 +503,4 @@
             }
         }
     ]
-}
\ No newline at end of file
+}

From 919236fdd1e2262eed2405f6ef7ac9fa8fcf9db7 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 6 Feb 2024 13:49:55 +0200
Subject: [PATCH 0328/1254] sc 0.47.3, sdk 0.3.2

---
 CHANGELOG.md                                  |  5 +++++
 Cargo.lock                                    | 20 +++++++++----------
 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 ++--
 framework/base/Cargo.toml                     |  4 ++--
 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                 |  8 ++++----
 framework/snippets/Cargo.toml                 |  6 +++---
 framework/wasm-adapter/Cargo.toml             |  4 ++--
 sdk/core/Cargo.toml                           |  2 +-
 tools/mxpy-snippet-generator/Cargo.toml       |  2 +-
 tools/rust-debugger/format-tests/Cargo.toml   |  4 ++--
 261 files changed, 390 insertions(+), 384 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 43a1f1f873..1356fff6d5 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.3, sdk 0.3.2] - 2024-02-06
+- SDK: changed the way to retrieve the new deployed address afte deploy/
+- Support for reading from another contract for the following storage mappers: `AddressToIdMapper`, `BiDiMapper`, `LinkedListMapper`, `SetMapper`, `SingleValueMapper`, `UniqueIdMapper`, `UnorderedSetMapper`, `UserMapper`, `VecMapper`, `WhitelistMapper`.
+- Additional methods to access data nodes directly in the `SetMapper` and `QueueMapper`.
+
 ## [sc 0.47.2, codec 0.18.6, vm 0.8.2, scenario-format 0.22.2] - 2024-02-02
 - Scenario testing infrastructure:
 	- The Rust VM can generate mock addresses, if not specified in advance.
diff --git a/Cargo.lock b/Cargo.lock
index 75a443f4a3..f249198017 100755
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1806,7 +1806,7 @@ checksum = "b59072fa0624b55ae5ae3fa6bfa91515bbeb4ac440214bc4a509e2c8806d6e9f"
 
 [[package]]
 name = "multiversx-price-aggregator-sc"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "arrayvec",
  "getrandom",
@@ -1827,7 +1827,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "bitflags 2.4.2",
  "hex-literal",
@@ -1857,7 +1857,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -1868,7 +1868,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-meta"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "clap",
  "colored",
@@ -1894,14 +1894,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-scenario"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "base64",
  "bech32",
@@ -1927,7 +1927,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-snippets"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "base64",
  "env_logger",
@@ -1941,14 +1941,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sdk"
-version = "0.3.1"
+version = "0.3.2"
 dependencies = [
  "anyhow",
  "base64",
@@ -1972,7 +1972,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-wegld-swap-sc"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "multiversx-sc",
  "multiversx-sc-modules",
diff --git a/contracts/benchmarks/large-storage/Cargo.toml b/contracts/benchmarks/large-storage/Cargo.toml
index f85db8478b..19d87a91a6 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.2"
+version = "0.47.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.2"
+version = "0.47.3"
 path = "../../../framework/scenario"
diff --git a/contracts/benchmarks/large-storage/meta/Cargo.toml b/contracts/benchmarks/large-storage/meta/Cargo.toml
index 583e2c8b6c..8c6736a0d8 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.2"
+version = "0.47.3"
 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 a3842fe54c..e36db80ee3 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.2"
+version = "0.47.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/mappers/benchmark-common/Cargo.toml b/contracts/benchmarks/mappers/benchmark-common/Cargo.toml
index 19c3ab2e7d..58b8b64338 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.2"
+version = "0.47.3"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.2"
+version = "0.47.3"
 path = "../../../../framework/scenario"
diff --git a/contracts/benchmarks/mappers/linked-list-repeat/Cargo.toml b/contracts/benchmarks/mappers/linked-list-repeat/Cargo.toml
index 9e0a0a83bc..664fd82fe6 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.2"
+version = "0.47.3"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.2"
+version = "0.47.3"
 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 fad64d1361..6854756244 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.2"
+version = "0.47.3"
 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 236f8e02cc..46ae9f62b7 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.2"
+version = "0.47.3"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/mappers/map-repeat/Cargo.toml b/contracts/benchmarks/mappers/map-repeat/Cargo.toml
index 82d70bcf73..6825f8f877 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.2"
+version = "0.47.3"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.2"
+version = "0.47.3"
 path = "../../../../framework/scenario"
diff --git a/contracts/benchmarks/mappers/map-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/map-repeat/meta/Cargo.toml
index 30c525b138..572e202cb3 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.2"
+version = "0.47.3"
 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 78ce3b4a3b..98bab485ad 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.2"
+version = "0.47.3"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/mappers/queue-repeat/Cargo.toml b/contracts/benchmarks/mappers/queue-repeat/Cargo.toml
index 1484246588..a39962a288 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.2"
+version = "0.47.3"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.2"
+version = "0.47.3"
 path = "../../../../framework/scenario"
diff --git a/contracts/benchmarks/mappers/queue-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/queue-repeat/meta/Cargo.toml
index 8c3c2bb394..38067268cb 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.2"
+version = "0.47.3"
 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 795b0b2382..6f09d4564a 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.2"
+version = "0.47.3"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/mappers/set-repeat/Cargo.toml b/contracts/benchmarks/mappers/set-repeat/Cargo.toml
index 089861f131..31d93546f7 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.2"
+version = "0.47.3"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.2"
+version = "0.47.3"
 path = "../../../../framework/scenario"
diff --git a/contracts/benchmarks/mappers/set-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/set-repeat/meta/Cargo.toml
index 819d75d12d..0f97317c17 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.2"
+version = "0.47.3"
 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 6ef9181b7b..ed9627726c 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.2"
+version = "0.47.3"
 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 6e13b51603..b96b2c4ea4 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.2"
+version = "0.47.3"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.2"
+version = "0.47.3"
 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 33fa092828..f1f766521d 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.2"
+version = "0.47.3"
 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 bee4ca4536..f9c9d27d41 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.2"
+version = "0.47.3"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/mappers/vec-repeat/Cargo.toml b/contracts/benchmarks/mappers/vec-repeat/Cargo.toml
index 55a08cfc5d..17196cbd7b 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.2"
+version = "0.47.3"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.2"
+version = "0.47.3"
 path = "../../../../framework/scenario"
diff --git a/contracts/benchmarks/mappers/vec-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/vec-repeat/meta/Cargo.toml
index b0b82ba301..01ff77167f 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.2"
+version = "0.47.3"
 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 b10ebda8cd..684c568f33 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.2"
+version = "0.47.3"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/send-tx-repeat/Cargo.toml b/contracts/benchmarks/send-tx-repeat/Cargo.toml
index 7eed5b74f1..ed2d42d8fe 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.2"
+version = "0.47.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.2"
+version = "0.47.3"
 path = "../../../framework/scenario"
diff --git a/contracts/benchmarks/send-tx-repeat/meta/Cargo.toml b/contracts/benchmarks/send-tx-repeat/meta/Cargo.toml
index dce1898e68..1adf2fc19a 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.2"
+version = "0.47.3"
 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 add8c1b0e0..6fc8efda12 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.2"
+version = "0.47.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/str-repeat/Cargo.toml b/contracts/benchmarks/str-repeat/Cargo.toml
index 9833ab6929..3e61e02b53 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.2"
+version = "0.47.3"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.2"
+version = "0.47.3"
 path = "../../../framework/scenario"
diff --git a/contracts/benchmarks/str-repeat/meta/Cargo.toml b/contracts/benchmarks/str-repeat/meta/Cargo.toml
index aaec1ac65e..54649565c2 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.2"
+version = "0.47.3"
 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 e46b5aa6f0..9fc23ed24b 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.2"
+version = "0.47.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/core/price-aggregator/Cargo.toml b/contracts/core/price-aggregator/Cargo.toml
index d0df8089e7..b2ca011551 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.2"
+version = "0.47.3"
 authors = [
     "Claudiu-Marcel Bruda <claudiu.bruda@multiversx.com>",
     "MultiversX <contact@multiversx.com>",
@@ -19,15 +19,15 @@ edition = "2021"
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "0.47.2"
+version = "0.47.3"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.47.2"
+version = "0.47.3"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.2"
+version = "0.47.3"
 path = "../../../framework/scenario"
 
 [dependencies]
diff --git a/contracts/core/price-aggregator/meta/Cargo.toml b/contracts/core/price-aggregator/meta/Cargo.toml
index 19a340dcf7..b92fc63a33 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.2"
+version = "0.47.3"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.47.2"
+version = "0.47.3"
 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 f45ea0e3e1..083a507b60 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.2"
+version = "0.47.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/core/wegld-swap/Cargo.toml b/contracts/core/wegld-swap/Cargo.toml
index 4112372bab..6feafcfdbd 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.2"
+version = "0.47.3"
 
 authors = [
     "Dorin Iancu <dorin.iancu@multiversx.com>",
@@ -20,13 +20,13 @@ edition = "2021"
 path = "src/wegld.rs"
 
 [dependencies.multiversx-sc]
-version = "0.47.2"
+version = "0.47.3"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.47.2"
+version = "0.47.3"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.2"
+version = "0.47.3"
 path = "../../../framework/scenario"
diff --git a/contracts/core/wegld-swap/meta/Cargo.toml b/contracts/core/wegld-swap/meta/Cargo.toml
index 780bf4fe0f..731682a071 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.2"
+version = "0.47.3"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.47.2"
+version = "0.47.3"
 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 ad53575289..6441b5e9cd 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.2"
+version = "0.47.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/adder/Cargo.toml b/contracts/examples/adder/Cargo.toml
index b0ea47a52d..526718b07a 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.2"
+version = "0.47.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.2"
+version = "0.47.3"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/adder/interact/Cargo.toml b/contracts/examples/adder/interact/Cargo.toml
index a2a43fb777..89298335ff 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.2"
+version = "0.47.3"
 path = "../../../../framework/snippets"
diff --git a/contracts/examples/adder/meta/Cargo.toml b/contracts/examples/adder/meta/Cargo.toml
index 3a7da5730e..dedfdc55c3 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.2"
+version = "0.47.3"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/examples/adder/wasm/Cargo.toml b/contracts/examples/adder/wasm/Cargo.toml
index cd8802d2b5..84690cb372 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.2"
+version = "0.47.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/bonding-curve-contract/Cargo.toml b/contracts/examples/bonding-curve-contract/Cargo.toml
index 3ee19b1bc1..d4da1a9bed 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.2"
+version = "0.47.3"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.47.2"
+version = "0.47.3"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.2"
+version = "0.47.3"
 path = "../../../framework/scenario"
 
diff --git a/contracts/examples/bonding-curve-contract/meta/Cargo.toml b/contracts/examples/bonding-curve-contract/meta/Cargo.toml
index 2ef6b9fc50..5d182cd1fa 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.2"
+version = "0.47.3"
 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 557f54d775..5df3eaba07 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.2"
+version = "0.47.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/check-pause/Cargo.toml b/contracts/examples/check-pause/Cargo.toml
index 1cd55c395d..ed51092af6 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.2"
+version = "0.47.3"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.47.2"
+version = "0.47.3"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.2"
+version = "0.47.3"
 path = "../../../framework/scenario"
 
diff --git a/contracts/examples/check-pause/meta/Cargo.toml b/contracts/examples/check-pause/meta/Cargo.toml
index fc756ec1c4..923ae12579 100644
--- a/contracts/examples/check-pause/meta/Cargo.toml
+++ b/contracts/examples/check-pause/meta/Cargo.toml
@@ -9,6 +9,6 @@ authors = ["Alin Cruceat <alin.cruceat@multiversx.com>"]
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.47.2"
+version = "0.47.3"
 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 6329b40073..db4dd2ee5b 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.2"
+version = "0.47.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/crowdfunding-esdt/Cargo.toml b/contracts/examples/crowdfunding-esdt/Cargo.toml
index 9cfad8ecb3..c0d3854be9 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.2"
+version = "0.47.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.2"
+version = "0.47.3"
 path = "../../../framework/scenario"
 
 [dev-dependencies]
diff --git a/contracts/examples/crowdfunding-esdt/meta/Cargo.toml b/contracts/examples/crowdfunding-esdt/meta/Cargo.toml
index c4c73bcca7..dd0af0dbfb 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.2"
+version = "0.47.3"
 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 3a01d7d539..ef0d645787 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.2"
+version = "0.47.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/crypto-bubbles/Cargo.toml b/contracts/examples/crypto-bubbles/Cargo.toml
index 409cb4214e..f606776099 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.2"
+version = "0.47.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.2"
+version = "0.47.3"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/crypto-bubbles/meta/Cargo.toml b/contracts/examples/crypto-bubbles/meta/Cargo.toml
index 5ede89a5c1..73fa2cee35 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.2"
+version = "0.47.3"
 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 8dc95f386a..9489fdc6c7 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.2"
+version = "0.47.3"
 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 1028f93b24..dbb5b128b0 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.2"
+version = "0.47.3"
 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 c2a2274eb5..46a3e61d2d 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.2"
+version = "0.47.3"
 path = "../../../../../framework/base"
diff --git a/contracts/examples/crypto-kitties/kitty-auction/Cargo.toml b/contracts/examples/crypto-kitties/kitty-auction/Cargo.toml
index 16b1af2bbe..e46753156f 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.2"
+version = "0.47.3"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.2"
+version = "0.47.3"
 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 bb4e48b29c..f1cec42ea1 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.2"
+version = "0.47.3"
 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 098f0d5cfc..0c18c7c842 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.2"
+version = "0.47.3"
 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 f5794b604d..4aef050d8b 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.2"
+version = "0.47.3"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.2"
+version = "0.47.3"
 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 d3292ecc24..82cbc0c985 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.2"
+version = "0.47.3"
 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 63099cadcd..9f75bcce27 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.2"
+version = "0.47.3"
 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 f9d480a2ae..be22ea04a5 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.2"
+version = "0.47.3"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.2"
+version = "0.47.3"
 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 fe09d0341a..16ce1b50f2 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.2"
+version = "0.47.3"
 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 fb94073cd1..409948609e 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.2"
+version = "0.47.3"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/crypto-zombies/Cargo.toml b/contracts/examples/crypto-zombies/Cargo.toml
index 4f22670c5b..9de86b55aa 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.2"
+version = "0.47.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.2"
+version = "0.47.3"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/crypto-zombies/meta/Cargo.toml b/contracts/examples/crypto-zombies/meta/Cargo.toml
index 4c63cb1bb8..6d680b4db5 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.2"
+version = "0.47.3"
 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 91245a915b..5252510261 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.2"
+version = "0.47.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/digital-cash/Cargo.toml b/contracts/examples/digital-cash/Cargo.toml
index 3755bb44ad..495a7b3a66 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.2"
+version = "0.47.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.2"
+version = "0.47.3"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/digital-cash/meta/Cargo.toml b/contracts/examples/digital-cash/meta/Cargo.toml
index dc7282fb52..50d33de0a0 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.2"
+version = "0.47.3"
 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 3621d24deb..496b0758dd 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.2"
+version = "0.47.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/empty/Cargo.toml b/contracts/examples/empty/Cargo.toml
index e0c864133b..8a97fb76b1 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.2"
+version = "0.47.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.2"
+version = "0.47.3"
 path = "../../../framework/scenario"
 
 [dev-dependencies]
diff --git a/contracts/examples/empty/meta/Cargo.toml b/contracts/examples/empty/meta/Cargo.toml
index 2b86ae4709..d9890e646a 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.2"
+version = "0.47.3"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/examples/empty/wasm/Cargo.toml b/contracts/examples/empty/wasm/Cargo.toml
index fce843d84c..e905d7ada5 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.2"
+version = "0.47.3"
 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 278ec3d48e..f6d0279b3f 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.2"
+version = "0.47.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.2"
+version = "0.47.3"
 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 6db901c05f..12342da91a 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.2"
+version = "0.47.3"
 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 b9e6f20b79..bdd3bf6e65 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.2"
+version = "0.47.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/factorial/Cargo.toml b/contracts/examples/factorial/Cargo.toml
index dda46719f0..d1dfe6793f 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.2"
+version = "0.47.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.2"
+version = "0.47.3"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/factorial/meta/Cargo.toml b/contracts/examples/factorial/meta/Cargo.toml
index effe9f182d..f4c9b332aa 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.2"
+version = "0.47.3"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/examples/factorial/wasm/Cargo.toml b/contracts/examples/factorial/wasm/Cargo.toml
index e71ab45a37..19eaa56b02 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.2"
+version = "0.47.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/fractional-nfts/Cargo.toml b/contracts/examples/fractional-nfts/Cargo.toml
index 43f4ab5208..3b43dd33af 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.2"
+version = "0.47.3"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.47.2"
+version = "0.47.3"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.2"
+version = "0.47.3"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/fractional-nfts/meta/Cargo.toml b/contracts/examples/fractional-nfts/meta/Cargo.toml
index 89760d434c..332c89e069 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.2"
+version = "0.47.3"
 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 38b654d67b..96cc50ffb1 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.2"
+version = "0.47.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/lottery-esdt/Cargo.toml b/contracts/examples/lottery-esdt/Cargo.toml
index 2cf4480bd4..f7f15b3eec 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.2"
+version = "0.47.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.2"
+version = "0.47.3"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/lottery-esdt/meta/Cargo.toml b/contracts/examples/lottery-esdt/meta/Cargo.toml
index dbea213543..2855837a76 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.2"
+version = "0.47.3"
 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 80a88a8498..9183725bc4 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.2"
+version = "0.47.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/multisig/Cargo.toml b/contracts/examples/multisig/Cargo.toml
index c60a79a1f3..bfb392597c 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.2"
+version = "0.47.3"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.47.2"
+version = "0.47.3"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.2"
+version = "0.47.3"
 path = "../../../framework/scenario"
 
 [dev-dependencies.adder]
@@ -27,7 +27,7 @@ path = "../adder"
 path = "../factorial"
 
 [dev-dependencies.multiversx-wegld-swap-sc]
-version = "0.47.2"
+version = "0.47.3"
 path = "../../core/wegld-swap"
 
 [dev-dependencies]
diff --git a/contracts/examples/multisig/interact/Cargo.toml b/contracts/examples/multisig/interact/Cargo.toml
index daa917618b..795251060a 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.2"
+version = "0.47.3"
 path = "../../../../contracts/modules"
 
 [dependencies.multiversx-sc-snippets]
-version = "0.47.2"
+version = "0.47.3"
 path = "../../../../framework/snippets"
 
 [dependencies.multiversx-sc-scenario]
-version = "=0.47.2"
+version = "=0.47.3"
 path = "../../../../framework/scenario"
diff --git a/contracts/examples/multisig/meta/Cargo.toml b/contracts/examples/multisig/meta/Cargo.toml
index c0f669414a..774a088c40 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.2"
+version = "0.47.3"
 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 945b04a8d5..fca3e2e29a 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.2"
+version = "0.47.3"
 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 3333a29e86..984505ff54 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.2"
+version = "0.47.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/multisig/wasm/Cargo.toml b/contracts/examples/multisig/wasm/Cargo.toml
index 7486ac8bbf..e067097f49 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.2"
+version = "0.47.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/nft-minter/Cargo.toml b/contracts/examples/nft-minter/Cargo.toml
index ffd702c5f7..ac10d97cf3 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.2"
+version = "0.47.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.2"
+version = "0.47.3"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/nft-minter/meta/Cargo.toml b/contracts/examples/nft-minter/meta/Cargo.toml
index 0f1fdec9ba..de2b78eaef 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.2"
+version = "0.47.3"
 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 a0bd23ba33..fde0b139c4 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.2"
+version = "0.47.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/nft-storage-prepay/Cargo.toml b/contracts/examples/nft-storage-prepay/Cargo.toml
index ad71ccf5fe..585e808f49 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.2"
+version = "0.47.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.2"
+version = "0.47.3"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/nft-storage-prepay/meta/Cargo.toml b/contracts/examples/nft-storage-prepay/meta/Cargo.toml
index 860846d93b..1ec208c119 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.2"
+version = "0.47.3"
 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 a1e808e20f..e28c50de61 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.2"
+version = "0.47.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/nft-subscription/Cargo.toml b/contracts/examples/nft-subscription/Cargo.toml
index 854cf4d284..0588c756ba 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.2"
+version = "0.47.3"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.47.2"
+version = "0.47.3"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.2"
+version = "0.47.3"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/nft-subscription/meta/Cargo.toml b/contracts/examples/nft-subscription/meta/Cargo.toml
index 57800d5546..4aa82ddddf 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.2"
+version = "0.47.3"
 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 ab27abeacd..d0dede7221 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.2"
+version = "0.47.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/order-book/factory/Cargo.toml b/contracts/examples/order-book/factory/Cargo.toml
index aa632d4468..ea83a00759 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.2"
+version = "0.47.3"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.2"
+version = "0.47.3"
 path = "../../../../framework/scenario"
 
diff --git a/contracts/examples/order-book/factory/meta/Cargo.toml b/contracts/examples/order-book/factory/meta/Cargo.toml
index 632ab30c4f..302c8792ea 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.2"
+version = "0.47.3"
 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 a63666fead..30026179f5 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.2"
+version = "0.47.3"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/order-book/pair/Cargo.toml b/contracts/examples/order-book/pair/Cargo.toml
index fce8fae450..a11004dbe6 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.2"
+version = "0.47.3"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.2"
+version = "0.47.3"
 path = "../../../../framework/scenario"
diff --git a/contracts/examples/order-book/pair/meta/Cargo.toml b/contracts/examples/order-book/pair/meta/Cargo.toml
index a2b7d88477..71d715d0f8 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.2"
+version = "0.47.3"
 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 1b64d7cf3b..e745d14fde 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.2"
+version = "0.47.3"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/ping-pong-egld/Cargo.toml b/contracts/examples/ping-pong-egld/Cargo.toml
index 36d8410254..5655199049 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.2"
+version = "0.47.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.2"
+version = "0.47.3"
 path = "../../../framework/scenario"
 
diff --git a/contracts/examples/ping-pong-egld/meta/Cargo.toml b/contracts/examples/ping-pong-egld/meta/Cargo.toml
index 0301baf6fc..529c1d0418 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.2"
+version = "0.47.3"
 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 e86d72d827..5b40ef50d5 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.2"
+version = "0.47.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/proxy-pause/Cargo.toml b/contracts/examples/proxy-pause/Cargo.toml
index 0503566a0d..f033e17ebd 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.2"
+version = "0.47.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.2"
+version = "0.47.3"
 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 480ed26122..43b6d409ba 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.2"
+version = "0.47.3"
 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 3738823a6c..ecb40783ad 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.2"
+version = "0.47.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/rewards-distribution/Cargo.toml b/contracts/examples/rewards-distribution/Cargo.toml
index c1f0feafe4..b58589d9fc 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.2"
+version = "0.47.3"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.47.2"
+version = "0.47.3"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.2"
+version = "0.47.3"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/rewards-distribution/meta/Cargo.toml b/contracts/examples/rewards-distribution/meta/Cargo.toml
index 3be9b2ba00..3982a30dac 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 <claudiu.bruda@multiversx.com>"]
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.47.2"
+version = "0.47.3"
 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 a7e683f016..22ac57c415 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.2"
+version = "0.47.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/seed-nft-minter/Cargo.toml b/contracts/examples/seed-nft-minter/Cargo.toml
index bfec6baf81..b9f4919338 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.2"
+version = "0.47.3"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.47.2"
+version = "0.47.3"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.2"
+version = "0.47.3"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/seed-nft-minter/meta/Cargo.toml b/contracts/examples/seed-nft-minter/meta/Cargo.toml
index cc7977a48e..1d33a15533 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 <claudiu.bruda@multiversx.com>"]
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.47.2"
+version = "0.47.3"
 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 a7c3d5f893..f6e1be26a3 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.2"
+version = "0.47.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/token-release/Cargo.toml b/contracts/examples/token-release/Cargo.toml
index add9f8665b..8e3c01422a 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.2"
+version = "0.47.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.2"
+version = "0.47.3"
 path = "../../../framework/scenario"
 
diff --git a/contracts/examples/token-release/meta/Cargo.toml b/contracts/examples/token-release/meta/Cargo.toml
index 9fbcc3154e..c727d00142 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.2"
+version = "0.47.3"
 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 e5cfcef205..738024de3f 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.2"
+version = "0.47.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/abi-tester/Cargo.toml b/contracts/feature-tests/abi-tester/Cargo.toml
index f4c68b8836..62f91a3184 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.2"
+version = "0.47.3"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.2"
+version = "0.47.3"
 path = "../../../framework/scenario"
 
 [dev-dependencies.multiversx-sc-meta]
-version = "0.47.2"
+version = "0.47.3"
 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 e14f13d3ef..012d6beb24 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.2"
+            "version": "0.47.3"
         }
     },
     "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 b0dd789802..2ecf36e4a7 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.2"
+            "version": "0.47.3"
         }
     },
     "docs": [
diff --git a/contracts/feature-tests/abi-tester/meta/Cargo.toml b/contracts/feature-tests/abi-tester/meta/Cargo.toml
index 31cee6dcac..7a0e3b1c23 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.2"
+version = "0.47.3"
 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 db0ef53086..13ddb51cac 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.2"
+version = "0.47.3"
 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 561bc4f1c7..91cffe5acd 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.2"
+version = "0.47.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/alloc-features/Cargo.toml b/contracts/feature-tests/alloc-features/Cargo.toml
index 8c78b91481..9966a1494f 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.2"
+version = "0.47.3"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.2"
+version = "0.47.3"
 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 7080977fa2..662fdad8c0 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.2"
+version = "0.47.3"
 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 9df0376315..9c134d4b48 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.2"
+version = "0.47.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/basic-features/Cargo.toml b/contracts/feature-tests/basic-features/Cargo.toml
index 8cb71d6641..e607e34ed3 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.2"
+version = "0.47.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.2"
+version = "0.47.3"
 path = "../../../framework/scenario"
 
 [dependencies.multiversx-sc-modules]
-version = "0.47.2"
+version = "0.47.3"
 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 947717e511..14c5474742 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.2"
+version = "0.47.3"
 path = "../../../../framework/snippets"
diff --git a/contracts/feature-tests/basic-features/meta/Cargo.toml b/contracts/feature-tests/basic-features/meta/Cargo.toml
index 5ebb9dcd5a..2c34e4b7a7 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.2"
+version = "0.47.3"
 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 da3a981344..a0bc496aa2 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.2"
+version = "0.47.3"
 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 0c7ec4f4f5..b9c3e35500 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.2"
+version = "0.47.3"
 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 d0c94d7780..89ceafc497 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.2"
+version = "0.47.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.2"
+version = "0.47.3"
 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 5aed077964..002d01b041 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.2"
+version = "0.47.3"
 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 80f6c171fe..51024f78b4 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.2"
+version = "0.47.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/Cargo.toml b/contracts/feature-tests/composability/Cargo.toml
index c3a4534a0d..143fcb3c91 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.2"
+version = "0.47.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.2"
+version = "0.47.3"
 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 c02dc0f411..c1c95ae40d 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.2"
+version = "0.47.3"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.2"
+version = "0.47.3"
 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 280e054390..91cb236f84 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.2"
+version = "0.47.3"
 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 0c05b89486..f8cfef127b 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.2"
+version = "0.47.3"
 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 d9e303934a..a557c2ac8b 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.2"
+version = "0.47.3"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.2"
+version = "0.47.3"
 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 23ebde7219..8f7cfa1b9f 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.2"
+version = "0.47.3"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.2"
+version = "0.47.3"
 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 64bef88d0d..19ef1bbe59 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.2"
+version = "0.47.3"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.47.2"
+version = "0.47.3"
 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 072f1edc7d..96de46ba79 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.2"
+version = "0.47.3"
 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 1a78069422..e1456188cd 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.2"
+version = "0.47.3"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.2"
+version = "0.47.3"
 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 8901156bcb..6274b398d9 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.2"
+version = "0.47.3"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.47.2"
+version = "0.47.3"
 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 65d8d7e506..d80624f0c6 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.2"
+version = "0.47.3"
 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 35372e74bf..75a8b92744 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.2"
+version = "0.47.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.2"
+version = "0.47.3"
 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 a52a5def70..2972519c60 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.2"
+version = "0.47.3"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.2"
+version = "0.47.3"
 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 adce020c48..88d0fb04c7 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.2"
+version = "0.47.3"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.47.2"
+version = "0.47.3"
 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 9eecdeac0c..86da9a35cd 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.2"
+version = "0.47.3"
 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 d8fc4b645b..9430275d1f 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.2"
+version = "0.47.3"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.2"
+version = "0.47.3"
 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 e63da2fa95..019894f2d6 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.2"
+version = "0.47.3"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.47.2"
+version = "0.47.3"
 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 8eb9bfe8b1..0850ae7a7c 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.2"
+version = "0.47.3"
 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 ef513e1fdf..080f11aeb8 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.2"
+version = "0.47.3"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.47.2"
+version = "0.47.3"
 path = "../../../../framework/wasm-adapter"
 optional = true
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.2"
+version = "0.47.3"
 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 42cc515f0f..6efaea7d7b 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.2"
+version = "0.47.3"
 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 8e5564562c..9ca8eb69c1 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.2"
+version = "0.47.3"
 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 0f266b7c18..670fa3ef88 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.2"
+version = "0.47.3"
 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 eba1eac5c7..111ede9c0b 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.2"
+version = "0.47.3"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.2"
+version = "0.47.3"
 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 955058bbe4..d0c0a68af6 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.2"
+version = "0.47.3"
 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 38680ad536..72bec0af8a 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.2"
+version = "0.47.3"
 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 b8cf1ce484..fa0f8e93ff 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.2"
+version = "0.47.3"
 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 e4a78866a8..dbd5e75907 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.2"
+version = "0.47.3"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/forwarder/Cargo.toml b/contracts/feature-tests/composability/forwarder/Cargo.toml
index 7375c9c8de..3ecd3494cd 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.2"
+version = "0.47.3"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.2"
+version = "0.47.3"
 path = "../../../../framework/scenario"
 
diff --git a/contracts/feature-tests/composability/forwarder/meta/Cargo.toml b/contracts/feature-tests/composability/forwarder/meta/Cargo.toml
index ab98e1932c..c20d8ac477 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.2"
+version = "0.47.3"
 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 4a2cd6f91a..083d971ae4 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.2"
+version = "0.47.3"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/interact/Cargo.toml b/contracts/feature-tests/composability/interact/Cargo.toml
index 172fa89ec6..8820602e23 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.2"
+version = "0.47.3"
 path = "../../../../contracts/modules"
 
 [dependencies.multiversx-sc-snippets]
-version = "0.47.2"
+version = "0.47.3"
 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 9501956727..01f345cf90 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.2"
+version = "0.47.3"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.2"
+version = "0.47.3"
 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 68e423f91c..6da88fbb20 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.2"
+version = "0.47.3"
 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 6695cf6487..58001d31e1 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.2"
+version = "0.47.3"
 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 9b2565cafc..98c9969ed4 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.2"
+version = "0.47.3"
 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 3a40cb8d80..8c5fc3f153 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.2"
+version = "0.47.3"
 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 78dd2025d6..8503d8a414 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.2"
+version = "0.47.3"
 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 6427124e1a..b4f318e3f7 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.2"
+version = "0.47.3"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.2"
+version = "0.47.3"
 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 6038a93374..e758969988 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.2"
+version = "0.47.3"
 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 37c65391b8..57b263e194 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.2"
+version = "0.47.3"
 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 3a91dd9747..fb1a590e19 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.2"
+version = "0.47.3"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.2"
+version = "0.47.3"
 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 1ad424a970..892c4aac22 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.2"
+version = "0.47.3"
 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 233e6b5093..63c0608f75 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.2"
+version = "0.47.3"
 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 af326fe6b8..5805680f2f 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.2"
+version = "0.47.3"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.2"
+version = "0.47.3"
 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 a3be121851..d02dd3ebb0 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.2"
+version = "0.47.3"
 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 4ff374c8aa..4ed7591719 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.2"
+version = "0.47.3"
 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 ed4c388960..0103c86b6f 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.2"
+version = "0.47.3"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.47.2"
+version = "0.47.3"
 path = "../../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.2"
+version = "0.47.3"
 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 be869432b5..d54d322a7b 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.2"
+version = "0.47.3"
 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 5137f97465..185804804a 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.2"
+version = "0.47.3"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/vault/Cargo.toml b/contracts/feature-tests/composability/vault/Cargo.toml
index 9298828f06..37d56fb0f1 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.2"
+version = "0.47.3"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.2"
+version = "0.47.3"
 path = "../../../../framework/scenario"
diff --git a/contracts/feature-tests/composability/vault/meta/Cargo.toml b/contracts/feature-tests/composability/vault/meta/Cargo.toml
index a5af858084..11ebe0fe99 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.2"
+version = "0.47.3"
 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 a063c162f1..ee122954fd 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.2"
+version = "0.47.3"
 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 3541992a2c..3a0b56aa51 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.2"
+version = "0.47.3"
 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 3e0e9d60b1..f03485ab55 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.2"
+version = "0.47.3"
 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 bdc82a0466..61cfa8596b 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.2"
+version = "0.47.3"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.2"
+version = "0.47.3"
 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 5ba1aa6034..c06402373f 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.2"
+version = "0.47.3"
 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 341ad900b0..dd7682e135 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.2"
+version = "0.47.3"
 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 4e30fdcbf7..d75af2b3ca 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.2"
+version = "0.47.3"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.2"
+version = "0.47.3"
 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 471632ecf4..f6fd2230ad 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.2"
+version = "0.47.3"
 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 9d8ab647af..0f11cf94fc 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.2"
+version = "0.47.3"
 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 cf70a46c2b..e6ec85a6ed 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.2"
+version = "0.47.3"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.2"
+version = "0.47.3"
 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 5999677fef..79dad1ae32 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.2"
+version = "0.47.3"
 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 208d696b15..0d92815967 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.2"
+version = "0.47.3"
 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 e2152a3138..c5261335b2 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.2"
+version = "0.47.3"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.2"
+version = "0.47.3"
 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 0184649670..922199a8c6 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.2"
+version = "0.47.3"
 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 5d175af1b4..f778b31257 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.2"
+version = "0.47.3"
 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 0e0ab79462..06764d1fa8 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.2"
+version = "0.47.3"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.2"
+version = "0.47.3"
 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 9f981e3334..96ac1477e7 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.2"
+version = "0.47.3"
 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 0bd037179a..847b3f9557 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.2"
+version = "0.47.3"
 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 e2653b547a..615d033565 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.2"
+version = "0.47.3"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.2"
+version = "0.47.3"
 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 dc7a215017..a9292ca253 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.2"
+version = "0.47.3"
 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 bdf6645315..429222a8d8 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.2"
+version = "0.47.3"
 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 fcb0bbbf4c..bd353180f1 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.2"
+version = "0.47.3"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.2"
+version = "0.47.3"
 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 361d26d8ac..dfa121643f 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.2"
+version = "0.47.3"
 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 c878a42e94..1c5f771381 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.2"
+version = "0.47.3"
 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 a53ad0778e..e5fbd6b118 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.2"
+version = "0.47.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.2"
+version = "0.47.3"
 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 fb6e72b524..f0066f59b2 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.2"
+version = "0.47.3"
 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 fff72fee8b..8398a3c9b6 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.2"
+version = "0.47.3"
 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 ef497095d6..805f4a9879 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.2"
+version = "0.47.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.2"
+version = "0.47.3"
 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 447b961217..20bf583185 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.2"
+version = "0.47.3"
 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 8ab6f75df7..88e0bc35dc 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.2"
+version = "0.47.3"
 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 36b788e9cd..0a39a7bda8 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.2"
+version = "0.47.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.2"
+version = "0.47.3"
 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 8115b51c98..3faca87e51 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.2"
+version = "0.47.3"
 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 7600c77903..e3f67b9d2d 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.2"
+version = "0.47.3"
 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 4f1a4f4245..ce0570fb65 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.2"
+version = "0.47.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.2"
+version = "0.47.3"
 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 e1f3e58d62..5ea25035d1 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.2"
+version = "0.47.3"
 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 e5653ccacb..b265003fad 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.2"
+version = "0.47.3"
 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 8824f0119c..5bc3507c82 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.2"
+version = "0.47.3"
 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 5582c7f4a8..3c0a7dc1cf 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.2"
+version = "0.47.3"
 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 91daf465e2..cbda187601 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.2"
+version = "0.47.3"
 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 9e70ba9750..f1358178a6 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.2"
+version = "0.47.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.2"
+version = "0.47.3"
 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 d28f91c110..093675a2a5 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.2"
+version = "0.47.3"
 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 d913e97a43..9755f08f02 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.2"
+version = "0.47.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/payable-features/Cargo.toml b/contracts/feature-tests/payable-features/Cargo.toml
index ce012e2df8..8c803df428 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.2"
+version = "0.47.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.2"
+version = "0.47.3"
 path = "../../../framework/scenario"
diff --git a/contracts/feature-tests/payable-features/meta/Cargo.toml b/contracts/feature-tests/payable-features/meta/Cargo.toml
index 7bf4ed7807..742de00b6c 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.2"
+version = "0.47.3"
 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 db21aeef89..990206679c 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.2"
+version = "0.47.3"
 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 255f6b22cd..d2d9c56886 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.2"
+version = "0.47.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.2"
+version = "0.47.3"
 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 08b1ab89ba..a5c5ab8123 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.2"
+version = "0.47.3"
 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 f3023fe098..7414aa3187 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.2"
+version = "0.47.3"
 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 4d51dd0485..324dbcef2c 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.2"
+// version = "0.47.3"
 // 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 0af5bc88a1..e71940ef92 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.2"
+version = "0.47.3"
 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 ac69dc8f67..b8a8fa758a 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.2"
+version = "0.47.3"
 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.2"
+version = "0.47.3"
 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 cdd5cbf0d8..0b1901a8c3 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.2"
+version = "0.47.3"
 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 e4bb06e1d1..3062730416 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.2"
+version = "0.47.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/use-module/Cargo.toml b/contracts/feature-tests/use-module/Cargo.toml
index 41d3418aa9..3d48b6bfe0 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.2"
+version = "0.47.3"
 path = "../../../contracts/modules"
 
 [dependencies.multiversx-sc]
-version = "0.47.2"
+version = "0.47.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.2"
+version = "0.47.3"
 path = "../../../framework/scenario"
 
 [dev-dependencies.multiversx-sc-meta]
-version = "0.47.2"
+version = "0.47.3"
 path = "../../../framework/meta"
diff --git a/contracts/feature-tests/use-module/meta/Cargo.toml b/contracts/feature-tests/use-module/meta/Cargo.toml
index 13751ede31..16cb7c5210 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.2"
+version = "0.47.3"
 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 7305a94f2d..fe61d8c140 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.2"
+version = "0.47.3"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.47.2"
+version = "0.47.3"
 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 1001951c08..fe38c7413d 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.2"
+            "version": "0.47.3"
         }
     },
     "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 875d6d83ea..d6d20af984 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.2"
+            "version": "0.47.3"
         }
     },
     "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 340045b8cb..59483391a5 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.2"
+version = "0.47.3"
 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 0819741645..b4521c33f2 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.2"
+version = "0.47.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/modules/Cargo.toml b/contracts/modules/Cargo.toml
index 40bc436291..3168f0e37b 100644
--- a/contracts/modules/Cargo.toml
+++ b/contracts/modules/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-modules"
-version = "0.47.2"
+version = "0.47.3"
 edition = "2021"
 
 authors = ["MultiversX <contact@multiversx.com>"]
@@ -17,5 +17,5 @@ categories = ["no-std", "wasm", "cryptography::cryptocurrencies"]
 alloc = ["multiversx-sc/alloc"]
 
 [dependencies.multiversx-sc]
-version = "0.47.2"
+version = "0.47.3"
 path = "../../framework/base"
diff --git a/framework/base/Cargo.toml b/framework/base/Cargo.toml
index 527a6ba1ff..e44543aff5 100644
--- a/framework/base/Cargo.toml
+++ b/framework/base/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc"
-version = "0.47.2"
+version = "0.47.3"
 edition = "2021"
 
 authors = ["Andrei Marinica <andrei.marinica@multiversx.com>", "MultiversX <contact@multiversx.com>"]
@@ -27,7 +27,7 @@ bitflags = "=2.4.2"
 num-traits = { version = "=0.2.17", default-features = false }
 
 [dependencies.multiversx-sc-derive]
-version = "=0.47.2"
+version = "=0.47.3"
 path = "../derive"
 
 [dependencies.multiversx-sc-codec]
diff --git a/framework/derive/Cargo.toml b/framework/derive/Cargo.toml
index cdd6f10d5c..81bc4c4a88 100644
--- a/framework/derive/Cargo.toml
+++ b/framework/derive/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-derive"
-version = "0.47.2"
+version = "0.47.3"
 edition = "2021"
 
 authors = ["Andrei Marinica <andrei.marinica@multiversx.com>", "MultiversX <contact@multiversx.com>"]
diff --git a/framework/meta/Cargo.toml b/framework/meta/Cargo.toml
index e2cd353cf3..a343484397 100644
--- a/framework/meta/Cargo.toml
+++ b/framework/meta/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-meta"
-version = "0.47.2"
+version = "0.47.3"
 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.2"
+version = "=0.47.3"
 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 2d67fe44c4..dc4072e1da 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.2"
+version = "0.47.3"
 
 # [workspace]
 
diff --git a/framework/meta/src/cmd/contract/meta_config.rs b/framework/meta/src/cmd/contract/meta_config.rs
index 14938b1989..400a1d3eed 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.2\"
+version = \"0.47.3\"
 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.2".to_string(),
+            framework_version: "0.47.3".to_string(),
             framework_path: Option::Some("../../../framework/base".to_string()),
             contract_features: Vec::<String>::new(),
         };
diff --git a/framework/meta/src/version_history.rs b/framework/meta/src/version_history.rs
index fc82b2e482..92afe9b3b6 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.2);
+pub const LAST_VERSION: FrameworkVersion = framework_version!(0.47.3);
 
 /// Indicates where to stop with the upgrades.
 pub const LAST_UPGRADE_VERSION: FrameworkVersion = LAST_VERSION;
@@ -60,6 +60,7 @@ pub const VERSIONS: &[FrameworkVersion] = framework_versions![
     0.47.0,
     0.47.1,
     0.47.2,
+    0.47.3,
 ];
 
 #[rustfmt::skip]
@@ -81,7 +82,7 @@ pub const CHECK_AFTER_UPGRADE_TO: &[FrameworkVersion] = framework_versions![
     0.44.0,
     0.45.2,
     0.46.0,
-    0.47.2,
+    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 bf070ffa09..f6d036ee75 100644
--- a/framework/scenario/Cargo.toml
+++ b/framework/scenario/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-scenario"
-version = "0.47.2"
+version = "0.47.3"
 edition = "2021"
 
 authors = [
@@ -40,12 +40,12 @@ path = "src/main.rs"
 run-go-tests = []
 
 [dependencies.multiversx-sc]
-version = "=0.47.2"
+version = "=0.47.3"
 features = ["alloc", "num-bigint"]
 path = "../base"
 
 [dependencies.multiversx-sc-meta]
-version = "=0.47.2"
+version = "=0.47.3"
 path = "../meta"
 
 [dependencies.multiversx-chain-scenario-format]
@@ -60,5 +60,5 @@ version = "=0.8.2"
 path = "../../vm"
 
 [dependencies.multiversx-sdk]
-version = "=0.3.1"
+version = "=0.3.2"
 path = "../../sdk/core"
diff --git a/framework/snippets/Cargo.toml b/framework/snippets/Cargo.toml
index 8cb12f1a60..b1f16b110a 100644
--- a/framework/snippets/Cargo.toml
+++ b/framework/snippets/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-snippets"
-version = "0.47.2"
+version = "0.47.3"
 edition = "2021"
 
 authors = ["MultiversX <contact@multiversx.com>"]
@@ -22,9 +22,9 @@ env_logger = "0.11"
 futures = "0.3"
 
 [dependencies.multiversx-sc-scenario]
-version = "=0.47.2"
+version = "=0.47.3"
 path = "../scenario"
 
 [dependencies.multiversx-sdk]
-version = "=0.3.1"
+version = "=0.3.2"
 path = "../../sdk/core"
diff --git a/framework/wasm-adapter/Cargo.toml b/framework/wasm-adapter/Cargo.toml
index 5072877adb..53d4097fa1 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.2"
+version = "0.47.3"
 edition = "2021"
 
 authors = [
@@ -22,5 +22,5 @@ categories = [
 ]
 
 [dependencies.multiversx-sc]
-version = "=0.47.2"
+version = "=0.47.3"
 path = "../base"
diff --git a/sdk/core/Cargo.toml b/sdk/core/Cargo.toml
index 8227e5422e..c3f7aefd73 100644
--- a/sdk/core/Cargo.toml
+++ b/sdk/core/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sdk"
-version = "0.3.1"
+version = "0.3.2"
 edition = "2021"
 
 authors = [
diff --git a/tools/mxpy-snippet-generator/Cargo.toml b/tools/mxpy-snippet-generator/Cargo.toml
index 278ec0c270..3c1d3d57ce 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.2"
+version = "0.47.3"
 path = "../../framework/base"
 
 [dependencies]
diff --git a/tools/rust-debugger/format-tests/Cargo.toml b/tools/rust-debugger/format-tests/Cargo.toml
index 6bcfb53f5c..e233dcd80f 100644
--- a/tools/rust-debugger/format-tests/Cargo.toml
+++ b/tools/rust-debugger/format-tests/Cargo.toml
@@ -9,11 +9,11 @@ name = "format-tests"
 path = "src/format_tests.rs"
 
 [dependencies.multiversx-sc]
-version = "0.47.2"
+version = "0.47.3"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-scenario]
-version = "0.47.2"
+version = "0.47.3"
 path = "../../../framework/scenario"
 
 [dependencies.multiversx-chain-vm]

From 0252b60ee37b5738689021c39aa1fc4e31b8c258 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 6 Feb 2024 14:04:22 +0200
Subject: [PATCH 0329/1254] Cargo.lock update

---
 .../benchmarks/large-storage/wasm/Cargo.lock  |  6 +-
 .../linked-list-repeat/wasm/Cargo.lock        |  6 +-
 .../mappers/map-repeat/wasm/Cargo.lock        |  6 +-
 .../mappers/queue-repeat/wasm/Cargo.lock      |  6 +-
 .../mappers/set-repeat/wasm/Cargo.lock        |  6 +-
 .../single-value-repeat/wasm/Cargo.lock       |  6 +-
 .../mappers/vec-repeat/wasm/Cargo.lock        |  6 +-
 .../benchmarks/send-tx-repeat/wasm/Cargo.lock |  6 +-
 .../benchmarks/str-repeat/wasm/Cargo.lock     |  6 +-
 .../core/price-aggregator/wasm/Cargo.lock     | 10 +-
 contracts/examples/adder/wasm/Cargo.lock      |  6 +-
 .../bonding-curve-contract/wasm/Cargo.lock    |  8 +-
 .../examples/check-pause/wasm/Cargo.lock      |  8 +-
 .../crowdfunding-esdt/wasm/Cargo.lock         |  6 +-
 .../examples/crypto-bubbles/wasm/Cargo.lock   |  6 +-
 .../kitty-auction/wasm/Cargo.lock             |  6 +-
 .../kitty-genetic-alg/wasm/Cargo.lock         |  6 +-
 .../kitty-ownership/wasm/Cargo.lock           |  6 +-
 .../examples/crypto-zombies/wasm/Cargo.lock   |  6 +-
 .../examples/digital-cash/wasm/Cargo.lock     |  6 +-
 contracts/examples/empty/wasm/Cargo.lock      |  6 +-
 .../esdt-transfer-with-fee/wasm/Cargo.lock    |  6 +-
 contracts/examples/factorial/wasm/Cargo.lock  |  6 +-
 .../examples/fractional-nfts/wasm/Cargo.lock  |  8 +-
 .../examples/lottery-esdt/wasm/Cargo.lock     |  6 +-
 .../multisig/wasm-multisig-full/Cargo.lock    |  8 +-
 .../multisig/wasm-multisig-view/Cargo.lock    |  8 +-
 contracts/examples/multisig/wasm/Cargo.lock   |  8 +-
 contracts/examples/nft-minter/wasm/Cargo.lock |  6 +-
 .../nft-storage-prepay/wasm/Cargo.lock        |  6 +-
 .../examples/nft-subscription/wasm/Cargo.lock |  8 +-
 .../order-book/factory/wasm/Cargo.lock        |  6 +-
 .../examples/order-book/pair/wasm/Cargo.lock  |  6 +-
 .../examples/ping-pong-egld/wasm/Cargo.lock   |  6 +-
 .../examples/proxy-pause/wasm/Cargo.lock      |  6 +-
 .../rewards-distribution/wasm/Cargo.lock      |  8 +-
 .../examples/seed-nft-minter/wasm/Cargo.lock  |  8 +-
 .../examples/token-release/wasm/Cargo.lock    |  6 +-
 .../abi-tester/wasm-abi-tester-ev/Cargo.lock  |  6 +-
 .../feature-tests/abi-tester/wasm/Cargo.lock  |  6 +-
 .../wasm-alloc-mem-fail/Cargo.lock            | 10 +-
 .../wasm-alloc-mem-fail/Cargo.toml            |  2 +-
 .../wasm-alloc-mem-fail/src/lib.rs            | 91 +++++++++++++++++++
 .../wasm-alloc-mem-leaking/Cargo.lock         | 10 +-
 .../wasm-alloc-mem-leaking/Cargo.toml         |  2 +-
 .../wasm-alloc-mem-leaking/src/lib.rs         | 91 +++++++++++++++++++
 .../alloc-features/wasm/Cargo.lock            |  6 +-
 .../alloc-features/wasm/src/lib.rs            |  4 +-
 .../Cargo.lock                                |  8 +-
 .../basic-features/wasm/Cargo.lock            |  8 +-
 .../big-float-features/wasm/Cargo.lock        |  6 +-
 .../builtin-func-features/wasm/Cargo.lock     |  6 +-
 .../first-contract/wasm/Cargo.lock            |  6 +-
 .../second-contract/wasm/Cargo.lock           |  6 +-
 .../child/wasm/Cargo.lock                     |  6 +-
 .../parent/wasm/Cargo.lock                    |  6 +-
 .../wasm-forwarder-queue-promises/Cargo.lock  |  6 +-
 .../forwarder-queue/wasm/Cargo.lock           |  6 +-
 .../Cargo.lock                                |  6 +-
 .../Cargo.lock                                |  6 +-
 .../forwarder-raw/wasm/Cargo.lock             |  6 +-
 .../composability/forwarder/wasm/Cargo.lock   |  6 +-
 .../local-esdt-and-nft/wasm/Cargo.lock        |  6 +-
 .../promises-features/wasm/Cargo.lock         |  6 +-
 .../proxy-test-first/wasm/Cargo.lock          |  6 +-
 .../proxy-test-second/wasm/Cargo.lock         |  6 +-
 .../recursive-caller/wasm/Cargo.lock          |  6 +-
 .../transfer-role-features/wasm/Cargo.lock    |  8 +-
 .../vault/wasm-vault-promises/Cargo.lock      |  6 +-
 .../vault/wasm-vault-upgrade/Cargo.lock       |  6 +-
 .../composability/vault/wasm/Cargo.lock       |  6 +-
 .../crowdfunding-erc20/wasm/Cargo.lock        |  6 +-
 .../erc1155-marketplace/wasm/Cargo.lock       |  6 +-
 .../erc1155-user-mock/wasm/Cargo.lock         |  6 +-
 .../erc1155/wasm/Cargo.lock                   |  6 +-
 .../erc-style-contracts/erc20/wasm/Cargo.lock |  6 +-
 .../erc721/wasm/Cargo.lock                    |  6 +-
 .../lottery-erc20/wasm/Cargo.lock             |  6 +-
 .../esdt-system-sc-mock/wasm/Cargo.lock       |  6 +-
 .../wasm/Cargo.lock                           |  6 +-
 .../managed-map-features/wasm/Cargo.lock      |  6 +-
 .../wasm-multi-contract-alt-impl/Cargo.lock   |  6 +-
 .../Cargo.lock                                |  6 +-
 .../Cargo.lock                                |  6 +-
 .../multi-contract-features/wasm/Cargo.lock   |  6 +-
 .../multi-contract-features/wasm/src/lib.rs   |  4 +-
 .../panic-message-features/wasm/Cargo.lock    |  6 +-
 .../payable-features/wasm/Cargo.lock          |  6 +-
 .../wasm/Cargo.lock                           |  6 +-
 .../wasm/Cargo.lock                           |  6 +-
 .../wasm-use-module-view/Cargo.lock           |  8 +-
 .../feature-tests/use-module/wasm/Cargo.lock  |  8 +-
 92 files changed, 464 insertions(+), 286 deletions(-)
 create mode 100644 contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/src/lib.rs
 create mode 100644 contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/src/lib.rs

diff --git a/contracts/benchmarks/large-storage/wasm/Cargo.lock b/contracts/benchmarks/large-storage/wasm/Cargo.lock
index b0d5dc98c4..66539b7c78 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.47.2"
+version = "0.47.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.lock
index 9b6ea53636..fb40529bbb 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.47.2"
+version = "0.47.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -92,7 +92,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -103,7 +103,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.lock
index f4f9af0e22..0f0f34ca4f 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.47.2"
+version = "0.47.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -92,7 +92,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -103,7 +103,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.lock
index 4a6bf582ab..ee2adae4ab 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.47.2"
+version = "0.47.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.lock
index 6dae67e28b..03d3b8e637 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.47.2"
+version = "0.47.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.lock
index 3a644997a0..4d99a9ef2f 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.47.2"
+version = "0.47.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.lock
index c74a8c9474..eb3587d1f2 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.47.2"
+version = "0.47.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/send-tx-repeat/wasm/Cargo.lock b/contracts/benchmarks/send-tx-repeat/wasm/Cargo.lock
index 4a9aada393..7c3d430e7d 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.47.2"
+version = "0.47.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/str-repeat/wasm/Cargo.lock b/contracts/benchmarks/str-repeat/wasm/Cargo.lock
index 1e7a383860..dc10e79df9 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.47.2"
+version = "0.47.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/core/price-aggregator/wasm/Cargo.lock b/contracts/core/price-aggregator/wasm/Cargo.lock
index bed6e748ce..f78ef7c803 100644
--- a/contracts/core/price-aggregator/wasm/Cargo.lock
+++ b/contracts/core/price-aggregator/wasm/Cargo.lock
@@ -86,7 +86,7 @@ checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
 
 [[package]]
 name = "multiversx-price-aggregator-sc"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "arrayvec",
  "getrandom",
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -134,7 +134,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -145,14 +145,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/adder/wasm/Cargo.lock b/contracts/examples/adder/wasm/Cargo.lock
index 87424c0f25..1dbfeecc21 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.47.2"
+version = "0.47.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/bonding-curve-contract/wasm/Cargo.lock b/contracts/examples/bonding-curve-contract/wasm/Cargo.lock
index 838e83b2a4..32151cae0b 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.47.2"
+version = "0.47.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,14 +96,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/check-pause/wasm/Cargo.lock b/contracts/examples/check-pause/wasm/Cargo.lock
index c8dc112ab5..3e3b8be25c 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.47.2"
+version = "0.47.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,14 +96,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crowdfunding-esdt/wasm/Cargo.lock b/contracts/examples/crowdfunding-esdt/wasm/Cargo.lock
index 2cab0566ac..37fe795b16 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.47.2"
+version = "0.47.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crypto-bubbles/wasm/Cargo.lock b/contracts/examples/crypto-bubbles/wasm/Cargo.lock
index c0ac92098b..0ecb4c8289 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.47.2"
+version = "0.47.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.lock b/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.lock
index e7c7e0d5df..0100ae4f6a 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.47.2"
+version = "0.47.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -113,7 +113,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -124,7 +124,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "multiversx-sc",
 ]
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 205601516f..4dcd5e038e 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.47.2"
+version = "0.47.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.lock b/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.lock
index 0e1c938e5a..1f5b8892ee 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.47.2"
+version = "0.47.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -104,7 +104,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -115,7 +115,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crypto-zombies/wasm/Cargo.lock b/contracts/examples/crypto-zombies/wasm/Cargo.lock
index 426468847e..330e342bb4 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.47.2"
+version = "0.47.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/digital-cash/wasm/Cargo.lock b/contracts/examples/digital-cash/wasm/Cargo.lock
index 38ba116686..17b6e812df 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.47.2"
+version = "0.47.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/empty/wasm/Cargo.lock b/contracts/examples/empty/wasm/Cargo.lock
index 02d683e8e1..c11ef9dbb1 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.47.2"
+version = "0.47.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.lock b/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.lock
index 1fa90e2cdb..595f04eddd 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.47.2"
+version = "0.47.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/factorial/wasm/Cargo.lock b/contracts/examples/factorial/wasm/Cargo.lock
index 8ec0d73e06..fa8295418a 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.47.2"
+version = "0.47.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/fractional-nfts/wasm/Cargo.lock b/contracts/examples/fractional-nfts/wasm/Cargo.lock
index 26389281dd..8e7c1bd93a 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.47.2"
+version = "0.47.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,14 +96,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/lottery-esdt/wasm/Cargo.lock b/contracts/examples/lottery-esdt/wasm/Cargo.lock
index 7d0b196ef5..f15bb67869 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.47.2"
+version = "0.47.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/multisig/wasm-multisig-full/Cargo.lock b/contracts/examples/multisig/wasm-multisig-full/Cargo.lock
index 034effb093..a0d4ee5b27 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.47.2"
+version = "0.47.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,14 +96,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/multisig/wasm-multisig-view/Cargo.lock b/contracts/examples/multisig/wasm-multisig-view/Cargo.lock
index 7de79104d4..b026d56c78 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.47.2"
+version = "0.47.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,14 +96,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/multisig/wasm/Cargo.lock b/contracts/examples/multisig/wasm/Cargo.lock
index adcd4070d5..74c8da6b32 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.47.2"
+version = "0.47.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,14 +96,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/nft-minter/wasm/Cargo.lock b/contracts/examples/nft-minter/wasm/Cargo.lock
index cb13e69fc3..96fbf6ebfc 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.47.2"
+version = "0.47.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/nft-storage-prepay/wasm/Cargo.lock b/contracts/examples/nft-storage-prepay/wasm/Cargo.lock
index 09ebc8d20b..52baa85dd8 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.47.2"
+version = "0.47.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/nft-subscription/wasm/Cargo.lock b/contracts/examples/nft-subscription/wasm/Cargo.lock
index 5fd9cdcf01..26faeb3bfe 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.47.2"
+version = "0.47.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,14 +80,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/order-book/factory/wasm/Cargo.lock b/contracts/examples/order-book/factory/wasm/Cargo.lock
index 05c81a6ae4..0c8e38ecfc 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.47.2"
+version = "0.47.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/order-book/pair/wasm/Cargo.lock b/contracts/examples/order-book/pair/wasm/Cargo.lock
index 1642e9662e..416a38f60f 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.47.2"
+version = "0.47.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/ping-pong-egld/wasm/Cargo.lock b/contracts/examples/ping-pong-egld/wasm/Cargo.lock
index c4323a01e1..dc763d516a 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.47.2"
+version = "0.47.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/proxy-pause/wasm/Cargo.lock b/contracts/examples/proxy-pause/wasm/Cargo.lock
index 6ae5d8a527..586d62d379 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.47.2"
+version = "0.47.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/rewards-distribution/wasm/Cargo.lock b/contracts/examples/rewards-distribution/wasm/Cargo.lock
index f922a0bf3c..7e14194a4c 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.47.2"
+version = "0.47.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,14 +80,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/seed-nft-minter/wasm/Cargo.lock b/contracts/examples/seed-nft-minter/wasm/Cargo.lock
index f29f3fc3d3..db59fda089 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.47.2"
+version = "0.47.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,14 +80,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/token-release/wasm/Cargo.lock b/contracts/examples/token-release/wasm/Cargo.lock
index f179940ab2..6750987cc0 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.47.2"
+version = "0.47.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "multiversx-sc",
 ]
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 a01d3eab5e..fb93072107 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.47.2"
+version = "0.47.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/abi-tester/wasm/Cargo.lock b/contracts/feature-tests/abi-tester/wasm/Cargo.lock
index 852b8903f2..a2cfd547b0 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.47.2"
+version = "0.47.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock
index 0d04c6f00f..0dd3c8a34e 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.1"
+version = "0.47.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.1"
+version = "0.47.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.1"
+version = "0.47.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml
index 9799d2a803..d30d006375 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml
@@ -25,7 +25,7 @@ overflow-checks = false
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.47.1"
+version = "0.47.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/src/lib.rs b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/src/lib.rs
new file mode 100644
index 0000000000..675bddb53d
--- /dev/null
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/src/lib.rs
@@ -0,0 +1,91 @@
+// Code generated by the multiversx-sc build system. DO NOT EDIT.
+
+////////////////////////////////////////////////////
+////////////////// AUTO-GENERATED //////////////////
+////////////////////////////////////////////////////
+
+// Init:                                 1
+// Endpoints:                           65
+// Async Callback (empty):               1
+// Total number of exported functions:  67
+
+#![no_std]
+#![allow(internal_features)]
+#![feature(lang_items)]
+
+multiversx_sc_wasm_adapter::allocator!();
+multiversx_sc_wasm_adapter::panic_handler!();
+
+multiversx_sc_wasm_adapter::endpoints! {
+    alloc_features
+    (
+        init => init
+        echo_h256 => echo_h256
+        echo_boxed_array_u8 => echo_boxed_array_u8
+        echo_boxed_bytes => echo_boxed_bytes
+        echo_slice_u8 => echo_slice_u8
+        echo_vec_u8 => echo_vec_u8
+        echo_string => echo_string
+        echo_str => echo_str
+        echo_str_box => echo_str_box
+        echo_async_result_empty => echo_async_result_empty
+        echo_large_boxed_byte_array => echo_large_boxed_byte_array
+        echo_boxed_ser_example_1 => echo_boxed_ser_example_1
+        echo_multi_value_tuples => echo_multi_value_tuples
+        echo_ser_example_1 => echo_ser_example_1
+        echo_vec_of_managed_buffer => echo_vec_of_managed_buffer
+        echo_big_int_vec => echo_big_int_vec
+        echo_varags_u32 => echo_varags_u32
+        echo_varags_big_uint => echo_varags_big_uint
+        compute_get_values => compute_get_values
+        compute_create_ec => compute_create_ec
+        compute_get_ec_length => compute_get_ec_length
+        compute_get_priv_key_byte_length => compute_get_priv_key_byte_length
+        compute_ec_add => compute_ec_add
+        compute_ec_double => compute_ec_double
+        compute_is_on_curve_ec => compute_is_on_curve_ec
+        compute_scalar_mult => compute_scalar_mult
+        compute_scalar_base_mult => compute_scalar_base_mult
+        compute_marshal_ec => compute_marshal_ec
+        compute_marshal_compressed_ec => compute_marshal_compressed_ec
+        compute_unmarshal_ec => compute_unmarshal_ec
+        compute_unmarshal_compressed_ec => compute_unmarshal_compressed_ec
+        compute_generate_key_ec => compute_generate_key_ec
+        only_owner_legacy => only_owner_legacy
+        return_sc_error => return_sc_error
+        result_ok => result_ok
+        result_err_from_bytes_1 => result_err_from_bytes_1
+        result_err_from_bytes_2 => result_err_from_bytes_2
+        result_err_from_bytes_3 => result_err_from_bytes_3
+        result_err_from_string => result_err_from_string
+        result_err_from_str => result_err_from_str
+        result_echo => result_echo
+        result_echo_2 => result_echo_2
+        result_echo_3 => result_echo_3
+        mbuffer_from_slice => mbuffer_from_slice
+        mbuffer_from_boxed_bytes => mbuffer_from_boxed_bytes
+        mbuffer_overwrite => mbuffer_overwrite
+        mbuffer_append_bytes => mbuffer_append_bytes
+        mbuffer_load_slice => mbuffer_load_slice
+        mbuffer_set_slice => mbuffer_set_slice
+        managed_address_from => managed_address_from
+        load_vec_u8 => load_vec_u8
+        load_addr => load_addr
+        load_opt_addr => load_opt_addr
+        is_empty_opt_addr => is_empty_opt_addr
+        load_ser_1 => load_ser_1
+        store_vec_u8 => store_vec_u8
+        store_addr => store_addr
+        store_opt_addr => store_opt_addr
+        store_ser_1 => store_ser_1
+        compare_h256 => compare_h256
+        h256_is_zero => h256_is_zero
+        boxed_bytes_zeros => boxed_bytes_zeros
+        boxed_bytes_concat_2 => boxed_bytes_concat_2
+        boxed_bytes_split => boxed_bytes_split
+        vec_concat_const => vec_concat_const
+        alloc_with_fail_memory => alloc_with_fail_memory
+    )
+}
+
+multiversx_sc_wasm_adapter::async_callback_empty! {}
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.lock b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.lock
index 5a9846cf0e..478995d08d 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.lock
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.lock
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.1"
+version = "0.47.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.5"
+version = "0.18.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.1"
+version = "0.47.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.1"
+version = "0.47.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml
index 8d4db63187..ccda5c15f4 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml
@@ -25,7 +25,7 @@ overflow-checks = false
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.47.1"
+version = "0.47.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/src/lib.rs b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/src/lib.rs
new file mode 100644
index 0000000000..55d2f88725
--- /dev/null
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/src/lib.rs
@@ -0,0 +1,91 @@
+// Code generated by the multiversx-sc build system. DO NOT EDIT.
+
+////////////////////////////////////////////////////
+////////////////// AUTO-GENERATED //////////////////
+////////////////////////////////////////////////////
+
+// Init:                                 1
+// Endpoints:                           65
+// Async Callback (empty):               1
+// Total number of exported functions:  67
+
+#![no_std]
+#![allow(internal_features)]
+#![feature(lang_items)]
+
+multiversx_sc_wasm_adapter::allocator!(leaking);
+multiversx_sc_wasm_adapter::panic_handler!();
+
+multiversx_sc_wasm_adapter::endpoints! {
+    alloc_features
+    (
+        init => init
+        echo_h256 => echo_h256
+        echo_boxed_array_u8 => echo_boxed_array_u8
+        echo_boxed_bytes => echo_boxed_bytes
+        echo_slice_u8 => echo_slice_u8
+        echo_vec_u8 => echo_vec_u8
+        echo_string => echo_string
+        echo_str => echo_str
+        echo_str_box => echo_str_box
+        echo_async_result_empty => echo_async_result_empty
+        echo_large_boxed_byte_array => echo_large_boxed_byte_array
+        echo_boxed_ser_example_1 => echo_boxed_ser_example_1
+        echo_multi_value_tuples => echo_multi_value_tuples
+        echo_ser_example_1 => echo_ser_example_1
+        echo_vec_of_managed_buffer => echo_vec_of_managed_buffer
+        echo_big_int_vec => echo_big_int_vec
+        echo_varags_u32 => echo_varags_u32
+        echo_varags_big_uint => echo_varags_big_uint
+        compute_get_values => compute_get_values
+        compute_create_ec => compute_create_ec
+        compute_get_ec_length => compute_get_ec_length
+        compute_get_priv_key_byte_length => compute_get_priv_key_byte_length
+        compute_ec_add => compute_ec_add
+        compute_ec_double => compute_ec_double
+        compute_is_on_curve_ec => compute_is_on_curve_ec
+        compute_scalar_mult => compute_scalar_mult
+        compute_scalar_base_mult => compute_scalar_base_mult
+        compute_marshal_ec => compute_marshal_ec
+        compute_marshal_compressed_ec => compute_marshal_compressed_ec
+        compute_unmarshal_ec => compute_unmarshal_ec
+        compute_unmarshal_compressed_ec => compute_unmarshal_compressed_ec
+        compute_generate_key_ec => compute_generate_key_ec
+        only_owner_legacy => only_owner_legacy
+        return_sc_error => return_sc_error
+        result_ok => result_ok
+        result_err_from_bytes_1 => result_err_from_bytes_1
+        result_err_from_bytes_2 => result_err_from_bytes_2
+        result_err_from_bytes_3 => result_err_from_bytes_3
+        result_err_from_string => result_err_from_string
+        result_err_from_str => result_err_from_str
+        result_echo => result_echo
+        result_echo_2 => result_echo_2
+        result_echo_3 => result_echo_3
+        mbuffer_from_slice => mbuffer_from_slice
+        mbuffer_from_boxed_bytes => mbuffer_from_boxed_bytes
+        mbuffer_overwrite => mbuffer_overwrite
+        mbuffer_append_bytes => mbuffer_append_bytes
+        mbuffer_load_slice => mbuffer_load_slice
+        mbuffer_set_slice => mbuffer_set_slice
+        managed_address_from => managed_address_from
+        load_vec_u8 => load_vec_u8
+        load_addr => load_addr
+        load_opt_addr => load_opt_addr
+        is_empty_opt_addr => is_empty_opt_addr
+        load_ser_1 => load_ser_1
+        store_vec_u8 => store_vec_u8
+        store_addr => store_addr
+        store_opt_addr => store_opt_addr
+        store_ser_1 => store_ser_1
+        compare_h256 => compare_h256
+        h256_is_zero => h256_is_zero
+        boxed_bytes_zeros => boxed_bytes_zeros
+        boxed_bytes_concat_2 => boxed_bytes_concat_2
+        boxed_bytes_split => boxed_bytes_split
+        vec_concat_const => vec_concat_const
+        alloc_with_leaking_memory => alloc_with_leaking_memory
+    )
+}
+
+multiversx_sc_wasm_adapter::async_callback_empty! {}
diff --git a/contracts/feature-tests/alloc-features/wasm/Cargo.lock b/contracts/feature-tests/alloc-features/wasm/Cargo.lock
index 3f18f2ff37..3bd5ec76ff 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.47.2"
+version = "0.47.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/alloc-features/wasm/src/lib.rs b/contracts/feature-tests/alloc-features/wasm/src/lib.rs
index d94121084e..f01cc37f8b 100644
--- a/contracts/feature-tests/alloc-features/wasm/src/lib.rs
+++ b/contracts/feature-tests/alloc-features/wasm/src/lib.rs
@@ -10,9 +10,7 @@
 // Total number of exported functions:  66
 
 #![no_std]
-
-// Configuration that works with rustc < 1.73.0.
-// TODO: Recommended rustc version: 1.73.0 or newer.
+#![allow(internal_features)]
 #![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!(static64k);
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 fa0c705fb0..506ab908d9 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.47.2"
+version = "0.47.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,14 +96,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/basic-features/wasm/Cargo.lock b/contracts/feature-tests/basic-features/wasm/Cargo.lock
index 8072ac0272..a9e185930f 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.47.2"
+version = "0.47.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,14 +96,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/big-float-features/wasm/Cargo.lock b/contracts/feature-tests/big-float-features/wasm/Cargo.lock
index 9371e6c673..77df781a59 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.47.2"
+version = "0.47.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "multiversx-sc",
 ]
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 03c114fb07..429c78c037 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.47.2"
+version = "0.47.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "multiversx-sc",
 ]
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 e4531fe8fc..dbc99448a0 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.47.2"
+version = "0.47.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "multiversx-sc",
 ]
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 d7ef86e524..8d9372cb47 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.47.2"
+version = "0.47.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "multiversx-sc",
 ]
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 b99b1d23a4..074007b500 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.47.2"
+version = "0.47.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "multiversx-sc",
 ]
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 bff8dc0ae4..d5ba929a36 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.47.2"
+version = "0.47.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "multiversx-sc",
 ]
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 acf0176f05..89c1886860 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.47.2"
+version = "0.47.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,7 +96,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock
index a8a4009fc5..60b9a450b2 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.47.2"
+version = "0.47.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,7 +96,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "multiversx-sc",
 ]
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 33f7ed43de..cf5aefa3c4 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.47.2"
+version = "0.47.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "multiversx-sc",
 ]
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 44a0fabbd6..8d65aaa888 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.47.2"
+version = "0.47.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.lock
index 653cef8d89..41a64d6e7d 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.47.2"
+version = "0.47.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock
index 5d415ecb4f..346b304ae3 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.47.2"
+version = "0.47.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,7 +96,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "multiversx-sc",
 ]
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 ecbdecfeff..3ebc1e57d1 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.47.2"
+version = "0.47.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/promises-features/wasm/Cargo.lock b/contracts/feature-tests/composability/promises-features/wasm/Cargo.lock
index bb0124a03d..cdbae5fac9 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.47.2"
+version = "0.47.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "multiversx-sc",
 ]
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 a58e520ded..5f4dfb67a8 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.47.2"
+version = "0.47.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "multiversx-sc",
 ]
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 adae09cc71..5fdfa521de 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.47.2"
+version = "0.47.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.lock b/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.lock
index f777cafcd6..f0c8bb95e7 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.47.2"
+version = "0.47.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "multiversx-sc",
 ]
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 287030bd35..ec66e3cada 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.47.2"
+version = "0.47.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,14 +80,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "multiversx-sc",
 ]
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 f1af95e185..31b660687b 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.47.2"
+version = "0.47.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "multiversx-sc",
 ]
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 8f8415824f..863b19fd4f 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.47.2"
+version = "0.47.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/vault/wasm/Cargo.lock b/contracts/feature-tests/composability/vault/wasm/Cargo.lock
index f9b1a9908a..8736fb15b2 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.47.2"
+version = "0.47.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "multiversx-sc",
 ]
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 23a61410c0..3ed6df3a09 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.47.2"
+version = "0.47.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -92,7 +92,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -103,7 +103,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "multiversx-sc",
 ]
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 3574277328..6a5f79da57 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.47.2"
+version = "0.47.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -92,7 +92,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -103,7 +103,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "multiversx-sc",
 ]
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 044758e9a0..5cb5908c1e 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.47.2"
+version = "0.47.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "multiversx-sc",
 ]
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 1d22e4d8ac..ed904a262f 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.47.2"
+version = "0.47.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "multiversx-sc",
 ]
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 9b6aba8a51..1524da2306 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.47.2"
+version = "0.47.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "multiversx-sc",
 ]
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 aef8b209f1..2e52ab7df2 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.47.2"
+version = "0.47.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "multiversx-sc",
 ]
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 a9c11a015f..f825b4adfd 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.47.2"
+version = "0.47.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -92,7 +92,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -103,7 +103,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "multiversx-sc",
 ]
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 7716b96ff3..80e5fec4e2 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.47.2"
+version = "0.47.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/formatted-message-features/wasm/Cargo.lock b/contracts/feature-tests/formatted-message-features/wasm/Cargo.lock
index 60b58bf37b..9a7a877b75 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.47.2"
+version = "0.47.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/managed-map-features/wasm/Cargo.lock b/contracts/feature-tests/managed-map-features/wasm/Cargo.lock
index ea67433217..4845f4055e 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.47.2"
+version = "0.47.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "multiversx-sc",
 ]
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 3ebb8ea84a..fa3d1d0421 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.47.2"
+version = "0.47.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "multiversx-sc",
 ]
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 96763ef26d..4238e8e323 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.47.2"
+version = "0.47.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "multiversx-sc",
 ]
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 a0dd0093e6..725f614e99 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.47.2"
+version = "0.47.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/multi-contract-features/wasm/Cargo.lock b/contracts/feature-tests/multi-contract-features/wasm/Cargo.lock
index 5f9d536467..e68c6fe000 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.47.2"
+version = "0.47.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/multi-contract-features/wasm/src/lib.rs b/contracts/feature-tests/multi-contract-features/wasm/src/lib.rs
index 32c7c0cf3f..655e83240c 100644
--- a/contracts/feature-tests/multi-contract-features/wasm/src/lib.rs
+++ b/contracts/feature-tests/multi-contract-features/wasm/src/lib.rs
@@ -10,9 +10,7 @@
 // Total number of exported functions:   4
 
 #![no_std]
-
-// Configuration that works with rustc < 1.73.0.
-// TODO: Recommended rustc version: 1.73.0 or newer.
+#![allow(internal_features)]
 #![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
diff --git a/contracts/feature-tests/panic-message-features/wasm/Cargo.lock b/contracts/feature-tests/panic-message-features/wasm/Cargo.lock
index c893bab211..59ad014eb2 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.47.2"
+version = "0.47.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/payable-features/wasm/Cargo.lock b/contracts/feature-tests/payable-features/wasm/Cargo.lock
index 7bb49ddb7b..0fa8f25b40 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.47.2"
+version = "0.47.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "multiversx-sc",
 ]
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 d988e88d93..bc5ce7e7a0 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.47.2"
+version = "0.47.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "multiversx-sc",
 ]
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 d04e6f35bd..89c91a1d95 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.47.2"
+version = "0.47.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "multiversx-sc",
 ]
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 386412b436..225b9ef110 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.47.2"
+version = "0.47.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,14 +80,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/use-module/wasm/Cargo.lock b/contracts/feature-tests/use-module/wasm/Cargo.lock
index 430481c2ef..2a61bb775b 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.47.2"
+version = "0.47.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,14 +80,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.2"
+version = "0.47.3"
 dependencies = [
  "multiversx-sc",
 ]

From a5364e97b9d849a12c512a2f0e6fc1a515556661 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Tue, 6 Feb 2024 16:36:26 +0200
Subject: [PATCH 0330/1254] add reports

---
 .../benchmarks/str-repeat/wasm/src/lib.rs     |  4 +-
 contracts/examples/adder/wasm/src/lib.rs      |  4 +-
 .../src/cmd/contract/sc_config/wasm_build.rs  | 59 +++++++++----------
 framework/meta/src/ei_check_json.rs           | 17 +++---
 framework/meta/src/report_info_json.rs        |  8 ++-
 framework/meta/src/tools/wasm_extractor.rs    | 43 ++++++++++----
 6 files changed, 81 insertions(+), 54 deletions(-)

diff --git a/contracts/benchmarks/str-repeat/wasm/src/lib.rs b/contracts/benchmarks/str-repeat/wasm/src/lib.rs
index 45af6112da..894a1bc4c0 100644
--- a/contracts/benchmarks/str-repeat/wasm/src/lib.rs
+++ b/contracts/benchmarks/str-repeat/wasm/src/lib.rs
@@ -10,7 +10,9 @@
 // Total number of exported functions:   5
 
 #![no_std]
-#![allow(internal_features)]
+
+// Configuration that works with rustc < 1.73.0.
+// TODO: Recommended rustc version: 1.73.0 or newer.
 #![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!(leaking);
diff --git a/contracts/examples/adder/wasm/src/lib.rs b/contracts/examples/adder/wasm/src/lib.rs
index 13bb12ad6e..b364edf422 100644
--- a/contracts/examples/adder/wasm/src/lib.rs
+++ b/contracts/examples/adder/wasm/src/lib.rs
@@ -10,7 +10,9 @@
 // Total number of exported functions:   5
 
 #![no_std]
-#![allow(internal_features)]
+
+// Configuration that works with rustc < 1.73.0.
+// TODO: Recommended rustc version: 1.73.0 or newer.
 #![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
diff --git a/framework/meta/src/cmd/contract/sc_config/wasm_build.rs b/framework/meta/src/cmd/contract/sc_config/wasm_build.rs
index 6df22c35a2..7f6fcabbac 100644
--- a/framework/meta/src/cmd/contract/sc_config/wasm_build.rs
+++ b/framework/meta/src/cmd/contract/sc_config/wasm_build.rs
@@ -73,9 +73,9 @@ impl ContractVariant {
         self.copy_contracts_to_output(build_args, output_path);
         self.run_wasm_opt(build_args, output_path);
         self.run_wasm2wat(build_args, output_path);
-        let ei_check = self.extract_imports(build_args, output_path, &mut wasm_data);
+        let wasm_info = self.extract_wasm_info(build_args, output_path);
         self.run_twiggy(build_args, output_path);
-        self.pack_mxsc_file(build_args, output_path, wasm_data, ei_check);
+        self.pack_mxsc_file(build_args, output_path, wasm_info);
     }
 
     fn copy_contracts_to_output(&self, build_args: &BuildArgs, output_path: &str) {
@@ -86,13 +86,7 @@ impl ContractVariant {
             .expect("failed to copy compiled contract to output directory");
     }
 
-    fn pack_mxsc_file(
-        &self,
-        build_args: &BuildArgs,
-        output_path: &str,
-        wasm_info: WasmInfo,
-        ei_check: Option<EiCheckJson>,
-    ) {
+    fn pack_mxsc_file(&self, build_args: &BuildArgs, output_path: &str, wasm_info: WasmInfo) {
         let output_wasm_path = format!("{output_path}/{}", self.wasm_output_name(build_args));
         let compiled_bytes = fs::read(output_wasm_path).expect("failed to open compiled contract");
         let output_mxsc_path = format!("{output_path}/{}", self.mxsc_file_output_name(build_args));
@@ -100,7 +94,8 @@ impl ContractVariant {
         print_contract_size(compiled_bytes.len());
         let mut abi = ContractAbiJson::from(&self.abi);
         let build_info = core::mem::take(&mut abi.build_info).unwrap();
-        let report = ReportInfoJson::new(&wasm_info, ei_check);
+        let ei_check_json = EiCheckJson::new(&self.settings.check_ei, wasm_info.ei_check);
+        let report = ReportInfoJson::new(&wasm_info, ei_check_json);
         let mxsc_file_json = MxscFileJson {
             build_info,
             abi,
@@ -133,13 +128,16 @@ impl ContractVariant {
         tools::wasm_to_wat(output_wasm_path.as_str(), output_wat_path.as_str());
     }
 
-    fn extract_wasm_info(&self, build_args: &BuildArgs, output_path: &str) -> Option<EiCheckJson>  {
+    fn extract_wasm_info(&self, build_args: &BuildArgs, output_path: &str) -> WasmInfo {
         let output_wasm_path = format!("{output_path}/{}", self.wasm_output_name(build_args));
 
         if !build_args.extract_imports {
-            WasmInfo::extract_wasm_info(&output_wasm_path, build_args.extract_imports)
-                .expect("error occured while extracting imports from .wasm ");
-            return None;
+            return WasmInfo::extract_wasm_info(
+                &output_wasm_path,
+                build_args.extract_imports,
+                &self.settings.check_ei,
+            )
+            .expect("error occured while extracting imports from .wasm ");
         }
 
         let output_imports_json_path = format!(
@@ -149,14 +147,17 @@ impl ContractVariant {
         );
         print_extract_imports(&output_imports_json_path);
 
-        let wasm_data = WasmInfo::extract_wasm_info(&output_wasm_path, true)
-            .expect("error occured while extracting imports from .wasm ");
+        let wasm_data =
+            WasmInfo::extract_wasm_info(&output_wasm_path, true, &self.settings.check_ei)
+                .expect("error occured while extracting imports from .wasm ");
 
         write_imports_output(
             output_imports_json_path.as_str(),
             wasm_data.imports.as_slice(),
         );
-        validate_ei(&wasm_data.imports, &self.settings.check_ei)
+        print_ei_check(&wasm_data, &self.settings.check_ei);
+
+        wasm_data
     }
 }
 
@@ -165,24 +166,22 @@ fn write_imports_output(dest_path: &str, import_names: &[String]) {
     fs::write(dest_path, json).expect("failed to write imports json file");
 }
 
-fn validate_ei(import_names: &[String], check_ei: &Option<EIVersion>) -> Option<EiCheckJson> {
+fn print_ei_check(wasm_data: &WasmInfo, check_ei: &Option<EIVersion>) {
     if let Some(ei) = check_ei {
-        print_check_ei(ei.name()); //
-        let mut num_errors = 0;
-        for import_name in import_names {
-            if !ei.contains_vm_hook(import_name) {
-                print_invalid_vm_hook(import_name, ei.name());
-                num_errors += 1;
-            }
-        }
-        if num_errors == 0 {
+        print_check_ei(ei.name());
+
+        if wasm_data.ei_check == true {
             print_check_ei_ok();
-            return Some(EiCheckJson::new(check_ei, true));
+            return;
+        }
+
+        for import_name in &wasm_data.imports {
+            if !ei.contains_vm_hook(import_name.as_str()) {
+                print_invalid_vm_hook(import_name.as_str(), ei.name());
+            }
         }
-        Some(EiCheckJson::new(check_ei, false))
     } else {
         print_ignore_ei_check();
-        None
     }
 }
 
diff --git a/framework/meta/src/ei_check_json.rs b/framework/meta/src/ei_check_json.rs
index 02b0372d34..586724751b 100644
--- a/framework/meta/src/ei_check_json.rs
+++ b/framework/meta/src/ei_check_json.rs
@@ -13,17 +13,14 @@ pub struct EiCheckJson {
 }
 
 impl EiCheckJson {
-    pub fn new(check_ei: &Option<EIVersion>, status: bool) -> Self {
-        EiCheckJson {
-            ei_version: get_ei_version(check_ei),
-            ok: status,
+    pub fn new(check_ei: &Option<EIVersion>, status: bool) -> Option<Self> {
+        if let Some(ei) = check_ei {
+            return Some(EiCheckJson {
+                ei_version: ei.name().to_string(),
+                ok: status,
+            });
         }
-    }
-}
 
-fn get_ei_version(check_ei: &Option<EIVersion>) -> String {
-    match check_ei {
-        Some(ei) => ei.name().to_string(),
-        None => "ignore".to_string(),
+        return None;
     }
 }
diff --git a/framework/meta/src/report_info_json.rs b/framework/meta/src/report_info_json.rs
index d3c7008585..9b680ee072 100644
--- a/framework/meta/src/report_info_json.rs
+++ b/framework/meta/src/report_info_json.rs
@@ -19,10 +19,16 @@ pub struct ReportInfoJson {
 
 impl ReportInfoJson {
     pub fn new(wasm_info: &WasmInfo, ei_check_info: Option<EiCheckJson>) -> Self {
+        let ei_check = if wasm_info.imports.is_empty() {
+            None
+        } else {
+            ei_check_info
+        };
+
         ReportInfoJson {
             imports: wasm_info.imports.iter().map(|i| i.to_string()).collect(),
             memory_allocation_error: wasm_info.allocator_trigger,
-            ei_check: ei_check_info,
+            ei_check,
         }
     }
 }
diff --git a/framework/meta/src/tools/wasm_extractor.rs b/framework/meta/src/tools/wasm_extractor.rs
index fb4233ae78..3588596dbb 100644
--- a/framework/meta/src/tools/wasm_extractor.rs
+++ b/framework/meta/src/tools/wasm_extractor.rs
@@ -2,53 +2,57 @@ use colored::Colorize;
 use std::fs;
 use wasmparser::{BinaryReaderError, DataSectionReader, ImportSectionReader, Parser, Payload};
 
+use crate::ei::EIVersion;
+
 const ERROR_FAIL_ALLOCATOR: &[u8; 27] = b"memory allocation forbidden";
 
 pub struct WasmInfo {
     pub imports: Vec<String>,
     pub allocator_trigger: bool,
+    pub ei_check: bool,
 }
 
 impl WasmInfo {
-    const fn new(imports: Vec<String>, allocator_trigger: bool) -> Self {
-        WasmInfo {
-            imports,
-            allocator_trigger,
-        }
-    }
-
     pub fn extract_wasm_info(
         output_wasm_path: &str,
         extract_imports_enabled: bool,
+        check_ei: &Option<EIVersion>,
     ) -> Result<WasmInfo, BinaryReaderError> {
         let wasm_data = fs::read(output_wasm_path)
             .expect("error occured while extracting information from .wasm: file not found");
 
-        populate_wasm_info(wasm_data, extract_imports_enabled)
+        populate_wasm_info(wasm_data, extract_imports_enabled, check_ei)
     }
 }
 
 fn populate_wasm_info(
     wasm_data: Vec<u8>,
     extract_imports_enabled: bool,
+    check_ei: &Option<EIVersion>,
 ) -> Result<WasmInfo, BinaryReaderError> {
     let mut imports = Vec::new();
-    let mut allocator_triggered = false;
+    let mut allocator_trigger = false;
+    let mut ei_check = false;
 
     let parser = Parser::new(0);
     for payload in parser.parse_all(&wasm_data) {
         match payload? {
             Payload::ImportSection(import_section) => {
                 imports = extract_imports(import_section, extract_imports_enabled);
+                ei_check = is_ei_valid(imports.clone(), check_ei);
             },
             Payload::DataSection(data_section) => {
-                allocator_triggered = is_fail_allocator_triggered(data_section);
+                allocator_trigger = is_fail_allocator_triggered(data_section);
             },
             _ => (),
         }
     }
 
-    Ok(WasmInfo::new(imports, allocator_triggered))
+    Ok(WasmInfo {
+        imports,
+        allocator_trigger,
+        ei_check,
+    })
 }
 
 fn is_fail_allocator_triggered(data_section: DataSectionReader) -> bool {
@@ -89,3 +93,20 @@ pub fn extract_imports(
 
     import_names
 }
+
+fn is_ei_valid(imports: Vec<String>, check_ei: &Option<EIVersion>) -> bool {
+    if let Some(ei) = check_ei {
+        let mut num_errors = 0;
+        for import in imports {
+            if !ei.contains_vm_hook(import.as_str()) {
+                num_errors += 1;
+            }
+        }
+
+        if num_errors == 0 {
+            return true;
+        }
+    }
+
+    return false;
+}

From 50df759242d59e14f55bde434ae14c9848d06996 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Tue, 6 Feb 2024 19:03:32 +0200
Subject: [PATCH 0331/1254] add mem_grow flag

---
 .../src/cmd/contract/sc_config/wasm_build.rs  |  2 +-
 framework/meta/src/ei_check_json.rs           |  2 +-
 framework/meta/src/report_info_json.rs        |  4 ++++
 framework/meta/src/tools/wasm_extractor.rs    | 23 +++++++++++++++++--
 4 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/framework/meta/src/cmd/contract/sc_config/wasm_build.rs b/framework/meta/src/cmd/contract/sc_config/wasm_build.rs
index 7f6fcabbac..bfe0539738 100644
--- a/framework/meta/src/cmd/contract/sc_config/wasm_build.rs
+++ b/framework/meta/src/cmd/contract/sc_config/wasm_build.rs
@@ -170,7 +170,7 @@ fn print_ei_check(wasm_data: &WasmInfo, check_ei: &Option<EIVersion>) {
     if let Some(ei) = check_ei {
         print_check_ei(ei.name());
 
-        if wasm_data.ei_check == true {
+        if wasm_data.ei_check {
             print_check_ei_ok();
             return;
         }
diff --git a/framework/meta/src/ei_check_json.rs b/framework/meta/src/ei_check_json.rs
index 586724751b..b655ab80c6 100644
--- a/framework/meta/src/ei_check_json.rs
+++ b/framework/meta/src/ei_check_json.rs
@@ -21,6 +21,6 @@ impl EiCheckJson {
             });
         }
 
-        return None;
+        None
     }
 }
diff --git a/framework/meta/src/report_info_json.rs b/framework/meta/src/report_info_json.rs
index 9b680ee072..3f0f5d7da5 100644
--- a/framework/meta/src/report_info_json.rs
+++ b/framework/meta/src/report_info_json.rs
@@ -12,6 +12,9 @@ pub struct ReportInfoJson {
     #[serde(default)]
     pub memory_allocation_error: bool,
 
+    #[serde(default)]
+    pub is_mem_grow: bool,
+
     #[serde(default)]
     #[serde(skip_serializing_if = "Option::is_none")]
     pub ei_check: Option<EiCheckJson>,
@@ -28,6 +31,7 @@ impl ReportInfoJson {
         ReportInfoJson {
             imports: wasm_info.imports.iter().map(|i| i.to_string()).collect(),
             memory_allocation_error: wasm_info.allocator_trigger,
+            is_mem_grow: wasm_info.memory_grow_flag,
             ei_check,
         }
     }
diff --git a/framework/meta/src/tools/wasm_extractor.rs b/framework/meta/src/tools/wasm_extractor.rs
index 3588596dbb..c8b9943190 100644
--- a/framework/meta/src/tools/wasm_extractor.rs
+++ b/framework/meta/src/tools/wasm_extractor.rs
@@ -1,15 +1,19 @@
 use colored::Colorize;
 use std::fs;
-use wasmparser::{BinaryReaderError, DataSectionReader, ImportSectionReader, Parser, Payload};
+use wasmparser::{
+    BinaryReaderError, DataSectionReader, FunctionBody, ImportSectionReader, Parser, Payload,
+};
 
 use crate::ei::EIVersion;
 
 const ERROR_FAIL_ALLOCATOR: &[u8; 27] = b"memory allocation forbidden";
+const MEMORY_GROW_OPCODE: u8 = 0x40;
 
 pub struct WasmInfo {
     pub imports: Vec<String>,
     pub allocator_trigger: bool,
     pub ei_check: bool,
+    pub memory_grow_flag: bool,
 }
 
 impl WasmInfo {
@@ -33,6 +37,7 @@ fn populate_wasm_info(
     let mut imports = Vec::new();
     let mut allocator_trigger = false;
     let mut ei_check = false;
+    let mut memory_grow_flag = false;
 
     let parser = Parser::new(0);
     for payload in parser.parse_all(&wasm_data) {
@@ -44,6 +49,9 @@ fn populate_wasm_info(
             Payload::DataSection(data_section) => {
                 allocator_trigger = is_fail_allocator_triggered(data_section);
             },
+            Payload::CodeSectionEntry(code_section) => {
+                memory_grow_flag = is_mem_grow(code_section);
+            },
             _ => (),
         }
     }
@@ -52,6 +60,7 @@ fn populate_wasm_info(
         imports,
         allocator_trigger,
         ei_check,
+        memory_grow_flag,
     })
 }
 
@@ -108,5 +117,15 @@ fn is_ei_valid(imports: Vec<String>, check_ei: &Option<EIVersion>) -> bool {
         }
     }
 
-    return false;
+    false
+}
+
+fn is_mem_grow(code_section: FunctionBody) -> bool {
+    let mut code = code_section.get_binary_reader();
+    while code.bytes_remaining() > 0 {
+        if code.read_u8().unwrap() == MEMORY_GROW_OPCODE {
+            return true;
+        }
+    }
+    false
 }

From fbf58f89c99ca818df4a95c04c52444762bda3b3 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Tue, 6 Feb 2024 19:10:02 +0200
Subject: [PATCH 0332/1254] revert changes

---
 contracts/benchmarks/str-repeat/wasm/src/lib.rs | 4 +---
 contracts/examples/adder/wasm/src/lib.rs        | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/contracts/benchmarks/str-repeat/wasm/src/lib.rs b/contracts/benchmarks/str-repeat/wasm/src/lib.rs
index 894a1bc4c0..45af6112da 100644
--- a/contracts/benchmarks/str-repeat/wasm/src/lib.rs
+++ b/contracts/benchmarks/str-repeat/wasm/src/lib.rs
@@ -10,9 +10,7 @@
 // Total number of exported functions:   5
 
 #![no_std]
-
-// Configuration that works with rustc < 1.73.0.
-// TODO: Recommended rustc version: 1.73.0 or newer.
+#![allow(internal_features)]
 #![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!(leaking);
diff --git a/contracts/examples/adder/wasm/src/lib.rs b/contracts/examples/adder/wasm/src/lib.rs
index b364edf422..13bb12ad6e 100644
--- a/contracts/examples/adder/wasm/src/lib.rs
+++ b/contracts/examples/adder/wasm/src/lib.rs
@@ -10,9 +10,7 @@
 // Total number of exported functions:   5
 
 #![no_std]
-
-// Configuration that works with rustc < 1.73.0.
-// TODO: Recommended rustc version: 1.73.0 or newer.
+#![allow(internal_features)]
 #![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();

From 3b01013c7297224b50ff39a73d777437677fffc1 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 7 Feb 2024 19:14:59 +0200
Subject: [PATCH 0333/1254] dependency upgrade

---
 Cargo.lock                | 6 +++---
 framework/meta/Cargo.toml | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f249198017..0d7dad932c 100755
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1887,7 +1887,7 @@ dependencies = [
  "serde",
  "serde_json",
  "toml",
- "wasmparser 0.120.0",
+ "wasmparser 0.121.0",
  "wasmprinter",
  "zip",
 ]
@@ -3445,9 +3445,9 @@ dependencies = [
 
 [[package]]
 name = "wasmparser"
-version = "0.120.0"
+version = "0.121.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9148127f39cbffe43efee8d5442b16ecdba21567785268daa1ec9e134389705"
+checksum = "953cf6a7606ab31382cb1caa5ae403e77ba70c7f8e12eeda167e7040d42bfda8"
 dependencies = [
  "bitflags 2.4.2",
  "indexmap",
diff --git a/framework/meta/Cargo.toml b/framework/meta/Cargo.toml
index a343484397..eb70fd09f7 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.120.0"
+wasmparser = "0.121.0"
 wasmprinter = "0.2.71"
 semver = "1.0.20"
 

From a9055a52f4aceed3a3e7b4f21078befb1b24ac17 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 8 Feb 2024 10:27:54 +0200
Subject: [PATCH 0334/1254] dependency fix - ed25519-dalek

---
 vm/Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vm/Cargo.toml b/vm/Cargo.toml
index 7cda7fb483..6eb8c2a23d 100644
--- a/vm/Cargo.toml
+++ b/vm/Cargo.toml
@@ -24,7 +24,7 @@ sha2 = "0.10.6"
 sha3 = "0.10.6"
 rand = "0.8.5"
 rand_seeder = "0.2.2"
-ed25519-dalek = "2.0.0"
+ed25519-dalek = "=2.1.0"
 itertools = "0.12.0"
 hex-literal = "=0.4.1"
 bitflags = "=2.4.2"

From 85bbd13abef6a363b97de3a2db8a6ab0874becc9 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 8 Feb 2024 10:44:51 +0200
Subject: [PATCH 0335/1254] crypto tests moved to VM

---
 {framework/scenario => vm}/tests/test_crypto.rs | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename {framework/scenario => vm}/tests/test_crypto.rs (100%)

diff --git a/framework/scenario/tests/test_crypto.rs b/vm/tests/test_crypto.rs
similarity index 100%
rename from framework/scenario/tests/test_crypto.rs
rename to vm/tests/test_crypto.rs

From 467ed818bc8bc138a2fa8e4abdfd7d146c4698e6 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 8 Feb 2024 10:47:28 +0200
Subject: [PATCH 0336/1254] ed25519-dalek downgraded

---
 Cargo.lock                 | 459 ++++++++++++++++++++-----------------
 vm/Cargo.toml              |   2 +-
 vm/src/crypto_functions.rs |  27 +--
 3 files changed, 256 insertions(+), 232 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 0d7dad932c..431291ab86 100755
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -113,9 +113,9 @@ dependencies = [
 
 [[package]]
 name = "anstyle"
-version = "1.0.4"
+version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87"
+checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc"
 
 [[package]]
 name = "anstyle-parse"
@@ -180,15 +180,9 @@ dependencies = [
 
 [[package]]
 name = "base64"
-version = "0.21.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9"
-
-[[package]]
-name = "base64ct"
-version = "1.6.0"
+version = "0.21.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b"
+checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
 
 [[package]]
 name = "basic-features"
@@ -257,8 +251,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "93f2635620bf0b9d4576eb7bb9a38a55df78bd1205d26fa994b25911a69f212f"
 dependencies = [
  "bitcoin_hashes",
- "rand",
- "rand_core",
+ "rand 0.8.5",
+ "rand_core 0.6.4",
  "serde",
  "unicode-normalization",
 ]
@@ -281,6 +275,15 @@ version = "2.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
 
+[[package]]
+name = "block-buffer"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4"
+dependencies = [
+ "generic-array",
+]
+
 [[package]]
 name = "block-buffer"
 version = "0.10.4"
@@ -403,9 +406,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.4.13"
+version = "4.4.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52bdc885e4cacc7f7c9eedc1ef6da641603180c783c41a15c264944deeaab642"
+checksum = "1e578d6ec4194633722ccf9544794b71b1385c3c027efe0c55db226fc880865c"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -413,9 +416,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.4.12"
+version = "4.4.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb7fb5e4e979aec3be7791562fcba452f94ad85e954da024396433e0e25a79e9"
+checksum = "4df4df40ec50c46000231c914968278b1eb05098cf8f1b3a518a95030e71d1c7"
 dependencies = [
  "anstream",
  "anstyle",
@@ -480,12 +483,6 @@ dependencies = [
  "vault",
 ]
 
-[[package]]
-name = "const-oid"
-version = "0.9.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8"
-
 [[package]]
 name = "convert_case"
 version = "0.6.0"
@@ -540,34 +537,28 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-deque"
-version = "0.8.4"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fca89a0e215bab21874660c67903c5f143333cab1da83d041c7ded6053774751"
+checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d"
 dependencies = [
- "cfg-if",
  "crossbeam-epoch",
  "crossbeam-utils",
 ]
 
 [[package]]
 name = "crossbeam-epoch"
-version = "0.9.17"
+version = "0.9.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e3681d554572a651dda4186cd47240627c3d0114d45a95f6ad27f2f22e7548d"
+checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
 dependencies = [
- "autocfg",
- "cfg-if",
  "crossbeam-utils",
 ]
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.8.18"
+version = "0.8.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3a430a770ebd84726f584a90ee7f020d28db52c6d02138900f22341f866d39c"
-dependencies = [
- "cfg-if",
-]
+checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345"
 
 [[package]]
 name = "crowdfunding-erc20"
@@ -649,40 +640,24 @@ dependencies = [
 
 [[package]]
 name = "curve25519-dalek"
-version = "4.1.1"
+version = "3.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e89b8c6a2e4b1f45971ad09761aafb85514a84744b67a95e32c3cc1352d1f65c"
+checksum = "0b9fdf9972b2bd6af2d913799d9ebc165ea4d2e65878e329d9c6b372c4491b61"
 dependencies = [
- "cfg-if",
- "cpufeatures",
- "curve25519-dalek-derive",
- "digest",
- "fiat-crypto",
- "platforms",
- "rustc_version",
+ "byteorder",
+ "digest 0.9.0",
+ "rand_core 0.5.1",
  "subtle",
  "zeroize",
 ]
 
 [[package]]
-name = "curve25519-dalek-derive"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "der"
-version = "0.7.8"
+name = "digest"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c"
+checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066"
 dependencies = [
- "const-oid",
- "zeroize",
+ "generic-array",
 ]
 
 [[package]]
@@ -691,7 +666,7 @@ version = "0.10.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
 dependencies = [
- "block-buffer",
+ "block-buffer 0.10.4",
  "crypto-common",
  "subtle",
 ]
@@ -714,25 +689,24 @@ dependencies = [
 
 [[package]]
 name = "ed25519"
-version = "2.2.3"
+version = "1.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53"
+checksum = "91cff35c70bba8a626e3185d8cd48cc11b5437e1a5bcd15b9b5fa3c64b6dfee7"
 dependencies = [
- "pkcs8",
  "signature",
 ]
 
 [[package]]
 name = "ed25519-dalek"
-version = "2.1.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f628eaec48bfd21b865dc2950cfa014450c01d2fa2b69a86c2fd5844ec523c0"
+checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d"
 dependencies = [
  "curve25519-dalek",
  "ed25519",
+ "rand 0.7.3",
  "serde",
- "sha2",
- "subtle",
+ "sha2 0.9.9",
  "zeroize",
 ]
 
@@ -967,12 +941,6 @@ version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5"
 
-[[package]]
-name = "fiat-crypto"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "27573eac26f4dd11e2b1916c3fe1baa56407c83c71a773a8ba17ec0bca03b6b7"
-
 [[package]]
 name = "first-contract"
 version = "0.0.0"
@@ -1215,14 +1183,25 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.2.11"
+version = "0.1.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi 0.9.0+wasi-snapshot-preview1",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f"
+checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5"
 dependencies = [
  "cfg-if",
  "js-sys",
  "libc",
- "wasi",
+ "wasi 0.11.0+wasi-snapshot-preview1",
  "wasm-bindgen",
 ]
 
@@ -1247,9 +1226,9 @@ dependencies = [
 
 [[package]]
 name = "h2"
-version = "0.3.22"
+version = "0.3.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d6250322ef6e60f93f9a2162799302cd6f68f79f6e5d85c8c16f14d1d958178"
+checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9"
 dependencies = [
  "bytes",
  "fnv",
@@ -1278,9 +1257,9 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
 
 [[package]]
 name = "hermit-abi"
-version = "0.3.3"
+version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7"
+checksum = "d0c62115964e08cb8039170eb33c1d0e2388a256930279edca206fff675f82c3"
 
 [[package]]
 name = "hex"
@@ -1300,7 +1279,7 @@ version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
 dependencies = [
- "digest",
+ "digest 0.10.7",
 ]
 
 [[package]]
@@ -1392,9 +1371,9 @@ dependencies = [
 
 [[package]]
 name = "ignore"
-version = "0.4.21"
+version = "0.4.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "747ad1b4ae841a78e8aba0d63adbfbeaea26b517b63705d47856b73015d27060"
+checksum = "b46810df39e66e925525d6e38ce1e7f6e1d208f72dc39757880fcb66e2c58af1"
 dependencies = [
  "crossbeam-deque",
  "globset",
@@ -1408,9 +1387,9 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.1.0"
+version = "2.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f"
+checksum = "824b2ae422412366ba479e8111fd301f7b5faece8149317bb81925979a53f520"
 dependencies = [
  "equivalent",
  "hashbrown",
@@ -1438,9 +1417,9 @@ checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3"
 
 [[package]]
 name = "itertools"
-version = "0.12.0"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25db6b064527c5d482d0423354fcd07a89a2dfe07b67892e62411946db7f07b0"
+checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
 dependencies = [
  "either",
 ]
@@ -1453,18 +1432,18 @@ checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c"
 
 [[package]]
 name = "js-sys"
-version = "0.3.66"
+version = "0.3.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca"
+checksum = "406cda4b368d531c842222cf9d2600a9a4acce8d29423695379c6868a143a9ee"
 dependencies = [
  "wasm-bindgen",
 ]
 
 [[package]]
 name = "keccak"
-version = "0.1.4"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f6d5ed8676d904364de097082f4e7d240b571b67989ced0240f08b7f966f940"
+checksum = "ecc2af9a1119c51f12a14607e783cb977bde58bc069ff0c3da1095e635d70654"
 dependencies = [
  "cpufeatures",
 ]
@@ -1556,9 +1535,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
 name = "libc"
-version = "0.2.151"
+version = "0.2.153"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4"
+checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
 
 [[package]]
 name = "linked-list-repeat"
@@ -1579,9 +1558,9 @@ dependencies = [
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.4.12"
+version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456"
+checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c"
 
 [[package]]
 name = "local-esdt-and-nft"
@@ -1696,9 +1675,9 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
 
 [[package]]
 name = "miniz_oxide"
-version = "0.7.1"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
+checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7"
 dependencies = [
  "adler",
 ]
@@ -1710,7 +1689,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09"
 dependencies = [
  "libc",
- "wasi",
+ "wasi 0.11.0+wasi-snapshot-preview1",
  "windows-sys 0.48.0",
 ]
 
@@ -1792,9 +1771,9 @@ dependencies = [
  "multiversx-chain-vm-executor",
  "num-bigint",
  "num-traits",
- "rand",
+ "rand 0.8.5",
  "rand_seeder",
- "sha2",
+ "sha2 0.10.8",
  "sha3",
 ]
 
@@ -1809,11 +1788,11 @@ name = "multiversx-price-aggregator-sc"
 version = "0.47.3"
 dependencies = [
  "arrayvec",
- "getrandom",
+ "getrandom 0.2.12",
  "multiversx-sc",
  "multiversx-sc-modules",
  "multiversx-sc-scenario",
- "rand",
+ "rand 0.8.5",
 ]
 
 [[package]]
@@ -1887,7 +1866,7 @@ dependencies = [
  "serde",
  "serde_json",
  "toml",
- "wasmparser 0.121.0",
+ "wasmparser",
  "wasmprinter",
  "zip",
 ]
@@ -1921,7 +1900,7 @@ dependencies = [
  "pathdiff",
  "serde",
  "serde_json",
- "sha2",
+ "sha2 0.10.8",
  "tokio",
 ]
 
@@ -1959,12 +1938,12 @@ dependencies = [
  "itertools",
  "pbkdf2",
  "pem",
- "rand",
+ "rand 0.8.5",
  "reqwest",
  "serde",
  "serde_json",
  "serde_repr",
- "sha2",
+ "sha2 0.10.8",
  "sha3",
  "tokio",
  "zeroize",
@@ -2088,11 +2067,10 @@ dependencies = [
 
 [[package]]
 name = "num-integer"
-version = "0.1.45"
+version = "0.1.46"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
+checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f"
 dependencies = [
- "autocfg",
  "num-traits",
 ]
 
@@ -2130,11 +2108,17 @@ version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
+[[package]]
+name = "opaque-debug"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
+
 [[package]]
 name = "openssl"
-version = "0.10.62"
+version = "0.10.63"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8cde4d2d9200ad5909f8dac647e29482e07c3a35de8a13fce7c9c7747ad9f671"
+checksum = "15c9d69dd87a29568d4d017cfe8ec518706046a05184e5aea92d0af890b803c8"
 dependencies = [
  "bitflags 2.4.2",
  "cfg-if",
@@ -2164,9 +2148,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.98"
+version = "0.9.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1665caf8ab2dc9aef43d1c0023bd904633a6a05cb30b0ad59bec2ae986e57a7"
+checksum = "22e1bf214306098e4832460f797824c05d25aacdf896f64a985fb0fd992454ae"
 dependencies = [
  "cc",
  "libc",
@@ -2283,7 +2267,7 @@ version = "0.12.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2"
 dependencies = [
- "digest",
+ "digest 0.10.7",
 ]
 
 [[package]]
@@ -2330,27 +2314,11 @@ dependencies = [
  "ping-pong-egld",
 ]
 
-[[package]]
-name = "pkcs8"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7"
-dependencies = [
- "der",
- "spki",
-]
-
 [[package]]
 name = "pkg-config"
-version = "0.3.28"
+version = "0.3.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69d3587f8a9e599cc7ec2c00e331f71c4e69a5f9a4b8a6efd5b07466b9736f9a"
-
-[[package]]
-name = "platforms"
-version = "3.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "626dec3cac7cc0e1577a2ec3fc496277ec2baa084bebad95bb6fdbfae235f84c"
+checksum = "2900ede94e305130c13ddd391e0ab7cbaeb783945ae07a279c268cb05109c6cb"
 
 [[package]]
 name = "ppv-lite86"
@@ -2469,6 +2437,19 @@ dependencies = [
  "nibble_vec",
 ]
 
+[[package]]
+name = "rand"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
+dependencies = [
+ "getrandom 0.1.16",
+ "libc",
+ "rand_chacha 0.2.2",
+ "rand_core 0.5.1",
+ "rand_hc",
+]
+
 [[package]]
 name = "rand"
 version = "0.8.5"
@@ -2476,8 +2457,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
 dependencies = [
  "libc",
- "rand_chacha",
- "rand_core",
+ "rand_chacha 0.3.1",
+ "rand_core 0.6.4",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
+dependencies = [
+ "ppv-lite86",
+ "rand_core 0.5.1",
 ]
 
 [[package]]
@@ -2487,7 +2478,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
 dependencies = [
  "ppv-lite86",
- "rand_core",
+ "rand_core 0.6.4",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
+dependencies = [
+ "getrandom 0.1.16",
 ]
 
 [[package]]
@@ -2496,7 +2496,16 @@ version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
 dependencies = [
- "getrandom",
+ "getrandom 0.2.12",
+]
+
+[[package]]
+name = "rand_hc"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
+dependencies = [
+ "rand_core 0.5.1",
 ]
 
 [[package]]
@@ -2505,7 +2514,7 @@ version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cf2890aaef0aa82719a50e808de264f9484b74b442e1a3a0e5ee38243ac40bdb"
 dependencies = [
- "rand_core",
+ "rand_core 0.6.4",
 ]
 
 [[package]]
@@ -2543,9 +2552,9 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.10.2"
+version = "1.10.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343"
+checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -2555,9 +2564,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.3"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f"
+checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -2572,9 +2581,9 @@ checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
 
 [[package]]
 name = "reqwest"
-version = "0.11.23"
+version = "0.11.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37b1ae8d9ac08420c66222fb9096fc5de435c3c48542bc5336c51892cffafb41"
+checksum = "c6920094eb85afde5e4a138be3f2de8bbdf28000f0029e72c45025a56b042251"
 dependencies = [
  "base64",
  "bytes",
@@ -2594,9 +2603,11 @@ dependencies = [
  "once_cell",
  "percent-encoding",
  "pin-project-lite",
+ "rustls-pemfile",
  "serde",
  "serde_json",
  "serde_urlencoded",
+ "sync_wrapper",
  "system-configuration",
  "tokio",
  "tokio-native-tls",
@@ -2695,9 +2706,9 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.38.28"
+version = "0.38.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316"
+checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949"
 dependencies = [
  "bitflags 2.4.2",
  "errno",
@@ -2706,6 +2717,15 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
+[[package]]
+name = "rustls-pemfile"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c"
+dependencies = [
+ "base64",
+]
+
 [[package]]
 name = "ryu"
 version = "1.0.16"
@@ -2817,18 +2837,18 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.194"
+version = "1.0.196"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b114498256798c94a0689e1a15fec6005dee8ac1f41de56404b67afc2a4b773"
+checksum = "870026e60fa08c69f064aa766c10f10b1d62db9ccd4d0abb206472bee0ce3b32"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.194"
+version = "1.0.196"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3385e45322e8f9931410f01b3031ec534c3947d0e94c18049af4d9f9907d4e0"
+checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2837,9 +2857,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.111"
+version = "1.0.113"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "176e46fa42316f18edd598015a5166857fc835ec732f5215eac6b7bdbf0a84f4"
+checksum = "69801b70b1c3dac963ecb03a364ba0ceda9cf60c71cfe475e99864759c8b8a79"
 dependencies = [
  "indexmap",
  "itoa",
@@ -2896,6 +2916,19 @@ dependencies = [
  "set-repeat",
 ]
 
+[[package]]
+name = "sha2"
+version = "0.9.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800"
+dependencies = [
+ "block-buffer 0.9.0",
+ "cfg-if",
+ "cpufeatures",
+ "digest 0.9.0",
+ "opaque-debug",
+]
+
 [[package]]
 name = "sha2"
 version = "0.10.8"
@@ -2904,7 +2937,7 @@ checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
 dependencies = [
  "cfg-if",
  "cpufeatures",
- "digest",
+ "digest 0.10.7",
 ]
 
 [[package]]
@@ -2913,7 +2946,7 @@ version = "0.10.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60"
 dependencies = [
- "digest",
+ "digest 0.10.7",
  "keccak",
 ]
 
@@ -2928,12 +2961,9 @@ dependencies = [
 
 [[package]]
 name = "signature"
-version = "2.2.0"
+version = "1.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de"
-dependencies = [
- "rand_core",
-]
+checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c"
 
 [[package]]
 name = "single-value-repeat"
@@ -2963,9 +2993,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 = "socket2"
@@ -2977,16 +3007,6 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
-[[package]]
-name = "spki"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d"
-dependencies = [
- "base64ct",
- "der",
-]
-
 [[package]]
 name = "str-repeat"
 version = "0.0.0"
@@ -3026,6 +3046,12 @@ dependencies = [
  "unicode-ident",
 ]
 
+[[package]]
+name = "sync_wrapper"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160"
+
 [[package]]
 name = "system-configuration"
 version = "0.5.1"
@@ -3049,13 +3075,12 @@ dependencies = [
 
 [[package]]
 name = "tempfile"
-version = "3.9.0"
+version = "3.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01ce4141aa927a6d1bd34a041795abd0db1cccba5d5f24b009f694bdf3a1f3fa"
+checksum = "a365e8cd18e44762ef95d87f284f4b5cd04107fec2ff3052bd6a3e6069669e67"
 dependencies = [
  "cfg-if",
  "fastrand",
- "redox_syscall",
  "rustix",
  "windows-sys 0.52.0",
 ]
@@ -3093,9 +3118,9 @@ dependencies = [
 
 [[package]]
 name = "tokio"
-version = "1.35.1"
+version = "1.36.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104"
+checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931"
 dependencies = [
  "backtrace",
  "bytes",
@@ -3147,9 +3172,9 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.8.8"
+version = "0.8.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35"
+checksum = "9a9aad4a3066010876e8dcf5a8a06e70a558751117a145c6ce2b82c2e2054290"
 dependencies = [
  "indexmap",
  "serde",
@@ -3169,9 +3194,9 @@ dependencies = [
 
 [[package]]
 name = "toml_edit"
-version = "0.21.0"
+version = "0.22.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03"
+checksum = "0c9ffdf896f8daaabf9b66ba8e77ea1ed5ed0f72821b398aba62352e95062951"
 dependencies = [
  "indexmap",
  "serde",
@@ -3237,9 +3262,9 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
 
 [[package]]
 name = "unicode-bidi"
-version = "0.3.14"
+version = "0.3.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f2528f27a9eb2b21e69c95319b30bd0efd85d09c379741b0f78ea1d86be2416"
+checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
 
 [[package]]
 name = "unicode-ident"
@@ -3258,9 +3283,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-segmentation"
-version = "1.10.1"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36"
+checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
 
 [[package]]
 name = "url"
@@ -3361,6 +3386,12 @@ dependencies = [
  "try-lock",
 ]
 
+[[package]]
+name = "wasi"
+version = "0.9.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
+
 [[package]]
 name = "wasi"
 version = "0.11.0+wasi-snapshot-preview1"
@@ -3369,9 +3400,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.89"
+version = "0.2.91"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e"
+checksum = "c1e124130aee3fb58c5bdd6b639a0509486b0338acaaae0c84a5124b0f588b7f"
 dependencies = [
  "cfg-if",
  "wasm-bindgen-macro",
@@ -3379,9 +3410,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.89"
+version = "0.2.91"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826"
+checksum = "c9e7e1900c352b609c8488ad12639a311045f40a35491fb69ba8c12f758af70b"
 dependencies = [
  "bumpalo",
  "log",
@@ -3394,9 +3425,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.39"
+version = "0.4.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac36a15a220124ac510204aec1c3e5db8a22ab06fd6706d881dc6149f8ed9a12"
+checksum = "877b9c3f61ceea0e56331985743b13f3d25c406a7098d45180fb5f09bc19ed97"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -3406,9 +3437,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.89"
+version = "0.2.91"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2"
+checksum = "b30af9e2d358182b5c7449424f017eba305ed32a7010509ede96cdc4696c46ed"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -3416,9 +3447,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.89"
+version = "0.2.91"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283"
+checksum = "642f325be6301eb8107a83d12a8ac6c1e1c54345a7ef1a9261962dfefda09e66"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3429,19 +3460,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.89"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f"
-
-[[package]]
-name = "wasmparser"
-version = "0.118.1"
+version = "0.2.91"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95ee9723b928e735d53000dec9eae7b07a60e490c85ab54abb66659fc61bfcd9"
-dependencies = [
- "indexmap",
- "semver",
-]
+checksum = "4f186bd2dcf04330886ce82d6f33dd75a7bfcf69ecf5763b89fcde53b6ac9838"
 
 [[package]]
 name = "wasmparser"
@@ -3456,19 +3477,19 @@ dependencies = [
 
 [[package]]
 name = "wasmprinter"
-version = "0.2.75"
+version = "0.2.78"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d027eb8294904fc715ac0870cebe6b0271e96b90605ee21511e7565c4ce568c"
+checksum = "05e32c13c59fdc64d3f6998a1d52eb1d362b6904a88b754190ccb85661ad577a"
 dependencies = [
  "anyhow",
- "wasmparser 0.118.1",
+ "wasmparser",
 ]
 
 [[package]]
 name = "web-sys"
-version = "0.3.66"
+version = "0.3.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50c24a44ec86bb68fbecd1b3efed7e85ea5621b39b35ef2766b66cd984f8010f"
+checksum = "96565907687f7aceb35bc5fc03770a8a0471d82e479f25832f54a0e3f4b28446"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -3639,9 +3660,9 @@ checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
 
 [[package]]
 name = "winnow"
-version = "0.5.32"
+version = "0.5.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8434aeec7b290e8da5c3f0d628cb0eac6cabcb31d14bb74f779a08109a5914d6"
+checksum = "5389a154b01683d28c77f8f68f49dea75f0a4da32557a58f68ee51ebba472d29"
 dependencies = [
  "memchr",
 ]
@@ -3661,6 +3682,20 @@ name = "zeroize"
 version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d"
+dependencies = [
+ "zeroize_derive",
+]
+
+[[package]]
+name = "zeroize_derive"
+version = "1.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
 
 [[package]]
 name = "zip"
diff --git a/vm/Cargo.toml b/vm/Cargo.toml
index 6eb8c2a23d..4b9c294e58 100644
--- a/vm/Cargo.toml
+++ b/vm/Cargo.toml
@@ -24,7 +24,7 @@ sha2 = "0.10.6"
 sha3 = "0.10.6"
 rand = "0.8.5"
 rand_seeder = "0.2.2"
-ed25519-dalek = "=2.1.0"
+ed25519-dalek = "1.0.1"
 itertools = "0.12.0"
 hex-literal = "=0.4.1"
 bitflags = "=2.4.2"
diff --git a/vm/src/crypto_functions.rs b/vm/src/crypto_functions.rs
index 3e64b7f9a2..5b43bfb174 100644
--- a/vm/src/crypto_functions.rs
+++ b/vm/src/crypto_functions.rs
@@ -18,26 +18,15 @@ pub fn keccak256(data: &[u8]) -> [u8; KECCAK256_RESULT_LEN] {
 }
 
 pub fn verify_ed25519(key: &[u8], message: &[u8], signature: &[u8]) -> bool {
-    let key_32: [u8; 32] = if let Ok(key_32) = key.try_into() {
-        key_32
-    } else {
+    let public = PublicKey::from_bytes(key);
+    if public.is_err() {
         return false;
-    };
-    let signature_64: [u8; 64] = if let Ok(signature_64) = signature.try_into() {
-        signature_64
-    } else {
-        return false;
-    };
+    }
 
-    let verifying_key_result = VerifyingKey::from_bytes(&key_32);
-    let verifying_key = if let Ok(verifying_key) = verifying_key_result {
-        verifying_key
-    } else {
+    let sig = Signature::from_bytes(signature);
+    if sig.is_err() {
         return false;
-    };
-
-    let sig = Signature::from_bytes(&signature_64);
+    }
 
-    let result = verifying_key.verify(message, &sig);
-    result.is_ok()
-}
+    public.unwrap().verify(message, &sig.unwrap()).is_ok()
+}
\ No newline at end of file

From 8b1c3e69339e368e337c64bd513374af3e88acb4 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 8 Feb 2024 10:52:47 +0200
Subject: [PATCH 0337/1254] cargo fmt

---
 vm/src/crypto_functions.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vm/src/crypto_functions.rs b/vm/src/crypto_functions.rs
index 5b43bfb174..647f657e10 100644
--- a/vm/src/crypto_functions.rs
+++ b/vm/src/crypto_functions.rs
@@ -29,4 +29,4 @@ pub fn verify_ed25519(key: &[u8], message: &[u8], signature: &[u8]) -> bool {
     }
 
     public.unwrap().verify(message, &sig.unwrap()).is_ok()
-}
\ No newline at end of file
+}

From c4ddd3ca03441f652cb772fd2ebd4830859a60a0 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 8 Feb 2024 11:26:20 +0200
Subject: [PATCH 0338/1254] sc 0.47.4, vm 0.8.3

---
 CHANGELOG.md                                  |  5 +++++
 Cargo.lock                                    | 20 +++++++++----------
 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 +-
 .../wasm-alloc-mem-fail/Cargo.toml            |  2 +-
 .../wasm-alloc-mem-leaking/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 ++--
 framework/base/Cargo.toml                     |  4 ++--
 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         |  3 ++-
 framework/scenario/Cargo.toml                 |  8 ++++----
 framework/snippets/Cargo.toml                 |  4 ++--
 framework/wasm-adapter/Cargo.toml             |  4 ++--
 tools/mxpy-snippet-generator/Cargo.toml       |  2 +-
 tools/rust-debugger/format-tests/Cargo.toml   |  6 +++---
 vm/Cargo.toml                                 |  2 +-
 263 files changed, 391 insertions(+), 385 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1356fff6d5..9f6526006a 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.4, vm 0.8.3] - 2024-02-08
+- Post-build wasm report added to `.mxsc.json` file.
+- Fixed a dependency issue involving ed25519-dalek (downgraded dependency).
+
 ## [sc 0.47.3, sdk 0.3.2] - 2024-02-06
 - SDK: changed the way to retrieve the new deployed address afte deploy/
 - Support for reading from another contract for the following storage mappers: `AddressToIdMapper`, `BiDiMapper`, `LinkedListMapper`, `SetMapper`, `SingleValueMapper`, `UniqueIdMapper`, `UnorderedSetMapper`, `UserMapper`, `VecMapper`, `WhitelistMapper`.
diff --git a/Cargo.lock b/Cargo.lock
index 431291ab86..6550fa0e64 100755
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1760,7 +1760,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-chain-vm"
-version = "0.8.2"
+version = "0.8.3"
 dependencies = [
  "bitflags 2.4.2",
  "colored",
@@ -1785,7 +1785,7 @@ checksum = "b59072fa0624b55ae5ae3fa6bfa91515bbeb4ac440214bc4a509e2c8806d6e9f"
 
 [[package]]
 name = "multiversx-price-aggregator-sc"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "arrayvec",
  "getrandom 0.2.12",
@@ -1806,7 +1806,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "bitflags 2.4.2",
  "hex-literal",
@@ -1836,7 +1836,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -1847,7 +1847,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-meta"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "clap",
  "colored",
@@ -1873,14 +1873,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-scenario"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "base64",
  "bech32",
@@ -1906,7 +1906,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-snippets"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "base64",
  "env_logger",
@@ -1920,7 +1920,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "multiversx-sc",
 ]
@@ -1951,7 +1951,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-wegld-swap-sc"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "multiversx-sc",
  "multiversx-sc-modules",
diff --git a/contracts/benchmarks/large-storage/Cargo.toml b/contracts/benchmarks/large-storage/Cargo.toml
index 19d87a91a6..5d40c9152b 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.3"
+version = "0.47.4"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.3"
+version = "0.47.4"
 path = "../../../framework/scenario"
diff --git a/contracts/benchmarks/large-storage/meta/Cargo.toml b/contracts/benchmarks/large-storage/meta/Cargo.toml
index 8c6736a0d8..061b684f16 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.3"
+version = "0.47.4"
 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 e36db80ee3..71baab2e45 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.3"
+version = "0.47.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/mappers/benchmark-common/Cargo.toml b/contracts/benchmarks/mappers/benchmark-common/Cargo.toml
index 58b8b64338..b4c848a6eb 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.3"
+version = "0.47.4"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.3"
+version = "0.47.4"
 path = "../../../../framework/scenario"
diff --git a/contracts/benchmarks/mappers/linked-list-repeat/Cargo.toml b/contracts/benchmarks/mappers/linked-list-repeat/Cargo.toml
index 664fd82fe6..bac9fe6806 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.3"
+version = "0.47.4"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.3"
+version = "0.47.4"
 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 6854756244..e22d76fe92 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.3"
+version = "0.47.4"
 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 46ae9f62b7..2cbb5bc50a 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.3"
+version = "0.47.4"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/mappers/map-repeat/Cargo.toml b/contracts/benchmarks/mappers/map-repeat/Cargo.toml
index 6825f8f877..248b242906 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.3"
+version = "0.47.4"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.3"
+version = "0.47.4"
 path = "../../../../framework/scenario"
diff --git a/contracts/benchmarks/mappers/map-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/map-repeat/meta/Cargo.toml
index 572e202cb3..f275522114 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.3"
+version = "0.47.4"
 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 98bab485ad..0c8bb08c9c 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.3"
+version = "0.47.4"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/mappers/queue-repeat/Cargo.toml b/contracts/benchmarks/mappers/queue-repeat/Cargo.toml
index a39962a288..92fcfc658f 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.3"
+version = "0.47.4"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.3"
+version = "0.47.4"
 path = "../../../../framework/scenario"
diff --git a/contracts/benchmarks/mappers/queue-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/queue-repeat/meta/Cargo.toml
index 38067268cb..5944b1bfda 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.3"
+version = "0.47.4"
 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 6f09d4564a..1a6d7b3ba9 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.3"
+version = "0.47.4"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/mappers/set-repeat/Cargo.toml b/contracts/benchmarks/mappers/set-repeat/Cargo.toml
index 31d93546f7..bd6fa5c3b0 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.3"
+version = "0.47.4"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.3"
+version = "0.47.4"
 path = "../../../../framework/scenario"
diff --git a/contracts/benchmarks/mappers/set-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/set-repeat/meta/Cargo.toml
index 0f97317c17..3270e5740a 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.3"
+version = "0.47.4"
 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 ed9627726c..df12a3332c 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.3"
+version = "0.47.4"
 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 b96b2c4ea4..4136a89d7f 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.3"
+version = "0.47.4"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.3"
+version = "0.47.4"
 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 f1f766521d..62158f904b 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.3"
+version = "0.47.4"
 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 f9c9d27d41..b98a6b77b6 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.3"
+version = "0.47.4"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/mappers/vec-repeat/Cargo.toml b/contracts/benchmarks/mappers/vec-repeat/Cargo.toml
index 17196cbd7b..cc7c80cd83 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.3"
+version = "0.47.4"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.3"
+version = "0.47.4"
 path = "../../../../framework/scenario"
diff --git a/contracts/benchmarks/mappers/vec-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/vec-repeat/meta/Cargo.toml
index 01ff77167f..1f84d712da 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.3"
+version = "0.47.4"
 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 684c568f33..39e2ff189b 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.3"
+version = "0.47.4"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/send-tx-repeat/Cargo.toml b/contracts/benchmarks/send-tx-repeat/Cargo.toml
index ed2d42d8fe..623d22a83c 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.3"
+version = "0.47.4"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.3"
+version = "0.47.4"
 path = "../../../framework/scenario"
diff --git a/contracts/benchmarks/send-tx-repeat/meta/Cargo.toml b/contracts/benchmarks/send-tx-repeat/meta/Cargo.toml
index 1adf2fc19a..119fcbdd56 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.3"
+version = "0.47.4"
 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 6fc8efda12..a55d4576ca 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.3"
+version = "0.47.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/str-repeat/Cargo.toml b/contracts/benchmarks/str-repeat/Cargo.toml
index 3e61e02b53..8ae1a71cfb 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.3"
+version = "0.47.4"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.3"
+version = "0.47.4"
 path = "../../../framework/scenario"
diff --git a/contracts/benchmarks/str-repeat/meta/Cargo.toml b/contracts/benchmarks/str-repeat/meta/Cargo.toml
index 54649565c2..cb358ea9b9 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.3"
+version = "0.47.4"
 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 9fc23ed24b..f37672a2a0 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.3"
+version = "0.47.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/core/price-aggregator/Cargo.toml b/contracts/core/price-aggregator/Cargo.toml
index b2ca011551..3f4e29d16f 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.3"
+version = "0.47.4"
 authors = [
     "Claudiu-Marcel Bruda <claudiu.bruda@multiversx.com>",
     "MultiversX <contact@multiversx.com>",
@@ -19,15 +19,15 @@ edition = "2021"
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "0.47.3"
+version = "0.47.4"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.47.3"
+version = "0.47.4"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.3"
+version = "0.47.4"
 path = "../../../framework/scenario"
 
 [dependencies]
diff --git a/contracts/core/price-aggregator/meta/Cargo.toml b/contracts/core/price-aggregator/meta/Cargo.toml
index b92fc63a33..8fdaeffc64 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.3"
+version = "0.47.4"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.47.3"
+version = "0.47.4"
 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 083a507b60..3a72bbaa0a 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.3"
+version = "0.47.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/core/wegld-swap/Cargo.toml b/contracts/core/wegld-swap/Cargo.toml
index 6feafcfdbd..62240f60ee 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.3"
+version = "0.47.4"
 
 authors = [
     "Dorin Iancu <dorin.iancu@multiversx.com>",
@@ -20,13 +20,13 @@ edition = "2021"
 path = "src/wegld.rs"
 
 [dependencies.multiversx-sc]
-version = "0.47.3"
+version = "0.47.4"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.47.3"
+version = "0.47.4"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.3"
+version = "0.47.4"
 path = "../../../framework/scenario"
diff --git a/contracts/core/wegld-swap/meta/Cargo.toml b/contracts/core/wegld-swap/meta/Cargo.toml
index 731682a071..62f650105b 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.3"
+version = "0.47.4"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.47.3"
+version = "0.47.4"
 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 6441b5e9cd..51ad50df2f 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.3"
+version = "0.47.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/adder/Cargo.toml b/contracts/examples/adder/Cargo.toml
index 526718b07a..36ed855589 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.3"
+version = "0.47.4"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.3"
+version = "0.47.4"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/adder/interact/Cargo.toml b/contracts/examples/adder/interact/Cargo.toml
index 89298335ff..f8a7e1bb35 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.3"
+version = "0.47.4"
 path = "../../../../framework/snippets"
diff --git a/contracts/examples/adder/meta/Cargo.toml b/contracts/examples/adder/meta/Cargo.toml
index dedfdc55c3..c4f745f2bb 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.3"
+version = "0.47.4"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/examples/adder/wasm/Cargo.toml b/contracts/examples/adder/wasm/Cargo.toml
index 84690cb372..1d10bb1a92 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.3"
+version = "0.47.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/bonding-curve-contract/Cargo.toml b/contracts/examples/bonding-curve-contract/Cargo.toml
index d4da1a9bed..a53de80b2f 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.3"
+version = "0.47.4"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.47.3"
+version = "0.47.4"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.3"
+version = "0.47.4"
 path = "../../../framework/scenario"
 
diff --git a/contracts/examples/bonding-curve-contract/meta/Cargo.toml b/contracts/examples/bonding-curve-contract/meta/Cargo.toml
index 5d182cd1fa..d962e16f11 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.3"
+version = "0.47.4"
 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 5df3eaba07..1e2b666d5b 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.3"
+version = "0.47.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/check-pause/Cargo.toml b/contracts/examples/check-pause/Cargo.toml
index ed51092af6..550458fe26 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.3"
+version = "0.47.4"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.47.3"
+version = "0.47.4"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.3"
+version = "0.47.4"
 path = "../../../framework/scenario"
 
diff --git a/contracts/examples/check-pause/meta/Cargo.toml b/contracts/examples/check-pause/meta/Cargo.toml
index 923ae12579..710a5cf57a 100644
--- a/contracts/examples/check-pause/meta/Cargo.toml
+++ b/contracts/examples/check-pause/meta/Cargo.toml
@@ -9,6 +9,6 @@ authors = ["Alin Cruceat <alin.cruceat@multiversx.com>"]
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.47.3"
+version = "0.47.4"
 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 db4dd2ee5b..52d5311983 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.3"
+version = "0.47.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/crowdfunding-esdt/Cargo.toml b/contracts/examples/crowdfunding-esdt/Cargo.toml
index c0d3854be9..963d937368 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.3"
+version = "0.47.4"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.3"
+version = "0.47.4"
 path = "../../../framework/scenario"
 
 [dev-dependencies]
diff --git a/contracts/examples/crowdfunding-esdt/meta/Cargo.toml b/contracts/examples/crowdfunding-esdt/meta/Cargo.toml
index dd0af0dbfb..7137feb3da 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.3"
+version = "0.47.4"
 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 ef0d645787..2bdd3dcec1 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.3"
+version = "0.47.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/crypto-bubbles/Cargo.toml b/contracts/examples/crypto-bubbles/Cargo.toml
index f606776099..433c083ba4 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.3"
+version = "0.47.4"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.3"
+version = "0.47.4"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/crypto-bubbles/meta/Cargo.toml b/contracts/examples/crypto-bubbles/meta/Cargo.toml
index 73fa2cee35..89b28878fd 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.3"
+version = "0.47.4"
 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 9489fdc6c7..5984f9ee38 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.3"
+version = "0.47.4"
 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 dbb5b128b0..1f30c5fcb6 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.3"
+version = "0.47.4"
 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 46a3e61d2d..d74cf135e3 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.3"
+version = "0.47.4"
 path = "../../../../../framework/base"
diff --git a/contracts/examples/crypto-kitties/kitty-auction/Cargo.toml b/contracts/examples/crypto-kitties/kitty-auction/Cargo.toml
index e46753156f..5245561b04 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.3"
+version = "0.47.4"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.3"
+version = "0.47.4"
 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 f1cec42ea1..e3476a2f0d 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.3"
+version = "0.47.4"
 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 0c18c7c842..767bc541d7 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.3"
+version = "0.47.4"
 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 4aef050d8b..dc33631ae2 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.3"
+version = "0.47.4"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.3"
+version = "0.47.4"
 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 82cbc0c985..6e5346904e 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.3"
+version = "0.47.4"
 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 9f75bcce27..a30b72aef2 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.3"
+version = "0.47.4"
 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 be22ea04a5..1728c94feb 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.3"
+version = "0.47.4"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.3"
+version = "0.47.4"
 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 16ce1b50f2..5504b33b0b 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.3"
+version = "0.47.4"
 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 409948609e..7ca40a20d2 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.3"
+version = "0.47.4"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/crypto-zombies/Cargo.toml b/contracts/examples/crypto-zombies/Cargo.toml
index 9de86b55aa..8d33d5587f 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.3"
+version = "0.47.4"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.3"
+version = "0.47.4"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/crypto-zombies/meta/Cargo.toml b/contracts/examples/crypto-zombies/meta/Cargo.toml
index 6d680b4db5..343741be0e 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.3"
+version = "0.47.4"
 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 5252510261..fc23af1935 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.3"
+version = "0.47.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/digital-cash/Cargo.toml b/contracts/examples/digital-cash/Cargo.toml
index 495a7b3a66..f185de1de5 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.3"
+version = "0.47.4"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.3"
+version = "0.47.4"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/digital-cash/meta/Cargo.toml b/contracts/examples/digital-cash/meta/Cargo.toml
index 50d33de0a0..99cf70662c 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.3"
+version = "0.47.4"
 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 496b0758dd..74d23b95d3 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.3"
+version = "0.47.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/empty/Cargo.toml b/contracts/examples/empty/Cargo.toml
index 8a97fb76b1..73588027f2 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.3"
+version = "0.47.4"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.3"
+version = "0.47.4"
 path = "../../../framework/scenario"
 
 [dev-dependencies]
diff --git a/contracts/examples/empty/meta/Cargo.toml b/contracts/examples/empty/meta/Cargo.toml
index d9890e646a..6cf91f7890 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.3"
+version = "0.47.4"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/examples/empty/wasm/Cargo.toml b/contracts/examples/empty/wasm/Cargo.toml
index e905d7ada5..7035a83338 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.3"
+version = "0.47.4"
 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 f6d0279b3f..26c9e1ccef 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.3"
+version = "0.47.4"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.3"
+version = "0.47.4"
 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 12342da91a..7838c62d7b 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.3"
+version = "0.47.4"
 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 bdd3bf6e65..1b25088dc3 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.3"
+version = "0.47.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/factorial/Cargo.toml b/contracts/examples/factorial/Cargo.toml
index d1dfe6793f..9cd04e512a 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.3"
+version = "0.47.4"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.3"
+version = "0.47.4"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/factorial/meta/Cargo.toml b/contracts/examples/factorial/meta/Cargo.toml
index f4c9b332aa..97e811c98c 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.3"
+version = "0.47.4"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/examples/factorial/wasm/Cargo.toml b/contracts/examples/factorial/wasm/Cargo.toml
index 19eaa56b02..7e5290631a 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.3"
+version = "0.47.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/fractional-nfts/Cargo.toml b/contracts/examples/fractional-nfts/Cargo.toml
index 3b43dd33af..e454076d7b 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.3"
+version = "0.47.4"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.47.3"
+version = "0.47.4"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.3"
+version = "0.47.4"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/fractional-nfts/meta/Cargo.toml b/contracts/examples/fractional-nfts/meta/Cargo.toml
index 332c89e069..08ba253b46 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.3"
+version = "0.47.4"
 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 96cc50ffb1..3dd5eedcd1 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.3"
+version = "0.47.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/lottery-esdt/Cargo.toml b/contracts/examples/lottery-esdt/Cargo.toml
index f7f15b3eec..0a3accab09 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.3"
+version = "0.47.4"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.3"
+version = "0.47.4"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/lottery-esdt/meta/Cargo.toml b/contracts/examples/lottery-esdt/meta/Cargo.toml
index 2855837a76..0fb743b225 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.3"
+version = "0.47.4"
 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 9183725bc4..a7a83472b4 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.3"
+version = "0.47.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/multisig/Cargo.toml b/contracts/examples/multisig/Cargo.toml
index bfb392597c..9fcb9eef78 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.3"
+version = "0.47.4"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.47.3"
+version = "0.47.4"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.3"
+version = "0.47.4"
 path = "../../../framework/scenario"
 
 [dev-dependencies.adder]
@@ -27,7 +27,7 @@ path = "../adder"
 path = "../factorial"
 
 [dev-dependencies.multiversx-wegld-swap-sc]
-version = "0.47.3"
+version = "0.47.4"
 path = "../../core/wegld-swap"
 
 [dev-dependencies]
diff --git a/contracts/examples/multisig/interact/Cargo.toml b/contracts/examples/multisig/interact/Cargo.toml
index 795251060a..b829512742 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.3"
+version = "0.47.4"
 path = "../../../../contracts/modules"
 
 [dependencies.multiversx-sc-snippets]
-version = "0.47.3"
+version = "0.47.4"
 path = "../../../../framework/snippets"
 
 [dependencies.multiversx-sc-scenario]
-version = "=0.47.3"
+version = "=0.47.4"
 path = "../../../../framework/scenario"
diff --git a/contracts/examples/multisig/meta/Cargo.toml b/contracts/examples/multisig/meta/Cargo.toml
index 774a088c40..ba9578d1b8 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.3"
+version = "0.47.4"
 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 fca3e2e29a..7f94c7aca2 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.3"
+version = "0.47.4"
 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 984505ff54..cb6d9ffa87 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.3"
+version = "0.47.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/multisig/wasm/Cargo.toml b/contracts/examples/multisig/wasm/Cargo.toml
index e067097f49..195ea27460 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.3"
+version = "0.47.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/nft-minter/Cargo.toml b/contracts/examples/nft-minter/Cargo.toml
index ac10d97cf3..60c0da0635 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.3"
+version = "0.47.4"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.3"
+version = "0.47.4"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/nft-minter/meta/Cargo.toml b/contracts/examples/nft-minter/meta/Cargo.toml
index de2b78eaef..b4ae982d3c 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.3"
+version = "0.47.4"
 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 fde0b139c4..b3910d1abb 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.3"
+version = "0.47.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/nft-storage-prepay/Cargo.toml b/contracts/examples/nft-storage-prepay/Cargo.toml
index 585e808f49..3db0ad7f00 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.3"
+version = "0.47.4"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.3"
+version = "0.47.4"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/nft-storage-prepay/meta/Cargo.toml b/contracts/examples/nft-storage-prepay/meta/Cargo.toml
index 1ec208c119..5a1f750b79 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.3"
+version = "0.47.4"
 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 e28c50de61..0c1e629109 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.3"
+version = "0.47.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/nft-subscription/Cargo.toml b/contracts/examples/nft-subscription/Cargo.toml
index 0588c756ba..57e5eecc3c 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.3"
+version = "0.47.4"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.47.3"
+version = "0.47.4"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.3"
+version = "0.47.4"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/nft-subscription/meta/Cargo.toml b/contracts/examples/nft-subscription/meta/Cargo.toml
index 4aa82ddddf..775ebbeb9b 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.3"
+version = "0.47.4"
 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 d0dede7221..0c021cd606 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.3"
+version = "0.47.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/order-book/factory/Cargo.toml b/contracts/examples/order-book/factory/Cargo.toml
index ea83a00759..774668a3dd 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.3"
+version = "0.47.4"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.3"
+version = "0.47.4"
 path = "../../../../framework/scenario"
 
diff --git a/contracts/examples/order-book/factory/meta/Cargo.toml b/contracts/examples/order-book/factory/meta/Cargo.toml
index 302c8792ea..a632afb175 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.3"
+version = "0.47.4"
 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 30026179f5..9c512e3e00 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.3"
+version = "0.47.4"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/order-book/pair/Cargo.toml b/contracts/examples/order-book/pair/Cargo.toml
index a11004dbe6..ded9aa2f79 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.3"
+version = "0.47.4"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.3"
+version = "0.47.4"
 path = "../../../../framework/scenario"
diff --git a/contracts/examples/order-book/pair/meta/Cargo.toml b/contracts/examples/order-book/pair/meta/Cargo.toml
index 71d715d0f8..6e8fab5792 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.3"
+version = "0.47.4"
 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 e745d14fde..d497348f77 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.3"
+version = "0.47.4"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/ping-pong-egld/Cargo.toml b/contracts/examples/ping-pong-egld/Cargo.toml
index 5655199049..ff46d18e80 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.3"
+version = "0.47.4"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.3"
+version = "0.47.4"
 path = "../../../framework/scenario"
 
diff --git a/contracts/examples/ping-pong-egld/meta/Cargo.toml b/contracts/examples/ping-pong-egld/meta/Cargo.toml
index 529c1d0418..0d9baadffa 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.3"
+version = "0.47.4"
 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 5b40ef50d5..9417659b63 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.3"
+version = "0.47.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/proxy-pause/Cargo.toml b/contracts/examples/proxy-pause/Cargo.toml
index f033e17ebd..7e0e196164 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.3"
+version = "0.47.4"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.3"
+version = "0.47.4"
 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 43b6d409ba..db82122ea2 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.3"
+version = "0.47.4"
 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 ecb40783ad..ff6d1c3934 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.3"
+version = "0.47.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/rewards-distribution/Cargo.toml b/contracts/examples/rewards-distribution/Cargo.toml
index b58589d9fc..0b4aaaf2fa 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.3"
+version = "0.47.4"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.47.3"
+version = "0.47.4"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.3"
+version = "0.47.4"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/rewards-distribution/meta/Cargo.toml b/contracts/examples/rewards-distribution/meta/Cargo.toml
index 3982a30dac..29dcbbdb78 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 <claudiu.bruda@multiversx.com>"]
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.47.3"
+version = "0.47.4"
 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 22ac57c415..ebe9b96a67 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.3"
+version = "0.47.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/seed-nft-minter/Cargo.toml b/contracts/examples/seed-nft-minter/Cargo.toml
index b9f4919338..d2811a722a 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.3"
+version = "0.47.4"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.47.3"
+version = "0.47.4"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.3"
+version = "0.47.4"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/seed-nft-minter/meta/Cargo.toml b/contracts/examples/seed-nft-minter/meta/Cargo.toml
index 1d33a15533..03267bcff6 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 <claudiu.bruda@multiversx.com>"]
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.47.3"
+version = "0.47.4"
 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 f6e1be26a3..f42bc4173b 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.3"
+version = "0.47.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/token-release/Cargo.toml b/contracts/examples/token-release/Cargo.toml
index 8e3c01422a..adaf65157d 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.3"
+version = "0.47.4"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.3"
+version = "0.47.4"
 path = "../../../framework/scenario"
 
diff --git a/contracts/examples/token-release/meta/Cargo.toml b/contracts/examples/token-release/meta/Cargo.toml
index c727d00142..e642a6a5e5 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.3"
+version = "0.47.4"
 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 738024de3f..24228e9dc2 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.3"
+version = "0.47.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/abi-tester/Cargo.toml b/contracts/feature-tests/abi-tester/Cargo.toml
index 62f91a3184..cec5c2c3e8 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.3"
+version = "0.47.4"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.3"
+version = "0.47.4"
 path = "../../../framework/scenario"
 
 [dev-dependencies.multiversx-sc-meta]
-version = "0.47.3"
+version = "0.47.4"
 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 012d6beb24..430deb54a5 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.3"
+            "version": "0.47.4"
         }
     },
     "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 2ecf36e4a7..fed675f693 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.3"
+            "version": "0.47.4"
         }
     },
     "docs": [
diff --git a/contracts/feature-tests/abi-tester/meta/Cargo.toml b/contracts/feature-tests/abi-tester/meta/Cargo.toml
index 7a0e3b1c23..3836cec9f0 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.3"
+version = "0.47.4"
 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 13ddb51cac..20f86c0cd5 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.3"
+version = "0.47.4"
 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 91cffe5acd..b6a74f8486 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.3"
+version = "0.47.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/alloc-features/Cargo.toml b/contracts/feature-tests/alloc-features/Cargo.toml
index 9966a1494f..90e8413f1b 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.3"
+version = "0.47.4"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.3"
+version = "0.47.4"
 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 662fdad8c0..1965ef6297 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.3"
+version = "0.47.4"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml
index d30d006375..cded4e93ba 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml
@@ -25,7 +25,7 @@ overflow-checks = false
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.47.3"
+version = "0.47.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml
index ccda5c15f4..f0db37cc10 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml
@@ -25,7 +25,7 @@ overflow-checks = false
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.47.3"
+version = "0.47.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/alloc-features/wasm/Cargo.toml b/contracts/feature-tests/alloc-features/wasm/Cargo.toml
index 9c134d4b48..1b66a4a451 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.3"
+version = "0.47.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/basic-features/Cargo.toml b/contracts/feature-tests/basic-features/Cargo.toml
index e607e34ed3..d31bcd043a 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.3"
+version = "0.47.4"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.3"
+version = "0.47.4"
 path = "../../../framework/scenario"
 
 [dependencies.multiversx-sc-modules]
-version = "0.47.3"
+version = "0.47.4"
 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 14c5474742..fe36163ce6 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.3"
+version = "0.47.4"
 path = "../../../../framework/snippets"
diff --git a/contracts/feature-tests/basic-features/meta/Cargo.toml b/contracts/feature-tests/basic-features/meta/Cargo.toml
index 2c34e4b7a7..2d38fa35fb 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.3"
+version = "0.47.4"
 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 a0bc496aa2..998a44ec4e 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.3"
+version = "0.47.4"
 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 b9c3e35500..97414fe81c 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.3"
+version = "0.47.4"
 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 89ceafc497..d64ff28385 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.3"
+version = "0.47.4"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.3"
+version = "0.47.4"
 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 002d01b041..5243b3c760 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.3"
+version = "0.47.4"
 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 51024f78b4..1c090cc1a0 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.3"
+version = "0.47.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/Cargo.toml b/contracts/feature-tests/composability/Cargo.toml
index 143fcb3c91..0c85eb9580 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.3"
+version = "0.47.4"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.3"
+version = "0.47.4"
 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 c1c95ae40d..8c1eb8e107 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.3"
+version = "0.47.4"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.3"
+version = "0.47.4"
 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 91cb236f84..7a71e9cbbe 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.3"
+version = "0.47.4"
 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 f8cfef127b..c67a18439e 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.3"
+version = "0.47.4"
 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 a557c2ac8b..c259e1e885 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.3"
+version = "0.47.4"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.3"
+version = "0.47.4"
 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 8f7cfa1b9f..6a48132cac 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.3"
+version = "0.47.4"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.3"
+version = "0.47.4"
 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 19ef1bbe59..4b9cbfed22 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.3"
+version = "0.47.4"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.47.3"
+version = "0.47.4"
 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 96de46ba79..2f5a726d5f 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.3"
+version = "0.47.4"
 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 e1456188cd..504404a1a5 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.3"
+version = "0.47.4"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.3"
+version = "0.47.4"
 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 6274b398d9..223fb43d64 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.3"
+version = "0.47.4"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.47.3"
+version = "0.47.4"
 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 d80624f0c6..f341fac72d 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.3"
+version = "0.47.4"
 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 75a8b92744..102bcfed58 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.3"
+version = "0.47.4"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.3"
+version = "0.47.4"
 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 2972519c60..fd851251ab 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.3"
+version = "0.47.4"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.3"
+version = "0.47.4"
 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 88d0fb04c7..7756dd9884 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.3"
+version = "0.47.4"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.47.3"
+version = "0.47.4"
 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 86da9a35cd..e142d2fc6b 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.3"
+version = "0.47.4"
 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 9430275d1f..73cca05e44 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.3"
+version = "0.47.4"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.3"
+version = "0.47.4"
 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 019894f2d6..bd427c3855 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.3"
+version = "0.47.4"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.47.3"
+version = "0.47.4"
 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 0850ae7a7c..9ac712d949 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.3"
+version = "0.47.4"
 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 080f11aeb8..b3e945ead5 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.3"
+version = "0.47.4"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.47.3"
+version = "0.47.4"
 path = "../../../../framework/wasm-adapter"
 optional = true
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.3"
+version = "0.47.4"
 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 6efaea7d7b..4eec5c09fd 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.3"
+version = "0.47.4"
 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 9ca8eb69c1..7b86949be8 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.3"
+version = "0.47.4"
 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 670fa3ef88..e9df273bdc 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.3"
+version = "0.47.4"
 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 111ede9c0b..66c5e0f62e 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.3"
+version = "0.47.4"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.3"
+version = "0.47.4"
 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 d0c0a68af6..c2171c6dbd 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.3"
+version = "0.47.4"
 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 72bec0af8a..01671fd73a 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.3"
+version = "0.47.4"
 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 fa0f8e93ff..e48fa01a8b 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.3"
+version = "0.47.4"
 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 dbd5e75907..e4ac47294c 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.3"
+version = "0.47.4"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/forwarder/Cargo.toml b/contracts/feature-tests/composability/forwarder/Cargo.toml
index 3ecd3494cd..8aa4dddf8d 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.3"
+version = "0.47.4"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.3"
+version = "0.47.4"
 path = "../../../../framework/scenario"
 
diff --git a/contracts/feature-tests/composability/forwarder/meta/Cargo.toml b/contracts/feature-tests/composability/forwarder/meta/Cargo.toml
index c20d8ac477..4bfa995581 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.3"
+version = "0.47.4"
 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 083d971ae4..a756f13886 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.3"
+version = "0.47.4"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/interact/Cargo.toml b/contracts/feature-tests/composability/interact/Cargo.toml
index 8820602e23..1c3f8f7eb7 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.3"
+version = "0.47.4"
 path = "../../../../contracts/modules"
 
 [dependencies.multiversx-sc-snippets]
-version = "0.47.3"
+version = "0.47.4"
 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 01f345cf90..13908345d8 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.3"
+version = "0.47.4"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.3"
+version = "0.47.4"
 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 6da88fbb20..fd16b35704 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.3"
+version = "0.47.4"
 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 58001d31e1..86f451be4b 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.3"
+version = "0.47.4"
 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 98c9969ed4..9a06201fc7 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.3"
+version = "0.47.4"
 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 8c5fc3f153..5bbe804406 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.3"
+version = "0.47.4"
 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 8503d8a414..c92dd9daf6 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.3"
+version = "0.47.4"
 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 b4f318e3f7..03fd2fae99 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.3"
+version = "0.47.4"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.3"
+version = "0.47.4"
 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 e758969988..58007e9511 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.3"
+version = "0.47.4"
 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 57b263e194..cbac5d5f98 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.3"
+version = "0.47.4"
 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 fb1a590e19..cf3503095a 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.3"
+version = "0.47.4"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.3"
+version = "0.47.4"
 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 892c4aac22..e487ed2503 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.3"
+version = "0.47.4"
 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 63c0608f75..17cb903625 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.3"
+version = "0.47.4"
 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 5805680f2f..5fb27caa77 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.3"
+version = "0.47.4"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.3"
+version = "0.47.4"
 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 d02dd3ebb0..91857c4209 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.3"
+version = "0.47.4"
 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 4ed7591719..fef729c40b 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.3"
+version = "0.47.4"
 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 0103c86b6f..13adfca4f8 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.3"
+version = "0.47.4"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.47.3"
+version = "0.47.4"
 path = "../../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.3"
+version = "0.47.4"
 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 d54d322a7b..b926e94951 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.3"
+version = "0.47.4"
 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 185804804a..44296fec66 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.3"
+version = "0.47.4"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/vault/Cargo.toml b/contracts/feature-tests/composability/vault/Cargo.toml
index 37d56fb0f1..7c58bbf94e 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.3"
+version = "0.47.4"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.3"
+version = "0.47.4"
 path = "../../../../framework/scenario"
diff --git a/contracts/feature-tests/composability/vault/meta/Cargo.toml b/contracts/feature-tests/composability/vault/meta/Cargo.toml
index 11ebe0fe99..7ae95b77ae 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.3"
+version = "0.47.4"
 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 ee122954fd..5848bd0e8e 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.3"
+version = "0.47.4"
 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 3a0b56aa51..6132ff9734 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.3"
+version = "0.47.4"
 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 f03485ab55..22fc6dd8e1 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.3"
+version = "0.47.4"
 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 61cfa8596b..7168729b30 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.3"
+version = "0.47.4"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.3"
+version = "0.47.4"
 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 c06402373f..34d6f87cad 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.3"
+version = "0.47.4"
 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 dd7682e135..4ba3bf2d9a 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.3"
+version = "0.47.4"
 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 d75af2b3ca..144b07fc61 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.3"
+version = "0.47.4"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.3"
+version = "0.47.4"
 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 f6fd2230ad..8ef7b29640 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.3"
+version = "0.47.4"
 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 0f11cf94fc..02d75ee006 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.3"
+version = "0.47.4"
 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 e6ec85a6ed..5aa723d111 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.3"
+version = "0.47.4"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.3"
+version = "0.47.4"
 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 79dad1ae32..d9a7cd60a3 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.3"
+version = "0.47.4"
 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 0d92815967..933ea65d16 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.3"
+version = "0.47.4"
 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 c5261335b2..e62919b3ab 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.3"
+version = "0.47.4"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.3"
+version = "0.47.4"
 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 922199a8c6..d5d645d0f1 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.3"
+version = "0.47.4"
 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 f778b31257..a62502f5f6 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.3"
+version = "0.47.4"
 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 06764d1fa8..bb1c12149b 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.3"
+version = "0.47.4"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.3"
+version = "0.47.4"
 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 96ac1477e7..6bad03d999 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.3"
+version = "0.47.4"
 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 847b3f9557..de69fe6826 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.3"
+version = "0.47.4"
 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 615d033565..cfafd07428 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.3"
+version = "0.47.4"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.3"
+version = "0.47.4"
 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 a9292ca253..8a15883327 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.3"
+version = "0.47.4"
 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 429222a8d8..8a2063a899 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.3"
+version = "0.47.4"
 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 bd353180f1..6c5dbaf79d 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.3"
+version = "0.47.4"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.3"
+version = "0.47.4"
 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 dfa121643f..07d5dea169 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.3"
+version = "0.47.4"
 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 1c5f771381..f38877401c 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.3"
+version = "0.47.4"
 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 e5fbd6b118..4856094648 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.3"
+version = "0.47.4"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.3"
+version = "0.47.4"
 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 f0066f59b2..b65eefd0df 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.3"
+version = "0.47.4"
 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 8398a3c9b6..f8180683cd 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.3"
+version = "0.47.4"
 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 805f4a9879..d786dc6e68 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.3"
+version = "0.47.4"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.3"
+version = "0.47.4"
 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 20bf583185..5f606095d2 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.3"
+version = "0.47.4"
 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 88e0bc35dc..1de57ac0b0 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.3"
+version = "0.47.4"
 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 0a39a7bda8..e30990c25b 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.3"
+version = "0.47.4"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.3"
+version = "0.47.4"
 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 3faca87e51..b1f1a6e4dc 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.3"
+version = "0.47.4"
 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 e3f67b9d2d..04503904ec 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.3"
+version = "0.47.4"
 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 ce0570fb65..923bccc230 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.3"
+version = "0.47.4"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.3"
+version = "0.47.4"
 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 5ea25035d1..adbf83ecd0 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.3"
+version = "0.47.4"
 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 b265003fad..735a04ba25 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.3"
+version = "0.47.4"
 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 5bc3507c82..57323aafa8 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.3"
+version = "0.47.4"
 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 3c0a7dc1cf..c17d98ca74 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.3"
+version = "0.47.4"
 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 cbda187601..9f4d9c6c73 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.3"
+version = "0.47.4"
 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 f1358178a6..7b2cf5bc99 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.3"
+version = "0.47.4"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.3"
+version = "0.47.4"
 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 093675a2a5..a0f39aa6c4 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.3"
+version = "0.47.4"
 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 9755f08f02..f705ca2583 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.3"
+version = "0.47.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/payable-features/Cargo.toml b/contracts/feature-tests/payable-features/Cargo.toml
index 8c803df428..445d66463e 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.3"
+version = "0.47.4"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.3"
+version = "0.47.4"
 path = "../../../framework/scenario"
diff --git a/contracts/feature-tests/payable-features/meta/Cargo.toml b/contracts/feature-tests/payable-features/meta/Cargo.toml
index 742de00b6c..a651ce411e 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.3"
+version = "0.47.4"
 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 990206679c..e36be08ae6 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.3"
+version = "0.47.4"
 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 d2d9c56886..799071a673 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.3"
+version = "0.47.4"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.3"
+version = "0.47.4"
 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 a5c5ab8123..111428bdb7 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.3"
+version = "0.47.4"
 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 7414aa3187..a8b07cd43b 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.3"
+version = "0.47.4"
 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 324dbcef2c..cc35e3dbf0 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.3"
+// version = "0.47.4"
 // 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 e71940ef92..844be02a77 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.3"
+version = "0.47.4"
 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 b8a8fa758a..0fba5c371a 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.3"
+version = "0.47.4"
 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.3"
+version = "0.47.4"
 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 0b1901a8c3..7a54d9f7f6 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.3"
+version = "0.47.4"
 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 3062730416..79cdfd35fc 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.3"
+version = "0.47.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/use-module/Cargo.toml b/contracts/feature-tests/use-module/Cargo.toml
index 3d48b6bfe0..6b2b9296c0 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.3"
+version = "0.47.4"
 path = "../../../contracts/modules"
 
 [dependencies.multiversx-sc]
-version = "0.47.3"
+version = "0.47.4"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.3"
+version = "0.47.4"
 path = "../../../framework/scenario"
 
 [dev-dependencies.multiversx-sc-meta]
-version = "0.47.3"
+version = "0.47.4"
 path = "../../../framework/meta"
diff --git a/contracts/feature-tests/use-module/meta/Cargo.toml b/contracts/feature-tests/use-module/meta/Cargo.toml
index 16cb7c5210..ae47738894 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.3"
+version = "0.47.4"
 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 fe61d8c140..4ec3f48a8a 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.3"
+version = "0.47.4"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.47.3"
+version = "0.47.4"
 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 fe38c7413d..1e2aa7eece 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.3"
+            "version": "0.47.4"
         }
     },
     "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 d6d20af984..9abfd943b0 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.3"
+            "version": "0.47.4"
         }
     },
     "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 59483391a5..3dfe8ccc8a 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.3"
+version = "0.47.4"
 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 b4521c33f2..e3bd3d0058 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.3"
+version = "0.47.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/modules/Cargo.toml b/contracts/modules/Cargo.toml
index 3168f0e37b..261a265d42 100644
--- a/contracts/modules/Cargo.toml
+++ b/contracts/modules/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-modules"
-version = "0.47.3"
+version = "0.47.4"
 edition = "2021"
 
 authors = ["MultiversX <contact@multiversx.com>"]
@@ -17,5 +17,5 @@ categories = ["no-std", "wasm", "cryptography::cryptocurrencies"]
 alloc = ["multiversx-sc/alloc"]
 
 [dependencies.multiversx-sc]
-version = "0.47.3"
+version = "0.47.4"
 path = "../../framework/base"
diff --git a/framework/base/Cargo.toml b/framework/base/Cargo.toml
index e44543aff5..dd372ebb50 100644
--- a/framework/base/Cargo.toml
+++ b/framework/base/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc"
-version = "0.47.3"
+version = "0.47.4"
 edition = "2021"
 
 authors = ["Andrei Marinica <andrei.marinica@multiversx.com>", "MultiversX <contact@multiversx.com>"]
@@ -27,7 +27,7 @@ bitflags = "=2.4.2"
 num-traits = { version = "=0.2.17", default-features = false }
 
 [dependencies.multiversx-sc-derive]
-version = "=0.47.3"
+version = "=0.47.4"
 path = "../derive"
 
 [dependencies.multiversx-sc-codec]
diff --git a/framework/derive/Cargo.toml b/framework/derive/Cargo.toml
index 81bc4c4a88..6494bdb753 100644
--- a/framework/derive/Cargo.toml
+++ b/framework/derive/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-derive"
-version = "0.47.3"
+version = "0.47.4"
 edition = "2021"
 
 authors = ["Andrei Marinica <andrei.marinica@multiversx.com>", "MultiversX <contact@multiversx.com>"]
diff --git a/framework/meta/Cargo.toml b/framework/meta/Cargo.toml
index eb70fd09f7..4746b46a37 100644
--- a/framework/meta/Cargo.toml
+++ b/framework/meta/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-meta"
-version = "0.47.3"
+version = "0.47.4"
 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.3"
+version = "=0.47.4"
 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 dc4072e1da..950038241c 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.3"
+version = "0.47.4"
 
 # [workspace]
 
diff --git a/framework/meta/src/cmd/contract/meta_config.rs b/framework/meta/src/cmd/contract/meta_config.rs
index 400a1d3eed..f5e9c18123 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.3\"
+version = \"0.47.4\"
 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.3".to_string(),
+            framework_version: "0.47.4".to_string(),
             framework_path: Option::Some("../../../framework/base".to_string()),
             contract_features: Vec::<String>::new(),
         };
diff --git a/framework/meta/src/version_history.rs b/framework/meta/src/version_history.rs
index 92afe9b3b6..45bea078ce 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.3);
+pub const LAST_VERSION: FrameworkVersion = framework_version!(0.47.4);
 
 /// Indicates where to stop with the upgrades.
 pub const LAST_UPGRADE_VERSION: FrameworkVersion = LAST_VERSION;
@@ -61,6 +61,7 @@ pub const VERSIONS: &[FrameworkVersion] = framework_versions![
     0.47.1,
     0.47.2,
     0.47.3,
+    0.47.4,
 ];
 
 #[rustfmt::skip]
diff --git a/framework/scenario/Cargo.toml b/framework/scenario/Cargo.toml
index f6d036ee75..e599159afc 100644
--- a/framework/scenario/Cargo.toml
+++ b/framework/scenario/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-scenario"
-version = "0.47.3"
+version = "0.47.4"
 edition = "2021"
 
 authors = [
@@ -40,12 +40,12 @@ path = "src/main.rs"
 run-go-tests = []
 
 [dependencies.multiversx-sc]
-version = "=0.47.3"
+version = "=0.47.4"
 features = ["alloc", "num-bigint"]
 path = "../base"
 
 [dependencies.multiversx-sc-meta]
-version = "=0.47.3"
+version = "=0.47.4"
 path = "../meta"
 
 [dependencies.multiversx-chain-scenario-format]
@@ -56,7 +56,7 @@ path = "../../sdk/scenario-format"
 version = "0.2.0"
 
 [dependencies.multiversx-chain-vm]
-version = "=0.8.2"
+version = "=0.8.3"
 path = "../../vm"
 
 [dependencies.multiversx-sdk]
diff --git a/framework/snippets/Cargo.toml b/framework/snippets/Cargo.toml
index b1f16b110a..67b81fb93b 100644
--- a/framework/snippets/Cargo.toml
+++ b/framework/snippets/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-snippets"
-version = "0.47.3"
+version = "0.47.4"
 edition = "2021"
 
 authors = ["MultiversX <contact@multiversx.com>"]
@@ -22,7 +22,7 @@ env_logger = "0.11"
 futures = "0.3"
 
 [dependencies.multiversx-sc-scenario]
-version = "=0.47.3"
+version = "=0.47.4"
 path = "../scenario"
 
 [dependencies.multiversx-sdk]
diff --git a/framework/wasm-adapter/Cargo.toml b/framework/wasm-adapter/Cargo.toml
index 53d4097fa1..2e358e1b6b 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.3"
+version = "0.47.4"
 edition = "2021"
 
 authors = [
@@ -22,5 +22,5 @@ categories = [
 ]
 
 [dependencies.multiversx-sc]
-version = "=0.47.3"
+version = "=0.47.4"
 path = "../base"
diff --git a/tools/mxpy-snippet-generator/Cargo.toml b/tools/mxpy-snippet-generator/Cargo.toml
index 3c1d3d57ce..7687286a24 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.3"
+version = "0.47.4"
 path = "../../framework/base"
 
 [dependencies]
diff --git a/tools/rust-debugger/format-tests/Cargo.toml b/tools/rust-debugger/format-tests/Cargo.toml
index e233dcd80f..d006ef7960 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.3"
+version = "=0.47.4"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-scenario]
-version = "0.47.3"
+version = "=0.47.4"
 path = "../../../framework/scenario"
 
 [dependencies.multiversx-chain-vm]
-version = "0.8.2"
+version = "=0.8.3"
 path = "../../../vm"
 
 [dev-dependencies]
diff --git a/vm/Cargo.toml b/vm/Cargo.toml
index 4b9c294e58..2246fc453a 100644
--- a/vm/Cargo.toml
+++ b/vm/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-chain-vm"
-version = "0.8.2"
+version = "0.8.3"
 edition = "2021"
 
 authors = [

From 6f4a152a089c08ea1528928954ac9735ba5d42e0 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 8 Feb 2024 12:08:39 +0200
Subject: [PATCH 0339/1254] Cargo.lock update

---
 .../benchmarks/large-storage/wasm/Cargo.lock  |  6 ++--
 .../linked-list-repeat/wasm/Cargo.lock        |  6 ++--
 .../mappers/map-repeat/wasm/Cargo.lock        |  6 ++--
 .../mappers/queue-repeat/wasm/Cargo.lock      |  6 ++--
 .../mappers/set-repeat/wasm/Cargo.lock        |  6 ++--
 .../single-value-repeat/wasm/Cargo.lock       |  6 ++--
 .../mappers/vec-repeat/wasm/Cargo.lock        |  6 ++--
 .../benchmarks/send-tx-repeat/wasm/Cargo.lock |  6 ++--
 .../benchmarks/str-repeat/wasm/Cargo.lock     |  6 ++--
 .../core/price-aggregator/wasm/Cargo.lock     | 34 +++++++++----------
 contracts/examples/adder/wasm/Cargo.lock      |  6 ++--
 .../bonding-curve-contract/wasm/Cargo.lock    |  8 ++---
 .../examples/check-pause/wasm/Cargo.lock      |  8 ++---
 .../crowdfunding-esdt/wasm/Cargo.lock         |  6 ++--
 .../examples/crypto-bubbles/wasm/Cargo.lock   |  6 ++--
 .../kitty-auction/wasm/Cargo.lock             |  6 ++--
 .../kitty-genetic-alg/wasm/Cargo.lock         |  6 ++--
 .../kitty-ownership/wasm/Cargo.lock           |  6 ++--
 .../examples/crypto-zombies/wasm/Cargo.lock   |  6 ++--
 .../examples/digital-cash/wasm/Cargo.lock     |  6 ++--
 contracts/examples/empty/wasm/Cargo.lock      |  6 ++--
 .../esdt-transfer-with-fee/wasm/Cargo.lock    |  6 ++--
 contracts/examples/factorial/wasm/Cargo.lock  |  6 ++--
 .../examples/fractional-nfts/wasm/Cargo.lock  |  8 ++---
 .../examples/lottery-esdt/wasm/Cargo.lock     |  6 ++--
 .../multisig/wasm-multisig-full/Cargo.lock    |  8 ++---
 .../multisig/wasm-multisig-view/Cargo.lock    |  8 ++---
 contracts/examples/multisig/wasm/Cargo.lock   |  8 ++---
 contracts/examples/nft-minter/wasm/Cargo.lock |  6 ++--
 .../nft-storage-prepay/wasm/Cargo.lock        |  6 ++--
 .../examples/nft-subscription/wasm/Cargo.lock |  8 ++---
 .../order-book/factory/wasm/Cargo.lock        |  6 ++--
 .../examples/order-book/pair/wasm/Cargo.lock  |  6 ++--
 .../examples/ping-pong-egld/wasm/Cargo.lock   |  6 ++--
 .../examples/proxy-pause/wasm/Cargo.lock      |  6 ++--
 .../rewards-distribution/wasm/Cargo.lock      |  8 ++---
 .../examples/seed-nft-minter/wasm/Cargo.lock  |  8 ++---
 .../examples/token-release/wasm/Cargo.lock    |  6 ++--
 .../abi-tester/wasm-abi-tester-ev/Cargo.lock  |  6 ++--
 .../feature-tests/abi-tester/wasm/Cargo.lock  |  6 ++--
 .../wasm-alloc-mem-fail/Cargo.lock            |  6 ++--
 .../wasm-alloc-mem-leaking/Cargo.lock         |  6 ++--
 .../alloc-features/wasm/Cargo.lock            |  6 ++--
 .../Cargo.lock                                |  8 ++---
 .../basic-features/wasm/Cargo.lock            |  8 ++---
 .../big-float-features/wasm/Cargo.lock        |  6 ++--
 .../builtin-func-features/wasm/Cargo.lock     |  6 ++--
 .../first-contract/wasm/Cargo.lock            |  6 ++--
 .../second-contract/wasm/Cargo.lock           |  6 ++--
 .../child/wasm/Cargo.lock                     |  6 ++--
 .../parent/wasm/Cargo.lock                    |  6 ++--
 .../wasm-forwarder-queue-promises/Cargo.lock  |  6 ++--
 .../forwarder-queue/wasm/Cargo.lock           |  6 ++--
 .../Cargo.lock                                |  6 ++--
 .../Cargo.lock                                |  6 ++--
 .../forwarder-raw/wasm/Cargo.lock             |  6 ++--
 .../composability/forwarder/wasm/Cargo.lock   |  6 ++--
 .../local-esdt-and-nft/wasm/Cargo.lock        |  6 ++--
 .../promises-features/wasm/Cargo.lock         |  6 ++--
 .../proxy-test-first/wasm/Cargo.lock          |  6 ++--
 .../proxy-test-second/wasm/Cargo.lock         |  6 ++--
 .../recursive-caller/wasm/Cargo.lock          |  6 ++--
 .../transfer-role-features/wasm/Cargo.lock    |  8 ++---
 .../vault/wasm-vault-promises/Cargo.lock      |  6 ++--
 .../vault/wasm-vault-upgrade/Cargo.lock       |  6 ++--
 .../composability/vault/wasm/Cargo.lock       |  6 ++--
 .../crowdfunding-erc20/wasm/Cargo.lock        |  6 ++--
 .../erc1155-marketplace/wasm/Cargo.lock       |  6 ++--
 .../erc1155-user-mock/wasm/Cargo.lock         |  6 ++--
 .../erc1155/wasm/Cargo.lock                   |  6 ++--
 .../erc-style-contracts/erc20/wasm/Cargo.lock |  6 ++--
 .../erc721/wasm/Cargo.lock                    |  6 ++--
 .../lottery-erc20/wasm/Cargo.lock             |  6 ++--
 .../esdt-system-sc-mock/wasm/Cargo.lock       |  6 ++--
 .../wasm/Cargo.lock                           |  6 ++--
 .../managed-map-features/wasm/Cargo.lock      |  6 ++--
 .../wasm-multi-contract-alt-impl/Cargo.lock   |  6 ++--
 .../Cargo.lock                                |  6 ++--
 .../Cargo.lock                                |  6 ++--
 .../multi-contract-features/wasm/Cargo.lock   |  6 ++--
 .../panic-message-features/wasm/Cargo.lock    |  6 ++--
 .../payable-features/wasm/Cargo.lock          |  6 ++--
 .../wasm/Cargo.lock                           |  6 ++--
 .../wasm/Cargo.lock                           |  6 ++--
 .../wasm-use-module-view/Cargo.lock           |  8 ++---
 .../feature-tests/use-module/wasm/Cargo.lock  |  8 ++---
 86 files changed, 286 insertions(+), 286 deletions(-)

diff --git a/contracts/benchmarks/large-storage/wasm/Cargo.lock b/contracts/benchmarks/large-storage/wasm/Cargo.lock
index 66539b7c78..8148ac8ac3 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.47.3"
+version = "0.47.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.lock
index fb40529bbb..e735e81157 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.47.3"
+version = "0.47.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -92,7 +92,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -103,7 +103,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.lock
index 0f0f34ca4f..da86542260 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.47.3"
+version = "0.47.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -92,7 +92,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -103,7 +103,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.lock
index ee2adae4ab..cbc93b8e4a 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.47.3"
+version = "0.47.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.lock
index 03d3b8e637..8f007230ed 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.47.3"
+version = "0.47.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.lock
index 4d99a9ef2f..0ed5ea463d 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.47.3"
+version = "0.47.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.lock
index eb3587d1f2..a890308d2e 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.47.3"
+version = "0.47.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/send-tx-repeat/wasm/Cargo.lock b/contracts/benchmarks/send-tx-repeat/wasm/Cargo.lock
index 7c3d430e7d..1950219bdb 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.47.3"
+version = "0.47.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/str-repeat/wasm/Cargo.lock b/contracts/benchmarks/str-repeat/wasm/Cargo.lock
index dc10e79df9..196a58c5e7 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.47.3"
+version = "0.47.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/core/price-aggregator/wasm/Cargo.lock b/contracts/core/price-aggregator/wasm/Cargo.lock
index f78ef7c803..e57c4b5d42 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.67"
+version = "0.3.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a1d36f1235bc969acba30b7f5990b864423a6068a10f7c90ae8f0112e3a59d1"
+checksum = "406cda4b368d531c842222cf9d2600a9a4acce8d29423695379c6868a143a9ee"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -86,7 +86,7 @@ checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
 
 [[package]]
 name = "multiversx-price-aggregator-sc"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "arrayvec",
  "getrandom",
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -134,7 +134,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -145,14 +145,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "multiversx-sc",
 ]
@@ -276,9 +276,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.90"
+version = "0.2.91"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1223296a201415c7fad14792dbefaace9bd52b62d33453ade1c5b5f07555406"
+checksum = "c1e124130aee3fb58c5bdd6b639a0509486b0338acaaae0c84a5124b0f588b7f"
 dependencies = [
  "cfg-if",
  "wasm-bindgen-macro",
@@ -286,9 +286,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.90"
+version = "0.2.91"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcdc935b63408d58a32f8cc9738a0bffd8f05cc7c002086c6ef20b7312ad9dcd"
+checksum = "c9e7e1900c352b609c8488ad12639a311045f40a35491fb69ba8c12f758af70b"
 dependencies = [
  "bumpalo",
  "log",
@@ -301,9 +301,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.90"
+version = "0.2.91"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e4c238561b2d428924c49815533a8b9121c664599558a5d9ec51f8a1740a999"
+checksum = "b30af9e2d358182b5c7449424f017eba305ed32a7010509ede96cdc4696c46ed"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -311,9 +311,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.90"
+version = "0.2.91"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bae1abb6806dc1ad9e560ed242107c0f6c84335f1749dd4e8ddb012ebd5e25a7"
+checksum = "642f325be6301eb8107a83d12a8ac6c1e1c54345a7ef1a9261962dfefda09e66"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -324,6 +324,6 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.90"
+version = "0.2.91"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d91413b1c31d7539ba5ef2451af3f0b833a005eb27a631cec32bc0635a8602b"
+checksum = "4f186bd2dcf04330886ce82d6f33dd75a7bfcf69ecf5763b89fcde53b6ac9838"
diff --git a/contracts/examples/adder/wasm/Cargo.lock b/contracts/examples/adder/wasm/Cargo.lock
index 1dbfeecc21..76dad58cac 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.47.3"
+version = "0.47.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/bonding-curve-contract/wasm/Cargo.lock b/contracts/examples/bonding-curve-contract/wasm/Cargo.lock
index 32151cae0b..b034ea7a9b 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.47.3"
+version = "0.47.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,14 +96,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/check-pause/wasm/Cargo.lock b/contracts/examples/check-pause/wasm/Cargo.lock
index 3e3b8be25c..b49e145835 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.47.3"
+version = "0.47.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,14 +96,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crowdfunding-esdt/wasm/Cargo.lock b/contracts/examples/crowdfunding-esdt/wasm/Cargo.lock
index 37fe795b16..01d410dd3a 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.47.3"
+version = "0.47.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crypto-bubbles/wasm/Cargo.lock b/contracts/examples/crypto-bubbles/wasm/Cargo.lock
index 0ecb4c8289..c646689015 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.47.3"
+version = "0.47.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.lock b/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.lock
index 0100ae4f6a..5b6ccc42b7 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.47.3"
+version = "0.47.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -113,7 +113,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -124,7 +124,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "multiversx-sc",
 ]
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 4dcd5e038e..c6f967bda2 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.47.3"
+version = "0.47.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.lock b/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.lock
index 1f5b8892ee..3fcdd3fbd1 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.47.3"
+version = "0.47.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -104,7 +104,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -115,7 +115,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crypto-zombies/wasm/Cargo.lock b/contracts/examples/crypto-zombies/wasm/Cargo.lock
index 330e342bb4..5605b9f6ab 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.47.3"
+version = "0.47.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/digital-cash/wasm/Cargo.lock b/contracts/examples/digital-cash/wasm/Cargo.lock
index 17b6e812df..8b772e8f01 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.47.3"
+version = "0.47.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/empty/wasm/Cargo.lock b/contracts/examples/empty/wasm/Cargo.lock
index c11ef9dbb1..c711b28cbd 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.47.3"
+version = "0.47.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.lock b/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.lock
index 595f04eddd..d629a0d134 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.47.3"
+version = "0.47.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/factorial/wasm/Cargo.lock b/contracts/examples/factorial/wasm/Cargo.lock
index fa8295418a..afac55b95e 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.47.3"
+version = "0.47.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/fractional-nfts/wasm/Cargo.lock b/contracts/examples/fractional-nfts/wasm/Cargo.lock
index 8e7c1bd93a..1aac8b6a7e 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.47.3"
+version = "0.47.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,14 +96,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/lottery-esdt/wasm/Cargo.lock b/contracts/examples/lottery-esdt/wasm/Cargo.lock
index f15bb67869..8c3f659391 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.47.3"
+version = "0.47.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/multisig/wasm-multisig-full/Cargo.lock b/contracts/examples/multisig/wasm-multisig-full/Cargo.lock
index a0d4ee5b27..755f08055b 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.47.3"
+version = "0.47.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,14 +96,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/multisig/wasm-multisig-view/Cargo.lock b/contracts/examples/multisig/wasm-multisig-view/Cargo.lock
index b026d56c78..dd6c470358 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.47.3"
+version = "0.47.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,14 +96,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/multisig/wasm/Cargo.lock b/contracts/examples/multisig/wasm/Cargo.lock
index 74c8da6b32..a2a15edc66 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.47.3"
+version = "0.47.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,14 +96,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/nft-minter/wasm/Cargo.lock b/contracts/examples/nft-minter/wasm/Cargo.lock
index 96fbf6ebfc..96d3199e96 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.47.3"
+version = "0.47.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/nft-storage-prepay/wasm/Cargo.lock b/contracts/examples/nft-storage-prepay/wasm/Cargo.lock
index 52baa85dd8..531c5cca79 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.47.3"
+version = "0.47.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/nft-subscription/wasm/Cargo.lock b/contracts/examples/nft-subscription/wasm/Cargo.lock
index 26faeb3bfe..77ba923958 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.47.3"
+version = "0.47.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,14 +80,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/order-book/factory/wasm/Cargo.lock b/contracts/examples/order-book/factory/wasm/Cargo.lock
index 0c8e38ecfc..f4dcd0fd4d 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.47.3"
+version = "0.47.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/order-book/pair/wasm/Cargo.lock b/contracts/examples/order-book/pair/wasm/Cargo.lock
index 416a38f60f..02cce8b075 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.47.3"
+version = "0.47.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/ping-pong-egld/wasm/Cargo.lock b/contracts/examples/ping-pong-egld/wasm/Cargo.lock
index dc763d516a..b8b8c55924 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.47.3"
+version = "0.47.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/proxy-pause/wasm/Cargo.lock b/contracts/examples/proxy-pause/wasm/Cargo.lock
index 586d62d379..3fe7a57949 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.47.3"
+version = "0.47.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/rewards-distribution/wasm/Cargo.lock b/contracts/examples/rewards-distribution/wasm/Cargo.lock
index 7e14194a4c..81ec12d61c 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.47.3"
+version = "0.47.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,14 +80,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/seed-nft-minter/wasm/Cargo.lock b/contracts/examples/seed-nft-minter/wasm/Cargo.lock
index db59fda089..d8833508b2 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.47.3"
+version = "0.47.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,14 +80,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/token-release/wasm/Cargo.lock b/contracts/examples/token-release/wasm/Cargo.lock
index 6750987cc0..15cb26d036 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.47.3"
+version = "0.47.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "multiversx-sc",
 ]
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 fb93072107..ba640af091 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.47.3"
+version = "0.47.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/abi-tester/wasm/Cargo.lock b/contracts/feature-tests/abi-tester/wasm/Cargo.lock
index a2cfd547b0..a19279f401 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.47.3"
+version = "0.47.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock
index 0dd3c8a34e..bd879ba61d 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.lock b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.lock
index 478995d08d..3cc4ec38d2 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.lock
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.lock
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/alloc-features/wasm/Cargo.lock b/contracts/feature-tests/alloc-features/wasm/Cargo.lock
index 3bd5ec76ff..e5835e2b7a 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.47.3"
+version = "0.47.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "multiversx-sc",
 ]
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 506ab908d9..2df9369539 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.47.3"
+version = "0.47.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,14 +96,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/basic-features/wasm/Cargo.lock b/contracts/feature-tests/basic-features/wasm/Cargo.lock
index a9e185930f..d7b69c3824 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.47.3"
+version = "0.47.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,14 +96,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/big-float-features/wasm/Cargo.lock b/contracts/feature-tests/big-float-features/wasm/Cargo.lock
index 77df781a59..4b170e4db8 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.47.3"
+version = "0.47.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "multiversx-sc",
 ]
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 429c78c037..82d29dce3b 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.47.3"
+version = "0.47.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "multiversx-sc",
 ]
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 dbc99448a0..e67425c1a8 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.47.3"
+version = "0.47.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "multiversx-sc",
 ]
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 8d9372cb47..f8807680d7 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.47.3"
+version = "0.47.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "multiversx-sc",
 ]
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 074007b500..2022bb8ce9 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.47.3"
+version = "0.47.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "multiversx-sc",
 ]
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 d5ba929a36..240d777f6c 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.47.3"
+version = "0.47.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "multiversx-sc",
 ]
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 89c1886860..b724024395 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.47.3"
+version = "0.47.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,7 +96,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock
index 60b9a450b2..e016cf9424 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.47.3"
+version = "0.47.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,7 +96,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "multiversx-sc",
 ]
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 cf5aefa3c4..5f95df3475 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.47.3"
+version = "0.47.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "multiversx-sc",
 ]
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 8d65aaa888..f56e305375 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.47.3"
+version = "0.47.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.lock
index 41a64d6e7d..91e3bd89a9 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.47.3"
+version = "0.47.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock
index 346b304ae3..c97d19070a 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.47.3"
+version = "0.47.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,7 +96,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "multiversx-sc",
 ]
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 3ebc1e57d1..689b3335f2 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.47.3"
+version = "0.47.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/promises-features/wasm/Cargo.lock b/contracts/feature-tests/composability/promises-features/wasm/Cargo.lock
index cdbae5fac9..5dfe73db9f 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.47.3"
+version = "0.47.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "multiversx-sc",
 ]
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 5f4dfb67a8..ac29bd11ae 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.47.3"
+version = "0.47.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "multiversx-sc",
 ]
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 5fdfa521de..6cc85e8a9f 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.47.3"
+version = "0.47.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.lock b/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.lock
index f0c8bb95e7..63354a689b 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.47.3"
+version = "0.47.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "multiversx-sc",
 ]
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 ec66e3cada..109fc9822b 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.47.3"
+version = "0.47.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,14 +80,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "multiversx-sc",
 ]
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 31b660687b..2d088845e2 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.47.3"
+version = "0.47.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "multiversx-sc",
 ]
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 863b19fd4f..155de79270 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.47.3"
+version = "0.47.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/vault/wasm/Cargo.lock b/contracts/feature-tests/composability/vault/wasm/Cargo.lock
index 8736fb15b2..f1ca2e7050 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.47.3"
+version = "0.47.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "multiversx-sc",
 ]
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 3ed6df3a09..bea64d59ff 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.47.3"
+version = "0.47.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -92,7 +92,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -103,7 +103,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "multiversx-sc",
 ]
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 6a5f79da57..9c1dab726e 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.47.3"
+version = "0.47.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -92,7 +92,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -103,7 +103,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "multiversx-sc",
 ]
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 5cb5908c1e..70a92d0808 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.47.3"
+version = "0.47.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "multiversx-sc",
 ]
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 ed904a262f..474ac2e011 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.47.3"
+version = "0.47.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "multiversx-sc",
 ]
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 1524da2306..ad9f9fd870 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.47.3"
+version = "0.47.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "multiversx-sc",
 ]
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 2e52ab7df2..60bc68aaee 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.47.3"
+version = "0.47.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "multiversx-sc",
 ]
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 f825b4adfd..2e3ed780bc 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.47.3"
+version = "0.47.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -92,7 +92,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -103,7 +103,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "multiversx-sc",
 ]
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 80e5fec4e2..eb96bc7f0d 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.47.3"
+version = "0.47.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/formatted-message-features/wasm/Cargo.lock b/contracts/feature-tests/formatted-message-features/wasm/Cargo.lock
index 9a7a877b75..8c987ab31f 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.47.3"
+version = "0.47.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/managed-map-features/wasm/Cargo.lock b/contracts/feature-tests/managed-map-features/wasm/Cargo.lock
index 4845f4055e..7e5399de32 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.47.3"
+version = "0.47.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "multiversx-sc",
 ]
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 fa3d1d0421..aceb038fd8 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.47.3"
+version = "0.47.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "multiversx-sc",
 ]
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 4238e8e323..9286c580a2 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.47.3"
+version = "0.47.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "multiversx-sc",
 ]
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 725f614e99..65cc74b09e 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.47.3"
+version = "0.47.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/multi-contract-features/wasm/Cargo.lock b/contracts/feature-tests/multi-contract-features/wasm/Cargo.lock
index e68c6fe000..ce7ca2f252 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.47.3"
+version = "0.47.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/panic-message-features/wasm/Cargo.lock b/contracts/feature-tests/panic-message-features/wasm/Cargo.lock
index 59ad014eb2..558b9240b2 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.47.3"
+version = "0.47.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/payable-features/wasm/Cargo.lock b/contracts/feature-tests/payable-features/wasm/Cargo.lock
index 0fa8f25b40..704af6b632 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.47.3"
+version = "0.47.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "multiversx-sc",
 ]
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 bc5ce7e7a0..c22b5416f6 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.47.3"
+version = "0.47.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "multiversx-sc",
 ]
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 89c91a1d95..0fcafe1b8f 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.47.3"
+version = "0.47.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "multiversx-sc",
 ]
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 225b9ef110..24321aeeb7 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.47.3"
+version = "0.47.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,14 +80,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/use-module/wasm/Cargo.lock b/contracts/feature-tests/use-module/wasm/Cargo.lock
index 2a61bb775b..1cd3a408af 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.47.3"
+version = "0.47.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,14 +80,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.3"
+version = "0.47.4"
 dependencies = [
  "multiversx-sc",
 ]

From 5ab42404aa5049873499eafd20a09f6faf5e2346 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Thu, 8 Feb 2024 20:39:38 +0100
Subject: [PATCH 0340/1254] changed command for --scen into mx-scenario-go run
 ./

---
 framework/meta/src/cmd/standalone/test.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/framework/meta/src/cmd/standalone/test.rs b/framework/meta/src/cmd/standalone/test.rs
index 33d3a38d24..66964b3d60 100644
--- a/framework/meta/src/cmd/standalone/test.rs
+++ b/framework/meta/src/cmd/standalone/test.rs
@@ -14,8 +14,8 @@ pub fn test(test_args: &TestArgs) {
     let no_capture = test_args.nocapture;
 
     if scen {
-        program = "run-scenarios";
-        args.push("./");
+        program = "mx-scenario-go";
+        args.extend(["run", "./"]);
 
         if go {
             println!("{}", "If scen parameter is true, it will override the go parameter. Executing scenarios...".yellow());

From ec1bddc5eb1f53e2bfd1d6cd4a25719103ac751a Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Mon, 12 Feb 2024 11:49:44 +0200
Subject: [PATCH 0341/1254] initial challange

---
 framework/meta/src/cmd/contract.rs            |   1 +
 .../src/cmd/contract/generate_proxy_struct.rs |   4 +
 .../proxy_struct_crate_gen.rs                 |  12 ++
 .../proxy_struct_gen_main.rs                  |  26 +++
 .../proxy_struct_sc_functions_gen.rs          | 163 ++++++++++++++++++
 .../proxy_struct_template_gen.rs              |  51 ++++++
 .../snippet_sc_functions_gen.rs               |   2 +-
 .../generate_snippets/snippet_type_map.rs     |   2 +-
 8 files changed, 259 insertions(+), 2 deletions(-)
 create mode 100644 framework/meta/src/cmd/contract/generate_proxy_struct.rs
 create mode 100644 framework/meta/src/cmd/contract/generate_proxy_struct/proxy_struct_crate_gen.rs
 create mode 100644 framework/meta/src/cmd/contract/generate_proxy_struct/proxy_struct_gen_main.rs
 create mode 100644 framework/meta/src/cmd/contract/generate_proxy_struct/proxy_struct_sc_functions_gen.rs
 create mode 100644 framework/meta/src/cmd/contract/generate_proxy_struct/proxy_struct_template_gen.rs

diff --git a/framework/meta/src/cmd/contract.rs b/framework/meta/src/cmd/contract.rs
index 215c394d63..6b3e8bddd0 100644
--- a/framework/meta/src/cmd/contract.rs
+++ b/framework/meta/src/cmd/contract.rs
@@ -4,6 +4,7 @@ mod meta_config;
 pub mod sc_config;
 pub mod wasm_cargo_toml_data;
 pub mod wasm_cargo_toml_generate;
+mod generate_proxy_struct;
 
 use std::path::Path;
 
diff --git a/framework/meta/src/cmd/contract/generate_proxy_struct.rs b/framework/meta/src/cmd/contract/generate_proxy_struct.rs
new file mode 100644
index 0000000000..3b7cdcd100
--- /dev/null
+++ b/framework/meta/src/cmd/contract/generate_proxy_struct.rs
@@ -0,0 +1,4 @@
+pub mod proxy_struct_crate_gen;
+pub mod proxy_struct_gen_main;
+pub mod proxy_struct_sc_functions_gen;
+pub mod proxy_struct_template_gen;
diff --git a/framework/meta/src/cmd/contract/generate_proxy_struct/proxy_struct_crate_gen.rs b/framework/meta/src/cmd/contract/generate_proxy_struct/proxy_struct_crate_gen.rs
new file mode 100644
index 0000000000..3d6ef0122d
--- /dev/null
+++ b/framework/meta/src/cmd/contract/generate_proxy_struct/proxy_struct_crate_gen.rs
@@ -0,0 +1,12 @@
+use std::fs::File;
+
+#[must_use]
+pub(crate) fn create_and_get_lib_file(proxies_file_name: &str) -> File {
+    let lib_path = format!("../{proxies_file_name}");
+    match File::options().create_new(true).write(true).open(&lib_path) {
+        Ok(f) => f,
+        Err(_) => panic!(
+            "{lib_path} file already exists, --overwrite option for proxies was not provided"
+        ),
+    }
+}
diff --git a/framework/meta/src/cmd/contract/generate_proxy_struct/proxy_struct_gen_main.rs b/framework/meta/src/cmd/contract/generate_proxy_struct/proxy_struct_gen_main.rs
new file mode 100644
index 0000000000..fb1342443a
--- /dev/null
+++ b/framework/meta/src/cmd/contract/generate_proxy_struct/proxy_struct_gen_main.rs
@@ -0,0 +1,26 @@
+use std::fs::File;
+
+use multiversx_sc::abi::ContractAbi;
+
+use crate::cmd::contract::generate_proxy_trait::proxy_trait_crate_gen::create_and_get_lib_file;
+
+use super::{
+    super::meta_config::MetaConfig,
+    proxy_struct_sc_functions_gen::write_content,
+    proxy_struct_template_gen::{write_imports, write_struct_template},
+};
+
+static PROXIES_SOURCE_FILE_NAME: &str = "proxies_struct_interactor_main.rs";
+
+impl MetaConfig {
+    pub fn generate_rust_proxies_struct(&self) {
+        let file = create_and_get_lib_file(PROXIES_SOURCE_FILE_NAME);
+        write_proxies_struct_to_file(file, &self.original_contract_abi);
+    }
+}
+
+fn write_proxies_struct_to_file(mut file: File, abi: &ContractAbi) {
+    write_imports(&mut file);
+    write_struct_template(&mut file);
+    write_content(&mut file, abi);
+}
diff --git a/framework/meta/src/cmd/contract/generate_proxy_struct/proxy_struct_sc_functions_gen.rs b/framework/meta/src/cmd/contract/generate_proxy_struct/proxy_struct_sc_functions_gen.rs
new file mode 100644
index 0000000000..075dc1b786
--- /dev/null
+++ b/framework/meta/src/cmd/contract/generate_proxy_struct/proxy_struct_sc_functions_gen.rs
@@ -0,0 +1,163 @@
+use std::{fs::File, io::Write};
+
+use multiversx_sc::abi::{ContractAbi, EndpointAbi, InputAbi, OutputAbis};
+
+use crate::cmd::contract::generate_snippets::{
+    snippet_gen_common::write_newline,
+    snippet_sc_functions_gen::map_output_types_to_rust_types,
+    snippet_type_map::{handle_abi_type, RustTypeString},
+};
+
+pub(crate) fn write_content(file: &mut File, abi: &ContractAbi) {
+    for constructor_abi in &abi.constructors {
+        write_endpoint(file, constructor_abi, "ContractDeploy");
+        write_constructor_content_macro(file);
+        write_constructor_contract_deploy(file, &constructor_abi.inputs);
+        writeln!(file, "\t\t___contract_deploy___").unwrap();
+        writeln!(file, "\t}}").unwrap();
+        write_newline(file);
+    }
+
+    for endpoint_abi in &abi.endpoints {
+        write_endpoint(file, endpoint_abi, "ContractCallNoPayment");
+        write_endpoint_content_macro(file, endpoint_abi.name);
+        write_contract_call(file, &endpoint_abi.inputs);
+        writeln!(file, "\t\t___contract_call___").unwrap();
+        writeln!(file, "\t}}").unwrap();
+        write_newline(file);
+    }
+
+    writeln!(file, "}}").unwrap();
+}
+
+fn write_constructor_contract_deploy(file: &mut File, inputs: &[InputAbi]) {
+    if inputs.is_empty() {
+        return;
+    }
+
+    for input in inputs.iter() {
+        write_constructor_contract_call(file, &input.arg_name);
+    }
+}
+
+fn write_contract_call(file: &mut File, inputs: &[InputAbi]) {
+    if inputs.is_empty() {
+        return;
+    }
+
+    for input in inputs.iter() {
+        write_contract_call_input(file, &input.arg_name);
+    }
+}
+
+fn write_contract_call_input(file: &mut File, arg_name: &&str) {
+    writeln!(
+        file,
+        "\t\tContractCall::proxy_arg(&mut ___contract_call___, &{arg_name});"
+    )
+    .unwrap();
+}
+
+fn write_constructor_contract_call(file: &mut File, arg_name: &&str) {
+    writeln!(
+        file,
+        "\t\t___contract_deploy___.push_endpoint_arg(&{arg_name});"
+    )
+    .unwrap();
+}
+
+fn write_endpoint_content_macro(file: &mut File, name: &str) {
+    writeln!(
+        file,
+        "\t\tlet ___address___ = multiversx_sc::extract_address!(self);"
+    )
+    .unwrap();
+    writeln!(
+        file,
+        "\t\tlet mut ___contract_call___ = multiversx_sc::endpoints_proxy!({name}, ___address___);"
+    )
+    .unwrap();
+}
+
+fn write_constructor_content_macro(file: &mut File) {
+    writeln!(
+        file,
+        "\t\tlet ___opt_address___ = multiversx_sc::extract_opt_address!(self);"
+    )
+    .unwrap();
+    writeln!(file, "\t\tlet mut ___contract_deploy___ = multiversx_sc::constructors_proxy!(___opt_address___);").unwrap();
+}
+
+fn write_endpoint(file: &mut File, endpoint_abi: &EndpointAbi, interaction_deploy: &str) {
+    write_info_endpoint(file, endpoint_abi.docs);
+    write_endpoint_fn(file, endpoint_abi.rust_method_name);
+    write_generic_args(file, &endpoint_abi.inputs);
+    write_parameters(file, &endpoint_abi.inputs, interaction_deploy);
+    write_output(file, &endpoint_abi.outputs);
+}
+
+fn write_output(file: &mut File, outputs: &OutputAbis) {
+    let output_type = map_output_types_to_rust_types(outputs);
+
+    let output_type_print = output_type.replace("<StaticApi>", "<A>");
+    write!(file, "{output_type_print}",).unwrap();
+    writeln!(file, "> {{").unwrap();
+}
+
+fn write_parameters(file: &mut File, inputs: &[InputAbi], interaction_deploy: &str) {
+    writeln!(file, "(").unwrap();
+    writeln!(file, "\t\t&mut self,").unwrap();
+
+    for (index, input) in inputs.iter().enumerate() {
+        write_parameter_arg(file, index, &input.arg_name);
+    }
+
+    write!(file, "\t) -> {interaction_deploy}<A, ").unwrap();
+}
+
+fn write_parameter_arg(file: &mut File, index: usize, arg_name: &str) {
+    writeln!(file, "\t\t{arg_name}: Arg{index},").unwrap()
+}
+
+fn write_endpoint_fn(file: &mut File, rust_method_name: &str) {
+    write!(file, "\tfn {rust_method_name}").unwrap();
+}
+
+fn write_info_endpoint(file: &mut File, abi_docs: &[&str]) {
+    if !abi_docs.is_empty() {
+        write!(file, "\t//").unwrap();
+    }
+
+    for &abi_doc in abi_docs {
+        writeln!(file, "{abi_doc} ").unwrap();
+    }
+}
+
+fn write_generic_args(file: &mut File, inputs: &[InputAbi]) {
+    if inputs.is_empty() {
+        return;
+    }
+
+    writeln!(file, "<").unwrap();
+
+    for (index, input) in inputs.iter().enumerate() {
+        write_argument(file, index, input.type_name.to_string());
+    }
+
+    write!(file, "\t>").unwrap();
+}
+
+fn write_argument(file: &mut File, index: usize, type_name: String) {
+    let mut type_string = RustTypeString::default();
+    handle_abi_type(&mut type_string, type_name);
+    let type_string_str = type_string.get_type_name().to_string();
+
+    let type_print = type_string_str.replace("<StaticApi>", "<A>");
+
+    writeln!(
+        file,
+        "\t\tArg{index}: multiversx_sc::codec::CodecInto<{}>,",
+        type_print
+    )
+    .unwrap();
+}
diff --git a/framework/meta/src/cmd/contract/generate_proxy_struct/proxy_struct_template_gen.rs b/framework/meta/src/cmd/contract/generate_proxy_struct/proxy_struct_template_gen.rs
new file mode 100644
index 0000000000..e88dd87943
--- /dev/null
+++ b/framework/meta/src/cmd/contract/generate_proxy_struct/proxy_struct_template_gen.rs
@@ -0,0 +1,51 @@
+use std::{fs::File, io::Write};
+
+use crate::cmd::contract::generate_snippets::snippet_gen_common::write_newline;
+
+pub(crate) fn write_imports(file: &mut File) {
+    writeln!(
+        file,
+        r#"#![allow(clippy::too_many_arguments)]
+#![allow(clippy::type_complexity)]
+multiversx_sc::imports!();"#
+    )
+    .unwrap();
+
+    write_newline(file);
+}
+
+// pub(crate) fn write_struct_template(file: &mut File) {
+//     write!(
+//         file,
+//         "pub struct Proxy<A>
+// where
+//     A: multiversx_sc::api::VMApi + 'static,
+// {{
+//     phantom = Phantom
+// }}
+
+// impl<A> Proxy<A>
+// where
+//     A: multiversx_sc::api::VMApi + 'static,
+// {{"
+//     )
+//     .unwrap();
+// }
+
+pub(crate) fn write_struct_template(file: &mut File) {
+    write!(
+        file,
+        "pub struct Proxy<A>
+where
+    A: multiversx_sc::api::VMApi + 'static,
+{{
+    pub address: ManagedOption<A, ManagedAddress<A>>,
+}}
+
+impl<A> Proxy<A>
+where
+    A: multiversx_sc::api::VMApi + 'static,
+{{"
+    )
+    .unwrap();
+}
diff --git a/framework/meta/src/cmd/contract/generate_snippets/snippet_sc_functions_gen.rs b/framework/meta/src/cmd/contract/generate_snippets/snippet_sc_functions_gen.rs
index 94b0cc8a43..6bc0fe01de 100644
--- a/framework/meta/src/cmd/contract/generate_snippets/snippet_sc_functions_gen.rs
+++ b/framework/meta/src/cmd/contract/generate_snippets/snippet_sc_functions_gen.rs
@@ -205,7 +205,7 @@ fn write_contract_query(file: &mut File, endpoint_abi: &EndpointAbi) {
     .unwrap();
 }
 
-fn map_output_types_to_rust_types(outputs: &[OutputAbi]) -> String {
+pub fn map_output_types_to_rust_types(outputs: &[OutputAbi]) -> String {
     let results_len = outputs.len();
     if results_len == 0 {
         return "()".to_string();
diff --git a/framework/meta/src/cmd/contract/generate_snippets/snippet_type_map.rs b/framework/meta/src/cmd/contract/generate_snippets/snippet_type_map.rs
index 803f8c6b29..5e6e28423b 100644
--- a/framework/meta/src/cmd/contract/generate_snippets/snippet_type_map.rs
+++ b/framework/meta/src/cmd/contract/generate_snippets/snippet_type_map.rs
@@ -183,7 +183,7 @@ fn get_abi_type(abi_type_str: &str) -> AbiType {
     }
 }
 
-fn handle_abi_type(type_string: &mut RustTypeString, abi_type_str: String) {
+pub fn handle_abi_type(type_string: &mut RustTypeString, abi_type_str: String) {
     let abi_type = get_abi_type(&abi_type_str);
     match abi_type {
         AbiType::UserDefined(user_type) => {

From 70076f8e6a372ef80646dc09ea0811c582b03058 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Mon, 12 Feb 2024 14:40:38 +0200
Subject: [PATCH 0342/1254] changed call

---
 .../adder/proxies_struct_interactor_main.rs   | 60 +++++++++++++++
 framework/base/src/macros.rs                  | 32 ++++++++
 .../meta/src/cli_args/cli_args_contract.rs    |  9 +++
 framework/meta/src/cmd/contract.rs            |  3 +-
 .../meta/src/cmd/contract/generate_proxy.rs   |  4 +
 .../proxy_crate_gen.rs}                       |  0
 .../proxy_gen_main.rs}                        | 11 ++-
 .../proxy_sc_functions_gen.rs}                | 75 +++++++++++--------
 .../proxy_template_gen.rs}                    |  0
 .../src/cmd/contract/generate_proxy_struct.rs |  4 -
 10 files changed, 155 insertions(+), 43 deletions(-)
 create mode 100644 contracts/examples/adder/proxies_struct_interactor_main.rs
 create mode 100644 framework/meta/src/cmd/contract/generate_proxy.rs
 rename framework/meta/src/cmd/contract/{generate_proxy_struct/proxy_struct_crate_gen.rs => generate_proxy/proxy_crate_gen.rs} (100%)
 rename framework/meta/src/cmd/contract/{generate_proxy_struct/proxy_struct_gen_main.rs => generate_proxy/proxy_gen_main.rs} (55%)
 rename framework/meta/src/cmd/contract/{generate_proxy_struct/proxy_struct_sc_functions_gen.rs => generate_proxy/proxy_sc_functions_gen.rs} (58%)
 rename framework/meta/src/cmd/contract/{generate_proxy_struct/proxy_struct_template_gen.rs => generate_proxy/proxy_template_gen.rs} (100%)
 delete mode 100644 framework/meta/src/cmd/contract/generate_proxy_struct.rs

diff --git a/contracts/examples/adder/proxies_struct_interactor_main.rs b/contracts/examples/adder/proxies_struct_interactor_main.rs
new file mode 100644
index 0000000000..944242261b
--- /dev/null
+++ b/contracts/examples/adder/proxies_struct_interactor_main.rs
@@ -0,0 +1,60 @@
+#![allow(clippy::too_many_arguments)]
+#![allow(clippy::type_complexity)]
+multiversx_sc::imports!();
+
+pub struct Proxy<A>
+where
+    A: multiversx_sc::api::VMApi + 'static,
+{
+    pub address: ManagedOption<A, ManagedAddress<A>>,
+}
+
+impl<A> Proxy<A>
+where
+    A: multiversx_sc::api::VMApi + 'static,
+{	fn init<
+		Arg0: multiversx_sc::codec::CodecInto<BigUint<A>>,
+	>(
+		&mut self,
+		initial_value: Arg0,
+	) -> ContractDeploy<A, ()> {
+		let ___opt_address___ = multiversx_sc::extract_opt_address!(self);
+		let mut ___contract_deploy___ = multiversx_sc::constructors_proxy!(___opt_address___);
+		___contract_deploy___.push_endpoint_arg(&initial_value);
+		___contract_deploy___
+	}
+
+	fn sum(
+		&mut self,
+	) -> ContractCallNoPayment<A, BigUint<A>> {
+		let ___address___ = multiversx_sc::extract_address!(self);
+		let mut ___contract_call___ = multiversx_sc::endpoints_proxy!(getSum, ___address___);
+		___contract_call___
+	}
+
+	fn upgrade<
+		Arg0: multiversx_sc::codec::CodecInto<BigUint<A>>,
+	>(
+		&mut self,
+		initial_value: Arg0,
+	) -> ContractCallNoPayment<A, ()> {
+		let ___address___ = multiversx_sc::extract_address!(self);
+		let mut ___contract_call___ = multiversx_sc::endpoints_proxy!(upgrade, ___address___);
+		ContractCall::proxy_arg(&mut ___contract_call___, &initial_value);
+		___contract_call___
+	}
+
+	//Add desired amount to the storage variable. 
+	fn add<
+		Arg0: multiversx_sc::codec::CodecInto<BigUint<A>>,
+	>(
+		&mut self,
+		value: Arg0,
+	) -> ContractCallNoPayment<A, ()> {
+		let ___address___ = multiversx_sc::extract_address!(self);
+		let mut ___contract_call___ = multiversx_sc::endpoints_proxy!(add, ___address___);
+		ContractCall::proxy_arg(&mut ___contract_call___, &value);
+		___contract_call___
+	}
+
+}
diff --git a/framework/base/src/macros.rs b/framework/base/src/macros.rs
index 159b639195..daaaac7a48 100644
--- a/framework/base/src/macros.rs
+++ b/framework/base/src/macros.rs
@@ -209,3 +209,35 @@ macro_rules! non_zero_usize {
         NonZeroUsize::new($input).unwrap_or_else(|| sc_panic!($error_msg))
     };
 }
+
+#[macro_export]
+macro_rules! endpoints_proxy {
+    ($endpoint_name:ident, $address:ident) => {
+        multiversx_sc::types::ContractCallNoPayment::new($address, stringify!($endpoint_name));
+    };
+}
+
+#[macro_export]
+macro_rules! constructors_proxy {
+    ($opt_address:ident) => {
+        multiversx_sc::types::new_contract_deploy($opt_address);
+    };
+}
+
+#[macro_export]
+macro_rules! extract_opt_address {
+    ($address:expr) => {{
+        core::mem::replace(
+            &mut $address.address,
+            multiversx_sc::types::ManagedOption::none(),
+        )
+    }};
+}
+
+#[macro_export]
+macro_rules! extract_address {
+    ($address:expr) => {{
+        multiversx_sc::extract_opt_address!($address)
+            .unwrap_or_sc_panic(multiversx_sc::err_msg::RECIPIENT_ADDRESS_NOT_SET)
+    }};
+}
diff --git a/framework/meta/src/cli_args/cli_args_contract.rs b/framework/meta/src/cli_args/cli_args_contract.rs
index 1853d64675..e05146a9bc 100644
--- a/framework/meta/src/cli_args/cli_args_contract.rs
+++ b/framework/meta/src/cli_args/cli_args_contract.rs
@@ -66,6 +66,12 @@ pub enum ContractCliAction {
         about = "Generates a snippets project, based on the contract ABI."
     )]
     GenerateSnippets(GenerateSnippetsArgs),
+
+    #[command(
+        name = "proxy",
+        about = "Generates a proxy, based on the contract ABI."
+    )]
+    GenerateProxies,
 }
 
 impl CliArgsToRaw for ContractCliAction {
@@ -97,6 +103,9 @@ impl CliArgsToRaw for ContractCliAction {
                 raw.push("snippets".to_string());
                 raw.append(&mut args.to_raw());
             },
+            ContractCliAction::GenerateProxies => {
+                raw.push("proxy".to_string());
+            },
         }
         raw
     }
diff --git a/framework/meta/src/cmd/contract.rs b/framework/meta/src/cmd/contract.rs
index 6b3e8bddd0..37fa3ee65b 100644
--- a/framework/meta/src/cmd/contract.rs
+++ b/framework/meta/src/cmd/contract.rs
@@ -1,10 +1,10 @@
+mod generate_proxy;
 mod generate_snippets;
 mod meta_abi;
 mod meta_config;
 pub mod sc_config;
 pub mod wasm_cargo_toml_data;
 pub mod wasm_cargo_toml_generate;
-mod generate_proxy_struct;
 
 use std::path::Path;
 
@@ -32,6 +32,7 @@ pub fn cli_main<AbiObj: ContractAbiProvider>() {
         ContractCliAction::GenerateSnippets(gs_args) => {
             meta_config_opt.generate_rust_snippets(&gs_args)
         },
+        ContractCliAction::GenerateProxies => meta_config_opt.generate_rust_proxies_struct(),
     }
 }
 
diff --git a/framework/meta/src/cmd/contract/generate_proxy.rs b/framework/meta/src/cmd/contract/generate_proxy.rs
new file mode 100644
index 0000000000..0dc83059b3
--- /dev/null
+++ b/framework/meta/src/cmd/contract/generate_proxy.rs
@@ -0,0 +1,4 @@
+pub mod proxy_crate_gen;
+pub mod proxy_gen_main;
+pub mod proxy_sc_functions_gen;
+pub mod proxy_template_gen;
diff --git a/framework/meta/src/cmd/contract/generate_proxy_struct/proxy_struct_crate_gen.rs b/framework/meta/src/cmd/contract/generate_proxy/proxy_crate_gen.rs
similarity index 100%
rename from framework/meta/src/cmd/contract/generate_proxy_struct/proxy_struct_crate_gen.rs
rename to framework/meta/src/cmd/contract/generate_proxy/proxy_crate_gen.rs
diff --git a/framework/meta/src/cmd/contract/generate_proxy_struct/proxy_struct_gen_main.rs b/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_main.rs
similarity index 55%
rename from framework/meta/src/cmd/contract/generate_proxy_struct/proxy_struct_gen_main.rs
rename to framework/meta/src/cmd/contract/generate_proxy/proxy_gen_main.rs
index fb1342443a..fb9549d998 100644
--- a/framework/meta/src/cmd/contract/generate_proxy_struct/proxy_struct_gen_main.rs
+++ b/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_main.rs
@@ -2,12 +2,11 @@ use std::fs::File;
 
 use multiversx_sc::abi::ContractAbi;
 
-use crate::cmd::contract::generate_proxy_trait::proxy_trait_crate_gen::create_and_get_lib_file;
-
 use super::{
     super::meta_config::MetaConfig,
-    proxy_struct_sc_functions_gen::write_content,
-    proxy_struct_template_gen::{write_imports, write_struct_template},
+    proxy_crate_gen::create_and_get_lib_file,
+    proxy_sc_functions_gen::write_content,
+    proxy_template_gen::{write_imports, write_struct_template},
 };
 
 static PROXIES_SOURCE_FILE_NAME: &str = "proxies_struct_interactor_main.rs";
@@ -15,11 +14,11 @@ static PROXIES_SOURCE_FILE_NAME: &str = "proxies_struct_interactor_main.rs";
 impl MetaConfig {
     pub fn generate_rust_proxies_struct(&self) {
         let file = create_and_get_lib_file(PROXIES_SOURCE_FILE_NAME);
-        write_proxies_struct_to_file(file, &self.original_contract_abi);
+        write_proxies_struct_to_file(file, self.original_contract_abi.clone());
     }
 }
 
-fn write_proxies_struct_to_file(mut file: File, abi: &ContractAbi) {
+fn write_proxies_struct_to_file(mut file: File, abi: ContractAbi) {
     write_imports(&mut file);
     write_struct_template(&mut file);
     write_content(&mut file, abi);
diff --git a/framework/meta/src/cmd/contract/generate_proxy_struct/proxy_struct_sc_functions_gen.rs b/framework/meta/src/cmd/contract/generate_proxy/proxy_sc_functions_gen.rs
similarity index 58%
rename from framework/meta/src/cmd/contract/generate_proxy_struct/proxy_struct_sc_functions_gen.rs
rename to framework/meta/src/cmd/contract/generate_proxy/proxy_sc_functions_gen.rs
index 075dc1b786..321a6868a4 100644
--- a/framework/meta/src/cmd/contract/generate_proxy_struct/proxy_struct_sc_functions_gen.rs
+++ b/framework/meta/src/cmd/contract/generate_proxy/proxy_sc_functions_gen.rs
@@ -8,49 +8,48 @@ use crate::cmd::contract::generate_snippets::{
     snippet_type_map::{handle_abi_type, RustTypeString},
 };
 
-pub(crate) fn write_content(file: &mut File, abi: &ContractAbi) {
-    for constructor_abi in &abi.constructors {
-        write_endpoint(file, constructor_abi, "ContractDeploy");
+const CONTRACT_DEPLOY: &str = "ContractDeploy";
+const CONTRACT_CALL_NO_PAYMENT: &str = "ContractCallNoPayment";
+
+pub(crate) fn write_content(file: &mut File, abi: ContractAbi) {
+    for constructor_abi in abi.constructors {
+        write_endpoint(file, constructor_abi.clone(), CONTRACT_DEPLOY);
         write_constructor_content_macro(file);
-        write_constructor_contract_deploy(file, &constructor_abi.inputs);
-        writeln!(file, "\t\t___contract_deploy___").unwrap();
-        writeln!(file, "\t}}").unwrap();
-        write_newline(file);
+        write_constructor_contract_deploy(file, constructor_abi.inputs);
+        write_end_of_constructor(file);
     }
 
-    for endpoint_abi in &abi.endpoints {
-        write_endpoint(file, endpoint_abi, "ContractCallNoPayment");
+    for endpoint_abi in abi.endpoints {
+        write_endpoint(file, endpoint_abi.clone(), CONTRACT_CALL_NO_PAYMENT);
         write_endpoint_content_macro(file, endpoint_abi.name);
-        write_contract_call(file, &endpoint_abi.inputs);
-        writeln!(file, "\t\t___contract_call___").unwrap();
-        writeln!(file, "\t}}").unwrap();
-        write_newline(file);
+        write_contract_call(file, endpoint_abi.inputs);
+        write_end_of_endpoint(file);
     }
 
     writeln!(file, "}}").unwrap();
 }
 
-fn write_constructor_contract_deploy(file: &mut File, inputs: &[InputAbi]) {
+fn write_constructor_contract_deploy(file: &mut File, inputs: Vec<InputAbi>) {
     if inputs.is_empty() {
         return;
     }
 
     for input in inputs.iter() {
-        write_constructor_contract_call(file, &input.arg_name);
+        write_constructor_contract_call(file, input.arg_name.clone());
     }
 }
 
-fn write_contract_call(file: &mut File, inputs: &[InputAbi]) {
+fn write_contract_call(file: &mut File, inputs: Vec<InputAbi>) {
     if inputs.is_empty() {
         return;
     }
 
     for input in inputs.iter() {
-        write_contract_call_input(file, &input.arg_name);
+        write_contract_call_input(file, input.arg_name.clone());
     }
 }
 
-fn write_contract_call_input(file: &mut File, arg_name: &&str) {
+fn write_contract_call_input(file: &mut File, arg_name: String) {
     writeln!(
         file,
         "\t\tContractCall::proxy_arg(&mut ___contract_call___, &{arg_name});"
@@ -58,7 +57,7 @@ fn write_contract_call_input(file: &mut File, arg_name: &&str) {
     .unwrap();
 }
 
-fn write_constructor_contract_call(file: &mut File, arg_name: &&str) {
+fn write_constructor_contract_call(file: &mut File, arg_name: String) {
     writeln!(
         file,
         "\t\t___contract_deploy___.push_endpoint_arg(&{arg_name});"
@@ -66,7 +65,7 @@ fn write_constructor_contract_call(file: &mut File, arg_name: &&str) {
     .unwrap();
 }
 
-fn write_endpoint_content_macro(file: &mut File, name: &str) {
+fn write_endpoint_content_macro(file: &mut File, name: String) {
     writeln!(
         file,
         "\t\tlet ___address___ = multiversx_sc::extract_address!(self);"
@@ -88,23 +87,23 @@ fn write_constructor_content_macro(file: &mut File) {
     writeln!(file, "\t\tlet mut ___contract_deploy___ = multiversx_sc::constructors_proxy!(___opt_address___);").unwrap();
 }
 
-fn write_endpoint(file: &mut File, endpoint_abi: &EndpointAbi, interaction_deploy: &str) {
+fn write_endpoint(file: &mut File, endpoint_abi: EndpointAbi, interaction_deploy: &str) {
     write_info_endpoint(file, endpoint_abi.docs);
     write_endpoint_fn(file, endpoint_abi.rust_method_name);
-    write_generic_args(file, &endpoint_abi.inputs);
-    write_parameters(file, &endpoint_abi.inputs, interaction_deploy);
-    write_output(file, &endpoint_abi.outputs);
+    write_generic_args(file, endpoint_abi.inputs.clone());
+    write_parameters(file, endpoint_abi.inputs, interaction_deploy);
+    write_output(file, endpoint_abi.outputs);
 }
 
-fn write_output(file: &mut File, outputs: &OutputAbis) {
-    let output_type = map_output_types_to_rust_types(outputs);
+fn write_output(file: &mut File, outputs: OutputAbis) {
+    let output_type = map_output_types_to_rust_types(&outputs);
 
     let output_type_print = output_type.replace("<StaticApi>", "<A>");
     write!(file, "{output_type_print}",).unwrap();
     writeln!(file, "> {{").unwrap();
 }
 
-fn write_parameters(file: &mut File, inputs: &[InputAbi], interaction_deploy: &str) {
+fn write_parameters(file: &mut File, inputs: Vec<InputAbi>, interaction_deploy: &str) {
     writeln!(file, "(").unwrap();
     writeln!(file, "\t\t&mut self,").unwrap();
 
@@ -119,21 +118,21 @@ fn write_parameter_arg(file: &mut File, index: usize, arg_name: &str) {
     writeln!(file, "\t\t{arg_name}: Arg{index},").unwrap()
 }
 
-fn write_endpoint_fn(file: &mut File, rust_method_name: &str) {
+fn write_endpoint_fn(file: &mut File, rust_method_name: String) {
     write!(file, "\tfn {rust_method_name}").unwrap();
 }
 
-fn write_info_endpoint(file: &mut File, abi_docs: &[&str]) {
-    if !abi_docs.is_empty() {
+fn write_info_endpoint(file: &mut File, docs: Vec<String>) {
+    if !docs.is_empty() {
         write!(file, "\t//").unwrap();
     }
 
-    for &abi_doc in abi_docs {
+    for abi_doc in docs {
         writeln!(file, "{abi_doc} ").unwrap();
     }
 }
 
-fn write_generic_args(file: &mut File, inputs: &[InputAbi]) {
+fn write_generic_args(file: &mut File, inputs: Vec<InputAbi>) {
     if inputs.is_empty() {
         return;
     }
@@ -161,3 +160,15 @@ fn write_argument(file: &mut File, index: usize, type_name: String) {
     )
     .unwrap();
 }
+
+fn write_end_of_constructor(file: &mut File) {
+    writeln!(file, "\t\t___contract_deploy___").unwrap();
+    writeln!(file, "\t}}").unwrap();
+    write_newline(file);
+}
+
+fn write_end_of_endpoint(file: &mut File) {
+    writeln!(file, "\t\t___contract_call___").unwrap();
+    writeln!(file, "\t}}").unwrap();
+    write_newline(file);
+}
diff --git a/framework/meta/src/cmd/contract/generate_proxy_struct/proxy_struct_template_gen.rs b/framework/meta/src/cmd/contract/generate_proxy/proxy_template_gen.rs
similarity index 100%
rename from framework/meta/src/cmd/contract/generate_proxy_struct/proxy_struct_template_gen.rs
rename to framework/meta/src/cmd/contract/generate_proxy/proxy_template_gen.rs
diff --git a/framework/meta/src/cmd/contract/generate_proxy_struct.rs b/framework/meta/src/cmd/contract/generate_proxy_struct.rs
deleted file mode 100644
index 3b7cdcd100..0000000000
--- a/framework/meta/src/cmd/contract/generate_proxy_struct.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-pub mod proxy_struct_crate_gen;
-pub mod proxy_struct_gen_main;
-pub mod proxy_struct_sc_functions_gen;
-pub mod proxy_struct_template_gen;

From b0ec3e5738e5c6f81fd7dc7b620cf3dab37f6083 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Mon, 12 Feb 2024 21:48:50 +0200
Subject: [PATCH 0343/1254] ProxyTo object, type level addres optionality

---
 .../examples/proxy-pause/src/proxy_pause.rs   |  2 +-
 framework/base/src/contract_base.rs           |  2 +-
 .../base/src/contract_base/proxy_obj_base.rs  | 20 +++---
 framework/base/src/macros.rs                  |  2 +-
 .../derive/src/generate/auto_impl_proxy.rs    | 39 ++++++++---
 framework/derive/src/generate/method_gen.rs   | 21 ++++--
 framework/derive/src/generate/snippets.rs     | 70 +++++++++++++++----
 .../derive/src/generate/supertrait_gen.rs     |  1 +
 .../scenario/src/facade/contract_info.rs      | 48 ++++++-------
 .../scenario/tests/contract_without_macros.rs | 54 ++++++++++++--
 10 files changed, 190 insertions(+), 69 deletions(-)

diff --git a/contracts/examples/proxy-pause/src/proxy_pause.rs b/contracts/examples/proxy-pause/src/proxy_pause.rs
index 2a83923866..9fafc23f25 100644
--- a/contracts/examples/proxy-pause/src/proxy_pause.rs
+++ b/contracts/examples/proxy-pause/src/proxy_pause.rs
@@ -48,7 +48,7 @@ pub trait PauseProxy {
 
     fn for_each_contract<F>(&self, f: F)
     where
-        F: Fn(pause_proxy::Proxy<Self::Api>),
+        F: Fn(pause_proxy::ProxyTo<Self::Api>),
     {
         for contract_address in self.contracts().iter() {
             f(self.pausable_contract().contract(contract_address));
diff --git a/framework/base/src/contract_base.rs b/framework/base/src/contract_base.rs
index 07ee908d93..b7ae48ea10 100644
--- a/framework/base/src/contract_base.rs
+++ b/framework/base/src/contract_base.rs
@@ -9,7 +9,7 @@ mod wrappers;
 pub use callable_contract::{CallableContract, CallableContractBuilder};
 pub use contract_abi_provider::ContractAbiProvider;
 pub use contract_base_trait::ContractBase;
-pub use proxy_obj_base::ProxyObjBase;
+pub use proxy_obj_base::{ProxyObjBase, ProxyObjNew};
 pub use proxy_obj_callback_base::CallbackProxyObjBase;
 pub use universal_contract_obj::*;
 pub use wrappers::*;
diff --git a/framework/base/src/contract_base/proxy_obj_base.rs b/framework/base/src/contract_base/proxy_obj_base.rs
index 54eadd26cd..d7849c8432 100644
--- a/framework/base/src/contract_base/proxy_obj_base.rs
+++ b/framework/base/src/contract_base/proxy_obj_base.rs
@@ -6,14 +6,6 @@ use crate::{
 pub trait ProxyObjBase {
     type Api: VMApi;
 
-    #[doc(hidden)]
-    fn new_proxy_obj() -> Self;
-
-    /// Specify the target contract to call.
-    /// Not taken into account for deploys.
-    #[must_use]
-    fn contract(self, address: ManagedAddress<Self::Api>) -> Self;
-
     /// Extracts the address contained in the proxy object and replaces it with None.
     ///
     /// Will just return `ManagedOption::none()` if no address was specified.
@@ -26,3 +18,15 @@ pub trait ProxyObjBase {
     #[doc(hidden)]
     fn extract_address(&mut self) -> ManagedAddress<Self::Api>;
 }
+
+pub trait ProxyObjNew: ProxyObjBase {
+    type ProxyTo: ProxyObjBase;
+
+    #[doc(hidden)]
+    fn new_proxy_obj() -> Self;
+
+    /// Specify the target contract to call.
+    /// Not taken into account for deploys.
+    #[must_use]
+    fn contract(self, address: ManagedAddress<Self::Api>) -> Self::ProxyTo;
+}
diff --git a/framework/base/src/macros.rs b/framework/base/src/macros.rs
index 159b639195..41611e165c 100644
--- a/framework/base/src/macros.rs
+++ b/framework/base/src/macros.rs
@@ -18,7 +18,7 @@ macro_rules! imports {
                 multi_types::*, DecodeError, IntoMultiValue, NestedDecode, NestedEncode, TopDecode,
                 TopEncode,
             },
-            contract_base::{ContractBase, ProxyObjBase},
+            contract_base::{ContractBase, ProxyObjBase, ProxyObjNew},
             err_msg,
             esdt::*,
             io::*,
diff --git a/framework/derive/src/generate/auto_impl_proxy.rs b/framework/derive/src/generate/auto_impl_proxy.rs
index 7590b57b63..33c36724ca 100644
--- a/framework/derive/src/generate/auto_impl_proxy.rs
+++ b/framework/derive/src/generate/auto_impl_proxy.rs
@@ -3,7 +3,8 @@ use crate::{
     model::{AutoImpl, ContractTrait, Method, MethodImpl},
     parse::split_path_last,
 };
-use syn::{punctuated::Punctuated, token::PathSep};
+use proc_macro2::Ident;
+use syn::{punctuated::Punctuated, token::PathSep, Pat};
 
 /// Path to a Rust module containing a contract call proxy.
 pub type ProxyModulePath = Punctuated<syn::PathSegment, PathSep>;
@@ -34,19 +35,37 @@ pub fn proxy_getter_return_type(m: &Method) -> ProxyGetterReturnType {
     }
 }
 
-fn proxy_getter_address_snippet(m: &Method) -> proc_macro2::TokenStream {
+pub fn proxy_getter_return_type_token(m: &Method) -> proc_macro2::TokenStream {
+    let ProxyGetterReturnType {
+        module_path,
+        mut proxy_obj_name,
+    } = proxy_getter_return_type(m);
+    if proxy_getter_address_arg_name(m).is_some() {
+        // replace type name
+        let span = proxy_obj_name.ident.span(); // preserve span
+        proxy_obj_name.ident = Ident::new("ProxyTo", span);
+    }
+    quote! { #module_path #proxy_obj_name}
+}
+
+fn proxy_getter_address_arg_name(m: &Method) -> Option<Pat> {
     match m.method_args.len() {
-        0 => quote! {},
-        1 => {
-            let address_arg_name = &m.method_args[0].pat;
-            quote! {
-                .contract(#address_arg_name)
-            }
-        },
+        0 => None,
+        1 => Some(m.method_args[0].pat.clone()),
         _ => panic!("Proxy getter can have at most 1 argument, which is the target address"),
     }
 }
 
+fn proxy_getter_address_snippet(m: &Method) -> proc_macro2::TokenStream {
+    if let Some(address_arg_name) = proxy_getter_address_arg_name(m) {
+        quote! {
+            .contract(#address_arg_name)
+        }
+    } else {
+        quote! {}
+    }
+}
+
 pub fn generate_proxy_getter_impl(m: &Method) -> proc_macro2::TokenStream {
     let msig = method_gen::generate_sig_with_attributes(m);
     let parsed_return_type = proxy_getter_return_type(m);
@@ -55,7 +74,7 @@ pub fn generate_proxy_getter_impl(m: &Method) -> proc_macro2::TokenStream {
 
     quote! {
         #msig {
-            #module_path Proxy::new_proxy_obj() #address_snippet
+            <#module_path Proxy<Self::Api> as multiversx_sc::contract_base::ProxyObjNew>::new_proxy_obj() #address_snippet
         }
     }
 }
diff --git a/framework/derive/src/generate/method_gen.rs b/framework/derive/src/generate/method_gen.rs
index dc979fe300..88de2bd30a 100644
--- a/framework/derive/src/generate/method_gen.rs
+++ b/framework/derive/src/generate/method_gen.rs
@@ -1,4 +1,6 @@
-use crate::model::{Method, MethodArgument};
+use crate::model::{AutoImpl, Method, MethodArgument, MethodImpl};
+
+use super::auto_impl_proxy::proxy_getter_return_type_token;
 
 pub fn arg_declarations(method_args: &[MethodArgument]) -> Vec<proc_macro2::TokenStream> {
     method_args
@@ -17,10 +19,7 @@ pub fn generate_sig(m: &Method) -> proc_macro2::TokenStream {
     let generics = &m.generics;
     let generics_where = &m.generics.where_clause;
     let arg_decl = arg_declarations(&m.method_args);
-    let ret_tok = match &m.return_type {
-        syn::ReturnType::Default => quote! {},
-        syn::ReturnType::Type(r_arrow_token, ty) => quote! { #r_arrow_token #ty },
-    };
+    let ret_tok = generate_sig_return(m);
     let result = quote! {
         #[allow(clippy::too_many_arguments)]
         #[allow(clippy::type_complexity)]
@@ -29,6 +28,18 @@ pub fn generate_sig(m: &Method) -> proc_macro2::TokenStream {
     result
 }
 
+pub fn generate_sig_return(m: &Method) -> proc_macro2::TokenStream {
+    if let MethodImpl::Generated(AutoImpl::ProxyGetter) = &m.implementation {
+        let proxy_ret_tok = proxy_getter_return_type_token(m);
+        return quote! { -> #proxy_ret_tok };
+    }
+
+    match &m.return_type {
+        syn::ReturnType::Default => quote! {},
+        syn::ReturnType::Type(r_arrow_token, ty) => quote! { #r_arrow_token #ty },
+    }
+}
+
 pub fn generate_sig_with_attributes(m: &Method) -> proc_macro2::TokenStream {
     let unprocessed_attributes = &m.unprocessed_attributes;
     let msig = generate_sig(m);
diff --git a/framework/derive/src/generate/snippets.rs b/framework/derive/src/generate/snippets.rs
index 6c1751a187..dbe4717b55 100644
--- a/framework/derive/src/generate/snippets.rs
+++ b/framework/derive/src/generate/snippets.rs
@@ -79,37 +79,83 @@ pub fn proxy_object_def() -> proc_macro2::TokenStream {
         where
             A: multiversx_sc::api::VMApi + 'static,
         {
-            pub address: multiversx_sc::types::ManagedOption<A, multiversx_sc::types::ManagedAddress<A>>,
+            _phantom: core::marker::PhantomData<A>,
         }
-
+    
         impl<A> multiversx_sc::contract_base::ProxyObjBase for Proxy<A>
         where
             A: multiversx_sc::api::VMApi + 'static,
         {
             type Api = A;
-
+    
+            fn extract_opt_address(
+                &mut self,
+            ) -> multiversx_sc::types::ManagedOption<
+                Self::Api,
+                multiversx_sc::types::ManagedAddress<Self::Api>,
+            > {
+                multiversx_sc::types::ManagedOption::none()
+            }
+    
+            fn extract_address(&mut self) -> multiversx_sc::types::ManagedAddress<Self::Api> {
+                multiversx_sc::api::ErrorApiImpl::signal_error(
+                    &<A as multiversx_sc::api::ErrorApi>::error_api_impl(),
+                    multiversx_sc::err_msg::RECIPIENT_ADDRESS_NOT_SET.as_bytes(),
+                )
+            }
+        }
+    
+        impl<A> multiversx_sc::contract_base::ProxyObjNew for Proxy<A>
+        where
+            A: multiversx_sc::api::VMApi + 'static,
+        {
+            type ProxyTo = ProxyTo<A>;
+    
             fn new_proxy_obj() -> Self {
                 Proxy {
-                    address: multiversx_sc::types::ManagedOption::none(),
+                    _phantom: core::marker::PhantomData,
                 }
             }
-
-            fn contract(mut self, address: multiversx_sc::types::ManagedAddress<Self::Api>) -> Self {
-                self.address = multiversx_sc::types::ManagedOption::some(address);
-                self
+    
+            fn contract(mut self, address: multiversx_sc::types::ManagedAddress<Self::Api>) -> Self::ProxyTo {
+                ProxyTo {
+                    address: multiversx_sc::types::ManagedOption::some(address)
+                }
             }
-
+        }
+    
+        pub struct ProxyTo<A>
+        where
+            A: multiversx_sc::api::VMApi + 'static,
+        {
+            pub address:
+                multiversx_sc::types::ManagedOption<A, multiversx_sc::types::ManagedAddress<A>>,
+        }
+    
+        impl<A> multiversx_sc::contract_base::ProxyObjBase for ProxyTo<A>
+        where
+            A: multiversx_sc::api::VMApi + 'static,
+        {
+            type Api = A;
+    
             fn extract_opt_address(
                 &mut self,
             ) -> multiversx_sc::types::ManagedOption<
                 Self::Api,
                 multiversx_sc::types::ManagedAddress<Self::Api>,
             > {
-                core::mem::replace(&mut self.address, multiversx_sc::types::ManagedOption::none())
+                core::mem::replace(
+                    &mut self.address,
+                    multiversx_sc::types::ManagedOption::none(),
+                )
             }
-
+    
             fn extract_address(&mut self) -> multiversx_sc::types::ManagedAddress<Self::Api> {
-                self.extract_opt_address().unwrap_or_sc_panic(multiversx_sc::err_msg::RECIPIENT_ADDRESS_NOT_SET)
+                let address = core::mem::replace(
+                    &mut self.address,
+                    multiversx_sc::types::ManagedOption::none(),
+                );
+                address.unwrap_or_sc_panic(multiversx_sc::err_msg::RECIPIENT_ADDRESS_NOT_SET)
             }
         }
     }
diff --git a/framework/derive/src/generate/supertrait_gen.rs b/framework/derive/src/generate/supertrait_gen.rs
index de5ba0f393..3d12cbb913 100644
--- a/framework/derive/src/generate/supertrait_gen.rs
+++ b/framework/derive/src/generate/supertrait_gen.rs
@@ -135,6 +135,7 @@ pub fn function_selector_module_calls(supertraits: &[Supertrait]) -> Vec<proc_ma
 fn impl_proxy_trait(module_path: &ModulePath) -> proc_macro2::TokenStream {
     quote! {
         impl<A> #module_path ProxyTrait for Proxy<A> where A: multiversx_sc::api::VMApi {}
+        impl<A> #module_path ProxyTrait for ProxyTo<A> where A: multiversx_sc::api::VMApi {}
     }
 }
 
diff --git a/framework/scenario/src/facade/contract_info.rs b/framework/scenario/src/facade/contract_info.rs
index 8376e859f8..bc1d88ee35 100644
--- a/framework/scenario/src/facade/contract_info.rs
+++ b/framework/scenario/src/facade/contract_info.rs
@@ -7,7 +7,7 @@ use multiversx_sc::types::{
 use crate::multiversx_sc::{
     api::ManagedTypeApi,
     codec::{CodecFrom, EncodeErrorHandler, TopEncode, TopEncodeOutput},
-    contract_base::ProxyObjBase,
+    contract_base::ProxyObjNew,
     types::{Address, ManagedAddress},
 };
 
@@ -15,12 +15,15 @@ use crate::scenario::model::{AddressKey, AddressValue};
 
 /// Bundles a representation of a contract with the contract proxy,
 /// so that it can be easily called in the context of a blockchain mock.
-pub struct ContractInfo<P: ProxyObjBase> {
+pub struct ContractInfo<P: ProxyObjNew> {
     pub scenario_address_expr: AddressKey,
-    proxy_inst: P,
+    proxy_inst: P::ProxyTo,
 }
 
-impl<P: ProxyObjBase> ContractInfo<P> {
+impl<P> ContractInfo<P>
+where
+    P: ProxyObjNew,
+{
     pub fn new<A>(address_expr: A) -> Self
     where
         AddressKey: From<A>,
@@ -38,47 +41,44 @@ impl<P: ProxyObjBase> ContractInfo<P> {
     }
 }
 
-impl<P: ProxyObjBase> From<&ContractInfo<P>> for AddressKey {
+impl<P: ProxyObjNew> From<&ContractInfo<P>> for AddressKey {
     fn from(from: &ContractInfo<P>) -> Self {
         from.scenario_address_expr.clone()
     }
 }
 
-impl<P: ProxyObjBase> From<ContractInfo<P>> for AddressKey {
+impl<P: ProxyObjNew> From<ContractInfo<P>> for AddressKey {
     fn from(from: ContractInfo<P>) -> Self {
         from.scenario_address_expr
     }
 }
 
-impl<P: ProxyObjBase> From<&ContractInfo<P>> for AddressValue {
+impl<P: ProxyObjNew> From<&ContractInfo<P>> for AddressValue {
     fn from(from: &ContractInfo<P>) -> Self {
         AddressValue::from(&from.scenario_address_expr)
     }
 }
 
-impl<P: ProxyObjBase> From<ContractInfo<P>> for AddressValue {
+impl<P: ProxyObjNew> From<ContractInfo<P>> for AddressValue {
     fn from(from: ContractInfo<P>) -> Self {
         AddressValue::from(&from.scenario_address_expr)
     }
 }
 
-impl<P: ProxyObjBase> Deref for ContractInfo<P> {
-    type Target = P;
+impl<P: ProxyObjNew> Deref for ContractInfo<P> {
+    type Target = P::ProxyTo;
     fn deref(&self) -> &Self::Target {
         &self.proxy_inst
     }
 }
 
-impl<P: ProxyObjBase> DerefMut for ContractInfo<P> {
+impl<P: ProxyObjNew> DerefMut for ContractInfo<P> {
     fn deref_mut(&mut self) -> &mut Self::Target {
-        let proxy_inst = core::mem::replace(&mut self.proxy_inst, P::new_proxy_obj());
-        let proxy_inst = proxy_inst.contract(self.scenario_address_expr.value.clone().into());
-        let _ = core::mem::replace(&mut self.proxy_inst, proxy_inst);
         &mut self.proxy_inst
     }
 }
 
-impl<P: ProxyObjBase> TopEncode for ContractInfo<P> {
+impl<P: ProxyObjNew> TopEncode for ContractInfo<P> {
     fn top_encode_or_handle_err<O, H>(&self, output: O, h: H) -> Result<(), H::HandledErr>
     where
         O: TopEncodeOutput,
@@ -90,15 +90,15 @@ impl<P: ProxyObjBase> TopEncode for ContractInfo<P> {
     }
 }
 
-impl<P: ProxyObjBase> CodecFrom<ContractInfo<P>> for Address {}
-impl<P: ProxyObjBase> CodecFrom<&ContractInfo<P>> for Address {}
-impl<M: ManagedTypeApi, P: ProxyObjBase> CodecFrom<ContractInfo<P>> for ManagedAddress<M> {}
-impl<M: ManagedTypeApi, P: ProxyObjBase> CodecFrom<&ContractInfo<P>> for ManagedAddress<M> {}
+impl<P: ProxyObjNew> CodecFrom<ContractInfo<P>> for Address {}
+impl<P: ProxyObjNew> CodecFrom<&ContractInfo<P>> for Address {}
+impl<M: ManagedTypeApi, P: ProxyObjNew> CodecFrom<ContractInfo<P>> for ManagedAddress<M> {}
+impl<M: ManagedTypeApi, P: ProxyObjNew> CodecFrom<&ContractInfo<P>> for ManagedAddress<M> {}
 
 impl<Env, P> AnnotatedValue<Env, ManagedAddress<Env::Api>> for &ContractInfo<P>
 where
     Env: TxEnv,
-    P: ProxyObjBase,
+    P: ProxyObjNew,
 {
     fn annotation(&self, _env: &Env) -> ManagedBuffer<Env::Api> {
         self.scenario_address_expr.original.as_str().into()
@@ -116,7 +116,7 @@ where
 impl<P, Env> TxFrom<Env> for &ContractInfo<P>
 where
     Env: TxEnv,
-    P: ProxyObjBase,
+    P: ProxyObjNew,
 {
     fn resolve_address(&self, _env: &Env) -> ManagedAddress<Env::Api> {
         (&self.scenario_address_expr.value).into()
@@ -125,18 +125,18 @@ where
 impl<P, Env> TxFromSpecified<Env> for &ContractInfo<P>
 where
     Env: TxEnv,
-    P: ProxyObjBase,
+    P: ProxyObjNew,
 {
 }
 impl<P, Env> TxTo<Env> for &ContractInfo<P>
 where
     Env: TxEnv,
-    P: ProxyObjBase,
+    P: ProxyObjNew,
 {
 }
 impl<P, Env> TxToSpecified<Env> for &ContractInfo<P>
 where
     Env: TxEnv,
-    P: ProxyObjBase,
+    P: ProxyObjNew,
 {
 }
diff --git a/framework/scenario/tests/contract_without_macros.rs b/framework/scenario/tests/contract_without_macros.rs
index cff92ceab8..e58dcfb9ee 100644
--- a/framework/scenario/tests/contract_without_macros.rs
+++ b/framework/scenario/tests/contract_without_macros.rs
@@ -9,7 +9,7 @@
 #![allow(unused)]
 
 use multiversx_sc::{
-    contract_base::ProxyObjBase,
+    contract_base::ProxyObjNew,
     types::{BigInt, ManagedAddress},
 };
 use multiversx_sc_scenario::api::{SingleTxApi, StaticApi};
@@ -332,8 +332,7 @@ mod sample_adder {
     where
         A: multiversx_sc::api::VMApi + 'static,
     {
-        pub address:
-            multiversx_sc::types::ManagedOption<A, multiversx_sc::types::ManagedAddress<A>>,
+        _phantom: core::marker::PhantomData<A>,
     }
 
     impl<A> multiversx_sc::contract_base::ProxyObjBase for Proxy<A>
@@ -342,16 +341,55 @@ mod sample_adder {
     {
         type Api = A;
 
+        fn extract_opt_address(
+            &mut self,
+        ) -> multiversx_sc::types::ManagedOption<
+            Self::Api,
+            multiversx_sc::types::ManagedAddress<Self::Api>,
+        > {
+            multiversx_sc::types::ManagedOption::none()
+        }
+
+        fn extract_address(&mut self) -> multiversx_sc::types::ManagedAddress<Self::Api> {
+            multiversx_sc::api::ErrorApiImpl::signal_error(
+                &<A as multiversx_sc::api::ErrorApi>::error_api_impl(),
+                multiversx_sc::err_msg::RECIPIENT_ADDRESS_NOT_SET.as_bytes(),
+            )
+        }
+    }
+
+    impl<A> multiversx_sc::contract_base::ProxyObjNew for Proxy<A>
+    where
+        A: multiversx_sc::api::VMApi + 'static,
+    {
+        type ProxyTo = ProxyTo<A>;
+
         fn new_proxy_obj() -> Self {
             Proxy {
-                address: multiversx_sc::types::ManagedOption::none(),
+                _phantom: core::marker::PhantomData,
             }
         }
 
-        fn contract(mut self, address: multiversx_sc::types::ManagedAddress<Self::Api>) -> Self {
-            self.address = multiversx_sc::types::ManagedOption::some(address);
-            self
+        fn contract(mut self, address: multiversx_sc::types::ManagedAddress<Self::Api>) -> Self::ProxyTo {
+            ProxyTo {
+                address: multiversx_sc::types::ManagedOption::some(address)
+            }
         }
+    }
+
+    pub struct ProxyTo<A>
+    where
+        A: multiversx_sc::api::VMApi + 'static,
+    {
+        pub address:
+            multiversx_sc::types::ManagedOption<A, multiversx_sc::types::ManagedAddress<A>>,
+    }
+
+    impl<A> multiversx_sc::contract_base::ProxyObjBase for ProxyTo<A>
+    where
+        A: multiversx_sc::api::VMApi + 'static,
+    {
+        type Api = A;
 
         fn extract_opt_address(
             &mut self,
@@ -375,8 +413,10 @@ mod sample_adder {
     }
 
     impl<A> super::module_1::ProxyTrait for Proxy<A> where A: multiversx_sc::api::VMApi {}
+    impl<A> super::module_1::ProxyTrait for ProxyTo<A> where A: multiversx_sc::api::VMApi {}
 
     impl<A> ProxyTrait for Proxy<A> where A: multiversx_sc::api::VMApi {}
+    impl<A> ProxyTrait for ProxyTo<A> where A: multiversx_sc::api::VMApi {}
 
     pub struct CallbackProxyObj<A>
     where

From 11c90c150fcf42569ed9e9e9d2f6364c834f0290 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 13 Feb 2024 10:00:06 +0200
Subject: [PATCH 0344/1254] ContractInfo refresh address fix

---
 framework/scenario/src/facade/contract_info.rs | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/framework/scenario/src/facade/contract_info.rs b/framework/scenario/src/facade/contract_info.rs
index bc1d88ee35..06e99b6461 100644
--- a/framework/scenario/src/facade/contract_info.rs
+++ b/framework/scenario/src/facade/contract_info.rs
@@ -39,6 +39,18 @@ where
     pub fn to_address(&self) -> Address {
         self.scenario_address_expr.to_address()
     }
+
+    /// For historical reasons the proxy consumes its address whenever it is called.
+    ///
+    /// When using it in tests, as part of `ContractInfo`,
+    /// it is convenient to refresh it before each call.
+    ///
+    /// It is sort of a hack, designed to optimize proxy use in contracts,
+    /// while making it easier to use in tests.
+    fn refresh_proxy_address(&mut self) {
+        self.proxy_inst =
+            P::new_proxy_obj().contract(self.scenario_address_expr.value.clone().into());
+    }
 }
 
 impl<P: ProxyObjNew> From<&ContractInfo<P>> for AddressKey {
@@ -74,6 +86,7 @@ impl<P: ProxyObjNew> Deref for ContractInfo<P> {
 
 impl<P: ProxyObjNew> DerefMut for ContractInfo<P> {
     fn deref_mut(&mut self) -> &mut Self::Target {
+        self.refresh_proxy_address();
         &mut self.proxy_inst
     }
 }

From bd43a5c686b8a752f995c2fb71d01e0fe4ce8311 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Tue, 13 Feb 2024 13:03:55 +0200
Subject: [PATCH 0345/1254] rename proxy to TxProxy and add overwrite command

---
 .../adder/proxies_struct_interactor_main.rs   |  4 ++--
 .../meta/src/cli_args/cli_args_contract.rs    | 17 +++++++-------
 framework/meta/src/cmd/contract.rs            |  8 ++++---
 .../generate_proxy/proxy_crate_gen.rs         | 17 ++++++++------
 .../contract/generate_proxy/proxy_gen_main.rs | 14 +++++++-----
 .../generate_proxy/proxy_template_gen.rs      | 22 ++-----------------
 .../generate_snippets/snippet_gen_main.rs     |  4 ++--
 7 files changed, 38 insertions(+), 48 deletions(-)

diff --git a/contracts/examples/adder/proxies_struct_interactor_main.rs b/contracts/examples/adder/proxies_struct_interactor_main.rs
index 944242261b..caf5ea8895 100644
--- a/contracts/examples/adder/proxies_struct_interactor_main.rs
+++ b/contracts/examples/adder/proxies_struct_interactor_main.rs
@@ -2,14 +2,14 @@
 #![allow(clippy::type_complexity)]
 multiversx_sc::imports!();
 
-pub struct Proxy<A>
+pub struct TxProxy<A>
 where
     A: multiversx_sc::api::VMApi + 'static,
 {
     pub address: ManagedOption<A, ManagedAddress<A>>,
 }
 
-impl<A> Proxy<A>
+impl<A> TxProxy<A>
 where
     A: multiversx_sc::api::VMApi + 'static,
 {	fn init<
diff --git a/framework/meta/src/cli_args/cli_args_contract.rs b/framework/meta/src/cli_args/cli_args_contract.rs
index e05146a9bc..4d89137b29 100644
--- a/framework/meta/src/cli_args/cli_args_contract.rs
+++ b/framework/meta/src/cli_args/cli_args_contract.rs
@@ -65,13 +65,13 @@ pub enum ContractCliAction {
         name = "snippets",
         about = "Generates a snippets project, based on the contract ABI."
     )]
-    GenerateSnippets(GenerateSnippetsArgs),
+    GenerateSnippets(GenerateOverwriteArg),
 
     #[command(
         name = "proxy",
         about = "Generates a proxy, based on the contract ABI."
     )]
-    GenerateProxies,
+    GenerateProxies(GenerateOverwriteArg),
 }
 
 impl CliArgsToRaw for ContractCliAction {
@@ -99,12 +99,13 @@ impl CliArgsToRaw for ContractCliAction {
             ContractCliAction::Update => {
                 raw.push("update".to_string());
             },
-            ContractCliAction::GenerateSnippets(args) => {
+            ContractCliAction::GenerateSnippets(arg) => {
                 raw.push("snippets".to_string());
-                raw.append(&mut args.to_raw());
+                raw.append(&mut arg.to_raw());
             },
-            ContractCliAction::GenerateProxies => {
+            ContractCliAction::GenerateProxies(arg) => {
                 raw.push("proxy".to_string());
+                raw.append(&mut arg.to_raw());
             },
         }
         raw
@@ -112,13 +113,13 @@ impl CliArgsToRaw for ContractCliAction {
 }
 
 #[derive(Default, Clone, PartialEq, Eq, Debug, Args)]
-pub struct GenerateSnippetsArgs {
-    /// Override snippets project if it already exists.
+pub struct GenerateOverwriteArg {
+    /// Override file if it already exists.
     #[arg(long, verbatim_doc_comment)]
     pub overwrite: bool,
 }
 
-impl CliArgsToRaw for GenerateSnippetsArgs {
+impl CliArgsToRaw for GenerateOverwriteArg {
     fn to_raw(&self) -> Vec<String> {
         let mut raw = Vec::new();
         if self.overwrite {
diff --git a/framework/meta/src/cmd/contract.rs b/framework/meta/src/cmd/contract.rs
index 37fa3ee65b..2f7e4b7bb7 100644
--- a/framework/meta/src/cmd/contract.rs
+++ b/framework/meta/src/cmd/contract.rs
@@ -29,10 +29,12 @@ pub fn cli_main<AbiObj: ContractAbiProvider>() {
         },
         ContractCliAction::Clean => meta_config_opt.clean(),
         ContractCliAction::Update => meta_config_opt.update(),
-        ContractCliAction::GenerateSnippets(gs_args) => {
-            meta_config_opt.generate_rust_snippets(&gs_args)
+        ContractCliAction::GenerateSnippets(gs_arg) => {
+            meta_config_opt.generate_rust_snippets(&gs_arg)
+        },
+        ContractCliAction::GenerateProxies(arg) => {
+            meta_config_opt.generate_rust_proxies_struct(&arg)
         },
-        ContractCliAction::GenerateProxies => meta_config_opt.generate_rust_proxies_struct(),
     }
 }
 
diff --git a/framework/meta/src/cmd/contract/generate_proxy/proxy_crate_gen.rs b/framework/meta/src/cmd/contract/generate_proxy/proxy_crate_gen.rs
index 3d6ef0122d..00f38e40cf 100644
--- a/framework/meta/src/cmd/contract/generate_proxy/proxy_crate_gen.rs
+++ b/framework/meta/src/cmd/contract/generate_proxy/proxy_crate_gen.rs
@@ -1,12 +1,15 @@
 use std::fs::File;
 
 #[must_use]
-pub(crate) fn create_and_get_lib_file(proxies_file_name: &str) -> File {
-    let lib_path = format!("../{proxies_file_name}");
-    match File::options().create_new(true).write(true).open(&lib_path) {
-        Ok(f) => f,
-        Err(_) => panic!(
-            "{lib_path} file already exists, --overwrite option for proxies was not provided"
-        ),
+pub(crate) fn create_file(proxies_file_name: &str, overwrite: bool) -> File {
+    let file = format!("../{proxies_file_name}");
+
+    if overwrite {
+        File::create(&file).unwrap()
+    } else {
+        match File::options().create_new(true).write(true).open(&file) {
+            Ok(f) => f,
+            Err(_) => panic!("{file} file already exists, --overwrite option was not provided"),
+        }
     }
 }
diff --git a/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_main.rs b/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_main.rs
index fb9549d998..b81ba802dc 100644
--- a/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_main.rs
+++ b/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_main.rs
@@ -2,23 +2,25 @@ use std::fs::File;
 
 use multiversx_sc::abi::ContractAbi;
 
+use crate::cli_args::GenerateOverwriteArg;
+
 use super::{
     super::meta_config::MetaConfig,
-    proxy_crate_gen::create_and_get_lib_file,
+    proxy_crate_gen::create_file,
     proxy_sc_functions_gen::write_content,
     proxy_template_gen::{write_imports, write_struct_template},
 };
 
-static PROXIES_SOURCE_FILE_NAME: &str = "proxies_struct_interactor_main.rs";
+const PROXIES_SOURCE_FILE_NAME: &str = "proxies_struct_interactor_main.rs";
 
 impl MetaConfig {
-    pub fn generate_rust_proxies_struct(&self) {
-        let file = create_and_get_lib_file(PROXIES_SOURCE_FILE_NAME);
-        write_proxies_struct_to_file(file, self.original_contract_abi.clone());
+    pub fn generate_rust_proxies_struct(&self, args: &GenerateOverwriteArg) {
+        let file = create_file(PROXIES_SOURCE_FILE_NAME, args.overwrite);
+        write_proxies_to_file(file, self.original_contract_abi.clone());
     }
 }
 
-fn write_proxies_struct_to_file(mut file: File, abi: ContractAbi) {
+fn write_proxies_to_file(mut file: File, abi: ContractAbi) {
     write_imports(&mut file);
     write_struct_template(&mut file);
     write_content(&mut file, abi);
diff --git a/framework/meta/src/cmd/contract/generate_proxy/proxy_template_gen.rs b/framework/meta/src/cmd/contract/generate_proxy/proxy_template_gen.rs
index e88dd87943..d2ff58a8ac 100644
--- a/framework/meta/src/cmd/contract/generate_proxy/proxy_template_gen.rs
+++ b/framework/meta/src/cmd/contract/generate_proxy/proxy_template_gen.rs
@@ -14,35 +14,17 @@ multiversx_sc::imports!();"#
     write_newline(file);
 }
 
-// pub(crate) fn write_struct_template(file: &mut File) {
-//     write!(
-//         file,
-//         "pub struct Proxy<A>
-// where
-//     A: multiversx_sc::api::VMApi + 'static,
-// {{
-//     phantom = Phantom
-// }}
-
-// impl<A> Proxy<A>
-// where
-//     A: multiversx_sc::api::VMApi + 'static,
-// {{"
-//     )
-//     .unwrap();
-// }
-
 pub(crate) fn write_struct_template(file: &mut File) {
     write!(
         file,
-        "pub struct Proxy<A>
+        "pub struct TxProxy<A>
 where
     A: multiversx_sc::api::VMApi + 'static,
 {{
     pub address: ManagedOption<A, ManagedAddress<A>>,
 }}
 
-impl<A> Proxy<A>
+impl<A> TxProxy<A>
 where
     A: multiversx_sc::api::VMApi + 'static,
 {{"
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 b158bcd0ce..010e35c2a2 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
@@ -2,7 +2,7 @@ use std::fs::File;
 
 use multiversx_sc::abi::ContractAbi;
 
-use crate::cli_args::GenerateSnippetsArgs;
+use crate::cli_args::GenerateOverwriteArg;
 
 use super::{
     super::meta_config::MetaConfig,
@@ -18,7 +18,7 @@ use super::{
 };
 
 impl MetaConfig {
-    pub fn generate_rust_snippets(&self, args: &GenerateSnippetsArgs) {
+    pub fn generate_rust_snippets(&self, args: &GenerateOverwriteArg) {
         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();

From b91a6a10df2b60a408afeb17181d3ba1d758c205 Mon Sep 17 00:00:00 2001
From: Alin Cruceat <alyn_509@yahoo.com>
Date: Tue, 13 Feb 2024 15:56:02 +0200
Subject: [PATCH 0346/1254] add upgrade to template contracts

---
 contracts/examples/crypto-zombies/src/lib.rs       | 3 +++
 contracts/examples/empty/src/empty.rs              | 3 +++
 contracts/examples/ping-pong-egld/src/ping_pong.rs | 3 +++
 3 files changed, 9 insertions(+)

diff --git a/contracts/examples/crypto-zombies/src/lib.rs b/contracts/examples/crypto-zombies/src/lib.rs
index 80d7e2b9b0..e48180a910 100644
--- a/contracts/examples/crypto-zombies/src/lib.rs
+++ b/contracts/examples/crypto-zombies/src/lib.rs
@@ -27,6 +27,9 @@ pub trait CryptoZombies:
         self.cooldown_time().set(86400u64);
     }
 
+    #[upgrade]
+    fn upgrade(&self) {}
+
     #[only_owner]
     #[endpoint]
     fn set_crypto_kitties_sc_address(&self, address: ManagedAddress) {
diff --git a/contracts/examples/empty/src/empty.rs b/contracts/examples/empty/src/empty.rs
index 05c2ddb437..986e66f63a 100644
--- a/contracts/examples/empty/src/empty.rs
+++ b/contracts/examples/empty/src/empty.rs
@@ -7,4 +7,7 @@ multiversx_sc::imports!();
 pub trait EmptyContract {
     #[init]
     fn init(&self) {}
+
+    #[upgrade]
+    fn upgrade(&self) {}
 }
diff --git a/contracts/examples/ping-pong-egld/src/ping_pong.rs b/contracts/examples/ping-pong-egld/src/ping_pong.rs
index 26b5e74880..1e4aaf21ae 100644
--- a/contracts/examples/ping-pong-egld/src/ping_pong.rs
+++ b/contracts/examples/ping-pong-egld/src/ping_pong.rs
@@ -47,6 +47,9 @@ pub trait PingPong {
         self.max_funds().set(max_funds.into_option());
     }
 
+    #[upgrade]
+    fn upgrade(&self) {}
+
     /// User sends some EGLD to be locked in the contract for a period of time.
     /// Optional `_data` argument is ignored.
     #[payable("EGLD")]

From e324b519e1df41264d7e58284a10c8bc2054c230 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 14 Feb 2024 01:24:18 +0200
Subject: [PATCH 0347/1254] old Proxy calls produce unified syntax, backwards
 compatibility

---
 .../tests/adder_blackbox_with_values_test.rs  |   6 +-
 .../interact/src/multisig_interact_wegld.rs   |   4 +-
 .../multisig/tests/multisig_blackbox_test.rs  |  47 ++---
 .../src/forwarder_raw_deploy_upgrade.rs       |   2 +-
 .../forwarder-raw/src/forwarder_raw_sync.rs   |   3 +-
 .../base/src/contract_base/proxy_obj_base.rs  |   6 +-
 .../base/src/types/interaction/async_call.rs  |  16 +-
 .../types/interaction/contract_call_exec.rs   |   2 +-
 .../interaction/contract_call_no_payment.rs   |  13 +-
 .../types/interaction/contract_call_trait.rs  |  13 +-
 .../contract_call_with_any_payment.rs         |  13 +-
 .../interaction/contract_call_with_egld.rs    |  13 +-
 .../contract_call_with_egld_or_single_esdt.rs |  14 +-
 .../contract_call_with_multi_esdt.rs          |  13 +-
 framework/base/src/types/interaction/mod.rs   |   2 +-
 framework/base/src/types/interaction/tx.rs    | 176 +++++++++++++++---
 .../src/types/interaction/tx_call_async.rs    |  71 ++++++-
 .../interaction/tx_call_async_promises.rs     |  49 ++++-
 .../src/types/interaction/tx_call_sync.rs     |  49 ++++-
 .../base/src/types/interaction/tx_call_te.rs  |   8 +-
 .../types/interaction/tx_result_handler.rs    |  11 ++
 .../interaction/tx_rh_original_result.rs      |   4 +-
 framework/derive/src/generate/proxy_gen.rs    |  97 ++++++----
 framework/derive/src/generate/snippets.rs     |  28 ++-
 .../src/facade/world_tx/scenario_tx.rs        |   6 +-
 .../src/scenario/model/step/sc_call_step.rs   |   6 +-
 .../src/scenario/model/step/sc_query_step.rs  |   4 +-
 .../scenario/tests/contract_without_macros.rs |  15 +-
 framework/snippets/src/interactor_sc_extra.rs |   4 +-
 29 files changed, 532 insertions(+), 163 deletions(-)

diff --git a/contracts/examples/adder/tests/adder_blackbox_with_values_test.rs b/contracts/examples/adder/tests/adder_blackbox_with_values_test.rs
index 5fa8f665ad..17b07e44b8 100644
--- a/contracts/examples/adder/tests/adder_blackbox_with_values_test.rs
+++ b/contracts/examples/adder/tests/adder_blackbox_with_values_test.rs
@@ -1,8 +1,5 @@
 use adder::*;
-use multiversx_sc::{
-    storage::mappers::SingleValue,
-    types::{AddressExpr, ScExpr},
-};
+use multiversx_sc::{storage::mappers::SingleValue, types::AddressExpr};
 use multiversx_sc_scenario::{api::StaticApi, num_bigint::BigUint, scenario_model::*, *};
 
 const ADDER_PATH_EXPR: &str = "mxsc:output/adder.mxsc.json";
@@ -46,7 +43,6 @@ fn adder_blackbox_with_values() {
         )
         .tx(|tx| {
             tx.from(AddressExpr("owner"))
-                .to(ScExpr("adder"))
                 .call(adder_contract.add(3u32))
                 .with_result(WithRawTxResponse(|response| {
                     assert!(response.tx_error.is_success());
diff --git a/contracts/examples/multisig/interact/src/multisig_interact_wegld.rs b/contracts/examples/multisig/interact/src/multisig_interact_wegld.rs
index a0d105abd9..e3c6009b95 100644
--- a/contracts/examples/multisig/interact/src/multisig_interact_wegld.rs
+++ b/contracts/examples/multisig/interact/src/multisig_interact_wegld.rs
@@ -1,12 +1,12 @@
 use std::time::Duration;
 
-use multiversx_sc_scenario::multiversx_sc::types::FunctionCall;
+use multiversx_sc_scenario::multiversx_sc::types::{ContractCallBase, FunctionCall};
 #[allow(unused_imports)]
 use multiversx_sc_snippets::multiversx_sc::types::{
     EsdtTokenPayment, MultiValueEncoded, TokenIdentifier,
 };
 use multiversx_sc_snippets::{
-    multiversx_sc::types::{ContractCall, ContractCallNoPayment},
+    multiversx_sc::types::ContractCallNoPayment,
     multiversx_sc_scenario::{
         mandos_system::ScenarioRunner, scenario_format::interpret_trait::InterpretableFrom,
         standalone::retrieve_account_as_scenario_set_state,
diff --git a/contracts/examples/multisig/tests/multisig_blackbox_test.rs b/contracts/examples/multisig/tests/multisig_blackbox_test.rs
index b79a1eadc2..f614d39062 100644
--- a/contracts/examples/multisig/tests/multisig_blackbox_test.rs
+++ b/contracts/examples/multisig/tests/multisig_blackbox_test.rs
@@ -9,10 +9,7 @@ use multiversx_sc::{
         test_util::top_encode_to_vec_u8_or_panic,
     },
     storage::mappers::SingleValue,
-    types::{
-        Address, AddressExpr, CodeMetadata, ContractCallNoPayment, FunctionCall, ReturnsExact,
-        ScExpr,
-    },
+    types::{Address, AddressExpr, CodeMetadata, FunctionCall, ReturnsExact},
 };
 use multiversx_sc_scenario::{
     api::StaticApi,
@@ -129,12 +126,12 @@ impl MultisigTestState {
     fn propose_add_board_member(&mut self, board_member_address: Address) -> usize {
         self.world.tx_return(|tx| {
             tx.from(AddressExpr("proposer"))
-                .to(ScExpr("multisig"))
+                // .to(ScExpr("multisig"))
                 .call(
                     self.multisig_contract
                         .propose_add_board_member(board_member_address),
                 )
-                .original_result::<usize>()
+                // .original_result::<usize>()
                 .returns(ReturnsExact)
         })
     }
@@ -160,32 +157,28 @@ impl MultisigTestState {
         &mut self,
         to: Address,
         egld_amount: u64,
-        contract_call: ContractCallNoPayment<StaticApi, ()>,
+        contract_call: FunctionCall<StaticApi>,
     ) -> usize {
-        self.world
-            .sc_call_get_result(ScCallStep::new().from(PROPOSER_ADDRESS_EXPR).call(
-                self.multisig_contract.propose_transfer_execute(
-                    to,
-                    egld_amount,
-                    contract_call.into_function_call(),
-                ),
-            ))
+        self.world.sc_call_get_result(
+            ScCallStep::new().from(PROPOSER_ADDRESS_EXPR).call(
+                self.multisig_contract
+                    .propose_transfer_execute(to, egld_amount, contract_call),
+            ),
+        )
     }
 
     fn propose_async_call(
         &mut self,
         to: Address,
         egld_amount: u64,
-        contract_call: ContractCallNoPayment<StaticApi, ()>,
+        contract_call: FunctionCall<StaticApi>,
     ) -> usize {
-        self.world
-            .sc_call_get_result(ScCallStep::new().from(PROPOSER_ADDRESS_EXPR).call(
-                self.multisig_contract.propose_async_call(
-                    to,
-                    egld_amount,
-                    contract_call.into_function_call(),
-                ),
-            ))
+        self.world.sc_call_get_result(
+            ScCallStep::new().from(PROPOSER_ADDRESS_EXPR).call(
+                self.multisig_contract
+                    .propose_async_call(to, egld_amount, contract_call),
+            ),
+        )
     }
 
     fn propose_remove_user(&mut self, user_address: Address) -> usize {
@@ -478,7 +471,7 @@ fn test_transfer_execute_sc_all() {
     let mut state = MultisigTestState::new();
     state.deploy_multisig_contract().deploy_adder_contract();
 
-    let adder_call = state.adder_contract.add(5u64);
+    let adder_call = state.adder_contract.add(5u64).into_function_call();
 
     let action_id = state.propose_transfer_execute(state.adder_address.clone(), 0u64, adder_call);
     state.sign(action_id);
@@ -496,7 +489,7 @@ fn test_async_call_to_sc() {
     let mut state = MultisigTestState::new();
     state.deploy_multisig_contract().deploy_adder_contract();
 
-    let adder_call = state.adder_contract.add(5u64);
+    let adder_call = state.adder_contract.add(5u64).into_function_call();
 
     let action_id = state.propose_async_call(state.adder_address.clone(), 0u64, adder_call);
     state.sign(action_id);
@@ -537,7 +530,7 @@ fn test_deploy_and_upgrade_from_source() {
             .expect_value(OptionalValue::Some(new_adder_address.clone())),
     );
 
-    let adder_call = state.adder_contract.add(5u64);
+    let adder_call = state.adder_contract.add(5u64).into_function_call();
 
     let action_id = state.propose_transfer_execute(new_adder_address, 0u64, adder_call);
     state.sign(action_id);
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 da9684608a..393aab3a73 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
@@ -10,7 +10,7 @@ pub trait ForwarderRawDeployUpgrade {
         args: MultiValueEncoded<ManagedBuffer>,
     ) -> MultiValue2<ManagedAddress, ManagedVec<Self::Api, ManagedBuffer>> {
         self.tx()
-            .deploy()
+            .raw_deploy()
             .code(code)
             .code_metadata(code_metadata)
             .arguments_raw(args.to_arg_buffer())
diff --git a/contracts/feature-tests/composability/forwarder-raw/src/forwarder_raw_sync.rs b/contracts/feature-tests/composability/forwarder-raw/src/forwarder_raw_sync.rs
index c77fd503f9..f235aca1da 100644
--- a/contracts/feature-tests/composability/forwarder-raw/src/forwarder_raw_sync.rs
+++ b/contracts/feature-tests/composability/forwarder-raw/src/forwarder_raw_sync.rs
@@ -16,11 +16,12 @@ pub trait ForwarderRawSync: super::forwarder_raw_common::ForwarderRawCommon {
             .tx()
             .to(to)
             .egld(payment)
+            .raw_call()
             .function_name(endpoint_name)
             .argument(&args)
             .with_gas_limit(half_gas)
             .returns(ReturnsRaw)
-            .execute_on_dest_context();
+            .sync_call();
 
         self.execute_on_dest_context_result(result);
     }
diff --git a/framework/base/src/contract_base/proxy_obj_base.rs b/framework/base/src/contract_base/proxy_obj_base.rs
index d7849c8432..0d3053d8f4 100644
--- a/framework/base/src/contract_base/proxy_obj_base.rs
+++ b/framework/base/src/contract_base/proxy_obj_base.rs
@@ -1,10 +1,11 @@
 use crate::{
     api::VMApi,
-    types::{ManagedAddress, ManagedOption},
+    types::{ManagedAddress, ManagedOption, TxScEnv, TxTo},
 };
 
 pub trait ProxyObjBase {
     type Api: VMApi;
+    type To: TxTo<TxScEnv<Self::Api>>;
 
     /// Extracts the address contained in the proxy object and replaces it with None.
     ///
@@ -17,6 +18,9 @@ pub trait ProxyObjBase {
     /// Will crash if no address was specified.
     #[doc(hidden)]
     fn extract_address(&mut self) -> ManagedAddress<Self::Api>;
+
+    #[doc(hidden)]
+    fn extract_proxy_to(&mut self) -> Self::To;
 }
 
 pub trait ProxyObjNew: ProxyObjBase {
diff --git a/framework/base/src/types/interaction/async_call.rs b/framework/base/src/types/interaction/async_call.rs
index 5c3b57c5c8..94756810b1 100644
--- a/framework/base/src/types/interaction/async_call.rs
+++ b/framework/base/src/types/interaction/async_call.rs
@@ -35,11 +35,11 @@ where
     }
 }
 
-impl<Api> AsyncCall<Api>
-where
-    Api: CallTypeApi + StorageWriteApi,
-{
-    pub fn call_and_exit(self) -> ! {
-        self.async_call_and_exit()
-    }
-}
+// impl<Api> AsyncCall<Api>
+// where
+//     Api: CallTypeApi + StorageWriteApi,
+// {
+//     pub fn call_and_exit(self) -> ! {
+//         self.async_call_and_exit()
+//     }
+// }
diff --git a/framework/base/src/types/interaction/contract_call_exec.rs b/framework/base/src/types/interaction/contract_call_exec.rs
index e5df812886..29a1a0587c 100644
--- a/framework/base/src/types/interaction/contract_call_exec.rs
+++ b/framework/base/src/types/interaction/contract_call_exec.rs
@@ -74,7 +74,7 @@ where
         Tx::new_tx_from_sc()
             .to(self.basic.to)
             .egld(self.egld_payment)
-            .call(self.basic.function_call)
+            .function_call(self.basic.function_call)
             .callback(None)
     }
 }
diff --git a/framework/base/src/types/interaction/contract_call_no_payment.rs b/framework/base/src/types/interaction/contract_call_no_payment.rs
index 4fc75125a5..75e03d9d07 100644
--- a/framework/base/src/types/interaction/contract_call_no_payment.rs
+++ b/framework/base/src/types/interaction/contract_call_no_payment.rs
@@ -11,7 +11,8 @@ use crate::{
 };
 
 use super::{
-    contract_call_exec::UNSPECIFIED_GAS_LIMIT, contract_call_with_egld::ContractCallWithEgld,
+    contract_call_exec::UNSPECIFIED_GAS_LIMIT, contract_call_trait::ContractCallBase,
+    contract_call_with_egld::ContractCallWithEgld,
     contract_call_with_multi_esdt::ContractCallWithMultiEsdt, ContractCall,
     ContractCallWithAnyPayment, ContractCallWithEgldOrSingleEsdt, FunctionCall, ManagedArgBuffer,
     Tx, TxScEnv,
@@ -35,7 +36,7 @@ where
     pub(super) _return_type: PhantomData<OriginalResult>,
 }
 
-impl<SA, OriginalResult> ContractCall<SA> for ContractCallNoPayment<SA, OriginalResult>
+impl<SA, OriginalResult> ContractCallBase<SA> for ContractCallNoPayment<SA, OriginalResult>
 where
     SA: CallTypeApi + 'static,
     OriginalResult: TopEncodeMulti,
@@ -49,7 +50,13 @@ where
             egld_payment: BigUint::zero(),
         }
     }
+}
 
+impl<SA, OriginalResult> ContractCall<SA> for ContractCallNoPayment<SA, OriginalResult>
+where
+    SA: CallTypeApi + 'static,
+    OriginalResult: TopEncodeMulti,
+{
     #[inline]
     fn get_mut_basic(&mut self) -> &mut ContractCallNoPayment<SA, OriginalResult> {
         self
@@ -169,6 +176,6 @@ where
     }
 
     pub fn tx(self) -> Tx<TxScEnv<SA>, (), (), (), (), FunctionCall<SA>, ()> {
-        Tx::new_tx_from_sc().call(self.function_call)
+        Tx::new_tx_from_sc().function_call(self.function_call)
     }
 }
diff --git a/framework/base/src/types/interaction/contract_call_trait.rs b/framework/base/src/types/interaction/contract_call_trait.rs
index f29d711847..3a3e034008 100644
--- a/framework/base/src/types/interaction/contract_call_trait.rs
+++ b/framework/base/src/types/interaction/contract_call_trait.rs
@@ -6,10 +6,7 @@ use crate::{
 
 use super::{AsyncCall, ContractCallNoPayment, ContractCallWithEgld, ManagedArgBuffer};
 
-/// Defines a contract call object, which is the basis for all calls to other contracts.
-///
-/// Its implementations differ on the type of payment that gets sent with the call.
-pub trait ContractCall<SA>: Sized
+pub trait ContractCallBase<SA>
 where
     SA: CallTypeApi + 'static,
 {
@@ -19,7 +16,15 @@ where
     /// thus reducing it to a simple transaction with optional EGLD value.
     #[doc(hidden)]
     fn into_normalized(self) -> ContractCallWithEgld<SA, Self::OriginalResult>;
+}
 
+/// Defines a contract call object, which is the basis for all calls to other contracts.
+///
+/// Its implementations differ on the type of payment that gets sent with the call.
+pub trait ContractCall<SA>: ContractCallBase<SA> + Sized
+where
+    SA: CallTypeApi + 'static,
+{
     /// Mutable access to the common base.
     #[doc(hidden)]
     fn get_mut_basic(&mut self) -> &mut ContractCallNoPayment<SA, Self::OriginalResult>;
diff --git a/framework/base/src/types/interaction/contract_call_with_any_payment.rs b/framework/base/src/types/interaction/contract_call_with_any_payment.rs
index 07f468a671..d195cb3889 100644
--- a/framework/base/src/types/interaction/contract_call_with_any_payment.rs
+++ b/framework/base/src/types/interaction/contract_call_with_any_payment.rs
@@ -5,7 +5,10 @@ use crate::{
     types::{EgldOrMultiEsdtPayment, ManagedAddress, ManagedBuffer},
 };
 
-use super::{contract_call_no_payment::ContractCallNoPayment, ContractCall, ContractCallWithEgld};
+use super::{
+    contract_call_no_payment::ContractCallNoPayment, contract_call_trait::ContractCallBase,
+    ContractCall, ContractCallWithEgld,
+};
 
 /// Holds data for calling another contract, with any type of payment: none, EGLD, Multi-ESDT.
 ///
@@ -19,7 +22,7 @@ where
     pub payment: EgldOrMultiEsdtPayment<SA>,
 }
 
-impl<SA, OriginalResult> ContractCall<SA> for ContractCallWithAnyPayment<SA, OriginalResult>
+impl<SA, OriginalResult> ContractCallBase<SA> for ContractCallWithAnyPayment<SA, OriginalResult>
 where
     SA: CallTypeApi + 'static,
     OriginalResult: TopEncodeMulti,
@@ -35,7 +38,13 @@ where
                 .convert_to_esdt_transfer_call(multi_esdt_payment),
         }
     }
+}
 
+impl<SA, OriginalResult> ContractCall<SA> for ContractCallWithAnyPayment<SA, OriginalResult>
+where
+    SA: CallTypeApi + 'static,
+    OriginalResult: TopEncodeMulti,
+{
     #[inline]
     fn get_mut_basic(&mut self) -> &mut ContractCallNoPayment<SA, OriginalResult> {
         &mut self.basic
diff --git a/framework/base/src/types/interaction/contract_call_with_egld.rs b/framework/base/src/types/interaction/contract_call_with_egld.rs
index 9d856cf7b5..9d6d749b08 100644
--- a/framework/base/src/types/interaction/contract_call_with_egld.rs
+++ b/framework/base/src/types/interaction/contract_call_with_egld.rs
@@ -5,7 +5,10 @@ use crate::{
     types::{BigUint, ManagedAddress, ManagedBuffer},
 };
 
-use super::{contract_call_no_payment::ContractCallNoPayment, ContractCall};
+use super::{
+    contract_call_no_payment::ContractCallNoPayment, contract_call_trait::ContractCallBase,
+    ContractCall,
+};
 
 /// Holds data for calling another contract, with EGLD payment only.
 ///
@@ -24,7 +27,7 @@ where
     pub egld_payment: BigUint<SA>,
 }
 
-impl<SA, OriginalResult> ContractCall<SA> for ContractCallWithEgld<SA, OriginalResult>
+impl<SA, OriginalResult> ContractCallBase<SA> for ContractCallWithEgld<SA, OriginalResult>
 where
     SA: CallTypeApi + 'static,
     OriginalResult: TopEncodeMulti,
@@ -36,7 +39,13 @@ where
         // no ESDT, no conversion needed
         self
     }
+}
 
+impl<SA, OriginalResult> ContractCall<SA> for ContractCallWithEgld<SA, OriginalResult>
+where
+    SA: CallTypeApi + 'static,
+    OriginalResult: TopEncodeMulti,
+{
     #[inline]
     fn get_mut_basic(&mut self) -> &mut ContractCallNoPayment<SA, OriginalResult> {
         &mut self.basic
diff --git a/framework/base/src/types/interaction/contract_call_with_egld_or_single_esdt.rs b/framework/base/src/types/interaction/contract_call_with_egld_or_single_esdt.rs
index 66d0b27a41..843653a532 100644
--- a/framework/base/src/types/interaction/contract_call_with_egld_or_single_esdt.rs
+++ b/framework/base/src/types/interaction/contract_call_with_egld_or_single_esdt.rs
@@ -7,7 +7,10 @@ use crate::{
     },
 };
 
-use super::{contract_call_no_payment::ContractCallNoPayment, ContractCall, ContractCallWithEgld};
+use super::{
+    contract_call_no_payment::ContractCallNoPayment, contract_call_trait::ContractCallBase,
+    ContractCall, ContractCallWithEgld,
+};
 
 /// Holds data for calling another contract, with a single payment, either EGLD or a single ESDT token.
 ///
@@ -40,7 +43,8 @@ where
     }
 }
 
-impl<SA, OriginalResult> ContractCall<SA> for ContractCallWithEgldOrSingleEsdt<SA, OriginalResult>
+impl<SA, OriginalResult> ContractCallBase<SA>
+    for ContractCallWithEgldOrSingleEsdt<SA, OriginalResult>
 where
     SA: CallTypeApi + 'static,
     OriginalResult: TopEncodeMulti,
@@ -56,7 +60,13 @@ where
             self.into_normalized_esdt()
         }
     }
+}
 
+impl<SA, OriginalResult> ContractCall<SA> for ContractCallWithEgldOrSingleEsdt<SA, OriginalResult>
+where
+    SA: CallTypeApi + 'static,
+    OriginalResult: TopEncodeMulti,
+{
     #[inline]
     fn get_mut_basic(&mut self) -> &mut ContractCallNoPayment<SA, OriginalResult> {
         &mut self.basic
diff --git a/framework/base/src/types/interaction/contract_call_with_multi_esdt.rs b/framework/base/src/types/interaction/contract_call_with_multi_esdt.rs
index 240d4ac270..d93f023db9 100644
--- a/framework/base/src/types/interaction/contract_call_with_multi_esdt.rs
+++ b/framework/base/src/types/interaction/contract_call_with_multi_esdt.rs
@@ -7,7 +7,10 @@ use crate::{
     },
 };
 
-use super::{contract_call_no_payment::ContractCallNoPayment, ContractCall, ContractCallWithEgld};
+use super::{
+    contract_call_no_payment::ContractCallNoPayment, contract_call_trait::ContractCallBase,
+    ContractCall, ContractCallWithEgld,
+};
 
 #[must_use]
 pub struct ContractCallWithMultiEsdt<SA, OriginalResult>
@@ -18,7 +21,7 @@ where
     pub esdt_payments: ManagedVec<SA, EsdtTokenPayment<SA>>,
 }
 
-impl<SA, OriginalResult> ContractCall<SA> for ContractCallWithMultiEsdt<SA, OriginalResult>
+impl<SA, OriginalResult> ContractCallBase<SA> for ContractCallWithMultiEsdt<SA, OriginalResult>
 where
     SA: CallTypeApi + 'static,
     OriginalResult: TopEncodeMulti,
@@ -30,7 +33,13 @@ where
             .into_normalized()
             .convert_to_esdt_transfer_call(self.esdt_payments)
     }
+}
 
+impl<SA, OriginalResult> ContractCall<SA> for ContractCallWithMultiEsdt<SA, OriginalResult>
+where
+    SA: CallTypeApi + 'static,
+    OriginalResult: TopEncodeMulti,
+{
     #[inline]
     fn get_mut_basic(&mut self) -> &mut ContractCallNoPayment<SA, OriginalResult> {
         &mut self.basic
diff --git a/framework/base/src/types/interaction/mod.rs b/framework/base/src/types/interaction/mod.rs
index ebacd944c6..636f31738c 100644
--- a/framework/base/src/types/interaction/mod.rs
+++ b/framework/base/src/types/interaction/mod.rs
@@ -47,7 +47,7 @@ pub use callback_closure::{
 };
 pub use callback_selector_result::CallbackSelectorResult;
 pub use contract_call_no_payment::ContractCallNoPayment;
-pub use contract_call_trait::ContractCall;
+pub use contract_call_trait::{ContractCall, ContractCallBase};
 pub use contract_call_with_any_payment::ContractCallWithAnyPayment;
 pub use contract_call_with_egld::ContractCallWithEgld;
 pub use contract_call_with_egld_or_single_esdt::ContractCallWithEgldOrSingleEsdt;
diff --git a/framework/base/src/types/interaction/tx.rs b/framework/base/src/types/interaction/tx.rs
index 283a1c656d..82142e8c6f 100644
--- a/framework/base/src/types/interaction/tx.rs
+++ b/framework/base/src/types/interaction/tx.rs
@@ -2,18 +2,19 @@ use crate::{
     api::{self, CallTypeApi, ManagedTypeApi},
     contract_base::{BlockchainWrapper, SendRawWrapper},
     types::{
-        BigUint, CodeMetadata, EgldPayment, EsdtTokenPayment, ManagedAddress, ManagedBuffer,
-        ManagedVec, MultiEsdtPayment,
+        BigUint, CodeMetadata, EgldOrEsdtTokenPayment, EgldPayment, EsdtTokenPayment,
+        ManagedAddress, ManagedBuffer, ManagedVec, MultiEsdtPayment,
     },
 };
 use alloc::boxed::Box;
 use multiversx_sc_codec::TopEncodeMulti;
 
 use super::{
-    AsyncCall, DeployCall, ExplicitGas, FunctionCall, ManagedArgBuffer, OriginalResultMarker,
-    RHList, RHListAppendNoRet, RHListAppendRet, RHListItem, TxData, TxDataFunctionCall, TxEnv,
-    TxFrom, TxFromSpecified, TxGas, TxPayment, TxPaymentEgldOnly, TxResultHandler, TxScEnv, TxTo,
-    TxToSpecified,
+    contract_call_exec::UNSPECIFIED_GAS_LIMIT, contract_call_trait::ContractCallBase, AsyncCall,
+    ContractCallNoPayment, ContractCallWithEgld, DeployCall, ExplicitGas, FunctionCall,
+    ManagedArgBuffer, OriginalResultMarker, RHList, RHListAppendNoRet, RHListAppendRet, RHListItem,
+    TxData, TxDataFunctionCall, TxEnv, TxFrom, TxFromSpecified, TxGas, TxPayment,
+    TxPaymentEgldOnly, TxResultHandler, TxScEnv, TxTo, TxToSpecified,
 };
 
 #[must_use]
@@ -92,12 +93,10 @@ where
 {
     pub fn from<From>(self, from: From) -> Tx<Env, From, To, Payment, Gas, Data, RH>
     where
-        From: TxFromSpecified<Env>,
+        From: TxFrom<Env>,
     {
-        let mut env = self.env;
-        env.annotate_from(&from);
         Tx {
-            env,
+            env: self.env,
             from,
             to: self.to,
             payment: self.payment,
@@ -117,14 +116,15 @@ where
     Data: TxData<Env>,
     RH: TxResultHandler<Env>,
 {
+    /// Specifies the recipient of the transaction.
+    ///
+    /// Allows argument to also be `()`.
     pub fn to<To>(self, to: To) -> Tx<Env, From, To, Payment, Gas, Data, RH>
     where
-        To: TxToSpecified<Env>,
+        To: TxTo<Env>,
     {
-        let mut env = self.env;
-        env.annotate_to(&to);
         Tx {
-            env,
+            env: self.env,
             from: self.from,
             to,
             payment: self.payment,
@@ -163,6 +163,13 @@ where
             result_handler: self.result_handler,
         }
     }
+
+    pub fn with_egld_transfer(
+        self,
+        egld_amount: BigUint<Env::Api>,
+    ) -> Tx<Env, From, To, EgldPayment<Env::Api>, Gas, Data, RH> {
+        self.egld(egld_amount)
+    }
 }
 
 impl<Env, From, To, Gas, Data, RH> Tx<Env, From, To, (), Gas, Data, RH>
@@ -207,6 +214,37 @@ where
             result_handler: self.result_handler,
         }
     }
+
+    /// Backwards compatibility.
+    pub fn with_multi_token_transfer(
+        self,
+        payments: MultiEsdtPayment<Env::Api>, // TODO: references
+    ) -> Tx<Env, From, To, MultiEsdtPayment<Env::Api>, Gas, Data, RH> {
+        self.multi_esdt(payments)
+    }
+
+    pub fn egld_or_single_esdt<P: Into<EgldOrEsdtTokenPayment<Env::Api>>>(
+        self,
+        payment: P,
+    ) -> Tx<Env, From, To, EgldOrEsdtTokenPayment<Env::Api>, Gas, Data, RH> {
+        Tx {
+            env: self.env,
+            from: self.from,
+            to: self.to,
+            payment: payment.into(),
+            gas: self.gas,
+            data: self.data,
+            result_handler: self.result_handler,
+        }
+    }
+
+    /// Backwards compatibility.
+    pub fn with_egld_or_single_esdt_transfer<P: Into<EgldOrEsdtTokenPayment<Env::Api>>>(
+        self,
+        payment: P,
+    ) -> Tx<Env, From, To, EgldOrEsdtTokenPayment<Env::Api>, Gas, Data, RH> {
+        self.egld_or_single_esdt(payment)
+    }
 }
 
 impl<Env, From, To, Gas, Data, RH> Tx<Env, From, To, EsdtTokenPayment<Env::Api>, Gas, Data, RH>
@@ -288,43 +326,41 @@ where
     }
 }
 
-impl<Env, From, To, Payment, Gas> Tx<Env, From, To, Payment, Gas, (), ()>
+impl<Env, From, To, Payment, Gas, RH> Tx<Env, From, To, Payment, Gas, (), RH>
 where
     Env: TxEnv,
     From: TxFrom<Env>,
     To: TxTo<Env>,
     Payment: TxPayment<Env>,
     Gas: TxGas<Env>,
+    RH: TxResultHandler<Env>,
 {
     #[inline]
-    pub fn call<FC: Into<FunctionCall<Env::Api>>>(
-        self,
-        call: FC,
-    ) -> Tx<Env, From, To, Payment, Gas, FunctionCall<Env::Api>, ()> {
+    pub fn raw_call(self) -> Tx<Env, From, To, Payment, Gas, FunctionCall<Env::Api>, RH> {
         Tx {
             env: self.env,
             from: self.from,
             to: self.to,
             payment: self.payment,
             gas: self.gas,
-            data: call.into(),
-            result_handler: (),
+            data: FunctionCall::empty(),
+            result_handler: self.result_handler,
         }
     }
 
     #[inline]
-    pub fn function_name<N: Into<ManagedBuffer<Env::Api>>>(
+    pub fn function_call(
         self,
-        function_name: N,
-    ) -> Tx<Env, From, To, Payment, Gas, FunctionCall<Env::Api>, ()> {
+        call: FunctionCall<Env::Api>,
+    ) -> Tx<Env, From, To, Payment, Gas, FunctionCall<Env::Api>, RH> {
         Tx {
             env: self.env,
             from: self.from,
             to: self.to,
             payment: self.payment,
             gas: self.gas,
-            data: FunctionCall::new(function_name),
-            result_handler: (),
+            data: call,
+            result_handler: self.result_handler,
         }
     }
 }
@@ -338,6 +374,59 @@ where
     Gas: TxGas<Env>,
     RH: TxResultHandler<Env>,
 {
+    pub fn into_function_call(self) -> FunctionCall<Env::Api> {
+        self.data
+    }
+}
+
+impl<Env, From, Payment, Gas> Tx<Env, From, (), Payment, Gas, (), ()>
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    Payment: TxPayment<Env>,
+    Gas: TxGas<Env>,
+{
+    /// Merges the argument data into the current tx.
+    /// Used for function calls originating in proxies.
+    ///
+    /// Different environment in the argument allowed because of compatibility with old proxies.
+    ///
+    /// Method still subject to considerable change.
+    pub fn call<Env2, To, O>(
+        self,
+        call: Tx<Env2, (), To, (), (), FunctionCall<Env::Api>, OriginalResultMarker<O>>,
+    ) -> Tx<Env, From, To, Payment, Gas, FunctionCall<Env::Api>, OriginalResultMarker<O>>
+    where
+        Env2: TxEnv<Api = Env::Api>,
+        To: TxTo<Env> + TxTo<Env2>,
+    {
+        Tx {
+            env: self.env,
+            from: self.from,
+            to: call.to,
+            payment: self.payment,
+            gas: self.gas,
+            data: call.data,
+            result_handler: call.result_handler,
+        }
+    }
+}
+
+impl<Env, From, To, Payment, Gas, RH> Tx<Env, From, To, Payment, Gas, FunctionCall<Env::Api>, RH>
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Payment: TxPayment<Env>,
+    Gas: TxGas<Env>,
+    RH: TxResultHandler<Env>,
+{
+    #[inline]
+    pub fn function_name<N: Into<ManagedBuffer<Env::Api>>>(mut self, function_name: N) -> Self {
+        self.data.function_name = function_name.into();
+        self
+    }
+
     #[inline]
     pub fn argument<T: TopEncodeMulti>(mut self, arg: &T) -> Self {
         self.data = self.data.argument(arg);
@@ -467,6 +556,39 @@ where
     }
 }
 
+impl<Api, To, Payment, OriginalResult> ContractCallBase<Api>
+    for Tx<
+        TxScEnv<Api>,
+        (),
+        To,
+        Payment,
+        (),
+        FunctionCall<Api>,
+        OriginalResultMarker<OriginalResult>,
+    >
+where
+    Api: CallTypeApi + 'static,
+    To: TxToSpecified<TxScEnv<Api>>,
+    Payment: TxPayment<TxScEnv<Api>>,
+    OriginalResult: TopEncodeMulti,
+{
+    type OriginalResult = OriginalResult;
+
+    fn into_normalized(self) -> ContractCallWithEgld<Api, OriginalResult> {
+        let normalized = self.normalize_tx();
+        ContractCallWithEgld {
+            basic: ContractCallNoPayment {
+                _phantom: core::marker::PhantomData,
+                to: normalized.to,
+                function_call: normalized.data,
+                explicit_gas_limit: UNSPECIFIED_GAS_LIMIT,
+                _return_type: core::marker::PhantomData,
+            },
+            egld_payment: normalized.payment.value,
+        }
+    }
+}
+
 impl<Env, Payment, Gas, Data> Tx<Env, (), (), Payment, Gas, Data, ()>
 where
     Env: TxEnv,
@@ -474,7 +596,7 @@ where
     Gas: TxGas<Env>,
     Data: TxData<Env>,
 {
-    pub fn deploy(self) -> Tx<Env, (), (), Payment, Gas, DeployCall<Env>, ()> {
+    pub fn raw_deploy(self) -> Tx<Env, (), (), Payment, Gas, DeployCall<Env>, ()> {
         Tx {
             env: self.env,
             from: self.from,
diff --git a/framework/base/src/types/interaction/tx_call_async.rs b/framework/base/src/types/interaction/tx_call_async.rs
index c1035b902b..0b283db590 100644
--- a/framework/base/src/types/interaction/tx_call_async.rs
+++ b/framework/base/src/types/interaction/tx_call_async.rs
@@ -5,8 +5,8 @@ use crate::{
 };
 
 use super::{
-    Tx, TxData, TxDataFunctionCall, TxEnv, TxFrom, TxGas, TxPayment, TxResultHandler, TxScEnv,
-    TxTo, TxToSpecified,
+    OriginalResultMarker, Tx, TxData, TxDataFunctionCall, TxEnv, TxFrom, TxGas, TxPayment,
+    TxResultHandler, TxScEnv, TxTo, TxToSpecified,
 };
 
 pub trait TxAsyncCallCallback<Api>: TxResultHandler<TxScEnv<Api>>
@@ -23,6 +23,13 @@ where
     fn save_callback_closure_to_storage(&self) {}
 }
 
+impl<Api, O> TxAsyncCallCallback<Api> for OriginalResultMarker<O>
+where
+    Api: CallTypeApi,
+{
+    fn save_callback_closure_to_storage(&self) {}
+}
+
 impl<Api> TxResultHandler<TxScEnv<Api>> for CallbackClosure<Api>
 where
     Api: CallTypeApi,
@@ -57,17 +64,42 @@ where
     }
 }
 
-impl<Api, From, To, Payment, Gas, Data> Tx<TxScEnv<Api>, From, To, Payment, Gas, Data, ()>
+impl<Api, To, Payment, Gas, Data> Tx<TxScEnv<Api>, (), To, Payment, Gas, Data, ()>
 where
     Api: CallTypeApi,
-    From: TxFrom<TxScEnv<Api>>,
     To: TxTo<TxScEnv<Api>>,
     Payment: TxPayment<TxScEnv<Api>>,
     Gas: TxGas<TxScEnv<Api>>,
     Data: TxData<TxScEnv<Api>>,
 {
     #[inline]
-    pub fn callback<RH>(self, callback: RH) -> Tx<TxScEnv<Api>, From, To, Payment, Gas, Data, RH>
+    pub fn callback<RH>(self, callback: RH) -> Tx<TxScEnv<Api>, (), To, Payment, Gas, Data, RH>
+    where
+        RH: TxAsyncCallCallback<Api>,
+    {
+        Tx {
+            env: self.env,
+            from: self.from,
+            to: self.to,
+            payment: self.payment,
+            gas: self.gas,
+            data: self.data,
+            result_handler: callback,
+        }
+    }
+}
+
+impl<Api, To, Payment, Gas, FC, OriginalResult>
+    Tx<TxScEnv<Api>, (), To, Payment, Gas, FC, OriginalResultMarker<OriginalResult>>
+where
+    Api: CallTypeApi,
+    To: TxToSpecified<TxScEnv<Api>>,
+    Payment: TxPayment<TxScEnv<Api>>,
+    Gas: TxGas<TxScEnv<Api>>,
+    FC: TxDataFunctionCall<TxScEnv<Api>>,
+{
+    /// Backwards compatibility.
+    pub fn with_callback<RH>(self, callback: RH) -> Tx<TxScEnv<Api>, (), To, Payment, Gas, FC, RH>
     where
         RH: TxAsyncCallCallback<Api>,
     {
@@ -101,4 +133,33 @@ where
             &normalized.data.arg_buffer,
         )
     }
+
+    pub fn call_and_exit(self) -> ! {
+        self.async_call_and_exit()
+    }
+}
+
+impl<Env, From, To, Payment, Gas, Data, RH> Tx<Env, From, To, Payment, Gas, Data, RH>
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Payment: TxPayment<Env>,
+    Gas: TxGas<Env>,
+    Data: TxData<Env>,
+    RH: TxResultHandler<Env>,
+{
+    /// Backwards compatibility only.
+    #[inline]
+    pub fn async_call(self) -> Tx<Env, From, To, Payment, Gas, Data, RH> {
+        Tx {
+            env: self.env,
+            from: self.from,
+            to: self.to,
+            payment: self.payment,
+            gas: self.gas,
+            data: self.data,
+            result_handler: self.result_handler,
+        }
+    }
 }
diff --git a/framework/base/src/types/interaction/tx_call_async_promises.rs b/framework/base/src/types/interaction/tx_call_async_promises.rs
index a97fdeb858..acf23e030d 100644
--- a/framework/base/src/types/interaction/tx_call_async_promises.rs
+++ b/framework/base/src/types/interaction/tx_call_async_promises.rs
@@ -5,8 +5,8 @@ use crate::{
 };
 
 use super::{
-    callback_closure::CallbackClosureWithGas, ExplicitGas, FunctionCall, Tx, TxGas, TxPayment,
-    TxResultHandler, TxScEnv, TxToSpecified,
+    callback_closure::CallbackClosureWithGas, ExplicitGas, FunctionCall, OriginalResultMarker, Tx,
+    TxGas, TxPayment, TxResultHandler, TxScEnv, TxToSpecified,
 };
 
 pub trait TxPromisesCallback<Api>: TxResultHandler<TxScEnv<Api>>
@@ -37,6 +37,23 @@ where
     }
 }
 
+impl<Api, O> TxPromisesCallback<Api> for OriginalResultMarker<O>
+where
+    Api: CallTypeApi,
+{
+    fn callback_name(&self) -> &'static str {
+        ""
+    }
+
+    fn overwrite_with_serialized_args(&self, cb_closure_args_serialized: &mut ManagedBuffer<Api>) {
+        cb_closure_args_serialized.overwrite(&[]);
+    }
+
+    fn gas_for_callback(&self) -> u64 {
+        0
+    }
+}
+
 impl<Api> TxResultHandler<TxScEnv<Api>> for CallbackClosureWithGas<Api>
 where
     Api: CallTypeApi,
@@ -89,6 +106,15 @@ where
             },
         }
     }
+
+    /// Backwards compatibility.
+    pub fn with_extra_gas_for_callback(
+        self,
+        gas: u64,
+    ) -> Tx<TxScEnv<Api>, (), To, Payment, Gas, FunctionCall<Api>, CallbackClosureWithGas<Api>>
+    {
+        self.gas_for_callback(gas)
+    }
 }
 
 impl<Api, To, Payment, Callback>
@@ -99,7 +125,7 @@ where
     Payment: TxPayment<TxScEnv<Api>>,
     Callback: TxPromisesCallback<Api>,
 {
-    pub fn async_call_promise(self) {
+    pub fn register_promise(self) {
         let callback_name = self.result_handler.callback_name();
         let mut cb_closure_args_serialized =
             ManagedBuffer::<Api>::from_raw_handle(const_handles::MBUF_TEMPORARY_1);
@@ -122,3 +148,20 @@ where
         )
     }
 }
+
+impl<Api, To, Payment, Gas, Callback>
+    Tx<TxScEnv<Api>, (), To, Payment, Gas, FunctionCall<Api>, Callback>
+where
+    Api: CallTypeApi,
+    To: TxToSpecified<TxScEnv<Api>>,
+    Payment: TxPayment<TxScEnv<Api>>,
+    Gas: TxGas<TxScEnv<Api>>,
+    Payment: TxPayment<TxScEnv<Api>>,
+    Callback: TxPromisesCallback<Api>,
+{
+    /// Backwards compatibility only.
+    #[inline]
+    pub fn async_call_promise(self) -> Self {
+        self
+    }
+}
diff --git a/framework/base/src/types/interaction/tx_call_sync.rs b/framework/base/src/types/interaction/tx_call_sync.rs
index c02452baae..2aaef2c26c 100644
--- a/framework/base/src/types/interaction/tx_call_sync.rs
+++ b/framework/base/src/types/interaction/tx_call_sync.rs
@@ -1,3 +1,5 @@
+use multiversx_sc_codec::TopDecodeMulti;
+
 use crate::{
     api::CallTypeApi,
     contract_base::SendRawWrapper,
@@ -6,8 +8,8 @@ use crate::{
 };
 
 use super::{
-    ConsNoRet, ConsRet, OriginalResultMarker, RHList, RHListItem, Tx, TxDataFunctionCall, TxEnv,
-    TxGas, TxPayment, TxScEnv, TxToSpecified,
+    contract_call_exec::decode_result, BackTransfers, ConsNoRet, ConsRet, OriginalResultMarker,
+    RHList, RHListItem, Tx, TxDataFunctionCall, TxEnv, TxGas, TxPayment, TxScEnv, TxToSpecified,
 };
 
 pub trait RHListItemSync<Env, Original>: RHListItem<Env, Original>
@@ -93,7 +95,7 @@ where
     RH: RHListSync<TxScEnv<Api>>,
     RH::ListReturns: NestedTupleFlatten,
 {
-    pub fn execute_on_dest_context(self) -> <RH::ListReturns as NestedTupleFlatten>::Unpacked {
+    fn execute_sync_call_raw(self) -> (ManagedVec<Api, ManagedBuffer<Api>>, RH) {
         let gas_limit = self.gas.resolve_gas(&self.env);
         let normalized = self.normalize_tx();
 
@@ -107,7 +109,46 @@ where
 
         SendRawWrapper::<Api>::new().clean_return_data();
 
-        let tuple_result = normalized.result_handler.list_sync_call_result(&raw_result);
+        (raw_result, normalized.result_handler)
+    }
+
+    pub fn sync_call(self) -> <RH::ListReturns as NestedTupleFlatten>::Unpacked {
+        let (raw_result, result_handler) = self.execute_sync_call_raw();
+
+        let tuple_result = result_handler.list_sync_call_result(&raw_result);
         tuple_result.flatten_unpack()
     }
 }
+
+impl<Api, To, Payment, Gas, FC, OriginalResult>
+    Tx<TxScEnv<Api>, (), To, Payment, Gas, FC, OriginalResultMarker<OriginalResult>>
+where
+    Api: CallTypeApi,
+    To: TxToSpecified<TxScEnv<Api>>,
+    Payment: TxPayment<TxScEnv<Api>>,
+    Gas: TxGas<TxScEnv<Api>>,
+    FC: TxDataFunctionCall<TxScEnv<Api>>,
+{
+    /// Backwards compatibility.
+    pub fn execute_on_dest_context<RequestedResult>(self) -> RequestedResult
+    where
+        RequestedResult: TopDecodeMulti,
+    {
+        let (raw_result, _) = self.execute_sync_call_raw();
+        decode_result(raw_result)
+    }
+
+    /// Backwards compatibility.
+    pub fn execute_on_dest_context_with_back_transfers<RequestedResult>(
+        self,
+    ) -> (RequestedResult, BackTransfers<Api>)
+    where
+        RequestedResult: TopDecodeMulti,
+    {
+        let result = self.execute_on_dest_context();
+        let back_transfers =
+            crate::contract_base::BlockchainWrapper::<Api>::new().get_back_transfers();
+
+        (result, back_transfers)
+    }
+}
diff --git a/framework/base/src/types/interaction/tx_call_te.rs b/framework/base/src/types/interaction/tx_call_te.rs
index 9a08d5cbb5..0f1157d570 100644
--- a/framework/base/src/types/interaction/tx_call_te.rs
+++ b/framework/base/src/types/interaction/tx_call_te.rs
@@ -1,8 +1,11 @@
 use crate::api::CallTypeApi;
 
-use super::{FunctionCall, Tx, TxData, TxFrom, TxGas, TxPayment, TxScEnv, TxToSpecified};
+use super::{
+    FunctionCall, Tx, TxData, TxEmptyResultHandler, TxFrom, TxGas, TxPayment, TxScEnv,
+    TxToSpecified,
+};
 
-impl<Api, From, To, Payment, Gas, FC> Tx<TxScEnv<Api>, From, To, Payment, Gas, FC, ()>
+impl<Api, From, To, Payment, Gas, FC, RH> Tx<TxScEnv<Api>, From, To, Payment, Gas, FC, RH>
 where
     Api: CallTypeApi,
     From: TxFrom<TxScEnv<Api>>,
@@ -10,6 +13,7 @@ where
     Payment: TxPayment<TxScEnv<Api>>,
     Gas: TxGas<TxScEnv<Api>>,
     FC: TxData<TxScEnv<Api>> + Into<FunctionCall<Api>>,
+    RH: TxEmptyResultHandler<TxScEnv<Api>>,
 {
     fn transfer_execute_with_gas(self, gas_limit: u64) {
         self.to.with_value_ref(|to| {
diff --git a/framework/base/src/types/interaction/tx_result_handler.rs b/framework/base/src/types/interaction/tx_result_handler.rs
index 838e9fa4d8..311679c442 100644
--- a/framework/base/src/types/interaction/tx_result_handler.rs
+++ b/framework/base/src/types/interaction/tx_result_handler.rs
@@ -13,3 +13,14 @@ where
 {
     type OriginalResult = ();
 }
+
+/// Indicates that given result handler is empty, i.e. doesn't cause any side effects and returns nothing.
+///
+/// Implemented for `()` and `OriginalResultMarker`.
+pub trait TxEmptyResultHandler<Env>: TxResultHandler<Env>
+where
+    Env: TxEnv,
+{
+}
+
+impl<Env> TxEmptyResultHandler<Env> for () where Env: TxEnv {}
diff --git a/framework/base/src/types/interaction/tx_rh_original_result.rs b/framework/base/src/types/interaction/tx_rh_original_result.rs
index e402b1686a..cfbe36aef8 100644
--- a/framework/base/src/types/interaction/tx_rh_original_result.rs
+++ b/framework/base/src/types/interaction/tx_rh_original_result.rs
@@ -1,6 +1,6 @@
 use core::marker::PhantomData;
 
-use super::{TxEnv, TxResultHandler};
+use super::{TxEmptyResultHandler, TxEnv, TxResultHandler};
 
 /// Contains no data.
 ///
@@ -32,3 +32,5 @@ where
 {
     type OriginalResult = O;
 }
+
+impl<Env, O> TxEmptyResultHandler<Env> for OriginalResultMarker<O> where Env: TxEnv {}
diff --git a/framework/derive/src/generate/proxy_gen.rs b/framework/derive/src/generate/proxy_gen.rs
index bc44d03b95..9fcdf60490 100644
--- a/framework/derive/src/generate/proxy_gen.rs
+++ b/framework/derive/src/generate/proxy_gen.rs
@@ -45,6 +45,24 @@ pub fn proxy_arg_gen(
 }
 
 pub fn generate_proxy_method_sig(
+    method: &Method,
+    return_type: proc_macro2::TokenStream,
+) -> proc_macro2::TokenStream {
+    let method_name = &method.name;
+    let mut generics = method.generics.clone();
+    let generics_where = &method.generics.where_clause;
+    let arg_decl = proxy_arg_gen(&method.method_args, &mut generics);
+    let result = quote! {
+        fn #method_name #generics (
+            &mut self,
+            #(#arg_decl),*
+        ) -> #return_type
+        #generics_where
+    };
+    result
+}
+
+pub fn generate_proxy_method_sig_old(
     method: &Method,
     proxy_return_struct_path: proc_macro2::TokenStream,
 ) -> proc_macro2::TokenStream {
@@ -67,6 +85,11 @@ pub fn generate_proxy_method_sig(
 }
 
 pub fn generate_proxy_endpoint(m: &Method, endpoint_name: String) -> proc_macro2::TokenStream {
+    let original_type = match &m.return_type {
+        syn::ReturnType::Default => quote! { () },
+        syn::ReturnType::Type(_, ty) => quote! { #ty },
+    };
+
     let mut token_count = 0;
     let mut token_expr =
         quote! { multiversx_sc::types::EgldOrEsdtTokenIdentifier::<Self::Api>::egld() };
@@ -84,7 +107,7 @@ pub fn generate_proxy_endpoint(m: &Method, endpoint_name: String) -> proc_macro2
             ArgPaymentMetadata::NotPayment => {
                 let pat = &arg.pat;
                 arg_push_snippets.push(quote! {
-                    multiversx_sc::types::ContractCall::proxy_arg(&mut ___contract_call___, &#pat);
+                    .argument(&#pat)
                 });
             },
             ArgPaymentMetadata::PaymentToken => {
@@ -127,62 +150,58 @@ pub fn generate_proxy_endpoint(m: &Method, endpoint_name: String) -> proc_macro2
         "No more than one payment multi argument allowed in call proxy"
     );
 
-    let contract_call_type;
-    let contract_call_init;
+    let payment_type;
+    let payment_init;
     if token_count > 0 || nonce_count > 0 || payment_count > 0 {
         assert!(multi_count == 0, "#[payment_multi] cannot coexist with any other payment annotation in the same endpoint");
 
         if token_count == 0 && nonce_count == 0 {
-            contract_call_type = quote! { multiversx_sc::types::ContractCallWithEgld };
-            contract_call_init = quote! {
-                let mut ___contract_call___ = multiversx_sc::types::ContractCallWithEgld::new(
-                    ___address___,
-                    #endpoint_name,
-                    #payment_expr,
-                );
-            };
+            payment_type = quote! { multiversx_sc::types::EgldPayment<Self::Api> };
+            payment_init = quote! { .egld(#payment_expr) };
         } else {
-            contract_call_type = quote! { multiversx_sc::types::ContractCallWithEgldOrSingleEsdt };
-            contract_call_init = quote! {
-                let mut ___contract_call___ = multiversx_sc::types::ContractCallWithEgldOrSingleEsdt::new(
-                    ___address___,
-                    #endpoint_name,
+            payment_type = quote! { multiversx_sc::types::EgldOrEsdtTokenPayment<Self::Api> };
+            payment_init = quote! { .egld_or_single_esdt(
+                multiversx_sc::types::EgldOrEsdtTokenPayment::new(
                     #token_expr,
                     #nonce_expr,
                     #payment_expr,
-                );
-            };
+                )
+            )};
         }
     } else if multi_count > 0 {
         let multi_expr = multi_expr_opt.unwrap();
-        contract_call_type = quote! { multiversx_sc::types::ContractCallWithMultiEsdt };
-        contract_call_init = quote! {
-            let mut ___contract_call___ = multiversx_sc::types::ContractCallWithMultiEsdt::new(
-                ___address___,
-                #endpoint_name,
-                #multi_expr.clone_value(),
-            );
-        };
+        payment_type = quote! { MultiEsdtPayment<Self::Api> };
+        payment_init = quote! { .multi_esdt(#multi_expr.clone_value()) };
     } else {
-        contract_call_type = quote! { multiversx_sc::types::ContractCallNoPayment };
-        contract_call_init = quote! {
-            let mut ___contract_call___ = multiversx_sc::types::ContractCallNoPayment::new(
-                ___address___,
-                #endpoint_name,
-            );
-        };
+        payment_type = quote! { () };
+        payment_init = quote! {};
     }
 
-    let msig = generate_proxy_method_sig(m, contract_call_type);
+    let return_type = quote! {
+        multiversx_sc::types::Tx<
+            multiversx_sc::types::TxScEnv<Self::Api>,
+            (),
+            Self::To,
+            #payment_type,
+            (),
+            multiversx_sc::types::FunctionCall<Self::Api>,
+            multiversx_sc::types::OriginalResultMarker<#original_type>,
+        >
+    };
+
+    let msig = generate_proxy_method_sig(m, return_type);
 
     let sig = quote! {
         #[allow(clippy::too_many_arguments)]
         #[allow(clippy::type_complexity)]
         #msig {
-            let ___address___ = self.extract_address();
-            #contract_call_init
-            #(#arg_push_snippets)*
-            ___contract_call___
+            multiversx_sc::types::TxBaseWithEnv::new_tx_from_sc()
+                .to(self.extract_proxy_to())
+                .original_result()
+                .raw_call()
+                .function_name(#endpoint_name)
+                #payment_init
+                #(#arg_push_snippets)*
         }
     };
 
@@ -191,7 +210,7 @@ pub fn generate_proxy_endpoint(m: &Method, endpoint_name: String) -> proc_macro2
 
 pub fn generate_proxy_deploy(init_method: &Method) -> proc_macro2::TokenStream {
     let msig =
-        generate_proxy_method_sig(init_method, quote! { multiversx_sc::types::ContractDeploy });
+        generate_proxy_method_sig_old(init_method, quote! { multiversx_sc::types::ContractDeploy });
 
     let mut payment_count = 0;
     let mut multi_count = 0;
diff --git a/framework/derive/src/generate/snippets.rs b/framework/derive/src/generate/snippets.rs
index dbe4717b55..6e66eb9ae4 100644
--- a/framework/derive/src/generate/snippets.rs
+++ b/framework/derive/src/generate/snippets.rs
@@ -81,13 +81,14 @@ pub fn proxy_object_def() -> proc_macro2::TokenStream {
         {
             _phantom: core::marker::PhantomData<A>,
         }
-    
+
         impl<A> multiversx_sc::contract_base::ProxyObjBase for Proxy<A>
         where
             A: multiversx_sc::api::VMApi + 'static,
         {
             type Api = A;
-    
+            type To = ();
+
             fn extract_opt_address(
                 &mut self,
             ) -> multiversx_sc::types::ManagedOption<
@@ -96,34 +97,36 @@ pub fn proxy_object_def() -> proc_macro2::TokenStream {
             > {
                 multiversx_sc::types::ManagedOption::none()
             }
-    
+
             fn extract_address(&mut self) -> multiversx_sc::types::ManagedAddress<Self::Api> {
                 multiversx_sc::api::ErrorApiImpl::signal_error(
                     &<A as multiversx_sc::api::ErrorApi>::error_api_impl(),
                     multiversx_sc::err_msg::RECIPIENT_ADDRESS_NOT_SET.as_bytes(),
                 )
             }
+
+            fn extract_proxy_to(&mut self) -> Self::To {}
         }
-    
+
         impl<A> multiversx_sc::contract_base::ProxyObjNew for Proxy<A>
         where
             A: multiversx_sc::api::VMApi + 'static,
         {
             type ProxyTo = ProxyTo<A>;
-    
+
             fn new_proxy_obj() -> Self {
                 Proxy {
                     _phantom: core::marker::PhantomData,
                 }
             }
-    
+
             fn contract(mut self, address: multiversx_sc::types::ManagedAddress<Self::Api>) -> Self::ProxyTo {
                 ProxyTo {
                     address: multiversx_sc::types::ManagedOption::some(address)
                 }
             }
         }
-    
+
         pub struct ProxyTo<A>
         where
             A: multiversx_sc::api::VMApi + 'static,
@@ -131,13 +134,14 @@ pub fn proxy_object_def() -> proc_macro2::TokenStream {
             pub address:
                 multiversx_sc::types::ManagedOption<A, multiversx_sc::types::ManagedAddress<A>>,
         }
-    
+
         impl<A> multiversx_sc::contract_base::ProxyObjBase for ProxyTo<A>
         where
             A: multiversx_sc::api::VMApi + 'static,
         {
             type Api = A;
-    
+            type To = multiversx_sc::types::ManagedAddress<A>;
+
             fn extract_opt_address(
                 &mut self,
             ) -> multiversx_sc::types::ManagedOption<
@@ -149,7 +153,7 @@ pub fn proxy_object_def() -> proc_macro2::TokenStream {
                     multiversx_sc::types::ManagedOption::none(),
                 )
             }
-    
+
             fn extract_address(&mut self) -> multiversx_sc::types::ManagedAddress<Self::Api> {
                 let address = core::mem::replace(
                     &mut self.address,
@@ -157,6 +161,10 @@ pub fn proxy_object_def() -> proc_macro2::TokenStream {
                 );
                 address.unwrap_or_sc_panic(multiversx_sc::err_msg::RECIPIENT_ADDRESS_NOT_SET)
             }
+
+            fn extract_proxy_to(&mut self) -> Self::To {
+                self.extract_address()
+            }
         }
     }
 }
diff --git a/framework/scenario/src/facade/world_tx/scenario_tx.rs b/framework/scenario/src/facade/world_tx/scenario_tx.rs
index cfad562838..403116c825 100644
--- a/framework/scenario/src/facade/world_tx/scenario_tx.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_tx.rs
@@ -1,6 +1,8 @@
 use multiversx_sc::{
     tuple_util::NestedTupleFlatten,
-    types::{FunctionCall, RHListSync, Tx, TxFromSpecified, TxGas, TxPayment, TxToSpecified},
+    types::{
+        FunctionCall, RHListSync, Tx, TxEnv, TxFromSpecified, TxGas, TxPayment, TxToSpecified,
+    },
 };
 
 use crate::{api::StaticApi, scenario_model::ScCallStep, ScenarioWorld};
@@ -56,6 +58,8 @@ where
 
     fn run_as_scenario_step(self, world: &mut ScenarioWorld) -> Self::Returns {
         let mut env = self.env;
+        env.annotate_from(&self.from);
+        env.annotate_to(&self.to);
         let mut step = ScCallStep::new()
             .from(env.from_annotation.as_ref().unwrap().as_str())
             .to(env.to_annotation.as_ref().unwrap().as_str())
diff --git a/framework/scenario/src/scenario/model/step/sc_call_step.rs b/framework/scenario/src/scenario/model/step/sc_call_step.rs
index f18bf4c2c5..e971cbaf23 100644
--- a/framework/scenario/src/scenario/model/step/sc_call_step.rs
+++ b/framework/scenario/src/scenario/model/step/sc_call_step.rs
@@ -1,4 +1,4 @@
-use multiversx_sc::types::H256;
+use multiversx_sc::types::{ContractCallBase, H256};
 
 use crate::{
     api::StaticApi,
@@ -138,7 +138,7 @@ impl ScCallStep {
     /// - "arguments"
     pub fn call<CC>(mut self, contract_call: CC) -> TypedScCall<CC::OriginalResult>
     where
-        CC: ContractCall<StaticApi>,
+        CC: ContractCallBase<StaticApi>,
     {
         let (to_str, function, egld_value_expr, scenario_args) =
             process_contract_call(contract_call);
@@ -224,7 +224,7 @@ pub(super) fn process_contract_call<CC>(
     contract_call: CC,
 ) -> (String, String, BigUintValue, Vec<String>)
 where
-    CC: ContractCall<StaticApi>,
+    CC: ContractCallBase<StaticApi>,
 {
     let normalized_cc = contract_call.into_normalized();
     let to_str = format!(
diff --git a/framework/scenario/src/scenario/model/step/sc_query_step.rs b/framework/scenario/src/scenario/model/step/sc_query_step.rs
index a3ada3b83b..8e62ff5473 100644
--- a/framework/scenario/src/scenario/model/step/sc_query_step.rs
+++ b/framework/scenario/src/scenario/model/step/sc_query_step.rs
@@ -1,4 +1,4 @@
-use multiversx_sc::types::H256;
+use multiversx_sc::types::{ContractCallBase, H256};
 use num_traits::Zero;
 
 use crate::{
@@ -67,7 +67,7 @@ impl ScQueryStep {
     /// - "arguments"
     pub fn call<CC>(mut self, contract_call: CC) -> TypedScQuery<CC::OriginalResult>
     where
-        CC: ContractCall<StaticApi>,
+        CC: ContractCallBase<StaticApi>,
     {
         let (to_str, function, egld_value_expr, mandos_args) = process_contract_call(contract_call);
         assert!(
diff --git a/framework/scenario/tests/contract_without_macros.rs b/framework/scenario/tests/contract_without_macros.rs
index e58dcfb9ee..32779c7ba1 100644
--- a/framework/scenario/tests/contract_without_macros.rs
+++ b/framework/scenario/tests/contract_without_macros.rs
@@ -340,6 +340,7 @@ mod sample_adder {
         A: multiversx_sc::api::VMApi + 'static,
     {
         type Api = A;
+        type To = ();
 
         fn extract_opt_address(
             &mut self,
@@ -356,6 +357,8 @@ mod sample_adder {
                 multiversx_sc::err_msg::RECIPIENT_ADDRESS_NOT_SET.as_bytes(),
             )
         }
+
+        fn extract_proxy_to(&mut self) -> Self::To {}
     }
 
     impl<A> multiversx_sc::contract_base::ProxyObjNew for Proxy<A>
@@ -370,9 +373,12 @@ mod sample_adder {
             }
         }
 
-        fn contract(mut self, address: multiversx_sc::types::ManagedAddress<Self::Api>) -> Self::ProxyTo {
+        fn contract(
+            mut self,
+            address: multiversx_sc::types::ManagedAddress<Self::Api>,
+        ) -> Self::ProxyTo {
             ProxyTo {
-                address: multiversx_sc::types::ManagedOption::some(address)
+                address: multiversx_sc::types::ManagedOption::some(address),
             }
         }
     }
@@ -390,6 +396,7 @@ mod sample_adder {
         A: multiversx_sc::api::VMApi + 'static,
     {
         type Api = A;
+        type To = multiversx_sc::types::ManagedAddress<A>;
 
         fn extract_opt_address(
             &mut self,
@@ -410,6 +417,10 @@ mod sample_adder {
             );
             address.unwrap_or_sc_panic(multiversx_sc::err_msg::RECIPIENT_ADDRESS_NOT_SET)
         }
+
+        fn extract_proxy_to(&mut self) -> Self::To {
+            self.extract_address()
+        }
     }
 
     impl<A> super::module_1::ProxyTrait for Proxy<A> where A: multiversx_sc::api::VMApi {}
diff --git a/framework/snippets/src/interactor_sc_extra.rs b/framework/snippets/src/interactor_sc_extra.rs
index 177b38d4e1..277adcd6e9 100644
--- a/framework/snippets/src/interactor_sc_extra.rs
+++ b/framework/snippets/src/interactor_sc_extra.rs
@@ -3,7 +3,7 @@ use multiversx_sc_scenario::{
     api::StaticApi,
     multiversx_sc::{
         codec::{CodecFrom, TopEncodeMulti},
-        types::{Address, ContractCall},
+        types::{Address, ContractCallBase},
     },
     scenario_model::{
         ScCallStep, ScDeployStep, ScQueryStep, TxResponse, TypedResponse, TypedScCall,
@@ -98,7 +98,7 @@ impl Interactor {
 
     pub async fn quick_query<CC, RequestedResult>(&mut self, contract_call: CC) -> RequestedResult
     where
-        CC: ContractCall<StaticApi>,
+        CC: ContractCallBase<StaticApi>,
         RequestedResult: CodecFrom<CC::OriginalResult>,
     {
         let mut typed_sc_query = ScQueryStep::new().call(contract_call);

From e9789928be9aa960da4213dee5c65ad968342bcf Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 14 Feb 2024 14:07:53 +0200
Subject: [PATCH 0348/1254] cleanup

---
 .../examples/multisig/tests/multisig_blackbox_test.rs    | 2 --
 framework/base/src/types/interaction/async_call.rs       | 9 ---------
 2 files changed, 11 deletions(-)

diff --git a/contracts/examples/multisig/tests/multisig_blackbox_test.rs b/contracts/examples/multisig/tests/multisig_blackbox_test.rs
index f614d39062..1b3229318d 100644
--- a/contracts/examples/multisig/tests/multisig_blackbox_test.rs
+++ b/contracts/examples/multisig/tests/multisig_blackbox_test.rs
@@ -126,12 +126,10 @@ impl MultisigTestState {
     fn propose_add_board_member(&mut self, board_member_address: Address) -> usize {
         self.world.tx_return(|tx| {
             tx.from(AddressExpr("proposer"))
-                // .to(ScExpr("multisig"))
                 .call(
                     self.multisig_contract
                         .propose_add_board_member(board_member_address),
                 )
-                // .original_result::<usize>()
                 .returns(ReturnsExact)
         })
     }
diff --git a/framework/base/src/types/interaction/async_call.rs b/framework/base/src/types/interaction/async_call.rs
index 94756810b1..5c3b60a41f 100644
--- a/framework/base/src/types/interaction/async_call.rs
+++ b/framework/base/src/types/interaction/async_call.rs
@@ -34,12 +34,3 @@ where
         self.async_call_and_exit()
     }
 }
-
-// impl<Api> AsyncCall<Api>
-// where
-//     Api: CallTypeApi + StorageWriteApi,
-// {
-//     pub fn call_and_exit(self) -> ! {
-//         self.async_call_and_exit()
-//     }
-// }

From 710f8dc1e2b8ece45b00398e3af7f8b42068c304 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Wed, 14 Feb 2024 17:08:34 +0200
Subject: [PATCH 0349/1254] minor changes

---
 .../meta/src/cli_args/cli_args_contract.rs    | 34 ++++++++++++++-----
 .../generate_proxy/proxy_crate_gen.rs         |  2 +-
 .../contract/generate_proxy/proxy_gen_main.rs |  4 +--
 .../generate_snippets/snippet_gen_main.rs     |  4 +--
 4 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/framework/meta/src/cli_args/cli_args_contract.rs b/framework/meta/src/cli_args/cli_args_contract.rs
index 4d89137b29..37cda6afdc 100644
--- a/framework/meta/src/cli_args/cli_args_contract.rs
+++ b/framework/meta/src/cli_args/cli_args_contract.rs
@@ -65,13 +65,13 @@ pub enum ContractCliAction {
         name = "snippets",
         about = "Generates a snippets project, based on the contract ABI."
     )]
-    GenerateSnippets(GenerateOverwriteArg),
+    GenerateSnippets(GenerateSnippetsArgs),
 
     #[command(
         name = "proxy",
         about = "Generates a proxy, based on the contract ABI."
     )]
-    GenerateProxies(GenerateOverwriteArg),
+    GenerateProxies(GenerateProxyArgs),
 }
 
 impl CliArgsToRaw for ContractCliAction {
@@ -99,13 +99,13 @@ impl CliArgsToRaw for ContractCliAction {
             ContractCliAction::Update => {
                 raw.push("update".to_string());
             },
-            ContractCliAction::GenerateSnippets(arg) => {
+            ContractCliAction::GenerateSnippets(args) => {
                 raw.push("snippets".to_string());
-                raw.append(&mut arg.to_raw());
+                raw.append(&mut args.to_raw());
             },
-            ContractCliAction::GenerateProxies(arg) => {
+            ContractCliAction::GenerateProxies(args) => {
                 raw.push("proxy".to_string());
-                raw.append(&mut arg.to_raw());
+                raw.append(&mut args.to_raw());
             },
         }
         raw
@@ -113,13 +113,29 @@ impl CliArgsToRaw for ContractCliAction {
 }
 
 #[derive(Default, Clone, PartialEq, Eq, Debug, Args)]
-pub struct GenerateOverwriteArg {
-    /// Override file if it already exists.
+pub struct GenerateSnippetsArgs {
+    /// Override snippets project if it already exists.
+    #[arg(long, verbatim_doc_comment)]
+    pub overwrite: bool,
+}
+
+impl CliArgsToRaw for GenerateSnippetsArgs {
+    fn to_raw(&self) -> Vec<String> {
+        let mut raw = Vec::new();
+        if self.overwrite {
+            raw.push("--overwrite".to_string());
+        }
+        raw
+    }
+}
+#[derive(Default, Clone, PartialEq, Eq, Debug, Args)]
+pub struct GenerateProxyArgs {
+    /// Override TxProxy project if it already exists.
     #[arg(long, verbatim_doc_comment)]
     pub overwrite: bool,
 }
 
-impl CliArgsToRaw for GenerateOverwriteArg {
+impl CliArgsToRaw for GenerateProxyArgs {
     fn to_raw(&self) -> Vec<String> {
         let mut raw = Vec::new();
         if self.overwrite {
diff --git a/framework/meta/src/cmd/contract/generate_proxy/proxy_crate_gen.rs b/framework/meta/src/cmd/contract/generate_proxy/proxy_crate_gen.rs
index 00f38e40cf..b5e8c40013 100644
--- a/framework/meta/src/cmd/contract/generate_proxy/proxy_crate_gen.rs
+++ b/framework/meta/src/cmd/contract/generate_proxy/proxy_crate_gen.rs
@@ -5,7 +5,7 @@ pub(crate) fn create_file(proxies_file_name: &str, overwrite: bool) -> File {
     let file = format!("../{proxies_file_name}");
 
     if overwrite {
-        File::create(&file).unwrap()
+        File::create(&file).expect("could not write proxy file")
     } else {
         match File::options().create_new(true).write(true).open(&file) {
             Ok(f) => f,
diff --git a/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_main.rs b/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_main.rs
index b81ba802dc..63c32d8530 100644
--- a/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_main.rs
+++ b/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_main.rs
@@ -2,7 +2,7 @@ use std::fs::File;
 
 use multiversx_sc::abi::ContractAbi;
 
-use crate::cli_args::GenerateOverwriteArg;
+use crate::cli_args::GenerateProxyArgs;
 
 use super::{
     super::meta_config::MetaConfig,
@@ -14,7 +14,7 @@ use super::{
 const PROXIES_SOURCE_FILE_NAME: &str = "proxies_struct_interactor_main.rs";
 
 impl MetaConfig {
-    pub fn generate_rust_proxies_struct(&self, args: &GenerateOverwriteArg) {
+    pub fn generate_rust_proxies_struct(&self, args: &GenerateProxyArgs) {
         let file = create_file(PROXIES_SOURCE_FILE_NAME, args.overwrite);
         write_proxies_to_file(file, self.original_contract_abi.clone());
     }
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 010e35c2a2..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
@@ -2,7 +2,7 @@ use std::fs::File;
 
 use multiversx_sc::abi::ContractAbi;
 
-use crate::cli_args::GenerateOverwriteArg;
+use crate::cli_args::GenerateSnippetsArgs;
 
 use super::{
     super::meta_config::MetaConfig,
@@ -18,7 +18,7 @@ use super::{
 };
 
 impl MetaConfig {
-    pub fn generate_rust_snippets(&self, args: &GenerateOverwriteArg) {
+    pub fn generate_rust_snippets(&self, args: &GenerateSnippetsArgs) {
         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();

From 1464bb79202755c5600e2e2efc8373e84f9e4150 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 15 Feb 2024 14:36:49 +0200
Subject: [PATCH 0350/1254] deprecated SCResult

---
 contracts/core/price-aggregator/src/lib.rs          | 12 ++++++------
 .../tests/price_aggregator_blackbox_test.rs         |  5 ++---
 .../tests/price_aggregator_whitebox_test.rs         |  5 ++---
 contracts/examples/check-pause/src/check_pause.rs   |  4 ++--
 .../alloc-features/src/macro_features_legacy.rs     | 10 ++++++----
 .../tests/alloc_features_general_test.rs            |  2 ++
 .../src/storage_mapper_map_storage.rs               | 13 ++++---------
 .../basic-features/src/storage_mapper_queue.rs      |  4 ++--
 .../feature-tests/use-module/src/use_module.rs      |  4 ++--
 framework/base/src/macros.rs                        | 13 +++++++------
 framework/base/src/types/io/sc_result.rs            |  4 ++++
 framework/scenario/tests/contract_without_macros.rs |  5 ++---
 12 files changed, 41 insertions(+), 40 deletions(-)

diff --git a/contracts/core/price-aggregator/src/lib.rs b/contracts/core/price-aggregator/src/lib.rs
index 70c1f5b586..1dbed54848 100644
--- a/contracts/core/price-aggregator/src/lib.rs
+++ b/contracts/core/price-aggregator/src/lib.rs
@@ -303,16 +303,16 @@ pub trait PriceAggregator:
         &self,
         from: ManagedBuffer,
         to: ManagedBuffer,
-    ) -> SCResult<MultiValue6<u32, ManagedBuffer, ManagedBuffer, u64, BigUint, u8>> {
-        require_old!(self.not_paused(), PAUSED_ERROR_MSG);
+    ) -> MultiValue6<u32, ManagedBuffer, ManagedBuffer, u64, BigUint, u8> {
+        require!(self.not_paused(), PAUSED_ERROR_MSG);
 
         let token_pair = TokenPair { from, to };
         let round_values = self
             .rounds()
             .get(&token_pair)
-            .ok_or("token pair not found")?;
+            .unwrap_or_else(|| sc_panic!("token pair not found"));
         let feed = self.make_price_feed(token_pair, round_values);
-        Ok((
+        (
             feed.round_id,
             feed.from,
             feed.to,
@@ -320,7 +320,7 @@ pub trait PriceAggregator:
             feed.price,
             feed.decimals,
         )
-            .into())
+            .into()
     }
 
     #[view(latestPriceFeedOptional)]
@@ -329,7 +329,7 @@ pub trait PriceAggregator:
         from: ManagedBuffer,
         to: ManagedBuffer,
     ) -> OptionalValue<MultiValue6<u32, ManagedBuffer, ManagedBuffer, u64, BigUint, u8>> {
-        self.latest_price_feed(from, to).ok().into()
+        Some(self.latest_price_feed(from, to)).into()
     }
 
     #[only_owner]
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 0c478ff82a..b1b28e4fcf 100644
--- a/contracts/core/price-aggregator/tests/price_aggregator_blackbox_test.rs
+++ b/contracts/core/price-aggregator/tests/price_aggregator_blackbox_test.rs
@@ -288,9 +288,8 @@ fn test_price_aggregator_submit_round_ok() {
     state
         .world
         .whitebox_query(&state.price_aggregator_whitebox, |sc| {
-            let result = sc
-                .latest_price_feed(managed_buffer!(EGLD_TICKER), managed_buffer!(USD_TICKER))
-                .unwrap();
+            let result =
+                sc.latest_price_feed(managed_buffer!(EGLD_TICKER), managed_buffer!(USD_TICKER));
 
             let (round_id, from, to, timestamp, price, decimals) = result.into_tuple();
             assert_eq!(round_id, 1);
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 22a00bccbf..a2a432127e 100644
--- a/contracts/core/price-aggregator/tests/price_aggregator_whitebox_test.rs
+++ b/contracts/core/price-aggregator/tests/price_aggregator_whitebox_test.rs
@@ -255,9 +255,8 @@ fn test_price_aggregator_submit_round_ok() {
     );
 
     world.whitebox_query(&price_aggregator_whitebox, |sc| {
-        let result = sc
-            .latest_price_feed(managed_buffer!(EGLD_TICKER), managed_buffer!(USD_TICKER))
-            .unwrap();
+        let result =
+            sc.latest_price_feed(managed_buffer!(EGLD_TICKER), managed_buffer!(USD_TICKER));
 
         let (round_id, from, to, timestamp, price, decimals) = result.into_tuple();
         assert_eq!(round_id, 1);
diff --git a/contracts/examples/check-pause/src/check_pause.rs b/contracts/examples/check-pause/src/check_pause.rs
index 82f5ba55a9..5f36260961 100644
--- a/contracts/examples/check-pause/src/check_pause.rs
+++ b/contracts/examples/check-pause/src/check_pause.rs
@@ -10,7 +10,7 @@ pub trait CheckPauseContract: pause::PauseModule {
     fn init(&self) {}
 
     #[endpoint(checkPause)]
-    fn check_pause(&self) -> SCResult<bool> {
-        Ok(self.is_paused())
+    fn check_pause(&self) -> bool {
+        self.is_paused()
     }
 }
diff --git a/contracts/feature-tests/alloc-features/src/macro_features_legacy.rs b/contracts/feature-tests/alloc-features/src/macro_features_legacy.rs
index 3e91e7dec7..1efc5ff38e 100644
--- a/contracts/feature-tests/alloc-features/src/macro_features_legacy.rs
+++ b/contracts/feature-tests/alloc-features/src/macro_features_legacy.rs
@@ -1,3 +1,5 @@
+#![allow(deprecated)]
+
 multiversx_sc::imports!();
 
 use multiversx_sc::types::String;
@@ -11,12 +13,12 @@ pub trait MacroFeaturesLegacy {
     #[view]
     fn only_owner_legacy(&self) -> SCResult<()> {
         multiversx_sc::only_owner!(self, "Custom only owner message");
-        Ok(())
+        SCResult::Ok(())
     }
 
     #[view]
     fn return_sc_error(&self) -> SCResult<()> {
-        sc_error!("return_sc_error")
+        multiversx_sc::sc_error!("return_sc_error")
     }
 
     #[view]
@@ -55,13 +57,13 @@ pub trait MacroFeaturesLegacy {
         require!(test, "test argument is false");
         let unwrapped =
             SCResult::<String, StaticSCError>::from_result(arg.ok_or("option argument is none"))?;
-        Ok(unwrapped)
+        SCResult::Ok(unwrapped)
     }
 
     #[endpoint]
     fn result_echo_2(&self, arg: Option<String>) -> SCResult<String> {
         let unwrapped = arg.ok_or("option argument is none")?;
-        Ok(unwrapped)
+        SCResult::Ok(unwrapped)
     }
 
     #[endpoint]
diff --git a/contracts/feature-tests/alloc-features/tests/alloc_features_general_test.rs b/contracts/feature-tests/alloc-features/tests/alloc_features_general_test.rs
index 5a17183dd2..2987b2d740 100644
--- a/contracts/feature-tests/alloc-features/tests/alloc_features_general_test.rs
+++ b/contracts/feature-tests/alloc-features/tests/alloc_features_general_test.rs
@@ -1,3 +1,5 @@
+#![allow(deprecated)]
+
 use multiversx_sc::types::{SCResult, StaticSCError};
 use multiversx_sc_scenario::api::StaticApi;
 
diff --git a/contracts/feature-tests/basic-features/src/storage_mapper_map_storage.rs b/contracts/feature-tests/basic-features/src/storage_mapper_map_storage.rs
index 4e334d9846..0179d9bab9 100644
--- a/contracts/feature-tests/basic-features/src/storage_mapper_map_storage.rs
+++ b/contracts/feature-tests/basic-features/src/storage_mapper_map_storage.rs
@@ -46,24 +46,19 @@ pub trait MapStorageMapperFeatures {
     }
 
     #[endpoint]
-    fn map_storage_mapper_insert_value(
-        &self,
-        item: u32,
-        key: u32,
-        value: u32,
-    ) -> SCResult<Option<u32>> {
+    fn map_storage_mapper_insert_value(&self, item: u32, key: u32, value: u32) -> Option<u32> {
         let map_storage_mapper = self.map_storage_mapper();
         if let Some(mut map) = map_storage_mapper.get(&item) {
-            return Ok(map.insert(key, value));
+            return map.insert(key, value);
         }
         sc_panic!("No storage!")
     }
 
     #[endpoint]
-    fn map_storage_mapper_get_value(&self, item: u32, key: u32) -> SCResult<Option<u32>> {
+    fn map_storage_mapper_get_value(&self, item: u32, key: u32) -> Option<u32> {
         let map_storage_mapper = self.map_storage_mapper();
         if let Some(map) = map_storage_mapper.get(&item) {
-            return Ok(map.get(&key));
+            return map.get(&key);
         }
         sc_panic!("No storage!")
     }
diff --git a/contracts/feature-tests/basic-features/src/storage_mapper_queue.rs b/contracts/feature-tests/basic-features/src/storage_mapper_queue.rs
index 262de7513b..ba228ff2b5 100644
--- a/contracts/feature-tests/basic-features/src/storage_mapper_queue.rs
+++ b/contracts/feature-tests/basic-features/src/storage_mapper_queue.rs
@@ -20,9 +20,9 @@ pub trait QueueMapperFeatures {
     }
 
     #[endpoint]
-    fn queue_mapper_front(&self) -> SCResult<u32> {
+    fn queue_mapper_front(&self) -> u32 {
         if let Some(front) = self.queue_mapper().front() {
-            return Ok(front);
+            return front;
         }
         sc_panic!("Queue empty!")
     }
diff --git a/contracts/feature-tests/use-module/src/use_module.rs b/contracts/feature-tests/use-module/src/use_module.rs
index 7cd54c9ec3..64d2e32c16 100644
--- a/contracts/feature-tests/use-module/src/use_module.rs
+++ b/contracts/feature-tests/use-module/src/use_module.rs
@@ -63,7 +63,7 @@ pub trait UseModule:
     }
 
     #[endpoint(checkPause)]
-    fn check_pause(&self) -> SCResult<bool> {
-        Ok(self.is_paused())
+    fn check_pause(&self) -> bool {
+        self.is_paused()
     }
 }
diff --git a/framework/base/src/macros.rs b/framework/base/src/macros.rs
index 159b639195..b8dd5c7757 100644
--- a/framework/base/src/macros.rs
+++ b/framework/base/src/macros.rs
@@ -24,12 +24,9 @@ macro_rules! imports {
             io::*,
             non_zero_usize,
             non_zero_util::*,
-            require, require_old, sc_error, sc_format, sc_panic, sc_print,
+            require, require_old, sc_format, sc_panic, sc_print,
             storage::mappers::*,
-            types::{
-                SCResult::{Err, Ok},
-                *,
-            },
+            types::*,
         };
     };
 }
@@ -50,6 +47,10 @@ macro_rules! derive_imports {
 }
 
 /// Compact way of returning a static error message.
+#[deprecated(
+    since = "0.48.0",
+    note = "Use `sc_panic!` instead, which terminates immediately."
+)]
 #[macro_export]
 macro_rules! sc_error {
     ($s:expr) => {
@@ -197,7 +198,7 @@ macro_rules! sc_try {
 macro_rules! only_owner {
     ($trait_self: expr, $error_msg:expr) => {
         if ($trait_self.blockchain().get_caller() != $trait_self.blockchain().get_owner_address()) {
-            return sc_error!($error_msg);
+            return multiversx_sc::sc_error!($error_msg);
         }
     };
 }
diff --git a/framework/base/src/types/io/sc_result.rs b/framework/base/src/types/io/sc_result.rs
index c602723127..6278987b45 100644
--- a/framework/base/src/types/io/sc_result.rs
+++ b/framework/base/src/types/io/sc_result.rs
@@ -12,6 +12,10 @@ use core::{
 use super::{SCError, StaticSCError};
 
 /// Default way to optionally return an error from a smart contract endpoint.
+#[deprecated(
+    since = "0.48.0",
+    note = "Use in-place error handling instead, such as `require!` or `sc_panic!`"
+)]
 #[must_use]
 #[derive(Debug, PartialEq, Eq, Clone)]
 pub enum SCResult<T, E = StaticSCError> {
diff --git a/framework/scenario/tests/contract_without_macros.rs b/framework/scenario/tests/contract_without_macros.rs
index cff92ceab8..5dc7ec7048 100644
--- a/framework/scenario/tests/contract_without_macros.rs
+++ b/framework/scenario/tests/contract_without_macros.rs
@@ -123,15 +123,14 @@ mod sample_adder {
         fn init(&self, initial_value: &BigInt<Self::Api>) {
             self.set_sum(initial_value);
         }
-        fn add(&self, value: BigInt<Self::Api>) -> SCResult<()> {
+        fn add(&self, value: BigInt<Self::Api>) {
             let mut sum = self.get_sum();
             sum.add_assign(value);
             self.set_sum(&sum);
-            Ok(())
         }
         fn get_sum(&self) -> BigInt<Self::Api>;
         fn set_sum(&self, sum: &BigInt<Self::Api>);
-        fn add_version(&self) -> SCResult<()> {
+        fn add_version(&self) {
             self.add(self.version())
         }
         fn callback(&self);

From dc6d8be7d02b7aa0e7c3abc50234114c85df995b Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 15 Feb 2024 14:47:50 +0200
Subject: [PATCH 0351/1254] deprecated require_old!

---
 framework/base/src/macros.rs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/framework/base/src/macros.rs b/framework/base/src/macros.rs
index b8dd5c7757..1cb056692c 100644
--- a/framework/base/src/macros.rs
+++ b/framework/base/src/macros.rs
@@ -24,7 +24,7 @@ macro_rules! imports {
             io::*,
             non_zero_usize,
             non_zero_util::*,
-            require, require_old, sc_format, sc_panic, sc_print,
+            require, sc_format, sc_panic, sc_print,
             storage::mappers::*,
             types::*,
         };
@@ -75,6 +75,10 @@ macro_rules! sc_error {
 /// }
 /// # }
 /// ```
+#[deprecated(
+    since = "0.48.0",
+    note = "Use `require!` instead, which terminates immediately."
+)]
 #[macro_export]
 macro_rules! require_old {
     ($expression:expr, $error_msg:expr) => {

From 6b764c30868f3504eb71aabd62d8eb8b52b2399f Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 15 Feb 2024 14:46:07 +0200
Subject: [PATCH 0352/1254] imports modules

---
 framework/base/src/lib.rs    | 38 ++++++++++++++++++++++++++++++++++++
 framework/base/src/macros.rs | 33 ++-----------------------------
 2 files changed, 40 insertions(+), 31 deletions(-)

diff --git a/framework/base/src/lib.rs b/framework/base/src/lib.rs
index 8d45f7dff1..bf82b19999 100644
--- a/framework/base/src/lib.rs
+++ b/framework/base/src/lib.rs
@@ -39,3 +39,41 @@ pub mod types;
 pub use hex_call_data::*;
 pub use hex_literal;
 pub use storage::{storage_clear, storage_get, storage_get_len, storage_set};
+
+/// Conveniently groups all framework imports required by a smart contract form the framework.
+pub mod imports {
+    pub use crate::{
+        abi::TypeAbi,
+        api::{ErrorApiImpl, ManagedTypeApi},
+        arrayvec::ArrayVec,
+        codec::{
+            multi_types::*, DecodeError, IntoMultiValue, NestedDecode, NestedEncode, TopDecode,
+            TopEncode,
+        },
+        contract_base::{ContractBase, ProxyObjBase},
+        err_msg,
+        esdt::*,
+        io::*,
+        non_zero_usize,
+        non_zero_util::*,
+        require, sc_format, sc_panic, sc_print,
+        storage::mappers::*,
+        types::*,
+    };
+    pub use core::ops::{
+        Add, AddAssign, BitAnd, BitAndAssign, BitOr, BitOrAssign, BitXor, BitXorAssign, Div,
+        DivAssign, Mul, MulAssign, Rem, RemAssign, Shl, ShlAssign, Shr, ShrAssign, Sub, SubAssign,
+    };
+}
+
+/// Conveniently groups all imports required for deriving framework-related traits for types.
+pub mod derive_imports {
+    pub use crate::{
+        codec,
+        codec::derive::{
+            NestedDecode, NestedEncode, TopDecode, TopDecodeOrDefault, TopEncode,
+            TopEncodeOrDefault,
+        },
+        derive::{ManagedVecItem, TypeAbi},
+    };
+}
diff --git a/framework/base/src/macros.rs b/framework/base/src/macros.rs
index 1cb056692c..1754688d03 100644
--- a/framework/base/src/macros.rs
+++ b/framework/base/src/macros.rs
@@ -5,29 +5,7 @@
 #[macro_export]
 macro_rules! imports {
     () => {
-        use core::ops::{
-            Add, AddAssign, BitAnd, BitAndAssign, BitOr, BitOrAssign, BitXor, BitXorAssign, Div,
-            DivAssign, Mul, MulAssign, Rem, RemAssign, Shl, ShlAssign, Shr, ShrAssign, Sub,
-            SubAssign,
-        };
-        use multiversx_sc::{
-            abi::TypeAbi,
-            api::{ErrorApiImpl, ManagedTypeApi},
-            arrayvec::ArrayVec,
-            codec::{
-                multi_types::*, DecodeError, IntoMultiValue, NestedDecode, NestedEncode, TopDecode,
-                TopEncode,
-            },
-            contract_base::{ContractBase, ProxyObjBase},
-            err_msg,
-            esdt::*,
-            io::*,
-            non_zero_usize,
-            non_zero_util::*,
-            require, sc_format, sc_panic, sc_print,
-            storage::mappers::*,
-            types::*,
-        };
+        use multiversx_sc::imports::*;
     };
 }
 
@@ -35,14 +13,7 @@ macro_rules! imports {
 #[macro_export]
 macro_rules! derive_imports {
     () => {
-        use multiversx_sc::{
-            codec,
-            codec::derive::{
-                NestedDecode, NestedEncode, TopDecode, TopDecodeOrDefault, TopEncode,
-                TopEncodeOrDefault,
-            },
-            derive::{ManagedVecItem, TypeAbi},
-        };
+        use multiversx_sc::derive_imports::*;
     };
 }
 

From ae442d881f806cdd9780e8a925a916f12f459269 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 15 Feb 2024 23:03:31 +0200
Subject: [PATCH 0353/1254] features cleanup

---
 framework/base/src/lib.rs         | 6 ++++--
 framework/wasm-adapter/src/lib.rs | 1 -
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/framework/base/src/lib.rs b/framework/base/src/lib.rs
index bf82b19999..cbd7331a2f 100644
--- a/framework/base/src/lib.rs
+++ b/framework/base/src/lib.rs
@@ -1,15 +1,17 @@
 #![no_std]
+
 #![feature(never_type)]
 #![feature(exhaustive_patterns)]
 #![feature(try_trait_v2)]
 #![feature(control_flow_enum)]
-#![allow(clippy::type_complexity)]
-#![allow(deprecated)]
 #![feature(maybe_uninit_uninit_array)]
 #![feature(maybe_uninit_array_assume_init)]
 #![feature(negative_impls)]
 #![feature(generic_const_exprs)]
+
 #![allow(incomplete_features)]
+#![allow(deprecated)]
+
 pub use multiversx_sc_derive::{self as derive, contract, module, proxy};
 
 // re-export basic heap types
diff --git a/framework/wasm-adapter/src/lib.rs b/framework/wasm-adapter/src/lib.rs
index bf7e6797d0..d105af6bcc 100644
--- a/framework/wasm-adapter/src/lib.rs
+++ b/framework/wasm-adapter/src/lib.rs
@@ -1,6 +1,5 @@
 #![no_std]
 #![feature(panic_info_message)]
-#![feature(int_roundings)]
 
 // Allows us to use alloc::vec::Vec;
 // TODO: get rid of the legacy API and also of this.

From 50ffd151fe8c7bf55b2599224a33d1b049a26c78 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 15 Feb 2024 23:04:53 +0200
Subject: [PATCH 0354/1254] clippy fix

---
 framework/scenario/tests/contract_without_macros.rs | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/framework/scenario/tests/contract_without_macros.rs b/framework/scenario/tests/contract_without_macros.rs
index 5dc7ec7048..0252be4b1e 100644
--- a/framework/scenario/tests/contract_without_macros.rs
+++ b/framework/scenario/tests/contract_without_macros.rs
@@ -196,8 +196,7 @@ mod sample_adder {
                 Self::Api,
                 (multiversx_sc::types::BigInt<Self::Api>, ()),
             >(("value", ()));
-            let result = self.add(value);
-            multiversx_sc::io::finish_multi::<Self::Api, _>(&result);
+            self.add(value);
         }
 
         fn call(&self, fn_name: &str) -> bool {
@@ -417,15 +416,15 @@ fn contract_without_macros_basic() {
     adder.init(&BigInt::from(5));
     assert_eq!(BigInt::from(5), adder.get_sum());
 
-    let _ = adder.add(BigInt::from(7));
+    adder.add(BigInt::from(7));
     assert_eq!(BigInt::from(12), adder.get_sum());
 
-    let _ = adder.add(BigInt::from(-1));
+    adder.add(BigInt::from(-1));
     assert_eq!(BigInt::from(11), adder.get_sum());
 
     assert_eq!(BigInt::from(100), adder.version());
 
-    let _ = adder.add_version();
+    adder.add_version();
     assert_eq!(BigInt::from(111), adder.get_sum());
 
     assert!(!adder.call("invalid_endpoint"));

From e164fff3ee9a409efc721a0c7cebda434fa9830a Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 15 Feb 2024 23:19:50 +0200
Subject: [PATCH 0355/1254] updated imports in example contracts

---
 contracts/examples/adder/src/adder.rs                        | 3 ++-
 .../bonding-curve-contract/src/bonding_curve_contract.rs     | 3 +--
 .../examples/bonding-curve-contract/src/function_selector.rs | 3 +--
 contracts/examples/check-pause/src/check_pause.rs            | 2 +-
 .../examples/crowdfunding-esdt/src/crowdfunding_esdt.rs      | 3 +--
 contracts/examples/crypto-bubbles/src/crypto_bubbles.rs      | 2 +-
 contracts/examples/crypto-kitties/common/kitty/src/color.rs  | 2 +-
 .../examples/crypto-kitties/common/kitty/src/kitty_genes.rs  | 2 +-
 contracts/examples/crypto-kitties/common/kitty/src/lib.rs    | 2 +-
 .../examples/crypto-kitties/kitty-auction/src/auction.rs     | 2 +-
 contracts/examples/crypto-kitties/kitty-auction/src/lib.rs   | 2 +-
 .../examples/crypto-kitties/kitty-genetic-alg/src/lib.rs     | 2 --
 contracts/examples/crypto-kitties/kitty-ownership/src/lib.rs | 2 +-
 .../examples/crypto-zombies/src/crypto_kitties_proxy.rs      | 3 +--
 contracts/examples/crypto-zombies/src/lib.rs                 | 3 +--
 contracts/examples/crypto-zombies/src/storage.rs             | 3 +--
 contracts/examples/crypto-zombies/src/zombie.rs              | 3 +--
 contracts/examples/crypto-zombies/src/zombie_attack.rs       | 2 +-
 contracts/examples/crypto-zombies/src/zombie_factory.rs      | 3 +--
 contracts/examples/crypto-zombies/src/zombie_feeding.rs      | 3 +--
 contracts/examples/crypto-zombies/src/zombie_helper.rs       | 2 +-
 contracts/examples/digital-cash/src/deposit_info.rs          | 3 +--
 contracts/examples/digital-cash/src/digital_cash.rs          | 3 +--
 contracts/examples/digital-cash/src/helpers.rs               | 2 +-
 contracts/examples/digital-cash/src/pay_fee_and_fund.rs      | 3 +--
 contracts/examples/digital-cash/src/signature_operations.rs  | 3 +--
 contracts/examples/digital-cash/src/storage.rs               | 3 +--
 contracts/examples/empty/src/empty.rs                        | 3 ++-
 .../esdt-transfer-with-fee/src/esdt_transfer_with_fee.rs     | 2 +-
 contracts/examples/esdt-transfer-with-fee/src/fee.rs         | 3 +--
 contracts/examples/factorial/src/factorial.rs                | 3 ++-
 contracts/examples/fractional-nfts/src/fractional_nfts.rs    | 4 ++--
 .../examples/fractional-nfts/src/fractional_uri_info.rs      | 3 +--
 contracts/examples/lottery-esdt/src/lottery.rs               | 2 +-
 contracts/examples/lottery-esdt/src/lottery_info.rs          | 2 +-
 contracts/examples/lottery-esdt/src/status.rs                | 2 +-
 contracts/examples/multisig/src/action.rs                    | 2 +-
 contracts/examples/multisig/src/multisig.rs                  | 2 +-
 contracts/examples/multisig/src/multisig_events.rs           | 2 +-
 contracts/examples/multisig/src/multisig_perform.rs          | 2 +-
 contracts/examples/multisig/src/multisig_propose.rs          | 2 +-
 contracts/examples/multisig/src/multisig_state.rs            | 2 +-
 contracts/examples/multisig/src/user_role.rs                 | 2 +-
 contracts/examples/nft-minter/src/lib.rs                     | 5 +----
 contracts/examples/nft-minter/src/nft_module.rs              | 3 +--
 .../examples/nft-storage-prepay/src/nft_storage_prepay.rs    | 2 +-
 contracts/examples/nft-subscription/src/lib.rs               | 3 +--
 contracts/examples/order-book/factory/src/lib.rs             | 3 +--
 contracts/examples/order-book/pair/src/common.rs             | 3 +--
 contracts/examples/order-book/pair/src/events.rs             | 3 +--
 contracts/examples/order-book/pair/src/global.rs             | 3 +--
 contracts/examples/order-book/pair/src/lib.rs                | 3 +--
 contracts/examples/order-book/pair/src/orders.rs             | 3 +--
 contracts/examples/order-book/pair/src/validation.rs         | 3 +--
 contracts/examples/ping-pong-egld/src/ping_pong.rs           | 2 +-
 contracts/examples/ping-pong-egld/src/user_status.rs         | 2 +-
 contracts/examples/proxy-pause/src/proxy_pause.rs            | 4 +---
 .../rewards-distribution/src/rewards_distribution.rs         | 5 +----
 .../rewards-distribution/tests/mock_seed_nft_minter.rs       | 2 +-
 .../examples/seed-nft-minter/src/distribution_module.rs      | 3 +--
 contracts/examples/seed-nft-minter/src/nft_module.rs         | 3 +--
 contracts/examples/seed-nft-minter/src/seed_nft_minter.rs    | 5 ++---
 contracts/examples/token-release/src/contract_data.rs        | 2 +-
 contracts/examples/token-release/src/token_release.rs        | 3 +--
 framework/base/src/lib.rs                                    | 2 --
 65 files changed, 68 insertions(+), 106 deletions(-)

diff --git a/contracts/examples/adder/src/adder.rs b/contracts/examples/adder/src/adder.rs
index 9b261c5aa8..ff08501b42 100644
--- a/contracts/examples/adder/src/adder.rs
+++ b/contracts/examples/adder/src/adder.rs
@@ -1,6 +1,7 @@
 #![no_std]
 
-multiversx_sc::imports!();
+use multiversx_sc::imports::*;
+
 /// One of the simplest smart contracts possible,
 /// it holds a single variable in storage, which anyone can increment.
 #[multiversx_sc::contract]
diff --git a/contracts/examples/bonding-curve-contract/src/bonding_curve_contract.rs b/contracts/examples/bonding-curve-contract/src/bonding_curve_contract.rs
index 2b9acedf7c..6ab29068d3 100644
--- a/contracts/examples/bonding-curve-contract/src/bonding_curve_contract.rs
+++ b/contracts/examples/bonding-curve-contract/src/bonding_curve_contract.rs
@@ -1,7 +1,6 @@
 #![no_std]
 
-multiversx_sc::imports!();
-multiversx_sc::derive_imports!();
+use multiversx_sc::imports::*;
 
 use function_selector::FunctionSelector;
 use multiversx_sc_modules::{
diff --git a/contracts/examples/bonding-curve-contract/src/function_selector.rs b/contracts/examples/bonding-curve-contract/src/function_selector.rs
index 94a8831e5a..218a490c9c 100644
--- a/contracts/examples/bonding-curve-contract/src/function_selector.rs
+++ b/contracts/examples/bonding-curve-contract/src/function_selector.rs
@@ -1,5 +1,4 @@
-multiversx_sc::imports!();
-multiversx_sc::derive_imports!();
+use multiversx_sc::{derive_imports::*, imports::*};
 
 use crate::bonding_curve::{
     curves::{curve_function::CurveFunction, linear_function::LinearFunction},
diff --git a/contracts/examples/check-pause/src/check_pause.rs b/contracts/examples/check-pause/src/check_pause.rs
index 5f36260961..c5b4742d52 100644
--- a/contracts/examples/check-pause/src/check_pause.rs
+++ b/contracts/examples/check-pause/src/check_pause.rs
@@ -1,6 +1,6 @@
 #![no_std]
 
-multiversx_sc::imports!();
+use multiversx_sc::imports::*;
 
 use multiversx_sc_modules::pause;
 
diff --git a/contracts/examples/crowdfunding-esdt/src/crowdfunding_esdt.rs b/contracts/examples/crowdfunding-esdt/src/crowdfunding_esdt.rs
index 625cd24487..8fa04d2e46 100644
--- a/contracts/examples/crowdfunding-esdt/src/crowdfunding_esdt.rs
+++ b/contracts/examples/crowdfunding-esdt/src/crowdfunding_esdt.rs
@@ -1,7 +1,6 @@
 #![no_std]
 
-multiversx_sc::imports!();
-multiversx_sc::derive_imports!();
+use multiversx_sc::{derive_imports::*, imports::*};
 
 #[derive(TopEncode, TopDecode, TypeAbi, PartialEq, Eq, Clone, Copy, Debug)]
 pub enum Status {
diff --git a/contracts/examples/crypto-bubbles/src/crypto_bubbles.rs b/contracts/examples/crypto-bubbles/src/crypto_bubbles.rs
index 75af47f65c..da481fd273 100644
--- a/contracts/examples/crypto-bubbles/src/crypto_bubbles.rs
+++ b/contracts/examples/crypto-bubbles/src/crypto_bubbles.rs
@@ -1,6 +1,6 @@
 #![no_std]
 
-multiversx_sc::imports!();
+use multiversx_sc::imports::*;
 
 #[multiversx_sc::contract]
 pub trait CryptoBubbles {
diff --git a/contracts/examples/crypto-kitties/common/kitty/src/color.rs b/contracts/examples/crypto-kitties/common/kitty/src/color.rs
index 32b273d754..0b02aecf49 100644
--- a/contracts/examples/crypto-kitties/common/kitty/src/color.rs
+++ b/contracts/examples/crypto-kitties/common/kitty/src/color.rs
@@ -1,4 +1,4 @@
-multiversx_sc::derive_imports!();
+use multiversx_sc::derive_imports::*;
 
 use random::*;
 
diff --git a/contracts/examples/crypto-kitties/common/kitty/src/kitty_genes.rs b/contracts/examples/crypto-kitties/common/kitty/src/kitty_genes.rs
index b0906860e8..4deb4100e6 100644
--- a/contracts/examples/crypto-kitties/common/kitty/src/kitty_genes.rs
+++ b/contracts/examples/crypto-kitties/common/kitty/src/kitty_genes.rs
@@ -1,4 +1,4 @@
-multiversx_sc::derive_imports!();
+use multiversx_sc::derive_imports::*;
 
 use super::color::*;
 use random::*;
diff --git a/contracts/examples/crypto-kitties/common/kitty/src/lib.rs b/contracts/examples/crypto-kitties/common/kitty/src/lib.rs
index 5c385d01de..c06f376e8d 100644
--- a/contracts/examples/crypto-kitties/common/kitty/src/lib.rs
+++ b/contracts/examples/crypto-kitties/common/kitty/src/lib.rs
@@ -1,6 +1,6 @@
 #![no_std]
 
-multiversx_sc::derive_imports!();
+use multiversx_sc::derive_imports::*;
 
 const SECONDS_PER_MINUTE: u64 = 60;
 const MAX_COOLDOWN: u64 = 60 * 60 * 24 * 7; // 7 days
diff --git a/contracts/examples/crypto-kitties/kitty-auction/src/auction.rs b/contracts/examples/crypto-kitties/kitty-auction/src/auction.rs
index c71aeac0a8..fda71eb13d 100644
--- a/contracts/examples/crypto-kitties/kitty-auction/src/auction.rs
+++ b/contracts/examples/crypto-kitties/kitty-auction/src/auction.rs
@@ -1,4 +1,4 @@
-multiversx_sc::derive_imports!();
+use multiversx_sc::derive_imports::*;
 
 use multiversx_sc::{
     api::ManagedTypeApi,
diff --git a/contracts/examples/crypto-kitties/kitty-auction/src/lib.rs b/contracts/examples/crypto-kitties/kitty-auction/src/lib.rs
index b371268418..af7c7c1736 100644
--- a/contracts/examples/crypto-kitties/kitty-auction/src/lib.rs
+++ b/contracts/examples/crypto-kitties/kitty-auction/src/lib.rs
@@ -1,6 +1,6 @@
 #![no_std]
 
-multiversx_sc::imports!();
+use multiversx_sc::imports::*;
 
 pub mod auction;
 use auction::*;
diff --git a/contracts/examples/crypto-kitties/kitty-genetic-alg/src/lib.rs b/contracts/examples/crypto-kitties/kitty-genetic-alg/src/lib.rs
index f2571fda2c..aab6154cec 100644
--- a/contracts/examples/crypto-kitties/kitty-genetic-alg/src/lib.rs
+++ b/contracts/examples/crypto-kitties/kitty-genetic-alg/src/lib.rs
@@ -1,7 +1,5 @@
 #![no_std]
 
-multiversx_sc::imports!();
-
 use kitty::{kitty_genes::*, Kitty};
 use random::Random;
 
diff --git a/contracts/examples/crypto-kitties/kitty-ownership/src/lib.rs b/contracts/examples/crypto-kitties/kitty-ownership/src/lib.rs
index e3fd696b65..2514592465 100644
--- a/contracts/examples/crypto-kitties/kitty-ownership/src/lib.rs
+++ b/contracts/examples/crypto-kitties/kitty-ownership/src/lib.rs
@@ -1,7 +1,7 @@
 #![no_std]
 #![allow(clippy::suspicious_operation_groupings)]
 
-multiversx_sc::imports!();
+use multiversx_sc::imports::*;
 
 use core::cmp::max;
 
diff --git a/contracts/examples/crypto-zombies/src/crypto_kitties_proxy.rs b/contracts/examples/crypto-zombies/src/crypto_kitties_proxy.rs
index 50a651b59d..ea4d366994 100644
--- a/contracts/examples/crypto-zombies/src/crypto_kitties_proxy.rs
+++ b/contracts/examples/crypto-zombies/src/crypto_kitties_proxy.rs
@@ -1,5 +1,4 @@
-multiversx_sc::imports!();
-multiversx_sc::derive_imports!();
+use multiversx_sc::derive_imports::*;
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, TypeAbi)]
 pub struct Kitty {
diff --git a/contracts/examples/crypto-zombies/src/lib.rs b/contracts/examples/crypto-zombies/src/lib.rs
index e48180a910..f2f47688ad 100644
--- a/contracts/examples/crypto-zombies/src/lib.rs
+++ b/contracts/examples/crypto-zombies/src/lib.rs
@@ -1,7 +1,6 @@
 #![no_std]
 
-multiversx_sc::imports!();
-multiversx_sc::derive_imports!();
+use multiversx_sc::imports::*;
 
 mod crypto_kitties_proxy;
 mod storage;
diff --git a/contracts/examples/crypto-zombies/src/storage.rs b/contracts/examples/crypto-zombies/src/storage.rs
index e6361efd65..608456b688 100644
--- a/contracts/examples/crypto-zombies/src/storage.rs
+++ b/contracts/examples/crypto-zombies/src/storage.rs
@@ -1,5 +1,4 @@
-multiversx_sc::imports!();
-multiversx_sc::derive_imports!();
+use multiversx_sc::imports::*;
 
 use crate::zombie::Zombie;
 
diff --git a/contracts/examples/crypto-zombies/src/zombie.rs b/contracts/examples/crypto-zombies/src/zombie.rs
index 3d814b9e3a..414c343f28 100644
--- a/contracts/examples/crypto-zombies/src/zombie.rs
+++ b/contracts/examples/crypto-zombies/src/zombie.rs
@@ -1,5 +1,4 @@
-multiversx_sc::imports!();
-multiversx_sc::derive_imports!();
+use multiversx_sc::{derive_imports::*, imports::*};
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, TypeAbi)]
 pub struct Zombie<M: ManagedTypeApi> {
diff --git a/contracts/examples/crypto-zombies/src/zombie_attack.rs b/contracts/examples/crypto-zombies/src/zombie_attack.rs
index 7678947365..e4bebdeca4 100644
--- a/contracts/examples/crypto-zombies/src/zombie_attack.rs
+++ b/contracts/examples/crypto-zombies/src/zombie_attack.rs
@@ -1,4 +1,4 @@
-multiversx_sc::imports!();
+use multiversx_sc::imports::*;
 
 use crate::{storage, zombie_factory, zombie_feeding, zombie_helper};
 
diff --git a/contracts/examples/crypto-zombies/src/zombie_factory.rs b/contracts/examples/crypto-zombies/src/zombie_factory.rs
index 0a637880eb..3ee8339b9c 100644
--- a/contracts/examples/crypto-zombies/src/zombie_factory.rs
+++ b/contracts/examples/crypto-zombies/src/zombie_factory.rs
@@ -1,5 +1,4 @@
-multiversx_sc::imports!();
-multiversx_sc::derive_imports!();
+use multiversx_sc::imports::*;
 
 use crate::{storage, zombie::Zombie};
 
diff --git a/contracts/examples/crypto-zombies/src/zombie_feeding.rs b/contracts/examples/crypto-zombies/src/zombie_feeding.rs
index df3a598779..e27b3e69ad 100644
--- a/contracts/examples/crypto-zombies/src/zombie_feeding.rs
+++ b/contracts/examples/crypto-zombies/src/zombie_feeding.rs
@@ -1,5 +1,4 @@
-multiversx_sc::imports!();
-multiversx_sc::derive_imports!();
+use multiversx_sc::imports::*;
 
 use crate::{
     crypto_kitties_proxy::{self, Kitty},
diff --git a/contracts/examples/crypto-zombies/src/zombie_helper.rs b/contracts/examples/crypto-zombies/src/zombie_helper.rs
index 20d1263bf3..000ffda770 100644
--- a/contracts/examples/crypto-zombies/src/zombie_helper.rs
+++ b/contracts/examples/crypto-zombies/src/zombie_helper.rs
@@ -1,4 +1,4 @@
-multiversx_sc::imports!();
+use multiversx_sc::imports::*;
 
 use crate::storage;
 
diff --git a/contracts/examples/digital-cash/src/deposit_info.rs b/contracts/examples/digital-cash/src/deposit_info.rs
index 2838d5de84..9fb14661ea 100644
--- a/contracts/examples/digital-cash/src/deposit_info.rs
+++ b/contracts/examples/digital-cash/src/deposit_info.rs
@@ -1,5 +1,4 @@
-multiversx_sc::imports!();
-multiversx_sc::derive_imports!();
+use multiversx_sc::{derive_imports::*, imports::*};
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, TypeAbi)]
 pub struct DepositInfo<M: ManagedTypeApi> {
diff --git a/contracts/examples/digital-cash/src/digital_cash.rs b/contracts/examples/digital-cash/src/digital_cash.rs
index c1d6ac4af2..b46c2b7331 100644
--- a/contracts/examples/digital-cash/src/digital_cash.rs
+++ b/contracts/examples/digital-cash/src/digital_cash.rs
@@ -1,8 +1,7 @@
 #![no_std]
 #![allow(unused_attributes)]
 
-multiversx_sc::imports!();
-multiversx_sc::derive_imports!();
+use multiversx_sc::imports::*;
 
 mod constants;
 mod deposit_info;
diff --git a/contracts/examples/digital-cash/src/helpers.rs b/contracts/examples/digital-cash/src/helpers.rs
index c9bb1ea0aa..d300e35d08 100644
--- a/contracts/examples/digital-cash/src/helpers.rs
+++ b/contracts/examples/digital-cash/src/helpers.rs
@@ -1,4 +1,4 @@
-multiversx_sc::imports!();
+use multiversx_sc::imports::*;
 
 use crate::{
     constants::*,
diff --git a/contracts/examples/digital-cash/src/pay_fee_and_fund.rs b/contracts/examples/digital-cash/src/pay_fee_and_fund.rs
index 246ffefb6b..45e913c51d 100644
--- a/contracts/examples/digital-cash/src/pay_fee_and_fund.rs
+++ b/contracts/examples/digital-cash/src/pay_fee_and_fund.rs
@@ -1,5 +1,4 @@
-multiversx_sc::imports!();
-multiversx_sc::derive_imports!();
+use multiversx_sc::imports::*;
 
 use crate::{constants::*, helpers, storage};
 
diff --git a/contracts/examples/digital-cash/src/signature_operations.rs b/contracts/examples/digital-cash/src/signature_operations.rs
index 865276fb72..3da7143f88 100644
--- a/contracts/examples/digital-cash/src/signature_operations.rs
+++ b/contracts/examples/digital-cash/src/signature_operations.rs
@@ -1,5 +1,4 @@
-multiversx_sc::imports!();
-multiversx_sc::derive_imports!();
+use multiversx_sc::imports::*;
 
 use crate::{constants::*, helpers, storage};
 
diff --git a/contracts/examples/digital-cash/src/storage.rs b/contracts/examples/digital-cash/src/storage.rs
index eb0fbef93d..2e18503ccd 100644
--- a/contracts/examples/digital-cash/src/storage.rs
+++ b/contracts/examples/digital-cash/src/storage.rs
@@ -1,5 +1,4 @@
-multiversx_sc::imports!();
-multiversx_sc::derive_imports!();
+use multiversx_sc::imports::*;
 
 use crate::deposit_info::*;
 
diff --git a/contracts/examples/empty/src/empty.rs b/contracts/examples/empty/src/empty.rs
index 986e66f63a..81353a08d9 100644
--- a/contracts/examples/empty/src/empty.rs
+++ b/contracts/examples/empty/src/empty.rs
@@ -1,6 +1,7 @@
 #![no_std]
 
-multiversx_sc::imports!();
+#[allow(unused_imports)]
+use multiversx_sc::imports::*;
 
 /// An empty contract. To be used as a template when starting a new contract from scratch.
 #[multiversx_sc::contract]
diff --git a/contracts/examples/esdt-transfer-with-fee/src/esdt_transfer_with_fee.rs b/contracts/examples/esdt-transfer-with-fee/src/esdt_transfer_with_fee.rs
index 85abae23b6..6133e5500f 100644
--- a/contracts/examples/esdt-transfer-with-fee/src/esdt_transfer_with_fee.rs
+++ b/contracts/examples/esdt-transfer-with-fee/src/esdt_transfer_with_fee.rs
@@ -3,7 +3,7 @@
 mod fee;
 use fee::*;
 
-multiversx_sc::imports!();
+use multiversx_sc::imports::*;
 #[multiversx_sc::contract]
 pub trait EsdtTransferWithFee {
     #[init]
diff --git a/contracts/examples/esdt-transfer-with-fee/src/fee.rs b/contracts/examples/esdt-transfer-with-fee/src/fee.rs
index fa53190af7..67c88d8742 100644
--- a/contracts/examples/esdt-transfer-with-fee/src/fee.rs
+++ b/contracts/examples/esdt-transfer-with-fee/src/fee.rs
@@ -1,5 +1,4 @@
-multiversx_sc::imports!();
-multiversx_sc::derive_imports!();
+use multiversx_sc::{derive_imports::*, imports::*};
 
 pub(crate) const PERCENTAGE_DIVISOR: u32 = 10_000; // dividing the percentage fee by this number will result in a 2 decimal percentage
 
diff --git a/contracts/examples/factorial/src/factorial.rs b/contracts/examples/factorial/src/factorial.rs
index 509666b86f..ac5c76427c 100644
--- a/contracts/examples/factorial/src/factorial.rs
+++ b/contracts/examples/factorial/src/factorial.rs
@@ -1,6 +1,7 @@
 #![no_std]
+#![allow(unused_imports)]
 
-multiversx_sc::imports!();
+use multiversx_sc::imports::*;
 
 #[multiversx_sc::contract]
 pub trait Factorial {
diff --git a/contracts/examples/fractional-nfts/src/fractional_nfts.rs b/contracts/examples/fractional-nfts/src/fractional_nfts.rs
index a429cfad10..c715edae82 100644
--- a/contracts/examples/fractional-nfts/src/fractional_nfts.rs
+++ b/contracts/examples/fractional-nfts/src/fractional_nfts.rs
@@ -1,6 +1,6 @@
 #![no_std]
 
-multiversx_sc::imports!();
+use multiversx_sc::imports::*;
 
 use multiversx_sc_modules::default_issue_callbacks;
 mod fractional_uri_info;
@@ -144,7 +144,7 @@ pub trait FractionalNfts: default_issue_callbacks::DefaultIssueCallbacksModule {
 }
 
 mod nft_marketplace_proxy {
-    multiversx_sc::imports!();
+    use multiversx_sc::imports::*;
 
     #[multiversx_sc::proxy]
     pub trait NftMarketplace {
diff --git a/contracts/examples/fractional-nfts/src/fractional_uri_info.rs b/contracts/examples/fractional-nfts/src/fractional_uri_info.rs
index 4837ee6fe1..4b41271a72 100644
--- a/contracts/examples/fractional-nfts/src/fractional_uri_info.rs
+++ b/contracts/examples/fractional-nfts/src/fractional_uri_info.rs
@@ -1,5 +1,4 @@
-multiversx_sc::imports!();
-multiversx_sc::derive_imports!();
+use multiversx_sc::{derive_imports::*, imports::*};
 
 use multiversx_sc::contract_base::ManagedSerializer;
 
diff --git a/contracts/examples/lottery-esdt/src/lottery.rs b/contracts/examples/lottery-esdt/src/lottery.rs
index 24a84bc6be..48a94b14b2 100644
--- a/contracts/examples/lottery-esdt/src/lottery.rs
+++ b/contracts/examples/lottery-esdt/src/lottery.rs
@@ -1,6 +1,6 @@
 #![no_std]
 
-multiversx_sc::imports!();
+use multiversx_sc::imports::*;
 
 mod lottery_info;
 mod status;
diff --git a/contracts/examples/lottery-esdt/src/lottery_info.rs b/contracts/examples/lottery-esdt/src/lottery_info.rs
index a7d7f32992..869a3906a8 100644
--- a/contracts/examples/lottery-esdt/src/lottery_info.rs
+++ b/contracts/examples/lottery-esdt/src/lottery_info.rs
@@ -3,7 +3,7 @@ use multiversx_sc::{
     types::{BigUint, EgldOrEsdtTokenIdentifier, ManagedVec},
 };
 
-multiversx_sc::derive_imports!();
+use multiversx_sc::derive_imports::*;
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, TypeAbi)]
 pub struct LotteryInfo<M: ManagedTypeApi> {
diff --git a/contracts/examples/lottery-esdt/src/status.rs b/contracts/examples/lottery-esdt/src/status.rs
index 90eaa84ad0..ba87b5bb84 100644
--- a/contracts/examples/lottery-esdt/src/status.rs
+++ b/contracts/examples/lottery-esdt/src/status.rs
@@ -1,4 +1,4 @@
-multiversx_sc::derive_imports!();
+use multiversx_sc::derive_imports::*;
 
 #[derive(TopEncode, TopDecode, TypeAbi, PartialEq, Eq, Clone, Copy)]
 pub enum Status {
diff --git a/contracts/examples/multisig/src/action.rs b/contracts/examples/multisig/src/action.rs
index f5c55cc117..d36af70f90 100644
--- a/contracts/examples/multisig/src/action.rs
+++ b/contracts/examples/multisig/src/action.rs
@@ -3,7 +3,7 @@ use multiversx_sc::{
     types::{BigUint, CodeMetadata, ManagedAddress, ManagedBuffer, ManagedVec},
 };
 
-multiversx_sc::derive_imports!();
+use multiversx_sc::derive_imports::*;
 
 #[derive(NestedEncode, NestedDecode, TypeAbi, Clone)]
 pub struct CallActionData<M: ManagedTypeApi> {
diff --git a/contracts/examples/multisig/src/multisig.rs b/contracts/examples/multisig/src/multisig.rs
index fee8439656..a3baed53ce 100644
--- a/contracts/examples/multisig/src/multisig.rs
+++ b/contracts/examples/multisig/src/multisig.rs
@@ -10,7 +10,7 @@ pub mod user_role;
 use action::ActionFullInfo;
 use user_role::UserRole;
 
-multiversx_sc::imports!();
+use multiversx_sc::imports::*;
 
 /// Multi-signature smart contract implementation.
 /// Acts like a wallet that needs multiple signers for any action performed.
diff --git a/contracts/examples/multisig/src/multisig_events.rs b/contracts/examples/multisig/src/multisig_events.rs
index 384fdb2c1f..6db1567f28 100644
--- a/contracts/examples/multisig/src/multisig_events.rs
+++ b/contracts/examples/multisig/src/multisig_events.rs
@@ -1,6 +1,6 @@
 use crate::{action::ActionFullInfo, user_role::UserRole};
 
-multiversx_sc::imports!();
+use multiversx_sc::imports::*;
 
 /// Contains all events that can be emitted by the contract.
 #[multiversx_sc::module]
diff --git a/contracts/examples/multisig/src/multisig_perform.rs b/contracts/examples/multisig/src/multisig_perform.rs
index 4769923423..1912b85321 100644
--- a/contracts/examples/multisig/src/multisig_perform.rs
+++ b/contracts/examples/multisig/src/multisig_perform.rs
@@ -3,7 +3,7 @@ use crate::{
     user_role::UserRole,
 };
 
-multiversx_sc::imports!();
+use multiversx_sc::imports::*;
 
 /// Gas required to finish transaction after transfer-execute.
 const PERFORM_ACTION_FINISH_GAS: u64 = 300_000;
diff --git a/contracts/examples/multisig/src/multisig_propose.rs b/contracts/examples/multisig/src/multisig_propose.rs
index 053b376236..8d59f58275 100644
--- a/contracts/examples/multisig/src/multisig_propose.rs
+++ b/contracts/examples/multisig/src/multisig_propose.rs
@@ -1,6 +1,6 @@
 use crate::action::{Action, CallActionData};
 
-multiversx_sc::imports!();
+use multiversx_sc::imports::*;
 
 /// Contains all events that can be emitted by the contract.
 #[multiversx_sc::module]
diff --git a/contracts/examples/multisig/src/multisig_state.rs b/contracts/examples/multisig/src/multisig_state.rs
index db64843ade..bfadd8efd6 100644
--- a/contracts/examples/multisig/src/multisig_state.rs
+++ b/contracts/examples/multisig/src/multisig_state.rs
@@ -1,6 +1,6 @@
 use crate::{action::Action, user_role::UserRole};
 
-multiversx_sc::imports!();
+use multiversx_sc::imports::*;
 
 /// Contains all events that can be emitted by the contract.
 #[multiversx_sc::module]
diff --git a/contracts/examples/multisig/src/user_role.rs b/contracts/examples/multisig/src/user_role.rs
index fa401130ac..b92b2dea30 100644
--- a/contracts/examples/multisig/src/user_role.rs
+++ b/contracts/examples/multisig/src/user_role.rs
@@ -1,4 +1,4 @@
-multiversx_sc::derive_imports!();
+use multiversx_sc::derive_imports::*;
 
 #[derive(TopEncode, TopDecode, TypeAbi, Clone, Copy, PartialEq, Eq, Debug)]
 pub enum UserRole {
diff --git a/contracts/examples/nft-minter/src/lib.rs b/contracts/examples/nft-minter/src/lib.rs
index e65e8a7dff..5f0a8b3f01 100644
--- a/contracts/examples/nft-minter/src/lib.rs
+++ b/contracts/examples/nft-minter/src/lib.rs
@@ -1,7 +1,6 @@
 #![no_std]
 
-multiversx_sc::imports!();
-multiversx_sc::derive_imports!();
+use multiversx_sc::{derive_imports::*, imports::*};
 
 mod nft_module;
 
@@ -87,8 +86,6 @@ pub trait NftMinter: nft_module::NftModule {
 }
 
 mod nft_marketplace_proxy {
-    multiversx_sc::imports!();
-
     #[multiversx_sc::proxy]
     pub trait NftMarketplace {
         #[endpoint(claimTokens)]
diff --git a/contracts/examples/nft-minter/src/nft_module.rs b/contracts/examples/nft-minter/src/nft_module.rs
index 5643201724..2b9b73523c 100644
--- a/contracts/examples/nft-minter/src/nft_module.rs
+++ b/contracts/examples/nft-minter/src/nft_module.rs
@@ -1,5 +1,4 @@
-multiversx_sc::imports!();
-multiversx_sc::derive_imports!();
+use multiversx_sc::{derive_imports::*, imports::*};
 
 const NFT_AMOUNT: u32 = 1;
 const ROYALTIES_MAX: u32 = 10_000;
diff --git a/contracts/examples/nft-storage-prepay/src/nft_storage_prepay.rs b/contracts/examples/nft-storage-prepay/src/nft_storage_prepay.rs
index e546da11e3..f21dfcb61b 100644
--- a/contracts/examples/nft-storage-prepay/src/nft_storage_prepay.rs
+++ b/contracts/examples/nft-storage-prepay/src/nft_storage_prepay.rs
@@ -1,6 +1,6 @@
 #![no_std]
 
-multiversx_sc::imports!();
+use multiversx_sc::imports::*;
 
 #[multiversx_sc::contract]
 pub trait NftStoragePrepay {
diff --git a/contracts/examples/nft-subscription/src/lib.rs b/contracts/examples/nft-subscription/src/lib.rs
index b9c4fcdb8d..d291eaf212 100644
--- a/contracts/examples/nft-subscription/src/lib.rs
+++ b/contracts/examples/nft-subscription/src/lib.rs
@@ -1,7 +1,6 @@
 #![no_std]
 
-multiversx_sc::imports!();
-multiversx_sc::derive_imports!();
+use multiversx_sc::imports::*;
 
 use multiversx_sc_modules::{default_issue_callbacks, subscription};
 
diff --git a/contracts/examples/order-book/factory/src/lib.rs b/contracts/examples/order-book/factory/src/lib.rs
index 1227754195..cac1192361 100644
--- a/contracts/examples/order-book/factory/src/lib.rs
+++ b/contracts/examples/order-book/factory/src/lib.rs
@@ -1,7 +1,6 @@
 #![no_std]
 
-multiversx_sc::imports!();
-multiversx_sc::derive_imports!();
+use multiversx_sc::{derive_imports::*, imports::*};
 
 #[derive(TopEncode, TopDecode, NestedEncode, NestedDecode, TypeAbi, Clone)]
 pub struct TokenIdPair<M: ManagedTypeApi> {
diff --git a/contracts/examples/order-book/pair/src/common.rs b/contracts/examples/order-book/pair/src/common.rs
index 17a5704073..1c4b2e893c 100644
--- a/contracts/examples/order-book/pair/src/common.rs
+++ b/contracts/examples/order-book/pair/src/common.rs
@@ -1,5 +1,4 @@
-multiversx_sc::imports!();
-multiversx_sc::derive_imports!();
+use multiversx_sc::{derive_imports::*, imports::*};
 
 pub const MAX_ORDERS_PER_USER: usize = 100;
 pub const PERCENT_BASE_POINTS: u64 = 100_000;
diff --git a/contracts/examples/order-book/pair/src/events.rs b/contracts/examples/order-book/pair/src/events.rs
index 997ae9990c..ddbd6a3496 100644
--- a/contracts/examples/order-book/pair/src/events.rs
+++ b/contracts/examples/order-book/pair/src/events.rs
@@ -1,5 +1,4 @@
-multiversx_sc::imports!();
-multiversx_sc::derive_imports!();
+use multiversx_sc::imports::*;
 
 use super::common::{Order, OrderType};
 
diff --git a/contracts/examples/order-book/pair/src/global.rs b/contracts/examples/order-book/pair/src/global.rs
index 371e661b71..9ed0718048 100644
--- a/contracts/examples/order-book/pair/src/global.rs
+++ b/contracts/examples/order-book/pair/src/global.rs
@@ -1,5 +1,4 @@
-multiversx_sc::imports!();
-multiversx_sc::derive_imports!();
+use multiversx_sc::imports::*;
 
 #[multiversx_sc::module]
 pub trait GlobalOperationModule {
diff --git a/contracts/examples/order-book/pair/src/lib.rs b/contracts/examples/order-book/pair/src/lib.rs
index e50b70c0e9..69e3a9f8c5 100644
--- a/contracts/examples/order-book/pair/src/lib.rs
+++ b/contracts/examples/order-book/pair/src/lib.rs
@@ -1,7 +1,6 @@
 #![no_std]
 
-multiversx_sc::imports!();
-multiversx_sc::derive_imports!();
+use multiversx_sc::imports::*;
 
 mod common;
 mod events;
diff --git a/contracts/examples/order-book/pair/src/orders.rs b/contracts/examples/order-book/pair/src/orders.rs
index 65803fb495..6dd9bdc0bf 100644
--- a/contracts/examples/order-book/pair/src/orders.rs
+++ b/contracts/examples/order-book/pair/src/orders.rs
@@ -1,5 +1,4 @@
-multiversx_sc::imports!();
-multiversx_sc::derive_imports!();
+use multiversx_sc::imports::*;
 
 use crate::common::{FEE_PENALTY_INCREASE_EPOCHS, FEE_PENALTY_INCREASE_PERCENT};
 
diff --git a/contracts/examples/order-book/pair/src/validation.rs b/contracts/examples/order-book/pair/src/validation.rs
index 14f1478e1d..488edbdb24 100644
--- a/contracts/examples/order-book/pair/src/validation.rs
+++ b/contracts/examples/order-book/pair/src/validation.rs
@@ -1,5 +1,4 @@
-multiversx_sc::imports!();
-multiversx_sc::derive_imports!();
+use multiversx_sc::imports::*;
 
 use crate::common::{FeeConfig, FeeConfigEnum};
 
diff --git a/contracts/examples/ping-pong-egld/src/ping_pong.rs b/contracts/examples/ping-pong-egld/src/ping_pong.rs
index 1e4aaf21ae..d2d84546de 100644
--- a/contracts/examples/ping-pong-egld/src/ping_pong.rs
+++ b/contracts/examples/ping-pong-egld/src/ping_pong.rs
@@ -1,6 +1,6 @@
 #![no_std]
 
-multiversx_sc::imports!();
+use multiversx_sc::imports::*;
 
 mod user_status;
 
diff --git a/contracts/examples/ping-pong-egld/src/user_status.rs b/contracts/examples/ping-pong-egld/src/user_status.rs
index d49da4b213..291981b0d7 100644
--- a/contracts/examples/ping-pong-egld/src/user_status.rs
+++ b/contracts/examples/ping-pong-egld/src/user_status.rs
@@ -1,4 +1,4 @@
-multiversx_sc::derive_imports!();
+use multiversx_sc::derive_imports::*;
 
 #[derive(TopEncode, TopDecode, TypeAbi, PartialEq, Eq, Clone, Copy)]
 pub enum UserStatus {
diff --git a/contracts/examples/proxy-pause/src/proxy_pause.rs b/contracts/examples/proxy-pause/src/proxy_pause.rs
index 2a83923866..685a870c7e 100644
--- a/contracts/examples/proxy-pause/src/proxy_pause.rs
+++ b/contracts/examples/proxy-pause/src/proxy_pause.rs
@@ -1,10 +1,8 @@
 #![no_std]
 
-multiversx_sc::imports!();
+use multiversx_sc::imports::*;
 
 mod pause_proxy {
-    multiversx_sc::imports!();
-
     #[multiversx_sc::proxy]
     pub trait Pausable {
         #[endpoint]
diff --git a/contracts/examples/rewards-distribution/src/rewards_distribution.rs b/contracts/examples/rewards-distribution/src/rewards_distribution.rs
index 59672da272..cef14e0fef 100644
--- a/contracts/examples/rewards-distribution/src/rewards_distribution.rs
+++ b/contracts/examples/rewards-distribution/src/rewards_distribution.rs
@@ -1,7 +1,6 @@
 #![no_std]
 
-multiversx_sc::imports!();
-multiversx_sc::derive_imports!();
+use multiversx_sc::{derive_imports::*, imports::*};
 use multiversx_sc_modules::ongoing_operation::{
     CONTINUE_OP, DEFAULT_MIN_GAS_TO_SAVE_PROGRESS, STOP_OP,
 };
@@ -440,8 +439,6 @@ fn ticket_from_storage(position: u64, ticket_id: u64) -> u64 {
 }
 
 mod seed_nft_minter {
-    multiversx_sc::imports!();
-
     #[multiversx_sc::proxy]
     pub trait SeedNftMinter {
         #[endpoint(getNftCount)]
diff --git a/contracts/examples/rewards-distribution/tests/mock_seed_nft_minter.rs b/contracts/examples/rewards-distribution/tests/mock_seed_nft_minter.rs
index 0c7a12d297..d4312c8920 100644
--- a/contracts/examples/rewards-distribution/tests/mock_seed_nft_minter.rs
+++ b/contracts/examples/rewards-distribution/tests/mock_seed_nft_minter.rs
@@ -1,4 +1,4 @@
-multiversx_sc::imports!();
+use multiversx_sc::imports::*;
 
 #[multiversx_sc::contract]
 pub trait MockSeedNftMinter {
diff --git a/contracts/examples/seed-nft-minter/src/distribution_module.rs b/contracts/examples/seed-nft-minter/src/distribution_module.rs
index df22a12919..9b3bb6d507 100644
--- a/contracts/examples/seed-nft-minter/src/distribution_module.rs
+++ b/contracts/examples/seed-nft-minter/src/distribution_module.rs
@@ -1,5 +1,4 @@
-multiversx_sc::imports!();
-multiversx_sc::derive_imports!();
+use multiversx_sc::{derive_imports::*, imports::*};
 
 pub const MAX_DISTRIBUTION_PERCENTAGE: u64 = 100_000; // 100%
 
diff --git a/contracts/examples/seed-nft-minter/src/nft_module.rs b/contracts/examples/seed-nft-minter/src/nft_module.rs
index f24ea67fc3..885ff36c90 100644
--- a/contracts/examples/seed-nft-minter/src/nft_module.rs
+++ b/contracts/examples/seed-nft-minter/src/nft_module.rs
@@ -1,7 +1,6 @@
 use crate::distribution_module;
 
-multiversx_sc::imports!();
-multiversx_sc::derive_imports!();
+use multiversx_sc::{derive_imports::*, imports::*};
 
 use multiversx_sc_modules::default_issue_callbacks;
 
diff --git a/contracts/examples/seed-nft-minter/src/seed_nft_minter.rs b/contracts/examples/seed-nft-minter/src/seed_nft_minter.rs
index 5e42c7a765..42b064e5cd 100644
--- a/contracts/examples/seed-nft-minter/src/seed_nft_minter.rs
+++ b/contracts/examples/seed-nft-minter/src/seed_nft_minter.rs
@@ -1,7 +1,6 @@
 #![no_std]
 
-multiversx_sc::imports!();
-multiversx_sc::derive_imports!();
+use multiversx_sc::{derive_imports::*, imports::*};
 
 mod distribution_module;
 mod nft_module;
@@ -123,7 +122,7 @@ pub trait SeedNftMinter:
 }
 
 mod nft_marketplace_proxy {
-    multiversx_sc::imports!();
+    use multiversx_sc::imports::*;
 
     #[multiversx_sc::proxy]
     pub trait NftMarketplace {
diff --git a/contracts/examples/token-release/src/contract_data.rs b/contracts/examples/token-release/src/contract_data.rs
index c40f1ac8a5..d224761986 100644
--- a/contracts/examples/token-release/src/contract_data.rs
+++ b/contracts/examples/token-release/src/contract_data.rs
@@ -1,6 +1,6 @@
 use multiversx_sc::{api::ManagedTypeApi, types::BigUint};
 
-multiversx_sc::derive_imports!();
+use multiversx_sc::derive_imports::*;
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, PartialEq, Eq, TypeAbi, Clone)]
 pub enum UnlockType<M: ManagedTypeApi> {
diff --git a/contracts/examples/token-release/src/token_release.rs b/contracts/examples/token-release/src/token_release.rs
index d4f1eba44b..29fb3890e0 100644
--- a/contracts/examples/token-release/src/token_release.rs
+++ b/contracts/examples/token-release/src/token_release.rs
@@ -1,7 +1,6 @@
 #![no_std]
 
-multiversx_sc::imports!();
-multiversx_sc::derive_imports!();
+use multiversx_sc::imports::*;
 
 mod contract_data;
 
diff --git a/framework/base/src/lib.rs b/framework/base/src/lib.rs
index cbd7331a2f..060fdb85b9 100644
--- a/framework/base/src/lib.rs
+++ b/framework/base/src/lib.rs
@@ -1,5 +1,4 @@
 #![no_std]
-
 #![feature(never_type)]
 #![feature(exhaustive_patterns)]
 #![feature(try_trait_v2)]
@@ -8,7 +7,6 @@
 #![feature(maybe_uninit_array_assume_init)]
 #![feature(negative_impls)]
 #![feature(generic_const_exprs)]
-
 #![allow(incomplete_features)]
 #![allow(deprecated)]
 

From f76701449a611fd428af4e828d1c5279a09552d9 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 16 Feb 2024 02:28:45 +0200
Subject: [PATCH 0356/1254] old Proxy deploys produce unified syntax, backwards
 compatibility

---
 .../src/forwarder_raw_deploy_upgrade.rs       |   2 +-
 .../proxy-test-first/src/proxy-test-first.rs  |   2 +-
 .../src/types/interaction/contract_deploy.rs  |   4 +-
 .../base/src/types/interaction/deploy_call.rs |  48 ++++-
 framework/base/src/types/interaction/mod.rs   |   2 +
 framework/base/src/types/interaction/tx.rs    |  90 ++++++--
 .../src/types/interaction/tx_call_deploy.rs   | 192 +++++++++++++++++-
 .../src/types/interaction/tx_code_source.rs   |  62 ++++++
 .../base/src/types/interaction/tx_gas.rs      |  11 +
 framework/derive/src/generate/proxy_gen.rs    |  97 ++++-----
 .../src/scenario/model/step/sc_deploy_step.rs |  10 +-
 11 files changed, 421 insertions(+), 99 deletions(-)
 create mode 100644 framework/base/src/types/interaction/tx_code_source.rs

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 393aab3a73..53a46c1f98 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
@@ -17,7 +17,7 @@ pub trait ForwarderRawDeployUpgrade {
             .with_gas_limit(self.blockchain().get_gas_left())
             .returns(ReturnsNewAddress)
             .returns(ReturnsRaw)
-            .execute_deploy()
+            .sync_call()
             .into()
     }
 
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 d84f36e5fa..b6d04b7606 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
@@ -78,8 +78,8 @@ pub trait ProxyTestFirst {
         let other_contract = self.get_other_contract();
 
         self.message_me_proxy()
-            .contract(other_contract)
             .init(456) // TODO: upgrade proxy
+            .to(other_contract)
             .with_egld_transfer(payment.clone_value())
             .upgrade_contract(&code, CodeMetadata::UPGRADEABLE);
     }
diff --git a/framework/base/src/types/interaction/contract_deploy.rs b/framework/base/src/types/interaction/contract_deploy.rs
index 1c61b7c977..448d9f4684 100644
--- a/framework/base/src/types/interaction/contract_deploy.rs
+++ b/framework/base/src/types/interaction/contract_deploy.rs
@@ -22,12 +22,12 @@ pub struct ContractDeploy<SA, OriginalResult>
 where
     SA: CallTypeApi + 'static,
 {
-    _phantom: PhantomData<SA>,
+    pub(crate) _phantom: PhantomData<SA>,
     pub to: ManagedOption<SA, ManagedAddress<SA>>, // only used for Upgrade, ignored for Deploy
     pub egld_payment: BigUint<SA>,
     pub explicit_gas_limit: u64,
     pub arg_buffer: ManagedArgBuffer<SA>,
-    _return_type: PhantomData<OriginalResult>,
+    pub(crate) _return_type: PhantomData<OriginalResult>,
 }
 
 /// Syntactical sugar to help macros to generate code easier.
diff --git a/framework/base/src/types/interaction/deploy_call.rs b/framework/base/src/types/interaction/deploy_call.rs
index ae7c2c9541..ec3a64e187 100644
--- a/framework/base/src/types/interaction/deploy_call.rs
+++ b/framework/base/src/types/interaction/deploy_call.rs
@@ -2,34 +2,39 @@ use multiversx_sc_codec::TopEncodeMulti;
 
 use crate::types::{CodeMetadata, ManagedBuffer, ManagedBufferCachedBuilder};
 
-use super::{FunctionCall, ManagedArgBuffer, Tx, TxData, TxEnv, TxFrom, TxGas, TxPayment, TxTo};
+use super::{
+    Code, FunctionCall, ManagedArgBuffer, Tx, TxCodeSource, TxData, TxEnv, TxFrom, TxGas,
+    TxPayment, TxTo,
+};
 
 /// Holds deploy data: code, code metadata, and arguments.
-pub struct DeployCall<Env>
+pub struct DeployCall<Env, CodeSource>
 where
     Env: TxEnv,
+    CodeSource: TxCodeSource<Env>,
 {
-    pub code: ManagedBuffer<Env::Api>,
+    pub code_source: CodeSource,
     pub code_metadata: CodeMetadata,
     pub arg_buffer: ManagedArgBuffer<Env::Api>,
 }
 
-impl<Env> Default for DeployCall<Env>
+impl<Env> Default for DeployCall<Env, ()>
 where
     Env: TxEnv,
 {
-    fn default() -> DeployCall<Env> {
+    fn default() -> DeployCall<Env, ()> {
         DeployCall {
-            code: ManagedBuffer::new(),
+            code_source: (),
             code_metadata: CodeMetadata::DEFAULT,
             arg_buffer: ManagedArgBuffer::new(),
         }
     }
 }
 
-impl<Env> TxData<Env> for DeployCall<Env>
+impl<Env, CodeSource> TxData<Env> for DeployCall<Env, CodeSource>
 where
     Env: TxEnv,
+    CodeSource: TxCodeSource<Env>,
 {
     fn is_no_call(&self) -> bool {
         false
@@ -38,16 +43,41 @@ where
     fn to_call_data_string(&self) -> ManagedBuffer<Env::Api> {
         // Implement as needed for deployment-specific data
         let mut result = ManagedBufferCachedBuilder::default();
-        result.append_managed_buffer(&self.code);
+        // result.append_managed_buffer(&self.code);
         // Add other fields as needed
         result.into_managed_buffer()
     }
 }
 
-impl<Env> DeployCall<Env>
+impl<Env> DeployCall<Env, ()>
 where
     Env: TxEnv,
 {
+    pub fn code_source<CodeSource>(self, code_source: CodeSource) -> DeployCall<Env, CodeSource>
+    where
+        CodeSource: TxCodeSource<Env>,
+    {
+        DeployCall {
+            code_source,
+            code_metadata: self.code_metadata,
+            arg_buffer: self.arg_buffer,
+        }
+    }
+}
+
+impl<Env, CodeSource> DeployCall<Env, CodeSource>
+where
+    Env: TxEnv,
+    CodeSource: TxCodeSource<Env>,
+{
+    pub fn code_metadata(mut self, code_metadata: CodeMetadata) -> Self
+    where
+        CodeSource: TxCodeSource<Env>,
+    {
+        self.code_metadata = code_metadata;
+        self
+    }
+
     /// Adds an argument of any serializable type.
     ///
     /// Multi-values are accepted. No type checking performed.
diff --git a/framework/base/src/types/interaction/mod.rs b/framework/base/src/types/interaction/mod.rs
index 636f31738c..0e13f0c5f2 100644
--- a/framework/base/src/types/interaction/mod.rs
+++ b/framework/base/src/types/interaction/mod.rs
@@ -26,6 +26,7 @@ mod tx_call_async_promises;
 mod tx_call_deploy;
 mod tx_call_sync;
 mod tx_call_te;
+mod tx_code_source;
 mod tx_data;
 mod tx_env;
 mod tx_env_sc;
@@ -62,6 +63,7 @@ pub use tx::*;
 pub use tx_call_async::*;
 pub use tx_call_async_promises::*;
 pub use tx_call_sync::*;
+pub use tx_code_source::*;
 pub use tx_data::*;
 pub use tx_env::*;
 pub use tx_env_sc::*;
diff --git a/framework/base/src/types/interaction/tx.rs b/framework/base/src/types/interaction/tx.rs
index 82142e8c6f..48281ac272 100644
--- a/framework/base/src/types/interaction/tx.rs
+++ b/framework/base/src/types/interaction/tx.rs
@@ -3,7 +3,7 @@ use crate::{
     contract_base::{BlockchainWrapper, SendRawWrapper},
     types::{
         BigUint, CodeMetadata, EgldOrEsdtTokenPayment, EgldPayment, EsdtTokenPayment,
-        ManagedAddress, ManagedBuffer, ManagedVec, MultiEsdtPayment,
+        ManagedAddress, ManagedBuffer, ManagedOption, ManagedVec, MultiEsdtPayment,
     },
 };
 use alloc::boxed::Box;
@@ -11,10 +11,11 @@ use multiversx_sc_codec::TopEncodeMulti;
 
 use super::{
     contract_call_exec::UNSPECIFIED_GAS_LIMIT, contract_call_trait::ContractCallBase, AsyncCall,
-    ContractCallNoPayment, ContractCallWithEgld, DeployCall, ExplicitGas, FunctionCall,
-    ManagedArgBuffer, OriginalResultMarker, RHList, RHListAppendNoRet, RHListAppendRet, RHListItem,
-    TxData, TxDataFunctionCall, TxEnv, TxFrom, TxFromSpecified, TxGas, TxPayment,
-    TxPaymentEgldOnly, TxResultHandler, TxScEnv, TxTo, TxToSpecified,
+    Code, ContractCallNoPayment, ContractCallWithEgld, ContractDeploy, DeployCall, ExplicitGas,
+    FromSource, FunctionCall, ManagedArgBuffer, OriginalResultMarker, RHList, RHListAppendNoRet,
+    RHListAppendRet, RHListItem, TxCodeSource, TxData, TxDataFunctionCall, TxEnv, TxFrom,
+    TxFromSpecified, TxGas, TxPayment, TxPaymentEgldOnly, TxResultHandler, TxScEnv, TxTo,
+    TxToSpecified,
 };
 
 #[must_use]
@@ -589,14 +590,15 @@ where
     }
 }
 
-impl<Env, Payment, Gas, Data> Tx<Env, (), (), Payment, Gas, Data, ()>
+impl<Env, To, Payment, Gas, RH> Tx<Env, (), To, Payment, Gas, (), RH>
 where
     Env: TxEnv,
+    To: TxTo<Env>,
     Payment: TxPaymentEgldOnly<Env>,
     Gas: TxGas<Env>,
-    Data: TxData<Env>,
+    RH: TxResultHandler<Env>,
 {
-    pub fn raw_deploy(self) -> Tx<Env, (), (), Payment, Gas, DeployCall<Env>, ()> {
+    pub fn raw_deploy(self) -> Tx<Env, (), To, Payment, Gas, DeployCall<Env, ()>, RH> {
         Tx {
             env: self.env,
             from: self.from,
@@ -609,43 +611,57 @@ where
     }
 }
 
-impl<Env, Payment, Gas> Tx<Env, (), (), Payment, Gas, DeployCall<Env>, ()>
+impl<Env, Payment, Gas, RH> Tx<Env, (), (), Payment, Gas, DeployCall<Env, ()>, RH>
 where
     Env: TxEnv,
     Payment: TxPaymentEgldOnly<Env>,
     Gas: TxGas<Env>,
+    RH: TxResultHandler<Env>,
 {
     pub fn code(
         mut self,
         code: ManagedBuffer<Env::Api>,
-    ) -> Tx<Env, (), (), Payment, Gas, DeployCall<Env>, ()> {
-        self.data.code = code;
+    ) -> Tx<Env, (), (), Payment, Gas, DeployCall<Env, Code<Env>>, RH> {
         Tx {
             env: self.env,
             from: self.from,
             to: self.to,
             payment: self.payment,
             gas: self.gas,
-            data: self.data,
+            data: self.data.code_source(Code::new(code)),
             result_handler: self.result_handler,
         }
     }
 
-    pub fn code_metadata(
+    pub fn from_source(
         mut self,
-        code_metadata: CodeMetadata,
-    ) -> Tx<Env, (), (), Payment, Gas, DeployCall<Env>, ()> {
-        self.data.code_metadata = code_metadata;
+        source_address: ManagedAddress<Env::Api>,
+    ) -> Tx<Env, (), (), Payment, Gas, DeployCall<Env, FromSource<Env>>, RH> {
         Tx {
             env: self.env,
             from: self.from,
             to: self.to,
             payment: self.payment,
             gas: self.gas,
-            data: self.data,
+            data: self.data.code_source(FromSource::new(source_address)),
             result_handler: self.result_handler,
         }
     }
+}
+
+impl<Env, Payment, Gas, CodeSource, RH>
+    Tx<Env, (), (), Payment, Gas, DeployCall<Env, CodeSource>, RH>
+where
+    Env: TxEnv,
+    Payment: TxPaymentEgldOnly<Env>,
+    Gas: TxGas<Env>,
+    CodeSource: TxCodeSource<Env>,
+    RH: TxResultHandler<Env>,
+{
+    pub fn code_metadata(mut self, code_metadata: CodeMetadata) -> Self {
+        self.data = self.data.code_metadata(code_metadata);
+        self
+    }
 
     #[inline]
     pub fn argument<T: TopEncodeMulti>(mut self, arg: &T) -> Self {
@@ -659,3 +675,43 @@ where
         self
     }
 }
+
+impl<Api, To, Payment, OriginalResult>
+    From<
+        Tx<
+            TxScEnv<Api>,
+            (),
+            To,
+            Payment,
+            (),
+            DeployCall<TxScEnv<Api>, ()>,
+            OriginalResultMarker<OriginalResult>,
+        >,
+    > for ContractDeploy<Api, OriginalResult>
+where
+    Api: CallTypeApi + 'static,
+    To: TxTo<TxScEnv<Api>>,
+    Payment: TxPaymentEgldOnly<TxScEnv<Api>>,
+    OriginalResult: TopEncodeMulti,
+{
+    fn from(
+        value: Tx<
+            TxScEnv<Api>,
+            (),
+            To,
+            Payment,
+            (),
+            DeployCall<TxScEnv<Api>, ()>,
+            OriginalResultMarker<OriginalResult>,
+        >,
+    ) -> Self {
+        ContractDeploy {
+            _phantom: core::marker::PhantomData,
+            to: ManagedOption::none(),
+            egld_payment: value.payment.to_egld_payment().value,
+            explicit_gas_limit: UNSPECIFIED_GAS_LIMIT,
+            arg_buffer: value.data.arg_buffer,
+            _return_type: core::marker::PhantomData,
+        }
+    }
+}
diff --git a/framework/base/src/types/interaction/tx_call_deploy.rs b/framework/base/src/types/interaction/tx_call_deploy.rs
index 9d57e362e3..0a9be62266 100644
--- a/framework/base/src/types/interaction/tx_call_deploy.rs
+++ b/framework/base/src/types/interaction/tx_call_deploy.rs
@@ -1,13 +1,16 @@
+use multiversx_sc_codec::{CodecFrom, TopEncodeMulti};
+
 use crate::{
     api::CallTypeApi,
     contract_base::SendRawWrapper,
     tuple_util::NestedTupleFlatten,
-    types::{ManagedAddress, ManagedBuffer, ManagedVec},
+    types::{CodeMetadata, ManagedAddress, ManagedBuffer, ManagedVec},
 };
 
 use super::{
-    ConsNoRet, ConsRet, DeployCall, OriginalResultMarker, RHList, RHListItem, Tx,
-    TxDataFunctionCall, TxEnv, TxGas, TxPayment, TxPaymentEgldOnly, TxScEnv, TxToSpecified,
+    contract_call_exec::decode_result, Code, ConsNoRet, ConsRet, DeployCall, FromSource,
+    OriginalResultMarker, RHList, RHListItem, Tx, TxDataFunctionCall, TxEmptyResultHandler, TxEnv,
+    TxGas, TxPayment, TxPaymentEgldOnly, TxResultHandler, TxScEnv, TxToSpecified,
 };
 
 pub trait RHListItemDeploy<Env, Original>: RHListItem<Env, Original>
@@ -89,31 +92,198 @@ where
     }
 }
 
-impl<Api, Payment, Gas, RH> Tx<TxScEnv<Api>, (), (), Payment, Gas, DeployCall<TxScEnv<Api>>, RH>
+impl<Api, Payment, Gas, RH>
+    Tx<TxScEnv<Api>, (), (), Payment, Gas, DeployCall<TxScEnv<Api>, Code<TxScEnv<Api>>>, RH>
 where
     Api: CallTypeApi,
     Payment: TxPaymentEgldOnly<TxScEnv<Api>>,
     Gas: TxGas<TxScEnv<Api>>,
-    RH: RHListDeploy<TxScEnv<Api>>,
-    RH::ListReturns: NestedTupleFlatten,
+    RH: TxResultHandler<TxScEnv<Api>>,
 {
-    pub fn execute_deploy(self) -> <RH::ListReturns as NestedTupleFlatten>::Unpacked {
+    fn execute_deploy_raw(self) -> (ManagedAddress<Api>, ManagedVec<Api, ManagedBuffer<Api>>, RH) {
         let gas_limit = self.gas.resolve_gas(&self.env);
         let egld_payment = self.payment.to_egld_payment();
 
         let (new_address, raw_results) = SendRawWrapper::<Api>::new().deploy_contract(
             gas_limit,
             &egld_payment.value,
-            &self.data.code,
+            &self.data.code_source.code,
+            self.data.code_metadata,
+            &self.data.arg_buffer,
+        );
+
+        SendRawWrapper::<Api>::new().clean_return_data();
+
+        (new_address, raw_results, self.result_handler)
+    }
+}
+
+impl<Api, Payment, Gas, RH>
+    Tx<TxScEnv<Api>, (), (), Payment, Gas, DeployCall<TxScEnv<Api>, FromSource<TxScEnv<Api>>>, RH>
+where
+    Api: CallTypeApi,
+    Payment: TxPaymentEgldOnly<TxScEnv<Api>>,
+    Gas: TxGas<TxScEnv<Api>>,
+    RH: TxResultHandler<TxScEnv<Api>>,
+{
+    fn execute_deploy_from_source_raw(
+        self,
+    ) -> (ManagedAddress<Api>, ManagedVec<Api, ManagedBuffer<Api>>, RH) {
+        let gas_limit = self.gas.resolve_gas(&self.env);
+        let egld_payment = self.payment.to_egld_payment();
+
+        let (new_address, raw_results) = SendRawWrapper::<Api>::new().deploy_from_source_contract(
+            gas_limit,
+            &egld_payment.value,
+            &self.data.code_source.address,
             self.data.code_metadata,
             &self.data.arg_buffer,
         );
 
         SendRawWrapper::<Api>::new().clean_return_data();
 
-        let tuple_result = self
-            .result_handler
-            .list_deploy_result(&new_address, &raw_results);
+        (new_address, raw_results, self.result_handler)
+    }
+}
+
+impl<Api, Payment, Gas, RH>
+    Tx<TxScEnv<Api>, (), (), Payment, Gas, DeployCall<TxScEnv<Api>, Code<TxScEnv<Api>>>, RH>
+where
+    Api: CallTypeApi,
+    Payment: TxPaymentEgldOnly<TxScEnv<Api>>,
+    Gas: TxGas<TxScEnv<Api>>,
+    RH: RHListDeploy<TxScEnv<Api>>,
+    RH::ListReturns: NestedTupleFlatten,
+{
+    /// Synchronously deploys a contract.
+    pub fn sync_call(self) -> <RH::ListReturns as NestedTupleFlatten>::Unpacked {
+        let (new_address, raw_results, result_handler) = self.execute_deploy_raw();
+
+        let tuple_result = result_handler.list_deploy_result(&new_address, &raw_results);
         tuple_result.flatten_unpack()
     }
 }
+
+impl<Api, Payment, Gas, RH>
+    Tx<TxScEnv<Api>, (), (), Payment, Gas, DeployCall<TxScEnv<Api>, FromSource<TxScEnv<Api>>>, RH>
+where
+    Api: CallTypeApi,
+    Payment: TxPaymentEgldOnly<TxScEnv<Api>>,
+    Gas: TxGas<TxScEnv<Api>>,
+    RH: RHListDeploy<TxScEnv<Api>>,
+    RH::ListReturns: NestedTupleFlatten,
+{
+    /// Synchronously deploys a contract from source.
+    pub fn sync_call(self) -> <RH::ListReturns as NestedTupleFlatten>::Unpacked {
+        let (new_address, raw_results, result_handler) = self.execute_deploy_from_source_raw();
+
+        let tuple_result = result_handler.list_deploy_result(&new_address, &raw_results);
+        tuple_result.flatten_unpack()
+    }
+}
+
+impl<Api, Payment, Gas, OriginalResult>
+    Tx<
+        TxScEnv<Api>,
+        (),
+        (),
+        Payment,
+        Gas,
+        DeployCall<TxScEnv<Api>, ()>,
+        OriginalResultMarker<OriginalResult>,
+    >
+where
+    Api: CallTypeApi,
+    Payment: TxPaymentEgldOnly<TxScEnv<Api>>,
+    Gas: TxGas<TxScEnv<Api>>,
+    OriginalResult: TopEncodeMulti,
+{
+    /// Backwards compatibility, immitates the old API.
+    ///
+    /// Note that the data type (the `DeployCall`) doesn't have the code set.
+    /// This is because the old API was passing it as paramter, so we do the Apime here.
+    /// For clarity, we don't want it set twice.
+    pub fn deploy_contract<RequestedResult>(
+        self,
+        code: &ManagedBuffer<Api>,
+        code_metadata: CodeMetadata,
+    ) -> (ManagedAddress<Api>, RequestedResult)
+    where
+        RequestedResult: CodecFrom<OriginalResult>,
+    {
+        let (new_address, raw_results, _) = self
+            .code(code.clone())
+            .code_metadata(code_metadata)
+            .execute_deploy_raw();
+
+        (new_address, decode_result(raw_results))
+    }
+
+    /// Backwards compatibility, immitates the old API.
+    ///
+    /// Note that the data type (the `DeployCall`) doesn't have the code set.
+    /// This is because the old API was passing it as paramter, so we do the Apime here.
+    /// For clarity, we don't want it set twice.
+    pub fn deploy_from_source<RequestedResult>(
+        self,
+        source_address: &ManagedAddress<Api>,
+        code_metadata: CodeMetadata,
+    ) -> (ManagedAddress<Api>, RequestedResult)
+    where
+        RequestedResult: CodecFrom<OriginalResult>,
+    {
+        let (new_address, raw_results, _) = self
+            .from_source(source_address.clone())
+            .code_metadata(code_metadata)
+            .execute_deploy_from_source_raw();
+
+        (new_address, decode_result(raw_results))
+    }
+}
+
+impl<Api, Payment, Gas, RH>
+    Tx<TxScEnv<Api>, (), ManagedAddress<Api>, Payment, Gas, DeployCall<TxScEnv<Api>, ()>, RH>
+where
+    Api: CallTypeApi,
+    Payment: TxPaymentEgldOnly<TxScEnv<Api>>,
+    Gas: TxGas<TxScEnv<Api>>,
+    RH: TxEmptyResultHandler<TxScEnv<Api>>,
+{
+    /// Backwards compatibility, immitates the old API.
+    ///
+    /// Note that the data type (the `DeployCall`) doesn't have the code set.
+    /// This is because the old API was passing it as paramter, so we do the Apime here.
+    /// For clarity, we don't want it set twice.
+    pub fn upgrade_contract(self, code: &ManagedBuffer<Api>, code_metadata: CodeMetadata) {
+        let gas = self.gas.explicit_or_gas_left(&self.env);
+        SendRawWrapper::<Api>::new().upgrade_contract(
+            &self.to,
+            gas,
+            &self.payment.to_egld_payment().value,
+            code,
+            code_metadata,
+            &self.data.arg_buffer,
+        );
+    }
+
+    /// Backwards compatibility, immitates the old API.
+    ///
+    /// Note that the data type (the `DeployCall`) doesn't have the code set.
+    /// This is because the old API was passing it as paramter, so we do the Apime here.
+    /// For clarity, we don't want it set twice.
+    pub fn upgrade_from_source(
+        self,
+        source_address: &ManagedAddress<Api>,
+        code_metadata: CodeMetadata,
+    ) {
+        let gas = self.gas.explicit_or_gas_left(&self.env);
+        SendRawWrapper::<Api>::new().upgrade_from_source_contract(
+            &self.to,
+            gas,
+            &self.payment.to_egld_payment().value,
+            source_address,
+            code_metadata,
+            &self.data.arg_buffer,
+        );
+    }
+}
diff --git a/framework/base/src/types/interaction/tx_code_source.rs b/framework/base/src/types/interaction/tx_code_source.rs
new file mode 100644
index 0000000000..b83963d33b
--- /dev/null
+++ b/framework/base/src/types/interaction/tx_code_source.rs
@@ -0,0 +1,62 @@
+use crate::{
+    api::ManagedTypeApi,
+    types::{ManagedAddress, ManagedBuffer},
+};
+
+use super::TxEnv;
+
+pub trait TxCodeSource<Env>
+where
+    Env: TxEnv,
+{
+}
+
+impl<Env> TxCodeSource<Env> for () where Env: TxEnv {}
+
+pub trait TxCodeSourceSpecified<Env>: TxCodeSource<Env>
+where
+    Env: TxEnv,
+{
+}
+
+/// Contains code for a deploy or upgrade.
+pub struct Code<Env>
+where
+    Env: TxEnv,
+{
+    pub code: ManagedBuffer<Env::Api>,
+}
+
+impl<Env> Code<Env>
+where
+    Env: TxEnv,
+{
+    pub fn new(code: ManagedBuffer<Env::Api>) -> Self {
+        Code { code }
+    }
+}
+
+impl<Env> TxCodeSource<Env> for Code<Env> where Env: TxEnv {}
+
+impl<Env> TxCodeSourceSpecified<Env> for Code<Env> where Env: TxEnv {}
+
+/// Indicates the source of a "deploy from source" or "upgrade from source".
+pub struct FromSource<Env>
+where
+    Env: TxEnv,
+{
+    pub address: ManagedAddress<Env::Api>,
+}
+
+impl<Env> FromSource<Env>
+where
+    Env: TxEnv,
+{
+    pub fn new(address: ManagedAddress<Env::Api>) -> Self {
+        FromSource { address }
+    }
+}
+
+impl<Env> TxCodeSource<Env> for FromSource<Env> where Env: TxEnv {}
+
+impl<Env> TxCodeSourceSpecified<Env> for FromSource<Env> where Env: TxEnv {}
diff --git a/framework/base/src/types/interaction/tx_gas.rs b/framework/base/src/types/interaction/tx_gas.rs
index 621ed86303..0b867b19a2 100644
--- a/framework/base/src/types/interaction/tx_gas.rs
+++ b/framework/base/src/types/interaction/tx_gas.rs
@@ -1,10 +1,13 @@
 use super::TxEnv;
+use crate::api::{BlockchainApi, BlockchainApiImpl};
 
 pub trait TxGas<Env>
 where
     Env: TxEnv,
 {
     fn resolve_gas(&self, env: &Env) -> u64;
+
+    fn explicit_or_gas_left(&self, env: &Env) -> u64;
 }
 
 impl<Env> TxGas<Env> for ()
@@ -14,6 +17,10 @@ where
     fn resolve_gas(&self, env: &Env) -> u64 {
         env.default_gas()
     }
+
+    fn explicit_or_gas_left(&self, env: &Env) -> u64 {
+        Env::Api::blockchain_api_impl().get_gas_left()
+    }
 }
 
 pub struct ExplicitGas(pub u64);
@@ -26,4 +33,8 @@ where
     fn resolve_gas(&self, _env: &Env) -> u64 {
         self.0
     }
+
+    fn explicit_or_gas_left(&self, _env: &Env) -> u64 {
+        self.0
+    }
 }
diff --git a/framework/derive/src/generate/proxy_gen.rs b/framework/derive/src/generate/proxy_gen.rs
index 9fcdf60490..8f4734558e 100644
--- a/framework/derive/src/generate/proxy_gen.rs
+++ b/framework/derive/src/generate/proxy_gen.rs
@@ -62,34 +62,14 @@ pub fn generate_proxy_method_sig(
     result
 }
 
-pub fn generate_proxy_method_sig_old(
-    method: &Method,
-    proxy_return_struct_path: proc_macro2::TokenStream,
-) -> proc_macro2::TokenStream {
-    let method_name = &method.name;
-    let mut generics = method.generics.clone();
-    let generics_where = &method.generics.where_clause;
-    let arg_decl = proxy_arg_gen(&method.method_args, &mut generics);
-    let ret_tok = match &method.return_type {
+fn original_type_tokens(m: &Method) -> proc_macro2::TokenStream {
+    match &m.return_type {
         syn::ReturnType::Default => quote! { () },
         syn::ReturnType::Type(_, ty) => quote! { #ty },
-    };
-    let result = quote! {
-        fn #method_name #generics (
-            &mut self,
-            #(#arg_decl),*
-        ) -> #proxy_return_struct_path<Self::Api, #ret_tok>
-        #generics_where
-    };
-    result
+    }
 }
 
 pub fn generate_proxy_endpoint(m: &Method, endpoint_name: String) -> proc_macro2::TokenStream {
-    let original_type = match &m.return_type {
-        syn::ReturnType::Default => quote! { () },
-        syn::ReturnType::Type(_, ty) => quote! { #ty },
-    };
-
     let mut token_count = 0;
     let mut token_expr =
         quote! { multiversx_sc::types::EgldOrEsdtTokenIdentifier::<Self::Api>::egld() };
@@ -177,6 +157,7 @@ pub fn generate_proxy_endpoint(m: &Method, endpoint_name: String) -> proc_macro2
         payment_init = quote! {};
     }
 
+    let original_type = original_type_tokens(m);
     let return_type = quote! {
         multiversx_sc::types::Tx<
             multiversx_sc::types::TxScEnv<Self::Api>,
@@ -209,50 +190,41 @@ pub fn generate_proxy_endpoint(m: &Method, endpoint_name: String) -> proc_macro2
 }
 
 pub fn generate_proxy_deploy(init_method: &Method) -> proc_macro2::TokenStream {
-    let msig =
-        generate_proxy_method_sig_old(init_method, quote! { multiversx_sc::types::ContractDeploy });
-
     let mut payment_count = 0;
     let mut multi_count = 0;
     let mut token_count = 0;
     let mut nonce_count = 0;
 
-    let arg_push_snippets: Vec<proc_macro2::TokenStream> = init_method
-        .method_args
-        .iter()
-        .map(|arg| match &arg.metadata.payment {
+    let mut payment_type = quote! { () };
+    let mut payment_init = quote! {};
+
+    let mut arg_push_snippets = Vec::<proc_macro2::TokenStream>::new();
+
+    for arg in &init_method.method_args {
+        match &arg.metadata.payment {
             ArgPaymentMetadata::NotPayment => {
                 let pat = &arg.pat;
-                quote! {
-                    ___contract_deploy___.push_endpoint_arg(&#pat);
-                }
+                arg_push_snippets.push(quote! {
+                    .argument(&#pat)
+                });
             },
             ArgPaymentMetadata::PaymentToken => {
                 token_count += 1;
-
-                quote! {}
             },
             ArgPaymentMetadata::PaymentNonce => {
                 nonce_count += 1;
-
-                quote! {}
             },
             ArgPaymentMetadata::PaymentAmount => {
                 payment_count += 1;
-                let pat = &arg.pat;
-                quote! {
-                    ___contract_deploy___ = ___contract_deploy___.with_egld_transfer(#pat);
-                }
+                let payment_expr = &arg.pat;
+                payment_type = quote! { multiversx_sc::types::EgldPayment<Self::Api> };
+                payment_init = quote! { .egld(#payment_expr) };
             },
             ArgPaymentMetadata::PaymentMulti => {
                 multi_count += 1;
-                let pat = &arg.pat;
-                quote! {
-                    ___contract_deploy___ = ___contract_deploy___.with_multi_token_transfer(#pat);
-                }
             },
-        })
-        .collect();
+        }
+    }
 
     assert!(
         payment_count <= 1,
@@ -260,17 +232,36 @@ pub fn generate_proxy_deploy(init_method: &Method) -> proc_macro2::TokenStream {
     );
     assert!(token_count == 0, "No ESDT payment allowed in #[init]");
     assert!(nonce_count == 0, "No SFT/NFT payment allowed in #[init]");
+    assert!(
+        multi_count == 0,
+        "No multi ESDT payments allowed in #[init]"
+    );
+
+    let original_type = original_type_tokens(init_method);
+    let return_type = quote! {
+        multiversx_sc::types::Tx<
+            multiversx_sc::types::TxScEnv<Self::Api>,
+            (),
+            Self::To, // still accepted, until we separate the upgrade constructor completely
+            #payment_type,
+            (),
+            multiversx_sc::types::DeployCall<multiversx_sc::types::TxScEnv<Self::Api>, ()>,
+            multiversx_sc::types::OriginalResultMarker<#original_type>,
+        >
+    };
+
+    let msig = generate_proxy_method_sig(init_method, return_type);
 
     let sig = quote! {
         #[allow(clippy::too_many_arguments)]
         #[allow(clippy::type_complexity)]
         #msig {
-            let ___opt_address___ = self.extract_opt_address();
-            let mut ___contract_deploy___ = multiversx_sc::types::new_contract_deploy(
-                ___opt_address___,
-            );
-            #(#arg_push_snippets)*
-            ___contract_deploy___
+            multiversx_sc::types::TxBaseWithEnv::new_tx_from_sc()
+                .raw_deploy()
+                #payment_init
+                #(#arg_push_snippets)*
+                .original_result()
+                .to(self.extract_proxy_to()) // still accepted, until we separate the upgrade constructor completely
         }
     };
 
diff --git a/framework/scenario/src/scenario/model/step/sc_deploy_step.rs b/framework/scenario/src/scenario/model/step/sc_deploy_step.rs
index 0ade06fc0f..d062baa15a 100644
--- a/framework/scenario/src/scenario/model/step/sc_deploy_step.rs
+++ b/framework/scenario/src/scenario/model/step/sc_deploy_step.rs
@@ -98,11 +98,11 @@ impl ScDeployStep {
     /// Sets following fields based on the smart contract proxy:
     /// - "function"
     /// - "arguments"
-    pub fn call<OriginalResult>(
-        mut self,
-        contract_deploy: ContractDeploy<StaticApi, OriginalResult>,
-    ) -> TypedScDeploy<OriginalResult> {
-        let (_, mandos_args) = process_contract_deploy(contract_deploy);
+    pub fn call<OriginalResult, CD>(mut self, contract_deploy: CD) -> TypedScDeploy<OriginalResult>
+    where
+        CD: Into<ContractDeploy<StaticApi, OriginalResult>>,
+    {
+        let (_, mandos_args) = process_contract_deploy(contract_deploy.into());
         for arg in mandos_args {
             self = self.argument(arg.as_str());
         }

From 533b386980b0c8e5081e68dddec70247ddbcce12 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 16 Feb 2024 02:42:43 +0200
Subject: [PATCH 0357/1254] unified syntax in forwarder-raw deploy/upgrade

---
 .../src/forwarder_raw_deploy_upgrade.rs       | 61 ++++++++++---------
 .../forw_raw_contract_deploy.scen.json        |  1 -
 framework/base/src/types/interaction/tx.rs    | 12 ++--
 .../src/types/interaction/tx_call_deploy.rs   | 58 ++++++++++++++++++
 4 files changed, 96 insertions(+), 36 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 53a46c1f98..f9e7e715b7 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
@@ -26,35 +26,35 @@ pub trait ForwarderRawDeployUpgrade {
         &self,
         source_contract_address: ManagedAddress,
         code_metadata: CodeMetadata,
-        arguments: MultiValueEncoded<ManagedBuffer>,
+        args: MultiValueEncoded<ManagedBuffer>,
     ) -> ManagedAddress {
-        let (address, _) = self.send_raw().deploy_from_source_contract(
-            self.blockchain().get_gas_left(),
-            &BigUint::zero(),
-            &source_contract_address,
-            code_metadata,
-            &arguments.to_arg_buffer(),
-        );
-
-        address
+        self.tx()
+            .raw_deploy()
+            .from_source(source_contract_address)
+            .code_metadata(code_metadata)
+            .arguments_raw(args.to_arg_buffer())
+            .with_gas_limit(self.blockchain().get_gas_left())
+            .returns(ReturnsNewAddress)
+            .sync_call()
+            .into()
     }
 
     #[endpoint]
     fn call_upgrade(
         &self,
-        child_sc_address: &ManagedAddress,
-        new_code: &ManagedBuffer,
+        child_sc_address: ManagedAddress,
+        new_code: ManagedBuffer,
         code_metadata: CodeMetadata,
-        arguments: MultiValueEncoded<ManagedBuffer>,
+        args: MultiValueEncoded<ManagedBuffer>,
     ) {
-        self.send_raw().upgrade_contract(
-            child_sc_address,
-            self.blockchain().get_gas_left(),
-            &BigUint::zero(),
-            new_code,
-            code_metadata,
-            &arguments.to_arg_buffer(),
-        );
+        self.tx()
+            .to(child_sc_address)
+            .raw_deploy()
+            .code(new_code)
+            .code_metadata(code_metadata)
+            .arguments_raw(args.to_arg_buffer())
+            .upgrade_async_call()
+            .into()
     }
 
     #[endpoint]
@@ -63,15 +63,16 @@ pub trait ForwarderRawDeployUpgrade {
         sc_address: ManagedAddress,
         source_contract_address: ManagedAddress,
         code_metadata: CodeMetadata,
-        arguments: MultiValueEncoded<ManagedBuffer>,
+        args: MultiValueEncoded<ManagedBuffer>,
     ) {
-        self.send_raw().upgrade_from_source_contract(
-            &sc_address,
-            self.blockchain().get_gas_left(),
-            &BigUint::zero(),
-            &source_contract_address,
-            code_metadata,
-            &arguments.to_arg_buffer(),
-        )
+        self.tx()
+            .to(sc_address)
+            .raw_deploy()
+            .from_source(source_contract_address)
+            .code_metadata(code_metadata)
+            .arguments_raw(args.to_arg_buffer())
+            .with_gas_limit(self.blockchain().get_gas_left())
+            .upgrade_async_call()
+            .into()
     }
 }
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 641dd34347..5e0097f354 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
@@ -128,7 +128,6 @@
             },
             "expect": {
                 "out": [
-                    "str:some_argument",
                     "sc:child-src-with-arg"
                 ],
                 "status": "0",
diff --git a/framework/base/src/types/interaction/tx.rs b/framework/base/src/types/interaction/tx.rs
index 48281ac272..2aaa4f373a 100644
--- a/framework/base/src/types/interaction/tx.rs
+++ b/framework/base/src/types/interaction/tx.rs
@@ -611,9 +611,10 @@ where
     }
 }
 
-impl<Env, Payment, Gas, RH> Tx<Env, (), (), Payment, Gas, DeployCall<Env, ()>, RH>
+impl<Env, To, Payment, Gas, RH> Tx<Env, (), To, Payment, Gas, DeployCall<Env, ()>, RH>
 where
     Env: TxEnv,
+    To: TxTo<Env>,
     Payment: TxPaymentEgldOnly<Env>,
     Gas: TxGas<Env>,
     RH: TxResultHandler<Env>,
@@ -621,7 +622,7 @@ where
     pub fn code(
         mut self,
         code: ManagedBuffer<Env::Api>,
-    ) -> Tx<Env, (), (), Payment, Gas, DeployCall<Env, Code<Env>>, RH> {
+    ) -> Tx<Env, (), To, Payment, Gas, DeployCall<Env, Code<Env>>, RH> {
         Tx {
             env: self.env,
             from: self.from,
@@ -636,7 +637,7 @@ where
     pub fn from_source(
         mut self,
         source_address: ManagedAddress<Env::Api>,
-    ) -> Tx<Env, (), (), Payment, Gas, DeployCall<Env, FromSource<Env>>, RH> {
+    ) -> Tx<Env, (), To, Payment, Gas, DeployCall<Env, FromSource<Env>>, RH> {
         Tx {
             env: self.env,
             from: self.from,
@@ -649,10 +650,11 @@ where
     }
 }
 
-impl<Env, Payment, Gas, CodeSource, RH>
-    Tx<Env, (), (), Payment, Gas, DeployCall<Env, CodeSource>, RH>
+impl<Env, To, Payment, Gas, CodeSource, RH>
+    Tx<Env, (), To, Payment, Gas, DeployCall<Env, CodeSource>, RH>
 where
     Env: TxEnv,
+    To: TxTo<Env>,
     Payment: TxPaymentEgldOnly<Env>,
     Gas: TxGas<Env>,
     CodeSource: TxCodeSource<Env>,
diff --git a/framework/base/src/types/interaction/tx_call_deploy.rs b/framework/base/src/types/interaction/tx_call_deploy.rs
index 0a9be62266..0fc3563980 100644
--- a/framework/base/src/types/interaction/tx_call_deploy.rs
+++ b/framework/base/src/types/interaction/tx_call_deploy.rs
@@ -182,6 +182,64 @@ where
     }
 }
 
+impl<Api, Payment, Gas, RH>
+    Tx<
+        TxScEnv<Api>,
+        (),
+        ManagedAddress<Api>,
+        Payment,
+        Gas,
+        DeployCall<TxScEnv<Api>, Code<TxScEnv<Api>>>,
+        RH,
+    >
+where
+    Api: CallTypeApi,
+    Payment: TxPaymentEgldOnly<TxScEnv<Api>>,
+    Gas: TxGas<TxScEnv<Api>>,
+    RH: TxEmptyResultHandler<TxScEnv<Api>>,
+{
+    pub fn upgrade_async_call(self) {
+        let gas = self.gas.explicit_or_gas_left(&self.env);
+        SendRawWrapper::<Api>::new().upgrade_contract(
+            &self.to,
+            gas,
+            &self.payment.to_egld_payment().value,
+            &self.data.code_source.code,
+            self.data.code_metadata,
+            &self.data.arg_buffer,
+        );
+    }
+}
+
+impl<Api, Payment, Gas, RH>
+    Tx<
+        TxScEnv<Api>,
+        (),
+        ManagedAddress<Api>,
+        Payment,
+        Gas,
+        DeployCall<TxScEnv<Api>, FromSource<TxScEnv<Api>>>,
+        RH,
+    >
+where
+    Api: CallTypeApi,
+    Payment: TxPaymentEgldOnly<TxScEnv<Api>>,
+    Gas: TxGas<TxScEnv<Api>>,
+    RH: TxEmptyResultHandler<TxScEnv<Api>>,
+{
+    pub fn upgrade_async_call(self) {
+        let gas = self.gas.explicit_or_gas_left(&self.env);
+        SendRawWrapper::<Api>::new().upgrade_from_source_contract(
+            &self.to,
+            gas,
+            &self.payment.to_egld_payment().value,
+            &self.data.code_source.address,
+            self.data.code_metadata,
+            &self.data.arg_buffer,
+        );
+    }
+}
+
 impl<Api, Payment, Gas, OriginalResult>
     Tx<
         TxScEnv<Api>,

From 60b656ef4a09f7572dc5119948941bfe31d2070a Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 16 Feb 2024 10:05:20 +0200
Subject: [PATCH 0358/1254] cleanup

---
 .../forwarder-raw/src/forwarder_raw_deploy_upgrade.rs      | 7 ++-----
 1 file changed, 2 insertions(+), 5 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 f9e7e715b7..b8fc6138eb 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
@@ -36,7 +36,6 @@ pub trait ForwarderRawDeployUpgrade {
             .with_gas_limit(self.blockchain().get_gas_left())
             .returns(ReturnsNewAddress)
             .sync_call()
-            .into()
     }
 
     #[endpoint]
@@ -53,8 +52,7 @@ pub trait ForwarderRawDeployUpgrade {
             .code(new_code)
             .code_metadata(code_metadata)
             .arguments_raw(args.to_arg_buffer())
-            .upgrade_async_call()
-            .into()
+            .upgrade_async_call();
     }
 
     #[endpoint]
@@ -72,7 +70,6 @@ pub trait ForwarderRawDeployUpgrade {
             .code_metadata(code_metadata)
             .arguments_raw(args.to_arg_buffer())
             .with_gas_limit(self.blockchain().get_gas_left())
-            .upgrade_async_call()
-            .into()
+            .upgrade_async_call();
     }
 }

From 72db5f7ae0dd08ef50f3c331b122d0d6005319a1 Mon Sep 17 00:00:00 2001
From: Dorin Marian Iancu <dorin.iancu@multiversx.com>
Date: Fri, 16 Feb 2024 15:30:39 +0200
Subject: [PATCH 0359/1254] partial impl

---
 framework/base/src/storage/mappers.rs         |   2 +
 .../mappers/ordered_binary_tree_mapper.rs     | 236 ++++++++++++++++++
 2 files changed, 238 insertions(+)
 create mode 100644 framework/base/src/storage/mappers/ordered_binary_tree_mapper.rs

diff --git a/framework/base/src/storage/mappers.rs b/framework/base/src/storage/mappers.rs
index 5b220073b8..67fc014859 100644
--- a/framework/base/src/storage/mappers.rs
+++ b/framework/base/src/storage/mappers.rs
@@ -4,6 +4,7 @@ mod linked_list_mapper;
 mod map_mapper;
 mod map_storage_mapper;
 mod mapper;
+mod ordered_binary_tree_mapper;
 mod queue_mapper;
 mod set_mapper;
 mod single_value_mapper;
@@ -20,6 +21,7 @@ pub use linked_list_mapper::{LinkedListMapper, LinkedListNode};
 pub use map_mapper::MapMapper;
 pub use map_storage_mapper::MapStorageMapper;
 pub use mapper::{StorageClearable, StorageMapper};
+pub use ordered_binary_tree_mapper::{NodeId, OrderedBinaryTreeMapper, OrderedBinaryTreeNode};
 pub use queue_mapper::QueueMapper;
 pub use set_mapper::SetMapper;
 pub use single_value_mapper::{SingleValue, SingleValueMapper};
diff --git a/framework/base/src/storage/mappers/ordered_binary_tree_mapper.rs b/framework/base/src/storage/mappers/ordered_binary_tree_mapper.rs
new file mode 100644
index 0000000000..edf1262a53
--- /dev/null
+++ b/framework/base/src/storage/mappers/ordered_binary_tree_mapper.rs
@@ -0,0 +1,236 @@
+use core::marker::PhantomData;
+
+use crate::{
+    api::StorageMapperApi,
+    imports::{ErrorApiImpl, ManagedType},
+    storage::StorageKey,
+    storage_set,
+};
+
+use super::set_mapper::{CurrentStorage, StorageAddress};
+
+use crate::codec::{
+    self,
+    derive::{TopDecode, TopEncode},
+    NestedDecode, NestedEncode, TopDecode, TopEncode,
+};
+
+pub type NodeId = u64;
+
+const NULL_ID: NodeId = 0;
+
+static ID_SUFFIX: &[u8] = b"_id";
+static LAST_ID_KEY_SUFFIX: &[u8] = b"_lastId";
+
+static CORRUPT_TREE_ERR_MGS: &[u8] = b"Corrupt tree";
+
+#[derive(TopEncode, TopDecode, Clone)]
+pub struct OrderedBinaryTreeNode<
+    T: TopEncode + TopDecode + NestedEncode + NestedDecode + PartialOrd + PartialEq + Clone,
+> {
+    pub(crate) left_id: NodeId,
+    pub(crate) right_id: NodeId,
+    pub(crate) data: T,
+}
+
+impl<T> OrderedBinaryTreeNode<T>
+where
+    T: TopEncode + TopDecode + NestedEncode + NestedDecode + PartialOrd + PartialEq + Clone,
+{
+    pub fn new(data: T) -> Self {
+        Self {
+            data,
+            left_id: NULL_ID,
+            right_id: NULL_ID,
+        }
+    }
+
+    #[inline]
+    pub fn get_data(&self) -> &T {
+        &self.data
+    }
+}
+
+pub struct OrderedBinaryTreeMapper<SA, T, A = CurrentStorage>
+where
+    SA: StorageMapperApi,
+    A: StorageAddress<SA>,
+    T: TopEncode + TopDecode + NestedEncode + NestedDecode + PartialOrd + PartialEq + Clone,
+{
+    opt_root: Option<OrderedBinaryTreeNode<T>>,
+    address: A,
+    key: StorageKey<SA>,
+    _phantom_api: PhantomData<SA>,
+    _phantom_item: PhantomData<T>,
+}
+
+impl<SA, T, A> OrderedBinaryTreeMapper<SA, T, A>
+where
+    SA: StorageMapperApi,
+    A: StorageAddress<SA>,
+    T: TopEncode + TopDecode + NestedEncode + NestedDecode + PartialOrd + PartialEq + Clone,
+{
+    pub fn get_root(&self) -> Option<OrderedBinaryTreeNode<T>> {
+        self.opt_root.clone()
+    }
+
+    pub fn get_node_by_id(&self, id: NodeId) -> Option<OrderedBinaryTreeNode<T>> {
+        if id == NULL_ID {
+            return None;
+        }
+
+        let key = self.build_key_for_item(id);
+        let storage_len = self.address.address_storage_get_len(key.as_ref());
+        if storage_len == 0 {
+            return None;
+        }
+
+        Some(self.address.address_storage_get(key.as_ref()))
+    }
+
+    pub fn try_get_node_by_id(&self, id: NodeId) -> OrderedBinaryTreeNode<T> {
+        let opt_node = self.get_node_by_id(id);
+        if opt_node.is_none() {
+            SA::error_api_impl().signal_error(CORRUPT_TREE_ERR_MGS);
+        }
+
+        unsafe { opt_node.unwrap_unchecked() }
+    }
+
+    pub fn get_depth(&self, node: &OrderedBinaryTreeNode<T>) -> usize {
+        if self.opt_root.is_none() {
+            return 0;
+        }
+
+        let opt_left_node = self.get_node_by_id(node.left_id);
+        let opt_right_node = self.get_node_by_id(node.right_id);
+
+        let l_depth = match opt_left_node {
+            Some(left_node) => self.get_depth(&left_node),
+            None => 0,
+        };
+        let r_depth = match opt_right_node {
+            Some(right_node) => self.get_depth(&right_node),
+            None => 0,
+        };
+
+        core::cmp::max(l_depth, r_depth) + 1
+    }
+
+    pub fn recursive_search(
+        &self,
+        opt_node: Option<OrderedBinaryTreeNode<T>>,
+        data: &T,
+    ) -> Option<OrderedBinaryTreeNode<T>> {
+        if opt_node.is_none() {
+            return None;
+        }
+
+        let node = unsafe { opt_node.unwrap_unchecked() };
+        if &node.data == data {
+            return Some(node);
+        }
+
+        if data < &node.data {
+            let opt_left_node = self.get_node_by_id(node.left_id);
+            self.recursive_search(opt_left_node, data)
+        } else {
+            let opt_right_node = self.get_node_by_id(node.right_id);
+            self.recursive_search(opt_right_node, data)
+        }
+    }
+
+    pub fn iterative_search(
+        &self,
+        mut opt_node: Option<OrderedBinaryTreeNode<T>>,
+        data: &T,
+    ) -> Option<OrderedBinaryTreeNode<T>> {
+        while opt_node.is_some() {
+            let node = unsafe { opt_node.unwrap_unchecked() };
+            if &node.data == data {
+                return Some(node);
+            }
+
+            if data < &node.data {
+                opt_node = self.get_node_by_id(node.left_id);
+            } else {
+                opt_node = self.get_node_by_id(node.right_id);
+            }
+        }
+
+        None
+    }
+
+    pub fn find_max(&self, mut node: OrderedBinaryTreeNode<T>) -> OrderedBinaryTreeNode<T> {
+        while node.right_id != NULL_ID {
+            node = self.try_get_node_by_id(node.right_id);
+        }
+
+        node
+    }
+
+    pub fn find_min(&self, mut node: OrderedBinaryTreeNode<T>) -> OrderedBinaryTreeNode<T> {
+        while node.left_id != NULL_ID {
+            node = self.try_get_node_by_id(node.left_id);
+        }
+
+        node
+    }
+
+    pub fn find_successor(&self, node: OrderedBinaryTreeNode<T>) -> OrderedBinaryTreeNode<T> {
+        if node.right_id != NULL_ID {
+            let right_node = self.try_get_node_by_id(node.right_id);
+            return self.find_min(right_node);
+        }
+    }
+
+    // pub fn insert_element(&mut self, data: T) {
+    //     let new_node = OrderedBinaryTreeNode::new(data);
+    //     if self.opt_root.is_none() {
+    //         let root_id = self.get_and_increment_last_id();
+    //         self.set_item(root_id, &new_node);
+    //     }
+    // }
+}
+
+impl<SA, T, A> OrderedBinaryTreeMapper<SA, T, A>
+where
+    SA: StorageMapperApi,
+    A: StorageAddress<SA>,
+    T: TopEncode + TopDecode + NestedEncode + NestedDecode + PartialOrd + PartialEq + Clone,
+{
+    fn build_key_for_item(&self, id: NodeId) -> StorageKey<SA> {
+        let mut item_key = self.key.clone();
+        item_key.append_bytes(ID_SUFFIX);
+        item_key.append_item(&id);
+
+        item_key
+    }
+
+    fn build_last_id_key(&self) -> StorageKey<SA> {
+        let mut key = self.key.clone();
+        key.append_bytes(LAST_ID_KEY_SUFFIX);
+
+        key
+    }
+
+    fn get_last_id(&self) -> NodeId {
+        let key = self.build_last_id_key();
+
+        self.address.address_storage_get(key.as_ref())
+    }
+
+    fn get_and_increment_last_id(&self) -> NodeId {
+        let key = self.build_last_id_key();
+        let last_id: NodeId = self.address.address_storage_get(key.as_ref());
+        let new_id = last_id + 1;
+        storage_set(key.as_ref(), &new_id);
+
+        new_id
+    }
+
+    fn set_item(&mut self, id: NodeId, node: &OrderedBinaryTreeNode<T>) {
+        let key = self.build_key_for_item(id);
+        storage_set(key.as_ref(), node);
+    }
+}

From e6a85404a12c264592d491383c82acc86cae0ac5 Mon Sep 17 00:00:00 2001
From: Dorin Marian Iancu <dorin.iancu@multiversx.com>
Date: Mon, 19 Feb 2024 09:37:13 +0200
Subject: [PATCH 0360/1254] search

---
 framework/base/src/storage/mappers.rs         |   4 +-
 .../mappers/ordered_binary_tree_mapper.rs     | 141 ++++++++++++------
 2 files changed, 97 insertions(+), 48 deletions(-)

diff --git a/framework/base/src/storage/mappers.rs b/framework/base/src/storage/mappers.rs
index 67fc014859..b6bac7f06b 100644
--- a/framework/base/src/storage/mappers.rs
+++ b/framework/base/src/storage/mappers.rs
@@ -21,7 +21,9 @@ pub use linked_list_mapper::{LinkedListMapper, LinkedListNode};
 pub use map_mapper::MapMapper;
 pub use map_storage_mapper::MapStorageMapper;
 pub use mapper::{StorageClearable, StorageMapper};
-pub use ordered_binary_tree_mapper::{NodeId, OrderedBinaryTreeMapper, OrderedBinaryTreeNode};
+pub use ordered_binary_tree_mapper::{
+    NodeId, OrderedBinaryTreeMapper, OrderedBinaryTreeNode, NULL_NODE_ID,
+};
 pub use queue_mapper::QueueMapper;
 pub use set_mapper::SetMapper;
 pub use single_value_mapper::{SingleValue, SingleValueMapper};
diff --git a/framework/base/src/storage/mappers/ordered_binary_tree_mapper.rs b/framework/base/src/storage/mappers/ordered_binary_tree_mapper.rs
index edf1262a53..0b7d7e9b65 100644
--- a/framework/base/src/storage/mappers/ordered_binary_tree_mapper.rs
+++ b/framework/base/src/storage/mappers/ordered_binary_tree_mapper.rs
@@ -12,12 +12,12 @@ use super::set_mapper::{CurrentStorage, StorageAddress};
 use crate::codec::{
     self,
     derive::{TopDecode, TopEncode},
-    NestedDecode, NestedEncode, TopDecode, TopEncode,
+    NestedDecode, NestedEncode,
 };
 
 pub type NodeId = u64;
 
-const NULL_ID: NodeId = 0;
+pub const NULL_NODE_ID: NodeId = 0;
 
 static ID_SUFFIX: &[u8] = b"_id";
 static LAST_ID_KEY_SUFFIX: &[u8] = b"_lastId";
@@ -25,23 +25,25 @@ static LAST_ID_KEY_SUFFIX: &[u8] = b"_lastId";
 static CORRUPT_TREE_ERR_MGS: &[u8] = b"Corrupt tree";
 
 #[derive(TopEncode, TopDecode, Clone)]
-pub struct OrderedBinaryTreeNode<
-    T: TopEncode + TopDecode + NestedEncode + NestedDecode + PartialOrd + PartialEq + Clone,
-> {
+pub struct OrderedBinaryTreeNode<T: NestedEncode + NestedDecode + PartialOrd + PartialEq + Clone> {
+    pub(crate) current_node_id: NodeId,
     pub(crate) left_id: NodeId,
     pub(crate) right_id: NodeId,
+    pub(crate) parent_id: NodeId,
     pub(crate) data: T,
 }
 
 impl<T> OrderedBinaryTreeNode<T>
 where
-    T: TopEncode + TopDecode + NestedEncode + NestedDecode + PartialOrd + PartialEq + Clone,
+    T: NestedEncode + NestedDecode + PartialOrd + PartialEq + Clone,
 {
-    pub fn new(data: T) -> Self {
+    pub fn new(current_node_id: NodeId, data: T) -> Self {
         Self {
             data,
-            left_id: NULL_ID,
-            right_id: NULL_ID,
+            current_node_id,
+            left_id: NULL_NODE_ID,
+            right_id: NULL_NODE_ID,
+            parent_id: NULL_NODE_ID,
         }
     }
 
@@ -55,7 +57,7 @@ pub struct OrderedBinaryTreeMapper<SA, T, A = CurrentStorage>
 where
     SA: StorageMapperApi,
     A: StorageAddress<SA>,
-    T: TopEncode + TopDecode + NestedEncode + NestedDecode + PartialOrd + PartialEq + Clone,
+    T: NestedEncode + NestedDecode + PartialOrd + PartialEq + Clone,
 {
     opt_root: Option<OrderedBinaryTreeNode<T>>,
     address: A,
@@ -68,35 +70,12 @@ impl<SA, T, A> OrderedBinaryTreeMapper<SA, T, A>
 where
     SA: StorageMapperApi,
     A: StorageAddress<SA>,
-    T: TopEncode + TopDecode + NestedEncode + NestedDecode + PartialOrd + PartialEq + Clone,
+    T: NestedEncode + NestedDecode + PartialOrd + PartialEq + Clone,
 {
     pub fn get_root(&self) -> Option<OrderedBinaryTreeNode<T>> {
         self.opt_root.clone()
     }
 
-    pub fn get_node_by_id(&self, id: NodeId) -> Option<OrderedBinaryTreeNode<T>> {
-        if id == NULL_ID {
-            return None;
-        }
-
-        let key = self.build_key_for_item(id);
-        let storage_len = self.address.address_storage_get_len(key.as_ref());
-        if storage_len == 0 {
-            return None;
-        }
-
-        Some(self.address.address_storage_get(key.as_ref()))
-    }
-
-    pub fn try_get_node_by_id(&self, id: NodeId) -> OrderedBinaryTreeNode<T> {
-        let opt_node = self.get_node_by_id(id);
-        if opt_node.is_none() {
-            SA::error_api_impl().signal_error(CORRUPT_TREE_ERR_MGS);
-        }
-
-        unsafe { opt_node.unwrap_unchecked() }
-    }
-
     pub fn get_depth(&self, node: &OrderedBinaryTreeNode<T>) -> usize {
         if self.opt_root.is_none() {
             return 0;
@@ -162,7 +141,7 @@ where
     }
 
     pub fn find_max(&self, mut node: OrderedBinaryTreeNode<T>) -> OrderedBinaryTreeNode<T> {
-        while node.right_id != NULL_ID {
+        while node.right_id != NULL_NODE_ID {
             node = self.try_get_node_by_id(node.right_id);
         }
 
@@ -170,35 +149,103 @@ where
     }
 
     pub fn find_min(&self, mut node: OrderedBinaryTreeNode<T>) -> OrderedBinaryTreeNode<T> {
-        while node.left_id != NULL_ID {
+        while node.left_id != NULL_NODE_ID {
             node = self.try_get_node_by_id(node.left_id);
         }
 
         node
     }
 
-    pub fn find_successor(&self, node: OrderedBinaryTreeNode<T>) -> OrderedBinaryTreeNode<T> {
-        if node.right_id != NULL_ID {
+    pub fn find_successor(
+        &self,
+        mut node: OrderedBinaryTreeNode<T>,
+    ) -> Option<OrderedBinaryTreeNode<T>> {
+        if node.right_id != NULL_NODE_ID {
             let right_node = self.try_get_node_by_id(node.right_id);
-            return self.find_min(right_node);
+            return Some(self.find_min(right_node));
         }
+
+        let mut successor_id = node.parent_id;
+        let mut opt_successor = self.get_node_by_id(successor_id);
+        while successor_id != NULL_NODE_ID {
+            if opt_successor.is_none() {
+                SA::error_api_impl().signal_error(CORRUPT_TREE_ERR_MGS);
+            }
+
+            let successor = unsafe { opt_successor.unwrap_unchecked() };
+            if node.current_node_id != successor.right_id {
+                return Some(successor);
+            }
+
+            successor_id = successor.parent_id;
+            opt_successor = self.get_node_by_id(successor_id);
+            node = successor;
+        }
+
+        opt_successor
     }
 
-    // pub fn insert_element(&mut self, data: T) {
-    //     let new_node = OrderedBinaryTreeNode::new(data);
-    //     if self.opt_root.is_none() {
-    //         let root_id = self.get_and_increment_last_id();
-    //         self.set_item(root_id, &new_node);
-    //     }
-    // }
+    pub fn find_predecessor(
+        &self,
+        mut node: OrderedBinaryTreeNode<T>,
+    ) -> Option<OrderedBinaryTreeNode<T>> {
+        if node.left_id != NULL_NODE_ID {
+            let left_node = self.try_get_node_by_id(node.left_id);
+            return Some(self.find_max(left_node));
+        }
+
+        let mut predecessor_id = node.parent_id;
+        let mut opt_predecessor = self.get_node_by_id(predecessor_id);
+        while predecessor_id != NULL_NODE_ID {
+            if opt_predecessor.is_none() {
+                SA::error_api_impl().signal_error(CORRUPT_TREE_ERR_MGS);
+            }
+
+            let predecessor = unsafe { opt_predecessor.unwrap_unchecked() };
+            if node.current_node_id != predecessor.left_id {
+                return Some(predecessor);
+            }
+
+            predecessor_id = predecessor.parent_id;
+            opt_predecessor = self.get_node_by_id(predecessor_id);
+            node = predecessor;
+        }
+
+        opt_predecessor
+    }
+
+    pub fn insert_element(&mut self, new_data: T) {}
 }
 
 impl<SA, T, A> OrderedBinaryTreeMapper<SA, T, A>
 where
     SA: StorageMapperApi,
     A: StorageAddress<SA>,
-    T: TopEncode + TopDecode + NestedEncode + NestedDecode + PartialOrd + PartialEq + Clone,
+    T: NestedEncode + NestedDecode + PartialOrd + PartialEq + Clone,
 {
+    fn get_node_by_id(&self, id: NodeId) -> Option<OrderedBinaryTreeNode<T>> {
+        if id == NULL_NODE_ID {
+            return None;
+        }
+
+        let key = self.build_key_for_item(id);
+        let storage_len = self.address.address_storage_get_len(key.as_ref());
+        if storage_len == 0 {
+            return None;
+        }
+
+        Some(self.address.address_storage_get(key.as_ref()))
+    }
+
+    fn try_get_node_by_id(&self, id: NodeId) -> OrderedBinaryTreeNode<T> {
+        let opt_node = self.get_node_by_id(id);
+        if opt_node.is_none() {
+            SA::error_api_impl().signal_error(CORRUPT_TREE_ERR_MGS);
+        }
+
+        unsafe { opt_node.unwrap_unchecked() }
+    }
+
     fn build_key_for_item(&self, id: NodeId) -> StorageKey<SA> {
         let mut item_key = self.key.clone();
         item_key.append_bytes(ID_SUFFIX);

From 34477b3baa51d8546a07de98a1ec01e9afdb446d Mon Sep 17 00:00:00 2001
From: Dorin Marian Iancu <dorin.iancu@multiversx.com>
Date: Mon, 19 Feb 2024 13:15:35 +0200
Subject: [PATCH 0361/1254] change root storage

---
 .../mappers/ordered_binary_tree_mapper.rs     | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/framework/base/src/storage/mappers/ordered_binary_tree_mapper.rs b/framework/base/src/storage/mappers/ordered_binary_tree_mapper.rs
index 0b7d7e9b65..44981ea15a 100644
--- a/framework/base/src/storage/mappers/ordered_binary_tree_mapper.rs
+++ b/framework/base/src/storage/mappers/ordered_binary_tree_mapper.rs
@@ -19,6 +19,7 @@ pub type NodeId = u64;
 
 pub const NULL_NODE_ID: NodeId = 0;
 
+static ROOT_SUFFIX: &[u8] = b"_root";
 static ID_SUFFIX: &[u8] = b"_id";
 static LAST_ID_KEY_SUFFIX: &[u8] = b"_lastId";
 
@@ -59,7 +60,6 @@ where
     A: StorageAddress<SA>,
     T: NestedEncode + NestedDecode + PartialOrd + PartialEq + Clone,
 {
-    opt_root: Option<OrderedBinaryTreeNode<T>>,
     address: A,
     key: StorageKey<SA>,
     _phantom_api: PhantomData<SA>,
@@ -73,11 +73,17 @@ where
     T: NestedEncode + NestedDecode + PartialOrd + PartialEq + Clone,
 {
     pub fn get_root(&self) -> Option<OrderedBinaryTreeNode<T>> {
-        self.opt_root.clone()
+        let root_key = self.build_root_key();
+        let storage_len = self.address.address_storage_get_len(root_key.as_ref());
+        if storage_len == 0 {
+            return None;
+        }
+
+        Some(self.address.address_storage_get(root_key.as_ref()))
     }
 
     pub fn get_depth(&self, node: &OrderedBinaryTreeNode<T>) -> usize {
-        if self.opt_root.is_none() {
+        if self.get_root().is_none() {
             return 0;
         }
 
@@ -246,6 +252,13 @@ where
         unsafe { opt_node.unwrap_unchecked() }
     }
 
+    fn build_root_key(&self) -> StorageKey<SA> {
+        let mut key = self.key.clone();
+        key.append_bytes(ROOT_SUFFIX);
+
+        key
+    }
+
     fn build_key_for_item(&self, id: NodeId) -> StorageKey<SA> {
         let mut item_key = self.key.clone();
         item_key.append_bytes(ID_SUFFIX);

From bbcd96e379718fba75cd4348f90d2b5c1874bbcf Mon Sep 17 00:00:00 2001
From: Dorin Marian Iancu <dorin.iancu@multiversx.com>
Date: Mon, 19 Feb 2024 13:33:06 +0200
Subject: [PATCH 0362/1254] insert element

---
 .../mappers/ordered_binary_tree_mapper.rs     | 51 +++++++++++++++++--
 1 file changed, 46 insertions(+), 5 deletions(-)

diff --git a/framework/base/src/storage/mappers/ordered_binary_tree_mapper.rs b/framework/base/src/storage/mappers/ordered_binary_tree_mapper.rs
index 44981ea15a..7b42e3905a 100644
--- a/framework/base/src/storage/mappers/ordered_binary_tree_mapper.rs
+++ b/framework/base/src/storage/mappers/ordered_binary_tree_mapper.rs
@@ -25,6 +25,8 @@ static LAST_ID_KEY_SUFFIX: &[u8] = b"_lastId";
 
 static CORRUPT_TREE_ERR_MGS: &[u8] = b"Corrupt tree";
 
+// https://en.wikipedia.org/wiki/Binary_search_tree
+
 #[derive(TopEncode, TopDecode, Clone)]
 pub struct OrderedBinaryTreeNode<T: NestedEncode + NestedDecode + PartialOrd + PartialEq + Clone> {
     pub(crate) current_node_id: NodeId,
@@ -220,7 +222,46 @@ where
         opt_predecessor
     }
 
-    pub fn insert_element(&mut self, new_data: T) {}
+    pub fn insert_element(&mut self, new_data: T) {
+        let new_node_id = self.get_and_increment_last_id();
+        let mut new_node = OrderedBinaryTreeNode::new(new_node_id, new_data);
+
+        let mut opt_new_node_parent = None;
+        let mut opt_current_node = self.get_root();
+        while opt_current_node.is_some() {
+            opt_new_node_parent = opt_current_node.clone();
+
+            let current_node = unsafe { opt_current_node.unwrap_unchecked() };
+            if new_node.data < current_node.data {
+                opt_current_node = self.get_node_by_id(current_node.left_id);
+            } else {
+                opt_current_node = self.get_node_by_id(current_node.right_id);
+            }
+        }
+
+        let new_node_parent_id = match &opt_new_node_parent {
+            Some(node) => node.current_node_id,
+            None => NULL_NODE_ID,
+        };
+        new_node.parent_id = new_node_parent_id;
+
+        if opt_new_node_parent.is_none() {
+            let root_key = self.build_root_key();
+            storage_set(root_key.as_ref(), &new_node);
+
+            return;
+        }
+
+        let mut new_node_parent = unsafe { opt_new_node_parent.unwrap_unchecked() };
+        if new_node.data < new_node_parent.data {
+            new_node_parent.left_id = new_node.current_node_id;
+        } else {
+            new_node_parent.right_id = new_node.current_node_id;
+        }
+
+        self.set_item(new_node_id, &new_node);
+        self.set_item(new_node_parent.current_node_id, &new_node_parent);
+    }
 }
 
 impl<SA, T, A> OrderedBinaryTreeMapper<SA, T, A>
@@ -274,11 +315,11 @@ where
         key
     }
 
-    fn get_last_id(&self) -> NodeId {
-        let key = self.build_last_id_key();
+    // fn get_last_id(&self) -> NodeId {
+    //     let key = self.build_last_id_key();
 
-        self.address.address_storage_get(key.as_ref())
-    }
+    //     self.address.address_storage_get(key.as_ref())
+    // }
 
     fn get_and_increment_last_id(&self) -> NodeId {
         let key = self.build_last_id_key();

From 22093e29ec481ffd17a30fa7da07ebc09a0218d0 Mon Sep 17 00:00:00 2001
From: Dorin Marian Iancu <dorin.iancu@multiversx.com>
Date: Mon, 19 Feb 2024 14:42:56 +0200
Subject: [PATCH 0363/1254] delete node

---
 .../mappers/ordered_binary_tree_mapper.rs     | 112 ++++++++++++++++--
 1 file changed, 103 insertions(+), 9 deletions(-)

diff --git a/framework/base/src/storage/mappers/ordered_binary_tree_mapper.rs b/framework/base/src/storage/mappers/ordered_binary_tree_mapper.rs
index 7b42e3905a..2d4915f002 100644
--- a/framework/base/src/storage/mappers/ordered_binary_tree_mapper.rs
+++ b/framework/base/src/storage/mappers/ordered_binary_tree_mapper.rs
@@ -1,5 +1,7 @@
 use core::marker::PhantomData;
 
+use codec::Empty;
+
 use crate::{
     api::StorageMapperApi,
     imports::{ErrorApiImpl, ManagedType},
@@ -109,9 +111,7 @@ where
         opt_node: Option<OrderedBinaryTreeNode<T>>,
         data: &T,
     ) -> Option<OrderedBinaryTreeNode<T>> {
-        if opt_node.is_none() {
-            return None;
-        }
+        opt_node.as_ref()?;
 
         let node = unsafe { opt_node.unwrap_unchecked() };
         if &node.data == data {
@@ -232,6 +232,10 @@ where
             opt_new_node_parent = opt_current_node.clone();
 
             let current_node = unsafe { opt_current_node.unwrap_unchecked() };
+            if new_node.data == current_node.data {
+                return;
+            }
+
             if new_node.data < current_node.data {
                 opt_current_node = self.get_node_by_id(current_node.left_id);
             } else {
@@ -262,6 +266,97 @@ where
         self.set_item(new_node_id, &new_node);
         self.set_item(new_node_parent.current_node_id, &new_node_parent);
     }
+
+    pub fn delete_node(&mut self, data: T) {
+        let opt_root = self.get_root();
+        let opt_node = self.iterative_search(opt_root, &data);
+        if opt_node.is_none() {
+            SA::error_api_impl().signal_error(b"Node not found");
+        }
+
+        let node = unsafe { opt_node.unwrap_unchecked() };
+        if node.left_id == NULL_NODE_ID {
+            let opt_to_add = self.get_node_by_id(node.right_id);
+            self.shift_nodes(&node, opt_to_add);
+
+            return;
+        }
+
+        if node.right_id == NULL_NODE_ID {
+            let opt_to_add = self.get_node_by_id(node.left_id);
+            self.shift_nodes(&node, opt_to_add);
+
+            return;
+        }
+
+        let opt_successor = self.find_successor(node.clone());
+        if opt_successor.is_none() {
+            SA::error_api_impl().signal_error(CORRUPT_TREE_ERR_MGS);
+        }
+
+        let mut successor = unsafe { opt_successor.unwrap_unchecked() };
+        if successor.parent_id != node.current_node_id {
+            let opt_right = self.get_node_by_id(successor.right_id);
+            self.shift_nodes(&successor, opt_right);
+
+            successor.right_id = node.right_id;
+
+            let opt_successor_right_node = self.get_node_by_id(successor.right_id);
+            if opt_successor_right_node.is_none() {
+                SA::error_api_impl().signal_error(CORRUPT_TREE_ERR_MGS);
+            }
+
+            let mut successor_right_node = unsafe { opt_successor_right_node.unwrap_unchecked() };
+            successor_right_node.parent_id = successor.current_node_id;
+
+            self.set_item(successor_right_node.current_node_id, &successor_right_node);
+        }
+
+        self.shift_nodes(&node, Some(successor.clone()));
+        successor.left_id = node.left_id;
+
+        let opt_successor_left_node = self.get_node_by_id(successor.left_id);
+        if opt_successor_left_node.is_none() {
+            SA::error_api_impl().signal_error(CORRUPT_TREE_ERR_MGS);
+        }
+
+        let mut successor_left_node = unsafe { opt_successor_left_node.unwrap_unchecked() };
+        successor_left_node.parent_id = successor.current_node_id;
+
+        self.set_item(successor_left_node.current_node_id, &successor_left_node);
+        self.set_item(successor.current_node_id, &successor);
+    }
+
+    fn shift_nodes(
+        &mut self,
+        to_delete: &OrderedBinaryTreeNode<T>,
+        opt_to_add: Option<OrderedBinaryTreeNode<T>>,
+    ) {
+        if to_delete.parent_id == NULL_NODE_ID {
+            let root_key = self.build_root_key();
+            match opt_to_add {
+                Some(to_add) => storage_set(root_key.as_ref(), &to_add),
+                None => storage_set(root_key.as_ref(), &Empty),
+            };
+
+            return;
+        }
+
+        let to_add_id = match opt_to_add {
+            Some(to_add) => to_add.current_node_id,
+            None => NULL_NODE_ID,
+        };
+
+        let mut parent = self.try_get_node_by_id(to_delete.parent_id);
+        if to_delete.current_node_id == parent.left_id {
+            parent.left_id = to_add_id;
+        } else {
+            parent.right_id = to_add_id;
+        }
+
+        self.set_item(parent.current_node_id, &parent);
+        self.clear_item(to_delete.current_node_id);
+    }
 }
 
 impl<SA, T, A> OrderedBinaryTreeMapper<SA, T, A>
@@ -315,12 +410,6 @@ where
         key
     }
 
-    // fn get_last_id(&self) -> NodeId {
-    //     let key = self.build_last_id_key();
-
-    //     self.address.address_storage_get(key.as_ref())
-    // }
-
     fn get_and_increment_last_id(&self) -> NodeId {
         let key = self.build_last_id_key();
         let last_id: NodeId = self.address.address_storage_get(key.as_ref());
@@ -334,4 +423,9 @@ where
         let key = self.build_key_for_item(id);
         storage_set(key.as_ref(), node);
     }
+
+    fn clear_item(&mut self, id: NodeId) {
+        let key = self.build_key_for_item(id);
+        storage_set(key.as_ref(), &Empty);
+    }
 }

From 90fbec910f78f74ec7eabdce146d1e06b9f861e3 Mon Sep 17 00:00:00 2001
From: Dorin Marian Iancu <dorin.iancu@multiversx.com>
Date: Mon, 19 Feb 2024 15:39:39 +0200
Subject: [PATCH 0364/1254] test + fixes

---
 .../basic-features/src/basic_features_main.rs |   3 +
 ...basic_features_ordered_binary_tree_test.rs | 100 ++++++++++++++++++
 .../mappers/ordered_binary_tree_mapper.rs     |  71 +++++++++----
 3 files changed, 153 insertions(+), 21 deletions(-)
 create mode 100644 contracts/feature-tests/basic-features/tests/basic_features_ordered_binary_tree_test.rs

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 3375fda456..2be5e1a535 100644
--- a/contracts/feature-tests/basic-features/src/basic_features_main.rs
+++ b/contracts/feature-tests/basic-features/src/basic_features_main.rs
@@ -100,4 +100,7 @@ pub trait BasicFeatures:
 
         arg1
     }
+
+    #[storage_mapper("coolTree")]
+    fn cool_tree(&self) -> OrderedBinaryTreeMapper<Self::Api, BigUint>;
 }
diff --git a/contracts/feature-tests/basic-features/tests/basic_features_ordered_binary_tree_test.rs b/contracts/feature-tests/basic-features/tests/basic_features_ordered_binary_tree_test.rs
new file mode 100644
index 0000000000..ef3313c466
--- /dev/null
+++ b/contracts/feature-tests/basic-features/tests/basic_features_ordered_binary_tree_test.rs
@@ -0,0 +1,100 @@
+#![allow(deprecated)]
+
+use basic_features::BasicFeatures;
+use multiversx_sc::imports::{OrderedBinaryTreeNode, NULL_NODE_ID};
+use multiversx_sc_scenario::{
+    managed_biguint, rust_biguint, testing_framework::BlockchainStateWrapper,
+};
+
+#[test]
+fn ordered_binary_tree_test() {
+    let mut b_mock = BlockchainStateWrapper::new();
+    let user = b_mock.create_user_account(&rust_biguint!(0));
+    let sc_wrapper = b_mock.create_sc_account(
+        &rust_biguint!(0),
+        Some(&user),
+        basic_features::contract_obj,
+        "rand wasm path",
+    );
+
+    b_mock
+        .execute_tx(&user, &sc_wrapper, &rust_biguint!(0), |sc| {
+            let mut my_tree_mapper = sc.cool_tree();
+            let opt_root = my_tree_mapper.get_root();
+            assert_eq!(opt_root, None);
+
+            my_tree_mapper.insert_element(5u32.into());
+            //////////////////// 5 /////////////////////////////
+
+            let opt_root = my_tree_mapper.get_root();
+            assert_eq!(
+                opt_root,
+                Some(OrderedBinaryTreeNode {
+                    current_node_id: 1,
+                    left_id: NULL_NODE_ID,
+                    right_id: NULL_NODE_ID,
+                    parent_id: NULL_NODE_ID,
+                    data: managed_biguint!(5)
+                })
+            );
+
+            let depth = my_tree_mapper.get_depth(&opt_root.unwrap());
+            assert_eq!(depth, 1);
+
+            my_tree_mapper.insert_element(3u32.into());
+            my_tree_mapper.insert_element(4u32.into());
+            my_tree_mapper.insert_element(8u32.into());
+            //////////////////// 5 /////////////////////////////
+            //////////// 3 ///////////// 8 //////////////////////
+            /////////////// 4 /////////////////////////////////////
+
+            let opt_root = my_tree_mapper.get_root();
+            assert_eq!(
+                opt_root,
+                Some(OrderedBinaryTreeNode {
+                    current_node_id: 1,
+                    left_id: 2,
+                    right_id: 4,
+                    parent_id: NULL_NODE_ID,
+                    data: managed_biguint!(5)
+                })
+            );
+
+            let opt_found_item = my_tree_mapper.iterative_search(opt_root.clone(), &4u32.into());
+            assert_eq!(
+                opt_found_item,
+                Some(OrderedBinaryTreeNode {
+                    current_node_id: 3,
+                    left_id: NULL_NODE_ID,
+                    right_id: NULL_NODE_ID,
+                    parent_id: 2,
+                    data: 4u32.into()
+                })
+            );
+
+            let opt_found_item = my_tree_mapper.recursive_search(opt_root.clone(), &4u32.into());
+            assert_eq!(
+                opt_found_item,
+                Some(OrderedBinaryTreeNode {
+                    current_node_id: 3,
+                    left_id: NULL_NODE_ID,
+                    right_id: NULL_NODE_ID,
+                    parent_id: 2,
+                    data: 4u32.into()
+                })
+            );
+
+            let opt_found_item = my_tree_mapper.recursive_search(opt_root.clone(), &50u32.into());
+            assert_eq!(opt_found_item, None);
+
+            let depth = my_tree_mapper.get_depth(&opt_root.unwrap());
+            assert_eq!(depth, 3);
+
+            my_tree_mapper.delete_node(4u32.into());
+
+            let opt_root = my_tree_mapper.get_root();
+            let depth = my_tree_mapper.get_depth(&opt_root.unwrap());
+            assert_eq!(depth, 2);
+        })
+        .assert_ok();
+}
diff --git a/framework/base/src/storage/mappers/ordered_binary_tree_mapper.rs b/framework/base/src/storage/mappers/ordered_binary_tree_mapper.rs
index 2d4915f002..851863c099 100644
--- a/framework/base/src/storage/mappers/ordered_binary_tree_mapper.rs
+++ b/framework/base/src/storage/mappers/ordered_binary_tree_mapper.rs
@@ -9,7 +9,10 @@ use crate::{
     storage_set,
 };
 
-use super::set_mapper::{CurrentStorage, StorageAddress};
+use super::{
+    set_mapper::{CurrentStorage, StorageAddress},
+    StorageMapper,
+};
 
 use crate::codec::{
     self,
@@ -21,7 +24,7 @@ pub type NodeId = u64;
 
 pub const NULL_NODE_ID: NodeId = 0;
 
-static ROOT_SUFFIX: &[u8] = b"_root";
+static ROOT_ID_SUFFIX: &[u8] = b"_rootId";
 static ID_SUFFIX: &[u8] = b"_id";
 static LAST_ID_KEY_SUFFIX: &[u8] = b"_lastId";
 
@@ -29,13 +32,13 @@ static CORRUPT_TREE_ERR_MGS: &[u8] = b"Corrupt tree";
 
 // https://en.wikipedia.org/wiki/Binary_search_tree
 
-#[derive(TopEncode, TopDecode, Clone)]
+#[derive(TopEncode, TopDecode, Clone, PartialEq, Debug)]
 pub struct OrderedBinaryTreeNode<T: NestedEncode + NestedDecode + PartialOrd + PartialEq + Clone> {
-    pub(crate) current_node_id: NodeId,
-    pub(crate) left_id: NodeId,
-    pub(crate) right_id: NodeId,
-    pub(crate) parent_id: NodeId,
-    pub(crate) data: T,
+    pub current_node_id: NodeId,
+    pub left_id: NodeId,
+    pub right_id: NodeId,
+    pub parent_id: NodeId,
+    pub data: T,
 }
 
 impl<T> OrderedBinaryTreeNode<T>
@@ -51,11 +54,6 @@ where
             parent_id: NULL_NODE_ID,
         }
     }
-
-    #[inline]
-    pub fn get_data(&self) -> &T {
-        &self.data
-    }
 }
 
 pub struct OrderedBinaryTreeMapper<SA, T, A = CurrentStorage>
@@ -70,6 +68,22 @@ where
     _phantom_item: PhantomData<T>,
 }
 
+impl<SA, T> StorageMapper<SA> for OrderedBinaryTreeMapper<SA, T, CurrentStorage>
+where
+    SA: StorageMapperApi,
+    T: NestedEncode + NestedDecode + PartialOrd + PartialEq + Clone + 'static,
+{
+    #[inline]
+    fn new(base_key: StorageKey<SA>) -> Self {
+        OrderedBinaryTreeMapper {
+            address: CurrentStorage,
+            key: base_key,
+            _phantom_api: PhantomData,
+            _phantom_item: PhantomData,
+        }
+    }
+}
+
 impl<SA, T, A> OrderedBinaryTreeMapper<SA, T, A>
 where
     SA: StorageMapperApi,
@@ -87,10 +101,6 @@ where
     }
 
     pub fn get_depth(&self, node: &OrderedBinaryTreeNode<T>) -> usize {
-        if self.get_root().is_none() {
-            return 0;
-        }
-
         let opt_left_node = self.get_node_by_id(node.left_id);
         let opt_right_node = self.get_node_by_id(node.right_id);
 
@@ -250,6 +260,9 @@ where
         new_node.parent_id = new_node_parent_id;
 
         if opt_new_node_parent.is_none() {
+            let root_id_key = self.build_root_id_key();
+            storage_set(root_id_key.as_ref(), &new_node.current_node_id);
+
             let root_key = self.build_root_key();
             storage_set(root_key.as_ref(), &new_node);
 
@@ -333,10 +346,17 @@ where
         opt_to_add: Option<OrderedBinaryTreeNode<T>>,
     ) {
         if to_delete.parent_id == NULL_NODE_ID {
+            let root_id_key = self.build_root_id_key();
             let root_key = self.build_root_key();
             match opt_to_add {
-                Some(to_add) => storage_set(root_key.as_ref(), &to_add),
-                None => storage_set(root_key.as_ref(), &Empty),
+                Some(to_add) => {
+                    storage_set(root_id_key.as_ref(), &to_add.current_node_id);
+                    storage_set(root_key.as_ref(), &to_add);
+                },
+                None => {
+                    storage_set(root_id_key.as_ref(), &Empty);
+                    storage_set(root_key.as_ref(), &Empty);
+                },
             };
 
             return;
@@ -388,13 +408,22 @@ where
         unsafe { opt_node.unwrap_unchecked() }
     }
 
-    fn build_root_key(&self) -> StorageKey<SA> {
+    fn build_root_id_key(&self) -> StorageKey<SA> {
         let mut key = self.key.clone();
-        key.append_bytes(ROOT_SUFFIX);
+        key.append_bytes(ROOT_ID_SUFFIX);
 
         key
     }
 
+    fn build_root_key(&self) -> StorageKey<SA> {
+        let mut key = self.key.clone();
+        key.append_bytes(ROOT_ID_SUFFIX);
+
+        let root_id = self.address.address_storage_get(key.as_ref());
+
+        self.build_key_for_item(root_id)
+    }
+
     fn build_key_for_item(&self, id: NodeId) -> StorageKey<SA> {
         let mut item_key = self.key.clone();
         item_key.append_bytes(ID_SUFFIX);

From 34f98493a4ad2acac4af3b301bb29d7392a3af46 Mon Sep 17 00:00:00 2001
From: Dorin Marian Iancu <dorin.iancu@multiversx.com>
Date: Mon, 19 Feb 2024 16:05:48 +0200
Subject: [PATCH 0365/1254] fix removing root bug

---
 ...basic_features_ordered_binary_tree_test.rs | 15 +++++++++++++
 .../mappers/ordered_binary_tree_mapper.rs     | 22 ++++++++++++++-----
 2 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/contracts/feature-tests/basic-features/tests/basic_features_ordered_binary_tree_test.rs b/contracts/feature-tests/basic-features/tests/basic_features_ordered_binary_tree_test.rs
index ef3313c466..071da4a958 100644
--- a/contracts/feature-tests/basic-features/tests/basic_features_ordered_binary_tree_test.rs
+++ b/contracts/feature-tests/basic-features/tests/basic_features_ordered_binary_tree_test.rs
@@ -95,6 +95,21 @@ fn ordered_binary_tree_test() {
             let opt_root = my_tree_mapper.get_root();
             let depth = my_tree_mapper.get_depth(&opt_root.unwrap());
             assert_eq!(depth, 2);
+
+            my_tree_mapper.insert_element(4u32.into());
+            my_tree_mapper.delete_node(5u32.into());
+
+            let opt_root = my_tree_mapper.get_root();
+            assert_eq!(
+                opt_root,
+                Some(OrderedBinaryTreeNode {
+                    current_node_id: 4,
+                    left_id: 2,
+                    right_id: NULL_NODE_ID,
+                    parent_id: NULL_NODE_ID,
+                    data: 8u32.into()
+                })
+            );
         })
         .assert_ok();
 }
diff --git a/framework/base/src/storage/mappers/ordered_binary_tree_mapper.rs b/framework/base/src/storage/mappers/ordered_binary_tree_mapper.rs
index 851863c099..ed5d70f3c9 100644
--- a/framework/base/src/storage/mappers/ordered_binary_tree_mapper.rs
+++ b/framework/base/src/storage/mappers/ordered_binary_tree_mapper.rs
@@ -312,6 +312,7 @@ where
             let opt_right = self.get_node_by_id(successor.right_id);
             self.shift_nodes(&successor, opt_right);
 
+            successor = self.try_get_node_by_id(successor.current_node_id);
             successor.right_id = node.right_id;
 
             let opt_successor_right_node = self.get_node_by_id(successor.right_id);
@@ -326,6 +327,7 @@ where
         }
 
         self.shift_nodes(&node, Some(successor.clone()));
+        successor = self.try_get_node_by_id(successor.current_node_id);
         successor.left_id = node.left_id;
 
         let opt_successor_left_node = self.get_node_by_id(successor.left_id);
@@ -343,17 +345,21 @@ where
     fn shift_nodes(
         &mut self,
         to_delete: &OrderedBinaryTreeNode<T>,
-        opt_to_add: Option<OrderedBinaryTreeNode<T>>,
+        mut opt_to_add: Option<OrderedBinaryTreeNode<T>>,
     ) {
         if to_delete.parent_id == NULL_NODE_ID {
             let root_id_key = self.build_root_id_key();
-            let root_key = self.build_root_key();
-            match opt_to_add {
+            match &mut opt_to_add {
                 Some(to_add) => {
+                    to_add.parent_id = NULL_NODE_ID;
                     storage_set(root_id_key.as_ref(), &to_add.current_node_id);
-                    storage_set(root_key.as_ref(), &to_add);
+
+                    let root_key = self.build_root_key();
+                    storage_set(root_key.as_ref(), to_add);
                 },
                 None => {
+                    let root_key = self.build_root_key();
+
                     storage_set(root_id_key.as_ref(), &Empty);
                     storage_set(root_key.as_ref(), &Empty);
                 },
@@ -362,7 +368,7 @@ where
             return;
         }
 
-        let to_add_id = match opt_to_add {
+        let to_add_id = match &opt_to_add {
             Some(to_add) => to_add.current_node_id,
             None => NULL_NODE_ID,
         };
@@ -374,6 +380,12 @@ where
             parent.right_id = to_add_id;
         }
 
+        if let Some(to_add) = &mut opt_to_add {
+            to_add.parent_id = to_delete.parent_id;
+
+            self.set_item(to_add.current_node_id, &to_add);
+        }
+
         self.set_item(parent.current_node_id, &parent);
         self.clear_item(to_delete.current_node_id);
     }

From 4b8a3fb063e2386616dad434f9581fd4222718dc Mon Sep 17 00:00:00 2001
From: Dorin Marian Iancu <dorin.iancu@multiversx.com>
Date: Tue, 20 Feb 2024 08:54:11 +0200
Subject: [PATCH 0366/1254] clippy

---
 .../base/src/storage/mappers/ordered_binary_tree_mapper.rs      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/framework/base/src/storage/mappers/ordered_binary_tree_mapper.rs b/framework/base/src/storage/mappers/ordered_binary_tree_mapper.rs
index ed5d70f3c9..8d56c302aa 100644
--- a/framework/base/src/storage/mappers/ordered_binary_tree_mapper.rs
+++ b/framework/base/src/storage/mappers/ordered_binary_tree_mapper.rs
@@ -383,7 +383,7 @@ where
         if let Some(to_add) = &mut opt_to_add {
             to_add.parent_id = to_delete.parent_id;
 
-            self.set_item(to_add.current_node_id, &to_add);
+            self.set_item(to_add.current_node_id, to_add);
         }
 
         self.set_item(parent.current_node_id, &parent);

From 0c51f9129975ebdd0687e8770b337d08525cceeb Mon Sep 17 00:00:00 2001
From: Alin Cruceat <alyn_509@yahoo.com>
Date: Tue, 20 Feb 2024 13:46:21 +0200
Subject: [PATCH 0367/1254] remove maybe uninit

---
 framework/base/src/lib.rs                     |  2 --
 .../src/types/managed/wrapped/managed_vec.rs  | 24 +++++++++++++++----
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/framework/base/src/lib.rs b/framework/base/src/lib.rs
index 060fdb85b9..951e3b5b4f 100644
--- a/framework/base/src/lib.rs
+++ b/framework/base/src/lib.rs
@@ -3,8 +3,6 @@
 #![feature(exhaustive_patterns)]
 #![feature(try_trait_v2)]
 #![feature(control_flow_enum)]
-#![feature(maybe_uninit_uninit_array)]
-#![feature(maybe_uninit_array_assume_init)]
 #![feature(negative_impls)]
 #![feature(generic_const_exprs)]
 #![allow(incomplete_features)]
diff --git a/framework/base/src/types/managed/wrapped/managed_vec.rs b/framework/base/src/types/managed/wrapped/managed_vec.rs
index 6a938c6412..84b42bbdae 100644
--- a/framework/base/src/types/managed/wrapped/managed_vec.rs
+++ b/framework/base/src/types/managed/wrapped/managed_vec.rs
@@ -1,3 +1,4 @@
+use super::EncodedManagedVecItem;
 use crate::{
     abi::{TypeAbi, TypeDescriptionContainer, TypeName},
     api::{ErrorApiImpl, InvalidSliceError, ManagedTypeApi},
@@ -12,9 +13,14 @@ use crate::{
     },
 };
 use alloc::vec::Vec;
-use core::{borrow::Borrow, cmp::Ordering, fmt::Debug, iter::FromIterator, marker::PhantomData};
-
-use super::EncodedManagedVecItem;
+use core::{
+    borrow::Borrow,
+    cmp::Ordering,
+    fmt::Debug,
+    iter::FromIterator,
+    marker::PhantomData,
+    mem::{transmute_copy, ManuallyDrop, MaybeUninit},
+};
 
 pub(crate) const INDEX_OUT_OF_RANGE_MSG: &[u8] = b"ManagedVec index out of range";
 
@@ -146,13 +152,23 @@ where
         if self.len() != N {
             return None;
         }
-
+        /*
         let mut result_uninit = core::mem::MaybeUninit::<T::Ref<'_>>::uninit_array();
         for (index, value) in self.iter().enumerate() {
             result_uninit[index].write(value);
         }
 
         let result = unsafe { core::mem::MaybeUninit::array_assume_init(result_uninit) };
+        */
+
+        let mut result_uninit =
+            unsafe { MaybeUninit::<[MaybeUninit<T::Ref<'_>>; N]>::uninit().assume_init() };
+
+        for (index, value) in self.iter().enumerate() {
+            result_uninit[index].write(value);
+        }
+
+        let result = unsafe { transmute_copy(&ManuallyDrop::new(result_uninit)) };
         Some(result)
     }
 

From f1fa4c19e97053f57e969bdf473f4cd5e531dde6 Mon Sep 17 00:00:00 2001
From: Alin Cruceat <alyn_509@yahoo.com>
Date: Tue, 20 Feb 2024 14:00:23 +0200
Subject: [PATCH 0368/1254] remove commented code

---
 framework/base/src/types/managed/wrapped/managed_vec.rs | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/framework/base/src/types/managed/wrapped/managed_vec.rs b/framework/base/src/types/managed/wrapped/managed_vec.rs
index 84b42bbdae..f7b8cad171 100644
--- a/framework/base/src/types/managed/wrapped/managed_vec.rs
+++ b/framework/base/src/types/managed/wrapped/managed_vec.rs
@@ -152,14 +152,6 @@ where
         if self.len() != N {
             return None;
         }
-        /*
-        let mut result_uninit = core::mem::MaybeUninit::<T::Ref<'_>>::uninit_array();
-        for (index, value) in self.iter().enumerate() {
-            result_uninit[index].write(value);
-        }
-
-        let result = unsafe { core::mem::MaybeUninit::array_assume_init(result_uninit) };
-        */
 
         let mut result_uninit =
             unsafe { MaybeUninit::<[MaybeUninit<T::Ref<'_>>; N]>::uninit().assume_init() };

From 97f02c117d8b079e01c7dba959ac81e59080e2e3 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Wed, 21 Feb 2024 16:37:38 +0200
Subject: [PATCH 0369/1254] initial design for TxProxy

---
 contracts/examples/adder/src/adder.rs      | 33 ++++++++++++++++++++++
 framework/derive/src/contract_impl.rs      |  6 ++++
 framework/derive/src/generate/proxy_gen.rs | 18 ++++++++++++
 3 files changed, 57 insertions(+)

diff --git a/contracts/examples/adder/src/adder.rs b/contracts/examples/adder/src/adder.rs
index 9b261c5aa8..8f504c1aea 100644
--- a/contracts/examples/adder/src/adder.rs
+++ b/contracts/examples/adder/src/adder.rs
@@ -25,3 +25,36 @@ pub trait Adder {
         self.sum().update(|sum| *sum += value);
     }
 }
+
+pub struct TxProxy;
+
+impl<Env> TxProxyTrait<Env> for TxProxy
+where
+    Env: TxEnv,
+{
+    type TxProxyMethods = TxProxyMethods<Env>;
+
+    fn env(self, env: Env) -> Self::TxProxyMethods {
+        TxProxyMethods { env }
+    }
+}
+
+impl<Env: TxEnv + multiversx_sc::api::CallTypeApi> TxProxyMethods<Env> {
+    pub fn add<Arg0: multiversx_sc::codec::CodecInto<BigUint<Env>>>(
+        self,
+        arg0: Arg0,
+    ) -> multiversx_sc::types::Tx<
+        Env,
+        (),
+        (),
+        (),
+        (),
+        FunctionCall<<Env as multiversx_sc::types::TxEnv>::Api>,
+        (),
+    > {
+        Tx::new_with_env(self.env)
+            .raw_call()
+            .function_name("add")
+            .argument(&arg0)
+    }
+}
diff --git a/framework/derive/src/contract_impl.rs b/framework/derive/src/contract_impl.rs
index 1f6b3c9383..414c261f72 100644
--- a/framework/derive/src/contract_impl.rs
+++ b/framework/derive/src/contract_impl.rs
@@ -130,6 +130,8 @@ pub fn contract_implementation(
     };
 
     let proxy_trait = proxy_gen::proxy_trait(contract);
+    let tx_proxy_trait = proxy_gen::tx_proxy_trait();
+    let tx_proxy_methods = proxy_gen::tx_proxy_methods();
     let proxy_obj_code = if is_contract_main {
         proxy_gen::proxy_obj_code(contract)
     } else {
@@ -145,6 +147,10 @@ pub fn contract_implementation(
 
         #proxy_trait
 
+        #tx_proxy_trait
+
+        #tx_proxy_methods
+
         #proxy_obj_code
 
         #callback_proxies_obj
diff --git a/framework/derive/src/generate/proxy_gen.rs b/framework/derive/src/generate/proxy_gen.rs
index 8f4734558e..0e1f851608 100644
--- a/framework/derive/src/generate/proxy_gen.rs
+++ b/framework/derive/src/generate/proxy_gen.rs
@@ -298,6 +298,24 @@ pub fn proxy_trait(contract: &ContractTrait) -> proc_macro2::TokenStream {
     }
 }
 
+pub fn tx_proxy_trait() -> proc_macro2::TokenStream {
+    quote! {
+        pub trait TxProxyTrait<Env>{
+            type TxProxyMethods;
+
+            fn env(self, env: Env) -> Self::TxProxyMethods;
+        }
+    }
+}
+
+pub fn tx_proxy_methods() -> proc_macro2::TokenStream {
+    quote! {
+        pub struct TxProxyMethods<Env: TxEnv> {
+            env: Env,
+        }        
+    }
+}
+
 pub fn proxy_obj_code(contract: &ContractTrait) -> proc_macro2::TokenStream {
     let proxy_object_def = snippets::proxy_object_def();
     let impl_all_proxy_traits =

From a48cdb89aea1aec6aeef7713203c4f3e3e37ef57 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Wed, 21 Feb 2024 18:09:58 +0200
Subject: [PATCH 0370/1254] modified proxy generator

---
 .../adder/proxies_struct_interactor_main.rs   |  98 +++++++-----
 .../contract/generate_proxy/proxy_gen_main.rs |   7 +-
 .../generate_proxy/proxy_sc_functions_gen.rs  | 140 ++++++------------
 .../generate_proxy/proxy_template_gen.rs      |  40 +++--
 4 files changed, 138 insertions(+), 147 deletions(-)

diff --git a/contracts/examples/adder/proxies_struct_interactor_main.rs b/contracts/examples/adder/proxies_struct_interactor_main.rs
index caf5ea8895..d682df98c8 100644
--- a/contracts/examples/adder/proxies_struct_interactor_main.rs
+++ b/contracts/examples/adder/proxies_struct_interactor_main.rs
@@ -1,60 +1,90 @@
-#![allow(clippy::too_many_arguments)]
-#![allow(clippy::type_complexity)]
 multiversx_sc::imports!();
 
-pub struct TxProxy<A>
+pub struct TxProxy;
+
+impl<Env> TxProxyTrait<Env> for TxProxy
 where
-    A: multiversx_sc::api::VMApi + 'static,
+    Env: TxEnv,
 {
-    pub address: ManagedOption<A, ManagedAddress<A>>,
+    type TxProxyMethods = TxProxyMethods<Env>;
+
+    fn env(self, env: Env) -> Self::TxProxyMethods {
+        TxProxyMethods { env }
+    }
 }
 
-impl<A> TxProxy<A>
-where
-    A: multiversx_sc::api::VMApi + 'static,
-{	fn init<
-		Arg0: multiversx_sc::codec::CodecInto<BigUint<A>>,
+impl<Env: TxEnv + multiversx_sc::api::CallTypeApi> TxProxyMethods<Env> {
+	pub fn init<
+		Arg0: multiversx_sc::codec::CodecInto<BigUint<Env>>,
 	>(
 		&mut self,
 		initial_value: Arg0,
-	) -> ContractDeploy<A, ()> {
-		let ___opt_address___ = multiversx_sc::extract_opt_address!(self);
-		let mut ___contract_deploy___ = multiversx_sc::constructors_proxy!(___opt_address___);
-		___contract_deploy___.push_endpoint_arg(&initial_value);
-		___contract_deploy___
+	) -> multiversx_sc::types::Tx<Env,
+        (),
+        (),
+        (),
+        (),
+        FunctionCall<<Env as multiversx_sc::types::TxEnv>::Api>,
+        (),
+    > {
+		Tx::new_with_env(self.env.clone())
+            .raw_call()
+            .function_name("init")
+			.argument(&initial_value)
 	}
 
-	fn sum(
+	pub fn sum(
 		&mut self,
-	) -> ContractCallNoPayment<A, BigUint<A>> {
-		let ___address___ = multiversx_sc::extract_address!(self);
-		let mut ___contract_call___ = multiversx_sc::endpoints_proxy!(getSum, ___address___);
-		___contract_call___
+	) -> multiversx_sc::types::Tx<Env,
+        (),
+        (),
+        (),
+        (),
+        FunctionCall<<Env as multiversx_sc::types::TxEnv>::Api>,
+        (),
+    > {
+		Tx::new_with_env(self.env.clone())
+            .raw_call()
+            .function_name("getSum")
 	}
 
-	fn upgrade<
-		Arg0: multiversx_sc::codec::CodecInto<BigUint<A>>,
+	pub fn upgrade<
+		Arg0: multiversx_sc::codec::CodecInto<BigUint<Env>>,
 	>(
 		&mut self,
 		initial_value: Arg0,
-	) -> ContractCallNoPayment<A, ()> {
-		let ___address___ = multiversx_sc::extract_address!(self);
-		let mut ___contract_call___ = multiversx_sc::endpoints_proxy!(upgrade, ___address___);
-		ContractCall::proxy_arg(&mut ___contract_call___, &initial_value);
-		___contract_call___
+	) -> multiversx_sc::types::Tx<Env,
+        (),
+        (),
+        (),
+        (),
+        FunctionCall<<Env as multiversx_sc::types::TxEnv>::Api>,
+        (),
+    > {
+		Tx::new_with_env(self.env.clone())
+            .raw_call()
+            .function_name("upgrade")
+			.argument(&initial_value)
 	}
 
 	//Add desired amount to the storage variable. 
-	fn add<
-		Arg0: multiversx_sc::codec::CodecInto<BigUint<A>>,
+	pub fn add<
+		Arg0: multiversx_sc::codec::CodecInto<BigUint<Env>>,
 	>(
 		&mut self,
 		value: Arg0,
-	) -> ContractCallNoPayment<A, ()> {
-		let ___address___ = multiversx_sc::extract_address!(self);
-		let mut ___contract_call___ = multiversx_sc::endpoints_proxy!(add, ___address___);
-		ContractCall::proxy_arg(&mut ___contract_call___, &value);
-		___contract_call___
+	) -> multiversx_sc::types::Tx<Env,
+        (),
+        (),
+        (),
+        (),
+        FunctionCall<<Env as multiversx_sc::types::TxEnv>::Api>,
+        (),
+    > {
+		Tx::new_with_env(self.env.clone())
+            .raw_call()
+            .function_name("add")
+			.argument(&value)
 	}
 
 }
diff --git a/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_main.rs b/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_main.rs
index 63c32d8530..7c6aa7e0bf 100644
--- a/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_main.rs
+++ b/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_main.rs
@@ -8,7 +8,10 @@ use super::{
     super::meta_config::MetaConfig,
     proxy_crate_gen::create_file,
     proxy_sc_functions_gen::write_content,
-    proxy_template_gen::{write_imports, write_struct_template},
+    proxy_template_gen::{
+        write_impl_for_tx_proxy, write_imports, write_struct_template,
+        write_tx_proxy_method_header,
+    },
 };
 
 const PROXIES_SOURCE_FILE_NAME: &str = "proxies_struct_interactor_main.rs";
@@ -23,5 +26,7 @@ impl MetaConfig {
 fn write_proxies_to_file(mut file: File, abi: ContractAbi) {
     write_imports(&mut file);
     write_struct_template(&mut file);
+    write_impl_for_tx_proxy(&mut file);
+    write_tx_proxy_method_header(&mut file);
     write_content(&mut file, abi);
 }
diff --git a/framework/meta/src/cmd/contract/generate_proxy/proxy_sc_functions_gen.rs b/framework/meta/src/cmd/contract/generate_proxy/proxy_sc_functions_gen.rs
index 321a6868a4..c818c27400 100644
--- a/framework/meta/src/cmd/contract/generate_proxy/proxy_sc_functions_gen.rs
+++ b/framework/meta/src/cmd/contract/generate_proxy/proxy_sc_functions_gen.rs
@@ -1,125 +1,80 @@
 use std::{fs::File, io::Write};
 
-use multiversx_sc::abi::{ContractAbi, EndpointAbi, InputAbi, OutputAbis};
+use multiversx_sc::abi::{ContractAbi, EndpointAbi, InputAbi};
 
 use crate::cmd::contract::generate_snippets::{
     snippet_gen_common::write_newline,
-    snippet_sc_functions_gen::map_output_types_to_rust_types,
     snippet_type_map::{handle_abi_type, RustTypeString},
 };
 
-const CONTRACT_DEPLOY: &str = "ContractDeploy";
-const CONTRACT_CALL_NO_PAYMENT: &str = "ContractCallNoPayment";
-
 pub(crate) fn write_content(file: &mut File, abi: ContractAbi) {
     for constructor_abi in abi.constructors {
-        write_endpoint(file, constructor_abi.clone(), CONTRACT_DEPLOY);
-        write_constructor_content_macro(file);
-        write_constructor_contract_deploy(file, constructor_abi.inputs);
-        write_end_of_constructor(file);
+        write_endpoint(file, constructor_abi.clone());
+        write_function_content(file, constructor_abi);
+        write_end_of_function(file);
     }
 
     for endpoint_abi in abi.endpoints {
-        write_endpoint(file, endpoint_abi.clone(), CONTRACT_CALL_NO_PAYMENT);
-        write_endpoint_content_macro(file, endpoint_abi.name);
-        write_contract_call(file, endpoint_abi.inputs);
-        write_end_of_endpoint(file);
+        write_endpoint(file, endpoint_abi.clone());
+        write_function_content(file, endpoint_abi);
+        write_end_of_function(file);
     }
 
     writeln!(file, "}}").unwrap();
 }
 
-fn write_constructor_contract_deploy(file: &mut File, inputs: Vec<InputAbi>) {
-    if inputs.is_empty() {
-        return;
-    }
-
-    for input in inputs.iter() {
-        write_constructor_contract_call(file, input.arg_name.clone());
-    }
-}
-
-fn write_contract_call(file: &mut File, inputs: Vec<InputAbi>) {
-    if inputs.is_empty() {
-        return;
-    }
-
-    for input in inputs.iter() {
-        write_contract_call_input(file, input.arg_name.clone());
-    }
-}
-
-fn write_contract_call_input(file: &mut File, arg_name: String) {
-    writeln!(
-        file,
-        "\t\tContractCall::proxy_arg(&mut ___contract_call___, &{arg_name});"
-    )
-    .unwrap();
-}
-
-fn write_constructor_contract_call(file: &mut File, arg_name: String) {
+fn write_function_content(file: &mut File, end: EndpointAbi) {
     writeln!(
         file,
-        "\t\t___contract_deploy___.push_endpoint_arg(&{arg_name});"
+        "\t\tTx::new_with_env(self.env.clone())
+            .raw_call()
+            .function_name(\"{}\")",
+        end.name
     )
     .unwrap();
-}
 
-fn write_endpoint_content_macro(file: &mut File, name: String) {
-    writeln!(
-        file,
-        "\t\tlet ___address___ = multiversx_sc::extract_address!(self);"
-    )
-    .unwrap();
-    writeln!(
-        file,
-        "\t\tlet mut ___contract_call___ = multiversx_sc::endpoints_proxy!({name}, ___address___);"
-    )
-    .unwrap();
-}
-
-fn write_constructor_content_macro(file: &mut File) {
-    writeln!(
-        file,
-        "\t\tlet ___opt_address___ = multiversx_sc::extract_opt_address!(self);"
-    )
-    .unwrap();
-    writeln!(file, "\t\tlet mut ___contract_deploy___ = multiversx_sc::constructors_proxy!(___opt_address___);").unwrap();
+    for input in end.inputs.iter() {
+        writeln!(
+            file,
+            "\t\t\t.argument(&{})",
+            input.arg_name // .argument(&arg0)"
+        )
+        .unwrap();
+    }
 }
 
-fn write_endpoint(file: &mut File, endpoint_abi: EndpointAbi, interaction_deploy: &str) {
+fn write_endpoint(file: &mut File, endpoint_abi: EndpointAbi) {
     write_info_endpoint(file, endpoint_abi.docs);
-    write_endpoint_fn(file, endpoint_abi.rust_method_name);
-    write_generic_args(file, endpoint_abi.inputs.clone());
-    write_parameters(file, endpoint_abi.inputs, interaction_deploy);
-    write_output(file, endpoint_abi.outputs);
+    write_function_header_endpoint(file, endpoint_abi.rust_method_name);
+    write_args(file, endpoint_abi.inputs.clone());
+    write_parameters_and_output(file, endpoint_abi.inputs);
 }
 
-fn write_output(file: &mut File, outputs: OutputAbis) {
-    let output_type = map_output_types_to_rust_types(&outputs);
-
-    let output_type_print = output_type.replace("<StaticApi>", "<A>");
-    write!(file, "{output_type_print}",).unwrap();
-    writeln!(file, "> {{").unwrap();
-}
-
-fn write_parameters(file: &mut File, inputs: Vec<InputAbi>, interaction_deploy: &str) {
+#[rustfmt::skip]
+fn write_parameters_and_output(file: &mut File, inputs: Vec<InputAbi>) {
     writeln!(file, "(").unwrap();
     writeln!(file, "\t\t&mut self,").unwrap();
 
     for (index, input) in inputs.iter().enumerate() {
-        write_parameter_arg(file, index, &input.arg_name);
+        writeln!(file, "\t\t{}: Arg{index},", &input.arg_name).unwrap();
     }
 
-    write!(file, "\t) -> {interaction_deploy}<A, ").unwrap();
-}
-
-fn write_parameter_arg(file: &mut File, index: usize, arg_name: &str) {
-    writeln!(file, "\t\t{arg_name}: Arg{index},").unwrap()
+    write!(
+        file,
+        "\t) -> multiversx_sc::types::Tx<Env,
+        (),
+        (),
+        (),
+        (),
+        FunctionCall<<Env as multiversx_sc::types::TxEnv>::Api>,
+        (),
+    > {{\n"
+    )
+    .unwrap();
 }
 
-fn write_endpoint_fn(file: &mut File, rust_method_name: String) {
-    write!(file, "\tfn {rust_method_name}").unwrap();
+fn write_function_header_endpoint(file: &mut File, rust_method_name: String) {
+    write!(file, "\tpub fn {rust_method_name}").unwrap();
 }
 
 fn write_info_endpoint(file: &mut File, docs: Vec<String>) {
@@ -132,7 +87,7 @@ fn write_info_endpoint(file: &mut File, docs: Vec<String>) {
     }
 }
 
-fn write_generic_args(file: &mut File, inputs: Vec<InputAbi>) {
+fn write_args(file: &mut File, inputs: Vec<InputAbi>) {
     if inputs.is_empty() {
         return;
     }
@@ -151,7 +106,7 @@ fn write_argument(file: &mut File, index: usize, type_name: String) {
     handle_abi_type(&mut type_string, type_name);
     let type_string_str = type_string.get_type_name().to_string();
 
-    let type_print = type_string_str.replace("<StaticApi>", "<A>");
+    let type_print = type_string_str.replace("<StaticApi>", "<Env>");
 
     writeln!(
         file,
@@ -161,14 +116,7 @@ fn write_argument(file: &mut File, index: usize, type_name: String) {
     .unwrap();
 }
 
-fn write_end_of_constructor(file: &mut File) {
-    writeln!(file, "\t\t___contract_deploy___").unwrap();
-    writeln!(file, "\t}}").unwrap();
-    write_newline(file);
-}
-
-fn write_end_of_endpoint(file: &mut File) {
-    writeln!(file, "\t\t___contract_call___").unwrap();
+fn write_end_of_function(file: &mut File) {
     writeln!(file, "\t}}").unwrap();
     write_newline(file);
 }
diff --git a/framework/meta/src/cmd/contract/generate_proxy/proxy_template_gen.rs b/framework/meta/src/cmd/contract/generate_proxy/proxy_template_gen.rs
index d2ff58a8ac..9742b54c59 100644
--- a/framework/meta/src/cmd/contract/generate_proxy/proxy_template_gen.rs
+++ b/framework/meta/src/cmd/contract/generate_proxy/proxy_template_gen.rs
@@ -3,31 +3,39 @@ use std::{fs::File, io::Write};
 use crate::cmd::contract::generate_snippets::snippet_gen_common::write_newline;
 
 pub(crate) fn write_imports(file: &mut File) {
-    writeln!(
-        file,
-        r#"#![allow(clippy::too_many_arguments)]
-#![allow(clippy::type_complexity)]
-multiversx_sc::imports!();"#
-    )
-    .unwrap();
+    writeln!(file, r#"multiversx_sc::imports!();"#).unwrap();
 
     write_newline(file);
 }
 
 pub(crate) fn write_struct_template(file: &mut File) {
-    write!(
+    writeln!(file, "pub struct TxProxy;").unwrap();
+    write_newline(file)
+}
+
+pub(crate) fn write_impl_for_tx_proxy(file: &mut File) {
+    writeln!(
         file,
-        "pub struct TxProxy<A>
+        r#"impl<Env> TxProxyTrait<Env> for TxProxy
 where
-    A: multiversx_sc::api::VMApi + 'static,
+    Env: TxEnv,
 {{
-    pub address: ManagedOption<A, ManagedAddress<A>>,
-}}
+    type TxProxyMethods = TxProxyMethods<Env>;
 
-impl<A> TxProxy<A>
-where
-    A: multiversx_sc::api::VMApi + 'static,
-{{"
+    fn env(self, env: Env) -> Self::TxProxyMethods {{
+        TxProxyMethods {{ env }}
+    }}
+}}"#
+    )
+    .unwrap();
+
+    write_newline(file);
+}
+
+pub(crate) fn write_tx_proxy_method_header(file: &mut File) {
+    writeln!(
+        file,
+        r#"impl<Env: TxEnv + multiversx_sc::api::CallTypeApi> TxProxyMethods<Env> {{"#
     )
     .unwrap();
 }

From e1d0888a7b397e6d0cfecac38d0ec69b23dc4430 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Thu, 22 Feb 2024 04:24:51 +0100
Subject: [PATCH 0371/1254] upgrade constructor impl for unified syntax + fmt

---
 .../src/forwarder_raw_alt_init.rs             |  2 +-
 framework/base/src/abi/endpoint_abi.rs        |  1 +
 framework/derive/src/generate/abi_gen.rs      | 15 ++++++++++++
 framework/derive/src/generate/contract_gen.rs |  1 +
 .../derive/src/generate/endpoints_mod_gen.rs  |  1 +
 .../derive/src/generate/function_selector.rs  |  5 ++++
 framework/derive/src/generate/proxy_gen.rs    |  1 +
 framework/derive/src/model/endpoint.rs        |  3 +++
 .../src/model/endpoint_type_metadata.rs       |  4 ++++
 framework/derive/src/model/method.rs          |  3 +++
 framework/derive/src/parse/endpoint_parse.rs  |  7 +-----
 framework/derive/src/parse/method_parse.rs    |  4 ++--
 .../derive/src/validate/validate_method.rs    |  7 +++++-
 .../meta/src/abi_json/contract_abi_json.rs    |  9 ++++++++
 .../contract/sc_config/contract_variant.rs    |  3 +++
 .../sc_config/contract_variant_builder.rs     |  1 +
 .../sc_config/contract_variant_validate.rs    | 20 +++++++++++++---
 .../cmd/contract/sc_config/wasm_crate_gen.rs  | 23 +++++++++++++++----
 18 files changed, 93 insertions(+), 17 deletions(-)

diff --git a/contracts/feature-tests/composability/forwarder-raw/src/forwarder_raw_alt_init.rs b/contracts/feature-tests/composability/forwarder-raw/src/forwarder_raw_alt_init.rs
index 79cab17a11..d677842e41 100644
--- a/contracts/feature-tests/composability/forwarder-raw/src/forwarder_raw_alt_init.rs
+++ b/contracts/feature-tests/composability/forwarder-raw/src/forwarder_raw_alt_init.rs
@@ -29,7 +29,7 @@ pub trait ForwarderRawAlterativeInit: super::forwarder_raw_common::ForwarderRawC
     /// Async calls are explicitly forbidden in upgrade constructors.
     ///
     /// TODO: write test once scenario tests support upgrades directly.
-    #[endpoint(upgrade)]
+    #[upgrade]
     #[label("init-async-call")]
     fn upgrade_async_call(
         &self,
diff --git a/framework/base/src/abi/endpoint_abi.rs b/framework/base/src/abi/endpoint_abi.rs
index 1ce6b5c363..ece11d3e63 100644
--- a/framework/base/src/abi/endpoint_abi.rs
+++ b/framework/base/src/abi/endpoint_abi.rs
@@ -33,6 +33,7 @@ pub enum EndpointMutabilityAbi {
 pub enum EndpointTypeAbi {
     #[default]
     Init,
+    Upgrade,
     Endpoint,
     PromisesCallback,
 }
diff --git a/framework/derive/src/generate/abi_gen.rs b/framework/derive/src/generate/abi_gen.rs
index df8755ded7..71c4c1b822 100644
--- a/framework/derive/src/generate/abi_gen.rs
+++ b/framework/derive/src/generate/abi_gen.rs
@@ -91,6 +91,21 @@ fn generate_endpoint_snippets(contract: &ContractTrait) -> Vec<proc_macro2::Toke
                     contract_abi.constructors.push(endpoint_abi);
                 })
             },
+            PublicRole::Upgrade(_) => {
+                let endpoint_def = generate_endpoint_snippet(
+                    m,
+                    "upgrade",
+                    false,
+                    false,
+                    EndpointMutabilityMetadata::Mutable,
+                    EndpointTypeMetadata::Upgrade,
+                    m.is_allow_multiple_var_args(),
+                );
+                Some(quote! {
+                    #endpoint_def
+                    contract_abi.endpoints.push(endpoint_abi);
+                })
+            },
             PublicRole::Endpoint(endpoint_metadata) => {
                 let endpoint_def = generate_endpoint_snippet(
                     m,
diff --git a/framework/derive/src/generate/contract_gen.rs b/framework/derive/src/generate/contract_gen.rs
index 6d3cf620e6..ba7ace5879 100644
--- a/framework/derive/src/generate/contract_gen.rs
+++ b/framework/derive/src/generate/contract_gen.rs
@@ -28,6 +28,7 @@ pub fn generate_call_methods(contract_trait: &ContractTrait) -> Vec<proc_macro2:
         .iter()
         .filter_map(|m| match &m.public_role {
             PublicRole::Init(_init_metadata) => Some(generate_call_method(m)),
+            PublicRole::Upgrade(_upgrade_metadata) => Some(generate_call_method(m)),
             PublicRole::Endpoint(_endpoint_metadata) => Some(generate_call_method(m)),
             PublicRole::CallbackPromise(_callback_metadata) => {
                 Some(generate_promises_callback_call_method(m))
diff --git a/framework/derive/src/generate/endpoints_mod_gen.rs b/framework/derive/src/generate/endpoints_mod_gen.rs
index 5f780f0c4a..b32a7ce9a8 100644
--- a/framework/derive/src/generate/endpoints_mod_gen.rs
+++ b/framework/derive/src/generate/endpoints_mod_gen.rs
@@ -67,6 +67,7 @@ fn generate_wasm_endpoints(contract_trait: &ContractTrait) -> Vec<proc_macro2::T
         .iter()
         .filter_map(|m| match &m.public_role {
             PublicRole::Init(_) => Some(generate_wasm_endpoint(m, &quote! { init })),
+            PublicRole::Upgrade(_) => Some(generate_wasm_endpoint(m, &quote! { upgrade })),
             PublicRole::Endpoint(endpoint_metadata) => {
                 let endpoint_ident = &endpoint_metadata.public_name;
                 Some(generate_wasm_endpoint(m, &quote! { #endpoint_ident }))
diff --git a/framework/derive/src/generate/function_selector.rs b/framework/derive/src/generate/function_selector.rs
index d49a673d71..6f157724f8 100644
--- a/framework/derive/src/generate/function_selector.rs
+++ b/framework/derive/src/generate/function_selector.rs
@@ -27,6 +27,11 @@ pub fn generate_function_selector_body(contract: &ContractTrait) -> proc_macro2:
                 "init",
                 quote! { if !<Self::Api as multiversx_sc::api::VMApi>::external_view_init_override() },
             )),
+            PublicRole::Upgrade(_) => Some(endpoint_match_arm(
+                m,
+                "upgrade",
+                quote! {},
+            )),
             PublicRole::Endpoint(endpoint_metadata) => Some(endpoint_match_arm(
                 m,
                 endpoint_metadata.public_name.to_string().as_str(),
diff --git a/framework/derive/src/generate/proxy_gen.rs b/framework/derive/src/generate/proxy_gen.rs
index 8f4734558e..2ea199ae54 100644
--- a/framework/derive/src/generate/proxy_gen.rs
+++ b/framework/derive/src/generate/proxy_gen.rs
@@ -274,6 +274,7 @@ pub fn generate_method_impl(contract_trait: &ContractTrait) -> Vec<proc_macro2::
         .iter()
         .filter_map(|m| match &m.public_role {
             PublicRole::Init(_) => Some(generate_proxy_deploy(m)),
+            PublicRole::Upgrade(_) => Some(generate_proxy_endpoint(m, "upgrade".to_string())),
             PublicRole::Endpoint(endpoint_metadata) => Some(generate_proxy_endpoint(
                 m,
                 endpoint_metadata.public_name.to_string(),
diff --git a/framework/derive/src/model/endpoint.rs b/framework/derive/src/model/endpoint.rs
index 5c3d403fdc..1385dd1ada 100644
--- a/framework/derive/src/model/endpoint.rs
+++ b/framework/derive/src/model/endpoint.rs
@@ -29,6 +29,9 @@ pub enum PublicRole {
     /// The smart contract constructor. There can be only one.
     Init(InitMetadata),
 
+    /// The smart contract upgrade constructor.
+    Upgrade(InitMetadata),
+
     /// Means it gets a smart contract function generated for it
     Endpoint(EndpointMetadata),
 
diff --git a/framework/derive/src/model/endpoint_type_metadata.rs b/framework/derive/src/model/endpoint_type_metadata.rs
index 4d668b2df7..4c048e94cb 100644
--- a/framework/derive/src/model/endpoint_type_metadata.rs
+++ b/framework/derive/src/model/endpoint_type_metadata.rs
@@ -2,6 +2,7 @@
 #[derive(Debug, Clone)]
 pub enum EndpointTypeMetadata {
     Init,
+    Upgrade,
     Endpoint,
     PromisesCallback,
 }
@@ -12,6 +13,9 @@ impl EndpointTypeMetadata {
             EndpointTypeMetadata::Init => {
                 quote! { multiversx_sc::abi::EndpointTypeAbi::Init }
             },
+            EndpointTypeMetadata::Upgrade => {
+                quote! { multiversx_sc::abi::EndpointTypeAbi::Upgrade }
+            },
             EndpointTypeMetadata::Endpoint => {
                 quote! { multiversx_sc::abi::EndpointTypeAbi::Endpoint }
             },
diff --git a/framework/derive/src/model/method.rs b/framework/derive/src/model/method.rs
index c705ecb268..776e39dfaa 100644
--- a/framework/derive/src/model/method.rs
+++ b/framework/derive/src/model/method.rs
@@ -77,6 +77,7 @@ impl Method {
     pub fn is_payable(&self) -> bool {
         match &self.public_role {
             PublicRole::Init(init_metadata) => init_metadata.payable.is_payable(),
+            PublicRole::Upgrade(upgrade_metadata) => upgrade_metadata.payable.is_payable(),
             PublicRole::Endpoint(endpoint_metadata) => endpoint_metadata.payable.is_payable(),
             PublicRole::Callback(_) | PublicRole::CallbackRaw | PublicRole::CallbackPromise(_) => {
                 true
@@ -88,6 +89,7 @@ impl Method {
     pub fn payable_metadata(&self) -> MethodPayableMetadata {
         match &self.public_role {
             PublicRole::Init(init_metadata) => init_metadata.payable.clone(),
+            PublicRole::Upgrade(upgrade_metadata) => upgrade_metadata.payable.clone(),
             PublicRole::Endpoint(endpoint_metadata) => endpoint_metadata.payable.clone(),
             PublicRole::Callback(_) | PublicRole::CallbackRaw | PublicRole::CallbackPromise(_) => {
                 MethodPayableMetadata::AnyToken
@@ -99,6 +101,7 @@ impl Method {
     pub fn is_allow_multiple_var_args(&self) -> bool {
         match &self.public_role {
             PublicRole::Init(init_metadata) => init_metadata.allow_multiple_var_args,
+            PublicRole::Upgrade(upgrade_metadata) => upgrade_metadata.allow_multiple_var_args,
             PublicRole::Endpoint(endpoint_metadata) => endpoint_metadata.allow_multiple_var_args,
             PublicRole::Callback(callback_metadata)
             | PublicRole::CallbackPromise(callback_metadata) => {
diff --git a/framework/derive/src/parse/endpoint_parse.rs b/framework/derive/src/parse/endpoint_parse.rs
index 92fd4ff175..fc68c25c59 100644
--- a/framework/derive/src/parse/endpoint_parse.rs
+++ b/framework/derive/src/parse/endpoint_parse.rs
@@ -44,13 +44,8 @@ pub fn process_upgrade_attribute(
     let has_attr = is_upgrade(attr);
     if has_attr {
         check_single_role(&*method);
-        method.public_role = PublicRole::Endpoint(EndpointMetadata {
-            public_name: proc_macro2::Ident::new("upgrade", proc_macro2::Span::call_site()),
+        method.public_role = PublicRole::Upgrade(InitMetadata {
             payable: first_pass_data.payable.clone(),
-            only_owner: false,
-            only_admin: false,
-            only_user_account: false,
-            mutability: EndpointMutabilityMetadata::Mutable,
             allow_multiple_var_args: first_pass_data.allow_multiple_var_args,
         });
         true
diff --git a/framework/derive/src/parse/method_parse.rs b/framework/derive/src/parse/method_parse.rs
index 267e9faa7b..a8c8a111c7 100644
--- a/framework/derive/src/parse/method_parse.rs
+++ b/framework/derive/src/parse/method_parse.rs
@@ -137,8 +137,8 @@ fn validate_method(method: &Method) {
     assert!(
         matches!(
             method.public_role,
-            PublicRole::Init(_) | PublicRole::Endpoint(_) | PublicRole::CallbackPromise(_)
-        ) || method.label_names.is_empty(),
+            PublicRole::Init(_) | PublicRole::Endpoint(_) | PublicRole::CallbackPromise(_) | PublicRole::Upgrade(_)
+                ) || method.label_names.is_empty(),
         "Labels can only be placed on endpoints, constructors, and promises callbacks. Method '{}' is neither.",
         &method.name.to_string()
     )
diff --git a/framework/derive/src/validate/validate_method.rs b/framework/derive/src/validate/validate_method.rs
index 9683e6c2ff..fafb2322e0 100644
--- a/framework/derive/src/validate/validate_method.rs
+++ b/framework/derive/src/validate/validate_method.rs
@@ -2,6 +2,7 @@ use super::reserved;
 use crate::model::{ArgPaymentMetadata, ContractTrait, Method, PublicRole};
 
 const INIT_ENDPOINT_NAME: &str = "init";
+const UPGRADE_ENDPOINT_NAME: &str = "upgrade";
 
 /// TODO: make it work with Result instead of panic
 pub fn validate_contract(contract_trait: &ContractTrait) {
@@ -23,6 +24,10 @@ fn validate_method_name(m: &Method) {
             endpoint_name_str != INIT_ENDPOINT_NAME,
             "Cannot declare endpoint with name 'init'. Use #[init] instead."
         );
+        assert!(
+            endpoint_name_str != UPGRADE_ENDPOINT_NAME,
+            "Cannot declare endpoint with name 'upgrade'. Use #[upgrade] instead."
+        );
         assert!(!reserved::is_reserved(endpoint_name_str.as_str()), "Cannot declare endpoint with name '{endpoint_name_str}', because that name is reserved by the Arwen API.");
     }
 }
@@ -73,7 +78,7 @@ fn validate_payment_args(m: &Method) {
 
         assert!(num_payment_token == 0, "`#[payment_token]` only allowed in payable endpoints, payable init or callbacks (method: `{}`)", m.name);
     }
-    if let PublicRole::Init(init_metadata) = &m.public_role {
+    if let PublicRole::Init(init_metadata) | PublicRole::Upgrade(init_metadata) = &m.public_role {
         assert!(
             init_metadata.payable.no_esdt(),
             "only EGLD payments currently allowed in constructors"
diff --git a/framework/meta/src/abi_json/contract_abi_json.rs b/framework/meta/src/abi_json/contract_abi_json.rs
index c4f62916c3..f8d3aad422 100644
--- a/framework/meta/src/abi_json/contract_abi_json.rs
+++ b/framework/meta/src/abi_json/contract_abi_json.rs
@@ -20,6 +20,10 @@ pub struct ContractAbiJson {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub constructor: Option<ConstructorAbiJson>,
 
+    #[serde(default)]
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub upgrade_constructor: Option<ConstructorAbiJson>,
+
     #[serde(default)]
     pub endpoints: Vec<EndpointAbiJson>,
 
@@ -48,6 +52,11 @@ impl From<&ContractAbi> for ContractAbiJson {
             docs: abi.docs.iter().map(|d| d.to_string()).collect(),
             name: abi.name.to_string(),
             constructor: abi.constructors.first().map(ConstructorAbiJson::from),
+            upgrade_constructor: abi
+                .endpoints
+                .iter()
+                .find(|c| matches!(c.endpoint_type, EndpointTypeAbi::Upgrade))
+                .map(ConstructorAbiJson::from),
             endpoints: abi.endpoints.iter().map(EndpointAbiJson::from).collect(),
             promises_callback_names: abi
                 .promise_callbacks
diff --git a/framework/meta/src/cmd/contract/sc_config/contract_variant.rs b/framework/meta/src/cmd/contract/sc_config/contract_variant.rs
index 6b6cf70cc4..99678a798b 100644
--- a/framework/meta/src/cmd/contract/sc_config/contract_variant.rs
+++ b/framework/meta/src/cmd/contract/sc_config/contract_variant.rs
@@ -154,6 +154,9 @@ impl ContractVariant {
     /// Should correspond to all wasm exported functions.
     pub fn all_exported_function_names(&self) -> Vec<String> {
         let mut result = vec!["init".to_string()];
+        if self.abi.constructors.len() > 1 {
+            result.push("upgrade".to_string())
+        }
         result.append(&mut self.endpoint_names());
         if self.abi.has_callback {
             result.push("callBack".to_string());
diff --git a/framework/meta/src/cmd/contract/sc_config/contract_variant_builder.rs b/framework/meta/src/cmd/contract/sc_config/contract_variant_builder.rs
index d447ab4a0a..1c4c229313 100644
--- a/framework/meta/src/cmd/contract/sc_config/contract_variant_builder.rs
+++ b/framework/meta/src/cmd/contract/sc_config/contract_variant_builder.rs
@@ -174,6 +174,7 @@ fn build_contract_abi(builder: ContractVariantBuilder, original_abi: &ContractAb
     for endpoint_abi in builder.collected_endpoints {
         match endpoint_abi.endpoint_type {
             multiversx_sc::abi::EndpointTypeAbi::Init => constructors.push(endpoint_abi),
+            multiversx_sc::abi::EndpointTypeAbi::Upgrade => endpoints.push(endpoint_abi),
             multiversx_sc::abi::EndpointTypeAbi::Endpoint => endpoints.push(endpoint_abi),
             multiversx_sc::abi::EndpointTypeAbi::PromisesCallback => {
                 promise_callbacks.push(endpoint_abi)
diff --git a/framework/meta/src/cmd/contract/sc_config/contract_variant_validate.rs b/framework/meta/src/cmd/contract/sc_config/contract_variant_validate.rs
index a0c0acb886..2b7a729bd1 100644
--- a/framework/meta/src/cmd/contract/sc_config/contract_variant_validate.rs
+++ b/framework/meta/src/cmd/contract/sc_config/contract_variant_validate.rs
@@ -1,4 +1,4 @@
-use multiversx_sc::abi::{ContractAbi, EndpointAbi};
+use multiversx_sc::abi::{ContractAbi, EndpointAbi, EndpointTypeAbi};
 
 use super::ContractVariant;
 
@@ -16,7 +16,13 @@ fn check_single_constructor(contract_variant: &ContractVariant) -> Result<(), St
             Err("Missing constructor. Add a method annotated with `#[init]`.".to_string())
         },
         1 => Ok(()),
-        _ => Err("More than one contrctructor present. Exactly one method annotated with `#[init]` is required.".to_string()),
+        2 => if has_init(contract_variant) && has_upgrade(contract_variant) {
+            Ok(())
+        }
+        else {
+            Err("You can only have two constructors and only one of each: `#[init]` and `#[upgrade]`".to_string())
+        }
+        _ => Err("More than two constructors present. Exactly one method annotated with `#[init]` and another optional `#[upgrade]` is required.".to_string()),
     }
 }
 
@@ -25,7 +31,15 @@ fn has_upgrade(contract_variant: &ContractVariant) -> bool {
         .abi
         .endpoints
         .iter()
-        .any(|endpoint| endpoint.name == "upgrade")
+        .any(|endpoint| matches!(endpoint.endpoint_type, EndpointTypeAbi::Upgrade))
+}
+
+fn has_init(contract_variant: &ContractVariant) -> bool {
+    contract_variant
+        .abi
+        .constructors
+        .iter()
+        .any(|endpoint| matches!(endpoint.endpoint_type, EndpointTypeAbi::Init))
 }
 
 /// Note: promise callbacks not included, since they have `#[call_value]` arguments, that are currently not modelled.
diff --git a/framework/meta/src/cmd/contract/sc_config/wasm_crate_gen.rs b/framework/meta/src/cmd/contract/sc_config/wasm_crate_gen.rs
index 7dde9e9805..386f51761c 100644
--- a/framework/meta/src/cmd/contract/sc_config/wasm_crate_gen.rs
+++ b/framework/meta/src/cmd/contract/sc_config/wasm_crate_gen.rs
@@ -1,4 +1,7 @@
-use multiversx_sc::{abi::EndpointAbi, external_view_contract::EXTERNAL_VIEW_CONSTRUCTOR_FLAG};
+use multiversx_sc::{
+    abi::{EndpointAbi, EndpointTypeAbi},
+    external_view_contract::EXTERNAL_VIEW_CONSTRUCTOR_FLAG,
+};
 use rustc_version::Version;
 use std::{
     fs::{self, File},
@@ -110,7 +113,21 @@ fn write_stat_comment(wasm_lib_file: &mut File, label: &str, number: usize) {
 impl ContractVariant {
     /// Writing some nicely formatted comments breaking down all exported functions.
     fn write_stat_comments(&self, wasm_lib_file: &mut File) {
-        write_stat_comment(wasm_lib_file, "Init:", NUM_INIT);
+        let mut total = self.abi.endpoints.len() + NUM_ASYNC_CB + self.abi.promise_callbacks.len();
+
+        if !self.abi.constructors.is_empty() {
+            write_stat_comment(wasm_lib_file, "Init:", NUM_INIT);
+            total += NUM_INIT;
+        }
+        if self
+            .abi
+            .endpoints
+            .iter()
+            .any(|c| matches!(c.endpoint_type, EndpointTypeAbi::Upgrade))
+        {
+            write_stat_comment(wasm_lib_file, "Upgrade:", NUM_INIT);
+        }
+
         write_stat_comment(wasm_lib_file, "Endpoints:", self.abi.endpoints.len());
         if self.abi.has_callback {
             write_stat_comment(wasm_lib_file, "Async Callback:", NUM_ASYNC_CB);
@@ -124,8 +141,6 @@ impl ContractVariant {
                 self.abi.promise_callbacks.len(),
             );
         }
-        let total =
-            self.abi.endpoints.len() + NUM_INIT + NUM_ASYNC_CB + self.abi.promise_callbacks.len();
 
         write_stat_comment(wasm_lib_file, "Total number of exported functions:", total);
     }

From 10329dede4bf28f4ab093e53613f13cac56026fd Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Thu, 22 Feb 2024 13:55:49 +0200
Subject: [PATCH 0372/1254] remove struct from adder

---
 contracts/examples/adder/src/adder.rs | 33 ---------------------------
 1 file changed, 33 deletions(-)

diff --git a/contracts/examples/adder/src/adder.rs b/contracts/examples/adder/src/adder.rs
index 8f504c1aea..9b261c5aa8 100644
--- a/contracts/examples/adder/src/adder.rs
+++ b/contracts/examples/adder/src/adder.rs
@@ -25,36 +25,3 @@ pub trait Adder {
         self.sum().update(|sum| *sum += value);
     }
 }
-
-pub struct TxProxy;
-
-impl<Env> TxProxyTrait<Env> for TxProxy
-where
-    Env: TxEnv,
-{
-    type TxProxyMethods = TxProxyMethods<Env>;
-
-    fn env(self, env: Env) -> Self::TxProxyMethods {
-        TxProxyMethods { env }
-    }
-}
-
-impl<Env: TxEnv + multiversx_sc::api::CallTypeApi> TxProxyMethods<Env> {
-    pub fn add<Arg0: multiversx_sc::codec::CodecInto<BigUint<Env>>>(
-        self,
-        arg0: Arg0,
-    ) -> multiversx_sc::types::Tx<
-        Env,
-        (),
-        (),
-        (),
-        (),
-        FunctionCall<<Env as multiversx_sc::types::TxEnv>::Api>,
-        (),
-    > {
-        Tx::new_with_env(self.env)
-            .raw_call()
-            .function_name("add")
-            .argument(&arg0)
-    }
-}

From ab7c770340ba763173e3ad83b292a8af7568f7fd Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Thu, 29 Feb 2024 00:28:02 +0200
Subject: [PATCH 0373/1254] changed ouput from each fn

---
 contracts/examples/adder/src/adder.rs         | 143 ++++++++++++++++++
 framework/base/src/types/interaction/mod.rs   |   2 +
 .../base/src/types/interaction/tx_proxy.rs    |  11 ++
 framework/derive/src/contract_impl.rs         |   6 -
 framework/derive/src/generate/proxy_gen.rs    |  18 ---
 5 files changed, 156 insertions(+), 24 deletions(-)
 create mode 100644 framework/base/src/types/interaction/tx_proxy.rs

diff --git a/contracts/examples/adder/src/adder.rs b/contracts/examples/adder/src/adder.rs
index 9b261c5aa8..d316d70a90 100644
--- a/contracts/examples/adder/src/adder.rs
+++ b/contracts/examples/adder/src/adder.rs
@@ -25,3 +25,146 @@ pub trait Adder {
         self.sum().update(|sum| *sum += value);
     }
 }
+
+pub struct TxProxy;
+
+impl<Env> TxProxyTrait<Env> for TxProxy
+where
+    Env: TxEnv,
+{
+    type TxProxyMethods = TxProxyMethods<Env>;
+
+    fn env(self, env: Env) -> Self::TxProxyMethods {
+        TxProxyMethods { env }
+    }
+}
+
+trait TxProxyMethodsTrait<Env: TxEnv + multiversx_sc::api::CallTypeApi> {
+    fn add<Arg0, O>(
+        self,
+        value: Arg0,
+    ) -> multiversx_sc::types::Tx<
+        Env,
+        (),
+        (),
+        (),
+        (),
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<O>,
+    >
+    where
+        Arg0: multiversx_sc::codec::CodecInto<BigUint<Env>>;
+
+    fn upgrade<Arg0, O>(
+        self,
+        initial_value: Arg0,
+    ) -> multiversx_sc::types::Tx<
+        Env,
+        (),
+        (),
+        (),
+        (),
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<O>,
+    >
+    where
+        Arg0: multiversx_sc::codec::CodecInto<BigUint<Env>>;
+
+    fn sum<O>(
+        self,
+    ) -> multiversx_sc::types::Tx<
+        Env,
+        (),
+        (),
+        (),
+        (),
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<O>,
+    >;
+
+    fn init<Arg0, O>(
+        self,
+        initial_value: Arg0,
+    ) -> multiversx_sc::types::Tx<Env, (), (), (), (), DeployCall<TxScEnv, FromSource<TxScEnv<Api>>>, OriginalResultMarker<O>>
+    where
+        Arg0: multiversx_sc::codec::CodecInto<BigUint<Env>>;
+}
+
+impl<Env: TxEnv + multiversx_sc::api::CallTypeApi> TxProxyMethodsTrait<Env>
+    for TxProxyMethods<Env>
+{
+    fn init<Arg0: multiversx_sc::codec::CodecInto<BigUint<Env>>, O>(
+        self,
+        initial_value: Arg0,
+    ) -> multiversx_sc::types::Tx<
+        Env,
+        (),
+        (),
+        (),
+        (),
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<O>,
+    > {
+        Tx::new_with_env(self.env)
+            .raw_call()
+            .function_name("init")
+            .argument(&initial_value)
+            .original_result()
+    }
+
+    fn sum<O>(
+        self,
+    ) -> multiversx_sc::types::Tx<
+        Env,
+        (),
+        (),
+        (),
+        (),
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<O>,
+    > {
+        Tx::new_with_env(self.env)
+            .raw_call()
+            .function_name("getSum")
+            .original_result()
+    }
+
+    fn upgrade<Arg0: multiversx_sc::codec::CodecInto<BigUint<Env>>, O>(
+        self,
+        initial_value: Arg0,
+    ) -> multiversx_sc::types::Tx<
+        Env,
+        (),
+        (),
+        (),
+        (),
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<O>,
+    > {
+        Tx::new_with_env(self.env.clone())
+            .raw_call()
+            .function_name("upgrade")
+            .argument(&initial_value)
+            .original_result()
+    }
+
+    //Add desired amount to the storage variable.
+    fn add<Arg0: multiversx_sc::codec::CodecInto<BigUint<Env>>, O>(
+        self,
+        value: Arg0,
+    ) -> multiversx_sc::types::Tx<
+        Env,
+        (),
+        (),
+        (),
+        (),
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<O>,
+    > {
+        Tx::new_with_env(self.env.clone())
+            .raw_call()
+            .function_name("add")
+            .argument(&value)
+            .original_result()
+    }
+}
diff --git a/framework/base/src/types/interaction/mod.rs b/framework/base/src/types/interaction/mod.rs
index 0e13f0c5f2..1378a9ff94 100644
--- a/framework/base/src/types/interaction/mod.rs
+++ b/framework/base/src/types/interaction/mod.rs
@@ -38,6 +38,7 @@ mod tx_rh_list;
 mod tx_rh_original_result;
 mod tx_to;
 mod typed_function_call;
+mod tx_proxy;
 
 pub use annotated::*;
 pub use async_call::AsyncCall;
@@ -75,5 +76,6 @@ pub use tx_rh_list::*;
 pub use tx_rh_original_result::*;
 pub use tx_to::*;
 pub use typed_function_call::*;
+pub use tx_proxy::*;
 
 pub type TxScBase<Api> = TxBaseWithEnv<TxScEnv<Api>>;
diff --git a/framework/base/src/types/interaction/tx_proxy.rs b/framework/base/src/types/interaction/tx_proxy.rs
new file mode 100644
index 0000000000..dbbaadf77e
--- /dev/null
+++ b/framework/base/src/types/interaction/tx_proxy.rs
@@ -0,0 +1,11 @@
+use super::TxEnv;
+
+pub trait TxProxyTrait<Env> {
+    type TxProxyMethods;
+
+    fn env(self, env: Env) -> Self::TxProxyMethods;
+}
+
+pub struct TxProxyMethods<Env: TxEnv> {
+    pub env: Env,
+}
diff --git a/framework/derive/src/contract_impl.rs b/framework/derive/src/contract_impl.rs
index 414c261f72..1f6b3c9383 100644
--- a/framework/derive/src/contract_impl.rs
+++ b/framework/derive/src/contract_impl.rs
@@ -130,8 +130,6 @@ pub fn contract_implementation(
     };
 
     let proxy_trait = proxy_gen::proxy_trait(contract);
-    let tx_proxy_trait = proxy_gen::tx_proxy_trait();
-    let tx_proxy_methods = proxy_gen::tx_proxy_methods();
     let proxy_obj_code = if is_contract_main {
         proxy_gen::proxy_obj_code(contract)
     } else {
@@ -147,10 +145,6 @@ pub fn contract_implementation(
 
         #proxy_trait
 
-        #tx_proxy_trait
-
-        #tx_proxy_methods
-
         #proxy_obj_code
 
         #callback_proxies_obj
diff --git a/framework/derive/src/generate/proxy_gen.rs b/framework/derive/src/generate/proxy_gen.rs
index 0e1f851608..8f4734558e 100644
--- a/framework/derive/src/generate/proxy_gen.rs
+++ b/framework/derive/src/generate/proxy_gen.rs
@@ -298,24 +298,6 @@ pub fn proxy_trait(contract: &ContractTrait) -> proc_macro2::TokenStream {
     }
 }
 
-pub fn tx_proxy_trait() -> proc_macro2::TokenStream {
-    quote! {
-        pub trait TxProxyTrait<Env>{
-            type TxProxyMethods;
-
-            fn env(self, env: Env) -> Self::TxProxyMethods;
-        }
-    }
-}
-
-pub fn tx_proxy_methods() -> proc_macro2::TokenStream {
-    quote! {
-        pub struct TxProxyMethods<Env: TxEnv> {
-            env: Env,
-        }        
-    }
-}
-
 pub fn proxy_obj_code(contract: &ContractTrait) -> proc_macro2::TokenStream {
     let proxy_object_def = snippets::proxy_object_def();
     let impl_all_proxy_traits =

From bb1217b7b271f4babadb2aaf4bb93fa58d56178c Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Thu, 29 Feb 2024 00:32:47 +0200
Subject: [PATCH 0374/1254] removed dummy code

---
 contracts/examples/adder/src/adder.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contracts/examples/adder/src/adder.rs b/contracts/examples/adder/src/adder.rs
index d316d70a90..e0cfe3eedf 100644
--- a/contracts/examples/adder/src/adder.rs
+++ b/contracts/examples/adder/src/adder.rs
@@ -85,7 +85,7 @@ trait TxProxyMethodsTrait<Env: TxEnv + multiversx_sc::api::CallTypeApi> {
     fn init<Arg0, O>(
         self,
         initial_value: Arg0,
-    ) -> multiversx_sc::types::Tx<Env, (), (), (), (), DeployCall<TxScEnv, FromSource<TxScEnv<Api>>>, OriginalResultMarker<O>>
+    ) -> multiversx_sc::types::Tx<Env, (), (), (), (), FunctionCall<Env::Api>, OriginalResultMarker<O>>
     where
         Arg0: multiversx_sc::codec::CodecInto<BigUint<Env>>;
 }

From 2a5f9d53d5dedd14769484a6af0d362aaf06e8a1 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Thu, 29 Feb 2024 16:50:17 +0200
Subject: [PATCH 0375/1254] modified init call

---
 contracts/examples/adder/src/adder.rs | 85 ++++++++++++++++-----------
 1 file changed, 50 insertions(+), 35 deletions(-)

diff --git a/contracts/examples/adder/src/adder.rs b/contracts/examples/adder/src/adder.rs
index e0cfe3eedf..59ba95ba20 100644
--- a/contracts/examples/adder/src/adder.rs
+++ b/contracts/examples/adder/src/adder.rs
@@ -39,8 +39,8 @@ where
     }
 }
 
-trait TxProxyMethodsTrait<Env: TxEnv + multiversx_sc::api::CallTypeApi> {
-    fn add<Arg0, O>(
+pub trait TxProxyMethodsTrait<Env: TxEnv + multiversx_sc::api::CallTypeApi> {
+    fn add<Arg0, OriginalResult>(
         self,
         value: Arg0,
     ) -> multiversx_sc::types::Tx<
@@ -50,12 +50,12 @@ trait TxProxyMethodsTrait<Env: TxEnv + multiversx_sc::api::CallTypeApi> {
         (),
         (),
         FunctionCall<Env::Api>,
-        OriginalResultMarker<O>,
+        OriginalResultMarker<OriginalResult>,
     >
     where
         Arg0: multiversx_sc::codec::CodecInto<BigUint<Env>>;
 
-    fn upgrade<Arg0, O>(
+    fn upgrade<Arg0, OriginalResult>(
         self,
         initial_value: Arg0,
     ) -> multiversx_sc::types::Tx<
@@ -65,12 +65,12 @@ trait TxProxyMethodsTrait<Env: TxEnv + multiversx_sc::api::CallTypeApi> {
         (),
         (),
         FunctionCall<Env::Api>,
-        OriginalResultMarker<O>,
+        OriginalResultMarker<OriginalResult>,
     >
     where
         Arg0: multiversx_sc::codec::CodecInto<BigUint<Env>>;
 
-    fn sum<O>(
+    fn sum<OriginalResult>(
         self,
     ) -> multiversx_sc::types::Tx<
         Env,
@@ -79,23 +79,33 @@ trait TxProxyMethodsTrait<Env: TxEnv + multiversx_sc::api::CallTypeApi> {
         (),
         (),
         FunctionCall<Env::Api>,
-        OriginalResultMarker<O>,
+        OriginalResultMarker<OriginalResult>,
     >;
 
-    fn init<Arg0, O>(
+    #[allow(clippy::type_complexity)]
+    fn init<Arg0, OriginalResult>(
         self,
         initial_value: Arg0,
-    ) -> multiversx_sc::types::Tx<Env, (), (), (), (), FunctionCall<Env::Api>, OriginalResultMarker<O>>
+    ) -> multiversx_sc::types::Tx<
+        Env,
+        (),
+        (),
+        (),
+        (),
+        DeployCall<Env::Api, ()>,
+        OriginalResultMarker<OriginalResult>,
+    >
     where
-        Arg0: multiversx_sc::codec::CodecInto<BigUint<Env>>;
+        Arg0: multiversx_sc::codec::CodecInto<BigUint<Env>>,
+        DeployCall<<Env as TxEnv>::Api, ()>: TxData<Env>,
+        <Env as TxEnv>::Api: TxEnv;
 }
 
-impl<Env: TxEnv + multiversx_sc::api::CallTypeApi> TxProxyMethodsTrait<Env>
+impl<Env: TxEnv<Api = Env> + multiversx_sc::api::CallTypeApi> TxProxyMethodsTrait<Env>
     for TxProxyMethods<Env>
 {
-    fn init<Arg0: multiversx_sc::codec::CodecInto<BigUint<Env>>, O>(
+    fn sum<OriginalResult>(
         self,
-        initial_value: Arg0,
     ) -> multiversx_sc::types::Tx<
         Env,
         (),
@@ -103,17 +113,17 @@ impl<Env: TxEnv + multiversx_sc::api::CallTypeApi> TxProxyMethodsTrait<Env>
         (),
         (),
         FunctionCall<Env::Api>,
-        OriginalResultMarker<O>,
+        OriginalResultMarker<OriginalResult>,
     > {
         Tx::new_with_env(self.env)
             .raw_call()
-            .function_name("init")
-            .argument(&initial_value)
+            .function_name("getSum")
             .original_result()
     }
 
-    fn sum<O>(
+    fn upgrade<Arg0: multiversx_sc::codec::CodecInto<BigUint<Env>>, OriginalResult>(
         self,
+        initial_value: Arg0,
     ) -> multiversx_sc::types::Tx<
         Env,
         (),
@@ -121,17 +131,19 @@ impl<Env: TxEnv + multiversx_sc::api::CallTypeApi> TxProxyMethodsTrait<Env>
         (),
         (),
         FunctionCall<Env::Api>,
-        OriginalResultMarker<O>,
+        OriginalResultMarker<OriginalResult>,
     > {
         Tx::new_with_env(self.env)
             .raw_call()
-            .function_name("getSum")
+            .function_name("upgrade")
+            .argument(&initial_value)
             .original_result()
     }
 
-    fn upgrade<Arg0: multiversx_sc::codec::CodecInto<BigUint<Env>>, O>(
+    //Add desired amount to the storage variable.
+    fn add<Arg0: multiversx_sc::codec::CodecInto<BigUint<Env>>, OriginalResult>(
         self,
-        initial_value: Arg0,
+        value: Arg0,
     ) -> multiversx_sc::types::Tx<
         Env,
         (),
@@ -139,32 +151,35 @@ impl<Env: TxEnv + multiversx_sc::api::CallTypeApi> TxProxyMethodsTrait<Env>
         (),
         (),
         FunctionCall<Env::Api>,
-        OriginalResultMarker<O>,
+        OriginalResultMarker<OriginalResult>,
     > {
-        Tx::new_with_env(self.env.clone())
+        Tx::new_with_env(self.env)
             .raw_call()
-            .function_name("upgrade")
-            .argument(&initial_value)
+            .function_name("add")
+            .argument(&value)
             .original_result()
     }
 
-    //Add desired amount to the storage variable.
-    fn add<Arg0: multiversx_sc::codec::CodecInto<BigUint<Env>>, O>(
+    fn init<Arg0, OriginalResult>(
         self,
-        value: Arg0,
+        initial_value: Arg0,
     ) -> multiversx_sc::types::Tx<
         Env,
         (),
         (),
         (),
         (),
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<O>,
-    > {
-        Tx::new_with_env(self.env.clone())
-            .raw_call()
-            .function_name("add")
-            .argument(&value)
+        DeployCall<<Env as TxEnv>::Api, ()>,
+        OriginalResultMarker<OriginalResult>,
+    >
+    where
+        Arg0: multiversx_sc::codec::CodecInto<BigUint<Env>>,
+        DeployCall<<Env as TxEnv>::Api, ()>: TxData<Env>,
+        <Env as TxEnv>::Api: TxEnv,
+    {
+        Tx::new_with_env(self.env)
+            .raw_deploy()
+            .argument(&initial_value)
             .original_result()
     }
 }

From 30fe9f4ae93d51e8af797fa6b01ee5d24e2450a1 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Thu, 29 Feb 2024 19:53:30 +0100
Subject: [PATCH 0376/1254] added upgrade constructors as separate field

---
 contracts/examples/adder/wasm/src/lib.rs      |  7 ++++---
 contracts/examples/factorial/wasm/src/lib.rs  |  5 +++--
 .../multisig/wasm-multisig-full/src/lib.rs    |  5 +++--
 contracts/examples/multisig/wasm/src/lib.rs   |  5 +++--
 .../src/lib.rs                                |  5 +++--
 .../proxy-test-second/wasm/src/lib.rs         |  5 +++--
 .../vault/wasm-vault-upgrade/src/lib.rs       |  6 +++---
 .../composability/vault/wasm/src/lib.rs       |  7 ++++---
 framework/base/src/abi/contract_abi.rs        |  4 ++++
 framework/derive/src/generate/abi_gen.rs      |  2 +-
 .../meta/src/abi_json/contract_abi_json.rs    |  6 +-----
 .../contract/sc_config/contract_variant.rs    |  3 ++-
 .../sc_config/contract_variant_builder.rs     |  4 +++-
 .../sc_config/contract_variant_validate.rs    | 21 ++++++++-----------
 .../cmd/contract/sc_config/wasm_crate_gen.rs  | 12 ++---------
 15 files changed, 48 insertions(+), 49 deletions(-)

diff --git a/contracts/examples/adder/wasm/src/lib.rs b/contracts/examples/adder/wasm/src/lib.rs
index 13bb12ad6e..38c36e9d2c 100644
--- a/contracts/examples/adder/wasm/src/lib.rs
+++ b/contracts/examples/adder/wasm/src/lib.rs
@@ -5,9 +5,10 @@
 ////////////////////////////////////////////////////
 
 // Init:                                 1
-// Endpoints:                            3
+// Upgrade:                              1
+// Endpoints:                            2
 // Async Callback (empty):               1
-// Total number of exported functions:   5
+// Total number of exported functions:   4
 
 #![no_std]
 #![allow(internal_features)]
@@ -20,8 +21,8 @@ multiversx_sc_wasm_adapter::endpoints! {
     adder
     (
         init => init
-        getSum => sum
         upgrade => upgrade
+        getSum => sum
         add => add
     )
 }
diff --git a/contracts/examples/factorial/wasm/src/lib.rs b/contracts/examples/factorial/wasm/src/lib.rs
index 7819e0b34f..0b5b352a7c 100644
--- a/contracts/examples/factorial/wasm/src/lib.rs
+++ b/contracts/examples/factorial/wasm/src/lib.rs
@@ -5,9 +5,10 @@
 ////////////////////////////////////////////////////
 
 // Init:                                 1
-// Endpoints:                            2
+// Upgrade:                              1
+// Endpoints:                            1
 // Async Callback (empty):               1
-// Total number of exported functions:   4
+// Total number of exported functions:   3
 
 #![no_std]
 #![allow(internal_features)]
diff --git a/contracts/examples/multisig/wasm-multisig-full/src/lib.rs b/contracts/examples/multisig/wasm-multisig-full/src/lib.rs
index b3f9a29bee..bc725882a2 100644
--- a/contracts/examples/multisig/wasm-multisig-full/src/lib.rs
+++ b/contracts/examples/multisig/wasm-multisig-full/src/lib.rs
@@ -5,9 +5,10 @@
 ////////////////////////////////////////////////////
 
 // Init:                                 1
-// Endpoints:                           29
+// Upgrade:                              1
+// Endpoints:                           28
 // Async Callback:                       1
-// Total number of exported functions:  31
+// Total number of exported functions:  30
 
 #![no_std]
 #![allow(internal_features)]
diff --git a/contracts/examples/multisig/wasm/src/lib.rs b/contracts/examples/multisig/wasm/src/lib.rs
index 0bb7178ce4..553df1cde9 100644
--- a/contracts/examples/multisig/wasm/src/lib.rs
+++ b/contracts/examples/multisig/wasm/src/lib.rs
@@ -5,9 +5,10 @@
 ////////////////////////////////////////////////////
 
 // Init:                                 1
-// Endpoints:                           21
+// Upgrade:                              1
+// Endpoints:                           20
 // Async Callback:                       1
-// Total number of exported functions:  23
+// Total number of exported functions:  22
 
 #![no_std]
 #![allow(internal_features)]
diff --git a/contracts/feature-tests/composability/forwarder-raw/wasm-forwarder-raw-init-async-call/src/lib.rs b/contracts/feature-tests/composability/forwarder-raw/wasm-forwarder-raw-init-async-call/src/lib.rs
index 01c9657fd7..c81e3182c8 100644
--- a/contracts/feature-tests/composability/forwarder-raw/wasm-forwarder-raw-init-async-call/src/lib.rs
+++ b/contracts/feature-tests/composability/forwarder-raw/wasm-forwarder-raw-init-async-call/src/lib.rs
@@ -5,9 +5,10 @@
 ////////////////////////////////////////////////////
 
 // Init:                                 1
-// Endpoints:                            1
+// Upgrade:                              1
+// Endpoints:                            0
 // Async Callback:                       1
-// Total number of exported functions:   3
+// Total number of exported functions:   2
 
 #![no_std]
 #![allow(internal_features)]
diff --git a/contracts/feature-tests/composability/proxy-test-second/wasm/src/lib.rs b/contracts/feature-tests/composability/proxy-test-second/wasm/src/lib.rs
index e10ed79624..bf6cc294c2 100644
--- a/contracts/feature-tests/composability/proxy-test-second/wasm/src/lib.rs
+++ b/contracts/feature-tests/composability/proxy-test-second/wasm/src/lib.rs
@@ -5,9 +5,10 @@
 ////////////////////////////////////////////////////
 
 // Init:                                 1
-// Endpoints:                            4
+// Upgrade:                              1
+// Endpoints:                            3
 // Async Callback (empty):               1
-// Total number of exported functions:   6
+// Total number of exported functions:   5
 
 #![no_std]
 #![allow(internal_features)]
diff --git a/contracts/feature-tests/composability/vault/wasm-vault-upgrade/src/lib.rs b/contracts/feature-tests/composability/vault/wasm-vault-upgrade/src/lib.rs
index 904a343933..772ffc92ba 100644
--- a/contracts/feature-tests/composability/vault/wasm-vault-upgrade/src/lib.rs
+++ b/contracts/feature-tests/composability/vault/wasm-vault-upgrade/src/lib.rs
@@ -4,10 +4,10 @@
 ////////////////// AUTO-GENERATED //////////////////
 ////////////////////////////////////////////////////
 
-// Init:                                 1
-// Endpoints:                            1
+// Upgrade:                              1
+// Endpoints:                            0
 // Async Callback (empty):               1
-// Total number of exported functions:   3
+// Total number of exported functions:   1
 
 #![no_std]
 #![allow(internal_features)]
diff --git a/contracts/feature-tests/composability/vault/wasm/src/lib.rs b/contracts/feature-tests/composability/vault/wasm/src/lib.rs
index 3ef976396a..c6e864fbbe 100644
--- a/contracts/feature-tests/composability/vault/wasm/src/lib.rs
+++ b/contracts/feature-tests/composability/vault/wasm/src/lib.rs
@@ -5,9 +5,10 @@
 ////////////////////////////////////////////////////
 
 // Init:                                 1
-// Endpoints:                           16
+// Upgrade:                              1
+// Endpoints:                           15
 // Async Callback (empty):               1
-// Total number of exported functions:  18
+// Total number of exported functions:  17
 
 #![no_std]
 #![allow(internal_features)]
@@ -20,6 +21,7 @@ multiversx_sc_wasm_adapter::endpoints! {
     vault
     (
         init => init
+        upgrade => upgrade
         echo_arguments => echo_arguments
         echo_arguments_without_storage => echo_arguments_without_storage
         echo_caller => echo_caller
@@ -35,7 +37,6 @@ multiversx_sc_wasm_adapter::endpoints! {
         call_counts => call_counts
         num_called_retrieve_funds_promises => num_called_retrieve_funds_promises
         num_async_calls_sent_from_child => num_async_calls_sent_from_child
-        upgrade => upgrade
     )
 }
 
diff --git a/framework/base/src/abi/contract_abi.rs b/framework/base/src/abi/contract_abi.rs
index 3b22d160e7..793b9eed5d 100644
--- a/framework/base/src/abi/contract_abi.rs
+++ b/framework/base/src/abi/contract_abi.rs
@@ -10,6 +10,7 @@ pub struct ContractAbi {
     pub docs: Vec<String>,
     pub name: String,
     pub constructors: Vec<EndpointAbi>,
+    pub upgrade_constructors: Vec<EndpointAbi>,
     pub endpoints: Vec<EndpointAbi>,
     pub promise_callbacks: Vec<EndpointAbi>,
     pub events: Vec<EventAbi>,
@@ -26,6 +27,7 @@ impl ContractAbi {
             docs: docs.iter().map(|s| s.to_string()).collect(),
             name: name.to_string(),
             constructors: Vec::new(),
+            upgrade_constructors: Vec::new(),
             endpoints: Vec::new(),
             promise_callbacks: Vec::new(),
             events: Vec::new(),
@@ -39,6 +41,7 @@ impl ContractAbi {
         self.constructors
             .extend_from_slice(other.constructors.as_slice());
         self.endpoints.extend_from_slice(other.endpoints.as_slice());
+        self.upgrade_constructors.extend_from_slice(other.upgrade_constructors.as_slice());
         self.events.extend_from_slice(other.events.as_slice());
         self.promise_callbacks
             .extend_from_slice(other.promise_callbacks.as_slice());
@@ -75,6 +78,7 @@ impl ContractAbi {
     pub fn iter_all_exports(&self) -> impl Iterator<Item = &EndpointAbi> {
         self.constructors
             .iter()
+            .chain(self.upgrade_constructors.iter())
             .chain(self.endpoints.iter())
             .chain(self.promise_callbacks.iter())
     }
diff --git a/framework/derive/src/generate/abi_gen.rs b/framework/derive/src/generate/abi_gen.rs
index 71c4c1b822..f9a5e8360b 100644
--- a/framework/derive/src/generate/abi_gen.rs
+++ b/framework/derive/src/generate/abi_gen.rs
@@ -103,7 +103,7 @@ fn generate_endpoint_snippets(contract: &ContractTrait) -> Vec<proc_macro2::Toke
                 );
                 Some(quote! {
                     #endpoint_def
-                    contract_abi.endpoints.push(endpoint_abi);
+                    contract_abi.upgrade_constructors.push(endpoint_abi);
                 })
             },
             PublicRole::Endpoint(endpoint_metadata) => {
diff --git a/framework/meta/src/abi_json/contract_abi_json.rs b/framework/meta/src/abi_json/contract_abi_json.rs
index f8d3aad422..aa8cc0df7f 100644
--- a/framework/meta/src/abi_json/contract_abi_json.rs
+++ b/framework/meta/src/abi_json/contract_abi_json.rs
@@ -52,11 +52,7 @@ impl From<&ContractAbi> for ContractAbiJson {
             docs: abi.docs.iter().map(|d| d.to_string()).collect(),
             name: abi.name.to_string(),
             constructor: abi.constructors.first().map(ConstructorAbiJson::from),
-            upgrade_constructor: abi
-                .endpoints
-                .iter()
-                .find(|c| matches!(c.endpoint_type, EndpointTypeAbi::Upgrade))
-                .map(ConstructorAbiJson::from),
+            upgrade_constructor: abi.upgrade_constructors.first().map(ConstructorAbiJson::from),
             endpoints: abi.endpoints.iter().map(EndpointAbiJson::from).collect(),
             promises_callback_names: abi
                 .promise_callbacks
diff --git a/framework/meta/src/cmd/contract/sc_config/contract_variant.rs b/framework/meta/src/cmd/contract/sc_config/contract_variant.rs
index 99678a798b..e1ff06da5d 100644
--- a/framework/meta/src/cmd/contract/sc_config/contract_variant.rs
+++ b/framework/meta/src/cmd/contract/sc_config/contract_variant.rs
@@ -154,7 +154,7 @@ impl ContractVariant {
     /// Should correspond to all wasm exported functions.
     pub fn all_exported_function_names(&self) -> Vec<String> {
         let mut result = vec!["init".to_string()];
-        if self.abi.constructors.len() > 1 {
+        if !self.abi.upgrade_constructors.is_empty() {
             result.push("upgrade".to_string())
         }
         result.append(&mut self.endpoint_names());
@@ -172,6 +172,7 @@ impl std::fmt::Debug for ContractVariant {
             .field("config_name", &self.contract_id)
             .field("public_name", &self.contract_name)
             .field("num-constructors", &self.abi.constructors.len())
+            .field("num-upgrade-constructors", &self.abi.upgrade_constructors.len())
             .field("num-endpoints", &self.abi.endpoints.len())
             .field("settings", &self.settings)
             .finish()
diff --git a/framework/meta/src/cmd/contract/sc_config/contract_variant_builder.rs b/framework/meta/src/cmd/contract/sc_config/contract_variant_builder.rs
index 1c4c229313..2d8b9dd54e 100644
--- a/framework/meta/src/cmd/contract/sc_config/contract_variant_builder.rs
+++ b/framework/meta/src/cmd/contract/sc_config/contract_variant_builder.rs
@@ -169,12 +169,13 @@ fn collect_add_endpoints(
 
 fn build_contract_abi(builder: ContractVariantBuilder, original_abi: &ContractAbi) -> ContractAbi {
     let mut constructors = Vec::new();
+    let mut upgrade_constructors = Vec::new();
     let mut endpoints = Vec::new();
     let mut promise_callbacks = Vec::new();
     for endpoint_abi in builder.collected_endpoints {
         match endpoint_abi.endpoint_type {
             multiversx_sc::abi::EndpointTypeAbi::Init => constructors.push(endpoint_abi),
-            multiversx_sc::abi::EndpointTypeAbi::Upgrade => endpoints.push(endpoint_abi),
+            multiversx_sc::abi::EndpointTypeAbi::Upgrade => upgrade_constructors.push(endpoint_abi),
             multiversx_sc::abi::EndpointTypeAbi::Endpoint => endpoints.push(endpoint_abi),
             multiversx_sc::abi::EndpointTypeAbi::PromisesCallback => {
                 promise_callbacks.push(endpoint_abi)
@@ -189,6 +190,7 @@ fn build_contract_abi(builder: ContractVariantBuilder, original_abi: &ContractAb
         docs: original_abi.docs.clone(),
         name: original_abi.name.clone(),
         constructors,
+        upgrade_constructors,
         endpoints,
         promise_callbacks,
         events: original_abi.events.clone(),
diff --git a/framework/meta/src/cmd/contract/sc_config/contract_variant_validate.rs b/framework/meta/src/cmd/contract/sc_config/contract_variant_validate.rs
index 2b7a729bd1..093650ebd2 100644
--- a/framework/meta/src/cmd/contract/sc_config/contract_variant_validate.rs
+++ b/framework/meta/src/cmd/contract/sc_config/contract_variant_validate.rs
@@ -1,4 +1,4 @@
-use multiversx_sc::abi::{ContractAbi, EndpointAbi, EndpointTypeAbi};
+use multiversx_sc::abi::{ContractAbi, EndpointAbi};
 
 use super::ContractVariant;
 
@@ -27,24 +27,21 @@ fn check_single_constructor(contract_variant: &ContractVariant) -> Result<(), St
 }
 
 fn has_upgrade(contract_variant: &ContractVariant) -> bool {
-    contract_variant
-        .abi
-        .endpoints
-        .iter()
-        .any(|endpoint| matches!(endpoint.endpoint_type, EndpointTypeAbi::Upgrade))
+    !contract_variant.abi.upgrade_constructors.is_empty()
 }
 
 fn has_init(contract_variant: &ContractVariant) -> bool {
-    contract_variant
-        .abi
-        .constructors
-        .iter()
-        .any(|endpoint| matches!(endpoint.endpoint_type, EndpointTypeAbi::Init))
+    !contract_variant.abi.constructors.is_empty()
 }
 
 /// Note: promise callbacks not included, since they have `#[call_value]` arguments, that are currently not modelled.
 fn validate_contract_var_args(abi: &ContractAbi) -> Result<(), String> {
-    for endpoint_abi in abi.constructors.iter().chain(abi.endpoints.iter()) {
+    for endpoint_abi in abi
+        .constructors
+        .iter()
+        .chain(abi.upgrade_constructors.iter())
+        .chain(abi.endpoints.iter())
+    {
         validate_endpoint_var_args_number(endpoint_abi)?;
         validate_endpoint_var_args_order(endpoint_abi)?;
     }
diff --git a/framework/meta/src/cmd/contract/sc_config/wasm_crate_gen.rs b/framework/meta/src/cmd/contract/sc_config/wasm_crate_gen.rs
index 386f51761c..e4d0230490 100644
--- a/framework/meta/src/cmd/contract/sc_config/wasm_crate_gen.rs
+++ b/framework/meta/src/cmd/contract/sc_config/wasm_crate_gen.rs
@@ -1,7 +1,4 @@
-use multiversx_sc::{
-    abi::{EndpointAbi, EndpointTypeAbi},
-    external_view_contract::EXTERNAL_VIEW_CONSTRUCTOR_FLAG,
-};
+use multiversx_sc::{abi::EndpointAbi, external_view_contract::EXTERNAL_VIEW_CONSTRUCTOR_FLAG};
 use rustc_version::Version;
 use std::{
     fs::{self, File},
@@ -119,12 +116,7 @@ impl ContractVariant {
             write_stat_comment(wasm_lib_file, "Init:", NUM_INIT);
             total += NUM_INIT;
         }
-        if self
-            .abi
-            .endpoints
-            .iter()
-            .any(|c| matches!(c.endpoint_type, EndpointTypeAbi::Upgrade))
-        {
+        if !self.abi.upgrade_constructors.is_empty() {
             write_stat_comment(wasm_lib_file, "Upgrade:", NUM_INIT);
         }
 

From 9d0ae2a03628f660df8c5cc8c3716004887a439b Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 29 Feb 2024 15:30:49 -0700
Subject: [PATCH 0377/1254] temporary tx proxy

---
 contracts/examples/adder/src/adder.rs         | 161 +-----------------
 contracts/examples/adder/src/temp_proxy.rs    |  82 +++++++++
 .../base/src/types/interaction/tx_proxy.rs    |   4 -
 3 files changed, 85 insertions(+), 162 deletions(-)
 create mode 100644 contracts/examples/adder/src/temp_proxy.rs

diff --git a/contracts/examples/adder/src/adder.rs b/contracts/examples/adder/src/adder.rs
index 59ba95ba20..88de4bb099 100644
--- a/contracts/examples/adder/src/adder.rs
+++ b/contracts/examples/adder/src/adder.rs
@@ -1,6 +1,9 @@
 #![no_std]
 
 multiversx_sc::imports!();
+
+pub mod temp_proxy;
+
 /// One of the simplest smart contracts possible,
 /// it holds a single variable in storage, which anyone can increment.
 #[multiversx_sc::contract]
@@ -25,161 +28,3 @@ pub trait Adder {
         self.sum().update(|sum| *sum += value);
     }
 }
-
-pub struct TxProxy;
-
-impl<Env> TxProxyTrait<Env> for TxProxy
-where
-    Env: TxEnv,
-{
-    type TxProxyMethods = TxProxyMethods<Env>;
-
-    fn env(self, env: Env) -> Self::TxProxyMethods {
-        TxProxyMethods { env }
-    }
-}
-
-pub trait TxProxyMethodsTrait<Env: TxEnv + multiversx_sc::api::CallTypeApi> {
-    fn add<Arg0, OriginalResult>(
-        self,
-        value: Arg0,
-    ) -> multiversx_sc::types::Tx<
-        Env,
-        (),
-        (),
-        (),
-        (),
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<OriginalResult>,
-    >
-    where
-        Arg0: multiversx_sc::codec::CodecInto<BigUint<Env>>;
-
-    fn upgrade<Arg0, OriginalResult>(
-        self,
-        initial_value: Arg0,
-    ) -> multiversx_sc::types::Tx<
-        Env,
-        (),
-        (),
-        (),
-        (),
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<OriginalResult>,
-    >
-    where
-        Arg0: multiversx_sc::codec::CodecInto<BigUint<Env>>;
-
-    fn sum<OriginalResult>(
-        self,
-    ) -> multiversx_sc::types::Tx<
-        Env,
-        (),
-        (),
-        (),
-        (),
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<OriginalResult>,
-    >;
-
-    #[allow(clippy::type_complexity)]
-    fn init<Arg0, OriginalResult>(
-        self,
-        initial_value: Arg0,
-    ) -> multiversx_sc::types::Tx<
-        Env,
-        (),
-        (),
-        (),
-        (),
-        DeployCall<Env::Api, ()>,
-        OriginalResultMarker<OriginalResult>,
-    >
-    where
-        Arg0: multiversx_sc::codec::CodecInto<BigUint<Env>>,
-        DeployCall<<Env as TxEnv>::Api, ()>: TxData<Env>,
-        <Env as TxEnv>::Api: TxEnv;
-}
-
-impl<Env: TxEnv<Api = Env> + multiversx_sc::api::CallTypeApi> TxProxyMethodsTrait<Env>
-    for TxProxyMethods<Env>
-{
-    fn sum<OriginalResult>(
-        self,
-    ) -> multiversx_sc::types::Tx<
-        Env,
-        (),
-        (),
-        (),
-        (),
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<OriginalResult>,
-    > {
-        Tx::new_with_env(self.env)
-            .raw_call()
-            .function_name("getSum")
-            .original_result()
-    }
-
-    fn upgrade<Arg0: multiversx_sc::codec::CodecInto<BigUint<Env>>, OriginalResult>(
-        self,
-        initial_value: Arg0,
-    ) -> multiversx_sc::types::Tx<
-        Env,
-        (),
-        (),
-        (),
-        (),
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<OriginalResult>,
-    > {
-        Tx::new_with_env(self.env)
-            .raw_call()
-            .function_name("upgrade")
-            .argument(&initial_value)
-            .original_result()
-    }
-
-    //Add desired amount to the storage variable.
-    fn add<Arg0: multiversx_sc::codec::CodecInto<BigUint<Env>>, OriginalResult>(
-        self,
-        value: Arg0,
-    ) -> multiversx_sc::types::Tx<
-        Env,
-        (),
-        (),
-        (),
-        (),
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<OriginalResult>,
-    > {
-        Tx::new_with_env(self.env)
-            .raw_call()
-            .function_name("add")
-            .argument(&value)
-            .original_result()
-    }
-
-    fn init<Arg0, OriginalResult>(
-        self,
-        initial_value: Arg0,
-    ) -> multiversx_sc::types::Tx<
-        Env,
-        (),
-        (),
-        (),
-        (),
-        DeployCall<<Env as TxEnv>::Api, ()>,
-        OriginalResultMarker<OriginalResult>,
-    >
-    where
-        Arg0: multiversx_sc::codec::CodecInto<BigUint<Env>>,
-        DeployCall<<Env as TxEnv>::Api, ()>: TxData<Env>,
-        <Env as TxEnv>::Api: TxEnv,
-    {
-        Tx::new_with_env(self.env)
-            .raw_deploy()
-            .argument(&initial_value)
-            .original_result()
-    }
-}
diff --git a/contracts/examples/adder/src/temp_proxy.rs b/contracts/examples/adder/src/temp_proxy.rs
new file mode 100644
index 0000000000..a703317132
--- /dev/null
+++ b/contracts/examples/adder/src/temp_proxy.rs
@@ -0,0 +1,82 @@
+use multiversx_sc::api::VMApi;
+
+multiversx_sc::imports!();
+
+pub struct TxProxy;
+
+impl<Env> TxProxyTrait<Env> for TxProxy
+where
+    Env: TxEnv,
+{
+    type TxProxyMethods = TxProxyMethods<Env>;
+
+    fn env(self, env: Env) -> Self::TxProxyMethods {
+        TxProxyMethods { env }
+    }
+}
+
+pub struct TxProxyMethods<Env: TxEnv> {
+    pub env: Env,
+}
+
+impl<Env> TxProxyMethods<Env>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+{
+    pub fn init<Arg0: multiversx_sc::codec::CodecInto<BigUint<Env::Api>>>(
+        self,
+        initial_value: Arg0,
+    ) -> multiversx_sc::types::Tx<
+        Env,
+        (),
+        (),
+        (),
+        (),
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<()>,
+    > {
+        Tx::new_with_env(self.env)
+            .raw_call()
+            .function_name("init")
+            .argument(&initial_value)
+            .original_result()
+    }
+
+    pub fn sum(
+        self,
+    ) -> multiversx_sc::types::Tx<
+        Env,
+        (),
+        (),
+        (),
+        (),
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<SingleValueMapper<Env::Api, multiversx_sc::types::BigUint<Env::Api>>>,
+    > {
+        Tx::new_with_env(self.env)
+            .raw_call()
+            .function_name("getSum")
+            .original_result()
+    }
+
+    //Add desired amount to the storage variable.
+    pub fn add<Arg0: multiversx_sc::codec::CodecInto<BigUint<Env::Api>>>(
+        self,
+        value: Arg0,
+    ) -> multiversx_sc::types::Tx<
+        Env,
+        (),
+        (),
+        (),
+        (),
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<()>,
+    > {
+        Tx::new_with_env(self.env)
+            .raw_call()
+            .function_name("add")
+            .argument(&value)
+            .original_result()
+    }
+}
diff --git a/framework/base/src/types/interaction/tx_proxy.rs b/framework/base/src/types/interaction/tx_proxy.rs
index dbbaadf77e..25063ecea5 100644
--- a/framework/base/src/types/interaction/tx_proxy.rs
+++ b/framework/base/src/types/interaction/tx_proxy.rs
@@ -5,7 +5,3 @@ pub trait TxProxyTrait<Env> {
 
     fn env(self, env: Env) -> Self::TxProxyMethods;
 }
-
-pub struct TxProxyMethods<Env: TxEnv> {
-    pub env: Env,
-}

From 84c5e5d0769adf2c0781ad4154d64fcb51f4472c Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Fri, 1 Mar 2024 16:06:14 +0100
Subject: [PATCH 0378/1254] fix after review

---
 .../abi_tester_expected_main.abi.json         | 16 ++++++++++
 .../abi-tester/src/abi_tester.rs              |  6 ++++
 .../feature-tests/abi-tester/wasm/src/lib.rs  |  2 ++
 .../sc_config/contract_variant_validate.rs    | 29 +++++--------------
 4 files changed, 31 insertions(+), 22 deletions(-)

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 430deb54a5..3cf574ed35 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
@@ -44,6 +44,22 @@
         ],
         "outputs": []
     },
+    "upgradeConstructor": {
+        "docs": [
+            "Upgrade constructor."
+        ],
+        "inputs": [
+            {
+                "name": "_constructor_arg_1",
+                "type": "i32"
+            },
+            {
+                "name": "_constructor_arg_2",
+                "type": "OnlyShowsUpInConstructor"
+            }
+        ],
+        "outputs": []
+    },
     "endpoints": [
         {
             "docs": [
diff --git a/contracts/feature-tests/abi-tester/src/abi_tester.rs b/contracts/feature-tests/abi-tester/src/abi_tester.rs
index a68ea341a3..15fe5f3c4a 100644
--- a/contracts/feature-tests/abi-tester/src/abi_tester.rs
+++ b/contracts/feature-tests/abi-tester/src/abi_tester.rs
@@ -30,6 +30,12 @@ pub trait AbiTester {
     #[payable("EGLD")]
     fn init(&self, _constructor_arg_1: i32, _constructor_arg_2: OnlyShowsUpInConstructor) {}
 
+    /// Upgrade constructor.
+    #[upgrade]
+    fn upgrade(&self, _constructor_arg_1: i32, _constructor_arg_2: OnlyShowsUpInConstructor) {
+        self.init(_constructor_arg_1, _constructor_arg_2)
+    }
+
     /// Example endpoint docs.
     #[endpoint]
     #[output_name("single output")]
diff --git a/contracts/feature-tests/abi-tester/wasm/src/lib.rs b/contracts/feature-tests/abi-tester/wasm/src/lib.rs
index 6a15c9899b..e38197e707 100644
--- a/contracts/feature-tests/abi-tester/wasm/src/lib.rs
+++ b/contracts/feature-tests/abi-tester/wasm/src/lib.rs
@@ -5,6 +5,7 @@
 ////////////////////////////////////////////////////
 
 // Init:                                 1
+// Upgrade:                              1
 // Endpoints:                           27
 // Async Callback (empty):               1
 // Total number of exported functions:  29
@@ -20,6 +21,7 @@ multiversx_sc_wasm_adapter::endpoints! {
     abi_tester
     (
         init => init
+        upgrade => upgrade
         echo_abi_test_type => echo_abi_test_type
         echo_enum => echo_enum
         take_managed_type => take_managed_type
diff --git a/framework/meta/src/cmd/contract/sc_config/contract_variant_validate.rs b/framework/meta/src/cmd/contract/sc_config/contract_variant_validate.rs
index 093650ebd2..eb64d00e48 100644
--- a/framework/meta/src/cmd/contract/sc_config/contract_variant_validate.rs
+++ b/framework/meta/src/cmd/contract/sc_config/contract_variant_validate.rs
@@ -9,31 +9,16 @@ pub fn validate_contract_variant(contract_variant: &ContractVariant) -> Result<(
 }
 
 fn check_single_constructor(contract_variant: &ContractVariant) -> Result<(), String> {
-    match contract_variant.abi.constructors.len() {
-        0 => if has_upgrade(contract_variant) {
-            Ok(())
-        } else {
-            Err("Missing constructor. Add a method annotated with `#[init]`.".to_string())
-        },
-        1 => Ok(()),
-        2 => if has_init(contract_variant) && has_upgrade(contract_variant) {
-            Ok(())
-        }
-        else {
-            Err("You can only have two constructors and only one of each: `#[init]` and `#[upgrade]`".to_string())
-        }
-        _ => Err("More than two constructors present. Exactly one method annotated with `#[init]` and another optional `#[upgrade]` is required.".to_string()),
+    match (
+        contract_variant.abi.constructors.len(),
+        contract_variant.abi.upgrade_constructors.len(),
+    ) {
+        (0, 0) => Err("Missing constructor. Add a method annotated with `#[init]`.".to_string()),
+        (1, 0) | (0, 1) | (1, 1) => Ok(()),
+        (_, _) => Err("More than two constructors present. Exactly one method annotated with `#[init]` and/or another optional `#[upgrade]` is required. ".to_string()),
     }
 }
 
-fn has_upgrade(contract_variant: &ContractVariant) -> bool {
-    !contract_variant.abi.upgrade_constructors.is_empty()
-}
-
-fn has_init(contract_variant: &ContractVariant) -> bool {
-    !contract_variant.abi.constructors.is_empty()
-}
-
 /// Note: promise callbacks not included, since they have `#[call_value]` arguments, that are currently not modelled.
 fn validate_contract_var_args(abi: &ContractAbi) -> Result<(), String> {
     for endpoint_abi in abi

From 54e80ded2af605102263a7d5328d0340ef87ccb0 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 1 Mar 2024 20:52:07 -0700
Subject: [PATCH 0379/1254] unified syntax - tx proxy tx lambda method

---
 .../tests/adder_blackbox_with_values_test.rs  |  5 ++-
 framework/base/src/types/interaction/tx.rs    | 37 ++++++++++++++++++-
 2 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/contracts/examples/adder/tests/adder_blackbox_with_values_test.rs b/contracts/examples/adder/tests/adder_blackbox_with_values_test.rs
index 17b07e44b8..a53d7f3a5c 100644
--- a/contracts/examples/adder/tests/adder_blackbox_with_values_test.rs
+++ b/contracts/examples/adder/tests/adder_blackbox_with_values_test.rs
@@ -1,5 +1,5 @@
 use adder::*;
-use multiversx_sc::{storage::mappers::SingleValue, types::AddressExpr};
+use multiversx_sc::{storage::mappers::SingleValue, types::{AddressExpr, ScExpr}};
 use multiversx_sc_scenario::{api::StaticApi, num_bigint::BigUint, scenario_model::*, *};
 
 const ADDER_PATH_EXPR: &str = "mxsc:output/adder.mxsc.json";
@@ -43,7 +43,8 @@ fn adder_blackbox_with_values() {
         )
         .tx(|tx| {
             tx.from(AddressExpr("owner"))
-                .call(adder_contract.add(3u32))
+                .to(ScExpr("adder"))
+                .typed(temp_proxy::TxProxy, |p| p.add(3u32))
                 .with_result(WithRawTxResponse(|response| {
                     assert!(response.tx_error.is_success());
                 }))
diff --git a/framework/base/src/types/interaction/tx.rs b/framework/base/src/types/interaction/tx.rs
index 2aaa4f373a..58f1f896a0 100644
--- a/framework/base/src/types/interaction/tx.rs
+++ b/framework/base/src/types/interaction/tx.rs
@@ -14,8 +14,8 @@ use super::{
     Code, ContractCallNoPayment, ContractCallWithEgld, ContractDeploy, DeployCall, ExplicitGas,
     FromSource, FunctionCall, ManagedArgBuffer, OriginalResultMarker, RHList, RHListAppendNoRet,
     RHListAppendRet, RHListItem, TxCodeSource, TxData, TxDataFunctionCall, TxEnv, TxFrom,
-    TxFromSpecified, TxGas, TxPayment, TxPaymentEgldOnly, TxResultHandler, TxScEnv, TxTo,
-    TxToSpecified,
+    TxFromSpecified, TxGas, TxPayment, TxPaymentEgldOnly, TxProxyTrait, TxResultHandler, TxScEnv,
+    TxTo, TxToSpecified,
 };
 
 #[must_use]
@@ -466,6 +466,39 @@ where
     }
 }
 
+impl<Env, From, To, Gas> Tx<Env, From, To, (), Gas, (), ()>
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn typed<Proxy, Payment, Data, RH, F>(
+        self,
+        proxy: Proxy,
+        f: F,
+    ) -> Tx<Env, From, To, Payment, Gas, Data, RH>
+    where
+        Proxy: TxProxyTrait<Env>,
+        Payment: TxPayment<Env>,
+        Data: TxData<Env>,
+        RH: TxResultHandler<Env>,
+        F: FnOnce(Proxy::TxProxyMethods) -> Tx<Env, (), (), Payment, (), Data, RH>,
+    {
+        let proxy_methods = proxy.env(self.env);
+        let proxy_tx = f(proxy_methods);
+        Tx {
+            env: proxy_tx.env,
+            from: self.from,
+            to: self.to,
+            payment: proxy_tx.payment,
+            gas: self.gas,
+            data: proxy_tx.data,
+            result_handler: proxy_tx.result_handler,
+        }
+    }
+}
+
 impl<Env, From, To, Payment, Gas, Data, ResultList>
     Tx<Env, From, To, Payment, Gas, Data, ResultList>
 where

From 0d0412601683092a9666f544fa1d7a8a8915a210 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 1 Mar 2024 21:24:14 -0700
Subject: [PATCH 0380/1254] unified syntax - tx proxy v2

---
 contracts/examples/adder/src/adder.rs         |  1 +
 contracts/examples/adder/src/temp_proxy_v2.rs | 94 +++++++++++++++++++
 .../tests/adder_blackbox_with_values_test.rs  | 16 +++-
 framework/base/src/types/interaction/tx.rs    | 13 ++-
 .../base/src/types/interaction/tx_proxy.rs    | 14 ++-
 5 files changed, 132 insertions(+), 6 deletions(-)
 create mode 100644 contracts/examples/adder/src/temp_proxy_v2.rs

diff --git a/contracts/examples/adder/src/adder.rs b/contracts/examples/adder/src/adder.rs
index 88de4bb099..541c37d5df 100644
--- a/contracts/examples/adder/src/adder.rs
+++ b/contracts/examples/adder/src/adder.rs
@@ -3,6 +3,7 @@
 multiversx_sc::imports!();
 
 pub mod temp_proxy;
+pub mod temp_proxy_v2;
 
 /// One of the simplest smart contracts possible,
 /// it holds a single variable in storage, which anyone can increment.
diff --git a/contracts/examples/adder/src/temp_proxy_v2.rs b/contracts/examples/adder/src/temp_proxy_v2.rs
new file mode 100644
index 0000000000..3206e45fac
--- /dev/null
+++ b/contracts/examples/adder/src/temp_proxy_v2.rs
@@ -0,0 +1,94 @@
+use multiversx_sc::api::VMApi;
+
+multiversx_sc::imports!();
+
+pub struct TxProxy;
+
+impl<Env, From, To, Gas> TxProxyTraitV2<Env, From, To, Gas> for TxProxy
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    type TxProxyMethods = TxProxyMethods<Env, From, To, Gas>;
+
+    fn prepare_methods(self, tx: Tx<Env, From, To, (), Gas, (), ()>) -> Self::TxProxyMethods {
+        TxProxyMethods { wrapped_tx: tx }
+    }
+}
+
+pub struct TxProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    wrapped_tx: Tx<Env, From, To, (), Gas, (), ()>,
+}
+
+impl<Env, From, To, Gas> TxProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn init<Arg0: multiversx_sc::codec::CodecInto<BigUint<Env::Api>>>(
+        self,
+        initial_value: Arg0,
+    ) -> multiversx_sc::types::Tx<
+        Env,
+        From,
+        To,
+        (),
+        Gas,
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<()>,
+    > {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("init")
+            .argument(&initial_value)
+            .original_result()
+    }
+
+    pub fn sum(
+        self,
+    ) -> multiversx_sc::types::Tx<
+        Env,
+        From,
+        To,
+        (),
+        Gas,
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<SingleValueMapper<Env::Api, multiversx_sc::types::BigUint<Env::Api>>>,
+    > {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("getSum")
+            .original_result()
+    }
+
+    //Add desired amount to the storage variable.
+    pub fn add<Arg0: multiversx_sc::codec::CodecInto<BigUint<Env::Api>>>(
+        self,
+        value: Arg0,
+    ) -> multiversx_sc::types::Tx<
+        Env,
+        From,
+        To,
+        (),
+        Gas,
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<()>,
+    > {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("add")
+            .argument(&value)
+            .original_result()
+    }
+}
diff --git a/contracts/examples/adder/tests/adder_blackbox_with_values_test.rs b/contracts/examples/adder/tests/adder_blackbox_with_values_test.rs
index a53d7f3a5c..c097f1fcd6 100644
--- a/contracts/examples/adder/tests/adder_blackbox_with_values_test.rs
+++ b/contracts/examples/adder/tests/adder_blackbox_with_values_test.rs
@@ -1,5 +1,8 @@
 use adder::*;
-use multiversx_sc::{storage::mappers::SingleValue, types::{AddressExpr, ScExpr}};
+use multiversx_sc::{
+    storage::mappers::SingleValue,
+    types::{AddressExpr, ScExpr},
+};
 use multiversx_sc_scenario::{api::StaticApi, num_bigint::BigUint, scenario_model::*, *};
 
 const ADDER_PATH_EXPR: &str = "mxsc:output/adder.mxsc.json";
@@ -44,7 +47,16 @@ fn adder_blackbox_with_values() {
         .tx(|tx| {
             tx.from(AddressExpr("owner"))
                 .to(ScExpr("adder"))
-                .typed(temp_proxy::TxProxy, |p| p.add(3u32))
+                .typed_v1(temp_proxy::TxProxy, |p| p.add(2u32))
+                .with_result(WithRawTxResponse(|response| {
+                    assert!(response.tx_error.is_success());
+                }))
+        })
+        .tx(|tx| {
+            tx.from(AddressExpr("owner"))
+                .to(ScExpr("adder"))
+                .typed_v2(temp_proxy_v2::TxProxy)
+                .add(1u32)
                 .with_result(WithRawTxResponse(|response| {
                     assert!(response.tx_error.is_success());
                 }))
diff --git a/framework/base/src/types/interaction/tx.rs b/framework/base/src/types/interaction/tx.rs
index 58f1f896a0..5ccdb483c5 100644
--- a/framework/base/src/types/interaction/tx.rs
+++ b/framework/base/src/types/interaction/tx.rs
@@ -14,8 +14,8 @@ use super::{
     Code, ContractCallNoPayment, ContractCallWithEgld, ContractDeploy, DeployCall, ExplicitGas,
     FromSource, FunctionCall, ManagedArgBuffer, OriginalResultMarker, RHList, RHListAppendNoRet,
     RHListAppendRet, RHListItem, TxCodeSource, TxData, TxDataFunctionCall, TxEnv, TxFrom,
-    TxFromSpecified, TxGas, TxPayment, TxPaymentEgldOnly, TxProxyTrait, TxResultHandler, TxScEnv,
-    TxTo, TxToSpecified,
+    TxFromSpecified, TxGas, TxPayment, TxPaymentEgldOnly, TxProxyTrait, TxProxyTraitV2,
+    TxResultHandler, TxScEnv, TxTo, TxToSpecified,
 };
 
 #[must_use]
@@ -473,7 +473,7 @@ where
     To: TxTo<Env>,
     Gas: TxGas<Env>,
 {
-    pub fn typed<Proxy, Payment, Data, RH, F>(
+    pub fn typed_v1<Proxy, Payment, Data, RH, F>(
         self,
         proxy: Proxy,
         f: F,
@@ -497,6 +497,13 @@ where
             result_handler: proxy_tx.result_handler,
         }
     }
+
+    pub fn typed_v2<Proxy>(self, proxy: Proxy) -> Proxy::TxProxyMethods
+    where
+        Proxy: TxProxyTraitV2<Env, From, To, Gas>,
+    {
+        proxy.prepare_methods(self)
+    }
 }
 
 impl<Env, From, To, Payment, Gas, Data, ResultList>
diff --git a/framework/base/src/types/interaction/tx_proxy.rs b/framework/base/src/types/interaction/tx_proxy.rs
index 25063ecea5..90ac72d76b 100644
--- a/framework/base/src/types/interaction/tx_proxy.rs
+++ b/framework/base/src/types/interaction/tx_proxy.rs
@@ -1,7 +1,19 @@
-use super::TxEnv;
+use super::{Tx, TxEnv, TxFrom, TxGas, TxTo};
 
 pub trait TxProxyTrait<Env> {
     type TxProxyMethods;
 
     fn env(self, env: Env) -> Self::TxProxyMethods;
 }
+
+pub trait TxProxyTraitV2<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    type TxProxyMethods;
+
+    fn prepare_methods(self, tx: Tx<Env, From, To, (), Gas, (), ()>) -> Self::TxProxyMethods;
+}

From 7d43d9240853b52ba77c333e7c1e6e87702dbc85 Mon Sep 17 00:00:00 2001
From: Alin Cruceat <alyn_509@yahoo.com>
Date: Mon, 4 Mar 2024 09:12:53 +0200
Subject: [PATCH 0381/1254] enforce arg kebab case & test

---
 .../meta/src/cli_args/cli_args_standalone.rs  |  4 ++
 .../standalone/template/contract_creator.rs   |  9 +++-
 .../template/contract_creator_target.rs       |  7 ++-
 framework/meta/tests/template_test.rs         | 46 ++++++++++++++++++-
 4 files changed, 63 insertions(+), 3 deletions(-)

diff --git a/framework/meta/src/cli_args/cli_args_standalone.rs b/framework/meta/src/cli_args/cli_args_standalone.rs
index a81d145dab..a92e94310b 100644
--- a/framework/meta/src/cli_args/cli_args_standalone.rs
+++ b/framework/meta/src/cli_args/cli_args_standalone.rs
@@ -225,6 +225,10 @@ pub struct TemplateArgs {
     #[arg(long, verbatim_doc_comment)]
     pub template: String,
 
+    /// Skips creating a new dir for the contract
+    #[arg(short, long, default_value = "false", verbatim_doc_comment)]
+    pub no_new_dir: bool,
+
     /// The framework version on which the contracts should be created.
     #[arg(long, verbatim_doc_comment)]
     pub tag: Option<String>,
diff --git a/framework/meta/src/cmd/standalone/template/contract_creator.rs b/framework/meta/src/cmd/standalone/template/contract_creator.rs
index d78e0d9e61..4f50da5c21 100644
--- a/framework/meta/src/cmd/standalone/template/contract_creator.rs
+++ b/framework/meta/src/cmd/standalone/template/contract_creator.rs
@@ -1,3 +1,5 @@
+use convert_case::{Case, Casing};
+
 use crate::{
     cli_args::TemplateArgs,
     version::FrameworkVersion,
@@ -22,11 +24,16 @@ pub fn create_contract(args: &TemplateArgs) {
 }
 
 fn target_from_args(args: &TemplateArgs) -> ContractCreatorTarget {
-    let new_name = args.name.clone().unwrap_or_else(|| args.template.clone());
+    let new_name = args
+        .name
+        .clone()
+        .unwrap_or_else(|| args.template.clone())
+        .to_case(Case::Kebab);
     let target_path = args.path.clone().unwrap_or_default();
     ContractCreatorTarget {
         target_path,
         new_name,
+        no_new_dir: args.no_new_dir,
     }
 }
 
diff --git a/framework/meta/src/cmd/standalone/template/contract_creator_target.rs b/framework/meta/src/cmd/standalone/template/contract_creator_target.rs
index 4904b48d05..61bb4672f0 100644
--- a/framework/meta/src/cmd/standalone/template/contract_creator_target.rs
+++ b/framework/meta/src/cmd/standalone/template/contract_creator_target.rs
@@ -4,10 +4,15 @@ use std::path::PathBuf;
 pub struct ContractCreatorTarget {
     pub target_path: PathBuf,
     pub new_name: String,
+    pub no_new_dir: bool,
 }
 
 impl ContractCreatorTarget {
     pub fn contract_dir(&self) -> PathBuf {
-        self.target_path.join(&self.new_name)
+        if self.no_new_dir {
+            self.target_path.clone()
+        } else {
+            self.target_path.join(&self.new_name)
+        }
     }
 }
diff --git a/framework/meta/tests/template_test.rs b/framework/meta/tests/template_test.rs
index f76db34407..1ca2b7ed07 100644
--- a/framework/meta/tests/template_test.rs
+++ b/framework/meta/tests/template_test.rs
@@ -1,5 +1,6 @@
 use std::{fs, process::Command};
 
+use convert_case::{Case, Casing};
 use multiversx_sc_meta::{
     cmd::standalone::template::{
         template_names_from_repo, ContractCreator, ContractCreatorTarget, RepoSource, RepoVersion,
@@ -52,6 +53,12 @@ fn template_current_ping_pong_egld() {
     template_test_current("ping-pong-egld", "examples", "new-ping-pong-egld");
 }
 
+#[test]
+#[cfg_attr(not(feature = "template-test-current"), ignore)]
+fn test_correct_naming() {
+    template_test_current("empty", "examples", "myNew-correct_Empty");
+}
+
 /// Recreates the folder structure in `contracts`, on the same level.
 /// This way, the relative paths are still valid in this case,
 /// and we can test the templates with the framework version of the current branch.
@@ -59,7 +66,43 @@ fn template_test_current(template_name: &str, sub_path: &str, new_name: &str) {
     let workspace_path = find_current_workspace().unwrap();
     let target = ContractCreatorTarget {
         target_path: workspace_path.join(TEMPLATE_TEMP_DIR_NAME).join(sub_path),
-        new_name: new_name.to_string(),
+        new_name: new_name.to_string().to_case(Case::Kebab),
+        no_new_dir: false,
+    };
+
+    let repo_source = RepoSource::from_local_path(workspace_path);
+
+    prepare_target_dir(&target);
+
+    ContractCreator::new(
+        &repo_source,
+        template_name.to_string(),
+        target.clone(),
+        true,
+    )
+    .create_contract(LAST_TEMPLATE_VERSION);
+
+    if BUILD_CONTRACTS {
+        build_contract(&target);
+    }
+    cargo_test(&target);
+}
+
+/// Recreates the folder structure in `contracts`, on the same level.
+/// This way, the relative paths are still valid in this case,
+/// and we can test the templates with the framework version of the current branch.
+#[test]
+#[cfg_attr(not(feature = "template-test-current"), ignore)]
+fn template_test_no_new_dir() {
+    let template_name = "empty";
+    let sub_path = "examples";
+    let new_name = "new-empty";
+
+    let workspace_path = find_current_workspace().unwrap();
+    let target = ContractCreatorTarget {
+        target_path: workspace_path.join(TEMPLATE_TEMP_DIR_NAME).join(sub_path),
+        new_name: new_name.to_string().to_case(Case::Kebab),
+        no_new_dir: true,
     };
 
     let repo_source = RepoSource::from_local_path(workspace_path);
@@ -108,6 +151,7 @@ fn template_test_released(template_name: &str, new_name: &str) {
     let target = ContractCreatorTarget {
         target_path: workspace_path.join(TEMPLATE_TEMP_DIR_NAME),
         new_name: new_name.to_string(),
+        no_new_dir: false,
     };
 
     let temp_dir_path = workspace_path

From 4ce0bffd4e8da4b813d2aa695a915b42bc7637ca Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Mon, 4 Mar 2024 11:41:07 +0100
Subject: [PATCH 0382/1254] recommit

---
 .../abi_tester_expected_main.abi.json         |  17 +
 .../abi_tester_expected_view.abi.json         |  17 +
 .../abi-tester/src/abi_test_type.rs           |   7 +-
 .../abi-tester/src/abi_tester.rs              |   6 +-
 .../scenarios/managed_decimal.scen.json       | 146 +++++++
 .../basic-features/src/basic_features_main.rs |   4 +
 .../basic-features/src/egld_decimal.rs        |  11 +
 .../src/managed_decimal_features.rs           |  43 ++
 .../tests/basic_features_egld_decimal_test.rs |  71 ++++
 .../basic_features_managed_decimal_test.rs    |  18 +
 .../basic-features/wasm/src/lib.rs            |  10 +-
 .../tests/big_float_scenario_rs_test.rs       |  47 ++-
 .../src/api/managed_types/const_handles.rs    |  14 +-
 .../src/api/managed_types/static_var_api.rs   |   4 +
 .../uncallable/static_var_api_uncallable.rs   |   8 +
 .../wrappers/call_value_wrapper.rs            |  12 +-
 .../base/src/types/managed/basic/big_float.rs |   6 +-
 .../wrapped/egld_or_esdt_token_identifier.rs  |   3 +-
 .../types/managed/wrapped/managed_decimal.rs  | 382 ++++++++++++++++++
 .../base/src/types/managed/wrapped/mod.rs     |   2 +
 .../types/managed/wrapped/token_identifier.rs |   3 +-
 .../src/api/local_api_vh/static_var_api_vh.rs |  10 +
 .../src/debug_executor/tx_static_vars.rs      |   3 +
 .../scenario/tests/managed_decimal_test.rs    | 129 ++++++
 .../scenario/tests/managed_type_debug_test.rs |  16 +-
 framework/scenario/tests/test_print_api.rs    |   6 +-
 framework/snippets/src/interactor_vm_query.rs |   1 +
 .../api/managed_types/static_var_api_node.rs  |  12 +
 28 files changed, 985 insertions(+), 23 deletions(-)
 create mode 100644 contracts/feature-tests/basic-features/scenarios/managed_decimal.scen.json
 create mode 100644 contracts/feature-tests/basic-features/src/egld_decimal.rs
 create mode 100644 contracts/feature-tests/basic-features/src/managed_decimal_features.rs
 create mode 100644 contracts/feature-tests/basic-features/tests/basic_features_egld_decimal_test.rs
 create mode 100644 contracts/feature-tests/basic-features/tests/basic_features_managed_decimal_test.rs
 create mode 100644 framework/base/src/types/managed/wrapped/managed_decimal.rs
 create mode 100644 framework/scenario/tests/managed_decimal_test.rs

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 430deb54a5..69829a2e6a 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
@@ -454,6 +454,14 @@
         {
             "ticker": "ExplicitDiscriminantMixed",
             "type": "ExplicitDiscriminantMixed"
+        },
+        {
+            "ticker": "ManagedDecimalVar",
+            "type": "ManagedDecimal<usize>"
+        },
+        {
+            "ticker": "ManagedDecimalConst",
+            "type": "ManagedDecimalWrapper"
         }
     ],
     "hasCallback": false,
@@ -770,6 +778,15 @@
                 }
             ]
         },
+        "ManagedDecimalWrapper": {
+            "type": "struct",
+            "fields": [
+                {
+                    "name": "field",
+                    "type": "ManagedDecimal<2>"
+                }
+            ]
+        },
         "OnlyShowsUpAsNested01": {
             "type": "struct",
             "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 fed675f693..7e9bcc8037 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
@@ -131,6 +131,14 @@
         {
             "ticker": "ExplicitDiscriminantMixed",
             "type": "ExplicitDiscriminantMixed"
+        },
+        {
+            "ticker": "ManagedDecimalVar",
+            "type": "ManagedDecimal<usize>"
+        },
+        {
+            "ticker": "ManagedDecimalConst",
+            "type": "ManagedDecimalWrapper"
         }
     ],
     "hasCallback": false,
@@ -447,6 +455,15 @@
                 }
             ]
         },
+        "ManagedDecimalWrapper": {
+            "type": "struct",
+            "fields": [
+                {
+                    "name": "field",
+                    "type": "ManagedDecimal<2>"
+                }
+            ]
+        },
         "OnlyShowsUpAsNested01": {
             "type": "struct",
             "docs": [
diff --git a/contracts/feature-tests/abi-tester/src/abi_test_type.rs b/contracts/feature-tests/abi-tester/src/abi_test_type.rs
index 2cc1fc4db4..6ff0fc3de9 100644
--- a/contracts/feature-tests/abi-tester/src/abi_test_type.rs
+++ b/contracts/feature-tests/abi-tester/src/abi_test_type.rs
@@ -1,7 +1,7 @@
 use crate::only_nested::*;
 use multiversx_sc::{
     api::ManagedTypeApi,
-    types::{BigUint, Box, ManagedBuffer},
+    types::{BigUint, Box, ConstDecimals, ManagedBuffer, ManagedDecimal},
 };
 multiversx_sc::derive_imports!();
 
@@ -38,3 +38,8 @@ pub struct AbiManagedVecItem {
 pub struct OnlyShowsUpInEsdtAttr {
     pub field: OnlyShowsUpAsNested10,
 }
+
+#[derive(TypeAbi)]
+pub struct ManagedDecimalWrapper<M: ManagedTypeApi> {
+    pub field: ManagedDecimal<M, ConstDecimals<2>>,
+}
diff --git a/contracts/feature-tests/abi-tester/src/abi_tester.rs b/contracts/feature-tests/abi-tester/src/abi_tester.rs
index a68ea341a3..ce0b6f82b7 100644
--- a/contracts/feature-tests/abi-tester/src/abi_tester.rs
+++ b/contracts/feature-tests/abi-tester/src/abi_tester.rs
@@ -22,8 +22,10 @@ use only_nested::*;
 #[esdt_attribute("STRUCT1", AbiEnum)]
 #[esdt_attribute("STRUCT2", AbiManagedType<Self::Api>)]
 #[esdt_attribute("OnlyInEsdt", OnlyShowsUpInEsdtAttr)]
-#[esdt_attribute["ExplicitDiscriminant", ExplicitDiscriminant]]
-#[esdt_attribute["ExplicitDiscriminantMixed", ExplicitDiscriminantMixed]]
+#[esdt_attribute("ExplicitDiscriminant", ExplicitDiscriminant)]
+#[esdt_attribute("ExplicitDiscriminantMixed", ExplicitDiscriminantMixed)]
+#[esdt_attribute("ManagedDecimalVar", ManagedDecimal<Self::Api, NumDecimals>)]
+#[esdt_attribute("ManagedDecimalConst", ManagedDecimalWrapper<Self::Api>)]
 pub trait AbiTester {
     /// Contract constructor.
     #[init]
diff --git a/contracts/feature-tests/basic-features/scenarios/managed_decimal.scen.json b/contracts/feature-tests/basic-features/scenarios/managed_decimal.scen.json
new file mode 100644
index 0000000000..e19612ae29
--- /dev/null
+++ b/contracts/feature-tests/basic-features/scenarios/managed_decimal.scen.json
@@ -0,0 +1,146 @@
+{
+    "steps": [
+        {
+            "step": "setState",
+            "accounts": {
+                "sc:basic-features": {
+                    "nonce": "0",
+                    "balance": "0",
+                    "code": "mxsc:../output/basic-features.mxsc.json"
+                },
+                "address:an_account": {
+                    "nonce": "0",
+                    "balance": "0"
+                }
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "1",
+            "tx": {
+                "from": "address:an_account",
+                "to": "sc:basic-features",
+                "function": "managed_decimal_addition",
+                "arguments": [
+                    "4",
+                    "5"
+                ],
+                "gasLimit": "1,000,000,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": [
+                    "9"
+                ]
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "1",
+            "tx": {
+                "from": "address:an_account",
+                "to": "sc:basic-features",
+                "function": "managed_decimal_subtraction",
+                "arguments": [
+                    "9",
+                    "4"
+                ],
+                "gasLimit": "1,000,000,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": [
+                    "5"
+                ]
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "2",
+            "tx": {
+                "from": "address:an_account",
+                "to": "sc:basic-features",
+                "function": "managed_decimal_subtraction",
+                "arguments": [
+                    "2",
+                    "8"
+                ],
+                "gasLimit": "1,000,000,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": [],
+                "status": "4",
+                "message": "str:cannot subtract because result would be negative",
+                "gas": "*",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "3",
+            "tx": {
+                "from": "address:an_account",
+                "to": "sc:basic-features",
+                "function": "managed_decimal_eq",
+                "arguments": [
+                    "13",
+                    "13"
+                ],
+                "gasLimit": "1,000,000,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": [
+                    "0x01"
+                ],
+                "status": "",
+                "message": "*",
+                "gas": "*",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "4",
+            "tx": {
+                "from": "address:an_account",
+                "to": "sc:basic-features",
+                "function": "managed_decimal_trunc",
+                "arguments": [],
+                "gasLimit": "1,000,000,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": [
+                    "313"
+                ],
+                "status": "",
+                "message": "*",
+                "gas": "*",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "5",
+            "tx": {
+                "from": "address:an_account",
+                "to": "sc:basic-features",
+                "function": "managed_decimal_into_raw_units",
+                "arguments": [],
+                "gasLimit": "1,000,000,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": [
+                    "12345"
+                ],
+                "status": "",
+                "message": "*",
+                "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 2be5e1a535..3ce78bc679 100644
--- a/contracts/feature-tests/basic-features/src/basic_features_main.rs
+++ b/contracts/feature-tests/basic-features/src/basic_features_main.rs
@@ -11,11 +11,13 @@ pub mod codec_err_test;
 pub mod crypto_features;
 pub mod echo;
 pub mod echo_managed;
+pub mod egld_decimal;
 pub mod elliptic_curve_features;
 pub mod event_features;
 pub mod macro_features;
 pub mod managed_address_features;
 pub mod managed_buffer_features;
+pub mod managed_decimal_features;
 pub mod managed_vec_features;
 pub mod non_zero_features;
 pub mod small_num_overflow_test_ops;
@@ -76,8 +78,10 @@ pub trait BasicFeatures:
     + small_num_overflow_test_ops::SmallIntOverflow
     + token_identifier_features::TokenIdentifierFeatures
     + non_zero_features::TypeFeatures
+    + egld_decimal::EgldDecimal
     + multiversx_sc_modules::default_issue_callbacks::DefaultIssueCallbacksModule
     + storage_mapper_get_at_address::StorageMapperGetAtAddress
+    + managed_decimal_features::ManagedDecimalFeatures
 {
     #[init]
     fn init(&self) {}
diff --git a/contracts/feature-tests/basic-features/src/egld_decimal.rs b/contracts/feature-tests/basic-features/src/egld_decimal.rs
new file mode 100644
index 0000000000..0b27ed84c6
--- /dev/null
+++ b/contracts/feature-tests/basic-features/src/egld_decimal.rs
@@ -0,0 +1,11 @@
+multiversx_sc::imports!();
+
+/// Used for testing the egld_decimal function return type
+#[multiversx_sc::module]
+pub trait EgldDecimal {
+    #[payable("EGLD")]
+    #[endpoint]
+    fn returns_egld_decimal(&self) -> ManagedDecimal<Self::Api, ConstDecimals<18>> {
+        self.call_value().egld_decimal()
+    }
+}
diff --git a/contracts/feature-tests/basic-features/src/managed_decimal_features.rs b/contracts/feature-tests/basic-features/src/managed_decimal_features.rs
new file mode 100644
index 0000000000..6952b9e6e1
--- /dev/null
+++ b/contracts/feature-tests/basic-features/src/managed_decimal_features.rs
@@ -0,0 +1,43 @@
+multiversx_sc::imports!();
+
+#[multiversx_sc::module]
+pub trait ManagedDecimalFeatures {
+    #[endpoint]
+    fn managed_decimal_addition(
+        &self,
+        first: ManagedDecimal<Self::Api, ConstDecimals<2>>,
+        second: ManagedDecimal<Self::Api, ConstDecimals<2>>,
+    ) -> ManagedDecimal<Self::Api, ConstDecimals<2>> {
+        first + second
+    }
+
+    #[endpoint]
+    fn managed_decimal_subtraction(
+        &self,
+        first: ManagedDecimal<Self::Api, ConstDecimals<2>>,
+        second: ManagedDecimal<Self::Api, ConstDecimals<2>>,
+    ) -> ManagedDecimal<Self::Api, ConstDecimals<2>> {
+        first - second
+    }
+
+    #[endpoint]
+    fn managed_decimal_eq(
+        &self,
+        first: ManagedDecimal<Self::Api, ConstDecimals<2>>,
+        second: ManagedDecimal<Self::Api, ConstDecimals<2>>,
+    ) -> bool {
+        first.eq(&second)
+    }
+
+    #[endpoint]
+    fn managed_decimal_trunc(&self) -> BigUint {
+        let dec = ManagedDecimal::from_raw_units(BigUint::from(31332u64), 2usize);
+        dec.trunc()
+    }
+
+    #[endpoint]
+    fn managed_decimal_into_raw_units(&self) -> BigUint {
+        let dec = ManagedDecimal::from_raw_units(BigUint::from(12345u64), 2usize);
+        dec.into_raw_units().clone()
+    }
+}
diff --git a/contracts/feature-tests/basic-features/tests/basic_features_egld_decimal_test.rs b/contracts/feature-tests/basic-features/tests/basic_features_egld_decimal_test.rs
new file mode 100644
index 0000000000..96a01cfc00
--- /dev/null
+++ b/contracts/feature-tests/basic-features/tests/basic_features_egld_decimal_test.rs
@@ -0,0 +1,71 @@
+use multiversx_sc::types::{
+    BigUint, ConstDecimals, ContractCallWithEgld, ManagedAddress, ManagedDecimal,
+};
+use multiversx_sc_scenario::{api::StaticApi, scenario_model::*, *};
+
+const BASIC_FEATURES_PATH_EXPR: &str = "file:../output/basic-features.wasm";
+const OWNER_ADDRESS_EXPR: &str = "address:owner";
+const BASIC_FEATURES_ADDRESS_EXPR: &str = "sc:basic-features";
+
+type BasicFeatures = ContractInfo<basic_features::Proxy<StaticApi>>;
+
+struct BasicFeaturesState {
+    world: ScenarioWorld,
+    basic_features: BasicFeatures,
+}
+
+impl BasicFeaturesState {
+    fn new() -> Self {
+        let mut world = world();
+        let basic_features_code = world.code_expression(BASIC_FEATURES_PATH_EXPR);
+
+        world.set_state_step(
+            SetStateStep::new()
+                .put_account(
+                    OWNER_ADDRESS_EXPR,
+                    Account::new().nonce(1).balance(BigUintValue::from(100u64)),
+                )
+                .put_account(
+                    BASIC_FEATURES_ADDRESS_EXPR,
+                    Account::new().nonce(1).code(basic_features_code),
+                ),
+        );
+
+        let basic_features = BasicFeatures::new(BASIC_FEATURES_ADDRESS_EXPR);
+
+        Self {
+            world,
+            basic_features,
+        }
+    }
+}
+fn world() -> ScenarioWorld {
+    let mut blockchain = ScenarioWorld::new();
+    blockchain.set_current_dir_from_workspace("contracts/feature-tests/basic-features");
+
+    blockchain.register_contract(BASIC_FEATURES_PATH_EXPR, basic_features::ContractBuilder);
+    blockchain
+}
+
+#[test]
+fn egld_decimal_blackbox_test() {
+    let mut state = BasicFeaturesState::new();
+
+    let sc_call =
+        ContractCallWithEgld::<StaticApi, ManagedDecimal<StaticApi, ConstDecimals<18>>>::new(
+            ManagedAddress::from(state.basic_features.to_address()),
+            "returns_egld_decimal",
+            BigUint::from(5u64),
+        );
+
+    let egld_decimal: ManagedDecimal<StaticApi, ConstDecimals<18>> = state
+        .world
+        .sc_call_get_result(ScCallStep::new().call(sc_call).from("address:owner"));
+
+    assert_eq!(
+        egld_decimal,
+        ManagedDecimal::<StaticApi, ConstDecimals<18>>::const_decimals_from_raw(BigUint::from(
+            5u64
+        ))
+    );
+}
diff --git a/contracts/feature-tests/basic-features/tests/basic_features_managed_decimal_test.rs b/contracts/feature-tests/basic-features/tests/basic_features_managed_decimal_test.rs
new file mode 100644
index 0000000000..42473aec9b
--- /dev/null
+++ b/contracts/feature-tests/basic-features/tests/basic_features_managed_decimal_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 managed_decimal_test() {
+    world().run("scenarios/managed_decimal.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 e87654cc7e..8a9a80bb04 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:                          384
+// Endpoints:                          390
 // Async Callback:                       1
-// Total number of exported functions: 386
+// Total number of exported functions: 392
 
 #![no_std]
 #![allow(internal_features)]
@@ -395,6 +395,7 @@ 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
+        returns_egld_decimal => returns_egld_decimal
         set_contract_address => set_contract_address
         is_empty_at_address => is_empty_at_address
         contains_at_address => contains_at_address
@@ -404,6 +405,11 @@ multiversx_sc_wasm_adapter::endpoints! {
         front_at_address => front_at_address
         back_at_address => back_at_address
         fill_set_mapper => fill_set_mapper
+        managed_decimal_addition => managed_decimal_addition
+        managed_decimal_subtraction => managed_decimal_subtraction
+        managed_decimal_eq => managed_decimal_eq
+        managed_decimal_trunc => managed_decimal_trunc
+        managed_decimal_into_raw_units => managed_decimal_into_raw_units
     )
 }
 
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 0c5d6383fa..439c098def 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
@@ -1,4 +1,5 @@
-use multiversx_sc_scenario::*;
+use multiversx_sc::types::{BigFloat, BigUint};
+use multiversx_sc_scenario::{api::StaticApi, *};
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
@@ -12,6 +13,50 @@ fn world() -> ScenarioWorld {
     blockchain
 }
 
+#[test]
+fn big_float_overflow_test_rs() {
+    let exp = 1_080i32;
+
+    let first = BigFloat::<StaticApi>::from_sci(1_005, -3)
+        .pow(exp)
+        .to_fixed_point(&(100_000_000_000_000_000i64.into()))
+        .into_big_uint();
+
+    let second = BigFloat::<StaticApi>::from_sci(1_005, -3)
+        .pow(exp)
+        .to_fixed_point(&(10_000_000_000_000_000i64.into()))
+        .into_big_uint();
+
+    let third_float = BigFloat::<StaticApi>::from_sci(1_005, -3)
+        .pow(exp)
+        .to_managed_decimal(17usize);
+    let third = third_float.into_raw_units();
+
+    let forth_float = BigFloat::<StaticApi>::from_sci(1_005, -3)
+        .pow(exp)
+        .to_managed_decimal(16usize);
+    let forth = forth_float.into_raw_units();
+
+    assert_eq!(
+        first.unwrap_or_sc_panic("unwrap failed"),
+        /* overflow */
+        BigUint::from(9223372036854775807u64)
+    );
+
+    assert_eq!(
+        second.unwrap_or_sc_panic("unwrap failed"),
+        BigUint::from(2184473079534488064u64)
+    );
+
+    assert_eq!(
+        third,
+        /* overflow */
+        &BigUint::from(9223372036854775807u64)
+    );
+
+    assert_eq!(forth, &BigUint::from(2184473079534488064u64));
+}
+
 #[test]
 fn big_float_new_from_big_int_rs() {
     world().run("scenarios/big_float_new_from_big_int.scen.json");
diff --git a/framework/base/src/api/managed_types/const_handles.rs b/framework/base/src/api/managed_types/const_handles.rs
index bd92bcc1db..837e002c53 100644
--- a/framework/base/src/api/managed_types/const_handles.rs
+++ b/framework/base/src/api/managed_types/const_handles.rs
@@ -1,3 +1,5 @@
+use num_traits::ToPrimitive;
+
 use super::RawHandle;
 
 /// Used as a flag. Reading from this handle will always result in a crash.
@@ -13,6 +15,7 @@ pub const CALL_VALUE_SINGLE_ESDT: RawHandle = -13;
 
 pub const BIG_INT_TEMPORARY_1: RawHandle = -14;
 pub const BIG_INT_TEMPORARY_2: RawHandle = -15;
+pub const BIG_FLOAT_TEMPORARY: RawHandle = -16;
 
 /// WARNING! With the current VM this still needs to be initialized before use.
 pub const MBUF_CONST_EMPTY: RawHandle = -20;
@@ -22,7 +25,16 @@ pub const CALLBACK_CLOSURE_ARGS_BUFFER: RawHandle = -23;
 pub const MBUF_TEMPORARY_1: RawHandle = -25;
 pub const MBUF_TEMPORARY_2: RawHandle = -26;
 
-pub const NEW_HANDLE_START_FROM: RawHandle = -100; // > -100 reserved for APIs
+pub const NEW_HANDLE_START_FROM: RawHandle = -200; // > -100 reserved for APIs
+
+// Vec of 64 entries of 1 bit
+pub const SCALING_FACTOR_START: RawHandle = -100;
+pub const SCALING_FACTOR_LENGTH: usize = 64;
 
 /// Used as a flag. Do not use as a regular handle.
 pub const MANAGED_OPTION_NONE: RawHandle = i32::MAX - 1;
+
+pub fn get_scaling_factor_handle(decimals: usize) -> i32 {
+    let decimals_i32 = decimals.to_i32().unwrap();
+    SCALING_FACTOR_START - decimals_i32
+}
diff --git a/framework/base/src/api/managed_types/static_var_api.rs b/framework/base/src/api/managed_types/static_var_api.rs
index 59f65dc3b6..0002e01bff 100644
--- a/framework/base/src/api/managed_types/static_var_api.rs
+++ b/framework/base/src/api/managed_types/static_var_api.rs
@@ -31,4 +31,8 @@ pub trait StaticVarApiImpl {
     fn set_call_value_multi_esdt_handle(&self, handle: RawHandle);
 
     fn get_call_value_multi_esdt_handle(&self) -> RawHandle;
+
+    fn get_scaling_factor_cached(&self, decimals: usize) -> bool;
+
+    fn set_scaling_factor_cached(&self, decimals: usize);
 }
diff --git a/framework/base/src/api/uncallable/static_var_api_uncallable.rs b/framework/base/src/api/uncallable/static_var_api_uncallable.rs
index 3ed707e06b..88811401ab 100644
--- a/framework/base/src/api/uncallable/static_var_api_uncallable.rs
+++ b/framework/base/src/api/uncallable/static_var_api_uncallable.rs
@@ -56,4 +56,12 @@ impl StaticVarApiImpl for UncallableApi {
     fn get_call_value_multi_esdt_handle(&self) -> RawHandle {
         unreachable!()
     }
+
+    fn get_scaling_factor_cached(&self, _decimals: usize) -> bool {
+        unreachable!()
+    }
+
+    fn set_scaling_factor_cached(&self, _decimals: usize) {
+        unreachable!()
+    }
 }
diff --git a/framework/base/src/contract_base/wrappers/call_value_wrapper.rs b/framework/base/src/contract_base/wrappers/call_value_wrapper.rs
index 520ee4228e..3006805ef0 100644
--- a/framework/base/src/contract_base/wrappers/call_value_wrapper.rs
+++ b/framework/base/src/contract_base/wrappers/call_value_wrapper.rs
@@ -7,8 +7,9 @@ use crate::{
     },
     err_msg,
     types::{
-        BigUint, EgldOrEsdtTokenIdentifier, EgldOrEsdtTokenPayment, EgldOrMultiEsdtPayment,
-        EsdtTokenPayment, ManagedRef, ManagedVec, TokenIdentifier,
+        BigUint, ConstDecimals, EgldOrEsdtTokenIdentifier, EgldOrEsdtTokenPayment,
+        EgldOrMultiEsdtPayment, EsdtTokenPayment, ManagedDecimal, ManagedRef, ManagedVec,
+        TokenIdentifier,
     },
 };
 
@@ -43,6 +44,13 @@ where
         unsafe { ManagedRef::wrap_handle(call_value_handle) }
     }
 
+    /// Returns the EGLD call value from the VM as ManagedDecimal
+    pub fn egld_decimal(&self) -> ManagedDecimal<A, ConstDecimals<18>> {
+        ManagedDecimal::<A, ConstDecimals<18>>::const_decimals_from_raw(
+            self.egld_value().clone_value(),
+        )
+    }
+
     /// Returns all ESDT transfers that accompany this SC call.
     /// Will return 0 results if nothing was transfered, or just EGLD.
     /// Fully managed underlying types, very efficient.
diff --git a/framework/base/src/types/managed/basic/big_float.rs b/framework/base/src/types/managed/basic/big_float.rs
index 83ef5613e3..44abed8b86 100644
--- a/framework/base/src/types/managed/basic/big_float.rs
+++ b/framework/base/src/types/managed/basic/big_float.rs
@@ -4,7 +4,7 @@ use crate::{
     api::{
         use_raw_handle, BigFloatApiImpl, ManagedTypeApi, ManagedTypeApiImpl, Sign, StaticVarApiImpl,
     },
-    types::{BigInt, BigUint, ManagedType},
+    types::{BigInt, BigUint, Decimals, ManagedDecimal, ManagedType},
 };
 use alloc::string::String;
 
@@ -169,6 +169,10 @@ impl<M: ManagedTypeApi> BigFloat<M> {
     pub fn to_fixed_point(&self, denominator: &BigFloat<M>) -> BigInt<M> {
         (self * denominator).trunc()
     }
+
+    pub fn to_managed_decimal<T: Decimals>(self, decimals: T) -> ManagedDecimal<M, T> {
+        ManagedDecimal::<M, T>::from_big_float(self, decimals)
+    }
 }
 
 impl<M: ManagedTypeApi> BigFloat<M> {
diff --git a/framework/base/src/types/managed/wrapped/egld_or_esdt_token_identifier.rs b/framework/base/src/types/managed/wrapped/egld_or_esdt_token_identifier.rs
index 3e7ae8afb5..e885181eca 100644
--- a/framework/base/src/types/managed/wrapped/egld_or_esdt_token_identifier.rs
+++ b/framework/base/src/types/managed/wrapped/egld_or_esdt_token_identifier.rs
@@ -1,3 +1,5 @@
+use alloc::string::ToString;
+
 use crate::{
     abi::{TypeAbi, TypeName},
     api::{HandleConstraints, ManagedTypeApi},
@@ -247,7 +249,6 @@ where
     M: ManagedTypeApi,
 {
     fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
-        use crate::alloc::string::ToString;
         if let Some(token_identifier) = self.data.as_option() {
             let token_id_str = token_identifier.to_string();
             f.debug_tuple("EgldOrEsdtTokenIdentifier::Esdt")
diff --git a/framework/base/src/types/managed/wrapped/managed_decimal.rs b/framework/base/src/types/managed/wrapped/managed_decimal.rs
new file mode 100644
index 0000000000..3bf824101d
--- /dev/null
+++ b/framework/base/src/types/managed/wrapped/managed_decimal.rs
@@ -0,0 +1,382 @@
+use crate::{
+    abi::{TypeAbi, TypeName},
+    api::{
+        const_handles, use_raw_handle, BigFloatApiImpl, BigIntApiImpl, ManagedTypeApi,
+        StaticVarApiImpl,
+    },
+    types::{BigFloat, BigUint},
+};
+
+use multiversx_sc_codec::{
+    DecodeError, DecodeErrorHandler, EncodeErrorHandler, NestedDecode, NestedDecodeInput,
+    NestedEncode, NestedEncodeOutput, TopDecode, TopDecodeInput, TopEncode, TopEncodeOutput,
+};
+
+use core::{
+    cmp::Ordering,
+    ops::{Add, Deref, Div, Mul, Sub},
+};
+
+use super::ManagedRef;
+
+fn scaling_factor<M: ManagedTypeApi>(
+    num_decimals: NumDecimals,
+) -> ManagedRef<'static, M, BigUint<M>> {
+    let handle: M::BigIntHandle =
+        use_raw_handle(const_handles::get_scaling_factor_handle(num_decimals));
+
+    if !M::static_var_api_impl().get_scaling_factor_cached(num_decimals) {
+        cache_scaling_factor::<M>(handle.clone(), num_decimals);
+        M::static_var_api_impl().set_scaling_factor_cached(num_decimals);
+    }
+
+    unsafe { ManagedRef::<'static, M, BigUint<M>>::wrap_handle(handle) }
+}
+
+fn cache_scaling_factor<M: ManagedTypeApi>(handle: M::BigIntHandle, num_decimals: NumDecimals) {
+    let temp1: M::BigIntHandle = use_raw_handle(const_handles::BIG_INT_TEMPORARY_1);
+    let temp2: M::BigIntHandle = use_raw_handle(const_handles::BIG_INT_TEMPORARY_2);
+    let api = M::managed_type_impl();
+    api.bi_set_int64(temp1.clone(), 10);
+    api.bi_set_int64(temp2.clone(), num_decimals as i64);
+    api.bi_pow(handle, temp1, temp2);
+}
+
+pub trait Decimals {
+    fn num_decimals(&self) -> NumDecimals;
+
+    fn scaling_factor<M: ManagedTypeApi>(&self) -> ManagedRef<'static, M, BigUint<M>> {
+        scaling_factor(self.num_decimals())
+    }
+}
+
+impl Decimals for NumDecimals {
+    fn num_decimals(&self) -> NumDecimals {
+        *self
+    }
+}
+
+pub type NumDecimals = usize;
+
+#[derive(Clone, Debug)]
+pub struct ConstDecimals<const DECIMALS: NumDecimals>;
+
+impl<const DECIMALS: NumDecimals> Decimals for ConstDecimals<DECIMALS> {
+    fn num_decimals(&self) -> NumDecimals {
+        DECIMALS
+    }
+
+    fn scaling_factor<M: ManagedTypeApi>(&self) -> ManagedRef<'static, M, BigUint<M>> {
+        scaling_factor(self.num_decimals())
+    }
+}
+
+#[derive(Debug, Clone)]
+pub struct ManagedDecimal<M: ManagedTypeApi, D: Decimals> {
+    data: BigUint<M>,
+    decimals: D,
+}
+
+impl<M: ManagedTypeApi, D: Decimals> ManagedDecimal<M, D> {
+    pub fn trunc(&self) -> BigUint<M> {
+        &self.data / self.decimals.scaling_factor().deref()
+    }
+
+    pub fn into_raw_units(&self) -> &BigUint<M> {
+        &self.data
+    }
+
+    pub fn from_raw_units(data: BigUint<M>, decimals: D) -> Self {
+        ManagedDecimal { data, decimals }
+    }
+
+    pub fn scale(&self) -> usize {
+        self.decimals.num_decimals()
+    }
+
+    pub fn rescale<T: Decimals>(self, scale_to: T) -> ManagedDecimal<M, T>
+    where
+        M: ManagedTypeApi,
+    {
+        let from_num_decimals = self.decimals.num_decimals();
+        let scale_to_num_decimals = scale_to.num_decimals();
+
+        match from_num_decimals.cmp(&scale_to_num_decimals) {
+            Ordering::Less => {
+                let delta_decimals = scale_to_num_decimals - from_num_decimals;
+                let scaling_factor: &BigUint<M> = &delta_decimals.scaling_factor();
+                ManagedDecimal::from_raw_units(&self.data * scaling_factor, scale_to)
+            },
+            Ordering::Equal => ManagedDecimal::from_raw_units(self.data, scale_to),
+            Ordering::Greater => {
+                let delta_decimals = from_num_decimals - scale_to_num_decimals;
+                let scaling_factor: &BigUint<M> = &delta_decimals.scaling_factor();
+                ManagedDecimal::from_raw_units(&self.data * scaling_factor, scale_to)
+            },
+        }
+    }
+
+    pub fn to_big_float(&self) -> BigFloat<M> {
+        let result = BigFloat::from_big_uint(&self.data);
+        let temp_handle: M::BigFloatHandle = use_raw_handle(const_handles::BIG_FLOAT_TEMPORARY);
+        let denominator = self.decimals.scaling_factor::<M>();
+        M::managed_type_impl().bf_set_bi(temp_handle.clone(), denominator.handle);
+        M::managed_type_impl().bf_div(result.handle.clone(), result.handle.clone(), temp_handle);
+        result
+    }
+
+    pub fn from_big_float<T: Decimals>(
+        big_float: BigFloat<M>,
+        num_decimals: T,
+    ) -> ManagedDecimal<M, T> {
+        let scaling_factor: &BigUint<M> = &num_decimals.scaling_factor();
+        let magnitude = big_float.magnitude();
+
+        let scaled = &BigFloat::from(scaling_factor) * &magnitude;
+        let fixed_big_int = scaled.trunc();
+
+        ManagedDecimal::from_raw_units(
+            fixed_big_int
+                .into_big_uint()
+                .unwrap_or_sc_panic("failed to cast BigInt to BigUint"),
+            num_decimals,
+        )
+    }
+}
+
+impl<M: ManagedTypeApi, const DECIMALS: NumDecimals> ManagedDecimal<M, ConstDecimals<DECIMALS>> {
+    pub fn const_decimals_from_raw(data: BigUint<M>) -> Self {
+        ManagedDecimal {
+            data,
+            decimals: ConstDecimals,
+        }
+    }
+}
+
+impl<M: ManagedTypeApi, const DECIMALS: NumDecimals> TopEncode
+    for ManagedDecimal<M, ConstDecimals<DECIMALS>>
+{
+    #[inline]
+    fn top_encode_or_handle_err<O, H>(&self, output: O, h: H) -> Result<(), H::HandledErr>
+    where
+        O: TopEncodeOutput,
+        H: EncodeErrorHandler,
+    {
+        self.data.top_encode_or_handle_err(output, h)
+    }
+}
+
+impl<M: ManagedTypeApi, const DECIMALS: NumDecimals> TopDecode
+    for ManagedDecimal<M, ConstDecimals<DECIMALS>>
+{
+    #[inline]
+    fn top_decode_or_handle_err<I, H>(input: I, h: H) -> Result<Self, H::HandledErr>
+    where
+        I: TopDecodeInput,
+        H: DecodeErrorHandler,
+    {
+        Ok(ManagedDecimal::const_decimals_from_raw(
+            BigUint::top_decode_or_handle_err(input, h)?,
+        ))
+    }
+}
+
+impl<M: ManagedTypeApi, const DECIMALS: NumDecimals> NestedEncode
+    for ManagedDecimal<M, ConstDecimals<DECIMALS>>
+{
+    #[inline]
+    fn dep_encode_or_handle_err<O, H>(&self, dest: &mut O, h: H) -> Result<(), H::HandledErr>
+    where
+        O: NestedEncodeOutput,
+        H: EncodeErrorHandler,
+    {
+        NestedEncode::dep_encode_or_handle_err(&self.data, dest, h)?;
+
+        Result::Ok(())
+    }
+}
+
+impl<M: ManagedTypeApi, const DECIMALS: NumDecimals> NestedDecode
+    for ManagedDecimal<M, ConstDecimals<DECIMALS>>
+{
+    #[inline]
+    fn dep_decode_or_handle_err<I, H>(input: &mut I, h: H) -> Result<Self, H::HandledErr>
+    where
+        I: NestedDecodeInput,
+        H: DecodeErrorHandler,
+    {
+        Result::Ok(ManagedDecimal::const_decimals_from_raw(
+            <BigUint<M> as NestedDecode>::dep_decode_or_handle_err(input, h)?,
+        ))
+    }
+}
+
+impl<M: ManagedTypeApi> NestedEncode for ManagedDecimal<M, NumDecimals> {
+    fn dep_encode_or_handle_err<O, H>(&self, dest: &mut O, h: H) -> Result<(), H::HandledErr>
+    where
+        O: NestedEncodeOutput,
+        H: EncodeErrorHandler,
+    {
+        NestedEncode::dep_encode_or_handle_err(&self.data, dest, h)?;
+        NestedEncode::dep_encode_or_handle_err(&self.decimals, dest, h)?;
+
+        Result::Ok(())
+    }
+}
+
+impl<M: ManagedTypeApi> TopEncode for ManagedDecimal<M, NumDecimals> {
+    #[inline]
+    fn top_encode_or_handle_err<O, H>(&self, output: O, h: H) -> Result<(), H::HandledErr>
+    where
+        O: TopEncodeOutput,
+        H: EncodeErrorHandler,
+    {
+        let mut buffer = output.start_nested_encode();
+        let dest = &mut buffer;
+        NestedEncode::dep_encode_or_handle_err(&self.data, dest, h)?;
+        NestedEncode::dep_encode_or_handle_err(&self.decimals, dest, h)?;
+
+        output.finalize_nested_encode(buffer);
+        Result::Ok(())
+    }
+}
+
+impl<M: ManagedTypeApi> NestedDecode for ManagedDecimal<M, NumDecimals> {
+    #[inline]
+    fn dep_decode_or_handle_err<I, H>(input: &mut I, h: H) -> Result<Self, H::HandledErr>
+    where
+        I: NestedDecodeInput,
+        H: DecodeErrorHandler,
+    {
+        Result::Ok(ManagedDecimal::from_raw_units(
+            <BigUint<M> as NestedDecode>::dep_decode_or_handle_err(input, h)?,
+            <NumDecimals as NestedDecode>::dep_decode_or_handle_err(input, h)?,
+        ))
+    }
+}
+
+impl<M: ManagedTypeApi> TopDecode for ManagedDecimal<M, NumDecimals> {
+    #[inline]
+    fn top_decode_or_handle_err<I, H>(top_input: I, h: H) -> Result<Self, H::HandledErr>
+    where
+        I: TopDecodeInput,
+        H: DecodeErrorHandler,
+    {
+        let mut nested_buffer = top_input.into_nested_buffer();
+        let result = ManagedDecimal::from_raw_units(
+            <BigUint<M> as NestedDecode>::dep_decode_or_handle_err(&mut nested_buffer, h)?,
+            <NumDecimals as NestedDecode>::dep_decode_or_handle_err(&mut nested_buffer, h)?,
+        );
+        if !NestedDecodeInput::is_depleted(&nested_buffer) {
+            return Result::Err(h.handle_error(DecodeError::INPUT_TOO_LONG));
+        }
+        Result::Ok(result)
+    }
+}
+
+impl<M: ManagedTypeApi, const DECIMALS: NumDecimals> From<BigUint<M>>
+    for ManagedDecimal<M, ConstDecimals<DECIMALS>>
+{
+    fn from(mut value: BigUint<M>) -> Self {
+        let decimals = ConstDecimals;
+        value *= decimals.scaling_factor().deref();
+        ManagedDecimal {
+            data: value,
+            decimals,
+        }
+    }
+}
+
+impl<M: ManagedTypeApi, const DECIMALS: NumDecimals> Add<ManagedDecimal<M, ConstDecimals<DECIMALS>>>
+    for ManagedDecimal<M, ConstDecimals<DECIMALS>>
+{
+    type Output = Self;
+
+    fn add(self, other: ManagedDecimal<M, ConstDecimals<DECIMALS>>) -> Self::Output {
+        ManagedDecimal::const_decimals_from_raw(self.data + other.data)
+    }
+}
+
+impl<M: ManagedTypeApi, const DECIMALS: NumDecimals> Sub<ManagedDecimal<M, ConstDecimals<DECIMALS>>>
+    for ManagedDecimal<M, ConstDecimals<DECIMALS>>
+{
+    type Output = Self;
+
+    fn sub(self, other: ManagedDecimal<M, ConstDecimals<DECIMALS>>) -> Self::Output {
+        ManagedDecimal::const_decimals_from_raw(self.data - other.data)
+    }
+}
+
+#[allow(clippy::suspicious_arithmetic_impl)]
+impl<M: ManagedTypeApi, const DECIMALS: NumDecimals, const OTHER_DECIMALS: NumDecimals>
+    Mul<ManagedDecimal<M, ConstDecimals<OTHER_DECIMALS>>>
+    for ManagedDecimal<M, ConstDecimals<DECIMALS>>
+where
+    [(); DECIMALS + OTHER_DECIMALS]:,
+{
+    type Output = ManagedDecimal<M, ConstDecimals<{ DECIMALS + OTHER_DECIMALS }>>;
+
+    fn mul(self, other: ManagedDecimal<M, ConstDecimals<OTHER_DECIMALS>>) -> Self::Output {
+        ManagedDecimal::const_decimals_from_raw(self.data * other.data)
+    }
+}
+
+#[allow(clippy::suspicious_arithmetic_impl)]
+impl<M: ManagedTypeApi, const DECIMALS: NumDecimals, const OTHER_DECIMALS: NumDecimals>
+    Div<ManagedDecimal<M, ConstDecimals<OTHER_DECIMALS>>>
+    for ManagedDecimal<M, ConstDecimals<DECIMALS>>
+where
+    [(); DECIMALS - OTHER_DECIMALS]:,
+{
+    type Output = ManagedDecimal<M, ConstDecimals<{ DECIMALS - OTHER_DECIMALS }>>;
+
+    fn div(self, other: ManagedDecimal<M, ConstDecimals<OTHER_DECIMALS>>) -> Self::Output {
+        ManagedDecimal::const_decimals_from_raw(self.data / other.data)
+    }
+}
+
+impl<M: ManagedTypeApi, D1: Decimals, D2: Decimals> PartialEq<ManagedDecimal<M, D2>>
+    for ManagedDecimal<M, D1>
+{
+    fn eq(&self, other: &ManagedDecimal<M, D2>) -> bool {
+        match self
+            .decimals
+            .num_decimals()
+            .cmp(&other.decimals.num_decimals())
+        {
+            Ordering::Less => {
+                let diff_decimals = other.decimals.num_decimals() - self.decimals.num_decimals();
+                let scaling_factor: &BigUint<M> = &diff_decimals.scaling_factor();
+                &self.data * scaling_factor == other.data
+            },
+            Ordering::Equal => self.data == other.data,
+            Ordering::Greater => {
+                let diff_decimals = self.decimals.num_decimals() - other.decimals.num_decimals();
+                let scaling_factor: &BigUint<M> = &diff_decimals.scaling_factor();
+                &other.data * scaling_factor == self.data
+            },
+        }
+    }
+}
+
+impl<M: ManagedTypeApi> TypeAbi for ManagedDecimal<M, NumDecimals> {
+    fn type_name() -> TypeName {
+        TypeName::from("ManagedDecimal<usize>")
+    }
+
+    fn is_variadic() -> bool {
+        false
+    }
+}
+
+impl<M: ManagedTypeApi, const DECIMALS: NumDecimals> TypeAbi
+    for ManagedDecimal<M, ConstDecimals<DECIMALS>>
+{
+    fn type_name() -> TypeName {
+        TypeName::from(alloc::format!("ManagedDecimal<{}>", DECIMALS))
+    }
+
+    fn is_variadic() -> bool {
+        false
+    }
+}
diff --git a/framework/base/src/types/managed/wrapped/mod.rs b/framework/base/src/types/managed/wrapped/mod.rs
index 8ac485fa38..c9c70fea9b 100644
--- a/framework/base/src/types/managed/wrapped/mod.rs
+++ b/framework/base/src/types/managed/wrapped/mod.rs
@@ -7,6 +7,7 @@ mod esdt_token_payment;
 mod managed_address;
 mod managed_buffer_cached_builder;
 mod managed_byte_array;
+mod managed_decimal;
 mod managed_option;
 mod managed_ref;
 mod managed_vec;
@@ -28,6 +29,7 @@ pub use managed_address::ManagedAddress;
 pub use managed_buffer_cached_builder::ManagedBufferCachedBuilder;
 pub(crate) use managed_byte_array::ManagedBufferSizeContext;
 pub use managed_byte_array::ManagedByteArray;
+pub use managed_decimal::{ConstDecimals, Decimals, ManagedDecimal, NumDecimals};
 pub use managed_option::ManagedOption;
 pub use managed_ref::ManagedRef;
 pub use managed_vec::ManagedVec;
diff --git a/framework/base/src/types/managed/wrapped/token_identifier.rs b/framework/base/src/types/managed/wrapped/token_identifier.rs
index 329b3f2b3d..2e5a27020c 100644
--- a/framework/base/src/types/managed/wrapped/token_identifier.rs
+++ b/framework/base/src/types/managed/wrapped/token_identifier.rs
@@ -1,3 +1,5 @@
+use alloc::string::ToString;
+
 use crate::{
     abi::{TypeAbi, TypeName},
     api::{ErrorApi, ErrorApiImpl, HandleConstraints, ManagedTypeApi, ManagedTypeApiImpl},
@@ -199,7 +201,6 @@ impl<M: ManagedTypeApi> core::fmt::Display for TokenIdentifier<M> {
 
 impl<M: ManagedTypeApi> core::fmt::Debug for TokenIdentifier<M> {
     fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
-        use crate::alloc::string::ToString;
         f.debug_tuple("TokenIdentifier")
             .field(&self.to_string())
             .finish()
diff --git a/framework/scenario/src/api/local_api_vh/static_var_api_vh.rs b/framework/scenario/src/api/local_api_vh/static_var_api_vh.rs
index c736ea9c01..907fc19d06 100644
--- a/framework/scenario/src/api/local_api_vh/static_var_api_vh.rs
+++ b/framework/scenario/src/api/local_api_vh/static_var_api_vh.rs
@@ -80,4 +80,14 @@ impl<VHB: VMHooksApiBackend> StaticVarApiImpl for VMHooksApi<VHB> {
             use_raw_handle(data.static_vars_cell.borrow().call_value_multi_esdt_handle)
         })
     }
+
+    fn get_scaling_factor_cached(&self, decimals: usize) -> bool {
+        self.with_static_data(|data| data.static_vars_cell.borrow().scaling_factor_init[decimals])
+    }
+
+    fn set_scaling_factor_cached(&self, decimals: usize) {
+        self.with_static_data(|data| {
+            data.static_vars_cell.borrow_mut().scaling_factor_init[decimals] = true
+        })
+    }
 }
diff --git a/framework/scenario/src/debug_executor/tx_static_vars.rs b/framework/scenario/src/debug_executor/tx_static_vars.rs
index 4ca23f33cb..88277694c4 100644
--- a/framework/scenario/src/debug_executor/tx_static_vars.rs
+++ b/framework/scenario/src/debug_executor/tx_static_vars.rs
@@ -7,6 +7,8 @@ pub struct TxStaticVars {
     pub num_arguments: i32,
     pub call_value_egld_handle: RawHandle,
     pub call_value_multi_esdt_handle: RawHandle,
+    //vec of true/false, true if bit from handle = scaling_start + index is not empty
+    pub scaling_factor_init: [bool; const_handles::SCALING_FACTOR_LENGTH],
 }
 
 impl Default for TxStaticVars {
@@ -17,6 +19,7 @@ impl Default for TxStaticVars {
             num_arguments: -1,
             call_value_egld_handle: const_handles::UNINITIALIZED_HANDLE,
             call_value_multi_esdt_handle: const_handles::UNINITIALIZED_HANDLE,
+            scaling_factor_init: [false; const_handles::SCALING_FACTOR_LENGTH],
         }
     }
 }
diff --git a/framework/scenario/tests/managed_decimal_test.rs b/framework/scenario/tests/managed_decimal_test.rs
new file mode 100644
index 0000000000..3b185a8a56
--- /dev/null
+++ b/framework/scenario/tests/managed_decimal_test.rs
@@ -0,0 +1,129 @@
+#![feature(generic_const_exprs)]
+#![allow(incomplete_features)]
+
+use multiversx_sc::{
+    codec::test_util::{check_dep_encode_decode, check_top_encode_decode},
+    types::{BigFloat, BigUint, ConstDecimals, ManagedDecimal, NumDecimals},
+};
+use multiversx_sc_scenario::api::StaticApi;
+
+#[test]
+pub fn test_managed_decimal() {
+    let fixed = ManagedDecimal::<StaticApi, ConstDecimals<2>>::from(BigUint::from(1u64));
+    let fixed_2 = ManagedDecimal::<StaticApi, ConstDecimals<2>>::from(BigUint::from(5u64));
+    let fixed_3 = ManagedDecimal::<StaticApi, ConstDecimals<4>>::from(BigUint::from(8u64));
+
+    let addition = fixed.clone() + fixed_2.clone();
+    assert_eq!(
+        addition,
+        ManagedDecimal::<StaticApi, ConstDecimals<2>>::from(BigUint::from(6u64))
+    );
+    assert_eq!(addition.into_raw_units(), &BigUint::from(600u64));
+    assert_eq!(addition.trunc(), BigUint::from(6u64));
+
+    let subtraction = addition - fixed;
+    assert_eq!(
+        subtraction,
+        ManagedDecimal::<StaticApi, ConstDecimals<2>>::from(BigUint::from(5u64))
+    );
+
+    let multiplication = fixed_3.clone() * fixed_2;
+    assert_eq!(
+        multiplication,
+        ManagedDecimal::<StaticApi, ConstDecimals<6>>::from(BigUint::from(40u64))
+    );
+
+    let division = multiplication / fixed_3;
+    assert_eq!(
+        division,
+        ManagedDecimal::<StaticApi, ConstDecimals<2>>::from(BigUint::from(5u64))
+    );
+
+    let fixed_4: ManagedDecimal<StaticApi, NumDecimals> =
+        ManagedDecimal::from_raw_units(BigUint::from(100u64), 2usize);
+    let fixed_5 = fixed_4.rescale(2usize);
+    assert_eq!(
+        fixed_5,
+        ManagedDecimal::from_raw_units(BigUint::from(100000000u64), 8usize)
+    );
+
+    let fixed_6: ManagedDecimal<StaticApi, ConstDecimals<2>> =
+        ManagedDecimal::from(BigUint::from(1500u64));
+    let fixed_7 = fixed_6.rescale(ConstDecimals::<8>);
+    assert_eq!(
+        fixed_7,
+        ManagedDecimal::<StaticApi, ConstDecimals<8>>::from(BigUint::from(1500u64))
+    );
+
+    let fixed_8: ManagedDecimal<StaticApi, NumDecimals> =
+        ManagedDecimal::from_raw_units(BigUint::from(5u64), 5usize);
+    let fixed_9 = fixed_8.rescale(ConstDecimals::<3>);
+    assert_eq!(
+        fixed_9,
+        ManagedDecimal::<StaticApi, ConstDecimals<3>>::const_decimals_from_raw(BigUint::from(
+            500u64
+        ))
+    );
+
+    let float_1 = BigFloat::<StaticApi>::from_frac(3i64, 2i64);
+    let fixed_float_1 = ManagedDecimal::<StaticApi, ConstDecimals<1>>::from_big_float(
+        float_1.clone(),
+        ConstDecimals::<1>,
+    );
+    let fixed_float_2 = ManagedDecimal::<StaticApi, NumDecimals>::from_big_float(float_1, 1usize);
+
+    assert_eq!(
+        fixed_float_1,
+        ManagedDecimal::<StaticApi, ConstDecimals<1>>::const_decimals_from_raw(BigUint::from(
+            15u64
+        ))
+    );
+    assert_eq!(
+        fixed_float_2,
+        ManagedDecimal::<StaticApi, NumDecimals>::from_raw_units(BigUint::from(15u64), 1usize)
+    );
+}
+
+#[test]
+fn test_managed_decimal_conversion() {
+    let fixed: ManagedDecimal<StaticApi, NumDecimals> =
+        ManagedDecimal::from_raw_units(BigUint::from(123456789123456789u64), 15usize); //123,45....
+
+    let float_coresp = fixed.to_big_float();
+
+    // hook not available yet, uncomment when available
+    // assert_eq!(
+    //     float_coresp.to_buffer(),
+    //     ManagedBuffer::from("123.456789123456789")
+    // );
+
+    assert_eq!(
+        float_coresp,
+        BigFloat::from_frac(123456789123456789i64, 1_000_000_000_000_000i64)
+    );
+}
+
+#[test]
+fn test_encode_decode() {
+    let fixed_struct: ManagedDecimal<StaticApi, NumDecimals> =
+        ManagedDecimal::from_raw_units(BigUint::from(1u64), 1usize);
+
+    #[rustfmt::skip]
+	let nested_bytes = &[
+		/* BigUint */ 0, 0, 0, 0x01, 0x01,
+		/* usize */ 0, 0, 0, 0x01,
+	];
+
+    check_dep_encode_decode(fixed_struct.clone(), nested_bytes);
+    check_top_encode_decode(fixed_struct, nested_bytes);
+
+    let fixed_const: ManagedDecimal<StaticApi, ConstDecimals<1>> =
+        ManagedDecimal::const_decimals_from_raw(BigUint::from(1u64));
+
+    #[rustfmt::skip]
+    let bytes = &[
+        /* BigUint */ 0x01,
+    ];
+
+    check_top_encode_decode(fixed_const, bytes);
+}
diff --git a/framework/scenario/tests/managed_type_debug_test.rs b/framework/scenario/tests/managed_type_debug_test.rs
index fbe031ab7e..1342395377 100644
--- a/framework/scenario/tests/managed_type_debug_test.rs
+++ b/framework/scenario/tests/managed_type_debug_test.rs
@@ -10,26 +10,26 @@ use multiversx_sc_scenario::api::StaticApi;
 #[test]
 fn test_big_uint_format() {
     let s = format!("{:?}", BigUint::<StaticApi>::from(0x1234u32));
-    assert_eq!("BigUint { handle: -100, hex-value-be: \"1234\" }", s);
+    assert_eq!("BigUint { handle: -200, hex-value-be: \"1234\" }", s);
 }
 
 #[test]
 fn test_big_int_format_1() {
     let s = format!("{:?}", BigInt::<StaticApi>::from(0x1234));
-    assert_eq!("BigInt { handle: -100, hex-value-be: \"1234\" }", s);
+    assert_eq!("BigInt { handle: -200, hex-value-be: \"1234\" }", s);
 }
 
 #[test]
 fn test_big_int_format_2() {
     let s = format!("{:?}", BigInt::<StaticApi>::from(-0x1234));
-    assert_eq!("BigInt { handle: -100, hex-value-be: \"edcc\" }", s);
+    assert_eq!("BigInt { handle: -200, hex-value-be: \"edcc\" }", s);
 }
 
 #[test]
 fn test_managed_buffer() {
     let _ = multiversx_sc::hex_literal::hex!("abcd");
     let s = format!("{:?}", ManagedBuffer::<StaticApi>::from(&[0x12, 0x34]));
-    assert_eq!("ManagedBuffer { handle: -100, hex-value: \"1234\" }", s);
+    assert_eq!("ManagedBuffer { handle: -200, hex-value: \"1234\" }", s);
 }
 
 #[test]
@@ -37,7 +37,7 @@ fn test_managed_byte_array() {
     let addr = hex!("01020304050607");
     let s = format!("{:?}", ManagedByteArray::<StaticApi, 7>::from(&addr));
     assert_eq!(
-        "ManagedByteArray { handle: -100, size: 7, hex-value: \"01020304050607\" }",
+        "ManagedByteArray { handle: -200, size: 7, hex-value: \"01020304050607\" }",
         s
     );
 }
@@ -46,7 +46,7 @@ fn test_managed_byte_array() {
 fn test_managed_address() {
     let addr = hex!("000000000000000000010000000000000000000000000000000000000002ffff");
     let s = format!("{:?}", ManagedAddress::<StaticApi>::from(&addr));
-    assert_eq!("ManagedAddress { handle: -100, hex-value: \"000000000000000000010000000000000000000000000000000000000002ffff\" }", s);
+    assert_eq!("ManagedAddress { handle: -200, hex-value: \"000000000000000000010000000000000000000000000000000000000002ffff\" }", s);
 }
 
 #[test]
@@ -55,7 +55,7 @@ fn test_managed_address_pretty() {
     let s = format!("{:#?}", ManagedAddress::<StaticApi>::from(&addr));
     assert_eq!(
         "ManagedAddress {
-    handle: -100,
+    handle: -200,
     hex-value: \"000000000000000000010000000000000000000000000000000000000002ffff\",
 }",
         s
@@ -68,7 +68,7 @@ fn test_managed_vec_format_biguint() {
     mv.push(BigUint::from(1u32));
     mv.push(BigUint::from(2u32));
     let s = format!("{:?}", &mv);
-    assert_eq!("[BigUint { handle: -101, hex-value-be: \"01\" }, BigUint { handle: -102, hex-value-be: \"02\" }]", s);
+    assert_eq!("[BigUint { handle: -201, hex-value-be: \"01\" }, BigUint { handle: -202, hex-value-be: \"02\" }]", s);
 }
 
 #[test]
diff --git a/framework/scenario/tests/test_print_api.rs b/framework/scenario/tests/test_print_api.rs
index f61cb78ea1..a15c91601d 100644
--- a/framework/scenario/tests/test_print_api.rs
+++ b/framework/scenario/tests/test_print_api.rs
@@ -6,13 +6,13 @@ fn test_print_api() {
     let zero = BigUint::<StaticApi>::from(0u64);
     assert_eq!(
         format!("{:?}", BigUintPrinter { value: zero }),
-        "BigUint { handle: -100, hex: \"00\", dec: \"0\" }"
+        "BigUint { handle: -200, hex: \"00\", dec: \"0\" }"
     );
 
     let regular = BigUint::<StaticApi>::from(257u64);
     assert_eq!(
         format!("{:?}", BigUintPrinter { value: regular }),
-        "BigUint { handle: -101, hex: \"0101\", dec: \"257\" }"
+        "BigUint { handle: -201, hex: \"0101\", dec: \"257\" }"
     );
 
     let huge_number = BigUint::<StaticApi>::from_bytes_be(&[
@@ -21,6 +21,6 @@ fn test_print_api() {
     ]);
     assert_eq!(
         format!("{:?}", BigUintPrinter { value: huge_number }),
-        "BigUint { handle: -102, hex: \"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff\", dec: \"7588550360256754183279148073529370729071901715047420004889892225542594864082845695\" }"
+        "BigUint { handle: -202, hex: \"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff\", dec: \"7588550360256754183279148073529370729071901715047420004889892225542594864082845695\" }"
     );
 }
diff --git a/framework/snippets/src/interactor_vm_query.rs b/framework/snippets/src/interactor_vm_query.rs
index 56a54961d2..d6a92aa450 100644
--- a/framework/snippets/src/interactor_vm_query.rs
+++ b/framework/snippets/src/interactor_vm_query.rs
@@ -40,6 +40,7 @@ impl Interactor {
         info!("{:#?}", result);
 
         let raw_results: Vec<Vec<u8>> = result.data.return_data.iter().map(base64_decode).collect();
+
         step.save_response(TxResponse::from_raw_results(raw_results));
 
         self.pre_runners.run_sc_query_step(step);
diff --git a/framework/wasm-adapter/src/api/managed_types/static_var_api_node.rs b/framework/wasm-adapter/src/api/managed_types/static_var_api_node.rs
index 272bbba578..9e1aebb216 100644
--- a/framework/wasm-adapter/src/api/managed_types/static_var_api_node.rs
+++ b/framework/wasm-adapter/src/api/managed_types/static_var_api_node.rs
@@ -11,6 +11,8 @@ static mut NEXT_HANDLE: i32 = const_handles::NEW_HANDLE_START_FROM;
 static mut NUM_ARGUMENTS: i32 = 0;
 static mut CALL_VALUE_EGLD_HANDLE: i32 = const_handles::UNINITIALIZED_HANDLE;
 static mut CALL_VALUE_MULTI_ESDT_HANDLE: i32 = const_handles::UNINITIALIZED_HANDLE;
+static mut SCALING_FACTOR_INIT: [bool; const_handles::SCALING_FACTOR_LENGTH] =
+    [false; const_handles::SCALING_FACTOR_LENGTH];
 
 // The compiler seems to enjoy inlining this method no matter how many times it shows up.
 // Hence the rather drastic directive.
@@ -78,4 +80,14 @@ impl StaticVarApiImpl for VmApiImpl {
     fn get_call_value_multi_esdt_handle(&self) -> RawHandle {
         unsafe { CALL_VALUE_MULTI_ESDT_HANDLE }
     }
+
+    fn get_scaling_factor_cached(&self, decimals: usize) -> bool {
+        unsafe { SCALING_FACTOR_INIT[decimals] }
+    }
+
+    fn set_scaling_factor_cached(&self, decimals: usize) {
+        {
+            unsafe { SCALING_FACTOR_INIT[decimals] = true }
+        }
+    }
 }

From a2eaf7da04a29987122d5852bad16a3f17d5dba9 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Mon, 4 Mar 2024 11:58:04 +0100
Subject: [PATCH 0383/1254] fix after review

---
 framework/base/src/api/managed_types/const_handles.rs       | 6 ++----
 framework/base/src/api/managed_types/static_var_api.rs      | 2 +-
 .../base/src/api/uncallable/static_var_api_uncallable.rs    | 2 +-
 framework/base/src/types/managed/wrapped/managed_decimal.rs | 2 +-
 .../scenario/src/api/local_api_vh/static_var_api_vh.rs      | 2 +-
 .../src/api/managed_types/static_var_api_node.rs            | 2 +-
 6 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/framework/base/src/api/managed_types/const_handles.rs b/framework/base/src/api/managed_types/const_handles.rs
index 837e002c53..73f329452e 100644
--- a/framework/base/src/api/managed_types/const_handles.rs
+++ b/framework/base/src/api/managed_types/const_handles.rs
@@ -1,5 +1,3 @@
-use num_traits::ToPrimitive;
-
 use super::RawHandle;
 
 /// Used as a flag. Reading from this handle will always result in a crash.
@@ -34,7 +32,7 @@ pub const SCALING_FACTOR_LENGTH: usize = 64;
 /// Used as a flag. Do not use as a regular handle.
 pub const MANAGED_OPTION_NONE: RawHandle = i32::MAX - 1;
 
-pub fn get_scaling_factor_handle(decimals: usize) -> i32 {
-    let decimals_i32 = decimals.to_i32().unwrap();
+pub const fn get_scaling_factor_handle(decimals: usize) -> i32 {
+    let decimals_i32 = decimals as i32;
     SCALING_FACTOR_START - decimals_i32
 }
diff --git a/framework/base/src/api/managed_types/static_var_api.rs b/framework/base/src/api/managed_types/static_var_api.rs
index 0002e01bff..8eaf474ef3 100644
--- a/framework/base/src/api/managed_types/static_var_api.rs
+++ b/framework/base/src/api/managed_types/static_var_api.rs
@@ -32,7 +32,7 @@ pub trait StaticVarApiImpl {
 
     fn get_call_value_multi_esdt_handle(&self) -> RawHandle;
 
-    fn get_scaling_factor_cached(&self, decimals: usize) -> bool;
+    fn is_scaling_factor_cached(&self, decimals: usize) -> bool;
 
     fn set_scaling_factor_cached(&self, decimals: usize);
 }
diff --git a/framework/base/src/api/uncallable/static_var_api_uncallable.rs b/framework/base/src/api/uncallable/static_var_api_uncallable.rs
index 88811401ab..1da3c772cf 100644
--- a/framework/base/src/api/uncallable/static_var_api_uncallable.rs
+++ b/framework/base/src/api/uncallable/static_var_api_uncallable.rs
@@ -57,7 +57,7 @@ impl StaticVarApiImpl for UncallableApi {
         unreachable!()
     }
 
-    fn get_scaling_factor_cached(&self, _decimals: usize) -> bool {
+    fn is_scaling_factor_cached(&self, _decimals: usize) -> bool {
         unreachable!()
     }
 
diff --git a/framework/base/src/types/managed/wrapped/managed_decimal.rs b/framework/base/src/types/managed/wrapped/managed_decimal.rs
index 3bf824101d..7810a43500 100644
--- a/framework/base/src/types/managed/wrapped/managed_decimal.rs
+++ b/framework/base/src/types/managed/wrapped/managed_decimal.rs
@@ -25,7 +25,7 @@ fn scaling_factor<M: ManagedTypeApi>(
     let handle: M::BigIntHandle =
         use_raw_handle(const_handles::get_scaling_factor_handle(num_decimals));
 
-    if !M::static_var_api_impl().get_scaling_factor_cached(num_decimals) {
+    if !M::static_var_api_impl().is_scaling_factor_cached(num_decimals) {
         cache_scaling_factor::<M>(handle.clone(), num_decimals);
         M::static_var_api_impl().set_scaling_factor_cached(num_decimals);
     }
diff --git a/framework/scenario/src/api/local_api_vh/static_var_api_vh.rs b/framework/scenario/src/api/local_api_vh/static_var_api_vh.rs
index 907fc19d06..e72ae45f74 100644
--- a/framework/scenario/src/api/local_api_vh/static_var_api_vh.rs
+++ b/framework/scenario/src/api/local_api_vh/static_var_api_vh.rs
@@ -81,7 +81,7 @@ impl<VHB: VMHooksApiBackend> StaticVarApiImpl for VMHooksApi<VHB> {
         })
     }
 
-    fn get_scaling_factor_cached(&self, decimals: usize) -> bool {
+    fn is_scaling_factor_cached(&self, decimals: usize) -> bool {
         self.with_static_data(|data| data.static_vars_cell.borrow().scaling_factor_init[decimals])
     }
 
diff --git a/framework/wasm-adapter/src/api/managed_types/static_var_api_node.rs b/framework/wasm-adapter/src/api/managed_types/static_var_api_node.rs
index 9e1aebb216..1350697cf6 100644
--- a/framework/wasm-adapter/src/api/managed_types/static_var_api_node.rs
+++ b/framework/wasm-adapter/src/api/managed_types/static_var_api_node.rs
@@ -81,7 +81,7 @@ impl StaticVarApiImpl for VmApiImpl {
         unsafe { CALL_VALUE_MULTI_ESDT_HANDLE }
     }
 
-    fn get_scaling_factor_cached(&self, decimals: usize) -> bool {
+    fn is_scaling_factor_cached(&self, decimals: usize) -> bool {
         unsafe { SCALING_FACTOR_INIT[decimals] }
     }
 

From b67a16973eb2012addcfd7d74231a1e758e5f4f4 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Mon, 4 Mar 2024 14:04:21 +0100
Subject: [PATCH 0384/1254] temporary tx proxy - init

---
 contracts/examples/adder/src/temp_proxy.rs    |  5 ++---
 contracts/examples/adder/src/temp_proxy_v2.rs | 19 +++++++++++++------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/contracts/examples/adder/src/temp_proxy.rs b/contracts/examples/adder/src/temp_proxy.rs
index a703317132..a92bf8213c 100644
--- a/contracts/examples/adder/src/temp_proxy.rs
+++ b/contracts/examples/adder/src/temp_proxy.rs
@@ -33,12 +33,11 @@ where
         (),
         (),
         (),
-        FunctionCall<Env::Api>,
+        DeployCall<Env, ()>,
         OriginalResultMarker<()>,
     > {
         Tx::new_with_env(self.env)
-            .raw_call()
-            .function_name("init")
+            .raw_deploy()
             .argument(&initial_value)
             .original_result()
     }
diff --git a/contracts/examples/adder/src/temp_proxy_v2.rs b/contracts/examples/adder/src/temp_proxy_v2.rs
index 3206e45fac..f18015ae98 100644
--- a/contracts/examples/adder/src/temp_proxy_v2.rs
+++ b/contracts/examples/adder/src/temp_proxy_v2.rs
@@ -28,11 +28,10 @@ where
     wrapped_tx: Tx<Env, From, To, (), Gas, (), ()>,
 }
 
-impl<Env, From, To, Gas> TxProxyMethods<Env, From, To, Gas>
+impl<Env, To, Gas> TxProxyMethods<Env, (), To, Gas>
 where
     Env: TxEnv,
     Env::Api: VMApi,
-    From: TxFrom<Env>,
     To: TxTo<Env>,
     Gas: TxGas<Env>,
 {
@@ -41,20 +40,28 @@ where
         initial_value: Arg0,
     ) -> multiversx_sc::types::Tx<
         Env,
-        From,
+        (),
         To,
         (),
         Gas,
-        FunctionCall<Env::Api>,
+        DeployCall<Env, ()>,
         OriginalResultMarker<()>,
     > {
         self.wrapped_tx
-            .raw_call()
-            .function_name("init")
+            .raw_deploy()
             .argument(&initial_value)
             .original_result()
     }
+}
 
+impl<Env, From, To, Gas> TxProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
     pub fn sum(
         self,
     ) -> multiversx_sc::types::Tx<

From 23dd65a60124df5439e52e40a83a33596a9467eb Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Mon, 4 Mar 2024 16:17:36 +0100
Subject: [PATCH 0385/1254] removed unstable feature for panic

---
 framework/wasm-adapter/src/lib.rs   | 1 -
 framework/wasm-adapter/src/panic.rs | 6 ++++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/framework/wasm-adapter/src/lib.rs b/framework/wasm-adapter/src/lib.rs
index d105af6bcc..4fb63ea0f0 100644
--- a/framework/wasm-adapter/src/lib.rs
+++ b/framework/wasm-adapter/src/lib.rs
@@ -1,5 +1,4 @@
 #![no_std]
-#![feature(panic_info_message)]
 
 // Allows us to use alloc::vec::Vec;
 // TODO: get rid of the legacy API and also of this.
diff --git a/framework/wasm-adapter/src/panic.rs b/framework/wasm-adapter/src/panic.rs
index 164db2fc14..ae1e8f848b 100644
--- a/framework/wasm-adapter/src/panic.rs
+++ b/framework/wasm-adapter/src/panic.rs
@@ -1,5 +1,6 @@
 use crate::api::VmApiImpl;
 pub use alloc::alloc::Layout;
+use alloc::string::ToString;
 use multiversx_sc::{
     api::{ErrorApi, ErrorApiImpl},
     types::{ManagedBuffer, ManagedType},
@@ -18,9 +19,10 @@ pub fn panic_fmt(_: &PanicInfo) -> ! {
 /// Mostly used for debugging, the additional code is normally not deemed to be worth it.
 pub fn panic_fmt_with_message(panic_info: &PanicInfo) -> ! {
     let mut panic_msg = ManagedPanicMessage::default();
-    if let Some(args) = panic_info.message() {
+    let message = panic_info.to_string();
+    if !message.is_empty() {
         panic_msg.append_str("panic occurred: ");
-        let _ = core::fmt::write(&mut panic_msg, *args);
+        panic_msg.append_str(&message);
     } else {
         panic_msg.append_str("unknown panic occurred");
     };

From 847a6277462657900d0e2303f7f628ce4fcc7b20 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Mon, 4 Mar 2024 18:25:08 +0100
Subject: [PATCH 0386/1254] format without memory alloc

---
 framework/wasm-adapter/src/panic.rs | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/framework/wasm-adapter/src/panic.rs b/framework/wasm-adapter/src/panic.rs
index ae1e8f848b..8417e9ce88 100644
--- a/framework/wasm-adapter/src/panic.rs
+++ b/framework/wasm-adapter/src/panic.rs
@@ -1,6 +1,5 @@
 use crate::api::VmApiImpl;
 pub use alloc::alloc::Layout;
-use alloc::string::ToString;
 use multiversx_sc::{
     api::{ErrorApi, ErrorApiImpl},
     types::{ManagedBuffer, ManagedType},
@@ -19,13 +18,10 @@ pub fn panic_fmt(_: &PanicInfo) -> ! {
 /// Mostly used for debugging, the additional code is normally not deemed to be worth it.
 pub fn panic_fmt_with_message(panic_info: &PanicInfo) -> ! {
     let mut panic_msg = ManagedPanicMessage::default();
-    let message = panic_info.to_string();
-    if !message.is_empty() {
-        panic_msg.append_str("panic occurred: ");
-        panic_msg.append_str(&message);
-    } else {
-        panic_msg.append_str("unknown panic occurred");
-    };
+    panic_msg.append_str("panic occurred: ");
+
+    let _ = core::fmt::write(&mut panic_msg, format_args!("{:?}", panic_info.payload()))
+        .expect("Failed to write panic payload");
 
     VmApiImpl::error_api_impl().signal_error_from_buffer(panic_msg.buffer.get_handle())
 }

From 8b479fd23e2620295320c3c8e3dd635247101208 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Mon, 4 Mar 2024 21:05:46 +0100
Subject: [PATCH 0387/1254] clippy fix

---
 contracts/examples/adder/src/temp_proxy.rs    | 13 ++++---------
 contracts/examples/adder/src/temp_proxy_v2.rs | 13 ++++---------
 2 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/contracts/examples/adder/src/temp_proxy.rs b/contracts/examples/adder/src/temp_proxy.rs
index a92bf8213c..a3e72adde0 100644
--- a/contracts/examples/adder/src/temp_proxy.rs
+++ b/contracts/examples/adder/src/temp_proxy.rs
@@ -1,3 +1,5 @@
+#![allow(clippy::all)]
+
 use multiversx_sc::api::VMApi;
 
 multiversx_sc::imports!();
@@ -27,15 +29,8 @@ where
     pub fn init<Arg0: multiversx_sc::codec::CodecInto<BigUint<Env::Api>>>(
         self,
         initial_value: Arg0,
-    ) -> multiversx_sc::types::Tx<
-        Env,
-        (),
-        (),
-        (),
-        (),
-        DeployCall<Env, ()>,
-        OriginalResultMarker<()>,
-    > {
+    ) -> multiversx_sc::types::Tx<Env, (), (), (), (), DeployCall<Env, ()>, OriginalResultMarker<()>>
+    {
         Tx::new_with_env(self.env)
             .raw_deploy()
             .argument(&initial_value)
diff --git a/contracts/examples/adder/src/temp_proxy_v2.rs b/contracts/examples/adder/src/temp_proxy_v2.rs
index f18015ae98..fb6f8cd50e 100644
--- a/contracts/examples/adder/src/temp_proxy_v2.rs
+++ b/contracts/examples/adder/src/temp_proxy_v2.rs
@@ -1,3 +1,5 @@
+#![allow(clippy::all)]
+
 use multiversx_sc::api::VMApi;
 
 multiversx_sc::imports!();
@@ -38,15 +40,8 @@ where
     pub fn init<Arg0: multiversx_sc::codec::CodecInto<BigUint<Env::Api>>>(
         self,
         initial_value: Arg0,
-    ) -> multiversx_sc::types::Tx<
-        Env,
-        (),
-        To,
-        (),
-        Gas,
-        DeployCall<Env, ()>,
-        OriginalResultMarker<()>,
-    > {
+    ) -> multiversx_sc::types::Tx<Env, (), To, (), Gas, DeployCall<Env, ()>, OriginalResultMarker<()>>
+    {
         self.wrapped_tx
             .raw_deploy()
             .argument(&initial_value)

From 92164aa4f2dbe2fccc506320f56b9f015b815c6c Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Mon, 4 Mar 2024 21:05:52 +0100
Subject: [PATCH 0388/1254] cargo fmt

---
 framework/base/src/types/interaction/mod.rs                   | 4 ++--
 .../meta/src/cmd/contract/generate_proxy/proxy_gen_main.rs    | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/framework/base/src/types/interaction/mod.rs b/framework/base/src/types/interaction/mod.rs
index 1378a9ff94..5c0e54dfeb 100644
--- a/framework/base/src/types/interaction/mod.rs
+++ b/framework/base/src/types/interaction/mod.rs
@@ -33,12 +33,12 @@ mod tx_env_sc;
 mod tx_from;
 mod tx_gas;
 mod tx_payment;
+mod tx_proxy;
 mod tx_result_handler;
 mod tx_rh_list;
 mod tx_rh_original_result;
 mod tx_to;
 mod typed_function_call;
-mod tx_proxy;
 
 pub use annotated::*;
 pub use async_call::AsyncCall;
@@ -71,11 +71,11 @@ pub use tx_env_sc::*;
 pub use tx_from::*;
 pub use tx_gas::*;
 pub use tx_payment::*;
+pub use tx_proxy::*;
 pub use tx_result_handler::*;
 pub use tx_rh_list::*;
 pub use tx_rh_original_result::*;
 pub use tx_to::*;
 pub use typed_function_call::*;
-pub use tx_proxy::*;
 
 pub type TxScBase<Api> = TxBaseWithEnv<TxScEnv<Api>>;
diff --git a/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_main.rs b/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_main.rs
index 7c6aa7e0bf..79776bedc2 100644
--- a/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_main.rs
+++ b/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_main.rs
@@ -9,8 +9,7 @@ use super::{
     proxy_crate_gen::create_file,
     proxy_sc_functions_gen::write_content,
     proxy_template_gen::{
-        write_impl_for_tx_proxy, write_imports, write_struct_template,
-        write_tx_proxy_method_header,
+        write_impl_for_tx_proxy, write_imports, write_struct_template, write_tx_proxy_method_header,
     },
 };
 

From f471c1a62e518f8c87c7fe4fd65e58529ce0bc67 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Mon, 4 Mar 2024 22:28:38 +0100
Subject: [PATCH 0389/1254] unified syntax - annotation cleanup

---
 .../base/src/types/interaction/expr_sc.rs     |  7 +++++
 .../base/src/types/interaction/tx_env.rs      |  8 ------
 .../base/src/types/interaction/tx_env_sc.rs   | 12 --------
 .../src/facade/world_tx/scenario_env.rs       | 16 -----------
 .../src/facade/world_tx/scenario_tx.rs        | 28 +++++++++++++++----
 5 files changed, 29 insertions(+), 42 deletions(-)

diff --git a/framework/base/src/types/interaction/expr_sc.rs b/framework/base/src/types/interaction/expr_sc.rs
index cf1fa47914..e7a403c76f 100644
--- a/framework/base/src/types/interaction/expr_sc.rs
+++ b/framework/base/src/types/interaction/expr_sc.rs
@@ -5,6 +5,8 @@ use crate::types::{ManagedAddress, ManagedBuffer};
 use super::{AnnotatedValue, TxEnv, TxFrom, TxFromSpecified, TxTo, TxToSpecified};
 
 const SC_PREFIX: &str = "sc:";
+const VM_TYPE_LEN: usize = 2;
+const DEFAULT_VM_TYPE: &[u8] = &[5, 0];
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
 pub struct ScExpr<'a>(pub &'a str);
@@ -52,6 +54,11 @@ impl<'a> ScExpr<'a> {
             len = 22;
         }
         unsafe {
+            ptr::copy_nonoverlapping(
+                DEFAULT_VM_TYPE.as_ptr(),
+                result.as_ptr().offset(8) as *mut u8,
+                VM_TYPE_LEN,
+            );
             ptr::copy_nonoverlapping(
                 expr_bytes.as_ptr(),
                 result.as_ptr().offset(10) as *mut u8,
diff --git a/framework/base/src/types/interaction/tx_env.rs b/framework/base/src/types/interaction/tx_env.rs
index fd47db3287..2072c1d88d 100644
--- a/framework/base/src/types/interaction/tx_env.rs
+++ b/framework/base/src/types/interaction/tx_env.rs
@@ -5,14 +5,6 @@ use super::AnnotatedValue;
 pub trait TxEnv: Sized {
     type Api: CallTypeApi;
 
-    fn annotate_from<From>(&mut self, from: &From)
-    where
-        From: AnnotatedValue<Self, ManagedAddress<Self::Api>>;
-
-    fn annotate_to<To>(&mut self, to: &To)
-    where
-        To: AnnotatedValue<Self, ManagedAddress<Self::Api>>;
-
     fn resolve_sender_address(&self) -> ManagedAddress<Self::Api>;
 
     fn default_gas(&self) -> u64;
diff --git a/framework/base/src/types/interaction/tx_env_sc.rs b/framework/base/src/types/interaction/tx_env_sc.rs
index 0fa61eb44a..cddc6c052b 100644
--- a/framework/base/src/types/interaction/tx_env_sc.rs
+++ b/framework/base/src/types/interaction/tx_env_sc.rs
@@ -43,18 +43,6 @@ where
 {
     type Api = Api;
 
-    fn annotate_from<From>(&mut self, _from: &From)
-    where
-        From: AnnotatedValue<Self, ManagedAddress<Api>>,
-    {
-    }
-
-    fn annotate_to<To>(&mut self, _to: &To)
-    where
-        To: AnnotatedValue<Self, ManagedAddress<Api>>,
-    {
-    }
-
     fn resolve_sender_address(&self) -> ManagedAddress<Api> {
         BlockchainWrapper::<Api>::new().get_sc_address()
     }
diff --git a/framework/scenario/src/facade/world_tx/scenario_env.rs b/framework/scenario/src/facade/world_tx/scenario_env.rs
index 16e92e2ee1..6e8a8ef8b4 100644
--- a/framework/scenario/src/facade/world_tx/scenario_env.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_env.rs
@@ -9,28 +9,12 @@ pub type TxScenarioBase = TxBaseWithEnv<ScenarioTxEnvironment>;
 #[derive(Default, Debug, Clone)]
 pub struct ScenarioTxEnvironment {
     pub context_path: PathBuf,
-    pub from_annotation: Option<String>,
-    pub to_annotation: Option<String>,
     pub response: Option<TxResponse>,
 }
 
 impl TxEnv for ScenarioTxEnvironment {
     type Api = StaticApi;
 
-    fn annotate_from<From>(&mut self, to: &From)
-    where
-        From: AnnotatedValue<ScenarioTxEnvironment, ManagedAddress<StaticApi>>,
-    {
-        self.from_annotation = Some(to.annotation(self).to_string())
-    }
-
-    fn annotate_to<To>(&mut self, to: &To)
-    where
-        To: AnnotatedValue<ScenarioTxEnvironment, ManagedAddress<StaticApi>>,
-    {
-        self.to_annotation = Some(to.annotation(self).to_string())
-    }
-
     fn resolve_sender_address(&self) -> ManagedAddress<Self::Api> {
         panic!("Explicit sender address expected")
     }
diff --git a/framework/scenario/src/facade/world_tx/scenario_tx.rs b/framework/scenario/src/facade/world_tx/scenario_tx.rs
index 403116c825..e2c54477b3 100644
--- a/framework/scenario/src/facade/world_tx/scenario_tx.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_tx.rs
@@ -1,11 +1,17 @@
+use multiversx_chain_scenario_format::serde_raw::ValueSubTree;
 use multiversx_sc::{
     tuple_util::NestedTupleFlatten,
     types::{
-        FunctionCall, RHListSync, Tx, TxEnv, TxFromSpecified, TxGas, TxPayment, TxToSpecified,
+        AnnotatedValue, FunctionCall, ManagedAddress, RHListSync, Tx, TxEnv, TxFromSpecified,
+        TxGas, TxPayment, TxToSpecified,
     },
 };
 
-use crate::{api::StaticApi, scenario_model::ScCallStep, ScenarioWorld};
+use crate::{
+    api::StaticApi,
+    scenario_model::{AddressValue, ScCallStep},
+    ScenarioWorld,
+};
 
 use super::{RHListScenario, ScenarioTxEnvironment, TxScenarioBase};
 
@@ -44,6 +50,18 @@ pub trait ScenarioTx {
     fn run_as_scenario_step(self, world: &mut ScenarioWorld) -> Self::Returns;
 }
 
+fn address_annotated<Env, Addr>(env: &Env, from: Addr) -> AddressValue
+where
+    Env: TxEnv,
+    Addr: AnnotatedValue<Env, ManagedAddress<Env::Api>>,
+{
+    let annotation = from.annotation(env).to_string();
+    AddressValue {
+        value: from.into_value().to_address(),
+        original: ValueSubTree::Str(annotation),
+    }
+}
+
 impl<From, To, Payment, Gas, RH> ScenarioTx
     for Tx<ScenarioTxEnvironment, From, To, Payment, Gas, FunctionCall<StaticApi>, RH>
 where
@@ -58,11 +76,9 @@ where
 
     fn run_as_scenario_step(self, world: &mut ScenarioWorld) -> Self::Returns {
         let mut env = self.env;
-        env.annotate_from(&self.from);
-        env.annotate_to(&self.to);
         let mut step = ScCallStep::new()
-            .from(env.from_annotation.as_ref().unwrap().as_str())
-            .to(env.to_annotation.as_ref().unwrap().as_str())
+            .from(address_annotated(&env, self.from))
+            .to(address_annotated(&env, self.to))
             .function(self.data.function_name.to_string().as_str());
         for arg in self.data.arg_buffer.iter_buffers() {
             step = step.argument(arg.to_vec());

From 48fb06167ff949044b12a1d92cf43b5234344294 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Tue, 5 Mar 2024 10:47:04 +0100
Subject: [PATCH 0390/1254] writing full panic for now, research ongoing

---
 framework/wasm-adapter/src/panic.rs | 34 +++++++++++++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)

diff --git a/framework/wasm-adapter/src/panic.rs b/framework/wasm-adapter/src/panic.rs
index 8417e9ce88..1c51d8ca86 100644
--- a/framework/wasm-adapter/src/panic.rs
+++ b/framework/wasm-adapter/src/panic.rs
@@ -2,7 +2,7 @@ use crate::api::VmApiImpl;
 pub use alloc::alloc::Layout;
 use multiversx_sc::{
     api::{ErrorApi, ErrorApiImpl},
-    types::{ManagedBuffer, ManagedType},
+    types::{ManagedBuffer, ManagedRef, ManagedType},
 };
 
 /// Also used in wasm crate macros.
@@ -20,9 +20,31 @@ pub fn panic_fmt_with_message(panic_info: &PanicInfo) -> ! {
     let mut panic_msg = ManagedPanicMessage::default();
     panic_msg.append_str("panic occurred: ");
 
-    let _ = core::fmt::write(&mut panic_msg, format_args!("{:?}", panic_info.payload()))
+    // downcasting the payload (default panic behavior in std) doesn't work in this scenario
+    // the payload is always a dummy value
+    // panic runtime is irrelevant for no_std applications
+    // let payload = if let Some(payload) = panic_info.payload().downcast_ref::<&'static str>() {
+    //     *payload
+    // } else {
+    //     "unknown panic occurred"
+    // };
+    // panic_msg.append_str(payload);
+
+    // write full panic
+    core::fmt::write(&mut panic_msg, format_args!("{:?}", panic_info))
         .expect("Failed to write panic payload");
 
+    // take str
+    // let str = format_args!("{:?}", panic_info).as_str();
+
+    // extract message
+    // let message = extract_panic_message(full_panic_str);
+
+    // overwrite buf
+    // match message {
+    //     Some(val) => panic_msg.overwrite(val.as_bytes()),
+    //     None => panic_msg.overwrite(b"unknown panic"),
+    // }
     VmApiImpl::error_api_impl().signal_error_from_buffer(panic_msg.buffer.get_handle())
 }
 
@@ -35,6 +57,14 @@ impl ManagedPanicMessage {
     fn append_str(&mut self, s: &str) {
         self.buffer.append_bytes(s.as_bytes());
     }
+
+    fn _overwrite(&mut self, s: &str) {
+        self.buffer.overwrite(s.as_bytes());
+    }
+
+    fn _buffer(&self) -> ManagedRef<VmApiImpl, ManagedBuffer<VmApiImpl>> {
+        self.buffer.as_ref()
+    }
 }
 
 impl core::fmt::Write for ManagedPanicMessage {

From e0591abd78ce2dc5a91dc18d41292300c36729e5 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Wed, 6 Mar 2024 15:36:16 +0200
Subject: [PATCH 0391/1254] proxy for constructor

---
 .../adder/proxies_struct_interactor_main.rs   | 133 ++++++++----------
 .../contract/generate_proxy/proxy_gen_main.rs |   6 +-
 .../generate_proxy/proxy_sc_functions_gen.rs  | 119 ++++++++++++----
 .../generate_proxy/proxy_template_gen.rs      |  41 ++++--
 4 files changed, 189 insertions(+), 110 deletions(-)

diff --git a/contracts/examples/adder/proxies_struct_interactor_main.rs b/contracts/examples/adder/proxies_struct_interactor_main.rs
index d682df98c8..1f0d8d51cb 100644
--- a/contracts/examples/adder/proxies_struct_interactor_main.rs
+++ b/contracts/examples/adder/proxies_struct_interactor_main.rs
@@ -1,90 +1,73 @@
+////////////////////////////////////////////////////
+////////////////// AUTO-GENERATED //////////////////
+////////////////////////////////////////////////////
+
+#![allow(clippy::all)]
+
+use multiversx_sc::api::VMApi;
+
 multiversx_sc::imports!();
 
 pub struct TxProxy;
 
-impl<Env> TxProxyTrait<Env> for TxProxy
+impl<Env, From, To, Gas> TxProxyTraitV2<Env, From, To, Gas> for TxProxy
 where
     Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
 {
-    type TxProxyMethods = TxProxyMethods<Env>;
+    type TxProxyMethods = TxProxyMethods<Env, From, To, Gas>;
 
-    fn env(self, env: Env) -> Self::TxProxyMethods {
-        TxProxyMethods { env }
+    fn prepare_methods(self, tx: Tx<Env, From, To, (), Gas, (), ()>) -> Self::TxProxyMethods {
+        TxProxyMethods { wrapped_tx: tx }
     }
 }
 
-impl<Env: TxEnv + multiversx_sc::api::CallTypeApi> TxProxyMethods<Env> {
-	pub fn init<
-		Arg0: multiversx_sc::codec::CodecInto<BigUint<Env>>,
-	>(
-		&mut self,
-		initial_value: Arg0,
-	) -> multiversx_sc::types::Tx<Env,
-        (),
-        (),
-        (),
-        (),
-        FunctionCall<<Env as multiversx_sc::types::TxEnv>::Api>,
-        (),
-    > {
-		Tx::new_with_env(self.env.clone())
-            .raw_call()
-            .function_name("init")
-			.argument(&initial_value)
-	}
-
-	pub fn sum(
-		&mut self,
-	) -> multiversx_sc::types::Tx<Env,
-        (),
-        (),
-        (),
-        (),
-        FunctionCall<<Env as multiversx_sc::types::TxEnv>::Api>,
-        (),
-    > {
-		Tx::new_with_env(self.env.clone())
-            .raw_call()
-            .function_name("getSum")
-	}
+pub struct TxProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    wrapped_tx: Tx<Env, From, To, (), Gas, (), ()>,
+}
 
-	pub fn upgrade<
-		Arg0: multiversx_sc::codec::CodecInto<BigUint<Env>>,
-	>(
-		&mut self,
-		initial_value: Arg0,
-	) -> multiversx_sc::types::Tx<Env,
-        (),
-        (),
-        (),
-        (),
-        FunctionCall<<Env as multiversx_sc::types::TxEnv>::Api>,
-        (),
-    > {
-		Tx::new_with_env(self.env.clone())
-            .raw_call()
-            .function_name("upgrade")
-			.argument(&initial_value)
-	}
+impl<Env, To, Gas> TxProxyMethods<Env, (), To, Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn init<Arg0: multiversx_sc::codec::CodecInto<BigUint<Env::Api>>>(
+        self,
+        initial_value: Arg0,
+    ) -> multiversx_sc::types::Tx<Env, (), To, (), Gas, DeployCall<Env, ()>, OriginalResultMarker<()>>
+    {
+        self.wrapped_tx
+            .raw_deploy()
+            .argument(&initial_value)
+            .original_result()
+    }
+}
+impl<Env, From, To, Gas> TxProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn sum(self) {}
 
-	//Add desired amount to the storage variable. 
-	pub fn add<
-		Arg0: multiversx_sc::codec::CodecInto<BigUint<Env>>,
-	>(
-		&mut self,
-		value: Arg0,
-	) -> multiversx_sc::types::Tx<Env,
-        (),
-        (),
-        (),
-        (),
-        FunctionCall<<Env as multiversx_sc::types::TxEnv>::Api>,
-        (),
-    > {
-		Tx::new_with_env(self.env.clone())
-            .raw_call()
-            .function_name("add")
-			.argument(&value)
-	}
+    pub fn upgrade<Arg0: multiversx_sc::codec::CodecInto<BigUint<Env::Api>>>(
+        self,
+        initial_value: Arg0,
+    ) {
+    }
 
+    //Add desired amount to the storage variable.
+    pub fn add<Arg0: multiversx_sc::codec::CodecInto<BigUint<Env::Api>>>(self, value: Arg0) {}
 }
diff --git a/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_main.rs b/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_main.rs
index 79776bedc2..e1b7745e31 100644
--- a/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_main.rs
+++ b/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_main.rs
@@ -9,7 +9,7 @@ use super::{
     proxy_crate_gen::create_file,
     proxy_sc_functions_gen::write_content,
     proxy_template_gen::{
-        write_impl_for_tx_proxy, write_imports, write_struct_template, write_tx_proxy_method_header,
+        write_header, write_impl_for_tx_proxy, write_struct_template, write_struct_tx_proxy_methods,
     },
 };
 
@@ -23,9 +23,9 @@ impl MetaConfig {
 }
 
 fn write_proxies_to_file(mut file: File, abi: ContractAbi) {
-    write_imports(&mut file);
+    write_header(&mut file);
     write_struct_template(&mut file);
     write_impl_for_tx_proxy(&mut file);
-    write_tx_proxy_method_header(&mut file);
+    write_struct_tx_proxy_methods(&mut file);
     write_content(&mut file, abi);
 }
diff --git a/framework/meta/src/cmd/contract/generate_proxy/proxy_sc_functions_gen.rs b/framework/meta/src/cmd/contract/generate_proxy/proxy_sc_functions_gen.rs
index c818c27400..c16c6489c6 100644
--- a/framework/meta/src/cmd/contract/generate_proxy/proxy_sc_functions_gen.rs
+++ b/framework/meta/src/cmd/contract/generate_proxy/proxy_sc_functions_gen.rs
@@ -1,28 +1,59 @@
 use std::{fs::File, io::Write};
 
-use multiversx_sc::abi::{ContractAbi, EndpointAbi, InputAbi};
+use multiversx_sc::abi::{ContractAbi, EndpointAbi, InputAbi, OutputAbi};
 
 use crate::cmd::contract::generate_snippets::{
-    snippet_gen_common::write_newline,
-    snippet_type_map::{handle_abi_type, RustTypeString},
+    snippet_gen_common::write_newline, snippet_sc_functions_gen::map_output_types_to_rust_types, snippet_type_map::{handle_abi_type, RustTypeString}
 };
 
 pub(crate) fn write_content(file: &mut File, abi: ContractAbi) {
+    write_header_impl_constructors(file);
     for constructor_abi in abi.constructors {
-        write_endpoint(file, constructor_abi.clone());
-        write_function_content(file, constructor_abi);
+        write_constructor_header(file, constructor_abi.clone());
+        write_constructor_content(file, constructor_abi.inputs);
         write_end_of_function(file);
     }
+    writeln!(file, "}}").unwrap();
 
+    write_header_impl_endpoints(file);
     for endpoint_abi in abi.endpoints {
-        write_endpoint(file, endpoint_abi.clone());
-        write_function_content(file, endpoint_abi);
-        write_end_of_function(file);
+        write_endpoint_header(file, endpoint_abi.clone());
+        // write_function_content(file, endpoint_abi);
+        // write_end_of_function(file);
     }
 
     writeln!(file, "}}").unwrap();
 }
 
+fn write_header_impl_constructors(file: &mut File) {
+    writeln!(
+        file,
+        r#"impl<Env, To, Gas> TxProxyMethods<Env, (), To, Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{{"#
+    )
+    .unwrap();
+}
+
+fn write_header_impl_endpoints(file: &mut File) {
+    writeln!(
+        file,
+        r#"impl<Env, From, To, Gas> TxProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{{"#
+    )
+    .unwrap();
+}
+
 fn write_function_content(file: &mut File, end: EndpointAbi) {
     writeln!(
         file,
@@ -43,36 +74,74 @@ fn write_function_content(file: &mut File, end: EndpointAbi) {
     }
 }
 
-fn write_endpoint(file: &mut File, endpoint_abi: EndpointAbi) {
+fn write_constructor_content(file: &mut File, inputs: Vec<InputAbi>) {
+    writeln!(
+        file,
+        "\t\tself.wrapped_tx
+            .raw_deploy()"
+    )
+    .unwrap();
+
+    for input in inputs.iter() {
+        writeln!(
+            file,
+            "\t\t\t.argument(&{})",
+            input.arg_name // .argument(&arg0)"
+        )
+        .unwrap();
+    }
+
+    writeln!(file, "\t\t\t.original_result()").unwrap();
+}
+
+fn write_constructor_header(file: &mut File, contructor_abi: EndpointAbi) {
+    write_fn_signature(file, contructor_abi);
+    write_constructor_output(file);
+}
+
+fn write_endpoint_header(file: &mut File, contructor_abi: EndpointAbi) {
+    write_fn_signature(file, contructor_abi.clone());
+    write_endpoint_output(file, contructor_abi.outputs);
+}
+
+fn write_fn_signature(file: &mut File, endpoint_abi: EndpointAbi) {
     write_info_endpoint(file, endpoint_abi.docs);
     write_function_header_endpoint(file, endpoint_abi.rust_method_name);
     write_args(file, endpoint_abi.inputs.clone());
-    write_parameters_and_output(file, endpoint_abi.inputs);
+    write_parameters(file, endpoint_abi.inputs);
 }
 
-#[rustfmt::skip]
-fn write_parameters_and_output(file: &mut File, inputs: Vec<InputAbi>) {
+fn write_parameters(file: &mut File, inputs: Vec<InputAbi>) {
     writeln!(file, "(").unwrap();
-    writeln!(file, "\t\t&mut self,").unwrap();
+    writeln!(file, "\t\tself,").unwrap();
 
     for (index, input) in inputs.iter().enumerate() {
         writeln!(file, "\t\t{}: Arg{index},", &input.arg_name).unwrap();
     }
 
-    write!(
+    write!(file, "\t) ").unwrap();
+}
+
+fn write_constructor_output(file: &mut File) {
+    writeln!(
         file,
-        "\t) -> multiversx_sc::types::Tx<Env,
-        (),
-        (),
-        (),
-        (),
-        FunctionCall<<Env as multiversx_sc::types::TxEnv>::Api>,
-        (),
-    > {{\n"
+        "-> multiversx_sc::types::Tx<Env, (), To, (), Gas, DeployCall<Env, ()>, OriginalResultMarker<()>>\n\t{{"
     )
     .unwrap();
 }
 
+fn write_endpoint_output(file: &mut File, outputs: Vec<OutputAbi>) {
+    let output_type = map_output_types_to_rust_types(&outputs);
+
+    println!("->>> output_type{}", output_type);
+
+    let output_type_print = output_type.replace("<StaticApi>", "<Env::Api>");
+
+    println!("{}", output_type_print);
+    // write!(file, "{output_type_print}",).unwrap();
+    // writeln!(file, "> {{").unwrap();
+}
+
 fn write_function_header_endpoint(file: &mut File, rust_method_name: String) {
     write!(file, "\tpub fn {rust_method_name}").unwrap();
 }
@@ -104,9 +173,11 @@ fn write_args(file: &mut File, inputs: Vec<InputAbi>) {
 fn write_argument(file: &mut File, index: usize, type_name: String) {
     let mut type_string = RustTypeString::default();
     handle_abi_type(&mut type_string, type_name);
-    let type_string_str = type_string.get_type_name().to_string();
 
-    let type_print = type_string_str.replace("<StaticApi>", "<Env>");
+    let type_print = type_string
+        .get_type_name()
+        .to_string()
+        .replace("<StaticApi>", "<Env::Api>");
 
     writeln!(
         file,
diff --git a/framework/meta/src/cmd/contract/generate_proxy/proxy_template_gen.rs b/framework/meta/src/cmd/contract/generate_proxy/proxy_template_gen.rs
index 9742b54c59..7af38cd93a 100644
--- a/framework/meta/src/cmd/contract/generate_proxy/proxy_template_gen.rs
+++ b/framework/meta/src/cmd/contract/generate_proxy/proxy_template_gen.rs
@@ -2,8 +2,20 @@ use std::{fs::File, io::Write};
 
 use crate::cmd::contract::generate_snippets::snippet_gen_common::write_newline;
 
-pub(crate) fn write_imports(file: &mut File) {
-    writeln!(file, r#"multiversx_sc::imports!();"#).unwrap();
+const PREFIX_AUTO_GENERATED: &str = "////////////////////////////////////////////////////
+////////////////// AUTO-GENERATED //////////////////
+////////////////////////////////////////////////////
+";
+
+const IMPORTS: &str = "#![allow(clippy::all)]
+
+use multiversx_sc::api::VMApi;
+
+multiversx_sc::imports!();";
+
+pub(crate) fn write_header(file: &mut File) {
+    writeln!(file, "{PREFIX_AUTO_GENERATED}").unwrap();
+    writeln!(file, r#"{IMPORTS}"#).unwrap();
 
     write_newline(file);
 }
@@ -16,14 +28,17 @@ pub(crate) fn write_struct_template(file: &mut File) {
 pub(crate) fn write_impl_for_tx_proxy(file: &mut File) {
     writeln!(
         file,
-        r#"impl<Env> TxProxyTrait<Env> for TxProxy
+        r#"impl<Env, From, To, Gas> TxProxyTraitV2<Env, From, To, Gas> for TxProxy
 where
     Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
 {{
-    type TxProxyMethods = TxProxyMethods<Env>;
+    type TxProxyMethods = TxProxyMethods<Env, From, To, Gas>;
 
-    fn env(self, env: Env) -> Self::TxProxyMethods {{
-        TxProxyMethods {{ env }}
+    fn prepare_methods(self, tx: Tx<Env, From, To, (), Gas, (), ()>) -> Self::TxProxyMethods {{
+        TxProxyMethods {{ wrapped_tx: tx }}
     }}
 }}"#
     )
@@ -32,10 +47,20 @@ where
     write_newline(file);
 }
 
-pub(crate) fn write_tx_proxy_method_header(file: &mut File) {
+pub(crate) fn write_struct_tx_proxy_methods(file: &mut File) {
     writeln!(
         file,
-        r#"impl<Env: TxEnv + multiversx_sc::api::CallTypeApi> TxProxyMethods<Env> {{"#
+        r#"pub struct TxProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{{
+    wrapped_tx: Tx<Env, From, To, (), Gas, (), ()>,
+}}"#
     )
     .unwrap();
+
+    write_newline(file);
 }

From 0008cbccfd4623f349d91231d2902449fa79feb8 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 7 Mar 2024 02:55:38 +0200
Subject: [PATCH 0392/1254] refactor - expr module

---
 framework/base/src/types/interaction/expr.rs               | 5 +++++
 .../interaction/{expr_address.rs => expr/address_expr.rs}  | 4 +---
 .../src/types/interaction/{expr_sc.rs => expr/sc_expr.rs}  | 7 ++++---
 framework/base/src/types/interaction/mod.rs                | 6 ++----
 4 files changed, 12 insertions(+), 10 deletions(-)
 create mode 100644 framework/base/src/types/interaction/expr.rs
 rename framework/base/src/types/interaction/{expr_address.rs => expr/address_expr.rs} (95%)
 rename framework/base/src/types/interaction/{expr_sc.rs => expr/sc_expr.rs} (95%)

diff --git a/framework/base/src/types/interaction/expr.rs b/framework/base/src/types/interaction/expr.rs
new file mode 100644
index 0000000000..c43da390f9
--- /dev/null
+++ b/framework/base/src/types/interaction/expr.rs
@@ -0,0 +1,5 @@
+mod address_expr;
+mod sc_expr;
+
+pub use address_expr::AddressExpr;
+pub use sc_expr::ScExpr;
diff --git a/framework/base/src/types/interaction/expr_address.rs b/framework/base/src/types/interaction/expr/address_expr.rs
similarity index 95%
rename from framework/base/src/types/interaction/expr_address.rs
rename to framework/base/src/types/interaction/expr/address_expr.rs
index c450d49043..97c56d056c 100644
--- a/framework/base/src/types/interaction/expr_address.rs
+++ b/framework/base/src/types/interaction/expr/address_expr.rs
@@ -1,8 +1,6 @@
 use core::ptr;
 
-use crate::types::{ManagedAddress, ManagedBuffer};
-
-use super::{AnnotatedValue, TxEnv, TxFrom, TxFromSpecified};
+use crate::types::{AnnotatedValue, ManagedAddress, ManagedBuffer, TxEnv, TxFrom, TxFromSpecified};
 
 const ADDRESS_PREFIX: &str = "address:";
 
diff --git a/framework/base/src/types/interaction/expr_sc.rs b/framework/base/src/types/interaction/expr/sc_expr.rs
similarity index 95%
rename from framework/base/src/types/interaction/expr_sc.rs
rename to framework/base/src/types/interaction/expr/sc_expr.rs
index e7a403c76f..9529c39348 100644
--- a/framework/base/src/types/interaction/expr_sc.rs
+++ b/framework/base/src/types/interaction/expr/sc_expr.rs
@@ -1,8 +1,9 @@
 use core::ptr;
 
-use crate::types::{ManagedAddress, ManagedBuffer};
-
-use super::{AnnotatedValue, TxEnv, TxFrom, TxFromSpecified, TxTo, TxToSpecified};
+use crate::types::{
+    AnnotatedValue, ManagedAddress, ManagedBuffer, TxEnv, TxFrom, TxFromSpecified, TxTo,
+    TxToSpecified,
+};
 
 const SC_PREFIX: &str = "sc:";
 const VM_TYPE_LEN: usize = 2;
diff --git a/framework/base/src/types/interaction/mod.rs b/framework/base/src/types/interaction/mod.rs
index 5c0e54dfeb..4e3fcc42b4 100644
--- a/framework/base/src/types/interaction/mod.rs
+++ b/framework/base/src/types/interaction/mod.rs
@@ -16,8 +16,7 @@ mod contract_call_with_egld_or_single_esdt;
 mod contract_call_with_multi_esdt;
 mod contract_deploy;
 mod deploy_call;
-mod expr_address;
-mod expr_sc;
+mod expr;
 mod function_call;
 mod managed_arg_buffer;
 mod tx;
@@ -56,8 +55,7 @@ pub use contract_call_with_egld_or_single_esdt::ContractCallWithEgldOrSingleEsdt
 pub use contract_call_with_multi_esdt::ContractCallWithMultiEsdt;
 pub use contract_deploy::{new_contract_deploy, ContractDeploy};
 pub use deploy_call::*;
-pub use expr_address::AddressExpr;
-pub use expr_sc::ScExpr;
+pub use expr::*;
 pub use function_call::FunctionCall;
 pub use managed_arg_buffer::ManagedArgBuffer;
 pub use tx::*;

From 9fad0f831b679168f0353b7b2bbfc7543dc7cd2f Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 7 Mar 2024 04:05:59 +0200
Subject: [PATCH 0393/1254] refactor: AnnotatedValue

---
 .../base/src/types/interaction/annotated.rs   | 18 ++++----------
 .../types/interaction/expr/address_expr.rs    | 24 ++++++++++++-------
 .../src/types/interaction/expr/sc_expr.rs     | 19 ++++++++-------
 framework/base/src/types/interaction/tx.rs    |  2 +-
 .../base/src/types/interaction/tx_call_te.rs  |  2 +-
 framework/base/src/types/interaction/tx_to.rs | 22 +++++++++++++++--
 .../scenario/src/facade/contract_info.rs      |  8 ++-----
 7 files changed, 55 insertions(+), 40 deletions(-)

diff --git a/framework/base/src/types/interaction/annotated.rs b/framework/base/src/types/interaction/annotated.rs
index bf01d4a4f9..708551a9fd 100644
--- a/framework/base/src/types/interaction/annotated.rs
+++ b/framework/base/src/types/interaction/annotated.rs
@@ -6,11 +6,9 @@ pub trait AnnotatedValue<Env, T>
 where
     Env: TxEnv,
 {
-    fn annotation(&self, _env: &Env) -> ManagedBuffer<Env::Api>;
+    fn annotation(&self, env: &Env) -> ManagedBuffer<Env::Api>;
 
-    fn into_value(self) -> T;
-
-    fn with_value_ref<F: FnOnce(&T)>(&self, f: F);
+    fn into_value(self, env: &Env) -> T;
 }
 
 impl<Env> AnnotatedValue<Env, ManagedAddress<Env::Api>> for ManagedAddress<Env::Api>
@@ -21,13 +19,9 @@ where
         self.hex_expr()
     }
 
-    fn into_value(self) -> ManagedAddress<Env::Api> {
+    fn into_value(self, _env: &Env) -> ManagedAddress<Env::Api> {
         self
     }
-
-    fn with_value_ref<F: FnOnce(&ManagedAddress<Env::Api>)>(&self, f: F) {
-        f(self)
-    }
 }
 
 impl<Env> AnnotatedValue<Env, ManagedAddress<Env::Api>> for &ManagedAddress<Env::Api>
@@ -38,11 +32,7 @@ where
         self.hex_expr()
     }
 
-    fn into_value(self) -> ManagedAddress<Env::Api> {
+    fn into_value(self, _env: &Env) -> ManagedAddress<Env::Api> {
         self.clone()
     }
-
-    fn with_value_ref<F: FnOnce(&ManagedAddress<Env::Api>)>(&self, f: F) {
-        f(self)
-    }
 }
diff --git a/framework/base/src/types/interaction/expr/address_expr.rs b/framework/base/src/types/interaction/expr/address_expr.rs
index 97c56d056c..9e1fd943b6 100644
--- a/framework/base/src/types/interaction/expr/address_expr.rs
+++ b/framework/base/src/types/interaction/expr/address_expr.rs
@@ -1,6 +1,9 @@
 use core::ptr;
 
-use crate::types::{AnnotatedValue, ManagedAddress, ManagedBuffer, TxEnv, TxFrom, TxFromSpecified};
+use crate::types::{
+    AnnotatedValue, ManagedAddress, ManagedBuffer, TxEnv, TxFrom, TxFromSpecified, TxTo,
+    TxToSpecified,
+};
 
 const ADDRESS_PREFIX: &str = "address:";
 
@@ -17,16 +20,10 @@ where
         result
     }
 
-    fn into_value(self) -> ManagedAddress<Env::Api> {
+    fn into_value(self, _env: &Env) -> ManagedAddress<Env::Api> {
         let expr: [u8; 32] = self.eval_to_array();
         expr.into()
     }
-
-    fn with_value_ref<F: FnOnce(&ManagedAddress<Env::Api>)>(&self, f: F) {
-        let expr: [u8; 32] = self.eval_to_array();
-        let ma = expr.into();
-        f(&ma);
-    }
 }
 impl<Env> TxFrom<Env> for AddressExpr
 where
@@ -38,6 +35,17 @@ where
     }
 }
 impl<Env> TxFromSpecified<Env> for AddressExpr where Env: TxEnv {}
+impl<Env> TxTo<Env> for AddressExpr where Env: TxEnv {}
+impl<Env> TxToSpecified<Env> for AddressExpr
+where
+    Env: TxEnv,
+{
+    fn with_address_ref<F: FnOnce(&ManagedAddress<Env::Api>)>(&self, _env: &Env, f: F) {
+        let expr: [u8; 32] = self.eval_to_array();
+        let ma = expr.into();
+        f(&ma);
+    }
+}
 
 impl AddressExpr {
     pub const fn eval_to_array(&self) -> [u8; 32] {
diff --git a/framework/base/src/types/interaction/expr/sc_expr.rs b/framework/base/src/types/interaction/expr/sc_expr.rs
index 9529c39348..b3c444bfa0 100644
--- a/framework/base/src/types/interaction/expr/sc_expr.rs
+++ b/framework/base/src/types/interaction/expr/sc_expr.rs
@@ -22,16 +22,10 @@ where
         result
     }
 
-    fn into_value(self) -> ManagedAddress<Env::Api> {
+    fn into_value(self, _env: &Env) -> ManagedAddress<Env::Api> {
         let expr: [u8; 32] = self.eval_to_array();
         expr.into()
     }
-
-    fn with_value_ref<F: FnOnce(&ManagedAddress<Env::Api>)>(&self, f: F) {
-        let expr: [u8; 32] = self.eval_to_array();
-        let ma = expr.into();
-        f(&ma);
-    }
 }
 impl<'a, Env> TxFrom<Env> for ScExpr<'a>
 where
@@ -44,7 +38,16 @@ where
 }
 impl<'a, Env> TxFromSpecified<Env> for ScExpr<'a> where Env: TxEnv {}
 impl<'a, Env> TxTo<Env> for ScExpr<'a> where Env: TxEnv {}
-impl<'a, Env> TxToSpecified<Env> for ScExpr<'a> where Env: TxEnv {}
+impl<'a, Env> TxToSpecified<Env> for ScExpr<'a>
+where
+    Env: TxEnv,
+{
+    fn with_address_ref<F: FnOnce(&ManagedAddress<Env::Api>)>(&self, _env: &Env, f: F) {
+        let expr: [u8; 32] = self.eval_to_array();
+        let ma = expr.into();
+        f(&ma);
+    }
+}
 
 impl<'a> ScExpr<'a> {
     pub const fn eval_to_array(&self) -> [u8; 32] {
diff --git a/framework/base/src/types/interaction/tx.rs b/framework/base/src/types/interaction/tx.rs
index 5ccdb483c5..fc44e39245 100644
--- a/framework/base/src/types/interaction/tx.rs
+++ b/framework/base/src/types/interaction/tx.rs
@@ -582,7 +582,7 @@ where
         let result = self.payment.convert_tx_data(
             &self.env,
             &self.from,
-            self.to.into_value(),
+            self.to.into_value(&self.env),
             self.data.into(),
         );
         Tx {
diff --git a/framework/base/src/types/interaction/tx_call_te.rs b/framework/base/src/types/interaction/tx_call_te.rs
index 0f1157d570..b7a97a93d1 100644
--- a/framework/base/src/types/interaction/tx_call_te.rs
+++ b/framework/base/src/types/interaction/tx_call_te.rs
@@ -16,7 +16,7 @@ where
     RH: TxEmptyResultHandler<TxScEnv<Api>>,
 {
     fn transfer_execute_with_gas(self, gas_limit: u64) {
-        self.to.with_value_ref(|to| {
+        self.to.with_address_ref(&self.env, |to| {
             self.payment
                 .perform_transfer_execute(&self.env, to, gas_limit, self.data.into());
         });
diff --git a/framework/base/src/types/interaction/tx_to.rs b/framework/base/src/types/interaction/tx_to.rs
index bbf520c8ef..8c51fd2d33 100644
--- a/framework/base/src/types/interaction/tx_to.rs
+++ b/framework/base/src/types/interaction/tx_to.rs
@@ -14,10 +14,28 @@ pub trait TxToSpecified<Env>: TxTo<Env> + AnnotatedValue<Env, ManagedAddress<Env
 where
     Env: TxEnv,
 {
+    /// Avoids a clone when performing transfer-execute.
+    ///
+    /// Other than that, does thesame as `AnnotatedValue::into_value`.
+    fn with_address_ref<F: FnOnce(&ManagedAddress<Env::Api>)>(&self, env: &Env, f: F);
 }
 
 impl<Env> TxTo<Env> for ManagedAddress<Env::Api> where Env: TxEnv {}
-impl<Env> TxToSpecified<Env> for ManagedAddress<Env::Api> where Env: TxEnv {}
+impl<Env> TxToSpecified<Env> for ManagedAddress<Env::Api>
+where
+    Env: TxEnv,
+{
+    fn with_address_ref<F: FnOnce(&ManagedAddress<Env::Api>)>(&self, _env: &Env, f: F) {
+        f(&self)
+    }
+}
 
 impl<Env> TxTo<Env> for &ManagedAddress<Env::Api> where Env: TxEnv {}
-impl<Env> TxToSpecified<Env> for &ManagedAddress<Env::Api> where Env: TxEnv {}
+impl<Env> TxToSpecified<Env> for &ManagedAddress<Env::Api>
+where
+    Env: TxEnv,
+{
+    fn with_address_ref<F: FnOnce(&ManagedAddress<Env::Api>)>(&self, _env: &Env, f: F) {
+        f(self)
+    }
+}
diff --git a/framework/scenario/src/facade/contract_info.rs b/framework/scenario/src/facade/contract_info.rs
index 06e99b6461..ba2766d3e4 100644
--- a/framework/scenario/src/facade/contract_info.rs
+++ b/framework/scenario/src/facade/contract_info.rs
@@ -117,15 +117,11 @@ where
         self.scenario_address_expr.original.as_str().into()
     }
 
-    fn into_value(self) -> ManagedAddress<Env::Api> {
+    fn into_value(self, _env: &Env) -> ManagedAddress<Env::Api> {
         (&self.scenario_address_expr.value).into()
     }
-
-    fn with_value_ref<F: FnOnce(&ManagedAddress<Env::Api>)>(&self, f: F) {
-        let ma: ManagedAddress<Env::Api> = (&self.scenario_address_expr.value).into();
-        f(&ma);
-    }
 }
+
 impl<P, Env> TxFrom<Env> for &ContractInfo<P>
 where
     Env: TxEnv,

From 4eec1215bff3d57a867c99404382319b74fd7e9a Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 7 Mar 2024 04:14:07 +0200
Subject: [PATCH 0394/1254] test fix

---
 framework/base/src/types/interaction/expr/sc_expr.rs  | 6 +++---
 framework/scenario/src/facade/contract_info.rs        | 4 ++++
 framework/scenario/src/facade/world_tx/scenario_tx.rs | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/framework/base/src/types/interaction/expr/sc_expr.rs b/framework/base/src/types/interaction/expr/sc_expr.rs
index b3c444bfa0..4d05f8bab1 100644
--- a/framework/base/src/types/interaction/expr/sc_expr.rs
+++ b/framework/base/src/types/interaction/expr/sc_expr.rs
@@ -85,15 +85,15 @@ pub mod tests {
     fn test_address_value() {
         assert_eq_eval(
             "",
-            b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00______________________",
+            b"\x00\x00\x00\x00\x00\x00\x00\x00\x05\x00______________________",
         );
         assert_eq_eval(
             "a",
-            b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00a_____________________",
+            b"\x00\x00\x00\x00\x00\x00\x00\x00\x05\x00a_____________________",
         );
         assert_eq_eval(
             "12345678901234567890120s",
-            b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x001234567890123456789012",
+            b"\x00\x00\x00\x00\x00\x00\x00\x00\x05\x001234567890123456789012",
         );
     }
 }
diff --git a/framework/scenario/src/facade/contract_info.rs b/framework/scenario/src/facade/contract_info.rs
index ba2766d3e4..9f88ad9a8b 100644
--- a/framework/scenario/src/facade/contract_info.rs
+++ b/framework/scenario/src/facade/contract_info.rs
@@ -148,4 +148,8 @@ where
     Env: TxEnv,
     P: ProxyObjNew,
 {
+    fn with_address_ref<F: FnOnce(&ManagedAddress<Env::Api>)>(&self, _env: &Env, f: F) {
+        let ma: ManagedAddress<Env::Api> = (&self.scenario_address_expr.value).into();
+        f(&ma);
+    }
 }
diff --git a/framework/scenario/src/facade/world_tx/scenario_tx.rs b/framework/scenario/src/facade/world_tx/scenario_tx.rs
index e2c54477b3..489d0c88a8 100644
--- a/framework/scenario/src/facade/world_tx/scenario_tx.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_tx.rs
@@ -57,7 +57,7 @@ where
 {
     let annotation = from.annotation(env).to_string();
     AddressValue {
-        value: from.into_value().to_address(),
+        value: from.into_value(env).to_address(),
         original: ValueSubTree::Str(annotation),
     }
 }

From 8838ded6f224eaa103bbccccd73a6f9ff6dd8f48 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 7 Mar 2024 10:41:18 +0200
Subject: [PATCH 0395/1254] unified syntax - blackbox init

---
 contracts/examples/adder/src/temp_proxy_v2.rs | 15 +++--
 .../tests/adder_blackbox_with_values_test.rs  | 21 ++++---
 .../base/src/types/interaction/annotated.rs   | 13 +++++
 framework/base/src/types/interaction/mod.rs   |  1 +
 framework/base/src/types/interaction/tx.rs    | 38 +++++++-----
 .../src/types/interaction/tx_call_deploy.rs   | 24 ++++----
 .../src/types/interaction/tx_code_source.rs   | 26 +++++----
 .../base/src/types/interaction/tx_env.rs      |  5 +-
 .../base/src/types/interaction/tx_rh_list.rs  |  2 +
 .../tx_rh_list/with_result_new_address.rs     | 52 +++++++++++++++++
 .../src/types/managed/basic/managed_buffer.rs | 13 ++++-
 .../types/managed/wrapped/managed_address.rs  |  8 +--
 framework/scenario/src/facade/world_tx.rs     |  2 +
 .../scenario/src/facade/world_tx/expr.rs      |  5 ++
 .../src/facade/world_tx/expr/file_expr.rs     | 31 ++++++++++
 .../src/facade/world_tx/expr/mxsc_expr.rs     | 35 +++++++++++
 .../facade/world_tx/scenario_rh_list_item.rs  | 21 ++++++-
 .../src/facade/world_tx/scenario_tx.rs        | 58 +++++++++++++++++--
 18 files changed, 303 insertions(+), 67 deletions(-)
 create mode 100644 framework/base/src/types/interaction/tx_rh_list/with_result_new_address.rs
 create mode 100644 framework/scenario/src/facade/world_tx/expr.rs
 create mode 100644 framework/scenario/src/facade/world_tx/expr/file_expr.rs
 create mode 100644 framework/scenario/src/facade/world_tx/expr/mxsc_expr.rs

diff --git a/contracts/examples/adder/src/temp_proxy_v2.rs b/contracts/examples/adder/src/temp_proxy_v2.rs
index fb6f8cd50e..206d420e4f 100644
--- a/contracts/examples/adder/src/temp_proxy_v2.rs
+++ b/contracts/examples/adder/src/temp_proxy_v2.rs
@@ -30,18 +30,25 @@ where
     wrapped_tx: Tx<Env, From, To, (), Gas, (), ()>,
 }
 
-impl<Env, To, Gas> TxProxyMethods<Env, (), To, Gas>
+impl<Env, From, Gas> TxProxyMethods<Env, From, (), Gas>
 where
     Env: TxEnv,
     Env::Api: VMApi,
-    To: TxTo<Env>,
+    From: TxFrom<Env>,
     Gas: TxGas<Env>,
 {
     pub fn init<Arg0: multiversx_sc::codec::CodecInto<BigUint<Env::Api>>>(
         self,
         initial_value: Arg0,
-    ) -> multiversx_sc::types::Tx<Env, (), To, (), Gas, DeployCall<Env, ()>, OriginalResultMarker<()>>
-    {
+    ) -> multiversx_sc::types::Tx<
+        Env,
+        From,
+        (),
+        (),
+        Gas,
+        DeployCall<Env, ()>,
+        OriginalResultMarker<()>,
+    > {
         self.wrapped_tx
             .raw_deploy()
             .argument(&initial_value)
diff --git a/contracts/examples/adder/tests/adder_blackbox_with_values_test.rs b/contracts/examples/adder/tests/adder_blackbox_with_values_test.rs
index c097f1fcd6..0ef6f023cb 100644
--- a/contracts/examples/adder/tests/adder_blackbox_with_values_test.rs
+++ b/contracts/examples/adder/tests/adder_blackbox_with_values_test.rs
@@ -1,7 +1,7 @@
 use adder::*;
 use multiversx_sc::{
     storage::mappers::SingleValue,
-    types::{AddressExpr, ScExpr},
+    types::{AddressExpr, ScExpr, WithResultNewAddress},
 };
 use multiversx_sc_scenario::{api::StaticApi, num_bigint::BigUint, scenario_model::*, *};
 
@@ -20,7 +20,6 @@ fn adder_blackbox_with_values() {
     let mut world = world();
     let owner_address = "address:owner";
     let mut adder_contract = ContractInfo::<adder::Proxy<StaticApi>>::new("sc:adder");
-    let adder_code = world.code_expression(ADDER_PATH_EXPR);
 
     world
         .start_trace()
@@ -29,15 +28,15 @@ fn adder_blackbox_with_values() {
                 .put_account(owner_address, Account::new().nonce(1))
                 .new_address(owner_address, 1, "sc:adder"),
         )
-        .sc_deploy_use_result(
-            ScDeployStep::new()
-                .from(owner_address)
-                .code(adder_code)
-                .call(adder_contract.init(5u32)),
-            |new_address, _: TypedResponse<()>| {
-                assert_eq!(new_address, adder_contract.to_address());
-            },
-        )
+        .tx(|tx| {
+            tx.from(AddressExpr("owner"))
+                .typed_v2(temp_proxy_v2::TxProxy)
+                .init(5u32)
+                .code(MxscExpr("output/adder.mxsc.json"))
+                .with_result(WithResultNewAddress::new(|new_address| {
+                    assert_eq!(new_address.to_address(), adder_contract.to_address());
+                }))
+        })
         .sc_query(
             ScQueryStep::new()
                 .to(&adder_contract)
diff --git a/framework/base/src/types/interaction/annotated.rs b/framework/base/src/types/interaction/annotated.rs
index 708551a9fd..878cdb5e1f 100644
--- a/framework/base/src/types/interaction/annotated.rs
+++ b/framework/base/src/types/interaction/annotated.rs
@@ -36,3 +36,16 @@ where
         self.clone()
     }
 }
+
+impl<Env> AnnotatedValue<Env, ManagedBuffer<Env::Api>> for ManagedBuffer<Env::Api>
+where
+    Env: TxEnv,
+{
+    fn annotation(&self, _env: &Env) -> crate::types::ManagedBuffer<Env::Api> {
+        self.hex_expr()
+    }
+
+    fn into_value(self, _env: &Env) -> ManagedBuffer<Env::Api> {
+        self
+    }
+}
diff --git a/framework/base/src/types/interaction/mod.rs b/framework/base/src/types/interaction/mod.rs
index 4e3fcc42b4..7b751e162b 100644
--- a/framework/base/src/types/interaction/mod.rs
+++ b/framework/base/src/types/interaction/mod.rs
@@ -61,6 +61,7 @@ pub use managed_arg_buffer::ManagedArgBuffer;
 pub use tx::*;
 pub use tx_call_async::*;
 pub use tx_call_async_promises::*;
+pub use tx_call_deploy::*;
 pub use tx_call_sync::*;
 pub use tx_code_source::*;
 pub use tx_data::*;
diff --git a/framework/base/src/types/interaction/tx.rs b/framework/base/src/types/interaction/tx.rs
index fc44e39245..9435f5e11e 100644
--- a/framework/base/src/types/interaction/tx.rs
+++ b/framework/base/src/types/interaction/tx.rs
@@ -10,12 +10,12 @@ use alloc::boxed::Box;
 use multiversx_sc_codec::TopEncodeMulti;
 
 use super::{
-    contract_call_exec::UNSPECIFIED_GAS_LIMIT, contract_call_trait::ContractCallBase, AsyncCall,
-    Code, ContractCallNoPayment, ContractCallWithEgld, ContractDeploy, DeployCall, ExplicitGas,
-    FromSource, FunctionCall, ManagedArgBuffer, OriginalResultMarker, RHList, RHListAppendNoRet,
-    RHListAppendRet, RHListItem, TxCodeSource, TxData, TxDataFunctionCall, TxEnv, TxFrom,
-    TxFromSpecified, TxGas, TxPayment, TxPaymentEgldOnly, TxProxyTrait, TxProxyTraitV2,
-    TxResultHandler, TxScEnv, TxTo, TxToSpecified,
+    contract_call_exec::UNSPECIFIED_GAS_LIMIT, contract_call_trait::ContractCallBase,
+    AnnotatedValue, AsyncCall, Code, ContractCallNoPayment, ContractCallWithEgld, ContractDeploy,
+    DeployCall, ExplicitGas, FromSource, FunctionCall, ManagedArgBuffer, OriginalResultMarker,
+    RHList, RHListAppendNoRet, RHListAppendRet, RHListItem, TxCodeSource, TxCodeValue, TxData,
+    TxDataFunctionCall, TxEnv, TxFrom, TxFromSpecified, TxGas, TxPayment, TxPaymentEgldOnly,
+    TxProxyTrait, TxProxyTraitV2, TxResultHandler, TxScEnv, TxTo, TxToSpecified,
 };
 
 #[must_use]
@@ -630,15 +630,16 @@ where
     }
 }
 
-impl<Env, To, Payment, Gas, RH> Tx<Env, (), To, Payment, Gas, (), RH>
+impl<Env, From, To, Payment, Gas, RH> Tx<Env, From, To, Payment, Gas, (), RH>
 where
     Env: TxEnv,
+    From: TxFrom<Env>,
     To: TxTo<Env>,
     Payment: TxPaymentEgldOnly<Env>,
     Gas: TxGas<Env>,
     RH: TxResultHandler<Env>,
 {
-    pub fn raw_deploy(self) -> Tx<Env, (), To, Payment, Gas, DeployCall<Env, ()>, RH> {
+    pub fn raw_deploy(self) -> Tx<Env, From, To, Payment, Gas, DeployCall<Env, ()>, RH> {
         Tx {
             env: self.env,
             from: self.from,
@@ -651,25 +652,29 @@ where
     }
 }
 
-impl<Env, To, Payment, Gas, RH> Tx<Env, (), To, Payment, Gas, DeployCall<Env, ()>, RH>
+impl<Env, From, To, Payment, Gas, RH> Tx<Env, From, To, Payment, Gas, DeployCall<Env, ()>, RH>
 where
     Env: TxEnv,
+    From: TxFrom<Env>,
     To: TxTo<Env>,
     Payment: TxPaymentEgldOnly<Env>,
     Gas: TxGas<Env>,
     RH: TxResultHandler<Env>,
 {
-    pub fn code(
+    pub fn code<CodeValue>(
         mut self,
-        code: ManagedBuffer<Env::Api>,
-    ) -> Tx<Env, (), To, Payment, Gas, DeployCall<Env, Code<Env>>, RH> {
+        code: CodeValue,
+    ) -> Tx<Env, From, To, Payment, Gas, DeployCall<Env, Code<CodeValue>>, RH>
+    where
+        CodeValue: TxCodeValue<Env>,
+    {
         Tx {
             env: self.env,
             from: self.from,
             to: self.to,
             payment: self.payment,
             gas: self.gas,
-            data: self.data.code_source(Code::new(code)),
+            data: self.data.code_source(Code(code)),
             result_handler: self.result_handler,
         }
     }
@@ -677,7 +682,7 @@ where
     pub fn from_source(
         mut self,
         source_address: ManagedAddress<Env::Api>,
-    ) -> Tx<Env, (), To, Payment, Gas, DeployCall<Env, FromSource<Env>>, RH> {
+    ) -> Tx<Env, From, To, Payment, Gas, DeployCall<Env, FromSource<Env>>, RH> {
         Tx {
             env: self.env,
             from: self.from,
@@ -690,10 +695,11 @@ where
     }
 }
 
-impl<Env, To, Payment, Gas, CodeSource, RH>
-    Tx<Env, (), To, Payment, Gas, DeployCall<Env, CodeSource>, RH>
+impl<Env, From, To, Payment, Gas, CodeSource, RH>
+    Tx<Env, From, To, Payment, Gas, DeployCall<Env, CodeSource>, RH>
 where
     Env: TxEnv,
+    From: TxFrom<Env>,
     To: TxTo<Env>,
     Payment: TxPaymentEgldOnly<Env>,
     Gas: TxGas<Env>,
diff --git a/framework/base/src/types/interaction/tx_call_deploy.rs b/framework/base/src/types/interaction/tx_call_deploy.rs
index 0fc3563980..6b1f670e7b 100644
--- a/framework/base/src/types/interaction/tx_call_deploy.rs
+++ b/framework/base/src/types/interaction/tx_call_deploy.rs
@@ -9,8 +9,9 @@ use crate::{
 
 use super::{
     contract_call_exec::decode_result, Code, ConsNoRet, ConsRet, DeployCall, FromSource,
-    OriginalResultMarker, RHList, RHListItem, Tx, TxDataFunctionCall, TxEmptyResultHandler, TxEnv,
-    TxGas, TxPayment, TxPaymentEgldOnly, TxResultHandler, TxScEnv, TxToSpecified,
+    OriginalResultMarker, RHList, RHListItem, Tx, TxCodeValue, TxDataFunctionCall,
+    TxEmptyResultHandler, TxEnv, TxGas, TxPayment, TxPaymentEgldOnly, TxResultHandler, TxScEnv,
+    TxToSpecified,
 };
 
 pub trait RHListItemDeploy<Env, Original>: RHListItem<Env, Original>
@@ -92,12 +93,13 @@ where
     }
 }
 
-impl<Api, Payment, Gas, RH>
-    Tx<TxScEnv<Api>, (), (), Payment, Gas, DeployCall<TxScEnv<Api>, Code<TxScEnv<Api>>>, RH>
+impl<Api, Payment, Gas, CodeValue, RH>
+    Tx<TxScEnv<Api>, (), (), Payment, Gas, DeployCall<TxScEnv<Api>, Code<CodeValue>>, RH>
 where
     Api: CallTypeApi,
     Payment: TxPaymentEgldOnly<TxScEnv<Api>>,
     Gas: TxGas<TxScEnv<Api>>,
+    CodeValue: TxCodeValue<TxScEnv<Api>>,
     RH: TxResultHandler<TxScEnv<Api>>,
 {
     fn execute_deploy_raw(self) -> (ManagedAddress<Api>, ManagedVec<Api, ManagedBuffer<Api>>, RH) {
@@ -107,7 +109,7 @@ where
         let (new_address, raw_results) = SendRawWrapper::<Api>::new().deploy_contract(
             gas_limit,
             &egld_payment.value,
-            &self.data.code_source.code,
+            &self.data.code_source.0.into_value(&self.env),
             self.data.code_metadata,
             &self.data.arg_buffer,
         );
@@ -146,12 +148,13 @@ where
     }
 }
 
-impl<Api, Payment, Gas, RH>
-    Tx<TxScEnv<Api>, (), (), Payment, Gas, DeployCall<TxScEnv<Api>, Code<TxScEnv<Api>>>, RH>
+impl<Api, Payment, Gas, CodeValue, RH>
+    Tx<TxScEnv<Api>, (), (), Payment, Gas, DeployCall<TxScEnv<Api>, Code<CodeValue>>, RH>
 where
     Api: CallTypeApi,
     Payment: TxPaymentEgldOnly<TxScEnv<Api>>,
     Gas: TxGas<TxScEnv<Api>>,
+    CodeValue: TxCodeValue<TxScEnv<Api>>,
     RH: RHListDeploy<TxScEnv<Api>>,
     RH::ListReturns: NestedTupleFlatten,
 {
@@ -182,20 +185,21 @@ where
     }
 }
 
-impl<Api, Payment, Gas, RH>
+impl<Api, Payment, Gas, CodeValue, RH>
     Tx<
         TxScEnv<Api>,
         (),
         ManagedAddress<Api>,
         Payment,
         Gas,
-        DeployCall<TxScEnv<Api>, Code<TxScEnv<Api>>>,
+        DeployCall<TxScEnv<Api>, Code<CodeValue>>,
         RH,
     >
 where
     Api: CallTypeApi,
     Payment: TxPaymentEgldOnly<TxScEnv<Api>>,
     Gas: TxGas<TxScEnv<Api>>,
+    CodeValue: TxCodeValue<TxScEnv<Api>>,
     RH: TxEmptyResultHandler<TxScEnv<Api>>,
 {
     pub fn upgrade_async_call(self) {
@@ -204,7 +208,7 @@ where
             &self.to,
             gas,
             &self.payment.to_egld_payment().value,
-            &self.data.code_source.code,
+            &self.data.code_source.0.into_value(&self.env),
             self.data.code_metadata,
             &self.data.arg_buffer,
         );
diff --git a/framework/base/src/types/interaction/tx_code_source.rs b/framework/base/src/types/interaction/tx_code_source.rs
index b83963d33b..752e6ece7c 100644
--- a/framework/base/src/types/interaction/tx_code_source.rs
+++ b/framework/base/src/types/interaction/tx_code_source.rs
@@ -3,7 +3,7 @@ use crate::{
     types::{ManagedAddress, ManagedBuffer},
 };
 
-use super::TxEnv;
+use super::{AnnotatedValue, TxEnv};
 
 pub trait TxCodeSource<Env>
 where
@@ -19,26 +19,30 @@ where
 {
 }
 
-/// Contains code for a deploy or upgrade.
-pub struct Code<Env>
+pub trait TxCodeValue<Env>: AnnotatedValue<Env, ManagedBuffer<Env::Api>>
 where
     Env: TxEnv,
 {
-    pub code: ManagedBuffer<Env::Api>,
 }
 
-impl<Env> Code<Env>
+impl<Env> TxCodeValue<Env> for ManagedBuffer<Env::Api> where Env: TxEnv {}
+
+/// Contains code for a deploy or upgrade.
+pub struct Code<CodeValue>(pub CodeValue);
+
+impl<Env, CodeValue> TxCodeSource<Env> for Code<CodeValue>
 where
     Env: TxEnv,
+    CodeValue: TxCodeValue<Env>,
 {
-    pub fn new(code: ManagedBuffer<Env::Api>) -> Self {
-        Code { code }
-    }
 }
 
-impl<Env> TxCodeSource<Env> for Code<Env> where Env: TxEnv {}
-
-impl<Env> TxCodeSourceSpecified<Env> for Code<Env> where Env: TxEnv {}
+impl<Env, CodeValue> TxCodeSourceSpecified<Env> for Code<CodeValue>
+where
+    Env: TxEnv,
+    CodeValue: TxCodeValue<Env>,
+{
+}
 
 /// Indicates the source of a "deploy from source" or "upgrade from source".
 pub struct FromSource<Env>
diff --git a/framework/base/src/types/interaction/tx_env.rs b/framework/base/src/types/interaction/tx_env.rs
index 2072c1d88d..9a8bfd04ab 100644
--- a/framework/base/src/types/interaction/tx_env.rs
+++ b/framework/base/src/types/interaction/tx_env.rs
@@ -1,4 +1,7 @@
-use crate::{api::CallTypeApi, types::ManagedAddress};
+use crate::{
+    api::CallTypeApi,
+    types::{ManagedAddress, ManagedBuffer},
+};
 
 use super::AnnotatedValue;
 
diff --git a/framework/base/src/types/interaction/tx_rh_list.rs b/framework/base/src/types/interaction/tx_rh_list.rs
index f34e0295a5..392863de73 100644
--- a/framework/base/src/types/interaction/tx_rh_list.rs
+++ b/framework/base/src/types/interaction/tx_rh_list.rs
@@ -6,6 +6,7 @@ mod returns_similar;
 mod tx_rh_list_cons;
 mod tx_rh_list_item;
 mod with_result_exact;
+mod with_result_new_address;
 mod with_result_raw;
 
 pub use returns_bt::*;
@@ -15,3 +16,4 @@ pub use returns_raw::*;
 pub use returns_similar::*;
 pub use tx_rh_list_cons::*;
 pub use tx_rh_list_item::*;
+pub use with_result_new_address::*;
diff --git a/framework/base/src/types/interaction/tx_rh_list/with_result_new_address.rs b/framework/base/src/types/interaction/tx_rh_list/with_result_new_address.rs
new file mode 100644
index 0000000000..c58383a86e
--- /dev/null
+++ b/framework/base/src/types/interaction/tx_rh_list/with_result_new_address.rs
@@ -0,0 +1,52 @@
+use core::marker::PhantomData;
+
+use crate::types::{
+    interaction::tx_call_deploy::RHListItemDeploy, ManagedAddress, ManagedBuffer, ManagedVec,
+    RHListItemSync, TxEnv,
+};
+
+use super::RHListItem;
+
+pub struct WithResultNewAddress<Env, F>
+where
+    Env: TxEnv,
+    F: FnOnce(&ManagedAddress<Env::Api>),
+{
+    _phantom: PhantomData<Env>,
+    pub f: F,
+}
+
+impl<Env, F> WithResultNewAddress<Env, F>
+where
+    Env: TxEnv,
+    F: FnOnce(&ManagedAddress<Env::Api>),
+{
+    pub fn new(f: F) -> Self {
+        WithResultNewAddress {
+            _phantom: PhantomData,
+            f,
+        }
+    }
+}
+
+impl<Env, F, Original> RHListItem<Env, Original> for WithResultNewAddress<Env, F>
+where
+    Env: TxEnv,
+    F: FnOnce(&ManagedAddress<Env::Api>),
+{
+    type Returns = ();
+}
+
+impl<Env, F, Original> RHListItemDeploy<Env, Original> for WithResultNewAddress<Env, F>
+where
+    Env: TxEnv,
+    F: FnOnce(&ManagedAddress<Env::Api>),
+{
+    fn item_deploy_result(
+        self,
+        new_address: &ManagedAddress<Env::Api>,
+        _raw_results: &ManagedVec<Env::Api, ManagedBuffer<Env::Api>>,
+    ) -> Self::Returns {
+        (self.f)(new_address);
+    }
+}
diff --git a/framework/base/src/types/managed/basic/managed_buffer.rs b/framework/base/src/types/managed/basic/managed_buffer.rs
index 3e4347aa1d..1caa2411f1 100644
--- a/framework/base/src/types/managed/basic/managed_buffer.rs
+++ b/framework/base/src/types/managed/basic/managed_buffer.rs
@@ -10,9 +10,10 @@ use crate::{
         TopEncodeOutput, TryStaticCast,
     },
     formatter::{
-        hex_util::encode_bytes_as_hex, FormatByteReceiver, SCBinary, SCDisplay, SCLowerHex,
+        hex_util::encode_bytes_as_hex, FormatBuffer, FormatByteReceiver, SCBinary, SCDisplay,
+        SCLowerHex,
     },
-    types::{heap::BoxedBytes, ManagedType, StaticBufferRef},
+    types::{heap::BoxedBytes, ManagedBufferCachedBuilder, ManagedType, StaticBufferRef},
 };
 
 /// A byte buffer managed by an external API.
@@ -330,6 +331,14 @@ impl<M: ManagedTypeApi> ManagedBuffer<M> {
             Some(u64::from_be_bytes(bytes))
         }
     }
+
+    /// Produces a hex expression in another managed buffer,
+    /// made up of "0x" + the hex representation of the data.
+    pub fn hex_expr(&self) -> ManagedBuffer<M> {
+        let mut result = ManagedBufferCachedBuilder::new_from_slice(b"0x");
+        result.append_lower_hex(self);
+        result.into_managed_buffer()
+    }
 }
 
 impl<M: ManagedTypeApi> Clone for ManagedBuffer<M> {
diff --git a/framework/base/src/types/managed/wrapped/managed_address.rs b/framework/base/src/types/managed/wrapped/managed_address.rs
index be24c8e99b..80de540394 100644
--- a/framework/base/src/types/managed/wrapped/managed_address.rs
+++ b/framework/base/src/types/managed/wrapped/managed_address.rs
@@ -8,12 +8,10 @@ use crate::{
         NestedDecode, NestedDecodeInput, NestedEncode, NestedEncodeOutput, TopDecode,
         TopDecodeInput, TopEncode, TopEncodeOutput, TryStaticCast,
     },
-    formatter::{hex_util::encode_bytes_as_hex, FormatBuffer, FormatByteReceiver, SCLowerHex},
+    formatter::{hex_util::encode_bytes_as_hex, FormatByteReceiver, SCLowerHex},
     types::{heap::Address, ManagedBuffer, ManagedByteArray, ManagedType},
 };
 
-use super::ManagedBufferCachedBuilder;
-
 #[repr(transparent)]
 #[derive(Clone)]
 pub struct ManagedAddress<M: ManagedTypeApi> {
@@ -254,9 +252,7 @@ impl<M: ManagedTypeApi> SCLowerHex for ManagedAddress<M> {
 
 impl<M: ManagedTypeApi> ManagedAddress<M> {
     pub fn hex_expr(&self) -> ManagedBuffer<M> {
-        let mut result = ManagedBufferCachedBuilder::new_from_slice(b"0x");
-        result.append_lower_hex(self);
-        result.into_managed_buffer()
+        self.bytes.buffer.hex_expr()
     }
 }
 
diff --git a/framework/scenario/src/facade/world_tx.rs b/framework/scenario/src/facade/world_tx.rs
index f0891db9cb..3cb83818cc 100644
--- a/framework/scenario/src/facade/world_tx.rs
+++ b/framework/scenario/src/facade/world_tx.rs
@@ -1,11 +1,13 @@
 #![allow(unused)] // TEMP
 
+mod expr;
 mod scenario_env;
 mod scenario_rh_list;
 mod scenario_rh_list_item;
 mod scenario_tx;
 mod with_tx_raw_response;
 
+pub use expr::*;
 pub use scenario_env::*;
 pub use scenario_rh_list::*;
 pub use scenario_rh_list_item::*;
diff --git a/framework/scenario/src/facade/world_tx/expr.rs b/framework/scenario/src/facade/world_tx/expr.rs
new file mode 100644
index 0000000000..2d28c5bdbd
--- /dev/null
+++ b/framework/scenario/src/facade/world_tx/expr.rs
@@ -0,0 +1,5 @@
+mod file_expr;
+mod mxsc_expr;
+
+pub use file_expr::FileExpr;
+pub use mxsc_expr::MxscExpr;
diff --git a/framework/scenario/src/facade/world_tx/expr/file_expr.rs b/framework/scenario/src/facade/world_tx/expr/file_expr.rs
new file mode 100644
index 0000000000..1cb80997e4
--- /dev/null
+++ b/framework/scenario/src/facade/world_tx/expr/file_expr.rs
@@ -0,0 +1,31 @@
+use core::ptr;
+use std::path::PathBuf;
+
+use multiversx_chain_scenario_format::{
+    interpret_trait::InterpreterContext, value_interpreter::interpret_string,
+};
+use multiversx_sc::types::{
+    AnnotatedValue, ManagedAddress, ManagedBuffer, TxEnv, TxFrom, TxFromSpecified, TxTo,
+    TxToSpecified,
+};
+
+use crate::{api::StaticApi, ScenarioTxEnvironment};
+
+const FILE_PREFIX: &str = "file:";
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub struct FileExpr<'a>(pub &'a str);
+
+impl<'a> AnnotatedValue<ScenarioTxEnvironment, ManagedBuffer<StaticApi>> for FileExpr<'a> {
+    fn annotation(&self, _env: &ScenarioTxEnvironment) -> ManagedBuffer<StaticApi> {
+        let mut result = ManagedBuffer::new_from_bytes(FILE_PREFIX.as_bytes());
+        result.append_bytes(self.0.as_bytes());
+        result
+    }
+
+    fn into_value(self, env: &ScenarioTxEnvironment) -> ManagedBuffer<StaticApi> {
+        let context = InterpreterContext::new().with_dir(env.context_path.clone());
+        let value = interpret_string(&format!("{FILE_PREFIX}{}", self.0), &context);
+        value.into()
+    }
+}
diff --git a/framework/scenario/src/facade/world_tx/expr/mxsc_expr.rs b/framework/scenario/src/facade/world_tx/expr/mxsc_expr.rs
new file mode 100644
index 0000000000..a0ba7c4ef9
--- /dev/null
+++ b/framework/scenario/src/facade/world_tx/expr/mxsc_expr.rs
@@ -0,0 +1,35 @@
+use core::ptr;
+use std::path::PathBuf;
+
+use multiversx_chain_scenario_format::{
+    interpret_trait::InterpreterContext, value_interpreter::interpret_string,
+};
+use multiversx_sc::types::{
+    AnnotatedValue, ManagedAddress, ManagedBuffer, TxCodeValue, TxEnv, TxFrom, TxFromSpecified,
+    TxTo, TxToSpecified,
+};
+
+use crate::{api::StaticApi, ScenarioTxEnvironment};
+
+const MXSC_PREFIX: &str = "mxsc:";
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub struct MxscExpr<'a>(pub &'a str);
+
+impl<'a> AnnotatedValue<ScenarioTxEnvironment, ManagedBuffer<StaticApi>> for MxscExpr<'a> {
+    fn annotation(&self, _env: &ScenarioTxEnvironment) -> ManagedBuffer<StaticApi> {
+        let mut result = ManagedBuffer::new_from_bytes(MXSC_PREFIX.as_bytes());
+        result.append_bytes(self.0.as_bytes());
+        result
+    }
+
+    fn into_value(self, env: &ScenarioTxEnvironment) -> ManagedBuffer<StaticApi> {
+        let context = InterpreterContext::new()
+            .with_dir(env.context_path.clone())
+            .with_allowed_missing_files();
+        let value = interpret_string(&format!("{MXSC_PREFIX}{}", self.0), &context);
+        value.into()
+    }
+}
+
+impl<'a> TxCodeValue<ScenarioTxEnvironment> for MxscExpr<'a> {}
diff --git a/framework/scenario/src/facade/world_tx/scenario_rh_list_item.rs b/framework/scenario/src/facade/world_tx/scenario_rh_list_item.rs
index 57ba631911..da0a98ff99 100644
--- a/framework/scenario/src/facade/world_tx/scenario_rh_list_item.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_rh_list_item.rs
@@ -1,9 +1,12 @@
 use multiversx_sc::{
     codec::TopDecodeMulti,
-    types::{RHList, RHListItem, ReturnsExact, TxEnv},
+    types::{ManagedAddress, RHList, RHListItem, ReturnsExact, TxEnv, WithResultNewAddress},
 };
 
-use crate::scenario_model::{TxResponse, TypedResponse};
+use crate::{
+    api::StaticApi,
+    scenario_model::{TxResponse, TypedResponse},
+};
 
 use super::ScenarioTxEnvironment;
 
@@ -22,3 +25,17 @@ where
             .expect("ReturnsExact expects that transaction is successful")
     }
 }
+
+impl<F, Original> RHListItemScenario<Original> for WithResultNewAddress<ScenarioTxEnvironment, F>
+where
+    F: FnOnce(&ManagedAddress<StaticApi>),
+{
+    fn item_scenario_result(self, tx_response: &TxResponse) -> Self::Returns {
+        let new_address = tx_response
+            .new_deployed_address
+            .clone()
+            .expect("missing returned address");
+
+        (self.f)(&ManagedAddress::from_address(&new_address));
+    }
+}
diff --git a/framework/scenario/src/facade/world_tx/scenario_tx.rs b/framework/scenario/src/facade/world_tx/scenario_tx.rs
index 489d0c88a8..13449cb8d4 100644
--- a/framework/scenario/src/facade/world_tx/scenario_tx.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_tx.rs
@@ -2,14 +2,15 @@ use multiversx_chain_scenario_format::serde_raw::ValueSubTree;
 use multiversx_sc::{
     tuple_util::NestedTupleFlatten,
     types::{
-        AnnotatedValue, FunctionCall, ManagedAddress, RHListSync, Tx, TxEnv, TxFromSpecified,
-        TxGas, TxPayment, TxToSpecified,
+        AnnotatedValue, Code, DeployCall, FunctionCall, ManagedAddress, ManagedBuffer, RHListSync,
+        Tx, TxCodeSource, TxCodeSourceSpecified, TxCodeValue, TxEnv, TxFromSpecified, TxGas,
+        TxPayment, TxToSpecified,
     },
 };
 
 use crate::{
     api::StaticApi,
-    scenario_model::{AddressValue, ScCallStep},
+    scenario_model::{AddressValue, BytesValue, ScCallStep, ScDeployStep},
     ScenarioWorld,
 };
 
@@ -62,6 +63,18 @@ where
     }
 }
 
+fn code_annotated<Env, CodeValue>(env: &Env, code: Code<CodeValue>) -> BytesValue
+where
+    Env: TxEnv,
+    CodeValue: TxCodeValue<Env>,
+{
+    let annotation = code.0.annotation(env).to_string();
+    BytesValue {
+        value: code.0.into_value(env).to_vec(),
+        original: ValueSubTree::Str(annotation),
+    }
+}
+
 impl<From, To, Payment, Gas, RH> ScenarioTx
     for Tx<ScenarioTxEnvironment, From, To, Payment, Gas, FunctionCall<StaticApi>, RH>
 where
@@ -81,7 +94,7 @@ where
             .to(address_annotated(&env, self.to))
             .function(self.data.function_name.to_string().as_str());
         for arg in self.data.arg_buffer.iter_buffers() {
-            step = step.argument(arg.to_vec());
+            step.tx.arguments.push(arg.to_vec().into());
         }
 
         world.sc_call(&mut step);
@@ -91,3 +104,40 @@ where
         tuple_result.flatten_unpack()
     }
 }
+
+impl<From, Payment, Gas, CodeValue, RH> ScenarioTx
+    for Tx<
+        ScenarioTxEnvironment,
+        From,
+        (),
+        Payment,
+        Gas,
+        DeployCall<ScenarioTxEnvironment, Code<CodeValue>>,
+        RH,
+    >
+where
+    From: TxFromSpecified<ScenarioTxEnvironment>,
+    Payment: TxPayment<ScenarioTxEnvironment>,
+    Gas: TxGas<ScenarioTxEnvironment>,
+    CodeValue: TxCodeValue<ScenarioTxEnvironment>,
+    RH: RHListScenario,
+    RH::ListReturns: NestedTupleFlatten,
+{
+    type Returns = <RH::ListReturns as NestedTupleFlatten>::Unpacked;
+
+    fn run_as_scenario_step(self, world: &mut ScenarioWorld) -> Self::Returns {
+        let mut env = self.env;
+        let mut step = ScDeployStep::new()
+            .from(address_annotated(&env, self.from))
+            .code(code_annotated(&env, self.data.code_source));
+        for arg in self.data.arg_buffer.iter_buffers() {
+            step.tx.arguments.push(arg.to_vec().into());
+        }
+
+        world.sc_deploy(&mut step);
+        let response = step.response.expect("step did not return result");
+
+        let tuple_result = self.result_handler.item_scenario_result(&response);
+        tuple_result.flatten_unpack()
+    }
+}

From 1da1ef020454e6bd5325356156befb5fdd7e63b2 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 7 Mar 2024 10:52:25 +0200
Subject: [PATCH 0396/1254] unified syntax - FromSource refactor

---
 framework/base/src/types/interaction/tx.rs    | 15 ++++---
 .../src/types/interaction/tx_call_deploy.rs   | 39 ++++++++++++++-----
 .../src/types/interaction/tx_code_source.rs   | 24 +++++++-----
 3 files changed, 52 insertions(+), 26 deletions(-)

diff --git a/framework/base/src/types/interaction/tx.rs b/framework/base/src/types/interaction/tx.rs
index 9435f5e11e..77d32df17e 100644
--- a/framework/base/src/types/interaction/tx.rs
+++ b/framework/base/src/types/interaction/tx.rs
@@ -14,8 +14,8 @@ use super::{
     AnnotatedValue, AsyncCall, Code, ContractCallNoPayment, ContractCallWithEgld, ContractDeploy,
     DeployCall, ExplicitGas, FromSource, FunctionCall, ManagedArgBuffer, OriginalResultMarker,
     RHList, RHListAppendNoRet, RHListAppendRet, RHListItem, TxCodeSource, TxCodeValue, TxData,
-    TxDataFunctionCall, TxEnv, TxFrom, TxFromSpecified, TxGas, TxPayment, TxPaymentEgldOnly,
-    TxProxyTrait, TxProxyTraitV2, TxResultHandler, TxScEnv, TxTo, TxToSpecified,
+    TxDataFunctionCall, TxEnv, TxFrom, TxFromSourceValue, TxFromSpecified, TxGas, TxPayment,
+    TxPaymentEgldOnly, TxProxyTrait, TxProxyTraitV2, TxResultHandler, TxScEnv, TxTo, TxToSpecified,
 };
 
 #[must_use]
@@ -679,17 +679,20 @@ where
         }
     }
 
-    pub fn from_source(
+    pub fn from_source<FromSourceValue>(
         mut self,
-        source_address: ManagedAddress<Env::Api>,
-    ) -> Tx<Env, From, To, Payment, Gas, DeployCall<Env, FromSource<Env>>, RH> {
+        source_address: FromSourceValue,
+    ) -> Tx<Env, From, To, Payment, Gas, DeployCall<Env, FromSource<FromSourceValue>>, RH>
+    where
+        FromSourceValue: TxFromSourceValue<Env>,
+    {
         Tx {
             env: self.env,
             from: self.from,
             to: self.to,
             payment: self.payment,
             gas: self.gas,
-            data: self.data.code_source(FromSource::new(source_address)),
+            data: self.data.code_source(FromSource(source_address)),
             result_handler: self.result_handler,
         }
     }
diff --git a/framework/base/src/types/interaction/tx_call_deploy.rs b/framework/base/src/types/interaction/tx_call_deploy.rs
index 6b1f670e7b..189d93b7ae 100644
--- a/framework/base/src/types/interaction/tx_call_deploy.rs
+++ b/framework/base/src/types/interaction/tx_call_deploy.rs
@@ -10,8 +10,8 @@ use crate::{
 use super::{
     contract_call_exec::decode_result, Code, ConsNoRet, ConsRet, DeployCall, FromSource,
     OriginalResultMarker, RHList, RHListItem, Tx, TxCodeValue, TxDataFunctionCall,
-    TxEmptyResultHandler, TxEnv, TxGas, TxPayment, TxPaymentEgldOnly, TxResultHandler, TxScEnv,
-    TxToSpecified,
+    TxEmptyResultHandler, TxEnv, TxFromSourceValue, TxGas, TxPayment, TxPaymentEgldOnly,
+    TxResultHandler, TxScEnv, TxToSpecified,
 };
 
 pub trait RHListItemDeploy<Env, Original>: RHListItem<Env, Original>
@@ -120,12 +120,21 @@ where
     }
 }
 
-impl<Api, Payment, Gas, RH>
-    Tx<TxScEnv<Api>, (), (), Payment, Gas, DeployCall<TxScEnv<Api>, FromSource<TxScEnv<Api>>>, RH>
+impl<Api, Payment, Gas, FromSourceValue, RH>
+    Tx<
+        TxScEnv<Api>,
+        (),
+        (),
+        Payment,
+        Gas,
+        DeployCall<TxScEnv<Api>, FromSource<FromSourceValue>>,
+        RH,
+    >
 where
     Api: CallTypeApi,
     Payment: TxPaymentEgldOnly<TxScEnv<Api>>,
     Gas: TxGas<TxScEnv<Api>>,
+    FromSourceValue: TxFromSourceValue<TxScEnv<Api>>,
     RH: TxResultHandler<TxScEnv<Api>>,
 {
     fn execute_deploy_from_source_raw(
@@ -137,7 +146,7 @@ where
         let (new_address, raw_results) = SendRawWrapper::<Api>::new().deploy_from_source_contract(
             gas_limit,
             &egld_payment.value,
-            &self.data.code_source.address,
+            &self.data.code_source.0.into_value(&self.env),
             self.data.code_metadata,
             &self.data.arg_buffer,
         );
@@ -167,12 +176,21 @@ where
     }
 }
 
-impl<Api, Payment, Gas, RH>
-    Tx<TxScEnv<Api>, (), (), Payment, Gas, DeployCall<TxScEnv<Api>, FromSource<TxScEnv<Api>>>, RH>
+impl<Api, Payment, Gas, FromSourceValue, RH>
+    Tx<
+        TxScEnv<Api>,
+        (),
+        (),
+        Payment,
+        Gas,
+        DeployCall<TxScEnv<Api>, FromSource<FromSourceValue>>,
+        RH,
+    >
 where
     Api: CallTypeApi,
     Payment: TxPaymentEgldOnly<TxScEnv<Api>>,
     Gas: TxGas<TxScEnv<Api>>,
+    FromSourceValue: TxFromSourceValue<TxScEnv<Api>>,
     RH: RHListDeploy<TxScEnv<Api>>,
     RH::ListReturns: NestedTupleFlatten,
 {
@@ -215,20 +233,21 @@ where
     }
 }
 
-impl<Api, Payment, Gas, RH>
+impl<Api, Payment, Gas, FromSourceValue, RH>
     Tx<
         TxScEnv<Api>,
         (),
         ManagedAddress<Api>,
         Payment,
         Gas,
-        DeployCall<TxScEnv<Api>, FromSource<TxScEnv<Api>>>,
+        DeployCall<TxScEnv<Api>, FromSource<FromSourceValue>>,
         RH,
     >
 where
     Api: CallTypeApi,
     Payment: TxPaymentEgldOnly<TxScEnv<Api>>,
     Gas: TxGas<TxScEnv<Api>>,
+    FromSourceValue: TxFromSourceValue<TxScEnv<Api>>,
     RH: TxEmptyResultHandler<TxScEnv<Api>>,
 {
     pub fn upgrade_async_call(self) {
@@ -237,7 +256,7 @@ where
             &self.to,
             gas,
             &self.payment.to_egld_payment().value,
-            &self.data.code_source.address,
+            &self.data.code_source.0.into_value(&self.env),
             self.data.code_metadata,
             &self.data.arg_buffer,
         );
diff --git a/framework/base/src/types/interaction/tx_code_source.rs b/framework/base/src/types/interaction/tx_code_source.rs
index 752e6ece7c..b8c48e718e 100644
--- a/framework/base/src/types/interaction/tx_code_source.rs
+++ b/framework/base/src/types/interaction/tx_code_source.rs
@@ -44,23 +44,27 @@ where
 {
 }
 
-/// Indicates the source of a "deploy from source" or "upgrade from source".
-pub struct FromSource<Env>
+pub trait TxFromSourceValue<Env>: AnnotatedValue<Env, ManagedAddress<Env::Api>>
 where
     Env: TxEnv,
 {
-    pub address: ManagedAddress<Env::Api>,
 }
 
-impl<Env> FromSource<Env>
+impl<Env> TxFromSourceValue<Env> for ManagedAddress<Env::Api> where Env: TxEnv {}
+
+/// Indicates the source of a "deploy from source" or "upgrade from source".
+pub struct FromSource<FromSourceValue>(pub FromSourceValue);
+
+impl<Env, FromSourceValue> TxCodeSource<Env> for FromSource<FromSourceValue>
 where
     Env: TxEnv,
+    FromSourceValue: TxFromSourceValue<Env>,
 {
-    pub fn new(address: ManagedAddress<Env::Api>) -> Self {
-        FromSource { address }
-    }
 }
 
-impl<Env> TxCodeSource<Env> for FromSource<Env> where Env: TxEnv {}
-
-impl<Env> TxCodeSourceSpecified<Env> for FromSource<Env> where Env: TxEnv {}
+impl<Env, FromSourceValue> TxCodeSourceSpecified<Env> for FromSource<FromSourceValue>
+where
+    Env: TxEnv,
+    FromSourceValue: TxFromSourceValue<Env>,
+{
+}

From 756bbd69bf87325bfa37f13af29120cabf835ee6 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 7 Mar 2024 10:52:36 +0200
Subject: [PATCH 0397/1254] clippy fix

---
 framework/base/src/types/interaction/tx_to.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/framework/base/src/types/interaction/tx_to.rs b/framework/base/src/types/interaction/tx_to.rs
index 8c51fd2d33..ecba5ad1f6 100644
--- a/framework/base/src/types/interaction/tx_to.rs
+++ b/framework/base/src/types/interaction/tx_to.rs
@@ -26,7 +26,7 @@ where
     Env: TxEnv,
 {
     fn with_address_ref<F: FnOnce(&ManagedAddress<Env::Api>)>(&self, _env: &Env, f: F) {
-        f(&self)
+        f(self)
     }
 }
 

From 5c35c9a5a9ebf4c768eff67e57e7f8c9dfb72678 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Thu, 7 Mar 2024 12:18:53 +0200
Subject: [PATCH 0398/1254] change type_name with struct type_names in abi

---
 .../adder/proxies_struct_interactor_main.rs   | 46 ++++++++------
 contracts/examples/adder/src/temp_proxy_v2.rs |  6 +-
 .../abi-tester/tests/abi_tester_abi_test.rs   |  2 +-
 framework/base/src/abi.rs                     | 15 +++++
 framework/base/src/abi/endpoint_abi.rs        |  7 +--
 framework/base/src/abi/type_abi.rs            | 49 ++++++++++-----
 .../base/src/abi/type_abi_impl_codec_multi.rs |  4 +-
 framework/base/src/abi/type_description.rs    | 13 ++--
 .../src/abi/type_description_container.rs     | 20 +++---
 framework/base/src/external_view_contract.rs  |  7 ++-
 .../src/storage/mappers/linked_list_mapper.rs |  2 +-
 .../base/src/storage/mappers/queue_mapper.rs  |  2 +-
 .../base/src/storage/mappers/set_mapper.rs    |  2 +-
 .../src/storage/mappers/unique_id_mapper.rs   |  2 +-
 .../storage/mappers/unordered_set_mapper.rs   |  2 +-
 .../base/src/storage/mappers/user_mapper.rs   |  2 +-
 .../base/src/storage/mappers/vec_mapper.rs    |  2 +-
 framework/base/src/types.rs                   |  2 +-
 framework/base/src/types/heap/h256_address.rs |  4 ++
 .../src/types/interaction/function_call.rs    |  2 +-
 .../types/io/operation_completion_status.rs   |  6 +-
 framework/base/src/types/managed/basic/mod.rs |  2 +-
 framework/base/src/types/managed/mod.rs       |  2 +-
 .../multi_value/multi_value_encoded.rs        |  2 +-
 framework/derive/src/type_abi_derive.rs       | 20 +++---
 .../meta/src/abi_json/contract_abi_json.rs    |  4 +-
 .../meta/src/abi_json/endpoint_abi_json.rs    |  4 +-
 framework/meta/src/abi_json/type_abi_json.rs  |  7 ++-
 .../generate_proxy/proxy_sc_functions_gen.rs  | 62 +++++++++----------
 .../snippet_sc_functions_gen.rs               |  4 +-
 .../sc_config/contract_variant_validate.rs    | 10 +--
 31 files changed, 185 insertions(+), 129 deletions(-)

diff --git a/contracts/examples/adder/proxies_struct_interactor_main.rs b/contracts/examples/adder/proxies_struct_interactor_main.rs
index 1f0d8d51cb..af7378dc8b 100644
--- a/contracts/examples/adder/proxies_struct_interactor_main.rs
+++ b/contracts/examples/adder/proxies_struct_interactor_main.rs
@@ -41,16 +41,19 @@ where
     To: TxTo<Env>,
     Gas: TxGas<Env>,
 {
-    pub fn init<Arg0: multiversx_sc::codec::CodecInto<BigUint<Env::Api>>>(
-        self,
-        initial_value: Arg0,
-    ) -> multiversx_sc::types::Tx<Env, (), To, (), Gas, DeployCall<Env, ()>, OriginalResultMarker<()>>
-    {
-        self.wrapped_tx
+	pub fn init<
+		Arg0: multiversx_sc::codec::CodecInto<BigUint<Env::Api>>,
+	>(
+		self,
+		initial_value: Arg0,
+	) -> multiversx_sc::types::Tx<Env, (), To, (), Gas, DeployCall<Env, ()>, OriginalResultMarker<()>>
+	{
+		self.wrapped_tx
             .raw_deploy()
-            .argument(&initial_value)
-            .original_result()
-    }
+			.argument(&initial_value)
+			.original_result()
+	}
+
 }
 impl<Env, From, To, Gas> TxProxyMethods<Env, From, To, Gas>
 where
@@ -60,14 +63,17 @@ where
     To: TxTo<Env>,
     Gas: TxGas<Env>,
 {
-    pub fn sum(self) {}
-
-    pub fn upgrade<Arg0: multiversx_sc::codec::CodecInto<BigUint<Env::Api>>>(
-        self,
-        initial_value: Arg0,
-    ) {
-    }
-
-    //Add desired amount to the storage variable.
-    pub fn add<Arg0: multiversx_sc::codec::CodecInto<BigUint<Env::Api>>>(self, value: Arg0) {}
-}
+	pub fn sum(
+		self,
+	) 	pub fn upgrade<
+		Arg0: multiversx_sc::codec::CodecInto<BigUint<Env::Api>>,
+	>(
+		self,
+		initial_value: Arg0,
+	) 	//Add desired amount to the storage variable. 
+	pub fn add<
+		Arg0: multiversx_sc::codec::CodecInto<BigUint<Env::Api>>,
+	>(
+		self,
+		value: Arg0,
+	) }
diff --git a/contracts/examples/adder/src/temp_proxy_v2.rs b/contracts/examples/adder/src/temp_proxy_v2.rs
index fb6f8cd50e..acd83918f6 100644
--- a/contracts/examples/adder/src/temp_proxy_v2.rs
+++ b/contracts/examples/adder/src/temp_proxy_v2.rs
@@ -66,7 +66,11 @@ where
         (),
         Gas,
         FunctionCall<Env::Api>,
-        OriginalResultMarker<SingleValueMapper<Env::Api, multiversx_sc::types::BigUint<Env::Api>>>,
+        OriginalResultMarker<
+            multiversx_sc::types::managed::basic::big_uint::BigUint<
+                multiversx_sc::api::uncallable::UncallableApi,
+            >,
+        >,
     > {
         self.wrapped_tx
             .raw_call()
diff --git a/contracts/feature-tests/abi-tester/tests/abi_tester_abi_test.rs b/contracts/feature-tests/abi-tester/tests/abi_tester_abi_test.rs
index f4274861de..f288a90059 100644
--- a/contracts/feature-tests/abi-tester/tests/abi_tester_abi_test.rs
+++ b/contracts/feature-tests/abi-tester/tests/abi_tester_abi_test.rs
@@ -94,7 +94,7 @@ fn abi_deserialization_check() {
         .types
         .get("AbiEnum")
         .unwrap()
-        .to_type_description("AbiEnum");
+        .to_type_description("AbiEnum", "Enum");
     if let TypeContents::Enum(variants) = abi_enum_type.contents {
         assert_eq!(variants.len(), 4);
         assert_eq!(
diff --git a/framework/base/src/abi.rs b/framework/base/src/abi.rs
index b79ae26124..2fc4e5af0d 100644
--- a/framework/base/src/abi.rs
+++ b/framework/base/src/abi.rs
@@ -19,3 +19,18 @@ pub use type_description::*;
 pub use type_description_container::*;
 
 pub type TypeName = alloc::string::String;
+
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub struct TypeNames {
+    pub abi: alloc::string::String,
+    pub rust: alloc::string::String,
+}
+
+impl TypeNames {
+    pub const fn new() -> Self {
+        TypeNames {
+            abi: alloc::string::String::new(),
+            rust: alloc::string::String::new(),
+        }
+    }
+}
diff --git a/framework/base/src/abi/endpoint_abi.rs b/framework/base/src/abi/endpoint_abi.rs
index 1ce6b5c363..5183ea580e 100644
--- a/framework/base/src/abi/endpoint_abi.rs
+++ b/framework/base/src/abi/endpoint_abi.rs
@@ -7,15 +7,14 @@ use alloc::{
 #[derive(Clone, Debug)]
 pub struct InputAbi {
     pub arg_name: String,
-    pub type_name: TypeName,
-    // pub original_type_name: TypeName,
+    pub type_names: TypeNames,
     pub multi_arg: bool,
 }
 
 #[derive(Clone, Debug)]
 pub struct OutputAbi {
     pub output_name: String,
-    pub type_name: TypeName,
+    pub type_names: TypeNames,
     pub multi_result: bool,
 }
 
@@ -89,7 +88,7 @@ impl EndpointAbi {
     pub fn add_input<T: TypeAbi>(&mut self, arg_name: &str) {
         self.inputs.push(InputAbi {
             arg_name: arg_name.to_string(),
-            type_name: T::type_name(),
+            type_names: T::type_names(),
             multi_arg: T::is_variadic(),
         });
     }
diff --git a/framework/base/src/abi/type_abi.rs b/framework/base/src/abi/type_abi.rs
index cdf6c153ac..3643cb9cf2 100644
--- a/framework/base/src/abi/type_abi.rs
+++ b/framework/base/src/abi/type_abi.rs
@@ -2,21 +2,32 @@ use super::*;
 use alloc::{string::ToString, vec::Vec};
 
 pub trait TypeAbi {
+    fn type_names() -> TypeNames {
+        TypeNames {
+            abi: Self::type_name(),
+            rust: Self::type_name_rust(),
+        }
+    }
+
     fn type_name() -> TypeName {
         core::any::type_name::<Self>().into()
     }
 
+    fn type_name_rust() -> TypeName {
+        core::any::type_name::<Self>().into()
+    }
+
     /// A type can provide more than its own name.
     /// For instance, a struct can also provide the descriptions of the type of its fields.
     /// TypeAbi doesn't care for the exact accumulator type,
     /// which is abstracted by the TypeDescriptionContainer trait.
     fn provide_type_descriptions<TDC: TypeDescriptionContainer>(accumulator: &mut TDC) {
-        let type_name = Self::type_name();
+        let type_names = Self::type_names();
         accumulator.insert(
-            type_name,
+            type_names,
             TypeDescription {
                 docs: Vec::new(),
-                name: Self::type_name(),
+                names: Self::type_names(),
                 contents: TypeContents::NotSpecified,
             },
         );
@@ -44,23 +55,33 @@ pub trait TypeAbi {
         };
         result.push(OutputAbi {
             output_name: output_name.to_string(),
-            type_name: Self::type_name(),
+            type_names: Self::type_names(),
             multi_result: Self::is_variadic(),
         });
         result
     }
 }
 
-pub fn type_name_variadic<T: TypeAbi>() -> TypeName {
-    let mut repr = TypeName::from("variadic<");
-    repr.push_str(T::type_name().as_str());
-    repr.push('>');
-    repr
+pub fn type_name_variadic<T: TypeAbi>() -> TypeNames {
+    let mut abi = TypeName::from("variadic<");
+    abi.push_str(T::type_name().as_str());
+    abi.push('>');
+
+    let mut rust = TypeName::from("variadic<");
+    rust.push_str(T::type_name_rust().as_str());
+    rust.push('>');
+
+    TypeNames { abi, rust }
 }
 
-pub fn type_name_optional<T: TypeAbi>() -> TypeName {
-    let mut repr = TypeName::from("optional<");
-    repr.push_str(T::type_name().as_str());
-    repr.push('>');
-    repr
+pub fn type_name_optional<T: TypeAbi>() -> TypeNames {
+    let mut abi = TypeName::from("optional<");
+    abi.push_str(T::type_name().as_str());
+    abi.push('>');
+
+    let mut rust = TypeName::from("optional<");
+    rust.push_str(T::type_name().as_str());
+    rust.push('>');
+
+    TypeNames { abi, rust }
 }
diff --git a/framework/base/src/abi/type_abi_impl_codec_multi.rs b/framework/base/src/abi/type_abi_impl_codec_multi.rs
index 6227634258..0a15206a46 100644
--- a/framework/base/src/abi/type_abi_impl_codec_multi.rs
+++ b/framework/base/src/abi/type_abi_impl_codec_multi.rs
@@ -6,7 +6,7 @@ use crate::{
 #[cfg(feature = "alloc")]
 impl<T: TypeAbi> TypeAbi for crate::codec::multi_types::MultiValueVec<T> {
     fn type_name() -> TypeName {
-        super::type_name_variadic::<T>()
+        super::type_name_variadic::<T>().abi
     }
 
     fn provide_type_descriptions<TDC: TypeDescriptionContainer>(accumulator: &mut TDC) {
@@ -30,7 +30,7 @@ impl TypeAbi for IgnoreValue {
 
 impl<T: TypeAbi> TypeAbi for OptionalValue<T> {
     fn type_name() -> TypeName {
-        super::type_name_optional::<T>()
+        super::type_name_optional::<T>().abi
     }
 
     fn provide_type_descriptions<TDC: TypeDescriptionContainer>(accumulator: &mut TDC) {
diff --git a/framework/base/src/abi/type_description.rs b/framework/base/src/abi/type_description.rs
index 2f0f5a4336..b9755fcaae 100644
--- a/framework/base/src/abi/type_description.rs
+++ b/framework/base/src/abi/type_description.rs
@@ -3,10 +3,12 @@ use alloc::{
     vec::Vec,
 };
 
+use super::TypeNames;
+
 #[derive(Clone, Debug)]
 pub struct TypeDescription {
     pub docs: Vec<String>,
-    pub name: String,
+    pub names: TypeNames,
     pub contents: TypeContents,
 }
 
@@ -17,17 +19,20 @@ impl TypeDescription {
     /// We use this as value while the fields are being computed.
     pub const PLACEHOLDER: TypeDescription = TypeDescription {
         docs: Vec::new(),
-        name: String::new(),
+        names: TypeNames {
+            abi: String::new(),
+            rust: String::new(),
+        },
         contents: TypeContents::NotSpecified,
     };
 }
 
 impl TypeDescription {
     /// Used in code generation.
-    pub fn new(docs: &[&str], name: String, contents: TypeContents) -> Self {
+    pub fn new(docs: &[&str], names: TypeNames, contents: TypeContents) -> Self {
         TypeDescription {
             docs: docs.iter().map(|s| s.to_string()).collect(),
-            name,
+            names,
             contents,
         }
     }
diff --git a/framework/base/src/abi/type_description_container.rs b/framework/base/src/abi/type_description_container.rs
index 7b9c0e892c..16dda2c8b9 100644
--- a/framework/base/src/abi/type_description_container.rs
+++ b/framework/base/src/abi/type_description_container.rs
@@ -8,17 +8,17 @@ pub trait TypeDescriptionContainer {
 
     // A placeholder gets inserted while computing field descriptions for a type,
     // to avoid an infinite loop for recursive types (if the same type appears again lower in the tree).
-    fn reserve_type_name(&mut self, type_name: TypeName) {
-        self.insert(type_name, TypeDescription::PLACEHOLDER);
+    fn reserve_type_name(&mut self, type_names: TypeNames) {
+        self.insert(type_names, TypeDescription::PLACEHOLDER);
     }
 
-    fn insert(&mut self, type_name: TypeName, type_description: TypeDescription);
+    fn insert(&mut self, type_names: TypeNames, type_description: TypeDescription);
 
     fn insert_all(&mut self, other: &Self);
 }
 
 #[derive(Clone, Default, Debug)]
-pub struct TypeDescriptionContainerImpl(pub Vec<(TypeName, TypeDescription)>);
+pub struct TypeDescriptionContainerImpl(pub Vec<(TypeNames, TypeDescription)>);
 
 impl TypeDescriptionContainer for TypeDescriptionContainerImpl {
     fn new() -> Self {
@@ -28,16 +28,18 @@ impl TypeDescriptionContainer for TypeDescriptionContainerImpl {
     fn contains_type(&self, type_name: &str) -> bool {
         self.0
             .iter()
-            .any(|(existing_type_name, _)| existing_type_name == type_name)
+            .any(|(existing_type_name, _)| existing_type_name.abi == type_name)
     }
 
-    fn insert(&mut self, type_name: TypeName, type_description: TypeDescription) {
-        if let Some((_existing_type_name, exisiting_type_description)) =
-            self.0.iter_mut().find(|(name, _)| name == &type_name)
+    fn insert(&mut self, type_names: TypeNames, type_description: TypeDescription) {
+        if let Some((_existing_type_name, exisiting_type_description)) = self
+            .0
+            .iter_mut()
+            .find(|(name, _)| name.abi == type_names.abi)
         {
             *exisiting_type_description = type_description;
         } else {
-            self.0.push((type_name, type_description));
+            self.0.push((type_names, type_description));
         }
     }
 
diff --git a/framework/base/src/external_view_contract.rs b/framework/base/src/external_view_contract.rs
index ba14d7072a..325eb93420 100644
--- a/framework/base/src/external_view_contract.rs
+++ b/framework/base/src/external_view_contract.rs
@@ -1,7 +1,7 @@
 use alloc::string::ToString;
 
 use crate::{
-    abi::{EndpointAbi, EndpointMutabilityAbi, EndpointTypeAbi, InputAbi, TypeAbi},
+    abi::{EndpointAbi, EndpointMutabilityAbi, EndpointTypeAbi, InputAbi, TypeAbi, TypeNames},
     api::{
         const_handles, use_raw_handle, CallValueApiImpl, ManagedBufferApiImpl, StorageWriteApiImpl,
         VMApi, EXTERNAL_VIEW_TARGET_ADRESS_KEY,
@@ -49,7 +49,10 @@ pub fn external_view_contract_constructor_abi() -> EndpointAbi {
     );
     endpoint_abi.inputs.push(InputAbi {
         arg_name: "target_contract_address".to_string(),
-        type_name: crate::types::heap::Address::type_name(),
+        type_names: TypeNames {
+            abi: crate::types::heap::Address::type_name(),
+            rust: crate::types::heap::Address::type_name_rust(),
+        },
         multi_arg: false,
     });
     endpoint_abi
diff --git a/framework/base/src/storage/mappers/linked_list_mapper.rs b/framework/base/src/storage/mappers/linked_list_mapper.rs
index d58c0ad19d..1bf067d97e 100644
--- a/framework/base/src/storage/mappers/linked_list_mapper.rs
+++ b/framework/base/src/storage/mappers/linked_list_mapper.rs
@@ -626,7 +626,7 @@ where
     T: TopEncode + TopDecode + NestedEncode + NestedDecode + Clone + TypeAbi,
 {
     fn type_name() -> TypeName {
-        crate::abi::type_name_variadic::<T>()
+        crate::abi::type_name_variadic::<T>().abi
     }
 
     fn provide_type_descriptions<TDC: TypeDescriptionContainer>(accumulator: &mut TDC) {
diff --git a/framework/base/src/storage/mappers/queue_mapper.rs b/framework/base/src/storage/mappers/queue_mapper.rs
index 79ac5f37d7..920c0d737b 100644
--- a/framework/base/src/storage/mappers/queue_mapper.rs
+++ b/framework/base/src/storage/mappers/queue_mapper.rs
@@ -532,7 +532,7 @@ where
     T: TopEncode + TopDecode + TypeAbi,
 {
     fn type_name() -> TypeName {
-        crate::abi::type_name_variadic::<T>()
+        crate::abi::type_name_variadic::<T>().abi
     }
 
     fn provide_type_descriptions<TDC: TypeDescriptionContainer>(accumulator: &mut TDC) {
diff --git a/framework/base/src/storage/mappers/set_mapper.rs b/framework/base/src/storage/mappers/set_mapper.rs
index 28941a7a8c..90ffcfc110 100644
--- a/framework/base/src/storage/mappers/set_mapper.rs
+++ b/framework/base/src/storage/mappers/set_mapper.rs
@@ -308,7 +308,7 @@ where
     T: TopEncode + TopDecode + NestedEncode + NestedDecode + TypeAbi,
 {
     fn type_name() -> TypeName {
-        crate::abi::type_name_variadic::<T>()
+        crate::abi::type_name_variadic::<T>().abi
     }
 
     fn provide_type_descriptions<TDC: TypeDescriptionContainer>(accumulator: &mut TDC) {
diff --git a/framework/base/src/storage/mappers/unique_id_mapper.rs b/framework/base/src/storage/mappers/unique_id_mapper.rs
index 779e1a1b71..ddf8aad22b 100644
--- a/framework/base/src/storage/mappers/unique_id_mapper.rs
+++ b/framework/base/src/storage/mappers/unique_id_mapper.rs
@@ -224,7 +224,7 @@ where
     SA: StorageMapperApi,
 {
     fn type_name() -> TypeName {
-        crate::abi::type_name_variadic::<usize>()
+        crate::abi::type_name_variadic::<usize>().abi
     }
 
     fn provide_type_descriptions<TDC: TypeDescriptionContainer>(accumulator: &mut TDC) {
diff --git a/framework/base/src/storage/mappers/unordered_set_mapper.rs b/framework/base/src/storage/mappers/unordered_set_mapper.rs
index fa151759ea..7b77bacfd0 100644
--- a/framework/base/src/storage/mappers/unordered_set_mapper.rs
+++ b/framework/base/src/storage/mappers/unordered_set_mapper.rs
@@ -239,7 +239,7 @@ where
     T: TopEncode + TopDecode + NestedEncode + NestedDecode + TypeAbi,
 {
     fn type_name() -> TypeName {
-        crate::abi::type_name_variadic::<T>()
+        crate::abi::type_name_variadic::<T>().abi
     }
 
     fn provide_type_descriptions<TDC: TypeDescriptionContainer>(accumulator: &mut TDC) {
diff --git a/framework/base/src/storage/mappers/user_mapper.rs b/framework/base/src/storage/mappers/user_mapper.rs
index bbfdcfb27b..e15f08da76 100644
--- a/framework/base/src/storage/mappers/user_mapper.rs
+++ b/framework/base/src/storage/mappers/user_mapper.rs
@@ -230,7 +230,7 @@ where
     SA: StorageMapperApi,
 {
     fn type_name() -> TypeName {
-        crate::abi::type_name_variadic::<ManagedAddress<SA>>()
+        crate::abi::type_name_variadic::<ManagedAddress<SA>>().abi
     }
 
     fn is_variadic() -> bool {
diff --git a/framework/base/src/storage/mappers/vec_mapper.rs b/framework/base/src/storage/mappers/vec_mapper.rs
index 49c9c159cc..2088f445b0 100644
--- a/framework/base/src/storage/mappers/vec_mapper.rs
+++ b/framework/base/src/storage/mappers/vec_mapper.rs
@@ -358,7 +358,7 @@ where
     T: TopEncode + TopDecode + TypeAbi,
 {
     fn type_name() -> TypeName {
-        crate::abi::type_name_variadic::<T>()
+        crate::abi::type_name_variadic::<T>().abi
     }
 
     fn provide_type_descriptions<TDC: TypeDescriptionContainer>(accumulator: &mut TDC) {
diff --git a/framework/base/src/types.rs b/framework/base/src/types.rs
index caa4a5a2d3..c316553b6b 100644
--- a/framework/base/src/types.rs
+++ b/framework/base/src/types.rs
@@ -3,7 +3,7 @@ mod flags;
 pub mod heap;
 mod interaction;
 mod io;
-mod managed;
+pub mod managed;
 mod static_buffer;
 
 pub use crypto::*;
diff --git a/framework/base/src/types/heap/h256_address.rs b/framework/base/src/types/heap/h256_address.rs
index e4c9b055d2..cd992145a9 100644
--- a/framework/base/src/types/heap/h256_address.rs
+++ b/framework/base/src/types/heap/h256_address.rs
@@ -206,6 +206,10 @@ impl TypeAbi for Address {
     fn type_name() -> TypeName {
         "Address".into()
     }
+
+    fn type_name_rust() -> TypeName {
+        "multiversx_sc::types::heap::h256_address".into()
+    }
 }
 
 #[cfg(test)]
diff --git a/framework/base/src/types/interaction/function_call.rs b/framework/base/src/types/interaction/function_call.rs
index 376aec879b..f4a3b69752 100644
--- a/framework/base/src/types/interaction/function_call.rs
+++ b/framework/base/src/types/interaction/function_call.rs
@@ -139,7 +139,7 @@ where
     Api: ManagedTypeApi,
 {
     fn type_name() -> TypeName {
-        crate::abi::type_name_variadic::<ManagedBuffer<Api>>()
+        crate::abi::type_name_variadic::<ManagedBuffer<Api>>().abi
     }
 
     fn is_variadic() -> bool {
diff --git a/framework/base/src/types/io/operation_completion_status.rs b/framework/base/src/types/io/operation_completion_status.rs
index a7e030ab96..207b9d760f 100644
--- a/framework/base/src/types/io/operation_completion_status.rs
+++ b/framework/base/src/types/io/operation_completion_status.rs
@@ -81,13 +81,13 @@ impl TypeAbi for OperationCompletionStatus {
     }
 
     fn provide_type_descriptions<TDC: TypeDescriptionContainer>(accumulator: &mut TDC) {
-        let type_name = Self::type_name();
+        let type_names = Self::type_names();
 
         accumulator.insert(
-            type_name,
+            type_names,
             TypeDescription {
                 docs: Vec::new(),
-                name: Self::type_name(),
+                names: Self::type_names(),
                 contents: TypeContents::ExplicitEnum([
                     ExplicitEnumVariantDescription::new(
                         &["indicates that operation was completed"],
diff --git a/framework/base/src/types/managed/basic/mod.rs b/framework/base/src/types/managed/basic/mod.rs
index 124fd1df55..5f818afac2 100644
--- a/framework/base/src/types/managed/basic/mod.rs
+++ b/framework/base/src/types/managed/basic/mod.rs
@@ -6,7 +6,7 @@ mod big_int_cmp;
 mod big_int_operators;
 mod big_int_sign;
 mod big_num_cmp;
-mod big_uint;
+pub mod big_uint;
 mod big_uint_cmp;
 mod big_uint_operators;
 mod cast_to_i64;
diff --git a/framework/base/src/types/managed/mod.rs b/framework/base/src/types/managed/mod.rs
index 3107f1ee3e..1ff74fdb84 100644
--- a/framework/base/src/types/managed/mod.rs
+++ b/framework/base/src/types/managed/mod.rs
@@ -1,4 +1,4 @@
-mod basic;
+pub mod basic;
 mod codec_util;
 mod managed_type_trait;
 mod multi_value;
diff --git a/framework/base/src/types/managed/multi_value/multi_value_encoded.rs b/framework/base/src/types/managed/multi_value/multi_value_encoded.rs
index ebf8e0cb69..943b909f35 100644
--- a/framework/base/src/types/managed/multi_value/multi_value_encoded.rs
+++ b/framework/base/src/types/managed/multi_value/multi_value_encoded.rs
@@ -228,7 +228,7 @@ where
     T: TypeAbi,
 {
     fn type_name() -> TypeName {
-        crate::abi::type_name_variadic::<T>()
+        crate::abi::type_name_variadic::<T>().abi
     }
 
     fn provide_type_descriptions<TDC: TypeDescriptionContainer>(accumulator: &mut TDC) {
diff --git a/framework/derive/src/type_abi_derive.rs b/framework/derive/src/type_abi_derive.rs
index efef94acb6..2d5848cc2d 100644
--- a/framework/derive/src/type_abi_derive.rs
+++ b/framework/derive/src/type_abi_derive.rs
@@ -50,16 +50,16 @@ pub fn type_abi_derive(ast: &syn::DeriveInput) -> TokenStream {
             let struct_field_snippets = fields_snippets(&data_struct.fields);
             quote! {
                 fn provide_type_descriptions<TDC: multiversx_sc::abi::TypeDescriptionContainer>(accumulator: &mut TDC) {
-                    let type_name = Self::type_name();
-                    if !accumulator.contains_type(&type_name) {
-                        accumulator.reserve_type_name(type_name.clone());
+                    let type_names = Self::type_names();
+                    if !accumulator.contains_type(&type_names.abi) {
+                        accumulator.reserve_type_name(type_names.clone());
                         let mut field_descriptions = multiversx_sc::types::heap::Vec::new();
                         #(#struct_field_snippets)*
                         accumulator.insert(
-                            type_name.clone(),
+                            type_names.clone(),
                             multiversx_sc::abi::TypeDescription::new(
                                 &[ #(#type_docs),* ],
-                                type_name,
+                                type_names,
                                 multiversx_sc::abi::TypeContents::Struct(field_descriptions),
                             ),
                         );
@@ -93,16 +93,16 @@ pub fn type_abi_derive(ast: &syn::DeriveInput) -> TokenStream {
                 .collect();
             quote! {
                 fn provide_type_descriptions<TDC: multiversx_sc::abi::TypeDescriptionContainer>(accumulator: &mut TDC) {
-                    let type_name = Self::type_name();
-                    if !accumulator.contains_type(&type_name) {
-                        accumulator.reserve_type_name(type_name.clone());
+                    let type_names = Self::type_names();
+                    if !accumulator.contains_type(&type_names.abi) {
+                        accumulator.reserve_type_name(type_names.clone());
                         let mut variant_descriptions = multiversx_sc::types::heap::Vec::new();
                         #(#enum_variant_snippets)*
                         accumulator.insert(
-                            type_name.clone(),
+                            type_names.clone(),
                             multiversx_sc::abi::TypeDescription::new(
                                 &[ #(#type_docs),* ],
-                                type_name,
+                                type_names,
                                 multiversx_sc::abi::TypeContents::Enum(variant_descriptions),
                             ),
                         );
diff --git a/framework/meta/src/abi_json/contract_abi_json.rs b/framework/meta/src/abi_json/contract_abi_json.rs
index c4f62916c3..ffd4d275b4 100644
--- a/framework/meta/src/abi_json/contract_abi_json.rs
+++ b/framework/meta/src/abi_json/contract_abi_json.rs
@@ -70,10 +70,10 @@ pub fn convert_type_descriptions_to_json(
     type_descriptions: &TypeDescriptionContainerImpl,
 ) -> BTreeMap<String, TypeDescriptionJson> {
     let mut types = BTreeMap::new();
-    for (type_name, type_description) in type_descriptions.0.iter() {
+    for (type_names, type_description) in type_descriptions.0.iter() {
         if type_description.contents.is_specified() {
             types.insert(
-                type_name.clone(),
+                type_names.abi.clone(),
                 TypeDescriptionJson::from(type_description),
             );
         }
diff --git a/framework/meta/src/abi_json/endpoint_abi_json.rs b/framework/meta/src/abi_json/endpoint_abi_json.rs
index 5882fcd961..b6bd041713 100644
--- a/framework/meta/src/abi_json/endpoint_abi_json.rs
+++ b/framework/meta/src/abi_json/endpoint_abi_json.rs
@@ -19,7 +19,7 @@ impl From<&InputAbi> for InputAbiJson {
     fn from(abi: &InputAbi) -> Self {
         InputAbiJson {
             arg_name: abi.arg_name.to_string(),
-            type_name: abi.type_name.clone(),
+            type_name: abi.type_names.abi.clone(),
             multi_arg: if abi.multi_arg { Some(true) } else { None },
         }
     }
@@ -43,7 +43,7 @@ impl From<&OutputAbi> for OutputAbiJson {
     fn from(abi: &OutputAbi) -> Self {
         OutputAbiJson {
             output_name: abi.output_name.clone(),
-            type_name: abi.type_name.clone(),
+            type_name: abi.type_names.abi.clone(),
             multi_result: if abi.multi_result { Some(true) } else { None },
         }
     }
diff --git a/framework/meta/src/abi_json/type_abi_json.rs b/framework/meta/src/abi_json/type_abi_json.rs
index 5602ae98cc..f7c3f16e38 100644
--- a/framework/meta/src/abi_json/type_abi_json.rs
+++ b/framework/meta/src/abi_json/type_abi_json.rs
@@ -68,10 +68,13 @@ impl From<&TypeDescription> for TypeDescriptionJson {
 }
 
 impl TypeDescriptionJson {
-    pub fn to_type_description(&self, name: &str) -> TypeDescription {
+    pub fn to_type_description(&self, name_abi: &str, name_rust: &str) -> TypeDescription {
         TypeDescription {
             docs: self.docs.clone(),
-            name: name.to_string(),
+            names: TypeNames {
+                abi: name_abi.to_string(),
+                rust: name_rust.to_string(),
+            },
             contents: match self.content_type.as_str() {
                 TYPE_DESCRIPTION_JSON_TYPE_STRUCT => TypeContents::Struct(
                     self.fields
diff --git a/framework/meta/src/cmd/contract/generate_proxy/proxy_sc_functions_gen.rs b/framework/meta/src/cmd/contract/generate_proxy/proxy_sc_functions_gen.rs
index c16c6489c6..edc7cf8804 100644
--- a/framework/meta/src/cmd/contract/generate_proxy/proxy_sc_functions_gen.rs
+++ b/framework/meta/src/cmd/contract/generate_proxy/proxy_sc_functions_gen.rs
@@ -1,9 +1,10 @@
 use std::{fs::File, io::Write};
 
-use multiversx_sc::abi::{ContractAbi, EndpointAbi, InputAbi, OutputAbi};
+use multiversx_sc::abi::{ContractAbi, EndpointAbi, InputAbi};
 
 use crate::cmd::contract::generate_snippets::{
-    snippet_gen_common::write_newline, snippet_sc_functions_gen::map_output_types_to_rust_types, snippet_type_map::{handle_abi_type, RustTypeString}
+    snippet_gen_common::write_newline,
+    snippet_type_map::{handle_abi_type, RustTypeString},
 };
 
 pub(crate) fn write_content(file: &mut File, abi: ContractAbi) {
@@ -54,25 +55,25 @@ where
     .unwrap();
 }
 
-fn write_function_content(file: &mut File, end: EndpointAbi) {
-    writeln!(
-        file,
-        "\t\tTx::new_with_env(self.env.clone())
-            .raw_call()
-            .function_name(\"{}\")",
-        end.name
-    )
-    .unwrap();
-
-    for input in end.inputs.iter() {
-        writeln!(
-            file,
-            "\t\t\t.argument(&{})",
-            input.arg_name // .argument(&arg0)"
-        )
-        .unwrap();
-    }
-}
+// fn write_function_content(file: &mut File, end: EndpointAbi) {
+//     writeln!(
+//         file,
+//         "\t\tTx::new_with_env(self.env.clone())
+//             .raw_call()
+//             .function_name(\"{}\")",
+//         end.name
+//     )
+//     .unwrap();
+
+//     for input in end.inputs.iter() {
+//         writeln!(
+//             file,
+//             "\t\t\t.argument(&{})",
+//             input.arg_name // .argument(&arg0)"
+//         )
+//         .unwrap();
+//     }
+// }
 
 fn write_constructor_content(file: &mut File, inputs: Vec<InputAbi>) {
     writeln!(
@@ -101,7 +102,7 @@ fn write_constructor_header(file: &mut File, contructor_abi: EndpointAbi) {
 
 fn write_endpoint_header(file: &mut File, contructor_abi: EndpointAbi) {
     write_fn_signature(file, contructor_abi.clone());
-    write_endpoint_output(file, contructor_abi.outputs);
+    // write_endpoint_output(contructor_abi.outputs);
 }
 
 fn write_fn_signature(file: &mut File, endpoint_abi: EndpointAbi) {
@@ -130,17 +131,10 @@ fn write_constructor_output(file: &mut File) {
     .unwrap();
 }
 
-fn write_endpoint_output(file: &mut File, outputs: Vec<OutputAbi>) {
-    let output_type = map_output_types_to_rust_types(&outputs);
-
-    println!("->>> output_type{}", output_type);
-
-    let output_type_print = output_type.replace("<StaticApi>", "<Env::Api>");
-
-    println!("{}", output_type_print);
-    // write!(file, "{output_type_print}",).unwrap();
-    // writeln!(file, "> {{").unwrap();
-}
+// fn write_endpoint_output(outputs: Vec<OutputAbi>) {
+//     let output_type = map_output_types_to_rust_types(&outputs);
+//     let output_type_print = output_type.replace("<StaticApi>", "<Env::Api>");
+// }
 
 fn write_function_header_endpoint(file: &mut File, rust_method_name: String) {
     write!(file, "\tpub fn {rust_method_name}").unwrap();
@@ -164,7 +158,7 @@ fn write_args(file: &mut File, inputs: Vec<InputAbi>) {
     writeln!(file, "<").unwrap();
 
     for (index, input) in inputs.iter().enumerate() {
-        write_argument(file, index, input.type_name.to_string());
+        write_argument(file, index, input.type_names.abi.to_string());
     }
 
     write!(file, "\t>").unwrap();
diff --git a/framework/meta/src/cmd/contract/generate_snippets/snippet_sc_functions_gen.rs b/framework/meta/src/cmd/contract/generate_snippets/snippet_sc_functions_gen.rs
index 6bc0fe01de..ade7591547 100644
--- a/framework/meta/src/cmd/contract/generate_snippets/snippet_sc_functions_gen.rs
+++ b/framework/meta/src/cmd/contract/generate_snippets/snippet_sc_functions_gen.rs
@@ -133,7 +133,7 @@ fn write_endpoint_args_declaration(file: &mut File, inputs: &[InputAbi]) {
     }
 
     for input in inputs {
-        let rust_type = map_abi_type_to_rust_type(input.type_name.clone());
+        let rust_type = map_abi_type_to_rust_type(input.type_names.abi.clone());
         writeln!(
             file,
             "        let {} = {};",
@@ -220,7 +220,7 @@ pub fn map_output_types_to_rust_types(outputs: &[OutputAbi]) -> String {
     }
 
     for (i, output) in outputs.iter().enumerate() {
-        input_str += &output.type_name;
+        input_str += &output.type_names.abi;
 
         if i < results_len - 1 {
             input_str += ",";
diff --git a/framework/meta/src/cmd/contract/sc_config/contract_variant_validate.rs b/framework/meta/src/cmd/contract/sc_config/contract_variant_validate.rs
index a0c0acb886..6347a0f4ee 100644
--- a/framework/meta/src/cmd/contract/sc_config/contract_variant_validate.rs
+++ b/framework/meta/src/cmd/contract/sc_config/contract_variant_validate.rs
@@ -69,7 +69,7 @@ fn validate_endpoint_var_args_order(endpoint_abi: &EndpointAbi) -> Result<(), St
 
 #[cfg(test)]
 mod tests {
-    use multiversx_sc::abi::{InputAbi, TypeName};
+    use multiversx_sc::abi::{InputAbi, TypeNames};
 
     use super::*;
 
@@ -78,12 +78,12 @@ mod tests {
         let mut endpoint_def = EndpointAbi::default();
         let var_arg_1 = InputAbi {
             arg_name: "arg_1".to_string(),
-            type_name: TypeName::new(),
+            type_names: TypeNames::new(),
             multi_arg: true,
         };
         let var_arg_2 = InputAbi {
             arg_name: "arg_2".to_string(),
-            type_name: TypeName::new(),
+            type_names: TypeNames::new(),
             multi_arg: true,
         };
         endpoint_def.inputs.push(var_arg_1);
@@ -103,12 +103,12 @@ mod tests {
         let mut endpoint_def = EndpointAbi::default();
         let arg = InputAbi {
             arg_name: "arg_1".to_string(),
-            type_name: TypeName::new(),
+            type_names: TypeNames::new(),
             multi_arg: false,
         };
         let var_arg_1 = InputAbi {
             arg_name: "arg_2".to_string(),
-            type_name: TypeName::new(),
+            type_names: TypeNames::new(),
             multi_arg: true,
         };
 

From a5948501d34b75835298cfe0f0e73b4f7e6a0d43 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Thu, 7 Mar 2024 15:02:48 +0200
Subject: [PATCH 0399/1254] remove proxy impl

---
 .../adder/proxies_struct_interactor_main.rs   | 134 ++++++++++--------
 .../contract/generate_proxy/proxy_gen_main.rs |   7 +-
 .../generate_proxy/proxy_sc_functions_gen.rs  | 119 ++++------------
 .../generate_proxy/proxy_template_gen.rs      |  41 ++----
 4 files changed, 110 insertions(+), 191 deletions(-)

diff --git a/contracts/examples/adder/proxies_struct_interactor_main.rs b/contracts/examples/adder/proxies_struct_interactor_main.rs
index af7378dc8b..f95b5dd523 100644
--- a/contracts/examples/adder/proxies_struct_interactor_main.rs
+++ b/contracts/examples/adder/proxies_struct_interactor_main.rs
@@ -1,79 +1,87 @@
-////////////////////////////////////////////////////
-////////////////// AUTO-GENERATED //////////////////
-////////////////////////////////////////////////////
-
-#![allow(clippy::all)]
-
-use multiversx_sc::api::VMApi;
-
 multiversx_sc::imports!();
 
 pub struct TxProxy;
 
-impl<Env, From, To, Gas> TxProxyTraitV2<Env, From, To, Gas> for TxProxy
+impl<Env> TxProxyTrait<Env> for TxProxy
 where
     Env: TxEnv,
-    From: TxFrom<Env>,
-    To: TxTo<Env>,
-    Gas: TxGas<Env>,
 {
-    type TxProxyMethods = TxProxyMethods<Env, From, To, Gas>;
+    type TxProxyMethods = TxProxyMethods<Env>;
 
-    fn prepare_methods(self, tx: Tx<Env, From, To, (), Gas, (), ()>) -> Self::TxProxyMethods {
-        TxProxyMethods { wrapped_tx: tx }
+    fn env(self, env: Env) -> Self::TxProxyMethods {
+        TxProxyMethods { env }
     }
 }
 
-pub struct TxProxyMethods<Env, From, To, Gas>
-where
-    Env: TxEnv,
-    From: TxFrom<Env>,
-    To: TxTo<Env>,
-    Gas: TxGas<Env>,
-{
-    wrapped_tx: Tx<Env, From, To, (), Gas, (), ()>,
-}
-
-impl<Env, To, Gas> TxProxyMethods<Env, (), To, Gas>
-where
-    Env: TxEnv,
-    Env::Api: VMApi,
-    To: TxTo<Env>,
-    Gas: TxGas<Env>,
-{
-	pub fn init<
-		Arg0: multiversx_sc::codec::CodecInto<BigUint<Env::Api>>,
+impl<Env: TxEnv + multiversx_sc::api::CallTypeApi> TxProxyMethods<Env> {
+    pub fn init<
+		Arg0: multiversx_sc::codec::CodecInto<BigUint<Env>>
 	>(
-		self,
-		initial_value: Arg0,
-	) -> multiversx_sc::types::Tx<Env, (), To, (), Gas, DeployCall<Env, ()>, OriginalResultMarker<()>>
-	{
-		self.wrapped_tx
+        &mut self,
+        initial_value: Arg0,
+    ) -> multiversx_sc::types::Tx<Env, (), To, (), Gas, DeployCall<Env, ()>, OriginalResultMarker<()>>
+    {
+        self.wrapped_tx
             .raw_deploy()
-			.argument(&initial_value)
-			.original_result()
-	}
+            .argument(&initial_value)
+            .original_result()
+    }
 
-}
-impl<Env, From, To, Gas> TxProxyMethods<Env, From, To, Gas>
-where
-    Env: TxEnv,
-    Env::Api: VMApi,
-    From: TxFrom<Env>,
-    To: TxTo<Env>,
-    Gas: TxGas<Env>,
-{
-	pub fn sum(
-		self,
-	) 	pub fn upgrade<
-		Arg0: multiversx_sc::codec::CodecInto<BigUint<Env::Api>>,
+    pub fn sum(
+        &mut self,
+    ) -> multiversx_sc::types::Tx<
+        Env,
+        (),
+        (),
+        (),
+        (),
+        FunctionCall<<Env as multiversx_sc::types::TxEnv>::Api>,
+        (),
+    > {
+        Tx::new_with_env(self.env.clone())
+            .raw_call()
+            .function_name("getSum")
+    }
+
+    pub fn upgrade<
+		Arg0: multiversx_sc::codec::CodecInto<BigUint<Env>>
 	>(
-		self,
-		initial_value: Arg0,
-	) 	//Add desired amount to the storage variable. 
-	pub fn add<
-		Arg0: multiversx_sc::codec::CodecInto<BigUint<Env::Api>>,
+        &mut self,
+        initial_value: Arg0,
+    ) -> multiversx_sc::types::Tx<
+        Env,
+        (),
+        (),
+        (),
+        (),
+        FunctionCall<<Env as multiversx_sc::types::TxEnv>::Api>,
+        (),
+    > {
+        Tx::new_with_env(self.env.clone())
+            .raw_call()
+            .function_name("upgrade")
+            .argument(&initial_value)
+    }
+
+    //Add desired amount to the storage variable.
+    pub fn add<
+		Arg0: multiversx_sc::codec::CodecInto<BigUint<Env>>
 	>(
-		self,
-		value: Arg0,
-	) }
+        &mut self,
+        value: Arg0,
+    ) -> multiversx_sc::types::Tx<
+        Env,
+        (),
+        (),
+        (),
+        (),
+        FunctionCall<<Env as multiversx_sc::types::TxEnv>::Api>,
+        (),
+    > {
+        Tx::new_with_env(self.env.clone())
+            .raw_call()
+            .function_name("add")
+            .argument(&value)
+    }
+
+}
diff --git a/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_main.rs b/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_main.rs
index e1b7745e31..8fc5455197 100644
--- a/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_main.rs
+++ b/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_main.rs
@@ -9,7 +9,8 @@ use super::{
     proxy_crate_gen::create_file,
     proxy_sc_functions_gen::write_content,
     proxy_template_gen::{
-        write_header, write_impl_for_tx_proxy, write_struct_template, write_struct_tx_proxy_methods,
+        write_impl_for_tx_proxy, write_imports, write_struct_template, 
+        write_tx_proxy_method_header,
     },
 };
 
@@ -23,9 +24,9 @@ impl MetaConfig {
 }
 
 fn write_proxies_to_file(mut file: File, abi: ContractAbi) {
-    write_header(&mut file);
+    write_imports(&mut file);
     write_struct_template(&mut file);
     write_impl_for_tx_proxy(&mut file);
-    write_struct_tx_proxy_methods(&mut file);
+    write_tx_proxy_method_header(&mut file);
     write_content(&mut file, abi);
 }
diff --git a/framework/meta/src/cmd/contract/generate_proxy/proxy_sc_functions_gen.rs b/framework/meta/src/cmd/contract/generate_proxy/proxy_sc_functions_gen.rs
index edc7cf8804..e2421e63f8 100644
--- a/framework/meta/src/cmd/contract/generate_proxy/proxy_sc_functions_gen.rs
+++ b/framework/meta/src/cmd/contract/generate_proxy/proxy_sc_functions_gen.rs
@@ -8,82 +8,32 @@ use crate::cmd::contract::generate_snippets::{
 };
 
 pub(crate) fn write_content(file: &mut File, abi: ContractAbi) {
-    write_header_impl_constructors(file);
     for constructor_abi in abi.constructors {
-        write_constructor_header(file, constructor_abi.clone());
-        write_constructor_content(file, constructor_abi.inputs);
+        write_endpoint(file, constructor_abi.clone());
+        write_function_content(file, constructor_abi);
         write_end_of_function(file);
     }
-    writeln!(file, "}}").unwrap();
 
-    write_header_impl_endpoints(file);
     for endpoint_abi in abi.endpoints {
-        write_endpoint_header(file, endpoint_abi.clone());
-        // write_function_content(file, endpoint_abi);
-        // write_end_of_function(file);
+        write_endpoint(file, endpoint_abi.clone());
+        write_function_content(file, endpoint_abi);
+        write_end_of_function(file);
     }
 
     writeln!(file, "}}").unwrap();
 }
 
-fn write_header_impl_constructors(file: &mut File) {
-    writeln!(
-        file,
-        r#"impl<Env, To, Gas> TxProxyMethods<Env, (), To, Gas>
-where
-    Env: TxEnv,
-    Env::Api: VMApi,
-    To: TxTo<Env>,
-    Gas: TxGas<Env>,
-{{"#
-    )
-    .unwrap();
-}
-
-fn write_header_impl_endpoints(file: &mut File) {
+fn write_function_content(file: &mut File, end: EndpointAbi) {
     writeln!(
         file,
-        r#"impl<Env, From, To, Gas> TxProxyMethods<Env, From, To, Gas>
-where
-    Env: TxEnv,
-    Env::Api: VMApi,
-    From: TxFrom<Env>,
-    To: TxTo<Env>,
-    Gas: TxGas<Env>,
-{{"#
+        "\t\tTx::new_with_env(self.env.clone())
+            .raw_call()
+            .function_name(\"{}\")",
+        end.name
     )
     .unwrap();
-}
 
-// fn write_function_content(file: &mut File, end: EndpointAbi) {
-//     writeln!(
-//         file,
-//         "\t\tTx::new_with_env(self.env.clone())
-//             .raw_call()
-//             .function_name(\"{}\")",
-//         end.name
-//     )
-//     .unwrap();
-
-//     for input in end.inputs.iter() {
-//         writeln!(
-//             file,
-//             "\t\t\t.argument(&{})",
-//             input.arg_name // .argument(&arg0)"
-//         )
-//         .unwrap();
-//     }
-// }
-
-fn write_constructor_content(file: &mut File, inputs: Vec<InputAbi>) {
-    writeln!(
-        file,
-        "\t\tself.wrapped_tx
-            .raw_deploy()"
-    )
-    .unwrap();
-
-    for input in inputs.iter() {
+    for input in end.inputs.iter() {
         writeln!(
             file,
             "\t\t\t.argument(&{})",
@@ -91,51 +41,38 @@ fn write_constructor_content(file: &mut File, inputs: Vec<InputAbi>) {
         )
         .unwrap();
     }
-
-    writeln!(file, "\t\t\t.original_result()").unwrap();
 }
 
-fn write_constructor_header(file: &mut File, contructor_abi: EndpointAbi) {
-    write_fn_signature(file, contructor_abi);
-    write_constructor_output(file);
-}
-
-fn write_endpoint_header(file: &mut File, contructor_abi: EndpointAbi) {
-    write_fn_signature(file, contructor_abi.clone());
-    // write_endpoint_output(contructor_abi.outputs);
-}
-
-fn write_fn_signature(file: &mut File, endpoint_abi: EndpointAbi) {
+fn write_endpoint(file: &mut File, endpoint_abi: EndpointAbi) {
     write_info_endpoint(file, endpoint_abi.docs);
     write_function_header_endpoint(file, endpoint_abi.rust_method_name);
     write_args(file, endpoint_abi.inputs.clone());
-    write_parameters(file, endpoint_abi.inputs);
+    write_parameters_and_output(file, endpoint_abi.inputs);
 }
 
-fn write_parameters(file: &mut File, inputs: Vec<InputAbi>) {
+#[rustfmt::skip]
+fn write_parameters_and_output(file: &mut File, inputs: Vec<InputAbi>) {
     writeln!(file, "(").unwrap();
-    writeln!(file, "\t\tself,").unwrap();
+    writeln!(file, "\t\t&mut self,").unwrap();
 
     for (index, input) in inputs.iter().enumerate() {
         writeln!(file, "\t\t{}: Arg{index},", &input.arg_name).unwrap();
     }
 
-    write!(file, "\t) ").unwrap();
-}
-
-fn write_constructor_output(file: &mut File) {
-    writeln!(
+    write!(
         file,
-        "-> multiversx_sc::types::Tx<Env, (), To, (), Gas, DeployCall<Env, ()>, OriginalResultMarker<()>>\n\t{{"
+        "\t) -> multiversx_sc::types::Tx<Env,
+        (),
+        (),
+        (),
+        (),
+        FunctionCall<<Env as multiversx_sc::types::TxEnv>::Api>,
+        (),
+    > {{\n"
     )
     .unwrap();
 }
 
-// fn write_endpoint_output(outputs: Vec<OutputAbi>) {
-//     let output_type = map_output_types_to_rust_types(&outputs);
-//     let output_type_print = output_type.replace("<StaticApi>", "<Env::Api>");
-// }
-
 fn write_function_header_endpoint(file: &mut File, rust_method_name: String) {
     write!(file, "\tpub fn {rust_method_name}").unwrap();
 }
@@ -167,11 +104,9 @@ fn write_args(file: &mut File, inputs: Vec<InputAbi>) {
 fn write_argument(file: &mut File, index: usize, type_name: String) {
     let mut type_string = RustTypeString::default();
     handle_abi_type(&mut type_string, type_name);
+    let type_string_str = type_string.get_type_name().to_string();
 
-    let type_print = type_string
-        .get_type_name()
-        .to_string()
-        .replace("<StaticApi>", "<Env::Api>");
+    let type_print = type_string_str.replace("<StaticApi>", "<Env>");
 
     writeln!(
         file,
diff --git a/framework/meta/src/cmd/contract/generate_proxy/proxy_template_gen.rs b/framework/meta/src/cmd/contract/generate_proxy/proxy_template_gen.rs
index 7af38cd93a..9742b54c59 100644
--- a/framework/meta/src/cmd/contract/generate_proxy/proxy_template_gen.rs
+++ b/framework/meta/src/cmd/contract/generate_proxy/proxy_template_gen.rs
@@ -2,20 +2,8 @@ use std::{fs::File, io::Write};
 
 use crate::cmd::contract::generate_snippets::snippet_gen_common::write_newline;
 
-const PREFIX_AUTO_GENERATED: &str = "////////////////////////////////////////////////////
-////////////////// AUTO-GENERATED //////////////////
-////////////////////////////////////////////////////
-";
-
-const IMPORTS: &str = "#![allow(clippy::all)]
-
-use multiversx_sc::api::VMApi;
-
-multiversx_sc::imports!();";
-
-pub(crate) fn write_header(file: &mut File) {
-    writeln!(file, "{PREFIX_AUTO_GENERATED}").unwrap();
-    writeln!(file, r#"{IMPORTS}"#).unwrap();
+pub(crate) fn write_imports(file: &mut File) {
+    writeln!(file, r#"multiversx_sc::imports!();"#).unwrap();
 
     write_newline(file);
 }
@@ -28,17 +16,14 @@ pub(crate) fn write_struct_template(file: &mut File) {
 pub(crate) fn write_impl_for_tx_proxy(file: &mut File) {
     writeln!(
         file,
-        r#"impl<Env, From, To, Gas> TxProxyTraitV2<Env, From, To, Gas> for TxProxy
+        r#"impl<Env> TxProxyTrait<Env> for TxProxy
 where
     Env: TxEnv,
-    From: TxFrom<Env>,
-    To: TxTo<Env>,
-    Gas: TxGas<Env>,
 {{
-    type TxProxyMethods = TxProxyMethods<Env, From, To, Gas>;
+    type TxProxyMethods = TxProxyMethods<Env>;
 
-    fn prepare_methods(self, tx: Tx<Env, From, To, (), Gas, (), ()>) -> Self::TxProxyMethods {{
-        TxProxyMethods {{ wrapped_tx: tx }}
+    fn env(self, env: Env) -> Self::TxProxyMethods {{
+        TxProxyMethods {{ env }}
     }}
 }}"#
     )
@@ -47,20 +32,10 @@ where
     write_newline(file);
 }
 
-pub(crate) fn write_struct_tx_proxy_methods(file: &mut File) {
+pub(crate) fn write_tx_proxy_method_header(file: &mut File) {
     writeln!(
         file,
-        r#"pub struct TxProxyMethods<Env, From, To, Gas>
-where
-    Env: TxEnv,
-    From: TxFrom<Env>,
-    To: TxTo<Env>,
-    Gas: TxGas<Env>,
-{{
-    wrapped_tx: Tx<Env, From, To, (), Gas, (), ()>,
-}}"#
+        r#"impl<Env: TxEnv + multiversx_sc::api::CallTypeApi> TxProxyMethods<Env> {{"#
     )
     .unwrap();
-
-    write_newline(file);
 }

From 04564ca1df09d8269b04957a99b3f597014a14c6 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Thu, 7 Mar 2024 19:54:27 +0100
Subject: [PATCH 0400/1254] fixed map mapper get from address issue + tests

---
 .../storage_mapper_get_at_address.scen.json   | 65 ++++++++++++++++++-
 .../src/storage_mapper_get_at_address.rs      | 27 ++++++++
 .../basic-features/wasm/src/lib.rs            |  7 +-
 .../base/src/storage/mappers/map_mapper.rs    |  8 ++-
 4 files changed, 102 insertions(+), 5 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 e2beefa293..6c2feb1d84 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
@@ -240,6 +240,69 @@
                 "gas": "*",
                 "refund": "*"
             }
+        },
+        {
+            "step": "scCall",
+            "id": "fill map mapper",
+            "tx": {
+                "from": "address:an_account",
+                "to": "sc:to-be-called",
+                "function": "fill_map_mapper",
+                "arguments": [
+                    "5"
+                ],
+                "gasLimit": "50,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": [],
+                "status": "",
+                "logs": "*",
+                "gas": "*",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "keys at address",
+            "tx": {
+                "from": "address:an_account",
+                "to": "sc:caller",
+                "function": "keys_at_address",
+                "arguments": [],
+                "gasLimit": "50,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": [
+                    "0x0000271100002712000027130000271400002715"
+                ],
+                "status": "",
+                "logs": "*",
+                "gas": "*",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "values at address",
+            "tx": {
+                "from": "address:an_account",
+                "to": "sc:caller",
+                "function": "values_at_address",
+                "arguments": [],
+                "gasLimit": "50,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": [
+                    "0x0000000100000002000000030000000400000005"
+                ],
+                "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 7fc07d48eb..7970619957 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
@@ -70,15 +70,42 @@ pub trait StorageMapperGetAtAddress {
         mapper.back().unwrap()
     }
 
+    #[endpoint]
+    fn keys_at_address(&self) -> ManagedVec<u32> {
+        let address = self.contract_address().get();
+        let mapper: MapMapper<u32, u32, _> =
+            MapMapper::new_from_address(address, StorageKey::from("map_mapper"));
+        mapper.keys().collect()
+    }
+
+    #[endpoint]
+    fn values_at_address(&self) -> ManagedVec<u32> {
+        let address = self.contract_address().get();
+        let mapper: MapMapper<u32, u32, _> =
+            MapMapper::new_from_address(address, StorageKey::from("map_mapper"));
+        mapper.values().collect()
+    }
+
     /// 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<u32>;
 
+    #[storage_mapper("map_mapper")]
+    fn map_mapper(&self) -> MapMapper<u32, u32>;
+
     #[endpoint]
     fn fill_set_mapper(&self, value: u32) {
         for item in 1u32..=value {
             self.set_mapper().insert(item);
         }
     }
+
+    #[endpoint]
+    fn fill_map_mapper(&self, value: u32) {
+        for item in 1u32..=value {
+            let key = 10_000u32 + item;
+            self.map_mapper().insert(key, item);
+        }
+    }
 }
diff --git a/contracts/feature-tests/basic-features/wasm/src/lib.rs b/contracts/feature-tests/basic-features/wasm/src/lib.rs
index e87654cc7e..dba8d815a6 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:                          384
+// Endpoints:                          387
 // Async Callback:                       1
-// Total number of exported functions: 386
+// Total number of exported functions: 389
 
 #![no_std]
 #![allow(internal_features)]
@@ -403,7 +403,10 @@ multiversx_sc_wasm_adapter::endpoints! {
         previous_at_address => previous_at_address
         front_at_address => front_at_address
         back_at_address => back_at_address
+        keys_at_address => keys_at_address
+        values_at_address => values_at_address
         fill_set_mapper => fill_set_mapper
+        fill_map_mapper => fill_map_mapper
     )
 }
 
diff --git a/framework/base/src/storage/mappers/map_mapper.rs b/framework/base/src/storage/mappers/map_mapper.rs
index 8ed38a3c70..af4bbda6ff 100644
--- a/framework/base/src/storage/mappers/map_mapper.rs
+++ b/framework/base/src/storage/mappers/map_mapper.rs
@@ -11,7 +11,7 @@ use crate::{
         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},
+    storage::{storage_clear, storage_set, StorageKey},
     types::{ManagedAddress, ManagedType, MultiValueEncoded},
 };
 
@@ -26,6 +26,7 @@ where
     V: TopEncode + TopDecode + 'static,
 {
     _phantom_api: PhantomData<SA>,
+    address: A,
     base_key: StorageKey<SA>,
     keys_set: SetMapper<SA, K, A>,
     _phantom_value: PhantomData<V>,
@@ -40,6 +41,7 @@ where
     fn new(base_key: StorageKey<SA>) -> Self {
         MapMapper {
             _phantom_api: PhantomData,
+            address: CurrentStorage,
             base_key: base_key.clone(),
             keys_set: SetMapper::new(base_key),
             _phantom_value: PhantomData,
@@ -106,6 +108,7 @@ where
     pub fn new_from_address(address: ManagedAddress<SA>, base_key: StorageKey<SA>) -> Self {
         MapMapper {
             _phantom_api: PhantomData,
+            address: address.clone(),
             base_key: base_key.clone(),
             keys_set: SetMapper::new_from_address(address, base_key),
             _phantom_value: PhantomData,
@@ -149,7 +152,8 @@ where
     }
 
     fn get_mapped_value(&self, key: &K) -> V {
-        storage_get(self.build_named_key(MAPPED_VALUE_IDENTIFIER, key).as_ref())
+        self.address
+            .address_storage_get(self.build_named_key(MAPPED_VALUE_IDENTIFIER, key).as_ref())
     }
 
     /// Gets a reference to the value in the entry.

From 0544f1bceff8025b589f14ee0907e3b8f8b55acb Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 8 Mar 2024 07:43:10 +0200
Subject: [PATCH 0401/1254] unified syntax - scenario result handler generic
 env

---
 .../src/facade/world_tx/scenario_rh_list.rs   | 31 +++++++++++++------
 .../facade/world_tx/scenario_rh_list_item.rs  | 13 +++++---
 .../src/facade/world_tx/scenario_tx.rs        |  4 +--
 .../facade/world_tx/with_tx_raw_response.rs   | 11 +++++--
 4 files changed, 40 insertions(+), 19 deletions(-)

diff --git a/framework/scenario/src/facade/world_tx/scenario_rh_list.rs b/framework/scenario/src/facade/world_tx/scenario_rh_list.rs
index e86bb6910f..4273b83fe7 100644
--- a/framework/scenario/src/facade/world_tx/scenario_rh_list.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_rh_list.rs
@@ -2,24 +2,34 @@ use multiversx_sc::types::{ConsNoRet, ConsRet, OriginalResultMarker, RHList, RHL
 
 use crate::scenario_model::TxResponse;
 
-use super::{RHListItemScenario, ScenarioTxEnvironment};
+use super::RHListItemScenario;
 
-pub trait RHListScenario: RHList<ScenarioTxEnvironment> {
+pub trait RHListScenario<Env>: RHList<Env>
+where
+    Env: TxEnv,
+{
     fn item_scenario_result(self, tx_response: &TxResponse) -> Self::ListReturns;
 }
 
-impl RHListScenario for () {
+impl<Env> RHListScenario<Env> for ()
+where
+    Env: TxEnv,
+{
     fn item_scenario_result(self, tx_response: &TxResponse) -> Self::ListReturns {}
 }
 
-impl<O> RHListScenario for OriginalResultMarker<O> {
+impl<Env, O> RHListScenario<Env> for OriginalResultMarker<O>
+where
+    Env: TxEnv,
+{
     fn item_scenario_result(self, tx_response: &TxResponse) -> Self::ListReturns {}
 }
 
-impl<Head, Tail> RHListScenario for ConsRet<ScenarioTxEnvironment, Head, Tail>
+impl<Env, Head, Tail> RHListScenario<Env> for ConsRet<Env, Head, Tail>
 where
-    Head: RHListItemScenario<Tail::OriginalResult>,
-    Tail: RHListScenario,
+    Env: TxEnv,
+    Head: RHListItemScenario<Env, Tail::OriginalResult>,
+    Tail: RHListScenario<Env>,
 {
     fn item_scenario_result(self, tx_response: &TxResponse) -> Self::ListReturns {
         let head_result = self.head.item_scenario_result(tx_response);
@@ -28,10 +38,11 @@ where
     }
 }
 
-impl<Head, Tail> RHListScenario for ConsNoRet<ScenarioTxEnvironment, Head, Tail>
+impl<Env, Head, Tail> RHListScenario<Env> for ConsNoRet<Env, Head, Tail>
 where
-    Head: RHListItemScenario<Tail::OriginalResult, Returns = ()>,
-    Tail: RHListScenario,
+    Env: TxEnv,
+    Head: RHListItemScenario<Env, Tail::OriginalResult, Returns = ()>,
+    Tail: RHListScenario<Env>,
 {
     fn item_scenario_result(self, tx_response: &TxResponse) -> Self::ListReturns {
         self.head.item_scenario_result(tx_response);
diff --git a/framework/scenario/src/facade/world_tx/scenario_rh_list_item.rs b/framework/scenario/src/facade/world_tx/scenario_rh_list_item.rs
index da0a98ff99..748df069d1 100644
--- a/framework/scenario/src/facade/world_tx/scenario_rh_list_item.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_rh_list_item.rs
@@ -10,12 +10,16 @@ use crate::{
 
 use super::ScenarioTxEnvironment;
 
-pub trait RHListItemScenario<Original>: RHListItem<ScenarioTxEnvironment, Original> {
+pub trait RHListItemScenario<Env, Original>: RHListItem<Env, Original>
+where
+    Env: TxEnv,
+{
     fn item_scenario_result(self, tx_response: &TxResponse) -> Self::Returns;
 }
 
-impl<Original> RHListItemScenario<Original> for ReturnsExact
+impl<Env, Original> RHListItemScenario<Env, Original> for ReturnsExact
 where
+    Env: TxEnv,
     Original: TopDecodeMulti,
 {
     fn item_scenario_result(self, tx_response: &TxResponse) -> Self::Returns {
@@ -26,9 +30,10 @@ where
     }
 }
 
-impl<F, Original> RHListItemScenario<Original> for WithResultNewAddress<ScenarioTxEnvironment, F>
+impl<Env, Original, F> RHListItemScenario<Env, Original> for WithResultNewAddress<Env, F>
 where
-    F: FnOnce(&ManagedAddress<StaticApi>),
+    Env: TxEnv,
+    F: FnOnce(&ManagedAddress<Env::Api>),
 {
     fn item_scenario_result(self, tx_response: &TxResponse) -> Self::Returns {
         let new_address = tx_response
diff --git a/framework/scenario/src/facade/world_tx/scenario_tx.rs b/framework/scenario/src/facade/world_tx/scenario_tx.rs
index 13449cb8d4..60673f2c44 100644
--- a/framework/scenario/src/facade/world_tx/scenario_tx.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_tx.rs
@@ -82,7 +82,7 @@ where
     To: TxToSpecified<ScenarioTxEnvironment>,
     Payment: TxPayment<ScenarioTxEnvironment>,
     Gas: TxGas<ScenarioTxEnvironment>,
-    RH: RHListScenario,
+    RH: RHListScenario<ScenarioTxEnvironment>,
     RH::ListReturns: NestedTupleFlatten,
 {
     type Returns = <RH::ListReturns as NestedTupleFlatten>::Unpacked;
@@ -120,7 +120,7 @@ where
     Payment: TxPayment<ScenarioTxEnvironment>,
     Gas: TxGas<ScenarioTxEnvironment>,
     CodeValue: TxCodeValue<ScenarioTxEnvironment>,
-    RH: RHListScenario,
+    RH: RHListScenario<ScenarioTxEnvironment>,
     RH::ListReturns: NestedTupleFlatten,
 {
     type Returns = <RH::ListReturns as NestedTupleFlatten>::Unpacked;
diff --git a/framework/scenario/src/facade/world_tx/with_tx_raw_response.rs b/framework/scenario/src/facade/world_tx/with_tx_raw_response.rs
index 8b63cfdfcc..75acd6707c 100644
--- a/framework/scenario/src/facade/world_tx/with_tx_raw_response.rs
+++ b/framework/scenario/src/facade/world_tx/with_tx_raw_response.rs
@@ -1,6 +1,9 @@
 use core::marker::PhantomData;
 
-use multiversx_sc::{codec::TopDecodeMulti, types::RHListItem};
+use multiversx_sc::{
+    codec::TopDecodeMulti,
+    types::{RHListItem, TxEnv},
+};
 
 use crate::scenario_model::TxResponse;
 
@@ -11,15 +14,17 @@ pub struct WithRawTxResponse<F>(pub F)
 where
     F: FnOnce(&TxResponse);
 
-impl<F, Original> RHListItem<ScenarioTxEnvironment, Original> for WithRawTxResponse<F>
+impl<Env, Original, F> RHListItem<Env, Original> for WithRawTxResponse<F>
 where
+    Env: TxEnv,
     F: FnOnce(&TxResponse),
 {
     type Returns = ();
 }
 
-impl<Original, F> RHListItemScenario<Original> for WithRawTxResponse<F>
+impl<Env, Original, F> RHListItemScenario<Env, Original> for WithRawTxResponse<F>
 where
+    Env: TxEnv,
     Original: TopDecodeMulti,
     F: FnOnce(&TxResponse),
 {

From 4e773c155d5a28c96435cb4cb3cda41204744abd Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 8 Mar 2024 07:49:38 +0200
Subject: [PATCH 0402/1254] unified syntax - rename ScenarioTxEnv

---
 .../src/facade/world_tx/expr/file_expr.rs     |  8 ++--
 .../src/facade/world_tx/expr/mxsc_expr.rs     | 10 ++---
 .../src/facade/world_tx/scenario_env.rs       |  6 +--
 .../facade/world_tx/scenario_rh_list_item.rs  |  2 +-
 .../src/facade/world_tx/scenario_tx.rs        | 38 ++++++++-----------
 .../facade/world_tx/with_tx_raw_response.rs   |  2 +-
 6 files changed, 29 insertions(+), 37 deletions(-)

diff --git a/framework/scenario/src/facade/world_tx/expr/file_expr.rs b/framework/scenario/src/facade/world_tx/expr/file_expr.rs
index 1cb80997e4..65965ecf8b 100644
--- a/framework/scenario/src/facade/world_tx/expr/file_expr.rs
+++ b/framework/scenario/src/facade/world_tx/expr/file_expr.rs
@@ -9,21 +9,21 @@ use multiversx_sc::types::{
     TxToSpecified,
 };
 
-use crate::{api::StaticApi, ScenarioTxEnvironment};
+use crate::{api::StaticApi, ScenarioTxEnv};
 
 const FILE_PREFIX: &str = "file:";
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
 pub struct FileExpr<'a>(pub &'a str);
 
-impl<'a> AnnotatedValue<ScenarioTxEnvironment, ManagedBuffer<StaticApi>> for FileExpr<'a> {
-    fn annotation(&self, _env: &ScenarioTxEnvironment) -> ManagedBuffer<StaticApi> {
+impl<'a> AnnotatedValue<ScenarioTxEnv, ManagedBuffer<StaticApi>> for FileExpr<'a> {
+    fn annotation(&self, _env: &ScenarioTxEnv) -> ManagedBuffer<StaticApi> {
         let mut result = ManagedBuffer::new_from_bytes(FILE_PREFIX.as_bytes());
         result.append_bytes(self.0.as_bytes());
         result
     }
 
-    fn into_value(self, env: &ScenarioTxEnvironment) -> ManagedBuffer<StaticApi> {
+    fn into_value(self, env: &ScenarioTxEnv) -> ManagedBuffer<StaticApi> {
         let context = InterpreterContext::new().with_dir(env.context_path.clone());
         let value = interpret_string(&format!("{FILE_PREFIX}{}", self.0), &context);
         value.into()
diff --git a/framework/scenario/src/facade/world_tx/expr/mxsc_expr.rs b/framework/scenario/src/facade/world_tx/expr/mxsc_expr.rs
index a0ba7c4ef9..25f9f21f42 100644
--- a/framework/scenario/src/facade/world_tx/expr/mxsc_expr.rs
+++ b/framework/scenario/src/facade/world_tx/expr/mxsc_expr.rs
@@ -9,21 +9,21 @@ use multiversx_sc::types::{
     TxTo, TxToSpecified,
 };
 
-use crate::{api::StaticApi, ScenarioTxEnvironment};
+use crate::{api::StaticApi, ScenarioTxEnv};
 
 const MXSC_PREFIX: &str = "mxsc:";
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
 pub struct MxscExpr<'a>(pub &'a str);
 
-impl<'a> AnnotatedValue<ScenarioTxEnvironment, ManagedBuffer<StaticApi>> for MxscExpr<'a> {
-    fn annotation(&self, _env: &ScenarioTxEnvironment) -> ManagedBuffer<StaticApi> {
+impl<'a> AnnotatedValue<ScenarioTxEnv, ManagedBuffer<StaticApi>> for MxscExpr<'a> {
+    fn annotation(&self, _env: &ScenarioTxEnv) -> ManagedBuffer<StaticApi> {
         let mut result = ManagedBuffer::new_from_bytes(MXSC_PREFIX.as_bytes());
         result.append_bytes(self.0.as_bytes());
         result
     }
 
-    fn into_value(self, env: &ScenarioTxEnvironment) -> ManagedBuffer<StaticApi> {
+    fn into_value(self, env: &ScenarioTxEnv) -> ManagedBuffer<StaticApi> {
         let context = InterpreterContext::new()
             .with_dir(env.context_path.clone())
             .with_allowed_missing_files();
@@ -32,4 +32,4 @@ impl<'a> AnnotatedValue<ScenarioTxEnvironment, ManagedBuffer<StaticApi>> for Mxs
     }
 }
 
-impl<'a> TxCodeValue<ScenarioTxEnvironment> for MxscExpr<'a> {}
+impl<'a> TxCodeValue<ScenarioTxEnv> for MxscExpr<'a> {}
diff --git a/framework/scenario/src/facade/world_tx/scenario_env.rs b/framework/scenario/src/facade/world_tx/scenario_env.rs
index 6e8a8ef8b4..9076cc5d48 100644
--- a/framework/scenario/src/facade/world_tx/scenario_env.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_env.rs
@@ -4,15 +4,15 @@ use multiversx_sc::types::{AnnotatedValue, ManagedAddress, TxBaseWithEnv, TxEnv}
 
 use crate::{api::StaticApi, scenario_model::TxResponse};
 
-pub type TxScenarioBase = TxBaseWithEnv<ScenarioTxEnvironment>;
+pub type TxScenarioBase = TxBaseWithEnv<ScenarioTxEnv>;
 
 #[derive(Default, Debug, Clone)]
-pub struct ScenarioTxEnvironment {
+pub struct ScenarioTxEnv {
     pub context_path: PathBuf,
     pub response: Option<TxResponse>,
 }
 
-impl TxEnv for ScenarioTxEnvironment {
+impl TxEnv for ScenarioTxEnv {
     type Api = StaticApi;
 
     fn resolve_sender_address(&self) -> ManagedAddress<Self::Api> {
diff --git a/framework/scenario/src/facade/world_tx/scenario_rh_list_item.rs b/framework/scenario/src/facade/world_tx/scenario_rh_list_item.rs
index 748df069d1..a357a6dcd8 100644
--- a/framework/scenario/src/facade/world_tx/scenario_rh_list_item.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_rh_list_item.rs
@@ -8,7 +8,7 @@ use crate::{
     scenario_model::{TxResponse, TypedResponse},
 };
 
-use super::ScenarioTxEnvironment;
+use super::ScenarioTxEnv;
 
 pub trait RHListItemScenario<Env, Original>: RHListItem<Env, Original>
 where
diff --git a/framework/scenario/src/facade/world_tx/scenario_tx.rs b/framework/scenario/src/facade/world_tx/scenario_tx.rs
index 60673f2c44..ae10294e72 100644
--- a/framework/scenario/src/facade/world_tx/scenario_tx.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_tx.rs
@@ -14,11 +14,11 @@ use crate::{
     ScenarioWorld,
 };
 
-use super::{RHListScenario, ScenarioTxEnvironment, TxScenarioBase};
+use super::{RHListScenario, ScenarioTxEnv, TxScenarioBase};
 
 impl ScenarioWorld {
-    fn tx_env(&self) -> ScenarioTxEnvironment {
-        ScenarioTxEnvironment {
+    fn tx_env(&self) -> ScenarioTxEnv {
+        ScenarioTxEnv {
             context_path: self.current_dir.clone(),
             ..Default::default()
         }
@@ -76,13 +76,13 @@ where
 }
 
 impl<From, To, Payment, Gas, RH> ScenarioTx
-    for Tx<ScenarioTxEnvironment, From, To, Payment, Gas, FunctionCall<StaticApi>, RH>
+    for Tx<ScenarioTxEnv, From, To, Payment, Gas, FunctionCall<StaticApi>, RH>
 where
-    From: TxFromSpecified<ScenarioTxEnvironment>,
-    To: TxToSpecified<ScenarioTxEnvironment>,
-    Payment: TxPayment<ScenarioTxEnvironment>,
-    Gas: TxGas<ScenarioTxEnvironment>,
-    RH: RHListScenario<ScenarioTxEnvironment>,
+    From: TxFromSpecified<ScenarioTxEnv>,
+    To: TxToSpecified<ScenarioTxEnv>,
+    Payment: TxPayment<ScenarioTxEnv>,
+    Gas: TxGas<ScenarioTxEnv>,
+    RH: RHListScenario<ScenarioTxEnv>,
     RH::ListReturns: NestedTupleFlatten,
 {
     type Returns = <RH::ListReturns as NestedTupleFlatten>::Unpacked;
@@ -106,21 +106,13 @@ where
 }
 
 impl<From, Payment, Gas, CodeValue, RH> ScenarioTx
-    for Tx<
-        ScenarioTxEnvironment,
-        From,
-        (),
-        Payment,
-        Gas,
-        DeployCall<ScenarioTxEnvironment, Code<CodeValue>>,
-        RH,
-    >
+    for Tx<ScenarioTxEnv, From, (), Payment, Gas, DeployCall<ScenarioTxEnv, Code<CodeValue>>, RH>
 where
-    From: TxFromSpecified<ScenarioTxEnvironment>,
-    Payment: TxPayment<ScenarioTxEnvironment>,
-    Gas: TxGas<ScenarioTxEnvironment>,
-    CodeValue: TxCodeValue<ScenarioTxEnvironment>,
-    RH: RHListScenario<ScenarioTxEnvironment>,
+    From: TxFromSpecified<ScenarioTxEnv>,
+    Payment: TxPayment<ScenarioTxEnv>,
+    Gas: TxGas<ScenarioTxEnv>,
+    CodeValue: TxCodeValue<ScenarioTxEnv>,
+    RH: RHListScenario<ScenarioTxEnv>,
     RH::ListReturns: NestedTupleFlatten,
 {
     type Returns = <RH::ListReturns as NestedTupleFlatten>::Unpacked;
diff --git a/framework/scenario/src/facade/world_tx/with_tx_raw_response.rs b/framework/scenario/src/facade/world_tx/with_tx_raw_response.rs
index 75acd6707c..053c962555 100644
--- a/framework/scenario/src/facade/world_tx/with_tx_raw_response.rs
+++ b/framework/scenario/src/facade/world_tx/with_tx_raw_response.rs
@@ -7,7 +7,7 @@ use multiversx_sc::{
 
 use crate::scenario_model::TxResponse;
 
-use super::{RHListItemScenario, ScenarioTxEnvironment};
+use super::{RHListItemScenario, ScenarioTxEnv};
 
 /// Wraps a closure that handles a `TxResponse` object.
 pub struct WithRawTxResponse<F>(pub F)

From 3029c57535dc041dce3637bd1984808026b0f3ea Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Fri, 8 Mar 2024 12:15:05 +0200
Subject: [PATCH 0403/1254] impl changes from review

---
 .../abi-tester/tests/abi_tester_abi_test.rs   |  7 +++--
 framework/base/src/abi/type_abi.rs            | 30 +++++++------------
 .../base/src/abi/type_abi_impl_codec_multi.rs |  4 +--
 framework/base/src/external_view_contract.rs  |  7 ++---
 .../src/storage/mappers/linked_list_mapper.rs |  2 +-
 .../base/src/storage/mappers/queue_mapper.rs  |  2 +-
 .../base/src/storage/mappers/set_mapper.rs    |  2 +-
 .../src/storage/mappers/unique_id_mapper.rs   |  2 +-
 .../storage/mappers/unordered_set_mapper.rs   |  2 +-
 .../base/src/storage/mappers/user_mapper.rs   |  2 +-
 .../base/src/storage/mappers/vec_mapper.rs    |  2 +-
 framework/base/src/types/heap/h256_address.rs |  4 ---
 .../src/types/interaction/function_call.rs    |  2 +-
 framework/base/src/types/managed/basic/mod.rs | 28 ++++++++---------
 .../multi_value/multi_value_encoded.rs        |  2 +-
 framework/meta/src/abi_json/type_abi_json.rs  |  7 ++---
 16 files changed, 44 insertions(+), 61 deletions(-)

diff --git a/contracts/feature-tests/abi-tester/tests/abi_tester_abi_test.rs b/contracts/feature-tests/abi-tester/tests/abi_tester_abi_test.rs
index f288a90059..e5a31ef9e4 100644
--- a/contracts/feature-tests/abi-tester/tests/abi_tester_abi_test.rs
+++ b/contracts/feature-tests/abi-tester/tests/abi_tester_abi_test.rs
@@ -1,7 +1,7 @@
 use std::{fs, fs::File, io::Write};
 
 use multiversx_sc::{
-    abi::{EnumVariantDescription, TypeContents},
+    abi::{EnumVariantDescription, TypeContents, TypeNames},
     contract_base::ContractAbiProvider,
 };
 use multiversx_sc_meta::{
@@ -94,7 +94,10 @@ fn abi_deserialization_check() {
         .types
         .get("AbiEnum")
         .unwrap()
-        .to_type_description("AbiEnum", "Enum");
+        .to_type_description(TypeNames {
+            abi: "AbiEnum".to_string(),
+            rust: "Enum".to_string(),
+        });
     if let TypeContents::Enum(variants) = abi_enum_type.contents {
         assert_eq!(variants.len(), 4);
         assert_eq!(
diff --git a/framework/base/src/abi/type_abi.rs b/framework/base/src/abi/type_abi.rs
index 3643cb9cf2..40c5022827 100644
--- a/framework/base/src/abi/type_abi.rs
+++ b/framework/base/src/abi/type_abi.rs
@@ -62,26 +62,16 @@ pub trait TypeAbi {
     }
 }
 
-pub fn type_name_variadic<T: TypeAbi>() -> TypeNames {
-    let mut abi = TypeName::from("variadic<");
-    abi.push_str(T::type_name().as_str());
-    abi.push('>');
-
-    let mut rust = TypeName::from("variadic<");
-    rust.push_str(T::type_name_rust().as_str());
-    rust.push('>');
-
-    TypeNames { abi, rust }
+pub fn type_name_variadic<T: TypeAbi>() -> TypeName {
+    let mut repr = TypeName::from("variadic<");
+    repr.push_str(T::type_name().as_str());
+    repr.push('>');
+    repr
 }
 
-pub fn type_name_optional<T: TypeAbi>() -> TypeNames {
-    let mut abi = TypeName::from("optional<");
-    abi.push_str(T::type_name().as_str());
-    abi.push('>');
-
-    let mut rust = TypeName::from("optional<");
-    rust.push_str(T::type_name().as_str());
-    rust.push('>');
-
-    TypeNames { abi, rust }
+pub fn type_name_optional<T: TypeAbi>() -> TypeName {
+    let mut repr = TypeName::from("optional<");
+    repr.push_str(T::type_name().as_str());
+    repr.push('>');
+    repr
 }
diff --git a/framework/base/src/abi/type_abi_impl_codec_multi.rs b/framework/base/src/abi/type_abi_impl_codec_multi.rs
index 0a15206a46..6227634258 100644
--- a/framework/base/src/abi/type_abi_impl_codec_multi.rs
+++ b/framework/base/src/abi/type_abi_impl_codec_multi.rs
@@ -6,7 +6,7 @@ use crate::{
 #[cfg(feature = "alloc")]
 impl<T: TypeAbi> TypeAbi for crate::codec::multi_types::MultiValueVec<T> {
     fn type_name() -> TypeName {
-        super::type_name_variadic::<T>().abi
+        super::type_name_variadic::<T>()
     }
 
     fn provide_type_descriptions<TDC: TypeDescriptionContainer>(accumulator: &mut TDC) {
@@ -30,7 +30,7 @@ impl TypeAbi for IgnoreValue {
 
 impl<T: TypeAbi> TypeAbi for OptionalValue<T> {
     fn type_name() -> TypeName {
-        super::type_name_optional::<T>().abi
+        super::type_name_optional::<T>()
     }
 
     fn provide_type_descriptions<TDC: TypeDescriptionContainer>(accumulator: &mut TDC) {
diff --git a/framework/base/src/external_view_contract.rs b/framework/base/src/external_view_contract.rs
index 325eb93420..2b01176176 100644
--- a/framework/base/src/external_view_contract.rs
+++ b/framework/base/src/external_view_contract.rs
@@ -1,7 +1,7 @@
 use alloc::string::ToString;
 
 use crate::{
-    abi::{EndpointAbi, EndpointMutabilityAbi, EndpointTypeAbi, InputAbi, TypeAbi, TypeNames},
+    abi::{EndpointAbi, EndpointMutabilityAbi, EndpointTypeAbi, InputAbi, TypeAbi},
     api::{
         const_handles, use_raw_handle, CallValueApiImpl, ManagedBufferApiImpl, StorageWriteApiImpl,
         VMApi, EXTERNAL_VIEW_TARGET_ADRESS_KEY,
@@ -49,10 +49,7 @@ pub fn external_view_contract_constructor_abi() -> EndpointAbi {
     );
     endpoint_abi.inputs.push(InputAbi {
         arg_name: "target_contract_address".to_string(),
-        type_names: TypeNames {
-            abi: crate::types::heap::Address::type_name(),
-            rust: crate::types::heap::Address::type_name_rust(),
-        },
+        type_names: crate::types::heap::Address::type_names(),
         multi_arg: false,
     });
     endpoint_abi
diff --git a/framework/base/src/storage/mappers/linked_list_mapper.rs b/framework/base/src/storage/mappers/linked_list_mapper.rs
index 1bf067d97e..d58c0ad19d 100644
--- a/framework/base/src/storage/mappers/linked_list_mapper.rs
+++ b/framework/base/src/storage/mappers/linked_list_mapper.rs
@@ -626,7 +626,7 @@ where
     T: TopEncode + TopDecode + NestedEncode + NestedDecode + Clone + TypeAbi,
 {
     fn type_name() -> TypeName {
-        crate::abi::type_name_variadic::<T>().abi
+        crate::abi::type_name_variadic::<T>()
     }
 
     fn provide_type_descriptions<TDC: TypeDescriptionContainer>(accumulator: &mut TDC) {
diff --git a/framework/base/src/storage/mappers/queue_mapper.rs b/framework/base/src/storage/mappers/queue_mapper.rs
index 920c0d737b..79ac5f37d7 100644
--- a/framework/base/src/storage/mappers/queue_mapper.rs
+++ b/framework/base/src/storage/mappers/queue_mapper.rs
@@ -532,7 +532,7 @@ where
     T: TopEncode + TopDecode + TypeAbi,
 {
     fn type_name() -> TypeName {
-        crate::abi::type_name_variadic::<T>().abi
+        crate::abi::type_name_variadic::<T>()
     }
 
     fn provide_type_descriptions<TDC: TypeDescriptionContainer>(accumulator: &mut TDC) {
diff --git a/framework/base/src/storage/mappers/set_mapper.rs b/framework/base/src/storage/mappers/set_mapper.rs
index 90ffcfc110..28941a7a8c 100644
--- a/framework/base/src/storage/mappers/set_mapper.rs
+++ b/framework/base/src/storage/mappers/set_mapper.rs
@@ -308,7 +308,7 @@ where
     T: TopEncode + TopDecode + NestedEncode + NestedDecode + TypeAbi,
 {
     fn type_name() -> TypeName {
-        crate::abi::type_name_variadic::<T>().abi
+        crate::abi::type_name_variadic::<T>()
     }
 
     fn provide_type_descriptions<TDC: TypeDescriptionContainer>(accumulator: &mut TDC) {
diff --git a/framework/base/src/storage/mappers/unique_id_mapper.rs b/framework/base/src/storage/mappers/unique_id_mapper.rs
index ddf8aad22b..779e1a1b71 100644
--- a/framework/base/src/storage/mappers/unique_id_mapper.rs
+++ b/framework/base/src/storage/mappers/unique_id_mapper.rs
@@ -224,7 +224,7 @@ where
     SA: StorageMapperApi,
 {
     fn type_name() -> TypeName {
-        crate::abi::type_name_variadic::<usize>().abi
+        crate::abi::type_name_variadic::<usize>()
     }
 
     fn provide_type_descriptions<TDC: TypeDescriptionContainer>(accumulator: &mut TDC) {
diff --git a/framework/base/src/storage/mappers/unordered_set_mapper.rs b/framework/base/src/storage/mappers/unordered_set_mapper.rs
index 7b77bacfd0..fa151759ea 100644
--- a/framework/base/src/storage/mappers/unordered_set_mapper.rs
+++ b/framework/base/src/storage/mappers/unordered_set_mapper.rs
@@ -239,7 +239,7 @@ where
     T: TopEncode + TopDecode + NestedEncode + NestedDecode + TypeAbi,
 {
     fn type_name() -> TypeName {
-        crate::abi::type_name_variadic::<T>().abi
+        crate::abi::type_name_variadic::<T>()
     }
 
     fn provide_type_descriptions<TDC: TypeDescriptionContainer>(accumulator: &mut TDC) {
diff --git a/framework/base/src/storage/mappers/user_mapper.rs b/framework/base/src/storage/mappers/user_mapper.rs
index e15f08da76..bbfdcfb27b 100644
--- a/framework/base/src/storage/mappers/user_mapper.rs
+++ b/framework/base/src/storage/mappers/user_mapper.rs
@@ -230,7 +230,7 @@ where
     SA: StorageMapperApi,
 {
     fn type_name() -> TypeName {
-        crate::abi::type_name_variadic::<ManagedAddress<SA>>().abi
+        crate::abi::type_name_variadic::<ManagedAddress<SA>>()
     }
 
     fn is_variadic() -> bool {
diff --git a/framework/base/src/storage/mappers/vec_mapper.rs b/framework/base/src/storage/mappers/vec_mapper.rs
index 2088f445b0..49c9c159cc 100644
--- a/framework/base/src/storage/mappers/vec_mapper.rs
+++ b/framework/base/src/storage/mappers/vec_mapper.rs
@@ -358,7 +358,7 @@ where
     T: TopEncode + TopDecode + TypeAbi,
 {
     fn type_name() -> TypeName {
-        crate::abi::type_name_variadic::<T>().abi
+        crate::abi::type_name_variadic::<T>()
     }
 
     fn provide_type_descriptions<TDC: TypeDescriptionContainer>(accumulator: &mut TDC) {
diff --git a/framework/base/src/types/heap/h256_address.rs b/framework/base/src/types/heap/h256_address.rs
index cd992145a9..e4c9b055d2 100644
--- a/framework/base/src/types/heap/h256_address.rs
+++ b/framework/base/src/types/heap/h256_address.rs
@@ -206,10 +206,6 @@ impl TypeAbi for Address {
     fn type_name() -> TypeName {
         "Address".into()
     }
-
-    fn type_name_rust() -> TypeName {
-        "multiversx_sc::types::heap::h256_address".into()
-    }
 }
 
 #[cfg(test)]
diff --git a/framework/base/src/types/interaction/function_call.rs b/framework/base/src/types/interaction/function_call.rs
index f4a3b69752..376aec879b 100644
--- a/framework/base/src/types/interaction/function_call.rs
+++ b/framework/base/src/types/interaction/function_call.rs
@@ -139,7 +139,7 @@ where
     Api: ManagedTypeApi,
 {
     fn type_name() -> TypeName {
-        crate::abi::type_name_variadic::<ManagedBuffer<Api>>().abi
+        crate::abi::type_name_variadic::<ManagedBuffer<Api>>()
     }
 
     fn is_variadic() -> bool {
diff --git a/framework/base/src/types/managed/basic/mod.rs b/framework/base/src/types/managed/basic/mod.rs
index 5f818afac2..419eb4b827 100644
--- a/framework/base/src/types/managed/basic/mod.rs
+++ b/framework/base/src/types/managed/basic/mod.rs
@@ -1,18 +1,18 @@
-mod big_float;
-mod big_float_cmp;
-mod big_float_operators;
-mod big_int;
-mod big_int_cmp;
-mod big_int_operators;
-mod big_int_sign;
-mod big_num_cmp;
+pub mod big_float;
+pub mod big_float_cmp;
+pub mod big_float_operators;
+pub mod big_int;
+pub mod big_int_cmp;
+pub mod big_int_operators;
+pub mod big_int_sign;
+pub mod big_num_cmp;
 pub mod big_uint;
-mod big_uint_cmp;
-mod big_uint_operators;
-mod cast_to_i64;
-mod elliptic_curve;
-mod managed_buffer;
-mod managed_map;
+pub mod big_uint_cmp;
+pub mod big_uint_operators;
+pub mod cast_to_i64;
+pub mod elliptic_curve;
+pub mod managed_buffer;
+pub mod managed_map;
 
 pub use big_float::BigFloat;
 pub use big_int::BigInt;
diff --git a/framework/base/src/types/managed/multi_value/multi_value_encoded.rs b/framework/base/src/types/managed/multi_value/multi_value_encoded.rs
index 943b909f35..ebf8e0cb69 100644
--- a/framework/base/src/types/managed/multi_value/multi_value_encoded.rs
+++ b/framework/base/src/types/managed/multi_value/multi_value_encoded.rs
@@ -228,7 +228,7 @@ where
     T: TypeAbi,
 {
     fn type_name() -> TypeName {
-        crate::abi::type_name_variadic::<T>().abi
+        crate::abi::type_name_variadic::<T>()
     }
 
     fn provide_type_descriptions<TDC: TypeDescriptionContainer>(accumulator: &mut TDC) {
diff --git a/framework/meta/src/abi_json/type_abi_json.rs b/framework/meta/src/abi_json/type_abi_json.rs
index f7c3f16e38..c7735f04d6 100644
--- a/framework/meta/src/abi_json/type_abi_json.rs
+++ b/framework/meta/src/abi_json/type_abi_json.rs
@@ -68,13 +68,10 @@ impl From<&TypeDescription> for TypeDescriptionJson {
 }
 
 impl TypeDescriptionJson {
-    pub fn to_type_description(&self, name_abi: &str, name_rust: &str) -> TypeDescription {
+    pub fn to_type_description(&self, names: TypeNames) -> TypeDescription {
         TypeDescription {
             docs: self.docs.clone(),
-            names: TypeNames {
-                abi: name_abi.to_string(),
-                rust: name_rust.to_string(),
-            },
+            names,
             contents: match self.content_type.as_str() {
                 TYPE_DESCRIPTION_JSON_TYPE_STRUCT => TypeContents::Struct(
                     self.fields

From 8e45b11807f9d5241bf64445fd16631b11c5c934 Mon Sep 17 00:00:00 2001
From: Laurentiu Ciobanu <laurentiu.ciobanu@multiversx.com>
Date: Fri, 8 Mar 2024 12:29:26 +0200
Subject: [PATCH 0404/1254] add tests for ManagedVec::to_array_of_refs

---
 framework/scenario/tests/managed_vec_test.rs | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/framework/scenario/tests/managed_vec_test.rs b/framework/scenario/tests/managed_vec_test.rs
index 90fa88c376..4fc3ede7c6 100644
--- a/framework/scenario/tests/managed_vec_test.rs
+++ b/framework/scenario/tests/managed_vec_test.rs
@@ -97,6 +97,25 @@ fn test_into_vec() {
     assert_eq!(vec, managed_vec.into_vec());
 }
 
+#[test]
+fn test_to_array_of_refs() {
+    let mut vec = ManagedVec::<StaticApi, i32>::new();
+    for i in 0..10 {
+        vec.push(i);
+    }
+
+    let refs: Option<[i32; 20]> = vec.to_array_of_refs();
+    assert!(refs.is_none());
+
+    let refs: Option<[i32; 10]> = vec.to_array_of_refs();
+    assert!(refs.is_some());
+
+    let refs = refs.unwrap();
+    for i in 0..10 {
+        assert_eq!(refs[i], i as i32);
+    }
+}
+
 #[test]
 fn test_take_u64() {
     let mut vec = Vec::<u64>::new();

From 9596874119e6af7f315f800ba6400f04de7c9b9a Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 8 Mar 2024 12:34:24 +0200
Subject: [PATCH 0405/1254] rust-toolchain.toml

---
 rust-toolchain.toml | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 rust-toolchain.toml

diff --git a/rust-toolchain.toml b/rust-toolchain.toml
new file mode 100644
index 0000000000..9a2458c117
--- /dev/null
+++ b/rust-toolchain.toml
@@ -0,0 +1,2 @@
+[toolchain]
+channel = "nightly-2023-12-11"

From b43ed2eb2d960cb69ef4513ece3ef0e38b84cc9a Mon Sep 17 00:00:00 2001
From: Laurentiu Ciobanu <laurentiu.ciobanu@multiversx.com>
Date: Fri, 8 Mar 2024 12:47:23 +0200
Subject: [PATCH 0406/1254] fix clippy warning in tests for
 ManagedVec::to_array_of_refs

---
 framework/scenario/tests/managed_vec_test.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/framework/scenario/tests/managed_vec_test.rs b/framework/scenario/tests/managed_vec_test.rs
index 4fc3ede7c6..c24802e599 100644
--- a/framework/scenario/tests/managed_vec_test.rs
+++ b/framework/scenario/tests/managed_vec_test.rs
@@ -111,8 +111,8 @@ fn test_to_array_of_refs() {
     assert!(refs.is_some());
 
     let refs = refs.unwrap();
-    for i in 0..10 {
-        assert_eq!(refs[i], i as i32);
+    for (i, &item) in refs.iter().enumerate() {
+        assert_eq!(item, i as i32);
     }
 }
 

From 0a479eec289a9957a4d41a7dab4a6570782eb4e4 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 8 Mar 2024 14:16:26 +0200
Subject: [PATCH 0407/1254] sc 0.47.5

---
 CHANGELOG.md                                   |  3 +++
 Cargo.lock                                     | 18 +++++++++---------
 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 ++--
 .../mappers/linked-list-repeat/meta/Cargo.toml |  2 +-
 .../mappers/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 +-
 .../benchmarks/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 +-
 contracts/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 +-
 .../examples/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 +++---
 contracts/examples/check-pause/meta/Cargo.toml |  2 +-
 contracts/examples/check-pause/wasm/Cargo.toml |  2 +-
 .../examples/crowdfunding-esdt/Cargo.toml      |  4 ++--
 .../examples/crowdfunding-esdt/meta/Cargo.toml |  2 +-
 .../examples/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 +-
 .../examples/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 +-
 contracts/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 ++--
 contracts/examples/proxy-pause/meta/Cargo.toml |  2 +-
 contracts/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 +-
 .../wasm-alloc-mem-fail/Cargo.toml             |  2 +-
 .../wasm-alloc-mem-leaking/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 +-
 .../composability/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 +-
 .../composability/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 ++--
 .../erc-style-contracts/erc721/meta/Cargo.toml |  2 +-
 .../erc-style-contracts/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 ++--
 .../formatted-message-features/meta/Cargo.toml |  2 +-
 .../formatted-message-features/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 +-
 .../use-module/wasm-use-module-view/Cargo.toml |  2 +-
 .../feature-tests/use-module/wasm/Cargo.toml   |  2 +-
 contracts/modules/Cargo.toml                   |  4 ++--
 framework/base/Cargo.toml                      |  4 ++--
 framework/derive/Cargo.toml                    |  2 +-
 framework/meta/Cargo.toml                      |  4 ++--
 .../generate_snippets/snippet_crate_gen.rs     |  2 +-
 framework/meta/src/cmd/contract/meta_config.rs |  4 ++--
 framework/meta/src/version_history.rs          |  3 ++-
 framework/scenario/Cargo.toml                  |  6 +++---
 framework/snippets/Cargo.toml                  |  4 ++--
 framework/wasm-adapter/Cargo.toml              |  4 ++--
 tools/mxpy-snippet-generator/Cargo.toml        |  2 +-
 tools/rust-debugger/format-tests/Cargo.toml    |  4 ++--
 262 files changed, 385 insertions(+), 381 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9f6526006a..c9c2118770 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,6 +26,9 @@ 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.5] - 2024-03-08
+- Fixed an issue with `MapMapper` when reading from another contract.
+- Got rid of nightly feature `maybe_uninit_uninit_array`/`maybe_uninit_array_assume_init`.
 
 ## [sc 0.47.4, vm 0.8.3] - 2024-02-08
 - Post-build wasm report added to `.mxsc.json` file.
diff --git a/Cargo.lock b/Cargo.lock
index 6550fa0e64..6274b48504 100755
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1785,7 +1785,7 @@ checksum = "b59072fa0624b55ae5ae3fa6bfa91515bbeb4ac440214bc4a509e2c8806d6e9f"
 
 [[package]]
 name = "multiversx-price-aggregator-sc"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "arrayvec",
  "getrandom 0.2.12",
@@ -1806,7 +1806,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "bitflags 2.4.2",
  "hex-literal",
@@ -1836,7 +1836,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -1847,7 +1847,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-meta"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "clap",
  "colored",
@@ -1873,14 +1873,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-scenario"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "base64",
  "bech32",
@@ -1906,7 +1906,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-snippets"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "base64",
  "env_logger",
@@ -1920,7 +1920,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "multiversx-sc",
 ]
@@ -1951,7 +1951,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-wegld-swap-sc"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "multiversx-sc",
  "multiversx-sc-modules",
diff --git a/contracts/benchmarks/large-storage/Cargo.toml b/contracts/benchmarks/large-storage/Cargo.toml
index 5d40c9152b..804f964141 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.4"
+version = "0.47.5"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.4"
+version = "0.47.5"
 path = "../../../framework/scenario"
diff --git a/contracts/benchmarks/large-storage/meta/Cargo.toml b/contracts/benchmarks/large-storage/meta/Cargo.toml
index 061b684f16..7516ee6f65 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.4"
+version = "0.47.5"
 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 71baab2e45..3442101383 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.4"
+version = "0.47.5"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/mappers/benchmark-common/Cargo.toml b/contracts/benchmarks/mappers/benchmark-common/Cargo.toml
index b4c848a6eb..f2db85ecfe 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.4"
+version = "0.47.5"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.4"
+version = "0.47.5"
 path = "../../../../framework/scenario"
diff --git a/contracts/benchmarks/mappers/linked-list-repeat/Cargo.toml b/contracts/benchmarks/mappers/linked-list-repeat/Cargo.toml
index bac9fe6806..558fbb4720 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.4"
+version = "0.47.5"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.4"
+version = "0.47.5"
 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 e22d76fe92..3a2b64389a 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.4"
+version = "0.47.5"
 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 2cbb5bc50a..8682d7b966 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.4"
+version = "0.47.5"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/mappers/map-repeat/Cargo.toml b/contracts/benchmarks/mappers/map-repeat/Cargo.toml
index 248b242906..63d397512e 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.4"
+version = "0.47.5"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.4"
+version = "0.47.5"
 path = "../../../../framework/scenario"
diff --git a/contracts/benchmarks/mappers/map-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/map-repeat/meta/Cargo.toml
index f275522114..9325ed7ae6 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.4"
+version = "0.47.5"
 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 0c8bb08c9c..62e8789c3b 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.4"
+version = "0.47.5"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/mappers/queue-repeat/Cargo.toml b/contracts/benchmarks/mappers/queue-repeat/Cargo.toml
index 92fcfc658f..a9f7dd1a38 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.4"
+version = "0.47.5"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.4"
+version = "0.47.5"
 path = "../../../../framework/scenario"
diff --git a/contracts/benchmarks/mappers/queue-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/queue-repeat/meta/Cargo.toml
index 5944b1bfda..29f1dc78c8 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.4"
+version = "0.47.5"
 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 1a6d7b3ba9..9c4d336e91 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.4"
+version = "0.47.5"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/mappers/set-repeat/Cargo.toml b/contracts/benchmarks/mappers/set-repeat/Cargo.toml
index bd6fa5c3b0..f62ee44aa2 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.4"
+version = "0.47.5"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.4"
+version = "0.47.5"
 path = "../../../../framework/scenario"
diff --git a/contracts/benchmarks/mappers/set-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/set-repeat/meta/Cargo.toml
index 3270e5740a..7e05b0d40c 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.4"
+version = "0.47.5"
 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 df12a3332c..7dcc58ebd4 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.4"
+version = "0.47.5"
 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 4136a89d7f..c4f974f557 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.4"
+version = "0.47.5"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.4"
+version = "0.47.5"
 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 62158f904b..a10f248f31 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.4"
+version = "0.47.5"
 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 b98a6b77b6..b738172a26 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.4"
+version = "0.47.5"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/mappers/vec-repeat/Cargo.toml b/contracts/benchmarks/mappers/vec-repeat/Cargo.toml
index cc7c80cd83..68f1484056 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.4"
+version = "0.47.5"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.4"
+version = "0.47.5"
 path = "../../../../framework/scenario"
diff --git a/contracts/benchmarks/mappers/vec-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/vec-repeat/meta/Cargo.toml
index 1f84d712da..d3b013bb67 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.4"
+version = "0.47.5"
 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 39e2ff189b..fe03b05162 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.4"
+version = "0.47.5"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/send-tx-repeat/Cargo.toml b/contracts/benchmarks/send-tx-repeat/Cargo.toml
index 623d22a83c..5517cf4101 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.4"
+version = "0.47.5"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.4"
+version = "0.47.5"
 path = "../../../framework/scenario"
diff --git a/contracts/benchmarks/send-tx-repeat/meta/Cargo.toml b/contracts/benchmarks/send-tx-repeat/meta/Cargo.toml
index 119fcbdd56..13920dbf06 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.4"
+version = "0.47.5"
 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 a55d4576ca..8f631f3518 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.4"
+version = "0.47.5"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/str-repeat/Cargo.toml b/contracts/benchmarks/str-repeat/Cargo.toml
index 8ae1a71cfb..123cfae104 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.4"
+version = "0.47.5"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.4"
+version = "0.47.5"
 path = "../../../framework/scenario"
diff --git a/contracts/benchmarks/str-repeat/meta/Cargo.toml b/contracts/benchmarks/str-repeat/meta/Cargo.toml
index cb358ea9b9..5a5d4b5d28 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.4"
+version = "0.47.5"
 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 f37672a2a0..64354ce36c 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.4"
+version = "0.47.5"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/core/price-aggregator/Cargo.toml b/contracts/core/price-aggregator/Cargo.toml
index 3f4e29d16f..1dd51d5792 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.4"
+version = "0.47.5"
 authors = [
     "Claudiu-Marcel Bruda <claudiu.bruda@multiversx.com>",
     "MultiversX <contact@multiversx.com>",
@@ -19,15 +19,15 @@ edition = "2021"
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "0.47.4"
+version = "0.47.5"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.47.4"
+version = "0.47.5"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.4"
+version = "0.47.5"
 path = "../../../framework/scenario"
 
 [dependencies]
diff --git a/contracts/core/price-aggregator/meta/Cargo.toml b/contracts/core/price-aggregator/meta/Cargo.toml
index 8fdaeffc64..07bc777dc8 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.4"
+version = "0.47.5"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.47.4"
+version = "0.47.5"
 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 3a72bbaa0a..c39965acb9 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.4"
+version = "0.47.5"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/core/wegld-swap/Cargo.toml b/contracts/core/wegld-swap/Cargo.toml
index 62240f60ee..5cce44f08e 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.4"
+version = "0.47.5"
 
 authors = [
     "Dorin Iancu <dorin.iancu@multiversx.com>",
@@ -20,13 +20,13 @@ edition = "2021"
 path = "src/wegld.rs"
 
 [dependencies.multiversx-sc]
-version = "0.47.4"
+version = "0.47.5"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.47.4"
+version = "0.47.5"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.4"
+version = "0.47.5"
 path = "../../../framework/scenario"
diff --git a/contracts/core/wegld-swap/meta/Cargo.toml b/contracts/core/wegld-swap/meta/Cargo.toml
index 62f650105b..222f0692d6 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.4"
+version = "0.47.5"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.47.4"
+version = "0.47.5"
 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 51ad50df2f..f622d5d6b9 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.4"
+version = "0.47.5"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/adder/Cargo.toml b/contracts/examples/adder/Cargo.toml
index 36ed855589..409f471ee5 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.4"
+version = "0.47.5"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.4"
+version = "0.47.5"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/adder/interact/Cargo.toml b/contracts/examples/adder/interact/Cargo.toml
index f8a7e1bb35..5ff9488dbf 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.4"
+version = "0.47.5"
 path = "../../../../framework/snippets"
diff --git a/contracts/examples/adder/meta/Cargo.toml b/contracts/examples/adder/meta/Cargo.toml
index c4f745f2bb..caf3b453e2 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.4"
+version = "0.47.5"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/examples/adder/wasm/Cargo.toml b/contracts/examples/adder/wasm/Cargo.toml
index 1d10bb1a92..04be870421 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.4"
+version = "0.47.5"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/bonding-curve-contract/Cargo.toml b/contracts/examples/bonding-curve-contract/Cargo.toml
index a53de80b2f..0b5939281e 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.4"
+version = "0.47.5"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.47.4"
+version = "0.47.5"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.4"
+version = "0.47.5"
 path = "../../../framework/scenario"
 
diff --git a/contracts/examples/bonding-curve-contract/meta/Cargo.toml b/contracts/examples/bonding-curve-contract/meta/Cargo.toml
index d962e16f11..91b330f0ab 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.4"
+version = "0.47.5"
 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 1e2b666d5b..d95c21a85d 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.4"
+version = "0.47.5"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/check-pause/Cargo.toml b/contracts/examples/check-pause/Cargo.toml
index 550458fe26..956cff6046 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.4"
+version = "0.47.5"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.47.4"
+version = "0.47.5"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.4"
+version = "0.47.5"
 path = "../../../framework/scenario"
 
diff --git a/contracts/examples/check-pause/meta/Cargo.toml b/contracts/examples/check-pause/meta/Cargo.toml
index 710a5cf57a..db3e95ad78 100644
--- a/contracts/examples/check-pause/meta/Cargo.toml
+++ b/contracts/examples/check-pause/meta/Cargo.toml
@@ -9,6 +9,6 @@ authors = ["Alin Cruceat <alin.cruceat@multiversx.com>"]
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.47.4"
+version = "0.47.5"
 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 52d5311983..619a7270c4 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.4"
+version = "0.47.5"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/crowdfunding-esdt/Cargo.toml b/contracts/examples/crowdfunding-esdt/Cargo.toml
index 963d937368..5a5a94d5a3 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.4"
+version = "0.47.5"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.4"
+version = "0.47.5"
 path = "../../../framework/scenario"
 
 [dev-dependencies]
diff --git a/contracts/examples/crowdfunding-esdt/meta/Cargo.toml b/contracts/examples/crowdfunding-esdt/meta/Cargo.toml
index 7137feb3da..b5bef9909d 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.4"
+version = "0.47.5"
 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 2bdd3dcec1..877d8761fb 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.4"
+version = "0.47.5"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/crypto-bubbles/Cargo.toml b/contracts/examples/crypto-bubbles/Cargo.toml
index 433c083ba4..f63a8b8af5 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.4"
+version = "0.47.5"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.4"
+version = "0.47.5"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/crypto-bubbles/meta/Cargo.toml b/contracts/examples/crypto-bubbles/meta/Cargo.toml
index 89b28878fd..1defd419e1 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.4"
+version = "0.47.5"
 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 5984f9ee38..5f8975e177 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.4"
+version = "0.47.5"
 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 1f30c5fcb6..495b1894ff 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.4"
+version = "0.47.5"
 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 d74cf135e3..2cc2fc4bd9 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.4"
+version = "0.47.5"
 path = "../../../../../framework/base"
diff --git a/contracts/examples/crypto-kitties/kitty-auction/Cargo.toml b/contracts/examples/crypto-kitties/kitty-auction/Cargo.toml
index 5245561b04..646835ce94 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.4"
+version = "0.47.5"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.4"
+version = "0.47.5"
 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 e3476a2f0d..2adc1e4a32 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.4"
+version = "0.47.5"
 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 767bc541d7..3a7e4400aa 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.4"
+version = "0.47.5"
 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 dc33631ae2..8c94bfe0de 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.4"
+version = "0.47.5"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.4"
+version = "0.47.5"
 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 6e5346904e..8e09c03447 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.4"
+version = "0.47.5"
 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 a30b72aef2..a7105ac21c 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.4"
+version = "0.47.5"
 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 1728c94feb..cbd78aed52 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.4"
+version = "0.47.5"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.4"
+version = "0.47.5"
 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 5504b33b0b..fe5c579c57 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.4"
+version = "0.47.5"
 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 7ca40a20d2..d81e2aec49 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.4"
+version = "0.47.5"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/crypto-zombies/Cargo.toml b/contracts/examples/crypto-zombies/Cargo.toml
index 8d33d5587f..3f30e8030e 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.4"
+version = "0.47.5"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.4"
+version = "0.47.5"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/crypto-zombies/meta/Cargo.toml b/contracts/examples/crypto-zombies/meta/Cargo.toml
index 343741be0e..396fb6584e 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.4"
+version = "0.47.5"
 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 fc23af1935..3234a023e6 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.4"
+version = "0.47.5"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/digital-cash/Cargo.toml b/contracts/examples/digital-cash/Cargo.toml
index f185de1de5..c9a21caba1 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.4"
+version = "0.47.5"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.4"
+version = "0.47.5"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/digital-cash/meta/Cargo.toml b/contracts/examples/digital-cash/meta/Cargo.toml
index 99cf70662c..42e08a4777 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.4"
+version = "0.47.5"
 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 74d23b95d3..ec1d9efa8f 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.4"
+version = "0.47.5"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/empty/Cargo.toml b/contracts/examples/empty/Cargo.toml
index 73588027f2..a8403c0d71 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.4"
+version = "0.47.5"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.4"
+version = "0.47.5"
 path = "../../../framework/scenario"
 
 [dev-dependencies]
diff --git a/contracts/examples/empty/meta/Cargo.toml b/contracts/examples/empty/meta/Cargo.toml
index 6cf91f7890..47a8dbdfd0 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.4"
+version = "0.47.5"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/examples/empty/wasm/Cargo.toml b/contracts/examples/empty/wasm/Cargo.toml
index 7035a83338..9a551ecd8a 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.4"
+version = "0.47.5"
 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 26c9e1ccef..a930ff827c 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.4"
+version = "0.47.5"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.4"
+version = "0.47.5"
 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 7838c62d7b..5f0ac8e76f 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.4"
+version = "0.47.5"
 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 1b25088dc3..dd7d97cdb8 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.4"
+version = "0.47.5"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/factorial/Cargo.toml b/contracts/examples/factorial/Cargo.toml
index 9cd04e512a..a8e1caf074 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.4"
+version = "0.47.5"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.4"
+version = "0.47.5"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/factorial/meta/Cargo.toml b/contracts/examples/factorial/meta/Cargo.toml
index 97e811c98c..6cdefc436d 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.4"
+version = "0.47.5"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/examples/factorial/wasm/Cargo.toml b/contracts/examples/factorial/wasm/Cargo.toml
index 7e5290631a..8889a9b7ae 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.4"
+version = "0.47.5"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/fractional-nfts/Cargo.toml b/contracts/examples/fractional-nfts/Cargo.toml
index e454076d7b..a64f7f323d 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.4"
+version = "0.47.5"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.47.4"
+version = "0.47.5"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.4"
+version = "0.47.5"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/fractional-nfts/meta/Cargo.toml b/contracts/examples/fractional-nfts/meta/Cargo.toml
index 08ba253b46..24ca9dc1c9 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.4"
+version = "0.47.5"
 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 3dd5eedcd1..ae8fa6d005 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.4"
+version = "0.47.5"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/lottery-esdt/Cargo.toml b/contracts/examples/lottery-esdt/Cargo.toml
index 0a3accab09..75cb2cdb2f 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.4"
+version = "0.47.5"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.4"
+version = "0.47.5"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/lottery-esdt/meta/Cargo.toml b/contracts/examples/lottery-esdt/meta/Cargo.toml
index 0fb743b225..fe025f1fbf 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.4"
+version = "0.47.5"
 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 a7a83472b4..c0395a9569 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.4"
+version = "0.47.5"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/multisig/Cargo.toml b/contracts/examples/multisig/Cargo.toml
index 9fcb9eef78..784f5b8bfd 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.4"
+version = "0.47.5"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.47.4"
+version = "0.47.5"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.4"
+version = "0.47.5"
 path = "../../../framework/scenario"
 
 [dev-dependencies.adder]
@@ -27,7 +27,7 @@ path = "../adder"
 path = "../factorial"
 
 [dev-dependencies.multiversx-wegld-swap-sc]
-version = "0.47.4"
+version = "0.47.5"
 path = "../../core/wegld-swap"
 
 [dev-dependencies]
diff --git a/contracts/examples/multisig/interact/Cargo.toml b/contracts/examples/multisig/interact/Cargo.toml
index b829512742..3720db003d 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.4"
+version = "0.47.5"
 path = "../../../../contracts/modules"
 
 [dependencies.multiversx-sc-snippets]
-version = "0.47.4"
+version = "0.47.5"
 path = "../../../../framework/snippets"
 
 [dependencies.multiversx-sc-scenario]
-version = "=0.47.4"
+version = "=0.47.5"
 path = "../../../../framework/scenario"
diff --git a/contracts/examples/multisig/meta/Cargo.toml b/contracts/examples/multisig/meta/Cargo.toml
index ba9578d1b8..1b46da4489 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.4"
+version = "0.47.5"
 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 7f94c7aca2..64faae5032 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.4"
+version = "0.47.5"
 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 cb6d9ffa87..ec1c6aba87 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.4"
+version = "0.47.5"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/multisig/wasm/Cargo.toml b/contracts/examples/multisig/wasm/Cargo.toml
index 195ea27460..de21ada11d 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.4"
+version = "0.47.5"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/nft-minter/Cargo.toml b/contracts/examples/nft-minter/Cargo.toml
index 60c0da0635..9bcab9f7cc 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.4"
+version = "0.47.5"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.4"
+version = "0.47.5"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/nft-minter/meta/Cargo.toml b/contracts/examples/nft-minter/meta/Cargo.toml
index b4ae982d3c..9193979931 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.4"
+version = "0.47.5"
 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 b3910d1abb..d44e299f52 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.4"
+version = "0.47.5"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/nft-storage-prepay/Cargo.toml b/contracts/examples/nft-storage-prepay/Cargo.toml
index 3db0ad7f00..c40c8096e5 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.4"
+version = "0.47.5"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.4"
+version = "0.47.5"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/nft-storage-prepay/meta/Cargo.toml b/contracts/examples/nft-storage-prepay/meta/Cargo.toml
index 5a1f750b79..2ecb100f40 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.4"
+version = "0.47.5"
 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 0c1e629109..2d0fa1f340 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.4"
+version = "0.47.5"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/nft-subscription/Cargo.toml b/contracts/examples/nft-subscription/Cargo.toml
index 57e5eecc3c..c3a15ca04e 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.4"
+version = "0.47.5"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.47.4"
+version = "0.47.5"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.4"
+version = "0.47.5"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/nft-subscription/meta/Cargo.toml b/contracts/examples/nft-subscription/meta/Cargo.toml
index 775ebbeb9b..ebb5c97716 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.4"
+version = "0.47.5"
 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 0c021cd606..0469136d02 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.4"
+version = "0.47.5"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/order-book/factory/Cargo.toml b/contracts/examples/order-book/factory/Cargo.toml
index 774668a3dd..e78a41e300 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.4"
+version = "0.47.5"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.4"
+version = "0.47.5"
 path = "../../../../framework/scenario"
 
diff --git a/contracts/examples/order-book/factory/meta/Cargo.toml b/contracts/examples/order-book/factory/meta/Cargo.toml
index a632afb175..c81b977517 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.4"
+version = "0.47.5"
 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 9c512e3e00..491a30d13c 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.4"
+version = "0.47.5"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/order-book/pair/Cargo.toml b/contracts/examples/order-book/pair/Cargo.toml
index ded9aa2f79..db90006821 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.4"
+version = "0.47.5"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.4"
+version = "0.47.5"
 path = "../../../../framework/scenario"
diff --git a/contracts/examples/order-book/pair/meta/Cargo.toml b/contracts/examples/order-book/pair/meta/Cargo.toml
index 6e8fab5792..b9af3fa938 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.4"
+version = "0.47.5"
 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 d497348f77..f00e902291 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.4"
+version = "0.47.5"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/ping-pong-egld/Cargo.toml b/contracts/examples/ping-pong-egld/Cargo.toml
index ff46d18e80..2679417da3 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.4"
+version = "0.47.5"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.4"
+version = "0.47.5"
 path = "../../../framework/scenario"
 
diff --git a/contracts/examples/ping-pong-egld/meta/Cargo.toml b/contracts/examples/ping-pong-egld/meta/Cargo.toml
index 0d9baadffa..0b40d9aa0b 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.4"
+version = "0.47.5"
 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 9417659b63..73147c5c45 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.4"
+version = "0.47.5"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/proxy-pause/Cargo.toml b/contracts/examples/proxy-pause/Cargo.toml
index 7e0e196164..3e4c3a6aec 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.4"
+version = "0.47.5"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.4"
+version = "0.47.5"
 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 db82122ea2..fba5a0b1bc 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.4"
+version = "0.47.5"
 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 ff6d1c3934..bdf21b6703 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.4"
+version = "0.47.5"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/rewards-distribution/Cargo.toml b/contracts/examples/rewards-distribution/Cargo.toml
index 0b4aaaf2fa..bafdb40929 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.4"
+version = "0.47.5"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.47.4"
+version = "0.47.5"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.4"
+version = "0.47.5"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/rewards-distribution/meta/Cargo.toml b/contracts/examples/rewards-distribution/meta/Cargo.toml
index 29dcbbdb78..cf59d2db46 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 <claudiu.bruda@multiversx.com>"]
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.47.4"
+version = "0.47.5"
 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 ebe9b96a67..a17709b9e7 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.4"
+version = "0.47.5"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/seed-nft-minter/Cargo.toml b/contracts/examples/seed-nft-minter/Cargo.toml
index d2811a722a..b1b22d1276 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.4"
+version = "0.47.5"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.47.4"
+version = "0.47.5"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.4"
+version = "0.47.5"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/seed-nft-minter/meta/Cargo.toml b/contracts/examples/seed-nft-minter/meta/Cargo.toml
index 03267bcff6..9828dc2788 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 <claudiu.bruda@multiversx.com>"]
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.47.4"
+version = "0.47.5"
 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 f42bc4173b..b6f616bf91 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.4"
+version = "0.47.5"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/token-release/Cargo.toml b/contracts/examples/token-release/Cargo.toml
index adaf65157d..2e20827705 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.4"
+version = "0.47.5"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.4"
+version = "0.47.5"
 path = "../../../framework/scenario"
 
diff --git a/contracts/examples/token-release/meta/Cargo.toml b/contracts/examples/token-release/meta/Cargo.toml
index e642a6a5e5..d774d4a2bb 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.4"
+version = "0.47.5"
 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 24228e9dc2..71ad98f976 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.4"
+version = "0.47.5"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/abi-tester/Cargo.toml b/contracts/feature-tests/abi-tester/Cargo.toml
index cec5c2c3e8..66ff8bb666 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.4"
+version = "0.47.5"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.4"
+version = "0.47.5"
 path = "../../../framework/scenario"
 
 [dev-dependencies.multiversx-sc-meta]
-version = "0.47.4"
+version = "0.47.5"
 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 430deb54a5..24c96a91f5 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.4"
+            "version": "0.47.5"
         }
     },
     "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 fed675f693..72b756e470 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.4"
+            "version": "0.47.5"
         }
     },
     "docs": [
diff --git a/contracts/feature-tests/abi-tester/meta/Cargo.toml b/contracts/feature-tests/abi-tester/meta/Cargo.toml
index 3836cec9f0..00bd658c54 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.4"
+version = "0.47.5"
 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 20f86c0cd5..f6fa5ff5af 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.4"
+version = "0.47.5"
 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 b6a74f8486..b5171c7792 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.4"
+version = "0.47.5"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/alloc-features/Cargo.toml b/contracts/feature-tests/alloc-features/Cargo.toml
index 90e8413f1b..3af733d06d 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.4"
+version = "0.47.5"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.4"
+version = "0.47.5"
 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 1965ef6297..e737db810b 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.4"
+version = "0.47.5"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml
index cded4e93ba..c4a1f55e35 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml
@@ -25,7 +25,7 @@ overflow-checks = false
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.47.4"
+version = "0.47.5"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml
index f0db37cc10..3380c24cf1 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml
@@ -25,7 +25,7 @@ overflow-checks = false
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.47.4"
+version = "0.47.5"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/alloc-features/wasm/Cargo.toml b/contracts/feature-tests/alloc-features/wasm/Cargo.toml
index 1b66a4a451..398ff4d589 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.4"
+version = "0.47.5"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/basic-features/Cargo.toml b/contracts/feature-tests/basic-features/Cargo.toml
index d31bcd043a..52a6628859 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.4"
+version = "0.47.5"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.4"
+version = "0.47.5"
 path = "../../../framework/scenario"
 
 [dependencies.multiversx-sc-modules]
-version = "0.47.4"
+version = "0.47.5"
 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 fe36163ce6..e761436e47 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.4"
+version = "0.47.5"
 path = "../../../../framework/snippets"
diff --git a/contracts/feature-tests/basic-features/meta/Cargo.toml b/contracts/feature-tests/basic-features/meta/Cargo.toml
index 2d38fa35fb..0f728ed49f 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.4"
+version = "0.47.5"
 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 998a44ec4e..22d26cd5d5 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.4"
+version = "0.47.5"
 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 97414fe81c..5b2c30319d 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.4"
+version = "0.47.5"
 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 d64ff28385..3444fe9e30 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.4"
+version = "0.47.5"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.4"
+version = "0.47.5"
 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 5243b3c760..9d7b7d3850 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.4"
+version = "0.47.5"
 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 1c090cc1a0..e62efe10e7 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.4"
+version = "0.47.5"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/Cargo.toml b/contracts/feature-tests/composability/Cargo.toml
index 0c85eb9580..d9ae0995ca 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.4"
+version = "0.47.5"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.4"
+version = "0.47.5"
 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 8c1eb8e107..c3f3d304ed 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.4"
+version = "0.47.5"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.4"
+version = "0.47.5"
 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 7a71e9cbbe..ab7adb1818 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.4"
+version = "0.47.5"
 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 c67a18439e..fb43fc2f21 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.4"
+version = "0.47.5"
 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 c259e1e885..d5cae9e497 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.4"
+version = "0.47.5"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.4"
+version = "0.47.5"
 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 6a48132cac..710f03fd71 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.4"
+version = "0.47.5"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.4"
+version = "0.47.5"
 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 4b9cbfed22..c2449efbf6 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.4"
+version = "0.47.5"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.47.4"
+version = "0.47.5"
 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 2f5a726d5f..544a09a21e 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.4"
+version = "0.47.5"
 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 504404a1a5..6d5c7636d0 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.4"
+version = "0.47.5"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.4"
+version = "0.47.5"
 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 223fb43d64..144cff2dbc 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.4"
+version = "0.47.5"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.47.4"
+version = "0.47.5"
 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 f341fac72d..6a878e1822 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.4"
+version = "0.47.5"
 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 102bcfed58..298cc38ea3 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.4"
+version = "0.47.5"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.4"
+version = "0.47.5"
 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 fd851251ab..f1bd614d0b 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.4"
+version = "0.47.5"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.4"
+version = "0.47.5"
 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 7756dd9884..159ee29fa7 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.4"
+version = "0.47.5"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.47.4"
+version = "0.47.5"
 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 e142d2fc6b..8737c18b6a 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.4"
+version = "0.47.5"
 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 73cca05e44..7062232070 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.4"
+version = "0.47.5"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.4"
+version = "0.47.5"
 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 bd427c3855..5649f09d1f 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.4"
+version = "0.47.5"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.47.4"
+version = "0.47.5"
 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 9ac712d949..38c12cb392 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.4"
+version = "0.47.5"
 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 b3e945ead5..943ec49253 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.4"
+version = "0.47.5"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.47.4"
+version = "0.47.5"
 path = "../../../../framework/wasm-adapter"
 optional = true
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.4"
+version = "0.47.5"
 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 4eec5c09fd..e9eb852173 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.4"
+version = "0.47.5"
 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 7b86949be8..38dd4a6e53 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.4"
+version = "0.47.5"
 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 e9df273bdc..23944ba669 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.4"
+version = "0.47.5"
 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 66c5e0f62e..759a6a64cd 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.4"
+version = "0.47.5"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.4"
+version = "0.47.5"
 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 c2171c6dbd..8fc82f5db3 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.4"
+version = "0.47.5"
 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 01671fd73a..e247aff0e9 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.4"
+version = "0.47.5"
 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 e48fa01a8b..1752f95e34 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.4"
+version = "0.47.5"
 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 e4ac47294c..23a0df99d8 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.4"
+version = "0.47.5"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/forwarder/Cargo.toml b/contracts/feature-tests/composability/forwarder/Cargo.toml
index 8aa4dddf8d..bd5e426fce 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.4"
+version = "0.47.5"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.4"
+version = "0.47.5"
 path = "../../../../framework/scenario"
 
diff --git a/contracts/feature-tests/composability/forwarder/meta/Cargo.toml b/contracts/feature-tests/composability/forwarder/meta/Cargo.toml
index 4bfa995581..709498d977 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.4"
+version = "0.47.5"
 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 a756f13886..e9af598856 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.4"
+version = "0.47.5"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/interact/Cargo.toml b/contracts/feature-tests/composability/interact/Cargo.toml
index 1c3f8f7eb7..3ca2ae6953 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.4"
+version = "0.47.5"
 path = "../../../../contracts/modules"
 
 [dependencies.multiversx-sc-snippets]
-version = "0.47.4"
+version = "0.47.5"
 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 13908345d8..3f9638f4d2 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.4"
+version = "0.47.5"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.4"
+version = "0.47.5"
 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 fd16b35704..8b6d5f3929 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.4"
+version = "0.47.5"
 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 86f451be4b..8808b6c488 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.4"
+version = "0.47.5"
 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 9a06201fc7..c2ffef9059 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.4"
+version = "0.47.5"
 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 5bbe804406..be4f70e057 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.4"
+version = "0.47.5"
 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 c92dd9daf6..ae07ea0f64 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.4"
+version = "0.47.5"
 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 03fd2fae99..dd0e5e3190 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.4"
+version = "0.47.5"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.4"
+version = "0.47.5"
 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 58007e9511..5ba64dbc91 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.4"
+version = "0.47.5"
 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 cbac5d5f98..1c4e66daad 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.4"
+version = "0.47.5"
 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 cf3503095a..6aacf4c17c 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.4"
+version = "0.47.5"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.4"
+version = "0.47.5"
 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 e487ed2503..8ad3614823 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.4"
+version = "0.47.5"
 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 17cb903625..4f0ac22bbc 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.4"
+version = "0.47.5"
 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 5fb27caa77..3d706c42a4 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.4"
+version = "0.47.5"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.4"
+version = "0.47.5"
 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 91857c4209..3439b25847 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.4"
+version = "0.47.5"
 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 fef729c40b..47b5eb2cf3 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.4"
+version = "0.47.5"
 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 13adfca4f8..40085fa73e 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.4"
+version = "0.47.5"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.47.4"
+version = "0.47.5"
 path = "../../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.4"
+version = "0.47.5"
 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 b926e94951..203a996a76 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.4"
+version = "0.47.5"
 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 44296fec66..ff699a705e 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.4"
+version = "0.47.5"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/vault/Cargo.toml b/contracts/feature-tests/composability/vault/Cargo.toml
index 7c58bbf94e..6d81c26350 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.4"
+version = "0.47.5"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.4"
+version = "0.47.5"
 path = "../../../../framework/scenario"
diff --git a/contracts/feature-tests/composability/vault/meta/Cargo.toml b/contracts/feature-tests/composability/vault/meta/Cargo.toml
index 7ae95b77ae..2fc51374aa 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.4"
+version = "0.47.5"
 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 5848bd0e8e..63df7d0d02 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.4"
+version = "0.47.5"
 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 6132ff9734..33c14f4fd5 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.4"
+version = "0.47.5"
 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 22fc6dd8e1..31122e31f2 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.4"
+version = "0.47.5"
 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 7168729b30..af4e57038a 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.4"
+version = "0.47.5"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.4"
+version = "0.47.5"
 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 34d6f87cad..ce6234c630 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.4"
+version = "0.47.5"
 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 4ba3bf2d9a..a73660bac8 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.4"
+version = "0.47.5"
 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 144b07fc61..83577513c1 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.4"
+version = "0.47.5"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.4"
+version = "0.47.5"
 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 8ef7b29640..b2c318dd13 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.4"
+version = "0.47.5"
 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 02d75ee006..bd55b29f36 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.4"
+version = "0.47.5"
 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 5aa723d111..e538bc4de9 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.4"
+version = "0.47.5"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.4"
+version = "0.47.5"
 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 d9a7cd60a3..5608c548a3 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.4"
+version = "0.47.5"
 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 933ea65d16..fcb4237512 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.4"
+version = "0.47.5"
 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 e62919b3ab..c39f7d5f16 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.4"
+version = "0.47.5"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.4"
+version = "0.47.5"
 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 d5d645d0f1..1815a7f706 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.4"
+version = "0.47.5"
 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 a62502f5f6..e964700ec5 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.4"
+version = "0.47.5"
 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 bb1c12149b..20671838db 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.4"
+version = "0.47.5"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.4"
+version = "0.47.5"
 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 6bad03d999..db4e5ff3df 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.4"
+version = "0.47.5"
 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 de69fe6826..59d6c7a7b8 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.4"
+version = "0.47.5"
 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 cfafd07428..8372f0354a 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.4"
+version = "0.47.5"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.4"
+version = "0.47.5"
 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 8a15883327..96afb07b44 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.4"
+version = "0.47.5"
 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 8a2063a899..a80419dcab 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.4"
+version = "0.47.5"
 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 6c5dbaf79d..46ffb3c5ea 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.4"
+version = "0.47.5"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.4"
+version = "0.47.5"
 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 07d5dea169..ce2495310a 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.4"
+version = "0.47.5"
 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 f38877401c..9338d5fd10 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.4"
+version = "0.47.5"
 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 4856094648..134d30ce63 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.4"
+version = "0.47.5"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.4"
+version = "0.47.5"
 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 b65eefd0df..e316dac5ad 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.4"
+version = "0.47.5"
 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 f8180683cd..656e98c8d1 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.4"
+version = "0.47.5"
 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 d786dc6e68..49dcba60aa 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.4"
+version = "0.47.5"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.4"
+version = "0.47.5"
 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 5f606095d2..b440c8cf8d 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.4"
+version = "0.47.5"
 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 1de57ac0b0..912900e134 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.4"
+version = "0.47.5"
 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 e30990c25b..4e44c248df 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.4"
+version = "0.47.5"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.4"
+version = "0.47.5"
 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 b1f1a6e4dc..fdb2ea7cc8 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.4"
+version = "0.47.5"
 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 04503904ec..c688388a91 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.4"
+version = "0.47.5"
 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 923bccc230..d4b5121141 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.4"
+version = "0.47.5"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.4"
+version = "0.47.5"
 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 adbf83ecd0..053f902584 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.4"
+version = "0.47.5"
 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 735a04ba25..d524d039f3 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.4"
+version = "0.47.5"
 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 57323aafa8..20839cea31 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.4"
+version = "0.47.5"
 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 c17d98ca74..beca5b4d75 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.4"
+version = "0.47.5"
 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 9f4d9c6c73..190c9b1fb5 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.4"
+version = "0.47.5"
 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 7b2cf5bc99..d76417a223 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.4"
+version = "0.47.5"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.4"
+version = "0.47.5"
 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 a0f39aa6c4..921c4f2671 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.4"
+version = "0.47.5"
 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 f705ca2583..b55981873c 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.4"
+version = "0.47.5"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/payable-features/Cargo.toml b/contracts/feature-tests/payable-features/Cargo.toml
index 445d66463e..acf93f21d7 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.4"
+version = "0.47.5"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.4"
+version = "0.47.5"
 path = "../../../framework/scenario"
diff --git a/contracts/feature-tests/payable-features/meta/Cargo.toml b/contracts/feature-tests/payable-features/meta/Cargo.toml
index a651ce411e..4fb0cc3a23 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.4"
+version = "0.47.5"
 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 e36be08ae6..9e9d3c0cd2 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.4"
+version = "0.47.5"
 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 799071a673..3fdc4d3e5b 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.4"
+version = "0.47.5"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.4"
+version = "0.47.5"
 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 111428bdb7..a942895412 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.4"
+version = "0.47.5"
 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 a8b07cd43b..851caad934 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.4"
+version = "0.47.5"
 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 cc35e3dbf0..711deb667e 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.4"
+// version = "0.47.5"
 // 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 844be02a77..23f7a37d4d 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.4"
+version = "0.47.5"
 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 0fba5c371a..2a5bd51b12 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.4"
+version = "0.47.5"
 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.4"
+version = "0.47.5"
 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 7a54d9f7f6..a378195cc9 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.4"
+version = "0.47.5"
 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 79cdfd35fc..c50643a4db 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.4"
+version = "0.47.5"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/use-module/Cargo.toml b/contracts/feature-tests/use-module/Cargo.toml
index 6b2b9296c0..281bd20397 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.4"
+version = "0.47.5"
 path = "../../../contracts/modules"
 
 [dependencies.multiversx-sc]
-version = "0.47.4"
+version = "0.47.5"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.4"
+version = "0.47.5"
 path = "../../../framework/scenario"
 
 [dev-dependencies.multiversx-sc-meta]
-version = "0.47.4"
+version = "0.47.5"
 path = "../../../framework/meta"
diff --git a/contracts/feature-tests/use-module/meta/Cargo.toml b/contracts/feature-tests/use-module/meta/Cargo.toml
index ae47738894..8246cc5fce 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.4"
+version = "0.47.5"
 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 4ec3f48a8a..7a0eecd776 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.4"
+version = "0.47.5"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.47.4"
+version = "0.47.5"
 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 1e2aa7eece..56d64db6c4 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.4"
+            "version": "0.47.5"
         }
     },
     "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 9abfd943b0..8fef61ec76 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.4"
+            "version": "0.47.5"
         }
     },
     "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 3dfe8ccc8a..bf3768167c 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.4"
+version = "0.47.5"
 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 e3bd3d0058..129b71c83e 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.4"
+version = "0.47.5"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/modules/Cargo.toml b/contracts/modules/Cargo.toml
index 261a265d42..dcdc0d02e5 100644
--- a/contracts/modules/Cargo.toml
+++ b/contracts/modules/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-modules"
-version = "0.47.4"
+version = "0.47.5"
 edition = "2021"
 
 authors = ["MultiversX <contact@multiversx.com>"]
@@ -17,5 +17,5 @@ categories = ["no-std", "wasm", "cryptography::cryptocurrencies"]
 alloc = ["multiversx-sc/alloc"]
 
 [dependencies.multiversx-sc]
-version = "0.47.4"
+version = "0.47.5"
 path = "../../framework/base"
diff --git a/framework/base/Cargo.toml b/framework/base/Cargo.toml
index dd372ebb50..ad2b6e260c 100644
--- a/framework/base/Cargo.toml
+++ b/framework/base/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc"
-version = "0.47.4"
+version = "0.47.5"
 edition = "2021"
 
 authors = ["Andrei Marinica <andrei.marinica@multiversx.com>", "MultiversX <contact@multiversx.com>"]
@@ -27,7 +27,7 @@ bitflags = "=2.4.2"
 num-traits = { version = "=0.2.17", default-features = false }
 
 [dependencies.multiversx-sc-derive]
-version = "=0.47.4"
+version = "=0.47.5"
 path = "../derive"
 
 [dependencies.multiversx-sc-codec]
diff --git a/framework/derive/Cargo.toml b/framework/derive/Cargo.toml
index 6494bdb753..490cccf7d8 100644
--- a/framework/derive/Cargo.toml
+++ b/framework/derive/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-derive"
-version = "0.47.4"
+version = "0.47.5"
 edition = "2021"
 
 authors = ["Andrei Marinica <andrei.marinica@multiversx.com>", "MultiversX <contact@multiversx.com>"]
diff --git a/framework/meta/Cargo.toml b/framework/meta/Cargo.toml
index 4746b46a37..a4554cf766 100644
--- a/framework/meta/Cargo.toml
+++ b/framework/meta/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-meta"
-version = "0.47.4"
+version = "0.47.5"
 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.4"
+version = "=0.47.5"
 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 950038241c..d65b1b6094 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.4"
+version = "0.47.5"
 
 # [workspace]
 
diff --git a/framework/meta/src/cmd/contract/meta_config.rs b/framework/meta/src/cmd/contract/meta_config.rs
index f5e9c18123..f492884743 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.4\"
+version = \"0.47.5\"
 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.4".to_string(),
+            framework_version: "0.47.5".to_string(),
             framework_path: Option::Some("../../../framework/base".to_string()),
             contract_features: Vec::<String>::new(),
         };
diff --git a/framework/meta/src/version_history.rs b/framework/meta/src/version_history.rs
index 45bea078ce..dbd391af6e 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.4);
+pub const LAST_VERSION: FrameworkVersion = framework_version!(0.47.5);
 
 /// Indicates where to stop with the upgrades.
 pub const LAST_UPGRADE_VERSION: FrameworkVersion = LAST_VERSION;
@@ -62,6 +62,7 @@ pub const VERSIONS: &[FrameworkVersion] = framework_versions![
     0.47.2,
     0.47.3,
     0.47.4,
+    0.47.5,
 ];
 
 #[rustfmt::skip]
diff --git a/framework/scenario/Cargo.toml b/framework/scenario/Cargo.toml
index e599159afc..560cf08281 100644
--- a/framework/scenario/Cargo.toml
+++ b/framework/scenario/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-scenario"
-version = "0.47.4"
+version = "0.47.5"
 edition = "2021"
 
 authors = [
@@ -40,12 +40,12 @@ path = "src/main.rs"
 run-go-tests = []
 
 [dependencies.multiversx-sc]
-version = "=0.47.4"
+version = "=0.47.5"
 features = ["alloc", "num-bigint"]
 path = "../base"
 
 [dependencies.multiversx-sc-meta]
-version = "=0.47.4"
+version = "=0.47.5"
 path = "../meta"
 
 [dependencies.multiversx-chain-scenario-format]
diff --git a/framework/snippets/Cargo.toml b/framework/snippets/Cargo.toml
index 67b81fb93b..3eb1a578df 100644
--- a/framework/snippets/Cargo.toml
+++ b/framework/snippets/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-snippets"
-version = "0.47.4"
+version = "0.47.5"
 edition = "2021"
 
 authors = ["MultiversX <contact@multiversx.com>"]
@@ -22,7 +22,7 @@ env_logger = "0.11"
 futures = "0.3"
 
 [dependencies.multiversx-sc-scenario]
-version = "=0.47.4"
+version = "=0.47.5"
 path = "../scenario"
 
 [dependencies.multiversx-sdk]
diff --git a/framework/wasm-adapter/Cargo.toml b/framework/wasm-adapter/Cargo.toml
index 2e358e1b6b..4630f3d7d4 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.4"
+version = "0.47.5"
 edition = "2021"
 
 authors = [
@@ -22,5 +22,5 @@ categories = [
 ]
 
 [dependencies.multiversx-sc]
-version = "=0.47.4"
+version = "=0.47.5"
 path = "../base"
diff --git a/tools/mxpy-snippet-generator/Cargo.toml b/tools/mxpy-snippet-generator/Cargo.toml
index 7687286a24..6e7ab2d1b7 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.4"
+version = "0.47.5"
 path = "../../framework/base"
 
 [dependencies]
diff --git a/tools/rust-debugger/format-tests/Cargo.toml b/tools/rust-debugger/format-tests/Cargo.toml
index d006ef7960..806ca531ea 100644
--- a/tools/rust-debugger/format-tests/Cargo.toml
+++ b/tools/rust-debugger/format-tests/Cargo.toml
@@ -9,11 +9,11 @@ name = "format-tests"
 path = "src/format_tests.rs"
 
 [dependencies.multiversx-sc]
-version = "=0.47.4"
+version = "=0.47.5"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-scenario]
-version = "=0.47.4"
+version = "=0.47.5"
 path = "../../../framework/scenario"
 
 [dependencies.multiversx-chain-vm]

From 8aa543bbdc1a9511ce686b8603f8945bf4570d6b Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 8 Mar 2024 14:21:09 +0200
Subject: [PATCH 0408/1254] Cargo.lock update

---
 contracts/benchmarks/large-storage/wasm/Cargo.lock     |  6 +++---
 .../mappers/linked-list-repeat/wasm/Cargo.lock         |  6 +++---
 .../benchmarks/mappers/map-repeat/wasm/Cargo.lock      |  6 +++---
 .../benchmarks/mappers/queue-repeat/wasm/Cargo.lock    |  6 +++---
 .../benchmarks/mappers/set-repeat/wasm/Cargo.lock      |  6 +++---
 .../mappers/single-value-repeat/wasm/Cargo.lock        |  6 +++---
 .../benchmarks/mappers/vec-repeat/wasm/Cargo.lock      |  6 +++---
 contracts/benchmarks/send-tx-repeat/wasm/Cargo.lock    |  6 +++---
 contracts/benchmarks/str-repeat/wasm/Cargo.lock        |  6 +++---
 contracts/core/price-aggregator/wasm/Cargo.lock        | 10 +++++-----
 contracts/examples/adder/wasm/Cargo.lock               |  6 +++---
 .../examples/bonding-curve-contract/wasm/Cargo.lock    |  8 ++++----
 contracts/examples/check-pause/wasm/Cargo.lock         |  8 ++++----
 contracts/examples/crowdfunding-esdt/wasm/Cargo.lock   |  6 +++---
 contracts/examples/crypto-bubbles/wasm/Cargo.lock      |  6 +++---
 .../crypto-kitties/kitty-auction/wasm/Cargo.lock       |  6 +++---
 .../crypto-kitties/kitty-genetic-alg/wasm/Cargo.lock   |  6 +++---
 .../crypto-kitties/kitty-ownership/wasm/Cargo.lock     |  6 +++---
 contracts/examples/crypto-zombies/wasm/Cargo.lock      |  6 +++---
 contracts/examples/crypto-zombies/wasm/src/lib.rs      |  5 +++--
 contracts/examples/digital-cash/wasm/Cargo.lock        |  6 +++---
 contracts/examples/empty/wasm/Cargo.lock               |  6 +++---
 contracts/examples/empty/wasm/src/lib.rs               |  5 +++--
 .../examples/esdt-transfer-with-fee/wasm/Cargo.lock    |  6 +++---
 contracts/examples/factorial/wasm/Cargo.lock           |  6 +++---
 contracts/examples/fractional-nfts/wasm/Cargo.lock     |  8 ++++----
 contracts/examples/lottery-esdt/wasm/Cargo.lock        |  6 +++---
 .../examples/multisig/wasm-multisig-full/Cargo.lock    |  8 ++++----
 .../examples/multisig/wasm-multisig-view/Cargo.lock    |  8 ++++----
 contracts/examples/multisig/wasm/Cargo.lock            |  8 ++++----
 contracts/examples/nft-minter/wasm/Cargo.lock          |  6 +++---
 contracts/examples/nft-storage-prepay/wasm/Cargo.lock  |  6 +++---
 contracts/examples/nft-subscription/wasm/Cargo.lock    |  8 ++++----
 contracts/examples/order-book/factory/wasm/Cargo.lock  |  6 +++---
 contracts/examples/order-book/pair/wasm/Cargo.lock     |  6 +++---
 contracts/examples/ping-pong-egld/wasm/Cargo.lock      |  6 +++---
 contracts/examples/ping-pong-egld/wasm/src/lib.rs      |  5 +++--
 contracts/examples/proxy-pause/wasm/Cargo.lock         |  6 +++---
 .../examples/rewards-distribution/wasm/Cargo.lock      |  8 ++++----
 contracts/examples/seed-nft-minter/wasm/Cargo.lock     |  8 ++++----
 contracts/examples/token-release/wasm/Cargo.lock       |  6 +++---
 .../abi-tester/wasm-abi-tester-ev/Cargo.lock           |  6 +++---
 contracts/feature-tests/abi-tester/wasm/Cargo.lock     |  6 +++---
 .../alloc-features/wasm-alloc-mem-fail/Cargo.lock      |  6 +++---
 .../alloc-features/wasm-alloc-mem-leaking/Cargo.lock   |  6 +++---
 contracts/feature-tests/alloc-features/wasm/Cargo.lock |  6 +++---
 .../wasm-basic-features-storage-bytes/Cargo.lock       |  8 ++++----
 contracts/feature-tests/basic-features/wasm/Cargo.lock |  8 ++++----
 .../feature-tests/big-float-features/wasm/Cargo.lock   |  6 +++---
 .../builtin-func-features/wasm/Cargo.lock              |  6 +++---
 .../esdt-contract-pair/first-contract/wasm/Cargo.lock  |  6 +++---
 .../esdt-contract-pair/second-contract/wasm/Cargo.lock |  6 +++---
 .../child/wasm/Cargo.lock                              |  6 +++---
 .../parent/wasm/Cargo.lock                             |  6 +++---
 .../wasm-forwarder-queue-promises/Cargo.lock           |  6 +++---
 .../composability/forwarder-queue/wasm/Cargo.lock      |  6 +++---
 .../wasm-forwarder-raw-init-async-call/Cargo.lock      |  6 +++---
 .../wasm-forwarder-raw-init-sync-call/Cargo.lock       |  6 +++---
 .../composability/forwarder-raw/wasm/Cargo.lock        |  6 +++---
 .../composability/forwarder/wasm/Cargo.lock            |  6 +++---
 .../composability/local-esdt-and-nft/wasm/Cargo.lock   |  6 +++---
 .../composability/promises-features/wasm/Cargo.lock    |  6 +++---
 .../composability/proxy-test-first/wasm/Cargo.lock     |  6 +++---
 .../composability/proxy-test-second/wasm/Cargo.lock    |  6 +++---
 .../composability/recursive-caller/wasm/Cargo.lock     |  6 +++---
 .../transfer-role-features/wasm/Cargo.lock             |  8 ++++----
 .../composability/vault/wasm-vault-promises/Cargo.lock |  6 +++---
 .../composability/vault/wasm-vault-upgrade/Cargo.lock  |  6 +++---
 .../feature-tests/composability/vault/wasm/Cargo.lock  |  6 +++---
 .../crowdfunding-erc20/wasm/Cargo.lock                 |  6 +++---
 .../erc1155-marketplace/wasm/Cargo.lock                |  6 +++---
 .../erc1155-user-mock/wasm/Cargo.lock                  |  6 +++---
 .../erc-style-contracts/erc1155/wasm/Cargo.lock        |  6 +++---
 .../erc-style-contracts/erc20/wasm/Cargo.lock          |  6 +++---
 .../erc-style-contracts/erc721/wasm/Cargo.lock         |  6 +++---
 .../erc-style-contracts/lottery-erc20/wasm/Cargo.lock  |  6 +++---
 .../feature-tests/esdt-system-sc-mock/wasm/Cargo.lock  |  6 +++---
 .../formatted-message-features/wasm/Cargo.lock         |  6 +++---
 .../feature-tests/managed-map-features/wasm/Cargo.lock |  6 +++---
 .../wasm-multi-contract-alt-impl/Cargo.lock            |  6 +++---
 .../wasm-multi-contract-example-feature/Cargo.lock     |  6 +++---
 .../wasm-multi-contract-features-view/Cargo.lock       |  6 +++---
 .../multi-contract-features/wasm/Cargo.lock            |  6 +++---
 .../panic-message-features/wasm/Cargo.lock             |  6 +++---
 .../feature-tests/payable-features/wasm/Cargo.lock     |  6 +++---
 .../rust-snippets-generator-test/wasm/Cargo.lock       |  6 +++---
 .../rust-testing-framework-tester/wasm/Cargo.lock      |  6 +++---
 .../use-module/wasm-use-module-view/Cargo.lock         |  8 ++++----
 contracts/feature-tests/use-module/wasm/Cargo.lock     |  8 ++++----
 89 files changed, 283 insertions(+), 280 deletions(-)

diff --git a/contracts/benchmarks/large-storage/wasm/Cargo.lock b/contracts/benchmarks/large-storage/wasm/Cargo.lock
index 8148ac8ac3..fa29ad6f14 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.47.4"
+version = "0.47.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.lock
index e735e81157..b81c08488a 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.47.4"
+version = "0.47.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -92,7 +92,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -103,7 +103,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.lock
index da86542260..54e27ced42 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.47.4"
+version = "0.47.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -92,7 +92,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -103,7 +103,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.lock
index cbc93b8e4a..a92443bd08 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.47.4"
+version = "0.47.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.lock
index 8f007230ed..5e5d756355 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.47.4"
+version = "0.47.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.lock
index 0ed5ea463d..558c2921c6 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.47.4"
+version = "0.47.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.lock
index a890308d2e..2feba1a867 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.47.4"
+version = "0.47.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/send-tx-repeat/wasm/Cargo.lock b/contracts/benchmarks/send-tx-repeat/wasm/Cargo.lock
index 1950219bdb..f9dfe9d5b2 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.47.4"
+version = "0.47.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/str-repeat/wasm/Cargo.lock b/contracts/benchmarks/str-repeat/wasm/Cargo.lock
index 196a58c5e7..1486892d5c 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.47.4"
+version = "0.47.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/core/price-aggregator/wasm/Cargo.lock b/contracts/core/price-aggregator/wasm/Cargo.lock
index e57c4b5d42..3c49a61d3a 100644
--- a/contracts/core/price-aggregator/wasm/Cargo.lock
+++ b/contracts/core/price-aggregator/wasm/Cargo.lock
@@ -86,7 +86,7 @@ checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
 
 [[package]]
 name = "multiversx-price-aggregator-sc"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "arrayvec",
  "getrandom",
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -134,7 +134,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -145,14 +145,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/adder/wasm/Cargo.lock b/contracts/examples/adder/wasm/Cargo.lock
index 76dad58cac..ee2b588c5d 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.47.4"
+version = "0.47.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/bonding-curve-contract/wasm/Cargo.lock b/contracts/examples/bonding-curve-contract/wasm/Cargo.lock
index b034ea7a9b..4764163b77 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.47.4"
+version = "0.47.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,14 +96,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/check-pause/wasm/Cargo.lock b/contracts/examples/check-pause/wasm/Cargo.lock
index b49e145835..659770d735 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.47.4"
+version = "0.47.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,14 +96,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crowdfunding-esdt/wasm/Cargo.lock b/contracts/examples/crowdfunding-esdt/wasm/Cargo.lock
index 01d410dd3a..06a703eb14 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.47.4"
+version = "0.47.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crypto-bubbles/wasm/Cargo.lock b/contracts/examples/crypto-bubbles/wasm/Cargo.lock
index c646689015..f2c55800ed 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.47.4"
+version = "0.47.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.lock b/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.lock
index 5b6ccc42b7..844e92ad69 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.47.4"
+version = "0.47.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -113,7 +113,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -124,7 +124,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "multiversx-sc",
 ]
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 c6f967bda2..3b48261415 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.47.4"
+version = "0.47.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.lock b/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.lock
index 3fcdd3fbd1..2305919360 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.47.4"
+version = "0.47.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -104,7 +104,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -115,7 +115,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crypto-zombies/wasm/Cargo.lock b/contracts/examples/crypto-zombies/wasm/Cargo.lock
index 5605b9f6ab..9425f7d3fe 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.47.4"
+version = "0.47.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crypto-zombies/wasm/src/lib.rs b/contracts/examples/crypto-zombies/wasm/src/lib.rs
index ddffa98fa8..44f5f426c8 100644
--- a/contracts/examples/crypto-zombies/wasm/src/lib.rs
+++ b/contracts/examples/crypto-zombies/wasm/src/lib.rs
@@ -5,9 +5,9 @@
 ////////////////////////////////////////////////////
 
 // Init:                                 1
-// Endpoints:                           17
+// Endpoints:                           18
 // Async Callback:                       1
-// Total number of exported functions:  19
+// Total number of exported functions:  20
 
 #![no_std]
 #![allow(internal_features)]
@@ -20,6 +20,7 @@ multiversx_sc_wasm_adapter::endpoints! {
     crypto_zombies
     (
         init => init
+        upgrade => upgrade
         set_crypto_kitties_sc_address => set_crypto_kitties_sc_address
         generate_random_dna => generate_random_dna
         create_random_zombie => create_random_zombie
diff --git a/contracts/examples/digital-cash/wasm/Cargo.lock b/contracts/examples/digital-cash/wasm/Cargo.lock
index 8b772e8f01..d01e7ca5d3 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.47.4"
+version = "0.47.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/empty/wasm/Cargo.lock b/contracts/examples/empty/wasm/Cargo.lock
index c711b28cbd..ed51dd0f2d 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.47.4"
+version = "0.47.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/empty/wasm/src/lib.rs b/contracts/examples/empty/wasm/src/lib.rs
index 15644e786d..33ca3e1cfd 100644
--- a/contracts/examples/empty/wasm/src/lib.rs
+++ b/contracts/examples/empty/wasm/src/lib.rs
@@ -5,9 +5,9 @@
 ////////////////////////////////////////////////////
 
 // Init:                                 1
-// Endpoints:                            0
+// Endpoints:                            1
 // Async Callback (empty):               1
-// Total number of exported functions:   2
+// Total number of exported functions:   3
 
 #![no_std]
 #![allow(internal_features)]
@@ -20,6 +20,7 @@ multiversx_sc_wasm_adapter::endpoints! {
     empty
     (
         init => init
+        upgrade => upgrade
     )
 }
 
diff --git a/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.lock b/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.lock
index d629a0d134..4a29f51769 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.47.4"
+version = "0.47.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/factorial/wasm/Cargo.lock b/contracts/examples/factorial/wasm/Cargo.lock
index afac55b95e..93ca6d814f 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.47.4"
+version = "0.47.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/fractional-nfts/wasm/Cargo.lock b/contracts/examples/fractional-nfts/wasm/Cargo.lock
index 1aac8b6a7e..8cb705ce82 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.47.4"
+version = "0.47.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,14 +96,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/lottery-esdt/wasm/Cargo.lock b/contracts/examples/lottery-esdt/wasm/Cargo.lock
index 8c3f659391..a597e353be 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.47.4"
+version = "0.47.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/multisig/wasm-multisig-full/Cargo.lock b/contracts/examples/multisig/wasm-multisig-full/Cargo.lock
index 755f08055b..329757cdb6 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.47.4"
+version = "0.47.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,14 +96,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/multisig/wasm-multisig-view/Cargo.lock b/contracts/examples/multisig/wasm-multisig-view/Cargo.lock
index dd6c470358..9ec7d5be1e 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.47.4"
+version = "0.47.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,14 +96,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/multisig/wasm/Cargo.lock b/contracts/examples/multisig/wasm/Cargo.lock
index a2a15edc66..a1f0090ffe 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.47.4"
+version = "0.47.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,14 +96,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/nft-minter/wasm/Cargo.lock b/contracts/examples/nft-minter/wasm/Cargo.lock
index 96d3199e96..8137f69e11 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.47.4"
+version = "0.47.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/nft-storage-prepay/wasm/Cargo.lock b/contracts/examples/nft-storage-prepay/wasm/Cargo.lock
index 531c5cca79..9618be73c9 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.47.4"
+version = "0.47.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/nft-subscription/wasm/Cargo.lock b/contracts/examples/nft-subscription/wasm/Cargo.lock
index 77ba923958..53bd528197 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.47.4"
+version = "0.47.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,14 +80,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/order-book/factory/wasm/Cargo.lock b/contracts/examples/order-book/factory/wasm/Cargo.lock
index f4dcd0fd4d..c5b0d6fa16 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.47.4"
+version = "0.47.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/order-book/pair/wasm/Cargo.lock b/contracts/examples/order-book/pair/wasm/Cargo.lock
index 02cce8b075..ee004b1197 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.47.4"
+version = "0.47.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/ping-pong-egld/wasm/Cargo.lock b/contracts/examples/ping-pong-egld/wasm/Cargo.lock
index b8b8c55924..b1fa1d7bee 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.47.4"
+version = "0.47.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/ping-pong-egld/wasm/src/lib.rs b/contracts/examples/ping-pong-egld/wasm/src/lib.rs
index 5e3d5faca6..ec95d16c7e 100644
--- a/contracts/examples/ping-pong-egld/wasm/src/lib.rs
+++ b/contracts/examples/ping-pong-egld/wasm/src/lib.rs
@@ -5,9 +5,9 @@
 ////////////////////////////////////////////////////
 
 // Init:                                 1
-// Endpoints:                           10
+// Endpoints:                           11
 // Async Callback (empty):               1
-// Total number of exported functions:  12
+// Total number of exported functions:  13
 
 #![no_std]
 #![allow(internal_features)]
@@ -20,6 +20,7 @@ multiversx_sc_wasm_adapter::endpoints! {
     ping_pong_egld
     (
         init => init
+        upgrade => upgrade
         ping => ping
         pong => pong
         pongAll => pong_all
diff --git a/contracts/examples/proxy-pause/wasm/Cargo.lock b/contracts/examples/proxy-pause/wasm/Cargo.lock
index 3fe7a57949..d9ee7fd1bf 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.47.4"
+version = "0.47.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/rewards-distribution/wasm/Cargo.lock b/contracts/examples/rewards-distribution/wasm/Cargo.lock
index 81ec12d61c..2f7aa5b9c9 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.47.4"
+version = "0.47.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,14 +80,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/seed-nft-minter/wasm/Cargo.lock b/contracts/examples/seed-nft-minter/wasm/Cargo.lock
index d8833508b2..cf8559ba91 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.47.4"
+version = "0.47.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,14 +80,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/token-release/wasm/Cargo.lock b/contracts/examples/token-release/wasm/Cargo.lock
index 15cb26d036..04771bffe7 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.47.4"
+version = "0.47.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "multiversx-sc",
 ]
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 ba640af091..68b0945a4a 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.47.4"
+version = "0.47.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/abi-tester/wasm/Cargo.lock b/contracts/feature-tests/abi-tester/wasm/Cargo.lock
index a19279f401..8f5706541d 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.47.4"
+version = "0.47.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock
index bd879ba61d..86a0dd8369 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.lock b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.lock
index 3cc4ec38d2..e6478aa683 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.lock
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.lock
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/alloc-features/wasm/Cargo.lock b/contracts/feature-tests/alloc-features/wasm/Cargo.lock
index e5835e2b7a..78cd8de067 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.47.4"
+version = "0.47.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "multiversx-sc",
 ]
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 2df9369539..fd4d59761c 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.47.4"
+version = "0.47.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,14 +96,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/basic-features/wasm/Cargo.lock b/contracts/feature-tests/basic-features/wasm/Cargo.lock
index d7b69c3824..e4bb971005 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.47.4"
+version = "0.47.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,14 +96,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/big-float-features/wasm/Cargo.lock b/contracts/feature-tests/big-float-features/wasm/Cargo.lock
index 4b170e4db8..8de5fab712 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.47.4"
+version = "0.47.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "multiversx-sc",
 ]
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 82d29dce3b..4e9e07752c 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.47.4"
+version = "0.47.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "multiversx-sc",
 ]
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 e67425c1a8..c38b6fb0ce 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.47.4"
+version = "0.47.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "multiversx-sc",
 ]
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 f8807680d7..b6b9fc008d 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.47.4"
+version = "0.47.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "multiversx-sc",
 ]
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 2022bb8ce9..1fcf243263 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.47.4"
+version = "0.47.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "multiversx-sc",
 ]
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 240d777f6c..a1695205f6 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.47.4"
+version = "0.47.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "multiversx-sc",
 ]
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 b724024395..77b8dddef6 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.47.4"
+version = "0.47.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,7 +96,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock
index e016cf9424..16c620e6f3 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.47.4"
+version = "0.47.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,7 +96,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "multiversx-sc",
 ]
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 5f95df3475..dc9d4ac00a 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.47.4"
+version = "0.47.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "multiversx-sc",
 ]
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 f56e305375..1e3db2655b 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.47.4"
+version = "0.47.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.lock
index 91e3bd89a9..f5ba514af5 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.47.4"
+version = "0.47.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock
index c97d19070a..3d866d859a 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.47.4"
+version = "0.47.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,7 +96,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "multiversx-sc",
 ]
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 689b3335f2..acc6558d24 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.47.4"
+version = "0.47.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/promises-features/wasm/Cargo.lock b/contracts/feature-tests/composability/promises-features/wasm/Cargo.lock
index 5dfe73db9f..eb6e4092ed 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.47.4"
+version = "0.47.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "multiversx-sc",
 ]
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 ac29bd11ae..4aff4f7065 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.47.4"
+version = "0.47.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "multiversx-sc",
 ]
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 6cc85e8a9f..3420a7b3f6 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.47.4"
+version = "0.47.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.lock b/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.lock
index 63354a689b..1c86119ff1 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.47.4"
+version = "0.47.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "multiversx-sc",
 ]
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 109fc9822b..bb7ae8f108 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.47.4"
+version = "0.47.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,14 +80,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "multiversx-sc",
 ]
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 2d088845e2..ee08553757 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.47.4"
+version = "0.47.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "multiversx-sc",
 ]
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 155de79270..5130bd4f11 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.47.4"
+version = "0.47.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/vault/wasm/Cargo.lock b/contracts/feature-tests/composability/vault/wasm/Cargo.lock
index f1ca2e7050..7c62c838a8 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.47.4"
+version = "0.47.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "multiversx-sc",
 ]
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 bea64d59ff..c1f6bbab6c 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.47.4"
+version = "0.47.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -92,7 +92,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -103,7 +103,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "multiversx-sc",
 ]
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 9c1dab726e..e1d897e85b 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.47.4"
+version = "0.47.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -92,7 +92,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -103,7 +103,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "multiversx-sc",
 ]
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 70a92d0808..89b2e55240 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.47.4"
+version = "0.47.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "multiversx-sc",
 ]
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 474ac2e011..edcb0e4176 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.47.4"
+version = "0.47.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "multiversx-sc",
 ]
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 ad9f9fd870..4833835c10 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.47.4"
+version = "0.47.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "multiversx-sc",
 ]
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 60bc68aaee..7b5004e949 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.47.4"
+version = "0.47.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "multiversx-sc",
 ]
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 2e3ed780bc..2d821b9e29 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.47.4"
+version = "0.47.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -92,7 +92,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -103,7 +103,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "multiversx-sc",
 ]
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 eb96bc7f0d..d789558af3 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.47.4"
+version = "0.47.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/formatted-message-features/wasm/Cargo.lock b/contracts/feature-tests/formatted-message-features/wasm/Cargo.lock
index 8c987ab31f..b19830db13 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.47.4"
+version = "0.47.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/managed-map-features/wasm/Cargo.lock b/contracts/feature-tests/managed-map-features/wasm/Cargo.lock
index 7e5399de32..e8fa9edd3d 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.47.4"
+version = "0.47.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "multiversx-sc",
 ]
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 aceb038fd8..1361ebb7c7 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.47.4"
+version = "0.47.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "multiversx-sc",
 ]
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 9286c580a2..3928df2b36 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.47.4"
+version = "0.47.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "multiversx-sc",
 ]
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 65cc74b09e..db8878b7ad 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.47.4"
+version = "0.47.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/multi-contract-features/wasm/Cargo.lock b/contracts/feature-tests/multi-contract-features/wasm/Cargo.lock
index ce7ca2f252..a8b5526b05 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.47.4"
+version = "0.47.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/panic-message-features/wasm/Cargo.lock b/contracts/feature-tests/panic-message-features/wasm/Cargo.lock
index 558b9240b2..daee57efc3 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.47.4"
+version = "0.47.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/payable-features/wasm/Cargo.lock b/contracts/feature-tests/payable-features/wasm/Cargo.lock
index 704af6b632..56c5e9e863 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.47.4"
+version = "0.47.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "multiversx-sc",
 ]
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 c22b5416f6..1f0efa51a3 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.47.4"
+version = "0.47.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "multiversx-sc",
 ]
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 0fcafe1b8f..83116fbd50 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.47.4"
+version = "0.47.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "multiversx-sc",
 ]
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 24321aeeb7..6de9cf30eb 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.47.4"
+version = "0.47.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,14 +80,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/use-module/wasm/Cargo.lock b/contracts/feature-tests/use-module/wasm/Cargo.lock
index 1cd3a408af..9d8b2504a3 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.47.4"
+version = "0.47.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,14 +80,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.4"
+version = "0.47.5"
 dependencies = [
  "multiversx-sc",
 ]

From 652e1a86b2a661fd1b1428443b4e1cffb6ca7024 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 8 Mar 2024 14:23:49 +0200
Subject: [PATCH 0409/1254] scenario fmt

---
 .../alloc-features/scenarios/alloc_mem_fail.scen.json       | 2 +-
 .../alloc-features/scenarios/alloc_mem_leaking.scen.json    | 2 +-
 .../scenarios/storage_mapper_get_at_address.scen.json       | 2 +-
 .../rust-testing-framework-tester/scenarios/test.scen.json  | 2 --
 .../scenarios/test_esdt_generation.scen.json                | 6 ++----
 5 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/contracts/feature-tests/alloc-features/scenarios/alloc_mem_fail.scen.json b/contracts/feature-tests/alloc-features/scenarios/alloc_mem_fail.scen.json
index 0925fbf76f..5185e53638 100644
--- a/contracts/feature-tests/alloc-features/scenarios/alloc_mem_fail.scen.json
+++ b/contracts/feature-tests/alloc-features/scenarios/alloc_mem_fail.scen.json
@@ -36,4 +36,4 @@
             }
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/contracts/feature-tests/alloc-features/scenarios/alloc_mem_leaking.scen.json b/contracts/feature-tests/alloc-features/scenarios/alloc_mem_leaking.scen.json
index d45bf922ac..0cae3b7303 100644
--- a/contracts/feature-tests/alloc-features/scenarios/alloc_mem_leaking.scen.json
+++ b/contracts/feature-tests/alloc-features/scenarios/alloc_mem_leaking.scen.json
@@ -37,4 +37,4 @@
             }
         }
     ]
-}
\ No newline at end of file
+}
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 6c2feb1d84..ffa1bbb620 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
@@ -305,4 +305,4 @@
             }
         }
     ]
-}
\ No newline at end of file
+}
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 d92783c9a0..eccc6e7367 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
@@ -37,7 +37,6 @@
             "accounts": {
                 "0x0000000000000000fb1397e8225ea85e0f0e6e8c7b126d0016ccbde0e667151e": {
                     "balance": "0",
-                    "esdt": {},
                     "storage": {
                         "str:totalValue": "0x01"
                     },
@@ -71,7 +70,6 @@
             "accounts": {
                 "0x0000000000000000fb1397e8225ea85e0f0e6e8c7b126d0016ccbde0e667151e": {
                     "balance": "0",
-                    "esdt": {},
                     "storage": {
                         "0x76616c756550657243616c6c657266687aadf862bd776c8fc18b8e9f8e20089714856ee233b3902a591d0d5f2925": "0x32",
                         "str:totalValue": "0x33"
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 558a14c743..a81d56b4f3 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
@@ -21,8 +21,7 @@
                                 {
                                     "nonce": "0",
                                     "balance": "1000",
-                                    "royalties": "0",
-                                    "attributes": "0x"
+                                    "royalties": "0"
                                 }
                             ]
                         }
@@ -45,8 +44,7 @@
                                     "nonce": "0",
                                     "balance": "1000",
                                     "royalties": "0",
-                                    "uri": [],
-                                    "attributes": "0x"
+                                    "uri": []
                                 }
                             ]
                         }

From bbaf79557ae249deb6689bf410c74a361bcfcda2 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 8 Mar 2024 14:32:47 +0200
Subject: [PATCH 0410/1254] scenario re-gen

---
 .../scenarios/stress_submit_test.scen.json    | 203 +++++++++++++-----
 .../scenarios/test.scen.json                  |   2 +
 .../scenarios/test_esdt_generation.scen.json  |   6 +-
 3 files changed, 159 insertions(+), 52 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 72d06e6316..6542b59c39 100644
--- a/contracts/core/price-aggregator/scenarios/stress_submit_test.scen.json
+++ b/contracts/core/price-aggregator/scenarios/stress_submit_test.scen.json
@@ -220,6 +220,7 @@
         },
         {
             "step": "scDeploy",
+            "id": "",
             "tx": {
                 "from": "address:owner",
                 "contractCode": "mxsc:../output/multiversx-price-aggregator-sc.mxsc.json",
@@ -289,6 +290,7 @@
         },
         {
             "step": "scCall",
+            "id": "",
             "tx": {
                 "from": "address:oracle1",
                 "to": "sc:price-aggregator",
@@ -304,6 +306,7 @@
         },
         {
             "step": "scCall",
+            "id": "",
             "tx": {
                 "from": "address:oracle2",
                 "to": "sc:price-aggregator",
@@ -319,6 +322,7 @@
         },
         {
             "step": "scCall",
+            "id": "",
             "tx": {
                 "from": "address:oracle3",
                 "to": "sc:price-aggregator",
@@ -334,6 +338,7 @@
         },
         {
             "step": "scCall",
+            "id": "",
             "tx": {
                 "from": "address:oracle4",
                 "to": "sc:price-aggregator",
@@ -349,6 +354,7 @@
         },
         {
             "step": "scCall",
+            "id": "",
             "tx": {
                 "from": "address:oracle5",
                 "to": "sc:price-aggregator",
@@ -364,6 +370,7 @@
         },
         {
             "step": "scCall",
+            "id": "",
             "tx": {
                 "from": "address:oracle6",
                 "to": "sc:price-aggregator",
@@ -379,6 +386,7 @@
         },
         {
             "step": "scCall",
+            "id": "",
             "tx": {
                 "from": "address:oracle7",
                 "to": "sc:price-aggregator",
@@ -394,6 +402,7 @@
         },
         {
             "step": "scCall",
+            "id": "",
             "tx": {
                 "from": "address:oracle8",
                 "to": "sc:price-aggregator",
@@ -409,6 +418,7 @@
         },
         {
             "step": "scCall",
+            "id": "",
             "tx": {
                 "from": "address:oracle9",
                 "to": "sc:price-aggregator",
@@ -424,6 +434,7 @@
         },
         {
             "step": "scCall",
+            "id": "",
             "tx": {
                 "from": "address:oracle10",
                 "to": "sc:price-aggregator",
@@ -439,6 +450,7 @@
         },
         {
             "step": "scCall",
+            "id": "",
             "tx": {
                 "from": "address:oracle11",
                 "to": "sc:price-aggregator",
@@ -454,6 +466,7 @@
         },
         {
             "step": "scCall",
+            "id": "",
             "tx": {
                 "from": "address:oracle12",
                 "to": "sc:price-aggregator",
@@ -469,6 +482,7 @@
         },
         {
             "step": "scCall",
+            "id": "",
             "tx": {
                 "from": "address:oracle13",
                 "to": "sc:price-aggregator",
@@ -484,6 +498,7 @@
         },
         {
             "step": "scCall",
+            "id": "",
             "tx": {
                 "from": "address:oracle14",
                 "to": "sc:price-aggregator",
@@ -499,6 +514,7 @@
         },
         {
             "step": "scCall",
+            "id": "",
             "tx": {
                 "from": "address:oracle15",
                 "to": "sc:price-aggregator",
@@ -514,6 +530,7 @@
         },
         {
             "step": "scCall",
+            "id": "",
             "tx": {
                 "from": "address:oracle16",
                 "to": "sc:price-aggregator",
@@ -529,6 +546,7 @@
         },
         {
             "step": "scCall",
+            "id": "",
             "tx": {
                 "from": "address:oracle17",
                 "to": "sc:price-aggregator",
@@ -544,6 +562,7 @@
         },
         {
             "step": "scCall",
+            "id": "",
             "tx": {
                 "from": "address:oracle18",
                 "to": "sc:price-aggregator",
@@ -559,6 +578,7 @@
         },
         {
             "step": "scCall",
+            "id": "",
             "tx": {
                 "from": "address:oracle19",
                 "to": "sc:price-aggregator",
@@ -574,6 +594,7 @@
         },
         {
             "step": "scCall",
+            "id": "",
             "tx": {
                 "from": "address:oracle20",
                 "to": "sc:price-aggregator",
@@ -589,6 +610,7 @@
         },
         {
             "step": "scCall",
+            "id": "",
             "tx": {
                 "from": "address:oracle21",
                 "to": "sc:price-aggregator",
@@ -604,6 +626,7 @@
         },
         {
             "step": "scCall",
+            "id": "",
             "tx": {
                 "from": "address:oracle22",
                 "to": "sc:price-aggregator",
@@ -619,6 +642,7 @@
         },
         {
             "step": "scCall",
+            "id": "",
             "tx": {
                 "from": "address:oracle23",
                 "to": "sc:price-aggregator",
@@ -634,6 +658,7 @@
         },
         {
             "step": "scCall",
+            "id": "",
             "tx": {
                 "from": "address:oracle24",
                 "to": "sc:price-aggregator",
@@ -649,6 +674,7 @@
         },
         {
             "step": "scCall",
+            "id": "",
             "tx": {
                 "from": "address:oracle25",
                 "to": "sc:price-aggregator",
@@ -664,6 +690,7 @@
         },
         {
             "step": "scCall",
+            "id": "",
             "tx": {
                 "from": "address:oracle26",
                 "to": "sc:price-aggregator",
@@ -679,6 +706,7 @@
         },
         {
             "step": "scCall",
+            "id": "",
             "tx": {
                 "from": "address:oracle27",
                 "to": "sc:price-aggregator",
@@ -694,6 +722,7 @@
         },
         {
             "step": "scCall",
+            "id": "",
             "tx": {
                 "from": "address:oracle28",
                 "to": "sc:price-aggregator",
@@ -709,6 +738,7 @@
         },
         {
             "step": "scCall",
+            "id": "",
             "tx": {
                 "from": "address:oracle29",
                 "to": "sc:price-aggregator",
@@ -724,6 +754,7 @@
         },
         {
             "step": "scCall",
+            "id": "",
             "tx": {
                 "from": "address:oracle30",
                 "to": "sc:price-aggregator",
@@ -739,6 +770,7 @@
         },
         {
             "step": "scCall",
+            "id": "",
             "tx": {
                 "from": "address:oracle31",
                 "to": "sc:price-aggregator",
@@ -754,6 +786,7 @@
         },
         {
             "step": "scCall",
+            "id": "",
             "tx": {
                 "from": "address:oracle32",
                 "to": "sc:price-aggregator",
@@ -769,6 +802,7 @@
         },
         {
             "step": "scCall",
+            "id": "",
             "tx": {
                 "from": "address:oracle33",
                 "to": "sc:price-aggregator",
@@ -784,6 +818,7 @@
         },
         {
             "step": "scCall",
+            "id": "",
             "tx": {
                 "from": "address:oracle34",
                 "to": "sc:price-aggregator",
@@ -799,6 +834,7 @@
         },
         {
             "step": "scCall",
+            "id": "",
             "tx": {
                 "from": "address:oracle35",
                 "to": "sc:price-aggregator",
@@ -814,6 +850,7 @@
         },
         {
             "step": "scCall",
+            "id": "",
             "tx": {
                 "from": "address:oracle36",
                 "to": "sc:price-aggregator",
@@ -829,6 +866,7 @@
         },
         {
             "step": "scCall",
+            "id": "",
             "tx": {
                 "from": "address:oracle37",
                 "to": "sc:price-aggregator",
@@ -844,6 +882,7 @@
         },
         {
             "step": "scCall",
+            "id": "",
             "tx": {
                 "from": "address:oracle38",
                 "to": "sc:price-aggregator",
@@ -859,6 +898,7 @@
         },
         {
             "step": "scCall",
+            "id": "",
             "tx": {
                 "from": "address:oracle39",
                 "to": "sc:price-aggregator",
@@ -874,6 +914,7 @@
         },
         {
             "step": "scCall",
+            "id": "",
             "tx": {
                 "from": "address:oracle40",
                 "to": "sc:price-aggregator",
@@ -889,6 +930,7 @@
         },
         {
             "step": "scCall",
+            "id": "",
             "tx": {
                 "from": "address:oracle41",
                 "to": "sc:price-aggregator",
@@ -904,6 +946,7 @@
         },
         {
             "step": "scCall",
+            "id": "",
             "tx": {
                 "from": "address:oracle42",
                 "to": "sc:price-aggregator",
@@ -919,6 +962,7 @@
         },
         {
             "step": "scCall",
+            "id": "",
             "tx": {
                 "from": "address:oracle43",
                 "to": "sc:price-aggregator",
@@ -934,6 +978,7 @@
         },
         {
             "step": "scCall",
+            "id": "",
             "tx": {
                 "from": "address:oracle44",
                 "to": "sc:price-aggregator",
@@ -949,6 +994,7 @@
         },
         {
             "step": "scCall",
+            "id": "",
             "tx": {
                 "from": "address:oracle45",
                 "to": "sc:price-aggregator",
@@ -964,6 +1010,7 @@
         },
         {
             "step": "scCall",
+            "id": "",
             "tx": {
                 "from": "address:oracle46",
                 "to": "sc:price-aggregator",
@@ -979,6 +1026,7 @@
         },
         {
             "step": "scCall",
+            "id": "",
             "tx": {
                 "from": "address:oracle47",
                 "to": "sc:price-aggregator",
@@ -994,6 +1042,7 @@
         },
         {
             "step": "scCall",
+            "id": "",
             "tx": {
                 "from": "address:oracle48",
                 "to": "sc:price-aggregator",
@@ -1009,6 +1058,7 @@
         },
         {
             "step": "scCall",
+            "id": "",
             "tx": {
                 "from": "address:oracle49",
                 "to": "sc:price-aggregator",
@@ -1024,6 +1074,7 @@
         },
         {
             "step": "scCall",
+            "id": "",
             "tx": {
                 "from": "address:oracle50",
                 "to": "sc:price-aggregator",
@@ -1039,6 +1090,7 @@
         },
         {
             "step": "scCall",
+            "id": "",
             "tx": {
                 "from": "address:owner",
                 "to": "sc:price-aggregator",
@@ -1057,6 +1109,7 @@
         },
         {
             "step": "scCall",
+            "id": "",
             "tx": {
                 "from": "address:owner",
                 "to": "sc:price-aggregator",
@@ -1071,6 +1124,7 @@
         },
         {
             "step": "scCall",
+            "id": "",
             "tx": {
                 "from": "address:oracle1",
                 "to": "sc:price-aggregator",
@@ -1079,7 +1133,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x5f",
-                    "0x20f828b458ed8ed1",
+                    "0x3beec6f9cf5130ed",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1091,6 +1145,7 @@
         },
         {
             "step": "scCall",
+            "id": "",
             "tx": {
                 "from": "address:oracle2",
                 "to": "sc:price-aggregator",
@@ -1099,7 +1154,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x2676d2b701c3b471",
+                    "0x50d924566a98aec8",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1111,6 +1166,7 @@
         },
         {
             "step": "scCall",
+            "id": "",
             "tx": {
                 "from": "address:oracle3",
                 "to": "sc:price-aggregator",
@@ -1119,7 +1175,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x18052e90c58519cd",
+                    "0x097b928bb2d85516",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1131,6 +1187,7 @@
         },
         {
             "step": "scCall",
+            "id": "",
             "tx": {
                 "from": "address:oracle4",
                 "to": "sc:price-aggregator",
@@ -1139,7 +1196,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x4b139df90523ff1e",
+                    "0x765c960a5c3c6b95",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1151,6 +1208,7 @@
         },
         {
             "step": "scCall",
+            "id": "",
             "tx": {
                 "from": "address:oracle5",
                 "to": "sc:price-aggregator",
@@ -1159,7 +1217,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x8d8ff5c57157d8b2",
+                    "0xf7426f44c20f404c",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1171,6 +1229,7 @@
         },
         {
             "step": "scCall",
+            "id": "",
             "tx": {
                 "from": "address:oracle6",
                 "to": "sc:price-aggregator",
@@ -1179,7 +1238,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x429916db24f4a29a",
+                    "0xa5c69769ba606c2b",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1191,6 +1250,7 @@
         },
         {
             "step": "scCall",
+            "id": "",
             "tx": {
                 "from": "address:oracle7",
                 "to": "sc:price-aggregator",
@@ -1199,7 +1259,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x20c94b8b0e79ad2c",
+                    "0xe8f77e933d1f2517",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1211,6 +1271,7 @@
         },
         {
             "step": "scCall",
+            "id": "",
             "tx": {
                 "from": "address:oracle8",
                 "to": "sc:price-aggregator",
@@ -1219,7 +1280,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x9394613d6e0c60a0",
+                    "0x94fba404681c1183",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1231,6 +1292,7 @@
         },
         {
             "step": "scCall",
+            "id": "",
             "tx": {
                 "from": "address:oracle9",
                 "to": "sc:price-aggregator",
@@ -1239,7 +1301,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x09b91e4b6287762c",
+                    "0xdc506f08b25d3b71",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1251,6 +1313,7 @@
         },
         {
             "step": "scCall",
+            "id": "",
             "tx": {
                 "from": "address:oracle10",
                 "to": "sc:price-aggregator",
@@ -1259,7 +1322,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x8f523ef0c30d5660",
+                    "0xf5b0acb8ddff3752",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1271,6 +1334,7 @@
         },
         {
             "step": "scCall",
+            "id": "",
             "tx": {
                 "from": "address:oracle11",
                 "to": "sc:price-aggregator",
@@ -1279,7 +1343,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x9a3b75436bbc9750",
+                    "0x39a7d356f768ea5e",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1291,6 +1355,7 @@
         },
         {
             "step": "scCall",
+            "id": "",
             "tx": {
                 "from": "address:oracle12",
                 "to": "sc:price-aggregator",
@@ -1299,7 +1364,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xaf90f593a2eca8b0",
+                    "0xaf145a7f797a48a1",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1311,6 +1376,7 @@
         },
         {
             "step": "scCall",
+            "id": "",
             "tx": {
                 "from": "address:oracle13",
                 "to": "sc:price-aggregator",
@@ -1319,7 +1385,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xe49d6e0a84537efc",
+                    "0xb18143fe76eef718",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1331,6 +1397,7 @@
         },
         {
             "step": "scCall",
+            "id": "",
             "tx": {
                 "from": "address:oracle14",
                 "to": "sc:price-aggregator",
@@ -1339,7 +1406,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x9358a38ff254be4b",
+                    "0x6f64a1ddec18e577",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1351,6 +1418,7 @@
         },
         {
             "step": "scCall",
+            "id": "",
             "tx": {
                 "from": "address:oracle15",
                 "to": "sc:price-aggregator",
@@ -1359,7 +1427,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x4224d33d8a7342fb",
+                    "0x87ffce2a932db3d4",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1371,6 +1439,7 @@
         },
         {
             "step": "scCall",
+            "id": "",
             "tx": {
                 "from": "address:oracle16",
                 "to": "sc:price-aggregator",
@@ -1379,7 +1448,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x9787f59a3d6b5a71",
+                    "0xe6642c7265c738c1",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1391,6 +1460,7 @@
         },
         {
             "step": "scCall",
+            "id": "",
             "tx": {
                 "from": "address:oracle17",
                 "to": "sc:price-aggregator",
@@ -1399,7 +1469,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xae871a49e18c8a4e",
+                    "0xd6079c55087a67d5",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1411,6 +1481,7 @@
         },
         {
             "step": "scCall",
+            "id": "",
             "tx": {
                 "from": "address:oracle18",
                 "to": "sc:price-aggregator",
@@ -1419,7 +1490,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x426db614e3f1db01",
+                    "0x90f7bb0d816fb87d",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1431,6 +1502,7 @@
         },
         {
             "step": "scCall",
+            "id": "",
             "tx": {
                 "from": "address:oracle19",
                 "to": "sc:price-aggregator",
@@ -1439,7 +1511,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xa7964ea7d746a2de",
+                    "0xa0ccc6f5f8c73ff2",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1451,6 +1523,7 @@
         },
         {
             "step": "scCall",
+            "id": "",
             "tx": {
                 "from": "address:oracle20",
                 "to": "sc:price-aggregator",
@@ -1459,7 +1532,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x23c8408e16872669",
+                    "0x258d38a35ccfd93d",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1471,6 +1544,7 @@
         },
         {
             "step": "scCall",
+            "id": "",
             "tx": {
                 "from": "address:oracle21",
                 "to": "sc:price-aggregator",
@@ -1479,7 +1553,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xdcb762dbcd5970bc",
+                    "0x903f62b19408019d",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1491,6 +1565,7 @@
         },
         {
             "step": "scCall",
+            "id": "",
             "tx": {
                 "from": "address:oracle22",
                 "to": "sc:price-aggregator",
@@ -1499,7 +1574,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xf99680ec6f6c3cc0",
+                    "0xc319aab79b2f512e",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1511,6 +1586,7 @@
         },
         {
             "step": "scCall",
+            "id": "",
             "tx": {
                 "from": "address:oracle23",
                 "to": "sc:price-aggregator",
@@ -1519,7 +1595,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xd0e83298636e0010",
+                    "0x4b41176cd679e194",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1531,6 +1607,7 @@
         },
         {
             "step": "scCall",
+            "id": "",
             "tx": {
                 "from": "address:oracle24",
                 "to": "sc:price-aggregator",
@@ -1539,7 +1616,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x2859a982dbd969a6",
+                    "0xaf3c4ad7cdcac230",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1551,6 +1628,7 @@
         },
         {
             "step": "scCall",
+            "id": "",
             "tx": {
                 "from": "address:oracle25",
                 "to": "sc:price-aggregator",
@@ -1559,7 +1637,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x2114dddd7df53e50",
+                    "0x2a8c4a82dfb68f13",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1571,6 +1649,7 @@
         },
         {
             "step": "scCall",
+            "id": "",
             "tx": {
                 "from": "address:oracle26",
                 "to": "sc:price-aggregator",
@@ -1579,7 +1658,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x4b800fe697e62e53",
+                    "0x358e92c93a69a2f9",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1591,6 +1670,7 @@
         },
         {
             "step": "scCall",
+            "id": "",
             "tx": {
                 "from": "address:oracle27",
                 "to": "sc:price-aggregator",
@@ -1599,7 +1679,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x03f2afbf9d784e9f",
+                    "0xb4bd55d9eebad664",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1611,6 +1691,7 @@
         },
         {
             "step": "scCall",
+            "id": "",
             "tx": {
                 "from": "address:oracle28",
                 "to": "sc:price-aggregator",
@@ -1619,7 +1700,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x56934b4f2bf5659e",
+                    "0x9061fc2440f4db51",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1631,6 +1712,7 @@
         },
         {
             "step": "scCall",
+            "id": "",
             "tx": {
                 "from": "address:oracle29",
                 "to": "sc:price-aggregator",
@@ -1639,7 +1721,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x7e9d18115922d624",
+                    "0xc8fde2d627d1b95a",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1651,6 +1733,7 @@
         },
         {
             "step": "scCall",
+            "id": "",
             "tx": {
                 "from": "address:oracle30",
                 "to": "sc:price-aggregator",
@@ -1659,7 +1742,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x21bceff1135a433b",
+                    "0xacede2c42f9bc928",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1671,6 +1754,7 @@
         },
         {
             "step": "scCall",
+            "id": "",
             "tx": {
                 "from": "address:oracle31",
                 "to": "sc:price-aggregator",
@@ -1679,7 +1763,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x014ad037b6df3b54",
+                    "0xb0a4ecb8d46cfe86",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1691,6 +1775,7 @@
         },
         {
             "step": "scCall",
+            "id": "",
             "tx": {
                 "from": "address:oracle32",
                 "to": "sc:price-aggregator",
@@ -1699,7 +1784,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x897754a9bc7fe8fb",
+                    "0xa8d8ee43a5c4ade8",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1711,6 +1796,7 @@
         },
         {
             "step": "scCall",
+            "id": "",
             "tx": {
                 "from": "address:oracle33",
                 "to": "sc:price-aggregator",
@@ -1719,7 +1805,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x9cbab2c3f4582758",
+                    "0xe20bb0819b83cbb6",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1731,6 +1817,7 @@
         },
         {
             "step": "scCall",
+            "id": "",
             "tx": {
                 "from": "address:oracle34",
                 "to": "sc:price-aggregator",
@@ -1739,7 +1826,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x3b21d0b3809f72a2",
+                    "0xb5566ca4a8a6da5b",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1751,6 +1838,7 @@
         },
         {
             "step": "scCall",
+            "id": "",
             "tx": {
                 "from": "address:oracle35",
                 "to": "sc:price-aggregator",
@@ -1759,7 +1847,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x2a750e9ce9c38392",
+                    "0x30b4e318dbf9c0a1",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1771,6 +1859,7 @@
         },
         {
             "step": "scCall",
+            "id": "",
             "tx": {
                 "from": "address:oracle36",
                 "to": "sc:price-aggregator",
@@ -1779,7 +1868,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x441ec6f7ccef3419",
+                    "0x34cd5592ee7ab5f0",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1791,6 +1880,7 @@
         },
         {
             "step": "scCall",
+            "id": "",
             "tx": {
                 "from": "address:oracle37",
                 "to": "sc:price-aggregator",
@@ -1799,7 +1889,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x04355cff356a9270",
+                    "0x4908da8f754f9e29",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1811,6 +1901,7 @@
         },
         {
             "step": "scCall",
+            "id": "",
             "tx": {
                 "from": "address:oracle38",
                 "to": "sc:price-aggregator",
@@ -1819,7 +1910,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x9f8f08c2a0fd1712",
+                    "0x460da40079bef875",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1831,6 +1922,7 @@
         },
         {
             "step": "scCall",
+            "id": "",
             "tx": {
                 "from": "address:oracle39",
                 "to": "sc:price-aggregator",
@@ -1839,7 +1931,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x0237bdd960ee91a4",
+                    "0x6eb6dd52e24341b6",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1851,6 +1943,7 @@
         },
         {
             "step": "scCall",
+            "id": "",
             "tx": {
                 "from": "address:oracle40",
                 "to": "sc:price-aggregator",
@@ -1859,7 +1952,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xd78d767d7431f639",
+                    "0xa06bb000b0901e98",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1871,6 +1964,7 @@
         },
         {
             "step": "scCall",
+            "id": "",
             "tx": {
                 "from": "address:oracle41",
                 "to": "sc:price-aggregator",
@@ -1879,7 +1973,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x0a97da94934b5384",
+                    "0x4f83b3dd7f1dd80e",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1891,6 +1985,7 @@
         },
         {
             "step": "scCall",
+            "id": "",
             "tx": {
                 "from": "address:oracle42",
                 "to": "sc:price-aggregator",
@@ -1899,7 +1994,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x83fd9fa634cd092c",
+                    "0x169e4556e8cd5271",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1911,6 +2006,7 @@
         },
         {
             "step": "scCall",
+            "id": "",
             "tx": {
                 "from": "address:oracle43",
                 "to": "sc:price-aggregator",
@@ -1919,7 +2015,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xa603bdf728ab39ca",
+                    "0xa45b9cfe7527301b",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1931,6 +2027,7 @@
         },
         {
             "step": "scCall",
+            "id": "",
             "tx": {
                 "from": "address:oracle44",
                 "to": "sc:price-aggregator",
@@ -1939,7 +2036,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x1e855680884a968e",
+                    "0xe3a28965ea6a3ae4",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1951,6 +2048,7 @@
         },
         {
             "step": "scCall",
+            "id": "",
             "tx": {
                 "from": "address:oracle45",
                 "to": "sc:price-aggregator",
@@ -1959,7 +2057,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x59185a21db734c4a",
+                    "0x4efa7be66acf5ded",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1971,6 +2069,7 @@
         },
         {
             "step": "scCall",
+            "id": "",
             "tx": {
                 "from": "address:oracle46",
                 "to": "sc:price-aggregator",
@@ -1979,7 +2078,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x0fb5b1c819ef5113",
+                    "0x5f75311f8cd29ea9",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1991,6 +2090,7 @@
         },
         {
             "step": "scCall",
+            "id": "",
             "tx": {
                 "from": "address:oracle47",
                 "to": "sc:price-aggregator",
@@ -1999,7 +2099,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x1f0d54522394ace8",
+                    "0xfc7c1268abc1d8e3",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -2011,6 +2111,7 @@
         },
         {
             "step": "scCall",
+            "id": "",
             "tx": {
                 "from": "address:oracle48",
                 "to": "sc:price-aggregator",
@@ -2019,7 +2120,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x8efc62f2eff2c135",
+                    "0xd24cc52d844c6a40",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -2031,6 +2132,7 @@
         },
         {
             "step": "scCall",
+            "id": "",
             "tx": {
                 "from": "address:oracle49",
                 "to": "sc:price-aggregator",
@@ -2039,7 +2141,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x1bb36c03cf1e6971",
+                    "0x804fc08cd1c73c42",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -2051,6 +2153,7 @@
         },
         {
             "step": "scCall",
+            "id": "",
             "tx": {
                 "from": "address:oracle50",
                 "to": "sc:price-aggregator",
@@ -2059,7 +2162,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x2571ea17cf81f6f2",
+                    "0x093077783f01d496",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
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 eccc6e7367..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
@@ -37,6 +37,7 @@
             "accounts": {
                 "0x0000000000000000fb1397e8225ea85e0f0e6e8c7b126d0016ccbde0e667151e": {
                     "balance": "0",
+                    "esdt": {},
                     "storage": {
                         "str:totalValue": "0x01"
                     },
@@ -70,6 +71,7 @@
             "accounts": {
                 "0x0000000000000000fb1397e8225ea85e0f0e6e8c7b126d0016ccbde0e667151e": {
                     "balance": "0",
+                    "esdt": {},
                     "storage": {
                         "0x76616c756550657243616c6c657266687aadf862bd776c8fc18b8e9f8e20089714856ee233b3902a591d0d5f2925": "0x32",
                         "str:totalValue": "0x33"
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 a81d56b4f3..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
@@ -21,7 +21,8 @@
                                 {
                                     "nonce": "0",
                                     "balance": "1000",
-                                    "royalties": "0"
+                                    "royalties": "0",
+                                    "attributes": "0x"
                                 }
                             ]
                         }
@@ -44,7 +45,8 @@
                                     "nonce": "0",
                                     "balance": "1000",
                                     "royalties": "0",
-                                    "uri": []
+                                    "uri": [],
+                                    "attributes": "0x"
                                 }
                             ]
                         }

From 3679258f18f5a292fbcf4176a6245b18d9065a36 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 8 Mar 2024 23:45:41 +0200
Subject: [PATCH 0411/1254] unified syntax - world.tx()

---
 .../tests/adder_blackbox_with_values_test.rs  | 25 ++++-----
 framework/scenario/src/facade/world_tx.rs     |  2 +
 .../src/facade/world_tx/scenario_tx.rs        | 53 +++++++++++++++++--
 .../src/facade/world_tx/world_ref_env.rs      | 22 ++++++++
 4 files changed, 86 insertions(+), 16 deletions(-)
 create mode 100644 framework/scenario/src/facade/world_tx/world_ref_env.rs

diff --git a/contracts/examples/adder/tests/adder_blackbox_with_values_test.rs b/contracts/examples/adder/tests/adder_blackbox_with_values_test.rs
index 0ef6f023cb..8111cda69d 100644
--- a/contracts/examples/adder/tests/adder_blackbox_with_values_test.rs
+++ b/contracts/examples/adder/tests/adder_blackbox_with_values_test.rs
@@ -28,7 +28,7 @@ fn adder_blackbox_with_values() {
                 .put_account(owner_address, Account::new().nonce(1))
                 .new_address(owner_address, 1, "sc:adder"),
         )
-        .tx(|tx| {
+        .chain_tx(|tx| {
             tx.from(AddressExpr("owner"))
                 .typed_v2(temp_proxy_v2::TxProxy)
                 .init(5u32)
@@ -43,23 +43,24 @@ fn adder_blackbox_with_values() {
                 .call(adder_contract.sum())
                 .expect_value(SingleValue::from(BigUint::from(5u32))),
         )
-        .tx(|tx| {
+        .chain_tx(|tx| {
             tx.from(AddressExpr("owner"))
                 .to(ScExpr("adder"))
                 .typed_v1(temp_proxy::TxProxy, |p| p.add(2u32))
                 .with_result(WithRawTxResponse(|response| {
                     assert!(response.tx_error.is_success());
                 }))
-        })
-        .tx(|tx| {
-            tx.from(AddressExpr("owner"))
-                .to(ScExpr("adder"))
-                .typed_v2(temp_proxy_v2::TxProxy)
-                .add(1u32)
-                .with_result(WithRawTxResponse(|response| {
-                    assert!(response.tx_error.is_success());
-                }))
-        })
+        });
+
+    world
+        .tx()
+        .from(AddressExpr("owner"))
+        .to(ScExpr("adder"))
+        .typed_v2(temp_proxy_v2::TxProxy)
+        .add(1u32)
+        .run();
+
+    world
         .check_state_step(
             CheckStateStep::new()
                 .put_account(owner_address, CheckAccount::new())
diff --git a/framework/scenario/src/facade/world_tx.rs b/framework/scenario/src/facade/world_tx.rs
index 3cb83818cc..e46b86d940 100644
--- a/framework/scenario/src/facade/world_tx.rs
+++ b/framework/scenario/src/facade/world_tx.rs
@@ -6,6 +6,7 @@ mod scenario_rh_list;
 mod scenario_rh_list_item;
 mod scenario_tx;
 mod with_tx_raw_response;
+mod world_ref_env;
 
 pub use expr::*;
 pub use scenario_env::*;
@@ -13,3 +14,4 @@ pub use scenario_rh_list::*;
 pub use scenario_rh_list_item::*;
 pub use scenario_tx::*;
 pub use with_tx_raw_response::WithRawTxResponse;
+pub use world_ref_env::WorldRefEnv;
diff --git a/framework/scenario/src/facade/world_tx/scenario_tx.rs b/framework/scenario/src/facade/world_tx/scenario_tx.rs
index ae10294e72..4398aa3875 100644
--- a/framework/scenario/src/facade/world_tx/scenario_tx.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_tx.rs
@@ -11,31 +11,40 @@ use multiversx_sc::{
 use crate::{
     api::StaticApi,
     scenario_model::{AddressValue, BytesValue, ScCallStep, ScDeployStep},
-    ScenarioWorld,
+    ScenarioWorld, WorldRefEnv,
 };
 
 use super::{RHListScenario, ScenarioTxEnv, TxScenarioBase};
 
 impl ScenarioWorld {
-    fn tx_env(&self) -> ScenarioTxEnv {
+    fn new_env_data(&self) -> ScenarioTxEnv {
         ScenarioTxEnv {
             context_path: self.current_dir.clone(),
             ..Default::default()
         }
     }
 
+    fn wrap_world_ref<'w>(&'w mut self) -> WorldRefEnv<'w> {
+        let data = self.new_env_data();
+        WorldRefEnv { world: self, data }
+    }
+
+    pub fn tx<'w>(&'w mut self) -> Tx<WorldRefEnv<'w>, (), (), (), (), (), ()> {
+        Tx::new_with_env(self.wrap_world_ref())
+    }
+
     pub fn tx_return<STx, F>(&mut self, f: F) -> STx::Returns
     where
         STx: ScenarioTx,
         F: FnOnce(TxScenarioBase) -> STx,
     {
-        let env = self.tx_env();
+        let env = self.new_env_data();
         let tx_base = TxScenarioBase::new_with_env(env);
         let tx = f(tx_base);
         tx.run_as_scenario_step(self)
     }
 
-    pub fn tx<STx, F>(&mut self, f: F) -> &mut Self
+    pub fn chain_tx<STx, F>(&mut self, f: F) -> &mut Self
     where
         STx: ScenarioTx<Returns = ()>,
         F: FnOnce(TxScenarioBase) -> STx,
@@ -51,6 +60,12 @@ pub trait ScenarioTx {
     fn run_as_scenario_step(self, world: &mut ScenarioWorld) -> Self::Returns;
 }
 
+pub trait ScenarioTx2 {
+    type Returns;
+
+    fn run(self) -> Self::Returns;
+}
+
 fn address_annotated<Env, Addr>(env: &Env, from: Addr) -> AddressValue
 where
     Env: TxEnv,
@@ -105,6 +120,36 @@ where
     }
 }
 
+impl<'w, From, To, Payment, Gas, RH> ScenarioTx2
+    for Tx<WorldRefEnv<'w>, From, To, Payment, Gas, FunctionCall<StaticApi>, RH>
+where
+    From: TxFromSpecified<WorldRefEnv<'w>>,
+    To: TxToSpecified<WorldRefEnv<'w>>,
+    Payment: TxPayment<WorldRefEnv<'w>>,
+    Gas: TxGas<WorldRefEnv<'w>>,
+    RH: RHListScenario<WorldRefEnv<'w>>,
+    RH::ListReturns: NestedTupleFlatten,
+{
+    type Returns = <RH::ListReturns as NestedTupleFlatten>::Unpacked;
+
+    fn run(self) -> Self::Returns {
+        let mut env = self.env;
+        let mut step = ScCallStep::new()
+            .from(address_annotated(&env, self.from))
+            .to(address_annotated(&env, self.to))
+            .function(self.data.function_name.to_string().as_str());
+        for arg in self.data.arg_buffer.iter_buffers() {
+            step.tx.arguments.push(arg.to_vec().into());
+        }
+
+        env.world.sc_call(&mut step);
+        let response = step.response.expect("step did not return result");
+
+        let tuple_result = self.result_handler.item_scenario_result(&response);
+        tuple_result.flatten_unpack()
+    }
+}
+
 impl<From, Payment, Gas, CodeValue, RH> ScenarioTx
     for Tx<ScenarioTxEnv, From, (), Payment, Gas, DeployCall<ScenarioTxEnv, Code<CodeValue>>, RH>
 where
diff --git a/framework/scenario/src/facade/world_tx/world_ref_env.rs b/framework/scenario/src/facade/world_tx/world_ref_env.rs
new file mode 100644
index 0000000000..8cb2284dc6
--- /dev/null
+++ b/framework/scenario/src/facade/world_tx/world_ref_env.rs
@@ -0,0 +1,22 @@
+use std::path::PathBuf;
+
+use multiversx_sc::types::{AnnotatedValue, ManagedAddress, TxBaseWithEnv, TxEnv};
+
+use crate::{api::StaticApi, scenario_model::TxResponse, ScenarioTxEnv, ScenarioWorld};
+
+pub struct WorldRefEnv<'w> {
+    pub world: &'w mut ScenarioWorld,
+    pub data: ScenarioTxEnv,
+}
+
+impl<'w> TxEnv for WorldRefEnv<'w> {
+    type Api = StaticApi;
+
+    fn resolve_sender_address(&self) -> ManagedAddress<Self::Api> {
+        panic!("Explicit sender address expected")
+    }
+
+    fn default_gas(&self) -> u64 {
+       self.data.default_gas()
+    }
+}

From ea38219a036eaaf40c443691740c460b3d9ecb31 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Sun, 10 Mar 2024 22:08:10 +0200
Subject: [PATCH 0412/1254] unified syntax - scenario tx execution cleanup

---
 .../examples/adder/tests/adder_blackbox.rs    |  86 +++++++
 ...lues_test.rs => adder_blackbox_chained.rs} |  19 +-
 ...ox_test.rs => adder_blackbox_raw_steps.rs} |   0
 .../multisig/tests/multisig_blackbox_test.rs  |  19 +-
 .../src/facade/world_tx/expr/file_expr.rs     |   8 +-
 .../src/facade/world_tx/expr/mxsc_expr.rs     |  15 +-
 .../src/facade/world_tx/scenario_env.rs       |  16 +-
 .../facade/world_tx/scenario_rh_list_item.rs  |   2 +-
 .../src/facade/world_tx/scenario_tx.rs        | 231 ++++++++++++------
 .../facade/world_tx/with_tx_raw_response.rs   |   2 +-
 .../src/facade/world_tx/world_ref_env.rs      |  14 +-
 11 files changed, 292 insertions(+), 120 deletions(-)
 create mode 100644 contracts/examples/adder/tests/adder_blackbox.rs
 rename contracts/examples/adder/tests/{adder_blackbox_with_values_test.rs => adder_blackbox_chained.rs} (85%)
 rename contracts/examples/adder/tests/{adder_blackbox_test.rs => adder_blackbox_raw_steps.rs} (100%)

diff --git a/contracts/examples/adder/tests/adder_blackbox.rs b/contracts/examples/adder/tests/adder_blackbox.rs
new file mode 100644
index 0000000000..ad24fd6250
--- /dev/null
+++ b/contracts/examples/adder/tests/adder_blackbox.rs
@@ -0,0 +1,86 @@
+use adder::*;
+use multiversx_sc::{
+    storage::mappers::SingleValue,
+    types::{AddressExpr, ScExpr, WithResultNewAddress},
+};
+use multiversx_sc_scenario::{api::StaticApi, num_bigint::BigUint, scenario_model::*, *};
+
+const ADDER_PATH_EXPR: &str = "mxsc:output/adder.mxsc.json";
+
+const OWNER: AddressExpr = AddressExpr("owner");
+const SC_ADDER: ScExpr = ScExpr("adder");
+const CODE_EXPR: MxscExpr = MxscExpr("output/adder.mxsc.json");
+
+fn world() -> ScenarioWorld {
+    let mut blockchain = ScenarioWorld::new();
+    blockchain.set_current_dir_from_workspace("contracts/examples/adder");
+
+    blockchain.register_contract(ADDER_PATH_EXPR, adder::ContractBuilder);
+    blockchain
+}
+
+#[test]
+fn adder_blackbox_with_values() {
+    let mut world = world();
+    let owner_address = "address:owner";
+    let mut adder_contract = ContractInfo::<adder::Proxy<StaticApi>>::new("sc:adder");
+
+    world.start_trace();
+
+    world.set_state_step(
+        SetStateStep::new()
+            .put_account(owner_address, Account::new().nonce(1))
+            .new_address(owner_address, 1, "sc:adder"),
+    );
+
+    world
+        .tx()
+        .from(OWNER)
+        .typed_v2(temp_proxy_v2::TxProxy)
+        .init(5u32)
+        .code(CODE_EXPR)
+        .with_result(WithResultNewAddress::new(|new_address| {
+            assert_eq!(new_address.to_address(), adder_contract.to_address());
+        }))
+        .run();
+
+    world.sc_query(
+        ScQueryStep::new()
+            .to(&adder_contract)
+            .call(adder_contract.sum())
+            .expect_value(SingleValue::from(BigUint::from(5u32))),
+    );
+
+    // TODO: remove
+    world
+        .tx()
+        .from(OWNER)
+        .to(SC_ADDER)
+        .typed_v1(temp_proxy::TxProxy, |p| p.add(2u32))
+        .with_result(WithRawTxResponse(|response| {
+            assert!(response.tx_error.is_success());
+        }))
+        .run();
+
+    world
+        .tx()
+        .from(OWNER)
+        .to(SC_ADDER)
+        .typed_v2(temp_proxy_v2::TxProxy)
+        .add(1u32)
+        .with_result(WithRawTxResponse(|response| {
+            assert!(response.tx_error.is_success());
+        }))
+        .run();
+
+    world.check_state_step(
+        CheckStateStep::new()
+            .put_account(owner_address, CheckAccount::new())
+            .put_account(
+                &adder_contract,
+                CheckAccount::new().check_storage("str:sum", "8"),
+            ),
+    );
+
+    world.write_scenario_trace("trace1.scen.json");
+}
diff --git a/contracts/examples/adder/tests/adder_blackbox_with_values_test.rs b/contracts/examples/adder/tests/adder_blackbox_chained.rs
similarity index 85%
rename from contracts/examples/adder/tests/adder_blackbox_with_values_test.rs
rename to contracts/examples/adder/tests/adder_blackbox_chained.rs
index 8111cda69d..49795ab994 100644
--- a/contracts/examples/adder/tests/adder_blackbox_with_values_test.rs
+++ b/contracts/examples/adder/tests/adder_blackbox_chained.rs
@@ -16,7 +16,7 @@ fn world() -> ScenarioWorld {
 }
 
 #[test]
-fn adder_blackbox_with_values() {
+fn adder_blackbox_chained() {
     let mut world = world();
     let owner_address = "address:owner";
     let mut adder_contract = ContractInfo::<adder::Proxy<StaticApi>>::new("sc:adder");
@@ -46,21 +46,12 @@ fn adder_blackbox_with_values() {
         .chain_tx(|tx| {
             tx.from(AddressExpr("owner"))
                 .to(ScExpr("adder"))
-                .typed_v1(temp_proxy::TxProxy, |p| p.add(2u32))
+                .typed_v2(temp_proxy_v2::TxProxy)
+                .add(3u32)
                 .with_result(WithRawTxResponse(|response| {
                     assert!(response.tx_error.is_success());
                 }))
-        });
-
-    world
-        .tx()
-        .from(AddressExpr("owner"))
-        .to(ScExpr("adder"))
-        .typed_v2(temp_proxy_v2::TxProxy)
-        .add(1u32)
-        .run();
-
-    world
+        })
         .check_state_step(
             CheckStateStep::new()
                 .put_account(owner_address, CheckAccount::new())
@@ -69,5 +60,5 @@ fn adder_blackbox_with_values() {
                     CheckAccount::new().check_storage("str:sum", "8"),
                 ),
         )
-        .write_scenario_trace("trace1.scen.json");
+        .write_scenario_trace("trace2.scen.json");
 }
diff --git a/contracts/examples/adder/tests/adder_blackbox_test.rs b/contracts/examples/adder/tests/adder_blackbox_raw_steps.rs
similarity index 100%
rename from contracts/examples/adder/tests/adder_blackbox_test.rs
rename to contracts/examples/adder/tests/adder_blackbox_raw_steps.rs
diff --git a/contracts/examples/multisig/tests/multisig_blackbox_test.rs b/contracts/examples/multisig/tests/multisig_blackbox_test.rs
index 1b3229318d..eaec591e26 100644
--- a/contracts/examples/multisig/tests/multisig_blackbox_test.rs
+++ b/contracts/examples/multisig/tests/multisig_blackbox_test.rs
@@ -17,7 +17,7 @@ use multiversx_sc_scenario::{
         Account, AddressValue, CheckAccount, CheckStateStep, ScCallStep, ScDeployStep, ScQueryStep,
         SetStateStep, TxExpect,
     },
-    ContractInfo, ScenarioWorld,
+    ContractInfo, ScenarioTxRun, ScenarioWorld,
 };
 use num_bigint::BigUint;
 
@@ -124,14 +124,15 @@ impl MultisigTestState {
     }
 
     fn propose_add_board_member(&mut self, board_member_address: Address) -> usize {
-        self.world.tx_return(|tx| {
-            tx.from(AddressExpr("proposer"))
-                .call(
-                    self.multisig_contract
-                        .propose_add_board_member(board_member_address),
-                )
-                .returns(ReturnsExact)
-        })
+        self.world
+            .tx()
+            .from(AddressExpr("proposer"))
+            .call(
+                self.multisig_contract
+                    .propose_add_board_member(board_member_address),
+            )
+            .returns(ReturnsExact)
+            .run()
     }
 
     fn propose_add_proposer(&mut self, proposer_address: Address) -> usize {
diff --git a/framework/scenario/src/facade/world_tx/expr/file_expr.rs b/framework/scenario/src/facade/world_tx/expr/file_expr.rs
index 65965ecf8b..f42f6e84e0 100644
--- a/framework/scenario/src/facade/world_tx/expr/file_expr.rs
+++ b/framework/scenario/src/facade/world_tx/expr/file_expr.rs
@@ -9,21 +9,21 @@ use multiversx_sc::types::{
     TxToSpecified,
 };
 
-use crate::{api::StaticApi, ScenarioTxEnv};
+use crate::{api::StaticApi, ScenarioTxEnvData};
 
 const FILE_PREFIX: &str = "file:";
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
 pub struct FileExpr<'a>(pub &'a str);
 
-impl<'a> AnnotatedValue<ScenarioTxEnv, ManagedBuffer<StaticApi>> for FileExpr<'a> {
-    fn annotation(&self, _env: &ScenarioTxEnv) -> ManagedBuffer<StaticApi> {
+impl<'a> AnnotatedValue<ScenarioTxEnvData, ManagedBuffer<StaticApi>> for FileExpr<'a> {
+    fn annotation(&self, _env: &ScenarioTxEnvData) -> ManagedBuffer<StaticApi> {
         let mut result = ManagedBuffer::new_from_bytes(FILE_PREFIX.as_bytes());
         result.append_bytes(self.0.as_bytes());
         result
     }
 
-    fn into_value(self, env: &ScenarioTxEnv) -> ManagedBuffer<StaticApi> {
+    fn into_value(self, env: &ScenarioTxEnvData) -> ManagedBuffer<StaticApi> {
         let context = InterpreterContext::new().with_dir(env.context_path.clone());
         let value = interpret_string(&format!("{FILE_PREFIX}{}", self.0), &context);
         value.into()
diff --git a/framework/scenario/src/facade/world_tx/expr/mxsc_expr.rs b/framework/scenario/src/facade/world_tx/expr/mxsc_expr.rs
index 25f9f21f42..e3e123ffe8 100644
--- a/framework/scenario/src/facade/world_tx/expr/mxsc_expr.rs
+++ b/framework/scenario/src/facade/world_tx/expr/mxsc_expr.rs
@@ -9,27 +9,30 @@ use multiversx_sc::types::{
     TxTo, TxToSpecified,
 };
 
-use crate::{api::StaticApi, ScenarioTxEnv};
+use crate::{api::StaticApi, ScenarioTxEnv, ScenarioTxEnvData, WorldRefEnv};
 
 const MXSC_PREFIX: &str = "mxsc:";
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
 pub struct MxscExpr<'a>(pub &'a str);
 
-impl<'a> AnnotatedValue<ScenarioTxEnv, ManagedBuffer<StaticApi>> for MxscExpr<'a> {
-    fn annotation(&self, _env: &ScenarioTxEnv) -> ManagedBuffer<StaticApi> {
+impl<'a, Env> AnnotatedValue<Env, ManagedBuffer<Env::Api>> for MxscExpr<'a>
+where
+    Env: ScenarioTxEnv,
+{
+    fn annotation(&self, _env: &Env) -> ManagedBuffer<Env::Api> {
         let mut result = ManagedBuffer::new_from_bytes(MXSC_PREFIX.as_bytes());
         result.append_bytes(self.0.as_bytes());
         result
     }
 
-    fn into_value(self, env: &ScenarioTxEnv) -> ManagedBuffer<StaticApi> {
+    fn into_value(self, env: &Env) -> ManagedBuffer<Env::Api> {
         let context = InterpreterContext::new()
-            .with_dir(env.context_path.clone())
+            .with_dir(env.env_data().context_path.clone())
             .with_allowed_missing_files();
         let value = interpret_string(&format!("{MXSC_PREFIX}{}", self.0), &context);
         value.into()
     }
 }
 
-impl<'a> TxCodeValue<ScenarioTxEnv> for MxscExpr<'a> {}
+impl<'a, Env> TxCodeValue<Env> for MxscExpr<'a> where Env: ScenarioTxEnv {}
diff --git a/framework/scenario/src/facade/world_tx/scenario_env.rs b/framework/scenario/src/facade/world_tx/scenario_env.rs
index 9076cc5d48..36ab974b34 100644
--- a/framework/scenario/src/facade/world_tx/scenario_env.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_env.rs
@@ -4,15 +4,17 @@ use multiversx_sc::types::{AnnotatedValue, ManagedAddress, TxBaseWithEnv, TxEnv}
 
 use crate::{api::StaticApi, scenario_model::TxResponse};
 
-pub type TxScenarioBase = TxBaseWithEnv<ScenarioTxEnv>;
+/// Designates a tx environment suitable for running scenarios locally.
+pub trait ScenarioTxEnv: TxEnv {
+    fn env_data(&self) -> &ScenarioTxEnvData;
+}
 
 #[derive(Default, Debug, Clone)]
-pub struct ScenarioTxEnv {
+pub struct ScenarioTxEnvData {
     pub context_path: PathBuf,
-    pub response: Option<TxResponse>,
 }
 
-impl TxEnv for ScenarioTxEnv {
+impl TxEnv for ScenarioTxEnvData {
     type Api = StaticApi;
 
     fn resolve_sender_address(&self) -> ManagedAddress<Self::Api> {
@@ -24,3 +26,9 @@ impl TxEnv for ScenarioTxEnv {
         5_000_000
     }
 }
+
+impl ScenarioTxEnv for ScenarioTxEnvData {
+    fn env_data(&self) -> &ScenarioTxEnvData {
+        self
+    }
+}
diff --git a/framework/scenario/src/facade/world_tx/scenario_rh_list_item.rs b/framework/scenario/src/facade/world_tx/scenario_rh_list_item.rs
index a357a6dcd8..057d1e0c1c 100644
--- a/framework/scenario/src/facade/world_tx/scenario_rh_list_item.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_rh_list_item.rs
@@ -8,7 +8,7 @@ use crate::{
     scenario_model::{TxResponse, TypedResponse},
 };
 
-use super::ScenarioTxEnv;
+use super::ScenarioTxEnvData;
 
 pub trait RHListItemScenario<Env, Original>: RHListItem<Env, Original>
 where
diff --git a/framework/scenario/src/facade/world_tx/scenario_tx.rs b/framework/scenario/src/facade/world_tx/scenario_tx.rs
index 4398aa3875..c8b8cc4772 100644
--- a/framework/scenario/src/facade/world_tx/scenario_tx.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_tx.rs
@@ -3,22 +3,22 @@ use multiversx_sc::{
     tuple_util::NestedTupleFlatten,
     types::{
         AnnotatedValue, Code, DeployCall, FunctionCall, ManagedAddress, ManagedBuffer, RHListSync,
-        Tx, TxCodeSource, TxCodeSourceSpecified, TxCodeValue, TxEnv, TxFromSpecified, TxGas,
-        TxPayment, TxToSpecified,
+        Tx, TxBaseWithEnv, TxCodeSource, TxCodeSourceSpecified, TxCodeValue, TxEnv,
+        TxFromSpecified, TxGas, TxPayment, TxToSpecified,
     },
 };
 
 use crate::{
     api::StaticApi,
-    scenario_model::{AddressValue, BytesValue, ScCallStep, ScDeployStep},
+    scenario_model::{AddressValue, BytesValue, ScCallStep, ScDeployStep, TxResponse},
     ScenarioWorld, WorldRefEnv,
 };
 
-use super::{RHListScenario, ScenarioTxEnv, TxScenarioBase};
+use super::{RHListScenario, ScenarioTxEnvData};
 
 impl ScenarioWorld {
-    fn new_env_data(&self) -> ScenarioTxEnv {
-        ScenarioTxEnv {
+    fn new_env_data(&self) -> ScenarioTxEnvData {
+        ScenarioTxEnvData {
             context_path: self.current_dir.clone(),
             ..Default::default()
         }
@@ -29,38 +29,30 @@ impl ScenarioWorld {
         WorldRefEnv { world: self, data }
     }
 
-    pub fn tx<'w>(&'w mut self) -> Tx<WorldRefEnv<'w>, (), (), (), (), (), ()> {
+    pub fn tx<'w>(&'w mut self) -> TxBaseWithEnv<WorldRefEnv<'w>> {
         Tx::new_with_env(self.wrap_world_ref())
     }
 
-    pub fn tx_return<STx, F>(&mut self, f: F) -> STx::Returns
+    pub fn chain_tx<STx, F>(&mut self, f: F) -> &mut Self
     where
-        STx: ScenarioTx,
-        F: FnOnce(TxScenarioBase) -> STx,
+        STx: ScenarioTxRunOnWorld<Returns = ()>,
+        F: FnOnce(TxBaseWithEnv<ScenarioTxEnvData>) -> STx,
     {
         let env = self.new_env_data();
-        let tx_base = TxScenarioBase::new_with_env(env);
+        let tx_base = TxBaseWithEnv::new_with_env(env);
         let tx = f(tx_base);
-        tx.run_as_scenario_step(self)
-    }
-
-    pub fn chain_tx<STx, F>(&mut self, f: F) -> &mut Self
-    where
-        STx: ScenarioTx<Returns = ()>,
-        F: FnOnce(TxScenarioBase) -> STx,
-    {
-        self.tx_return(f);
+        tx.run_on_world(self);
         self
     }
 }
 
-pub trait ScenarioTx {
+pub trait ScenarioTxRunOnWorld {
     type Returns;
 
-    fn run_as_scenario_step(self, world: &mut ScenarioWorld) -> Self::Returns;
+    fn run_on_world(self, world: &mut ScenarioWorld) -> Self::Returns;
 }
 
-pub trait ScenarioTx2 {
+pub trait ScenarioTxRun {
     type Returns;
 
     fn run(self) -> Self::Returns;
@@ -90,37 +82,97 @@ where
     }
 }
 
-impl<From, To, Payment, Gas, RH> ScenarioTx
-    for Tx<ScenarioTxEnv, From, To, Payment, Gas, FunctionCall<StaticApi>, RH>
+fn tx_to_sc_call_step<Env, From, To, Payment, Gas>(
+    env: &Env,
+    from: From,
+    to: To,
+    _payment: Payment,
+    _gas: Gas,
+    data: FunctionCall<Env::Api>,
+) -> ScCallStep
+where
+    Env: TxEnv,
+    From: TxFromSpecified<Env>,
+    To: TxToSpecified<Env>,
+    Payment: TxPayment<Env>,
+    Gas: TxGas<Env>,
+{
+    let mut step = ScCallStep::new()
+        .from(address_annotated(env, from))
+        .to(address_annotated(env, to))
+        .function(data.function_name.to_string().as_str());
+    for arg in data.arg_buffer.iter_buffers() {
+        step.tx.arguments.push(arg.to_vec().into());
+    }
+
+    step
+}
+
+fn tx_to_sc_deploy_step<Env, From, Payment, Gas, CodeValue>(
+    env: &Env,
+    from: From,
+    _payment: Payment,
+    _gas: Gas,
+    data: DeployCall<Env, Code<CodeValue>>,
+) -> ScDeployStep
+where
+    Env: TxEnv,
+    From: TxFromSpecified<Env>,
+    Payment: TxPayment<Env>,
+    Gas: TxGas<Env>,
+    CodeValue: TxCodeValue<Env>,
+{
+    let mut step = ScDeployStep::new()
+        .from(address_annotated(env, from))
+        .code(code_annotated(env, data.code_source));
+    for arg in data.arg_buffer.iter_buffers() {
+        step.tx.arguments.push(arg.to_vec().into());
+    }
+
+    step
+}
+
+fn process_result<Env, RH>(
+    response: Option<TxResponse>,
+    result_handler: RH,
+) -> <RH::ListReturns as NestedTupleFlatten>::Unpacked
 where
-    From: TxFromSpecified<ScenarioTxEnv>,
-    To: TxToSpecified<ScenarioTxEnv>,
-    Payment: TxPayment<ScenarioTxEnv>,
-    Gas: TxGas<ScenarioTxEnv>,
-    RH: RHListScenario<ScenarioTxEnv>,
+    Env: TxEnv,
+    RH: RHListScenario<Env>,
     RH::ListReturns: NestedTupleFlatten,
 {
-    type Returns = <RH::ListReturns as NestedTupleFlatten>::Unpacked;
+    let response = response.expect("step did not return result");
+    let tuple_result = result_handler.item_scenario_result(&response);
+    tuple_result.flatten_unpack()
+}
 
-    fn run_as_scenario_step(self, world: &mut ScenarioWorld) -> Self::Returns {
-        let mut env = self.env;
-        let mut step = ScCallStep::new()
-            .from(address_annotated(&env, self.from))
-            .to(address_annotated(&env, self.to))
-            .function(self.data.function_name.to_string().as_str());
-        for arg in self.data.arg_buffer.iter_buffers() {
-            step.tx.arguments.push(arg.to_vec().into());
-        }
+impl<From, To, Payment, Gas, RH> ScenarioTxRunOnWorld
+    for Tx<ScenarioTxEnvData, From, To, Payment, Gas, FunctionCall<StaticApi>, RH>
+where
+    From: TxFromSpecified<ScenarioTxEnvData>,
+    To: TxToSpecified<ScenarioTxEnvData>,
+    Payment: TxPayment<ScenarioTxEnvData>,
+    Gas: TxGas<ScenarioTxEnvData>,
+    RH: RHListScenario<ScenarioTxEnvData>,
+    RH::ListReturns: NestedTupleFlatten,
+{
+    type Returns = <RH::ListReturns as NestedTupleFlatten>::Unpacked;
 
+    fn run_on_world(self, world: &mut ScenarioWorld) -> Self::Returns {
+        let mut step = tx_to_sc_call_step(
+            &self.env,
+            self.from,
+            self.to,
+            self.payment,
+            self.gas,
+            self.data,
+        );
         world.sc_call(&mut step);
-        let response = step.response.expect("step did not return result");
-
-        let tuple_result = self.result_handler.item_scenario_result(&response);
-        tuple_result.flatten_unpack()
+        process_result(step.response, self.result_handler)
     }
 }
 
-impl<'w, From, To, Payment, Gas, RH> ScenarioTx2
+impl<'w, From, To, Payment, Gas, RH> ScenarioTxRun
     for Tx<WorldRefEnv<'w>, From, To, Payment, Gas, FunctionCall<StaticApi>, RH>
 where
     From: TxFromSpecified<WorldRefEnv<'w>>,
@@ -133,48 +185,71 @@ where
     type Returns = <RH::ListReturns as NestedTupleFlatten>::Unpacked;
 
     fn run(self) -> Self::Returns {
-        let mut env = self.env;
-        let mut step = ScCallStep::new()
-            .from(address_annotated(&env, self.from))
-            .to(address_annotated(&env, self.to))
-            .function(self.data.function_name.to_string().as_str());
-        for arg in self.data.arg_buffer.iter_buffers() {
-            step.tx.arguments.push(arg.to_vec().into());
-        }
-
-        env.world.sc_call(&mut step);
-        let response = step.response.expect("step did not return result");
-
-        let tuple_result = self.result_handler.item_scenario_result(&response);
-        tuple_result.flatten_unpack()
+        let mut step = tx_to_sc_call_step(
+            &self.env,
+            self.from,
+            self.to,
+            self.payment,
+            self.gas,
+            self.data,
+        );
+        self.env.world.sc_call(&mut step);
+        process_result(step.response, self.result_handler)
     }
 }
 
-impl<From, Payment, Gas, CodeValue, RH> ScenarioTx
-    for Tx<ScenarioTxEnv, From, (), Payment, Gas, DeployCall<ScenarioTxEnv, Code<CodeValue>>, RH>
+impl<From, Payment, Gas, CodeValue, RH> ScenarioTxRunOnWorld
+    for Tx<
+        ScenarioTxEnvData,
+        From,
+        (),
+        Payment,
+        Gas,
+        DeployCall<ScenarioTxEnvData, Code<CodeValue>>,
+        RH,
+    >
 where
-    From: TxFromSpecified<ScenarioTxEnv>,
-    Payment: TxPayment<ScenarioTxEnv>,
-    Gas: TxGas<ScenarioTxEnv>,
-    CodeValue: TxCodeValue<ScenarioTxEnv>,
-    RH: RHListScenario<ScenarioTxEnv>,
+    From: TxFromSpecified<ScenarioTxEnvData>,
+    Payment: TxPayment<ScenarioTxEnvData>,
+    Gas: TxGas<ScenarioTxEnvData>,
+    CodeValue: TxCodeValue<ScenarioTxEnvData>,
+    RH: RHListScenario<ScenarioTxEnvData>,
     RH::ListReturns: NestedTupleFlatten,
 {
     type Returns = <RH::ListReturns as NestedTupleFlatten>::Unpacked;
 
-    fn run_as_scenario_step(self, world: &mut ScenarioWorld) -> Self::Returns {
-        let mut env = self.env;
-        let mut step = ScDeployStep::new()
-            .from(address_annotated(&env, self.from))
-            .code(code_annotated(&env, self.data.code_source));
-        for arg in self.data.arg_buffer.iter_buffers() {
-            step.tx.arguments.push(arg.to_vec().into());
-        }
-
+    fn run_on_world(self, world: &mut ScenarioWorld) -> Self::Returns {
+        let mut step =
+            tx_to_sc_deploy_step(&self.env, self.from, self.payment, self.gas, self.data);
         world.sc_deploy(&mut step);
-        let response = step.response.expect("step did not return result");
+        process_result(step.response, self.result_handler)
+    }
+}
 
-        let tuple_result = self.result_handler.item_scenario_result(&response);
-        tuple_result.flatten_unpack()
+impl<'w, From, Payment, Gas, CodeValue, RH> ScenarioTxRun
+    for Tx<
+        WorldRefEnv<'w>,
+        From,
+        (),
+        Payment,
+        Gas,
+        DeployCall<WorldRefEnv<'w>, Code<CodeValue>>,
+        RH,
+    >
+where
+    From: TxFromSpecified<WorldRefEnv<'w>>,
+    Payment: TxPayment<WorldRefEnv<'w>>,
+    Gas: TxGas<WorldRefEnv<'w>>,
+    CodeValue: TxCodeValue<WorldRefEnv<'w>>,
+    RH: RHListScenario<WorldRefEnv<'w>>,
+    RH::ListReturns: NestedTupleFlatten,
+{
+    type Returns = <RH::ListReturns as NestedTupleFlatten>::Unpacked;
+
+    fn run(self) -> Self::Returns {
+        let mut step =
+            tx_to_sc_deploy_step(&self.env, self.from, self.payment, self.gas, self.data);
+        self.env.world.sc_deploy(&mut step);
+        process_result(step.response, self.result_handler)
     }
 }
diff --git a/framework/scenario/src/facade/world_tx/with_tx_raw_response.rs b/framework/scenario/src/facade/world_tx/with_tx_raw_response.rs
index 053c962555..51f603a47b 100644
--- a/framework/scenario/src/facade/world_tx/with_tx_raw_response.rs
+++ b/framework/scenario/src/facade/world_tx/with_tx_raw_response.rs
@@ -7,7 +7,7 @@ use multiversx_sc::{
 
 use crate::scenario_model::TxResponse;
 
-use super::{RHListItemScenario, ScenarioTxEnv};
+use super::{RHListItemScenario, ScenarioTxEnvData};
 
 /// Wraps a closure that handles a `TxResponse` object.
 pub struct WithRawTxResponse<F>(pub F)
diff --git a/framework/scenario/src/facade/world_tx/world_ref_env.rs b/framework/scenario/src/facade/world_tx/world_ref_env.rs
index 8cb2284dc6..92abd8c2ff 100644
--- a/framework/scenario/src/facade/world_tx/world_ref_env.rs
+++ b/framework/scenario/src/facade/world_tx/world_ref_env.rs
@@ -2,11 +2,13 @@ use std::path::PathBuf;
 
 use multiversx_sc::types::{AnnotatedValue, ManagedAddress, TxBaseWithEnv, TxEnv};
 
-use crate::{api::StaticApi, scenario_model::TxResponse, ScenarioTxEnv, ScenarioWorld};
+use crate::{
+    api::StaticApi, scenario_model::TxResponse, ScenarioTxEnv, ScenarioTxEnvData, ScenarioWorld,
+};
 
 pub struct WorldRefEnv<'w> {
     pub world: &'w mut ScenarioWorld,
-    pub data: ScenarioTxEnv,
+    pub data: ScenarioTxEnvData,
 }
 
 impl<'w> TxEnv for WorldRefEnv<'w> {
@@ -17,6 +19,12 @@ impl<'w> TxEnv for WorldRefEnv<'w> {
     }
 
     fn default_gas(&self) -> u64 {
-       self.data.default_gas()
+        self.data.default_gas()
+    }
+}
+
+impl<'w> ScenarioTxEnv for WorldRefEnv<'w> {
+    fn env_data(&self) -> &ScenarioTxEnvData {
+        &self.data
     }
 }

From ecbebe1cfeeada945aec45c754bdb253d1bddf9a Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Mon, 11 Mar 2024 09:56:53 +0200
Subject: [PATCH 0413/1254] unified syntax - scenario execution refactoring

---
 framework/scenario/src/facade/world_tx.rs     |   9 +-
 .../src/facade/world_tx/expr/mxsc_expr.rs     |   2 +-
 .../src/facade/world_tx/scenario_env.rs       |  20 +-
 .../{scenario_tx.rs => scenario_env_exec.rs}  | 194 ++++++------------
 ...world_ref_env.rs => scenario_env_query.rs} |   6 +-
 .../src/facade/world_tx/scenario_env_util.rs  | 103 ++++++++++
 .../world_tx/scenario_world_steps_tx.rs       |  12 --
 7 files changed, 191 insertions(+), 155 deletions(-)
 rename framework/scenario/src/facade/world_tx/{scenario_tx.rs => scenario_env_exec.rs} (54%)
 rename framework/scenario/src/facade/world_tx/{world_ref_env.rs => scenario_env_query.rs} (82%)
 create mode 100644 framework/scenario/src/facade/world_tx/scenario_env_util.rs
 delete mode 100644 framework/scenario/src/facade/world_tx/scenario_world_steps_tx.rs

diff --git a/framework/scenario/src/facade/world_tx.rs b/framework/scenario/src/facade/world_tx.rs
index e46b86d940..287c911253 100644
--- a/framework/scenario/src/facade/world_tx.rs
+++ b/framework/scenario/src/facade/world_tx.rs
@@ -2,16 +2,17 @@
 
 mod expr;
 mod scenario_env;
+mod scenario_env_exec;
+mod scenario_env_query;
+mod scenario_env_util;
 mod scenario_rh_list;
 mod scenario_rh_list_item;
-mod scenario_tx;
 mod with_tx_raw_response;
-mod world_ref_env;
 
 pub use expr::*;
 pub use scenario_env::*;
+pub use scenario_env_exec::ScenarioEnvExec;
+pub use scenario_env_query::ScenarioEnvQuery;
 pub use scenario_rh_list::*;
 pub use scenario_rh_list_item::*;
-pub use scenario_tx::*;
 pub use with_tx_raw_response::WithRawTxResponse;
-pub use world_ref_env::WorldRefEnv;
diff --git a/framework/scenario/src/facade/world_tx/expr/mxsc_expr.rs b/framework/scenario/src/facade/world_tx/expr/mxsc_expr.rs
index e3e123ffe8..6f95cf2b7a 100644
--- a/framework/scenario/src/facade/world_tx/expr/mxsc_expr.rs
+++ b/framework/scenario/src/facade/world_tx/expr/mxsc_expr.rs
@@ -9,7 +9,7 @@ use multiversx_sc::types::{
     TxTo, TxToSpecified,
 };
 
-use crate::{api::StaticApi, ScenarioTxEnv, ScenarioTxEnvData, WorldRefEnv};
+use crate::{api::StaticApi, ScenarioEnvExec, ScenarioTxEnv, ScenarioTxEnvData};
 
 const MXSC_PREFIX: &str = "mxsc:";
 
diff --git a/framework/scenario/src/facade/world_tx/scenario_env.rs b/framework/scenario/src/facade/world_tx/scenario_env.rs
index 36ab974b34..9c1833659b 100644
--- a/framework/scenario/src/facade/world_tx/scenario_env.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_env.rs
@@ -2,13 +2,14 @@ use std::path::PathBuf;
 
 use multiversx_sc::types::{AnnotatedValue, ManagedAddress, TxBaseWithEnv, TxEnv};
 
-use crate::{api::StaticApi, scenario_model::TxResponse};
+use crate::{api::StaticApi, scenario_model::TxResponse, ScenarioWorld};
 
 /// Designates a tx environment suitable for running scenarios locally.
 pub trait ScenarioTxEnv: TxEnv {
     fn env_data(&self) -> &ScenarioTxEnvData;
 }
 
+/// The actual data required to run a scenario locally. This is the minimal environment needed to run txs.
 #[derive(Default, Debug, Clone)]
 pub struct ScenarioTxEnvData {
     pub context_path: PathBuf,
@@ -32,3 +33,20 @@ impl ScenarioTxEnv for ScenarioTxEnvData {
         self
     }
 }
+
+/// Provides a `run` method for transactions and steps.
+pub trait ScenarioTxRun {
+    type Returns;
+
+    fn run(self) -> Self::Returns;
+}
+
+/// Provides a method to run scenario steps and txs, which also takes a `ScenarioWorld` argument.
+///
+/// It is used for chaining methods that can't include the reference to the ScenarioWorld in the environment
+/// for reasons imposed by lifetimes/the borrow checker.
+pub trait ScenarioTxRunOnWorld {
+    type Returns;
+
+    fn run_on_world(self, world: &mut ScenarioWorld) -> Self::Returns;
+}
diff --git a/framework/scenario/src/facade/world_tx/scenario_tx.rs b/framework/scenario/src/facade/world_tx/scenario_env_exec.rs
similarity index 54%
rename from framework/scenario/src/facade/world_tx/scenario_tx.rs
rename to framework/scenario/src/facade/world_tx/scenario_env_exec.rs
index c8b8cc4772..e0cb011529 100644
--- a/framework/scenario/src/facade/world_tx/scenario_tx.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_env_exec.rs
@@ -1,3 +1,5 @@
+use std::path::PathBuf;
+
 use multiversx_chain_scenario_format::serde_raw::ValueSubTree;
 use multiversx_sc::{
     tuple_util::NestedTupleFlatten,
@@ -11,139 +13,33 @@ use multiversx_sc::{
 use crate::{
     api::StaticApi,
     scenario_model::{AddressValue, BytesValue, ScCallStep, ScDeployStep, TxResponse},
-    ScenarioWorld, WorldRefEnv,
+    ScenarioTxEnv, ScenarioTxRun, ScenarioTxRunOnWorld, ScenarioWorld,
 };
 
-use super::{RHListScenario, ScenarioTxEnvData};
-
-impl ScenarioWorld {
-    fn new_env_data(&self) -> ScenarioTxEnvData {
-        ScenarioTxEnvData {
-            context_path: self.current_dir.clone(),
-            ..Default::default()
-        }
-    }
-
-    fn wrap_world_ref<'w>(&'w mut self) -> WorldRefEnv<'w> {
-        let data = self.new_env_data();
-        WorldRefEnv { world: self, data }
-    }
-
-    pub fn tx<'w>(&'w mut self) -> TxBaseWithEnv<WorldRefEnv<'w>> {
-        Tx::new_with_env(self.wrap_world_ref())
-    }
+use super::{scenario_env_util::*, RHListScenario, ScenarioTxEnvData};
 
-    pub fn chain_tx<STx, F>(&mut self, f: F) -> &mut Self
-    where
-        STx: ScenarioTxRunOnWorld<Returns = ()>,
-        F: FnOnce(TxBaseWithEnv<ScenarioTxEnvData>) -> STx,
-    {
-        let env = self.new_env_data();
-        let tx_base = TxBaseWithEnv::new_with_env(env);
-        let tx = f(tx_base);
-        tx.run_on_world(self);
-        self
-    }
+/// Environment for executing transactions.
+pub struct ScenarioEnvExec<'w> {
+    pub world: &'w mut ScenarioWorld,
+    pub data: ScenarioTxEnvData,
 }
 
-pub trait ScenarioTxRunOnWorld {
-    type Returns;
-
-    fn run_on_world(self, world: &mut ScenarioWorld) -> Self::Returns;
-}
+impl<'w> TxEnv for ScenarioEnvExec<'w> {
+    type Api = StaticApi;
 
-pub trait ScenarioTxRun {
-    type Returns;
-
-    fn run(self) -> Self::Returns;
-}
-
-fn address_annotated<Env, Addr>(env: &Env, from: Addr) -> AddressValue
-where
-    Env: TxEnv,
-    Addr: AnnotatedValue<Env, ManagedAddress<Env::Api>>,
-{
-    let annotation = from.annotation(env).to_string();
-    AddressValue {
-        value: from.into_value(env).to_address(),
-        original: ValueSubTree::Str(annotation),
+    fn resolve_sender_address(&self) -> ManagedAddress<Self::Api> {
+        panic!("Explicit sender address expected")
     }
-}
 
-fn code_annotated<Env, CodeValue>(env: &Env, code: Code<CodeValue>) -> BytesValue
-where
-    Env: TxEnv,
-    CodeValue: TxCodeValue<Env>,
-{
-    let annotation = code.0.annotation(env).to_string();
-    BytesValue {
-        value: code.0.into_value(env).to_vec(),
-        original: ValueSubTree::Str(annotation),
+    fn default_gas(&self) -> u64 {
+        self.data.default_gas()
     }
 }
 
-fn tx_to_sc_call_step<Env, From, To, Payment, Gas>(
-    env: &Env,
-    from: From,
-    to: To,
-    _payment: Payment,
-    _gas: Gas,
-    data: FunctionCall<Env::Api>,
-) -> ScCallStep
-where
-    Env: TxEnv,
-    From: TxFromSpecified<Env>,
-    To: TxToSpecified<Env>,
-    Payment: TxPayment<Env>,
-    Gas: TxGas<Env>,
-{
-    let mut step = ScCallStep::new()
-        .from(address_annotated(env, from))
-        .to(address_annotated(env, to))
-        .function(data.function_name.to_string().as_str());
-    for arg in data.arg_buffer.iter_buffers() {
-        step.tx.arguments.push(arg.to_vec().into());
+impl<'w> ScenarioTxEnv for ScenarioEnvExec<'w> {
+    fn env_data(&self) -> &ScenarioTxEnvData {
+        &self.data
     }
-
-    step
-}
-
-fn tx_to_sc_deploy_step<Env, From, Payment, Gas, CodeValue>(
-    env: &Env,
-    from: From,
-    _payment: Payment,
-    _gas: Gas,
-    data: DeployCall<Env, Code<CodeValue>>,
-) -> ScDeployStep
-where
-    Env: TxEnv,
-    From: TxFromSpecified<Env>,
-    Payment: TxPayment<Env>,
-    Gas: TxGas<Env>,
-    CodeValue: TxCodeValue<Env>,
-{
-    let mut step = ScDeployStep::new()
-        .from(address_annotated(env, from))
-        .code(code_annotated(env, data.code_source));
-    for arg in data.arg_buffer.iter_buffers() {
-        step.tx.arguments.push(arg.to_vec().into());
-    }
-
-    step
-}
-
-fn process_result<Env, RH>(
-    response: Option<TxResponse>,
-    result_handler: RH,
-) -> <RH::ListReturns as NestedTupleFlatten>::Unpacked
-where
-    Env: TxEnv,
-    RH: RHListScenario<Env>,
-    RH::ListReturns: NestedTupleFlatten,
-{
-    let response = response.expect("step did not return result");
-    let tuple_result = result_handler.item_scenario_result(&response);
-    tuple_result.flatten_unpack()
 }
 
 impl<From, To, Payment, Gas, RH> ScenarioTxRunOnWorld
@@ -173,13 +69,13 @@ where
 }
 
 impl<'w, From, To, Payment, Gas, RH> ScenarioTxRun
-    for Tx<WorldRefEnv<'w>, From, To, Payment, Gas, FunctionCall<StaticApi>, RH>
+    for Tx<ScenarioEnvExec<'w>, From, To, Payment, Gas, FunctionCall<StaticApi>, RH>
 where
-    From: TxFromSpecified<WorldRefEnv<'w>>,
-    To: TxToSpecified<WorldRefEnv<'w>>,
-    Payment: TxPayment<WorldRefEnv<'w>>,
-    Gas: TxGas<WorldRefEnv<'w>>,
-    RH: RHListScenario<WorldRefEnv<'w>>,
+    From: TxFromSpecified<ScenarioEnvExec<'w>>,
+    To: TxToSpecified<ScenarioEnvExec<'w>>,
+    Payment: TxPayment<ScenarioEnvExec<'w>>,
+    Gas: TxGas<ScenarioEnvExec<'w>>,
+    RH: RHListScenario<ScenarioEnvExec<'w>>,
     RH::ListReturns: NestedTupleFlatten,
 {
     type Returns = <RH::ListReturns as NestedTupleFlatten>::Unpacked;
@@ -228,20 +124,20 @@ where
 
 impl<'w, From, Payment, Gas, CodeValue, RH> ScenarioTxRun
     for Tx<
-        WorldRefEnv<'w>,
+        ScenarioEnvExec<'w>,
         From,
         (),
         Payment,
         Gas,
-        DeployCall<WorldRefEnv<'w>, Code<CodeValue>>,
+        DeployCall<ScenarioEnvExec<'w>, Code<CodeValue>>,
         RH,
     >
 where
-    From: TxFromSpecified<WorldRefEnv<'w>>,
-    Payment: TxPayment<WorldRefEnv<'w>>,
-    Gas: TxGas<WorldRefEnv<'w>>,
-    CodeValue: TxCodeValue<WorldRefEnv<'w>>,
-    RH: RHListScenario<WorldRefEnv<'w>>,
+    From: TxFromSpecified<ScenarioEnvExec<'w>>,
+    Payment: TxPayment<ScenarioEnvExec<'w>>,
+    Gas: TxGas<ScenarioEnvExec<'w>>,
+    CodeValue: TxCodeValue<ScenarioEnvExec<'w>>,
+    RH: RHListScenario<ScenarioEnvExec<'w>>,
     RH::ListReturns: NestedTupleFlatten,
 {
     type Returns = <RH::ListReturns as NestedTupleFlatten>::Unpacked;
@@ -253,3 +149,33 @@ where
         process_result(step.response, self.result_handler)
     }
 }
+
+impl ScenarioWorld {
+    fn new_env_data(&self) -> ScenarioTxEnvData {
+        ScenarioTxEnvData {
+            context_path: self.current_dir.clone(),
+            ..Default::default()
+        }
+    }
+
+    fn wrap_world_ref<'w>(&'w mut self) -> ScenarioEnvExec<'w> {
+        let data = self.new_env_data();
+        ScenarioEnvExec { world: self, data }
+    }
+
+    pub fn tx<'w>(&'w mut self) -> TxBaseWithEnv<ScenarioEnvExec<'w>> {
+        Tx::new_with_env(self.wrap_world_ref())
+    }
+
+    pub fn chain_tx<STx, F>(&mut self, f: F) -> &mut Self
+    where
+        STx: ScenarioTxRunOnWorld<Returns = ()>,
+        F: FnOnce(TxBaseWithEnv<ScenarioTxEnvData>) -> STx,
+    {
+        let env = self.new_env_data();
+        let tx_base = TxBaseWithEnv::new_with_env(env);
+        let tx = f(tx_base);
+        tx.run_on_world(self);
+        self
+    }
+}
diff --git a/framework/scenario/src/facade/world_tx/world_ref_env.rs b/framework/scenario/src/facade/world_tx/scenario_env_query.rs
similarity index 82%
rename from framework/scenario/src/facade/world_tx/world_ref_env.rs
rename to framework/scenario/src/facade/world_tx/scenario_env_query.rs
index 92abd8c2ff..fbee3b921d 100644
--- a/framework/scenario/src/facade/world_tx/world_ref_env.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_env_query.rs
@@ -6,12 +6,12 @@ use crate::{
     api::StaticApi, scenario_model::TxResponse, ScenarioTxEnv, ScenarioTxEnvData, ScenarioWorld,
 };
 
-pub struct WorldRefEnv<'w> {
+pub struct ScenarioEnvQuery<'w> {
     pub world: &'w mut ScenarioWorld,
     pub data: ScenarioTxEnvData,
 }
 
-impl<'w> TxEnv for WorldRefEnv<'w> {
+impl<'w> TxEnv for ScenarioEnvQuery<'w> {
     type Api = StaticApi;
 
     fn resolve_sender_address(&self) -> ManagedAddress<Self::Api> {
@@ -23,7 +23,7 @@ impl<'w> TxEnv for WorldRefEnv<'w> {
     }
 }
 
-impl<'w> ScenarioTxEnv for WorldRefEnv<'w> {
+impl<'w> ScenarioTxEnv for ScenarioEnvQuery<'w> {
     fn env_data(&self) -> &ScenarioTxEnvData {
         &self.data
     }
diff --git a/framework/scenario/src/facade/world_tx/scenario_env_util.rs b/framework/scenario/src/facade/world_tx/scenario_env_util.rs
new file mode 100644
index 0000000000..84b808fbc3
--- /dev/null
+++ b/framework/scenario/src/facade/world_tx/scenario_env_util.rs
@@ -0,0 +1,103 @@
+use multiversx_chain_scenario_format::serde_raw::ValueSubTree;
+use multiversx_sc::{
+    tuple_util::NestedTupleFlatten,
+    types::{
+        AnnotatedValue, Code, DeployCall, FunctionCall, ManagedAddress, ManagedBuffer, RHListSync,
+        Tx, TxBaseWithEnv, TxCodeSource, TxCodeSourceSpecified, TxCodeValue, TxEnv,
+        TxFromSpecified, TxGas, TxPayment, TxToSpecified,
+    },
+};
+
+use crate::{
+    api::StaticApi,
+    scenario_model::{AddressValue, BytesValue, ScCallStep, ScDeployStep, TxResponse},
+    RHListScenario, ScenarioEnvExec, ScenarioWorld,
+};
+
+pub(super) fn address_annotated<Env, Addr>(env: &Env, from: Addr) -> AddressValue
+where
+    Env: TxEnv,
+    Addr: AnnotatedValue<Env, ManagedAddress<Env::Api>>,
+{
+    let annotation = from.annotation(env).to_string();
+    AddressValue {
+        value: from.into_value(env).to_address(),
+        original: ValueSubTree::Str(annotation),
+    }
+}
+
+pub(super) fn code_annotated<Env, CodeValue>(env: &Env, code: Code<CodeValue>) -> BytesValue
+where
+    Env: TxEnv,
+    CodeValue: TxCodeValue<Env>,
+{
+    let annotation = code.0.annotation(env).to_string();
+    BytesValue {
+        value: code.0.into_value(env).to_vec(),
+        original: ValueSubTree::Str(annotation),
+    }
+}
+
+pub(super) fn tx_to_sc_call_step<Env, From, To, Payment, Gas>(
+    env: &Env,
+    from: From,
+    to: To,
+    _payment: Payment,
+    _gas: Gas,
+    data: FunctionCall<Env::Api>,
+) -> ScCallStep
+where
+    Env: TxEnv,
+    From: TxFromSpecified<Env>,
+    To: TxToSpecified<Env>,
+    Payment: TxPayment<Env>,
+    Gas: TxGas<Env>,
+{
+    let mut step = ScCallStep::new()
+        .from(address_annotated(env, from))
+        .to(address_annotated(env, to))
+        .function(data.function_name.to_string().as_str());
+    for arg in data.arg_buffer.iter_buffers() {
+        step.tx.arguments.push(arg.to_vec().into());
+    }
+
+    step
+}
+
+pub(super) fn tx_to_sc_deploy_step<Env, From, Payment, Gas, CodeValue>(
+    env: &Env,
+    from: From,
+    _payment: Payment,
+    _gas: Gas,
+    data: DeployCall<Env, Code<CodeValue>>,
+) -> ScDeployStep
+where
+    Env: TxEnv,
+    From: TxFromSpecified<Env>,
+    Payment: TxPayment<Env>,
+    Gas: TxGas<Env>,
+    CodeValue: TxCodeValue<Env>,
+{
+    let mut step = ScDeployStep::new()
+        .from(address_annotated(env, from))
+        .code(code_annotated(env, data.code_source));
+    for arg in data.arg_buffer.iter_buffers() {
+        step.tx.arguments.push(arg.to_vec().into());
+    }
+
+    step
+}
+
+pub(super) fn process_result<Env, RH>(
+    response: Option<TxResponse>,
+    result_handler: RH,
+) -> <RH::ListReturns as NestedTupleFlatten>::Unpacked
+where
+    Env: TxEnv,
+    RH: RHListScenario<Env>,
+    RH::ListReturns: NestedTupleFlatten,
+{
+    let response = response.expect("step did not return result");
+    let tuple_result = result_handler.item_scenario_result(&response);
+    tuple_result.flatten_unpack()
+}
diff --git a/framework/scenario/src/facade/world_tx/scenario_world_steps_tx.rs b/framework/scenario/src/facade/world_tx/scenario_world_steps_tx.rs
deleted file mode 100644
index 566caf319e..0000000000
--- a/framework/scenario/src/facade/world_tx/scenario_world_steps_tx.rs
+++ /dev/null
@@ -1,12 +0,0 @@
-use std::path::PathBuf;
-
-use multiversx_sc::types::{
-    AnnotatedValue, FunctionCall, ManagedAddress, Tx, TxBaseWithEnv, TxEnv, TxFromSpecified, TxGas,
-    TxPayment, TxToSpecified,
-};
-
-use crate::{
-    api::StaticApi,
-    facade::ScenarioWorld,
-    scenario_model::{ScCallStep, TxResponse},
-};

From 540b72aab295152e8bd666560954c12b5420b3af Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Mon, 11 Mar 2024 10:09:06 +0100
Subject: [PATCH 0414/1254] managed decimal macros to replace unstable const
 generic arithmetic

---
 .../types/managed/wrapped/managed_decimal.rs  |   36 +-
 .../managed/wrapped/managed_decimal_macros.rs | 4246 +++++++++++++++++
 .../base/src/types/managed/wrapped/mod.rs     |    1 +
 3 files changed, 4267 insertions(+), 16 deletions(-)
 create mode 100644 framework/base/src/types/managed/wrapped/managed_decimal_macros.rs

diff --git a/framework/base/src/types/managed/wrapped/managed_decimal.rs b/framework/base/src/types/managed/wrapped/managed_decimal.rs
index 7810a43500..39a8263396 100644
--- a/framework/base/src/types/managed/wrapped/managed_decimal.rs
+++ b/framework/base/src/types/managed/wrapped/managed_decimal.rs
@@ -307,31 +307,35 @@ impl<M: ManagedTypeApi, const DECIMALS: NumDecimals> Sub<ManagedDecimal<M, Const
     }
 }
 
-#[allow(clippy::suspicious_arithmetic_impl)]
-impl<M: ManagedTypeApi, const DECIMALS: NumDecimals, const OTHER_DECIMALS: NumDecimals>
-    Mul<ManagedDecimal<M, ConstDecimals<OTHER_DECIMALS>>>
-    for ManagedDecimal<M, ConstDecimals<DECIMALS>>
+impl<M: ManagedTypeApi, D1: Decimals, D2: Decimals> Mul<ManagedDecimal<M, D2>>
+    for ManagedDecimal<M, D1>
 where
-    [(); DECIMALS + OTHER_DECIMALS]:,
+    D1: Add<D2>,
+    <D1 as Add<D2>>::Output: Decimals,
 {
-    type Output = ManagedDecimal<M, ConstDecimals<{ DECIMALS + OTHER_DECIMALS }>>;
+    type Output = ManagedDecimal<M, <D1 as Add<D2>>::Output>;
 
-    fn mul(self, other: ManagedDecimal<M, ConstDecimals<OTHER_DECIMALS>>) -> Self::Output {
-        ManagedDecimal::const_decimals_from_raw(self.data * other.data)
+    fn mul(self, other: ManagedDecimal<M, D2>) -> Self::Output {
+        ManagedDecimal {
+            data: self.data * other.data,
+            decimals: self.decimals + other.decimals,
+        }
     }
 }
 
-#[allow(clippy::suspicious_arithmetic_impl)]
-impl<M: ManagedTypeApi, const DECIMALS: NumDecimals, const OTHER_DECIMALS: NumDecimals>
-    Div<ManagedDecimal<M, ConstDecimals<OTHER_DECIMALS>>>
-    for ManagedDecimal<M, ConstDecimals<DECIMALS>>
+impl<M: ManagedTypeApi, D1: Decimals, D2: Decimals> Div<ManagedDecimal<M, D2>>
+    for ManagedDecimal<M, D1>
 where
-    [(); DECIMALS - OTHER_DECIMALS]:,
+    D1: Sub<D2>,
+    <D1 as Sub<D2>>::Output: Decimals,
 {
-    type Output = ManagedDecimal<M, ConstDecimals<{ DECIMALS - OTHER_DECIMALS }>>;
+    type Output = ManagedDecimal<M, <D1 as Sub<D2>>::Output>;
 
-    fn div(self, other: ManagedDecimal<M, ConstDecimals<OTHER_DECIMALS>>) -> Self::Output {
-        ManagedDecimal::const_decimals_from_raw(self.data / other.data)
+    fn div(self, other: ManagedDecimal<M, D2>) -> Self::Output {
+        ManagedDecimal {
+            data: self.data / other.data,
+            decimals: self.decimals - other.decimals,
+        }
     }
 }
 
diff --git a/framework/base/src/types/managed/wrapped/managed_decimal_macros.rs b/framework/base/src/types/managed/wrapped/managed_decimal_macros.rs
new file mode 100644
index 0000000000..ca6d8a3a3c
--- /dev/null
+++ b/framework/base/src/types/managed/wrapped/managed_decimal_macros.rs
@@ -0,0 +1,4246 @@
+use crate::types::ConstDecimals;
+use core::ops::{Add, Sub};
+
+macro_rules! add_sub_const_decimals {
+    ($dec1:expr, $dec2:expr, $result_add:expr, $result_sub:expr) => {
+        impl Add<ConstDecimals<$dec2>> for ConstDecimals<$dec1> {
+            type Output = ConstDecimals<$result_add>;
+            fn add(self, _rhs: ConstDecimals<$dec2>) -> Self::Output {
+                ConstDecimals::<$result_add>
+            }
+        }
+        impl Sub<ConstDecimals<$dec2>> for ConstDecimals<$dec1> {
+            type Output = ConstDecimals<$result_sub>;
+            fn sub(self, _rhs: ConstDecimals<$dec2>) -> Self::Output {
+                ConstDecimals::<$result_sub>
+            }
+        }
+    };
+}
+
+// Add and subtract macros for const decimals
+add_sub_const_decimals!(64usize, 64usize, 128usize, 0usize);
+add_sub_const_decimals!(64usize, 63usize, 127usize, 1usize);
+add_sub_const_decimals!(64usize, 62usize, 126usize, 2usize);
+add_sub_const_decimals!(64usize, 61usize, 125usize, 3usize);
+add_sub_const_decimals!(64usize, 60usize, 124usize, 4usize);
+add_sub_const_decimals!(64usize, 59usize, 123usize, 5usize);
+add_sub_const_decimals!(64usize, 58usize, 122usize, 6usize);
+add_sub_const_decimals!(64usize, 57usize, 121usize, 7usize);
+add_sub_const_decimals!(64usize, 56usize, 120usize, 8usize);
+add_sub_const_decimals!(64usize, 55usize, 119usize, 9usize);
+add_sub_const_decimals!(64usize, 54usize, 118usize, 10usize);
+add_sub_const_decimals!(64usize, 53usize, 117usize, 11usize);
+add_sub_const_decimals!(64usize, 52usize, 116usize, 12usize);
+add_sub_const_decimals!(64usize, 51usize, 115usize, 13usize);
+add_sub_const_decimals!(64usize, 50usize, 114usize, 14usize);
+add_sub_const_decimals!(64usize, 49usize, 113usize, 15usize);
+add_sub_const_decimals!(64usize, 48usize, 112usize, 16usize);
+add_sub_const_decimals!(64usize, 47usize, 111usize, 17usize);
+add_sub_const_decimals!(64usize, 46usize, 110usize, 18usize);
+add_sub_const_decimals!(64usize, 45usize, 109usize, 19usize);
+add_sub_const_decimals!(64usize, 44usize, 108usize, 20usize);
+add_sub_const_decimals!(64usize, 43usize, 107usize, 21usize);
+add_sub_const_decimals!(64usize, 42usize, 106usize, 22usize);
+add_sub_const_decimals!(64usize, 41usize, 105usize, 23usize);
+add_sub_const_decimals!(64usize, 40usize, 104usize, 24usize);
+add_sub_const_decimals!(64usize, 39usize, 103usize, 25usize);
+add_sub_const_decimals!(64usize, 38usize, 102usize, 26usize);
+add_sub_const_decimals!(64usize, 37usize, 101usize, 27usize);
+add_sub_const_decimals!(64usize, 36usize, 100usize, 28usize);
+add_sub_const_decimals!(64usize, 35usize, 99usize, 29usize);
+add_sub_const_decimals!(64usize, 34usize, 98usize, 30usize);
+add_sub_const_decimals!(64usize, 33usize, 97usize, 31usize);
+add_sub_const_decimals!(64usize, 32usize, 96usize, 32usize);
+add_sub_const_decimals!(64usize, 31usize, 95usize, 33usize);
+add_sub_const_decimals!(64usize, 30usize, 94usize, 34usize);
+add_sub_const_decimals!(64usize, 29usize, 93usize, 35usize);
+add_sub_const_decimals!(64usize, 28usize, 92usize, 36usize);
+add_sub_const_decimals!(64usize, 27usize, 91usize, 37usize);
+add_sub_const_decimals!(64usize, 26usize, 90usize, 38usize);
+add_sub_const_decimals!(64usize, 25usize, 89usize, 39usize);
+add_sub_const_decimals!(64usize, 24usize, 88usize, 40usize);
+add_sub_const_decimals!(64usize, 23usize, 87usize, 41usize);
+add_sub_const_decimals!(64usize, 22usize, 86usize, 42usize);
+add_sub_const_decimals!(64usize, 21usize, 85usize, 43usize);
+add_sub_const_decimals!(64usize, 20usize, 84usize, 44usize);
+add_sub_const_decimals!(64usize, 19usize, 83usize, 45usize);
+add_sub_const_decimals!(64usize, 18usize, 82usize, 46usize);
+add_sub_const_decimals!(64usize, 17usize, 81usize, 47usize);
+add_sub_const_decimals!(64usize, 16usize, 80usize, 48usize);
+add_sub_const_decimals!(64usize, 15usize, 79usize, 49usize);
+add_sub_const_decimals!(64usize, 14usize, 78usize, 50usize);
+add_sub_const_decimals!(64usize, 13usize, 77usize, 51usize);
+add_sub_const_decimals!(64usize, 12usize, 76usize, 52usize);
+add_sub_const_decimals!(64usize, 11usize, 75usize, 53usize);
+add_sub_const_decimals!(64usize, 10usize, 74usize, 54usize);
+add_sub_const_decimals!(64usize, 9usize, 73usize, 55usize);
+add_sub_const_decimals!(64usize, 8usize, 72usize, 56usize);
+add_sub_const_decimals!(64usize, 7usize, 71usize, 57usize);
+add_sub_const_decimals!(64usize, 6usize, 70usize, 58usize);
+add_sub_const_decimals!(64usize, 5usize, 69usize, 59usize);
+add_sub_const_decimals!(64usize, 4usize, 68usize, 60usize);
+add_sub_const_decimals!(64usize, 3usize, 67usize, 61usize);
+add_sub_const_decimals!(64usize, 2usize, 66usize, 62usize);
+add_sub_const_decimals!(64usize, 1usize, 65usize, 63usize);
+add_sub_const_decimals!(64usize, 0usize, 64usize, 64usize);
+add_sub_const_decimals!(63usize, 64usize, 127usize, 0usize);
+add_sub_const_decimals!(63usize, 63usize, 126usize, 0usize);
+add_sub_const_decimals!(63usize, 62usize, 125usize, 1usize);
+add_sub_const_decimals!(63usize, 61usize, 124usize, 2usize);
+add_sub_const_decimals!(63usize, 60usize, 123usize, 3usize);
+add_sub_const_decimals!(63usize, 59usize, 122usize, 4usize);
+add_sub_const_decimals!(63usize, 58usize, 121usize, 5usize);
+add_sub_const_decimals!(63usize, 57usize, 120usize, 6usize);
+add_sub_const_decimals!(63usize, 56usize, 119usize, 7usize);
+add_sub_const_decimals!(63usize, 55usize, 118usize, 8usize);
+add_sub_const_decimals!(63usize, 54usize, 117usize, 9usize);
+add_sub_const_decimals!(63usize, 53usize, 116usize, 10usize);
+add_sub_const_decimals!(63usize, 52usize, 115usize, 11usize);
+add_sub_const_decimals!(63usize, 51usize, 114usize, 12usize);
+add_sub_const_decimals!(63usize, 50usize, 113usize, 13usize);
+add_sub_const_decimals!(63usize, 49usize, 112usize, 14usize);
+add_sub_const_decimals!(63usize, 48usize, 111usize, 15usize);
+add_sub_const_decimals!(63usize, 47usize, 110usize, 16usize);
+add_sub_const_decimals!(63usize, 46usize, 109usize, 17usize);
+add_sub_const_decimals!(63usize, 45usize, 108usize, 18usize);
+add_sub_const_decimals!(63usize, 44usize, 107usize, 19usize);
+add_sub_const_decimals!(63usize, 43usize, 106usize, 20usize);
+add_sub_const_decimals!(63usize, 42usize, 105usize, 21usize);
+add_sub_const_decimals!(63usize, 41usize, 104usize, 22usize);
+add_sub_const_decimals!(63usize, 40usize, 103usize, 23usize);
+add_sub_const_decimals!(63usize, 39usize, 102usize, 24usize);
+add_sub_const_decimals!(63usize, 38usize, 101usize, 25usize);
+add_sub_const_decimals!(63usize, 37usize, 100usize, 26usize);
+add_sub_const_decimals!(63usize, 36usize, 99usize, 27usize);
+add_sub_const_decimals!(63usize, 35usize, 98usize, 28usize);
+add_sub_const_decimals!(63usize, 34usize, 97usize, 29usize);
+add_sub_const_decimals!(63usize, 33usize, 96usize, 30usize);
+add_sub_const_decimals!(63usize, 32usize, 95usize, 31usize);
+add_sub_const_decimals!(63usize, 31usize, 94usize, 32usize);
+add_sub_const_decimals!(63usize, 30usize, 93usize, 33usize);
+add_sub_const_decimals!(63usize, 29usize, 92usize, 34usize);
+add_sub_const_decimals!(63usize, 28usize, 91usize, 35usize);
+add_sub_const_decimals!(63usize, 27usize, 90usize, 36usize);
+add_sub_const_decimals!(63usize, 26usize, 89usize, 37usize);
+add_sub_const_decimals!(63usize, 25usize, 88usize, 38usize);
+add_sub_const_decimals!(63usize, 24usize, 87usize, 39usize);
+add_sub_const_decimals!(63usize, 23usize, 86usize, 40usize);
+add_sub_const_decimals!(63usize, 22usize, 85usize, 41usize);
+add_sub_const_decimals!(63usize, 21usize, 84usize, 42usize);
+add_sub_const_decimals!(63usize, 20usize, 83usize, 43usize);
+add_sub_const_decimals!(63usize, 19usize, 82usize, 44usize);
+add_sub_const_decimals!(63usize, 18usize, 81usize, 45usize);
+add_sub_const_decimals!(63usize, 17usize, 80usize, 46usize);
+add_sub_const_decimals!(63usize, 16usize, 79usize, 47usize);
+add_sub_const_decimals!(63usize, 15usize, 78usize, 48usize);
+add_sub_const_decimals!(63usize, 14usize, 77usize, 49usize);
+add_sub_const_decimals!(63usize, 13usize, 76usize, 50usize);
+add_sub_const_decimals!(63usize, 12usize, 75usize, 51usize);
+add_sub_const_decimals!(63usize, 11usize, 74usize, 52usize);
+add_sub_const_decimals!(63usize, 10usize, 73usize, 53usize);
+add_sub_const_decimals!(63usize, 9usize, 72usize, 54usize);
+add_sub_const_decimals!(63usize, 8usize, 71usize, 55usize);
+add_sub_const_decimals!(63usize, 7usize, 70usize, 56usize);
+add_sub_const_decimals!(63usize, 6usize, 69usize, 57usize);
+add_sub_const_decimals!(63usize, 5usize, 68usize, 58usize);
+add_sub_const_decimals!(63usize, 4usize, 67usize, 59usize);
+add_sub_const_decimals!(63usize, 3usize, 66usize, 60usize);
+add_sub_const_decimals!(63usize, 2usize, 65usize, 61usize);
+add_sub_const_decimals!(63usize, 1usize, 64usize, 62usize);
+add_sub_const_decimals!(63usize, 0usize, 63usize, 63usize);
+add_sub_const_decimals!(62usize, 64usize, 126usize, 0usize);
+add_sub_const_decimals!(62usize, 63usize, 125usize, 0usize);
+add_sub_const_decimals!(62usize, 62usize, 124usize, 0usize);
+add_sub_const_decimals!(62usize, 61usize, 123usize, 1usize);
+add_sub_const_decimals!(62usize, 60usize, 122usize, 2usize);
+add_sub_const_decimals!(62usize, 59usize, 121usize, 3usize);
+add_sub_const_decimals!(62usize, 58usize, 120usize, 4usize);
+add_sub_const_decimals!(62usize, 57usize, 119usize, 5usize);
+add_sub_const_decimals!(62usize, 56usize, 118usize, 6usize);
+add_sub_const_decimals!(62usize, 55usize, 117usize, 7usize);
+add_sub_const_decimals!(62usize, 54usize, 116usize, 8usize);
+add_sub_const_decimals!(62usize, 53usize, 115usize, 9usize);
+add_sub_const_decimals!(62usize, 52usize, 114usize, 10usize);
+add_sub_const_decimals!(62usize, 51usize, 113usize, 11usize);
+add_sub_const_decimals!(62usize, 50usize, 112usize, 12usize);
+add_sub_const_decimals!(62usize, 49usize, 111usize, 13usize);
+add_sub_const_decimals!(62usize, 48usize, 110usize, 14usize);
+add_sub_const_decimals!(62usize, 47usize, 109usize, 15usize);
+add_sub_const_decimals!(62usize, 46usize, 108usize, 16usize);
+add_sub_const_decimals!(62usize, 45usize, 107usize, 17usize);
+add_sub_const_decimals!(62usize, 44usize, 106usize, 18usize);
+add_sub_const_decimals!(62usize, 43usize, 105usize, 19usize);
+add_sub_const_decimals!(62usize, 42usize, 104usize, 20usize);
+add_sub_const_decimals!(62usize, 41usize, 103usize, 21usize);
+add_sub_const_decimals!(62usize, 40usize, 102usize, 22usize);
+add_sub_const_decimals!(62usize, 39usize, 101usize, 23usize);
+add_sub_const_decimals!(62usize, 38usize, 100usize, 24usize);
+add_sub_const_decimals!(62usize, 37usize, 99usize, 25usize);
+add_sub_const_decimals!(62usize, 36usize, 98usize, 26usize);
+add_sub_const_decimals!(62usize, 35usize, 97usize, 27usize);
+add_sub_const_decimals!(62usize, 34usize, 96usize, 28usize);
+add_sub_const_decimals!(62usize, 33usize, 95usize, 29usize);
+add_sub_const_decimals!(62usize, 32usize, 94usize, 30usize);
+add_sub_const_decimals!(62usize, 31usize, 93usize, 31usize);
+add_sub_const_decimals!(62usize, 30usize, 92usize, 32usize);
+add_sub_const_decimals!(62usize, 29usize, 91usize, 33usize);
+add_sub_const_decimals!(62usize, 28usize, 90usize, 34usize);
+add_sub_const_decimals!(62usize, 27usize, 89usize, 35usize);
+add_sub_const_decimals!(62usize, 26usize, 88usize, 36usize);
+add_sub_const_decimals!(62usize, 25usize, 87usize, 37usize);
+add_sub_const_decimals!(62usize, 24usize, 86usize, 38usize);
+add_sub_const_decimals!(62usize, 23usize, 85usize, 39usize);
+add_sub_const_decimals!(62usize, 22usize, 84usize, 40usize);
+add_sub_const_decimals!(62usize, 21usize, 83usize, 41usize);
+add_sub_const_decimals!(62usize, 20usize, 82usize, 42usize);
+add_sub_const_decimals!(62usize, 19usize, 81usize, 43usize);
+add_sub_const_decimals!(62usize, 18usize, 80usize, 44usize);
+add_sub_const_decimals!(62usize, 17usize, 79usize, 45usize);
+add_sub_const_decimals!(62usize, 16usize, 78usize, 46usize);
+add_sub_const_decimals!(62usize, 15usize, 77usize, 47usize);
+add_sub_const_decimals!(62usize, 14usize, 76usize, 48usize);
+add_sub_const_decimals!(62usize, 13usize, 75usize, 49usize);
+add_sub_const_decimals!(62usize, 12usize, 74usize, 50usize);
+add_sub_const_decimals!(62usize, 11usize, 73usize, 51usize);
+add_sub_const_decimals!(62usize, 10usize, 72usize, 52usize);
+add_sub_const_decimals!(62usize, 9usize, 71usize, 53usize);
+add_sub_const_decimals!(62usize, 8usize, 70usize, 54usize);
+add_sub_const_decimals!(62usize, 7usize, 69usize, 55usize);
+add_sub_const_decimals!(62usize, 6usize, 68usize, 56usize);
+add_sub_const_decimals!(62usize, 5usize, 67usize, 57usize);
+add_sub_const_decimals!(62usize, 4usize, 66usize, 58usize);
+add_sub_const_decimals!(62usize, 3usize, 65usize, 59usize);
+add_sub_const_decimals!(62usize, 2usize, 64usize, 60usize);
+add_sub_const_decimals!(62usize, 1usize, 63usize, 61usize);
+add_sub_const_decimals!(62usize, 0usize, 62usize, 62usize);
+add_sub_const_decimals!(61usize, 64usize, 125usize, 0usize);
+add_sub_const_decimals!(61usize, 63usize, 124usize, 0usize);
+add_sub_const_decimals!(61usize, 62usize, 123usize, 0usize);
+add_sub_const_decimals!(61usize, 61usize, 122usize, 0usize);
+add_sub_const_decimals!(61usize, 60usize, 121usize, 1usize);
+add_sub_const_decimals!(61usize, 59usize, 120usize, 2usize);
+add_sub_const_decimals!(61usize, 58usize, 119usize, 3usize);
+add_sub_const_decimals!(61usize, 57usize, 118usize, 4usize);
+add_sub_const_decimals!(61usize, 56usize, 117usize, 5usize);
+add_sub_const_decimals!(61usize, 55usize, 116usize, 6usize);
+add_sub_const_decimals!(61usize, 54usize, 115usize, 7usize);
+add_sub_const_decimals!(61usize, 53usize, 114usize, 8usize);
+add_sub_const_decimals!(61usize, 52usize, 113usize, 9usize);
+add_sub_const_decimals!(61usize, 51usize, 112usize, 10usize);
+add_sub_const_decimals!(61usize, 50usize, 111usize, 11usize);
+add_sub_const_decimals!(61usize, 49usize, 110usize, 12usize);
+add_sub_const_decimals!(61usize, 48usize, 109usize, 13usize);
+add_sub_const_decimals!(61usize, 47usize, 108usize, 14usize);
+add_sub_const_decimals!(61usize, 46usize, 107usize, 15usize);
+add_sub_const_decimals!(61usize, 45usize, 106usize, 16usize);
+add_sub_const_decimals!(61usize, 44usize, 105usize, 17usize);
+add_sub_const_decimals!(61usize, 43usize, 104usize, 18usize);
+add_sub_const_decimals!(61usize, 42usize, 103usize, 19usize);
+add_sub_const_decimals!(61usize, 41usize, 102usize, 20usize);
+add_sub_const_decimals!(61usize, 40usize, 101usize, 21usize);
+add_sub_const_decimals!(61usize, 39usize, 100usize, 22usize);
+add_sub_const_decimals!(61usize, 38usize, 99usize, 23usize);
+add_sub_const_decimals!(61usize, 37usize, 98usize, 24usize);
+add_sub_const_decimals!(61usize, 36usize, 97usize, 25usize);
+add_sub_const_decimals!(61usize, 35usize, 96usize, 26usize);
+add_sub_const_decimals!(61usize, 34usize, 95usize, 27usize);
+add_sub_const_decimals!(61usize, 33usize, 94usize, 28usize);
+add_sub_const_decimals!(61usize, 32usize, 93usize, 29usize);
+add_sub_const_decimals!(61usize, 31usize, 92usize, 30usize);
+add_sub_const_decimals!(61usize, 30usize, 91usize, 31usize);
+add_sub_const_decimals!(61usize, 29usize, 90usize, 32usize);
+add_sub_const_decimals!(61usize, 28usize, 89usize, 33usize);
+add_sub_const_decimals!(61usize, 27usize, 88usize, 34usize);
+add_sub_const_decimals!(61usize, 26usize, 87usize, 35usize);
+add_sub_const_decimals!(61usize, 25usize, 86usize, 36usize);
+add_sub_const_decimals!(61usize, 24usize, 85usize, 37usize);
+add_sub_const_decimals!(61usize, 23usize, 84usize, 38usize);
+add_sub_const_decimals!(61usize, 22usize, 83usize, 39usize);
+add_sub_const_decimals!(61usize, 21usize, 82usize, 40usize);
+add_sub_const_decimals!(61usize, 20usize, 81usize, 41usize);
+add_sub_const_decimals!(61usize, 19usize, 80usize, 42usize);
+add_sub_const_decimals!(61usize, 18usize, 79usize, 43usize);
+add_sub_const_decimals!(61usize, 17usize, 78usize, 44usize);
+add_sub_const_decimals!(61usize, 16usize, 77usize, 45usize);
+add_sub_const_decimals!(61usize, 15usize, 76usize, 46usize);
+add_sub_const_decimals!(61usize, 14usize, 75usize, 47usize);
+add_sub_const_decimals!(61usize, 13usize, 74usize, 48usize);
+add_sub_const_decimals!(61usize, 12usize, 73usize, 49usize);
+add_sub_const_decimals!(61usize, 11usize, 72usize, 50usize);
+add_sub_const_decimals!(61usize, 10usize, 71usize, 51usize);
+add_sub_const_decimals!(61usize, 9usize, 70usize, 52usize);
+add_sub_const_decimals!(61usize, 8usize, 69usize, 53usize);
+add_sub_const_decimals!(61usize, 7usize, 68usize, 54usize);
+add_sub_const_decimals!(61usize, 6usize, 67usize, 55usize);
+add_sub_const_decimals!(61usize, 5usize, 66usize, 56usize);
+add_sub_const_decimals!(61usize, 4usize, 65usize, 57usize);
+add_sub_const_decimals!(61usize, 3usize, 64usize, 58usize);
+add_sub_const_decimals!(61usize, 2usize, 63usize, 59usize);
+add_sub_const_decimals!(61usize, 1usize, 62usize, 60usize);
+add_sub_const_decimals!(61usize, 0usize, 61usize, 61usize);
+add_sub_const_decimals!(60usize, 64usize, 124usize, 0usize);
+add_sub_const_decimals!(60usize, 63usize, 123usize, 0usize);
+add_sub_const_decimals!(60usize, 62usize, 122usize, 0usize);
+add_sub_const_decimals!(60usize, 61usize, 121usize, 0usize);
+add_sub_const_decimals!(60usize, 60usize, 120usize, 0usize);
+add_sub_const_decimals!(60usize, 59usize, 119usize, 1usize);
+add_sub_const_decimals!(60usize, 58usize, 118usize, 2usize);
+add_sub_const_decimals!(60usize, 57usize, 117usize, 3usize);
+add_sub_const_decimals!(60usize, 56usize, 116usize, 4usize);
+add_sub_const_decimals!(60usize, 55usize, 115usize, 5usize);
+add_sub_const_decimals!(60usize, 54usize, 114usize, 6usize);
+add_sub_const_decimals!(60usize, 53usize, 113usize, 7usize);
+add_sub_const_decimals!(60usize, 52usize, 112usize, 8usize);
+add_sub_const_decimals!(60usize, 51usize, 111usize, 9usize);
+add_sub_const_decimals!(60usize, 50usize, 110usize, 10usize);
+add_sub_const_decimals!(60usize, 49usize, 109usize, 11usize);
+add_sub_const_decimals!(60usize, 48usize, 108usize, 12usize);
+add_sub_const_decimals!(60usize, 47usize, 107usize, 13usize);
+add_sub_const_decimals!(60usize, 46usize, 106usize, 14usize);
+add_sub_const_decimals!(60usize, 45usize, 105usize, 15usize);
+add_sub_const_decimals!(60usize, 44usize, 104usize, 16usize);
+add_sub_const_decimals!(60usize, 43usize, 103usize, 17usize);
+add_sub_const_decimals!(60usize, 42usize, 102usize, 18usize);
+add_sub_const_decimals!(60usize, 41usize, 101usize, 19usize);
+add_sub_const_decimals!(60usize, 40usize, 100usize, 20usize);
+add_sub_const_decimals!(60usize, 39usize, 99usize, 21usize);
+add_sub_const_decimals!(60usize, 38usize, 98usize, 22usize);
+add_sub_const_decimals!(60usize, 37usize, 97usize, 23usize);
+add_sub_const_decimals!(60usize, 36usize, 96usize, 24usize);
+add_sub_const_decimals!(60usize, 35usize, 95usize, 25usize);
+add_sub_const_decimals!(60usize, 34usize, 94usize, 26usize);
+add_sub_const_decimals!(60usize, 33usize, 93usize, 27usize);
+add_sub_const_decimals!(60usize, 32usize, 92usize, 28usize);
+add_sub_const_decimals!(60usize, 31usize, 91usize, 29usize);
+add_sub_const_decimals!(60usize, 30usize, 90usize, 30usize);
+add_sub_const_decimals!(60usize, 29usize, 89usize, 31usize);
+add_sub_const_decimals!(60usize, 28usize, 88usize, 32usize);
+add_sub_const_decimals!(60usize, 27usize, 87usize, 33usize);
+add_sub_const_decimals!(60usize, 26usize, 86usize, 34usize);
+add_sub_const_decimals!(60usize, 25usize, 85usize, 35usize);
+add_sub_const_decimals!(60usize, 24usize, 84usize, 36usize);
+add_sub_const_decimals!(60usize, 23usize, 83usize, 37usize);
+add_sub_const_decimals!(60usize, 22usize, 82usize, 38usize);
+add_sub_const_decimals!(60usize, 21usize, 81usize, 39usize);
+add_sub_const_decimals!(60usize, 20usize, 80usize, 40usize);
+add_sub_const_decimals!(60usize, 19usize, 79usize, 41usize);
+add_sub_const_decimals!(60usize, 18usize, 78usize, 42usize);
+add_sub_const_decimals!(60usize, 17usize, 77usize, 43usize);
+add_sub_const_decimals!(60usize, 16usize, 76usize, 44usize);
+add_sub_const_decimals!(60usize, 15usize, 75usize, 45usize);
+add_sub_const_decimals!(60usize, 14usize, 74usize, 46usize);
+add_sub_const_decimals!(60usize, 13usize, 73usize, 47usize);
+add_sub_const_decimals!(60usize, 12usize, 72usize, 48usize);
+add_sub_const_decimals!(60usize, 11usize, 71usize, 49usize);
+add_sub_const_decimals!(60usize, 10usize, 70usize, 50usize);
+add_sub_const_decimals!(60usize, 9usize, 69usize, 51usize);
+add_sub_const_decimals!(60usize, 8usize, 68usize, 52usize);
+add_sub_const_decimals!(60usize, 7usize, 67usize, 53usize);
+add_sub_const_decimals!(60usize, 6usize, 66usize, 54usize);
+add_sub_const_decimals!(60usize, 5usize, 65usize, 55usize);
+add_sub_const_decimals!(60usize, 4usize, 64usize, 56usize);
+add_sub_const_decimals!(60usize, 3usize, 63usize, 57usize);
+add_sub_const_decimals!(60usize, 2usize, 62usize, 58usize);
+add_sub_const_decimals!(60usize, 1usize, 61usize, 59usize);
+add_sub_const_decimals!(60usize, 0usize, 60usize, 60usize);
+add_sub_const_decimals!(59usize, 64usize, 123usize, 0usize);
+add_sub_const_decimals!(59usize, 63usize, 122usize, 0usize);
+add_sub_const_decimals!(59usize, 62usize, 121usize, 0usize);
+add_sub_const_decimals!(59usize, 61usize, 120usize, 0usize);
+add_sub_const_decimals!(59usize, 60usize, 119usize, 0usize);
+add_sub_const_decimals!(59usize, 59usize, 118usize, 0usize);
+add_sub_const_decimals!(59usize, 58usize, 117usize, 1usize);
+add_sub_const_decimals!(59usize, 57usize, 116usize, 2usize);
+add_sub_const_decimals!(59usize, 56usize, 115usize, 3usize);
+add_sub_const_decimals!(59usize, 55usize, 114usize, 4usize);
+add_sub_const_decimals!(59usize, 54usize, 113usize, 5usize);
+add_sub_const_decimals!(59usize, 53usize, 112usize, 6usize);
+add_sub_const_decimals!(59usize, 52usize, 111usize, 7usize);
+add_sub_const_decimals!(59usize, 51usize, 110usize, 8usize);
+add_sub_const_decimals!(59usize, 50usize, 109usize, 9usize);
+add_sub_const_decimals!(59usize, 49usize, 108usize, 10usize);
+add_sub_const_decimals!(59usize, 48usize, 107usize, 11usize);
+add_sub_const_decimals!(59usize, 47usize, 106usize, 12usize);
+add_sub_const_decimals!(59usize, 46usize, 105usize, 13usize);
+add_sub_const_decimals!(59usize, 45usize, 104usize, 14usize);
+add_sub_const_decimals!(59usize, 44usize, 103usize, 15usize);
+add_sub_const_decimals!(59usize, 43usize, 102usize, 16usize);
+add_sub_const_decimals!(59usize, 42usize, 101usize, 17usize);
+add_sub_const_decimals!(59usize, 41usize, 100usize, 18usize);
+add_sub_const_decimals!(59usize, 40usize, 99usize, 19usize);
+add_sub_const_decimals!(59usize, 39usize, 98usize, 20usize);
+add_sub_const_decimals!(59usize, 38usize, 97usize, 21usize);
+add_sub_const_decimals!(59usize, 37usize, 96usize, 22usize);
+add_sub_const_decimals!(59usize, 36usize, 95usize, 23usize);
+add_sub_const_decimals!(59usize, 35usize, 94usize, 24usize);
+add_sub_const_decimals!(59usize, 34usize, 93usize, 25usize);
+add_sub_const_decimals!(59usize, 33usize, 92usize, 26usize);
+add_sub_const_decimals!(59usize, 32usize, 91usize, 27usize);
+add_sub_const_decimals!(59usize, 31usize, 90usize, 28usize);
+add_sub_const_decimals!(59usize, 30usize, 89usize, 29usize);
+add_sub_const_decimals!(59usize, 29usize, 88usize, 30usize);
+add_sub_const_decimals!(59usize, 28usize, 87usize, 31usize);
+add_sub_const_decimals!(59usize, 27usize, 86usize, 32usize);
+add_sub_const_decimals!(59usize, 26usize, 85usize, 33usize);
+add_sub_const_decimals!(59usize, 25usize, 84usize, 34usize);
+add_sub_const_decimals!(59usize, 24usize, 83usize, 35usize);
+add_sub_const_decimals!(59usize, 23usize, 82usize, 36usize);
+add_sub_const_decimals!(59usize, 22usize, 81usize, 37usize);
+add_sub_const_decimals!(59usize, 21usize, 80usize, 38usize);
+add_sub_const_decimals!(59usize, 20usize, 79usize, 39usize);
+add_sub_const_decimals!(59usize, 19usize, 78usize, 40usize);
+add_sub_const_decimals!(59usize, 18usize, 77usize, 41usize);
+add_sub_const_decimals!(59usize, 17usize, 76usize, 42usize);
+add_sub_const_decimals!(59usize, 16usize, 75usize, 43usize);
+add_sub_const_decimals!(59usize, 15usize, 74usize, 44usize);
+add_sub_const_decimals!(59usize, 14usize, 73usize, 45usize);
+add_sub_const_decimals!(59usize, 13usize, 72usize, 46usize);
+add_sub_const_decimals!(59usize, 12usize, 71usize, 47usize);
+add_sub_const_decimals!(59usize, 11usize, 70usize, 48usize);
+add_sub_const_decimals!(59usize, 10usize, 69usize, 49usize);
+add_sub_const_decimals!(59usize, 9usize, 68usize, 50usize);
+add_sub_const_decimals!(59usize, 8usize, 67usize, 51usize);
+add_sub_const_decimals!(59usize, 7usize, 66usize, 52usize);
+add_sub_const_decimals!(59usize, 6usize, 65usize, 53usize);
+add_sub_const_decimals!(59usize, 5usize, 64usize, 54usize);
+add_sub_const_decimals!(59usize, 4usize, 63usize, 55usize);
+add_sub_const_decimals!(59usize, 3usize, 62usize, 56usize);
+add_sub_const_decimals!(59usize, 2usize, 61usize, 57usize);
+add_sub_const_decimals!(59usize, 1usize, 60usize, 58usize);
+add_sub_const_decimals!(59usize, 0usize, 59usize, 59usize);
+add_sub_const_decimals!(58usize, 64usize, 122usize, 0usize);
+add_sub_const_decimals!(58usize, 63usize, 121usize, 0usize);
+add_sub_const_decimals!(58usize, 62usize, 120usize, 0usize);
+add_sub_const_decimals!(58usize, 61usize, 119usize, 0usize);
+add_sub_const_decimals!(58usize, 60usize, 118usize, 0usize);
+add_sub_const_decimals!(58usize, 59usize, 117usize, 0usize);
+add_sub_const_decimals!(58usize, 58usize, 116usize, 0usize);
+add_sub_const_decimals!(58usize, 57usize, 115usize, 1usize);
+add_sub_const_decimals!(58usize, 56usize, 114usize, 2usize);
+add_sub_const_decimals!(58usize, 55usize, 113usize, 3usize);
+add_sub_const_decimals!(58usize, 54usize, 112usize, 4usize);
+add_sub_const_decimals!(58usize, 53usize, 111usize, 5usize);
+add_sub_const_decimals!(58usize, 52usize, 110usize, 6usize);
+add_sub_const_decimals!(58usize, 51usize, 109usize, 7usize);
+add_sub_const_decimals!(58usize, 50usize, 108usize, 8usize);
+add_sub_const_decimals!(58usize, 49usize, 107usize, 9usize);
+add_sub_const_decimals!(58usize, 48usize, 106usize, 10usize);
+add_sub_const_decimals!(58usize, 47usize, 105usize, 11usize);
+add_sub_const_decimals!(58usize, 46usize, 104usize, 12usize);
+add_sub_const_decimals!(58usize, 45usize, 103usize, 13usize);
+add_sub_const_decimals!(58usize, 44usize, 102usize, 14usize);
+add_sub_const_decimals!(58usize, 43usize, 101usize, 15usize);
+add_sub_const_decimals!(58usize, 42usize, 100usize, 16usize);
+add_sub_const_decimals!(58usize, 41usize, 99usize, 17usize);
+add_sub_const_decimals!(58usize, 40usize, 98usize, 18usize);
+add_sub_const_decimals!(58usize, 39usize, 97usize, 19usize);
+add_sub_const_decimals!(58usize, 38usize, 96usize, 20usize);
+add_sub_const_decimals!(58usize, 37usize, 95usize, 21usize);
+add_sub_const_decimals!(58usize, 36usize, 94usize, 22usize);
+add_sub_const_decimals!(58usize, 35usize, 93usize, 23usize);
+add_sub_const_decimals!(58usize, 34usize, 92usize, 24usize);
+add_sub_const_decimals!(58usize, 33usize, 91usize, 25usize);
+add_sub_const_decimals!(58usize, 32usize, 90usize, 26usize);
+add_sub_const_decimals!(58usize, 31usize, 89usize, 27usize);
+add_sub_const_decimals!(58usize, 30usize, 88usize, 28usize);
+add_sub_const_decimals!(58usize, 29usize, 87usize, 29usize);
+add_sub_const_decimals!(58usize, 28usize, 86usize, 30usize);
+add_sub_const_decimals!(58usize, 27usize, 85usize, 31usize);
+add_sub_const_decimals!(58usize, 26usize, 84usize, 32usize);
+add_sub_const_decimals!(58usize, 25usize, 83usize, 33usize);
+add_sub_const_decimals!(58usize, 24usize, 82usize, 34usize);
+add_sub_const_decimals!(58usize, 23usize, 81usize, 35usize);
+add_sub_const_decimals!(58usize, 22usize, 80usize, 36usize);
+add_sub_const_decimals!(58usize, 21usize, 79usize, 37usize);
+add_sub_const_decimals!(58usize, 20usize, 78usize, 38usize);
+add_sub_const_decimals!(58usize, 19usize, 77usize, 39usize);
+add_sub_const_decimals!(58usize, 18usize, 76usize, 40usize);
+add_sub_const_decimals!(58usize, 17usize, 75usize, 41usize);
+add_sub_const_decimals!(58usize, 16usize, 74usize, 42usize);
+add_sub_const_decimals!(58usize, 15usize, 73usize, 43usize);
+add_sub_const_decimals!(58usize, 14usize, 72usize, 44usize);
+add_sub_const_decimals!(58usize, 13usize, 71usize, 45usize);
+add_sub_const_decimals!(58usize, 12usize, 70usize, 46usize);
+add_sub_const_decimals!(58usize, 11usize, 69usize, 47usize);
+add_sub_const_decimals!(58usize, 10usize, 68usize, 48usize);
+add_sub_const_decimals!(58usize, 9usize, 67usize, 49usize);
+add_sub_const_decimals!(58usize, 8usize, 66usize, 50usize);
+add_sub_const_decimals!(58usize, 7usize, 65usize, 51usize);
+add_sub_const_decimals!(58usize, 6usize, 64usize, 52usize);
+add_sub_const_decimals!(58usize, 5usize, 63usize, 53usize);
+add_sub_const_decimals!(58usize, 4usize, 62usize, 54usize);
+add_sub_const_decimals!(58usize, 3usize, 61usize, 55usize);
+add_sub_const_decimals!(58usize, 2usize, 60usize, 56usize);
+add_sub_const_decimals!(58usize, 1usize, 59usize, 57usize);
+add_sub_const_decimals!(58usize, 0usize, 58usize, 58usize);
+add_sub_const_decimals!(57usize, 64usize, 121usize, 0usize);
+add_sub_const_decimals!(57usize, 63usize, 120usize, 0usize);
+add_sub_const_decimals!(57usize, 62usize, 119usize, 0usize);
+add_sub_const_decimals!(57usize, 61usize, 118usize, 0usize);
+add_sub_const_decimals!(57usize, 60usize, 117usize, 0usize);
+add_sub_const_decimals!(57usize, 59usize, 116usize, 0usize);
+add_sub_const_decimals!(57usize, 58usize, 115usize, 0usize);
+add_sub_const_decimals!(57usize, 57usize, 114usize, 0usize);
+add_sub_const_decimals!(57usize, 56usize, 113usize, 1usize);
+add_sub_const_decimals!(57usize, 55usize, 112usize, 2usize);
+add_sub_const_decimals!(57usize, 54usize, 111usize, 3usize);
+add_sub_const_decimals!(57usize, 53usize, 110usize, 4usize);
+add_sub_const_decimals!(57usize, 52usize, 109usize, 5usize);
+add_sub_const_decimals!(57usize, 51usize, 108usize, 6usize);
+add_sub_const_decimals!(57usize, 50usize, 107usize, 7usize);
+add_sub_const_decimals!(57usize, 49usize, 106usize, 8usize);
+add_sub_const_decimals!(57usize, 48usize, 105usize, 9usize);
+add_sub_const_decimals!(57usize, 47usize, 104usize, 10usize);
+add_sub_const_decimals!(57usize, 46usize, 103usize, 11usize);
+add_sub_const_decimals!(57usize, 45usize, 102usize, 12usize);
+add_sub_const_decimals!(57usize, 44usize, 101usize, 13usize);
+add_sub_const_decimals!(57usize, 43usize, 100usize, 14usize);
+add_sub_const_decimals!(57usize, 42usize, 99usize, 15usize);
+add_sub_const_decimals!(57usize, 41usize, 98usize, 16usize);
+add_sub_const_decimals!(57usize, 40usize, 97usize, 17usize);
+add_sub_const_decimals!(57usize, 39usize, 96usize, 18usize);
+add_sub_const_decimals!(57usize, 38usize, 95usize, 19usize);
+add_sub_const_decimals!(57usize, 37usize, 94usize, 20usize);
+add_sub_const_decimals!(57usize, 36usize, 93usize, 21usize);
+add_sub_const_decimals!(57usize, 35usize, 92usize, 22usize);
+add_sub_const_decimals!(57usize, 34usize, 91usize, 23usize);
+add_sub_const_decimals!(57usize, 33usize, 90usize, 24usize);
+add_sub_const_decimals!(57usize, 32usize, 89usize, 25usize);
+add_sub_const_decimals!(57usize, 31usize, 88usize, 26usize);
+add_sub_const_decimals!(57usize, 30usize, 87usize, 27usize);
+add_sub_const_decimals!(57usize, 29usize, 86usize, 28usize);
+add_sub_const_decimals!(57usize, 28usize, 85usize, 29usize);
+add_sub_const_decimals!(57usize, 27usize, 84usize, 30usize);
+add_sub_const_decimals!(57usize, 26usize, 83usize, 31usize);
+add_sub_const_decimals!(57usize, 25usize, 82usize, 32usize);
+add_sub_const_decimals!(57usize, 24usize, 81usize, 33usize);
+add_sub_const_decimals!(57usize, 23usize, 80usize, 34usize);
+add_sub_const_decimals!(57usize, 22usize, 79usize, 35usize);
+add_sub_const_decimals!(57usize, 21usize, 78usize, 36usize);
+add_sub_const_decimals!(57usize, 20usize, 77usize, 37usize);
+add_sub_const_decimals!(57usize, 19usize, 76usize, 38usize);
+add_sub_const_decimals!(57usize, 18usize, 75usize, 39usize);
+add_sub_const_decimals!(57usize, 17usize, 74usize, 40usize);
+add_sub_const_decimals!(57usize, 16usize, 73usize, 41usize);
+add_sub_const_decimals!(57usize, 15usize, 72usize, 42usize);
+add_sub_const_decimals!(57usize, 14usize, 71usize, 43usize);
+add_sub_const_decimals!(57usize, 13usize, 70usize, 44usize);
+add_sub_const_decimals!(57usize, 12usize, 69usize, 45usize);
+add_sub_const_decimals!(57usize, 11usize, 68usize, 46usize);
+add_sub_const_decimals!(57usize, 10usize, 67usize, 47usize);
+add_sub_const_decimals!(57usize, 9usize, 66usize, 48usize);
+add_sub_const_decimals!(57usize, 8usize, 65usize, 49usize);
+add_sub_const_decimals!(57usize, 7usize, 64usize, 50usize);
+add_sub_const_decimals!(57usize, 6usize, 63usize, 51usize);
+add_sub_const_decimals!(57usize, 5usize, 62usize, 52usize);
+add_sub_const_decimals!(57usize, 4usize, 61usize, 53usize);
+add_sub_const_decimals!(57usize, 3usize, 60usize, 54usize);
+add_sub_const_decimals!(57usize, 2usize, 59usize, 55usize);
+add_sub_const_decimals!(57usize, 1usize, 58usize, 56usize);
+add_sub_const_decimals!(57usize, 0usize, 57usize, 57usize);
+add_sub_const_decimals!(56usize, 64usize, 120usize, 0usize);
+add_sub_const_decimals!(56usize, 63usize, 119usize, 0usize);
+add_sub_const_decimals!(56usize, 62usize, 118usize, 0usize);
+add_sub_const_decimals!(56usize, 61usize, 117usize, 0usize);
+add_sub_const_decimals!(56usize, 60usize, 116usize, 0usize);
+add_sub_const_decimals!(56usize, 59usize, 115usize, 0usize);
+add_sub_const_decimals!(56usize, 58usize, 114usize, 0usize);
+add_sub_const_decimals!(56usize, 57usize, 113usize, 0usize);
+add_sub_const_decimals!(56usize, 56usize, 112usize, 0usize);
+add_sub_const_decimals!(56usize, 55usize, 111usize, 1usize);
+add_sub_const_decimals!(56usize, 54usize, 110usize, 2usize);
+add_sub_const_decimals!(56usize, 53usize, 109usize, 3usize);
+add_sub_const_decimals!(56usize, 52usize, 108usize, 4usize);
+add_sub_const_decimals!(56usize, 51usize, 107usize, 5usize);
+add_sub_const_decimals!(56usize, 50usize, 106usize, 6usize);
+add_sub_const_decimals!(56usize, 49usize, 105usize, 7usize);
+add_sub_const_decimals!(56usize, 48usize, 104usize, 8usize);
+add_sub_const_decimals!(56usize, 47usize, 103usize, 9usize);
+add_sub_const_decimals!(56usize, 46usize, 102usize, 10usize);
+add_sub_const_decimals!(56usize, 45usize, 101usize, 11usize);
+add_sub_const_decimals!(56usize, 44usize, 100usize, 12usize);
+add_sub_const_decimals!(56usize, 43usize, 99usize, 13usize);
+add_sub_const_decimals!(56usize, 42usize, 98usize, 14usize);
+add_sub_const_decimals!(56usize, 41usize, 97usize, 15usize);
+add_sub_const_decimals!(56usize, 40usize, 96usize, 16usize);
+add_sub_const_decimals!(56usize, 39usize, 95usize, 17usize);
+add_sub_const_decimals!(56usize, 38usize, 94usize, 18usize);
+add_sub_const_decimals!(56usize, 37usize, 93usize, 19usize);
+add_sub_const_decimals!(56usize, 36usize, 92usize, 20usize);
+add_sub_const_decimals!(56usize, 35usize, 91usize, 21usize);
+add_sub_const_decimals!(56usize, 34usize, 90usize, 22usize);
+add_sub_const_decimals!(56usize, 33usize, 89usize, 23usize);
+add_sub_const_decimals!(56usize, 32usize, 88usize, 24usize);
+add_sub_const_decimals!(56usize, 31usize, 87usize, 25usize);
+add_sub_const_decimals!(56usize, 30usize, 86usize, 26usize);
+add_sub_const_decimals!(56usize, 29usize, 85usize, 27usize);
+add_sub_const_decimals!(56usize, 28usize, 84usize, 28usize);
+add_sub_const_decimals!(56usize, 27usize, 83usize, 29usize);
+add_sub_const_decimals!(56usize, 26usize, 82usize, 30usize);
+add_sub_const_decimals!(56usize, 25usize, 81usize, 31usize);
+add_sub_const_decimals!(56usize, 24usize, 80usize, 32usize);
+add_sub_const_decimals!(56usize, 23usize, 79usize, 33usize);
+add_sub_const_decimals!(56usize, 22usize, 78usize, 34usize);
+add_sub_const_decimals!(56usize, 21usize, 77usize, 35usize);
+add_sub_const_decimals!(56usize, 20usize, 76usize, 36usize);
+add_sub_const_decimals!(56usize, 19usize, 75usize, 37usize);
+add_sub_const_decimals!(56usize, 18usize, 74usize, 38usize);
+add_sub_const_decimals!(56usize, 17usize, 73usize, 39usize);
+add_sub_const_decimals!(56usize, 16usize, 72usize, 40usize);
+add_sub_const_decimals!(56usize, 15usize, 71usize, 41usize);
+add_sub_const_decimals!(56usize, 14usize, 70usize, 42usize);
+add_sub_const_decimals!(56usize, 13usize, 69usize, 43usize);
+add_sub_const_decimals!(56usize, 12usize, 68usize, 44usize);
+add_sub_const_decimals!(56usize, 11usize, 67usize, 45usize);
+add_sub_const_decimals!(56usize, 10usize, 66usize, 46usize);
+add_sub_const_decimals!(56usize, 9usize, 65usize, 47usize);
+add_sub_const_decimals!(56usize, 8usize, 64usize, 48usize);
+add_sub_const_decimals!(56usize, 7usize, 63usize, 49usize);
+add_sub_const_decimals!(56usize, 6usize, 62usize, 50usize);
+add_sub_const_decimals!(56usize, 5usize, 61usize, 51usize);
+add_sub_const_decimals!(56usize, 4usize, 60usize, 52usize);
+add_sub_const_decimals!(56usize, 3usize, 59usize, 53usize);
+add_sub_const_decimals!(56usize, 2usize, 58usize, 54usize);
+add_sub_const_decimals!(56usize, 1usize, 57usize, 55usize);
+add_sub_const_decimals!(56usize, 0usize, 56usize, 56usize);
+add_sub_const_decimals!(55usize, 64usize, 119usize, 0usize);
+add_sub_const_decimals!(55usize, 63usize, 118usize, 0usize);
+add_sub_const_decimals!(55usize, 62usize, 117usize, 0usize);
+add_sub_const_decimals!(55usize, 61usize, 116usize, 0usize);
+add_sub_const_decimals!(55usize, 60usize, 115usize, 0usize);
+add_sub_const_decimals!(55usize, 59usize, 114usize, 0usize);
+add_sub_const_decimals!(55usize, 58usize, 113usize, 0usize);
+add_sub_const_decimals!(55usize, 57usize, 112usize, 0usize);
+add_sub_const_decimals!(55usize, 56usize, 111usize, 0usize);
+add_sub_const_decimals!(55usize, 55usize, 110usize, 0usize);
+add_sub_const_decimals!(55usize, 54usize, 109usize, 1usize);
+add_sub_const_decimals!(55usize, 53usize, 108usize, 2usize);
+add_sub_const_decimals!(55usize, 52usize, 107usize, 3usize);
+add_sub_const_decimals!(55usize, 51usize, 106usize, 4usize);
+add_sub_const_decimals!(55usize, 50usize, 105usize, 5usize);
+add_sub_const_decimals!(55usize, 49usize, 104usize, 6usize);
+add_sub_const_decimals!(55usize, 48usize, 103usize, 7usize);
+add_sub_const_decimals!(55usize, 47usize, 102usize, 8usize);
+add_sub_const_decimals!(55usize, 46usize, 101usize, 9usize);
+add_sub_const_decimals!(55usize, 45usize, 100usize, 10usize);
+add_sub_const_decimals!(55usize, 44usize, 99usize, 11usize);
+add_sub_const_decimals!(55usize, 43usize, 98usize, 12usize);
+add_sub_const_decimals!(55usize, 42usize, 97usize, 13usize);
+add_sub_const_decimals!(55usize, 41usize, 96usize, 14usize);
+add_sub_const_decimals!(55usize, 40usize, 95usize, 15usize);
+add_sub_const_decimals!(55usize, 39usize, 94usize, 16usize);
+add_sub_const_decimals!(55usize, 38usize, 93usize, 17usize);
+add_sub_const_decimals!(55usize, 37usize, 92usize, 18usize);
+add_sub_const_decimals!(55usize, 36usize, 91usize, 19usize);
+add_sub_const_decimals!(55usize, 35usize, 90usize, 20usize);
+add_sub_const_decimals!(55usize, 34usize, 89usize, 21usize);
+add_sub_const_decimals!(55usize, 33usize, 88usize, 22usize);
+add_sub_const_decimals!(55usize, 32usize, 87usize, 23usize);
+add_sub_const_decimals!(55usize, 31usize, 86usize, 24usize);
+add_sub_const_decimals!(55usize, 30usize, 85usize, 25usize);
+add_sub_const_decimals!(55usize, 29usize, 84usize, 26usize);
+add_sub_const_decimals!(55usize, 28usize, 83usize, 27usize);
+add_sub_const_decimals!(55usize, 27usize, 82usize, 28usize);
+add_sub_const_decimals!(55usize, 26usize, 81usize, 29usize);
+add_sub_const_decimals!(55usize, 25usize, 80usize, 30usize);
+add_sub_const_decimals!(55usize, 24usize, 79usize, 31usize);
+add_sub_const_decimals!(55usize, 23usize, 78usize, 32usize);
+add_sub_const_decimals!(55usize, 22usize, 77usize, 33usize);
+add_sub_const_decimals!(55usize, 21usize, 76usize, 34usize);
+add_sub_const_decimals!(55usize, 20usize, 75usize, 35usize);
+add_sub_const_decimals!(55usize, 19usize, 74usize, 36usize);
+add_sub_const_decimals!(55usize, 18usize, 73usize, 37usize);
+add_sub_const_decimals!(55usize, 17usize, 72usize, 38usize);
+add_sub_const_decimals!(55usize, 16usize, 71usize, 39usize);
+add_sub_const_decimals!(55usize, 15usize, 70usize, 40usize);
+add_sub_const_decimals!(55usize, 14usize, 69usize, 41usize);
+add_sub_const_decimals!(55usize, 13usize, 68usize, 42usize);
+add_sub_const_decimals!(55usize, 12usize, 67usize, 43usize);
+add_sub_const_decimals!(55usize, 11usize, 66usize, 44usize);
+add_sub_const_decimals!(55usize, 10usize, 65usize, 45usize);
+add_sub_const_decimals!(55usize, 9usize, 64usize, 46usize);
+add_sub_const_decimals!(55usize, 8usize, 63usize, 47usize);
+add_sub_const_decimals!(55usize, 7usize, 62usize, 48usize);
+add_sub_const_decimals!(55usize, 6usize, 61usize, 49usize);
+add_sub_const_decimals!(55usize, 5usize, 60usize, 50usize);
+add_sub_const_decimals!(55usize, 4usize, 59usize, 51usize);
+add_sub_const_decimals!(55usize, 3usize, 58usize, 52usize);
+add_sub_const_decimals!(55usize, 2usize, 57usize, 53usize);
+add_sub_const_decimals!(55usize, 1usize, 56usize, 54usize);
+add_sub_const_decimals!(55usize, 0usize, 55usize, 55usize);
+add_sub_const_decimals!(54usize, 64usize, 118usize, 0usize);
+add_sub_const_decimals!(54usize, 63usize, 117usize, 0usize);
+add_sub_const_decimals!(54usize, 62usize, 116usize, 0usize);
+add_sub_const_decimals!(54usize, 61usize, 115usize, 0usize);
+add_sub_const_decimals!(54usize, 60usize, 114usize, 0usize);
+add_sub_const_decimals!(54usize, 59usize, 113usize, 0usize);
+add_sub_const_decimals!(54usize, 58usize, 112usize, 0usize);
+add_sub_const_decimals!(54usize, 57usize, 111usize, 0usize);
+add_sub_const_decimals!(54usize, 56usize, 110usize, 0usize);
+add_sub_const_decimals!(54usize, 55usize, 109usize, 0usize);
+add_sub_const_decimals!(54usize, 54usize, 108usize, 0usize);
+add_sub_const_decimals!(54usize, 53usize, 107usize, 1usize);
+add_sub_const_decimals!(54usize, 52usize, 106usize, 2usize);
+add_sub_const_decimals!(54usize, 51usize, 105usize, 3usize);
+add_sub_const_decimals!(54usize, 50usize, 104usize, 4usize);
+add_sub_const_decimals!(54usize, 49usize, 103usize, 5usize);
+add_sub_const_decimals!(54usize, 48usize, 102usize, 6usize);
+add_sub_const_decimals!(54usize, 47usize, 101usize, 7usize);
+add_sub_const_decimals!(54usize, 46usize, 100usize, 8usize);
+add_sub_const_decimals!(54usize, 45usize, 99usize, 9usize);
+add_sub_const_decimals!(54usize, 44usize, 98usize, 10usize);
+add_sub_const_decimals!(54usize, 43usize, 97usize, 11usize);
+add_sub_const_decimals!(54usize, 42usize, 96usize, 12usize);
+add_sub_const_decimals!(54usize, 41usize, 95usize, 13usize);
+add_sub_const_decimals!(54usize, 40usize, 94usize, 14usize);
+add_sub_const_decimals!(54usize, 39usize, 93usize, 15usize);
+add_sub_const_decimals!(54usize, 38usize, 92usize, 16usize);
+add_sub_const_decimals!(54usize, 37usize, 91usize, 17usize);
+add_sub_const_decimals!(54usize, 36usize, 90usize, 18usize);
+add_sub_const_decimals!(54usize, 35usize, 89usize, 19usize);
+add_sub_const_decimals!(54usize, 34usize, 88usize, 20usize);
+add_sub_const_decimals!(54usize, 33usize, 87usize, 21usize);
+add_sub_const_decimals!(54usize, 32usize, 86usize, 22usize);
+add_sub_const_decimals!(54usize, 31usize, 85usize, 23usize);
+add_sub_const_decimals!(54usize, 30usize, 84usize, 24usize);
+add_sub_const_decimals!(54usize, 29usize, 83usize, 25usize);
+add_sub_const_decimals!(54usize, 28usize, 82usize, 26usize);
+add_sub_const_decimals!(54usize, 27usize, 81usize, 27usize);
+add_sub_const_decimals!(54usize, 26usize, 80usize, 28usize);
+add_sub_const_decimals!(54usize, 25usize, 79usize, 29usize);
+add_sub_const_decimals!(54usize, 24usize, 78usize, 30usize);
+add_sub_const_decimals!(54usize, 23usize, 77usize, 31usize);
+add_sub_const_decimals!(54usize, 22usize, 76usize, 32usize);
+add_sub_const_decimals!(54usize, 21usize, 75usize, 33usize);
+add_sub_const_decimals!(54usize, 20usize, 74usize, 34usize);
+add_sub_const_decimals!(54usize, 19usize, 73usize, 35usize);
+add_sub_const_decimals!(54usize, 18usize, 72usize, 36usize);
+add_sub_const_decimals!(54usize, 17usize, 71usize, 37usize);
+add_sub_const_decimals!(54usize, 16usize, 70usize, 38usize);
+add_sub_const_decimals!(54usize, 15usize, 69usize, 39usize);
+add_sub_const_decimals!(54usize, 14usize, 68usize, 40usize);
+add_sub_const_decimals!(54usize, 13usize, 67usize, 41usize);
+add_sub_const_decimals!(54usize, 12usize, 66usize, 42usize);
+add_sub_const_decimals!(54usize, 11usize, 65usize, 43usize);
+add_sub_const_decimals!(54usize, 10usize, 64usize, 44usize);
+add_sub_const_decimals!(54usize, 9usize, 63usize, 45usize);
+add_sub_const_decimals!(54usize, 8usize, 62usize, 46usize);
+add_sub_const_decimals!(54usize, 7usize, 61usize, 47usize);
+add_sub_const_decimals!(54usize, 6usize, 60usize, 48usize);
+add_sub_const_decimals!(54usize, 5usize, 59usize, 49usize);
+add_sub_const_decimals!(54usize, 4usize, 58usize, 50usize);
+add_sub_const_decimals!(54usize, 3usize, 57usize, 51usize);
+add_sub_const_decimals!(54usize, 2usize, 56usize, 52usize);
+add_sub_const_decimals!(54usize, 1usize, 55usize, 53usize);
+add_sub_const_decimals!(54usize, 0usize, 54usize, 54usize);
+add_sub_const_decimals!(53usize, 64usize, 117usize, 0usize);
+add_sub_const_decimals!(53usize, 63usize, 116usize, 0usize);
+add_sub_const_decimals!(53usize, 62usize, 115usize, 0usize);
+add_sub_const_decimals!(53usize, 61usize, 114usize, 0usize);
+add_sub_const_decimals!(53usize, 60usize, 113usize, 0usize);
+add_sub_const_decimals!(53usize, 59usize, 112usize, 0usize);
+add_sub_const_decimals!(53usize, 58usize, 111usize, 0usize);
+add_sub_const_decimals!(53usize, 57usize, 110usize, 0usize);
+add_sub_const_decimals!(53usize, 56usize, 109usize, 0usize);
+add_sub_const_decimals!(53usize, 55usize, 108usize, 0usize);
+add_sub_const_decimals!(53usize, 54usize, 107usize, 0usize);
+add_sub_const_decimals!(53usize, 53usize, 106usize, 0usize);
+add_sub_const_decimals!(53usize, 52usize, 105usize, 1usize);
+add_sub_const_decimals!(53usize, 51usize, 104usize, 2usize);
+add_sub_const_decimals!(53usize, 50usize, 103usize, 3usize);
+add_sub_const_decimals!(53usize, 49usize, 102usize, 4usize);
+add_sub_const_decimals!(53usize, 48usize, 101usize, 5usize);
+add_sub_const_decimals!(53usize, 47usize, 100usize, 6usize);
+add_sub_const_decimals!(53usize, 46usize, 99usize, 7usize);
+add_sub_const_decimals!(53usize, 45usize, 98usize, 8usize);
+add_sub_const_decimals!(53usize, 44usize, 97usize, 9usize);
+add_sub_const_decimals!(53usize, 43usize, 96usize, 10usize);
+add_sub_const_decimals!(53usize, 42usize, 95usize, 11usize);
+add_sub_const_decimals!(53usize, 41usize, 94usize, 12usize);
+add_sub_const_decimals!(53usize, 40usize, 93usize, 13usize);
+add_sub_const_decimals!(53usize, 39usize, 92usize, 14usize);
+add_sub_const_decimals!(53usize, 38usize, 91usize, 15usize);
+add_sub_const_decimals!(53usize, 37usize, 90usize, 16usize);
+add_sub_const_decimals!(53usize, 36usize, 89usize, 17usize);
+add_sub_const_decimals!(53usize, 35usize, 88usize, 18usize);
+add_sub_const_decimals!(53usize, 34usize, 87usize, 19usize);
+add_sub_const_decimals!(53usize, 33usize, 86usize, 20usize);
+add_sub_const_decimals!(53usize, 32usize, 85usize, 21usize);
+add_sub_const_decimals!(53usize, 31usize, 84usize, 22usize);
+add_sub_const_decimals!(53usize, 30usize, 83usize, 23usize);
+add_sub_const_decimals!(53usize, 29usize, 82usize, 24usize);
+add_sub_const_decimals!(53usize, 28usize, 81usize, 25usize);
+add_sub_const_decimals!(53usize, 27usize, 80usize, 26usize);
+add_sub_const_decimals!(53usize, 26usize, 79usize, 27usize);
+add_sub_const_decimals!(53usize, 25usize, 78usize, 28usize);
+add_sub_const_decimals!(53usize, 24usize, 77usize, 29usize);
+add_sub_const_decimals!(53usize, 23usize, 76usize, 30usize);
+add_sub_const_decimals!(53usize, 22usize, 75usize, 31usize);
+add_sub_const_decimals!(53usize, 21usize, 74usize, 32usize);
+add_sub_const_decimals!(53usize, 20usize, 73usize, 33usize);
+add_sub_const_decimals!(53usize, 19usize, 72usize, 34usize);
+add_sub_const_decimals!(53usize, 18usize, 71usize, 35usize);
+add_sub_const_decimals!(53usize, 17usize, 70usize, 36usize);
+add_sub_const_decimals!(53usize, 16usize, 69usize, 37usize);
+add_sub_const_decimals!(53usize, 15usize, 68usize, 38usize);
+add_sub_const_decimals!(53usize, 14usize, 67usize, 39usize);
+add_sub_const_decimals!(53usize, 13usize, 66usize, 40usize);
+add_sub_const_decimals!(53usize, 12usize, 65usize, 41usize);
+add_sub_const_decimals!(53usize, 11usize, 64usize, 42usize);
+add_sub_const_decimals!(53usize, 10usize, 63usize, 43usize);
+add_sub_const_decimals!(53usize, 9usize, 62usize, 44usize);
+add_sub_const_decimals!(53usize, 8usize, 61usize, 45usize);
+add_sub_const_decimals!(53usize, 7usize, 60usize, 46usize);
+add_sub_const_decimals!(53usize, 6usize, 59usize, 47usize);
+add_sub_const_decimals!(53usize, 5usize, 58usize, 48usize);
+add_sub_const_decimals!(53usize, 4usize, 57usize, 49usize);
+add_sub_const_decimals!(53usize, 3usize, 56usize, 50usize);
+add_sub_const_decimals!(53usize, 2usize, 55usize, 51usize);
+add_sub_const_decimals!(53usize, 1usize, 54usize, 52usize);
+add_sub_const_decimals!(53usize, 0usize, 53usize, 53usize);
+add_sub_const_decimals!(52usize, 64usize, 116usize, 0usize);
+add_sub_const_decimals!(52usize, 63usize, 115usize, 0usize);
+add_sub_const_decimals!(52usize, 62usize, 114usize, 0usize);
+add_sub_const_decimals!(52usize, 61usize, 113usize, 0usize);
+add_sub_const_decimals!(52usize, 60usize, 112usize, 0usize);
+add_sub_const_decimals!(52usize, 59usize, 111usize, 0usize);
+add_sub_const_decimals!(52usize, 58usize, 110usize, 0usize);
+add_sub_const_decimals!(52usize, 57usize, 109usize, 0usize);
+add_sub_const_decimals!(52usize, 56usize, 108usize, 0usize);
+add_sub_const_decimals!(52usize, 55usize, 107usize, 0usize);
+add_sub_const_decimals!(52usize, 54usize, 106usize, 0usize);
+add_sub_const_decimals!(52usize, 53usize, 105usize, 0usize);
+add_sub_const_decimals!(52usize, 52usize, 104usize, 0usize);
+add_sub_const_decimals!(52usize, 51usize, 103usize, 1usize);
+add_sub_const_decimals!(52usize, 50usize, 102usize, 2usize);
+add_sub_const_decimals!(52usize, 49usize, 101usize, 3usize);
+add_sub_const_decimals!(52usize, 48usize, 100usize, 4usize);
+add_sub_const_decimals!(52usize, 47usize, 99usize, 5usize);
+add_sub_const_decimals!(52usize, 46usize, 98usize, 6usize);
+add_sub_const_decimals!(52usize, 45usize, 97usize, 7usize);
+add_sub_const_decimals!(52usize, 44usize, 96usize, 8usize);
+add_sub_const_decimals!(52usize, 43usize, 95usize, 9usize);
+add_sub_const_decimals!(52usize, 42usize, 94usize, 10usize);
+add_sub_const_decimals!(52usize, 41usize, 93usize, 11usize);
+add_sub_const_decimals!(52usize, 40usize, 92usize, 12usize);
+add_sub_const_decimals!(52usize, 39usize, 91usize, 13usize);
+add_sub_const_decimals!(52usize, 38usize, 90usize, 14usize);
+add_sub_const_decimals!(52usize, 37usize, 89usize, 15usize);
+add_sub_const_decimals!(52usize, 36usize, 88usize, 16usize);
+add_sub_const_decimals!(52usize, 35usize, 87usize, 17usize);
+add_sub_const_decimals!(52usize, 34usize, 86usize, 18usize);
+add_sub_const_decimals!(52usize, 33usize, 85usize, 19usize);
+add_sub_const_decimals!(52usize, 32usize, 84usize, 20usize);
+add_sub_const_decimals!(52usize, 31usize, 83usize, 21usize);
+add_sub_const_decimals!(52usize, 30usize, 82usize, 22usize);
+add_sub_const_decimals!(52usize, 29usize, 81usize, 23usize);
+add_sub_const_decimals!(52usize, 28usize, 80usize, 24usize);
+add_sub_const_decimals!(52usize, 27usize, 79usize, 25usize);
+add_sub_const_decimals!(52usize, 26usize, 78usize, 26usize);
+add_sub_const_decimals!(52usize, 25usize, 77usize, 27usize);
+add_sub_const_decimals!(52usize, 24usize, 76usize, 28usize);
+add_sub_const_decimals!(52usize, 23usize, 75usize, 29usize);
+add_sub_const_decimals!(52usize, 22usize, 74usize, 30usize);
+add_sub_const_decimals!(52usize, 21usize, 73usize, 31usize);
+add_sub_const_decimals!(52usize, 20usize, 72usize, 32usize);
+add_sub_const_decimals!(52usize, 19usize, 71usize, 33usize);
+add_sub_const_decimals!(52usize, 18usize, 70usize, 34usize);
+add_sub_const_decimals!(52usize, 17usize, 69usize, 35usize);
+add_sub_const_decimals!(52usize, 16usize, 68usize, 36usize);
+add_sub_const_decimals!(52usize, 15usize, 67usize, 37usize);
+add_sub_const_decimals!(52usize, 14usize, 66usize, 38usize);
+add_sub_const_decimals!(52usize, 13usize, 65usize, 39usize);
+add_sub_const_decimals!(52usize, 12usize, 64usize, 40usize);
+add_sub_const_decimals!(52usize, 11usize, 63usize, 41usize);
+add_sub_const_decimals!(52usize, 10usize, 62usize, 42usize);
+add_sub_const_decimals!(52usize, 9usize, 61usize, 43usize);
+add_sub_const_decimals!(52usize, 8usize, 60usize, 44usize);
+add_sub_const_decimals!(52usize, 7usize, 59usize, 45usize);
+add_sub_const_decimals!(52usize, 6usize, 58usize, 46usize);
+add_sub_const_decimals!(52usize, 5usize, 57usize, 47usize);
+add_sub_const_decimals!(52usize, 4usize, 56usize, 48usize);
+add_sub_const_decimals!(52usize, 3usize, 55usize, 49usize);
+add_sub_const_decimals!(52usize, 2usize, 54usize, 50usize);
+add_sub_const_decimals!(52usize, 1usize, 53usize, 51usize);
+add_sub_const_decimals!(52usize, 0usize, 52usize, 52usize);
+add_sub_const_decimals!(51usize, 64usize, 115usize, 0usize);
+add_sub_const_decimals!(51usize, 63usize, 114usize, 0usize);
+add_sub_const_decimals!(51usize, 62usize, 113usize, 0usize);
+add_sub_const_decimals!(51usize, 61usize, 112usize, 0usize);
+add_sub_const_decimals!(51usize, 60usize, 111usize, 0usize);
+add_sub_const_decimals!(51usize, 59usize, 110usize, 0usize);
+add_sub_const_decimals!(51usize, 58usize, 109usize, 0usize);
+add_sub_const_decimals!(51usize, 57usize, 108usize, 0usize);
+add_sub_const_decimals!(51usize, 56usize, 107usize, 0usize);
+add_sub_const_decimals!(51usize, 55usize, 106usize, 0usize);
+add_sub_const_decimals!(51usize, 54usize, 105usize, 0usize);
+add_sub_const_decimals!(51usize, 53usize, 104usize, 0usize);
+add_sub_const_decimals!(51usize, 52usize, 103usize, 0usize);
+add_sub_const_decimals!(51usize, 51usize, 102usize, 0usize);
+add_sub_const_decimals!(51usize, 50usize, 101usize, 1usize);
+add_sub_const_decimals!(51usize, 49usize, 100usize, 2usize);
+add_sub_const_decimals!(51usize, 48usize, 99usize, 3usize);
+add_sub_const_decimals!(51usize, 47usize, 98usize, 4usize);
+add_sub_const_decimals!(51usize, 46usize, 97usize, 5usize);
+add_sub_const_decimals!(51usize, 45usize, 96usize, 6usize);
+add_sub_const_decimals!(51usize, 44usize, 95usize, 7usize);
+add_sub_const_decimals!(51usize, 43usize, 94usize, 8usize);
+add_sub_const_decimals!(51usize, 42usize, 93usize, 9usize);
+add_sub_const_decimals!(51usize, 41usize, 92usize, 10usize);
+add_sub_const_decimals!(51usize, 40usize, 91usize, 11usize);
+add_sub_const_decimals!(51usize, 39usize, 90usize, 12usize);
+add_sub_const_decimals!(51usize, 38usize, 89usize, 13usize);
+add_sub_const_decimals!(51usize, 37usize, 88usize, 14usize);
+add_sub_const_decimals!(51usize, 36usize, 87usize, 15usize);
+add_sub_const_decimals!(51usize, 35usize, 86usize, 16usize);
+add_sub_const_decimals!(51usize, 34usize, 85usize, 17usize);
+add_sub_const_decimals!(51usize, 33usize, 84usize, 18usize);
+add_sub_const_decimals!(51usize, 32usize, 83usize, 19usize);
+add_sub_const_decimals!(51usize, 31usize, 82usize, 20usize);
+add_sub_const_decimals!(51usize, 30usize, 81usize, 21usize);
+add_sub_const_decimals!(51usize, 29usize, 80usize, 22usize);
+add_sub_const_decimals!(51usize, 28usize, 79usize, 23usize);
+add_sub_const_decimals!(51usize, 27usize, 78usize, 24usize);
+add_sub_const_decimals!(51usize, 26usize, 77usize, 25usize);
+add_sub_const_decimals!(51usize, 25usize, 76usize, 26usize);
+add_sub_const_decimals!(51usize, 24usize, 75usize, 27usize);
+add_sub_const_decimals!(51usize, 23usize, 74usize, 28usize);
+add_sub_const_decimals!(51usize, 22usize, 73usize, 29usize);
+add_sub_const_decimals!(51usize, 21usize, 72usize, 30usize);
+add_sub_const_decimals!(51usize, 20usize, 71usize, 31usize);
+add_sub_const_decimals!(51usize, 19usize, 70usize, 32usize);
+add_sub_const_decimals!(51usize, 18usize, 69usize, 33usize);
+add_sub_const_decimals!(51usize, 17usize, 68usize, 34usize);
+add_sub_const_decimals!(51usize, 16usize, 67usize, 35usize);
+add_sub_const_decimals!(51usize, 15usize, 66usize, 36usize);
+add_sub_const_decimals!(51usize, 14usize, 65usize, 37usize);
+add_sub_const_decimals!(51usize, 13usize, 64usize, 38usize);
+add_sub_const_decimals!(51usize, 12usize, 63usize, 39usize);
+add_sub_const_decimals!(51usize, 11usize, 62usize, 40usize);
+add_sub_const_decimals!(51usize, 10usize, 61usize, 41usize);
+add_sub_const_decimals!(51usize, 9usize, 60usize, 42usize);
+add_sub_const_decimals!(51usize, 8usize, 59usize, 43usize);
+add_sub_const_decimals!(51usize, 7usize, 58usize, 44usize);
+add_sub_const_decimals!(51usize, 6usize, 57usize, 45usize);
+add_sub_const_decimals!(51usize, 5usize, 56usize, 46usize);
+add_sub_const_decimals!(51usize, 4usize, 55usize, 47usize);
+add_sub_const_decimals!(51usize, 3usize, 54usize, 48usize);
+add_sub_const_decimals!(51usize, 2usize, 53usize, 49usize);
+add_sub_const_decimals!(51usize, 1usize, 52usize, 50usize);
+add_sub_const_decimals!(51usize, 0usize, 51usize, 51usize);
+add_sub_const_decimals!(50usize, 64usize, 114usize, 0usize);
+add_sub_const_decimals!(50usize, 63usize, 113usize, 0usize);
+add_sub_const_decimals!(50usize, 62usize, 112usize, 0usize);
+add_sub_const_decimals!(50usize, 61usize, 111usize, 0usize);
+add_sub_const_decimals!(50usize, 60usize, 110usize, 0usize);
+add_sub_const_decimals!(50usize, 59usize, 109usize, 0usize);
+add_sub_const_decimals!(50usize, 58usize, 108usize, 0usize);
+add_sub_const_decimals!(50usize, 57usize, 107usize, 0usize);
+add_sub_const_decimals!(50usize, 56usize, 106usize, 0usize);
+add_sub_const_decimals!(50usize, 55usize, 105usize, 0usize);
+add_sub_const_decimals!(50usize, 54usize, 104usize, 0usize);
+add_sub_const_decimals!(50usize, 53usize, 103usize, 0usize);
+add_sub_const_decimals!(50usize, 52usize, 102usize, 0usize);
+add_sub_const_decimals!(50usize, 51usize, 101usize, 0usize);
+add_sub_const_decimals!(50usize, 50usize, 100usize, 0usize);
+add_sub_const_decimals!(50usize, 49usize, 99usize, 1usize);
+add_sub_const_decimals!(50usize, 48usize, 98usize, 2usize);
+add_sub_const_decimals!(50usize, 47usize, 97usize, 3usize);
+add_sub_const_decimals!(50usize, 46usize, 96usize, 4usize);
+add_sub_const_decimals!(50usize, 45usize, 95usize, 5usize);
+add_sub_const_decimals!(50usize, 44usize, 94usize, 6usize);
+add_sub_const_decimals!(50usize, 43usize, 93usize, 7usize);
+add_sub_const_decimals!(50usize, 42usize, 92usize, 8usize);
+add_sub_const_decimals!(50usize, 41usize, 91usize, 9usize);
+add_sub_const_decimals!(50usize, 40usize, 90usize, 10usize);
+add_sub_const_decimals!(50usize, 39usize, 89usize, 11usize);
+add_sub_const_decimals!(50usize, 38usize, 88usize, 12usize);
+add_sub_const_decimals!(50usize, 37usize, 87usize, 13usize);
+add_sub_const_decimals!(50usize, 36usize, 86usize, 14usize);
+add_sub_const_decimals!(50usize, 35usize, 85usize, 15usize);
+add_sub_const_decimals!(50usize, 34usize, 84usize, 16usize);
+add_sub_const_decimals!(50usize, 33usize, 83usize, 17usize);
+add_sub_const_decimals!(50usize, 32usize, 82usize, 18usize);
+add_sub_const_decimals!(50usize, 31usize, 81usize, 19usize);
+add_sub_const_decimals!(50usize, 30usize, 80usize, 20usize);
+add_sub_const_decimals!(50usize, 29usize, 79usize, 21usize);
+add_sub_const_decimals!(50usize, 28usize, 78usize, 22usize);
+add_sub_const_decimals!(50usize, 27usize, 77usize, 23usize);
+add_sub_const_decimals!(50usize, 26usize, 76usize, 24usize);
+add_sub_const_decimals!(50usize, 25usize, 75usize, 25usize);
+add_sub_const_decimals!(50usize, 24usize, 74usize, 26usize);
+add_sub_const_decimals!(50usize, 23usize, 73usize, 27usize);
+add_sub_const_decimals!(50usize, 22usize, 72usize, 28usize);
+add_sub_const_decimals!(50usize, 21usize, 71usize, 29usize);
+add_sub_const_decimals!(50usize, 20usize, 70usize, 30usize);
+add_sub_const_decimals!(50usize, 19usize, 69usize, 31usize);
+add_sub_const_decimals!(50usize, 18usize, 68usize, 32usize);
+add_sub_const_decimals!(50usize, 17usize, 67usize, 33usize);
+add_sub_const_decimals!(50usize, 16usize, 66usize, 34usize);
+add_sub_const_decimals!(50usize, 15usize, 65usize, 35usize);
+add_sub_const_decimals!(50usize, 14usize, 64usize, 36usize);
+add_sub_const_decimals!(50usize, 13usize, 63usize, 37usize);
+add_sub_const_decimals!(50usize, 12usize, 62usize, 38usize);
+add_sub_const_decimals!(50usize, 11usize, 61usize, 39usize);
+add_sub_const_decimals!(50usize, 10usize, 60usize, 40usize);
+add_sub_const_decimals!(50usize, 9usize, 59usize, 41usize);
+add_sub_const_decimals!(50usize, 8usize, 58usize, 42usize);
+add_sub_const_decimals!(50usize, 7usize, 57usize, 43usize);
+add_sub_const_decimals!(50usize, 6usize, 56usize, 44usize);
+add_sub_const_decimals!(50usize, 5usize, 55usize, 45usize);
+add_sub_const_decimals!(50usize, 4usize, 54usize, 46usize);
+add_sub_const_decimals!(50usize, 3usize, 53usize, 47usize);
+add_sub_const_decimals!(50usize, 2usize, 52usize, 48usize);
+add_sub_const_decimals!(50usize, 1usize, 51usize, 49usize);
+add_sub_const_decimals!(50usize, 0usize, 50usize, 50usize);
+add_sub_const_decimals!(49usize, 64usize, 113usize, 0usize);
+add_sub_const_decimals!(49usize, 63usize, 112usize, 0usize);
+add_sub_const_decimals!(49usize, 62usize, 111usize, 0usize);
+add_sub_const_decimals!(49usize, 61usize, 110usize, 0usize);
+add_sub_const_decimals!(49usize, 60usize, 109usize, 0usize);
+add_sub_const_decimals!(49usize, 59usize, 108usize, 0usize);
+add_sub_const_decimals!(49usize, 58usize, 107usize, 0usize);
+add_sub_const_decimals!(49usize, 57usize, 106usize, 0usize);
+add_sub_const_decimals!(49usize, 56usize, 105usize, 0usize);
+add_sub_const_decimals!(49usize, 55usize, 104usize, 0usize);
+add_sub_const_decimals!(49usize, 54usize, 103usize, 0usize);
+add_sub_const_decimals!(49usize, 53usize, 102usize, 0usize);
+add_sub_const_decimals!(49usize, 52usize, 101usize, 0usize);
+add_sub_const_decimals!(49usize, 51usize, 100usize, 0usize);
+add_sub_const_decimals!(49usize, 50usize, 99usize, 0usize);
+add_sub_const_decimals!(49usize, 49usize, 98usize, 0usize);
+add_sub_const_decimals!(49usize, 48usize, 97usize, 1usize);
+add_sub_const_decimals!(49usize, 47usize, 96usize, 2usize);
+add_sub_const_decimals!(49usize, 46usize, 95usize, 3usize);
+add_sub_const_decimals!(49usize, 45usize, 94usize, 4usize);
+add_sub_const_decimals!(49usize, 44usize, 93usize, 5usize);
+add_sub_const_decimals!(49usize, 43usize, 92usize, 6usize);
+add_sub_const_decimals!(49usize, 42usize, 91usize, 7usize);
+add_sub_const_decimals!(49usize, 41usize, 90usize, 8usize);
+add_sub_const_decimals!(49usize, 40usize, 89usize, 9usize);
+add_sub_const_decimals!(49usize, 39usize, 88usize, 10usize);
+add_sub_const_decimals!(49usize, 38usize, 87usize, 11usize);
+add_sub_const_decimals!(49usize, 37usize, 86usize, 12usize);
+add_sub_const_decimals!(49usize, 36usize, 85usize, 13usize);
+add_sub_const_decimals!(49usize, 35usize, 84usize, 14usize);
+add_sub_const_decimals!(49usize, 34usize, 83usize, 15usize);
+add_sub_const_decimals!(49usize, 33usize, 82usize, 16usize);
+add_sub_const_decimals!(49usize, 32usize, 81usize, 17usize);
+add_sub_const_decimals!(49usize, 31usize, 80usize, 18usize);
+add_sub_const_decimals!(49usize, 30usize, 79usize, 19usize);
+add_sub_const_decimals!(49usize, 29usize, 78usize, 20usize);
+add_sub_const_decimals!(49usize, 28usize, 77usize, 21usize);
+add_sub_const_decimals!(49usize, 27usize, 76usize, 22usize);
+add_sub_const_decimals!(49usize, 26usize, 75usize, 23usize);
+add_sub_const_decimals!(49usize, 25usize, 74usize, 24usize);
+add_sub_const_decimals!(49usize, 24usize, 73usize, 25usize);
+add_sub_const_decimals!(49usize, 23usize, 72usize, 26usize);
+add_sub_const_decimals!(49usize, 22usize, 71usize, 27usize);
+add_sub_const_decimals!(49usize, 21usize, 70usize, 28usize);
+add_sub_const_decimals!(49usize, 20usize, 69usize, 29usize);
+add_sub_const_decimals!(49usize, 19usize, 68usize, 30usize);
+add_sub_const_decimals!(49usize, 18usize, 67usize, 31usize);
+add_sub_const_decimals!(49usize, 17usize, 66usize, 32usize);
+add_sub_const_decimals!(49usize, 16usize, 65usize, 33usize);
+add_sub_const_decimals!(49usize, 15usize, 64usize, 34usize);
+add_sub_const_decimals!(49usize, 14usize, 63usize, 35usize);
+add_sub_const_decimals!(49usize, 13usize, 62usize, 36usize);
+add_sub_const_decimals!(49usize, 12usize, 61usize, 37usize);
+add_sub_const_decimals!(49usize, 11usize, 60usize, 38usize);
+add_sub_const_decimals!(49usize, 10usize, 59usize, 39usize);
+add_sub_const_decimals!(49usize, 9usize, 58usize, 40usize);
+add_sub_const_decimals!(49usize, 8usize, 57usize, 41usize);
+add_sub_const_decimals!(49usize, 7usize, 56usize, 42usize);
+add_sub_const_decimals!(49usize, 6usize, 55usize, 43usize);
+add_sub_const_decimals!(49usize, 5usize, 54usize, 44usize);
+add_sub_const_decimals!(49usize, 4usize, 53usize, 45usize);
+add_sub_const_decimals!(49usize, 3usize, 52usize, 46usize);
+add_sub_const_decimals!(49usize, 2usize, 51usize, 47usize);
+add_sub_const_decimals!(49usize, 1usize, 50usize, 48usize);
+add_sub_const_decimals!(49usize, 0usize, 49usize, 49usize);
+add_sub_const_decimals!(48usize, 64usize, 112usize, 0usize);
+add_sub_const_decimals!(48usize, 63usize, 111usize, 0usize);
+add_sub_const_decimals!(48usize, 62usize, 110usize, 0usize);
+add_sub_const_decimals!(48usize, 61usize, 109usize, 0usize);
+add_sub_const_decimals!(48usize, 60usize, 108usize, 0usize);
+add_sub_const_decimals!(48usize, 59usize, 107usize, 0usize);
+add_sub_const_decimals!(48usize, 58usize, 106usize, 0usize);
+add_sub_const_decimals!(48usize, 57usize, 105usize, 0usize);
+add_sub_const_decimals!(48usize, 56usize, 104usize, 0usize);
+add_sub_const_decimals!(48usize, 55usize, 103usize, 0usize);
+add_sub_const_decimals!(48usize, 54usize, 102usize, 0usize);
+add_sub_const_decimals!(48usize, 53usize, 101usize, 0usize);
+add_sub_const_decimals!(48usize, 52usize, 100usize, 0usize);
+add_sub_const_decimals!(48usize, 51usize, 99usize, 0usize);
+add_sub_const_decimals!(48usize, 50usize, 98usize, 0usize);
+add_sub_const_decimals!(48usize, 49usize, 97usize, 0usize);
+add_sub_const_decimals!(48usize, 48usize, 96usize, 0usize);
+add_sub_const_decimals!(48usize, 47usize, 95usize, 1usize);
+add_sub_const_decimals!(48usize, 46usize, 94usize, 2usize);
+add_sub_const_decimals!(48usize, 45usize, 93usize, 3usize);
+add_sub_const_decimals!(48usize, 44usize, 92usize, 4usize);
+add_sub_const_decimals!(48usize, 43usize, 91usize, 5usize);
+add_sub_const_decimals!(48usize, 42usize, 90usize, 6usize);
+add_sub_const_decimals!(48usize, 41usize, 89usize, 7usize);
+add_sub_const_decimals!(48usize, 40usize, 88usize, 8usize);
+add_sub_const_decimals!(48usize, 39usize, 87usize, 9usize);
+add_sub_const_decimals!(48usize, 38usize, 86usize, 10usize);
+add_sub_const_decimals!(48usize, 37usize, 85usize, 11usize);
+add_sub_const_decimals!(48usize, 36usize, 84usize, 12usize);
+add_sub_const_decimals!(48usize, 35usize, 83usize, 13usize);
+add_sub_const_decimals!(48usize, 34usize, 82usize, 14usize);
+add_sub_const_decimals!(48usize, 33usize, 81usize, 15usize);
+add_sub_const_decimals!(48usize, 32usize, 80usize, 16usize);
+add_sub_const_decimals!(48usize, 31usize, 79usize, 17usize);
+add_sub_const_decimals!(48usize, 30usize, 78usize, 18usize);
+add_sub_const_decimals!(48usize, 29usize, 77usize, 19usize);
+add_sub_const_decimals!(48usize, 28usize, 76usize, 20usize);
+add_sub_const_decimals!(48usize, 27usize, 75usize, 21usize);
+add_sub_const_decimals!(48usize, 26usize, 74usize, 22usize);
+add_sub_const_decimals!(48usize, 25usize, 73usize, 23usize);
+add_sub_const_decimals!(48usize, 24usize, 72usize, 24usize);
+add_sub_const_decimals!(48usize, 23usize, 71usize, 25usize);
+add_sub_const_decimals!(48usize, 22usize, 70usize, 26usize);
+add_sub_const_decimals!(48usize, 21usize, 69usize, 27usize);
+add_sub_const_decimals!(48usize, 20usize, 68usize, 28usize);
+add_sub_const_decimals!(48usize, 19usize, 67usize, 29usize);
+add_sub_const_decimals!(48usize, 18usize, 66usize, 30usize);
+add_sub_const_decimals!(48usize, 17usize, 65usize, 31usize);
+add_sub_const_decimals!(48usize, 16usize, 64usize, 32usize);
+add_sub_const_decimals!(48usize, 15usize, 63usize, 33usize);
+add_sub_const_decimals!(48usize, 14usize, 62usize, 34usize);
+add_sub_const_decimals!(48usize, 13usize, 61usize, 35usize);
+add_sub_const_decimals!(48usize, 12usize, 60usize, 36usize);
+add_sub_const_decimals!(48usize, 11usize, 59usize, 37usize);
+add_sub_const_decimals!(48usize, 10usize, 58usize, 38usize);
+add_sub_const_decimals!(48usize, 9usize, 57usize, 39usize);
+add_sub_const_decimals!(48usize, 8usize, 56usize, 40usize);
+add_sub_const_decimals!(48usize, 7usize, 55usize, 41usize);
+add_sub_const_decimals!(48usize, 6usize, 54usize, 42usize);
+add_sub_const_decimals!(48usize, 5usize, 53usize, 43usize);
+add_sub_const_decimals!(48usize, 4usize, 52usize, 44usize);
+add_sub_const_decimals!(48usize, 3usize, 51usize, 45usize);
+add_sub_const_decimals!(48usize, 2usize, 50usize, 46usize);
+add_sub_const_decimals!(48usize, 1usize, 49usize, 47usize);
+add_sub_const_decimals!(48usize, 0usize, 48usize, 48usize);
+add_sub_const_decimals!(47usize, 64usize, 111usize, 0usize);
+add_sub_const_decimals!(47usize, 63usize, 110usize, 0usize);
+add_sub_const_decimals!(47usize, 62usize, 109usize, 0usize);
+add_sub_const_decimals!(47usize, 61usize, 108usize, 0usize);
+add_sub_const_decimals!(47usize, 60usize, 107usize, 0usize);
+add_sub_const_decimals!(47usize, 59usize, 106usize, 0usize);
+add_sub_const_decimals!(47usize, 58usize, 105usize, 0usize);
+add_sub_const_decimals!(47usize, 57usize, 104usize, 0usize);
+add_sub_const_decimals!(47usize, 56usize, 103usize, 0usize);
+add_sub_const_decimals!(47usize, 55usize, 102usize, 0usize);
+add_sub_const_decimals!(47usize, 54usize, 101usize, 0usize);
+add_sub_const_decimals!(47usize, 53usize, 100usize, 0usize);
+add_sub_const_decimals!(47usize, 52usize, 99usize, 0usize);
+add_sub_const_decimals!(47usize, 51usize, 98usize, 0usize);
+add_sub_const_decimals!(47usize, 50usize, 97usize, 0usize);
+add_sub_const_decimals!(47usize, 49usize, 96usize, 0usize);
+add_sub_const_decimals!(47usize, 48usize, 95usize, 0usize);
+add_sub_const_decimals!(47usize, 47usize, 94usize, 0usize);
+add_sub_const_decimals!(47usize, 46usize, 93usize, 1usize);
+add_sub_const_decimals!(47usize, 45usize, 92usize, 2usize);
+add_sub_const_decimals!(47usize, 44usize, 91usize, 3usize);
+add_sub_const_decimals!(47usize, 43usize, 90usize, 4usize);
+add_sub_const_decimals!(47usize, 42usize, 89usize, 5usize);
+add_sub_const_decimals!(47usize, 41usize, 88usize, 6usize);
+add_sub_const_decimals!(47usize, 40usize, 87usize, 7usize);
+add_sub_const_decimals!(47usize, 39usize, 86usize, 8usize);
+add_sub_const_decimals!(47usize, 38usize, 85usize, 9usize);
+add_sub_const_decimals!(47usize, 37usize, 84usize, 10usize);
+add_sub_const_decimals!(47usize, 36usize, 83usize, 11usize);
+add_sub_const_decimals!(47usize, 35usize, 82usize, 12usize);
+add_sub_const_decimals!(47usize, 34usize, 81usize, 13usize);
+add_sub_const_decimals!(47usize, 33usize, 80usize, 14usize);
+add_sub_const_decimals!(47usize, 32usize, 79usize, 15usize);
+add_sub_const_decimals!(47usize, 31usize, 78usize, 16usize);
+add_sub_const_decimals!(47usize, 30usize, 77usize, 17usize);
+add_sub_const_decimals!(47usize, 29usize, 76usize, 18usize);
+add_sub_const_decimals!(47usize, 28usize, 75usize, 19usize);
+add_sub_const_decimals!(47usize, 27usize, 74usize, 20usize);
+add_sub_const_decimals!(47usize, 26usize, 73usize, 21usize);
+add_sub_const_decimals!(47usize, 25usize, 72usize, 22usize);
+add_sub_const_decimals!(47usize, 24usize, 71usize, 23usize);
+add_sub_const_decimals!(47usize, 23usize, 70usize, 24usize);
+add_sub_const_decimals!(47usize, 22usize, 69usize, 25usize);
+add_sub_const_decimals!(47usize, 21usize, 68usize, 26usize);
+add_sub_const_decimals!(47usize, 20usize, 67usize, 27usize);
+add_sub_const_decimals!(47usize, 19usize, 66usize, 28usize);
+add_sub_const_decimals!(47usize, 18usize, 65usize, 29usize);
+add_sub_const_decimals!(47usize, 17usize, 64usize, 30usize);
+add_sub_const_decimals!(47usize, 16usize, 63usize, 31usize);
+add_sub_const_decimals!(47usize, 15usize, 62usize, 32usize);
+add_sub_const_decimals!(47usize, 14usize, 61usize, 33usize);
+add_sub_const_decimals!(47usize, 13usize, 60usize, 34usize);
+add_sub_const_decimals!(47usize, 12usize, 59usize, 35usize);
+add_sub_const_decimals!(47usize, 11usize, 58usize, 36usize);
+add_sub_const_decimals!(47usize, 10usize, 57usize, 37usize);
+add_sub_const_decimals!(47usize, 9usize, 56usize, 38usize);
+add_sub_const_decimals!(47usize, 8usize, 55usize, 39usize);
+add_sub_const_decimals!(47usize, 7usize, 54usize, 40usize);
+add_sub_const_decimals!(47usize, 6usize, 53usize, 41usize);
+add_sub_const_decimals!(47usize, 5usize, 52usize, 42usize);
+add_sub_const_decimals!(47usize, 4usize, 51usize, 43usize);
+add_sub_const_decimals!(47usize, 3usize, 50usize, 44usize);
+add_sub_const_decimals!(47usize, 2usize, 49usize, 45usize);
+add_sub_const_decimals!(47usize, 1usize, 48usize, 46usize);
+add_sub_const_decimals!(47usize, 0usize, 47usize, 47usize);
+add_sub_const_decimals!(46usize, 64usize, 110usize, 0usize);
+add_sub_const_decimals!(46usize, 63usize, 109usize, 0usize);
+add_sub_const_decimals!(46usize, 62usize, 108usize, 0usize);
+add_sub_const_decimals!(46usize, 61usize, 107usize, 0usize);
+add_sub_const_decimals!(46usize, 60usize, 106usize, 0usize);
+add_sub_const_decimals!(46usize, 59usize, 105usize, 0usize);
+add_sub_const_decimals!(46usize, 58usize, 104usize, 0usize);
+add_sub_const_decimals!(46usize, 57usize, 103usize, 0usize);
+add_sub_const_decimals!(46usize, 56usize, 102usize, 0usize);
+add_sub_const_decimals!(46usize, 55usize, 101usize, 0usize);
+add_sub_const_decimals!(46usize, 54usize, 100usize, 0usize);
+add_sub_const_decimals!(46usize, 53usize, 99usize, 0usize);
+add_sub_const_decimals!(46usize, 52usize, 98usize, 0usize);
+add_sub_const_decimals!(46usize, 51usize, 97usize, 0usize);
+add_sub_const_decimals!(46usize, 50usize, 96usize, 0usize);
+add_sub_const_decimals!(46usize, 49usize, 95usize, 0usize);
+add_sub_const_decimals!(46usize, 48usize, 94usize, 0usize);
+add_sub_const_decimals!(46usize, 47usize, 93usize, 0usize);
+add_sub_const_decimals!(46usize, 46usize, 92usize, 0usize);
+add_sub_const_decimals!(46usize, 45usize, 91usize, 1usize);
+add_sub_const_decimals!(46usize, 44usize, 90usize, 2usize);
+add_sub_const_decimals!(46usize, 43usize, 89usize, 3usize);
+add_sub_const_decimals!(46usize, 42usize, 88usize, 4usize);
+add_sub_const_decimals!(46usize, 41usize, 87usize, 5usize);
+add_sub_const_decimals!(46usize, 40usize, 86usize, 6usize);
+add_sub_const_decimals!(46usize, 39usize, 85usize, 7usize);
+add_sub_const_decimals!(46usize, 38usize, 84usize, 8usize);
+add_sub_const_decimals!(46usize, 37usize, 83usize, 9usize);
+add_sub_const_decimals!(46usize, 36usize, 82usize, 10usize);
+add_sub_const_decimals!(46usize, 35usize, 81usize, 11usize);
+add_sub_const_decimals!(46usize, 34usize, 80usize, 12usize);
+add_sub_const_decimals!(46usize, 33usize, 79usize, 13usize);
+add_sub_const_decimals!(46usize, 32usize, 78usize, 14usize);
+add_sub_const_decimals!(46usize, 31usize, 77usize, 15usize);
+add_sub_const_decimals!(46usize, 30usize, 76usize, 16usize);
+add_sub_const_decimals!(46usize, 29usize, 75usize, 17usize);
+add_sub_const_decimals!(46usize, 28usize, 74usize, 18usize);
+add_sub_const_decimals!(46usize, 27usize, 73usize, 19usize);
+add_sub_const_decimals!(46usize, 26usize, 72usize, 20usize);
+add_sub_const_decimals!(46usize, 25usize, 71usize, 21usize);
+add_sub_const_decimals!(46usize, 24usize, 70usize, 22usize);
+add_sub_const_decimals!(46usize, 23usize, 69usize, 23usize);
+add_sub_const_decimals!(46usize, 22usize, 68usize, 24usize);
+add_sub_const_decimals!(46usize, 21usize, 67usize, 25usize);
+add_sub_const_decimals!(46usize, 20usize, 66usize, 26usize);
+add_sub_const_decimals!(46usize, 19usize, 65usize, 27usize);
+add_sub_const_decimals!(46usize, 18usize, 64usize, 28usize);
+add_sub_const_decimals!(46usize, 17usize, 63usize, 29usize);
+add_sub_const_decimals!(46usize, 16usize, 62usize, 30usize);
+add_sub_const_decimals!(46usize, 15usize, 61usize, 31usize);
+add_sub_const_decimals!(46usize, 14usize, 60usize, 32usize);
+add_sub_const_decimals!(46usize, 13usize, 59usize, 33usize);
+add_sub_const_decimals!(46usize, 12usize, 58usize, 34usize);
+add_sub_const_decimals!(46usize, 11usize, 57usize, 35usize);
+add_sub_const_decimals!(46usize, 10usize, 56usize, 36usize);
+add_sub_const_decimals!(46usize, 9usize, 55usize, 37usize);
+add_sub_const_decimals!(46usize, 8usize, 54usize, 38usize);
+add_sub_const_decimals!(46usize, 7usize, 53usize, 39usize);
+add_sub_const_decimals!(46usize, 6usize, 52usize, 40usize);
+add_sub_const_decimals!(46usize, 5usize, 51usize, 41usize);
+add_sub_const_decimals!(46usize, 4usize, 50usize, 42usize);
+add_sub_const_decimals!(46usize, 3usize, 49usize, 43usize);
+add_sub_const_decimals!(46usize, 2usize, 48usize, 44usize);
+add_sub_const_decimals!(46usize, 1usize, 47usize, 45usize);
+add_sub_const_decimals!(46usize, 0usize, 46usize, 46usize);
+add_sub_const_decimals!(45usize, 64usize, 109usize, 0usize);
+add_sub_const_decimals!(45usize, 63usize, 108usize, 0usize);
+add_sub_const_decimals!(45usize, 62usize, 107usize, 0usize);
+add_sub_const_decimals!(45usize, 61usize, 106usize, 0usize);
+add_sub_const_decimals!(45usize, 60usize, 105usize, 0usize);
+add_sub_const_decimals!(45usize, 59usize, 104usize, 0usize);
+add_sub_const_decimals!(45usize, 58usize, 103usize, 0usize);
+add_sub_const_decimals!(45usize, 57usize, 102usize, 0usize);
+add_sub_const_decimals!(45usize, 56usize, 101usize, 0usize);
+add_sub_const_decimals!(45usize, 55usize, 100usize, 0usize);
+add_sub_const_decimals!(45usize, 54usize, 99usize, 0usize);
+add_sub_const_decimals!(45usize, 53usize, 98usize, 0usize);
+add_sub_const_decimals!(45usize, 52usize, 97usize, 0usize);
+add_sub_const_decimals!(45usize, 51usize, 96usize, 0usize);
+add_sub_const_decimals!(45usize, 50usize, 95usize, 0usize);
+add_sub_const_decimals!(45usize, 49usize, 94usize, 0usize);
+add_sub_const_decimals!(45usize, 48usize, 93usize, 0usize);
+add_sub_const_decimals!(45usize, 47usize, 92usize, 0usize);
+add_sub_const_decimals!(45usize, 46usize, 91usize, 0usize);
+add_sub_const_decimals!(45usize, 45usize, 90usize, 0usize);
+add_sub_const_decimals!(45usize, 44usize, 89usize, 1usize);
+add_sub_const_decimals!(45usize, 43usize, 88usize, 2usize);
+add_sub_const_decimals!(45usize, 42usize, 87usize, 3usize);
+add_sub_const_decimals!(45usize, 41usize, 86usize, 4usize);
+add_sub_const_decimals!(45usize, 40usize, 85usize, 5usize);
+add_sub_const_decimals!(45usize, 39usize, 84usize, 6usize);
+add_sub_const_decimals!(45usize, 38usize, 83usize, 7usize);
+add_sub_const_decimals!(45usize, 37usize, 82usize, 8usize);
+add_sub_const_decimals!(45usize, 36usize, 81usize, 9usize);
+add_sub_const_decimals!(45usize, 35usize, 80usize, 10usize);
+add_sub_const_decimals!(45usize, 34usize, 79usize, 11usize);
+add_sub_const_decimals!(45usize, 33usize, 78usize, 12usize);
+add_sub_const_decimals!(45usize, 32usize, 77usize, 13usize);
+add_sub_const_decimals!(45usize, 31usize, 76usize, 14usize);
+add_sub_const_decimals!(45usize, 30usize, 75usize, 15usize);
+add_sub_const_decimals!(45usize, 29usize, 74usize, 16usize);
+add_sub_const_decimals!(45usize, 28usize, 73usize, 17usize);
+add_sub_const_decimals!(45usize, 27usize, 72usize, 18usize);
+add_sub_const_decimals!(45usize, 26usize, 71usize, 19usize);
+add_sub_const_decimals!(45usize, 25usize, 70usize, 20usize);
+add_sub_const_decimals!(45usize, 24usize, 69usize, 21usize);
+add_sub_const_decimals!(45usize, 23usize, 68usize, 22usize);
+add_sub_const_decimals!(45usize, 22usize, 67usize, 23usize);
+add_sub_const_decimals!(45usize, 21usize, 66usize, 24usize);
+add_sub_const_decimals!(45usize, 20usize, 65usize, 25usize);
+add_sub_const_decimals!(45usize, 19usize, 64usize, 26usize);
+add_sub_const_decimals!(45usize, 18usize, 63usize, 27usize);
+add_sub_const_decimals!(45usize, 17usize, 62usize, 28usize);
+add_sub_const_decimals!(45usize, 16usize, 61usize, 29usize);
+add_sub_const_decimals!(45usize, 15usize, 60usize, 30usize);
+add_sub_const_decimals!(45usize, 14usize, 59usize, 31usize);
+add_sub_const_decimals!(45usize, 13usize, 58usize, 32usize);
+add_sub_const_decimals!(45usize, 12usize, 57usize, 33usize);
+add_sub_const_decimals!(45usize, 11usize, 56usize, 34usize);
+add_sub_const_decimals!(45usize, 10usize, 55usize, 35usize);
+add_sub_const_decimals!(45usize, 9usize, 54usize, 36usize);
+add_sub_const_decimals!(45usize, 8usize, 53usize, 37usize);
+add_sub_const_decimals!(45usize, 7usize, 52usize, 38usize);
+add_sub_const_decimals!(45usize, 6usize, 51usize, 39usize);
+add_sub_const_decimals!(45usize, 5usize, 50usize, 40usize);
+add_sub_const_decimals!(45usize, 4usize, 49usize, 41usize);
+add_sub_const_decimals!(45usize, 3usize, 48usize, 42usize);
+add_sub_const_decimals!(45usize, 2usize, 47usize, 43usize);
+add_sub_const_decimals!(45usize, 1usize, 46usize, 44usize);
+add_sub_const_decimals!(45usize, 0usize, 45usize, 45usize);
+add_sub_const_decimals!(44usize, 64usize, 108usize, 0usize);
+add_sub_const_decimals!(44usize, 63usize, 107usize, 0usize);
+add_sub_const_decimals!(44usize, 62usize, 106usize, 0usize);
+add_sub_const_decimals!(44usize, 61usize, 105usize, 0usize);
+add_sub_const_decimals!(44usize, 60usize, 104usize, 0usize);
+add_sub_const_decimals!(44usize, 59usize, 103usize, 0usize);
+add_sub_const_decimals!(44usize, 58usize, 102usize, 0usize);
+add_sub_const_decimals!(44usize, 57usize, 101usize, 0usize);
+add_sub_const_decimals!(44usize, 56usize, 100usize, 0usize);
+add_sub_const_decimals!(44usize, 55usize, 99usize, 0usize);
+add_sub_const_decimals!(44usize, 54usize, 98usize, 0usize);
+add_sub_const_decimals!(44usize, 53usize, 97usize, 0usize);
+add_sub_const_decimals!(44usize, 52usize, 96usize, 0usize);
+add_sub_const_decimals!(44usize, 51usize, 95usize, 0usize);
+add_sub_const_decimals!(44usize, 50usize, 94usize, 0usize);
+add_sub_const_decimals!(44usize, 49usize, 93usize, 0usize);
+add_sub_const_decimals!(44usize, 48usize, 92usize, 0usize);
+add_sub_const_decimals!(44usize, 47usize, 91usize, 0usize);
+add_sub_const_decimals!(44usize, 46usize, 90usize, 0usize);
+add_sub_const_decimals!(44usize, 45usize, 89usize, 0usize);
+add_sub_const_decimals!(44usize, 44usize, 88usize, 0usize);
+add_sub_const_decimals!(44usize, 43usize, 87usize, 1usize);
+add_sub_const_decimals!(44usize, 42usize, 86usize, 2usize);
+add_sub_const_decimals!(44usize, 41usize, 85usize, 3usize);
+add_sub_const_decimals!(44usize, 40usize, 84usize, 4usize);
+add_sub_const_decimals!(44usize, 39usize, 83usize, 5usize);
+add_sub_const_decimals!(44usize, 38usize, 82usize, 6usize);
+add_sub_const_decimals!(44usize, 37usize, 81usize, 7usize);
+add_sub_const_decimals!(44usize, 36usize, 80usize, 8usize);
+add_sub_const_decimals!(44usize, 35usize, 79usize, 9usize);
+add_sub_const_decimals!(44usize, 34usize, 78usize, 10usize);
+add_sub_const_decimals!(44usize, 33usize, 77usize, 11usize);
+add_sub_const_decimals!(44usize, 32usize, 76usize, 12usize);
+add_sub_const_decimals!(44usize, 31usize, 75usize, 13usize);
+add_sub_const_decimals!(44usize, 30usize, 74usize, 14usize);
+add_sub_const_decimals!(44usize, 29usize, 73usize, 15usize);
+add_sub_const_decimals!(44usize, 28usize, 72usize, 16usize);
+add_sub_const_decimals!(44usize, 27usize, 71usize, 17usize);
+add_sub_const_decimals!(44usize, 26usize, 70usize, 18usize);
+add_sub_const_decimals!(44usize, 25usize, 69usize, 19usize);
+add_sub_const_decimals!(44usize, 24usize, 68usize, 20usize);
+add_sub_const_decimals!(44usize, 23usize, 67usize, 21usize);
+add_sub_const_decimals!(44usize, 22usize, 66usize, 22usize);
+add_sub_const_decimals!(44usize, 21usize, 65usize, 23usize);
+add_sub_const_decimals!(44usize, 20usize, 64usize, 24usize);
+add_sub_const_decimals!(44usize, 19usize, 63usize, 25usize);
+add_sub_const_decimals!(44usize, 18usize, 62usize, 26usize);
+add_sub_const_decimals!(44usize, 17usize, 61usize, 27usize);
+add_sub_const_decimals!(44usize, 16usize, 60usize, 28usize);
+add_sub_const_decimals!(44usize, 15usize, 59usize, 29usize);
+add_sub_const_decimals!(44usize, 14usize, 58usize, 30usize);
+add_sub_const_decimals!(44usize, 13usize, 57usize, 31usize);
+add_sub_const_decimals!(44usize, 12usize, 56usize, 32usize);
+add_sub_const_decimals!(44usize, 11usize, 55usize, 33usize);
+add_sub_const_decimals!(44usize, 10usize, 54usize, 34usize);
+add_sub_const_decimals!(44usize, 9usize, 53usize, 35usize);
+add_sub_const_decimals!(44usize, 8usize, 52usize, 36usize);
+add_sub_const_decimals!(44usize, 7usize, 51usize, 37usize);
+add_sub_const_decimals!(44usize, 6usize, 50usize, 38usize);
+add_sub_const_decimals!(44usize, 5usize, 49usize, 39usize);
+add_sub_const_decimals!(44usize, 4usize, 48usize, 40usize);
+add_sub_const_decimals!(44usize, 3usize, 47usize, 41usize);
+add_sub_const_decimals!(44usize, 2usize, 46usize, 42usize);
+add_sub_const_decimals!(44usize, 1usize, 45usize, 43usize);
+add_sub_const_decimals!(44usize, 0usize, 44usize, 44usize);
+add_sub_const_decimals!(43usize, 64usize, 107usize, 0usize);
+add_sub_const_decimals!(43usize, 63usize, 106usize, 0usize);
+add_sub_const_decimals!(43usize, 62usize, 105usize, 0usize);
+add_sub_const_decimals!(43usize, 61usize, 104usize, 0usize);
+add_sub_const_decimals!(43usize, 60usize, 103usize, 0usize);
+add_sub_const_decimals!(43usize, 59usize, 102usize, 0usize);
+add_sub_const_decimals!(43usize, 58usize, 101usize, 0usize);
+add_sub_const_decimals!(43usize, 57usize, 100usize, 0usize);
+add_sub_const_decimals!(43usize, 56usize, 99usize, 0usize);
+add_sub_const_decimals!(43usize, 55usize, 98usize, 0usize);
+add_sub_const_decimals!(43usize, 54usize, 97usize, 0usize);
+add_sub_const_decimals!(43usize, 53usize, 96usize, 0usize);
+add_sub_const_decimals!(43usize, 52usize, 95usize, 0usize);
+add_sub_const_decimals!(43usize, 51usize, 94usize, 0usize);
+add_sub_const_decimals!(43usize, 50usize, 93usize, 0usize);
+add_sub_const_decimals!(43usize, 49usize, 92usize, 0usize);
+add_sub_const_decimals!(43usize, 48usize, 91usize, 0usize);
+add_sub_const_decimals!(43usize, 47usize, 90usize, 0usize);
+add_sub_const_decimals!(43usize, 46usize, 89usize, 0usize);
+add_sub_const_decimals!(43usize, 45usize, 88usize, 0usize);
+add_sub_const_decimals!(43usize, 44usize, 87usize, 0usize);
+add_sub_const_decimals!(43usize, 43usize, 86usize, 0usize);
+add_sub_const_decimals!(43usize, 42usize, 85usize, 1usize);
+add_sub_const_decimals!(43usize, 41usize, 84usize, 2usize);
+add_sub_const_decimals!(43usize, 40usize, 83usize, 3usize);
+add_sub_const_decimals!(43usize, 39usize, 82usize, 4usize);
+add_sub_const_decimals!(43usize, 38usize, 81usize, 5usize);
+add_sub_const_decimals!(43usize, 37usize, 80usize, 6usize);
+add_sub_const_decimals!(43usize, 36usize, 79usize, 7usize);
+add_sub_const_decimals!(43usize, 35usize, 78usize, 8usize);
+add_sub_const_decimals!(43usize, 34usize, 77usize, 9usize);
+add_sub_const_decimals!(43usize, 33usize, 76usize, 10usize);
+add_sub_const_decimals!(43usize, 32usize, 75usize, 11usize);
+add_sub_const_decimals!(43usize, 31usize, 74usize, 12usize);
+add_sub_const_decimals!(43usize, 30usize, 73usize, 13usize);
+add_sub_const_decimals!(43usize, 29usize, 72usize, 14usize);
+add_sub_const_decimals!(43usize, 28usize, 71usize, 15usize);
+add_sub_const_decimals!(43usize, 27usize, 70usize, 16usize);
+add_sub_const_decimals!(43usize, 26usize, 69usize, 17usize);
+add_sub_const_decimals!(43usize, 25usize, 68usize, 18usize);
+add_sub_const_decimals!(43usize, 24usize, 67usize, 19usize);
+add_sub_const_decimals!(43usize, 23usize, 66usize, 20usize);
+add_sub_const_decimals!(43usize, 22usize, 65usize, 21usize);
+add_sub_const_decimals!(43usize, 21usize, 64usize, 22usize);
+add_sub_const_decimals!(43usize, 20usize, 63usize, 23usize);
+add_sub_const_decimals!(43usize, 19usize, 62usize, 24usize);
+add_sub_const_decimals!(43usize, 18usize, 61usize, 25usize);
+add_sub_const_decimals!(43usize, 17usize, 60usize, 26usize);
+add_sub_const_decimals!(43usize, 16usize, 59usize, 27usize);
+add_sub_const_decimals!(43usize, 15usize, 58usize, 28usize);
+add_sub_const_decimals!(43usize, 14usize, 57usize, 29usize);
+add_sub_const_decimals!(43usize, 13usize, 56usize, 30usize);
+add_sub_const_decimals!(43usize, 12usize, 55usize, 31usize);
+add_sub_const_decimals!(43usize, 11usize, 54usize, 32usize);
+add_sub_const_decimals!(43usize, 10usize, 53usize, 33usize);
+add_sub_const_decimals!(43usize, 9usize, 52usize, 34usize);
+add_sub_const_decimals!(43usize, 8usize, 51usize, 35usize);
+add_sub_const_decimals!(43usize, 7usize, 50usize, 36usize);
+add_sub_const_decimals!(43usize, 6usize, 49usize, 37usize);
+add_sub_const_decimals!(43usize, 5usize, 48usize, 38usize);
+add_sub_const_decimals!(43usize, 4usize, 47usize, 39usize);
+add_sub_const_decimals!(43usize, 3usize, 46usize, 40usize);
+add_sub_const_decimals!(43usize, 2usize, 45usize, 41usize);
+add_sub_const_decimals!(43usize, 1usize, 44usize, 42usize);
+add_sub_const_decimals!(43usize, 0usize, 43usize, 43usize);
+add_sub_const_decimals!(42usize, 64usize, 106usize, 0usize);
+add_sub_const_decimals!(42usize, 63usize, 105usize, 0usize);
+add_sub_const_decimals!(42usize, 62usize, 104usize, 0usize);
+add_sub_const_decimals!(42usize, 61usize, 103usize, 0usize);
+add_sub_const_decimals!(42usize, 60usize, 102usize, 0usize);
+add_sub_const_decimals!(42usize, 59usize, 101usize, 0usize);
+add_sub_const_decimals!(42usize, 58usize, 100usize, 0usize);
+add_sub_const_decimals!(42usize, 57usize, 99usize, 0usize);
+add_sub_const_decimals!(42usize, 56usize, 98usize, 0usize);
+add_sub_const_decimals!(42usize, 55usize, 97usize, 0usize);
+add_sub_const_decimals!(42usize, 54usize, 96usize, 0usize);
+add_sub_const_decimals!(42usize, 53usize, 95usize, 0usize);
+add_sub_const_decimals!(42usize, 52usize, 94usize, 0usize);
+add_sub_const_decimals!(42usize, 51usize, 93usize, 0usize);
+add_sub_const_decimals!(42usize, 50usize, 92usize, 0usize);
+add_sub_const_decimals!(42usize, 49usize, 91usize, 0usize);
+add_sub_const_decimals!(42usize, 48usize, 90usize, 0usize);
+add_sub_const_decimals!(42usize, 47usize, 89usize, 0usize);
+add_sub_const_decimals!(42usize, 46usize, 88usize, 0usize);
+add_sub_const_decimals!(42usize, 45usize, 87usize, 0usize);
+add_sub_const_decimals!(42usize, 44usize, 86usize, 0usize);
+add_sub_const_decimals!(42usize, 43usize, 85usize, 0usize);
+add_sub_const_decimals!(42usize, 42usize, 84usize, 0usize);
+add_sub_const_decimals!(42usize, 41usize, 83usize, 1usize);
+add_sub_const_decimals!(42usize, 40usize, 82usize, 2usize);
+add_sub_const_decimals!(42usize, 39usize, 81usize, 3usize);
+add_sub_const_decimals!(42usize, 38usize, 80usize, 4usize);
+add_sub_const_decimals!(42usize, 37usize, 79usize, 5usize);
+add_sub_const_decimals!(42usize, 36usize, 78usize, 6usize);
+add_sub_const_decimals!(42usize, 35usize, 77usize, 7usize);
+add_sub_const_decimals!(42usize, 34usize, 76usize, 8usize);
+add_sub_const_decimals!(42usize, 33usize, 75usize, 9usize);
+add_sub_const_decimals!(42usize, 32usize, 74usize, 10usize);
+add_sub_const_decimals!(42usize, 31usize, 73usize, 11usize);
+add_sub_const_decimals!(42usize, 30usize, 72usize, 12usize);
+add_sub_const_decimals!(42usize, 29usize, 71usize, 13usize);
+add_sub_const_decimals!(42usize, 28usize, 70usize, 14usize);
+add_sub_const_decimals!(42usize, 27usize, 69usize, 15usize);
+add_sub_const_decimals!(42usize, 26usize, 68usize, 16usize);
+add_sub_const_decimals!(42usize, 25usize, 67usize, 17usize);
+add_sub_const_decimals!(42usize, 24usize, 66usize, 18usize);
+add_sub_const_decimals!(42usize, 23usize, 65usize, 19usize);
+add_sub_const_decimals!(42usize, 22usize, 64usize, 20usize);
+add_sub_const_decimals!(42usize, 21usize, 63usize, 21usize);
+add_sub_const_decimals!(42usize, 20usize, 62usize, 22usize);
+add_sub_const_decimals!(42usize, 19usize, 61usize, 23usize);
+add_sub_const_decimals!(42usize, 18usize, 60usize, 24usize);
+add_sub_const_decimals!(42usize, 17usize, 59usize, 25usize);
+add_sub_const_decimals!(42usize, 16usize, 58usize, 26usize);
+add_sub_const_decimals!(42usize, 15usize, 57usize, 27usize);
+add_sub_const_decimals!(42usize, 14usize, 56usize, 28usize);
+add_sub_const_decimals!(42usize, 13usize, 55usize, 29usize);
+add_sub_const_decimals!(42usize, 12usize, 54usize, 30usize);
+add_sub_const_decimals!(42usize, 11usize, 53usize, 31usize);
+add_sub_const_decimals!(42usize, 10usize, 52usize, 32usize);
+add_sub_const_decimals!(42usize, 9usize, 51usize, 33usize);
+add_sub_const_decimals!(42usize, 8usize, 50usize, 34usize);
+add_sub_const_decimals!(42usize, 7usize, 49usize, 35usize);
+add_sub_const_decimals!(42usize, 6usize, 48usize, 36usize);
+add_sub_const_decimals!(42usize, 5usize, 47usize, 37usize);
+add_sub_const_decimals!(42usize, 4usize, 46usize, 38usize);
+add_sub_const_decimals!(42usize, 3usize, 45usize, 39usize);
+add_sub_const_decimals!(42usize, 2usize, 44usize, 40usize);
+add_sub_const_decimals!(42usize, 1usize, 43usize, 41usize);
+add_sub_const_decimals!(42usize, 0usize, 42usize, 42usize);
+add_sub_const_decimals!(41usize, 64usize, 105usize, 0usize);
+add_sub_const_decimals!(41usize, 63usize, 104usize, 0usize);
+add_sub_const_decimals!(41usize, 62usize, 103usize, 0usize);
+add_sub_const_decimals!(41usize, 61usize, 102usize, 0usize);
+add_sub_const_decimals!(41usize, 60usize, 101usize, 0usize);
+add_sub_const_decimals!(41usize, 59usize, 100usize, 0usize);
+add_sub_const_decimals!(41usize, 58usize, 99usize, 0usize);
+add_sub_const_decimals!(41usize, 57usize, 98usize, 0usize);
+add_sub_const_decimals!(41usize, 56usize, 97usize, 0usize);
+add_sub_const_decimals!(41usize, 55usize, 96usize, 0usize);
+add_sub_const_decimals!(41usize, 54usize, 95usize, 0usize);
+add_sub_const_decimals!(41usize, 53usize, 94usize, 0usize);
+add_sub_const_decimals!(41usize, 52usize, 93usize, 0usize);
+add_sub_const_decimals!(41usize, 51usize, 92usize, 0usize);
+add_sub_const_decimals!(41usize, 50usize, 91usize, 0usize);
+add_sub_const_decimals!(41usize, 49usize, 90usize, 0usize);
+add_sub_const_decimals!(41usize, 48usize, 89usize, 0usize);
+add_sub_const_decimals!(41usize, 47usize, 88usize, 0usize);
+add_sub_const_decimals!(41usize, 46usize, 87usize, 0usize);
+add_sub_const_decimals!(41usize, 45usize, 86usize, 0usize);
+add_sub_const_decimals!(41usize, 44usize, 85usize, 0usize);
+add_sub_const_decimals!(41usize, 43usize, 84usize, 0usize);
+add_sub_const_decimals!(41usize, 42usize, 83usize, 0usize);
+add_sub_const_decimals!(41usize, 41usize, 82usize, 0usize);
+add_sub_const_decimals!(41usize, 40usize, 81usize, 1usize);
+add_sub_const_decimals!(41usize, 39usize, 80usize, 2usize);
+add_sub_const_decimals!(41usize, 38usize, 79usize, 3usize);
+add_sub_const_decimals!(41usize, 37usize, 78usize, 4usize);
+add_sub_const_decimals!(41usize, 36usize, 77usize, 5usize);
+add_sub_const_decimals!(41usize, 35usize, 76usize, 6usize);
+add_sub_const_decimals!(41usize, 34usize, 75usize, 7usize);
+add_sub_const_decimals!(41usize, 33usize, 74usize, 8usize);
+add_sub_const_decimals!(41usize, 32usize, 73usize, 9usize);
+add_sub_const_decimals!(41usize, 31usize, 72usize, 10usize);
+add_sub_const_decimals!(41usize, 30usize, 71usize, 11usize);
+add_sub_const_decimals!(41usize, 29usize, 70usize, 12usize);
+add_sub_const_decimals!(41usize, 28usize, 69usize, 13usize);
+add_sub_const_decimals!(41usize, 27usize, 68usize, 14usize);
+add_sub_const_decimals!(41usize, 26usize, 67usize, 15usize);
+add_sub_const_decimals!(41usize, 25usize, 66usize, 16usize);
+add_sub_const_decimals!(41usize, 24usize, 65usize, 17usize);
+add_sub_const_decimals!(41usize, 23usize, 64usize, 18usize);
+add_sub_const_decimals!(41usize, 22usize, 63usize, 19usize);
+add_sub_const_decimals!(41usize, 21usize, 62usize, 20usize);
+add_sub_const_decimals!(41usize, 20usize, 61usize, 21usize);
+add_sub_const_decimals!(41usize, 19usize, 60usize, 22usize);
+add_sub_const_decimals!(41usize, 18usize, 59usize, 23usize);
+add_sub_const_decimals!(41usize, 17usize, 58usize, 24usize);
+add_sub_const_decimals!(41usize, 16usize, 57usize, 25usize);
+add_sub_const_decimals!(41usize, 15usize, 56usize, 26usize);
+add_sub_const_decimals!(41usize, 14usize, 55usize, 27usize);
+add_sub_const_decimals!(41usize, 13usize, 54usize, 28usize);
+add_sub_const_decimals!(41usize, 12usize, 53usize, 29usize);
+add_sub_const_decimals!(41usize, 11usize, 52usize, 30usize);
+add_sub_const_decimals!(41usize, 10usize, 51usize, 31usize);
+add_sub_const_decimals!(41usize, 9usize, 50usize, 32usize);
+add_sub_const_decimals!(41usize, 8usize, 49usize, 33usize);
+add_sub_const_decimals!(41usize, 7usize, 48usize, 34usize);
+add_sub_const_decimals!(41usize, 6usize, 47usize, 35usize);
+add_sub_const_decimals!(41usize, 5usize, 46usize, 36usize);
+add_sub_const_decimals!(41usize, 4usize, 45usize, 37usize);
+add_sub_const_decimals!(41usize, 3usize, 44usize, 38usize);
+add_sub_const_decimals!(41usize, 2usize, 43usize, 39usize);
+add_sub_const_decimals!(41usize, 1usize, 42usize, 40usize);
+add_sub_const_decimals!(41usize, 0usize, 41usize, 41usize);
+add_sub_const_decimals!(40usize, 64usize, 104usize, 0usize);
+add_sub_const_decimals!(40usize, 63usize, 103usize, 0usize);
+add_sub_const_decimals!(40usize, 62usize, 102usize, 0usize);
+add_sub_const_decimals!(40usize, 61usize, 101usize, 0usize);
+add_sub_const_decimals!(40usize, 60usize, 100usize, 0usize);
+add_sub_const_decimals!(40usize, 59usize, 99usize, 0usize);
+add_sub_const_decimals!(40usize, 58usize, 98usize, 0usize);
+add_sub_const_decimals!(40usize, 57usize, 97usize, 0usize);
+add_sub_const_decimals!(40usize, 56usize, 96usize, 0usize);
+add_sub_const_decimals!(40usize, 55usize, 95usize, 0usize);
+add_sub_const_decimals!(40usize, 54usize, 94usize, 0usize);
+add_sub_const_decimals!(40usize, 53usize, 93usize, 0usize);
+add_sub_const_decimals!(40usize, 52usize, 92usize, 0usize);
+add_sub_const_decimals!(40usize, 51usize, 91usize, 0usize);
+add_sub_const_decimals!(40usize, 50usize, 90usize, 0usize);
+add_sub_const_decimals!(40usize, 49usize, 89usize, 0usize);
+add_sub_const_decimals!(40usize, 48usize, 88usize, 0usize);
+add_sub_const_decimals!(40usize, 47usize, 87usize, 0usize);
+add_sub_const_decimals!(40usize, 46usize, 86usize, 0usize);
+add_sub_const_decimals!(40usize, 45usize, 85usize, 0usize);
+add_sub_const_decimals!(40usize, 44usize, 84usize, 0usize);
+add_sub_const_decimals!(40usize, 43usize, 83usize, 0usize);
+add_sub_const_decimals!(40usize, 42usize, 82usize, 0usize);
+add_sub_const_decimals!(40usize, 41usize, 81usize, 0usize);
+add_sub_const_decimals!(40usize, 40usize, 80usize, 0usize);
+add_sub_const_decimals!(40usize, 39usize, 79usize, 1usize);
+add_sub_const_decimals!(40usize, 38usize, 78usize, 2usize);
+add_sub_const_decimals!(40usize, 37usize, 77usize, 3usize);
+add_sub_const_decimals!(40usize, 36usize, 76usize, 4usize);
+add_sub_const_decimals!(40usize, 35usize, 75usize, 5usize);
+add_sub_const_decimals!(40usize, 34usize, 74usize, 6usize);
+add_sub_const_decimals!(40usize, 33usize, 73usize, 7usize);
+add_sub_const_decimals!(40usize, 32usize, 72usize, 8usize);
+add_sub_const_decimals!(40usize, 31usize, 71usize, 9usize);
+add_sub_const_decimals!(40usize, 30usize, 70usize, 10usize);
+add_sub_const_decimals!(40usize, 29usize, 69usize, 11usize);
+add_sub_const_decimals!(40usize, 28usize, 68usize, 12usize);
+add_sub_const_decimals!(40usize, 27usize, 67usize, 13usize);
+add_sub_const_decimals!(40usize, 26usize, 66usize, 14usize);
+add_sub_const_decimals!(40usize, 25usize, 65usize, 15usize);
+add_sub_const_decimals!(40usize, 24usize, 64usize, 16usize);
+add_sub_const_decimals!(40usize, 23usize, 63usize, 17usize);
+add_sub_const_decimals!(40usize, 22usize, 62usize, 18usize);
+add_sub_const_decimals!(40usize, 21usize, 61usize, 19usize);
+add_sub_const_decimals!(40usize, 20usize, 60usize, 20usize);
+add_sub_const_decimals!(40usize, 19usize, 59usize, 21usize);
+add_sub_const_decimals!(40usize, 18usize, 58usize, 22usize);
+add_sub_const_decimals!(40usize, 17usize, 57usize, 23usize);
+add_sub_const_decimals!(40usize, 16usize, 56usize, 24usize);
+add_sub_const_decimals!(40usize, 15usize, 55usize, 25usize);
+add_sub_const_decimals!(40usize, 14usize, 54usize, 26usize);
+add_sub_const_decimals!(40usize, 13usize, 53usize, 27usize);
+add_sub_const_decimals!(40usize, 12usize, 52usize, 28usize);
+add_sub_const_decimals!(40usize, 11usize, 51usize, 29usize);
+add_sub_const_decimals!(40usize, 10usize, 50usize, 30usize);
+add_sub_const_decimals!(40usize, 9usize, 49usize, 31usize);
+add_sub_const_decimals!(40usize, 8usize, 48usize, 32usize);
+add_sub_const_decimals!(40usize, 7usize, 47usize, 33usize);
+add_sub_const_decimals!(40usize, 6usize, 46usize, 34usize);
+add_sub_const_decimals!(40usize, 5usize, 45usize, 35usize);
+add_sub_const_decimals!(40usize, 4usize, 44usize, 36usize);
+add_sub_const_decimals!(40usize, 3usize, 43usize, 37usize);
+add_sub_const_decimals!(40usize, 2usize, 42usize, 38usize);
+add_sub_const_decimals!(40usize, 1usize, 41usize, 39usize);
+add_sub_const_decimals!(40usize, 0usize, 40usize, 40usize);
+add_sub_const_decimals!(39usize, 64usize, 103usize, 0usize);
+add_sub_const_decimals!(39usize, 63usize, 102usize, 0usize);
+add_sub_const_decimals!(39usize, 62usize, 101usize, 0usize);
+add_sub_const_decimals!(39usize, 61usize, 100usize, 0usize);
+add_sub_const_decimals!(39usize, 60usize, 99usize, 0usize);
+add_sub_const_decimals!(39usize, 59usize, 98usize, 0usize);
+add_sub_const_decimals!(39usize, 58usize, 97usize, 0usize);
+add_sub_const_decimals!(39usize, 57usize, 96usize, 0usize);
+add_sub_const_decimals!(39usize, 56usize, 95usize, 0usize);
+add_sub_const_decimals!(39usize, 55usize, 94usize, 0usize);
+add_sub_const_decimals!(39usize, 54usize, 93usize, 0usize);
+add_sub_const_decimals!(39usize, 53usize, 92usize, 0usize);
+add_sub_const_decimals!(39usize, 52usize, 91usize, 0usize);
+add_sub_const_decimals!(39usize, 51usize, 90usize, 0usize);
+add_sub_const_decimals!(39usize, 50usize, 89usize, 0usize);
+add_sub_const_decimals!(39usize, 49usize, 88usize, 0usize);
+add_sub_const_decimals!(39usize, 48usize, 87usize, 0usize);
+add_sub_const_decimals!(39usize, 47usize, 86usize, 0usize);
+add_sub_const_decimals!(39usize, 46usize, 85usize, 0usize);
+add_sub_const_decimals!(39usize, 45usize, 84usize, 0usize);
+add_sub_const_decimals!(39usize, 44usize, 83usize, 0usize);
+add_sub_const_decimals!(39usize, 43usize, 82usize, 0usize);
+add_sub_const_decimals!(39usize, 42usize, 81usize, 0usize);
+add_sub_const_decimals!(39usize, 41usize, 80usize, 0usize);
+add_sub_const_decimals!(39usize, 40usize, 79usize, 0usize);
+add_sub_const_decimals!(39usize, 39usize, 78usize, 0usize);
+add_sub_const_decimals!(39usize, 38usize, 77usize, 1usize);
+add_sub_const_decimals!(39usize, 37usize, 76usize, 2usize);
+add_sub_const_decimals!(39usize, 36usize, 75usize, 3usize);
+add_sub_const_decimals!(39usize, 35usize, 74usize, 4usize);
+add_sub_const_decimals!(39usize, 34usize, 73usize, 5usize);
+add_sub_const_decimals!(39usize, 33usize, 72usize, 6usize);
+add_sub_const_decimals!(39usize, 32usize, 71usize, 7usize);
+add_sub_const_decimals!(39usize, 31usize, 70usize, 8usize);
+add_sub_const_decimals!(39usize, 30usize, 69usize, 9usize);
+add_sub_const_decimals!(39usize, 29usize, 68usize, 10usize);
+add_sub_const_decimals!(39usize, 28usize, 67usize, 11usize);
+add_sub_const_decimals!(39usize, 27usize, 66usize, 12usize);
+add_sub_const_decimals!(39usize, 26usize, 65usize, 13usize);
+add_sub_const_decimals!(39usize, 25usize, 64usize, 14usize);
+add_sub_const_decimals!(39usize, 24usize, 63usize, 15usize);
+add_sub_const_decimals!(39usize, 23usize, 62usize, 16usize);
+add_sub_const_decimals!(39usize, 22usize, 61usize, 17usize);
+add_sub_const_decimals!(39usize, 21usize, 60usize, 18usize);
+add_sub_const_decimals!(39usize, 20usize, 59usize, 19usize);
+add_sub_const_decimals!(39usize, 19usize, 58usize, 20usize);
+add_sub_const_decimals!(39usize, 18usize, 57usize, 21usize);
+add_sub_const_decimals!(39usize, 17usize, 56usize, 22usize);
+add_sub_const_decimals!(39usize, 16usize, 55usize, 23usize);
+add_sub_const_decimals!(39usize, 15usize, 54usize, 24usize);
+add_sub_const_decimals!(39usize, 14usize, 53usize, 25usize);
+add_sub_const_decimals!(39usize, 13usize, 52usize, 26usize);
+add_sub_const_decimals!(39usize, 12usize, 51usize, 27usize);
+add_sub_const_decimals!(39usize, 11usize, 50usize, 28usize);
+add_sub_const_decimals!(39usize, 10usize, 49usize, 29usize);
+add_sub_const_decimals!(39usize, 9usize, 48usize, 30usize);
+add_sub_const_decimals!(39usize, 8usize, 47usize, 31usize);
+add_sub_const_decimals!(39usize, 7usize, 46usize, 32usize);
+add_sub_const_decimals!(39usize, 6usize, 45usize, 33usize);
+add_sub_const_decimals!(39usize, 5usize, 44usize, 34usize);
+add_sub_const_decimals!(39usize, 4usize, 43usize, 35usize);
+add_sub_const_decimals!(39usize, 3usize, 42usize, 36usize);
+add_sub_const_decimals!(39usize, 2usize, 41usize, 37usize);
+add_sub_const_decimals!(39usize, 1usize, 40usize, 38usize);
+add_sub_const_decimals!(39usize, 0usize, 39usize, 39usize);
+add_sub_const_decimals!(38usize, 64usize, 102usize, 0usize);
+add_sub_const_decimals!(38usize, 63usize, 101usize, 0usize);
+add_sub_const_decimals!(38usize, 62usize, 100usize, 0usize);
+add_sub_const_decimals!(38usize, 61usize, 99usize, 0usize);
+add_sub_const_decimals!(38usize, 60usize, 98usize, 0usize);
+add_sub_const_decimals!(38usize, 59usize, 97usize, 0usize);
+add_sub_const_decimals!(38usize, 58usize, 96usize, 0usize);
+add_sub_const_decimals!(38usize, 57usize, 95usize, 0usize);
+add_sub_const_decimals!(38usize, 56usize, 94usize, 0usize);
+add_sub_const_decimals!(38usize, 55usize, 93usize, 0usize);
+add_sub_const_decimals!(38usize, 54usize, 92usize, 0usize);
+add_sub_const_decimals!(38usize, 53usize, 91usize, 0usize);
+add_sub_const_decimals!(38usize, 52usize, 90usize, 0usize);
+add_sub_const_decimals!(38usize, 51usize, 89usize, 0usize);
+add_sub_const_decimals!(38usize, 50usize, 88usize, 0usize);
+add_sub_const_decimals!(38usize, 49usize, 87usize, 0usize);
+add_sub_const_decimals!(38usize, 48usize, 86usize, 0usize);
+add_sub_const_decimals!(38usize, 47usize, 85usize, 0usize);
+add_sub_const_decimals!(38usize, 46usize, 84usize, 0usize);
+add_sub_const_decimals!(38usize, 45usize, 83usize, 0usize);
+add_sub_const_decimals!(38usize, 44usize, 82usize, 0usize);
+add_sub_const_decimals!(38usize, 43usize, 81usize, 0usize);
+add_sub_const_decimals!(38usize, 42usize, 80usize, 0usize);
+add_sub_const_decimals!(38usize, 41usize, 79usize, 0usize);
+add_sub_const_decimals!(38usize, 40usize, 78usize, 0usize);
+add_sub_const_decimals!(38usize, 39usize, 77usize, 0usize);
+add_sub_const_decimals!(38usize, 38usize, 76usize, 0usize);
+add_sub_const_decimals!(38usize, 37usize, 75usize, 1usize);
+add_sub_const_decimals!(38usize, 36usize, 74usize, 2usize);
+add_sub_const_decimals!(38usize, 35usize, 73usize, 3usize);
+add_sub_const_decimals!(38usize, 34usize, 72usize, 4usize);
+add_sub_const_decimals!(38usize, 33usize, 71usize, 5usize);
+add_sub_const_decimals!(38usize, 32usize, 70usize, 6usize);
+add_sub_const_decimals!(38usize, 31usize, 69usize, 7usize);
+add_sub_const_decimals!(38usize, 30usize, 68usize, 8usize);
+add_sub_const_decimals!(38usize, 29usize, 67usize, 9usize);
+add_sub_const_decimals!(38usize, 28usize, 66usize, 10usize);
+add_sub_const_decimals!(38usize, 27usize, 65usize, 11usize);
+add_sub_const_decimals!(38usize, 26usize, 64usize, 12usize);
+add_sub_const_decimals!(38usize, 25usize, 63usize, 13usize);
+add_sub_const_decimals!(38usize, 24usize, 62usize, 14usize);
+add_sub_const_decimals!(38usize, 23usize, 61usize, 15usize);
+add_sub_const_decimals!(38usize, 22usize, 60usize, 16usize);
+add_sub_const_decimals!(38usize, 21usize, 59usize, 17usize);
+add_sub_const_decimals!(38usize, 20usize, 58usize, 18usize);
+add_sub_const_decimals!(38usize, 19usize, 57usize, 19usize);
+add_sub_const_decimals!(38usize, 18usize, 56usize, 20usize);
+add_sub_const_decimals!(38usize, 17usize, 55usize, 21usize);
+add_sub_const_decimals!(38usize, 16usize, 54usize, 22usize);
+add_sub_const_decimals!(38usize, 15usize, 53usize, 23usize);
+add_sub_const_decimals!(38usize, 14usize, 52usize, 24usize);
+add_sub_const_decimals!(38usize, 13usize, 51usize, 25usize);
+add_sub_const_decimals!(38usize, 12usize, 50usize, 26usize);
+add_sub_const_decimals!(38usize, 11usize, 49usize, 27usize);
+add_sub_const_decimals!(38usize, 10usize, 48usize, 28usize);
+add_sub_const_decimals!(38usize, 9usize, 47usize, 29usize);
+add_sub_const_decimals!(38usize, 8usize, 46usize, 30usize);
+add_sub_const_decimals!(38usize, 7usize, 45usize, 31usize);
+add_sub_const_decimals!(38usize, 6usize, 44usize, 32usize);
+add_sub_const_decimals!(38usize, 5usize, 43usize, 33usize);
+add_sub_const_decimals!(38usize, 4usize, 42usize, 34usize);
+add_sub_const_decimals!(38usize, 3usize, 41usize, 35usize);
+add_sub_const_decimals!(38usize, 2usize, 40usize, 36usize);
+add_sub_const_decimals!(38usize, 1usize, 39usize, 37usize);
+add_sub_const_decimals!(38usize, 0usize, 38usize, 38usize);
+add_sub_const_decimals!(37usize, 64usize, 101usize, 0usize);
+add_sub_const_decimals!(37usize, 63usize, 100usize, 0usize);
+add_sub_const_decimals!(37usize, 62usize, 99usize, 0usize);
+add_sub_const_decimals!(37usize, 61usize, 98usize, 0usize);
+add_sub_const_decimals!(37usize, 60usize, 97usize, 0usize);
+add_sub_const_decimals!(37usize, 59usize, 96usize, 0usize);
+add_sub_const_decimals!(37usize, 58usize, 95usize, 0usize);
+add_sub_const_decimals!(37usize, 57usize, 94usize, 0usize);
+add_sub_const_decimals!(37usize, 56usize, 93usize, 0usize);
+add_sub_const_decimals!(37usize, 55usize, 92usize, 0usize);
+add_sub_const_decimals!(37usize, 54usize, 91usize, 0usize);
+add_sub_const_decimals!(37usize, 53usize, 90usize, 0usize);
+add_sub_const_decimals!(37usize, 52usize, 89usize, 0usize);
+add_sub_const_decimals!(37usize, 51usize, 88usize, 0usize);
+add_sub_const_decimals!(37usize, 50usize, 87usize, 0usize);
+add_sub_const_decimals!(37usize, 49usize, 86usize, 0usize);
+add_sub_const_decimals!(37usize, 48usize, 85usize, 0usize);
+add_sub_const_decimals!(37usize, 47usize, 84usize, 0usize);
+add_sub_const_decimals!(37usize, 46usize, 83usize, 0usize);
+add_sub_const_decimals!(37usize, 45usize, 82usize, 0usize);
+add_sub_const_decimals!(37usize, 44usize, 81usize, 0usize);
+add_sub_const_decimals!(37usize, 43usize, 80usize, 0usize);
+add_sub_const_decimals!(37usize, 42usize, 79usize, 0usize);
+add_sub_const_decimals!(37usize, 41usize, 78usize, 0usize);
+add_sub_const_decimals!(37usize, 40usize, 77usize, 0usize);
+add_sub_const_decimals!(37usize, 39usize, 76usize, 0usize);
+add_sub_const_decimals!(37usize, 38usize, 75usize, 0usize);
+add_sub_const_decimals!(37usize, 37usize, 74usize, 0usize);
+add_sub_const_decimals!(37usize, 36usize, 73usize, 1usize);
+add_sub_const_decimals!(37usize, 35usize, 72usize, 2usize);
+add_sub_const_decimals!(37usize, 34usize, 71usize, 3usize);
+add_sub_const_decimals!(37usize, 33usize, 70usize, 4usize);
+add_sub_const_decimals!(37usize, 32usize, 69usize, 5usize);
+add_sub_const_decimals!(37usize, 31usize, 68usize, 6usize);
+add_sub_const_decimals!(37usize, 30usize, 67usize, 7usize);
+add_sub_const_decimals!(37usize, 29usize, 66usize, 8usize);
+add_sub_const_decimals!(37usize, 28usize, 65usize, 9usize);
+add_sub_const_decimals!(37usize, 27usize, 64usize, 10usize);
+add_sub_const_decimals!(37usize, 26usize, 63usize, 11usize);
+add_sub_const_decimals!(37usize, 25usize, 62usize, 12usize);
+add_sub_const_decimals!(37usize, 24usize, 61usize, 13usize);
+add_sub_const_decimals!(37usize, 23usize, 60usize, 14usize);
+add_sub_const_decimals!(37usize, 22usize, 59usize, 15usize);
+add_sub_const_decimals!(37usize, 21usize, 58usize, 16usize);
+add_sub_const_decimals!(37usize, 20usize, 57usize, 17usize);
+add_sub_const_decimals!(37usize, 19usize, 56usize, 18usize);
+add_sub_const_decimals!(37usize, 18usize, 55usize, 19usize);
+add_sub_const_decimals!(37usize, 17usize, 54usize, 20usize);
+add_sub_const_decimals!(37usize, 16usize, 53usize, 21usize);
+add_sub_const_decimals!(37usize, 15usize, 52usize, 22usize);
+add_sub_const_decimals!(37usize, 14usize, 51usize, 23usize);
+add_sub_const_decimals!(37usize, 13usize, 50usize, 24usize);
+add_sub_const_decimals!(37usize, 12usize, 49usize, 25usize);
+add_sub_const_decimals!(37usize, 11usize, 48usize, 26usize);
+add_sub_const_decimals!(37usize, 10usize, 47usize, 27usize);
+add_sub_const_decimals!(37usize, 9usize, 46usize, 28usize);
+add_sub_const_decimals!(37usize, 8usize, 45usize, 29usize);
+add_sub_const_decimals!(37usize, 7usize, 44usize, 30usize);
+add_sub_const_decimals!(37usize, 6usize, 43usize, 31usize);
+add_sub_const_decimals!(37usize, 5usize, 42usize, 32usize);
+add_sub_const_decimals!(37usize, 4usize, 41usize, 33usize);
+add_sub_const_decimals!(37usize, 3usize, 40usize, 34usize);
+add_sub_const_decimals!(37usize, 2usize, 39usize, 35usize);
+add_sub_const_decimals!(37usize, 1usize, 38usize, 36usize);
+add_sub_const_decimals!(37usize, 0usize, 37usize, 37usize);
+add_sub_const_decimals!(36usize, 64usize, 100usize, 0usize);
+add_sub_const_decimals!(36usize, 63usize, 99usize, 0usize);
+add_sub_const_decimals!(36usize, 62usize, 98usize, 0usize);
+add_sub_const_decimals!(36usize, 61usize, 97usize, 0usize);
+add_sub_const_decimals!(36usize, 60usize, 96usize, 0usize);
+add_sub_const_decimals!(36usize, 59usize, 95usize, 0usize);
+add_sub_const_decimals!(36usize, 58usize, 94usize, 0usize);
+add_sub_const_decimals!(36usize, 57usize, 93usize, 0usize);
+add_sub_const_decimals!(36usize, 56usize, 92usize, 0usize);
+add_sub_const_decimals!(36usize, 55usize, 91usize, 0usize);
+add_sub_const_decimals!(36usize, 54usize, 90usize, 0usize);
+add_sub_const_decimals!(36usize, 53usize, 89usize, 0usize);
+add_sub_const_decimals!(36usize, 52usize, 88usize, 0usize);
+add_sub_const_decimals!(36usize, 51usize, 87usize, 0usize);
+add_sub_const_decimals!(36usize, 50usize, 86usize, 0usize);
+add_sub_const_decimals!(36usize, 49usize, 85usize, 0usize);
+add_sub_const_decimals!(36usize, 48usize, 84usize, 0usize);
+add_sub_const_decimals!(36usize, 47usize, 83usize, 0usize);
+add_sub_const_decimals!(36usize, 46usize, 82usize, 0usize);
+add_sub_const_decimals!(36usize, 45usize, 81usize, 0usize);
+add_sub_const_decimals!(36usize, 44usize, 80usize, 0usize);
+add_sub_const_decimals!(36usize, 43usize, 79usize, 0usize);
+add_sub_const_decimals!(36usize, 42usize, 78usize, 0usize);
+add_sub_const_decimals!(36usize, 41usize, 77usize, 0usize);
+add_sub_const_decimals!(36usize, 40usize, 76usize, 0usize);
+add_sub_const_decimals!(36usize, 39usize, 75usize, 0usize);
+add_sub_const_decimals!(36usize, 38usize, 74usize, 0usize);
+add_sub_const_decimals!(36usize, 37usize, 73usize, 0usize);
+add_sub_const_decimals!(36usize, 36usize, 72usize, 0usize);
+add_sub_const_decimals!(36usize, 35usize, 71usize, 1usize);
+add_sub_const_decimals!(36usize, 34usize, 70usize, 2usize);
+add_sub_const_decimals!(36usize, 33usize, 69usize, 3usize);
+add_sub_const_decimals!(36usize, 32usize, 68usize, 4usize);
+add_sub_const_decimals!(36usize, 31usize, 67usize, 5usize);
+add_sub_const_decimals!(36usize, 30usize, 66usize, 6usize);
+add_sub_const_decimals!(36usize, 29usize, 65usize, 7usize);
+add_sub_const_decimals!(36usize, 28usize, 64usize, 8usize);
+add_sub_const_decimals!(36usize, 27usize, 63usize, 9usize);
+add_sub_const_decimals!(36usize, 26usize, 62usize, 10usize);
+add_sub_const_decimals!(36usize, 25usize, 61usize, 11usize);
+add_sub_const_decimals!(36usize, 24usize, 60usize, 12usize);
+add_sub_const_decimals!(36usize, 23usize, 59usize, 13usize);
+add_sub_const_decimals!(36usize, 22usize, 58usize, 14usize);
+add_sub_const_decimals!(36usize, 21usize, 57usize, 15usize);
+add_sub_const_decimals!(36usize, 20usize, 56usize, 16usize);
+add_sub_const_decimals!(36usize, 19usize, 55usize, 17usize);
+add_sub_const_decimals!(36usize, 18usize, 54usize, 18usize);
+add_sub_const_decimals!(36usize, 17usize, 53usize, 19usize);
+add_sub_const_decimals!(36usize, 16usize, 52usize, 20usize);
+add_sub_const_decimals!(36usize, 15usize, 51usize, 21usize);
+add_sub_const_decimals!(36usize, 14usize, 50usize, 22usize);
+add_sub_const_decimals!(36usize, 13usize, 49usize, 23usize);
+add_sub_const_decimals!(36usize, 12usize, 48usize, 24usize);
+add_sub_const_decimals!(36usize, 11usize, 47usize, 25usize);
+add_sub_const_decimals!(36usize, 10usize, 46usize, 26usize);
+add_sub_const_decimals!(36usize, 9usize, 45usize, 27usize);
+add_sub_const_decimals!(36usize, 8usize, 44usize, 28usize);
+add_sub_const_decimals!(36usize, 7usize, 43usize, 29usize);
+add_sub_const_decimals!(36usize, 6usize, 42usize, 30usize);
+add_sub_const_decimals!(36usize, 5usize, 41usize, 31usize);
+add_sub_const_decimals!(36usize, 4usize, 40usize, 32usize);
+add_sub_const_decimals!(36usize, 3usize, 39usize, 33usize);
+add_sub_const_decimals!(36usize, 2usize, 38usize, 34usize);
+add_sub_const_decimals!(36usize, 1usize, 37usize, 35usize);
+add_sub_const_decimals!(36usize, 0usize, 36usize, 36usize);
+add_sub_const_decimals!(35usize, 64usize, 99usize, 0usize);
+add_sub_const_decimals!(35usize, 63usize, 98usize, 0usize);
+add_sub_const_decimals!(35usize, 62usize, 97usize, 0usize);
+add_sub_const_decimals!(35usize, 61usize, 96usize, 0usize);
+add_sub_const_decimals!(35usize, 60usize, 95usize, 0usize);
+add_sub_const_decimals!(35usize, 59usize, 94usize, 0usize);
+add_sub_const_decimals!(35usize, 58usize, 93usize, 0usize);
+add_sub_const_decimals!(35usize, 57usize, 92usize, 0usize);
+add_sub_const_decimals!(35usize, 56usize, 91usize, 0usize);
+add_sub_const_decimals!(35usize, 55usize, 90usize, 0usize);
+add_sub_const_decimals!(35usize, 54usize, 89usize, 0usize);
+add_sub_const_decimals!(35usize, 53usize, 88usize, 0usize);
+add_sub_const_decimals!(35usize, 52usize, 87usize, 0usize);
+add_sub_const_decimals!(35usize, 51usize, 86usize, 0usize);
+add_sub_const_decimals!(35usize, 50usize, 85usize, 0usize);
+add_sub_const_decimals!(35usize, 49usize, 84usize, 0usize);
+add_sub_const_decimals!(35usize, 48usize, 83usize, 0usize);
+add_sub_const_decimals!(35usize, 47usize, 82usize, 0usize);
+add_sub_const_decimals!(35usize, 46usize, 81usize, 0usize);
+add_sub_const_decimals!(35usize, 45usize, 80usize, 0usize);
+add_sub_const_decimals!(35usize, 44usize, 79usize, 0usize);
+add_sub_const_decimals!(35usize, 43usize, 78usize, 0usize);
+add_sub_const_decimals!(35usize, 42usize, 77usize, 0usize);
+add_sub_const_decimals!(35usize, 41usize, 76usize, 0usize);
+add_sub_const_decimals!(35usize, 40usize, 75usize, 0usize);
+add_sub_const_decimals!(35usize, 39usize, 74usize, 0usize);
+add_sub_const_decimals!(35usize, 38usize, 73usize, 0usize);
+add_sub_const_decimals!(35usize, 37usize, 72usize, 0usize);
+add_sub_const_decimals!(35usize, 36usize, 71usize, 0usize);
+add_sub_const_decimals!(35usize, 35usize, 70usize, 0usize);
+add_sub_const_decimals!(35usize, 34usize, 69usize, 1usize);
+add_sub_const_decimals!(35usize, 33usize, 68usize, 2usize);
+add_sub_const_decimals!(35usize, 32usize, 67usize, 3usize);
+add_sub_const_decimals!(35usize, 31usize, 66usize, 4usize);
+add_sub_const_decimals!(35usize, 30usize, 65usize, 5usize);
+add_sub_const_decimals!(35usize, 29usize, 64usize, 6usize);
+add_sub_const_decimals!(35usize, 28usize, 63usize, 7usize);
+add_sub_const_decimals!(35usize, 27usize, 62usize, 8usize);
+add_sub_const_decimals!(35usize, 26usize, 61usize, 9usize);
+add_sub_const_decimals!(35usize, 25usize, 60usize, 10usize);
+add_sub_const_decimals!(35usize, 24usize, 59usize, 11usize);
+add_sub_const_decimals!(35usize, 23usize, 58usize, 12usize);
+add_sub_const_decimals!(35usize, 22usize, 57usize, 13usize);
+add_sub_const_decimals!(35usize, 21usize, 56usize, 14usize);
+add_sub_const_decimals!(35usize, 20usize, 55usize, 15usize);
+add_sub_const_decimals!(35usize, 19usize, 54usize, 16usize);
+add_sub_const_decimals!(35usize, 18usize, 53usize, 17usize);
+add_sub_const_decimals!(35usize, 17usize, 52usize, 18usize);
+add_sub_const_decimals!(35usize, 16usize, 51usize, 19usize);
+add_sub_const_decimals!(35usize, 15usize, 50usize, 20usize);
+add_sub_const_decimals!(35usize, 14usize, 49usize, 21usize);
+add_sub_const_decimals!(35usize, 13usize, 48usize, 22usize);
+add_sub_const_decimals!(35usize, 12usize, 47usize, 23usize);
+add_sub_const_decimals!(35usize, 11usize, 46usize, 24usize);
+add_sub_const_decimals!(35usize, 10usize, 45usize, 25usize);
+add_sub_const_decimals!(35usize, 9usize, 44usize, 26usize);
+add_sub_const_decimals!(35usize, 8usize, 43usize, 27usize);
+add_sub_const_decimals!(35usize, 7usize, 42usize, 28usize);
+add_sub_const_decimals!(35usize, 6usize, 41usize, 29usize);
+add_sub_const_decimals!(35usize, 5usize, 40usize, 30usize);
+add_sub_const_decimals!(35usize, 4usize, 39usize, 31usize);
+add_sub_const_decimals!(35usize, 3usize, 38usize, 32usize);
+add_sub_const_decimals!(35usize, 2usize, 37usize, 33usize);
+add_sub_const_decimals!(35usize, 1usize, 36usize, 34usize);
+add_sub_const_decimals!(35usize, 0usize, 35usize, 35usize);
+add_sub_const_decimals!(34usize, 64usize, 98usize, 0usize);
+add_sub_const_decimals!(34usize, 63usize, 97usize, 0usize);
+add_sub_const_decimals!(34usize, 62usize, 96usize, 0usize);
+add_sub_const_decimals!(34usize, 61usize, 95usize, 0usize);
+add_sub_const_decimals!(34usize, 60usize, 94usize, 0usize);
+add_sub_const_decimals!(34usize, 59usize, 93usize, 0usize);
+add_sub_const_decimals!(34usize, 58usize, 92usize, 0usize);
+add_sub_const_decimals!(34usize, 57usize, 91usize, 0usize);
+add_sub_const_decimals!(34usize, 56usize, 90usize, 0usize);
+add_sub_const_decimals!(34usize, 55usize, 89usize, 0usize);
+add_sub_const_decimals!(34usize, 54usize, 88usize, 0usize);
+add_sub_const_decimals!(34usize, 53usize, 87usize, 0usize);
+add_sub_const_decimals!(34usize, 52usize, 86usize, 0usize);
+add_sub_const_decimals!(34usize, 51usize, 85usize, 0usize);
+add_sub_const_decimals!(34usize, 50usize, 84usize, 0usize);
+add_sub_const_decimals!(34usize, 49usize, 83usize, 0usize);
+add_sub_const_decimals!(34usize, 48usize, 82usize, 0usize);
+add_sub_const_decimals!(34usize, 47usize, 81usize, 0usize);
+add_sub_const_decimals!(34usize, 46usize, 80usize, 0usize);
+add_sub_const_decimals!(34usize, 45usize, 79usize, 0usize);
+add_sub_const_decimals!(34usize, 44usize, 78usize, 0usize);
+add_sub_const_decimals!(34usize, 43usize, 77usize, 0usize);
+add_sub_const_decimals!(34usize, 42usize, 76usize, 0usize);
+add_sub_const_decimals!(34usize, 41usize, 75usize, 0usize);
+add_sub_const_decimals!(34usize, 40usize, 74usize, 0usize);
+add_sub_const_decimals!(34usize, 39usize, 73usize, 0usize);
+add_sub_const_decimals!(34usize, 38usize, 72usize, 0usize);
+add_sub_const_decimals!(34usize, 37usize, 71usize, 0usize);
+add_sub_const_decimals!(34usize, 36usize, 70usize, 0usize);
+add_sub_const_decimals!(34usize, 35usize, 69usize, 0usize);
+add_sub_const_decimals!(34usize, 34usize, 68usize, 0usize);
+add_sub_const_decimals!(34usize, 33usize, 67usize, 1usize);
+add_sub_const_decimals!(34usize, 32usize, 66usize, 2usize);
+add_sub_const_decimals!(34usize, 31usize, 65usize, 3usize);
+add_sub_const_decimals!(34usize, 30usize, 64usize, 4usize);
+add_sub_const_decimals!(34usize, 29usize, 63usize, 5usize);
+add_sub_const_decimals!(34usize, 28usize, 62usize, 6usize);
+add_sub_const_decimals!(34usize, 27usize, 61usize, 7usize);
+add_sub_const_decimals!(34usize, 26usize, 60usize, 8usize);
+add_sub_const_decimals!(34usize, 25usize, 59usize, 9usize);
+add_sub_const_decimals!(34usize, 24usize, 58usize, 10usize);
+add_sub_const_decimals!(34usize, 23usize, 57usize, 11usize);
+add_sub_const_decimals!(34usize, 22usize, 56usize, 12usize);
+add_sub_const_decimals!(34usize, 21usize, 55usize, 13usize);
+add_sub_const_decimals!(34usize, 20usize, 54usize, 14usize);
+add_sub_const_decimals!(34usize, 19usize, 53usize, 15usize);
+add_sub_const_decimals!(34usize, 18usize, 52usize, 16usize);
+add_sub_const_decimals!(34usize, 17usize, 51usize, 17usize);
+add_sub_const_decimals!(34usize, 16usize, 50usize, 18usize);
+add_sub_const_decimals!(34usize, 15usize, 49usize, 19usize);
+add_sub_const_decimals!(34usize, 14usize, 48usize, 20usize);
+add_sub_const_decimals!(34usize, 13usize, 47usize, 21usize);
+add_sub_const_decimals!(34usize, 12usize, 46usize, 22usize);
+add_sub_const_decimals!(34usize, 11usize, 45usize, 23usize);
+add_sub_const_decimals!(34usize, 10usize, 44usize, 24usize);
+add_sub_const_decimals!(34usize, 9usize, 43usize, 25usize);
+add_sub_const_decimals!(34usize, 8usize, 42usize, 26usize);
+add_sub_const_decimals!(34usize, 7usize, 41usize, 27usize);
+add_sub_const_decimals!(34usize, 6usize, 40usize, 28usize);
+add_sub_const_decimals!(34usize, 5usize, 39usize, 29usize);
+add_sub_const_decimals!(34usize, 4usize, 38usize, 30usize);
+add_sub_const_decimals!(34usize, 3usize, 37usize, 31usize);
+add_sub_const_decimals!(34usize, 2usize, 36usize, 32usize);
+add_sub_const_decimals!(34usize, 1usize, 35usize, 33usize);
+add_sub_const_decimals!(34usize, 0usize, 34usize, 34usize);
+add_sub_const_decimals!(33usize, 64usize, 97usize, 0usize);
+add_sub_const_decimals!(33usize, 63usize, 96usize, 0usize);
+add_sub_const_decimals!(33usize, 62usize, 95usize, 0usize);
+add_sub_const_decimals!(33usize, 61usize, 94usize, 0usize);
+add_sub_const_decimals!(33usize, 60usize, 93usize, 0usize);
+add_sub_const_decimals!(33usize, 59usize, 92usize, 0usize);
+add_sub_const_decimals!(33usize, 58usize, 91usize, 0usize);
+add_sub_const_decimals!(33usize, 57usize, 90usize, 0usize);
+add_sub_const_decimals!(33usize, 56usize, 89usize, 0usize);
+add_sub_const_decimals!(33usize, 55usize, 88usize, 0usize);
+add_sub_const_decimals!(33usize, 54usize, 87usize, 0usize);
+add_sub_const_decimals!(33usize, 53usize, 86usize, 0usize);
+add_sub_const_decimals!(33usize, 52usize, 85usize, 0usize);
+add_sub_const_decimals!(33usize, 51usize, 84usize, 0usize);
+add_sub_const_decimals!(33usize, 50usize, 83usize, 0usize);
+add_sub_const_decimals!(33usize, 49usize, 82usize, 0usize);
+add_sub_const_decimals!(33usize, 48usize, 81usize, 0usize);
+add_sub_const_decimals!(33usize, 47usize, 80usize, 0usize);
+add_sub_const_decimals!(33usize, 46usize, 79usize, 0usize);
+add_sub_const_decimals!(33usize, 45usize, 78usize, 0usize);
+add_sub_const_decimals!(33usize, 44usize, 77usize, 0usize);
+add_sub_const_decimals!(33usize, 43usize, 76usize, 0usize);
+add_sub_const_decimals!(33usize, 42usize, 75usize, 0usize);
+add_sub_const_decimals!(33usize, 41usize, 74usize, 0usize);
+add_sub_const_decimals!(33usize, 40usize, 73usize, 0usize);
+add_sub_const_decimals!(33usize, 39usize, 72usize, 0usize);
+add_sub_const_decimals!(33usize, 38usize, 71usize, 0usize);
+add_sub_const_decimals!(33usize, 37usize, 70usize, 0usize);
+add_sub_const_decimals!(33usize, 36usize, 69usize, 0usize);
+add_sub_const_decimals!(33usize, 35usize, 68usize, 0usize);
+add_sub_const_decimals!(33usize, 34usize, 67usize, 0usize);
+add_sub_const_decimals!(33usize, 33usize, 66usize, 0usize);
+add_sub_const_decimals!(33usize, 32usize, 65usize, 1usize);
+add_sub_const_decimals!(33usize, 31usize, 64usize, 2usize);
+add_sub_const_decimals!(33usize, 30usize, 63usize, 3usize);
+add_sub_const_decimals!(33usize, 29usize, 62usize, 4usize);
+add_sub_const_decimals!(33usize, 28usize, 61usize, 5usize);
+add_sub_const_decimals!(33usize, 27usize, 60usize, 6usize);
+add_sub_const_decimals!(33usize, 26usize, 59usize, 7usize);
+add_sub_const_decimals!(33usize, 25usize, 58usize, 8usize);
+add_sub_const_decimals!(33usize, 24usize, 57usize, 9usize);
+add_sub_const_decimals!(33usize, 23usize, 56usize, 10usize);
+add_sub_const_decimals!(33usize, 22usize, 55usize, 11usize);
+add_sub_const_decimals!(33usize, 21usize, 54usize, 12usize);
+add_sub_const_decimals!(33usize, 20usize, 53usize, 13usize);
+add_sub_const_decimals!(33usize, 19usize, 52usize, 14usize);
+add_sub_const_decimals!(33usize, 18usize, 51usize, 15usize);
+add_sub_const_decimals!(33usize, 17usize, 50usize, 16usize);
+add_sub_const_decimals!(33usize, 16usize, 49usize, 17usize);
+add_sub_const_decimals!(33usize, 15usize, 48usize, 18usize);
+add_sub_const_decimals!(33usize, 14usize, 47usize, 19usize);
+add_sub_const_decimals!(33usize, 13usize, 46usize, 20usize);
+add_sub_const_decimals!(33usize, 12usize, 45usize, 21usize);
+add_sub_const_decimals!(33usize, 11usize, 44usize, 22usize);
+add_sub_const_decimals!(33usize, 10usize, 43usize, 23usize);
+add_sub_const_decimals!(33usize, 9usize, 42usize, 24usize);
+add_sub_const_decimals!(33usize, 8usize, 41usize, 25usize);
+add_sub_const_decimals!(33usize, 7usize, 40usize, 26usize);
+add_sub_const_decimals!(33usize, 6usize, 39usize, 27usize);
+add_sub_const_decimals!(33usize, 5usize, 38usize, 28usize);
+add_sub_const_decimals!(33usize, 4usize, 37usize, 29usize);
+add_sub_const_decimals!(33usize, 3usize, 36usize, 30usize);
+add_sub_const_decimals!(33usize, 2usize, 35usize, 31usize);
+add_sub_const_decimals!(33usize, 1usize, 34usize, 32usize);
+add_sub_const_decimals!(33usize, 0usize, 33usize, 33usize);
+add_sub_const_decimals!(32usize, 64usize, 96usize, 0usize);
+add_sub_const_decimals!(32usize, 63usize, 95usize, 0usize);
+add_sub_const_decimals!(32usize, 62usize, 94usize, 0usize);
+add_sub_const_decimals!(32usize, 61usize, 93usize, 0usize);
+add_sub_const_decimals!(32usize, 60usize, 92usize, 0usize);
+add_sub_const_decimals!(32usize, 59usize, 91usize, 0usize);
+add_sub_const_decimals!(32usize, 58usize, 90usize, 0usize);
+add_sub_const_decimals!(32usize, 57usize, 89usize, 0usize);
+add_sub_const_decimals!(32usize, 56usize, 88usize, 0usize);
+add_sub_const_decimals!(32usize, 55usize, 87usize, 0usize);
+add_sub_const_decimals!(32usize, 54usize, 86usize, 0usize);
+add_sub_const_decimals!(32usize, 53usize, 85usize, 0usize);
+add_sub_const_decimals!(32usize, 52usize, 84usize, 0usize);
+add_sub_const_decimals!(32usize, 51usize, 83usize, 0usize);
+add_sub_const_decimals!(32usize, 50usize, 82usize, 0usize);
+add_sub_const_decimals!(32usize, 49usize, 81usize, 0usize);
+add_sub_const_decimals!(32usize, 48usize, 80usize, 0usize);
+add_sub_const_decimals!(32usize, 47usize, 79usize, 0usize);
+add_sub_const_decimals!(32usize, 46usize, 78usize, 0usize);
+add_sub_const_decimals!(32usize, 45usize, 77usize, 0usize);
+add_sub_const_decimals!(32usize, 44usize, 76usize, 0usize);
+add_sub_const_decimals!(32usize, 43usize, 75usize, 0usize);
+add_sub_const_decimals!(32usize, 42usize, 74usize, 0usize);
+add_sub_const_decimals!(32usize, 41usize, 73usize, 0usize);
+add_sub_const_decimals!(32usize, 40usize, 72usize, 0usize);
+add_sub_const_decimals!(32usize, 39usize, 71usize, 0usize);
+add_sub_const_decimals!(32usize, 38usize, 70usize, 0usize);
+add_sub_const_decimals!(32usize, 37usize, 69usize, 0usize);
+add_sub_const_decimals!(32usize, 36usize, 68usize, 0usize);
+add_sub_const_decimals!(32usize, 35usize, 67usize, 0usize);
+add_sub_const_decimals!(32usize, 34usize, 66usize, 0usize);
+add_sub_const_decimals!(32usize, 33usize, 65usize, 0usize);
+add_sub_const_decimals!(32usize, 32usize, 64usize, 0usize);
+add_sub_const_decimals!(32usize, 31usize, 63usize, 1usize);
+add_sub_const_decimals!(32usize, 30usize, 62usize, 2usize);
+add_sub_const_decimals!(32usize, 29usize, 61usize, 3usize);
+add_sub_const_decimals!(32usize, 28usize, 60usize, 4usize);
+add_sub_const_decimals!(32usize, 27usize, 59usize, 5usize);
+add_sub_const_decimals!(32usize, 26usize, 58usize, 6usize);
+add_sub_const_decimals!(32usize, 25usize, 57usize, 7usize);
+add_sub_const_decimals!(32usize, 24usize, 56usize, 8usize);
+add_sub_const_decimals!(32usize, 23usize, 55usize, 9usize);
+add_sub_const_decimals!(32usize, 22usize, 54usize, 10usize);
+add_sub_const_decimals!(32usize, 21usize, 53usize, 11usize);
+add_sub_const_decimals!(32usize, 20usize, 52usize, 12usize);
+add_sub_const_decimals!(32usize, 19usize, 51usize, 13usize);
+add_sub_const_decimals!(32usize, 18usize, 50usize, 14usize);
+add_sub_const_decimals!(32usize, 17usize, 49usize, 15usize);
+add_sub_const_decimals!(32usize, 16usize, 48usize, 16usize);
+add_sub_const_decimals!(32usize, 15usize, 47usize, 17usize);
+add_sub_const_decimals!(32usize, 14usize, 46usize, 18usize);
+add_sub_const_decimals!(32usize, 13usize, 45usize, 19usize);
+add_sub_const_decimals!(32usize, 12usize, 44usize, 20usize);
+add_sub_const_decimals!(32usize, 11usize, 43usize, 21usize);
+add_sub_const_decimals!(32usize, 10usize, 42usize, 22usize);
+add_sub_const_decimals!(32usize, 9usize, 41usize, 23usize);
+add_sub_const_decimals!(32usize, 8usize, 40usize, 24usize);
+add_sub_const_decimals!(32usize, 7usize, 39usize, 25usize);
+add_sub_const_decimals!(32usize, 6usize, 38usize, 26usize);
+add_sub_const_decimals!(32usize, 5usize, 37usize, 27usize);
+add_sub_const_decimals!(32usize, 4usize, 36usize, 28usize);
+add_sub_const_decimals!(32usize, 3usize, 35usize, 29usize);
+add_sub_const_decimals!(32usize, 2usize, 34usize, 30usize);
+add_sub_const_decimals!(32usize, 1usize, 33usize, 31usize);
+add_sub_const_decimals!(32usize, 0usize, 32usize, 32usize);
+add_sub_const_decimals!(31usize, 64usize, 95usize, 0usize);
+add_sub_const_decimals!(31usize, 63usize, 94usize, 0usize);
+add_sub_const_decimals!(31usize, 62usize, 93usize, 0usize);
+add_sub_const_decimals!(31usize, 61usize, 92usize, 0usize);
+add_sub_const_decimals!(31usize, 60usize, 91usize, 0usize);
+add_sub_const_decimals!(31usize, 59usize, 90usize, 0usize);
+add_sub_const_decimals!(31usize, 58usize, 89usize, 0usize);
+add_sub_const_decimals!(31usize, 57usize, 88usize, 0usize);
+add_sub_const_decimals!(31usize, 56usize, 87usize, 0usize);
+add_sub_const_decimals!(31usize, 55usize, 86usize, 0usize);
+add_sub_const_decimals!(31usize, 54usize, 85usize, 0usize);
+add_sub_const_decimals!(31usize, 53usize, 84usize, 0usize);
+add_sub_const_decimals!(31usize, 52usize, 83usize, 0usize);
+add_sub_const_decimals!(31usize, 51usize, 82usize, 0usize);
+add_sub_const_decimals!(31usize, 50usize, 81usize, 0usize);
+add_sub_const_decimals!(31usize, 49usize, 80usize, 0usize);
+add_sub_const_decimals!(31usize, 48usize, 79usize, 0usize);
+add_sub_const_decimals!(31usize, 47usize, 78usize, 0usize);
+add_sub_const_decimals!(31usize, 46usize, 77usize, 0usize);
+add_sub_const_decimals!(31usize, 45usize, 76usize, 0usize);
+add_sub_const_decimals!(31usize, 44usize, 75usize, 0usize);
+add_sub_const_decimals!(31usize, 43usize, 74usize, 0usize);
+add_sub_const_decimals!(31usize, 42usize, 73usize, 0usize);
+add_sub_const_decimals!(31usize, 41usize, 72usize, 0usize);
+add_sub_const_decimals!(31usize, 40usize, 71usize, 0usize);
+add_sub_const_decimals!(31usize, 39usize, 70usize, 0usize);
+add_sub_const_decimals!(31usize, 38usize, 69usize, 0usize);
+add_sub_const_decimals!(31usize, 37usize, 68usize, 0usize);
+add_sub_const_decimals!(31usize, 36usize, 67usize, 0usize);
+add_sub_const_decimals!(31usize, 35usize, 66usize, 0usize);
+add_sub_const_decimals!(31usize, 34usize, 65usize, 0usize);
+add_sub_const_decimals!(31usize, 33usize, 64usize, 0usize);
+add_sub_const_decimals!(31usize, 32usize, 63usize, 0usize);
+add_sub_const_decimals!(31usize, 31usize, 62usize, 0usize);
+add_sub_const_decimals!(31usize, 30usize, 61usize, 1usize);
+add_sub_const_decimals!(31usize, 29usize, 60usize, 2usize);
+add_sub_const_decimals!(31usize, 28usize, 59usize, 3usize);
+add_sub_const_decimals!(31usize, 27usize, 58usize, 4usize);
+add_sub_const_decimals!(31usize, 26usize, 57usize, 5usize);
+add_sub_const_decimals!(31usize, 25usize, 56usize, 6usize);
+add_sub_const_decimals!(31usize, 24usize, 55usize, 7usize);
+add_sub_const_decimals!(31usize, 23usize, 54usize, 8usize);
+add_sub_const_decimals!(31usize, 22usize, 53usize, 9usize);
+add_sub_const_decimals!(31usize, 21usize, 52usize, 10usize);
+add_sub_const_decimals!(31usize, 20usize, 51usize, 11usize);
+add_sub_const_decimals!(31usize, 19usize, 50usize, 12usize);
+add_sub_const_decimals!(31usize, 18usize, 49usize, 13usize);
+add_sub_const_decimals!(31usize, 17usize, 48usize, 14usize);
+add_sub_const_decimals!(31usize, 16usize, 47usize, 15usize);
+add_sub_const_decimals!(31usize, 15usize, 46usize, 16usize);
+add_sub_const_decimals!(31usize, 14usize, 45usize, 17usize);
+add_sub_const_decimals!(31usize, 13usize, 44usize, 18usize);
+add_sub_const_decimals!(31usize, 12usize, 43usize, 19usize);
+add_sub_const_decimals!(31usize, 11usize, 42usize, 20usize);
+add_sub_const_decimals!(31usize, 10usize, 41usize, 21usize);
+add_sub_const_decimals!(31usize, 9usize, 40usize, 22usize);
+add_sub_const_decimals!(31usize, 8usize, 39usize, 23usize);
+add_sub_const_decimals!(31usize, 7usize, 38usize, 24usize);
+add_sub_const_decimals!(31usize, 6usize, 37usize, 25usize);
+add_sub_const_decimals!(31usize, 5usize, 36usize, 26usize);
+add_sub_const_decimals!(31usize, 4usize, 35usize, 27usize);
+add_sub_const_decimals!(31usize, 3usize, 34usize, 28usize);
+add_sub_const_decimals!(31usize, 2usize, 33usize, 29usize);
+add_sub_const_decimals!(31usize, 1usize, 32usize, 30usize);
+add_sub_const_decimals!(31usize, 0usize, 31usize, 31usize);
+add_sub_const_decimals!(30usize, 64usize, 94usize, 0usize);
+add_sub_const_decimals!(30usize, 63usize, 93usize, 0usize);
+add_sub_const_decimals!(30usize, 62usize, 92usize, 0usize);
+add_sub_const_decimals!(30usize, 61usize, 91usize, 0usize);
+add_sub_const_decimals!(30usize, 60usize, 90usize, 0usize);
+add_sub_const_decimals!(30usize, 59usize, 89usize, 0usize);
+add_sub_const_decimals!(30usize, 58usize, 88usize, 0usize);
+add_sub_const_decimals!(30usize, 57usize, 87usize, 0usize);
+add_sub_const_decimals!(30usize, 56usize, 86usize, 0usize);
+add_sub_const_decimals!(30usize, 55usize, 85usize, 0usize);
+add_sub_const_decimals!(30usize, 54usize, 84usize, 0usize);
+add_sub_const_decimals!(30usize, 53usize, 83usize, 0usize);
+add_sub_const_decimals!(30usize, 52usize, 82usize, 0usize);
+add_sub_const_decimals!(30usize, 51usize, 81usize, 0usize);
+add_sub_const_decimals!(30usize, 50usize, 80usize, 0usize);
+add_sub_const_decimals!(30usize, 49usize, 79usize, 0usize);
+add_sub_const_decimals!(30usize, 48usize, 78usize, 0usize);
+add_sub_const_decimals!(30usize, 47usize, 77usize, 0usize);
+add_sub_const_decimals!(30usize, 46usize, 76usize, 0usize);
+add_sub_const_decimals!(30usize, 45usize, 75usize, 0usize);
+add_sub_const_decimals!(30usize, 44usize, 74usize, 0usize);
+add_sub_const_decimals!(30usize, 43usize, 73usize, 0usize);
+add_sub_const_decimals!(30usize, 42usize, 72usize, 0usize);
+add_sub_const_decimals!(30usize, 41usize, 71usize, 0usize);
+add_sub_const_decimals!(30usize, 40usize, 70usize, 0usize);
+add_sub_const_decimals!(30usize, 39usize, 69usize, 0usize);
+add_sub_const_decimals!(30usize, 38usize, 68usize, 0usize);
+add_sub_const_decimals!(30usize, 37usize, 67usize, 0usize);
+add_sub_const_decimals!(30usize, 36usize, 66usize, 0usize);
+add_sub_const_decimals!(30usize, 35usize, 65usize, 0usize);
+add_sub_const_decimals!(30usize, 34usize, 64usize, 0usize);
+add_sub_const_decimals!(30usize, 33usize, 63usize, 0usize);
+add_sub_const_decimals!(30usize, 32usize, 62usize, 0usize);
+add_sub_const_decimals!(30usize, 31usize, 61usize, 0usize);
+add_sub_const_decimals!(30usize, 30usize, 60usize, 0usize);
+add_sub_const_decimals!(30usize, 29usize, 59usize, 1usize);
+add_sub_const_decimals!(30usize, 28usize, 58usize, 2usize);
+add_sub_const_decimals!(30usize, 27usize, 57usize, 3usize);
+add_sub_const_decimals!(30usize, 26usize, 56usize, 4usize);
+add_sub_const_decimals!(30usize, 25usize, 55usize, 5usize);
+add_sub_const_decimals!(30usize, 24usize, 54usize, 6usize);
+add_sub_const_decimals!(30usize, 23usize, 53usize, 7usize);
+add_sub_const_decimals!(30usize, 22usize, 52usize, 8usize);
+add_sub_const_decimals!(30usize, 21usize, 51usize, 9usize);
+add_sub_const_decimals!(30usize, 20usize, 50usize, 10usize);
+add_sub_const_decimals!(30usize, 19usize, 49usize, 11usize);
+add_sub_const_decimals!(30usize, 18usize, 48usize, 12usize);
+add_sub_const_decimals!(30usize, 17usize, 47usize, 13usize);
+add_sub_const_decimals!(30usize, 16usize, 46usize, 14usize);
+add_sub_const_decimals!(30usize, 15usize, 45usize, 15usize);
+add_sub_const_decimals!(30usize, 14usize, 44usize, 16usize);
+add_sub_const_decimals!(30usize, 13usize, 43usize, 17usize);
+add_sub_const_decimals!(30usize, 12usize, 42usize, 18usize);
+add_sub_const_decimals!(30usize, 11usize, 41usize, 19usize);
+add_sub_const_decimals!(30usize, 10usize, 40usize, 20usize);
+add_sub_const_decimals!(30usize, 9usize, 39usize, 21usize);
+add_sub_const_decimals!(30usize, 8usize, 38usize, 22usize);
+add_sub_const_decimals!(30usize, 7usize, 37usize, 23usize);
+add_sub_const_decimals!(30usize, 6usize, 36usize, 24usize);
+add_sub_const_decimals!(30usize, 5usize, 35usize, 25usize);
+add_sub_const_decimals!(30usize, 4usize, 34usize, 26usize);
+add_sub_const_decimals!(30usize, 3usize, 33usize, 27usize);
+add_sub_const_decimals!(30usize, 2usize, 32usize, 28usize);
+add_sub_const_decimals!(30usize, 1usize, 31usize, 29usize);
+add_sub_const_decimals!(30usize, 0usize, 30usize, 30usize);
+add_sub_const_decimals!(29usize, 64usize, 93usize, 0usize);
+add_sub_const_decimals!(29usize, 63usize, 92usize, 0usize);
+add_sub_const_decimals!(29usize, 62usize, 91usize, 0usize);
+add_sub_const_decimals!(29usize, 61usize, 90usize, 0usize);
+add_sub_const_decimals!(29usize, 60usize, 89usize, 0usize);
+add_sub_const_decimals!(29usize, 59usize, 88usize, 0usize);
+add_sub_const_decimals!(29usize, 58usize, 87usize, 0usize);
+add_sub_const_decimals!(29usize, 57usize, 86usize, 0usize);
+add_sub_const_decimals!(29usize, 56usize, 85usize, 0usize);
+add_sub_const_decimals!(29usize, 55usize, 84usize, 0usize);
+add_sub_const_decimals!(29usize, 54usize, 83usize, 0usize);
+add_sub_const_decimals!(29usize, 53usize, 82usize, 0usize);
+add_sub_const_decimals!(29usize, 52usize, 81usize, 0usize);
+add_sub_const_decimals!(29usize, 51usize, 80usize, 0usize);
+add_sub_const_decimals!(29usize, 50usize, 79usize, 0usize);
+add_sub_const_decimals!(29usize, 49usize, 78usize, 0usize);
+add_sub_const_decimals!(29usize, 48usize, 77usize, 0usize);
+add_sub_const_decimals!(29usize, 47usize, 76usize, 0usize);
+add_sub_const_decimals!(29usize, 46usize, 75usize, 0usize);
+add_sub_const_decimals!(29usize, 45usize, 74usize, 0usize);
+add_sub_const_decimals!(29usize, 44usize, 73usize, 0usize);
+add_sub_const_decimals!(29usize, 43usize, 72usize, 0usize);
+add_sub_const_decimals!(29usize, 42usize, 71usize, 0usize);
+add_sub_const_decimals!(29usize, 41usize, 70usize, 0usize);
+add_sub_const_decimals!(29usize, 40usize, 69usize, 0usize);
+add_sub_const_decimals!(29usize, 39usize, 68usize, 0usize);
+add_sub_const_decimals!(29usize, 38usize, 67usize, 0usize);
+add_sub_const_decimals!(29usize, 37usize, 66usize, 0usize);
+add_sub_const_decimals!(29usize, 36usize, 65usize, 0usize);
+add_sub_const_decimals!(29usize, 35usize, 64usize, 0usize);
+add_sub_const_decimals!(29usize, 34usize, 63usize, 0usize);
+add_sub_const_decimals!(29usize, 33usize, 62usize, 0usize);
+add_sub_const_decimals!(29usize, 32usize, 61usize, 0usize);
+add_sub_const_decimals!(29usize, 31usize, 60usize, 0usize);
+add_sub_const_decimals!(29usize, 30usize, 59usize, 0usize);
+add_sub_const_decimals!(29usize, 29usize, 58usize, 0usize);
+add_sub_const_decimals!(29usize, 28usize, 57usize, 1usize);
+add_sub_const_decimals!(29usize, 27usize, 56usize, 2usize);
+add_sub_const_decimals!(29usize, 26usize, 55usize, 3usize);
+add_sub_const_decimals!(29usize, 25usize, 54usize, 4usize);
+add_sub_const_decimals!(29usize, 24usize, 53usize, 5usize);
+add_sub_const_decimals!(29usize, 23usize, 52usize, 6usize);
+add_sub_const_decimals!(29usize, 22usize, 51usize, 7usize);
+add_sub_const_decimals!(29usize, 21usize, 50usize, 8usize);
+add_sub_const_decimals!(29usize, 20usize, 49usize, 9usize);
+add_sub_const_decimals!(29usize, 19usize, 48usize, 10usize);
+add_sub_const_decimals!(29usize, 18usize, 47usize, 11usize);
+add_sub_const_decimals!(29usize, 17usize, 46usize, 12usize);
+add_sub_const_decimals!(29usize, 16usize, 45usize, 13usize);
+add_sub_const_decimals!(29usize, 15usize, 44usize, 14usize);
+add_sub_const_decimals!(29usize, 14usize, 43usize, 15usize);
+add_sub_const_decimals!(29usize, 13usize, 42usize, 16usize);
+add_sub_const_decimals!(29usize, 12usize, 41usize, 17usize);
+add_sub_const_decimals!(29usize, 11usize, 40usize, 18usize);
+add_sub_const_decimals!(29usize, 10usize, 39usize, 19usize);
+add_sub_const_decimals!(29usize, 9usize, 38usize, 20usize);
+add_sub_const_decimals!(29usize, 8usize, 37usize, 21usize);
+add_sub_const_decimals!(29usize, 7usize, 36usize, 22usize);
+add_sub_const_decimals!(29usize, 6usize, 35usize, 23usize);
+add_sub_const_decimals!(29usize, 5usize, 34usize, 24usize);
+add_sub_const_decimals!(29usize, 4usize, 33usize, 25usize);
+add_sub_const_decimals!(29usize, 3usize, 32usize, 26usize);
+add_sub_const_decimals!(29usize, 2usize, 31usize, 27usize);
+add_sub_const_decimals!(29usize, 1usize, 30usize, 28usize);
+add_sub_const_decimals!(29usize, 0usize, 29usize, 29usize);
+add_sub_const_decimals!(28usize, 64usize, 92usize, 0usize);
+add_sub_const_decimals!(28usize, 63usize, 91usize, 0usize);
+add_sub_const_decimals!(28usize, 62usize, 90usize, 0usize);
+add_sub_const_decimals!(28usize, 61usize, 89usize, 0usize);
+add_sub_const_decimals!(28usize, 60usize, 88usize, 0usize);
+add_sub_const_decimals!(28usize, 59usize, 87usize, 0usize);
+add_sub_const_decimals!(28usize, 58usize, 86usize, 0usize);
+add_sub_const_decimals!(28usize, 57usize, 85usize, 0usize);
+add_sub_const_decimals!(28usize, 56usize, 84usize, 0usize);
+add_sub_const_decimals!(28usize, 55usize, 83usize, 0usize);
+add_sub_const_decimals!(28usize, 54usize, 82usize, 0usize);
+add_sub_const_decimals!(28usize, 53usize, 81usize, 0usize);
+add_sub_const_decimals!(28usize, 52usize, 80usize, 0usize);
+add_sub_const_decimals!(28usize, 51usize, 79usize, 0usize);
+add_sub_const_decimals!(28usize, 50usize, 78usize, 0usize);
+add_sub_const_decimals!(28usize, 49usize, 77usize, 0usize);
+add_sub_const_decimals!(28usize, 48usize, 76usize, 0usize);
+add_sub_const_decimals!(28usize, 47usize, 75usize, 0usize);
+add_sub_const_decimals!(28usize, 46usize, 74usize, 0usize);
+add_sub_const_decimals!(28usize, 45usize, 73usize, 0usize);
+add_sub_const_decimals!(28usize, 44usize, 72usize, 0usize);
+add_sub_const_decimals!(28usize, 43usize, 71usize, 0usize);
+add_sub_const_decimals!(28usize, 42usize, 70usize, 0usize);
+add_sub_const_decimals!(28usize, 41usize, 69usize, 0usize);
+add_sub_const_decimals!(28usize, 40usize, 68usize, 0usize);
+add_sub_const_decimals!(28usize, 39usize, 67usize, 0usize);
+add_sub_const_decimals!(28usize, 38usize, 66usize, 0usize);
+add_sub_const_decimals!(28usize, 37usize, 65usize, 0usize);
+add_sub_const_decimals!(28usize, 36usize, 64usize, 0usize);
+add_sub_const_decimals!(28usize, 35usize, 63usize, 0usize);
+add_sub_const_decimals!(28usize, 34usize, 62usize, 0usize);
+add_sub_const_decimals!(28usize, 33usize, 61usize, 0usize);
+add_sub_const_decimals!(28usize, 32usize, 60usize, 0usize);
+add_sub_const_decimals!(28usize, 31usize, 59usize, 0usize);
+add_sub_const_decimals!(28usize, 30usize, 58usize, 0usize);
+add_sub_const_decimals!(28usize, 29usize, 57usize, 0usize);
+add_sub_const_decimals!(28usize, 28usize, 56usize, 0usize);
+add_sub_const_decimals!(28usize, 27usize, 55usize, 1usize);
+add_sub_const_decimals!(28usize, 26usize, 54usize, 2usize);
+add_sub_const_decimals!(28usize, 25usize, 53usize, 3usize);
+add_sub_const_decimals!(28usize, 24usize, 52usize, 4usize);
+add_sub_const_decimals!(28usize, 23usize, 51usize, 5usize);
+add_sub_const_decimals!(28usize, 22usize, 50usize, 6usize);
+add_sub_const_decimals!(28usize, 21usize, 49usize, 7usize);
+add_sub_const_decimals!(28usize, 20usize, 48usize, 8usize);
+add_sub_const_decimals!(28usize, 19usize, 47usize, 9usize);
+add_sub_const_decimals!(28usize, 18usize, 46usize, 10usize);
+add_sub_const_decimals!(28usize, 17usize, 45usize, 11usize);
+add_sub_const_decimals!(28usize, 16usize, 44usize, 12usize);
+add_sub_const_decimals!(28usize, 15usize, 43usize, 13usize);
+add_sub_const_decimals!(28usize, 14usize, 42usize, 14usize);
+add_sub_const_decimals!(28usize, 13usize, 41usize, 15usize);
+add_sub_const_decimals!(28usize, 12usize, 40usize, 16usize);
+add_sub_const_decimals!(28usize, 11usize, 39usize, 17usize);
+add_sub_const_decimals!(28usize, 10usize, 38usize, 18usize);
+add_sub_const_decimals!(28usize, 9usize, 37usize, 19usize);
+add_sub_const_decimals!(28usize, 8usize, 36usize, 20usize);
+add_sub_const_decimals!(28usize, 7usize, 35usize, 21usize);
+add_sub_const_decimals!(28usize, 6usize, 34usize, 22usize);
+add_sub_const_decimals!(28usize, 5usize, 33usize, 23usize);
+add_sub_const_decimals!(28usize, 4usize, 32usize, 24usize);
+add_sub_const_decimals!(28usize, 3usize, 31usize, 25usize);
+add_sub_const_decimals!(28usize, 2usize, 30usize, 26usize);
+add_sub_const_decimals!(28usize, 1usize, 29usize, 27usize);
+add_sub_const_decimals!(28usize, 0usize, 28usize, 28usize);
+add_sub_const_decimals!(27usize, 64usize, 91usize, 0usize);
+add_sub_const_decimals!(27usize, 63usize, 90usize, 0usize);
+add_sub_const_decimals!(27usize, 62usize, 89usize, 0usize);
+add_sub_const_decimals!(27usize, 61usize, 88usize, 0usize);
+add_sub_const_decimals!(27usize, 60usize, 87usize, 0usize);
+add_sub_const_decimals!(27usize, 59usize, 86usize, 0usize);
+add_sub_const_decimals!(27usize, 58usize, 85usize, 0usize);
+add_sub_const_decimals!(27usize, 57usize, 84usize, 0usize);
+add_sub_const_decimals!(27usize, 56usize, 83usize, 0usize);
+add_sub_const_decimals!(27usize, 55usize, 82usize, 0usize);
+add_sub_const_decimals!(27usize, 54usize, 81usize, 0usize);
+add_sub_const_decimals!(27usize, 53usize, 80usize, 0usize);
+add_sub_const_decimals!(27usize, 52usize, 79usize, 0usize);
+add_sub_const_decimals!(27usize, 51usize, 78usize, 0usize);
+add_sub_const_decimals!(27usize, 50usize, 77usize, 0usize);
+add_sub_const_decimals!(27usize, 49usize, 76usize, 0usize);
+add_sub_const_decimals!(27usize, 48usize, 75usize, 0usize);
+add_sub_const_decimals!(27usize, 47usize, 74usize, 0usize);
+add_sub_const_decimals!(27usize, 46usize, 73usize, 0usize);
+add_sub_const_decimals!(27usize, 45usize, 72usize, 0usize);
+add_sub_const_decimals!(27usize, 44usize, 71usize, 0usize);
+add_sub_const_decimals!(27usize, 43usize, 70usize, 0usize);
+add_sub_const_decimals!(27usize, 42usize, 69usize, 0usize);
+add_sub_const_decimals!(27usize, 41usize, 68usize, 0usize);
+add_sub_const_decimals!(27usize, 40usize, 67usize, 0usize);
+add_sub_const_decimals!(27usize, 39usize, 66usize, 0usize);
+add_sub_const_decimals!(27usize, 38usize, 65usize, 0usize);
+add_sub_const_decimals!(27usize, 37usize, 64usize, 0usize);
+add_sub_const_decimals!(27usize, 36usize, 63usize, 0usize);
+add_sub_const_decimals!(27usize, 35usize, 62usize, 0usize);
+add_sub_const_decimals!(27usize, 34usize, 61usize, 0usize);
+add_sub_const_decimals!(27usize, 33usize, 60usize, 0usize);
+add_sub_const_decimals!(27usize, 32usize, 59usize, 0usize);
+add_sub_const_decimals!(27usize, 31usize, 58usize, 0usize);
+add_sub_const_decimals!(27usize, 30usize, 57usize, 0usize);
+add_sub_const_decimals!(27usize, 29usize, 56usize, 0usize);
+add_sub_const_decimals!(27usize, 28usize, 55usize, 0usize);
+add_sub_const_decimals!(27usize, 27usize, 54usize, 0usize);
+add_sub_const_decimals!(27usize, 26usize, 53usize, 1usize);
+add_sub_const_decimals!(27usize, 25usize, 52usize, 2usize);
+add_sub_const_decimals!(27usize, 24usize, 51usize, 3usize);
+add_sub_const_decimals!(27usize, 23usize, 50usize, 4usize);
+add_sub_const_decimals!(27usize, 22usize, 49usize, 5usize);
+add_sub_const_decimals!(27usize, 21usize, 48usize, 6usize);
+add_sub_const_decimals!(27usize, 20usize, 47usize, 7usize);
+add_sub_const_decimals!(27usize, 19usize, 46usize, 8usize);
+add_sub_const_decimals!(27usize, 18usize, 45usize, 9usize);
+add_sub_const_decimals!(27usize, 17usize, 44usize, 10usize);
+add_sub_const_decimals!(27usize, 16usize, 43usize, 11usize);
+add_sub_const_decimals!(27usize, 15usize, 42usize, 12usize);
+add_sub_const_decimals!(27usize, 14usize, 41usize, 13usize);
+add_sub_const_decimals!(27usize, 13usize, 40usize, 14usize);
+add_sub_const_decimals!(27usize, 12usize, 39usize, 15usize);
+add_sub_const_decimals!(27usize, 11usize, 38usize, 16usize);
+add_sub_const_decimals!(27usize, 10usize, 37usize, 17usize);
+add_sub_const_decimals!(27usize, 9usize, 36usize, 18usize);
+add_sub_const_decimals!(27usize, 8usize, 35usize, 19usize);
+add_sub_const_decimals!(27usize, 7usize, 34usize, 20usize);
+add_sub_const_decimals!(27usize, 6usize, 33usize, 21usize);
+add_sub_const_decimals!(27usize, 5usize, 32usize, 22usize);
+add_sub_const_decimals!(27usize, 4usize, 31usize, 23usize);
+add_sub_const_decimals!(27usize, 3usize, 30usize, 24usize);
+add_sub_const_decimals!(27usize, 2usize, 29usize, 25usize);
+add_sub_const_decimals!(27usize, 1usize, 28usize, 26usize);
+add_sub_const_decimals!(27usize, 0usize, 27usize, 27usize);
+add_sub_const_decimals!(26usize, 64usize, 90usize, 0usize);
+add_sub_const_decimals!(26usize, 63usize, 89usize, 0usize);
+add_sub_const_decimals!(26usize, 62usize, 88usize, 0usize);
+add_sub_const_decimals!(26usize, 61usize, 87usize, 0usize);
+add_sub_const_decimals!(26usize, 60usize, 86usize, 0usize);
+add_sub_const_decimals!(26usize, 59usize, 85usize, 0usize);
+add_sub_const_decimals!(26usize, 58usize, 84usize, 0usize);
+add_sub_const_decimals!(26usize, 57usize, 83usize, 0usize);
+add_sub_const_decimals!(26usize, 56usize, 82usize, 0usize);
+add_sub_const_decimals!(26usize, 55usize, 81usize, 0usize);
+add_sub_const_decimals!(26usize, 54usize, 80usize, 0usize);
+add_sub_const_decimals!(26usize, 53usize, 79usize, 0usize);
+add_sub_const_decimals!(26usize, 52usize, 78usize, 0usize);
+add_sub_const_decimals!(26usize, 51usize, 77usize, 0usize);
+add_sub_const_decimals!(26usize, 50usize, 76usize, 0usize);
+add_sub_const_decimals!(26usize, 49usize, 75usize, 0usize);
+add_sub_const_decimals!(26usize, 48usize, 74usize, 0usize);
+add_sub_const_decimals!(26usize, 47usize, 73usize, 0usize);
+add_sub_const_decimals!(26usize, 46usize, 72usize, 0usize);
+add_sub_const_decimals!(26usize, 45usize, 71usize, 0usize);
+add_sub_const_decimals!(26usize, 44usize, 70usize, 0usize);
+add_sub_const_decimals!(26usize, 43usize, 69usize, 0usize);
+add_sub_const_decimals!(26usize, 42usize, 68usize, 0usize);
+add_sub_const_decimals!(26usize, 41usize, 67usize, 0usize);
+add_sub_const_decimals!(26usize, 40usize, 66usize, 0usize);
+add_sub_const_decimals!(26usize, 39usize, 65usize, 0usize);
+add_sub_const_decimals!(26usize, 38usize, 64usize, 0usize);
+add_sub_const_decimals!(26usize, 37usize, 63usize, 0usize);
+add_sub_const_decimals!(26usize, 36usize, 62usize, 0usize);
+add_sub_const_decimals!(26usize, 35usize, 61usize, 0usize);
+add_sub_const_decimals!(26usize, 34usize, 60usize, 0usize);
+add_sub_const_decimals!(26usize, 33usize, 59usize, 0usize);
+add_sub_const_decimals!(26usize, 32usize, 58usize, 0usize);
+add_sub_const_decimals!(26usize, 31usize, 57usize, 0usize);
+add_sub_const_decimals!(26usize, 30usize, 56usize, 0usize);
+add_sub_const_decimals!(26usize, 29usize, 55usize, 0usize);
+add_sub_const_decimals!(26usize, 28usize, 54usize, 0usize);
+add_sub_const_decimals!(26usize, 27usize, 53usize, 0usize);
+add_sub_const_decimals!(26usize, 26usize, 52usize, 0usize);
+add_sub_const_decimals!(26usize, 25usize, 51usize, 1usize);
+add_sub_const_decimals!(26usize, 24usize, 50usize, 2usize);
+add_sub_const_decimals!(26usize, 23usize, 49usize, 3usize);
+add_sub_const_decimals!(26usize, 22usize, 48usize, 4usize);
+add_sub_const_decimals!(26usize, 21usize, 47usize, 5usize);
+add_sub_const_decimals!(26usize, 20usize, 46usize, 6usize);
+add_sub_const_decimals!(26usize, 19usize, 45usize, 7usize);
+add_sub_const_decimals!(26usize, 18usize, 44usize, 8usize);
+add_sub_const_decimals!(26usize, 17usize, 43usize, 9usize);
+add_sub_const_decimals!(26usize, 16usize, 42usize, 10usize);
+add_sub_const_decimals!(26usize, 15usize, 41usize, 11usize);
+add_sub_const_decimals!(26usize, 14usize, 40usize, 12usize);
+add_sub_const_decimals!(26usize, 13usize, 39usize, 13usize);
+add_sub_const_decimals!(26usize, 12usize, 38usize, 14usize);
+add_sub_const_decimals!(26usize, 11usize, 37usize, 15usize);
+add_sub_const_decimals!(26usize, 10usize, 36usize, 16usize);
+add_sub_const_decimals!(26usize, 9usize, 35usize, 17usize);
+add_sub_const_decimals!(26usize, 8usize, 34usize, 18usize);
+add_sub_const_decimals!(26usize, 7usize, 33usize, 19usize);
+add_sub_const_decimals!(26usize, 6usize, 32usize, 20usize);
+add_sub_const_decimals!(26usize, 5usize, 31usize, 21usize);
+add_sub_const_decimals!(26usize, 4usize, 30usize, 22usize);
+add_sub_const_decimals!(26usize, 3usize, 29usize, 23usize);
+add_sub_const_decimals!(26usize, 2usize, 28usize, 24usize);
+add_sub_const_decimals!(26usize, 1usize, 27usize, 25usize);
+add_sub_const_decimals!(26usize, 0usize, 26usize, 26usize);
+add_sub_const_decimals!(25usize, 64usize, 89usize, 0usize);
+add_sub_const_decimals!(25usize, 63usize, 88usize, 0usize);
+add_sub_const_decimals!(25usize, 62usize, 87usize, 0usize);
+add_sub_const_decimals!(25usize, 61usize, 86usize, 0usize);
+add_sub_const_decimals!(25usize, 60usize, 85usize, 0usize);
+add_sub_const_decimals!(25usize, 59usize, 84usize, 0usize);
+add_sub_const_decimals!(25usize, 58usize, 83usize, 0usize);
+add_sub_const_decimals!(25usize, 57usize, 82usize, 0usize);
+add_sub_const_decimals!(25usize, 56usize, 81usize, 0usize);
+add_sub_const_decimals!(25usize, 55usize, 80usize, 0usize);
+add_sub_const_decimals!(25usize, 54usize, 79usize, 0usize);
+add_sub_const_decimals!(25usize, 53usize, 78usize, 0usize);
+add_sub_const_decimals!(25usize, 52usize, 77usize, 0usize);
+add_sub_const_decimals!(25usize, 51usize, 76usize, 0usize);
+add_sub_const_decimals!(25usize, 50usize, 75usize, 0usize);
+add_sub_const_decimals!(25usize, 49usize, 74usize, 0usize);
+add_sub_const_decimals!(25usize, 48usize, 73usize, 0usize);
+add_sub_const_decimals!(25usize, 47usize, 72usize, 0usize);
+add_sub_const_decimals!(25usize, 46usize, 71usize, 0usize);
+add_sub_const_decimals!(25usize, 45usize, 70usize, 0usize);
+add_sub_const_decimals!(25usize, 44usize, 69usize, 0usize);
+add_sub_const_decimals!(25usize, 43usize, 68usize, 0usize);
+add_sub_const_decimals!(25usize, 42usize, 67usize, 0usize);
+add_sub_const_decimals!(25usize, 41usize, 66usize, 0usize);
+add_sub_const_decimals!(25usize, 40usize, 65usize, 0usize);
+add_sub_const_decimals!(25usize, 39usize, 64usize, 0usize);
+add_sub_const_decimals!(25usize, 38usize, 63usize, 0usize);
+add_sub_const_decimals!(25usize, 37usize, 62usize, 0usize);
+add_sub_const_decimals!(25usize, 36usize, 61usize, 0usize);
+add_sub_const_decimals!(25usize, 35usize, 60usize, 0usize);
+add_sub_const_decimals!(25usize, 34usize, 59usize, 0usize);
+add_sub_const_decimals!(25usize, 33usize, 58usize, 0usize);
+add_sub_const_decimals!(25usize, 32usize, 57usize, 0usize);
+add_sub_const_decimals!(25usize, 31usize, 56usize, 0usize);
+add_sub_const_decimals!(25usize, 30usize, 55usize, 0usize);
+add_sub_const_decimals!(25usize, 29usize, 54usize, 0usize);
+add_sub_const_decimals!(25usize, 28usize, 53usize, 0usize);
+add_sub_const_decimals!(25usize, 27usize, 52usize, 0usize);
+add_sub_const_decimals!(25usize, 26usize, 51usize, 0usize);
+add_sub_const_decimals!(25usize, 25usize, 50usize, 0usize);
+add_sub_const_decimals!(25usize, 24usize, 49usize, 1usize);
+add_sub_const_decimals!(25usize, 23usize, 48usize, 2usize);
+add_sub_const_decimals!(25usize, 22usize, 47usize, 3usize);
+add_sub_const_decimals!(25usize, 21usize, 46usize, 4usize);
+add_sub_const_decimals!(25usize, 20usize, 45usize, 5usize);
+add_sub_const_decimals!(25usize, 19usize, 44usize, 6usize);
+add_sub_const_decimals!(25usize, 18usize, 43usize, 7usize);
+add_sub_const_decimals!(25usize, 17usize, 42usize, 8usize);
+add_sub_const_decimals!(25usize, 16usize, 41usize, 9usize);
+add_sub_const_decimals!(25usize, 15usize, 40usize, 10usize);
+add_sub_const_decimals!(25usize, 14usize, 39usize, 11usize);
+add_sub_const_decimals!(25usize, 13usize, 38usize, 12usize);
+add_sub_const_decimals!(25usize, 12usize, 37usize, 13usize);
+add_sub_const_decimals!(25usize, 11usize, 36usize, 14usize);
+add_sub_const_decimals!(25usize, 10usize, 35usize, 15usize);
+add_sub_const_decimals!(25usize, 9usize, 34usize, 16usize);
+add_sub_const_decimals!(25usize, 8usize, 33usize, 17usize);
+add_sub_const_decimals!(25usize, 7usize, 32usize, 18usize);
+add_sub_const_decimals!(25usize, 6usize, 31usize, 19usize);
+add_sub_const_decimals!(25usize, 5usize, 30usize, 20usize);
+add_sub_const_decimals!(25usize, 4usize, 29usize, 21usize);
+add_sub_const_decimals!(25usize, 3usize, 28usize, 22usize);
+add_sub_const_decimals!(25usize, 2usize, 27usize, 23usize);
+add_sub_const_decimals!(25usize, 1usize, 26usize, 24usize);
+add_sub_const_decimals!(25usize, 0usize, 25usize, 25usize);
+add_sub_const_decimals!(24usize, 64usize, 88usize, 0usize);
+add_sub_const_decimals!(24usize, 63usize, 87usize, 0usize);
+add_sub_const_decimals!(24usize, 62usize, 86usize, 0usize);
+add_sub_const_decimals!(24usize, 61usize, 85usize, 0usize);
+add_sub_const_decimals!(24usize, 60usize, 84usize, 0usize);
+add_sub_const_decimals!(24usize, 59usize, 83usize, 0usize);
+add_sub_const_decimals!(24usize, 58usize, 82usize, 0usize);
+add_sub_const_decimals!(24usize, 57usize, 81usize, 0usize);
+add_sub_const_decimals!(24usize, 56usize, 80usize, 0usize);
+add_sub_const_decimals!(24usize, 55usize, 79usize, 0usize);
+add_sub_const_decimals!(24usize, 54usize, 78usize, 0usize);
+add_sub_const_decimals!(24usize, 53usize, 77usize, 0usize);
+add_sub_const_decimals!(24usize, 52usize, 76usize, 0usize);
+add_sub_const_decimals!(24usize, 51usize, 75usize, 0usize);
+add_sub_const_decimals!(24usize, 50usize, 74usize, 0usize);
+add_sub_const_decimals!(24usize, 49usize, 73usize, 0usize);
+add_sub_const_decimals!(24usize, 48usize, 72usize, 0usize);
+add_sub_const_decimals!(24usize, 47usize, 71usize, 0usize);
+add_sub_const_decimals!(24usize, 46usize, 70usize, 0usize);
+add_sub_const_decimals!(24usize, 45usize, 69usize, 0usize);
+add_sub_const_decimals!(24usize, 44usize, 68usize, 0usize);
+add_sub_const_decimals!(24usize, 43usize, 67usize, 0usize);
+add_sub_const_decimals!(24usize, 42usize, 66usize, 0usize);
+add_sub_const_decimals!(24usize, 41usize, 65usize, 0usize);
+add_sub_const_decimals!(24usize, 40usize, 64usize, 0usize);
+add_sub_const_decimals!(24usize, 39usize, 63usize, 0usize);
+add_sub_const_decimals!(24usize, 38usize, 62usize, 0usize);
+add_sub_const_decimals!(24usize, 37usize, 61usize, 0usize);
+add_sub_const_decimals!(24usize, 36usize, 60usize, 0usize);
+add_sub_const_decimals!(24usize, 35usize, 59usize, 0usize);
+add_sub_const_decimals!(24usize, 34usize, 58usize, 0usize);
+add_sub_const_decimals!(24usize, 33usize, 57usize, 0usize);
+add_sub_const_decimals!(24usize, 32usize, 56usize, 0usize);
+add_sub_const_decimals!(24usize, 31usize, 55usize, 0usize);
+add_sub_const_decimals!(24usize, 30usize, 54usize, 0usize);
+add_sub_const_decimals!(24usize, 29usize, 53usize, 0usize);
+add_sub_const_decimals!(24usize, 28usize, 52usize, 0usize);
+add_sub_const_decimals!(24usize, 27usize, 51usize, 0usize);
+add_sub_const_decimals!(24usize, 26usize, 50usize, 0usize);
+add_sub_const_decimals!(24usize, 25usize, 49usize, 0usize);
+add_sub_const_decimals!(24usize, 24usize, 48usize, 0usize);
+add_sub_const_decimals!(24usize, 23usize, 47usize, 1usize);
+add_sub_const_decimals!(24usize, 22usize, 46usize, 2usize);
+add_sub_const_decimals!(24usize, 21usize, 45usize, 3usize);
+add_sub_const_decimals!(24usize, 20usize, 44usize, 4usize);
+add_sub_const_decimals!(24usize, 19usize, 43usize, 5usize);
+add_sub_const_decimals!(24usize, 18usize, 42usize, 6usize);
+add_sub_const_decimals!(24usize, 17usize, 41usize, 7usize);
+add_sub_const_decimals!(24usize, 16usize, 40usize, 8usize);
+add_sub_const_decimals!(24usize, 15usize, 39usize, 9usize);
+add_sub_const_decimals!(24usize, 14usize, 38usize, 10usize);
+add_sub_const_decimals!(24usize, 13usize, 37usize, 11usize);
+add_sub_const_decimals!(24usize, 12usize, 36usize, 12usize);
+add_sub_const_decimals!(24usize, 11usize, 35usize, 13usize);
+add_sub_const_decimals!(24usize, 10usize, 34usize, 14usize);
+add_sub_const_decimals!(24usize, 9usize, 33usize, 15usize);
+add_sub_const_decimals!(24usize, 8usize, 32usize, 16usize);
+add_sub_const_decimals!(24usize, 7usize, 31usize, 17usize);
+add_sub_const_decimals!(24usize, 6usize, 30usize, 18usize);
+add_sub_const_decimals!(24usize, 5usize, 29usize, 19usize);
+add_sub_const_decimals!(24usize, 4usize, 28usize, 20usize);
+add_sub_const_decimals!(24usize, 3usize, 27usize, 21usize);
+add_sub_const_decimals!(24usize, 2usize, 26usize, 22usize);
+add_sub_const_decimals!(24usize, 1usize, 25usize, 23usize);
+add_sub_const_decimals!(24usize, 0usize, 24usize, 24usize);
+add_sub_const_decimals!(23usize, 64usize, 87usize, 0usize);
+add_sub_const_decimals!(23usize, 63usize, 86usize, 0usize);
+add_sub_const_decimals!(23usize, 62usize, 85usize, 0usize);
+add_sub_const_decimals!(23usize, 61usize, 84usize, 0usize);
+add_sub_const_decimals!(23usize, 60usize, 83usize, 0usize);
+add_sub_const_decimals!(23usize, 59usize, 82usize, 0usize);
+add_sub_const_decimals!(23usize, 58usize, 81usize, 0usize);
+add_sub_const_decimals!(23usize, 57usize, 80usize, 0usize);
+add_sub_const_decimals!(23usize, 56usize, 79usize, 0usize);
+add_sub_const_decimals!(23usize, 55usize, 78usize, 0usize);
+add_sub_const_decimals!(23usize, 54usize, 77usize, 0usize);
+add_sub_const_decimals!(23usize, 53usize, 76usize, 0usize);
+add_sub_const_decimals!(23usize, 52usize, 75usize, 0usize);
+add_sub_const_decimals!(23usize, 51usize, 74usize, 0usize);
+add_sub_const_decimals!(23usize, 50usize, 73usize, 0usize);
+add_sub_const_decimals!(23usize, 49usize, 72usize, 0usize);
+add_sub_const_decimals!(23usize, 48usize, 71usize, 0usize);
+add_sub_const_decimals!(23usize, 47usize, 70usize, 0usize);
+add_sub_const_decimals!(23usize, 46usize, 69usize, 0usize);
+add_sub_const_decimals!(23usize, 45usize, 68usize, 0usize);
+add_sub_const_decimals!(23usize, 44usize, 67usize, 0usize);
+add_sub_const_decimals!(23usize, 43usize, 66usize, 0usize);
+add_sub_const_decimals!(23usize, 42usize, 65usize, 0usize);
+add_sub_const_decimals!(23usize, 41usize, 64usize, 0usize);
+add_sub_const_decimals!(23usize, 40usize, 63usize, 0usize);
+add_sub_const_decimals!(23usize, 39usize, 62usize, 0usize);
+add_sub_const_decimals!(23usize, 38usize, 61usize, 0usize);
+add_sub_const_decimals!(23usize, 37usize, 60usize, 0usize);
+add_sub_const_decimals!(23usize, 36usize, 59usize, 0usize);
+add_sub_const_decimals!(23usize, 35usize, 58usize, 0usize);
+add_sub_const_decimals!(23usize, 34usize, 57usize, 0usize);
+add_sub_const_decimals!(23usize, 33usize, 56usize, 0usize);
+add_sub_const_decimals!(23usize, 32usize, 55usize, 0usize);
+add_sub_const_decimals!(23usize, 31usize, 54usize, 0usize);
+add_sub_const_decimals!(23usize, 30usize, 53usize, 0usize);
+add_sub_const_decimals!(23usize, 29usize, 52usize, 0usize);
+add_sub_const_decimals!(23usize, 28usize, 51usize, 0usize);
+add_sub_const_decimals!(23usize, 27usize, 50usize, 0usize);
+add_sub_const_decimals!(23usize, 26usize, 49usize, 0usize);
+add_sub_const_decimals!(23usize, 25usize, 48usize, 0usize);
+add_sub_const_decimals!(23usize, 24usize, 47usize, 0usize);
+add_sub_const_decimals!(23usize, 23usize, 46usize, 0usize);
+add_sub_const_decimals!(23usize, 22usize, 45usize, 1usize);
+add_sub_const_decimals!(23usize, 21usize, 44usize, 2usize);
+add_sub_const_decimals!(23usize, 20usize, 43usize, 3usize);
+add_sub_const_decimals!(23usize, 19usize, 42usize, 4usize);
+add_sub_const_decimals!(23usize, 18usize, 41usize, 5usize);
+add_sub_const_decimals!(23usize, 17usize, 40usize, 6usize);
+add_sub_const_decimals!(23usize, 16usize, 39usize, 7usize);
+add_sub_const_decimals!(23usize, 15usize, 38usize, 8usize);
+add_sub_const_decimals!(23usize, 14usize, 37usize, 9usize);
+add_sub_const_decimals!(23usize, 13usize, 36usize, 10usize);
+add_sub_const_decimals!(23usize, 12usize, 35usize, 11usize);
+add_sub_const_decimals!(23usize, 11usize, 34usize, 12usize);
+add_sub_const_decimals!(23usize, 10usize, 33usize, 13usize);
+add_sub_const_decimals!(23usize, 9usize, 32usize, 14usize);
+add_sub_const_decimals!(23usize, 8usize, 31usize, 15usize);
+add_sub_const_decimals!(23usize, 7usize, 30usize, 16usize);
+add_sub_const_decimals!(23usize, 6usize, 29usize, 17usize);
+add_sub_const_decimals!(23usize, 5usize, 28usize, 18usize);
+add_sub_const_decimals!(23usize, 4usize, 27usize, 19usize);
+add_sub_const_decimals!(23usize, 3usize, 26usize, 20usize);
+add_sub_const_decimals!(23usize, 2usize, 25usize, 21usize);
+add_sub_const_decimals!(23usize, 1usize, 24usize, 22usize);
+add_sub_const_decimals!(23usize, 0usize, 23usize, 23usize);
+add_sub_const_decimals!(22usize, 64usize, 86usize, 0usize);
+add_sub_const_decimals!(22usize, 63usize, 85usize, 0usize);
+add_sub_const_decimals!(22usize, 62usize, 84usize, 0usize);
+add_sub_const_decimals!(22usize, 61usize, 83usize, 0usize);
+add_sub_const_decimals!(22usize, 60usize, 82usize, 0usize);
+add_sub_const_decimals!(22usize, 59usize, 81usize, 0usize);
+add_sub_const_decimals!(22usize, 58usize, 80usize, 0usize);
+add_sub_const_decimals!(22usize, 57usize, 79usize, 0usize);
+add_sub_const_decimals!(22usize, 56usize, 78usize, 0usize);
+add_sub_const_decimals!(22usize, 55usize, 77usize, 0usize);
+add_sub_const_decimals!(22usize, 54usize, 76usize, 0usize);
+add_sub_const_decimals!(22usize, 53usize, 75usize, 0usize);
+add_sub_const_decimals!(22usize, 52usize, 74usize, 0usize);
+add_sub_const_decimals!(22usize, 51usize, 73usize, 0usize);
+add_sub_const_decimals!(22usize, 50usize, 72usize, 0usize);
+add_sub_const_decimals!(22usize, 49usize, 71usize, 0usize);
+add_sub_const_decimals!(22usize, 48usize, 70usize, 0usize);
+add_sub_const_decimals!(22usize, 47usize, 69usize, 0usize);
+add_sub_const_decimals!(22usize, 46usize, 68usize, 0usize);
+add_sub_const_decimals!(22usize, 45usize, 67usize, 0usize);
+add_sub_const_decimals!(22usize, 44usize, 66usize, 0usize);
+add_sub_const_decimals!(22usize, 43usize, 65usize, 0usize);
+add_sub_const_decimals!(22usize, 42usize, 64usize, 0usize);
+add_sub_const_decimals!(22usize, 41usize, 63usize, 0usize);
+add_sub_const_decimals!(22usize, 40usize, 62usize, 0usize);
+add_sub_const_decimals!(22usize, 39usize, 61usize, 0usize);
+add_sub_const_decimals!(22usize, 38usize, 60usize, 0usize);
+add_sub_const_decimals!(22usize, 37usize, 59usize, 0usize);
+add_sub_const_decimals!(22usize, 36usize, 58usize, 0usize);
+add_sub_const_decimals!(22usize, 35usize, 57usize, 0usize);
+add_sub_const_decimals!(22usize, 34usize, 56usize, 0usize);
+add_sub_const_decimals!(22usize, 33usize, 55usize, 0usize);
+add_sub_const_decimals!(22usize, 32usize, 54usize, 0usize);
+add_sub_const_decimals!(22usize, 31usize, 53usize, 0usize);
+add_sub_const_decimals!(22usize, 30usize, 52usize, 0usize);
+add_sub_const_decimals!(22usize, 29usize, 51usize, 0usize);
+add_sub_const_decimals!(22usize, 28usize, 50usize, 0usize);
+add_sub_const_decimals!(22usize, 27usize, 49usize, 0usize);
+add_sub_const_decimals!(22usize, 26usize, 48usize, 0usize);
+add_sub_const_decimals!(22usize, 25usize, 47usize, 0usize);
+add_sub_const_decimals!(22usize, 24usize, 46usize, 0usize);
+add_sub_const_decimals!(22usize, 23usize, 45usize, 0usize);
+add_sub_const_decimals!(22usize, 22usize, 44usize, 0usize);
+add_sub_const_decimals!(22usize, 21usize, 43usize, 1usize);
+add_sub_const_decimals!(22usize, 20usize, 42usize, 2usize);
+add_sub_const_decimals!(22usize, 19usize, 41usize, 3usize);
+add_sub_const_decimals!(22usize, 18usize, 40usize, 4usize);
+add_sub_const_decimals!(22usize, 17usize, 39usize, 5usize);
+add_sub_const_decimals!(22usize, 16usize, 38usize, 6usize);
+add_sub_const_decimals!(22usize, 15usize, 37usize, 7usize);
+add_sub_const_decimals!(22usize, 14usize, 36usize, 8usize);
+add_sub_const_decimals!(22usize, 13usize, 35usize, 9usize);
+add_sub_const_decimals!(22usize, 12usize, 34usize, 10usize);
+add_sub_const_decimals!(22usize, 11usize, 33usize, 11usize);
+add_sub_const_decimals!(22usize, 10usize, 32usize, 12usize);
+add_sub_const_decimals!(22usize, 9usize, 31usize, 13usize);
+add_sub_const_decimals!(22usize, 8usize, 30usize, 14usize);
+add_sub_const_decimals!(22usize, 7usize, 29usize, 15usize);
+add_sub_const_decimals!(22usize, 6usize, 28usize, 16usize);
+add_sub_const_decimals!(22usize, 5usize, 27usize, 17usize);
+add_sub_const_decimals!(22usize, 4usize, 26usize, 18usize);
+add_sub_const_decimals!(22usize, 3usize, 25usize, 19usize);
+add_sub_const_decimals!(22usize, 2usize, 24usize, 20usize);
+add_sub_const_decimals!(22usize, 1usize, 23usize, 21usize);
+add_sub_const_decimals!(22usize, 0usize, 22usize, 22usize);
+add_sub_const_decimals!(21usize, 64usize, 85usize, 0usize);
+add_sub_const_decimals!(21usize, 63usize, 84usize, 0usize);
+add_sub_const_decimals!(21usize, 62usize, 83usize, 0usize);
+add_sub_const_decimals!(21usize, 61usize, 82usize, 0usize);
+add_sub_const_decimals!(21usize, 60usize, 81usize, 0usize);
+add_sub_const_decimals!(21usize, 59usize, 80usize, 0usize);
+add_sub_const_decimals!(21usize, 58usize, 79usize, 0usize);
+add_sub_const_decimals!(21usize, 57usize, 78usize, 0usize);
+add_sub_const_decimals!(21usize, 56usize, 77usize, 0usize);
+add_sub_const_decimals!(21usize, 55usize, 76usize, 0usize);
+add_sub_const_decimals!(21usize, 54usize, 75usize, 0usize);
+add_sub_const_decimals!(21usize, 53usize, 74usize, 0usize);
+add_sub_const_decimals!(21usize, 52usize, 73usize, 0usize);
+add_sub_const_decimals!(21usize, 51usize, 72usize, 0usize);
+add_sub_const_decimals!(21usize, 50usize, 71usize, 0usize);
+add_sub_const_decimals!(21usize, 49usize, 70usize, 0usize);
+add_sub_const_decimals!(21usize, 48usize, 69usize, 0usize);
+add_sub_const_decimals!(21usize, 47usize, 68usize, 0usize);
+add_sub_const_decimals!(21usize, 46usize, 67usize, 0usize);
+add_sub_const_decimals!(21usize, 45usize, 66usize, 0usize);
+add_sub_const_decimals!(21usize, 44usize, 65usize, 0usize);
+add_sub_const_decimals!(21usize, 43usize, 64usize, 0usize);
+add_sub_const_decimals!(21usize, 42usize, 63usize, 0usize);
+add_sub_const_decimals!(21usize, 41usize, 62usize, 0usize);
+add_sub_const_decimals!(21usize, 40usize, 61usize, 0usize);
+add_sub_const_decimals!(21usize, 39usize, 60usize, 0usize);
+add_sub_const_decimals!(21usize, 38usize, 59usize, 0usize);
+add_sub_const_decimals!(21usize, 37usize, 58usize, 0usize);
+add_sub_const_decimals!(21usize, 36usize, 57usize, 0usize);
+add_sub_const_decimals!(21usize, 35usize, 56usize, 0usize);
+add_sub_const_decimals!(21usize, 34usize, 55usize, 0usize);
+add_sub_const_decimals!(21usize, 33usize, 54usize, 0usize);
+add_sub_const_decimals!(21usize, 32usize, 53usize, 0usize);
+add_sub_const_decimals!(21usize, 31usize, 52usize, 0usize);
+add_sub_const_decimals!(21usize, 30usize, 51usize, 0usize);
+add_sub_const_decimals!(21usize, 29usize, 50usize, 0usize);
+add_sub_const_decimals!(21usize, 28usize, 49usize, 0usize);
+add_sub_const_decimals!(21usize, 27usize, 48usize, 0usize);
+add_sub_const_decimals!(21usize, 26usize, 47usize, 0usize);
+add_sub_const_decimals!(21usize, 25usize, 46usize, 0usize);
+add_sub_const_decimals!(21usize, 24usize, 45usize, 0usize);
+add_sub_const_decimals!(21usize, 23usize, 44usize, 0usize);
+add_sub_const_decimals!(21usize, 22usize, 43usize, 0usize);
+add_sub_const_decimals!(21usize, 21usize, 42usize, 0usize);
+add_sub_const_decimals!(21usize, 20usize, 41usize, 1usize);
+add_sub_const_decimals!(21usize, 19usize, 40usize, 2usize);
+add_sub_const_decimals!(21usize, 18usize, 39usize, 3usize);
+add_sub_const_decimals!(21usize, 17usize, 38usize, 4usize);
+add_sub_const_decimals!(21usize, 16usize, 37usize, 5usize);
+add_sub_const_decimals!(21usize, 15usize, 36usize, 6usize);
+add_sub_const_decimals!(21usize, 14usize, 35usize, 7usize);
+add_sub_const_decimals!(21usize, 13usize, 34usize, 8usize);
+add_sub_const_decimals!(21usize, 12usize, 33usize, 9usize);
+add_sub_const_decimals!(21usize, 11usize, 32usize, 10usize);
+add_sub_const_decimals!(21usize, 10usize, 31usize, 11usize);
+add_sub_const_decimals!(21usize, 9usize, 30usize, 12usize);
+add_sub_const_decimals!(21usize, 8usize, 29usize, 13usize);
+add_sub_const_decimals!(21usize, 7usize, 28usize, 14usize);
+add_sub_const_decimals!(21usize, 6usize, 27usize, 15usize);
+add_sub_const_decimals!(21usize, 5usize, 26usize, 16usize);
+add_sub_const_decimals!(21usize, 4usize, 25usize, 17usize);
+add_sub_const_decimals!(21usize, 3usize, 24usize, 18usize);
+add_sub_const_decimals!(21usize, 2usize, 23usize, 19usize);
+add_sub_const_decimals!(21usize, 1usize, 22usize, 20usize);
+add_sub_const_decimals!(21usize, 0usize, 21usize, 21usize);
+add_sub_const_decimals!(20usize, 64usize, 84usize, 0usize);
+add_sub_const_decimals!(20usize, 63usize, 83usize, 0usize);
+add_sub_const_decimals!(20usize, 62usize, 82usize, 0usize);
+add_sub_const_decimals!(20usize, 61usize, 81usize, 0usize);
+add_sub_const_decimals!(20usize, 60usize, 80usize, 0usize);
+add_sub_const_decimals!(20usize, 59usize, 79usize, 0usize);
+add_sub_const_decimals!(20usize, 58usize, 78usize, 0usize);
+add_sub_const_decimals!(20usize, 57usize, 77usize, 0usize);
+add_sub_const_decimals!(20usize, 56usize, 76usize, 0usize);
+add_sub_const_decimals!(20usize, 55usize, 75usize, 0usize);
+add_sub_const_decimals!(20usize, 54usize, 74usize, 0usize);
+add_sub_const_decimals!(20usize, 53usize, 73usize, 0usize);
+add_sub_const_decimals!(20usize, 52usize, 72usize, 0usize);
+add_sub_const_decimals!(20usize, 51usize, 71usize, 0usize);
+add_sub_const_decimals!(20usize, 50usize, 70usize, 0usize);
+add_sub_const_decimals!(20usize, 49usize, 69usize, 0usize);
+add_sub_const_decimals!(20usize, 48usize, 68usize, 0usize);
+add_sub_const_decimals!(20usize, 47usize, 67usize, 0usize);
+add_sub_const_decimals!(20usize, 46usize, 66usize, 0usize);
+add_sub_const_decimals!(20usize, 45usize, 65usize, 0usize);
+add_sub_const_decimals!(20usize, 44usize, 64usize, 0usize);
+add_sub_const_decimals!(20usize, 43usize, 63usize, 0usize);
+add_sub_const_decimals!(20usize, 42usize, 62usize, 0usize);
+add_sub_const_decimals!(20usize, 41usize, 61usize, 0usize);
+add_sub_const_decimals!(20usize, 40usize, 60usize, 0usize);
+add_sub_const_decimals!(20usize, 39usize, 59usize, 0usize);
+add_sub_const_decimals!(20usize, 38usize, 58usize, 0usize);
+add_sub_const_decimals!(20usize, 37usize, 57usize, 0usize);
+add_sub_const_decimals!(20usize, 36usize, 56usize, 0usize);
+add_sub_const_decimals!(20usize, 35usize, 55usize, 0usize);
+add_sub_const_decimals!(20usize, 34usize, 54usize, 0usize);
+add_sub_const_decimals!(20usize, 33usize, 53usize, 0usize);
+add_sub_const_decimals!(20usize, 32usize, 52usize, 0usize);
+add_sub_const_decimals!(20usize, 31usize, 51usize, 0usize);
+add_sub_const_decimals!(20usize, 30usize, 50usize, 0usize);
+add_sub_const_decimals!(20usize, 29usize, 49usize, 0usize);
+add_sub_const_decimals!(20usize, 28usize, 48usize, 0usize);
+add_sub_const_decimals!(20usize, 27usize, 47usize, 0usize);
+add_sub_const_decimals!(20usize, 26usize, 46usize, 0usize);
+add_sub_const_decimals!(20usize, 25usize, 45usize, 0usize);
+add_sub_const_decimals!(20usize, 24usize, 44usize, 0usize);
+add_sub_const_decimals!(20usize, 23usize, 43usize, 0usize);
+add_sub_const_decimals!(20usize, 22usize, 42usize, 0usize);
+add_sub_const_decimals!(20usize, 21usize, 41usize, 0usize);
+add_sub_const_decimals!(20usize, 20usize, 40usize, 0usize);
+add_sub_const_decimals!(20usize, 19usize, 39usize, 1usize);
+add_sub_const_decimals!(20usize, 18usize, 38usize, 2usize);
+add_sub_const_decimals!(20usize, 17usize, 37usize, 3usize);
+add_sub_const_decimals!(20usize, 16usize, 36usize, 4usize);
+add_sub_const_decimals!(20usize, 15usize, 35usize, 5usize);
+add_sub_const_decimals!(20usize, 14usize, 34usize, 6usize);
+add_sub_const_decimals!(20usize, 13usize, 33usize, 7usize);
+add_sub_const_decimals!(20usize, 12usize, 32usize, 8usize);
+add_sub_const_decimals!(20usize, 11usize, 31usize, 9usize);
+add_sub_const_decimals!(20usize, 10usize, 30usize, 10usize);
+add_sub_const_decimals!(20usize, 9usize, 29usize, 11usize);
+add_sub_const_decimals!(20usize, 8usize, 28usize, 12usize);
+add_sub_const_decimals!(20usize, 7usize, 27usize, 13usize);
+add_sub_const_decimals!(20usize, 6usize, 26usize, 14usize);
+add_sub_const_decimals!(20usize, 5usize, 25usize, 15usize);
+add_sub_const_decimals!(20usize, 4usize, 24usize, 16usize);
+add_sub_const_decimals!(20usize, 3usize, 23usize, 17usize);
+add_sub_const_decimals!(20usize, 2usize, 22usize, 18usize);
+add_sub_const_decimals!(20usize, 1usize, 21usize, 19usize);
+add_sub_const_decimals!(20usize, 0usize, 20usize, 20usize);
+add_sub_const_decimals!(19usize, 64usize, 83usize, 0usize);
+add_sub_const_decimals!(19usize, 63usize, 82usize, 0usize);
+add_sub_const_decimals!(19usize, 62usize, 81usize, 0usize);
+add_sub_const_decimals!(19usize, 61usize, 80usize, 0usize);
+add_sub_const_decimals!(19usize, 60usize, 79usize, 0usize);
+add_sub_const_decimals!(19usize, 59usize, 78usize, 0usize);
+add_sub_const_decimals!(19usize, 58usize, 77usize, 0usize);
+add_sub_const_decimals!(19usize, 57usize, 76usize, 0usize);
+add_sub_const_decimals!(19usize, 56usize, 75usize, 0usize);
+add_sub_const_decimals!(19usize, 55usize, 74usize, 0usize);
+add_sub_const_decimals!(19usize, 54usize, 73usize, 0usize);
+add_sub_const_decimals!(19usize, 53usize, 72usize, 0usize);
+add_sub_const_decimals!(19usize, 52usize, 71usize, 0usize);
+add_sub_const_decimals!(19usize, 51usize, 70usize, 0usize);
+add_sub_const_decimals!(19usize, 50usize, 69usize, 0usize);
+add_sub_const_decimals!(19usize, 49usize, 68usize, 0usize);
+add_sub_const_decimals!(19usize, 48usize, 67usize, 0usize);
+add_sub_const_decimals!(19usize, 47usize, 66usize, 0usize);
+add_sub_const_decimals!(19usize, 46usize, 65usize, 0usize);
+add_sub_const_decimals!(19usize, 45usize, 64usize, 0usize);
+add_sub_const_decimals!(19usize, 44usize, 63usize, 0usize);
+add_sub_const_decimals!(19usize, 43usize, 62usize, 0usize);
+add_sub_const_decimals!(19usize, 42usize, 61usize, 0usize);
+add_sub_const_decimals!(19usize, 41usize, 60usize, 0usize);
+add_sub_const_decimals!(19usize, 40usize, 59usize, 0usize);
+add_sub_const_decimals!(19usize, 39usize, 58usize, 0usize);
+add_sub_const_decimals!(19usize, 38usize, 57usize, 0usize);
+add_sub_const_decimals!(19usize, 37usize, 56usize, 0usize);
+add_sub_const_decimals!(19usize, 36usize, 55usize, 0usize);
+add_sub_const_decimals!(19usize, 35usize, 54usize, 0usize);
+add_sub_const_decimals!(19usize, 34usize, 53usize, 0usize);
+add_sub_const_decimals!(19usize, 33usize, 52usize, 0usize);
+add_sub_const_decimals!(19usize, 32usize, 51usize, 0usize);
+add_sub_const_decimals!(19usize, 31usize, 50usize, 0usize);
+add_sub_const_decimals!(19usize, 30usize, 49usize, 0usize);
+add_sub_const_decimals!(19usize, 29usize, 48usize, 0usize);
+add_sub_const_decimals!(19usize, 28usize, 47usize, 0usize);
+add_sub_const_decimals!(19usize, 27usize, 46usize, 0usize);
+add_sub_const_decimals!(19usize, 26usize, 45usize, 0usize);
+add_sub_const_decimals!(19usize, 25usize, 44usize, 0usize);
+add_sub_const_decimals!(19usize, 24usize, 43usize, 0usize);
+add_sub_const_decimals!(19usize, 23usize, 42usize, 0usize);
+add_sub_const_decimals!(19usize, 22usize, 41usize, 0usize);
+add_sub_const_decimals!(19usize, 21usize, 40usize, 0usize);
+add_sub_const_decimals!(19usize, 20usize, 39usize, 0usize);
+add_sub_const_decimals!(19usize, 19usize, 38usize, 0usize);
+add_sub_const_decimals!(19usize, 18usize, 37usize, 1usize);
+add_sub_const_decimals!(19usize, 17usize, 36usize, 2usize);
+add_sub_const_decimals!(19usize, 16usize, 35usize, 3usize);
+add_sub_const_decimals!(19usize, 15usize, 34usize, 4usize);
+add_sub_const_decimals!(19usize, 14usize, 33usize, 5usize);
+add_sub_const_decimals!(19usize, 13usize, 32usize, 6usize);
+add_sub_const_decimals!(19usize, 12usize, 31usize, 7usize);
+add_sub_const_decimals!(19usize, 11usize, 30usize, 8usize);
+add_sub_const_decimals!(19usize, 10usize, 29usize, 9usize);
+add_sub_const_decimals!(19usize, 9usize, 28usize, 10usize);
+add_sub_const_decimals!(19usize, 8usize, 27usize, 11usize);
+add_sub_const_decimals!(19usize, 7usize, 26usize, 12usize);
+add_sub_const_decimals!(19usize, 6usize, 25usize, 13usize);
+add_sub_const_decimals!(19usize, 5usize, 24usize, 14usize);
+add_sub_const_decimals!(19usize, 4usize, 23usize, 15usize);
+add_sub_const_decimals!(19usize, 3usize, 22usize, 16usize);
+add_sub_const_decimals!(19usize, 2usize, 21usize, 17usize);
+add_sub_const_decimals!(19usize, 1usize, 20usize, 18usize);
+add_sub_const_decimals!(19usize, 0usize, 19usize, 19usize);
+add_sub_const_decimals!(18usize, 64usize, 82usize, 0usize);
+add_sub_const_decimals!(18usize, 63usize, 81usize, 0usize);
+add_sub_const_decimals!(18usize, 62usize, 80usize, 0usize);
+add_sub_const_decimals!(18usize, 61usize, 79usize, 0usize);
+add_sub_const_decimals!(18usize, 60usize, 78usize, 0usize);
+add_sub_const_decimals!(18usize, 59usize, 77usize, 0usize);
+add_sub_const_decimals!(18usize, 58usize, 76usize, 0usize);
+add_sub_const_decimals!(18usize, 57usize, 75usize, 0usize);
+add_sub_const_decimals!(18usize, 56usize, 74usize, 0usize);
+add_sub_const_decimals!(18usize, 55usize, 73usize, 0usize);
+add_sub_const_decimals!(18usize, 54usize, 72usize, 0usize);
+add_sub_const_decimals!(18usize, 53usize, 71usize, 0usize);
+add_sub_const_decimals!(18usize, 52usize, 70usize, 0usize);
+add_sub_const_decimals!(18usize, 51usize, 69usize, 0usize);
+add_sub_const_decimals!(18usize, 50usize, 68usize, 0usize);
+add_sub_const_decimals!(18usize, 49usize, 67usize, 0usize);
+add_sub_const_decimals!(18usize, 48usize, 66usize, 0usize);
+add_sub_const_decimals!(18usize, 47usize, 65usize, 0usize);
+add_sub_const_decimals!(18usize, 46usize, 64usize, 0usize);
+add_sub_const_decimals!(18usize, 45usize, 63usize, 0usize);
+add_sub_const_decimals!(18usize, 44usize, 62usize, 0usize);
+add_sub_const_decimals!(18usize, 43usize, 61usize, 0usize);
+add_sub_const_decimals!(18usize, 42usize, 60usize, 0usize);
+add_sub_const_decimals!(18usize, 41usize, 59usize, 0usize);
+add_sub_const_decimals!(18usize, 40usize, 58usize, 0usize);
+add_sub_const_decimals!(18usize, 39usize, 57usize, 0usize);
+add_sub_const_decimals!(18usize, 38usize, 56usize, 0usize);
+add_sub_const_decimals!(18usize, 37usize, 55usize, 0usize);
+add_sub_const_decimals!(18usize, 36usize, 54usize, 0usize);
+add_sub_const_decimals!(18usize, 35usize, 53usize, 0usize);
+add_sub_const_decimals!(18usize, 34usize, 52usize, 0usize);
+add_sub_const_decimals!(18usize, 33usize, 51usize, 0usize);
+add_sub_const_decimals!(18usize, 32usize, 50usize, 0usize);
+add_sub_const_decimals!(18usize, 31usize, 49usize, 0usize);
+add_sub_const_decimals!(18usize, 30usize, 48usize, 0usize);
+add_sub_const_decimals!(18usize, 29usize, 47usize, 0usize);
+add_sub_const_decimals!(18usize, 28usize, 46usize, 0usize);
+add_sub_const_decimals!(18usize, 27usize, 45usize, 0usize);
+add_sub_const_decimals!(18usize, 26usize, 44usize, 0usize);
+add_sub_const_decimals!(18usize, 25usize, 43usize, 0usize);
+add_sub_const_decimals!(18usize, 24usize, 42usize, 0usize);
+add_sub_const_decimals!(18usize, 23usize, 41usize, 0usize);
+add_sub_const_decimals!(18usize, 22usize, 40usize, 0usize);
+add_sub_const_decimals!(18usize, 21usize, 39usize, 0usize);
+add_sub_const_decimals!(18usize, 20usize, 38usize, 0usize);
+add_sub_const_decimals!(18usize, 19usize, 37usize, 0usize);
+add_sub_const_decimals!(18usize, 18usize, 36usize, 0usize);
+add_sub_const_decimals!(18usize, 17usize, 35usize, 1usize);
+add_sub_const_decimals!(18usize, 16usize, 34usize, 2usize);
+add_sub_const_decimals!(18usize, 15usize, 33usize, 3usize);
+add_sub_const_decimals!(18usize, 14usize, 32usize, 4usize);
+add_sub_const_decimals!(18usize, 13usize, 31usize, 5usize);
+add_sub_const_decimals!(18usize, 12usize, 30usize, 6usize);
+add_sub_const_decimals!(18usize, 11usize, 29usize, 7usize);
+add_sub_const_decimals!(18usize, 10usize, 28usize, 8usize);
+add_sub_const_decimals!(18usize, 9usize, 27usize, 9usize);
+add_sub_const_decimals!(18usize, 8usize, 26usize, 10usize);
+add_sub_const_decimals!(18usize, 7usize, 25usize, 11usize);
+add_sub_const_decimals!(18usize, 6usize, 24usize, 12usize);
+add_sub_const_decimals!(18usize, 5usize, 23usize, 13usize);
+add_sub_const_decimals!(18usize, 4usize, 22usize, 14usize);
+add_sub_const_decimals!(18usize, 3usize, 21usize, 15usize);
+add_sub_const_decimals!(18usize, 2usize, 20usize, 16usize);
+add_sub_const_decimals!(18usize, 1usize, 19usize, 17usize);
+add_sub_const_decimals!(18usize, 0usize, 18usize, 18usize);
+add_sub_const_decimals!(17usize, 64usize, 81usize, 0usize);
+add_sub_const_decimals!(17usize, 63usize, 80usize, 0usize);
+add_sub_const_decimals!(17usize, 62usize, 79usize, 0usize);
+add_sub_const_decimals!(17usize, 61usize, 78usize, 0usize);
+add_sub_const_decimals!(17usize, 60usize, 77usize, 0usize);
+add_sub_const_decimals!(17usize, 59usize, 76usize, 0usize);
+add_sub_const_decimals!(17usize, 58usize, 75usize, 0usize);
+add_sub_const_decimals!(17usize, 57usize, 74usize, 0usize);
+add_sub_const_decimals!(17usize, 56usize, 73usize, 0usize);
+add_sub_const_decimals!(17usize, 55usize, 72usize, 0usize);
+add_sub_const_decimals!(17usize, 54usize, 71usize, 0usize);
+add_sub_const_decimals!(17usize, 53usize, 70usize, 0usize);
+add_sub_const_decimals!(17usize, 52usize, 69usize, 0usize);
+add_sub_const_decimals!(17usize, 51usize, 68usize, 0usize);
+add_sub_const_decimals!(17usize, 50usize, 67usize, 0usize);
+add_sub_const_decimals!(17usize, 49usize, 66usize, 0usize);
+add_sub_const_decimals!(17usize, 48usize, 65usize, 0usize);
+add_sub_const_decimals!(17usize, 47usize, 64usize, 0usize);
+add_sub_const_decimals!(17usize, 46usize, 63usize, 0usize);
+add_sub_const_decimals!(17usize, 45usize, 62usize, 0usize);
+add_sub_const_decimals!(17usize, 44usize, 61usize, 0usize);
+add_sub_const_decimals!(17usize, 43usize, 60usize, 0usize);
+add_sub_const_decimals!(17usize, 42usize, 59usize, 0usize);
+add_sub_const_decimals!(17usize, 41usize, 58usize, 0usize);
+add_sub_const_decimals!(17usize, 40usize, 57usize, 0usize);
+add_sub_const_decimals!(17usize, 39usize, 56usize, 0usize);
+add_sub_const_decimals!(17usize, 38usize, 55usize, 0usize);
+add_sub_const_decimals!(17usize, 37usize, 54usize, 0usize);
+add_sub_const_decimals!(17usize, 36usize, 53usize, 0usize);
+add_sub_const_decimals!(17usize, 35usize, 52usize, 0usize);
+add_sub_const_decimals!(17usize, 34usize, 51usize, 0usize);
+add_sub_const_decimals!(17usize, 33usize, 50usize, 0usize);
+add_sub_const_decimals!(17usize, 32usize, 49usize, 0usize);
+add_sub_const_decimals!(17usize, 31usize, 48usize, 0usize);
+add_sub_const_decimals!(17usize, 30usize, 47usize, 0usize);
+add_sub_const_decimals!(17usize, 29usize, 46usize, 0usize);
+add_sub_const_decimals!(17usize, 28usize, 45usize, 0usize);
+add_sub_const_decimals!(17usize, 27usize, 44usize, 0usize);
+add_sub_const_decimals!(17usize, 26usize, 43usize, 0usize);
+add_sub_const_decimals!(17usize, 25usize, 42usize, 0usize);
+add_sub_const_decimals!(17usize, 24usize, 41usize, 0usize);
+add_sub_const_decimals!(17usize, 23usize, 40usize, 0usize);
+add_sub_const_decimals!(17usize, 22usize, 39usize, 0usize);
+add_sub_const_decimals!(17usize, 21usize, 38usize, 0usize);
+add_sub_const_decimals!(17usize, 20usize, 37usize, 0usize);
+add_sub_const_decimals!(17usize, 19usize, 36usize, 0usize);
+add_sub_const_decimals!(17usize, 18usize, 35usize, 0usize);
+add_sub_const_decimals!(17usize, 17usize, 34usize, 0usize);
+add_sub_const_decimals!(17usize, 16usize, 33usize, 1usize);
+add_sub_const_decimals!(17usize, 15usize, 32usize, 2usize);
+add_sub_const_decimals!(17usize, 14usize, 31usize, 3usize);
+add_sub_const_decimals!(17usize, 13usize, 30usize, 4usize);
+add_sub_const_decimals!(17usize, 12usize, 29usize, 5usize);
+add_sub_const_decimals!(17usize, 11usize, 28usize, 6usize);
+add_sub_const_decimals!(17usize, 10usize, 27usize, 7usize);
+add_sub_const_decimals!(17usize, 9usize, 26usize, 8usize);
+add_sub_const_decimals!(17usize, 8usize, 25usize, 9usize);
+add_sub_const_decimals!(17usize, 7usize, 24usize, 10usize);
+add_sub_const_decimals!(17usize, 6usize, 23usize, 11usize);
+add_sub_const_decimals!(17usize, 5usize, 22usize, 12usize);
+add_sub_const_decimals!(17usize, 4usize, 21usize, 13usize);
+add_sub_const_decimals!(17usize, 3usize, 20usize, 14usize);
+add_sub_const_decimals!(17usize, 2usize, 19usize, 15usize);
+add_sub_const_decimals!(17usize, 1usize, 18usize, 16usize);
+add_sub_const_decimals!(17usize, 0usize, 17usize, 17usize);
+add_sub_const_decimals!(16usize, 64usize, 80usize, 0usize);
+add_sub_const_decimals!(16usize, 63usize, 79usize, 0usize);
+add_sub_const_decimals!(16usize, 62usize, 78usize, 0usize);
+add_sub_const_decimals!(16usize, 61usize, 77usize, 0usize);
+add_sub_const_decimals!(16usize, 60usize, 76usize, 0usize);
+add_sub_const_decimals!(16usize, 59usize, 75usize, 0usize);
+add_sub_const_decimals!(16usize, 58usize, 74usize, 0usize);
+add_sub_const_decimals!(16usize, 57usize, 73usize, 0usize);
+add_sub_const_decimals!(16usize, 56usize, 72usize, 0usize);
+add_sub_const_decimals!(16usize, 55usize, 71usize, 0usize);
+add_sub_const_decimals!(16usize, 54usize, 70usize, 0usize);
+add_sub_const_decimals!(16usize, 53usize, 69usize, 0usize);
+add_sub_const_decimals!(16usize, 52usize, 68usize, 0usize);
+add_sub_const_decimals!(16usize, 51usize, 67usize, 0usize);
+add_sub_const_decimals!(16usize, 50usize, 66usize, 0usize);
+add_sub_const_decimals!(16usize, 49usize, 65usize, 0usize);
+add_sub_const_decimals!(16usize, 48usize, 64usize, 0usize);
+add_sub_const_decimals!(16usize, 47usize, 63usize, 0usize);
+add_sub_const_decimals!(16usize, 46usize, 62usize, 0usize);
+add_sub_const_decimals!(16usize, 45usize, 61usize, 0usize);
+add_sub_const_decimals!(16usize, 44usize, 60usize, 0usize);
+add_sub_const_decimals!(16usize, 43usize, 59usize, 0usize);
+add_sub_const_decimals!(16usize, 42usize, 58usize, 0usize);
+add_sub_const_decimals!(16usize, 41usize, 57usize, 0usize);
+add_sub_const_decimals!(16usize, 40usize, 56usize, 0usize);
+add_sub_const_decimals!(16usize, 39usize, 55usize, 0usize);
+add_sub_const_decimals!(16usize, 38usize, 54usize, 0usize);
+add_sub_const_decimals!(16usize, 37usize, 53usize, 0usize);
+add_sub_const_decimals!(16usize, 36usize, 52usize, 0usize);
+add_sub_const_decimals!(16usize, 35usize, 51usize, 0usize);
+add_sub_const_decimals!(16usize, 34usize, 50usize, 0usize);
+add_sub_const_decimals!(16usize, 33usize, 49usize, 0usize);
+add_sub_const_decimals!(16usize, 32usize, 48usize, 0usize);
+add_sub_const_decimals!(16usize, 31usize, 47usize, 0usize);
+add_sub_const_decimals!(16usize, 30usize, 46usize, 0usize);
+add_sub_const_decimals!(16usize, 29usize, 45usize, 0usize);
+add_sub_const_decimals!(16usize, 28usize, 44usize, 0usize);
+add_sub_const_decimals!(16usize, 27usize, 43usize, 0usize);
+add_sub_const_decimals!(16usize, 26usize, 42usize, 0usize);
+add_sub_const_decimals!(16usize, 25usize, 41usize, 0usize);
+add_sub_const_decimals!(16usize, 24usize, 40usize, 0usize);
+add_sub_const_decimals!(16usize, 23usize, 39usize, 0usize);
+add_sub_const_decimals!(16usize, 22usize, 38usize, 0usize);
+add_sub_const_decimals!(16usize, 21usize, 37usize, 0usize);
+add_sub_const_decimals!(16usize, 20usize, 36usize, 0usize);
+add_sub_const_decimals!(16usize, 19usize, 35usize, 0usize);
+add_sub_const_decimals!(16usize, 18usize, 34usize, 0usize);
+add_sub_const_decimals!(16usize, 17usize, 33usize, 0usize);
+add_sub_const_decimals!(16usize, 16usize, 32usize, 0usize);
+add_sub_const_decimals!(16usize, 15usize, 31usize, 1usize);
+add_sub_const_decimals!(16usize, 14usize, 30usize, 2usize);
+add_sub_const_decimals!(16usize, 13usize, 29usize, 3usize);
+add_sub_const_decimals!(16usize, 12usize, 28usize, 4usize);
+add_sub_const_decimals!(16usize, 11usize, 27usize, 5usize);
+add_sub_const_decimals!(16usize, 10usize, 26usize, 6usize);
+add_sub_const_decimals!(16usize, 9usize, 25usize, 7usize);
+add_sub_const_decimals!(16usize, 8usize, 24usize, 8usize);
+add_sub_const_decimals!(16usize, 7usize, 23usize, 9usize);
+add_sub_const_decimals!(16usize, 6usize, 22usize, 10usize);
+add_sub_const_decimals!(16usize, 5usize, 21usize, 11usize);
+add_sub_const_decimals!(16usize, 4usize, 20usize, 12usize);
+add_sub_const_decimals!(16usize, 3usize, 19usize, 13usize);
+add_sub_const_decimals!(16usize, 2usize, 18usize, 14usize);
+add_sub_const_decimals!(16usize, 1usize, 17usize, 15usize);
+add_sub_const_decimals!(16usize, 0usize, 16usize, 16usize);
+add_sub_const_decimals!(15usize, 64usize, 79usize, 0usize);
+add_sub_const_decimals!(15usize, 63usize, 78usize, 0usize);
+add_sub_const_decimals!(15usize, 62usize, 77usize, 0usize);
+add_sub_const_decimals!(15usize, 61usize, 76usize, 0usize);
+add_sub_const_decimals!(15usize, 60usize, 75usize, 0usize);
+add_sub_const_decimals!(15usize, 59usize, 74usize, 0usize);
+add_sub_const_decimals!(15usize, 58usize, 73usize, 0usize);
+add_sub_const_decimals!(15usize, 57usize, 72usize, 0usize);
+add_sub_const_decimals!(15usize, 56usize, 71usize, 0usize);
+add_sub_const_decimals!(15usize, 55usize, 70usize, 0usize);
+add_sub_const_decimals!(15usize, 54usize, 69usize, 0usize);
+add_sub_const_decimals!(15usize, 53usize, 68usize, 0usize);
+add_sub_const_decimals!(15usize, 52usize, 67usize, 0usize);
+add_sub_const_decimals!(15usize, 51usize, 66usize, 0usize);
+add_sub_const_decimals!(15usize, 50usize, 65usize, 0usize);
+add_sub_const_decimals!(15usize, 49usize, 64usize, 0usize);
+add_sub_const_decimals!(15usize, 48usize, 63usize, 0usize);
+add_sub_const_decimals!(15usize, 47usize, 62usize, 0usize);
+add_sub_const_decimals!(15usize, 46usize, 61usize, 0usize);
+add_sub_const_decimals!(15usize, 45usize, 60usize, 0usize);
+add_sub_const_decimals!(15usize, 44usize, 59usize, 0usize);
+add_sub_const_decimals!(15usize, 43usize, 58usize, 0usize);
+add_sub_const_decimals!(15usize, 42usize, 57usize, 0usize);
+add_sub_const_decimals!(15usize, 41usize, 56usize, 0usize);
+add_sub_const_decimals!(15usize, 40usize, 55usize, 0usize);
+add_sub_const_decimals!(15usize, 39usize, 54usize, 0usize);
+add_sub_const_decimals!(15usize, 38usize, 53usize, 0usize);
+add_sub_const_decimals!(15usize, 37usize, 52usize, 0usize);
+add_sub_const_decimals!(15usize, 36usize, 51usize, 0usize);
+add_sub_const_decimals!(15usize, 35usize, 50usize, 0usize);
+add_sub_const_decimals!(15usize, 34usize, 49usize, 0usize);
+add_sub_const_decimals!(15usize, 33usize, 48usize, 0usize);
+add_sub_const_decimals!(15usize, 32usize, 47usize, 0usize);
+add_sub_const_decimals!(15usize, 31usize, 46usize, 0usize);
+add_sub_const_decimals!(15usize, 30usize, 45usize, 0usize);
+add_sub_const_decimals!(15usize, 29usize, 44usize, 0usize);
+add_sub_const_decimals!(15usize, 28usize, 43usize, 0usize);
+add_sub_const_decimals!(15usize, 27usize, 42usize, 0usize);
+add_sub_const_decimals!(15usize, 26usize, 41usize, 0usize);
+add_sub_const_decimals!(15usize, 25usize, 40usize, 0usize);
+add_sub_const_decimals!(15usize, 24usize, 39usize, 0usize);
+add_sub_const_decimals!(15usize, 23usize, 38usize, 0usize);
+add_sub_const_decimals!(15usize, 22usize, 37usize, 0usize);
+add_sub_const_decimals!(15usize, 21usize, 36usize, 0usize);
+add_sub_const_decimals!(15usize, 20usize, 35usize, 0usize);
+add_sub_const_decimals!(15usize, 19usize, 34usize, 0usize);
+add_sub_const_decimals!(15usize, 18usize, 33usize, 0usize);
+add_sub_const_decimals!(15usize, 17usize, 32usize, 0usize);
+add_sub_const_decimals!(15usize, 16usize, 31usize, 0usize);
+add_sub_const_decimals!(15usize, 15usize, 30usize, 0usize);
+add_sub_const_decimals!(15usize, 14usize, 29usize, 1usize);
+add_sub_const_decimals!(15usize, 13usize, 28usize, 2usize);
+add_sub_const_decimals!(15usize, 12usize, 27usize, 3usize);
+add_sub_const_decimals!(15usize, 11usize, 26usize, 4usize);
+add_sub_const_decimals!(15usize, 10usize, 25usize, 5usize);
+add_sub_const_decimals!(15usize, 9usize, 24usize, 6usize);
+add_sub_const_decimals!(15usize, 8usize, 23usize, 7usize);
+add_sub_const_decimals!(15usize, 7usize, 22usize, 8usize);
+add_sub_const_decimals!(15usize, 6usize, 21usize, 9usize);
+add_sub_const_decimals!(15usize, 5usize, 20usize, 10usize);
+add_sub_const_decimals!(15usize, 4usize, 19usize, 11usize);
+add_sub_const_decimals!(15usize, 3usize, 18usize, 12usize);
+add_sub_const_decimals!(15usize, 2usize, 17usize, 13usize);
+add_sub_const_decimals!(15usize, 1usize, 16usize, 14usize);
+add_sub_const_decimals!(15usize, 0usize, 15usize, 15usize);
+add_sub_const_decimals!(14usize, 64usize, 78usize, 0usize);
+add_sub_const_decimals!(14usize, 63usize, 77usize, 0usize);
+add_sub_const_decimals!(14usize, 62usize, 76usize, 0usize);
+add_sub_const_decimals!(14usize, 61usize, 75usize, 0usize);
+add_sub_const_decimals!(14usize, 60usize, 74usize, 0usize);
+add_sub_const_decimals!(14usize, 59usize, 73usize, 0usize);
+add_sub_const_decimals!(14usize, 58usize, 72usize, 0usize);
+add_sub_const_decimals!(14usize, 57usize, 71usize, 0usize);
+add_sub_const_decimals!(14usize, 56usize, 70usize, 0usize);
+add_sub_const_decimals!(14usize, 55usize, 69usize, 0usize);
+add_sub_const_decimals!(14usize, 54usize, 68usize, 0usize);
+add_sub_const_decimals!(14usize, 53usize, 67usize, 0usize);
+add_sub_const_decimals!(14usize, 52usize, 66usize, 0usize);
+add_sub_const_decimals!(14usize, 51usize, 65usize, 0usize);
+add_sub_const_decimals!(14usize, 50usize, 64usize, 0usize);
+add_sub_const_decimals!(14usize, 49usize, 63usize, 0usize);
+add_sub_const_decimals!(14usize, 48usize, 62usize, 0usize);
+add_sub_const_decimals!(14usize, 47usize, 61usize, 0usize);
+add_sub_const_decimals!(14usize, 46usize, 60usize, 0usize);
+add_sub_const_decimals!(14usize, 45usize, 59usize, 0usize);
+add_sub_const_decimals!(14usize, 44usize, 58usize, 0usize);
+add_sub_const_decimals!(14usize, 43usize, 57usize, 0usize);
+add_sub_const_decimals!(14usize, 42usize, 56usize, 0usize);
+add_sub_const_decimals!(14usize, 41usize, 55usize, 0usize);
+add_sub_const_decimals!(14usize, 40usize, 54usize, 0usize);
+add_sub_const_decimals!(14usize, 39usize, 53usize, 0usize);
+add_sub_const_decimals!(14usize, 38usize, 52usize, 0usize);
+add_sub_const_decimals!(14usize, 37usize, 51usize, 0usize);
+add_sub_const_decimals!(14usize, 36usize, 50usize, 0usize);
+add_sub_const_decimals!(14usize, 35usize, 49usize, 0usize);
+add_sub_const_decimals!(14usize, 34usize, 48usize, 0usize);
+add_sub_const_decimals!(14usize, 33usize, 47usize, 0usize);
+add_sub_const_decimals!(14usize, 32usize, 46usize, 0usize);
+add_sub_const_decimals!(14usize, 31usize, 45usize, 0usize);
+add_sub_const_decimals!(14usize, 30usize, 44usize, 0usize);
+add_sub_const_decimals!(14usize, 29usize, 43usize, 0usize);
+add_sub_const_decimals!(14usize, 28usize, 42usize, 0usize);
+add_sub_const_decimals!(14usize, 27usize, 41usize, 0usize);
+add_sub_const_decimals!(14usize, 26usize, 40usize, 0usize);
+add_sub_const_decimals!(14usize, 25usize, 39usize, 0usize);
+add_sub_const_decimals!(14usize, 24usize, 38usize, 0usize);
+add_sub_const_decimals!(14usize, 23usize, 37usize, 0usize);
+add_sub_const_decimals!(14usize, 22usize, 36usize, 0usize);
+add_sub_const_decimals!(14usize, 21usize, 35usize, 0usize);
+add_sub_const_decimals!(14usize, 20usize, 34usize, 0usize);
+add_sub_const_decimals!(14usize, 19usize, 33usize, 0usize);
+add_sub_const_decimals!(14usize, 18usize, 32usize, 0usize);
+add_sub_const_decimals!(14usize, 17usize, 31usize, 0usize);
+add_sub_const_decimals!(14usize, 16usize, 30usize, 0usize);
+add_sub_const_decimals!(14usize, 15usize, 29usize, 0usize);
+add_sub_const_decimals!(14usize, 14usize, 28usize, 0usize);
+add_sub_const_decimals!(14usize, 13usize, 27usize, 1usize);
+add_sub_const_decimals!(14usize, 12usize, 26usize, 2usize);
+add_sub_const_decimals!(14usize, 11usize, 25usize, 3usize);
+add_sub_const_decimals!(14usize, 10usize, 24usize, 4usize);
+add_sub_const_decimals!(14usize, 9usize, 23usize, 5usize);
+add_sub_const_decimals!(14usize, 8usize, 22usize, 6usize);
+add_sub_const_decimals!(14usize, 7usize, 21usize, 7usize);
+add_sub_const_decimals!(14usize, 6usize, 20usize, 8usize);
+add_sub_const_decimals!(14usize, 5usize, 19usize, 9usize);
+add_sub_const_decimals!(14usize, 4usize, 18usize, 10usize);
+add_sub_const_decimals!(14usize, 3usize, 17usize, 11usize);
+add_sub_const_decimals!(14usize, 2usize, 16usize, 12usize);
+add_sub_const_decimals!(14usize, 1usize, 15usize, 13usize);
+add_sub_const_decimals!(14usize, 0usize, 14usize, 14usize);
+add_sub_const_decimals!(13usize, 64usize, 77usize, 0usize);
+add_sub_const_decimals!(13usize, 63usize, 76usize, 0usize);
+add_sub_const_decimals!(13usize, 62usize, 75usize, 0usize);
+add_sub_const_decimals!(13usize, 61usize, 74usize, 0usize);
+add_sub_const_decimals!(13usize, 60usize, 73usize, 0usize);
+add_sub_const_decimals!(13usize, 59usize, 72usize, 0usize);
+add_sub_const_decimals!(13usize, 58usize, 71usize, 0usize);
+add_sub_const_decimals!(13usize, 57usize, 70usize, 0usize);
+add_sub_const_decimals!(13usize, 56usize, 69usize, 0usize);
+add_sub_const_decimals!(13usize, 55usize, 68usize, 0usize);
+add_sub_const_decimals!(13usize, 54usize, 67usize, 0usize);
+add_sub_const_decimals!(13usize, 53usize, 66usize, 0usize);
+add_sub_const_decimals!(13usize, 52usize, 65usize, 0usize);
+add_sub_const_decimals!(13usize, 51usize, 64usize, 0usize);
+add_sub_const_decimals!(13usize, 50usize, 63usize, 0usize);
+add_sub_const_decimals!(13usize, 49usize, 62usize, 0usize);
+add_sub_const_decimals!(13usize, 48usize, 61usize, 0usize);
+add_sub_const_decimals!(13usize, 47usize, 60usize, 0usize);
+add_sub_const_decimals!(13usize, 46usize, 59usize, 0usize);
+add_sub_const_decimals!(13usize, 45usize, 58usize, 0usize);
+add_sub_const_decimals!(13usize, 44usize, 57usize, 0usize);
+add_sub_const_decimals!(13usize, 43usize, 56usize, 0usize);
+add_sub_const_decimals!(13usize, 42usize, 55usize, 0usize);
+add_sub_const_decimals!(13usize, 41usize, 54usize, 0usize);
+add_sub_const_decimals!(13usize, 40usize, 53usize, 0usize);
+add_sub_const_decimals!(13usize, 39usize, 52usize, 0usize);
+add_sub_const_decimals!(13usize, 38usize, 51usize, 0usize);
+add_sub_const_decimals!(13usize, 37usize, 50usize, 0usize);
+add_sub_const_decimals!(13usize, 36usize, 49usize, 0usize);
+add_sub_const_decimals!(13usize, 35usize, 48usize, 0usize);
+add_sub_const_decimals!(13usize, 34usize, 47usize, 0usize);
+add_sub_const_decimals!(13usize, 33usize, 46usize, 0usize);
+add_sub_const_decimals!(13usize, 32usize, 45usize, 0usize);
+add_sub_const_decimals!(13usize, 31usize, 44usize, 0usize);
+add_sub_const_decimals!(13usize, 30usize, 43usize, 0usize);
+add_sub_const_decimals!(13usize, 29usize, 42usize, 0usize);
+add_sub_const_decimals!(13usize, 28usize, 41usize, 0usize);
+add_sub_const_decimals!(13usize, 27usize, 40usize, 0usize);
+add_sub_const_decimals!(13usize, 26usize, 39usize, 0usize);
+add_sub_const_decimals!(13usize, 25usize, 38usize, 0usize);
+add_sub_const_decimals!(13usize, 24usize, 37usize, 0usize);
+add_sub_const_decimals!(13usize, 23usize, 36usize, 0usize);
+add_sub_const_decimals!(13usize, 22usize, 35usize, 0usize);
+add_sub_const_decimals!(13usize, 21usize, 34usize, 0usize);
+add_sub_const_decimals!(13usize, 20usize, 33usize, 0usize);
+add_sub_const_decimals!(13usize, 19usize, 32usize, 0usize);
+add_sub_const_decimals!(13usize, 18usize, 31usize, 0usize);
+add_sub_const_decimals!(13usize, 17usize, 30usize, 0usize);
+add_sub_const_decimals!(13usize, 16usize, 29usize, 0usize);
+add_sub_const_decimals!(13usize, 15usize, 28usize, 0usize);
+add_sub_const_decimals!(13usize, 14usize, 27usize, 0usize);
+add_sub_const_decimals!(13usize, 13usize, 26usize, 0usize);
+add_sub_const_decimals!(13usize, 12usize, 25usize, 1usize);
+add_sub_const_decimals!(13usize, 11usize, 24usize, 2usize);
+add_sub_const_decimals!(13usize, 10usize, 23usize, 3usize);
+add_sub_const_decimals!(13usize, 9usize, 22usize, 4usize);
+add_sub_const_decimals!(13usize, 8usize, 21usize, 5usize);
+add_sub_const_decimals!(13usize, 7usize, 20usize, 6usize);
+add_sub_const_decimals!(13usize, 6usize, 19usize, 7usize);
+add_sub_const_decimals!(13usize, 5usize, 18usize, 8usize);
+add_sub_const_decimals!(13usize, 4usize, 17usize, 9usize);
+add_sub_const_decimals!(13usize, 3usize, 16usize, 10usize);
+add_sub_const_decimals!(13usize, 2usize, 15usize, 11usize);
+add_sub_const_decimals!(13usize, 1usize, 14usize, 12usize);
+add_sub_const_decimals!(13usize, 0usize, 13usize, 13usize);
+add_sub_const_decimals!(12usize, 64usize, 76usize, 0usize);
+add_sub_const_decimals!(12usize, 63usize, 75usize, 0usize);
+add_sub_const_decimals!(12usize, 62usize, 74usize, 0usize);
+add_sub_const_decimals!(12usize, 61usize, 73usize, 0usize);
+add_sub_const_decimals!(12usize, 60usize, 72usize, 0usize);
+add_sub_const_decimals!(12usize, 59usize, 71usize, 0usize);
+add_sub_const_decimals!(12usize, 58usize, 70usize, 0usize);
+add_sub_const_decimals!(12usize, 57usize, 69usize, 0usize);
+add_sub_const_decimals!(12usize, 56usize, 68usize, 0usize);
+add_sub_const_decimals!(12usize, 55usize, 67usize, 0usize);
+add_sub_const_decimals!(12usize, 54usize, 66usize, 0usize);
+add_sub_const_decimals!(12usize, 53usize, 65usize, 0usize);
+add_sub_const_decimals!(12usize, 52usize, 64usize, 0usize);
+add_sub_const_decimals!(12usize, 51usize, 63usize, 0usize);
+add_sub_const_decimals!(12usize, 50usize, 62usize, 0usize);
+add_sub_const_decimals!(12usize, 49usize, 61usize, 0usize);
+add_sub_const_decimals!(12usize, 48usize, 60usize, 0usize);
+add_sub_const_decimals!(12usize, 47usize, 59usize, 0usize);
+add_sub_const_decimals!(12usize, 46usize, 58usize, 0usize);
+add_sub_const_decimals!(12usize, 45usize, 57usize, 0usize);
+add_sub_const_decimals!(12usize, 44usize, 56usize, 0usize);
+add_sub_const_decimals!(12usize, 43usize, 55usize, 0usize);
+add_sub_const_decimals!(12usize, 42usize, 54usize, 0usize);
+add_sub_const_decimals!(12usize, 41usize, 53usize, 0usize);
+add_sub_const_decimals!(12usize, 40usize, 52usize, 0usize);
+add_sub_const_decimals!(12usize, 39usize, 51usize, 0usize);
+add_sub_const_decimals!(12usize, 38usize, 50usize, 0usize);
+add_sub_const_decimals!(12usize, 37usize, 49usize, 0usize);
+add_sub_const_decimals!(12usize, 36usize, 48usize, 0usize);
+add_sub_const_decimals!(12usize, 35usize, 47usize, 0usize);
+add_sub_const_decimals!(12usize, 34usize, 46usize, 0usize);
+add_sub_const_decimals!(12usize, 33usize, 45usize, 0usize);
+add_sub_const_decimals!(12usize, 32usize, 44usize, 0usize);
+add_sub_const_decimals!(12usize, 31usize, 43usize, 0usize);
+add_sub_const_decimals!(12usize, 30usize, 42usize, 0usize);
+add_sub_const_decimals!(12usize, 29usize, 41usize, 0usize);
+add_sub_const_decimals!(12usize, 28usize, 40usize, 0usize);
+add_sub_const_decimals!(12usize, 27usize, 39usize, 0usize);
+add_sub_const_decimals!(12usize, 26usize, 38usize, 0usize);
+add_sub_const_decimals!(12usize, 25usize, 37usize, 0usize);
+add_sub_const_decimals!(12usize, 24usize, 36usize, 0usize);
+add_sub_const_decimals!(12usize, 23usize, 35usize, 0usize);
+add_sub_const_decimals!(12usize, 22usize, 34usize, 0usize);
+add_sub_const_decimals!(12usize, 21usize, 33usize, 0usize);
+add_sub_const_decimals!(12usize, 20usize, 32usize, 0usize);
+add_sub_const_decimals!(12usize, 19usize, 31usize, 0usize);
+add_sub_const_decimals!(12usize, 18usize, 30usize, 0usize);
+add_sub_const_decimals!(12usize, 17usize, 29usize, 0usize);
+add_sub_const_decimals!(12usize, 16usize, 28usize, 0usize);
+add_sub_const_decimals!(12usize, 15usize, 27usize, 0usize);
+add_sub_const_decimals!(12usize, 14usize, 26usize, 0usize);
+add_sub_const_decimals!(12usize, 13usize, 25usize, 0usize);
+add_sub_const_decimals!(12usize, 12usize, 24usize, 0usize);
+add_sub_const_decimals!(12usize, 11usize, 23usize, 1usize);
+add_sub_const_decimals!(12usize, 10usize, 22usize, 2usize);
+add_sub_const_decimals!(12usize, 9usize, 21usize, 3usize);
+add_sub_const_decimals!(12usize, 8usize, 20usize, 4usize);
+add_sub_const_decimals!(12usize, 7usize, 19usize, 5usize);
+add_sub_const_decimals!(12usize, 6usize, 18usize, 6usize);
+add_sub_const_decimals!(12usize, 5usize, 17usize, 7usize);
+add_sub_const_decimals!(12usize, 4usize, 16usize, 8usize);
+add_sub_const_decimals!(12usize, 3usize, 15usize, 9usize);
+add_sub_const_decimals!(12usize, 2usize, 14usize, 10usize);
+add_sub_const_decimals!(12usize, 1usize, 13usize, 11usize);
+add_sub_const_decimals!(12usize, 0usize, 12usize, 12usize);
+add_sub_const_decimals!(11usize, 64usize, 75usize, 0usize);
+add_sub_const_decimals!(11usize, 63usize, 74usize, 0usize);
+add_sub_const_decimals!(11usize, 62usize, 73usize, 0usize);
+add_sub_const_decimals!(11usize, 61usize, 72usize, 0usize);
+add_sub_const_decimals!(11usize, 60usize, 71usize, 0usize);
+add_sub_const_decimals!(11usize, 59usize, 70usize, 0usize);
+add_sub_const_decimals!(11usize, 58usize, 69usize, 0usize);
+add_sub_const_decimals!(11usize, 57usize, 68usize, 0usize);
+add_sub_const_decimals!(11usize, 56usize, 67usize, 0usize);
+add_sub_const_decimals!(11usize, 55usize, 66usize, 0usize);
+add_sub_const_decimals!(11usize, 54usize, 65usize, 0usize);
+add_sub_const_decimals!(11usize, 53usize, 64usize, 0usize);
+add_sub_const_decimals!(11usize, 52usize, 63usize, 0usize);
+add_sub_const_decimals!(11usize, 51usize, 62usize, 0usize);
+add_sub_const_decimals!(11usize, 50usize, 61usize, 0usize);
+add_sub_const_decimals!(11usize, 49usize, 60usize, 0usize);
+add_sub_const_decimals!(11usize, 48usize, 59usize, 0usize);
+add_sub_const_decimals!(11usize, 47usize, 58usize, 0usize);
+add_sub_const_decimals!(11usize, 46usize, 57usize, 0usize);
+add_sub_const_decimals!(11usize, 45usize, 56usize, 0usize);
+add_sub_const_decimals!(11usize, 44usize, 55usize, 0usize);
+add_sub_const_decimals!(11usize, 43usize, 54usize, 0usize);
+add_sub_const_decimals!(11usize, 42usize, 53usize, 0usize);
+add_sub_const_decimals!(11usize, 41usize, 52usize, 0usize);
+add_sub_const_decimals!(11usize, 40usize, 51usize, 0usize);
+add_sub_const_decimals!(11usize, 39usize, 50usize, 0usize);
+add_sub_const_decimals!(11usize, 38usize, 49usize, 0usize);
+add_sub_const_decimals!(11usize, 37usize, 48usize, 0usize);
+add_sub_const_decimals!(11usize, 36usize, 47usize, 0usize);
+add_sub_const_decimals!(11usize, 35usize, 46usize, 0usize);
+add_sub_const_decimals!(11usize, 34usize, 45usize, 0usize);
+add_sub_const_decimals!(11usize, 33usize, 44usize, 0usize);
+add_sub_const_decimals!(11usize, 32usize, 43usize, 0usize);
+add_sub_const_decimals!(11usize, 31usize, 42usize, 0usize);
+add_sub_const_decimals!(11usize, 30usize, 41usize, 0usize);
+add_sub_const_decimals!(11usize, 29usize, 40usize, 0usize);
+add_sub_const_decimals!(11usize, 28usize, 39usize, 0usize);
+add_sub_const_decimals!(11usize, 27usize, 38usize, 0usize);
+add_sub_const_decimals!(11usize, 26usize, 37usize, 0usize);
+add_sub_const_decimals!(11usize, 25usize, 36usize, 0usize);
+add_sub_const_decimals!(11usize, 24usize, 35usize, 0usize);
+add_sub_const_decimals!(11usize, 23usize, 34usize, 0usize);
+add_sub_const_decimals!(11usize, 22usize, 33usize, 0usize);
+add_sub_const_decimals!(11usize, 21usize, 32usize, 0usize);
+add_sub_const_decimals!(11usize, 20usize, 31usize, 0usize);
+add_sub_const_decimals!(11usize, 19usize, 30usize, 0usize);
+add_sub_const_decimals!(11usize, 18usize, 29usize, 0usize);
+add_sub_const_decimals!(11usize, 17usize, 28usize, 0usize);
+add_sub_const_decimals!(11usize, 16usize, 27usize, 0usize);
+add_sub_const_decimals!(11usize, 15usize, 26usize, 0usize);
+add_sub_const_decimals!(11usize, 14usize, 25usize, 0usize);
+add_sub_const_decimals!(11usize, 13usize, 24usize, 0usize);
+add_sub_const_decimals!(11usize, 12usize, 23usize, 0usize);
+add_sub_const_decimals!(11usize, 11usize, 22usize, 0usize);
+add_sub_const_decimals!(11usize, 10usize, 21usize, 1usize);
+add_sub_const_decimals!(11usize, 9usize, 20usize, 2usize);
+add_sub_const_decimals!(11usize, 8usize, 19usize, 3usize);
+add_sub_const_decimals!(11usize, 7usize, 18usize, 4usize);
+add_sub_const_decimals!(11usize, 6usize, 17usize, 5usize);
+add_sub_const_decimals!(11usize, 5usize, 16usize, 6usize);
+add_sub_const_decimals!(11usize, 4usize, 15usize, 7usize);
+add_sub_const_decimals!(11usize, 3usize, 14usize, 8usize);
+add_sub_const_decimals!(11usize, 2usize, 13usize, 9usize);
+add_sub_const_decimals!(11usize, 1usize, 12usize, 10usize);
+add_sub_const_decimals!(11usize, 0usize, 11usize, 11usize);
+add_sub_const_decimals!(10usize, 64usize, 74usize, 0usize);
+add_sub_const_decimals!(10usize, 63usize, 73usize, 0usize);
+add_sub_const_decimals!(10usize, 62usize, 72usize, 0usize);
+add_sub_const_decimals!(10usize, 61usize, 71usize, 0usize);
+add_sub_const_decimals!(10usize, 60usize, 70usize, 0usize);
+add_sub_const_decimals!(10usize, 59usize, 69usize, 0usize);
+add_sub_const_decimals!(10usize, 58usize, 68usize, 0usize);
+add_sub_const_decimals!(10usize, 57usize, 67usize, 0usize);
+add_sub_const_decimals!(10usize, 56usize, 66usize, 0usize);
+add_sub_const_decimals!(10usize, 55usize, 65usize, 0usize);
+add_sub_const_decimals!(10usize, 54usize, 64usize, 0usize);
+add_sub_const_decimals!(10usize, 53usize, 63usize, 0usize);
+add_sub_const_decimals!(10usize, 52usize, 62usize, 0usize);
+add_sub_const_decimals!(10usize, 51usize, 61usize, 0usize);
+add_sub_const_decimals!(10usize, 50usize, 60usize, 0usize);
+add_sub_const_decimals!(10usize, 49usize, 59usize, 0usize);
+add_sub_const_decimals!(10usize, 48usize, 58usize, 0usize);
+add_sub_const_decimals!(10usize, 47usize, 57usize, 0usize);
+add_sub_const_decimals!(10usize, 46usize, 56usize, 0usize);
+add_sub_const_decimals!(10usize, 45usize, 55usize, 0usize);
+add_sub_const_decimals!(10usize, 44usize, 54usize, 0usize);
+add_sub_const_decimals!(10usize, 43usize, 53usize, 0usize);
+add_sub_const_decimals!(10usize, 42usize, 52usize, 0usize);
+add_sub_const_decimals!(10usize, 41usize, 51usize, 0usize);
+add_sub_const_decimals!(10usize, 40usize, 50usize, 0usize);
+add_sub_const_decimals!(10usize, 39usize, 49usize, 0usize);
+add_sub_const_decimals!(10usize, 38usize, 48usize, 0usize);
+add_sub_const_decimals!(10usize, 37usize, 47usize, 0usize);
+add_sub_const_decimals!(10usize, 36usize, 46usize, 0usize);
+add_sub_const_decimals!(10usize, 35usize, 45usize, 0usize);
+add_sub_const_decimals!(10usize, 34usize, 44usize, 0usize);
+add_sub_const_decimals!(10usize, 33usize, 43usize, 0usize);
+add_sub_const_decimals!(10usize, 32usize, 42usize, 0usize);
+add_sub_const_decimals!(10usize, 31usize, 41usize, 0usize);
+add_sub_const_decimals!(10usize, 30usize, 40usize, 0usize);
+add_sub_const_decimals!(10usize, 29usize, 39usize, 0usize);
+add_sub_const_decimals!(10usize, 28usize, 38usize, 0usize);
+add_sub_const_decimals!(10usize, 27usize, 37usize, 0usize);
+add_sub_const_decimals!(10usize, 26usize, 36usize, 0usize);
+add_sub_const_decimals!(10usize, 25usize, 35usize, 0usize);
+add_sub_const_decimals!(10usize, 24usize, 34usize, 0usize);
+add_sub_const_decimals!(10usize, 23usize, 33usize, 0usize);
+add_sub_const_decimals!(10usize, 22usize, 32usize, 0usize);
+add_sub_const_decimals!(10usize, 21usize, 31usize, 0usize);
+add_sub_const_decimals!(10usize, 20usize, 30usize, 0usize);
+add_sub_const_decimals!(10usize, 19usize, 29usize, 0usize);
+add_sub_const_decimals!(10usize, 18usize, 28usize, 0usize);
+add_sub_const_decimals!(10usize, 17usize, 27usize, 0usize);
+add_sub_const_decimals!(10usize, 16usize, 26usize, 0usize);
+add_sub_const_decimals!(10usize, 15usize, 25usize, 0usize);
+add_sub_const_decimals!(10usize, 14usize, 24usize, 0usize);
+add_sub_const_decimals!(10usize, 13usize, 23usize, 0usize);
+add_sub_const_decimals!(10usize, 12usize, 22usize, 0usize);
+add_sub_const_decimals!(10usize, 11usize, 21usize, 0usize);
+add_sub_const_decimals!(10usize, 10usize, 20usize, 0usize);
+add_sub_const_decimals!(10usize, 9usize, 19usize, 1usize);
+add_sub_const_decimals!(10usize, 8usize, 18usize, 2usize);
+add_sub_const_decimals!(10usize, 7usize, 17usize, 3usize);
+add_sub_const_decimals!(10usize, 6usize, 16usize, 4usize);
+add_sub_const_decimals!(10usize, 5usize, 15usize, 5usize);
+add_sub_const_decimals!(10usize, 4usize, 14usize, 6usize);
+add_sub_const_decimals!(10usize, 3usize, 13usize, 7usize);
+add_sub_const_decimals!(10usize, 2usize, 12usize, 8usize);
+add_sub_const_decimals!(10usize, 1usize, 11usize, 9usize);
+add_sub_const_decimals!(10usize, 0usize, 10usize, 10usize);
+add_sub_const_decimals!(9usize, 64usize, 73usize, 0usize);
+add_sub_const_decimals!(9usize, 63usize, 72usize, 0usize);
+add_sub_const_decimals!(9usize, 62usize, 71usize, 0usize);
+add_sub_const_decimals!(9usize, 61usize, 70usize, 0usize);
+add_sub_const_decimals!(9usize, 60usize, 69usize, 0usize);
+add_sub_const_decimals!(9usize, 59usize, 68usize, 0usize);
+add_sub_const_decimals!(9usize, 58usize, 67usize, 0usize);
+add_sub_const_decimals!(9usize, 57usize, 66usize, 0usize);
+add_sub_const_decimals!(9usize, 56usize, 65usize, 0usize);
+add_sub_const_decimals!(9usize, 55usize, 64usize, 0usize);
+add_sub_const_decimals!(9usize, 54usize, 63usize, 0usize);
+add_sub_const_decimals!(9usize, 53usize, 62usize, 0usize);
+add_sub_const_decimals!(9usize, 52usize, 61usize, 0usize);
+add_sub_const_decimals!(9usize, 51usize, 60usize, 0usize);
+add_sub_const_decimals!(9usize, 50usize, 59usize, 0usize);
+add_sub_const_decimals!(9usize, 49usize, 58usize, 0usize);
+add_sub_const_decimals!(9usize, 48usize, 57usize, 0usize);
+add_sub_const_decimals!(9usize, 47usize, 56usize, 0usize);
+add_sub_const_decimals!(9usize, 46usize, 55usize, 0usize);
+add_sub_const_decimals!(9usize, 45usize, 54usize, 0usize);
+add_sub_const_decimals!(9usize, 44usize, 53usize, 0usize);
+add_sub_const_decimals!(9usize, 43usize, 52usize, 0usize);
+add_sub_const_decimals!(9usize, 42usize, 51usize, 0usize);
+add_sub_const_decimals!(9usize, 41usize, 50usize, 0usize);
+add_sub_const_decimals!(9usize, 40usize, 49usize, 0usize);
+add_sub_const_decimals!(9usize, 39usize, 48usize, 0usize);
+add_sub_const_decimals!(9usize, 38usize, 47usize, 0usize);
+add_sub_const_decimals!(9usize, 37usize, 46usize, 0usize);
+add_sub_const_decimals!(9usize, 36usize, 45usize, 0usize);
+add_sub_const_decimals!(9usize, 35usize, 44usize, 0usize);
+add_sub_const_decimals!(9usize, 34usize, 43usize, 0usize);
+add_sub_const_decimals!(9usize, 33usize, 42usize, 0usize);
+add_sub_const_decimals!(9usize, 32usize, 41usize, 0usize);
+add_sub_const_decimals!(9usize, 31usize, 40usize, 0usize);
+add_sub_const_decimals!(9usize, 30usize, 39usize, 0usize);
+add_sub_const_decimals!(9usize, 29usize, 38usize, 0usize);
+add_sub_const_decimals!(9usize, 28usize, 37usize, 0usize);
+add_sub_const_decimals!(9usize, 27usize, 36usize, 0usize);
+add_sub_const_decimals!(9usize, 26usize, 35usize, 0usize);
+add_sub_const_decimals!(9usize, 25usize, 34usize, 0usize);
+add_sub_const_decimals!(9usize, 24usize, 33usize, 0usize);
+add_sub_const_decimals!(9usize, 23usize, 32usize, 0usize);
+add_sub_const_decimals!(9usize, 22usize, 31usize, 0usize);
+add_sub_const_decimals!(9usize, 21usize, 30usize, 0usize);
+add_sub_const_decimals!(9usize, 20usize, 29usize, 0usize);
+add_sub_const_decimals!(9usize, 19usize, 28usize, 0usize);
+add_sub_const_decimals!(9usize, 18usize, 27usize, 0usize);
+add_sub_const_decimals!(9usize, 17usize, 26usize, 0usize);
+add_sub_const_decimals!(9usize, 16usize, 25usize, 0usize);
+add_sub_const_decimals!(9usize, 15usize, 24usize, 0usize);
+add_sub_const_decimals!(9usize, 14usize, 23usize, 0usize);
+add_sub_const_decimals!(9usize, 13usize, 22usize, 0usize);
+add_sub_const_decimals!(9usize, 12usize, 21usize, 0usize);
+add_sub_const_decimals!(9usize, 11usize, 20usize, 0usize);
+add_sub_const_decimals!(9usize, 10usize, 19usize, 0usize);
+add_sub_const_decimals!(9usize, 9usize, 18usize, 0usize);
+add_sub_const_decimals!(9usize, 8usize, 17usize, 1usize);
+add_sub_const_decimals!(9usize, 7usize, 16usize, 2usize);
+add_sub_const_decimals!(9usize, 6usize, 15usize, 3usize);
+add_sub_const_decimals!(9usize, 5usize, 14usize, 4usize);
+add_sub_const_decimals!(9usize, 4usize, 13usize, 5usize);
+add_sub_const_decimals!(9usize, 3usize, 12usize, 6usize);
+add_sub_const_decimals!(9usize, 2usize, 11usize, 7usize);
+add_sub_const_decimals!(9usize, 1usize, 10usize, 8usize);
+add_sub_const_decimals!(9usize, 0usize, 9usize, 9usize);
+add_sub_const_decimals!(8usize, 64usize, 72usize, 0usize);
+add_sub_const_decimals!(8usize, 63usize, 71usize, 0usize);
+add_sub_const_decimals!(8usize, 62usize, 70usize, 0usize);
+add_sub_const_decimals!(8usize, 61usize, 69usize, 0usize);
+add_sub_const_decimals!(8usize, 60usize, 68usize, 0usize);
+add_sub_const_decimals!(8usize, 59usize, 67usize, 0usize);
+add_sub_const_decimals!(8usize, 58usize, 66usize, 0usize);
+add_sub_const_decimals!(8usize, 57usize, 65usize, 0usize);
+add_sub_const_decimals!(8usize, 56usize, 64usize, 0usize);
+add_sub_const_decimals!(8usize, 55usize, 63usize, 0usize);
+add_sub_const_decimals!(8usize, 54usize, 62usize, 0usize);
+add_sub_const_decimals!(8usize, 53usize, 61usize, 0usize);
+add_sub_const_decimals!(8usize, 52usize, 60usize, 0usize);
+add_sub_const_decimals!(8usize, 51usize, 59usize, 0usize);
+add_sub_const_decimals!(8usize, 50usize, 58usize, 0usize);
+add_sub_const_decimals!(8usize, 49usize, 57usize, 0usize);
+add_sub_const_decimals!(8usize, 48usize, 56usize, 0usize);
+add_sub_const_decimals!(8usize, 47usize, 55usize, 0usize);
+add_sub_const_decimals!(8usize, 46usize, 54usize, 0usize);
+add_sub_const_decimals!(8usize, 45usize, 53usize, 0usize);
+add_sub_const_decimals!(8usize, 44usize, 52usize, 0usize);
+add_sub_const_decimals!(8usize, 43usize, 51usize, 0usize);
+add_sub_const_decimals!(8usize, 42usize, 50usize, 0usize);
+add_sub_const_decimals!(8usize, 41usize, 49usize, 0usize);
+add_sub_const_decimals!(8usize, 40usize, 48usize, 0usize);
+add_sub_const_decimals!(8usize, 39usize, 47usize, 0usize);
+add_sub_const_decimals!(8usize, 38usize, 46usize, 0usize);
+add_sub_const_decimals!(8usize, 37usize, 45usize, 0usize);
+add_sub_const_decimals!(8usize, 36usize, 44usize, 0usize);
+add_sub_const_decimals!(8usize, 35usize, 43usize, 0usize);
+add_sub_const_decimals!(8usize, 34usize, 42usize, 0usize);
+add_sub_const_decimals!(8usize, 33usize, 41usize, 0usize);
+add_sub_const_decimals!(8usize, 32usize, 40usize, 0usize);
+add_sub_const_decimals!(8usize, 31usize, 39usize, 0usize);
+add_sub_const_decimals!(8usize, 30usize, 38usize, 0usize);
+add_sub_const_decimals!(8usize, 29usize, 37usize, 0usize);
+add_sub_const_decimals!(8usize, 28usize, 36usize, 0usize);
+add_sub_const_decimals!(8usize, 27usize, 35usize, 0usize);
+add_sub_const_decimals!(8usize, 26usize, 34usize, 0usize);
+add_sub_const_decimals!(8usize, 25usize, 33usize, 0usize);
+add_sub_const_decimals!(8usize, 24usize, 32usize, 0usize);
+add_sub_const_decimals!(8usize, 23usize, 31usize, 0usize);
+add_sub_const_decimals!(8usize, 22usize, 30usize, 0usize);
+add_sub_const_decimals!(8usize, 21usize, 29usize, 0usize);
+add_sub_const_decimals!(8usize, 20usize, 28usize, 0usize);
+add_sub_const_decimals!(8usize, 19usize, 27usize, 0usize);
+add_sub_const_decimals!(8usize, 18usize, 26usize, 0usize);
+add_sub_const_decimals!(8usize, 17usize, 25usize, 0usize);
+add_sub_const_decimals!(8usize, 16usize, 24usize, 0usize);
+add_sub_const_decimals!(8usize, 15usize, 23usize, 0usize);
+add_sub_const_decimals!(8usize, 14usize, 22usize, 0usize);
+add_sub_const_decimals!(8usize, 13usize, 21usize, 0usize);
+add_sub_const_decimals!(8usize, 12usize, 20usize, 0usize);
+add_sub_const_decimals!(8usize, 11usize, 19usize, 0usize);
+add_sub_const_decimals!(8usize, 10usize, 18usize, 0usize);
+add_sub_const_decimals!(8usize, 9usize, 17usize, 0usize);
+add_sub_const_decimals!(8usize, 8usize, 16usize, 0usize);
+add_sub_const_decimals!(8usize, 7usize, 15usize, 1usize);
+add_sub_const_decimals!(8usize, 6usize, 14usize, 2usize);
+add_sub_const_decimals!(8usize, 5usize, 13usize, 3usize);
+add_sub_const_decimals!(8usize, 4usize, 12usize, 4usize);
+add_sub_const_decimals!(8usize, 3usize, 11usize, 5usize);
+add_sub_const_decimals!(8usize, 2usize, 10usize, 6usize);
+add_sub_const_decimals!(8usize, 1usize, 9usize, 7usize);
+add_sub_const_decimals!(8usize, 0usize, 8usize, 8usize);
+add_sub_const_decimals!(7usize, 64usize, 71usize, 0usize);
+add_sub_const_decimals!(7usize, 63usize, 70usize, 0usize);
+add_sub_const_decimals!(7usize, 62usize, 69usize, 0usize);
+add_sub_const_decimals!(7usize, 61usize, 68usize, 0usize);
+add_sub_const_decimals!(7usize, 60usize, 67usize, 0usize);
+add_sub_const_decimals!(7usize, 59usize, 66usize, 0usize);
+add_sub_const_decimals!(7usize, 58usize, 65usize, 0usize);
+add_sub_const_decimals!(7usize, 57usize, 64usize, 0usize);
+add_sub_const_decimals!(7usize, 56usize, 63usize, 0usize);
+add_sub_const_decimals!(7usize, 55usize, 62usize, 0usize);
+add_sub_const_decimals!(7usize, 54usize, 61usize, 0usize);
+add_sub_const_decimals!(7usize, 53usize, 60usize, 0usize);
+add_sub_const_decimals!(7usize, 52usize, 59usize, 0usize);
+add_sub_const_decimals!(7usize, 51usize, 58usize, 0usize);
+add_sub_const_decimals!(7usize, 50usize, 57usize, 0usize);
+add_sub_const_decimals!(7usize, 49usize, 56usize, 0usize);
+add_sub_const_decimals!(7usize, 48usize, 55usize, 0usize);
+add_sub_const_decimals!(7usize, 47usize, 54usize, 0usize);
+add_sub_const_decimals!(7usize, 46usize, 53usize, 0usize);
+add_sub_const_decimals!(7usize, 45usize, 52usize, 0usize);
+add_sub_const_decimals!(7usize, 44usize, 51usize, 0usize);
+add_sub_const_decimals!(7usize, 43usize, 50usize, 0usize);
+add_sub_const_decimals!(7usize, 42usize, 49usize, 0usize);
+add_sub_const_decimals!(7usize, 41usize, 48usize, 0usize);
+add_sub_const_decimals!(7usize, 40usize, 47usize, 0usize);
+add_sub_const_decimals!(7usize, 39usize, 46usize, 0usize);
+add_sub_const_decimals!(7usize, 38usize, 45usize, 0usize);
+add_sub_const_decimals!(7usize, 37usize, 44usize, 0usize);
+add_sub_const_decimals!(7usize, 36usize, 43usize, 0usize);
+add_sub_const_decimals!(7usize, 35usize, 42usize, 0usize);
+add_sub_const_decimals!(7usize, 34usize, 41usize, 0usize);
+add_sub_const_decimals!(7usize, 33usize, 40usize, 0usize);
+add_sub_const_decimals!(7usize, 32usize, 39usize, 0usize);
+add_sub_const_decimals!(7usize, 31usize, 38usize, 0usize);
+add_sub_const_decimals!(7usize, 30usize, 37usize, 0usize);
+add_sub_const_decimals!(7usize, 29usize, 36usize, 0usize);
+add_sub_const_decimals!(7usize, 28usize, 35usize, 0usize);
+add_sub_const_decimals!(7usize, 27usize, 34usize, 0usize);
+add_sub_const_decimals!(7usize, 26usize, 33usize, 0usize);
+add_sub_const_decimals!(7usize, 25usize, 32usize, 0usize);
+add_sub_const_decimals!(7usize, 24usize, 31usize, 0usize);
+add_sub_const_decimals!(7usize, 23usize, 30usize, 0usize);
+add_sub_const_decimals!(7usize, 22usize, 29usize, 0usize);
+add_sub_const_decimals!(7usize, 21usize, 28usize, 0usize);
+add_sub_const_decimals!(7usize, 20usize, 27usize, 0usize);
+add_sub_const_decimals!(7usize, 19usize, 26usize, 0usize);
+add_sub_const_decimals!(7usize, 18usize, 25usize, 0usize);
+add_sub_const_decimals!(7usize, 17usize, 24usize, 0usize);
+add_sub_const_decimals!(7usize, 16usize, 23usize, 0usize);
+add_sub_const_decimals!(7usize, 15usize, 22usize, 0usize);
+add_sub_const_decimals!(7usize, 14usize, 21usize, 0usize);
+add_sub_const_decimals!(7usize, 13usize, 20usize, 0usize);
+add_sub_const_decimals!(7usize, 12usize, 19usize, 0usize);
+add_sub_const_decimals!(7usize, 11usize, 18usize, 0usize);
+add_sub_const_decimals!(7usize, 10usize, 17usize, 0usize);
+add_sub_const_decimals!(7usize, 9usize, 16usize, 0usize);
+add_sub_const_decimals!(7usize, 8usize, 15usize, 0usize);
+add_sub_const_decimals!(7usize, 7usize, 14usize, 0usize);
+add_sub_const_decimals!(7usize, 6usize, 13usize, 1usize);
+add_sub_const_decimals!(7usize, 5usize, 12usize, 2usize);
+add_sub_const_decimals!(7usize, 4usize, 11usize, 3usize);
+add_sub_const_decimals!(7usize, 3usize, 10usize, 4usize);
+add_sub_const_decimals!(7usize, 2usize, 9usize, 5usize);
+add_sub_const_decimals!(7usize, 1usize, 8usize, 6usize);
+add_sub_const_decimals!(7usize, 0usize, 7usize, 7usize);
+add_sub_const_decimals!(6usize, 64usize, 70usize, 0usize);
+add_sub_const_decimals!(6usize, 63usize, 69usize, 0usize);
+add_sub_const_decimals!(6usize, 62usize, 68usize, 0usize);
+add_sub_const_decimals!(6usize, 61usize, 67usize, 0usize);
+add_sub_const_decimals!(6usize, 60usize, 66usize, 0usize);
+add_sub_const_decimals!(6usize, 59usize, 65usize, 0usize);
+add_sub_const_decimals!(6usize, 58usize, 64usize, 0usize);
+add_sub_const_decimals!(6usize, 57usize, 63usize, 0usize);
+add_sub_const_decimals!(6usize, 56usize, 62usize, 0usize);
+add_sub_const_decimals!(6usize, 55usize, 61usize, 0usize);
+add_sub_const_decimals!(6usize, 54usize, 60usize, 0usize);
+add_sub_const_decimals!(6usize, 53usize, 59usize, 0usize);
+add_sub_const_decimals!(6usize, 52usize, 58usize, 0usize);
+add_sub_const_decimals!(6usize, 51usize, 57usize, 0usize);
+add_sub_const_decimals!(6usize, 50usize, 56usize, 0usize);
+add_sub_const_decimals!(6usize, 49usize, 55usize, 0usize);
+add_sub_const_decimals!(6usize, 48usize, 54usize, 0usize);
+add_sub_const_decimals!(6usize, 47usize, 53usize, 0usize);
+add_sub_const_decimals!(6usize, 46usize, 52usize, 0usize);
+add_sub_const_decimals!(6usize, 45usize, 51usize, 0usize);
+add_sub_const_decimals!(6usize, 44usize, 50usize, 0usize);
+add_sub_const_decimals!(6usize, 43usize, 49usize, 0usize);
+add_sub_const_decimals!(6usize, 42usize, 48usize, 0usize);
+add_sub_const_decimals!(6usize, 41usize, 47usize, 0usize);
+add_sub_const_decimals!(6usize, 40usize, 46usize, 0usize);
+add_sub_const_decimals!(6usize, 39usize, 45usize, 0usize);
+add_sub_const_decimals!(6usize, 38usize, 44usize, 0usize);
+add_sub_const_decimals!(6usize, 37usize, 43usize, 0usize);
+add_sub_const_decimals!(6usize, 36usize, 42usize, 0usize);
+add_sub_const_decimals!(6usize, 35usize, 41usize, 0usize);
+add_sub_const_decimals!(6usize, 34usize, 40usize, 0usize);
+add_sub_const_decimals!(6usize, 33usize, 39usize, 0usize);
+add_sub_const_decimals!(6usize, 32usize, 38usize, 0usize);
+add_sub_const_decimals!(6usize, 31usize, 37usize, 0usize);
+add_sub_const_decimals!(6usize, 30usize, 36usize, 0usize);
+add_sub_const_decimals!(6usize, 29usize, 35usize, 0usize);
+add_sub_const_decimals!(6usize, 28usize, 34usize, 0usize);
+add_sub_const_decimals!(6usize, 27usize, 33usize, 0usize);
+add_sub_const_decimals!(6usize, 26usize, 32usize, 0usize);
+add_sub_const_decimals!(6usize, 25usize, 31usize, 0usize);
+add_sub_const_decimals!(6usize, 24usize, 30usize, 0usize);
+add_sub_const_decimals!(6usize, 23usize, 29usize, 0usize);
+add_sub_const_decimals!(6usize, 22usize, 28usize, 0usize);
+add_sub_const_decimals!(6usize, 21usize, 27usize, 0usize);
+add_sub_const_decimals!(6usize, 20usize, 26usize, 0usize);
+add_sub_const_decimals!(6usize, 19usize, 25usize, 0usize);
+add_sub_const_decimals!(6usize, 18usize, 24usize, 0usize);
+add_sub_const_decimals!(6usize, 17usize, 23usize, 0usize);
+add_sub_const_decimals!(6usize, 16usize, 22usize, 0usize);
+add_sub_const_decimals!(6usize, 15usize, 21usize, 0usize);
+add_sub_const_decimals!(6usize, 14usize, 20usize, 0usize);
+add_sub_const_decimals!(6usize, 13usize, 19usize, 0usize);
+add_sub_const_decimals!(6usize, 12usize, 18usize, 0usize);
+add_sub_const_decimals!(6usize, 11usize, 17usize, 0usize);
+add_sub_const_decimals!(6usize, 10usize, 16usize, 0usize);
+add_sub_const_decimals!(6usize, 9usize, 15usize, 0usize);
+add_sub_const_decimals!(6usize, 8usize, 14usize, 0usize);
+add_sub_const_decimals!(6usize, 7usize, 13usize, 0usize);
+add_sub_const_decimals!(6usize, 6usize, 12usize, 0usize);
+add_sub_const_decimals!(6usize, 5usize, 11usize, 1usize);
+add_sub_const_decimals!(6usize, 4usize, 10usize, 2usize);
+add_sub_const_decimals!(6usize, 3usize, 9usize, 3usize);
+add_sub_const_decimals!(6usize, 2usize, 8usize, 4usize);
+add_sub_const_decimals!(6usize, 1usize, 7usize, 5usize);
+add_sub_const_decimals!(6usize, 0usize, 6usize, 6usize);
+add_sub_const_decimals!(5usize, 64usize, 69usize, 0usize);
+add_sub_const_decimals!(5usize, 63usize, 68usize, 0usize);
+add_sub_const_decimals!(5usize, 62usize, 67usize, 0usize);
+add_sub_const_decimals!(5usize, 61usize, 66usize, 0usize);
+add_sub_const_decimals!(5usize, 60usize, 65usize, 0usize);
+add_sub_const_decimals!(5usize, 59usize, 64usize, 0usize);
+add_sub_const_decimals!(5usize, 58usize, 63usize, 0usize);
+add_sub_const_decimals!(5usize, 57usize, 62usize, 0usize);
+add_sub_const_decimals!(5usize, 56usize, 61usize, 0usize);
+add_sub_const_decimals!(5usize, 55usize, 60usize, 0usize);
+add_sub_const_decimals!(5usize, 54usize, 59usize, 0usize);
+add_sub_const_decimals!(5usize, 53usize, 58usize, 0usize);
+add_sub_const_decimals!(5usize, 52usize, 57usize, 0usize);
+add_sub_const_decimals!(5usize, 51usize, 56usize, 0usize);
+add_sub_const_decimals!(5usize, 50usize, 55usize, 0usize);
+add_sub_const_decimals!(5usize, 49usize, 54usize, 0usize);
+add_sub_const_decimals!(5usize, 48usize, 53usize, 0usize);
+add_sub_const_decimals!(5usize, 47usize, 52usize, 0usize);
+add_sub_const_decimals!(5usize, 46usize, 51usize, 0usize);
+add_sub_const_decimals!(5usize, 45usize, 50usize, 0usize);
+add_sub_const_decimals!(5usize, 44usize, 49usize, 0usize);
+add_sub_const_decimals!(5usize, 43usize, 48usize, 0usize);
+add_sub_const_decimals!(5usize, 42usize, 47usize, 0usize);
+add_sub_const_decimals!(5usize, 41usize, 46usize, 0usize);
+add_sub_const_decimals!(5usize, 40usize, 45usize, 0usize);
+add_sub_const_decimals!(5usize, 39usize, 44usize, 0usize);
+add_sub_const_decimals!(5usize, 38usize, 43usize, 0usize);
+add_sub_const_decimals!(5usize, 37usize, 42usize, 0usize);
+add_sub_const_decimals!(5usize, 36usize, 41usize, 0usize);
+add_sub_const_decimals!(5usize, 35usize, 40usize, 0usize);
+add_sub_const_decimals!(5usize, 34usize, 39usize, 0usize);
+add_sub_const_decimals!(5usize, 33usize, 38usize, 0usize);
+add_sub_const_decimals!(5usize, 32usize, 37usize, 0usize);
+add_sub_const_decimals!(5usize, 31usize, 36usize, 0usize);
+add_sub_const_decimals!(5usize, 30usize, 35usize, 0usize);
+add_sub_const_decimals!(5usize, 29usize, 34usize, 0usize);
+add_sub_const_decimals!(5usize, 28usize, 33usize, 0usize);
+add_sub_const_decimals!(5usize, 27usize, 32usize, 0usize);
+add_sub_const_decimals!(5usize, 26usize, 31usize, 0usize);
+add_sub_const_decimals!(5usize, 25usize, 30usize, 0usize);
+add_sub_const_decimals!(5usize, 24usize, 29usize, 0usize);
+add_sub_const_decimals!(5usize, 23usize, 28usize, 0usize);
+add_sub_const_decimals!(5usize, 22usize, 27usize, 0usize);
+add_sub_const_decimals!(5usize, 21usize, 26usize, 0usize);
+add_sub_const_decimals!(5usize, 20usize, 25usize, 0usize);
+add_sub_const_decimals!(5usize, 19usize, 24usize, 0usize);
+add_sub_const_decimals!(5usize, 18usize, 23usize, 0usize);
+add_sub_const_decimals!(5usize, 17usize, 22usize, 0usize);
+add_sub_const_decimals!(5usize, 16usize, 21usize, 0usize);
+add_sub_const_decimals!(5usize, 15usize, 20usize, 0usize);
+add_sub_const_decimals!(5usize, 14usize, 19usize, 0usize);
+add_sub_const_decimals!(5usize, 13usize, 18usize, 0usize);
+add_sub_const_decimals!(5usize, 12usize, 17usize, 0usize);
+add_sub_const_decimals!(5usize, 11usize, 16usize, 0usize);
+add_sub_const_decimals!(5usize, 10usize, 15usize, 0usize);
+add_sub_const_decimals!(5usize, 9usize, 14usize, 0usize);
+add_sub_const_decimals!(5usize, 8usize, 13usize, 0usize);
+add_sub_const_decimals!(5usize, 7usize, 12usize, 0usize);
+add_sub_const_decimals!(5usize, 6usize, 11usize, 0usize);
+add_sub_const_decimals!(5usize, 5usize, 10usize, 0usize);
+add_sub_const_decimals!(5usize, 4usize, 9usize, 1usize);
+add_sub_const_decimals!(5usize, 3usize, 8usize, 2usize);
+add_sub_const_decimals!(5usize, 2usize, 7usize, 3usize);
+add_sub_const_decimals!(5usize, 1usize, 6usize, 4usize);
+add_sub_const_decimals!(5usize, 0usize, 5usize, 5usize);
+add_sub_const_decimals!(4usize, 64usize, 68usize, 0usize);
+add_sub_const_decimals!(4usize, 63usize, 67usize, 0usize);
+add_sub_const_decimals!(4usize, 62usize, 66usize, 0usize);
+add_sub_const_decimals!(4usize, 61usize, 65usize, 0usize);
+add_sub_const_decimals!(4usize, 60usize, 64usize, 0usize);
+add_sub_const_decimals!(4usize, 59usize, 63usize, 0usize);
+add_sub_const_decimals!(4usize, 58usize, 62usize, 0usize);
+add_sub_const_decimals!(4usize, 57usize, 61usize, 0usize);
+add_sub_const_decimals!(4usize, 56usize, 60usize, 0usize);
+add_sub_const_decimals!(4usize, 55usize, 59usize, 0usize);
+add_sub_const_decimals!(4usize, 54usize, 58usize, 0usize);
+add_sub_const_decimals!(4usize, 53usize, 57usize, 0usize);
+add_sub_const_decimals!(4usize, 52usize, 56usize, 0usize);
+add_sub_const_decimals!(4usize, 51usize, 55usize, 0usize);
+add_sub_const_decimals!(4usize, 50usize, 54usize, 0usize);
+add_sub_const_decimals!(4usize, 49usize, 53usize, 0usize);
+add_sub_const_decimals!(4usize, 48usize, 52usize, 0usize);
+add_sub_const_decimals!(4usize, 47usize, 51usize, 0usize);
+add_sub_const_decimals!(4usize, 46usize, 50usize, 0usize);
+add_sub_const_decimals!(4usize, 45usize, 49usize, 0usize);
+add_sub_const_decimals!(4usize, 44usize, 48usize, 0usize);
+add_sub_const_decimals!(4usize, 43usize, 47usize, 0usize);
+add_sub_const_decimals!(4usize, 42usize, 46usize, 0usize);
+add_sub_const_decimals!(4usize, 41usize, 45usize, 0usize);
+add_sub_const_decimals!(4usize, 40usize, 44usize, 0usize);
+add_sub_const_decimals!(4usize, 39usize, 43usize, 0usize);
+add_sub_const_decimals!(4usize, 38usize, 42usize, 0usize);
+add_sub_const_decimals!(4usize, 37usize, 41usize, 0usize);
+add_sub_const_decimals!(4usize, 36usize, 40usize, 0usize);
+add_sub_const_decimals!(4usize, 35usize, 39usize, 0usize);
+add_sub_const_decimals!(4usize, 34usize, 38usize, 0usize);
+add_sub_const_decimals!(4usize, 33usize, 37usize, 0usize);
+add_sub_const_decimals!(4usize, 32usize, 36usize, 0usize);
+add_sub_const_decimals!(4usize, 31usize, 35usize, 0usize);
+add_sub_const_decimals!(4usize, 30usize, 34usize, 0usize);
+add_sub_const_decimals!(4usize, 29usize, 33usize, 0usize);
+add_sub_const_decimals!(4usize, 28usize, 32usize, 0usize);
+add_sub_const_decimals!(4usize, 27usize, 31usize, 0usize);
+add_sub_const_decimals!(4usize, 26usize, 30usize, 0usize);
+add_sub_const_decimals!(4usize, 25usize, 29usize, 0usize);
+add_sub_const_decimals!(4usize, 24usize, 28usize, 0usize);
+add_sub_const_decimals!(4usize, 23usize, 27usize, 0usize);
+add_sub_const_decimals!(4usize, 22usize, 26usize, 0usize);
+add_sub_const_decimals!(4usize, 21usize, 25usize, 0usize);
+add_sub_const_decimals!(4usize, 20usize, 24usize, 0usize);
+add_sub_const_decimals!(4usize, 19usize, 23usize, 0usize);
+add_sub_const_decimals!(4usize, 18usize, 22usize, 0usize);
+add_sub_const_decimals!(4usize, 17usize, 21usize, 0usize);
+add_sub_const_decimals!(4usize, 16usize, 20usize, 0usize);
+add_sub_const_decimals!(4usize, 15usize, 19usize, 0usize);
+add_sub_const_decimals!(4usize, 14usize, 18usize, 0usize);
+add_sub_const_decimals!(4usize, 13usize, 17usize, 0usize);
+add_sub_const_decimals!(4usize, 12usize, 16usize, 0usize);
+add_sub_const_decimals!(4usize, 11usize, 15usize, 0usize);
+add_sub_const_decimals!(4usize, 10usize, 14usize, 0usize);
+add_sub_const_decimals!(4usize, 9usize, 13usize, 0usize);
+add_sub_const_decimals!(4usize, 8usize, 12usize, 0usize);
+add_sub_const_decimals!(4usize, 7usize, 11usize, 0usize);
+add_sub_const_decimals!(4usize, 6usize, 10usize, 0usize);
+add_sub_const_decimals!(4usize, 5usize, 9usize, 0usize);
+add_sub_const_decimals!(4usize, 4usize, 8usize, 0usize);
+add_sub_const_decimals!(4usize, 3usize, 7usize, 1usize);
+add_sub_const_decimals!(4usize, 2usize, 6usize, 2usize);
+add_sub_const_decimals!(4usize, 1usize, 5usize, 3usize);
+add_sub_const_decimals!(4usize, 0usize, 4usize, 4usize);
+add_sub_const_decimals!(3usize, 64usize, 67usize, 0usize);
+add_sub_const_decimals!(3usize, 63usize, 66usize, 0usize);
+add_sub_const_decimals!(3usize, 62usize, 65usize, 0usize);
+add_sub_const_decimals!(3usize, 61usize, 64usize, 0usize);
+add_sub_const_decimals!(3usize, 60usize, 63usize, 0usize);
+add_sub_const_decimals!(3usize, 59usize, 62usize, 0usize);
+add_sub_const_decimals!(3usize, 58usize, 61usize, 0usize);
+add_sub_const_decimals!(3usize, 57usize, 60usize, 0usize);
+add_sub_const_decimals!(3usize, 56usize, 59usize, 0usize);
+add_sub_const_decimals!(3usize, 55usize, 58usize, 0usize);
+add_sub_const_decimals!(3usize, 54usize, 57usize, 0usize);
+add_sub_const_decimals!(3usize, 53usize, 56usize, 0usize);
+add_sub_const_decimals!(3usize, 52usize, 55usize, 0usize);
+add_sub_const_decimals!(3usize, 51usize, 54usize, 0usize);
+add_sub_const_decimals!(3usize, 50usize, 53usize, 0usize);
+add_sub_const_decimals!(3usize, 49usize, 52usize, 0usize);
+add_sub_const_decimals!(3usize, 48usize, 51usize, 0usize);
+add_sub_const_decimals!(3usize, 47usize, 50usize, 0usize);
+add_sub_const_decimals!(3usize, 46usize, 49usize, 0usize);
+add_sub_const_decimals!(3usize, 45usize, 48usize, 0usize);
+add_sub_const_decimals!(3usize, 44usize, 47usize, 0usize);
+add_sub_const_decimals!(3usize, 43usize, 46usize, 0usize);
+add_sub_const_decimals!(3usize, 42usize, 45usize, 0usize);
+add_sub_const_decimals!(3usize, 41usize, 44usize, 0usize);
+add_sub_const_decimals!(3usize, 40usize, 43usize, 0usize);
+add_sub_const_decimals!(3usize, 39usize, 42usize, 0usize);
+add_sub_const_decimals!(3usize, 38usize, 41usize, 0usize);
+add_sub_const_decimals!(3usize, 37usize, 40usize, 0usize);
+add_sub_const_decimals!(3usize, 36usize, 39usize, 0usize);
+add_sub_const_decimals!(3usize, 35usize, 38usize, 0usize);
+add_sub_const_decimals!(3usize, 34usize, 37usize, 0usize);
+add_sub_const_decimals!(3usize, 33usize, 36usize, 0usize);
+add_sub_const_decimals!(3usize, 32usize, 35usize, 0usize);
+add_sub_const_decimals!(3usize, 31usize, 34usize, 0usize);
+add_sub_const_decimals!(3usize, 30usize, 33usize, 0usize);
+add_sub_const_decimals!(3usize, 29usize, 32usize, 0usize);
+add_sub_const_decimals!(3usize, 28usize, 31usize, 0usize);
+add_sub_const_decimals!(3usize, 27usize, 30usize, 0usize);
+add_sub_const_decimals!(3usize, 26usize, 29usize, 0usize);
+add_sub_const_decimals!(3usize, 25usize, 28usize, 0usize);
+add_sub_const_decimals!(3usize, 24usize, 27usize, 0usize);
+add_sub_const_decimals!(3usize, 23usize, 26usize, 0usize);
+add_sub_const_decimals!(3usize, 22usize, 25usize, 0usize);
+add_sub_const_decimals!(3usize, 21usize, 24usize, 0usize);
+add_sub_const_decimals!(3usize, 20usize, 23usize, 0usize);
+add_sub_const_decimals!(3usize, 19usize, 22usize, 0usize);
+add_sub_const_decimals!(3usize, 18usize, 21usize, 0usize);
+add_sub_const_decimals!(3usize, 17usize, 20usize, 0usize);
+add_sub_const_decimals!(3usize, 16usize, 19usize, 0usize);
+add_sub_const_decimals!(3usize, 15usize, 18usize, 0usize);
+add_sub_const_decimals!(3usize, 14usize, 17usize, 0usize);
+add_sub_const_decimals!(3usize, 13usize, 16usize, 0usize);
+add_sub_const_decimals!(3usize, 12usize, 15usize, 0usize);
+add_sub_const_decimals!(3usize, 11usize, 14usize, 0usize);
+add_sub_const_decimals!(3usize, 10usize, 13usize, 0usize);
+add_sub_const_decimals!(3usize, 9usize, 12usize, 0usize);
+add_sub_const_decimals!(3usize, 8usize, 11usize, 0usize);
+add_sub_const_decimals!(3usize, 7usize, 10usize, 0usize);
+add_sub_const_decimals!(3usize, 6usize, 9usize, 0usize);
+add_sub_const_decimals!(3usize, 5usize, 8usize, 0usize);
+add_sub_const_decimals!(3usize, 4usize, 7usize, 0usize);
+add_sub_const_decimals!(3usize, 3usize, 6usize, 0usize);
+add_sub_const_decimals!(3usize, 2usize, 5usize, 1usize);
+add_sub_const_decimals!(3usize, 1usize, 4usize, 2usize);
+add_sub_const_decimals!(3usize, 0usize, 3usize, 3usize);
+add_sub_const_decimals!(2usize, 64usize, 66usize, 0usize);
+add_sub_const_decimals!(2usize, 63usize, 65usize, 0usize);
+add_sub_const_decimals!(2usize, 62usize, 64usize, 0usize);
+add_sub_const_decimals!(2usize, 61usize, 63usize, 0usize);
+add_sub_const_decimals!(2usize, 60usize, 62usize, 0usize);
+add_sub_const_decimals!(2usize, 59usize, 61usize, 0usize);
+add_sub_const_decimals!(2usize, 58usize, 60usize, 0usize);
+add_sub_const_decimals!(2usize, 57usize, 59usize, 0usize);
+add_sub_const_decimals!(2usize, 56usize, 58usize, 0usize);
+add_sub_const_decimals!(2usize, 55usize, 57usize, 0usize);
+add_sub_const_decimals!(2usize, 54usize, 56usize, 0usize);
+add_sub_const_decimals!(2usize, 53usize, 55usize, 0usize);
+add_sub_const_decimals!(2usize, 52usize, 54usize, 0usize);
+add_sub_const_decimals!(2usize, 51usize, 53usize, 0usize);
+add_sub_const_decimals!(2usize, 50usize, 52usize, 0usize);
+add_sub_const_decimals!(2usize, 49usize, 51usize, 0usize);
+add_sub_const_decimals!(2usize, 48usize, 50usize, 0usize);
+add_sub_const_decimals!(2usize, 47usize, 49usize, 0usize);
+add_sub_const_decimals!(2usize, 46usize, 48usize, 0usize);
+add_sub_const_decimals!(2usize, 45usize, 47usize, 0usize);
+add_sub_const_decimals!(2usize, 44usize, 46usize, 0usize);
+add_sub_const_decimals!(2usize, 43usize, 45usize, 0usize);
+add_sub_const_decimals!(2usize, 42usize, 44usize, 0usize);
+add_sub_const_decimals!(2usize, 41usize, 43usize, 0usize);
+add_sub_const_decimals!(2usize, 40usize, 42usize, 0usize);
+add_sub_const_decimals!(2usize, 39usize, 41usize, 0usize);
+add_sub_const_decimals!(2usize, 38usize, 40usize, 0usize);
+add_sub_const_decimals!(2usize, 37usize, 39usize, 0usize);
+add_sub_const_decimals!(2usize, 36usize, 38usize, 0usize);
+add_sub_const_decimals!(2usize, 35usize, 37usize, 0usize);
+add_sub_const_decimals!(2usize, 34usize, 36usize, 0usize);
+add_sub_const_decimals!(2usize, 33usize, 35usize, 0usize);
+add_sub_const_decimals!(2usize, 32usize, 34usize, 0usize);
+add_sub_const_decimals!(2usize, 31usize, 33usize, 0usize);
+add_sub_const_decimals!(2usize, 30usize, 32usize, 0usize);
+add_sub_const_decimals!(2usize, 29usize, 31usize, 0usize);
+add_sub_const_decimals!(2usize, 28usize, 30usize, 0usize);
+add_sub_const_decimals!(2usize, 27usize, 29usize, 0usize);
+add_sub_const_decimals!(2usize, 26usize, 28usize, 0usize);
+add_sub_const_decimals!(2usize, 25usize, 27usize, 0usize);
+add_sub_const_decimals!(2usize, 24usize, 26usize, 0usize);
+add_sub_const_decimals!(2usize, 23usize, 25usize, 0usize);
+add_sub_const_decimals!(2usize, 22usize, 24usize, 0usize);
+add_sub_const_decimals!(2usize, 21usize, 23usize, 0usize);
+add_sub_const_decimals!(2usize, 20usize, 22usize, 0usize);
+add_sub_const_decimals!(2usize, 19usize, 21usize, 0usize);
+add_sub_const_decimals!(2usize, 18usize, 20usize, 0usize);
+add_sub_const_decimals!(2usize, 17usize, 19usize, 0usize);
+add_sub_const_decimals!(2usize, 16usize, 18usize, 0usize);
+add_sub_const_decimals!(2usize, 15usize, 17usize, 0usize);
+add_sub_const_decimals!(2usize, 14usize, 16usize, 0usize);
+add_sub_const_decimals!(2usize, 13usize, 15usize, 0usize);
+add_sub_const_decimals!(2usize, 12usize, 14usize, 0usize);
+add_sub_const_decimals!(2usize, 11usize, 13usize, 0usize);
+add_sub_const_decimals!(2usize, 10usize, 12usize, 0usize);
+add_sub_const_decimals!(2usize, 9usize, 11usize, 0usize);
+add_sub_const_decimals!(2usize, 8usize, 10usize, 0usize);
+add_sub_const_decimals!(2usize, 7usize, 9usize, 0usize);
+add_sub_const_decimals!(2usize, 6usize, 8usize, 0usize);
+add_sub_const_decimals!(2usize, 5usize, 7usize, 0usize);
+add_sub_const_decimals!(2usize, 4usize, 6usize, 0usize);
+add_sub_const_decimals!(2usize, 3usize, 5usize, 0usize);
+add_sub_const_decimals!(2usize, 2usize, 4usize, 0usize);
+add_sub_const_decimals!(2usize, 1usize, 3usize, 1usize);
+add_sub_const_decimals!(2usize, 0usize, 2usize, 2usize);
+add_sub_const_decimals!(1usize, 64usize, 65usize, 0usize);
+add_sub_const_decimals!(1usize, 63usize, 64usize, 0usize);
+add_sub_const_decimals!(1usize, 62usize, 63usize, 0usize);
+add_sub_const_decimals!(1usize, 61usize, 62usize, 0usize);
+add_sub_const_decimals!(1usize, 60usize, 61usize, 0usize);
+add_sub_const_decimals!(1usize, 59usize, 60usize, 0usize);
+add_sub_const_decimals!(1usize, 58usize, 59usize, 0usize);
+add_sub_const_decimals!(1usize, 57usize, 58usize, 0usize);
+add_sub_const_decimals!(1usize, 56usize, 57usize, 0usize);
+add_sub_const_decimals!(1usize, 55usize, 56usize, 0usize);
+add_sub_const_decimals!(1usize, 54usize, 55usize, 0usize);
+add_sub_const_decimals!(1usize, 53usize, 54usize, 0usize);
+add_sub_const_decimals!(1usize, 52usize, 53usize, 0usize);
+add_sub_const_decimals!(1usize, 51usize, 52usize, 0usize);
+add_sub_const_decimals!(1usize, 50usize, 51usize, 0usize);
+add_sub_const_decimals!(1usize, 49usize, 50usize, 0usize);
+add_sub_const_decimals!(1usize, 48usize, 49usize, 0usize);
+add_sub_const_decimals!(1usize, 47usize, 48usize, 0usize);
+add_sub_const_decimals!(1usize, 46usize, 47usize, 0usize);
+add_sub_const_decimals!(1usize, 45usize, 46usize, 0usize);
+add_sub_const_decimals!(1usize, 44usize, 45usize, 0usize);
+add_sub_const_decimals!(1usize, 43usize, 44usize, 0usize);
+add_sub_const_decimals!(1usize, 42usize, 43usize, 0usize);
+add_sub_const_decimals!(1usize, 41usize, 42usize, 0usize);
+add_sub_const_decimals!(1usize, 40usize, 41usize, 0usize);
+add_sub_const_decimals!(1usize, 39usize, 40usize, 0usize);
+add_sub_const_decimals!(1usize, 38usize, 39usize, 0usize);
+add_sub_const_decimals!(1usize, 37usize, 38usize, 0usize);
+add_sub_const_decimals!(1usize, 36usize, 37usize, 0usize);
+add_sub_const_decimals!(1usize, 35usize, 36usize, 0usize);
+add_sub_const_decimals!(1usize, 34usize, 35usize, 0usize);
+add_sub_const_decimals!(1usize, 33usize, 34usize, 0usize);
+add_sub_const_decimals!(1usize, 32usize, 33usize, 0usize);
+add_sub_const_decimals!(1usize, 31usize, 32usize, 0usize);
+add_sub_const_decimals!(1usize, 30usize, 31usize, 0usize);
+add_sub_const_decimals!(1usize, 29usize, 30usize, 0usize);
+add_sub_const_decimals!(1usize, 28usize, 29usize, 0usize);
+add_sub_const_decimals!(1usize, 27usize, 28usize, 0usize);
+add_sub_const_decimals!(1usize, 26usize, 27usize, 0usize);
+add_sub_const_decimals!(1usize, 25usize, 26usize, 0usize);
+add_sub_const_decimals!(1usize, 24usize, 25usize, 0usize);
+add_sub_const_decimals!(1usize, 23usize, 24usize, 0usize);
+add_sub_const_decimals!(1usize, 22usize, 23usize, 0usize);
+add_sub_const_decimals!(1usize, 21usize, 22usize, 0usize);
+add_sub_const_decimals!(1usize, 20usize, 21usize, 0usize);
+add_sub_const_decimals!(1usize, 19usize, 20usize, 0usize);
+add_sub_const_decimals!(1usize, 18usize, 19usize, 0usize);
+add_sub_const_decimals!(1usize, 17usize, 18usize, 0usize);
+add_sub_const_decimals!(1usize, 16usize, 17usize, 0usize);
+add_sub_const_decimals!(1usize, 15usize, 16usize, 0usize);
+add_sub_const_decimals!(1usize, 14usize, 15usize, 0usize);
+add_sub_const_decimals!(1usize, 13usize, 14usize, 0usize);
+add_sub_const_decimals!(1usize, 12usize, 13usize, 0usize);
+add_sub_const_decimals!(1usize, 11usize, 12usize, 0usize);
+add_sub_const_decimals!(1usize, 10usize, 11usize, 0usize);
+add_sub_const_decimals!(1usize, 9usize, 10usize, 0usize);
+add_sub_const_decimals!(1usize, 8usize, 9usize, 0usize);
+add_sub_const_decimals!(1usize, 7usize, 8usize, 0usize);
+add_sub_const_decimals!(1usize, 6usize, 7usize, 0usize);
+add_sub_const_decimals!(1usize, 5usize, 6usize, 0usize);
+add_sub_const_decimals!(1usize, 4usize, 5usize, 0usize);
+add_sub_const_decimals!(1usize, 3usize, 4usize, 0usize);
+add_sub_const_decimals!(1usize, 2usize, 3usize, 0usize);
+add_sub_const_decimals!(1usize, 1usize, 2usize, 0usize);
+add_sub_const_decimals!(1usize, 0usize, 1usize, 1usize);
+add_sub_const_decimals!(0usize, 64usize, 64usize, 0usize);
+add_sub_const_decimals!(0usize, 63usize, 63usize, 0usize);
+add_sub_const_decimals!(0usize, 62usize, 62usize, 0usize);
+add_sub_const_decimals!(0usize, 61usize, 61usize, 0usize);
+add_sub_const_decimals!(0usize, 60usize, 60usize, 0usize);
+add_sub_const_decimals!(0usize, 59usize, 59usize, 0usize);
+add_sub_const_decimals!(0usize, 58usize, 58usize, 0usize);
+add_sub_const_decimals!(0usize, 57usize, 57usize, 0usize);
+add_sub_const_decimals!(0usize, 56usize, 56usize, 0usize);
+add_sub_const_decimals!(0usize, 55usize, 55usize, 0usize);
+add_sub_const_decimals!(0usize, 54usize, 54usize, 0usize);
+add_sub_const_decimals!(0usize, 53usize, 53usize, 0usize);
+add_sub_const_decimals!(0usize, 52usize, 52usize, 0usize);
+add_sub_const_decimals!(0usize, 51usize, 51usize, 0usize);
+add_sub_const_decimals!(0usize, 50usize, 50usize, 0usize);
+add_sub_const_decimals!(0usize, 49usize, 49usize, 0usize);
+add_sub_const_decimals!(0usize, 48usize, 48usize, 0usize);
+add_sub_const_decimals!(0usize, 47usize, 47usize, 0usize);
+add_sub_const_decimals!(0usize, 46usize, 46usize, 0usize);
+add_sub_const_decimals!(0usize, 45usize, 45usize, 0usize);
+add_sub_const_decimals!(0usize, 44usize, 44usize, 0usize);
+add_sub_const_decimals!(0usize, 43usize, 43usize, 0usize);
+add_sub_const_decimals!(0usize, 42usize, 42usize, 0usize);
+add_sub_const_decimals!(0usize, 41usize, 41usize, 0usize);
+add_sub_const_decimals!(0usize, 40usize, 40usize, 0usize);
+add_sub_const_decimals!(0usize, 39usize, 39usize, 0usize);
+add_sub_const_decimals!(0usize, 38usize, 38usize, 0usize);
+add_sub_const_decimals!(0usize, 37usize, 37usize, 0usize);
+add_sub_const_decimals!(0usize, 36usize, 36usize, 0usize);
+add_sub_const_decimals!(0usize, 35usize, 35usize, 0usize);
+add_sub_const_decimals!(0usize, 34usize, 34usize, 0usize);
+add_sub_const_decimals!(0usize, 33usize, 33usize, 0usize);
+add_sub_const_decimals!(0usize, 32usize, 32usize, 0usize);
+add_sub_const_decimals!(0usize, 31usize, 31usize, 0usize);
+add_sub_const_decimals!(0usize, 30usize, 30usize, 0usize);
+add_sub_const_decimals!(0usize, 29usize, 29usize, 0usize);
+add_sub_const_decimals!(0usize, 28usize, 28usize, 0usize);
+add_sub_const_decimals!(0usize, 27usize, 27usize, 0usize);
+add_sub_const_decimals!(0usize, 26usize, 26usize, 0usize);
+add_sub_const_decimals!(0usize, 25usize, 25usize, 0usize);
+add_sub_const_decimals!(0usize, 24usize, 24usize, 0usize);
+add_sub_const_decimals!(0usize, 23usize, 23usize, 0usize);
+add_sub_const_decimals!(0usize, 22usize, 22usize, 0usize);
+add_sub_const_decimals!(0usize, 21usize, 21usize, 0usize);
+add_sub_const_decimals!(0usize, 20usize, 20usize, 0usize);
+add_sub_const_decimals!(0usize, 19usize, 19usize, 0usize);
+add_sub_const_decimals!(0usize, 18usize, 18usize, 0usize);
+add_sub_const_decimals!(0usize, 17usize, 17usize, 0usize);
+add_sub_const_decimals!(0usize, 16usize, 16usize, 0usize);
+add_sub_const_decimals!(0usize, 15usize, 15usize, 0usize);
+add_sub_const_decimals!(0usize, 14usize, 14usize, 0usize);
+add_sub_const_decimals!(0usize, 13usize, 13usize, 0usize);
+add_sub_const_decimals!(0usize, 12usize, 12usize, 0usize);
+add_sub_const_decimals!(0usize, 11usize, 11usize, 0usize);
+add_sub_const_decimals!(0usize, 10usize, 10usize, 0usize);
+add_sub_const_decimals!(0usize, 9usize, 9usize, 0usize);
+add_sub_const_decimals!(0usize, 8usize, 8usize, 0usize);
+add_sub_const_decimals!(0usize, 7usize, 7usize, 0usize);
+add_sub_const_decimals!(0usize, 6usize, 6usize, 0usize);
+add_sub_const_decimals!(0usize, 5usize, 5usize, 0usize);
+add_sub_const_decimals!(0usize, 4usize, 4usize, 0usize);
+add_sub_const_decimals!(0usize, 3usize, 3usize, 0usize);
+add_sub_const_decimals!(0usize, 2usize, 2usize, 0usize);
+add_sub_const_decimals!(0usize, 1usize, 1usize, 0usize);
+add_sub_const_decimals!(0usize, 0usize, 0usize, 0usize);
diff --git a/framework/base/src/types/managed/wrapped/mod.rs b/framework/base/src/types/managed/wrapped/mod.rs
index c9c70fea9b..e05c3a3a43 100644
--- a/framework/base/src/types/managed/wrapped/mod.rs
+++ b/framework/base/src/types/managed/wrapped/mod.rs
@@ -8,6 +8,7 @@ mod managed_address;
 mod managed_buffer_cached_builder;
 mod managed_byte_array;
 mod managed_decimal;
+mod managed_decimal_macros;
 mod managed_option;
 mod managed_ref;
 mod managed_vec;

From be4f4090c1b6f39e44cf1a4839bdbd34cb98916f Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Mon, 11 Mar 2024 12:33:33 +0200
Subject: [PATCH 0415/1254] unified syntax - scneario queries, more refactoring

---
 .../examples/adder/tests/adder_blackbox.rs    |  11 +-
 .../adder/tests/adder_blackbox_chained.rs     |  22 ++--
 .../base/src/types/interaction/tx_rh_list.rs  |   2 +
 .../interaction/tx_rh_list/returns_similar.rs |  38 +++++-
 .../tx_rh_list/with_result_similar.rs         |  56 +++++++++
 framework/scenario/src/facade/world_tx.rs     |   1 +
 .../src/facade/world_tx/scenario_env.rs       |   9 ++
 .../facade/world_tx/scenario_env_deploy.rs    |  77 ++++++++++++
 .../src/facade/world_tx/scenario_env_exec.rs  | 115 +++---------------
 .../src/facade/world_tx/scenario_env_query.rs |  54 +++++++-
 .../src/facade/world_tx/scenario_env_util.rs  |  21 +++-
 .../facade/world_tx/scenario_rh_list_item.rs  |  37 +++++-
 12 files changed, 325 insertions(+), 118 deletions(-)
 create mode 100644 framework/base/src/types/interaction/tx_rh_list/with_result_similar.rs
 create mode 100644 framework/scenario/src/facade/world_tx/scenario_env_deploy.rs

diff --git a/contracts/examples/adder/tests/adder_blackbox.rs b/contracts/examples/adder/tests/adder_blackbox.rs
index ad24fd6250..dda9068a25 100644
--- a/contracts/examples/adder/tests/adder_blackbox.rs
+++ b/contracts/examples/adder/tests/adder_blackbox.rs
@@ -1,7 +1,7 @@
 use adder::*;
 use multiversx_sc::{
     storage::mappers::SingleValue,
-    types::{AddressExpr, ScExpr, WithResultNewAddress},
+    types::{AddressExpr, ReturnsSimilar, ScExpr, WithResultNewAddress},
 };
 use multiversx_sc_scenario::{api::StaticApi, num_bigint::BigUint, scenario_model::*, *};
 
@@ -51,6 +51,15 @@ fn adder_blackbox_with_values() {
             .expect_value(SingleValue::from(BigUint::from(5u32))),
     );
 
+    let value = world
+        .query()
+        .to(SC_ADDER)
+        .typed_v2(temp_proxy_v2::TxProxy)
+        .sum()
+        .returns(ReturnsSimilar::<SingleValue<BigUint>>::new())
+        .run();
+    assert_eq!(value.into(), BigUint::from(5u32));
+
     // TODO: remove
     world
         .tx()
diff --git a/contracts/examples/adder/tests/adder_blackbox_chained.rs b/contracts/examples/adder/tests/adder_blackbox_chained.rs
index 49795ab994..8121afb4e9 100644
--- a/contracts/examples/adder/tests/adder_blackbox_chained.rs
+++ b/contracts/examples/adder/tests/adder_blackbox_chained.rs
@@ -1,7 +1,7 @@
 use adder::*;
 use multiversx_sc::{
     storage::mappers::SingleValue,
-    types::{AddressExpr, ScExpr, WithResultNewAddress},
+    types::{AddressExpr, ScExpr, WithResultNewAddress, WithResultSimilar},
 };
 use multiversx_sc_scenario::{api::StaticApi, num_bigint::BigUint, scenario_model::*, *};
 
@@ -19,7 +19,7 @@ fn world() -> ScenarioWorld {
 fn adder_blackbox_chained() {
     let mut world = world();
     let owner_address = "address:owner";
-    let mut adder_contract = ContractInfo::<adder::Proxy<StaticApi>>::new("sc:adder");
+    let adder_contract = ContractInfo::<adder::Proxy<StaticApi>>::new("sc:adder");
 
     world
         .start_trace()
@@ -28,7 +28,7 @@ fn adder_blackbox_chained() {
                 .put_account(owner_address, Account::new().nonce(1))
                 .new_address(owner_address, 1, "sc:adder"),
         )
-        .chain_tx(|tx| {
+        .chain_deploy(|tx| {
             tx.from(AddressExpr("owner"))
                 .typed_v2(temp_proxy_v2::TxProxy)
                 .init(5u32)
@@ -37,13 +37,15 @@ fn adder_blackbox_chained() {
                     assert_eq!(new_address.to_address(), adder_contract.to_address());
                 }))
         })
-        .sc_query(
-            ScQueryStep::new()
-                .to(&adder_contract)
-                .call(adder_contract.sum())
-                .expect_value(SingleValue::from(BigUint::from(5u32))),
-        )
-        .chain_tx(|tx| {
+        .chain_query(|tx| {
+            tx.to(ScExpr("adder"))
+                .typed_v2(temp_proxy_v2::TxProxy)
+                .sum()
+                .with_result(WithResultSimilar::new(|value: SingleValue<BigUint>| {
+                    assert_eq!(value.into(), BigUint::from(5u32));
+                }))
+        })
+        .chain_call(|tx| {
             tx.from(AddressExpr("owner"))
                 .to(ScExpr("adder"))
                 .typed_v2(temp_proxy_v2::TxProxy)
diff --git a/framework/base/src/types/interaction/tx_rh_list.rs b/framework/base/src/types/interaction/tx_rh_list.rs
index 392863de73..2cf4743ef2 100644
--- a/framework/base/src/types/interaction/tx_rh_list.rs
+++ b/framework/base/src/types/interaction/tx_rh_list.rs
@@ -8,6 +8,7 @@ mod tx_rh_list_item;
 mod with_result_exact;
 mod with_result_new_address;
 mod with_result_raw;
+mod with_result_similar;
 
 pub use returns_bt::*;
 pub use returns_exact::*;
@@ -17,3 +18,4 @@ pub use returns_similar::*;
 pub use tx_rh_list_cons::*;
 pub use tx_rh_list_item::*;
 pub use with_result_new_address::*;
+pub use with_result_similar::*;
diff --git a/framework/base/src/types/interaction/tx_rh_list/returns_similar.rs b/framework/base/src/types/interaction/tx_rh_list/returns_similar.rs
index 07929d122f..1233a9bae0 100644
--- a/framework/base/src/types/interaction/tx_rh_list/returns_similar.rs
+++ b/framework/base/src/types/interaction/tx_rh_list/returns_similar.rs
@@ -1,10 +1,19 @@
 use core::marker::PhantomData;
 
-pub struct ReturnSimilar<T> {
+use multiversx_sc_codec::{CodecFrom, TopEncodeMulti};
+
+use crate::types::{
+    interaction::contract_call_exec::decode_result, ManagedBuffer, ManagedVec, RHListItemSync,
+    TxEnv,
+};
+
+use super::RHListItem;
+
+pub struct ReturnsSimilar<T> {
     _phantom: PhantomData<T>,
 }
 
-impl<T> Default for ReturnSimilar<T> {
+impl<T> Default for ReturnsSimilar<T> {
     fn default() -> Self {
         Self {
             _phantom: Default::default(),
@@ -12,8 +21,31 @@ impl<T> Default for ReturnSimilar<T> {
     }
 }
 
-impl<T> ReturnSimilar<T> {
+impl<T> ReturnsSimilar<T> {
     pub fn new() -> Self {
         Self::default()
     }
 }
+
+impl<Env, Original, T> RHListItem<Env, Original> for ReturnsSimilar<T>
+where
+    Env: TxEnv,
+    Original: TopEncodeMulti,
+    T: CodecFrom<Original>,
+{
+    type Returns = T;
+}
+
+impl<Env, Original, T> RHListItemSync<Env, Original> for ReturnsSimilar<T>
+where
+    Env: TxEnv,
+    Original: TopEncodeMulti,
+    T: CodecFrom<Original>,
+{
+    fn item_sync_call_result(
+        self,
+        raw_results: &ManagedVec<Env::Api, ManagedBuffer<Env::Api>>,
+    ) -> Self::Returns {
+        decode_result::<Env::Api, T>(raw_results.clone())
+    }
+}
diff --git a/framework/base/src/types/interaction/tx_rh_list/with_result_similar.rs b/framework/base/src/types/interaction/tx_rh_list/with_result_similar.rs
new file mode 100644
index 0000000000..ff0e5b1b5f
--- /dev/null
+++ b/framework/base/src/types/interaction/tx_rh_list/with_result_similar.rs
@@ -0,0 +1,56 @@
+use core::marker::PhantomData;
+
+use multiversx_sc_codec::{CodecFrom, TopDecodeMulti, TopEncodeMulti};
+
+use crate::types::{
+    interaction::contract_call_exec::decode_result, ManagedBuffer, ManagedVec, RHListItemSync,
+    TxEnv,
+};
+
+use super::RHListItem;
+
+pub struct WithResultSimilar<T, F>
+where
+    F: FnOnce(T),
+{
+    _phantom: PhantomData<T>,
+    pub f: F,
+}
+
+impl<T, F> WithResultSimilar<T, F>
+where
+    F: FnOnce(T),
+{
+    pub fn new(f: F) -> Self {
+        WithResultSimilar {
+            _phantom: PhantomData,
+            f,
+        }
+    }
+}
+
+impl<Env, Original, T, F> RHListItem<Env, Original> for WithResultSimilar<T, F>
+where
+    Env: TxEnv,
+    Original: TopEncodeMulti,
+    T: CodecFrom<Original>,
+    F: FnOnce(T),
+{
+    type Returns = ();
+}
+
+impl<Env, Original, T, F> RHListItemSync<Env, Original> for WithResultSimilar<T, F>
+where
+    Env: TxEnv,
+    Original: TopEncodeMulti,
+    T: CodecFrom<Original>,
+    F: FnOnce(T),
+{
+    fn item_sync_call_result(
+        self,
+        raw_results: &ManagedVec<Env::Api, ManagedBuffer<Env::Api>>,
+    ) -> Self::Returns {
+        let t = decode_result::<Env::Api, T>(raw_results.clone());
+        (self.f)(t)
+    }
+}
diff --git a/framework/scenario/src/facade/world_tx.rs b/framework/scenario/src/facade/world_tx.rs
index 287c911253..8c2314767e 100644
--- a/framework/scenario/src/facade/world_tx.rs
+++ b/framework/scenario/src/facade/world_tx.rs
@@ -2,6 +2,7 @@
 
 mod expr;
 mod scenario_env;
+mod scenario_env_deploy;
 mod scenario_env_exec;
 mod scenario_env_query;
 mod scenario_env_util;
diff --git a/framework/scenario/src/facade/world_tx/scenario_env.rs b/framework/scenario/src/facade/world_tx/scenario_env.rs
index 9c1833659b..b2fb597620 100644
--- a/framework/scenario/src/facade/world_tx/scenario_env.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_env.rs
@@ -34,6 +34,15 @@ impl ScenarioTxEnv for ScenarioTxEnvData {
     }
 }
 
+impl ScenarioWorld {
+    pub(crate) fn new_env_data(&self) -> ScenarioTxEnvData {
+        ScenarioTxEnvData {
+            context_path: self.current_dir.clone(),
+            ..Default::default()
+        }
+    }
+}
+
 /// Provides a `run` method for transactions and steps.
 pub trait ScenarioTxRun {
     type Returns;
diff --git a/framework/scenario/src/facade/world_tx/scenario_env_deploy.rs b/framework/scenario/src/facade/world_tx/scenario_env_deploy.rs
new file mode 100644
index 0000000000..103228c3e2
--- /dev/null
+++ b/framework/scenario/src/facade/world_tx/scenario_env_deploy.rs
@@ -0,0 +1,77 @@
+use std::path::PathBuf;
+
+use multiversx_chain_scenario_format::serde_raw::ValueSubTree;
+use multiversx_sc::{
+    tuple_util::NestedTupleFlatten,
+    types::{
+        AnnotatedValue, Code, DeployCall, FunctionCall, ManagedAddress, ManagedBuffer, RHListSync,
+        Tx, TxBaseWithEnv, TxCodeSource, TxCodeSourceSpecified, TxCodeValue, TxEnv,
+        TxFromSpecified, TxGas, TxPayment, TxToSpecified,
+    },
+};
+
+use crate::{
+    api::StaticApi,
+    scenario_model::{AddressValue, BytesValue, ScCallStep, ScDeployStep, TxResponse},
+    ScenarioEnvExec, ScenarioTxEnv, ScenarioTxRun, ScenarioTxRunOnWorld, ScenarioWorld,
+};
+
+use super::{scenario_env_util::*, RHListScenario, ScenarioTxEnvData};
+
+impl<'w, From, Payment, Gas, CodeValue, RH> ScenarioTxRun
+    for Tx<
+        ScenarioEnvExec<'w>,
+        From,
+        (),
+        Payment,
+        Gas,
+        DeployCall<ScenarioEnvExec<'w>, Code<CodeValue>>,
+        RH,
+    >
+where
+    From: TxFromSpecified<ScenarioEnvExec<'w>>,
+    Payment: TxPayment<ScenarioEnvExec<'w>>,
+    Gas: TxGas<ScenarioEnvExec<'w>>,
+    CodeValue: TxCodeValue<ScenarioEnvExec<'w>>,
+    RH: RHListScenario<ScenarioEnvExec<'w>>,
+    RH::ListReturns: NestedTupleFlatten,
+{
+    type Returns = <RH::ListReturns as NestedTupleFlatten>::Unpacked;
+
+    fn run(self) -> Self::Returns {
+        let mut step =
+            tx_to_sc_deploy_step(&self.env, self.from, self.payment, self.gas, self.data);
+        self.env.world.sc_deploy(&mut step);
+        process_result(step.response, self.result_handler)
+    }
+}
+
+impl ScenarioWorld {
+    pub fn chain_deploy<From, Payment, Gas, CodeValue, RH, F>(&mut self, f: F) -> &mut Self
+    where
+        From: TxFromSpecified<ScenarioTxEnvData>,
+        Payment: TxPayment<ScenarioTxEnvData>,
+        Gas: TxGas<ScenarioTxEnvData>,
+        CodeValue: TxCodeValue<ScenarioTxEnvData>,
+        RH: RHListScenario<ScenarioTxEnvData, ListReturns = ()>,
+        F: FnOnce(
+            TxBaseWithEnv<ScenarioTxEnvData>,
+        ) -> Tx<
+            ScenarioTxEnvData,
+            From,
+            (),
+            Payment,
+            Gas,
+            DeployCall<ScenarioTxEnvData, Code<CodeValue>>,
+            RH,
+        >,
+    {
+        let env = self.new_env_data();
+        let tx_base = TxBaseWithEnv::new_with_env(env);
+        let tx = f(tx_base);
+        let mut step = tx_to_sc_deploy_step(&tx.env, tx.from, tx.payment, tx.gas, tx.data);
+        self.sc_deploy(&mut step);
+        process_result(step.response, tx.result_handler);
+        self
+    }
+}
diff --git a/framework/scenario/src/facade/world_tx/scenario_env_exec.rs b/framework/scenario/src/facade/world_tx/scenario_env_exec.rs
index e0cb011529..44a6c2226b 100644
--- a/framework/scenario/src/facade/world_tx/scenario_env_exec.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_env_exec.rs
@@ -42,32 +42,6 @@ impl<'w> ScenarioTxEnv for ScenarioEnvExec<'w> {
     }
 }
 
-impl<From, To, Payment, Gas, RH> ScenarioTxRunOnWorld
-    for Tx<ScenarioTxEnvData, From, To, Payment, Gas, FunctionCall<StaticApi>, RH>
-where
-    From: TxFromSpecified<ScenarioTxEnvData>,
-    To: TxToSpecified<ScenarioTxEnvData>,
-    Payment: TxPayment<ScenarioTxEnvData>,
-    Gas: TxGas<ScenarioTxEnvData>,
-    RH: RHListScenario<ScenarioTxEnvData>,
-    RH::ListReturns: NestedTupleFlatten,
-{
-    type Returns = <RH::ListReturns as NestedTupleFlatten>::Unpacked;
-
-    fn run_on_world(self, world: &mut ScenarioWorld) -> Self::Returns {
-        let mut step = tx_to_sc_call_step(
-            &self.env,
-            self.from,
-            self.to,
-            self.payment,
-            self.gas,
-            self.data,
-        );
-        world.sc_call(&mut step);
-        process_result(step.response, self.result_handler)
-    }
-}
-
 impl<'w, From, To, Payment, Gas, RH> ScenarioTxRun
     for Tx<ScenarioEnvExec<'w>, From, To, Payment, Gas, FunctionCall<StaticApi>, RH>
 where
@@ -94,88 +68,31 @@ where
     }
 }
 
-impl<From, Payment, Gas, CodeValue, RH> ScenarioTxRunOnWorld
-    for Tx<
-        ScenarioTxEnvData,
-        From,
-        (),
-        Payment,
-        Gas,
-        DeployCall<ScenarioTxEnvData, Code<CodeValue>>,
-        RH,
-    >
-where
-    From: TxFromSpecified<ScenarioTxEnvData>,
-    Payment: TxPayment<ScenarioTxEnvData>,
-    Gas: TxGas<ScenarioTxEnvData>,
-    CodeValue: TxCodeValue<ScenarioTxEnvData>,
-    RH: RHListScenario<ScenarioTxEnvData>,
-    RH::ListReturns: NestedTupleFlatten,
-{
-    type Returns = <RH::ListReturns as NestedTupleFlatten>::Unpacked;
-
-    fn run_on_world(self, world: &mut ScenarioWorld) -> Self::Returns {
-        let mut step =
-            tx_to_sc_deploy_step(&self.env, self.from, self.payment, self.gas, self.data);
-        world.sc_deploy(&mut step);
-        process_result(step.response, self.result_handler)
-    }
-}
-
-impl<'w, From, Payment, Gas, CodeValue, RH> ScenarioTxRun
-    for Tx<
-        ScenarioEnvExec<'w>,
-        From,
-        (),
-        Payment,
-        Gas,
-        DeployCall<ScenarioEnvExec<'w>, Code<CodeValue>>,
-        RH,
-    >
-where
-    From: TxFromSpecified<ScenarioEnvExec<'w>>,
-    Payment: TxPayment<ScenarioEnvExec<'w>>,
-    Gas: TxGas<ScenarioEnvExec<'w>>,
-    CodeValue: TxCodeValue<ScenarioEnvExec<'w>>,
-    RH: RHListScenario<ScenarioEnvExec<'w>>,
-    RH::ListReturns: NestedTupleFlatten,
-{
-    type Returns = <RH::ListReturns as NestedTupleFlatten>::Unpacked;
-
-    fn run(self) -> Self::Returns {
-        let mut step =
-            tx_to_sc_deploy_step(&self.env, self.from, self.payment, self.gas, self.data);
-        self.env.world.sc_deploy(&mut step);
-        process_result(step.response, self.result_handler)
-    }
-}
-
 impl ScenarioWorld {
-    fn new_env_data(&self) -> ScenarioTxEnvData {
-        ScenarioTxEnvData {
-            context_path: self.current_dir.clone(),
-            ..Default::default()
-        }
-    }
-
-    fn wrap_world_ref<'w>(&'w mut self) -> ScenarioEnvExec<'w> {
-        let data = self.new_env_data();
-        ScenarioEnvExec { world: self, data }
-    }
-
     pub fn tx<'w>(&'w mut self) -> TxBaseWithEnv<ScenarioEnvExec<'w>> {
-        Tx::new_with_env(self.wrap_world_ref())
+        let data = self.new_env_data();
+        let env = ScenarioEnvExec { world: self, data };
+        Tx::new_with_env(env)
     }
 
-    pub fn chain_tx<STx, F>(&mut self, f: F) -> &mut Self
+    pub fn chain_call<From, To, Payment, Gas, RH, F>(&mut self, f: F) -> &mut Self
     where
-        STx: ScenarioTxRunOnWorld<Returns = ()>,
-        F: FnOnce(TxBaseWithEnv<ScenarioTxEnvData>) -> STx,
+        From: TxFromSpecified<ScenarioTxEnvData>,
+        To: TxToSpecified<ScenarioTxEnvData>,
+        Payment: TxPayment<ScenarioTxEnvData>,
+        Gas: TxGas<ScenarioTxEnvData>,
+        RH: RHListScenario<ScenarioTxEnvData, ListReturns = ()>,
+        F: FnOnce(
+            TxBaseWithEnv<ScenarioTxEnvData>,
+        )
+            -> Tx<ScenarioTxEnvData, From, To, Payment, Gas, FunctionCall<StaticApi>, RH>,
     {
         let env = self.new_env_data();
         let tx_base = TxBaseWithEnv::new_with_env(env);
         let tx = f(tx_base);
-        tx.run_on_world(self);
+        let mut step = tx_to_sc_call_step(&tx.env, tx.from, tx.to, tx.payment, tx.gas, tx.data);
+        self.sc_call(&mut step);
+        process_result(step.response, tx.result_handler);
         self
     }
 }
diff --git a/framework/scenario/src/facade/world_tx/scenario_env_query.rs b/framework/scenario/src/facade/world_tx/scenario_env_query.rs
index fbee3b921d..12ed35a3bf 100644
--- a/framework/scenario/src/facade/world_tx/scenario_env_query.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_env_query.rs
@@ -1,11 +1,20 @@
 use std::path::PathBuf;
 
-use multiversx_sc::types::{AnnotatedValue, ManagedAddress, TxBaseWithEnv, TxEnv};
+use multiversx_sc::{
+    tuple_util::NestedTupleFlatten,
+    types::{
+        AnnotatedValue, FunctionCall, ManagedAddress, Tx, TxBaseWithEnv, TxEnv, TxFromSpecified,
+        TxGas, TxPayment, TxToSpecified,
+    },
+};
 
 use crate::{
-    api::StaticApi, scenario_model::TxResponse, ScenarioTxEnv, ScenarioTxEnvData, ScenarioWorld,
+    api::StaticApi, scenario_model::TxResponse, RHListScenario, ScenarioTxEnv, ScenarioTxEnvData,
+    ScenarioTxRun, ScenarioTxRunOnWorld, ScenarioWorld,
 };
 
+use super::scenario_env_util::*;
+
 pub struct ScenarioEnvQuery<'w> {
     pub world: &'w mut ScenarioWorld,
     pub data: ScenarioTxEnvData,
@@ -28,3 +37,44 @@ impl<'w> ScenarioTxEnv for ScenarioEnvQuery<'w> {
         &self.data
     }
 }
+
+impl<'w, To, RH> ScenarioTxRun
+    for Tx<ScenarioEnvQuery<'w>, (), To, (), (), FunctionCall<StaticApi>, RH>
+where
+    To: TxToSpecified<ScenarioEnvQuery<'w>>,
+    RH: RHListScenario<ScenarioEnvQuery<'w>>,
+    RH::ListReturns: NestedTupleFlatten,
+{
+    type Returns = <RH::ListReturns as NestedTupleFlatten>::Unpacked;
+
+    fn run(self) -> Self::Returns {
+        let mut step = tx_to_sc_query_step(&self.env, self.to, self.data);
+        self.env.world.sc_query(&mut step);
+        process_result(step.response, self.result_handler)
+    }
+}
+
+impl ScenarioWorld {
+    pub fn query<'w>(&'w mut self) -> TxBaseWithEnv<ScenarioEnvQuery<'w>> {
+        let data = self.new_env_data();
+        let env = ScenarioEnvQuery { world: self, data };
+        Tx::new_with_env(env)
+    }
+
+    pub fn chain_query<To, RH, F>(&mut self, f: F) -> &mut Self
+    where
+        To: TxToSpecified<ScenarioTxEnvData>,
+        RH: RHListScenario<ScenarioTxEnvData, ListReturns = ()>,
+        F: FnOnce(
+            TxBaseWithEnv<ScenarioTxEnvData>,
+        ) -> Tx<ScenarioTxEnvData, (), To, (), (), FunctionCall<StaticApi>, RH>,
+    {
+        let env = self.new_env_data();
+        let tx_base = TxBaseWithEnv::new_with_env(env);
+        let tx = f(tx_base);
+        let mut step = tx_to_sc_query_step(&tx.env, tx.to, tx.data);
+        self.sc_query(&mut step);
+        process_result(step.response, tx.result_handler);
+        self
+    }
+}
diff --git a/framework/scenario/src/facade/world_tx/scenario_env_util.rs b/framework/scenario/src/facade/world_tx/scenario_env_util.rs
index 84b808fbc3..e05a4de177 100644
--- a/framework/scenario/src/facade/world_tx/scenario_env_util.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_env_util.rs
@@ -10,7 +10,7 @@ use multiversx_sc::{
 
 use crate::{
     api::StaticApi,
-    scenario_model::{AddressValue, BytesValue, ScCallStep, ScDeployStep, TxResponse},
+    scenario_model::{AddressValue, BytesValue, ScCallStep, ScDeployStep, ScQueryStep, TxResponse},
     RHListScenario, ScenarioEnvExec, ScenarioWorld,
 };
 
@@ -88,6 +88,25 @@ where
     step
 }
 
+pub(super) fn tx_to_sc_query_step<Env, To>(
+    env: &Env,
+    to: To,
+    data: FunctionCall<Env::Api>,
+) -> ScQueryStep
+where
+    Env: TxEnv,
+    To: TxToSpecified<Env>,
+{
+    let mut step = ScQueryStep::new()
+        .to(address_annotated(env, to))
+        .function(data.function_name.to_string().as_str());
+    for arg in data.arg_buffer.iter_buffers() {
+        step.tx.arguments.push(arg.to_vec().into());
+    }
+
+    step
+}
+
 pub(super) fn process_result<Env, RH>(
     response: Option<TxResponse>,
     result_handler: RH,
diff --git a/framework/scenario/src/facade/world_tx/scenario_rh_list_item.rs b/framework/scenario/src/facade/world_tx/scenario_rh_list_item.rs
index 057d1e0c1c..4de678b586 100644
--- a/framework/scenario/src/facade/world_tx/scenario_rh_list_item.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_rh_list_item.rs
@@ -1,6 +1,9 @@
 use multiversx_sc::{
-    codec::TopDecodeMulti,
-    types::{ManagedAddress, RHList, RHListItem, ReturnsExact, TxEnv, WithResultNewAddress},
+    codec::{CodecFrom, TopDecodeMulti, TopEncodeMulti},
+    types::{
+        ManagedAddress, RHList, RHListItem, ReturnsExact, ReturnsSimilar, TxEnv,
+        WithResultNewAddress, WithResultSimilar,
+    },
 };
 
 use crate::{
@@ -30,6 +33,36 @@ where
     }
 }
 
+impl<Env, Original, T> RHListItemScenario<Env, Original> for ReturnsSimilar<T>
+where
+    Env: TxEnv,
+    Original: TopEncodeMulti,
+    T: CodecFrom<Original>,
+{
+    fn item_scenario_result(self, tx_response: &TxResponse) -> Self::Returns {
+        let response = TypedResponse::<T>::from_raw(tx_response);
+        response
+            .result
+            .expect("ReturnsSimilar expects that transaction is successful")
+    }
+}
+
+impl<Env, Original, T, F> RHListItemScenario<Env, Original> for WithResultSimilar<T, F>
+where
+    Env: TxEnv,
+    Original: TopEncodeMulti,
+    T: CodecFrom<Original>,
+    F: FnOnce(T),
+{
+    fn item_scenario_result(self, tx_response: &TxResponse) -> Self::Returns {
+        let response = TypedResponse::<T>::from_raw(tx_response);
+        let value = response
+            .result
+            .expect("ReturnsExact expects that transaction is successful");
+        (self.f)(value);
+    }
+}
+
 impl<Env, Original, F> RHListItemScenario<Env, Original> for WithResultNewAddress<Env, F>
 where
     Env: TxEnv,

From 042026f9a8461ab6f5d00677210bcd45a3964c09 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Mon, 11 Mar 2024 12:35:26 +0200
Subject: [PATCH 0416/1254] clippy fix

---
 framework/scenario/src/facade/world_tx/scenario_env.rs       | 1 -
 framework/scenario/src/facade/world_tx/scenario_env_exec.rs  | 2 +-
 framework/scenario/src/facade/world_tx/scenario_env_query.rs | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/framework/scenario/src/facade/world_tx/scenario_env.rs b/framework/scenario/src/facade/world_tx/scenario_env.rs
index b2fb597620..0392fa2bb6 100644
--- a/framework/scenario/src/facade/world_tx/scenario_env.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_env.rs
@@ -38,7 +38,6 @@ impl ScenarioWorld {
     pub(crate) fn new_env_data(&self) -> ScenarioTxEnvData {
         ScenarioTxEnvData {
             context_path: self.current_dir.clone(),
-            ..Default::default()
         }
     }
 }
diff --git a/framework/scenario/src/facade/world_tx/scenario_env_exec.rs b/framework/scenario/src/facade/world_tx/scenario_env_exec.rs
index 44a6c2226b..844bbf9c97 100644
--- a/framework/scenario/src/facade/world_tx/scenario_env_exec.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_env_exec.rs
@@ -69,7 +69,7 @@ where
 }
 
 impl ScenarioWorld {
-    pub fn tx<'w>(&'w mut self) -> TxBaseWithEnv<ScenarioEnvExec<'w>> {
+    pub fn tx(&mut self) -> TxBaseWithEnv<ScenarioEnvExec<'_>> {
         let data = self.new_env_data();
         let env = ScenarioEnvExec { world: self, data };
         Tx::new_with_env(env)
diff --git a/framework/scenario/src/facade/world_tx/scenario_env_query.rs b/framework/scenario/src/facade/world_tx/scenario_env_query.rs
index 12ed35a3bf..f95f3cce33 100644
--- a/framework/scenario/src/facade/world_tx/scenario_env_query.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_env_query.rs
@@ -55,7 +55,7 @@ where
 }
 
 impl ScenarioWorld {
-    pub fn query<'w>(&'w mut self) -> TxBaseWithEnv<ScenarioEnvQuery<'w>> {
+    pub fn query(&mut self) -> TxBaseWithEnv<ScenarioEnvQuery<'_>> {
         let data = self.new_env_data();
         let env = ScenarioEnvQuery { world: self, data };
         Tx::new_with_env(env)

From f7cb39f6ae8d263377fe6822a01fce6f5f1c6f1e Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Mon, 11 Mar 2024 12:46:20 +0200
Subject: [PATCH 0417/1254] adder legacy proxy test

---
 ...ined.rs => adder_blackbox_chained_test.rs} |  0
 .../tests/adder_blackbox_legacy_proxy_test.rs | 79 +++++++++++++++++++
 ...ps.rs => adder_blackbox_raw_steps_test.rs} |  0
 ...der_blackbox.rs => adder_blackbox_test.rs} | 11 +--
 4 files changed, 81 insertions(+), 9 deletions(-)
 rename contracts/examples/adder/tests/{adder_blackbox_chained.rs => adder_blackbox_chained_test.rs} (100%)
 create mode 100644 contracts/examples/adder/tests/adder_blackbox_legacy_proxy_test.rs
 rename contracts/examples/adder/tests/{adder_blackbox_raw_steps.rs => adder_blackbox_raw_steps_test.rs} (100%)
 rename contracts/examples/adder/tests/{adder_blackbox.rs => adder_blackbox_test.rs} (88%)

diff --git a/contracts/examples/adder/tests/adder_blackbox_chained.rs b/contracts/examples/adder/tests/adder_blackbox_chained_test.rs
similarity index 100%
rename from contracts/examples/adder/tests/adder_blackbox_chained.rs
rename to contracts/examples/adder/tests/adder_blackbox_chained_test.rs
diff --git a/contracts/examples/adder/tests/adder_blackbox_legacy_proxy_test.rs b/contracts/examples/adder/tests/adder_blackbox_legacy_proxy_test.rs
new file mode 100644
index 0000000000..373e75f49f
--- /dev/null
+++ b/contracts/examples/adder/tests/adder_blackbox_legacy_proxy_test.rs
@@ -0,0 +1,79 @@
+use adder::*;
+use multiversx_sc::{
+    storage::mappers::SingleValue,
+    types::{AddressExpr, ReturnsSimilar, WithResultNewAddress},
+};
+use multiversx_sc_scenario::{api::StaticApi, num_bigint::BigUint, scenario_model::*, *};
+
+const ADDER_PATH_EXPR: &str = "mxsc:output/adder.mxsc.json";
+
+const OWNER: AddressExpr = AddressExpr("owner");
+const CODE_EXPR: MxscExpr = MxscExpr("output/adder.mxsc.json");
+
+fn world() -> ScenarioWorld {
+    let mut blockchain = ScenarioWorld::new();
+    blockchain.set_current_dir_from_workspace("contracts/examples/adder");
+
+    blockchain.register_contract(ADDER_PATH_EXPR, adder::ContractBuilder);
+    blockchain
+}
+
+#[test]
+fn adder_blackbox_legacy_proxy() {
+    let mut world = world();
+    let owner_address = "address:owner";
+    let mut adder_contract = ContractInfo::<adder::Proxy<StaticApi>>::new("sc:adder");
+
+    world.start_trace();
+
+    world.set_state_step(
+        SetStateStep::new()
+            .put_account(owner_address, Account::new().nonce(1))
+            .new_address(owner_address, 1, "sc:adder"),
+    );
+
+    world
+        .tx()
+        .from(OWNER)
+        .typed_v2(temp_proxy_v2::TxProxy)
+        .init(5u32)
+        .code(CODE_EXPR)
+        .with_result(WithResultNewAddress::new(|new_address| {
+            assert_eq!(new_address.to_address(), adder_contract.to_address());
+        }))
+        .run();
+
+    world.sc_query(
+        ScQueryStep::new()
+            .to(&adder_contract)
+            .call(adder_contract.sum())
+            .expect_value(SingleValue::from(BigUint::from(5u32))),
+    );
+
+    let value = world
+        .query()
+        .call(adder_contract.sum())
+        .returns(ReturnsSimilar::<SingleValue<BigUint>>::new())
+        .run();
+    assert_eq!(value.into(), BigUint::from(5u32));
+
+    world
+        .tx()
+        .from(OWNER)
+        .call(adder_contract.add(3u32))
+        .with_result(WithRawTxResponse(|response| {
+            assert!(response.tx_error.is_success());
+        }))
+        .run();
+
+    world.check_state_step(
+        CheckStateStep::new()
+            .put_account(owner_address, CheckAccount::new())
+            .put_account(
+                &adder_contract,
+                CheckAccount::new().check_storage("str:sum", "8"),
+            ),
+    );
+
+    world.write_scenario_trace("trace1.scen.json");
+}
diff --git a/contracts/examples/adder/tests/adder_blackbox_raw_steps.rs b/contracts/examples/adder/tests/adder_blackbox_raw_steps_test.rs
similarity index 100%
rename from contracts/examples/adder/tests/adder_blackbox_raw_steps.rs
rename to contracts/examples/adder/tests/adder_blackbox_raw_steps_test.rs
diff --git a/contracts/examples/adder/tests/adder_blackbox.rs b/contracts/examples/adder/tests/adder_blackbox_test.rs
similarity index 88%
rename from contracts/examples/adder/tests/adder_blackbox.rs
rename to contracts/examples/adder/tests/adder_blackbox_test.rs
index dda9068a25..185aa24001 100644
--- a/contracts/examples/adder/tests/adder_blackbox.rs
+++ b/contracts/examples/adder/tests/adder_blackbox_test.rs
@@ -20,10 +20,10 @@ fn world() -> ScenarioWorld {
 }
 
 #[test]
-fn adder_blackbox_with_values() {
+fn adder_blackbox() {
     let mut world = world();
     let owner_address = "address:owner";
-    let mut adder_contract = ContractInfo::<adder::Proxy<StaticApi>>::new("sc:adder");
+    let adder_contract = ContractInfo::<adder::Proxy<StaticApi>>::new("sc:adder");
 
     world.start_trace();
 
@@ -44,13 +44,6 @@ fn adder_blackbox_with_values() {
         }))
         .run();
 
-    world.sc_query(
-        ScQueryStep::new()
-            .to(&adder_contract)
-            .call(adder_contract.sum())
-            .expect_value(SingleValue::from(BigUint::from(5u32))),
-    );
-
     let value = world
         .query()
         .to(SC_ADDER)

From 8b596f30eab57bd705fe0aee0b9a7f0e6822a671 Mon Sep 17 00:00:00 2001
From: Alin Cruceat <alyn_509@yahoo.com>
Date: Mon, 11 Mar 2024 16:08:16 +0200
Subject: [PATCH 0418/1254] include numbers in template name test

---
 framework/meta/tests/template_test.rs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/framework/meta/tests/template_test.rs b/framework/meta/tests/template_test.rs
index 1ca2b7ed07..ffa8bd3e8d 100644
--- a/framework/meta/tests/template_test.rs
+++ b/framework/meta/tests/template_test.rs
@@ -56,7 +56,15 @@ fn template_current_ping_pong_egld() {
 #[test]
 #[cfg_attr(not(feature = "template-test-current"), ignore)]
 fn test_correct_naming() {
-    template_test_current("empty", "examples", "myNew-correct_Empty");
+    template_test_current("empty", "examples", "my1New2_3-correct_Empty");
+}
+#[test]
+#[cfg_attr(not(feature = "template-test-current"), ignore)]
+fn test_correct_pharsing() {
+    assert_eq!(
+        "myNew42-correct_Empty".to_string().to_case(Case::Kebab),
+        "my-new-42-correct-empty"
+    );
 }
 
 /// Recreates the folder structure in `contracts`, on the same level.

From 958f2ae251ea9a0f8f8163e63f942db983f2dd7f Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Mon, 11 Mar 2024 16:36:49 +0200
Subject: [PATCH 0419/1254] TxProxy example fix

---
 contracts/examples/adder/src/temp_proxy_v2.rs               | 6 +-----
 .../examples/adder/tests/adder_blackbox_chained_test.rs     | 4 ++--
 contracts/examples/adder/tests/adder_blackbox_test.rs       | 4 ++--
 framework/base/src/types/managed/basic/big_uint.rs          | 4 ++++
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/contracts/examples/adder/src/temp_proxy_v2.rs b/contracts/examples/adder/src/temp_proxy_v2.rs
index 039a1454fd..145760201f 100644
--- a/contracts/examples/adder/src/temp_proxy_v2.rs
+++ b/contracts/examples/adder/src/temp_proxy_v2.rs
@@ -73,11 +73,7 @@ where
         (),
         Gas,
         FunctionCall<Env::Api>,
-        OriginalResultMarker<
-            multiversx_sc::types::managed::basic::big_uint::BigUint<
-                multiversx_sc::api::uncallable::UncallableApi,
-            >,
-        >,
+        OriginalResultMarker<BigUint<Env::Api>>,
     > {
         self.wrapped_tx
             .raw_call()
diff --git a/contracts/examples/adder/tests/adder_blackbox_chained_test.rs b/contracts/examples/adder/tests/adder_blackbox_chained_test.rs
index 8121afb4e9..ca9c201cb2 100644
--- a/contracts/examples/adder/tests/adder_blackbox_chained_test.rs
+++ b/contracts/examples/adder/tests/adder_blackbox_chained_test.rs
@@ -41,8 +41,8 @@ fn adder_blackbox_chained() {
             tx.to(ScExpr("adder"))
                 .typed_v2(temp_proxy_v2::TxProxy)
                 .sum()
-                .with_result(WithResultSimilar::new(|value: SingleValue<BigUint>| {
-                    assert_eq!(value.into(), BigUint::from(5u32));
+                .with_result(WithResultSimilar::new(|value: BigUint| {
+                    assert_eq!(value, BigUint::from(5u32));
                 }))
         })
         .chain_call(|tx| {
diff --git a/contracts/examples/adder/tests/adder_blackbox_test.rs b/contracts/examples/adder/tests/adder_blackbox_test.rs
index 185aa24001..346ae1344b 100644
--- a/contracts/examples/adder/tests/adder_blackbox_test.rs
+++ b/contracts/examples/adder/tests/adder_blackbox_test.rs
@@ -49,9 +49,9 @@ fn adder_blackbox() {
         .to(SC_ADDER)
         .typed_v2(temp_proxy_v2::TxProxy)
         .sum()
-        .returns(ReturnsSimilar::<SingleValue<BigUint>>::new())
+        .returns(ReturnsSimilar::<BigUint>::new())
         .run();
-    assert_eq!(value.into(), BigUint::from(5u32));
+    assert_eq!(value, BigUint::from(5u32));
 
     // TODO: remove
     world
diff --git a/framework/base/src/types/managed/basic/big_uint.rs b/framework/base/src/types/managed/basic/big_uint.rs
index b139f823dc..df0c1b947b 100644
--- a/framework/base/src/types/managed/basic/big_uint.rs
+++ b/framework/base/src/types/managed/basic/big_uint.rs
@@ -291,6 +291,10 @@ impl<M: ManagedTypeApi> crate::abi::TypeAbi for BigUint<M> {
     fn type_name() -> TypeName {
         TypeName::from("BigUint")
     }
+
+    fn type_name_rust() -> TypeName {
+        TypeName::from("multiversx_sc::types::BigUint<$API>")
+    }
 }
 
 impl<M: ManagedTypeApi> SCDisplay for BigUint<M> {

From a25c81bc6add42419c618a6e79ac92924ae1323a Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Mon, 11 Mar 2024 16:54:56 +0200
Subject: [PATCH 0420/1254] changed visibility

---
 .../tests/adder_blackbox_chained_test.rs      |  5 +---
 .../adder/tests/adder_blackbox_test.rs        |  5 +---
 framework/base/src/types/managed/basic/mod.rs | 30 +++++++++----------
 3 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/contracts/examples/adder/tests/adder_blackbox_chained_test.rs b/contracts/examples/adder/tests/adder_blackbox_chained_test.rs
index ca9c201cb2..2edc5e4100 100644
--- a/contracts/examples/adder/tests/adder_blackbox_chained_test.rs
+++ b/contracts/examples/adder/tests/adder_blackbox_chained_test.rs
@@ -1,8 +1,5 @@
 use adder::*;
-use multiversx_sc::{
-    storage::mappers::SingleValue,
-    types::{AddressExpr, ScExpr, WithResultNewAddress, WithResultSimilar},
-};
+use multiversx_sc::types::{AddressExpr, ScExpr, WithResultNewAddress, WithResultSimilar};
 use multiversx_sc_scenario::{api::StaticApi, num_bigint::BigUint, scenario_model::*, *};
 
 const ADDER_PATH_EXPR: &str = "mxsc:output/adder.mxsc.json";
diff --git a/contracts/examples/adder/tests/adder_blackbox_test.rs b/contracts/examples/adder/tests/adder_blackbox_test.rs
index 346ae1344b..69f94a2e1e 100644
--- a/contracts/examples/adder/tests/adder_blackbox_test.rs
+++ b/contracts/examples/adder/tests/adder_blackbox_test.rs
@@ -1,8 +1,5 @@
 use adder::*;
-use multiversx_sc::{
-    storage::mappers::SingleValue,
-    types::{AddressExpr, ReturnsSimilar, ScExpr, WithResultNewAddress},
-};
+use multiversx_sc::types::{AddressExpr, ReturnsSimilar, ScExpr, WithResultNewAddress};
 use multiversx_sc_scenario::{api::StaticApi, num_bigint::BigUint, scenario_model::*, *};
 
 const ADDER_PATH_EXPR: &str = "mxsc:output/adder.mxsc.json";
diff --git a/framework/base/src/types/managed/basic/mod.rs b/framework/base/src/types/managed/basic/mod.rs
index 419eb4b827..124fd1df55 100644
--- a/framework/base/src/types/managed/basic/mod.rs
+++ b/framework/base/src/types/managed/basic/mod.rs
@@ -1,18 +1,18 @@
-pub mod big_float;
-pub mod big_float_cmp;
-pub mod big_float_operators;
-pub mod big_int;
-pub mod big_int_cmp;
-pub mod big_int_operators;
-pub mod big_int_sign;
-pub mod big_num_cmp;
-pub mod big_uint;
-pub mod big_uint_cmp;
-pub mod big_uint_operators;
-pub mod cast_to_i64;
-pub mod elliptic_curve;
-pub mod managed_buffer;
-pub mod managed_map;
+mod big_float;
+mod big_float_cmp;
+mod big_float_operators;
+mod big_int;
+mod big_int_cmp;
+mod big_int_operators;
+mod big_int_sign;
+mod big_num_cmp;
+mod big_uint;
+mod big_uint_cmp;
+mod big_uint_operators;
+mod cast_to_i64;
+mod elliptic_curve;
+mod managed_buffer;
+mod managed_map;
 
 pub use big_float::BigFloat;
 pub use big_int::BigInt;

From b2875807e2f379fa9c9508db2ccd0c5f013203c8 Mon Sep 17 00:00:00 2001
From: Alin Cruceat <alyn_509@yahoo.com>
Date: Mon, 11 Mar 2024 16:59:16 +0200
Subject: [PATCH 0421/1254] exclude no_new_dir feature

---
 .../meta/src/cli_args/cli_args_standalone.rs  |  4 --
 .../standalone/template/contract_creator.rs   |  1 -
 .../template/contract_creator_target.rs       |  7 +---
 framework/meta/tests/template_test.rs         | 37 -------------------
 4 files changed, 1 insertion(+), 48 deletions(-)

diff --git a/framework/meta/src/cli_args/cli_args_standalone.rs b/framework/meta/src/cli_args/cli_args_standalone.rs
index a92e94310b..a81d145dab 100644
--- a/framework/meta/src/cli_args/cli_args_standalone.rs
+++ b/framework/meta/src/cli_args/cli_args_standalone.rs
@@ -225,10 +225,6 @@ pub struct TemplateArgs {
     #[arg(long, verbatim_doc_comment)]
     pub template: String,
 
-    /// Skips creating a new dir for the contract
-    #[arg(short, long, default_value = "false", verbatim_doc_comment)]
-    pub no_new_dir: bool,
-
     /// The framework version on which the contracts should be created.
     #[arg(long, verbatim_doc_comment)]
     pub tag: Option<String>,
diff --git a/framework/meta/src/cmd/standalone/template/contract_creator.rs b/framework/meta/src/cmd/standalone/template/contract_creator.rs
index 4f50da5c21..ae55c79b39 100644
--- a/framework/meta/src/cmd/standalone/template/contract_creator.rs
+++ b/framework/meta/src/cmd/standalone/template/contract_creator.rs
@@ -33,7 +33,6 @@ fn target_from_args(args: &TemplateArgs) -> ContractCreatorTarget {
     ContractCreatorTarget {
         target_path,
         new_name,
-        no_new_dir: args.no_new_dir,
     }
 }
 
diff --git a/framework/meta/src/cmd/standalone/template/contract_creator_target.rs b/framework/meta/src/cmd/standalone/template/contract_creator_target.rs
index 61bb4672f0..4904b48d05 100644
--- a/framework/meta/src/cmd/standalone/template/contract_creator_target.rs
+++ b/framework/meta/src/cmd/standalone/template/contract_creator_target.rs
@@ -4,15 +4,10 @@ use std::path::PathBuf;
 pub struct ContractCreatorTarget {
     pub target_path: PathBuf,
     pub new_name: String,
-    pub no_new_dir: bool,
 }
 
 impl ContractCreatorTarget {
     pub fn contract_dir(&self) -> PathBuf {
-        if self.no_new_dir {
-            self.target_path.clone()
-        } else {
-            self.target_path.join(&self.new_name)
-        }
+        self.target_path.join(&self.new_name)
     }
 }
diff --git a/framework/meta/tests/template_test.rs b/framework/meta/tests/template_test.rs
index ffa8bd3e8d..c006ef0704 100644
--- a/framework/meta/tests/template_test.rs
+++ b/framework/meta/tests/template_test.rs
@@ -75,42 +75,6 @@ fn template_test_current(template_name: &str, sub_path: &str, new_name: &str) {
     let target = ContractCreatorTarget {
         target_path: workspace_path.join(TEMPLATE_TEMP_DIR_NAME).join(sub_path),
         new_name: new_name.to_string().to_case(Case::Kebab),
-        no_new_dir: false,
-    };
-
-    let repo_source = RepoSource::from_local_path(workspace_path);
-
-    prepare_target_dir(&target);
-
-    ContractCreator::new(
-        &repo_source,
-        template_name.to_string(),
-        target.clone(),
-        true,
-    )
-    .create_contract(LAST_TEMPLATE_VERSION);
-
-    if BUILD_CONTRACTS {
-        build_contract(&target);
-    }
-    cargo_test(&target);
-}
-
-/// Recreates the folder structure in `contracts`, on the same level.
-/// This way, the relative paths are still valid in this case,
-/// and we can test the templates with the framework version of the current branch.
-#[test]
-#[cfg_attr(not(feature = "template-test-current"), ignore)]
-fn template_test_no_new_dir() {
-    let template_name = "empty";
-    let sub_path = "examples";
-    let new_name = "new-empty";
-
-    let workspace_path = find_current_workspace().unwrap();
-    let target = ContractCreatorTarget {
-        target_path: workspace_path.join(TEMPLATE_TEMP_DIR_NAME).join(sub_path),
-        new_name: new_name.to_string().to_case(Case::Kebab),
-        no_new_dir: true,
     };
 
     let repo_source = RepoSource::from_local_path(workspace_path);
@@ -159,7 +123,6 @@ fn template_test_released(template_name: &str, new_name: &str) {
     let target = ContractCreatorTarget {
         target_path: workspace_path.join(TEMPLATE_TEMP_DIR_NAME),
         new_name: new_name.to_string(),
-        no_new_dir: false,
     };
 
     let temp_dir_path = workspace_path

From c284c1e469384f0c66c4e3f308e670b0320eb12c Mon Sep 17 00:00:00 2001
From: Laurentiu Ciobanu <laurentiu.ciobanu@multiversx.com>
Date: Mon, 11 Mar 2024 18:40:54 +0200
Subject: [PATCH 0422/1254] run llvm-cov and render outputs

---
 .gitignore                              |  4 +++
 Cargo.lock                              |  9 ++++++
 Cargo.toml                              |  1 +
 tests-coverage.sh                       | 33 +++++++++++++++++++
 tools/coverage-renderer/Cargo.toml      |  9 ++++++
 tools/coverage-renderer/src/cargo.rs    | 17 ++++++++++
 tools/coverage-renderer/src/llvm_cov.rs | 41 +++++++++++++++++++++++
 tools/coverage-renderer/src/main.rs     | 28 ++++++++++++++++
 tools/coverage-renderer/src/renderer.rs | 43 +++++++++++++++++++++++++
 9 files changed, 185 insertions(+)
 create mode 100755 tests-coverage.sh
 create mode 100644 tools/coverage-renderer/Cargo.toml
 create mode 100644 tools/coverage-renderer/src/cargo.rs
 create mode 100644 tools/coverage-renderer/src/llvm_cov.rs
 create mode 100644 tools/coverage-renderer/src/main.rs
 create mode 100644 tools/coverage-renderer/src/renderer.rs

diff --git a/.gitignore b/.gitignore
index 630f52abb6..6e26ebc202 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,6 +14,10 @@ sdk/**/Cargo.lock
 tools/**/Cargo.lock
 vm/**/Cargo.lock
 
+# Profiler outputs
+*.profraw
+*.profdata
+*.coverage
 
 # These are backup files generated by rustfmt
 **/*.rs.bk
diff --git a/Cargo.lock b/Cargo.lock
index 6274b48504..1e015137d2 100755
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -517,6 +517,15 @@ version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
 
+[[package]]
+name = "coverage-renderer"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "serde",
+ "serde_json",
+]
+
 [[package]]
 name = "cpufeatures"
 version = "0.2.12"
diff --git a/Cargo.toml b/Cargo.toml
index ef92a8a7b9..f2cc134137 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -16,6 +16,7 @@ members = [
   "sdk/scenario-format",
 
   "tools/mxpy-snippet-generator",
+  "tools/coverage-renderer",
 
   "vm",
 
diff --git a/tests-coverage.sh b/tests-coverage.sh
new file mode 100755
index 0000000000..68139f8a8e
--- /dev/null
+++ b/tests-coverage.sh
@@ -0,0 +1,33 @@
+#!/bin/sh
+RUSTFLAGS="-C instrument-coverage" \
+    cargo test --tests
+
+PROFRAW_FILES=$(find . -name "default_*.profraw")
+llvm-profdata merge -sparse $PROFRAW_FILES -o tests.profdata
+find . -name "default_*.profraw" -delete
+
+llvm-cov export \
+    $( \
+      for file in \
+        $( \
+          RUSTFLAGS="-C instrument-coverage" \
+            cargo test --tests --no-run --message-format=json \
+              | jq -r "select(.profile.test == true) | .filenames[]" \
+              | grep -v dSYM - \
+        ); \
+      do \
+        printf "%s %s " -object $file; \
+      done \
+    ) \
+  --ignore-filename-regex='/.cargo/registry' \
+  --ignore-filename-regex='rustc/' \
+  --ignore-filename-regex='meta/src' \
+  --ignore-filename-regex='wasm-adapter' \
+  --ignore-filename-regex='benchmarks/' \
+  --ignore-filename-regex='tests/' \
+  --ignore-filename-regex='tools/coverage-renderer/' \
+  --instr-profile=tests.profdata --summary-only --format=text > tests.coverage
+rm ./tests.profdata
+
+cargo run --quiet --bin coverage-renderer ./tests.coverage > coverage.md
+rm ./tests.coverage
\ No newline at end of file
diff --git a/tools/coverage-renderer/Cargo.toml b/tools/coverage-renderer/Cargo.toml
new file mode 100644
index 0000000000..eb7a044055
--- /dev/null
+++ b/tools/coverage-renderer/Cargo.toml
@@ -0,0 +1,9 @@
+[package]
+name = "coverage-renderer"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+serde = { version = "1.0", features = ["derive"] }
+serde_json = "1.0"
+anyhow = "1.0.44"
\ No newline at end of file
diff --git a/tools/coverage-renderer/src/cargo.rs b/tools/coverage-renderer/src/cargo.rs
new file mode 100644
index 0000000000..e4ab22d94e
--- /dev/null
+++ b/tools/coverage-renderer/src/cargo.rs
@@ -0,0 +1,17 @@
+use std::process::Command;
+
+use anyhow::{bail, Result};
+
+pub fn get_workspace_root() -> Result<String> {
+    let output = Command::new("cargo")
+        .args(&["metadata", "--no-deps", "--format-version=1"])
+        .output()?;
+
+    let metadata: serde_json::Value = serde_json::from_slice(&output.stdout)?;
+
+    let Some(workspace_root) = metadata["workspace_root"].as_str() else {
+        bail!("Failed to get workspace root");
+    };
+
+    Ok(workspace_root.to_owned())
+}
\ No newline at end of file
diff --git a/tools/coverage-renderer/src/llvm_cov.rs b/tools/coverage-renderer/src/llvm_cov.rs
new file mode 100644
index 0000000000..1f5cba4da4
--- /dev/null
+++ b/tools/coverage-renderer/src/llvm_cov.rs
@@ -0,0 +1,41 @@
+use serde::Deserialize;
+use anyhow::{bail, Result};
+use serde_json::Value;
+
+#[derive(Deserialize)]
+pub struct Coverage {
+    pub files: Vec<FileSummary>,
+    pub totals: Summary, 
+}
+
+#[derive(Deserialize)]
+pub struct SummaryItem {
+    pub count: u64,
+    pub covered: u64,
+    pub percent: f64,
+}
+
+#[derive(Deserialize)]
+pub struct Summary {
+    pub functions: SummaryItem,
+    pub lines: SummaryItem,
+    pub instantiations: SummaryItem,
+    pub regions: SummaryItem,
+}
+
+#[derive(Deserialize)]
+pub struct FileSummary {
+    pub filename: String,
+    pub summary: Summary,
+}
+
+
+pub fn parse_llvm_cov_output(output: &str) -> Result<Coverage> {
+    let llvm_cov_output: Value = serde_json::from_str(output)?;
+    let Some(coverage) = llvm_cov_output.get("data").and_then(|data| data.get(0)) else {
+        bail!("Invalid llvm-cov output");
+    };
+
+    let coverage = serde_json::from_value(coverage.to_owned())?;
+    Ok(coverage)
+}
\ No newline at end of file
diff --git a/tools/coverage-renderer/src/main.rs b/tools/coverage-renderer/src/main.rs
new file mode 100644
index 0000000000..4e0a3f60ea
--- /dev/null
+++ b/tools/coverage-renderer/src/main.rs
@@ -0,0 +1,28 @@
+mod llvm_cov;
+mod renderer;
+mod cargo;
+
+use std::env;
+use anyhow::{bail, Result};
+
+use llvm_cov::parse_llvm_cov_output;
+use renderer::render_coverage;
+
+fn main() -> Result<()> {
+    let args = env::args();
+
+    if args.len() < 2 {
+        bail!("Usage: coverage-renderer <input_path>");
+    }
+
+    let root = cargo::get_workspace_root()?;
+
+    let input_path = args.skip(1).next().unwrap();
+    let input = std::fs::read_to_string(&input_path)?;
+
+    let coverage = parse_llvm_cov_output(&input)?;
+    
+    render_coverage(&coverage, &root);
+
+    Ok(())
+}
diff --git a/tools/coverage-renderer/src/renderer.rs b/tools/coverage-renderer/src/renderer.rs
new file mode 100644
index 0000000000..3e06194e2b
--- /dev/null
+++ b/tools/coverage-renderer/src/renderer.rs
@@ -0,0 +1,43 @@
+use crate::llvm_cov::{Coverage, FileSummary, Summary};
+
+pub fn render_coverage(coverage: &Coverage, root: &str) {
+    render_header();
+    render_totals(&coverage.totals);
+    render_files(&coverage.files, root);
+}
+
+fn render_header() {
+    println!("# Coverage Summary");
+    println!();
+}
+
+fn render_totals(summary: &Summary) {
+    println!("## Totals");
+
+    println!("| | Count | Covered | % |");
+    println!("|---|---|---|---|");
+    println!("| Lines | {} | {} | {:.2} |", summary.lines.count, summary.lines.covered, summary.lines.percent);
+    println!("| Regions | {} | {} | {:.2} |", summary.regions.count, summary.regions.covered, summary.regions.percent);
+    println!("| Functions | {} | {} | {:.2} |", summary.functions.count, summary.functions.covered, summary.functions.percent);
+    println!("| Instantiations | {} | {} | {:.2} |", summary.instantiations.count, summary.instantiations.covered, summary.instantiations.percent);
+
+    println!();
+}
+
+fn render_files(files: &[FileSummary], root: &str) {
+    println!("## Files");
+    println!("| File | Lines | Regions | Functions | Instantiations |");
+    println!("|---|---|---|---|---|");
+    for file in files {
+        render_file(file, root);
+    }
+
+    println!();
+}
+
+fn render_file(file: &FileSummary, root: &str) {
+    let summary = &file.summary;
+    let filename = file.filename.strip_prefix(root).unwrap();
+
+    println!("| {} | {:.2}% | {:.2}% | {:.2}% | {:.2}% |", filename, summary.lines.percent, summary.regions.percent, summary.functions.percent, summary.instantiations.percent);
+}
\ No newline at end of file

From 2d5b341349b1f4f3dfa7177f6fee93c47f488c19 Mon Sep 17 00:00:00 2001
From: Laurentiu Ciobanu <laurentiu.ciobanu@multiversx.com>
Date: Mon, 11 Mar 2024 18:49:32 +0200
Subject: [PATCH 0423/1254] add action

---
 .github/workflows/actions.yml | 61 +++++++++++++++++++++++++++++++----
 1 file changed, 54 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
index 9aa9fdcee4..dce52f5f28 100644
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -30,7 +30,7 @@ jobs:
 
           cargo install wasm-opt
           cargo install twiggy
-          
+
           cargo install --path framework/meta
           sc-meta install mx-scenario-go --tag v2.1.0-alpha
 
@@ -46,8 +46,7 @@ jobs:
       - name: Run the wasm tests
         env:
           RUSTFLAGS: ""
-        run:
-          cargo test --features multiversx-sc-scenario/run-go-tests
+        run: cargo test --features multiversx-sc-scenario/run-go-tests
 
       - name: Generate the contract report
         env:
@@ -108,8 +107,8 @@ jobs:
         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'
+          comment-author: "github-actions[bot]"
+          body-includes: "Contract comparison"
 
       - name: Create or update the report comment
         uses: peter-evans/create-or-update-comment@v2
@@ -120,6 +119,55 @@ jobs:
           body: ${{ steps.template.outputs.result }}
           edit-mode: replace
 
+  test_coverage:
+    name: Test Coverage
+    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: Install prerequisites
+        run: |
+          apt-get install llvm-17
+
+          which llvm-cov
+          which llvm-profdata
+
+      - name: Run tests and generate report
+        env:
+          RUSTFLAGS: ""
+        run: |
+          ./tests-coverage.sh
+
+      - name: Upload the report
+        uses: actions/upload-artifact@v3
+        with:
+          name: coverage
+          path: coverage.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: "Coverage Summary"
+
+      - 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-path: ./coverage.md
+          edit-mode: replace
+
   rust_test:
     name: Rust tests
     runs-on: ubuntu-latest
@@ -132,8 +180,7 @@ jobs:
       - name: Run the rust tests
         env:
           RUSTFLAGS: ""
-        run:
-          cargo test
+        run: cargo test
 
   clippy_check:
     name: Clippy linter check

From 23555e3fe7bfdf43d7517bc35dffca3f37a2464a Mon Sep 17 00:00:00 2001
From: Laurentiu Ciobanu <laurentiu.ciobanu@multiversx.com>
Date: Mon, 11 Mar 2024 18:50:21 +0200
Subject: [PATCH 0424/1254] add action

---
 .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 dce52f5f28..c1e9993d3d 100644
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -133,7 +133,7 @@ jobs:
 
       - name: Install prerequisites
         run: |
-          apt-get install llvm-17
+          sudo apt-get install llvm-17
 
           which llvm-cov
           which llvm-profdata

From 93e5f2bda59872aede4e306ba998e12de2b6041c Mon Sep 17 00:00:00 2001
From: Laurentiu Ciobanu <laurentiu.ciobanu@multiversx.com>
Date: Mon, 11 Mar 2024 18:54:06 +0200
Subject: [PATCH 0425/1254] fix action

---
 .github/workflows/actions.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
index c1e9993d3d..b08b9572fc 100644
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -133,7 +133,9 @@ jobs:
 
       - name: Install prerequisites
         run: |
-          sudo apt-get install llvm-17
+          wget https://apt.llvm.org/llvm.sh
+          chmod +x llvm.sh
+          sudo ./llvm.sh 17 
 
           which llvm-cov
           which llvm-profdata

From c56efef3f7a9527c0582f331345aaafbe706bec9 Mon Sep 17 00:00:00 2001
From: Laurentiu Ciobanu <laurentiu.ciobanu@multiversx.com>
Date: Mon, 11 Mar 2024 18:57:06 +0200
Subject: [PATCH 0426/1254] fix action

---
 .github/workflows/actions.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
index b08b9572fc..14828d6fa0 100644
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -133,9 +133,7 @@ jobs:
 
       - name: Install prerequisites
         run: |
-          wget https://apt.llvm.org/llvm.sh
-          chmod +x llvm.sh
-          sudo ./llvm.sh 17 
+          rustup component add llvm-tools-preview
 
           which llvm-cov
           which llvm-profdata

From d920b53dcf5b56dba8acb0c44d77cf51ae62acda Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Mon, 11 Mar 2024 19:04:51 +0200
Subject: [PATCH 0427/1254] cleanup

---
 framework/meta/tests/template_test.rs | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/framework/meta/tests/template_test.rs b/framework/meta/tests/template_test.rs
index c006ef0704..e3463d09a2 100644
--- a/framework/meta/tests/template_test.rs
+++ b/framework/meta/tests/template_test.rs
@@ -56,15 +56,12 @@ fn template_current_ping_pong_egld() {
 #[test]
 #[cfg_attr(not(feature = "template-test-current"), ignore)]
 fn test_correct_naming() {
-    template_test_current("empty", "examples", "my1New2_3-correct_Empty");
-}
-#[test]
-#[cfg_attr(not(feature = "template-test-current"), ignore)]
-fn test_correct_pharsing() {
     assert_eq!(
         "myNew42-correct_Empty".to_string().to_case(Case::Kebab),
         "my-new-42-correct-empty"
     );
+
+    template_test_current("empty", "examples", "my1New2_3-correct_Empty");
 }
 
 /// Recreates the folder structure in `contracts`, on the same level.

From 2fdf0ede3a61c7f5dbc662548abb687206b2fdf4 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Mon, 11 Mar 2024 19:05:59 +0200
Subject: [PATCH 0428/1254] changed visibility

---
 framework/base/src/types.rs             | 2 +-
 framework/base/src/types/managed/mod.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/framework/base/src/types.rs b/framework/base/src/types.rs
index c316553b6b..caa4a5a2d3 100644
--- a/framework/base/src/types.rs
+++ b/framework/base/src/types.rs
@@ -3,7 +3,7 @@ mod flags;
 pub mod heap;
 mod interaction;
 mod io;
-pub mod managed;
+mod managed;
 mod static_buffer;
 
 pub use crypto::*;
diff --git a/framework/base/src/types/managed/mod.rs b/framework/base/src/types/managed/mod.rs
index 1ff74fdb84..3107f1ee3e 100644
--- a/framework/base/src/types/managed/mod.rs
+++ b/framework/base/src/types/managed/mod.rs
@@ -1,4 +1,4 @@
-pub mod basic;
+mod basic;
 mod codec_util;
 mod managed_type_trait;
 mod multi_value;

From 3f9676c6549aee363285b27b75a30ed05fa1f6ee Mon Sep 17 00:00:00 2001
From: Laurentiu Ciobanu <laurentiu.ciobanu@multiversx.com>
Date: Mon, 11 Mar 2024 19:14:12 +0200
Subject: [PATCH 0429/1254] fix action

---
 .github/workflows/actions.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
index 14828d6fa0..449901a0b6 100644
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -134,6 +134,7 @@ jobs:
       - name: Install prerequisites
         run: |
           rustup component add llvm-tools-preview
+          echo "::add-path::$(dirname $(find ~/.rustup -name llvm-cov))"
 
           which llvm-cov
           which llvm-profdata

From f6b548c993774ab6ca1bdb17d51d80dadd59cb84 Mon Sep 17 00:00:00 2001
From: Laurentiu Ciobanu <laurentiu.ciobanu@multiversx.com>
Date: Mon, 11 Mar 2024 19:16:47 +0200
Subject: [PATCH 0430/1254] fix action

---
 .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 449901a0b6..50c641665e 100644
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -134,7 +134,7 @@ jobs:
       - name: Install prerequisites
         run: |
           rustup component add llvm-tools-preview
-          echo "::add-path::$(dirname $(find ~/.rustup -name llvm-cov))"
+          dirname $(find ~/.rustup -name llvm-cov) >> $GITHUB_PATH
 
           which llvm-cov
           which llvm-profdata

From d41af20d6ac156011b525cd6b2cfdc6a7b5e8454 Mon Sep 17 00:00:00 2001
From: Laurentiu Ciobanu <laurentiu.ciobanu@multiversx.com>
Date: Mon, 11 Mar 2024 19:18:52 +0200
Subject: [PATCH 0431/1254] fix action

---
 .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 50c641665e..9467fa3606 100644
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -129,12 +129,11 @@ jobs:
         uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
           toolchain: nightly-2023-12-11
-          target: wasm32-unknown-unknown
 
       - name: Install prerequisites
         run: |
           rustup component add llvm-tools-preview
-          dirname $(find ~/.rustup -name llvm-cov) >> $GITHUB_PATH
+          echo "$(dirname $(find ~/.rustup -name llvm-cov))" >> $GITHUB_PATH
 
           which llvm-cov
           which llvm-profdata

From 263f968fdfad319533da705749866497ef65b9d0 Mon Sep 17 00:00:00 2001
From: Laurentiu Ciobanu <laurentiu.ciobanu@multiversx.com>
Date: Mon, 11 Mar 2024 19:20:42 +0200
Subject: [PATCH 0432/1254] fix action

---
 .github/workflows/actions.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
index 9467fa3606..ede215154e 100644
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -133,10 +133,12 @@ jobs:
       - name: Install prerequisites
         run: |
           rustup component add llvm-tools-preview
-          echo "$(dirname $(find ~/.rustup -name llvm-cov))" >> $GITHUB_PATH
+          dirname $(find ~/.rustup -name llvm-cov) >> $GITHUB_PATH
 
-          which llvm-cov
-          which llvm-profdata
+          echo $(dirname $(find ~/.rustup -name llvm-cov))
+
+          # which llvm-cov
+          # which llvm-profdata
 
       - name: Run tests and generate report
         env:

From 5fe0027afd2086050b868559f25f3749e0fb1b78 Mon Sep 17 00:00:00 2001
From: Laurentiu Ciobanu <laurentiu.ciobanu@multiversx.com>
Date: Mon, 11 Mar 2024 19:35:13 +0200
Subject: [PATCH 0433/1254] fix action

---
 .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 ede215154e..b6d06db260 100644
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -167,7 +167,7 @@ jobs:
         with:
           comment-id: ${{ steps.fc.outputs.comment-id }}
           issue-number: ${{ github.event.pull_request.number }}
-          body-path: ./coverage.md
+          body-file: ./coverage.md
           edit-mode: replace
 
   rust_test:

From 216e629fe38d9feb61eaa507a8d444698b1c8faa Mon Sep 17 00:00:00 2001
From: Laurentiu Ciobanu <laurentiu.ciobanu@multiversx.com>
Date: Mon, 11 Mar 2024 19:50:57 +0200
Subject: [PATCH 0434/1254] fix action

---
 tools/coverage-renderer/src/renderer.rs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tools/coverage-renderer/src/renderer.rs b/tools/coverage-renderer/src/renderer.rs
index 3e06194e2b..fefa1f6522 100644
--- a/tools/coverage-renderer/src/renderer.rs
+++ b/tools/coverage-renderer/src/renderer.rs
@@ -26,13 +26,14 @@ fn render_totals(summary: &Summary) {
 
 fn render_files(files: &[FileSummary], root: &str) {
     println!("## Files");
+    println!("<details><summary>Expand</summary>\n");
     println!("| File | Lines | Regions | Functions | Instantiations |");
     println!("|---|---|---|---|---|");
     for file in files {
         render_file(file, root);
     }
 
-    println!();
+    println!("</details>");
 }
 
 fn render_file(file: &FileSummary, root: &str) {
@@ -40,4 +41,4 @@ fn render_file(file: &FileSummary, root: &str) {
     let filename = file.filename.strip_prefix(root).unwrap();
 
     println!("| {} | {:.2}% | {:.2}% | {:.2}% | {:.2}% |", filename, summary.lines.percent, summary.regions.percent, summary.functions.percent, summary.instantiations.percent);
-}
\ No newline at end of file
+}

From 27bec3761c3955d69f82d17419b728210a11f5f1 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Tue, 12 Mar 2024 00:01:31 +0100
Subject: [PATCH 0435/1254] remove never type

---
 .../alloc-features/src/alloc_features_main.rs            | 1 -
 .../basic-features/src/basic_features_main.rs            | 1 -
 data/codec/src/codec_err_handler.rs                      | 7 +++++--
 data/codec/src/lib.rs                                    | 1 -
 framework/base/src/contract_base/wrappers/serializer.rs  | 5 +++--
 framework/base/src/io/arg_error_handler.rs               | 5 ++++-
 framework/base/src/lib.rs                                | 1 -
 framework/base/src/storage/storage_get.rs                | 9 +++------
 framework/base/src/types/io/sc_error_static.rs           | 5 +++--
 9 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/contracts/feature-tests/alloc-features/src/alloc_features_main.rs b/contracts/feature-tests/alloc-features/src/alloc_features_main.rs
index d744d2195c..d5a83a1e70 100644
--- a/contracts/feature-tests/alloc-features/src/alloc_features_main.rs
+++ b/contracts/feature-tests/alloc-features/src/alloc_features_main.rs
@@ -1,5 +1,4 @@
 #![no_std]
-#![feature(never_type)]
 
 multiversx_sc::imports!();
 
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 2be5e1a535..2f0cb9a830 100644
--- a/contracts/feature-tests/basic-features/src/basic_features_main.rs
+++ b/contracts/feature-tests/basic-features/src/basic_features_main.rs
@@ -1,5 +1,4 @@
 #![no_std]
-#![feature(never_type)]
 
 multiversx_sc::imports!();
 
diff --git a/data/codec/src/codec_err_handler.rs b/data/codec/src/codec_err_handler.rs
index c7e6d6d90d..de0b731fa9 100644
--- a/data/codec/src/codec_err_handler.rs
+++ b/data/codec/src/codec_err_handler.rs
@@ -34,12 +34,15 @@ impl DecodeErrorHandler for DefaultErrorHandler {
     }
 }
 
+#[derive(Debug)]
+pub enum Never {}
+
 /// An error handler that panics immediately, instead of returning a `Result`.
 #[derive(Clone, Copy)]
 pub struct PanicErrorHandler;
 
 impl EncodeErrorHandler for PanicErrorHandler {
-    type HandledErr = !;
+    type HandledErr = Never;
 
     #[inline]
     fn handle_error(&self, err: EncodeError) -> Self::HandledErr {
@@ -48,7 +51,7 @@ impl EncodeErrorHandler for PanicErrorHandler {
 }
 
 impl DecodeErrorHandler for PanicErrorHandler {
-    type HandledErr = !;
+    type HandledErr = Never;
 
     #[inline]
     fn handle_error(&self, err: DecodeError) -> Self::HandledErr {
diff --git a/data/codec/src/lib.rs b/data/codec/src/lib.rs
index cea3384871..df9d6e3f25 100644
--- a/data/codec/src/lib.rs
+++ b/data/codec/src/lib.rs
@@ -1,6 +1,5 @@
 #![no_std]
 #![feature(try_trait_v2)]
-#![feature(never_type)]
 #![feature(exhaustive_patterns)]
 #![feature(auto_traits)]
 #![feature(negative_impls)]
diff --git a/framework/base/src/contract_base/wrappers/serializer.rs b/framework/base/src/contract_base/wrappers/serializer.rs
index 00c3e9649c..5064f67b38 100644
--- a/framework/base/src/contract_base/wrappers/serializer.rs
+++ b/framework/base/src/contract_base/wrappers/serializer.rs
@@ -7,6 +7,7 @@ use crate::codec::{
 use crate::{
     api::{ErrorApi, ErrorApiImpl, ManagedTypeApi},
     err_msg,
+    imports::Never,
     types::{heap::BoxedBytes, ManagedBuffer, ManagedType},
 };
 
@@ -98,7 +99,7 @@ impl<M> EncodeErrorHandler for ExitCodecErrorHandler<M>
 where
     M: ManagedTypeApi + ErrorApi,
 {
-    type HandledErr = !;
+    type HandledErr = Never;
 
     fn handle_error(&self, err: EncodeError) -> Self::HandledErr {
         let mut message_buffer = ManagedBuffer::<M>::new_from_bytes(self.base_message);
@@ -111,7 +112,7 @@ impl<M> DecodeErrorHandler for ExitCodecErrorHandler<M>
 where
     M: ManagedTypeApi + ErrorApi,
 {
-    type HandledErr = !;
+    type HandledErr = Never;
 
     fn handle_error(&self, err: DecodeError) -> Self::HandledErr {
         let mut message_buffer = ManagedBuffer::<M>::new_from_bytes(self.base_message);
diff --git a/framework/base/src/io/arg_error_handler.rs b/framework/base/src/io/arg_error_handler.rs
index 3fd6c19c8f..b750f106f1 100644
--- a/framework/base/src/io/arg_error_handler.rs
+++ b/framework/base/src/io/arg_error_handler.rs
@@ -29,11 +29,14 @@ where
     }
 }
 
+#[derive(Debug)]
+pub enum Never {}
+
 impl<M> DecodeErrorHandler for ArgErrorHandler<M>
 where
     M: ManagedTypeApi + ErrorApi,
 {
-    type HandledErr = !;
+    type HandledErr = Never;
 
     #[inline(always)]
     fn handle_error(&self, err: DecodeError) -> Self::HandledErr {
diff --git a/framework/base/src/lib.rs b/framework/base/src/lib.rs
index 951e3b5b4f..9c3ecb592c 100644
--- a/framework/base/src/lib.rs
+++ b/framework/base/src/lib.rs
@@ -1,5 +1,4 @@
 #![no_std]
-#![feature(never_type)]
 #![feature(exhaustive_patterns)]
 #![feature(try_trait_v2)]
 #![feature(control_flow_enum)]
diff --git a/framework/base/src/storage/storage_get.rs b/framework/base/src/storage/storage_get.rs
index c4504df70f..790994b896 100644
--- a/framework/base/src/storage/storage_get.rs
+++ b/framework/base/src/storage/storage_get.rs
@@ -4,12 +4,9 @@ use crate::{
     api::{
         const_handles, use_raw_handle, ErrorApi, ErrorApiImpl, ManagedBufferApiImpl,
         ManagedTypeApi, StaticVarApiImpl, StorageReadApi, StorageReadApiImpl,
-    },
-    codec::*,
-    err_msg,
-    types::{
+    }, codec::*, err_msg, imports::Never, types::{
         BigInt, BigUint, ManagedBuffer, ManagedBufferNestedDecodeInput, ManagedRef, ManagedType,
-    },
+    }
 };
 use alloc::boxed::Box;
 
@@ -158,7 +155,7 @@ impl<M> DecodeErrorHandler for StorageGetErrorHandler<M>
 where
     M: ManagedTypeApi + ErrorApi,
 {
-    type HandledErr = !;
+    type HandledErr = Never;
 
     fn handle_error(&self, err: DecodeError) -> Self::HandledErr {
         let mut message_buffer = ManagedBuffer::<M>::new_from_bytes(err_msg::STORAGE_DECODE_ERROR);
diff --git a/framework/base/src/types/io/sc_error_static.rs b/framework/base/src/types/io/sc_error_static.rs
index a63daa1571..9d06a41d64 100644
--- a/framework/base/src/types/io/sc_error_static.rs
+++ b/framework/base/src/types/io/sc_error_static.rs
@@ -1,6 +1,7 @@
 use crate::codec::{self, DecodeError, EncodeError, TopEncodeMulti, TryStaticCast};
 
 use crate::api::{EndpointFinishApi, ErrorApiImpl};
+use crate::imports::Never;
 
 use super::SCError;
 
@@ -54,8 +55,8 @@ impl From<DecodeError> for StaticSCError {
     }
 }
 
-impl From<!> for StaticSCError {
-    fn from(_: !) -> Self {
+impl From<Never> for StaticSCError {
+    fn from(_: Never) -> Self {
         unreachable!()
     }
 }

From c0f50ce35d269e9f23cb8c01f2f436acdf606fa4 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Tue, 12 Mar 2024 01:04:15 +0100
Subject: [PATCH 0436/1254] cut path from panic info

---
 .../scenarios/panic-after-log.scen.json       |  2 +-
 .../scenarios/panic-message.scen.json         |  2 +-
 framework/wasm-adapter/src/panic.rs           | 40 ++++---------------
 3 files changed, 9 insertions(+), 35 deletions(-)

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 c652454513..f28323bf54 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
@@ -30,7 +30,7 @@
             "expect": {
                 "out": [],
                 "status": "0x04",
-                "message": "str:panic occurred: panic after log",
+                "message": "str:panic occured: PanicInfo { payload: Any { .. }, message: Some(panic after log), location: Location { file: panic_features.rs, line: 22, col: 9 }, can_unwind: true, force_no_backtrace: false }",
                 "logs": [
                     {
                         "address": "address:an_account",
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 7852b73228..816c4b3eef 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
@@ -32,7 +32,7 @@
             "expect": {
                 "out": [],
                 "status": "0x04",
-                "message": "str:panic occurred: example panic message 123",
+                "message": "str:panic occured: PanicInfo { payload: Any { .. }, message: Some(panic after log), location: Location { file: panic_features.rs, line: 22, col: 9 }, can_unwind: true, force_no_backtrace: false }",
                 "logs": "*",
                 "gas": "*",
                 "refund": "*"
diff --git a/framework/wasm-adapter/src/panic.rs b/framework/wasm-adapter/src/panic.rs
index 1c51d8ca86..603c4846e1 100644
--- a/framework/wasm-adapter/src/panic.rs
+++ b/framework/wasm-adapter/src/panic.rs
@@ -2,7 +2,7 @@ use crate::api::VmApiImpl;
 pub use alloc::alloc::Layout;
 use multiversx_sc::{
     api::{ErrorApi, ErrorApiImpl},
-    types::{ManagedBuffer, ManagedRef, ManagedType},
+    types::{ManagedBuffer, ManagedType},
 };
 
 /// Also used in wasm crate macros.
@@ -20,31 +20,9 @@ pub fn panic_fmt_with_message(panic_info: &PanicInfo) -> ! {
     let mut panic_msg = ManagedPanicMessage::default();
     panic_msg.append_str("panic occurred: ");
 
-    // downcasting the payload (default panic behavior in std) doesn't work in this scenario
-    // the payload is always a dummy value
-    // panic runtime is irrelevant for no_std applications
-    // let payload = if let Some(payload) = panic_info.payload().downcast_ref::<&'static str>() {
-    //     *payload
-    // } else {
-    //     "unknown panic occurred"
-    // };
-    // panic_msg.append_str(payload);
-
-    // write full panic
     core::fmt::write(&mut panic_msg, format_args!("{:?}", panic_info))
-        .expect("Failed to write panic payload");
-
-    // take str
-    // let str = format_args!("{:?}", panic_info).as_str();
+        .unwrap_or_else(|_| panic_msg.append_str("unable to write panic"));
 
-    // extract message
-    // let message = extract_panic_message(full_panic_str);
-
-    // overwrite buf
-    // match message {
-    //     Some(val) => panic_msg.overwrite(val.as_bytes()),
-    //     None => panic_msg.overwrite(b"unknown panic"),
-    // }
     VmApiImpl::error_api_impl().signal_error_from_buffer(panic_msg.buffer.get_handle())
 }
 
@@ -57,19 +35,15 @@ impl ManagedPanicMessage {
     fn append_str(&mut self, s: &str) {
         self.buffer.append_bytes(s.as_bytes());
     }
-
-    fn _overwrite(&mut self, s: &str) {
-        self.buffer.overwrite(s.as_bytes());
-    }
-
-    fn _buffer(&self) -> ManagedRef<VmApiImpl, ManagedBuffer<VmApiImpl>> {
-        self.buffer.as_ref()
-    }
 }
 
 impl core::fmt::Write for ManagedPanicMessage {
     fn write_str(&mut self, s: &str) -> core::fmt::Result {
-        self.append_str(s);
+        let file_name = match s.rfind('/') {
+            Some(index) => &s[index + 1..],
+            None => s,
+        };
+        self.append_str(file_name);
         Ok(())
     }
 }

From 14567b81a31107efef73f3fc78ed7c2dda54b50e Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Tue, 12 Mar 2024 01:14:04 +0100
Subject: [PATCH 0437/1254] remove explicit path from panic info location

sign
---
 framework/wasm-adapter/src/panic.rs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/framework/wasm-adapter/src/panic.rs b/framework/wasm-adapter/src/panic.rs
index 603c4846e1..59a9545835 100644
--- a/framework/wasm-adapter/src/panic.rs
+++ b/framework/wasm-adapter/src/panic.rs
@@ -35,6 +35,10 @@ impl ManagedPanicMessage {
     fn append_str(&mut self, s: &str) {
         self.buffer.append_bytes(s.as_bytes());
     }
+
+    fn _overwrite(&mut self, s: &str) {
+        self.buffer.overwrite(s.as_bytes());
+    }
 }
 
 impl core::fmt::Write for ManagedPanicMessage {

From 51b9facb073a03262c3d8448a3275fb0ba0e4ed3 Mon Sep 17 00:00:00 2001
From: Laurentiu Ciobanu <laurentiu.ciobanu@multiversx.com>
Date: Tue, 12 Mar 2024 11:12:06 +0200
Subject: [PATCH 0438/1254] fix clippy warnings

---
 tools/coverage-renderer/src/cargo.rs | 4 ++--
 tools/coverage-renderer/src/main.rs  | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/tools/coverage-renderer/src/cargo.rs b/tools/coverage-renderer/src/cargo.rs
index e4ab22d94e..53c67e394c 100644
--- a/tools/coverage-renderer/src/cargo.rs
+++ b/tools/coverage-renderer/src/cargo.rs
@@ -4,7 +4,7 @@ use anyhow::{bail, Result};
 
 pub fn get_workspace_root() -> Result<String> {
     let output = Command::new("cargo")
-        .args(&["metadata", "--no-deps", "--format-version=1"])
+        .args(["metadata", "--no-deps", "--format-version=1"])
         .output()?;
 
     let metadata: serde_json::Value = serde_json::from_slice(&output.stdout)?;
@@ -14,4 +14,4 @@ pub fn get_workspace_root() -> Result<String> {
     };
 
     Ok(workspace_root.to_owned())
-}
\ No newline at end of file
+}
diff --git a/tools/coverage-renderer/src/main.rs b/tools/coverage-renderer/src/main.rs
index 4e0a3f60ea..3f43d208c2 100644
--- a/tools/coverage-renderer/src/main.rs
+++ b/tools/coverage-renderer/src/main.rs
@@ -9,7 +9,7 @@ use llvm_cov::parse_llvm_cov_output;
 use renderer::render_coverage;
 
 fn main() -> Result<()> {
-    let args = env::args();
+    let mut args = env::args();
 
     if args.len() < 2 {
         bail!("Usage: coverage-renderer <input_path>");
@@ -17,8 +17,8 @@ fn main() -> Result<()> {
 
     let root = cargo::get_workspace_root()?;
 
-    let input_path = args.skip(1).next().unwrap();
-    let input = std::fs::read_to_string(&input_path)?;
+    let input_path = args.nth(1).unwrap();
+    let input = std::fs::read_to_string(input_path)?;
 
     let coverage = parse_llvm_cov_output(&input)?;
     

From e18bf808eebbff550d8c2faeb8c285d2e5c5c9e3 Mon Sep 17 00:00:00 2001
From: Laurentiu Ciobanu <laurentiu.ciobanu@multiversx.com>
Date: Tue, 12 Mar 2024 13:43:28 +0200
Subject: [PATCH 0439/1254] fix fmt

---
 tools/coverage-renderer/src/llvm_cov.rs |  7 +++---
 tools/coverage-renderer/src/main.rs     |  6 ++---
 tools/coverage-renderer/src/renderer.rs | 31 +++++++++++++++++++++----
 3 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/tools/coverage-renderer/src/llvm_cov.rs b/tools/coverage-renderer/src/llvm_cov.rs
index 1f5cba4da4..ed4f40104f 100644
--- a/tools/coverage-renderer/src/llvm_cov.rs
+++ b/tools/coverage-renderer/src/llvm_cov.rs
@@ -1,11 +1,11 @@
-use serde::Deserialize;
 use anyhow::{bail, Result};
+use serde::Deserialize;
 use serde_json::Value;
 
 #[derive(Deserialize)]
 pub struct Coverage {
     pub files: Vec<FileSummary>,
-    pub totals: Summary, 
+    pub totals: Summary,
 }
 
 #[derive(Deserialize)]
@@ -29,7 +29,6 @@ pub struct FileSummary {
     pub summary: Summary,
 }
 
-
 pub fn parse_llvm_cov_output(output: &str) -> Result<Coverage> {
     let llvm_cov_output: Value = serde_json::from_str(output)?;
     let Some(coverage) = llvm_cov_output.get("data").and_then(|data| data.get(0)) else {
@@ -38,4 +37,4 @@ pub fn parse_llvm_cov_output(output: &str) -> Result<Coverage> {
 
     let coverage = serde_json::from_value(coverage.to_owned())?;
     Ok(coverage)
-}
\ No newline at end of file
+}
diff --git a/tools/coverage-renderer/src/main.rs b/tools/coverage-renderer/src/main.rs
index 3f43d208c2..4d4234555d 100644
--- a/tools/coverage-renderer/src/main.rs
+++ b/tools/coverage-renderer/src/main.rs
@@ -1,9 +1,9 @@
+mod cargo;
 mod llvm_cov;
 mod renderer;
-mod cargo;
 
-use std::env;
 use anyhow::{bail, Result};
+use std::env;
 
 use llvm_cov::parse_llvm_cov_output;
 use renderer::render_coverage;
@@ -21,7 +21,7 @@ fn main() -> Result<()> {
     let input = std::fs::read_to_string(input_path)?;
 
     let coverage = parse_llvm_cov_output(&input)?;
-    
+
     render_coverage(&coverage, &root);
 
     Ok(())
diff --git a/tools/coverage-renderer/src/renderer.rs b/tools/coverage-renderer/src/renderer.rs
index fefa1f6522..ae230d9c6c 100644
--- a/tools/coverage-renderer/src/renderer.rs
+++ b/tools/coverage-renderer/src/renderer.rs
@@ -16,10 +16,24 @@ fn render_totals(summary: &Summary) {
 
     println!("| | Count | Covered | % |");
     println!("|---|---|---|---|");
-    println!("| Lines | {} | {} | {:.2} |", summary.lines.count, summary.lines.covered, summary.lines.percent);
-    println!("| Regions | {} | {} | {:.2} |", summary.regions.count, summary.regions.covered, summary.regions.percent);
-    println!("| Functions | {} | {} | {:.2} |", summary.functions.count, summary.functions.covered, summary.functions.percent);
-    println!("| Instantiations | {} | {} | {:.2} |", summary.instantiations.count, summary.instantiations.covered, summary.instantiations.percent);
+    println!(
+        "| Lines | {} | {} | {:.2} |",
+        summary.lines.count, summary.lines.covered, summary.lines.percent
+    );
+    println!(
+        "| Regions | {} | {} | {:.2} |",
+        summary.regions.count, summary.regions.covered, summary.regions.percent
+    );
+    println!(
+        "| Functions | {} | {} | {:.2} |",
+        summary.functions.count, summary.functions.covered, summary.functions.percent
+    );
+    println!(
+        "| Instantiations | {} | {} | {:.2} |",
+        summary.instantiations.count,
+        summary.instantiations.covered,
+        summary.instantiations.percent
+    );
 
     println!();
 }
@@ -40,5 +54,12 @@ fn render_file(file: &FileSummary, root: &str) {
     let summary = &file.summary;
     let filename = file.filename.strip_prefix(root).unwrap();
 
-    println!("| {} | {:.2}% | {:.2}% | {:.2}% | {:.2}% |", filename, summary.lines.percent, summary.regions.percent, summary.functions.percent, summary.instantiations.percent);
+    println!(
+        "| {} | {:.2}% | {:.2}% | {:.2}% | {:.2}% |",
+        filename,
+        summary.lines.percent,
+        summary.regions.percent,
+        summary.functions.percent,
+        summary.instantiations.percent
+    );
 }

From 4ac41ee5ac79d6493e9b9c5b1feb4c2d0caf52c3 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Tue, 12 Mar 2024 13:14:36 +0100
Subject: [PATCH 0440/1254] mandos tests change

---
 .../scenarios/error-message-after-log.txt                       | 1 +
 .../panic-message-features/scenarios/error-message.txt          | 1 +
 .../panic-message-features/scenarios/panic-after-log.scen.json  | 2 +-
 .../panic-message-features/scenarios/panic-message.scen.json    | 2 +-
 4 files changed, 4 insertions(+), 2 deletions(-)
 create mode 100644 contracts/feature-tests/panic-message-features/scenarios/error-message-after-log.txt
 create mode 100644 contracts/feature-tests/panic-message-features/scenarios/error-message.txt

diff --git a/contracts/feature-tests/panic-message-features/scenarios/error-message-after-log.txt b/contracts/feature-tests/panic-message-features/scenarios/error-message-after-log.txt
new file mode 100644
index 0000000000..09fa24df8b
--- /dev/null
+++ b/contracts/feature-tests/panic-message-features/scenarios/error-message-after-log.txt
@@ -0,0 +1 @@
+panic occured: PanicInfo { payload: Any { .. }, message: Some(panic after log), location: Location { file: "panic_features.rs", line: 22, col: 9 }, can_unwind: true, force_no_backtrace: false }
\ No newline at end of file
diff --git a/contracts/feature-tests/panic-message-features/scenarios/error-message.txt b/contracts/feature-tests/panic-message-features/scenarios/error-message.txt
new file mode 100644
index 0000000000..0c49fcc44d
--- /dev/null
+++ b/contracts/feature-tests/panic-message-features/scenarios/error-message.txt
@@ -0,0 +1 @@
+panic occured: PanicInfo { payload: Any { .. }, message: Some(example panic message 123), location: Location { file: "panic_features.rs", line: 22, col: 9 }, can_unwind: true, force_no_backtrace: false }
\ No newline at end of file
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 f28323bf54..91e0efe2f9 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
@@ -30,7 +30,7 @@
             "expect": {
                 "out": [],
                 "status": "0x04",
-                "message": "str:panic occured: PanicInfo { payload: Any { .. }, message: Some(panic after log), location: Location { file: panic_features.rs, line: 22, col: 9 }, can_unwind: true, force_no_backtrace: false }",
+                "message": "file:error-message-after-log.txt",
                 "logs": [
                     {
                         "address": "address:an_account",
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 816c4b3eef..bc8ad34548 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
@@ -32,7 +32,7 @@
             "expect": {
                 "out": [],
                 "status": "0x04",
-                "message": "str:panic occured: PanicInfo { payload: Any { .. }, message: Some(panic after log), location: Location { file: panic_features.rs, line: 22, col: 9 }, can_unwind: true, force_no_backtrace: false }",
+                "message": "file:error-message.txt",
                 "logs": "*",
                 "gas": "*",
                 "refund": "*"

From 2b4c4ac8e555e7edb7bf32828f52678e86d93afc Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Tue, 12 Mar 2024 16:06:12 +0100
Subject: [PATCH 0441/1254] remove exhaustive patterns

---
 data/codec/src/equivalent/codec_convert.rs    |  11 +-
 data/codec/src/lib.rs                         |   1 -
 data/codec/src/single/top_en.rs               |   5 +-
 data/codec/src/test_util.rs                   |  28 ++++-
 .../src/contract_base/wrappers/serializer.rs  |  30 +++--
 .../wrappers/storage_raw_wrapper.rs           |   7 +-
 .../base/src/formatter/formatter_traits.rs    |   8 +-
 framework/base/src/io/arg_nested_tuple.rs     |  13 +-
 framework/base/src/io/finish.rs               |   5 +-
 framework/base/src/lib.rs                     |   1 -
 framework/base/src/log_util.rs                |  14 ++-
 framework/base/src/storage/storage_get.rs     |  15 ++-
 .../src/storage/storage_get_from_address.rs   |   7 +-
 framework/base/src/storage/storage_key.rs     |   7 +-
 framework/base/src/storage/storage_set.rs     |   7 +-
 .../src/types/interaction/callback_closure.rs |   5 +-
 .../types/interaction/contract_call_exec.rs   |   6 +-
 .../src/types/interaction/contract_deploy.rs  |  11 +-
 .../types/interaction/managed_arg_buffer.rs   |  22 +++-
 .../base/src/types/io/sc_error_static.rs      |   6 +-
 framework/base/src/types/io/sc_result.rs      |   5 +-
 .../multi_value/multi_value_encoded.rs        |   7 +-
 .../multi_value/multi_value_encoded_iter.rs   |   5 +-
 .../types/managed/wrapped/esdt_token_data.rs  |   8 +-
 framework/scenario/src/lib.rs                 |   2 +-
 .../src/scenario/model/step/sc_call_step.rs   |   5 +-
 .../model/transaction/typed_response.rs       |   5 +-
 .../scenario/tests/hex_call_data_arg_load.rs  | 117 ++++++++++++------
 28 files changed, 256 insertions(+), 107 deletions(-)

diff --git a/data/codec/src/equivalent/codec_convert.rs b/data/codec/src/equivalent/codec_convert.rs
index dadcda2036..533bd60294 100644
--- a/data/codec/src/equivalent/codec_convert.rs
+++ b/data/codec/src/equivalent/codec_convert.rs
@@ -9,9 +9,14 @@ where
     Medium: Default + TopDecodeMultiInput + TopEncodeMultiOutput,
 {
     let mut medium: Medium = Default::default();
-    let Ok(()) = from.multi_encode_or_handle_err(&mut medium, PanicErrorHandler);
-    let Ok(result) = To::multi_decode_or_handle_err(&mut medium, PanicErrorHandler);
-    result
+    match from.multi_encode_or_handle_err(&mut medium, PanicErrorHandler) {
+        Ok(()) => (),
+        Err(err) => panic!("panic occured: {:#?}", err),
+    };
+    match To::multi_decode_or_handle_err(&mut medium, PanicErrorHandler) {
+        Ok(result) => result,
+        Err(err) => panic!("panic occured: {:#?}", err),
+    }
 }
 
 #[allow(unused)]
diff --git a/data/codec/src/lib.rs b/data/codec/src/lib.rs
index df9d6e3f25..6ee069e3d0 100644
--- a/data/codec/src/lib.rs
+++ b/data/codec/src/lib.rs
@@ -1,6 +1,5 @@
 #![no_std]
 #![feature(try_trait_v2)]
-#![feature(exhaustive_patterns)]
 #![feature(auto_traits)]
 #![feature(negative_impls)]
 
diff --git a/data/codec/src/single/top_en.rs b/data/codec/src/single/top_en.rs
index 2826c7d3d2..71553341bf 100644
--- a/data/codec/src/single/top_en.rs
+++ b/data/codec/src/single/top_en.rs
@@ -48,6 +48,9 @@ pub fn top_encode_to_vec_u8<T: TopEncode>(obj: &T) -> Result<Vec<u8>, EncodeErro
 
 pub fn top_encode_to_vec_u8_or_panic<T: TopEncode>(obj: &T) -> Vec<u8> {
     let mut bytes = Vec::<u8>::new();
-    let Ok(()) = obj.top_encode_or_handle_err(&mut bytes, PanicErrorHandler);
+    match obj.top_encode_or_handle_err(&mut bytes, PanicErrorHandler) {
+        Ok(_) => {},
+        Err(err) => panic!("panic occured: {:#?}", err),
+    }
     bytes
 }
diff --git a/data/codec/src/test_util.rs b/data/codec/src/test_util.rs
index d8155a082c..588c8aba40 100644
--- a/data/codec/src/test_util.rs
+++ b/data/codec/src/test_util.rs
@@ -6,7 +6,10 @@ use core::fmt::Debug;
 /// Do not use in smart contracts!
 pub fn top_encode_to_vec_u8_or_panic<T: TopEncode>(obj: &T) -> Vec<u8> {
     let mut bytes = Vec::<u8>::new();
-    let Ok(()) = obj.top_encode_or_handle_err(&mut bytes, PanicErrorHandler);
+    match obj.top_encode_or_handle_err(&mut bytes, PanicErrorHandler) {
+        Ok(_) => {},
+        Err(err) => panic!("panic occured: {:#?}", err),
+    };
     bytes
 }
 
@@ -14,7 +17,10 @@ pub fn top_encode_to_vec_u8_or_panic<T: TopEncode>(obj: &T) -> Vec<u8> {
 /// Do not use in smart contracts!
 pub fn dep_encode_to_vec_or_panic<T: NestedEncode>(obj: &T) -> Vec<u8> {
     let mut bytes = Vec::<u8>::new();
-    let Ok(()) = obj.dep_encode_or_handle_err(&mut bytes, PanicErrorHandler);
+    match obj.dep_encode_or_handle_err(&mut bytes, PanicErrorHandler) {
+        Ok(_) => {},
+        Err(err) => panic!("panic occured: {:#?}", err),
+    };
     bytes
 }
 
@@ -41,15 +47,21 @@ pub fn check_dep_encode<T: NestedEncode>(obj: &T) -> Vec<u8> {
 /// Calls nested decode and panics if an encoding error occurs.
 /// Do not use in smart contracts!
 pub fn dep_decode_from_byte_slice_or_panic<T: NestedDecode>(input: &[u8]) -> T {
-    let Ok(result) = dep_decode_from_byte_slice(input, PanicErrorHandler);
-    result
+    match dep_decode_from_byte_slice(input, PanicErrorHandler) {
+        Ok(result) => result,
+        Err(err) => panic!("panic occured: {:#?}", err),
+    }
 }
 
 /// Calls both the fast exit and the regular top-decode,
 /// compares that the outputs are equal, then returns the result.
 /// To be used in serialization tests.
 pub fn check_top_decode<T: TopDecode + PartialEq + Debug>(bytes: &[u8]) -> T {
-    let Ok(fast_exit_obj) = T::top_decode_or_handle_err(bytes, PanicErrorHandler);
+    let fast_exit_obj = match T::top_decode_or_handle_err(bytes, PanicErrorHandler) {
+        Ok(val) => val,
+        Err(err) => panic!("panic occured: {:#?}", err),
+    };
+
     let result_obj = T::top_decode_or_handle_err(bytes, DefaultErrorHandler).unwrap();
     assert_eq!(fast_exit_obj, result_obj);
     fast_exit_obj
@@ -59,7 +71,11 @@ pub fn check_top_decode<T: TopDecode + PartialEq + Debug>(bytes: &[u8]) -> T {
 /// compares that the outputs are equal, then returns the result.
 /// To be used in serialization tests.
 pub fn check_dep_decode<T: NestedDecode + PartialEq + Debug>(bytes: &[u8]) -> T {
-    let Ok(fast_exit_obj) = dep_decode_from_byte_slice(bytes, PanicErrorHandler);
+    let fast_exit_obj = match dep_decode_from_byte_slice(bytes, PanicErrorHandler) {
+        Ok(val) => val,
+        Err(err) => panic!("panic occured: {:#?}", err),
+    };
+
     let result_obj = dep_decode_from_byte_slice(bytes, DefaultErrorHandler).unwrap();
     assert_eq!(fast_exit_obj, result_obj);
     fast_exit_obj
diff --git a/framework/base/src/contract_base/wrappers/serializer.rs b/framework/base/src/contract_base/wrappers/serializer.rs
index 5064f67b38..2c4ce1ef49 100644
--- a/framework/base/src/contract_base/wrappers/serializer.rs
+++ b/framework/base/src/contract_base/wrappers/serializer.rs
@@ -31,19 +31,25 @@ where
 
     pub fn top_encode_to_managed_buffer<T: TopEncode>(&self, value: &T) -> ManagedBuffer<M> {
         let mut result = ManagedBuffer::new();
-        let Ok(()) = value.top_encode_or_handle_err(
+        match value.top_encode_or_handle_err(
             &mut result,
             ExitCodecErrorHandler::<M>::from(err_msg::SERIALIZER_ENCODE_ERROR),
-        );
+        ) {
+            Ok(_) => {},
+            Err(err) => panic!("panic occured: {:#?}", err),
+        };
         result
     }
 
     pub fn top_encode_to_boxed_bytes<T: TopEncode>(&self, value: &T) -> BoxedBytes {
         let mut result = BoxedBytes::empty();
-        let Ok(()) = value.top_encode_or_handle_err(
+        match value.top_encode_or_handle_err(
             &mut result,
             ExitCodecErrorHandler::<M>::from(err_msg::SERIALIZER_ENCODE_ERROR),
-        );
+        ) {
+            Ok(_) => {},
+            Err(err) => panic!("panic occured: {:#?}", err),
+        };
         result
     }
 
@@ -56,19 +62,23 @@ where
         buffer: &ManagedBuffer<M>,
         error_message: &'static [u8],
     ) -> T {
-        let Ok(value) = T::top_decode_or_handle_err(
+        match T::top_decode_or_handle_err(
             buffer.clone(), // TODO: remove clone
             ExitCodecErrorHandler::<M>::from(error_message),
-        );
-        value
+        ) {
+            Ok(value) => value,
+            Err(err) => panic!("panic occured: {:#?}", err),
+        }
     }
 
     pub fn top_decode_from_byte_slice<T: TopDecode>(&self, slice: &[u8]) -> T {
-        let Ok(value) = T::top_decode_or_handle_err(
+        match T::top_decode_or_handle_err(
             slice,
             ExitCodecErrorHandler::<M>::from(err_msg::SERIALIZER_DECODE_ERROR),
-        );
-        value
+        ) {
+            Ok(value) => value,
+            Err(err) => panic!("panic occured: {:#?}", err),
+        }
     }
 }
 
diff --git a/framework/base/src/contract_base/wrappers/storage_raw_wrapper.rs b/framework/base/src/contract_base/wrappers/storage_raw_wrapper.rs
index 0b0280a111..e934d6477d 100644
--- a/framework/base/src/contract_base/wrappers/storage_raw_wrapper.rs
+++ b/framework/base/src/contract_base/wrappers/storage_raw_wrapper.rs
@@ -63,9 +63,10 @@ where
             result_buffer.get_handle(),
         );
 
-        let Ok(value) =
-            V::top_decode_or_handle_err(result_buffer, StorageGetErrorHandler::<A>::default());
-        value
+        match V::top_decode_or_handle_err(result_buffer, StorageGetErrorHandler::<A>::default()) {
+            Ok(value) => value,
+            Err(err) => panic!("panic occured: {:#?}", err),
+        }
     }
 
     /// Write a serializable value to storage under the given key
diff --git a/framework/base/src/formatter/formatter_traits.rs b/framework/base/src/formatter/formatter_traits.rs
index 7faa0b00f5..cbabc27f8c 100644
--- a/framework/base/src/formatter/formatter_traits.rs
+++ b/framework/base/src/formatter/formatter_traits.rs
@@ -90,10 +90,14 @@ pub trait SCCodec {
 impl<T: TopEncode> SCCodec for T {
     fn fmt<F: FormatByteReceiver>(&self, f: &mut F) {
         let mut encoded = ManagedBuffer::<F::Api>::new();
-        let Ok(()) = self.top_encode_or_handle_err(
+
+        match self.top_encode_or_handle_err(
             &mut encoded,
             ExitCodecErrorHandler::<F::Api>::from(err_msg::FORMATTER_ENCODE_ERROR),
-        );
+        ) {
+            Ok(_) => {},
+            Err(err) => panic!("panic occured: {:#?}", err),
+        };
         SCLowerHex::fmt(&encoded, f);
     }
 }
diff --git a/framework/base/src/io/arg_nested_tuple.rs b/framework/base/src/io/arg_nested_tuple.rs
index c3838766e3..5caecd9b4c 100644
--- a/framework/base/src/io/arg_nested_tuple.rs
+++ b/framework/base/src/io/arg_nested_tuple.rs
@@ -71,8 +71,10 @@ where
 {
     let mut arg_loader = EndpointSingleArgLoader::<AA>::new(index);
     let h = ArgErrorHandler::<AA>::from(arg_id);
-    let Ok(value) = T::multi_decode_or_handle_err(&mut arg_loader, h);
-    value
+    match T::multi_decode_or_handle_err(&mut arg_loader, h) {
+        Ok(value) => value,
+        Err(err) => panic!("panic occured: {:#?}", err),
+    }
 }
 
 #[inline(never)]
@@ -83,9 +85,10 @@ where
     T: TopDecodeMulti,
 {
     let h = ArgErrorHandler::<AA>::from(arg_id);
-    let result = T::multi_decode_or_handle_err(loader, h);
-    let Ok(value) = result;
-    value
+    match T::multi_decode_or_handle_err(loader, h) {
+        Ok(value) => value,
+        Err(err) => panic!("panic occured: {:#?}", err),
+    }
 }
 
 /// Models an argument tree of the form `(arg1, (arg2, ... (argn, ())))`, used for retrieving endpoint arguments.
diff --git a/framework/base/src/io/finish.rs b/framework/base/src/io/finish.rs
index f44cc02c5e..6842d63bb5 100644
--- a/framework/base/src/io/finish.rs
+++ b/framework/base/src/io/finish.rs
@@ -20,7 +20,10 @@ where
 {
     let h = ExitCodecErrorHandler::<FA>::from(err_msg::FINISH_ENCODE_ERROR);
     let mut output = ApiOutputAdapter::<FA>::default();
-    let Ok(()) = item.multi_encode_or_handle_err(&mut output, h);
+    match item.multi_encode_or_handle_err(&mut output, h) {
+        Ok(_) => {},
+        Err(err) => panic!("panic occured: {:#?}", err),
+    }
 }
 
 #[derive(Clone)]
diff --git a/framework/base/src/lib.rs b/framework/base/src/lib.rs
index 9c3ecb592c..5fc3b0e2ed 100644
--- a/framework/base/src/lib.rs
+++ b/framework/base/src/lib.rs
@@ -1,5 +1,4 @@
 #![no_std]
-#![feature(exhaustive_patterns)]
 #![feature(try_trait_v2)]
 #![feature(control_flow_enum)]
 #![feature(negative_impls)]
diff --git a/framework/base/src/log_util.rs b/framework/base/src/log_util.rs
index 4fa4b14963..9a01f2af03 100644
--- a/framework/base/src/log_util.rs
+++ b/framework/base/src/log_util.rs
@@ -21,10 +21,13 @@ where
     A: ErrorApi + ManagedTypeApi,
     T: TopEncodeMulti,
 {
-    let Ok(()) = topic.multi_encode_or_handle_err(
+    match topic.multi_encode_or_handle_err(
         accumulator,
         ExitCodecErrorHandler::<A>::from(err_msg::LOG_TOPIC_ENCODE_ERROR),
-    );
+    ) {
+        Ok(_) => {},
+        Err(err) => panic!("panic occured: {:#?}", err),
+    }
 }
 
 pub fn serialize_log_data<T, A>(data: T) -> ManagedBuffer<A>
@@ -33,10 +36,13 @@ where
     A: ErrorApi + ManagedTypeApi,
 {
     let mut data_buffer = ManagedBuffer::new();
-    let Ok(()) = data.top_encode_or_handle_err(
+    match data.top_encode_or_handle_err(
         &mut data_buffer,
         ExitCodecErrorHandler::<A>::from(err_msg::LOG_DATA_ENCODE_ERROR),
-    );
+    ) {
+        Ok(_) => {},
+        Err(err) => panic!("panic occured: {:#?}", err),
+    };
     data_buffer
 }
 
diff --git a/framework/base/src/storage/storage_get.rs b/framework/base/src/storage/storage_get.rs
index 790994b896..2d68925846 100644
--- a/framework/base/src/storage/storage_get.rs
+++ b/framework/base/src/storage/storage_get.rs
@@ -4,9 +4,13 @@ use crate::{
     api::{
         const_handles, use_raw_handle, ErrorApi, ErrorApiImpl, ManagedBufferApiImpl,
         ManagedTypeApi, StaticVarApiImpl, StorageReadApi, StorageReadApiImpl,
-    }, codec::*, err_msg, imports::Never, types::{
+    },
+    codec::*,
+    err_msg,
+    imports::Never,
+    types::{
         BigInt, BigUint, ManagedBuffer, ManagedBufferNestedDecodeInput, ManagedRef, ManagedType,
-    }
+    },
 };
 use alloc::boxed::Box;
 
@@ -110,10 +114,13 @@ where
     T: TopDecode,
     A: StorageReadApi + ManagedTypeApi + ErrorApi,
 {
-    let Ok(value) = T::top_decode_or_handle_err(
+    let value = match T::top_decode_or_handle_err(
         StorageGetInput::new(key),
         StorageGetErrorHandler::<A>::default(),
-    );
+    ) {
+        Ok(val) => val,
+        Err(err) => panic!("panic occured: {:#?}", err),
+    };
     value
 }
 
diff --git a/framework/base/src/storage/storage_get_from_address.rs b/framework/base/src/storage/storage_get_from_address.rs
index 8cfeb531f1..44be1896f0 100644
--- a/framework/base/src/storage/storage_get_from_address.rs
+++ b/framework/base/src/storage/storage_get_from_address.rs
@@ -126,10 +126,13 @@ where
     T: TopDecode,
     A: StorageReadApi + ManagedTypeApi + ErrorApi,
 {
-    let Ok(value) = T::top_decode_or_handle_err(
+    let value = match T::top_decode_or_handle_err(
         StorageGetFromAddressInput::new(addr, key),
         StorageGetErrorHandler::<A>::default(),
-    );
+    ) {
+        Ok(val) => val,
+        Err(err) => panic!("panic occured: {:#?}", err),
+    };
     value
 }
 
diff --git a/framework/base/src/storage/storage_key.rs b/framework/base/src/storage/storage_key.rs
index 47520108a6..addd91859d 100644
--- a/framework/base/src/storage/storage_key.rs
+++ b/framework/base/src/storage/storage_key.rs
@@ -60,10 +60,13 @@ where
     where
         T: NestedEncode,
     {
-        let Ok(()) = item.dep_encode_or_handle_err(
+        match item.dep_encode_or_handle_err(
             &mut self.buffer,
             ExitCodecErrorHandler::<A>::from(err_msg::STORAGE_KEY_ENCODE_ERROR),
-        );
+        ) {
+            Ok(_) => {},
+            Err(err) => panic!("panic occured: {:#?}", err),
+        }
     }
 
     #[inline]
diff --git a/framework/base/src/storage/storage_set.rs b/framework/base/src/storage/storage_set.rs
index e988b47351..30381f3e89 100644
--- a/framework/base/src/storage/storage_set.rs
+++ b/framework/base/src/storage/storage_set.rs
@@ -85,10 +85,13 @@ where
     T: TopEncode,
     A: StorageWriteApi + ManagedTypeApi + ErrorApi,
 {
-    let Ok(()) = value.top_encode_or_handle_err(
+    match value.top_encode_or_handle_err(
         StorageSetOutput::new(key),
         ExitCodecErrorHandler::<A>::from(err_msg::STORAGE_ENCODE_ERROR),
-    );
+    ) {
+        Ok(_) => {},
+        Err(err) => panic!("panic occured: {:#?}", err),
+    }
 }
 
 /// Useful for storage mappers.
diff --git a/framework/base/src/types/interaction/callback_closure.rs b/framework/base/src/types/interaction/callback_closure.rs
index 98b6fece64..e1f748228b 100644
--- a/framework/base/src/types/interaction/callback_closure.rs
+++ b/framework/base/src/types/interaction/callback_closure.rs
@@ -52,7 +52,10 @@ impl<M: ManagedTypeApi + ErrorApi> CallbackClosure<M> {
 
     pub fn push_endpoint_arg<T: TopEncodeMulti>(&mut self, endpoint_arg: &T) {
         let h = ExitCodecErrorHandler::<M>::from(err_msg::CONTRACT_CALL_ENCODE_ERROR);
-        let Ok(()) = endpoint_arg.multi_encode_or_handle_err(&mut self.closure_args, h);
+        match endpoint_arg.multi_encode_or_handle_err(&mut self.closure_args, h) {
+            Ok(_) => {},
+            Err(err) => panic!("panic occured: {:#?}", err),
+        }
     }
 
     pub fn save_to_storage<A: BlockchainApi + StorageWriteApi>(&self) {
diff --git a/framework/base/src/types/interaction/contract_call_exec.rs b/framework/base/src/types/interaction/contract_call_exec.rs
index 260897e1a6..b6790206b7 100644
--- a/framework/base/src/types/interaction/contract_call_exec.rs
+++ b/framework/base/src/types/interaction/contract_call_exec.rs
@@ -226,6 +226,8 @@ where
     let mut loader = ManagedResultArgLoader::new(raw_result);
     let arg_id = ArgId::from(&b"sync result"[..]);
     let h: ArgErrorHandler<SA> = ArgErrorHandler::<SA>::from(arg_id);
-    let Ok(result) = RequestedResult::multi_decode_or_handle_err(&mut loader, h);
-    result
+    match RequestedResult::multi_decode_or_handle_err(&mut loader, h) {
+        Ok(result) => result,
+        Err(err) => panic!("panic occured: {:#?}", err),
+    }
 }
diff --git a/framework/base/src/types/interaction/contract_deploy.rs b/framework/base/src/types/interaction/contract_deploy.rs
index 1c61b7c977..7ae893d2a0 100644
--- a/framework/base/src/types/interaction/contract_deploy.rs
+++ b/framework/base/src/types/interaction/contract_deploy.rs
@@ -82,7 +82,10 @@ where
 
     pub fn push_endpoint_arg<T: TopEncodeMulti>(&mut self, endpoint_arg: &T) {
         let h = ExitCodecErrorHandler::<SA>::from(err_msg::CONTRACT_CALL_ENCODE_ERROR);
-        let Ok(()) = endpoint_arg.multi_encode_or_handle_err(&mut self.arg_buffer, h);
+        match endpoint_arg.multi_encode_or_handle_err(&mut self.arg_buffer, h) {
+            Ok(_) => {},
+            Err(err) => panic!("panic occured: {:#?}", err),
+        }
     }
 
     fn resolve_gas_limit(&self) -> u64 {
@@ -108,8 +111,10 @@ where
         let mut loader = ManagedResultArgLoader::new(raw_result);
         let arg_id = ArgId::from(&b"init result"[..]);
         let h = ArgErrorHandler::<SA>::from(arg_id);
-        let Ok(result) = RequestedResult::multi_decode_or_handle_err(&mut loader, h);
-        result
+        match RequestedResult::multi_decode_or_handle_err(&mut loader, h) {
+            Ok(result) => result,
+            Err(err) => panic!("panic occured: {:#?}", err),
+        }
     }
 
     /// Executes immediately, synchronously, and returns Some(Address) of the deployed contract.  
diff --git a/framework/base/src/types/interaction/managed_arg_buffer.rs b/framework/base/src/types/interaction/managed_arg_buffer.rs
index b0cee5db30..30c2ea54f3 100644
--- a/framework/base/src/types/interaction/managed_arg_buffer.rs
+++ b/framework/base/src/types/interaction/managed_arg_buffer.rs
@@ -180,16 +180,22 @@ where
 {
     pub fn push_arg<T: TopEncode>(&mut self, arg: T) {
         let mut encoded_buffer = ManagedBuffer::new();
-        let Ok(()) = arg.top_encode_or_handle_err(
+        match arg.top_encode_or_handle_err(
             &mut encoded_buffer,
             ExitCodecErrorHandler::<M>::from(err_msg::CONTRACT_CALL_ENCODE_ERROR),
-        );
+        ) {
+            Ok(_) => {},
+            Err(err) => panic!("panic occured: {:#?}", err),
+        };
         self.push_arg_raw(encoded_buffer);
     }
 
     pub fn push_multi_arg<T: TopEncodeMulti>(&mut self, arg: &T) {
         let h = ExitCodecErrorHandler::<M>::from(err_msg::CONTRACT_CALL_ENCODE_ERROR);
-        let Ok(()) = arg.multi_encode_or_handle_err(self, h);
+        match arg.multi_encode_or_handle_err(self, h) {
+            Ok(_) => {},
+            Err(err) => panic!("panic occured: {:#?}", err),
+        }
     }
 }
 
@@ -279,7 +285,10 @@ where
     pub fn serialize_overwrite(&self, dest: &mut ManagedBuffer<M>) {
         dest.overwrite(&[]);
         let h = ExitCodecErrorHandler::<M>::from(err_msg::SERIALIZER_ENCODE_ERROR);
-        let Ok(()) = self.top_encode_or_handle_err(dest, h);
+        match self.top_encode_or_handle_err(dest, h) {
+            Ok(_) => {},
+            Err(err) => panic!("panic occured: {:#?}", err),
+        }
     }
 
     /// Deserializes self from a managed buffer in-place, without creating a new handle.
@@ -289,7 +298,10 @@ where
         self.clear();
         let mut nested_de_input = ManagedBufferNestedDecodeInput::new(source);
         while nested_de_input.remaining_len() > 0 {
-            let Ok(item) = ManagedBuffer::dep_decode_or_handle_err(&mut nested_de_input, h);
+            let item = match ManagedBuffer::dep_decode_or_handle_err(&mut nested_de_input, h) {
+                Ok(val) => val,
+                Err(err) => panic!("panic occured: {:#?}", err),
+            };
             self.push_arg_raw(item);
         }
     }
diff --git a/framework/base/src/types/io/sc_error_static.rs b/framework/base/src/types/io/sc_error_static.rs
index 9d06a41d64..6569715131 100644
--- a/framework/base/src/types/io/sc_error_static.rs
+++ b/framework/base/src/types/io/sc_error_static.rs
@@ -1,7 +1,9 @@
 use crate::codec::{self, DecodeError, EncodeError, TopEncodeMulti, TryStaticCast};
 
-use crate::api::{EndpointFinishApi, ErrorApiImpl};
-use crate::imports::Never;
+use crate::{
+    api::{EndpointFinishApi, ErrorApiImpl},
+    imports::Never,
+};
 
 use super::SCError;
 
diff --git a/framework/base/src/types/io/sc_result.rs b/framework/base/src/types/io/sc_result.rs
index 6278987b45..c4de593afc 100644
--- a/framework/base/src/types/io/sc_result.rs
+++ b/framework/base/src/types/io/sc_result.rs
@@ -105,7 +105,10 @@ where
     FromErr: Into<StaticSCError>,
 {
     fn from_residual(residual: Result<convert::Infallible, FromErr>) -> Self {
-        let Err(e) = residual;
+        let e = match residual {
+            Ok(_) => panic!("residual is not error"),
+            Err(err) => err,
+        };
         SCResult::Err(e.into())
     }
 }
diff --git a/framework/base/src/types/managed/multi_value/multi_value_encoded.rs b/framework/base/src/types/managed/multi_value/multi_value_encoded.rs
index ebf8e0cb69..e32165b554 100644
--- a/framework/base/src/types/managed/multi_value/multi_value_encoded.rs
+++ b/framework/base/src/types/managed/multi_value/multi_value_encoded.rs
@@ -68,10 +68,13 @@ where
     T: TopEncodeMulti,
 {
     pub fn push(&mut self, item: T) {
-        let Ok(()) = item.multi_encode_or_handle_err(
+        match item.multi_encode_or_handle_err(
             &mut self.raw_buffers,
             ExitCodecErrorHandler::<M>::from(err_msg::SERIALIZER_ENCODE_ERROR),
-        );
+        ) {
+            Ok(_) => {},
+            Err(err) => panic!("panic occured: {:#?}", err),
+        }
     }
 }
 
diff --git a/framework/base/src/types/managed/multi_value/multi_value_encoded_iter.rs b/framework/base/src/types/managed/multi_value/multi_value_encoded_iter.rs
index 99ef7fa132..e0e9b1a5e5 100644
--- a/framework/base/src/types/managed/multi_value/multi_value_encoded_iter.rs
+++ b/framework/base/src/types/managed/multi_value/multi_value_encoded_iter.rs
@@ -54,7 +54,10 @@ where
         if self.data_loader.has_next() {
             let arg_id = ArgId::from(&b"var args"[..]);
             let h = ArgErrorHandler::<M>::from(arg_id);
-            let Ok(result) = T::multi_decode_or_handle_err(&mut self.data_loader, h);
+            let result = match T::multi_decode_or_handle_err(&mut self.data_loader, h) {
+                Ok(val) => val,
+                Err(err) => panic!("panic occured: {:#?}", err),
+            };
             Some(result)
         } else {
             None
diff --git a/framework/base/src/types/managed/wrapped/esdt_token_data.rs b/framework/base/src/types/managed/wrapped/esdt_token_data.rs
index d4b13afdbe..ac44045e25 100644
--- a/framework/base/src/types/managed/wrapped/esdt_token_data.rs
+++ b/framework/base/src/types/managed/wrapped/esdt_token_data.rs
@@ -53,10 +53,12 @@ impl<M: ManagedTypeApi> EsdtTokenData<M> {
     }
 
     pub fn decode_attributes<T: TopDecode>(&self) -> T {
-        let Ok(value) = T::top_decode_or_handle_err(
+        match T::top_decode_or_handle_err(
             self.attributes.clone(), // TODO: remove clone
             ExitCodecErrorHandler::<M>::from(DECODE_ATTRIBUTE_ERROR_PREFIX),
-        );
-        value
+        ) {
+            Ok(value) => value,
+            Err(err) => panic!("panic occured: {:#?}", err),
+        }
     }
 }
diff --git a/framework/scenario/src/lib.rs b/framework/scenario/src/lib.rs
index 0110147ed3..61286a2e50 100644
--- a/framework/scenario/src/lib.rs
+++ b/framework/scenario/src/lib.rs
@@ -1,5 +1,5 @@
 #![allow(clippy::type_complexity)]
-#![feature(exhaustive_patterns)]
+// #![feature(exhaustive_patterns)]
 
 pub mod api;
 pub mod bech32;
diff --git a/framework/scenario/src/scenario/model/step/sc_call_step.rs b/framework/scenario/src/scenario/model/step/sc_call_step.rs
index f18bf4c2c5..cf9d2b4026 100644
--- a/framework/scenario/src/scenario/model/step/sc_call_step.rs
+++ b/framework/scenario/src/scenario/model/step/sc_call_step.rs
@@ -255,7 +255,10 @@ pub fn convert_call_args(arg_buffer: &ManagedArgBuffer<StaticApi>) -> Vec<String
 
 pub(super) fn format_expect<T: TopEncodeMulti>(t: T) -> TxExpect {
     let mut encoded = Vec::<Vec<u8>>::new();
-    let Ok(()) = t.multi_encode_or_handle_err(&mut encoded, PanicErrorHandler);
+    match t.multi_encode_or_handle_err(&mut encoded, PanicErrorHandler) {
+        Ok(_) => {},
+        Err(err) => panic!("panic occured: {:#?}", err),
+    };
     let mut expect = TxExpect::ok().no_result();
     for encoded_res in encoded {
         let encoded_hex_string = format!("0x{}", hex::encode(encoded_res.as_slice()));
diff --git a/framework/scenario/src/scenario/model/transaction/typed_response.rs b/framework/scenario/src/scenario/model/transaction/typed_response.rs
index 90bb2e245a..2ab7823c92 100644
--- a/framework/scenario/src/scenario/model/transaction/typed_response.rs
+++ b/framework/scenario/src/scenario/model/transaction/typed_response.rs
@@ -19,7 +19,10 @@ where
     pub fn from_raw(raw_response: &TxResponse) -> Self {
         let result: Result<T, TxResponseStatus> = if raw_response.tx_error.is_success() {
             let mut result_raw = raw_response.out.clone();
-            let Ok(decoded) = T::multi_decode_or_handle_err(&mut result_raw, PanicErrorHandler);
+            let decoded = match T::multi_decode_or_handle_err(&mut result_raw, PanicErrorHandler) {
+                Ok(val) => val,
+                Err(err) => panic!("panic occured: {:#?}", err),
+            };
             Ok(decoded)
         } else {
             Err(raw_response.tx_error.clone())
diff --git a/framework/scenario/tests/hex_call_data_arg_load.rs b/framework/scenario/tests/hex_call_data_arg_load.rs
index ef5c60ffb1..9b64f4565c 100644
--- a/framework/scenario/tests/hex_call_data_arg_load.rs
+++ b/framework/scenario/tests/hex_call_data_arg_load.rs
@@ -1,5 +1,3 @@
-#![feature(exhaustive_patterns)]
-
 use multiversx_sc::{
     codec::{
         multi_types::{MultiValue2, MultiValueVec, OptionalValue},
@@ -14,11 +12,16 @@ use multiversx_sc_scenario::api::StaticApi;
 fn test_simple_args() {
     let input: &[u8] = b"func@1111@2222";
     let mut de = HexCallDataDeserializer::new(input);
-    let Ok(arg1) = i32::multi_decode_or_handle_err(&mut de, PanicErrorHandler);
-    assert_eq!(arg1, 0x1111i32);
 
-    let Ok(arg2) = i32::multi_decode_or_handle_err(&mut de, PanicErrorHandler);
-    assert_eq!(arg2, 0x2222i32);
+    match i32::multi_decode_or_handle_err(&mut de, PanicErrorHandler) {
+        Ok(arg1) => assert_eq!(arg1, 0x1111i32),
+        Err(err) => panic!("panic occured: {:#?}", err),
+    }
+
+    match i32::multi_decode_or_handle_err(&mut de, PanicErrorHandler) {
+        Ok(arg2) => assert_eq!(arg2, 0x2222i32),
+        Err(err) => panic!("panic occured: {:#?}", err),
+    }
 
     de.assert_no_more_args(PanicErrorHandler).unwrap();
 }
@@ -27,8 +30,11 @@ fn test_simple_args() {
 fn test_simple_managed_arg() {
     let input: &[u8] = b"some_other_func@05";
     let mut de = HexCallDataDeserializer::new(input);
-    let Ok(arg1) = BigUint::<StaticApi>::multi_decode_or_handle_err(&mut de, PanicErrorHandler);
-    assert_eq!(arg1, BigUint::from(5u32));
+
+    match BigUint::<StaticApi>::multi_decode_or_handle_err(&mut de, PanicErrorHandler) {
+        Ok(arg1) => assert_eq!(arg1, BigUint::from(5u32)),
+        Err(err) => panic!("panic occured: {:#?}", err),
+    }
 
     de.assert_no_more_args(PanicErrorHandler).unwrap();
 }
@@ -37,8 +43,11 @@ fn test_simple_managed_arg() {
 fn test_simple_vec_arg() {
     let input: &[u8] = b"some_other_func@000000020000000300000006";
     let mut de = HexCallDataDeserializer::new(input);
-    let Ok(arg1) = Vec::<usize>::multi_decode_or_handle_err(&mut de, PanicErrorHandler);
-    assert_eq!(arg1, [2usize, 3usize, 6usize].to_vec());
+
+    match Vec::<usize>::multi_decode_or_handle_err(&mut de, PanicErrorHandler) {
+        Ok(arg1) => assert_eq!(arg1, [2usize, 3usize, 6usize].to_vec()),
+        Err(err) => panic!("panic occured: {:#?}", err),
+    }
 
     de.assert_no_more_args(PanicErrorHandler).unwrap();
 }
@@ -47,48 +56,67 @@ fn test_simple_vec_arg() {
 fn test_var_args() {
     let input: &[u8] = b"func@1111@2222";
     let mut de = HexCallDataDeserializer::new(input);
-    let Ok(var_arg) = MultiValueVec::<i32>::multi_decode_or_handle_err(&mut de, PanicErrorHandler);
-    let arg_vec = var_arg.into_vec();
-    assert_eq!(arg_vec.len(), 2);
-    assert_eq!(arg_vec[0], 0x1111i32);
-    assert_eq!(arg_vec[1], 0x2222i32);
+
+    match MultiValueVec::<i32>::multi_decode_or_handle_err(&mut de, PanicErrorHandler) {
+        Ok(var_arg) => {
+            let arg_vec = var_arg.into_vec();
+            assert_eq!(arg_vec.len(), 2);
+            assert_eq!(arg_vec[0], 0x1111i32);
+            assert_eq!(arg_vec[1], 0x2222i32);
+        },
+        Err(err) => panic!("panic occured: {:#?}", err),
+    }
 }
 
 #[test]
 fn test_multi_arg_2() {
     let input: &[u8] = b"func@1111@2222";
     let mut de = HexCallDataDeserializer::new(input);
-    let Ok(tuple_arg) =
-        MultiValue2::<i32, i32>::multi_decode_or_handle_err(&mut de, PanicErrorHandler);
-    let tuple = tuple_arg.into_tuple();
-    assert_eq!(tuple.0, 0x1111i32);
-    assert_eq!(tuple.1, 0x2222i32);
+
+    match MultiValue2::<i32, i32>::multi_decode_or_handle_err(&mut de, PanicErrorHandler) {
+        Ok(tuple_arg) => {
+            let tuple = tuple_arg.into_tuple();
+            assert_eq!(tuple.0, 0x1111i32);
+            assert_eq!(tuple.1, 0x2222i32);
+        },
+        Err(err) => panic!("panic occured: {:#?}", err),
+    }
 }
 
 #[test]
 fn test_var_multi_arg_2() {
     let input: &[u8] = b"func@1111@2222";
     let mut de = HexCallDataDeserializer::new(input);
-    let Ok(tuple_arg) = MultiValueVec::<MultiValue2<i32, i32>>::multi_decode_or_handle_err(
+
+    match MultiValueVec::<MultiValue2<i32, i32>>::multi_decode_or_handle_err(
         &mut de,
         PanicErrorHandler,
-    );
-    let tuple_vec = tuple_arg.into_vec();
-    assert_eq!(tuple_vec.len(), 1);
-    let mut iter = tuple_vec.into_iter();
-    let tuple = iter.next().unwrap().into_tuple();
-    assert_eq!(tuple.0, 0x1111i32);
-    assert_eq!(tuple.1, 0x2222i32);
+    ) {
+        Ok(tuple_arg) => {
+            let tuple_vec = tuple_arg.into_vec();
+            assert_eq!(tuple_vec.len(), 1);
+            let mut iter = tuple_vec.into_iter();
+            let tuple = iter.next().unwrap().into_tuple();
+            assert_eq!(tuple.0, 0x1111i32);
+            assert_eq!(tuple.1, 0x2222i32);
+        },
+        Err(err) => panic!("panic occured: {:#?}", err),
+    }
 }
 
 #[test]
 fn test_opt_multi_arg_2() {
     let input: &[u8] = b"func@1111@2222";
     let mut de = HexCallDataDeserializer::new(input);
-    let Ok(opt_tuple_arg) = OptionalValue::<MultiValue2<i32, i32>>::multi_decode_or_handle_err(
+
+    let opt_tuple_arg = match OptionalValue::<MultiValue2<i32, i32>>::multi_decode_or_handle_err(
         &mut de,
         PanicErrorHandler,
-    );
+    ) {
+        Ok(arg) => arg,
+        Err(err) => panic!("panic occured: {:#?}", err),
+    };
+
     match opt_tuple_arg {
         OptionalValue::Some(tuple_arg) => {
             let tuple = tuple_arg.into_tuple();
@@ -105,10 +133,15 @@ fn test_opt_multi_arg_2() {
 fn test_async_call_result_ok() {
     let input: &[u8] = b"func@@1111@2222";
     let mut de = HexCallDataDeserializer::new(input);
-    let Ok(acr) = AsyncCallResult::<MultiValue2<i32, i32>>::multi_decode_or_handle_err(
+
+    let acr = match AsyncCallResult::<MultiValue2<i32, i32>>::multi_decode_or_handle_err(
         &mut de,
         PanicErrorHandler,
-    );
+    ) {
+        Ok(val) => val,
+        Err(err) => panic!("panic occured: {:#?}", err),
+    };
+
     match acr {
         AsyncCallResult::Ok(tuple_arg) => {
             let tuple = tuple_arg.into_tuple();
@@ -125,11 +158,16 @@ fn test_async_call_result_ok() {
 fn test_async_call_result_ok2() {
     let input: &[u8] = b"func@00";
     let mut de = HexCallDataDeserializer::new(input);
-    let Ok(acr) =
-        AsyncCallResult::<MultiValueVec<MultiValue2<i32, i32>>>::multi_decode_or_handle_err(
+
+    let acr =
+        match AsyncCallResult::<MultiValueVec<MultiValue2<i32, i32>>>::multi_decode_or_handle_err(
             &mut de,
             PanicErrorHandler,
-        );
+        ) {
+            Ok(val) => val,
+            Err(err) => panic!("panic occured: {:#?}", err),
+        };
+
     match acr {
         AsyncCallResult::Ok(var_args) => {
             assert_eq!(var_args.len(), 0);
@@ -144,10 +182,15 @@ fn test_async_call_result_ok2() {
 fn test_async_call_result_err() {
     let input: &[u8] = b"func@0123@1111";
     let mut de = HexCallDataDeserializer::new(input);
-    let Ok(acr) = AsyncCallResult::<MultiValue2<i32, i32>>::multi_decode_or_handle_err(
+
+    let acr = match AsyncCallResult::<MultiValue2<i32, i32>>::multi_decode_or_handle_err(
         &mut de,
         PanicErrorHandler,
-    );
+    ) {
+        Ok(val) => val,
+        Err(err) => panic!("panic occured: {:#?}", err),
+    };
+
     match acr {
         AsyncCallResult::Ok(_) => {
             panic!("AsyncCallResult::Err expected");

From e429526db11f7a64adc72dd2457aa106ce9784f6 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Tue, 12 Mar 2024 16:16:50 +0100
Subject: [PATCH 0442/1254] remove forgotten comment

---
 framework/scenario/src/lib.rs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/framework/scenario/src/lib.rs b/framework/scenario/src/lib.rs
index 61286a2e50..c131ad764c 100644
--- a/framework/scenario/src/lib.rs
+++ b/framework/scenario/src/lib.rs
@@ -1,5 +1,4 @@
 #![allow(clippy::type_complexity)]
-// #![feature(exhaustive_patterns)]
 
 pub mod api;
 pub mod bech32;

From 3a4c4992db0c22b98de3ba6fb98776f6d7570846 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Tue, 12 Mar 2024 20:15:02 +0200
Subject: [PATCH 0443/1254] generated code

---
 .../adder/proxies_struct_interactor_main.rs   |  87 --------
 .../contract/generate_proxy/proxy_gen_main.rs |   9 +-
 .../generate_proxy/proxy_sc_functions_gen.rs  | 199 +++++++++++++++---
 .../generate_proxy/proxy_template_gen.rs      |  41 +++-
 4 files changed, 202 insertions(+), 134 deletions(-)
 delete mode 100644 contracts/examples/adder/proxies_struct_interactor_main.rs

diff --git a/contracts/examples/adder/proxies_struct_interactor_main.rs b/contracts/examples/adder/proxies_struct_interactor_main.rs
deleted file mode 100644
index f95b5dd523..0000000000
--- a/contracts/examples/adder/proxies_struct_interactor_main.rs
+++ /dev/null
@@ -1,87 +0,0 @@
-multiversx_sc::imports!();
-
-pub struct TxProxy;
-
-impl<Env> TxProxyTrait<Env> for TxProxy
-where
-    Env: TxEnv,
-{
-    type TxProxyMethods = TxProxyMethods<Env>;
-
-    fn env(self, env: Env) -> Self::TxProxyMethods {
-        TxProxyMethods { env }
-    }
-}
-
-impl<Env: TxEnv + multiversx_sc::api::CallTypeApi> TxProxyMethods<Env> {
-    pub fn init<
-		Arg0: multiversx_sc::codec::CodecInto<BigUint<Env>>
-	>(
-        &mut self,
-        initial_value: Arg0,
-    ) -> multiversx_sc::types::Tx<Env, (), To, (), Gas, DeployCall<Env, ()>, OriginalResultMarker<()>>
-    {
-        self.wrapped_tx
-            .raw_deploy()
-            .argument(&initial_value)
-            .original_result()
-    }
-
-    pub fn sum(
-        &mut self,
-    ) -> multiversx_sc::types::Tx<
-        Env,
-        (),
-        (),
-        (),
-        (),
-        FunctionCall<<Env as multiversx_sc::types::TxEnv>::Api>,
-        (),
-    > {
-        Tx::new_with_env(self.env.clone())
-            .raw_call()
-            .function_name("getSum")
-    }
-
-    pub fn upgrade<
-		Arg0: multiversx_sc::codec::CodecInto<BigUint<Env>>
-	>(
-        &mut self,
-        initial_value: Arg0,
-    ) -> multiversx_sc::types::Tx<
-        Env,
-        (),
-        (),
-        (),
-        (),
-        FunctionCall<<Env as multiversx_sc::types::TxEnv>::Api>,
-        (),
-    > {
-        Tx::new_with_env(self.env.clone())
-            .raw_call()
-            .function_name("upgrade")
-            .argument(&initial_value)
-    }
-
-    //Add desired amount to the storage variable.
-    pub fn add<
-		Arg0: multiversx_sc::codec::CodecInto<BigUint<Env>>
-	>(
-        &mut self,
-        value: Arg0,
-    ) -> multiversx_sc::types::Tx<
-        Env,
-        (),
-        (),
-        (),
-        (),
-        FunctionCall<<Env as multiversx_sc::types::TxEnv>::Api>,
-        (),
-    > {
-        Tx::new_with_env(self.env.clone())
-            .raw_call()
-            .function_name("add")
-            .argument(&value)
-    }
-
-}
diff --git a/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_main.rs b/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_main.rs
index 8fc5455197..10c1c33b1a 100644
--- a/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_main.rs
+++ b/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_main.rs
@@ -9,12 +9,11 @@ use super::{
     proxy_crate_gen::create_file,
     proxy_sc_functions_gen::write_content,
     proxy_template_gen::{
-        write_impl_for_tx_proxy, write_imports, write_struct_template, 
-        write_tx_proxy_method_header,
+        write_header, write_impl_for_tx_proxy, write_struct_template, write_struct_tx_proxy_methods,
     },
 };
 
-const PROXIES_SOURCE_FILE_NAME: &str = "proxies_struct_interactor_main.rs";
+const PROXIES_SOURCE_FILE_NAME: &str = "/output/proxies_struct_interactor_main.rs";
 
 impl MetaConfig {
     pub fn generate_rust_proxies_struct(&self, args: &GenerateProxyArgs) {
@@ -24,9 +23,9 @@ impl MetaConfig {
 }
 
 fn write_proxies_to_file(mut file: File, abi: ContractAbi) {
-    write_imports(&mut file);
+    write_header(&mut file);
     write_struct_template(&mut file);
     write_impl_for_tx_proxy(&mut file);
-    write_tx_proxy_method_header(&mut file);
+    write_struct_tx_proxy_methods(&mut file);
     write_content(&mut file, abi);
 }
diff --git a/framework/meta/src/cmd/contract/generate_proxy/proxy_sc_functions_gen.rs b/framework/meta/src/cmd/contract/generate_proxy/proxy_sc_functions_gen.rs
index e2421e63f8..ef700766d1 100644
--- a/framework/meta/src/cmd/contract/generate_proxy/proxy_sc_functions_gen.rs
+++ b/framework/meta/src/cmd/contract/generate_proxy/proxy_sc_functions_gen.rs
@@ -1,76 +1,163 @@
 use std::{fs::File, io::Write};
 
-use multiversx_sc::abi::{ContractAbi, EndpointAbi, InputAbi};
+use multiversx_sc::abi::{ContractAbi, EndpointAbi, InputAbi, OutputAbi};
 
 use crate::cmd::contract::generate_snippets::{
     snippet_gen_common::write_newline,
     snippet_type_map::{handle_abi_type, RustTypeString},
 };
 
+const ENV: &str = "Env:";
+const COLON: char = ':';
+
 pub(crate) fn write_content(file: &mut File, abi: ContractAbi) {
+    write_header_impl_constructor(file);
     for constructor_abi in abi.constructors {
-        write_endpoint(file, constructor_abi.clone());
-        write_function_content(file, constructor_abi);
+        write_constructor_header(file, constructor_abi.clone());
+        write_constructor_content(file, constructor_abi.inputs);
         write_end_of_function(file);
     }
+    writeln!(file, "}}").unwrap();
 
+    write_header_impl_endpoints(file);
     for endpoint_abi in abi.endpoints {
-        write_endpoint(file, endpoint_abi.clone());
-        write_function_content(file, endpoint_abi);
+        write_endpoint_header(file, endpoint_abi.clone());
+        write_endpoint_content(file, endpoint_abi.name, endpoint_abi.inputs);
         write_end_of_function(file);
     }
 
     writeln!(file, "}}").unwrap();
 }
 
-fn write_function_content(file: &mut File, end: EndpointAbi) {
+fn write_header_impl_constructor(file: &mut File) {
     writeln!(
         file,
-        "\t\tTx::new_with_env(self.env.clone())
-            .raw_call()
-            .function_name(\"{}\")",
-        end.name
+        r#"impl<Env, To, Gas> TxProxyMethods<Env, (), To, Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    Gas: TxGas<Env>,
+{{"#
     )
     .unwrap();
+}
 
-    for input in end.inputs.iter() {
-        writeln!(
-            file,
-            "\t\t\t.argument(&{})",
-            input.arg_name // .argument(&arg0)"
-        )
-        .unwrap();
-    }
+fn write_header_impl_endpoints(file: &mut File) {
+    writeln!(
+        file,
+        r#"impl<Env, From, To, Gas> TxProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{{"#
+    )
+    .unwrap();
+}
+
+fn write_constructor_header(file: &mut File, contructor_abi: EndpointAbi) {
+    write_fn_signature(file, contructor_abi);
+    write_constructor_output(file);
 }
 
-fn write_endpoint(file: &mut File, endpoint_abi: EndpointAbi) {
+fn write_endpoint_header(file: &mut File, contructor_abi: EndpointAbi) {
+    write_fn_signature(file, contructor_abi.clone());
+    write_endpoint_output(file, contructor_abi.outputs);
+}
+
+fn write_fn_signature(file: &mut File, endpoint_abi: EndpointAbi) {
     write_info_endpoint(file, endpoint_abi.docs);
     write_function_header_endpoint(file, endpoint_abi.rust_method_name);
     write_args(file, endpoint_abi.inputs.clone());
-    write_parameters_and_output(file, endpoint_abi.inputs);
+    write_parameters(file, endpoint_abi.inputs);
 }
 
-#[rustfmt::skip]
-fn write_parameters_and_output(file: &mut File, inputs: Vec<InputAbi>) {
+fn write_parameters(file: &mut File, inputs: Vec<InputAbi>) {
     writeln!(file, "(").unwrap();
-    writeln!(file, "\t\t&mut self,").unwrap();
-
+    writeln!(file, "\t\tself,").unwrap();
     for (index, input) in inputs.iter().enumerate() {
         writeln!(file, "\t\t{}: Arg{index},", &input.arg_name).unwrap();
     }
+    write!(file, "\t) ").unwrap();
+}
+
+fn write_constructor_output(file: &mut File) {
+    writeln!(
+        file,
+        "-> multiversx_sc::types::Tx<Env, (), To, (), Gas, DeployCall<Env, ()>, OriginalResultMarker<()>>\n\t{{"
+    )
+    .unwrap();
+}
 
+fn write_endpoint_output(file: &mut File, outputs: Vec<OutputAbi>) {
     write!(
         file,
-        "\t) -> multiversx_sc::types::Tx<Env,
-        (),
-        (),
-        (),
-        (),
-        FunctionCall<<Env as multiversx_sc::types::TxEnv>::Api>,
+        "-> multiversx_sc::types::Tx<
+        Env,
+        From,
+        To,
         (),
-    > {{\n"
+        Gas,
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<"
+    )
+    .unwrap();
+
+    if outputs.len() == 0 {
+        write!(file, "()").unwrap();
+    } else {
+        parse_and_write_outputs(file, outputs);
+    }
+
+    writeln!(
+        file,
+        ">,
+    > {{"
+    )
+    .unwrap();
+}
+
+fn write_constructor_content(file: &mut File, inputs: Vec<InputAbi>) {
+    writeln!(
+        file,
+        "\t\tself.wrapped_tx
+            .raw_deploy()"
+    )
+    .unwrap();
+    for input in inputs.iter() {
+        writeln!(
+            file,
+            "\t\t\t.argument(&{})",
+            input.arg_name // .argument(&arg0)"
+        )
+        .unwrap();
+    }
+    writeln!(file, "\t\t\t.original_result()").unwrap();
+}
+
+fn write_endpoint_content(file: &mut File, function_name: String, inputs: Vec<InputAbi>) {
+    writeln!(
+        file,
+        "\t\tself.wrapped_tx
+            .raw_call()
+            .function_name(\"{}\")",
+        function_name
     )
     .unwrap();
+
+    for input in inputs.iter() {
+        writeln!(
+            file,
+            "\t\t\t.argument(&{})",
+            input.arg_name // .argument(&arg0)"
+        )
+        .unwrap();
+    }
+
+    writeln!(file, "\t\t\t.original_result()").unwrap();
 }
 
 fn write_function_header_endpoint(file: &mut File, rust_method_name: String) {
@@ -104,9 +191,10 @@ fn write_args(file: &mut File, inputs: Vec<InputAbi>) {
 fn write_argument(file: &mut File, index: usize, type_name: String) {
     let mut type_string = RustTypeString::default();
     handle_abi_type(&mut type_string, type_name);
-    let type_string_str = type_string.get_type_name().to_string();
-
-    let type_print = type_string_str.replace("<StaticApi>", "<Env>");
+    let type_print = type_string
+        .get_type_name()
+        .replace("StaticApi", "Env::Api")
+        .to_string();
 
     writeln!(
         file,
@@ -120,3 +208,46 @@ fn write_end_of_function(file: &mut File) {
     writeln!(file, "\t}}").unwrap();
     write_newline(file);
 }
+
+fn parse_and_write_outputs(file: &mut File, outputs: Vec<OutputAbi>) {
+    for output in outputs {
+        let env_api = output
+            .type_names
+            .rust
+            .replace("multiversx_sc::api::uncallable::UncallableApi", "Env::Api")
+            .to_string();
+
+        let mut current_string = String::new();
+        let mut found_words = Vec::new();
+
+        for character in env_api.chars() {
+            if character == COLON {
+                // adjust_on_colon_suffix(character, current_string, found_words);
+                if current_string.ends_with(COLON) && !current_string.ends_with(ENV){
+                    if current_string.len() > 0
+                        && current_string.chars().next().unwrap().is_uppercase()
+                    {
+                        found_words.push(current_string[..current_string.len() - 1].to_string());
+                    }
+                    current_string.clear();
+                } else {
+                    current_string.push(character);
+                }
+            } else if character == ' ' && current_string.ends_with(',') {
+                if current_string.len() > 0 && current_string.chars().next().unwrap().is_uppercase()
+                {
+                    current_string.push(character);
+                    found_words.push(current_string.clone());
+                    current_string.clear();
+                } else {
+                    current_string.push(character);
+                }
+            } else {
+                current_string.push(character);
+            }
+        }
+
+        found_words.push(current_string);
+        write!(file, "{}", found_words.join("")).unwrap();
+    }
+}
\ No newline at end of file
diff --git a/framework/meta/src/cmd/contract/generate_proxy/proxy_template_gen.rs b/framework/meta/src/cmd/contract/generate_proxy/proxy_template_gen.rs
index 9742b54c59..7af38cd93a 100644
--- a/framework/meta/src/cmd/contract/generate_proxy/proxy_template_gen.rs
+++ b/framework/meta/src/cmd/contract/generate_proxy/proxy_template_gen.rs
@@ -2,8 +2,20 @@ use std::{fs::File, io::Write};
 
 use crate::cmd::contract::generate_snippets::snippet_gen_common::write_newline;
 
-pub(crate) fn write_imports(file: &mut File) {
-    writeln!(file, r#"multiversx_sc::imports!();"#).unwrap();
+const PREFIX_AUTO_GENERATED: &str = "////////////////////////////////////////////////////
+////////////////// AUTO-GENERATED //////////////////
+////////////////////////////////////////////////////
+";
+
+const IMPORTS: &str = "#![allow(clippy::all)]
+
+use multiversx_sc::api::VMApi;
+
+multiversx_sc::imports!();";
+
+pub(crate) fn write_header(file: &mut File) {
+    writeln!(file, "{PREFIX_AUTO_GENERATED}").unwrap();
+    writeln!(file, r#"{IMPORTS}"#).unwrap();
 
     write_newline(file);
 }
@@ -16,14 +28,17 @@ pub(crate) fn write_struct_template(file: &mut File) {
 pub(crate) fn write_impl_for_tx_proxy(file: &mut File) {
     writeln!(
         file,
-        r#"impl<Env> TxProxyTrait<Env> for TxProxy
+        r#"impl<Env, From, To, Gas> TxProxyTraitV2<Env, From, To, Gas> for TxProxy
 where
     Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
 {{
-    type TxProxyMethods = TxProxyMethods<Env>;
+    type TxProxyMethods = TxProxyMethods<Env, From, To, Gas>;
 
-    fn env(self, env: Env) -> Self::TxProxyMethods {{
-        TxProxyMethods {{ env }}
+    fn prepare_methods(self, tx: Tx<Env, From, To, (), Gas, (), ()>) -> Self::TxProxyMethods {{
+        TxProxyMethods {{ wrapped_tx: tx }}
     }}
 }}"#
     )
@@ -32,10 +47,20 @@ where
     write_newline(file);
 }
 
-pub(crate) fn write_tx_proxy_method_header(file: &mut File) {
+pub(crate) fn write_struct_tx_proxy_methods(file: &mut File) {
     writeln!(
         file,
-        r#"impl<Env: TxEnv + multiversx_sc::api::CallTypeApi> TxProxyMethods<Env> {{"#
+        r#"pub struct TxProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{{
+    wrapped_tx: Tx<Env, From, To, (), Gas, (), ()>,
+}}"#
     )
     .unwrap();
+
+    write_newline(file);
 }

From 1feb3491175a5812ee83fb59a63e47066f7d8602 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Tue, 12 Mar 2024 20:32:29 +0200
Subject: [PATCH 0444/1254] fix clippy

---
 .../base/src/storage/mappers/single_value_mapper.rs   |  4 ++++
 .../contract/generate_proxy/proxy_sc_functions_gen.rs | 11 ++++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/framework/base/src/storage/mappers/single_value_mapper.rs b/framework/base/src/storage/mappers/single_value_mapper.rs
index b00d605542..5eade9503a 100644
--- a/framework/base/src/storage/mappers/single_value_mapper.rs
+++ b/framework/base/src/storage/mappers/single_value_mapper.rs
@@ -226,6 +226,10 @@ where
         T::type_name()
     }
 
+    fn type_name_rust() -> TypeName {
+        T::type_name_rust()
+    }
+
     fn provide_type_descriptions<TDC: TypeDescriptionContainer>(accumulator: &mut TDC) {
         T::provide_type_descriptions(accumulator)
     }
diff --git a/framework/meta/src/cmd/contract/generate_proxy/proxy_sc_functions_gen.rs b/framework/meta/src/cmd/contract/generate_proxy/proxy_sc_functions_gen.rs
index ef700766d1..cdabec8ce5 100644
--- a/framework/meta/src/cmd/contract/generate_proxy/proxy_sc_functions_gen.rs
+++ b/framework/meta/src/cmd/contract/generate_proxy/proxy_sc_functions_gen.rs
@@ -106,7 +106,7 @@ fn write_endpoint_output(file: &mut File, outputs: Vec<OutputAbi>) {
     )
     .unwrap();
 
-    if outputs.len() == 0 {
+    if outputs.is_empty() {
         write!(file, "()").unwrap();
     } else {
         parse_and_write_outputs(file, outputs);
@@ -215,6 +215,7 @@ fn parse_and_write_outputs(file: &mut File, outputs: Vec<OutputAbi>) {
             .type_names
             .rust
             .replace("multiversx_sc::api::uncallable::UncallableApi", "Env::Api")
+            .replace("$API", "Env::Api")
             .to_string();
 
         let mut current_string = String::new();
@@ -223,8 +224,8 @@ fn parse_and_write_outputs(file: &mut File, outputs: Vec<OutputAbi>) {
         for character in env_api.chars() {
             if character == COLON {
                 // adjust_on_colon_suffix(character, current_string, found_words);
-                if current_string.ends_with(COLON) && !current_string.ends_with(ENV){
-                    if current_string.len() > 0
+                if current_string.ends_with(COLON) && !current_string.ends_with(ENV) {
+                    if !current_string.is_empty()
                         && current_string.chars().next().unwrap().is_uppercase()
                     {
                         found_words.push(current_string[..current_string.len() - 1].to_string());
@@ -234,7 +235,7 @@ fn parse_and_write_outputs(file: &mut File, outputs: Vec<OutputAbi>) {
                     current_string.push(character);
                 }
             } else if character == ' ' && current_string.ends_with(',') {
-                if current_string.len() > 0 && current_string.chars().next().unwrap().is_uppercase()
+                if !current_string.is_empty() && current_string.chars().next().unwrap().is_uppercase()
                 {
                     current_string.push(character);
                     found_words.push(current_string.clone());
@@ -250,4 +251,4 @@ fn parse_and_write_outputs(file: &mut File, outputs: Vec<OutputAbi>) {
         found_words.push(current_string);
         write!(file, "{}", found_words.join("")).unwrap();
     }
-}
\ No newline at end of file
+}

From 958a27b354ca187b71700e596cc74f81ac9d3331 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 13 Mar 2024 12:16:37 +0100
Subject: [PATCH 0445/1254] tx proxy gen - cleanup, minor fixes

---
 contracts/examples/adder/src/temp_proxy_v2.rs |  33 ++----
 framework/base/src/lib.rs                     |   2 +-
 .../generate_proxy/proxy_sc_functions_gen.rs  | 109 +++++++-----------
 .../generate_proxy/proxy_template_gen.rs      |   4 +-
 4 files changed, 53 insertions(+), 95 deletions(-)

diff --git a/contracts/examples/adder/src/temp_proxy_v2.rs b/contracts/examples/adder/src/temp_proxy_v2.rs
index 145760201f..ac17677128 100644
--- a/contracts/examples/adder/src/temp_proxy_v2.rs
+++ b/contracts/examples/adder/src/temp_proxy_v2.rs
@@ -1,8 +1,10 @@
-#![allow(clippy::all)]
+////////////////////////////////////////////////////
+////////////////// AUTO-GENERATED //////////////////
+////////////////////////////////////////////////////
 
-use multiversx_sc::api::VMApi;
+#![allow(clippy::all)]
 
-multiversx_sc::imports!();
+use multiversx_sc::imports::*;
 
 pub struct TxProxy;
 
@@ -40,22 +42,13 @@ where
     pub fn init<Arg0: multiversx_sc::codec::CodecInto<BigUint<Env::Api>>>(
         self,
         initial_value: Arg0,
-    ) -> multiversx_sc::types::Tx<
-        Env,
-        From,
-        (),
-        (),
-        Gas,
-        DeployCall<Env, ()>,
-        OriginalResultMarker<()>,
-    > {
+    ) -> Tx<Env, From, (), (), Gas, DeployCall<Env, ()>, OriginalResultMarker<()>> {
         self.wrapped_tx
             .raw_deploy()
             .argument(&initial_value)
             .original_result()
     }
 }
-
 impl<Env, From, To, Gas> TxProxyMethods<Env, From, To, Gas>
 where
     Env: TxEnv,
@@ -66,14 +59,14 @@ where
 {
     pub fn sum(
         self,
-    ) -> multiversx_sc::types::Tx<
+    ) -> Tx<
         Env,
         From,
         To,
         (),
         Gas,
         FunctionCall<Env::Api>,
-        OriginalResultMarker<BigUint<Env::Api>>,
+        OriginalResultMarker<multiversx_sc::types::BigUint<Env::Api>>,
     > {
         self.wrapped_tx
             .raw_call()
@@ -85,15 +78,7 @@ where
     pub fn add<Arg0: multiversx_sc::codec::CodecInto<BigUint<Env::Api>>>(
         self,
         value: Arg0,
-    ) -> multiversx_sc::types::Tx<
-        Env,
-        From,
-        To,
-        (),
-        Gas,
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<()>,
-    > {
+    ) -> Tx<Env, From, To, (), Gas, FunctionCall<Env::Api>, OriginalResultMarker<()>> {
         self.wrapped_tx
             .raw_call()
             .function_name("add")
diff --git a/framework/base/src/lib.rs b/framework/base/src/lib.rs
index 57dd97bee2..e209315d7a 100644
--- a/framework/base/src/lib.rs
+++ b/framework/base/src/lib.rs
@@ -43,7 +43,7 @@ pub use storage::{storage_clear, storage_get, storage_get_len, storage_set};
 pub mod imports {
     pub use crate::{
         abi::TypeAbi,
-        api::{ErrorApiImpl, ManagedTypeApi},
+        api::{ErrorApiImpl, ManagedTypeApi, VMApi},
         arrayvec::ArrayVec,
         codec::{
             multi_types::*, DecodeError, IntoMultiValue, NestedDecode, NestedEncode, TopDecode,
diff --git a/framework/meta/src/cmd/contract/generate_proxy/proxy_sc_functions_gen.rs b/framework/meta/src/cmd/contract/generate_proxy/proxy_sc_functions_gen.rs
index cdabec8ce5..5429a62e81 100644
--- a/framework/meta/src/cmd/contract/generate_proxy/proxy_sc_functions_gen.rs
+++ b/framework/meta/src/cmd/contract/generate_proxy/proxy_sc_functions_gen.rs
@@ -7,9 +7,6 @@ use crate::cmd::contract::generate_snippets::{
     snippet_type_map::{handle_abi_type, RustTypeString},
 };
 
-const ENV: &str = "Env:";
-const COLON: char = ':';
-
 pub(crate) fn write_content(file: &mut File, abi: ContractAbi) {
     write_header_impl_constructor(file);
     for constructor_abi in abi.constructors {
@@ -32,7 +29,7 @@ pub(crate) fn write_content(file: &mut File, abi: ContractAbi) {
 fn write_header_impl_constructor(file: &mut File) {
     writeln!(
         file,
-        r#"impl<Env, To, Gas> TxProxyMethods<Env, (), To, Gas>
+        r#"impl<Env, From, Gas> TxProxyMethods<Env, From, (), Gas>
 where
     Env: TxEnv,
     Env::Api: VMApi,
@@ -59,8 +56,8 @@ where
 }
 
 fn write_constructor_header(file: &mut File, contructor_abi: EndpointAbi) {
-    write_fn_signature(file, contructor_abi);
-    write_constructor_output(file);
+    write_fn_signature(file, contructor_abi.clone());
+    write_constructor_output(file, contructor_abi.outputs);
 }
 
 fn write_endpoint_header(file: &mut File, contructor_abi: EndpointAbi) {
@@ -84,10 +81,26 @@ fn write_parameters(file: &mut File, inputs: Vec<InputAbi>) {
     write!(file, "\t) ").unwrap();
 }
 
-fn write_constructor_output(file: &mut File) {
+fn write_constructor_output(file: &mut File, outputs: Vec<OutputAbi>) {
+    write!(
+        file,
+        "-> Tx<
+        Env,
+        From,
+        (),
+        (),
+        Gas,
+        DeployCall<Env, ()>,
+        OriginalResultMarker<"
+    )
+    .unwrap();
+
+    parse_and_write_outputs(file, outputs);
+
     writeln!(
         file,
-        "-> multiversx_sc::types::Tx<Env, (), To, (), Gas, DeployCall<Env, ()>, OriginalResultMarker<()>>\n\t{{"
+        ">,
+    > {{"
     )
     .unwrap();
 }
@@ -95,7 +108,7 @@ fn write_constructor_output(file: &mut File) {
 fn write_endpoint_output(file: &mut File, outputs: Vec<OutputAbi>) {
     write!(
         file,
-        "-> multiversx_sc::types::Tx<
+        "-> Tx<
         Env,
         From,
         To,
@@ -106,11 +119,7 @@ fn write_endpoint_output(file: &mut File, outputs: Vec<OutputAbi>) {
     )
     .unwrap();
 
-    if outputs.is_empty() {
-        write!(file, "()").unwrap();
-    } else {
-        parse_and_write_outputs(file, outputs);
-    }
+    parse_and_write_outputs(file, outputs);
 
     writeln!(
         file,
@@ -128,12 +137,7 @@ fn write_constructor_content(file: &mut File, inputs: Vec<InputAbi>) {
     )
     .unwrap();
     for input in inputs.iter() {
-        writeln!(
-            file,
-            "\t\t\t.argument(&{})",
-            input.arg_name // .argument(&arg0)"
-        )
-        .unwrap();
+        writeln!(file, "\t\t\t.argument(&{})", input.arg_name).unwrap();
     }
     writeln!(file, "\t\t\t.original_result()").unwrap();
 }
@@ -149,12 +153,7 @@ fn write_endpoint_content(file: &mut File, function_name: String, inputs: Vec<In
     .unwrap();
 
     for input in inputs.iter() {
-        writeln!(
-            file,
-            "\t\t\t.argument(&{})",
-            input.arg_name // .argument(&arg0)"
-        )
-        .unwrap();
+        writeln!(file, "\t\t\t.argument(&{})", input.arg_name).unwrap();
     }
 
     writeln!(file, "\t\t\t.original_result()").unwrap();
@@ -198,7 +197,7 @@ fn write_argument(file: &mut File, index: usize, type_name: String) {
 
     writeln!(
         file,
-        "\t\tArg{index}: multiversx_sc::codec::CodecInto<{}>,",
+        "\t\tArg{index}: CodecInto<{}>,",
         type_print
     )
     .unwrap();
@@ -209,46 +208,22 @@ fn write_end_of_function(file: &mut File) {
     write_newline(file);
 }
 
+fn adjust_type_name(original_rust_name: &str) -> String {
+    original_rust_name
+        .replace("multiversx_sc::api::uncallable::UncallableApi", "Env::Api")
+        .replace("$API", "Env::Api")
+        .to_string()
+}
+
 fn parse_and_write_outputs(file: &mut File, outputs: Vec<OutputAbi>) {
-    for output in outputs {
-        let env_api = output
-            .type_names
-            .rust
-            .replace("multiversx_sc::api::uncallable::UncallableApi", "Env::Api")
-            .replace("$API", "Env::Api")
-            .to_string();
-
-        let mut current_string = String::new();
-        let mut found_words = Vec::new();
-
-        for character in env_api.chars() {
-            if character == COLON {
-                // adjust_on_colon_suffix(character, current_string, found_words);
-                if current_string.ends_with(COLON) && !current_string.ends_with(ENV) {
-                    if !current_string.is_empty()
-                        && current_string.chars().next().unwrap().is_uppercase()
-                    {
-                        found_words.push(current_string[..current_string.len() - 1].to_string());
-                    }
-                    current_string.clear();
-                } else {
-                    current_string.push(character);
-                }
-            } else if character == ' ' && current_string.ends_with(',') {
-                if !current_string.is_empty() && current_string.chars().next().unwrap().is_uppercase()
-                {
-                    current_string.push(character);
-                    found_words.push(current_string.clone());
-                    current_string.clear();
-                } else {
-                    current_string.push(character);
-                }
-            } else {
-                current_string.push(character);
-            }
-        }
-
-        found_words.push(current_string);
-        write!(file, "{}", found_words.join("")).unwrap();
+    match outputs.len() {
+        0 => {
+            write!(file, "()").unwrap();
+        },
+        1 => {
+            let adjusted = adjust_type_name(&outputs[0].type_names.rust);
+            write!(file, "{adjusted}").unwrap();
+        },
+        _ => panic!("multiple outputs not yet supported"),
     }
 }
diff --git a/framework/meta/src/cmd/contract/generate_proxy/proxy_template_gen.rs b/framework/meta/src/cmd/contract/generate_proxy/proxy_template_gen.rs
index 7af38cd93a..f5e82eced7 100644
--- a/framework/meta/src/cmd/contract/generate_proxy/proxy_template_gen.rs
+++ b/framework/meta/src/cmd/contract/generate_proxy/proxy_template_gen.rs
@@ -9,9 +9,7 @@ const PREFIX_AUTO_GENERATED: &str = "///////////////////////////////////////////
 
 const IMPORTS: &str = "#![allow(clippy::all)]
 
-use multiversx_sc::api::VMApi;
-
-multiversx_sc::imports!();";
+use multiversx_sc::imports::*;";
 
 pub(crate) fn write_header(file: &mut File) {
     writeln!(file, "{PREFIX_AUTO_GENERATED}").unwrap();

From e294fff0b71f80e3258453d424d196bdb084d1f7 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 13 Mar 2024 12:19:19 +0100
Subject: [PATCH 0446/1254] tx proxy gen - indent using spaces instad of tabs

---
 .../generate_proxy/proxy_sc_functions_gen.rs  | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/framework/meta/src/cmd/contract/generate_proxy/proxy_sc_functions_gen.rs b/framework/meta/src/cmd/contract/generate_proxy/proxy_sc_functions_gen.rs
index 5429a62e81..020eb1d71b 100644
--- a/framework/meta/src/cmd/contract/generate_proxy/proxy_sc_functions_gen.rs
+++ b/framework/meta/src/cmd/contract/generate_proxy/proxy_sc_functions_gen.rs
@@ -74,11 +74,11 @@ fn write_fn_signature(file: &mut File, endpoint_abi: EndpointAbi) {
 
 fn write_parameters(file: &mut File, inputs: Vec<InputAbi>) {
     writeln!(file, "(").unwrap();
-    writeln!(file, "\t\tself,").unwrap();
+    writeln!(file, "        self,").unwrap();
     for (index, input) in inputs.iter().enumerate() {
-        writeln!(file, "\t\t{}: Arg{index},", &input.arg_name).unwrap();
+        writeln!(file, "        {}: Arg{index},", &input.arg_name).unwrap();
     }
-    write!(file, "\t) ").unwrap();
+    write!(file, "    ) ").unwrap();
 }
 
 fn write_constructor_output(file: &mut File, outputs: Vec<OutputAbi>) {
@@ -132,20 +132,20 @@ fn write_endpoint_output(file: &mut File, outputs: Vec<OutputAbi>) {
 fn write_constructor_content(file: &mut File, inputs: Vec<InputAbi>) {
     writeln!(
         file,
-        "\t\tself.wrapped_tx
+        "        self.wrapped_tx
             .raw_deploy()"
     )
     .unwrap();
     for input in inputs.iter() {
-        writeln!(file, "\t\t\t.argument(&{})", input.arg_name).unwrap();
+        writeln!(file, "            .argument(&{})", input.arg_name).unwrap();
     }
-    writeln!(file, "\t\t\t.original_result()").unwrap();
+    writeln!(file, "            .original_result()").unwrap();
 }
 
 fn write_endpoint_content(file: &mut File, function_name: String, inputs: Vec<InputAbi>) {
     writeln!(
         file,
-        "\t\tself.wrapped_tx
+        "        self.wrapped_tx
             .raw_call()
             .function_name(\"{}\")",
         function_name
@@ -153,19 +153,19 @@ fn write_endpoint_content(file: &mut File, function_name: String, inputs: Vec<In
     .unwrap();
 
     for input in inputs.iter() {
-        writeln!(file, "\t\t\t.argument(&{})", input.arg_name).unwrap();
+        writeln!(file, "            .argument(&{})", input.arg_name).unwrap();
     }
 
-    writeln!(file, "\t\t\t.original_result()").unwrap();
+    writeln!(file, "            .original_result()").unwrap();
 }
 
 fn write_function_header_endpoint(file: &mut File, rust_method_name: String) {
-    write!(file, "\tpub fn {rust_method_name}").unwrap();
+    write!(file, "    pub fn {rust_method_name}").unwrap();
 }
 
 fn write_info_endpoint(file: &mut File, docs: Vec<String>) {
     if !docs.is_empty() {
-        write!(file, "\t//").unwrap();
+        write!(file, "    //").unwrap();
     }
 
     for abi_doc in docs {
@@ -184,7 +184,7 @@ fn write_args(file: &mut File, inputs: Vec<InputAbi>) {
         write_argument(file, index, input.type_names.abi.to_string());
     }
 
-    write!(file, "\t>").unwrap();
+    write!(file, "    >").unwrap();
 }
 
 fn write_argument(file: &mut File, index: usize, type_name: String) {
@@ -197,14 +197,14 @@ fn write_argument(file: &mut File, index: usize, type_name: String) {
 
     writeln!(
         file,
-        "\t\tArg{index}: CodecInto<{}>,",
+        "        Arg{index}: CodecInto<{}>,",
         type_print
     )
     .unwrap();
 }
 
 fn write_end_of_function(file: &mut File) {
-    writeln!(file, "\t}}").unwrap();
+    writeln!(file, "    }}").unwrap();
     write_newline(file);
 }
 

From 6867c940cfab0a77e4e5ae3288ade406848c7a89 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 13 Mar 2024 12:19:28 +0100
Subject: [PATCH 0447/1254] cargo fmt

---
 framework/base/src/abi/contract_abi.rs                     | 3 ++-
 framework/meta/src/abi_json/contract_abi_json.rs           | 5 ++++-
 .../cmd/contract/generate_proxy/proxy_sc_functions_gen.rs  | 7 +------
 .../meta/src/cmd/contract/sc_config/contract_variant.rs    | 5 ++++-
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/framework/base/src/abi/contract_abi.rs b/framework/base/src/abi/contract_abi.rs
index 793b9eed5d..2c8ad67fba 100644
--- a/framework/base/src/abi/contract_abi.rs
+++ b/framework/base/src/abi/contract_abi.rs
@@ -41,7 +41,8 @@ impl ContractAbi {
         self.constructors
             .extend_from_slice(other.constructors.as_slice());
         self.endpoints.extend_from_slice(other.endpoints.as_slice());
-        self.upgrade_constructors.extend_from_slice(other.upgrade_constructors.as_slice());
+        self.upgrade_constructors
+            .extend_from_slice(other.upgrade_constructors.as_slice());
         self.events.extend_from_slice(other.events.as_slice());
         self.promise_callbacks
             .extend_from_slice(other.promise_callbacks.as_slice());
diff --git a/framework/meta/src/abi_json/contract_abi_json.rs b/framework/meta/src/abi_json/contract_abi_json.rs
index 0d845544fe..58c0865eee 100644
--- a/framework/meta/src/abi_json/contract_abi_json.rs
+++ b/framework/meta/src/abi_json/contract_abi_json.rs
@@ -52,7 +52,10 @@ impl From<&ContractAbi> for ContractAbiJson {
             docs: abi.docs.iter().map(|d| d.to_string()).collect(),
             name: abi.name.to_string(),
             constructor: abi.constructors.first().map(ConstructorAbiJson::from),
-            upgrade_constructor: abi.upgrade_constructors.first().map(ConstructorAbiJson::from),
+            upgrade_constructor: abi
+                .upgrade_constructors
+                .first()
+                .map(ConstructorAbiJson::from),
             endpoints: abi.endpoints.iter().map(EndpointAbiJson::from).collect(),
             promises_callback_names: abi
                 .promise_callbacks
diff --git a/framework/meta/src/cmd/contract/generate_proxy/proxy_sc_functions_gen.rs b/framework/meta/src/cmd/contract/generate_proxy/proxy_sc_functions_gen.rs
index 020eb1d71b..6abdf37fc4 100644
--- a/framework/meta/src/cmd/contract/generate_proxy/proxy_sc_functions_gen.rs
+++ b/framework/meta/src/cmd/contract/generate_proxy/proxy_sc_functions_gen.rs
@@ -195,12 +195,7 @@ fn write_argument(file: &mut File, index: usize, type_name: String) {
         .replace("StaticApi", "Env::Api")
         .to_string();
 
-    writeln!(
-        file,
-        "        Arg{index}: CodecInto<{}>,",
-        type_print
-    )
-    .unwrap();
+    writeln!(file, "        Arg{index}: CodecInto<{}>,", type_print).unwrap();
 }
 
 fn write_end_of_function(file: &mut File) {
diff --git a/framework/meta/src/cmd/contract/sc_config/contract_variant.rs b/framework/meta/src/cmd/contract/sc_config/contract_variant.rs
index e1ff06da5d..4467705eef 100644
--- a/framework/meta/src/cmd/contract/sc_config/contract_variant.rs
+++ b/framework/meta/src/cmd/contract/sc_config/contract_variant.rs
@@ -172,7 +172,10 @@ impl std::fmt::Debug for ContractVariant {
             .field("config_name", &self.contract_id)
             .field("public_name", &self.contract_name)
             .field("num-constructors", &self.abi.constructors.len())
-            .field("num-upgrade-constructors", &self.abi.upgrade_constructors.len())
+            .field(
+                "num-upgrade-constructors",
+                &self.abi.upgrade_constructors.len(),
+            )
             .field("num-endpoints", &self.abi.endpoints.len())
             .field("settings", &self.settings)
             .finish()

From 48caa550a5a01bf0451eb666dff4bcf500f80d14 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 13 Mar 2024 12:24:19 +0100
Subject: [PATCH 0448/1254] tx proxy gen - doc fix

---
 contracts/examples/adder/src/temp_proxy_v2.rs | 32 ++++++++++++++++---
 framework/base/src/lib.rs                     |  4 +--
 .../generate_proxy/proxy_sc_functions_gen.rs  |  6 ++--
 3 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/contracts/examples/adder/src/temp_proxy_v2.rs b/contracts/examples/adder/src/temp_proxy_v2.rs
index ac17677128..2d7a9b4c76 100644
--- a/contracts/examples/adder/src/temp_proxy_v2.rs
+++ b/contracts/examples/adder/src/temp_proxy_v2.rs
@@ -39,15 +39,26 @@ where
     From: TxFrom<Env>,
     Gas: TxGas<Env>,
 {
-    pub fn init<Arg0: multiversx_sc::codec::CodecInto<BigUint<Env::Api>>>(
+    pub fn init<
+        Arg0: CodecInto<BigUint<Env::Api>>,
+    >(
         self,
         initial_value: Arg0,
-    ) -> Tx<Env, From, (), (), Gas, DeployCall<Env, ()>, OriginalResultMarker<()>> {
+    ) -> Tx<
+        Env,
+        From,
+        (),
+        (),
+        Gas,
+        DeployCall<Env, ()>,
+        OriginalResultMarker<()>,
+    > {
         self.wrapped_tx
             .raw_deploy()
             .argument(&initial_value)
             .original_result()
     }
+
 }
 impl<Env, From, To, Gas> TxProxyMethods<Env, From, To, Gas>
 where
@@ -74,15 +85,26 @@ where
             .original_result()
     }
 
-    //Add desired amount to the storage variable.
-    pub fn add<Arg0: multiversx_sc::codec::CodecInto<BigUint<Env::Api>>>(
+    /// Add desired amount to the storage variable. 
+    pub fn add<
+        Arg0: CodecInto<BigUint<Env::Api>>,
+    >(
         self,
         value: Arg0,
-    ) -> Tx<Env, From, To, (), Gas, FunctionCall<Env::Api>, OriginalResultMarker<()>> {
+    ) -> Tx<
+        Env,
+        From,
+        To,
+        (),
+        Gas,
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<()>,
+    > {
         self.wrapped_tx
             .raw_call()
             .function_name("add")
             .argument(&value)
             .original_result()
     }
+
 }
diff --git a/framework/base/src/lib.rs b/framework/base/src/lib.rs
index e209315d7a..7f2a8b1c2b 100644
--- a/framework/base/src/lib.rs
+++ b/framework/base/src/lib.rs
@@ -46,8 +46,8 @@ pub mod imports {
         api::{ErrorApiImpl, ManagedTypeApi, VMApi},
         arrayvec::ArrayVec,
         codec::{
-            multi_types::*, DecodeError, IntoMultiValue, NestedDecode, NestedEncode, TopDecode,
-            TopEncode,
+            multi_types::*, CodecFrom, CodecFromSelf, CodecInto, DecodeError, IntoMultiValue,
+            NestedDecode, NestedEncode, TopDecode, TopEncode,
         },
         contract_base::{ContractBase, ProxyObjBase, ProxyObjNew},
         err_msg,
diff --git a/framework/meta/src/cmd/contract/generate_proxy/proxy_sc_functions_gen.rs b/framework/meta/src/cmd/contract/generate_proxy/proxy_sc_functions_gen.rs
index 6abdf37fc4..b35e402a9d 100644
--- a/framework/meta/src/cmd/contract/generate_proxy/proxy_sc_functions_gen.rs
+++ b/framework/meta/src/cmd/contract/generate_proxy/proxy_sc_functions_gen.rs
@@ -66,7 +66,7 @@ fn write_endpoint_header(file: &mut File, contructor_abi: EndpointAbi) {
 }
 
 fn write_fn_signature(file: &mut File, endpoint_abi: EndpointAbi) {
-    write_info_endpoint(file, endpoint_abi.docs);
+    write_endpoint_docs(file, endpoint_abi.docs);
     write_function_header_endpoint(file, endpoint_abi.rust_method_name);
     write_args(file, endpoint_abi.inputs.clone());
     write_parameters(file, endpoint_abi.inputs);
@@ -163,9 +163,9 @@ fn write_function_header_endpoint(file: &mut File, rust_method_name: String) {
     write!(file, "    pub fn {rust_method_name}").unwrap();
 }
 
-fn write_info_endpoint(file: &mut File, docs: Vec<String>) {
+fn write_endpoint_docs(file: &mut File, docs: Vec<String>) {
     if !docs.is_empty() {
-        write!(file, "    //").unwrap();
+        write!(file, "    /// ").unwrap();
     }
 
     for abi_doc in docs {

From aa24ecd7d35af072c299be31999a28ec3ef72079 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Wed, 13 Mar 2024 13:49:24 +0200
Subject: [PATCH 0449/1254] explicit type name rust

---
 framework/base/src/abi/type_abi_impl_basic.rs | 36 +++++++++++++++++++
 .../base/src/storage/mappers/bi_di_mapper.rs  |  4 +++
 .../src/storage/mappers/linked_list_mapper.rs |  4 +++
 .../base/src/storage/mappers/map_mapper.rs    |  4 +++
 .../base/src/storage/mappers/queue_mapper.rs  |  4 +++
 .../base/src/storage/mappers/set_mapper.rs    |  4 +++
 .../mappers/token/fungible_token_mapper.rs    |  4 +++
 .../token/non_fungible_token_mapper.rs        |  4 +++
 .../src/storage/mappers/unique_id_mapper.rs   |  4 +++
 .../storage/mappers/unordered_set_mapper.rs   |  4 +++
 .../base/src/storage/mappers/user_mapper.rs   |  4 +++
 .../base/src/storage/mappers/vec_mapper.rs    |  4 +++
 .../src/types/interaction/function_call.rs    |  4 +++
 .../types/interaction/managed_arg_buffer.rs   |  4 +++
 framework/base/src/types/io/sc_result.rs      |  4 +++
 .../base/src/types/managed/basic/big_int.rs   |  4 +++
 .../src/types/managed/basic/big_int_sign.rs   |  4 +++
 .../src/types/managed/basic/elliptic_curve.rs |  4 +++
 .../esdt_token_payment_multi_value.rs         |  4 +++
 .../multi_value/multi_value_encoded.rs        |  4 +++
 .../types/managed/wrapped/managed_address.rs  |  4 +++
 .../managed/wrapped/managed_byte_array.rs     |  4 +++
 .../types/managed/wrapped/managed_option.rs   |  4 +++
 .../src/types/managed/wrapped/managed_vec.rs  |  4 +++
 .../src/types/static_buffer/sparse_array.rs   |  4 +++
 .../contract/generate_proxy/proxy_gen_main.rs |  2 +-
 26 files changed, 133 insertions(+), 1 deletion(-)

diff --git a/framework/base/src/abi/type_abi_impl_basic.rs b/framework/base/src/abi/type_abi_impl_basic.rs
index 00965215de..133e67085a 100644
--- a/framework/base/src/abi/type_abi_impl_basic.rs
+++ b/framework/base/src/abi/type_abi_impl_basic.rs
@@ -19,6 +19,10 @@ impl<T: TypeAbi> TypeAbi for &T {
         T::type_name()
     }
 
+    fn type_name_rust() -> TypeName {
+        T::type_name_rust()
+    }
+
     fn provide_type_descriptions<TDC: TypeDescriptionContainer>(accumulator: &mut TDC) {
         T::provide_type_descriptions(accumulator);
     }
@@ -29,6 +33,10 @@ impl<T: TypeAbi> TypeAbi for Box<T> {
         T::type_name()
     }
 
+    fn type_name_rust() -> TypeName {
+        T::type_name_rust()
+    }
+
     fn provide_type_descriptions<TDC: TypeDescriptionContainer>(accumulator: &mut TDC) {
         T::provide_type_descriptions(accumulator);
     }
@@ -46,6 +54,10 @@ impl<T: TypeAbi> TypeAbi for &[T] {
         repr
     }
 
+    fn type_name_rust() -> TypeName {
+        T::type_name_rust()
+    }
+
     fn provide_type_descriptions<TDC: TypeDescriptionContainer>(accumulator: &mut TDC) {
         T::provide_type_descriptions(accumulator);
     }
@@ -56,6 +68,10 @@ impl<T: TypeAbi> TypeAbi for Vec<T> {
         <&[T]>::type_name()
     }
 
+    fn type_name_rust() -> TypeName {
+        <&[T]>::type_name_rust()
+    }
+
     fn provide_type_descriptions<TDC: TypeDescriptionContainer>(accumulator: &mut TDC) {
         T::provide_type_descriptions(accumulator);
     }
@@ -66,6 +82,10 @@ impl<T: TypeAbi, const CAP: usize> TypeAbi for ArrayVec<T, CAP> {
         <&[T]>::type_name()
     }
 
+    fn type_name_rust() -> TypeName {
+        <&[T]>::type_name_rust()
+    }
+
     fn provide_type_descriptions<TDC: TypeDescriptionContainer>(accumulator: &mut TDC) {
         T::provide_type_descriptions(accumulator);
     }
@@ -76,6 +96,10 @@ impl<T: TypeAbi> TypeAbi for Box<[T]> {
         <&[T]>::type_name()
     }
 
+    fn type_name_rust() -> TypeName {
+        <&[T]>::type_name_rust()
+    }
+
     fn provide_type_descriptions<TDC: TypeDescriptionContainer>(accumulator: &mut TDC) {
         T::provide_type_descriptions(accumulator);
     }
@@ -91,12 +115,20 @@ impl TypeAbi for &str {
     fn type_name() -> TypeName {
         TypeName::type_name()
     }
+
+    fn type_name_rust() -> TypeName {
+        TypeName::type_name_rust()
+    }
 }
 
 impl TypeAbi for Box<str> {
     fn type_name() -> TypeName {
         TypeName::type_name()
     }
+
+    fn type_name_rust() -> TypeName {
+        TypeName::type_name_rust()
+    }
 }
 
 macro_rules! type_abi_name_only {
@@ -144,6 +176,10 @@ impl<T: TypeAbi, E> TypeAbi for Result<T, E> {
         T::type_name()
     }
 
+    fn type_name_rust() -> TypeName {
+        T::type_name_rust()
+    }
+
     /// Similar to the SCResult implementation.
     fn output_abis(output_names: &[&'static str]) -> OutputAbis {
         T::output_abis(output_names)
diff --git a/framework/base/src/storage/mappers/bi_di_mapper.rs b/framework/base/src/storage/mappers/bi_di_mapper.rs
index 42c55e5275..4878e3c3fc 100644
--- a/framework/base/src/storage/mappers/bi_di_mapper.rs
+++ b/framework/base/src/storage/mappers/bi_di_mapper.rs
@@ -331,6 +331,10 @@ where
         MultiValueEncoded::<SA, MultiValue2<K, V>>::type_name()
     }
 
+    fn type_name_rust() -> TypeName {
+        MultiValueEncoded::<SA, MultiValue2<K, V>>::type_name_rust()
+    }
+
     fn provide_type_descriptions<TDC: TypeDescriptionContainer>(accumulator: &mut TDC) {
         K::provide_type_descriptions(accumulator);
         V::provide_type_descriptions(accumulator);
diff --git a/framework/base/src/storage/mappers/linked_list_mapper.rs b/framework/base/src/storage/mappers/linked_list_mapper.rs
index d58c0ad19d..38f71f9191 100644
--- a/framework/base/src/storage/mappers/linked_list_mapper.rs
+++ b/framework/base/src/storage/mappers/linked_list_mapper.rs
@@ -629,6 +629,10 @@ where
         crate::abi::type_name_variadic::<T>()
     }
 
+    fn type_name_rust() -> TypeName {
+        T::type_name_rust()
+    }
+
     fn provide_type_descriptions<TDC: TypeDescriptionContainer>(accumulator: &mut TDC) {
         T::provide_type_descriptions(accumulator);
     }
diff --git a/framework/base/src/storage/mappers/map_mapper.rs b/framework/base/src/storage/mappers/map_mapper.rs
index af4bbda6ff..e8aac7adc1 100644
--- a/framework/base/src/storage/mappers/map_mapper.rs
+++ b/framework/base/src/storage/mappers/map_mapper.rs
@@ -559,6 +559,10 @@ where
         MultiValueEncoded::<SA, MultiValue2<K, V>>::type_name()
     }
 
+    fn type_name_rust() -> TypeName {
+        MultiValueEncoded::<SA, MultiValue2<K, V>>::type_name_rust()
+    }
+
     fn provide_type_descriptions<TDC: TypeDescriptionContainer>(accumulator: &mut TDC) {
         K::provide_type_descriptions(accumulator);
         V::provide_type_descriptions(accumulator);
diff --git a/framework/base/src/storage/mappers/queue_mapper.rs b/framework/base/src/storage/mappers/queue_mapper.rs
index 79ac5f37d7..c2b90f0fe3 100644
--- a/framework/base/src/storage/mappers/queue_mapper.rs
+++ b/framework/base/src/storage/mappers/queue_mapper.rs
@@ -535,6 +535,10 @@ where
         crate::abi::type_name_variadic::<T>()
     }
 
+    fn type_name_rust() -> TypeName {
+        T::type_name_rust()
+    }
+
     fn provide_type_descriptions<TDC: TypeDescriptionContainer>(accumulator: &mut TDC) {
         T::provide_type_descriptions(accumulator);
     }
diff --git a/framework/base/src/storage/mappers/set_mapper.rs b/framework/base/src/storage/mappers/set_mapper.rs
index 28941a7a8c..d95ca8df6b 100644
--- a/framework/base/src/storage/mappers/set_mapper.rs
+++ b/framework/base/src/storage/mappers/set_mapper.rs
@@ -311,6 +311,10 @@ where
         crate::abi::type_name_variadic::<T>()
     }
 
+    fn type_name_rust() -> TypeName {
+        T::type_name_rust()
+    }
+
     fn provide_type_descriptions<TDC: TypeDescriptionContainer>(accumulator: &mut TDC) {
         T::provide_type_descriptions(accumulator);
     }
diff --git a/framework/base/src/storage/mappers/token/fungible_token_mapper.rs b/framework/base/src/storage/mappers/token/fungible_token_mapper.rs
index 5cc3b88e2a..7f84501071 100644
--- a/framework/base/src/storage/mappers/token/fungible_token_mapper.rs
+++ b/framework/base/src/storage/mappers/token/fungible_token_mapper.rs
@@ -278,6 +278,10 @@ where
         TokenIdentifier::<SA>::type_name()
     }
 
+    fn type_name_rust() -> TypeName {
+        TokenIdentifier::<SA>::type_name_rust()
+    }
+
     fn provide_type_descriptions<TDC: crate::abi::TypeDescriptionContainer>(accumulator: &mut TDC) {
         TokenIdentifier::<SA>::provide_type_descriptions(accumulator);
     }
diff --git a/framework/base/src/storage/mappers/token/non_fungible_token_mapper.rs b/framework/base/src/storage/mappers/token/non_fungible_token_mapper.rs
index 11207c70a3..80946dd2a6 100644
--- a/framework/base/src/storage/mappers/token/non_fungible_token_mapper.rs
+++ b/framework/base/src/storage/mappers/token/non_fungible_token_mapper.rs
@@ -408,6 +408,10 @@ where
         TokenIdentifier::<SA>::type_name()
     }
 
+    fn type_name_rust() -> TypeName {
+        TokenIdentifier::<SA>::type_name_rust()
+    }
+
     fn provide_type_descriptions<TDC: crate::abi::TypeDescriptionContainer>(accumulator: &mut TDC) {
         TokenIdentifier::<SA>::provide_type_descriptions(accumulator);
     }
diff --git a/framework/base/src/storage/mappers/unique_id_mapper.rs b/framework/base/src/storage/mappers/unique_id_mapper.rs
index 779e1a1b71..546fdc9825 100644
--- a/framework/base/src/storage/mappers/unique_id_mapper.rs
+++ b/framework/base/src/storage/mappers/unique_id_mapper.rs
@@ -227,6 +227,10 @@ where
         crate::abi::type_name_variadic::<usize>()
     }
 
+    fn type_name_rust() -> TypeName {
+        usize::type_name_rust()
+    }
+
     fn provide_type_descriptions<TDC: TypeDescriptionContainer>(accumulator: &mut TDC) {
         usize::provide_type_descriptions(accumulator);
     }
diff --git a/framework/base/src/storage/mappers/unordered_set_mapper.rs b/framework/base/src/storage/mappers/unordered_set_mapper.rs
index fa151759ea..dac6516cca 100644
--- a/framework/base/src/storage/mappers/unordered_set_mapper.rs
+++ b/framework/base/src/storage/mappers/unordered_set_mapper.rs
@@ -242,6 +242,10 @@ where
         crate::abi::type_name_variadic::<T>()
     }
 
+    fn type_name_rust() -> TypeName {
+        T::type_name_rust()
+    }
+
     fn provide_type_descriptions<TDC: TypeDescriptionContainer>(accumulator: &mut TDC) {
         T::provide_type_descriptions(accumulator);
     }
diff --git a/framework/base/src/storage/mappers/user_mapper.rs b/framework/base/src/storage/mappers/user_mapper.rs
index bbfdcfb27b..2339b019ab 100644
--- a/framework/base/src/storage/mappers/user_mapper.rs
+++ b/framework/base/src/storage/mappers/user_mapper.rs
@@ -233,6 +233,10 @@ where
         crate::abi::type_name_variadic::<ManagedAddress<SA>>()
     }
 
+    fn type_name_rust() -> TypeName {
+        ManagedAddress::<SA>::type_name_rust()
+    }
+
     fn is_variadic() -> bool {
         true
     }
diff --git a/framework/base/src/storage/mappers/vec_mapper.rs b/framework/base/src/storage/mappers/vec_mapper.rs
index 49c9c159cc..af0afe3278 100644
--- a/framework/base/src/storage/mappers/vec_mapper.rs
+++ b/framework/base/src/storage/mappers/vec_mapper.rs
@@ -361,6 +361,10 @@ where
         crate::abi::type_name_variadic::<T>()
     }
 
+    fn type_name_rust() -> TypeName {
+        T::type_name_rust()
+    }
+
     fn provide_type_descriptions<TDC: TypeDescriptionContainer>(accumulator: &mut TDC) {
         T::provide_type_descriptions(accumulator);
     }
diff --git a/framework/base/src/types/interaction/function_call.rs b/framework/base/src/types/interaction/function_call.rs
index 376aec879b..c21ab3a3e3 100644
--- a/framework/base/src/types/interaction/function_call.rs
+++ b/framework/base/src/types/interaction/function_call.rs
@@ -142,6 +142,10 @@ where
         crate::abi::type_name_variadic::<ManagedBuffer<Api>>()
     }
 
+    fn type_name_rust() -> TypeName {
+        ManagedAddress::<Api>::type_name_rust()
+    }
+
     fn is_variadic() -> bool {
         true
     }
diff --git a/framework/base/src/types/interaction/managed_arg_buffer.rs b/framework/base/src/types/interaction/managed_arg_buffer.rs
index 7af6346c7b..d9a009e01e 100644
--- a/framework/base/src/types/interaction/managed_arg_buffer.rs
+++ b/framework/base/src/types/interaction/managed_arg_buffer.rs
@@ -307,4 +307,8 @@ where
     fn type_name() -> TypeName {
         <&[ManagedBuffer<M>] as TypeAbi>::type_name()
     }
+
+    fn type_name_rust() -> TypeName {
+        <&[ManagedBuffer<M>] as TypeAbi>::type_name_rust()
+    }
 }
diff --git a/framework/base/src/types/io/sc_result.rs b/framework/base/src/types/io/sc_result.rs
index 6278987b45..17d915994e 100644
--- a/framework/base/src/types/io/sc_result.rs
+++ b/framework/base/src/types/io/sc_result.rs
@@ -132,6 +132,10 @@ impl<T: TypeAbi, E> TypeAbi for SCResult<T, E> {
         T::type_name()
     }
 
+    fn type_name_rust() -> TypeName {
+        T::type_name_rust()
+    }
+
     /// Gives `SCResult<()>` the possibility to produce 0 output ABIs,
     /// just like `()`.
     /// It is also possible to have `SCResult<MultiResultX<...>>`,
diff --git a/framework/base/src/types/managed/basic/big_int.rs b/framework/base/src/types/managed/basic/big_int.rs
index 227a298d02..c2aed1704a 100644
--- a/framework/base/src/types/managed/basic/big_int.rs
+++ b/framework/base/src/types/managed/basic/big_int.rs
@@ -302,6 +302,10 @@ impl<M: ManagedTypeApi> crate::abi::TypeAbi for BigInt<M> {
     fn type_name() -> TypeName {
         TypeName::from("BigInt")
     }
+
+    fn type_name_rust() -> TypeName {
+        TypeName::from("multiversx_sc::types::BigInt<$API>")
+    }
 }
 
 impl<M: ManagedTypeApi> BigInt<M> {
diff --git a/framework/base/src/types/managed/basic/big_int_sign.rs b/framework/base/src/types/managed/basic/big_int_sign.rs
index 5d850afe79..c0c7e01d81 100644
--- a/framework/base/src/types/managed/basic/big_int_sign.rs
+++ b/framework/base/src/types/managed/basic/big_int_sign.rs
@@ -83,4 +83,8 @@ impl crate::abi::TypeAbi for Sign {
     fn type_name() -> TypeName {
         TypeName::from("Sign")
     }
+
+    fn type_name_rust() -> TypeName {
+        TypeName::from("multiversx_sc::types::Sign<$API>")
+    }
 }
diff --git a/framework/base/src/types/managed/basic/elliptic_curve.rs b/framework/base/src/types/managed/basic/elliptic_curve.rs
index d70f7f738d..95fecb7e2a 100644
--- a/framework/base/src/types/managed/basic/elliptic_curve.rs
+++ b/framework/base/src/types/managed/basic/elliptic_curve.rs
@@ -422,4 +422,8 @@ impl<M: ManagedTypeApi> TypeAbi for EllipticCurve<M> {
     fn type_name() -> TypeName {
         TypeName::from("EllipticCurve")
     }
+
+    fn type_name_rust() -> TypeName {
+        TypeName::from("multiversx_sc::types::EllipticCurve<$API>")
+    }
 }
diff --git a/framework/base/src/types/managed/multi_value/esdt_token_payment_multi_value.rs b/framework/base/src/types/managed/multi_value/esdt_token_payment_multi_value.rs
index 66149fe04c..f1ce48e609 100644
--- a/framework/base/src/types/managed/multi_value/esdt_token_payment_multi_value.rs
+++ b/framework/base/src/types/managed/multi_value/esdt_token_payment_multi_value.rs
@@ -106,6 +106,10 @@ where
         MultiValue3::<TokenIdentifier<M>, u64, BigUint<M>>::type_name()
     }
 
+    fn type_name_rust() -> TypeName {
+        MultiValue3::<TokenIdentifier<M>, u64, BigUint<M>>::type_name_rust()
+    }
+
     fn is_variadic() -> bool {
         true
     }
diff --git a/framework/base/src/types/managed/multi_value/multi_value_encoded.rs b/framework/base/src/types/managed/multi_value/multi_value_encoded.rs
index ebf8e0cb69..6cbb85fe54 100644
--- a/framework/base/src/types/managed/multi_value/multi_value_encoded.rs
+++ b/framework/base/src/types/managed/multi_value/multi_value_encoded.rs
@@ -231,6 +231,10 @@ where
         crate::abi::type_name_variadic::<T>()
     }
 
+    fn type_name_rust() -> TypeName {
+        T::type_name_rust()
+    }
+
     fn provide_type_descriptions<TDC: TypeDescriptionContainer>(accumulator: &mut TDC) {
         T::provide_type_descriptions(accumulator);
     }
diff --git a/framework/base/src/types/managed/wrapped/managed_address.rs b/framework/base/src/types/managed/wrapped/managed_address.rs
index 80de540394..e65469fc63 100644
--- a/framework/base/src/types/managed/wrapped/managed_address.rs
+++ b/framework/base/src/types/managed/wrapped/managed_address.rs
@@ -242,6 +242,10 @@ where
     fn type_name() -> TypeName {
         Address::type_name()
     }
+
+    fn type_name_rust() -> TypeName {
+        Address::type_name_rust()
+    }
 }
 
 impl<M: ManagedTypeApi> SCLowerHex for ManagedAddress<M> {
diff --git a/framework/base/src/types/managed/wrapped/managed_byte_array.rs b/framework/base/src/types/managed/wrapped/managed_byte_array.rs
index ed41ba4951..413152bcc1 100644
--- a/framework/base/src/types/managed/wrapped/managed_byte_array.rs
+++ b/framework/base/src/types/managed/wrapped/managed_byte_array.rs
@@ -211,6 +211,10 @@ where
     fn type_name() -> TypeName {
         <&[u8; N] as TypeAbi>::type_name()
     }
+
+    fn type_name_rust() -> TypeName {
+        <&[u8; N] as TypeAbi>::type_name_rust()
+    }
 }
 
 impl<M, const N: usize> SCLowerHex for ManagedByteArray<M, N>
diff --git a/framework/base/src/types/managed/wrapped/managed_option.rs b/framework/base/src/types/managed/wrapped/managed_option.rs
index 1fe4366eb0..422a5e7753 100644
--- a/framework/base/src/types/managed/wrapped/managed_option.rs
+++ b/framework/base/src/types/managed/wrapped/managed_option.rs
@@ -279,6 +279,10 @@ where
         Option::<T>::type_name()
     }
 
+    fn type_name_rust() -> TypeName {
+        Option::<T>::type_name_rust()
+    }
+
     fn provide_type_descriptions<TDC: TypeDescriptionContainer>(accumulator: &mut TDC) {
         T::provide_type_descriptions(accumulator);
     }
diff --git a/framework/base/src/types/managed/wrapped/managed_vec.rs b/framework/base/src/types/managed/wrapped/managed_vec.rs
index f7b8cad171..d66e09436b 100644
--- a/framework/base/src/types/managed/wrapped/managed_vec.rs
+++ b/framework/base/src/types/managed/wrapped/managed_vec.rs
@@ -688,6 +688,10 @@ where
         <&[T] as TypeAbi>::type_name()
     }
 
+    fn type_name_rust() -> TypeName {
+        <&[T] as TypeAbi>::type_name_rust()
+    }
+
     fn provide_type_descriptions<TDC: TypeDescriptionContainer>(accumulator: &mut TDC) {
         T::provide_type_descriptions(accumulator);
     }
diff --git a/framework/base/src/types/static_buffer/sparse_array.rs b/framework/base/src/types/static_buffer/sparse_array.rs
index 2c6ddd61e2..59001062b1 100644
--- a/framework/base/src/types/static_buffer/sparse_array.rs
+++ b/framework/base/src/types/static_buffer/sparse_array.rs
@@ -311,6 +311,10 @@ where
         <&[usize] as TypeAbi>::type_name()
     }
 
+    fn type_name_rust() -> TypeName {
+        <&[usize] as TypeAbi>::type_name_rust()
+    }
+
     fn provide_type_descriptions<TDC: TypeDescriptionContainer>(accumulator: &mut TDC) {
         usize::provide_type_descriptions(accumulator);
     }
diff --git a/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_main.rs b/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_main.rs
index 10c1c33b1a..32916d02f7 100644
--- a/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_main.rs
+++ b/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_main.rs
@@ -13,7 +13,7 @@ use super::{
     },
 };
 
-const PROXIES_SOURCE_FILE_NAME: &str = "/output/proxies_struct_interactor_main.rs";
+const PROXIES_SOURCE_FILE_NAME: &str = "/output/proxy.rs";
 
 impl MetaConfig {
     pub fn generate_rust_proxies_struct(&self, args: &GenerateProxyArgs) {

From dc4f13db9a04c5f0926e7a2398ded3eadc8791c5 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Wed, 13 Mar 2024 13:53:36 +0100
Subject: [PATCH 0450/1254] fix after review, replaced custom never type with
 rust infallible type

---
 Cargo.lock                                    |   9 ++
 data/codec/Cargo.toml                         |   1 +
 data/codec/src/codec_err_handler.rs           |   9 +-
 data/codec/src/equivalent/codec_convert.rs    |  13 +-
 data/codec/src/single/top_en.rs               |   7 +-
 data/codec/src/test_util.rs                   |  30 ++---
 framework/base/Cargo.toml                     |   1 +
 .../src/contract_base/wrappers/serializer.rs  |  51 ++++----
 .../wrappers/storage_raw_wrapper.rs           |   8 +-
 .../base/src/formatter/formatter_traits.rs    |  11 +-
 framework/base/src/io/arg_error_handler.rs    |   7 +-
 framework/base/src/io/arg_nested_tuple.rs     |  12 +-
 framework/base/src/io/finish.rs               |   8 +-
 framework/base/src/log_util.rs                |  23 ++--
 framework/base/src/storage/storage_get.rs     |  15 +--
 .../src/storage/storage_get_from_address.rs   |  10 +-
 framework/base/src/storage/storage_key.rs     |  10 +-
 framework/base/src/storage/storage_set.rs     |  15 +--
 .../src/types/interaction/callback_closure.rs |   9 +-
 .../types/interaction/contract_call_exec.rs   |   7 +-
 .../src/types/interaction/contract_deploy.rs  |  14 +--
 .../types/interaction/managed_arg_buffer.rs   |  25 ++--
 .../base/src/types/io/sc_error_static.rs      |  11 +-
 .../multi_value/multi_value_encoded.rs        |  10 +-
 .../multi_value/multi_value_encoded_iter.rs   |   8 +-
 .../types/managed/wrapped/esdt_token_data.rs  |   9 +-
 framework/scenario/Cargo.toml                 |   1 +
 .../src/scenario/model/step/sc_call_step.rs   |   7 +-
 .../model/transaction/typed_response.rs       |   7 +-
 .../scenario/tests/hex_call_data_arg_load.rs  | 118 ++++++++----------
 30 files changed, 200 insertions(+), 266 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 1e015137d2..06a50bc700 100755
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1822,6 +1822,7 @@ dependencies = [
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -1831,6 +1832,7 @@ dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
  "num-bigint",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -1911,6 +1913,7 @@ dependencies = [
  "serde_json",
  "sha2 0.10.8",
  "tokio",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -3296,6 +3299,12 @@ version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
 
+[[package]]
+name = "unwrap-infallible"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "151ac09978d3c2862c4e39b557f4eceee2cc72150bc4cb4f16abf061b6e381fb"
+
 [[package]]
 name = "url"
 version = "2.5.0"
diff --git a/data/codec/Cargo.toml b/data/codec/Cargo.toml
index b42b2051b5..260688121e 100644
--- a/data/codec/Cargo.toml
+++ b/data/codec/Cargo.toml
@@ -25,6 +25,7 @@ optional = true
 [dependencies]
 arrayvec = { version = "=0.7.4", default-features = false }
 num-bigint = { version = "=0.4.4", optional = true } # can only be used in std contexts
+unwrap-infallible = "0.1.5"
 
 [dev-dependencies.multiversx-sc-codec-derive]
 path = "../codec-derive"
diff --git a/data/codec/src/codec_err_handler.rs b/data/codec/src/codec_err_handler.rs
index de0b731fa9..e101d07b6e 100644
--- a/data/codec/src/codec_err_handler.rs
+++ b/data/codec/src/codec_err_handler.rs
@@ -1,3 +1,5 @@
+use core::convert::Infallible;
+
 use crate::{DecodeError, EncodeError};
 
 pub trait EncodeErrorHandler: Copy {
@@ -34,15 +36,12 @@ impl DecodeErrorHandler for DefaultErrorHandler {
     }
 }
 
-#[derive(Debug)]
-pub enum Never {}
-
 /// An error handler that panics immediately, instead of returning a `Result`.
 #[derive(Clone, Copy)]
 pub struct PanicErrorHandler;
 
 impl EncodeErrorHandler for PanicErrorHandler {
-    type HandledErr = Never;
+    type HandledErr = Infallible;
 
     #[inline]
     fn handle_error(&self, err: EncodeError) -> Self::HandledErr {
@@ -51,7 +50,7 @@ impl EncodeErrorHandler for PanicErrorHandler {
 }
 
 impl DecodeErrorHandler for PanicErrorHandler {
-    type HandledErr = Never;
+    type HandledErr = Infallible;
 
     #[inline]
     fn handle_error(&self, err: DecodeError) -> Self::HandledErr {
diff --git a/data/codec/src/equivalent/codec_convert.rs b/data/codec/src/equivalent/codec_convert.rs
index 533bd60294..34b5f28879 100644
--- a/data/codec/src/equivalent/codec_convert.rs
+++ b/data/codec/src/equivalent/codec_convert.rs
@@ -1,3 +1,5 @@
+use unwrap_infallible::UnwrapInfallible;
+
 use crate::{
     CodecFrom, PanicErrorHandler, TopDecodeMultiInput, TopEncodeMulti, TopEncodeMultiOutput,
 };
@@ -9,14 +11,9 @@ where
     Medium: Default + TopDecodeMultiInput + TopEncodeMultiOutput,
 {
     let mut medium: Medium = Default::default();
-    match from.multi_encode_or_handle_err(&mut medium, PanicErrorHandler) {
-        Ok(()) => (),
-        Err(err) => panic!("panic occured: {:#?}", err),
-    };
-    match To::multi_decode_or_handle_err(&mut medium, PanicErrorHandler) {
-        Ok(result) => result,
-        Err(err) => panic!("panic occured: {:#?}", err),
-    }
+    from.multi_encode_or_handle_err(&mut medium, PanicErrorHandler)
+        .unwrap_infallible();
+    To::multi_decode_or_handle_err(&mut medium, PanicErrorHandler).unwrap_infallible()
 }
 
 #[allow(unused)]
diff --git a/data/codec/src/single/top_en.rs b/data/codec/src/single/top_en.rs
index 71553341bf..dd131ffc1f 100644
--- a/data/codec/src/single/top_en.rs
+++ b/data/codec/src/single/top_en.rs
@@ -3,6 +3,7 @@ use crate::{
     PanicErrorHandler, TopEncodeOutput,
 };
 use alloc::vec::Vec;
+use unwrap_infallible::UnwrapInfallible;
 
 pub trait TopEncode: Sized {
     /// Attempt to serialize the value to ouput.
@@ -48,9 +49,7 @@ pub fn top_encode_to_vec_u8<T: TopEncode>(obj: &T) -> Result<Vec<u8>, EncodeErro
 
 pub fn top_encode_to_vec_u8_or_panic<T: TopEncode>(obj: &T) -> Vec<u8> {
     let mut bytes = Vec::<u8>::new();
-    match obj.top_encode_or_handle_err(&mut bytes, PanicErrorHandler) {
-        Ok(_) => {},
-        Err(err) => panic!("panic occured: {:#?}", err),
-    }
+    obj.top_encode_or_handle_err(&mut bytes, PanicErrorHandler)
+        .unwrap_infallible();
     bytes
 }
diff --git a/data/codec/src/test_util.rs b/data/codec/src/test_util.rs
index 588c8aba40..1733fff8b9 100644
--- a/data/codec/src/test_util.rs
+++ b/data/codec/src/test_util.rs
@@ -1,15 +1,14 @@
 use crate::*;
 use alloc::vec::Vec;
 use core::fmt::Debug;
+use unwrap_infallible::UnwrapInfallible;
 
 /// Calls top encode and panics if an encoding error occurs.
 /// Do not use in smart contracts!
 pub fn top_encode_to_vec_u8_or_panic<T: TopEncode>(obj: &T) -> Vec<u8> {
     let mut bytes = Vec::<u8>::new();
-    match obj.top_encode_or_handle_err(&mut bytes, PanicErrorHandler) {
-        Ok(_) => {},
-        Err(err) => panic!("panic occured: {:#?}", err),
-    };
+    obj.top_encode_or_handle_err(&mut bytes, PanicErrorHandler)
+        .unwrap_infallible();
     bytes
 }
 
@@ -17,10 +16,8 @@ pub fn top_encode_to_vec_u8_or_panic<T: TopEncode>(obj: &T) -> Vec<u8> {
 /// Do not use in smart contracts!
 pub fn dep_encode_to_vec_or_panic<T: NestedEncode>(obj: &T) -> Vec<u8> {
     let mut bytes = Vec::<u8>::new();
-    match obj.dep_encode_or_handle_err(&mut bytes, PanicErrorHandler) {
-        Ok(_) => {},
-        Err(err) => panic!("panic occured: {:#?}", err),
-    };
+    obj.dep_encode_or_handle_err(&mut bytes, PanicErrorHandler)
+        .unwrap_infallible();
     bytes
 }
 
@@ -47,21 +44,14 @@ pub fn check_dep_encode<T: NestedEncode>(obj: &T) -> Vec<u8> {
 /// Calls nested decode and panics if an encoding error occurs.
 /// Do not use in smart contracts!
 pub fn dep_decode_from_byte_slice_or_panic<T: NestedDecode>(input: &[u8]) -> T {
-    match dep_decode_from_byte_slice(input, PanicErrorHandler) {
-        Ok(result) => result,
-        Err(err) => panic!("panic occured: {:#?}", err),
-    }
+    dep_decode_from_byte_slice(input, PanicErrorHandler).unwrap_infallible()
 }
 
 /// Calls both the fast exit and the regular top-decode,
 /// compares that the outputs are equal, then returns the result.
 /// To be used in serialization tests.
 pub fn check_top_decode<T: TopDecode + PartialEq + Debug>(bytes: &[u8]) -> T {
-    let fast_exit_obj = match T::top_decode_or_handle_err(bytes, PanicErrorHandler) {
-        Ok(val) => val,
-        Err(err) => panic!("panic occured: {:#?}", err),
-    };
-
+    let fast_exit_obj = T::top_decode_or_handle_err(bytes, PanicErrorHandler).unwrap_infallible();
     let result_obj = T::top_decode_or_handle_err(bytes, DefaultErrorHandler).unwrap();
     assert_eq!(fast_exit_obj, result_obj);
     fast_exit_obj
@@ -71,11 +61,7 @@ pub fn check_top_decode<T: TopDecode + PartialEq + Debug>(bytes: &[u8]) -> T {
 /// compares that the outputs are equal, then returns the result.
 /// To be used in serialization tests.
 pub fn check_dep_decode<T: NestedDecode + PartialEq + Debug>(bytes: &[u8]) -> T {
-    let fast_exit_obj = match dep_decode_from_byte_slice(bytes, PanicErrorHandler) {
-        Ok(val) => val,
-        Err(err) => panic!("panic occured: {:#?}", err),
-    };
-
+    let fast_exit_obj = dep_decode_from_byte_slice(bytes, PanicErrorHandler).unwrap_infallible();
     let result_obj = dep_decode_from_byte_slice(bytes, DefaultErrorHandler).unwrap();
     assert_eq!(fast_exit_obj, result_obj);
     fast_exit_obj
diff --git a/framework/base/Cargo.toml b/framework/base/Cargo.toml
index ad2b6e260c..70c27f3db0 100644
--- a/framework/base/Cargo.toml
+++ b/framework/base/Cargo.toml
@@ -25,6 +25,7 @@ esdt-token-payment-legacy-decode = []
 hex-literal = "=0.4.1"
 bitflags = "=2.4.2"
 num-traits = { version = "=0.2.17", default-features = false }
+unwrap-infallible = "0.1.5"
 
 [dependencies.multiversx-sc-derive]
 version = "=0.47.5"
diff --git a/framework/base/src/contract_base/wrappers/serializer.rs b/framework/base/src/contract_base/wrappers/serializer.rs
index 2c4ce1ef49..ee2dace3ca 100644
--- a/framework/base/src/contract_base/wrappers/serializer.rs
+++ b/framework/base/src/contract_base/wrappers/serializer.rs
@@ -1,4 +1,6 @@
-use core::marker::PhantomData;
+use core::{convert::Infallible, marker::PhantomData};
+
+use unwrap_infallible::UnwrapInfallible;
 
 use crate::codec::{
     DecodeError, DecodeErrorHandler, EncodeError, EncodeErrorHandler, TopDecode, TopEncode,
@@ -7,7 +9,6 @@ use crate::codec::{
 use crate::{
     api::{ErrorApi, ErrorApiImpl, ManagedTypeApi},
     err_msg,
-    imports::Never,
     types::{heap::BoxedBytes, ManagedBuffer, ManagedType},
 };
 
@@ -31,25 +32,23 @@ where
 
     pub fn top_encode_to_managed_buffer<T: TopEncode>(&self, value: &T) -> ManagedBuffer<M> {
         let mut result = ManagedBuffer::new();
-        match value.top_encode_or_handle_err(
-            &mut result,
-            ExitCodecErrorHandler::<M>::from(err_msg::SERIALIZER_ENCODE_ERROR),
-        ) {
-            Ok(_) => {},
-            Err(err) => panic!("panic occured: {:#?}", err),
-        };
+        value
+            .top_encode_or_handle_err(
+                &mut result,
+                ExitCodecErrorHandler::<M>::from(err_msg::SERIALIZER_ENCODE_ERROR),
+            )
+            .unwrap_infallible();
         result
     }
 
     pub fn top_encode_to_boxed_bytes<T: TopEncode>(&self, value: &T) -> BoxedBytes {
         let mut result = BoxedBytes::empty();
-        match value.top_encode_or_handle_err(
-            &mut result,
-            ExitCodecErrorHandler::<M>::from(err_msg::SERIALIZER_ENCODE_ERROR),
-        ) {
-            Ok(_) => {},
-            Err(err) => panic!("panic occured: {:#?}", err),
-        };
+        value
+            .top_encode_or_handle_err(
+                &mut result,
+                ExitCodecErrorHandler::<M>::from(err_msg::SERIALIZER_ENCODE_ERROR),
+            )
+            .unwrap_infallible();
         result
     }
 
@@ -62,23 +61,19 @@ where
         buffer: &ManagedBuffer<M>,
         error_message: &'static [u8],
     ) -> T {
-        match T::top_decode_or_handle_err(
+        T::top_decode_or_handle_err(
             buffer.clone(), // TODO: remove clone
             ExitCodecErrorHandler::<M>::from(error_message),
-        ) {
-            Ok(value) => value,
-            Err(err) => panic!("panic occured: {:#?}", err),
-        }
+        )
+        .unwrap_infallible()
     }
 
     pub fn top_decode_from_byte_slice<T: TopDecode>(&self, slice: &[u8]) -> T {
-        match T::top_decode_or_handle_err(
+        T::top_decode_or_handle_err(
             slice,
             ExitCodecErrorHandler::<M>::from(err_msg::SERIALIZER_DECODE_ERROR),
-        ) {
-            Ok(value) => value,
-            Err(err) => panic!("panic occured: {:#?}", err),
-        }
+        )
+        .unwrap_infallible()
     }
 }
 
@@ -109,7 +104,7 @@ impl<M> EncodeErrorHandler for ExitCodecErrorHandler<M>
 where
     M: ManagedTypeApi + ErrorApi,
 {
-    type HandledErr = Never;
+    type HandledErr = Infallible;
 
     fn handle_error(&self, err: EncodeError) -> Self::HandledErr {
         let mut message_buffer = ManagedBuffer::<M>::new_from_bytes(self.base_message);
@@ -122,7 +117,7 @@ impl<M> DecodeErrorHandler for ExitCodecErrorHandler<M>
 where
     M: ManagedTypeApi + ErrorApi,
 {
-    type HandledErr = Never;
+    type HandledErr = Infallible;
 
     fn handle_error(&self, err: DecodeError) -> Self::HandledErr {
         let mut message_buffer = ManagedBuffer::<M>::new_from_bytes(self.base_message);
diff --git a/framework/base/src/contract_base/wrappers/storage_raw_wrapper.rs b/framework/base/src/contract_base/wrappers/storage_raw_wrapper.rs
index e934d6477d..5a4992c36e 100644
--- a/framework/base/src/contract_base/wrappers/storage_raw_wrapper.rs
+++ b/framework/base/src/contract_base/wrappers/storage_raw_wrapper.rs
@@ -1,5 +1,7 @@
 use core::marker::PhantomData;
 
+use unwrap_infallible::UnwrapInfallible;
+
 use crate::codec::{TopDecode, TopEncode};
 
 use crate::{
@@ -63,10 +65,8 @@ where
             result_buffer.get_handle(),
         );
 
-        match V::top_decode_or_handle_err(result_buffer, StorageGetErrorHandler::<A>::default()) {
-            Ok(value) => value,
-            Err(err) => panic!("panic occured: {:#?}", err),
-        }
+        V::top_decode_or_handle_err(result_buffer, StorageGetErrorHandler::<A>::default())
+            .unwrap_infallible()
     }
 
     /// Write a serializable value to storage under the given key
diff --git a/framework/base/src/formatter/formatter_traits.rs b/framework/base/src/formatter/formatter_traits.rs
index cbabc27f8c..11a24baf96 100644
--- a/framework/base/src/formatter/formatter_traits.rs
+++ b/framework/base/src/formatter/formatter_traits.rs
@@ -1,3 +1,5 @@
+use unwrap_infallible::UnwrapInfallible;
+
 use crate::codec::TopEncode;
 
 use crate::{
@@ -90,14 +92,11 @@ pub trait SCCodec {
 impl<T: TopEncode> SCCodec for T {
     fn fmt<F: FormatByteReceiver>(&self, f: &mut F) {
         let mut encoded = ManagedBuffer::<F::Api>::new();
-
-        match self.top_encode_or_handle_err(
+        self.top_encode_or_handle_err(
             &mut encoded,
             ExitCodecErrorHandler::<F::Api>::from(err_msg::FORMATTER_ENCODE_ERROR),
-        ) {
-            Ok(_) => {},
-            Err(err) => panic!("panic occured: {:#?}", err),
-        };
+        )
+        .unwrap_infallible();
         SCLowerHex::fmt(&encoded, f);
     }
 }
diff --git a/framework/base/src/io/arg_error_handler.rs b/framework/base/src/io/arg_error_handler.rs
index b750f106f1..10b3fa2560 100644
--- a/framework/base/src/io/arg_error_handler.rs
+++ b/framework/base/src/io/arg_error_handler.rs
@@ -1,4 +1,4 @@
-use core::marker::PhantomData;
+use core::{convert::Infallible, marker::PhantomData};
 
 use crate::{
     api::{ErrorApi, ManagedTypeApi},
@@ -29,14 +29,11 @@ where
     }
 }
 
-#[derive(Debug)]
-pub enum Never {}
-
 impl<M> DecodeErrorHandler for ArgErrorHandler<M>
 where
     M: ManagedTypeApi + ErrorApi,
 {
-    type HandledErr = Never;
+    type HandledErr = Infallible;
 
     #[inline(always)]
     fn handle_error(&self, err: DecodeError) -> Self::HandledErr {
diff --git a/framework/base/src/io/arg_nested_tuple.rs b/framework/base/src/io/arg_nested_tuple.rs
index 5caecd9b4c..fca34c9886 100644
--- a/framework/base/src/io/arg_nested_tuple.rs
+++ b/framework/base/src/io/arg_nested_tuple.rs
@@ -1,3 +1,5 @@
+use unwrap_infallible::UnwrapInfallible;
+
 use super::{EndpointDynArgLoader, EndpointSingleArgLoader, ManagedResultArgLoader};
 use crate::{
     api::{
@@ -71,10 +73,7 @@ where
 {
     let mut arg_loader = EndpointSingleArgLoader::<AA>::new(index);
     let h = ArgErrorHandler::<AA>::from(arg_id);
-    match T::multi_decode_or_handle_err(&mut arg_loader, h) {
-        Ok(value) => value,
-        Err(err) => panic!("panic occured: {:#?}", err),
-    }
+    T::multi_decode_or_handle_err(&mut arg_loader, h).unwrap_infallible()
 }
 
 #[inline(never)]
@@ -85,10 +84,7 @@ where
     T: TopDecodeMulti,
 {
     let h = ArgErrorHandler::<AA>::from(arg_id);
-    match T::multi_decode_or_handle_err(loader, h) {
-        Ok(value) => value,
-        Err(err) => panic!("panic occured: {:#?}", err),
-    }
+    T::multi_decode_or_handle_err(loader, h).unwrap_infallible()
 }
 
 /// Models an argument tree of the form `(arg1, (arg2, ... (argn, ())))`, used for retrieving endpoint arguments.
diff --git a/framework/base/src/io/finish.rs b/framework/base/src/io/finish.rs
index 6842d63bb5..f7f3f402af 100644
--- a/framework/base/src/io/finish.rs
+++ b/framework/base/src/io/finish.rs
@@ -1,5 +1,7 @@
 use core::marker::PhantomData;
 
+use unwrap_infallible::UnwrapInfallible;
+
 use crate::codec::{EncodeErrorHandler, TopEncodeMulti, TopEncodeMultiOutput, TryStaticCast};
 
 use crate::{
@@ -20,10 +22,8 @@ where
 {
     let h = ExitCodecErrorHandler::<FA>::from(err_msg::FINISH_ENCODE_ERROR);
     let mut output = ApiOutputAdapter::<FA>::default();
-    match item.multi_encode_or_handle_err(&mut output, h) {
-        Ok(_) => {},
-        Err(err) => panic!("panic occured: {:#?}", err),
-    }
+    item.multi_encode_or_handle_err(&mut output, h)
+        .unwrap_infallible()
 }
 
 #[derive(Clone)]
diff --git a/framework/base/src/log_util.rs b/framework/base/src/log_util.rs
index 9a01f2af03..0cca3bc2a2 100644
--- a/framework/base/src/log_util.rs
+++ b/framework/base/src/log_util.rs
@@ -1,3 +1,5 @@
+use unwrap_infallible::UnwrapInfallible;
+
 use crate::codec::{TopEncode, TopEncodeMulti};
 
 use crate::{
@@ -21,13 +23,12 @@ where
     A: ErrorApi + ManagedTypeApi,
     T: TopEncodeMulti,
 {
-    match topic.multi_encode_or_handle_err(
-        accumulator,
-        ExitCodecErrorHandler::<A>::from(err_msg::LOG_TOPIC_ENCODE_ERROR),
-    ) {
-        Ok(_) => {},
-        Err(err) => panic!("panic occured: {:#?}", err),
-    }
+    topic
+        .multi_encode_or_handle_err(
+            accumulator,
+            ExitCodecErrorHandler::<A>::from(err_msg::LOG_TOPIC_ENCODE_ERROR),
+        )
+        .unwrap_infallible();
 }
 
 pub fn serialize_log_data<T, A>(data: T) -> ManagedBuffer<A>
@@ -36,13 +37,11 @@ where
     A: ErrorApi + ManagedTypeApi,
 {
     let mut data_buffer = ManagedBuffer::new();
-    match data.top_encode_or_handle_err(
+    data.top_encode_or_handle_err(
         &mut data_buffer,
         ExitCodecErrorHandler::<A>::from(err_msg::LOG_DATA_ENCODE_ERROR),
-    ) {
-        Ok(_) => {},
-        Err(err) => panic!("panic occured: {:#?}", err),
-    };
+    )
+    .unwrap_infallible();
     data_buffer
 }
 
diff --git a/framework/base/src/storage/storage_get.rs b/framework/base/src/storage/storage_get.rs
index 2d68925846..9f46ddb27d 100644
--- a/framework/base/src/storage/storage_get.rs
+++ b/framework/base/src/storage/storage_get.rs
@@ -1,4 +1,4 @@
-use core::marker::PhantomData;
+use core::{convert::Infallible, marker::PhantomData};
 
 use crate::{
     api::{
@@ -7,12 +7,12 @@ use crate::{
     },
     codec::*,
     err_msg,
-    imports::Never,
     types::{
         BigInt, BigUint, ManagedBuffer, ManagedBufferNestedDecodeInput, ManagedRef, ManagedType,
     },
 };
 use alloc::boxed::Box;
+use unwrap_infallible::UnwrapInfallible;
 
 use super::StorageKey;
 
@@ -114,14 +114,11 @@ where
     T: TopDecode,
     A: StorageReadApi + ManagedTypeApi + ErrorApi,
 {
-    let value = match T::top_decode_or_handle_err(
+    T::top_decode_or_handle_err(
         StorageGetInput::new(key),
         StorageGetErrorHandler::<A>::default(),
-    ) {
-        Ok(val) => val,
-        Err(err) => panic!("panic occured: {:#?}", err),
-    };
-    value
+    )
+    .unwrap_infallible()
 }
 
 /// Useful for storage mappers.
@@ -162,7 +159,7 @@ impl<M> DecodeErrorHandler for StorageGetErrorHandler<M>
 where
     M: ManagedTypeApi + ErrorApi,
 {
-    type HandledErr = Never;
+    type HandledErr = Infallible;
 
     fn handle_error(&self, err: DecodeError) -> Self::HandledErr {
         let mut message_buffer = ManagedBuffer::<M>::new_from_bytes(err_msg::STORAGE_DECODE_ERROR);
diff --git a/framework/base/src/storage/storage_get_from_address.rs b/framework/base/src/storage/storage_get_from_address.rs
index 44be1896f0..ee569c9378 100644
--- a/framework/base/src/storage/storage_get_from_address.rs
+++ b/framework/base/src/storage/storage_get_from_address.rs
@@ -10,6 +10,7 @@ use crate::{
     },
 };
 use alloc::boxed::Box;
+use unwrap_infallible::UnwrapInfallible;
 
 use super::{StorageGetErrorHandler, StorageKey};
 
@@ -126,14 +127,11 @@ where
     T: TopDecode,
     A: StorageReadApi + ManagedTypeApi + ErrorApi,
 {
-    let value = match T::top_decode_or_handle_err(
+    T::top_decode_or_handle_err(
         StorageGetFromAddressInput::new(addr, key),
         StorageGetErrorHandler::<A>::default(),
-    ) {
-        Ok(val) => val,
-        Err(err) => panic!("panic occured: {:#?}", err),
-    };
-    value
+    )
+    .unwrap_infallible()
 }
 
 /// Useful for storage mappers.
diff --git a/framework/base/src/storage/storage_key.rs b/framework/base/src/storage/storage_key.rs
index addd91859d..b56358218b 100644
--- a/framework/base/src/storage/storage_key.rs
+++ b/framework/base/src/storage/storage_key.rs
@@ -1,3 +1,5 @@
+use unwrap_infallible::UnwrapInfallible;
+
 use crate::{
     api::{ErrorApi, ManagedTypeApi},
     codec::*,
@@ -60,13 +62,11 @@ where
     where
         T: NestedEncode,
     {
-        match item.dep_encode_or_handle_err(
+        item.dep_encode_or_handle_err(
             &mut self.buffer,
             ExitCodecErrorHandler::<A>::from(err_msg::STORAGE_KEY_ENCODE_ERROR),
-        ) {
-            Ok(_) => {},
-            Err(err) => panic!("panic occured: {:#?}", err),
-        }
+        )
+        .unwrap_infallible()
     }
 
     #[inline]
diff --git a/framework/base/src/storage/storage_set.rs b/framework/base/src/storage/storage_set.rs
index 30381f3e89..f6e6f6ef28 100644
--- a/framework/base/src/storage/storage_set.rs
+++ b/framework/base/src/storage/storage_set.rs
@@ -1,3 +1,5 @@
+use unwrap_infallible::UnwrapInfallible;
+
 use crate::{
     api::{
         const_handles, use_raw_handle, ErrorApi, ManagedBufferApiImpl, ManagedTypeApi,
@@ -85,13 +87,12 @@ where
     T: TopEncode,
     A: StorageWriteApi + ManagedTypeApi + ErrorApi,
 {
-    match value.top_encode_or_handle_err(
-        StorageSetOutput::new(key),
-        ExitCodecErrorHandler::<A>::from(err_msg::STORAGE_ENCODE_ERROR),
-    ) {
-        Ok(_) => {},
-        Err(err) => panic!("panic occured: {:#?}", err),
-    }
+    value
+        .top_encode_or_handle_err(
+            StorageSetOutput::new(key),
+            ExitCodecErrorHandler::<A>::from(err_msg::STORAGE_ENCODE_ERROR),
+        )
+        .unwrap_infallible()
 }
 
 /// Useful for storage mappers.
diff --git a/framework/base/src/types/interaction/callback_closure.rs b/framework/base/src/types/interaction/callback_closure.rs
index e1f748228b..8022c3bdf6 100644
--- a/framework/base/src/types/interaction/callback_closure.rs
+++ b/framework/base/src/types/interaction/callback_closure.rs
@@ -1,3 +1,5 @@
+use unwrap_infallible::UnwrapInfallible;
+
 use crate::{
     api::{BlockchainApi, ErrorApi, ManagedTypeApi, StorageReadApi, StorageWriteApi},
     codec::{
@@ -52,10 +54,9 @@ impl<M: ManagedTypeApi + ErrorApi> CallbackClosure<M> {
 
     pub fn push_endpoint_arg<T: TopEncodeMulti>(&mut self, endpoint_arg: &T) {
         let h = ExitCodecErrorHandler::<M>::from(err_msg::CONTRACT_CALL_ENCODE_ERROR);
-        match endpoint_arg.multi_encode_or_handle_err(&mut self.closure_args, h) {
-            Ok(_) => {},
-            Err(err) => panic!("panic occured: {:#?}", err),
-        }
+        endpoint_arg
+            .multi_encode_or_handle_err(&mut self.closure_args, h)
+            .unwrap_infallible()
     }
 
     pub fn save_to_storage<A: BlockchainApi + StorageWriteApi>(&self) {
diff --git a/framework/base/src/types/interaction/contract_call_exec.rs b/framework/base/src/types/interaction/contract_call_exec.rs
index b6790206b7..a285951ef8 100644
--- a/framework/base/src/types/interaction/contract_call_exec.rs
+++ b/framework/base/src/types/interaction/contract_call_exec.rs
@@ -1,3 +1,5 @@
+use unwrap_infallible::UnwrapInfallible;
+
 use crate::{
     api::{use_raw_handle, StaticVarApiImpl},
     codec::TopDecodeMulti,
@@ -226,8 +228,5 @@ where
     let mut loader = ManagedResultArgLoader::new(raw_result);
     let arg_id = ArgId::from(&b"sync result"[..]);
     let h: ArgErrorHandler<SA> = ArgErrorHandler::<SA>::from(arg_id);
-    match RequestedResult::multi_decode_or_handle_err(&mut loader, h) {
-        Ok(result) => result,
-        Err(err) => panic!("panic occured: {:#?}", err),
-    }
+    RequestedResult::multi_decode_or_handle_err(&mut loader, h).unwrap_infallible()
 }
diff --git a/framework/base/src/types/interaction/contract_deploy.rs b/framework/base/src/types/interaction/contract_deploy.rs
index 7ae893d2a0..c8dcfd1a87 100644
--- a/framework/base/src/types/interaction/contract_deploy.rs
+++ b/framework/base/src/types/interaction/contract_deploy.rs
@@ -1,5 +1,7 @@
 use core::marker::PhantomData;
 
+use unwrap_infallible::UnwrapInfallible;
+
 use crate::codec::{CodecFrom, TopEncodeMulti};
 
 use crate::{
@@ -82,10 +84,9 @@ where
 
     pub fn push_endpoint_arg<T: TopEncodeMulti>(&mut self, endpoint_arg: &T) {
         let h = ExitCodecErrorHandler::<SA>::from(err_msg::CONTRACT_CALL_ENCODE_ERROR);
-        match endpoint_arg.multi_encode_or_handle_err(&mut self.arg_buffer, h) {
-            Ok(_) => {},
-            Err(err) => panic!("panic occured: {:#?}", err),
-        }
+        endpoint_arg
+            .multi_encode_or_handle_err(&mut self.arg_buffer, h)
+            .unwrap_infallible()
     }
 
     fn resolve_gas_limit(&self) -> u64 {
@@ -111,10 +112,7 @@ where
         let mut loader = ManagedResultArgLoader::new(raw_result);
         let arg_id = ArgId::from(&b"init result"[..]);
         let h = ArgErrorHandler::<SA>::from(arg_id);
-        match RequestedResult::multi_decode_or_handle_err(&mut loader, h) {
-            Ok(result) => result,
-            Err(err) => panic!("panic occured: {:#?}", err),
-        }
+        RequestedResult::multi_decode_or_handle_err(&mut loader, h).unwrap_infallible()
     }
 
     /// Executes immediately, synchronously, and returns Some(Address) of the deployed contract.  
diff --git a/framework/base/src/types/interaction/managed_arg_buffer.rs b/framework/base/src/types/interaction/managed_arg_buffer.rs
index 30c2ea54f3..8cb70c561e 100644
--- a/framework/base/src/types/interaction/managed_arg_buffer.rs
+++ b/framework/base/src/types/interaction/managed_arg_buffer.rs
@@ -15,6 +15,7 @@ use crate::{
 };
 use alloc::vec::Vec;
 use multiversx_sc_codec::TopEncodeMulti;
+use unwrap_infallible::UnwrapInfallible;
 
 #[derive(Debug, Default, Clone)]
 #[repr(transparent)]
@@ -180,22 +181,17 @@ where
 {
     pub fn push_arg<T: TopEncode>(&mut self, arg: T) {
         let mut encoded_buffer = ManagedBuffer::new();
-        match arg.top_encode_or_handle_err(
+        arg.top_encode_or_handle_err(
             &mut encoded_buffer,
             ExitCodecErrorHandler::<M>::from(err_msg::CONTRACT_CALL_ENCODE_ERROR),
-        ) {
-            Ok(_) => {},
-            Err(err) => panic!("panic occured: {:#?}", err),
-        };
+        )
+        .unwrap_infallible();
         self.push_arg_raw(encoded_buffer);
     }
 
     pub fn push_multi_arg<T: TopEncodeMulti>(&mut self, arg: &T) {
         let h = ExitCodecErrorHandler::<M>::from(err_msg::CONTRACT_CALL_ENCODE_ERROR);
-        match arg.multi_encode_or_handle_err(self, h) {
-            Ok(_) => {},
-            Err(err) => panic!("panic occured: {:#?}", err),
-        }
+        arg.multi_encode_or_handle_err(self, h).unwrap_infallible();
     }
 }
 
@@ -285,10 +281,7 @@ where
     pub fn serialize_overwrite(&self, dest: &mut ManagedBuffer<M>) {
         dest.overwrite(&[]);
         let h = ExitCodecErrorHandler::<M>::from(err_msg::SERIALIZER_ENCODE_ERROR);
-        match self.top_encode_or_handle_err(dest, h) {
-            Ok(_) => {},
-            Err(err) => panic!("panic occured: {:#?}", err),
-        }
+        self.top_encode_or_handle_err(dest, h).unwrap_infallible()
     }
 
     /// Deserializes self from a managed buffer in-place, without creating a new handle.
@@ -298,10 +291,8 @@ where
         self.clear();
         let mut nested_de_input = ManagedBufferNestedDecodeInput::new(source);
         while nested_de_input.remaining_len() > 0 {
-            let item = match ManagedBuffer::dep_decode_or_handle_err(&mut nested_de_input, h) {
-                Ok(val) => val,
-                Err(err) => panic!("panic occured: {:#?}", err),
-            };
+            let item = ManagedBuffer::dep_decode_or_handle_err(&mut nested_de_input, h)
+                .unwrap_infallible();
             self.push_arg_raw(item);
         }
     }
diff --git a/framework/base/src/types/io/sc_error_static.rs b/framework/base/src/types/io/sc_error_static.rs
index 6569715131..176fb86162 100644
--- a/framework/base/src/types/io/sc_error_static.rs
+++ b/framework/base/src/types/io/sc_error_static.rs
@@ -1,9 +1,6 @@
 use crate::codec::{self, DecodeError, EncodeError, TopEncodeMulti, TryStaticCast};
 
-use crate::{
-    api::{EndpointFinishApi, ErrorApiImpl},
-    imports::Never,
-};
+use crate::api::{EndpointFinishApi, ErrorApiImpl};
 
 use super::SCError;
 
@@ -57,12 +54,6 @@ impl From<DecodeError> for StaticSCError {
     }
 }
 
-impl From<Never> for StaticSCError {
-    fn from(_: Never) -> Self {
-        unreachable!()
-    }
-}
-
 impl TopEncodeMulti for StaticSCError {
     fn multi_encode_or_handle_err<O, H>(&self, output: &mut O, h: H) -> Result<(), H::HandledErr>
     where
diff --git a/framework/base/src/types/managed/multi_value/multi_value_encoded.rs b/framework/base/src/types/managed/multi_value/multi_value_encoded.rs
index e32165b554..751a606caf 100644
--- a/framework/base/src/types/managed/multi_value/multi_value_encoded.rs
+++ b/framework/base/src/types/managed/multi_value/multi_value_encoded.rs
@@ -1,3 +1,5 @@
+use unwrap_infallible::UnwrapInfallible;
+
 use crate::{
     abi::{TypeAbi, TypeDescriptionContainer, TypeName},
     api::{ErrorApi, ManagedTypeApi},
@@ -68,13 +70,11 @@ where
     T: TopEncodeMulti,
 {
     pub fn push(&mut self, item: T) {
-        match item.multi_encode_or_handle_err(
+        item.multi_encode_or_handle_err(
             &mut self.raw_buffers,
             ExitCodecErrorHandler::<M>::from(err_msg::SERIALIZER_ENCODE_ERROR),
-        ) {
-            Ok(_) => {},
-            Err(err) => panic!("panic occured: {:#?}", err),
-        }
+        )
+        .unwrap_infallible()
     }
 }
 
diff --git a/framework/base/src/types/managed/multi_value/multi_value_encoded_iter.rs b/framework/base/src/types/managed/multi_value/multi_value_encoded_iter.rs
index e0e9b1a5e5..8a88ffeef7 100644
--- a/framework/base/src/types/managed/multi_value/multi_value_encoded_iter.rs
+++ b/framework/base/src/types/managed/multi_value/multi_value_encoded_iter.rs
@@ -1,5 +1,7 @@
 use core::marker::PhantomData;
 
+use unwrap_infallible::UnwrapInfallible;
+
 use crate::codec::{TopDecodeMulti, TopDecodeMultiInput};
 
 use crate::{
@@ -54,10 +56,8 @@ where
         if self.data_loader.has_next() {
             let arg_id = ArgId::from(&b"var args"[..]);
             let h = ArgErrorHandler::<M>::from(arg_id);
-            let result = match T::multi_decode_or_handle_err(&mut self.data_loader, h) {
-                Ok(val) => val,
-                Err(err) => panic!("panic occured: {:#?}", err),
-            };
+            let result =
+                T::multi_decode_or_handle_err(&mut self.data_loader, h).unwrap_infallible();
             Some(result)
         } else {
             None
diff --git a/framework/base/src/types/managed/wrapped/esdt_token_data.rs b/framework/base/src/types/managed/wrapped/esdt_token_data.rs
index ac44045e25..60b2b3178e 100644
--- a/framework/base/src/types/managed/wrapped/esdt_token_data.rs
+++ b/framework/base/src/types/managed/wrapped/esdt_token_data.rs
@@ -1,4 +1,5 @@
 use multiversx_sc_derive::ManagedVecItem;
+use unwrap_infallible::UnwrapInfallible;
 
 use crate::{
     api::ManagedTypeApi,
@@ -53,12 +54,10 @@ impl<M: ManagedTypeApi> EsdtTokenData<M> {
     }
 
     pub fn decode_attributes<T: TopDecode>(&self) -> T {
-        match T::top_decode_or_handle_err(
+        T::top_decode_or_handle_err(
             self.attributes.clone(), // TODO: remove clone
             ExitCodecErrorHandler::<M>::from(DECODE_ATTRIBUTE_ERROR_PREFIX),
-        ) {
-            Ok(value) => value,
-            Err(err) => panic!("panic occured: {:#?}", err),
-        }
+        )
+        .unwrap_infallible()
     }
 }
diff --git a/framework/scenario/Cargo.toml b/framework/scenario/Cargo.toml
index 560cf08281..ea810a231c 100644
--- a/framework/scenario/Cargo.toml
+++ b/framework/scenario/Cargo.toml
@@ -31,6 +31,7 @@ itertools = "0.12.0"
 colored = "2.0"
 clap = { version = "4.4.7", features = ["derive"] }
 tokio = { version = "1.24", features = ["full"] }
+unwrap-infallible = "0.1.5"
 
 [[bin]]
 name = "sc-scenario"
diff --git a/framework/scenario/src/scenario/model/step/sc_call_step.rs b/framework/scenario/src/scenario/model/step/sc_call_step.rs
index cf9d2b4026..dc12d33212 100644
--- a/framework/scenario/src/scenario/model/step/sc_call_step.rs
+++ b/framework/scenario/src/scenario/model/step/sc_call_step.rs
@@ -1,4 +1,5 @@
 use multiversx_sc::types::H256;
+use unwrap_infallible::UnwrapInfallible;
 
 use crate::{
     api::StaticApi,
@@ -255,10 +256,8 @@ pub fn convert_call_args(arg_buffer: &ManagedArgBuffer<StaticApi>) -> Vec<String
 
 pub(super) fn format_expect<T: TopEncodeMulti>(t: T) -> TxExpect {
     let mut encoded = Vec::<Vec<u8>>::new();
-    match t.multi_encode_or_handle_err(&mut encoded, PanicErrorHandler) {
-        Ok(_) => {},
-        Err(err) => panic!("panic occured: {:#?}", err),
-    };
+    t.multi_encode_or_handle_err(&mut encoded, PanicErrorHandler)
+        .unwrap_infallible();
     let mut expect = TxExpect::ok().no_result();
     for encoded_res in encoded {
         let encoded_hex_string = format!("0x{}", hex::encode(encoded_res.as_slice()));
diff --git a/framework/scenario/src/scenario/model/transaction/typed_response.rs b/framework/scenario/src/scenario/model/transaction/typed_response.rs
index 2ab7823c92..a25974a1b8 100644
--- a/framework/scenario/src/scenario/model/transaction/typed_response.rs
+++ b/framework/scenario/src/scenario/model/transaction/typed_response.rs
@@ -1,5 +1,6 @@
 use super::{Log, TxResponse, TxResponseStatus};
 use multiversx_sc::codec::{PanicErrorHandler, TopDecodeMulti};
+use unwrap_infallible::UnwrapInfallible;
 
 pub struct TypedResponse<T>
 where
@@ -19,10 +20,8 @@ where
     pub fn from_raw(raw_response: &TxResponse) -> Self {
         let result: Result<T, TxResponseStatus> = if raw_response.tx_error.is_success() {
             let mut result_raw = raw_response.out.clone();
-            let decoded = match T::multi_decode_or_handle_err(&mut result_raw, PanicErrorHandler) {
-                Ok(val) => val,
-                Err(err) => panic!("panic occured: {:#?}", err),
-            };
+            let decoded = T::multi_decode_or_handle_err(&mut result_raw, PanicErrorHandler)
+                .unwrap_infallible();
             Ok(decoded)
         } else {
             Err(raw_response.tx_error.clone())
diff --git a/framework/scenario/tests/hex_call_data_arg_load.rs b/framework/scenario/tests/hex_call_data_arg_load.rs
index 9b64f4565c..0001ceb799 100644
--- a/framework/scenario/tests/hex_call_data_arg_load.rs
+++ b/framework/scenario/tests/hex_call_data_arg_load.rs
@@ -7,21 +7,18 @@ use multiversx_sc::{
     HexCallDataDeserializer,
 };
 use multiversx_sc_scenario::api::StaticApi;
+use unwrap_infallible::UnwrapInfallible;
 
 #[test]
 fn test_simple_args() {
     let input: &[u8] = b"func@1111@2222";
     let mut de = HexCallDataDeserializer::new(input);
 
-    match i32::multi_decode_or_handle_err(&mut de, PanicErrorHandler) {
-        Ok(arg1) => assert_eq!(arg1, 0x1111i32),
-        Err(err) => panic!("panic occured: {:#?}", err),
-    }
+    let arg1 = i32::multi_decode_or_handle_err(&mut de, PanicErrorHandler).unwrap_infallible();
+    assert_eq!(arg1, 0x1111i32);
 
-    match i32::multi_decode_or_handle_err(&mut de, PanicErrorHandler) {
-        Ok(arg2) => assert_eq!(arg2, 0x2222i32),
-        Err(err) => panic!("panic occured: {:#?}", err),
-    }
+    let arg2 = i32::multi_decode_or_handle_err(&mut de, PanicErrorHandler).unwrap_infallible();
+    assert_eq!(arg2, 0x2222i32);
 
     de.assert_no_more_args(PanicErrorHandler).unwrap();
 }
@@ -31,10 +28,9 @@ fn test_simple_managed_arg() {
     let input: &[u8] = b"some_other_func@05";
     let mut de = HexCallDataDeserializer::new(input);
 
-    match BigUint::<StaticApi>::multi_decode_or_handle_err(&mut de, PanicErrorHandler) {
-        Ok(arg1) => assert_eq!(arg1, BigUint::from(5u32)),
-        Err(err) => panic!("panic occured: {:#?}", err),
-    }
+    let arg1 = BigUint::<StaticApi>::multi_decode_or_handle_err(&mut de, PanicErrorHandler)
+        .unwrap_infallible();
+    assert_eq!(arg1, BigUint::from(5u32));
 
     de.assert_no_more_args(PanicErrorHandler).unwrap();
 }
@@ -44,10 +40,9 @@ fn test_simple_vec_arg() {
     let input: &[u8] = b"some_other_func@000000020000000300000006";
     let mut de = HexCallDataDeserializer::new(input);
 
-    match Vec::<usize>::multi_decode_or_handle_err(&mut de, PanicErrorHandler) {
-        Ok(arg1) => assert_eq!(arg1, [2usize, 3usize, 6usize].to_vec()),
-        Err(err) => panic!("panic occured: {:#?}", err),
-    }
+    let arg1 =
+        Vec::<usize>::multi_decode_or_handle_err(&mut de, PanicErrorHandler).unwrap_infallible();
+    assert_eq!(arg1, [2usize, 3usize, 6usize].to_vec());
 
     de.assert_no_more_args(PanicErrorHandler).unwrap();
 }
@@ -57,15 +52,13 @@ fn test_var_args() {
     let input: &[u8] = b"func@1111@2222";
     let mut de = HexCallDataDeserializer::new(input);
 
-    match MultiValueVec::<i32>::multi_decode_or_handle_err(&mut de, PanicErrorHandler) {
-        Ok(var_arg) => {
-            let arg_vec = var_arg.into_vec();
-            assert_eq!(arg_vec.len(), 2);
-            assert_eq!(arg_vec[0], 0x1111i32);
-            assert_eq!(arg_vec[1], 0x2222i32);
-        },
-        Err(err) => panic!("panic occured: {:#?}", err),
-    }
+    let var_arg = MultiValueVec::<i32>::multi_decode_or_handle_err(&mut de, PanicErrorHandler)
+        .unwrap_infallible();
+    let arg_vec = var_arg.into_vec();
+
+    assert_eq!(arg_vec.len(), 2);
+    assert_eq!(arg_vec[0], 0x1111i32);
+    assert_eq!(arg_vec[1], 0x2222i32);
 }
 
 #[test]
@@ -73,14 +66,12 @@ fn test_multi_arg_2() {
     let input: &[u8] = b"func@1111@2222";
     let mut de = HexCallDataDeserializer::new(input);
 
-    match MultiValue2::<i32, i32>::multi_decode_or_handle_err(&mut de, PanicErrorHandler) {
-        Ok(tuple_arg) => {
-            let tuple = tuple_arg.into_tuple();
-            assert_eq!(tuple.0, 0x1111i32);
-            assert_eq!(tuple.1, 0x2222i32);
-        },
-        Err(err) => panic!("panic occured: {:#?}", err),
-    }
+    let tuple_arg = MultiValue2::<i32, i32>::multi_decode_or_handle_err(&mut de, PanicErrorHandler)
+        .unwrap_infallible();
+    let tuple = tuple_arg.into_tuple();
+
+    assert_eq!(tuple.0, 0x1111i32);
+    assert_eq!(tuple.1, 0x2222i32);
 }
 
 #[test]
@@ -88,20 +79,20 @@ fn test_var_multi_arg_2() {
     let input: &[u8] = b"func@1111@2222";
     let mut de = HexCallDataDeserializer::new(input);
 
-    match MultiValueVec::<MultiValue2<i32, i32>>::multi_decode_or_handle_err(
+    let tuple_arg = MultiValueVec::<MultiValue2<i32, i32>>::multi_decode_or_handle_err(
         &mut de,
         PanicErrorHandler,
-    ) {
-        Ok(tuple_arg) => {
-            let tuple_vec = tuple_arg.into_vec();
-            assert_eq!(tuple_vec.len(), 1);
-            let mut iter = tuple_vec.into_iter();
-            let tuple = iter.next().unwrap().into_tuple();
-            assert_eq!(tuple.0, 0x1111i32);
-            assert_eq!(tuple.1, 0x2222i32);
-        },
-        Err(err) => panic!("panic occured: {:#?}", err),
-    }
+    )
+    .unwrap_infallible();
+    let tuple_vec = tuple_arg.into_vec();
+
+    assert_eq!(tuple_vec.len(), 1);
+
+    let mut iter = tuple_vec.into_iter();
+    let tuple = iter.next().unwrap().into_tuple();
+
+    assert_eq!(tuple.0, 0x1111i32);
+    assert_eq!(tuple.1, 0x2222i32);
 }
 
 #[test]
@@ -109,13 +100,11 @@ fn test_opt_multi_arg_2() {
     let input: &[u8] = b"func@1111@2222";
     let mut de = HexCallDataDeserializer::new(input);
 
-    let opt_tuple_arg = match OptionalValue::<MultiValue2<i32, i32>>::multi_decode_or_handle_err(
+    let opt_tuple_arg = OptionalValue::<MultiValue2<i32, i32>>::multi_decode_or_handle_err(
         &mut de,
         PanicErrorHandler,
-    ) {
-        Ok(arg) => arg,
-        Err(err) => panic!("panic occured: {:#?}", err),
-    };
+    )
+    .unwrap_infallible();
 
     match opt_tuple_arg {
         OptionalValue::Some(tuple_arg) => {
@@ -134,13 +123,11 @@ fn test_async_call_result_ok() {
     let input: &[u8] = b"func@@1111@2222";
     let mut de = HexCallDataDeserializer::new(input);
 
-    let acr = match AsyncCallResult::<MultiValue2<i32, i32>>::multi_decode_or_handle_err(
+    let acr = AsyncCallResult::<MultiValue2<i32, i32>>::multi_decode_or_handle_err(
         &mut de,
         PanicErrorHandler,
-    ) {
-        Ok(val) => val,
-        Err(err) => panic!("panic occured: {:#?}", err),
-    };
+    )
+    .unwrap_infallible();
 
     match acr {
         AsyncCallResult::Ok(tuple_arg) => {
@@ -159,14 +146,11 @@ fn test_async_call_result_ok2() {
     let input: &[u8] = b"func@00";
     let mut de = HexCallDataDeserializer::new(input);
 
-    let acr =
-        match AsyncCallResult::<MultiValueVec<MultiValue2<i32, i32>>>::multi_decode_or_handle_err(
-            &mut de,
-            PanicErrorHandler,
-        ) {
-            Ok(val) => val,
-            Err(err) => panic!("panic occured: {:#?}", err),
-        };
+    let acr = AsyncCallResult::<MultiValueVec<MultiValue2<i32, i32>>>::multi_decode_or_handle_err(
+        &mut de,
+        PanicErrorHandler,
+    )
+    .unwrap_infallible();
 
     match acr {
         AsyncCallResult::Ok(var_args) => {
@@ -183,13 +167,11 @@ fn test_async_call_result_err() {
     let input: &[u8] = b"func@0123@1111";
     let mut de = HexCallDataDeserializer::new(input);
 
-    let acr = match AsyncCallResult::<MultiValue2<i32, i32>>::multi_decode_or_handle_err(
+    let acr = AsyncCallResult::<MultiValue2<i32, i32>>::multi_decode_or_handle_err(
         &mut de,
         PanicErrorHandler,
-    ) {
-        Ok(val) => val,
-        Err(err) => panic!("panic occured: {:#?}", err),
-    };
+    )
+    .unwrap_infallible();
 
     match acr {
         AsyncCallResult::Ok(_) => {

From ba0e1550667bdeced0d4978dc5fef1248f0cb135 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Wed, 13 Mar 2024 16:32:37 +0100
Subject: [PATCH 0451/1254] panic into unreachable

---
 framework/base/src/types/io/sc_result.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/framework/base/src/types/io/sc_result.rs b/framework/base/src/types/io/sc_result.rs
index c4de593afc..2565956ed0 100644
--- a/framework/base/src/types/io/sc_result.rs
+++ b/framework/base/src/types/io/sc_result.rs
@@ -106,7 +106,7 @@ where
 {
     fn from_residual(residual: Result<convert::Infallible, FromErr>) -> Self {
         let e = match residual {
-            Ok(_) => panic!("residual is not error"),
+            Ok(_) => unreachable!(),
             Err(err) => err,
         };
         SCResult::Err(e.into())

From 6ff7b38e23c65b6753258fbad641ed2cd63dc34a Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Wed, 13 Mar 2024 20:01:41 +0200
Subject: [PATCH 0452/1254] change proxy name

---
 contracts/examples/adder/src/temp_proxy_v2.rs    | 10 +++++-----
 .../contract/generate_proxy/proxy_gen_main.rs    |  6 +++---
 .../generate_proxy/proxy_sc_functions_gen.rs     | 12 ++++++------
 .../generate_proxy/proxy_template_gen.rs         | 16 ++++++++--------
 4 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/contracts/examples/adder/src/temp_proxy_v2.rs b/contracts/examples/adder/src/temp_proxy_v2.rs
index 2d7a9b4c76..370df8324b 100644
--- a/contracts/examples/adder/src/temp_proxy_v2.rs
+++ b/contracts/examples/adder/src/temp_proxy_v2.rs
@@ -15,14 +15,14 @@ where
     To: TxTo<Env>,
     Gas: TxGas<Env>,
 {
-    type TxProxyMethods = TxProxyMethods<Env, From, To, Gas>;
+    type TxProxyMethods = TxAdderMethods<Env, From, To, Gas>;
 
     fn prepare_methods(self, tx: Tx<Env, From, To, (), Gas, (), ()>) -> Self::TxProxyMethods {
-        TxProxyMethods { wrapped_tx: tx }
+        TxAdderMethods { wrapped_tx: tx }
     }
 }
 
-pub struct TxProxyMethods<Env, From, To, Gas>
+pub struct TxAdderMethods<Env, From, To, Gas>
 where
     Env: TxEnv,
     From: TxFrom<Env>,
@@ -32,7 +32,7 @@ where
     wrapped_tx: Tx<Env, From, To, (), Gas, (), ()>,
 }
 
-impl<Env, From, Gas> TxProxyMethods<Env, From, (), Gas>
+impl<Env, From, Gas> TxAdderMethods<Env, From, (), Gas>
 where
     Env: TxEnv,
     Env::Api: VMApi,
@@ -60,7 +60,7 @@ where
     }
 
 }
-impl<Env, From, To, Gas> TxProxyMethods<Env, From, To, Gas>
+impl<Env, From, To, Gas> TxAdderMethods<Env, From, To, Gas>
 where
     Env: TxEnv,
     Env::Api: VMApi,
diff --git a/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_main.rs b/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_main.rs
index 32916d02f7..3510eb640a 100644
--- a/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_main.rs
+++ b/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_main.rs
@@ -24,8 +24,8 @@ impl MetaConfig {
 
 fn write_proxies_to_file(mut file: File, abi: ContractAbi) {
     write_header(&mut file);
-    write_struct_template(&mut file);
-    write_impl_for_tx_proxy(&mut file);
-    write_struct_tx_proxy_methods(&mut file);
+    write_struct_template(&mut file, &abi.name);
+    write_impl_for_tx_proxy(&mut file, &abi.name);
+    write_struct_tx_proxy_methods(&mut file, &abi.name);
     write_content(&mut file, abi);
 }
diff --git a/framework/meta/src/cmd/contract/generate_proxy/proxy_sc_functions_gen.rs b/framework/meta/src/cmd/contract/generate_proxy/proxy_sc_functions_gen.rs
index b35e402a9d..e9c895ac40 100644
--- a/framework/meta/src/cmd/contract/generate_proxy/proxy_sc_functions_gen.rs
+++ b/framework/meta/src/cmd/contract/generate_proxy/proxy_sc_functions_gen.rs
@@ -8,7 +8,7 @@ use crate::cmd::contract::generate_snippets::{
 };
 
 pub(crate) fn write_content(file: &mut File, abi: ContractAbi) {
-    write_header_impl_constructor(file);
+    write_header_impl_constructor(file, &abi.name);
     for constructor_abi in abi.constructors {
         write_constructor_header(file, constructor_abi.clone());
         write_constructor_content(file, constructor_abi.inputs);
@@ -16,7 +16,7 @@ pub(crate) fn write_content(file: &mut File, abi: ContractAbi) {
     }
     writeln!(file, "}}").unwrap();
 
-    write_header_impl_endpoints(file);
+    write_header_impl_endpoints(file, &abi.name);
     for endpoint_abi in abi.endpoints {
         write_endpoint_header(file, endpoint_abi.clone());
         write_endpoint_content(file, endpoint_abi.name, endpoint_abi.inputs);
@@ -26,10 +26,10 @@ pub(crate) fn write_content(file: &mut File, abi: ContractAbi) {
     writeln!(file, "}}").unwrap();
 }
 
-fn write_header_impl_constructor(file: &mut File) {
+fn write_header_impl_constructor(file: &mut File, name: &String) {
     writeln!(
         file,
-        r#"impl<Env, From, Gas> TxProxyMethods<Env, From, (), Gas>
+        r#"impl<Env, From, Gas> Tx{name}Methods<Env, From, (), Gas>
 where
     Env: TxEnv,
     Env::Api: VMApi,
@@ -40,10 +40,10 @@ where
     .unwrap();
 }
 
-fn write_header_impl_endpoints(file: &mut File) {
+fn write_header_impl_endpoints(file: &mut File, name: &String) {
     writeln!(
         file,
-        r#"impl<Env, From, To, Gas> TxProxyMethods<Env, From, To, Gas>
+        r#"impl<Env, From, To, Gas> Tx{name}Methods<Env, From, To, Gas>
 where
     Env: TxEnv,
     Env::Api: VMApi,
diff --git a/framework/meta/src/cmd/contract/generate_proxy/proxy_template_gen.rs b/framework/meta/src/cmd/contract/generate_proxy/proxy_template_gen.rs
index f5e82eced7..e476cb212f 100644
--- a/framework/meta/src/cmd/contract/generate_proxy/proxy_template_gen.rs
+++ b/framework/meta/src/cmd/contract/generate_proxy/proxy_template_gen.rs
@@ -18,25 +18,25 @@ pub(crate) fn write_header(file: &mut File) {
     write_newline(file);
 }
 
-pub(crate) fn write_struct_template(file: &mut File) {
-    writeln!(file, "pub struct TxProxy;").unwrap();
+pub(crate) fn write_struct_template(file: &mut File, name: &String) {
+    writeln!(file, "pub struct Tx{name};").unwrap();
     write_newline(file)
 }
 
-pub(crate) fn write_impl_for_tx_proxy(file: &mut File) {
+pub(crate) fn write_impl_for_tx_proxy(file: &mut File, name: &String) {
     writeln!(
         file,
-        r#"impl<Env, From, To, Gas> TxProxyTraitV2<Env, From, To, Gas> for TxProxy
+        r#"impl<Env, From, To, Gas> TxProxyTraitV2<Env, From, To, Gas> for Tx{name}
 where
     Env: TxEnv,
     From: TxFrom<Env>,
     To: TxTo<Env>,
     Gas: TxGas<Env>,
 {{
-    type TxProxyMethods = TxProxyMethods<Env, From, To, Gas>;
+    type TxProxyMethods = Tx{name}Methods<Env, From, To, Gas>;
 
     fn prepare_methods(self, tx: Tx<Env, From, To, (), Gas, (), ()>) -> Self::TxProxyMethods {{
-        TxProxyMethods {{ wrapped_tx: tx }}
+        Tx{name}Methods {{ wrapped_tx: tx }}
     }}
 }}"#
     )
@@ -45,10 +45,10 @@ where
     write_newline(file);
 }
 
-pub(crate) fn write_struct_tx_proxy_methods(file: &mut File) {
+pub(crate) fn write_struct_tx_proxy_methods(file: &mut File, name: &String) {
     writeln!(
         file,
-        r#"pub struct TxProxyMethods<Env, From, To, Gas>
+        r#"pub struct Tx{name}Methods<Env, From, To, Gas>
 where
     Env: TxEnv,
     From: TxFrom<Env>,

From 199f639cd3f502dbf9ca72623f9d8e0d235c6f25 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Thu, 14 Mar 2024 10:42:40 +0200
Subject: [PATCH 0453/1254] removed proxy v1 and changed v2 as the main

---
 contracts/examples/adder/src/adder.rs         |   1 -
 contracts/examples/adder/src/temp_proxy.rs    |  88 +++++++++-----
 contracts/examples/adder/src/temp_proxy_v2.rs | 110 ------------------
 .../tests/adder_blackbox_chained_test.rs      |   6 +-
 .../tests/adder_blackbox_legacy_proxy_test.rs |   2 +-
 .../adder/tests/adder_blackbox_test.rs        |  17 +--
 framework/base/src/types/interaction/tx.rs    |  31 +----
 .../base/src/types/interaction/tx_proxy.rs    |   8 +-
 8 files changed, 72 insertions(+), 191 deletions(-)
 delete mode 100644 contracts/examples/adder/src/temp_proxy_v2.rs

diff --git a/contracts/examples/adder/src/adder.rs b/contracts/examples/adder/src/adder.rs
index c6995b9d11..b9f5fe86fe 100644
--- a/contracts/examples/adder/src/adder.rs
+++ b/contracts/examples/adder/src/adder.rs
@@ -3,7 +3,6 @@
 use multiversx_sc::imports::*;
 
 pub mod temp_proxy;
-pub mod temp_proxy_v2;
 
 /// One of the simplest smart contracts possible,
 /// it holds a single variable in storage, which anyone can increment.
diff --git a/contracts/examples/adder/src/temp_proxy.rs b/contracts/examples/adder/src/temp_proxy.rs
index a3e72adde0..8a1569374e 100644
--- a/contracts/examples/adder/src/temp_proxy.rs
+++ b/contracts/examples/adder/src/temp_proxy.rs
@@ -1,76 +1,110 @@
-#![allow(clippy::all)]
+////////////////////////////////////////////////////
+////////////////// AUTO-GENERATED //////////////////
+////////////////////////////////////////////////////
 
-use multiversx_sc::api::VMApi;
+#![allow(clippy::all)]
 
-multiversx_sc::imports!();
+use multiversx_sc::imports::*;
 
 pub struct TxProxy;
 
-impl<Env> TxProxyTrait<Env> for TxProxy
+impl<Env, From, To, Gas> TxProxyTrait<Env, From, To, Gas> for TxProxy
 where
     Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
 {
-    type TxProxyMethods = TxProxyMethods<Env>;
+    type TxProxyMethods = TxAdderMethods<Env, From, To, Gas>;
 
-    fn env(self, env: Env) -> Self::TxProxyMethods {
-        TxProxyMethods { env }
+    fn prepare_methods(self, tx: Tx<Env, From, To, (), Gas, (), ()>) -> Self::TxProxyMethods {
+        TxAdderMethods { wrapped_tx: tx }
     }
 }
 
-pub struct TxProxyMethods<Env: TxEnv> {
-    pub env: Env,
+pub struct TxAdderMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    wrapped_tx: Tx<Env, From, To, (), Gas, (), ()>,
 }
 
-impl<Env> TxProxyMethods<Env>
+impl<Env, From, Gas> TxAdderMethods<Env, From, (), Gas>
 where
     Env: TxEnv,
     Env::Api: VMApi,
+    From: TxFrom<Env>,
+    Gas: TxGas<Env>,
 {
-    pub fn init<Arg0: multiversx_sc::codec::CodecInto<BigUint<Env::Api>>>(
+    pub fn init<
+        Arg0: CodecInto<BigUint<Env::Api>>,
+    >(
         self,
         initial_value: Arg0,
-    ) -> multiversx_sc::types::Tx<Env, (), (), (), (), DeployCall<Env, ()>, OriginalResultMarker<()>>
-    {
-        Tx::new_with_env(self.env)
+    ) -> Tx<
+        Env,
+        From,
+        (),
+        (),
+        Gas,
+        DeployCall<Env, ()>,
+        OriginalResultMarker<()>,
+    > {
+        self.wrapped_tx
             .raw_deploy()
             .argument(&initial_value)
             .original_result()
     }
 
+}
+impl<Env, From, To, Gas> TxAdderMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
     pub fn sum(
         self,
-    ) -> multiversx_sc::types::Tx<
+    ) -> Tx<
         Env,
+        From,
+        To,
         (),
-        (),
-        (),
-        (),
+        Gas,
         FunctionCall<Env::Api>,
-        OriginalResultMarker<SingleValueMapper<Env::Api, multiversx_sc::types::BigUint<Env::Api>>>,
+        OriginalResultMarker<multiversx_sc::types::BigUint<Env::Api>>,
     > {
-        Tx::new_with_env(self.env)
+        self.wrapped_tx
             .raw_call()
             .function_name("getSum")
             .original_result()
     }
 
-    //Add desired amount to the storage variable.
-    pub fn add<Arg0: multiversx_sc::codec::CodecInto<BigUint<Env::Api>>>(
+    /// Add desired amount to the storage variable. 
+    pub fn add<
+        Arg0: CodecInto<BigUint<Env::Api>>,
+    >(
         self,
         value: Arg0,
-    ) -> multiversx_sc::types::Tx<
+    ) -> Tx<
         Env,
+        From,
+        To,
         (),
-        (),
-        (),
-        (),
+        Gas,
         FunctionCall<Env::Api>,
         OriginalResultMarker<()>,
     > {
-        Tx::new_with_env(self.env)
+        self.wrapped_tx
             .raw_call()
             .function_name("add")
             .argument(&value)
             .original_result()
     }
+
 }
diff --git a/contracts/examples/adder/src/temp_proxy_v2.rs b/contracts/examples/adder/src/temp_proxy_v2.rs
deleted file mode 100644
index 370df8324b..0000000000
--- a/contracts/examples/adder/src/temp_proxy_v2.rs
+++ /dev/null
@@ -1,110 +0,0 @@
-////////////////////////////////////////////////////
-////////////////// AUTO-GENERATED //////////////////
-////////////////////////////////////////////////////
-
-#![allow(clippy::all)]
-
-use multiversx_sc::imports::*;
-
-pub struct TxProxy;
-
-impl<Env, From, To, Gas> TxProxyTraitV2<Env, From, To, Gas> for TxProxy
-where
-    Env: TxEnv,
-    From: TxFrom<Env>,
-    To: TxTo<Env>,
-    Gas: TxGas<Env>,
-{
-    type TxProxyMethods = TxAdderMethods<Env, From, To, Gas>;
-
-    fn prepare_methods(self, tx: Tx<Env, From, To, (), Gas, (), ()>) -> Self::TxProxyMethods {
-        TxAdderMethods { wrapped_tx: tx }
-    }
-}
-
-pub struct TxAdderMethods<Env, From, To, Gas>
-where
-    Env: TxEnv,
-    From: TxFrom<Env>,
-    To: TxTo<Env>,
-    Gas: TxGas<Env>,
-{
-    wrapped_tx: Tx<Env, From, To, (), Gas, (), ()>,
-}
-
-impl<Env, From, Gas> TxAdderMethods<Env, From, (), Gas>
-where
-    Env: TxEnv,
-    Env::Api: VMApi,
-    From: TxFrom<Env>,
-    Gas: TxGas<Env>,
-{
-    pub fn init<
-        Arg0: CodecInto<BigUint<Env::Api>>,
-    >(
-        self,
-        initial_value: Arg0,
-    ) -> Tx<
-        Env,
-        From,
-        (),
-        (),
-        Gas,
-        DeployCall<Env, ()>,
-        OriginalResultMarker<()>,
-    > {
-        self.wrapped_tx
-            .raw_deploy()
-            .argument(&initial_value)
-            .original_result()
-    }
-
-}
-impl<Env, From, To, Gas> TxAdderMethods<Env, From, To, Gas>
-where
-    Env: TxEnv,
-    Env::Api: VMApi,
-    From: TxFrom<Env>,
-    To: TxTo<Env>,
-    Gas: TxGas<Env>,
-{
-    pub fn sum(
-        self,
-    ) -> Tx<
-        Env,
-        From,
-        To,
-        (),
-        Gas,
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<multiversx_sc::types::BigUint<Env::Api>>,
-    > {
-        self.wrapped_tx
-            .raw_call()
-            .function_name("getSum")
-            .original_result()
-    }
-
-    /// Add desired amount to the storage variable. 
-    pub fn add<
-        Arg0: CodecInto<BigUint<Env::Api>>,
-    >(
-        self,
-        value: Arg0,
-    ) -> Tx<
-        Env,
-        From,
-        To,
-        (),
-        Gas,
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<()>,
-    > {
-        self.wrapped_tx
-            .raw_call()
-            .function_name("add")
-            .argument(&value)
-            .original_result()
-    }
-
-}
diff --git a/contracts/examples/adder/tests/adder_blackbox_chained_test.rs b/contracts/examples/adder/tests/adder_blackbox_chained_test.rs
index 2edc5e4100..234a4aea52 100644
--- a/contracts/examples/adder/tests/adder_blackbox_chained_test.rs
+++ b/contracts/examples/adder/tests/adder_blackbox_chained_test.rs
@@ -27,7 +27,7 @@ fn adder_blackbox_chained() {
         )
         .chain_deploy(|tx| {
             tx.from(AddressExpr("owner"))
-                .typed_v2(temp_proxy_v2::TxProxy)
+                .typed(temp_proxy::TxProxy)
                 .init(5u32)
                 .code(MxscExpr("output/adder.mxsc.json"))
                 .with_result(WithResultNewAddress::new(|new_address| {
@@ -36,7 +36,7 @@ fn adder_blackbox_chained() {
         })
         .chain_query(|tx| {
             tx.to(ScExpr("adder"))
-                .typed_v2(temp_proxy_v2::TxProxy)
+                .typed(temp_proxy::TxProxy)
                 .sum()
                 .with_result(WithResultSimilar::new(|value: BigUint| {
                     assert_eq!(value, BigUint::from(5u32));
@@ -45,7 +45,7 @@ fn adder_blackbox_chained() {
         .chain_call(|tx| {
             tx.from(AddressExpr("owner"))
                 .to(ScExpr("adder"))
-                .typed_v2(temp_proxy_v2::TxProxy)
+                .typed(temp_proxy::TxProxy)
                 .add(3u32)
                 .with_result(WithRawTxResponse(|response| {
                     assert!(response.tx_error.is_success());
diff --git a/contracts/examples/adder/tests/adder_blackbox_legacy_proxy_test.rs b/contracts/examples/adder/tests/adder_blackbox_legacy_proxy_test.rs
index 373e75f49f..9da1ce9758 100644
--- a/contracts/examples/adder/tests/adder_blackbox_legacy_proxy_test.rs
+++ b/contracts/examples/adder/tests/adder_blackbox_legacy_proxy_test.rs
@@ -35,7 +35,7 @@ fn adder_blackbox_legacy_proxy() {
     world
         .tx()
         .from(OWNER)
-        .typed_v2(temp_proxy_v2::TxProxy)
+        .typed(temp_proxy::TxProxy)
         .init(5u32)
         .code(CODE_EXPR)
         .with_result(WithResultNewAddress::new(|new_address| {
diff --git a/contracts/examples/adder/tests/adder_blackbox_test.rs b/contracts/examples/adder/tests/adder_blackbox_test.rs
index 69f94a2e1e..39f9946d7f 100644
--- a/contracts/examples/adder/tests/adder_blackbox_test.rs
+++ b/contracts/examples/adder/tests/adder_blackbox_test.rs
@@ -33,7 +33,7 @@ fn adder_blackbox() {
     world
         .tx()
         .from(OWNER)
-        .typed_v2(temp_proxy_v2::TxProxy)
+        .typed(temp_proxy::TxProxy)
         .init(5u32)
         .code(CODE_EXPR)
         .with_result(WithResultNewAddress::new(|new_address| {
@@ -44,28 +44,17 @@ fn adder_blackbox() {
     let value = world
         .query()
         .to(SC_ADDER)
-        .typed_v2(temp_proxy_v2::TxProxy)
+        .typed(temp_proxy::TxProxy)
         .sum()
         .returns(ReturnsSimilar::<BigUint>::new())
         .run();
     assert_eq!(value, BigUint::from(5u32));
 
-    // TODO: remove
     world
         .tx()
         .from(OWNER)
         .to(SC_ADDER)
-        .typed_v1(temp_proxy::TxProxy, |p| p.add(2u32))
-        .with_result(WithRawTxResponse(|response| {
-            assert!(response.tx_error.is_success());
-        }))
-        .run();
-
-    world
-        .tx()
-        .from(OWNER)
-        .to(SC_ADDER)
-        .typed_v2(temp_proxy_v2::TxProxy)
+        .typed(temp_proxy::TxProxy)
         .add(1u32)
         .with_result(WithRawTxResponse(|response| {
             assert!(response.tx_error.is_success());
diff --git a/framework/base/src/types/interaction/tx.rs b/framework/base/src/types/interaction/tx.rs
index 77d32df17e..49d8b214be 100644
--- a/framework/base/src/types/interaction/tx.rs
+++ b/framework/base/src/types/interaction/tx.rs
@@ -15,7 +15,7 @@ use super::{
     DeployCall, ExplicitGas, FromSource, FunctionCall, ManagedArgBuffer, OriginalResultMarker,
     RHList, RHListAppendNoRet, RHListAppendRet, RHListItem, TxCodeSource, TxCodeValue, TxData,
     TxDataFunctionCall, TxEnv, TxFrom, TxFromSourceValue, TxFromSpecified, TxGas, TxPayment,
-    TxPaymentEgldOnly, TxProxyTrait, TxProxyTraitV2, TxResultHandler, TxScEnv, TxTo, TxToSpecified,
+    TxPaymentEgldOnly, TxProxyTrait, TxResultHandler, TxScEnv, TxTo, TxToSpecified,
 };
 
 #[must_use]
@@ -473,34 +473,9 @@ where
     To: TxTo<Env>,
     Gas: TxGas<Env>,
 {
-    pub fn typed_v1<Proxy, Payment, Data, RH, F>(
-        self,
-        proxy: Proxy,
-        f: F,
-    ) -> Tx<Env, From, To, Payment, Gas, Data, RH>
-    where
-        Proxy: TxProxyTrait<Env>,
-        Payment: TxPayment<Env>,
-        Data: TxData<Env>,
-        RH: TxResultHandler<Env>,
-        F: FnOnce(Proxy::TxProxyMethods) -> Tx<Env, (), (), Payment, (), Data, RH>,
-    {
-        let proxy_methods = proxy.env(self.env);
-        let proxy_tx = f(proxy_methods);
-        Tx {
-            env: proxy_tx.env,
-            from: self.from,
-            to: self.to,
-            payment: proxy_tx.payment,
-            gas: self.gas,
-            data: proxy_tx.data,
-            result_handler: proxy_tx.result_handler,
-        }
-    }
-
-    pub fn typed_v2<Proxy>(self, proxy: Proxy) -> Proxy::TxProxyMethods
+    pub fn typed<Proxy>(self, proxy: Proxy) -> Proxy::TxProxyMethods
     where
-        Proxy: TxProxyTraitV2<Env, From, To, Gas>,
+        Proxy: TxProxyTrait<Env, From, To, Gas>,
     {
         proxy.prepare_methods(self)
     }
diff --git a/framework/base/src/types/interaction/tx_proxy.rs b/framework/base/src/types/interaction/tx_proxy.rs
index 90ac72d76b..4addee820d 100644
--- a/framework/base/src/types/interaction/tx_proxy.rs
+++ b/framework/base/src/types/interaction/tx_proxy.rs
@@ -1,12 +1,6 @@
 use super::{Tx, TxEnv, TxFrom, TxGas, TxTo};
 
-pub trait TxProxyTrait<Env> {
-    type TxProxyMethods;
-
-    fn env(self, env: Env) -> Self::TxProxyMethods;
-}
-
-pub trait TxProxyTraitV2<Env, From, To, Gas>
+pub trait TxProxyTrait<Env, From, To, Gas>
 where
     Env: TxEnv,
     From: TxFrom<Env>,

From 63fc3a8ffc93538b071b6b88e97941f5777fe09d Mon Sep 17 00:00:00 2001
From: Laurentiu Ciobanu <laurentiu.ciobanu@multiversx.com>
Date: Thu, 14 Mar 2024 11:36:48 +0200
Subject: [PATCH 0454/1254] add idea and zed editor configs to gitignore

---
 .gitignore | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 6e26ebc202..5a6b68624a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,8 +22,10 @@ vm/**/Cargo.lock
 # These are backup files generated by rustfmt
 **/*.rs.bk
 
-# VSCode config
+# Editors config
 .vscode
+.zed
+.idea
 
 # Others
 my-vm-tests.sh

From ed4bd0300335be9e43d48bf44d5306521b088a36 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Thu, 14 Mar 2024 11:28:20 +0200
Subject: [PATCH 0455/1254] fix btest

fixed test

fixed btest
---
 contracts/examples/adder/tests/adder_blackbox_test.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contracts/examples/adder/tests/adder_blackbox_test.rs b/contracts/examples/adder/tests/adder_blackbox_test.rs
index 39f9946d7f..5face2c48d 100644
--- a/contracts/examples/adder/tests/adder_blackbox_test.rs
+++ b/contracts/examples/adder/tests/adder_blackbox_test.rs
@@ -66,7 +66,7 @@ fn adder_blackbox() {
             .put_account(owner_address, CheckAccount::new())
             .put_account(
                 &adder_contract,
-                CheckAccount::new().check_storage("str:sum", "8"),
+                CheckAccount::new().check_storage("str:sum", "6"),
             ),
     );
 

From a6a6d7e10c86585b99b63ba2a5dfa5f6d4325cc0 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 14 Mar 2024 11:34:57 +0100
Subject: [PATCH 0456/1254] tx proxy gen naming fix

---
 contracts/examples/adder/src/temp_proxy.rs    | 46 +++++--------------
 .../tests/adder_blackbox_chained_test.rs      |  6 +--
 .../tests/adder_blackbox_legacy_proxy_test.rs |  2 +-
 .../adder/tests/adder_blackbox_test.rs        |  6 +--
 .../meta/src/cmd/contract/generate_proxy.rs   |  1 +
 .../contract/generate_proxy/proxy_naming.rs   |  7 +++
 .../generate_proxy/proxy_sc_functions_gen.rs  |  8 +++-
 .../generate_proxy/proxy_template_gen.rs      | 16 +++++--
 8 files changed, 44 insertions(+), 48 deletions(-)
 create mode 100644 framework/meta/src/cmd/contract/generate_proxy/proxy_naming.rs

diff --git a/contracts/examples/adder/src/temp_proxy.rs b/contracts/examples/adder/src/temp_proxy.rs
index 8a1569374e..d733bd7439 100644
--- a/contracts/examples/adder/src/temp_proxy.rs
+++ b/contracts/examples/adder/src/temp_proxy.rs
@@ -6,23 +6,23 @@
 
 use multiversx_sc::imports::*;
 
-pub struct TxProxy;
+pub struct AdderProxy;
 
-impl<Env, From, To, Gas> TxProxyTrait<Env, From, To, Gas> for TxProxy
+impl<Env, From, To, Gas> TxProxyTrait<Env, From, To, Gas> for AdderProxy
 where
     Env: TxEnv,
     From: TxFrom<Env>,
     To: TxTo<Env>,
     Gas: TxGas<Env>,
 {
-    type TxProxyMethods = TxAdderMethods<Env, From, To, Gas>;
+    type TxProxyMethods = AdderProxyMethods<Env, From, To, Gas>;
 
     fn prepare_methods(self, tx: Tx<Env, From, To, (), Gas, (), ()>) -> Self::TxProxyMethods {
-        TxAdderMethods { wrapped_tx: tx }
+        AdderProxyMethods { wrapped_tx: tx }
     }
 }
 
-pub struct TxAdderMethods<Env, From, To, Gas>
+pub struct AdderProxyMethods<Env, From, To, Gas>
 where
     Env: TxEnv,
     From: TxFrom<Env>,
@@ -32,35 +32,24 @@ where
     wrapped_tx: Tx<Env, From, To, (), Gas, (), ()>,
 }
 
-impl<Env, From, Gas> TxAdderMethods<Env, From, (), Gas>
+impl<Env, From, Gas> AdderProxyMethods<Env, From, (), Gas>
 where
     Env: TxEnv,
     Env::Api: VMApi,
     From: TxFrom<Env>,
     Gas: TxGas<Env>,
 {
-    pub fn init<
-        Arg0: CodecInto<BigUint<Env::Api>>,
-    >(
+    pub fn init<Arg0: CodecInto<BigUint<Env::Api>>>(
         self,
         initial_value: Arg0,
-    ) -> Tx<
-        Env,
-        From,
-        (),
-        (),
-        Gas,
-        DeployCall<Env, ()>,
-        OriginalResultMarker<()>,
-    > {
+    ) -> Tx<Env, From, (), (), Gas, DeployCall<Env, ()>, OriginalResultMarker<()>> {
         self.wrapped_tx
             .raw_deploy()
             .argument(&initial_value)
             .original_result()
     }
-
 }
-impl<Env, From, To, Gas> TxAdderMethods<Env, From, To, Gas>
+impl<Env, From, To, Gas> AdderProxyMethods<Env, From, To, Gas>
 where
     Env: TxEnv,
     Env::Api: VMApi,
@@ -85,26 +74,15 @@ where
             .original_result()
     }
 
-    /// Add desired amount to the storage variable. 
-    pub fn add<
-        Arg0: CodecInto<BigUint<Env::Api>>,
-    >(
+    /// Add desired amount to the storage variable.
+    pub fn add<Arg0: CodecInto<BigUint<Env::Api>>>(
         self,
         value: Arg0,
-    ) -> Tx<
-        Env,
-        From,
-        To,
-        (),
-        Gas,
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<()>,
-    > {
+    ) -> Tx<Env, From, To, (), Gas, FunctionCall<Env::Api>, OriginalResultMarker<()>> {
         self.wrapped_tx
             .raw_call()
             .function_name("add")
             .argument(&value)
             .original_result()
     }
-
 }
diff --git a/contracts/examples/adder/tests/adder_blackbox_chained_test.rs b/contracts/examples/adder/tests/adder_blackbox_chained_test.rs
index 234a4aea52..8d3c51c11c 100644
--- a/contracts/examples/adder/tests/adder_blackbox_chained_test.rs
+++ b/contracts/examples/adder/tests/adder_blackbox_chained_test.rs
@@ -27,7 +27,7 @@ fn adder_blackbox_chained() {
         )
         .chain_deploy(|tx| {
             tx.from(AddressExpr("owner"))
-                .typed(temp_proxy::TxProxy)
+                .typed(temp_proxy::AdderProxy)
                 .init(5u32)
                 .code(MxscExpr("output/adder.mxsc.json"))
                 .with_result(WithResultNewAddress::new(|new_address| {
@@ -36,7 +36,7 @@ fn adder_blackbox_chained() {
         })
         .chain_query(|tx| {
             tx.to(ScExpr("adder"))
-                .typed(temp_proxy::TxProxy)
+                .typed(temp_proxy::AdderProxy)
                 .sum()
                 .with_result(WithResultSimilar::new(|value: BigUint| {
                     assert_eq!(value, BigUint::from(5u32));
@@ -45,7 +45,7 @@ fn adder_blackbox_chained() {
         .chain_call(|tx| {
             tx.from(AddressExpr("owner"))
                 .to(ScExpr("adder"))
-                .typed(temp_proxy::TxProxy)
+                .typed(temp_proxy::AdderProxy)
                 .add(3u32)
                 .with_result(WithRawTxResponse(|response| {
                     assert!(response.tx_error.is_success());
diff --git a/contracts/examples/adder/tests/adder_blackbox_legacy_proxy_test.rs b/contracts/examples/adder/tests/adder_blackbox_legacy_proxy_test.rs
index 9da1ce9758..ddd131905e 100644
--- a/contracts/examples/adder/tests/adder_blackbox_legacy_proxy_test.rs
+++ b/contracts/examples/adder/tests/adder_blackbox_legacy_proxy_test.rs
@@ -35,7 +35,7 @@ fn adder_blackbox_legacy_proxy() {
     world
         .tx()
         .from(OWNER)
-        .typed(temp_proxy::TxProxy)
+        .typed(temp_proxy::AdderProxy)
         .init(5u32)
         .code(CODE_EXPR)
         .with_result(WithResultNewAddress::new(|new_address| {
diff --git a/contracts/examples/adder/tests/adder_blackbox_test.rs b/contracts/examples/adder/tests/adder_blackbox_test.rs
index 5face2c48d..ffcf7fb81f 100644
--- a/contracts/examples/adder/tests/adder_blackbox_test.rs
+++ b/contracts/examples/adder/tests/adder_blackbox_test.rs
@@ -33,7 +33,7 @@ fn adder_blackbox() {
     world
         .tx()
         .from(OWNER)
-        .typed(temp_proxy::TxProxy)
+        .typed(temp_proxy::AdderProxy)
         .init(5u32)
         .code(CODE_EXPR)
         .with_result(WithResultNewAddress::new(|new_address| {
@@ -44,7 +44,7 @@ fn adder_blackbox() {
     let value = world
         .query()
         .to(SC_ADDER)
-        .typed(temp_proxy::TxProxy)
+        .typed(temp_proxy::AdderProxy)
         .sum()
         .returns(ReturnsSimilar::<BigUint>::new())
         .run();
@@ -54,7 +54,7 @@ fn adder_blackbox() {
         .tx()
         .from(OWNER)
         .to(SC_ADDER)
-        .typed(temp_proxy::TxProxy)
+        .typed(temp_proxy::AdderProxy)
         .add(1u32)
         .with_result(WithRawTxResponse(|response| {
             assert!(response.tx_error.is_success());
diff --git a/framework/meta/src/cmd/contract/generate_proxy.rs b/framework/meta/src/cmd/contract/generate_proxy.rs
index 0dc83059b3..d8f689c428 100644
--- a/framework/meta/src/cmd/contract/generate_proxy.rs
+++ b/framework/meta/src/cmd/contract/generate_proxy.rs
@@ -1,4 +1,5 @@
 pub mod proxy_crate_gen;
 pub mod proxy_gen_main;
+mod proxy_naming;
 pub mod proxy_sc_functions_gen;
 pub mod proxy_template_gen;
diff --git a/framework/meta/src/cmd/contract/generate_proxy/proxy_naming.rs b/framework/meta/src/cmd/contract/generate_proxy/proxy_naming.rs
new file mode 100644
index 0000000000..e71a6a0e64
--- /dev/null
+++ b/framework/meta/src/cmd/contract/generate_proxy/proxy_naming.rs
@@ -0,0 +1,7 @@
+pub(super) fn proxy_type_name(contract_trait_name: &str) -> String {
+    format!("{contract_trait_name}Proxy")
+}
+
+pub(super) fn proxy_methods_type_name(contract_trait_name: &str) -> String {
+    format!("{contract_trait_name}ProxyMethods")
+}
diff --git a/framework/meta/src/cmd/contract/generate_proxy/proxy_sc_functions_gen.rs b/framework/meta/src/cmd/contract/generate_proxy/proxy_sc_functions_gen.rs
index e9c895ac40..ffb999f02c 100644
--- a/framework/meta/src/cmd/contract/generate_proxy/proxy_sc_functions_gen.rs
+++ b/framework/meta/src/cmd/contract/generate_proxy/proxy_sc_functions_gen.rs
@@ -7,6 +7,8 @@ use crate::cmd::contract::generate_snippets::{
     snippet_type_map::{handle_abi_type, RustTypeString},
 };
 
+use super::proxy_naming::proxy_methods_type_name;
+
 pub(crate) fn write_content(file: &mut File, abi: ContractAbi) {
     write_header_impl_constructor(file, &abi.name);
     for constructor_abi in abi.constructors {
@@ -27,9 +29,10 @@ pub(crate) fn write_content(file: &mut File, abi: ContractAbi) {
 }
 
 fn write_header_impl_constructor(file: &mut File, name: &String) {
+    let proxy_methods_type_name = proxy_methods_type_name(name);
     writeln!(
         file,
-        r#"impl<Env, From, Gas> Tx{name}Methods<Env, From, (), Gas>
+        r#"impl<Env, From, Gas> {proxy_methods_type_name}<Env, From, (), Gas>
 where
     Env: TxEnv,
     Env::Api: VMApi,
@@ -41,9 +44,10 @@ where
 }
 
 fn write_header_impl_endpoints(file: &mut File, name: &String) {
+    let proxy_methods_type_name = proxy_methods_type_name(name);
     writeln!(
         file,
-        r#"impl<Env, From, To, Gas> Tx{name}Methods<Env, From, To, Gas>
+        r#"impl<Env, From, To, Gas> {proxy_methods_type_name}<Env, From, To, Gas>
 where
     Env: TxEnv,
     Env::Api: VMApi,
diff --git a/framework/meta/src/cmd/contract/generate_proxy/proxy_template_gen.rs b/framework/meta/src/cmd/contract/generate_proxy/proxy_template_gen.rs
index e476cb212f..bd3c894ff0 100644
--- a/framework/meta/src/cmd/contract/generate_proxy/proxy_template_gen.rs
+++ b/framework/meta/src/cmd/contract/generate_proxy/proxy_template_gen.rs
@@ -2,6 +2,8 @@ use std::{fs::File, io::Write};
 
 use crate::cmd::contract::generate_snippets::snippet_gen_common::write_newline;
 
+use super::proxy_naming::{proxy_methods_type_name, proxy_type_name};
+
 const PREFIX_AUTO_GENERATED: &str = "////////////////////////////////////////////////////
 ////////////////// AUTO-GENERATED //////////////////
 ////////////////////////////////////////////////////
@@ -19,24 +21,27 @@ pub(crate) fn write_header(file: &mut File) {
 }
 
 pub(crate) fn write_struct_template(file: &mut File, name: &String) {
-    writeln!(file, "pub struct Tx{name};").unwrap();
+    let proxy_type_name = proxy_type_name(name);
+    writeln!(file, "pub struct {proxy_type_name};").unwrap();
     write_newline(file)
 }
 
 pub(crate) fn write_impl_for_tx_proxy(file: &mut File, name: &String) {
+    let proxy_type_name = proxy_type_name(name);
+    let proxy_methods_type_name = proxy_methods_type_name(name);
     writeln!(
         file,
-        r#"impl<Env, From, To, Gas> TxProxyTraitV2<Env, From, To, Gas> for Tx{name}
+        r#"impl<Env, From, To, Gas> TxProxyTrait<Env, From, To, Gas> for {proxy_type_name}
 where
     Env: TxEnv,
     From: TxFrom<Env>,
     To: TxTo<Env>,
     Gas: TxGas<Env>,
 {{
-    type TxProxyMethods = Tx{name}Methods<Env, From, To, Gas>;
+    type TxProxyMethods = {proxy_methods_type_name}<Env, From, To, Gas>;
 
     fn prepare_methods(self, tx: Tx<Env, From, To, (), Gas, (), ()>) -> Self::TxProxyMethods {{
-        Tx{name}Methods {{ wrapped_tx: tx }}
+        {proxy_methods_type_name} {{ wrapped_tx: tx }}
     }}
 }}"#
     )
@@ -46,9 +51,10 @@ where
 }
 
 pub(crate) fn write_struct_tx_proxy_methods(file: &mut File, name: &String) {
+    let proxy_methods_type_name = proxy_methods_type_name(name);
     writeln!(
         file,
-        r#"pub struct Tx{name}Methods<Env, From, To, Gas>
+        r#"pub struct {proxy_methods_type_name}<Env, From, To, Gas>
 where
     Env: TxEnv,
     From: TxFrom<Env>,

From f1a294e1cf52d59e4d8fcfbaf606c49eb8a0d246 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 14 Mar 2024 11:42:07 +0100
Subject: [PATCH 0457/1254] tx proxy refactor

---
 contracts/examples/adder/src/temp_proxy.rs                    | 2 +-
 framework/base/src/types/interaction/tx.rs                    | 2 +-
 framework/base/src/types/interaction/tx_proxy.rs              | 4 +++-
 .../src/cmd/contract/generate_proxy/proxy_template_gen.rs     | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/contracts/examples/adder/src/temp_proxy.rs b/contracts/examples/adder/src/temp_proxy.rs
index d733bd7439..c1b5195101 100644
--- a/contracts/examples/adder/src/temp_proxy.rs
+++ b/contracts/examples/adder/src/temp_proxy.rs
@@ -17,7 +17,7 @@ where
 {
     type TxProxyMethods = AdderProxyMethods<Env, From, To, Gas>;
 
-    fn prepare_methods(self, tx: Tx<Env, From, To, (), Gas, (), ()>) -> Self::TxProxyMethods {
+    fn proxy_methods(self, tx: Tx<Env, From, To, (), Gas, (), ()>) -> Self::TxProxyMethods {
         AdderProxyMethods { wrapped_tx: tx }
     }
 }
diff --git a/framework/base/src/types/interaction/tx.rs b/framework/base/src/types/interaction/tx.rs
index 49d8b214be..b7c47f1930 100644
--- a/framework/base/src/types/interaction/tx.rs
+++ b/framework/base/src/types/interaction/tx.rs
@@ -477,7 +477,7 @@ where
     where
         Proxy: TxProxyTrait<Env, From, To, Gas>,
     {
-        proxy.prepare_methods(self)
+        proxy.proxy_methods(self)
     }
 }
 
diff --git a/framework/base/src/types/interaction/tx_proxy.rs b/framework/base/src/types/interaction/tx_proxy.rs
index 4addee820d..273b9a2960 100644
--- a/framework/base/src/types/interaction/tx_proxy.rs
+++ b/framework/base/src/types/interaction/tx_proxy.rs
@@ -1,5 +1,6 @@
 use super::{Tx, TxEnv, TxFrom, TxGas, TxTo};
 
+/// Defines a proxy object for a smart contract.
 pub trait TxProxyTrait<Env, From, To, Gas>
 where
     Env: TxEnv,
@@ -9,5 +10,6 @@ where
 {
     type TxProxyMethods;
 
-    fn prepare_methods(self, tx: Tx<Env, From, To, (), Gas, (), ()>) -> Self::TxProxyMethods;
+    /// Creates the associated type that contains the proxy methods implementations.
+    fn proxy_methods(self, tx: Tx<Env, From, To, (), Gas, (), ()>) -> Self::TxProxyMethods;
 }
diff --git a/framework/meta/src/cmd/contract/generate_proxy/proxy_template_gen.rs b/framework/meta/src/cmd/contract/generate_proxy/proxy_template_gen.rs
index bd3c894ff0..31b94c059b 100644
--- a/framework/meta/src/cmd/contract/generate_proxy/proxy_template_gen.rs
+++ b/framework/meta/src/cmd/contract/generate_proxy/proxy_template_gen.rs
@@ -40,7 +40,7 @@ where
 {{
     type TxProxyMethods = {proxy_methods_type_name}<Env, From, To, Gas>;
 
-    fn prepare_methods(self, tx: Tx<Env, From, To, (), Gas, (), ()>) -> Self::TxProxyMethods {{
+    fn proxy_methods(self, tx: Tx<Env, From, To, (), Gas, (), ()>) -> Self::TxProxyMethods {{
         {proxy_methods_type_name} {{ wrapped_tx: tx }}
     }}
 }}"#

From bf92a14cc3e463b796191834db210c28f1f6dfaf Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Thu, 14 Mar 2024 13:13:02 +0200
Subject: [PATCH 0458/1254] fix clippy

---
 .../cmd/contract/generate_proxy/proxy_sc_functions_gen.rs   | 4 ++--
 .../src/cmd/contract/generate_proxy/proxy_template_gen.rs   | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/framework/meta/src/cmd/contract/generate_proxy/proxy_sc_functions_gen.rs b/framework/meta/src/cmd/contract/generate_proxy/proxy_sc_functions_gen.rs
index ffb999f02c..f3b4d6fccf 100644
--- a/framework/meta/src/cmd/contract/generate_proxy/proxy_sc_functions_gen.rs
+++ b/framework/meta/src/cmd/contract/generate_proxy/proxy_sc_functions_gen.rs
@@ -28,7 +28,7 @@ pub(crate) fn write_content(file: &mut File, abi: ContractAbi) {
     writeln!(file, "}}").unwrap();
 }
 
-fn write_header_impl_constructor(file: &mut File, name: &String) {
+fn write_header_impl_constructor(file: &mut File, name: &str) {
     let proxy_methods_type_name = proxy_methods_type_name(name);
     writeln!(
         file,
@@ -43,7 +43,7 @@ where
     .unwrap();
 }
 
-fn write_header_impl_endpoints(file: &mut File, name: &String) {
+fn write_header_impl_endpoints(file: &mut File, name: &str) {
     let proxy_methods_type_name = proxy_methods_type_name(name);
     writeln!(
         file,
diff --git a/framework/meta/src/cmd/contract/generate_proxy/proxy_template_gen.rs b/framework/meta/src/cmd/contract/generate_proxy/proxy_template_gen.rs
index 31b94c059b..71dc2e2287 100644
--- a/framework/meta/src/cmd/contract/generate_proxy/proxy_template_gen.rs
+++ b/framework/meta/src/cmd/contract/generate_proxy/proxy_template_gen.rs
@@ -20,13 +20,13 @@ pub(crate) fn write_header(file: &mut File) {
     write_newline(file);
 }
 
-pub(crate) fn write_struct_template(file: &mut File, name: &String) {
+pub(crate) fn write_struct_template(file: &mut File, name: &str) {
     let proxy_type_name = proxy_type_name(name);
     writeln!(file, "pub struct {proxy_type_name};").unwrap();
     write_newline(file)
 }
 
-pub(crate) fn write_impl_for_tx_proxy(file: &mut File, name: &String) {
+pub(crate) fn write_impl_for_tx_proxy(file: &mut File, name: &str) {
     let proxy_type_name = proxy_type_name(name);
     let proxy_methods_type_name = proxy_methods_type_name(name);
     writeln!(
@@ -50,7 +50,7 @@ where
     write_newline(file);
 }
 
-pub(crate) fn write_struct_tx_proxy_methods(file: &mut File, name: &String) {
+pub(crate) fn write_struct_tx_proxy_methods(file: &mut File, name: &str) {
     let proxy_methods_type_name = proxy_methods_type_name(name);
     writeln!(
         file,

From 486b5ec7c49eea5a39cd43945f403edea98ea95e Mon Sep 17 00:00:00 2001
From: Laurentiu Ciobanu <laurentiu.ciobanu@multiversx.com>
Date: Thu, 14 Mar 2024 14:01:28 +0200
Subject: [PATCH 0459/1254] move test coverage renderer in sc-meta standalone

---
 .github/workflows/actions.yml                 | 33 ++++++-
 .gitignore                                    |  3 +-
 Cargo.lock                                    |  9 --
 Cargo.toml                                    |  1 -
 .../meta/src/cli_args/cli_args_standalone.rs  | 18 ++++
 framework/meta/src/cmd/standalone.rs          |  9 +-
 .../cmd/standalone/test_coverage_render.rs    | 46 ++++++++++
 .../standalone/test_coverage_render/cargo.rs  | 20 +++++
 .../standalone/test_coverage_render/error.rs  | 28 ++++++
 .../test_coverage_render}/llvm_cov.rs         | 15 ++--
 .../standalone/test_coverage_render/render.rs | 86 +++++++++++++++++++
 tests-coverage.sh                             |  3 +-
 tools/coverage-renderer/Cargo.toml            |  9 --
 tools/coverage-renderer/src/cargo.rs          | 17 ----
 tools/coverage-renderer/src/main.rs           | 28 ------
 tools/coverage-renderer/src/renderer.rs       | 65 --------------
 16 files changed, 251 insertions(+), 139 deletions(-)
 create mode 100644 framework/meta/src/cmd/standalone/test_coverage_render.rs
 create mode 100644 framework/meta/src/cmd/standalone/test_coverage_render/cargo.rs
 create mode 100644 framework/meta/src/cmd/standalone/test_coverage_render/error.rs
 rename {tools/coverage-renderer/src => framework/meta/src/cmd/standalone/test_coverage_render}/llvm_cov.rs (58%)
 create mode 100644 framework/meta/src/cmd/standalone/test_coverage_render/render.rs
 delete mode 100644 tools/coverage-renderer/Cargo.toml
 delete mode 100644 tools/coverage-renderer/src/cargo.rs
 delete mode 100644 tools/coverage-renderer/src/main.rs
 delete mode 100644 tools/coverage-renderer/src/renderer.rs

diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
index b6d06db260..024e737f08 100644
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -144,7 +144,38 @@ jobs:
         env:
           RUSTFLAGS: ""
         run: |
-          ./tests-coverage.sh
+          RUSTFLAGS="-C instrument-coverage" \
+            cargo test --tests
+          
+          PROFRAW_FILES=$(find . -name "default_*.profraw")
+          llvm-profdata merge -sparse $PROFRAW_FILES -o tests.profdata
+          find . -name "default_*.profraw" -delete
+          
+          llvm-cov export \
+          $( \
+            for file in \
+          $( \
+            RUSTFLAGS="-C instrument-coverage" \
+              cargo test --tests --no-run --message-format=json \
+                | jq -r "select(.profile.test == true) | .filenames[]" \
+                | grep -v dSYM - \
+            ); \
+          do \
+            printf "%s %s " -object $file; \
+            done \
+          ) \
+            --ignore-filename-regex='/.cargo/registry' \
+            --ignore-filename-regex='rustc/' \
+            --ignore-filename-regex='meta/src' \
+            --ignore-filename-regex='wasm-adapter' \
+            --ignore-filename-regex='benchmarks/' \
+            --ignore-filename-regex='tests/' \
+            --instr-profile=tests.profdata --summary-only --format=text > tests.coverage
+          
+          rm ./tests.profdata
+          
+          cargo run --bin sc-meta test-coverage-render --input ./tests.coverage --output ./coverage.md
+          rm ./tests.coverage
 
       - name: Upload the report
         uses: actions/upload-artifact@v3
diff --git a/.gitignore b/.gitignore
index 5a6b68624a..7c530277be 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,10 +14,11 @@ sdk/**/Cargo.lock
 tools/**/Cargo.lock
 vm/**/Cargo.lock
 
-# Profiler outputs
+# Coverage outputs
 *.profraw
 *.profdata
 *.coverage
+coverage.md
 
 # These are backup files generated by rustfmt
 **/*.rs.bk
diff --git a/Cargo.lock b/Cargo.lock
index 1e015137d2..6274b48504 100755
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -517,15 +517,6 @@ version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
 
-[[package]]
-name = "coverage-renderer"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "serde",
- "serde_json",
-]
-
 [[package]]
 name = "cpufeatures"
 version = "0.2.12"
diff --git a/Cargo.toml b/Cargo.toml
index f2cc134137..ef92a8a7b9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -16,7 +16,6 @@ members = [
   "sdk/scenario-format",
 
   "tools/mxpy-snippet-generator",
-  "tools/coverage-renderer",
 
   "vm",
 
diff --git a/framework/meta/src/cli_args/cli_args_standalone.rs b/framework/meta/src/cli_args/cli_args_standalone.rs
index a81d145dab..a16f12ecdc 100644
--- a/framework/meta/src/cli_args/cli_args_standalone.rs
+++ b/framework/meta/src/cli_args/cli_args_standalone.rs
@@ -66,6 +66,12 @@ pub enum StandaloneCliAction {
     #[command(name = "test", about = "Runs cargo test")]
     Test(TestArgs),
 
+    #[command(
+        name = "test-coverage-render",
+        about = "Render pretty output from test coverage result"
+    )]
+    TestCoverageRender(TestCoverageRenderArgs),
+
     #[command(name = "install", about = "Installs framework dependencies")]
     Install(InstallArgs),
 }
@@ -107,6 +113,18 @@ pub struct TestArgs {
     pub nocapture: bool,
 }
 
+#[derive(Default, Clone, PartialEq, Eq, Debug, Args)]
+pub struct TestCoverageRenderArgs {
+    /// Input file path (llvm-cov json5 format)
+    /// Generated by the llvm-cov export tool
+    #[arg(short, long, verbatim_doc_comment)]
+    pub input: String,
+
+    /// Output file path
+    #[arg(short, long, verbatim_doc_comment)]
+    pub output: String,
+}
+
 #[derive(Default, Clone, PartialEq, Eq, Debug, Args)]
 pub struct AllArgs {
     #[command(subcommand)]
diff --git a/framework/meta/src/cmd/standalone.rs b/framework/meta/src/cmd/standalone.rs
index ddc8cef085..58f8c9b6b7 100644
--- a/framework/meta/src/cmd/standalone.rs
+++ b/framework/meta/src/cmd/standalone.rs
@@ -6,9 +6,13 @@ mod print_util;
 pub mod scen_test_gen;
 pub mod template;
 pub mod test;
+mod test_coverage_render;
 pub(crate) mod upgrade;
 
-use crate::cli_args::{StandaloneCliAction, StandaloneCliArgs};
+use crate::{
+    cli_args::{StandaloneCliAction, StandaloneCliArgs},
+    cmd::standalone::test_coverage_render::test_coverage_render,
+};
 use all::call_all_meta;
 use clap::Parser;
 use info::call_info;
@@ -41,6 +45,9 @@ pub fn cli_main_standalone() {
             test_gen_tool(args);
         },
         Some(StandaloneCliAction::Test(args)) => test(args),
+        Some(StandaloneCliAction::TestCoverageRender(args)) => {
+            test_coverage_render(args);
+        },
         Some(StandaloneCliAction::Install(args)) => install(args),
         None => {},
     }
diff --git a/framework/meta/src/cmd/standalone/test_coverage_render.rs b/framework/meta/src/cmd/standalone/test_coverage_render.rs
new file mode 100644
index 0000000000..2789fd3d43
--- /dev/null
+++ b/framework/meta/src/cmd/standalone/test_coverage_render.rs
@@ -0,0 +1,46 @@
+mod cargo;
+mod error;
+mod llvm_cov;
+mod render;
+
+use crate::{
+    cli_args::TestCoverageRenderArgs,
+    cmd::standalone::test_coverage_render::{
+        cargo::get_workspace_root, error::TestCoverageRenderError, llvm_cov::parse_llvm_cov_output,
+        render::render_coverage,
+    },
+};
+use std::{fs, process};
+
+fn run_test_coverage_renderer(
+    args: &TestCoverageRenderArgs,
+) -> Result<(), TestCoverageRenderError> {
+    let Ok(input) = fs::read_to_string(&args.input) else {
+        return Err(TestCoverageRenderError::InvalidInputPath(
+            "failed to read".into(),
+        ));
+    };
+
+    let root = get_workspace_root()?;
+
+    let coverage = parse_llvm_cov_output(&input)?;
+
+    let mut output = String::new();
+
+    render_coverage(&mut output, &coverage, &root);
+
+    let Ok(_) = fs::write(&args.output, output) else {
+        return Err(TestCoverageRenderError::InvalidOutputPath(
+            "failed to write".into(),
+        ));
+    };
+
+    Ok(())
+}
+
+pub fn test_coverage_render(args: &TestCoverageRenderArgs) {
+    if let Err(err) = run_test_coverage_renderer(args) {
+        eprintln!("{}", err);
+        process::exit(1);
+    }
+}
diff --git a/framework/meta/src/cmd/standalone/test_coverage_render/cargo.rs b/framework/meta/src/cmd/standalone/test_coverage_render/cargo.rs
new file mode 100644
index 0000000000..ca5167ea4b
--- /dev/null
+++ b/framework/meta/src/cmd/standalone/test_coverage_render/cargo.rs
@@ -0,0 +1,20 @@
+use crate::cmd::standalone::test_coverage_render::error::TestCoverageRenderError;
+use std::process::Command;
+
+pub fn get_workspace_root() -> Result<String, TestCoverageRenderError> {
+    let output = Command::new("cargo")
+        .args(["metadata", "--no-deps", "--format-version=1"])
+        .output()
+        .map_err(|e| TestCoverageRenderError::Cargo(format!("{}", e)))?;
+
+    let metadata: serde_json::Value = serde_json::from_slice(&output.stdout)
+        .map_err(|_| TestCoverageRenderError::Cargo("invalid manifest data".into()))?;
+
+    let Some(workspace_root) = metadata["workspace_root"].as_str() else {
+        return Err(TestCoverageRenderError::Cargo(
+            "invalid manifest data".into(),
+        ));
+    };
+
+    Ok(workspace_root.to_owned())
+}
diff --git a/framework/meta/src/cmd/standalone/test_coverage_render/error.rs b/framework/meta/src/cmd/standalone/test_coverage_render/error.rs
new file mode 100644
index 0000000000..36b2f1849a
--- /dev/null
+++ b/framework/meta/src/cmd/standalone/test_coverage_render/error.rs
@@ -0,0 +1,28 @@
+use std::{
+    error::Error,
+    fmt::{Display, Formatter},
+};
+
+#[derive(Debug)]
+pub enum TestCoverageRenderError {
+    InvalidInputPath(String),
+    InvalidOutputPath(String),
+    Cargo(String),
+    InvalidLlvmCovInput,
+}
+
+impl Error for TestCoverageRenderError {}
+
+impl Display for TestCoverageRenderError {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        let message = match self {
+            TestCoverageRenderError::InvalidInputPath(msg) => format!("Invalid input path: {msg}"),
+            TestCoverageRenderError::InvalidOutputPath(msg) => {
+                format!("Invalid output path: {msg}")
+            },
+            TestCoverageRenderError::Cargo(msg) => format!("Failed to run cargo: {msg}"),
+            TestCoverageRenderError::InvalidLlvmCovInput => "Invalid llvm-cov input".into(),
+        };
+        write!(f, "TestCoverageRenderError: {}", message)
+    }
+}
diff --git a/tools/coverage-renderer/src/llvm_cov.rs b/framework/meta/src/cmd/standalone/test_coverage_render/llvm_cov.rs
similarity index 58%
rename from tools/coverage-renderer/src/llvm_cov.rs
rename to framework/meta/src/cmd/standalone/test_coverage_render/llvm_cov.rs
index ed4f40104f..ed499ec387 100644
--- a/tools/coverage-renderer/src/llvm_cov.rs
+++ b/framework/meta/src/cmd/standalone/test_coverage_render/llvm_cov.rs
@@ -1,7 +1,8 @@
-use anyhow::{bail, Result};
 use serde::Deserialize;
 use serde_json::Value;
 
+use super::error::TestCoverageRenderError;
+
 #[derive(Deserialize)]
 pub struct Coverage {
     pub files: Vec<FileSummary>,
@@ -29,12 +30,16 @@ pub struct FileSummary {
     pub summary: Summary,
 }
 
-pub fn parse_llvm_cov_output(output: &str) -> Result<Coverage> {
-    let llvm_cov_output: Value = serde_json::from_str(output)?;
+pub fn parse_llvm_cov_output(output: &str) -> Result<Coverage, TestCoverageRenderError> {
+    let llvm_cov_output: Value =
+        serde_json::from_str(output).map_err(|_| TestCoverageRenderError::InvalidLlvmCovInput)?;
+
     let Some(coverage) = llvm_cov_output.get("data").and_then(|data| data.get(0)) else {
-        bail!("Invalid llvm-cov output");
+        return Err(TestCoverageRenderError::InvalidLlvmCovInput);
     };
 
-    let coverage = serde_json::from_value(coverage.to_owned())?;
+    let coverage = serde_json::from_value(coverage.to_owned())
+        .map_err(|_| TestCoverageRenderError::InvalidLlvmCovInput)?;
+
     Ok(coverage)
 }
diff --git a/framework/meta/src/cmd/standalone/test_coverage_render/render.rs b/framework/meta/src/cmd/standalone/test_coverage_render/render.rs
new file mode 100644
index 0000000000..3b0d8d1307
--- /dev/null
+++ b/framework/meta/src/cmd/standalone/test_coverage_render/render.rs
@@ -0,0 +1,86 @@
+use super::llvm_cov::{Coverage, FileSummary, Summary};
+
+use std::fmt::Write;
+
+fn writeln_output_str<S: AsRef<str>>(output: &mut String, input: S) {
+    output.write_str(&format!("{}\n", input.as_ref())).ok();
+}
+
+pub fn render_coverage(output: &mut String, coverage: &Coverage, root: &str) {
+    render_header(output);
+    render_totals(output, &coverage.totals);
+    render_files(output, &coverage.files, root);
+}
+
+fn render_header(output: &mut String) {
+    writeln_output_str(output, "# Coverage Summary\n");
+}
+
+fn render_totals(output: &mut String, summary: &Summary) {
+    writeln_output_str(output, "## Totals");
+
+    writeln_output_str(output, "| | Count | Covered | % |");
+    writeln_output_str(output, "|---|---|---|---|");
+    writeln_output_str(
+        output,
+        format!(
+            "| Lines | {} | {} | {:.2} |",
+            summary.lines.count, summary.lines.covered, summary.lines.percent
+        ),
+    );
+    writeln_output_str(
+        output,
+        format!(
+            "| Regions | {} | {} | {:.2} |",
+            summary.regions.count, summary.regions.covered, summary.regions.percent
+        ),
+    );
+    writeln_output_str(
+        output,
+        format!(
+            "| Functions | {} | {} | {:.2} |",
+            summary.functions.count, summary.functions.covered, summary.functions.percent
+        ),
+    );
+    writeln_output_str(
+        output,
+        format!(
+            "| Instantiations | {} | {} | {:.2} |\n",
+            summary.instantiations.count,
+            summary.instantiations.covered,
+            summary.instantiations.percent
+        ),
+    );
+}
+
+fn render_files(output: &mut String, files: &[FileSummary], root: &str) {
+    writeln_output_str(output, "## Files");
+    writeln_output_str(output, "<details><summary>Expand</summary>\n");
+    writeln_output_str(
+        output,
+        "| File | Lines | Regions | Functions | Instantiations |",
+    );
+    writeln_output_str(output, "|---|---|---|---|---|");
+    for file in files {
+        render_file(output, file, root);
+    }
+
+    writeln_output_str(output, "</details>");
+}
+
+fn render_file(output: &mut String, file: &FileSummary, root: &str) {
+    let summary = &file.summary;
+    let filename = file.filename.strip_prefix(root).unwrap();
+
+    writeln_output_str(
+        output,
+        format!(
+            "| {} | {:.2}% | {:.2}% | {:.2}% | {:.2}% |",
+            filename,
+            summary.lines.percent,
+            summary.regions.percent,
+            summary.functions.percent,
+            summary.instantiations.percent
+        ),
+    );
+}
diff --git a/tests-coverage.sh b/tests-coverage.sh
index 68139f8a8e..e7ec167ff0 100755
--- a/tests-coverage.sh
+++ b/tests-coverage.sh
@@ -25,9 +25,8 @@ llvm-cov export \
   --ignore-filename-regex='wasm-adapter' \
   --ignore-filename-regex='benchmarks/' \
   --ignore-filename-regex='tests/' \
-  --ignore-filename-regex='tools/coverage-renderer/' \
   --instr-profile=tests.profdata --summary-only --format=text > tests.coverage
 rm ./tests.profdata
 
-cargo run --quiet --bin coverage-renderer ./tests.coverage > coverage.md
+cargo run --bin sc-meta test-coverage-render --input ./tests.coverage --output ./coverage.md
 rm ./tests.coverage
\ No newline at end of file
diff --git a/tools/coverage-renderer/Cargo.toml b/tools/coverage-renderer/Cargo.toml
deleted file mode 100644
index eb7a044055..0000000000
--- a/tools/coverage-renderer/Cargo.toml
+++ /dev/null
@@ -1,9 +0,0 @@
-[package]
-name = "coverage-renderer"
-version = "0.1.0"
-edition = "2021"
-
-[dependencies]
-serde = { version = "1.0", features = ["derive"] }
-serde_json = "1.0"
-anyhow = "1.0.44"
\ No newline at end of file
diff --git a/tools/coverage-renderer/src/cargo.rs b/tools/coverage-renderer/src/cargo.rs
deleted file mode 100644
index 53c67e394c..0000000000
--- a/tools/coverage-renderer/src/cargo.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-use std::process::Command;
-
-use anyhow::{bail, Result};
-
-pub fn get_workspace_root() -> Result<String> {
-    let output = Command::new("cargo")
-        .args(["metadata", "--no-deps", "--format-version=1"])
-        .output()?;
-
-    let metadata: serde_json::Value = serde_json::from_slice(&output.stdout)?;
-
-    let Some(workspace_root) = metadata["workspace_root"].as_str() else {
-        bail!("Failed to get workspace root");
-    };
-
-    Ok(workspace_root.to_owned())
-}
diff --git a/tools/coverage-renderer/src/main.rs b/tools/coverage-renderer/src/main.rs
deleted file mode 100644
index 4d4234555d..0000000000
--- a/tools/coverage-renderer/src/main.rs
+++ /dev/null
@@ -1,28 +0,0 @@
-mod cargo;
-mod llvm_cov;
-mod renderer;
-
-use anyhow::{bail, Result};
-use std::env;
-
-use llvm_cov::parse_llvm_cov_output;
-use renderer::render_coverage;
-
-fn main() -> Result<()> {
-    let mut args = env::args();
-
-    if args.len() < 2 {
-        bail!("Usage: coverage-renderer <input_path>");
-    }
-
-    let root = cargo::get_workspace_root()?;
-
-    let input_path = args.nth(1).unwrap();
-    let input = std::fs::read_to_string(input_path)?;
-
-    let coverage = parse_llvm_cov_output(&input)?;
-
-    render_coverage(&coverage, &root);
-
-    Ok(())
-}
diff --git a/tools/coverage-renderer/src/renderer.rs b/tools/coverage-renderer/src/renderer.rs
deleted file mode 100644
index ae230d9c6c..0000000000
--- a/tools/coverage-renderer/src/renderer.rs
+++ /dev/null
@@ -1,65 +0,0 @@
-use crate::llvm_cov::{Coverage, FileSummary, Summary};
-
-pub fn render_coverage(coverage: &Coverage, root: &str) {
-    render_header();
-    render_totals(&coverage.totals);
-    render_files(&coverage.files, root);
-}
-
-fn render_header() {
-    println!("# Coverage Summary");
-    println!();
-}
-
-fn render_totals(summary: &Summary) {
-    println!("## Totals");
-
-    println!("| | Count | Covered | % |");
-    println!("|---|---|---|---|");
-    println!(
-        "| Lines | {} | {} | {:.2} |",
-        summary.lines.count, summary.lines.covered, summary.lines.percent
-    );
-    println!(
-        "| Regions | {} | {} | {:.2} |",
-        summary.regions.count, summary.regions.covered, summary.regions.percent
-    );
-    println!(
-        "| Functions | {} | {} | {:.2} |",
-        summary.functions.count, summary.functions.covered, summary.functions.percent
-    );
-    println!(
-        "| Instantiations | {} | {} | {:.2} |",
-        summary.instantiations.count,
-        summary.instantiations.covered,
-        summary.instantiations.percent
-    );
-
-    println!();
-}
-
-fn render_files(files: &[FileSummary], root: &str) {
-    println!("## Files");
-    println!("<details><summary>Expand</summary>\n");
-    println!("| File | Lines | Regions | Functions | Instantiations |");
-    println!("|---|---|---|---|---|");
-    for file in files {
-        render_file(file, root);
-    }
-
-    println!("</details>");
-}
-
-fn render_file(file: &FileSummary, root: &str) {
-    let summary = &file.summary;
-    let filename = file.filename.strip_prefix(root).unwrap();
-
-    println!(
-        "| {} | {:.2}% | {:.2}% | {:.2}% | {:.2}% |",
-        filename,
-        summary.lines.percent,
-        summary.regions.percent,
-        summary.functions.percent,
-        summary.instantiations.percent
-    );
-}

From 3e8e90088ad15d1e4f04b1ca3706616ec0e28b47 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 14 Mar 2024 13:09:17 +0100
Subject: [PATCH 0460/1254] tx proxy gen fix, multisig example

---
 contracts/examples/multisig/src/multisig.rs   |   1 +
 contracts/examples/multisig/src/proxy.rs      | 724 ++++++++++++++++++
 framework/base/src/abi/type_abi.rs            |  11 +-
 framework/base/src/abi/type_abi_impl_basic.rs |  25 +-
 .../base/src/abi/type_abi_impl_codec_multi.rs |  14 +
 .../src/storage/mappers/linked_list_mapper.rs |   2 +-
 .../base/src/storage/mappers/queue_mapper.rs  |   2 +-
 .../base/src/storage/mappers/set_mapper.rs    |   2 +-
 .../src/storage/mappers/unique_id_mapper.rs   |   2 +-
 .../storage/mappers/unordered_set_mapper.rs   |   2 +-
 .../base/src/storage/mappers/user_mapper.rs   |   2 +-
 .../base/src/storage/mappers/vec_mapper.rs    |   2 +-
 .../base/src/types/flags/code_metadata.rs     |   4 +
 .../src/types/interaction/function_call.rs    |   2 +-
 .../types/interaction/managed_arg_buffer.rs   |   2 +-
 framework/base/src/types/io/sc_result.rs      |   8 +-
 .../base/src/types/managed/basic/big_int.rs   |   2 +-
 .../src/types/managed/basic/big_int_sign.rs   |   2 +-
 .../base/src/types/managed/basic/big_uint.rs  |   2 +-
 .../src/types/managed/basic/elliptic_curve.rs |   2 +-
 .../src/types/managed/basic/managed_buffer.rs |   4 +
 .../esdt_token_payment_multi_value.rs         |   2 +-
 .../multi_value/multi_value_encoded.rs        |   2 +-
 .../types/managed/wrapped/managed_address.rs  |   2 +-
 .../managed/wrapped/managed_byte_array.rs     |   4 +-
 .../src/types/managed/wrapped/managed_vec.rs  |   4 +-
 .../src/types/static_buffer/sparse_array.rs   |   4 +-
 .../generate_proxy/proxy_sc_functions_gen.rs  |  25 +-
 28 files changed, 806 insertions(+), 54 deletions(-)
 create mode 100644 contracts/examples/multisig/src/proxy.rs

diff --git a/contracts/examples/multisig/src/multisig.rs b/contracts/examples/multisig/src/multisig.rs
index a3baed53ce..da8c81d21f 100644
--- a/contracts/examples/multisig/src/multisig.rs
+++ b/contracts/examples/multisig/src/multisig.rs
@@ -5,6 +5,7 @@ pub mod multisig_events;
 pub mod multisig_perform;
 pub mod multisig_propose;
 pub mod multisig_state;
+pub mod proxy;
 pub mod user_role;
 
 use action::ActionFullInfo;
diff --git a/contracts/examples/multisig/src/proxy.rs b/contracts/examples/multisig/src/proxy.rs
new file mode 100644
index 0000000000..73b99ea08c
--- /dev/null
+++ b/contracts/examples/multisig/src/proxy.rs
@@ -0,0 +1,724 @@
+////////////////////////////////////////////////////
+////////////////// AUTO-GENERATED //////////////////
+////////////////////////////////////////////////////
+
+#![allow(clippy::all)]
+
+use multiversx_sc::imports::*;
+use crate as multisig;
+
+pub struct MultisigProxy;
+
+impl<Env, From, To, Gas> TxProxyTrait<Env, From, To, Gas> for MultisigProxy
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    type TxProxyMethods = MultisigProxyMethods<Env, From, To, Gas>;
+
+    fn proxy_methods(self, tx: Tx<Env, From, To, (), Gas, (), ()>) -> Self::TxProxyMethods {
+        MultisigProxyMethods { wrapped_tx: tx }
+    }
+}
+
+pub struct MultisigProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    wrapped_tx: Tx<Env, From, To, (), Gas, (), ()>,
+}
+
+impl<Env, From, Gas> MultisigProxyMethods<Env, From, (), Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn init<
+        Arg0: CodecInto<usize>,
+        Arg1: CodecInto<MultiValueEncoded<Env::Api, ManagedAddress<Env::Api>>>,
+    >(
+        self,
+        quorum: Arg0,
+        board: Arg1,
+    ) -> Tx<
+        Env,
+        From,
+        (),
+        (),
+        Gas,
+        DeployCall<Env, ()>,
+        OriginalResultMarker<()>,
+    > {
+        self.wrapped_tx
+            .raw_deploy()
+            .argument(&quorum)
+            .argument(&board)
+            .original_result()
+    }
+
+}
+impl<Env, From, To, Gas> MultisigProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    /// Allows the contract to receive funds even if it is marked as unpayable in the protocol. 
+    pub fn deposit(
+        self,
+    ) -> Tx<
+        Env,
+        From,
+        To,
+        (),
+        Gas,
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<()>,
+    > {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("deposit")
+            .original_result()
+    }
+
+    /// Iterates through all actions and retrieves those that are still pending. 
+    /// Serialized full action data: 
+    /// - the action id 
+    /// - the serialized action data 
+    /// - (number of signers followed by) list of signer addresses. 
+    pub fn get_pending_action_full_info(
+        self,
+    ) -> Tx<
+        Env,
+        From,
+        To,
+        (),
+        Gas,
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<MultiValueEncoded<Env::Api, multisig::action::ActionFullInfo<Env::Api>>>,
+    > {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("getPendingActionFullInfo")
+            .original_result()
+    }
+
+    /// Returns `true` (`1`) if the user has signed the action. 
+    /// Does not check whether or not the user is still a board member and the signature valid. 
+    pub fn signed<
+        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+        Arg1: CodecInto<usize>,
+    >(
+        self,
+        user: Arg0,
+        action_id: Arg1,
+    ) -> Tx<
+        Env,
+        From,
+        To,
+        (),
+        Gas,
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<bool>,
+    > {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("signed")
+            .argument(&user)
+            .argument(&action_id)
+            .original_result()
+    }
+
+    /// Indicates user rights. 
+    /// `0` = no rights, 
+    /// `1` = can propose, but not sign, 
+    /// `2` = can propose and sign. 
+    pub fn user_role<
+        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+    >(
+        self,
+        user: Arg0,
+    ) -> Tx<
+        Env,
+        From,
+        To,
+        (),
+        Gas,
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<multisig::user_role::UserRole>,
+    > {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("userRole")
+            .argument(&user)
+            .original_result()
+    }
+
+    /// Lists all users that can sign actions. 
+    pub fn get_all_board_members(
+        self,
+    ) -> Tx<
+        Env,
+        From,
+        To,
+        (),
+        Gas,
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<MultiValueEncoded<Env::Api, ManagedAddress<Env::Api>>>,
+    > {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("getAllBoardMembers")
+            .original_result()
+    }
+
+    /// Lists all proposers that are not board members. 
+    pub fn get_all_proposers(
+        self,
+    ) -> Tx<
+        Env,
+        From,
+        To,
+        (),
+        Gas,
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<MultiValueEncoded<Env::Api, ManagedAddress<Env::Api>>>,
+    > {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("getAllProposers")
+            .original_result()
+    }
+
+    /// Used by board members to sign actions. 
+    pub fn sign<
+        Arg0: CodecInto<usize>,
+    >(
+        self,
+        action_id: Arg0,
+    ) -> Tx<
+        Env,
+        From,
+        To,
+        (),
+        Gas,
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<()>,
+    > {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("sign")
+            .argument(&action_id)
+            .original_result()
+    }
+
+    /// Board members can withdraw their signatures if they no longer desire for the action to be executed. 
+    /// Actions that are left with no valid signatures can be then deleted to free up storage. 
+    pub fn unsign<
+        Arg0: CodecInto<usize>,
+    >(
+        self,
+        action_id: Arg0,
+    ) -> Tx<
+        Env,
+        From,
+        To,
+        (),
+        Gas,
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<()>,
+    > {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("unsign")
+            .argument(&action_id)
+            .original_result()
+    }
+
+    /// Clears storage pertaining to an action that is no longer supposed to be executed. 
+    /// Any signatures that the action received must first be removed, via `unsign`. 
+    /// Otherwise this endpoint would be prone to abuse. 
+    pub fn discard_action<
+        Arg0: CodecInto<usize>,
+    >(
+        self,
+        action_id: Arg0,
+    ) -> Tx<
+        Env,
+        From,
+        To,
+        (),
+        Gas,
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<()>,
+    > {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("discardAction")
+            .argument(&action_id)
+            .original_result()
+    }
+
+    /// Minimum number of signatures needed to perform any action. 
+    pub fn quorum(
+        self,
+    ) -> Tx<
+        Env,
+        From,
+        To,
+        (),
+        Gas,
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<usize>,
+    > {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("getQuorum")
+            .original_result()
+    }
+
+    /// Denormalized board member count. 
+    /// It is kept in sync with the user list by the contract. 
+    pub fn num_board_members(
+        self,
+    ) -> Tx<
+        Env,
+        From,
+        To,
+        (),
+        Gas,
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<usize>,
+    > {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("getNumBoardMembers")
+            .original_result()
+    }
+
+    /// Denormalized proposer count. 
+    /// It is kept in sync with the user list by the contract. 
+    pub fn num_proposers(
+        self,
+    ) -> Tx<
+        Env,
+        From,
+        To,
+        (),
+        Gas,
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<usize>,
+    > {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("getNumProposers")
+            .original_result()
+    }
+
+    /// The index of the last proposed action. 
+    /// 0 means that no action was ever proposed yet. 
+    pub fn get_action_last_index(
+        self,
+    ) -> Tx<
+        Env,
+        From,
+        To,
+        (),
+        Gas,
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<usize>,
+    > {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("getActionLastIndex")
+            .original_result()
+    }
+
+    /// Serialized action data of an action with index. 
+    pub fn get_action_data<
+        Arg0: CodecInto<usize>,
+    >(
+        self,
+        action_id: Arg0,
+    ) -> Tx<
+        Env,
+        From,
+        To,
+        (),
+        Gas,
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<multisig::action::Action<Env::Api>>,
+    > {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("getActionData")
+            .argument(&action_id)
+            .original_result()
+    }
+
+    /// Gets addresses of all users who signed an action. 
+    /// Does not check if those users are still board members or not, 
+    /// so the result may contain invalid signers. 
+    pub fn get_action_signers<
+        Arg0: CodecInto<usize>,
+    >(
+        self,
+        action_id: Arg0,
+    ) -> Tx<
+        Env,
+        From,
+        To,
+        (),
+        Gas,
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<ManagedVec<Env::Api, ManagedAddress<Env::Api>>>,
+    > {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("getActionSigners")
+            .argument(&action_id)
+            .original_result()
+    }
+
+    /// Gets addresses of all users who signed an action and are still board members. 
+    /// All these signatures are currently valid. 
+    pub fn get_action_signer_count<
+        Arg0: CodecInto<usize>,
+    >(
+        self,
+        action_id: Arg0,
+    ) -> Tx<
+        Env,
+        From,
+        To,
+        (),
+        Gas,
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<usize>,
+    > {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("getActionSignerCount")
+            .argument(&action_id)
+            .original_result()
+    }
+
+    /// It is possible for board members to lose their role. 
+    /// They are not automatically removed from all actions when doing so, 
+    /// therefore the contract needs to re-check every time when actions are performed. 
+    /// This function is used to validate the signers before performing an action. 
+    /// It also makes it easy to check before performing an action. 
+    pub fn get_action_valid_signer_count<
+        Arg0: CodecInto<usize>,
+    >(
+        self,
+        action_id: Arg0,
+    ) -> Tx<
+        Env,
+        From,
+        To,
+        (),
+        Gas,
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<usize>,
+    > {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("getActionValidSignerCount")
+            .argument(&action_id)
+            .original_result()
+    }
+
+    /// Initiates board member addition process. 
+    /// Can also be used to promote a proposer to board member. 
+    pub fn propose_add_board_member<
+        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+    >(
+        self,
+        board_member_address: Arg0,
+    ) -> Tx<
+        Env,
+        From,
+        To,
+        (),
+        Gas,
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<usize>,
+    > {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("proposeAddBoardMember")
+            .argument(&board_member_address)
+            .original_result()
+    }
+
+    /// Initiates proposer addition process.. 
+    /// Can also be used to demote a board member to proposer. 
+    pub fn propose_add_proposer<
+        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+    >(
+        self,
+        proposer_address: Arg0,
+    ) -> Tx<
+        Env,
+        From,
+        To,
+        (),
+        Gas,
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<usize>,
+    > {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("proposeAddProposer")
+            .argument(&proposer_address)
+            .original_result()
+    }
+
+    /// Removes user regardless of whether it is a board member or proposer. 
+    pub fn propose_remove_user<
+        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+    >(
+        self,
+        user_address: Arg0,
+    ) -> Tx<
+        Env,
+        From,
+        To,
+        (),
+        Gas,
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<usize>,
+    > {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("proposeRemoveUser")
+            .argument(&user_address)
+            .original_result()
+    }
+
+    pub fn propose_change_quorum<
+        Arg0: CodecInto<usize>,
+    >(
+        self,
+        new_quorum: Arg0,
+    ) -> Tx<
+        Env,
+        From,
+        To,
+        (),
+        Gas,
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<usize>,
+    > {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("proposeChangeQuorum")
+            .argument(&new_quorum)
+            .original_result()
+    }
+
+    /// Propose a transaction in which the contract will perform a transfer-execute call. 
+    /// Can send EGLD without calling anything. 
+    /// Can call smart contract endpoints directly. 
+    /// Doesn't really work with builtin functions. 
+    pub fn propose_transfer_execute<
+        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+        Arg1: CodecInto<BigUint<Env::Api>>,
+        Arg2: CodecInto<FunctionCall<Env::Api>>,
+    >(
+        self,
+        to: Arg0,
+        egld_amount: Arg1,
+        function_call: Arg2,
+    ) -> Tx<
+        Env,
+        From,
+        To,
+        (),
+        Gas,
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<usize>,
+    > {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("proposeTransferExecute")
+            .argument(&to)
+            .argument(&egld_amount)
+            .argument(&function_call)
+            .original_result()
+    }
+
+    /// Propose a transaction in which the contract will perform a transfer-execute call. 
+    /// Can call smart contract endpoints directly. 
+    /// Can use ESDTTransfer/ESDTNFTTransfer/MultiESDTTransfer to send tokens, while also optionally calling endpoints. 
+    /// Works well with builtin functions. 
+    /// Cannot simply send EGLD directly without calling anything. 
+    pub fn propose_async_call<
+        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+        Arg1: CodecInto<BigUint<Env::Api>>,
+        Arg2: CodecInto<FunctionCall<Env::Api>>,
+    >(
+        self,
+        to: Arg0,
+        egld_amount: Arg1,
+        function_call: Arg2,
+    ) -> Tx<
+        Env,
+        From,
+        To,
+        (),
+        Gas,
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<usize>,
+    > {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("proposeAsyncCall")
+            .argument(&to)
+            .argument(&egld_amount)
+            .argument(&function_call)
+            .original_result()
+    }
+
+    pub fn propose_sc_deploy_from_source<
+        Arg0: CodecInto<BigUint<Env::Api>>,
+        Arg1: CodecInto<ManagedAddress<Env::Api>>,
+        Arg2: CodecInto<CodeMetadata>,
+        Arg3: CodecInto<MultiValueEncoded<Env::Api, ManagedBuffer<Env::Api>>>,
+    >(
+        self,
+        amount: Arg0,
+        source: Arg1,
+        code_metadata: Arg2,
+        arguments: Arg3,
+    ) -> Tx<
+        Env,
+        From,
+        To,
+        (),
+        Gas,
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<usize>,
+    > {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("proposeSCDeployFromSource")
+            .argument(&amount)
+            .argument(&source)
+            .argument(&code_metadata)
+            .argument(&arguments)
+            .original_result()
+    }
+
+    pub fn propose_sc_upgrade_from_source<
+        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+        Arg1: CodecInto<BigUint<Env::Api>>,
+        Arg2: CodecInto<ManagedAddress<Env::Api>>,
+        Arg3: CodecInto<CodeMetadata>,
+        Arg4: CodecInto<MultiValueEncoded<Env::Api, ManagedBuffer<Env::Api>>>,
+    >(
+        self,
+        sc_address: Arg0,
+        amount: Arg1,
+        source: Arg2,
+        code_metadata: Arg3,
+        arguments: Arg4,
+    ) -> Tx<
+        Env,
+        From,
+        To,
+        (),
+        Gas,
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<usize>,
+    > {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("proposeSCUpgradeFromSource")
+            .argument(&sc_address)
+            .argument(&amount)
+            .argument(&source)
+            .argument(&code_metadata)
+            .argument(&arguments)
+            .original_result()
+    }
+
+    /// Returns `true` (`1`) if `getActionValidSignerCount >= getQuorum`. 
+    pub fn quorum_reached<
+        Arg0: CodecInto<usize>,
+    >(
+        self,
+        action_id: Arg0,
+    ) -> Tx<
+        Env,
+        From,
+        To,
+        (),
+        Gas,
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<bool>,
+    > {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("quorumReached")
+            .argument(&action_id)
+            .original_result()
+    }
+
+    /// Proposers and board members use this to launch signed actions. 
+    pub fn perform_action_endpoint<
+        Arg0: CodecInto<usize>,
+    >(
+        self,
+        action_id: Arg0,
+    ) -> Tx<
+        Env,
+        From,
+        To,
+        (),
+        Gas,
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<OptionalValue<ManagedAddress<Env::Api>>>,
+    > {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("performAction")
+            .argument(&action_id)
+            .original_result()
+    }
+
+    pub fn dns_register<
+        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+        Arg1: CodecInto<ManagedBuffer<Env::Api>>,
+    >(
+        self,
+        dns_address: Arg0,
+        name: Arg1,
+    ) -> Tx<
+        Env,
+        From,
+        To,
+        (),
+        Gas,
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<()>,
+    > {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("dnsRegister")
+            .argument(&dns_address)
+            .argument(&name)
+            .original_result()
+    }
+
+}
diff --git a/framework/base/src/abi/type_abi.rs b/framework/base/src/abi/type_abi.rs
index 40c5022827..62633e2a70 100644
--- a/framework/base/src/abi/type_abi.rs
+++ b/framework/base/src/abi/type_abi.rs
@@ -1,5 +1,5 @@
 use super::*;
-use alloc::{string::ToString, vec::Vec};
+use alloc::{format, string::ToString, vec::Vec};
 
 pub trait TypeAbi {
     fn type_names() -> TypeNames {
@@ -63,10 +63,11 @@ pub trait TypeAbi {
 }
 
 pub fn type_name_variadic<T: TypeAbi>() -> TypeName {
-    let mut repr = TypeName::from("variadic<");
-    repr.push_str(T::type_name().as_str());
-    repr.push('>');
-    repr
+    format!("variadic<{}>", T::type_name())
+}
+
+pub fn type_name_multi_value_encoded<T: TypeAbi>() -> TypeName {
+    format!("MultiValueEncoded<$API, {}>", T::type_name_rust())
 }
 
 pub fn type_name_optional<T: TypeAbi>() -> TypeName {
diff --git a/framework/base/src/abi/type_abi_impl_basic.rs b/framework/base/src/abi/type_abi_impl_basic.rs
index 133e67085a..8a2bb41c94 100644
--- a/framework/base/src/abi/type_abi_impl_basic.rs
+++ b/framework/base/src/abi/type_abi_impl_basic.rs
@@ -2,6 +2,7 @@ use super::*;
 use crate::arrayvec::ArrayVec;
 use alloc::{
     boxed::Box,
+    format,
     string::{String, ToString},
     vec::Vec,
 };
@@ -55,7 +56,7 @@ impl<T: TypeAbi> TypeAbi for &[T] {
     }
 
     fn type_name_rust() -> TypeName {
-        T::type_name_rust()
+        format!("&[{}]", T::type_name_rust())
     }
 
     fn provide_type_descriptions<TDC: TypeDescriptionContainer>(accumulator: &mut TDC) {
@@ -69,7 +70,7 @@ impl<T: TypeAbi> TypeAbi for Vec<T> {
     }
 
     fn type_name_rust() -> TypeName {
-        <&[T]>::type_name_rust()
+        format!("Vec<{}>", T::type_name_rust())
     }
 
     fn provide_type_descriptions<TDC: TypeDescriptionContainer>(accumulator: &mut TDC) {
@@ -83,7 +84,7 @@ impl<T: TypeAbi, const CAP: usize> TypeAbi for ArrayVec<T, CAP> {
     }
 
     fn type_name_rust() -> TypeName {
-        <&[T]>::type_name_rust()
+        format!("ArrayVec<{}, {}usize>", T::type_name_rust(), CAP)
     }
 
     fn provide_type_descriptions<TDC: TypeDescriptionContainer>(accumulator: &mut TDC) {
@@ -117,7 +118,7 @@ impl TypeAbi for &str {
     }
 
     fn type_name_rust() -> TypeName {
-        TypeName::type_name_rust()
+        "&str".into()
     }
 }
 
@@ -160,10 +161,12 @@ type_abi_name_only!(bool, "bool");
 
 impl<T: TypeAbi> TypeAbi for Option<T> {
     fn type_name() -> TypeName {
-        let mut repr = TypeName::from("Option<");
-        repr.push_str(T::type_name().as_str());
-        repr.push('>');
-        repr
+        format!("Option<{}>", T::type_name())
+    }
+
+    
+    fn type_name_rust() -> TypeName {
+        format!("Option<{}>", T::type_name_rust())
     }
 
     fn provide_type_descriptions<TDC: TypeDescriptionContainer>(accumulator: &mut TDC) {
@@ -177,7 +180,11 @@ impl<T: TypeAbi, E> TypeAbi for Result<T, E> {
     }
 
     fn type_name_rust() -> TypeName {
-        T::type_name_rust()
+        format!(
+            "Result<{}, {}>",
+            T::type_name_rust(),
+            core::any::type_name::<E>()
+        )
     }
 
     /// Similar to the SCResult implementation.
diff --git a/framework/base/src/abi/type_abi_impl_codec_multi.rs b/framework/base/src/abi/type_abi_impl_codec_multi.rs
index 6227634258..9d34d8b5f9 100644
--- a/framework/base/src/abi/type_abi_impl_codec_multi.rs
+++ b/framework/base/src/abi/type_abi_impl_codec_multi.rs
@@ -1,3 +1,5 @@
+use alloc::format;
+
 use crate::{
     abi::{OutputAbis, TypeAbi, TypeDescriptionContainer, TypeName},
     codec::multi_types::{IgnoreValue, OptionalValue},
@@ -9,6 +11,10 @@ impl<T: TypeAbi> TypeAbi for crate::codec::multi_types::MultiValueVec<T> {
         super::type_name_variadic::<T>()
     }
 
+    fn type_name_rust() -> TypeName {
+        format!("MultiValueVec<$API, {}>", T::type_name_rust())
+    }
+
     fn provide_type_descriptions<TDC: TypeDescriptionContainer>(accumulator: &mut TDC) {
         T::provide_type_descriptions(accumulator);
     }
@@ -23,6 +29,10 @@ impl TypeAbi for IgnoreValue {
         TypeName::from("ignore")
     }
 
+    fn type_name_rust() -> TypeName {
+        "IgnoreValue".into()
+    }
+
     fn is_variadic() -> bool {
         true
     }
@@ -33,6 +43,10 @@ impl<T: TypeAbi> TypeAbi for OptionalValue<T> {
         super::type_name_optional::<T>()
     }
 
+    fn type_name_rust() -> TypeName {
+        format!("OptionalValue<{}>", T::type_name_rust())
+    }
+
     fn provide_type_descriptions<TDC: TypeDescriptionContainer>(accumulator: &mut TDC) {
         T::provide_type_descriptions(accumulator);
     }
diff --git a/framework/base/src/storage/mappers/linked_list_mapper.rs b/framework/base/src/storage/mappers/linked_list_mapper.rs
index 38f71f9191..7382ae8229 100644
--- a/framework/base/src/storage/mappers/linked_list_mapper.rs
+++ b/framework/base/src/storage/mappers/linked_list_mapper.rs
@@ -630,7 +630,7 @@ where
     }
 
     fn type_name_rust() -> TypeName {
-        T::type_name_rust()
+        crate::abi::type_name_multi_value_encoded::<T>()
     }
 
     fn provide_type_descriptions<TDC: TypeDescriptionContainer>(accumulator: &mut TDC) {
diff --git a/framework/base/src/storage/mappers/queue_mapper.rs b/framework/base/src/storage/mappers/queue_mapper.rs
index c2b90f0fe3..93d90de1a3 100644
--- a/framework/base/src/storage/mappers/queue_mapper.rs
+++ b/framework/base/src/storage/mappers/queue_mapper.rs
@@ -536,7 +536,7 @@ where
     }
 
     fn type_name_rust() -> TypeName {
-        T::type_name_rust()
+        crate::abi::type_name_multi_value_encoded::<T>()
     }
 
     fn provide_type_descriptions<TDC: TypeDescriptionContainer>(accumulator: &mut TDC) {
diff --git a/framework/base/src/storage/mappers/set_mapper.rs b/framework/base/src/storage/mappers/set_mapper.rs
index d95ca8df6b..79492b9a43 100644
--- a/framework/base/src/storage/mappers/set_mapper.rs
+++ b/framework/base/src/storage/mappers/set_mapper.rs
@@ -312,7 +312,7 @@ where
     }
 
     fn type_name_rust() -> TypeName {
-        T::type_name_rust()
+        crate::abi::type_name_multi_value_encoded::<T>()
     }
 
     fn provide_type_descriptions<TDC: TypeDescriptionContainer>(accumulator: &mut TDC) {
diff --git a/framework/base/src/storage/mappers/unique_id_mapper.rs b/framework/base/src/storage/mappers/unique_id_mapper.rs
index 546fdc9825..550729952f 100644
--- a/framework/base/src/storage/mappers/unique_id_mapper.rs
+++ b/framework/base/src/storage/mappers/unique_id_mapper.rs
@@ -228,7 +228,7 @@ where
     }
 
     fn type_name_rust() -> TypeName {
-        usize::type_name_rust()
+        crate::abi::type_name_multi_value_encoded::<usize>()
     }
 
     fn provide_type_descriptions<TDC: TypeDescriptionContainer>(accumulator: &mut TDC) {
diff --git a/framework/base/src/storage/mappers/unordered_set_mapper.rs b/framework/base/src/storage/mappers/unordered_set_mapper.rs
index dac6516cca..ef2a708fad 100644
--- a/framework/base/src/storage/mappers/unordered_set_mapper.rs
+++ b/framework/base/src/storage/mappers/unordered_set_mapper.rs
@@ -243,7 +243,7 @@ where
     }
 
     fn type_name_rust() -> TypeName {
-        T::type_name_rust()
+        crate::abi::type_name_multi_value_encoded::<T>()
     }
 
     fn provide_type_descriptions<TDC: TypeDescriptionContainer>(accumulator: &mut TDC) {
diff --git a/framework/base/src/storage/mappers/user_mapper.rs b/framework/base/src/storage/mappers/user_mapper.rs
index 2339b019ab..4fc7a50f74 100644
--- a/framework/base/src/storage/mappers/user_mapper.rs
+++ b/framework/base/src/storage/mappers/user_mapper.rs
@@ -234,7 +234,7 @@ where
     }
 
     fn type_name_rust() -> TypeName {
-        ManagedAddress::<SA>::type_name_rust()
+        crate::abi::type_name_multi_value_encoded::<ManagedAddress<SA>>()
     }
 
     fn is_variadic() -> bool {
diff --git a/framework/base/src/storage/mappers/vec_mapper.rs b/framework/base/src/storage/mappers/vec_mapper.rs
index af0afe3278..457ac55cfa 100644
--- a/framework/base/src/storage/mappers/vec_mapper.rs
+++ b/framework/base/src/storage/mappers/vec_mapper.rs
@@ -362,7 +362,7 @@ where
     }
 
     fn type_name_rust() -> TypeName {
-        T::type_name_rust()
+        crate::abi::type_name_multi_value_encoded::<T>()
     }
 
     fn provide_type_descriptions<TDC: TypeDescriptionContainer>(accumulator: &mut TDC) {
diff --git a/framework/base/src/types/flags/code_metadata.rs b/framework/base/src/types/flags/code_metadata.rs
index 89df4b91de..6c65859c1a 100644
--- a/framework/base/src/types/flags/code_metadata.rs
+++ b/framework/base/src/types/flags/code_metadata.rs
@@ -107,6 +107,10 @@ impl TypeAbi for CodeMetadata {
     fn type_name() -> TypeName {
         "CodeMetadata".into()
     }
+
+    fn type_name_rust() -> TypeName {
+        "CodeMetadata".into()
+    }
 }
 
 impl SCDisplay for CodeMetadata {
diff --git a/framework/base/src/types/interaction/function_call.rs b/framework/base/src/types/interaction/function_call.rs
index c21ab3a3e3..63814de88a 100644
--- a/framework/base/src/types/interaction/function_call.rs
+++ b/framework/base/src/types/interaction/function_call.rs
@@ -143,7 +143,7 @@ where
     }
 
     fn type_name_rust() -> TypeName {
-        ManagedAddress::<Api>::type_name_rust()
+        "FunctionCall<$API>".into()
     }
 
     fn is_variadic() -> bool {
diff --git a/framework/base/src/types/interaction/managed_arg_buffer.rs b/framework/base/src/types/interaction/managed_arg_buffer.rs
index d9a009e01e..e2d13f3566 100644
--- a/framework/base/src/types/interaction/managed_arg_buffer.rs
+++ b/framework/base/src/types/interaction/managed_arg_buffer.rs
@@ -309,6 +309,6 @@ where
     }
 
     fn type_name_rust() -> TypeName {
-        <&[ManagedBuffer<M>] as TypeAbi>::type_name_rust()
+        "ManagedArgBufer<$API>".into()
     }
 }
diff --git a/framework/base/src/types/io/sc_result.rs b/framework/base/src/types/io/sc_result.rs
index 17d915994e..78a4d2ec18 100644
--- a/framework/base/src/types/io/sc_result.rs
+++ b/framework/base/src/types/io/sc_result.rs
@@ -1,3 +1,5 @@
+use alloc::format;
+
 use crate::codec::{EncodeErrorHandler, TopEncodeMulti, TopEncodeMultiOutput};
 
 use crate::{
@@ -133,7 +135,11 @@ impl<T: TypeAbi, E> TypeAbi for SCResult<T, E> {
     }
 
     fn type_name_rust() -> TypeName {
-        T::type_name_rust()
+        format!(
+            "SCResult<{}, {}>",
+            T::type_name_rust(),
+            core::any::type_name::<E>()
+        )
     }
 
     /// Gives `SCResult<()>` the possibility to produce 0 output ABIs,
diff --git a/framework/base/src/types/managed/basic/big_int.rs b/framework/base/src/types/managed/basic/big_int.rs
index c2aed1704a..e924a14787 100644
--- a/framework/base/src/types/managed/basic/big_int.rs
+++ b/framework/base/src/types/managed/basic/big_int.rs
@@ -304,7 +304,7 @@ impl<M: ManagedTypeApi> crate::abi::TypeAbi for BigInt<M> {
     }
 
     fn type_name_rust() -> TypeName {
-        TypeName::from("multiversx_sc::types::BigInt<$API>")
+        TypeName::from("BigInt<$API>")
     }
 }
 
diff --git a/framework/base/src/types/managed/basic/big_int_sign.rs b/framework/base/src/types/managed/basic/big_int_sign.rs
index c0c7e01d81..641e1c9328 100644
--- a/framework/base/src/types/managed/basic/big_int_sign.rs
+++ b/framework/base/src/types/managed/basic/big_int_sign.rs
@@ -85,6 +85,6 @@ impl crate::abi::TypeAbi for Sign {
     }
 
     fn type_name_rust() -> TypeName {
-        TypeName::from("multiversx_sc::types::Sign<$API>")
+        TypeName::from("multiversx_sc::types::Sign")
     }
 }
diff --git a/framework/base/src/types/managed/basic/big_uint.rs b/framework/base/src/types/managed/basic/big_uint.rs
index df0c1b947b..4e1d286908 100644
--- a/framework/base/src/types/managed/basic/big_uint.rs
+++ b/framework/base/src/types/managed/basic/big_uint.rs
@@ -293,7 +293,7 @@ impl<M: ManagedTypeApi> crate::abi::TypeAbi for BigUint<M> {
     }
 
     fn type_name_rust() -> TypeName {
-        TypeName::from("multiversx_sc::types::BigUint<$API>")
+        TypeName::from("BigUint<$API>")
     }
 }
 
diff --git a/framework/base/src/types/managed/basic/elliptic_curve.rs b/framework/base/src/types/managed/basic/elliptic_curve.rs
index 95fecb7e2a..904a0de67a 100644
--- a/framework/base/src/types/managed/basic/elliptic_curve.rs
+++ b/framework/base/src/types/managed/basic/elliptic_curve.rs
@@ -424,6 +424,6 @@ impl<M: ManagedTypeApi> TypeAbi for EllipticCurve<M> {
     }
 
     fn type_name_rust() -> TypeName {
-        TypeName::from("multiversx_sc::types::EllipticCurve<$API>")
+        TypeName::from("EllipticCurve<$API>")
     }
 }
diff --git a/framework/base/src/types/managed/basic/managed_buffer.rs b/framework/base/src/types/managed/basic/managed_buffer.rs
index 1caa2411f1..b39643a27d 100644
--- a/framework/base/src/types/managed/basic/managed_buffer.rs
+++ b/framework/base/src/types/managed/basic/managed_buffer.rs
@@ -465,6 +465,10 @@ impl<M: ManagedTypeApi> crate::abi::TypeAbi for ManagedBuffer<M> {
     fn type_name() -> TypeName {
         "bytes".into()
     }
+
+    fn type_name_rust() -> TypeName {
+        "ManagedBuffer<$API>".into()
+    }
 }
 
 impl<M: ManagedTypeApi> SCDisplay for ManagedBuffer<M> {
diff --git a/framework/base/src/types/managed/multi_value/esdt_token_payment_multi_value.rs b/framework/base/src/types/managed/multi_value/esdt_token_payment_multi_value.rs
index f1ce48e609..9f27f1cd89 100644
--- a/framework/base/src/types/managed/multi_value/esdt_token_payment_multi_value.rs
+++ b/framework/base/src/types/managed/multi_value/esdt_token_payment_multi_value.rs
@@ -107,7 +107,7 @@ where
     }
 
     fn type_name_rust() -> TypeName {
-        MultiValue3::<TokenIdentifier<M>, u64, BigUint<M>>::type_name_rust()
+        "EsdtTokenPaymentMultiValue<$API>".into()
     }
 
     fn is_variadic() -> bool {
diff --git a/framework/base/src/types/managed/multi_value/multi_value_encoded.rs b/framework/base/src/types/managed/multi_value/multi_value_encoded.rs
index 6cbb85fe54..be22e29b10 100644
--- a/framework/base/src/types/managed/multi_value/multi_value_encoded.rs
+++ b/framework/base/src/types/managed/multi_value/multi_value_encoded.rs
@@ -232,7 +232,7 @@ where
     }
 
     fn type_name_rust() -> TypeName {
-        T::type_name_rust()
+        crate::abi::type_name_multi_value_encoded::<T>()
     }
 
     fn provide_type_descriptions<TDC: TypeDescriptionContainer>(accumulator: &mut TDC) {
diff --git a/framework/base/src/types/managed/wrapped/managed_address.rs b/framework/base/src/types/managed/wrapped/managed_address.rs
index e65469fc63..d0bf38f9dc 100644
--- a/framework/base/src/types/managed/wrapped/managed_address.rs
+++ b/framework/base/src/types/managed/wrapped/managed_address.rs
@@ -244,7 +244,7 @@ where
     }
 
     fn type_name_rust() -> TypeName {
-        Address::type_name_rust()
+        "ManagedAddress<$API>".into()
     }
 }
 
diff --git a/framework/base/src/types/managed/wrapped/managed_byte_array.rs b/framework/base/src/types/managed/wrapped/managed_byte_array.rs
index 413152bcc1..5ff3b37c6f 100644
--- a/framework/base/src/types/managed/wrapped/managed_byte_array.rs
+++ b/framework/base/src/types/managed/wrapped/managed_byte_array.rs
@@ -1,5 +1,7 @@
 use core::convert::TryFrom;
 
+use alloc::format;
+
 use crate::{
     abi::{TypeAbi, TypeName},
     api::ManagedTypeApi,
@@ -213,7 +215,7 @@ where
     }
 
     fn type_name_rust() -> TypeName {
-        <&[u8; N] as TypeAbi>::type_name_rust()
+        format!("ManagedByteArray<$API, {N}usize>")
     }
 }
 
diff --git a/framework/base/src/types/managed/wrapped/managed_vec.rs b/framework/base/src/types/managed/wrapped/managed_vec.rs
index d66e09436b..0b6b4c996a 100644
--- a/framework/base/src/types/managed/wrapped/managed_vec.rs
+++ b/framework/base/src/types/managed/wrapped/managed_vec.rs
@@ -12,7 +12,7 @@ use crate::{
         ManagedVecRefIterator, MultiValueEncoded, MultiValueManagedVec,
     },
 };
-use alloc::vec::Vec;
+use alloc::{format, vec::Vec};
 use core::{
     borrow::Borrow,
     cmp::Ordering,
@@ -689,7 +689,7 @@ where
     }
 
     fn type_name_rust() -> TypeName {
-        <&[T] as TypeAbi>::type_name_rust()
+        format!("ManagedVec<$API, {}>", T::type_name_rust())
     }
 
     fn provide_type_descriptions<TDC: TypeDescriptionContainer>(accumulator: &mut TDC) {
diff --git a/framework/base/src/types/static_buffer/sparse_array.rs b/framework/base/src/types/static_buffer/sparse_array.rs
index 59001062b1..a0e556f2d8 100644
--- a/framework/base/src/types/static_buffer/sparse_array.rs
+++ b/framework/base/src/types/static_buffer/sparse_array.rs
@@ -1,3 +1,5 @@
+use alloc::format;
+
 use crate::{
     abi::{TypeAbi, TypeDescriptionContainer, TypeName},
     api::{ErrorApi, ErrorApiImpl},
@@ -312,7 +314,7 @@ where
     }
 
     fn type_name_rust() -> TypeName {
-        <&[usize] as TypeAbi>::type_name_rust()
+        format!("SparseArray<$API, {CAPACITY}usize>")
     }
 
     fn provide_type_descriptions<TDC: TypeDescriptionContainer>(accumulator: &mut TDC) {
diff --git a/framework/meta/src/cmd/contract/generate_proxy/proxy_sc_functions_gen.rs b/framework/meta/src/cmd/contract/generate_proxy/proxy_sc_functions_gen.rs
index f3b4d6fccf..d1909b25c6 100644
--- a/framework/meta/src/cmd/contract/generate_proxy/proxy_sc_functions_gen.rs
+++ b/framework/meta/src/cmd/contract/generate_proxy/proxy_sc_functions_gen.rs
@@ -2,10 +2,7 @@ use std::{fs::File, io::Write};
 
 use multiversx_sc::abi::{ContractAbi, EndpointAbi, InputAbi, OutputAbi};
 
-use crate::cmd::contract::generate_snippets::{
-    snippet_gen_common::write_newline,
-    snippet_type_map::{handle_abi_type, RustTypeString},
-};
+use crate::cmd::contract::generate_snippets::snippet_gen_common::write_newline;
 
 use super::proxy_naming::proxy_methods_type_name;
 
@@ -168,12 +165,8 @@ fn write_function_header_endpoint(file: &mut File, rust_method_name: String) {
 }
 
 fn write_endpoint_docs(file: &mut File, docs: Vec<String>) {
-    if !docs.is_empty() {
-        write!(file, "    /// ").unwrap();
-    }
-
     for abi_doc in docs {
-        writeln!(file, "{abi_doc} ").unwrap();
+        writeln!(file, "    /// {abi_doc} ").unwrap();
     }
 }
 
@@ -185,21 +178,15 @@ fn write_args(file: &mut File, inputs: Vec<InputAbi>) {
     writeln!(file, "<").unwrap();
 
     for (index, input) in inputs.iter().enumerate() {
-        write_argument(file, index, input.type_names.abi.to_string());
+        write_argument(file, index, &input.type_names.rust);
     }
 
     write!(file, "    >").unwrap();
 }
 
-fn write_argument(file: &mut File, index: usize, type_name: String) {
-    let mut type_string = RustTypeString::default();
-    handle_abi_type(&mut type_string, type_name);
-    let type_print = type_string
-        .get_type_name()
-        .replace("StaticApi", "Env::Api")
-        .to_string();
-
-    writeln!(file, "        Arg{index}: CodecInto<{}>,", type_print).unwrap();
+fn write_argument(file: &mut File, index: usize, rust_name: &str) {
+    let adjusted = adjust_type_name(rust_name);
+    writeln!(file, "        Arg{index}: CodecInto<{adjusted}>,").unwrap();
 }
 
 fn write_end_of_function(file: &mut File) {

From af48f3857df00023e9f1f9f33f9a31a773c2c74c Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 14 Mar 2024 13:11:51 +0100
Subject: [PATCH 0461/1254] clippy fix

---
 framework/base/src/types/interaction/tx.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/framework/base/src/types/interaction/tx.rs b/framework/base/src/types/interaction/tx.rs
index b7c47f1930..c2ca6a8903 100644
--- a/framework/base/src/types/interaction/tx.rs
+++ b/framework/base/src/types/interaction/tx.rs
@@ -543,6 +543,7 @@ where
     FC: TxDataFunctionCall<Env>,
     RH: TxResultHandler<Env>,
 {
+    #[allow(clippy::type_complexity)]
     pub fn normalize_tx(
         self,
     ) -> Tx<

From aa0ef9af7fcea0171a173bd5ea5f106f671d8e95 Mon Sep 17 00:00:00 2001
From: Laurentiu Ciobanu <laurentiu.ciobanu@multiversx.com>
Date: Thu, 14 Mar 2024 14:19:37 +0200
Subject: [PATCH 0462/1254] remove old tests-coverage.sh script

---
 tests-coverage.sh | 32 --------------------------------
 1 file changed, 32 deletions(-)
 delete mode 100755 tests-coverage.sh

diff --git a/tests-coverage.sh b/tests-coverage.sh
deleted file mode 100755
index e7ec167ff0..0000000000
--- a/tests-coverage.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-RUSTFLAGS="-C instrument-coverage" \
-    cargo test --tests
-
-PROFRAW_FILES=$(find . -name "default_*.profraw")
-llvm-profdata merge -sparse $PROFRAW_FILES -o tests.profdata
-find . -name "default_*.profraw" -delete
-
-llvm-cov export \
-    $( \
-      for file in \
-        $( \
-          RUSTFLAGS="-C instrument-coverage" \
-            cargo test --tests --no-run --message-format=json \
-              | jq -r "select(.profile.test == true) | .filenames[]" \
-              | grep -v dSYM - \
-        ); \
-      do \
-        printf "%s %s " -object $file; \
-      done \
-    ) \
-  --ignore-filename-regex='/.cargo/registry' \
-  --ignore-filename-regex='rustc/' \
-  --ignore-filename-regex='meta/src' \
-  --ignore-filename-regex='wasm-adapter' \
-  --ignore-filename-regex='benchmarks/' \
-  --ignore-filename-regex='tests/' \
-  --instr-profile=tests.profdata --summary-only --format=text > tests.coverage
-rm ./tests.profdata
-
-cargo run --bin sc-meta test-coverage-render --input ./tests.coverage --output ./coverage.md
-rm ./tests.coverage
\ No newline at end of file

From 89cf6612fb65b7ea8062fa3601794139e758e90d Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 14 Mar 2024 17:55:35 +0100
Subject: [PATCH 0463/1254] adder interactor in template

---
 Cargo.lock                                    | 22 ++++++------
 contracts/examples/adder/interact/Cargo.toml  |  6 ++--
 .../{adder_interact.rs => basic_interact.rs}  | 34 +++++++++----------
 ..._interact_cli.rs => basic_interact_cli.rs} |  0
 ...act_config.rs => basic_interact_config.rs} |  0
 ...eract_state.rs => basic_interact_state.rs} |  0
 contracts/examples/adder/mxsc-template.toml   |  5 +++
 .../standalone/template/template_adjuster.rs  | 22 +++++++++++-
 .../standalone/template/template_metadata.rs  |  3 ++
 framework/meta/tests/template_test.rs         | 21 ++++++++++++
 10 files changed, 81 insertions(+), 32 deletions(-)
 rename contracts/examples/adder/interact/src/{adder_interact.rs => basic_interact.rs} (87%)
 rename contracts/examples/adder/interact/src/{adder_interact_cli.rs => basic_interact_cli.rs} (100%)
 rename contracts/examples/adder/interact/src/{adder_interact_config.rs => basic_interact_config.rs} (100%)
 rename contracts/examples/adder/interact/src/{adder_interact_state.rs => basic_interact_state.rs} (100%)

diff --git a/Cargo.lock b/Cargo.lock
index 1e015137d2..a499eedc34 100755
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -37,17 +37,6 @@ dependencies = [
  "multiversx-sc-scenario",
 ]
 
-[[package]]
-name = "adder-interact"
-version = "0.0.0"
-dependencies = [
- "adder",
- "clap",
- "multiversx-sc-snippets",
- "serde",
- "toml",
-]
-
 [[package]]
 name = "adder-meta"
 version = "0.0.0"
@@ -213,6 +202,17 @@ dependencies = [
  "multiversx-sc-meta",
 ]
 
+[[package]]
+name = "basic-interact"
+version = "0.0.0"
+dependencies = [
+ "adder",
+ "clap",
+ "multiversx-sc-snippets",
+ "serde",
+ "toml",
+]
+
 [[package]]
 name = "bech32"
 version = "0.9.1"
diff --git a/contracts/examples/adder/interact/Cargo.toml b/contracts/examples/adder/interact/Cargo.toml
index 5ff9488dbf..a9d36faf3b 100644
--- a/contracts/examples/adder/interact/Cargo.toml
+++ b/contracts/examples/adder/interact/Cargo.toml
@@ -1,13 +1,13 @@
 [package]
-name = "adder-interact"
+name = "basic-interact"
 version = "0.0.0"
 authors = ["Ovidiu Stinga <ovidiu.stinga@multiversx.com>"]
 edition = "2021"
 publish = false
 
 [[bin]]
-name = "adder-interact"
-path = "src/adder_interact.rs"
+name = "basic-interact"
+path = "src/basic_interact.rs"
 
 [dependencies]
 clap = { version = "4.4.7", features = ["derive"] }
diff --git a/contracts/examples/adder/interact/src/adder_interact.rs b/contracts/examples/adder/interact/src/basic_interact.rs
similarity index 87%
rename from contracts/examples/adder/interact/src/adder_interact.rs
rename to contracts/examples/adder/interact/src/basic_interact.rs
index 10df4ddf61..3dd78d048a 100644
--- a/contracts/examples/adder/interact/src/adder_interact.rs
+++ b/contracts/examples/adder/interact/src/basic_interact.rs
@@ -1,10 +1,10 @@
-mod adder_interact_cli;
-mod adder_interact_config;
-mod adder_interact_state;
+mod basic_interact_cli;
+mod basic_interact_config;
+mod basic_interact_state;
 
 use adder::ProxyTrait;
-use adder_interact_config::Config;
-use adder_interact_state::State;
+use basic_interact_config::Config;
+use basic_interact_state::State;
 use clap::Parser;
 use multiversx_sc_snippets::{
     env_logger,
@@ -30,24 +30,24 @@ const INTERACTOR_SCENARIO_TRACE_PATH: &str = "interactor_trace.scen.json";
 async fn main() {
     env_logger::init();
 
-    let mut adder_interact = AdderInteract::init().await;
+    let mut basic_interact = AdderInteract::init().await;
 
-    let cli = adder_interact_cli::InteractCli::parse();
+    let cli = basic_interact_cli::InteractCli::parse();
     match &cli.command {
-        Some(adder_interact_cli::InteractCliCommand::Add(args)) => {
-            adder_interact.add(args.value).await;
+        Some(basic_interact_cli::InteractCliCommand::Add(args)) => {
+            basic_interact.add(args.value).await;
         },
-        Some(adder_interact_cli::InteractCliCommand::Deploy) => {
-            adder_interact.deploy().await;
+        Some(basic_interact_cli::InteractCliCommand::Deploy) => {
+            basic_interact.deploy().await;
         },
-        Some(adder_interact_cli::InteractCliCommand::Feed) => {
-            adder_interact.feed_contract_egld().await;
+        Some(basic_interact_cli::InteractCliCommand::Feed) => {
+            basic_interact.feed_contract_egld().await;
         },
-        Some(adder_interact_cli::InteractCliCommand::MultiDeploy(args)) => {
-            adder_interact.multi_deploy(&args.count).await;
+        Some(basic_interact_cli::InteractCliCommand::MultiDeploy(args)) => {
+            basic_interact.multi_deploy(&args.count).await;
         },
-        Some(adder_interact_cli::InteractCliCommand::Sum) => {
-            adder_interact.print_sum().await;
+        Some(basic_interact_cli::InteractCliCommand::Sum) => {
+            basic_interact.print_sum().await;
         },
         None => {},
     }
diff --git a/contracts/examples/adder/interact/src/adder_interact_cli.rs b/contracts/examples/adder/interact/src/basic_interact_cli.rs
similarity index 100%
rename from contracts/examples/adder/interact/src/adder_interact_cli.rs
rename to contracts/examples/adder/interact/src/basic_interact_cli.rs
diff --git a/contracts/examples/adder/interact/src/adder_interact_config.rs b/contracts/examples/adder/interact/src/basic_interact_config.rs
similarity index 100%
rename from contracts/examples/adder/interact/src/adder_interact_config.rs
rename to contracts/examples/adder/interact/src/basic_interact_config.rs
diff --git a/contracts/examples/adder/interact/src/adder_interact_state.rs b/contracts/examples/adder/interact/src/basic_interact_state.rs
similarity index 100%
rename from contracts/examples/adder/interact/src/adder_interact_state.rs
rename to contracts/examples/adder/interact/src/basic_interact_state.rs
diff --git a/contracts/examples/adder/mxsc-template.toml b/contracts/examples/adder/mxsc-template.toml
index 59d08379d0..341c2d6cf5 100644
--- a/contracts/examples/adder/mxsc-template.toml
+++ b/contracts/examples/adder/mxsc-template.toml
@@ -15,4 +15,9 @@ files_include = [
     "Cargo.toml",
     "README.md",
     "multiversx.json",
+    "interact/Cargo.toml",
+    "interact/config.toml",
+    "interact/.gitignore",
+    "interact/src",
 ]
+has_interactor = true
diff --git a/framework/meta/src/cmd/standalone/template/template_adjuster.rs b/framework/meta/src/cmd/standalone/template/template_adjuster.rs
index 6751fb175c..9fd3ee741e 100644
--- a/framework/meta/src/cmd/standalone/template/template_adjuster.rs
+++ b/framework/meta/src/cmd/standalone/template/template_adjuster.rs
@@ -10,6 +10,7 @@ use ruplacer::Query;
 use toml::value::Table;
 
 const TEST_DIRECTORY: &str = "./tests";
+const INTERACT_DIRECTORY: &str = "./interact";
 const ROOT_CARGO_TOML: &str = "./Cargo.toml";
 const META_CARGO_TOML: &str = "./meta/Cargo.toml";
 const WASM_CARGO_TOML: &str = "./wasm/Cargo.toml";
@@ -34,7 +35,11 @@ impl TemplateAdjuster {
             remove_paths_from_deps(&mut toml, &[]);
         }
 
-        toml.add_workspace(&[".", "meta"]);
+        if self.metadata.has_interactor {
+            toml.add_workspace(&[".", "meta", "interact"]);
+        } else {
+            toml.add_workspace(&[".", "meta"]);
+        }
 
         toml.save_to_file(&cargo_toml_path);
     }
@@ -71,6 +76,7 @@ impl TemplateAdjuster {
         self.rename_in_cargo_toml_meta();
         self.rename_in_cargo_toml_wasm();
         self.rename_in_tests();
+        self.rename_in_interactor();
         self.rename_solution_files();
     }
 
@@ -193,6 +199,20 @@ impl TemplateAdjuster {
         );
     }
 
+    fn rename_in_interactor(&self) {
+        let old_mxsc = mxsc_file_name(&self.metadata.name);
+        let new_mxsc = mxsc_file_name(&self.target.new_name);
+
+        let mut queries = Vec::<Query>::new();
+        queries.push(Query::substring(&old_mxsc, &new_mxsc));
+
+        replace_in_files(
+            &self.target.contract_dir().join(INTERACT_DIRECTORY),
+            "*.rs",
+            &queries,
+        );
+    }
+
     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);
diff --git a/framework/meta/src/cmd/standalone/template/template_metadata.rs b/framework/meta/src/cmd/standalone/template/template_metadata.rs
index 2f47f47617..b2113d21b3 100644
--- a/framework/meta/src/cmd/standalone/template/template_metadata.rs
+++ b/framework/meta/src/cmd/standalone/template/template_metadata.rs
@@ -7,6 +7,9 @@ pub struct TemplateMetadata {
     pub src_file: String,
     pub rename_pairs: Vec<(String, String)>,
     pub files_include: Vec<String>,
+
+    #[serde(default)]
+    pub has_interactor: bool,
 }
 
 #[cfg(test)]
diff --git a/framework/meta/tests/template_test.rs b/framework/meta/tests/template_test.rs
index e3463d09a2..1f5f0edc7c 100644
--- a/framework/meta/tests/template_test.rs
+++ b/framework/meta/tests/template_test.rs
@@ -33,6 +33,8 @@ fn test_template_list() {
 #[cfg_attr(not(feature = "template-test-current"), ignore)]
 fn template_current_adder() {
     template_test_current("adder", "examples", "new-adder");
+
+    cargo_check_interactor("examples", "new-adder");
 }
 
 #[test]
@@ -198,3 +200,22 @@ pub fn build_contract(target: &ContractCreatorTarget) {
 
     assert!(exit_status.success(), "contract build process failed");
 }
+
+fn cargo_check_interactor(sub_path: &str, new_name: &str) {
+    let workspace_path = find_current_workspace().unwrap();
+    let target_path = workspace_path
+        .join(TEMPLATE_TEMP_DIR_NAME)
+        .join(sub_path)
+        .join(new_name)
+        .join("interact");
+
+    let exit_status = Command::new("cargo")
+        .arg("check")
+        .current_dir(target_path)
+        .spawn()
+        .expect("failed to spawn contract clean process")
+        .wait()
+        .expect("contract test process was not running");
+
+    assert!(exit_status.success(), "contract test process failed");
+}

From 34eabff98c7b765146e1c04164918d4e3a4b6b7f Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 14 Mar 2024 18:05:20 +0100
Subject: [PATCH 0464/1254] clippy fix

---
 .../meta/src/cmd/standalone/template/template_adjuster.rs      | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/framework/meta/src/cmd/standalone/template/template_adjuster.rs b/framework/meta/src/cmd/standalone/template/template_adjuster.rs
index 9fd3ee741e..d84422c536 100644
--- a/framework/meta/src/cmd/standalone/template/template_adjuster.rs
+++ b/framework/meta/src/cmd/standalone/template/template_adjuster.rs
@@ -203,8 +203,7 @@ impl TemplateAdjuster {
         let old_mxsc = mxsc_file_name(&self.metadata.name);
         let new_mxsc = mxsc_file_name(&self.target.new_name);
 
-        let mut queries = Vec::<Query>::new();
-        queries.push(Query::substring(&old_mxsc, &new_mxsc));
+        let queries = vec![Query::substring(&old_mxsc, &new_mxsc)];
 
         replace_in_files(
             &self.target.contract_dir().join(INTERACT_DIRECTORY),

From e4b1620f739ccdeaacf6d012acc5e2c118a52be6 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 15 Mar 2024 00:25:25 +0100
Subject: [PATCH 0465/1254] sc 0.47.6

---
 CHANGELOG.md                                  |   5 +
 Cargo.lock                                    |  18 ++--
 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 +-
 .../scenarios/stress_submit_test.scen.json    | 100 +++++++++---------
 .../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 +-
 .../wasm-alloc-mem-fail/Cargo.toml            |   2 +-
 .../wasm-alloc-mem-leaking/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 +-
 framework/base/Cargo.toml                     |   4 +-
 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         |   3 +-
 framework/scenario/Cargo.toml                 |   6 +-
 framework/snippets/Cargo.toml                 |   4 +-
 framework/wasm-adapter/Cargo.toml             |   4 +-
 tools/mxpy-snippet-generator/Cargo.toml       |   2 +-
 tools/rust-debugger/format-tests/Cargo.toml   |   4 +-
 263 files changed, 437 insertions(+), 431 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c9c2118770..7bcc7b063a 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.6] - 2024-03-15
+- Template naming bugfix, regarding numbers in the project name.
+- Added the interactor to the adder template.
+
 ## [sc 0.47.5] - 2024-03-08
 - Fixed an issue with `MapMapper` when reading from another contract.
 - Got rid of nightly feature `maybe_uninit_uninit_array`/`maybe_uninit_array_assume_init`.
diff --git a/Cargo.lock b/Cargo.lock
index a499eedc34..670a0d00ae 100755
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1794,7 +1794,7 @@ checksum = "b59072fa0624b55ae5ae3fa6bfa91515bbeb4ac440214bc4a509e2c8806d6e9f"
 
 [[package]]
 name = "multiversx-price-aggregator-sc"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "arrayvec",
  "getrandom 0.2.12",
@@ -1815,7 +1815,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "bitflags 2.4.2",
  "hex-literal",
@@ -1845,7 +1845,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -1856,7 +1856,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-meta"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "clap",
  "colored",
@@ -1882,14 +1882,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-scenario"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "base64",
  "bech32",
@@ -1915,7 +1915,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-snippets"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "base64",
  "env_logger",
@@ -1929,7 +1929,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "multiversx-sc",
 ]
@@ -1960,7 +1960,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-wegld-swap-sc"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "multiversx-sc",
  "multiversx-sc-modules",
diff --git a/contracts/benchmarks/large-storage/Cargo.toml b/contracts/benchmarks/large-storage/Cargo.toml
index 804f964141..5fb591be86 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.5"
+version = "0.47.6"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.5"
+version = "0.47.6"
 path = "../../../framework/scenario"
diff --git a/contracts/benchmarks/large-storage/meta/Cargo.toml b/contracts/benchmarks/large-storage/meta/Cargo.toml
index 7516ee6f65..ce060cbb49 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.5"
+version = "0.47.6"
 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 3442101383..b55c72c7c2 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.5"
+version = "0.47.6"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/mappers/benchmark-common/Cargo.toml b/contracts/benchmarks/mappers/benchmark-common/Cargo.toml
index f2db85ecfe..09f6f6b1ea 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.5"
+version = "0.47.6"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.5"
+version = "0.47.6"
 path = "../../../../framework/scenario"
diff --git a/contracts/benchmarks/mappers/linked-list-repeat/Cargo.toml b/contracts/benchmarks/mappers/linked-list-repeat/Cargo.toml
index 558fbb4720..d7295369df 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.5"
+version = "0.47.6"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.5"
+version = "0.47.6"
 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 3a2b64389a..c9f0d0f743 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.5"
+version = "0.47.6"
 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 8682d7b966..f43fc00def 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.5"
+version = "0.47.6"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/mappers/map-repeat/Cargo.toml b/contracts/benchmarks/mappers/map-repeat/Cargo.toml
index 63d397512e..dbac0a2fc4 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.5"
+version = "0.47.6"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.5"
+version = "0.47.6"
 path = "../../../../framework/scenario"
diff --git a/contracts/benchmarks/mappers/map-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/map-repeat/meta/Cargo.toml
index 9325ed7ae6..aaafa11fd8 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.5"
+version = "0.47.6"
 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 62e8789c3b..c9949f2909 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.5"
+version = "0.47.6"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/mappers/queue-repeat/Cargo.toml b/contracts/benchmarks/mappers/queue-repeat/Cargo.toml
index a9f7dd1a38..f3f0675e36 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.5"
+version = "0.47.6"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.5"
+version = "0.47.6"
 path = "../../../../framework/scenario"
diff --git a/contracts/benchmarks/mappers/queue-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/queue-repeat/meta/Cargo.toml
index 29f1dc78c8..a56ea924d4 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.5"
+version = "0.47.6"
 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 9c4d336e91..0810177dcf 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.5"
+version = "0.47.6"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/mappers/set-repeat/Cargo.toml b/contracts/benchmarks/mappers/set-repeat/Cargo.toml
index f62ee44aa2..465175b82a 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.5"
+version = "0.47.6"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.5"
+version = "0.47.6"
 path = "../../../../framework/scenario"
diff --git a/contracts/benchmarks/mappers/set-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/set-repeat/meta/Cargo.toml
index 7e05b0d40c..61ccaa8425 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.5"
+version = "0.47.6"
 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 7dcc58ebd4..ab29b05874 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.5"
+version = "0.47.6"
 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 c4f974f557..52a712c1c6 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.5"
+version = "0.47.6"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.5"
+version = "0.47.6"
 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 a10f248f31..a3091fffc1 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.5"
+version = "0.47.6"
 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 b738172a26..40b27f6ae7 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.5"
+version = "0.47.6"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/mappers/vec-repeat/Cargo.toml b/contracts/benchmarks/mappers/vec-repeat/Cargo.toml
index 68f1484056..db78e32d9e 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.5"
+version = "0.47.6"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.5"
+version = "0.47.6"
 path = "../../../../framework/scenario"
diff --git a/contracts/benchmarks/mappers/vec-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/vec-repeat/meta/Cargo.toml
index d3b013bb67..3d50c9a221 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.5"
+version = "0.47.6"
 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 fe03b05162..798d769c5f 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.5"
+version = "0.47.6"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/send-tx-repeat/Cargo.toml b/contracts/benchmarks/send-tx-repeat/Cargo.toml
index 5517cf4101..eef886e33a 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.5"
+version = "0.47.6"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.5"
+version = "0.47.6"
 path = "../../../framework/scenario"
diff --git a/contracts/benchmarks/send-tx-repeat/meta/Cargo.toml b/contracts/benchmarks/send-tx-repeat/meta/Cargo.toml
index 13920dbf06..9af50be174 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.5"
+version = "0.47.6"
 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 8f631f3518..32ace41bb8 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.5"
+version = "0.47.6"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/str-repeat/Cargo.toml b/contracts/benchmarks/str-repeat/Cargo.toml
index 123cfae104..faad09ae64 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.5"
+version = "0.47.6"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.5"
+version = "0.47.6"
 path = "../../../framework/scenario"
diff --git a/contracts/benchmarks/str-repeat/meta/Cargo.toml b/contracts/benchmarks/str-repeat/meta/Cargo.toml
index 5a5d4b5d28..209f138d48 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.5"
+version = "0.47.6"
 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 64354ce36c..3da3e115a2 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.5"
+version = "0.47.6"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/core/price-aggregator/Cargo.toml b/contracts/core/price-aggregator/Cargo.toml
index 1dd51d5792..fec7498b3e 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.5"
+version = "0.47.6"
 authors = [
     "Claudiu-Marcel Bruda <claudiu.bruda@multiversx.com>",
     "MultiversX <contact@multiversx.com>",
@@ -19,15 +19,15 @@ edition = "2021"
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "0.47.5"
+version = "0.47.6"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.47.5"
+version = "0.47.6"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.5"
+version = "0.47.6"
 path = "../../../framework/scenario"
 
 [dependencies]
diff --git a/contracts/core/price-aggregator/meta/Cargo.toml b/contracts/core/price-aggregator/meta/Cargo.toml
index 07bc777dc8..1af2bc366a 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.5"
+version = "0.47.6"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.47.5"
+version = "0.47.6"
 path = "../../../../framework/meta"
 default-features = false
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 6542b59c39..79a075b626 100644
--- a/contracts/core/price-aggregator/scenarios/stress_submit_test.scen.json
+++ b/contracts/core/price-aggregator/scenarios/stress_submit_test.scen.json
@@ -1133,7 +1133,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x5f",
-                    "0x3beec6f9cf5130ed",
+                    "0x7788c70a9610c4be",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1154,7 +1154,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x50d924566a98aec8",
+                    "0xc1ea824e31efc9e4",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1175,7 +1175,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x097b928bb2d85516",
+                    "0xce32013182f11964",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1196,7 +1196,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x765c960a5c3c6b95",
+                    "0x7b5585abc8746bba",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1217,7 +1217,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xf7426f44c20f404c",
+                    "0x5b72e1448c0d88e9",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1238,7 +1238,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xa5c69769ba606c2b",
+                    "0x84ffa4c93adbf03f",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1259,7 +1259,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xe8f77e933d1f2517",
+                    "0xdf49c7683aa8f812",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1280,7 +1280,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x94fba404681c1183",
+                    "0xdd16d54980e37a14",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1301,7 +1301,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xdc506f08b25d3b71",
+                    "0x489fc7abc281bff5",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1322,7 +1322,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xf5b0acb8ddff3752",
+                    "0x2b21387b70dc68fa",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1343,7 +1343,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x39a7d356f768ea5e",
+                    "0x73a7c835bc2c5cc1",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1364,7 +1364,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xaf145a7f797a48a1",
+                    "0xd0f9d6948f749e88",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1385,7 +1385,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xb18143fe76eef718",
+                    "0xefa0dd75e273f855",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1406,7 +1406,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x6f64a1ddec18e577",
+                    "0xa4e30019602ac07a",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1427,7 +1427,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x87ffce2a932db3d4",
+                    "0x6a76200c754ab268",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1448,7 +1448,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xe6642c7265c738c1",
+                    "0xf80c0fe7c4f2d2ab",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1469,7 +1469,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xd6079c55087a67d5",
+                    "0xc3311fd07a622588",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1490,7 +1490,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x90f7bb0d816fb87d",
+                    "0x7e1ed49ae692e3c2",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1511,7 +1511,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xa0ccc6f5f8c73ff2",
+                    "0x1bc08702bf94881d",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1532,7 +1532,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x258d38a35ccfd93d",
+                    "0xe1ef12a5d5de7a5b",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1553,7 +1553,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x903f62b19408019d",
+                    "0xbe81b81b461e586a",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1574,7 +1574,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xc319aab79b2f512e",
+                    "0x5299386cac2959d3",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1595,7 +1595,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x4b41176cd679e194",
+                    "0x7ad8b2a2d0d8bb25",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1616,7 +1616,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xaf3c4ad7cdcac230",
+                    "0xc699d9b2a2265377",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1637,7 +1637,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x2a8c4a82dfb68f13",
+                    "0xb901a55b0792d1e0",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1658,7 +1658,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x358e92c93a69a2f9",
+                    "0xfeea45b5beba2c40",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1679,7 +1679,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xb4bd55d9eebad664",
+                    "0x65302a6c38774d4d",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1700,7 +1700,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x9061fc2440f4db51",
+                    "0xe7ca98860b4e0732",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1721,7 +1721,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xc8fde2d627d1b95a",
+                    "0x8bc5c26698edefb0",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1742,7 +1742,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xacede2c42f9bc928",
+                    "0x0a3fe4dea3530a88",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1763,7 +1763,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xb0a4ecb8d46cfe86",
+                    "0x0fbbfc508ed1daea",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1784,7 +1784,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xa8d8ee43a5c4ade8",
+                    "0x776254af7eee5567",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1805,7 +1805,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xe20bb0819b83cbb6",
+                    "0xa1fdcba5f1a891d6",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1826,7 +1826,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xb5566ca4a8a6da5b",
+                    "0x44d1ed7c7ae1e173",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1847,7 +1847,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x30b4e318dbf9c0a1",
+                    "0xaa4c9135752b8024",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1868,7 +1868,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x34cd5592ee7ab5f0",
+                    "0x7e2d24a77721cabb",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1889,7 +1889,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x4908da8f754f9e29",
+                    "0x776c84750a7890f7",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1910,7 +1910,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x460da40079bef875",
+                    "0xd18201dfce0e5317",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1931,7 +1931,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x6eb6dd52e24341b6",
+                    "0xb7288d6a6593e051",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1952,7 +1952,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xa06bb000b0901e98",
+                    "0x97eab65a65b5f17d",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1973,7 +1973,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x4f83b3dd7f1dd80e",
+                    "0x8e24cf5782e9cb6c",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1994,7 +1994,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x169e4556e8cd5271",
+                    "0xab04f3386a213e9e",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -2015,7 +2015,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xa45b9cfe7527301b",
+                    "0xa7f258578eacd75d",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -2036,7 +2036,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xe3a28965ea6a3ae4",
+                    "0xd42348b209cd6e99",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -2057,7 +2057,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x4efa7be66acf5ded",
+                    "0xe22ff5fdee16b542",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -2078,7 +2078,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x5f75311f8cd29ea9",
+                    "0xc3b6af3c8792a1ea",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -2099,7 +2099,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xfc7c1268abc1d8e3",
+                    "0x81a7c3dd9adfa891",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -2120,7 +2120,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xd24cc52d844c6a40",
+                    "0x53df0a0a26a53996",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -2141,7 +2141,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x804fc08cd1c73c42",
+                    "0xdcb0a37d6cb1bc42",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -2162,7 +2162,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x093077783f01d496",
+                    "0x127a946b5bbaed56",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
diff --git a/contracts/core/price-aggregator/wasm/Cargo.toml b/contracts/core/price-aggregator/wasm/Cargo.toml
index c39965acb9..842befe349 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.5"
+version = "0.47.6"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/core/wegld-swap/Cargo.toml b/contracts/core/wegld-swap/Cargo.toml
index 5cce44f08e..a52652c87c 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.5"
+version = "0.47.6"
 
 authors = [
     "Dorin Iancu <dorin.iancu@multiversx.com>",
@@ -20,13 +20,13 @@ edition = "2021"
 path = "src/wegld.rs"
 
 [dependencies.multiversx-sc]
-version = "0.47.5"
+version = "0.47.6"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.47.5"
+version = "0.47.6"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.5"
+version = "0.47.6"
 path = "../../../framework/scenario"
diff --git a/contracts/core/wegld-swap/meta/Cargo.toml b/contracts/core/wegld-swap/meta/Cargo.toml
index 222f0692d6..98214c5c45 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.5"
+version = "0.47.6"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.47.5"
+version = "0.47.6"
 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 f622d5d6b9..42da670c1c 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.5"
+version = "0.47.6"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/adder/Cargo.toml b/contracts/examples/adder/Cargo.toml
index 409f471ee5..b8eea0debf 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.5"
+version = "0.47.6"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.5"
+version = "0.47.6"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/adder/interact/Cargo.toml b/contracts/examples/adder/interact/Cargo.toml
index a9d36faf3b..9a3cfa2282 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.5"
+version = "0.47.6"
 path = "../../../../framework/snippets"
diff --git a/contracts/examples/adder/meta/Cargo.toml b/contracts/examples/adder/meta/Cargo.toml
index caf3b453e2..4177224e49 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.5"
+version = "0.47.6"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/examples/adder/wasm/Cargo.toml b/contracts/examples/adder/wasm/Cargo.toml
index 04be870421..2d90464201 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.5"
+version = "0.47.6"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/bonding-curve-contract/Cargo.toml b/contracts/examples/bonding-curve-contract/Cargo.toml
index 0b5939281e..f75bedbdd5 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.5"
+version = "0.47.6"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.47.5"
+version = "0.47.6"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.5"
+version = "0.47.6"
 path = "../../../framework/scenario"
 
diff --git a/contracts/examples/bonding-curve-contract/meta/Cargo.toml b/contracts/examples/bonding-curve-contract/meta/Cargo.toml
index 91b330f0ab..998bf5381c 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.5"
+version = "0.47.6"
 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 d95c21a85d..9ef2d26d25 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.5"
+version = "0.47.6"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/check-pause/Cargo.toml b/contracts/examples/check-pause/Cargo.toml
index 956cff6046..60884428d1 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.5"
+version = "0.47.6"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.47.5"
+version = "0.47.6"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.5"
+version = "0.47.6"
 path = "../../../framework/scenario"
 
diff --git a/contracts/examples/check-pause/meta/Cargo.toml b/contracts/examples/check-pause/meta/Cargo.toml
index db3e95ad78..59360f259a 100644
--- a/contracts/examples/check-pause/meta/Cargo.toml
+++ b/contracts/examples/check-pause/meta/Cargo.toml
@@ -9,6 +9,6 @@ authors = ["Alin Cruceat <alin.cruceat@multiversx.com>"]
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.47.5"
+version = "0.47.6"
 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 619a7270c4..ab4176d63f 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.5"
+version = "0.47.6"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/crowdfunding-esdt/Cargo.toml b/contracts/examples/crowdfunding-esdt/Cargo.toml
index 5a5a94d5a3..dd987f9168 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.5"
+version = "0.47.6"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.5"
+version = "0.47.6"
 path = "../../../framework/scenario"
 
 [dev-dependencies]
diff --git a/contracts/examples/crowdfunding-esdt/meta/Cargo.toml b/contracts/examples/crowdfunding-esdt/meta/Cargo.toml
index b5bef9909d..177efdbcc1 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.5"
+version = "0.47.6"
 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 877d8761fb..246445cd42 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.5"
+version = "0.47.6"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/crypto-bubbles/Cargo.toml b/contracts/examples/crypto-bubbles/Cargo.toml
index f63a8b8af5..bf37ef5fd8 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.5"
+version = "0.47.6"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.5"
+version = "0.47.6"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/crypto-bubbles/meta/Cargo.toml b/contracts/examples/crypto-bubbles/meta/Cargo.toml
index 1defd419e1..de1f82844d 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.5"
+version = "0.47.6"
 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 5f8975e177..52a989cb0e 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.5"
+version = "0.47.6"
 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 495b1894ff..83b65857e0 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.5"
+version = "0.47.6"
 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 2cc2fc4bd9..24ebd9e621 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.5"
+version = "0.47.6"
 path = "../../../../../framework/base"
diff --git a/contracts/examples/crypto-kitties/kitty-auction/Cargo.toml b/contracts/examples/crypto-kitties/kitty-auction/Cargo.toml
index 646835ce94..a755f4fc4e 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.5"
+version = "0.47.6"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.5"
+version = "0.47.6"
 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 2adc1e4a32..489a222777 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.5"
+version = "0.47.6"
 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 3a7e4400aa..708dd5e87a 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.5"
+version = "0.47.6"
 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 8c94bfe0de..146f1535ae 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.5"
+version = "0.47.6"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.5"
+version = "0.47.6"
 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 8e09c03447..6c47bf57ef 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.5"
+version = "0.47.6"
 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 a7105ac21c..78060f6e1e 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.5"
+version = "0.47.6"
 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 cbd78aed52..1554492c61 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.5"
+version = "0.47.6"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.5"
+version = "0.47.6"
 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 fe5c579c57..d96c0229d1 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.5"
+version = "0.47.6"
 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 d81e2aec49..bed211e9ba 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.5"
+version = "0.47.6"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/crypto-zombies/Cargo.toml b/contracts/examples/crypto-zombies/Cargo.toml
index 3f30e8030e..7d7010857a 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.5"
+version = "0.47.6"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.5"
+version = "0.47.6"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/crypto-zombies/meta/Cargo.toml b/contracts/examples/crypto-zombies/meta/Cargo.toml
index 396fb6584e..20b5e5cd5b 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.5"
+version = "0.47.6"
 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 3234a023e6..7e2708f437 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.5"
+version = "0.47.6"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/digital-cash/Cargo.toml b/contracts/examples/digital-cash/Cargo.toml
index c9a21caba1..08c4259881 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.5"
+version = "0.47.6"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.5"
+version = "0.47.6"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/digital-cash/meta/Cargo.toml b/contracts/examples/digital-cash/meta/Cargo.toml
index 42e08a4777..d8a20bcba9 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.5"
+version = "0.47.6"
 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 ec1d9efa8f..be892f045c 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.5"
+version = "0.47.6"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/empty/Cargo.toml b/contracts/examples/empty/Cargo.toml
index a8403c0d71..0bf1a921b2 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.5"
+version = "0.47.6"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.5"
+version = "0.47.6"
 path = "../../../framework/scenario"
 
 [dev-dependencies]
diff --git a/contracts/examples/empty/meta/Cargo.toml b/contracts/examples/empty/meta/Cargo.toml
index 47a8dbdfd0..55b650cbec 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.5"
+version = "0.47.6"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/examples/empty/wasm/Cargo.toml b/contracts/examples/empty/wasm/Cargo.toml
index 9a551ecd8a..ac4dd8cce9 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.5"
+version = "0.47.6"
 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 a930ff827c..0f7591af8b 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.5"
+version = "0.47.6"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.5"
+version = "0.47.6"
 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 5f0ac8e76f..06316a3b20 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.5"
+version = "0.47.6"
 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 dd7d97cdb8..5855a9e99b 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.5"
+version = "0.47.6"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/factorial/Cargo.toml b/contracts/examples/factorial/Cargo.toml
index a8e1caf074..d0c7032607 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.5"
+version = "0.47.6"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.5"
+version = "0.47.6"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/factorial/meta/Cargo.toml b/contracts/examples/factorial/meta/Cargo.toml
index 6cdefc436d..1df33d3fd2 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.5"
+version = "0.47.6"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/examples/factorial/wasm/Cargo.toml b/contracts/examples/factorial/wasm/Cargo.toml
index 8889a9b7ae..4ad683cc2f 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.5"
+version = "0.47.6"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/fractional-nfts/Cargo.toml b/contracts/examples/fractional-nfts/Cargo.toml
index a64f7f323d..772f5cdcad 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.5"
+version = "0.47.6"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.47.5"
+version = "0.47.6"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.5"
+version = "0.47.6"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/fractional-nfts/meta/Cargo.toml b/contracts/examples/fractional-nfts/meta/Cargo.toml
index 24ca9dc1c9..814f89e481 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.5"
+version = "0.47.6"
 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 ae8fa6d005..cc319d03b1 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.5"
+version = "0.47.6"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/lottery-esdt/Cargo.toml b/contracts/examples/lottery-esdt/Cargo.toml
index 75cb2cdb2f..14f07cb698 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.5"
+version = "0.47.6"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.5"
+version = "0.47.6"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/lottery-esdt/meta/Cargo.toml b/contracts/examples/lottery-esdt/meta/Cargo.toml
index fe025f1fbf..585766f77b 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.5"
+version = "0.47.6"
 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 c0395a9569..3b9c9009c6 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.5"
+version = "0.47.6"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/multisig/Cargo.toml b/contracts/examples/multisig/Cargo.toml
index 784f5b8bfd..72315654ab 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.5"
+version = "0.47.6"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.47.5"
+version = "0.47.6"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.5"
+version = "0.47.6"
 path = "../../../framework/scenario"
 
 [dev-dependencies.adder]
@@ -27,7 +27,7 @@ path = "../adder"
 path = "../factorial"
 
 [dev-dependencies.multiversx-wegld-swap-sc]
-version = "0.47.5"
+version = "0.47.6"
 path = "../../core/wegld-swap"
 
 [dev-dependencies]
diff --git a/contracts/examples/multisig/interact/Cargo.toml b/contracts/examples/multisig/interact/Cargo.toml
index 3720db003d..e5d783eb74 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.5"
+version = "0.47.6"
 path = "../../../../contracts/modules"
 
 [dependencies.multiversx-sc-snippets]
-version = "0.47.5"
+version = "0.47.6"
 path = "../../../../framework/snippets"
 
 [dependencies.multiversx-sc-scenario]
-version = "=0.47.5"
+version = "=0.47.6"
 path = "../../../../framework/scenario"
diff --git a/contracts/examples/multisig/meta/Cargo.toml b/contracts/examples/multisig/meta/Cargo.toml
index 1b46da4489..0a92bfb7f3 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.5"
+version = "0.47.6"
 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 64faae5032..6cf54e2aa4 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.5"
+version = "0.47.6"
 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 ec1c6aba87..49029387f6 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.5"
+version = "0.47.6"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/multisig/wasm/Cargo.toml b/contracts/examples/multisig/wasm/Cargo.toml
index de21ada11d..a8a21b6cd5 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.5"
+version = "0.47.6"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/nft-minter/Cargo.toml b/contracts/examples/nft-minter/Cargo.toml
index 9bcab9f7cc..848a54ff69 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.5"
+version = "0.47.6"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.5"
+version = "0.47.6"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/nft-minter/meta/Cargo.toml b/contracts/examples/nft-minter/meta/Cargo.toml
index 9193979931..48c93adfb8 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.5"
+version = "0.47.6"
 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 d44e299f52..31796c2315 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.5"
+version = "0.47.6"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/nft-storage-prepay/Cargo.toml b/contracts/examples/nft-storage-prepay/Cargo.toml
index c40c8096e5..56124a7d4a 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.5"
+version = "0.47.6"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.5"
+version = "0.47.6"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/nft-storage-prepay/meta/Cargo.toml b/contracts/examples/nft-storage-prepay/meta/Cargo.toml
index 2ecb100f40..7efa3acb1b 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.5"
+version = "0.47.6"
 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 2d0fa1f340..a8f76a1501 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.5"
+version = "0.47.6"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/nft-subscription/Cargo.toml b/contracts/examples/nft-subscription/Cargo.toml
index c3a15ca04e..8098098892 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.5"
+version = "0.47.6"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.47.5"
+version = "0.47.6"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.5"
+version = "0.47.6"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/nft-subscription/meta/Cargo.toml b/contracts/examples/nft-subscription/meta/Cargo.toml
index ebb5c97716..b6b576f83a 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.5"
+version = "0.47.6"
 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 0469136d02..a511fa5b0a 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.5"
+version = "0.47.6"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/order-book/factory/Cargo.toml b/contracts/examples/order-book/factory/Cargo.toml
index e78a41e300..89ca0536c7 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.5"
+version = "0.47.6"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.5"
+version = "0.47.6"
 path = "../../../../framework/scenario"
 
diff --git a/contracts/examples/order-book/factory/meta/Cargo.toml b/contracts/examples/order-book/factory/meta/Cargo.toml
index c81b977517..d014e078bb 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.5"
+version = "0.47.6"
 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 491a30d13c..21ce9dedc7 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.5"
+version = "0.47.6"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/order-book/pair/Cargo.toml b/contracts/examples/order-book/pair/Cargo.toml
index db90006821..5564e659a5 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.5"
+version = "0.47.6"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.5"
+version = "0.47.6"
 path = "../../../../framework/scenario"
diff --git a/contracts/examples/order-book/pair/meta/Cargo.toml b/contracts/examples/order-book/pair/meta/Cargo.toml
index b9af3fa938..6351950abf 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.5"
+version = "0.47.6"
 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 f00e902291..ed79171648 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.5"
+version = "0.47.6"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/ping-pong-egld/Cargo.toml b/contracts/examples/ping-pong-egld/Cargo.toml
index 2679417da3..8e4476d9cd 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.5"
+version = "0.47.6"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.5"
+version = "0.47.6"
 path = "../../../framework/scenario"
 
diff --git a/contracts/examples/ping-pong-egld/meta/Cargo.toml b/contracts/examples/ping-pong-egld/meta/Cargo.toml
index 0b40d9aa0b..a1048e6bf3 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.5"
+version = "0.47.6"
 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 73147c5c45..7422ef15d8 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.5"
+version = "0.47.6"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/proxy-pause/Cargo.toml b/contracts/examples/proxy-pause/Cargo.toml
index 3e4c3a6aec..c226500631 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.5"
+version = "0.47.6"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.5"
+version = "0.47.6"
 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 fba5a0b1bc..7016affa99 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.5"
+version = "0.47.6"
 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 bdf21b6703..fd17464600 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.5"
+version = "0.47.6"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/rewards-distribution/Cargo.toml b/contracts/examples/rewards-distribution/Cargo.toml
index bafdb40929..e1f67893d3 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.5"
+version = "0.47.6"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.47.5"
+version = "0.47.6"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.5"
+version = "0.47.6"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/rewards-distribution/meta/Cargo.toml b/contracts/examples/rewards-distribution/meta/Cargo.toml
index cf59d2db46..6319b2bb00 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 <claudiu.bruda@multiversx.com>"]
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.47.5"
+version = "0.47.6"
 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 a17709b9e7..0248259c78 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.5"
+version = "0.47.6"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/seed-nft-minter/Cargo.toml b/contracts/examples/seed-nft-minter/Cargo.toml
index b1b22d1276..f55298cb22 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.5"
+version = "0.47.6"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.47.5"
+version = "0.47.6"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.5"
+version = "0.47.6"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/seed-nft-minter/meta/Cargo.toml b/contracts/examples/seed-nft-minter/meta/Cargo.toml
index 9828dc2788..13fb20029a 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 <claudiu.bruda@multiversx.com>"]
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.47.5"
+version = "0.47.6"
 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 b6f616bf91..bf62e69388 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.5"
+version = "0.47.6"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/token-release/Cargo.toml b/contracts/examples/token-release/Cargo.toml
index 2e20827705..57eeb7e92a 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.5"
+version = "0.47.6"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.5"
+version = "0.47.6"
 path = "../../../framework/scenario"
 
diff --git a/contracts/examples/token-release/meta/Cargo.toml b/contracts/examples/token-release/meta/Cargo.toml
index d774d4a2bb..08378ca6d0 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.5"
+version = "0.47.6"
 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 71ad98f976..6383a6ed3b 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.5"
+version = "0.47.6"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/abi-tester/Cargo.toml b/contracts/feature-tests/abi-tester/Cargo.toml
index 66ff8bb666..c01817136a 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.5"
+version = "0.47.6"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.5"
+version = "0.47.6"
 path = "../../../framework/scenario"
 
 [dev-dependencies.multiversx-sc-meta]
-version = "0.47.5"
+version = "0.47.6"
 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 24c96a91f5..a654d33b25 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.5"
+            "version": "0.47.6"
         }
     },
     "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 72b756e470..61dc7d29ca 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.5"
+            "version": "0.47.6"
         }
     },
     "docs": [
diff --git a/contracts/feature-tests/abi-tester/meta/Cargo.toml b/contracts/feature-tests/abi-tester/meta/Cargo.toml
index 00bd658c54..22e005167f 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.5"
+version = "0.47.6"
 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 f6fa5ff5af..66dc257026 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.5"
+version = "0.47.6"
 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 b5171c7792..42cd160365 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.5"
+version = "0.47.6"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/alloc-features/Cargo.toml b/contracts/feature-tests/alloc-features/Cargo.toml
index 3af733d06d..0af3de93d1 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.5"
+version = "0.47.6"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.5"
+version = "0.47.6"
 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 e737db810b..9f7d0a9c26 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.5"
+version = "0.47.6"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml
index c4a1f55e35..2d85bd1f91 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml
@@ -25,7 +25,7 @@ overflow-checks = false
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.47.5"
+version = "0.47.6"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml
index 3380c24cf1..1f0a7140d0 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml
@@ -25,7 +25,7 @@ overflow-checks = false
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.47.5"
+version = "0.47.6"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/alloc-features/wasm/Cargo.toml b/contracts/feature-tests/alloc-features/wasm/Cargo.toml
index 398ff4d589..bd900991eb 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.5"
+version = "0.47.6"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/basic-features/Cargo.toml b/contracts/feature-tests/basic-features/Cargo.toml
index 52a6628859..b8d4b8b236 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.5"
+version = "0.47.6"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.5"
+version = "0.47.6"
 path = "../../../framework/scenario"
 
 [dependencies.multiversx-sc-modules]
-version = "0.47.5"
+version = "0.47.6"
 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 e761436e47..a7cf4aecd8 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.5"
+version = "0.47.6"
 path = "../../../../framework/snippets"
diff --git a/contracts/feature-tests/basic-features/meta/Cargo.toml b/contracts/feature-tests/basic-features/meta/Cargo.toml
index 0f728ed49f..7f2421ad5a 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.5"
+version = "0.47.6"
 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 22d26cd5d5..01a88e074e 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.5"
+version = "0.47.6"
 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 5b2c30319d..f08c381dc3 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.5"
+version = "0.47.6"
 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 3444fe9e30..925bdefbdd 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.5"
+version = "0.47.6"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.5"
+version = "0.47.6"
 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 9d7b7d3850..bcfabc08e8 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.5"
+version = "0.47.6"
 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 e62efe10e7..3009fb8622 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.5"
+version = "0.47.6"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/Cargo.toml b/contracts/feature-tests/composability/Cargo.toml
index d9ae0995ca..e3f6ef1289 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.5"
+version = "0.47.6"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.5"
+version = "0.47.6"
 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 c3f3d304ed..e44e39bb90 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.5"
+version = "0.47.6"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.5"
+version = "0.47.6"
 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 ab7adb1818..bd93bf1e24 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.5"
+version = "0.47.6"
 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 fb43fc2f21..dc3866cc80 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.5"
+version = "0.47.6"
 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 d5cae9e497..dec107ce74 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.5"
+version = "0.47.6"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.5"
+version = "0.47.6"
 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 710f03fd71..922076491c 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.5"
+version = "0.47.6"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.5"
+version = "0.47.6"
 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 c2449efbf6..373381ce93 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.5"
+version = "0.47.6"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.47.5"
+version = "0.47.6"
 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 544a09a21e..1ebb400b16 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.5"
+version = "0.47.6"
 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 6d5c7636d0..e85e4b699b 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.5"
+version = "0.47.6"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.5"
+version = "0.47.6"
 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 144cff2dbc..12d36d6033 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.5"
+version = "0.47.6"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.47.5"
+version = "0.47.6"
 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 6a878e1822..a20aa71942 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.5"
+version = "0.47.6"
 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 298cc38ea3..93e83468e9 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.5"
+version = "0.47.6"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.5"
+version = "0.47.6"
 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 f1bd614d0b..3ebbe8338d 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.5"
+version = "0.47.6"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.5"
+version = "0.47.6"
 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 159ee29fa7..770e8e77da 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.5"
+version = "0.47.6"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.47.5"
+version = "0.47.6"
 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 8737c18b6a..e84938d004 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.5"
+version = "0.47.6"
 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 7062232070..455e5b0b03 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.5"
+version = "0.47.6"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.5"
+version = "0.47.6"
 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 5649f09d1f..761bbe612b 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.5"
+version = "0.47.6"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.47.5"
+version = "0.47.6"
 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 38c12cb392..23fee292e2 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.5"
+version = "0.47.6"
 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 943ec49253..d15beaace1 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.5"
+version = "0.47.6"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.47.5"
+version = "0.47.6"
 path = "../../../../framework/wasm-adapter"
 optional = true
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.5"
+version = "0.47.6"
 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 e9eb852173..d286d863b4 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.5"
+version = "0.47.6"
 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 38dd4a6e53..762dedbde1 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.5"
+version = "0.47.6"
 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 23944ba669..4ffc557a76 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.5"
+version = "0.47.6"
 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 759a6a64cd..ad123d8008 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.5"
+version = "0.47.6"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.5"
+version = "0.47.6"
 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 8fc82f5db3..651ea4dee6 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.5"
+version = "0.47.6"
 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 e247aff0e9..f4f8cdcdc3 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.5"
+version = "0.47.6"
 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 1752f95e34..51bccab90a 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.5"
+version = "0.47.6"
 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 23a0df99d8..eaeb7026a2 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.5"
+version = "0.47.6"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/forwarder/Cargo.toml b/contracts/feature-tests/composability/forwarder/Cargo.toml
index bd5e426fce..5b6914d7ac 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.5"
+version = "0.47.6"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.5"
+version = "0.47.6"
 path = "../../../../framework/scenario"
 
diff --git a/contracts/feature-tests/composability/forwarder/meta/Cargo.toml b/contracts/feature-tests/composability/forwarder/meta/Cargo.toml
index 709498d977..3983d9fa4e 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.5"
+version = "0.47.6"
 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 e9af598856..9504e2f48b 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.5"
+version = "0.47.6"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/interact/Cargo.toml b/contracts/feature-tests/composability/interact/Cargo.toml
index 3ca2ae6953..1f8dfafece 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.5"
+version = "0.47.6"
 path = "../../../../contracts/modules"
 
 [dependencies.multiversx-sc-snippets]
-version = "0.47.5"
+version = "0.47.6"
 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 3f9638f4d2..379f930e0d 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.5"
+version = "0.47.6"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.5"
+version = "0.47.6"
 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 8b6d5f3929..67141d7e4f 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.5"
+version = "0.47.6"
 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 8808b6c488..cc52f9652f 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.5"
+version = "0.47.6"
 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 c2ffef9059..0c54e9ca6c 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.5"
+version = "0.47.6"
 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 be4f70e057..4f15b8e5eb 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.5"
+version = "0.47.6"
 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 ae07ea0f64..ba2aa8961a 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.5"
+version = "0.47.6"
 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 dd0e5e3190..c45cea4950 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.5"
+version = "0.47.6"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.5"
+version = "0.47.6"
 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 5ba64dbc91..a9a2ecb49d 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.5"
+version = "0.47.6"
 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 1c4e66daad..8adc41ac0d 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.5"
+version = "0.47.6"
 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 6aacf4c17c..ad95170147 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.5"
+version = "0.47.6"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.5"
+version = "0.47.6"
 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 8ad3614823..cc0dce54fe 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.5"
+version = "0.47.6"
 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 4f0ac22bbc..b1bc1ef21f 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.5"
+version = "0.47.6"
 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 3d706c42a4..f2b77ca992 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.5"
+version = "0.47.6"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.5"
+version = "0.47.6"
 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 3439b25847..0c8ccb0372 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.5"
+version = "0.47.6"
 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 47b5eb2cf3..d874f6e8b4 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.5"
+version = "0.47.6"
 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 40085fa73e..f7562b838f 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.5"
+version = "0.47.6"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.47.5"
+version = "0.47.6"
 path = "../../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.5"
+version = "0.47.6"
 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 203a996a76..8e379bf43e 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.5"
+version = "0.47.6"
 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 ff699a705e..8c91eb8859 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.5"
+version = "0.47.6"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/vault/Cargo.toml b/contracts/feature-tests/composability/vault/Cargo.toml
index 6d81c26350..97f5b97371 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.5"
+version = "0.47.6"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.5"
+version = "0.47.6"
 path = "../../../../framework/scenario"
diff --git a/contracts/feature-tests/composability/vault/meta/Cargo.toml b/contracts/feature-tests/composability/vault/meta/Cargo.toml
index 2fc51374aa..4ab77c4b1a 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.5"
+version = "0.47.6"
 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 63df7d0d02..3c865c7080 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.5"
+version = "0.47.6"
 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 33c14f4fd5..faacfa4958 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.5"
+version = "0.47.6"
 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 31122e31f2..1812fd9940 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.5"
+version = "0.47.6"
 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 af4e57038a..aff54f13b1 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.5"
+version = "0.47.6"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.5"
+version = "0.47.6"
 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 ce6234c630..3cc15aabe4 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.5"
+version = "0.47.6"
 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 a73660bac8..51248463d6 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.5"
+version = "0.47.6"
 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 83577513c1..72f9a18cab 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.5"
+version = "0.47.6"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.5"
+version = "0.47.6"
 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 b2c318dd13..b003c9b982 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.5"
+version = "0.47.6"
 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 bd55b29f36..bb53084b5c 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.5"
+version = "0.47.6"
 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 e538bc4de9..b746b973e2 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.5"
+version = "0.47.6"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.5"
+version = "0.47.6"
 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 5608c548a3..a33bb345af 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.5"
+version = "0.47.6"
 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 fcb4237512..da3b74318e 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.5"
+version = "0.47.6"
 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 c39f7d5f16..83c8dd14a8 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.5"
+version = "0.47.6"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.5"
+version = "0.47.6"
 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 1815a7f706..49f3be1eb5 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.5"
+version = "0.47.6"
 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 e964700ec5..4974a81405 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.5"
+version = "0.47.6"
 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 20671838db..f096425dd6 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.5"
+version = "0.47.6"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.5"
+version = "0.47.6"
 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 db4e5ff3df..03a604c31c 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.5"
+version = "0.47.6"
 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 59d6c7a7b8..68bd125939 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.5"
+version = "0.47.6"
 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 8372f0354a..c082fc26c0 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.5"
+version = "0.47.6"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.5"
+version = "0.47.6"
 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 96afb07b44..4e65b4a70b 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.5"
+version = "0.47.6"
 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 a80419dcab..28677d89a4 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.5"
+version = "0.47.6"
 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 46ffb3c5ea..8325377c72 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.5"
+version = "0.47.6"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.5"
+version = "0.47.6"
 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 ce2495310a..bcb736b2c5 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.5"
+version = "0.47.6"
 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 9338d5fd10..51bf87cd2b 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.5"
+version = "0.47.6"
 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 134d30ce63..fe18ccf688 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.5"
+version = "0.47.6"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.5"
+version = "0.47.6"
 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 e316dac5ad..f0be9537fd 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.5"
+version = "0.47.6"
 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 656e98c8d1..72dfa8d22d 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.5"
+version = "0.47.6"
 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 49dcba60aa..214e59652c 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.5"
+version = "0.47.6"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.5"
+version = "0.47.6"
 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 b440c8cf8d..1af90b4ab0 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.5"
+version = "0.47.6"
 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 912900e134..7191a15963 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.5"
+version = "0.47.6"
 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 4e44c248df..ed703f3075 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.5"
+version = "0.47.6"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.5"
+version = "0.47.6"
 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 fdb2ea7cc8..329543ba08 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.5"
+version = "0.47.6"
 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 c688388a91..03b93b10dd 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.5"
+version = "0.47.6"
 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 d4b5121141..f41cc01ce4 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.5"
+version = "0.47.6"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.5"
+version = "0.47.6"
 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 053f902584..e7a6d60187 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.5"
+version = "0.47.6"
 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 d524d039f3..32d0b6f060 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.5"
+version = "0.47.6"
 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 20839cea31..572367ec21 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.5"
+version = "0.47.6"
 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 beca5b4d75..17ee4e7f75 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.5"
+version = "0.47.6"
 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 190c9b1fb5..2dcc933328 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.5"
+version = "0.47.6"
 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 d76417a223..664ed96cdd 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.5"
+version = "0.47.6"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.5"
+version = "0.47.6"
 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 921c4f2671..b50def053b 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.5"
+version = "0.47.6"
 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 b55981873c..ca41ca4bd8 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.5"
+version = "0.47.6"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/payable-features/Cargo.toml b/contracts/feature-tests/payable-features/Cargo.toml
index acf93f21d7..4275d0c50e 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.5"
+version = "0.47.6"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.5"
+version = "0.47.6"
 path = "../../../framework/scenario"
diff --git a/contracts/feature-tests/payable-features/meta/Cargo.toml b/contracts/feature-tests/payable-features/meta/Cargo.toml
index 4fb0cc3a23..15aef444c1 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.5"
+version = "0.47.6"
 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 9e9d3c0cd2..f4c9524fef 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.5"
+version = "0.47.6"
 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 3fdc4d3e5b..aeb8806dc0 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.5"
+version = "0.47.6"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.5"
+version = "0.47.6"
 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 a942895412..f529a43554 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.5"
+version = "0.47.6"
 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 851caad934..ecc108c9ac 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.5"
+version = "0.47.6"
 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 711deb667e..d3de295f52 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.5"
+// version = "0.47.6"
 // 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 23f7a37d4d..1bcd9911ee 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.5"
+version = "0.47.6"
 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 2a5bd51b12..7f56f74850 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.5"
+version = "0.47.6"
 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.5"
+version = "0.47.6"
 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 a378195cc9..c66e556d33 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.5"
+version = "0.47.6"
 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 c50643a4db..122854100f 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.5"
+version = "0.47.6"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/use-module/Cargo.toml b/contracts/feature-tests/use-module/Cargo.toml
index 281bd20397..4909bcc5b6 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.5"
+version = "0.47.6"
 path = "../../../contracts/modules"
 
 [dependencies.multiversx-sc]
-version = "0.47.5"
+version = "0.47.6"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.5"
+version = "0.47.6"
 path = "../../../framework/scenario"
 
 [dev-dependencies.multiversx-sc-meta]
-version = "0.47.5"
+version = "0.47.6"
 path = "../../../framework/meta"
diff --git a/contracts/feature-tests/use-module/meta/Cargo.toml b/contracts/feature-tests/use-module/meta/Cargo.toml
index 8246cc5fce..d67ab6febf 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.5"
+version = "0.47.6"
 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 7a0eecd776..fe4ec859bf 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.5"
+version = "0.47.6"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.47.5"
+version = "0.47.6"
 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 56d64db6c4..37974a3659 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.5"
+            "version": "0.47.6"
         }
     },
     "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 8fef61ec76..948e9d09f4 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.5"
+            "version": "0.47.6"
         }
     },
     "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 bf3768167c..746abe441f 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.5"
+version = "0.47.6"
 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 129b71c83e..1a0e69499a 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.5"
+version = "0.47.6"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/modules/Cargo.toml b/contracts/modules/Cargo.toml
index dcdc0d02e5..5f0c2f43ed 100644
--- a/contracts/modules/Cargo.toml
+++ b/contracts/modules/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-modules"
-version = "0.47.5"
+version = "0.47.6"
 edition = "2021"
 
 authors = ["MultiversX <contact@multiversx.com>"]
@@ -17,5 +17,5 @@ categories = ["no-std", "wasm", "cryptography::cryptocurrencies"]
 alloc = ["multiversx-sc/alloc"]
 
 [dependencies.multiversx-sc]
-version = "0.47.5"
+version = "0.47.6"
 path = "../../framework/base"
diff --git a/framework/base/Cargo.toml b/framework/base/Cargo.toml
index ad2b6e260c..f85aa5896e 100644
--- a/framework/base/Cargo.toml
+++ b/framework/base/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc"
-version = "0.47.5"
+version = "0.47.6"
 edition = "2021"
 
 authors = ["Andrei Marinica <andrei.marinica@multiversx.com>", "MultiversX <contact@multiversx.com>"]
@@ -27,7 +27,7 @@ bitflags = "=2.4.2"
 num-traits = { version = "=0.2.17", default-features = false }
 
 [dependencies.multiversx-sc-derive]
-version = "=0.47.5"
+version = "=0.47.6"
 path = "../derive"
 
 [dependencies.multiversx-sc-codec]
diff --git a/framework/derive/Cargo.toml b/framework/derive/Cargo.toml
index 490cccf7d8..3f745d768a 100644
--- a/framework/derive/Cargo.toml
+++ b/framework/derive/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-derive"
-version = "0.47.5"
+version = "0.47.6"
 edition = "2021"
 
 authors = ["Andrei Marinica <andrei.marinica@multiversx.com>", "MultiversX <contact@multiversx.com>"]
diff --git a/framework/meta/Cargo.toml b/framework/meta/Cargo.toml
index a4554cf766..4825f960a9 100644
--- a/framework/meta/Cargo.toml
+++ b/framework/meta/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-meta"
-version = "0.47.5"
+version = "0.47.6"
 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.5"
+version = "=0.47.6"
 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 d65b1b6094..73bb69786f 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.5"
+version = "0.47.6"
 
 # [workspace]
 
diff --git a/framework/meta/src/cmd/contract/meta_config.rs b/framework/meta/src/cmd/contract/meta_config.rs
index f492884743..ff9ed2f2f5 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.5\"
+version = \"0.47.6\"
 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.5".to_string(),
+            framework_version: "0.47.6".to_string(),
             framework_path: Option::Some("../../../framework/base".to_string()),
             contract_features: Vec::<String>::new(),
         };
diff --git a/framework/meta/src/version_history.rs b/framework/meta/src/version_history.rs
index dbd391af6e..28e3deb2fa 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.5);
+pub const LAST_VERSION: FrameworkVersion = framework_version!(0.47.6);
 
 /// Indicates where to stop with the upgrades.
 pub const LAST_UPGRADE_VERSION: FrameworkVersion = LAST_VERSION;
@@ -63,6 +63,7 @@ pub const VERSIONS: &[FrameworkVersion] = framework_versions![
     0.47.3,
     0.47.4,
     0.47.5,
+    0.47.6,
 ];
 
 #[rustfmt::skip]
diff --git a/framework/scenario/Cargo.toml b/framework/scenario/Cargo.toml
index 560cf08281..cff475ee2f 100644
--- a/framework/scenario/Cargo.toml
+++ b/framework/scenario/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-scenario"
-version = "0.47.5"
+version = "0.47.6"
 edition = "2021"
 
 authors = [
@@ -40,12 +40,12 @@ path = "src/main.rs"
 run-go-tests = []
 
 [dependencies.multiversx-sc]
-version = "=0.47.5"
+version = "=0.47.6"
 features = ["alloc", "num-bigint"]
 path = "../base"
 
 [dependencies.multiversx-sc-meta]
-version = "=0.47.5"
+version = "=0.47.6"
 path = "../meta"
 
 [dependencies.multiversx-chain-scenario-format]
diff --git a/framework/snippets/Cargo.toml b/framework/snippets/Cargo.toml
index 3eb1a578df..700053f340 100644
--- a/framework/snippets/Cargo.toml
+++ b/framework/snippets/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-snippets"
-version = "0.47.5"
+version = "0.47.6"
 edition = "2021"
 
 authors = ["MultiversX <contact@multiversx.com>"]
@@ -22,7 +22,7 @@ env_logger = "0.11"
 futures = "0.3"
 
 [dependencies.multiversx-sc-scenario]
-version = "=0.47.5"
+version = "=0.47.6"
 path = "../scenario"
 
 [dependencies.multiversx-sdk]
diff --git a/framework/wasm-adapter/Cargo.toml b/framework/wasm-adapter/Cargo.toml
index 4630f3d7d4..a4efa2c1eb 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.5"
+version = "0.47.6"
 edition = "2021"
 
 authors = [
@@ -22,5 +22,5 @@ categories = [
 ]
 
 [dependencies.multiversx-sc]
-version = "=0.47.5"
+version = "=0.47.6"
 path = "../base"
diff --git a/tools/mxpy-snippet-generator/Cargo.toml b/tools/mxpy-snippet-generator/Cargo.toml
index 6e7ab2d1b7..0de044383f 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.5"
+version = "0.47.6"
 path = "../../framework/base"
 
 [dependencies]
diff --git a/tools/rust-debugger/format-tests/Cargo.toml b/tools/rust-debugger/format-tests/Cargo.toml
index 806ca531ea..c7109ff434 100644
--- a/tools/rust-debugger/format-tests/Cargo.toml
+++ b/tools/rust-debugger/format-tests/Cargo.toml
@@ -9,11 +9,11 @@ name = "format-tests"
 path = "src/format_tests.rs"
 
 [dependencies.multiversx-sc]
-version = "=0.47.5"
+version = "=0.47.6"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-scenario]
-version = "=0.47.5"
+version = "=0.47.6"
 path = "../../../framework/scenario"
 
 [dependencies.multiversx-chain-vm]

From faa9941d138543f7251742b1814e97c9c4014f79 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 15 Mar 2024 00:37:28 +0100
Subject: [PATCH 0466/1254] Cargo.lock update

---
 .../benchmarks/large-storage/wasm/Cargo.lock  |  6 +--
 .../linked-list-repeat/wasm/Cargo.lock        |  6 +--
 .../mappers/map-repeat/wasm/Cargo.lock        |  6 +--
 .../mappers/queue-repeat/wasm/Cargo.lock      |  6 +--
 .../mappers/set-repeat/wasm/Cargo.lock        |  6 +--
 .../single-value-repeat/wasm/Cargo.lock       |  6 +--
 .../mappers/vec-repeat/wasm/Cargo.lock        |  6 +--
 .../benchmarks/send-tx-repeat/wasm/Cargo.lock |  6 +--
 .../benchmarks/str-repeat/wasm/Cargo.lock     |  6 +--
 .../core/price-aggregator/wasm/Cargo.lock     | 42 +++++++++----------
 contracts/examples/adder/wasm/Cargo.lock      |  6 +--
 .../bonding-curve-contract/wasm/Cargo.lock    |  8 ++--
 .../examples/check-pause/wasm/Cargo.lock      |  8 ++--
 .../crowdfunding-esdt/wasm/Cargo.lock         |  6 +--
 .../examples/crypto-bubbles/wasm/Cargo.lock   |  6 +--
 .../kitty-auction/wasm/Cargo.lock             |  6 +--
 .../kitty-genetic-alg/wasm/Cargo.lock         |  6 +--
 .../kitty-ownership/wasm/Cargo.lock           |  6 +--
 .../examples/crypto-zombies/wasm/Cargo.lock   |  6 +--
 .../examples/digital-cash/wasm/Cargo.lock     |  6 +--
 contracts/examples/empty/wasm/Cargo.lock      |  6 +--
 .../esdt-transfer-with-fee/wasm/Cargo.lock    |  6 +--
 contracts/examples/factorial/wasm/Cargo.lock  |  6 +--
 .../examples/fractional-nfts/wasm/Cargo.lock  |  8 ++--
 .../examples/lottery-esdt/wasm/Cargo.lock     |  6 +--
 .../multisig/wasm-multisig-full/Cargo.lock    |  8 ++--
 .../multisig/wasm-multisig-view/Cargo.lock    |  8 ++--
 contracts/examples/multisig/wasm/Cargo.lock   |  8 ++--
 contracts/examples/nft-minter/wasm/Cargo.lock |  6 +--
 .../nft-storage-prepay/wasm/Cargo.lock        |  6 +--
 .../examples/nft-subscription/wasm/Cargo.lock |  8 ++--
 .../order-book/factory/wasm/Cargo.lock        |  6 +--
 .../examples/order-book/pair/wasm/Cargo.lock  |  6 +--
 .../examples/ping-pong-egld/wasm/Cargo.lock   |  6 +--
 .../examples/proxy-pause/wasm/Cargo.lock      |  6 +--
 .../rewards-distribution/wasm/Cargo.lock      |  8 ++--
 .../examples/seed-nft-minter/wasm/Cargo.lock  |  8 ++--
 .../examples/token-release/wasm/Cargo.lock    |  6 +--
 .../abi-tester/wasm-abi-tester-ev/Cargo.lock  |  6 +--
 .../feature-tests/abi-tester/wasm/Cargo.lock  |  6 +--
 .../wasm-alloc-mem-fail/Cargo.lock            |  6 +--
 .../wasm-alloc-mem-leaking/Cargo.lock         |  6 +--
 .../alloc-features/wasm/Cargo.lock            |  6 +--
 .../Cargo.lock                                |  8 ++--
 .../basic-features/wasm/Cargo.lock            |  8 ++--
 .../big-float-features/wasm/Cargo.lock        |  6 +--
 .../builtin-func-features/wasm/Cargo.lock     |  6 +--
 .../first-contract/wasm/Cargo.lock            |  6 +--
 .../second-contract/wasm/Cargo.lock           |  6 +--
 .../child/wasm/Cargo.lock                     |  6 +--
 .../parent/wasm/Cargo.lock                    |  6 +--
 .../wasm-forwarder-queue-promises/Cargo.lock  |  6 +--
 .../forwarder-queue/wasm/Cargo.lock           |  6 +--
 .../Cargo.lock                                |  6 +--
 .../Cargo.lock                                |  6 +--
 .../forwarder-raw/wasm/Cargo.lock             |  6 +--
 .../composability/forwarder/wasm/Cargo.lock   |  6 +--
 .../local-esdt-and-nft/wasm/Cargo.lock        |  6 +--
 .../promises-features/wasm/Cargo.lock         |  6 +--
 .../proxy-test-first/wasm/Cargo.lock          |  6 +--
 .../proxy-test-second/wasm/Cargo.lock         |  6 +--
 .../recursive-caller/wasm/Cargo.lock          |  6 +--
 .../transfer-role-features/wasm/Cargo.lock    |  8 ++--
 .../vault/wasm-vault-promises/Cargo.lock      |  6 +--
 .../vault/wasm-vault-upgrade/Cargo.lock       |  6 +--
 .../composability/vault/wasm/Cargo.lock       |  6 +--
 .../crowdfunding-erc20/wasm/Cargo.lock        |  6 +--
 .../erc1155-marketplace/wasm/Cargo.lock       |  6 +--
 .../erc1155-user-mock/wasm/Cargo.lock         |  6 +--
 .../erc1155/wasm/Cargo.lock                   |  6 +--
 .../erc-style-contracts/erc20/wasm/Cargo.lock |  6 +--
 .../erc721/wasm/Cargo.lock                    |  6 +--
 .../lottery-erc20/wasm/Cargo.lock             |  6 +--
 .../esdt-system-sc-mock/wasm/Cargo.lock       |  6 +--
 .../wasm/Cargo.lock                           |  6 +--
 .../managed-map-features/wasm/Cargo.lock      |  6 +--
 .../wasm-multi-contract-alt-impl/Cargo.lock   |  6 +--
 .../Cargo.lock                                |  6 +--
 .../Cargo.lock                                |  6 +--
 .../multi-contract-features/wasm/Cargo.lock   |  6 +--
 .../panic-message-features/wasm/Cargo.lock    |  6 +--
 .../payable-features/wasm/Cargo.lock          |  6 +--
 .../wasm/Cargo.lock                           |  6 +--
 .../wasm/Cargo.lock                           |  6 +--
 .../wasm-use-module-view/Cargo.lock           |  8 ++--
 .../feature-tests/use-module/wasm/Cargo.lock  |  8 ++--
 86 files changed, 290 insertions(+), 290 deletions(-)

diff --git a/contracts/benchmarks/large-storage/wasm/Cargo.lock b/contracts/benchmarks/large-storage/wasm/Cargo.lock
index fa29ad6f14..7be1d06796 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.47.5"
+version = "0.47.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.lock
index b81c08488a..c53d36c9e6 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.47.5"
+version = "0.47.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -92,7 +92,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -103,7 +103,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.lock
index 54e27ced42..8e9ecb0aff 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.47.5"
+version = "0.47.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -92,7 +92,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -103,7 +103,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.lock
index a92443bd08..a05e0cbf9c 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.47.5"
+version = "0.47.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.lock
index 5e5d756355..82ecbafa98 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.47.5"
+version = "0.47.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.lock
index 558c2921c6..aeda5a7bc8 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.47.5"
+version = "0.47.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.lock
index 2feba1a867..12e9bf5ce5 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.47.5"
+version = "0.47.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/send-tx-repeat/wasm/Cargo.lock b/contracts/benchmarks/send-tx-repeat/wasm/Cargo.lock
index f9dfe9d5b2..5ae88675b5 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.47.5"
+version = "0.47.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/str-repeat/wasm/Cargo.lock b/contracts/benchmarks/str-repeat/wasm/Cargo.lock
index 1486892d5c..5a33cbf8ea 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.47.5"
+version = "0.47.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/core/price-aggregator/wasm/Cargo.lock b/contracts/core/price-aggregator/wasm/Cargo.lock
index 3c49a61d3a..7e1f74ef3b 100644
--- a/contracts/core/price-aggregator/wasm/Cargo.lock
+++ b/contracts/core/price-aggregator/wasm/Cargo.lock
@@ -22,9 +22,9 @@ checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
 
 [[package]]
 name = "bumpalo"
-version = "3.14.0"
+version = "3.15.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec"
+checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa"
 
 [[package]]
 name = "cfg-if"
@@ -65,9 +65,9 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "js-sys"
-version = "0.3.68"
+version = "0.3.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "406cda4b368d531c842222cf9d2600a9a4acce8d29423695379c6868a143a9ee"
+checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -80,13 +80,13 @@ checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
 
 [[package]]
 name = "log"
-version = "0.4.20"
+version = "0.4.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
+checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
 
 [[package]]
 name = "multiversx-price-aggregator-sc"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "arrayvec",
  "getrandom",
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -134,7 +134,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -145,14 +145,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "multiversx-sc",
 ]
@@ -276,9 +276,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.91"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1e124130aee3fb58c5bdd6b639a0509486b0338acaaae0c84a5124b0f588b7f"
+checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"
 dependencies = [
  "cfg-if",
  "wasm-bindgen-macro",
@@ -286,9 +286,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.91"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9e7e1900c352b609c8488ad12639a311045f40a35491fb69ba8c12f758af70b"
+checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da"
 dependencies = [
  "bumpalo",
  "log",
@@ -301,9 +301,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.91"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b30af9e2d358182b5c7449424f017eba305ed32a7010509ede96cdc4696c46ed"
+checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -311,9 +311,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.91"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "642f325be6301eb8107a83d12a8ac6c1e1c54345a7ef1a9261962dfefda09e66"
+checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -324,6 +324,6 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.91"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f186bd2dcf04330886ce82d6f33dd75a7bfcf69ecf5763b89fcde53b6ac9838"
+checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
diff --git a/contracts/examples/adder/wasm/Cargo.lock b/contracts/examples/adder/wasm/Cargo.lock
index ee2b588c5d..f1e406be0b 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.47.5"
+version = "0.47.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/bonding-curve-contract/wasm/Cargo.lock b/contracts/examples/bonding-curve-contract/wasm/Cargo.lock
index 4764163b77..b95f064ec9 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.47.5"
+version = "0.47.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,14 +96,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/check-pause/wasm/Cargo.lock b/contracts/examples/check-pause/wasm/Cargo.lock
index 659770d735..381a32895d 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.47.5"
+version = "0.47.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,14 +96,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crowdfunding-esdt/wasm/Cargo.lock b/contracts/examples/crowdfunding-esdt/wasm/Cargo.lock
index 06a703eb14..188e8e70e9 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.47.5"
+version = "0.47.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crypto-bubbles/wasm/Cargo.lock b/contracts/examples/crypto-bubbles/wasm/Cargo.lock
index f2c55800ed..56782e48f4 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.47.5"
+version = "0.47.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.lock b/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.lock
index 844e92ad69..5ccd000fa0 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.47.5"
+version = "0.47.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -113,7 +113,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -124,7 +124,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "multiversx-sc",
 ]
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 3b48261415..e2d7648bec 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.47.5"
+version = "0.47.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.lock b/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.lock
index 2305919360..95e227f126 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.47.5"
+version = "0.47.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -104,7 +104,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -115,7 +115,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crypto-zombies/wasm/Cargo.lock b/contracts/examples/crypto-zombies/wasm/Cargo.lock
index 9425f7d3fe..4375fdad74 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.47.5"
+version = "0.47.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/digital-cash/wasm/Cargo.lock b/contracts/examples/digital-cash/wasm/Cargo.lock
index d01e7ca5d3..80451862a4 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.47.5"
+version = "0.47.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/empty/wasm/Cargo.lock b/contracts/examples/empty/wasm/Cargo.lock
index ed51dd0f2d..77c2d35593 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.47.5"
+version = "0.47.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.lock b/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.lock
index 4a29f51769..0b1120c4bb 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.47.5"
+version = "0.47.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/factorial/wasm/Cargo.lock b/contracts/examples/factorial/wasm/Cargo.lock
index 93ca6d814f..61020c7136 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.47.5"
+version = "0.47.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/fractional-nfts/wasm/Cargo.lock b/contracts/examples/fractional-nfts/wasm/Cargo.lock
index 8cb705ce82..fcf3281a66 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.47.5"
+version = "0.47.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,14 +96,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/lottery-esdt/wasm/Cargo.lock b/contracts/examples/lottery-esdt/wasm/Cargo.lock
index a597e353be..4fb2a0da1a 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.47.5"
+version = "0.47.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/multisig/wasm-multisig-full/Cargo.lock b/contracts/examples/multisig/wasm-multisig-full/Cargo.lock
index 329757cdb6..91527cb329 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.47.5"
+version = "0.47.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,14 +96,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/multisig/wasm-multisig-view/Cargo.lock b/contracts/examples/multisig/wasm-multisig-view/Cargo.lock
index 9ec7d5be1e..f7651215a2 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.47.5"
+version = "0.47.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,14 +96,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/multisig/wasm/Cargo.lock b/contracts/examples/multisig/wasm/Cargo.lock
index a1f0090ffe..703a789b67 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.47.5"
+version = "0.47.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,14 +96,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/nft-minter/wasm/Cargo.lock b/contracts/examples/nft-minter/wasm/Cargo.lock
index 8137f69e11..4e52a3e4ce 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.47.5"
+version = "0.47.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/nft-storage-prepay/wasm/Cargo.lock b/contracts/examples/nft-storage-prepay/wasm/Cargo.lock
index 9618be73c9..e86af50f12 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.47.5"
+version = "0.47.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/nft-subscription/wasm/Cargo.lock b/contracts/examples/nft-subscription/wasm/Cargo.lock
index 53bd528197..9b4c96f380 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.47.5"
+version = "0.47.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,14 +80,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/order-book/factory/wasm/Cargo.lock b/contracts/examples/order-book/factory/wasm/Cargo.lock
index c5b0d6fa16..8a0892b4f0 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.47.5"
+version = "0.47.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/order-book/pair/wasm/Cargo.lock b/contracts/examples/order-book/pair/wasm/Cargo.lock
index ee004b1197..7b781cacc5 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.47.5"
+version = "0.47.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/ping-pong-egld/wasm/Cargo.lock b/contracts/examples/ping-pong-egld/wasm/Cargo.lock
index b1fa1d7bee..ea650d9183 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.47.5"
+version = "0.47.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/proxy-pause/wasm/Cargo.lock b/contracts/examples/proxy-pause/wasm/Cargo.lock
index d9ee7fd1bf..0255476045 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.47.5"
+version = "0.47.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/rewards-distribution/wasm/Cargo.lock b/contracts/examples/rewards-distribution/wasm/Cargo.lock
index 2f7aa5b9c9..7a48d77b79 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.47.5"
+version = "0.47.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,14 +80,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/seed-nft-minter/wasm/Cargo.lock b/contracts/examples/seed-nft-minter/wasm/Cargo.lock
index cf8559ba91..fb7221c3d2 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.47.5"
+version = "0.47.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,14 +80,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/token-release/wasm/Cargo.lock b/contracts/examples/token-release/wasm/Cargo.lock
index 04771bffe7..8c8f3dc478 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.47.5"
+version = "0.47.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "multiversx-sc",
 ]
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 68b0945a4a..10c6773f26 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.47.5"
+version = "0.47.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/abi-tester/wasm/Cargo.lock b/contracts/feature-tests/abi-tester/wasm/Cargo.lock
index 8f5706541d..a5aff97dd6 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.47.5"
+version = "0.47.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock
index 86a0dd8369..487a94fe63 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.lock b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.lock
index e6478aa683..0ad48515fe 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.lock
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.lock
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/alloc-features/wasm/Cargo.lock b/contracts/feature-tests/alloc-features/wasm/Cargo.lock
index 78cd8de067..6c98001362 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.47.5"
+version = "0.47.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "multiversx-sc",
 ]
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 fd4d59761c..3a6b9aafb9 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.47.5"
+version = "0.47.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,14 +96,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/basic-features/wasm/Cargo.lock b/contracts/feature-tests/basic-features/wasm/Cargo.lock
index e4bb971005..1ce9fe2626 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.47.5"
+version = "0.47.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,14 +96,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/big-float-features/wasm/Cargo.lock b/contracts/feature-tests/big-float-features/wasm/Cargo.lock
index 8de5fab712..b51f2b38fc 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.47.5"
+version = "0.47.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "multiversx-sc",
 ]
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 4e9e07752c..86dcd9f808 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.47.5"
+version = "0.47.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "multiversx-sc",
 ]
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 c38b6fb0ce..eecef5998f 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.47.5"
+version = "0.47.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "multiversx-sc",
 ]
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 b6b9fc008d..7c177a1cb4 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.47.5"
+version = "0.47.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "multiversx-sc",
 ]
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 1fcf243263..05ce10fcdf 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.47.5"
+version = "0.47.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "multiversx-sc",
 ]
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 a1695205f6..1203771393 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.47.5"
+version = "0.47.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "multiversx-sc",
 ]
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 77b8dddef6..6cd0f8bf6f 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.47.5"
+version = "0.47.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,7 +96,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock
index 16c620e6f3..204fd42b2c 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.47.5"
+version = "0.47.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,7 +96,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "multiversx-sc",
 ]
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 dc9d4ac00a..114dcac248 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.47.5"
+version = "0.47.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "multiversx-sc",
 ]
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 1e3db2655b..c3a50248c5 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.47.5"
+version = "0.47.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.lock
index f5ba514af5..938e700dd1 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.47.5"
+version = "0.47.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock
index 3d866d859a..f261a8a95a 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.47.5"
+version = "0.47.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,7 +96,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "multiversx-sc",
 ]
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 acc6558d24..54764c0e5f 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.47.5"
+version = "0.47.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/promises-features/wasm/Cargo.lock b/contracts/feature-tests/composability/promises-features/wasm/Cargo.lock
index eb6e4092ed..8be785965b 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.47.5"
+version = "0.47.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "multiversx-sc",
 ]
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 4aff4f7065..4c616d091a 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.47.5"
+version = "0.47.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "multiversx-sc",
 ]
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 3420a7b3f6..2fd411835f 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.47.5"
+version = "0.47.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.lock b/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.lock
index 1c86119ff1..ac7deaf7a0 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.47.5"
+version = "0.47.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "multiversx-sc",
 ]
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 bb7ae8f108..d2e6b98b35 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.47.5"
+version = "0.47.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,14 +80,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "multiversx-sc",
 ]
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 ee08553757..a8fb67560e 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.47.5"
+version = "0.47.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "multiversx-sc",
 ]
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 5130bd4f11..91342201d7 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.47.5"
+version = "0.47.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/vault/wasm/Cargo.lock b/contracts/feature-tests/composability/vault/wasm/Cargo.lock
index 7c62c838a8..7f7b448ea1 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.47.5"
+version = "0.47.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "multiversx-sc",
 ]
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 c1f6bbab6c..e9da526720 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.47.5"
+version = "0.47.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -92,7 +92,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -103,7 +103,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "multiversx-sc",
 ]
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 e1d897e85b..f7da662233 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.47.5"
+version = "0.47.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -92,7 +92,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -103,7 +103,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "multiversx-sc",
 ]
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 89b2e55240..02a77c911f 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.47.5"
+version = "0.47.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "multiversx-sc",
 ]
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 edcb0e4176..f068f66024 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.47.5"
+version = "0.47.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "multiversx-sc",
 ]
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 4833835c10..31f5c7a5b3 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.47.5"
+version = "0.47.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "multiversx-sc",
 ]
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 7b5004e949..921baab25d 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.47.5"
+version = "0.47.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "multiversx-sc",
 ]
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 2d821b9e29..49b706b912 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.47.5"
+version = "0.47.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -92,7 +92,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -103,7 +103,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "multiversx-sc",
 ]
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 d789558af3..7d3eb7e294 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.47.5"
+version = "0.47.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/formatted-message-features/wasm/Cargo.lock b/contracts/feature-tests/formatted-message-features/wasm/Cargo.lock
index b19830db13..80f9af5533 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.47.5"
+version = "0.47.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/managed-map-features/wasm/Cargo.lock b/contracts/feature-tests/managed-map-features/wasm/Cargo.lock
index e8fa9edd3d..491ef2f890 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.47.5"
+version = "0.47.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "multiversx-sc",
 ]
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 1361ebb7c7..f08ba00acd 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.47.5"
+version = "0.47.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "multiversx-sc",
 ]
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 3928df2b36..aef8e2e065 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.47.5"
+version = "0.47.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "multiversx-sc",
 ]
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 db8878b7ad..0fb553246f 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.47.5"
+version = "0.47.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/multi-contract-features/wasm/Cargo.lock b/contracts/feature-tests/multi-contract-features/wasm/Cargo.lock
index a8b5526b05..2be74ea6d2 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.47.5"
+version = "0.47.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/panic-message-features/wasm/Cargo.lock b/contracts/feature-tests/panic-message-features/wasm/Cargo.lock
index daee57efc3..d7a615f03b 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.47.5"
+version = "0.47.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/payable-features/wasm/Cargo.lock b/contracts/feature-tests/payable-features/wasm/Cargo.lock
index 56c5e9e863..5fd8334ff0 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.47.5"
+version = "0.47.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "multiversx-sc",
 ]
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 1f0efa51a3..11de3fca41 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.47.5"
+version = "0.47.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "multiversx-sc",
 ]
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 83116fbd50..0fa9a620bc 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.47.5"
+version = "0.47.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "multiversx-sc",
 ]
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 6de9cf30eb..d5e7c069db 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.47.5"
+version = "0.47.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,14 +80,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/use-module/wasm/Cargo.lock b/contracts/feature-tests/use-module/wasm/Cargo.lock
index 9d8b2504a3..7c11441a64 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.47.5"
+version = "0.47.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,14 +80,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.5"
+version = "0.47.6"
 dependencies = [
  "multiversx-sc",
 ]

From 835ac026e3a3b1e93aca9b754e8144315d11a980 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 15 Mar 2024 07:23:54 +0100
Subject: [PATCH 0467/1254] template fix: remove path from interactor
 Cargo.toml

---
 .../standalone/template/template_adjuster.rs    | 17 +++++++++++++++++
 framework/meta/tests/template_test.rs           |  2 ++
 2 files changed, 19 insertions(+)

diff --git a/framework/meta/src/cmd/standalone/template/template_adjuster.rs b/framework/meta/src/cmd/standalone/template/template_adjuster.rs
index d84422c536..1182463c8f 100644
--- a/framework/meta/src/cmd/standalone/template/template_adjuster.rs
+++ b/framework/meta/src/cmd/standalone/template/template_adjuster.rs
@@ -14,6 +14,7 @@ const INTERACT_DIRECTORY: &str = "./interact";
 const ROOT_CARGO_TOML: &str = "./Cargo.toml";
 const META_CARGO_TOML: &str = "./meta/Cargo.toml";
 const WASM_CARGO_TOML: &str = "./wasm/Cargo.toml";
+const INTERACT_CARGO_TOML: &str = "./interact/Cargo.toml";
 
 pub struct TemplateAdjuster {
     pub metadata: TemplateMetadata,
@@ -25,6 +26,7 @@ impl TemplateAdjuster {
         self.update_dependencies_root();
         self.update_dependencies_meta();
         self.update_dependencies_wasm(args_tag);
+        self.update_dependencies_interact();
     }
 
     fn update_dependencies_root(&self) {
@@ -70,6 +72,21 @@ impl TemplateAdjuster {
         toml.save_to_file(&cargo_toml_path);
     }
 
+    fn update_dependencies_interact(&self) {
+        if !self.metadata.has_interactor {
+            return;
+        }
+
+        let cargo_toml_path = self.target.contract_dir().join(INTERACT_CARGO_TOML);
+        let mut toml = CargoTomlContents::load_from_file(&cargo_toml_path);
+
+        if !self.keep_paths {
+            remove_paths_from_deps(&mut toml, &[&self.metadata.name]);
+        }
+
+        toml.save_to_file(&cargo_toml_path);
+    }
+
     pub fn rename_template_to(&self) {
         self.rename_trait_to();
         self.rename_in_cargo_toml_root();
diff --git a/framework/meta/tests/template_test.rs b/framework/meta/tests/template_test.rs
index 1f5f0edc7c..335fcb240b 100644
--- a/framework/meta/tests/template_test.rs
+++ b/framework/meta/tests/template_test.rs
@@ -98,6 +98,8 @@ fn template_test_current(template_name: &str, sub_path: &str, new_name: &str) {
 #[cfg_attr(not(feature = "template-test-released"), ignore)]
 fn template_released_adder() {
     template_test_released("adder", "released-adder");
+
+    cargo_check_interactor("", "released-adder");
 }
 
 #[test]

From 54789fe3eba79ad42742665a99be1477f093a4d0 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 15 Mar 2024 07:49:49 +0100
Subject: [PATCH 0468/1254] sc 0.47.7

---
 CHANGELOG.md                                  |   5 +-
 Cargo.lock                                    |  18 ++--
 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 +-
 .../scenarios/stress_submit_test.scen.json    | 100 +++++++++---------
 .../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 +-
 .../wasm-alloc-mem-fail/Cargo.toml            |   2 +-
 .../wasm-alloc-mem-leaking/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 +-
 framework/base/Cargo.toml                     |   4 +-
 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         |   3 +-
 framework/scenario/Cargo.toml                 |   6 +-
 framework/snippets/Cargo.toml                 |   4 +-
 framework/wasm-adapter/Cargo.toml             |   4 +-
 tools/mxpy-snippet-generator/Cargo.toml       |   2 +-
 tools/rust-debugger/format-tests/Cargo.toml   |   4 +-
 263 files changed, 436 insertions(+), 432 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7bcc7b063a..c69c506421 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,7 +27,10 @@ They are:
 - `multiversx-sdk`, in short `sdk`, allows communication with the chain(s), 1 crate.
 
 
-## [sc 0.47.6] - 2024-03-15
+## [sc 0.47.7] - 2024-03-15
+- Template bugfix (concerning the interactor).
+
+## [sc 0.47.6] - 2024-03-14
 - Template naming bugfix, regarding numbers in the project name.
 - Added the interactor to the adder template.
 
diff --git a/Cargo.lock b/Cargo.lock
index 670a0d00ae..91f8b05cc7 100755
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1794,7 +1794,7 @@ checksum = "b59072fa0624b55ae5ae3fa6bfa91515bbeb4ac440214bc4a509e2c8806d6e9f"
 
 [[package]]
 name = "multiversx-price-aggregator-sc"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "arrayvec",
  "getrandom 0.2.12",
@@ -1815,7 +1815,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "bitflags 2.4.2",
  "hex-literal",
@@ -1845,7 +1845,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -1856,7 +1856,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-meta"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "clap",
  "colored",
@@ -1882,14 +1882,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-scenario"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "base64",
  "bech32",
@@ -1915,7 +1915,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-snippets"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "base64",
  "env_logger",
@@ -1929,7 +1929,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "multiversx-sc",
 ]
@@ -1960,7 +1960,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-wegld-swap-sc"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "multiversx-sc",
  "multiversx-sc-modules",
diff --git a/contracts/benchmarks/large-storage/Cargo.toml b/contracts/benchmarks/large-storage/Cargo.toml
index 5fb591be86..c14636ef07 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.6"
+version = "0.47.7"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.6"
+version = "0.47.7"
 path = "../../../framework/scenario"
diff --git a/contracts/benchmarks/large-storage/meta/Cargo.toml b/contracts/benchmarks/large-storage/meta/Cargo.toml
index ce060cbb49..df4b4ca87a 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.6"
+version = "0.47.7"
 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 b55c72c7c2..979d575564 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.6"
+version = "0.47.7"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/mappers/benchmark-common/Cargo.toml b/contracts/benchmarks/mappers/benchmark-common/Cargo.toml
index 09f6f6b1ea..125a2154ef 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.6"
+version = "0.47.7"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.6"
+version = "0.47.7"
 path = "../../../../framework/scenario"
diff --git a/contracts/benchmarks/mappers/linked-list-repeat/Cargo.toml b/contracts/benchmarks/mappers/linked-list-repeat/Cargo.toml
index d7295369df..7d204e2520 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.6"
+version = "0.47.7"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.6"
+version = "0.47.7"
 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 c9f0d0f743..fbe11e8dfb 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.6"
+version = "0.47.7"
 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 f43fc00def..c894b1c183 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.6"
+version = "0.47.7"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/mappers/map-repeat/Cargo.toml b/contracts/benchmarks/mappers/map-repeat/Cargo.toml
index dbac0a2fc4..02a30108b1 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.6"
+version = "0.47.7"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.6"
+version = "0.47.7"
 path = "../../../../framework/scenario"
diff --git a/contracts/benchmarks/mappers/map-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/map-repeat/meta/Cargo.toml
index aaafa11fd8..bf452ee2cd 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.6"
+version = "0.47.7"
 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 c9949f2909..c8350b0002 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.6"
+version = "0.47.7"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/mappers/queue-repeat/Cargo.toml b/contracts/benchmarks/mappers/queue-repeat/Cargo.toml
index f3f0675e36..484adebeb7 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.6"
+version = "0.47.7"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.6"
+version = "0.47.7"
 path = "../../../../framework/scenario"
diff --git a/contracts/benchmarks/mappers/queue-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/queue-repeat/meta/Cargo.toml
index a56ea924d4..6616ebe0ed 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.6"
+version = "0.47.7"
 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 0810177dcf..5dee69f0e3 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.6"
+version = "0.47.7"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/mappers/set-repeat/Cargo.toml b/contracts/benchmarks/mappers/set-repeat/Cargo.toml
index 465175b82a..b02586fda1 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.6"
+version = "0.47.7"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.6"
+version = "0.47.7"
 path = "../../../../framework/scenario"
diff --git a/contracts/benchmarks/mappers/set-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/set-repeat/meta/Cargo.toml
index 61ccaa8425..44f4460ec8 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.6"
+version = "0.47.7"
 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 ab29b05874..8582da6423 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.6"
+version = "0.47.7"
 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 52a712c1c6..6d514a9876 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.6"
+version = "0.47.7"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.6"
+version = "0.47.7"
 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 a3091fffc1..27636e6c3b 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.6"
+version = "0.47.7"
 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 40b27f6ae7..a32bd93768 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.6"
+version = "0.47.7"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/mappers/vec-repeat/Cargo.toml b/contracts/benchmarks/mappers/vec-repeat/Cargo.toml
index db78e32d9e..86a34d011c 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.6"
+version = "0.47.7"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.6"
+version = "0.47.7"
 path = "../../../../framework/scenario"
diff --git a/contracts/benchmarks/mappers/vec-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/vec-repeat/meta/Cargo.toml
index 3d50c9a221..39c9156194 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.6"
+version = "0.47.7"
 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 798d769c5f..98b52695ce 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.6"
+version = "0.47.7"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/send-tx-repeat/Cargo.toml b/contracts/benchmarks/send-tx-repeat/Cargo.toml
index eef886e33a..b2228d2bb3 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.6"
+version = "0.47.7"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.6"
+version = "0.47.7"
 path = "../../../framework/scenario"
diff --git a/contracts/benchmarks/send-tx-repeat/meta/Cargo.toml b/contracts/benchmarks/send-tx-repeat/meta/Cargo.toml
index 9af50be174..e497927391 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.6"
+version = "0.47.7"
 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 32ace41bb8..ca9b654305 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.6"
+version = "0.47.7"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/str-repeat/Cargo.toml b/contracts/benchmarks/str-repeat/Cargo.toml
index faad09ae64..b2f9886089 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.6"
+version = "0.47.7"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.6"
+version = "0.47.7"
 path = "../../../framework/scenario"
diff --git a/contracts/benchmarks/str-repeat/meta/Cargo.toml b/contracts/benchmarks/str-repeat/meta/Cargo.toml
index 209f138d48..6552eff709 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.6"
+version = "0.47.7"
 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 3da3e115a2..0927435100 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.6"
+version = "0.47.7"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/core/price-aggregator/Cargo.toml b/contracts/core/price-aggregator/Cargo.toml
index fec7498b3e..324d1192de 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.6"
+version = "0.47.7"
 authors = [
     "Claudiu-Marcel Bruda <claudiu.bruda@multiversx.com>",
     "MultiversX <contact@multiversx.com>",
@@ -19,15 +19,15 @@ edition = "2021"
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "0.47.6"
+version = "0.47.7"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.47.6"
+version = "0.47.7"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.6"
+version = "0.47.7"
 path = "../../../framework/scenario"
 
 [dependencies]
diff --git a/contracts/core/price-aggregator/meta/Cargo.toml b/contracts/core/price-aggregator/meta/Cargo.toml
index 1af2bc366a..8116be6e4d 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.6"
+version = "0.47.7"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.47.6"
+version = "0.47.7"
 path = "../../../../framework/meta"
 default-features = false
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 79a075b626..a8f13f2994 100644
--- a/contracts/core/price-aggregator/scenarios/stress_submit_test.scen.json
+++ b/contracts/core/price-aggregator/scenarios/stress_submit_test.scen.json
@@ -1133,7 +1133,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x5f",
-                    "0x7788c70a9610c4be",
+                    "0xe4431c9cfb505fea",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1154,7 +1154,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xc1ea824e31efc9e4",
+                    "0xcca317a0b6489409",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1175,7 +1175,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xce32013182f11964",
+                    "0xd5da94d218e8b3e3",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1196,7 +1196,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x7b5585abc8746bba",
+                    "0x9b9f24755509abe6",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1217,7 +1217,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x5b72e1448c0d88e9",
+                    "0x596faa56dc4d9d4e",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1238,7 +1238,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x84ffa4c93adbf03f",
+                    "0x69ccc76678e2499e",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1259,7 +1259,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xdf49c7683aa8f812",
+                    "0x0176a6a333f061",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1280,7 +1280,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xdd16d54980e37a14",
+                    "0xee2ede42941ffb6f",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1301,7 +1301,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x489fc7abc281bff5",
+                    "0xfe5a2ca21500c94a",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1322,7 +1322,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x2b21387b70dc68fa",
+                    "0x98c16991e599ae6b",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1343,7 +1343,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x73a7c835bc2c5cc1",
+                    "0xec0197ac7c0da4a2",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1364,7 +1364,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xd0f9d6948f749e88",
+                    "0x4758692d635dde95",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1385,7 +1385,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xefa0dd75e273f855",
+                    "0xfa99ca83e839c136",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1406,7 +1406,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xa4e30019602ac07a",
+                    "0x2542eed0ad760b6f",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1427,7 +1427,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x6a76200c754ab268",
+                    "0xcaa56ad357bf558a",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1448,7 +1448,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xf80c0fe7c4f2d2ab",
+                    "0x4104ad72636fdc35",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1469,7 +1469,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xc3311fd07a622588",
+                    "0x08b6adc46d6dccf0",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1490,7 +1490,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x7e1ed49ae692e3c2",
+                    "0xb5c8708954d584e4",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1511,7 +1511,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x1bc08702bf94881d",
+                    "0x6136e999fb83ab09",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1532,7 +1532,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xe1ef12a5d5de7a5b",
+                    "0x214d92d0a7450389",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1553,7 +1553,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xbe81b81b461e586a",
+                    "0xea21e03952d07af9",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1574,7 +1574,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x5299386cac2959d3",
+                    "0xdd822b3e1a5bb8a3",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1595,7 +1595,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x7ad8b2a2d0d8bb25",
+                    "0x80e2a3c4b931c4bc",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1616,7 +1616,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xc699d9b2a2265377",
+                    "0x279c3fa2eeaf0fb0",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1637,7 +1637,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xb901a55b0792d1e0",
+                    "0x768021226eba1043",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1658,7 +1658,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xfeea45b5beba2c40",
+                    "0x026089384f007444",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1679,7 +1679,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x65302a6c38774d4d",
+                    "0x49f7ab393052bb",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1700,7 +1700,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xe7ca98860b4e0732",
+                    "0x049afbf40fa88fb8",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1721,7 +1721,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x8bc5c26698edefb0",
+                    "0x6d9edf2f943d0c48",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1742,7 +1742,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x0a3fe4dea3530a88",
+                    "0x9fa99de813defc0c",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1763,7 +1763,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x0fbbfc508ed1daea",
+                    "0xd1d93e3611904d25",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1784,7 +1784,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x776254af7eee5567",
+                    "0x8696ff1edc27700e",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1805,7 +1805,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xa1fdcba5f1a891d6",
+                    "0xb20b2290aaa5a45e",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1826,7 +1826,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x44d1ed7c7ae1e173",
+                    "0x46f399722142c7dc",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1847,7 +1847,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xaa4c9135752b8024",
+                    "0x812c7b08e5ef93bb",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1868,7 +1868,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x7e2d24a77721cabb",
+                    "0x9f42bd04602aabfa",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1889,7 +1889,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x776c84750a7890f7",
+                    "0x3313bced09c1b91f",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1910,7 +1910,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xd18201dfce0e5317",
+                    "0xcc71d4a051c86da1",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1931,7 +1931,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xb7288d6a6593e051",
+                    "0x020dcbfee96f9111",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1952,7 +1952,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x97eab65a65b5f17d",
+                    "0x66803b9e9fb6ae87",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1973,7 +1973,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x8e24cf5782e9cb6c",
+                    "0x5e784067e72d6000",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1994,7 +1994,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xab04f3386a213e9e",
+                    "0x1990e5a459100514",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -2015,7 +2015,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xa7f258578eacd75d",
+                    "0x643b36cf7c98aed2",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -2036,7 +2036,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xd42348b209cd6e99",
+                    "0x19b768a5982e5d17",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -2057,7 +2057,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xe22ff5fdee16b542",
+                    "0xe8396bc4dade2e38",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -2078,7 +2078,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xc3b6af3c8792a1ea",
+                    "0xbd1b166e888f23b8",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -2099,7 +2099,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x81a7c3dd9adfa891",
+                    "0x4541ecf9e1bcd219",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -2120,7 +2120,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x53df0a0a26a53996",
+                    "0xac32e3eac4733d3e",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -2141,7 +2141,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xdcb0a37d6cb1bc42",
+                    "0x7d7dde2542dfa2d9",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -2162,7 +2162,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x127a946b5bbaed56",
+                    "0xd2c63e8cf9db301a",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
diff --git a/contracts/core/price-aggregator/wasm/Cargo.toml b/contracts/core/price-aggregator/wasm/Cargo.toml
index 842befe349..5a6caae0e4 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.6"
+version = "0.47.7"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/core/wegld-swap/Cargo.toml b/contracts/core/wegld-swap/Cargo.toml
index a52652c87c..011eda03bc 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.6"
+version = "0.47.7"
 
 authors = [
     "Dorin Iancu <dorin.iancu@multiversx.com>",
@@ -20,13 +20,13 @@ edition = "2021"
 path = "src/wegld.rs"
 
 [dependencies.multiversx-sc]
-version = "0.47.6"
+version = "0.47.7"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.47.6"
+version = "0.47.7"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.6"
+version = "0.47.7"
 path = "../../../framework/scenario"
diff --git a/contracts/core/wegld-swap/meta/Cargo.toml b/contracts/core/wegld-swap/meta/Cargo.toml
index 98214c5c45..5544435199 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.6"
+version = "0.47.7"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.47.6"
+version = "0.47.7"
 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 42da670c1c..2edcc0b9b7 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.6"
+version = "0.47.7"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/adder/Cargo.toml b/contracts/examples/adder/Cargo.toml
index b8eea0debf..e5e3295387 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.6"
+version = "0.47.7"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.6"
+version = "0.47.7"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/adder/interact/Cargo.toml b/contracts/examples/adder/interact/Cargo.toml
index 9a3cfa2282..b82fd0a198 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.6"
+version = "0.47.7"
 path = "../../../../framework/snippets"
diff --git a/contracts/examples/adder/meta/Cargo.toml b/contracts/examples/adder/meta/Cargo.toml
index 4177224e49..5b91c45d86 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.6"
+version = "0.47.7"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/examples/adder/wasm/Cargo.toml b/contracts/examples/adder/wasm/Cargo.toml
index 2d90464201..8d6ad9d33a 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.6"
+version = "0.47.7"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/bonding-curve-contract/Cargo.toml b/contracts/examples/bonding-curve-contract/Cargo.toml
index f75bedbdd5..e49b33e18c 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.6"
+version = "0.47.7"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.47.6"
+version = "0.47.7"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.6"
+version = "0.47.7"
 path = "../../../framework/scenario"
 
diff --git a/contracts/examples/bonding-curve-contract/meta/Cargo.toml b/contracts/examples/bonding-curve-contract/meta/Cargo.toml
index 998bf5381c..daa146036b 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.6"
+version = "0.47.7"
 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 9ef2d26d25..ed65eb737e 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.6"
+version = "0.47.7"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/check-pause/Cargo.toml b/contracts/examples/check-pause/Cargo.toml
index 60884428d1..b88e277df8 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.6"
+version = "0.47.7"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.47.6"
+version = "0.47.7"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.6"
+version = "0.47.7"
 path = "../../../framework/scenario"
 
diff --git a/contracts/examples/check-pause/meta/Cargo.toml b/contracts/examples/check-pause/meta/Cargo.toml
index 59360f259a..f24dffa830 100644
--- a/contracts/examples/check-pause/meta/Cargo.toml
+++ b/contracts/examples/check-pause/meta/Cargo.toml
@@ -9,6 +9,6 @@ authors = ["Alin Cruceat <alin.cruceat@multiversx.com>"]
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.47.6"
+version = "0.47.7"
 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 ab4176d63f..96ad3090db 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.6"
+version = "0.47.7"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/crowdfunding-esdt/Cargo.toml b/contracts/examples/crowdfunding-esdt/Cargo.toml
index dd987f9168..f613fa063b 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.6"
+version = "0.47.7"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.6"
+version = "0.47.7"
 path = "../../../framework/scenario"
 
 [dev-dependencies]
diff --git a/contracts/examples/crowdfunding-esdt/meta/Cargo.toml b/contracts/examples/crowdfunding-esdt/meta/Cargo.toml
index 177efdbcc1..bd09bd4551 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.6"
+version = "0.47.7"
 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 246445cd42..689fec6919 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.6"
+version = "0.47.7"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/crypto-bubbles/Cargo.toml b/contracts/examples/crypto-bubbles/Cargo.toml
index bf37ef5fd8..125eaf59db 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.6"
+version = "0.47.7"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.6"
+version = "0.47.7"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/crypto-bubbles/meta/Cargo.toml b/contracts/examples/crypto-bubbles/meta/Cargo.toml
index de1f82844d..e05a6f0fd3 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.6"
+version = "0.47.7"
 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 52a989cb0e..d1fd604852 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.6"
+version = "0.47.7"
 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 83b65857e0..c76b6d4ef0 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.6"
+version = "0.47.7"
 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 24ebd9e621..89e113c11e 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.6"
+version = "0.47.7"
 path = "../../../../../framework/base"
diff --git a/contracts/examples/crypto-kitties/kitty-auction/Cargo.toml b/contracts/examples/crypto-kitties/kitty-auction/Cargo.toml
index a755f4fc4e..e6d49ccec0 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.6"
+version = "0.47.7"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.6"
+version = "0.47.7"
 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 489a222777..9928efcd4f 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.6"
+version = "0.47.7"
 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 708dd5e87a..df1952bd3c 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.6"
+version = "0.47.7"
 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 146f1535ae..a73684282c 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.6"
+version = "0.47.7"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.6"
+version = "0.47.7"
 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 6c47bf57ef..b69a84ab3f 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.6"
+version = "0.47.7"
 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 78060f6e1e..ce608c6fcc 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.6"
+version = "0.47.7"
 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 1554492c61..40ccfe9d17 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.6"
+version = "0.47.7"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.6"
+version = "0.47.7"
 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 d96c0229d1..51c19d26be 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.6"
+version = "0.47.7"
 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 bed211e9ba..edd45c233c 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.6"
+version = "0.47.7"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/crypto-zombies/Cargo.toml b/contracts/examples/crypto-zombies/Cargo.toml
index 7d7010857a..5b3a3ec3b4 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.6"
+version = "0.47.7"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.6"
+version = "0.47.7"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/crypto-zombies/meta/Cargo.toml b/contracts/examples/crypto-zombies/meta/Cargo.toml
index 20b5e5cd5b..ab9e646a43 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.6"
+version = "0.47.7"
 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 7e2708f437..e9e2eed377 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.6"
+version = "0.47.7"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/digital-cash/Cargo.toml b/contracts/examples/digital-cash/Cargo.toml
index 08c4259881..c3e97b9d50 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.6"
+version = "0.47.7"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.6"
+version = "0.47.7"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/digital-cash/meta/Cargo.toml b/contracts/examples/digital-cash/meta/Cargo.toml
index d8a20bcba9..6a47014d9a 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.6"
+version = "0.47.7"
 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 be892f045c..14405201e3 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.6"
+version = "0.47.7"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/empty/Cargo.toml b/contracts/examples/empty/Cargo.toml
index 0bf1a921b2..d385cb0ae7 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.6"
+version = "0.47.7"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.6"
+version = "0.47.7"
 path = "../../../framework/scenario"
 
 [dev-dependencies]
diff --git a/contracts/examples/empty/meta/Cargo.toml b/contracts/examples/empty/meta/Cargo.toml
index 55b650cbec..805066b5c8 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.6"
+version = "0.47.7"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/examples/empty/wasm/Cargo.toml b/contracts/examples/empty/wasm/Cargo.toml
index ac4dd8cce9..3070e27098 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.6"
+version = "0.47.7"
 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 0f7591af8b..03f96eba03 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.6"
+version = "0.47.7"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.6"
+version = "0.47.7"
 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 06316a3b20..684ace8d06 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.6"
+version = "0.47.7"
 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 5855a9e99b..0afb5f35f9 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.6"
+version = "0.47.7"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/factorial/Cargo.toml b/contracts/examples/factorial/Cargo.toml
index d0c7032607..3c39cfb14b 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.6"
+version = "0.47.7"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.6"
+version = "0.47.7"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/factorial/meta/Cargo.toml b/contracts/examples/factorial/meta/Cargo.toml
index 1df33d3fd2..e781b294dd 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.6"
+version = "0.47.7"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/examples/factorial/wasm/Cargo.toml b/contracts/examples/factorial/wasm/Cargo.toml
index 4ad683cc2f..e8bdd8a99a 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.6"
+version = "0.47.7"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/fractional-nfts/Cargo.toml b/contracts/examples/fractional-nfts/Cargo.toml
index 772f5cdcad..75fc12bcef 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.6"
+version = "0.47.7"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.47.6"
+version = "0.47.7"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.6"
+version = "0.47.7"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/fractional-nfts/meta/Cargo.toml b/contracts/examples/fractional-nfts/meta/Cargo.toml
index 814f89e481..e3ea4de942 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.6"
+version = "0.47.7"
 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 cc319d03b1..ef3c3f47db 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.6"
+version = "0.47.7"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/lottery-esdt/Cargo.toml b/contracts/examples/lottery-esdt/Cargo.toml
index 14f07cb698..839f52d773 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.6"
+version = "0.47.7"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.6"
+version = "0.47.7"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/lottery-esdt/meta/Cargo.toml b/contracts/examples/lottery-esdt/meta/Cargo.toml
index 585766f77b..7e5658adbd 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.6"
+version = "0.47.7"
 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 3b9c9009c6..b80ccdb610 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.6"
+version = "0.47.7"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/multisig/Cargo.toml b/contracts/examples/multisig/Cargo.toml
index 72315654ab..8ca32c7c05 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.6"
+version = "0.47.7"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.47.6"
+version = "0.47.7"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.6"
+version = "0.47.7"
 path = "../../../framework/scenario"
 
 [dev-dependencies.adder]
@@ -27,7 +27,7 @@ path = "../adder"
 path = "../factorial"
 
 [dev-dependencies.multiversx-wegld-swap-sc]
-version = "0.47.6"
+version = "0.47.7"
 path = "../../core/wegld-swap"
 
 [dev-dependencies]
diff --git a/contracts/examples/multisig/interact/Cargo.toml b/contracts/examples/multisig/interact/Cargo.toml
index e5d783eb74..ecef6173f0 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.6"
+version = "0.47.7"
 path = "../../../../contracts/modules"
 
 [dependencies.multiversx-sc-snippets]
-version = "0.47.6"
+version = "0.47.7"
 path = "../../../../framework/snippets"
 
 [dependencies.multiversx-sc-scenario]
-version = "=0.47.6"
+version = "=0.47.7"
 path = "../../../../framework/scenario"
diff --git a/contracts/examples/multisig/meta/Cargo.toml b/contracts/examples/multisig/meta/Cargo.toml
index 0a92bfb7f3..7fa9cc2c46 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.6"
+version = "0.47.7"
 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 6cf54e2aa4..ca6d88e1d0 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.6"
+version = "0.47.7"
 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 49029387f6..f7e2721efb 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.6"
+version = "0.47.7"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/multisig/wasm/Cargo.toml b/contracts/examples/multisig/wasm/Cargo.toml
index a8a21b6cd5..6b844797f2 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.6"
+version = "0.47.7"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/nft-minter/Cargo.toml b/contracts/examples/nft-minter/Cargo.toml
index 848a54ff69..aff73e25c2 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.6"
+version = "0.47.7"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.6"
+version = "0.47.7"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/nft-minter/meta/Cargo.toml b/contracts/examples/nft-minter/meta/Cargo.toml
index 48c93adfb8..756b066668 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.6"
+version = "0.47.7"
 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 31796c2315..069fba528a 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.6"
+version = "0.47.7"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/nft-storage-prepay/Cargo.toml b/contracts/examples/nft-storage-prepay/Cargo.toml
index 56124a7d4a..a368d88336 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.6"
+version = "0.47.7"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.6"
+version = "0.47.7"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/nft-storage-prepay/meta/Cargo.toml b/contracts/examples/nft-storage-prepay/meta/Cargo.toml
index 7efa3acb1b..0e49db9a62 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.6"
+version = "0.47.7"
 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 a8f76a1501..05644d41ae 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.6"
+version = "0.47.7"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/nft-subscription/Cargo.toml b/contracts/examples/nft-subscription/Cargo.toml
index 8098098892..df21696927 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.6"
+version = "0.47.7"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.47.6"
+version = "0.47.7"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.6"
+version = "0.47.7"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/nft-subscription/meta/Cargo.toml b/contracts/examples/nft-subscription/meta/Cargo.toml
index b6b576f83a..89dffa7dfa 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.6"
+version = "0.47.7"
 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 a511fa5b0a..2cf17a24e4 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.6"
+version = "0.47.7"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/order-book/factory/Cargo.toml b/contracts/examples/order-book/factory/Cargo.toml
index 89ca0536c7..ca12b9cc3d 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.6"
+version = "0.47.7"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.6"
+version = "0.47.7"
 path = "../../../../framework/scenario"
 
diff --git a/contracts/examples/order-book/factory/meta/Cargo.toml b/contracts/examples/order-book/factory/meta/Cargo.toml
index d014e078bb..cefbe2fcde 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.6"
+version = "0.47.7"
 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 21ce9dedc7..6b7817678b 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.6"
+version = "0.47.7"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/order-book/pair/Cargo.toml b/contracts/examples/order-book/pair/Cargo.toml
index 5564e659a5..bb5c2f1627 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.6"
+version = "0.47.7"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.6"
+version = "0.47.7"
 path = "../../../../framework/scenario"
diff --git a/contracts/examples/order-book/pair/meta/Cargo.toml b/contracts/examples/order-book/pair/meta/Cargo.toml
index 6351950abf..a81995baef 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.6"
+version = "0.47.7"
 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 ed79171648..5d37fa7b60 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.6"
+version = "0.47.7"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/ping-pong-egld/Cargo.toml b/contracts/examples/ping-pong-egld/Cargo.toml
index 8e4476d9cd..fdb2d555ca 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.6"
+version = "0.47.7"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.6"
+version = "0.47.7"
 path = "../../../framework/scenario"
 
diff --git a/contracts/examples/ping-pong-egld/meta/Cargo.toml b/contracts/examples/ping-pong-egld/meta/Cargo.toml
index a1048e6bf3..de3cc18e68 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.6"
+version = "0.47.7"
 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 7422ef15d8..1df8da0cc8 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.6"
+version = "0.47.7"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/proxy-pause/Cargo.toml b/contracts/examples/proxy-pause/Cargo.toml
index c226500631..8d67538105 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.6"
+version = "0.47.7"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.6"
+version = "0.47.7"
 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 7016affa99..596d785f2b 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.6"
+version = "0.47.7"
 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 fd17464600..902e25899a 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.6"
+version = "0.47.7"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/rewards-distribution/Cargo.toml b/contracts/examples/rewards-distribution/Cargo.toml
index e1f67893d3..471247d8c3 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.6"
+version = "0.47.7"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.47.6"
+version = "0.47.7"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.6"
+version = "0.47.7"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/rewards-distribution/meta/Cargo.toml b/contracts/examples/rewards-distribution/meta/Cargo.toml
index 6319b2bb00..420e9282e2 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 <claudiu.bruda@multiversx.com>"]
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.47.6"
+version = "0.47.7"
 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 0248259c78..39e2d3068a 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.6"
+version = "0.47.7"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/seed-nft-minter/Cargo.toml b/contracts/examples/seed-nft-minter/Cargo.toml
index f55298cb22..c55ff0c92f 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.6"
+version = "0.47.7"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.47.6"
+version = "0.47.7"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.6"
+version = "0.47.7"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/seed-nft-minter/meta/Cargo.toml b/contracts/examples/seed-nft-minter/meta/Cargo.toml
index 13fb20029a..bb0ce16461 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 <claudiu.bruda@multiversx.com>"]
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.47.6"
+version = "0.47.7"
 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 bf62e69388..4d2c71fefa 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.6"
+version = "0.47.7"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/token-release/Cargo.toml b/contracts/examples/token-release/Cargo.toml
index 57eeb7e92a..1ce57e5743 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.6"
+version = "0.47.7"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.6"
+version = "0.47.7"
 path = "../../../framework/scenario"
 
diff --git a/contracts/examples/token-release/meta/Cargo.toml b/contracts/examples/token-release/meta/Cargo.toml
index 08378ca6d0..df8d03f85c 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.6"
+version = "0.47.7"
 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 6383a6ed3b..868e19d6cc 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.6"
+version = "0.47.7"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/abi-tester/Cargo.toml b/contracts/feature-tests/abi-tester/Cargo.toml
index c01817136a..120c36ddb9 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.6"
+version = "0.47.7"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.6"
+version = "0.47.7"
 path = "../../../framework/scenario"
 
 [dev-dependencies.multiversx-sc-meta]
-version = "0.47.6"
+version = "0.47.7"
 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 a654d33b25..b054e907f9 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.6"
+            "version": "0.47.7"
         }
     },
     "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 61dc7d29ca..f8a30cb9a5 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.6"
+            "version": "0.47.7"
         }
     },
     "docs": [
diff --git a/contracts/feature-tests/abi-tester/meta/Cargo.toml b/contracts/feature-tests/abi-tester/meta/Cargo.toml
index 22e005167f..01f35f065f 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.6"
+version = "0.47.7"
 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 66dc257026..c351e491ea 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.6"
+version = "0.47.7"
 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 42cd160365..f17dd3c623 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.6"
+version = "0.47.7"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/alloc-features/Cargo.toml b/contracts/feature-tests/alloc-features/Cargo.toml
index 0af3de93d1..d11683c5e4 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.6"
+version = "0.47.7"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.6"
+version = "0.47.7"
 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 9f7d0a9c26..79afc0549d 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.6"
+version = "0.47.7"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml
index 2d85bd1f91..ca1f942e8d 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml
@@ -25,7 +25,7 @@ overflow-checks = false
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.47.6"
+version = "0.47.7"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml
index 1f0a7140d0..e80853eaec 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml
@@ -25,7 +25,7 @@ overflow-checks = false
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.47.6"
+version = "0.47.7"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/alloc-features/wasm/Cargo.toml b/contracts/feature-tests/alloc-features/wasm/Cargo.toml
index bd900991eb..538e891924 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.6"
+version = "0.47.7"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/basic-features/Cargo.toml b/contracts/feature-tests/basic-features/Cargo.toml
index b8d4b8b236..69bcc353b4 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.6"
+version = "0.47.7"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.6"
+version = "0.47.7"
 path = "../../../framework/scenario"
 
 [dependencies.multiversx-sc-modules]
-version = "0.47.6"
+version = "0.47.7"
 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 a7cf4aecd8..fa1a68e091 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.6"
+version = "0.47.7"
 path = "../../../../framework/snippets"
diff --git a/contracts/feature-tests/basic-features/meta/Cargo.toml b/contracts/feature-tests/basic-features/meta/Cargo.toml
index 7f2421ad5a..137affe099 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.6"
+version = "0.47.7"
 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 01a88e074e..eac8322b00 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.6"
+version = "0.47.7"
 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 f08c381dc3..93678ef55e 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.6"
+version = "0.47.7"
 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 925bdefbdd..8b78db9d6d 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.6"
+version = "0.47.7"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.6"
+version = "0.47.7"
 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 bcfabc08e8..4bd7003cb8 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.6"
+version = "0.47.7"
 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 3009fb8622..ca9aacf92c 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.6"
+version = "0.47.7"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/Cargo.toml b/contracts/feature-tests/composability/Cargo.toml
index e3f6ef1289..012b7c9b0f 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.6"
+version = "0.47.7"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.6"
+version = "0.47.7"
 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 e44e39bb90..6e63eed118 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.6"
+version = "0.47.7"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.6"
+version = "0.47.7"
 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 bd93bf1e24..7d9dd69080 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.6"
+version = "0.47.7"
 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 dc3866cc80..29cae7410a 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.6"
+version = "0.47.7"
 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 dec107ce74..f524274292 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.6"
+version = "0.47.7"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.6"
+version = "0.47.7"
 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 922076491c..b90c693b83 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.6"
+version = "0.47.7"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.6"
+version = "0.47.7"
 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 373381ce93..d1beb99c55 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.6"
+version = "0.47.7"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.47.6"
+version = "0.47.7"
 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 1ebb400b16..780b8b5976 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.6"
+version = "0.47.7"
 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 e85e4b699b..d63d17ba7c 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.6"
+version = "0.47.7"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.6"
+version = "0.47.7"
 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 12d36d6033..1b2b4c9ae8 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.6"
+version = "0.47.7"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.47.6"
+version = "0.47.7"
 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 a20aa71942..7fe7faba53 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.6"
+version = "0.47.7"
 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 93e83468e9..523d016be9 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.6"
+version = "0.47.7"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.6"
+version = "0.47.7"
 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 3ebbe8338d..ba2043bb9c 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.6"
+version = "0.47.7"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.6"
+version = "0.47.7"
 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 770e8e77da..c64d09ad9f 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.6"
+version = "0.47.7"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.47.6"
+version = "0.47.7"
 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 e84938d004..1c90664162 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.6"
+version = "0.47.7"
 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 455e5b0b03..c0b513daf9 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.6"
+version = "0.47.7"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.6"
+version = "0.47.7"
 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 761bbe612b..bd6370a5d6 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.6"
+version = "0.47.7"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.47.6"
+version = "0.47.7"
 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 23fee292e2..bf013293a4 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.6"
+version = "0.47.7"
 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 d15beaace1..b74dab6fa0 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.6"
+version = "0.47.7"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.47.6"
+version = "0.47.7"
 path = "../../../../framework/wasm-adapter"
 optional = true
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.6"
+version = "0.47.7"
 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 d286d863b4..f1bd598825 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.6"
+version = "0.47.7"
 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 762dedbde1..3b1cb00d61 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.6"
+version = "0.47.7"
 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 4ffc557a76..8d2783428d 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.6"
+version = "0.47.7"
 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 ad123d8008..aaee506a33 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.6"
+version = "0.47.7"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.6"
+version = "0.47.7"
 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 651ea4dee6..dfbe580e61 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.6"
+version = "0.47.7"
 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 f4f8cdcdc3..741fcf25a4 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.6"
+version = "0.47.7"
 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 51bccab90a..6397512ee5 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.6"
+version = "0.47.7"
 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 eaeb7026a2..0bfd54569f 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.6"
+version = "0.47.7"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/forwarder/Cargo.toml b/contracts/feature-tests/composability/forwarder/Cargo.toml
index 5b6914d7ac..d67b930314 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.6"
+version = "0.47.7"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.6"
+version = "0.47.7"
 path = "../../../../framework/scenario"
 
diff --git a/contracts/feature-tests/composability/forwarder/meta/Cargo.toml b/contracts/feature-tests/composability/forwarder/meta/Cargo.toml
index 3983d9fa4e..8664eb1263 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.6"
+version = "0.47.7"
 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 9504e2f48b..3f16868f4f 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.6"
+version = "0.47.7"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/interact/Cargo.toml b/contracts/feature-tests/composability/interact/Cargo.toml
index 1f8dfafece..ad60ab2555 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.6"
+version = "0.47.7"
 path = "../../../../contracts/modules"
 
 [dependencies.multiversx-sc-snippets]
-version = "0.47.6"
+version = "0.47.7"
 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 379f930e0d..400f2b8326 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.6"
+version = "0.47.7"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.6"
+version = "0.47.7"
 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 67141d7e4f..11dcbc0172 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.6"
+version = "0.47.7"
 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 cc52f9652f..57d59b04c8 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.6"
+version = "0.47.7"
 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 0c54e9ca6c..d20bd48551 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.6"
+version = "0.47.7"
 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 4f15b8e5eb..f87047401b 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.6"
+version = "0.47.7"
 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 ba2aa8961a..a34280c6e3 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.6"
+version = "0.47.7"
 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 c45cea4950..6575490586 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.6"
+version = "0.47.7"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.6"
+version = "0.47.7"
 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 a9a2ecb49d..d028bd24b7 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.6"
+version = "0.47.7"
 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 8adc41ac0d..2c1676b837 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.6"
+version = "0.47.7"
 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 ad95170147..730c7b533a 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.6"
+version = "0.47.7"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.6"
+version = "0.47.7"
 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 cc0dce54fe..0dd5487e95 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.6"
+version = "0.47.7"
 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 b1bc1ef21f..07753ca55d 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.6"
+version = "0.47.7"
 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 f2b77ca992..e7b04ffa7c 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.6"
+version = "0.47.7"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.6"
+version = "0.47.7"
 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 0c8ccb0372..c9793ace43 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.6"
+version = "0.47.7"
 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 d874f6e8b4..91ed65a2d3 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.6"
+version = "0.47.7"
 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 f7562b838f..95f9b7f49e 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.6"
+version = "0.47.7"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.47.6"
+version = "0.47.7"
 path = "../../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.6"
+version = "0.47.7"
 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 8e379bf43e..a8181a9132 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.6"
+version = "0.47.7"
 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 8c91eb8859..d30c662adc 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.6"
+version = "0.47.7"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/vault/Cargo.toml b/contracts/feature-tests/composability/vault/Cargo.toml
index 97f5b97371..e8dac88354 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.6"
+version = "0.47.7"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.6"
+version = "0.47.7"
 path = "../../../../framework/scenario"
diff --git a/contracts/feature-tests/composability/vault/meta/Cargo.toml b/contracts/feature-tests/composability/vault/meta/Cargo.toml
index 4ab77c4b1a..e66d236430 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.6"
+version = "0.47.7"
 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 3c865c7080..eea431599a 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.6"
+version = "0.47.7"
 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 faacfa4958..df2708b28c 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.6"
+version = "0.47.7"
 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 1812fd9940..91ba6c8eb0 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.6"
+version = "0.47.7"
 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 aff54f13b1..eee5a8c938 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.6"
+version = "0.47.7"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.6"
+version = "0.47.7"
 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 3cc15aabe4..860cb4cc26 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.6"
+version = "0.47.7"
 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 51248463d6..395ebd54ca 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.6"
+version = "0.47.7"
 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 72f9a18cab..0cec9ec90c 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.6"
+version = "0.47.7"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.6"
+version = "0.47.7"
 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 b003c9b982..58a5a24afb 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.6"
+version = "0.47.7"
 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 bb53084b5c..ddfa355f91 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.6"
+version = "0.47.7"
 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 b746b973e2..018b1389f9 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.6"
+version = "0.47.7"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.6"
+version = "0.47.7"
 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 a33bb345af..eb1c12b642 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.6"
+version = "0.47.7"
 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 da3b74318e..d97ea42d66 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.6"
+version = "0.47.7"
 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 83c8dd14a8..472a2221c3 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.6"
+version = "0.47.7"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.6"
+version = "0.47.7"
 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 49f3be1eb5..ed69ca1b1d 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.6"
+version = "0.47.7"
 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 4974a81405..e87fed7bfb 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.6"
+version = "0.47.7"
 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 f096425dd6..13dec6eb99 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.6"
+version = "0.47.7"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.6"
+version = "0.47.7"
 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 03a604c31c..1df6d352e5 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.6"
+version = "0.47.7"
 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 68bd125939..5ffc4b6634 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.6"
+version = "0.47.7"
 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 c082fc26c0..d4416664b3 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.6"
+version = "0.47.7"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.6"
+version = "0.47.7"
 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 4e65b4a70b..14f9790c4e 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.6"
+version = "0.47.7"
 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 28677d89a4..2adcd02752 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.6"
+version = "0.47.7"
 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 8325377c72..c64d30a727 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.6"
+version = "0.47.7"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.6"
+version = "0.47.7"
 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 bcb736b2c5..6bc05488c3 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.6"
+version = "0.47.7"
 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 51bf87cd2b..6ac958ed88 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.6"
+version = "0.47.7"
 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 fe18ccf688..77f5c847b6 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.6"
+version = "0.47.7"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.6"
+version = "0.47.7"
 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 f0be9537fd..b969dbdfd2 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.6"
+version = "0.47.7"
 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 72dfa8d22d..1643028e3e 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.6"
+version = "0.47.7"
 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 214e59652c..e4ad7a76f4 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.6"
+version = "0.47.7"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.6"
+version = "0.47.7"
 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 1af90b4ab0..8edf568f01 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.6"
+version = "0.47.7"
 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 7191a15963..6df7609817 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.6"
+version = "0.47.7"
 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 ed703f3075..60361712ca 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.6"
+version = "0.47.7"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.6"
+version = "0.47.7"
 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 329543ba08..bf307044ec 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.6"
+version = "0.47.7"
 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 03b93b10dd..7539e5e8b4 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.6"
+version = "0.47.7"
 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 f41cc01ce4..ce4c8336e1 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.6"
+version = "0.47.7"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.6"
+version = "0.47.7"
 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 e7a6d60187..880326335d 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.6"
+version = "0.47.7"
 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 32d0b6f060..1f3aed535e 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.6"
+version = "0.47.7"
 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 572367ec21..c23dbbe7b5 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.6"
+version = "0.47.7"
 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 17ee4e7f75..43e4ee7e81 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.6"
+version = "0.47.7"
 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 2dcc933328..04ad42d688 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.6"
+version = "0.47.7"
 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 664ed96cdd..eee25be7cb 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.6"
+version = "0.47.7"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.6"
+version = "0.47.7"
 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 b50def053b..eb9cc0fabd 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.6"
+version = "0.47.7"
 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 ca41ca4bd8..ea09b86ffb 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.6"
+version = "0.47.7"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/payable-features/Cargo.toml b/contracts/feature-tests/payable-features/Cargo.toml
index 4275d0c50e..74caadb1ce 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.6"
+version = "0.47.7"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.6"
+version = "0.47.7"
 path = "../../../framework/scenario"
diff --git a/contracts/feature-tests/payable-features/meta/Cargo.toml b/contracts/feature-tests/payable-features/meta/Cargo.toml
index 15aef444c1..3b13a7b499 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.6"
+version = "0.47.7"
 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 f4c9524fef..4f1db6cd5b 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.6"
+version = "0.47.7"
 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 aeb8806dc0..7b71012dee 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.6"
+version = "0.47.7"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.6"
+version = "0.47.7"
 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 f529a43554..b8216cfd0e 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.6"
+version = "0.47.7"
 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 ecc108c9ac..47c5484bb8 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.6"
+version = "0.47.7"
 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 d3de295f52..857244627f 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.6"
+// version = "0.47.7"
 // 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 1bcd9911ee..dcebf91da8 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.6"
+version = "0.47.7"
 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 7f56f74850..317fb42fab 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.6"
+version = "0.47.7"
 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.6"
+version = "0.47.7"
 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 c66e556d33..c8e6c1ce0c 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.6"
+version = "0.47.7"
 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 122854100f..0580ef4b3d 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.6"
+version = "0.47.7"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/use-module/Cargo.toml b/contracts/feature-tests/use-module/Cargo.toml
index 4909bcc5b6..7c7d7cec76 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.6"
+version = "0.47.7"
 path = "../../../contracts/modules"
 
 [dependencies.multiversx-sc]
-version = "0.47.6"
+version = "0.47.7"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.6"
+version = "0.47.7"
 path = "../../../framework/scenario"
 
 [dev-dependencies.multiversx-sc-meta]
-version = "0.47.6"
+version = "0.47.7"
 path = "../../../framework/meta"
diff --git a/contracts/feature-tests/use-module/meta/Cargo.toml b/contracts/feature-tests/use-module/meta/Cargo.toml
index d67ab6febf..6cc313e34b 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.6"
+version = "0.47.7"
 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 fe4ec859bf..635ff546a0 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.6"
+version = "0.47.7"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.47.6"
+version = "0.47.7"
 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 37974a3659..2e4694e6fb 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.6"
+            "version": "0.47.7"
         }
     },
     "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 948e9d09f4..c84a7deac4 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.6"
+            "version": "0.47.7"
         }
     },
     "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 746abe441f..a7dcfe74cf 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.6"
+version = "0.47.7"
 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 1a0e69499a..a08ec3fe72 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.6"
+version = "0.47.7"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/modules/Cargo.toml b/contracts/modules/Cargo.toml
index 5f0c2f43ed..f6a506632d 100644
--- a/contracts/modules/Cargo.toml
+++ b/contracts/modules/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-modules"
-version = "0.47.6"
+version = "0.47.7"
 edition = "2021"
 
 authors = ["MultiversX <contact@multiversx.com>"]
@@ -17,5 +17,5 @@ categories = ["no-std", "wasm", "cryptography::cryptocurrencies"]
 alloc = ["multiversx-sc/alloc"]
 
 [dependencies.multiversx-sc]
-version = "0.47.6"
+version = "0.47.7"
 path = "../../framework/base"
diff --git a/framework/base/Cargo.toml b/framework/base/Cargo.toml
index f85aa5896e..b3beb82b33 100644
--- a/framework/base/Cargo.toml
+++ b/framework/base/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc"
-version = "0.47.6"
+version = "0.47.7"
 edition = "2021"
 
 authors = ["Andrei Marinica <andrei.marinica@multiversx.com>", "MultiversX <contact@multiversx.com>"]
@@ -27,7 +27,7 @@ bitflags = "=2.4.2"
 num-traits = { version = "=0.2.17", default-features = false }
 
 [dependencies.multiversx-sc-derive]
-version = "=0.47.6"
+version = "=0.47.7"
 path = "../derive"
 
 [dependencies.multiversx-sc-codec]
diff --git a/framework/derive/Cargo.toml b/framework/derive/Cargo.toml
index 3f745d768a..b31ebfcfd1 100644
--- a/framework/derive/Cargo.toml
+++ b/framework/derive/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-derive"
-version = "0.47.6"
+version = "0.47.7"
 edition = "2021"
 
 authors = ["Andrei Marinica <andrei.marinica@multiversx.com>", "MultiversX <contact@multiversx.com>"]
diff --git a/framework/meta/Cargo.toml b/framework/meta/Cargo.toml
index 4825f960a9..5e7d2ea2ae 100644
--- a/framework/meta/Cargo.toml
+++ b/framework/meta/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-meta"
-version = "0.47.6"
+version = "0.47.7"
 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.6"
+version = "=0.47.7"
 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 73bb69786f..8239f5c5e0 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.6"
+version = "0.47.7"
 
 # [workspace]
 
diff --git a/framework/meta/src/cmd/contract/meta_config.rs b/framework/meta/src/cmd/contract/meta_config.rs
index ff9ed2f2f5..d1ba6a66ec 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.6\"
+version = \"0.47.7\"
 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.6".to_string(),
+            framework_version: "0.47.7".to_string(),
             framework_path: Option::Some("../../../framework/base".to_string()),
             contract_features: Vec::<String>::new(),
         };
diff --git a/framework/meta/src/version_history.rs b/framework/meta/src/version_history.rs
index 28e3deb2fa..531047fd6c 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.6);
+pub const LAST_VERSION: FrameworkVersion = framework_version!(0.47.7);
 
 /// Indicates where to stop with the upgrades.
 pub const LAST_UPGRADE_VERSION: FrameworkVersion = LAST_VERSION;
@@ -64,6 +64,7 @@ pub const VERSIONS: &[FrameworkVersion] = framework_versions![
     0.47.4,
     0.47.5,
     0.47.6,
+    0.47.7,
 ];
 
 #[rustfmt::skip]
diff --git a/framework/scenario/Cargo.toml b/framework/scenario/Cargo.toml
index cff475ee2f..a8846449bc 100644
--- a/framework/scenario/Cargo.toml
+++ b/framework/scenario/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-scenario"
-version = "0.47.6"
+version = "0.47.7"
 edition = "2021"
 
 authors = [
@@ -40,12 +40,12 @@ path = "src/main.rs"
 run-go-tests = []
 
 [dependencies.multiversx-sc]
-version = "=0.47.6"
+version = "=0.47.7"
 features = ["alloc", "num-bigint"]
 path = "../base"
 
 [dependencies.multiversx-sc-meta]
-version = "=0.47.6"
+version = "=0.47.7"
 path = "../meta"
 
 [dependencies.multiversx-chain-scenario-format]
diff --git a/framework/snippets/Cargo.toml b/framework/snippets/Cargo.toml
index 700053f340..9413f07e9f 100644
--- a/framework/snippets/Cargo.toml
+++ b/framework/snippets/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-snippets"
-version = "0.47.6"
+version = "0.47.7"
 edition = "2021"
 
 authors = ["MultiversX <contact@multiversx.com>"]
@@ -22,7 +22,7 @@ env_logger = "0.11"
 futures = "0.3"
 
 [dependencies.multiversx-sc-scenario]
-version = "=0.47.6"
+version = "=0.47.7"
 path = "../scenario"
 
 [dependencies.multiversx-sdk]
diff --git a/framework/wasm-adapter/Cargo.toml b/framework/wasm-adapter/Cargo.toml
index a4efa2c1eb..217b5c98a8 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.6"
+version = "0.47.7"
 edition = "2021"
 
 authors = [
@@ -22,5 +22,5 @@ categories = [
 ]
 
 [dependencies.multiversx-sc]
-version = "=0.47.6"
+version = "=0.47.7"
 path = "../base"
diff --git a/tools/mxpy-snippet-generator/Cargo.toml b/tools/mxpy-snippet-generator/Cargo.toml
index 0de044383f..2d84fe4e2d 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.6"
+version = "0.47.7"
 path = "../../framework/base"
 
 [dependencies]
diff --git a/tools/rust-debugger/format-tests/Cargo.toml b/tools/rust-debugger/format-tests/Cargo.toml
index c7109ff434..ce3cab8d55 100644
--- a/tools/rust-debugger/format-tests/Cargo.toml
+++ b/tools/rust-debugger/format-tests/Cargo.toml
@@ -9,11 +9,11 @@ name = "format-tests"
 path = "src/format_tests.rs"
 
 [dependencies.multiversx-sc]
-version = "=0.47.6"
+version = "=0.47.7"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-scenario]
-version = "=0.47.6"
+version = "=0.47.7"
 path = "../../../framework/scenario"
 
 [dependencies.multiversx-chain-vm]

From b2bf499e82821ad1f2c5d8f0d0d56d4c71312ba1 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 15 Mar 2024 07:52:49 +0100
Subject: [PATCH 0469/1254] Cargo.lock update

---
 contracts/benchmarks/large-storage/wasm/Cargo.lock     |  6 +++---
 .../mappers/linked-list-repeat/wasm/Cargo.lock         |  6 +++---
 .../benchmarks/mappers/map-repeat/wasm/Cargo.lock      |  6 +++---
 .../benchmarks/mappers/queue-repeat/wasm/Cargo.lock    |  6 +++---
 .../benchmarks/mappers/set-repeat/wasm/Cargo.lock      |  6 +++---
 .../mappers/single-value-repeat/wasm/Cargo.lock        |  6 +++---
 .../benchmarks/mappers/vec-repeat/wasm/Cargo.lock      |  6 +++---
 contracts/benchmarks/send-tx-repeat/wasm/Cargo.lock    |  6 +++---
 contracts/benchmarks/str-repeat/wasm/Cargo.lock        |  6 +++---
 contracts/core/price-aggregator/wasm/Cargo.lock        | 10 +++++-----
 contracts/examples/adder/wasm/Cargo.lock               |  6 +++---
 .../examples/bonding-curve-contract/wasm/Cargo.lock    |  8 ++++----
 contracts/examples/check-pause/wasm/Cargo.lock         |  8 ++++----
 contracts/examples/crowdfunding-esdt/wasm/Cargo.lock   |  6 +++---
 contracts/examples/crypto-bubbles/wasm/Cargo.lock      |  6 +++---
 .../crypto-kitties/kitty-auction/wasm/Cargo.lock       |  6 +++---
 .../crypto-kitties/kitty-genetic-alg/wasm/Cargo.lock   |  6 +++---
 .../crypto-kitties/kitty-ownership/wasm/Cargo.lock     |  6 +++---
 contracts/examples/crypto-zombies/wasm/Cargo.lock      |  6 +++---
 contracts/examples/digital-cash/wasm/Cargo.lock        |  6 +++---
 contracts/examples/empty/wasm/Cargo.lock               |  6 +++---
 .../examples/esdt-transfer-with-fee/wasm/Cargo.lock    |  6 +++---
 contracts/examples/factorial/wasm/Cargo.lock           |  6 +++---
 contracts/examples/fractional-nfts/wasm/Cargo.lock     |  8 ++++----
 contracts/examples/lottery-esdt/wasm/Cargo.lock        |  6 +++---
 .../examples/multisig/wasm-multisig-full/Cargo.lock    |  8 ++++----
 .../examples/multisig/wasm-multisig-view/Cargo.lock    |  8 ++++----
 contracts/examples/multisig/wasm/Cargo.lock            |  8 ++++----
 contracts/examples/nft-minter/wasm/Cargo.lock          |  6 +++---
 contracts/examples/nft-storage-prepay/wasm/Cargo.lock  |  6 +++---
 contracts/examples/nft-subscription/wasm/Cargo.lock    |  8 ++++----
 contracts/examples/order-book/factory/wasm/Cargo.lock  |  6 +++---
 contracts/examples/order-book/pair/wasm/Cargo.lock     |  6 +++---
 contracts/examples/ping-pong-egld/wasm/Cargo.lock      |  6 +++---
 contracts/examples/proxy-pause/wasm/Cargo.lock         |  6 +++---
 .../examples/rewards-distribution/wasm/Cargo.lock      |  8 ++++----
 contracts/examples/seed-nft-minter/wasm/Cargo.lock     |  8 ++++----
 contracts/examples/token-release/wasm/Cargo.lock       |  6 +++---
 .../abi-tester/wasm-abi-tester-ev/Cargo.lock           |  6 +++---
 contracts/feature-tests/abi-tester/wasm/Cargo.lock     |  6 +++---
 .../alloc-features/wasm-alloc-mem-fail/Cargo.lock      |  6 +++---
 .../alloc-features/wasm-alloc-mem-leaking/Cargo.lock   |  6 +++---
 contracts/feature-tests/alloc-features/wasm/Cargo.lock |  6 +++---
 .../wasm-basic-features-storage-bytes/Cargo.lock       |  8 ++++----
 contracts/feature-tests/basic-features/wasm/Cargo.lock |  8 ++++----
 .../feature-tests/big-float-features/wasm/Cargo.lock   |  6 +++---
 .../builtin-func-features/wasm/Cargo.lock              |  6 +++---
 .../esdt-contract-pair/first-contract/wasm/Cargo.lock  |  6 +++---
 .../esdt-contract-pair/second-contract/wasm/Cargo.lock |  6 +++---
 .../child/wasm/Cargo.lock                              |  6 +++---
 .../parent/wasm/Cargo.lock                             |  6 +++---
 .../wasm-forwarder-queue-promises/Cargo.lock           |  6 +++---
 .../composability/forwarder-queue/wasm/Cargo.lock      |  6 +++---
 .../wasm-forwarder-raw-init-async-call/Cargo.lock      |  6 +++---
 .../wasm-forwarder-raw-init-sync-call/Cargo.lock       |  6 +++---
 .../composability/forwarder-raw/wasm/Cargo.lock        |  6 +++---
 .../composability/forwarder/wasm/Cargo.lock            |  6 +++---
 .../composability/local-esdt-and-nft/wasm/Cargo.lock   |  6 +++---
 .../composability/promises-features/wasm/Cargo.lock    |  6 +++---
 .../composability/proxy-test-first/wasm/Cargo.lock     |  6 +++---
 .../composability/proxy-test-second/wasm/Cargo.lock    |  6 +++---
 .../composability/recursive-caller/wasm/Cargo.lock     |  6 +++---
 .../transfer-role-features/wasm/Cargo.lock             |  8 ++++----
 .../composability/vault/wasm-vault-promises/Cargo.lock |  6 +++---
 .../composability/vault/wasm-vault-upgrade/Cargo.lock  |  6 +++---
 .../feature-tests/composability/vault/wasm/Cargo.lock  |  6 +++---
 .../crowdfunding-erc20/wasm/Cargo.lock                 |  6 +++---
 .../erc1155-marketplace/wasm/Cargo.lock                |  6 +++---
 .../erc1155-user-mock/wasm/Cargo.lock                  |  6 +++---
 .../erc-style-contracts/erc1155/wasm/Cargo.lock        |  6 +++---
 .../erc-style-contracts/erc20/wasm/Cargo.lock          |  6 +++---
 .../erc-style-contracts/erc721/wasm/Cargo.lock         |  6 +++---
 .../erc-style-contracts/lottery-erc20/wasm/Cargo.lock  |  6 +++---
 .../feature-tests/esdt-system-sc-mock/wasm/Cargo.lock  |  6 +++---
 .../formatted-message-features/wasm/Cargo.lock         |  6 +++---
 .../feature-tests/managed-map-features/wasm/Cargo.lock |  6 +++---
 .../wasm-multi-contract-alt-impl/Cargo.lock            |  6 +++---
 .../wasm-multi-contract-example-feature/Cargo.lock     |  6 +++---
 .../wasm-multi-contract-features-view/Cargo.lock       |  6 +++---
 .../multi-contract-features/wasm/Cargo.lock            |  6 +++---
 .../panic-message-features/wasm/Cargo.lock             |  6 +++---
 .../feature-tests/payable-features/wasm/Cargo.lock     |  6 +++---
 .../rust-snippets-generator-test/wasm/Cargo.lock       |  6 +++---
 .../rust-testing-framework-tester/wasm/Cargo.lock      |  6 +++---
 .../use-module/wasm-use-module-view/Cargo.lock         |  8 ++++----
 contracts/feature-tests/use-module/wasm/Cargo.lock     |  8 ++++----
 86 files changed, 274 insertions(+), 274 deletions(-)

diff --git a/contracts/benchmarks/large-storage/wasm/Cargo.lock b/contracts/benchmarks/large-storage/wasm/Cargo.lock
index 7be1d06796..31750ec068 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.47.6"
+version = "0.47.7"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.lock
index c53d36c9e6..1c822ccffb 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.47.6"
+version = "0.47.7"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -92,7 +92,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -103,7 +103,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.lock
index 8e9ecb0aff..93d5f89c99 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.47.6"
+version = "0.47.7"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -92,7 +92,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -103,7 +103,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.lock
index a05e0cbf9c..42082bb424 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.47.6"
+version = "0.47.7"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.lock
index 82ecbafa98..7e38065884 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.47.6"
+version = "0.47.7"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.lock
index aeda5a7bc8..6b1f5c27ba 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.47.6"
+version = "0.47.7"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.lock
index 12e9bf5ce5..ac3a58591d 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.47.6"
+version = "0.47.7"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/send-tx-repeat/wasm/Cargo.lock b/contracts/benchmarks/send-tx-repeat/wasm/Cargo.lock
index 5ae88675b5..ce4e08b913 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.47.6"
+version = "0.47.7"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/str-repeat/wasm/Cargo.lock b/contracts/benchmarks/str-repeat/wasm/Cargo.lock
index 5a33cbf8ea..cffabbafb4 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.47.6"
+version = "0.47.7"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/core/price-aggregator/wasm/Cargo.lock b/contracts/core/price-aggregator/wasm/Cargo.lock
index 7e1f74ef3b..0a413621c5 100644
--- a/contracts/core/price-aggregator/wasm/Cargo.lock
+++ b/contracts/core/price-aggregator/wasm/Cargo.lock
@@ -86,7 +86,7 @@ checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
 
 [[package]]
 name = "multiversx-price-aggregator-sc"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "arrayvec",
  "getrandom",
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -134,7 +134,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -145,14 +145,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/adder/wasm/Cargo.lock b/contracts/examples/adder/wasm/Cargo.lock
index f1e406be0b..2a5ed06f4c 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.47.6"
+version = "0.47.7"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/bonding-curve-contract/wasm/Cargo.lock b/contracts/examples/bonding-curve-contract/wasm/Cargo.lock
index b95f064ec9..562a9b2da4 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.47.6"
+version = "0.47.7"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,14 +96,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/check-pause/wasm/Cargo.lock b/contracts/examples/check-pause/wasm/Cargo.lock
index 381a32895d..1b0dee59f8 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.47.6"
+version = "0.47.7"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,14 +96,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crowdfunding-esdt/wasm/Cargo.lock b/contracts/examples/crowdfunding-esdt/wasm/Cargo.lock
index 188e8e70e9..b132742fa0 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.47.6"
+version = "0.47.7"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crypto-bubbles/wasm/Cargo.lock b/contracts/examples/crypto-bubbles/wasm/Cargo.lock
index 56782e48f4..5f554cec2b 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.47.6"
+version = "0.47.7"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.lock b/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.lock
index 5ccd000fa0..535a51de38 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.47.6"
+version = "0.47.7"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -113,7 +113,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -124,7 +124,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "multiversx-sc",
 ]
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 e2d7648bec..d61753e258 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.47.6"
+version = "0.47.7"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.lock b/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.lock
index 95e227f126..45a01439c5 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.47.6"
+version = "0.47.7"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -104,7 +104,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -115,7 +115,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crypto-zombies/wasm/Cargo.lock b/contracts/examples/crypto-zombies/wasm/Cargo.lock
index 4375fdad74..a9f01a6180 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.47.6"
+version = "0.47.7"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/digital-cash/wasm/Cargo.lock b/contracts/examples/digital-cash/wasm/Cargo.lock
index 80451862a4..79bb5c8cba 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.47.6"
+version = "0.47.7"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/empty/wasm/Cargo.lock b/contracts/examples/empty/wasm/Cargo.lock
index 77c2d35593..ac143852e3 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.47.6"
+version = "0.47.7"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.lock b/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.lock
index 0b1120c4bb..33e5926915 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.47.6"
+version = "0.47.7"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/factorial/wasm/Cargo.lock b/contracts/examples/factorial/wasm/Cargo.lock
index 61020c7136..e8423983d5 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.47.6"
+version = "0.47.7"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/fractional-nfts/wasm/Cargo.lock b/contracts/examples/fractional-nfts/wasm/Cargo.lock
index fcf3281a66..64a57b293d 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.47.6"
+version = "0.47.7"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,14 +96,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/lottery-esdt/wasm/Cargo.lock b/contracts/examples/lottery-esdt/wasm/Cargo.lock
index 4fb2a0da1a..d63b3dead5 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.47.6"
+version = "0.47.7"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/multisig/wasm-multisig-full/Cargo.lock b/contracts/examples/multisig/wasm-multisig-full/Cargo.lock
index 91527cb329..606b39381c 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.47.6"
+version = "0.47.7"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,14 +96,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/multisig/wasm-multisig-view/Cargo.lock b/contracts/examples/multisig/wasm-multisig-view/Cargo.lock
index f7651215a2..020a882847 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.47.6"
+version = "0.47.7"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,14 +96,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/multisig/wasm/Cargo.lock b/contracts/examples/multisig/wasm/Cargo.lock
index 703a789b67..06d5316f69 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.47.6"
+version = "0.47.7"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,14 +96,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/nft-minter/wasm/Cargo.lock b/contracts/examples/nft-minter/wasm/Cargo.lock
index 4e52a3e4ce..4555b16aba 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.47.6"
+version = "0.47.7"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/nft-storage-prepay/wasm/Cargo.lock b/contracts/examples/nft-storage-prepay/wasm/Cargo.lock
index e86af50f12..f92cbb26e0 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.47.6"
+version = "0.47.7"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/nft-subscription/wasm/Cargo.lock b/contracts/examples/nft-subscription/wasm/Cargo.lock
index 9b4c96f380..34a24cf679 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.47.6"
+version = "0.47.7"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,14 +80,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/order-book/factory/wasm/Cargo.lock b/contracts/examples/order-book/factory/wasm/Cargo.lock
index 8a0892b4f0..5472eac6f3 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.47.6"
+version = "0.47.7"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/order-book/pair/wasm/Cargo.lock b/contracts/examples/order-book/pair/wasm/Cargo.lock
index 7b781cacc5..76a5a75e99 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.47.6"
+version = "0.47.7"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/ping-pong-egld/wasm/Cargo.lock b/contracts/examples/ping-pong-egld/wasm/Cargo.lock
index ea650d9183..0bc1b1c801 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.47.6"
+version = "0.47.7"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/proxy-pause/wasm/Cargo.lock b/contracts/examples/proxy-pause/wasm/Cargo.lock
index 0255476045..49f181a970 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.47.6"
+version = "0.47.7"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/rewards-distribution/wasm/Cargo.lock b/contracts/examples/rewards-distribution/wasm/Cargo.lock
index 7a48d77b79..2daa481ff3 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.47.6"
+version = "0.47.7"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,14 +80,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/seed-nft-minter/wasm/Cargo.lock b/contracts/examples/seed-nft-minter/wasm/Cargo.lock
index fb7221c3d2..9ac9f584f9 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.47.6"
+version = "0.47.7"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,14 +80,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/token-release/wasm/Cargo.lock b/contracts/examples/token-release/wasm/Cargo.lock
index 8c8f3dc478..da72b4a6d4 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.47.6"
+version = "0.47.7"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "multiversx-sc",
 ]
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 10c6773f26..4b4fbd01f6 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.47.6"
+version = "0.47.7"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/abi-tester/wasm/Cargo.lock b/contracts/feature-tests/abi-tester/wasm/Cargo.lock
index a5aff97dd6..3c219d33c9 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.47.6"
+version = "0.47.7"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock
index 487a94fe63..e5d2af2ccd 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.lock b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.lock
index 0ad48515fe..4455b345f9 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.lock
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.lock
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/alloc-features/wasm/Cargo.lock b/contracts/feature-tests/alloc-features/wasm/Cargo.lock
index 6c98001362..f2bdfc23e9 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.47.6"
+version = "0.47.7"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "multiversx-sc",
 ]
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 3a6b9aafb9..c9265a486f 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.47.6"
+version = "0.47.7"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,14 +96,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/basic-features/wasm/Cargo.lock b/contracts/feature-tests/basic-features/wasm/Cargo.lock
index 1ce9fe2626..c62ed6e208 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.47.6"
+version = "0.47.7"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,14 +96,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/big-float-features/wasm/Cargo.lock b/contracts/feature-tests/big-float-features/wasm/Cargo.lock
index b51f2b38fc..7d9f21fbd5 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.47.6"
+version = "0.47.7"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "multiversx-sc",
 ]
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 86dcd9f808..d7c01b1316 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.47.6"
+version = "0.47.7"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "multiversx-sc",
 ]
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 eecef5998f..e2f6d2e32a 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.47.6"
+version = "0.47.7"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "multiversx-sc",
 ]
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 7c177a1cb4..71a3d6506f 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.47.6"
+version = "0.47.7"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "multiversx-sc",
 ]
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 05ce10fcdf..8c397ab34f 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.47.6"
+version = "0.47.7"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "multiversx-sc",
 ]
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 1203771393..87ffcd81cd 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.47.6"
+version = "0.47.7"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "multiversx-sc",
 ]
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 6cd0f8bf6f..1789144ba6 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.47.6"
+version = "0.47.7"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,7 +96,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock
index 204fd42b2c..b9c77bd876 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.47.6"
+version = "0.47.7"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,7 +96,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "multiversx-sc",
 ]
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 114dcac248..25b1bd5be1 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.47.6"
+version = "0.47.7"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "multiversx-sc",
 ]
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 c3a50248c5..24bb5c2c3c 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.47.6"
+version = "0.47.7"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.lock
index 938e700dd1..3bd5720470 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.47.6"
+version = "0.47.7"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock
index f261a8a95a..3d741a724c 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.47.6"
+version = "0.47.7"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,7 +96,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "multiversx-sc",
 ]
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 54764c0e5f..9df77263a4 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.47.6"
+version = "0.47.7"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/promises-features/wasm/Cargo.lock b/contracts/feature-tests/composability/promises-features/wasm/Cargo.lock
index 8be785965b..d99b0c86ad 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.47.6"
+version = "0.47.7"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "multiversx-sc",
 ]
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 4c616d091a..131e1f98e0 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.47.6"
+version = "0.47.7"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "multiversx-sc",
 ]
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 2fd411835f..07096a0c87 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.47.6"
+version = "0.47.7"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.lock b/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.lock
index ac7deaf7a0..ace05f291b 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.47.6"
+version = "0.47.7"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "multiversx-sc",
 ]
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 d2e6b98b35..2426bbafc9 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.47.6"
+version = "0.47.7"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,14 +80,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "multiversx-sc",
 ]
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 a8fb67560e..817d599fc8 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.47.6"
+version = "0.47.7"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "multiversx-sc",
 ]
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 91342201d7..b86fda7779 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.47.6"
+version = "0.47.7"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/vault/wasm/Cargo.lock b/contracts/feature-tests/composability/vault/wasm/Cargo.lock
index 7f7b448ea1..63b59e6432 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.47.6"
+version = "0.47.7"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "multiversx-sc",
 ]
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 e9da526720..48d839370c 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.47.6"
+version = "0.47.7"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -92,7 +92,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -103,7 +103,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "multiversx-sc",
 ]
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 f7da662233..e824be164e 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.47.6"
+version = "0.47.7"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -92,7 +92,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -103,7 +103,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "multiversx-sc",
 ]
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 02a77c911f..cafbaaa044 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.47.6"
+version = "0.47.7"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "multiversx-sc",
 ]
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 f068f66024..b06fbb5915 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.47.6"
+version = "0.47.7"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "multiversx-sc",
 ]
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 31f5c7a5b3..fadd4d7d06 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.47.6"
+version = "0.47.7"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "multiversx-sc",
 ]
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 921baab25d..1b86e0f930 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.47.6"
+version = "0.47.7"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "multiversx-sc",
 ]
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 49b706b912..69246ef0e7 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.47.6"
+version = "0.47.7"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -92,7 +92,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -103,7 +103,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "multiversx-sc",
 ]
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 7d3eb7e294..45dee647b9 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.47.6"
+version = "0.47.7"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/formatted-message-features/wasm/Cargo.lock b/contracts/feature-tests/formatted-message-features/wasm/Cargo.lock
index 80f9af5533..7b03d2eed4 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.47.6"
+version = "0.47.7"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/managed-map-features/wasm/Cargo.lock b/contracts/feature-tests/managed-map-features/wasm/Cargo.lock
index 491ef2f890..551ac72ffa 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.47.6"
+version = "0.47.7"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "multiversx-sc",
 ]
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 f08ba00acd..d2952ba4f2 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.47.6"
+version = "0.47.7"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "multiversx-sc",
 ]
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 aef8e2e065..952172f4a5 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.47.6"
+version = "0.47.7"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "multiversx-sc",
 ]
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 0fb553246f..f078c5b4cb 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.47.6"
+version = "0.47.7"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/multi-contract-features/wasm/Cargo.lock b/contracts/feature-tests/multi-contract-features/wasm/Cargo.lock
index 2be74ea6d2..d849f259dd 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.47.6"
+version = "0.47.7"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/panic-message-features/wasm/Cargo.lock b/contracts/feature-tests/panic-message-features/wasm/Cargo.lock
index d7a615f03b..19c41a8939 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.47.6"
+version = "0.47.7"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/payable-features/wasm/Cargo.lock b/contracts/feature-tests/payable-features/wasm/Cargo.lock
index 5fd8334ff0..312b0558e5 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.47.6"
+version = "0.47.7"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "multiversx-sc",
 ]
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 11de3fca41..016e4d921d 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.47.6"
+version = "0.47.7"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "multiversx-sc",
 ]
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 0fa9a620bc..be5589bcee 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.47.6"
+version = "0.47.7"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "multiversx-sc",
 ]
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 d5e7c069db..3d059e28f6 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.47.6"
+version = "0.47.7"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,14 +80,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/use-module/wasm/Cargo.lock b/contracts/feature-tests/use-module/wasm/Cargo.lock
index 7c11441a64..3478705566 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.47.6"
+version = "0.47.7"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,14 +80,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.6"
+version = "0.47.7"
 dependencies = [
  "multiversx-sc",
 ]

From d9114fc3091166c4e3c91a2f598f313696ad9cd6 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Tue, 19 Mar 2024 00:35:29 +0200
Subject: [PATCH 0470/1254] add enum in proxy

---
 .../src/crowdfunding_esdt.rs                  |   1 +
 .../crowdfunding-esdt/src/temp_proxy.rs       | 157 ++++++++++++++++++
 framework/base/src/abi/type_description.rs    |  24 +++
 .../wrapped/egld_or_esdt_token_identifier.rs  |   4 +
 .../contract/generate_proxy/proxy_gen_main.rs |   4 +-
 .../generate_proxy/proxy_template_gen.rs      |  21 +++
 6 files changed, 210 insertions(+), 1 deletion(-)
 create mode 100644 contracts/examples/crowdfunding-esdt/src/temp_proxy.rs

diff --git a/contracts/examples/crowdfunding-esdt/src/crowdfunding_esdt.rs b/contracts/examples/crowdfunding-esdt/src/crowdfunding_esdt.rs
index 8fa04d2e46..5b4af4b037 100644
--- a/contracts/examples/crowdfunding-esdt/src/crowdfunding_esdt.rs
+++ b/contracts/examples/crowdfunding-esdt/src/crowdfunding_esdt.rs
@@ -1,6 +1,7 @@
 #![no_std]
 
 use multiversx_sc::{derive_imports::*, imports::*};
+pub mod temp_proxy;
 
 #[derive(TopEncode, TopDecode, TypeAbi, PartialEq, Eq, Clone, Copy, Debug)]
 pub enum Status {
diff --git a/contracts/examples/crowdfunding-esdt/src/temp_proxy.rs b/contracts/examples/crowdfunding-esdt/src/temp_proxy.rs
new file mode 100644
index 0000000000..1e197ae2f1
--- /dev/null
+++ b/contracts/examples/crowdfunding-esdt/src/temp_proxy.rs
@@ -0,0 +1,157 @@
+////////////////////////////////////////////////////
+////////////////// AUTO-GENERATED //////////////////
+////////////////////////////////////////////////////
+
+#![allow(clippy::all)]
+
+use multiversx_sc::imports::*;
+
+pub enum Status {
+    FundingPeriod,
+    Successful,
+    Failed,
+}
+pub struct CrowdfundingProxy;
+
+impl<Env, From, To, Gas> TxProxyTrait<Env, From, To, Gas> for CrowdfundingProxy
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    type TxProxyMethods = CrowdfundingProxyMethods<Env, From, To, Gas>;
+
+    fn proxy_methods(self, tx: Tx<Env, From, To, (), Gas, (), ()>) -> Self::TxProxyMethods {
+        CrowdfundingProxyMethods { wrapped_tx: tx }
+    }
+}
+
+pub struct CrowdfundingProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    wrapped_tx: Tx<Env, From, To, (), Gas, (), ()>,
+}
+
+impl<Env, From, Gas> CrowdfundingProxyMethods<Env, From, (), Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn init<
+        Arg0: CodecInto<BigUint<Env::Api>>,
+        Arg1: CodecInto<u64>,
+        Arg2: CodecInto<EgldOrEsdtTokenIdentifier<Env::Api>>,
+    >(
+        self,
+        target: Arg0,
+        deadline: Arg1,
+        token_identifier: Arg2,
+    ) -> Tx<Env, From, (), (), Gas, DeployCall<Env, ()>, OriginalResultMarker<()>> {
+        self.wrapped_tx
+            .raw_deploy()
+            .argument(&target)
+            .argument(&deadline)
+            .argument(&token_identifier)
+            .original_result()
+    }
+}
+impl<Env, From, To, Gas> CrowdfundingProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn fund(
+        self,
+    ) -> Tx<Env, From, To, (), Gas, FunctionCall<Env::Api>, OriginalResultMarker<()>> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("fund")
+            .original_result()
+    }
+
+    pub fn status(
+        self,
+    ) -> Tx<Env, From, To, (), Gas, FunctionCall<Env::Api>, OriginalResultMarker<Status>> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("status")
+            .original_result()
+    }
+
+    pub fn get_current_funds(
+        self,
+    ) -> Tx<Env, From, To, (), Gas, FunctionCall<Env::Api>, OriginalResultMarker<BigUint<Env::Api>>>
+    {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("getCurrentFunds")
+            .original_result()
+    }
+
+    pub fn claim(
+        self,
+    ) -> Tx<Env, From, To, (), Gas, FunctionCall<Env::Api>, OriginalResultMarker<()>> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("claim")
+            .original_result()
+    }
+
+    pub fn target(
+        self,
+    ) -> Tx<Env, From, To, (), Gas, FunctionCall<Env::Api>, OriginalResultMarker<BigUint<Env::Api>>>
+    {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("getTarget")
+            .original_result()
+    }
+
+    pub fn deadline(
+        self,
+    ) -> Tx<Env, From, To, (), Gas, FunctionCall<Env::Api>, OriginalResultMarker<u64>> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("getDeadline")
+            .original_result()
+    }
+
+    pub fn deposit<Arg0: CodecInto<ManagedAddress<Env::Api>>>(
+        self,
+        donor: Arg0,
+    ) -> Tx<Env, From, To, (), Gas, FunctionCall<Env::Api>, OriginalResultMarker<BigUint<Env::Api>>>
+    {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("getDeposit")
+            .argument(&donor)
+            .original_result()
+    }
+
+    pub fn cf_token_identifier(
+        self,
+    ) -> Tx<
+        Env,
+        From,
+        To,
+        (),
+        Gas,
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<EgldOrEsdtTokenIdentifier<Env::Api>>,
+    > {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("getCrowdfundingTokenIdentifier")
+            .original_result()
+    }
+}
diff --git a/framework/base/src/abi/type_description.rs b/framework/base/src/abi/type_description.rs
index b9755fcaae..4084ffd85a 100644
--- a/framework/base/src/abi/type_description.rs
+++ b/framework/base/src/abi/type_description.rs
@@ -50,6 +50,30 @@ impl TypeContents {
     pub fn is_specified(&self) -> bool {
         !matches!(*self, TypeContents::NotSpecified)
     }
+
+    pub fn extract_names(&self) -> Vec<String> {
+        let mut names = Vec::new();
+        match &self {
+            TypeContents::Enum(enum_variants) => {
+                for enum_variant in enum_variants.into_iter() {
+                    names.push(enum_variant.name.clone());
+                }
+            },
+            TypeContents::Struct(struct_fields) => {
+                for struct_field in struct_fields {
+                    todo!()
+                }
+            },
+            TypeContents::ExplicitEnum(explicit_enum_variants) => {
+                for explicit_enum_variant in explicit_enum_variants {
+                    todo!()
+                }
+            },
+            TypeContents::NotSpecified => {},
+        }
+
+        names
+    }
 }
 
 #[derive(Clone, Debug, PartialEq, Eq)]
diff --git a/framework/base/src/types/managed/wrapped/egld_or_esdt_token_identifier.rs b/framework/base/src/types/managed/wrapped/egld_or_esdt_token_identifier.rs
index ed2c7083a7..3635ddaba2 100644
--- a/framework/base/src/types/managed/wrapped/egld_or_esdt_token_identifier.rs
+++ b/framework/base/src/types/managed/wrapped/egld_or_esdt_token_identifier.rs
@@ -214,6 +214,10 @@ impl<M: ManagedTypeApi> TypeAbi for EgldOrEsdtTokenIdentifier<M> {
     fn type_name() -> TypeName {
         "EgldOrEsdtTokenIdentifier".into()
     }
+
+    fn type_name_rust() -> TypeName {
+        "EgldOrEsdtTokenIdentifier<$API>".into()
+    }
 }
 
 impl<M: ManagedTypeApi> SCDisplay for EgldOrEsdtTokenIdentifier<M> {
diff --git a/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_main.rs b/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_main.rs
index 3510eb640a..93cdb7a8e6 100644
--- a/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_main.rs
+++ b/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_main.rs
@@ -9,7 +9,8 @@ use super::{
     proxy_crate_gen::create_file,
     proxy_sc_functions_gen::write_content,
     proxy_template_gen::{
-        write_header, write_impl_for_tx_proxy, write_struct_template, write_struct_tx_proxy_methods,
+        write_header, write_impl_for_tx_proxy, write_struct_template,
+        write_struct_tx_proxy_methods, write_types,
     },
 };
 
@@ -24,6 +25,7 @@ impl MetaConfig {
 
 fn write_proxies_to_file(mut file: File, abi: ContractAbi) {
     write_header(&mut file);
+    write_types(&mut file, &abi.type_descriptions);
     write_struct_template(&mut file, &abi.name);
     write_impl_for_tx_proxy(&mut file, &abi.name);
     write_struct_tx_proxy_methods(&mut file, &abi.name);
diff --git a/framework/meta/src/cmd/contract/generate_proxy/proxy_template_gen.rs b/framework/meta/src/cmd/contract/generate_proxy/proxy_template_gen.rs
index 71dc2e2287..7dfdd56c1a 100644
--- a/framework/meta/src/cmd/contract/generate_proxy/proxy_template_gen.rs
+++ b/framework/meta/src/cmd/contract/generate_proxy/proxy_template_gen.rs
@@ -1,5 +1,7 @@
 use std::{fs::File, io::Write};
 
+use multiversx_sc::abi::{TypeContents, TypeDescription, TypeDescriptionContainerImpl};
+
 use crate::cmd::contract::generate_snippets::snippet_gen_common::write_newline;
 
 use super::proxy_naming::{proxy_methods_type_name, proxy_type_name};
@@ -20,6 +22,14 @@ pub(crate) fn write_header(file: &mut File) {
     write_newline(file);
 }
 
+pub(crate) fn write_types(file: &mut File, types: &TypeDescriptionContainerImpl) {
+    for t in types.0.iter() {
+        if matches!(t.1.contents, TypeContents::Enum(_)) {
+            write_enum(file, &t.1);
+        }
+    }
+}
+
 pub(crate) fn write_struct_template(file: &mut File, name: &str) {
     let proxy_type_name = proxy_type_name(name);
     writeln!(file, "pub struct {proxy_type_name};").unwrap();
@@ -68,3 +78,14 @@ where
 
     write_newline(file);
 }
+
+fn write_enum(file: &mut File, type_description: &TypeDescription) {
+    writeln!(file, r#"pub enum {} {{"#, type_description.names.abi).unwrap();
+
+    for content in type_description.contents.extract_names() {
+        writeln!(file, "    {content},").unwrap();
+    }
+
+    writeln!(file, "}}").unwrap();
+    write_newline(file);
+}

From 16020977c7c053230c518569c0f242dd4626e123 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 19 Mar 2024 09:35:38 +0200
Subject: [PATCH 0471/1254] removed deprecation from old testing framework

---
 framework/scenario/src/lib.rs | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/framework/scenario/src/lib.rs b/framework/scenario/src/lib.rs
index 0110147ed3..8e31b5bb6e 100644
--- a/framework/scenario/src/lib.rs
+++ b/framework/scenario/src/lib.rs
@@ -13,15 +13,10 @@ pub mod standalone;
 pub mod test_wallets;
 mod vm_go_tool;
 
-#[deprecated(
-    since = "0.42.0",
-    note = "Use the blackbox testing framework instead. If needed, it also supports whitebox calls."
-)]
 pub mod whitebox_legacy;
 
 /// Keeping this for backwards compatibility.
 /// Unfortunately, the `deprecated` annotation doesn't function for reexports.
-#[allow(deprecated)]
 pub use whitebox_legacy as testing_framework;
 
 pub use api::DebugApi;

From 0d8124425bedd720c67af4770cedbdf2275b2c8f Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 19 Mar 2024 10:52:02 +0200
Subject: [PATCH 0472/1254] tx proxy gen - TypeAbi derive rust name fix

---
 framework/derive/src/type_abi_derive.rs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/framework/derive/src/type_abi_derive.rs b/framework/derive/src/type_abi_derive.rs
index 2d5848cc2d..bdbe24208f 100644
--- a/framework/derive/src/type_abi_derive.rs
+++ b/framework/derive/src/type_abi_derive.rs
@@ -122,6 +122,10 @@ pub fn type_abi_derive(ast: &syn::DeriveInput) -> TokenStream {
                 #name_str.into()
             }
 
+            fn type_name_rust() -> multiversx_sc::abi::TypeName {
+                #name_str.into()
+            }
+
             #type_description_impl
         }
     };

From 9f233b441052bc8488702dd7713956a122e3817a Mon Sep 17 00:00:00 2001
From: Alin Cruceat <alyn_509@yahoo.com>
Date: Tue, 19 Mar 2024 13:39:59 +0200
Subject: [PATCH 0473/1254] vec_mapper set has mut ref

---
 framework/base/src/storage/mappers/vec_mapper.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/framework/base/src/storage/mappers/vec_mapper.rs b/framework/base/src/storage/mappers/vec_mapper.rs
index 49c9c159cc..cc4db40e29 100644
--- a/framework/base/src/storage/mappers/vec_mapper.rs
+++ b/framework/base/src/storage/mappers/vec_mapper.rs
@@ -202,7 +202,7 @@ where
 
     /// Set item at index in storage.
     /// Index must be valid (1 <= index <= count).
-    pub fn set(&self, index: usize, item: &T) {
+    pub fn set(&mut self, index: usize, item: &T) {
         if index == 0 || index > self.len() {
             SA::error_api_impl().signal_error(&b"index out of range"[..]);
         }

From 1c0fc9ded24a42f2e8c662e511247d1d71d9daa9 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Tue, 19 Mar 2024 15:45:59 +0200
Subject: [PATCH 0474/1254] tx proxy gen - extract attributes macro

---
 .../crowdfunding-esdt/src/crowdfunding_esdt.rs   |  3 ++-
 framework/base/src/abi/type_description.rs       | 16 ++++++++--------
 framework/derive/src/lib.rs                      | 13 ++++++++++++-
 3 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/contracts/examples/crowdfunding-esdt/src/crowdfunding_esdt.rs b/contracts/examples/crowdfunding-esdt/src/crowdfunding_esdt.rs
index 5b4af4b037..e82411c0e1 100644
--- a/contracts/examples/crowdfunding-esdt/src/crowdfunding_esdt.rs
+++ b/contracts/examples/crowdfunding-esdt/src/crowdfunding_esdt.rs
@@ -3,7 +3,8 @@
 use multiversx_sc::{derive_imports::*, imports::*};
 pub mod temp_proxy;
 
-#[derive(TopEncode, TopDecode, TypeAbi, PartialEq, Eq, Clone, Copy, Debug)]
+#[derive(TypeAbi)]
+#[derive(TopEncode, TopDecode, PartialEq, Eq, Clone, Copy, Debug)]
 pub enum Status {
     FundingPeriod,
     Successful,
diff --git a/framework/base/src/abi/type_description.rs b/framework/base/src/abi/type_description.rs
index 4084ffd85a..b127e1844e 100644
--- a/framework/base/src/abi/type_description.rs
+++ b/framework/base/src/abi/type_description.rs
@@ -59,15 +59,15 @@ impl TypeContents {
                     names.push(enum_variant.name.clone());
                 }
             },
-            TypeContents::Struct(struct_fields) => {
-                for struct_field in struct_fields {
-                    todo!()
-                }
+            TypeContents::Struct(_struct_fields) => {
+                // for struct_field in struct_fields {
+                //     todo!()
+                // }
             },
-            TypeContents::ExplicitEnum(explicit_enum_variants) => {
-                for explicit_enum_variant in explicit_enum_variants {
-                    todo!()
-                }
+            TypeContents::ExplicitEnum(_explicit_enum_variants) => {
+                // for explicit_enum_variant in explicit_enum_variants {
+                //     todo!()
+                // }
             },
             TypeContents::NotSpecified => {},
         }
diff --git a/framework/derive/src/lib.rs b/framework/derive/src/lib.rs
index a68d493c97..66531e3205 100644
--- a/framework/derive/src/lib.rs
+++ b/framework/derive/src/lib.rs
@@ -48,7 +48,18 @@ pub fn proxy(
 
 #[proc_macro_derive(TypeAbi)]
 pub fn type_abi_derive(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
-    let ast = syn::parse(input).unwrap();
+    let ast: syn::DeriveInput = syn::parse(input).unwrap();
+    for a in ast.clone().attrs {
+        match &a.meta {
+            syn::Meta::Path(_path) => {},
+            syn::Meta::List(list) => {
+                for token in <proc_macro2::TokenStream as Clone>::clone(&list.tokens).into_iter() {
+                    println!(">>>{}", token.to_string());
+                }
+            },
+            syn::Meta::NameValue(_name_value) => {},
+        }
+    }
     type_abi_derive::type_abi_derive(&ast)
 }
 

From 37de8ba950a60c1114fad8e410b2d656d248efa3 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Wed, 20 Mar 2024 00:31:22 +0200
Subject: [PATCH 0475/1254] tx proxy gen - add macro_attibutes in proxy for
 enum

---
 .../crowdfunding-esdt/src/temp_proxy.rs       | 92 ++++++++++++++++---
 framework/base/src/abi/type_abi.rs            |  1 +
 framework/base/src/abi/type_description.rs    | 12 ++-
 .../types/io/operation_completion_status.rs   |  1 +
 framework/derive/src/lib.rs                   | 11 ---
 .../derive/src/parse/attributes/doc_attr.rs   | 14 +++
 framework/derive/src/parse/attributes/mod.rs  |  2 +-
 framework/derive/src/type_abi_derive.rs       |  6 ++
 framework/meta/src/abi_json/type_abi_json.rs  |  1 +
 .../generate_proxy/proxy_template_gen.rs      | 15 +++
 10 files changed, 129 insertions(+), 26 deletions(-)

diff --git a/contracts/examples/crowdfunding-esdt/src/temp_proxy.rs b/contracts/examples/crowdfunding-esdt/src/temp_proxy.rs
index 1e197ae2f1..1c4d10dbb9 100644
--- a/contracts/examples/crowdfunding-esdt/src/temp_proxy.rs
+++ b/contracts/examples/crowdfunding-esdt/src/temp_proxy.rs
@@ -6,11 +6,14 @@
 
 use multiversx_sc::imports::*;
 
+#[derive(TypeAbi)]
+#[derive(TopEncode, TopDecode, PartialEq, Eq, Clone, Copy, Debug)]
 pub enum Status {
     FundingPeriod,
     Successful,
     Failed,
 }
+
 pub struct CrowdfundingProxy;
 
 impl<Env, From, To, Gas> TxProxyTrait<Env, From, To, Gas> for CrowdfundingProxy
@@ -53,7 +56,15 @@ where
         target: Arg0,
         deadline: Arg1,
         token_identifier: Arg2,
-    ) -> Tx<Env, From, (), (), Gas, DeployCall<Env, ()>, OriginalResultMarker<()>> {
+    ) -> Tx<
+        Env,
+        From,
+        (),
+        (),
+        Gas,
+        DeployCall<Env, ()>,
+        OriginalResultMarker<()>,
+    > {
         self.wrapped_tx
             .raw_deploy()
             .argument(&target)
@@ -61,6 +72,7 @@ where
             .argument(&token_identifier)
             .original_result()
     }
+
 }
 impl<Env, From, To, Gas> CrowdfundingProxyMethods<Env, From, To, Gas>
 where
@@ -72,7 +84,15 @@ where
 {
     pub fn fund(
         self,
-    ) -> Tx<Env, From, To, (), Gas, FunctionCall<Env::Api>, OriginalResultMarker<()>> {
+    ) -> Tx<
+        Env,
+        From,
+        To,
+        (),
+        Gas,
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<()>,
+    > {
         self.wrapped_tx
             .raw_call()
             .function_name("fund")
@@ -81,7 +101,15 @@ where
 
     pub fn status(
         self,
-    ) -> Tx<Env, From, To, (), Gas, FunctionCall<Env::Api>, OriginalResultMarker<Status>> {
+    ) -> Tx<
+        Env,
+        From,
+        To,
+        (),
+        Gas,
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<Status>,
+    > {
         self.wrapped_tx
             .raw_call()
             .function_name("status")
@@ -90,8 +118,15 @@ where
 
     pub fn get_current_funds(
         self,
-    ) -> Tx<Env, From, To, (), Gas, FunctionCall<Env::Api>, OriginalResultMarker<BigUint<Env::Api>>>
-    {
+    ) -> Tx<
+        Env,
+        From,
+        To,
+        (),
+        Gas,
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<BigUint<Env::Api>>,
+    > {
         self.wrapped_tx
             .raw_call()
             .function_name("getCurrentFunds")
@@ -100,7 +135,15 @@ where
 
     pub fn claim(
         self,
-    ) -> Tx<Env, From, To, (), Gas, FunctionCall<Env::Api>, OriginalResultMarker<()>> {
+    ) -> Tx<
+        Env,
+        From,
+        To,
+        (),
+        Gas,
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<()>,
+    > {
         self.wrapped_tx
             .raw_call()
             .function_name("claim")
@@ -109,8 +152,15 @@ where
 
     pub fn target(
         self,
-    ) -> Tx<Env, From, To, (), Gas, FunctionCall<Env::Api>, OriginalResultMarker<BigUint<Env::Api>>>
-    {
+    ) -> Tx<
+        Env,
+        From,
+        To,
+        (),
+        Gas,
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<BigUint<Env::Api>>,
+    > {
         self.wrapped_tx
             .raw_call()
             .function_name("getTarget")
@@ -119,18 +169,35 @@ where
 
     pub fn deadline(
         self,
-    ) -> Tx<Env, From, To, (), Gas, FunctionCall<Env::Api>, OriginalResultMarker<u64>> {
+    ) -> Tx<
+        Env,
+        From,
+        To,
+        (),
+        Gas,
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<u64>,
+    > {
         self.wrapped_tx
             .raw_call()
             .function_name("getDeadline")
             .original_result()
     }
 
-    pub fn deposit<Arg0: CodecInto<ManagedAddress<Env::Api>>>(
+    pub fn deposit<
+        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+    >(
         self,
         donor: Arg0,
-    ) -> Tx<Env, From, To, (), Gas, FunctionCall<Env::Api>, OriginalResultMarker<BigUint<Env::Api>>>
-    {
+    ) -> Tx<
+        Env,
+        From,
+        To,
+        (),
+        Gas,
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<BigUint<Env::Api>>,
+    > {
         self.wrapped_tx
             .raw_call()
             .function_name("getDeposit")
@@ -154,4 +221,5 @@ where
             .function_name("getCrowdfundingTokenIdentifier")
             .original_result()
     }
+
 }
diff --git a/framework/base/src/abi/type_abi.rs b/framework/base/src/abi/type_abi.rs
index 62633e2a70..215cb36464 100644
--- a/framework/base/src/abi/type_abi.rs
+++ b/framework/base/src/abi/type_abi.rs
@@ -29,6 +29,7 @@ pub trait TypeAbi {
                 docs: Vec::new(),
                 names: Self::type_names(),
                 contents: TypeContents::NotSpecified,
+                macro_attributes: Vec::new()
             },
         );
     }
diff --git a/framework/base/src/abi/type_description.rs b/framework/base/src/abi/type_description.rs
index b127e1844e..cee01bfa58 100644
--- a/framework/base/src/abi/type_description.rs
+++ b/framework/base/src/abi/type_description.rs
@@ -10,6 +10,7 @@ pub struct TypeDescription {
     pub docs: Vec<String>,
     pub names: TypeNames,
     pub contents: TypeContents,
+    pub macro_attributes: Vec<String>,
 }
 
 impl TypeDescription {
@@ -24,16 +25,23 @@ impl TypeDescription {
             rust: String::new(),
         },
         contents: TypeContents::NotSpecified,
+        macro_attributes: Vec::new(),
     };
 }
 
 impl TypeDescription {
     /// Used in code generation.
-    pub fn new(docs: &[&str], names: TypeNames, contents: TypeContents) -> Self {
+    pub fn new(
+        docs: &[&str],
+        names: TypeNames,
+        contents: TypeContents,
+        macro_attributes: &[&str],
+    ) -> Self {
         TypeDescription {
             docs: docs.iter().map(|s| s.to_string()).collect(),
             names,
             contents,
+            macro_attributes: macro_attributes.iter().map(|s| s.to_string()).collect(),
         }
     }
 }
@@ -55,7 +63,7 @@ impl TypeContents {
         let mut names = Vec::new();
         match &self {
             TypeContents::Enum(enum_variants) => {
-                for enum_variant in enum_variants.into_iter() {
+                for enum_variant in enum_variants {
                     names.push(enum_variant.name.clone());
                 }
             },
diff --git a/framework/base/src/types/io/operation_completion_status.rs b/framework/base/src/types/io/operation_completion_status.rs
index 207b9d760f..b69af9624a 100644
--- a/framework/base/src/types/io/operation_completion_status.rs
+++ b/framework/base/src/types/io/operation_completion_status.rs
@@ -98,6 +98,7 @@ impl TypeAbi for OperationCompletionStatus {
                         INTERRUPTED_STR,
                     )
                 ].to_vec()),
+                macro_attributes: Vec::new()
             },
         );
     }
diff --git a/framework/derive/src/lib.rs b/framework/derive/src/lib.rs
index 66531e3205..bdc33883fe 100644
--- a/framework/derive/src/lib.rs
+++ b/framework/derive/src/lib.rs
@@ -49,17 +49,6 @@ pub fn proxy(
 #[proc_macro_derive(TypeAbi)]
 pub fn type_abi_derive(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
     let ast: syn::DeriveInput = syn::parse(input).unwrap();
-    for a in ast.clone().attrs {
-        match &a.meta {
-            syn::Meta::Path(_path) => {},
-            syn::Meta::List(list) => {
-                for token in <proc_macro2::TokenStream as Clone>::clone(&list.tokens).into_iter() {
-                    println!(">>>{}", token.to_string());
-                }
-            },
-            syn::Meta::NameValue(_name_value) => {},
-        }
-    }
     type_abi_derive::type_abi_derive(&ast)
 }
 
diff --git a/framework/derive/src/parse/attributes/doc_attr.rs b/framework/derive/src/parse/attributes/doc_attr.rs
index c2a670abb5..d9d3b22658 100644
--- a/framework/derive/src/parse/attributes/doc_attr.rs
+++ b/framework/derive/src/parse/attributes/doc_attr.rs
@@ -45,6 +45,20 @@ pub fn extract_doc(attrs: &[syn::Attribute]) -> Vec<String> {
         .collect()
 }
 
+pub fn extract_macro_attributes(attrs: &[syn::Attribute]) -> Vec<String> {
+    let mut macro_attributes = Vec::new();
+
+    for a in attrs {
+        if let syn::Meta::List(list) = &a.meta {
+            for token in list.tokens.clone().into_iter() {
+                macro_attributes.push(token.to_string());
+            }
+        }
+    }
+
+    macro_attributes
+}
+
 fn remove_backslashes(input: &str) -> String {
     input
         .trim_matches('\"')
diff --git a/framework/derive/src/parse/attributes/mod.rs b/framework/derive/src/parse/attributes/mod.rs
index e355c78e61..e58c1a912e 100644
--- a/framework/derive/src/parse/attributes/mod.rs
+++ b/framework/derive/src/parse/attributes/mod.rs
@@ -11,7 +11,7 @@ mod trait_prop_names;
 mod util;
 
 pub use argument_attr::*;
-pub use doc_attr::{extract_doc, OutputNameAttribute};
+pub use doc_attr::{extract_doc, extract_macro_attributes, OutputNameAttribute};
 pub use endpoint_attr::*;
 pub use event_attr::*;
 pub use label_attr::*;
diff --git a/framework/derive/src/type_abi_derive.rs b/framework/derive/src/type_abi_derive.rs
index bdbe24208f..13fab6baa3 100644
--- a/framework/derive/src/type_abi_derive.rs
+++ b/framework/derive/src/type_abi_derive.rs
@@ -1,3 +1,5 @@
+use crate::parse::attributes::extract_macro_attributes;
+
 use super::parse::attributes::extract_doc;
 use proc_macro::TokenStream;
 use quote::quote;
@@ -45,6 +47,8 @@ fn fields_snippets(fields: &syn::Fields) -> Vec<proc_macro2::TokenStream> {
 
 pub fn type_abi_derive(ast: &syn::DeriveInput) -> TokenStream {
     let type_docs = extract_doc(ast.attrs.as_slice());
+    let macro_attributes = extract_macro_attributes(ast.attrs.as_slice());
+
     let type_description_impl = match &ast.data {
         syn::Data::Struct(data_struct) => {
             let struct_field_snippets = fields_snippets(&data_struct.fields);
@@ -61,6 +65,7 @@ pub fn type_abi_derive(ast: &syn::DeriveInput) -> TokenStream {
                                 &[ #(#type_docs),* ],
                                 type_names,
                                 multiversx_sc::abi::TypeContents::Struct(field_descriptions),
+                                &[ #(#macro_attributes),* ],
                             ),
                         );
                     }
@@ -104,6 +109,7 @@ pub fn type_abi_derive(ast: &syn::DeriveInput) -> TokenStream {
                                 &[ #(#type_docs),* ],
                                 type_names,
                                 multiversx_sc::abi::TypeContents::Enum(variant_descriptions),
+                                &[ #(#macro_attributes),* ],
                             ),
                         );
                     }
diff --git a/framework/meta/src/abi_json/type_abi_json.rs b/framework/meta/src/abi_json/type_abi_json.rs
index c7735f04d6..dac3f7c029 100644
--- a/framework/meta/src/abi_json/type_abi_json.rs
+++ b/framework/meta/src/abi_json/type_abi_json.rs
@@ -87,6 +87,7 @@ impl TypeDescriptionJson {
                 ),
                 _ => TypeContents::NotSpecified,
             },
+            macro_attributes: Vec::new()
         }
     }
 }
diff --git a/framework/meta/src/cmd/contract/generate_proxy/proxy_template_gen.rs b/framework/meta/src/cmd/contract/generate_proxy/proxy_template_gen.rs
index 7dfdd56c1a..1267cb839c 100644
--- a/framework/meta/src/cmd/contract/generate_proxy/proxy_template_gen.rs
+++ b/framework/meta/src/cmd/contract/generate_proxy/proxy_template_gen.rs
@@ -80,6 +80,7 @@ where
 }
 
 fn write_enum(file: &mut File, type_description: &TypeDescription) {
+    write_macro_attributes(file, &type_description.macro_attributes);
     writeln!(file, r#"pub enum {} {{"#, type_description.names.abi).unwrap();
 
     for content in type_description.contents.extract_names() {
@@ -89,3 +90,17 @@ fn write_enum(file: &mut File, type_description: &TypeDescription) {
     writeln!(file, "}}").unwrap();
     write_newline(file);
 }
+
+fn write_macro_attributes(file: &mut File, macro_attributes: &[String]) {
+    writeln!(file, "#[derive(TypeAbi)]").unwrap();
+    if !macro_attributes.is_empty() {
+        write!(file, "#[derive(").unwrap();
+    }
+
+    let attributes = macro_attributes.join("").replace(',', ", ");
+    write!(file, "{attributes}").unwrap();
+
+    if !macro_attributes.is_empty() {
+        writeln!(file, ")]").unwrap();
+    }
+}

From 775f0e8208a1f15ff10d3097b10d1bb3f4e654a7 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Wed, 20 Mar 2024 10:15:59 +0200
Subject: [PATCH 0476/1254] tx proxy gen - add derive imports

---
 contracts/examples/crowdfunding-esdt/src/temp_proxy.rs    | 2 ++
 .../src/cmd/contract/generate_proxy/proxy_template_gen.rs | 8 ++++++++
 2 files changed, 10 insertions(+)

diff --git a/contracts/examples/crowdfunding-esdt/src/temp_proxy.rs b/contracts/examples/crowdfunding-esdt/src/temp_proxy.rs
index 1c4d10dbb9..98ab96c104 100644
--- a/contracts/examples/crowdfunding-esdt/src/temp_proxy.rs
+++ b/contracts/examples/crowdfunding-esdt/src/temp_proxy.rs
@@ -6,6 +6,8 @@
 
 use multiversx_sc::imports::*;
 
+use multiversx_sc::derive_imports::*;
+
 #[derive(TypeAbi)]
 #[derive(TopEncode, TopDecode, PartialEq, Eq, Clone, Copy, Debug)]
 pub enum Status {
diff --git a/framework/meta/src/cmd/contract/generate_proxy/proxy_template_gen.rs b/framework/meta/src/cmd/contract/generate_proxy/proxy_template_gen.rs
index 1267cb839c..25dd7a150d 100644
--- a/framework/meta/src/cmd/contract/generate_proxy/proxy_template_gen.rs
+++ b/framework/meta/src/cmd/contract/generate_proxy/proxy_template_gen.rs
@@ -15,6 +15,8 @@ const IMPORTS: &str = "#![allow(clippy::all)]
 
 use multiversx_sc::imports::*;";
 
+const DERIVE_IMPORTS: &str = "use multiversx_sc::derive_imports::*;";
+
 pub(crate) fn write_header(file: &mut File) {
     writeln!(file, "{PREFIX_AUTO_GENERATED}").unwrap();
     writeln!(file, r#"{IMPORTS}"#).unwrap();
@@ -80,6 +82,7 @@ where
 }
 
 fn write_enum(file: &mut File, type_description: &TypeDescription) {
+    write_derive_imports(file);
     write_macro_attributes(file, &type_description.macro_attributes);
     writeln!(file, r#"pub enum {} {{"#, type_description.names.abi).unwrap();
 
@@ -104,3 +107,8 @@ fn write_macro_attributes(file: &mut File, macro_attributes: &[String]) {
         writeln!(file, ")]").unwrap();
     }
 }
+
+fn write_derive_imports(file: &mut File) {
+    writeln!(file, "{DERIVE_IMPORTS}").unwrap();
+    write_newline(file);
+}

From cf30349c4d7a053e2a3c57d7ec4f8119bff77ecc Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 20 Mar 2024 10:42:51 +0200
Subject: [PATCH 0477/1254] unified syntax - interactors

---
 .../adder/interact/src/basic_interact.rs      | 104 +++++++-------
 .../base/src/types/interaction/annotated.rs   |  28 +++-
 .../base/src/types/interaction/tx_from.rs     |  24 +++-
 .../base/src/types/interaction/tx_payment.rs  |  92 ++++++++++++
 framework/base/src/types/interaction/tx_to.rs |  24 +++-
 framework/scenario/src/facade/world_tx.rs     |   2 +-
 .../src/facade/world_tx/scenario_env.rs       |  10 --
 .../facade/world_tx/scenario_env_deploy.rs    |   2 +-
 .../src/facade/world_tx/scenario_env_exec.rs  |   2 +-
 .../src/facade/world_tx/scenario_env_query.rs |   2 +-
 .../src/facade/world_tx/scenario_env_util.rs  |  61 ++++++--
 .../facade/world_tx/scenario_rh_list_item.rs  |  16 ++-
 .../model/value/value_set_big_uint.rs         |  13 +-
 .../scenario/model/value/value_set_bytes.rs   |  32 +++++
 framework/snippets/src/interactor.rs          |   9 +-
 framework/snippets/src/itx.rs                 |  17 +++
 framework/snippets/src/itx/interactor_env.rs  |  24 ++++
 .../snippets/src/itx/interactor_env_deploy.rs | 136 ++++++++++++++++++
 .../snippets/src/itx/interactor_env_exec.rs   | 122 ++++++++++++++++
 .../snippets/src/itx/interactor_env_query.rs  | 106 ++++++++++++++
 .../snippets/src/itx/interactor_env_transf.rs |  51 +++++++
 .../snippets/src/itx/interactor_rh_list.rs    |  51 +++++++
 .../src/itx/interactor_rh_list_item.rs        |  76 ++++++++++
 framework/snippets/src/lib.rs                 |   2 +
 24 files changed, 924 insertions(+), 82 deletions(-)
 create mode 100644 framework/snippets/src/itx.rs
 create mode 100644 framework/snippets/src/itx/interactor_env.rs
 create mode 100644 framework/snippets/src/itx/interactor_env_deploy.rs
 create mode 100644 framework/snippets/src/itx/interactor_env_exec.rs
 create mode 100644 framework/snippets/src/itx/interactor_env_query.rs
 create mode 100644 framework/snippets/src/itx/interactor_env_transf.rs
 create mode 100644 framework/snippets/src/itx/interactor_rh_list.rs
 create mode 100644 framework/snippets/src/itx/interactor_rh_list_item.rs

diff --git a/contracts/examples/adder/interact/src/basic_interact.rs b/contracts/examples/adder/interact/src/basic_interact.rs
index 3dd78d048a..a5687aaede 100644
--- a/contracts/examples/adder/interact/src/basic_interact.rs
+++ b/contracts/examples/adder/interact/src/basic_interact.rs
@@ -2,26 +2,24 @@ mod basic_interact_cli;
 mod basic_interact_config;
 mod basic_interact_state;
 
-use adder::ProxyTrait;
+use adder::{temp_proxy, ProxyTrait};
 use basic_interact_config::Config;
 use basic_interact_state::State;
 use clap::Parser;
 use multiversx_sc_snippets::{
     env_logger,
-    multiversx_sc::{storage::mappers::SingleValue, types::Address},
+    multiversx_sc::types::{Address, ReturnsNewAddress, ReturnsSimilar},
     multiversx_sc_scenario::{
         api::StaticApi,
         bech32,
         mandos_system::ScenarioRunner,
         num_bigint::BigUint,
         scenario_format::interpret_trait::{InterpretableFrom, InterpreterContext},
-        scenario_model::{
-            BytesValue, ScCallStep, ScDeployStep, ScQueryStep, Scenario, TransferStep, TxExpect,
-        },
+        scenario_model::{BytesValue, ScDeployStep, Scenario},
         standalone::retrieve_account_as_scenario_set_state,
-        test_wallets, ContractInfo,
+        test_wallets, ContractInfo, WithRawTxResponse,
     },
-    tokio, Interactor, StepBuffer,
+    tokio, Interactor, InteractorPrepareAsync, StepBuffer,
 };
 
 const INTERACTOR_SCENARIO_TRACE_PATH: &str = "interactor_trace.scen.json";
@@ -100,28 +98,32 @@ impl AdderInteract {
     async fn deploy(&mut self) {
         self.set_state().await;
 
-        self.interactor
-            .sc_deploy_use_result(
-                ScDeployStep::new()
-                    .call(self.state.default_adder().init(BigUint::from(0u64)))
-                    .from(&self.wallet_address)
-                    .code(&self.adder_code),
-                |new_address, tr| {
-                    tr.result.unwrap_or_else(|err| {
-                        panic!(
-                            "deploy failed: status: {}, message: {}",
-                            err.status, err.message
-                        )
-                    });
-
-                    let new_address_bech32 = bech32::encode(&new_address);
-                    println!("new address: {new_address_bech32}");
-
-                    let new_address_expr = format!("bech32:{new_address_bech32}");
-                    self.state.set_adder_address(&new_address_expr);
-                },
-            )
+        let new_address = self
+            .interactor
+            .tx()
+            .from(&self.wallet_address)
+            .typed(temp_proxy::AdderProxy)
+            .init(0u32)
+            .code(&self.adder_code)
+            .with_result(WithRawTxResponse(|response| {
+                let err = &response.tx_error;
+                assert!(
+                    err.is_success(),
+                    "deploy failed: status: {}, message: {}",
+                    err.status,
+                    err.message
+                );
+            }))
+            .returns(ReturnsNewAddress)
+            .prepare_async()
+            .run()
             .await;
+
+        let new_address_bech32 = bech32::encode(&new_address.to_address());
+        println!("new address: {new_address_bech32}");
+
+        let new_address_expr = format!("bech32:{new_address_bech32}");
+        self.state.set_adder_address(&new_address_expr);
     }
 
     async fn multi_deploy(&mut self, count: &u8) {
@@ -164,38 +166,42 @@ impl AdderInteract {
     }
 
     async fn feed_contract_egld(&mut self) {
-        let _ = self
-            .interactor
-            .transfer(
-                TransferStep::new()
-                    .from(&self.wallet_address)
-                    .to(self.state.adder())
-                    .egld_value("0,050000000000000000"),
-            )
+        self.interactor
+            .tx()
+            .from(&self.wallet_address)
+            .to(self.state.adder().to_address())
+            .egld(50000000000000000u64.into()) // TODO: annotate "0,050000000000000000"
+            .prepare_async()
+            .run()
             .await;
     }
 
     async fn add(&mut self, value: u64) {
         self.interactor
-            .sc_call(
-                ScCallStep::new()
-                    .call(self.state.adder().add(value))
-                    .from(&self.wallet_address)
-                    .expect(
-                        TxExpect::ok().additional_error_message("performing add failed with: "),
-                    ),
-            )
+            .tx()
+            .from(&self.wallet_address)
+            .to(self.state.adder().to_address())
+            .typed(temp_proxy::AdderProxy)
+            .add(value)
+            .prepare_async()
+            .run()
             .await;
 
         println!("successfully performed add");
     }
 
     async fn print_sum(&mut self) {
-        self.interactor
-            .sc_query_use_result(ScQueryStep::new().call(self.state.adder().sum()), |tr| {
-                let sum: SingleValue<BigUint> = tr.result.unwrap();
-                println!("sum: {}", sum.into());
-            })
+        let sum = self
+            .interactor
+            .query()
+            .to(self.state.adder().to_address())
+            .typed(temp_proxy::AdderProxy)
+            .sum()
+            .returns(ReturnsSimilar::<BigUint>::new())
+            .prepare_async()
+            .run()
             .await;
+
+        println!("sum: {sum}");
     }
 }
diff --git a/framework/base/src/types/interaction/annotated.rs b/framework/base/src/types/interaction/annotated.rs
index 878cdb5e1f..247b47b206 100644
--- a/framework/base/src/types/interaction/annotated.rs
+++ b/framework/base/src/types/interaction/annotated.rs
@@ -1,4 +1,4 @@
-use crate::types::{ManagedAddress, ManagedBuffer};
+use crate::types::{Address, ManagedAddress, ManagedBuffer};
 
 use super::TxEnv;
 
@@ -37,6 +37,32 @@ where
     }
 }
 
+impl<Env> AnnotatedValue<Env, ManagedAddress<Env::Api>> for Address
+where
+    Env: TxEnv,
+{
+    fn annotation(&self, _env: &Env) -> ManagedBuffer<Env::Api> {
+        ManagedAddress::from(self).hex_expr()
+    }
+
+    fn into_value(self, _env: &Env) -> ManagedAddress<Env::Api> {
+        self.into()
+    }
+}
+
+impl<Env> AnnotatedValue<Env, ManagedAddress<Env::Api>> for &Address
+where
+    Env: TxEnv,
+{
+    fn annotation(&self, _env: &Env) -> ManagedBuffer<Env::Api> {
+        ManagedAddress::from(*self).hex_expr()
+    }
+
+    fn into_value(self, _env: &Env) -> ManagedAddress<Env::Api> {
+        self.into()
+    }
+}
+
 impl<Env> AnnotatedValue<Env, ManagedBuffer<Env::Api>> for ManagedBuffer<Env::Api>
 where
     Env: TxEnv,
diff --git a/framework/base/src/types/interaction/tx_from.rs b/framework/base/src/types/interaction/tx_from.rs
index ef6cbb1462..0ced9e75c8 100644
--- a/framework/base/src/types/interaction/tx_from.rs
+++ b/framework/base/src/types/interaction/tx_from.rs
@@ -1,4 +1,4 @@
-use crate::types::ManagedAddress;
+use crate::types::{Address, ManagedAddress};
 
 use super::{AnnotatedValue, TxEnv};
 
@@ -44,3 +44,25 @@ where
     }
 }
 impl<Env> TxFromSpecified<Env> for &ManagedAddress<Env::Api> where Env: TxEnv {}
+
+impl<Env> TxFrom<Env> for Address
+where
+    Env: TxEnv,
+{
+    fn resolve_address(&self, _env: &Env) -> ManagedAddress<Env::Api> {
+        self.into()
+    }
+}
+
+impl<Env> TxFromSpecified<Env> for Address where Env: TxEnv {}
+
+impl<Env> TxFrom<Env> for &Address
+where
+    Env: TxEnv,
+{
+    fn resolve_address(&self, _env: &Env) -> ManagedAddress<Env::Api> {
+        ManagedAddress::from_address(self)
+    }
+}
+
+impl<Env> TxFromSpecified<Env> for &Address where Env: TxEnv {}
diff --git a/framework/base/src/types/interaction/tx_payment.rs b/framework/base/src/types/interaction/tx_payment.rs
index 0f50f50e53..d7f7fd90f5 100644
--- a/framework/base/src/types/interaction/tx_payment.rs
+++ b/framework/base/src/types/interaction/tx_payment.rs
@@ -1,6 +1,8 @@
 use crate::{
     api::ManagedTypeApi,
     contract_base::SendRawWrapper,
+    formatter::FormatBuffer,
+    imports::{BigUint, ManagedBuffer, ManagedBufferCachedBuilder, ManagedVec},
     types::{
         EgldOrEsdtTokenPayment, EgldOrMultiEsdtPayment, EgldPayment, EsdtTokenPayment,
         ManagedAddress, MultiEsdtPayment,
@@ -19,6 +21,50 @@ where
     pub fc: FunctionCall<Api>,
 }
 
+#[derive(Clone)]
+pub struct AnnotatedEgldPayment<Api>
+where
+    Api: ManagedTypeApi,
+{
+    pub value: BigUint<Api>,
+    pub annotation: ManagedBuffer<Api>,
+}
+
+impl<Api> AnnotatedEgldPayment<Api>
+where
+    Api: ManagedTypeApi,
+{
+    pub fn new_egld(value: BigUint<Api>) -> Self {
+        let mut annotation = ManagedBufferCachedBuilder::default();
+        annotation.append_display(&value);
+        AnnotatedEgldPayment {
+            value,
+            annotation: annotation.into_managed_buffer(),
+        }
+    }
+}
+
+#[derive(Clone)]
+pub struct FullPaymentData<Api>
+where
+    Api: ManagedTypeApi,
+{
+    pub egld: Option<AnnotatedEgldPayment<Api>>,
+    pub multi_esdt: MultiEsdtPayment<Api>,
+}
+
+impl<Api> Default for FullPaymentData<Api>
+where
+    Api: ManagedTypeApi,
+{
+    fn default() -> Self {
+        Self {
+            egld: None,
+            multi_esdt: Default::default(),
+        }
+    }
+}
+
 /// Describes a payment that is part of a transaction.
 pub trait TxPayment<Env>
 where
@@ -44,6 +90,8 @@ where
         gas_limit: u64,
         fc: FunctionCall<Env::Api>,
     );
+
+    fn into_full_payment_data(self) -> FullPaymentData<Env::Api>;
 }
 
 /// Marks a payment object that only contains EGLD or nothing at all.
@@ -88,6 +136,10 @@ where
     ) {
         EgldPayment::no_payment().perform_transfer_execute(env, to, gas_limit, fc);
     }
+
+    fn into_full_payment_data(self) -> FullPaymentData<Env::Api> {
+        FullPaymentData::default()
+    }
 }
 
 impl<Env> TxPaymentEgldOnly<Env> for ()
@@ -139,6 +191,13 @@ where
             &fc.arg_buffer,
         );
     }
+
+    fn into_full_payment_data(self) -> FullPaymentData<<Env as TxEnv>::Api> {
+        FullPaymentData {
+            egld: Some(AnnotatedEgldPayment::new_egld(self.value)),
+            multi_esdt: ManagedVec::new(),
+        }
+    }
 }
 
 impl<Env> TxPaymentEgldOnly<Env> for EgldPayment<Env::Api>
@@ -184,6 +243,13 @@ where
     ) {
         MultiEsdtPayment::from_single_item(self).perform_transfer_execute(env, to, gas_limit, fc);
     }
+
+    fn into_full_payment_data(self) -> FullPaymentData<<Env as TxEnv>::Api> {
+        FullPaymentData {
+            egld: None,
+            multi_esdt: MultiEsdtPayment::from_single_item(self),
+        }
+    }
 }
 
 impl<Env> TxPayment<Env> for MultiEsdtPayment<Env::Api>
@@ -226,6 +292,13 @@ where
             &fc.arg_buffer,
         );
     }
+
+    fn into_full_payment_data(self) -> FullPaymentData<<Env as TxEnv>::Api> {
+        FullPaymentData {
+            egld: None,
+            multi_esdt: self,
+        }
+    }
 }
 
 impl<Env> TxPayment<Env> for EgldOrEsdtTokenPayment<Env::Api>
@@ -268,6 +341,14 @@ where
             |(to, fc), esdt_payment| esdt_payment.perform_transfer_execute(env, to, gas_limit, fc),
         )
     }
+
+    fn into_full_payment_data(self) -> FullPaymentData<Env::Api> {
+        self.map_egld_or_esdt(
+            (),
+            |(), amount| TxPayment::<Env>::into_full_payment_data(EgldPayment::from(amount)),
+            |(), esdt_payment| TxPayment::<Env>::into_full_payment_data(esdt_payment),
+        )
+    }
 }
 
 impl<Env> TxPayment<Env> for EgldOrMultiEsdtPayment<Env::Api>
@@ -314,6 +395,17 @@ where
             },
         }
     }
+
+    fn into_full_payment_data(self) -> FullPaymentData<Env::Api> {
+        match self {
+            EgldOrMultiEsdtPayment::Egld(egld_amount) => {
+                TxPayment::<Env>::into_full_payment_data(EgldPayment::from(egld_amount))
+            },
+            EgldOrMultiEsdtPayment::MultiEsdt(multi_esdt_payment) => {
+                TxPayment::<Env>::into_full_payment_data(multi_esdt_payment)
+            },
+        }
+    }
 }
 
 fn convert_tx_data_fungible<Api>(
diff --git a/framework/base/src/types/interaction/tx_to.rs b/framework/base/src/types/interaction/tx_to.rs
index ecba5ad1f6..2a32ac576f 100644
--- a/framework/base/src/types/interaction/tx_to.rs
+++ b/framework/base/src/types/interaction/tx_to.rs
@@ -1,4 +1,4 @@
-use crate::types::ManagedAddress;
+use crate::types::{Address, ManagedAddress};
 
 use super::{AnnotatedValue, TxEnv};
 
@@ -39,3 +39,25 @@ where
         f(self)
     }
 }
+
+impl<Env> TxTo<Env> for Address where Env: TxEnv {}
+impl<Env> TxToSpecified<Env> for Address
+where
+    Env: TxEnv,
+{
+    fn with_address_ref<F: FnOnce(&ManagedAddress<Env::Api>)>(&self, _env: &Env, f: F) {
+        let managed_address = ManagedAddress::from(self);
+        f(&managed_address)
+    }
+}
+
+impl<Env> TxTo<Env> for &Address where Env: TxEnv {}
+impl<Env> TxToSpecified<Env> for &Address
+where
+    Env: TxEnv,
+{
+    fn with_address_ref<F: FnOnce(&ManagedAddress<Env::Api>)>(&self, _env: &Env, f: F) {
+        let managed_address = ManagedAddress::from(*self);
+        f(&managed_address)
+    }
+}
diff --git a/framework/scenario/src/facade/world_tx.rs b/framework/scenario/src/facade/world_tx.rs
index 8c2314767e..92f842cf55 100644
--- a/framework/scenario/src/facade/world_tx.rs
+++ b/framework/scenario/src/facade/world_tx.rs
@@ -5,7 +5,7 @@ mod scenario_env;
 mod scenario_env_deploy;
 mod scenario_env_exec;
 mod scenario_env_query;
-mod scenario_env_util;
+pub mod scenario_env_util;
 mod scenario_rh_list;
 mod scenario_rh_list_item;
 mod with_tx_raw_response;
diff --git a/framework/scenario/src/facade/world_tx/scenario_env.rs b/framework/scenario/src/facade/world_tx/scenario_env.rs
index 0392fa2bb6..758cff63f1 100644
--- a/framework/scenario/src/facade/world_tx/scenario_env.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_env.rs
@@ -48,13 +48,3 @@ pub trait ScenarioTxRun {
 
     fn run(self) -> Self::Returns;
 }
-
-/// Provides a method to run scenario steps and txs, which also takes a `ScenarioWorld` argument.
-///
-/// It is used for chaining methods that can't include the reference to the ScenarioWorld in the environment
-/// for reasons imposed by lifetimes/the borrow checker.
-pub trait ScenarioTxRunOnWorld {
-    type Returns;
-
-    fn run_on_world(self, world: &mut ScenarioWorld) -> Self::Returns;
-}
diff --git a/framework/scenario/src/facade/world_tx/scenario_env_deploy.rs b/framework/scenario/src/facade/world_tx/scenario_env_deploy.rs
index 103228c3e2..d9317a094c 100644
--- a/framework/scenario/src/facade/world_tx/scenario_env_deploy.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_env_deploy.rs
@@ -13,7 +13,7 @@ use multiversx_sc::{
 use crate::{
     api::StaticApi,
     scenario_model::{AddressValue, BytesValue, ScCallStep, ScDeployStep, TxResponse},
-    ScenarioEnvExec, ScenarioTxEnv, ScenarioTxRun, ScenarioTxRunOnWorld, ScenarioWorld,
+    ScenarioEnvExec, ScenarioTxEnv, ScenarioTxRun, ScenarioWorld,
 };
 
 use super::{scenario_env_util::*, RHListScenario, ScenarioTxEnvData};
diff --git a/framework/scenario/src/facade/world_tx/scenario_env_exec.rs b/framework/scenario/src/facade/world_tx/scenario_env_exec.rs
index 844bbf9c97..3758673006 100644
--- a/framework/scenario/src/facade/world_tx/scenario_env_exec.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_env_exec.rs
@@ -13,7 +13,7 @@ use multiversx_sc::{
 use crate::{
     api::StaticApi,
     scenario_model::{AddressValue, BytesValue, ScCallStep, ScDeployStep, TxResponse},
-    ScenarioTxEnv, ScenarioTxRun, ScenarioTxRunOnWorld, ScenarioWorld,
+    ScenarioTxEnv, ScenarioTxRun, ScenarioWorld,
 };
 
 use super::{scenario_env_util::*, RHListScenario, ScenarioTxEnvData};
diff --git a/framework/scenario/src/facade/world_tx/scenario_env_query.rs b/framework/scenario/src/facade/world_tx/scenario_env_query.rs
index f95f3cce33..e7d73ec729 100644
--- a/framework/scenario/src/facade/world_tx/scenario_env_query.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_env_query.rs
@@ -10,7 +10,7 @@ use multiversx_sc::{
 
 use crate::{
     api::StaticApi, scenario_model::TxResponse, RHListScenario, ScenarioTxEnv, ScenarioTxEnvData,
-    ScenarioTxRun, ScenarioTxRunOnWorld, ScenarioWorld,
+    ScenarioTxRun, ScenarioWorld,
 };
 
 use super::scenario_env_util::*;
diff --git a/framework/scenario/src/facade/world_tx/scenario_env_util.rs b/framework/scenario/src/facade/world_tx/scenario_env_util.rs
index e05a4de177..19776e9a0d 100644
--- a/framework/scenario/src/facade/world_tx/scenario_env_util.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_env_util.rs
@@ -10,11 +10,14 @@ use multiversx_sc::{
 
 use crate::{
     api::StaticApi,
-    scenario_model::{AddressValue, BytesValue, ScCallStep, ScDeployStep, ScQueryStep, TxResponse},
+    scenario_model::{
+        AddressValue, BigUintValue, BytesValue, ScCallStep, ScDeployStep, ScQueryStep,
+        TransferStep, TxResponse,
+    },
     RHListScenario, ScenarioEnvExec, ScenarioWorld,
 };
 
-pub(super) fn address_annotated<Env, Addr>(env: &Env, from: Addr) -> AddressValue
+pub fn address_annotated<Env, Addr>(env: &Env, from: Addr) -> AddressValue
 where
     Env: TxEnv,
     Addr: AnnotatedValue<Env, ManagedAddress<Env::Api>>,
@@ -26,7 +29,7 @@ where
     }
 }
 
-pub(super) fn code_annotated<Env, CodeValue>(env: &Env, code: Code<CodeValue>) -> BytesValue
+pub fn code_annotated<Env, CodeValue>(env: &Env, code: Code<CodeValue>) -> BytesValue
 where
     Env: TxEnv,
     CodeValue: TxCodeValue<Env>,
@@ -38,11 +41,11 @@ where
     }
 }
 
-pub(super) fn tx_to_sc_call_step<Env, From, To, Payment, Gas>(
+pub fn tx_to_sc_call_step<Env, From, To, Payment, Gas>(
     env: &Env,
     from: From,
     to: To,
-    _payment: Payment,
+    payment: Payment,
     _gas: Gas,
     data: FunctionCall<Env::Api>,
 ) -> ScCallStep
@@ -61,13 +64,18 @@ where
         step.tx.arguments.push(arg.to_vec().into());
     }
 
+    let full_payment_data = payment.into_full_payment_data();
+    if let Some(annotated_egld_payment) = full_payment_data.egld {
+        step.tx.egld_value = annotated_egld_payment.into();
+    }
+
     step
 }
 
-pub(super) fn tx_to_sc_deploy_step<Env, From, Payment, Gas, CodeValue>(
+pub fn tx_to_sc_deploy_step<Env, From, Payment, Gas, CodeValue>(
     env: &Env,
     from: From,
-    _payment: Payment,
+    payment: Payment,
     _gas: Gas,
     data: DeployCall<Env, Code<CodeValue>>,
 ) -> ScDeployStep
@@ -85,14 +93,15 @@ where
         step.tx.arguments.push(arg.to_vec().into());
     }
 
+    let full_payment_data = payment.into_full_payment_data();
+    if let Some(annotated_egld_payment) = full_payment_data.egld {
+        step.tx.egld_value = annotated_egld_payment.into();
+    }
+
     step
 }
 
-pub(super) fn tx_to_sc_query_step<Env, To>(
-    env: &Env,
-    to: To,
-    data: FunctionCall<Env::Api>,
-) -> ScQueryStep
+pub fn tx_to_sc_query_step<Env, To>(env: &Env, to: To, data: FunctionCall<Env::Api>) -> ScQueryStep
 where
     Env: TxEnv,
     To: TxToSpecified<Env>,
@@ -107,7 +116,33 @@ where
     step
 }
 
-pub(super) fn process_result<Env, RH>(
+pub fn tx_to_transfer_step<Env, From, To, Payment, Gas>(
+    env: &Env,
+    from: From,
+    to: To,
+    payment: Payment,
+    _gas: Gas,
+) -> TransferStep
+where
+    Env: TxEnv,
+    From: TxFromSpecified<Env>,
+    To: TxToSpecified<Env>,
+    Payment: TxPayment<Env>,
+    Gas: TxGas<Env>,
+{
+    let mut step = TransferStep::new()
+        .from(address_annotated(env, from))
+        .to(address_annotated(env, to));
+
+    let full_payment_data = payment.into_full_payment_data();
+    if let Some(annotated_egld_payment) = full_payment_data.egld {
+        step.tx.egld_value = annotated_egld_payment.into();
+    }
+
+    step
+}
+
+pub fn process_result<Env, RH>(
     response: Option<TxResponse>,
     result_handler: RH,
 ) -> <RH::ListReturns as NestedTupleFlatten>::Unpacked
diff --git a/framework/scenario/src/facade/world_tx/scenario_rh_list_item.rs b/framework/scenario/src/facade/world_tx/scenario_rh_list_item.rs
index 4de678b586..36440e0313 100644
--- a/framework/scenario/src/facade/world_tx/scenario_rh_list_item.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_rh_list_item.rs
@@ -1,7 +1,7 @@
 use multiversx_sc::{
     codec::{CodecFrom, TopDecodeMulti, TopEncodeMulti},
     types::{
-        ManagedAddress, RHList, RHListItem, ReturnsExact, ReturnsSimilar, TxEnv,
+        ManagedAddress, RHList, RHListItem, ReturnsExact, ReturnsNewAddress, ReturnsSimilar, TxEnv,
         WithResultNewAddress, WithResultSimilar,
     },
 };
@@ -63,6 +63,20 @@ where
     }
 }
 
+impl<Env, Original> RHListItemScenario<Env, Original> for ReturnsNewAddress
+where
+    Env: TxEnv,
+{
+    fn item_scenario_result(self, tx_response: &TxResponse) -> Self::Returns {
+        let new_address = tx_response
+            .new_deployed_address
+            .clone()
+            .expect("missing returned address");
+
+        new_address.into()
+    }
+}
+
 impl<Env, Original, F> RHListItemScenario<Env, Original> for WithResultNewAddress<Env, F>
 where
     Env: TxEnv,
diff --git a/framework/scenario/src/scenario/model/value/value_set_big_uint.rs b/framework/scenario/src/scenario/model/value/value_set_big_uint.rs
index c21c913851..003370509d 100644
--- a/framework/scenario/src/scenario/model/value/value_set_big_uint.rs
+++ b/framework/scenario/src/scenario/model/value/value_set_big_uint.rs
@@ -95,7 +95,7 @@ impl From<&BigUint> for BigUintValue {
 
 impl<M: ManagedTypeApi> From<crate::multiversx_sc::types::BigUint<M>> for BigUintValue {
     fn from(from: crate::multiversx_sc::types::BigUint<M>) -> Self {
-        let value = BigUint::from_bytes_be(from.to_bytes_be().as_slice());
+        let value = from.to_alloc();
         BigUintValue {
             original: ValueSubTree::Str(value.to_string()),
             value,
@@ -103,6 +103,17 @@ impl<M: ManagedTypeApi> From<crate::multiversx_sc::types::BigUint<M>> for BigUin
     }
 }
 
+impl<M: ManagedTypeApi> From<crate::multiversx_sc::types::AnnotatedEgldPayment<M>>
+    for BigUintValue
+{
+    fn from(from: crate::multiversx_sc::types::AnnotatedEgldPayment<M>) -> Self {
+        BigUintValue {
+            value: from.value.to_alloc(),
+            original: ValueSubTree::Str(from.annotation.to_string()),
+        }
+    }
+}
+
 impl From<&str> for BigUintValue {
     fn from(from: &str) -> Self {
         BigUintValue::interpret_from(from, &InterpreterContext::default())
diff --git a/framework/scenario/src/scenario/model/value/value_set_bytes.rs b/framework/scenario/src/scenario/model/value/value_set_bytes.rs
index 33fb896d01..eaed19cea0 100644
--- a/framework/scenario/src/scenario/model/value/value_set_bytes.rs
+++ b/framework/scenario/src/scenario/model/value/value_set_bytes.rs
@@ -1,3 +1,5 @@
+use multiversx_sc::types::{AnnotatedValue, ManagedBuffer, TxCodeValue, TxEnv};
+
 use crate::scenario_format::{
     interpret_trait::{InterpretableFrom, InterpreterContext, IntoRaw},
     serde_raw::ValueSubTree,
@@ -134,3 +136,33 @@ impl fmt::Display for BytesValue {
         self.original.fmt(f)
     }
 }
+
+impl<Env> AnnotatedValue<Env, ManagedBuffer<Env::Api>> for BytesValue
+where
+    Env: TxEnv,
+{
+    fn annotation(&self, _env: &Env) -> ManagedBuffer<<Env as TxEnv>::Api> {
+        self.original.to_concatenated_string().into()
+    }
+
+    fn into_value(self, _env: &Env) -> ManagedBuffer<Env::Api> {
+        self.value.into()
+    }
+}
+
+impl<Env> TxCodeValue<Env> for BytesValue where Env: TxEnv {}
+
+impl<Env> AnnotatedValue<Env, ManagedBuffer<Env::Api>> for &BytesValue
+where
+    Env: TxEnv,
+{
+    fn annotation(&self, _env: &Env) -> ManagedBuffer<<Env as TxEnv>::Api> {
+        self.original.to_concatenated_string().into()
+    }
+
+    fn into_value(self, _env: &Env) -> ManagedBuffer<Env::Api> {
+        self.value.clone().into()
+    }
+}
+
+impl<Env> TxCodeValue<Env> for &BytesValue where Env: TxEnv {}
diff --git a/framework/snippets/src/interactor.rs b/framework/snippets/src/interactor.rs
index 7034932d91..346d117f80 100644
--- a/framework/snippets/src/interactor.rs
+++ b/framework/snippets/src/interactor.rs
@@ -8,7 +8,11 @@ use multiversx_sdk::{
     data::{address::Address as ErdrsAddress, network_config::NetworkConfig},
     wallet::Wallet,
 };
-use std::{collections::HashMap, path::Path, time::Duration};
+use std::{
+    collections::HashMap,
+    path::{Path, PathBuf},
+    time::Duration,
+};
 
 use crate::Sender;
 
@@ -22,6 +26,8 @@ pub struct Interactor {
     pub(crate) waiting_time_ms: u64,
     pub pre_runners: ScenarioRunnerList,
     pub post_runners: ScenarioRunnerList,
+
+    pub current_dir: PathBuf,
 }
 
 impl Interactor {
@@ -35,6 +41,7 @@ impl Interactor {
             waiting_time_ms: 0,
             pre_runners: ScenarioRunnerList::empty(),
             post_runners: ScenarioRunnerList::empty(),
+            current_dir: PathBuf::default(),
         }
     }
 
diff --git a/framework/snippets/src/itx.rs b/framework/snippets/src/itx.rs
new file mode 100644
index 0000000000..dd34244999
--- /dev/null
+++ b/framework/snippets/src/itx.rs
@@ -0,0 +1,17 @@
+#![allow(unused)] // TEMP
+
+mod interactor_env;
+mod interactor_env_deploy;
+mod interactor_env_exec;
+mod interactor_env_query;
+mod interactor_env_transf;
+mod interactor_rh_list;
+mod interactor_rh_list_item;
+
+pub use interactor_env::*;
+pub use interactor_env_deploy::*;
+pub use interactor_env_exec::InteractorEnvExec;
+pub use interactor_env_query::InteractorEnvQuery;
+pub use interactor_env_transf::*;
+pub use interactor_rh_list::*;
+pub use interactor_rh_list_item::*;
diff --git a/framework/snippets/src/itx/interactor_env.rs b/framework/snippets/src/itx/interactor_env.rs
new file mode 100644
index 0000000000..521389a713
--- /dev/null
+++ b/framework/snippets/src/itx/interactor_env.rs
@@ -0,0 +1,24 @@
+use std::path::PathBuf;
+
+use multiversx_sc_scenario::{
+    api::StaticApi,
+    multiversx_sc::types::{AnnotatedValue, ManagedAddress, TxBaseWithEnv, TxEnv},
+    scenario_model::TxResponse,
+    ScenarioTxEnvData, ScenarioWorld,
+};
+
+use crate::Interactor;
+
+impl Interactor {
+    pub(crate) fn new_env_data(&self) -> ScenarioTxEnvData {
+        ScenarioTxEnvData {
+            context_path: self.current_dir.clone(),
+        }
+    }
+}
+
+pub trait InteractorPrepareAsync {
+    type Exec;
+
+    fn prepare_async(self) -> Self::Exec;
+}
diff --git a/framework/snippets/src/itx/interactor_env_deploy.rs b/framework/snippets/src/itx/interactor_env_deploy.rs
new file mode 100644
index 0000000000..48f679dd31
--- /dev/null
+++ b/framework/snippets/src/itx/interactor_env_deploy.rs
@@ -0,0 +1,136 @@
+use std::path::PathBuf;
+
+use multiversx_sc_scenario::{
+    api::StaticApi,
+    multiversx_sc::{
+        tuple_util::NestedTupleFlatten,
+        types::{
+            AnnotatedValue, Code, DeployCall, FunctionCall, ManagedAddress, ManagedBuffer,
+            RHListSync, Tx, TxBaseWithEnv, TxCodeSource, TxCodeSourceSpecified, TxCodeValue, TxEnv,
+            TxFromSpecified, TxGas, TxPayment, TxToSpecified,
+        },
+    },
+    scenario_env_util::*,
+    scenario_model::{AddressValue, BytesValue, ScCallStep, ScDeployStep, TxResponse},
+    RHListScenario, ScenarioEnvExec, ScenarioTxEnv, ScenarioTxEnvData, ScenarioTxRun,
+    ScenarioWorld,
+};
+
+use crate::{Interactor, InteractorPrepareAsync};
+
+use super::InteractorEnvExec;
+
+pub struct InteractorDeployStep<'w, RH>
+where
+    RH: RHListScenario<InteractorEnvExec<'w>>,
+    RH::ListReturns: NestedTupleFlatten,
+{
+    world: &'w mut Interactor,
+    sc_deploy_step: ScDeployStep,
+    result_handler: RH,
+}
+
+impl<'w, From, Payment, Gas, CodeValue, RH> InteractorPrepareAsync
+    for Tx<
+        InteractorEnvExec<'w>,
+        From,
+        (),
+        Payment,
+        Gas,
+        DeployCall<InteractorEnvExec<'w>, Code<CodeValue>>,
+        RH,
+    >
+where
+    From: TxFromSpecified<InteractorEnvExec<'w>>,
+    Payment: TxPayment<InteractorEnvExec<'w>>,
+    Gas: TxGas<InteractorEnvExec<'w>>,
+    CodeValue: TxCodeValue<InteractorEnvExec<'w>>,
+    RH: RHListScenario<InteractorEnvExec<'w>>,
+    RH::ListReturns: NestedTupleFlatten,
+    <RH::ListReturns as NestedTupleFlatten>::Unpacked: Send,
+{
+    type Exec = InteractorDeployStep<'w, RH>;
+
+    fn prepare_async(self) -> Self::Exec {
+        let mut sc_deploy_step =
+            tx_to_sc_deploy_step(&self.env, self.from, self.payment, self.gas, self.data);
+        InteractorDeployStep {
+            world: self.env.world,
+            sc_deploy_step: sc_deploy_step,
+            result_handler: self.result_handler,
+        }
+    }
+}
+
+impl<'w, RH> InteractorDeployStep<'w, RH>
+where
+    RH: RHListScenario<InteractorEnvExec<'w>>,
+    RH::ListReturns: NestedTupleFlatten,
+{
+    pub async fn run(self) -> <RH::ListReturns as NestedTupleFlatten>::Unpacked {
+        let mut sc_deploy_step = self.sc_deploy_step;
+        self.world.sc_deploy(&mut sc_deploy_step).await;
+        process_result(sc_deploy_step.response, self.result_handler)
+    }
+}
+
+impl Interactor {
+    pub async fn chain_deploy<From, Payment, Gas, CodeValue, RH, F>(&mut self, f: F) -> &mut Self
+    where
+        From: TxFromSpecified<ScenarioTxEnvData>,
+        Payment: TxPayment<ScenarioTxEnvData>,
+        Gas: TxGas<ScenarioTxEnvData>,
+        CodeValue: TxCodeValue<ScenarioTxEnvData>,
+        RH: RHListScenario<ScenarioTxEnvData, ListReturns = ()>,
+        F: FnOnce(
+            TxBaseWithEnv<ScenarioTxEnvData>,
+        ) -> Tx<
+            ScenarioTxEnvData,
+            From,
+            (),
+            Payment,
+            Gas,
+            DeployCall<ScenarioTxEnvData, Code<CodeValue>>,
+            RH,
+        >,
+    {
+        let env = self.new_env_data();
+        let tx_base = TxBaseWithEnv::new_with_env(env);
+        let tx = f(tx_base);
+        let mut step = tx_to_sc_deploy_step(&tx.env, tx.from, tx.payment, tx.gas, tx.data);
+        self.sc_deploy(&mut step).await;
+        process_result(step.response, tx.result_handler);
+        self
+    }
+
+    pub async fn run_deploy<From, Payment, Gas, CodeValue, RH, F>(
+        &mut self,
+        f: F,
+    ) -> <RH::ListReturns as NestedTupleFlatten>::Unpacked
+    where
+        From: TxFromSpecified<ScenarioTxEnvData>,
+        Payment: TxPayment<ScenarioTxEnvData>,
+        Gas: TxGas<ScenarioTxEnvData>,
+        CodeValue: TxCodeValue<ScenarioTxEnvData>,
+        RH: RHListScenario<ScenarioTxEnvData>,
+        RH::ListReturns: NestedTupleFlatten,
+        F: FnOnce(
+            TxBaseWithEnv<ScenarioTxEnvData>,
+        ) -> Tx<
+            ScenarioTxEnvData,
+            From,
+            (),
+            Payment,
+            Gas,
+            DeployCall<ScenarioTxEnvData, Code<CodeValue>>,
+            RH,
+        >,
+    {
+        let env = self.new_env_data();
+        let tx_base = TxBaseWithEnv::new_with_env(env);
+        let tx = f(tx_base);
+        let mut step = tx_to_sc_deploy_step(&tx.env, tx.from, tx.payment, tx.gas, tx.data);
+        self.sc_deploy(&mut step).await;
+        process_result(step.response, tx.result_handler)
+    }
+}
diff --git a/framework/snippets/src/itx/interactor_env_exec.rs b/framework/snippets/src/itx/interactor_env_exec.rs
new file mode 100644
index 0000000000..dc5269e6e9
--- /dev/null
+++ b/framework/snippets/src/itx/interactor_env_exec.rs
@@ -0,0 +1,122 @@
+use std::path::PathBuf;
+
+use multiversx_sc_scenario::{
+    api::StaticApi,
+    multiversx_sc::{
+        tuple_util::NestedTupleFlatten,
+        types::{
+            AnnotatedValue, Code, DeployCall, FunctionCall, ManagedAddress, ManagedBuffer,
+            RHListSync, Tx, TxBaseWithEnv, TxCodeSource, TxCodeSourceSpecified, TxCodeValue, TxEnv,
+            TxFromSpecified, TxGas, TxPayment, TxToSpecified,
+        },
+    },
+    scenario_env_util::*,
+    scenario_model::{AddressValue, BytesValue, ScCallStep, ScDeployStep, TxResponse},
+    RHListScenario, ScenarioTxEnv, ScenarioTxEnvData, ScenarioTxRun, ScenarioWorld,
+};
+
+use crate::{Interactor, InteractorPrepareAsync};
+
+/// Environment for executing transactions.
+pub struct InteractorEnvExec<'w> {
+    pub world: &'w mut Interactor,
+    pub data: ScenarioTxEnvData,
+}
+
+impl<'w> TxEnv for InteractorEnvExec<'w> {
+    type Api = StaticApi;
+
+    fn resolve_sender_address(&self) -> ManagedAddress<Self::Api> {
+        panic!("Explicit sender address expected")
+    }
+
+    fn default_gas(&self) -> u64 {
+        self.data.default_gas()
+    }
+}
+
+impl<'w> ScenarioTxEnv for InteractorEnvExec<'w> {
+    fn env_data(&self) -> &ScenarioTxEnvData {
+        &self.data
+    }
+}
+
+pub struct InteractorCallStep<'w, RH>
+where
+    RH: RHListScenario<InteractorEnvExec<'w>>,
+    RH::ListReturns: NestedTupleFlatten,
+{
+    world: &'w mut Interactor,
+    sc_call_step: ScCallStep,
+    result_handler: RH,
+}
+
+impl<'w, From, To, Payment, Gas, RH> InteractorPrepareAsync
+    for Tx<InteractorEnvExec<'w>, From, To, Payment, Gas, FunctionCall<StaticApi>, RH>
+where
+    From: TxFromSpecified<InteractorEnvExec<'w>>,
+    To: TxToSpecified<InteractorEnvExec<'w>>,
+    Payment: TxPayment<InteractorEnvExec<'w>>,
+    Gas: TxGas<InteractorEnvExec<'w>>,
+    RH: RHListScenario<InteractorEnvExec<'w>>,
+    RH::ListReturns: NestedTupleFlatten,
+{
+    type Exec = InteractorCallStep<'w, RH>;
+
+    fn prepare_async(self) -> Self::Exec {
+        let mut sc_call_step = tx_to_sc_call_step(
+            &self.env,
+            self.from,
+            self.to,
+            self.payment,
+            self.gas,
+            self.data,
+        );
+        InteractorCallStep {
+            world: self.env.world,
+            sc_call_step,
+            result_handler: self.result_handler,
+        }
+    }
+}
+
+impl<'w, RH> InteractorCallStep<'w, RH>
+where
+    RH: RHListScenario<InteractorEnvExec<'w>>,
+    RH::ListReturns: NestedTupleFlatten,
+{
+    pub async fn run(self) -> <RH::ListReturns as NestedTupleFlatten>::Unpacked {
+        let mut sc_call_step = self.sc_call_step;
+        self.world.sc_call(&mut sc_call_step).await;
+        process_result(sc_call_step.response, self.result_handler)
+    }
+}
+
+impl Interactor {
+    pub fn tx(&mut self) -> TxBaseWithEnv<InteractorEnvExec<'_>> {
+        let data = self.new_env_data();
+        let env = InteractorEnvExec { world: self, data };
+        Tx::new_with_env(env)
+    }
+
+    pub async fn chain_call<From, To, Payment, Gas, RH, F>(&mut self, f: F) -> &mut Self
+    where
+        From: TxFromSpecified<ScenarioTxEnvData>,
+        To: TxToSpecified<ScenarioTxEnvData>,
+        Payment: TxPayment<ScenarioTxEnvData>,
+        Gas: TxGas<ScenarioTxEnvData>,
+        RH: RHListScenario<ScenarioTxEnvData, ListReturns = ()>,
+        F: FnOnce(
+            TxBaseWithEnv<ScenarioTxEnvData>,
+        )
+            -> Tx<ScenarioTxEnvData, From, To, Payment, Gas, FunctionCall<StaticApi>, RH>,
+    {
+        let env = self.new_env_data();
+        let tx_base = TxBaseWithEnv::new_with_env(env);
+        let tx = f(tx_base);
+        let mut step = tx_to_sc_call_step(&tx.env, tx.from, tx.to, tx.payment, tx.gas, tx.data);
+        self.sc_call(&mut step).await;
+        process_result(step.response, tx.result_handler);
+        self
+    }
+}
diff --git a/framework/snippets/src/itx/interactor_env_query.rs b/framework/snippets/src/itx/interactor_env_query.rs
new file mode 100644
index 0000000000..20e61e571f
--- /dev/null
+++ b/framework/snippets/src/itx/interactor_env_query.rs
@@ -0,0 +1,106 @@
+use std::path::PathBuf;
+
+use multiversx_sc_scenario::{
+    api::StaticApi,
+    multiversx_sc::{
+        tuple_util::NestedTupleFlatten,
+        types::{
+            AnnotatedValue, FunctionCall, ManagedAddress, Tx, TxBaseWithEnv, TxEnv,
+            TxFromSpecified, TxGas, TxPayment, TxToSpecified,
+        },
+    },
+    scenario_env_util::*,
+    scenario_model::{ScQueryStep, TxResponse},
+    RHListScenario, ScenarioTxEnv, ScenarioTxEnvData, ScenarioTxRun, ScenarioWorld,
+};
+
+use crate::{Interactor, InteractorPrepareAsync};
+
+pub struct InteractorEnvQuery<'w> {
+    pub world: &'w mut Interactor,
+    pub data: ScenarioTxEnvData,
+}
+
+impl<'w> TxEnv for InteractorEnvQuery<'w> {
+    type Api = StaticApi;
+
+    fn resolve_sender_address(&self) -> ManagedAddress<Self::Api> {
+        panic!("Explicit sender address expected")
+    }
+
+    fn default_gas(&self) -> u64 {
+        self.data.default_gas()
+    }
+}
+
+impl<'w> ScenarioTxEnv for InteractorEnvQuery<'w> {
+    fn env_data(&self) -> &ScenarioTxEnvData {
+        &self.data
+    }
+}
+
+pub struct InteractorQueryStep<'w, RH>
+where
+    RH: RHListScenario<InteractorEnvQuery<'w>>,
+    RH::ListReturns: NestedTupleFlatten,
+{
+    world: &'w mut Interactor,
+    sc_query_step: ScQueryStep,
+    result_handler: RH,
+}
+
+impl<'w, To, RH> InteractorPrepareAsync
+    for Tx<InteractorEnvQuery<'w>, (), To, (), (), FunctionCall<StaticApi>, RH>
+where
+    To: TxToSpecified<InteractorEnvQuery<'w>>,
+    RH: RHListScenario<InteractorEnvQuery<'w>>,
+    RH::ListReturns: NestedTupleFlatten,
+{
+    type Exec = InteractorQueryStep<'w, RH>;
+
+    fn prepare_async(self) -> Self::Exec {
+        let mut sc_query_step = tx_to_sc_query_step(&self.env, self.to, self.data);
+        InteractorQueryStep {
+            world: self.env.world,
+            sc_query_step,
+            result_handler: self.result_handler,
+        }
+    }
+}
+
+impl<'w, RH> InteractorQueryStep<'w, RH>
+where
+    RH: RHListScenario<InteractorEnvQuery<'w>>,
+    RH::ListReturns: NestedTupleFlatten,
+{
+    pub async fn run(self) -> <RH::ListReturns as NestedTupleFlatten>::Unpacked {
+        let mut sc_call_step = self.sc_query_step;
+        self.world.sc_query(&mut sc_call_step).await;
+        process_result(sc_call_step.response, self.result_handler)
+    }
+}
+
+impl Interactor {
+    pub fn query(&mut self) -> TxBaseWithEnv<InteractorEnvQuery<'_>> {
+        let data = self.new_env_data();
+        let env = InteractorEnvQuery { world: self, data };
+        Tx::new_with_env(env)
+    }
+
+    pub async fn chain_query<To, RH, F>(&mut self, f: F) -> &mut Self
+    where
+        To: TxToSpecified<ScenarioTxEnvData>,
+        RH: RHListScenario<ScenarioTxEnvData, ListReturns = ()>,
+        F: FnOnce(
+            TxBaseWithEnv<ScenarioTxEnvData>,
+        ) -> Tx<ScenarioTxEnvData, (), To, (), (), FunctionCall<StaticApi>, RH>,
+    {
+        let env = self.new_env_data();
+        let tx_base = TxBaseWithEnv::new_with_env(env);
+        let tx = f(tx_base);
+        let mut step = tx_to_sc_query_step(&tx.env, tx.to, tx.data);
+        self.sc_query(&mut step).await;
+        process_result(step.response, tx.result_handler);
+        self
+    }
+}
diff --git a/framework/snippets/src/itx/interactor_env_transf.rs b/framework/snippets/src/itx/interactor_env_transf.rs
new file mode 100644
index 0000000000..993b2b04d6
--- /dev/null
+++ b/framework/snippets/src/itx/interactor_env_transf.rs
@@ -0,0 +1,51 @@
+use std::path::PathBuf;
+
+use multiversx_sc_scenario::{
+    api::StaticApi,
+    multiversx_sc::{
+        tuple_util::NestedTupleFlatten,
+        types::{
+            AnnotatedValue, Code, DeployCall, FunctionCall, ManagedAddress, ManagedBuffer,
+            RHListSync, Tx, TxBaseWithEnv, TxCodeSource, TxCodeSourceSpecified, TxCodeValue, TxEnv,
+            TxFromSpecified, TxGas, TxPayment, TxToSpecified,
+        },
+    },
+    scenario_env_util::*,
+    scenario_model::{
+        AddressValue, BytesValue, ScCallStep, ScDeployStep, TransferStep, TxResponse,
+    },
+    RHListScenario, ScenarioTxEnv, ScenarioTxEnvData, ScenarioTxRun, ScenarioWorld,
+};
+
+use crate::{Interactor, InteractorEnvExec, InteractorPrepareAsync};
+
+pub struct InteractorTransferStep<'w> {
+    world: &'w mut Interactor,
+    step: TransferStep,
+}
+
+impl<'w, From, To, Payment, Gas> InteractorPrepareAsync
+    for Tx<InteractorEnvExec<'w>, From, To, Payment, Gas, (), ()>
+where
+    From: TxFromSpecified<InteractorEnvExec<'w>>,
+    To: TxToSpecified<InteractorEnvExec<'w>>,
+    Payment: TxPayment<InteractorEnvExec<'w>>,
+    Gas: TxGas<InteractorEnvExec<'w>>,
+{
+    type Exec = InteractorTransferStep<'w>;
+
+    fn prepare_async(self) -> Self::Exec {
+        let mut sc_call_step =
+            tx_to_transfer_step(&self.env, self.from, self.to, self.payment, self.gas);
+        InteractorTransferStep {
+            world: self.env.world,
+            step: sc_call_step,
+        }
+    }
+}
+
+impl<'w> InteractorTransferStep<'w> {
+    pub async fn run(self) {
+        self.world.transfer(self.step).await;
+    }
+}
diff --git a/framework/snippets/src/itx/interactor_rh_list.rs b/framework/snippets/src/itx/interactor_rh_list.rs
new file mode 100644
index 0000000000..e48c94dc5f
--- /dev/null
+++ b/framework/snippets/src/itx/interactor_rh_list.rs
@@ -0,0 +1,51 @@
+use multiversx_sc_scenario::{
+    multiversx_sc::types::{ConsNoRet, ConsRet, OriginalResultMarker, RHList, RHListItem, TxEnv},
+    scenario_model::TxResponse,
+    RHListItemScenario,
+};
+
+pub trait RHListScenario<Env>: RHList<Env>
+where
+    Env: TxEnv,
+{
+    fn item_scenario_result(self, tx_response: &TxResponse) -> Self::ListReturns;
+}
+
+impl<Env> RHListScenario<Env> for ()
+where
+    Env: TxEnv,
+{
+    fn item_scenario_result(self, tx_response: &TxResponse) -> Self::ListReturns {}
+}
+
+impl<Env, O> RHListScenario<Env> for OriginalResultMarker<O>
+where
+    Env: TxEnv,
+{
+    fn item_scenario_result(self, tx_response: &TxResponse) -> Self::ListReturns {}
+}
+
+impl<Env, Head, Tail> RHListScenario<Env> for ConsRet<Env, Head, Tail>
+where
+    Env: TxEnv,
+    Head: RHListItemScenario<Env, Tail::OriginalResult>,
+    Tail: RHListScenario<Env>,
+{
+    fn item_scenario_result(self, tx_response: &TxResponse) -> Self::ListReturns {
+        let head_result = self.head.item_scenario_result(tx_response);
+        let tail_result = self.tail.item_scenario_result(tx_response);
+        (head_result, tail_result)
+    }
+}
+
+impl<Env, Head, Tail> RHListScenario<Env> for ConsNoRet<Env, Head, Tail>
+where
+    Env: TxEnv,
+    Head: RHListItemScenario<Env, Tail::OriginalResult, Returns = ()>,
+    Tail: RHListScenario<Env>,
+{
+    fn item_scenario_result(self, tx_response: &TxResponse) -> Self::ListReturns {
+        self.head.item_scenario_result(tx_response);
+        self.tail.item_scenario_result(tx_response)
+    }
+}
diff --git a/framework/snippets/src/itx/interactor_rh_list_item.rs b/framework/snippets/src/itx/interactor_rh_list_item.rs
new file mode 100644
index 0000000000..7a6063fbc6
--- /dev/null
+++ b/framework/snippets/src/itx/interactor_rh_list_item.rs
@@ -0,0 +1,76 @@
+use multiversx_sc_scenario::{
+    api::StaticApi,
+    multiversx_sc::{
+        codec::{CodecFrom, TopDecodeMulti, TopEncodeMulti},
+        types::{
+            ManagedAddress, RHList, RHListItem, ReturnsExact, ReturnsSimilar, TxEnv,
+            WithResultNewAddress, WithResultSimilar,
+        },
+    },
+    scenario_model::{TxResponse, TypedResponse},
+};
+
+pub trait RHListItemScenario<Env, Original>: RHListItem<Env, Original>
+where
+    Env: TxEnv,
+{
+    fn item_scenario_result(self, tx_response: &TxResponse) -> Self::Returns;
+}
+
+impl<Env, Original> RHListItemScenario<Env, Original> for ReturnsExact
+where
+    Env: TxEnv,
+    Original: TopDecodeMulti,
+{
+    fn item_scenario_result(self, tx_response: &TxResponse) -> Self::Returns {
+        let response = TypedResponse::<Original>::from_raw(tx_response);
+        response
+            .result
+            .expect("ReturnsExact expects that transaction is successful")
+    }
+}
+
+impl<Env, Original, T> RHListItemScenario<Env, Original> for ReturnsSimilar<T>
+where
+    Env: TxEnv,
+    Original: TopEncodeMulti,
+    T: CodecFrom<Original>,
+{
+    fn item_scenario_result(self, tx_response: &TxResponse) -> Self::Returns {
+        let response = TypedResponse::<T>::from_raw(tx_response);
+        response
+            .result
+            .expect("ReturnsSimilar expects that transaction is successful")
+    }
+}
+
+impl<Env, Original, T, F> RHListItemScenario<Env, Original> for WithResultSimilar<T, F>
+where
+    Env: TxEnv,
+    Original: TopEncodeMulti,
+    T: CodecFrom<Original>,
+    F: FnOnce(T),
+{
+    fn item_scenario_result(self, tx_response: &TxResponse) -> Self::Returns {
+        let response = TypedResponse::<T>::from_raw(tx_response);
+        let value = response
+            .result
+            .expect("ReturnsExact expects that transaction is successful");
+        (self.f)(value);
+    }
+}
+
+impl<Env, Original, F> RHListItemScenario<Env, Original> for WithResultNewAddress<Env, F>
+where
+    Env: TxEnv,
+    F: FnOnce(&ManagedAddress<Env::Api>),
+{
+    fn item_scenario_result(self, tx_response: &TxResponse) -> Self::Returns {
+        let new_address = tx_response
+            .new_deployed_address
+            .clone()
+            .expect("missing returned address");
+
+        (self.f)(&ManagedAddress::from_address(&new_address));
+    }
+}
diff --git a/framework/snippets/src/lib.rs b/framework/snippets/src/lib.rs
index 2081c11a58..9bf2c07e33 100644
--- a/framework/snippets/src/lib.rs
+++ b/framework/snippets/src/lib.rs
@@ -10,6 +10,7 @@ mod interactor_sc_transfer;
 mod interactor_sender;
 mod interactor_tx_spec;
 mod interactor_vm_query;
+mod itx;
 mod step_buffer;
 
 pub use env_logger;
@@ -18,6 +19,7 @@ pub use interactor::*;
 pub use interactor_dns::*;
 pub use interactor_sender::*;
 pub use interactor_tx_spec::*;
+pub use itx::*;
 pub use log;
 pub use multiversx_sc_scenario::{self, multiversx_sc};
 pub use multiversx_sdk as erdrs; // TODO: remove

From fe57e7c40d948092faab832e42788d0a73ca1163 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 20 Mar 2024 16:04:32 +0200
Subject: [PATCH 0478/1254] cleanup

---
 framework/base/src/types/interaction/annotated.rs   | 2 +-
 framework/base/src/types/interaction/tx_from.rs     | 2 +-
 framework/base/src/types/interaction/tx_to.rs       | 2 +-
 framework/snippets/src/itx/interactor_env_deploy.rs | 3 +--
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/framework/base/src/types/interaction/annotated.rs b/framework/base/src/types/interaction/annotated.rs
index 247b47b206..d190f65631 100644
--- a/framework/base/src/types/interaction/annotated.rs
+++ b/framework/base/src/types/interaction/annotated.rs
@@ -1,4 +1,4 @@
-use crate::types::{Address, ManagedAddress, ManagedBuffer};
+use crate::types::{heap::Address, ManagedAddress, ManagedBuffer};
 
 use super::TxEnv;
 
diff --git a/framework/base/src/types/interaction/tx_from.rs b/framework/base/src/types/interaction/tx_from.rs
index 0ced9e75c8..039cb2c34c 100644
--- a/framework/base/src/types/interaction/tx_from.rs
+++ b/framework/base/src/types/interaction/tx_from.rs
@@ -1,4 +1,4 @@
-use crate::types::{Address, ManagedAddress};
+use crate::types::{heap::Address, ManagedAddress};
 
 use super::{AnnotatedValue, TxEnv};
 
diff --git a/framework/base/src/types/interaction/tx_to.rs b/framework/base/src/types/interaction/tx_to.rs
index 2a32ac576f..984587a6ed 100644
--- a/framework/base/src/types/interaction/tx_to.rs
+++ b/framework/base/src/types/interaction/tx_to.rs
@@ -1,4 +1,4 @@
-use crate::types::{Address, ManagedAddress};
+use crate::types::{heap::Address, ManagedAddress};
 
 use super::{AnnotatedValue, TxEnv};
 
diff --git a/framework/snippets/src/itx/interactor_env_deploy.rs b/framework/snippets/src/itx/interactor_env_deploy.rs
index 48f679dd31..ea11ecc338 100644
--- a/framework/snippets/src/itx/interactor_env_deploy.rs
+++ b/framework/snippets/src/itx/interactor_env_deploy.rs
@@ -47,7 +47,6 @@ where
     CodeValue: TxCodeValue<InteractorEnvExec<'w>>,
     RH: RHListScenario<InteractorEnvExec<'w>>,
     RH::ListReturns: NestedTupleFlatten,
-    <RH::ListReturns as NestedTupleFlatten>::Unpacked: Send,
 {
     type Exec = InteractorDeployStep<'w, RH>;
 
@@ -56,7 +55,7 @@ where
             tx_to_sc_deploy_step(&self.env, self.from, self.payment, self.gas, self.data);
         InteractorDeployStep {
             world: self.env.world,
-            sc_deploy_step: sc_deploy_step,
+            sc_deploy_step,
             result_handler: self.result_handler,
         }
     }

From 5ea579ab4ab72f88e0c709062023f040990a16a1 Mon Sep 17 00:00:00 2001
From: Laurentiu Ciobanu <laurentiu.ciobanu@multiversx.com>
Date: Wed, 20 Mar 2024 18:04:45 +0200
Subject: [PATCH 0479/1254] use sc-meta test-coverage

---
 .github/workflows/actions.yml                 |  33 +----
 .../scenarios/stress_submit_test.scen.json    | 100 +++++++-------
 .../meta/src/cli_args/cli_args_standalone.rs  |  34 +++--
 framework/meta/src/cmd/standalone.rs          |   8 +-
 .../meta/src/cmd/standalone/test_coverage.rs  |  27 ++++
 .../src/cmd/standalone/test_coverage/cargo.rs | 103 ++++++++++++++
 .../src/cmd/standalone/test_coverage/error.rs |  34 +++++
 .../cmd/standalone/test_coverage/llvm_cov.rs  | 128 ++++++++++++++++++
 .../render.rs                                 |   0
 .../src/cmd/standalone/test_coverage/run.rs   |  61 +++++++++
 .../src/cmd/standalone/test_coverage/util.rs  |  56 ++++++++
 .../cmd/standalone/test_coverage_render.rs    |  46 -------
 .../standalone/test_coverage_render/cargo.rs  |  20 ---
 .../standalone/test_coverage_render/error.rs  |  28 ----
 .../test_coverage_render/llvm_cov.rs          |  45 ------
 15 files changed, 487 insertions(+), 236 deletions(-)
 create mode 100644 framework/meta/src/cmd/standalone/test_coverage.rs
 create mode 100644 framework/meta/src/cmd/standalone/test_coverage/cargo.rs
 create mode 100644 framework/meta/src/cmd/standalone/test_coverage/error.rs
 create mode 100644 framework/meta/src/cmd/standalone/test_coverage/llvm_cov.rs
 rename framework/meta/src/cmd/standalone/{test_coverage_render => test_coverage}/render.rs (100%)
 create mode 100644 framework/meta/src/cmd/standalone/test_coverage/run.rs
 create mode 100644 framework/meta/src/cmd/standalone/test_coverage/util.rs
 delete mode 100644 framework/meta/src/cmd/standalone/test_coverage_render.rs
 delete mode 100644 framework/meta/src/cmd/standalone/test_coverage_render/cargo.rs
 delete mode 100644 framework/meta/src/cmd/standalone/test_coverage_render/error.rs
 delete mode 100644 framework/meta/src/cmd/standalone/test_coverage_render/llvm_cov.rs

diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
index 024e737f08..d126600160 100644
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -137,45 +137,16 @@ jobs:
 
           echo $(dirname $(find ~/.rustup -name llvm-cov))
 
-          # which llvm-cov
-          # which llvm-profdata
-
       - name: Run tests and generate report
         env:
           RUSTFLAGS: ""
         run: |
-          RUSTFLAGS="-C instrument-coverage" \
-            cargo test --tests
-          
-          PROFRAW_FILES=$(find . -name "default_*.profraw")
-          llvm-profdata merge -sparse $PROFRAW_FILES -o tests.profdata
-          find . -name "default_*.profraw" -delete
-          
-          llvm-cov export \
-          $( \
-            for file in \
-          $( \
-            RUSTFLAGS="-C instrument-coverage" \
-              cargo test --tests --no-run --message-format=json \
-                | jq -r "select(.profile.test == true) | .filenames[]" \
-                | grep -v dSYM - \
-            ); \
-          do \
-            printf "%s %s " -object $file; \
-            done \
-          ) \
-            --ignore-filename-regex='/.cargo/registry' \
-            --ignore-filename-regex='rustc/' \
+          cargo run --bin sc-meta test-coverage \
             --ignore-filename-regex='meta/src' \
             --ignore-filename-regex='wasm-adapter' \
             --ignore-filename-regex='benchmarks/' \
             --ignore-filename-regex='tests/' \
-            --instr-profile=tests.profdata --summary-only --format=text > tests.coverage
-          
-          rm ./tests.profdata
-          
-          cargo run --bin sc-meta test-coverage-render --input ./tests.coverage --output ./coverage.md
-          rm ./tests.coverage
+            --output ./coverage.md
 
       - name: Upload the report
         uses: actions/upload-artifact@v3
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 6542b59c39..3bfa543ab0 100644
--- a/contracts/core/price-aggregator/scenarios/stress_submit_test.scen.json
+++ b/contracts/core/price-aggregator/scenarios/stress_submit_test.scen.json
@@ -1133,7 +1133,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x5f",
-                    "0x3beec6f9cf5130ed",
+                    "0xe799ca60351b896c",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1154,7 +1154,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x50d924566a98aec8",
+                    "0x716cd8945fc70b18",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1175,7 +1175,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x097b928bb2d85516",
+                    "0xe1a2287391e5624b",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1196,7 +1196,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x765c960a5c3c6b95",
+                    "0xba073d189ad09a2c",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1217,7 +1217,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xf7426f44c20f404c",
+                    "0xff00ce8c0444abdd",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1238,7 +1238,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xa5c69769ba606c2b",
+                    "0xde7637de9f0f868c",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1259,7 +1259,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xe8f77e933d1f2517",
+                    "0xac01126106b01960",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1280,7 +1280,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x94fba404681c1183",
+                    "0xa5ab55cf028f836d",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1301,7 +1301,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xdc506f08b25d3b71",
+                    "0x953c8fd0d4474074",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1322,7 +1322,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xf5b0acb8ddff3752",
+                    "0xa65e64a9aa0802a6",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1343,7 +1343,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x39a7d356f768ea5e",
+                    "0xa6bb40b782efcd03",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1364,7 +1364,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xaf145a7f797a48a1",
+                    "0x97484e0f98100c9a",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1385,7 +1385,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xb18143fe76eef718",
+                    "0x65ba697509c0a86f",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1406,7 +1406,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x6f64a1ddec18e577",
+                    "0x111061b1a3ea38b8",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1427,7 +1427,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x87ffce2a932db3d4",
+                    "0xec876fe889ad08ff",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1448,7 +1448,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xe6642c7265c738c1",
+                    "0xb605dd34611b3dc0",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1469,7 +1469,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xd6079c55087a67d5",
+                    "0x7602960448fff2ac",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1490,7 +1490,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x90f7bb0d816fb87d",
+                    "0x140f137aa7a87a94",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1511,7 +1511,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xa0ccc6f5f8c73ff2",
+                    "0xd557396414be3f15",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1532,7 +1532,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x258d38a35ccfd93d",
+                    "0x325769f53bfb87a2",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1553,7 +1553,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x903f62b19408019d",
+                    "0x4deee148cfa1854f",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1574,7 +1574,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xc319aab79b2f512e",
+                    "0x40bb80f3ae334d7e",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1595,7 +1595,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x4b41176cd679e194",
+                    "0xfc1a57c0b4f030e8",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1616,7 +1616,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xaf3c4ad7cdcac230",
+                    "0xcd1034fe7c1feae5",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1637,7 +1637,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x2a8c4a82dfb68f13",
+                    "0x7b6560eadfaf3cca",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1658,7 +1658,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x358e92c93a69a2f9",
+                    "0xed0bece4a403eae3",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1679,7 +1679,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xb4bd55d9eebad664",
+                    "0xae251605c03d8082",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1700,7 +1700,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x9061fc2440f4db51",
+                    "0x66e42ed8550f773b",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1721,7 +1721,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xc8fde2d627d1b95a",
+                    "0xccb3836eb7cae53c",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1742,7 +1742,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xacede2c42f9bc928",
+                    "0xad95fe9b4bbf2d4d",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1763,7 +1763,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xb0a4ecb8d46cfe86",
+                    "0x2efcb72f7ca0545f",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1784,7 +1784,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xa8d8ee43a5c4ade8",
+                    "0x7089de0311ceaa83",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1805,7 +1805,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xe20bb0819b83cbb6",
+                    "0x7112fc625005421b",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1826,7 +1826,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xb5566ca4a8a6da5b",
+                    "0x77c398c91e818621",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1847,7 +1847,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x30b4e318dbf9c0a1",
+                    "0x260a0fc02a2d124b",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1868,7 +1868,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x34cd5592ee7ab5f0",
+                    "0x3aa99face36d47d0",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1889,7 +1889,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x4908da8f754f9e29",
+                    "0xbe3b8f275886e44f",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1910,7 +1910,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x460da40079bef875",
+                    "0xb86991c34a794564",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1931,7 +1931,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x6eb6dd52e24341b6",
+                    "0xe3aad9f5ef417ac7",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1952,7 +1952,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xa06bb000b0901e98",
+                    "0x68d9d244742a63ea",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1973,7 +1973,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x4f83b3dd7f1dd80e",
+                    "0x6f99d232bca2e67d",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1994,7 +1994,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x169e4556e8cd5271",
+                    "0x268183cfacad3372",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -2015,7 +2015,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xa45b9cfe7527301b",
+                    "0x217fe27c5b1f3a59",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -2036,7 +2036,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xe3a28965ea6a3ae4",
+                    "0xde4949fcb07b230a",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -2057,7 +2057,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x4efa7be66acf5ded",
+                    "0x755b157b4fa653ba",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -2078,7 +2078,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x5f75311f8cd29ea9",
+                    "0xedef13da2591c4c2",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -2099,7 +2099,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xfc7c1268abc1d8e3",
+                    "0x6e872c7160cfa5e1",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -2120,7 +2120,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xd24cc52d844c6a40",
+                    "0xe97d0cbb0d5016a4",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -2141,7 +2141,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x804fc08cd1c73c42",
+                    "0x4d2d2ed6700c8419",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -2162,7 +2162,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x093077783f01d496",
+                    "0xd4a84da6b88e4737",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
diff --git a/framework/meta/src/cli_args/cli_args_standalone.rs b/framework/meta/src/cli_args/cli_args_standalone.rs
index a16f12ecdc..2f6c435e9c 100644
--- a/framework/meta/src/cli_args/cli_args_standalone.rs
+++ b/framework/meta/src/cli_args/cli_args_standalone.rs
@@ -1,6 +1,6 @@
 use std::path::PathBuf;
 
-use clap::{ArgAction, Args, Parser, Subcommand};
+use clap::{ArgAction, Args, Parser, Subcommand, ValueEnum};
 
 use super::{CliArgsToRaw, ContractCliAction};
 
@@ -66,11 +66,8 @@ pub enum StandaloneCliAction {
     #[command(name = "test", about = "Runs cargo test")]
     Test(TestArgs),
 
-    #[command(
-        name = "test-coverage-render",
-        about = "Render pretty output from test coverage result"
-    )]
-    TestCoverageRender(TestCoverageRenderArgs),
+    #[command(name = "test-coverage", about = "Run test coverage and output report")]
+    TestCoverage(TestCoverageArgs),
 
     #[command(name = "install", about = "Installs framework dependencies")]
     Install(InstallArgs),
@@ -113,16 +110,29 @@ pub struct TestArgs {
     pub nocapture: bool,
 }
 
-#[derive(Default, Clone, PartialEq, Eq, Debug, Args)]
-pub struct TestCoverageRenderArgs {
-    /// Input file path (llvm-cov json5 format)
-    /// Generated by the llvm-cov export tool
-    #[arg(short, long, verbatim_doc_comment)]
-    pub input: String,
+#[derive(Default, Clone, PartialEq, Eq, Debug, ValueEnum)]
+pub enum TestCoverageOutputFormat {
+    /// Markdown pretty-print summary
+    #[default]
+    Markdown,
+
+    /// JSON summary
+    Json,
+}
 
+#[derive(Default, Clone, PartialEq, Eq, Debug, Args)]
+pub struct TestCoverageArgs {
     /// Output file path
     #[arg(short, long, verbatim_doc_comment)]
     pub output: String,
+
+    /// Output format
+    #[arg(short, long, verbatim_doc_comment)]
+    pub format: Option<TestCoverageOutputFormat>,
+
+    /// Ignore files by path patterns
+    #[arg(short = 'i', long = "ignore-filename-regex", verbatim_doc_comment)]
+    pub ignore_filename_regex: Vec<String>,
 }
 
 #[derive(Default, Clone, PartialEq, Eq, Debug, Args)]
diff --git a/framework/meta/src/cmd/standalone.rs b/framework/meta/src/cmd/standalone.rs
index 58f8c9b6b7..62dd910836 100644
--- a/framework/meta/src/cmd/standalone.rs
+++ b/framework/meta/src/cmd/standalone.rs
@@ -6,12 +6,12 @@ mod print_util;
 pub mod scen_test_gen;
 pub mod template;
 pub mod test;
-mod test_coverage_render;
+mod test_coverage;
 pub(crate) mod upgrade;
 
 use crate::{
     cli_args::{StandaloneCliAction, StandaloneCliArgs},
-    cmd::standalone::test_coverage_render::test_coverage_render,
+    cmd::standalone::test_coverage::test_coverage,
 };
 use all::call_all_meta;
 use clap::Parser;
@@ -45,8 +45,8 @@ pub fn cli_main_standalone() {
             test_gen_tool(args);
         },
         Some(StandaloneCliAction::Test(args)) => test(args),
-        Some(StandaloneCliAction::TestCoverageRender(args)) => {
-            test_coverage_render(args);
+        Some(StandaloneCliAction::TestCoverage(args)) => {
+            test_coverage(args);
         },
         Some(StandaloneCliAction::Install(args)) => install(args),
         None => {},
diff --git a/framework/meta/src/cmd/standalone/test_coverage.rs b/framework/meta/src/cmd/standalone/test_coverage.rs
new file mode 100644
index 0000000000..029f7b551a
--- /dev/null
+++ b/framework/meta/src/cmd/standalone/test_coverage.rs
@@ -0,0 +1,27 @@
+mod cargo;
+mod error;
+mod llvm_cov;
+mod render;
+mod run;
+mod util;
+
+use crate::{
+    cli_args::{TestCoverageArgs, TestCoverageOutputFormat},
+    cmd::standalone::test_coverage::{cargo::get_workspace_root, run::run_test_coverage},
+};
+use std::process;
+
+pub fn test_coverage(args: &TestCoverageArgs) {
+    let root_path = get_workspace_root().unwrap();
+    if let Err(err) = run_test_coverage(
+        &root_path,
+        &args.output,
+        args.format
+            .as_ref()
+            .unwrap_or(&TestCoverageOutputFormat::default()),
+        &args.ignore_filename_regex,
+    ) {
+        eprintln!("{}", err);
+        process::exit(1);
+    }
+}
diff --git a/framework/meta/src/cmd/standalone/test_coverage/cargo.rs b/framework/meta/src/cmd/standalone/test_coverage/cargo.rs
new file mode 100644
index 0000000000..5f5660d103
--- /dev/null
+++ b/framework/meta/src/cmd/standalone/test_coverage/cargo.rs
@@ -0,0 +1,103 @@
+use crate::cmd::standalone::test_coverage::{
+    error::TestCoverageError, util::deep_find_files_with_ext,
+};
+use serde::Deserialize;
+use std::process::Command;
+
+pub fn get_workspace_root() -> Result<String, TestCoverageError> {
+    let output = Command::new("cargo")
+        .args(["metadata", "--no-deps", "--format-version=1"])
+        .output()
+        .map_err(|e| TestCoverageError::Cargo(format!("{}", e)))?;
+
+    let metadata: serde_json::Value = serde_json::from_slice(&output.stdout)
+        .map_err(|_| TestCoverageError::Cargo("invalid manifest data".into()))?;
+
+    let Some(workspace_root) = metadata["workspace_root"].as_str() else {
+        return Err(TestCoverageError::Cargo("invalid manifest data".into()));
+    };
+
+    Ok(workspace_root.to_owned())
+}
+
+#[derive(Debug, Clone, Deserialize)]
+struct PartialCompilerArtifactMessage {
+    filenames: Vec<String>,
+    profile: PartialCompilerArtifactProfile,
+}
+
+#[derive(Debug, Clone, Deserialize)]
+struct PartialCompilerArtifactProfile {
+    test: Option<bool>,
+}
+
+pub fn run_instrumented_tests(path: &str) -> Result<(), TestCoverageError> {
+    let Ok(status) = Command::new("cargo")
+        .current_dir(path)
+        .env("RUSTFLAGS", "-C instrument-coverage")
+        .args(vec!["test", "--tests"])
+        .status()
+    else {
+        return Err(TestCoverageError::Cargo(
+            "can't run instrumented tests".into(),
+        ));
+    };
+
+    if !status.success() {
+        return Err(TestCoverageError::Cargo(
+            "can't run instrumented tests".into(),
+        ));
+    }
+
+    Ok(())
+}
+
+pub fn get_instrumented_test_binaries_paths(path: &str) -> Result<Vec<String>, TestCoverageError> {
+    let Ok(output) = Command::new("cargo")
+        .current_dir(path)
+        .env("RUSTFLAGS", "-C instrument-coverage")
+        .args(vec!["test", "--tests", "--no-run", "--message-format=json"])
+        .output()
+    else {
+        return Err(TestCoverageError::Cargo(
+            "can't get test binaries paths".into(),
+        ));
+    };
+
+    if !output.status.success() {
+        return Err(TestCoverageError::Cargo(
+            "can't get test binaries paths".into(),
+        ));
+    }
+
+    let output = String::from_utf8_lossy(&output.stdout);
+    let messages = output.split('\n').collect::<Vec<_>>();
+
+    let mut result = vec![];
+    for message in messages {
+        let Ok(message) = serde_json::from_str::<serde_json::Value>(message) else {
+            continue;
+        };
+
+        if !matches!(
+            message.get("reason").map(|val| val.as_str()),
+            Some(Some("compiler-artifact"))
+        ) {
+            continue;
+        }
+
+        let Ok(mut message) = serde_json::from_value::<PartialCompilerArtifactMessage>(message)
+        else {
+            continue;
+        };
+
+        let is_test = message.profile.test.unwrap_or_default();
+        if !is_test {
+            continue;
+        }
+
+        result.append(&mut message.filenames);
+    }
+
+    Ok(result)
+}
diff --git a/framework/meta/src/cmd/standalone/test_coverage/error.rs b/framework/meta/src/cmd/standalone/test_coverage/error.rs
new file mode 100644
index 0000000000..16334d203b
--- /dev/null
+++ b/framework/meta/src/cmd/standalone/test_coverage/error.rs
@@ -0,0 +1,34 @@
+use std::{
+    error::Error,
+    fmt::{Display, Formatter},
+};
+
+#[derive(Debug)]
+pub enum TestCoverageError {
+    MissingDependency(String),
+    FsError(String),
+    Cargo(String),
+    LlvmProfdata(String),
+    LlvmCov(String),
+}
+
+impl Error for TestCoverageError {}
+
+impl Display for TestCoverageError {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        let message = match self {
+            TestCoverageError::MissingDependency(dep) =>
+                format!("Missing dependency {dep}. Make sure you have {dep} installed on your system and it's available in PATH."),
+
+            TestCoverageError::FsError(msg) =>
+                format!("FS operation failed: {msg}"),
+            TestCoverageError::Cargo(msg) =>
+                format!("Failed to run cargo: {msg}"),
+            TestCoverageError::LlvmProfdata(msg) =>
+                format!("llvm-profdata error: {msg}"),
+            TestCoverageError::LlvmCov(msg) =>
+                format!("llvm-cov error: {msg}"),
+        };
+        write!(f, "TestCoverageRenderError: {}", message)
+    }
+}
diff --git a/framework/meta/src/cmd/standalone/test_coverage/llvm_cov.rs b/framework/meta/src/cmd/standalone/test_coverage/llvm_cov.rs
new file mode 100644
index 0000000000..07413d0b50
--- /dev/null
+++ b/framework/meta/src/cmd/standalone/test_coverage/llvm_cov.rs
@@ -0,0 +1,128 @@
+use serde::{Deserialize, Serialize};
+use serde_json::Value;
+use std::{path::PathBuf, process::Command};
+
+use super::error::TestCoverageError;
+
+const DEFAULT_IGNORE_FILENAME_REGEX: [&str; 2] = ["/.cargo/registry", "rustc/"];
+
+#[derive(Serialize, Deserialize)]
+pub struct Coverage {
+    pub files: Vec<FileSummary>,
+    pub totals: Summary,
+}
+
+#[derive(Serialize, Deserialize)]
+pub struct SummaryItem {
+    pub count: u64,
+    pub covered: u64,
+    pub percent: f64,
+}
+
+#[derive(Serialize, Deserialize)]
+pub struct Summary {
+    pub functions: SummaryItem,
+    pub lines: SummaryItem,
+    pub instantiations: SummaryItem,
+    pub regions: SummaryItem,
+}
+
+#[derive(Serialize, Deserialize)]
+pub struct FileSummary {
+    pub filename: String,
+    pub summary: Summary,
+}
+
+fn parse_llvm_cov_output(output: &str) -> Result<Coverage, TestCoverageError> {
+    let llvm_cov_output: Value = serde_json::from_str(output)
+        .map_err(|_| TestCoverageError::LlvmCov("invalid output data".into()))?;
+
+    let Some(coverage) = llvm_cov_output.get("data").and_then(|data| data.get(0)) else {
+        return Err(TestCoverageError::LlvmCov("invalid output data".into()));
+    };
+
+    let coverage = serde_json::from_value(coverage.to_owned())
+        .map_err(|_| TestCoverageError::LlvmCov("invalid output data".into()))?;
+
+    Ok(coverage)
+}
+
+pub fn combine_instrumentation_results(
+    root_dir: &str,
+    profraw_files: &Vec<String>,
+) -> Result<String, TestCoverageError> {
+    let Ok(output) = Command::new("llvm-profdata")
+        .current_dir(root_dir)
+        .args(vec!["merge", "-o", "merged.profdata", "-sparse"])
+        .args(profraw_files)
+        .status()
+    else {
+        return Err(TestCoverageError::LlvmProfdata(
+            "can't merge profraw files".into(),
+        ));
+    };
+
+    if !output.success() {
+        return Err(TestCoverageError::LlvmProfdata(
+            "can't merge profraw files".into(),
+        ));
+    }
+
+    let output_path = PathBuf::from(root_dir)
+        .join("merged.profdata")
+        .canonicalize()
+        .map_err(|_| {
+            TestCoverageError::FsError("can't get canonical path for merged.profdata".into())
+        })?;
+
+    Ok(output_path.to_string_lossy().to_string())
+}
+
+pub fn export_coverage_summary(
+    root_dir: &str,
+    profdata_file: &str,
+    binary_files: &Vec<String>,
+    ignore_filename_regex: &Vec<String>,
+) -> Result<Coverage, TestCoverageError> {
+    let objects = binary_files
+        .iter()
+        .flat_map(|path| vec!["-object", path.as_str()])
+        .collect::<Vec<_>>();
+
+    let mut ignore_filename_regex = ignore_filename_regex
+        .iter()
+        .map(|s| format!("--ignore-filename-regex={}", s))
+        .collect::<Vec<_>>();
+
+    for ignore in DEFAULT_IGNORE_FILENAME_REGEX {
+        ignore_filename_regex.push(format!("--ignore-filename-regex={}", ignore));
+    }
+
+    let Ok(output) = Command::new("llvm-cov")
+        .current_dir(root_dir)
+        .arg("export")
+        .args(&objects)
+        .args(&ignore_filename_regex)
+        .args(&[
+            &format!("--instr-profile={}", profdata_file),
+            "--summary-only",
+            "--format=text",
+        ])
+        .output()
+    else {
+        return Err(TestCoverageError::LlvmCov(
+            "can't export coverage summary.".into(),
+        ));
+    };
+
+    if !output.status.success() {
+        return Err(TestCoverageError::LlvmCov(
+            "can't export coverage summary".into(),
+        ));
+    }
+
+    let coverage = String::from_utf8_lossy(&output.stdout).to_string();
+    let coverage = parse_llvm_cov_output(&coverage)?;
+
+    Ok(coverage)
+}
diff --git a/framework/meta/src/cmd/standalone/test_coverage_render/render.rs b/framework/meta/src/cmd/standalone/test_coverage/render.rs
similarity index 100%
rename from framework/meta/src/cmd/standalone/test_coverage_render/render.rs
rename to framework/meta/src/cmd/standalone/test_coverage/render.rs
diff --git a/framework/meta/src/cmd/standalone/test_coverage/run.rs b/framework/meta/src/cmd/standalone/test_coverage/run.rs
new file mode 100644
index 0000000000..f15ecdb8d4
--- /dev/null
+++ b/framework/meta/src/cmd/standalone/test_coverage/run.rs
@@ -0,0 +1,61 @@
+use std::fs;
+
+use crate::{
+    cli_args::TestCoverageOutputFormat,
+    cmd::standalone::test_coverage::{
+        cargo::{get_instrumented_test_binaries_paths, run_instrumented_tests},
+        error::TestCoverageError,
+        llvm_cov::{combine_instrumentation_results, export_coverage_summary},
+        render::render_coverage,
+        util::{
+            cleanup_file, cleanup_many_files, deep_find_files_with_ext, ensure_dependencies_in_path,
+        },
+    },
+};
+
+pub fn run_test_coverage(
+    root_path: &str,
+    output_path: &str,
+    output_format: &TestCoverageOutputFormat,
+    ignore_filename_regex: &Vec<String>,
+) -> Result<(), TestCoverageError> {
+    ensure_dependencies_in_path()?;
+
+    run_instrumented_tests(root_path)?;
+    let test_binaries = get_instrumented_test_binaries_paths(root_path)?;
+
+    let instrumentation_output_files = deep_find_files_with_ext(root_path, "profraw")?;
+
+    let combined_instrumentation_output =
+        combine_instrumentation_results(root_path, &instrumentation_output_files)?;
+
+    cleanup_many_files(&instrumentation_output_files)?;
+
+    let coverage = export_coverage_summary(
+        root_path,
+        &combined_instrumentation_output,
+        &test_binaries,
+        ignore_filename_regex,
+    )?;
+
+    cleanup_file(&combined_instrumentation_output)?;
+
+    let mut output = String::new();
+
+    match output_format {
+        TestCoverageOutputFormat::Markdown => {
+            render_coverage(&mut output, &coverage, &root_path);
+        },
+        TestCoverageOutputFormat::Json => {
+            output = serde_json::to_string_pretty(&coverage).unwrap();
+        },
+    };
+
+    let Ok(_) = fs::write(output_path, output) else {
+        return Err(TestCoverageError::FsError(format!(
+            "failed to write to {output_path}"
+        )));
+    };
+
+    Ok(())
+}
diff --git a/framework/meta/src/cmd/standalone/test_coverage/util.rs b/framework/meta/src/cmd/standalone/test_coverage/util.rs
new file mode 100644
index 0000000000..94cbe42352
--- /dev/null
+++ b/framework/meta/src/cmd/standalone/test_coverage/util.rs
@@ -0,0 +1,56 @@
+use crate::cmd::standalone::test_coverage::error::TestCoverageError;
+use std::{fs, process::Command};
+
+const DEPENDENCIES: [&str; 2] = ["llvm-cov", "llvm-profdata"];
+
+pub fn ensure_dependencies_in_path() -> Result<(), TestCoverageError> {
+    for dependency in DEPENDENCIES.iter() {
+        let Ok(_) = Command::new(dependency).arg("--version").output() else {
+            return Err(TestCoverageError::MissingDependency(dependency.to_string()));
+        };
+    }
+
+    Ok(())
+}
+
+pub fn deep_find_files_with_ext(dir: &str, ext: &str) -> Result<Vec<String>, TestCoverageError> {
+    let mut result = vec![];
+
+    let dir_contents = fs::read_dir(dir)
+        .map_err(|_| TestCoverageError::FsError(format!("failed to read dir at path {dir}")))?;
+
+    for entry in dir_contents {
+        let entry = entry.map_err(|_| {
+            TestCoverageError::FsError(format!("failed to read entry in dir at path {dir}"))
+        })?;
+        let path = entry.path();
+        if path.is_dir() {
+            result.append(&mut deep_find_files_with_ext(path.to_str().unwrap(), ext)?);
+        } else if path.is_file() {
+            if let Some(file_ext) = path.extension() {
+                if file_ext == ext {
+                    result.push(path.to_str().unwrap().to_string());
+                }
+            }
+        }
+    }
+
+    Ok(result)
+}
+
+pub fn cleanup_many_files(files: &Vec<String>) -> Result<(), TestCoverageError> {
+    for file in files {
+        fs::remove_file(file).map_err(|_| {
+            TestCoverageError::FsError(format!("failed to remove file at path {file}"))
+        })?;
+    }
+
+    Ok(())
+}
+
+pub fn cleanup_file(file: &str) -> Result<(), TestCoverageError> {
+    fs::remove_file(file)
+        .map_err(|_| TestCoverageError::FsError(format!("failed to remove file at path {file}")))?;
+
+    Ok(())
+}
diff --git a/framework/meta/src/cmd/standalone/test_coverage_render.rs b/framework/meta/src/cmd/standalone/test_coverage_render.rs
deleted file mode 100644
index 2789fd3d43..0000000000
--- a/framework/meta/src/cmd/standalone/test_coverage_render.rs
+++ /dev/null
@@ -1,46 +0,0 @@
-mod cargo;
-mod error;
-mod llvm_cov;
-mod render;
-
-use crate::{
-    cli_args::TestCoverageRenderArgs,
-    cmd::standalone::test_coverage_render::{
-        cargo::get_workspace_root, error::TestCoverageRenderError, llvm_cov::parse_llvm_cov_output,
-        render::render_coverage,
-    },
-};
-use std::{fs, process};
-
-fn run_test_coverage_renderer(
-    args: &TestCoverageRenderArgs,
-) -> Result<(), TestCoverageRenderError> {
-    let Ok(input) = fs::read_to_string(&args.input) else {
-        return Err(TestCoverageRenderError::InvalidInputPath(
-            "failed to read".into(),
-        ));
-    };
-
-    let root = get_workspace_root()?;
-
-    let coverage = parse_llvm_cov_output(&input)?;
-
-    let mut output = String::new();
-
-    render_coverage(&mut output, &coverage, &root);
-
-    let Ok(_) = fs::write(&args.output, output) else {
-        return Err(TestCoverageRenderError::InvalidOutputPath(
-            "failed to write".into(),
-        ));
-    };
-
-    Ok(())
-}
-
-pub fn test_coverage_render(args: &TestCoverageRenderArgs) {
-    if let Err(err) = run_test_coverage_renderer(args) {
-        eprintln!("{}", err);
-        process::exit(1);
-    }
-}
diff --git a/framework/meta/src/cmd/standalone/test_coverage_render/cargo.rs b/framework/meta/src/cmd/standalone/test_coverage_render/cargo.rs
deleted file mode 100644
index ca5167ea4b..0000000000
--- a/framework/meta/src/cmd/standalone/test_coverage_render/cargo.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-use crate::cmd::standalone::test_coverage_render::error::TestCoverageRenderError;
-use std::process::Command;
-
-pub fn get_workspace_root() -> Result<String, TestCoverageRenderError> {
-    let output = Command::new("cargo")
-        .args(["metadata", "--no-deps", "--format-version=1"])
-        .output()
-        .map_err(|e| TestCoverageRenderError::Cargo(format!("{}", e)))?;
-
-    let metadata: serde_json::Value = serde_json::from_slice(&output.stdout)
-        .map_err(|_| TestCoverageRenderError::Cargo("invalid manifest data".into()))?;
-
-    let Some(workspace_root) = metadata["workspace_root"].as_str() else {
-        return Err(TestCoverageRenderError::Cargo(
-            "invalid manifest data".into(),
-        ));
-    };
-
-    Ok(workspace_root.to_owned())
-}
diff --git a/framework/meta/src/cmd/standalone/test_coverage_render/error.rs b/framework/meta/src/cmd/standalone/test_coverage_render/error.rs
deleted file mode 100644
index 36b2f1849a..0000000000
--- a/framework/meta/src/cmd/standalone/test_coverage_render/error.rs
+++ /dev/null
@@ -1,28 +0,0 @@
-use std::{
-    error::Error,
-    fmt::{Display, Formatter},
-};
-
-#[derive(Debug)]
-pub enum TestCoverageRenderError {
-    InvalidInputPath(String),
-    InvalidOutputPath(String),
-    Cargo(String),
-    InvalidLlvmCovInput,
-}
-
-impl Error for TestCoverageRenderError {}
-
-impl Display for TestCoverageRenderError {
-    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-        let message = match self {
-            TestCoverageRenderError::InvalidInputPath(msg) => format!("Invalid input path: {msg}"),
-            TestCoverageRenderError::InvalidOutputPath(msg) => {
-                format!("Invalid output path: {msg}")
-            },
-            TestCoverageRenderError::Cargo(msg) => format!("Failed to run cargo: {msg}"),
-            TestCoverageRenderError::InvalidLlvmCovInput => "Invalid llvm-cov input".into(),
-        };
-        write!(f, "TestCoverageRenderError: {}", message)
-    }
-}
diff --git a/framework/meta/src/cmd/standalone/test_coverage_render/llvm_cov.rs b/framework/meta/src/cmd/standalone/test_coverage_render/llvm_cov.rs
deleted file mode 100644
index ed499ec387..0000000000
--- a/framework/meta/src/cmd/standalone/test_coverage_render/llvm_cov.rs
+++ /dev/null
@@ -1,45 +0,0 @@
-use serde::Deserialize;
-use serde_json::Value;
-
-use super::error::TestCoverageRenderError;
-
-#[derive(Deserialize)]
-pub struct Coverage {
-    pub files: Vec<FileSummary>,
-    pub totals: Summary,
-}
-
-#[derive(Deserialize)]
-pub struct SummaryItem {
-    pub count: u64,
-    pub covered: u64,
-    pub percent: f64,
-}
-
-#[derive(Deserialize)]
-pub struct Summary {
-    pub functions: SummaryItem,
-    pub lines: SummaryItem,
-    pub instantiations: SummaryItem,
-    pub regions: SummaryItem,
-}
-
-#[derive(Deserialize)]
-pub struct FileSummary {
-    pub filename: String,
-    pub summary: Summary,
-}
-
-pub fn parse_llvm_cov_output(output: &str) -> Result<Coverage, TestCoverageRenderError> {
-    let llvm_cov_output: Value =
-        serde_json::from_str(output).map_err(|_| TestCoverageRenderError::InvalidLlvmCovInput)?;
-
-    let Some(coverage) = llvm_cov_output.get("data").and_then(|data| data.get(0)) else {
-        return Err(TestCoverageRenderError::InvalidLlvmCovInput);
-    };
-
-    let coverage = serde_json::from_value(coverage.to_owned())
-        .map_err(|_| TestCoverageRenderError::InvalidLlvmCovInput)?;
-
-    Ok(coverage)
-}

From 3beb7595c1b0cd27158f02464969e31a0a87a6d9 Mon Sep 17 00:00:00 2001
From: Laurentiu Ciobanu <laurentiu.ciobanu@multiversx.com>
Date: Wed, 20 Mar 2024 18:07:13 +0200
Subject: [PATCH 0480/1254] restore stree_submit_test.scen.json

---
 .../scenarios/stress_submit_test.scen.json    | 4294 ++++++++---------
 1 file changed, 2147 insertions(+), 2147 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 3bfa543ab0..4fe66c794d 100644
--- a/contracts/core/price-aggregator/scenarios/stress_submit_test.scen.json
+++ b/contracts/core/price-aggregator/scenarios/stress_submit_test.scen.json
@@ -1,2176 +1,2176 @@
 {
-    "steps": [
-        {
-            "step": "setState",
-            "accounts": {
-                "address:oracle1": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle10": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle11": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle12": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle13": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle14": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle15": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle16": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle17": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle18": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle19": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle2": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle20": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle21": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle22": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle23": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle24": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle25": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle26": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle27": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle28": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle29": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle3": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle30": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle31": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle32": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle33": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle34": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle35": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle36": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle37": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle38": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle39": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle4": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle40": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle41": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle42": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle43": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle44": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle45": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle46": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle47": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle48": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle49": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle5": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle50": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle6": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle7": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle8": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle9": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:owner": {
-                    "nonce": "1"
-                }
-            },
-            "newAddresses": [
-                {
-                    "creatorAddress": "address:owner",
-                    "creatorNonce": "1",
-                    "newAddress": "sc:price-aggregator"
-                }
-            ],
-            "currentBlockInfo": {
-                "blockTimestamp": "100"
-            }
-        },
-        {
-            "step": "scDeploy",
-            "id": "",
-            "tx": {
-                "from": "address:owner",
-                "contractCode": "mxsc:../output/multiversx-price-aggregator-sc.mxsc.json",
-                "arguments": [
-                    "0x45474c44",
-                    "0x14",
-                    "0x0a",
-                    "0x03",
-                    "0x32",
-                    "0x6f7261636c65315f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c65325f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c65335f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c65345f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c65355f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c65365f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c65375f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c65385f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c65395f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6531305f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6531315f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6531325f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6531335f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6531345f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6531355f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6531365f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6531375f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6531385f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6531395f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6532305f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6532315f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6532325f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6532335f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6532345f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6532355f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6532365f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6532375f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6532385f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6532395f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6533305f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6533315f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6533325f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6533335f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6533345f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6533355f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6533365f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6533375f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6533385f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6533395f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6534305f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6534315f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6534325f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6534335f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6534345f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6534355f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6534365f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6534375f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6534385f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6534395f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
-                    "0x6f7261636c6535305f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f"
-                ],
-                "gasLimit": "120,000,000"
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle1",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000"
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle2",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000"
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle3",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000"
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
+  "steps": [
+    {
+      "step": "setState",
+      "accounts": {
+        "address:oracle1": {
+          "nonce": "1",
+          "balance": "20"
+        },
+        "address:oracle10": {
+          "nonce": "1",
+          "balance": "20"
+        },
+        "address:oracle11": {
+          "nonce": "1",
+          "balance": "20"
+        },
+        "address:oracle12": {
+          "nonce": "1",
+          "balance": "20"
+        },
+        "address:oracle13": {
+          "nonce": "1",
+          "balance": "20"
+        },
+        "address:oracle14": {
+          "nonce": "1",
+          "balance": "20"
+        },
+        "address:oracle15": {
+          "nonce": "1",
+          "balance": "20"
+        },
+        "address:oracle16": {
+          "nonce": "1",
+          "balance": "20"
+        },
+        "address:oracle17": {
+          "nonce": "1",
+          "balance": "20"
+        },
+        "address:oracle18": {
+          "nonce": "1",
+          "balance": "20"
+        },
+        "address:oracle19": {
+          "nonce": "1",
+          "balance": "20"
+        },
+        "address:oracle2": {
+          "nonce": "1",
+          "balance": "20"
+        },
+        "address:oracle20": {
+          "nonce": "1",
+          "balance": "20"
+        },
+        "address:oracle21": {
+          "nonce": "1",
+          "balance": "20"
+        },
+        "address:oracle22": {
+          "nonce": "1",
+          "balance": "20"
+        },
+        "address:oracle23": {
+          "nonce": "1",
+          "balance": "20"
+        },
+        "address:oracle24": {
+          "nonce": "1",
+          "balance": "20"
+        },
+        "address:oracle25": {
+          "nonce": "1",
+          "balance": "20"
+        },
+        "address:oracle26": {
+          "nonce": "1",
+          "balance": "20"
+        },
+        "address:oracle27": {
+          "nonce": "1",
+          "balance": "20"
+        },
+        "address:oracle28": {
+          "nonce": "1",
+          "balance": "20"
+        },
+        "address:oracle29": {
+          "nonce": "1",
+          "balance": "20"
+        },
+        "address:oracle3": {
+          "nonce": "1",
+          "balance": "20"
+        },
+        "address:oracle30": {
+          "nonce": "1",
+          "balance": "20"
+        },
+        "address:oracle31": {
+          "nonce": "1",
+          "balance": "20"
         },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle4",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000"
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle5",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000"
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
+        "address:oracle32": {
+          "nonce": "1",
+          "balance": "20"
         },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle6",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000"
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle7",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000"
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle8",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000"
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle9",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000"
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle10",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000"
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle11",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000"
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
+        "address:oracle33": {
+          "nonce": "1",
+          "balance": "20"
         },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle12",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000"
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
+        "address:oracle34": {
+          "nonce": "1",
+          "balance": "20"
         },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle13",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000"
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
+        "address:oracle35": {
+          "nonce": "1",
+          "balance": "20"
         },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle14",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000"
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
+        "address:oracle36": {
+          "nonce": "1",
+          "balance": "20"
         },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle15",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000"
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
+        "address:oracle37": {
+          "nonce": "1",
+          "balance": "20"
         },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle16",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000"
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
+        "address:oracle38": {
+          "nonce": "1",
+          "balance": "20"
         },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle17",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000"
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
+        "address:oracle39": {
+          "nonce": "1",
+          "balance": "20"
         },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle18",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000"
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
+        "address:oracle4": {
+          "nonce": "1",
+          "balance": "20"
         },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle19",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000"
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
+        "address:oracle40": {
+          "nonce": "1",
+          "balance": "20"
         },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle20",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000"
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
+        "address:oracle41": {
+          "nonce": "1",
+          "balance": "20"
         },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle21",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000"
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
+        "address:oracle42": {
+          "nonce": "1",
+          "balance": "20"
         },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle22",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000"
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
+        "address:oracle43": {
+          "nonce": "1",
+          "balance": "20"
         },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle23",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000"
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
+        "address:oracle44": {
+          "nonce": "1",
+          "balance": "20"
         },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle24",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000"
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
+        "address:oracle45": {
+          "nonce": "1",
+          "balance": "20"
         },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle25",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000"
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
+        "address:oracle46": {
+          "nonce": "1",
+          "balance": "20"
         },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle26",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000"
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
+        "address:oracle47": {
+          "nonce": "1",
+          "balance": "20"
         },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle27",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000"
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
+        "address:oracle48": {
+          "nonce": "1",
+          "balance": "20"
         },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle28",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000"
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
+        "address:oracle49": {
+          "nonce": "1",
+          "balance": "20"
         },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle29",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000"
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
+        "address:oracle5": {
+          "nonce": "1",
+          "balance": "20"
         },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle30",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000"
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
+        "address:oracle50": {
+          "nonce": "1",
+          "balance": "20"
         },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle31",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000"
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
+        "address:oracle6": {
+          "nonce": "1",
+          "balance": "20"
         },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle32",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000"
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
+        "address:oracle7": {
+          "nonce": "1",
+          "balance": "20"
         },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle33",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000"
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
+        "address:oracle8": {
+          "nonce": "1",
+          "balance": "20"
         },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle34",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000"
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle35",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000"
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle36",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000"
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle37",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000"
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle38",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000"
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle39",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000"
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle40",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000"
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle41",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000"
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle42",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000"
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle43",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000"
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle44",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000"
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle45",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000"
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle46",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000"
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle47",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000"
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle48",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000"
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle49",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000"
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle50",
-                "to": "sc:price-aggregator",
-                "egldValue": "20",
-                "function": "stake",
-                "arguments": [],
-                "gasLimit": "5,000,000"
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:owner",
-                "to": "sc:price-aggregator",
-                "function": "setPairDecimals",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x"
-                ],
-                "gasLimit": "5,000,000"
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:owner",
-                "to": "sc:price-aggregator",
-                "function": "unpause",
-                "arguments": [],
-                "gasLimit": "5,000,000"
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle1",
-                "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x5f",
-                    "0xe799ca60351b896c",
-                    "0x"
-                ],
-                "gasLimit": "7,000,000"
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle2",
-                "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x64",
-                    "0x716cd8945fc70b18",
-                    "0x"
-                ],
-                "gasLimit": "7,000,000"
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle3",
-                "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x64",
-                    "0xe1a2287391e5624b",
-                    "0x"
-                ],
-                "gasLimit": "7,000,000"
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle4",
-                "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x64",
-                    "0xba073d189ad09a2c",
-                    "0x"
-                ],
-                "gasLimit": "7,000,000"
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle5",
-                "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x64",
-                    "0xff00ce8c0444abdd",
-                    "0x"
-                ],
-                "gasLimit": "7,000,000"
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle6",
-                "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x64",
-                    "0xde7637de9f0f868c",
-                    "0x"
-                ],
-                "gasLimit": "7,000,000"
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle7",
-                "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x64",
-                    "0xac01126106b01960",
-                    "0x"
-                ],
-                "gasLimit": "7,000,000"
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle8",
-                "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x64",
-                    "0xa5ab55cf028f836d",
-                    "0x"
-                ],
-                "gasLimit": "7,000,000"
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle9",
-                "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x64",
-                    "0x953c8fd0d4474074",
-                    "0x"
-                ],
-                "gasLimit": "7,000,000"
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle10",
-                "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x64",
-                    "0xa65e64a9aa0802a6",
-                    "0x"
-                ],
-                "gasLimit": "7,000,000"
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle11",
-                "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x64",
-                    "0xa6bb40b782efcd03",
-                    "0x"
-                ],
-                "gasLimit": "7,000,000"
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle12",
-                "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x64",
-                    "0x97484e0f98100c9a",
-                    "0x"
-                ],
-                "gasLimit": "7,000,000"
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle13",
-                "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x64",
-                    "0x65ba697509c0a86f",
-                    "0x"
-                ],
-                "gasLimit": "7,000,000"
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle14",
-                "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x64",
-                    "0x111061b1a3ea38b8",
-                    "0x"
-                ],
-                "gasLimit": "7,000,000"
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle15",
-                "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x64",
-                    "0xec876fe889ad08ff",
-                    "0x"
-                ],
-                "gasLimit": "7,000,000"
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle16",
-                "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x64",
-                    "0xb605dd34611b3dc0",
-                    "0x"
-                ],
-                "gasLimit": "7,000,000"
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle17",
-                "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x64",
-                    "0x7602960448fff2ac",
-                    "0x"
-                ],
-                "gasLimit": "7,000,000"
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle18",
-                "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x64",
-                    "0x140f137aa7a87a94",
-                    "0x"
-                ],
-                "gasLimit": "7,000,000"
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle19",
-                "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x64",
-                    "0xd557396414be3f15",
-                    "0x"
-                ],
-                "gasLimit": "7,000,000"
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle20",
-                "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x64",
-                    "0x325769f53bfb87a2",
-                    "0x"
-                ],
-                "gasLimit": "7,000,000"
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle21",
-                "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x64",
-                    "0x4deee148cfa1854f",
-                    "0x"
-                ],
-                "gasLimit": "7,000,000"
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle22",
-                "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x64",
-                    "0x40bb80f3ae334d7e",
-                    "0x"
-                ],
-                "gasLimit": "7,000,000"
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle23",
-                "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x64",
-                    "0xfc1a57c0b4f030e8",
-                    "0x"
-                ],
-                "gasLimit": "7,000,000"
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle24",
-                "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x64",
-                    "0xcd1034fe7c1feae5",
-                    "0x"
-                ],
-                "gasLimit": "7,000,000"
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle25",
-                "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x64",
-                    "0x7b6560eadfaf3cca",
-                    "0x"
-                ],
-                "gasLimit": "7,000,000"
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle26",
-                "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x64",
-                    "0xed0bece4a403eae3",
-                    "0x"
-                ],
-                "gasLimit": "7,000,000"
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle27",
-                "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x64",
-                    "0xae251605c03d8082",
-                    "0x"
-                ],
-                "gasLimit": "7,000,000"
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle28",
-                "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x64",
-                    "0x66e42ed8550f773b",
-                    "0x"
-                ],
-                "gasLimit": "7,000,000"
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle29",
-                "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x64",
-                    "0xccb3836eb7cae53c",
-                    "0x"
-                ],
-                "gasLimit": "7,000,000"
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle30",
-                "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x64",
-                    "0xad95fe9b4bbf2d4d",
-                    "0x"
-                ],
-                "gasLimit": "7,000,000"
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle31",
-                "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x64",
-                    "0x2efcb72f7ca0545f",
-                    "0x"
-                ],
-                "gasLimit": "7,000,000"
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle32",
-                "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x64",
-                    "0x7089de0311ceaa83",
-                    "0x"
-                ],
-                "gasLimit": "7,000,000"
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle33",
-                "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x64",
-                    "0x7112fc625005421b",
-                    "0x"
-                ],
-                "gasLimit": "7,000,000"
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle34",
-                "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x64",
-                    "0x77c398c91e818621",
-                    "0x"
-                ],
-                "gasLimit": "7,000,000"
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle35",
-                "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x64",
-                    "0x260a0fc02a2d124b",
-                    "0x"
-                ],
-                "gasLimit": "7,000,000"
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle36",
-                "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x64",
-                    "0x3aa99face36d47d0",
-                    "0x"
-                ],
-                "gasLimit": "7,000,000"
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle37",
-                "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x64",
-                    "0xbe3b8f275886e44f",
-                    "0x"
-                ],
-                "gasLimit": "7,000,000"
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle38",
-                "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x64",
-                    "0xb86991c34a794564",
-                    "0x"
-                ],
-                "gasLimit": "7,000,000"
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle39",
-                "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x64",
-                    "0xe3aad9f5ef417ac7",
-                    "0x"
-                ],
-                "gasLimit": "7,000,000"
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle40",
-                "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x64",
-                    "0x68d9d244742a63ea",
-                    "0x"
-                ],
-                "gasLimit": "7,000,000"
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle41",
-                "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x64",
-                    "0x6f99d232bca2e67d",
-                    "0x"
-                ],
-                "gasLimit": "7,000,000"
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle42",
-                "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x64",
-                    "0x268183cfacad3372",
-                    "0x"
-                ],
-                "gasLimit": "7,000,000"
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle43",
-                "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x64",
-                    "0x217fe27c5b1f3a59",
-                    "0x"
-                ],
-                "gasLimit": "7,000,000"
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle44",
-                "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x64",
-                    "0xde4949fcb07b230a",
-                    "0x"
-                ],
-                "gasLimit": "7,000,000"
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle45",
-                "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x64",
-                    "0x755b157b4fa653ba",
-                    "0x"
-                ],
-                "gasLimit": "7,000,000"
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle46",
-                "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x64",
-                    "0xedef13da2591c4c2",
-                    "0x"
-                ],
-                "gasLimit": "7,000,000"
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle47",
-                "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x64",
-                    "0x6e872c7160cfa5e1",
-                    "0x"
-                ],
-                "gasLimit": "7,000,000"
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle48",
-                "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x64",
-                    "0xe97d0cbb0d5016a4",
-                    "0x"
-                ],
-                "gasLimit": "7,000,000"
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle49",
-                "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x64",
-                    "0x4d2d2ed6700c8419",
-                    "0x"
-                ],
-                "gasLimit": "7,000,000"
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
+        "address:oracle9": {
+          "nonce": "1",
+          "balance": "20"
         },
+        "address:owner": {
+          "nonce": "1"
+        }
+      },
+      "newAddresses": [
         {
-            "step": "scCall",
-            "id": "",
-            "tx": {
-                "from": "address:oracle50",
-                "to": "sc:price-aggregator",
-                "function": "submit",
-                "arguments": [
-                    "0x45474c44",
-                    "0x55534443",
-                    "0x64",
-                    "0xd4a84da6b88e4737",
-                    "0x"
-                ],
-                "gasLimit": "7,000,000"
-            },
-            "expect": {
-                "out": [],
-                "status": "0"
-            }
+          "creatorAddress": "address:owner",
+          "creatorNonce": "1",
+          "newAddress": "sc:price-aggregator"
         }
-    ]
-}
+      ],
+      "currentBlockInfo": {
+        "blockTimestamp": "100"
+      }
+    },
+    {
+      "step": "scDeploy",
+      "id": "",
+      "tx": {
+        "from": "address:owner",
+        "contractCode": "mxsc:../output/multiversx-price-aggregator-sc.mxsc.json",
+        "arguments": [
+          "0x45474c44",
+          "0x14",
+          "0x0a",
+          "0x03",
+          "0x32",
+          "0x6f7261636c65315f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+          "0x6f7261636c65325f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+          "0x6f7261636c65335f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+          "0x6f7261636c65345f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+          "0x6f7261636c65355f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+          "0x6f7261636c65365f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+          "0x6f7261636c65375f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+          "0x6f7261636c65385f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+          "0x6f7261636c65395f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+          "0x6f7261636c6531305f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+          "0x6f7261636c6531315f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+          "0x6f7261636c6531325f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+          "0x6f7261636c6531335f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+          "0x6f7261636c6531345f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+          "0x6f7261636c6531355f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+          "0x6f7261636c6531365f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+          "0x6f7261636c6531375f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+          "0x6f7261636c6531385f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+          "0x6f7261636c6531395f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+          "0x6f7261636c6532305f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+          "0x6f7261636c6532315f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+          "0x6f7261636c6532325f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+          "0x6f7261636c6532335f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+          "0x6f7261636c6532345f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+          "0x6f7261636c6532355f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+          "0x6f7261636c6532365f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+          "0x6f7261636c6532375f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+          "0x6f7261636c6532385f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+          "0x6f7261636c6532395f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+          "0x6f7261636c6533305f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+          "0x6f7261636c6533315f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+          "0x6f7261636c6533325f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+          "0x6f7261636c6533335f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+          "0x6f7261636c6533345f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+          "0x6f7261636c6533355f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+          "0x6f7261636c6533365f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+          "0x6f7261636c6533375f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+          "0x6f7261636c6533385f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+          "0x6f7261636c6533395f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+          "0x6f7261636c6534305f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+          "0x6f7261636c6534315f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+          "0x6f7261636c6534325f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+          "0x6f7261636c6534335f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+          "0x6f7261636c6534345f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+          "0x6f7261636c6534355f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+          "0x6f7261636c6534365f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+          "0x6f7261636c6534375f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+          "0x6f7261636c6534385f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+          "0x6f7261636c6534395f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+          "0x6f7261636c6535305f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f"
+        ],
+        "gasLimit": "120,000,000"
+      },
+      "expect": {
+        "out": [],
+        "status": "0"
+      }
+    },
+    {
+      "step": "scCall",
+      "id": "",
+      "tx": {
+        "from": "address:oracle1",
+        "to": "sc:price-aggregator",
+        "egldValue": "20",
+        "function": "stake",
+        "arguments": [],
+        "gasLimit": "5,000,000"
+      },
+      "expect": {
+        "out": [],
+        "status": "0"
+      }
+    },
+    {
+      "step": "scCall",
+      "id": "",
+      "tx": {
+        "from": "address:oracle2",
+        "to": "sc:price-aggregator",
+        "egldValue": "20",
+        "function": "stake",
+        "arguments": [],
+        "gasLimit": "5,000,000"
+      },
+      "expect": {
+        "out": [],
+        "status": "0"
+      }
+    },
+    {
+      "step": "scCall",
+      "id": "",
+      "tx": {
+        "from": "address:oracle3",
+        "to": "sc:price-aggregator",
+        "egldValue": "20",
+        "function": "stake",
+        "arguments": [],
+        "gasLimit": "5,000,000"
+      },
+      "expect": {
+        "out": [],
+        "status": "0"
+      }
+    },
+    {
+      "step": "scCall",
+      "id": "",
+      "tx": {
+        "from": "address:oracle4",
+        "to": "sc:price-aggregator",
+        "egldValue": "20",
+        "function": "stake",
+        "arguments": [],
+        "gasLimit": "5,000,000"
+      },
+      "expect": {
+        "out": [],
+        "status": "0"
+      }
+    },
+    {
+      "step": "scCall",
+      "id": "",
+      "tx": {
+        "from": "address:oracle5",
+        "to": "sc:price-aggregator",
+        "egldValue": "20",
+        "function": "stake",
+        "arguments": [],
+        "gasLimit": "5,000,000"
+      },
+      "expect": {
+        "out": [],
+        "status": "0"
+      }
+    },
+    {
+      "step": "scCall",
+      "id": "",
+      "tx": {
+        "from": "address:oracle6",
+        "to": "sc:price-aggregator",
+        "egldValue": "20",
+        "function": "stake",
+        "arguments": [],
+        "gasLimit": "5,000,000"
+      },
+      "expect": {
+        "out": [],
+        "status": "0"
+      }
+    },
+    {
+      "step": "scCall",
+      "id": "",
+      "tx": {
+        "from": "address:oracle7",
+        "to": "sc:price-aggregator",
+        "egldValue": "20",
+        "function": "stake",
+        "arguments": [],
+        "gasLimit": "5,000,000"
+      },
+      "expect": {
+        "out": [],
+        "status": "0"
+      }
+    },
+    {
+      "step": "scCall",
+      "id": "",
+      "tx": {
+        "from": "address:oracle8",
+        "to": "sc:price-aggregator",
+        "egldValue": "20",
+        "function": "stake",
+        "arguments": [],
+        "gasLimit": "5,000,000"
+      },
+      "expect": {
+        "out": [],
+        "status": "0"
+      }
+    },
+    {
+      "step": "scCall",
+      "id": "",
+      "tx": {
+        "from": "address:oracle9",
+        "to": "sc:price-aggregator",
+        "egldValue": "20",
+        "function": "stake",
+        "arguments": [],
+        "gasLimit": "5,000,000"
+      },
+      "expect": {
+        "out": [],
+        "status": "0"
+      }
+    },
+    {
+      "step": "scCall",
+      "id": "",
+      "tx": {
+        "from": "address:oracle10",
+        "to": "sc:price-aggregator",
+        "egldValue": "20",
+        "function": "stake",
+        "arguments": [],
+        "gasLimit": "5,000,000"
+      },
+      "expect": {
+        "out": [],
+        "status": "0"
+      }
+    },
+    {
+      "step": "scCall",
+      "id": "",
+      "tx": {
+        "from": "address:oracle11",
+        "to": "sc:price-aggregator",
+        "egldValue": "20",
+        "function": "stake",
+        "arguments": [],
+        "gasLimit": "5,000,000"
+      },
+      "expect": {
+        "out": [],
+        "status": "0"
+      }
+    },
+    {
+      "step": "scCall",
+      "id": "",
+      "tx": {
+        "from": "address:oracle12",
+        "to": "sc:price-aggregator",
+        "egldValue": "20",
+        "function": "stake",
+        "arguments": [],
+        "gasLimit": "5,000,000"
+      },
+      "expect": {
+        "out": [],
+        "status": "0"
+      }
+    },
+    {
+      "step": "scCall",
+      "id": "",
+      "tx": {
+        "from": "address:oracle13",
+        "to": "sc:price-aggregator",
+        "egldValue": "20",
+        "function": "stake",
+        "arguments": [],
+        "gasLimit": "5,000,000"
+      },
+      "expect": {
+        "out": [],
+        "status": "0"
+      }
+    },
+    {
+      "step": "scCall",
+      "id": "",
+      "tx": {
+        "from": "address:oracle14",
+        "to": "sc:price-aggregator",
+        "egldValue": "20",
+        "function": "stake",
+        "arguments": [],
+        "gasLimit": "5,000,000"
+      },
+      "expect": {
+        "out": [],
+        "status": "0"
+      }
+    },
+    {
+      "step": "scCall",
+      "id": "",
+      "tx": {
+        "from": "address:oracle15",
+        "to": "sc:price-aggregator",
+        "egldValue": "20",
+        "function": "stake",
+        "arguments": [],
+        "gasLimit": "5,000,000"
+      },
+      "expect": {
+        "out": [],
+        "status": "0"
+      }
+    },
+    {
+      "step": "scCall",
+      "id": "",
+      "tx": {
+        "from": "address:oracle16",
+        "to": "sc:price-aggregator",
+        "egldValue": "20",
+        "function": "stake",
+        "arguments": [],
+        "gasLimit": "5,000,000"
+      },
+      "expect": {
+        "out": [],
+        "status": "0"
+      }
+    },
+    {
+      "step": "scCall",
+      "id": "",
+      "tx": {
+        "from": "address:oracle17",
+        "to": "sc:price-aggregator",
+        "egldValue": "20",
+        "function": "stake",
+        "arguments": [],
+        "gasLimit": "5,000,000"
+      },
+      "expect": {
+        "out": [],
+        "status": "0"
+      }
+    },
+    {
+      "step": "scCall",
+      "id": "",
+      "tx": {
+        "from": "address:oracle18",
+        "to": "sc:price-aggregator",
+        "egldValue": "20",
+        "function": "stake",
+        "arguments": [],
+        "gasLimit": "5,000,000"
+      },
+      "expect": {
+        "out": [],
+        "status": "0"
+      }
+    },
+    {
+      "step": "scCall",
+      "id": "",
+      "tx": {
+        "from": "address:oracle19",
+        "to": "sc:price-aggregator",
+        "egldValue": "20",
+        "function": "stake",
+        "arguments": [],
+        "gasLimit": "5,000,000"
+      },
+      "expect": {
+        "out": [],
+        "status": "0"
+      }
+    },
+    {
+      "step": "scCall",
+      "id": "",
+      "tx": {
+        "from": "address:oracle20",
+        "to": "sc:price-aggregator",
+        "egldValue": "20",
+        "function": "stake",
+        "arguments": [],
+        "gasLimit": "5,000,000"
+      },
+      "expect": {
+        "out": [],
+        "status": "0"
+      }
+    },
+    {
+      "step": "scCall",
+      "id": "",
+      "tx": {
+        "from": "address:oracle21",
+        "to": "sc:price-aggregator",
+        "egldValue": "20",
+        "function": "stake",
+        "arguments": [],
+        "gasLimit": "5,000,000"
+      },
+      "expect": {
+        "out": [],
+        "status": "0"
+      }
+    },
+    {
+      "step": "scCall",
+      "id": "",
+      "tx": {
+        "from": "address:oracle22",
+        "to": "sc:price-aggregator",
+        "egldValue": "20",
+        "function": "stake",
+        "arguments": [],
+        "gasLimit": "5,000,000"
+      },
+      "expect": {
+        "out": [],
+        "status": "0"
+      }
+    },
+    {
+      "step": "scCall",
+      "id": "",
+      "tx": {
+        "from": "address:oracle23",
+        "to": "sc:price-aggregator",
+        "egldValue": "20",
+        "function": "stake",
+        "arguments": [],
+        "gasLimit": "5,000,000"
+      },
+      "expect": {
+        "out": [],
+        "status": "0"
+      }
+    },
+    {
+      "step": "scCall",
+      "id": "",
+      "tx": {
+        "from": "address:oracle24",
+        "to": "sc:price-aggregator",
+        "egldValue": "20",
+        "function": "stake",
+        "arguments": [],
+        "gasLimit": "5,000,000"
+      },
+      "expect": {
+        "out": [],
+        "status": "0"
+      }
+    },
+    {
+      "step": "scCall",
+      "id": "",
+      "tx": {
+        "from": "address:oracle25",
+        "to": "sc:price-aggregator",
+        "egldValue": "20",
+        "function": "stake",
+        "arguments": [],
+        "gasLimit": "5,000,000"
+      },
+      "expect": {
+        "out": [],
+        "status": "0"
+      }
+    },
+    {
+      "step": "scCall",
+      "id": "",
+      "tx": {
+        "from": "address:oracle26",
+        "to": "sc:price-aggregator",
+        "egldValue": "20",
+        "function": "stake",
+        "arguments": [],
+        "gasLimit": "5,000,000"
+      },
+      "expect": {
+        "out": [],
+        "status": "0"
+      }
+    },
+    {
+      "step": "scCall",
+      "id": "",
+      "tx": {
+        "from": "address:oracle27",
+        "to": "sc:price-aggregator",
+        "egldValue": "20",
+        "function": "stake",
+        "arguments": [],
+        "gasLimit": "5,000,000"
+      },
+      "expect": {
+        "out": [],
+        "status": "0"
+      }
+    },
+    {
+      "step": "scCall",
+      "id": "",
+      "tx": {
+        "from": "address:oracle28",
+        "to": "sc:price-aggregator",
+        "egldValue": "20",
+        "function": "stake",
+        "arguments": [],
+        "gasLimit": "5,000,000"
+      },
+      "expect": {
+        "out": [],
+        "status": "0"
+      }
+    },
+    {
+      "step": "scCall",
+      "id": "",
+      "tx": {
+        "from": "address:oracle29",
+        "to": "sc:price-aggregator",
+        "egldValue": "20",
+        "function": "stake",
+        "arguments": [],
+        "gasLimit": "5,000,000"
+      },
+      "expect": {
+        "out": [],
+        "status": "0"
+      }
+    },
+    {
+      "step": "scCall",
+      "id": "",
+      "tx": {
+        "from": "address:oracle30",
+        "to": "sc:price-aggregator",
+        "egldValue": "20",
+        "function": "stake",
+        "arguments": [],
+        "gasLimit": "5,000,000"
+      },
+      "expect": {
+        "out": [],
+        "status": "0"
+      }
+    },
+    {
+      "step": "scCall",
+      "id": "",
+      "tx": {
+        "from": "address:oracle31",
+        "to": "sc:price-aggregator",
+        "egldValue": "20",
+        "function": "stake",
+        "arguments": [],
+        "gasLimit": "5,000,000"
+      },
+      "expect": {
+        "out": [],
+        "status": "0"
+      }
+    },
+    {
+      "step": "scCall",
+      "id": "",
+      "tx": {
+        "from": "address:oracle32",
+        "to": "sc:price-aggregator",
+        "egldValue": "20",
+        "function": "stake",
+        "arguments": [],
+        "gasLimit": "5,000,000"
+      },
+      "expect": {
+        "out": [],
+        "status": "0"
+      }
+    },
+    {
+      "step": "scCall",
+      "id": "",
+      "tx": {
+        "from": "address:oracle33",
+        "to": "sc:price-aggregator",
+        "egldValue": "20",
+        "function": "stake",
+        "arguments": [],
+        "gasLimit": "5,000,000"
+      },
+      "expect": {
+        "out": [],
+        "status": "0"
+      }
+    },
+    {
+      "step": "scCall",
+      "id": "",
+      "tx": {
+        "from": "address:oracle34",
+        "to": "sc:price-aggregator",
+        "egldValue": "20",
+        "function": "stake",
+        "arguments": [],
+        "gasLimit": "5,000,000"
+      },
+      "expect": {
+        "out": [],
+        "status": "0"
+      }
+    },
+    {
+      "step": "scCall",
+      "id": "",
+      "tx": {
+        "from": "address:oracle35",
+        "to": "sc:price-aggregator",
+        "egldValue": "20",
+        "function": "stake",
+        "arguments": [],
+        "gasLimit": "5,000,000"
+      },
+      "expect": {
+        "out": [],
+        "status": "0"
+      }
+    },
+    {
+      "step": "scCall",
+      "id": "",
+      "tx": {
+        "from": "address:oracle36",
+        "to": "sc:price-aggregator",
+        "egldValue": "20",
+        "function": "stake",
+        "arguments": [],
+        "gasLimit": "5,000,000"
+      },
+      "expect": {
+        "out": [],
+        "status": "0"
+      }
+    },
+    {
+      "step": "scCall",
+      "id": "",
+      "tx": {
+        "from": "address:oracle37",
+        "to": "sc:price-aggregator",
+        "egldValue": "20",
+        "function": "stake",
+        "arguments": [],
+        "gasLimit": "5,000,000"
+      },
+      "expect": {
+        "out": [],
+        "status": "0"
+      }
+    },
+    {
+      "step": "scCall",
+      "id": "",
+      "tx": {
+        "from": "address:oracle38",
+        "to": "sc:price-aggregator",
+        "egldValue": "20",
+        "function": "stake",
+        "arguments": [],
+        "gasLimit": "5,000,000"
+      },
+      "expect": {
+        "out": [],
+        "status": "0"
+      }
+    },
+    {
+      "step": "scCall",
+      "id": "",
+      "tx": {
+        "from": "address:oracle39",
+        "to": "sc:price-aggregator",
+        "egldValue": "20",
+        "function": "stake",
+        "arguments": [],
+        "gasLimit": "5,000,000"
+      },
+      "expect": {
+        "out": [],
+        "status": "0"
+      }
+    },
+    {
+      "step": "scCall",
+      "id": "",
+      "tx": {
+        "from": "address:oracle40",
+        "to": "sc:price-aggregator",
+        "egldValue": "20",
+        "function": "stake",
+        "arguments": [],
+        "gasLimit": "5,000,000"
+      },
+      "expect": {
+        "out": [],
+        "status": "0"
+      }
+    },
+    {
+      "step": "scCall",
+      "id": "",
+      "tx": {
+        "from": "address:oracle41",
+        "to": "sc:price-aggregator",
+        "egldValue": "20",
+        "function": "stake",
+        "arguments": [],
+        "gasLimit": "5,000,000"
+      },
+      "expect": {
+        "out": [],
+        "status": "0"
+      }
+    },
+    {
+      "step": "scCall",
+      "id": "",
+      "tx": {
+        "from": "address:oracle42",
+        "to": "sc:price-aggregator",
+        "egldValue": "20",
+        "function": "stake",
+        "arguments": [],
+        "gasLimit": "5,000,000"
+      },
+      "expect": {
+        "out": [],
+        "status": "0"
+      }
+    },
+    {
+      "step": "scCall",
+      "id": "",
+      "tx": {
+        "from": "address:oracle43",
+        "to": "sc:price-aggregator",
+        "egldValue": "20",
+        "function": "stake",
+        "arguments": [],
+        "gasLimit": "5,000,000"
+      },
+      "expect": {
+        "out": [],
+        "status": "0"
+      }
+    },
+    {
+      "step": "scCall",
+      "id": "",
+      "tx": {
+        "from": "address:oracle44",
+        "to": "sc:price-aggregator",
+        "egldValue": "20",
+        "function": "stake",
+        "arguments": [],
+        "gasLimit": "5,000,000"
+      },
+      "expect": {
+        "out": [],
+        "status": "0"
+      }
+    },
+    {
+      "step": "scCall",
+      "id": "",
+      "tx": {
+        "from": "address:oracle45",
+        "to": "sc:price-aggregator",
+        "egldValue": "20",
+        "function": "stake",
+        "arguments": [],
+        "gasLimit": "5,000,000"
+      },
+      "expect": {
+        "out": [],
+        "status": "0"
+      }
+    },
+    {
+      "step": "scCall",
+      "id": "",
+      "tx": {
+        "from": "address:oracle46",
+        "to": "sc:price-aggregator",
+        "egldValue": "20",
+        "function": "stake",
+        "arguments": [],
+        "gasLimit": "5,000,000"
+      },
+      "expect": {
+        "out": [],
+        "status": "0"
+      }
+    },
+    {
+      "step": "scCall",
+      "id": "",
+      "tx": {
+        "from": "address:oracle47",
+        "to": "sc:price-aggregator",
+        "egldValue": "20",
+        "function": "stake",
+        "arguments": [],
+        "gasLimit": "5,000,000"
+      },
+      "expect": {
+        "out": [],
+        "status": "0"
+      }
+    },
+    {
+      "step": "scCall",
+      "id": "",
+      "tx": {
+        "from": "address:oracle48",
+        "to": "sc:price-aggregator",
+        "egldValue": "20",
+        "function": "stake",
+        "arguments": [],
+        "gasLimit": "5,000,000"
+      },
+      "expect": {
+        "out": [],
+        "status": "0"
+      }
+    },
+    {
+      "step": "scCall",
+      "id": "",
+      "tx": {
+        "from": "address:oracle49",
+        "to": "sc:price-aggregator",
+        "egldValue": "20",
+        "function": "stake",
+        "arguments": [],
+        "gasLimit": "5,000,000"
+      },
+      "expect": {
+        "out": [],
+        "status": "0"
+      }
+    },
+    {
+      "step": "scCall",
+      "id": "",
+      "tx": {
+        "from": "address:oracle50",
+        "to": "sc:price-aggregator",
+        "egldValue": "20",
+        "function": "stake",
+        "arguments": [],
+        "gasLimit": "5,000,000"
+      },
+      "expect": {
+        "out": [],
+        "status": "0"
+      }
+    },
+    {
+      "step": "scCall",
+      "id": "",
+      "tx": {
+        "from": "address:owner",
+        "to": "sc:price-aggregator",
+        "function": "setPairDecimals",
+        "arguments": [
+          "0x45474c44",
+          "0x55534443",
+          "0x"
+        ],
+        "gasLimit": "5,000,000"
+      },
+      "expect": {
+        "out": [],
+        "status": "0"
+      }
+    },
+    {
+      "step": "scCall",
+      "id": "",
+      "tx": {
+        "from": "address:owner",
+        "to": "sc:price-aggregator",
+        "function": "unpause",
+        "arguments": [],
+        "gasLimit": "5,000,000"
+      },
+      "expect": {
+        "out": [],
+        "status": "0"
+      }
+    },
+    {
+      "step": "scCall",
+      "id": "",
+      "tx": {
+        "from": "address:oracle1",
+        "to": "sc:price-aggregator",
+        "function": "submit",
+        "arguments": [
+          "0x45474c44",
+          "0x55534443",
+          "0x5f",
+          "0xe4431c9cfb505fea",
+          "0x"
+        ],
+        "gasLimit": "7,000,000"
+      },
+      "expect": {
+        "out": [],
+        "status": "0"
+      }
+    },
+    {
+      "step": "scCall",
+      "id": "",
+      "tx": {
+        "from": "address:oracle2",
+        "to": "sc:price-aggregator",
+        "function": "submit",
+        "arguments": [
+          "0x45474c44",
+          "0x55534443",
+          "0x64",
+          "0xcca317a0b6489409",
+          "0x"
+        ],
+        "gasLimit": "7,000,000"
+      },
+      "expect": {
+        "out": [],
+        "status": "0"
+      }
+    },
+    {
+      "step": "scCall",
+      "id": "",
+      "tx": {
+        "from": "address:oracle3",
+        "to": "sc:price-aggregator",
+        "function": "submit",
+        "arguments": [
+          "0x45474c44",
+          "0x55534443",
+          "0x64",
+          "0xd5da94d218e8b3e3",
+          "0x"
+        ],
+        "gasLimit": "7,000,000"
+      },
+      "expect": {
+        "out": [],
+        "status": "0"
+      }
+    },
+    {
+      "step": "scCall",
+      "id": "",
+      "tx": {
+        "from": "address:oracle4",
+        "to": "sc:price-aggregator",
+        "function": "submit",
+        "arguments": [
+          "0x45474c44",
+          "0x55534443",
+          "0x64",
+          "0x9b9f24755509abe6",
+          "0x"
+        ],
+        "gasLimit": "7,000,000"
+      },
+      "expect": {
+        "out": [],
+        "status": "0"
+      }
+    },
+    {
+      "step": "scCall",
+      "id": "",
+      "tx": {
+        "from": "address:oracle5",
+        "to": "sc:price-aggregator",
+        "function": "submit",
+        "arguments": [
+          "0x45474c44",
+          "0x55534443",
+          "0x64",
+          "0x596faa56dc4d9d4e",
+          "0x"
+        ],
+        "gasLimit": "7,000,000"
+      },
+      "expect": {
+        "out": [],
+        "status": "0"
+      }
+    },
+    {
+      "step": "scCall",
+      "id": "",
+      "tx": {
+        "from": "address:oracle6",
+        "to": "sc:price-aggregator",
+        "function": "submit",
+        "arguments": [
+          "0x45474c44",
+          "0x55534443",
+          "0x64",
+          "0x69ccc76678e2499e",
+          "0x"
+        ],
+        "gasLimit": "7,000,000"
+      },
+      "expect": {
+        "out": [],
+        "status": "0"
+      }
+    },
+    {
+      "step": "scCall",
+      "id": "",
+      "tx": {
+        "from": "address:oracle7",
+        "to": "sc:price-aggregator",
+        "function": "submit",
+        "arguments": [
+          "0x45474c44",
+          "0x55534443",
+          "0x64",
+          "0x0176a6a333f061",
+          "0x"
+        ],
+        "gasLimit": "7,000,000"
+      },
+      "expect": {
+        "out": [],
+        "status": "0"
+      }
+    },
+    {
+      "step": "scCall",
+      "id": "",
+      "tx": {
+        "from": "address:oracle8",
+        "to": "sc:price-aggregator",
+        "function": "submit",
+        "arguments": [
+          "0x45474c44",
+          "0x55534443",
+          "0x64",
+          "0xee2ede42941ffb6f",
+          "0x"
+        ],
+        "gasLimit": "7,000,000"
+      },
+      "expect": {
+        "out": [],
+        "status": "0"
+      }
+    },
+    {
+      "step": "scCall",
+      "id": "",
+      "tx": {
+        "from": "address:oracle9",
+        "to": "sc:price-aggregator",
+        "function": "submit",
+        "arguments": [
+          "0x45474c44",
+          "0x55534443",
+          "0x64",
+          "0xfe5a2ca21500c94a",
+          "0x"
+        ],
+        "gasLimit": "7,000,000"
+      },
+      "expect": {
+        "out": [],
+        "status": "0"
+      }
+    },
+    {
+      "step": "scCall",
+      "id": "",
+      "tx": {
+        "from": "address:oracle10",
+        "to": "sc:price-aggregator",
+        "function": "submit",
+        "arguments": [
+          "0x45474c44",
+          "0x55534443",
+          "0x64",
+          "0x98c16991e599ae6b",
+          "0x"
+        ],
+        "gasLimit": "7,000,000"
+      },
+      "expect": {
+        "out": [],
+        "status": "0"
+      }
+    },
+    {
+      "step": "scCall",
+      "id": "",
+      "tx": {
+        "from": "address:oracle11",
+        "to": "sc:price-aggregator",
+        "function": "submit",
+        "arguments": [
+          "0x45474c44",
+          "0x55534443",
+          "0x64",
+          "0xec0197ac7c0da4a2",
+          "0x"
+        ],
+        "gasLimit": "7,000,000"
+      },
+      "expect": {
+        "out": [],
+        "status": "0"
+      }
+    },
+    {
+      "step": "scCall",
+      "id": "",
+      "tx": {
+        "from": "address:oracle12",
+        "to": "sc:price-aggregator",
+        "function": "submit",
+        "arguments": [
+          "0x45474c44",
+          "0x55534443",
+          "0x64",
+          "0x4758692d635dde95",
+          "0x"
+        ],
+        "gasLimit": "7,000,000"
+      },
+      "expect": {
+        "out": [],
+        "status": "0"
+      }
+    },
+    {
+      "step": "scCall",
+      "id": "",
+      "tx": {
+        "from": "address:oracle13",
+        "to": "sc:price-aggregator",
+        "function": "submit",
+        "arguments": [
+          "0x45474c44",
+          "0x55534443",
+          "0x64",
+          "0xfa99ca83e839c136",
+          "0x"
+        ],
+        "gasLimit": "7,000,000"
+      },
+      "expect": {
+        "out": [],
+        "status": "0"
+      }
+    },
+    {
+      "step": "scCall",
+      "id": "",
+      "tx": {
+        "from": "address:oracle14",
+        "to": "sc:price-aggregator",
+        "function": "submit",
+        "arguments": [
+          "0x45474c44",
+          "0x55534443",
+          "0x64",
+          "0x2542eed0ad760b6f",
+          "0x"
+        ],
+        "gasLimit": "7,000,000"
+      },
+      "expect": {
+        "out": [],
+        "status": "0"
+      }
+    },
+    {
+      "step": "scCall",
+      "id": "",
+      "tx": {
+        "from": "address:oracle15",
+        "to": "sc:price-aggregator",
+        "function": "submit",
+        "arguments": [
+          "0x45474c44",
+          "0x55534443",
+          "0x64",
+          "0xcaa56ad357bf558a",
+          "0x"
+        ],
+        "gasLimit": "7,000,000"
+      },
+      "expect": {
+        "out": [],
+        "status": "0"
+      }
+    },
+    {
+      "step": "scCall",
+      "id": "",
+      "tx": {
+        "from": "address:oracle16",
+        "to": "sc:price-aggregator",
+        "function": "submit",
+        "arguments": [
+          "0x45474c44",
+          "0x55534443",
+          "0x64",
+          "0x4104ad72636fdc35",
+          "0x"
+        ],
+        "gasLimit": "7,000,000"
+      },
+      "expect": {
+        "out": [],
+        "status": "0"
+      }
+    },
+    {
+      "step": "scCall",
+      "id": "",
+      "tx": {
+        "from": "address:oracle17",
+        "to": "sc:price-aggregator",
+        "function": "submit",
+        "arguments": [
+          "0x45474c44",
+          "0x55534443",
+          "0x64",
+          "0x08b6adc46d6dccf0",
+          "0x"
+        ],
+        "gasLimit": "7,000,000"
+      },
+      "expect": {
+        "out": [],
+        "status": "0"
+      }
+    },
+    {
+      "step": "scCall",
+      "id": "",
+      "tx": {
+        "from": "address:oracle18",
+        "to": "sc:price-aggregator",
+        "function": "submit",
+        "arguments": [
+          "0x45474c44",
+          "0x55534443",
+          "0x64",
+          "0xb5c8708954d584e4",
+          "0x"
+        ],
+        "gasLimit": "7,000,000"
+      },
+      "expect": {
+        "out": [],
+        "status": "0"
+      }
+    },
+    {
+      "step": "scCall",
+      "id": "",
+      "tx": {
+        "from": "address:oracle19",
+        "to": "sc:price-aggregator",
+        "function": "submit",
+        "arguments": [
+          "0x45474c44",
+          "0x55534443",
+          "0x64",
+          "0x6136e999fb83ab09",
+          "0x"
+        ],
+        "gasLimit": "7,000,000"
+      },
+      "expect": {
+        "out": [],
+        "status": "0"
+      }
+    },
+    {
+      "step": "scCall",
+      "id": "",
+      "tx": {
+        "from": "address:oracle20",
+        "to": "sc:price-aggregator",
+        "function": "submit",
+        "arguments": [
+          "0x45474c44",
+          "0x55534443",
+          "0x64",
+          "0x214d92d0a7450389",
+          "0x"
+        ],
+        "gasLimit": "7,000,000"
+      },
+      "expect": {
+        "out": [],
+        "status": "0"
+      }
+    },
+    {
+      "step": "scCall",
+      "id": "",
+      "tx": {
+        "from": "address:oracle21",
+        "to": "sc:price-aggregator",
+        "function": "submit",
+        "arguments": [
+          "0x45474c44",
+          "0x55534443",
+          "0x64",
+          "0xea21e03952d07af9",
+          "0x"
+        ],
+        "gasLimit": "7,000,000"
+      },
+      "expect": {
+        "out": [],
+        "status": "0"
+      }
+    },
+    {
+      "step": "scCall",
+      "id": "",
+      "tx": {
+        "from": "address:oracle22",
+        "to": "sc:price-aggregator",
+        "function": "submit",
+        "arguments": [
+          "0x45474c44",
+          "0x55534443",
+          "0x64",
+          "0xdd822b3e1a5bb8a3",
+          "0x"
+        ],
+        "gasLimit": "7,000,000"
+      },
+      "expect": {
+        "out": [],
+        "status": "0"
+      }
+    },
+    {
+      "step": "scCall",
+      "id": "",
+      "tx": {
+        "from": "address:oracle23",
+        "to": "sc:price-aggregator",
+        "function": "submit",
+        "arguments": [
+          "0x45474c44",
+          "0x55534443",
+          "0x64",
+          "0x80e2a3c4b931c4bc",
+          "0x"
+        ],
+        "gasLimit": "7,000,000"
+      },
+      "expect": {
+        "out": [],
+        "status": "0"
+      }
+    },
+    {
+      "step": "scCall",
+      "id": "",
+      "tx": {
+        "from": "address:oracle24",
+        "to": "sc:price-aggregator",
+        "function": "submit",
+        "arguments": [
+          "0x45474c44",
+          "0x55534443",
+          "0x64",
+          "0x279c3fa2eeaf0fb0",
+          "0x"
+        ],
+        "gasLimit": "7,000,000"
+      },
+      "expect": {
+        "out": [],
+        "status": "0"
+      }
+    },
+    {
+      "step": "scCall",
+      "id": "",
+      "tx": {
+        "from": "address:oracle25",
+        "to": "sc:price-aggregator",
+        "function": "submit",
+        "arguments": [
+          "0x45474c44",
+          "0x55534443",
+          "0x64",
+          "0x768021226eba1043",
+          "0x"
+        ],
+        "gasLimit": "7,000,000"
+      },
+      "expect": {
+        "out": [],
+        "status": "0"
+      }
+    },
+    {
+      "step": "scCall",
+      "id": "",
+      "tx": {
+        "from": "address:oracle26",
+        "to": "sc:price-aggregator",
+        "function": "submit",
+        "arguments": [
+          "0x45474c44",
+          "0x55534443",
+          "0x64",
+          "0x026089384f007444",
+          "0x"
+        ],
+        "gasLimit": "7,000,000"
+      },
+      "expect": {
+        "out": [],
+        "status": "0"
+      }
+    },
+    {
+      "step": "scCall",
+      "id": "",
+      "tx": {
+        "from": "address:oracle27",
+        "to": "sc:price-aggregator",
+        "function": "submit",
+        "arguments": [
+          "0x45474c44",
+          "0x55534443",
+          "0x64",
+          "0x49f7ab393052bb",
+          "0x"
+        ],
+        "gasLimit": "7,000,000"
+      },
+      "expect": {
+        "out": [],
+        "status": "0"
+      }
+    },
+    {
+      "step": "scCall",
+      "id": "",
+      "tx": {
+        "from": "address:oracle28",
+        "to": "sc:price-aggregator",
+        "function": "submit",
+        "arguments": [
+          "0x45474c44",
+          "0x55534443",
+          "0x64",
+          "0x049afbf40fa88fb8",
+          "0x"
+        ],
+        "gasLimit": "7,000,000"
+      },
+      "expect": {
+        "out": [],
+        "status": "0"
+      }
+    },
+    {
+      "step": "scCall",
+      "id": "",
+      "tx": {
+        "from": "address:oracle29",
+        "to": "sc:price-aggregator",
+        "function": "submit",
+        "arguments": [
+          "0x45474c44",
+          "0x55534443",
+          "0x64",
+          "0x6d9edf2f943d0c48",
+          "0x"
+        ],
+        "gasLimit": "7,000,000"
+      },
+      "expect": {
+        "out": [],
+        "status": "0"
+      }
+    },
+    {
+      "step": "scCall",
+      "id": "",
+      "tx": {
+        "from": "address:oracle30",
+        "to": "sc:price-aggregator",
+        "function": "submit",
+        "arguments": [
+          "0x45474c44",
+          "0x55534443",
+          "0x64",
+          "0x9fa99de813defc0c",
+          "0x"
+        ],
+        "gasLimit": "7,000,000"
+      },
+      "expect": {
+        "out": [],
+        "status": "0"
+      }
+    },
+    {
+      "step": "scCall",
+      "id": "",
+      "tx": {
+        "from": "address:oracle31",
+        "to": "sc:price-aggregator",
+        "function": "submit",
+        "arguments": [
+          "0x45474c44",
+          "0x55534443",
+          "0x64",
+          "0xd1d93e3611904d25",
+          "0x"
+        ],
+        "gasLimit": "7,000,000"
+      },
+      "expect": {
+        "out": [],
+        "status": "0"
+      }
+    },
+    {
+      "step": "scCall",
+      "id": "",
+      "tx": {
+        "from": "address:oracle32",
+        "to": "sc:price-aggregator",
+        "function": "submit",
+        "arguments": [
+          "0x45474c44",
+          "0x55534443",
+          "0x64",
+          "0x8696ff1edc27700e",
+          "0x"
+        ],
+        "gasLimit": "7,000,000"
+      },
+      "expect": {
+        "out": [],
+        "status": "0"
+      }
+    },
+    {
+      "step": "scCall",
+      "id": "",
+      "tx": {
+        "from": "address:oracle33",
+        "to": "sc:price-aggregator",
+        "function": "submit",
+        "arguments": [
+          "0x45474c44",
+          "0x55534443",
+          "0x64",
+          "0xb20b2290aaa5a45e",
+          "0x"
+        ],
+        "gasLimit": "7,000,000"
+      },
+      "expect": {
+        "out": [],
+        "status": "0"
+      }
+    },
+    {
+      "step": "scCall",
+      "id": "",
+      "tx": {
+        "from": "address:oracle34",
+        "to": "sc:price-aggregator",
+        "function": "submit",
+        "arguments": [
+          "0x45474c44",
+          "0x55534443",
+          "0x64",
+          "0x46f399722142c7dc",
+          "0x"
+        ],
+        "gasLimit": "7,000,000"
+      },
+      "expect": {
+        "out": [],
+        "status": "0"
+      }
+    },
+    {
+      "step": "scCall",
+      "id": "",
+      "tx": {
+        "from": "address:oracle35",
+        "to": "sc:price-aggregator",
+        "function": "submit",
+        "arguments": [
+          "0x45474c44",
+          "0x55534443",
+          "0x64",
+          "0x812c7b08e5ef93bb",
+          "0x"
+        ],
+        "gasLimit": "7,000,000"
+      },
+      "expect": {
+        "out": [],
+        "status": "0"
+      }
+    },
+    {
+      "step": "scCall",
+      "id": "",
+      "tx": {
+        "from": "address:oracle36",
+        "to": "sc:price-aggregator",
+        "function": "submit",
+        "arguments": [
+          "0x45474c44",
+          "0x55534443",
+          "0x64",
+          "0x9f42bd04602aabfa",
+          "0x"
+        ],
+        "gasLimit": "7,000,000"
+      },
+      "expect": {
+        "out": [],
+        "status": "0"
+      }
+    },
+    {
+      "step": "scCall",
+      "id": "",
+      "tx": {
+        "from": "address:oracle37",
+        "to": "sc:price-aggregator",
+        "function": "submit",
+        "arguments": [
+          "0x45474c44",
+          "0x55534443",
+          "0x64",
+          "0x3313bced09c1b91f",
+          "0x"
+        ],
+        "gasLimit": "7,000,000"
+      },
+      "expect": {
+        "out": [],
+        "status": "0"
+      }
+    },
+    {
+      "step": "scCall",
+      "id": "",
+      "tx": {
+        "from": "address:oracle38",
+        "to": "sc:price-aggregator",
+        "function": "submit",
+        "arguments": [
+          "0x45474c44",
+          "0x55534443",
+          "0x64",
+          "0xcc71d4a051c86da1",
+          "0x"
+        ],
+        "gasLimit": "7,000,000"
+      },
+      "expect": {
+        "out": [],
+        "status": "0"
+      }
+    },
+    {
+      "step": "scCall",
+      "id": "",
+      "tx": {
+        "from": "address:oracle39",
+        "to": "sc:price-aggregator",
+        "function": "submit",
+        "arguments": [
+          "0x45474c44",
+          "0x55534443",
+          "0x64",
+          "0x020dcbfee96f9111",
+          "0x"
+        ],
+        "gasLimit": "7,000,000"
+      },
+      "expect": {
+        "out": [],
+        "status": "0"
+      }
+    },
+    {
+      "step": "scCall",
+      "id": "",
+      "tx": {
+        "from": "address:oracle40",
+        "to": "sc:price-aggregator",
+        "function": "submit",
+        "arguments": [
+          "0x45474c44",
+          "0x55534443",
+          "0x64",
+          "0x66803b9e9fb6ae87",
+          "0x"
+        ],
+        "gasLimit": "7,000,000"
+      },
+      "expect": {
+        "out": [],
+        "status": "0"
+      }
+    },
+    {
+      "step": "scCall",
+      "id": "",
+      "tx": {
+        "from": "address:oracle41",
+        "to": "sc:price-aggregator",
+        "function": "submit",
+        "arguments": [
+          "0x45474c44",
+          "0x55534443",
+          "0x64",
+          "0x5e784067e72d6000",
+          "0x"
+        ],
+        "gasLimit": "7,000,000"
+      },
+      "expect": {
+        "out": [],
+        "status": "0"
+      }
+    },
+    {
+      "step": "scCall",
+      "id": "",
+      "tx": {
+        "from": "address:oracle42",
+        "to": "sc:price-aggregator",
+        "function": "submit",
+        "arguments": [
+          "0x45474c44",
+          "0x55534443",
+          "0x64",
+          "0x1990e5a459100514",
+          "0x"
+        ],
+        "gasLimit": "7,000,000"
+      },
+      "expect": {
+        "out": [],
+        "status": "0"
+      }
+    },
+    {
+      "step": "scCall",
+      "id": "",
+      "tx": {
+        "from": "address:oracle43",
+        "to": "sc:price-aggregator",
+        "function": "submit",
+        "arguments": [
+          "0x45474c44",
+          "0x55534443",
+          "0x64",
+          "0x643b36cf7c98aed2",
+          "0x"
+        ],
+        "gasLimit": "7,000,000"
+      },
+      "expect": {
+        "out": [],
+        "status": "0"
+      }
+    },
+    {
+      "step": "scCall",
+      "id": "",
+      "tx": {
+        "from": "address:oracle44",
+        "to": "sc:price-aggregator",
+        "function": "submit",
+        "arguments": [
+          "0x45474c44",
+          "0x55534443",
+          "0x64",
+          "0x19b768a5982e5d17",
+          "0x"
+        ],
+        "gasLimit": "7,000,000"
+      },
+      "expect": {
+        "out": [],
+        "status": "0"
+      }
+    },
+    {
+      "step": "scCall",
+      "id": "",
+      "tx": {
+        "from": "address:oracle45",
+        "to": "sc:price-aggregator",
+        "function": "submit",
+        "arguments": [
+          "0x45474c44",
+          "0x55534443",
+          "0x64",
+          "0xe8396bc4dade2e38",
+          "0x"
+        ],
+        "gasLimit": "7,000,000"
+      },
+      "expect": {
+        "out": [],
+        "status": "0"
+      }
+    },
+    {
+      "step": "scCall",
+      "id": "",
+      "tx": {
+        "from": "address:oracle46",
+        "to": "sc:price-aggregator",
+        "function": "submit",
+        "arguments": [
+          "0x45474c44",
+          "0x55534443",
+          "0x64",
+          "0xbd1b166e888f23b8",
+          "0x"
+        ],
+        "gasLimit": "7,000,000"
+      },
+      "expect": {
+        "out": [],
+        "status": "0"
+      }
+    },
+    {
+      "step": "scCall",
+      "id": "",
+      "tx": {
+        "from": "address:oracle47",
+        "to": "sc:price-aggregator",
+        "function": "submit",
+        "arguments": [
+          "0x45474c44",
+          "0x55534443",
+          "0x64",
+          "0x4541ecf9e1bcd219",
+          "0x"
+        ],
+        "gasLimit": "7,000,000"
+      },
+      "expect": {
+        "out": [],
+        "status": "0"
+      }
+    },
+    {
+      "step": "scCall",
+      "id": "",
+      "tx": {
+        "from": "address:oracle48",
+        "to": "sc:price-aggregator",
+        "function": "submit",
+        "arguments": [
+          "0x45474c44",
+          "0x55534443",
+          "0x64",
+          "0xac32e3eac4733d3e",
+          "0x"
+        ],
+        "gasLimit": "7,000,000"
+      },
+      "expect": {
+        "out": [],
+        "status": "0"
+      }
+    },
+    {
+      "step": "scCall",
+      "id": "",
+      "tx": {
+        "from": "address:oracle49",
+        "to": "sc:price-aggregator",
+        "function": "submit",
+        "arguments": [
+          "0x45474c44",
+          "0x55534443",
+          "0x64",
+          "0x7d7dde2542dfa2d9",
+          "0x"
+        ],
+        "gasLimit": "7,000,000"
+      },
+      "expect": {
+        "out": [],
+        "status": "0"
+      }
+    },
+    {
+      "step": "scCall",
+      "id": "",
+      "tx": {
+        "from": "address:oracle50",
+        "to": "sc:price-aggregator",
+        "function": "submit",
+        "arguments": [
+          "0x45474c44",
+          "0x55534443",
+          "0x64",
+          "0xd2c63e8cf9db301a",
+          "0x"
+        ],
+        "gasLimit": "7,000,000"
+      },
+      "expect": {
+        "out": [],
+        "status": "0"
+      }
+    }
+  ]
+}
\ No newline at end of file

From 17855b0dc1eead02af34b55ab5d940a53d3d9d21 Mon Sep 17 00:00:00 2001
From: Alexandru Popenta <alexandru.p9913@gmail.com>
Date: Wed, 20 Mar 2024 18:17:14 +0200
Subject: [PATCH 0481/1254] update actions workflow file

---
 .github/workflows/actions.yml | 145 +++-------------------------------
 1 file changed, 9 insertions(+), 136 deletions(-)

diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
index b6d06db260..c1826f2efe 100644
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -12,112 +12,15 @@ permissions:
   pull-requests: write
 
 jobs:
-  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: Install prerequisites
-        run: |
-          pipx install multiversx-sdk-cli==v9.3.1
-
-          cargo install wasm-opt
-          cargo install twiggy
-
-          cargo install --path framework/meta
-          sc-meta install mx-scenario-go --tag v2.1.0-alpha
-
-          which mxpy
-          which wasm-opt
-          which mx-scenario-go
-
-      - 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 .
-          mxpy 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
-              mxpy contract report --compare report.json --output-format github-markdown --output-file report-table.md
-          else
-              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
-
-      - 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
+  contracts:
+    name: Contracts
+    uses: multiversx/mx-sc-actions/.github/workflows/contracts.yml@654552f55d4bfbbbc78cc7c362e4127ca04c4173
+    with:
+      rust-toolchain: nightly-2023-12-11
+      vmtools-version: v1.5.24
+      path-to-sc-meta: framework/meta
+    secrets:
+      token: ${{ secrets.GITHUB_TOKEN }}
 
   test_coverage:
     name: Test Coverage
@@ -169,33 +72,3 @@ jobs:
           issue-number: ${{ github.event.pull_request.number }}
           body-file: ./coverage.md
           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: nightly-2023-12-11
-
-      - 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: nightly-2023-12-11
-          components: clippy
-      - uses: giraffate/clippy-action@v1
-        env:
-          RUSTFLAGS: ""
-        with:
-          github_token: ${{ github.token }}
-          clippy_flags: --all-targets --all-features

From 058a62b4c27586d7aa07335945632205c645fe67 Mon Sep 17 00:00:00 2001
From: Laurentiu Ciobanu <laurentiu.ciobanu@multiversx.com>
Date: Wed, 20 Mar 2024 18:26:08 +0200
Subject: [PATCH 0482/1254] remove unused import

---
 framework/meta/src/cmd/standalone/test_coverage/cargo.rs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/framework/meta/src/cmd/standalone/test_coverage/cargo.rs b/framework/meta/src/cmd/standalone/test_coverage/cargo.rs
index 5f5660d103..6fb70e13b9 100644
--- a/framework/meta/src/cmd/standalone/test_coverage/cargo.rs
+++ b/framework/meta/src/cmd/standalone/test_coverage/cargo.rs
@@ -1,6 +1,4 @@
-use crate::cmd::standalone::test_coverage::{
-    error::TestCoverageError, util::deep_find_files_with_ext,
-};
+use crate::cmd::standalone::test_coverage::error::TestCoverageError;
 use serde::Deserialize;
 use std::process::Command;
 

From bcad1743e9ad64059c67dd11a6dbb6f4bfead70d Mon Sep 17 00:00:00 2001
From: Alexandru Popenta <alexandru.p9913@gmail.com>
Date: Wed, 20 Mar 2024 18:27:31 +0200
Subject: [PATCH 0483/1254] remove vm-tools arg

---
 .github/workflows/actions.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
index c1826f2efe..37aec0ae8b 100644
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -17,7 +17,6 @@ jobs:
     uses: multiversx/mx-sc-actions/.github/workflows/contracts.yml@654552f55d4bfbbbc78cc7c362e4127ca04c4173
     with:
       rust-toolchain: nightly-2023-12-11
-      vmtools-version: v1.5.24
       path-to-sc-meta: framework/meta
     secrets:
       token: ${{ secrets.GITHUB_TOKEN }}

From 1c2efbb15940a1de1f11e326fc9d8d65d02ebebd Mon Sep 17 00:00:00 2001
From: Laurentiu Ciobanu <laurentiu.ciobanu@multiversx.com>
Date: Wed, 20 Mar 2024 18:38:43 +0200
Subject: [PATCH 0484/1254] fix clippy warnings

---
 framework/meta/src/cmd/standalone/test_coverage/llvm_cov.rs | 6 +++---
 framework/meta/src/cmd/standalone/test_coverage/run.rs      | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/framework/meta/src/cmd/standalone/test_coverage/llvm_cov.rs b/framework/meta/src/cmd/standalone/test_coverage/llvm_cov.rs
index 07413d0b50..5cb139e6de 100644
--- a/framework/meta/src/cmd/standalone/test_coverage/llvm_cov.rs
+++ b/framework/meta/src/cmd/standalone/test_coverage/llvm_cov.rs
@@ -81,8 +81,8 @@ pub fn combine_instrumentation_results(
 pub fn export_coverage_summary(
     root_dir: &str,
     profdata_file: &str,
-    binary_files: &Vec<String>,
-    ignore_filename_regex: &Vec<String>,
+    binary_files: &[String],
+    ignore_filename_regex: &[String],
 ) -> Result<Coverage, TestCoverageError> {
     let objects = binary_files
         .iter()
@@ -103,7 +103,7 @@ pub fn export_coverage_summary(
         .arg("export")
         .args(&objects)
         .args(&ignore_filename_regex)
-        .args(&[
+        .args([
             &format!("--instr-profile={}", profdata_file),
             "--summary-only",
             "--format=text",
diff --git a/framework/meta/src/cmd/standalone/test_coverage/run.rs b/framework/meta/src/cmd/standalone/test_coverage/run.rs
index f15ecdb8d4..bdb810700b 100644
--- a/framework/meta/src/cmd/standalone/test_coverage/run.rs
+++ b/framework/meta/src/cmd/standalone/test_coverage/run.rs
@@ -17,7 +17,7 @@ pub fn run_test_coverage(
     root_path: &str,
     output_path: &str,
     output_format: &TestCoverageOutputFormat,
-    ignore_filename_regex: &Vec<String>,
+    ignore_filename_regex: &[String],
 ) -> Result<(), TestCoverageError> {
     ensure_dependencies_in_path()?;
 
@@ -44,7 +44,7 @@ pub fn run_test_coverage(
 
     match output_format {
         TestCoverageOutputFormat::Markdown => {
-            render_coverage(&mut output, &coverage, &root_path);
+            render_coverage(&mut output, &coverage, root_path);
         },
         TestCoverageOutputFormat::Json => {
             output = serde_json::to_string_pretty(&coverage).unwrap();

From 4a06a1ec96297fc449093c3867feed671ffb82e6 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Wed, 20 Mar 2024 20:26:26 +0200
Subject: [PATCH 0485/1254] tx proxy gen - generate code for struct

---
 contracts/examples/crypto-zombies/src/lib.rs  |   1 +
 .../examples/crypto-zombies/src/temp_proxy.rs | 428 ++++++++++++++++++
 .../examples/crypto-zombies/src/zombie.rs     |   3 +-
 .../examples/digital-cash/src/deposit_info.rs |   3 +-
 framework/base/src/abi/type_description.rs    |  15 +-
 framework/derive/src/type_abi_derive.rs       |  19 +-
 .../generate_proxy/proxy_template_gen.rs      |  38 +-
 7 files changed, 490 insertions(+), 17 deletions(-)
 create mode 100644 contracts/examples/crypto-zombies/src/temp_proxy.rs

diff --git a/contracts/examples/crypto-zombies/src/lib.rs b/contracts/examples/crypto-zombies/src/lib.rs
index f2f47688ad..ed6b9befba 100644
--- a/contracts/examples/crypto-zombies/src/lib.rs
+++ b/contracts/examples/crypto-zombies/src/lib.rs
@@ -9,6 +9,7 @@ mod zombie_attack;
 mod zombie_factory;
 mod zombie_feeding;
 mod zombie_helper;
+pub mod temp_proxy;
 
 #[multiversx_sc::contract]
 pub trait CryptoZombies:
diff --git a/contracts/examples/crypto-zombies/src/temp_proxy.rs b/contracts/examples/crypto-zombies/src/temp_proxy.rs
new file mode 100644
index 0000000000..163be5ffa1
--- /dev/null
+++ b/contracts/examples/crypto-zombies/src/temp_proxy.rs
@@ -0,0 +1,428 @@
+////////////////////////////////////////////////////
+////////////////// AUTO-GENERATED //////////////////
+////////////////////////////////////////////////////
+
+#![allow(clippy::all)]
+
+use multiversx_sc::imports::*;
+
+use multiversx_sc::derive_imports::*;
+
+#[derive(TypeAbi)]
+#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
+pub struct Zombie<Api>
+where
+    Api: ManagedTypeApi,
+{
+    pub name: ManagedBuffer<Api>,
+    pub dna: u64,
+    pub level: u16,
+    pub ready_time: u64,
+    pub win_count: usize,
+    pub loss_count: usize,
+}
+
+pub struct CryptoZombiesProxy;
+
+impl<Env, From, To, Gas> TxProxyTrait<Env, From, To, Gas> for CryptoZombiesProxy
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    type TxProxyMethods = CryptoZombiesProxyMethods<Env, From, To, Gas>;
+
+    fn proxy_methods(self, tx: Tx<Env, From, To, (), Gas, (), ()>) -> Self::TxProxyMethods {
+        CryptoZombiesProxyMethods { wrapped_tx: tx }
+    }
+}
+
+pub struct CryptoZombiesProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    wrapped_tx: Tx<Env, From, To, (), Gas, (), ()>,
+}
+
+impl<Env, From, Gas> CryptoZombiesProxyMethods<Env, From, (), Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn init(
+        self,
+    ) -> Tx<
+        Env,
+        From,
+        (),
+        (),
+        Gas,
+        DeployCall<Env, ()>,
+        OriginalResultMarker<()>,
+    > {
+        self.wrapped_tx
+            .raw_deploy()
+            .original_result()
+    }
+
+}
+impl<Env, From, To, Gas> CryptoZombiesProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn set_crypto_kitties_sc_address<
+        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+    >(
+        self,
+        address: Arg0,
+    ) -> Tx<
+        Env,
+        From,
+        To,
+        (),
+        Gas,
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<()>,
+    > {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("set_crypto_kitties_sc_address")
+            .argument(&address)
+            .original_result()
+    }
+
+    pub fn generate_random_dna(
+        self,
+    ) -> Tx<
+        Env,
+        From,
+        To,
+        (),
+        Gas,
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<u64>,
+    > {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("generate_random_dna")
+            .original_result()
+    }
+
+    pub fn create_random_zombie<
+        Arg0: CodecInto<ManagedBuffer<Env::Api>>,
+    >(
+        self,
+        name: Arg0,
+    ) -> Tx<
+        Env,
+        From,
+        To,
+        (),
+        Gas,
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<()>,
+    > {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("create_random_zombie")
+            .argument(&name)
+            .original_result()
+    }
+
+    pub fn is_ready<
+        Arg0: CodecInto<usize>,
+    >(
+        self,
+        zombie_id: Arg0,
+    ) -> Tx<
+        Env,
+        From,
+        To,
+        (),
+        Gas,
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<bool>,
+    > {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("is_ready")
+            .argument(&zombie_id)
+            .original_result()
+    }
+
+    pub fn feed_on_kitty<
+        Arg0: CodecInto<usize>,
+        Arg1: CodecInto<u32>,
+    >(
+        self,
+        zombie_id: Arg0,
+        kitty_id: Arg1,
+    ) -> Tx<
+        Env,
+        From,
+        To,
+        (),
+        Gas,
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<()>,
+    > {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("feed_on_kitty")
+            .argument(&zombie_id)
+            .argument(&kitty_id)
+            .original_result()
+    }
+
+    pub fn dna_digits(
+        self,
+    ) -> Tx<
+        Env,
+        From,
+        To,
+        (),
+        Gas,
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<u8>,
+    > {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("dna_digits")
+            .original_result()
+    }
+
+    pub fn zombies_count(
+        self,
+    ) -> Tx<
+        Env,
+        From,
+        To,
+        (),
+        Gas,
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<usize>,
+    > {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("zombies_count")
+            .original_result()
+    }
+
+    pub fn zombies<
+        Arg0: CodecInto<usize>,
+    >(
+        self,
+        id: Arg0,
+    ) -> Tx<
+        Env,
+        From,
+        To,
+        (),
+        Gas,
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<Zombie<Env::Api>>,
+    > {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("zombies")
+            .argument(&id)
+            .original_result()
+    }
+
+    pub fn zombie_owner<
+        Arg0: CodecInto<usize>,
+    >(
+        self,
+        id: Arg0,
+    ) -> Tx<
+        Env,
+        From,
+        To,
+        (),
+        Gas,
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<ManagedAddress<Env::Api>>,
+    > {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("zombie_owner")
+            .argument(&id)
+            .original_result()
+    }
+
+    pub fn crypto_kitties_sc_address(
+        self,
+    ) -> Tx<
+        Env,
+        From,
+        To,
+        (),
+        Gas,
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<ManagedAddress<Env::Api>>,
+    > {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("crypto_kitties_sc_address")
+            .original_result()
+    }
+
+    pub fn cooldown_time(
+        self,
+    ) -> Tx<
+        Env,
+        From,
+        To,
+        (),
+        Gas,
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<u64>,
+    > {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("cooldown_time")
+            .original_result()
+    }
+
+    pub fn owned_zombies<
+        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+    >(
+        self,
+        owner: Arg0,
+    ) -> Tx<
+        Env,
+        From,
+        To,
+        (),
+        Gas,
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<MultiValueEncoded<Env::Api, usize>>,
+    > {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("owned_zombies")
+            .argument(&owner)
+            .original_result()
+    }
+
+    pub fn level_up<
+        Arg0: CodecInto<usize>,
+    >(
+        self,
+        zombie_id: Arg0,
+    ) -> Tx<
+        Env,
+        From,
+        To,
+        (),
+        Gas,
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<()>,
+    > {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("level_up")
+            .argument(&zombie_id)
+            .original_result()
+    }
+
+    pub fn withdraw(
+        self,
+    ) -> Tx<
+        Env,
+        From,
+        To,
+        (),
+        Gas,
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<()>,
+    > {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("withdraw")
+            .original_result()
+    }
+
+    pub fn change_name<
+        Arg0: CodecInto<usize>,
+        Arg1: CodecInto<ManagedBuffer<Env::Api>>,
+    >(
+        self,
+        zombie_id: Arg0,
+        name: Arg1,
+    ) -> Tx<
+        Env,
+        From,
+        To,
+        (),
+        Gas,
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<()>,
+    > {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("change_name")
+            .argument(&zombie_id)
+            .argument(&name)
+            .original_result()
+    }
+
+    pub fn change_dna<
+        Arg0: CodecInto<usize>,
+        Arg1: CodecInto<u64>,
+    >(
+        self,
+        zombie_id: Arg0,
+        dna: Arg1,
+    ) -> Tx<
+        Env,
+        From,
+        To,
+        (),
+        Gas,
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<()>,
+    > {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("change_dna")
+            .argument(&zombie_id)
+            .argument(&dna)
+            .original_result()
+    }
+
+    pub fn attack<
+        Arg0: CodecInto<usize>,
+        Arg1: CodecInto<usize>,
+    >(
+        self,
+        zombie_id: Arg0,
+        target_id: Arg1,
+    ) -> Tx<
+        Env,
+        From,
+        To,
+        (),
+        Gas,
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<()>,
+    > {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("attack")
+            .argument(&zombie_id)
+            .argument(&target_id)
+            .original_result()
+    }
+
+}
diff --git a/contracts/examples/crypto-zombies/src/zombie.rs b/contracts/examples/crypto-zombies/src/zombie.rs
index 414c343f28..858d1b791c 100644
--- a/contracts/examples/crypto-zombies/src/zombie.rs
+++ b/contracts/examples/crypto-zombies/src/zombie.rs
@@ -1,6 +1,7 @@
 use multiversx_sc::{derive_imports::*, imports::*};
 
-#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, TypeAbi)]
+#[derive(TypeAbi)]
+#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct Zombie<M: ManagedTypeApi> {
     pub name: ManagedBuffer<M>,
     pub dna: u64,
diff --git a/contracts/examples/digital-cash/src/deposit_info.rs b/contracts/examples/digital-cash/src/deposit_info.rs
index 9fb14661ea..0164db2090 100644
--- a/contracts/examples/digital-cash/src/deposit_info.rs
+++ b/contracts/examples/digital-cash/src/deposit_info.rs
@@ -1,6 +1,7 @@
 use multiversx_sc::{derive_imports::*, imports::*};
 
-#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, TypeAbi)]
+#[derive(TypeAbi)]
+#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct DepositInfo<M: ManagedTypeApi> {
     pub depositor_address: ManagedAddress<M>,
     pub esdt_funds: ManagedVec<M, EsdtTokenPayment<M>>,
diff --git a/framework/base/src/abi/type_description.rs b/framework/base/src/abi/type_description.rs
index cee01bfa58..011b07d00c 100644
--- a/framework/base/src/abi/type_description.rs
+++ b/framework/base/src/abi/type_description.rs
@@ -67,16 +67,13 @@ impl TypeContents {
                     names.push(enum_variant.name.clone());
                 }
             },
-            TypeContents::Struct(_struct_fields) => {
-                // for struct_field in struct_fields {
-                //     todo!()
-                // }
-            },
-            TypeContents::ExplicitEnum(_explicit_enum_variants) => {
-                // for explicit_enum_variant in explicit_enum_variants {
-                //     todo!()
-                // }
+            TypeContents::Struct(struct_fields) => {
+                for struct_field in struct_fields {
+                    names.push(struct_field.name.clone());
+                    names.push(struct_field.field_type.clone());
+                }
             },
+            TypeContents::ExplicitEnum(_explicit_enum_variants) => {},
             TypeContents::NotSpecified => {},
         }
 
diff --git a/framework/derive/src/type_abi_derive.rs b/framework/derive/src/type_abi_derive.rs
index 13fab6baa3..aad347ba31 100644
--- a/framework/derive/src/type_abi_derive.rs
+++ b/framework/derive/src/type_abi_derive.rs
@@ -2,7 +2,7 @@ use crate::parse::attributes::extract_macro_attributes;
 
 use super::parse::attributes::extract_doc;
 use proc_macro::TokenStream;
-use quote::quote;
+use quote::{quote, ToTokens};
 
 pub struct ExplicitDiscriminant {
     pub variant_index: usize,
@@ -21,7 +21,7 @@ fn field_snippet(index: usize, field: &syn::Field) -> proc_macro2::TokenStream {
         field_descriptions.push(multiversx_sc::abi::StructFieldDescription::new(
             &[ #(#field_docs),* ],
             #field_name_str,
-            <#field_ty>::type_name(),
+            <#field_ty>::type_name_rust(),
         ));
         <#field_ty>::provide_type_descriptions(accumulator);
     }
@@ -122,6 +122,7 @@ pub fn type_abi_derive(ast: &syn::DeriveInput) -> TokenStream {
     let name = &ast.ident;
     let name_str = name.to_string();
     let (impl_generics, ty_generics, where_clause) = &ast.generics.split_for_impl();
+    let name_rust = extract_rust_type(ty_generics, name_str.clone());
     let type_abi_impl = quote! {
         impl #impl_generics multiversx_sc::abi::TypeAbi for #name #ty_generics #where_clause {
             fn type_name() -> multiversx_sc::abi::TypeName {
@@ -129,7 +130,7 @@ pub fn type_abi_derive(ast: &syn::DeriveInput) -> TokenStream {
             }
 
             fn type_name_rust() -> multiversx_sc::abi::TypeName {
-                #name_str.into()
+                #name_rust.into()
             }
 
             #type_description_impl
@@ -180,3 +181,15 @@ pub fn get_discriminant(
 
     quote! { #next_value}
 }
+
+fn extract_rust_type(ty_generics: &syn::TypeGenerics<'_>, mut output_name: String) -> String {
+    let mut ty_generics_tokens = proc_macro2::TokenStream::new();
+    ty_generics.to_tokens(&mut ty_generics_tokens);
+
+    if ty_generics_tokens.to_string().is_empty() {
+        return output_name;
+    }
+
+    output_name.push_str("<$API>");
+    return output_name;
+}
diff --git a/framework/meta/src/cmd/contract/generate_proxy/proxy_template_gen.rs b/framework/meta/src/cmd/contract/generate_proxy/proxy_template_gen.rs
index 25dd7a150d..5ae0202317 100644
--- a/framework/meta/src/cmd/contract/generate_proxy/proxy_template_gen.rs
+++ b/framework/meta/src/cmd/contract/generate_proxy/proxy_template_gen.rs
@@ -25,9 +25,12 @@ pub(crate) fn write_header(file: &mut File) {
 }
 
 pub(crate) fn write_types(file: &mut File, types: &TypeDescriptionContainerImpl) {
-    for t in types.0.iter() {
-        if matches!(t.1.contents, TypeContents::Enum(_)) {
-            write_enum(file, &t.1);
+    for (_, type_description) in &types.0 {
+        match &type_description.contents {
+            TypeContents::Enum(_) => write_enum(file, type_description),
+            TypeContents::Struct(_) => write_struct(file, type_description),
+            TypeContents::NotSpecified => {},
+            TypeContents::ExplicitEnum(_) => {},
         }
     }
 }
@@ -94,6 +97,35 @@ fn write_enum(file: &mut File, type_description: &TypeDescription) {
     write_newline(file);
 }
 
+fn write_struct(file: &mut File, type_description: &TypeDescription) {
+    let struct_name = type_description.names.rust.replace("$API", "Api");
+
+    write_derive_imports(file);
+    write_macro_attributes(file, &type_description.macro_attributes);
+    writeln!(file, r#"pub struct {}"#, struct_name).unwrap();
+
+    if struct_name.contains("<Api>") {
+        writeln!(
+            file,
+            r#"where
+    Api: ManagedTypeApi,"#
+        )
+        .unwrap();
+    }
+
+    writeln!(file, r#"{{"#).unwrap();
+
+    for content in type_description.contents.extract_names().chunks_exact(2) {
+        let variable_name = &content[0];
+        let variable_type = &content[1].replace("$API", "Api");
+
+        writeln!(file, "    pub {variable_name}: {variable_type},").unwrap();
+    }
+
+    writeln!(file, "}}").unwrap();
+    write_newline(file);
+}
+
 fn write_macro_attributes(file: &mut File, macro_attributes: &[String]) {
     writeln!(file, "#[derive(TypeAbi)]").unwrap();
     if !macro_attributes.is_empty() {

From 1ca8287df4cc9a39e1097c78418f8748b9df8d2a Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Wed, 20 Mar 2024 20:34:26 +0200
Subject: [PATCH 0486/1254] tx proxy gen - cleanup

---
 .../examples/crypto-zombies/src/temp_proxy.rs | 32 +++++++++----------
 framework/derive/src/type_abi_derive.rs       |  2 +-
 .../contract/generate_proxy/proxy_gen_main.rs |  4 +--
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/contracts/examples/crypto-zombies/src/temp_proxy.rs b/contracts/examples/crypto-zombies/src/temp_proxy.rs
index 163be5ffa1..32f130dfdc 100644
--- a/contracts/examples/crypto-zombies/src/temp_proxy.rs
+++ b/contracts/examples/crypto-zombies/src/temp_proxy.rs
@@ -6,22 +6,6 @@
 
 use multiversx_sc::imports::*;
 
-use multiversx_sc::derive_imports::*;
-
-#[derive(TypeAbi)]
-#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
-pub struct Zombie<Api>
-where
-    Api: ManagedTypeApi,
-{
-    pub name: ManagedBuffer<Api>,
-    pub dna: u64,
-    pub level: u16,
-    pub ready_time: u64,
-    pub win_count: usize,
-    pub loss_count: usize,
-}
-
 pub struct CryptoZombiesProxy;
 
 impl<Env, From, To, Gas> TxProxyTrait<Env, From, To, Gas> for CryptoZombiesProxy
@@ -426,3 +410,19 @@ where
     }
 
 }
+use multiversx_sc::derive_imports::*;
+
+#[derive(TypeAbi)]
+#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
+pub struct Zombie<Api>
+where
+    Api: ManagedTypeApi,
+{
+    pub name: ManagedBuffer<Api>,
+    pub dna: u64,
+    pub level: u16,
+    pub ready_time: u64,
+    pub win_count: usize,
+    pub loss_count: usize,
+}
+
diff --git a/framework/derive/src/type_abi_derive.rs b/framework/derive/src/type_abi_derive.rs
index aad347ba31..cd93bdf33a 100644
--- a/framework/derive/src/type_abi_derive.rs
+++ b/framework/derive/src/type_abi_derive.rs
@@ -191,5 +191,5 @@ fn extract_rust_type(ty_generics: &syn::TypeGenerics<'_>, mut output_name: Strin
     }
 
     output_name.push_str("<$API>");
-    return output_name;
+    output_name
 }
diff --git a/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_main.rs b/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_main.rs
index 93cdb7a8e6..de78b53162 100644
--- a/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_main.rs
+++ b/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_main.rs
@@ -25,9 +25,9 @@ impl MetaConfig {
 
 fn write_proxies_to_file(mut file: File, abi: ContractAbi) {
     write_header(&mut file);
-    write_types(&mut file, &abi.type_descriptions);
     write_struct_template(&mut file, &abi.name);
     write_impl_for_tx_proxy(&mut file, &abi.name);
     write_struct_tx_proxy_methods(&mut file, &abi.name);
-    write_content(&mut file, abi);
+    write_content(&mut file, abi.clone());
+    write_types(&mut file, &abi.type_descriptions);
 }

From 82f20ac69793728bd87b29e0a7ca4890e2292b6a Mon Sep 17 00:00:00 2001
From: Alexandru Popenta <alexandru.p9913@gmail.com>
Date: Wed, 20 Mar 2024 20:57:44 +0200
Subject: [PATCH 0487/1254] reference newer commit

---
 .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 37aec0ae8b..4e8efeed0a 100644
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -14,7 +14,7 @@ permissions:
 jobs:
   contracts:
     name: Contracts
-    uses: multiversx/mx-sc-actions/.github/workflows/contracts.yml@654552f55d4bfbbbc78cc7c362e4127ca04c4173
+    uses: multiversx/mx-sc-actions/.github/workflows/contracts.yml@447422c7affe6670871444793f20cbaafbe9d71e
     with:
       rust-toolchain: nightly-2023-12-11
       path-to-sc-meta: framework/meta

From 2d720bf148e6b9e8e0d89362b68dcdfc7eb2d7d3 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 20 Mar 2024 22:12:35 +0200
Subject: [PATCH 0488/1254] proxy-paths in sc-config.toml

---
 .../adder/interact/src/basic_interact.rs      |  8 ++---
 contracts/examples/adder/mxsc-template.toml   |  1 +
 contracts/examples/adder/sc-config.toml       |  2 ++
 contracts/examples/adder/src/adder.rs         |  2 +-
 .../src/{temp_proxy.rs => adder_proxy.rs}     |  0
 .../tests/adder_blackbox_chained_test.rs      |  6 ++--
 .../tests/adder_blackbox_legacy_proxy_test.rs |  2 +-
 .../adder/tests/adder_blackbox_test.rs        |  6 ++--
 framework/base/src/abi/type_abi_impl_basic.rs |  1 -
 .../meta/src/cli_args/cli_args_contract.rs    | 21 ++---------
 framework/meta/src/cmd/contract.rs            |  4 +--
 .../generate_proxy/proxy_crate_gen.rs         | 13 ++-----
 .../contract/generate_proxy/proxy_gen_main.rs | 21 ++++++-----
 .../contract/sc_config/contract_variant.rs    | 15 +++++++-
 .../sc_config/contract_variant_builder.rs     | 35 +++++++++++++++----
 .../cmd/contract/sc_config/sc_config_model.rs |  1 +
 .../cmd/contract/sc_config/sc_config_serde.rs |  4 +++
 .../standalone/template/template_adjuster.rs  |  9 +++++
 18 files changed, 90 insertions(+), 61 deletions(-)
 create mode 100644 contracts/examples/adder/sc-config.toml
 rename contracts/examples/adder/src/{temp_proxy.rs => adder_proxy.rs} (100%)

diff --git a/contracts/examples/adder/interact/src/basic_interact.rs b/contracts/examples/adder/interact/src/basic_interact.rs
index a5687aaede..57ab414d53 100644
--- a/contracts/examples/adder/interact/src/basic_interact.rs
+++ b/contracts/examples/adder/interact/src/basic_interact.rs
@@ -2,7 +2,7 @@ mod basic_interact_cli;
 mod basic_interact_config;
 mod basic_interact_state;
 
-use adder::{temp_proxy, ProxyTrait};
+use adder::{adder_proxy, ProxyTrait};
 use basic_interact_config::Config;
 use basic_interact_state::State;
 use clap::Parser;
@@ -102,7 +102,7 @@ impl AdderInteract {
             .interactor
             .tx()
             .from(&self.wallet_address)
-            .typed(temp_proxy::AdderProxy)
+            .typed(adder_proxy::AdderProxy)
             .init(0u32)
             .code(&self.adder_code)
             .with_result(WithRawTxResponse(|response| {
@@ -181,7 +181,7 @@ impl AdderInteract {
             .tx()
             .from(&self.wallet_address)
             .to(self.state.adder().to_address())
-            .typed(temp_proxy::AdderProxy)
+            .typed(adder_proxy::AdderProxy)
             .add(value)
             .prepare_async()
             .run()
@@ -195,7 +195,7 @@ impl AdderInteract {
             .interactor
             .query()
             .to(self.state.adder().to_address())
-            .typed(temp_proxy::AdderProxy)
+            .typed(adder_proxy::AdderProxy)
             .sum()
             .returns(ReturnsSimilar::<BigUint>::new())
             .prepare_async()
diff --git a/contracts/examples/adder/mxsc-template.toml b/contracts/examples/adder/mxsc-template.toml
index 341c2d6cf5..490557cc50 100644
--- a/contracts/examples/adder/mxsc-template.toml
+++ b/contracts/examples/adder/mxsc-template.toml
@@ -14,6 +14,7 @@ files_include = [
     "tests",
     "Cargo.toml",
     "README.md",
+    "sc-config.toml",
     "multiversx.json",
     "interact/Cargo.toml",
     "interact/config.toml",
diff --git a/contracts/examples/adder/sc-config.toml b/contracts/examples/adder/sc-config.toml
new file mode 100644
index 0000000000..702f7844e9
--- /dev/null
+++ b/contracts/examples/adder/sc-config.toml
@@ -0,0 +1,2 @@
+[settings]
+proxy-paths = ["src/adder_proxy.rs"]
diff --git a/contracts/examples/adder/src/adder.rs b/contracts/examples/adder/src/adder.rs
index b9f5fe86fe..307f4112f5 100644
--- a/contracts/examples/adder/src/adder.rs
+++ b/contracts/examples/adder/src/adder.rs
@@ -2,7 +2,7 @@
 
 use multiversx_sc::imports::*;
 
-pub mod temp_proxy;
+pub mod adder_proxy;
 
 /// One of the simplest smart contracts possible,
 /// it holds a single variable in storage, which anyone can increment.
diff --git a/contracts/examples/adder/src/temp_proxy.rs b/contracts/examples/adder/src/adder_proxy.rs
similarity index 100%
rename from contracts/examples/adder/src/temp_proxy.rs
rename to contracts/examples/adder/src/adder_proxy.rs
diff --git a/contracts/examples/adder/tests/adder_blackbox_chained_test.rs b/contracts/examples/adder/tests/adder_blackbox_chained_test.rs
index 8d3c51c11c..6060ad3859 100644
--- a/contracts/examples/adder/tests/adder_blackbox_chained_test.rs
+++ b/contracts/examples/adder/tests/adder_blackbox_chained_test.rs
@@ -27,7 +27,7 @@ fn adder_blackbox_chained() {
         )
         .chain_deploy(|tx| {
             tx.from(AddressExpr("owner"))
-                .typed(temp_proxy::AdderProxy)
+                .typed(adder_proxy::AdderProxy)
                 .init(5u32)
                 .code(MxscExpr("output/adder.mxsc.json"))
                 .with_result(WithResultNewAddress::new(|new_address| {
@@ -36,7 +36,7 @@ fn adder_blackbox_chained() {
         })
         .chain_query(|tx| {
             tx.to(ScExpr("adder"))
-                .typed(temp_proxy::AdderProxy)
+                .typed(adder_proxy::AdderProxy)
                 .sum()
                 .with_result(WithResultSimilar::new(|value: BigUint| {
                     assert_eq!(value, BigUint::from(5u32));
@@ -45,7 +45,7 @@ fn adder_blackbox_chained() {
         .chain_call(|tx| {
             tx.from(AddressExpr("owner"))
                 .to(ScExpr("adder"))
-                .typed(temp_proxy::AdderProxy)
+                .typed(adder_proxy::AdderProxy)
                 .add(3u32)
                 .with_result(WithRawTxResponse(|response| {
                     assert!(response.tx_error.is_success());
diff --git a/contracts/examples/adder/tests/adder_blackbox_legacy_proxy_test.rs b/contracts/examples/adder/tests/adder_blackbox_legacy_proxy_test.rs
index ddd131905e..3e7030a3c0 100644
--- a/contracts/examples/adder/tests/adder_blackbox_legacy_proxy_test.rs
+++ b/contracts/examples/adder/tests/adder_blackbox_legacy_proxy_test.rs
@@ -35,7 +35,7 @@ fn adder_blackbox_legacy_proxy() {
     world
         .tx()
         .from(OWNER)
-        .typed(temp_proxy::AdderProxy)
+        .typed(adder_proxy::AdderProxy)
         .init(5u32)
         .code(CODE_EXPR)
         .with_result(WithResultNewAddress::new(|new_address| {
diff --git a/contracts/examples/adder/tests/adder_blackbox_test.rs b/contracts/examples/adder/tests/adder_blackbox_test.rs
index ffcf7fb81f..4a09e4117d 100644
--- a/contracts/examples/adder/tests/adder_blackbox_test.rs
+++ b/contracts/examples/adder/tests/adder_blackbox_test.rs
@@ -33,7 +33,7 @@ fn adder_blackbox() {
     world
         .tx()
         .from(OWNER)
-        .typed(temp_proxy::AdderProxy)
+        .typed(adder_proxy::AdderProxy)
         .init(5u32)
         .code(CODE_EXPR)
         .with_result(WithResultNewAddress::new(|new_address| {
@@ -44,7 +44,7 @@ fn adder_blackbox() {
     let value = world
         .query()
         .to(SC_ADDER)
-        .typed(temp_proxy::AdderProxy)
+        .typed(adder_proxy::AdderProxy)
         .sum()
         .returns(ReturnsSimilar::<BigUint>::new())
         .run();
@@ -54,7 +54,7 @@ fn adder_blackbox() {
         .tx()
         .from(OWNER)
         .to(SC_ADDER)
-        .typed(temp_proxy::AdderProxy)
+        .typed(adder_proxy::AdderProxy)
         .add(1u32)
         .with_result(WithRawTxResponse(|response| {
             assert!(response.tx_error.is_success());
diff --git a/framework/base/src/abi/type_abi_impl_basic.rs b/framework/base/src/abi/type_abi_impl_basic.rs
index 8a2bb41c94..f2e6586e2f 100644
--- a/framework/base/src/abi/type_abi_impl_basic.rs
+++ b/framework/base/src/abi/type_abi_impl_basic.rs
@@ -164,7 +164,6 @@ impl<T: TypeAbi> TypeAbi for Option<T> {
         format!("Option<{}>", T::type_name())
     }
 
-    
     fn type_name_rust() -> TypeName {
         format!("Option<{}>", T::type_name_rust())
     }
diff --git a/framework/meta/src/cli_args/cli_args_contract.rs b/framework/meta/src/cli_args/cli_args_contract.rs
index 37cda6afdc..e05146a9bc 100644
--- a/framework/meta/src/cli_args/cli_args_contract.rs
+++ b/framework/meta/src/cli_args/cli_args_contract.rs
@@ -71,7 +71,7 @@ pub enum ContractCliAction {
         name = "proxy",
         about = "Generates a proxy, based on the contract ABI."
     )]
-    GenerateProxies(GenerateProxyArgs),
+    GenerateProxies,
 }
 
 impl CliArgsToRaw for ContractCliAction {
@@ -103,9 +103,8 @@ impl CliArgsToRaw for ContractCliAction {
                 raw.push("snippets".to_string());
                 raw.append(&mut args.to_raw());
             },
-            ContractCliAction::GenerateProxies(args) => {
+            ContractCliAction::GenerateProxies => {
                 raw.push("proxy".to_string());
-                raw.append(&mut args.to_raw());
             },
         }
         raw
@@ -128,19 +127,3 @@ impl CliArgsToRaw for GenerateSnippetsArgs {
         raw
     }
 }
-#[derive(Default, Clone, PartialEq, Eq, Debug, Args)]
-pub struct GenerateProxyArgs {
-    /// Override TxProxy project if it already exists.
-    #[arg(long, verbatim_doc_comment)]
-    pub overwrite: bool,
-}
-
-impl CliArgsToRaw for GenerateProxyArgs {
-    fn to_raw(&self) -> Vec<String> {
-        let mut raw = Vec::new();
-        if self.overwrite {
-            raw.push("--overwrite".to_string());
-        }
-        raw
-    }
-}
diff --git a/framework/meta/src/cmd/contract.rs b/framework/meta/src/cmd/contract.rs
index 2f7e4b7bb7..8011d3f2e3 100644
--- a/framework/meta/src/cmd/contract.rs
+++ b/framework/meta/src/cmd/contract.rs
@@ -32,9 +32,7 @@ pub fn cli_main<AbiObj: ContractAbiProvider>() {
         ContractCliAction::GenerateSnippets(gs_arg) => {
             meta_config_opt.generate_rust_snippets(&gs_arg)
         },
-        ContractCliAction::GenerateProxies(arg) => {
-            meta_config_opt.generate_rust_proxies_struct(&arg)
-        },
+        ContractCliAction::GenerateProxies => meta_config_opt.generate_proxy(),
     }
 }
 
diff --git a/framework/meta/src/cmd/contract/generate_proxy/proxy_crate_gen.rs b/framework/meta/src/cmd/contract/generate_proxy/proxy_crate_gen.rs
index b5e8c40013..8b5960577d 100644
--- a/framework/meta/src/cmd/contract/generate_proxy/proxy_crate_gen.rs
+++ b/framework/meta/src/cmd/contract/generate_proxy/proxy_crate_gen.rs
@@ -1,15 +1,8 @@
 use std::fs::File;
 
 #[must_use]
-pub(crate) fn create_file(proxies_file_name: &str, overwrite: bool) -> File {
-    let file = format!("../{proxies_file_name}");
+pub(crate) fn create_file(proxy_file_name: &str) -> File {
+    let file = format!("../{proxy_file_name}");
 
-    if overwrite {
-        File::create(&file).expect("could not write proxy file")
-    } else {
-        match File::options().create_new(true).write(true).open(&file) {
-            Ok(f) => f,
-            Err(_) => panic!("{file} file already exists, --overwrite option was not provided"),
-        }
-    }
+    File::create(file).expect("could not write proxy file")
 }
diff --git a/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_main.rs b/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_main.rs
index 3510eb640a..de47b3bc2d 100644
--- a/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_main.rs
+++ b/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_main.rs
@@ -2,8 +2,6 @@ use std::fs::File;
 
 use multiversx_sc::abi::ContractAbi;
 
-use crate::cli_args::GenerateProxyArgs;
-
 use super::{
     super::meta_config::MetaConfig,
     proxy_crate_gen::create_file,
@@ -13,19 +11,26 @@ use super::{
     },
 };
 
-const PROXIES_SOURCE_FILE_NAME: &str = "/output/proxy.rs";
+const OUTPUT_PROXY_PATH: &str = "/output/proxy.rs";
 
 impl MetaConfig {
-    pub fn generate_rust_proxies_struct(&self, args: &GenerateProxyArgs) {
-        let file = create_file(PROXIES_SOURCE_FILE_NAME, args.overwrite);
-        write_proxies_to_file(file, self.original_contract_abi.clone());
+    pub fn generate_proxy(&self) {
+        write_proxy_with_explicit_path(OUTPUT_PROXY_PATH, &self.original_contract_abi);
+        for path in &self.sc_config.proxy_paths {
+            write_proxy_with_explicit_path(path, &self.original_contract_abi);
+        }
     }
 }
 
-fn write_proxies_to_file(mut file: File, abi: ContractAbi) {
+fn write_proxy_with_explicit_path(path: &str, abi: &ContractAbi) {
+    let file = create_file(path);
+    write_proxy_to_file(file, abi);
+}
+
+fn write_proxy_to_file(mut file: File, abi: &ContractAbi) {
     write_header(&mut file);
     write_struct_template(&mut file, &abi.name);
     write_impl_for_tx_proxy(&mut file, &abi.name);
     write_struct_tx_proxy_methods(&mut file, &abi.name);
-    write_content(&mut file, abi);
+    write_content(&mut file, abi.clone());
 }
diff --git a/framework/meta/src/cmd/contract/sc_config/contract_variant.rs b/framework/meta/src/cmd/contract/sc_config/contract_variant.rs
index 4467705eef..feab3976cf 100644
--- a/framework/meta/src/cmd/contract/sc_config/contract_variant.rs
+++ b/framework/meta/src/cmd/contract/sc_config/contract_variant.rs
@@ -1,6 +1,6 @@
 use std::path::PathBuf;
 
-use super::ContractVariantSettings;
+use super::{contract_variant_builder::default_wasm_crate_name, ContractVariantSettings};
 use crate::cli_args::BuildArgs;
 use multiversx_sc::abi::ContractAbi;
 
@@ -35,6 +35,19 @@ pub struct ContractVariant {
 }
 
 impl ContractVariant {
+    pub fn default_from_abi(abi: &ContractAbi) -> Self {
+        let default_contract_config_name = abi.build_info.contract_crate.name.to_string();
+        let wasm_crate_name = default_wasm_crate_name(&default_contract_config_name);
+        ContractVariant {
+            main: true,
+            settings: ContractVariantSettings::default(),
+            contract_id: default_contract_config_name.clone(),
+            contract_name: default_contract_config_name,
+            wasm_crate_name,
+            abi: abi.clone(),
+        }
+    }
+
     pub fn public_name_snake_case(&self) -> String {
         self.contract_name.replace('-', "_")
     }
diff --git a/framework/meta/src/cmd/contract/sc_config/contract_variant_builder.rs b/framework/meta/src/cmd/contract/sc_config/contract_variant_builder.rs
index 2d8b9dd54e..c2dc1058f5 100644
--- a/framework/meta/src/cmd/contract/sc_config/contract_variant_builder.rs
+++ b/framework/meta/src/cmd/contract/sc_config/contract_variant_builder.rs
@@ -200,7 +200,7 @@ fn build_contract_abi(builder: ContractVariantBuilder, original_abi: &ContractAb
     }
 }
 
-fn default_wasm_crate_name(contract_name: &str) -> String {
+pub(crate) fn default_wasm_crate_name(contract_name: &str) -> String {
     format!("{contract_name}-wasm")
 }
 
@@ -236,7 +236,7 @@ fn set_main_contract_flag(
         )
     } else {
         let first_contract = contracts.get_mut(0).unwrap_or_else(|| {
-            panic!("Cannot set default contract because no optput contract was specified.")
+            panic!("Cannot set default contract because no output contract was specified.")
         });
         first_contract.main = true;
     }
@@ -263,22 +263,42 @@ impl ScConfig {
             .iter()
             .map(ContractVariantBuilder::map_from_config)
             .collect();
-        collect_unlabelled_endpoints(&mut contract_builders, original_abi);
-        collect_labelled_endpoints(&mut contract_builders, original_abi);
-        collect_add_endpoints(&mut contract_builders, original_abi);
-        process_labels_for_contracts(&mut contract_builders, &config.labels_for_contracts);
+        collect_and_process_endpoints(
+            &mut contract_builders,
+            original_abi,
+            &config.labels_for_contracts,
+        );
+
         let mut contracts: Vec<ContractVariant> = contract_builders
             .into_values()
             .map(|builder| build_contract(builder, original_abi))
             .collect();
+        if contracts.is_empty() {
+            contracts.push(ContractVariant::default_from_abi(original_abi));
+        }
         set_main_contract_flag(&mut contracts, &config.settings.main);
         validate_contract_variants(&contracts);
+        let default_contract_config_name = config.settings.main.clone().unwrap_or_default();
         ScConfig {
-            default_contract_config_name: config.settings.main.clone().unwrap_or_default(),
+            default_contract_config_name,
             contracts,
+            proxy_paths: config.settings.proxy_paths.clone(),
         }
     }
+}
+
+fn collect_and_process_endpoints(
+    contract_builders: &mut HashMap<String, ContractVariantBuilder>,
+    original_abi: &ContractAbi,
+    labels_for_contracts: &HashMap<String, Vec<String>>,
+) {
+    collect_unlabelled_endpoints(contract_builders, original_abi);
+    collect_labelled_endpoints(contract_builders, original_abi);
+    collect_add_endpoints(contract_builders, original_abi);
+    process_labels_for_contracts(contract_builders, labels_for_contracts);
+}
 
+impl ScConfig {
     /// Provides the config for the cases where no `multicontract.toml` file is available.
     ///
     /// The default configuration contains a single main contract, with all endpoints.
@@ -295,6 +315,7 @@ impl ScConfig {
                 wasm_crate_name,
                 abi: original_abi.clone(),
             }],
+            proxy_paths: Vec::new(),
         }
     }
 
diff --git a/framework/meta/src/cmd/contract/sc_config/sc_config_model.rs b/framework/meta/src/cmd/contract/sc_config/sc_config_model.rs
index 7f9ddbf5a9..f1d579a1a9 100644
--- a/framework/meta/src/cmd/contract/sc_config/sc_config_model.rs
+++ b/framework/meta/src/cmd/contract/sc_config/sc_config_model.rs
@@ -15,6 +15,7 @@ pub const SC_CONFIG_FILE_NAMES: &[&str] = &["sc-config.toml", "multicontract.tom
 pub struct ScConfig {
     pub default_contract_config_name: String,
     pub contracts: Vec<ContractVariant>,
+    pub proxy_paths: Vec<String>,
 }
 
 impl ScConfig {
diff --git a/framework/meta/src/cmd/contract/sc_config/sc_config_serde.rs b/framework/meta/src/cmd/contract/sc_config/sc_config_serde.rs
index 4813fcfb09..4dd51a1a23 100644
--- a/framework/meta/src/cmd/contract/sc_config/sc_config_serde.rs
+++ b/framework/meta/src/cmd/contract/sc_config/sc_config_serde.rs
@@ -62,6 +62,10 @@ pub struct ContractVariantSerde {
 #[serde(deny_unknown_fields)]
 pub struct MultiContractGeneralSettingsSerde {
     pub main: Option<String>,
+
+    #[serde(default)]
+    #[serde(rename = "proxy-paths")]
+    pub proxy_paths: Vec<String>,
 }
 
 #[derive(Deserialize, Default, Debug, Clone, PartialEq, Eq)]
diff --git a/framework/meta/src/cmd/standalone/template/template_adjuster.rs b/framework/meta/src/cmd/standalone/template/template_adjuster.rs
index 1182463c8f..c841c5d1f7 100644
--- a/framework/meta/src/cmd/standalone/template/template_adjuster.rs
+++ b/framework/meta/src/cmd/standalone/template/template_adjuster.rs
@@ -104,6 +104,8 @@ impl TemplateAdjuster {
         let old_name = self.metadata.name.to_case(Case::Snake);
         let new_package = format!("{new_name}::");
         let old_package = format!("{old_name}::");
+        let new_proxy_mod = format!("{new_name}_proxy");
+        let old_proxy_mod = format!("{old_name}_proxy");
 
         replace_in_files(
             &self.target.contract_dir(),
@@ -111,8 +113,15 @@ impl TemplateAdjuster {
             &[
                 Query::substring(old_trait, &new_trait),
                 Query::substring(&old_package, &new_package),
+                Query::substring(&old_proxy_mod, &new_proxy_mod),
             ][..],
         );
+
+        replace_in_files(
+            &self.target.contract_dir(),
+            "*sc-config.toml",
+            &[Query::substring(&old_proxy_mod, &new_proxy_mod)][..],
+        );
     }
 
     fn rename_in_cargo_toml_root(&self) {

From 88eb1a4d09bb2155f1fad23bc60fff7ae83ae78b Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 21 Mar 2024 01:33:09 +0200
Subject: [PATCH 0489/1254] proxy gen - multiple outputs

---
 .../generate_proxy/proxy_sc_functions_gen.rs         | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/framework/meta/src/cmd/contract/generate_proxy/proxy_sc_functions_gen.rs b/framework/meta/src/cmd/contract/generate_proxy/proxy_sc_functions_gen.rs
index d1909b25c6..8198bbe325 100644
--- a/framework/meta/src/cmd/contract/generate_proxy/proxy_sc_functions_gen.rs
+++ b/framework/meta/src/cmd/contract/generate_proxy/proxy_sc_functions_gen.rs
@@ -210,6 +210,16 @@ fn parse_and_write_outputs(file: &mut File, outputs: Vec<OutputAbi>) {
             let adjusted = adjust_type_name(&outputs[0].type_names.rust);
             write!(file, "{adjusted}").unwrap();
         },
-        _ => panic!("multiple outputs not yet supported"),
+        _ => {
+            write!(file, "MultiValue{}<", outputs.len()).unwrap();
+            for (i, output) in outputs.iter().enumerate() {
+                if i > 0 {
+                    write!(file, ", ").unwrap();
+                }
+                let adjusted = adjust_type_name(&output.type_names.rust);
+                write!(file, "{adjusted}").unwrap();
+            }
+            write!(file, ">").unwrap();
+        },
     }
 }

From 2488db86bd4bf36f1e9941a016704f7d65ffc552 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 21 Mar 2024 01:57:59 +0200
Subject: [PATCH 0490/1254] proxy gen - type fixes

---
 framework/base/src/abi/type_abi_impl_basic.rs | 24 +++++++++++++++++--
 .../base/src/abi/type_abi_impl_codec_multi.rs | 15 +++++++++++-
 framework/base/src/types/heap/boxed_bytes.rs  |  4 ++++
 framework/base/src/types/heap/h256.rs         |  4 ++++
 framework/base/src/types/heap/h256_address.rs |  4 ++++
 .../types/managed/wrapped/token_identifier.rs |  4 ++++
 6 files changed, 52 insertions(+), 3 deletions(-)

diff --git a/framework/base/src/abi/type_abi_impl_basic.rs b/framework/base/src/abi/type_abi_impl_basic.rs
index f2e6586e2f..00452263cd 100644
--- a/framework/base/src/abi/type_abi_impl_basic.rs
+++ b/framework/base/src/abi/type_abi_impl_basic.rs
@@ -204,8 +204,7 @@ macro_rules! tuple_impls {
                 $($name: TypeAbi,)+
             {
 				fn type_name() -> TypeName {
-					let mut repr = TypeName::from("tuple");
-					repr.push_str("<");
+					let mut repr = TypeName::from("tuple<");
 					$(
 						if $n > 0 {
 							repr.push(',');
@@ -216,6 +215,18 @@ macro_rules! tuple_impls {
 					repr
 				}
 
+                fn type_name_rust() -> TypeName {
+					let mut repr = TypeName::from("(");
+					$(
+						if $n > 0 {
+							repr.push_str(", ");
+						}
+						repr.push_str($name::type_name_rust().as_str());
+                    )+
+					repr.push(')');
+					repr
+				}
+
 				fn provide_type_descriptions<TDC: TypeDescriptionContainer>(accumulator: &mut TDC) {
 					$(
 						$name::provide_type_descriptions(accumulator);
@@ -255,6 +266,15 @@ impl<T: TypeAbi, const N: usize> TypeAbi for [T; N] {
         repr
     }
 
+    fn type_name_rust() -> TypeName {
+        let mut repr = TypeName::from("[");
+        repr.push_str(T::type_name_rust().as_str());
+        repr.push_str("; ");
+        repr.push_str(N.to_string().as_str());
+        repr.push(']');
+        repr
+    }
+
     fn provide_type_descriptions<TDC: TypeDescriptionContainer>(accumulator: &mut TDC) {
         T::provide_type_descriptions(accumulator);
     }
diff --git a/framework/base/src/abi/type_abi_impl_codec_multi.rs b/framework/base/src/abi/type_abi_impl_codec_multi.rs
index 9d34d8b5f9..9d3cce98db 100644
--- a/framework/base/src/abi/type_abi_impl_codec_multi.rs
+++ b/framework/base/src/abi/type_abi_impl_codec_multi.rs
@@ -12,7 +12,7 @@ impl<T: TypeAbi> TypeAbi for crate::codec::multi_types::MultiValueVec<T> {
     }
 
     fn type_name_rust() -> TypeName {
-        format!("MultiValueVec<$API, {}>", T::type_name_rust())
+        format!("MultiValueVec<{}>", T::type_name_rust())
     }
 
     fn provide_type_descriptions<TDC: TypeDescriptionContainer>(accumulator: &mut TDC) {
@@ -76,6 +76,19 @@ macro_rules! multi_arg_impls {
                     repr
                 }
 
+                fn type_name_rust() -> TypeName {
+                    let mut repr = TypeName::from(stringify!($mval_struct));
+                    repr.push('<');
+                    $(
+                        if $n > 0 {
+                            repr.push_str(", ");
+                        }
+                        repr.push_str($name::type_name_rust().as_str());
+                    )+
+                    repr.push('>');
+                    repr
+                }
+
                 fn provide_type_descriptions<TDC: TypeDescriptionContainer>(accumulator: &mut TDC) {
 					$(
 						$name::provide_type_descriptions(accumulator);
diff --git a/framework/base/src/types/heap/boxed_bytes.rs b/framework/base/src/types/heap/boxed_bytes.rs
index 24c08d1199..1b7c2b35e7 100644
--- a/framework/base/src/types/heap/boxed_bytes.rs
+++ b/framework/base/src/types/heap/boxed_bytes.rs
@@ -244,6 +244,10 @@ impl TypeAbi for BoxedBytes {
     fn type_name() -> TypeName {
         "bytes".into()
     }
+
+    fn type_name_rust() -> TypeName {
+        "BoxedBytes".into()
+    }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/framework/base/src/types/heap/h256.rs b/framework/base/src/types/heap/h256.rs
index 5dd0a2786b..a097b0d08d 100644
--- a/framework/base/src/types/heap/h256.rs
+++ b/framework/base/src/types/heap/h256.rs
@@ -228,6 +228,10 @@ impl TypeAbi for H256 {
     fn type_name() -> TypeName {
         "H256".into()
     }
+
+    fn type_name_rust() -> TypeName {
+        "H256".into()
+    }
 }
 
 #[cfg(test)]
diff --git a/framework/base/src/types/heap/h256_address.rs b/framework/base/src/types/heap/h256_address.rs
index e4c9b055d2..5e4712df7a 100644
--- a/framework/base/src/types/heap/h256_address.rs
+++ b/framework/base/src/types/heap/h256_address.rs
@@ -206,6 +206,10 @@ impl TypeAbi for Address {
     fn type_name() -> TypeName {
         "Address".into()
     }
+
+    fn type_name_rust() -> TypeName {
+        "Address".into()
+    }
 }
 
 #[cfg(test)]
diff --git a/framework/base/src/types/managed/wrapped/token_identifier.rs b/framework/base/src/types/managed/wrapped/token_identifier.rs
index 329b3f2b3d..2c8423b3a6 100644
--- a/framework/base/src/types/managed/wrapped/token_identifier.rs
+++ b/framework/base/src/types/managed/wrapped/token_identifier.rs
@@ -171,6 +171,10 @@ impl<M: ManagedTypeApi> TypeAbi for TokenIdentifier<M> {
     fn type_name() -> TypeName {
         "TokenIdentifier".into()
     }
+
+    fn type_name_rust() -> TypeName {
+        "TokenIdentifier".into()
+    }
 }
 
 impl<M: ManagedTypeApi> SCDisplay for TokenIdentifier<M> {

From f86de72ee50bb2072d10fb39b1404889b18fdffc Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 21 Mar 2024 01:58:23 +0200
Subject: [PATCH 0491/1254] abi tester proxy - initial commit

---
 .../feature-tests/abi-tester/sc-config.toml   |   1 +
 .../feature-tests/abi-tester/src/abi_proxy.rs | 908 ++++++++++++++++++
 .../abi-tester/src/abi_tester.rs              |   1 +
 3 files changed, 910 insertions(+)
 create mode 100644 contracts/feature-tests/abi-tester/src/abi_proxy.rs

diff --git a/contracts/feature-tests/abi-tester/sc-config.toml b/contracts/feature-tests/abi-tester/sc-config.toml
index 5a61f68d47..20d63c86b8 100644
--- a/contracts/feature-tests/abi-tester/sc-config.toml
+++ b/contracts/feature-tests/abi-tester/sc-config.toml
@@ -1,6 +1,7 @@
 # Abi-tester multi-contract config, used for testing.
 
 [settings]
+proxy-paths = ["src/abi_proxy.rs"]
 main = "main"
 
 [contracts.main]
diff --git a/contracts/feature-tests/abi-tester/src/abi_proxy.rs b/contracts/feature-tests/abi-tester/src/abi_proxy.rs
new file mode 100644
index 0000000000..968e8fd345
--- /dev/null
+++ b/contracts/feature-tests/abi-tester/src/abi_proxy.rs
@@ -0,0 +1,908 @@
+////////////////////////////////////////////////////
+////////////////// AUTO-GENERATED //////////////////
+////////////////////////////////////////////////////
+
+#![allow(clippy::all)]
+
+use multiversx_sc::imports::*;
+
+pub struct AbiTesterProxy;
+
+impl<Env, From, To, Gas> TxProxyTrait<Env, From, To, Gas> for AbiTesterProxy
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    type TxProxyMethods = AbiTesterProxyMethods<Env, From, To, Gas>;
+
+    fn proxy_methods(self, tx: Tx<Env, From, To, (), Gas, (), ()>) -> Self::TxProxyMethods {
+        AbiTesterProxyMethods { wrapped_tx: tx }
+    }
+}
+
+pub struct AbiTesterProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    wrapped_tx: Tx<Env, From, To, (), Gas, (), ()>,
+}
+
+impl<Env, From, Gas> AbiTesterProxyMethods<Env, From, (), Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    Gas: TxGas<Env>,
+{
+    /// Contract constructor. 
+    pub fn init<
+        Arg0: CodecInto<i32>,
+        Arg1: CodecInto<OnlyShowsUpInConstructor>,
+    >(
+        self,
+        _constructor_arg_1: Arg0,
+        _constructor_arg_2: Arg1,
+    ) -> Tx<
+        Env,
+        From,
+        (),
+        (),
+        Gas,
+        DeployCall<Env, ()>,
+        OriginalResultMarker<()>,
+    > {
+        self.wrapped_tx
+            .raw_deploy()
+            .argument(&_constructor_arg_1)
+            .argument(&_constructor_arg_2)
+            .original_result()
+    }
+
+}
+impl<Env, From, To, Gas> AbiTesterProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    /// Example endpoint docs. 
+    pub fn echo_abi_test_type<
+        Arg0: CodecInto<AbiTestType>,
+    >(
+        self,
+        att: Arg0,
+    ) -> Tx<
+        Env,
+        From,
+        To,
+        (),
+        Gas,
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<AbiTestType>,
+    > {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("echo_abi_test_type")
+            .argument(&att)
+            .original_result()
+    }
+
+    pub fn echo_enum<
+        Arg0: CodecInto<AbiEnum>,
+    >(
+        self,
+        e: Arg0,
+    ) -> Tx<
+        Env,
+        From,
+        To,
+        (),
+        Gas,
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<AbiEnum>,
+    > {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("echo_enum")
+            .argument(&e)
+            .original_result()
+    }
+
+    pub fn take_managed_type<
+        Arg0: CodecInto<AbiManagedType<Env::Api>>,
+    >(
+        self,
+        _arg: Arg0,
+    ) -> Tx<
+        Env,
+        From,
+        To,
+        (),
+        Gas,
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<()>,
+    > {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("take_managed_type")
+            .argument(&_arg)
+            .original_result()
+    }
+
+    pub fn multi_result_3(
+        self,
+    ) -> Tx<
+        Env,
+        From,
+        To,
+        (),
+        Gas,
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<MultiValue3<i32, [u8; 3], BoxedBytes>>,
+    > {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("multi_result_3")
+            .original_result()
+    }
+
+    pub fn multi_result_4(
+        self,
+    ) -> Tx<
+        Env,
+        From,
+        To,
+        (),
+        Gas,
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<MultiValue4<i32, [u8; 3], BoxedBytes, OnlyShowsUpAsNested03>>,
+    > {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("multi_result_4")
+            .original_result()
+    }
+
+    pub fn var_args<
+        Arg0: CodecInto<u32>,
+        Arg1: CodecInto<MultiValueVec<MultiValue2<OnlyShowsUpAsNested04, i32>>>,
+    >(
+        self,
+        _simple_arg: Arg0,
+        _var_args: Arg1,
+    ) -> Tx<
+        Env,
+        From,
+        To,
+        (),
+        Gas,
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<()>,
+    > {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("var_args")
+            .argument(&_simple_arg)
+            .argument(&_var_args)
+            .original_result()
+    }
+
+    pub fn multi_result_vec(
+        self,
+    ) -> Tx<
+        Env,
+        From,
+        To,
+        (),
+        Gas,
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<MultiValueVec<MultiValue3<OnlyShowsUpAsNested05, bool, ()>>>,
+    > {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("multi_result_vec")
+            .original_result()
+    }
+
+    pub fn optional_arg<
+        Arg0: CodecInto<u32>,
+        Arg1: CodecInto<OptionalValue<OnlyShowsUpAsNested06>>,
+    >(
+        self,
+        _simple_arg: Arg0,
+        _opt_args: Arg1,
+    ) -> Tx<
+        Env,
+        From,
+        To,
+        (),
+        Gas,
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<()>,
+    > {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("optional_arg")
+            .argument(&_simple_arg)
+            .argument(&_opt_args)
+            .original_result()
+    }
+
+    pub fn optional_result(
+        self,
+    ) -> Tx<
+        Env,
+        From,
+        To,
+        (),
+        Gas,
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<OptionalValue<OnlyShowsUpAsNested07>>,
+    > {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("optional_result")
+            .original_result()
+    }
+
+    pub fn address_vs_h256<
+        Arg0: CodecInto<Address>,
+        Arg1: CodecInto<H256>,
+    >(
+        self,
+        address: Arg0,
+        h256: Arg1,
+    ) -> Tx<
+        Env,
+        From,
+        To,
+        (),
+        Gas,
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<MultiValue2<Address, H256>>,
+    > {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("address_vs_h256")
+            .argument(&address)
+            .argument(&h256)
+            .original_result()
+    }
+
+    pub fn managed_address_vs_byte_array<
+        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+        Arg1: CodecInto<ManagedByteArray<Env::Api, 32usize>>,
+    >(
+        self,
+        address: Arg0,
+        byte_array: Arg1,
+    ) -> Tx<
+        Env,
+        From,
+        To,
+        (),
+        Gas,
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<MultiValue2<ManagedAddress<Env::Api>, ManagedByteArray<Env::Api, 32usize>>>,
+    > {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("managed_address_vs_byte_array")
+            .argument(&address)
+            .argument(&byte_array)
+            .original_result()
+    }
+
+    pub fn esdt_local_role(
+        self,
+    ) -> Tx<
+        Env,
+        From,
+        To,
+        (),
+        Gas,
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<EsdtLocalRole>,
+    > {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("esdt_local_role")
+            .original_result()
+    }
+
+    pub fn esdt_token_payment(
+        self,
+    ) -> Tx<
+        Env,
+        From,
+        To,
+        (),
+        Gas,
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<EsdtTokenPayment<Env::Api>>,
+    > {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("esdt_token_payment")
+            .original_result()
+    }
+
+    pub fn esdt_token_data(
+        self,
+    ) -> Tx<
+        Env,
+        From,
+        To,
+        (),
+        Gas,
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<EsdtTokenData<Env::Api>>,
+    > {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("esdt_token_data")
+            .original_result()
+    }
+
+    pub fn sample_storage_mapper(
+        self,
+    ) -> Tx<
+        Env,
+        From,
+        To,
+        (),
+        Gas,
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<OnlyShowsUpAsNestedInSingleValueMapper>,
+    > {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("sample_storage_mapper")
+            .original_result()
+    }
+
+    pub fn item_for_vec(
+        self,
+    ) -> Tx<
+        Env,
+        From,
+        To,
+        (),
+        Gas,
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<Vec<OnlyShowsUpAsNestedInVec>>,
+    > {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("item_for_vec")
+            .original_result()
+    }
+
+    pub fn item_for_array_vec(
+        self,
+    ) -> Tx<
+        Env,
+        From,
+        To,
+        (),
+        Gas,
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<ArrayVec<OnlyShowsUpAsNestedInArrayVec, 3usize>>,
+    > {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("item_for_array_vec")
+            .original_result()
+    }
+
+    pub fn item_for_managed_vec(
+        self,
+    ) -> Tx<
+        Env,
+        From,
+        To,
+        (),
+        Gas,
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<ManagedVec<Env::Api, AbiManagedVecItem>>,
+    > {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("item_for_managed_vec")
+            .original_result()
+    }
+
+    pub fn item_for_array<
+        Arg0: CodecInto<[OnlyShowsUpAsNestedInArray; 5]>,
+    >(
+        self,
+        _array: Arg0,
+    ) -> Tx<
+        Env,
+        From,
+        To,
+        (),
+        Gas,
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<()>,
+    > {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("item_for_array")
+            .argument(&_array)
+            .original_result()
+    }
+
+    pub fn item_for_box(
+        self,
+    ) -> Tx<
+        Env,
+        From,
+        To,
+        (),
+        Gas,
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<OnlyShowsUpAsNestedInBox>,
+    > {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("item_for_box")
+            .original_result()
+    }
+
+    pub fn item_for_boxed_slice(
+        self,
+    ) -> Tx<
+        Env,
+        From,
+        To,
+        (),
+        Gas,
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<&[OnlyShowsUpAsNestedInBoxedSlice]>,
+    > {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("item_for_boxed_slice")
+            .original_result()
+    }
+
+    pub fn item_for_ref<
+        Arg0: CodecInto<OnlyShowsUpAsNestedInRef>,
+    >(
+        self,
+        _ref: Arg0,
+    ) -> Tx<
+        Env,
+        From,
+        To,
+        (),
+        Gas,
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<()>,
+    > {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("item_for_ref")
+            .argument(&_ref)
+            .original_result()
+    }
+
+    pub fn item_for_slice<
+        Arg0: CodecInto<&[OnlyShowsUpAsNestedInSlice]>,
+    >(
+        self,
+        _ref: Arg0,
+    ) -> Tx<
+        Env,
+        From,
+        To,
+        (),
+        Gas,
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<()>,
+    > {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("item_for_slice")
+            .argument(&_ref)
+            .original_result()
+    }
+
+    pub fn item_for_option(
+        self,
+    ) -> Tx<
+        Env,
+        From,
+        To,
+        (),
+        Gas,
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<Option<OnlyShowsUpAsNestedInOption>>,
+    > {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("item_for_option")
+            .original_result()
+    }
+
+    pub fn payable_egld(
+        self,
+    ) -> Tx<
+        Env,
+        From,
+        To,
+        (),
+        Gas,
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<()>,
+    > {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("payable_egld")
+            .original_result()
+    }
+
+    pub fn payable_some_token(
+        self,
+    ) -> Tx<
+        Env,
+        From,
+        To,
+        (),
+        Gas,
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<()>,
+    > {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("payable_some_token")
+            .original_result()
+    }
+
+    pub fn payable_any_token(
+        self,
+    ) -> Tx<
+        Env,
+        From,
+        To,
+        (),
+        Gas,
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<()>,
+    > {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("payable_any_token")
+            .original_result()
+    }
+
+    pub fn external_view(
+        self,
+    ) -> Tx<
+        Env,
+        From,
+        To,
+        (),
+        Gas,
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<()>,
+    > {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("external_view")
+            .original_result()
+    }
+
+    pub fn label_a(
+        self,
+    ) -> Tx<
+        Env,
+        From,
+        To,
+        (),
+        Gas,
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<()>,
+    > {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("label_a")
+            .original_result()
+    }
+
+    pub fn label_b(
+        self,
+    ) -> Tx<
+        Env,
+        From,
+        To,
+        (),
+        Gas,
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<()>,
+    > {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("label_b")
+            .original_result()
+    }
+
+}
+use multiversx_sc::derive_imports::*;
+
+#[derive(TypeAbi)]
+pub struct OnlyShowsUpInConstructor
+{
+    pub something: (),
+}
+
+use multiversx_sc::derive_imports::*;
+
+#[derive(TypeAbi)]
+pub struct AbiTestType
+{
+    pub nested: OnlyShowsUpAsNested01,
+    pub next: Option<AbiTestType>,
+    pub tuple_madness: (OnlyShowsUpAsNested02, Option<AbiTestType>),
+}
+
+use multiversx_sc::derive_imports::*;
+
+#[derive(TypeAbi)]
+pub struct OnlyShowsUpAsNested01
+{
+}
+
+use multiversx_sc::derive_imports::*;
+
+#[derive(TypeAbi)]
+pub struct OnlyShowsUpAsNested02
+{
+    pub something: [u8; 0],
+}
+
+use multiversx_sc::derive_imports::*;
+
+#[derive(TypeAbi)]
+pub enum AbiEnum {
+    Nothing,
+    Something,
+    SomethingMore,
+    SomeStruct,
+}
+
+use multiversx_sc::derive_imports::*;
+
+#[derive(TypeAbi)]
+pub struct OnlyShowsUpAsNested08
+{
+}
+
+use multiversx_sc::derive_imports::*;
+
+#[derive(TypeAbi)]
+pub struct OnlyShowsUpAsNested09
+{
+}
+
+use multiversx_sc::derive_imports::*;
+
+#[derive(TypeAbi)]
+pub struct AbiManagedType<Api>
+where
+    Api: ManagedTypeApi,
+{
+    pub big_uint: BigUint<Api>,
+    pub integer: i32,
+    pub managed_buffer: ManagedBuffer<Api>,
+}
+
+use multiversx_sc::derive_imports::*;
+
+#[derive(TypeAbi)]
+pub struct OnlyShowsUpAsNested03
+{
+}
+
+use multiversx_sc::derive_imports::*;
+
+#[derive(TypeAbi)]
+pub struct OnlyShowsUpAsNested04
+{
+}
+
+use multiversx_sc::derive_imports::*;
+
+#[derive(TypeAbi)]
+pub struct OnlyShowsUpAsNested05
+{
+}
+
+use multiversx_sc::derive_imports::*;
+
+#[derive(TypeAbi)]
+pub struct OnlyShowsUpAsNested06
+{
+}
+
+use multiversx_sc::derive_imports::*;
+
+#[derive(TypeAbi)]
+pub struct OnlyShowsUpAsNested07
+{
+}
+
+use multiversx_sc::derive_imports::*;
+
+#[derive(TypeAbi)]
+pub enum EsdtLocalRole {
+    None,
+    Mint,
+    Burn,
+    NftCreate,
+    NftAddQuantity,
+    NftBurn,
+    NftAddUri,
+    NftUpdateAttributes,
+    Transfer,
+}
+
+use multiversx_sc::derive_imports::*;
+
+#[derive(TypeAbi)]
+pub struct EsdtTokenPayment<Api>
+where
+    Api: ManagedTypeApi,
+{
+    pub token_identifier: multiversx_sc::types::managed::wrapped::token_identifier::TokenIdentifier<multiversx_sc::api::uncallable::UncallableApi>,
+    pub token_nonce: u64,
+    pub amount: BigUint<Api>,
+}
+
+use multiversx_sc::derive_imports::*;
+
+#[derive(TypeAbi)]
+pub struct EsdtTokenData<Api>
+where
+    Api: ManagedTypeApi,
+{
+    pub token_type: EsdtTokenType,
+    pub amount: BigUint<Api>,
+    pub frozen: bool,
+    pub hash: ManagedBuffer<Api>,
+    pub name: ManagedBuffer<Api>,
+    pub attributes: ManagedBuffer<Api>,
+    pub creator: ManagedAddress<Api>,
+    pub royalties: BigUint<Api>,
+    pub uris: ManagedVec<Api, ManagedBuffer<Api>>,
+}
+
+use multiversx_sc::derive_imports::*;
+
+#[derive(TypeAbi)]
+pub enum EsdtTokenType {
+    Fungible,
+    NonFungible,
+    SemiFungible,
+    Meta,
+    Invalid,
+}
+
+use multiversx_sc::derive_imports::*;
+
+#[derive(TypeAbi)]
+pub struct OnlyShowsUpAsNestedInSingleValueMapper
+{
+}
+
+use multiversx_sc::derive_imports::*;
+
+#[derive(TypeAbi)]
+pub struct OnlyShowsUpAsNestedInVec
+{
+}
+
+use multiversx_sc::derive_imports::*;
+
+#[derive(TypeAbi)]
+pub struct OnlyShowsUpAsNestedInArrayVec
+{
+}
+
+use multiversx_sc::derive_imports::*;
+
+#[derive(TypeAbi)]
+pub struct AbiManagedVecItem
+{
+    pub value1: u32,
+    pub value2: u32,
+}
+
+use multiversx_sc::derive_imports::*;
+
+#[derive(TypeAbi)]
+pub struct OnlyShowsUpAsNestedInArray
+{
+}
+
+use multiversx_sc::derive_imports::*;
+
+#[derive(TypeAbi)]
+pub struct OnlyShowsUpAsNestedInBox
+{
+}
+
+use multiversx_sc::derive_imports::*;
+
+#[derive(TypeAbi)]
+pub struct OnlyShowsUpAsNestedInBoxedSlice
+{
+}
+
+use multiversx_sc::derive_imports::*;
+
+#[derive(TypeAbi)]
+pub struct OnlyShowsUpAsNestedInRef
+{
+}
+
+use multiversx_sc::derive_imports::*;
+
+#[derive(TypeAbi)]
+pub struct OnlyShowsUpAsNestedInSlice
+{
+}
+
+use multiversx_sc::derive_imports::*;
+
+#[derive(TypeAbi)]
+pub struct OnlyShowsUpAsNestedInOption
+{
+}
+
+use multiversx_sc::derive_imports::*;
+
+#[derive(TypeAbi)]
+pub struct OnlyShowsUpInEsdtAttr
+{
+    pub field: OnlyShowsUpAsNested10,
+}
+
+use multiversx_sc::derive_imports::*;
+
+#[derive(TypeAbi)]
+pub struct OnlyShowsUpAsNested10
+{
+}
+
+use multiversx_sc::derive_imports::*;
+
+#[derive(TypeAbi)]
+pub enum ExplicitDiscriminant {
+    Zero,
+    Thirty,
+    Twelve,
+    Fifty,
+    FiftyOne,
+}
+
+use multiversx_sc::derive_imports::*;
+
+#[derive(TypeAbi)]
+#[derive(u8)]
+pub enum ExplicitDiscriminantMixed {
+    Zero,
+    Unit,
+    Tuple,
+    Five,
+    Struct,
+}
+
diff --git a/contracts/feature-tests/abi-tester/src/abi_tester.rs b/contracts/feature-tests/abi-tester/src/abi_tester.rs
index 15fe5f3c4a..48976f5980 100644
--- a/contracts/feature-tests/abi-tester/src/abi_tester.rs
+++ b/contracts/feature-tests/abi-tester/src/abi_tester.rs
@@ -3,6 +3,7 @@
 multiversx_sc::imports!();
 
 mod abi_enum;
+// pub mod abi_proxy;
 mod abi_test_type;
 mod only_nested;
 

From b682d58d076f9821d3fbc5575893746f9df856a3 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 21 Mar 2024 02:22:44 +0200
Subject: [PATCH 0492/1254] proxy gen - clean up imports

---
 framework/base/src/lib.rs                          |  5 +++++
 .../src/types/managed/wrapped/token_identifier.rs  |  2 +-
 .../contract/generate_proxy/proxy_template_gen.rs  | 14 +++-----------
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/framework/base/src/lib.rs b/framework/base/src/lib.rs
index 7f2a8b1c2b..7910499169 100644
--- a/framework/base/src/lib.rs
+++ b/framework/base/src/lib.rs
@@ -76,3 +76,8 @@ pub mod derive_imports {
         derive::{ManagedVecItem, TypeAbi},
     };
 }
+
+/// Conveniently groups all imports required for generated proxies.
+pub mod proxy_imports {
+    pub use crate::{derive_imports::*, imports::*};
+}
diff --git a/framework/base/src/types/managed/wrapped/token_identifier.rs b/framework/base/src/types/managed/wrapped/token_identifier.rs
index 2c8423b3a6..af113dbc4e 100644
--- a/framework/base/src/types/managed/wrapped/token_identifier.rs
+++ b/framework/base/src/types/managed/wrapped/token_identifier.rs
@@ -173,7 +173,7 @@ impl<M: ManagedTypeApi> TypeAbi for TokenIdentifier<M> {
     }
 
     fn type_name_rust() -> TypeName {
-        "TokenIdentifier".into()
+        "TokenIdentifier<$API>".into()
     }
 }
 
diff --git a/framework/meta/src/cmd/contract/generate_proxy/proxy_template_gen.rs b/framework/meta/src/cmd/contract/generate_proxy/proxy_template_gen.rs
index 5ae0202317..054f977b84 100644
--- a/framework/meta/src/cmd/contract/generate_proxy/proxy_template_gen.rs
+++ b/framework/meta/src/cmd/contract/generate_proxy/proxy_template_gen.rs
@@ -11,15 +11,13 @@ const PREFIX_AUTO_GENERATED: &str = "///////////////////////////////////////////
 ////////////////////////////////////////////////////
 ";
 
-const IMPORTS: &str = "#![allow(clippy::all)]
+const PRELUDE: &str = "#![allow(clippy::all)]
 
-use multiversx_sc::imports::*;";
-
-const DERIVE_IMPORTS: &str = "use multiversx_sc::derive_imports::*;";
+use multiversx_sc::proxy_imports::*;";
 
 pub(crate) fn write_header(file: &mut File) {
     writeln!(file, "{PREFIX_AUTO_GENERATED}").unwrap();
-    writeln!(file, r#"{IMPORTS}"#).unwrap();
+    writeln!(file, r#"{PRELUDE}"#).unwrap();
 
     write_newline(file);
 }
@@ -85,7 +83,6 @@ where
 }
 
 fn write_enum(file: &mut File, type_description: &TypeDescription) {
-    write_derive_imports(file);
     write_macro_attributes(file, &type_description.macro_attributes);
     writeln!(file, r#"pub enum {} {{"#, type_description.names.abi).unwrap();
 
@@ -100,7 +97,6 @@ fn write_enum(file: &mut File, type_description: &TypeDescription) {
 fn write_struct(file: &mut File, type_description: &TypeDescription) {
     let struct_name = type_description.names.rust.replace("$API", "Api");
 
-    write_derive_imports(file);
     write_macro_attributes(file, &type_description.macro_attributes);
     writeln!(file, r#"pub struct {}"#, struct_name).unwrap();
 
@@ -140,7 +136,3 @@ fn write_macro_attributes(file: &mut File, macro_attributes: &[String]) {
     }
 }
 
-fn write_derive_imports(file: &mut File) {
-    writeln!(file, "{DERIVE_IMPORTS}").unwrap();
-    write_newline(file);
-}

From 8ee46b9903d56ccf714d958c2d6c4dcdba99b083 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 21 Mar 2024 03:20:06 +0200
Subject: [PATCH 0493/1254] proxy gen - derive fix

---
 .../feature-tests/abi-tester/src/abi_proxy.rs | 141 +++++-------------
 .../abi-tester/src/abi_test_type.rs           |   9 +-
 .../abi-tester/src/only_nested.rs             |  60 +++++---
 framework/base/src/abi/type_abi_impl_basic.rs |  10 +-
 .../derive/src/parse/attributes/doc_attr.rs   |   8 +-
 .../generate_proxy/proxy_template_gen.rs      |  16 +-
 6 files changed, 101 insertions(+), 143 deletions(-)

diff --git a/contracts/feature-tests/abi-tester/src/abi_proxy.rs b/contracts/feature-tests/abi-tester/src/abi_proxy.rs
index 968e8fd345..cbc0520f5a 100644
--- a/contracts/feature-tests/abi-tester/src/abi_proxy.rs
+++ b/contracts/feature-tests/abi-tester/src/abi_proxy.rs
@@ -4,7 +4,7 @@
 
 #![allow(clippy::all)]
 
-use multiversx_sc::imports::*;
+use multiversx_sc::proxy_imports::*;
 
 pub struct AbiTesterProxy;
 
@@ -449,7 +449,7 @@ where
         (),
         Gas,
         FunctionCall<Env::Api>,
-        OriginalResultMarker<OnlyShowsUpAsNestedInBox>,
+        OriginalResultMarker<Box<OnlyShowsUpAsNestedInBox>>,
     > {
         self.wrapped_tx
             .raw_call()
@@ -466,7 +466,7 @@ where
         (),
         Gas,
         FunctionCall<Env::Api>,
-        OriginalResultMarker<&[OnlyShowsUpAsNestedInBoxedSlice]>,
+        OriginalResultMarker<Box<[OnlyShowsUpAsNestedInBoxedSlice]>>,
     > {
         self.wrapped_tx
             .raw_call()
@@ -496,7 +496,7 @@ where
     }
 
     pub fn item_for_slice<
-        Arg0: CodecInto<&[OnlyShowsUpAsNestedInSlice]>,
+        Arg0: CodecInto<Box<[OnlyShowsUpAsNestedInSlice]>>,
     >(
         self,
         _ref: Arg0,
@@ -636,42 +636,32 @@ where
     }
 
 }
-use multiversx_sc::derive_imports::*;
-
-#[derive(TypeAbi)]
+#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct OnlyShowsUpInConstructor
 {
     pub something: (),
 }
 
-use multiversx_sc::derive_imports::*;
-
-#[derive(TypeAbi)]
+#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct AbiTestType
 {
     pub nested: OnlyShowsUpAsNested01,
-    pub next: Option<AbiTestType>,
-    pub tuple_madness: (OnlyShowsUpAsNested02, Option<AbiTestType>),
+    pub next: Option<Box<AbiTestType>>,
+    pub tuple_madness: (OnlyShowsUpAsNested02, Option<Box<AbiTestType>>),
 }
 
-use multiversx_sc::derive_imports::*;
-
-#[derive(TypeAbi)]
+#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct OnlyShowsUpAsNested01
 {
 }
 
-use multiversx_sc::derive_imports::*;
-
-#[derive(TypeAbi)]
+#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct OnlyShowsUpAsNested02
 {
     pub something: [u8; 0],
 }
 
-use multiversx_sc::derive_imports::*;
-
-#[derive(TypeAbi)]
+#[derive(TopEncode, TopDecode)]
 pub enum AbiEnum {
     Nothing,
     Something,
@@ -679,23 +669,17 @@ pub enum AbiEnum {
     SomeStruct,
 }
 
-use multiversx_sc::derive_imports::*;
-
-#[derive(TypeAbi)]
+#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct OnlyShowsUpAsNested08
 {
 }
 
-use multiversx_sc::derive_imports::*;
-
-#[derive(TypeAbi)]
+#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct OnlyShowsUpAsNested09
 {
 }
 
-use multiversx_sc::derive_imports::*;
-
-#[derive(TypeAbi)]
+#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct AbiManagedType<Api>
 where
     Api: ManagedTypeApi,
@@ -705,44 +689,32 @@ where
     pub managed_buffer: ManagedBuffer<Api>,
 }
 
-use multiversx_sc::derive_imports::*;
-
-#[derive(TypeAbi)]
+#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct OnlyShowsUpAsNested03
 {
 }
 
-use multiversx_sc::derive_imports::*;
-
-#[derive(TypeAbi)]
+#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct OnlyShowsUpAsNested04
 {
 }
 
-use multiversx_sc::derive_imports::*;
-
-#[derive(TypeAbi)]
+#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct OnlyShowsUpAsNested05
 {
 }
 
-use multiversx_sc::derive_imports::*;
-
-#[derive(TypeAbi)]
+#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct OnlyShowsUpAsNested06
 {
 }
 
-use multiversx_sc::derive_imports::*;
-
-#[derive(TypeAbi)]
+#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct OnlyShowsUpAsNested07
 {
 }
 
-use multiversx_sc::derive_imports::*;
-
-#[derive(TypeAbi)]
+#[derive(TopEncode, TopDecode)]
 pub enum EsdtLocalRole {
     None,
     Mint,
@@ -755,26 +727,22 @@ pub enum EsdtLocalRole {
     Transfer,
 }
 
-use multiversx_sc::derive_imports::*;
-
-#[derive(TypeAbi)]
+#[derive(TopEncode, TopDecode)]
 pub struct EsdtTokenPayment<Api>
 where
     Api: ManagedTypeApi,
 {
-    pub token_identifier: multiversx_sc::types::managed::wrapped::token_identifier::TokenIdentifier<multiversx_sc::api::uncallable::UncallableApi>,
+    pub token_identifier: TokenIdentifier<Api>,
     pub token_nonce: u64,
     pub amount: BigUint<Api>,
 }
 
-use multiversx_sc::derive_imports::*;
-
-#[derive(TypeAbi)]
+#[derive(TopEncode, TopDecode)]
 pub struct EsdtTokenData<Api>
 where
     Api: ManagedTypeApi,
 {
-    pub token_type: EsdtTokenType,
+    pub token_type: self::EsdtTokenType,
     pub amount: BigUint<Api>,
     pub frozen: bool,
     pub hash: ManagedBuffer<Api>,
@@ -785,9 +753,7 @@ where
     pub uris: ManagedVec<Api, ManagedBuffer<Api>>,
 }
 
-use multiversx_sc::derive_imports::*;
-
-#[derive(TypeAbi)]
+#[derive(TopEncode, TopDecode)]
 pub enum EsdtTokenType {
     Fungible,
     NonFungible,
@@ -796,96 +762,70 @@ pub enum EsdtTokenType {
     Invalid,
 }
 
-use multiversx_sc::derive_imports::*;
-
-#[derive(TypeAbi)]
+#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct OnlyShowsUpAsNestedInSingleValueMapper
 {
 }
 
-use multiversx_sc::derive_imports::*;
-
-#[derive(TypeAbi)]
+#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct OnlyShowsUpAsNestedInVec
 {
 }
 
-use multiversx_sc::derive_imports::*;
-
-#[derive(TypeAbi)]
+#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct OnlyShowsUpAsNestedInArrayVec
 {
 }
 
-use multiversx_sc::derive_imports::*;
-
-#[derive(TypeAbi)]
+#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, ManagedVecItem)]
 pub struct AbiManagedVecItem
 {
     pub value1: u32,
     pub value2: u32,
 }
 
-use multiversx_sc::derive_imports::*;
-
-#[derive(TypeAbi)]
+#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct OnlyShowsUpAsNestedInArray
 {
 }
 
-use multiversx_sc::derive_imports::*;
-
-#[derive(TypeAbi)]
+#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct OnlyShowsUpAsNestedInBox
 {
 }
 
-use multiversx_sc::derive_imports::*;
-
-#[derive(TypeAbi)]
+#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct OnlyShowsUpAsNestedInBoxedSlice
 {
 }
 
-use multiversx_sc::derive_imports::*;
-
-#[derive(TypeAbi)]
+#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct OnlyShowsUpAsNestedInRef
 {
 }
 
-use multiversx_sc::derive_imports::*;
-
-#[derive(TypeAbi)]
+#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct OnlyShowsUpAsNestedInSlice
 {
 }
 
-use multiversx_sc::derive_imports::*;
-
-#[derive(TypeAbi)]
+#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct OnlyShowsUpAsNestedInOption
 {
 }
 
-use multiversx_sc::derive_imports::*;
-
-#[derive(TypeAbi)]
+#[derive(TopEncode, TopDecode)]
 pub struct OnlyShowsUpInEsdtAttr
 {
     pub field: OnlyShowsUpAsNested10,
 }
 
-use multiversx_sc::derive_imports::*;
-
-#[derive(TypeAbi)]
+#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct OnlyShowsUpAsNested10
 {
 }
 
-use multiversx_sc::derive_imports::*;
-
-#[derive(TypeAbi)]
+#[derive(TopEncode, TopDecode)]
 pub enum ExplicitDiscriminant {
     Zero,
     Thirty,
@@ -894,10 +834,7 @@ pub enum ExplicitDiscriminant {
     FiftyOne,
 }
 
-use multiversx_sc::derive_imports::*;
-
-#[derive(TypeAbi)]
-#[derive(u8)]
+#[derive(TopEncode, TopDecode)]
 pub enum ExplicitDiscriminantMixed {
     Zero,
     Unit,
diff --git a/contracts/feature-tests/abi-tester/src/abi_test_type.rs b/contracts/feature-tests/abi-tester/src/abi_test_type.rs
index 2cc1fc4db4..b952146aa3 100644
--- a/contracts/feature-tests/abi-tester/src/abi_test_type.rs
+++ b/contracts/feature-tests/abi-tester/src/abi_test_type.rs
@@ -6,7 +6,8 @@ use multiversx_sc::{
 multiversx_sc::derive_imports!();
 
 /// Its only purpose is to test that the ABI generator works fine.
-#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, TypeAbi)]
+#[derive(TypeAbi)]
+#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct AbiTestType {
     /// This type should only appear here.
     pub nested: OnlyShowsUpAsNested01,
@@ -20,7 +21,8 @@ pub struct AbiTestType {
 }
 
 /// Its only purpose is to test that the ABI generator works fine.
-#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, TypeAbi)]
+#[derive(TypeAbi)]
+#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct AbiManagedType<M: ManagedTypeApi> {
     pub big_uint: BigUint<M>,
     pub integer: i32,
@@ -28,7 +30,8 @@ pub struct AbiManagedType<M: ManagedTypeApi> {
 }
 
 /// Its only purpose is to test that the ABI generator works fine.
-#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, TypeAbi, ManagedVecItem)]
+#[derive(TypeAbi)]
+#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, ManagedVecItem)]
 pub struct AbiManagedVecItem {
     pub value1: u32,
     pub value2: u32,
diff --git a/contracts/feature-tests/abi-tester/src/only_nested.rs b/contracts/feature-tests/abi-tester/src/only_nested.rs
index d1e19441d0..fe17c7e55e 100644
--- a/contracts/feature-tests/abi-tester/src/only_nested.rs
+++ b/contracts/feature-tests/abi-tester/src/only_nested.rs
@@ -1,85 +1,105 @@
 multiversx_sc::derive_imports!();
 
 /// Tests that the ABI generator also fetches types that only appear as fields.
-#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, TypeAbi)]
+#[derive(TypeAbi)]
+#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct OnlyShowsUpInConstructor {
     pub something: (),
 }
 
 /// Tests that the ABI generator also fetches types that only appear as fields.
-#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, TypeAbi)]
+#[derive(TypeAbi)]
+#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct OnlyShowsUpAsNested01;
 
 /// Tests that the ABI generator also fetches types that only appear as fields.
-#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, TypeAbi)]
+#[derive(TypeAbi)]
+#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct OnlyShowsUpAsNested02 {
     pub something: [u8; 0],
 }
 
 /// Tests that the ABI generator also fetches types that only appear as fields.
-#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, TypeAbi)]
+#[derive(TypeAbi)]
+#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct OnlyShowsUpAsNested03();
 
 /// Tests that the ABI generator also fetches types that only appear as fields.
-#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, TypeAbi)]
+#[derive(TypeAbi)]
+#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct OnlyShowsUpAsNested04;
 
 /// Tests that the ABI generator also fetches types that only appear as fields.
-#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, TypeAbi)]
+#[derive(TypeAbi)]
+#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct OnlyShowsUpAsNested05;
 
 /// Tests that the ABI generator also fetches types that only appear as fields.
-#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, TypeAbi)]
+#[derive(TypeAbi)]
+#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct OnlyShowsUpAsNested06;
 
 /// Tests that the ABI generator also fetches types that only appear as fields.
-#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, TypeAbi)]
+#[derive(TypeAbi)]
+#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct OnlyShowsUpAsNested07;
 
 /// Tests that the ABI generator also fetches types that only appear as fields.
-#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, TypeAbi)]
+#[derive(TypeAbi)]
+#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct OnlyShowsUpAsNested08;
 
 /// Tests that the ABI generator also fetches types that only appear as fields.
-#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, TypeAbi)]
+#[derive(TypeAbi)]
+#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct OnlyShowsUpAsNested09;
 
 /// Tests that the ABI generator also fetches types that only appear as fields.
-#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, TypeAbi)]
+#[derive(TypeAbi)]
+#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct OnlyShowsUpAsNested10;
 
 /// Tests that the ABI generator also fetches types that only appear as fields.
-#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, TypeAbi)]
+#[derive(TypeAbi)]
+#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct OnlyShowsUpAsNestedInSingleValueMapper;
 
 /// Tests that the ABI generator also fetches types that only appear as fields.
-#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, TypeAbi)]
+#[derive(TypeAbi)]
+#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct OnlyShowsUpAsNestedInVec;
 
 /// Tests that the ABI generator also fetches types that only appear as fields.
-#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, TypeAbi)]
+#[derive(TypeAbi)]
+#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct OnlyShowsUpAsNestedInArrayVec;
 
 /// Tests that the ABI generator also fetches types that only appear as fields.
-#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, TypeAbi)]
+#[derive(TypeAbi)]
+#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct OnlyShowsUpAsNestedInArray;
 
 /// Tests that the ABI generator also fetches types that only appear as fields.
-#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, TypeAbi)]
+#[derive(TypeAbi)]
+#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct OnlyShowsUpAsNestedInBox;
 
 /// Tests that the ABI generator also fetches types that only appear as fields.
-#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, TypeAbi)]
+#[derive(TypeAbi)]
+#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct OnlyShowsUpAsNestedInBoxedSlice;
 
 /// Tests that the ABI generator also fetches types that only appear as fields.
-#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, TypeAbi)]
+#[derive(TypeAbi)]
+#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct OnlyShowsUpAsNestedInRef;
 
 /// Tests that the ABI generator also fetches types that only appear as fields.
-#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, TypeAbi)]
+#[derive(TypeAbi)]
+#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct OnlyShowsUpAsNestedInSlice;
 
 /// Tests that the ABI generator also fetches types that only appear as fields.
-#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, TypeAbi)]
+#[derive(TypeAbi)]
+#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct OnlyShowsUpAsNestedInOption;
diff --git a/framework/base/src/abi/type_abi_impl_basic.rs b/framework/base/src/abi/type_abi_impl_basic.rs
index 00452263cd..c14447b2ba 100644
--- a/framework/base/src/abi/type_abi_impl_basic.rs
+++ b/framework/base/src/abi/type_abi_impl_basic.rs
@@ -35,7 +35,7 @@ impl<T: TypeAbi> TypeAbi for Box<T> {
     }
 
     fn type_name_rust() -> TypeName {
-        T::type_name_rust()
+        format!("Box<{}>", T::type_name_rust())
     }
 
     fn provide_type_descriptions<TDC: TypeDescriptionContainer>(accumulator: &mut TDC) {
@@ -56,7 +56,8 @@ impl<T: TypeAbi> TypeAbi for &[T] {
     }
 
     fn type_name_rust() -> TypeName {
-        format!("&[{}]", T::type_name_rust())
+        // we need to convert to an owned type
+        format!("Box<[{}]>", T::type_name_rust())
     }
 
     fn provide_type_descriptions<TDC: TypeDescriptionContainer>(accumulator: &mut TDC) {
@@ -98,7 +99,7 @@ impl<T: TypeAbi> TypeAbi for Box<[T]> {
     }
 
     fn type_name_rust() -> TypeName {
-        <&[T]>::type_name_rust()
+        format!("Box<[{}]>", T::type_name_rust())
     }
 
     fn provide_type_descriptions<TDC: TypeDescriptionContainer>(accumulator: &mut TDC) {
@@ -118,7 +119,8 @@ impl TypeAbi for &str {
     }
 
     fn type_name_rust() -> TypeName {
-        "&str".into()
+        // we need to convert to an owned type
+        "Box<str>".into()
     }
 }
 
diff --git a/framework/derive/src/parse/attributes/doc_attr.rs b/framework/derive/src/parse/attributes/doc_attr.rs
index d9d3b22658..5c5ed4d41b 100644
--- a/framework/derive/src/parse/attributes/doc_attr.rs
+++ b/framework/derive/src/parse/attributes/doc_attr.rs
@@ -50,8 +50,12 @@ pub fn extract_macro_attributes(attrs: &[syn::Attribute]) -> Vec<String> {
 
     for a in attrs {
         if let syn::Meta::List(list) = &a.meta {
-            for token in list.tokens.clone().into_iter() {
-                macro_attributes.push(token.to_string());
+            if list.path.is_ident("derive") {
+                for token in list.tokens.clone().into_iter() {
+                    if let proc_macro2::TokenTree::Ident(ident) = token {
+                        macro_attributes.push(ident.to_string());
+                    }
+                }
             }
         }
     }
diff --git a/framework/meta/src/cmd/contract/generate_proxy/proxy_template_gen.rs b/framework/meta/src/cmd/contract/generate_proxy/proxy_template_gen.rs
index 054f977b84..699ecf433b 100644
--- a/framework/meta/src/cmd/contract/generate_proxy/proxy_template_gen.rs
+++ b/framework/meta/src/cmd/contract/generate_proxy/proxy_template_gen.rs
@@ -96,7 +96,6 @@ fn write_enum(file: &mut File, type_description: &TypeDescription) {
 
 fn write_struct(file: &mut File, type_description: &TypeDescription) {
     let struct_name = type_description.names.rust.replace("$API", "Api");
-
     write_macro_attributes(file, &type_description.macro_attributes);
     writeln!(file, r#"pub struct {}"#, struct_name).unwrap();
 
@@ -123,16 +122,9 @@ fn write_struct(file: &mut File, type_description: &TypeDescription) {
 }
 
 fn write_macro_attributes(file: &mut File, macro_attributes: &[String]) {
-    writeln!(file, "#[derive(TypeAbi)]").unwrap();
-    if !macro_attributes.is_empty() {
-        write!(file, "#[derive(").unwrap();
-    }
-
-    let attributes = macro_attributes.join("").replace(',', ", ");
-    write!(file, "{attributes}").unwrap();
-
-    if !macro_attributes.is_empty() {
-        writeln!(file, ")]").unwrap();
+    if macro_attributes.is_empty() {
+        writeln!(file, "#[derive(TopEncode, TopDecode)]").unwrap();
+    } else {
+        writeln!(file, "#[derive({})]", macro_attributes.join(", ")).unwrap();
     }
 }
-

From d7a541f0dc6f2189e3c8fad73d2dc70c0c7b9140 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Thu, 21 Mar 2024 09:04:44 +0200
Subject: [PATCH 0494/1254] tx proxy gen - fixed tests

---
 .../abi_tester_expected_main.abi.json         | 28 +++++++++----------
 .../abi_tester_expected_view.abi.json         | 28 +++++++++----------
 2 files changed, 28 insertions(+), 28 deletions(-)

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 b94afe2670..999feb222f 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
@@ -532,7 +532,7 @@
             "fields": [
                 {
                     "name": "big_uint",
-                    "type": "BigUint"
+                    "type": "BigUint<$API>"
                 },
                 {
                     "name": "integer",
@@ -540,7 +540,7 @@
                 },
                 {
                     "name": "managed_buffer",
-                    "type": "bytes"
+                    "type": "ManagedBuffer<$API>"
                 }
             ]
         },
@@ -578,7 +578,7 @@
                         "Tests that recursive types will not send the ABI generator into an infinite loop."
                     ],
                     "name": "next",
-                    "type": "Option<AbiTestType>"
+                    "type": "Option<Box<AbiTestType>>"
                 },
                 {
                     "docs": [
@@ -586,7 +586,7 @@
                         "Also, just like above, recursive types need to work even when nested into a tuple."
                     ],
                     "name": "tuple_madness",
-                    "type": "tuple<OnlyShowsUpAsNested02,Option<AbiTestType>>"
+                    "type": "(OnlyShowsUpAsNested02, Option<Box<AbiTestType>>)"
                 }
             ]
         },
@@ -640,7 +640,7 @@
                 },
                 {
                     "name": "amount",
-                    "type": "BigUint"
+                    "type": "BigUint<$API>"
                 },
                 {
                     "name": "frozen",
@@ -648,27 +648,27 @@
                 },
                 {
                     "name": "hash",
-                    "type": "bytes"
+                    "type": "ManagedBuffer<$API>"
                 },
                 {
                     "name": "name",
-                    "type": "bytes"
+                    "type": "ManagedBuffer<$API>"
                 },
                 {
                     "name": "attributes",
-                    "type": "bytes"
+                    "type": "ManagedBuffer<$API>"
                 },
                 {
                     "name": "creator",
-                    "type": "Address"
+                    "type": "ManagedAddress<$API>"
                 },
                 {
                     "name": "royalties",
-                    "type": "BigUint"
+                    "type": "BigUint<$API>"
                 },
                 {
                     "name": "uris",
-                    "type": "List<bytes>"
+                    "type": "ManagedVec<$API, ManagedBuffer<$API>>"
                 }
             ]
         },
@@ -677,7 +677,7 @@
             "fields": [
                 {
                     "name": "token_identifier",
-                    "type": "TokenIdentifier"
+                    "type": "TokenIdentifier<$API>"
                 },
                 {
                     "name": "token_nonce",
@@ -685,7 +685,7 @@
                 },
                 {
                     "name": "amount",
-                    "type": "BigUint"
+                    "type": "BigUint<$API>"
                 }
             ]
         },
@@ -800,7 +800,7 @@
             "fields": [
                 {
                     "name": "something",
-                    "type": "array0<u8>"
+                    "type": "[u8; 0]"
                 }
             ]
         },
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 f8a30cb9a5..4a31f9ea3d 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
@@ -193,7 +193,7 @@
             "fields": [
                 {
                     "name": "big_uint",
-                    "type": "BigUint"
+                    "type": "BigUint<$API>"
                 },
                 {
                     "name": "integer",
@@ -201,7 +201,7 @@
                 },
                 {
                     "name": "managed_buffer",
-                    "type": "bytes"
+                    "type": "ManagedBuffer<$API>"
                 }
             ]
         },
@@ -239,7 +239,7 @@
                         "Tests that recursive types will not send the ABI generator into an infinite loop."
                     ],
                     "name": "next",
-                    "type": "Option<AbiTestType>"
+                    "type": "Option<Box<AbiTestType>>"
                 },
                 {
                     "docs": [
@@ -247,7 +247,7 @@
                         "Also, just like above, recursive types need to work even when nested into a tuple."
                     ],
                     "name": "tuple_madness",
-                    "type": "tuple<OnlyShowsUpAsNested02,Option<AbiTestType>>"
+                    "type": "(OnlyShowsUpAsNested02, Option<Box<AbiTestType>>)"
                 }
             ]
         },
@@ -301,7 +301,7 @@
                 },
                 {
                     "name": "amount",
-                    "type": "BigUint"
+                    "type": "BigUint<$API>"
                 },
                 {
                     "name": "frozen",
@@ -309,27 +309,27 @@
                 },
                 {
                     "name": "hash",
-                    "type": "bytes"
+                    "type": "ManagedBuffer<$API>"
                 },
                 {
                     "name": "name",
-                    "type": "bytes"
+                    "type": "ManagedBuffer<$API>"
                 },
                 {
                     "name": "attributes",
-                    "type": "bytes"
+                    "type": "ManagedBuffer<$API>"
                 },
                 {
                     "name": "creator",
-                    "type": "Address"
+                    "type": "ManagedAddress<$API>"
                 },
                 {
                     "name": "royalties",
-                    "type": "BigUint"
+                    "type": "BigUint<$API>"
                 },
                 {
                     "name": "uris",
-                    "type": "List<bytes>"
+                    "type": "ManagedVec<$API, ManagedBuffer<$API>>"
                 }
             ]
         },
@@ -338,7 +338,7 @@
             "fields": [
                 {
                     "name": "token_identifier",
-                    "type": "TokenIdentifier"
+                    "type": "TokenIdentifier<$API>"
                 },
                 {
                     "name": "token_nonce",
@@ -346,7 +346,7 @@
                 },
                 {
                     "name": "amount",
-                    "type": "BigUint"
+                    "type": "BigUint<$API>"
                 }
             ]
         },
@@ -461,7 +461,7 @@
             "fields": [
                 {
                     "name": "something",
-                    "type": "array0<u8>"
+                    "type": "[u8; 0]"
                 }
             ]
         },

From 81c38a2efba4086f8d1d7086c422aa25c75f93be Mon Sep 17 00:00:00 2001
From: Alexandru Popenta <alexandru.p9913@gmail.com>
Date: Thu, 21 Mar 2024 09:17:56 +0200
Subject: [PATCH 0495/1254] reference newer commit

---
 .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 4e8efeed0a..586abce63e 100644
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -14,7 +14,7 @@ permissions:
 jobs:
   contracts:
     name: Contracts
-    uses: multiversx/mx-sc-actions/.github/workflows/contracts.yml@447422c7affe6670871444793f20cbaafbe9d71e
+    uses: multiversx/mx-sc-actions/.github/workflows/contracts.yml@4eb6d05e48bb36241ce3183f1e223cf3a9e78ab5
     with:
       rust-toolchain: nightly-2023-12-11
       path-to-sc-meta: framework/meta

From 8f9fffeedde5ece6b0d4c4ebbfacba60c3f10d2c Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Thu, 21 Mar 2024 10:02:49 +0200
Subject: [PATCH 0496/1254] tx proxy gen - fixed tests

---
 .../use_module_expected_main.abi.json         | 34 +++++++++----------
 .../use_module_expected_view.abi.json         | 34 +++++++++----------
 2 files changed, 34 insertions(+), 34 deletions(-)

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 2e4694e6fb..8ce1878d1a 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
@@ -1023,7 +1023,7 @@
             "fields": [
                 {
                     "name": "token_identifier",
-                    "type": "TokenIdentifier"
+                    "type": "TokenIdentifier<$API>"
                 },
                 {
                     "name": "token_nonce",
@@ -1031,7 +1031,7 @@
                 },
                 {
                     "name": "amount",
-                    "type": "BigUint"
+                    "type": "BigUint<$API>"
                 }
             ]
         },
@@ -1065,11 +1065,11 @@
             "fields": [
                 {
                     "name": "depositor_addr",
-                    "type": "Address"
+                    "type": "ManagedAddress<$API>"
                 },
                 {
                     "name": "tokens",
-                    "type": "EsdtTokenPayment"
+                    "type": "EsdtTokenPayment<$API>"
                 }
             ]
         },
@@ -1082,15 +1082,15 @@
                 },
                 {
                     "name": "dest_address",
-                    "type": "Address"
+                    "type": "ManagedAddress<$API>"
                 },
                 {
                     "name": "function_name",
-                    "type": "bytes"
+                    "type": "ManagedBuffer<$API>"
                 },
                 {
                     "name": "arguments",
-                    "type": "List<bytes>"
+                    "type": "ManagedVec<$API, ManagedBuffer<$API>>"
                 }
             ]
         },
@@ -1099,19 +1099,19 @@
             "fields": [
                 {
                     "name": "proposer",
-                    "type": "Address"
+                    "type": "ManagedAddress<$API>"
                 },
                 {
                     "name": "actions",
-                    "type": "List<GovernanceAction>"
+                    "type": "ArrayVec<GovernanceAction<$API>, 4usize>"
                 },
                 {
                     "name": "description",
-                    "type": "bytes"
+                    "type": "ManagedBuffer<$API>"
                 },
                 {
                     "name": "fees",
-                    "type": "ProposalFees"
+                    "type": "ProposalFees<$API>"
                 }
             ]
         },
@@ -1170,11 +1170,11 @@
             "fields": [
                 {
                     "name": "total_amount",
-                    "type": "BigUint"
+                    "type": "BigUint<$API>"
                 },
                 {
                     "name": "entries",
-                    "type": "List<FeeEntry>"
+                    "type": "ManagedVec<$API, FeeEntry<$API>>"
                 }
             ]
         },
@@ -1183,19 +1183,19 @@
             "fields": [
                 {
                     "name": "up_votes",
-                    "type": "BigUint"
+                    "type": "BigUint<$API>"
                 },
                 {
                     "name": "down_votes",
-                    "type": "BigUint"
+                    "type": "BigUint<$API>"
                 },
                 {
                     "name": "down_veto_votes",
-                    "type": "BigUint"
+                    "type": "BigUint<$API>"
                 },
                 {
                     "name": "abstain_votes",
-                    "type": "BigUint"
+                    "type": "BigUint<$API>"
                 }
             ]
         },
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 c84a7deac4..9fd87c32f8 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
@@ -267,7 +267,7 @@
             "fields": [
                 {
                     "name": "token_identifier",
-                    "type": "TokenIdentifier"
+                    "type": "TokenIdentifier<$API>"
                 },
                 {
                     "name": "token_nonce",
@@ -275,7 +275,7 @@
                 },
                 {
                     "name": "amount",
-                    "type": "BigUint"
+                    "type": "BigUint<$API>"
                 }
             ]
         },
@@ -309,11 +309,11 @@
             "fields": [
                 {
                     "name": "depositor_addr",
-                    "type": "Address"
+                    "type": "ManagedAddress<$API>"
                 },
                 {
                     "name": "tokens",
-                    "type": "EsdtTokenPayment"
+                    "type": "EsdtTokenPayment<$API>"
                 }
             ]
         },
@@ -326,15 +326,15 @@
                 },
                 {
                     "name": "dest_address",
-                    "type": "Address"
+                    "type": "ManagedAddress<$API>"
                 },
                 {
                     "name": "function_name",
-                    "type": "bytes"
+                    "type": "ManagedBuffer<$API>"
                 },
                 {
                     "name": "arguments",
-                    "type": "List<bytes>"
+                    "type": "ManagedVec<$API, ManagedBuffer<$API>>"
                 }
             ]
         },
@@ -343,19 +343,19 @@
             "fields": [
                 {
                     "name": "proposer",
-                    "type": "Address"
+                    "type": "ManagedAddress<$API>"
                 },
                 {
                     "name": "actions",
-                    "type": "List<GovernanceAction>"
+                    "type": "ArrayVec<GovernanceAction<$API>, 4usize>"
                 },
                 {
                     "name": "description",
-                    "type": "bytes"
+                    "type": "ManagedBuffer<$API>"
                 },
                 {
                     "name": "fees",
-                    "type": "ProposalFees"
+                    "type": "ProposalFees<$API>"
                 }
             ]
         },
@@ -414,11 +414,11 @@
             "fields": [
                 {
                     "name": "total_amount",
-                    "type": "BigUint"
+                    "type": "BigUint<$API>"
                 },
                 {
                     "name": "entries",
-                    "type": "List<FeeEntry>"
+                    "type": "ManagedVec<$API, FeeEntry<$API>>"
                 }
             ]
         },
@@ -427,19 +427,19 @@
             "fields": [
                 {
                     "name": "up_votes",
-                    "type": "BigUint"
+                    "type": "BigUint<$API>"
                 },
                 {
                     "name": "down_votes",
-                    "type": "BigUint"
+                    "type": "BigUint<$API>"
                 },
                 {
                     "name": "down_veto_votes",
-                    "type": "BigUint"
+                    "type": "BigUint<$API>"
                 },
                 {
                     "name": "abstain_votes",
-                    "type": "BigUint"
+                    "type": "BigUint<$API>"
                 }
             ]
         },

From 3120a9686b3b136d2ee76f2a990684375e10d7b7 Mon Sep 17 00:00:00 2001
From: Alexandru Popenta <alexandru.p9913@gmail.com>
Date: Thu, 21 Mar 2024 10:07:13 +0200
Subject: [PATCH 0497/1254] reference newer commit

---
 .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 586abce63e..94a41b3dbe 100644
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -14,7 +14,7 @@ permissions:
 jobs:
   contracts:
     name: Contracts
-    uses: multiversx/mx-sc-actions/.github/workflows/contracts.yml@4eb6d05e48bb36241ce3183f1e223cf3a9e78ab5
+    uses: multiversx/mx-sc-actions/.github/workflows/contracts.yml@53103051467f2ae63ebfbf3ea71328bf215a2828
     with:
       rust-toolchain: nightly-2023-12-11
       path-to-sc-meta: framework/meta

From e06e1d13f661649736a7d991a306cd6baa411861 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 21 Mar 2024 11:04:34 +0200
Subject: [PATCH 0498/1254] type_abi proc attribute instead of derive(TypeAbi)

---
 .../src/crowdfunding_esdt.rs                  |  2 +-
 .../crowdfunding-esdt/src/temp_proxy.rs       |  2 +-
 contracts/examples/crypto-zombies/src/lib.rs  |  2 +-
 .../examples/crypto-zombies/src/temp_proxy.rs |  2 +-
 .../examples/crypto-zombies/src/zombie.rs     |  2 +-
 .../examples/digital-cash/src/deposit_info.rs |  2 +-
 .../feature-tests/abi-tester/src/abi_proxy.rs | 10 ++--
 .../abi-tester/src/abi_test_type.rs           |  8 +--
 .../abi-tester/src/abi_tester.rs              |  2 +-
 .../abi-tester/src/only_nested.rs             | 40 +++++++-------
 .../src/types/codec_err_test_type.rs          |  4 +-
 framework/base/src/abi/type_abi.rs            |  2 +-
 framework/base/src/lib.rs                     |  2 +-
 .../base/src/types/flags/esdt_local_role.rs   |  7 +--
 .../base/src/types/flags/esdt_token_type.rs   | 55 ++++---------------
 .../types/managed/wrapped/esdt_token_data.rs  |  7 +--
 .../managed/wrapped/esdt_token_payment.rs     |  5 +-
 framework/derive/src/lib.rs                   | 12 +++-
 framework/derive/src/type_abi_derive.rs       | 18 ++++--
 framework/meta/src/abi_json/type_abi_json.rs  |  2 +-
 20 files changed, 83 insertions(+), 103 deletions(-)

diff --git a/contracts/examples/crowdfunding-esdt/src/crowdfunding_esdt.rs b/contracts/examples/crowdfunding-esdt/src/crowdfunding_esdt.rs
index e82411c0e1..f38da41061 100644
--- a/contracts/examples/crowdfunding-esdt/src/crowdfunding_esdt.rs
+++ b/contracts/examples/crowdfunding-esdt/src/crowdfunding_esdt.rs
@@ -3,7 +3,7 @@
 use multiversx_sc::{derive_imports::*, imports::*};
 pub mod temp_proxy;
 
-#[derive(TypeAbi)]
+#[type_abi]
 #[derive(TopEncode, TopDecode, PartialEq, Eq, Clone, Copy, Debug)]
 pub enum Status {
     FundingPeriod,
diff --git a/contracts/examples/crowdfunding-esdt/src/temp_proxy.rs b/contracts/examples/crowdfunding-esdt/src/temp_proxy.rs
index 98ab96c104..b82e54eb8c 100644
--- a/contracts/examples/crowdfunding-esdt/src/temp_proxy.rs
+++ b/contracts/examples/crowdfunding-esdt/src/temp_proxy.rs
@@ -8,7 +8,7 @@ use multiversx_sc::imports::*;
 
 use multiversx_sc::derive_imports::*;
 
-#[derive(TypeAbi)]
+#[type_abi]
 #[derive(TopEncode, TopDecode, PartialEq, Eq, Clone, Copy, Debug)]
 pub enum Status {
     FundingPeriod,
diff --git a/contracts/examples/crypto-zombies/src/lib.rs b/contracts/examples/crypto-zombies/src/lib.rs
index ed6b9befba..bed761384f 100644
--- a/contracts/examples/crypto-zombies/src/lib.rs
+++ b/contracts/examples/crypto-zombies/src/lib.rs
@@ -4,12 +4,12 @@ use multiversx_sc::imports::*;
 
 mod crypto_kitties_proxy;
 mod storage;
+pub mod temp_proxy;
 mod zombie;
 mod zombie_attack;
 mod zombie_factory;
 mod zombie_feeding;
 mod zombie_helper;
-pub mod temp_proxy;
 
 #[multiversx_sc::contract]
 pub trait CryptoZombies:
diff --git a/contracts/examples/crypto-zombies/src/temp_proxy.rs b/contracts/examples/crypto-zombies/src/temp_proxy.rs
index 32f130dfdc..09ae9979d1 100644
--- a/contracts/examples/crypto-zombies/src/temp_proxy.rs
+++ b/contracts/examples/crypto-zombies/src/temp_proxy.rs
@@ -412,7 +412,7 @@ where
 }
 use multiversx_sc::derive_imports::*;
 
-#[derive(TypeAbi)]
+#[type_abi]
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct Zombie<Api>
 where
diff --git a/contracts/examples/crypto-zombies/src/zombie.rs b/contracts/examples/crypto-zombies/src/zombie.rs
index 858d1b791c..bfe3fd22ad 100644
--- a/contracts/examples/crypto-zombies/src/zombie.rs
+++ b/contracts/examples/crypto-zombies/src/zombie.rs
@@ -1,6 +1,6 @@
 use multiversx_sc::{derive_imports::*, imports::*};
 
-#[derive(TypeAbi)]
+#[type_abi]
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct Zombie<M: ManagedTypeApi> {
     pub name: ManagedBuffer<M>,
diff --git a/contracts/examples/digital-cash/src/deposit_info.rs b/contracts/examples/digital-cash/src/deposit_info.rs
index 0164db2090..ce2c279409 100644
--- a/contracts/examples/digital-cash/src/deposit_info.rs
+++ b/contracts/examples/digital-cash/src/deposit_info.rs
@@ -1,6 +1,6 @@
 use multiversx_sc::{derive_imports::*, imports::*};
 
-#[derive(TypeAbi)]
+#[type_abi]
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct DepositInfo<M: ManagedTypeApi> {
     pub depositor_address: ManagedAddress<M>,
diff --git a/contracts/feature-tests/abi-tester/src/abi_proxy.rs b/contracts/feature-tests/abi-tester/src/abi_proxy.rs
index cbc0520f5a..c7c7f8650a 100644
--- a/contracts/feature-tests/abi-tester/src/abi_proxy.rs
+++ b/contracts/feature-tests/abi-tester/src/abi_proxy.rs
@@ -714,7 +714,7 @@ pub struct OnlyShowsUpAsNested07
 {
 }
 
-#[derive(TopEncode, TopDecode)]
+#[derive(TopDecode, TopEncode, NestedDecode, NestedEncode, Clone, PartialEq, Eq, Debug, Copy)]
 pub enum EsdtLocalRole {
     None,
     Mint,
@@ -727,7 +727,7 @@ pub enum EsdtLocalRole {
     Transfer,
 }
 
-#[derive(TopEncode, TopDecode)]
+#[derive(TopEncode, NestedEncode, Clone, PartialEq, Eq, Debug)]
 pub struct EsdtTokenPayment<Api>
 where
     Api: ManagedTypeApi,
@@ -737,12 +737,12 @@ where
     pub amount: BigUint<Api>,
 }
 
-#[derive(TopEncode, TopDecode)]
+#[derive(Clone, TopDecode, TopEncode, NestedDecode, NestedEncode, Debug, ManagedVecItem)]
 pub struct EsdtTokenData<Api>
 where
     Api: ManagedTypeApi,
 {
-    pub token_type: self::EsdtTokenType,
+    pub token_type: EsdtTokenType,
     pub amount: BigUint<Api>,
     pub frozen: bool,
     pub hash: ManagedBuffer<Api>,
@@ -753,7 +753,7 @@ where
     pub uris: ManagedVec<Api, ManagedBuffer<Api>>,
 }
 
-#[derive(TopEncode, TopDecode)]
+#[derive(TopDecode, TopEncode, NestedDecode, NestedEncode, Clone, PartialEq, Eq, Debug, ManagedVecItem)]
 pub enum EsdtTokenType {
     Fungible,
     NonFungible,
diff --git a/contracts/feature-tests/abi-tester/src/abi_test_type.rs b/contracts/feature-tests/abi-tester/src/abi_test_type.rs
index b952146aa3..ff4f76b744 100644
--- a/contracts/feature-tests/abi-tester/src/abi_test_type.rs
+++ b/contracts/feature-tests/abi-tester/src/abi_test_type.rs
@@ -6,7 +6,7 @@ use multiversx_sc::{
 multiversx_sc::derive_imports!();
 
 /// Its only purpose is to test that the ABI generator works fine.
-#[derive(TypeAbi)]
+#[type_abi]
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct AbiTestType {
     /// This type should only appear here.
@@ -21,7 +21,7 @@ pub struct AbiTestType {
 }
 
 /// Its only purpose is to test that the ABI generator works fine.
-#[derive(TypeAbi)]
+#[type_abi]
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct AbiManagedType<M: ManagedTypeApi> {
     pub big_uint: BigUint<M>,
@@ -30,14 +30,14 @@ pub struct AbiManagedType<M: ManagedTypeApi> {
 }
 
 /// Its only purpose is to test that the ABI generator works fine.
-#[derive(TypeAbi)]
+#[type_abi]
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, ManagedVecItem)]
 pub struct AbiManagedVecItem {
     pub value1: u32,
     pub value2: u32,
 }
 
-#[derive(TypeAbi)]
+#[type_abi]
 pub struct OnlyShowsUpInEsdtAttr {
     pub field: OnlyShowsUpAsNested10,
 }
diff --git a/contracts/feature-tests/abi-tester/src/abi_tester.rs b/contracts/feature-tests/abi-tester/src/abi_tester.rs
index 48976f5980..1d7226c0f9 100644
--- a/contracts/feature-tests/abi-tester/src/abi_tester.rs
+++ b/contracts/feature-tests/abi-tester/src/abi_tester.rs
@@ -3,7 +3,7 @@
 multiversx_sc::imports!();
 
 mod abi_enum;
-// pub mod abi_proxy;
+pub mod abi_proxy;
 mod abi_test_type;
 mod only_nested;
 
diff --git a/contracts/feature-tests/abi-tester/src/only_nested.rs b/contracts/feature-tests/abi-tester/src/only_nested.rs
index fe17c7e55e..5c960cc95a 100644
--- a/contracts/feature-tests/abi-tester/src/only_nested.rs
+++ b/contracts/feature-tests/abi-tester/src/only_nested.rs
@@ -1,105 +1,105 @@
 multiversx_sc::derive_imports!();
 
 /// Tests that the ABI generator also fetches types that only appear as fields.
-#[derive(TypeAbi)]
+#[type_abi]
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct OnlyShowsUpInConstructor {
     pub something: (),
 }
 
 /// Tests that the ABI generator also fetches types that only appear as fields.
-#[derive(TypeAbi)]
+#[type_abi]
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct OnlyShowsUpAsNested01;
 
 /// Tests that the ABI generator also fetches types that only appear as fields.
-#[derive(TypeAbi)]
+#[type_abi]
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct OnlyShowsUpAsNested02 {
     pub something: [u8; 0],
 }
 
 /// Tests that the ABI generator also fetches types that only appear as fields.
-#[derive(TypeAbi)]
+#[type_abi]
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct OnlyShowsUpAsNested03();
 
 /// Tests that the ABI generator also fetches types that only appear as fields.
-#[derive(TypeAbi)]
+#[type_abi]
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct OnlyShowsUpAsNested04;
 
 /// Tests that the ABI generator also fetches types that only appear as fields.
-#[derive(TypeAbi)]
+#[type_abi]
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct OnlyShowsUpAsNested05;
 
 /// Tests that the ABI generator also fetches types that only appear as fields.
-#[derive(TypeAbi)]
+#[type_abi]
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct OnlyShowsUpAsNested06;
 
 /// Tests that the ABI generator also fetches types that only appear as fields.
-#[derive(TypeAbi)]
+#[type_abi]
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct OnlyShowsUpAsNested07;
 
 /// Tests that the ABI generator also fetches types that only appear as fields.
-#[derive(TypeAbi)]
+#[type_abi]
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct OnlyShowsUpAsNested08;
 
 /// Tests that the ABI generator also fetches types that only appear as fields.
-#[derive(TypeAbi)]
+#[type_abi]
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct OnlyShowsUpAsNested09;
 
 /// Tests that the ABI generator also fetches types that only appear as fields.
-#[derive(TypeAbi)]
+#[type_abi]
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct OnlyShowsUpAsNested10;
 
 /// Tests that the ABI generator also fetches types that only appear as fields.
-#[derive(TypeAbi)]
+#[type_abi]
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct OnlyShowsUpAsNestedInSingleValueMapper;
 
 /// Tests that the ABI generator also fetches types that only appear as fields.
-#[derive(TypeAbi)]
+#[type_abi]
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct OnlyShowsUpAsNestedInVec;
 
 /// Tests that the ABI generator also fetches types that only appear as fields.
-#[derive(TypeAbi)]
+#[type_abi]
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct OnlyShowsUpAsNestedInArrayVec;
 
 /// Tests that the ABI generator also fetches types that only appear as fields.
-#[derive(TypeAbi)]
+#[type_abi]
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct OnlyShowsUpAsNestedInArray;
 
 /// Tests that the ABI generator also fetches types that only appear as fields.
-#[derive(TypeAbi)]
+#[type_abi]
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct OnlyShowsUpAsNestedInBox;
 
 /// Tests that the ABI generator also fetches types that only appear as fields.
-#[derive(TypeAbi)]
+#[type_abi]
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct OnlyShowsUpAsNestedInBoxedSlice;
 
 /// Tests that the ABI generator also fetches types that only appear as fields.
-#[derive(TypeAbi)]
+#[type_abi]
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct OnlyShowsUpAsNestedInRef;
 
 /// Tests that the ABI generator also fetches types that only appear as fields.
-#[derive(TypeAbi)]
+#[type_abi]
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct OnlyShowsUpAsNestedInSlice;
 
 /// Tests that the ABI generator also fetches types that only appear as fields.
-#[derive(TypeAbi)]
+#[type_abi]
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct OnlyShowsUpAsNestedInOption;
diff --git a/contracts/feature-tests/basic-features/src/types/codec_err_test_type.rs b/contracts/feature-tests/basic-features/src/types/codec_err_test_type.rs
index 16350f3a5a..41c1524c41 100644
--- a/contracts/feature-tests/basic-features/src/types/codec_err_test_type.rs
+++ b/contracts/feature-tests/basic-features/src/types/codec_err_test_type.rs
@@ -4,11 +4,11 @@ use multiversx_sc::{
         NestedDecodeInput, NestedEncode, NestedEncodeOutput, TopDecode, TopDecodeInput, TopEncode,
         TopEncodeOutput,
     },
-    derive::TypeAbi,
+    derive::type_abi,
 };
 
 /// Helper type to explore encode/decode errors.
-#[derive(TypeAbi)]
+#[type_abi]
 pub struct CodecErrorTestType;
 
 impl TopEncode for CodecErrorTestType {
diff --git a/framework/base/src/abi/type_abi.rs b/framework/base/src/abi/type_abi.rs
index 215cb36464..94213e7705 100644
--- a/framework/base/src/abi/type_abi.rs
+++ b/framework/base/src/abi/type_abi.rs
@@ -29,7 +29,7 @@ pub trait TypeAbi {
                 docs: Vec::new(),
                 names: Self::type_names(),
                 contents: TypeContents::NotSpecified,
-                macro_attributes: Vec::new()
+                macro_attributes: Vec::new(),
             },
         );
     }
diff --git a/framework/base/src/lib.rs b/framework/base/src/lib.rs
index 7910499169..aa1d477897 100644
--- a/framework/base/src/lib.rs
+++ b/framework/base/src/lib.rs
@@ -73,7 +73,7 @@ pub mod derive_imports {
             NestedDecode, NestedEncode, TopDecode, TopDecodeOrDefault, TopEncode,
             TopEncodeOrDefault,
         },
-        derive::{ManagedVecItem, TypeAbi},
+        derive::{type_abi, ManagedVecItem, TypeAbi},
     };
 }
 
diff --git a/framework/base/src/types/flags/esdt_local_role.rs b/framework/base/src/types/flags/esdt_local_role.rs
index f0f241d931..9bc5edfc68 100644
--- a/framework/base/src/types/flags/esdt_local_role.rs
+++ b/framework/base/src/types/flags/esdt_local_role.rs
@@ -5,7 +5,7 @@ use crate::{
 
 use super::EsdtLocalRoleFlags;
 use crate as multiversx_sc;
-use crate::{derive::TypeAbi, types::ManagedVecItem};
+use crate::{derive::type_abi, types::ManagedVecItem};
 
 static ESDT_ROLE_NONE: &[u8] = &[];
 static ESDT_ROLE_LOCAL_MINT: &[u8] = b"ESDTRoleLocalMint";
@@ -17,9 +17,8 @@ static ESDT_ROLE_NFT_ADD_URI: &[u8] = b"ESDTRoleNFTAddURI";
 static ESDT_ROLE_NFT_UPDATE_ATTRIBUTES: &[u8] = b"ESDTRoleNFTUpdateAttributes";
 static ESDT_ROLE_TRANSFER: &[u8] = b"ESDTTransferRole";
 
-#[derive(
-    TopDecode, TopEncode, NestedDecode, NestedEncode, TypeAbi, Clone, PartialEq, Eq, Debug, Copy,
-)]
+#[type_abi]
+#[derive(TopDecode, TopEncode, NestedDecode, NestedEncode, Clone, PartialEq, Eq, Debug, Copy)]
 pub enum EsdtLocalRole {
     None,
     Mint,
diff --git a/framework/base/src/types/flags/esdt_token_type.rs b/framework/base/src/types/flags/esdt_token_type.rs
index 2348254455..1993fd1cfa 100644
--- a/framework/base/src/types/flags/esdt_token_type.rs
+++ b/framework/base/src/types/flags/esdt_token_type.rs
@@ -1,6 +1,9 @@
 use multiversx_sc_derive::ManagedVecItem;
 
-use crate::codec::*;
+use crate::{
+    codec,
+    codec::derive::{NestedDecode, NestedEncode, TopDecode, TopEncode},
+};
 
 const ESDT_TYPE_FUNGIBLE: &[u8] = b"FungibleESDT";
 const ESDT_TYPE_NON_FUNGIBLE: &[u8] = b"NonFungibleESDT";
@@ -9,10 +12,14 @@ const ESDT_TYPE_META: &[u8] = b"MetaESDT";
 const ESDT_TYPE_INVALID: &[u8] = &[];
 
 use crate as multiversx_sc; // needed by the TypeAbi generated code
-use crate::derive::TypeAbi;
+use crate::derive::type_abi;
 
 // Note: In the current implementation, SemiFungible is never returned
-#[derive(Clone, PartialEq, Eq, Debug, TypeAbi, ManagedVecItem)]
+
+#[type_abi]
+#[derive(
+    TopDecode, TopEncode, NestedDecode, NestedEncode, Clone, PartialEq, Eq, Debug, ManagedVecItem,
+)]
 pub enum EsdtTokenType {
     Fungible,
     NonFungible,
@@ -80,45 +87,3 @@ impl<'a> From<&'a [u8]> for EsdtTokenType {
         }
     }
 }
-
-impl NestedEncode for EsdtTokenType {
-    #[inline]
-    fn dep_encode_or_handle_err<O, H>(&self, dest: &mut O, h: H) -> Result<(), H::HandledErr>
-    where
-        O: NestedEncodeOutput,
-        H: EncodeErrorHandler,
-    {
-        self.as_u8().dep_encode_or_handle_err(dest, h)
-    }
-}
-
-impl TopEncode for EsdtTokenType {
-    #[inline]
-    fn top_encode_or_handle_err<O, H>(&self, output: O, h: H) -> Result<(), H::HandledErr>
-    where
-        O: TopEncodeOutput,
-        H: EncodeErrorHandler,
-    {
-        self.as_u8().top_encode_or_handle_err(output, h)
-    }
-}
-
-impl NestedDecode for EsdtTokenType {
-    fn dep_decode_or_handle_err<I, H>(input: &mut I, h: H) -> Result<Self, H::HandledErr>
-    where
-        I: NestedDecodeInput,
-        H: DecodeErrorHandler,
-    {
-        Ok(Self::from(u8::dep_decode_or_handle_err(input, h)?))
-    }
-}
-
-impl TopDecode for EsdtTokenType {
-    fn top_decode_or_handle_err<I, H>(input: I, h: H) -> Result<Self, H::HandledErr>
-    where
-        I: TopDecodeInput,
-        H: DecodeErrorHandler,
-    {
-        Ok(Self::from(u8::top_decode_or_handle_err(input, h)?))
-    }
-}
diff --git a/framework/base/src/types/managed/wrapped/esdt_token_data.rs b/framework/base/src/types/managed/wrapped/esdt_token_data.rs
index d4b13afdbe..5bbd550299 100644
--- a/framework/base/src/types/managed/wrapped/esdt_token_data.rs
+++ b/framework/base/src/types/managed/wrapped/esdt_token_data.rs
@@ -12,13 +12,12 @@ use crate::{
 };
 
 use crate as multiversx_sc; // needed by the TypeAbi generated code
-use crate::derive::TypeAbi;
+use crate::derive::type_abi;
 
 const DECODE_ATTRIBUTE_ERROR_PREFIX: &[u8] = b"error decoding ESDT attributes: ";
 
-#[derive(
-    Clone, TopDecode, TopEncode, NestedDecode, NestedEncode, TypeAbi, Debug, ManagedVecItem,
-)]
+#[type_abi]
+#[derive(Clone, TopDecode, TopEncode, NestedDecode, NestedEncode, Debug, ManagedVecItem)]
 pub struct EsdtTokenData<M: ManagedTypeApi> {
     pub token_type: EsdtTokenType,
     pub amount: BigUint<M>,
diff --git a/framework/base/src/types/managed/wrapped/esdt_token_payment.rs b/framework/base/src/types/managed/wrapped/esdt_token_payment.rs
index 29391f5381..246b28de1d 100644
--- a/framework/base/src/types/managed/wrapped/esdt_token_payment.rs
+++ b/framework/base/src/types/managed/wrapped/esdt_token_payment.rs
@@ -10,12 +10,13 @@ use crate::{
         derive::{NestedEncode, TopEncode},
         IntoMultiValue, NestedDecode, TopDecode,
     },
-    derive::TypeAbi,
+    derive::type_abi,
 };
 
 use super::ManagedVec;
 
-#[derive(TopEncode, NestedEncode, TypeAbi, Clone, PartialEq, Eq, Debug)]
+#[type_abi]
+#[derive(TopEncode, NestedEncode, Clone, PartialEq, Eq, Debug)]
 pub struct EsdtTokenPayment<M: ManagedTypeApi> {
     pub token_identifier: TokenIdentifier<M>,
     pub token_nonce: u64,
diff --git a/framework/derive/src/lib.rs b/framework/derive/src/lib.rs
index bdc33883fe..917ecb2159 100644
--- a/framework/derive/src/lib.rs
+++ b/framework/derive/src/lib.rs
@@ -48,8 +48,16 @@ pub fn proxy(
 
 #[proc_macro_derive(TypeAbi)]
 pub fn type_abi_derive(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
-    let ast: syn::DeriveInput = syn::parse(input).unwrap();
-    type_abi_derive::type_abi_derive(&ast)
+    type_abi_derive::type_abi_derive(input).into()
+}
+
+#[proc_macro_attribute]
+pub fn type_abi(
+    args: proc_macro::TokenStream,
+    input: proc_macro::TokenStream,
+) -> proc_macro::TokenStream {
+    assert!(args.is_empty(), "#[type_abi] attribute takes no args");
+    type_abi_derive::type_abi_full(input).into()
 }
 
 #[proc_macro_derive(ManagedVecItem)]
diff --git a/framework/derive/src/type_abi_derive.rs b/framework/derive/src/type_abi_derive.rs
index cd93bdf33a..aec0b73a18 100644
--- a/framework/derive/src/type_abi_derive.rs
+++ b/framework/derive/src/type_abi_derive.rs
@@ -1,7 +1,6 @@
 use crate::parse::attributes::extract_macro_attributes;
 
 use super::parse::attributes::extract_doc;
-use proc_macro::TokenStream;
 use quote::{quote, ToTokens};
 
 pub struct ExplicitDiscriminant {
@@ -45,7 +44,8 @@ fn fields_snippets(fields: &syn::Fields) -> Vec<proc_macro2::TokenStream> {
     }
 }
 
-pub fn type_abi_derive(ast: &syn::DeriveInput) -> TokenStream {
+pub fn type_abi_derive(input: proc_macro::TokenStream) -> proc_macro2::TokenStream {
+    let ast: syn::DeriveInput = syn::parse(input).unwrap();
     let type_docs = extract_doc(ast.attrs.as_slice());
     let macro_attributes = extract_macro_attributes(ast.attrs.as_slice());
 
@@ -123,7 +123,7 @@ pub fn type_abi_derive(ast: &syn::DeriveInput) -> TokenStream {
     let name_str = name.to_string();
     let (impl_generics, ty_generics, where_clause) = &ast.generics.split_for_impl();
     let name_rust = extract_rust_type(ty_generics, name_str.clone());
-    let type_abi_impl = quote! {
+    quote! {
         impl #impl_generics multiversx_sc::abi::TypeAbi for #name #ty_generics #where_clause {
             fn type_name() -> multiversx_sc::abi::TypeName {
                 #name_str.into()
@@ -135,8 +135,16 @@ pub fn type_abi_derive(ast: &syn::DeriveInput) -> TokenStream {
 
             #type_description_impl
         }
-    };
-    type_abi_impl.into()
+    }
+}
+
+pub fn type_abi_full(input: proc_macro::TokenStream) -> proc_macro2::TokenStream {
+    let input_conv = proc_macro2::TokenStream::from(input.clone());
+    let derive_code = type_abi_derive(input);
+    quote! {
+        #input_conv
+        #derive_code
+    }
 }
 
 pub fn get_discriminant(
diff --git a/framework/meta/src/abi_json/type_abi_json.rs b/framework/meta/src/abi_json/type_abi_json.rs
index dac3f7c029..4f6bbb8fbe 100644
--- a/framework/meta/src/abi_json/type_abi_json.rs
+++ b/framework/meta/src/abi_json/type_abi_json.rs
@@ -87,7 +87,7 @@ impl TypeDescriptionJson {
                 ),
                 _ => TypeContents::NotSpecified,
             },
-            macro_attributes: Vec::new()
+            macro_attributes: Vec::new(),
         }
     }
 }

From 25912266cb030536fea6895e8282266c5d7a7d62 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 21 Mar 2024 11:04:53 +0200
Subject: [PATCH 0499/1254] multisig - re-generated proxy

---
 contracts/examples/multisig/sc-config.toml    |  1 +
 contracts/examples/multisig/src/multisig.rs   |  2 +-
 .../src/{proxy.rs => multisig_proxy.rs}       | 50 +++++++++++++++++--
 3 files changed, 47 insertions(+), 6 deletions(-)
 rename contracts/examples/multisig/src/{proxy.rs => multisig_proxy.rs} (94%)

diff --git a/contracts/examples/multisig/sc-config.toml b/contracts/examples/multisig/sc-config.toml
index ca6a294c4f..00417afac7 100644
--- a/contracts/examples/multisig/sc-config.toml
+++ b/contracts/examples/multisig/sc-config.toml
@@ -1,4 +1,5 @@
 [settings]
+proxy-paths = ["src/multisig_proxy.rs"]
 main = "main"
 
 [contracts.main]
diff --git a/contracts/examples/multisig/src/multisig.rs b/contracts/examples/multisig/src/multisig.rs
index da8c81d21f..75c13cb5dd 100644
--- a/contracts/examples/multisig/src/multisig.rs
+++ b/contracts/examples/multisig/src/multisig.rs
@@ -4,8 +4,8 @@ pub mod action;
 pub mod multisig_events;
 pub mod multisig_perform;
 pub mod multisig_propose;
+// pub mod multisig_proxy;
 pub mod multisig_state;
-pub mod proxy;
 pub mod user_role;
 
 use action::ActionFullInfo;
diff --git a/contracts/examples/multisig/src/proxy.rs b/contracts/examples/multisig/src/multisig_proxy.rs
similarity index 94%
rename from contracts/examples/multisig/src/proxy.rs
rename to contracts/examples/multisig/src/multisig_proxy.rs
index 73b99ea08c..b0d42e16ef 100644
--- a/contracts/examples/multisig/src/proxy.rs
+++ b/contracts/examples/multisig/src/multisig_proxy.rs
@@ -4,8 +4,7 @@
 
 #![allow(clippy::all)]
 
-use multiversx_sc::imports::*;
-use crate as multisig;
+use multiversx_sc::proxy_imports::*;
 
 pub struct MultisigProxy;
 
@@ -104,7 +103,7 @@ where
         (),
         Gas,
         FunctionCall<Env::Api>,
-        OriginalResultMarker<MultiValueEncoded<Env::Api, multisig::action::ActionFullInfo<Env::Api>>>,
+        OriginalResultMarker<MultiValueEncoded<Env::Api, ActionFullInfo<Env::Api>>>,
     > {
         self.wrapped_tx
             .raw_call()
@@ -154,7 +153,7 @@ where
         (),
         Gas,
         FunctionCall<Env::Api>,
-        OriginalResultMarker<multisig::user_role::UserRole>,
+        OriginalResultMarker<UserRole>,
     > {
         self.wrapped_tx
             .raw_call()
@@ -356,7 +355,7 @@ where
         (),
         Gas,
         FunctionCall<Env::Api>,
-        OriginalResultMarker<multisig::action::Action<Env::Api>>,
+        OriginalResultMarker<Action<Env::Api>>,
     > {
         self.wrapped_tx
             .raw_call()
@@ -722,3 +721,44 @@ where
     }
 
 }
+#[derive(TopEncode, TopDecode)]
+pub struct ActionFullInfo<Api>
+where
+    Api: ManagedTypeApi,
+{
+    pub action_id: usize,
+    pub action_data: Action<Api>,
+    pub signers: ManagedVec<Api, ManagedAddress<Api>>,
+}
+
+#[derive(TopEncode, TopDecode)]
+pub enum Action {
+    Nothing,
+    AddBoardMember,
+    AddProposer,
+    RemoveUser,
+    ChangeQuorum,
+    SendTransferExecute,
+    SendAsyncCall,
+    SCDeployFromSource,
+    SCUpgradeFromSource,
+}
+
+#[derive(TopEncode, TopDecode)]
+pub struct CallActionData<Api>
+where
+    Api: ManagedTypeApi,
+{
+    pub to: ManagedAddress<Api>,
+    pub egld_amount: BigUint<Api>,
+    pub endpoint_name: ManagedBuffer<Api>,
+    pub arguments: ManagedVec<Api, ManagedBuffer<Api>>,
+}
+
+#[derive(TopEncode, TopDecode)]
+pub enum UserRole {
+    None,
+    Proposer,
+    BoardMember,
+}
+

From e3f937f95ca01b56a2e3e9197dae68dfef968151 Mon Sep 17 00:00:00 2001
From: Laurentiu Ciobanu <laurentiu.ciobanu@multiversx.com>
Date: Thu, 21 Mar 2024 11:09:01 +0200
Subject: [PATCH 0500/1254] cleanup compiler-artifact check

---
 framework/meta/src/cmd/standalone/test_coverage/cargo.rs | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/framework/meta/src/cmd/standalone/test_coverage/cargo.rs b/framework/meta/src/cmd/standalone/test_coverage/cargo.rs
index 6fb70e13b9..2a4f3b45c0 100644
--- a/framework/meta/src/cmd/standalone/test_coverage/cargo.rs
+++ b/framework/meta/src/cmd/standalone/test_coverage/cargo.rs
@@ -77,12 +77,9 @@ pub fn get_instrumented_test_binaries_paths(path: &str) -> Result<Vec<String>, T
             continue;
         };
 
-        if !matches!(
-            message.get("reason").map(|val| val.as_str()),
-            Some(Some("compiler-artifact"))
-        ) {
+        let Some("compiler-artifact") = message.get("reason").and_then(|val| val.as_str()) else {
             continue;
-        }
+        };
 
         let Ok(mut message) = serde_json::from_value::<PartialCompilerArtifactMessage>(message)
         else {

From 5058b386c297f63ac4bc3ef4c7c0f90668b43fc0 Mon Sep 17 00:00:00 2001
From: Alexandru Popenta <alexandru.p9913@gmail.com>
Date: Thu, 21 Mar 2024 12:16:13 +0200
Subject: [PATCH 0501/1254] reference latest commit

---
 .github/workflows/actions.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
index 94a41b3dbe..698412f9ac 100644
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -14,10 +14,11 @@ permissions:
 jobs:
   contracts:
     name: Contracts
-    uses: multiversx/mx-sc-actions/.github/workflows/contracts.yml@53103051467f2ae63ebfbf3ea71328bf215a2828
+    uses: multiversx/mx-sc-actions/.github/workflows/contracts.yml@fa11ef52c0fa2f9d993fe8d06239ffd871301c89
     with:
       rust-toolchain: nightly-2023-12-11
       path-to-sc-meta: framework/meta
+      mx-scenario-go-version: v2.1.0-alpha2
     secrets:
       token: ${{ secrets.GITHUB_TOKEN }}
 

From 83f5658921f1080febd83925e8ff519f5f376473 Mon Sep 17 00:00:00 2001
From: Alexandru Popenta <alexandru.p9913@gmail.com>
Date: Thu, 21 Mar 2024 12:45:34 +0200
Subject: [PATCH 0502/1254] reference latest commit

---
 .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 698412f9ac..f121a28ac8 100644
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -14,7 +14,7 @@ permissions:
 jobs:
   contracts:
     name: Contracts
-    uses: multiversx/mx-sc-actions/.github/workflows/contracts.yml@fa11ef52c0fa2f9d993fe8d06239ffd871301c89
+    uses: multiversx/mx-sc-actions/.github/workflows/contracts.yml@a94a5ee2982c5db0972a5ad81ebbc798b7cd6014
     with:
       rust-toolchain: nightly-2023-12-11
       path-to-sc-meta: framework/meta

From 0734745696c31019703e15b1f8d25bc95cb319c9 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 21 Mar 2024 14:09:33 +0200
Subject: [PATCH 0503/1254] type abi - type name rust in struct field
 description

---
 framework/base/src/abi/type_description.rs   | 6 +++---
 framework/derive/src/type_abi_derive.rs      | 2 +-
 framework/meta/src/abi_json/type_abi_json.rs | 7 +++++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/framework/base/src/abi/type_description.rs b/framework/base/src/abi/type_description.rs
index 011b07d00c..0d2aead60b 100644
--- a/framework/base/src/abi/type_description.rs
+++ b/framework/base/src/abi/type_description.rs
@@ -70,7 +70,7 @@ impl TypeContents {
             TypeContents::Struct(struct_fields) => {
                 for struct_field in struct_fields {
                     names.push(struct_field.name.clone());
-                    names.push(struct_field.field_type.clone());
+                    // names.push(struct_field.field_type.clone());
                 }
             },
             TypeContents::ExplicitEnum(_explicit_enum_variants) => {},
@@ -112,12 +112,12 @@ impl EnumVariantDescription {
 pub struct StructFieldDescription {
     pub docs: Vec<String>,
     pub name: String,
-    pub field_type: String,
+    pub field_type: TypeNames,
 }
 
 impl StructFieldDescription {
     /// Used in code generation.
-    pub fn new(docs: &[&str], name: &str, field_type: String) -> Self {
+    pub fn new(docs: &[&str], name: &str, field_type: TypeNames) -> Self {
         Self {
             docs: docs.iter().map(|s| s.to_string()).collect(),
             name: name.to_string(),
diff --git a/framework/derive/src/type_abi_derive.rs b/framework/derive/src/type_abi_derive.rs
index aec0b73a18..56bd71d600 100644
--- a/framework/derive/src/type_abi_derive.rs
+++ b/framework/derive/src/type_abi_derive.rs
@@ -20,7 +20,7 @@ fn field_snippet(index: usize, field: &syn::Field) -> proc_macro2::TokenStream {
         field_descriptions.push(multiversx_sc::abi::StructFieldDescription::new(
             &[ #(#field_docs),* ],
             #field_name_str,
-            <#field_ty>::type_name_rust(),
+            <#field_ty>::type_names(),
         ));
         <#field_ty>::provide_type_descriptions(accumulator);
     }
diff --git a/framework/meta/src/abi_json/type_abi_json.rs b/framework/meta/src/abi_json/type_abi_json.rs
index 4f6bbb8fbe..f26cc7086d 100644
--- a/framework/meta/src/abi_json/type_abi_json.rs
+++ b/framework/meta/src/abi_json/type_abi_json.rs
@@ -109,7 +109,7 @@ impl From<&StructFieldDescription> for StructFieldDescriptionJson {
         StructFieldDescriptionJson {
             docs: abi.docs.iter().map(|d| d.to_string()).collect(),
             name: abi.name.to_string(),
-            field_type: abi.field_type.clone(),
+            field_type: abi.field_type.abi.clone(),
         }
     }
 }
@@ -119,7 +119,10 @@ impl StructFieldDescriptionJson {
         StructFieldDescription {
             docs: self.docs.clone(),
             name: self.name.clone(),
-            field_type: self.field_type.clone(),
+            field_type: TypeNames {
+                abi: self.field_type.clone(),
+                rust: "<unspecified>".into(),
+            },
         }
     }
 }

From 6e234c4ad111cec0d3b330db8ee725b8511e869f Mon Sep 17 00:00:00 2001
From: Alexandru Popenta <alexandru.p9913@gmail.com>
Date: Thu, 21 Mar 2024 14:29:40 +0200
Subject: [PATCH 0504/1254] reference latest commit

---
 .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 f121a28ac8..d51d92caaa 100644
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -14,7 +14,7 @@ permissions:
 jobs:
   contracts:
     name: Contracts
-    uses: multiversx/mx-sc-actions/.github/workflows/contracts.yml@a94a5ee2982c5db0972a5ad81ebbc798b7cd6014
+    uses: multiversx/mx-sc-actions/.github/workflows/contracts.yml@88f0203200a120a0a9e05cb8b0b3bdf083fe4389
     with:
       rust-toolchain: nightly-2023-12-11
       path-to-sc-meta: framework/meta

From 0b4cbc09eba26b3a7cbc75d8939ed7efb80e2dd3 Mon Sep 17 00:00:00 2001
From: Alexandru Popenta <alexandru.p9913@gmail.com>
Date: Thu, 21 Mar 2024 14:40:47 +0200
Subject: [PATCH 0505/1254] use previous mx-scenario-go release

---
 .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 d51d92caaa..a65df63c8a 100644
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -18,7 +18,7 @@ jobs:
     with:
       rust-toolchain: nightly-2023-12-11
       path-to-sc-meta: framework/meta
-      mx-scenario-go-version: v2.1.0-alpha2
+      mx-scenario-go-version: v2.1.0-alpha
     secrets:
       token: ${{ secrets.GITHUB_TOKEN }}
 

From 1d5b5d6fb6513be2e8d636b4209628eab1a5e6a8 Mon Sep 17 00:00:00 2001
From: Alexandru Popenta <alexandru.p9913@gmail.com>
Date: Thu, 21 Mar 2024 15:43:40 +0200
Subject: [PATCH 0506/1254] reference latest release

---
 .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 a65df63c8a..2d0dcc041b 100644
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -14,7 +14,7 @@ permissions:
 jobs:
   contracts:
     name: Contracts
-    uses: multiversx/mx-sc-actions/.github/workflows/contracts.yml@88f0203200a120a0a9e05cb8b0b3bdf083fe4389
+    uses: multiversx/mx-sc-actions/.github/workflows/contracts.yml@v3.0.0
     with:
       rust-toolchain: nightly-2023-12-11
       path-to-sc-meta: framework/meta

From ba291bfdc24769f91de38ac6579caeb4438f9c85 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Thu, 21 Mar 2024 18:09:22 +0200
Subject: [PATCH 0507/1254] tx proxy gen - handle enum with tuple and struct
 variants

---
 .../abi_tester_expected_main.abi.json         |  28 ++--
 .../abi_tester_expected_view.abi.json         |  28 ++--
 .../feature-tests/abi-tester/src/abi_proxy.rs |  16 ++-
 .../use_module_expected_main.abi.json         |  34 ++---
 .../use_module_expected_view.abi.json         |  34 ++---
 framework/base/src/abi/type_description.rs    |  21 ---
 .../meta/src/cmd/contract/generate_proxy.rs   |   1 +
 .../contract/generate_proxy/proxy_gen_main.rs |   4 +-
 .../generate_proxy/proxy_gen_struct_enum.rs   | 122 ++++++++++++++++++
 .../generate_proxy/proxy_template_gen.rs      |  60 ---------
 10 files changed, 198 insertions(+), 150 deletions(-)
 create mode 100644 framework/meta/src/cmd/contract/generate_proxy/proxy_gen_struct_enum.rs

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 999feb222f..b94afe2670 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
@@ -532,7 +532,7 @@
             "fields": [
                 {
                     "name": "big_uint",
-                    "type": "BigUint<$API>"
+                    "type": "BigUint"
                 },
                 {
                     "name": "integer",
@@ -540,7 +540,7 @@
                 },
                 {
                     "name": "managed_buffer",
-                    "type": "ManagedBuffer<$API>"
+                    "type": "bytes"
                 }
             ]
         },
@@ -578,7 +578,7 @@
                         "Tests that recursive types will not send the ABI generator into an infinite loop."
                     ],
                     "name": "next",
-                    "type": "Option<Box<AbiTestType>>"
+                    "type": "Option<AbiTestType>"
                 },
                 {
                     "docs": [
@@ -586,7 +586,7 @@
                         "Also, just like above, recursive types need to work even when nested into a tuple."
                     ],
                     "name": "tuple_madness",
-                    "type": "(OnlyShowsUpAsNested02, Option<Box<AbiTestType>>)"
+                    "type": "tuple<OnlyShowsUpAsNested02,Option<AbiTestType>>"
                 }
             ]
         },
@@ -640,7 +640,7 @@
                 },
                 {
                     "name": "amount",
-                    "type": "BigUint<$API>"
+                    "type": "BigUint"
                 },
                 {
                     "name": "frozen",
@@ -648,27 +648,27 @@
                 },
                 {
                     "name": "hash",
-                    "type": "ManagedBuffer<$API>"
+                    "type": "bytes"
                 },
                 {
                     "name": "name",
-                    "type": "ManagedBuffer<$API>"
+                    "type": "bytes"
                 },
                 {
                     "name": "attributes",
-                    "type": "ManagedBuffer<$API>"
+                    "type": "bytes"
                 },
                 {
                     "name": "creator",
-                    "type": "ManagedAddress<$API>"
+                    "type": "Address"
                 },
                 {
                     "name": "royalties",
-                    "type": "BigUint<$API>"
+                    "type": "BigUint"
                 },
                 {
                     "name": "uris",
-                    "type": "ManagedVec<$API, ManagedBuffer<$API>>"
+                    "type": "List<bytes>"
                 }
             ]
         },
@@ -677,7 +677,7 @@
             "fields": [
                 {
                     "name": "token_identifier",
-                    "type": "TokenIdentifier<$API>"
+                    "type": "TokenIdentifier"
                 },
                 {
                     "name": "token_nonce",
@@ -685,7 +685,7 @@
                 },
                 {
                     "name": "amount",
-                    "type": "BigUint<$API>"
+                    "type": "BigUint"
                 }
             ]
         },
@@ -800,7 +800,7 @@
             "fields": [
                 {
                     "name": "something",
-                    "type": "[u8; 0]"
+                    "type": "array0<u8>"
                 }
             ]
         },
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 4a31f9ea3d..f8a30cb9a5 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
@@ -193,7 +193,7 @@
             "fields": [
                 {
                     "name": "big_uint",
-                    "type": "BigUint<$API>"
+                    "type": "BigUint"
                 },
                 {
                     "name": "integer",
@@ -201,7 +201,7 @@
                 },
                 {
                     "name": "managed_buffer",
-                    "type": "ManagedBuffer<$API>"
+                    "type": "bytes"
                 }
             ]
         },
@@ -239,7 +239,7 @@
                         "Tests that recursive types will not send the ABI generator into an infinite loop."
                     ],
                     "name": "next",
-                    "type": "Option<Box<AbiTestType>>"
+                    "type": "Option<AbiTestType>"
                 },
                 {
                     "docs": [
@@ -247,7 +247,7 @@
                         "Also, just like above, recursive types need to work even when nested into a tuple."
                     ],
                     "name": "tuple_madness",
-                    "type": "(OnlyShowsUpAsNested02, Option<Box<AbiTestType>>)"
+                    "type": "tuple<OnlyShowsUpAsNested02,Option<AbiTestType>>"
                 }
             ]
         },
@@ -301,7 +301,7 @@
                 },
                 {
                     "name": "amount",
-                    "type": "BigUint<$API>"
+                    "type": "BigUint"
                 },
                 {
                     "name": "frozen",
@@ -309,27 +309,27 @@
                 },
                 {
                     "name": "hash",
-                    "type": "ManagedBuffer<$API>"
+                    "type": "bytes"
                 },
                 {
                     "name": "name",
-                    "type": "ManagedBuffer<$API>"
+                    "type": "bytes"
                 },
                 {
                     "name": "attributes",
-                    "type": "ManagedBuffer<$API>"
+                    "type": "bytes"
                 },
                 {
                     "name": "creator",
-                    "type": "ManagedAddress<$API>"
+                    "type": "Address"
                 },
                 {
                     "name": "royalties",
-                    "type": "BigUint<$API>"
+                    "type": "BigUint"
                 },
                 {
                     "name": "uris",
-                    "type": "ManagedVec<$API, ManagedBuffer<$API>>"
+                    "type": "List<bytes>"
                 }
             ]
         },
@@ -338,7 +338,7 @@
             "fields": [
                 {
                     "name": "token_identifier",
-                    "type": "TokenIdentifier<$API>"
+                    "type": "TokenIdentifier"
                 },
                 {
                     "name": "token_nonce",
@@ -346,7 +346,7 @@
                 },
                 {
                     "name": "amount",
-                    "type": "BigUint<$API>"
+                    "type": "BigUint"
                 }
             ]
         },
@@ -461,7 +461,7 @@
             "fields": [
                 {
                     "name": "something",
-                    "type": "[u8; 0]"
+                    "type": "array0<u8>"
                 }
             ]
         },
diff --git a/contracts/feature-tests/abi-tester/src/abi_proxy.rs b/contracts/feature-tests/abi-tester/src/abi_proxy.rs
index c7c7f8650a..5fdab1395f 100644
--- a/contracts/feature-tests/abi-tester/src/abi_proxy.rs
+++ b/contracts/feature-tests/abi-tester/src/abi_proxy.rs
@@ -664,9 +664,12 @@ pub struct OnlyShowsUpAsNested02
 #[derive(TopEncode, TopDecode)]
 pub enum AbiEnum {
     Nothing,
-    Something,
-    SomethingMore,
-    SomeStruct,
+    Something(i32),
+    SomethingMore(u8, OnlyShowsUpAsNested08),
+    SomeStruct {
+        a: u16,
+        b: OnlyShowsUpAsNested09,
+    },
 }
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
@@ -838,8 +841,11 @@ pub enum ExplicitDiscriminant {
 pub enum ExplicitDiscriminantMixed {
     Zero,
     Unit,
-    Tuple,
+    Tuple(u16),
     Five,
-    Struct,
+    Struct {
+        a: u8,
+        b: u16,
+    },
 }
 
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 8ce1878d1a..2e4694e6fb 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
@@ -1023,7 +1023,7 @@
             "fields": [
                 {
                     "name": "token_identifier",
-                    "type": "TokenIdentifier<$API>"
+                    "type": "TokenIdentifier"
                 },
                 {
                     "name": "token_nonce",
@@ -1031,7 +1031,7 @@
                 },
                 {
                     "name": "amount",
-                    "type": "BigUint<$API>"
+                    "type": "BigUint"
                 }
             ]
         },
@@ -1065,11 +1065,11 @@
             "fields": [
                 {
                     "name": "depositor_addr",
-                    "type": "ManagedAddress<$API>"
+                    "type": "Address"
                 },
                 {
                     "name": "tokens",
-                    "type": "EsdtTokenPayment<$API>"
+                    "type": "EsdtTokenPayment"
                 }
             ]
         },
@@ -1082,15 +1082,15 @@
                 },
                 {
                     "name": "dest_address",
-                    "type": "ManagedAddress<$API>"
+                    "type": "Address"
                 },
                 {
                     "name": "function_name",
-                    "type": "ManagedBuffer<$API>"
+                    "type": "bytes"
                 },
                 {
                     "name": "arguments",
-                    "type": "ManagedVec<$API, ManagedBuffer<$API>>"
+                    "type": "List<bytes>"
                 }
             ]
         },
@@ -1099,19 +1099,19 @@
             "fields": [
                 {
                     "name": "proposer",
-                    "type": "ManagedAddress<$API>"
+                    "type": "Address"
                 },
                 {
                     "name": "actions",
-                    "type": "ArrayVec<GovernanceAction<$API>, 4usize>"
+                    "type": "List<GovernanceAction>"
                 },
                 {
                     "name": "description",
-                    "type": "ManagedBuffer<$API>"
+                    "type": "bytes"
                 },
                 {
                     "name": "fees",
-                    "type": "ProposalFees<$API>"
+                    "type": "ProposalFees"
                 }
             ]
         },
@@ -1170,11 +1170,11 @@
             "fields": [
                 {
                     "name": "total_amount",
-                    "type": "BigUint<$API>"
+                    "type": "BigUint"
                 },
                 {
                     "name": "entries",
-                    "type": "ManagedVec<$API, FeeEntry<$API>>"
+                    "type": "List<FeeEntry>"
                 }
             ]
         },
@@ -1183,19 +1183,19 @@
             "fields": [
                 {
                     "name": "up_votes",
-                    "type": "BigUint<$API>"
+                    "type": "BigUint"
                 },
                 {
                     "name": "down_votes",
-                    "type": "BigUint<$API>"
+                    "type": "BigUint"
                 },
                 {
                     "name": "down_veto_votes",
-                    "type": "BigUint<$API>"
+                    "type": "BigUint"
                 },
                 {
                     "name": "abstain_votes",
-                    "type": "BigUint<$API>"
+                    "type": "BigUint"
                 }
             ]
         },
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 9fd87c32f8..c84a7deac4 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
@@ -267,7 +267,7 @@
             "fields": [
                 {
                     "name": "token_identifier",
-                    "type": "TokenIdentifier<$API>"
+                    "type": "TokenIdentifier"
                 },
                 {
                     "name": "token_nonce",
@@ -275,7 +275,7 @@
                 },
                 {
                     "name": "amount",
-                    "type": "BigUint<$API>"
+                    "type": "BigUint"
                 }
             ]
         },
@@ -309,11 +309,11 @@
             "fields": [
                 {
                     "name": "depositor_addr",
-                    "type": "ManagedAddress<$API>"
+                    "type": "Address"
                 },
                 {
                     "name": "tokens",
-                    "type": "EsdtTokenPayment<$API>"
+                    "type": "EsdtTokenPayment"
                 }
             ]
         },
@@ -326,15 +326,15 @@
                 },
                 {
                     "name": "dest_address",
-                    "type": "ManagedAddress<$API>"
+                    "type": "Address"
                 },
                 {
                     "name": "function_name",
-                    "type": "ManagedBuffer<$API>"
+                    "type": "bytes"
                 },
                 {
                     "name": "arguments",
-                    "type": "ManagedVec<$API, ManagedBuffer<$API>>"
+                    "type": "List<bytes>"
                 }
             ]
         },
@@ -343,19 +343,19 @@
             "fields": [
                 {
                     "name": "proposer",
-                    "type": "ManagedAddress<$API>"
+                    "type": "Address"
                 },
                 {
                     "name": "actions",
-                    "type": "ArrayVec<GovernanceAction<$API>, 4usize>"
+                    "type": "List<GovernanceAction>"
                 },
                 {
                     "name": "description",
-                    "type": "ManagedBuffer<$API>"
+                    "type": "bytes"
                 },
                 {
                     "name": "fees",
-                    "type": "ProposalFees<$API>"
+                    "type": "ProposalFees"
                 }
             ]
         },
@@ -414,11 +414,11 @@
             "fields": [
                 {
                     "name": "total_amount",
-                    "type": "BigUint<$API>"
+                    "type": "BigUint"
                 },
                 {
                     "name": "entries",
-                    "type": "ManagedVec<$API, FeeEntry<$API>>"
+                    "type": "List<FeeEntry>"
                 }
             ]
         },
@@ -427,19 +427,19 @@
             "fields": [
                 {
                     "name": "up_votes",
-                    "type": "BigUint<$API>"
+                    "type": "BigUint"
                 },
                 {
                     "name": "down_votes",
-                    "type": "BigUint<$API>"
+                    "type": "BigUint"
                 },
                 {
                     "name": "down_veto_votes",
-                    "type": "BigUint<$API>"
+                    "type": "BigUint"
                 },
                 {
                     "name": "abstain_votes",
-                    "type": "BigUint<$API>"
+                    "type": "BigUint"
                 }
             ]
         },
diff --git a/framework/base/src/abi/type_description.rs b/framework/base/src/abi/type_description.rs
index 0d2aead60b..f7e78ccef7 100644
--- a/framework/base/src/abi/type_description.rs
+++ b/framework/base/src/abi/type_description.rs
@@ -58,27 +58,6 @@ impl TypeContents {
     pub fn is_specified(&self) -> bool {
         !matches!(*self, TypeContents::NotSpecified)
     }
-
-    pub fn extract_names(&self) -> Vec<String> {
-        let mut names = Vec::new();
-        match &self {
-            TypeContents::Enum(enum_variants) => {
-                for enum_variant in enum_variants {
-                    names.push(enum_variant.name.clone());
-                }
-            },
-            TypeContents::Struct(struct_fields) => {
-                for struct_field in struct_fields {
-                    names.push(struct_field.name.clone());
-                    // names.push(struct_field.field_type.clone());
-                }
-            },
-            TypeContents::ExplicitEnum(_explicit_enum_variants) => {},
-            TypeContents::NotSpecified => {},
-        }
-
-        names
-    }
 }
 
 #[derive(Clone, Debug, PartialEq, Eq)]
diff --git a/framework/meta/src/cmd/contract/generate_proxy.rs b/framework/meta/src/cmd/contract/generate_proxy.rs
index d8f689c428..4538ae77d4 100644
--- a/framework/meta/src/cmd/contract/generate_proxy.rs
+++ b/framework/meta/src/cmd/contract/generate_proxy.rs
@@ -3,3 +3,4 @@ pub mod proxy_gen_main;
 mod proxy_naming;
 pub mod proxy_sc_functions_gen;
 pub mod proxy_template_gen;
+pub mod proxy_gen_struct_enum;
diff --git a/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_main.rs b/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_main.rs
index 6362738c52..a55fa334f5 100644
--- a/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_main.rs
+++ b/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_main.rs
@@ -5,10 +5,10 @@ use multiversx_sc::abi::ContractAbi;
 use super::{
     super::meta_config::MetaConfig,
     proxy_crate_gen::create_file,
+    proxy_gen_struct_enum::write_types,
     proxy_sc_functions_gen::write_content,
     proxy_template_gen::{
-        write_header, write_impl_for_tx_proxy, write_struct_template,
-        write_struct_tx_proxy_methods, write_types,
+        write_header, write_impl_for_tx_proxy, write_struct_template, write_struct_tx_proxy_methods,
     },
 };
 
diff --git a/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_struct_enum.rs b/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_struct_enum.rs
new file mode 100644
index 0000000000..b20a5cced2
--- /dev/null
+++ b/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_struct_enum.rs
@@ -0,0 +1,122 @@
+use std::{fs::File, io::Write};
+
+use multiversx_sc::abi::{
+    EnumVariantDescription, StructFieldDescription, TypeContents, TypeDescription,
+    TypeDescriptionContainerImpl,
+};
+
+use crate::cmd::contract::generate_snippets::snippet_gen_common::write_newline;
+
+const ZERO: &str = "0";
+
+pub(crate) fn write_types(file: &mut File, types: &TypeDescriptionContainerImpl) {
+    for (_, type_description) in &types.0 {
+        match &type_description.contents {
+            TypeContents::Enum(enum_variants) => write_enum(file, enum_variants, type_description),
+            TypeContents::Struct(struct_fields) => {
+                write_struct(file, struct_fields, type_description)
+            },
+            TypeContents::NotSpecified => {},
+            TypeContents::ExplicitEnum(_) => {},
+        }
+    }
+}
+
+fn write_struct(
+    file: &mut File,
+    struct_fields: &Vec<StructFieldDescription>,
+    type_description: &TypeDescription,
+) {
+    let struct_name = type_description.names.rust.replace("$API", "Api");
+    write_macro_attributes(file, &type_description.macro_attributes);
+    writeln!(file, r#"pub struct {struct_name}"#).unwrap();
+
+    if struct_name.contains("<Api>") {
+        writeln!(
+            file,
+            r#"where
+    Api: ManagedTypeApi,"#
+        )
+        .unwrap();
+    }
+
+    writeln!(file, r#"{{"#).unwrap();
+
+    for field in struct_fields {
+        writeln!(
+            file,
+            "    pub {}: {},",
+            field.name,
+            field.field_type.rust.replace("$API", "Api")
+        )
+        .unwrap();
+    }
+
+    writeln!(file, "}}").unwrap();
+    write_newline(file);
+}
+
+fn write_enum(
+    file: &mut File,
+    enum_variants: &Vec<EnumVariantDescription>,
+    type_description: &TypeDescription,
+) {
+    write_macro_attributes(file, &type_description.macro_attributes);
+    writeln!(
+        file,
+        r#"pub enum {} {{"#,
+        type_description.names.rust.replace("$API", "Api")
+    )
+    .unwrap();
+
+    for variant in enum_variants {
+        write!(file, "    {}", variant.name).unwrap();
+        if variant.fields.is_empty() {
+            writeln!(file, ",").unwrap();
+            continue;
+        }
+
+        if variant.fields[0].name == ZERO {
+            write_tuple_in_variant(file, &variant.fields);
+        } else {
+            write_struct_in_variant(file, &variant.fields);
+        }
+    }
+    writeln!(file, "}}").unwrap();
+    write_newline(file);
+}
+
+fn write_macro_attributes(file: &mut File, macro_attributes: &[String]) {
+    if macro_attributes.is_empty() {
+        writeln!(file, "#[derive(TopEncode, TopDecode)]").unwrap();
+    } else {
+        writeln!(file, "#[derive({})]", macro_attributes.join(", ")).unwrap();
+    }
+}
+
+fn write_struct_in_variant(file: &mut File, fields: &Vec<StructFieldDescription>) {
+    writeln!(file, " {{").unwrap();
+
+    for field in fields {
+        writeln!(
+            file,
+            "        {}: {},",
+            field.name,
+            field.field_type.rust.replace("$API", "Api")
+        )
+        .unwrap();
+    }
+
+    writeln!(file, "    }},").unwrap();
+}
+
+fn write_tuple_in_variant(file: &mut File, fields: &Vec<StructFieldDescription>) {
+    write!(file, "(").unwrap();
+    write!(file, "{}", fields[0].field_type.rust.replace("$API", "Api")).unwrap();
+
+    for field in &fields[1..] {
+        write!(file, ", {}", field.field_type.rust.replace("$API", "Api")).unwrap();
+    }
+
+    writeln!(file, "),").unwrap();
+}
diff --git a/framework/meta/src/cmd/contract/generate_proxy/proxy_template_gen.rs b/framework/meta/src/cmd/contract/generate_proxy/proxy_template_gen.rs
index 699ecf433b..71b673e3a5 100644
--- a/framework/meta/src/cmd/contract/generate_proxy/proxy_template_gen.rs
+++ b/framework/meta/src/cmd/contract/generate_proxy/proxy_template_gen.rs
@@ -1,7 +1,5 @@
 use std::{fs::File, io::Write};
 
-use multiversx_sc::abi::{TypeContents, TypeDescription, TypeDescriptionContainerImpl};
-
 use crate::cmd::contract::generate_snippets::snippet_gen_common::write_newline;
 
 use super::proxy_naming::{proxy_methods_type_name, proxy_type_name};
@@ -22,17 +20,6 @@ pub(crate) fn write_header(file: &mut File) {
     write_newline(file);
 }
 
-pub(crate) fn write_types(file: &mut File, types: &TypeDescriptionContainerImpl) {
-    for (_, type_description) in &types.0 {
-        match &type_description.contents {
-            TypeContents::Enum(_) => write_enum(file, type_description),
-            TypeContents::Struct(_) => write_struct(file, type_description),
-            TypeContents::NotSpecified => {},
-            TypeContents::ExplicitEnum(_) => {},
-        }
-    }
-}
-
 pub(crate) fn write_struct_template(file: &mut File, name: &str) {
     let proxy_type_name = proxy_type_name(name);
     writeln!(file, "pub struct {proxy_type_name};").unwrap();
@@ -81,50 +68,3 @@ where
 
     write_newline(file);
 }
-
-fn write_enum(file: &mut File, type_description: &TypeDescription) {
-    write_macro_attributes(file, &type_description.macro_attributes);
-    writeln!(file, r#"pub enum {} {{"#, type_description.names.abi).unwrap();
-
-    for content in type_description.contents.extract_names() {
-        writeln!(file, "    {content},").unwrap();
-    }
-
-    writeln!(file, "}}").unwrap();
-    write_newline(file);
-}
-
-fn write_struct(file: &mut File, type_description: &TypeDescription) {
-    let struct_name = type_description.names.rust.replace("$API", "Api");
-    write_macro_attributes(file, &type_description.macro_attributes);
-    writeln!(file, r#"pub struct {}"#, struct_name).unwrap();
-
-    if struct_name.contains("<Api>") {
-        writeln!(
-            file,
-            r#"where
-    Api: ManagedTypeApi,"#
-        )
-        .unwrap();
-    }
-
-    writeln!(file, r#"{{"#).unwrap();
-
-    for content in type_description.contents.extract_names().chunks_exact(2) {
-        let variable_name = &content[0];
-        let variable_type = &content[1].replace("$API", "Api");
-
-        writeln!(file, "    pub {variable_name}: {variable_type},").unwrap();
-    }
-
-    writeln!(file, "}}").unwrap();
-    write_newline(file);
-}
-
-fn write_macro_attributes(file: &mut File, macro_attributes: &[String]) {
-    if macro_attributes.is_empty() {
-        writeln!(file, "#[derive(TopEncode, TopDecode)]").unwrap();
-    } else {
-        writeln!(file, "#[derive({})]", macro_attributes.join(", ")).unwrap();
-    }
-}

From 82133dff989ec081559a299ffa846e0919f89193 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Thu, 21 Mar 2024 18:21:45 +0200
Subject: [PATCH 0508/1254] fix clippy

---
 .../src/cmd/contract/generate_proxy/proxy_gen_struct_enum.rs  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_struct_enum.rs b/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_struct_enum.rs
index b20a5cced2..2932437a5b 100644
--- a/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_struct_enum.rs
+++ b/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_struct_enum.rs
@@ -94,7 +94,7 @@ fn write_macro_attributes(file: &mut File, macro_attributes: &[String]) {
     }
 }
 
-fn write_struct_in_variant(file: &mut File, fields: &Vec<StructFieldDescription>) {
+fn write_struct_in_variant(file: &mut File, fields: &[StructFieldDescription]) {
     writeln!(file, " {{").unwrap();
 
     for field in fields {
@@ -110,7 +110,7 @@ fn write_struct_in_variant(file: &mut File, fields: &Vec<StructFieldDescription>
     writeln!(file, "    }},").unwrap();
 }
 
-fn write_tuple_in_variant(file: &mut File, fields: &Vec<StructFieldDescription>) {
+fn write_tuple_in_variant(file: &mut File, fields: &[StructFieldDescription]) {
     write!(file, "(").unwrap();
     write!(file, "{}", fields[0].field_type.rust.replace("$API", "Api")).unwrap();
 

From 4b64a37b7e3dd102b6cd537e5a2d105b5aeee50b Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Thu, 21 Mar 2024 21:39:40 +0200
Subject: [PATCH 0509/1254] tx proxy gen - setup and call sc-meta proxy

---
 contracts/examples/adder/src/adder_proxy.rs   |  36 +-
 .../examples/crowdfunding-esdt/sc-config.toml |   2 +
 .../src/crowdfunding_esdt.rs                  |   2 +-
 ...mp_proxy.rs => crowdfunding_esdt_proxy.rs} |  19 +-
 .../examples/crypto-zombies/sc-config.toml    |   2 +
 ...{temp_proxy.rs => crypto_zombies_proxy.rs} |   5 +-
 contracts/examples/crypto-zombies/src/lib.rs  |   2 +-
 .../examples/crypto-zombies/wasm/src/lib.rs   |   5 +-
 .../examples/digital-cash/sc-config.toml      |   2 +
 .../examples/digital-cash/src/deposit_info.rs |   3 +-
 .../examples/digital-cash/src/digital_cash.rs |   1 +
 .../digital-cash/src/digital_cash_proxy.rs    | 391 ++++++++++++++++++
 12 files changed, 443 insertions(+), 27 deletions(-)
 create mode 100644 contracts/examples/crowdfunding-esdt/sc-config.toml
 rename contracts/examples/crowdfunding-esdt/src/{temp_proxy.rs => crowdfunding_esdt_proxy.rs} (98%)
 create mode 100644 contracts/examples/crypto-zombies/sc-config.toml
 rename contracts/examples/crypto-zombies/src/{temp_proxy.rs => crypto_zombies_proxy.rs} (99%)
 create mode 100644 contracts/examples/digital-cash/sc-config.toml
 create mode 100644 contracts/examples/digital-cash/src/digital_cash_proxy.rs

diff --git a/contracts/examples/adder/src/adder_proxy.rs b/contracts/examples/adder/src/adder_proxy.rs
index c1b5195101..72e85655f8 100644
--- a/contracts/examples/adder/src/adder_proxy.rs
+++ b/contracts/examples/adder/src/adder_proxy.rs
@@ -4,7 +4,7 @@
 
 #![allow(clippy::all)]
 
-use multiversx_sc::imports::*;
+use multiversx_sc::proxy_imports::*;
 
 pub struct AdderProxy;
 
@@ -39,15 +39,26 @@ where
     From: TxFrom<Env>,
     Gas: TxGas<Env>,
 {
-    pub fn init<Arg0: CodecInto<BigUint<Env::Api>>>(
+    pub fn init<
+        Arg0: CodecInto<BigUint<Env::Api>>,
+    >(
         self,
         initial_value: Arg0,
-    ) -> Tx<Env, From, (), (), Gas, DeployCall<Env, ()>, OriginalResultMarker<()>> {
+    ) -> Tx<
+        Env,
+        From,
+        (),
+        (),
+        Gas,
+        DeployCall<Env, ()>,
+        OriginalResultMarker<()>,
+    > {
         self.wrapped_tx
             .raw_deploy()
             .argument(&initial_value)
             .original_result()
     }
+
 }
 impl<Env, From, To, Gas> AdderProxyMethods<Env, From, To, Gas>
 where
@@ -66,7 +77,7 @@ where
         (),
         Gas,
         FunctionCall<Env::Api>,
-        OriginalResultMarker<multiversx_sc::types::BigUint<Env::Api>>,
+        OriginalResultMarker<BigUint<Env::Api>>,
     > {
         self.wrapped_tx
             .raw_call()
@@ -74,15 +85,26 @@ where
             .original_result()
     }
 
-    /// Add desired amount to the storage variable.
-    pub fn add<Arg0: CodecInto<BigUint<Env::Api>>>(
+    /// Add desired amount to the storage variable. 
+    pub fn add<
+        Arg0: CodecInto<BigUint<Env::Api>>,
+    >(
         self,
         value: Arg0,
-    ) -> Tx<Env, From, To, (), Gas, FunctionCall<Env::Api>, OriginalResultMarker<()>> {
+    ) -> Tx<
+        Env,
+        From,
+        To,
+        (),
+        Gas,
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<()>,
+    > {
         self.wrapped_tx
             .raw_call()
             .function_name("add")
             .argument(&value)
             .original_result()
     }
+
 }
diff --git a/contracts/examples/crowdfunding-esdt/sc-config.toml b/contracts/examples/crowdfunding-esdt/sc-config.toml
new file mode 100644
index 0000000000..6539909c96
--- /dev/null
+++ b/contracts/examples/crowdfunding-esdt/sc-config.toml
@@ -0,0 +1,2 @@
+[settings]
+proxy-paths = ["src/crowdfunding_esdt_proxy.rs"]
diff --git a/contracts/examples/crowdfunding-esdt/src/crowdfunding_esdt.rs b/contracts/examples/crowdfunding-esdt/src/crowdfunding_esdt.rs
index f38da41061..abe8420d82 100644
--- a/contracts/examples/crowdfunding-esdt/src/crowdfunding_esdt.rs
+++ b/contracts/examples/crowdfunding-esdt/src/crowdfunding_esdt.rs
@@ -1,7 +1,7 @@
 #![no_std]
 
 use multiversx_sc::{derive_imports::*, imports::*};
-pub mod temp_proxy;
+pub mod crowdfunding_esdt_proxy;
 
 #[type_abi]
 #[derive(TopEncode, TopDecode, PartialEq, Eq, Clone, Copy, Debug)]
diff --git a/contracts/examples/crowdfunding-esdt/src/temp_proxy.rs b/contracts/examples/crowdfunding-esdt/src/crowdfunding_esdt_proxy.rs
similarity index 98%
rename from contracts/examples/crowdfunding-esdt/src/temp_proxy.rs
rename to contracts/examples/crowdfunding-esdt/src/crowdfunding_esdt_proxy.rs
index b82e54eb8c..fbbcec61d4 100644
--- a/contracts/examples/crowdfunding-esdt/src/temp_proxy.rs
+++ b/contracts/examples/crowdfunding-esdt/src/crowdfunding_esdt_proxy.rs
@@ -4,17 +4,7 @@
 
 #![allow(clippy::all)]
 
-use multiversx_sc::imports::*;
-
-use multiversx_sc::derive_imports::*;
-
-#[type_abi]
-#[derive(TopEncode, TopDecode, PartialEq, Eq, Clone, Copy, Debug)]
-pub enum Status {
-    FundingPeriod,
-    Successful,
-    Failed,
-}
+use multiversx_sc::proxy_imports::*;
 
 pub struct CrowdfundingProxy;
 
@@ -225,3 +215,10 @@ where
     }
 
 }
+#[derive(TopEncode, TopDecode, PartialEq, Eq, Clone, Copy, Debug)]
+pub enum Status {
+    FundingPeriod,
+    Successful,
+    Failed,
+}
+
diff --git a/contracts/examples/crypto-zombies/sc-config.toml b/contracts/examples/crypto-zombies/sc-config.toml
new file mode 100644
index 0000000000..2a3130ea0d
--- /dev/null
+++ b/contracts/examples/crypto-zombies/sc-config.toml
@@ -0,0 +1,2 @@
+[settings]
+proxy-paths = ["src/crypto_zombies_proxy.rs"]
\ No newline at end of file
diff --git a/contracts/examples/crypto-zombies/src/temp_proxy.rs b/contracts/examples/crypto-zombies/src/crypto_zombies_proxy.rs
similarity index 99%
rename from contracts/examples/crypto-zombies/src/temp_proxy.rs
rename to contracts/examples/crypto-zombies/src/crypto_zombies_proxy.rs
index 09ae9979d1..ea1a1ef4a6 100644
--- a/contracts/examples/crypto-zombies/src/temp_proxy.rs
+++ b/contracts/examples/crypto-zombies/src/crypto_zombies_proxy.rs
@@ -4,7 +4,7 @@
 
 #![allow(clippy::all)]
 
-use multiversx_sc::imports::*;
+use multiversx_sc::proxy_imports::*;
 
 pub struct CryptoZombiesProxy;
 
@@ -410,9 +410,6 @@ where
     }
 
 }
-use multiversx_sc::derive_imports::*;
-
-#[type_abi]
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct Zombie<Api>
 where
diff --git a/contracts/examples/crypto-zombies/src/lib.rs b/contracts/examples/crypto-zombies/src/lib.rs
index bed761384f..d767bd61ff 100644
--- a/contracts/examples/crypto-zombies/src/lib.rs
+++ b/contracts/examples/crypto-zombies/src/lib.rs
@@ -3,8 +3,8 @@
 use multiversx_sc::imports::*;
 
 mod crypto_kitties_proxy;
+pub mod crypto_zombies_proxy;
 mod storage;
-pub mod temp_proxy;
 mod zombie;
 mod zombie_attack;
 mod zombie_factory;
diff --git a/contracts/examples/crypto-zombies/wasm/src/lib.rs b/contracts/examples/crypto-zombies/wasm/src/lib.rs
index 44f5f426c8..ffc350bc7d 100644
--- a/contracts/examples/crypto-zombies/wasm/src/lib.rs
+++ b/contracts/examples/crypto-zombies/wasm/src/lib.rs
@@ -5,9 +5,10 @@
 ////////////////////////////////////////////////////
 
 // Init:                                 1
-// Endpoints:                           18
+// Upgrade:                              1
+// Endpoints:                           17
 // Async Callback:                       1
-// Total number of exported functions:  20
+// Total number of exported functions:  19
 
 #![no_std]
 #![allow(internal_features)]
diff --git a/contracts/examples/digital-cash/sc-config.toml b/contracts/examples/digital-cash/sc-config.toml
new file mode 100644
index 0000000000..e33ce56689
--- /dev/null
+++ b/contracts/examples/digital-cash/sc-config.toml
@@ -0,0 +1,2 @@
+[settings]
+proxy-paths = ["src/digital_cash_proxy.rs"]
\ No newline at end of file
diff --git a/contracts/examples/digital-cash/src/deposit_info.rs b/contracts/examples/digital-cash/src/deposit_info.rs
index ce2c279409..daef136feb 100644
--- a/contracts/examples/digital-cash/src/deposit_info.rs
+++ b/contracts/examples/digital-cash/src/deposit_info.rs
@@ -25,7 +25,8 @@ where
     }
 }
 
-#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, TypeAbi)]
+#[type_abi]
+#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct Fee<M: ManagedTypeApi> {
     pub num_token_to_transfer: usize,
     pub value: EgldOrEsdtTokenPayment<M>,
diff --git a/contracts/examples/digital-cash/src/digital_cash.rs b/contracts/examples/digital-cash/src/digital_cash.rs
index b46c2b7331..052faca2ef 100644
--- a/contracts/examples/digital-cash/src/digital_cash.rs
+++ b/contracts/examples/digital-cash/src/digital_cash.rs
@@ -5,6 +5,7 @@ use multiversx_sc::imports::*;
 
 mod constants;
 mod deposit_info;
+pub mod digital_cash_proxy;
 mod helpers;
 mod pay_fee_and_fund;
 mod signature_operations;
diff --git a/contracts/examples/digital-cash/src/digital_cash_proxy.rs b/contracts/examples/digital-cash/src/digital_cash_proxy.rs
new file mode 100644
index 0000000000..41459dea9f
--- /dev/null
+++ b/contracts/examples/digital-cash/src/digital_cash_proxy.rs
@@ -0,0 +1,391 @@
+////////////////////////////////////////////////////
+////////////////// AUTO-GENERATED //////////////////
+////////////////////////////////////////////////////
+
+#![allow(clippy::all)]
+
+use multiversx_sc::proxy_imports::*;
+
+pub struct DigitalCashProxy;
+
+impl<Env, From, To, Gas> TxProxyTrait<Env, From, To, Gas> for DigitalCashProxy
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    type TxProxyMethods = DigitalCashProxyMethods<Env, From, To, Gas>;
+
+    fn proxy_methods(self, tx: Tx<Env, From, To, (), Gas, (), ()>) -> Self::TxProxyMethods {
+        DigitalCashProxyMethods { wrapped_tx: tx }
+    }
+}
+
+pub struct DigitalCashProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    wrapped_tx: Tx<Env, From, To, (), Gas, (), ()>,
+}
+
+impl<Env, From, Gas> DigitalCashProxyMethods<Env, From, (), Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn init<
+        Arg0: CodecInto<BigUint<Env::Api>>,
+        Arg1: CodecInto<EgldOrEsdtTokenIdentifier<Env::Api>>,
+    >(
+        self,
+        fee: Arg0,
+        token: Arg1,
+    ) -> Tx<
+        Env,
+        From,
+        (),
+        (),
+        Gas,
+        DeployCall<Env, ()>,
+        OriginalResultMarker<()>,
+    > {
+        self.wrapped_tx
+            .raw_deploy()
+            .argument(&fee)
+            .argument(&token)
+            .original_result()
+    }
+
+}
+impl<Env, From, To, Gas> DigitalCashProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn whitelist_fee_token<
+        Arg0: CodecInto<BigUint<Env::Api>>,
+        Arg1: CodecInto<EgldOrEsdtTokenIdentifier<Env::Api>>,
+    >(
+        self,
+        fee: Arg0,
+        token: Arg1,
+    ) -> Tx<
+        Env,
+        From,
+        To,
+        (),
+        Gas,
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<()>,
+    > {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("whitelistFeeToken")
+            .argument(&fee)
+            .argument(&token)
+            .original_result()
+    }
+
+    pub fn blacklist_fee_token<
+        Arg0: CodecInto<EgldOrEsdtTokenIdentifier<Env::Api>>,
+    >(
+        self,
+        token: Arg0,
+    ) -> Tx<
+        Env,
+        From,
+        To,
+        (),
+        Gas,
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<()>,
+    > {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("blacklistFeeToken")
+            .argument(&token)
+            .original_result()
+    }
+
+    pub fn claim_fees(
+        self,
+    ) -> Tx<
+        Env,
+        From,
+        To,
+        (),
+        Gas,
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<()>,
+    > {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("claimFees")
+            .original_result()
+    }
+
+    pub fn get_amount<
+        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+        Arg1: CodecInto<EgldOrEsdtTokenIdentifier<Env::Api>>,
+        Arg2: CodecInto<u64>,
+    >(
+        self,
+        address: Arg0,
+        token: Arg1,
+        nonce: Arg2,
+    ) -> Tx<
+        Env,
+        From,
+        To,
+        (),
+        Gas,
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<BigUint<Env::Api>>,
+    > {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("getAmount")
+            .argument(&address)
+            .argument(&token)
+            .argument(&nonce)
+            .original_result()
+    }
+
+    pub fn pay_fee_and_fund_esdt<
+        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+        Arg1: CodecInto<u64>,
+    >(
+        self,
+        address: Arg0,
+        valability: Arg1,
+    ) -> Tx<
+        Env,
+        From,
+        To,
+        (),
+        Gas,
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<()>,
+    > {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("payFeeAndFundESDT")
+            .argument(&address)
+            .argument(&valability)
+            .original_result()
+    }
+
+    pub fn pay_fee_and_fund_egld<
+        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+        Arg1: CodecInto<u64>,
+    >(
+        self,
+        address: Arg0,
+        valability: Arg1,
+    ) -> Tx<
+        Env,
+        From,
+        To,
+        (),
+        Gas,
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<()>,
+    > {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("payFeeAndFundEGLD")
+            .argument(&address)
+            .argument(&valability)
+            .original_result()
+    }
+
+    pub fn fund<
+        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+        Arg1: CodecInto<u64>,
+    >(
+        self,
+        address: Arg0,
+        valability: Arg1,
+    ) -> Tx<
+        Env,
+        From,
+        To,
+        (),
+        Gas,
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<()>,
+    > {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("fund")
+            .argument(&address)
+            .argument(&valability)
+            .original_result()
+    }
+
+    pub fn deposit_fees<
+        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+    >(
+        self,
+        address: Arg0,
+    ) -> Tx<
+        Env,
+        From,
+        To,
+        (),
+        Gas,
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<()>,
+    > {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("depositFees")
+            .argument(&address)
+            .original_result()
+    }
+
+    pub fn withdraw<
+        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+    >(
+        self,
+        address: Arg0,
+    ) -> Tx<
+        Env,
+        From,
+        To,
+        (),
+        Gas,
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<()>,
+    > {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("withdraw")
+            .argument(&address)
+            .original_result()
+    }
+
+    pub fn claim<
+        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+        Arg1: CodecInto<ManagedByteArray<Env::Api, 64usize>>,
+    >(
+        self,
+        address: Arg0,
+        signature: Arg1,
+    ) -> Tx<
+        Env,
+        From,
+        To,
+        (),
+        Gas,
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<()>,
+    > {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("claim")
+            .argument(&address)
+            .argument(&signature)
+            .original_result()
+    }
+
+    pub fn forward<
+        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+        Arg1: CodecInto<ManagedAddress<Env::Api>>,
+        Arg2: CodecInto<ManagedByteArray<Env::Api, 64usize>>,
+    >(
+        self,
+        address: Arg0,
+        forward_address: Arg1,
+        signature: Arg2,
+    ) -> Tx<
+        Env,
+        From,
+        To,
+        (),
+        Gas,
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<()>,
+    > {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("forward")
+            .argument(&address)
+            .argument(&forward_address)
+            .argument(&signature)
+            .original_result()
+    }
+
+    pub fn deposit<
+        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+    >(
+        self,
+        donor: Arg0,
+    ) -> Tx<
+        Env,
+        From,
+        To,
+        (),
+        Gas,
+        FunctionCall<Env::Api>,
+        OriginalResultMarker<DepositInfo<Env::Api>>,
+    > {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("deposit")
+            .argument(&donor)
+            .original_result()
+    }
+
+}
+#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
+pub struct DepositInfo<Api>
+where
+    Api: ManagedTypeApi,
+{
+    pub depositor_address: ManagedAddress<Api>,
+    pub esdt_funds: ManagedVec<Api, EsdtTokenPayment<Api>>,
+    pub egld_funds: BigUint<Api>,
+    pub valability: u64,
+    pub expiration_round: u64,
+    pub fees: Fee<Api>,
+}
+
+#[derive(TopEncode, NestedEncode, Clone, PartialEq, Eq, Debug)]
+pub struct EsdtTokenPayment<Api>
+where
+    Api: ManagedTypeApi,
+{
+    pub token_identifier: TokenIdentifier<Api>,
+    pub token_nonce: u64,
+    pub amount: BigUint<Api>,
+}
+
+#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
+pub struct Fee<Api>
+where
+    Api: ManagedTypeApi,
+{
+    pub num_token_to_transfer: usize,
+    pub value: EgldOrEsdtTokenPayment<Api>,
+}
+
+#[derive(TopEncode, TopDecode)]
+pub struct EgldOrEsdtTokenPayment<Api>
+where
+    Api: ManagedTypeApi,
+{
+    pub token_identifier: EgldOrEsdtTokenIdentifier<Api>,
+    pub token_nonce: u64,
+    pub amount: BigUint<Api>,
+}
+

From 8e1e6684c1a21c620d096e66b783797806d3a956 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 21 Mar 2024 22:47:41 +0200
Subject: [PATCH 0510/1254] tx proxy gen - fixed multisig

---
 contracts/examples/multisig/src/action.rs     |  9 +++--
 contracts/examples/multisig/src/multisig.rs   |  2 +-
 .../examples/multisig/src/multisig_proxy.rs   | 38 +++++++++++++------
 .../generate_proxy/proxy_gen_struct_enum.rs   | 29 +++++++-------
 4 files changed, 48 insertions(+), 30 deletions(-)

diff --git a/contracts/examples/multisig/src/action.rs b/contracts/examples/multisig/src/action.rs
index d36af70f90..c26c83259a 100644
--- a/contracts/examples/multisig/src/action.rs
+++ b/contracts/examples/multisig/src/action.rs
@@ -5,7 +5,8 @@ use multiversx_sc::{
 
 use multiversx_sc::derive_imports::*;
 
-#[derive(NestedEncode, NestedDecode, TypeAbi, Clone)]
+#[type_abi]
+#[derive(NestedEncode, NestedDecode, Clone)]
 pub struct CallActionData<M: ManagedTypeApi> {
     pub to: ManagedAddress<M>,
     pub egld_amount: BigUint<M>,
@@ -13,7 +14,8 @@ pub struct CallActionData<M: ManagedTypeApi> {
     pub arguments: ManagedVec<M, ManagedBuffer<M>>,
 }
 
-#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, TypeAbi, Clone)]
+#[type_abi]
+#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, Clone)]
 pub enum Action<M: ManagedTypeApi> {
     Nothing,
     AddBoardMember(ManagedAddress<M>),
@@ -47,7 +49,8 @@ impl<M: ManagedTypeApi> Action<M> {
 }
 
 /// Not used internally, just to retrieve results via endpoint.
-#[derive(TopEncode, TypeAbi)]
+#[type_abi]
+#[derive(TopEncode)]
 pub struct ActionFullInfo<M: ManagedTypeApi> {
     pub action_id: usize,
     pub action_data: Action<M>,
diff --git a/contracts/examples/multisig/src/multisig.rs b/contracts/examples/multisig/src/multisig.rs
index 75c13cb5dd..96d3d5cdfa 100644
--- a/contracts/examples/multisig/src/multisig.rs
+++ b/contracts/examples/multisig/src/multisig.rs
@@ -4,7 +4,7 @@ pub mod action;
 pub mod multisig_events;
 pub mod multisig_perform;
 pub mod multisig_propose;
-// pub mod multisig_proxy;
+pub mod multisig_proxy;
 pub mod multisig_state;
 pub mod user_role;
 
diff --git a/contracts/examples/multisig/src/multisig_proxy.rs b/contracts/examples/multisig/src/multisig_proxy.rs
index b0d42e16ef..330637de69 100644
--- a/contracts/examples/multisig/src/multisig_proxy.rs
+++ b/contracts/examples/multisig/src/multisig_proxy.rs
@@ -721,7 +721,7 @@ where
     }
 
 }
-#[derive(TopEncode, TopDecode)]
+#[derive(TopEncode)]
 pub struct ActionFullInfo<Api>
 where
     Api: ManagedTypeApi,
@@ -731,20 +731,34 @@ where
     pub signers: ManagedVec<Api, ManagedAddress<Api>>,
 }
 
-#[derive(TopEncode, TopDecode)]
-pub enum Action {
+#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, Clone)]
+pub enum Action<Api>
+where
+    Api: ManagedTypeApi,
+{
     Nothing,
-    AddBoardMember,
-    AddProposer,
-    RemoveUser,
-    ChangeQuorum,
-    SendTransferExecute,
-    SendAsyncCall,
-    SCDeployFromSource,
-    SCUpgradeFromSource,
+    AddBoardMember(ManagedAddress<Api>),
+    AddProposer(ManagedAddress<Api>),
+    RemoveUser(ManagedAddress<Api>),
+    ChangeQuorum(usize),
+    SendTransferExecute(CallActionData<Api>),
+    SendAsyncCall(CallActionData<Api>),
+    SCDeployFromSource {
+        amount: BigUint<Api>,
+        source: ManagedAddress<Api>,
+        code_metadata: CodeMetadata,
+        arguments: ManagedVec<Api, ManagedBuffer<Api>>,
+    },
+    SCUpgradeFromSource {
+        sc_address: ManagedAddress<Api>,
+        amount: BigUint<Api>,
+        source: ManagedAddress<Api>,
+        code_metadata: CodeMetadata,
+        arguments: ManagedVec<Api, ManagedBuffer<Api>>,
+    },
 }
 
-#[derive(TopEncode, TopDecode)]
+#[derive(NestedEncode, NestedDecode, Clone)]
 pub struct CallActionData<Api>
 where
     Api: ManagedTypeApi,
diff --git a/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_struct_enum.rs b/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_struct_enum.rs
index 2932437a5b..dabf9744c1 100644
--- a/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_struct_enum.rs
+++ b/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_struct_enum.rs
@@ -22,25 +22,32 @@ pub(crate) fn write_types(file: &mut File, types: &TypeDescriptionContainerImpl)
     }
 }
 
-fn write_struct(
-    file: &mut File,
-    struct_fields: &Vec<StructFieldDescription>,
-    type_description: &TypeDescription,
-) {
+fn start_write_type(file: &mut File, type_type: &str,  type_description: &TypeDescription,) {
     let struct_name = type_description.names.rust.replace("$API", "Api");
     write_macro_attributes(file, &type_description.macro_attributes);
-    writeln!(file, r#"pub struct {struct_name}"#).unwrap();
+    write!(file, r#"pub {type_type} {struct_name}"#).unwrap();
 
     if struct_name.contains("<Api>") {
         writeln!(
             file,
-            r#"where
+            r#"
+where
     Api: ManagedTypeApi,"#
         )
         .unwrap();
+    } else {
+        write!(file, " ").unwrap();
     }
 
     writeln!(file, r#"{{"#).unwrap();
+}
+
+fn write_struct(
+    file: &mut File,
+    struct_fields: &Vec<StructFieldDescription>,
+    type_description: &TypeDescription,
+) {
+    start_write_type(file, "struct", type_description);
 
     for field in struct_fields {
         writeln!(
@@ -61,13 +68,7 @@ fn write_enum(
     enum_variants: &Vec<EnumVariantDescription>,
     type_description: &TypeDescription,
 ) {
-    write_macro_attributes(file, &type_description.macro_attributes);
-    writeln!(
-        file,
-        r#"pub enum {} {{"#,
-        type_description.names.rust.replace("$API", "Api")
-    )
-    .unwrap();
+    start_write_type(file, "enum", type_description);
 
     for variant in enum_variants {
         write!(file, "    {}", variant.name).unwrap();

From a101ad3b0b100dbae46c2191eec131c2641f1669 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 21 Mar 2024 23:03:25 +0200
Subject: [PATCH 0511/1254] tx proxy gen - blacklist of types from framework

---
 .../digital-cash/src/digital_cash_proxy.rs    | 20 -------------------
 .../generate_proxy/proxy_gen_struct_enum.rs   | 17 +++++++++++++++-
 2 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/contracts/examples/digital-cash/src/digital_cash_proxy.rs b/contracts/examples/digital-cash/src/digital_cash_proxy.rs
index 41459dea9f..75dc624b92 100644
--- a/contracts/examples/digital-cash/src/digital_cash_proxy.rs
+++ b/contracts/examples/digital-cash/src/digital_cash_proxy.rs
@@ -360,16 +360,6 @@ where
     pub fees: Fee<Api>,
 }
 
-#[derive(TopEncode, NestedEncode, Clone, PartialEq, Eq, Debug)]
-pub struct EsdtTokenPayment<Api>
-where
-    Api: ManagedTypeApi,
-{
-    pub token_identifier: TokenIdentifier<Api>,
-    pub token_nonce: u64,
-    pub amount: BigUint<Api>,
-}
-
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct Fee<Api>
 where
@@ -379,13 +369,3 @@ where
     pub value: EgldOrEsdtTokenPayment<Api>,
 }
 
-#[derive(TopEncode, TopDecode)]
-pub struct EgldOrEsdtTokenPayment<Api>
-where
-    Api: ManagedTypeApi,
-{
-    pub token_identifier: EgldOrEsdtTokenIdentifier<Api>,
-    pub token_nonce: u64,
-    pub amount: BigUint<Api>,
-}
-
diff --git a/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_struct_enum.rs b/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_struct_enum.rs
index dabf9744c1..2179ce4a42 100644
--- a/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_struct_enum.rs
+++ b/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_struct_enum.rs
@@ -9,8 +9,23 @@ use crate::cmd::contract::generate_snippets::snippet_gen_common::write_newline;
 
 const ZERO: &str = "0";
 
+/// Types defined in the framework don't need to be generated again in the proxy.
+const TYPES_FROM_FRAMEWORK: &[&str] = &[
+    "EsdtTokenPayment<$API>",
+    "EgldOrEsdtTokenPayment<$API>",
+    "EsdtTokenData<$API>",
+    "EgldOrEsdtTokenIdentifier<$API>",
+    "EgldOrEsdtTokenPayment<$API>",
+    "EgldOrMultiEsdtPayment<$API>",
+    "EsdtTokenData<$API>",
+];
+
 pub(crate) fn write_types(file: &mut File, types: &TypeDescriptionContainerImpl) {
     for (_, type_description) in &types.0 {
+        if TYPES_FROM_FRAMEWORK.contains(&type_description.names.rust.as_str()) {
+            continue;
+        }
+
         match &type_description.contents {
             TypeContents::Enum(enum_variants) => write_enum(file, enum_variants, type_description),
             TypeContents::Struct(struct_fields) => {
@@ -22,7 +37,7 @@ pub(crate) fn write_types(file: &mut File, types: &TypeDescriptionContainerImpl)
     }
 }
 
-fn start_write_type(file: &mut File, type_type: &str,  type_description: &TypeDescription,) {
+fn start_write_type(file: &mut File, type_type: &str, type_description: &TypeDescription) {
     let struct_name = type_description.names.rust.replace("$API", "Api");
     write_macro_attributes(file, &type_description.macro_attributes);
     write!(file, r#"pub {type_type} {struct_name}"#).unwrap();

From 318070e868f65952de4e60ba1bd81574844879f6 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 21 Mar 2024 23:07:56 +0200
Subject: [PATCH 0512/1254] tx proxy gen  - fix abi-tester

---
 .../feature-tests/abi-tester/src/abi_proxy.rs | 95 +++++--------------
 1 file changed, 23 insertions(+), 72 deletions(-)

diff --git a/contracts/feature-tests/abi-tester/src/abi_proxy.rs b/contracts/feature-tests/abi-tester/src/abi_proxy.rs
index 5fdab1395f..fe87bd79a6 100644
--- a/contracts/feature-tests/abi-tester/src/abi_proxy.rs
+++ b/contracts/feature-tests/abi-tester/src/abi_proxy.rs
@@ -637,27 +637,23 @@ where
 
 }
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
-pub struct OnlyShowsUpInConstructor
-{
+pub struct OnlyShowsUpInConstructor {
     pub something: (),
 }
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
-pub struct AbiTestType
-{
+pub struct AbiTestType {
     pub nested: OnlyShowsUpAsNested01,
     pub next: Option<Box<AbiTestType>>,
     pub tuple_madness: (OnlyShowsUpAsNested02, Option<Box<AbiTestType>>),
 }
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
-pub struct OnlyShowsUpAsNested01
-{
+pub struct OnlyShowsUpAsNested01 {
 }
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
-pub struct OnlyShowsUpAsNested02
-{
+pub struct OnlyShowsUpAsNested02 {
     pub something: [u8; 0],
 }
 
@@ -673,13 +669,11 @@ pub enum AbiEnum {
 }
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
-pub struct OnlyShowsUpAsNested08
-{
+pub struct OnlyShowsUpAsNested08 {
 }
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
-pub struct OnlyShowsUpAsNested09
-{
+pub struct OnlyShowsUpAsNested09 {
 }
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
@@ -693,28 +687,23 @@ where
 }
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
-pub struct OnlyShowsUpAsNested03
-{
+pub struct OnlyShowsUpAsNested03 {
 }
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
-pub struct OnlyShowsUpAsNested04
-{
+pub struct OnlyShowsUpAsNested04 {
 }
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
-pub struct OnlyShowsUpAsNested05
-{
+pub struct OnlyShowsUpAsNested05 {
 }
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
-pub struct OnlyShowsUpAsNested06
-{
+pub struct OnlyShowsUpAsNested06 {
 }
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
-pub struct OnlyShowsUpAsNested07
-{
+pub struct OnlyShowsUpAsNested07 {
 }
 
 #[derive(TopDecode, TopEncode, NestedDecode, NestedEncode, Clone, PartialEq, Eq, Debug, Copy)]
@@ -730,32 +719,6 @@ pub enum EsdtLocalRole {
     Transfer,
 }
 
-#[derive(TopEncode, NestedEncode, Clone, PartialEq, Eq, Debug)]
-pub struct EsdtTokenPayment<Api>
-where
-    Api: ManagedTypeApi,
-{
-    pub token_identifier: TokenIdentifier<Api>,
-    pub token_nonce: u64,
-    pub amount: BigUint<Api>,
-}
-
-#[derive(Clone, TopDecode, TopEncode, NestedDecode, NestedEncode, Debug, ManagedVecItem)]
-pub struct EsdtTokenData<Api>
-where
-    Api: ManagedTypeApi,
-{
-    pub token_type: EsdtTokenType,
-    pub amount: BigUint<Api>,
-    pub frozen: bool,
-    pub hash: ManagedBuffer<Api>,
-    pub name: ManagedBuffer<Api>,
-    pub attributes: ManagedBuffer<Api>,
-    pub creator: ManagedAddress<Api>,
-    pub royalties: BigUint<Api>,
-    pub uris: ManagedVec<Api, ManagedBuffer<Api>>,
-}
-
 #[derive(TopDecode, TopEncode, NestedDecode, NestedEncode, Clone, PartialEq, Eq, Debug, ManagedVecItem)]
 pub enum EsdtTokenType {
     Fungible,
@@ -766,66 +729,54 @@ pub enum EsdtTokenType {
 }
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
-pub struct OnlyShowsUpAsNestedInSingleValueMapper
-{
+pub struct OnlyShowsUpAsNestedInSingleValueMapper {
 }
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
-pub struct OnlyShowsUpAsNestedInVec
-{
+pub struct OnlyShowsUpAsNestedInVec {
 }
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
-pub struct OnlyShowsUpAsNestedInArrayVec
-{
+pub struct OnlyShowsUpAsNestedInArrayVec {
 }
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, ManagedVecItem)]
-pub struct AbiManagedVecItem
-{
+pub struct AbiManagedVecItem {
     pub value1: u32,
     pub value2: u32,
 }
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
-pub struct OnlyShowsUpAsNestedInArray
-{
+pub struct OnlyShowsUpAsNestedInArray {
 }
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
-pub struct OnlyShowsUpAsNestedInBox
-{
+pub struct OnlyShowsUpAsNestedInBox {
 }
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
-pub struct OnlyShowsUpAsNestedInBoxedSlice
-{
+pub struct OnlyShowsUpAsNestedInBoxedSlice {
 }
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
-pub struct OnlyShowsUpAsNestedInRef
-{
+pub struct OnlyShowsUpAsNestedInRef {
 }
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
-pub struct OnlyShowsUpAsNestedInSlice
-{
+pub struct OnlyShowsUpAsNestedInSlice {
 }
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
-pub struct OnlyShowsUpAsNestedInOption
-{
+pub struct OnlyShowsUpAsNestedInOption {
 }
 
 #[derive(TopEncode, TopDecode)]
-pub struct OnlyShowsUpInEsdtAttr
-{
+pub struct OnlyShowsUpInEsdtAttr {
     pub field: OnlyShowsUpAsNested10,
 }
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
-pub struct OnlyShowsUpAsNested10
-{
+pub struct OnlyShowsUpAsNested10 {
 }
 
 #[derive(TopEncode, TopDecode)]

From 87fd1731933e4e3e1c6f2322d2eec8899cea7a8f Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Thu, 21 Mar 2024 23:29:08 +0200
Subject: [PATCH 0513/1254] tx proxy gen - fixed test

---
 contracts/examples/crypto-zombies/sc-config.toml                | 2 +-
 contracts/examples/crypto-zombies/src/lib.rs                    | 2 +-
 .../src/{crypto_zombies_proxy.rs => proxy_crypto_zombies.rs}    | 0
 framework/meta/tests/template_test.rs                           | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename contracts/examples/crypto-zombies/src/{crypto_zombies_proxy.rs => proxy_crypto_zombies.rs} (100%)

diff --git a/contracts/examples/crypto-zombies/sc-config.toml b/contracts/examples/crypto-zombies/sc-config.toml
index 2a3130ea0d..d43702bdfa 100644
--- a/contracts/examples/crypto-zombies/sc-config.toml
+++ b/contracts/examples/crypto-zombies/sc-config.toml
@@ -1,2 +1,2 @@
 [settings]
-proxy-paths = ["src/crypto_zombies_proxy.rs"]
\ No newline at end of file
+proxy-paths = ["src/proxy_crypto_zombies.rs"]
\ No newline at end of file
diff --git a/contracts/examples/crypto-zombies/src/lib.rs b/contracts/examples/crypto-zombies/src/lib.rs
index d767bd61ff..05364f6f31 100644
--- a/contracts/examples/crypto-zombies/src/lib.rs
+++ b/contracts/examples/crypto-zombies/src/lib.rs
@@ -3,7 +3,7 @@
 use multiversx_sc::imports::*;
 
 mod crypto_kitties_proxy;
-pub mod crypto_zombies_proxy;
+pub mod proxy_crypto_zombies;
 mod storage;
 mod zombie;
 mod zombie_attack;
diff --git a/contracts/examples/crypto-zombies/src/crypto_zombies_proxy.rs b/contracts/examples/crypto-zombies/src/proxy_crypto_zombies.rs
similarity index 100%
rename from contracts/examples/crypto-zombies/src/crypto_zombies_proxy.rs
rename to contracts/examples/crypto-zombies/src/proxy_crypto_zombies.rs
diff --git a/framework/meta/tests/template_test.rs b/framework/meta/tests/template_test.rs
index 335fcb240b..950a6079d7 100644
--- a/framework/meta/tests/template_test.rs
+++ b/framework/meta/tests/template_test.rs
@@ -38,7 +38,7 @@ fn template_current_adder() {
 }
 
 #[test]
-#[cfg_attr(not(feature = "template-test-current"), ignore)]
+// #[cfg_attr(not(feature = "template-test-current"), ignore)]
 fn template_current_crypto_zombies() {
     template_test_current("crypto-zombies", "examples", "new-crypto-zombies");
 }

From 10e8d93dcf4910c1993a2f943e229accd4c85fed Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Thu, 21 Mar 2024 23:37:47 +0200
Subject: [PATCH 0514/1254] tx proxy gen - revert template test

---
 framework/meta/tests/template_test.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/framework/meta/tests/template_test.rs b/framework/meta/tests/template_test.rs
index 950a6079d7..335fcb240b 100644
--- a/framework/meta/tests/template_test.rs
+++ b/framework/meta/tests/template_test.rs
@@ -38,7 +38,7 @@ fn template_current_adder() {
 }
 
 #[test]
-// #[cfg_attr(not(feature = "template-test-current"), ignore)]
+#[cfg_attr(not(feature = "template-test-current"), ignore)]
 fn template_current_crypto_zombies() {
     template_test_current("crypto-zombies", "examples", "new-crypto-zombies");
 }

From cd8ab0890a42744f559142b3fd2b6552924fb4c5 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 22 Mar 2024 11:15:12 +0200
Subject: [PATCH 0515/1254] proxy gen formatting

---
 contracts/examples/adder/src/adder_proxy.rs   |  35 +-
 .../src/crowdfunding_esdt_proxy.rs            |  90 +---
 .../src/proxy_crypto_zombies.rs               | 187 +--------
 .../digital-cash/src/digital_cash_proxy.rs    | 137 +------
 contracts/examples/empty/wasm/src/lib.rs      |   5 +-
 .../examples/multisig/src/multisig_proxy.rs   | 297 ++------------
 .../examples/ping-pong-egld/wasm/src/lib.rs   |   5 +-
 .../feature-tests/abi-tester/src/abi_proxy.rs | 385 +++---------------
 .../base/src/types/interaction/tx_proxy.rs    |  10 +-
 .../meta/src/cmd/contract/generate_proxy.rs   |   2 +-
 .../contract/generate_proxy/proxy_gen_main.rs |   5 +-
 .../generate_proxy/proxy_gen_struct_enum.rs   |  11 +-
 .../generate_proxy/proxy_sc_functions_gen.rs  |  61 +--
 .../generate_proxy/proxy_template_gen.rs      |  24 +-
 14 files changed, 200 insertions(+), 1054 deletions(-)

diff --git a/contracts/examples/adder/src/adder_proxy.rs b/contracts/examples/adder/src/adder_proxy.rs
index 72e85655f8..9a460ca687 100644
--- a/contracts/examples/adder/src/adder_proxy.rs
+++ b/contracts/examples/adder/src/adder_proxy.rs
@@ -32,6 +32,7 @@ where
     wrapped_tx: Tx<Env, From, To, (), Gas, (), ()>,
 }
 
+#[rustfmt::skip]
 impl<Env, From, Gas> AdderProxyMethods<Env, From, (), Gas>
 where
     Env: TxEnv,
@@ -44,22 +45,15 @@ where
     >(
         self,
         initial_value: Arg0,
-    ) -> Tx<
-        Env,
-        From,
-        (),
-        (),
-        Gas,
-        DeployCall<Env, ()>,
-        OriginalResultMarker<()>,
-    > {
+    ) -> TxProxyDeploy<Env, From, Gas, ()> {
         self.wrapped_tx
             .raw_deploy()
             .argument(&initial_value)
             .original_result()
     }
-
 }
+
+#[rustfmt::skip]
 impl<Env, From, To, Gas> AdderProxyMethods<Env, From, To, Gas>
 where
     Env: TxEnv,
@@ -70,15 +64,7 @@ where
 {
     pub fn sum(
         self,
-    ) -> Tx<
-        Env,
-        From,
-        To,
-        (),
-        Gas,
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<BigUint<Env::Api>>,
-    > {
+    ) -> TxProxyCall<Env, From, To, Gas, BigUint<Env::Api>> {
         self.wrapped_tx
             .raw_call()
             .function_name("getSum")
@@ -91,20 +77,11 @@ where
     >(
         self,
         value: Arg0,
-    ) -> Tx<
-        Env,
-        From,
-        To,
-        (),
-        Gas,
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<()>,
-    > {
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
             .raw_call()
             .function_name("add")
             .argument(&value)
             .original_result()
     }
-
 }
diff --git a/contracts/examples/crowdfunding-esdt/src/crowdfunding_esdt_proxy.rs b/contracts/examples/crowdfunding-esdt/src/crowdfunding_esdt_proxy.rs
index fbbcec61d4..5f73825a34 100644
--- a/contracts/examples/crowdfunding-esdt/src/crowdfunding_esdt_proxy.rs
+++ b/contracts/examples/crowdfunding-esdt/src/crowdfunding_esdt_proxy.rs
@@ -48,15 +48,7 @@ where
         target: Arg0,
         deadline: Arg1,
         token_identifier: Arg2,
-    ) -> Tx<
-        Env,
-        From,
-        (),
-        (),
-        Gas,
-        DeployCall<Env, ()>,
-        OriginalResultMarker<()>,
-    > {
+    ) -> Tx<Env, From, (), (), Gas, DeployCall<Env, ()>, OriginalResultMarker<()>> {
         self.wrapped_tx
             .raw_deploy()
             .argument(&target)
@@ -64,7 +56,6 @@ where
             .argument(&token_identifier)
             .original_result()
     }
-
 }
 impl<Env, From, To, Gas> CrowdfundingProxyMethods<Env, From, To, Gas>
 where
@@ -76,15 +67,7 @@ where
 {
     pub fn fund(
         self,
-    ) -> Tx<
-        Env,
-        From,
-        To,
-        (),
-        Gas,
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<()>,
-    > {
+    ) -> Tx<Env, From, To, (), Gas, FunctionCall<Env::Api>, OriginalResultMarker<()>> {
         self.wrapped_tx
             .raw_call()
             .function_name("fund")
@@ -93,15 +76,7 @@ where
 
     pub fn status(
         self,
-    ) -> Tx<
-        Env,
-        From,
-        To,
-        (),
-        Gas,
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<Status>,
-    > {
+    ) -> Tx<Env, From, To, (), Gas, FunctionCall<Env::Api>, OriginalResultMarker<Status>> {
         self.wrapped_tx
             .raw_call()
             .function_name("status")
@@ -110,15 +85,8 @@ where
 
     pub fn get_current_funds(
         self,
-    ) -> Tx<
-        Env,
-        From,
-        To,
-        (),
-        Gas,
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<BigUint<Env::Api>>,
-    > {
+    ) -> Tx<Env, From, To, (), Gas, FunctionCall<Env::Api>, OriginalResultMarker<BigUint<Env::Api>>>
+    {
         self.wrapped_tx
             .raw_call()
             .function_name("getCurrentFunds")
@@ -127,15 +95,7 @@ where
 
     pub fn claim(
         self,
-    ) -> Tx<
-        Env,
-        From,
-        To,
-        (),
-        Gas,
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<()>,
-    > {
+    ) -> Tx<Env, From, To, (), Gas, FunctionCall<Env::Api>, OriginalResultMarker<()>> {
         self.wrapped_tx
             .raw_call()
             .function_name("claim")
@@ -144,15 +104,8 @@ where
 
     pub fn target(
         self,
-    ) -> Tx<
-        Env,
-        From,
-        To,
-        (),
-        Gas,
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<BigUint<Env::Api>>,
-    > {
+    ) -> Tx<Env, From, To, (), Gas, FunctionCall<Env::Api>, OriginalResultMarker<BigUint<Env::Api>>>
+    {
         self.wrapped_tx
             .raw_call()
             .function_name("getTarget")
@@ -161,35 +114,18 @@ where
 
     pub fn deadline(
         self,
-    ) -> Tx<
-        Env,
-        From,
-        To,
-        (),
-        Gas,
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<u64>,
-    > {
+    ) -> Tx<Env, From, To, (), Gas, FunctionCall<Env::Api>, OriginalResultMarker<u64>> {
         self.wrapped_tx
             .raw_call()
             .function_name("getDeadline")
             .original_result()
     }
 
-    pub fn deposit<
-        Arg0: CodecInto<ManagedAddress<Env::Api>>,
-    >(
+    pub fn deposit<Arg0: CodecInto<ManagedAddress<Env::Api>>>(
         self,
         donor: Arg0,
-    ) -> Tx<
-        Env,
-        From,
-        To,
-        (),
-        Gas,
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<BigUint<Env::Api>>,
-    > {
+    ) -> Tx<Env, From, To, (), Gas, FunctionCall<Env::Api>, OriginalResultMarker<BigUint<Env::Api>>>
+    {
         self.wrapped_tx
             .raw_call()
             .function_name("getDeposit")
@@ -213,7 +149,6 @@ where
             .function_name("getCrowdfundingTokenIdentifier")
             .original_result()
     }
-
 }
 #[derive(TopEncode, TopDecode, PartialEq, Eq, Clone, Copy, Debug)]
 pub enum Status {
@@ -221,4 +156,3 @@ pub enum Status {
     Successful,
     Failed,
 }
-
diff --git a/contracts/examples/crypto-zombies/src/proxy_crypto_zombies.rs b/contracts/examples/crypto-zombies/src/proxy_crypto_zombies.rs
index ea1a1ef4a6..ce6fcdd05b 100644
--- a/contracts/examples/crypto-zombies/src/proxy_crypto_zombies.rs
+++ b/contracts/examples/crypto-zombies/src/proxy_crypto_zombies.rs
@@ -32,6 +32,7 @@ where
     wrapped_tx: Tx<Env, From, To, (), Gas, (), ()>,
 }
 
+#[rustfmt::skip]
 impl<Env, From, Gas> CryptoZombiesProxyMethods<Env, From, (), Gas>
 where
     Env: TxEnv,
@@ -41,21 +42,14 @@ where
 {
     pub fn init(
         self,
-    ) -> Tx<
-        Env,
-        From,
-        (),
-        (),
-        Gas,
-        DeployCall<Env, ()>,
-        OriginalResultMarker<()>,
-    > {
+    ) -> TxProxyDeploy<Env, From, Gas, ()> {
         self.wrapped_tx
             .raw_deploy()
             .original_result()
     }
-
 }
+
+#[rustfmt::skip]
 impl<Env, From, To, Gas> CryptoZombiesProxyMethods<Env, From, To, Gas>
 where
     Env: TxEnv,
@@ -69,15 +63,7 @@ where
     >(
         self,
         address: Arg0,
-    ) -> Tx<
-        Env,
-        From,
-        To,
-        (),
-        Gas,
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<()>,
-    > {
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
             .raw_call()
             .function_name("set_crypto_kitties_sc_address")
@@ -87,15 +73,7 @@ where
 
     pub fn generate_random_dna(
         self,
-    ) -> Tx<
-        Env,
-        From,
-        To,
-        (),
-        Gas,
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<u64>,
-    > {
+    ) -> TxProxyCall<Env, From, To, Gas, u64> {
         self.wrapped_tx
             .raw_call()
             .function_name("generate_random_dna")
@@ -107,15 +85,7 @@ where
     >(
         self,
         name: Arg0,
-    ) -> Tx<
-        Env,
-        From,
-        To,
-        (),
-        Gas,
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<()>,
-    > {
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
             .raw_call()
             .function_name("create_random_zombie")
@@ -128,15 +98,7 @@ where
     >(
         self,
         zombie_id: Arg0,
-    ) -> Tx<
-        Env,
-        From,
-        To,
-        (),
-        Gas,
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<bool>,
-    > {
+    ) -> TxProxyCall<Env, From, To, Gas, bool> {
         self.wrapped_tx
             .raw_call()
             .function_name("is_ready")
@@ -151,15 +113,7 @@ where
         self,
         zombie_id: Arg0,
         kitty_id: Arg1,
-    ) -> Tx<
-        Env,
-        From,
-        To,
-        (),
-        Gas,
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<()>,
-    > {
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
             .raw_call()
             .function_name("feed_on_kitty")
@@ -170,15 +124,7 @@ where
 
     pub fn dna_digits(
         self,
-    ) -> Tx<
-        Env,
-        From,
-        To,
-        (),
-        Gas,
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<u8>,
-    > {
+    ) -> TxProxyCall<Env, From, To, Gas, u8> {
         self.wrapped_tx
             .raw_call()
             .function_name("dna_digits")
@@ -187,15 +133,7 @@ where
 
     pub fn zombies_count(
         self,
-    ) -> Tx<
-        Env,
-        From,
-        To,
-        (),
-        Gas,
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<usize>,
-    > {
+    ) -> TxProxyCall<Env, From, To, Gas, usize> {
         self.wrapped_tx
             .raw_call()
             .function_name("zombies_count")
@@ -207,15 +145,7 @@ where
     >(
         self,
         id: Arg0,
-    ) -> Tx<
-        Env,
-        From,
-        To,
-        (),
-        Gas,
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<Zombie<Env::Api>>,
-    > {
+    ) -> TxProxyCall<Env, From, To, Gas, Zombie<Env::Api>> {
         self.wrapped_tx
             .raw_call()
             .function_name("zombies")
@@ -228,15 +158,7 @@ where
     >(
         self,
         id: Arg0,
-    ) -> Tx<
-        Env,
-        From,
-        To,
-        (),
-        Gas,
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<ManagedAddress<Env::Api>>,
-    > {
+    ) -> TxProxyCall<Env, From, To, Gas, ManagedAddress<Env::Api>> {
         self.wrapped_tx
             .raw_call()
             .function_name("zombie_owner")
@@ -246,15 +168,7 @@ where
 
     pub fn crypto_kitties_sc_address(
         self,
-    ) -> Tx<
-        Env,
-        From,
-        To,
-        (),
-        Gas,
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<ManagedAddress<Env::Api>>,
-    > {
+    ) -> TxProxyCall<Env, From, To, Gas, ManagedAddress<Env::Api>> {
         self.wrapped_tx
             .raw_call()
             .function_name("crypto_kitties_sc_address")
@@ -263,15 +177,7 @@ where
 
     pub fn cooldown_time(
         self,
-    ) -> Tx<
-        Env,
-        From,
-        To,
-        (),
-        Gas,
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<u64>,
-    > {
+    ) -> TxProxyCall<Env, From, To, Gas, u64> {
         self.wrapped_tx
             .raw_call()
             .function_name("cooldown_time")
@@ -283,15 +189,7 @@ where
     >(
         self,
         owner: Arg0,
-    ) -> Tx<
-        Env,
-        From,
-        To,
-        (),
-        Gas,
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<MultiValueEncoded<Env::Api, usize>>,
-    > {
+    ) -> TxProxyCall<Env, From, To, Gas, MultiValueEncoded<Env::Api, usize>> {
         self.wrapped_tx
             .raw_call()
             .function_name("owned_zombies")
@@ -304,15 +202,7 @@ where
     >(
         self,
         zombie_id: Arg0,
-    ) -> Tx<
-        Env,
-        From,
-        To,
-        (),
-        Gas,
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<()>,
-    > {
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
             .raw_call()
             .function_name("level_up")
@@ -322,15 +212,7 @@ where
 
     pub fn withdraw(
         self,
-    ) -> Tx<
-        Env,
-        From,
-        To,
-        (),
-        Gas,
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<()>,
-    > {
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
             .raw_call()
             .function_name("withdraw")
@@ -344,15 +226,7 @@ where
         self,
         zombie_id: Arg0,
         name: Arg1,
-    ) -> Tx<
-        Env,
-        From,
-        To,
-        (),
-        Gas,
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<()>,
-    > {
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
             .raw_call()
             .function_name("change_name")
@@ -368,15 +242,7 @@ where
         self,
         zombie_id: Arg0,
         dna: Arg1,
-    ) -> Tx<
-        Env,
-        From,
-        To,
-        (),
-        Gas,
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<()>,
-    > {
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
             .raw_call()
             .function_name("change_dna")
@@ -392,15 +258,7 @@ where
         self,
         zombie_id: Arg0,
         target_id: Arg1,
-    ) -> Tx<
-        Env,
-        From,
-        To,
-        (),
-        Gas,
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<()>,
-    > {
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
             .raw_call()
             .function_name("attack")
@@ -408,8 +266,8 @@ where
             .argument(&target_id)
             .original_result()
     }
-
 }
+
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct Zombie<Api>
 where
@@ -422,4 +280,3 @@ where
     pub win_count: usize,
     pub loss_count: usize,
 }
-
diff --git a/contracts/examples/digital-cash/src/digital_cash_proxy.rs b/contracts/examples/digital-cash/src/digital_cash_proxy.rs
index 75dc624b92..c3d87f81c7 100644
--- a/contracts/examples/digital-cash/src/digital_cash_proxy.rs
+++ b/contracts/examples/digital-cash/src/digital_cash_proxy.rs
@@ -32,6 +32,7 @@ where
     wrapped_tx: Tx<Env, From, To, (), Gas, (), ()>,
 }
 
+#[rustfmt::skip]
 impl<Env, From, Gas> DigitalCashProxyMethods<Env, From, (), Gas>
 where
     Env: TxEnv,
@@ -46,23 +47,16 @@ where
         self,
         fee: Arg0,
         token: Arg1,
-    ) -> Tx<
-        Env,
-        From,
-        (),
-        (),
-        Gas,
-        DeployCall<Env, ()>,
-        OriginalResultMarker<()>,
-    > {
+    ) -> TxProxyDeploy<Env, From, Gas, ()> {
         self.wrapped_tx
             .raw_deploy()
             .argument(&fee)
             .argument(&token)
             .original_result()
     }
-
 }
+
+#[rustfmt::skip]
 impl<Env, From, To, Gas> DigitalCashProxyMethods<Env, From, To, Gas>
 where
     Env: TxEnv,
@@ -78,15 +72,7 @@ where
         self,
         fee: Arg0,
         token: Arg1,
-    ) -> Tx<
-        Env,
-        From,
-        To,
-        (),
-        Gas,
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<()>,
-    > {
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
             .raw_call()
             .function_name("whitelistFeeToken")
@@ -100,15 +86,7 @@ where
     >(
         self,
         token: Arg0,
-    ) -> Tx<
-        Env,
-        From,
-        To,
-        (),
-        Gas,
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<()>,
-    > {
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
             .raw_call()
             .function_name("blacklistFeeToken")
@@ -118,15 +96,7 @@ where
 
     pub fn claim_fees(
         self,
-    ) -> Tx<
-        Env,
-        From,
-        To,
-        (),
-        Gas,
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<()>,
-    > {
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
             .raw_call()
             .function_name("claimFees")
@@ -142,15 +112,7 @@ where
         address: Arg0,
         token: Arg1,
         nonce: Arg2,
-    ) -> Tx<
-        Env,
-        From,
-        To,
-        (),
-        Gas,
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<BigUint<Env::Api>>,
-    > {
+    ) -> TxProxyCall<Env, From, To, Gas, BigUint<Env::Api>> {
         self.wrapped_tx
             .raw_call()
             .function_name("getAmount")
@@ -167,15 +129,7 @@ where
         self,
         address: Arg0,
         valability: Arg1,
-    ) -> Tx<
-        Env,
-        From,
-        To,
-        (),
-        Gas,
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<()>,
-    > {
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
             .raw_call()
             .function_name("payFeeAndFundESDT")
@@ -191,15 +145,7 @@ where
         self,
         address: Arg0,
         valability: Arg1,
-    ) -> Tx<
-        Env,
-        From,
-        To,
-        (),
-        Gas,
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<()>,
-    > {
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
             .raw_call()
             .function_name("payFeeAndFundEGLD")
@@ -215,15 +161,7 @@ where
         self,
         address: Arg0,
         valability: Arg1,
-    ) -> Tx<
-        Env,
-        From,
-        To,
-        (),
-        Gas,
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<()>,
-    > {
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
             .raw_call()
             .function_name("fund")
@@ -237,15 +175,7 @@ where
     >(
         self,
         address: Arg0,
-    ) -> Tx<
-        Env,
-        From,
-        To,
-        (),
-        Gas,
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<()>,
-    > {
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
             .raw_call()
             .function_name("depositFees")
@@ -258,15 +188,7 @@ where
     >(
         self,
         address: Arg0,
-    ) -> Tx<
-        Env,
-        From,
-        To,
-        (),
-        Gas,
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<()>,
-    > {
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
             .raw_call()
             .function_name("withdraw")
@@ -281,15 +203,7 @@ where
         self,
         address: Arg0,
         signature: Arg1,
-    ) -> Tx<
-        Env,
-        From,
-        To,
-        (),
-        Gas,
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<()>,
-    > {
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
             .raw_call()
             .function_name("claim")
@@ -307,15 +221,7 @@ where
         address: Arg0,
         forward_address: Arg1,
         signature: Arg2,
-    ) -> Tx<
-        Env,
-        From,
-        To,
-        (),
-        Gas,
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<()>,
-    > {
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
             .raw_call()
             .function_name("forward")
@@ -330,23 +236,15 @@ where
     >(
         self,
         donor: Arg0,
-    ) -> Tx<
-        Env,
-        From,
-        To,
-        (),
-        Gas,
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<DepositInfo<Env::Api>>,
-    > {
+    ) -> TxProxyCall<Env, From, To, Gas, DepositInfo<Env::Api>> {
         self.wrapped_tx
             .raw_call()
             .function_name("deposit")
             .argument(&donor)
             .original_result()
     }
-
 }
+
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct DepositInfo<Api>
 where
@@ -368,4 +266,3 @@ where
     pub num_token_to_transfer: usize,
     pub value: EgldOrEsdtTokenPayment<Api>,
 }
-
diff --git a/contracts/examples/empty/wasm/src/lib.rs b/contracts/examples/empty/wasm/src/lib.rs
index 33ca3e1cfd..6267772e3b 100644
--- a/contracts/examples/empty/wasm/src/lib.rs
+++ b/contracts/examples/empty/wasm/src/lib.rs
@@ -5,9 +5,10 @@
 ////////////////////////////////////////////////////
 
 // Init:                                 1
-// Endpoints:                            1
+// Upgrade:                              1
+// Endpoints:                            0
 // Async Callback (empty):               1
-// Total number of exported functions:   3
+// Total number of exported functions:   2
 
 #![no_std]
 #![allow(internal_features)]
diff --git a/contracts/examples/multisig/src/multisig_proxy.rs b/contracts/examples/multisig/src/multisig_proxy.rs
index 330637de69..a4f5c82bd7 100644
--- a/contracts/examples/multisig/src/multisig_proxy.rs
+++ b/contracts/examples/multisig/src/multisig_proxy.rs
@@ -32,6 +32,7 @@ where
     wrapped_tx: Tx<Env, From, To, (), Gas, (), ()>,
 }
 
+#[rustfmt::skip]
 impl<Env, From, Gas> MultisigProxyMethods<Env, From, (), Gas>
 where
     Env: TxEnv,
@@ -46,23 +47,16 @@ where
         self,
         quorum: Arg0,
         board: Arg1,
-    ) -> Tx<
-        Env,
-        From,
-        (),
-        (),
-        Gas,
-        DeployCall<Env, ()>,
-        OriginalResultMarker<()>,
-    > {
+    ) -> TxProxyDeploy<Env, From, Gas, ()> {
         self.wrapped_tx
             .raw_deploy()
             .argument(&quorum)
             .argument(&board)
             .original_result()
     }
-
 }
+
+#[rustfmt::skip]
 impl<Env, From, To, Gas> MultisigProxyMethods<Env, From, To, Gas>
 where
     Env: TxEnv,
@@ -74,15 +68,7 @@ where
     /// Allows the contract to receive funds even if it is marked as unpayable in the protocol. 
     pub fn deposit(
         self,
-    ) -> Tx<
-        Env,
-        From,
-        To,
-        (),
-        Gas,
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<()>,
-    > {
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
             .raw_call()
             .function_name("deposit")
@@ -96,15 +82,7 @@ where
     /// - (number of signers followed by) list of signer addresses. 
     pub fn get_pending_action_full_info(
         self,
-    ) -> Tx<
-        Env,
-        From,
-        To,
-        (),
-        Gas,
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<MultiValueEncoded<Env::Api, ActionFullInfo<Env::Api>>>,
-    > {
+    ) -> TxProxyCall<Env, From, To, Gas, MultiValueEncoded<Env::Api, ActionFullInfo<Env::Api>>> {
         self.wrapped_tx
             .raw_call()
             .function_name("getPendingActionFullInfo")
@@ -120,15 +98,7 @@ where
         self,
         user: Arg0,
         action_id: Arg1,
-    ) -> Tx<
-        Env,
-        From,
-        To,
-        (),
-        Gas,
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<bool>,
-    > {
+    ) -> TxProxyCall<Env, From, To, Gas, bool> {
         self.wrapped_tx
             .raw_call()
             .function_name("signed")
@@ -146,15 +116,7 @@ where
     >(
         self,
         user: Arg0,
-    ) -> Tx<
-        Env,
-        From,
-        To,
-        (),
-        Gas,
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<UserRole>,
-    > {
+    ) -> TxProxyCall<Env, From, To, Gas, UserRole> {
         self.wrapped_tx
             .raw_call()
             .function_name("userRole")
@@ -165,15 +127,7 @@ where
     /// Lists all users that can sign actions. 
     pub fn get_all_board_members(
         self,
-    ) -> Tx<
-        Env,
-        From,
-        To,
-        (),
-        Gas,
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<MultiValueEncoded<Env::Api, ManagedAddress<Env::Api>>>,
-    > {
+    ) -> TxProxyCall<Env, From, To, Gas, MultiValueEncoded<Env::Api, ManagedAddress<Env::Api>>> {
         self.wrapped_tx
             .raw_call()
             .function_name("getAllBoardMembers")
@@ -183,15 +137,7 @@ where
     /// Lists all proposers that are not board members. 
     pub fn get_all_proposers(
         self,
-    ) -> Tx<
-        Env,
-        From,
-        To,
-        (),
-        Gas,
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<MultiValueEncoded<Env::Api, ManagedAddress<Env::Api>>>,
-    > {
+    ) -> TxProxyCall<Env, From, To, Gas, MultiValueEncoded<Env::Api, ManagedAddress<Env::Api>>> {
         self.wrapped_tx
             .raw_call()
             .function_name("getAllProposers")
@@ -204,15 +150,7 @@ where
     >(
         self,
         action_id: Arg0,
-    ) -> Tx<
-        Env,
-        From,
-        To,
-        (),
-        Gas,
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<()>,
-    > {
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
             .raw_call()
             .function_name("sign")
@@ -227,15 +165,7 @@ where
     >(
         self,
         action_id: Arg0,
-    ) -> Tx<
-        Env,
-        From,
-        To,
-        (),
-        Gas,
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<()>,
-    > {
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
             .raw_call()
             .function_name("unsign")
@@ -251,15 +181,7 @@ where
     >(
         self,
         action_id: Arg0,
-    ) -> Tx<
-        Env,
-        From,
-        To,
-        (),
-        Gas,
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<()>,
-    > {
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
             .raw_call()
             .function_name("discardAction")
@@ -270,15 +192,7 @@ where
     /// Minimum number of signatures needed to perform any action. 
     pub fn quorum(
         self,
-    ) -> Tx<
-        Env,
-        From,
-        To,
-        (),
-        Gas,
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<usize>,
-    > {
+    ) -> TxProxyCall<Env, From, To, Gas, usize> {
         self.wrapped_tx
             .raw_call()
             .function_name("getQuorum")
@@ -289,15 +203,7 @@ where
     /// It is kept in sync with the user list by the contract. 
     pub fn num_board_members(
         self,
-    ) -> Tx<
-        Env,
-        From,
-        To,
-        (),
-        Gas,
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<usize>,
-    > {
+    ) -> TxProxyCall<Env, From, To, Gas, usize> {
         self.wrapped_tx
             .raw_call()
             .function_name("getNumBoardMembers")
@@ -308,15 +214,7 @@ where
     /// It is kept in sync with the user list by the contract. 
     pub fn num_proposers(
         self,
-    ) -> Tx<
-        Env,
-        From,
-        To,
-        (),
-        Gas,
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<usize>,
-    > {
+    ) -> TxProxyCall<Env, From, To, Gas, usize> {
         self.wrapped_tx
             .raw_call()
             .function_name("getNumProposers")
@@ -327,15 +225,7 @@ where
     /// 0 means that no action was ever proposed yet. 
     pub fn get_action_last_index(
         self,
-    ) -> Tx<
-        Env,
-        From,
-        To,
-        (),
-        Gas,
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<usize>,
-    > {
+    ) -> TxProxyCall<Env, From, To, Gas, usize> {
         self.wrapped_tx
             .raw_call()
             .function_name("getActionLastIndex")
@@ -348,15 +238,7 @@ where
     >(
         self,
         action_id: Arg0,
-    ) -> Tx<
-        Env,
-        From,
-        To,
-        (),
-        Gas,
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<Action<Env::Api>>,
-    > {
+    ) -> TxProxyCall<Env, From, To, Gas, Action<Env::Api>> {
         self.wrapped_tx
             .raw_call()
             .function_name("getActionData")
@@ -372,15 +254,7 @@ where
     >(
         self,
         action_id: Arg0,
-    ) -> Tx<
-        Env,
-        From,
-        To,
-        (),
-        Gas,
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<ManagedVec<Env::Api, ManagedAddress<Env::Api>>>,
-    > {
+    ) -> TxProxyCall<Env, From, To, Gas, ManagedVec<Env::Api, ManagedAddress<Env::Api>>> {
         self.wrapped_tx
             .raw_call()
             .function_name("getActionSigners")
@@ -395,15 +269,7 @@ where
     >(
         self,
         action_id: Arg0,
-    ) -> Tx<
-        Env,
-        From,
-        To,
-        (),
-        Gas,
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<usize>,
-    > {
+    ) -> TxProxyCall<Env, From, To, Gas, usize> {
         self.wrapped_tx
             .raw_call()
             .function_name("getActionSignerCount")
@@ -421,15 +287,7 @@ where
     >(
         self,
         action_id: Arg0,
-    ) -> Tx<
-        Env,
-        From,
-        To,
-        (),
-        Gas,
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<usize>,
-    > {
+    ) -> TxProxyCall<Env, From, To, Gas, usize> {
         self.wrapped_tx
             .raw_call()
             .function_name("getActionValidSignerCount")
@@ -444,15 +302,7 @@ where
     >(
         self,
         board_member_address: Arg0,
-    ) -> Tx<
-        Env,
-        From,
-        To,
-        (),
-        Gas,
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<usize>,
-    > {
+    ) -> TxProxyCall<Env, From, To, Gas, usize> {
         self.wrapped_tx
             .raw_call()
             .function_name("proposeAddBoardMember")
@@ -467,15 +317,7 @@ where
     >(
         self,
         proposer_address: Arg0,
-    ) -> Tx<
-        Env,
-        From,
-        To,
-        (),
-        Gas,
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<usize>,
-    > {
+    ) -> TxProxyCall<Env, From, To, Gas, usize> {
         self.wrapped_tx
             .raw_call()
             .function_name("proposeAddProposer")
@@ -489,15 +331,7 @@ where
     >(
         self,
         user_address: Arg0,
-    ) -> Tx<
-        Env,
-        From,
-        To,
-        (),
-        Gas,
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<usize>,
-    > {
+    ) -> TxProxyCall<Env, From, To, Gas, usize> {
         self.wrapped_tx
             .raw_call()
             .function_name("proposeRemoveUser")
@@ -510,15 +344,7 @@ where
     >(
         self,
         new_quorum: Arg0,
-    ) -> Tx<
-        Env,
-        From,
-        To,
-        (),
-        Gas,
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<usize>,
-    > {
+    ) -> TxProxyCall<Env, From, To, Gas, usize> {
         self.wrapped_tx
             .raw_call()
             .function_name("proposeChangeQuorum")
@@ -539,15 +365,7 @@ where
         to: Arg0,
         egld_amount: Arg1,
         function_call: Arg2,
-    ) -> Tx<
-        Env,
-        From,
-        To,
-        (),
-        Gas,
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<usize>,
-    > {
+    ) -> TxProxyCall<Env, From, To, Gas, usize> {
         self.wrapped_tx
             .raw_call()
             .function_name("proposeTransferExecute")
@@ -571,15 +389,7 @@ where
         to: Arg0,
         egld_amount: Arg1,
         function_call: Arg2,
-    ) -> Tx<
-        Env,
-        From,
-        To,
-        (),
-        Gas,
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<usize>,
-    > {
+    ) -> TxProxyCall<Env, From, To, Gas, usize> {
         self.wrapped_tx
             .raw_call()
             .function_name("proposeAsyncCall")
@@ -600,15 +410,7 @@ where
         source: Arg1,
         code_metadata: Arg2,
         arguments: Arg3,
-    ) -> Tx<
-        Env,
-        From,
-        To,
-        (),
-        Gas,
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<usize>,
-    > {
+    ) -> TxProxyCall<Env, From, To, Gas, usize> {
         self.wrapped_tx
             .raw_call()
             .function_name("proposeSCDeployFromSource")
@@ -632,15 +434,7 @@ where
         source: Arg2,
         code_metadata: Arg3,
         arguments: Arg4,
-    ) -> Tx<
-        Env,
-        From,
-        To,
-        (),
-        Gas,
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<usize>,
-    > {
+    ) -> TxProxyCall<Env, From, To, Gas, usize> {
         self.wrapped_tx
             .raw_call()
             .function_name("proposeSCUpgradeFromSource")
@@ -658,15 +452,7 @@ where
     >(
         self,
         action_id: Arg0,
-    ) -> Tx<
-        Env,
-        From,
-        To,
-        (),
-        Gas,
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<bool>,
-    > {
+    ) -> TxProxyCall<Env, From, To, Gas, bool> {
         self.wrapped_tx
             .raw_call()
             .function_name("quorumReached")
@@ -680,15 +466,7 @@ where
     >(
         self,
         action_id: Arg0,
-    ) -> Tx<
-        Env,
-        From,
-        To,
-        (),
-        Gas,
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<OptionalValue<ManagedAddress<Env::Api>>>,
-    > {
+    ) -> TxProxyCall<Env, From, To, Gas, OptionalValue<ManagedAddress<Env::Api>>> {
         self.wrapped_tx
             .raw_call()
             .function_name("performAction")
@@ -703,15 +481,7 @@ where
         self,
         dns_address: Arg0,
         name: Arg1,
-    ) -> Tx<
-        Env,
-        From,
-        To,
-        (),
-        Gas,
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<()>,
-    > {
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
             .raw_call()
             .function_name("dnsRegister")
@@ -719,8 +489,8 @@ where
             .argument(&name)
             .original_result()
     }
-
 }
+
 #[derive(TopEncode)]
 pub struct ActionFullInfo<Api>
 where
@@ -775,4 +545,3 @@ pub enum UserRole {
     Proposer,
     BoardMember,
 }
-
diff --git a/contracts/examples/ping-pong-egld/wasm/src/lib.rs b/contracts/examples/ping-pong-egld/wasm/src/lib.rs
index ec95d16c7e..32ace34885 100644
--- a/contracts/examples/ping-pong-egld/wasm/src/lib.rs
+++ b/contracts/examples/ping-pong-egld/wasm/src/lib.rs
@@ -5,9 +5,10 @@
 ////////////////////////////////////////////////////
 
 // Init:                                 1
-// Endpoints:                           11
+// Upgrade:                              1
+// Endpoints:                           10
 // Async Callback (empty):               1
-// Total number of exported functions:  13
+// Total number of exported functions:  12
 
 #![no_std]
 #![allow(internal_features)]
diff --git a/contracts/feature-tests/abi-tester/src/abi_proxy.rs b/contracts/feature-tests/abi-tester/src/abi_proxy.rs
index fe87bd79a6..8759f224d8 100644
--- a/contracts/feature-tests/abi-tester/src/abi_proxy.rs
+++ b/contracts/feature-tests/abi-tester/src/abi_proxy.rs
@@ -32,6 +32,7 @@ where
     wrapped_tx: Tx<Env, From, To, (), Gas, (), ()>,
 }
 
+#[rustfmt::skip]
 impl<Env, From, Gas> AbiTesterProxyMethods<Env, From, (), Gas>
 where
     Env: TxEnv,
@@ -47,23 +48,16 @@ where
         self,
         _constructor_arg_1: Arg0,
         _constructor_arg_2: Arg1,
-    ) -> Tx<
-        Env,
-        From,
-        (),
-        (),
-        Gas,
-        DeployCall<Env, ()>,
-        OriginalResultMarker<()>,
-    > {
+    ) -> TxProxyDeploy<Env, From, Gas, ()> {
         self.wrapped_tx
             .raw_deploy()
             .argument(&_constructor_arg_1)
             .argument(&_constructor_arg_2)
             .original_result()
     }
-
 }
+
+#[rustfmt::skip]
 impl<Env, From, To, Gas> AbiTesterProxyMethods<Env, From, To, Gas>
 where
     Env: TxEnv,
@@ -78,15 +72,7 @@ where
     >(
         self,
         att: Arg0,
-    ) -> Tx<
-        Env,
-        From,
-        To,
-        (),
-        Gas,
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<AbiTestType>,
-    > {
+    ) -> TxProxyCall<Env, From, To, Gas, AbiTestType> {
         self.wrapped_tx
             .raw_call()
             .function_name("echo_abi_test_type")
@@ -99,15 +85,7 @@ where
     >(
         self,
         e: Arg0,
-    ) -> Tx<
-        Env,
-        From,
-        To,
-        (),
-        Gas,
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<AbiEnum>,
-    > {
+    ) -> TxProxyCall<Env, From, To, Gas, AbiEnum> {
         self.wrapped_tx
             .raw_call()
             .function_name("echo_enum")
@@ -120,15 +98,7 @@ where
     >(
         self,
         _arg: Arg0,
-    ) -> Tx<
-        Env,
-        From,
-        To,
-        (),
-        Gas,
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<()>,
-    > {
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
             .raw_call()
             .function_name("take_managed_type")
@@ -138,15 +108,7 @@ where
 
     pub fn multi_result_3(
         self,
-    ) -> Tx<
-        Env,
-        From,
-        To,
-        (),
-        Gas,
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<MultiValue3<i32, [u8; 3], BoxedBytes>>,
-    > {
+    ) -> TxProxyCall<Env, From, To, Gas, MultiValue3<i32, [u8; 3], BoxedBytes>> {
         self.wrapped_tx
             .raw_call()
             .function_name("multi_result_3")
@@ -155,15 +117,7 @@ where
 
     pub fn multi_result_4(
         self,
-    ) -> Tx<
-        Env,
-        From,
-        To,
-        (),
-        Gas,
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<MultiValue4<i32, [u8; 3], BoxedBytes, OnlyShowsUpAsNested03>>,
-    > {
+    ) -> TxProxyCall<Env, From, To, Gas, MultiValue4<i32, [u8; 3], BoxedBytes, OnlyShowsUpAsNested03>> {
         self.wrapped_tx
             .raw_call()
             .function_name("multi_result_4")
@@ -177,15 +131,7 @@ where
         self,
         _simple_arg: Arg0,
         _var_args: Arg1,
-    ) -> Tx<
-        Env,
-        From,
-        To,
-        (),
-        Gas,
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<()>,
-    > {
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
             .raw_call()
             .function_name("var_args")
@@ -196,15 +142,7 @@ where
 
     pub fn multi_result_vec(
         self,
-    ) -> Tx<
-        Env,
-        From,
-        To,
-        (),
-        Gas,
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<MultiValueVec<MultiValue3<OnlyShowsUpAsNested05, bool, ()>>>,
-    > {
+    ) -> TxProxyCall<Env, From, To, Gas, MultiValueVec<MultiValue3<OnlyShowsUpAsNested05, bool, ()>>> {
         self.wrapped_tx
             .raw_call()
             .function_name("multi_result_vec")
@@ -218,15 +156,7 @@ where
         self,
         _simple_arg: Arg0,
         _opt_args: Arg1,
-    ) -> Tx<
-        Env,
-        From,
-        To,
-        (),
-        Gas,
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<()>,
-    > {
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
             .raw_call()
             .function_name("optional_arg")
@@ -237,15 +167,7 @@ where
 
     pub fn optional_result(
         self,
-    ) -> Tx<
-        Env,
-        From,
-        To,
-        (),
-        Gas,
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<OptionalValue<OnlyShowsUpAsNested07>>,
-    > {
+    ) -> TxProxyCall<Env, From, To, Gas, OptionalValue<OnlyShowsUpAsNested07>> {
         self.wrapped_tx
             .raw_call()
             .function_name("optional_result")
@@ -259,15 +181,7 @@ where
         self,
         address: Arg0,
         h256: Arg1,
-    ) -> Tx<
-        Env,
-        From,
-        To,
-        (),
-        Gas,
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<MultiValue2<Address, H256>>,
-    > {
+    ) -> TxProxyCall<Env, From, To, Gas, MultiValue2<Address, H256>> {
         self.wrapped_tx
             .raw_call()
             .function_name("address_vs_h256")
@@ -283,15 +197,7 @@ where
         self,
         address: Arg0,
         byte_array: Arg1,
-    ) -> Tx<
-        Env,
-        From,
-        To,
-        (),
-        Gas,
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<MultiValue2<ManagedAddress<Env::Api>, ManagedByteArray<Env::Api, 32usize>>>,
-    > {
+    ) -> TxProxyCall<Env, From, To, Gas, MultiValue2<ManagedAddress<Env::Api>, ManagedByteArray<Env::Api, 32usize>>> {
         self.wrapped_tx
             .raw_call()
             .function_name("managed_address_vs_byte_array")
@@ -302,15 +208,7 @@ where
 
     pub fn esdt_local_role(
         self,
-    ) -> Tx<
-        Env,
-        From,
-        To,
-        (),
-        Gas,
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<EsdtLocalRole>,
-    > {
+    ) -> TxProxyCall<Env, From, To, Gas, EsdtLocalRole> {
         self.wrapped_tx
             .raw_call()
             .function_name("esdt_local_role")
@@ -319,15 +217,7 @@ where
 
     pub fn esdt_token_payment(
         self,
-    ) -> Tx<
-        Env,
-        From,
-        To,
-        (),
-        Gas,
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<EsdtTokenPayment<Env::Api>>,
-    > {
+    ) -> TxProxyCall<Env, From, To, Gas, EsdtTokenPayment<Env::Api>> {
         self.wrapped_tx
             .raw_call()
             .function_name("esdt_token_payment")
@@ -336,15 +226,7 @@ where
 
     pub fn esdt_token_data(
         self,
-    ) -> Tx<
-        Env,
-        From,
-        To,
-        (),
-        Gas,
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<EsdtTokenData<Env::Api>>,
-    > {
+    ) -> TxProxyCall<Env, From, To, Gas, EsdtTokenData<Env::Api>> {
         self.wrapped_tx
             .raw_call()
             .function_name("esdt_token_data")
@@ -353,15 +235,7 @@ where
 
     pub fn sample_storage_mapper(
         self,
-    ) -> Tx<
-        Env,
-        From,
-        To,
-        (),
-        Gas,
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<OnlyShowsUpAsNestedInSingleValueMapper>,
-    > {
+    ) -> TxProxyCall<Env, From, To, Gas, OnlyShowsUpAsNestedInSingleValueMapper> {
         self.wrapped_tx
             .raw_call()
             .function_name("sample_storage_mapper")
@@ -370,15 +244,7 @@ where
 
     pub fn item_for_vec(
         self,
-    ) -> Tx<
-        Env,
-        From,
-        To,
-        (),
-        Gas,
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<Vec<OnlyShowsUpAsNestedInVec>>,
-    > {
+    ) -> TxProxyCall<Env, From, To, Gas, Vec<OnlyShowsUpAsNestedInVec>> {
         self.wrapped_tx
             .raw_call()
             .function_name("item_for_vec")
@@ -387,15 +253,7 @@ where
 
     pub fn item_for_array_vec(
         self,
-    ) -> Tx<
-        Env,
-        From,
-        To,
-        (),
-        Gas,
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<ArrayVec<OnlyShowsUpAsNestedInArrayVec, 3usize>>,
-    > {
+    ) -> TxProxyCall<Env, From, To, Gas, ArrayVec<OnlyShowsUpAsNestedInArrayVec, 3usize>> {
         self.wrapped_tx
             .raw_call()
             .function_name("item_for_array_vec")
@@ -404,15 +262,7 @@ where
 
     pub fn item_for_managed_vec(
         self,
-    ) -> Tx<
-        Env,
-        From,
-        To,
-        (),
-        Gas,
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<ManagedVec<Env::Api, AbiManagedVecItem>>,
-    > {
+    ) -> TxProxyCall<Env, From, To, Gas, ManagedVec<Env::Api, AbiManagedVecItem>> {
         self.wrapped_tx
             .raw_call()
             .function_name("item_for_managed_vec")
@@ -424,15 +274,7 @@ where
     >(
         self,
         _array: Arg0,
-    ) -> Tx<
-        Env,
-        From,
-        To,
-        (),
-        Gas,
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<()>,
-    > {
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
             .raw_call()
             .function_name("item_for_array")
@@ -442,15 +284,7 @@ where
 
     pub fn item_for_box(
         self,
-    ) -> Tx<
-        Env,
-        From,
-        To,
-        (),
-        Gas,
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<Box<OnlyShowsUpAsNestedInBox>>,
-    > {
+    ) -> TxProxyCall<Env, From, To, Gas, Box<OnlyShowsUpAsNestedInBox>> {
         self.wrapped_tx
             .raw_call()
             .function_name("item_for_box")
@@ -459,15 +293,7 @@ where
 
     pub fn item_for_boxed_slice(
         self,
-    ) -> Tx<
-        Env,
-        From,
-        To,
-        (),
-        Gas,
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<Box<[OnlyShowsUpAsNestedInBoxedSlice]>>,
-    > {
+    ) -> TxProxyCall<Env, From, To, Gas, Box<[OnlyShowsUpAsNestedInBoxedSlice]>> {
         self.wrapped_tx
             .raw_call()
             .function_name("item_for_boxed_slice")
@@ -479,15 +305,7 @@ where
     >(
         self,
         _ref: Arg0,
-    ) -> Tx<
-        Env,
-        From,
-        To,
-        (),
-        Gas,
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<()>,
-    > {
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
             .raw_call()
             .function_name("item_for_ref")
@@ -500,15 +318,7 @@ where
     >(
         self,
         _ref: Arg0,
-    ) -> Tx<
-        Env,
-        From,
-        To,
-        (),
-        Gas,
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<()>,
-    > {
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
             .raw_call()
             .function_name("item_for_slice")
@@ -518,15 +328,7 @@ where
 
     pub fn item_for_option(
         self,
-    ) -> Tx<
-        Env,
-        From,
-        To,
-        (),
-        Gas,
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<Option<OnlyShowsUpAsNestedInOption>>,
-    > {
+    ) -> TxProxyCall<Env, From, To, Gas, Option<OnlyShowsUpAsNestedInOption>> {
         self.wrapped_tx
             .raw_call()
             .function_name("item_for_option")
@@ -535,15 +337,7 @@ where
 
     pub fn payable_egld(
         self,
-    ) -> Tx<
-        Env,
-        From,
-        To,
-        (),
-        Gas,
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<()>,
-    > {
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
             .raw_call()
             .function_name("payable_egld")
@@ -552,15 +346,7 @@ where
 
     pub fn payable_some_token(
         self,
-    ) -> Tx<
-        Env,
-        From,
-        To,
-        (),
-        Gas,
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<()>,
-    > {
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
             .raw_call()
             .function_name("payable_some_token")
@@ -569,15 +355,7 @@ where
 
     pub fn payable_any_token(
         self,
-    ) -> Tx<
-        Env,
-        From,
-        To,
-        (),
-        Gas,
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<()>,
-    > {
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
             .raw_call()
             .function_name("payable_any_token")
@@ -586,15 +364,7 @@ where
 
     pub fn external_view(
         self,
-    ) -> Tx<
-        Env,
-        From,
-        To,
-        (),
-        Gas,
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<()>,
-    > {
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
             .raw_call()
             .function_name("external_view")
@@ -603,15 +373,7 @@ where
 
     pub fn label_a(
         self,
-    ) -> Tx<
-        Env,
-        From,
-        To,
-        (),
-        Gas,
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<()>,
-    > {
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
             .raw_call()
             .function_name("label_a")
@@ -620,22 +382,14 @@ where
 
     pub fn label_b(
         self,
-    ) -> Tx<
-        Env,
-        From,
-        To,
-        (),
-        Gas,
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<()>,
-    > {
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
             .raw_call()
             .function_name("label_b")
             .original_result()
     }
-
 }
+
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct OnlyShowsUpInConstructor {
     pub something: (),
@@ -649,8 +403,7 @@ pub struct AbiTestType {
 }
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
-pub struct OnlyShowsUpAsNested01 {
-}
+pub struct OnlyShowsUpAsNested01 {}
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct OnlyShowsUpAsNested02 {
@@ -662,19 +415,14 @@ pub enum AbiEnum {
     Nothing,
     Something(i32),
     SomethingMore(u8, OnlyShowsUpAsNested08),
-    SomeStruct {
-        a: u16,
-        b: OnlyShowsUpAsNested09,
-    },
+    SomeStruct { a: u16, b: OnlyShowsUpAsNested09 },
 }
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
-pub struct OnlyShowsUpAsNested08 {
-}
+pub struct OnlyShowsUpAsNested08 {}
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
-pub struct OnlyShowsUpAsNested09 {
-}
+pub struct OnlyShowsUpAsNested09 {}
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct AbiManagedType<Api>
@@ -687,24 +435,19 @@ where
 }
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
-pub struct OnlyShowsUpAsNested03 {
-}
+pub struct OnlyShowsUpAsNested03 {}
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
-pub struct OnlyShowsUpAsNested04 {
-}
+pub struct OnlyShowsUpAsNested04 {}
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
-pub struct OnlyShowsUpAsNested05 {
-}
+pub struct OnlyShowsUpAsNested05 {}
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
-pub struct OnlyShowsUpAsNested06 {
-}
+pub struct OnlyShowsUpAsNested06 {}
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
-pub struct OnlyShowsUpAsNested07 {
-}
+pub struct OnlyShowsUpAsNested07 {}
 
 #[derive(TopDecode, TopEncode, NestedDecode, NestedEncode, Clone, PartialEq, Eq, Debug, Copy)]
 pub enum EsdtLocalRole {
@@ -719,7 +462,9 @@ pub enum EsdtLocalRole {
     Transfer,
 }
 
-#[derive(TopDecode, TopEncode, NestedDecode, NestedEncode, Clone, PartialEq, Eq, Debug, ManagedVecItem)]
+#[derive(
+    TopDecode, TopEncode, NestedDecode, NestedEncode, Clone, PartialEq, Eq, Debug, ManagedVecItem,
+)]
 pub enum EsdtTokenType {
     Fungible,
     NonFungible,
@@ -729,16 +474,13 @@ pub enum EsdtTokenType {
 }
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
-pub struct OnlyShowsUpAsNestedInSingleValueMapper {
-}
+pub struct OnlyShowsUpAsNestedInSingleValueMapper {}
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
-pub struct OnlyShowsUpAsNestedInVec {
-}
+pub struct OnlyShowsUpAsNestedInVec {}
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
-pub struct OnlyShowsUpAsNestedInArrayVec {
-}
+pub struct OnlyShowsUpAsNestedInArrayVec {}
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, ManagedVecItem)]
 pub struct AbiManagedVecItem {
@@ -747,28 +489,22 @@ pub struct AbiManagedVecItem {
 }
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
-pub struct OnlyShowsUpAsNestedInArray {
-}
+pub struct OnlyShowsUpAsNestedInArray {}
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
-pub struct OnlyShowsUpAsNestedInBox {
-}
+pub struct OnlyShowsUpAsNestedInBox {}
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
-pub struct OnlyShowsUpAsNestedInBoxedSlice {
-}
+pub struct OnlyShowsUpAsNestedInBoxedSlice {}
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
-pub struct OnlyShowsUpAsNestedInRef {
-}
+pub struct OnlyShowsUpAsNestedInRef {}
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
-pub struct OnlyShowsUpAsNestedInSlice {
-}
+pub struct OnlyShowsUpAsNestedInSlice {}
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
-pub struct OnlyShowsUpAsNestedInOption {
-}
+pub struct OnlyShowsUpAsNestedInOption {}
 
 #[derive(TopEncode, TopDecode)]
 pub struct OnlyShowsUpInEsdtAttr {
@@ -776,8 +512,7 @@ pub struct OnlyShowsUpInEsdtAttr {
 }
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
-pub struct OnlyShowsUpAsNested10 {
-}
+pub struct OnlyShowsUpAsNested10 {}
 
 #[derive(TopEncode, TopDecode)]
 pub enum ExplicitDiscriminant {
@@ -794,9 +529,5 @@ pub enum ExplicitDiscriminantMixed {
     Unit,
     Tuple(u16),
     Five,
-    Struct {
-        a: u8,
-        b: u16,
-    },
+    Struct { a: u8, b: u16 },
 }
-
diff --git a/framework/base/src/types/interaction/tx_proxy.rs b/framework/base/src/types/interaction/tx_proxy.rs
index 273b9a2960..f38e356be0 100644
--- a/framework/base/src/types/interaction/tx_proxy.rs
+++ b/framework/base/src/types/interaction/tx_proxy.rs
@@ -1,4 +1,4 @@
-use super::{Tx, TxEnv, TxFrom, TxGas, TxTo};
+use super::{DeployCall, FunctionCall, OriginalResultMarker, Tx, TxEnv, TxFrom, TxGas, TxTo};
 
 /// Defines a proxy object for a smart contract.
 pub trait TxProxyTrait<Env, From, To, Gas>
@@ -13,3 +13,11 @@ where
     /// Creates the associated type that contains the proxy methods implementations.
     fn proxy_methods(self, tx: Tx<Env, From, To, (), Gas, (), ()>) -> Self::TxProxyMethods;
 }
+
+/// Alias for a `Tx` generated from a proxy, in `init` or `upgrade`.
+pub type TxProxyDeploy<Env, From, Gas, Original> =
+    Tx<Env, From, (), (), Gas, DeployCall<Env, ()>, OriginalResultMarker<Original>>;
+
+/// Alias for a `Tx` generated from a proxy, in an endpoint.
+pub type TxProxyCall<Env, From, To, Gas, Original> =
+    Tx<Env, From, To, (), Gas, FunctionCall<<Env as TxEnv>::Api>, OriginalResultMarker<Original>>;
diff --git a/framework/meta/src/cmd/contract/generate_proxy.rs b/framework/meta/src/cmd/contract/generate_proxy.rs
index 4538ae77d4..2aa854bc2e 100644
--- a/framework/meta/src/cmd/contract/generate_proxy.rs
+++ b/framework/meta/src/cmd/contract/generate_proxy.rs
@@ -1,6 +1,6 @@
 pub mod proxy_crate_gen;
 pub mod proxy_gen_main;
+pub mod proxy_gen_struct_enum;
 mod proxy_naming;
 pub mod proxy_sc_functions_gen;
 pub mod proxy_template_gen;
-pub mod proxy_gen_struct_enum;
diff --git a/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_main.rs b/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_main.rs
index a55fa334f5..2c0f730eca 100644
--- a/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_main.rs
+++ b/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_main.rs
@@ -8,7 +8,8 @@ use super::{
     proxy_gen_struct_enum::write_types,
     proxy_sc_functions_gen::write_content,
     proxy_template_gen::{
-        write_header, write_impl_for_tx_proxy, write_struct_template, write_struct_tx_proxy_methods,
+        write_header, write_impl_for_tx_proxy, write_struct_tx_proxy_methods,
+        write_tx_proxy_type_def,
     },
 };
 
@@ -30,7 +31,7 @@ fn write_proxy_with_explicit_path(path: &str, abi: &ContractAbi) {
 
 fn write_proxy_to_file(mut file: File, abi: &ContractAbi) {
     write_header(&mut file);
-    write_struct_template(&mut file, &abi.name);
+    write_tx_proxy_type_def(&mut file, &abi.name);
     write_impl_for_tx_proxy(&mut file, &abi.name);
     write_struct_tx_proxy_methods(&mut file, &abi.name);
     write_content(&mut file, abi.clone());
diff --git a/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_struct_enum.rs b/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_struct_enum.rs
index 2179ce4a42..b82b071e16 100644
--- a/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_struct_enum.rs
+++ b/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_struct_enum.rs
@@ -5,8 +5,6 @@ use multiversx_sc::abi::{
     TypeDescriptionContainerImpl,
 };
 
-use crate::cmd::contract::generate_snippets::snippet_gen_common::write_newline;
-
 const ZERO: &str = "0";
 
 /// Types defined in the framework don't need to be generated again in the proxy.
@@ -38,11 +36,12 @@ pub(crate) fn write_types(file: &mut File, types: &TypeDescriptionContainerImpl)
 }
 
 fn start_write_type(file: &mut File, type_type: &str, type_description: &TypeDescription) {
-    let struct_name = type_description.names.rust.replace("$API", "Api");
+    writeln!(file).unwrap();
+    let type_name = type_description.names.rust.replace("$API", "Api");
     write_macro_attributes(file, &type_description.macro_attributes);
-    write!(file, r#"pub {type_type} {struct_name}"#).unwrap();
+    write!(file, r#"pub {type_type} {type_name}"#).unwrap();
 
-    if struct_name.contains("<Api>") {
+    if type_name.contains("<Api>") {
         writeln!(
             file,
             r#"
@@ -75,7 +74,6 @@ fn write_struct(
     }
 
     writeln!(file, "}}").unwrap();
-    write_newline(file);
 }
 
 fn write_enum(
@@ -99,7 +97,6 @@ fn write_enum(
         }
     }
     writeln!(file, "}}").unwrap();
-    write_newline(file);
 }
 
 fn write_macro_attributes(file: &mut File, macro_attributes: &[String]) {
diff --git a/framework/meta/src/cmd/contract/generate_proxy/proxy_sc_functions_gen.rs b/framework/meta/src/cmd/contract/generate_proxy/proxy_sc_functions_gen.rs
index 8198bbe325..59624f979d 100644
--- a/framework/meta/src/cmd/contract/generate_proxy/proxy_sc_functions_gen.rs
+++ b/framework/meta/src/cmd/contract/generate_proxy/proxy_sc_functions_gen.rs
@@ -2,13 +2,14 @@ use std::{fs::File, io::Write};
 
 use multiversx_sc::abi::{ContractAbi, EndpointAbi, InputAbi, OutputAbi};
 
-use crate::cmd::contract::generate_snippets::snippet_gen_common::write_newline;
-
 use super::proxy_naming::proxy_methods_type_name;
 
 pub(crate) fn write_content(file: &mut File, abi: ContractAbi) {
     write_header_impl_constructor(file, &abi.name);
-    for constructor_abi in abi.constructors {
+    for (i, constructor_abi) in abi.constructors.into_iter().enumerate() {
+        if i > 0 {
+            writeln!(file).unwrap();
+        }
         write_constructor_header(file, constructor_abi.clone());
         write_constructor_content(file, constructor_abi.inputs);
         write_end_of_function(file);
@@ -16,7 +17,10 @@ pub(crate) fn write_content(file: &mut File, abi: ContractAbi) {
     writeln!(file, "}}").unwrap();
 
     write_header_impl_endpoints(file, &abi.name);
-    for endpoint_abi in abi.endpoints {
+    for (i, endpoint_abi) in abi.endpoints.into_iter().enumerate() {
+        if i > 0 {
+            writeln!(file).unwrap();
+        }
         write_endpoint_header(file, endpoint_abi.clone());
         write_endpoint_content(file, endpoint_abi.name, endpoint_abi.inputs);
         write_end_of_function(file);
@@ -29,7 +33,9 @@ fn write_header_impl_constructor(file: &mut File, name: &str) {
     let proxy_methods_type_name = proxy_methods_type_name(name);
     writeln!(
         file,
-        r#"impl<Env, From, Gas> {proxy_methods_type_name}<Env, From, (), Gas>
+        r#"
+#[rustfmt::skip]
+impl<Env, From, Gas> {proxy_methods_type_name}<Env, From, (), Gas>
 where
     Env: TxEnv,
     Env::Api: VMApi,
@@ -44,7 +50,9 @@ fn write_header_impl_endpoints(file: &mut File, name: &str) {
     let proxy_methods_type_name = proxy_methods_type_name(name);
     writeln!(
         file,
-        r#"impl<Env, From, To, Gas> {proxy_methods_type_name}<Env, From, To, Gas>
+        r#"
+#[rustfmt::skip]
+impl<Env, From, To, Gas> {proxy_methods_type_name}<Env, From, To, Gas>
 where
     Env: TxEnv,
     Env::Api: VMApi,
@@ -83,51 +91,19 @@ fn write_parameters(file: &mut File, inputs: Vec<InputAbi>) {
 }
 
 fn write_constructor_output(file: &mut File, outputs: Vec<OutputAbi>) {
-    write!(
-        file,
-        "-> Tx<
-        Env,
-        From,
-        (),
-        (),
-        Gas,
-        DeployCall<Env, ()>,
-        OriginalResultMarker<"
-    )
-    .unwrap();
+    write!(file, "-> TxProxyDeploy<Env, From, Gas, ").unwrap();
 
     parse_and_write_outputs(file, outputs);
 
-    writeln!(
-        file,
-        ">,
-    > {{"
-    )
-    .unwrap();
+    writeln!(file, "> {{").unwrap();
 }
 
 fn write_endpoint_output(file: &mut File, outputs: Vec<OutputAbi>) {
-    write!(
-        file,
-        "-> Tx<
-        Env,
-        From,
-        To,
-        (),
-        Gas,
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<"
-    )
-    .unwrap();
+    write!(file, "-> TxProxyCall<Env, From, To, Gas, ").unwrap();
 
     parse_and_write_outputs(file, outputs);
 
-    writeln!(
-        file,
-        ">,
-    > {{"
-    )
-    .unwrap();
+    writeln!(file, "> {{").unwrap();
 }
 
 fn write_constructor_content(file: &mut File, inputs: Vec<InputAbi>) {
@@ -191,7 +167,6 @@ fn write_argument(file: &mut File, index: usize, rust_name: &str) {
 
 fn write_end_of_function(file: &mut File) {
     writeln!(file, "    }}").unwrap();
-    write_newline(file);
 }
 
 fn adjust_type_name(original_rust_name: &str) -> String {
diff --git a/framework/meta/src/cmd/contract/generate_proxy/proxy_template_gen.rs b/framework/meta/src/cmd/contract/generate_proxy/proxy_template_gen.rs
index 71b673e3a5..22e26eff5a 100644
--- a/framework/meta/src/cmd/contract/generate_proxy/proxy_template_gen.rs
+++ b/framework/meta/src/cmd/contract/generate_proxy/proxy_template_gen.rs
@@ -1,7 +1,5 @@
 use std::{fs::File, io::Write};
 
-use crate::cmd::contract::generate_snippets::snippet_gen_common::write_newline;
-
 use super::proxy_naming::{proxy_methods_type_name, proxy_type_name};
 
 const PREFIX_AUTO_GENERATED: &str = "////////////////////////////////////////////////////
@@ -16,14 +14,16 @@ use multiversx_sc::proxy_imports::*;";
 pub(crate) fn write_header(file: &mut File) {
     writeln!(file, "{PREFIX_AUTO_GENERATED}").unwrap();
     writeln!(file, r#"{PRELUDE}"#).unwrap();
-
-    write_newline(file);
 }
 
-pub(crate) fn write_struct_template(file: &mut File, name: &str) {
+pub(crate) fn write_tx_proxy_type_def(file: &mut File, name: &str) {
     let proxy_type_name = proxy_type_name(name);
-    writeln!(file, "pub struct {proxy_type_name};").unwrap();
-    write_newline(file)
+    writeln!(
+        file,
+        "
+pub struct {proxy_type_name};"
+    )
+    .unwrap();
 }
 
 pub(crate) fn write_impl_for_tx_proxy(file: &mut File, name: &str) {
@@ -31,7 +31,8 @@ pub(crate) fn write_impl_for_tx_proxy(file: &mut File, name: &str) {
     let proxy_methods_type_name = proxy_methods_type_name(name);
     writeln!(
         file,
-        r#"impl<Env, From, To, Gas> TxProxyTrait<Env, From, To, Gas> for {proxy_type_name}
+        r#"
+impl<Env, From, To, Gas> TxProxyTrait<Env, From, To, Gas> for {proxy_type_name}
 where
     Env: TxEnv,
     From: TxFrom<Env>,
@@ -46,15 +47,14 @@ where
 }}"#
     )
     .unwrap();
-
-    write_newline(file);
 }
 
 pub(crate) fn write_struct_tx_proxy_methods(file: &mut File, name: &str) {
     let proxy_methods_type_name = proxy_methods_type_name(name);
     writeln!(
         file,
-        r#"pub struct {proxy_methods_type_name}<Env, From, To, Gas>
+        r#"
+pub struct {proxy_methods_type_name}<Env, From, To, Gas>
 where
     Env: TxEnv,
     From: TxFrom<Env>,
@@ -65,6 +65,4 @@ where
 }}"#
     )
     .unwrap();
-
-    write_newline(file);
 }

From 030b02b623ee6264cb253bdb917bbd5d9bb4718d Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 22 Mar 2024 01:56:59 +0200
Subject: [PATCH 0516/1254] unified syntax - refactored payment normalization

---
 .../types/interaction/expr/address_expr.rs    |   7 +-
 .../src/types/interaction/expr/sc_expr.rs     |   7 +-
 .../src/types/interaction/function_call.rs    |   1 +
 framework/base/src/types/interaction/mod.rs   |   2 +
 framework/base/src/types/interaction/tx.rs    |  70 ++-----
 .../src/types/interaction/tx_call_async.rs    |  25 ++-
 .../interaction/tx_call_async_promises.rs     |  34 ++--
 .../src/types/interaction/tx_call_sync.rs     |  32 +--
 .../base/src/types/interaction/tx_payment.rs  | 180 +----------------
 .../types/interaction/tx_payment_normalize.rs | 188 ++++++++++++++++++
 framework/base/src/types/interaction/tx_to.rs |  24 ++-
 .../scenario/src/facade/contract_info.rs      |   7 +-
 12 files changed, 303 insertions(+), 274 deletions(-)
 create mode 100644 framework/base/src/types/interaction/tx_payment_normalize.rs

diff --git a/framework/base/src/types/interaction/expr/address_expr.rs b/framework/base/src/types/interaction/expr/address_expr.rs
index 9e1fd943b6..44db09f0fe 100644
--- a/framework/base/src/types/interaction/expr/address_expr.rs
+++ b/framework/base/src/types/interaction/expr/address_expr.rs
@@ -40,10 +40,13 @@ impl<Env> TxToSpecified<Env> for AddressExpr
 where
     Env: TxEnv,
 {
-    fn with_address_ref<F: FnOnce(&ManagedAddress<Env::Api>)>(&self, _env: &Env, f: F) {
+    fn with_address_ref<F, R>(&self, env: &Env, f: F) -> R
+    where
+        F: FnOnce(&ManagedAddress<Env::Api>) -> R,
+    {
         let expr: [u8; 32] = self.eval_to_array();
         let ma = expr.into();
-        f(&ma);
+        f(&ma)
     }
 }
 
diff --git a/framework/base/src/types/interaction/expr/sc_expr.rs b/framework/base/src/types/interaction/expr/sc_expr.rs
index 4d05f8bab1..a81275ec4e 100644
--- a/framework/base/src/types/interaction/expr/sc_expr.rs
+++ b/framework/base/src/types/interaction/expr/sc_expr.rs
@@ -42,10 +42,13 @@ impl<'a, Env> TxToSpecified<Env> for ScExpr<'a>
 where
     Env: TxEnv,
 {
-    fn with_address_ref<F: FnOnce(&ManagedAddress<Env::Api>)>(&self, _env: &Env, f: F) {
+    fn with_address_ref<F, R>(&self, env: &Env, f: F) -> R
+    where
+        F: FnOnce(&ManagedAddress<Env::Api>) -> R,
+    {
         let expr: [u8; 32] = self.eval_to_array();
         let ma = expr.into();
-        f(&ma);
+        f(&ma)
     }
 }
 
diff --git a/framework/base/src/types/interaction/function_call.rs b/framework/base/src/types/interaction/function_call.rs
index 63814de88a..8a1e298419 100644
--- a/framework/base/src/types/interaction/function_call.rs
+++ b/framework/base/src/types/interaction/function_call.rs
@@ -17,6 +17,7 @@ use super::{ContractCallNoPayment, ManagedArgBuffer, TypedFunctionCall};
 /// Encodes a function call on the blockchain, composed of a function name and its encoded arguments.
 ///
 /// Can be used as a multi-argument, to embed a call within a call.
+#[derive(Clone)]
 pub struct FunctionCall<Api>
 where
     Api: ManagedTypeApi,
diff --git a/framework/base/src/types/interaction/mod.rs b/framework/base/src/types/interaction/mod.rs
index 7b751e162b..e756f230d9 100644
--- a/framework/base/src/types/interaction/mod.rs
+++ b/framework/base/src/types/interaction/mod.rs
@@ -32,6 +32,7 @@ mod tx_env_sc;
 mod tx_from;
 mod tx_gas;
 mod tx_payment;
+mod tx_payment_normalize;
 mod tx_proxy;
 mod tx_result_handler;
 mod tx_rh_list;
@@ -70,6 +71,7 @@ pub use tx_env_sc::*;
 pub use tx_from::*;
 pub use tx_gas::*;
 pub use tx_payment::*;
+pub use tx_payment_normalize::TxPaymentNormalize;
 pub use tx_proxy::*;
 pub use tx_result_handler::*;
 pub use tx_rh_list::*;
diff --git a/framework/base/src/types/interaction/tx.rs b/framework/base/src/types/interaction/tx.rs
index c2ca6a8903..84b94b238f 100644
--- a/framework/base/src/types/interaction/tx.rs
+++ b/framework/base/src/types/interaction/tx.rs
@@ -15,7 +15,8 @@ use super::{
     DeployCall, ExplicitGas, FromSource, FunctionCall, ManagedArgBuffer, OriginalResultMarker,
     RHList, RHListAppendNoRet, RHListAppendRet, RHListItem, TxCodeSource, TxCodeValue, TxData,
     TxDataFunctionCall, TxEnv, TxFrom, TxFromSourceValue, TxFromSpecified, TxGas, TxPayment,
-    TxPaymentEgldOnly, TxProxyTrait, TxResultHandler, TxScEnv, TxTo, TxToSpecified,
+    TxPaymentEgldOnly, TxPaymentNormalize, TxProxyTrait, TxResultHandler, TxScEnv, TxTo,
+    TxToSpecified,
 };
 
 #[must_use]
@@ -533,46 +534,6 @@ where
     }
 }
 
-impl<Env, From, To, Payment, Gas, FC, RH> Tx<Env, From, To, Payment, Gas, FC, RH>
-where
-    Env: TxEnv,
-    From: TxFrom<Env>,
-    To: TxToSpecified<Env>,
-    Payment: TxPayment<Env>,
-    Gas: TxGas<Env>,
-    FC: TxDataFunctionCall<Env>,
-    RH: TxResultHandler<Env>,
-{
-    #[allow(clippy::type_complexity)]
-    pub fn normalize_tx(
-        self,
-    ) -> Tx<
-        Env,
-        From,
-        ManagedAddress<Env::Api>,
-        EgldPayment<Env::Api>,
-        Gas,
-        FunctionCall<Env::Api>,
-        RH,
-    > {
-        let result = self.payment.convert_tx_data(
-            &self.env,
-            &self.from,
-            self.to.into_value(&self.env),
-            self.data.into(),
-        );
-        Tx {
-            env: self.env,
-            from: self.from,
-            to: result.to,
-            payment: result.egld_payment,
-            gas: self.gas,
-            data: result.fc,
-            result_handler: self.result_handler,
-        }
-    }
-}
-
 impl<Api, To, Payment, OriginalResult> ContractCallBase<Api>
     for Tx<
         TxScEnv<Api>,
@@ -586,23 +547,28 @@ impl<Api, To, Payment, OriginalResult> ContractCallBase<Api>
 where
     Api: CallTypeApi + 'static,
     To: TxToSpecified<TxScEnv<Api>>,
-    Payment: TxPayment<TxScEnv<Api>>,
+    Payment: TxPaymentNormalize<TxScEnv<Api>, (), To>,
     OriginalResult: TopEncodeMulti,
 {
     type OriginalResult = OriginalResult;
 
     fn into_normalized(self) -> ContractCallWithEgld<Api, OriginalResult> {
-        let normalized = self.normalize_tx();
-        ContractCallWithEgld {
-            basic: ContractCallNoPayment {
-                _phantom: core::marker::PhantomData,
-                to: normalized.to,
-                function_call: normalized.data,
-                explicit_gas_limit: UNSPECIFIED_GAS_LIMIT,
-                _return_type: core::marker::PhantomData,
+        self.payment.with_normalized(
+            &self.env,
+            &self.from,
+            self.to,
+            self.data,
+            |norm_to, norm_egld, norm_fc| ContractCallWithEgld {
+                basic: ContractCallNoPayment {
+                    _phantom: core::marker::PhantomData,
+                    to: norm_to.clone(),
+                    function_call: norm_fc.clone(),
+                    explicit_gas_limit: UNSPECIFIED_GAS_LIMIT,
+                    _return_type: core::marker::PhantomData,
+                },
+                egld_payment: norm_egld.clone(),
             },
-            egld_payment: normalized.payment.value,
-        }
+        )
     }
 }
 
diff --git a/framework/base/src/types/interaction/tx_call_async.rs b/framework/base/src/types/interaction/tx_call_async.rs
index 0b283db590..3e77979c2e 100644
--- a/framework/base/src/types/interaction/tx_call_async.rs
+++ b/framework/base/src/types/interaction/tx_call_async.rs
@@ -6,7 +6,7 @@ use crate::{
 
 use super::{
     OriginalResultMarker, Tx, TxData, TxDataFunctionCall, TxEnv, TxFrom, TxGas, TxPayment,
-    TxResultHandler, TxScEnv, TxTo, TxToSpecified,
+    TxPaymentNormalize, TxResultHandler, TxScEnv, TxTo, TxToSpecified,
 };
 
 pub trait TxAsyncCallCallback<Api>: TxResultHandler<TxScEnv<Api>>
@@ -119,18 +119,25 @@ impl<Api, To, Payment, FC, RH> Tx<TxScEnv<Api>, (), To, Payment, (), FC, RH>
 where
     Api: CallTypeApi,
     To: TxToSpecified<TxScEnv<Api>>,
-    Payment: TxPayment<TxScEnv<Api>>,
+    Payment: TxPaymentNormalize<TxScEnv<Api>, (), To>,
     FC: TxDataFunctionCall<TxScEnv<Api>>,
     RH: TxAsyncCallCallback<Api>,
 {
     pub fn async_call_and_exit(self) -> ! {
-        let normalized = self.normalize_tx();
-        normalized.result_handler.save_callback_closure_to_storage();
-        SendRawWrapper::<Api>::new().async_call_raw(
-            &normalized.to,
-            &normalized.payment.value,
-            &normalized.data.function_name,
-            &normalized.data.arg_buffer,
+        self.result_handler.save_callback_closure_to_storage();
+        self.payment.with_normalized(
+            &self.env,
+            &self.from,
+            self.to,
+            self.data.into(),
+            |norm_to, norm_egld, norm_fc| {
+                SendRawWrapper::<Api>::new().async_call_raw(
+                    norm_to,
+                    norm_egld,
+                    &norm_fc.function_name,
+                    &norm_fc.arg_buffer,
+                )
+            },
         )
     }
 
diff --git a/framework/base/src/types/interaction/tx_call_async_promises.rs b/framework/base/src/types/interaction/tx_call_async_promises.rs
index acf23e030d..134d2e0081 100644
--- a/framework/base/src/types/interaction/tx_call_async_promises.rs
+++ b/framework/base/src/types/interaction/tx_call_async_promises.rs
@@ -6,7 +6,7 @@ use crate::{
 
 use super::{
     callback_closure::CallbackClosureWithGas, ExplicitGas, FunctionCall, OriginalResultMarker, Tx,
-    TxGas, TxPayment, TxResultHandler, TxScEnv, TxToSpecified,
+    TxGas, TxPayment, TxPaymentNormalize, TxResultHandler, TxScEnv, TxToSpecified,
 };
 
 pub trait TxPromisesCallback<Api>: TxResultHandler<TxScEnv<Api>>
@@ -122,7 +122,7 @@ impl<Api, To, Payment, Callback>
 where
     Api: CallTypeApi,
     To: TxToSpecified<TxScEnv<Api>>,
-    Payment: TxPayment<TxScEnv<Api>>,
+    Payment: TxPaymentNormalize<TxScEnv<Api>, (), To>,
     Callback: TxPromisesCallback<Api>,
 {
     pub fn register_promise(self) {
@@ -133,18 +133,24 @@ where
             .overwrite_with_serialized_args(&mut cb_closure_args_serialized);
         let extra_gas_for_callback = self.result_handler.gas_for_callback();
 
-        let normalized = self.normalize_tx();
-
-        SendRawWrapper::<Api>::new().create_async_call_raw(
-            &normalized.to,
-            &normalized.payment.value,
-            &normalized.data.function_name,
-            &normalized.data.arg_buffer,
-            callback_name,
-            callback_name,
-            normalized.gas.0,
-            extra_gas_for_callback,
-            &cb_closure_args_serialized,
+        self.payment.with_normalized(
+            &self.env,
+            &self.from,
+            self.to,
+            self.data,
+            |norm_to, norm_egld, norm_fc| {
+                SendRawWrapper::<Api>::new().create_async_call_raw(
+                    norm_to,
+                    norm_egld,
+                    &norm_fc.function_name,
+                    &norm_fc.arg_buffer,
+                    callback_name,
+                    callback_name,
+                    self.gas.0,
+                    extra_gas_for_callback,
+                    &cb_closure_args_serialized,
+                )
+            },
         )
     }
 }
diff --git a/framework/base/src/types/interaction/tx_call_sync.rs b/framework/base/src/types/interaction/tx_call_sync.rs
index 2aaef2c26c..8e039b99d0 100644
--- a/framework/base/src/types/interaction/tx_call_sync.rs
+++ b/framework/base/src/types/interaction/tx_call_sync.rs
@@ -9,7 +9,8 @@ use crate::{
 
 use super::{
     contract_call_exec::decode_result, BackTransfers, ConsNoRet, ConsRet, OriginalResultMarker,
-    RHList, RHListItem, Tx, TxDataFunctionCall, TxEnv, TxGas, TxPayment, TxScEnv, TxToSpecified,
+    RHList, RHListItem, Tx, TxDataFunctionCall, TxEnv, TxGas, TxPayment, TxPaymentNormalize,
+    TxScEnv, TxToSpecified,
 };
 
 pub trait RHListItemSync<Env, Original>: RHListItem<Env, Original>
@@ -89,7 +90,7 @@ impl<Api, To, Payment, Gas, FC, RH> Tx<TxScEnv<Api>, (), To, Payment, Gas, FC, R
 where
     Api: CallTypeApi,
     To: TxToSpecified<TxScEnv<Api>>,
-    Payment: TxPayment<TxScEnv<Api>>,
+    Payment: TxPaymentNormalize<TxScEnv<Api>, (), To>,
     Gas: TxGas<TxScEnv<Api>>,
     FC: TxDataFunctionCall<TxScEnv<Api>>,
     RH: RHListSync<TxScEnv<Api>>,
@@ -97,19 +98,26 @@ where
 {
     fn execute_sync_call_raw(self) -> (ManagedVec<Api, ManagedBuffer<Api>>, RH) {
         let gas_limit = self.gas.resolve_gas(&self.env);
-        let normalized = self.normalize_tx();
-
-        let raw_result = SendRawWrapper::<Api>::new().execute_on_dest_context_raw(
-            gas_limit,
-            &normalized.to,
-            &normalized.payment.value,
-            &normalized.data.function_name,
-            &normalized.data.arg_buffer,
+
+        let raw_result = self.payment.with_normalized(
+            &self.env,
+            &self.from,
+            self.to,
+            self.data.into(),
+            |norm_to, norm_egld, norm_fc| {
+                SendRawWrapper::<Api>::new().execute_on_dest_context_raw(
+                    gas_limit,
+                    norm_to,
+                    norm_egld,
+                    &norm_fc.function_name,
+                    &norm_fc.arg_buffer,
+                )
+            },
         );
 
         SendRawWrapper::<Api>::new().clean_return_data();
 
-        (raw_result, normalized.result_handler)
+        (raw_result, self.result_handler)
     }
 
     pub fn sync_call(self) -> <RH::ListReturns as NestedTupleFlatten>::Unpacked {
@@ -125,7 +133,7 @@ impl<Api, To, Payment, Gas, FC, OriginalResult>
 where
     Api: CallTypeApi,
     To: TxToSpecified<TxScEnv<Api>>,
-    Payment: TxPayment<TxScEnv<Api>>,
+    Payment: TxPaymentNormalize<TxScEnv<Api>, (), To>,
     Gas: TxGas<TxScEnv<Api>>,
     FC: TxDataFunctionCall<TxScEnv<Api>>,
 {
diff --git a/framework/base/src/types/interaction/tx_payment.rs b/framework/base/src/types/interaction/tx_payment.rs
index d7f7fd90f5..055d42041b 100644
--- a/framework/base/src/types/interaction/tx_payment.rs
+++ b/framework/base/src/types/interaction/tx_payment.rs
@@ -9,17 +9,7 @@ use crate::{
     },
 };
 
-use super::{FunctionCall, TxEnv, TxFrom};
-
-/// Temporary structure for returning a normalized transfer.
-pub struct PaymentConversionResult<Api>
-where
-    Api: ManagedTypeApi,
-{
-    pub to: ManagedAddress<Api>,
-    pub egld_payment: EgldPayment<Api>,
-    pub fc: FunctionCall<Api>,
-}
+use super::{FunctionCall, TxEnv, TxFrom, TxToSpecified};
 
 #[derive(Clone)]
 pub struct AnnotatedEgldPayment<Api>
@@ -73,16 +63,6 @@ where
 {
     fn is_no_payment(&self) -> bool;
 
-    fn convert_tx_data<From>(
-        self,
-        env: &Env,
-        from: &From,
-        to: ManagedAddress<Env::Api>,
-        fc: FunctionCall<Env::Api>,
-    ) -> PaymentConversionResult<Env::Api>
-    where
-        From: TxFrom<Env>;
-
     fn perform_transfer_execute(
         self,
         env: &Env,
@@ -110,23 +90,6 @@ where
         true
     }
 
-    fn convert_tx_data<From>(
-        self,
-        _env: &Env,
-        _from: &From,
-        to: ManagedAddress<Env::Api>,
-        fc: FunctionCall<Env::Api>,
-    ) -> PaymentConversionResult<Env::Api>
-    where
-        From: TxFrom<Env>,
-    {
-        PaymentConversionResult {
-            to,
-            egld_payment: EgldPayment::no_payment(),
-            fc,
-        }
-    }
-
     fn perform_transfer_execute(
         self,
         env: &Env,
@@ -159,23 +122,6 @@ where
         self.value == 0u32
     }
 
-    fn convert_tx_data<From>(
-        self,
-        _env: &Env,
-        _from: &From,
-        to: ManagedAddress<Env::Api>,
-        fc: FunctionCall<Env::Api>,
-    ) -> PaymentConversionResult<Env::Api>
-    where
-        From: TxFrom<Env>,
-    {
-        PaymentConversionResult {
-            to,
-            egld_payment: self,
-            fc,
-        }
-    }
-
     fn perform_transfer_execute(
         self,
         _env: &Env,
@@ -192,7 +138,7 @@ where
         );
     }
 
-    fn into_full_payment_data(self) -> FullPaymentData<<Env as TxEnv>::Api> {
+    fn into_full_payment_data(self) -> FullPaymentData<Env::Api> {
         FullPaymentData {
             egld: Some(AnnotatedEgldPayment::new_egld(self.value)),
             multi_esdt: ManagedVec::new(),
@@ -217,23 +163,6 @@ where
         self.amount == 0u32
     }
 
-    fn convert_tx_data<From>(
-        self,
-        env: &Env,
-        from: &From,
-        to: ManagedAddress<Env::Api>,
-        fc: FunctionCall<Env::Api>,
-    ) -> PaymentConversionResult<Env::Api>
-    where
-        From: TxFrom<Env>,
-    {
-        if self.token_nonce == 0 {
-            convert_tx_data_fungible(self, to, fc)
-        } else {
-            convert_tx_data_nft(self, from.resolve_address(env), to, fc)
-        }
-    }
-
     fn perform_transfer_execute(
         self,
         env: &Env,
@@ -244,7 +173,7 @@ where
         MultiEsdtPayment::from_single_item(self).perform_transfer_execute(env, to, gas_limit, fc);
     }
 
-    fn into_full_payment_data(self) -> FullPaymentData<<Env as TxEnv>::Api> {
+    fn into_full_payment_data(self) -> FullPaymentData<Env::Api> {
         FullPaymentData {
             egld: None,
             multi_esdt: MultiEsdtPayment::from_single_item(self),
@@ -260,23 +189,6 @@ where
         self.is_empty()
     }
 
-    fn convert_tx_data<From>(
-        self,
-        env: &Env,
-        from: &From,
-        to: ManagedAddress<Env::Api>,
-        fc: FunctionCall<Env::Api>,
-    ) -> PaymentConversionResult<Env::Api>
-    where
-        From: TxFrom<Env>,
-    {
-        match self.len() {
-            0 => ().convert_tx_data(env, from, to, fc),
-            1 => self.get(0).convert_tx_data(env, from, to, fc),
-            _ => convert_tx_data_multi(self, from.resolve_address(env), to, fc),
-        }
-    }
-
     fn perform_transfer_execute(
         self,
         _env: &Env,
@@ -293,7 +205,7 @@ where
         );
     }
 
-    fn into_full_payment_data(self) -> FullPaymentData<<Env as TxEnv>::Api> {
+    fn into_full_payment_data(self) -> FullPaymentData<Env::Api> {
         FullPaymentData {
             egld: None,
             multi_esdt: self,
@@ -309,23 +221,6 @@ where
         self.amount == 0u32
     }
 
-    fn convert_tx_data<From>(
-        self,
-        env: &Env,
-        from: &From,
-        to: ManagedAddress<Env::Api>,
-        fc: FunctionCall<Env::Api>,
-    ) -> PaymentConversionResult<Env::Api>
-    where
-        From: TxFrom<Env>,
-    {
-        self.map_egld_or_esdt(
-            (to, fc),
-            |(to, fc), amount| EgldPayment::from(amount).convert_tx_data(env, from, to, fc),
-            |(to, fc), esdt_payment| esdt_payment.convert_tx_data(env, from, to, fc),
-        )
-    }
-
     fn perform_transfer_execute(
         self,
         env: &Env,
@@ -359,26 +254,6 @@ where
         self.is_empty()
     }
 
-    fn convert_tx_data<From>(
-        self,
-        env: &Env,
-        from: &From,
-        to: ManagedAddress<Env::Api>,
-        fc: FunctionCall<Env::Api>,
-    ) -> PaymentConversionResult<Env::Api>
-    where
-        From: TxFrom<Env>,
-    {
-        match self {
-            EgldOrMultiEsdtPayment::Egld(egld_amount) => {
-                EgldPayment::from(egld_amount).convert_tx_data(env, from, to, fc)
-            },
-            EgldOrMultiEsdtPayment::MultiEsdt(multi_esdt_payment) => {
-                multi_esdt_payment.convert_tx_data(env, from, to, fc)
-            },
-        }
-    }
-
     fn perform_transfer_execute(
         self,
         env: &Env,
@@ -407,50 +282,3 @@ where
         }
     }
 }
-
-fn convert_tx_data_fungible<Api>(
-    payment: EsdtTokenPayment<Api>,
-    to: ManagedAddress<Api>,
-    fc: FunctionCall<Api>,
-) -> PaymentConversionResult<Api>
-where
-    Api: ManagedTypeApi,
-{
-    PaymentConversionResult {
-        to,
-        egld_payment: EgldPayment::no_payment(),
-        fc: fc.convert_to_single_transfer_fungible_call(payment),
-    }
-}
-
-fn convert_tx_data_nft<Api>(
-    payment: EsdtTokenPayment<Api>,
-    from: ManagedAddress<Api>,
-    to: ManagedAddress<Api>,
-    fc: FunctionCall<Api>,
-) -> PaymentConversionResult<Api>
-where
-    Api: ManagedTypeApi,
-{
-    PaymentConversionResult {
-        to: from,
-        egld_payment: EgldPayment::no_payment(),
-        fc: fc.convert_to_single_transfer_nft_call(&to, payment),
-    }
-}
-
-fn convert_tx_data_multi<Api>(
-    payment: MultiEsdtPayment<Api>,
-    from: ManagedAddress<Api>,
-    to: ManagedAddress<Api>,
-    fc: FunctionCall<Api>,
-) -> PaymentConversionResult<Api>
-where
-    Api: ManagedTypeApi,
-{
-    PaymentConversionResult {
-        to: from,
-        egld_payment: EgldPayment::no_payment(),
-        fc: fc.convert_to_multi_transfer_esdt_call(&to, payment),
-    }
-}
diff --git a/framework/base/src/types/interaction/tx_payment_normalize.rs b/framework/base/src/types/interaction/tx_payment_normalize.rs
new file mode 100644
index 0000000000..5338c8c354
--- /dev/null
+++ b/framework/base/src/types/interaction/tx_payment_normalize.rs
@@ -0,0 +1,188 @@
+use crate::{
+    api::{self, CallTypeApi, ManagedTypeApi},
+    contract_base::{BlockchainWrapper, SendRawWrapper},
+    types::{
+        BigUint, CodeMetadata, EgldOrEsdtTokenPayment, EgldOrMultiEsdtPayment, EgldPayment,
+        EsdtTokenPayment, ManagedAddress, ManagedBuffer, ManagedOption, ManagedVec,
+        MultiEsdtPayment,
+    },
+};
+use alloc::boxed::Box;
+use multiversx_sc_codec::TopEncodeMulti;
+
+use super::{
+    contract_call_exec::UNSPECIFIED_GAS_LIMIT, contract_call_trait::ContractCallBase,
+    AnnotatedValue, AsyncCall, Code, ContractCallNoPayment, ContractCallWithEgld, ContractDeploy,
+    DeployCall, ExplicitGas, FromSource, FunctionCall, ManagedArgBuffer, OriginalResultMarker,
+    RHList, RHListAppendNoRet, RHListAppendRet, RHListItem, TxCodeSource, TxCodeValue, TxData,
+    TxDataFunctionCall, TxEnv, TxFrom, TxFromSourceValue, TxFromSpecified, TxGas, TxPayment,
+    TxPaymentEgldOnly, TxProxyTrait, TxResultHandler, TxScEnv, TxTo, TxToSpecified,
+};
+
+/// Defines how a payment transforms a transaction,
+/// e.g. from ESDT transfer to ESDTTransfer builtin function.
+pub trait TxPaymentNormalize<Env, From, To>: TxPayment<Env>
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxToSpecified<Env>,
+{
+    fn with_normalized<F, R>(
+        self,
+        env: &Env,
+        from: &From,
+        to: To,
+        fc: FunctionCall<Env::Api>,
+        f: F,
+    ) -> R
+    where
+        F: FnOnce(&ManagedAddress<Env::Api>, &BigUint<Env::Api>, &FunctionCall<Env::Api>) -> R;
+}
+
+impl<Env, From, To> TxPaymentNormalize<Env, From, To> for ()
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxToSpecified<Env>,
+{
+    fn with_normalized<F, R>(
+        self,
+        env: &Env,
+        from: &From,
+        to: To,
+        fc: FunctionCall<Env::Api>,
+        f: F,
+    ) -> R
+    where
+        F: FnOnce(&ManagedAddress<Env::Api>, &BigUint<Env::Api>, &FunctionCall<Env::Api>) -> R,
+    {
+        to.with_address_ref(env, |to_addr| f(to_addr, &BigUint::zero(), &fc))
+    }
+}
+
+impl<Env, From, To> TxPaymentNormalize<Env, From, To> for EgldPayment<Env::Api>
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxToSpecified<Env>,
+{
+    fn with_normalized<F, R>(
+        self,
+        env: &Env,
+        from: &From,
+        to: To,
+        fc: FunctionCall<Env::Api>,
+        f: F,
+    ) -> R
+    where
+        F: FnOnce(&ManagedAddress<Env::Api>, &BigUint<Env::Api>, &FunctionCall<Env::Api>) -> R,
+    {
+        to.with_address_ref(env, |to_addr| f(to_addr, &self.value, &fc))
+    }
+}
+
+impl<Env, From, To> TxPaymentNormalize<Env, From, To> for EsdtTokenPayment<Env::Api>
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxToSpecified<Env>,
+{
+    fn with_normalized<F, R>(
+        self,
+        env: &Env,
+        from: &From,
+        to: To,
+        fc: FunctionCall<Env::Api>,
+        f: F,
+    ) -> R
+    where
+        F: FnOnce(&ManagedAddress<Env::Api>, &BigUint<Env::Api>, &FunctionCall<Env::Api>) -> R,
+    {
+        to.with_address_ref(env, |to_addr| {
+            if self.token_nonce == 0 {
+                let fc_conv = fc.convert_to_single_transfer_fungible_call(self);
+                f(to_addr, &BigUint::zero(), &fc_conv)
+            } else {
+                let fc_conv = fc.convert_to_single_transfer_nft_call(to_addr, self);
+                f(&from.resolve_address(env), &BigUint::zero(), &fc_conv)
+            }
+        })
+    }
+}
+
+impl<Env, From, To> TxPaymentNormalize<Env, From, To> for MultiEsdtPayment<Env::Api>
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxToSpecified<Env>,
+{
+    fn with_normalized<F, R>(
+        self,
+        env: &Env,
+        from: &From,
+        to: To,
+        fc: FunctionCall<Env::Api>,
+        f: F,
+    ) -> R
+    where
+        F: FnOnce(&ManagedAddress<Env::Api>, &BigUint<Env::Api>, &FunctionCall<Env::Api>) -> R,
+    {
+        to.with_address_ref(env, |to_addr| {
+            let fc_conv = fc.convert_to_multi_transfer_esdt_call(to_addr, self);
+            f(&from.resolve_address(env), &BigUint::zero(), &fc_conv)
+        })
+    }
+}
+
+impl<Env, From, To> TxPaymentNormalize<Env, From, To> for EgldOrEsdtTokenPayment<Env::Api>
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxToSpecified<Env>,
+{
+    fn with_normalized<F, R>(
+        self,
+        env: &Env,
+        from: &From,
+        to: To,
+        fc: FunctionCall<Env::Api>,
+        f: F,
+    ) -> R
+    where
+        F: FnOnce(&ManagedAddress<Env::Api>, &BigUint<Env::Api>, &FunctionCall<Env::Api>) -> R,
+    {
+        self.map_egld_or_esdt(
+            (to, fc, f),
+            |(to, fc, f), amount| EgldPayment::from(amount).with_normalized(env, from, to, fc, f),
+            |(to, fc, f), esdt_payment| esdt_payment.with_normalized(env, from, to, fc, f),
+        )
+    }
+}
+
+impl<Env, From, To> TxPaymentNormalize<Env, From, To> for EgldOrMultiEsdtPayment<Env::Api>
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxToSpecified<Env>,
+{
+    fn with_normalized<F, R>(
+        self,
+        env: &Env,
+        from: &From,
+        to: To,
+        fc: FunctionCall<Env::Api>,
+        f: F,
+    ) -> R
+    where
+        F: FnOnce(&ManagedAddress<Env::Api>, &BigUint<Env::Api>, &FunctionCall<Env::Api>) -> R,
+    {
+        match self {
+            EgldOrMultiEsdtPayment::Egld(egld_amount) => {
+                EgldPayment::from(egld_amount).with_normalized(env, from, to, fc, f)
+            },
+            EgldOrMultiEsdtPayment::MultiEsdt(multi_esdt_payment) => {
+                multi_esdt_payment.with_normalized(env, from, to, fc, f)
+            },
+        }
+    }
+}
diff --git a/framework/base/src/types/interaction/tx_to.rs b/framework/base/src/types/interaction/tx_to.rs
index 984587a6ed..c09b25d4f3 100644
--- a/framework/base/src/types/interaction/tx_to.rs
+++ b/framework/base/src/types/interaction/tx_to.rs
@@ -17,7 +17,9 @@ where
     /// Avoids a clone when performing transfer-execute.
     ///
     /// Other than that, does thesame as `AnnotatedValue::into_value`.
-    fn with_address_ref<F: FnOnce(&ManagedAddress<Env::Api>)>(&self, env: &Env, f: F);
+    fn with_address_ref<F, R>(&self, env: &Env, f: F) -> R
+    where
+        F: FnOnce(&ManagedAddress<Env::Api>) -> R;
 }
 
 impl<Env> TxTo<Env> for ManagedAddress<Env::Api> where Env: TxEnv {}
@@ -25,7 +27,10 @@ impl<Env> TxToSpecified<Env> for ManagedAddress<Env::Api>
 where
     Env: TxEnv,
 {
-    fn with_address_ref<F: FnOnce(&ManagedAddress<Env::Api>)>(&self, _env: &Env, f: F) {
+    fn with_address_ref<F, R>(&self, env: &Env, f: F) -> R
+    where
+        F: FnOnce(&ManagedAddress<Env::Api>) -> R,
+    {
         f(self)
     }
 }
@@ -35,7 +40,10 @@ impl<Env> TxToSpecified<Env> for &ManagedAddress<Env::Api>
 where
     Env: TxEnv,
 {
-    fn with_address_ref<F: FnOnce(&ManagedAddress<Env::Api>)>(&self, _env: &Env, f: F) {
+    fn with_address_ref<F, R>(&self, env: &Env, f: F) -> R
+    where
+        F: FnOnce(&ManagedAddress<Env::Api>) -> R,
+    {
         f(self)
     }
 }
@@ -45,7 +53,10 @@ impl<Env> TxToSpecified<Env> for Address
 where
     Env: TxEnv,
 {
-    fn with_address_ref<F: FnOnce(&ManagedAddress<Env::Api>)>(&self, _env: &Env, f: F) {
+    fn with_address_ref<F, R>(&self, env: &Env, f: F) -> R
+    where
+        F: FnOnce(&ManagedAddress<Env::Api>) -> R,
+    {
         let managed_address = ManagedAddress::from(self);
         f(&managed_address)
     }
@@ -56,7 +67,10 @@ impl<Env> TxToSpecified<Env> for &Address
 where
     Env: TxEnv,
 {
-    fn with_address_ref<F: FnOnce(&ManagedAddress<Env::Api>)>(&self, _env: &Env, f: F) {
+    fn with_address_ref<F, R>(&self, env: &Env, f: F) -> R
+    where
+        F: FnOnce(&ManagedAddress<Env::Api>) -> R,
+    {
         let managed_address = ManagedAddress::from(*self);
         f(&managed_address)
     }
diff --git a/framework/scenario/src/facade/contract_info.rs b/framework/scenario/src/facade/contract_info.rs
index 9f88ad9a8b..56095208e6 100644
--- a/framework/scenario/src/facade/contract_info.rs
+++ b/framework/scenario/src/facade/contract_info.rs
@@ -148,8 +148,11 @@ where
     Env: TxEnv,
     P: ProxyObjNew,
 {
-    fn with_address_ref<F: FnOnce(&ManagedAddress<Env::Api>)>(&self, _env: &Env, f: F) {
+    fn with_address_ref<F, R>(&self, _env: &Env, f: F) -> R
+    where
+        F: FnOnce(&ManagedAddress<Env::Api>) -> R,
+    {
         let ma: ManagedAddress<Env::Api> = (&self.scenario_address_expr.value).into();
-        f(&ma);
+        f(&ma)
     }
 }

From 21e2446b37ec9b83a7d8288599d13ba678f5ba6d Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 22 Mar 2024 11:33:47 +0200
Subject: [PATCH 0517/1254] MultiEsdtPayment with_normalized fix

---
 .../src/types/interaction/tx_payment_normalize.rs    | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/framework/base/src/types/interaction/tx_payment_normalize.rs b/framework/base/src/types/interaction/tx_payment_normalize.rs
index 5338c8c354..af0e540de9 100644
--- a/framework/base/src/types/interaction/tx_payment_normalize.rs
+++ b/framework/base/src/types/interaction/tx_payment_normalize.rs
@@ -127,10 +127,14 @@ where
     where
         F: FnOnce(&ManagedAddress<Env::Api>, &BigUint<Env::Api>, &FunctionCall<Env::Api>) -> R,
     {
-        to.with_address_ref(env, |to_addr| {
-            let fc_conv = fc.convert_to_multi_transfer_esdt_call(to_addr, self);
-            f(&from.resolve_address(env), &BigUint::zero(), &fc_conv)
-        })
+        match self.len() {
+            0 => ().with_normalized(env, from, to, fc, f),
+            1 => self.get(0).with_normalized(env, from, to, fc, f),
+            _ => to.with_address_ref(env, |to_addr| {
+                let fc_conv = fc.convert_to_multi_transfer_esdt_call(to_addr, self);
+                f(&from.resolve_address(env), &BigUint::zero(), &fc_conv)
+            }),
+        }
     }
 }
 

From 590e13cebcde6defff0ea46bad23a70df4f7ccec Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 22 Mar 2024 03:29:49 +0200
Subject: [PATCH 0518/1254] unified syntax - egld payment refactor

---
 .../adder/interact/src/basic_interact.rs      |   2 +-
 .../base/src/types/interaction/annotated.rs   |  45 +++++++-
 framework/base/src/types/interaction/mod.rs   |   4 +
 framework/base/src/types/interaction/tx.rs    |  27 +++--
 .../src/types/interaction/tx_call_deploy.rs   | 106 ++++++++++--------
 .../base/src/types/interaction/tx_data.rs     |   5 +-
 .../base/src/types/interaction/tx_payment.rs  | 101 +++--------------
 .../src/types/interaction/tx_payment_egld.rs  | 105 +++++++++++++++++
 .../interaction/tx_payment_egld_value.rs      |  65 +++++++++++
 .../types/interaction/tx_payment_normalize.rs |  26 +++--
 .../base/src/types/managed/basic/big_uint.rs  |  13 ++-
 .../src/types/managed/wrapped/egld_payment.rs |  30 -----
 .../base/src/types/managed/wrapped/mod.rs     |   2 -
 .../src/facade/world_tx/scenario_env_util.rs  |   6 +-
 14 files changed, 338 insertions(+), 199 deletions(-)
 create mode 100644 framework/base/src/types/interaction/tx_payment_egld.rs
 create mode 100644 framework/base/src/types/interaction/tx_payment_egld_value.rs
 delete mode 100644 framework/base/src/types/managed/wrapped/egld_payment.rs

diff --git a/contracts/examples/adder/interact/src/basic_interact.rs b/contracts/examples/adder/interact/src/basic_interact.rs
index 57ab414d53..f1036b4aa0 100644
--- a/contracts/examples/adder/interact/src/basic_interact.rs
+++ b/contracts/examples/adder/interact/src/basic_interact.rs
@@ -170,7 +170,7 @@ impl AdderInteract {
             .tx()
             .from(&self.wallet_address)
             .to(self.state.adder().to_address())
-            .egld(50000000000000000u64.into()) // TODO: annotate "0,050000000000000000"
+            .egld(50000000000000000u64) // TODO: annotate "0,050000000000000000"
             .prepare_async()
             .run()
             .await;
diff --git a/framework/base/src/types/interaction/annotated.rs b/framework/base/src/types/interaction/annotated.rs
index d190f65631..8571b4669b 100644
--- a/framework/base/src/types/interaction/annotated.rs
+++ b/framework/base/src/types/interaction/annotated.rs
@@ -1,4 +1,4 @@
-use crate::types::{heap::Address, ManagedAddress, ManagedBuffer};
+use crate::types::{heap::Address, BigUint, ManagedAddress, ManagedBuffer};
 
 use super::TxEnv;
 
@@ -28,7 +28,7 @@ impl<Env> AnnotatedValue<Env, ManagedAddress<Env::Api>> for &ManagedAddress<Env:
 where
     Env: TxEnv,
 {
-    fn annotation(&self, _env: &Env) -> crate::types::ManagedBuffer<Env::Api> {
+    fn annotation(&self, _env: &Env) -> ManagedBuffer<Env::Api> {
         self.hex_expr()
     }
 
@@ -67,7 +67,7 @@ impl<Env> AnnotatedValue<Env, ManagedBuffer<Env::Api>> for ManagedBuffer<Env::Ap
 where
     Env: TxEnv,
 {
-    fn annotation(&self, _env: &Env) -> crate::types::ManagedBuffer<Env::Api> {
+    fn annotation(&self, _env: &Env) -> ManagedBuffer<Env::Api> {
         self.hex_expr()
     }
 
@@ -75,3 +75,42 @@ where
         self
     }
 }
+
+impl<Env> AnnotatedValue<Env, BigUint<Env::Api>> for BigUint<Env::Api>
+where
+    Env: TxEnv,
+{
+    fn annotation(&self, _env: &Env) -> ManagedBuffer<Env::Api> {
+        self.to_display()
+    }
+
+    fn into_value(self, _env: &Env) -> BigUint<Env::Api> {
+        self
+    }
+}
+
+impl<Env> AnnotatedValue<Env, BigUint<Env::Api>> for &BigUint<Env::Api>
+where
+    Env: TxEnv,
+{
+    fn annotation(&self, _env: &Env) -> ManagedBuffer<Env::Api> {
+        self.to_display()
+    }
+
+    fn into_value(self, _env: &Env) -> BigUint<Env::Api> {
+        self.clone()
+    }
+}
+
+impl<Env> AnnotatedValue<Env, BigUint<Env::Api>> for u64
+where
+    Env: TxEnv,
+{
+    fn annotation(&self, env: &Env) -> ManagedBuffer<Env::Api> {
+        self.into_value(env).to_display()
+    }
+
+    fn into_value(self, _env: &Env) -> BigUint<Env::Api> {
+        BigUint::<Env::Api>::from(self)
+    }
+}
diff --git a/framework/base/src/types/interaction/mod.rs b/framework/base/src/types/interaction/mod.rs
index e756f230d9..44697cddb8 100644
--- a/framework/base/src/types/interaction/mod.rs
+++ b/framework/base/src/types/interaction/mod.rs
@@ -32,6 +32,8 @@ mod tx_env_sc;
 mod tx_from;
 mod tx_gas;
 mod tx_payment;
+mod tx_payment_egld;
+mod tx_payment_egld_value;
 mod tx_payment_normalize;
 mod tx_proxy;
 mod tx_result_handler;
@@ -71,6 +73,8 @@ pub use tx_env_sc::*;
 pub use tx_from::*;
 pub use tx_gas::*;
 pub use tx_payment::*;
+pub use tx_payment_egld::*;
+pub use tx_payment_egld_value::TxEgldValue;
 pub use tx_payment_normalize::TxPaymentNormalize;
 pub use tx_proxy::*;
 pub use tx_result_handler::*;
diff --git a/framework/base/src/types/interaction/tx.rs b/framework/base/src/types/interaction/tx.rs
index 84b94b238f..8fae065026 100644
--- a/framework/base/src/types/interaction/tx.rs
+++ b/framework/base/src/types/interaction/tx.rs
@@ -2,8 +2,8 @@ use crate::{
     api::{self, CallTypeApi, ManagedTypeApi},
     contract_base::{BlockchainWrapper, SendRawWrapper},
     types::{
-        BigUint, CodeMetadata, EgldOrEsdtTokenPayment, EgldPayment, EsdtTokenPayment,
-        ManagedAddress, ManagedBuffer, ManagedOption, ManagedVec, MultiEsdtPayment,
+        BigUint, CodeMetadata, EgldOrEsdtTokenPayment, EsdtTokenPayment, ManagedAddress,
+        ManagedBuffer, ManagedOption, ManagedVec, MultiEsdtPayment,
     },
 };
 use alloc::boxed::Box;
@@ -12,11 +12,11 @@ use multiversx_sc_codec::TopEncodeMulti;
 use super::{
     contract_call_exec::UNSPECIFIED_GAS_LIMIT, contract_call_trait::ContractCallBase,
     AnnotatedValue, AsyncCall, Code, ContractCallNoPayment, ContractCallWithEgld, ContractDeploy,
-    DeployCall, ExplicitGas, FromSource, FunctionCall, ManagedArgBuffer, OriginalResultMarker,
-    RHList, RHListAppendNoRet, RHListAppendRet, RHListItem, TxCodeSource, TxCodeValue, TxData,
-    TxDataFunctionCall, TxEnv, TxFrom, TxFromSourceValue, TxFromSpecified, TxGas, TxPayment,
-    TxPaymentEgldOnly, TxPaymentNormalize, TxProxyTrait, TxResultHandler, TxScEnv, TxTo,
-    TxToSpecified,
+    DeployCall, Egld, EgldPayment, ExplicitGas, FromSource, FunctionCall, ManagedArgBuffer,
+    OriginalResultMarker, RHList, RHListAppendNoRet, RHListAppendRet, RHListItem, TxCodeSource,
+    TxCodeValue, TxData, TxDataFunctionCall, TxEgldValue, TxEnv, TxFrom, TxFromSourceValue,
+    TxFromSpecified, TxGas, TxPayment, TxPaymentEgldOnly, TxPaymentNormalize, TxProxyTrait,
+    TxResultHandler, TxScEnv, TxTo, TxToSpecified,
 };
 
 #[must_use]
@@ -151,15 +151,18 @@ where
     Data: TxData<Env>,
     RH: TxResultHandler<Env>,
 {
-    pub fn egld(
+    pub fn egld<EgldValue>(
         self,
-        egld_amount: BigUint<Env::Api>,
-    ) -> Tx<Env, From, To, EgldPayment<Env::Api>, Gas, Data, RH> {
+        egld_value: EgldValue,
+    ) -> Tx<Env, From, To, Egld<EgldValue>, Gas, Data, RH>
+    where
+        EgldValue: TxEgldValue<Env>,
+    {
         Tx {
             env: self.env,
             from: self.from,
             to: self.to,
-            payment: EgldPayment { value: egld_amount },
+            payment: Egld(egld_value),
             gas: self.gas,
             data: self.data,
             result_handler: self.result_handler,
@@ -701,7 +704,7 @@ where
         ContractDeploy {
             _phantom: core::marker::PhantomData,
             to: ManagedOption::none(),
-            egld_payment: value.payment.to_egld_payment().value,
+            egld_payment: value.payment.into_egld_payment(&value.env),
             explicit_gas_limit: UNSPECIFIED_GAS_LIMIT,
             arg_buffer: value.data.arg_buffer,
             _return_type: core::marker::PhantomData,
diff --git a/framework/base/src/types/interaction/tx_call_deploy.rs b/framework/base/src/types/interaction/tx_call_deploy.rs
index 189d93b7ae..7c9e17d84c 100644
--- a/framework/base/src/types/interaction/tx_call_deploy.rs
+++ b/framework/base/src/types/interaction/tx_call_deploy.rs
@@ -104,15 +104,16 @@ where
 {
     fn execute_deploy_raw(self) -> (ManagedAddress<Api>, ManagedVec<Api, ManagedBuffer<Api>>, RH) {
         let gas_limit = self.gas.resolve_gas(&self.env);
-        let egld_payment = self.payment.to_egld_payment();
 
-        let (new_address, raw_results) = SendRawWrapper::<Api>::new().deploy_contract(
-            gas_limit,
-            &egld_payment.value,
-            &self.data.code_source.0.into_value(&self.env),
-            self.data.code_metadata,
-            &self.data.arg_buffer,
-        );
+        let (new_address, raw_results) = self.payment.with_egld_value(|egld_value| {
+            SendRawWrapper::<Api>::new().deploy_contract(
+                gas_limit,
+                egld_value,
+                &self.data.code_source.0.into_value(&self.env),
+                self.data.code_metadata,
+                &self.data.arg_buffer,
+            )
+        });
 
         SendRawWrapper::<Api>::new().clean_return_data();
 
@@ -141,15 +142,16 @@ where
         self,
     ) -> (ManagedAddress<Api>, ManagedVec<Api, ManagedBuffer<Api>>, RH) {
         let gas_limit = self.gas.resolve_gas(&self.env);
-        let egld_payment = self.payment.to_egld_payment();
 
-        let (new_address, raw_results) = SendRawWrapper::<Api>::new().deploy_from_source_contract(
-            gas_limit,
-            &egld_payment.value,
-            &self.data.code_source.0.into_value(&self.env),
-            self.data.code_metadata,
-            &self.data.arg_buffer,
-        );
+        let (new_address, raw_results) = self.payment.with_egld_value(|egld_value| {
+            SendRawWrapper::<Api>::new().deploy_from_source_contract(
+                gas_limit,
+                egld_value,
+                &self.data.code_source.0.into_value(&self.env),
+                self.data.code_metadata,
+                &self.data.arg_buffer,
+            )
+        });
 
         SendRawWrapper::<Api>::new().clean_return_data();
 
@@ -222,14 +224,16 @@ where
 {
     pub fn upgrade_async_call(self) {
         let gas = self.gas.explicit_or_gas_left(&self.env);
-        SendRawWrapper::<Api>::new().upgrade_contract(
-            &self.to,
-            gas,
-            &self.payment.to_egld_payment().value,
-            &self.data.code_source.0.into_value(&self.env),
-            self.data.code_metadata,
-            &self.data.arg_buffer,
-        );
+        self.payment.with_egld_value(|egld_value| {
+            SendRawWrapper::<Api>::new().upgrade_contract(
+                &self.to,
+                gas,
+                egld_value,
+                &self.data.code_source.0.into_value(&self.env),
+                self.data.code_metadata,
+                &self.data.arg_buffer,
+            );
+        });
     }
 }
 
@@ -252,14 +256,16 @@ where
 {
     pub fn upgrade_async_call(self) {
         let gas = self.gas.explicit_or_gas_left(&self.env);
-        SendRawWrapper::<Api>::new().upgrade_from_source_contract(
-            &self.to,
-            gas,
-            &self.payment.to_egld_payment().value,
-            &self.data.code_source.0.into_value(&self.env),
-            self.data.code_metadata,
-            &self.data.arg_buffer,
-        );
+        self.payment.with_egld_value(|egld_value| {
+            SendRawWrapper::<Api>::new().upgrade_from_source_contract(
+                &self.to,
+                gas,
+                egld_value,
+                &self.data.code_source.0.into_value(&self.env),
+                self.data.code_metadata,
+                &self.data.arg_buffer,
+            );
+        });
     }
 }
 
@@ -337,14 +343,16 @@ where
     /// For clarity, we don't want it set twice.
     pub fn upgrade_contract(self, code: &ManagedBuffer<Api>, code_metadata: CodeMetadata) {
         let gas = self.gas.explicit_or_gas_left(&self.env);
-        SendRawWrapper::<Api>::new().upgrade_contract(
-            &self.to,
-            gas,
-            &self.payment.to_egld_payment().value,
-            code,
-            code_metadata,
-            &self.data.arg_buffer,
-        );
+        self.payment.with_egld_value(|egld_value| {
+            SendRawWrapper::<Api>::new().upgrade_contract(
+                &self.to,
+                gas,
+                egld_value,
+                code,
+                code_metadata,
+                &self.data.arg_buffer,
+            );
+        });
     }
 
     /// Backwards compatibility, immitates the old API.
@@ -358,13 +366,15 @@ where
         code_metadata: CodeMetadata,
     ) {
         let gas = self.gas.explicit_or_gas_left(&self.env);
-        SendRawWrapper::<Api>::new().upgrade_from_source_contract(
-            &self.to,
-            gas,
-            &self.payment.to_egld_payment().value,
-            source_address,
-            code_metadata,
-            &self.data.arg_buffer,
-        );
+        self.payment.with_egld_value(|egld_value| {
+            SendRawWrapper::<Api>::new().upgrade_from_source_contract(
+                &self.to,
+                gas,
+                egld_value,
+                source_address,
+                code_metadata,
+                &self.data.arg_buffer,
+            );
+        });
     }
 }
diff --git a/framework/base/src/types/interaction/tx_data.rs b/framework/base/src/types/interaction/tx_data.rs
index c4a679401f..eb1e56fd7d 100644
--- a/framework/base/src/types/interaction/tx_data.rs
+++ b/framework/base/src/types/interaction/tx_data.rs
@@ -2,10 +2,7 @@ use crate::{
     api::ManagedTypeApi,
     contract_base::SendRawWrapper,
     formatter::SCLowerHex,
-    types::{
-        CodeMetadata, EgldPayment, ManagedAddress, ManagedBuffer, ManagedBufferCachedBuilder,
-        ManagedVec,
-    },
+    types::{CodeMetadata, ManagedAddress, ManagedBuffer, ManagedBufferCachedBuilder, ManagedVec},
 };
 
 use super::{FunctionCall, ManagedArgBuffer, Tx, TxEnv, TxFrom, TxGas, TxPayment, TxTo};
diff --git a/framework/base/src/types/interaction/tx_payment.rs b/framework/base/src/types/interaction/tx_payment.rs
index 055d42041b..beca0172f0 100644
--- a/framework/base/src/types/interaction/tx_payment.rs
+++ b/framework/base/src/types/interaction/tx_payment.rs
@@ -4,12 +4,12 @@ use crate::{
     formatter::FormatBuffer,
     imports::{BigUint, ManagedBuffer, ManagedBufferCachedBuilder, ManagedVec},
     types::{
-        EgldOrEsdtTokenPayment, EgldOrMultiEsdtPayment, EgldPayment, EsdtTokenPayment,
-        ManagedAddress, MultiEsdtPayment,
+        EgldOrEsdtTokenPayment, EgldOrMultiEsdtPayment, EsdtTokenPayment, ManagedAddress,
+        MultiEsdtPayment,
     },
 };
 
-use super::{FunctionCall, TxEnv, TxFrom, TxToSpecified};
+use super::{Egld, FunctionCall, TxEnv, TxFrom, TxToSpecified};
 
 #[derive(Clone)]
 pub struct AnnotatedEgldPayment<Api>
@@ -25,12 +25,8 @@ where
     Api: ManagedTypeApi,
 {
     pub fn new_egld(value: BigUint<Api>) -> Self {
-        let mut annotation = ManagedBufferCachedBuilder::default();
-        annotation.append_display(&value);
-        AnnotatedEgldPayment {
-            value,
-            annotation: annotation.into_managed_buffer(),
-        }
+        let annotation = value.to_display();
+        AnnotatedEgldPayment { value, annotation }
     }
 }
 
@@ -59,7 +55,6 @@ where
 pub trait TxPayment<Env>
 where
     Env: TxEnv,
-    Self: Clone,
 {
     fn is_no_payment(&self) -> bool;
 
@@ -71,15 +66,7 @@ where
         fc: FunctionCall<Env::Api>,
     );
 
-    fn into_full_payment_data(self) -> FullPaymentData<Env::Api>;
-}
-
-/// Marks a payment object that only contains EGLD or nothing at all.
-pub trait TxPaymentEgldOnly<Env>: TxPayment<Env>
-where
-    Env: TxEnv,
-{
-    fn to_egld_payment(self) -> EgldPayment<Env::Api>;
+    fn into_full_payment_data(self, env: &Env) -> FullPaymentData<Env::Api>;
 }
 
 impl<Env> TxPayment<Env> for ()
@@ -97,64 +84,14 @@ where
         gas_limit: u64,
         fc: FunctionCall<Env::Api>,
     ) {
-        EgldPayment::no_payment().perform_transfer_execute(env, to, gas_limit, fc);
+        Egld(BigUint::zero()).perform_transfer_execute(env, to, gas_limit, fc);
     }
 
-    fn into_full_payment_data(self) -> FullPaymentData<Env::Api> {
+    fn into_full_payment_data(self, _env: &Env) -> FullPaymentData<Env::Api> {
         FullPaymentData::default()
     }
 }
 
-impl<Env> TxPaymentEgldOnly<Env> for ()
-where
-    Env: TxEnv,
-{
-    fn to_egld_payment(self) -> EgldPayment<Env::Api> {
-        EgldPayment::no_payment()
-    }
-}
-
-impl<Env> TxPayment<Env> for EgldPayment<Env::Api>
-where
-    Env: TxEnv,
-{
-    fn is_no_payment(&self) -> bool {
-        self.value == 0u32
-    }
-
-    fn perform_transfer_execute(
-        self,
-        _env: &Env,
-        to: &ManagedAddress<Env::Api>,
-        gas_limit: u64,
-        fc: FunctionCall<Env::Api>,
-    ) {
-        let _ = SendRawWrapper::<Env::Api>::new().direct_egld_execute(
-            to,
-            &self.value,
-            gas_limit,
-            &fc.function_name,
-            &fc.arg_buffer,
-        );
-    }
-
-    fn into_full_payment_data(self) -> FullPaymentData<Env::Api> {
-        FullPaymentData {
-            egld: Some(AnnotatedEgldPayment::new_egld(self.value)),
-            multi_esdt: ManagedVec::new(),
-        }
-    }
-}
-
-impl<Env> TxPaymentEgldOnly<Env> for EgldPayment<Env::Api>
-where
-    Env: TxEnv,
-{
-    fn to_egld_payment(self) -> EgldPayment<Env::Api> {
-        self
-    }
-}
-
 impl<Env> TxPayment<Env> for EsdtTokenPayment<Env::Api>
 where
     Env: TxEnv,
@@ -173,7 +110,7 @@ where
         MultiEsdtPayment::from_single_item(self).perform_transfer_execute(env, to, gas_limit, fc);
     }
 
-    fn into_full_payment_data(self) -> FullPaymentData<Env::Api> {
+    fn into_full_payment_data(self, env: &Env) -> FullPaymentData<Env::Api> {
         FullPaymentData {
             egld: None,
             multi_esdt: MultiEsdtPayment::from_single_item(self),
@@ -205,7 +142,7 @@ where
         );
     }
 
-    fn into_full_payment_data(self) -> FullPaymentData<Env::Api> {
+    fn into_full_payment_data(self, env: &Env) -> FullPaymentData<Env::Api> {
         FullPaymentData {
             egld: None,
             multi_esdt: self,
@@ -230,18 +167,16 @@ where
     ) {
         self.map_egld_or_esdt(
             (to, fc),
-            |(to, fc), amount| {
-                EgldPayment::from(amount).perform_transfer_execute(env, to, gas_limit, fc)
-            },
+            |(to, fc), amount| Egld(amount).perform_transfer_execute(env, to, gas_limit, fc),
             |(to, fc), esdt_payment| esdt_payment.perform_transfer_execute(env, to, gas_limit, fc),
         )
     }
 
-    fn into_full_payment_data(self) -> FullPaymentData<Env::Api> {
+    fn into_full_payment_data(self, env: &Env) -> FullPaymentData<Env::Api> {
         self.map_egld_or_esdt(
             (),
-            |(), amount| TxPayment::<Env>::into_full_payment_data(EgldPayment::from(amount)),
-            |(), esdt_payment| TxPayment::<Env>::into_full_payment_data(esdt_payment),
+            |(), amount| TxPayment::<Env>::into_full_payment_data(Egld(amount), env),
+            |(), esdt_payment| TxPayment::<Env>::into_full_payment_data(esdt_payment, env),
         )
     }
 }
@@ -263,7 +198,7 @@ where
     ) {
         match self {
             EgldOrMultiEsdtPayment::Egld(egld_amount) => {
-                EgldPayment::from(egld_amount).perform_transfer_execute(env, to, gas_limit, fc)
+                Egld(egld_amount).perform_transfer_execute(env, to, gas_limit, fc)
             },
             EgldOrMultiEsdtPayment::MultiEsdt(multi_esdt_payment) => {
                 multi_esdt_payment.perform_transfer_execute(env, to, gas_limit, fc)
@@ -271,13 +206,13 @@ where
         }
     }
 
-    fn into_full_payment_data(self) -> FullPaymentData<Env::Api> {
+    fn into_full_payment_data(self, env: &Env) -> FullPaymentData<Env::Api> {
         match self {
             EgldOrMultiEsdtPayment::Egld(egld_amount) => {
-                TxPayment::<Env>::into_full_payment_data(EgldPayment::from(egld_amount))
+                TxPayment::<Env>::into_full_payment_data(Egld(egld_amount), env)
             },
             EgldOrMultiEsdtPayment::MultiEsdt(multi_esdt_payment) => {
-                TxPayment::<Env>::into_full_payment_data(multi_esdt_payment)
+                TxPayment::<Env>::into_full_payment_data(multi_esdt_payment, env)
             },
         }
     }
diff --git a/framework/base/src/types/interaction/tx_payment_egld.rs b/framework/base/src/types/interaction/tx_payment_egld.rs
new file mode 100644
index 0000000000..29a3d0781b
--- /dev/null
+++ b/framework/base/src/types/interaction/tx_payment_egld.rs
@@ -0,0 +1,105 @@
+use crate::{
+    api::{self, CallTypeApi, ManagedTypeApi},
+    contract_base::{BlockchainWrapper, SendRawWrapper},
+    types::{
+        BigUint, CodeMetadata, EgldOrEsdtTokenPayment, EgldOrMultiEsdtPayment, EsdtTokenPayment,
+        ManagedAddress, ManagedBuffer, ManagedOption, ManagedVec, MultiEsdtPayment,
+    },
+};
+use alloc::boxed::Box;
+use multiversx_sc_codec::TopEncodeMulti;
+
+use super::{
+    contract_call_exec::UNSPECIFIED_GAS_LIMIT, contract_call_trait::ContractCallBase,
+    AnnotatedEgldPayment, AnnotatedValue, AsyncCall, Code, ContractCallNoPayment,
+    ContractCallWithEgld, ContractDeploy, DeployCall, ExplicitGas, FromSource, FullPaymentData,
+    FunctionCall, ManagedArgBuffer, OriginalResultMarker, RHList, RHListAppendNoRet,
+    RHListAppendRet, RHListItem, TxCodeSource, TxCodeValue, TxData, TxDataFunctionCall,
+    TxEgldValue, TxEnv, TxFrom, TxFromSourceValue, TxFromSpecified, TxGas, TxPayment, TxProxyTrait,
+    TxResultHandler, TxScEnv, TxTo, TxToSpecified,
+};
+
+/// Indicates the EGLD payment in a transaction.
+pub struct Egld<EgldValue>(pub EgldValue);
+
+pub type EgldPayment<Api> = Egld<BigUint<Api>>;
+
+impl<Env, EgldValue> TxPayment<Env> for Egld<EgldValue>
+where
+    Env: TxEnv,
+    EgldValue: TxEgldValue<Env>,
+{
+    fn is_no_payment(&self) -> bool {
+        self.0.with_egld_value(|egld_value| egld_value == &0u32)
+    }
+
+    fn perform_transfer_execute(
+        self,
+        _env: &Env,
+        to: &ManagedAddress<Env::Api>,
+        gas_limit: u64,
+        fc: FunctionCall<Env::Api>,
+    ) {
+        self.0.with_egld_value(|egld_value| {
+            let _ = SendRawWrapper::<Env::Api>::new().direct_egld_execute(
+                to,
+                egld_value,
+                gas_limit,
+                &fc.function_name,
+                &fc.arg_buffer,
+            );
+        })
+    }
+
+    fn into_full_payment_data(self, env: &Env) -> FullPaymentData<Env::Api> {
+        FullPaymentData {
+            egld: Some(AnnotatedEgldPayment::new_egld(self.0.into_value(env))),
+            multi_esdt: ManagedVec::new(),
+        }
+    }
+}
+
+/// Marks a payment object that only contains EGLD or nothing at all.
+pub trait TxPaymentEgldOnly<Env>: TxPayment<Env>
+where
+    Env: TxEnv,
+{
+    fn with_egld_value<F, R>(&self, f: F) -> R
+    where
+        F: FnOnce(&BigUint<Env::Api>) -> R;
+
+    fn into_egld_payment(self, env: &Env) -> BigUint<Env::Api>;
+}
+
+impl<Env> TxPaymentEgldOnly<Env> for ()
+where
+    Env: TxEnv,
+{
+    fn with_egld_value<F, R>(&self, f: F) -> R
+    where
+        F: FnOnce(&BigUint<Env::Api>) -> R,
+    {
+        f(&BigUint::zero())
+    }
+
+    fn into_egld_payment(self, _env: &Env) -> BigUint<Env::Api> {
+        BigUint::zero()
+    }
+}
+
+impl<Env, EgldValue> TxPaymentEgldOnly<Env> for Egld<EgldValue>
+where
+    Env: TxEnv,
+    EgldValue: TxEgldValue<Env>,
+{
+    fn with_egld_value<F, R>(&self, f: F) -> R
+    where
+        F: FnOnce(&BigUint<Env::Api>) -> R,
+    {
+        self.0.with_egld_value(f)
+    }
+
+    fn into_egld_payment(self, env: &Env) -> BigUint<Env::Api> {
+        self.0.into_value(env)
+    }
+}
diff --git a/framework/base/src/types/interaction/tx_payment_egld_value.rs b/framework/base/src/types/interaction/tx_payment_egld_value.rs
new file mode 100644
index 0000000000..af5da4cbd3
--- /dev/null
+++ b/framework/base/src/types/interaction/tx_payment_egld_value.rs
@@ -0,0 +1,65 @@
+use crate::{
+    api::{self, CallTypeApi, ManagedTypeApi},
+    contract_base::{BlockchainWrapper, SendRawWrapper},
+    types::{
+        BigUint, CodeMetadata, EgldOrEsdtTokenPayment, EgldOrMultiEsdtPayment, EsdtTokenPayment,
+        ManagedAddress, ManagedBuffer, ManagedOption, ManagedVec, MultiEsdtPayment,
+    },
+};
+use alloc::boxed::Box;
+use multiversx_sc_codec::TopEncodeMulti;
+
+use super::{
+    contract_call_exec::UNSPECIFIED_GAS_LIMIT, contract_call_trait::ContractCallBase,
+    AnnotatedEgldPayment, AnnotatedValue, AsyncCall, Code, ContractCallNoPayment,
+    ContractCallWithEgld, ContractDeploy, DeployCall, ExplicitGas, FromSource, FullPaymentData,
+    FunctionCall, ManagedArgBuffer, OriginalResultMarker, RHList, RHListAppendNoRet,
+    RHListAppendRet, RHListItem, TxCodeSource, TxCodeValue, TxData, TxDataFunctionCall, TxEnv,
+    TxFrom, TxFromSourceValue, TxFromSpecified, TxGas, TxPayment, TxProxyTrait, TxResultHandler,
+    TxScEnv, TxTo, TxToSpecified,
+};
+
+pub trait TxEgldValue<Env>: AnnotatedValue<Env, BigUint<Env::Api>>
+where
+    Env: TxEnv,
+{
+    fn with_egld_value<F, R>(&self, f: F) -> R
+    where
+        F: FnOnce(&BigUint<Env::Api>) -> R;
+}
+
+impl<Env> TxEgldValue<Env> for BigUint<Env::Api>
+where
+    Env: TxEnv,
+{
+    fn with_egld_value<F, R>(&self, f: F) -> R
+    where
+        F: FnOnce(&BigUint<Env::Api>) -> R,
+    {
+        f(self)
+    }
+}
+
+impl<Env> TxEgldValue<Env> for &BigUint<Env::Api>
+where
+    Env: TxEnv,
+{
+    fn with_egld_value<F, R>(&self, f: F) -> R
+    where
+        F: FnOnce(&BigUint<Env::Api>) -> R,
+    {
+        f(*self)
+    }
+}
+
+impl<Env> TxEgldValue<Env> for u64
+where
+    Env: TxEnv,
+{
+    fn with_egld_value<F, R>(&self, f: F) -> R
+    where
+        F: FnOnce(&BigUint<Env::Api>) -> R,
+    {
+        f(&BigUint::<Env::Api>::from(*self))
+    }
+}
diff --git a/framework/base/src/types/interaction/tx_payment_normalize.rs b/framework/base/src/types/interaction/tx_payment_normalize.rs
index af0e540de9..015df89087 100644
--- a/framework/base/src/types/interaction/tx_payment_normalize.rs
+++ b/framework/base/src/types/interaction/tx_payment_normalize.rs
@@ -2,9 +2,8 @@ use crate::{
     api::{self, CallTypeApi, ManagedTypeApi},
     contract_base::{BlockchainWrapper, SendRawWrapper},
     types::{
-        BigUint, CodeMetadata, EgldOrEsdtTokenPayment, EgldOrMultiEsdtPayment, EgldPayment,
-        EsdtTokenPayment, ManagedAddress, ManagedBuffer, ManagedOption, ManagedVec,
-        MultiEsdtPayment,
+        BigUint, CodeMetadata, EgldOrEsdtTokenPayment, EgldOrMultiEsdtPayment, EsdtTokenPayment,
+        ManagedAddress, ManagedBuffer, ManagedOption, ManagedVec, MultiEsdtPayment,
     },
 };
 use alloc::boxed::Box;
@@ -13,10 +12,11 @@ use multiversx_sc_codec::TopEncodeMulti;
 use super::{
     contract_call_exec::UNSPECIFIED_GAS_LIMIT, contract_call_trait::ContractCallBase,
     AnnotatedValue, AsyncCall, Code, ContractCallNoPayment, ContractCallWithEgld, ContractDeploy,
-    DeployCall, ExplicitGas, FromSource, FunctionCall, ManagedArgBuffer, OriginalResultMarker,
-    RHList, RHListAppendNoRet, RHListAppendRet, RHListItem, TxCodeSource, TxCodeValue, TxData,
-    TxDataFunctionCall, TxEnv, TxFrom, TxFromSourceValue, TxFromSpecified, TxGas, TxPayment,
-    TxPaymentEgldOnly, TxProxyTrait, TxResultHandler, TxScEnv, TxTo, TxToSpecified,
+    DeployCall, Egld, ExplicitGas, FromSource, FunctionCall, ManagedArgBuffer,
+    OriginalResultMarker, RHList, RHListAppendNoRet, RHListAppendRet, RHListItem, TxCodeSource,
+    TxCodeValue, TxData, TxDataFunctionCall, TxEgldValue, TxEnv, TxFrom, TxFromSourceValue,
+    TxFromSpecified, TxGas, TxPayment, TxPaymentEgldOnly, TxProxyTrait, TxResultHandler, TxScEnv,
+    TxTo, TxToSpecified,
 };
 
 /// Defines how a payment transforms a transaction,
@@ -60,11 +60,12 @@ where
     }
 }
 
-impl<Env, From, To> TxPaymentNormalize<Env, From, To> for EgldPayment<Env::Api>
+impl<Env, From, To, EgldValue> TxPaymentNormalize<Env, From, To> for Egld<EgldValue>
 where
     Env: TxEnv,
     From: TxFrom<Env>,
     To: TxToSpecified<Env>,
+    EgldValue: TxEgldValue<Env>,
 {
     fn with_normalized<F, R>(
         self,
@@ -77,7 +78,10 @@ where
     where
         F: FnOnce(&ManagedAddress<Env::Api>, &BigUint<Env::Api>, &FunctionCall<Env::Api>) -> R,
     {
-        to.with_address_ref(env, |to_addr| f(to_addr, &self.value, &fc))
+        to.with_address_ref(env, |to_addr| {
+            self.0
+                .with_egld_value(|egld_value| f(to_addr, egld_value, &fc))
+        })
     }
 }
 
@@ -157,7 +161,7 @@ where
     {
         self.map_egld_or_esdt(
             (to, fc, f),
-            |(to, fc, f), amount| EgldPayment::from(amount).with_normalized(env, from, to, fc, f),
+            |(to, fc, f), amount| Egld(amount).with_normalized(env, from, to, fc, f),
             |(to, fc, f), esdt_payment| esdt_payment.with_normalized(env, from, to, fc, f),
         )
     }
@@ -182,7 +186,7 @@ where
     {
         match self {
             EgldOrMultiEsdtPayment::Egld(egld_amount) => {
-                EgldPayment::from(egld_amount).with_normalized(env, from, to, fc, f)
+                Egld(egld_amount).with_normalized(env, from, to, fc, f)
             },
             EgldOrMultiEsdtPayment::MultiEsdt(multi_esdt_payment) => {
                 multi_esdt_payment.with_normalized(env, from, to, fc, f)
diff --git a/framework/base/src/types/managed/basic/big_uint.rs b/framework/base/src/types/managed/basic/big_uint.rs
index 4e1d286908..5f32388093 100644
--- a/framework/base/src/types/managed/basic/big_uint.rs
+++ b/framework/base/src/types/managed/basic/big_uint.rs
@@ -11,8 +11,8 @@ use crate::{
         NestedDecodeInput, NestedEncode, NestedEncodeOutput, TopDecode, TopDecodeInput, TopEncode,
         TopEncodeOutput, TryStaticCast,
     },
-    formatter::{hex_util::encode_bytes_as_hex, FormatByteReceiver, SCDisplay},
-    types::{heap::BoxedBytes, ManagedBuffer, ManagedType},
+    formatter::{hex_util::encode_bytes_as_hex, FormatBuffer, FormatByteReceiver, SCDisplay},
+    types::{heap::BoxedBytes, ManagedBuffer, ManagedBufferCachedBuilder, ManagedType},
 };
 
 use super::cast_to_i64::cast_to_i64;
@@ -307,6 +307,15 @@ impl<M: ManagedTypeApi> SCDisplay for BigUint<M> {
     }
 }
 
+impl<M: ManagedTypeApi> BigUint<M> {
+    /// Creates to a managed buffer containing the textual representation of the number.
+    pub fn to_display(&self) -> ManagedBuffer<M> {
+        let mut result = ManagedBufferCachedBuilder::new_from_slice(&[]);
+        result.append_display(self);
+        result.into_managed_buffer()
+    }
+}
+
 impl<M: ManagedTypeApi> core::fmt::Debug for BigUint<M> {
     fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
         f.debug_struct("BigUint")
diff --git a/framework/base/src/types/managed/wrapped/egld_payment.rs b/framework/base/src/types/managed/wrapped/egld_payment.rs
deleted file mode 100644
index f4c190e899..0000000000
--- a/framework/base/src/types/managed/wrapped/egld_payment.rs
+++ /dev/null
@@ -1,30 +0,0 @@
-use crate::{api::ManagedTypeApi, types::BigUint};
-
-/// Simple newtype wrapper around a BigUint value.
-///
-/// Its purpose is to indicate
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub struct EgldPayment<Api>
-where
-    Api: ManagedTypeApi + 'static,
-{
-    pub value: BigUint<Api>,
-}
-
-impl<Api> From<BigUint<Api>> for EgldPayment<Api>
-where
-    Api: ManagedTypeApi + 'static,
-{
-    fn from(value: BigUint<Api>) -> Self {
-        EgldPayment { value }
-    }
-}
-
-impl<Api> EgldPayment<Api>
-where
-    Api: ManagedTypeApi + 'static,
-{
-    pub fn no_payment() -> Self {
-        EgldPayment::from(BigUint::zero())
-    }
-}
diff --git a/framework/base/src/types/managed/wrapped/mod.rs b/framework/base/src/types/managed/wrapped/mod.rs
index dee1161f44..8ac485fa38 100644
--- a/framework/base/src/types/managed/wrapped/mod.rs
+++ b/framework/base/src/types/managed/wrapped/mod.rs
@@ -1,7 +1,6 @@
 mod egld_or_esdt_token_identifier;
 mod egld_or_esdt_token_payment;
 mod egld_or_multi_esdt_payment;
-mod egld_payment;
 mod encoded_managed_vec_item;
 mod esdt_token_data;
 mod esdt_token_payment;
@@ -22,7 +21,6 @@ mod token_identifier;
 pub use egld_or_esdt_token_identifier::EgldOrEsdtTokenIdentifier;
 pub use egld_or_esdt_token_payment::EgldOrEsdtTokenPayment;
 pub use egld_or_multi_esdt_payment::EgldOrMultiEsdtPayment;
-pub use egld_payment::EgldPayment;
 pub(crate) use encoded_managed_vec_item::EncodedManagedVecItem;
 pub use esdt_token_data::EsdtTokenData;
 pub use esdt_token_payment::{EsdtTokenPayment, MultiEsdtPayment};
diff --git a/framework/scenario/src/facade/world_tx/scenario_env_util.rs b/framework/scenario/src/facade/world_tx/scenario_env_util.rs
index 19776e9a0d..2e75fa3c5d 100644
--- a/framework/scenario/src/facade/world_tx/scenario_env_util.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_env_util.rs
@@ -64,7 +64,7 @@ where
         step.tx.arguments.push(arg.to_vec().into());
     }
 
-    let full_payment_data = payment.into_full_payment_data();
+    let full_payment_data = payment.into_full_payment_data(env);
     if let Some(annotated_egld_payment) = full_payment_data.egld {
         step.tx.egld_value = annotated_egld_payment.into();
     }
@@ -93,7 +93,7 @@ where
         step.tx.arguments.push(arg.to_vec().into());
     }
 
-    let full_payment_data = payment.into_full_payment_data();
+    let full_payment_data = payment.into_full_payment_data(env);
     if let Some(annotated_egld_payment) = full_payment_data.egld {
         step.tx.egld_value = annotated_egld_payment.into();
     }
@@ -134,7 +134,7 @@ where
         .from(address_annotated(env, from))
         .to(address_annotated(env, to));
 
-    let full_payment_data = payment.into_full_payment_data();
+    let full_payment_data = payment.into_full_payment_data(env);
     if let Some(annotated_egld_payment) = full_payment_data.egld {
         step.tx.egld_value = annotated_egld_payment.into();
     }

From 92c188695c28d136c6fbffe43c510ba5d7d0aca7 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 22 Mar 2024 03:49:11 +0200
Subject: [PATCH 0519/1254] unified syntax - replaced direct_egld

---
 contracts/benchmarks/send-tx-repeat/src/send_tx_repeat.rs     | 2 +-
 contracts/core/wegld-swap/src/wegld.rs                        | 2 +-
 contracts/examples/crypto-bubbles/src/crypto_bubbles.rs       | 2 +-
 contracts/examples/ping-pong-egld/src/ping_pong.rs            | 4 ++--
 contracts/feature-tests/composability/forwarder/src/esdt.rs   | 2 +-
 .../composability/forwarder/src/forwarder_main.rs             | 2 +-
 contracts/feature-tests/composability/forwarder/src/nft.rs    | 2 +-
 contracts/feature-tests/composability/forwarder/src/sft.rs    | 2 +-
 .../feature-tests/composability/local-esdt-and-nft/src/lib.rs | 4 ++--
 9 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/contracts/benchmarks/send-tx-repeat/src/send_tx_repeat.rs b/contracts/benchmarks/send-tx-repeat/src/send_tx_repeat.rs
index da74343a01..ade5321f68 100644
--- a/contracts/benchmarks/send-tx-repeat/src/send_tx_repeat.rs
+++ b/contracts/benchmarks/send-tx-repeat/src/send_tx_repeat.rs
@@ -11,7 +11,7 @@ pub trait SendTxRepeat {
     #[endpoint]
     fn repeat(&self, to: ManagedAddress, amount: BigUint, times: usize) {
         for _ in 0..times {
-            self.send().direct_egld(&to, &amount);
+            self.tx().to(&to).egld(&amount).transfer();
         }
     }
 }
diff --git a/contracts/core/wegld-swap/src/wegld.rs b/contracts/core/wegld-swap/src/wegld.rs
index 4b12bbc80a..e31a6d0e87 100644
--- a/contracts/core/wegld-swap/src/wegld.rs
+++ b/contracts/core/wegld-swap/src/wegld.rs
@@ -50,7 +50,7 @@ pub trait EgldEsdtSwap: multiversx_sc_modules::pause::PauseModule {
 
         // 1 wrapped eGLD = 1 eGLD, so we pay back the same amount
         let caller = self.blockchain().get_caller();
-        self.send().direct_egld(&caller, &payment_amount);
+        self.tx().to(&caller).egld(&payment_amount).transfer();
     }
 
     #[view(getLockedEgldBalance)]
diff --git a/contracts/examples/crypto-bubbles/src/crypto_bubbles.rs b/contracts/examples/crypto-bubbles/src/crypto_bubbles.rs
index da481fd273..35b687f2cc 100644
--- a/contracts/examples/crypto-bubbles/src/crypto_bubbles.rs
+++ b/contracts/examples/crypto-bubbles/src/crypto_bubbles.rs
@@ -38,7 +38,7 @@ pub trait CryptoBubbles {
             *balance -= amount;
         });
 
-        self.send().direct_egld(player, amount);
+        self.tx().to(player).egld(amount).transfer();
 
         self.withdraw_event(player, amount);
     }
diff --git a/contracts/examples/ping-pong-egld/src/ping_pong.rs b/contracts/examples/ping-pong-egld/src/ping_pong.rs
index d2d84546de..683c2a2ed5 100644
--- a/contracts/examples/ping-pong-egld/src/ping_pong.rs
+++ b/contracts/examples/ping-pong-egld/src/ping_pong.rs
@@ -107,8 +107,8 @@ pub trait PingPong {
             UserStatus::Registered => {
                 self.user_status(user_id).set(UserStatus::Withdrawn);
                 if let Some(user_address) = self.user_mapper().get_user_address(user_id) {
-                    self.send()
-                        .direct_egld(&user_address, &self.ping_amount().get());
+                    let amount = self.ping_amount().get();
+                    self.tx().to(user_address).egld(amount).transfer();
                     Result::Ok(())
                 } else {
                     Result::Err("unknown user")
diff --git a/contracts/feature-tests/composability/forwarder/src/esdt.rs b/contracts/feature-tests/composability/forwarder/src/esdt.rs
index ed809e514a..ae9e366720 100644
--- a/contracts/feature-tests/composability/forwarder/src/esdt.rs
+++ b/contracts/feature-tests/composability/forwarder/src/esdt.rs
@@ -135,7 +135,7 @@ pub trait ForwarderEsdtModule: storage::ForwarderStorageModule {
             ManagedAsyncCallResult::Err(message) => {
                 // return issue cost to the caller
                 if token_identifier.is_egld() && returned_tokens > 0 {
-                    self.send().direct_egld(caller, &returned_tokens);
+                    self.tx().to(caller).egld(&returned_tokens).transfer();
                 }
 
                 self.last_error_message().set(&message.err_msg);
diff --git a/contracts/feature-tests/composability/forwarder/src/forwarder_main.rs b/contracts/feature-tests/composability/forwarder/src/forwarder_main.rs
index 71ddd886df..ee8403fd9a 100644
--- a/contracts/feature-tests/composability/forwarder/src/forwarder_main.rs
+++ b/contracts/feature-tests/composability/forwarder/src/forwarder_main.rs
@@ -36,6 +36,6 @@ pub trait Forwarder:
 
     #[endpoint]
     fn send_egld(&self, to: &ManagedAddress, amount: &BigUint) {
-        self.send().direct_egld(to, amount);
+        self.tx().to(to).egld(amount).transfer();
     }
 }
diff --git a/contracts/feature-tests/composability/forwarder/src/nft.rs b/contracts/feature-tests/composability/forwarder/src/nft.rs
index 97d7a2dbd2..95ab6cfeed 100644
--- a/contracts/feature-tests/composability/forwarder/src/nft.rs
+++ b/contracts/feature-tests/composability/forwarder/src/nft.rs
@@ -90,7 +90,7 @@ pub trait ForwarderNftModule: storage::ForwarderStorageModule {
                 let (token_identifier, returned_tokens) =
                     self.call_value().egld_or_single_fungible_esdt();
                 if token_identifier.is_egld() && returned_tokens > 0 {
-                    self.send().direct_egld(caller, &returned_tokens);
+                    self.tx().to(caller).egld(&returned_tokens).transfer();
                 }
 
                 self.last_error_message().set(&message.err_msg);
diff --git a/contracts/feature-tests/composability/forwarder/src/sft.rs b/contracts/feature-tests/composability/forwarder/src/sft.rs
index 12e1a2f431..77b8d8b37c 100644
--- a/contracts/feature-tests/composability/forwarder/src/sft.rs
+++ b/contracts/feature-tests/composability/forwarder/src/sft.rs
@@ -47,7 +47,7 @@ pub trait ForwarderSftModule: storage::ForwarderStorageModule {
                 let (token_identifier, returned_tokens) =
                     self.call_value().egld_or_single_fungible_esdt();
                 if token_identifier.is_egld() && returned_tokens > 0 {
-                    self.send().direct_egld(caller, &returned_tokens);
+                    self.tx().to(caller).egld(&returned_tokens).transfer();
                 }
 
                 self.last_error_message().set(&message.err_msg);
diff --git a/contracts/feature-tests/composability/local-esdt-and-nft/src/lib.rs b/contracts/feature-tests/composability/local-esdt-and-nft/src/lib.rs
index 235e3cde63..e65fd789b4 100644
--- a/contracts/feature-tests/composability/local-esdt-and-nft/src/lib.rs
+++ b/contracts/feature-tests/composability/local-esdt-and-nft/src/lib.rs
@@ -287,7 +287,7 @@ pub trait LocalEsdtAndEsdtNft {
             ManagedAsyncCallResult::Err(message) => {
                 // return issue cost to the caller
                 if token_identifier.is_egld() && returned_tokens > 0 {
-                    self.send().direct_egld(caller, &returned_tokens);
+                    self.tx().to(caller).egld(&returned_tokens).transfer();
                 }
 
                 self.last_error_message().set(&message.err_msg);
@@ -311,7 +311,7 @@ pub trait LocalEsdtAndEsdtNft {
                 let (token_identifier, returned_tokens) =
                     self.call_value().egld_or_single_fungible_esdt();
                 if token_identifier.is_egld() && returned_tokens > 0 {
-                    self.send().direct_egld(caller, &returned_tokens);
+                    self.tx().to(caller).egld(&returned_tokens).transfer();
                 }
 
                 self.last_error_message().set(&message.err_msg);

From 4519aca4ca4b90911cd5d72aa511b3d045e1175f Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 22 Mar 2024 14:22:23 +0200
Subject: [PATCH 0520/1254] cargo update

---
 Cargo.lock | 257 ++++++++++++++++++++++++++---------------------------
 1 file changed, 127 insertions(+), 130 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 3c912fe3ca..cb6a9f3e5b 100755
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -62,9 +62,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
 
 [[package]]
 name = "aho-corasick"
-version = "1.1.2"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0"
+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
 dependencies = [
  "memchr",
 ]
@@ -88,9 +88,9 @@ dependencies = [
 
 [[package]]
 name = "anstream"
-version = "0.6.11"
+version = "0.6.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e2e1ebcb11de5c03c67de28a7df593d32191b44939c482e97702baaaa6ab6a5"
+checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb"
 dependencies = [
  "anstyle",
  "anstyle-parse",
@@ -136,9 +136,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.79"
+version = "1.0.81"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca"
+checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247"
 
 [[package]]
 name = "arrayvec"
@@ -154,9 +154,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "backtrace"
-version = "0.3.69"
+version = "0.3.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837"
+checksum = "95d8e92cac0961e91dbd517496b00f7e9b92363dbe6d42c3198268323798860c"
 dependencies = [
  "addr2line",
  "cc",
@@ -312,9 +312,9 @@ dependencies = [
 
 [[package]]
 name = "bstr"
-version = "1.9.0"
+version = "1.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c48f0051a4b4c5e0b6d365cd04af53aeaa209e3cc15ec2cdb69e73cc87fbd0dc"
+checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706"
 dependencies = [
  "memchr",
  "serde",
@@ -338,9 +338,9 @@ dependencies = [
 
 [[package]]
 name = "bumpalo"
-version = "3.14.0"
+version = "3.15.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec"
+checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa"
 
 [[package]]
 name = "byteorder"
@@ -356,12 +356,9 @@ checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223"
 
 [[package]]
 name = "cc"
-version = "1.0.83"
+version = "1.0.90"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0"
-dependencies = [
- "libc",
-]
+checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5"
 
 [[package]]
 name = "cfg-if"
@@ -406,9 +403,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.4.18"
+version = "4.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e578d6ec4194633722ccf9544794b71b1385c3c027efe0c55db226fc880865c"
+checksum = "949626d00e063efc93b6dca932419ceb5432f99769911c0b995f7e884c778813"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -416,9 +413,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.4.18"
+version = "4.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4df4df40ec50c46000231c914968278b1eb05098cf8f1b3a518a95030e71d1c7"
+checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4"
 dependencies = [
  "anstream",
  "anstyle",
@@ -428,9 +425,9 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.4.7"
+version = "4.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442"
+checksum = "90239a040c80f5e14809ca132ddc4176ab33d5e17e49691793296e3fcb34d72f"
 dependencies = [
  "heck",
  "proc-macro2",
@@ -440,9 +437,9 @@ dependencies = [
 
 [[package]]
 name = "clap_lex"
-version = "0.6.0"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1"
+checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce"
 
 [[package]]
 name = "colorchoice"
@@ -528,9 +525,9 @@ dependencies = [
 
 [[package]]
 name = "crc32fast"
-version = "1.3.2"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d"
+checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa"
 dependencies = [
  "cfg-if",
 ]
@@ -712,9 +709,9 @@ dependencies = [
 
 [[package]]
 name = "either"
-version = "1.9.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
+checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a"
 
 [[package]]
 name = "empty"
@@ -760,9 +757,9 @@ dependencies = [
 
 [[package]]
 name = "env_logger"
-version = "0.11.1"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05e7cf40684ae96ade6232ed84582f40ce0a66efcd43a5117aef610534f8e0b8"
+checksum = "38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9"
 dependencies = [
  "anstream",
  "anstyle",
@@ -1226,9 +1223,9 @@ dependencies = [
 
 [[package]]
 name = "h2"
-version = "0.3.24"
+version = "0.3.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9"
+checksum = "4fbd2820c5e49886948654ab546d0688ff24530286bdcf8fca3cefb16d4618eb"
 dependencies = [
  "bytes",
  "fnv",
@@ -1251,15 +1248,15 @@ checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 
 [[package]]
 name = "heck"
-version = "0.4.1"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 
 [[package]]
 name = "hermit-abi"
-version = "0.3.5"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0c62115964e08cb8039170eb33c1d0e2388a256930279edca206fff675f82c3"
+checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
 
 [[package]]
 name = "hex"
@@ -1284,9 +1281,9 @@ dependencies = [
 
 [[package]]
 name = "http"
-version = "0.2.11"
+version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb"
+checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1"
 dependencies = [
  "bytes",
  "fnv",
@@ -1387,9 +1384,9 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.2.2"
+version = "2.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "824b2ae422412366ba479e8111fd301f7b5faece8149317bb81925979a53f520"
+checksum = "7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4"
 dependencies = [
  "equivalent",
  "hashbrown",
@@ -1432,9 +1429,9 @@ checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c"
 
 [[package]]
 name = "js-sys"
-version = "0.3.68"
+version = "0.3.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "406cda4b368d531c842222cf9d2600a9a4acce8d29423695379c6868a143a9ee"
+checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -1590,9 +1587,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.20"
+version = "0.4.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
+checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
 
 [[package]]
 name = "lottery-erc20"
@@ -1684,9 +1681,9 @@ dependencies = [
 
 [[package]]
 name = "mio"
-version = "0.8.10"
+version = "0.8.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09"
+checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
 dependencies = [
  "libc",
  "wasi 0.11.0+wasi-snapshot-preview1",
@@ -2110,15 +2107,15 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "opaque-debug"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
+checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381"
 
 [[package]]
 name = "openssl"
-version = "0.10.63"
+version = "0.10.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15c9d69dd87a29568d4d017cfe8ec518706046a05184e5aea92d0af890b803c8"
+checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f"
 dependencies = [
  "bitflags 2.4.2",
  "cfg-if",
@@ -2148,9 +2145,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.99"
+version = "0.9.101"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22e1bf214306098e4832460f797824c05d25aacdf896f64a985fb0fd992454ae"
+checksum = "dda2b0f344e78efc2facf7d195d098df0dd72151b26ab98da807afc26c198dff"
 dependencies = [
  "cc",
  "libc",
@@ -2316,9 +2313,9 @@ dependencies = [
 
 [[package]]
 name = "pkg-config"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2900ede94e305130c13ddd391e0ab7cbaeb783945ae07a279c268cb05109c6cb"
+checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
 
 [[package]]
 name = "ppv-lite86"
@@ -2564,9 +2561,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.5"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd"
+checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -2581,9 +2578,9 @@ checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
 
 [[package]]
 name = "reqwest"
-version = "0.11.24"
+version = "0.11.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6920094eb85afde5e4a138be3f2de8bbdf28000f0029e72c45025a56b042251"
+checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62"
 dependencies = [
  "base64",
  "bytes",
@@ -2706,9 +2703,9 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.38.31"
+version = "0.38.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949"
+checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89"
 dependencies = [
  "bitflags 2.4.2",
  "errno",
@@ -2728,9 +2725,9 @@ dependencies = [
 
 [[package]]
 name = "ryu"
-version = "1.0.16"
+version = "1.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c"
+checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1"
 
 [[package]]
 name = "same-file"
@@ -2815,9 +2812,9 @@ dependencies = [
 
 [[package]]
 name = "semver"
-version = "1.0.21"
+version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0"
+checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca"
 
 [[package]]
 name = "send-tx-repeat"
@@ -2837,18 +2834,18 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.196"
+version = "1.0.197"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "870026e60fa08c69f064aa766c10f10b1d62db9ccd4d0abb206472bee0ce3b32"
+checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.196"
+version = "1.0.197"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67"
+checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2857,9 +2854,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.113"
+version = "1.0.114"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69801b70b1c3dac963ecb03a364ba0ceda9cf60c71cfe475e99864759c8b8a79"
+checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0"
 dependencies = [
  "indexmap",
  "itoa",
@@ -2993,18 +2990,18 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "socket2"
-version = "0.5.5"
+version = "0.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9"
+checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871"
 dependencies = [
  "libc",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -3025,9 +3022,9 @@ dependencies = [
 
 [[package]]
 name = "strsim"
-version = "0.10.0"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
+checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01"
 
 [[package]]
 name = "subtle"
@@ -3075,9 +3072,9 @@ dependencies = [
 
 [[package]]
 name = "tempfile"
-version = "3.10.0"
+version = "3.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a365e8cd18e44762ef95d87f284f4b5cd04107fec2ff3052bd6a3e6069669e67"
+checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1"
 dependencies = [
  "cfg-if",
  "fastrand",
@@ -3172,9 +3169,9 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.8.10"
+version = "0.8.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a9aad4a3066010876e8dcf5a8a06e70a558751117a145c6ce2b82c2e2054290"
+checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3"
 dependencies = [
  "indexmap",
  "serde",
@@ -3194,9 +3191,9 @@ dependencies = [
 
 [[package]]
 name = "toml_edit"
-version = "0.22.4"
+version = "0.22.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c9ffdf896f8daaabf9b66ba8e77ea1ed5ed0f72821b398aba62352e95062951"
+checksum = "8e40bb779c5187258fd7aad0eb68cb8706a0a81fa712fbea808ab43c4b8374c4"
 dependencies = [
  "indexmap",
  "serde",
@@ -3369,9 +3366,9 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "walkdir"
-version = "2.4.0"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee"
+checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
 dependencies = [
  "same-file",
  "winapi-util",
@@ -3400,9 +3397,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.91"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1e124130aee3fb58c5bdd6b639a0509486b0338acaaae0c84a5124b0f588b7f"
+checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"
 dependencies = [
  "cfg-if",
  "wasm-bindgen-macro",
@@ -3410,9 +3407,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.91"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9e7e1900c352b609c8488ad12639a311045f40a35491fb69ba8c12f758af70b"
+checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da"
 dependencies = [
  "bumpalo",
  "log",
@@ -3425,9 +3422,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.41"
+version = "0.4.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "877b9c3f61ceea0e56331985743b13f3d25c406a7098d45180fb5f09bc19ed97"
+checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -3437,9 +3434,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.91"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b30af9e2d358182b5c7449424f017eba305ed32a7010509ede96cdc4696c46ed"
+checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -3447,9 +3444,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.91"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "642f325be6301eb8107a83d12a8ac6c1e1c54345a7ef1a9261962dfefda09e66"
+checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3460,15 +3457,15 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.91"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f186bd2dcf04330886ce82d6f33dd75a7bfcf69ecf5763b89fcde53b6ac9838"
+checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
 
 [[package]]
 name = "wasmparser"
-version = "0.121.0"
+version = "0.121.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "953cf6a7606ab31382cb1caa5ae403e77ba70c7f8e12eeda167e7040d42bfda8"
+checksum = "9dbe55c8f9d0dbd25d9447a5a889ff90c0cc3feaa7395310d3d826b2c703eaab"
 dependencies = [
  "bitflags 2.4.2",
  "indexmap",
@@ -3477,9 +3474,9 @@ dependencies = [
 
 [[package]]
 name = "wasmprinter"
-version = "0.2.78"
+version = "0.2.80"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05e32c13c59fdc64d3f6998a1d52eb1d362b6904a88b754190ccb85661ad577a"
+checksum = "60e73986a6b7fdfedb7c5bf9e7eb71135486507c8fbc4c0c42cffcb6532988b7"
 dependencies = [
  "anyhow",
  "wasmparser",
@@ -3487,9 +3484,9 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.68"
+version = "0.3.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96565907687f7aceb35bc5fc03770a8a0471d82e479f25832f54a0e3f4b28446"
+checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -3541,7 +3538,7 @@ version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
 dependencies = [
- "windows-targets 0.52.0",
+ "windows-targets 0.52.4",
 ]
 
 [[package]]
@@ -3561,17 +3558,17 @@ dependencies = [
 
 [[package]]
 name = "windows-targets"
-version = "0.52.0"
+version = "0.52.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd"
+checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b"
 dependencies = [
- "windows_aarch64_gnullvm 0.52.0",
- "windows_aarch64_msvc 0.52.0",
- "windows_i686_gnu 0.52.0",
- "windows_i686_msvc 0.52.0",
- "windows_x86_64_gnu 0.52.0",
- "windows_x86_64_gnullvm 0.52.0",
- "windows_x86_64_msvc 0.52.0",
+ "windows_aarch64_gnullvm 0.52.4",
+ "windows_aarch64_msvc 0.52.4",
+ "windows_i686_gnu 0.52.4",
+ "windows_i686_msvc 0.52.4",
+ "windows_x86_64_gnu 0.52.4",
+ "windows_x86_64_gnullvm 0.52.4",
+ "windows_x86_64_msvc 0.52.4",
 ]
 
 [[package]]
@@ -3582,9 +3579,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
 
 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.52.0"
+version = "0.52.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea"
+checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9"
 
 [[package]]
 name = "windows_aarch64_msvc"
@@ -3594,9 +3591,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
 
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.52.0"
+version = "0.52.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef"
+checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675"
 
 [[package]]
 name = "windows_i686_gnu"
@@ -3606,9 +3603,9 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.52.0"
+version = "0.52.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313"
+checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3"
 
 [[package]]
 name = "windows_i686_msvc"
@@ -3618,9 +3615,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.52.0"
+version = "0.52.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a"
+checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02"
 
 [[package]]
 name = "windows_x86_64_gnu"
@@ -3630,9 +3627,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.52.0"
+version = "0.52.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd"
+checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
@@ -3642,9 +3639,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.52.0"
+version = "0.52.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e"
+checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177"
 
 [[package]]
 name = "windows_x86_64_msvc"
@@ -3654,15 +3651,15 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.52.0"
+version = "0.52.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
+checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8"
 
 [[package]]
 name = "winnow"
-version = "0.5.39"
+version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5389a154b01683d28c77f8f68f49dea75f0a4da32557a58f68ee51ebba472d29"
+checksum = "dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8"
 dependencies = [
  "memchr",
 ]

From 9b0ae6867329e9aa89b927eeb3844ed173aa7cf1 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 22 Mar 2024 14:23:11 +0200
Subject: [PATCH 0521/1254] sc 0.47.8

---
 CHANGELOG.md                                  |   3 +
 Cargo.lock                                    |  18 ++--
 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 +-
 .../scenarios/stress_submit_test.scen.json    | 100 +++++++++---------
 .../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 +-
 .../wasm-alloc-mem-fail/Cargo.toml            |   2 +-
 .../wasm-alloc-mem-leaking/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 +-
 framework/base/Cargo.toml                     |   4 +-
 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         |   3 +-
 framework/scenario/Cargo.toml                 |   6 +-
 framework/snippets/Cargo.toml                 |   4 +-
 framework/wasm-adapter/Cargo.toml             |   4 +-
 tools/mxpy-snippet-generator/Cargo.toml       |   2 +-
 tools/rust-debugger/format-tests/Cargo.toml   |   4 +-
 263 files changed, 435 insertions(+), 431 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c69c506421..db5a580558 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,6 +26,9 @@ 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.8] - 2024-03-22
+- Test coverage functionality in sc-meta.
+- Removed deprecation from legacy whitebox testing framework, since it is still used extensively.
 
 ## [sc 0.47.7] - 2024-03-15
 - Template bugfix (concerning the interactor).
diff --git a/Cargo.lock b/Cargo.lock
index cb6a9f3e5b..0362d5974b 100755
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1782,7 +1782,7 @@ checksum = "b59072fa0624b55ae5ae3fa6bfa91515bbeb4ac440214bc4a509e2c8806d6e9f"
 
 [[package]]
 name = "multiversx-price-aggregator-sc"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "arrayvec",
  "getrandom 0.2.12",
@@ -1803,7 +1803,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "bitflags 2.4.2",
  "hex-literal",
@@ -1833,7 +1833,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -1844,7 +1844,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-meta"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "clap",
  "colored",
@@ -1870,14 +1870,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-scenario"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "base64",
  "bech32",
@@ -1903,7 +1903,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-snippets"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "base64",
  "env_logger",
@@ -1917,7 +1917,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "multiversx-sc",
 ]
@@ -1948,7 +1948,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-wegld-swap-sc"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "multiversx-sc",
  "multiversx-sc-modules",
diff --git a/contracts/benchmarks/large-storage/Cargo.toml b/contracts/benchmarks/large-storage/Cargo.toml
index c14636ef07..d8d51ae966 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.7"
+version = "0.47.8"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.7"
+version = "0.47.8"
 path = "../../../framework/scenario"
diff --git a/contracts/benchmarks/large-storage/meta/Cargo.toml b/contracts/benchmarks/large-storage/meta/Cargo.toml
index df4b4ca87a..fc26387f50 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.7"
+version = "0.47.8"
 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 979d575564..43578fbca6 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.7"
+version = "0.47.8"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/mappers/benchmark-common/Cargo.toml b/contracts/benchmarks/mappers/benchmark-common/Cargo.toml
index 125a2154ef..8677e1dc01 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.7"
+version = "0.47.8"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.7"
+version = "0.47.8"
 path = "../../../../framework/scenario"
diff --git a/contracts/benchmarks/mappers/linked-list-repeat/Cargo.toml b/contracts/benchmarks/mappers/linked-list-repeat/Cargo.toml
index 7d204e2520..af3d114fd2 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.7"
+version = "0.47.8"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.7"
+version = "0.47.8"
 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 fbe11e8dfb..3c360bd518 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.7"
+version = "0.47.8"
 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 c894b1c183..bb1eb11323 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.7"
+version = "0.47.8"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/mappers/map-repeat/Cargo.toml b/contracts/benchmarks/mappers/map-repeat/Cargo.toml
index 02a30108b1..18ff68251c 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.7"
+version = "0.47.8"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.7"
+version = "0.47.8"
 path = "../../../../framework/scenario"
diff --git a/contracts/benchmarks/mappers/map-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/map-repeat/meta/Cargo.toml
index bf452ee2cd..2ef4df4850 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.7"
+version = "0.47.8"
 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 c8350b0002..c49b4cfb90 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.7"
+version = "0.47.8"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/mappers/queue-repeat/Cargo.toml b/contracts/benchmarks/mappers/queue-repeat/Cargo.toml
index 484adebeb7..82615c61e9 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.7"
+version = "0.47.8"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.7"
+version = "0.47.8"
 path = "../../../../framework/scenario"
diff --git a/contracts/benchmarks/mappers/queue-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/queue-repeat/meta/Cargo.toml
index 6616ebe0ed..6c017510da 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.7"
+version = "0.47.8"
 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 5dee69f0e3..ca9077b541 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.7"
+version = "0.47.8"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/mappers/set-repeat/Cargo.toml b/contracts/benchmarks/mappers/set-repeat/Cargo.toml
index b02586fda1..cfabe4e46d 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.7"
+version = "0.47.8"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.7"
+version = "0.47.8"
 path = "../../../../framework/scenario"
diff --git a/contracts/benchmarks/mappers/set-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/set-repeat/meta/Cargo.toml
index 44f4460ec8..c722ed9b9e 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.7"
+version = "0.47.8"
 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 8582da6423..8737881c35 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.7"
+version = "0.47.8"
 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 6d514a9876..456e49050c 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.7"
+version = "0.47.8"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.7"
+version = "0.47.8"
 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 27636e6c3b..efb702f58c 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.7"
+version = "0.47.8"
 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 a32bd93768..1373a98a29 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.7"
+version = "0.47.8"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/mappers/vec-repeat/Cargo.toml b/contracts/benchmarks/mappers/vec-repeat/Cargo.toml
index 86a34d011c..66a7f34c1e 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.7"
+version = "0.47.8"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.7"
+version = "0.47.8"
 path = "../../../../framework/scenario"
diff --git a/contracts/benchmarks/mappers/vec-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/vec-repeat/meta/Cargo.toml
index 39c9156194..12c7a4952d 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.7"
+version = "0.47.8"
 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 98b52695ce..71308601eb 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.7"
+version = "0.47.8"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/send-tx-repeat/Cargo.toml b/contracts/benchmarks/send-tx-repeat/Cargo.toml
index b2228d2bb3..7284596303 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.7"
+version = "0.47.8"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.7"
+version = "0.47.8"
 path = "../../../framework/scenario"
diff --git a/contracts/benchmarks/send-tx-repeat/meta/Cargo.toml b/contracts/benchmarks/send-tx-repeat/meta/Cargo.toml
index e497927391..0bc84fbdc2 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.7"
+version = "0.47.8"
 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 ca9b654305..c0c13946cc 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.7"
+version = "0.47.8"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/str-repeat/Cargo.toml b/contracts/benchmarks/str-repeat/Cargo.toml
index b2f9886089..116327da15 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.7"
+version = "0.47.8"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.7"
+version = "0.47.8"
 path = "../../../framework/scenario"
diff --git a/contracts/benchmarks/str-repeat/meta/Cargo.toml b/contracts/benchmarks/str-repeat/meta/Cargo.toml
index 6552eff709..6792de337f 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.7"
+version = "0.47.8"
 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 0927435100..a36fe3ee2c 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.7"
+version = "0.47.8"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/core/price-aggregator/Cargo.toml b/contracts/core/price-aggregator/Cargo.toml
index 324d1192de..ed988e0663 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.7"
+version = "0.47.8"
 authors = [
     "Claudiu-Marcel Bruda <claudiu.bruda@multiversx.com>",
     "MultiversX <contact@multiversx.com>",
@@ -19,15 +19,15 @@ edition = "2021"
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "0.47.7"
+version = "0.47.8"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.47.7"
+version = "0.47.8"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.7"
+version = "0.47.8"
 path = "../../../framework/scenario"
 
 [dependencies]
diff --git a/contracts/core/price-aggregator/meta/Cargo.toml b/contracts/core/price-aggregator/meta/Cargo.toml
index 8116be6e4d..2cd9bbab1a 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.7"
+version = "0.47.8"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.47.7"
+version = "0.47.8"
 path = "../../../../framework/meta"
 default-features = false
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 a8f13f2994..6ed4ec81ac 100644
--- a/contracts/core/price-aggregator/scenarios/stress_submit_test.scen.json
+++ b/contracts/core/price-aggregator/scenarios/stress_submit_test.scen.json
@@ -1133,7 +1133,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x5f",
-                    "0xe4431c9cfb505fea",
+                    "0x7e73f7325747f41e",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1154,7 +1154,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xcca317a0b6489409",
+                    "0x67da5ce3a07967b4",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1175,7 +1175,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xd5da94d218e8b3e3",
+                    "0x42345d9c03249906",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1196,7 +1196,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x9b9f24755509abe6",
+                    "0x729cbab7559d2418",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1217,7 +1217,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x596faa56dc4d9d4e",
+                    "0x4b1f1fb91704289a",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1238,7 +1238,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x69ccc76678e2499e",
+                    "0x9041a66f9a8eddd3",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1259,7 +1259,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x0176a6a333f061",
+                    "0x119426970178f4e8",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1280,7 +1280,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xee2ede42941ffb6f",
+                    "0xa4a00453870b1413",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1301,7 +1301,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xfe5a2ca21500c94a",
+                    "0x506335784433b85b",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1322,7 +1322,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x98c16991e599ae6b",
+                    "0xa272188ead522f3c",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1343,7 +1343,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xec0197ac7c0da4a2",
+                    "0x899a358acd3a916d",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1364,7 +1364,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x4758692d635dde95",
+                    "0xa72819f377890189",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1385,7 +1385,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xfa99ca83e839c136",
+                    "0x67c7c355dbf99be8",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1406,7 +1406,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x2542eed0ad760b6f",
+                    "0xfbb7382befbf0ba3",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1427,7 +1427,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xcaa56ad357bf558a",
+                    "0x3b6e67573e4e3f73",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1448,7 +1448,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x4104ad72636fdc35",
+                    "0xf1cad9d61b5dea8e",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1469,7 +1469,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x08b6adc46d6dccf0",
+                    "0x0f125f34c142d4dd",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1490,7 +1490,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xb5c8708954d584e4",
+                    "0xe78b1d333ef1d9cb",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1511,7 +1511,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x6136e999fb83ab09",
+                    "0x2d95a8f7484f98c5",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1532,7 +1532,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x214d92d0a7450389",
+                    "0x7a97d84d6b233203",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1553,7 +1553,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xea21e03952d07af9",
+                    "0xb874fdc44ac92cff",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1574,7 +1574,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xdd822b3e1a5bb8a3",
+                    "0x8cb05ff6dcfb459f",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1595,7 +1595,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x80e2a3c4b931c4bc",
+                    "0xa402f6a3b4ee09e7",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1616,7 +1616,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x279c3fa2eeaf0fb0",
+                    "0x24f913b5c6d6d687",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1637,7 +1637,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x768021226eba1043",
+                    "0x601430ad5b35c7b2",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1658,7 +1658,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x026089384f007444",
+                    "0xa66e3496b143093d",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1679,7 +1679,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x49f7ab393052bb",
+                    "0x10fbd80dee58e58c",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1700,7 +1700,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x049afbf40fa88fb8",
+                    "0xdbe95503112f8855",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1721,7 +1721,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x6d9edf2f943d0c48",
+                    "0x799a64362d43ecb5",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1742,7 +1742,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x9fa99de813defc0c",
+                    "0xc4040f7c568dfe5f",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1763,7 +1763,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xd1d93e3611904d25",
+                    "0x5f0934092a3b285e",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1784,7 +1784,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x8696ff1edc27700e",
+                    "0xbab97635db0333b2",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1805,7 +1805,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xb20b2290aaa5a45e",
+                    "0x3a540081e9ccd62e",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1826,7 +1826,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x46f399722142c7dc",
+                    "0x05bea873f4825a82",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1847,7 +1847,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x812c7b08e5ef93bb",
+                    "0x67d016dd357634ca",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1868,7 +1868,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x9f42bd04602aabfa",
+                    "0x4d6b5212f854c77d",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1889,7 +1889,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x3313bced09c1b91f",
+                    "0x7c62a09f1a3336c8",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1910,7 +1910,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xcc71d4a051c86da1",
+                    "0x21c179faeb48f1d7",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1931,7 +1931,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x020dcbfee96f9111",
+                    "0xe7f11437e10fa779",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1952,7 +1952,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x66803b9e9fb6ae87",
+                    "0xb06dea0282c5fa22",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1973,7 +1973,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x5e784067e72d6000",
+                    "0x805ed8f4a0a71cce",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1994,7 +1994,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x1990e5a459100514",
+                    "0x483ef0b2517c0915",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -2015,7 +2015,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x643b36cf7c98aed2",
+                    "0x45e24c96cc048c8e",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -2036,7 +2036,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x19b768a5982e5d17",
+                    "0x2c9cfe97258a6099",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -2057,7 +2057,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xe8396bc4dade2e38",
+                    "0xf0c3114cbb06b7ac",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -2078,7 +2078,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xbd1b166e888f23b8",
+                    "0x9400e2a0a2b4c559",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -2099,7 +2099,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x4541ecf9e1bcd219",
+                    "0x6ff6239cf418528a",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -2120,7 +2120,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xac32e3eac4733d3e",
+                    "0x3a1e0de1fb534547",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -2141,7 +2141,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x7d7dde2542dfa2d9",
+                    "0x3a549a5c074f3805",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -2162,7 +2162,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xd2c63e8cf9db301a",
+                    "0xaebe838a44d1559e",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
diff --git a/contracts/core/price-aggregator/wasm/Cargo.toml b/contracts/core/price-aggregator/wasm/Cargo.toml
index 5a6caae0e4..b553602e97 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.7"
+version = "0.47.8"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/core/wegld-swap/Cargo.toml b/contracts/core/wegld-swap/Cargo.toml
index 011eda03bc..64157bb652 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.7"
+version = "0.47.8"
 
 authors = [
     "Dorin Iancu <dorin.iancu@multiversx.com>",
@@ -20,13 +20,13 @@ edition = "2021"
 path = "src/wegld.rs"
 
 [dependencies.multiversx-sc]
-version = "0.47.7"
+version = "0.47.8"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.47.7"
+version = "0.47.8"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.7"
+version = "0.47.8"
 path = "../../../framework/scenario"
diff --git a/contracts/core/wegld-swap/meta/Cargo.toml b/contracts/core/wegld-swap/meta/Cargo.toml
index 5544435199..213dfa0c5e 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.7"
+version = "0.47.8"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.47.7"
+version = "0.47.8"
 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 2edcc0b9b7..3dee2153c4 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.7"
+version = "0.47.8"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/adder/Cargo.toml b/contracts/examples/adder/Cargo.toml
index e5e3295387..f5a121ae40 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.7"
+version = "0.47.8"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.7"
+version = "0.47.8"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/adder/interact/Cargo.toml b/contracts/examples/adder/interact/Cargo.toml
index b82fd0a198..142f39c28c 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.7"
+version = "0.47.8"
 path = "../../../../framework/snippets"
diff --git a/contracts/examples/adder/meta/Cargo.toml b/contracts/examples/adder/meta/Cargo.toml
index 5b91c45d86..dfe91b3e7d 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.7"
+version = "0.47.8"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/examples/adder/wasm/Cargo.toml b/contracts/examples/adder/wasm/Cargo.toml
index 8d6ad9d33a..21d0226bb2 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.7"
+version = "0.47.8"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/bonding-curve-contract/Cargo.toml b/contracts/examples/bonding-curve-contract/Cargo.toml
index e49b33e18c..214b810a7f 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.7"
+version = "0.47.8"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.47.7"
+version = "0.47.8"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.7"
+version = "0.47.8"
 path = "../../../framework/scenario"
 
diff --git a/contracts/examples/bonding-curve-contract/meta/Cargo.toml b/contracts/examples/bonding-curve-contract/meta/Cargo.toml
index daa146036b..531d3b0113 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.7"
+version = "0.47.8"
 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 ed65eb737e..f575a2ff9f 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.7"
+version = "0.47.8"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/check-pause/Cargo.toml b/contracts/examples/check-pause/Cargo.toml
index b88e277df8..008b308b83 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.7"
+version = "0.47.8"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.47.7"
+version = "0.47.8"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.7"
+version = "0.47.8"
 path = "../../../framework/scenario"
 
diff --git a/contracts/examples/check-pause/meta/Cargo.toml b/contracts/examples/check-pause/meta/Cargo.toml
index f24dffa830..c4b5f792f1 100644
--- a/contracts/examples/check-pause/meta/Cargo.toml
+++ b/contracts/examples/check-pause/meta/Cargo.toml
@@ -9,6 +9,6 @@ authors = ["Alin Cruceat <alin.cruceat@multiversx.com>"]
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.47.7"
+version = "0.47.8"
 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 96ad3090db..1c40a1c120 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.7"
+version = "0.47.8"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/crowdfunding-esdt/Cargo.toml b/contracts/examples/crowdfunding-esdt/Cargo.toml
index f613fa063b..e5a85e92fb 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.7"
+version = "0.47.8"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.7"
+version = "0.47.8"
 path = "../../../framework/scenario"
 
 [dev-dependencies]
diff --git a/contracts/examples/crowdfunding-esdt/meta/Cargo.toml b/contracts/examples/crowdfunding-esdt/meta/Cargo.toml
index bd09bd4551..100c48ff0b 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.7"
+version = "0.47.8"
 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 689fec6919..2202fb5bf2 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.7"
+version = "0.47.8"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/crypto-bubbles/Cargo.toml b/contracts/examples/crypto-bubbles/Cargo.toml
index 125eaf59db..2e3590429a 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.7"
+version = "0.47.8"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.7"
+version = "0.47.8"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/crypto-bubbles/meta/Cargo.toml b/contracts/examples/crypto-bubbles/meta/Cargo.toml
index e05a6f0fd3..a1f11927a9 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.7"
+version = "0.47.8"
 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 d1fd604852..7075fe64da 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.7"
+version = "0.47.8"
 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 c76b6d4ef0..23eaa019f3 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.7"
+version = "0.47.8"
 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 89e113c11e..cca99947d8 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.7"
+version = "0.47.8"
 path = "../../../../../framework/base"
diff --git a/contracts/examples/crypto-kitties/kitty-auction/Cargo.toml b/contracts/examples/crypto-kitties/kitty-auction/Cargo.toml
index e6d49ccec0..9ee13ed08d 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.7"
+version = "0.47.8"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.7"
+version = "0.47.8"
 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 9928efcd4f..aaf92d9d1d 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.7"
+version = "0.47.8"
 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 df1952bd3c..fd1bc05228 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.7"
+version = "0.47.8"
 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 a73684282c..75ffc5989c 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.7"
+version = "0.47.8"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.7"
+version = "0.47.8"
 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 b69a84ab3f..17514bb97f 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.7"
+version = "0.47.8"
 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 ce608c6fcc..ad70a987be 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.7"
+version = "0.47.8"
 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 40ccfe9d17..9d7e08a9cf 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.7"
+version = "0.47.8"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.7"
+version = "0.47.8"
 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 51c19d26be..582fa4313f 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.7"
+version = "0.47.8"
 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 edd45c233c..6c7f572232 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.7"
+version = "0.47.8"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/crypto-zombies/Cargo.toml b/contracts/examples/crypto-zombies/Cargo.toml
index 5b3a3ec3b4..63d67d258b 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.7"
+version = "0.47.8"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.7"
+version = "0.47.8"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/crypto-zombies/meta/Cargo.toml b/contracts/examples/crypto-zombies/meta/Cargo.toml
index ab9e646a43..8a3ac45fa8 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.7"
+version = "0.47.8"
 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 e9e2eed377..fd7179dea8 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.7"
+version = "0.47.8"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/digital-cash/Cargo.toml b/contracts/examples/digital-cash/Cargo.toml
index c3e97b9d50..d9bdd6b52c 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.7"
+version = "0.47.8"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.7"
+version = "0.47.8"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/digital-cash/meta/Cargo.toml b/contracts/examples/digital-cash/meta/Cargo.toml
index 6a47014d9a..5692d13296 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.7"
+version = "0.47.8"
 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 14405201e3..1a990dca60 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.7"
+version = "0.47.8"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/empty/Cargo.toml b/contracts/examples/empty/Cargo.toml
index d385cb0ae7..5ed6cf966f 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.7"
+version = "0.47.8"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.7"
+version = "0.47.8"
 path = "../../../framework/scenario"
 
 [dev-dependencies]
diff --git a/contracts/examples/empty/meta/Cargo.toml b/contracts/examples/empty/meta/Cargo.toml
index 805066b5c8..c27adb6ad1 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.7"
+version = "0.47.8"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/examples/empty/wasm/Cargo.toml b/contracts/examples/empty/wasm/Cargo.toml
index 3070e27098..1c3cae4528 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.7"
+version = "0.47.8"
 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 03f96eba03..e56c0ace06 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.7"
+version = "0.47.8"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.7"
+version = "0.47.8"
 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 684ace8d06..b774dd1607 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.7"
+version = "0.47.8"
 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 0afb5f35f9..1c81968938 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.7"
+version = "0.47.8"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/factorial/Cargo.toml b/contracts/examples/factorial/Cargo.toml
index 3c39cfb14b..bec69a21be 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.7"
+version = "0.47.8"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.7"
+version = "0.47.8"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/factorial/meta/Cargo.toml b/contracts/examples/factorial/meta/Cargo.toml
index e781b294dd..746a2c9143 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.7"
+version = "0.47.8"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/examples/factorial/wasm/Cargo.toml b/contracts/examples/factorial/wasm/Cargo.toml
index e8bdd8a99a..550140a626 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.7"
+version = "0.47.8"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/fractional-nfts/Cargo.toml b/contracts/examples/fractional-nfts/Cargo.toml
index 75fc12bcef..0709e73516 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.7"
+version = "0.47.8"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.47.7"
+version = "0.47.8"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.7"
+version = "0.47.8"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/fractional-nfts/meta/Cargo.toml b/contracts/examples/fractional-nfts/meta/Cargo.toml
index e3ea4de942..9026904365 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.7"
+version = "0.47.8"
 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 ef3c3f47db..26ca3dc694 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.7"
+version = "0.47.8"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/lottery-esdt/Cargo.toml b/contracts/examples/lottery-esdt/Cargo.toml
index 839f52d773..51341883a4 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.7"
+version = "0.47.8"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.7"
+version = "0.47.8"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/lottery-esdt/meta/Cargo.toml b/contracts/examples/lottery-esdt/meta/Cargo.toml
index 7e5658adbd..f528e0359d 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.7"
+version = "0.47.8"
 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 b80ccdb610..c780b8253f 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.7"
+version = "0.47.8"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/multisig/Cargo.toml b/contracts/examples/multisig/Cargo.toml
index 8ca32c7c05..5a4ac52971 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.7"
+version = "0.47.8"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.47.7"
+version = "0.47.8"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.7"
+version = "0.47.8"
 path = "../../../framework/scenario"
 
 [dev-dependencies.adder]
@@ -27,7 +27,7 @@ path = "../adder"
 path = "../factorial"
 
 [dev-dependencies.multiversx-wegld-swap-sc]
-version = "0.47.7"
+version = "0.47.8"
 path = "../../core/wegld-swap"
 
 [dev-dependencies]
diff --git a/contracts/examples/multisig/interact/Cargo.toml b/contracts/examples/multisig/interact/Cargo.toml
index ecef6173f0..06f7debcdc 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.7"
+version = "0.47.8"
 path = "../../../../contracts/modules"
 
 [dependencies.multiversx-sc-snippets]
-version = "0.47.7"
+version = "0.47.8"
 path = "../../../../framework/snippets"
 
 [dependencies.multiversx-sc-scenario]
-version = "=0.47.7"
+version = "=0.47.8"
 path = "../../../../framework/scenario"
diff --git a/contracts/examples/multisig/meta/Cargo.toml b/contracts/examples/multisig/meta/Cargo.toml
index 7fa9cc2c46..67b228a5dd 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.7"
+version = "0.47.8"
 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 ca6d88e1d0..004b0e97f5 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.7"
+version = "0.47.8"
 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 f7e2721efb..28b230710b 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.7"
+version = "0.47.8"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/multisig/wasm/Cargo.toml b/contracts/examples/multisig/wasm/Cargo.toml
index 6b844797f2..3a2268d369 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.7"
+version = "0.47.8"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/nft-minter/Cargo.toml b/contracts/examples/nft-minter/Cargo.toml
index aff73e25c2..89ee1e27f1 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.7"
+version = "0.47.8"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.7"
+version = "0.47.8"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/nft-minter/meta/Cargo.toml b/contracts/examples/nft-minter/meta/Cargo.toml
index 756b066668..6e3b2dfc81 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.7"
+version = "0.47.8"
 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 069fba528a..d9001e8b30 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.7"
+version = "0.47.8"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/nft-storage-prepay/Cargo.toml b/contracts/examples/nft-storage-prepay/Cargo.toml
index a368d88336..ee4e7cbf03 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.7"
+version = "0.47.8"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.7"
+version = "0.47.8"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/nft-storage-prepay/meta/Cargo.toml b/contracts/examples/nft-storage-prepay/meta/Cargo.toml
index 0e49db9a62..faa27e4d8b 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.7"
+version = "0.47.8"
 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 05644d41ae..1e5478ddae 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.7"
+version = "0.47.8"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/nft-subscription/Cargo.toml b/contracts/examples/nft-subscription/Cargo.toml
index df21696927..deb7f32494 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.7"
+version = "0.47.8"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.47.7"
+version = "0.47.8"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.7"
+version = "0.47.8"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/nft-subscription/meta/Cargo.toml b/contracts/examples/nft-subscription/meta/Cargo.toml
index 89dffa7dfa..2d002e2afb 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.7"
+version = "0.47.8"
 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 2cf17a24e4..9d6afb20b4 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.7"
+version = "0.47.8"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/order-book/factory/Cargo.toml b/contracts/examples/order-book/factory/Cargo.toml
index ca12b9cc3d..89c01440da 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.7"
+version = "0.47.8"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.7"
+version = "0.47.8"
 path = "../../../../framework/scenario"
 
diff --git a/contracts/examples/order-book/factory/meta/Cargo.toml b/contracts/examples/order-book/factory/meta/Cargo.toml
index cefbe2fcde..9854915232 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.7"
+version = "0.47.8"
 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 6b7817678b..1d66994d44 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.7"
+version = "0.47.8"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/order-book/pair/Cargo.toml b/contracts/examples/order-book/pair/Cargo.toml
index bb5c2f1627..0063356649 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.7"
+version = "0.47.8"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.7"
+version = "0.47.8"
 path = "../../../../framework/scenario"
diff --git a/contracts/examples/order-book/pair/meta/Cargo.toml b/contracts/examples/order-book/pair/meta/Cargo.toml
index a81995baef..b71a025162 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.7"
+version = "0.47.8"
 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 5d37fa7b60..08d0fb2c86 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.7"
+version = "0.47.8"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/ping-pong-egld/Cargo.toml b/contracts/examples/ping-pong-egld/Cargo.toml
index fdb2d555ca..ed353384c1 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.7"
+version = "0.47.8"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.7"
+version = "0.47.8"
 path = "../../../framework/scenario"
 
diff --git a/contracts/examples/ping-pong-egld/meta/Cargo.toml b/contracts/examples/ping-pong-egld/meta/Cargo.toml
index de3cc18e68..627ba0bf33 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.7"
+version = "0.47.8"
 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 1df8da0cc8..ca2420cd15 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.7"
+version = "0.47.8"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/proxy-pause/Cargo.toml b/contracts/examples/proxy-pause/Cargo.toml
index 8d67538105..8f185a46a3 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.7"
+version = "0.47.8"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.7"
+version = "0.47.8"
 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 596d785f2b..13a900ebe5 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.7"
+version = "0.47.8"
 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 902e25899a..214e9930eb 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.7"
+version = "0.47.8"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/rewards-distribution/Cargo.toml b/contracts/examples/rewards-distribution/Cargo.toml
index 471247d8c3..6addeb95a8 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.7"
+version = "0.47.8"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.47.7"
+version = "0.47.8"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.7"
+version = "0.47.8"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/rewards-distribution/meta/Cargo.toml b/contracts/examples/rewards-distribution/meta/Cargo.toml
index 420e9282e2..92c25000a7 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 <claudiu.bruda@multiversx.com>"]
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.47.7"
+version = "0.47.8"
 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 39e2d3068a..e095d7be11 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.7"
+version = "0.47.8"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/seed-nft-minter/Cargo.toml b/contracts/examples/seed-nft-minter/Cargo.toml
index c55ff0c92f..f544ddebf2 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.7"
+version = "0.47.8"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.47.7"
+version = "0.47.8"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.7"
+version = "0.47.8"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/seed-nft-minter/meta/Cargo.toml b/contracts/examples/seed-nft-minter/meta/Cargo.toml
index bb0ce16461..c9f4fb9159 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 <claudiu.bruda@multiversx.com>"]
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.47.7"
+version = "0.47.8"
 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 4d2c71fefa..d32e1ba149 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.7"
+version = "0.47.8"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/token-release/Cargo.toml b/contracts/examples/token-release/Cargo.toml
index 1ce57e5743..4909074ab7 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.7"
+version = "0.47.8"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.7"
+version = "0.47.8"
 path = "../../../framework/scenario"
 
diff --git a/contracts/examples/token-release/meta/Cargo.toml b/contracts/examples/token-release/meta/Cargo.toml
index df8d03f85c..2b61364559 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.7"
+version = "0.47.8"
 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 868e19d6cc..48ca0061b0 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.7"
+version = "0.47.8"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/abi-tester/Cargo.toml b/contracts/feature-tests/abi-tester/Cargo.toml
index 120c36ddb9..d2335a15b8 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.7"
+version = "0.47.8"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.7"
+version = "0.47.8"
 path = "../../../framework/scenario"
 
 [dev-dependencies.multiversx-sc-meta]
-version = "0.47.7"
+version = "0.47.8"
 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 b054e907f9..d3e2a4d8ac 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.7"
+            "version": "0.47.8"
         }
     },
     "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 f8a30cb9a5..5d1bde1cfa 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.7"
+            "version": "0.47.8"
         }
     },
     "docs": [
diff --git a/contracts/feature-tests/abi-tester/meta/Cargo.toml b/contracts/feature-tests/abi-tester/meta/Cargo.toml
index 01f35f065f..f8070e33ff 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.7"
+version = "0.47.8"
 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 c351e491ea..64cdfb6c85 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.7"
+version = "0.47.8"
 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 f17dd3c623..a8952129d6 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.7"
+version = "0.47.8"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/alloc-features/Cargo.toml b/contracts/feature-tests/alloc-features/Cargo.toml
index d11683c5e4..814c55b656 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.7"
+version = "0.47.8"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.7"
+version = "0.47.8"
 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 79afc0549d..62255e15fa 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.7"
+version = "0.47.8"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml
index ca1f942e8d..52c6563e32 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml
@@ -25,7 +25,7 @@ overflow-checks = false
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.47.7"
+version = "0.47.8"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml
index e80853eaec..1fac4d058d 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml
@@ -25,7 +25,7 @@ overflow-checks = false
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.47.7"
+version = "0.47.8"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/alloc-features/wasm/Cargo.toml b/contracts/feature-tests/alloc-features/wasm/Cargo.toml
index 538e891924..ab5fb829ca 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.7"
+version = "0.47.8"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/basic-features/Cargo.toml b/contracts/feature-tests/basic-features/Cargo.toml
index 69bcc353b4..5529ecea8d 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.7"
+version = "0.47.8"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.7"
+version = "0.47.8"
 path = "../../../framework/scenario"
 
 [dependencies.multiversx-sc-modules]
-version = "0.47.7"
+version = "0.47.8"
 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 fa1a68e091..89b7ac2add 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.7"
+version = "0.47.8"
 path = "../../../../framework/snippets"
diff --git a/contracts/feature-tests/basic-features/meta/Cargo.toml b/contracts/feature-tests/basic-features/meta/Cargo.toml
index 137affe099..327f8c74a4 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.7"
+version = "0.47.8"
 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 eac8322b00..661bc1146e 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.7"
+version = "0.47.8"
 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 93678ef55e..3973b0842c 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.7"
+version = "0.47.8"
 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 8b78db9d6d..8ac9cfb28a 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.7"
+version = "0.47.8"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.7"
+version = "0.47.8"
 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 4bd7003cb8..ae56a96cbe 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.7"
+version = "0.47.8"
 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 ca9aacf92c..6f693347c9 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.7"
+version = "0.47.8"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/Cargo.toml b/contracts/feature-tests/composability/Cargo.toml
index 012b7c9b0f..72b9f9f248 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.7"
+version = "0.47.8"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.7"
+version = "0.47.8"
 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 6e63eed118..ffa3071ea0 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.7"
+version = "0.47.8"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.7"
+version = "0.47.8"
 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 7d9dd69080..8ad49c4ae9 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.7"
+version = "0.47.8"
 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 29cae7410a..5e5e2253c2 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.7"
+version = "0.47.8"
 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 f524274292..7e9bdb354b 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.7"
+version = "0.47.8"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.7"
+version = "0.47.8"
 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 b90c693b83..96088fcc89 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.7"
+version = "0.47.8"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.7"
+version = "0.47.8"
 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 d1beb99c55..83d74291d0 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.7"
+version = "0.47.8"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.47.7"
+version = "0.47.8"
 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 780b8b5976..3d060317d0 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.7"
+version = "0.47.8"
 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 d63d17ba7c..158aae66f8 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.7"
+version = "0.47.8"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.7"
+version = "0.47.8"
 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 1b2b4c9ae8..9d5bce7286 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.7"
+version = "0.47.8"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.47.7"
+version = "0.47.8"
 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 7fe7faba53..ce110829f3 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.7"
+version = "0.47.8"
 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 523d016be9..bcd33e4734 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.7"
+version = "0.47.8"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.7"
+version = "0.47.8"
 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 ba2043bb9c..3b8cfb5174 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.7"
+version = "0.47.8"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.7"
+version = "0.47.8"
 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 c64d09ad9f..850924c2d7 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.7"
+version = "0.47.8"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.47.7"
+version = "0.47.8"
 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 1c90664162..894f1e4a4b 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.7"
+version = "0.47.8"
 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 c0b513daf9..f338b5dece 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.7"
+version = "0.47.8"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.7"
+version = "0.47.8"
 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 bd6370a5d6..571de47a23 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.7"
+version = "0.47.8"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.47.7"
+version = "0.47.8"
 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 bf013293a4..5efabe6632 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.7"
+version = "0.47.8"
 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 b74dab6fa0..45d7fd86c0 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.7"
+version = "0.47.8"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.47.7"
+version = "0.47.8"
 path = "../../../../framework/wasm-adapter"
 optional = true
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.7"
+version = "0.47.8"
 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 f1bd598825..9683e7d49b 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.7"
+version = "0.47.8"
 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 3b1cb00d61..3b33f8dedc 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.7"
+version = "0.47.8"
 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 8d2783428d..e50bec1684 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.7"
+version = "0.47.8"
 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 aaee506a33..63f7f1d1f9 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.7"
+version = "0.47.8"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.7"
+version = "0.47.8"
 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 dfbe580e61..f10e13d7dd 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.7"
+version = "0.47.8"
 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 741fcf25a4..3e70d341d7 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.7"
+version = "0.47.8"
 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 6397512ee5..028cc4f9c8 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.7"
+version = "0.47.8"
 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 0bfd54569f..82fdd0688b 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.7"
+version = "0.47.8"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/forwarder/Cargo.toml b/contracts/feature-tests/composability/forwarder/Cargo.toml
index d67b930314..92b1504a59 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.7"
+version = "0.47.8"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.7"
+version = "0.47.8"
 path = "../../../../framework/scenario"
 
diff --git a/contracts/feature-tests/composability/forwarder/meta/Cargo.toml b/contracts/feature-tests/composability/forwarder/meta/Cargo.toml
index 8664eb1263..613c92b16e 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.7"
+version = "0.47.8"
 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 3f16868f4f..5bb46d0307 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.7"
+version = "0.47.8"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/interact/Cargo.toml b/contracts/feature-tests/composability/interact/Cargo.toml
index ad60ab2555..b3721732fd 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.7"
+version = "0.47.8"
 path = "../../../../contracts/modules"
 
 [dependencies.multiversx-sc-snippets]
-version = "0.47.7"
+version = "0.47.8"
 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 400f2b8326..46f7436547 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.7"
+version = "0.47.8"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.7"
+version = "0.47.8"
 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 11dcbc0172..999999a718 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.7"
+version = "0.47.8"
 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 57d59b04c8..bfca51da3a 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.7"
+version = "0.47.8"
 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 d20bd48551..342c5b1456 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.7"
+version = "0.47.8"
 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 f87047401b..c0375d049f 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.7"
+version = "0.47.8"
 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 a34280c6e3..557e5818c2 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.7"
+version = "0.47.8"
 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 6575490586..f3629b7af5 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.7"
+version = "0.47.8"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.7"
+version = "0.47.8"
 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 d028bd24b7..68f5e3fce2 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.7"
+version = "0.47.8"
 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 2c1676b837..44d547460f 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.7"
+version = "0.47.8"
 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 730c7b533a..3f985bf59b 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.7"
+version = "0.47.8"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.7"
+version = "0.47.8"
 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 0dd5487e95..da932e6e3e 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.7"
+version = "0.47.8"
 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 07753ca55d..883b4ca57e 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.7"
+version = "0.47.8"
 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 e7b04ffa7c..edf1153a21 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.7"
+version = "0.47.8"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.7"
+version = "0.47.8"
 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 c9793ace43..b7d04141e7 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.7"
+version = "0.47.8"
 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 91ed65a2d3..e4b324558a 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.7"
+version = "0.47.8"
 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 95f9b7f49e..f8b73bd1ed 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.7"
+version = "0.47.8"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.47.7"
+version = "0.47.8"
 path = "../../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.7"
+version = "0.47.8"
 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 a8181a9132..838f62ec07 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.7"
+version = "0.47.8"
 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 d30c662adc..7b4e0119bd 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.7"
+version = "0.47.8"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/vault/Cargo.toml b/contracts/feature-tests/composability/vault/Cargo.toml
index e8dac88354..4ffd03f581 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.7"
+version = "0.47.8"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.7"
+version = "0.47.8"
 path = "../../../../framework/scenario"
diff --git a/contracts/feature-tests/composability/vault/meta/Cargo.toml b/contracts/feature-tests/composability/vault/meta/Cargo.toml
index e66d236430..0f93896e19 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.7"
+version = "0.47.8"
 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 eea431599a..2693692ecb 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.7"
+version = "0.47.8"
 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 df2708b28c..9a3472c495 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.7"
+version = "0.47.8"
 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 91ba6c8eb0..13fd270b33 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.7"
+version = "0.47.8"
 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 eee5a8c938..8927b8f85e 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.7"
+version = "0.47.8"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.7"
+version = "0.47.8"
 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 860cb4cc26..0450a2b95d 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.7"
+version = "0.47.8"
 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 395ebd54ca..7d42a6b0c3 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.7"
+version = "0.47.8"
 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 0cec9ec90c..52e5e2a3d1 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.7"
+version = "0.47.8"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.7"
+version = "0.47.8"
 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 58a5a24afb..f6a0e60410 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.7"
+version = "0.47.8"
 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 ddfa355f91..d8fe625b1d 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.7"
+version = "0.47.8"
 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 018b1389f9..4827e78bf8 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.7"
+version = "0.47.8"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.7"
+version = "0.47.8"
 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 eb1c12b642..1162ceb5ba 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.7"
+version = "0.47.8"
 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 d97ea42d66..ae8a024f7d 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.7"
+version = "0.47.8"
 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 472a2221c3..3fb1f66765 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.7"
+version = "0.47.8"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.7"
+version = "0.47.8"
 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 ed69ca1b1d..73652ff74a 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.7"
+version = "0.47.8"
 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 e87fed7bfb..6ecc47676f 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.7"
+version = "0.47.8"
 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 13dec6eb99..b7406f877d 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.7"
+version = "0.47.8"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.7"
+version = "0.47.8"
 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 1df6d352e5..e823cd155d 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.7"
+version = "0.47.8"
 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 5ffc4b6634..101d4d596f 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.7"
+version = "0.47.8"
 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 d4416664b3..d1a58ed741 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.7"
+version = "0.47.8"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.7"
+version = "0.47.8"
 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 14f9790c4e..bd511266c5 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.7"
+version = "0.47.8"
 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 2adcd02752..d76eb68fd8 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.7"
+version = "0.47.8"
 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 c64d30a727..464c79efd7 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.7"
+version = "0.47.8"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.7"
+version = "0.47.8"
 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 6bc05488c3..40901de7a7 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.7"
+version = "0.47.8"
 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 6ac958ed88..ec4f4653ac 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.7"
+version = "0.47.8"
 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 77f5c847b6..6cdb6d9217 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.7"
+version = "0.47.8"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.7"
+version = "0.47.8"
 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 b969dbdfd2..d66c92f437 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.7"
+version = "0.47.8"
 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 1643028e3e..910198734b 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.7"
+version = "0.47.8"
 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 e4ad7a76f4..13c5d9ec32 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.7"
+version = "0.47.8"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.7"
+version = "0.47.8"
 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 8edf568f01..6059435514 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.7"
+version = "0.47.8"
 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 6df7609817..0ada82ca9b 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.7"
+version = "0.47.8"
 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 60361712ca..cf64d6b26b 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.7"
+version = "0.47.8"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.7"
+version = "0.47.8"
 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 bf307044ec..022e576282 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.7"
+version = "0.47.8"
 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 7539e5e8b4..b01e83de22 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.7"
+version = "0.47.8"
 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 ce4c8336e1..55b238d90f 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.7"
+version = "0.47.8"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.7"
+version = "0.47.8"
 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 880326335d..7a30e9f032 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.7"
+version = "0.47.8"
 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 1f3aed535e..9e59c8cf59 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.7"
+version = "0.47.8"
 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 c23dbbe7b5..e455698505 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.7"
+version = "0.47.8"
 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 43e4ee7e81..c57395bee3 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.7"
+version = "0.47.8"
 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 04ad42d688..a4ccad2d0a 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.7"
+version = "0.47.8"
 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 eee25be7cb..3c6eb639a6 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.7"
+version = "0.47.8"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.7"
+version = "0.47.8"
 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 eb9cc0fabd..b5b6de2443 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.7"
+version = "0.47.8"
 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 ea09b86ffb..0df3393018 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.7"
+version = "0.47.8"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/payable-features/Cargo.toml b/contracts/feature-tests/payable-features/Cargo.toml
index 74caadb1ce..bcb27446c2 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.7"
+version = "0.47.8"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.7"
+version = "0.47.8"
 path = "../../../framework/scenario"
diff --git a/contracts/feature-tests/payable-features/meta/Cargo.toml b/contracts/feature-tests/payable-features/meta/Cargo.toml
index 3b13a7b499..baced24321 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.7"
+version = "0.47.8"
 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 4f1db6cd5b..58274256ad 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.7"
+version = "0.47.8"
 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 7b71012dee..21ff7ba5f7 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.7"
+version = "0.47.8"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.7"
+version = "0.47.8"
 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 b8216cfd0e..7415ce614c 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.7"
+version = "0.47.8"
 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 47c5484bb8..a134a77263 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.7"
+version = "0.47.8"
 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 857244627f..deb116da19 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.7"
+// version = "0.47.8"
 // 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 dcebf91da8..62dc6c73a4 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.7"
+version = "0.47.8"
 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 317fb42fab..1a5fa9375d 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.7"
+version = "0.47.8"
 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.7"
+version = "0.47.8"
 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 c8e6c1ce0c..d9601c6185 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.7"
+version = "0.47.8"
 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 0580ef4b3d..aa6193531a 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.7"
+version = "0.47.8"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/use-module/Cargo.toml b/contracts/feature-tests/use-module/Cargo.toml
index 7c7d7cec76..f0dd37e380 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.7"
+version = "0.47.8"
 path = "../../../contracts/modules"
 
 [dependencies.multiversx-sc]
-version = "0.47.7"
+version = "0.47.8"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.7"
+version = "0.47.8"
 path = "../../../framework/scenario"
 
 [dev-dependencies.multiversx-sc-meta]
-version = "0.47.7"
+version = "0.47.8"
 path = "../../../framework/meta"
diff --git a/contracts/feature-tests/use-module/meta/Cargo.toml b/contracts/feature-tests/use-module/meta/Cargo.toml
index 6cc313e34b..c23e5696aa 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.7"
+version = "0.47.8"
 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 635ff546a0..41b204dcd7 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.7"
+version = "0.47.8"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.47.7"
+version = "0.47.8"
 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 2e4694e6fb..b40f0e911c 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.7"
+            "version": "0.47.8"
         }
     },
     "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 c84a7deac4..a2e1621128 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.7"
+            "version": "0.47.8"
         }
     },
     "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 a7dcfe74cf..55ded78fe6 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.7"
+version = "0.47.8"
 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 a08ec3fe72..571611596c 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.7"
+version = "0.47.8"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/modules/Cargo.toml b/contracts/modules/Cargo.toml
index f6a506632d..b7df46cac1 100644
--- a/contracts/modules/Cargo.toml
+++ b/contracts/modules/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-modules"
-version = "0.47.7"
+version = "0.47.8"
 edition = "2021"
 
 authors = ["MultiversX <contact@multiversx.com>"]
@@ -17,5 +17,5 @@ categories = ["no-std", "wasm", "cryptography::cryptocurrencies"]
 alloc = ["multiversx-sc/alloc"]
 
 [dependencies.multiversx-sc]
-version = "0.47.7"
+version = "0.47.8"
 path = "../../framework/base"
diff --git a/framework/base/Cargo.toml b/framework/base/Cargo.toml
index b3beb82b33..9edc7414d7 100644
--- a/framework/base/Cargo.toml
+++ b/framework/base/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc"
-version = "0.47.7"
+version = "0.47.8"
 edition = "2021"
 
 authors = ["Andrei Marinica <andrei.marinica@multiversx.com>", "MultiversX <contact@multiversx.com>"]
@@ -27,7 +27,7 @@ bitflags = "=2.4.2"
 num-traits = { version = "=0.2.17", default-features = false }
 
 [dependencies.multiversx-sc-derive]
-version = "=0.47.7"
+version = "=0.47.8"
 path = "../derive"
 
 [dependencies.multiversx-sc-codec]
diff --git a/framework/derive/Cargo.toml b/framework/derive/Cargo.toml
index b31ebfcfd1..c615da8563 100644
--- a/framework/derive/Cargo.toml
+++ b/framework/derive/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-derive"
-version = "0.47.7"
+version = "0.47.8"
 edition = "2021"
 
 authors = ["Andrei Marinica <andrei.marinica@multiversx.com>", "MultiversX <contact@multiversx.com>"]
diff --git a/framework/meta/Cargo.toml b/framework/meta/Cargo.toml
index 5e7d2ea2ae..a8775be7a2 100644
--- a/framework/meta/Cargo.toml
+++ b/framework/meta/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-meta"
-version = "0.47.7"
+version = "0.47.8"
 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.7"
+version = "=0.47.8"
 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 8239f5c5e0..98e686cd90 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.7"
+version = "0.47.8"
 
 # [workspace]
 
diff --git a/framework/meta/src/cmd/contract/meta_config.rs b/framework/meta/src/cmd/contract/meta_config.rs
index d1ba6a66ec..df9f1ab337 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.7\"
+version = \"0.47.8\"
 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.7".to_string(),
+            framework_version: "0.47.8".to_string(),
             framework_path: Option::Some("../../../framework/base".to_string()),
             contract_features: Vec::<String>::new(),
         };
diff --git a/framework/meta/src/version_history.rs b/framework/meta/src/version_history.rs
index 531047fd6c..7b79e2ff5b 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.7);
+pub const LAST_VERSION: FrameworkVersion = framework_version!(0.47.8);
 
 /// Indicates where to stop with the upgrades.
 pub const LAST_UPGRADE_VERSION: FrameworkVersion = LAST_VERSION;
@@ -65,6 +65,7 @@ pub const VERSIONS: &[FrameworkVersion] = framework_versions![
     0.47.5,
     0.47.6,
     0.47.7,
+    0.47.8,
 ];
 
 #[rustfmt::skip]
diff --git a/framework/scenario/Cargo.toml b/framework/scenario/Cargo.toml
index a8846449bc..0e138752e6 100644
--- a/framework/scenario/Cargo.toml
+++ b/framework/scenario/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-scenario"
-version = "0.47.7"
+version = "0.47.8"
 edition = "2021"
 
 authors = [
@@ -40,12 +40,12 @@ path = "src/main.rs"
 run-go-tests = []
 
 [dependencies.multiversx-sc]
-version = "=0.47.7"
+version = "=0.47.8"
 features = ["alloc", "num-bigint"]
 path = "../base"
 
 [dependencies.multiversx-sc-meta]
-version = "=0.47.7"
+version = "=0.47.8"
 path = "../meta"
 
 [dependencies.multiversx-chain-scenario-format]
diff --git a/framework/snippets/Cargo.toml b/framework/snippets/Cargo.toml
index 9413f07e9f..14426e25fe 100644
--- a/framework/snippets/Cargo.toml
+++ b/framework/snippets/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-snippets"
-version = "0.47.7"
+version = "0.47.8"
 edition = "2021"
 
 authors = ["MultiversX <contact@multiversx.com>"]
@@ -22,7 +22,7 @@ env_logger = "0.11"
 futures = "0.3"
 
 [dependencies.multiversx-sc-scenario]
-version = "=0.47.7"
+version = "=0.47.8"
 path = "../scenario"
 
 [dependencies.multiversx-sdk]
diff --git a/framework/wasm-adapter/Cargo.toml b/framework/wasm-adapter/Cargo.toml
index 217b5c98a8..b75da45633 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.7"
+version = "0.47.8"
 edition = "2021"
 
 authors = [
@@ -22,5 +22,5 @@ categories = [
 ]
 
 [dependencies.multiversx-sc]
-version = "=0.47.7"
+version = "=0.47.8"
 path = "../base"
diff --git a/tools/mxpy-snippet-generator/Cargo.toml b/tools/mxpy-snippet-generator/Cargo.toml
index 2d84fe4e2d..4253ef6872 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.7"
+version = "0.47.8"
 path = "../../framework/base"
 
 [dependencies]
diff --git a/tools/rust-debugger/format-tests/Cargo.toml b/tools/rust-debugger/format-tests/Cargo.toml
index ce3cab8d55..c838a1d924 100644
--- a/tools/rust-debugger/format-tests/Cargo.toml
+++ b/tools/rust-debugger/format-tests/Cargo.toml
@@ -9,11 +9,11 @@ name = "format-tests"
 path = "src/format_tests.rs"
 
 [dependencies.multiversx-sc]
-version = "=0.47.7"
+version = "=0.47.8"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-scenario]
-version = "=0.47.7"
+version = "=0.47.8"
 path = "../../../framework/scenario"
 
 [dependencies.multiversx-chain-vm]

From 98e9b98e5867840ace9c0840a92077173f3528d1 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 22 Mar 2024 15:12:48 +0200
Subject: [PATCH 0522/1254] Cargo.lock update

---
 contracts/benchmarks/large-storage/wasm/Cargo.lock | 10 +++++-----
 .../mappers/linked-list-repeat/wasm/Cargo.lock     | 10 +++++-----
 .../benchmarks/mappers/map-repeat/wasm/Cargo.lock  | 10 +++++-----
 .../mappers/queue-repeat/wasm/Cargo.lock           | 10 +++++-----
 .../benchmarks/mappers/set-repeat/wasm/Cargo.lock  | 10 +++++-----
 .../mappers/single-value-repeat/wasm/Cargo.lock    | 10 +++++-----
 .../benchmarks/mappers/vec-repeat/wasm/Cargo.lock  | 10 +++++-----
 .../benchmarks/send-tx-repeat/wasm/Cargo.lock      | 10 +++++-----
 contracts/benchmarks/str-repeat/wasm/Cargo.lock    | 10 +++++-----
 contracts/core/price-aggregator/wasm/Cargo.lock    | 14 +++++++-------
 contracts/examples/adder/wasm/Cargo.lock           | 10 +++++-----
 .../bonding-curve-contract/wasm/Cargo.lock         | 12 ++++++------
 contracts/examples/check-pause/wasm/Cargo.lock     | 12 ++++++------
 .../examples/crowdfunding-esdt/wasm/Cargo.lock     | 10 +++++-----
 contracts/examples/crypto-bubbles/wasm/Cargo.lock  | 10 +++++-----
 .../crypto-kitties/kitty-auction/wasm/Cargo.lock   | 10 +++++-----
 .../kitty-genetic-alg/wasm/Cargo.lock              | 10 +++++-----
 .../crypto-kitties/kitty-ownership/wasm/Cargo.lock | 10 +++++-----
 contracts/examples/crypto-zombies/wasm/Cargo.lock  | 10 +++++-----
 contracts/examples/digital-cash/wasm/Cargo.lock    | 10 +++++-----
 contracts/examples/empty/wasm/Cargo.lock           | 10 +++++-----
 .../esdt-transfer-with-fee/wasm/Cargo.lock         | 10 +++++-----
 contracts/examples/factorial/wasm/Cargo.lock       | 10 +++++-----
 contracts/examples/fractional-nfts/wasm/Cargo.lock | 12 ++++++------
 contracts/examples/lottery-esdt/wasm/Cargo.lock    | 10 +++++-----
 .../multisig/wasm-multisig-full/Cargo.lock         | 12 ++++++------
 .../multisig/wasm-multisig-view/Cargo.lock         | 12 ++++++------
 contracts/examples/multisig/wasm/Cargo.lock        | 12 ++++++------
 contracts/examples/nft-minter/wasm/Cargo.lock      | 10 +++++-----
 .../examples/nft-storage-prepay/wasm/Cargo.lock    | 10 +++++-----
 .../examples/nft-subscription/wasm/Cargo.lock      | 12 ++++++------
 .../examples/order-book/factory/wasm/Cargo.lock    | 10 +++++-----
 contracts/examples/order-book/pair/wasm/Cargo.lock | 10 +++++-----
 contracts/examples/ping-pong-egld/wasm/Cargo.lock  | 10 +++++-----
 contracts/examples/proxy-pause/wasm/Cargo.lock     | 10 +++++-----
 .../examples/rewards-distribution/wasm/Cargo.lock  | 12 ++++++------
 contracts/examples/seed-nft-minter/wasm/Cargo.lock | 12 ++++++------
 contracts/examples/token-release/wasm/Cargo.lock   | 10 +++++-----
 .../abi-tester/wasm-abi-tester-ev/Cargo.lock       | 10 +++++-----
 contracts/feature-tests/abi-tester/wasm/Cargo.lock | 10 +++++-----
 .../alloc-features/wasm-alloc-mem-fail/Cargo.lock  | 10 +++++-----
 .../wasm-alloc-mem-leaking/Cargo.lock              | 10 +++++-----
 .../feature-tests/alloc-features/wasm/Cargo.lock   | 10 +++++-----
 .../wasm-basic-features-storage-bytes/Cargo.lock   | 12 ++++++------
 .../feature-tests/basic-features/wasm/Cargo.lock   | 12 ++++++------
 .../big-float-features/wasm/Cargo.lock             | 10 +++++-----
 .../builtin-func-features/wasm/Cargo.lock          | 10 +++++-----
 .../first-contract/wasm/Cargo.lock                 | 10 +++++-----
 .../second-contract/wasm/Cargo.lock                | 10 +++++-----
 .../child/wasm/Cargo.lock                          | 10 +++++-----
 .../parent/wasm/Cargo.lock                         | 10 +++++-----
 .../wasm-forwarder-queue-promises/Cargo.lock       | 10 +++++-----
 .../composability/forwarder-queue/wasm/Cargo.lock  | 10 +++++-----
 .../wasm-forwarder-raw-init-async-call/Cargo.lock  | 10 +++++-----
 .../wasm-forwarder-raw-init-sync-call/Cargo.lock   | 10 +++++-----
 .../composability/forwarder-raw/wasm/Cargo.lock    | 10 +++++-----
 .../composability/forwarder/wasm/Cargo.lock        | 10 +++++-----
 .../local-esdt-and-nft/wasm/Cargo.lock             | 10 +++++-----
 .../promises-features/wasm/Cargo.lock              | 10 +++++-----
 .../composability/proxy-test-first/wasm/Cargo.lock | 10 +++++-----
 .../proxy-test-second/wasm/Cargo.lock              | 10 +++++-----
 .../composability/recursive-caller/wasm/Cargo.lock | 10 +++++-----
 .../transfer-role-features/wasm/Cargo.lock         | 12 ++++++------
 .../vault/wasm-vault-promises/Cargo.lock           | 10 +++++-----
 .../vault/wasm-vault-upgrade/Cargo.lock            | 10 +++++-----
 .../composability/vault/wasm/Cargo.lock            | 10 +++++-----
 .../crowdfunding-erc20/wasm/Cargo.lock             | 10 +++++-----
 .../erc1155-marketplace/wasm/Cargo.lock            | 10 +++++-----
 .../erc1155-user-mock/wasm/Cargo.lock              | 10 +++++-----
 .../erc-style-contracts/erc1155/wasm/Cargo.lock    | 10 +++++-----
 .../erc-style-contracts/erc20/wasm/Cargo.lock      | 10 +++++-----
 .../erc-style-contracts/erc721/wasm/Cargo.lock     | 10 +++++-----
 .../lottery-erc20/wasm/Cargo.lock                  | 10 +++++-----
 .../esdt-system-sc-mock/wasm/Cargo.lock            | 10 +++++-----
 .../formatted-message-features/wasm/Cargo.lock     | 10 +++++-----
 .../managed-map-features/wasm/Cargo.lock           | 10 +++++-----
 .../wasm-multi-contract-alt-impl/Cargo.lock        | 10 +++++-----
 .../wasm-multi-contract-example-feature/Cargo.lock | 10 +++++-----
 .../wasm-multi-contract-features-view/Cargo.lock   | 10 +++++-----
 .../multi-contract-features/wasm/Cargo.lock        | 10 +++++-----
 .../panic-message-features/wasm/Cargo.lock         | 10 +++++-----
 .../feature-tests/payable-features/wasm/Cargo.lock | 10 +++++-----
 .../rust-snippets-generator-test/wasm/Cargo.lock   | 10 +++++-----
 .../rust-testing-framework-tester/wasm/Cargo.lock  | 10 +++++-----
 .../use-module/wasm-use-module-view/Cargo.lock     | 12 ++++++------
 contracts/feature-tests/use-module/wasm/Cargo.lock | 12 ++++++------
 86 files changed, 446 insertions(+), 446 deletions(-)

diff --git a/contracts/benchmarks/large-storage/wasm/Cargo.lock b/contracts/benchmarks/large-storage/wasm/Cargo.lock
index 31750ec068..3b7ddf924d 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.47.7"
+version = "0.47.8"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "multiversx-sc",
 ]
@@ -148,9 +148,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[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 1c822ccffb..1cf1efc122 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.47.7"
+version = "0.47.8"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -92,7 +92,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -103,7 +103,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "multiversx-sc",
 ]
@@ -156,9 +156,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
diff --git a/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.lock
index 93d5f89c99..946c9f3148 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.47.7"
+version = "0.47.8"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -92,7 +92,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -103,7 +103,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "multiversx-sc",
 ]
@@ -156,9 +156,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
diff --git a/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.lock
index 42082bb424..78846158be 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.47.7"
+version = "0.47.8"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "multiversx-sc",
 ]
@@ -156,9 +156,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
diff --git a/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.lock
index 7e38065884..9e34dfc959 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.47.7"
+version = "0.47.8"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "multiversx-sc",
 ]
@@ -156,9 +156,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[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 6b1f5c27ba..5a1e115b0d 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.47.7"
+version = "0.47.8"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "multiversx-sc",
 ]
@@ -156,9 +156,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
diff --git a/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.lock
index ac3a58591d..6a46869df7 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.47.7"
+version = "0.47.8"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "multiversx-sc",
 ]
@@ -140,9 +140,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
diff --git a/contracts/benchmarks/send-tx-repeat/wasm/Cargo.lock b/contracts/benchmarks/send-tx-repeat/wasm/Cargo.lock
index ce4e08b913..8d5515d04d 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.47.7"
+version = "0.47.8"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "multiversx-sc",
 ]
@@ -148,9 +148,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
diff --git a/contracts/benchmarks/str-repeat/wasm/Cargo.lock b/contracts/benchmarks/str-repeat/wasm/Cargo.lock
index cffabbafb4..f85a43a545 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.47.7"
+version = "0.47.8"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "multiversx-sc",
 ]
@@ -133,9 +133,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "str-repeat"
diff --git a/contracts/core/price-aggregator/wasm/Cargo.lock b/contracts/core/price-aggregator/wasm/Cargo.lock
index 0a413621c5..4331327ffd 100644
--- a/contracts/core/price-aggregator/wasm/Cargo.lock
+++ b/contracts/core/price-aggregator/wasm/Cargo.lock
@@ -86,7 +86,7 @@ checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
 
 [[package]]
 name = "multiversx-price-aggregator-sc"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "arrayvec",
  "getrandom",
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -134,7 +134,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -145,14 +145,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "multiversx-sc",
 ]
@@ -247,9 +247,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
diff --git a/contracts/examples/adder/wasm/Cargo.lock b/contracts/examples/adder/wasm/Cargo.lock
index 2a5ed06f4c..d0b2c19aa6 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.47.7"
+version = "0.47.8"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "multiversx-sc",
 ]
@@ -148,9 +148,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
diff --git a/contracts/examples/bonding-curve-contract/wasm/Cargo.lock b/contracts/examples/bonding-curve-contract/wasm/Cargo.lock
index 562a9b2da4..d6238edca0 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.47.7"
+version = "0.47.8"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,14 +96,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "multiversx-sc",
 ]
@@ -156,9 +156,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
diff --git a/contracts/examples/check-pause/wasm/Cargo.lock b/contracts/examples/check-pause/wasm/Cargo.lock
index 1b0dee59f8..5ee107a05b 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.47.7"
+version = "0.47.8"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,14 +96,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "multiversx-sc",
 ]
@@ -156,9 +156,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
diff --git a/contracts/examples/crowdfunding-esdt/wasm/Cargo.lock b/contracts/examples/crowdfunding-esdt/wasm/Cargo.lock
index b132742fa0..8d30b32a98 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.47.7"
+version = "0.47.8"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "multiversx-sc",
 ]
@@ -148,9 +148,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
diff --git a/contracts/examples/crypto-bubbles/wasm/Cargo.lock b/contracts/examples/crypto-bubbles/wasm/Cargo.lock
index 5f554cec2b..58d2a4be8b 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.47.7"
+version = "0.47.8"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "multiversx-sc",
 ]
@@ -148,9 +148,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[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 535a51de38..aeaec8ffb0 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.47.7"
+version = "0.47.8"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -113,7 +113,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -124,7 +124,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "multiversx-sc",
 ]
@@ -184,9 +184,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[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 d61753e258..c3842dae09 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.47.7"
+version = "0.47.8"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "multiversx-sc",
 ]
@@ -165,9 +165,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[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 45a01439c5..f11b790b7f 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.47.7"
+version = "0.47.8"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -104,7 +104,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -115,7 +115,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "multiversx-sc",
 ]
@@ -175,9 +175,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
diff --git a/contracts/examples/crypto-zombies/wasm/Cargo.lock b/contracts/examples/crypto-zombies/wasm/Cargo.lock
index a9f01a6180..9052befd7e 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.47.7"
+version = "0.47.8"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "multiversx-sc",
 ]
@@ -148,9 +148,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
diff --git a/contracts/examples/digital-cash/wasm/Cargo.lock b/contracts/examples/digital-cash/wasm/Cargo.lock
index 79bb5c8cba..844e04e7d1 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.47.7"
+version = "0.47.8"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "multiversx-sc",
 ]
@@ -148,9 +148,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
diff --git a/contracts/examples/empty/wasm/Cargo.lock b/contracts/examples/empty/wasm/Cargo.lock
index ac143852e3..c697c0de43 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.47.7"
+version = "0.47.8"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "multiversx-sc",
 ]
@@ -148,9 +148,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[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 33e5926915..fdf2a62489 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.47.7"
+version = "0.47.8"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "multiversx-sc",
 ]
@@ -148,9 +148,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
diff --git a/contracts/examples/factorial/wasm/Cargo.lock b/contracts/examples/factorial/wasm/Cargo.lock
index e8423983d5..de7d1ca2ae 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.47.7"
+version = "0.47.8"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "multiversx-sc",
 ]
@@ -148,9 +148,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
diff --git a/contracts/examples/fractional-nfts/wasm/Cargo.lock b/contracts/examples/fractional-nfts/wasm/Cargo.lock
index 64a57b293d..d13522f894 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.47.7"
+version = "0.47.8"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,14 +96,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "multiversx-sc",
 ]
@@ -156,9 +156,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
diff --git a/contracts/examples/lottery-esdt/wasm/Cargo.lock b/contracts/examples/lottery-esdt/wasm/Cargo.lock
index d63b3dead5..ce9560173c 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.47.7"
+version = "0.47.8"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "multiversx-sc",
 ]
@@ -148,9 +148,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
diff --git a/contracts/examples/multisig/wasm-multisig-full/Cargo.lock b/contracts/examples/multisig/wasm-multisig-full/Cargo.lock
index 606b39381c..83333cc9d2 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.47.7"
+version = "0.47.8"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,14 +96,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "multiversx-sc",
 ]
@@ -156,9 +156,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
diff --git a/contracts/examples/multisig/wasm-multisig-view/Cargo.lock b/contracts/examples/multisig/wasm-multisig-view/Cargo.lock
index 020a882847..7e84c623fa 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.47.7"
+version = "0.47.8"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,14 +96,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "multiversx-sc",
 ]
@@ -156,9 +156,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
diff --git a/contracts/examples/multisig/wasm/Cargo.lock b/contracts/examples/multisig/wasm/Cargo.lock
index 06d5316f69..b56f8b9f00 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.47.7"
+version = "0.47.8"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,14 +96,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "multiversx-sc",
 ]
@@ -156,9 +156,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
diff --git a/contracts/examples/nft-minter/wasm/Cargo.lock b/contracts/examples/nft-minter/wasm/Cargo.lock
index 4555b16aba..89c376064b 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.47.7"
+version = "0.47.8"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "multiversx-sc",
 ]
@@ -148,9 +148,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
diff --git a/contracts/examples/nft-storage-prepay/wasm/Cargo.lock b/contracts/examples/nft-storage-prepay/wasm/Cargo.lock
index f92cbb26e0..161c20f4ee 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.47.7"
+version = "0.47.8"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "multiversx-sc",
 ]
@@ -148,9 +148,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
diff --git a/contracts/examples/nft-subscription/wasm/Cargo.lock b/contracts/examples/nft-subscription/wasm/Cargo.lock
index 34a24cf679..b862e4314c 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.47.7"
+version = "0.47.8"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,14 +80,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "multiversx-sc",
 ]
@@ -156,9 +156,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
diff --git a/contracts/examples/order-book/factory/wasm/Cargo.lock b/contracts/examples/order-book/factory/wasm/Cargo.lock
index 5472eac6f3..884b17c296 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.47.7"
+version = "0.47.8"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "multiversx-sc",
 ]
@@ -148,9 +148,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
diff --git a/contracts/examples/order-book/pair/wasm/Cargo.lock b/contracts/examples/order-book/pair/wasm/Cargo.lock
index 76a5a75e99..6488a5eaa5 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.47.7"
+version = "0.47.8"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "multiversx-sc",
 ]
@@ -148,9 +148,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
diff --git a/contracts/examples/ping-pong-egld/wasm/Cargo.lock b/contracts/examples/ping-pong-egld/wasm/Cargo.lock
index 0bc1b1c801..1d697bc89d 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.47.7"
+version = "0.47.8"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "multiversx-sc",
 ]
@@ -148,9 +148,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
diff --git a/contracts/examples/proxy-pause/wasm/Cargo.lock b/contracts/examples/proxy-pause/wasm/Cargo.lock
index 49f181a970..7847d7e907 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.47.7"
+version = "0.47.8"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "multiversx-sc",
 ]
@@ -148,9 +148,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
diff --git a/contracts/examples/rewards-distribution/wasm/Cargo.lock b/contracts/examples/rewards-distribution/wasm/Cargo.lock
index 2daa481ff3..ed367793e0 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.47.7"
+version = "0.47.8"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,14 +80,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "multiversx-sc",
 ]
@@ -156,9 +156,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
diff --git a/contracts/examples/seed-nft-minter/wasm/Cargo.lock b/contracts/examples/seed-nft-minter/wasm/Cargo.lock
index 9ac9f584f9..5b0c14e4c0 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.47.7"
+version = "0.47.8"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,14 +80,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "multiversx-sc",
 ]
@@ -156,9 +156,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
diff --git a/contracts/examples/token-release/wasm/Cargo.lock b/contracts/examples/token-release/wasm/Cargo.lock
index da72b4a6d4..982ffe7e5b 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.47.7"
+version = "0.47.8"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "multiversx-sc",
 ]
@@ -133,9 +133,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[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 4b4fbd01f6..6224f94e8e 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.47.7"
+version = "0.47.8"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "multiversx-sc",
 ]
@@ -148,9 +148,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
diff --git a/contracts/feature-tests/abi-tester/wasm/Cargo.lock b/contracts/feature-tests/abi-tester/wasm/Cargo.lock
index 3c219d33c9..648921bf93 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.47.7"
+version = "0.47.8"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "multiversx-sc",
 ]
@@ -148,9 +148,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock
index e5d2af2ccd..f7d9075764 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "multiversx-sc",
 ]
@@ -148,9 +148,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.lock b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.lock
index 4455b345f9..e278d208aa 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.lock
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.lock
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "multiversx-sc",
 ]
@@ -148,9 +148,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
diff --git a/contracts/feature-tests/alloc-features/wasm/Cargo.lock b/contracts/feature-tests/alloc-features/wasm/Cargo.lock
index f2bdfc23e9..911763d1ee 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.47.7"
+version = "0.47.8"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "multiversx-sc",
 ]
@@ -148,9 +148,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[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 c9265a486f..4096da06a6 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.47.7"
+version = "0.47.8"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,14 +96,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "multiversx-sc",
 ]
@@ -156,9 +156,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
diff --git a/contracts/feature-tests/basic-features/wasm/Cargo.lock b/contracts/feature-tests/basic-features/wasm/Cargo.lock
index c62ed6e208..b771e88a45 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.47.7"
+version = "0.47.8"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,14 +96,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "multiversx-sc",
 ]
@@ -156,9 +156,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[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 7d9f21fbd5..e219eb63f1 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.47.7"
+version = "0.47.8"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "multiversx-sc",
 ]
@@ -148,9 +148,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[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 d7c01b1316..b24993d7ef 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.47.7"
+version = "0.47.8"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "multiversx-sc",
 ]
@@ -148,9 +148,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[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 e2f6d2e32a..2df38c78c8 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.47.7"
+version = "0.47.8"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "multiversx-sc",
 ]
@@ -148,9 +148,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[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 71a3d6506f..dae06b0b1b 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.47.7"
+version = "0.47.8"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "multiversx-sc",
 ]
@@ -148,9 +148,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[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 8c397ab34f..ceffed2f48 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.47.7"
+version = "0.47.8"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "multiversx-sc",
 ]
@@ -148,9 +148,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[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 87ffcd81cd..543b947e37 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.47.7"
+version = "0.47.8"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "multiversx-sc",
 ]
@@ -156,9 +156,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[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 1789144ba6..ad9a1f4b49 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.47.7"
+version = "0.47.8"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,7 +96,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "multiversx-sc",
 ]
@@ -149,9 +149,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[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 b9c77bd876..4e148e341c 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.47.7"
+version = "0.47.8"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,7 +96,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "multiversx-sc",
 ]
@@ -149,9 +149,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[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 25b1bd5be1..8d5690eae5 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.47.7"
+version = "0.47.8"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "multiversx-sc",
 ]
@@ -148,9 +148,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[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 24bb5c2c3c..1e4d942595 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.47.7"
+version = "0.47.8"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "multiversx-sc",
 ]
@@ -148,9 +148,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[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 3bd5720470..951a706535 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.47.7"
+version = "0.47.8"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "multiversx-sc",
 ]
@@ -148,9 +148,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
diff --git a/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock
index 3d741a724c..9fb9899a61 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.47.7"
+version = "0.47.8"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,7 +96,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "multiversx-sc",
 ]
@@ -149,9 +149,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[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 9df77263a4..3ecce8a599 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.47.7"
+version = "0.47.8"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "multiversx-sc",
 ]
@@ -148,9 +148,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[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 d99b0c86ad..74b8399729 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.47.7"
+version = "0.47.8"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "multiversx-sc",
 ]
@@ -149,9 +149,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[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 131e1f98e0..c4e3b77125 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.47.7"
+version = "0.47.8"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "multiversx-sc",
 ]
@@ -149,9 +149,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[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 07096a0c87..b45fac9e48 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.47.7"
+version = "0.47.8"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "multiversx-sc",
 ]
@@ -148,9 +148,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[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 ace05f291b..d3ff7c1587 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.47.7"
+version = "0.47.8"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "multiversx-sc",
 ]
@@ -149,9 +149,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[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 2426bbafc9..8f6bc439b6 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.47.7"
+version = "0.47.8"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,14 +80,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "multiversx-sc",
 ]
@@ -140,9 +140,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[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 817d599fc8..547f949bf0 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.47.7"
+version = "0.47.8"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "multiversx-sc",
 ]
@@ -133,9 +133,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[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 b86fda7779..8a1fb523c4 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.47.7"
+version = "0.47.8"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "multiversx-sc",
 ]
@@ -133,9 +133,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
diff --git a/contracts/feature-tests/composability/vault/wasm/Cargo.lock b/contracts/feature-tests/composability/vault/wasm/Cargo.lock
index 63b59e6432..fad7e9967d 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.47.7"
+version = "0.47.8"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "multiversx-sc",
 ]
@@ -133,9 +133,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[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 48d839370c..542c92a53d 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.47.7"
+version = "0.47.8"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -92,7 +92,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -103,7 +103,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "multiversx-sc",
 ]
@@ -156,9 +156,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[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 e824be164e..c0031acd5f 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.47.7"
+version = "0.47.8"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -92,7 +92,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -103,7 +103,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "multiversx-sc",
 ]
@@ -156,9 +156,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[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 cafbaaa044..556081cf37 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.47.7"
+version = "0.47.8"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "multiversx-sc",
 ]
@@ -148,9 +148,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[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 b06fbb5915..8e9ff2e68a 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.47.7"
+version = "0.47.8"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "multiversx-sc",
 ]
@@ -148,9 +148,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[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 fadd4d7d06..9d4ae04370 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.47.7"
+version = "0.47.8"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "multiversx-sc",
 ]
@@ -148,9 +148,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[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 1b86e0f930..391b426bb2 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.47.7"
+version = "0.47.8"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "multiversx-sc",
 ]
@@ -148,9 +148,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[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 69246ef0e7..b24dd728d1 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.47.7"
+version = "0.47.8"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -92,7 +92,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -103,7 +103,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "multiversx-sc",
 ]
@@ -156,9 +156,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[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 45dee647b9..cd0ce287fb 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.47.7"
+version = "0.47.8"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "multiversx-sc",
 ]
@@ -148,9 +148,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[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 7b03d2eed4..fc222834e1 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.47.7"
+version = "0.47.8"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "multiversx-sc",
 ]
@@ -148,9 +148,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[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 551ac72ffa..a01751bebe 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.47.7"
+version = "0.47.8"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "multiversx-sc",
 ]
@@ -148,9 +148,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[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 d2952ba4f2..6a372a85c5 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.47.7"
+version = "0.47.8"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "multiversx-sc",
 ]
@@ -148,9 +148,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[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 952172f4a5..e6c247041d 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.47.7"
+version = "0.47.8"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "multiversx-sc",
 ]
@@ -148,9 +148,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[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 f078c5b4cb..eb10f6d145 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.47.7"
+version = "0.47.8"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "multiversx-sc",
 ]
@@ -148,9 +148,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[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 d849f259dd..db59aa094a 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.47.7"
+version = "0.47.8"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "multiversx-sc",
 ]
@@ -148,9 +148,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[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 19c41a8939..59e64f220b 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.47.7"
+version = "0.47.8"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "multiversx-sc",
 ]
@@ -148,9 +148,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
diff --git a/contracts/feature-tests/payable-features/wasm/Cargo.lock b/contracts/feature-tests/payable-features/wasm/Cargo.lock
index 312b0558e5..29d59c1f86 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.47.7"
+version = "0.47.8"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "multiversx-sc",
 ]
@@ -148,9 +148,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[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 016e4d921d..4398ef5691 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.47.7"
+version = "0.47.8"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "multiversx-sc",
 ]
@@ -148,9 +148,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[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 be5589bcee..39a57994af 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.47.7"
+version = "0.47.8"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "multiversx-sc",
 ]
@@ -148,9 +148,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[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 3d059e28f6..f01d124f6d 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.47.7"
+version = "0.47.8"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,14 +80,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "multiversx-sc",
 ]
@@ -140,9 +140,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
diff --git a/contracts/feature-tests/use-module/wasm/Cargo.lock b/contracts/feature-tests/use-module/wasm/Cargo.lock
index 3478705566..49e4869bf9 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.47.7"
+version = "0.47.8"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,14 +80,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.7"
+version = "0.47.8"
 dependencies = [
  "multiversx-sc",
 ]
@@ -140,9 +140,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"

From e8ce4666fe9602c9a4e15ef40c5be3e5cdd685c4 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Fri, 22 Mar 2024 15:58:06 +0200
Subject: [PATCH 0523/1254] unified sytax - remove direct_call usage in
 contracts

---
 .../examples/crypto-kitties/kitty-auction/src/lib.rs | 12 ++++++++----
 .../crypto-kitties/kitty-ownership/src/lib.rs        |  4 ++--
 .../examples/crypto-zombies/src/zombie_helper.rs     |  5 ++++-
 contracts/examples/digital-cash/src/digital_cash.rs  |  2 +-
 contracts/examples/digital-cash/src/helpers.rs       |  2 +-
 .../digital-cash/src/signature_operations.rs         | 12 ++++++++----
 .../nft-storage-prepay/src/nft_storage_prepay.rs     |  4 ++--
 .../src/bonding_curve/utils/owner_endpoints.rs       |  2 +-
 contracts/modules/src/default_issue_callbacks.rs     |  6 +++---
 contracts/modules/src/esdt.rs                        |  6 +++---
 10 files changed, 33 insertions(+), 22 deletions(-)

diff --git a/contracts/examples/crypto-kitties/kitty-auction/src/lib.rs b/contracts/examples/crypto-kitties/kitty-auction/src/lib.rs
index af7c7c1736..a6bf8ae782 100644
--- a/contracts/examples/crypto-kitties/kitty-auction/src/lib.rs
+++ b/contracts/examples/crypto-kitties/kitty-auction/src/lib.rs
@@ -183,8 +183,10 @@ pub trait KittyAuction {
 
         // refund losing bid
         if !auction.current_winner.is_zero() {
-            self.send()
-                .direct_egld(&auction.current_winner, &auction.current_bid);
+            self.tx()
+                .to(&auction.current_winner)
+                .egld(&auction.current_bid)
+                .transfer();
         }
 
         // update auction bid and winner
@@ -356,8 +358,10 @@ pub trait KittyAuction {
                 if auction.kitty_owner != self.blockchain().get_sc_address()
                     && !auction.current_winner.is_zero()
                 {
-                    self.send()
-                        .direct_egld(&auction.kitty_owner, &auction.current_bid);
+                    self.tx()
+                        .to(&auction.kitty_owner)
+                        .egld(&auction.current_bid)
+                        .transfer();
                 }
             },
             ManagedAsyncCallResult::Err(_) => {
diff --git a/contracts/examples/crypto-kitties/kitty-ownership/src/lib.rs b/contracts/examples/crypto-kitties/kitty-ownership/src/lib.rs
index 2514592465..21eadff6d9 100644
--- a/contracts/examples/crypto-kitties/kitty-ownership/src/lib.rs
+++ b/contracts/examples/crypto-kitties/kitty-ownership/src/lib.rs
@@ -52,7 +52,7 @@ pub trait KittyOwnership {
             .blockchain()
             .get_sc_balance(&EgldOrEsdtTokenIdentifier::egld(), 0);
 
-        self.send().direct_egld(&caller, &egld_balance);
+        self.tx().to(&caller).egld(&egld_balance).transfer();
     }
 
     // views/endpoints - ERC721 required
@@ -569,7 +569,7 @@ pub trait KittyOwnership {
 
                 // send birth fee to caller
                 let fee = self.birth_fee().get();
-                self.send().direct_egld(&original_caller, &fee);
+                self.tx().to(&original_caller).egld(&fee).transfer();
             },
             ManagedAsyncCallResult::Err(_) => {
                 // this can only fail if the kitty_genes contract address is invalid
diff --git a/contracts/examples/crypto-zombies/src/zombie_helper.rs b/contracts/examples/crypto-zombies/src/zombie_helper.rs
index 000ffda770..c38edc9ea0 100644
--- a/contracts/examples/crypto-zombies/src/zombie_helper.rs
+++ b/contracts/examples/crypto-zombies/src/zombie_helper.rs
@@ -31,7 +31,10 @@ pub trait ZombieHelper: storage::Storage {
     fn withdraw(&self) {
         let caller_address = self.blockchain().get_caller();
         let collected_fees = self.collected_fees().get();
-        self.send().direct_egld(&caller_address, &collected_fees);
+        self.tx()
+            .to(&caller_address)
+            .egld(&collected_fees)
+            .transfer();
         self.collected_fees().clear();
     }
 
diff --git a/contracts/examples/digital-cash/src/digital_cash.rs b/contracts/examples/digital-cash/src/digital_cash.rs
index 052faca2ef..e1384d1742 100644
--- a/contracts/examples/digital-cash/src/digital_cash.rs
+++ b/contracts/examples/digital-cash/src/digital_cash.rs
@@ -55,7 +55,7 @@ pub trait DigitalCash:
                 continue;
             }
             if token == EgldOrEsdtTokenIdentifier::egld() {
-                self.send().direct_egld(&caller_address, &fee);
+                self.tx().to(&caller_address).egld(&fee).transfer();
             } else {
                 let collected_fee = EsdtTokenPayment::new(token.unwrap_esdt(), 0, fee);
                 collected_esdt_fees.push(collected_fee);
diff --git a/contracts/examples/digital-cash/src/helpers.rs b/contracts/examples/digital-cash/src/helpers.rs
index d300e35d08..eef0b641f1 100644
--- a/contracts/examples/digital-cash/src/helpers.rs
+++ b/contracts/examples/digital-cash/src/helpers.rs
@@ -9,7 +9,7 @@ use crate::{
 pub trait HelpersModule: storage::StorageModule {
     fn send_fee_to_address(&self, fee: &EgldOrEsdtTokenPayment, address: &ManagedAddress) {
         if fee.token_identifier == EgldOrEsdtTokenIdentifier::egld() {
-            self.send().direct_egld(address, &fee.amount);
+            self.tx().to(address).egld(&fee.amount).transfer();
         } else {
             let esdt_fee = fee.clone().unwrap_esdt();
             self.send()
diff --git a/contracts/examples/digital-cash/src/signature_operations.rs b/contracts/examples/digital-cash/src/signature_operations.rs
index 3da7143f88..5a60851143 100644
--- a/contracts/examples/digital-cash/src/signature_operations.rs
+++ b/contracts/examples/digital-cash/src/signature_operations.rs
@@ -33,8 +33,10 @@ pub trait SignatureOperationsModule: storage::StorageModule + helpers::HelpersMo
         }
 
         if egld_funds > 0 {
-            self.send()
-                .direct_egld(&deposit.depositor_address, &egld_funds);
+            self.tx()
+                .to(&deposit.depositor_address)
+                .egld(&egld_funds)
+                .transfer();
         }
 
         if !esdt_funds.is_empty() {
@@ -71,8 +73,10 @@ pub trait SignatureOperationsModule: storage::StorageModule + helpers::HelpersMo
             .update(|collected_fees| *collected_fees += fee_cost);
 
         if deposit.egld_funds > 0 {
-            self.send()
-                .direct_egld(&caller_address, &deposit.egld_funds);
+            self.tx()
+                .to(&caller_address)
+                .egld(&deposit.egld_funds)
+                .transfer();
         }
         if !deposit.esdt_funds.is_empty() {
             self.send()
diff --git a/contracts/examples/nft-storage-prepay/src/nft_storage_prepay.rs b/contracts/examples/nft-storage-prepay/src/nft_storage_prepay.rs
index f21dfcb61b..7e1c6115d3 100644
--- a/contracts/examples/nft-storage-prepay/src/nft_storage_prepay.rs
+++ b/contracts/examples/nft-storage-prepay/src/nft_storage_prepay.rs
@@ -42,7 +42,7 @@ pub trait NftStoragePrepay {
         self.total_reserved().clear();
 
         let owner = self.blockchain().get_caller();
-        self.send().direct_egld(&owner, &total_reserved);
+        self.tx().to(&owner).egld(&total_reserved).transfer();
     }
 
     // endpoints
@@ -71,7 +71,7 @@ pub trait NftStoragePrepay {
         user_deposit -= &amount;
         self.deposit(&caller).set(&user_deposit);
 
-        self.send().direct_egld(&caller, &amount);
+        self.tx().to(&caller).egld(&amount).transfer();
     }
 
     // views
diff --git a/contracts/modules/src/bonding_curve/utils/owner_endpoints.rs b/contracts/modules/src/bonding_curve/utils/owner_endpoints.rs
index 51f5eaaa35..007eda5fb7 100644
--- a/contracts/modules/src/bonding_curve/utils/owner_endpoints.rs
+++ b/contracts/modules/src/bonding_curve/utils/owner_endpoints.rs
@@ -181,7 +181,7 @@ pub trait OwnerEndpointsModule: storage::StorageModule + events::EventsModule {
         self.owned_tokens(&caller).clear();
         self.send().direct_multi(&caller, &tokens_to_claim);
         if egld_to_claim > BigUint::zero() {
-            self.send().direct_egld(&caller, &egld_to_claim);
+            self.tx().to(&caller).egld(&egld_to_claim).transfer();
         }
     }
 
diff --git a/contracts/modules/src/default_issue_callbacks.rs b/contracts/modules/src/default_issue_callbacks.rs
index 7c0d096b2e..6edd7abeec 100644
--- a/contracts/modules/src/default_issue_callbacks.rs
+++ b/contracts/modules/src/default_issue_callbacks.rs
@@ -46,9 +46,9 @@ pub trait DefaultIssueCallbacksModule {
     }
 
     fn return_failed_issue_funds(&self, initial_caller: ManagedAddress) {
-        let egld_returned = self.call_value().egld_value();
-        if *egld_returned > 0u32 {
-            self.send().direct_egld(&initial_caller, &egld_returned);
+        let egld_returned = self.call_value().egld_value().to_u64().unwrap();
+        if egld_returned > 0u64 {
+            self.tx().to(&initial_caller).egld(egld_returned).transfer();
         }
     }
 }
diff --git a/contracts/modules/src/esdt.rs b/contracts/modules/src/esdt.rs
index 18f43b896f..a61ba67a3f 100644
--- a/contracts/modules/src/esdt.rs
+++ b/contracts/modules/src/esdt.rs
@@ -63,9 +63,9 @@ pub trait EsdtModule {
             ManagedAsyncCallResult::Err(_) => {
                 // return payment to initial caller
                 let initial_caller = self.blockchain().get_owner_address();
-                let egld_returned = self.call_value().egld_value();
-                if *egld_returned > 0u32 {
-                    self.send().direct_egld(&initial_caller, &egld_returned);
+                let egld_returned = self.call_value().egld_value().to_u64().unwrap();
+                if egld_returned > 0u64 {
+                    self.tx().to(&initial_caller).egld(egld_returned).transfer();
                 }
             },
         }

From c374bfc9f6db1db5c106e73b096cfe848824c633 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Fri, 22 Mar 2024 16:54:50 +0200
Subject: [PATCH 0524/1254] unified syntax - add transfer_non_zero and replace
 multi_esdt_transfer_execute

---
 .../composability/forwarder/src/esdt.rs              | 12 +++++-------
 framework/base/src/types/interaction/tx_call_te.rs   |  8 ++++++++
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/contracts/feature-tests/composability/forwarder/src/esdt.rs b/contracts/feature-tests/composability/forwarder/src/esdt.rs
index ae9e366720..c178749ba9 100644
--- a/contracts/feature-tests/composability/forwarder/src/esdt.rs
+++ b/contracts/feature-tests/composability/forwarder/src/esdt.rs
@@ -73,13 +73,11 @@ pub trait ForwarderEsdtModule: storage::ForwarderStorageModule {
             all_token_payments.push(payment);
         }
 
-        let _ = self.send_raw().multi_esdt_transfer_execute(
-            &to,
-            &all_token_payments,
-            self.blockchain().get_gas_left(),
-            &ManagedBuffer::new(),
-            &ManagedArgBuffer::new(),
-        );
+        self.tx()
+            .with_gas_limit(self.blockchain().get_gas_left())
+            .to(&to)
+            .multi_esdt(all_token_payments)
+            .transfer_execute();
     }
 
     #[payable("EGLD")]
diff --git a/framework/base/src/types/interaction/tx_call_te.rs b/framework/base/src/types/interaction/tx_call_te.rs
index b7a97a93d1..96eb1a72fb 100644
--- a/framework/base/src/types/interaction/tx_call_te.rs
+++ b/framework/base/src/types/interaction/tx_call_te.rs
@@ -49,4 +49,12 @@ where
     pub fn transfer(self) {
         self.transfer_execute_with_gas(0)
     }
+
+    pub fn transfer_non_zero(self) {
+        if self.payment.is_no_payment() {
+            return;
+        }
+
+        self.transfer_execute_with_gas(0)
+    }
 }

From bb219c02ad2bc8b227a8587c441ebac6b30dfad7 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Fri, 22 Mar 2024 18:05:29 +0100
Subject: [PATCH 0525/1254] small gas fix and multisig unified syntax in
 interactor

---
 .../interact/src/multisig_interact.rs         | 114 +++++++++---------
 .../interact/src/multisig_interact_nfts.rs    |  38 +++---
 .../interact/src/multisig_interact_wegld.rs   |   4 +-
 contracts/examples/multisig/src/multisig.rs   |   2 +-
 .../examples/multisig/src/multisig_proxy.rs   |   6 +-
 .../src/facade/world_tx/scenario_env_util.rs  |   7 +-
 6 files changed, 89 insertions(+), 82 deletions(-)

diff --git a/contracts/examples/multisig/interact/src/multisig_interact.rs b/contracts/examples/multisig/interact/src/multisig_interact.rs
index cf679c5a13..1de0b6f261 100644
--- a/contracts/examples/multisig/interact/src/multisig_interact.rs
+++ b/contracts/examples/multisig/interact/src/multisig_interact.rs
@@ -6,27 +6,26 @@ mod multisig_interact_wegld;
 
 use clap::Parser;
 use multisig::{
-    multisig_perform::ProxyTrait as _, multisig_propose::ProxyTrait as _,
-    multisig_state::ProxyTrait as _, ProxyTrait as _,
+    multisig_perform::ProxyTrait as _, multisig_propose::ProxyTrait as _, multisig_proxy,
+    ProxyTrait as _,
 };
 use multisig_interact_config::Config;
 use multisig_interact_state::State;
-use multiversx_sc_modules::dns::ProxyTrait as _;
 use multiversx_sc_scenario::{
-    mandos_system::ScenarioRunner, multiversx_sc::codec::multi_types::IgnoreValue,
+    mandos_system::ScenarioRunner,
+    multiversx_sc::types::{BigUint, ReturnsNewAddress, ReturnsSimilar},
     scenario_format::interpret_trait::InterpretableFrom,
-    standalone::retrieve_account_as_scenario_set_state, test_wallets,
+    standalone::retrieve_account_as_scenario_set_state,
+    test_wallets,
 };
 use multiversx_sc_snippets::{
     dns_address_for_name, env_logger,
-    multiversx_sc::{
-        codec::multi_types::MultiValueVec, storage::mappers::SingleValue, types::Address,
-    },
+    multiversx_sc::{codec::multi_types::MultiValueVec, types::Address},
     multiversx_sc_scenario::{
         api::StaticApi, bech32, scenario_format::interpret_trait::InterpreterContext,
         scenario_model::*, ContractInfo,
     },
-    tokio, Interactor, StepBuffer,
+    tokio, Interactor, InteractorPrepareAsync, StepBuffer,
 };
 
 const SYSTEM_SC_BECH32: &str = "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u";
@@ -160,21 +159,17 @@ impl MultisigInteract {
         self.set_state().await;
 
         let board = self.board();
-        let (new_address, _) = self
+
+        let new_address = self
             .interactor
-            .sc_deploy_get_result::<_, IgnoreValue>(
-                ScDeployStep::new()
-                    .call(
-                        self.state
-                            .default_multisig()
-                            .init(Config::load_config().quorum(), board),
-                    )
-                    .from(&self.wallet_address)
-                    .code(&self.multisig_code)
-                    .gas_limit("100,000,000")
-                    .expect(TxExpect::ok().additional_error_message("deploy failed: ")),
-            )
-            .await;
+            .tx()
+            .from(&self.wallet_address)
+            .typed(multisig_proxy::MultisigProxy)
+            .init(&Config::load_config().quorum(), board)
+            .code(&self.multisig_code)
+            .with_gas_limit(100_000_000u64)
+            .returns(ReturnsNewAddress)
+            .sync_call();
 
         let new_address_bech32 = bech32::encode(&new_address);
         println!("new address: {new_address_bech32}");
@@ -243,33 +238,31 @@ impl MultisigInteract {
     }
 
     async fn feed_contract_egld(&mut self) {
-        let _ = self
-            .interactor
-            .transfer(
-                TransferStep::new()
-                    .from(&self.wallet_address)
-                    .to(self.state.multisig())
-                    .egld_value("0,050000000000000000"),
-            )
+        self.interactor
+            .tx()
+            .from(&self.wallet_address)
+            .to(self.state.multisig().to_address())
+            .egld(BigUint::from(5_000_000_000_000_000_0u64)) // 0,05 or 5 * 10^16
+            .prepare_async()
+            .run()
             .await;
     }
 
-    async fn perform_action(&mut self, action_id: usize, gas_expr: &str) {
+    async fn perform_action(&mut self, action_id: usize, gas_expr: u64) {
         if !self.quorum_reached(action_id).await && !self.sign(action_id).await {
             return;
         }
         println!("quorum reached for action `{action_id}`");
 
         self.interactor
-            .sc_call(
-                ScCallStep::new()
-                    .call(self.state.multisig().perform_action_endpoint(action_id))
-                    .from(&self.wallet_address)
-                    .gas_limit(gas_expr)
-                    .expect(TxExpect::ok().additional_error_message(format!(
-                        "perform action `{action_id}` failed with: "
-                    ))),
-            )
+            .tx()
+            .from(&self.wallet_address)
+            .to(self.state.multisig().to_address())
+            .with_gas_limit(gas_expr)
+            .typed(multisig_proxy::MultisigProxy)
+            .perform_action_endpoint(action_id)
+            .prepare_async()
+            .run()
             .await;
 
         println!("successfully performed action `{action_id}`");
@@ -361,33 +354,46 @@ impl MultisigInteract {
     async fn dns_register(&mut self, name: &str) {
         let dns_address = dns_address_for_name(name);
         self.interactor
-            .sc_call(
-                ScCallStep::new()
-                    .call(self.state.multisig().dns_register(dns_address, name))
-                    .from(&self.wallet_address)
-                    .gas_limit("30,000,000")
-                    .expect(TxExpect::ok().additional_error_message("dns register failed with: ")),
-            )
+            .tx()
+            .from(&self.wallet_address)
+            .to(self.state.multisig().to_address())
+            .with_gas_limit(30_000_000u64)
+            .typed(multisig_proxy::MultisigProxy)
+            .dns_register(dns_address, name)
+            .prepare_async()
+            .run()
             .await;
 
         println!("successfully registered dns");
     }
 
     async fn print_quorum(&mut self) {
-        let quorum: SingleValue<usize> = self
+        let quorum = self
             .interactor
-            .quick_query(self.state.multisig().quorum())
+            .query()
+            .to(self.state.multisig().to_address())
+            .typed(multisig_proxy::MultisigProxy)
+            .quorum()
+            .returns(ReturnsSimilar::<usize>::new())
+            .prepare_async()
+            .run()
             .await;
 
-        println!("quorum: {}", quorum.into());
+        println!("quorum: {}", quorum);
     }
 
     async fn print_board(&mut self) {
-        let board: SingleValue<usize> = self
+        let board = self
             .interactor
-            .quick_query(self.state.multisig().num_board_members())
+            .query()
+            .to(self.state.multisig().to_address())
+            .typed(multisig_proxy::MultisigProxy)
+            .num_board_members()
+            .returns(ReturnsSimilar::<usize>::new())
+            .prepare_async()
+            .run()
             .await;
 
-        println!("board: {}", board.into());
+        println!("board: {}", board);
     }
 }
diff --git a/contracts/examples/multisig/interact/src/multisig_interact_nfts.rs b/contracts/examples/multisig/interact/src/multisig_interact_nfts.rs
index ab8fa001f7..d607b7816a 100644
--- a/contracts/examples/multisig/interact/src/multisig_interact_nfts.rs
+++ b/contracts/examples/multisig/interact/src/multisig_interact_nfts.rs
@@ -39,26 +39,24 @@ impl MultisigInteract {
         let system_sc_address = bech32::decode(SYSTEM_SC_BECH32);
         let action_id = self
             .interactor
-            .sc_call_get_result(
-                ScCallStep::new()
-                    .call(
-                        self.state.multisig().propose_async_call(
-                            system_sc_address,
-                            ISSUE_COST,
-                            FunctionCall::new("registerAndSetAllRoles")
-                                .argument(&COLLECTION_NAME)
-                                .argument(&COLLECTION_TICKER)
-                                .argument(&TOKEN_TYPE)
-                                .argument(&0u32),
-                        ),
-                    )
-                    .from(&self.wallet_address)
-                    .gas_limit("10,000,000")
-                    .expect(TxExpect::ok().additional_error_message("failed to issue collection")),
+            .tx()
+            .from(&self.wallet_address)
+            .to(self.state.multisig().to_address())
+            .with_gas_limit(10_000_000u64)
+            .typed(multisig_proxy::MultisigProxy)
+            .propose_async_call(
+                system_sc_address,
+                ISSUE_COST,
+                FunctionCall::new("registerAndSetAllRoles")
+                    .argument(&COLLECTION_NAME)
+                    .argument(&COLLECTION_TICKER)
+                    .argument(&TOKEN_TYPE)
+                    .argument(&0u32),
             )
-            .await
-            .result
-            .unwrap();
+            .returns(ReturnsSimilar::<usize>::new())
+            .prepare_async()
+            .run()
+            .await;
 
         println!("successfully proposed issue colllection with roles all action `{action_id}`");
         action_id
@@ -186,7 +184,7 @@ impl MultisigInteract {
         let action_id = self.propose_set_special_role().await;
 
         println!("performing set special role action `{action_id}`...");
-        self.perform_action(action_id, "80,000,000").await;
+        self.perform_action(action_id, 80_000_000u64).await;
     }
 
     pub async fn create_items(&mut self) {
diff --git a/contracts/examples/multisig/interact/src/multisig_interact_wegld.rs b/contracts/examples/multisig/interact/src/multisig_interact_wegld.rs
index e3c6009b95..bcfa959805 100644
--- a/contracts/examples/multisig/interact/src/multisig_interact_wegld.rs
+++ b/contracts/examples/multisig/interact/src/multisig_interact_wegld.rs
@@ -34,7 +34,7 @@ impl MultisigInteract {
         let action_id = self.propose_wrap_egld().await;
 
         println!("perfoming wrap egld action `{action_id}`...");
-        self.perform_action(action_id, "15,000,000").await;
+        self.perform_action(action_id, 15_000_000u64).await;
     }
 
     pub async fn unwrap_egld(&mut self) {
@@ -42,7 +42,7 @@ impl MultisigInteract {
         let action_id = self.propose_unwrap_egld().await;
 
         println!("perfoming unwrap egld action `{action_id}`...");
-        self.perform_action(action_id, "15,000,000").await;
+        self.perform_action(action_id, 15_000_000u64).await;
     }
 
     pub async fn wegld_swap_set_state(&mut self) {
diff --git a/contracts/examples/multisig/src/multisig.rs b/contracts/examples/multisig/src/multisig.rs
index 75c13cb5dd..96d3d5cdfa 100644
--- a/contracts/examples/multisig/src/multisig.rs
+++ b/contracts/examples/multisig/src/multisig.rs
@@ -4,7 +4,7 @@ pub mod action;
 pub mod multisig_events;
 pub mod multisig_perform;
 pub mod multisig_propose;
-// pub mod multisig_proxy;
+pub mod multisig_proxy;
 pub mod multisig_state;
 pub mod user_role;
 
diff --git a/contracts/examples/multisig/src/multisig_proxy.rs b/contracts/examples/multisig/src/multisig_proxy.rs
index b0d42e16ef..265bc968ab 100644
--- a/contracts/examples/multisig/src/multisig_proxy.rs
+++ b/contracts/examples/multisig/src/multisig_proxy.rs
@@ -355,7 +355,7 @@ where
         (),
         Gas,
         FunctionCall<Env::Api>,
-        OriginalResultMarker<Action<Env::Api>>,
+        OriginalResultMarker<Action>,
     > {
         self.wrapped_tx
             .raw_call()
@@ -727,11 +727,11 @@ where
     Api: ManagedTypeApi,
 {
     pub action_id: usize,
-    pub action_data: Action<Api>,
+    pub action_data: Action,
     pub signers: ManagedVec<Api, ManagedAddress<Api>>,
 }
 
-#[derive(TopEncode, TopDecode)]
+#[derive(TopEncode, TopDecode, NestedEncode, NestedDecode)]
 pub enum Action {
     Nothing,
     AddBoardMember,
diff --git a/framework/scenario/src/facade/world_tx/scenario_env_util.rs b/framework/scenario/src/facade/world_tx/scenario_env_util.rs
index 19776e9a0d..2de2e9ae6c 100644
--- a/framework/scenario/src/facade/world_tx/scenario_env_util.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_env_util.rs
@@ -12,7 +12,7 @@ use crate::{
     api::StaticApi,
     scenario_model::{
         AddressValue, BigUintValue, BytesValue, ScCallStep, ScDeployStep, ScQueryStep,
-        TransferStep, TxResponse,
+        TransferStep, TxResponse, U64Value,
     },
     RHListScenario, ScenarioEnvExec, ScenarioWorld,
 };
@@ -46,7 +46,7 @@ pub fn tx_to_sc_call_step<Env, From, To, Payment, Gas>(
     from: From,
     to: To,
     payment: Payment,
-    _gas: Gas,
+    gas: Gas,
     data: FunctionCall<Env::Api>,
 ) -> ScCallStep
 where
@@ -63,6 +63,9 @@ where
     for arg in data.arg_buffer.iter_buffers() {
         step.tx.arguments.push(arg.to_vec().into());
     }
+    
+    let explicit_gas = gas.resolve_gas(env);
+    step.tx.gas_limit = U64Value::from(explicit_gas);
 
     let full_payment_data = payment.into_full_payment_data();
     if let Some(annotated_egld_payment) = full_payment_data.egld {

From 4ac234c569076c995883dad551858c1a305c86ad Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 22 Mar 2024 19:16:17 +0200
Subject: [PATCH 0526/1254] send wrapper - send egld via unified syntax

---
 .../src/contract_base/wrappers/send_wrapper.rs     | 14 ++++++++------
 framework/base/src/types/interaction/tx_call_te.rs | 11 +++++++++++
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/framework/base/src/contract_base/wrappers/send_wrapper.rs b/framework/base/src/contract_base/wrappers/send_wrapper.rs
index 62f99b767c..ec8fd41c5b 100644
--- a/framework/base/src/contract_base/wrappers/send_wrapper.rs
+++ b/framework/base/src/contract_base/wrappers/send_wrapper.rs
@@ -75,7 +75,10 @@ where
     /// Used especially for sending EGLD to regular accounts.
     #[inline]
     pub fn direct_egld(&self, to: &ManagedAddress<A>, amount: &BigUint<A>) {
-        self.send_raw_wrapper().direct_egld(to, amount, Empty)
+        Tx::new_tx_from_sc()
+            .to(to)
+            .egld(amount)
+            .transfer();
     }
 
     /// Sends EGLD to a given address, directly.
@@ -83,11 +86,10 @@ where
     ///
     /// If the amount is 0, it returns without error.
     pub fn direct_non_zero_egld(&self, to: &ManagedAddress<A>, amount: &BigUint<A>) {
-        if amount == &0 {
-            return;
-        }
-
-        self.direct_egld(to, amount)
+        Tx::new_tx_from_sc()
+            .to(to)
+            .egld(amount)
+            .transfer_non_zero();
     }
 
     /// Sends either EGLD, ESDT or NFT to the target address,
diff --git a/framework/base/src/types/interaction/tx_call_te.rs b/framework/base/src/types/interaction/tx_call_te.rs
index b7a97a93d1..792757eb07 100644
--- a/framework/base/src/types/interaction/tx_call_te.rs
+++ b/framework/base/src/types/interaction/tx_call_te.rs
@@ -49,4 +49,15 @@ where
     pub fn transfer(self) {
         self.transfer_execute_with_gas(0)
     }
+
+    /// Transfers funds, amount is greater than zero. Does nothing otherwise.
+    /// 
+    /// Can only used for simple transfers.
+    pub fn transfer_non_zero(self) {
+        if self.payment.is_no_payment() {
+            return;
+        }
+
+        self.transfer();
+    }
 }

From 7a79ec9a73a94937ea66a0b4d30bc823737fa7a1 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Fri, 22 Mar 2024 18:19:33 +0100
Subject: [PATCH 0527/1254] regen proxy file

---
 contracts/examples/multisig/src/multisig_proxy.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contracts/examples/multisig/src/multisig_proxy.rs b/contracts/examples/multisig/src/multisig_proxy.rs
index 5b596c9836..a4f5c82bd7 100644
--- a/contracts/examples/multisig/src/multisig_proxy.rs
+++ b/contracts/examples/multisig/src/multisig_proxy.rs
@@ -497,7 +497,7 @@ where
     Api: ManagedTypeApi,
 {
     pub action_id: usize,
-    pub action_data: Action,
+    pub action_data: Action<Api>,
     pub signers: ManagedVec<Api, ManagedAddress<Api>>,
 }
 

From 48e8f36c35bd9b38593f2e6f207a9f8e2d342eb7 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 22 Mar 2024 19:44:22 +0200
Subject: [PATCH 0528/1254] send wrapper - send multi esdt via unified syntax

---
 .../contract_base/wrappers/send_wrapper.rs    | 21 ++++---------
 framework/base/src/types/interaction/tx.rs    | 16 ++++++++++
 .../base/src/types/interaction/tx_call_te.rs  |  2 +-
 .../base/src/types/interaction/tx_payment.rs  | 30 +++++++++++++++++--
 4 files changed, 51 insertions(+), 18 deletions(-)

diff --git a/framework/base/src/contract_base/wrappers/send_wrapper.rs b/framework/base/src/contract_base/wrappers/send_wrapper.rs
index ec8fd41c5b..d73074f52d 100644
--- a/framework/base/src/contract_base/wrappers/send_wrapper.rs
+++ b/framework/base/src/contract_base/wrappers/send_wrapper.rs
@@ -75,10 +75,7 @@ where
     /// Used especially for sending EGLD to regular accounts.
     #[inline]
     pub fn direct_egld(&self, to: &ManagedAddress<A>, amount: &BigUint<A>) {
-        Tx::new_tx_from_sc()
-            .to(to)
-            .egld(amount)
-            .transfer();
+        Tx::new_tx_from_sc().to(to).egld(amount).transfer();
     }
 
     /// Sends EGLD to a given address, directly.
@@ -86,10 +83,7 @@ where
     ///
     /// If the amount is 0, it returns without error.
     pub fn direct_non_zero_egld(&self, to: &ManagedAddress<A>, amount: &BigUint<A>) {
-        Tx::new_tx_from_sc()
-            .to(to)
-            .egld(amount)
-            .transfer_non_zero();
+        Tx::new_tx_from_sc().to(to).egld(amount).transfer_non_zero();
     }
 
     /// Sends either EGLD, ESDT or NFT to the target address,
@@ -293,13 +287,10 @@ where
         to: &ManagedAddress<A>,
         payments: &ManagedVec<A, EsdtTokenPayment<A>>,
     ) {
-        let _ = self.send_raw_wrapper().multi_esdt_transfer_execute(
-            to,
-            payments,
-            0,
-            &ManagedBuffer::new(),
-            &ManagedArgBuffer::new(),
-        );
+        Tx::new_tx_from_sc()
+            .to(to)
+            .multi_esdt_ref(payments)
+            .transfer();
     }
 
     /// Performs a simple ESDT/NFT transfer, but via async call.  
diff --git a/framework/base/src/types/interaction/tx.rs b/framework/base/src/types/interaction/tx.rs
index 8fae065026..d7388dc250 100644
--- a/framework/base/src/types/interaction/tx.rs
+++ b/framework/base/src/types/interaction/tx.rs
@@ -220,6 +220,22 @@ where
         }
     }
 
+    /// Sets a reference to multiple ESDT payments.
+    pub fn multi_esdt_ref(
+        self,
+        payments: &MultiEsdtPayment<Env::Api>,
+    ) -> Tx<Env, From, To, &MultiEsdtPayment<Env::Api>, Gas, Data, RH> {
+        Tx {
+            env: self.env,
+            from: self.from,
+            to: self.to,
+            payment: payments,
+            gas: self.gas,
+            data: self.data,
+            result_handler: self.result_handler,
+        }
+    }
+
     /// Backwards compatibility.
     pub fn with_multi_token_transfer(
         self,
diff --git a/framework/base/src/types/interaction/tx_call_te.rs b/framework/base/src/types/interaction/tx_call_te.rs
index 792757eb07..938a6c2523 100644
--- a/framework/base/src/types/interaction/tx_call_te.rs
+++ b/framework/base/src/types/interaction/tx_call_te.rs
@@ -51,7 +51,7 @@ where
     }
 
     /// Transfers funds, amount is greater than zero. Does nothing otherwise.
-    /// 
+    ///
     /// Can only used for simple transfers.
     pub fn transfer_non_zero(self) {
         if self.payment.is_no_payment() {
diff --git a/framework/base/src/types/interaction/tx_payment.rs b/framework/base/src/types/interaction/tx_payment.rs
index beca0172f0..c3cc29fa9d 100644
--- a/framework/base/src/types/interaction/tx_payment.rs
+++ b/framework/base/src/types/interaction/tx_payment.rs
@@ -118,7 +118,7 @@ where
     }
 }
 
-impl<Env> TxPayment<Env> for MultiEsdtPayment<Env::Api>
+impl<Env> TxPayment<Env> for &MultiEsdtPayment<Env::Api>
 where
     Env: TxEnv,
 {
@@ -135,13 +135,39 @@ where
     ) {
         let _ = SendRawWrapper::<Env::Api>::new().multi_esdt_transfer_execute(
             to,
-            &self,
+            self,
             gas_limit,
             &fc.function_name,
             &fc.arg_buffer,
         );
     }
 
+    fn into_full_payment_data(self, env: &Env) -> FullPaymentData<Env::Api> {
+        FullPaymentData {
+            egld: None,
+            multi_esdt: self.clone(),
+        }
+    }
+}
+
+impl<Env> TxPayment<Env> for MultiEsdtPayment<Env::Api>
+where
+    Env: TxEnv,
+{
+    fn is_no_payment(&self) -> bool {
+        self.is_empty()
+    }
+
+    fn perform_transfer_execute(
+        self,
+        env: &Env,
+        to: &ManagedAddress<Env::Api>,
+        gas_limit: u64,
+        fc: FunctionCall<Env::Api>,
+    ) {
+        (&self).perform_transfer_execute(env, to, gas_limit, fc);
+    }
+
     fn into_full_payment_data(self, env: &Env) -> FullPaymentData<Env::Api> {
         FullPaymentData {
             egld: None,

From 5a7aff284584c5c0d2d8912bf3fbbeccfe8613b8 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 22 Mar 2024 20:00:52 +0200
Subject: [PATCH 0529/1254] cleaned up imports

---
 .../base/src/types/interaction/deploy_call.rs |  7 ++----
 .../types/interaction/expr/address_expr.rs    |  2 +-
 .../src/types/interaction/expr/sc_expr.rs     |  2 +-
 framework/base/src/types/interaction/tx.rs    | 23 +++++++++---------
 .../src/types/interaction/tx_call_deploy.rs   |  5 ++--
 .../src/types/interaction/tx_call_sync.rs     |  4 ++--
 .../src/types/interaction/tx_code_source.rs   |  5 +---
 .../base/src/types/interaction/tx_data.rs     |  6 ++---
 .../base/src/types/interaction/tx_env.rs      |  7 +-----
 .../base/src/types/interaction/tx_env_sc.rs   |  4 +---
 .../base/src/types/interaction/tx_gas.rs      |  2 +-
 .../base/src/types/interaction/tx_payment.rs  | 11 ++++-----
 .../src/types/interaction/tx_payment_egld.rs  | 19 ++++-----------
 .../interaction/tx_payment_egld_value.rs      | 21 ++--------------
 .../types/interaction/tx_payment_normalize.rs | 24 +++++--------------
 .../tx_rh_list/returns_new_address.rs         |  8 ++-----
 .../tx_rh_list/with_result_new_address.rs     |  3 +--
 .../tx_rh_list/with_result_similar.rs         |  2 +-
 framework/base/src/types/interaction/tx_to.rs |  8 +++----
 19 files changed, 50 insertions(+), 113 deletions(-)

diff --git a/framework/base/src/types/interaction/deploy_call.rs b/framework/base/src/types/interaction/deploy_call.rs
index ec3a64e187..ad087d34b8 100644
--- a/framework/base/src/types/interaction/deploy_call.rs
+++ b/framework/base/src/types/interaction/deploy_call.rs
@@ -2,10 +2,7 @@ use multiversx_sc_codec::TopEncodeMulti;
 
 use crate::types::{CodeMetadata, ManagedBuffer, ManagedBufferCachedBuilder};
 
-use super::{
-    Code, FunctionCall, ManagedArgBuffer, Tx, TxCodeSource, TxData, TxEnv, TxFrom, TxGas,
-    TxPayment, TxTo,
-};
+use super::{ManagedArgBuffer, TxCodeSource, TxData, TxEnv};
 
 /// Holds deploy data: code, code metadata, and arguments.
 pub struct DeployCall<Env, CodeSource>
@@ -42,7 +39,7 @@ where
 
     fn to_call_data_string(&self) -> ManagedBuffer<Env::Api> {
         // Implement as needed for deployment-specific data
-        let mut result = ManagedBufferCachedBuilder::default();
+        let result = ManagedBufferCachedBuilder::default();
         // result.append_managed_buffer(&self.code);
         // Add other fields as needed
         result.into_managed_buffer()
diff --git a/framework/base/src/types/interaction/expr/address_expr.rs b/framework/base/src/types/interaction/expr/address_expr.rs
index 44db09f0fe..a5b9756638 100644
--- a/framework/base/src/types/interaction/expr/address_expr.rs
+++ b/framework/base/src/types/interaction/expr/address_expr.rs
@@ -40,7 +40,7 @@ impl<Env> TxToSpecified<Env> for AddressExpr
 where
     Env: TxEnv,
 {
-    fn with_address_ref<F, R>(&self, env: &Env, f: F) -> R
+    fn with_address_ref<F, R>(&self, _env: &Env, f: F) -> R
     where
         F: FnOnce(&ManagedAddress<Env::Api>) -> R,
     {
diff --git a/framework/base/src/types/interaction/expr/sc_expr.rs b/framework/base/src/types/interaction/expr/sc_expr.rs
index a81275ec4e..551d4eaf0a 100644
--- a/framework/base/src/types/interaction/expr/sc_expr.rs
+++ b/framework/base/src/types/interaction/expr/sc_expr.rs
@@ -42,7 +42,7 @@ impl<'a, Env> TxToSpecified<Env> for ScExpr<'a>
 where
     Env: TxEnv,
 {
-    fn with_address_ref<F, R>(&self, env: &Env, f: F) -> R
+    fn with_address_ref<F, R>(&self, _env: &Env, f: F) -> R
     where
         F: FnOnce(&ManagedAddress<Env::Api>) -> R,
     {
diff --git a/framework/base/src/types/interaction/tx.rs b/framework/base/src/types/interaction/tx.rs
index d7388dc250..db6c244bd6 100644
--- a/framework/base/src/types/interaction/tx.rs
+++ b/framework/base/src/types/interaction/tx.rs
@@ -1,22 +1,21 @@
 use crate::{
-    api::{self, CallTypeApi, ManagedTypeApi},
-    contract_base::{BlockchainWrapper, SendRawWrapper},
+    api::CallTypeApi,
+    contract_base::BlockchainWrapper,
     types::{
         BigUint, CodeMetadata, EgldOrEsdtTokenPayment, EsdtTokenPayment, ManagedAddress,
         ManagedBuffer, ManagedOption, ManagedVec, MultiEsdtPayment,
     },
 };
-use alloc::boxed::Box;
+
 use multiversx_sc_codec::TopEncodeMulti;
 
 use super::{
-    contract_call_exec::UNSPECIFIED_GAS_LIMIT, contract_call_trait::ContractCallBase,
-    AnnotatedValue, AsyncCall, Code, ContractCallNoPayment, ContractCallWithEgld, ContractDeploy,
-    DeployCall, Egld, EgldPayment, ExplicitGas, FromSource, FunctionCall, ManagedArgBuffer,
-    OriginalResultMarker, RHList, RHListAppendNoRet, RHListAppendRet, RHListItem, TxCodeSource,
-    TxCodeValue, TxData, TxDataFunctionCall, TxEgldValue, TxEnv, TxFrom, TxFromSourceValue,
-    TxFromSpecified, TxGas, TxPayment, TxPaymentEgldOnly, TxPaymentNormalize, TxProxyTrait,
-    TxResultHandler, TxScEnv, TxTo, TxToSpecified,
+    contract_call_exec::UNSPECIFIED_GAS_LIMIT, contract_call_trait::ContractCallBase, Code,
+    ContractCallNoPayment, ContractCallWithEgld, ContractDeploy, DeployCall, Egld, EgldPayment,
+    ExplicitGas, FromSource, FunctionCall, ManagedArgBuffer, OriginalResultMarker, RHList,
+    RHListAppendNoRet, RHListAppendRet, RHListItem, TxCodeSource, TxCodeValue, TxData, TxEgldValue,
+    TxEnv, TxFrom, TxFromSourceValue, TxGas, TxPayment, TxPaymentEgldOnly, TxPaymentNormalize,
+    TxProxyTrait, TxResultHandler, TxScEnv, TxTo, TxToSpecified,
 };
 
 #[must_use]
@@ -623,7 +622,7 @@ where
     RH: TxResultHandler<Env>,
 {
     pub fn code<CodeValue>(
-        mut self,
+        self,
         code: CodeValue,
     ) -> Tx<Env, From, To, Payment, Gas, DeployCall<Env, Code<CodeValue>>, RH>
     where
@@ -641,7 +640,7 @@ where
     }
 
     pub fn from_source<FromSourceValue>(
-        mut self,
+        self,
         source_address: FromSourceValue,
     ) -> Tx<Env, From, To, Payment, Gas, DeployCall<Env, FromSource<FromSourceValue>>, RH>
     where
diff --git a/framework/base/src/types/interaction/tx_call_deploy.rs b/framework/base/src/types/interaction/tx_call_deploy.rs
index 7c9e17d84c..de2e943563 100644
--- a/framework/base/src/types/interaction/tx_call_deploy.rs
+++ b/framework/base/src/types/interaction/tx_call_deploy.rs
@@ -9,9 +9,8 @@ use crate::{
 
 use super::{
     contract_call_exec::decode_result, Code, ConsNoRet, ConsRet, DeployCall, FromSource,
-    OriginalResultMarker, RHList, RHListItem, Tx, TxCodeValue, TxDataFunctionCall,
-    TxEmptyResultHandler, TxEnv, TxFromSourceValue, TxGas, TxPayment, TxPaymentEgldOnly,
-    TxResultHandler, TxScEnv, TxToSpecified,
+    OriginalResultMarker, RHList, RHListItem, Tx, TxCodeValue, TxEmptyResultHandler, TxEnv,
+    TxFromSourceValue, TxGas, TxPaymentEgldOnly, TxResultHandler, TxScEnv,
 };
 
 pub trait RHListItemDeploy<Env, Original>: RHListItem<Env, Original>
diff --git a/framework/base/src/types/interaction/tx_call_sync.rs b/framework/base/src/types/interaction/tx_call_sync.rs
index 8e039b99d0..0213a1df75 100644
--- a/framework/base/src/types/interaction/tx_call_sync.rs
+++ b/framework/base/src/types/interaction/tx_call_sync.rs
@@ -9,8 +9,8 @@ use crate::{
 
 use super::{
     contract_call_exec::decode_result, BackTransfers, ConsNoRet, ConsRet, OriginalResultMarker,
-    RHList, RHListItem, Tx, TxDataFunctionCall, TxEnv, TxGas, TxPayment, TxPaymentNormalize,
-    TxScEnv, TxToSpecified,
+    RHList, RHListItem, Tx, TxDataFunctionCall, TxEnv, TxGas, TxPaymentNormalize, TxScEnv,
+    TxToSpecified,
 };
 
 pub trait RHListItemSync<Env, Original>: RHListItem<Env, Original>
diff --git a/framework/base/src/types/interaction/tx_code_source.rs b/framework/base/src/types/interaction/tx_code_source.rs
index b8c48e718e..d7013a9cde 100644
--- a/framework/base/src/types/interaction/tx_code_source.rs
+++ b/framework/base/src/types/interaction/tx_code_source.rs
@@ -1,7 +1,4 @@
-use crate::{
-    api::ManagedTypeApi,
-    types::{ManagedAddress, ManagedBuffer},
-};
+use crate::types::{ManagedAddress, ManagedBuffer};
 
 use super::{AnnotatedValue, TxEnv};
 
diff --git a/framework/base/src/types/interaction/tx_data.rs b/framework/base/src/types/interaction/tx_data.rs
index eb1e56fd7d..7b347d2f3c 100644
--- a/framework/base/src/types/interaction/tx_data.rs
+++ b/framework/base/src/types/interaction/tx_data.rs
@@ -1,11 +1,9 @@
 use crate::{
-    api::ManagedTypeApi,
-    contract_base::SendRawWrapper,
     formatter::SCLowerHex,
-    types::{CodeMetadata, ManagedAddress, ManagedBuffer, ManagedBufferCachedBuilder, ManagedVec},
+    types::{ManagedBuffer, ManagedBufferCachedBuilder},
 };
 
-use super::{FunctionCall, ManagedArgBuffer, Tx, TxEnv, TxFrom, TxGas, TxPayment, TxTo};
+use super::{FunctionCall, TxEnv};
 
 pub trait TxData<Env>
 where
diff --git a/framework/base/src/types/interaction/tx_env.rs b/framework/base/src/types/interaction/tx_env.rs
index 9a8bfd04ab..54fbf77b90 100644
--- a/framework/base/src/types/interaction/tx_env.rs
+++ b/framework/base/src/types/interaction/tx_env.rs
@@ -1,9 +1,4 @@
-use crate::{
-    api::CallTypeApi,
-    types::{ManagedAddress, ManagedBuffer},
-};
-
-use super::AnnotatedValue;
+use crate::{api::CallTypeApi, types::ManagedAddress};
 
 pub trait TxEnv: Sized {
     type Api: CallTypeApi;
diff --git a/framework/base/src/types/interaction/tx_env_sc.rs b/framework/base/src/types/interaction/tx_env_sc.rs
index cddc6c052b..ce2c287d30 100644
--- a/framework/base/src/types/interaction/tx_env_sc.rs
+++ b/framework/base/src/types/interaction/tx_env_sc.rs
@@ -6,9 +6,7 @@ use crate::{
     types::ManagedAddress,
 };
 
-use super::{
-    contract_call_exec::TRANSFER_EXECUTE_DEFAULT_LEFTOVER, AnnotatedValue, Tx, TxBaseWithEnv, TxEnv,
-};
+use super::{contract_call_exec::TRANSFER_EXECUTE_DEFAULT_LEFTOVER, Tx, TxBaseWithEnv, TxEnv};
 
 pub struct TxScEnv<Api>
 where
diff --git a/framework/base/src/types/interaction/tx_gas.rs b/framework/base/src/types/interaction/tx_gas.rs
index 0b867b19a2..eec1c19e4b 100644
--- a/framework/base/src/types/interaction/tx_gas.rs
+++ b/framework/base/src/types/interaction/tx_gas.rs
@@ -18,7 +18,7 @@ where
         env.default_gas()
     }
 
-    fn explicit_or_gas_left(&self, env: &Env) -> u64 {
+    fn explicit_or_gas_left(&self, _env: &Env) -> u64 {
         Env::Api::blockchain_api_impl().get_gas_left()
     }
 }
diff --git a/framework/base/src/types/interaction/tx_payment.rs b/framework/base/src/types/interaction/tx_payment.rs
index c3cc29fa9d..41d7b7f537 100644
--- a/framework/base/src/types/interaction/tx_payment.rs
+++ b/framework/base/src/types/interaction/tx_payment.rs
@@ -1,15 +1,14 @@
 use crate::{
     api::ManagedTypeApi,
     contract_base::SendRawWrapper,
-    formatter::FormatBuffer,
-    imports::{BigUint, ManagedBuffer, ManagedBufferCachedBuilder, ManagedVec},
+    imports::{BigUint, ManagedBuffer},
     types::{
         EgldOrEsdtTokenPayment, EgldOrMultiEsdtPayment, EsdtTokenPayment, ManagedAddress,
         MultiEsdtPayment,
     },
 };
 
-use super::{Egld, FunctionCall, TxEnv, TxFrom, TxToSpecified};
+use super::{Egld, FunctionCall, TxEnv};
 
 #[derive(Clone)]
 pub struct AnnotatedEgldPayment<Api>
@@ -110,7 +109,7 @@ where
         MultiEsdtPayment::from_single_item(self).perform_transfer_execute(env, to, gas_limit, fc);
     }
 
-    fn into_full_payment_data(self, env: &Env) -> FullPaymentData<Env::Api> {
+    fn into_full_payment_data(self, _env: &Env) -> FullPaymentData<Env::Api> {
         FullPaymentData {
             egld: None,
             multi_esdt: MultiEsdtPayment::from_single_item(self),
@@ -142,7 +141,7 @@ where
         );
     }
 
-    fn into_full_payment_data(self, env: &Env) -> FullPaymentData<Env::Api> {
+    fn into_full_payment_data(self, _env: &Env) -> FullPaymentData<Env::Api> {
         FullPaymentData {
             egld: None,
             multi_esdt: self.clone(),
@@ -168,7 +167,7 @@ where
         (&self).perform_transfer_execute(env, to, gas_limit, fc);
     }
 
-    fn into_full_payment_data(self, env: &Env) -> FullPaymentData<Env::Api> {
+    fn into_full_payment_data(self, _env: &Env) -> FullPaymentData<Env::Api> {
         FullPaymentData {
             egld: None,
             multi_esdt: self,
diff --git a/framework/base/src/types/interaction/tx_payment_egld.rs b/framework/base/src/types/interaction/tx_payment_egld.rs
index 29a3d0781b..fca770068c 100644
--- a/framework/base/src/types/interaction/tx_payment_egld.rs
+++ b/framework/base/src/types/interaction/tx_payment_egld.rs
@@ -1,22 +1,11 @@
 use crate::{
-    api::{self, CallTypeApi, ManagedTypeApi},
-    contract_base::{BlockchainWrapper, SendRawWrapper},
-    types::{
-        BigUint, CodeMetadata, EgldOrEsdtTokenPayment, EgldOrMultiEsdtPayment, EsdtTokenPayment,
-        ManagedAddress, ManagedBuffer, ManagedOption, ManagedVec, MultiEsdtPayment,
-    },
+    contract_base::SendRawWrapper,
+    types::{BigUint, ManagedAddress, ManagedVec},
 };
-use alloc::boxed::Box;
-use multiversx_sc_codec::TopEncodeMulti;
 
 use super::{
-    contract_call_exec::UNSPECIFIED_GAS_LIMIT, contract_call_trait::ContractCallBase,
-    AnnotatedEgldPayment, AnnotatedValue, AsyncCall, Code, ContractCallNoPayment,
-    ContractCallWithEgld, ContractDeploy, DeployCall, ExplicitGas, FromSource, FullPaymentData,
-    FunctionCall, ManagedArgBuffer, OriginalResultMarker, RHList, RHListAppendNoRet,
-    RHListAppendRet, RHListItem, TxCodeSource, TxCodeValue, TxData, TxDataFunctionCall,
-    TxEgldValue, TxEnv, TxFrom, TxFromSourceValue, TxFromSpecified, TxGas, TxPayment, TxProxyTrait,
-    TxResultHandler, TxScEnv, TxTo, TxToSpecified,
+    AnnotatedEgldPayment, FullPaymentData, FunctionCall, TxEgldValue, TxEnv,
+    TxPayment,
 };
 
 /// Indicates the EGLD payment in a transaction.
diff --git a/framework/base/src/types/interaction/tx_payment_egld_value.rs b/framework/base/src/types/interaction/tx_payment_egld_value.rs
index af5da4cbd3..94f424f2bc 100644
--- a/framework/base/src/types/interaction/tx_payment_egld_value.rs
+++ b/framework/base/src/types/interaction/tx_payment_egld_value.rs
@@ -1,23 +1,6 @@
-use crate::{
-    api::{self, CallTypeApi, ManagedTypeApi},
-    contract_base::{BlockchainWrapper, SendRawWrapper},
-    types::{
-        BigUint, CodeMetadata, EgldOrEsdtTokenPayment, EgldOrMultiEsdtPayment, EsdtTokenPayment,
-        ManagedAddress, ManagedBuffer, ManagedOption, ManagedVec, MultiEsdtPayment,
-    },
-};
-use alloc::boxed::Box;
-use multiversx_sc_codec::TopEncodeMulti;
+use crate::types::BigUint;
 
-use super::{
-    contract_call_exec::UNSPECIFIED_GAS_LIMIT, contract_call_trait::ContractCallBase,
-    AnnotatedEgldPayment, AnnotatedValue, AsyncCall, Code, ContractCallNoPayment,
-    ContractCallWithEgld, ContractDeploy, DeployCall, ExplicitGas, FromSource, FullPaymentData,
-    FunctionCall, ManagedArgBuffer, OriginalResultMarker, RHList, RHListAppendNoRet,
-    RHListAppendRet, RHListItem, TxCodeSource, TxCodeValue, TxData, TxDataFunctionCall, TxEnv,
-    TxFrom, TxFromSourceValue, TxFromSpecified, TxGas, TxPayment, TxProxyTrait, TxResultHandler,
-    TxScEnv, TxTo, TxToSpecified,
-};
+use super::{AnnotatedValue, TxEnv};
 
 pub trait TxEgldValue<Env>: AnnotatedValue<Env, BigUint<Env::Api>>
 where
diff --git a/framework/base/src/types/interaction/tx_payment_normalize.rs b/framework/base/src/types/interaction/tx_payment_normalize.rs
index 015df89087..9d64cbb4df 100644
--- a/framework/base/src/types/interaction/tx_payment_normalize.rs
+++ b/framework/base/src/types/interaction/tx_payment_normalize.rs
@@ -1,22 +1,10 @@
-use crate::{
-    api::{self, CallTypeApi, ManagedTypeApi},
-    contract_base::{BlockchainWrapper, SendRawWrapper},
-    types::{
-        BigUint, CodeMetadata, EgldOrEsdtTokenPayment, EgldOrMultiEsdtPayment, EsdtTokenPayment,
-        ManagedAddress, ManagedBuffer, ManagedOption, ManagedVec, MultiEsdtPayment,
-    },
+use crate::types::{
+    BigUint, EgldOrEsdtTokenPayment, EgldOrMultiEsdtPayment, EsdtTokenPayment, ManagedAddress,
+    MultiEsdtPayment,
 };
-use alloc::boxed::Box;
-use multiversx_sc_codec::TopEncodeMulti;
 
 use super::{
-    contract_call_exec::UNSPECIFIED_GAS_LIMIT, contract_call_trait::ContractCallBase,
-    AnnotatedValue, AsyncCall, Code, ContractCallNoPayment, ContractCallWithEgld, ContractDeploy,
-    DeployCall, Egld, ExplicitGas, FromSource, FunctionCall, ManagedArgBuffer,
-    OriginalResultMarker, RHList, RHListAppendNoRet, RHListAppendRet, RHListItem, TxCodeSource,
-    TxCodeValue, TxData, TxDataFunctionCall, TxEgldValue, TxEnv, TxFrom, TxFromSourceValue,
-    TxFromSpecified, TxGas, TxPayment, TxPaymentEgldOnly, TxProxyTrait, TxResultHandler, TxScEnv,
-    TxTo, TxToSpecified,
+    Egld, FunctionCall, TxEgldValue, TxEnv, TxFrom, TxPayment,  TxToSpecified,
 };
 
 /// Defines how a payment transforms a transaction,
@@ -48,7 +36,7 @@ where
     fn with_normalized<F, R>(
         self,
         env: &Env,
-        from: &From,
+        _from: &From,
         to: To,
         fc: FunctionCall<Env::Api>,
         f: F,
@@ -70,7 +58,7 @@ where
     fn with_normalized<F, R>(
         self,
         env: &Env,
-        from: &From,
+        _from: &From,
         to: To,
         fc: FunctionCall<Env::Api>,
         f: F,
diff --git a/framework/base/src/types/interaction/tx_rh_list/returns_new_address.rs b/framework/base/src/types/interaction/tx_rh_list/returns_new_address.rs
index fee76c5e1f..c9c271e2dd 100644
--- a/framework/base/src/types/interaction/tx_rh_list/returns_new_address.rs
+++ b/framework/base/src/types/interaction/tx_rh_list/returns_new_address.rs
@@ -1,9 +1,5 @@
-use crate::{
-    contract_base::BlockchainWrapper,
-    types::{
-        interaction::tx_call_deploy::RHListItemDeploy, BackTransfers, ManagedAddress,
-        ManagedBuffer, ManagedVec, RHListItemSync, TxEnv,
-    },
+use crate::types::{
+    interaction::tx_call_deploy::RHListItemDeploy, ManagedAddress, ManagedBuffer, ManagedVec, TxEnv,
 };
 
 use super::RHListItem;
diff --git a/framework/base/src/types/interaction/tx_rh_list/with_result_new_address.rs b/framework/base/src/types/interaction/tx_rh_list/with_result_new_address.rs
index c58383a86e..64b2894f1f 100644
--- a/framework/base/src/types/interaction/tx_rh_list/with_result_new_address.rs
+++ b/framework/base/src/types/interaction/tx_rh_list/with_result_new_address.rs
@@ -1,8 +1,7 @@
 use core::marker::PhantomData;
 
 use crate::types::{
-    interaction::tx_call_deploy::RHListItemDeploy, ManagedAddress, ManagedBuffer, ManagedVec,
-    RHListItemSync, TxEnv,
+    interaction::tx_call_deploy::RHListItemDeploy, ManagedAddress, ManagedBuffer, ManagedVec, TxEnv,
 };
 
 use super::RHListItem;
diff --git a/framework/base/src/types/interaction/tx_rh_list/with_result_similar.rs b/framework/base/src/types/interaction/tx_rh_list/with_result_similar.rs
index ff0e5b1b5f..c9fd9173b2 100644
--- a/framework/base/src/types/interaction/tx_rh_list/with_result_similar.rs
+++ b/framework/base/src/types/interaction/tx_rh_list/with_result_similar.rs
@@ -1,6 +1,6 @@
 use core::marker::PhantomData;
 
-use multiversx_sc_codec::{CodecFrom, TopDecodeMulti, TopEncodeMulti};
+use multiversx_sc_codec::{CodecFrom, TopEncodeMulti};
 
 use crate::types::{
     interaction::contract_call_exec::decode_result, ManagedBuffer, ManagedVec, RHListItemSync,
diff --git a/framework/base/src/types/interaction/tx_to.rs b/framework/base/src/types/interaction/tx_to.rs
index c09b25d4f3..4116cbc9f9 100644
--- a/framework/base/src/types/interaction/tx_to.rs
+++ b/framework/base/src/types/interaction/tx_to.rs
@@ -27,7 +27,7 @@ impl<Env> TxToSpecified<Env> for ManagedAddress<Env::Api>
 where
     Env: TxEnv,
 {
-    fn with_address_ref<F, R>(&self, env: &Env, f: F) -> R
+    fn with_address_ref<F, R>(&self, _env: &Env, f: F) -> R
     where
         F: FnOnce(&ManagedAddress<Env::Api>) -> R,
     {
@@ -40,7 +40,7 @@ impl<Env> TxToSpecified<Env> for &ManagedAddress<Env::Api>
 where
     Env: TxEnv,
 {
-    fn with_address_ref<F, R>(&self, env: &Env, f: F) -> R
+    fn with_address_ref<F, R>(&self, _env: &Env, f: F) -> R
     where
         F: FnOnce(&ManagedAddress<Env::Api>) -> R,
     {
@@ -53,7 +53,7 @@ impl<Env> TxToSpecified<Env> for Address
 where
     Env: TxEnv,
 {
-    fn with_address_ref<F, R>(&self, env: &Env, f: F) -> R
+    fn with_address_ref<F, R>(&self, _env: &Env, f: F) -> R
     where
         F: FnOnce(&ManagedAddress<Env::Api>) -> R,
     {
@@ -67,7 +67,7 @@ impl<Env> TxToSpecified<Env> for &Address
 where
     Env: TxEnv,
 {
-    fn with_address_ref<F, R>(&self, env: &Env, f: F) -> R
+    fn with_address_ref<F, R>(&self, _env: &Env, f: F) -> R
     where
         F: FnOnce(&ManagedAddress<Env::Api>) -> R,
     {

From 67d22a659a582dea2a76ebbf84989246dbd498f7 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Fri, 22 Mar 2024 19:59:18 +0100
Subject: [PATCH 0530/1254] further impl unified syntax in multisig interact

---
 .../interact/src/multisig_interact.rs         | 43 +++++++----
 .../interact/src/multisig_interact_nfts.rs    | 76 +++++++++++--------
 .../interact/src/multisig_interact_wegld.rs   | 50 ++++++------
 3 files changed, 97 insertions(+), 72 deletions(-)

diff --git a/contracts/examples/multisig/interact/src/multisig_interact.rs b/contracts/examples/multisig/interact/src/multisig_interact.rs
index 1de0b6f261..c068f09a0e 100644
--- a/contracts/examples/multisig/interact/src/multisig_interact.rs
+++ b/contracts/examples/multisig/interact/src/multisig_interact.rs
@@ -13,7 +13,7 @@ use multisig_interact_config::Config;
 use multisig_interact_state::State;
 use multiversx_sc_scenario::{
     mandos_system::ScenarioRunner,
-    multiversx_sc::types::{BigUint, ReturnsNewAddress, ReturnsSimilar},
+    multiversx_sc::types::{BigUint, ReturnsSimilar},
     scenario_format::interpret_trait::InterpretableFrom,
     standalone::retrieve_account_as_scenario_set_state,
     test_wallets,
@@ -158,18 +158,19 @@ impl MultisigInteract {
     async fn deploy(&mut self) {
         self.set_state().await;
 
-        let board = self.board();
+        let _board = self.board();
 
-        let new_address = self
-            .interactor
-            .tx()
-            .from(&self.wallet_address)
-            .typed(multisig_proxy::MultisigProxy)
-            .init(&Config::load_config().quorum(), board)
-            .code(&self.multisig_code)
-            .with_gas_limit(100_000_000u64)
-            .returns(ReturnsNewAddress)
-            .sync_call();
+        let new_address = Address::zero();
+        // let new_address = self
+        //     .interactor
+        //     .tx()
+        //     .from(&self.wallet_address)
+        //     .typed(multisig_proxy::MultisigProxy)
+        //     .init(&Config::load_config().quorum(), board)
+        //     .code(&self.multisig_code)
+        //     .with_gas_limit(100_000_000u64)
+        //     .returns(ReturnsNewAddress)
+        //     .sync_call();
 
         let new_address_bech32 = bech32::encode(&new_address);
         println!("new address: {new_address_bech32}");
@@ -242,7 +243,7 @@ impl MultisigInteract {
             .tx()
             .from(&self.wallet_address)
             .to(self.state.multisig().to_address())
-            .egld(BigUint::from(5_000_000_000_000_000_0u64)) // 0,05 or 5 * 10^16
+            .egld(BigUint::from(50_000_000_000_000_000u64)) // 0,05 or 5 * 10^16
             .prepare_async()
             .run()
             .await;
@@ -303,13 +304,25 @@ impl MultisigInteract {
 
     async fn quorum_reached(&mut self, action_id: usize) -> bool {
         self.interactor
-            .quick_query(self.state.multisig().quorum_reached(action_id))
+            .query()
+            .to(self.state.multisig().to_address())
+            .typed(multisig_proxy::MultisigProxy)
+            .quorum_reached(action_id)
+            .returns(ReturnsSimilar::<bool>::new())
+            .prepare_async()
+            .run()
             .await
     }
 
     async fn signed(&mut self, signer: &Address, action_id: usize) -> bool {
         self.interactor
-            .quick_query(self.state.multisig().signed(signer, action_id))
+            .query()
+            .to(self.state.multisig().to_address())
+            .typed(multisig_proxy::MultisigProxy)
+            .signed(signer, action_id)
+            .returns(ReturnsSimilar::<bool>::new())
+            .prepare_async()
+            .run()
             .await
     }
 
diff --git a/contracts/examples/multisig/interact/src/multisig_interact_nfts.rs b/contracts/examples/multisig/interact/src/multisig_interact_nfts.rs
index d607b7816a..bcf73645ad 100644
--- a/contracts/examples/multisig/interact/src/multisig_interact_nfts.rs
+++ b/contracts/examples/multisig/interact/src/multisig_interact_nfts.rs
@@ -73,6 +73,18 @@ impl MultisigInteract {
         }
         println!("quorum reached for action `{action_id}`");
 
+        // let _ = self
+        //     .interactor
+        //     .tx()
+        //     .from(&self.wallet_address)
+        //     .to(&self.state.multisig().to_address())
+        //     .with_gas_limit(80_000_000u64)
+        //     .typed(multisig_proxy::MultisigProxy)
+        //     .perform_action_endpoint(action_id)
+        //     .with_result(WithResultTokenIdentifier::new(|token_id| {
+        //         self.collection_token_identifier = token_id.to_string()
+        //     }));
+
         let response: TypedResponse<IgnoreValue> = self
             .interactor
             .sc_call_get_result(
@@ -98,23 +110,22 @@ impl MultisigInteract {
         let system_sc_address = bech32::decode(SYSTEM_SC_BECH32);
         let action_id = self
             .interactor
-            .sc_call_get_result(
-                ScCallStep::new()
-                    .call(
-                        self.state.multisig().propose_async_call(
-                            system_sc_address,
-                            ISSUE_COST,
-                            FunctionCall::new("issueNonFungible")
-                                .argument(&COLLECTION_NAME)
-                                .argument(&COLLECTION_TICKER),
-                        ),
-                    )
-                    .from(&self.wallet_address)
-                    .gas_limit("10,000,000"),
+            .tx()
+            .from(&self.wallet_address)
+            .to(&self.state.multisig().to_address())
+            .with_gas_limit(10_000_000u64)
+            .typed(multisig_proxy::MultisigProxy)
+            .propose_async_call(
+                system_sc_address,
+                ISSUE_COST,
+                FunctionCall::new("issueNonFungible")
+                    .argument(&COLLECTION_NAME)
+                    .argument(&COLLECTION_TICKER),
             )
-            .await
-            .result
-            .unwrap();
+            .returns(ReturnsSimilar::<usize>::new())
+            .prepare_async()
+            .run()
+            .await;
 
         println!("successfully proposed issue colllection action `{action_id}`");
         action_id
@@ -156,24 +167,23 @@ impl MultisigInteract {
         let multisig_address = self.state.multisig().to_address();
         let action_id = self
             .interactor
-            .sc_call_get_result(
-                ScCallStep::new()
-                    .call(
-                        self.state.multisig().propose_async_call(
-                            &self.system_sc_address,
-                            0u64,
-                            FunctionCall::new("setSpecialRole")
-                                .argument(&self.collection_token_identifier)
-                                .argument(&multisig_address)
-                                .argument(&"ESDTRoleNFTCreate"),
-                        ),
-                    )
-                    .from(&self.wallet_address)
-                    .gas_limit("10,000,000"),
+            .tx()
+            .from(&self.wallet_address)
+            .to(&self.state.multisig().to_address())
+            .with_gas_limit(10_000_000u64)
+            .typed(multisig_proxy::MultisigProxy)
+            .propose_async_call(
+                &self.system_sc_address,
+                0u64,
+                FunctionCall::new("setSpecialRole")
+                    .argument(&self.collection_token_identifier)
+                    .argument(&multisig_address)
+                    .argument(&"ESDTRoleNFTCreate"),
             )
-            .await
-            .result
-            .unwrap();
+            .returns(ReturnsSimilar::<usize>::new())
+            .prepare_async()
+            .run()
+            .await;
 
         println!("successfully proposed set special role with action `{action_id}`");
         action_id
diff --git a/contracts/examples/multisig/interact/src/multisig_interact_wegld.rs b/contracts/examples/multisig/interact/src/multisig_interact_wegld.rs
index bcfa959805..ebd75faada 100644
--- a/contracts/examples/multisig/interact/src/multisig_interact_wegld.rs
+++ b/contracts/examples/multisig/interact/src/multisig_interact_wegld.rs
@@ -62,19 +62,20 @@ impl MultisigInteract {
     async fn propose_wrap_egld(&mut self) -> usize {
         let action_id = self
             .interactor
-            .sc_call_get_result(
-                ScCallStep::new()
-                    .call(self.state.multisig().propose_async_call(
-                        bech32::decode(WEGLD_SWAP_SC_BECH32),
-                        WRAP_AMOUNT,
-                        FunctionCall::new("wrapEgld"),
-                    ))
-                    .from(&self.wallet_address)
-                    .gas_limit("10,000,000"),
+            .tx()
+            .from(&self.wallet_address)
+            .to(&self.state.multisig().to_address())
+            .with_gas_limit(10_000_000u64)
+            .typed(multisig_proxy::MultisigProxy)
+            .propose_async_call(
+                bech32::decode(WEGLD_SWAP_SC_BECH32),
+                WRAP_AMOUNT,
+                FunctionCall::new("wrapEgld"),
             )
-            .await
-            .result
-            .unwrap();
+            .returns(ReturnsSimilar::<usize>::new())
+            .prepare_async()
+            .run()
+            .await;
 
         println!("successfully proposed wrap egld action `{action_id}`");
         action_id
@@ -94,19 +95,20 @@ impl MultisigInteract {
 
         let action_id = self
             .interactor
-            .sc_call_get_result(
-                ScCallStep::new()
-                    .call(self.state.multisig().propose_async_call(
-                        contract_call.basic.to,
-                        0u64,
-                        contract_call.basic.function_call,
-                    ))
-                    .from(&self.wallet_address)
-                    .gas_limit("10,000,000"),
+            .tx()
+            .from(&self.wallet_address)
+            .to(&self.state.multisig().to_address())
+            .with_gas_limit(10_000_000u64)
+            .typed(multisig_proxy::MultisigProxy)
+            .propose_async_call(
+                contract_call.basic.to,
+                0u64,
+                contract_call.basic.function_call,
             )
-            .await
-            .result
-            .unwrap();
+            .returns(ReturnsSimilar::<usize>::new())
+            .prepare_async()
+            .run()
+            .await;
 
         println!("successfully proposed unwrap egld action `{action_id}`");
         action_id

From 647a1a1c3ff375b5765e40b1c784c4edb7eda34a Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 22 Mar 2024 21:15:35 +0200
Subject: [PATCH 0531/1254] tx payment - file reorg

---
 framework/base/src/types/interaction/mod.rs   |   6 -
 .../base/src/types/interaction/tx_payment.rs  | 236 ++++--------------
 .../{ => tx_payment}/tx_payment_egld.rs       |  32 +--
 .../{ => tx_payment}/tx_payment_egld_value.rs |   4 +-
 .../tx_payment/tx_payment_multi_esdt.rs       |  64 +++++
 .../interaction/tx_payment/tx_payment_none.rs |  48 ++++
 .../{ => tx_payment}/tx_payment_normalize.rs  |   6 +-
 .../tx_payment/tx_payment_other.rs            |  76 ++++++
 .../tx_payment/tx_payment_single_esdt.rs      |  32 +++
 9 files changed, 268 insertions(+), 236 deletions(-)
 rename framework/base/src/types/interaction/{ => tx_payment}/tx_payment_egld.rs (71%)
 rename framework/base/src/types/interaction/{ => tx_payment}/tx_payment_egld_value.rs (92%)
 create mode 100644 framework/base/src/types/interaction/tx_payment/tx_payment_multi_esdt.rs
 create mode 100644 framework/base/src/types/interaction/tx_payment/tx_payment_none.rs
 rename framework/base/src/types/interaction/{ => tx_payment}/tx_payment_normalize.rs (97%)
 create mode 100644 framework/base/src/types/interaction/tx_payment/tx_payment_other.rs
 create mode 100644 framework/base/src/types/interaction/tx_payment/tx_payment_single_esdt.rs

diff --git a/framework/base/src/types/interaction/mod.rs b/framework/base/src/types/interaction/mod.rs
index 44697cddb8..7b751e162b 100644
--- a/framework/base/src/types/interaction/mod.rs
+++ b/framework/base/src/types/interaction/mod.rs
@@ -32,9 +32,6 @@ mod tx_env_sc;
 mod tx_from;
 mod tx_gas;
 mod tx_payment;
-mod tx_payment_egld;
-mod tx_payment_egld_value;
-mod tx_payment_normalize;
 mod tx_proxy;
 mod tx_result_handler;
 mod tx_rh_list;
@@ -73,9 +70,6 @@ pub use tx_env_sc::*;
 pub use tx_from::*;
 pub use tx_gas::*;
 pub use tx_payment::*;
-pub use tx_payment_egld::*;
-pub use tx_payment_egld_value::TxEgldValue;
-pub use tx_payment_normalize::TxPaymentNormalize;
 pub use tx_proxy::*;
 pub use tx_result_handler::*;
 pub use tx_rh_list::*;
diff --git a/framework/base/src/types/interaction/tx_payment.rs b/framework/base/src/types/interaction/tx_payment.rs
index 41d7b7f537..af40f79f56 100644
--- a/framework/base/src/types/interaction/tx_payment.rs
+++ b/framework/base/src/types/interaction/tx_payment.rs
@@ -1,54 +1,25 @@
+mod tx_payment_egld;
+mod tx_payment_egld_value;
+mod tx_payment_multi_esdt;
+mod tx_payment_none;
+mod tx_payment_normalize;
+mod tx_payment_other;
+mod tx_payment_single_esdt;
+
+pub use tx_payment_egld::{Egld, EgldPayment};
+pub use tx_payment_egld_value::TxEgldValue;
+pub use tx_payment_normalize::TxPaymentNormalize;
+
 use crate::{
     api::ManagedTypeApi,
     contract_base::SendRawWrapper,
-    imports::{BigUint, ManagedBuffer},
     types::{
-        EgldOrEsdtTokenPayment, EgldOrMultiEsdtPayment, EsdtTokenPayment, ManagedAddress,
-        MultiEsdtPayment,
+        BigUint, EgldOrEsdtTokenPayment, EgldOrMultiEsdtPayment, EsdtTokenPayment, ManagedAddress,
+        ManagedBuffer, MultiEsdtPayment,
     },
 };
 
-use super::{Egld, FunctionCall, TxEnv};
-
-#[derive(Clone)]
-pub struct AnnotatedEgldPayment<Api>
-where
-    Api: ManagedTypeApi,
-{
-    pub value: BigUint<Api>,
-    pub annotation: ManagedBuffer<Api>,
-}
-
-impl<Api> AnnotatedEgldPayment<Api>
-where
-    Api: ManagedTypeApi,
-{
-    pub fn new_egld(value: BigUint<Api>) -> Self {
-        let annotation = value.to_display();
-        AnnotatedEgldPayment { value, annotation }
-    }
-}
-
-#[derive(Clone)]
-pub struct FullPaymentData<Api>
-where
-    Api: ManagedTypeApi,
-{
-    pub egld: Option<AnnotatedEgldPayment<Api>>,
-    pub multi_esdt: MultiEsdtPayment<Api>,
-}
-
-impl<Api> Default for FullPaymentData<Api>
-where
-    Api: ManagedTypeApi,
-{
-    fn default() -> Self {
-        Self {
-            egld: None,
-            multi_esdt: Default::default(),
-        }
-    }
-}
+use super::{FunctionCall, TxEnv};
 
 /// Describes a payment that is part of a transaction.
 pub trait TxPayment<Env>
@@ -68,177 +39,54 @@ where
     fn into_full_payment_data(self, env: &Env) -> FullPaymentData<Env::Api>;
 }
 
-impl<Env> TxPayment<Env> for ()
+/// Marks a payment object that only contains EGLD or nothing at all.
+pub trait TxPaymentEgldOnly<Env>: TxPayment<Env>
 where
     Env: TxEnv,
 {
-    fn is_no_payment(&self) -> bool {
-        true
-    }
-
-    fn perform_transfer_execute(
-        self,
-        env: &Env,
-        to: &ManagedAddress<Env::Api>,
-        gas_limit: u64,
-        fc: FunctionCall<Env::Api>,
-    ) {
-        Egld(BigUint::zero()).perform_transfer_execute(env, to, gas_limit, fc);
-    }
+    fn with_egld_value<F, R>(&self, f: F) -> R
+    where
+        F: FnOnce(&BigUint<Env::Api>) -> R;
 
-    fn into_full_payment_data(self, _env: &Env) -> FullPaymentData<Env::Api> {
-        FullPaymentData::default()
-    }
+    fn into_egld_payment(self, env: &Env) -> BigUint<Env::Api>;
 }
 
-impl<Env> TxPayment<Env> for EsdtTokenPayment<Env::Api>
-where
-    Env: TxEnv,
-{
-    fn is_no_payment(&self) -> bool {
-        self.amount == 0u32
-    }
-
-    fn perform_transfer_execute(
-        self,
-        env: &Env,
-        to: &ManagedAddress<Env::Api>,
-        gas_limit: u64,
-        fc: FunctionCall<Env::Api>,
-    ) {
-        MultiEsdtPayment::from_single_item(self).perform_transfer_execute(env, to, gas_limit, fc);
-    }
-
-    fn into_full_payment_data(self, _env: &Env) -> FullPaymentData<Env::Api> {
-        FullPaymentData {
-            egld: None,
-            multi_esdt: MultiEsdtPayment::from_single_item(self),
-        }
-    }
-}
-
-impl<Env> TxPayment<Env> for &MultiEsdtPayment<Env::Api>
+#[derive(Clone)]
+pub struct AnnotatedEgldPayment<Api>
 where
-    Env: TxEnv,
+    Api: ManagedTypeApi,
 {
-    fn is_no_payment(&self) -> bool {
-        self.is_empty()
-    }
-
-    fn perform_transfer_execute(
-        self,
-        _env: &Env,
-        to: &ManagedAddress<Env::Api>,
-        gas_limit: u64,
-        fc: FunctionCall<Env::Api>,
-    ) {
-        let _ = SendRawWrapper::<Env::Api>::new().multi_esdt_transfer_execute(
-            to,
-            self,
-            gas_limit,
-            &fc.function_name,
-            &fc.arg_buffer,
-        );
-    }
-
-    fn into_full_payment_data(self, _env: &Env) -> FullPaymentData<Env::Api> {
-        FullPaymentData {
-            egld: None,
-            multi_esdt: self.clone(),
-        }
-    }
+    pub value: BigUint<Api>,
+    pub annotation: ManagedBuffer<Api>,
 }
 
-impl<Env> TxPayment<Env> for MultiEsdtPayment<Env::Api>
+impl<Api> AnnotatedEgldPayment<Api>
 where
-    Env: TxEnv,
+    Api: ManagedTypeApi,
 {
-    fn is_no_payment(&self) -> bool {
-        self.is_empty()
-    }
-
-    fn perform_transfer_execute(
-        self,
-        env: &Env,
-        to: &ManagedAddress<Env::Api>,
-        gas_limit: u64,
-        fc: FunctionCall<Env::Api>,
-    ) {
-        (&self).perform_transfer_execute(env, to, gas_limit, fc);
-    }
-
-    fn into_full_payment_data(self, _env: &Env) -> FullPaymentData<Env::Api> {
-        FullPaymentData {
-            egld: None,
-            multi_esdt: self,
-        }
+    pub fn new_egld(value: BigUint<Api>) -> Self {
+        let annotation = value.to_display();
+        AnnotatedEgldPayment { value, annotation }
     }
 }
 
-impl<Env> TxPayment<Env> for EgldOrEsdtTokenPayment<Env::Api>
+#[derive(Clone)]
+pub struct FullPaymentData<Api>
 where
-    Env: TxEnv,
+    Api: ManagedTypeApi,
 {
-    fn is_no_payment(&self) -> bool {
-        self.amount == 0u32
-    }
-
-    fn perform_transfer_execute(
-        self,
-        env: &Env,
-        to: &ManagedAddress<Env::Api>,
-        gas_limit: u64,
-        fc: FunctionCall<Env::Api>,
-    ) {
-        self.map_egld_or_esdt(
-            (to, fc),
-            |(to, fc), amount| Egld(amount).perform_transfer_execute(env, to, gas_limit, fc),
-            |(to, fc), esdt_payment| esdt_payment.perform_transfer_execute(env, to, gas_limit, fc),
-        )
-    }
-
-    fn into_full_payment_data(self, env: &Env) -> FullPaymentData<Env::Api> {
-        self.map_egld_or_esdt(
-            (),
-            |(), amount| TxPayment::<Env>::into_full_payment_data(Egld(amount), env),
-            |(), esdt_payment| TxPayment::<Env>::into_full_payment_data(esdt_payment, env),
-        )
-    }
+    pub egld: Option<AnnotatedEgldPayment<Api>>,
+    pub multi_esdt: MultiEsdtPayment<Api>,
 }
 
-impl<Env> TxPayment<Env> for EgldOrMultiEsdtPayment<Env::Api>
+impl<Api> Default for FullPaymentData<Api>
 where
-    Env: TxEnv,
+    Api: ManagedTypeApi,
 {
-    fn is_no_payment(&self) -> bool {
-        self.is_empty()
-    }
-
-    fn perform_transfer_execute(
-        self,
-        env: &Env,
-        to: &ManagedAddress<Env::Api>,
-        gas_limit: u64,
-        fc: FunctionCall<Env::Api>,
-    ) {
-        match self {
-            EgldOrMultiEsdtPayment::Egld(egld_amount) => {
-                Egld(egld_amount).perform_transfer_execute(env, to, gas_limit, fc)
-            },
-            EgldOrMultiEsdtPayment::MultiEsdt(multi_esdt_payment) => {
-                multi_esdt_payment.perform_transfer_execute(env, to, gas_limit, fc)
-            },
-        }
-    }
-
-    fn into_full_payment_data(self, env: &Env) -> FullPaymentData<Env::Api> {
-        match self {
-            EgldOrMultiEsdtPayment::Egld(egld_amount) => {
-                TxPayment::<Env>::into_full_payment_data(Egld(egld_amount), env)
-            },
-            EgldOrMultiEsdtPayment::MultiEsdt(multi_esdt_payment) => {
-                TxPayment::<Env>::into_full_payment_data(multi_esdt_payment, env)
-            },
+    fn default() -> Self {
+        Self {
+            egld: None,
+            multi_esdt: Default::default(),
         }
     }
 }
diff --git a/framework/base/src/types/interaction/tx_payment_egld.rs b/framework/base/src/types/interaction/tx_payment/tx_payment_egld.rs
similarity index 71%
rename from framework/base/src/types/interaction/tx_payment_egld.rs
rename to framework/base/src/types/interaction/tx_payment/tx_payment_egld.rs
index fca770068c..f84d6afacb 100644
--- a/framework/base/src/types/interaction/tx_payment_egld.rs
+++ b/framework/base/src/types/interaction/tx_payment/tx_payment_egld.rs
@@ -4,8 +4,8 @@ use crate::{
 };
 
 use super::{
-    AnnotatedEgldPayment, FullPaymentData, FunctionCall, TxEgldValue, TxEnv,
-    TxPayment,
+    AnnotatedEgldPayment, FullPaymentData, FunctionCall, TxEgldValue, TxEnv, TxPayment,
+    TxPaymentEgldOnly,
 };
 
 /// Indicates the EGLD payment in a transaction.
@@ -48,34 +48,6 @@ where
     }
 }
 
-/// Marks a payment object that only contains EGLD or nothing at all.
-pub trait TxPaymentEgldOnly<Env>: TxPayment<Env>
-where
-    Env: TxEnv,
-{
-    fn with_egld_value<F, R>(&self, f: F) -> R
-    where
-        F: FnOnce(&BigUint<Env::Api>) -> R;
-
-    fn into_egld_payment(self, env: &Env) -> BigUint<Env::Api>;
-}
-
-impl<Env> TxPaymentEgldOnly<Env> for ()
-where
-    Env: TxEnv,
-{
-    fn with_egld_value<F, R>(&self, f: F) -> R
-    where
-        F: FnOnce(&BigUint<Env::Api>) -> R,
-    {
-        f(&BigUint::zero())
-    }
-
-    fn into_egld_payment(self, _env: &Env) -> BigUint<Env::Api> {
-        BigUint::zero()
-    }
-}
-
 impl<Env, EgldValue> TxPaymentEgldOnly<Env> for Egld<EgldValue>
 where
     Env: TxEnv,
diff --git a/framework/base/src/types/interaction/tx_payment_egld_value.rs b/framework/base/src/types/interaction/tx_payment/tx_payment_egld_value.rs
similarity index 92%
rename from framework/base/src/types/interaction/tx_payment_egld_value.rs
rename to framework/base/src/types/interaction/tx_payment/tx_payment_egld_value.rs
index 94f424f2bc..561235eef2 100644
--- a/framework/base/src/types/interaction/tx_payment_egld_value.rs
+++ b/framework/base/src/types/interaction/tx_payment/tx_payment_egld_value.rs
@@ -1,6 +1,6 @@
-use crate::types::BigUint;
+use crate::types::{AnnotatedValue, BigUint};
 
-use super::{AnnotatedValue, TxEnv};
+use super::TxEnv;
 
 pub trait TxEgldValue<Env>: AnnotatedValue<Env, BigUint<Env::Api>>
 where
diff --git a/framework/base/src/types/interaction/tx_payment/tx_payment_multi_esdt.rs b/framework/base/src/types/interaction/tx_payment/tx_payment_multi_esdt.rs
new file mode 100644
index 0000000000..84a8de5e5b
--- /dev/null
+++ b/framework/base/src/types/interaction/tx_payment/tx_payment_multi_esdt.rs
@@ -0,0 +1,64 @@
+use crate::{
+    contract_base::SendRawWrapper,
+    types::{BigUint, ManagedAddress, ManagedVec, MultiEsdtPayment},
+};
+
+use super::{AnnotatedEgldPayment, FullPaymentData, FunctionCall, TxEgldValue, TxEnv, TxPayment};
+
+impl<Env> TxPayment<Env> for &MultiEsdtPayment<Env::Api>
+where
+    Env: TxEnv,
+{
+    fn is_no_payment(&self) -> bool {
+        self.is_empty()
+    }
+
+    fn perform_transfer_execute(
+        self,
+        _env: &Env,
+        to: &ManagedAddress<Env::Api>,
+        gas_limit: u64,
+        fc: FunctionCall<Env::Api>,
+    ) {
+        let _ = SendRawWrapper::<Env::Api>::new().multi_esdt_transfer_execute(
+            to,
+            self,
+            gas_limit,
+            &fc.function_name,
+            &fc.arg_buffer,
+        );
+    }
+
+    fn into_full_payment_data(self, _env: &Env) -> FullPaymentData<Env::Api> {
+        FullPaymentData {
+            egld: None,
+            multi_esdt: self.clone(),
+        }
+    }
+}
+
+impl<Env> TxPayment<Env> for MultiEsdtPayment<Env::Api>
+where
+    Env: TxEnv,
+{
+    fn is_no_payment(&self) -> bool {
+        self.is_empty()
+    }
+
+    fn perform_transfer_execute(
+        self,
+        env: &Env,
+        to: &ManagedAddress<Env::Api>,
+        gas_limit: u64,
+        fc: FunctionCall<Env::Api>,
+    ) {
+        (&self).perform_transfer_execute(env, to, gas_limit, fc);
+    }
+
+    fn into_full_payment_data(self, _env: &Env) -> FullPaymentData<Env::Api> {
+        FullPaymentData {
+            egld: None,
+            multi_esdt: self,
+        }
+    }
+}
diff --git a/framework/base/src/types/interaction/tx_payment/tx_payment_none.rs b/framework/base/src/types/interaction/tx_payment/tx_payment_none.rs
new file mode 100644
index 0000000000..7b34ccfe9b
--- /dev/null
+++ b/framework/base/src/types/interaction/tx_payment/tx_payment_none.rs
@@ -0,0 +1,48 @@
+use crate::{
+    contract_base::SendRawWrapper,
+    types::{BigUint, ManagedAddress, ManagedVec},
+};
+
+use super::{
+    AnnotatedEgldPayment, Egld, FullPaymentData, FunctionCall, TxEgldValue, TxEnv, TxPayment,
+    TxPaymentEgldOnly,
+};
+
+impl<Env> TxPayment<Env> for ()
+where
+    Env: TxEnv,
+{
+    fn is_no_payment(&self) -> bool {
+        true
+    }
+
+    fn perform_transfer_execute(
+        self,
+        env: &Env,
+        to: &ManagedAddress<Env::Api>,
+        gas_limit: u64,
+        fc: FunctionCall<Env::Api>,
+    ) {
+        Egld(BigUint::zero()).perform_transfer_execute(env, to, gas_limit, fc);
+    }
+
+    fn into_full_payment_data(self, _env: &Env) -> FullPaymentData<Env::Api> {
+        FullPaymentData::default()
+    }
+}
+
+impl<Env> TxPaymentEgldOnly<Env> for ()
+where
+    Env: TxEnv,
+{
+    fn with_egld_value<F, R>(&self, f: F) -> R
+    where
+        F: FnOnce(&BigUint<Env::Api>) -> R,
+    {
+        f(&BigUint::zero())
+    }
+
+    fn into_egld_payment(self, _env: &Env) -> BigUint<Env::Api> {
+        BigUint::zero()
+    }
+}
diff --git a/framework/base/src/types/interaction/tx_payment_normalize.rs b/framework/base/src/types/interaction/tx_payment/tx_payment_normalize.rs
similarity index 97%
rename from framework/base/src/types/interaction/tx_payment_normalize.rs
rename to framework/base/src/types/interaction/tx_payment/tx_payment_normalize.rs
index 9d64cbb4df..db263fa83f 100644
--- a/framework/base/src/types/interaction/tx_payment_normalize.rs
+++ b/framework/base/src/types/interaction/tx_payment/tx_payment_normalize.rs
@@ -1,11 +1,9 @@
 use crate::types::{
     BigUint, EgldOrEsdtTokenPayment, EgldOrMultiEsdtPayment, EsdtTokenPayment, ManagedAddress,
-    MultiEsdtPayment,
+    MultiEsdtPayment, TxFrom, TxToSpecified,
 };
 
-use super::{
-    Egld, FunctionCall, TxEgldValue, TxEnv, TxFrom, TxPayment,  TxToSpecified,
-};
+use super::{Egld, FunctionCall, TxEgldValue, TxEnv, TxPayment};
 
 /// Defines how a payment transforms a transaction,
 /// e.g. from ESDT transfer to ESDTTransfer builtin function.
diff --git a/framework/base/src/types/interaction/tx_payment/tx_payment_other.rs b/framework/base/src/types/interaction/tx_payment/tx_payment_other.rs
new file mode 100644
index 0000000000..0c8bf7772b
--- /dev/null
+++ b/framework/base/src/types/interaction/tx_payment/tx_payment_other.rs
@@ -0,0 +1,76 @@
+use crate::{
+    contract_base::SendRawWrapper,
+    types::{
+        BigUint, Egld, EgldOrEsdtTokenPayment, EgldOrMultiEsdtPayment, ManagedAddress, ManagedVec,
+    },
+};
+
+use super::{AnnotatedEgldPayment, FullPaymentData, FunctionCall, TxEgldValue, TxEnv, TxPayment};
+
+impl<Env> TxPayment<Env> for EgldOrEsdtTokenPayment<Env::Api>
+where
+    Env: TxEnv,
+{
+    fn is_no_payment(&self) -> bool {
+        self.amount == 0u32
+    }
+
+    fn perform_transfer_execute(
+        self,
+        env: &Env,
+        to: &ManagedAddress<Env::Api>,
+        gas_limit: u64,
+        fc: FunctionCall<Env::Api>,
+    ) {
+        self.map_egld_or_esdt(
+            (to, fc),
+            |(to, fc), amount| Egld(amount).perform_transfer_execute(env, to, gas_limit, fc),
+            |(to, fc), esdt_payment| esdt_payment.perform_transfer_execute(env, to, gas_limit, fc),
+        )
+    }
+
+    fn into_full_payment_data(self, env: &Env) -> FullPaymentData<Env::Api> {
+        self.map_egld_or_esdt(
+            (),
+            |(), amount| TxPayment::<Env>::into_full_payment_data(Egld(amount), env),
+            |(), esdt_payment| TxPayment::<Env>::into_full_payment_data(esdt_payment, env),
+        )
+    }
+}
+
+impl<Env> TxPayment<Env> for EgldOrMultiEsdtPayment<Env::Api>
+where
+    Env: TxEnv,
+{
+    fn is_no_payment(&self) -> bool {
+        self.is_empty()
+    }
+
+    fn perform_transfer_execute(
+        self,
+        env: &Env,
+        to: &ManagedAddress<Env::Api>,
+        gas_limit: u64,
+        fc: FunctionCall<Env::Api>,
+    ) {
+        match self {
+            EgldOrMultiEsdtPayment::Egld(egld_amount) => {
+                Egld(egld_amount).perform_transfer_execute(env, to, gas_limit, fc)
+            },
+            EgldOrMultiEsdtPayment::MultiEsdt(multi_esdt_payment) => {
+                multi_esdt_payment.perform_transfer_execute(env, to, gas_limit, fc)
+            },
+        }
+    }
+
+    fn into_full_payment_data(self, env: &Env) -> FullPaymentData<Env::Api> {
+        match self {
+            EgldOrMultiEsdtPayment::Egld(egld_amount) => {
+                TxPayment::<Env>::into_full_payment_data(Egld(egld_amount), env)
+            },
+            EgldOrMultiEsdtPayment::MultiEsdt(multi_esdt_payment) => {
+                TxPayment::<Env>::into_full_payment_data(multi_esdt_payment, env)
+            },
+        }
+    }
+}
diff --git a/framework/base/src/types/interaction/tx_payment/tx_payment_single_esdt.rs b/framework/base/src/types/interaction/tx_payment/tx_payment_single_esdt.rs
new file mode 100644
index 0000000000..7651351db8
--- /dev/null
+++ b/framework/base/src/types/interaction/tx_payment/tx_payment_single_esdt.rs
@@ -0,0 +1,32 @@
+use crate::{
+    contract_base::SendRawWrapper,
+    types::{BigUint, EsdtTokenPayment, ManagedAddress, ManagedVec, MultiEsdtPayment},
+};
+
+use super::{AnnotatedEgldPayment, FullPaymentData, FunctionCall, TxEgldValue, TxEnv, TxPayment};
+
+impl<Env> TxPayment<Env> for EsdtTokenPayment<Env::Api>
+where
+    Env: TxEnv,
+{
+    fn is_no_payment(&self) -> bool {
+        self.amount == 0u32
+    }
+
+    fn perform_transfer_execute(
+        self,
+        env: &Env,
+        to: &ManagedAddress<Env::Api>,
+        gas_limit: u64,
+        fc: FunctionCall<Env::Api>,
+    ) {
+        MultiEsdtPayment::from_single_item(self).perform_transfer_execute(env, to, gas_limit, fc);
+    }
+
+    fn into_full_payment_data(self, _env: &Env) -> FullPaymentData<Env::Api> {
+        FullPaymentData {
+            egld: None,
+            multi_esdt: MultiEsdtPayment::from_single_item(self),
+        }
+    }
+}

From 2497d68df0aae32439c7c972ca639d0f5230e848 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 22 Mar 2024 21:15:41 +0200
Subject: [PATCH 0532/1254] import fix

---
 .../base/src/storage/mappers/ordered_binary_tree_mapper.rs    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/framework/base/src/storage/mappers/ordered_binary_tree_mapper.rs b/framework/base/src/storage/mappers/ordered_binary_tree_mapper.rs
index 8d56c302aa..fbc3de782f 100644
--- a/framework/base/src/storage/mappers/ordered_binary_tree_mapper.rs
+++ b/framework/base/src/storage/mappers/ordered_binary_tree_mapper.rs
@@ -3,10 +3,10 @@ use core::marker::PhantomData;
 use codec::Empty;
 
 use crate::{
-    api::StorageMapperApi,
-    imports::{ErrorApiImpl, ManagedType},
+    api::{ErrorApiImpl, StorageMapperApi},
     storage::StorageKey,
     storage_set,
+    types::ManagedType,
 };
 
 use super::{

From c78d33451732e5ec459e68a79c59be2537320413 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Fri, 22 Mar 2024 20:24:57 +0100
Subject: [PATCH 0533/1254] returnsNewTokenIdentifier and further improvements
 to multisig interact

---
 .../interact/src/multisig_interact.rs         | 33 ++++-----
 .../interact/src/multisig_interact_nfts.rs    | 69 ++++++++-----------
 .../base/src/types/interaction/tx_rh_list.rs  |  3 +
 .../returns_new_token_identifier.rs           | 32 +++++++++
 .../facade/world_tx/scenario_rh_list_item.rs  | 19 ++++-
 5 files changed, 96 insertions(+), 60 deletions(-)
 create mode 100644 framework/base/src/types/interaction/tx_rh_list/returns_new_token_identifier.rs

diff --git a/contracts/examples/multisig/interact/src/multisig_interact.rs b/contracts/examples/multisig/interact/src/multisig_interact.rs
index c068f09a0e..8f7c4ddd1b 100644
--- a/contracts/examples/multisig/interact/src/multisig_interact.rs
+++ b/contracts/examples/multisig/interact/src/multisig_interact.rs
@@ -13,7 +13,7 @@ use multisig_interact_config::Config;
 use multisig_interact_state::State;
 use multiversx_sc_scenario::{
     mandos_system::ScenarioRunner,
-    multiversx_sc::types::{BigUint, ReturnsSimilar},
+    multiversx_sc::types::{BigUint, ReturnsNewAddress, ReturnsSimilar},
     scenario_format::interpret_trait::InterpretableFrom,
     standalone::retrieve_account_as_scenario_set_state,
     test_wallets,
@@ -158,21 +158,22 @@ impl MultisigInteract {
     async fn deploy(&mut self) {
         self.set_state().await;
 
-        let _board = self.board();
-
-        let new_address = Address::zero();
-        // let new_address = self
-        //     .interactor
-        //     .tx()
-        //     .from(&self.wallet_address)
-        //     .typed(multisig_proxy::MultisigProxy)
-        //     .init(&Config::load_config().quorum(), board)
-        //     .code(&self.multisig_code)
-        //     .with_gas_limit(100_000_000u64)
-        //     .returns(ReturnsNewAddress)
-        //     .sync_call();
-
-        let new_address_bech32 = bech32::encode(&new_address);
+        let board = self.board();
+
+        let new_address = self
+            .interactor
+            .tx()
+            .from(&self.wallet_address)
+            .typed(multisig_proxy::MultisigProxy)
+            .init(&Config::load_config().quorum(), board)
+            .code(&self.multisig_code)
+            .with_gas_limit(100_000_000u64)
+            .returns(ReturnsNewAddress)
+            .prepare_async()
+            .run()
+            .await;
+
+        let new_address_bech32 = bech32::encode(&new_address.to_address());
         println!("new address: {new_address_bech32}");
 
         let new_address_expr = format!("bech32:{new_address_bech32}");
diff --git a/contracts/examples/multisig/interact/src/multisig_interact_nfts.rs b/contracts/examples/multisig/interact/src/multisig_interact_nfts.rs
index bcf73645ad..73f128c564 100644
--- a/contracts/examples/multisig/interact/src/multisig_interact_nfts.rs
+++ b/contracts/examples/multisig/interact/src/multisig_interact_nfts.rs
@@ -1,8 +1,8 @@
 use std::time::Duration;
 
 use multiversx_sc_scenario::multiversx_sc::{
-    codec::{multi_types::IgnoreValue, Empty},
-    types::FunctionCall,
+    codec::Empty,
+    types::{FunctionCall, ReturnsNewTokenIdentidier},
 };
 
 use super::*;
@@ -73,33 +73,20 @@ impl MultisigInteract {
         }
         println!("quorum reached for action `{action_id}`");
 
-        // let _ = self
-        //     .interactor
-        //     .tx()
-        //     .from(&self.wallet_address)
-        //     .to(&self.state.multisig().to_address())
-        //     .with_gas_limit(80_000_000u64)
-        //     .typed(multisig_proxy::MultisigProxy)
-        //     .perform_action_endpoint(action_id)
-        //     .with_result(WithResultTokenIdentifier::new(|token_id| {
-        //         self.collection_token_identifier = token_id.to_string()
-        //     }));
-
-        let response: TypedResponse<IgnoreValue> = self
+        let new_token_id = self
             .interactor
-            .sc_call_get_result(
-                ScCallStep::new()
-                    .call(self.state.multisig().perform_action_endpoint(action_id))
-                    .from(&self.wallet_address)
-                    .gas_limit("80,000,000")
-                    .expect(TxExpect::ok().additional_error_message(
-                        "perform issue collection with all roles failed: ",
-                    )),
-            )
+            .tx()
+            .from(&self.wallet_address)
+            .to(&self.state.multisig().to_address())
+            .with_gas_limit(80_000_000u64)
+            .typed(multisig_proxy::MultisigProxy)
+            .perform_action_endpoint(action_id)
+            .returns(ReturnsNewTokenIdentidier)
+            .prepare_async()
+            .run()
             .await;
-        self.collection_token_identifier = response
-            .new_issued_token_identifier
-            .expect("new token identifier could not be retrieved");
+        self.collection_token_identifier = new_token_id.to_string();
+
         println!(
             "collection token identifier: {}",
             self.collection_token_identifier
@@ -141,22 +128,20 @@ impl MultisigInteract {
             return;
         }
         println!("quorum reached for action `{action_id}`");
+        let new_token_id = self
+            .interactor
+            .tx()
+            .from(&self.wallet_address)
+            .to(&self.state.multisig().to_address())
+            .with_gas_limit(80_000_000u64)
+            .typed(multisig_proxy::MultisigProxy)
+            .perform_action_endpoint(action_id)
+            .returns(ReturnsNewTokenIdentidier)
+            .prepare_async()
+            .run()
+            .await;
+        self.collection_token_identifier = new_token_id.to_string();
 
-        let response: TypedResponse<IgnoreValue> =
-            self.interactor
-                .sc_call_get_result(
-                    ScCallStep::new()
-                        .call(self.state.multisig().perform_action_endpoint(action_id))
-                        .from(&self.wallet_address)
-                        .gas_limit("80,000,000")
-                        .expect(TxExpect::ok().additional_error_message(
-                            "perform issue collection with all failed: ",
-                        )),
-                )
-                .await;
-        self.collection_token_identifier = response
-            .new_issued_token_identifier
-            .expect("new token identifier could not be retrieved");
         println!(
             "collection token identifier: {}",
             self.collection_token_identifier
diff --git a/framework/base/src/types/interaction/tx_rh_list.rs b/framework/base/src/types/interaction/tx_rh_list.rs
index 2cf4743ef2..b3dd278f12 100644
--- a/framework/base/src/types/interaction/tx_rh_list.rs
+++ b/framework/base/src/types/interaction/tx_rh_list.rs
@@ -3,6 +3,7 @@ mod returns_exact;
 mod returns_new_address;
 mod returns_raw;
 mod returns_similar;
+mod returns_new_token_identifier;
 mod tx_rh_list_cons;
 mod tx_rh_list_item;
 mod with_result_exact;
@@ -15,7 +16,9 @@ pub use returns_exact::*;
 pub use returns_new_address::*;
 pub use returns_raw::*;
 pub use returns_similar::*;
+pub use returns_new_token_identifier::*;
 pub use tx_rh_list_cons::*;
 pub use tx_rh_list_item::*;
 pub use with_result_new_address::*;
 pub use with_result_similar::*;
+
diff --git a/framework/base/src/types/interaction/tx_rh_list/returns_new_token_identifier.rs b/framework/base/src/types/interaction/tx_rh_list/returns_new_token_identifier.rs
new file mode 100644
index 0000000000..71d5751de1
--- /dev/null
+++ b/framework/base/src/types/interaction/tx_rh_list/returns_new_token_identifier.rs
@@ -0,0 +1,32 @@
+use crate::{
+    contract_base::BlockchainWrapper, proxy_imports::TokenIdentifier, types::{
+        interaction::tx_call_deploy::RHListItemDeploy, BackTransfers, ManagedAddress,
+        ManagedBuffer, ManagedVec, RHListItemSync, TxEnv,
+    }
+};
+
+use super::RHListItem;
+
+pub struct ReturnsNewTokenIdentidier;
+
+impl<Env, Original> RHListItem<Env, Original> for ReturnsNewTokenIdentidier
+where
+    Env: TxEnv,
+{
+    type Returns = TokenIdentifier<Env::Api>;
+}
+
+
+// impl<Env, Original> RHListItemScenario<Env, Original> for ReturnsNewTokenIdentidier
+// where
+//     Env: TxEnv,
+// {
+//     fn item_scenario_result(self, tx_response: &TxResponse) -> Self::Returns {
+//         let new_token_id = tx_response
+//             .new_issued_token_identifier
+//             .clone()
+//             .expect("missing returned token identifier");
+
+//         new_token_id.into()
+//     }
+// }
diff --git a/framework/scenario/src/facade/world_tx/scenario_rh_list_item.rs b/framework/scenario/src/facade/world_tx/scenario_rh_list_item.rs
index 36440e0313..7ed940c6be 100644
--- a/framework/scenario/src/facade/world_tx/scenario_rh_list_item.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_rh_list_item.rs
@@ -1,8 +1,9 @@
 use multiversx_sc::{
     codec::{CodecFrom, TopDecodeMulti, TopEncodeMulti},
     types::{
-        ManagedAddress, RHList, RHListItem, ReturnsExact, ReturnsNewAddress, ReturnsSimilar, TxEnv,
-        WithResultNewAddress, WithResultSimilar,
+        ManagedAddress, RHList, RHListItem, ReturnsExact, ReturnsNewAddress,
+        ReturnsNewTokenIdentidier, ReturnsSimilar, TokenIdentifier, TxEnv, WithResultNewAddress,
+        WithResultSimilar,
     },
 };
 
@@ -77,6 +78,20 @@ where
     }
 }
 
+impl<Env, Original> RHListItemScenario<Env, Original> for ReturnsNewTokenIdentidier
+where
+    Env: TxEnv,
+{
+    fn item_scenario_result(self, tx_response: &TxResponse) -> Self::Returns {
+        let new_token_id = tx_response
+            .new_issued_token_identifier
+            .clone()
+            .expect("missing returned token identifier");
+
+        TokenIdentifier::from(new_token_id.as_str())
+    }
+}
+
 impl<Env, Original, F> RHListItemScenario<Env, Original> for WithResultNewAddress<Env, F>
 where
     Env: TxEnv,

From 1e95bad87d036e0e5971dc5fd3416827f6e8cfe0 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 22 Mar 2024 22:31:16 +0200
Subject: [PATCH 0534/1254] tx payment refactor - with_normalized moved back to
 TxPayment

---
 .../interaction/contract_call_convert.rs      |   6 +-
 .../src/types/interaction/function_call.rs    |   8 +-
 framework/base/src/types/interaction/tx.rs    |   6 +-
 .../src/types/interaction/tx_call_async.rs    |   4 +-
 .../interaction/tx_call_async_promises.rs     |   4 +-
 .../src/types/interaction/tx_call_sync.rs     |   7 +-
 .../base/src/types/interaction/tx_payment.rs  |  22 ++-
 .../interaction/tx_payment/tx_payment_egld.rs |  21 +-
 .../tx_payment/tx_payment_multi_esdt.rs       |  41 +++-
 .../interaction/tx_payment/tx_payment_none.rs |  18 +-
 .../tx_payment/tx_payment_normalize.rs        | 182 ------------------
 .../tx_payment/tx_payment_other.rs            |  44 +++++
 .../tx_payment/tx_payment_single_esdt.rs      |  29 ++-
 13 files changed, 185 insertions(+), 207 deletions(-)
 delete mode 100644 framework/base/src/types/interaction/tx_payment/tx_payment_normalize.rs

diff --git a/framework/base/src/types/interaction/contract_call_convert.rs b/framework/base/src/types/interaction/contract_call_convert.rs
index c7e4301c2c..88e6ae6627 100644
--- a/framework/base/src/types/interaction/contract_call_convert.rs
+++ b/framework/base/src/types/interaction/contract_call_convert.rs
@@ -38,7 +38,7 @@ where
                     function_call: self
                         .basic
                         .function_call
-                        .convert_to_single_transfer_fungible_call(payment),
+                        .convert_to_single_transfer_fungible_call(&payment),
                     explicit_gas_limit: self.basic.explicit_gas_limit,
                     _return_type: PhantomData,
                 },
@@ -55,7 +55,7 @@ where
                     function_call: self
                         .basic
                         .function_call
-                        .convert_to_single_transfer_nft_call(&self.basic.to, payment),
+                        .convert_to_single_transfer_nft_call(&self.basic.to, &payment),
                     explicit_gas_limit: self.basic.explicit_gas_limit,
                     _return_type: PhantomData,
                 },
@@ -78,7 +78,7 @@ where
                 function_call: self
                     .basic
                     .function_call
-                    .convert_to_multi_transfer_esdt_call(&self.basic.to, payments),
+                    .convert_to_multi_transfer_esdt_call(&self.basic.to, &payments),
                 explicit_gas_limit: self.basic.explicit_gas_limit,
                 _return_type: PhantomData,
             },
diff --git a/framework/base/src/types/interaction/function_call.rs b/framework/base/src/types/interaction/function_call.rs
index 8a1e298419..efb149e2b4 100644
--- a/framework/base/src/types/interaction/function_call.rs
+++ b/framework/base/src/types/interaction/function_call.rs
@@ -159,7 +159,7 @@ where
     /// Constructs `ESDTTransfer` builtin function call.
     pub(super) fn convert_to_single_transfer_fungible_call(
         self,
-        payment: EsdtTokenPayment<Api>,
+        payment: &EsdtTokenPayment<Api>,
     ) -> FunctionCall<Api> {
         FunctionCall::new(ESDT_TRANSFER_FUNC_NAME)
             .argument(&payment.token_identifier)
@@ -177,7 +177,7 @@ where
     pub(super) fn convert_to_single_transfer_nft_call(
         self,
         to: &ManagedAddress<Api>,
-        payment: EsdtTokenPayment<Api>,
+        payment: &EsdtTokenPayment<Api>,
     ) -> FunctionCall<Api> {
         FunctionCall::new(ESDT_NFT_TRANSFER_FUNC_NAME)
             .argument(&payment.token_identifier)
@@ -191,13 +191,13 @@ where
     pub(super) fn convert_to_multi_transfer_esdt_call(
         self,
         to: &ManagedAddress<Api>,
-        payments: ManagedVec<Api, EsdtTokenPayment<Api>>,
+        payments: &ManagedVec<Api, EsdtTokenPayment<Api>>,
     ) -> FunctionCall<Api> {
         let mut result = FunctionCall::new(ESDT_MULTI_TRANSFER_FUNC_NAME)
             .argument(&to)
             .argument(&payments.len());
 
-        for payment in payments.into_iter() {
+        for payment in payments {
             result = result
                 .argument(&payment.token_identifier)
                 .argument(&payment.token_nonce)
diff --git a/framework/base/src/types/interaction/tx.rs b/framework/base/src/types/interaction/tx.rs
index db6c244bd6..9e41ae8b2d 100644
--- a/framework/base/src/types/interaction/tx.rs
+++ b/framework/base/src/types/interaction/tx.rs
@@ -14,8 +14,8 @@ use super::{
     ContractCallNoPayment, ContractCallWithEgld, ContractDeploy, DeployCall, Egld, EgldPayment,
     ExplicitGas, FromSource, FunctionCall, ManagedArgBuffer, OriginalResultMarker, RHList,
     RHListAppendNoRet, RHListAppendRet, RHListItem, TxCodeSource, TxCodeValue, TxData, TxEgldValue,
-    TxEnv, TxFrom, TxFromSourceValue, TxGas, TxPayment, TxPaymentEgldOnly, TxPaymentNormalize,
-    TxProxyTrait, TxResultHandler, TxScEnv, TxTo, TxToSpecified,
+    TxEnv, TxFrom, TxFromSourceValue, TxGas, TxPayment, TxPaymentEgldOnly, TxProxyTrait,
+    TxResultHandler, TxScEnv, TxTo, TxToSpecified,
 };
 
 #[must_use]
@@ -565,7 +565,7 @@ impl<Api, To, Payment, OriginalResult> ContractCallBase<Api>
 where
     Api: CallTypeApi + 'static,
     To: TxToSpecified<TxScEnv<Api>>,
-    Payment: TxPaymentNormalize<TxScEnv<Api>, (), To>,
+    Payment: TxPayment<TxScEnv<Api>>,
     OriginalResult: TopEncodeMulti,
 {
     type OriginalResult = OriginalResult;
diff --git a/framework/base/src/types/interaction/tx_call_async.rs b/framework/base/src/types/interaction/tx_call_async.rs
index 3e77979c2e..daa69013cf 100644
--- a/framework/base/src/types/interaction/tx_call_async.rs
+++ b/framework/base/src/types/interaction/tx_call_async.rs
@@ -6,7 +6,7 @@ use crate::{
 
 use super::{
     OriginalResultMarker, Tx, TxData, TxDataFunctionCall, TxEnv, TxFrom, TxGas, TxPayment,
-    TxPaymentNormalize, TxResultHandler, TxScEnv, TxTo, TxToSpecified,
+    TxResultHandler, TxScEnv, TxTo, TxToSpecified,
 };
 
 pub trait TxAsyncCallCallback<Api>: TxResultHandler<TxScEnv<Api>>
@@ -119,7 +119,7 @@ impl<Api, To, Payment, FC, RH> Tx<TxScEnv<Api>, (), To, Payment, (), FC, RH>
 where
     Api: CallTypeApi,
     To: TxToSpecified<TxScEnv<Api>>,
-    Payment: TxPaymentNormalize<TxScEnv<Api>, (), To>,
+    Payment: TxPayment<TxScEnv<Api>>,
     FC: TxDataFunctionCall<TxScEnv<Api>>,
     RH: TxAsyncCallCallback<Api>,
 {
diff --git a/framework/base/src/types/interaction/tx_call_async_promises.rs b/framework/base/src/types/interaction/tx_call_async_promises.rs
index 134d2e0081..f2560451cf 100644
--- a/framework/base/src/types/interaction/tx_call_async_promises.rs
+++ b/framework/base/src/types/interaction/tx_call_async_promises.rs
@@ -6,7 +6,7 @@ use crate::{
 
 use super::{
     callback_closure::CallbackClosureWithGas, ExplicitGas, FunctionCall, OriginalResultMarker, Tx,
-    TxGas, TxPayment, TxPaymentNormalize, TxResultHandler, TxScEnv, TxToSpecified,
+    TxGas, TxPayment, TxResultHandler, TxScEnv, TxToSpecified,
 };
 
 pub trait TxPromisesCallback<Api>: TxResultHandler<TxScEnv<Api>>
@@ -122,7 +122,7 @@ impl<Api, To, Payment, Callback>
 where
     Api: CallTypeApi,
     To: TxToSpecified<TxScEnv<Api>>,
-    Payment: TxPaymentNormalize<TxScEnv<Api>, (), To>,
+    Payment: TxPayment<TxScEnv<Api>>,
     Callback: TxPromisesCallback<Api>,
 {
     pub fn register_promise(self) {
diff --git a/framework/base/src/types/interaction/tx_call_sync.rs b/framework/base/src/types/interaction/tx_call_sync.rs
index 0213a1df75..61c73a7b0c 100644
--- a/framework/base/src/types/interaction/tx_call_sync.rs
+++ b/framework/base/src/types/interaction/tx_call_sync.rs
@@ -9,8 +9,7 @@ use crate::{
 
 use super::{
     contract_call_exec::decode_result, BackTransfers, ConsNoRet, ConsRet, OriginalResultMarker,
-    RHList, RHListItem, Tx, TxDataFunctionCall, TxEnv, TxGas, TxPaymentNormalize, TxScEnv,
-    TxToSpecified,
+    RHList, RHListItem, Tx, TxDataFunctionCall, TxEnv, TxGas, TxPayment, TxScEnv, TxToSpecified,
 };
 
 pub trait RHListItemSync<Env, Original>: RHListItem<Env, Original>
@@ -90,7 +89,7 @@ impl<Api, To, Payment, Gas, FC, RH> Tx<TxScEnv<Api>, (), To, Payment, Gas, FC, R
 where
     Api: CallTypeApi,
     To: TxToSpecified<TxScEnv<Api>>,
-    Payment: TxPaymentNormalize<TxScEnv<Api>, (), To>,
+    Payment: TxPayment<TxScEnv<Api>>,
     Gas: TxGas<TxScEnv<Api>>,
     FC: TxDataFunctionCall<TxScEnv<Api>>,
     RH: RHListSync<TxScEnv<Api>>,
@@ -133,7 +132,7 @@ impl<Api, To, Payment, Gas, FC, OriginalResult>
 where
     Api: CallTypeApi,
     To: TxToSpecified<TxScEnv<Api>>,
-    Payment: TxPaymentNormalize<TxScEnv<Api>, (), To>,
+    Payment: TxPayment<TxScEnv<Api>>,
     Gas: TxGas<TxScEnv<Api>>,
     FC: TxDataFunctionCall<TxScEnv<Api>>,
 {
diff --git a/framework/base/src/types/interaction/tx_payment.rs b/framework/base/src/types/interaction/tx_payment.rs
index af40f79f56..2511d2ede8 100644
--- a/framework/base/src/types/interaction/tx_payment.rs
+++ b/framework/base/src/types/interaction/tx_payment.rs
@@ -2,13 +2,11 @@ mod tx_payment_egld;
 mod tx_payment_egld_value;
 mod tx_payment_multi_esdt;
 mod tx_payment_none;
-mod tx_payment_normalize;
 mod tx_payment_other;
 mod tx_payment_single_esdt;
 
 pub use tx_payment_egld::{Egld, EgldPayment};
 pub use tx_payment_egld_value::TxEgldValue;
-pub use tx_payment_normalize::TxPaymentNormalize;
 
 use crate::{
     api::ManagedTypeApi,
@@ -19,15 +17,18 @@ use crate::{
     },
 };
 
-use super::{FunctionCall, TxEnv};
+use super::{FunctionCall, TxEnv, TxFrom, TxToSpecified};
 
 /// Describes a payment that is part of a transaction.
 pub trait TxPayment<Env>
 where
     Env: TxEnv,
 {
+    /// Returns true if payment indicates transfer of either non-zero EGLD or ESDT amounts.
     fn is_no_payment(&self) -> bool;
 
+    /// Transfer-execute calls have different APIs for different payments types.
+    /// This method selects between them.
     fn perform_transfer_execute(
         self,
         env: &Env,
@@ -36,6 +37,21 @@ where
         fc: FunctionCall<Env::Api>,
     );
 
+    /// Converts an ESDT call to a built-in function call, if necessary.
+    fn with_normalized<From, To, F, R>(
+        self,
+        env: &Env,
+        from: &From,
+        to: To,
+        fc: FunctionCall<Env::Api>,
+        f: F,
+    ) -> R
+    where
+        From: TxFrom<Env>,
+        To: TxToSpecified<Env>,
+        F: FnOnce(&ManagedAddress<Env::Api>, &BigUint<Env::Api>, &FunctionCall<Env::Api>) -> R;
+
+    /// Payment data to be used by the testing framework. Will be refactored.
     fn into_full_payment_data(self, env: &Env) -> FullPaymentData<Env::Api>;
 }
 
diff --git a/framework/base/src/types/interaction/tx_payment/tx_payment_egld.rs b/framework/base/src/types/interaction/tx_payment/tx_payment_egld.rs
index f84d6afacb..a4881bda05 100644
--- a/framework/base/src/types/interaction/tx_payment/tx_payment_egld.rs
+++ b/framework/base/src/types/interaction/tx_payment/tx_payment_egld.rs
@@ -1,6 +1,6 @@
 use crate::{
     contract_base::SendRawWrapper,
-    types::{BigUint, ManagedAddress, ManagedVec},
+    types::{BigUint, ManagedAddress, ManagedVec, TxFrom, TxToSpecified},
 };
 
 use super::{
@@ -40,6 +40,25 @@ where
         })
     }
 
+    fn with_normalized<From, To, F, R>(
+        self,
+        env: &Env,
+        _from: &From,
+        to: To,
+        fc: FunctionCall<Env::Api>,
+        f: F,
+    ) -> R
+    where
+        From: TxFrom<Env>,
+        To: TxToSpecified<Env>,
+        F: FnOnce(&ManagedAddress<Env::Api>, &BigUint<Env::Api>, &FunctionCall<Env::Api>) -> R,
+    {
+        to.with_address_ref(env, |to_addr| {
+            self.0
+                .with_egld_value(|egld_value| f(to_addr, egld_value, &fc))
+        })
+    }
+
     fn into_full_payment_data(self, env: &Env) -> FullPaymentData<Env::Api> {
         FullPaymentData {
             egld: Some(AnnotatedEgldPayment::new_egld(self.0.into_value(env))),
diff --git a/framework/base/src/types/interaction/tx_payment/tx_payment_multi_esdt.rs b/framework/base/src/types/interaction/tx_payment/tx_payment_multi_esdt.rs
index 84a8de5e5b..de9f65eff9 100644
--- a/framework/base/src/types/interaction/tx_payment/tx_payment_multi_esdt.rs
+++ b/framework/base/src/types/interaction/tx_payment/tx_payment_multi_esdt.rs
@@ -1,6 +1,6 @@
 use crate::{
     contract_base::SendRawWrapper,
-    types::{BigUint, ManagedAddress, ManagedVec, MultiEsdtPayment},
+    types::{BigUint, ManagedAddress, ManagedVec, MultiEsdtPayment, TxFrom, TxToSpecified},
 };
 
 use super::{AnnotatedEgldPayment, FullPaymentData, FunctionCall, TxEgldValue, TxEnv, TxPayment};
@@ -29,6 +29,29 @@ where
         );
     }
 
+    fn with_normalized<From, To, F, R>(
+        self,
+        env: &Env,
+        from: &From,
+        to: To,
+        fc: FunctionCall<Env::Api>,
+        f: F,
+    ) -> R
+    where
+        From: TxFrom<Env>,
+        To: TxToSpecified<Env>,
+        F: FnOnce(&ManagedAddress<Env::Api>, &BigUint<Env::Api>, &FunctionCall<Env::Api>) -> R,
+    {
+        match self.len() {
+            0 => ().with_normalized(env, from, to, fc, f),
+            1 => self.get(0).with_normalized(env, from, to, fc, f),
+            _ => to.with_address_ref(env, |to_addr| {
+                let fc_conv = fc.convert_to_multi_transfer_esdt_call(to_addr, self);
+                f(&from.resolve_address(env), &BigUint::zero(), &fc_conv)
+            }),
+        }
+    }
+
     fn into_full_payment_data(self, _env: &Env) -> FullPaymentData<Env::Api> {
         FullPaymentData {
             egld: None,
@@ -55,6 +78,22 @@ where
         (&self).perform_transfer_execute(env, to, gas_limit, fc);
     }
 
+    fn with_normalized<From, To, F, R>(
+        self,
+        env: &Env,
+        from: &From,
+        to: To,
+        fc: FunctionCall<Env::Api>,
+        f: F,
+    ) -> R
+    where
+        From: TxFrom<Env>,
+        To: TxToSpecified<Env>,
+        F: FnOnce(&ManagedAddress<Env::Api>, &BigUint<Env::Api>, &FunctionCall<Env::Api>) -> R,
+    {
+        (&self).with_normalized(env, from, to, fc, f)
+    }
+
     fn into_full_payment_data(self, _env: &Env) -> FullPaymentData<Env::Api> {
         FullPaymentData {
             egld: None,
diff --git a/framework/base/src/types/interaction/tx_payment/tx_payment_none.rs b/framework/base/src/types/interaction/tx_payment/tx_payment_none.rs
index 7b34ccfe9b..d97143a2ad 100644
--- a/framework/base/src/types/interaction/tx_payment/tx_payment_none.rs
+++ b/framework/base/src/types/interaction/tx_payment/tx_payment_none.rs
@@ -1,6 +1,6 @@
 use crate::{
     contract_base::SendRawWrapper,
-    types::{BigUint, ManagedAddress, ManagedVec},
+    types::{BigUint, ManagedAddress, ManagedVec, TxFrom, TxToSpecified},
 };
 
 use super::{
@@ -26,6 +26,22 @@ where
         Egld(BigUint::zero()).perform_transfer_execute(env, to, gas_limit, fc);
     }
 
+    fn with_normalized<From, To, F, R>(
+        self,
+        env: &Env,
+        _from: &From,
+        to: To,
+        fc: FunctionCall<Env::Api>,
+        f: F,
+    ) -> R
+    where
+        From: TxFrom<Env>,
+        To: TxToSpecified<Env>,
+        F: FnOnce(&ManagedAddress<Env::Api>, &BigUint<Env::Api>, &FunctionCall<Env::Api>) -> R,
+    {
+        to.with_address_ref(env, |to_addr| f(to_addr, &BigUint::zero(), &fc))
+    }
+
     fn into_full_payment_data(self, _env: &Env) -> FullPaymentData<Env::Api> {
         FullPaymentData::default()
     }
diff --git a/framework/base/src/types/interaction/tx_payment/tx_payment_normalize.rs b/framework/base/src/types/interaction/tx_payment/tx_payment_normalize.rs
deleted file mode 100644
index db263fa83f..0000000000
--- a/framework/base/src/types/interaction/tx_payment/tx_payment_normalize.rs
+++ /dev/null
@@ -1,182 +0,0 @@
-use crate::types::{
-    BigUint, EgldOrEsdtTokenPayment, EgldOrMultiEsdtPayment, EsdtTokenPayment, ManagedAddress,
-    MultiEsdtPayment, TxFrom, TxToSpecified,
-};
-
-use super::{Egld, FunctionCall, TxEgldValue, TxEnv, TxPayment};
-
-/// Defines how a payment transforms a transaction,
-/// e.g. from ESDT transfer to ESDTTransfer builtin function.
-pub trait TxPaymentNormalize<Env, From, To>: TxPayment<Env>
-where
-    Env: TxEnv,
-    From: TxFrom<Env>,
-    To: TxToSpecified<Env>,
-{
-    fn with_normalized<F, R>(
-        self,
-        env: &Env,
-        from: &From,
-        to: To,
-        fc: FunctionCall<Env::Api>,
-        f: F,
-    ) -> R
-    where
-        F: FnOnce(&ManagedAddress<Env::Api>, &BigUint<Env::Api>, &FunctionCall<Env::Api>) -> R;
-}
-
-impl<Env, From, To> TxPaymentNormalize<Env, From, To> for ()
-where
-    Env: TxEnv,
-    From: TxFrom<Env>,
-    To: TxToSpecified<Env>,
-{
-    fn with_normalized<F, R>(
-        self,
-        env: &Env,
-        _from: &From,
-        to: To,
-        fc: FunctionCall<Env::Api>,
-        f: F,
-    ) -> R
-    where
-        F: FnOnce(&ManagedAddress<Env::Api>, &BigUint<Env::Api>, &FunctionCall<Env::Api>) -> R,
-    {
-        to.with_address_ref(env, |to_addr| f(to_addr, &BigUint::zero(), &fc))
-    }
-}
-
-impl<Env, From, To, EgldValue> TxPaymentNormalize<Env, From, To> for Egld<EgldValue>
-where
-    Env: TxEnv,
-    From: TxFrom<Env>,
-    To: TxToSpecified<Env>,
-    EgldValue: TxEgldValue<Env>,
-{
-    fn with_normalized<F, R>(
-        self,
-        env: &Env,
-        _from: &From,
-        to: To,
-        fc: FunctionCall<Env::Api>,
-        f: F,
-    ) -> R
-    where
-        F: FnOnce(&ManagedAddress<Env::Api>, &BigUint<Env::Api>, &FunctionCall<Env::Api>) -> R,
-    {
-        to.with_address_ref(env, |to_addr| {
-            self.0
-                .with_egld_value(|egld_value| f(to_addr, egld_value, &fc))
-        })
-    }
-}
-
-impl<Env, From, To> TxPaymentNormalize<Env, From, To> for EsdtTokenPayment<Env::Api>
-where
-    Env: TxEnv,
-    From: TxFrom<Env>,
-    To: TxToSpecified<Env>,
-{
-    fn with_normalized<F, R>(
-        self,
-        env: &Env,
-        from: &From,
-        to: To,
-        fc: FunctionCall<Env::Api>,
-        f: F,
-    ) -> R
-    where
-        F: FnOnce(&ManagedAddress<Env::Api>, &BigUint<Env::Api>, &FunctionCall<Env::Api>) -> R,
-    {
-        to.with_address_ref(env, |to_addr| {
-            if self.token_nonce == 0 {
-                let fc_conv = fc.convert_to_single_transfer_fungible_call(self);
-                f(to_addr, &BigUint::zero(), &fc_conv)
-            } else {
-                let fc_conv = fc.convert_to_single_transfer_nft_call(to_addr, self);
-                f(&from.resolve_address(env), &BigUint::zero(), &fc_conv)
-            }
-        })
-    }
-}
-
-impl<Env, From, To> TxPaymentNormalize<Env, From, To> for MultiEsdtPayment<Env::Api>
-where
-    Env: TxEnv,
-    From: TxFrom<Env>,
-    To: TxToSpecified<Env>,
-{
-    fn with_normalized<F, R>(
-        self,
-        env: &Env,
-        from: &From,
-        to: To,
-        fc: FunctionCall<Env::Api>,
-        f: F,
-    ) -> R
-    where
-        F: FnOnce(&ManagedAddress<Env::Api>, &BigUint<Env::Api>, &FunctionCall<Env::Api>) -> R,
-    {
-        match self.len() {
-            0 => ().with_normalized(env, from, to, fc, f),
-            1 => self.get(0).with_normalized(env, from, to, fc, f),
-            _ => to.with_address_ref(env, |to_addr| {
-                let fc_conv = fc.convert_to_multi_transfer_esdt_call(to_addr, self);
-                f(&from.resolve_address(env), &BigUint::zero(), &fc_conv)
-            }),
-        }
-    }
-}
-
-impl<Env, From, To> TxPaymentNormalize<Env, From, To> for EgldOrEsdtTokenPayment<Env::Api>
-where
-    Env: TxEnv,
-    From: TxFrom<Env>,
-    To: TxToSpecified<Env>,
-{
-    fn with_normalized<F, R>(
-        self,
-        env: &Env,
-        from: &From,
-        to: To,
-        fc: FunctionCall<Env::Api>,
-        f: F,
-    ) -> R
-    where
-        F: FnOnce(&ManagedAddress<Env::Api>, &BigUint<Env::Api>, &FunctionCall<Env::Api>) -> R,
-    {
-        self.map_egld_or_esdt(
-            (to, fc, f),
-            |(to, fc, f), amount| Egld(amount).with_normalized(env, from, to, fc, f),
-            |(to, fc, f), esdt_payment| esdt_payment.with_normalized(env, from, to, fc, f),
-        )
-    }
-}
-
-impl<Env, From, To> TxPaymentNormalize<Env, From, To> for EgldOrMultiEsdtPayment<Env::Api>
-where
-    Env: TxEnv,
-    From: TxFrom<Env>,
-    To: TxToSpecified<Env>,
-{
-    fn with_normalized<F, R>(
-        self,
-        env: &Env,
-        from: &From,
-        to: To,
-        fc: FunctionCall<Env::Api>,
-        f: F,
-    ) -> R
-    where
-        F: FnOnce(&ManagedAddress<Env::Api>, &BigUint<Env::Api>, &FunctionCall<Env::Api>) -> R,
-    {
-        match self {
-            EgldOrMultiEsdtPayment::Egld(egld_amount) => {
-                Egld(egld_amount).with_normalized(env, from, to, fc, f)
-            },
-            EgldOrMultiEsdtPayment::MultiEsdt(multi_esdt_payment) => {
-                multi_esdt_payment.with_normalized(env, from, to, fc, f)
-            },
-        }
-    }
-}
diff --git a/framework/base/src/types/interaction/tx_payment/tx_payment_other.rs b/framework/base/src/types/interaction/tx_payment/tx_payment_other.rs
index 0c8bf7772b..5a28d80902 100644
--- a/framework/base/src/types/interaction/tx_payment/tx_payment_other.rs
+++ b/framework/base/src/types/interaction/tx_payment/tx_payment_other.rs
@@ -2,6 +2,7 @@ use crate::{
     contract_base::SendRawWrapper,
     types::{
         BigUint, Egld, EgldOrEsdtTokenPayment, EgldOrMultiEsdtPayment, ManagedAddress, ManagedVec,
+        TxFrom, TxToSpecified,
     },
 };
 
@@ -29,6 +30,26 @@ where
         )
     }
 
+    fn with_normalized<From, To, F, R>(
+        self,
+        env: &Env,
+        from: &From,
+        to: To,
+        fc: FunctionCall<Env::Api>,
+        f: F,
+    ) -> R
+    where
+        From: TxFrom<Env>,
+        To: TxToSpecified<Env>,
+        F: FnOnce(&ManagedAddress<Env::Api>, &BigUint<Env::Api>, &FunctionCall<Env::Api>) -> R,
+    {
+        self.map_egld_or_esdt(
+            (to, fc, f),
+            |(to, fc, f), amount| Egld(amount).with_normalized(env, from, to, fc, f),
+            |(to, fc, f), esdt_payment| esdt_payment.with_normalized(env, from, to, fc, f),
+        )
+    }
+
     fn into_full_payment_data(self, env: &Env) -> FullPaymentData<Env::Api> {
         self.map_egld_or_esdt(
             (),
@@ -63,6 +84,29 @@ where
         }
     }
 
+    fn with_normalized<From, To, F, R>(
+        self,
+        env: &Env,
+        from: &From,
+        to: To,
+        fc: FunctionCall<Env::Api>,
+        f: F,
+    ) -> R
+    where
+        From: TxFrom<Env>,
+        To: TxToSpecified<Env>,
+        F: FnOnce(&ManagedAddress<Env::Api>, &BigUint<Env::Api>, &FunctionCall<Env::Api>) -> R,
+    {
+        match self {
+            EgldOrMultiEsdtPayment::Egld(egld_amount) => {
+                Egld(egld_amount).with_normalized(env, from, to, fc, f)
+            },
+            EgldOrMultiEsdtPayment::MultiEsdt(multi_esdt_payment) => {
+                multi_esdt_payment.with_normalized(env, from, to, fc, f)
+            },
+        }
+    }
+
     fn into_full_payment_data(self, env: &Env) -> FullPaymentData<Env::Api> {
         match self {
             EgldOrMultiEsdtPayment::Egld(egld_amount) => {
diff --git a/framework/base/src/types/interaction/tx_payment/tx_payment_single_esdt.rs b/framework/base/src/types/interaction/tx_payment/tx_payment_single_esdt.rs
index 7651351db8..f2fdf5aacb 100644
--- a/framework/base/src/types/interaction/tx_payment/tx_payment_single_esdt.rs
+++ b/framework/base/src/types/interaction/tx_payment/tx_payment_single_esdt.rs
@@ -1,6 +1,9 @@
 use crate::{
     contract_base::SendRawWrapper,
-    types::{BigUint, EsdtTokenPayment, ManagedAddress, ManagedVec, MultiEsdtPayment},
+    types::{
+        BigUint, EsdtTokenPayment, ManagedAddress, ManagedVec, MultiEsdtPayment, TxFrom,
+        TxToSpecified,
+    },
 };
 
 use super::{AnnotatedEgldPayment, FullPaymentData, FunctionCall, TxEgldValue, TxEnv, TxPayment};
@@ -23,6 +26,30 @@ where
         MultiEsdtPayment::from_single_item(self).perform_transfer_execute(env, to, gas_limit, fc);
     }
 
+    fn with_normalized<From, To, F, R>(
+        self,
+        env: &Env,
+        from: &From,
+        to: To,
+        fc: FunctionCall<Env::Api>,
+        f: F,
+    ) -> R
+    where
+        From: TxFrom<Env>,
+        To: TxToSpecified<Env>,
+        F: FnOnce(&ManagedAddress<Env::Api>, &BigUint<Env::Api>, &FunctionCall<Env::Api>) -> R,
+    {
+        to.with_address_ref(env, |to_addr| {
+            if self.token_nonce == 0 {
+                let fc_conv = fc.convert_to_single_transfer_fungible_call(&self);
+                f(to_addr, &BigUint::zero(), &fc_conv)
+            } else {
+                let fc_conv = fc.convert_to_single_transfer_nft_call(to_addr, &self);
+                f(&from.resolve_address(env), &BigUint::zero(), &fc_conv)
+            }
+        })
+    }
+
     fn into_full_payment_data(self, _env: &Env) -> FullPaymentData<Env::Api> {
         FullPaymentData {
             egld: None,

From 80cb79bcade227e3e13a5f0cded2a25774a2caaf Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Fri, 22 Mar 2024 21:57:29 +0100
Subject: [PATCH 0535/1254] fix after review, cleanup and fmt

---
 .../interact/src/multisig_interact_nfts.rs    | 12 ++++-----
 .../interact/src/multisig_interact_wegld.rs   |  6 ++---
 .../base/src/types/interaction/tx_rh_list.rs  |  5 ++--
 .../returns_new_token_identifier.rs           | 25 +++++--------------
 .../src/facade/world_tx/scenario_env_util.rs  |  2 +-
 .../facade/world_tx/scenario_rh_list_item.rs  |  4 +--
 6 files changed, 20 insertions(+), 34 deletions(-)

diff --git a/contracts/examples/multisig/interact/src/multisig_interact_nfts.rs b/contracts/examples/multisig/interact/src/multisig_interact_nfts.rs
index 73f128c564..5d54205c8a 100644
--- a/contracts/examples/multisig/interact/src/multisig_interact_nfts.rs
+++ b/contracts/examples/multisig/interact/src/multisig_interact_nfts.rs
@@ -2,7 +2,7 @@ use std::time::Duration;
 
 use multiversx_sc_scenario::multiversx_sc::{
     codec::Empty,
-    types::{FunctionCall, ReturnsNewTokenIdentidier},
+    types::{FunctionCall, ReturnsExact, ReturnsNewTokenIdentifier},
 };
 
 use super::*;
@@ -53,7 +53,7 @@ impl MultisigInteract {
                     .argument(&TOKEN_TYPE)
                     .argument(&0u32),
             )
-            .returns(ReturnsSimilar::<usize>::new())
+            .returns(ReturnsExact)
             .prepare_async()
             .run()
             .await;
@@ -81,7 +81,7 @@ impl MultisigInteract {
             .with_gas_limit(80_000_000u64)
             .typed(multisig_proxy::MultisigProxy)
             .perform_action_endpoint(action_id)
-            .returns(ReturnsNewTokenIdentidier)
+            .returns(ReturnsNewTokenIdentifier)
             .prepare_async()
             .run()
             .await;
@@ -109,7 +109,7 @@ impl MultisigInteract {
                     .argument(&COLLECTION_NAME)
                     .argument(&COLLECTION_TICKER),
             )
-            .returns(ReturnsSimilar::<usize>::new())
+            .returns(ReturnsExact)
             .prepare_async()
             .run()
             .await;
@@ -136,7 +136,7 @@ impl MultisigInteract {
             .with_gas_limit(80_000_000u64)
             .typed(multisig_proxy::MultisigProxy)
             .perform_action_endpoint(action_id)
-            .returns(ReturnsNewTokenIdentidier)
+            .returns(ReturnsNewTokenIdentifier)
             .prepare_async()
             .run()
             .await;
@@ -165,7 +165,7 @@ impl MultisigInteract {
                     .argument(&multisig_address)
                     .argument(&"ESDTRoleNFTCreate"),
             )
-            .returns(ReturnsSimilar::<usize>::new())
+            .returns(ReturnsExact)
             .prepare_async()
             .run()
             .await;
diff --git a/contracts/examples/multisig/interact/src/multisig_interact_wegld.rs b/contracts/examples/multisig/interact/src/multisig_interact_wegld.rs
index ebd75faada..cbfde97e3f 100644
--- a/contracts/examples/multisig/interact/src/multisig_interact_wegld.rs
+++ b/contracts/examples/multisig/interact/src/multisig_interact_wegld.rs
@@ -1,6 +1,6 @@
 use std::time::Duration;
 
-use multiversx_sc_scenario::multiversx_sc::types::{ContractCallBase, FunctionCall};
+use multiversx_sc_scenario::multiversx_sc::types::{ContractCallBase, FunctionCall, ReturnsExact};
 #[allow(unused_imports)]
 use multiversx_sc_snippets::multiversx_sc::types::{
     EsdtTokenPayment, MultiValueEncoded, TokenIdentifier,
@@ -72,7 +72,7 @@ impl MultisigInteract {
                 WRAP_AMOUNT,
                 FunctionCall::new("wrapEgld"),
             )
-            .returns(ReturnsSimilar::<usize>::new())
+            .returns(ReturnsExact)
             .prepare_async()
             .run()
             .await;
@@ -105,7 +105,7 @@ impl MultisigInteract {
                 0u64,
                 contract_call.basic.function_call,
             )
-            .returns(ReturnsSimilar::<usize>::new())
+            .returns(ReturnsExact)
             .prepare_async()
             .run()
             .await;
diff --git a/framework/base/src/types/interaction/tx_rh_list.rs b/framework/base/src/types/interaction/tx_rh_list.rs
index b3dd278f12..4af293146a 100644
--- a/framework/base/src/types/interaction/tx_rh_list.rs
+++ b/framework/base/src/types/interaction/tx_rh_list.rs
@@ -1,9 +1,9 @@
 mod returns_bt;
 mod returns_exact;
 mod returns_new_address;
+mod returns_new_token_identifier;
 mod returns_raw;
 mod returns_similar;
-mod returns_new_token_identifier;
 mod tx_rh_list_cons;
 mod tx_rh_list_item;
 mod with_result_exact;
@@ -14,11 +14,10 @@ mod with_result_similar;
 pub use returns_bt::*;
 pub use returns_exact::*;
 pub use returns_new_address::*;
+pub use returns_new_token_identifier::*;
 pub use returns_raw::*;
 pub use returns_similar::*;
-pub use returns_new_token_identifier::*;
 pub use tx_rh_list_cons::*;
 pub use tx_rh_list_item::*;
 pub use with_result_new_address::*;
 pub use with_result_similar::*;
-
diff --git a/framework/base/src/types/interaction/tx_rh_list/returns_new_token_identifier.rs b/framework/base/src/types/interaction/tx_rh_list/returns_new_token_identifier.rs
index 71d5751de1..c1a4af47d1 100644
--- a/framework/base/src/types/interaction/tx_rh_list/returns_new_token_identifier.rs
+++ b/framework/base/src/types/interaction/tx_rh_list/returns_new_token_identifier.rs
@@ -1,32 +1,19 @@
 use crate::{
-    contract_base::BlockchainWrapper, proxy_imports::TokenIdentifier, types::{
+    contract_base::BlockchainWrapper,
+    proxy_imports::TokenIdentifier,
+    types::{
         interaction::tx_call_deploy::RHListItemDeploy, BackTransfers, ManagedAddress,
         ManagedBuffer, ManagedVec, RHListItemSync, TxEnv,
-    }
+    },
 };
 
 use super::RHListItem;
 
-pub struct ReturnsNewTokenIdentidier;
+pub struct ReturnsNewTokenIdentifier;
 
-impl<Env, Original> RHListItem<Env, Original> for ReturnsNewTokenIdentidier
+impl<Env, Original> RHListItem<Env, Original> for ReturnsNewTokenIdentifier
 where
     Env: TxEnv,
 {
     type Returns = TokenIdentifier<Env::Api>;
 }
-
-
-// impl<Env, Original> RHListItemScenario<Env, Original> for ReturnsNewTokenIdentidier
-// where
-//     Env: TxEnv,
-// {
-//     fn item_scenario_result(self, tx_response: &TxResponse) -> Self::Returns {
-//         let new_token_id = tx_response
-//             .new_issued_token_identifier
-//             .clone()
-//             .expect("missing returned token identifier");
-
-//         new_token_id.into()
-//     }
-// }
diff --git a/framework/scenario/src/facade/world_tx/scenario_env_util.rs b/framework/scenario/src/facade/world_tx/scenario_env_util.rs
index 3a67373bb5..e54c34b969 100644
--- a/framework/scenario/src/facade/world_tx/scenario_env_util.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_env_util.rs
@@ -63,7 +63,7 @@ where
     for arg in data.arg_buffer.iter_buffers() {
         step.tx.arguments.push(arg.to_vec().into());
     }
-    
+
     let explicit_gas = gas.resolve_gas(env);
     step.tx.gas_limit = U64Value::from(explicit_gas);
 
diff --git a/framework/scenario/src/facade/world_tx/scenario_rh_list_item.rs b/framework/scenario/src/facade/world_tx/scenario_rh_list_item.rs
index 7ed940c6be..780f2f7dcb 100644
--- a/framework/scenario/src/facade/world_tx/scenario_rh_list_item.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_rh_list_item.rs
@@ -2,7 +2,7 @@ use multiversx_sc::{
     codec::{CodecFrom, TopDecodeMulti, TopEncodeMulti},
     types::{
         ManagedAddress, RHList, RHListItem, ReturnsExact, ReturnsNewAddress,
-        ReturnsNewTokenIdentidier, ReturnsSimilar, TokenIdentifier, TxEnv, WithResultNewAddress,
+        ReturnsNewTokenIdentifier, ReturnsSimilar, TokenIdentifier, TxEnv, WithResultNewAddress,
         WithResultSimilar,
     },
 };
@@ -78,7 +78,7 @@ where
     }
 }
 
-impl<Env, Original> RHListItemScenario<Env, Original> for ReturnsNewTokenIdentidier
+impl<Env, Original> RHListItemScenario<Env, Original> for ReturnsNewTokenIdentifier
 where
     Env: TxEnv,
 {

From f0b1bb03e2bf07003af45d3eee5b2b131883f8f0 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 22 Mar 2024 23:01:33 +0200
Subject: [PATCH 0536/1254] transfer cleanup

---
 contracts/feature-tests/composability/forwarder/src/esdt.rs | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/contracts/feature-tests/composability/forwarder/src/esdt.rs b/contracts/feature-tests/composability/forwarder/src/esdt.rs
index c178749ba9..214b9dd9ea 100644
--- a/contracts/feature-tests/composability/forwarder/src/esdt.rs
+++ b/contracts/feature-tests/composability/forwarder/src/esdt.rs
@@ -73,11 +73,7 @@ pub trait ForwarderEsdtModule: storage::ForwarderStorageModule {
             all_token_payments.push(payment);
         }
 
-        self.tx()
-            .with_gas_limit(self.blockchain().get_gas_left())
-            .to(&to)
-            .multi_esdt(all_token_payments)
-            .transfer_execute();
+        self.tx().to(&to).multi_esdt(all_token_payments).transfer();
     }
 
     #[payable("EGLD")]

From 6100308e7f5b5c171f1a87967a853e6b62666e57 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 22 Mar 2024 23:07:34 +0200
Subject: [PATCH 0537/1254] transfer cleanup

---
 contracts/modules/src/esdt.rs                            | 9 +++++----
 .../base/src/contract_base/wrappers/send_wrapper.rs      | 5 ++++-
 framework/base/src/types/interaction/tx_call_te.rs       | 4 ++--
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/contracts/modules/src/esdt.rs b/contracts/modules/src/esdt.rs
index a61ba67a3f..fa02cfd263 100644
--- a/contracts/modules/src/esdt.rs
+++ b/contracts/modules/src/esdt.rs
@@ -63,10 +63,11 @@ pub trait EsdtModule {
             ManagedAsyncCallResult::Err(_) => {
                 // return payment to initial caller
                 let initial_caller = self.blockchain().get_owner_address();
-                let egld_returned = self.call_value().egld_value().to_u64().unwrap();
-                if egld_returned > 0u64 {
-                    self.tx().to(&initial_caller).egld(egld_returned).transfer();
-                }
+                let egld_returned = self.call_value().egld_value();
+                self.tx()
+                    .to(&initial_caller)
+                    .egld(&*egld_returned)
+                    .transfer_if_not_empty();
             },
         }
     }
diff --git a/framework/base/src/contract_base/wrappers/send_wrapper.rs b/framework/base/src/contract_base/wrappers/send_wrapper.rs
index d73074f52d..aa0c837fde 100644
--- a/framework/base/src/contract_base/wrappers/send_wrapper.rs
+++ b/framework/base/src/contract_base/wrappers/send_wrapper.rs
@@ -83,7 +83,10 @@ where
     ///
     /// If the amount is 0, it returns without error.
     pub fn direct_non_zero_egld(&self, to: &ManagedAddress<A>, amount: &BigUint<A>) {
-        Tx::new_tx_from_sc().to(to).egld(amount).transfer_non_zero();
+        Tx::new_tx_from_sc()
+            .to(to)
+            .egld(amount)
+            .transfer_if_not_empty();
     }
 
     /// Sends either EGLD, ESDT or NFT to the target address,
diff --git a/framework/base/src/types/interaction/tx_call_te.rs b/framework/base/src/types/interaction/tx_call_te.rs
index 938a6c2523..5cb81a6f0f 100644
--- a/framework/base/src/types/interaction/tx_call_te.rs
+++ b/framework/base/src/types/interaction/tx_call_te.rs
@@ -50,10 +50,10 @@ where
         self.transfer_execute_with_gas(0)
     }
 
-    /// Transfers funds, amount is greater than zero. Does nothing otherwise.
+    /// Transfers funds, if amount is greater than zero. Does nothing otherwise.
     ///
     /// Can only used for simple transfers.
-    pub fn transfer_non_zero(self) {
+    pub fn transfer_if_not_empty(self) {
         if self.payment.is_no_payment() {
             return;
         }

From e3ba39d5b40aa03bea18ad6170cefdd8d8fd3872 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Fri, 22 Mar 2024 22:15:29 +0100
Subject: [PATCH 0538/1254] gas fix for deploy and transfer

---
 .../scenario/src/facade/world_tx/scenario_env_util.rs  | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/framework/scenario/src/facade/world_tx/scenario_env_util.rs b/framework/scenario/src/facade/world_tx/scenario_env_util.rs
index e54c34b969..8663e54852 100644
--- a/framework/scenario/src/facade/world_tx/scenario_env_util.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_env_util.rs
@@ -79,7 +79,7 @@ pub fn tx_to_sc_deploy_step<Env, From, Payment, Gas, CodeValue>(
     env: &Env,
     from: From,
     payment: Payment,
-    _gas: Gas,
+    gas: Gas,
     data: DeployCall<Env, Code<CodeValue>>,
 ) -> ScDeployStep
 where
@@ -96,6 +96,9 @@ where
         step.tx.arguments.push(arg.to_vec().into());
     }
 
+    let explicit_gas = gas.resolve_gas(env);
+    step.tx.gas_limit = U64Value::from(explicit_gas);
+
     let full_payment_data = payment.into_full_payment_data(env);
     if let Some(annotated_egld_payment) = full_payment_data.egld {
         step.tx.egld_value = annotated_egld_payment.into();
@@ -124,7 +127,7 @@ pub fn tx_to_transfer_step<Env, From, To, Payment, Gas>(
     from: From,
     to: To,
     payment: Payment,
-    _gas: Gas,
+    gas: Gas,
 ) -> TransferStep
 where
     Env: TxEnv,
@@ -137,6 +140,9 @@ where
         .from(address_annotated(env, from))
         .to(address_annotated(env, to));
 
+    let explicit_gas = gas.resolve_gas(env);
+    step.tx.gas_limit = U64Value::from(explicit_gas);
+
     let full_payment_data = payment.into_full_payment_data(env);
     if let Some(annotated_egld_payment) = full_payment_data.egld {
         step.tx.egld_value = annotated_egld_payment.into();

From 051fecf38c62ca4d3d33059fb2603a5c30877c43 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Sat, 23 Mar 2024 00:08:59 +0200
Subject: [PATCH 0539/1254] EsdtTokenPaymentRefs, tx.esdt_refs, direct_esdt
 unified syntax impl

---
 .../contract_base/wrappers/send_wrapper.rs    |  9 ++-
 .../interaction/contract_call_convert.rs      |  4 +-
 .../src/types/interaction/function_call.rs    |  9 ++-
 framework/base/src/types/interaction/tx.rs    | 25 ++++++
 .../base/src/types/interaction/tx_payment.rs  |  1 +
 .../tx_payment/tx_payment_multi_esdt.rs       | 27 ++++---
 .../tx_payment/tx_payment_single_esdt.rs      | 13 +--
 .../tx_payment/tx_payment_single_esdt_ref.rs  | 81 +++++++++++++++++++
 .../managed/wrapped/esdt_token_payment.rs     | 28 +++++++
 .../base/src/types/managed/wrapped/mod.rs     |  2 +-
 10 files changed, 170 insertions(+), 29 deletions(-)
 create mode 100644 framework/base/src/types/interaction/tx_payment/tx_payment_single_esdt_ref.rs

diff --git a/framework/base/src/contract_base/wrappers/send_wrapper.rs b/framework/base/src/contract_base/wrappers/send_wrapper.rs
index aa0c837fde..519c71158d 100644
--- a/framework/base/src/contract_base/wrappers/send_wrapper.rs
+++ b/framework/base/src/contract_base/wrappers/send_wrapper.rs
@@ -188,16 +188,17 @@ where
     }
 
     /// Sends a single ESDT transfer to target address.
-    #[inline]
-    #[allow(clippy::too_many_arguments)]
     pub fn direct_esdt(
         &self,
         to: &ManagedAddress<A>,
         token_identifier: &TokenIdentifier<A>,
-        nonce: u64,
+        token_nonce: u64,
         amount: &BigUint<A>,
     ) {
-        self.direct_esdt_with_gas_limit(to, token_identifier, nonce, amount, 0, Empty, &[]);
+        Tx::new_tx_from_sc()
+            .to(to)
+            .esdt_refs(token_identifier, token_nonce, amount)
+            .transfer();
     }
 
     /// Sends a single ESDT transfer to target address.
diff --git a/framework/base/src/types/interaction/contract_call_convert.rs b/framework/base/src/types/interaction/contract_call_convert.rs
index 88e6ae6627..fe4225d9a4 100644
--- a/framework/base/src/types/interaction/contract_call_convert.rs
+++ b/framework/base/src/types/interaction/contract_call_convert.rs
@@ -38,7 +38,7 @@ where
                     function_call: self
                         .basic
                         .function_call
-                        .convert_to_single_transfer_fungible_call(&payment),
+                        .convert_to_single_transfer_fungible_call(payment.as_refs()),
                     explicit_gas_limit: self.basic.explicit_gas_limit,
                     _return_type: PhantomData,
                 },
@@ -55,7 +55,7 @@ where
                     function_call: self
                         .basic
                         .function_call
-                        .convert_to_single_transfer_nft_call(&self.basic.to, &payment),
+                        .convert_to_single_transfer_nft_call(&self.basic.to, payment.as_refs()),
                     explicit_gas_limit: self.basic.explicit_gas_limit,
                     _return_type: PhantomData,
                 },
diff --git a/framework/base/src/types/interaction/function_call.rs b/framework/base/src/types/interaction/function_call.rs
index efb149e2b4..1d78735a79 100644
--- a/framework/base/src/types/interaction/function_call.rs
+++ b/framework/base/src/types/interaction/function_call.rs
@@ -9,7 +9,10 @@ use crate::{
         CallTypeApi, ManagedTypeApi, ESDT_MULTI_TRANSFER_FUNC_NAME, ESDT_NFT_TRANSFER_FUNC_NAME,
         ESDT_TRANSFER_FUNC_NAME,
     },
-    types::{EsdtTokenPayment, ManagedAddress, ManagedBuffer, ManagedVec, MultiValueEncoded},
+    types::{
+        EsdtTokenPayment, EsdtTokenPaymentRefs, ManagedAddress, ManagedBuffer, ManagedVec,
+        MultiValueEncoded,
+    },
 };
 
 use super::{ContractCallNoPayment, ManagedArgBuffer, TypedFunctionCall};
@@ -159,7 +162,7 @@ where
     /// Constructs `ESDTTransfer` builtin function call.
     pub(super) fn convert_to_single_transfer_fungible_call(
         self,
-        payment: &EsdtTokenPayment<Api>,
+        payment: EsdtTokenPaymentRefs<'_, Api>,
     ) -> FunctionCall<Api> {
         FunctionCall::new(ESDT_TRANSFER_FUNC_NAME)
             .argument(&payment.token_identifier)
@@ -177,7 +180,7 @@ where
     pub(super) fn convert_to_single_transfer_nft_call(
         self,
         to: &ManagedAddress<Api>,
-        payment: &EsdtTokenPayment<Api>,
+        payment: EsdtTokenPaymentRefs<'_, Api>,
     ) -> FunctionCall<Api> {
         FunctionCall::new(ESDT_NFT_TRANSFER_FUNC_NAME)
             .argument(&payment.token_identifier)
diff --git a/framework/base/src/types/interaction/tx.rs b/framework/base/src/types/interaction/tx.rs
index 9e41ae8b2d..27b11f59f8 100644
--- a/framework/base/src/types/interaction/tx.rs
+++ b/framework/base/src/types/interaction/tx.rs
@@ -1,6 +1,7 @@
 use crate::{
     api::CallTypeApi,
     contract_base::BlockchainWrapper,
+    proxy_imports::{EsdtTokenPaymentRefs, TokenIdentifier},
     types::{
         BigUint, CodeMetadata, EgldOrEsdtTokenPayment, EsdtTokenPayment, ManagedAddress,
         ManagedBuffer, ManagedOption, ManagedVec, MultiEsdtPayment,
@@ -203,6 +204,30 @@ where
         }
     }
 
+    /// Sets a single token payment, with the token identifier and amount kept as references.
+    ///
+    /// This is handy whem we only want one ESDT transfer and we want to avoid unnecessary object clones.
+    pub fn esdt_refs<'a>(
+        self,
+        token_identifier: &'a TokenIdentifier<Env::Api>,
+        token_nonce: u64,
+        amount: &'a BigUint<Env::Api>,
+    ) -> Tx<Env, From, To, EsdtTokenPaymentRefs<'a, Env::Api>, Gas, Data, RH> {
+        Tx {
+            env: self.env,
+            from: self.from,
+            to: self.to,
+            payment: EsdtTokenPaymentRefs {
+                token_identifier,
+                token_nonce,
+                amount,
+            },
+            gas: self.gas,
+            data: self.data,
+            result_handler: self.result_handler,
+        }
+    }
+
     /// Adds a collection of ESDT payments to a transaction.
     pub fn multi_esdt(
         self,
diff --git a/framework/base/src/types/interaction/tx_payment.rs b/framework/base/src/types/interaction/tx_payment.rs
index 2511d2ede8..4b2f54e29f 100644
--- a/framework/base/src/types/interaction/tx_payment.rs
+++ b/framework/base/src/types/interaction/tx_payment.rs
@@ -4,6 +4,7 @@ mod tx_payment_multi_esdt;
 mod tx_payment_none;
 mod tx_payment_other;
 mod tx_payment_single_esdt;
+mod tx_payment_single_esdt_ref;
 
 pub use tx_payment_egld::{Egld, EgldPayment};
 pub use tx_payment_egld_value::TxEgldValue;
diff --git a/framework/base/src/types/interaction/tx_payment/tx_payment_multi_esdt.rs b/framework/base/src/types/interaction/tx_payment/tx_payment_multi_esdt.rs
index de9f65eff9..3c1a554d03 100644
--- a/framework/base/src/types/interaction/tx_payment/tx_payment_multi_esdt.rs
+++ b/framework/base/src/types/interaction/tx_payment/tx_payment_multi_esdt.rs
@@ -15,18 +15,27 @@ where
 
     fn perform_transfer_execute(
         self,
-        _env: &Env,
+        env: &Env,
         to: &ManagedAddress<Env::Api>,
         gas_limit: u64,
         fc: FunctionCall<Env::Api>,
     ) {
-        let _ = SendRawWrapper::<Env::Api>::new().multi_esdt_transfer_execute(
-            to,
-            self,
-            gas_limit,
-            &fc.function_name,
-            &fc.arg_buffer,
-        );
+        match self.len() {
+            0 => ().perform_transfer_execute(env, to, gas_limit, fc),
+            1 => self
+                .get(0)
+                .as_refs()
+                .perform_transfer_execute(env, to, gas_limit, fc),
+            _ => {
+                let _ = SendRawWrapper::<Env::Api>::new().multi_esdt_transfer_execute(
+                    to,
+                    self,
+                    gas_limit,
+                    &fc.function_name,
+                    &fc.arg_buffer,
+                );
+            },
+        }
     }
 
     fn with_normalized<From, To, F, R>(
@@ -44,7 +53,7 @@ where
     {
         match self.len() {
             0 => ().with_normalized(env, from, to, fc, f),
-            1 => self.get(0).with_normalized(env, from, to, fc, f),
+            1 => self.get(0).as_refs().with_normalized(env, from, to, fc, f),
             _ => to.with_address_ref(env, |to_addr| {
                 let fc_conv = fc.convert_to_multi_transfer_esdt_call(to_addr, self);
                 f(&from.resolve_address(env), &BigUint::zero(), &fc_conv)
diff --git a/framework/base/src/types/interaction/tx_payment/tx_payment_single_esdt.rs b/framework/base/src/types/interaction/tx_payment/tx_payment_single_esdt.rs
index f2fdf5aacb..f5bf61c0f1 100644
--- a/framework/base/src/types/interaction/tx_payment/tx_payment_single_esdt.rs
+++ b/framework/base/src/types/interaction/tx_payment/tx_payment_single_esdt.rs
@@ -23,7 +23,8 @@ where
         gas_limit: u64,
         fc: FunctionCall<Env::Api>,
     ) {
-        MultiEsdtPayment::from_single_item(self).perform_transfer_execute(env, to, gas_limit, fc);
+        self.as_refs()
+            .perform_transfer_execute(env, to, gas_limit, fc);
     }
 
     fn with_normalized<From, To, F, R>(
@@ -39,15 +40,7 @@ where
         To: TxToSpecified<Env>,
         F: FnOnce(&ManagedAddress<Env::Api>, &BigUint<Env::Api>, &FunctionCall<Env::Api>) -> R,
     {
-        to.with_address_ref(env, |to_addr| {
-            if self.token_nonce == 0 {
-                let fc_conv = fc.convert_to_single_transfer_fungible_call(&self);
-                f(to_addr, &BigUint::zero(), &fc_conv)
-            } else {
-                let fc_conv = fc.convert_to_single_transfer_nft_call(to_addr, &self);
-                f(&from.resolve_address(env), &BigUint::zero(), &fc_conv)
-            }
-        })
+        self.as_refs().with_normalized(env, from, to, fc, f)
     }
 
     fn into_full_payment_data(self, _env: &Env) -> FullPaymentData<Env::Api> {
diff --git a/framework/base/src/types/interaction/tx_payment/tx_payment_single_esdt_ref.rs b/framework/base/src/types/interaction/tx_payment/tx_payment_single_esdt_ref.rs
new file mode 100644
index 0000000000..c0d568e11b
--- /dev/null
+++ b/framework/base/src/types/interaction/tx_payment/tx_payment_single_esdt_ref.rs
@@ -0,0 +1,81 @@
+use crate::{
+    api::ManagedTypeApi,
+    contract_base::SendRawWrapper,
+    types::{
+        BigUint, EsdtTokenPayment, EsdtTokenPaymentRefs, ManagedAddress, ManagedVec,
+        MultiEsdtPayment, TokenIdentifier, TxFrom, TxToSpecified,
+    },
+};
+
+use super::{AnnotatedEgldPayment, FullPaymentData, FunctionCall, TxEgldValue, TxEnv, TxPayment};
+
+impl<'a, Env> TxPayment<Env> for EsdtTokenPaymentRefs<'a, Env::Api>
+where
+    Env: TxEnv,
+{
+    fn is_no_payment(&self) -> bool {
+        self.amount == &0u32
+    }
+
+    fn perform_transfer_execute(
+        self,
+        env: &Env,
+        to: &ManagedAddress<Env::Api>,
+        gas_limit: u64,
+        fc: FunctionCall<Env::Api>,
+    ) {
+        if self.token_nonce == 0 {
+            // fungible ESDT
+            let _ = SendRawWrapper::<Env::Api>::new().transfer_esdt_execute(
+                to,
+                self.token_identifier,
+                self.amount,
+                gas_limit,
+                &fc.function_name,
+                &fc.arg_buffer,
+            );
+        } else {
+            // non-fungible/semi-fungible ESDT
+            let _ = SendRawWrapper::<Env::Api>::new().transfer_esdt_nft_execute(
+                to,
+                self.token_identifier,
+                self.token_nonce,
+                self.amount,
+                gas_limit,
+                &fc.function_name,
+                &fc.arg_buffer,
+            );
+        }
+    }
+
+    fn with_normalized<From, To, F, R>(
+        self,
+        env: &Env,
+        from: &From,
+        to: To,
+        fc: FunctionCall<Env::Api>,
+        f: F,
+    ) -> R
+    where
+        From: TxFrom<Env>,
+        To: TxToSpecified<Env>,
+        F: FnOnce(&ManagedAddress<Env::Api>, &BigUint<Env::Api>, &FunctionCall<Env::Api>) -> R,
+    {
+        to.with_address_ref(env, |to_addr| {
+            if self.token_nonce == 0 {
+                let fc_conv = fc.convert_to_single_transfer_fungible_call(self);
+                f(to_addr, &BigUint::zero(), &fc_conv)
+            } else {
+                let fc_conv = fc.convert_to_single_transfer_nft_call(to_addr, self);
+                f(&from.resolve_address(env), &BigUint::zero(), &fc_conv)
+            }
+        })
+    }
+
+    fn into_full_payment_data(self, _env: &Env) -> FullPaymentData<Env::Api> {
+        FullPaymentData {
+            egld: None,
+            multi_esdt: MultiEsdtPayment::from_single_item(self.to_owned_payment()),
+        }
+    }
+}
diff --git a/framework/base/src/types/managed/wrapped/esdt_token_payment.rs b/framework/base/src/types/managed/wrapped/esdt_token_payment.rs
index 246b28de1d..161c2c1ee3 100644
--- a/framework/base/src/types/managed/wrapped/esdt_token_payment.rs
+++ b/framework/base/src/types/managed/wrapped/esdt_token_payment.rs
@@ -222,3 +222,31 @@ impl<M: ManagedTypeApi> ManagedVecItem for EsdtTokenPayment<M> {
         writer(&arr[..])
     }
 }
+
+/// The version of `EsdtTokenPayment` that contains referrences instead of owned fields.
+pub struct EsdtTokenPaymentRefs<'a, M: ManagedTypeApi> {
+    pub token_identifier: &'a TokenIdentifier<M>,
+    pub token_nonce: u64,
+    pub amount: &'a BigUint<M>,
+}
+
+impl<M: ManagedTypeApi> EsdtTokenPayment<M> {
+    pub fn as_refs(&self) -> EsdtTokenPaymentRefs<'_, M> {
+        EsdtTokenPaymentRefs {
+            token_identifier: &self.token_identifier,
+            token_nonce: self.token_nonce,
+            amount: &self.amount,
+        }
+    }
+}
+
+impl<'a, M: ManagedTypeApi> EsdtTokenPaymentRefs<'a, M> {
+    /// Will clone the referenced values.
+    pub fn to_owned_payment(&self) -> EsdtTokenPayment<M> {
+        EsdtTokenPayment {
+            token_identifier: self.token_identifier.clone(),
+            token_nonce: self.token_nonce,
+            amount: self.amount.clone(),
+        }
+    }
+}
diff --git a/framework/base/src/types/managed/wrapped/mod.rs b/framework/base/src/types/managed/wrapped/mod.rs
index 8ac485fa38..a2dcd6008a 100644
--- a/framework/base/src/types/managed/wrapped/mod.rs
+++ b/framework/base/src/types/managed/wrapped/mod.rs
@@ -23,7 +23,7 @@ pub use egld_or_esdt_token_payment::EgldOrEsdtTokenPayment;
 pub use egld_or_multi_esdt_payment::EgldOrMultiEsdtPayment;
 pub(crate) use encoded_managed_vec_item::EncodedManagedVecItem;
 pub use esdt_token_data::EsdtTokenData;
-pub use esdt_token_payment::{EsdtTokenPayment, MultiEsdtPayment};
+pub use esdt_token_payment::{EsdtTokenPayment, EsdtTokenPaymentRefs, MultiEsdtPayment};
 pub use managed_address::ManagedAddress;
 pub use managed_buffer_cached_builder::ManagedBufferCachedBuilder;
 pub(crate) use managed_byte_array::ManagedBufferSizeContext;

From 0b6e0d687e51d26f87b0abe457b10ebadac0ed29 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Sat, 23 Mar 2024 00:22:55 +0200
Subject: [PATCH 0540/1254] unified sytax - remove direct_esdt usage in
 contracts

---
 contracts/examples/digital-cash/src/helpers.rs         |  6 ++++--
 contracts/examples/order-book/pair/src/orders.rs       | 10 ++++------
 .../forwarder-raw/src/forwarder_raw_async.rs           |  4 ++--
 .../modules/src/bonding_curve/utils/user_endpoints.rs  |  6 ++++--
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/contracts/examples/digital-cash/src/helpers.rs b/contracts/examples/digital-cash/src/helpers.rs
index eef0b641f1..9fa90f5b9b 100644
--- a/contracts/examples/digital-cash/src/helpers.rs
+++ b/contracts/examples/digital-cash/src/helpers.rs
@@ -12,8 +12,10 @@ pub trait HelpersModule: storage::StorageModule {
             self.tx().to(address).egld(&fee.amount).transfer();
         } else {
             let esdt_fee = fee.clone().unwrap_esdt();
-            self.send()
-                .direct_esdt(address, &esdt_fee.token_identifier, 0, &esdt_fee.amount);
+            self.tx()
+                .to(address)
+                .esdt_refs(&esdt_fee.token_identifier, 0, &esdt_fee.amount)
+                .transfer();
         }
     }
 
diff --git a/contracts/examples/order-book/pair/src/orders.rs b/contracts/examples/order-book/pair/src/orders.rs
index 6dd9bdc0bf..67fc5aa619 100644
--- a/contracts/examples/order-book/pair/src/orders.rs
+++ b/contracts/examples/order-book/pair/src/orders.rs
@@ -353,12 +353,10 @@ pub trait OrdersModule:
     fn execute_transfers(&self, transfers: ManagedVec<Transfer<Self::Api>>) {
         for transfer in &transfers {
             if transfer.payment.amount > 0 {
-                self.send().direct_esdt(
-                    &transfer.to,
-                    &transfer.payment.token_id,
-                    0,
-                    &transfer.payment.amount,
-                )
+                self.tx()
+                    .to(&transfer.to)
+                    .esdt_refs(&transfer.payment.token_id, 0, &transfer.payment.amount)
+                    .transfer();
             }
         }
     }
diff --git a/contracts/feature-tests/composability/forwarder-raw/src/forwarder_raw_async.rs b/contracts/feature-tests/composability/forwarder-raw/src/forwarder_raw_async.rs
index 25d8868298..b0c3cbfec9 100644
--- a/contracts/feature-tests/composability/forwarder-raw/src/forwarder_raw_async.rs
+++ b/contracts/feature-tests/composability/forwarder-raw/src/forwarder_raw_async.rs
@@ -13,14 +13,14 @@ pub trait ForwarderRawAsync: super::forwarder_raw_common::ForwarderRawCommon {
     #[payable("*")]
     fn forward_direct_esdt_via_transf_exec(&self, to: ManagedAddress) {
         let (token, payment) = self.call_value().single_fungible_esdt();
-        self.send().direct_esdt(&to, &token, 0, &payment);
+        self.tx().to(&to).esdt_refs(&token, 0, &payment).transfer();
     }
 
     #[endpoint]
     #[payable("*")]
     fn forward_direct_esdt_multi(&self, to: ManagedAddress) {
         let payments = self.call_value().all_esdt_transfers();
-        self.send().direct_multi(&to, &payments);
+        self.tx().to(&to).multi_esdt_ref(&payments).transfer();
     }
 
     fn forward_contract_call(
diff --git a/contracts/modules/src/bonding_curve/utils/user_endpoints.rs b/contracts/modules/src/bonding_curve/utils/user_endpoints.rs
index 321a0bd439..3f4471be95 100644
--- a/contracts/modules/src/bonding_curve/utils/user_endpoints.rs
+++ b/contracts/modules/src/bonding_curve/utils/user_endpoints.rs
@@ -98,8 +98,10 @@ pub trait UserEndpointsModule: storage::StorageModule + events::EventsModule {
 
         match requested_nonce {
             OptionalValue::Some(nonce) => {
-                self.send()
-                    .direct_esdt(&caller, &requested_token, nonce, &requested_amount);
+                self.tx()
+                    .to(&caller)
+                    .esdt_refs(&requested_token, nonce, &requested_amount)
+                    .transfer();
                 if self.nonce_amount(&requested_token, nonce).get() - requested_amount.clone() > 0 {
                     self.nonce_amount(&requested_token, nonce)
                         .update(|val| *val -= requested_amount.clone());

From be81bed9129a3ffc228e74325bd5550abeb02fb2 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Sat, 23 Mar 2024 01:09:41 +0200
Subject: [PATCH 0541/1254] unified syntax - ToCaller

---
 framework/base/src/types/interaction/tx_to.rs |  4 ++
 .../types/interaction/tx_to/tx_to_caller.rs   | 43 +++++++++++++++++++
 2 files changed, 47 insertions(+)
 create mode 100644 framework/base/src/types/interaction/tx_to/tx_to_caller.rs

diff --git a/framework/base/src/types/interaction/tx_to.rs b/framework/base/src/types/interaction/tx_to.rs
index 4116cbc9f9..13c78b5da6 100644
--- a/framework/base/src/types/interaction/tx_to.rs
+++ b/framework/base/src/types/interaction/tx_to.rs
@@ -1,3 +1,7 @@
+mod tx_to_caller;
+
+pub use tx_to_caller::ToCaller;
+
 use crate::types::{heap::Address, ManagedAddress};
 
 use super::{AnnotatedValue, TxEnv};
diff --git a/framework/base/src/types/interaction/tx_to/tx_to_caller.rs b/framework/base/src/types/interaction/tx_to/tx_to_caller.rs
new file mode 100644
index 0000000000..5c1668d38d
--- /dev/null
+++ b/framework/base/src/types/interaction/tx_to/tx_to_caller.rs
@@ -0,0 +1,43 @@
+use crate::{
+    api::{BlockchainApi, CallTypeApi},
+    contract_base::BlockchainWrapper,
+    types::{AnnotatedValue, ManagedAddress, ManagedBuffer, TxScEnv},
+};
+
+use super::{TxTo, TxToSpecified};
+
+/// Indicates that transaction should be sent to the caller (the sender of the current transaction).
+pub struct ToCaller;
+
+fn get_caller<Api>() -> ManagedAddress<Api>
+where
+    Api: CallTypeApi + BlockchainApi,
+{
+    BlockchainWrapper::<Api>::new().get_caller()
+}
+
+impl<Api> AnnotatedValue<TxScEnv<Api>, ManagedAddress<Api>> for ToCaller
+where
+    Api: CallTypeApi + BlockchainApi,
+{
+    fn annotation(&self, env: &TxScEnv<Api>) -> ManagedBuffer<Api> {
+        get_caller::<Api>().hex_expr()
+    }
+
+    fn into_value(self, _env: &TxScEnv<Api>) -> ManagedAddress<Api> {
+        get_caller::<Api>()
+    }
+}
+
+impl<Api> TxTo<TxScEnv<Api>> for ToCaller where Api: CallTypeApi + BlockchainApi {}
+impl<Api> TxToSpecified<TxScEnv<Api>> for ToCaller
+where
+    Api: CallTypeApi + BlockchainApi,
+{
+    fn with_address_ref<F, R>(&self, env: &TxScEnv<Api>, f: F) -> R
+    where
+        F: FnOnce(&ManagedAddress<Api>) -> R,
+    {
+        f(&get_caller::<Api>())
+    }
+}

From 072f46231b014f9bfd27abc9dabb05a75563d330 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Sat, 23 Mar 2024 01:10:08 +0200
Subject: [PATCH 0542/1254] unified sytax - remove direct_esdt usage in
 contracts

---
 contracts/core/wegld-swap/src/wegld.rs        |  7 +--
 .../fractional-nfts/src/fractional_nfts.rs    | 31 +++++++------
 .../examples/nft-minter/src/nft_module.rs     | 12 ++---
 .../examples/nft-subscription/src/lib.rs      | 46 +++++++++----------
 .../seed-nft-minter/src/nft_module.rs         | 12 ++---
 .../token-release/src/token_release.rs        |  6 ++-
 .../composability/forwarder/src/esdt.rs       | 18 ++++++--
 .../composability/forwarder/src/nft.rs        |  6 ++-
 .../rust-testing-framework-tester/src/lib.rs  | 12 +++--
 contracts/modules/src/governance/mod.rs       | 28 ++++++-----
 .../mappers/token/fungible_token_mapper.rs    |  7 ++-
 .../token/non_fungible_token_mapper.rs        | 16 ++++---
 12 files changed, 112 insertions(+), 89 deletions(-)

diff --git a/contracts/core/wegld-swap/src/wegld.rs b/contracts/core/wegld-swap/src/wegld.rs
index e31a6d0e87..11143e4209 100644
--- a/contracts/core/wegld-swap/src/wegld.rs
+++ b/contracts/core/wegld-swap/src/wegld.rs
@@ -23,9 +23,10 @@ pub trait EgldEsdtSwap: multiversx_sc_modules::pause::PauseModule {
         self.send()
             .esdt_local_mint(&wrapped_egld_token_id, 0, &payment_amount);
 
-        let caller = self.blockchain().get_caller();
-        self.send()
-            .direct_esdt(&caller, &wrapped_egld_token_id, 0, &payment_amount);
+        self.tx()
+            .to(ToCaller)
+            .esdt_refs(&wrapped_egld_token_id, 0, &payment_amount)
+            .transfer();
 
         EsdtTokenPayment::new(wrapped_egld_token_id, 0, payment_amount.clone_value())
     }
diff --git a/contracts/examples/fractional-nfts/src/fractional_nfts.rs b/contracts/examples/fractional-nfts/src/fractional_nfts.rs
index c715edae82..f27ba43286 100644
--- a/contracts/examples/fractional-nfts/src/fractional_nfts.rs
+++ b/contracts/examples/fractional-nfts/src/fractional_nfts.rs
@@ -85,13 +85,14 @@ pub trait FractionalNfts: default_issue_callbacks::DefaultIssueCallbacksModule {
             &uris,
         );
 
-        let caller = self.blockchain().get_caller();
-        self.send().direct_esdt(
-            &caller,
-            fractional_token,
-            fractional_nonce,
-            &initial_fractional_amount,
-        );
+        self.tx()
+            .to(ToCaller)
+            .esdt_refs(
+                fractional_token,
+                fractional_nonce,
+                &initial_fractional_amount,
+            )
+            .transfer();
     }
 
     #[payable("*")]
@@ -123,13 +124,15 @@ pub trait FractionalNfts: default_issue_callbacks::DefaultIssueCallbacksModule {
         );
 
         let original = fractional_info.original_payment;
-        let caller = self.blockchain().get_caller();
-        self.send().direct_esdt(
-            &caller,
-            &original.token_identifier,
-            original.token_nonce,
-            &original.amount,
-        );
+
+        self.tx()
+            .to(ToCaller)
+            .esdt_refs(
+                &original.token_identifier,
+                original.token_nonce,
+                &original.amount,
+            )
+            .transfer();
     }
 
     #[view(getFractionalToken)]
diff --git a/contracts/examples/nft-minter/src/nft_module.rs b/contracts/examples/nft-minter/src/nft_module.rs
index 2b9b73523c..51208ea40d 100644
--- a/contracts/examples/nft-minter/src/nft_module.rs
+++ b/contracts/examples/nft-minter/src/nft_module.rs
@@ -88,13 +88,11 @@ pub trait NftModule {
         self.price_tag(nft_nonce).clear();
 
         let nft_token_id = self.nft_token_id().get();
-        let caller = self.blockchain().get_caller();
-        self.send().direct_esdt(
-            &caller,
-            &nft_token_id,
-            nft_nonce,
-            &BigUint::from(NFT_AMOUNT),
-        );
+
+        self.tx()
+            .to(ToCaller)
+            .esdt_refs(&nft_token_id, nft_nonce, &BigUint::from(NFT_AMOUNT))
+            .transfer();
 
         let owner = self.blockchain().get_owner_address();
         self.send().direct(
diff --git a/contracts/examples/nft-subscription/src/lib.rs b/contracts/examples/nft-subscription/src/lib.rs
index d291eaf212..277913dc88 100644
--- a/contracts/examples/nft-subscription/src/lib.rs
+++ b/contracts/examples/nft-subscription/src/lib.rs
@@ -35,12 +35,15 @@ pub trait NftSubscription:
             ManagedBuffer::from(b"common"),
             &ManagedVec::new(),
         );
-        self.send().direct_esdt(
-            &self.blockchain().get_caller(),
-            self.token_id().get_token_id_ref(),
-            nonce,
-            &BigUint::from(1u8),
-        );
+
+        self.tx()
+            .to(ToCaller)
+            .esdt_refs(
+                self.token_id().get_token_id_ref(),
+                nonce,
+                &BigUint::from(1u8),
+            )
+            .transfer();
     }
 
     #[payable("*")]
@@ -48,12 +51,10 @@ pub trait NftSubscription:
     fn update_attributes(&self, attributes: ManagedBuffer) {
         let (id, nonce, _) = self.call_value().single_esdt().into_tuple();
         self.update_subscription_attributes::<ManagedBuffer>(&id, nonce, attributes);
-        self.send().direct_esdt(
-            &self.blockchain().get_caller(),
-            &id,
-            nonce,
-            &BigUint::from(1u8),
-        );
+        self.tx()
+            .to(ToCaller)
+            .esdt_refs(&id, nonce, &BigUint::from(1u8))
+            .transfer();
     }
 
     #[payable("*")]
@@ -61,12 +62,10 @@ pub trait NftSubscription:
     fn renew(&self, duration: u64) {
         let (id, nonce, _) = self.call_value().single_esdt().into_tuple();
         self.renew_subscription::<ManagedBuffer>(&id, nonce, duration);
-        self.send().direct_esdt(
-            &self.blockchain().get_caller(),
-            &id,
-            nonce,
-            &BigUint::from(1u8),
-        );
+        self.tx()
+            .to(ToCaller)
+            .esdt_refs(&id, nonce, &BigUint::from(1u8))
+            .transfer();
     }
 
     #[payable("*")]
@@ -74,12 +73,11 @@ pub trait NftSubscription:
     fn cancel(&self) {
         let (id, nonce, _) = self.call_value().single_esdt().into_tuple();
         self.cancel_subscription::<ManagedBuffer>(&id, nonce);
-        self.send().direct_esdt(
-            &self.blockchain().get_caller(),
-            &id,
-            nonce,
-            &BigUint::from(1u8),
-        );
+
+        self.tx()
+            .to(ToCaller)
+            .esdt_refs(&id, nonce, &BigUint::from(1u8))
+            .transfer();
     }
 
     #[storage_mapper("tokenId")]
diff --git a/contracts/examples/seed-nft-minter/src/nft_module.rs b/contracts/examples/seed-nft-minter/src/nft_module.rs
index 885ff36c90..e6d285f343 100644
--- a/contracts/examples/seed-nft-minter/src/nft_module.rs
+++ b/contracts/examples/seed-nft-minter/src/nft_module.rs
@@ -65,13 +65,11 @@ pub trait NftModule:
         self.price_tag(nft_nonce).clear();
 
         let nft_token_id = self.nft_token_id().get_token_id();
-        let caller = self.blockchain().get_caller();
-        self.send().direct_esdt(
-            &caller,
-            &nft_token_id,
-            nft_nonce,
-            &BigUint::from(NFT_AMOUNT),
-        );
+
+        self.tx()
+            .to(ToCaller)
+            .esdt_refs(&nft_token_id, nft_nonce, &BigUint::from(NFT_AMOUNT))
+            .transfer();
 
         self.distribute_funds(
             &payment.token_identifier,
diff --git a/contracts/examples/token-release/src/token_release.rs b/contracts/examples/token-release/src/token_release.rs
index 29fb3890e0..71ac2934b6 100644
--- a/contracts/examples/token-release/src/token_release.rs
+++ b/contracts/examples/token-release/src/token_release.rs
@@ -312,8 +312,10 @@ pub trait TokenRelease {
         address: &ManagedAddress,
         amount: &BigUint,
     ) {
-        self.send()
-            .direct_esdt(address, token_identifier, 0, amount);
+        self.tx()
+            .to(address)
+            .esdt_refs(token_identifier, 0, amount)
+            .transfer();
     }
 
     fn mint_all_tokens(&self, token_identifier: &TokenIdentifier, amount: &BigUint) {
diff --git a/contracts/feature-tests/composability/forwarder/src/esdt.rs b/contracts/feature-tests/composability/forwarder/src/esdt.rs
index 214b9dd9ea..bfe9de0d34 100644
--- a/contracts/feature-tests/composability/forwarder/src/esdt.rs
+++ b/contracts/feature-tests/composability/forwarder/src/esdt.rs
@@ -32,7 +32,7 @@ pub trait ForwarderEsdtModule: storage::ForwarderStorageModule {
 
     #[endpoint]
     fn send_esdt(&self, to: &ManagedAddress, token_id: TokenIdentifier, amount: &BigUint) {
-        self.send().direct_esdt(to, &token_id, 0, amount);
+        self.tx().to(to).esdt_refs(&token_id, 0, amount).transfer();
     }
 
     #[payable("*")]
@@ -42,7 +42,10 @@ pub trait ForwarderEsdtModule: storage::ForwarderStorageModule {
         let fees = &payment * &percentage_fees / PERCENTAGE_TOTAL;
         let amount_to_send = payment - fees;
 
-        self.send().direct_esdt(&to, &token_id, 0, &amount_to_send);
+        self.tx()
+            .to(&to)
+            .esdt_refs(&token_id, 0, &amount_to_send)
+            .transfer();
     }
 
     #[endpoint]
@@ -53,9 +56,14 @@ pub trait ForwarderEsdtModule: storage::ForwarderStorageModule {
         amount_first_time: &BigUint,
         amount_second_time: &BigUint,
     ) {
-        self.send().direct_esdt(to, &token_id, 0, amount_first_time);
-        self.send()
-            .direct_esdt(to, &token_id, 0, amount_second_time);
+        self.tx()
+            .to(to)
+            .esdt_refs(&token_id, 0, amount_first_time)
+            .transfer();
+        self.tx()
+            .to(to)
+            .esdt_refs(&token_id, 0, amount_second_time)
+            .transfer();
     }
 
     #[endpoint]
diff --git a/contracts/feature-tests/composability/forwarder/src/nft.rs b/contracts/feature-tests/composability/forwarder/src/nft.rs
index 95ab6cfeed..c21fa1f6c8 100644
--- a/contracts/feature-tests/composability/forwarder/src/nft.rs
+++ b/contracts/feature-tests/composability/forwarder/src/nft.rs
@@ -271,8 +271,10 @@ pub trait ForwarderNftModule: storage::ForwarderStorageModule {
             uri,
         );
 
-        self.send()
-            .direct_esdt(&to, &token_identifier, token_nonce, &amount);
+        self.tx()
+            .to(&to)
+            .esdt_refs(&token_identifier, token_nonce, &amount)
+            .transfer();
 
         self.send_event(&to, &token_identifier, token_nonce, &amount);
     }
diff --git a/contracts/feature-tests/rust-testing-framework-tester/src/lib.rs b/contracts/feature-tests/rust-testing-framework-tester/src/lib.rs
index 010f002e6a..dbb55e7fde 100644
--- a/contracts/feature-tests/rust-testing-framework-tester/src/lib.rs
+++ b/contracts/feature-tests/rust-testing-framework-tester/src/lib.rs
@@ -88,12 +88,13 @@ pub trait RustTestingFrameworkTester: dummy_module::DummyModule {
     #[payable("*")]
     #[endpoint]
     fn receive_esdt_half(&self) {
-        let caller = self.blockchain().get_caller();
         let payment = self.call_value().single_esdt();
         let amount = payment.amount / 2u32;
 
-        self.send()
-            .direct_esdt(&caller, &payment.token_identifier, 0, &amount);
+        self.tx()
+            .to(ToCaller)
+            .esdt_refs(&payment.token_identifier, 0, &amount)
+            .transfer();
     }
 
     #[payable("*")]
@@ -111,7 +112,10 @@ pub trait RustTestingFrameworkTester: dummy_module::DummyModule {
         nft_nonce: u64,
         amount: BigUint,
     ) {
-        self.send().direct_esdt(&to, &token_id, nft_nonce, &amount);
+        self.tx()
+            .to(&to)
+            .esdt_refs(&token_id, nft_nonce, &amount)
+            .transfer();
     }
 
     #[endpoint]
diff --git a/contracts/modules/src/governance/mod.rs b/contracts/modules/src/governance/mod.rs
index ee343f7101..5463975fbb 100644
--- a/contracts/modules/src/governance/mod.rs
+++ b/contracts/modules/src/governance/mod.rs
@@ -84,12 +84,14 @@ pub trait GovernanceModule:
         for fee_entry in fees_to_send.iter() {
             let payment = fee_entry.tokens.clone();
 
-            self.send().direct_esdt(
-                &fee_entry.depositor_addr,
-                &payment.token_identifier,
-                payment.token_nonce,
-                &payment.amount,
-            );
+            self.tx()
+                .to(&fee_entry.depositor_addr)
+                .esdt_refs(
+                    &payment.token_identifier,
+                    payment.token_nonce,
+                    &payment.amount,
+                )
+                .transfer();
             self.user_claim_event(&caller, proposal_id, &fee_entry.tokens);
         }
     }
@@ -420,12 +422,14 @@ pub trait GovernanceModule:
 
         for fee_entry in payments.entries.iter() {
             let payment = fee_entry.tokens;
-            self.send().direct_esdt(
-                &fee_entry.depositor_addr,
-                &payment.token_identifier,
-                payment.token_nonce,
-                &payment.amount,
-            );
+            self.tx()
+                .to(&fee_entry.depositor_addr)
+                .esdt_refs(
+                    &payment.token_identifier,
+                    payment.token_nonce,
+                    &payment.amount,
+                )
+                .transfer();
         }
     }
 
diff --git a/framework/base/src/storage/mappers/token/fungible_token_mapper.rs b/framework/base/src/storage/mappers/token/fungible_token_mapper.rs
index 7f84501071..a2df87584e 100644
--- a/framework/base/src/storage/mappers/token/fungible_token_mapper.rs
+++ b/framework/base/src/storage/mappers/token/fungible_token_mapper.rs
@@ -3,6 +3,7 @@ use crate::{
     api::ErrorApiImpl,
     codec::{CodecFrom, EncodeErrorHandler, TopEncodeMulti, TopEncodeMultiOutput},
     storage_clear, storage_get, storage_set,
+    types::Tx,
 };
 
 use super::{
@@ -243,8 +244,10 @@ where
     }
 
     fn send_payment(&self, to: &ManagedAddress<SA>, payment: &EsdtTokenPayment<SA>) {
-        let send_wrapper = SendWrapper::<SA>::new();
-        send_wrapper.direct_esdt(to, &payment.token_identifier, 0, &payment.amount);
+        Tx::new_tx_from_sc()
+            .to(to)
+            .esdt_refs(&payment.token_identifier, 0, &payment.amount)
+            .transfer();
     }
 }
 
diff --git a/framework/base/src/storage/mappers/token/non_fungible_token_mapper.rs b/framework/base/src/storage/mappers/token/non_fungible_token_mapper.rs
index 80946dd2a6..a02f9d7d07 100644
--- a/framework/base/src/storage/mappers/token/non_fungible_token_mapper.rs
+++ b/framework/base/src/storage/mappers/token/non_fungible_token_mapper.rs
@@ -3,6 +3,7 @@ use crate::{
         CodecFrom, EncodeErrorHandler, TopDecode, TopEncode, TopEncodeMulti, TopEncodeMultiOutput,
     },
     storage_clear, storage_get, storage_set,
+    types::Tx,
 };
 
 use super::{
@@ -368,13 +369,14 @@ where
     }
 
     fn send_payment(&self, to: &ManagedAddress<SA>, payment: &EsdtTokenPayment<SA>) {
-        let send_wrapper = SendWrapper::<SA>::new();
-        send_wrapper.direct_esdt(
-            to,
-            &payment.token_identifier,
-            payment.token_nonce,
-            &payment.amount,
-        );
+        Tx::new_tx_from_sc()
+            .to(to)
+            .esdt_refs(
+                &payment.token_identifier,
+                payment.token_nonce,
+                &payment.amount,
+            )
+            .transfer();
     }
 }
 

From e473c20a07777e32ac32ab777faba1f9cc42265e Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Sat, 23 Mar 2024 01:18:55 +0200
Subject: [PATCH 0543/1254] unified syntax - renamed single_esdt

---
 contracts/core/wegld-swap/src/wegld.rs                |  2 +-
 contracts/examples/digital-cash/src/helpers.rs        |  2 +-
 .../examples/fractional-nfts/src/fractional_nfts.rs   |  4 ++--
 contracts/examples/nft-minter/src/nft_module.rs       |  2 +-
 contracts/examples/nft-subscription/src/lib.rs        |  8 ++++----
 contracts/examples/order-book/pair/src/orders.rs      |  2 +-
 contracts/examples/seed-nft-minter/src/nft_module.rs  |  2 +-
 contracts/examples/token-release/src/token_release.rs |  2 +-
 .../forwarder-raw/src/forwarder_raw_async.rs          |  5 ++++-
 .../feature-tests/composability/forwarder/src/esdt.rs | 11 +++++++----
 .../feature-tests/composability/forwarder/src/nft.rs  |  2 +-
 .../rust-testing-framework-tester/src/lib.rs          |  4 ++--
 .../modules/src/bonding_curve/utils/user_endpoints.rs |  2 +-
 contracts/modules/src/governance/mod.rs               |  4 ++--
 .../base/src/contract_base/wrappers/send_wrapper.rs   |  2 +-
 .../storage/mappers/token/fungible_token_mapper.rs    |  2 +-
 .../mappers/token/non_fungible_token_mapper.rs        |  2 +-
 framework/base/src/types/interaction/tx.rs            |  2 +-
 18 files changed, 33 insertions(+), 27 deletions(-)

diff --git a/contracts/core/wegld-swap/src/wegld.rs b/contracts/core/wegld-swap/src/wegld.rs
index 11143e4209..4a38cab09e 100644
--- a/contracts/core/wegld-swap/src/wegld.rs
+++ b/contracts/core/wegld-swap/src/wegld.rs
@@ -25,7 +25,7 @@ pub trait EgldEsdtSwap: multiversx_sc_modules::pause::PauseModule {
 
         self.tx()
             .to(ToCaller)
-            .esdt_refs(&wrapped_egld_token_id, 0, &payment_amount)
+            .single_esdt(&wrapped_egld_token_id, 0, &payment_amount)
             .transfer();
 
         EsdtTokenPayment::new(wrapped_egld_token_id, 0, payment_amount.clone_value())
diff --git a/contracts/examples/digital-cash/src/helpers.rs b/contracts/examples/digital-cash/src/helpers.rs
index 9fa90f5b9b..aa5c4efadc 100644
--- a/contracts/examples/digital-cash/src/helpers.rs
+++ b/contracts/examples/digital-cash/src/helpers.rs
@@ -14,7 +14,7 @@ pub trait HelpersModule: storage::StorageModule {
             let esdt_fee = fee.clone().unwrap_esdt();
             self.tx()
                 .to(address)
-                .esdt_refs(&esdt_fee.token_identifier, 0, &esdt_fee.amount)
+                .single_esdt(&esdt_fee.token_identifier, 0, &esdt_fee.amount)
                 .transfer();
         }
     }
diff --git a/contracts/examples/fractional-nfts/src/fractional_nfts.rs b/contracts/examples/fractional-nfts/src/fractional_nfts.rs
index f27ba43286..761eb1ec68 100644
--- a/contracts/examples/fractional-nfts/src/fractional_nfts.rs
+++ b/contracts/examples/fractional-nfts/src/fractional_nfts.rs
@@ -87,7 +87,7 @@ pub trait FractionalNfts: default_issue_callbacks::DefaultIssueCallbacksModule {
 
         self.tx()
             .to(ToCaller)
-            .esdt_refs(
+            .single_esdt(
                 fractional_token,
                 fractional_nonce,
                 &initial_fractional_amount,
@@ -127,7 +127,7 @@ pub trait FractionalNfts: default_issue_callbacks::DefaultIssueCallbacksModule {
 
         self.tx()
             .to(ToCaller)
-            .esdt_refs(
+            .single_esdt(
                 &original.token_identifier,
                 original.token_nonce,
                 &original.amount,
diff --git a/contracts/examples/nft-minter/src/nft_module.rs b/contracts/examples/nft-minter/src/nft_module.rs
index 51208ea40d..05b937f432 100644
--- a/contracts/examples/nft-minter/src/nft_module.rs
+++ b/contracts/examples/nft-minter/src/nft_module.rs
@@ -91,7 +91,7 @@ pub trait NftModule {
 
         self.tx()
             .to(ToCaller)
-            .esdt_refs(&nft_token_id, nft_nonce, &BigUint::from(NFT_AMOUNT))
+            .single_esdt(&nft_token_id, nft_nonce, &BigUint::from(NFT_AMOUNT))
             .transfer();
 
         let owner = self.blockchain().get_owner_address();
diff --git a/contracts/examples/nft-subscription/src/lib.rs b/contracts/examples/nft-subscription/src/lib.rs
index 277913dc88..7b0b63096e 100644
--- a/contracts/examples/nft-subscription/src/lib.rs
+++ b/contracts/examples/nft-subscription/src/lib.rs
@@ -38,7 +38,7 @@ pub trait NftSubscription:
 
         self.tx()
             .to(ToCaller)
-            .esdt_refs(
+            .single_esdt(
                 self.token_id().get_token_id_ref(),
                 nonce,
                 &BigUint::from(1u8),
@@ -53,7 +53,7 @@ pub trait NftSubscription:
         self.update_subscription_attributes::<ManagedBuffer>(&id, nonce, attributes);
         self.tx()
             .to(ToCaller)
-            .esdt_refs(&id, nonce, &BigUint::from(1u8))
+            .single_esdt(&id, nonce, &BigUint::from(1u8))
             .transfer();
     }
 
@@ -64,7 +64,7 @@ pub trait NftSubscription:
         self.renew_subscription::<ManagedBuffer>(&id, nonce, duration);
         self.tx()
             .to(ToCaller)
-            .esdt_refs(&id, nonce, &BigUint::from(1u8))
+            .single_esdt(&id, nonce, &BigUint::from(1u8))
             .transfer();
     }
 
@@ -76,7 +76,7 @@ pub trait NftSubscription:
 
         self.tx()
             .to(ToCaller)
-            .esdt_refs(&id, nonce, &BigUint::from(1u8))
+            .single_esdt(&id, nonce, &BigUint::from(1u8))
             .transfer();
     }
 
diff --git a/contracts/examples/order-book/pair/src/orders.rs b/contracts/examples/order-book/pair/src/orders.rs
index 67fc5aa619..1ec11afee4 100644
--- a/contracts/examples/order-book/pair/src/orders.rs
+++ b/contracts/examples/order-book/pair/src/orders.rs
@@ -355,7 +355,7 @@ pub trait OrdersModule:
             if transfer.payment.amount > 0 {
                 self.tx()
                     .to(&transfer.to)
-                    .esdt_refs(&transfer.payment.token_id, 0, &transfer.payment.amount)
+                    .single_esdt(&transfer.payment.token_id, 0, &transfer.payment.amount)
                     .transfer();
             }
         }
diff --git a/contracts/examples/seed-nft-minter/src/nft_module.rs b/contracts/examples/seed-nft-minter/src/nft_module.rs
index e6d285f343..a65a4175d7 100644
--- a/contracts/examples/seed-nft-minter/src/nft_module.rs
+++ b/contracts/examples/seed-nft-minter/src/nft_module.rs
@@ -68,7 +68,7 @@ pub trait NftModule:
 
         self.tx()
             .to(ToCaller)
-            .esdt_refs(&nft_token_id, nft_nonce, &BigUint::from(NFT_AMOUNT))
+            .single_esdt(&nft_token_id, nft_nonce, &BigUint::from(NFT_AMOUNT))
             .transfer();
 
         self.distribute_funds(
diff --git a/contracts/examples/token-release/src/token_release.rs b/contracts/examples/token-release/src/token_release.rs
index 71ac2934b6..b0acd8a0e7 100644
--- a/contracts/examples/token-release/src/token_release.rs
+++ b/contracts/examples/token-release/src/token_release.rs
@@ -314,7 +314,7 @@ pub trait TokenRelease {
     ) {
         self.tx()
             .to(address)
-            .esdt_refs(token_identifier, 0, amount)
+            .single_esdt(token_identifier, 0, amount)
             .transfer();
     }
 
diff --git a/contracts/feature-tests/composability/forwarder-raw/src/forwarder_raw_async.rs b/contracts/feature-tests/composability/forwarder-raw/src/forwarder_raw_async.rs
index b0c3cbfec9..cdf3c8f42c 100644
--- a/contracts/feature-tests/composability/forwarder-raw/src/forwarder_raw_async.rs
+++ b/contracts/feature-tests/composability/forwarder-raw/src/forwarder_raw_async.rs
@@ -13,7 +13,10 @@ pub trait ForwarderRawAsync: super::forwarder_raw_common::ForwarderRawCommon {
     #[payable("*")]
     fn forward_direct_esdt_via_transf_exec(&self, to: ManagedAddress) {
         let (token, payment) = self.call_value().single_fungible_esdt();
-        self.tx().to(&to).esdt_refs(&token, 0, &payment).transfer();
+        self.tx()
+            .to(&to)
+            .single_esdt(&token, 0, &payment)
+            .transfer();
     }
 
     #[endpoint]
diff --git a/contracts/feature-tests/composability/forwarder/src/esdt.rs b/contracts/feature-tests/composability/forwarder/src/esdt.rs
index bfe9de0d34..844329ae65 100644
--- a/contracts/feature-tests/composability/forwarder/src/esdt.rs
+++ b/contracts/feature-tests/composability/forwarder/src/esdt.rs
@@ -32,7 +32,10 @@ pub trait ForwarderEsdtModule: storage::ForwarderStorageModule {
 
     #[endpoint]
     fn send_esdt(&self, to: &ManagedAddress, token_id: TokenIdentifier, amount: &BigUint) {
-        self.tx().to(to).esdt_refs(&token_id, 0, amount).transfer();
+        self.tx()
+            .to(to)
+            .single_esdt(&token_id, 0, amount)
+            .transfer();
     }
 
     #[payable("*")]
@@ -44,7 +47,7 @@ pub trait ForwarderEsdtModule: storage::ForwarderStorageModule {
 
         self.tx()
             .to(&to)
-            .esdt_refs(&token_id, 0, &amount_to_send)
+            .single_esdt(&token_id, 0, &amount_to_send)
             .transfer();
     }
 
@@ -58,11 +61,11 @@ pub trait ForwarderEsdtModule: storage::ForwarderStorageModule {
     ) {
         self.tx()
             .to(to)
-            .esdt_refs(&token_id, 0, amount_first_time)
+            .single_esdt(&token_id, 0, amount_first_time)
             .transfer();
         self.tx()
             .to(to)
-            .esdt_refs(&token_id, 0, amount_second_time)
+            .single_esdt(&token_id, 0, amount_second_time)
             .transfer();
     }
 
diff --git a/contracts/feature-tests/composability/forwarder/src/nft.rs b/contracts/feature-tests/composability/forwarder/src/nft.rs
index c21fa1f6c8..65e5eb7de1 100644
--- a/contracts/feature-tests/composability/forwarder/src/nft.rs
+++ b/contracts/feature-tests/composability/forwarder/src/nft.rs
@@ -273,7 +273,7 @@ pub trait ForwarderNftModule: storage::ForwarderStorageModule {
 
         self.tx()
             .to(&to)
-            .esdt_refs(&token_identifier, token_nonce, &amount)
+            .single_esdt(&token_identifier, token_nonce, &amount)
             .transfer();
 
         self.send_event(&to, &token_identifier, token_nonce, &amount);
diff --git a/contracts/feature-tests/rust-testing-framework-tester/src/lib.rs b/contracts/feature-tests/rust-testing-framework-tester/src/lib.rs
index dbb55e7fde..dae11542e4 100644
--- a/contracts/feature-tests/rust-testing-framework-tester/src/lib.rs
+++ b/contracts/feature-tests/rust-testing-framework-tester/src/lib.rs
@@ -93,7 +93,7 @@ pub trait RustTestingFrameworkTester: dummy_module::DummyModule {
 
         self.tx()
             .to(ToCaller)
-            .esdt_refs(&payment.token_identifier, 0, &amount)
+            .single_esdt(&payment.token_identifier, 0, &amount)
             .transfer();
     }
 
@@ -114,7 +114,7 @@ pub trait RustTestingFrameworkTester: dummy_module::DummyModule {
     ) {
         self.tx()
             .to(&to)
-            .esdt_refs(&token_id, nft_nonce, &amount)
+            .single_esdt(&token_id, nft_nonce, &amount)
             .transfer();
     }
 
diff --git a/contracts/modules/src/bonding_curve/utils/user_endpoints.rs b/contracts/modules/src/bonding_curve/utils/user_endpoints.rs
index 3f4471be95..5eec6451d2 100644
--- a/contracts/modules/src/bonding_curve/utils/user_endpoints.rs
+++ b/contracts/modules/src/bonding_curve/utils/user_endpoints.rs
@@ -100,7 +100,7 @@ pub trait UserEndpointsModule: storage::StorageModule + events::EventsModule {
             OptionalValue::Some(nonce) => {
                 self.tx()
                     .to(&caller)
-                    .esdt_refs(&requested_token, nonce, &requested_amount)
+                    .single_esdt(&requested_token, nonce, &requested_amount)
                     .transfer();
                 if self.nonce_amount(&requested_token, nonce).get() - requested_amount.clone() > 0 {
                     self.nonce_amount(&requested_token, nonce)
diff --git a/contracts/modules/src/governance/mod.rs b/contracts/modules/src/governance/mod.rs
index 5463975fbb..624a6949e1 100644
--- a/contracts/modules/src/governance/mod.rs
+++ b/contracts/modules/src/governance/mod.rs
@@ -86,7 +86,7 @@ pub trait GovernanceModule:
 
             self.tx()
                 .to(&fee_entry.depositor_addr)
-                .esdt_refs(
+                .single_esdt(
                     &payment.token_identifier,
                     payment.token_nonce,
                     &payment.amount,
@@ -424,7 +424,7 @@ pub trait GovernanceModule:
             let payment = fee_entry.tokens;
             self.tx()
                 .to(&fee_entry.depositor_addr)
-                .esdt_refs(
+                .single_esdt(
                     &payment.token_identifier,
                     payment.token_nonce,
                     &payment.amount,
diff --git a/framework/base/src/contract_base/wrappers/send_wrapper.rs b/framework/base/src/contract_base/wrappers/send_wrapper.rs
index 519c71158d..b55e486241 100644
--- a/framework/base/src/contract_base/wrappers/send_wrapper.rs
+++ b/framework/base/src/contract_base/wrappers/send_wrapper.rs
@@ -197,7 +197,7 @@ where
     ) {
         Tx::new_tx_from_sc()
             .to(to)
-            .esdt_refs(token_identifier, token_nonce, amount)
+            .single_esdt(token_identifier, token_nonce, amount)
             .transfer();
     }
 
diff --git a/framework/base/src/storage/mappers/token/fungible_token_mapper.rs b/framework/base/src/storage/mappers/token/fungible_token_mapper.rs
index a2df87584e..53f07eab56 100644
--- a/framework/base/src/storage/mappers/token/fungible_token_mapper.rs
+++ b/framework/base/src/storage/mappers/token/fungible_token_mapper.rs
@@ -246,7 +246,7 @@ where
     fn send_payment(&self, to: &ManagedAddress<SA>, payment: &EsdtTokenPayment<SA>) {
         Tx::new_tx_from_sc()
             .to(to)
-            .esdt_refs(&payment.token_identifier, 0, &payment.amount)
+            .single_esdt(&payment.token_identifier, 0, &payment.amount)
             .transfer();
     }
 }
diff --git a/framework/base/src/storage/mappers/token/non_fungible_token_mapper.rs b/framework/base/src/storage/mappers/token/non_fungible_token_mapper.rs
index a02f9d7d07..a49db9846b 100644
--- a/framework/base/src/storage/mappers/token/non_fungible_token_mapper.rs
+++ b/framework/base/src/storage/mappers/token/non_fungible_token_mapper.rs
@@ -371,7 +371,7 @@ where
     fn send_payment(&self, to: &ManagedAddress<SA>, payment: &EsdtTokenPayment<SA>) {
         Tx::new_tx_from_sc()
             .to(to)
-            .esdt_refs(
+            .single_esdt(
                 &payment.token_identifier,
                 payment.token_nonce,
                 &payment.amount,
diff --git a/framework/base/src/types/interaction/tx.rs b/framework/base/src/types/interaction/tx.rs
index 27b11f59f8..583e038625 100644
--- a/framework/base/src/types/interaction/tx.rs
+++ b/framework/base/src/types/interaction/tx.rs
@@ -207,7 +207,7 @@ where
     /// Sets a single token payment, with the token identifier and amount kept as references.
     ///
     /// This is handy whem we only want one ESDT transfer and we want to avoid unnecessary object clones.
-    pub fn esdt_refs<'a>(
+    pub fn single_esdt<'a>(
         self,
         token_identifier: &'a TokenIdentifier<Env::Api>,
         token_nonce: u64,

From e168ede6ba1002700b0306740aec07adc8872bb1 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Sat, 23 Mar 2024 02:02:50 +0200
Subject: [PATCH 0544/1254] clean up multi-esdt transfer-execute call

---
 .../tx_payment/tx_payment_multi_esdt.rs       | 23 ++++++-------------
 1 file changed, 7 insertions(+), 16 deletions(-)

diff --git a/framework/base/src/types/interaction/tx_payment/tx_payment_multi_esdt.rs b/framework/base/src/types/interaction/tx_payment/tx_payment_multi_esdt.rs
index 3c1a554d03..39f0e6a64c 100644
--- a/framework/base/src/types/interaction/tx_payment/tx_payment_multi_esdt.rs
+++ b/framework/base/src/types/interaction/tx_payment/tx_payment_multi_esdt.rs
@@ -20,22 +20,13 @@ where
         gas_limit: u64,
         fc: FunctionCall<Env::Api>,
     ) {
-        match self.len() {
-            0 => ().perform_transfer_execute(env, to, gas_limit, fc),
-            1 => self
-                .get(0)
-                .as_refs()
-                .perform_transfer_execute(env, to, gas_limit, fc),
-            _ => {
-                let _ = SendRawWrapper::<Env::Api>::new().multi_esdt_transfer_execute(
-                    to,
-                    self,
-                    gas_limit,
-                    &fc.function_name,
-                    &fc.arg_buffer,
-                );
-            },
-        }
+        let _ = SendRawWrapper::<Env::Api>::new().multi_esdt_transfer_execute(
+            to,
+            self,
+            gas_limit,
+            &fc.function_name,
+            &fc.arg_buffer,
+        );
     }
 
     fn with_normalized<From, To, F, R>(

From f1d0737565f6b52b58ce9ce702a4695586196f57 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Sat, 23 Mar 2024 02:11:49 +0200
Subject: [PATCH 0545/1254] unified sytax - remove direct_multi usage in
 contracts

---
 contracts/examples/digital-cash/src/digital_cash.rs  |  6 ++++--
 .../digital-cash/src/signature_operations.rs         | 12 ++++++++----
 .../src/esdt_transfer_with_fee.rs                    |  5 ++---
 .../src/bonding_curve/utils/owner_endpoints.rs       |  2 +-
 .../src/bonding_curve/utils/user_endpoints.rs        |  2 +-
 contracts/modules/src/token_merge/mod.rs             | 12 ++++++++----
 contracts/modules/src/transfer_role_proxy.rs         |  6 ++++--
 7 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/contracts/examples/digital-cash/src/digital_cash.rs b/contracts/examples/digital-cash/src/digital_cash.rs
index e1384d1742..97875a1a15 100644
--- a/contracts/examples/digital-cash/src/digital_cash.rs
+++ b/contracts/examples/digital-cash/src/digital_cash.rs
@@ -62,8 +62,10 @@ pub trait DigitalCash:
             }
         }
         if !collected_esdt_fees.is_empty() {
-            self.send()
-                .direct_multi(&caller_address, &collected_esdt_fees);
+            self.tx()
+                .to(&caller_address)
+                .multi_esdt_ref(&collected_esdt_fees)
+                .transfer();
         }
     }
 
diff --git a/contracts/examples/digital-cash/src/signature_operations.rs b/contracts/examples/digital-cash/src/signature_operations.rs
index 5a60851143..f729cb6061 100644
--- a/contracts/examples/digital-cash/src/signature_operations.rs
+++ b/contracts/examples/digital-cash/src/signature_operations.rs
@@ -40,8 +40,10 @@ pub trait SignatureOperationsModule: storage::StorageModule + helpers::HelpersMo
         }
 
         if !esdt_funds.is_empty() {
-            self.send()
-                .direct_multi(&deposit.depositor_address, &esdt_funds);
+            self.tx()
+                .to(&deposit.depositor_address)
+                .multi_esdt(esdt_funds)
+                .transfer();
         }
     }
 
@@ -79,8 +81,10 @@ pub trait SignatureOperationsModule: storage::StorageModule + helpers::HelpersMo
                 .transfer();
         }
         if !deposit.esdt_funds.is_empty() {
-            self.send()
-                .direct_multi(&caller_address, &deposit.esdt_funds);
+            self.tx()
+                .to(&caller_address)
+                .multi_esdt_ref(&deposit.esdt_funds)
+                .transfer();
         }
         if deposited_fee.amount > 0 {
             self.send_fee_to_address(&deposited_fee, &deposit.depositor_address);
diff --git a/contracts/examples/esdt-transfer-with-fee/src/esdt_transfer_with_fee.rs b/contracts/examples/esdt-transfer-with-fee/src/esdt_transfer_with_fee.rs
index 6133e5500f..fc47ed9acd 100644
--- a/contracts/examples/esdt-transfer-with-fee/src/esdt_transfer_with_fee.rs
+++ b/contracts/examples/esdt-transfer-with-fee/src/esdt_transfer_with_fee.rs
@@ -40,8 +40,7 @@ pub trait EsdtTransferWithFee {
         }
         self.paid_fees().clear();
 
-        let caller = self.blockchain().get_caller();
-        self.send().direct_multi(&caller, &fees);
+        self.tx().to(ToCaller).multi_esdt_ref(&fees).transfer();
     }
 
     #[payable("*")]
@@ -82,7 +81,7 @@ pub trait EsdtTransferWithFee {
                 },
             }
         }
-        self.send().direct_multi(&address, &new_payments);
+        self.tx().to(&address).multi_esdt(new_payments).transfer();
     }
 
     fn get_payment_after_fees(
diff --git a/contracts/modules/src/bonding_curve/utils/owner_endpoints.rs b/contracts/modules/src/bonding_curve/utils/owner_endpoints.rs
index 007eda5fb7..820ba41446 100644
--- a/contracts/modules/src/bonding_curve/utils/owner_endpoints.rs
+++ b/contracts/modules/src/bonding_curve/utils/owner_endpoints.rs
@@ -179,7 +179,7 @@ pub trait OwnerEndpointsModule: storage::StorageModule + events::EventsModule {
             self.bonding_curve(&token).clear();
         }
         self.owned_tokens(&caller).clear();
-        self.send().direct_multi(&caller, &tokens_to_claim);
+        self.tx().to(&caller).multi_esdt(tokens_to_claim).transfer();
         if egld_to_claim > BigUint::zero() {
             self.tx().to(&caller).egld(&egld_to_claim).transfer();
         }
diff --git a/contracts/modules/src/bonding_curve/utils/user_endpoints.rs b/contracts/modules/src/bonding_curve/utils/user_endpoints.rs
index 5eec6451d2..d81fc4f2b1 100644
--- a/contracts/modules/src/bonding_curve/utils/user_endpoints.rs
+++ b/contracts/modules/src/bonding_curve/utils/user_endpoints.rs
@@ -158,7 +158,7 @@ pub trait UserEndpointsModule: storage::StorageModule + events::EventsModule {
             }
         }
 
-        self.send().direct_multi(caller, &tokens_to_send);
+        self.tx().to(caller).multi_esdt(tokens_to_send).transfer();
 
         self.token_details(&token)
             .update(|token_ownership| token_ownership.token_nonces = nonces);
diff --git a/contracts/modules/src/token_merge/mod.rs b/contracts/modules/src/token_merge/mod.rs
index 024626e2f1..0acdce1af8 100644
--- a/contracts/modules/src/token_merge/mod.rs
+++ b/contracts/modules/src/token_merge/mod.rs
@@ -118,8 +118,10 @@ pub trait TokenMergeModule:
                 .esdt_local_burn(&token.token_identifier, token.token_nonce, &token.amount);
         }
 
-        let caller = self.blockchain().get_caller();
-        self.send().direct_multi(&caller, &output_payments);
+        self.tx()
+            .to(ToCaller)
+            .multi_esdt_ref(&output_payments)
+            .transfer();
 
         output_payments
     }
@@ -165,8 +167,10 @@ pub trait TokenMergeModule:
         );
         tokens_to_remove.push(new_merged_token);
 
-        let caller = self.blockchain().get_caller();
-        self.send().direct_multi(&caller, &tokens_to_remove);
+        self.tx()
+            .to(ToCaller)
+            .multi_esdt_ref(&tokens_to_remove)
+            .transfer();
 
         tokens_to_remove
     }
diff --git a/contracts/modules/src/transfer_role_proxy.rs b/contracts/modules/src/transfer_role_proxy.rs
index 80995eff04..2c272eb01b 100644
--- a/contracts/modules/src/transfer_role_proxy.rs
+++ b/contracts/modules/src/transfer_role_proxy.rs
@@ -109,8 +109,10 @@ pub trait TransferRoleProxyModule {
             ManagedAsyncCallResult::Ok(return_values) => return_values,
             ManagedAsyncCallResult::Err(err) => {
                 if !initial_payments.is_empty() {
-                    self.send()
-                        .direct_multi(&original_caller, &initial_payments);
+                    self.tx()
+                        .to(&original_caller)
+                        .multi_esdt(initial_payments)
+                        .transfer();
                 }
 
                 let mut err_result = MultiValueEncoded::new();

From 7228575a639f9784a2348fe222f1a30ca8faa13a Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Sat, 23 Mar 2024 02:46:26 +0200
Subject: [PATCH 0546/1254] ToCaller optimization

---
 .../src/api/managed_types/const_handles.rs    |  3 +++
 .../types/interaction/tx_to/tx_to_caller.rs   | 19 +++++++------------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/framework/base/src/api/managed_types/const_handles.rs b/framework/base/src/api/managed_types/const_handles.rs
index bd92bcc1db..1657d18e67 100644
--- a/framework/base/src/api/managed_types/const_handles.rs
+++ b/framework/base/src/api/managed_types/const_handles.rs
@@ -22,6 +22,9 @@ pub const CALLBACK_CLOSURE_ARGS_BUFFER: RawHandle = -23;
 pub const MBUF_TEMPORARY_1: RawHandle = -25;
 pub const MBUF_TEMPORARY_2: RawHandle = -26;
 
+pub const ADDRESS_CALLER: RawHandle = -30;
+pub const ADDRESS_SELF: RawHandle = -31;
+
 pub const NEW_HANDLE_START_FROM: RawHandle = -100; // > -100 reserved for APIs
 
 /// Used as a flag. Do not use as a regular handle.
diff --git a/framework/base/src/types/interaction/tx_to/tx_to_caller.rs b/framework/base/src/types/interaction/tx_to/tx_to_caller.rs
index 5c1668d38d..1e3b59db73 100644
--- a/framework/base/src/types/interaction/tx_to/tx_to_caller.rs
+++ b/framework/base/src/types/interaction/tx_to/tx_to_caller.rs
@@ -1,7 +1,7 @@
 use crate::{
-    api::{BlockchainApi, CallTypeApi},
+    api::{const_handles, use_raw_handle, BlockchainApi, BlockchainApiImpl, CallTypeApi},
     contract_base::BlockchainWrapper,
-    types::{AnnotatedValue, ManagedAddress, ManagedBuffer, TxScEnv},
+    types::{AnnotatedValue, ManagedAddress, ManagedBuffer, ManagedType, TxScEnv},
 };
 
 use super::{TxTo, TxToSpecified};
@@ -9,23 +9,16 @@ use super::{TxTo, TxToSpecified};
 /// Indicates that transaction should be sent to the caller (the sender of the current transaction).
 pub struct ToCaller;
 
-fn get_caller<Api>() -> ManagedAddress<Api>
-where
-    Api: CallTypeApi + BlockchainApi,
-{
-    BlockchainWrapper::<Api>::new().get_caller()
-}
-
 impl<Api> AnnotatedValue<TxScEnv<Api>, ManagedAddress<Api>> for ToCaller
 where
     Api: CallTypeApi + BlockchainApi,
 {
     fn annotation(&self, env: &TxScEnv<Api>) -> ManagedBuffer<Api> {
-        get_caller::<Api>().hex_expr()
+        self.with_address_ref(env, |addr_ref| addr_ref.hex_expr())
     }
 
     fn into_value(self, _env: &TxScEnv<Api>) -> ManagedAddress<Api> {
-        get_caller::<Api>()
+        BlockchainWrapper::<Api>::new().get_caller()
     }
 }
 
@@ -38,6 +31,8 @@ where
     where
         F: FnOnce(&ManagedAddress<Api>) -> R,
     {
-        f(&get_caller::<Api>())
+        let caller_handle: Api::ManagedBufferHandle = use_raw_handle(const_handles::ADDRESS_CALLER);
+        Api::blockchain_api_impl().load_caller_managed(caller_handle.clone());
+        f(&ManagedAddress::from_handle(caller_handle))
     }
 }

From 4cce48246bc00397320f84b64a218c7b13775f32 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Sat, 23 Mar 2024 02:46:34 +0200
Subject: [PATCH 0547/1254] ToSelf implementation

---
 framework/base/src/types/interaction/tx_to.rs |  2 +
 .../src/types/interaction/tx_to/tx_to_self.rs | 38 +++++++++++++++++++
 2 files changed, 40 insertions(+)
 create mode 100644 framework/base/src/types/interaction/tx_to/tx_to_self.rs

diff --git a/framework/base/src/types/interaction/tx_to.rs b/framework/base/src/types/interaction/tx_to.rs
index 13c78b5da6..6d964bd0b5 100644
--- a/framework/base/src/types/interaction/tx_to.rs
+++ b/framework/base/src/types/interaction/tx_to.rs
@@ -1,6 +1,8 @@
 mod tx_to_caller;
+mod tx_to_self;
 
 pub use tx_to_caller::ToCaller;
+pub use tx_to_self::ToSelf;
 
 use crate::types::{heap::Address, ManagedAddress};
 
diff --git a/framework/base/src/types/interaction/tx_to/tx_to_self.rs b/framework/base/src/types/interaction/tx_to/tx_to_self.rs
new file mode 100644
index 0000000000..a4adfaa429
--- /dev/null
+++ b/framework/base/src/types/interaction/tx_to/tx_to_self.rs
@@ -0,0 +1,38 @@
+use crate::{
+    api::{const_handles, use_raw_handle, BlockchainApi, BlockchainApiImpl, CallTypeApi},
+    contract_base::BlockchainWrapper,
+    types::{AnnotatedValue, ManagedAddress, ManagedBuffer, ManagedType, TxScEnv},
+};
+
+use super::{TxTo, TxToSpecified};
+
+/// Indicates that transaction should be sent to itself.
+pub struct ToSelf;
+
+impl<Api> AnnotatedValue<TxScEnv<Api>, ManagedAddress<Api>> for ToSelf
+where
+    Api: CallTypeApi + BlockchainApi,
+{
+    fn annotation(&self, env: &TxScEnv<Api>) -> ManagedBuffer<Api> {
+        self.with_address_ref(env, |addr_ref| addr_ref.hex_expr())
+    }
+
+    fn into_value(self, _env: &TxScEnv<Api>) -> ManagedAddress<Api> {
+        BlockchainWrapper::<Api>::new().get_sc_address()
+    }
+}
+
+impl<Api> TxTo<TxScEnv<Api>> for ToSelf where Api: CallTypeApi + BlockchainApi {}
+impl<Api> TxToSpecified<TxScEnv<Api>> for ToSelf
+where
+    Api: CallTypeApi + BlockchainApi,
+{
+    fn with_address_ref<F, R>(&self, env: &TxScEnv<Api>, f: F) -> R
+    where
+        F: FnOnce(&ManagedAddress<Api>) -> R,
+    {
+        let sc_address_handle: Api::ManagedBufferHandle = use_raw_handle(const_handles::ADDRESS_CALLER);
+        Api::blockchain_api_impl().load_sc_address_managed(sc_address_handle.clone());
+        f(&ManagedAddress::from_handle(sc_address_handle))
+    }
+}

From 4f18e7b8596ded05860b56bd9afe9af6b2c0871b Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Sat, 23 Mar 2024 03:03:12 +0200
Subject: [PATCH 0548/1254] call_local_esdt_built_in_function refactor

---
 .../contract_base/wrappers/send_wrapper.rs    | 58 +++++++++++--------
 1 file changed, 33 insertions(+), 25 deletions(-)

diff --git a/framework/base/src/contract_base/wrappers/send_wrapper.rs b/framework/base/src/contract_base/wrappers/send_wrapper.rs
index b55e486241..83972d0b28 100644
--- a/framework/base/src/contract_base/wrappers/send_wrapper.rs
+++ b/framework/base/src/contract_base/wrappers/send_wrapper.rs
@@ -12,6 +12,7 @@ use crate::{
     },
     codec,
     esdt::ESDTSystemSmartContractProxy,
+    proxy_imports::{ReturnsRaw, ToSelf},
     types::{
         BigUint, ContractCall, ContractCallNoPayment, EgldOrEsdtTokenIdentifier, EsdtTokenPayment,
         ManagedAddress, ManagedArgBuffer, ManagedBuffer, ManagedType, ManagedVec, TokenIdentifier,
@@ -380,11 +381,31 @@ where
     pub fn call_local_esdt_built_in_function(
         &self,
         gas: u64,
-        endpoint_name: &ManagedBuffer<A>,
-        arg_buffer: &ManagedArgBuffer<A>,
+        endpoint_name: ManagedBuffer<A>,
+        arg_buffer: ManagedArgBuffer<A>,
     ) -> ManagedVec<A, ManagedBuffer<A>> {
-        self.send_raw_wrapper()
-            .call_local_esdt_built_in_function(gas, endpoint_name, arg_buffer)
+        Tx::new_tx_from_sc()
+            .to(ToSelf)
+            .with_gas_limit(gas)
+            .raw_call()
+            .function_name(endpoint_name)
+            .arguments_raw(arg_buffer)
+            .returns(ReturnsRaw)
+            .sync_call()
+    }
+
+    fn call_local_esdt_built_in_function_minimal(
+        &self,
+        function_name: &str,
+        arg_buffer: ManagedArgBuffer<A>,
+    ) {
+        Tx::new_tx_from_sc()
+            .to(ToSelf)
+            .with_gas_limit(A::blockchain_api_impl().get_gas_left())
+            .raw_call()
+            .function_name(function_name)
+            .arguments_raw(arg_buffer)
+            .sync_call()
     }
 
     /// Allows synchronous minting of ESDT/SFT (depending on nonce). Execution is resumed afterwards.
@@ -410,11 +431,7 @@ where
 
         arg_buffer.push_arg(amount);
 
-        let _ = self.call_local_esdt_built_in_function(
-            A::blockchain_api_impl().get_gas_left(),
-            &ManagedBuffer::from(func_name),
-            &arg_buffer,
-        );
+        self.call_local_esdt_built_in_function_minimal(func_name, arg_buffer);
     }
 
     /// Allows synchronous minting of ESDT/SFT (depending on nonce). Execution is resumed afterwards.
@@ -456,11 +473,7 @@ where
 
         arg_buffer.push_arg(amount);
 
-        let _ = self.call_local_esdt_built_in_function(
-            A::blockchain_api_impl().get_gas_left(),
-            &ManagedBuffer::from(func_name),
-            &arg_buffer,
-        );
+        self.call_local_esdt_built_in_function_minimal(func_name, arg_buffer);
     }
 
     /// Allows synchronous burning of ESDT/SFT/NFT (depending on nonce). Execution is resumed afterwards.
@@ -549,8 +562,8 @@ where
 
         let output = self.call_local_esdt_built_in_function(
             A::blockchain_api_impl().get_gas_left(),
-            &ManagedBuffer::from(ESDT_NFT_CREATE_FUNC_NAME),
-            &arg_buffer,
+            ManagedBuffer::from(ESDT_NFT_CREATE_FUNC_NAME),
+            arg_buffer,
         );
 
         if let Some(first_result_bytes) = output.try_get(0) {
@@ -770,11 +783,7 @@ where
             arg_buffer.push_arg(uri);
         }
 
-        let _ = self.call_local_esdt_built_in_function(
-            A::blockchain_api_impl().get_gas_left(),
-            &ManagedBuffer::from(ESDT_NFT_ADD_URI_FUNC_NAME),
-            &arg_buffer,
-        );
+        self.call_local_esdt_built_in_function_minimal(ESDT_NFT_ADD_URI_FUNC_NAME, arg_buffer);
     }
 
     /// Changes attributes of an NFT, via a synchronous builtin function call.
@@ -789,10 +798,9 @@ where
         arg_buffer.push_arg(nft_nonce);
         arg_buffer.push_arg(new_attributes);
 
-        let _ = self.call_local_esdt_built_in_function(
-            A::blockchain_api_impl().get_gas_left(),
-            &ManagedBuffer::from(ESDT_NFT_UPDATE_ATTRIBUTES_FUNC_NAME),
-            &arg_buffer,
+        self.call_local_esdt_built_in_function_minimal(
+            ESDT_NFT_UPDATE_ATTRIBUTES_FUNC_NAME,
+            arg_buffer,
         );
     }
 }

From 10c8b72ec3f2caeab5ec3e6a3e9f9988b260ce06 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Mon, 25 Mar 2024 09:46:22 +0200
Subject: [PATCH 0549/1254] removed duplicate RHListScenario trait

---
 framework/snippets/src/itx.rs                 |  4 -
 .../snippets/src/itx/interactor_rh_list.rs    | 51 -------------
 .../src/itx/interactor_rh_list_item.rs        | 76 -------------------
 3 files changed, 131 deletions(-)
 delete mode 100644 framework/snippets/src/itx/interactor_rh_list.rs
 delete mode 100644 framework/snippets/src/itx/interactor_rh_list_item.rs

diff --git a/framework/snippets/src/itx.rs b/framework/snippets/src/itx.rs
index dd34244999..8cef20e699 100644
--- a/framework/snippets/src/itx.rs
+++ b/framework/snippets/src/itx.rs
@@ -5,13 +5,9 @@ mod interactor_env_deploy;
 mod interactor_env_exec;
 mod interactor_env_query;
 mod interactor_env_transf;
-mod interactor_rh_list;
-mod interactor_rh_list_item;
 
 pub use interactor_env::*;
 pub use interactor_env_deploy::*;
 pub use interactor_env_exec::InteractorEnvExec;
 pub use interactor_env_query::InteractorEnvQuery;
 pub use interactor_env_transf::*;
-pub use interactor_rh_list::*;
-pub use interactor_rh_list_item::*;
diff --git a/framework/snippets/src/itx/interactor_rh_list.rs b/framework/snippets/src/itx/interactor_rh_list.rs
deleted file mode 100644
index e48c94dc5f..0000000000
--- a/framework/snippets/src/itx/interactor_rh_list.rs
+++ /dev/null
@@ -1,51 +0,0 @@
-use multiversx_sc_scenario::{
-    multiversx_sc::types::{ConsNoRet, ConsRet, OriginalResultMarker, RHList, RHListItem, TxEnv},
-    scenario_model::TxResponse,
-    RHListItemScenario,
-};
-
-pub trait RHListScenario<Env>: RHList<Env>
-where
-    Env: TxEnv,
-{
-    fn item_scenario_result(self, tx_response: &TxResponse) -> Self::ListReturns;
-}
-
-impl<Env> RHListScenario<Env> for ()
-where
-    Env: TxEnv,
-{
-    fn item_scenario_result(self, tx_response: &TxResponse) -> Self::ListReturns {}
-}
-
-impl<Env, O> RHListScenario<Env> for OriginalResultMarker<O>
-where
-    Env: TxEnv,
-{
-    fn item_scenario_result(self, tx_response: &TxResponse) -> Self::ListReturns {}
-}
-
-impl<Env, Head, Tail> RHListScenario<Env> for ConsRet<Env, Head, Tail>
-where
-    Env: TxEnv,
-    Head: RHListItemScenario<Env, Tail::OriginalResult>,
-    Tail: RHListScenario<Env>,
-{
-    fn item_scenario_result(self, tx_response: &TxResponse) -> Self::ListReturns {
-        let head_result = self.head.item_scenario_result(tx_response);
-        let tail_result = self.tail.item_scenario_result(tx_response);
-        (head_result, tail_result)
-    }
-}
-
-impl<Env, Head, Tail> RHListScenario<Env> for ConsNoRet<Env, Head, Tail>
-where
-    Env: TxEnv,
-    Head: RHListItemScenario<Env, Tail::OriginalResult, Returns = ()>,
-    Tail: RHListScenario<Env>,
-{
-    fn item_scenario_result(self, tx_response: &TxResponse) -> Self::ListReturns {
-        self.head.item_scenario_result(tx_response);
-        self.tail.item_scenario_result(tx_response)
-    }
-}
diff --git a/framework/snippets/src/itx/interactor_rh_list_item.rs b/framework/snippets/src/itx/interactor_rh_list_item.rs
deleted file mode 100644
index 7a6063fbc6..0000000000
--- a/framework/snippets/src/itx/interactor_rh_list_item.rs
+++ /dev/null
@@ -1,76 +0,0 @@
-use multiversx_sc_scenario::{
-    api::StaticApi,
-    multiversx_sc::{
-        codec::{CodecFrom, TopDecodeMulti, TopEncodeMulti},
-        types::{
-            ManagedAddress, RHList, RHListItem, ReturnsExact, ReturnsSimilar, TxEnv,
-            WithResultNewAddress, WithResultSimilar,
-        },
-    },
-    scenario_model::{TxResponse, TypedResponse},
-};
-
-pub trait RHListItemScenario<Env, Original>: RHListItem<Env, Original>
-where
-    Env: TxEnv,
-{
-    fn item_scenario_result(self, tx_response: &TxResponse) -> Self::Returns;
-}
-
-impl<Env, Original> RHListItemScenario<Env, Original> for ReturnsExact
-where
-    Env: TxEnv,
-    Original: TopDecodeMulti,
-{
-    fn item_scenario_result(self, tx_response: &TxResponse) -> Self::Returns {
-        let response = TypedResponse::<Original>::from_raw(tx_response);
-        response
-            .result
-            .expect("ReturnsExact expects that transaction is successful")
-    }
-}
-
-impl<Env, Original, T> RHListItemScenario<Env, Original> for ReturnsSimilar<T>
-where
-    Env: TxEnv,
-    Original: TopEncodeMulti,
-    T: CodecFrom<Original>,
-{
-    fn item_scenario_result(self, tx_response: &TxResponse) -> Self::Returns {
-        let response = TypedResponse::<T>::from_raw(tx_response);
-        response
-            .result
-            .expect("ReturnsSimilar expects that transaction is successful")
-    }
-}
-
-impl<Env, Original, T, F> RHListItemScenario<Env, Original> for WithResultSimilar<T, F>
-where
-    Env: TxEnv,
-    Original: TopEncodeMulti,
-    T: CodecFrom<Original>,
-    F: FnOnce(T),
-{
-    fn item_scenario_result(self, tx_response: &TxResponse) -> Self::Returns {
-        let response = TypedResponse::<T>::from_raw(tx_response);
-        let value = response
-            .result
-            .expect("ReturnsExact expects that transaction is successful");
-        (self.f)(value);
-    }
-}
-
-impl<Env, Original, F> RHListItemScenario<Env, Original> for WithResultNewAddress<Env, F>
-where
-    Env: TxEnv,
-    F: FnOnce(&ManagedAddress<Env::Api>),
-{
-    fn item_scenario_result(self, tx_response: &TxResponse) -> Self::Returns {
-        let new_address = tx_response
-            .new_deployed_address
-            .clone()
-            .expect("missing returned address");
-
-        (self.f)(&ManagedAddress::from_address(&new_address));
-    }
-}

From da7e01ba578eff1af63a86e74be925a9b0148b73 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Mon, 25 Mar 2024 13:00:35 +0200
Subject: [PATCH 0550/1254] Result handler processing traits generic in
 RawResult type

---
 .../src/types/interaction/tx_call_deploy.rs   | 99 ++++---------------
 .../src/types/interaction/tx_call_sync.rs     | 82 ++-------------
 .../base/src/types/interaction/tx_rh_list.rs  |  2 +
 .../interaction/tx_rh_list/returns_bt.rs      | 27 +----
 .../interaction/tx_rh_list/returns_exact.rs   | 17 ++--
 .../tx_rh_list/returns_new_address.rs         | 16 +--
 .../interaction/tx_rh_list/returns_raw.rs     | 27 ++---
 .../interaction/tx_rh_list/returns_similar.rs | 14 ++-
 .../interaction/tx_rh_list/tx_rh_list_exec.rs | 68 +++++++++++++
 .../tx_rh_list/with_result_exact.rs           | 14 ++-
 .../tx_rh_list/with_result_new_address.rs     | 17 ++--
 .../interaction/tx_rh_list/with_result_raw.rs | 14 ++-
 .../tx_rh_list/with_result_similar.rs         | 14 ++-
 .../src/types/interaction/tx_to/tx_to_self.rs |  3 +-
 framework/scenario/src/facade/world_tx.rs     |  5 +-
 .../facade/world_tx/scenario_env_deploy.rs    |  8 +-
 .../src/facade/world_tx/scenario_env_exec.rs  |  8 +-
 .../src/facade/world_tx/scenario_env_query.rs | 12 +--
 .../src/facade/world_tx/scenario_env_util.rs  |  8 +-
 ...io_rh_list_item.rs => scenario_rh_impl.rs} | 31 +++---
 .../src/facade/world_tx/scenario_rh_list.rs   | 51 ----------
 .../facade/world_tx/with_tx_raw_response.rs   | 10 +-
 .../snippets/src/itx/interactor_env_deploy.rs | 15 ++-
 .../snippets/src/itx/interactor_env_exec.rs   | 12 +--
 .../snippets/src/itx/interactor_env_query.rs  | 12 +--
 .../snippets/src/itx/interactor_env_transf.rs |  6 +-
 26 files changed, 211 insertions(+), 381 deletions(-)
 create mode 100644 framework/base/src/types/interaction/tx_rh_list/tx_rh_list_exec.rs
 rename framework/scenario/src/facade/world_tx/{scenario_rh_list_item.rs => scenario_rh_impl.rs} (57%)
 delete mode 100644 framework/scenario/src/facade/world_tx/scenario_rh_list.rs

diff --git a/framework/base/src/types/interaction/tx_call_deploy.rs b/framework/base/src/types/interaction/tx_call_deploy.rs
index de2e943563..c5f948ea32 100644
--- a/framework/base/src/types/interaction/tx_call_deploy.rs
+++ b/framework/base/src/types/interaction/tx_call_deploy.rs
@@ -9,87 +9,16 @@ use crate::{
 
 use super::{
     contract_call_exec::decode_result, Code, ConsNoRet, ConsRet, DeployCall, FromSource,
-    OriginalResultMarker, RHList, RHListItem, Tx, TxCodeValue, TxEmptyResultHandler, TxEnv,
-    TxFromSourceValue, TxGas, TxPaymentEgldOnly, TxResultHandler, TxScEnv,
+    OriginalResultMarker, RHList, RHListExec, RHListItem, Tx, TxCodeValue, TxEmptyResultHandler,
+    TxEnv, TxFromSourceValue, TxGas, TxPaymentEgldOnly, TxResultHandler, TxScEnv,
 };
 
-pub trait RHListItemDeploy<Env, Original>: RHListItem<Env, Original>
+pub struct DeployRawResult<Api>
 where
-    Env: TxEnv,
-{
-    fn item_deploy_result(
-        self,
-        new_address: &ManagedAddress<Env::Api>,
-        raw_results: &ManagedVec<Env::Api, ManagedBuffer<Env::Api>>,
-    ) -> Self::Returns;
-}
-
-pub trait RHListDeploy<Env>: RHList<Env>
-where
-    Env: TxEnv,
-{
-    fn list_deploy_result(
-        self,
-        new_address: &ManagedAddress<Env::Api>,
-        raw_results: &ManagedVec<Env::Api, ManagedBuffer<Env::Api>>,
-    ) -> Self::ListReturns;
-}
-
-impl<Env> RHListDeploy<Env> for ()
-where
-    Env: TxEnv,
-{
-    fn list_deploy_result(
-        self,
-        _new_address: &ManagedAddress<Env::Api>,
-        _raw_results: &ManagedVec<Env::Api, ManagedBuffer<Env::Api>>,
-    ) -> Self::ListReturns {
-    }
-}
-
-impl<Env, O> RHListDeploy<Env> for OriginalResultMarker<O>
-where
-    Env: TxEnv,
-{
-    fn list_deploy_result(
-        self,
-        _new_address: &ManagedAddress<Env::Api>,
-        _raw_results: &ManagedVec<Env::Api, ManagedBuffer<Env::Api>>,
-    ) -> Self::ListReturns {
-    }
-}
-
-impl<Env, Head, Tail> RHListDeploy<Env> for ConsRet<Env, Head, Tail>
-where
-    Env: TxEnv,
-    Head: RHListItemDeploy<Env, Tail::OriginalResult>,
-    Tail: RHListDeploy<Env>,
-{
-    fn list_deploy_result(
-        self,
-        new_address: &ManagedAddress<Env::Api>,
-        raw_results: &ManagedVec<Env::Api, ManagedBuffer<Env::Api>>,
-    ) -> Self::ListReturns {
-        let head_result = self.head.item_deploy_result(new_address, raw_results);
-        let tail_result = self.tail.list_deploy_result(new_address, raw_results);
-        (head_result, tail_result)
-    }
-}
-
-impl<Env, Head, Tail> RHListDeploy<Env> for ConsNoRet<Env, Head, Tail>
-where
-    Env: TxEnv,
-    Head: RHListItemDeploy<Env, Tail::OriginalResult, Returns = ()>,
-    Tail: RHListDeploy<Env>,
+    Api: CallTypeApi,
 {
-    fn list_deploy_result(
-        self,
-        new_address: &ManagedAddress<Env::Api>,
-        raw_results: &ManagedVec<Env::Api, ManagedBuffer<Env::Api>>,
-    ) -> Self::ListReturns {
-        self.head.item_deploy_result(new_address, raw_results);
-        self.tail.list_deploy_result(new_address, raw_results)
-    }
+    pub new_address: ManagedAddress<Api>,
+    pub raw_results: ManagedVec<Api, ManagedBuffer<Api>>,
 }
 
 impl<Api, Payment, Gas, CodeValue, RH>
@@ -165,14 +94,18 @@ where
     Payment: TxPaymentEgldOnly<TxScEnv<Api>>,
     Gas: TxGas<TxScEnv<Api>>,
     CodeValue: TxCodeValue<TxScEnv<Api>>,
-    RH: RHListDeploy<TxScEnv<Api>>,
+    RH: RHListExec<DeployRawResult<Api>, TxScEnv<Api>>,
     RH::ListReturns: NestedTupleFlatten,
 {
     /// Synchronously deploys a contract.
     pub fn sync_call(self) -> <RH::ListReturns as NestedTupleFlatten>::Unpacked {
         let (new_address, raw_results, result_handler) = self.execute_deploy_raw();
 
-        let tuple_result = result_handler.list_deploy_result(&new_address, &raw_results);
+        let deploy_raw_result = DeployRawResult {
+            new_address,
+            raw_results,
+        };
+        let tuple_result = result_handler.list_process_result(&deploy_raw_result);
         tuple_result.flatten_unpack()
     }
 }
@@ -192,14 +125,18 @@ where
     Payment: TxPaymentEgldOnly<TxScEnv<Api>>,
     Gas: TxGas<TxScEnv<Api>>,
     FromSourceValue: TxFromSourceValue<TxScEnv<Api>>,
-    RH: RHListDeploy<TxScEnv<Api>>,
+    RH: RHListExec<DeployRawResult<Api>, TxScEnv<Api>>,
     RH::ListReturns: NestedTupleFlatten,
 {
     /// Synchronously deploys a contract from source.
     pub fn sync_call(self) -> <RH::ListReturns as NestedTupleFlatten>::Unpacked {
         let (new_address, raw_results, result_handler) = self.execute_deploy_from_source_raw();
 
-        let tuple_result = result_handler.list_deploy_result(&new_address, &raw_results);
+        let deploy_raw_result = DeployRawResult {
+            new_address,
+            raw_results,
+        };
+        let tuple_result = result_handler.list_process_result(&deploy_raw_result);
         tuple_result.flatten_unpack()
     }
 }
diff --git a/framework/base/src/types/interaction/tx_call_sync.rs b/framework/base/src/types/interaction/tx_call_sync.rs
index 61c73a7b0c..9e45d09875 100644
--- a/framework/base/src/types/interaction/tx_call_sync.rs
+++ b/framework/base/src/types/interaction/tx_call_sync.rs
@@ -9,81 +9,13 @@ use crate::{
 
 use super::{
     contract_call_exec::decode_result, BackTransfers, ConsNoRet, ConsRet, OriginalResultMarker,
-    RHList, RHListItem, Tx, TxDataFunctionCall, TxEnv, TxGas, TxPayment, TxScEnv, TxToSpecified,
+    RHList, RHListExec, RHListItem, Tx, TxDataFunctionCall, TxEnv, TxGas, TxPayment, TxScEnv,
+    TxToSpecified,
 };
 
-pub trait RHListItemSync<Env, Original>: RHListItem<Env, Original>
+pub struct SyncCallRawResult<Api>(pub ManagedVec<Api, ManagedBuffer<Api>>)
 where
-    Env: TxEnv,
-{
-    fn item_sync_call_result(
-        self,
-        raw_results: &ManagedVec<Env::Api, ManagedBuffer<Env::Api>>,
-    ) -> Self::Returns;
-}
-
-pub trait RHListSync<Env>: RHList<Env>
-where
-    Env: TxEnv,
-{
-    fn list_sync_call_result(
-        self,
-        raw_results: &ManagedVec<Env::Api, ManagedBuffer<Env::Api>>,
-    ) -> Self::ListReturns;
-}
-
-impl<Env> RHListSync<Env> for ()
-where
-    Env: TxEnv,
-{
-    fn list_sync_call_result(
-        self,
-        _raw_results: &ManagedVec<Env::Api, ManagedBuffer<Env::Api>>,
-    ) -> Self::ListReturns {
-    }
-}
-
-impl<Env, O> RHListSync<Env> for OriginalResultMarker<O>
-where
-    Env: TxEnv,
-{
-    fn list_sync_call_result(
-        self,
-        _raw_results: &ManagedVec<Env::Api, ManagedBuffer<Env::Api>>,
-    ) -> Self::ListReturns {
-    }
-}
-
-impl<Env, Head, Tail> RHListSync<Env> for ConsRet<Env, Head, Tail>
-where
-    Env: TxEnv,
-    Head: RHListItemSync<Env, Tail::OriginalResult>,
-    Tail: RHListSync<Env>,
-{
-    fn list_sync_call_result(
-        self,
-        raw_results: &ManagedVec<Env::Api, ManagedBuffer<Env::Api>>,
-    ) -> Self::ListReturns {
-        let head_result = self.head.item_sync_call_result(raw_results);
-        let tail_result = self.tail.list_sync_call_result(raw_results);
-        (head_result, tail_result)
-    }
-}
-
-impl<Env, Head, Tail> RHListSync<Env> for ConsNoRet<Env, Head, Tail>
-where
-    Env: TxEnv,
-    Head: RHListItemSync<Env, Tail::OriginalResult, Returns = ()>,
-    Tail: RHListSync<Env>,
-{
-    fn list_sync_call_result(
-        self,
-        raw_results: &ManagedVec<Env::Api, ManagedBuffer<Env::Api>>,
-    ) -> Self::ListReturns {
-        self.head.item_sync_call_result(raw_results);
-        self.tail.list_sync_call_result(raw_results)
-    }
-}
+    Api: CallTypeApi;
 
 impl<Api, To, Payment, Gas, FC, RH> Tx<TxScEnv<Api>, (), To, Payment, Gas, FC, RH>
 where
@@ -92,7 +24,7 @@ where
     Payment: TxPayment<TxScEnv<Api>>,
     Gas: TxGas<TxScEnv<Api>>,
     FC: TxDataFunctionCall<TxScEnv<Api>>,
-    RH: RHListSync<TxScEnv<Api>>,
+    RH: RHListExec<SyncCallRawResult<Api>, TxScEnv<Api>>,
     RH::ListReturns: NestedTupleFlatten,
 {
     fn execute_sync_call_raw(self) -> (ManagedVec<Api, ManagedBuffer<Api>>, RH) {
@@ -121,8 +53,8 @@ where
 
     pub fn sync_call(self) -> <RH::ListReturns as NestedTupleFlatten>::Unpacked {
         let (raw_result, result_handler) = self.execute_sync_call_raw();
-
-        let tuple_result = result_handler.list_sync_call_result(&raw_result);
+        let sync_raw_result = SyncCallRawResult(raw_result);
+        let tuple_result = result_handler.list_process_result(&sync_raw_result);
         tuple_result.flatten_unpack()
     }
 }
diff --git a/framework/base/src/types/interaction/tx_rh_list.rs b/framework/base/src/types/interaction/tx_rh_list.rs
index 2cf4743ef2..4e0bb4327c 100644
--- a/framework/base/src/types/interaction/tx_rh_list.rs
+++ b/framework/base/src/types/interaction/tx_rh_list.rs
@@ -4,6 +4,7 @@ mod returns_new_address;
 mod returns_raw;
 mod returns_similar;
 mod tx_rh_list_cons;
+mod tx_rh_list_exec;
 mod tx_rh_list_item;
 mod with_result_exact;
 mod with_result_new_address;
@@ -16,6 +17,7 @@ pub use returns_new_address::*;
 pub use returns_raw::*;
 pub use returns_similar::*;
 pub use tx_rh_list_cons::*;
+pub use tx_rh_list_exec::*;
 pub use tx_rh_list_item::*;
 pub use with_result_new_address::*;
 pub use with_result_similar::*;
diff --git a/framework/base/src/types/interaction/tx_rh_list/returns_bt.rs b/framework/base/src/types/interaction/tx_rh_list/returns_bt.rs
index 1f1be042e5..ceda028bcd 100644
--- a/framework/base/src/types/interaction/tx_rh_list/returns_bt.rs
+++ b/framework/base/src/types/interaction/tx_rh_list/returns_bt.rs
@@ -1,12 +1,9 @@
 use crate::{
     contract_base::BlockchainWrapper,
-    types::{
-        interaction::tx_call_deploy::RHListItemDeploy, BackTransfers, ManagedAddress,
-        ManagedBuffer, ManagedVec, RHListItemSync, TxEnv,
-    },
+    types::{BackTransfers, ManagedAddress, ManagedBuffer, ManagedVec, TxEnv},
 };
 
-use super::RHListItem;
+use super::{RHListItem, RHListItemExec};
 
 pub struct ReturnsBackTransfers;
 
@@ -17,27 +14,11 @@ where
     type Returns = BackTransfers<Env::Api>;
 }
 
-impl<Env, Original> RHListItemSync<Env, Original> for ReturnsBackTransfers
+impl<RawResult, Env, Original> RHListItemExec<RawResult, Env, Original> for ReturnsBackTransfers
 where
     Env: TxEnv,
 {
-    fn item_sync_call_result(
-        self,
-        _raw_results: &ManagedVec<Env::Api, ManagedBuffer<Env::Api>>,
-    ) -> Self::Returns {
-        BlockchainWrapper::<Env::Api>::new().get_back_transfers()
-    }
-}
-
-impl<Env, Original> RHListItemDeploy<Env, Original> for ReturnsBackTransfers
-where
-    Env: TxEnv,
-{
-    fn item_deploy_result(
-        self,
-        _new_address: &ManagedAddress<Env::Api>,
-        _raw_results: &ManagedVec<Env::Api, ManagedBuffer<Env::Api>>,
-    ) -> Self::Returns {
+    fn item_process_result(self, _raw_result: &RawResult) -> Self::Returns {
         BlockchainWrapper::<Env::Api>::new().get_back_transfers()
     }
 }
diff --git a/framework/base/src/types/interaction/tx_rh_list/returns_exact.rs b/framework/base/src/types/interaction/tx_rh_list/returns_exact.rs
index edbc82144d..87a25f0fb2 100644
--- a/framework/base/src/types/interaction/tx_rh_list/returns_exact.rs
+++ b/framework/base/src/types/interaction/tx_rh_list/returns_exact.rs
@@ -1,11 +1,11 @@
 use multiversx_sc_codec::TopDecodeMulti;
 
-use crate::types::{
-    interaction::contract_call_exec::decode_result, ManagedBuffer, ManagedVec, RHListItemSync,
-    TxEnv,
+use crate::{
+    proxy_imports::SyncCallRawResult,
+    types::{interaction::contract_call_exec::decode_result, ManagedBuffer, ManagedVec, TxEnv},
 };
 
-use super::RHListItem;
+use super::{RHListItem, RHListItemExec};
 
 pub struct ReturnsExact;
 
@@ -16,15 +16,12 @@ where
     type Returns = Original;
 }
 
-impl<Env, Original> RHListItemSync<Env, Original> for ReturnsExact
+impl<Env, Original> RHListItemExec<SyncCallRawResult<Env::Api>, Env, Original> for ReturnsExact
 where
     Env: TxEnv,
     Original: TopDecodeMulti,
 {
-    fn item_sync_call_result(
-        self,
-        raw_results: &ManagedVec<Env::Api, ManagedBuffer<Env::Api>>,
-    ) -> Self::Returns {
-        decode_result::<Env::Api, Original>(raw_results.clone())
+    fn item_process_result(self, raw_result: &SyncCallRawResult<Env::Api>) -> Original {
+        decode_result::<Env::Api, Original>(raw_result.0.clone())
     }
 }
diff --git a/framework/base/src/types/interaction/tx_rh_list/returns_new_address.rs b/framework/base/src/types/interaction/tx_rh_list/returns_new_address.rs
index c9c271e2dd..2b1b9ccad4 100644
--- a/framework/base/src/types/interaction/tx_rh_list/returns_new_address.rs
+++ b/framework/base/src/types/interaction/tx_rh_list/returns_new_address.rs
@@ -1,8 +1,6 @@
-use crate::types::{
-    interaction::tx_call_deploy::RHListItemDeploy, ManagedAddress, ManagedBuffer, ManagedVec, TxEnv,
-};
+use crate::types::{DeployRawResult, ManagedAddress, ManagedBuffer, ManagedVec, TxEnv};
 
-use super::RHListItem;
+use super::{RHListItem, RHListItemExec};
 
 pub struct ReturnsNewAddress;
 
@@ -13,15 +11,11 @@ where
     type Returns = ManagedAddress<Env::Api>;
 }
 
-impl<Env, Original> RHListItemDeploy<Env, Original> for ReturnsNewAddress
+impl<Env, Original> RHListItemExec<DeployRawResult<Env::Api>, Env, Original> for ReturnsNewAddress
 where
     Env: TxEnv,
 {
-    fn item_deploy_result(
-        self,
-        new_address: &ManagedAddress<Env::Api>,
-        _raw_results: &ManagedVec<Env::Api, ManagedBuffer<Env::Api>>,
-    ) -> Self::Returns {
-        new_address.clone()
+    fn item_process_result(self, raw_result: &DeployRawResult<Env::Api>) -> Self::Returns {
+        raw_result.new_address.clone()
     }
 }
diff --git a/framework/base/src/types/interaction/tx_rh_list/returns_raw.rs b/framework/base/src/types/interaction/tx_rh_list/returns_raw.rs
index 5f709c04a6..d1b501d77c 100644
--- a/framework/base/src/types/interaction/tx_rh_list/returns_raw.rs
+++ b/framework/base/src/types/interaction/tx_rh_list/returns_raw.rs
@@ -1,9 +1,9 @@
-use crate::types::{
-    interaction::tx_call_deploy::RHListItemDeploy, ManagedAddress, ManagedBuffer, ManagedVec,
-    RHListItemSync, TxEnv,
+use crate::{
+    proxy_imports::SyncCallRawResult,
+    types::{DeployRawResult, ManagedAddress, ManagedBuffer, ManagedVec, TxEnv},
 };
 
-use super::RHListItem;
+use super::{RHListItem, RHListItemExec};
 
 pub struct ReturnsRaw;
 
@@ -14,27 +14,20 @@ where
     type Returns = ManagedVec<Env::Api, ManagedBuffer<Env::Api>>;
 }
 
-impl<Env, Original> RHListItemSync<Env, Original> for ReturnsRaw
+impl<Env, Original> RHListItemExec<SyncCallRawResult<Env::Api>, Env, Original> for ReturnsRaw
 where
     Env: TxEnv,
 {
-    fn item_sync_call_result(
-        self,
-        raw_results: &ManagedVec<Env::Api, ManagedBuffer<Env::Api>>,
-    ) -> Self::Returns {
-        raw_results.clone()
+    fn item_process_result(self, raw_result: &SyncCallRawResult<Env::Api>) -> Self::Returns {
+        raw_result.0.clone()
     }
 }
 
-impl<Env, Original> RHListItemDeploy<Env, Original> for ReturnsRaw
+impl<Env, Original> RHListItemExec<DeployRawResult<Env::Api>, Env, Original> for ReturnsRaw
 where
     Env: TxEnv,
 {
-    fn item_deploy_result(
-        self,
-        _new_address: &ManagedAddress<Env::Api>,
-        raw_results: &ManagedVec<Env::Api, ManagedBuffer<Env::Api>>,
-    ) -> Self::Returns {
-        raw_results.clone()
+    fn item_process_result(self, raw_result: &DeployRawResult<Env::Api>) -> Self::Returns {
+        raw_result.raw_results.clone()
     }
 }
diff --git a/framework/base/src/types/interaction/tx_rh_list/returns_similar.rs b/framework/base/src/types/interaction/tx_rh_list/returns_similar.rs
index 1233a9bae0..adfb2f3bdb 100644
--- a/framework/base/src/types/interaction/tx_rh_list/returns_similar.rs
+++ b/framework/base/src/types/interaction/tx_rh_list/returns_similar.rs
@@ -3,11 +3,11 @@ use core::marker::PhantomData;
 use multiversx_sc_codec::{CodecFrom, TopEncodeMulti};
 
 use crate::types::{
-    interaction::contract_call_exec::decode_result, ManagedBuffer, ManagedVec, RHListItemSync,
+    interaction::contract_call_exec::decode_result, ManagedBuffer, ManagedVec, SyncCallRawResult,
     TxEnv,
 };
 
-use super::RHListItem;
+use super::{RHListItem, RHListItemExec};
 
 pub struct ReturnsSimilar<T> {
     _phantom: PhantomData<T>,
@@ -36,16 +36,14 @@ where
     type Returns = T;
 }
 
-impl<Env, Original, T> RHListItemSync<Env, Original> for ReturnsSimilar<T>
+impl<Env, Original, T> RHListItemExec<SyncCallRawResult<Env::Api>, Env, Original>
+    for ReturnsSimilar<T>
 where
     Env: TxEnv,
     Original: TopEncodeMulti,
     T: CodecFrom<Original>,
 {
-    fn item_sync_call_result(
-        self,
-        raw_results: &ManagedVec<Env::Api, ManagedBuffer<Env::Api>>,
-    ) -> Self::Returns {
-        decode_result::<Env::Api, T>(raw_results.clone())
+    fn item_process_result(self, raw_result: &SyncCallRawResult<Env::Api>) -> Self::Returns {
+        decode_result::<Env::Api, T>(raw_result.0.clone())
     }
 }
diff --git a/framework/base/src/types/interaction/tx_rh_list/tx_rh_list_exec.rs b/framework/base/src/types/interaction/tx_rh_list/tx_rh_list_exec.rs
new file mode 100644
index 0000000000..cc39d08561
--- /dev/null
+++ b/framework/base/src/types/interaction/tx_rh_list/tx_rh_list_exec.rs
@@ -0,0 +1,68 @@
+use crate::{proxy_imports::OriginalResultMarker, types::TxEnv};
+
+use super::{ConsNoRet, ConsRet, RHList, RHListItem};
+
+/// Indicates how result processing will undergo for one specific result handler.
+///
+/// Note that the `ResultType` needs to be the first generic type in the definition,
+/// so we can add new implementations of the same result handlers for new raw result types in subsequent crates.
+pub trait RHListItemExec<RawResult, Env, Original>: RHListItem<Env, Original>
+where
+    Env: TxEnv,
+{
+    fn item_process_result(self, raw_result: &RawResult) -> Self::Returns;
+}
+
+impl<RawResult, Env, Original> RHListItemExec<RawResult, Env, Original> for ()
+where
+    Env: TxEnv,
+{
+    fn item_process_result(self, _raw_result: &RawResult) -> Self::Returns {}
+}
+
+/// Indicates how result processing will undergo for an ensemble of result handlers.
+pub trait RHListExec<RawResult, Env>: RHList<Env>
+where
+    Env: TxEnv,
+{
+    fn list_process_result(self, raw_result: &RawResult) -> Self::ListReturns;
+}
+
+impl<RawResult, Env> RHListExec<RawResult, Env> for ()
+where
+    Env: TxEnv,
+{
+    fn list_process_result(self, _raw_result: &RawResult) -> Self::ListReturns {}
+}
+
+impl<RawResult, Env, O> RHListExec<RawResult, Env> for OriginalResultMarker<O>
+where
+    Env: TxEnv,
+{
+    fn list_process_result(self, _raw_result: &RawResult) -> Self::ListReturns {}
+}
+
+impl<RawResult, Env, Head, Tail> RHListExec<RawResult, Env> for ConsRet<Env, Head, Tail>
+where
+    Env: TxEnv,
+    Head: RHListItemExec<RawResult, Env, Tail::OriginalResult>,
+    Tail: RHListExec<RawResult, Env>,
+{
+    fn list_process_result(self, raw_result: &RawResult) -> Self::ListReturns {
+        let head_result = self.head.item_process_result(raw_result);
+        let tail_result = self.tail.list_process_result(raw_result);
+        (head_result, tail_result)
+    }
+}
+
+impl<RawResult, Env, Head, Tail> RHListExec<RawResult, Env> for ConsNoRet<Env, Head, Tail>
+where
+    Env: TxEnv,
+    Head: RHListItemExec<RawResult, Env, Tail::OriginalResult, Returns = ()>,
+    Tail: RHListExec<RawResult, Env>,
+{
+    fn list_process_result(self, raw_result: &RawResult) -> Self::ListReturns {
+        self.head.item_process_result(raw_result);
+        self.tail.list_process_result(raw_result)
+    }
+}
diff --git a/framework/base/src/types/interaction/tx_rh_list/with_result_exact.rs b/framework/base/src/types/interaction/tx_rh_list/with_result_exact.rs
index f3319c5a07..d3045dca25 100644
--- a/framework/base/src/types/interaction/tx_rh_list/with_result_exact.rs
+++ b/framework/base/src/types/interaction/tx_rh_list/with_result_exact.rs
@@ -3,11 +3,11 @@ use core::marker::PhantomData;
 use multiversx_sc_codec::TopDecodeMulti;
 
 use crate::types::{
-    interaction::contract_call_exec::decode_result, ManagedBuffer, ManagedVec, RHListItemSync,
+    interaction::contract_call_exec::decode_result, ManagedBuffer, ManagedVec, SyncCallRawResult,
     TxEnv,
 };
 
-use super::RHListItem;
+use super::{RHListItem, RHListItemExec};
 
 pub struct WithResultExact<T, F>
 where
@@ -37,17 +37,15 @@ where
     type Returns = ();
 }
 
-impl<Env, Original, F> RHListItemSync<Env, Original> for WithResultExact<Original, F>
+impl<Env, Original, F> RHListItemExec<SyncCallRawResult<Env::Api>, Env, Original>
+    for WithResultExact<Original, F>
 where
     Env: TxEnv,
     Original: TopDecodeMulti,
     F: FnOnce(Original),
 {
-    fn item_sync_call_result(
-        self,
-        raw_results: &ManagedVec<Env::Api, ManagedBuffer<Env::Api>>,
-    ) -> Self::Returns {
-        let t = decode_result::<Env::Api, Original>(raw_results.clone());
+    fn item_process_result(self, raw_result: &SyncCallRawResult<Env::Api>) -> Self::Returns {
+        let t = decode_result::<Env::Api, Original>(raw_result.0.clone());
         (self.f)(t)
     }
 }
diff --git a/framework/base/src/types/interaction/tx_rh_list/with_result_new_address.rs b/framework/base/src/types/interaction/tx_rh_list/with_result_new_address.rs
index 64b2894f1f..5dad91eef6 100644
--- a/framework/base/src/types/interaction/tx_rh_list/with_result_new_address.rs
+++ b/framework/base/src/types/interaction/tx_rh_list/with_result_new_address.rs
@@ -1,10 +1,8 @@
 use core::marker::PhantomData;
 
-use crate::types::{
-    interaction::tx_call_deploy::RHListItemDeploy, ManagedAddress, ManagedBuffer, ManagedVec, TxEnv,
-};
+use crate::types::{DeployRawResult, ManagedAddress, ManagedBuffer, ManagedVec, TxEnv};
 
-use super::RHListItem;
+use super::{RHListItem, RHListItemExec};
 
 pub struct WithResultNewAddress<Env, F>
 where
@@ -36,16 +34,13 @@ where
     type Returns = ();
 }
 
-impl<Env, F, Original> RHListItemDeploy<Env, Original> for WithResultNewAddress<Env, F>
+impl<Env, F, Original> RHListItemExec<DeployRawResult<Env::Api>, Env, Original>
+    for WithResultNewAddress<Env, F>
 where
     Env: TxEnv,
     F: FnOnce(&ManagedAddress<Env::Api>),
 {
-    fn item_deploy_result(
-        self,
-        new_address: &ManagedAddress<Env::Api>,
-        _raw_results: &ManagedVec<Env::Api, ManagedBuffer<Env::Api>>,
-    ) -> Self::Returns {
-        (self.f)(new_address);
+    fn item_process_result(self, raw_result: &DeployRawResult<Env::Api>) -> Self::Returns {
+        (self.f)(&raw_result.new_address);
     }
 }
diff --git a/framework/base/src/types/interaction/tx_rh_list/with_result_raw.rs b/framework/base/src/types/interaction/tx_rh_list/with_result_raw.rs
index 8f288604be..35b4053d2a 100644
--- a/framework/base/src/types/interaction/tx_rh_list/with_result_raw.rs
+++ b/framework/base/src/types/interaction/tx_rh_list/with_result_raw.rs
@@ -1,8 +1,8 @@
 use core::marker::PhantomData;
 
-use crate::types::{ManagedBuffer, ManagedVec, RHListItemSync, TxEnv};
+use crate::types::{ManagedBuffer, ManagedVec, SyncCallRawResult, TxEnv};
 
-use super::RHListItem;
+use super::{RHListItem, RHListItemExec};
 
 pub struct WithResultRaw<Env, F>
 where
@@ -34,15 +34,13 @@ where
     type Returns = ();
 }
 
-impl<Env, F, Original> RHListItemSync<Env, Original> for WithResultRaw<Env, F>
+impl<Env, F, Original> RHListItemExec<SyncCallRawResult<Env::Api>, Env, Original>
+    for WithResultRaw<Env, F>
 where
     Env: TxEnv,
     F: FnOnce(&ManagedVec<Env::Api, ManagedBuffer<Env::Api>>),
 {
-    fn item_sync_call_result(
-        self,
-        raw_results: &ManagedVec<Env::Api, ManagedBuffer<Env::Api>>,
-    ) -> Self::Returns {
-        (self.f)(raw_results)
+    fn item_process_result(self, raw_result: &SyncCallRawResult<Env::Api>) -> Self::Returns {
+        (self.f)(&raw_result.0)
     }
 }
diff --git a/framework/base/src/types/interaction/tx_rh_list/with_result_similar.rs b/framework/base/src/types/interaction/tx_rh_list/with_result_similar.rs
index c9fd9173b2..d2af475447 100644
--- a/framework/base/src/types/interaction/tx_rh_list/with_result_similar.rs
+++ b/framework/base/src/types/interaction/tx_rh_list/with_result_similar.rs
@@ -3,11 +3,11 @@ use core::marker::PhantomData;
 use multiversx_sc_codec::{CodecFrom, TopEncodeMulti};
 
 use crate::types::{
-    interaction::contract_call_exec::decode_result, ManagedBuffer, ManagedVec, RHListItemSync,
+    interaction::contract_call_exec::decode_result, ManagedBuffer, ManagedVec, SyncCallRawResult,
     TxEnv,
 };
 
-use super::RHListItem;
+use super::{RHListItem, RHListItemExec};
 
 pub struct WithResultSimilar<T, F>
 where
@@ -39,18 +39,16 @@ where
     type Returns = ();
 }
 
-impl<Env, Original, T, F> RHListItemSync<Env, Original> for WithResultSimilar<T, F>
+impl<Env, Original, T, F> RHListItemExec<SyncCallRawResult<Env::Api>, Env, Original>
+    for WithResultSimilar<T, F>
 where
     Env: TxEnv,
     Original: TopEncodeMulti,
     T: CodecFrom<Original>,
     F: FnOnce(T),
 {
-    fn item_sync_call_result(
-        self,
-        raw_results: &ManagedVec<Env::Api, ManagedBuffer<Env::Api>>,
-    ) -> Self::Returns {
-        let t = decode_result::<Env::Api, T>(raw_results.clone());
+    fn item_process_result(self, raw_result: &SyncCallRawResult<Env::Api>) -> Self::Returns {
+        let t = decode_result::<Env::Api, T>(raw_result.0.clone());
         (self.f)(t)
     }
 }
diff --git a/framework/base/src/types/interaction/tx_to/tx_to_self.rs b/framework/base/src/types/interaction/tx_to/tx_to_self.rs
index a4adfaa429..87e068ae6f 100644
--- a/framework/base/src/types/interaction/tx_to/tx_to_self.rs
+++ b/framework/base/src/types/interaction/tx_to/tx_to_self.rs
@@ -31,7 +31,8 @@ where
     where
         F: FnOnce(&ManagedAddress<Api>) -> R,
     {
-        let sc_address_handle: Api::ManagedBufferHandle = use_raw_handle(const_handles::ADDRESS_CALLER);
+        let sc_address_handle: Api::ManagedBufferHandle =
+            use_raw_handle(const_handles::ADDRESS_CALLER);
         Api::blockchain_api_impl().load_sc_address_managed(sc_address_handle.clone());
         f(&ManagedAddress::from_handle(sc_address_handle))
     }
diff --git a/framework/scenario/src/facade/world_tx.rs b/framework/scenario/src/facade/world_tx.rs
index 92f842cf55..4a6fd86317 100644
--- a/framework/scenario/src/facade/world_tx.rs
+++ b/framework/scenario/src/facade/world_tx.rs
@@ -6,14 +6,11 @@ mod scenario_env_deploy;
 mod scenario_env_exec;
 mod scenario_env_query;
 pub mod scenario_env_util;
-mod scenario_rh_list;
-mod scenario_rh_list_item;
+mod scenario_rh_impl;
 mod with_tx_raw_response;
 
 pub use expr::*;
 pub use scenario_env::*;
 pub use scenario_env_exec::ScenarioEnvExec;
 pub use scenario_env_query::ScenarioEnvQuery;
-pub use scenario_rh_list::*;
-pub use scenario_rh_list_item::*;
 pub use with_tx_raw_response::WithRawTxResponse;
diff --git a/framework/scenario/src/facade/world_tx/scenario_env_deploy.rs b/framework/scenario/src/facade/world_tx/scenario_env_deploy.rs
index d9317a094c..fadd24d78d 100644
--- a/framework/scenario/src/facade/world_tx/scenario_env_deploy.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_env_deploy.rs
@@ -4,7 +4,7 @@ use multiversx_chain_scenario_format::serde_raw::ValueSubTree;
 use multiversx_sc::{
     tuple_util::NestedTupleFlatten,
     types::{
-        AnnotatedValue, Code, DeployCall, FunctionCall, ManagedAddress, ManagedBuffer, RHListSync,
+        AnnotatedValue, Code, DeployCall, FunctionCall, ManagedAddress, ManagedBuffer, RHListExec,
         Tx, TxBaseWithEnv, TxCodeSource, TxCodeSourceSpecified, TxCodeValue, TxEnv,
         TxFromSpecified, TxGas, TxPayment, TxToSpecified,
     },
@@ -16,7 +16,7 @@ use crate::{
     ScenarioEnvExec, ScenarioTxEnv, ScenarioTxRun, ScenarioWorld,
 };
 
-use super::{scenario_env_util::*, RHListScenario, ScenarioTxEnvData};
+use super::{scenario_env_util::*, ScenarioTxEnvData};
 
 impl<'w, From, Payment, Gas, CodeValue, RH> ScenarioTxRun
     for Tx<
@@ -33,7 +33,7 @@ where
     Payment: TxPayment<ScenarioEnvExec<'w>>,
     Gas: TxGas<ScenarioEnvExec<'w>>,
     CodeValue: TxCodeValue<ScenarioEnvExec<'w>>,
-    RH: RHListScenario<ScenarioEnvExec<'w>>,
+    RH: RHListExec<TxResponse, ScenarioEnvExec<'w>>,
     RH::ListReturns: NestedTupleFlatten,
 {
     type Returns = <RH::ListReturns as NestedTupleFlatten>::Unpacked;
@@ -53,7 +53,7 @@ impl ScenarioWorld {
         Payment: TxPayment<ScenarioTxEnvData>,
         Gas: TxGas<ScenarioTxEnvData>,
         CodeValue: TxCodeValue<ScenarioTxEnvData>,
-        RH: RHListScenario<ScenarioTxEnvData, ListReturns = ()>,
+        RH: RHListExec<TxResponse, ScenarioTxEnvData, ListReturns = ()>,
         F: FnOnce(
             TxBaseWithEnv<ScenarioTxEnvData>,
         ) -> Tx<
diff --git a/framework/scenario/src/facade/world_tx/scenario_env_exec.rs b/framework/scenario/src/facade/world_tx/scenario_env_exec.rs
index 3758673006..e19c515c0b 100644
--- a/framework/scenario/src/facade/world_tx/scenario_env_exec.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_env_exec.rs
@@ -4,7 +4,7 @@ use multiversx_chain_scenario_format::serde_raw::ValueSubTree;
 use multiversx_sc::{
     tuple_util::NestedTupleFlatten,
     types::{
-        AnnotatedValue, Code, DeployCall, FunctionCall, ManagedAddress, ManagedBuffer, RHListSync,
+        AnnotatedValue, Code, DeployCall, FunctionCall, ManagedAddress, ManagedBuffer, RHListExec,
         Tx, TxBaseWithEnv, TxCodeSource, TxCodeSourceSpecified, TxCodeValue, TxEnv,
         TxFromSpecified, TxGas, TxPayment, TxToSpecified,
     },
@@ -16,7 +16,7 @@ use crate::{
     ScenarioTxEnv, ScenarioTxRun, ScenarioWorld,
 };
 
-use super::{scenario_env_util::*, RHListScenario, ScenarioTxEnvData};
+use super::{scenario_env_util::*, ScenarioTxEnvData};
 
 /// Environment for executing transactions.
 pub struct ScenarioEnvExec<'w> {
@@ -49,7 +49,7 @@ where
     To: TxToSpecified<ScenarioEnvExec<'w>>,
     Payment: TxPayment<ScenarioEnvExec<'w>>,
     Gas: TxGas<ScenarioEnvExec<'w>>,
-    RH: RHListScenario<ScenarioEnvExec<'w>>,
+    RH: RHListExec<TxResponse, ScenarioEnvExec<'w>>,
     RH::ListReturns: NestedTupleFlatten,
 {
     type Returns = <RH::ListReturns as NestedTupleFlatten>::Unpacked;
@@ -81,7 +81,7 @@ impl ScenarioWorld {
         To: TxToSpecified<ScenarioTxEnvData>,
         Payment: TxPayment<ScenarioTxEnvData>,
         Gas: TxGas<ScenarioTxEnvData>,
-        RH: RHListScenario<ScenarioTxEnvData, ListReturns = ()>,
+        RH: RHListExec<TxResponse, ScenarioTxEnvData, ListReturns = ()>,
         F: FnOnce(
             TxBaseWithEnv<ScenarioTxEnvData>,
         )
diff --git a/framework/scenario/src/facade/world_tx/scenario_env_query.rs b/framework/scenario/src/facade/world_tx/scenario_env_query.rs
index e7d73ec729..993b4d9636 100644
--- a/framework/scenario/src/facade/world_tx/scenario_env_query.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_env_query.rs
@@ -3,14 +3,14 @@ use std::path::PathBuf;
 use multiversx_sc::{
     tuple_util::NestedTupleFlatten,
     types::{
-        AnnotatedValue, FunctionCall, ManagedAddress, Tx, TxBaseWithEnv, TxEnv, TxFromSpecified,
-        TxGas, TxPayment, TxToSpecified,
+        AnnotatedValue, FunctionCall, ManagedAddress, RHListExec, Tx, TxBaseWithEnv, TxEnv,
+        TxFromSpecified, TxGas, TxPayment, TxToSpecified,
     },
 };
 
 use crate::{
-    api::StaticApi, scenario_model::TxResponse, RHListScenario, ScenarioTxEnv, ScenarioTxEnvData,
-    ScenarioTxRun, ScenarioWorld,
+    api::StaticApi, scenario_model::TxResponse, ScenarioTxEnv, ScenarioTxEnvData, ScenarioTxRun,
+    ScenarioWorld,
 };
 
 use super::scenario_env_util::*;
@@ -42,7 +42,7 @@ impl<'w, To, RH> ScenarioTxRun
     for Tx<ScenarioEnvQuery<'w>, (), To, (), (), FunctionCall<StaticApi>, RH>
 where
     To: TxToSpecified<ScenarioEnvQuery<'w>>,
-    RH: RHListScenario<ScenarioEnvQuery<'w>>,
+    RH: RHListExec<TxResponse, ScenarioEnvQuery<'w>>,
     RH::ListReturns: NestedTupleFlatten,
 {
     type Returns = <RH::ListReturns as NestedTupleFlatten>::Unpacked;
@@ -64,7 +64,7 @@ impl ScenarioWorld {
     pub fn chain_query<To, RH, F>(&mut self, f: F) -> &mut Self
     where
         To: TxToSpecified<ScenarioTxEnvData>,
-        RH: RHListScenario<ScenarioTxEnvData, ListReturns = ()>,
+        RH: RHListExec<TxResponse, ScenarioTxEnvData, ListReturns = ()>,
         F: FnOnce(
             TxBaseWithEnv<ScenarioTxEnvData>,
         ) -> Tx<ScenarioTxEnvData, (), To, (), (), FunctionCall<StaticApi>, RH>,
diff --git a/framework/scenario/src/facade/world_tx/scenario_env_util.rs b/framework/scenario/src/facade/world_tx/scenario_env_util.rs
index 2e75fa3c5d..eca9bc84ed 100644
--- a/framework/scenario/src/facade/world_tx/scenario_env_util.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_env_util.rs
@@ -2,7 +2,7 @@ use multiversx_chain_scenario_format::serde_raw::ValueSubTree;
 use multiversx_sc::{
     tuple_util::NestedTupleFlatten,
     types::{
-        AnnotatedValue, Code, DeployCall, FunctionCall, ManagedAddress, ManagedBuffer, RHListSync,
+        AnnotatedValue, Code, DeployCall, FunctionCall, ManagedAddress, ManagedBuffer, RHListExec,
         Tx, TxBaseWithEnv, TxCodeSource, TxCodeSourceSpecified, TxCodeValue, TxEnv,
         TxFromSpecified, TxGas, TxPayment, TxToSpecified,
     },
@@ -14,7 +14,7 @@ use crate::{
         AddressValue, BigUintValue, BytesValue, ScCallStep, ScDeployStep, ScQueryStep,
         TransferStep, TxResponse,
     },
-    RHListScenario, ScenarioEnvExec, ScenarioWorld,
+    ScenarioEnvExec, ScenarioWorld,
 };
 
 pub fn address_annotated<Env, Addr>(env: &Env, from: Addr) -> AddressValue
@@ -148,10 +148,10 @@ pub fn process_result<Env, RH>(
 ) -> <RH::ListReturns as NestedTupleFlatten>::Unpacked
 where
     Env: TxEnv,
-    RH: RHListScenario<Env>,
+    RH: RHListExec<TxResponse, Env>,
     RH::ListReturns: NestedTupleFlatten,
 {
     let response = response.expect("step did not return result");
-    let tuple_result = result_handler.item_scenario_result(&response);
+    let tuple_result = result_handler.list_process_result(&response);
     tuple_result.flatten_unpack()
 }
diff --git a/framework/scenario/src/facade/world_tx/scenario_rh_list_item.rs b/framework/scenario/src/facade/world_tx/scenario_rh_impl.rs
similarity index 57%
rename from framework/scenario/src/facade/world_tx/scenario_rh_list_item.rs
rename to framework/scenario/src/facade/world_tx/scenario_rh_impl.rs
index 36440e0313..b0161b52b8 100644
--- a/framework/scenario/src/facade/world_tx/scenario_rh_list_item.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_rh_impl.rs
@@ -1,8 +1,8 @@
 use multiversx_sc::{
     codec::{CodecFrom, TopDecodeMulti, TopEncodeMulti},
     types::{
-        ManagedAddress, RHList, RHListItem, ReturnsExact, ReturnsNewAddress, ReturnsSimilar, TxEnv,
-        WithResultNewAddress, WithResultSimilar,
+        ManagedAddress, RHList, RHListItem, RHListItemExec, ReturnsExact, ReturnsNewAddress,
+        ReturnsSimilar, TxEnv, WithResultNewAddress, WithResultSimilar,
     },
 };
 
@@ -13,19 +13,12 @@ use crate::{
 
 use super::ScenarioTxEnvData;
 
-pub trait RHListItemScenario<Env, Original>: RHListItem<Env, Original>
-where
-    Env: TxEnv,
-{
-    fn item_scenario_result(self, tx_response: &TxResponse) -> Self::Returns;
-}
-
-impl<Env, Original> RHListItemScenario<Env, Original> for ReturnsExact
+impl<Env, Original> RHListItemExec<TxResponse, Env, Original> for ReturnsExact
 where
     Env: TxEnv,
     Original: TopDecodeMulti,
 {
-    fn item_scenario_result(self, tx_response: &TxResponse) -> Self::Returns {
+    fn item_process_result(self, tx_response: &TxResponse) -> Self::Returns {
         let response = TypedResponse::<Original>::from_raw(tx_response);
         response
             .result
@@ -33,13 +26,13 @@ where
     }
 }
 
-impl<Env, Original, T> RHListItemScenario<Env, Original> for ReturnsSimilar<T>
+impl<Env, Original, T> RHListItemExec<TxResponse, Env, Original> for ReturnsSimilar<T>
 where
     Env: TxEnv,
     Original: TopEncodeMulti,
     T: CodecFrom<Original>,
 {
-    fn item_scenario_result(self, tx_response: &TxResponse) -> Self::Returns {
+    fn item_process_result(self, tx_response: &TxResponse) -> Self::Returns {
         let response = TypedResponse::<T>::from_raw(tx_response);
         response
             .result
@@ -47,14 +40,14 @@ where
     }
 }
 
-impl<Env, Original, T, F> RHListItemScenario<Env, Original> for WithResultSimilar<T, F>
+impl<Env, Original, T, F> RHListItemExec<TxResponse, Env, Original> for WithResultSimilar<T, F>
 where
     Env: TxEnv,
     Original: TopEncodeMulti,
     T: CodecFrom<Original>,
     F: FnOnce(T),
 {
-    fn item_scenario_result(self, tx_response: &TxResponse) -> Self::Returns {
+    fn item_process_result(self, tx_response: &TxResponse) -> Self::Returns {
         let response = TypedResponse::<T>::from_raw(tx_response);
         let value = response
             .result
@@ -63,11 +56,11 @@ where
     }
 }
 
-impl<Env, Original> RHListItemScenario<Env, Original> for ReturnsNewAddress
+impl<Env, Original> RHListItemExec<TxResponse, Env, Original> for ReturnsNewAddress
 where
     Env: TxEnv,
 {
-    fn item_scenario_result(self, tx_response: &TxResponse) -> Self::Returns {
+    fn item_process_result(self, tx_response: &TxResponse) -> Self::Returns {
         let new_address = tx_response
             .new_deployed_address
             .clone()
@@ -77,12 +70,12 @@ where
     }
 }
 
-impl<Env, Original, F> RHListItemScenario<Env, Original> for WithResultNewAddress<Env, F>
+impl<Env, Original, F> RHListItemExec<TxResponse, Env, Original> for WithResultNewAddress<Env, F>
 where
     Env: TxEnv,
     F: FnOnce(&ManagedAddress<Env::Api>),
 {
-    fn item_scenario_result(self, tx_response: &TxResponse) -> Self::Returns {
+    fn item_process_result(self, tx_response: &TxResponse) -> Self::Returns {
         let new_address = tx_response
             .new_deployed_address
             .clone()
diff --git a/framework/scenario/src/facade/world_tx/scenario_rh_list.rs b/framework/scenario/src/facade/world_tx/scenario_rh_list.rs
deleted file mode 100644
index 4273b83fe7..0000000000
--- a/framework/scenario/src/facade/world_tx/scenario_rh_list.rs
+++ /dev/null
@@ -1,51 +0,0 @@
-use multiversx_sc::types::{ConsNoRet, ConsRet, OriginalResultMarker, RHList, RHListItem, TxEnv};
-
-use crate::scenario_model::TxResponse;
-
-use super::RHListItemScenario;
-
-pub trait RHListScenario<Env>: RHList<Env>
-where
-    Env: TxEnv,
-{
-    fn item_scenario_result(self, tx_response: &TxResponse) -> Self::ListReturns;
-}
-
-impl<Env> RHListScenario<Env> for ()
-where
-    Env: TxEnv,
-{
-    fn item_scenario_result(self, tx_response: &TxResponse) -> Self::ListReturns {}
-}
-
-impl<Env, O> RHListScenario<Env> for OriginalResultMarker<O>
-where
-    Env: TxEnv,
-{
-    fn item_scenario_result(self, tx_response: &TxResponse) -> Self::ListReturns {}
-}
-
-impl<Env, Head, Tail> RHListScenario<Env> for ConsRet<Env, Head, Tail>
-where
-    Env: TxEnv,
-    Head: RHListItemScenario<Env, Tail::OriginalResult>,
-    Tail: RHListScenario<Env>,
-{
-    fn item_scenario_result(self, tx_response: &TxResponse) -> Self::ListReturns {
-        let head_result = self.head.item_scenario_result(tx_response);
-        let tail_result = self.tail.item_scenario_result(tx_response);
-        (head_result, tail_result)
-    }
-}
-
-impl<Env, Head, Tail> RHListScenario<Env> for ConsNoRet<Env, Head, Tail>
-where
-    Env: TxEnv,
-    Head: RHListItemScenario<Env, Tail::OriginalResult, Returns = ()>,
-    Tail: RHListScenario<Env>,
-{
-    fn item_scenario_result(self, tx_response: &TxResponse) -> Self::ListReturns {
-        self.head.item_scenario_result(tx_response);
-        self.tail.item_scenario_result(tx_response)
-    }
-}
diff --git a/framework/scenario/src/facade/world_tx/with_tx_raw_response.rs b/framework/scenario/src/facade/world_tx/with_tx_raw_response.rs
index 51f603a47b..512338aab8 100644
--- a/framework/scenario/src/facade/world_tx/with_tx_raw_response.rs
+++ b/framework/scenario/src/facade/world_tx/with_tx_raw_response.rs
@@ -2,12 +2,12 @@ use core::marker::PhantomData;
 
 use multiversx_sc::{
     codec::TopDecodeMulti,
-    types::{RHListItem, TxEnv},
+    types::{RHListItem, RHListItemExec, TxEnv},
 };
 
 use crate::scenario_model::TxResponse;
 
-use super::{RHListItemScenario, ScenarioTxEnvData};
+use super::ScenarioTxEnvData;
 
 /// Wraps a closure that handles a `TxResponse` object.
 pub struct WithRawTxResponse<F>(pub F)
@@ -22,13 +22,13 @@ where
     type Returns = ();
 }
 
-impl<Env, Original, F> RHListItemScenario<Env, Original> for WithRawTxResponse<F>
+impl<Env, Original, F> RHListItemExec<TxResponse, Env, Original> for WithRawTxResponse<F>
 where
     Env: TxEnv,
     Original: TopDecodeMulti,
     F: FnOnce(&TxResponse),
 {
-    fn item_scenario_result(self, tx_response: &TxResponse) -> Self::Returns {
-        (self.0)(tx_response)
+    fn item_process_result(self, raw_result: &TxResponse) -> Self::Returns {
+        (self.0)(raw_result)
     }
 }
diff --git a/framework/snippets/src/itx/interactor_env_deploy.rs b/framework/snippets/src/itx/interactor_env_deploy.rs
index ea11ecc338..d907db498e 100644
--- a/framework/snippets/src/itx/interactor_env_deploy.rs
+++ b/framework/snippets/src/itx/interactor_env_deploy.rs
@@ -6,14 +6,13 @@ use multiversx_sc_scenario::{
         tuple_util::NestedTupleFlatten,
         types::{
             AnnotatedValue, Code, DeployCall, FunctionCall, ManagedAddress, ManagedBuffer,
-            RHListSync, Tx, TxBaseWithEnv, TxCodeSource, TxCodeSourceSpecified, TxCodeValue, TxEnv,
+            RHListExec, Tx, TxBaseWithEnv, TxCodeSource, TxCodeSourceSpecified, TxCodeValue, TxEnv,
             TxFromSpecified, TxGas, TxPayment, TxToSpecified,
         },
     },
     scenario_env_util::*,
     scenario_model::{AddressValue, BytesValue, ScCallStep, ScDeployStep, TxResponse},
-    RHListScenario, ScenarioEnvExec, ScenarioTxEnv, ScenarioTxEnvData, ScenarioTxRun,
-    ScenarioWorld,
+    ScenarioEnvExec, ScenarioTxEnv, ScenarioTxEnvData, ScenarioTxRun, ScenarioWorld,
 };
 
 use crate::{Interactor, InteractorPrepareAsync};
@@ -22,7 +21,7 @@ use super::InteractorEnvExec;
 
 pub struct InteractorDeployStep<'w, RH>
 where
-    RH: RHListScenario<InteractorEnvExec<'w>>,
+    RH: RHListExec<TxResponse, InteractorEnvExec<'w>>,
     RH::ListReturns: NestedTupleFlatten,
 {
     world: &'w mut Interactor,
@@ -45,7 +44,7 @@ where
     Payment: TxPayment<InteractorEnvExec<'w>>,
     Gas: TxGas<InteractorEnvExec<'w>>,
     CodeValue: TxCodeValue<InteractorEnvExec<'w>>,
-    RH: RHListScenario<InteractorEnvExec<'w>>,
+    RH: RHListExec<TxResponse, InteractorEnvExec<'w>>,
     RH::ListReturns: NestedTupleFlatten,
 {
     type Exec = InteractorDeployStep<'w, RH>;
@@ -63,7 +62,7 @@ where
 
 impl<'w, RH> InteractorDeployStep<'w, RH>
 where
-    RH: RHListScenario<InteractorEnvExec<'w>>,
+    RH: RHListExec<TxResponse, InteractorEnvExec<'w>>,
     RH::ListReturns: NestedTupleFlatten,
 {
     pub async fn run(self) -> <RH::ListReturns as NestedTupleFlatten>::Unpacked {
@@ -80,7 +79,7 @@ impl Interactor {
         Payment: TxPayment<ScenarioTxEnvData>,
         Gas: TxGas<ScenarioTxEnvData>,
         CodeValue: TxCodeValue<ScenarioTxEnvData>,
-        RH: RHListScenario<ScenarioTxEnvData, ListReturns = ()>,
+        RH: RHListExec<TxResponse, ScenarioTxEnvData, ListReturns = ()>,
         F: FnOnce(
             TxBaseWithEnv<ScenarioTxEnvData>,
         ) -> Tx<
@@ -111,7 +110,7 @@ impl Interactor {
         Payment: TxPayment<ScenarioTxEnvData>,
         Gas: TxGas<ScenarioTxEnvData>,
         CodeValue: TxCodeValue<ScenarioTxEnvData>,
-        RH: RHListScenario<ScenarioTxEnvData>,
+        RH: RHListExec<TxResponse, ScenarioTxEnvData>,
         RH::ListReturns: NestedTupleFlatten,
         F: FnOnce(
             TxBaseWithEnv<ScenarioTxEnvData>,
diff --git a/framework/snippets/src/itx/interactor_env_exec.rs b/framework/snippets/src/itx/interactor_env_exec.rs
index dc5269e6e9..bc2d9d20da 100644
--- a/framework/snippets/src/itx/interactor_env_exec.rs
+++ b/framework/snippets/src/itx/interactor_env_exec.rs
@@ -6,13 +6,13 @@ use multiversx_sc_scenario::{
         tuple_util::NestedTupleFlatten,
         types::{
             AnnotatedValue, Code, DeployCall, FunctionCall, ManagedAddress, ManagedBuffer,
-            RHListSync, Tx, TxBaseWithEnv, TxCodeSource, TxCodeSourceSpecified, TxCodeValue, TxEnv,
+            RHListExec, Tx, TxBaseWithEnv, TxCodeSource, TxCodeSourceSpecified, TxCodeValue, TxEnv,
             TxFromSpecified, TxGas, TxPayment, TxToSpecified,
         },
     },
     scenario_env_util::*,
     scenario_model::{AddressValue, BytesValue, ScCallStep, ScDeployStep, TxResponse},
-    RHListScenario, ScenarioTxEnv, ScenarioTxEnvData, ScenarioTxRun, ScenarioWorld,
+    ScenarioTxEnv, ScenarioTxEnvData, ScenarioTxRun, ScenarioWorld,
 };
 
 use crate::{Interactor, InteractorPrepareAsync};
@@ -43,7 +43,7 @@ impl<'w> ScenarioTxEnv for InteractorEnvExec<'w> {
 
 pub struct InteractorCallStep<'w, RH>
 where
-    RH: RHListScenario<InteractorEnvExec<'w>>,
+    RH: RHListExec<TxResponse, InteractorEnvExec<'w>>,
     RH::ListReturns: NestedTupleFlatten,
 {
     world: &'w mut Interactor,
@@ -58,7 +58,7 @@ where
     To: TxToSpecified<InteractorEnvExec<'w>>,
     Payment: TxPayment<InteractorEnvExec<'w>>,
     Gas: TxGas<InteractorEnvExec<'w>>,
-    RH: RHListScenario<InteractorEnvExec<'w>>,
+    RH: RHListExec<TxResponse, InteractorEnvExec<'w>>,
     RH::ListReturns: NestedTupleFlatten,
 {
     type Exec = InteractorCallStep<'w, RH>;
@@ -82,7 +82,7 @@ where
 
 impl<'w, RH> InteractorCallStep<'w, RH>
 where
-    RH: RHListScenario<InteractorEnvExec<'w>>,
+    RH: RHListExec<TxResponse, InteractorEnvExec<'w>>,
     RH::ListReturns: NestedTupleFlatten,
 {
     pub async fn run(self) -> <RH::ListReturns as NestedTupleFlatten>::Unpacked {
@@ -105,7 +105,7 @@ impl Interactor {
         To: TxToSpecified<ScenarioTxEnvData>,
         Payment: TxPayment<ScenarioTxEnvData>,
         Gas: TxGas<ScenarioTxEnvData>,
-        RH: RHListScenario<ScenarioTxEnvData, ListReturns = ()>,
+        RH: RHListExec<TxResponse, ScenarioTxEnvData, ListReturns = ()>,
         F: FnOnce(
             TxBaseWithEnv<ScenarioTxEnvData>,
         )
diff --git a/framework/snippets/src/itx/interactor_env_query.rs b/framework/snippets/src/itx/interactor_env_query.rs
index 20e61e571f..1628215992 100644
--- a/framework/snippets/src/itx/interactor_env_query.rs
+++ b/framework/snippets/src/itx/interactor_env_query.rs
@@ -5,13 +5,13 @@ use multiversx_sc_scenario::{
     multiversx_sc::{
         tuple_util::NestedTupleFlatten,
         types::{
-            AnnotatedValue, FunctionCall, ManagedAddress, Tx, TxBaseWithEnv, TxEnv,
+            AnnotatedValue, FunctionCall, ManagedAddress, RHListExec, Tx, TxBaseWithEnv, TxEnv,
             TxFromSpecified, TxGas, TxPayment, TxToSpecified,
         },
     },
     scenario_env_util::*,
     scenario_model::{ScQueryStep, TxResponse},
-    RHListScenario, ScenarioTxEnv, ScenarioTxEnvData, ScenarioTxRun, ScenarioWorld,
+    ScenarioTxEnv, ScenarioTxEnvData, ScenarioTxRun, ScenarioWorld,
 };
 
 use crate::{Interactor, InteractorPrepareAsync};
@@ -41,7 +41,7 @@ impl<'w> ScenarioTxEnv for InteractorEnvQuery<'w> {
 
 pub struct InteractorQueryStep<'w, RH>
 where
-    RH: RHListScenario<InteractorEnvQuery<'w>>,
+    RH: RHListExec<TxResponse, InteractorEnvQuery<'w>>,
     RH::ListReturns: NestedTupleFlatten,
 {
     world: &'w mut Interactor,
@@ -53,7 +53,7 @@ impl<'w, To, RH> InteractorPrepareAsync
     for Tx<InteractorEnvQuery<'w>, (), To, (), (), FunctionCall<StaticApi>, RH>
 where
     To: TxToSpecified<InteractorEnvQuery<'w>>,
-    RH: RHListScenario<InteractorEnvQuery<'w>>,
+    RH: RHListExec<TxResponse, InteractorEnvQuery<'w>>,
     RH::ListReturns: NestedTupleFlatten,
 {
     type Exec = InteractorQueryStep<'w, RH>;
@@ -70,7 +70,7 @@ where
 
 impl<'w, RH> InteractorQueryStep<'w, RH>
 where
-    RH: RHListScenario<InteractorEnvQuery<'w>>,
+    RH: RHListExec<TxResponse, InteractorEnvQuery<'w>>,
     RH::ListReturns: NestedTupleFlatten,
 {
     pub async fn run(self) -> <RH::ListReturns as NestedTupleFlatten>::Unpacked {
@@ -90,7 +90,7 @@ impl Interactor {
     pub async fn chain_query<To, RH, F>(&mut self, f: F) -> &mut Self
     where
         To: TxToSpecified<ScenarioTxEnvData>,
-        RH: RHListScenario<ScenarioTxEnvData, ListReturns = ()>,
+        RH: RHListExec<TxResponse, ScenarioTxEnvData, ListReturns = ()>,
         F: FnOnce(
             TxBaseWithEnv<ScenarioTxEnvData>,
         ) -> Tx<ScenarioTxEnvData, (), To, (), (), FunctionCall<StaticApi>, RH>,
diff --git a/framework/snippets/src/itx/interactor_env_transf.rs b/framework/snippets/src/itx/interactor_env_transf.rs
index 993b2b04d6..19a161b18f 100644
--- a/framework/snippets/src/itx/interactor_env_transf.rs
+++ b/framework/snippets/src/itx/interactor_env_transf.rs
@@ -5,8 +5,8 @@ use multiversx_sc_scenario::{
     multiversx_sc::{
         tuple_util::NestedTupleFlatten,
         types::{
-            AnnotatedValue, Code, DeployCall, FunctionCall, ManagedAddress, ManagedBuffer,
-            RHListSync, Tx, TxBaseWithEnv, TxCodeSource, TxCodeSourceSpecified, TxCodeValue, TxEnv,
+            AnnotatedValue, Code, DeployCall, FunctionCall, ManagedAddress, ManagedBuffer, Tx,
+            TxBaseWithEnv, TxCodeSource, TxCodeSourceSpecified, TxCodeValue, TxEnv,
             TxFromSpecified, TxGas, TxPayment, TxToSpecified,
         },
     },
@@ -14,7 +14,7 @@ use multiversx_sc_scenario::{
     scenario_model::{
         AddressValue, BytesValue, ScCallStep, ScDeployStep, TransferStep, TxResponse,
     },
-    RHListScenario, ScenarioTxEnv, ScenarioTxEnvData, ScenarioTxRun, ScenarioWorld,
+    ScenarioTxEnv, ScenarioTxEnvData, ScenarioTxRun, ScenarioWorld,
 };
 
 use crate::{Interactor, InteractorEnvExec, InteractorPrepareAsync};

From cd8f93eed85740349e4df4da30a841e91e551a18 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Mon, 25 Mar 2024 17:06:52 +0200
Subject: [PATCH 0551/1254] Result handler renamed

---
 .../adder/interact/src/basic_interact.rs      |  4 ++--
 .../tests/adder_blackbox_chained_test.rs      |  6 +++---
 .../tests/adder_blackbox_legacy_proxy_test.rs |  6 +++---
 .../adder/tests/adder_blackbox_test.rs        |  6 +++---
 .../multisig/tests/multisig_blackbox_test.rs  |  4 ++--
 .../src/forwarder_raw_deploy_upgrade.rs       |  2 +-
 .../forwarder-raw/src/forwarder_raw_sync.rs   |  2 +-
 .../contract_base/wrappers/send_wrapper.rs    |  4 ++--
 .../types/interaction/tx_result_handler.rs    | 18 ++++++++++++++++++
 .../returns_bt.rs                             |  7 ++++---
 .../returns_new_address.rs                    |  7 ++++---
 .../returns_raw_result.rs}                    | 17 ++++++++---------
 .../returns_result.rs}                        | 16 ++++++++++------
 .../returns_result_conv.rs}                   | 19 ++++++++++---------
 .../with_new_address.rs}                      | 17 +++++++++--------
 .../with_raw_result.rs}                       | 17 +++++++++--------
 .../with_result.rs}                           | 19 ++++++++++---------
 .../with_result_conv.rs}                      | 19 ++++++++++---------
 .../base/src/types/interaction/tx_rh_list.rs  | 16 ----------------
 .../src/facade/world_tx/scenario_rh_impl.rs   | 12 ++++++------
 20 files changed, 115 insertions(+), 103 deletions(-)
 rename framework/base/src/types/interaction/{tx_rh_list => tx_result_handler}/returns_bt.rs (74%)
 rename framework/base/src/types/interaction/{tx_rh_list => tx_result_handler}/returns_new_address.rs (68%)
 rename framework/base/src/types/interaction/{tx_rh_list/returns_raw.rs => tx_result_handler/returns_raw_result.rs} (59%)
 rename framework/base/src/types/interaction/{tx_rh_list/returns_exact.rs => tx_result_handler/returns_result.rs} (52%)
 rename framework/base/src/types/interaction/{tx_rh_list/returns_similar.rs => tx_result_handler/returns_result_conv.rs} (65%)
 rename framework/base/src/types/interaction/{tx_rh_list/with_result_new_address.rs => tx_result_handler/with_new_address.rs} (62%)
 rename framework/base/src/types/interaction/{tx_rh_list/with_result_raw.rs => tx_result_handler/with_raw_result.rs} (66%)
 rename framework/base/src/types/interaction/{tx_rh_list/with_result_exact.rs => tx_result_handler/with_result.rs} (65%)
 rename framework/base/src/types/interaction/{tx_rh_list/with_result_similar.rs => tx_result_handler/with_result_conv.rs} (71%)

diff --git a/contracts/examples/adder/interact/src/basic_interact.rs b/contracts/examples/adder/interact/src/basic_interact.rs
index f1036b4aa0..7941bd7626 100644
--- a/contracts/examples/adder/interact/src/basic_interact.rs
+++ b/contracts/examples/adder/interact/src/basic_interact.rs
@@ -8,7 +8,7 @@ use basic_interact_state::State;
 use clap::Parser;
 use multiversx_sc_snippets::{
     env_logger,
-    multiversx_sc::types::{Address, ReturnsNewAddress, ReturnsSimilar},
+    multiversx_sc::types::{Address, ReturnsNewAddress, ReturnsResultConv},
     multiversx_sc_scenario::{
         api::StaticApi,
         bech32,
@@ -197,7 +197,7 @@ impl AdderInteract {
             .to(self.state.adder().to_address())
             .typed(adder_proxy::AdderProxy)
             .sum()
-            .returns(ReturnsSimilar::<BigUint>::new())
+            .returns(ReturnsResultConv::<BigUint>::new())
             .prepare_async()
             .run()
             .await;
diff --git a/contracts/examples/adder/tests/adder_blackbox_chained_test.rs b/contracts/examples/adder/tests/adder_blackbox_chained_test.rs
index 6060ad3859..05b95ba905 100644
--- a/contracts/examples/adder/tests/adder_blackbox_chained_test.rs
+++ b/contracts/examples/adder/tests/adder_blackbox_chained_test.rs
@@ -1,5 +1,5 @@
 use adder::*;
-use multiversx_sc::types::{AddressExpr, ScExpr, WithResultNewAddress, WithResultSimilar};
+use multiversx_sc::types::{AddressExpr, ScExpr, WithNewAddress, WithResultConv};
 use multiversx_sc_scenario::{api::StaticApi, num_bigint::BigUint, scenario_model::*, *};
 
 const ADDER_PATH_EXPR: &str = "mxsc:output/adder.mxsc.json";
@@ -30,7 +30,7 @@ fn adder_blackbox_chained() {
                 .typed(adder_proxy::AdderProxy)
                 .init(5u32)
                 .code(MxscExpr("output/adder.mxsc.json"))
-                .with_result(WithResultNewAddress::new(|new_address| {
+                .with_result(WithNewAddress::new(|new_address| {
                     assert_eq!(new_address.to_address(), adder_contract.to_address());
                 }))
         })
@@ -38,7 +38,7 @@ fn adder_blackbox_chained() {
             tx.to(ScExpr("adder"))
                 .typed(adder_proxy::AdderProxy)
                 .sum()
-                .with_result(WithResultSimilar::new(|value: BigUint| {
+                .with_result(WithResultConv::new(|value: BigUint| {
                     assert_eq!(value, BigUint::from(5u32));
                 }))
         })
diff --git a/contracts/examples/adder/tests/adder_blackbox_legacy_proxy_test.rs b/contracts/examples/adder/tests/adder_blackbox_legacy_proxy_test.rs
index 3e7030a3c0..1370a064fc 100644
--- a/contracts/examples/adder/tests/adder_blackbox_legacy_proxy_test.rs
+++ b/contracts/examples/adder/tests/adder_blackbox_legacy_proxy_test.rs
@@ -1,7 +1,7 @@
 use adder::*;
 use multiversx_sc::{
     storage::mappers::SingleValue,
-    types::{AddressExpr, ReturnsSimilar, WithResultNewAddress},
+    types::{AddressExpr, ReturnsResultConv, WithNewAddress},
 };
 use multiversx_sc_scenario::{api::StaticApi, num_bigint::BigUint, scenario_model::*, *};
 
@@ -38,7 +38,7 @@ fn adder_blackbox_legacy_proxy() {
         .typed(adder_proxy::AdderProxy)
         .init(5u32)
         .code(CODE_EXPR)
-        .with_result(WithResultNewAddress::new(|new_address| {
+        .with_result(WithNewAddress::new(|new_address| {
             assert_eq!(new_address.to_address(), adder_contract.to_address());
         }))
         .run();
@@ -53,7 +53,7 @@ fn adder_blackbox_legacy_proxy() {
     let value = world
         .query()
         .call(adder_contract.sum())
-        .returns(ReturnsSimilar::<SingleValue<BigUint>>::new())
+        .returns(ReturnsResultConv::<SingleValue<BigUint>>::new())
         .run();
     assert_eq!(value.into(), BigUint::from(5u32));
 
diff --git a/contracts/examples/adder/tests/adder_blackbox_test.rs b/contracts/examples/adder/tests/adder_blackbox_test.rs
index 4a09e4117d..ec98935ba4 100644
--- a/contracts/examples/adder/tests/adder_blackbox_test.rs
+++ b/contracts/examples/adder/tests/adder_blackbox_test.rs
@@ -1,5 +1,5 @@
 use adder::*;
-use multiversx_sc::types::{AddressExpr, ReturnsSimilar, ScExpr, WithResultNewAddress};
+use multiversx_sc::types::{AddressExpr, ReturnsResultConv, ScExpr, WithNewAddress};
 use multiversx_sc_scenario::{api::StaticApi, num_bigint::BigUint, scenario_model::*, *};
 
 const ADDER_PATH_EXPR: &str = "mxsc:output/adder.mxsc.json";
@@ -36,7 +36,7 @@ fn adder_blackbox() {
         .typed(adder_proxy::AdderProxy)
         .init(5u32)
         .code(CODE_EXPR)
-        .with_result(WithResultNewAddress::new(|new_address| {
+        .with_result(WithNewAddress::new(|new_address| {
             assert_eq!(new_address.to_address(), adder_contract.to_address());
         }))
         .run();
@@ -46,7 +46,7 @@ fn adder_blackbox() {
         .to(SC_ADDER)
         .typed(adder_proxy::AdderProxy)
         .sum()
-        .returns(ReturnsSimilar::<BigUint>::new())
+        .returns(ReturnsResultConv::<BigUint>::new())
         .run();
     assert_eq!(value, BigUint::from(5u32));
 
diff --git a/contracts/examples/multisig/tests/multisig_blackbox_test.rs b/contracts/examples/multisig/tests/multisig_blackbox_test.rs
index eaec591e26..7107a6628e 100644
--- a/contracts/examples/multisig/tests/multisig_blackbox_test.rs
+++ b/contracts/examples/multisig/tests/multisig_blackbox_test.rs
@@ -9,7 +9,7 @@ use multiversx_sc::{
         test_util::top_encode_to_vec_u8_or_panic,
     },
     storage::mappers::SingleValue,
-    types::{Address, AddressExpr, CodeMetadata, FunctionCall, ReturnsExact},
+    types::{Address, AddressExpr, CodeMetadata, FunctionCall, ReturnsResult},
 };
 use multiversx_sc_scenario::{
     api::StaticApi,
@@ -131,7 +131,7 @@ impl MultisigTestState {
                 self.multisig_contract
                     .propose_add_board_member(board_member_address),
             )
-            .returns(ReturnsExact)
+            .returns(ReturnsResult)
             .run()
     }
 
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 b8fc6138eb..20ccacf4db 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
@@ -16,7 +16,7 @@ pub trait ForwarderRawDeployUpgrade {
             .arguments_raw(args.to_arg_buffer())
             .with_gas_limit(self.blockchain().get_gas_left())
             .returns(ReturnsNewAddress)
-            .returns(ReturnsRaw)
+            .returns(ReturnsRawResult)
             .sync_call()
             .into()
     }
diff --git a/contracts/feature-tests/composability/forwarder-raw/src/forwarder_raw_sync.rs b/contracts/feature-tests/composability/forwarder-raw/src/forwarder_raw_sync.rs
index f235aca1da..7fd9958479 100644
--- a/contracts/feature-tests/composability/forwarder-raw/src/forwarder_raw_sync.rs
+++ b/contracts/feature-tests/composability/forwarder-raw/src/forwarder_raw_sync.rs
@@ -20,7 +20,7 @@ pub trait ForwarderRawSync: super::forwarder_raw_common::ForwarderRawCommon {
             .function_name(endpoint_name)
             .argument(&args)
             .with_gas_limit(half_gas)
-            .returns(ReturnsRaw)
+            .returns(ReturnsRawResult)
             .sync_call();
 
         self.execute_on_dest_context_result(result);
diff --git a/framework/base/src/contract_base/wrappers/send_wrapper.rs b/framework/base/src/contract_base/wrappers/send_wrapper.rs
index 83972d0b28..6083b7b92a 100644
--- a/framework/base/src/contract_base/wrappers/send_wrapper.rs
+++ b/framework/base/src/contract_base/wrappers/send_wrapper.rs
@@ -12,7 +12,7 @@ use crate::{
     },
     codec,
     esdt::ESDTSystemSmartContractProxy,
-    proxy_imports::{ReturnsRaw, ToSelf},
+    proxy_imports::{ReturnsRawResult, ToSelf},
     types::{
         BigUint, ContractCall, ContractCallNoPayment, EgldOrEsdtTokenIdentifier, EsdtTokenPayment,
         ManagedAddress, ManagedArgBuffer, ManagedBuffer, ManagedType, ManagedVec, TokenIdentifier,
@@ -390,7 +390,7 @@ where
             .raw_call()
             .function_name(endpoint_name)
             .arguments_raw(arg_buffer)
-            .returns(ReturnsRaw)
+            .returns(ReturnsRawResult)
             .sync_call()
     }
 
diff --git a/framework/base/src/types/interaction/tx_result_handler.rs b/framework/base/src/types/interaction/tx_result_handler.rs
index 311679c442..754c339931 100644
--- a/framework/base/src/types/interaction/tx_result_handler.rs
+++ b/framework/base/src/types/interaction/tx_result_handler.rs
@@ -1,3 +1,21 @@
+mod returns_bt;
+mod returns_new_address;
+mod returns_raw_result;
+mod returns_result;
+mod returns_result_conv;
+mod with_new_address;
+mod with_raw_result;
+mod with_result;
+mod with_result_conv;
+
+pub use returns_bt::*;
+pub use returns_new_address::*;
+pub use returns_raw_result::*;
+pub use returns_result::*;
+pub use returns_result_conv::*;
+pub use with_new_address::*;
+pub use with_result_conv::*;
+
 use super::TxEnv;
 
 pub trait TxResultHandler<Env>
diff --git a/framework/base/src/types/interaction/tx_rh_list/returns_bt.rs b/framework/base/src/types/interaction/tx_result_handler/returns_bt.rs
similarity index 74%
rename from framework/base/src/types/interaction/tx_rh_list/returns_bt.rs
rename to framework/base/src/types/interaction/tx_result_handler/returns_bt.rs
index ceda028bcd..a04469930c 100644
--- a/framework/base/src/types/interaction/tx_rh_list/returns_bt.rs
+++ b/framework/base/src/types/interaction/tx_result_handler/returns_bt.rs
@@ -1,10 +1,11 @@
 use crate::{
     contract_base::BlockchainWrapper,
-    types::{BackTransfers, ManagedAddress, ManagedBuffer, ManagedVec, TxEnv},
+    types::{
+        BackTransfers, ManagedAddress, ManagedBuffer, ManagedVec, RHListItem, RHListItemExec, TxEnv,
+    },
 };
 
-use super::{RHListItem, RHListItemExec};
-
+/// Indicates that back-transfers will be returned.
 pub struct ReturnsBackTransfers;
 
 impl<Env, Original> RHListItem<Env, Original> for ReturnsBackTransfers
diff --git a/framework/base/src/types/interaction/tx_rh_list/returns_new_address.rs b/framework/base/src/types/interaction/tx_result_handler/returns_new_address.rs
similarity index 68%
rename from framework/base/src/types/interaction/tx_rh_list/returns_new_address.rs
rename to framework/base/src/types/interaction/tx_result_handler/returns_new_address.rs
index 2b1b9ccad4..89854b906a 100644
--- a/framework/base/src/types/interaction/tx_rh_list/returns_new_address.rs
+++ b/framework/base/src/types/interaction/tx_result_handler/returns_new_address.rs
@@ -1,7 +1,8 @@
-use crate::types::{DeployRawResult, ManagedAddress, ManagedBuffer, ManagedVec, TxEnv};
-
-use super::{RHListItem, RHListItemExec};
+use crate::types::{
+    DeployRawResult, ManagedAddress, ManagedBuffer, ManagedVec, RHListItem, RHListItemExec, TxEnv,
+};
 
+/// Indicates that the newly deployed address will be returned after a deploy.
 pub struct ReturnsNewAddress;
 
 impl<Env, Original> RHListItem<Env, Original> for ReturnsNewAddress
diff --git a/framework/base/src/types/interaction/tx_rh_list/returns_raw.rs b/framework/base/src/types/interaction/tx_result_handler/returns_raw_result.rs
similarity index 59%
rename from framework/base/src/types/interaction/tx_rh_list/returns_raw.rs
rename to framework/base/src/types/interaction/tx_result_handler/returns_raw_result.rs
index d1b501d77c..2627d99065 100644
--- a/framework/base/src/types/interaction/tx_rh_list/returns_raw.rs
+++ b/framework/base/src/types/interaction/tx_result_handler/returns_raw_result.rs
@@ -1,20 +1,19 @@
-use crate::{
-    proxy_imports::SyncCallRawResult,
-    types::{DeployRawResult, ManagedAddress, ManagedBuffer, ManagedVec, TxEnv},
+use crate::types::{
+    DeployRawResult, ManagedAddress, ManagedBuffer, ManagedVec, RHListItem, RHListItemExec,
+    SyncCallRawResult, TxEnv,
 };
 
-use super::{RHListItem, RHListItemExec};
+/// Indicates that the raw result data will be returned.
+pub struct ReturnsRawResult;
 
-pub struct ReturnsRaw;
-
-impl<Env, Original> RHListItem<Env, Original> for ReturnsRaw
+impl<Env, Original> RHListItem<Env, Original> for ReturnsRawResult
 where
     Env: TxEnv,
 {
     type Returns = ManagedVec<Env::Api, ManagedBuffer<Env::Api>>;
 }
 
-impl<Env, Original> RHListItemExec<SyncCallRawResult<Env::Api>, Env, Original> for ReturnsRaw
+impl<Env, Original> RHListItemExec<SyncCallRawResult<Env::Api>, Env, Original> for ReturnsRawResult
 where
     Env: TxEnv,
 {
@@ -23,7 +22,7 @@ where
     }
 }
 
-impl<Env, Original> RHListItemExec<DeployRawResult<Env::Api>, Env, Original> for ReturnsRaw
+impl<Env, Original> RHListItemExec<DeployRawResult<Env::Api>, Env, Original> for ReturnsRawResult
 where
     Env: TxEnv,
 {
diff --git a/framework/base/src/types/interaction/tx_rh_list/returns_exact.rs b/framework/base/src/types/interaction/tx_result_handler/returns_result.rs
similarity index 52%
rename from framework/base/src/types/interaction/tx_rh_list/returns_exact.rs
rename to framework/base/src/types/interaction/tx_result_handler/returns_result.rs
index 87a25f0fb2..71cbd020cf 100644
--- a/framework/base/src/types/interaction/tx_rh_list/returns_exact.rs
+++ b/framework/base/src/types/interaction/tx_result_handler/returns_result.rs
@@ -2,21 +2,25 @@ use multiversx_sc_codec::TopDecodeMulti;
 
 use crate::{
     proxy_imports::SyncCallRawResult,
-    types::{interaction::contract_call_exec::decode_result, ManagedBuffer, ManagedVec, TxEnv},
+    types::{
+        interaction::contract_call_exec::decode_result, ManagedBuffer, ManagedVec, RHListItem,
+        RHListItemExec, TxEnv,
+    },
 };
 
-use super::{RHListItem, RHListItemExec};
+/// Indicates that result will be returned.
+///
+/// Value will be decoded according to the type defined in the smart contract.
+pub struct ReturnsResult;
 
-pub struct ReturnsExact;
-
-impl<Env, Original> RHListItem<Env, Original> for ReturnsExact
+impl<Env, Original> RHListItem<Env, Original> for ReturnsResult
 where
     Env: TxEnv,
 {
     type Returns = Original;
 }
 
-impl<Env, Original> RHListItemExec<SyncCallRawResult<Env::Api>, Env, Original> for ReturnsExact
+impl<Env, Original> RHListItemExec<SyncCallRawResult<Env::Api>, Env, Original> for ReturnsResult
 where
     Env: TxEnv,
     Original: TopDecodeMulti,
diff --git a/framework/base/src/types/interaction/tx_rh_list/returns_similar.rs b/framework/base/src/types/interaction/tx_result_handler/returns_result_conv.rs
similarity index 65%
rename from framework/base/src/types/interaction/tx_rh_list/returns_similar.rs
rename to framework/base/src/types/interaction/tx_result_handler/returns_result_conv.rs
index adfb2f3bdb..1dbabc0bf1 100644
--- a/framework/base/src/types/interaction/tx_rh_list/returns_similar.rs
+++ b/framework/base/src/types/interaction/tx_result_handler/returns_result_conv.rs
@@ -3,17 +3,18 @@ use core::marker::PhantomData;
 use multiversx_sc_codec::{CodecFrom, TopEncodeMulti};
 
 use crate::types::{
-    interaction::contract_call_exec::decode_result, ManagedBuffer, ManagedVec, SyncCallRawResult,
-    TxEnv,
+    interaction::contract_call_exec::decode_result, ManagedBuffer, ManagedVec, RHListItem,
+    RHListItemExec, SyncCallRawResult, TxEnv,
 };
 
-use super::{RHListItem, RHListItemExec};
-
-pub struct ReturnsSimilar<T> {
+/// Indicates that result will be returned.
+///
+/// Value will be converted to type `T`, which should be compatible with the original type.
+pub struct ReturnsResultConv<T> {
     _phantom: PhantomData<T>,
 }
 
-impl<T> Default for ReturnsSimilar<T> {
+impl<T> Default for ReturnsResultConv<T> {
     fn default() -> Self {
         Self {
             _phantom: Default::default(),
@@ -21,13 +22,13 @@ impl<T> Default for ReturnsSimilar<T> {
     }
 }
 
-impl<T> ReturnsSimilar<T> {
+impl<T> ReturnsResultConv<T> {
     pub fn new() -> Self {
         Self::default()
     }
 }
 
-impl<Env, Original, T> RHListItem<Env, Original> for ReturnsSimilar<T>
+impl<Env, Original, T> RHListItem<Env, Original> for ReturnsResultConv<T>
 where
     Env: TxEnv,
     Original: TopEncodeMulti,
@@ -37,7 +38,7 @@ where
 }
 
 impl<Env, Original, T> RHListItemExec<SyncCallRawResult<Env::Api>, Env, Original>
-    for ReturnsSimilar<T>
+    for ReturnsResultConv<T>
 where
     Env: TxEnv,
     Original: TopEncodeMulti,
diff --git a/framework/base/src/types/interaction/tx_rh_list/with_result_new_address.rs b/framework/base/src/types/interaction/tx_result_handler/with_new_address.rs
similarity index 62%
rename from framework/base/src/types/interaction/tx_rh_list/with_result_new_address.rs
rename to framework/base/src/types/interaction/tx_result_handler/with_new_address.rs
index 5dad91eef6..2a8840f744 100644
--- a/framework/base/src/types/interaction/tx_rh_list/with_result_new_address.rs
+++ b/framework/base/src/types/interaction/tx_result_handler/with_new_address.rs
@@ -1,10 +1,11 @@
 use core::marker::PhantomData;
 
-use crate::types::{DeployRawResult, ManagedAddress, ManagedBuffer, ManagedVec, TxEnv};
+use crate::types::{
+    DeployRawResult, ManagedAddress, ManagedBuffer, ManagedVec, RHListItem, RHListItemExec, TxEnv,
+};
 
-use super::{RHListItem, RHListItemExec};
-
-pub struct WithResultNewAddress<Env, F>
+/// Defines a lambda function to be called on the newly deployed address, after a deploy.
+pub struct WithNewAddress<Env, F>
 where
     Env: TxEnv,
     F: FnOnce(&ManagedAddress<Env::Api>),
@@ -13,20 +14,20 @@ where
     pub f: F,
 }
 
-impl<Env, F> WithResultNewAddress<Env, F>
+impl<Env, F> WithNewAddress<Env, F>
 where
     Env: TxEnv,
     F: FnOnce(&ManagedAddress<Env::Api>),
 {
     pub fn new(f: F) -> Self {
-        WithResultNewAddress {
+        WithNewAddress {
             _phantom: PhantomData,
             f,
         }
     }
 }
 
-impl<Env, F, Original> RHListItem<Env, Original> for WithResultNewAddress<Env, F>
+impl<Env, F, Original> RHListItem<Env, Original> for WithNewAddress<Env, F>
 where
     Env: TxEnv,
     F: FnOnce(&ManagedAddress<Env::Api>),
@@ -35,7 +36,7 @@ where
 }
 
 impl<Env, F, Original> RHListItemExec<DeployRawResult<Env::Api>, Env, Original>
-    for WithResultNewAddress<Env, F>
+    for WithNewAddress<Env, F>
 where
     Env: TxEnv,
     F: FnOnce(&ManagedAddress<Env::Api>),
diff --git a/framework/base/src/types/interaction/tx_rh_list/with_result_raw.rs b/framework/base/src/types/interaction/tx_result_handler/with_raw_result.rs
similarity index 66%
rename from framework/base/src/types/interaction/tx_rh_list/with_result_raw.rs
rename to framework/base/src/types/interaction/tx_result_handler/with_raw_result.rs
index 35b4053d2a..f2d1457f07 100644
--- a/framework/base/src/types/interaction/tx_rh_list/with_result_raw.rs
+++ b/framework/base/src/types/interaction/tx_result_handler/with_raw_result.rs
@@ -1,10 +1,11 @@
 use core::marker::PhantomData;
 
-use crate::types::{ManagedBuffer, ManagedVec, SyncCallRawResult, TxEnv};
+use crate::types::{
+    ManagedBuffer, ManagedVec, RHListItem, RHListItemExec, SyncCallRawResult, TxEnv,
+};
 
-use super::{RHListItem, RHListItemExec};
-
-pub struct WithResultRaw<Env, F>
+/// Defines a lambda function to be called on the raw result of the transaction.
+pub struct WithRawResult<Env, F>
 where
     Env: TxEnv,
     F: FnOnce(&ManagedVec<Env::Api, ManagedBuffer<Env::Api>>),
@@ -13,20 +14,20 @@ where
     f: F,
 }
 
-impl<Env, F> WithResultRaw<Env, F>
+impl<Env, F> WithRawResult<Env, F>
 where
     Env: TxEnv,
     F: FnOnce(&ManagedVec<Env::Api, ManagedBuffer<Env::Api>>),
 {
     pub fn new(f: F) -> Self {
-        WithResultRaw {
+        WithRawResult {
             _phantom: PhantomData,
             f,
         }
     }
 }
 
-impl<Env, F, Original> RHListItem<Env, Original> for WithResultRaw<Env, F>
+impl<Env, F, Original> RHListItem<Env, Original> for WithRawResult<Env, F>
 where
     Env: TxEnv,
     F: FnOnce(&ManagedVec<Env::Api, ManagedBuffer<Env::Api>>),
@@ -35,7 +36,7 @@ where
 }
 
 impl<Env, F, Original> RHListItemExec<SyncCallRawResult<Env::Api>, Env, Original>
-    for WithResultRaw<Env, F>
+    for WithRawResult<Env, F>
 where
     Env: TxEnv,
     F: FnOnce(&ManagedVec<Env::Api, ManagedBuffer<Env::Api>>),
diff --git a/framework/base/src/types/interaction/tx_rh_list/with_result_exact.rs b/framework/base/src/types/interaction/tx_result_handler/with_result.rs
similarity index 65%
rename from framework/base/src/types/interaction/tx_rh_list/with_result_exact.rs
rename to framework/base/src/types/interaction/tx_result_handler/with_result.rs
index d3045dca25..800ac30a7a 100644
--- a/framework/base/src/types/interaction/tx_rh_list/with_result_exact.rs
+++ b/framework/base/src/types/interaction/tx_result_handler/with_result.rs
@@ -3,13 +3,14 @@ use core::marker::PhantomData;
 use multiversx_sc_codec::TopDecodeMulti;
 
 use crate::types::{
-    interaction::contract_call_exec::decode_result, ManagedBuffer, ManagedVec, SyncCallRawResult,
-    TxEnv,
+    interaction::contract_call_exec::decode_result, ManagedBuffer, ManagedVec, RHListItem,
+    RHListItemExec, SyncCallRawResult, TxEnv,
 };
 
-use super::{RHListItem, RHListItemExec};
-
-pub struct WithResultExact<T, F>
+/// Defines a lambda function to be called on the decoded result.
+///
+/// Value will be decoded according to the type defined in the smart contract.
+pub struct WithResult<T, F>
 where
     F: FnOnce(T),
 {
@@ -17,19 +18,19 @@ where
     f: F,
 }
 
-impl<T, F> WithResultExact<T, F>
+impl<T, F> WithResult<T, F>
 where
     F: FnOnce(T),
 {
     pub fn new(f: F) -> Self {
-        WithResultExact {
+        WithResult {
             _phantom: PhantomData,
             f,
         }
     }
 }
 
-impl<Env, Original, F> RHListItem<Env, Original> for WithResultExact<Original, F>
+impl<Env, Original, F> RHListItem<Env, Original> for WithResult<Original, F>
 where
     Env: TxEnv,
     F: FnOnce(Original),
@@ -38,7 +39,7 @@ where
 }
 
 impl<Env, Original, F> RHListItemExec<SyncCallRawResult<Env::Api>, Env, Original>
-    for WithResultExact<Original, F>
+    for WithResult<Original, F>
 where
     Env: TxEnv,
     Original: TopDecodeMulti,
diff --git a/framework/base/src/types/interaction/tx_rh_list/with_result_similar.rs b/framework/base/src/types/interaction/tx_result_handler/with_result_conv.rs
similarity index 71%
rename from framework/base/src/types/interaction/tx_rh_list/with_result_similar.rs
rename to framework/base/src/types/interaction/tx_result_handler/with_result_conv.rs
index d2af475447..89831e8283 100644
--- a/framework/base/src/types/interaction/tx_rh_list/with_result_similar.rs
+++ b/framework/base/src/types/interaction/tx_result_handler/with_result_conv.rs
@@ -3,13 +3,14 @@ use core::marker::PhantomData;
 use multiversx_sc_codec::{CodecFrom, TopEncodeMulti};
 
 use crate::types::{
-    interaction::contract_call_exec::decode_result, ManagedBuffer, ManagedVec, SyncCallRawResult,
-    TxEnv,
+    interaction::contract_call_exec::decode_result, ManagedBuffer, ManagedVec, RHListItem,
+    RHListItemExec, SyncCallRawResult, TxEnv,
 };
 
-use super::{RHListItem, RHListItemExec};
-
-pub struct WithResultSimilar<T, F>
+/// Defines a lambda function to be called on the decoded result.
+///
+/// Value will be converted to type `T`, which should be compatible with the original type.
+pub struct WithResultConv<T, F>
 where
     F: FnOnce(T),
 {
@@ -17,19 +18,19 @@ where
     pub f: F,
 }
 
-impl<T, F> WithResultSimilar<T, F>
+impl<T, F> WithResultConv<T, F>
 where
     F: FnOnce(T),
 {
     pub fn new(f: F) -> Self {
-        WithResultSimilar {
+        WithResultConv {
             _phantom: PhantomData,
             f,
         }
     }
 }
 
-impl<Env, Original, T, F> RHListItem<Env, Original> for WithResultSimilar<T, F>
+impl<Env, Original, T, F> RHListItem<Env, Original> for WithResultConv<T, F>
 where
     Env: TxEnv,
     Original: TopEncodeMulti,
@@ -40,7 +41,7 @@ where
 }
 
 impl<Env, Original, T, F> RHListItemExec<SyncCallRawResult<Env::Api>, Env, Original>
-    for WithResultSimilar<T, F>
+    for WithResultConv<T, F>
 where
     Env: TxEnv,
     Original: TopEncodeMulti,
diff --git a/framework/base/src/types/interaction/tx_rh_list.rs b/framework/base/src/types/interaction/tx_rh_list.rs
index 4e0bb4327c..b4ca45bc58 100644
--- a/framework/base/src/types/interaction/tx_rh_list.rs
+++ b/framework/base/src/types/interaction/tx_rh_list.rs
@@ -1,23 +1,7 @@
-mod returns_bt;
-mod returns_exact;
-mod returns_new_address;
-mod returns_raw;
-mod returns_similar;
 mod tx_rh_list_cons;
 mod tx_rh_list_exec;
 mod tx_rh_list_item;
-mod with_result_exact;
-mod with_result_new_address;
-mod with_result_raw;
-mod with_result_similar;
 
-pub use returns_bt::*;
-pub use returns_exact::*;
-pub use returns_new_address::*;
-pub use returns_raw::*;
-pub use returns_similar::*;
 pub use tx_rh_list_cons::*;
 pub use tx_rh_list_exec::*;
 pub use tx_rh_list_item::*;
-pub use with_result_new_address::*;
-pub use with_result_similar::*;
diff --git a/framework/scenario/src/facade/world_tx/scenario_rh_impl.rs b/framework/scenario/src/facade/world_tx/scenario_rh_impl.rs
index b0161b52b8..0471e42786 100644
--- a/framework/scenario/src/facade/world_tx/scenario_rh_impl.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_rh_impl.rs
@@ -1,8 +1,8 @@
 use multiversx_sc::{
     codec::{CodecFrom, TopDecodeMulti, TopEncodeMulti},
     types::{
-        ManagedAddress, RHList, RHListItem, RHListItemExec, ReturnsExact, ReturnsNewAddress,
-        ReturnsSimilar, TxEnv, WithResultNewAddress, WithResultSimilar,
+        ManagedAddress, RHList, RHListItem, RHListItemExec, ReturnsNewAddress, ReturnsResult,
+        ReturnsResultConv, TxEnv, WithNewAddress, WithResultConv,
     },
 };
 
@@ -13,7 +13,7 @@ use crate::{
 
 use super::ScenarioTxEnvData;
 
-impl<Env, Original> RHListItemExec<TxResponse, Env, Original> for ReturnsExact
+impl<Env, Original> RHListItemExec<TxResponse, Env, Original> for ReturnsResult
 where
     Env: TxEnv,
     Original: TopDecodeMulti,
@@ -26,7 +26,7 @@ where
     }
 }
 
-impl<Env, Original, T> RHListItemExec<TxResponse, Env, Original> for ReturnsSimilar<T>
+impl<Env, Original, T> RHListItemExec<TxResponse, Env, Original> for ReturnsResultConv<T>
 where
     Env: TxEnv,
     Original: TopEncodeMulti,
@@ -40,7 +40,7 @@ where
     }
 }
 
-impl<Env, Original, T, F> RHListItemExec<TxResponse, Env, Original> for WithResultSimilar<T, F>
+impl<Env, Original, T, F> RHListItemExec<TxResponse, Env, Original> for WithResultConv<T, F>
 where
     Env: TxEnv,
     Original: TopEncodeMulti,
@@ -70,7 +70,7 @@ where
     }
 }
 
-impl<Env, Original, F> RHListItemExec<TxResponse, Env, Original> for WithResultNewAddress<Env, F>
+impl<Env, Original, F> RHListItemExec<TxResponse, Env, Original> for WithNewAddress<Env, F>
 where
     Env: TxEnv,
     F: FnOnce(&ManagedAddress<Env::Api>),

From 5a1a184f424432fb8bdc6b5492f4cdbc3c2a1a03 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Mon, 25 Mar 2024 18:15:25 +0200
Subject: [PATCH 0552/1254] unified syntax - initial impl of
 EgldOrMultiEsdtPaymentRefs

---
 .../wrapped/egld_or_multi_esdt_payment.rs      | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/framework/base/src/types/managed/wrapped/egld_or_multi_esdt_payment.rs b/framework/base/src/types/managed/wrapped/egld_or_multi_esdt_payment.rs
index bcd4d2cd03..11a8d7ea83 100644
--- a/framework/base/src/types/managed/wrapped/egld_or_multi_esdt_payment.rs
+++ b/framework/base/src/types/managed/wrapped/egld_or_multi_esdt_payment.rs
@@ -33,3 +33,21 @@ impl<M: ManagedTypeApi> EgldOrMultiEsdtPayment<M> {
         }
     }
 }
+
+pub enum EgldOrMultiEsdtPaymentRefs<'a, M: ManagedTypeApi> {
+    Egld(&'a BigUint<M>),
+    MultiEsdt(&'a ManagedVec<M, EsdtTokenPayment<M>>),
+}
+
+impl<M: ManagedTypeApi> EgldOrMultiEsdtPayment<M> {
+    pub fn as_refs(&self) -> EgldOrMultiEsdtPaymentRefs<'_, M> {
+        match self {
+            EgldOrMultiEsdtPayment::Egld(egld_value) => {
+                EgldOrMultiEsdtPaymentRefs::Egld(egld_value)
+            },
+            EgldOrMultiEsdtPayment::MultiEsdt(esdt_payments) => {
+                EgldOrMultiEsdtPaymentRefs::MultiEsdt(esdt_payments)
+            },
+        }
+    }
+}

From 448c5caf159fed961a0b929b13aa83e0016c0539 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Mon, 25 Mar 2024 18:27:45 +0200
Subject: [PATCH 0553/1254] result handler cleanup

---
 .../src/types/interaction/tx_rh_list/tx_rh_list_exec.rs    | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/framework/base/src/types/interaction/tx_rh_list/tx_rh_list_exec.rs b/framework/base/src/types/interaction/tx_rh_list/tx_rh_list_exec.rs
index cc39d08561..b8121d40d8 100644
--- a/framework/base/src/types/interaction/tx_rh_list/tx_rh_list_exec.rs
+++ b/framework/base/src/types/interaction/tx_rh_list/tx_rh_list_exec.rs
@@ -13,13 +13,6 @@ where
     fn item_process_result(self, raw_result: &RawResult) -> Self::Returns;
 }
 
-impl<RawResult, Env, Original> RHListItemExec<RawResult, Env, Original> for ()
-where
-    Env: TxEnv,
-{
-    fn item_process_result(self, _raw_result: &RawResult) -> Self::Returns {}
-}
-
 /// Indicates how result processing will undergo for an ensemble of result handlers.
 pub trait RHListExec<RawResult, Env>: RHList<Env>
 where

From a2f48a52b28900ac60e0fbc59274a4930e69cefd Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Tue, 26 Mar 2024 02:55:53 +0100
Subject: [PATCH 0554/1254] vault generated proxy in forwarder - except upgrade

---
 .../composability/forwarder/src/call_async.rs |  55 ++--
 .../composability/forwarder/src/call_sync.rs  | 103 +++----
 .../forwarder/src/call_transf_exec.rs         |  47 ++--
 .../forwarder/src/contract_change_owner.rs    |  13 +-
 .../forwarder/src/contract_deploy.rs          |  41 ++-
 .../forwarder/src/forwarder_main.rs           |   1 +
 .../forwarder/src/vault_proxy.rs              | 253 ++++++++++++++++++
 .../composability/vault/sc-config.toml        |   1 +
 .../returns_new_token_identifier.rs           |   4 +-
 9 files changed, 412 insertions(+), 106 deletions(-)
 create mode 100644 contracts/feature-tests/composability/forwarder/src/vault_proxy.rs

diff --git a/contracts/feature-tests/composability/forwarder/src/call_async.rs b/contracts/feature-tests/composability/forwarder/src/call_async.rs
index 8826c2db48..04ba78faab 100644
--- a/contracts/feature-tests/composability/forwarder/src/call_async.rs
+++ b/contracts/feature-tests/composability/forwarder/src/call_async.rs
@@ -1,3 +1,5 @@
+use crate::vault_proxy;
+
 multiversx_sc::imports!();
 multiversx_sc::derive_imports!();
 
@@ -14,13 +16,11 @@ const PERCENTAGE_TOTAL: u64 = 10_000; // 100%
 
 #[multiversx_sc::module]
 pub trait ForwarderAsyncCallModule {
-    #[proxy]
-    fn vault_proxy(&self) -> vault::Proxy<Self::Api>;
-
     #[endpoint]
     fn echo_args_async(&self, to: ManagedAddress, args: MultiValueEncoded<ManagedBuffer>) {
-        self.vault_proxy()
-            .contract(to)
+        self.tx()
+            .to(&to)
+            .typed(vault_proxy::VaultProxy)
             .echo_arguments(args)
             .async_call()
             .with_callback(self.callbacks().echo_args_callback())
@@ -57,8 +57,9 @@ pub trait ForwarderAsyncCallModule {
     #[payable("*")]
     fn forward_async_accept_funds(&self, to: ManagedAddress) {
         let payment = self.call_value().egld_or_single_esdt();
-        self.vault_proxy()
-            .contract(to)
+        self.tx()
+            .to(&to)
+            .typed(vault_proxy::VaultProxy)
             .accept_funds()
             .with_egld_or_single_esdt_transfer(payment)
             .async_call()
@@ -70,8 +71,9 @@ pub trait ForwarderAsyncCallModule {
     fn forward_async_accept_funds_half_payment(&self, to: ManagedAddress) {
         let payment = self.call_value().egld_or_single_esdt();
         let half_payment = payment.amount / 2u32;
-        self.vault_proxy()
-            .contract(to)
+        self.tx()
+            .to(&to)
+            .typed(vault_proxy::VaultProxy)
             .accept_funds()
             .with_egld_or_single_esdt_transfer((
                 payment.token_identifier,
@@ -89,8 +91,9 @@ pub trait ForwarderAsyncCallModule {
         let fees = &payment.amount * &percentage_fees / PERCENTAGE_TOTAL;
         let amount_to_send = &payment.amount - &fees;
 
-        self.vault_proxy()
-            .contract(to)
+        self.tx()
+            .to(&to)
+            .typed(vault_proxy::VaultProxy)
             .accept_funds()
             .with_egld_or_single_esdt_transfer((
                 payment.token_identifier,
@@ -109,8 +112,9 @@ pub trait ForwarderAsyncCallModule {
         token_nonce: u64,
         amount: BigUint,
     ) {
-        self.vault_proxy()
-            .contract(to)
+        self.tx()
+            .to(&to)
+            .typed(vault_proxy::VaultProxy)
             .retrieve_funds(token, token_nonce, amount)
             .async_call()
             .with_callback(self.callbacks().retrieve_funds_callback())
@@ -146,16 +150,17 @@ pub trait ForwarderAsyncCallModule {
         token_identifier: &EgldOrEsdtTokenIdentifier,
         amount: &BigUint,
     ) {
-        self.vault_proxy()
-            .contract(to.clone())
+        self.tx()
+            .to(to)
+            .typed(vault_proxy::VaultProxy)
             .accept_funds()
-            .with_egld_or_single_esdt_transfer((token_identifier.clone(), 0, amount.clone()))
+            .with_egld_or_single_esdt_transfer((token_identifier.clone(), 0u64, amount.clone()))
             .async_call()
             .with_callback(
                 self.callbacks()
                     .send_funds_twice_callback(to, token_identifier, amount),
             )
-            .call_and_exit()
+            .call_and_exit();
     }
 
     #[callback]
@@ -165,12 +170,13 @@ pub trait ForwarderAsyncCallModule {
         token_identifier: &EgldOrEsdtTokenIdentifier,
         cb_amount: &BigUint,
     ) {
-        self.vault_proxy()
-            .contract(to.clone())
+        self.tx()
+            .to(to)
+            .typed(vault_proxy::VaultProxy)
             .accept_funds()
-            .with_egld_or_single_esdt_transfer((token_identifier.clone(), 0, cb_amount.clone()))
+            .with_egld_or_single_esdt_transfer((token_identifier.clone(), 0u64, cb_amount.clone()))
             .async_call()
-            .call_and_exit()
+            .call_and_exit();
     }
 
     #[endpoint]
@@ -188,12 +194,13 @@ pub trait ForwarderAsyncCallModule {
             all_token_payments.push(payment);
         }
 
-        self.vault_proxy()
-            .contract(to)
+        self.tx()
+            .to(&to)
+            .typed(vault_proxy::VaultProxy)
             .accept_funds()
             .with_multi_token_transfer(all_token_payments)
             .async_call()
-            .call_and_exit()
+            .call_and_exit();
     }
 
     #[view]
diff --git a/contracts/feature-tests/composability/forwarder/src/call_sync.rs b/contracts/feature-tests/composability/forwarder/src/call_sync.rs
index 67d923936e..d2b32e1913 100644
--- a/contracts/feature-tests/composability/forwarder/src/call_sync.rs
+++ b/contracts/feature-tests/composability/forwarder/src/call_sync.rs
@@ -1,23 +1,24 @@
+use crate::vault_proxy;
+
 multiversx_sc::imports!();
 
 const PERCENTAGE_TOTAL: u64 = 10_000; // 100%
 
 #[multiversx_sc::module]
 pub trait ForwarderSyncCallModule {
-    #[proxy]
-    fn vault_proxy(&self) -> vault::Proxy<Self::Api>;
-
     #[endpoint]
     #[payable("*")]
     fn echo_arguments_sync(&self, to: ManagedAddress, args: MultiValueEncoded<ManagedBuffer>) {
         let half_gas = self.blockchain().get_gas_left() / 2;
 
-        let result: MultiValueEncoded<ManagedBuffer> = self
-            .vault_proxy()
-            .contract(to)
-            .echo_arguments(args)
+        let result = self
+            .tx()
+            .to(&to)
             .with_gas_limit(half_gas)
-            .execute_on_dest_context();
+            .typed(vault_proxy::VaultProxy)
+            .echo_arguments(args)
+            .returns(ReturnsExact)
+            .sync_call();
 
         self.execute_on_dest_context_result_event(&result.into_vec_of_buffers());
     }
@@ -31,21 +32,25 @@ pub trait ForwarderSyncCallModule {
     ) {
         let one_third_gas = self.blockchain().get_gas_left() / 3;
 
-        let result: MultiValueEncoded<ManagedBuffer> = self
-            .vault_proxy()
-            .contract(to.clone())
-            .echo_arguments(&args)
+        let result = self
+            .tx()
+            .to(&to)
             .with_gas_limit(one_third_gas)
-            .execute_on_dest_context();
+            .typed(vault_proxy::VaultProxy)
+            .echo_arguments(args.clone())
+            .returns(ReturnsExact)
+            .sync_call();
 
         self.execute_on_dest_context_result_event(&result.into_vec_of_buffers());
 
-        let result: MultiValueEncoded<ManagedBuffer> = self
-            .vault_proxy()
-            .contract(to)
-            .echo_arguments(&args)
+        let result = self
+            .tx()
+            .to(&to)
             .with_gas_limit(one_third_gas)
-            .execute_on_dest_context();
+            .typed(vault_proxy::VaultProxy)
+            .echo_arguments(args)
+            .returns(ReturnsExact)
+            .sync_call();
 
         self.execute_on_dest_context_result_event(&result.into_vec_of_buffers());
     }
@@ -59,13 +64,16 @@ pub trait ForwarderSyncCallModule {
         let payment = self.call_value().egld_or_single_esdt();
         let half_gas = self.blockchain().get_gas_left() / 2;
 
-        let result: MultiValue2<BigUint, MultiValueEncoded<EsdtTokenPaymentMultiValue>> = self
-            .vault_proxy()
-            .contract(to)
+        let result = self
+            .tx()
+            .to(&to)
+            .with_gas_limit(half_gas)
+            .typed(vault_proxy::VaultProxy)
             .accept_funds_echo_payment()
             .with_egld_or_single_esdt_transfer(payment)
-            .with_gas_limit(half_gas)
-            .execute_on_dest_context();
+            .returns(ReturnsExact)
+            .sync_call();
+
         let (egld_value, esdt_transfers_multi) = result.into_tuple();
 
         self.accept_funds_sync_result_event(&egld_value, &esdt_transfers_multi);
@@ -78,12 +86,13 @@ pub trait ForwarderSyncCallModule {
         let fees = &payment * &percentage_fees / PERCENTAGE_TOTAL;
         let amount_to_send = payment - fees;
 
-        let () = self
-            .vault_proxy()
-            .contract(to)
+        self.tx()
+            .to(&to)
+            .typed(vault_proxy::VaultProxy)
             .accept_funds()
-            .with_egld_or_single_esdt_transfer((token_id, 0, amount_to_send))
-            .execute_on_dest_context();
+            .with_egld_or_single_esdt_transfer((token_id, 0u64, amount_to_send))
+            .returns(ReturnsExact)
+            .sync_call();
     }
 
     #[event("accept_funds_sync_result")]
@@ -97,17 +106,19 @@ pub trait ForwarderSyncCallModule {
     #[payable("*")]
     fn forward_sync_accept_funds_then_read(&self, to: ManagedAddress) -> usize {
         let payment = self.call_value().egld_or_single_esdt();
-        self.vault_proxy()
-            .contract(to.clone())
+        self.tx()
+            .to(&to)
+            .typed(vault_proxy::VaultProxy)
             .accept_funds()
             .with_egld_or_single_esdt_transfer(payment)
-            .execute_on_dest_context::<()>();
+            .sync_call();
 
-        self.vault_proxy()
-            .contract(to)
+        self.tx()
+            .to(&to)
+            .typed(vault_proxy::VaultProxy)
             .call_counts(b"accept_funds")
-            .execute_on_dest_context::<SingleValue<usize>>()
-            .into()
+            .returns(ReturnsExact)
+            .sync_call()
     }
 
     #[endpoint]
@@ -118,10 +129,11 @@ pub trait ForwarderSyncCallModule {
         token_nonce: u64,
         amount: BigUint,
     ) {
-        self.vault_proxy()
-            .contract(to)
+        self.tx()
+            .to(&to)
+            .typed(vault_proxy::VaultProxy)
             .retrieve_funds(token, token_nonce, amount)
-            .execute_on_dest_context::<()>();
+            .sync_call();
     }
 
     #[payable("*")]
@@ -134,15 +146,16 @@ pub trait ForwarderSyncCallModule {
     ) {
         let payments = self.call_value().all_esdt_transfers();
 
-        self.vault_proxy()
-            .contract(to)
+        self.tx()
+            .to(&to)
+            .typed(vault_proxy::VaultProxy)
             .retrieve_funds_with_transfer_exec(
                 token,
                 amount,
                 OptionalValue::<ManagedBuffer>::Some(b"accept_funds_func".into()),
             )
             .with_multi_token_transfer(payments.clone_value())
-            .execute_on_dest_context::<()>();
+            .sync_call();
     }
 
     #[payable("*")]
@@ -163,11 +176,11 @@ pub trait ForwarderSyncCallModule {
             all_token_payments.push(payment);
         }
 
-        let () = self
-            .vault_proxy()
-            .contract(to)
+        self.tx()
+            .to(&to)
+            .typed(vault_proxy::VaultProxy)
             .accept_funds()
             .with_multi_token_transfer(all_token_payments)
-            .execute_on_dest_context();
+            .sync_call();
     }
 }
diff --git a/contracts/feature-tests/composability/forwarder/src/call_transf_exec.rs b/contracts/feature-tests/composability/forwarder/src/call_transf_exec.rs
index e402ea5316..3573987867 100644
--- a/contracts/feature-tests/composability/forwarder/src/call_transf_exec.rs
+++ b/contracts/feature-tests/composability/forwarder/src/call_transf_exec.rs
@@ -1,18 +1,18 @@
+use crate::vault_proxy;
+
 multiversx_sc::imports!();
 
 const PERCENTAGE_TOTAL: u64 = 10_000; // 100%
 
 #[multiversx_sc::module]
 pub trait ForwarderTransferExecuteModule {
-    #[proxy]
-    fn vault_proxy(&self) -> vault::Proxy<Self::Api>;
-
     #[endpoint]
     #[payable("*")]
     fn forward_transf_exec_accept_funds(&self, to: ManagedAddress) {
         let payment = self.call_value().egld_or_single_esdt();
-        self.vault_proxy()
-            .contract(to)
+        self.tx()
+            .to(&to)
+            .typed(vault_proxy::VaultProxy)
             .accept_funds()
             .with_egld_or_single_esdt_transfer(payment)
             .transfer_execute();
@@ -29,10 +29,11 @@ pub trait ForwarderTransferExecuteModule {
         let fees = &payment * &percentage_fees / PERCENTAGE_TOTAL;
         let amount_to_send = payment - fees;
 
-        self.vault_proxy()
-            .contract(to)
+        self.tx()
+            .to(&to)
+            .typed(vault_proxy::VaultProxy)
             .accept_funds()
-            .with_egld_or_single_esdt_transfer((token_id, 0, amount_to_send))
+            .with_egld_or_single_esdt_transfer((token_id, 0u64, amount_to_send))
             .transfer_execute();
     }
 
@@ -43,15 +44,17 @@ pub trait ForwarderTransferExecuteModule {
         let half_payment = payment / 2u32;
         let half_gas = self.blockchain().get_gas_left() / 2;
 
-        self.vault_proxy()
-            .contract(to.clone())
+        self.tx()
+            .to(&to)
+            .typed(vault_proxy::VaultProxy)
             .accept_funds()
             .with_egld_or_single_esdt_transfer((token.clone(), token_nonce, half_payment.clone()))
             .with_gas_limit(half_gas)
             .transfer_execute();
 
-        self.vault_proxy()
-            .contract(to)
+        self.tx()
+            .to(&to)
+            .typed(vault_proxy::VaultProxy)
             .accept_funds()
             .with_egld_or_single_esdt_transfer((token, token_nonce, half_payment))
             .with_gas_limit(half_gas)
@@ -70,8 +73,9 @@ pub trait ForwarderTransferExecuteModule {
         let payment_token = payment.token_identifier.clone();
         let gas_left_before = self.blockchain().get_gas_left();
 
-        self.vault_proxy()
-            .contract(to)
+        self.tx()
+            .to(&to)
+            .typed(vault_proxy::VaultProxy)
             .accept_funds()
             .with_egld_or_single_esdt_transfer(payment)
             .transfer_execute();
@@ -102,8 +106,9 @@ pub trait ForwarderTransferExecuteModule {
             all_token_payments.push(payment);
         }
 
-        self.vault_proxy()
-            .contract(to)
+        self.tx()
+            .to(&to)
+            .typed(vault_proxy::VaultProxy)
             .accept_funds()
             .with_multi_token_transfer(all_token_payments)
             .transfer_execute()
@@ -124,8 +129,9 @@ pub trait ForwarderTransferExecuteModule {
             all_token_payments.push(payment);
         }
 
-        self.vault_proxy()
-            .contract(to)
+        self.tx()
+            .to(&to)
+            .typed(vault_proxy::VaultProxy)
             .accept_funds()
             .with_multi_token_transfer(all_token_payments)
             .transfer_execute()
@@ -146,8 +152,9 @@ pub trait ForwarderTransferExecuteModule {
             all_token_payments.push(payment);
         }
 
-        self.vault_proxy()
-            .contract(to)
+        self.tx()
+            .to(&to)
+            .typed(vault_proxy::VaultProxy)
             .reject_funds()
             .with_multi_token_transfer(all_token_payments)
             .transfer_execute()
diff --git a/contracts/feature-tests/composability/forwarder/src/contract_change_owner.rs b/contracts/feature-tests/composability/forwarder/src/contract_change_owner.rs
index 8c5a140e8d..2e1247d9f7 100644
--- a/contracts/feature-tests/composability/forwarder/src/contract_change_owner.rs
+++ b/contracts/feature-tests/composability/forwarder/src/contract_change_owner.rs
@@ -1,10 +1,9 @@
+use crate::vault_proxy;
+
 multiversx_sc::imports!();
 
 #[multiversx_sc::module]
 pub trait ChangeOwnerModule {
-    #[proxy]
-    fn vault_proxy(&self) -> vault::Proxy<Self::Api>;
-
     #[endpoint(changeOwnerAddress)]
     fn change_owner(
         &self,
@@ -20,9 +19,11 @@ pub trait ChangeOwnerModule {
     }
 
     fn get_owner_of_vault_contract(&self, address: ManagedAddress) -> ManagedAddress {
-        self.vault_proxy()
-            .contract(address)
+        self.tx()
+            .to(&address)
+            .typed(vault_proxy::VaultProxy)
             .get_owner_address()
-            .execute_on_dest_context()
+            .returns(ReturnsExact)
+            .sync_call()
     }
 }
diff --git a/contracts/feature-tests/composability/forwarder/src/contract_deploy.rs b/contracts/feature-tests/composability/forwarder/src/contract_deploy.rs
index d573b45ec0..aefdfb55c0 100644
--- a/contracts/feature-tests/composability/forwarder/src/contract_deploy.rs
+++ b/contracts/feature-tests/composability/forwarder/src/contract_deploy.rs
@@ -1,10 +1,9 @@
+use crate::vault_proxy;
+
 multiversx_sc::imports!();
 
 #[multiversx_sc::module]
 pub trait DeployContractModule {
-    #[proxy]
-    fn vault_proxy(&self) -> vault::Proxy<Self::Api>;
-
     #[endpoint]
     fn deploy_contract(
         &self,
@@ -36,9 +35,22 @@ pub trait DeployContractModule {
         code: &ManagedBuffer,
         opt_arg: OptionalValue<ManagedBuffer>,
     ) -> (ManagedAddress, OptionalValue<ManagedBuffer>) {
-        self.vault_proxy()
+        let (new_address, response_vec) = self
+            .tx()
+            .typed(vault_proxy::VaultProxy)
             .init(opt_arg)
-            .deploy_contract(code, CodeMetadata::DEFAULT)
+            .code(code.clone())
+            .returns(ReturnsNewAddress)
+            .returns(ReturnsRaw)
+            .sync_call();
+
+        let response = if response_vec.is_empty() {
+            OptionalValue::None
+        } else {
+            OptionalValue::Some(response_vec.get(0).clone_value())
+        };
+
+        (new_address, response)
     }
 
     #[endpoint]
@@ -47,9 +59,22 @@ pub trait DeployContractModule {
         source_address: ManagedAddress,
         opt_arg: OptionalValue<ManagedBuffer>,
     ) -> MultiValue2<ManagedAddress, OptionalValue<ManagedBuffer>> {
-        self.vault_proxy()
+        let (new_address, response_vec) = self
+            .tx()
+            .typed(vault_proxy::VaultProxy)
             .init(opt_arg)
-            .deploy_from_source(&source_address, CodeMetadata::DEFAULT)
-            .into()
+            .code_metadata(CodeMetadata::DEFAULT)
+            .from_source(source_address)
+            .returns(ReturnsNewAddress)
+            .returns(ReturnsRaw)
+            .sync_call();
+
+        let response = if response_vec.is_empty() {
+            OptionalValue::None
+        } else {
+            OptionalValue::Some(response_vec.get(0).clone_value())
+        };
+
+        MultiValue2::from((new_address, response))
     }
 }
diff --git a/contracts/feature-tests/composability/forwarder/src/forwarder_main.rs b/contracts/feature-tests/composability/forwarder/src/forwarder_main.rs
index ee8403fd9a..61dcbad468 100644
--- a/contracts/feature-tests/composability/forwarder/src/forwarder_main.rs
+++ b/contracts/feature-tests/composability/forwarder/src/forwarder_main.rs
@@ -13,6 +13,7 @@ pub mod nft;
 pub mod roles;
 pub mod sft;
 pub mod storage;
+pub mod vault_proxy;
 
 multiversx_sc::imports!();
 
diff --git a/contracts/feature-tests/composability/forwarder/src/vault_proxy.rs b/contracts/feature-tests/composability/forwarder/src/vault_proxy.rs
new file mode 100644
index 0000000000..f1c9e2127a
--- /dev/null
+++ b/contracts/feature-tests/composability/forwarder/src/vault_proxy.rs
@@ -0,0 +1,253 @@
+////////////////////////////////////////////////////
+////////////////// AUTO-GENERATED //////////////////
+////////////////////////////////////////////////////
+
+#![allow(clippy::all)]
+
+use multiversx_sc::proxy_imports::*;
+
+pub struct VaultProxy;
+
+impl<Env, From, To, Gas> TxProxyTrait<Env, From, To, Gas> for VaultProxy
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    type TxProxyMethods = VaultProxyMethods<Env, From, To, Gas>;
+
+    fn proxy_methods(self, tx: Tx<Env, From, To, (), Gas, (), ()>) -> Self::TxProxyMethods {
+        VaultProxyMethods { wrapped_tx: tx }
+    }
+}
+
+pub struct VaultProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    wrapped_tx: Tx<Env, From, To, (), Gas, (), ()>,
+}
+
+#[rustfmt::skip]
+impl<Env, From, Gas> VaultProxyMethods<Env, From, (), Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn init<
+        Arg0: CodecInto<OptionalValue<ManagedBuffer<Env::Api>>>,
+    >(
+        self,
+        opt_arg_to_echo: Arg0,
+    ) -> TxProxyDeploy<Env, From, Gas, OptionalValue<ManagedBuffer<Env::Api>>> {
+        self.wrapped_tx
+            .raw_deploy()
+            .argument(&opt_arg_to_echo)
+            .original_result()
+    }
+}
+
+#[rustfmt::skip]
+impl<Env, From, To, Gas> VaultProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn echo_arguments<
+        Arg0: CodecInto<MultiValueEncoded<Env::Api, ManagedBuffer<Env::Api>>>,
+    >(
+        self,
+        args: Arg0,
+    ) -> TxProxyCall<Env, From, To, Gas, MultiValueEncoded<Env::Api, ManagedBuffer<Env::Api>>> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("echo_arguments")
+            .argument(&args)
+            .original_result()
+    }
+
+    pub fn echo_arguments_without_storage<
+        Arg0: CodecInto<MultiValueEncoded<Env::Api, ManagedBuffer<Env::Api>>>,
+    >(
+        self,
+        args: Arg0,
+    ) -> TxProxyCall<Env, From, To, Gas, MultiValueEncoded<Env::Api, ManagedBuffer<Env::Api>>> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("echo_arguments_without_storage")
+            .argument(&args)
+            .original_result()
+    }
+
+    pub fn echo_caller(
+        self,
+    ) -> TxProxyCall<Env, From, To, Gas, ManagedAddress<Env::Api>> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("echo_caller")
+            .original_result()
+    }
+
+    pub fn accept_funds(
+        self,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("accept_funds")
+            .original_result()
+    }
+
+    pub fn accept_funds_echo_payment(
+        self,
+    ) -> TxProxyCall<Env, From, To, Gas, MultiValue2<BigUint<Env::Api>, MultiValueEncoded<Env::Api, EsdtTokenPaymentMultiValue<Env::Api>>>> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("accept_funds_echo_payment")
+            .original_result()
+    }
+
+    pub fn accept_funds_single_esdt_transfer(
+        self,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("accept_funds_single_esdt_transfer")
+            .original_result()
+    }
+
+    pub fn reject_funds(
+        self,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("reject_funds")
+            .original_result()
+    }
+
+    pub fn retrieve_funds_with_transfer_exec<
+        Arg0: CodecInto<TokenIdentifier<Env::Api>>,
+        Arg1: CodecInto<BigUint<Env::Api>>,
+        Arg2: CodecInto<OptionalValue<ManagedBuffer<Env::Api>>>,
+    >(
+        self,
+        token: Arg0,
+        amount: Arg1,
+        opt_receive_func: Arg2,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("retrieve_funds_with_transfer_exec")
+            .argument(&token)
+            .argument(&amount)
+            .argument(&opt_receive_func)
+            .original_result()
+    }
+
+    pub fn retrieve_funds_promises<
+        Arg0: CodecInto<OptionalValue<u64>>,
+        Arg1: CodecInto<OptionalValue<BigUint<Env::Api>>>,
+    >(
+        self,
+        back_transfers: Arg0,
+        back_transfer_value: Arg1,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("retrieve_funds_promises")
+            .argument(&back_transfers)
+            .argument(&back_transfer_value)
+            .original_result()
+    }
+
+    pub fn retrieve_funds<
+        Arg0: CodecInto<EgldOrEsdtTokenIdentifier<Env::Api>>,
+        Arg1: CodecInto<u64>,
+        Arg2: CodecInto<BigUint<Env::Api>>,
+    >(
+        self,
+        token: Arg0,
+        nonce: Arg1,
+        amount: Arg2,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("retrieve_funds")
+            .argument(&token)
+            .argument(&nonce)
+            .argument(&amount)
+            .original_result()
+    }
+
+    pub fn retrieve_multi_funds_async<
+        Arg0: CodecInto<MultiValueEncoded<Env::Api, MultiValue3<TokenIdentifier<Env::Api>, u64, BigUint<Env::Api>>>>,
+    >(
+        self,
+        token_payments: Arg0,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("retrieve_multi_funds_async")
+            .argument(&token_payments)
+            .original_result()
+    }
+
+    pub fn burn_and_create_retrive_async(
+        self,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("burn_and_create_retrive_async")
+            .original_result()
+    }
+
+    pub fn get_owner_address(
+        self,
+    ) -> TxProxyCall<Env, From, To, Gas, ManagedAddress<Env::Api>> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("get_owner_address")
+            .original_result()
+    }
+
+    /// We already leave a trace of the calls using the event logs; 
+    /// this additional counter has the role of showing that storage also gets saved correctly. 
+    pub fn call_counts<
+        Arg0: CodecInto<ManagedBuffer<Env::Api>>,
+    >(
+        self,
+        endpoint: Arg0,
+    ) -> TxProxyCall<Env, From, To, Gas, usize> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("call_counts")
+            .argument(&endpoint)
+            .original_result()
+    }
+
+    pub fn num_called_retrieve_funds_promises(
+        self,
+    ) -> TxProxyCall<Env, From, To, Gas, usize> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("num_called_retrieve_funds_promises")
+            .original_result()
+    }
+
+    pub fn num_async_calls_sent_from_child(
+        self,
+    ) -> TxProxyCall<Env, From, To, Gas, usize> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("num_async_calls_sent_from_child")
+            .original_result()
+    }
+}
diff --git a/contracts/feature-tests/composability/vault/sc-config.toml b/contracts/feature-tests/composability/vault/sc-config.toml
index f0d4da2f02..33b8945873 100644
--- a/contracts/feature-tests/composability/vault/sc-config.toml
+++ b/contracts/feature-tests/composability/vault/sc-config.toml
@@ -1,5 +1,6 @@
 [settings]
 main = "main"
+proxy-paths = ["../forwarder/src/vault_proxy.rs"]
 
 [contracts.main]
 name = "vault"
diff --git a/framework/base/src/types/interaction/tx_rh_list/returns_new_token_identifier.rs b/framework/base/src/types/interaction/tx_rh_list/returns_new_token_identifier.rs
index c1a4af47d1..5e8169df92 100644
--- a/framework/base/src/types/interaction/tx_rh_list/returns_new_token_identifier.rs
+++ b/framework/base/src/types/interaction/tx_rh_list/returns_new_token_identifier.rs
@@ -3,12 +3,10 @@ use crate::{
     proxy_imports::TokenIdentifier,
     types::{
         interaction::tx_call_deploy::RHListItemDeploy, BackTransfers, ManagedAddress,
-        ManagedBuffer, ManagedVec, RHListItemSync, TxEnv,
+        ManagedBuffer, ManagedVec, RHListItem, RHListItemSync, TxEnv,
     },
 };
 
-use super::RHListItem;
-
 pub struct ReturnsNewTokenIdentifier;
 
 impl<Env, Original> RHListItem<Env, Original> for ReturnsNewTokenIdentifier

From dcd48415b5df41c529a96c958bf17948501ca2f8 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 26 Mar 2024 10:28:20 +0200
Subject: [PATCH 0555/1254] Result handlers folder in scenario

---
 framework/scenario/src/facade.rs                              | 1 +
 framework/scenario/src/facade/result_handlers.rs              | 3 +++
 .../{world_tx => result_handlers}/with_tx_raw_response.rs     | 4 ----
 framework/scenario/src/facade/world_tx.rs                     | 2 --
 framework/scenario/src/lib.rs                                 | 2 +-
 5 files changed, 5 insertions(+), 7 deletions(-)
 create mode 100644 framework/scenario/src/facade/result_handlers.rs
 rename framework/scenario/src/facade/{world_tx => result_handlers}/with_tx_raw_response.rs (91%)

diff --git a/framework/scenario/src/facade.rs b/framework/scenario/src/facade.rs
index 51989165df..a37265e0b4 100644
--- a/framework/scenario/src/facade.rs
+++ b/framework/scenario/src/facade.rs
@@ -1,5 +1,6 @@
 mod contract_info;
 mod debugger_backend;
+pub(crate) mod result_handlers;
 mod scenario_world;
 mod scenario_world_runner;
 mod scenario_world_steps;
diff --git a/framework/scenario/src/facade/result_handlers.rs b/framework/scenario/src/facade/result_handlers.rs
new file mode 100644
index 0000000000..6bb2de8216
--- /dev/null
+++ b/framework/scenario/src/facade/result_handlers.rs
@@ -0,0 +1,3 @@
+mod with_tx_raw_response;
+
+pub use with_tx_raw_response::WithRawTxResponse;
diff --git a/framework/scenario/src/facade/world_tx/with_tx_raw_response.rs b/framework/scenario/src/facade/result_handlers/with_tx_raw_response.rs
similarity index 91%
rename from framework/scenario/src/facade/world_tx/with_tx_raw_response.rs
rename to framework/scenario/src/facade/result_handlers/with_tx_raw_response.rs
index 512338aab8..f67d3b0f48 100644
--- a/framework/scenario/src/facade/world_tx/with_tx_raw_response.rs
+++ b/framework/scenario/src/facade/result_handlers/with_tx_raw_response.rs
@@ -1,5 +1,3 @@
-use core::marker::PhantomData;
-
 use multiversx_sc::{
     codec::TopDecodeMulti,
     types::{RHListItem, RHListItemExec, TxEnv},
@@ -7,8 +5,6 @@ use multiversx_sc::{
 
 use crate::scenario_model::TxResponse;
 
-use super::ScenarioTxEnvData;
-
 /// Wraps a closure that handles a `TxResponse` object.
 pub struct WithRawTxResponse<F>(pub F)
 where
diff --git a/framework/scenario/src/facade/world_tx.rs b/framework/scenario/src/facade/world_tx.rs
index 4a6fd86317..0ccbdd9514 100644
--- a/framework/scenario/src/facade/world_tx.rs
+++ b/framework/scenario/src/facade/world_tx.rs
@@ -7,10 +7,8 @@ mod scenario_env_exec;
 mod scenario_env_query;
 pub mod scenario_env_util;
 mod scenario_rh_impl;
-mod with_tx_raw_response;
 
 pub use expr::*;
 pub use scenario_env::*;
 pub use scenario_env_exec::ScenarioEnvExec;
 pub use scenario_env_query::ScenarioEnvQuery;
-pub use with_tx_raw_response::WithRawTxResponse;
diff --git a/framework/scenario/src/lib.rs b/framework/scenario/src/lib.rs
index 1fb9b4c63e..64229851af 100644
--- a/framework/scenario/src/lib.rs
+++ b/framework/scenario/src/lib.rs
@@ -39,7 +39,7 @@ pub use crate::scenario as mandos_system;
 // Re-exporting the whole mandos crate for easier use in tests.
 pub use multiversx_chain_scenario_format as scenario_format;
 
-pub use facade::{world_tx::*, ContractInfo, ScenarioWorld, WhiteboxContract};
+pub use facade::{result_handlers::*, world_tx::*, ContractInfo, ScenarioWorld, WhiteboxContract};
 
 use std::path::Path;
 

From e83cb660db4a0595a700a6d5e8a98c5939676013 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 26 Mar 2024 10:46:23 +0200
Subject: [PATCH 0556/1254] renamed adder unit test

---
 .../examples/adder/tests/{adder_test.rs => adder_unit_test.rs}    | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename contracts/examples/adder/tests/{adder_test.rs => adder_unit_test.rs} (100%)

diff --git a/contracts/examples/adder/tests/adder_test.rs b/contracts/examples/adder/tests/adder_unit_test.rs
similarity index 100%
rename from contracts/examples/adder/tests/adder_test.rs
rename to contracts/examples/adder/tests/adder_unit_test.rs

From cb303813b635d9e8c04bb85750bbe7e0ff684655 Mon Sep 17 00:00:00 2001
From: Laurentiu Ciobanu <laurentiu.ciobanu@multiversx.com>
Date: Tue, 26 Mar 2024 16:29:43 +0200
Subject: [PATCH 0557/1254] use shared sc-actions test-coverage job

---
 .github/workflows/actions.yml | 59 +++--------------------------------
 1 file changed, 4 insertions(+), 55 deletions(-)

diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
index a2aa85a4ee..278e4e30df 100644
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -14,63 +14,12 @@ permissions:
 jobs:
   contracts:
     name: Contracts
-    uses: multiversx/mx-sc-actions/.github/workflows/contracts.yml@v3.0.0
+    #    uses: multiversx/mx-sc-actions/.github/workflows/contracts.yml@v3.0.0
+    uses: multiversx/mx-sc-actions/.github/workflows/contracts.yml@3c37e52a9de8f4111f823da0b2412f1fc55b7d30
     with:
       rust-toolchain: nightly-2023-12-11
       path-to-sc-meta: framework/meta
       mx-scenario-go-version: v2.1.0-alpha
+      coverage-args: --ignore-filename-regex='meta/src' --ignore-filename-regex='wasm-adapter' --ignore-filename-regex='benchmarks/' --ignore-filename-regex='tests/' --output ./coverage.md
     secrets:
-      token: ${{ secrets.GITHUB_TOKEN }}
-
-  test_coverage:
-    name: Test Coverage
-    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
-
-      - name: Install prerequisites
-        run: |
-          rustup component add llvm-tools-preview
-          dirname $(find ~/.rustup -name llvm-cov) >> $GITHUB_PATH
-
-          echo $(dirname $(find ~/.rustup -name llvm-cov))
-
-      - name: Run tests and generate report
-        env:
-          RUSTFLAGS: ""
-        run: |
-          cargo run --bin sc-meta test-coverage \
-            --ignore-filename-regex='meta/src' \
-            --ignore-filename-regex='wasm-adapter' \
-            --ignore-filename-regex='benchmarks/' \
-            --ignore-filename-regex='tests/' \
-            --output ./coverage.md
-
-      - name: Upload the report
-        uses: actions/upload-artifact@v3
-        with:
-          name: coverage
-          path: coverage.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: "Coverage Summary"
-
-      - 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-file: ./coverage.md
-          edit-mode: replace
+      token: ${{ secrets.GITHUB_TOKEN }}
\ No newline at end of file

From 38e6794bfb4c5273f1d0cb4e9d33055390bedecc Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Tue, 26 Mar 2024 19:24:10 +0200
Subject: [PATCH 0558/1254] unified sytax - integrate in Tx

---
 framework/base/src/types/interaction/tx.rs    | 32 ++++++-
 .../base/src/types/interaction/tx_payment.rs  |  1 +
 .../tx_payment_egld_or_multi_esdt.rs          | 93 +++++++++++++++++++
 .../tx_payment/tx_payment_single_esdt_ref.rs  |  4 +-
 .../wrapped/egld_or_multi_esdt_payment.rs     | 21 +++++
 .../base/src/types/managed/wrapped/mod.rs     |  2 +-
 6 files changed, 149 insertions(+), 4 deletions(-)
 create mode 100644 framework/base/src/types/interaction/tx_payment/tx_payment_egld_or_multi_esdt.rs

diff --git a/framework/base/src/types/interaction/tx.rs b/framework/base/src/types/interaction/tx.rs
index 583e038625..1251dc656c 100644
--- a/framework/base/src/types/interaction/tx.rs
+++ b/framework/base/src/types/interaction/tx.rs
@@ -1,7 +1,7 @@
 use crate::{
     api::CallTypeApi,
     contract_base::BlockchainWrapper,
-    proxy_imports::{EsdtTokenPaymentRefs, TokenIdentifier},
+    proxy_imports::{EgldOrMultiEsdtPaymentRefs, EsdtTokenPaymentRefs, TokenIdentifier},
     types::{
         BigUint, CodeMetadata, EgldOrEsdtTokenPayment, EsdtTokenPayment, ManagedAddress,
         ManagedBuffer, ManagedOption, ManagedVec, MultiEsdtPayment,
@@ -260,6 +260,36 @@ where
         }
     }
 
+    pub fn egld_ref(
+        self,
+        amount: &BigUint<Env::Api>,
+    ) -> Tx<Env, From, To, EgldOrMultiEsdtPaymentRefs<'_, Env::Api>, Gas, Data, RH> {
+        Tx {
+            env: self.env,
+            from: self.from,
+            to: self.to,
+            payment: EgldOrMultiEsdtPaymentRefs::Egld(amount),
+            gas: self.gas,
+            data: self.data,
+            result_handler: self.result_handler,
+        }
+    }
+
+    pub fn mult_esdt_payment_ref(
+        self,
+        amount: &ManagedVec<Env::Api, EsdtTokenPayment<Env::Api>>,
+    ) -> Tx<Env, From, To, EgldOrMultiEsdtPaymentRefs<'_, Env::Api>, Gas, Data, RH> {
+        Tx {
+            env: self.env,
+            from: self.from,
+            to: self.to,
+            payment: EgldOrMultiEsdtPaymentRefs::MultiEsdt(amount),
+            gas: self.gas,
+            data: self.data,
+            result_handler: self.result_handler,
+        }
+    }
+
     /// Backwards compatibility.
     pub fn with_multi_token_transfer(
         self,
diff --git a/framework/base/src/types/interaction/tx_payment.rs b/framework/base/src/types/interaction/tx_payment.rs
index 4b2f54e29f..d70fc79349 100644
--- a/framework/base/src/types/interaction/tx_payment.rs
+++ b/framework/base/src/types/interaction/tx_payment.rs
@@ -1,4 +1,5 @@
 mod tx_payment_egld;
+mod tx_payment_egld_or_multi_esdt;
 mod tx_payment_egld_value;
 mod tx_payment_multi_esdt;
 mod tx_payment_none;
diff --git a/framework/base/src/types/interaction/tx_payment/tx_payment_egld_or_multi_esdt.rs b/framework/base/src/types/interaction/tx_payment/tx_payment_egld_or_multi_esdt.rs
new file mode 100644
index 0000000000..7ebfe42806
--- /dev/null
+++ b/framework/base/src/types/interaction/tx_payment/tx_payment_egld_or_multi_esdt.rs
@@ -0,0 +1,93 @@
+use alloc::borrow::ToOwned;
+
+use crate::{
+    api::ManagedTypeApi,
+    contract_base::SendRawWrapper,
+    proxy_imports::{
+        AnnotatedValue, EgldOrMultiEsdtPayment, EgldOrMultiEsdtPaymentRefs, ManagedType,
+    },
+    types::{
+        BigUint, EsdtTokenPayment, EsdtTokenPaymentRefs, ManagedAddress, ManagedVec,
+        MultiEsdtPayment, TxFrom, TxToSpecified,
+    },
+};
+
+use super::{AnnotatedEgldPayment, FullPaymentData, FunctionCall, TxEgldValue, TxEnv, TxPayment};
+
+impl<'a, Env> TxPayment<Env> for EgldOrMultiEsdtPaymentRefs<'a, Env::Api>
+where
+    Env: TxEnv,
+{
+    fn is_no_payment(&self) -> bool {
+        self.is_empty()
+    }
+
+    fn perform_transfer_execute(
+        self,
+        env: &Env,
+        to: &ManagedAddress<Env::Api>,
+        gas_limit: u64,
+        fc: FunctionCall<Env::Api>,
+    ) {
+        match self {
+            EgldOrMultiEsdtPaymentRefs::Egld(egld_amount) => {
+                let _ = SendRawWrapper::<Env::Api>::new().direct_egld_execute(
+                    to,
+                    egld_amount,
+                    gas_limit,
+                    &fc.function_name,
+                    &fc.arg_buffer,
+                );
+            },
+            EgldOrMultiEsdtPaymentRefs::MultiEsdt(multi_esdt_payment) => {
+                let _ = SendRawWrapper::<Env::Api>::new().multi_esdt_transfer_execute(
+                    to,
+                    multi_esdt_payment,
+                    gas_limit,
+                    &fc.function_name,
+                    &fc.arg_buffer,
+                );
+            },
+        }
+    }
+
+    fn with_normalized<From, To, F, R>(
+        self,
+        env: &Env,
+        from: &From,
+        to: To,
+        fc: FunctionCall<Env::Api>,
+        f: F,
+    ) -> R
+    where
+        From: TxFrom<Env>,
+        To: TxToSpecified<Env>,
+        F: FnOnce(&ManagedAddress<Env::Api>, &BigUint<Env::Api>, &FunctionCall<Env::Api>) -> R,
+    {
+        match self {
+            EgldOrMultiEsdtPaymentRefs::Egld(egld_amount) => {
+                to.with_address_ref(env, |to_addr| f(to_addr, &BigUint::zero(), &fc))
+            },
+            EgldOrMultiEsdtPaymentRefs::MultiEsdt(multi_esdt_payment) => {
+                to.with_address_ref(env, |to_addr| {
+                    let fc_conv =
+                        fc.convert_to_multi_transfer_esdt_call(to_addr, multi_esdt_payment);
+                    f(to_addr, &BigUint::zero(), &fc_conv)
+                })
+            },
+        }
+    }
+
+    fn into_full_payment_data(self, env: &Env) -> FullPaymentData<Env::Api> {
+        match self {
+            EgldOrMultiEsdtPaymentRefs::Egld(egld_amount) => FullPaymentData {
+                egld: Some(AnnotatedEgldPayment::new_egld(egld_amount.into_value(env))),
+                multi_esdt: ManagedVec::new(),
+            },
+            EgldOrMultiEsdtPaymentRefs::MultiEsdt(multi_esdt_payment) => FullPaymentData {
+                egld: None,
+                multi_esdt: multi_esdt_payment.clone(),
+            },
+        }
+    }
+}
diff --git a/framework/base/src/types/interaction/tx_payment/tx_payment_single_esdt_ref.rs b/framework/base/src/types/interaction/tx_payment/tx_payment_single_esdt_ref.rs
index c0d568e11b..fd976e14d4 100644
--- a/framework/base/src/types/interaction/tx_payment/tx_payment_single_esdt_ref.rs
+++ b/framework/base/src/types/interaction/tx_payment/tx_payment_single_esdt_ref.rs
@@ -2,8 +2,8 @@ use crate::{
     api::ManagedTypeApi,
     contract_base::SendRawWrapper,
     types::{
-        BigUint, EsdtTokenPayment, EsdtTokenPaymentRefs, ManagedAddress, ManagedVec,
-        MultiEsdtPayment, TokenIdentifier, TxFrom, TxToSpecified,
+        BigUint, EsdtTokenPaymentRefs, ManagedAddress, ManagedVec, MultiEsdtPayment,
+        TokenIdentifier, TxFrom, TxToSpecified,
     },
 };
 
diff --git a/framework/base/src/types/managed/wrapped/egld_or_multi_esdt_payment.rs b/framework/base/src/types/managed/wrapped/egld_or_multi_esdt_payment.rs
index 11a8d7ea83..838fc278a4 100644
--- a/framework/base/src/types/managed/wrapped/egld_or_multi_esdt_payment.rs
+++ b/framework/base/src/types/managed/wrapped/egld_or_multi_esdt_payment.rs
@@ -34,6 +34,7 @@ impl<M: ManagedTypeApi> EgldOrMultiEsdtPayment<M> {
     }
 }
 
+/// The version of `EgldOrMultiEsdtPayment` that contains referrences instead of owned fields.
 pub enum EgldOrMultiEsdtPaymentRefs<'a, M: ManagedTypeApi> {
     Egld(&'a BigUint<M>),
     MultiEsdt(&'a ManagedVec<M, EsdtTokenPayment<M>>),
@@ -51,3 +52,23 @@ impl<M: ManagedTypeApi> EgldOrMultiEsdtPayment<M> {
         }
     }
 }
+
+impl<'a, M: ManagedTypeApi> EgldOrMultiEsdtPaymentRefs<'a, M> {
+    pub fn to_owned_payment(&self) -> EgldOrMultiEsdtPayment<M> {
+        match self {
+            EgldOrMultiEsdtPaymentRefs::Egld(egld_value) => {
+                EgldOrMultiEsdtPayment::Egld((*egld_value).clone())
+            },
+            EgldOrMultiEsdtPaymentRefs::MultiEsdt(esdt_payments) => {
+                EgldOrMultiEsdtPayment::MultiEsdt((*esdt_payments).clone())
+            },
+        }
+    }
+
+    pub fn is_empty(&self) -> bool {
+        match self {
+            EgldOrMultiEsdtPaymentRefs::Egld(egld_value) => *egld_value == &0u32,
+            EgldOrMultiEsdtPaymentRefs::MultiEsdt(esdt_payments) => esdt_payments.is_empty(),
+        }
+    }
+}
diff --git a/framework/base/src/types/managed/wrapped/mod.rs b/framework/base/src/types/managed/wrapped/mod.rs
index a2dcd6008a..5a5e907403 100644
--- a/framework/base/src/types/managed/wrapped/mod.rs
+++ b/framework/base/src/types/managed/wrapped/mod.rs
@@ -20,7 +20,7 @@ mod token_identifier;
 
 pub use egld_or_esdt_token_identifier::EgldOrEsdtTokenIdentifier;
 pub use egld_or_esdt_token_payment::EgldOrEsdtTokenPayment;
-pub use egld_or_multi_esdt_payment::EgldOrMultiEsdtPayment;
+pub use egld_or_multi_esdt_payment::{EgldOrMultiEsdtPayment, EgldOrMultiEsdtPaymentRefs};
 pub(crate) use encoded_managed_vec_item::EncodedManagedVecItem;
 pub use esdt_token_data::EsdtTokenData;
 pub use esdt_token_payment::{EsdtTokenPayment, EsdtTokenPaymentRefs, MultiEsdtPayment};

From ba6da3fbe0c034a7b7784c553694b72115d4a04b Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Tue, 26 Mar 2024 18:40:48 +0100
Subject: [PATCH 0559/1254] upgrade in proxy

---
 .../src/forwarder_raw_deploy_upgrade.rs       |   4 +-
 .../forwarder/src/contract_upgrade.rs         |  27 ++--
 .../forwarder/src/vault_proxy.rs              |  22 +++
 .../proxy-test-first/src/proxy-test-first.rs  |   7 +-
 framework/base/src/types/interaction/mod.rs   |   4 +
 framework/base/src/types/interaction/tx.rs    |  99 +++++++++++++-
 .../src/types/interaction/tx_call_deploy.rs   | 117 +---------------
 .../src/types/interaction/tx_call_upgrade.rs  | 127 ++++++++++++++++++
 .../base/src/types/interaction/tx_proxy.rs    |  10 +-
 .../src/types/interaction/upgrade_call.rs     |  90 +++++++++++++
 .../generate_proxy/proxy_sc_functions_gen.rs  |  69 +++++++++-
 11 files changed, 437 insertions(+), 139 deletions(-)
 create mode 100644 framework/base/src/types/interaction/tx_call_upgrade.rs
 create mode 100644 framework/base/src/types/interaction/upgrade_call.rs

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 b8fc6138eb..03ebdd9cb4 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
@@ -48,7 +48,7 @@ pub trait ForwarderRawDeployUpgrade {
     ) {
         self.tx()
             .to(child_sc_address)
-            .raw_deploy()
+            .raw_upgrade()
             .code(new_code)
             .code_metadata(code_metadata)
             .arguments_raw(args.to_arg_buffer())
@@ -65,7 +65,7 @@ pub trait ForwarderRawDeployUpgrade {
     ) {
         self.tx()
             .to(sc_address)
-            .raw_deploy()
+            .raw_upgrade()
             .from_source(source_contract_address)
             .code_metadata(code_metadata)
             .arguments_raw(args.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 b1629eeaa1..a1a402c6e7 100644
--- a/contracts/feature-tests/composability/forwarder/src/contract_upgrade.rs
+++ b/contracts/feature-tests/composability/forwarder/src/contract_upgrade.rs
@@ -1,10 +1,9 @@
+use crate::vault_proxy;
+
 multiversx_sc::imports!();
 
 #[multiversx_sc::module]
 pub trait UpgradeContractModule {
-    #[proxy]
-    fn vault_proxy(&self, sc_address: ManagedAddress) -> vault::Proxy<Self::Api>;
-
     #[endpoint(upgradeVault)]
     fn upgrade_vault(
         &self,
@@ -12,9 +11,14 @@ pub trait UpgradeContractModule {
         new_code: ManagedBuffer,
         opt_arg: OptionalValue<ManagedBuffer>,
     ) {
-        self.vault_proxy(child_sc_address)
-            .init(opt_arg)
-            .upgrade_contract(&new_code, CodeMetadata::UPGRADEABLE);
+        let _ = self
+            .tx()
+            .to(child_sc_address)
+            .typed(vault_proxy::VaultProxy)
+            .upgrade(opt_arg)
+            .code(new_code)
+            .code_metadata(CodeMetadata::UPGRADEABLE)
+            .upgrade_async_call();
     }
 
     #[endpoint]
@@ -24,8 +28,13 @@ pub trait UpgradeContractModule {
         source_address: ManagedAddress,
         opt_arg: OptionalValue<ManagedBuffer>,
     ) {
-        self.vault_proxy(child_sc_address)
-            .init(opt_arg)
-            .upgrade_from_source(&source_address, CodeMetadata::UPGRADEABLE)
+        let _ = self
+            .tx()
+            .to(child_sc_address)
+            .typed(vault_proxy::VaultProxy)
+            .upgrade(opt_arg)
+            .code_metadata(CodeMetadata::UPGRADEABLE)
+            .from_source(source_address)
+            .upgrade_async_call();
     }
 }
diff --git a/contracts/feature-tests/composability/forwarder/src/vault_proxy.rs b/contracts/feature-tests/composability/forwarder/src/vault_proxy.rs
index f1c9e2127a..2d6cb09693 100644
--- a/contracts/feature-tests/composability/forwarder/src/vault_proxy.rs
+++ b/contracts/feature-tests/composability/forwarder/src/vault_proxy.rs
@@ -53,6 +53,28 @@ where
     }
 }
 
+#[rustfmt::skip]
+impl<Env, From, To, Gas> VaultProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn upgrade<
+        Arg0: CodecInto<OptionalValue<ManagedBuffer<Env::Api>>>,
+    >(
+        self,
+        opt_arg_to_echo: Arg0,
+    ) -> TxProxyUpgrade<Env, From, To, Gas, MultiValue2<Box<str>, OptionalValue<ManagedBuffer<Env::Api>>>> {
+        self.wrapped_tx
+            .raw_upgrade()
+            .argument(&opt_arg_to_echo)
+            .original_result()
+    }
+}
+
 #[rustfmt::skip]
 impl<Env, From, To, Gas> VaultProxyMethods<Env, From, To, Gas>
 where
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 b6d04b7606..7d18e22e3b 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
@@ -77,10 +77,11 @@ pub trait ProxyTestFirst {
         let payment = self.call_value().egld_value();
         let other_contract = self.get_other_contract();
 
-        self.message_me_proxy()
-            .init(456) // TODO: upgrade proxy
+        self.tx()
             .to(other_contract)
-            .with_egld_transfer(payment.clone_value())
+            .raw_upgrade()
+            .argument(&456)
+            .egld(payment.clone_value())
             .upgrade_contract(&code, CodeMetadata::UPGRADEABLE);
     }
 
diff --git a/framework/base/src/types/interaction/mod.rs b/framework/base/src/types/interaction/mod.rs
index 7b751e162b..125f16150b 100644
--- a/framework/base/src/types/interaction/mod.rs
+++ b/framework/base/src/types/interaction/mod.rs
@@ -25,6 +25,7 @@ mod tx_call_async_promises;
 mod tx_call_deploy;
 mod tx_call_sync;
 mod tx_call_te;
+mod tx_call_upgrade;
 mod tx_code_source;
 mod tx_data;
 mod tx_env;
@@ -38,6 +39,7 @@ mod tx_rh_list;
 mod tx_rh_original_result;
 mod tx_to;
 mod typed_function_call;
+mod upgrade_call;
 
 pub use annotated::*;
 pub use async_call::AsyncCall;
@@ -63,6 +65,7 @@ pub use tx_call_async::*;
 pub use tx_call_async_promises::*;
 pub use tx_call_deploy::*;
 pub use tx_call_sync::*;
+pub use tx_call_upgrade::*;
 pub use tx_code_source::*;
 pub use tx_data::*;
 pub use tx_env::*;
@@ -76,5 +79,6 @@ pub use tx_rh_list::*;
 pub use tx_rh_original_result::*;
 pub use tx_to::*;
 pub use typed_function_call::*;
+pub use upgrade_call::*;
 
 pub type TxScBase<Api> = TxBaseWithEnv<TxScEnv<Api>>;
diff --git a/framework/base/src/types/interaction/tx.rs b/framework/base/src/types/interaction/tx.rs
index 583e038625..548da703c8 100644
--- a/framework/base/src/types/interaction/tx.rs
+++ b/framework/base/src/types/interaction/tx.rs
@@ -16,7 +16,7 @@ use super::{
     ExplicitGas, FromSource, FunctionCall, ManagedArgBuffer, OriginalResultMarker, RHList,
     RHListAppendNoRet, RHListAppendRet, RHListItem, TxCodeSource, TxCodeValue, TxData, TxEgldValue,
     TxEnv, TxFrom, TxFromSourceValue, TxGas, TxPayment, TxPaymentEgldOnly, TxProxyTrait,
-    TxResultHandler, TxScEnv, TxTo, TxToSpecified,
+    TxResultHandler, TxScEnv, TxTo, TxToSpecified, UpgradeCall,
 };
 
 #[must_use]
@@ -637,6 +637,74 @@ where
     }
 }
 
+impl<Env, From, To, Payment, Gas, RH> Tx<Env, From, To, Payment, Gas, (), RH>
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Payment: TxPaymentEgldOnly<Env>,
+    Gas: TxGas<Env>,
+    RH: TxResultHandler<Env>,
+{
+    pub fn raw_upgrade(self) -> Tx<Env, From, To, Payment, Gas, UpgradeCall<Env, ()>, RH> {
+        Tx {
+            env: self.env,
+            from: self.from,
+            to: self.to,
+            payment: self.payment,
+            gas: self.gas,
+            data: UpgradeCall::default(),
+            result_handler: self.result_handler,
+        }
+    }
+}
+
+impl<Env, From, To, Payment, Gas, RH> Tx<Env, From, To, Payment, Gas, UpgradeCall<Env, ()>, RH>
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Payment: TxPaymentEgldOnly<Env>,
+    Gas: TxGas<Env>,
+    RH: TxResultHandler<Env>,
+{
+    pub fn code<CodeValue>(
+        self,
+        code: CodeValue,
+    ) -> Tx<Env, From, To, Payment, Gas, UpgradeCall<Env, Code<CodeValue>>, RH>
+    where
+        CodeValue: TxCodeValue<Env>,
+    {
+        Tx {
+            env: self.env,
+            from: self.from,
+            to: self.to,
+            payment: self.payment,
+            gas: self.gas,
+            data: self.data.code_source(Code(code)),
+            result_handler: self.result_handler,
+        }
+    }
+
+    pub fn from_source<FromSourceValue>(
+        self,
+        source_address: FromSourceValue,
+    ) -> Tx<Env, From, To, Payment, Gas, UpgradeCall<Env, FromSource<FromSourceValue>>, RH>
+    where
+        FromSourceValue: TxFromSourceValue<Env>,
+    {
+        Tx {
+            env: self.env,
+            from: self.from,
+            to: self.to,
+            payment: self.payment,
+            gas: self.gas,
+            data: self.data.code_source(FromSource(source_address)),
+            result_handler: self.result_handler,
+        }
+    }
+}
+
 impl<Env, From, To, Payment, Gas, RH> Tx<Env, From, To, Payment, Gas, DeployCall<Env, ()>, RH>
 where
     Env: TxEnv,
@@ -712,6 +780,35 @@ where
     }
 }
 
+impl<Env, From, To, Payment, Gas, CodeSource, RH>
+    Tx<Env, From, To, Payment, Gas, UpgradeCall<Env, CodeSource>, RH>
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Payment: TxPaymentEgldOnly<Env>,
+    Gas: TxGas<Env>,
+    CodeSource: TxCodeSource<Env>,
+    RH: TxResultHandler<Env>,
+{
+    pub fn code_metadata(mut self, code_metadata: CodeMetadata) -> Self {
+        self.data = self.data.code_metadata(code_metadata);
+        self
+    }
+
+    #[inline]
+    pub fn argument<T: TopEncodeMulti>(mut self, arg: &T) -> Self {
+        self.data = self.data.argument(arg);
+        self
+    }
+
+    #[inline]
+    pub fn arguments_raw(mut self, raw: ManagedArgBuffer<Env::Api>) -> Self {
+        self.data.arg_buffer = raw;
+        self
+    }
+}
+
 impl<Api, To, Payment, OriginalResult>
     From<
         Tx<
diff --git a/framework/base/src/types/interaction/tx_call_deploy.rs b/framework/base/src/types/interaction/tx_call_deploy.rs
index c5f948ea32..0fd9cedc74 100644
--- a/framework/base/src/types/interaction/tx_call_deploy.rs
+++ b/framework/base/src/types/interaction/tx_call_deploy.rs
@@ -10,7 +10,7 @@ use crate::{
 use super::{
     contract_call_exec::decode_result, Code, ConsNoRet, ConsRet, DeployCall, FromSource,
     OriginalResultMarker, RHList, RHListExec, RHListItem, Tx, TxCodeValue, TxEmptyResultHandler,
-    TxEnv, TxFromSourceValue, TxGas, TxPaymentEgldOnly, TxResultHandler, TxScEnv,
+    TxEnv, TxFromSourceValue, TxGas, TxPaymentEgldOnly, TxResultHandler, TxScEnv, UpgradeCall,
 };
 
 pub struct DeployRawResult<Api>
@@ -141,70 +141,6 @@ where
     }
 }
 
-impl<Api, Payment, Gas, CodeValue, RH>
-    Tx<
-        TxScEnv<Api>,
-        (),
-        ManagedAddress<Api>,
-        Payment,
-        Gas,
-        DeployCall<TxScEnv<Api>, Code<CodeValue>>,
-        RH,
-    >
-where
-    Api: CallTypeApi,
-    Payment: TxPaymentEgldOnly<TxScEnv<Api>>,
-    Gas: TxGas<TxScEnv<Api>>,
-    CodeValue: TxCodeValue<TxScEnv<Api>>,
-    RH: TxEmptyResultHandler<TxScEnv<Api>>,
-{
-    pub fn upgrade_async_call(self) {
-        let gas = self.gas.explicit_or_gas_left(&self.env);
-        self.payment.with_egld_value(|egld_value| {
-            SendRawWrapper::<Api>::new().upgrade_contract(
-                &self.to,
-                gas,
-                egld_value,
-                &self.data.code_source.0.into_value(&self.env),
-                self.data.code_metadata,
-                &self.data.arg_buffer,
-            );
-        });
-    }
-}
-
-impl<Api, Payment, Gas, FromSourceValue, RH>
-    Tx<
-        TxScEnv<Api>,
-        (),
-        ManagedAddress<Api>,
-        Payment,
-        Gas,
-        DeployCall<TxScEnv<Api>, FromSource<FromSourceValue>>,
-        RH,
-    >
-where
-    Api: CallTypeApi,
-    Payment: TxPaymentEgldOnly<TxScEnv<Api>>,
-    Gas: TxGas<TxScEnv<Api>>,
-    FromSourceValue: TxFromSourceValue<TxScEnv<Api>>,
-    RH: TxEmptyResultHandler<TxScEnv<Api>>,
-{
-    pub fn upgrade_async_call(self) {
-        let gas = self.gas.explicit_or_gas_left(&self.env);
-        self.payment.with_egld_value(|egld_value| {
-            SendRawWrapper::<Api>::new().upgrade_from_source_contract(
-                &self.to,
-                gas,
-                egld_value,
-                &self.data.code_source.0.into_value(&self.env),
-                self.data.code_metadata,
-                &self.data.arg_buffer,
-            );
-        });
-    }
-}
-
 impl<Api, Payment, Gas, OriginalResult>
     Tx<
         TxScEnv<Api>,
@@ -263,54 +199,3 @@ where
         (new_address, decode_result(raw_results))
     }
 }
-
-impl<Api, Payment, Gas, RH>
-    Tx<TxScEnv<Api>, (), ManagedAddress<Api>, Payment, Gas, DeployCall<TxScEnv<Api>, ()>, RH>
-where
-    Api: CallTypeApi,
-    Payment: TxPaymentEgldOnly<TxScEnv<Api>>,
-    Gas: TxGas<TxScEnv<Api>>,
-    RH: TxEmptyResultHandler<TxScEnv<Api>>,
-{
-    /// Backwards compatibility, immitates the old API.
-    ///
-    /// Note that the data type (the `DeployCall`) doesn't have the code set.
-    /// This is because the old API was passing it as paramter, so we do the Apime here.
-    /// For clarity, we don't want it set twice.
-    pub fn upgrade_contract(self, code: &ManagedBuffer<Api>, code_metadata: CodeMetadata) {
-        let gas = self.gas.explicit_or_gas_left(&self.env);
-        self.payment.with_egld_value(|egld_value| {
-            SendRawWrapper::<Api>::new().upgrade_contract(
-                &self.to,
-                gas,
-                egld_value,
-                code,
-                code_metadata,
-                &self.data.arg_buffer,
-            );
-        });
-    }
-
-    /// Backwards compatibility, immitates the old API.
-    ///
-    /// Note that the data type (the `DeployCall`) doesn't have the code set.
-    /// This is because the old API was passing it as paramter, so we do the Apime here.
-    /// For clarity, we don't want it set twice.
-    pub fn upgrade_from_source(
-        self,
-        source_address: &ManagedAddress<Api>,
-        code_metadata: CodeMetadata,
-    ) {
-        let gas = self.gas.explicit_or_gas_left(&self.env);
-        self.payment.with_egld_value(|egld_value| {
-            SendRawWrapper::<Api>::new().upgrade_from_source_contract(
-                &self.to,
-                gas,
-                egld_value,
-                source_address,
-                code_metadata,
-                &self.data.arg_buffer,
-            );
-        });
-    }
-}
diff --git a/framework/base/src/types/interaction/tx_call_upgrade.rs b/framework/base/src/types/interaction/tx_call_upgrade.rs
new file mode 100644
index 0000000000..013c5adf06
--- /dev/null
+++ b/framework/base/src/types/interaction/tx_call_upgrade.rs
@@ -0,0 +1,127 @@
+use crate::{
+    api::CallTypeApi,
+    contract_base::SendRawWrapper,
+    proxy_imports::{CodeMetadata, ManagedAddress, ManagedBuffer, ManagedVec},
+    tuple_util::NestedTupleFlatten,
+};
+
+use super::{
+    tx_from, Code, DeployRawResult, FromSource, RHListExec, Tx, TxCodeValue, TxEmptyResultHandler,
+    TxFrom, TxFromSourceValue, TxGas, TxPaymentEgldOnly, TxResultHandler, TxScEnv, TxTo,
+    UpgradeCall,
+};
+
+impl<Api, Payment, Gas, CodeValue, RH>
+    Tx<
+        TxScEnv<Api>,
+        (),
+        ManagedAddress<Api>,
+        Payment,
+        Gas,
+        UpgradeCall<TxScEnv<Api>, Code<CodeValue>>,
+        RH,
+    >
+where
+    Api: CallTypeApi,
+    Payment: TxPaymentEgldOnly<TxScEnv<Api>>,
+    Gas: TxGas<TxScEnv<Api>>,
+    CodeValue: TxCodeValue<TxScEnv<Api>>,
+    RH: TxEmptyResultHandler<TxScEnv<Api>>,
+{
+    pub fn upgrade_async_call(self) {
+        let gas = self.gas.explicit_or_gas_left(&self.env);
+        self.payment.with_egld_value(|egld_value| {
+            SendRawWrapper::<Api>::new().upgrade_contract(
+                &self.to,
+                gas,
+                egld_value,
+                &self.data.code_source.0.into_value(&self.env),
+                self.data.code_metadata,
+                &self.data.arg_buffer,
+            );
+        });
+    }
+}
+
+impl<Api, Payment, Gas, FromSourceValue, RH>
+    Tx<
+        TxScEnv<Api>,
+        (),
+        ManagedAddress<Api>,
+        Payment,
+        Gas,
+        UpgradeCall<TxScEnv<Api>, FromSource<FromSourceValue>>,
+        RH,
+    >
+where
+    Api: CallTypeApi,
+    Payment: TxPaymentEgldOnly<TxScEnv<Api>>,
+    Gas: TxGas<TxScEnv<Api>>,
+    FromSourceValue: TxFromSourceValue<TxScEnv<Api>>,
+    RH: TxEmptyResultHandler<TxScEnv<Api>>,
+{
+    pub fn upgrade_async_call(self) {
+        let gas = self.gas.explicit_or_gas_left(&self.env);
+        self.payment.with_egld_value(|egld_value| {
+            SendRawWrapper::<Api>::new().upgrade_from_source_contract(
+                &self.to,
+                gas,
+                egld_value,
+                &self.data.code_source.0.into_value(&self.env),
+                self.data.code_metadata,
+                &self.data.arg_buffer,
+            );
+        });
+    }
+}
+
+impl<Api, Payment, Gas, RH>
+    Tx<TxScEnv<Api>, (), ManagedAddress<Api>, Payment, Gas, UpgradeCall<TxScEnv<Api>, ()>, RH>
+where
+    Api: CallTypeApi,
+    Payment: TxPaymentEgldOnly<TxScEnv<Api>>,
+    Gas: TxGas<TxScEnv<Api>>,
+    RH: TxEmptyResultHandler<TxScEnv<Api>>,
+{
+    /// Backwards compatibility, immitates the old API.
+    ///
+    /// Note that the data type (the `DeployCall`) doesn't have the code set.
+    /// This is because the old API was passing it as paramter, so we do the Apime here.
+    /// For clarity, we don't want it set twice.
+    pub fn upgrade_contract(self, code: &ManagedBuffer<Api>, code_metadata: CodeMetadata) {
+        let gas = self.gas.explicit_or_gas_left(&self.env);
+        self.payment.with_egld_value(|egld_value| {
+            SendRawWrapper::<Api>::new().upgrade_contract(
+                &self.to,
+                gas,
+                egld_value,
+                code,
+                code_metadata,
+                &self.data.arg_buffer,
+            );
+        });
+    }
+
+    /// Backwards compatibility, immitates the old API.
+    ///
+    /// Note that the data type (the `DeployCall`) doesn't have the code set.
+    /// This is because the old API was passing it as paramter, so we do the Apime here.
+    /// For clarity, we don't want it set twice.
+    pub fn upgrade_from_source(
+        self,
+        source_address: &ManagedAddress<Api>,
+        code_metadata: CodeMetadata,
+    ) {
+        let gas = self.gas.explicit_or_gas_left(&self.env);
+        self.payment.with_egld_value(|egld_value| {
+            SendRawWrapper::<Api>::new().upgrade_from_source_contract(
+                &self.to,
+                gas,
+                egld_value,
+                source_address,
+                code_metadata,
+                &self.data.arg_buffer,
+            );
+        });
+    }
+}
diff --git a/framework/base/src/types/interaction/tx_proxy.rs b/framework/base/src/types/interaction/tx_proxy.rs
index f38e356be0..7bb0c67439 100644
--- a/framework/base/src/types/interaction/tx_proxy.rs
+++ b/framework/base/src/types/interaction/tx_proxy.rs
@@ -1,4 +1,6 @@
-use super::{DeployCall, FunctionCall, OriginalResultMarker, Tx, TxEnv, TxFrom, TxGas, TxTo};
+use super::{
+    DeployCall, FunctionCall, OriginalResultMarker, Tx, TxEnv, TxFrom, TxGas, TxTo, UpgradeCall,
+};
 
 /// Defines a proxy object for a smart contract.
 pub trait TxProxyTrait<Env, From, To, Gas>
@@ -14,10 +16,14 @@ where
     fn proxy_methods(self, tx: Tx<Env, From, To, (), Gas, (), ()>) -> Self::TxProxyMethods;
 }
 
-/// Alias for a `Tx` generated from a proxy, in `init` or `upgrade`.
+/// Alias for a `Tx` generated from a proxy, in `init`.
 pub type TxProxyDeploy<Env, From, Gas, Original> =
     Tx<Env, From, (), (), Gas, DeployCall<Env, ()>, OriginalResultMarker<Original>>;
 
 /// Alias for a `Tx` generated from a proxy, in an endpoint.
 pub type TxProxyCall<Env, From, To, Gas, Original> =
     Tx<Env, From, To, (), Gas, FunctionCall<<Env as TxEnv>::Api>, OriginalResultMarker<Original>>;
+
+/// Alias for a `Tx` generated from a proxy, in `upgrade`.
+pub type TxProxyUpgrade<Env, From, To, Gas, Original> =
+    Tx<Env, From, To, (), Gas, UpgradeCall<Env, ()>, OriginalResultMarker<Original>>;
diff --git a/framework/base/src/types/interaction/upgrade_call.rs b/framework/base/src/types/interaction/upgrade_call.rs
new file mode 100644
index 0000000000..d69895f029
--- /dev/null
+++ b/framework/base/src/types/interaction/upgrade_call.rs
@@ -0,0 +1,90 @@
+use multiversx_sc_codec::TopEncodeMulti;
+
+use crate::types::{CodeMetadata, ManagedBuffer, ManagedBufferCachedBuilder};
+
+use super::{ManagedArgBuffer, TxCodeSource, TxData, TxEnv};
+
+/// Holds deploy data: code, code metadata, and arguments.
+pub struct UpgradeCall<Env, CodeSource>
+where
+    Env: TxEnv,
+    CodeSource: TxCodeSource<Env>,
+{
+    pub code_source: CodeSource,
+    pub code_metadata: CodeMetadata,
+    pub arg_buffer: ManagedArgBuffer<Env::Api>,
+}
+
+impl<Env> Default for UpgradeCall<Env, ()>
+where
+    Env: TxEnv,
+{
+    fn default() -> UpgradeCall<Env, ()> {
+        UpgradeCall {
+            code_source: (),
+            code_metadata: CodeMetadata::DEFAULT,
+            arg_buffer: ManagedArgBuffer::new(),
+        }
+    }
+}
+
+impl<Env, CodeSource> TxData<Env> for UpgradeCall<Env, CodeSource>
+where
+    Env: TxEnv,
+    CodeSource: TxCodeSource<Env>,
+{
+    fn is_no_call(&self) -> bool {
+        false
+    }
+
+    fn to_call_data_string(&self) -> ManagedBuffer<Env::Api> {
+        // Implement as needed for deployment-specific data
+        let result = ManagedBufferCachedBuilder::default();
+        // result.append_managed_buffer(&self.code);
+        // Add other fields as needed
+        result.into_managed_buffer()
+    }
+}
+
+impl<Env> UpgradeCall<Env, ()>
+where
+    Env: TxEnv,
+{
+    pub fn code_source<CodeSource>(self, code_source: CodeSource) -> UpgradeCall<Env, CodeSource>
+    where
+        CodeSource: TxCodeSource<Env>,
+    {
+        UpgradeCall {
+            code_source,
+            code_metadata: self.code_metadata,
+            arg_buffer: self.arg_buffer,
+        }
+    }
+}
+
+impl<Env, CodeSource> UpgradeCall<Env, CodeSource>
+where
+    Env: TxEnv,
+    CodeSource: TxCodeSource<Env>,
+{
+    pub fn code_metadata(mut self, code_metadata: CodeMetadata) -> Self
+    where
+        CodeSource: TxCodeSource<Env>,
+    {
+        self.code_metadata = code_metadata;
+        self
+    }
+
+    /// Adds an argument of any serializable type.
+    ///
+    /// Multi-values are accepted. No type checking performed.
+    pub fn argument<T: TopEncodeMulti>(mut self, arg: &T) -> Self {
+        self.arg_buffer.push_multi_arg(arg);
+        self
+    }
+
+    pub fn arguments_raw(mut self, raw: ManagedArgBuffer<Env::Api>) -> Self {
+        self.arg_buffer = raw;
+        self
+    }
+}
diff --git a/framework/meta/src/cmd/contract/generate_proxy/proxy_sc_functions_gen.rs b/framework/meta/src/cmd/contract/generate_proxy/proxy_sc_functions_gen.rs
index 59624f979d..54eee5c44a 100644
--- a/framework/meta/src/cmd/contract/generate_proxy/proxy_sc_functions_gen.rs
+++ b/framework/meta/src/cmd/contract/generate_proxy/proxy_sc_functions_gen.rs
@@ -14,6 +14,19 @@ pub(crate) fn write_content(file: &mut File, abi: ContractAbi) {
         write_constructor_content(file, constructor_abi.inputs);
         write_end_of_function(file);
     }
+
+    writeln!(file, "}}").unwrap();
+
+    write_header_impl_upgrade_constructor(file, &abi.name);
+    for (i, upgrade_abi) in abi.upgrade_constructors.clone().into_iter().enumerate() {
+        if i > 0 {
+            writeln!(file).unwrap();
+        }
+        write_upgrade_constructor_header(file, upgrade_abi.clone());
+        write_upgrade_constructor_content(file, upgrade_abi.inputs);
+        write_end_of_function(file);
+    }
+
     writeln!(file, "}}").unwrap();
 
     write_header_impl_endpoints(file, &abi.name);
@@ -46,6 +59,24 @@ where
     .unwrap();
 }
 
+fn write_header_impl_upgrade_constructor(file: &mut File, name: &str) {
+    let proxy_methods_type_name = proxy_methods_type_name(name);
+    writeln!(
+        file,
+        r#"
+#[rustfmt::skip]
+impl<Env, From, To, Gas> {proxy_methods_type_name}<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{{"#
+    )
+    .unwrap();
+}
+
 fn write_header_impl_endpoints(file: &mut File, name: &str) {
     let proxy_methods_type_name = proxy_methods_type_name(name);
     writeln!(
@@ -64,14 +95,19 @@ where
     .unwrap();
 }
 
-fn write_constructor_header(file: &mut File, contructor_abi: EndpointAbi) {
-    write_fn_signature(file, contructor_abi.clone());
-    write_constructor_output(file, contructor_abi.outputs);
+fn write_constructor_header(file: &mut File, constructor_abi: EndpointAbi) {
+    write_fn_signature(file, constructor_abi.clone());
+    write_constructor_output(file, constructor_abi.outputs);
 }
 
-fn write_endpoint_header(file: &mut File, contructor_abi: EndpointAbi) {
-    write_fn_signature(file, contructor_abi.clone());
-    write_endpoint_output(file, contructor_abi.outputs);
+fn write_upgrade_constructor_header(file: &mut File, upgrade_constructor_abi: EndpointAbi) {
+    write_fn_signature(file, upgrade_constructor_abi.clone());
+    write_upgrade_constructor_output(file, upgrade_constructor_abi.outputs);
+}
+
+fn write_endpoint_header(file: &mut File, constructor_abi: EndpointAbi) {
+    write_fn_signature(file, constructor_abi.clone());
+    write_endpoint_output(file, constructor_abi.outputs);
 }
 
 fn write_fn_signature(file: &mut File, endpoint_abi: EndpointAbi) {
@@ -98,6 +134,14 @@ fn write_constructor_output(file: &mut File, outputs: Vec<OutputAbi>) {
     writeln!(file, "> {{").unwrap();
 }
 
+fn write_upgrade_constructor_output(file: &mut File, outputs: Vec<OutputAbi>) {
+    write!(file, "-> TxProxyUpgrade<Env, From, To, Gas, ").unwrap();
+
+    parse_and_write_outputs(file, outputs);
+
+    writeln!(file, "> {{").unwrap();
+}
+
 fn write_endpoint_output(file: &mut File, outputs: Vec<OutputAbi>) {
     write!(file, "-> TxProxyCall<Env, From, To, Gas, ").unwrap();
 
@@ -119,6 +163,19 @@ fn write_constructor_content(file: &mut File, inputs: Vec<InputAbi>) {
     writeln!(file, "            .original_result()").unwrap();
 }
 
+fn write_upgrade_constructor_content(file: &mut File, inputs: Vec<InputAbi>) {
+    writeln!(
+        file,
+        "        self.wrapped_tx
+                .raw_upgrade()"
+    )
+    .unwrap();
+    for input in inputs.iter() {
+        writeln!(file, "            .argument(&{})", input.arg_name).unwrap();
+    }
+    writeln!(file, "            .original_result()").unwrap();
+}
+
 fn write_endpoint_content(file: &mut File, function_name: String, inputs: Vec<InputAbi>) {
     writeln!(
         file,

From 819c43868a39dace3f0e25f92c2c760b9372e761 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 26 Mar 2024 19:51:19 +0200
Subject: [PATCH 0560/1254] address expression conversions

---
 .../types/interaction/expr/address_expr.rs    |  5 +++++
 .../src/types/interaction/expr/sc_expr.rs     |  5 +++++
 .../src/scenario/model/value/address_key.rs   | 20 +++++++++++++++++++
 3 files changed, 30 insertions(+)

diff --git a/framework/base/src/types/interaction/expr/address_expr.rs b/framework/base/src/types/interaction/expr/address_expr.rs
index a5b9756638..ce2fa10fb5 100644
--- a/framework/base/src/types/interaction/expr/address_expr.rs
+++ b/framework/base/src/types/interaction/expr/address_expr.rs
@@ -63,6 +63,11 @@ impl AddressExpr {
         }
         result
     }
+
+    #[cfg(feature = "alloc")]
+    pub fn eval_to_expr(&self) -> alloc::string::String {
+        alloc::format!("{ADDRESS_PREFIX}{}", self.0)
+    }
 }
 
 #[cfg(test)]
diff --git a/framework/base/src/types/interaction/expr/sc_expr.rs b/framework/base/src/types/interaction/expr/sc_expr.rs
index 551d4eaf0a..1613587402 100644
--- a/framework/base/src/types/interaction/expr/sc_expr.rs
+++ b/framework/base/src/types/interaction/expr/sc_expr.rs
@@ -74,6 +74,11 @@ impl<'a> ScExpr<'a> {
         }
         result
     }
+
+    #[cfg(feature = "alloc")]
+    pub fn eval_to_expr(&self) -> alloc::string::String {
+        alloc::format!("{SC_PREFIX}{}", self.0)
+    }
 }
 
 #[cfg(test)]
diff --git a/framework/scenario/src/scenario/model/value/address_key.rs b/framework/scenario/src/scenario/model/value/address_key.rs
index 5bbc1d79ae..889cca69ae 100644
--- a/framework/scenario/src/scenario/model/value/address_key.rs
+++ b/framework/scenario/src/scenario/model/value/address_key.rs
@@ -1,3 +1,5 @@
+use multiversx_sc::types::{AddressExpr, ScExpr};
+
 use super::{value_from_slice, AddressValue};
 use crate::{
     multiversx_sc::types::Address,
@@ -114,3 +116,21 @@ impl From<&Address> for AddressKey {
         }
     }
 }
+
+impl From<AddressExpr> for AddressKey {
+    fn from(from: AddressExpr) -> Self {
+        AddressKey {
+            value: from.eval_to_array().into(),
+            original: from.eval_to_expr(),
+        }
+    }
+}
+
+impl From<ScExpr<'_>> for AddressKey {
+    fn from(from: ScExpr) -> Self {
+        AddressKey {
+            value: from.eval_to_array().into(),
+            original: from.eval_to_expr(),
+        }
+    }
+}

From d28adf093020337f96f077f7f361cb9dc2b043c3 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 26 Mar 2024 19:54:24 +0200
Subject: [PATCH 0561/1254] result handlers for errors, v1

---
 .../interaction/tx_rh_list/tx_rh_list_exec.rs | 22 ++++++++++++++++
 .../scenario/src/facade/result_handlers.rs    |  4 +++
 .../facade/result_handlers/returns_message.rs | 26 +++++++++++++++++++
 .../facade/result_handlers/returns_status.rs  | 26 +++++++++++++++++++
 4 files changed, 78 insertions(+)
 create mode 100644 framework/scenario/src/facade/result_handlers/returns_message.rs
 create mode 100644 framework/scenario/src/facade/result_handlers/returns_status.rs

diff --git a/framework/base/src/types/interaction/tx_rh_list/tx_rh_list_exec.rs b/framework/base/src/types/interaction/tx_rh_list/tx_rh_list_exec.rs
index b8121d40d8..64f8a0a487 100644
--- a/framework/base/src/types/interaction/tx_rh_list/tx_rh_list_exec.rs
+++ b/framework/base/src/types/interaction/tx_rh_list/tx_rh_list_exec.rs
@@ -10,6 +10,10 @@ pub trait RHListItemExec<RawResult, Env, Original>: RHListItem<Env, Original>
 where
     Env: TxEnv,
 {
+    fn is_error_handled(&self) -> bool {
+        false
+    }
+
     fn item_process_result(self, raw_result: &RawResult) -> Self::Returns;
 }
 
@@ -18,6 +22,8 @@ pub trait RHListExec<RawResult, Env>: RHList<Env>
 where
     Env: TxEnv,
 {
+    fn is_error_handled(&self) -> bool;
+
     fn list_process_result(self, raw_result: &RawResult) -> Self::ListReturns;
 }
 
@@ -25,6 +31,10 @@ impl<RawResult, Env> RHListExec<RawResult, Env> for ()
 where
     Env: TxEnv,
 {
+    fn is_error_handled(&self) -> bool {
+        false
+    }
+
     fn list_process_result(self, _raw_result: &RawResult) -> Self::ListReturns {}
 }
 
@@ -32,6 +42,10 @@ impl<RawResult, Env, O> RHListExec<RawResult, Env> for OriginalResultMarker<O>
 where
     Env: TxEnv,
 {
+    fn is_error_handled(&self) -> bool {
+        false
+    }
+
     fn list_process_result(self, _raw_result: &RawResult) -> Self::ListReturns {}
 }
 
@@ -41,6 +55,10 @@ where
     Head: RHListItemExec<RawResult, Env, Tail::OriginalResult>,
     Tail: RHListExec<RawResult, Env>,
 {
+    fn is_error_handled(&self) -> bool {
+        self.head.is_error_handled() || self.tail.is_error_handled()
+    }
+
     fn list_process_result(self, raw_result: &RawResult) -> Self::ListReturns {
         let head_result = self.head.item_process_result(raw_result);
         let tail_result = self.tail.list_process_result(raw_result);
@@ -54,6 +72,10 @@ where
     Head: RHListItemExec<RawResult, Env, Tail::OriginalResult, Returns = ()>,
     Tail: RHListExec<RawResult, Env>,
 {
+    fn is_error_handled(&self) -> bool {
+        self.head.is_error_handled() || self.tail.is_error_handled()
+    }
+
     fn list_process_result(self, raw_result: &RawResult) -> Self::ListReturns {
         self.head.item_process_result(raw_result);
         self.tail.list_process_result(raw_result)
diff --git a/framework/scenario/src/facade/result_handlers.rs b/framework/scenario/src/facade/result_handlers.rs
index 6bb2de8216..55f541d8e0 100644
--- a/framework/scenario/src/facade/result_handlers.rs
+++ b/framework/scenario/src/facade/result_handlers.rs
@@ -1,3 +1,7 @@
+mod returns_message;
+mod returns_status;
 mod with_tx_raw_response;
 
+pub use returns_message::ReturnsMessage;
+pub use returns_status::ReturnsStatus;
 pub use with_tx_raw_response::WithRawTxResponse;
diff --git a/framework/scenario/src/facade/result_handlers/returns_message.rs b/framework/scenario/src/facade/result_handlers/returns_message.rs
new file mode 100644
index 0000000000..c9e9821055
--- /dev/null
+++ b/framework/scenario/src/facade/result_handlers/returns_message.rs
@@ -0,0 +1,26 @@
+use multiversx_sc::types::{RHListItem, RHListItemExec, TxEnv};
+
+use crate::scenario_model::TxResponse;
+
+/// Indicates that the error status will be returned.
+pub struct ReturnsMessage;
+
+impl<Env, Original> RHListItem<Env, Original> for ReturnsMessage
+where
+    Env: TxEnv,
+{
+    type Returns = String;
+}
+
+impl<Env, Original> RHListItemExec<TxResponse, Env, Original> for ReturnsMessage
+where
+    Env: TxEnv,
+{
+    fn is_error_handled(&self) -> bool {
+        true
+    }
+
+    fn item_process_result(self, raw_result: &TxResponse) -> Self::Returns {
+        raw_result.tx_error.message.clone()
+    }
+}
diff --git a/framework/scenario/src/facade/result_handlers/returns_status.rs b/framework/scenario/src/facade/result_handlers/returns_status.rs
new file mode 100644
index 0000000000..7e81421efb
--- /dev/null
+++ b/framework/scenario/src/facade/result_handlers/returns_status.rs
@@ -0,0 +1,26 @@
+use multiversx_sc::types::{RHListItem, RHListItemExec, TxEnv};
+
+use crate::scenario_model::TxResponse;
+
+/// Indicates that the error status will be returned.
+pub struct ReturnsStatus;
+
+impl<Env, Original> RHListItem<Env, Original> for ReturnsStatus
+where
+    Env: TxEnv,
+{
+    type Returns = u64;
+}
+
+impl<Env, Original> RHListItemExec<TxResponse, Env, Original> for ReturnsStatus
+where
+    Env: TxEnv,
+{
+    fn is_error_handled(&self) -> bool {
+        true
+    }
+
+    fn item_process_result(self, raw_result: &TxResponse) -> Self::Returns {
+        raw_result.tx_error.status
+    }
+}

From b3f1e9e7cf44f38ae222db631a202e0c7befdf3a Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 26 Mar 2024 21:51:34 +0200
Subject: [PATCH 0562/1254] result handlers for errors, v2

---
 .../panic-message-features/sc-config.toml     |  1 +
 .../src/panic_features.rs                     |  5 +
 .../tests/pmf_blackbox_test.rs                | 93 ++++++++++++++++++
 .../panic-message-features/tests/pmf_proxy.rs | 95 +++++++++++++++++++
 .../panic-message-features/wasm/src/lib.rs    |  5 +-
 .../base/src/types/interaction/tx_env.rs      |  3 +
 .../base/src/types/interaction/tx_env_sc.rs   |  2 +
 .../interaction/tx_rh_list/tx_rh_list_exec.rs | 43 ++++++---
 .../generate_proxy/proxy_template_gen.rs      |  9 +-
 .../scenario/src/facade/result_handlers.rs    |  4 +
 .../facade/result_handlers/expect_message.rs  | 32 +++++++
 .../facade/result_handlers/expect_status.rs   | 27 ++++++
 .../facade/result_handlers/returns_message.rs | 11 ++-
 .../facade/result_handlers/returns_status.rs  | 18 +++-
 .../src/facade/world_tx/scenario_env.rs       |  8 +-
 .../facade/world_tx/scenario_env_deploy.rs    |  2 +
 .../src/facade/world_tx/scenario_env_exec.rs  |  6 +-
 .../src/facade/world_tx/scenario_env_query.rs |  9 +-
 .../scenario/model/transaction/tx_expect.rs   |  6 ++
 .../snippets/src/itx/interactor_env_deploy.rs |  9 +-
 .../snippets/src/itx/interactor_env_exec.rs   | 12 ++-
 .../snippets/src/itx/interactor_env_query.rs  | 12 ++-
 22 files changed, 371 insertions(+), 41 deletions(-)
 create mode 100644 contracts/feature-tests/panic-message-features/tests/pmf_blackbox_test.rs
 create mode 100644 contracts/feature-tests/panic-message-features/tests/pmf_proxy.rs
 create mode 100644 framework/scenario/src/facade/result_handlers/expect_message.rs
 create mode 100644 framework/scenario/src/facade/result_handlers/expect_status.rs

diff --git a/contracts/feature-tests/panic-message-features/sc-config.toml b/contracts/feature-tests/panic-message-features/sc-config.toml
index fc05c90bba..7b60b5fb8c 100644
--- a/contracts/feature-tests/panic-message-features/sc-config.toml
+++ b/contracts/feature-tests/panic-message-features/sc-config.toml
@@ -1,4 +1,5 @@
 [settings]
+proxy-paths = ["tests/pmf_proxy.rs"]
 main = "main"
 
 [contracts.main]
diff --git a/contracts/feature-tests/panic-message-features/src/panic_features.rs b/contracts/feature-tests/panic-message-features/src/panic_features.rs
index 4b4ed32258..a2726d2fea 100644
--- a/contracts/feature-tests/panic-message-features/src/panic_features.rs
+++ b/contracts/feature-tests/panic-message-features/src/panic_features.rs
@@ -24,4 +24,9 @@ pub trait PanicMessageFeatures {
 
     #[event("before-panic")]
     fn before_panic(&self);
+
+    #[view]
+    fn sc_panic(&self) {
+        sc_panic!("sc_panic! test");
+    }
 }
diff --git a/contracts/feature-tests/panic-message-features/tests/pmf_blackbox_test.rs b/contracts/feature-tests/panic-message-features/tests/pmf_blackbox_test.rs
new file mode 100644
index 0000000000..ff14571fd9
--- /dev/null
+++ b/contracts/feature-tests/panic-message-features/tests/pmf_blackbox_test.rs
@@ -0,0 +1,93 @@
+mod pmf_proxy;
+use multiversx_sc::types::{AddressExpr, ScExpr};
+use multiversx_sc_scenario::{scenario_model::*, *};
+
+const OWNER: AddressExpr = AddressExpr("owner");
+const SC_PMF: ScExpr = ScExpr("pmf");
+const CODE_EXPR: &str = "mxsc:output/panic-message-features.mxsc.json";
+
+fn world() -> ScenarioWorld {
+    let mut blockchain = ScenarioWorld::new();
+    blockchain.set_current_dir_from_workspace("contracts/examples/adder");
+
+    blockchain.register_contract(CODE_EXPR, panic_message_features::ContractBuilder);
+    blockchain
+}
+
+fn setup() -> ScenarioWorld {
+    let mut world = world();
+    let code = world.code_expression(CODE_EXPR);
+
+    world.set_state_step(
+        SetStateStep::new()
+            .put_account(OWNER, Account::new().nonce(1))
+            .put_account(SC_PMF, Account::new().code(code)),
+    );
+
+    world
+}
+
+// TODO: move to basic-features a testing framework tester
+#[test]
+fn tx_returns_error_test() {
+    let mut world = setup();
+
+    let (status, message) = world
+        .tx()
+        .from(OWNER)
+        .to(SC_PMF)
+        .typed(pmf_proxy::PanicMessageFeaturesProxy)
+        .sc_panic()
+        .returns(ReturnsStatus)
+        .returns(ReturnsMessage)
+        .run();
+
+    assert_eq!(status, 4);
+    assert_eq!(message, "sc_panic! test");
+}
+
+#[test]
+fn query_returns_error_test() {
+    let mut world = setup();
+
+    let (status, message) = world
+        .query()
+        .to(SC_PMF)
+        .typed(pmf_proxy::PanicMessageFeaturesProxy)
+        .sc_panic()
+        .returns(ReturnsStatus)
+        .returns(ReturnsMessage)
+        .run();
+
+    assert_eq!(status, 4);
+    assert_eq!(message, "sc_panic! test");
+}
+
+#[test]
+fn tx_expect_error_test() {
+    let mut world = setup();
+
+    world
+        .tx()
+        .from(OWNER)
+        .to(SC_PMF)
+        .typed(pmf_proxy::PanicMessageFeaturesProxy)
+        .sc_panic()
+        .returns(ExpectStatus(4))
+        .returns(ExpectMessage("sc_panic! test"))
+        .run();
+}
+
+#[test]
+fn query_expect_error_test() {
+    let mut world = setup();
+
+    world
+        .query()
+        .to(SC_PMF)
+        .typed(pmf_proxy::PanicMessageFeaturesProxy)
+        .sc_panic()
+        .returns(ExpectStatus(4))
+        .returns(ExpectMessage("sc_panic! test"))
+        .run();
+}
diff --git a/contracts/feature-tests/panic-message-features/tests/pmf_proxy.rs b/contracts/feature-tests/panic-message-features/tests/pmf_proxy.rs
new file mode 100644
index 0000000000..8226a1ec5f
--- /dev/null
+++ b/contracts/feature-tests/panic-message-features/tests/pmf_proxy.rs
@@ -0,0 +1,95 @@
+// Code generated by the multiversx-sc proxy generator. DO NOT EDIT.
+
+////////////////////////////////////////////////////
+////////////////// AUTO-GENERATED //////////////////
+////////////////////////////////////////////////////
+
+#![allow(dead_code)]
+#![allow(clippy::all)]
+
+use multiversx_sc::proxy_imports::*;
+
+pub struct PanicMessageFeaturesProxy;
+
+impl<Env, From, To, Gas> TxProxyTrait<Env, From, To, Gas> for PanicMessageFeaturesProxy
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    type TxProxyMethods = PanicMessageFeaturesProxyMethods<Env, From, To, Gas>;
+
+    fn proxy_methods(self, tx: Tx<Env, From, To, (), Gas, (), ()>) -> Self::TxProxyMethods {
+        PanicMessageFeaturesProxyMethods { wrapped_tx: tx }
+    }
+}
+
+pub struct PanicMessageFeaturesProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    wrapped_tx: Tx<Env, From, To, (), Gas, (), ()>,
+}
+
+#[rustfmt::skip]
+impl<Env, From, Gas> PanicMessageFeaturesProxyMethods<Env, From, (), Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn init(
+        self,
+    ) -> TxProxyDeploy<Env, From, Gas, ()> {
+        self.wrapped_tx
+            .raw_deploy()
+            .original_result()
+    }
+}
+
+#[rustfmt::skip]
+impl<Env, From, To, Gas> PanicMessageFeaturesProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn panic_with_message<
+        Arg0: CodecInto<u32>,
+    >(
+        self,
+        some_value: Arg0,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("panicWithMessage")
+            .argument(&some_value)
+            .original_result()
+    }
+
+    /// Logs do not get recorded in case of panic. 
+    pub fn panic_after_log(
+        self,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("panicAfterLog")
+            .original_result()
+    }
+
+    pub fn sc_panic(
+        self,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("sc_panic")
+            .original_result()
+    }
+}
diff --git a/contracts/feature-tests/panic-message-features/wasm/src/lib.rs b/contracts/feature-tests/panic-message-features/wasm/src/lib.rs
index 2a024b15d2..a347a1aaa3 100644
--- a/contracts/feature-tests/panic-message-features/wasm/src/lib.rs
+++ b/contracts/feature-tests/panic-message-features/wasm/src/lib.rs
@@ -5,9 +5,9 @@
 ////////////////////////////////////////////////////
 
 // Init:                                 1
-// Endpoints:                            2
+// Endpoints:                            3
 // Async Callback (empty):               1
-// Total number of exported functions:   4
+// Total number of exported functions:   5
 
 #![no_std]
 #![allow(internal_features)]
@@ -22,6 +22,7 @@ multiversx_sc_wasm_adapter::endpoints! {
         init => init
         panicWithMessage => panic_with_message
         panicAfterLog => panic_after_log
+        sc_panic => sc_panic
     )
 }
 
diff --git a/framework/base/src/types/interaction/tx_env.rs b/framework/base/src/types/interaction/tx_env.rs
index 54fbf77b90..482b0a0e8e 100644
--- a/framework/base/src/types/interaction/tx_env.rs
+++ b/framework/base/src/types/interaction/tx_env.rs
@@ -3,6 +3,9 @@ use crate::{api::CallTypeApi, types::ManagedAddress};
 pub trait TxEnv: Sized {
     type Api: CallTypeApi;
 
+    /// Type built by result handlers that translates into the "expect" section in scenarios.
+    type RHExpect: Default;
+
     fn resolve_sender_address(&self) -> ManagedAddress<Self::Api>;
 
     fn default_gas(&self) -> u64;
diff --git a/framework/base/src/types/interaction/tx_env_sc.rs b/framework/base/src/types/interaction/tx_env_sc.rs
index ce2c287d30..f22c4a3dee 100644
--- a/framework/base/src/types/interaction/tx_env_sc.rs
+++ b/framework/base/src/types/interaction/tx_env_sc.rs
@@ -41,6 +41,8 @@ where
 {
     type Api = Api;
 
+    type RHExpect = ();
+
     fn resolve_sender_address(&self) -> ManagedAddress<Api> {
         BlockchainWrapper::<Api>::new().get_sc_address()
     }
diff --git a/framework/base/src/types/interaction/tx_rh_list/tx_rh_list_exec.rs b/framework/base/src/types/interaction/tx_rh_list/tx_rh_list_exec.rs
index 64f8a0a487..06b2184366 100644
--- a/framework/base/src/types/interaction/tx_rh_list/tx_rh_list_exec.rs
+++ b/framework/base/src/types/interaction/tx_rh_list/tx_rh_list_exec.rs
@@ -1,4 +1,8 @@
-use crate::{proxy_imports::OriginalResultMarker, types::TxEnv};
+use crate::{
+    api::CallTypeApi,
+    proxy_imports::{ManagedBuffer, OriginalResultMarker},
+    types::TxEnv,
+};
 
 use super::{ConsNoRet, ConsRet, RHList, RHListItem};
 
@@ -10,10 +14,19 @@ pub trait RHListItemExec<RawResult, Env, Original>: RHListItem<Env, Original>
 where
     Env: TxEnv,
 {
-    fn is_error_handled(&self) -> bool {
-        false
+    /// Part of the execution pre-processing, each result handler needs to produce an "expect" field,
+    /// as defined in the environment.
+    ///
+    /// The operation is chained, so all result handlers can contribute, hence the `prev` argument,
+    /// which represents the "expect" field produces by the other result handlers.
+    ///
+    /// The default behavior is to leave it unchanged.
+    fn item_tx_expect(&self, prev: Env::RHExpect) -> Env::RHExpect {
+        prev
     }
 
+    /// The main functionality of a result handler, it either does some computation internally
+    /// (e.g. execution of a lambda function), or produces a result, or both.
     fn item_process_result(self, raw_result: &RawResult) -> Self::Returns;
 }
 
@@ -22,8 +35,14 @@ pub trait RHListExec<RawResult, Env>: RHList<Env>
 where
     Env: TxEnv,
 {
-    fn is_error_handled(&self) -> bool;
+    /// Provides the execution pre-processing, in which result handlers collectively produce an "expect" field.
+    ///
+    /// The operation starts with the default "expect" field, which normally has all fields unspecified, except
+    /// for the "status", which is by default set to "0". This means that failing transactions will cause a panic
+    /// unless explicitly stated in one of the result handlers.
+    fn list_tx_expect(&self) -> Env::RHExpect;
 
+    /// Aggregates the executions of all result handlers, as configured for a transaction.
     fn list_process_result(self, raw_result: &RawResult) -> Self::ListReturns;
 }
 
@@ -31,8 +50,8 @@ impl<RawResult, Env> RHListExec<RawResult, Env> for ()
 where
     Env: TxEnv,
 {
-    fn is_error_handled(&self) -> bool {
-        false
+    fn list_tx_expect(&self) -> Env::RHExpect {
+        Env::RHExpect::default()
     }
 
     fn list_process_result(self, _raw_result: &RawResult) -> Self::ListReturns {}
@@ -42,8 +61,8 @@ impl<RawResult, Env, O> RHListExec<RawResult, Env> for OriginalResultMarker<O>
 where
     Env: TxEnv,
 {
-    fn is_error_handled(&self) -> bool {
-        false
+    fn list_tx_expect(&self) -> Env::RHExpect {
+        Env::RHExpect::default()
     }
 
     fn list_process_result(self, _raw_result: &RawResult) -> Self::ListReturns {}
@@ -55,8 +74,8 @@ where
     Head: RHListItemExec<RawResult, Env, Tail::OriginalResult>,
     Tail: RHListExec<RawResult, Env>,
 {
-    fn is_error_handled(&self) -> bool {
-        self.head.is_error_handled() || self.tail.is_error_handled()
+    fn list_tx_expect(&self) -> Env::RHExpect {
+        self.head.item_tx_expect(self.tail.list_tx_expect())
     }
 
     fn list_process_result(self, raw_result: &RawResult) -> Self::ListReturns {
@@ -72,8 +91,8 @@ where
     Head: RHListItemExec<RawResult, Env, Tail::OriginalResult, Returns = ()>,
     Tail: RHListExec<RawResult, Env>,
 {
-    fn is_error_handled(&self) -> bool {
-        self.head.is_error_handled() || self.tail.is_error_handled()
+    fn list_tx_expect(&self) -> Env::RHExpect {
+        self.head.item_tx_expect(self.tail.list_tx_expect())
     }
 
     fn list_process_result(self, raw_result: &RawResult) -> Self::ListReturns {
diff --git a/framework/meta/src/cmd/contract/generate_proxy/proxy_template_gen.rs b/framework/meta/src/cmd/contract/generate_proxy/proxy_template_gen.rs
index 22e26eff5a..6145315233 100644
--- a/framework/meta/src/cmd/contract/generate_proxy/proxy_template_gen.rs
+++ b/framework/meta/src/cmd/contract/generate_proxy/proxy_template_gen.rs
@@ -2,17 +2,18 @@ use std::{fs::File, io::Write};
 
 use super::proxy_naming::{proxy_methods_type_name, proxy_type_name};
 
-const PREFIX_AUTO_GENERATED: &str = "////////////////////////////////////////////////////
+const PRELUDE: &str = "// Code generated by the multiversx-sc proxy generator. DO NOT EDIT.
+
+////////////////////////////////////////////////////
 ////////////////// AUTO-GENERATED //////////////////
 ////////////////////////////////////////////////////
-";
 
-const PRELUDE: &str = "#![allow(clippy::all)]
+#![allow(dead_code)]
+#![allow(clippy::all)]
 
 use multiversx_sc::proxy_imports::*;";
 
 pub(crate) fn write_header(file: &mut File) {
-    writeln!(file, "{PREFIX_AUTO_GENERATED}").unwrap();
     writeln!(file, r#"{PRELUDE}"#).unwrap();
 }
 
diff --git a/framework/scenario/src/facade/result_handlers.rs b/framework/scenario/src/facade/result_handlers.rs
index 55f541d8e0..369a390a75 100644
--- a/framework/scenario/src/facade/result_handlers.rs
+++ b/framework/scenario/src/facade/result_handlers.rs
@@ -1,7 +1,11 @@
+mod expect_message;
+mod expect_status;
 mod returns_message;
 mod returns_status;
 mod with_tx_raw_response;
 
+pub use expect_message::ExpectMessage;
+pub use expect_status::ExpectStatus;
 pub use returns_message::ReturnsMessage;
 pub use returns_status::ReturnsStatus;
 pub use with_tx_raw_response::WithRawTxResponse;
diff --git a/framework/scenario/src/facade/result_handlers/expect_message.rs b/framework/scenario/src/facade/result_handlers/expect_message.rs
new file mode 100644
index 0000000000..4f46d05b59
--- /dev/null
+++ b/framework/scenario/src/facade/result_handlers/expect_message.rs
@@ -0,0 +1,32 @@
+use multiversx_chain_scenario_format::serde_raw::ValueSubTree;
+use multiversx_sc::types::{RHListItem, RHListItemExec, TxEnv};
+
+use crate::scenario_model::{BytesValue, CheckValue, TxExpect, TxResponse};
+
+/// Verifies that transaction result message matches the given one.
+///
+/// Can only be used in tests and interactors, not available in contracts.
+pub struct ExpectMessage<'a>(pub &'a str);
+
+impl<'a, Env, Original> RHListItem<Env, Original> for ExpectMessage<'a>
+where
+    Env: TxEnv,
+{
+    type Returns = ();
+}
+
+impl<'a, Env, Original> RHListItemExec<TxResponse, Env, Original> for ExpectMessage<'a>
+where
+    Env: TxEnv<RHExpect = TxExpect>,
+{
+    fn item_tx_expect(&self, mut prev: TxExpect) -> TxExpect {
+        let expect_message_expr = BytesValue {
+            value: self.0.to_string().into_bytes(),
+            original: ValueSubTree::Str(format!("str:{}", self.0)),
+        };
+        prev.message = CheckValue::Equal(expect_message_expr);
+        prev
+    }
+
+    fn item_process_result(self, _: &TxResponse) -> Self::Returns {}
+}
diff --git a/framework/scenario/src/facade/result_handlers/expect_status.rs b/framework/scenario/src/facade/result_handlers/expect_status.rs
new file mode 100644
index 0000000000..127982739b
--- /dev/null
+++ b/framework/scenario/src/facade/result_handlers/expect_status.rs
@@ -0,0 +1,27 @@
+use multiversx_sc::types::{RHListItem, RHListItemExec, TxEnv};
+
+use crate::scenario_model::{CheckValue, TxExpect, TxResponse};
+
+/// Verifies that transaction result status matches the given one.
+///
+/// Can only be used in tests and interactors, not available in contracts.
+pub struct ExpectStatus(pub u64);
+
+impl<Env, Original> RHListItem<Env, Original> for ExpectStatus
+where
+    Env: TxEnv,
+{
+    type Returns = ();
+}
+
+impl<Env, Original> RHListItemExec<TxResponse, Env, Original> for ExpectStatus
+where
+    Env: TxEnv<RHExpect = TxExpect>,
+{
+    fn item_tx_expect(&self, mut prev: TxExpect) -> TxExpect {
+        prev.status = CheckValue::Equal(self.0.into());
+        prev
+    }
+
+    fn item_process_result(self, _: &TxResponse) -> Self::Returns {}
+}
diff --git a/framework/scenario/src/facade/result_handlers/returns_message.rs b/framework/scenario/src/facade/result_handlers/returns_message.rs
index c9e9821055..64164e05ef 100644
--- a/framework/scenario/src/facade/result_handlers/returns_message.rs
+++ b/framework/scenario/src/facade/result_handlers/returns_message.rs
@@ -1,8 +1,10 @@
 use multiversx_sc::types::{RHListItem, RHListItemExec, TxEnv};
 
-use crate::scenario_model::TxResponse;
+use crate::scenario_model::{CheckValue, TxExpect, TxResponse};
 
 /// Indicates that the error status will be returned.
+///
+/// Can only be used in tests and interactors, not available in contracts.
 pub struct ReturnsMessage;
 
 impl<Env, Original> RHListItem<Env, Original> for ReturnsMessage
@@ -14,10 +16,11 @@ where
 
 impl<Env, Original> RHListItemExec<TxResponse, Env, Original> for ReturnsMessage
 where
-    Env: TxEnv,
+    Env: TxEnv<RHExpect = TxExpect>,
 {
-    fn is_error_handled(&self) -> bool {
-        true
+    fn item_tx_expect(&self, mut prev: TxExpect) -> TxExpect {
+        prev.message = CheckValue::Star;
+        prev
     }
 
     fn item_process_result(self, raw_result: &TxResponse) -> Self::Returns {
diff --git a/framework/scenario/src/facade/result_handlers/returns_status.rs b/framework/scenario/src/facade/result_handlers/returns_status.rs
index 7e81421efb..184163619d 100644
--- a/framework/scenario/src/facade/result_handlers/returns_status.rs
+++ b/framework/scenario/src/facade/result_handlers/returns_status.rs
@@ -1,8 +1,10 @@
 use multiversx_sc::types::{RHListItem, RHListItemExec, TxEnv};
 
-use crate::scenario_model::TxResponse;
+use crate::scenario_model::{CheckValue, TxExpect, TxResponse, U64Value};
 
 /// Indicates that the error status will be returned.
+///
+/// Can only be used in tests and interactors, not available in contracts.
 pub struct ReturnsStatus;
 
 impl<Env, Original> RHListItem<Env, Original> for ReturnsStatus
@@ -14,10 +16,18 @@ where
 
 impl<Env, Original> RHListItemExec<TxResponse, Env, Original> for ReturnsStatus
 where
-    Env: TxEnv,
+    Env: TxEnv<RHExpect = TxExpect>,
 {
-    fn is_error_handled(&self) -> bool {
-        true
+    fn item_tx_expect(&self, mut prev: TxExpect) -> TxExpect {
+        if let CheckValue::Equal(U64Value {
+            value: 0,
+            original: _,
+        }) = prev.status
+        {
+            prev.status = CheckValue::Star;
+        }
+
+        prev
     }
 
     fn item_process_result(self, raw_result: &TxResponse) -> Self::Returns {
diff --git a/framework/scenario/src/facade/world_tx/scenario_env.rs b/framework/scenario/src/facade/world_tx/scenario_env.rs
index 758cff63f1..4589e36599 100644
--- a/framework/scenario/src/facade/world_tx/scenario_env.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_env.rs
@@ -2,7 +2,11 @@ use std::path::PathBuf;
 
 use multiversx_sc::types::{AnnotatedValue, ManagedAddress, TxBaseWithEnv, TxEnv};
 
-use crate::{api::StaticApi, scenario_model::TxResponse, ScenarioWorld};
+use crate::{
+    api::StaticApi,
+    scenario_model::{TxExpect, TxResponse},
+    ScenarioWorld,
+};
 
 /// Designates a tx environment suitable for running scenarios locally.
 pub trait ScenarioTxEnv: TxEnv {
@@ -18,6 +22,8 @@ pub struct ScenarioTxEnvData {
 impl TxEnv for ScenarioTxEnvData {
     type Api = StaticApi;
 
+    type RHExpect = TxExpect;
+
     fn resolve_sender_address(&self) -> ManagedAddress<Self::Api> {
         panic!("Explicit sender address expected")
     }
diff --git a/framework/scenario/src/facade/world_tx/scenario_env_deploy.rs b/framework/scenario/src/facade/world_tx/scenario_env_deploy.rs
index fadd24d78d..ef7b2a243f 100644
--- a/framework/scenario/src/facade/world_tx/scenario_env_deploy.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_env_deploy.rs
@@ -41,6 +41,7 @@ where
     fn run(self) -> Self::Returns {
         let mut step =
             tx_to_sc_deploy_step(&self.env, self.from, self.payment, self.gas, self.data);
+        step.expect = Some(self.result_handler.list_tx_expect());
         self.env.world.sc_deploy(&mut step);
         process_result(step.response, self.result_handler)
     }
@@ -71,6 +72,7 @@ impl ScenarioWorld {
         let tx = f(tx_base);
         let mut step = tx_to_sc_deploy_step(&tx.env, tx.from, tx.payment, tx.gas, tx.data);
         self.sc_deploy(&mut step);
+        step.expect = Some(tx.result_handler.list_tx_expect());
         process_result(step.response, tx.result_handler);
         self
     }
diff --git a/framework/scenario/src/facade/world_tx/scenario_env_exec.rs b/framework/scenario/src/facade/world_tx/scenario_env_exec.rs
index e19c515c0b..25f738f5e4 100644
--- a/framework/scenario/src/facade/world_tx/scenario_env_exec.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_env_exec.rs
@@ -12,7 +12,7 @@ use multiversx_sc::{
 
 use crate::{
     api::StaticApi,
-    scenario_model::{AddressValue, BytesValue, ScCallStep, ScDeployStep, TxResponse},
+    scenario_model::{AddressValue, BytesValue, ScCallStep, ScDeployStep, TxExpect, TxResponse},
     ScenarioTxEnv, ScenarioTxRun, ScenarioWorld,
 };
 
@@ -27,6 +27,8 @@ pub struct ScenarioEnvExec<'w> {
 impl<'w> TxEnv for ScenarioEnvExec<'w> {
     type Api = StaticApi;
 
+    type RHExpect = TxExpect;
+
     fn resolve_sender_address(&self) -> ManagedAddress<Self::Api> {
         panic!("Explicit sender address expected")
     }
@@ -63,6 +65,7 @@ where
             self.gas,
             self.data,
         );
+        step.expect = Some(self.result_handler.list_tx_expect());
         self.env.world.sc_call(&mut step);
         process_result(step.response, self.result_handler)
     }
@@ -91,6 +94,7 @@ impl ScenarioWorld {
         let tx_base = TxBaseWithEnv::new_with_env(env);
         let tx = f(tx_base);
         let mut step = tx_to_sc_call_step(&tx.env, tx.from, tx.to, tx.payment, tx.gas, tx.data);
+        step.expect = Some(tx.result_handler.list_tx_expect());
         self.sc_call(&mut step);
         process_result(step.response, tx.result_handler);
         self
diff --git a/framework/scenario/src/facade/world_tx/scenario_env_query.rs b/framework/scenario/src/facade/world_tx/scenario_env_query.rs
index 993b4d9636..c25d0f61db 100644
--- a/framework/scenario/src/facade/world_tx/scenario_env_query.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_env_query.rs
@@ -9,8 +9,9 @@ use multiversx_sc::{
 };
 
 use crate::{
-    api::StaticApi, scenario_model::TxResponse, ScenarioTxEnv, ScenarioTxEnvData, ScenarioTxRun,
-    ScenarioWorld,
+    api::StaticApi,
+    scenario_model::{TxExpect, TxResponse},
+    ScenarioTxEnv, ScenarioTxEnvData, ScenarioTxRun, ScenarioWorld,
 };
 
 use super::scenario_env_util::*;
@@ -23,6 +24,8 @@ pub struct ScenarioEnvQuery<'w> {
 impl<'w> TxEnv for ScenarioEnvQuery<'w> {
     type Api = StaticApi;
 
+    type RHExpect = TxExpect;
+
     fn resolve_sender_address(&self) -> ManagedAddress<Self::Api> {
         panic!("Explicit sender address expected")
     }
@@ -49,6 +52,7 @@ where
 
     fn run(self) -> Self::Returns {
         let mut step = tx_to_sc_query_step(&self.env, self.to, self.data);
+        step.expect = Some(self.result_handler.list_tx_expect());
         self.env.world.sc_query(&mut step);
         process_result(step.response, self.result_handler)
     }
@@ -74,6 +78,7 @@ impl ScenarioWorld {
         let tx = f(tx_base);
         let mut step = tx_to_sc_query_step(&tx.env, tx.to, tx.data);
         self.sc_query(&mut step);
+        step.expect = Some(tx.result_handler.list_tx_expect());
         process_result(step.response, tx.result_handler);
         self
     }
diff --git a/framework/scenario/src/scenario/model/transaction/tx_expect.rs b/framework/scenario/src/scenario/model/transaction/tx_expect.rs
index 6f64a471f0..d487a10db5 100644
--- a/framework/scenario/src/scenario/model/transaction/tx_expect.rs
+++ b/framework/scenario/src/scenario/model/transaction/tx_expect.rs
@@ -23,6 +23,12 @@ pub struct TxExpect {
     pub additional_error_message: String,
 }
 
+impl Default for TxExpect {
+    fn default() -> Self {
+        Self::ok()
+    }
+}
+
 impl TxExpect {
     pub fn ok() -> Self {
         TxExpect {
diff --git a/framework/snippets/src/itx/interactor_env_deploy.rs b/framework/snippets/src/itx/interactor_env_deploy.rs
index d907db498e..6fdd9dfb48 100644
--- a/framework/snippets/src/itx/interactor_env_deploy.rs
+++ b/framework/snippets/src/itx/interactor_env_deploy.rs
@@ -66,9 +66,10 @@ where
     RH::ListReturns: NestedTupleFlatten,
 {
     pub async fn run(self) -> <RH::ListReturns as NestedTupleFlatten>::Unpacked {
-        let mut sc_deploy_step = self.sc_deploy_step;
-        self.world.sc_deploy(&mut sc_deploy_step).await;
-        process_result(sc_deploy_step.response, self.result_handler)
+        let mut step = self.sc_deploy_step;
+        step.expect = Some(self.result_handler.list_tx_expect());
+        self.world.sc_deploy(&mut step).await;
+        process_result(step.response, self.result_handler)
     }
 }
 
@@ -96,6 +97,7 @@ impl Interactor {
         let tx_base = TxBaseWithEnv::new_with_env(env);
         let tx = f(tx_base);
         let mut step = tx_to_sc_deploy_step(&tx.env, tx.from, tx.payment, tx.gas, tx.data);
+        step.expect = Some(tx.result_handler.list_tx_expect());
         self.sc_deploy(&mut step).await;
         process_result(step.response, tx.result_handler);
         self
@@ -128,6 +130,7 @@ impl Interactor {
         let tx_base = TxBaseWithEnv::new_with_env(env);
         let tx = f(tx_base);
         let mut step = tx_to_sc_deploy_step(&tx.env, tx.from, tx.payment, tx.gas, tx.data);
+        step.expect = Some(tx.result_handler.list_tx_expect());
         self.sc_deploy(&mut step).await;
         process_result(step.response, tx.result_handler)
     }
diff --git a/framework/snippets/src/itx/interactor_env_exec.rs b/framework/snippets/src/itx/interactor_env_exec.rs
index bc2d9d20da..15065c9191 100644
--- a/framework/snippets/src/itx/interactor_env_exec.rs
+++ b/framework/snippets/src/itx/interactor_env_exec.rs
@@ -11,7 +11,7 @@ use multiversx_sc_scenario::{
         },
     },
     scenario_env_util::*,
-    scenario_model::{AddressValue, BytesValue, ScCallStep, ScDeployStep, TxResponse},
+    scenario_model::{AddressValue, BytesValue, ScCallStep, ScDeployStep, TxExpect, TxResponse},
     ScenarioTxEnv, ScenarioTxEnvData, ScenarioTxRun, ScenarioWorld,
 };
 
@@ -26,6 +26,8 @@ pub struct InteractorEnvExec<'w> {
 impl<'w> TxEnv for InteractorEnvExec<'w> {
     type Api = StaticApi;
 
+    type RHExpect = TxExpect;
+
     fn resolve_sender_address(&self) -> ManagedAddress<Self::Api> {
         panic!("Explicit sender address expected")
     }
@@ -86,9 +88,10 @@ where
     RH::ListReturns: NestedTupleFlatten,
 {
     pub async fn run(self) -> <RH::ListReturns as NestedTupleFlatten>::Unpacked {
-        let mut sc_call_step = self.sc_call_step;
-        self.world.sc_call(&mut sc_call_step).await;
-        process_result(sc_call_step.response, self.result_handler)
+        let mut step = self.sc_call_step;
+        step.expect = Some(self.result_handler.list_tx_expect());
+        self.world.sc_call(&mut step).await;
+        process_result(step.response, self.result_handler)
     }
 }
 
@@ -115,6 +118,7 @@ impl Interactor {
         let tx_base = TxBaseWithEnv::new_with_env(env);
         let tx = f(tx_base);
         let mut step = tx_to_sc_call_step(&tx.env, tx.from, tx.to, tx.payment, tx.gas, tx.data);
+        step.expect = Some(tx.result_handler.list_tx_expect());
         self.sc_call(&mut step).await;
         process_result(step.response, tx.result_handler);
         self
diff --git a/framework/snippets/src/itx/interactor_env_query.rs b/framework/snippets/src/itx/interactor_env_query.rs
index 1628215992..1ca5be149a 100644
--- a/framework/snippets/src/itx/interactor_env_query.rs
+++ b/framework/snippets/src/itx/interactor_env_query.rs
@@ -10,7 +10,7 @@ use multiversx_sc_scenario::{
         },
     },
     scenario_env_util::*,
-    scenario_model::{ScQueryStep, TxResponse},
+    scenario_model::{ScQueryStep, TxExpect, TxResponse},
     ScenarioTxEnv, ScenarioTxEnvData, ScenarioTxRun, ScenarioWorld,
 };
 
@@ -24,6 +24,8 @@ pub struct InteractorEnvQuery<'w> {
 impl<'w> TxEnv for InteractorEnvQuery<'w> {
     type Api = StaticApi;
 
+    type RHExpect = TxExpect;
+
     fn resolve_sender_address(&self) -> ManagedAddress<Self::Api> {
         panic!("Explicit sender address expected")
     }
@@ -74,9 +76,10 @@ where
     RH::ListReturns: NestedTupleFlatten,
 {
     pub async fn run(self) -> <RH::ListReturns as NestedTupleFlatten>::Unpacked {
-        let mut sc_call_step = self.sc_query_step;
-        self.world.sc_query(&mut sc_call_step).await;
-        process_result(sc_call_step.response, self.result_handler)
+        let mut step = self.sc_query_step;
+        step.expect = Some(self.result_handler.list_tx_expect());
+        self.world.sc_query(&mut step).await;
+        process_result(step.response, self.result_handler)
     }
 }
 
@@ -99,6 +102,7 @@ impl Interactor {
         let tx_base = TxBaseWithEnv::new_with_env(env);
         let tx = f(tx_base);
         let mut step = tx_to_sc_query_step(&tx.env, tx.to, tx.data);
+        step.expect = Some(tx.result_handler.list_tx_expect());
         self.sc_query(&mut step).await;
         process_result(step.response, tx.result_handler);
         self

From 335a54e8a5a93eed59df8e2880f1c842d9c672f2 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 27 Mar 2024 01:05:44 +0200
Subject: [PATCH 0563/1254] multisig interactor cleanup

---
 contracts/examples/multisig/interact/config.toml       |  2 +-
 .../multisig/interact/src/multisig_interact.rs         | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/contracts/examples/multisig/interact/config.toml b/contracts/examples/multisig/interact/config.toml
index 1a1e45429a..a3b733f73d 100644
--- a/contracts/examples/multisig/interact/config.toml
+++ b/contracts/examples/multisig/interact/config.toml
@@ -1,2 +1,2 @@
-gateway = 'https://testnet-gateway.multiversx.com'
+gateway = 'https://devnet-gateway.multiversx.com'
 quorum = 2
diff --git a/contracts/examples/multisig/interact/src/multisig_interact.rs b/contracts/examples/multisig/interact/src/multisig_interact.rs
index 60d4ad2359..c60d0c9fac 100644
--- a/contracts/examples/multisig/interact/src/multisig_interact.rs
+++ b/contracts/examples/multisig/interact/src/multisig_interact.rs
@@ -13,7 +13,7 @@ use multisig_interact_config::Config;
 use multisig_interact_state::State;
 use multiversx_sc_scenario::{
     mandos_system::ScenarioRunner,
-    multiversx_sc::types::{BigUint, ReturnsNewAddress, ReturnsResultConv},
+    multiversx_sc::types::{BigUint, ReturnsNewAddress, ReturnsResult},
     scenario_format::interpret_trait::InterpretableFrom,
     standalone::retrieve_account_as_scenario_set_state,
     test_wallets,
@@ -309,7 +309,7 @@ impl MultisigInteract {
             .to(self.state.multisig().to_address())
             .typed(multisig_proxy::MultisigProxy)
             .quorum_reached(action_id)
-            .returns(ReturnsResultConv::<bool>::new())
+            .returns(ReturnsResult)
             .prepare_async()
             .run()
             .await
@@ -321,7 +321,7 @@ impl MultisigInteract {
             .to(self.state.multisig().to_address())
             .typed(multisig_proxy::MultisigProxy)
             .signed(signer, action_id)
-            .returns(ReturnsResultConv::<bool>::new())
+            .returns(ReturnsResult)
             .prepare_async()
             .run()
             .await
@@ -388,7 +388,7 @@ impl MultisigInteract {
             .to(self.state.multisig().to_address())
             .typed(multisig_proxy::MultisigProxy)
             .quorum()
-            .returns(ReturnsResultConv::<usize>::new())
+            .returns(ReturnsResult)
             .prepare_async()
             .run()
             .await;
@@ -403,7 +403,7 @@ impl MultisigInteract {
             .to(self.state.multisig().to_address())
             .typed(multisig_proxy::MultisigProxy)
             .num_board_members()
-            .returns(ReturnsResultConv::<usize>::new())
+            .returns(ReturnsResult)
             .prepare_async()
             .run()
             .await;

From f4c6c0c104af78c1b56c7f6eff27ee3016788bb4 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 27 Mar 2024 05:06:00 +0200
Subject: [PATCH 0564/1254] forwarder cleanup

---
 .../forwarder/src/contract_deploy.rs          | 31 +++++--------------
 .../tx_result_handler/returns_result.rs       | 19 ++++++++----
 2 files changed, 20 insertions(+), 30 deletions(-)

diff --git a/contracts/feature-tests/composability/forwarder/src/contract_deploy.rs b/contracts/feature-tests/composability/forwarder/src/contract_deploy.rs
index d3c92f81a7..30bc967665 100644
--- a/contracts/feature-tests/composability/forwarder/src/contract_deploy.rs
+++ b/contracts/feature-tests/composability/forwarder/src/contract_deploy.rs
@@ -35,22 +35,13 @@ pub trait DeployContractModule {
         code: &ManagedBuffer,
         opt_arg: OptionalValue<ManagedBuffer>,
     ) -> (ManagedAddress, OptionalValue<ManagedBuffer>) {
-        let (new_address, response_vec) = self
-            .tx()
+        self.tx()
             .typed(vault_proxy::VaultProxy)
             .init(opt_arg)
             .code(code.clone())
             .returns(ReturnsNewAddress)
-            .returns(ReturnsRawResult)
-            .sync_call();
-
-        let response = if response_vec.is_empty() {
-            OptionalValue::None
-        } else {
-            OptionalValue::Some(response_vec.get(0).clone_value())
-        };
-
-        (new_address, response)
+            .returns(ReturnsResult)
+            .sync_call()
     }
 
     #[endpoint]
@@ -59,22 +50,14 @@ pub trait DeployContractModule {
         source_address: ManagedAddress,
         opt_arg: OptionalValue<ManagedBuffer>,
     ) -> MultiValue2<ManagedAddress, OptionalValue<ManagedBuffer>> {
-        let (new_address, response_vec) = self
-            .tx()
+        self.tx()
             .typed(vault_proxy::VaultProxy)
             .init(opt_arg)
             .code_metadata(CodeMetadata::DEFAULT)
             .from_source(source_address)
             .returns(ReturnsNewAddress)
-            .returns(ReturnsRawResult)
-            .sync_call();
-
-        let response = if response_vec.is_empty() {
-            OptionalValue::None
-        } else {
-            OptionalValue::Some(response_vec.get(0).clone_value())
-        };
-
-        MultiValue2::from((new_address, response))
+            .returns(ReturnsResult)
+            .sync_call()
+            .into()
     }
 }
diff --git a/framework/base/src/types/interaction/tx_result_handler/returns_result.rs b/framework/base/src/types/interaction/tx_result_handler/returns_result.rs
index 71cbd020cf..5082a6bff6 100644
--- a/framework/base/src/types/interaction/tx_result_handler/returns_result.rs
+++ b/framework/base/src/types/interaction/tx_result_handler/returns_result.rs
@@ -1,11 +1,8 @@
 use multiversx_sc_codec::TopDecodeMulti;
 
-use crate::{
-    proxy_imports::SyncCallRawResult,
-    types::{
-        interaction::contract_call_exec::decode_result, ManagedBuffer, ManagedVec, RHListItem,
-        RHListItemExec, TxEnv,
-    },
+use crate::types::{
+    interaction::contract_call_exec::decode_result, DeployRawResult, ManagedBuffer, ManagedVec,
+    RHListItem, RHListItemExec, SyncCallRawResult, TxEnv,
 };
 
 /// Indicates that result will be returned.
@@ -29,3 +26,13 @@ where
         decode_result::<Env::Api, Original>(raw_result.0.clone())
     }
 }
+
+impl<Env, Original> RHListItemExec<DeployRawResult<Env::Api>, Env, Original> for ReturnsResult
+where
+    Env: TxEnv,
+    Original: TopDecodeMulti,
+{
+    fn item_process_result(self, raw_result: &DeployRawResult<Env::Api>) -> Original {
+        decode_result::<Env::Api, Original>(raw_result.raw_results.clone())
+    }
+}

From cd557953cb1258428e24d19828b235f8c66f890f Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 27 Mar 2024 05:21:15 +0200
Subject: [PATCH 0565/1254] vault proxy fix

---
 .../composability/forwarder/src/vault_proxy.rs        |  5 ++++-
 framework/base/src/abi/type_abi_impl_basic.rs         | 11 +++++------
 .../contract/generate_proxy/proxy_sc_functions_gen.rs |  2 +-
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/contracts/feature-tests/composability/forwarder/src/vault_proxy.rs b/contracts/feature-tests/composability/forwarder/src/vault_proxy.rs
index 2d6cb09693..f04735e6a5 100644
--- a/contracts/feature-tests/composability/forwarder/src/vault_proxy.rs
+++ b/contracts/feature-tests/composability/forwarder/src/vault_proxy.rs
@@ -1,7 +1,10 @@
+// Code generated by the multiversx-sc proxy generator. DO NOT EDIT.
+
 ////////////////////////////////////////////////////
 ////////////////// AUTO-GENERATED //////////////////
 ////////////////////////////////////////////////////
 
+#![allow(dead_code)]
 #![allow(clippy::all)]
 
 use multiversx_sc::proxy_imports::*;
@@ -67,7 +70,7 @@ where
     >(
         self,
         opt_arg_to_echo: Arg0,
-    ) -> TxProxyUpgrade<Env, From, To, Gas, MultiValue2<Box<str>, OptionalValue<ManagedBuffer<Env::Api>>>> {
+    ) -> TxProxyUpgrade<Env, From, To, Gas, MultiValue2<&'static str, OptionalValue<ManagedBuffer<Env::Api>>>> {
         self.wrapped_tx
             .raw_upgrade()
             .argument(&opt_arg_to_echo)
diff --git a/framework/base/src/abi/type_abi_impl_basic.rs b/framework/base/src/abi/type_abi_impl_basic.rs
index c14447b2ba..0487e19392 100644
--- a/framework/base/src/abi/type_abi_impl_basic.rs
+++ b/framework/base/src/abi/type_abi_impl_basic.rs
@@ -113,24 +113,23 @@ impl TypeAbi for String {
     }
 }
 
-impl TypeAbi for &str {
+impl TypeAbi for &'static str {
     fn type_name() -> TypeName {
-        TypeName::type_name()
+        String::type_name()
     }
 
     fn type_name_rust() -> TypeName {
-        // we need to convert to an owned type
-        "Box<str>".into()
+        "&'static str".into()
     }
 }
 
 impl TypeAbi for Box<str> {
     fn type_name() -> TypeName {
-        TypeName::type_name()
+        String::type_name()
     }
 
     fn type_name_rust() -> TypeName {
-        TypeName::type_name_rust()
+        "Box<str>".into()
     }
 }
 
diff --git a/framework/meta/src/cmd/contract/generate_proxy/proxy_sc_functions_gen.rs b/framework/meta/src/cmd/contract/generate_proxy/proxy_sc_functions_gen.rs
index 54eee5c44a..00ec38b490 100644
--- a/framework/meta/src/cmd/contract/generate_proxy/proxy_sc_functions_gen.rs
+++ b/framework/meta/src/cmd/contract/generate_proxy/proxy_sc_functions_gen.rs
@@ -167,7 +167,7 @@ fn write_upgrade_constructor_content(file: &mut File, inputs: Vec<InputAbi>) {
     writeln!(
         file,
         "        self.wrapped_tx
-                .raw_upgrade()"
+            .raw_upgrade()"
     )
     .unwrap();
     for input in inputs.iter() {

From a0beddf1da2449d4ee4bdb3823d4989aae660f44 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 27 Mar 2024 05:37:51 +0200
Subject: [PATCH 0566/1254] rename: upgrade_async_call_and_exit

---
 .../forwarder-raw/src/forwarder_raw_deploy_upgrade.rs  |  4 ++--
 .../composability/forwarder/src/contract_upgrade.rs    | 10 ++++------
 .../base/src/types/interaction/tx_call_upgrade.rs      | 10 ++++++++--
 3 files changed, 14 insertions(+), 10 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 07ddea1c3a..acd385db2c 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
@@ -52,7 +52,7 @@ pub trait ForwarderRawDeployUpgrade {
             .code(new_code)
             .code_metadata(code_metadata)
             .arguments_raw(args.to_arg_buffer())
-            .upgrade_async_call();
+            .upgrade_async_call_and_exit();
     }
 
     #[endpoint]
@@ -70,6 +70,6 @@ pub trait ForwarderRawDeployUpgrade {
             .code_metadata(code_metadata)
             .arguments_raw(args.to_arg_buffer())
             .with_gas_limit(self.blockchain().get_gas_left())
-            .upgrade_async_call();
+            .upgrade_async_call_and_exit();
     }
 }
diff --git a/contracts/feature-tests/composability/forwarder/src/contract_upgrade.rs b/contracts/feature-tests/composability/forwarder/src/contract_upgrade.rs
index a1a402c6e7..f4782821e0 100644
--- a/contracts/feature-tests/composability/forwarder/src/contract_upgrade.rs
+++ b/contracts/feature-tests/composability/forwarder/src/contract_upgrade.rs
@@ -11,14 +11,13 @@ pub trait UpgradeContractModule {
         new_code: ManagedBuffer,
         opt_arg: OptionalValue<ManagedBuffer>,
     ) {
-        let _ = self
-            .tx()
+        self.tx()
             .to(child_sc_address)
             .typed(vault_proxy::VaultProxy)
             .upgrade(opt_arg)
             .code(new_code)
             .code_metadata(CodeMetadata::UPGRADEABLE)
-            .upgrade_async_call();
+            .upgrade_async_call_and_exit();
     }
 
     #[endpoint]
@@ -28,13 +27,12 @@ pub trait UpgradeContractModule {
         source_address: ManagedAddress,
         opt_arg: OptionalValue<ManagedBuffer>,
     ) {
-        let _ = self
-            .tx()
+        self.tx()
             .to(child_sc_address)
             .typed(vault_proxy::VaultProxy)
             .upgrade(opt_arg)
             .code_metadata(CodeMetadata::UPGRADEABLE)
             .from_source(source_address)
-            .upgrade_async_call();
+            .upgrade_async_call_and_exit();
     }
 }
diff --git a/framework/base/src/types/interaction/tx_call_upgrade.rs b/framework/base/src/types/interaction/tx_call_upgrade.rs
index 013c5adf06..93104a0f08 100644
--- a/framework/base/src/types/interaction/tx_call_upgrade.rs
+++ b/framework/base/src/types/interaction/tx_call_upgrade.rs
@@ -28,7 +28,10 @@ where
     CodeValue: TxCodeValue<TxScEnv<Api>>,
     RH: TxEmptyResultHandler<TxScEnv<Api>>,
 {
-    pub fn upgrade_async_call(self) {
+    /// Launches the upgrade async call.
+    ///
+    /// TODO: change return type to `!`.
+    pub fn upgrade_async_call_and_exit(self) {
         let gas = self.gas.explicit_or_gas_left(&self.env);
         self.payment.with_egld_value(|egld_value| {
             SendRawWrapper::<Api>::new().upgrade_contract(
@@ -60,7 +63,10 @@ where
     FromSourceValue: TxFromSourceValue<TxScEnv<Api>>,
     RH: TxEmptyResultHandler<TxScEnv<Api>>,
 {
-    pub fn upgrade_async_call(self) {
+    /// Launches the upgrade from source async call.
+    ///
+    /// TODO: change return type to `!`.
+    pub fn upgrade_async_call_and_exit(self) {
         let gas = self.gas.explicit_or_gas_left(&self.env);
         self.payment.with_egld_value(|egld_value| {
             SendRawWrapper::<Api>::new().upgrade_from_source_contract(

From 8a0c266dbaba3a6da22cbcf8b8e647ed0ea17452 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 27 Mar 2024 05:47:13 +0200
Subject: [PATCH 0567/1254] doc fix

---
 .../base/src/types/interaction/tx_call_deploy.rs | 12 ++++++++----
 .../src/types/interaction/tx_call_upgrade.rs     | 16 ++++++++++------
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/framework/base/src/types/interaction/tx_call_deploy.rs b/framework/base/src/types/interaction/tx_call_deploy.rs
index 0fd9cedc74..1b41ccb406 100644
--- a/framework/base/src/types/interaction/tx_call_deploy.rs
+++ b/framework/base/src/types/interaction/tx_call_deploy.rs
@@ -160,8 +160,10 @@ where
     /// Backwards compatibility, immitates the old API.
     ///
     /// Note that the data type (the `DeployCall`) doesn't have the code set.
-    /// This is because the old API was passing it as paramter, so we do the Apime here.
-    /// For clarity, we don't want it set twice.
+    /// This is because the old API was passing it as paramter, so we use it from the `code` argument.
+    ///
+    /// Also note that the code metadata is taken from the `code_metadata` argument.
+    /// If another one was previously set in the `Tx` object, that one will be ignored.
     pub fn deploy_contract<RequestedResult>(
         self,
         code: &ManagedBuffer<Api>,
@@ -181,8 +183,10 @@ where
     /// Backwards compatibility, immitates the old API.
     ///
     /// Note that the data type (the `DeployCall`) doesn't have the code set.
-    /// This is because the old API was passing it as paramter, so we do the Apime here.
-    /// For clarity, we don't want it set twice.
+    /// This is because the old API was passing it as paramter, so we use it from the `code` argument.
+    ///
+    /// Also note that the code metadata is taken from the `code_metadata` argument.
+    /// If another one was previously set in the `Tx` object, that one will be ignored.
     pub fn deploy_from_source<RequestedResult>(
         self,
         source_address: &ManagedAddress<Api>,
diff --git a/framework/base/src/types/interaction/tx_call_upgrade.rs b/framework/base/src/types/interaction/tx_call_upgrade.rs
index 93104a0f08..2d6af25fab 100644
--- a/framework/base/src/types/interaction/tx_call_upgrade.rs
+++ b/framework/base/src/types/interaction/tx_call_upgrade.rs
@@ -91,9 +91,11 @@ where
 {
     /// Backwards compatibility, immitates the old API.
     ///
-    /// Note that the data type (the `DeployCall`) doesn't have the code set.
-    /// This is because the old API was passing it as paramter, so we do the Apime here.
-    /// For clarity, we don't want it set twice.
+    /// Note that the data type (the `UpgradeCall`) doesn't have the code set.
+    /// This is because the old API was passing it as paramter, so we use it from the `code` argument.
+    ///
+    /// Also note that the code metadata is taken from the `code_metadata` argument.
+    /// If another one was previously set in the `Tx` object, that one will be ignored.
     pub fn upgrade_contract(self, code: &ManagedBuffer<Api>, code_metadata: CodeMetadata) {
         let gas = self.gas.explicit_or_gas_left(&self.env);
         self.payment.with_egld_value(|egld_value| {
@@ -110,9 +112,11 @@ where
 
     /// Backwards compatibility, immitates the old API.
     ///
-    /// Note that the data type (the `DeployCall`) doesn't have the code set.
-    /// This is because the old API was passing it as paramter, so we do the Apime here.
-    /// For clarity, we don't want it set twice.
+    /// Note that the data type (the `UpgradeCall`) doesn't have the code set.
+    /// This is because the old API was passing it as paramter, so we use it from the `code` argument.
+    ///
+    /// Also note that the code metadata is taken from the `code_metadata` argument.
+    /// If another one was previously set in the `Tx` object, that one will be ignored.
     pub fn upgrade_from_source(
         self,
         source_address: &ManagedAddress<Api>,

From 09521e404062b2ee1314be6918f0a766e80fe8ce Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 27 Mar 2024 06:59:20 +0200
Subject: [PATCH 0568/1254] AnnotatedValue refactor

---
 .../base/src/types/interaction/annotated.rs   | 104 ++++++++++++++++--
 .../types/interaction/expr/address_expr.rs    |  17 +--
 .../src/types/interaction/expr/sc_expr.rs     |  17 +--
 .../src/types/interaction/tx_call_deploy.rs   |   4 +-
 .../base/src/types/interaction/tx_call_te.rs  |   4 +-
 .../src/types/interaction/tx_call_upgrade.rs  |   8 +-
 .../base/src/types/interaction/tx_payment.rs  |  17 ++-
 .../interaction/tx_payment/tx_payment_egld.rs |  38 +++++--
 .../tx_payment/tx_payment_egld_value.rs       |  41 +------
 .../tx_payment/tx_payment_multi_esdt.rs       |   4 +-
 .../interaction/tx_payment/tx_payment_none.rs |  18 +--
 .../tx_payment/tx_payment_other.rs            |   4 +-
 .../tx_payment/tx_payment_single_esdt.rs      |   2 +-
 .../tx_payment/tx_payment_single_esdt_ref.rs  |   2 +-
 framework/base/src/types/interaction/tx_to.rs |  53 ++-------
 .../types/interaction/tx_to/tx_to_caller.rs   |  13 +--
 .../src/types/interaction/tx_to/tx_to_self.rs |  13 +--
 .../scenario/src/facade/contract_info.rs      |   9 +-
 .../src/facade/world_tx/expr/file_expr.rs     |   2 +-
 .../src/facade/world_tx/expr/mxsc_expr.rs     |   2 +-
 .../scenario/model/value/value_set_bytes.rs   |   6 +-
 21 files changed, 181 insertions(+), 197 deletions(-)

diff --git a/framework/base/src/types/interaction/annotated.rs b/framework/base/src/types/interaction/annotated.rs
index 8571b4669b..afaecf184e 100644
--- a/framework/base/src/types/interaction/annotated.rs
+++ b/framework/base/src/types/interaction/annotated.rs
@@ -2,13 +2,31 @@ use crate::types::{heap::Address, BigUint, ManagedAddress, ManagedBuffer};
 
 use super::TxEnv;
 
-pub trait AnnotatedValue<Env, T>
+pub trait AnnotatedValue<Env, T>: Sized
 where
     Env: TxEnv,
 {
     fn annotation(&self, env: &Env) -> ManagedBuffer<Env::Api>;
 
-    fn into_value(self, env: &Env) -> T;
+    /// Produces the value from a reference of the annotated type. Might involve a `.clone()` in some cases.
+    fn to_value(&self, env: &Env) -> T;
+
+    /// Consumes annotated value to produce actual value.
+    ///
+    /// Override whenever it helps to avoid an unnecessary clone.
+    fn into_value(self, env: &Env) -> T {
+        self.to_value(env)
+    }
+
+    /// Can be used when working with references only.
+    ///
+    /// Override whenever it helps to avoid an unnecessary clone.
+    fn with_value_ref<F, R>(&self, env: &Env, f: F) -> R
+    where
+        F: FnOnce(&T) -> R,
+    {
+        f(&self.to_value(env))
+    }
 }
 
 impl<Env> AnnotatedValue<Env, ManagedAddress<Env::Api>> for ManagedAddress<Env::Api>
@@ -19,9 +37,20 @@ where
         self.hex_expr()
     }
 
+    fn to_value(&self, env: &Env) -> ManagedAddress<Env::Api> {
+        self.clone()
+    }
+
     fn into_value(self, _env: &Env) -> ManagedAddress<Env::Api> {
         self
     }
+
+    fn with_value_ref<F, R>(&self, env: &Env, f: F) -> R
+    where
+        F: FnOnce(&ManagedAddress<Env::Api>) -> R,
+    {
+        f(self)
+    }
 }
 
 impl<Env> AnnotatedValue<Env, ManagedAddress<Env::Api>> for &ManagedAddress<Env::Api>
@@ -32,9 +61,20 @@ where
         self.hex_expr()
     }
 
+    fn to_value(&self, env: &Env) -> ManagedAddress<Env::Api> {
+        (*self).clone()
+    }
+
     fn into_value(self, _env: &Env) -> ManagedAddress<Env::Api> {
         self.clone()
     }
+
+    fn with_value_ref<F, R>(&self, env: &Env, f: F) -> R
+    where
+        F: FnOnce(&ManagedAddress<Env::Api>) -> R,
+    {
+        f(self)
+    }
 }
 
 impl<Env> AnnotatedValue<Env, ManagedAddress<Env::Api>> for Address
@@ -45,8 +85,8 @@ where
         ManagedAddress::from(self).hex_expr()
     }
 
-    fn into_value(self, _env: &Env) -> ManagedAddress<Env::Api> {
-        self.into()
+    fn to_value(&self, env: &Env) -> ManagedAddress<Env::Api> {
+        ManagedAddress::from(self)
     }
 }
 
@@ -58,8 +98,8 @@ where
         ManagedAddress::from(*self).hex_expr()
     }
 
-    fn into_value(self, _env: &Env) -> ManagedAddress<Env::Api> {
-        self.into()
+    fn to_value(&self, env: &Env) -> ManagedAddress<Env::Api> {
+        ManagedAddress::from(*self)
     }
 }
 
@@ -71,9 +111,20 @@ where
         self.hex_expr()
     }
 
+    fn to_value(&self, _env: &Env) -> ManagedBuffer<Env::Api> {
+        self.clone()
+    }
+
     fn into_value(self, _env: &Env) -> ManagedBuffer<Env::Api> {
         self
     }
+
+    fn with_value_ref<F, R>(&self, env: &Env, f: F) -> R
+    where
+        F: FnOnce(&ManagedBuffer<Env::Api>) -> R,
+    {
+        f(self)
+    }
 }
 
 impl<Env> AnnotatedValue<Env, BigUint<Env::Api>> for BigUint<Env::Api>
@@ -84,9 +135,20 @@ where
         self.to_display()
     }
 
+    fn to_value(&self, _env: &Env) -> BigUint<Env::Api> {
+        self.clone()
+    }
+
     fn into_value(self, _env: &Env) -> BigUint<Env::Api> {
         self
     }
+
+    fn with_value_ref<F, R>(&self, env: &Env, f: F) -> R
+    where
+        F: FnOnce(&BigUint<Env::Api>) -> R,
+    {
+        f(self)
+    }
 }
 
 impl<Env> AnnotatedValue<Env, BigUint<Env::Api>> for &BigUint<Env::Api>
@@ -97,9 +159,20 @@ where
         self.to_display()
     }
 
+    fn to_value(&self, _env: &Env) -> BigUint<Env::Api> {
+        (*self).clone()
+    }
+
     fn into_value(self, _env: &Env) -> BigUint<Env::Api> {
         self.clone()
     }
+
+    fn with_value_ref<F, R>(&self, env: &Env, f: F) -> R
+    where
+        F: FnOnce(&BigUint<Env::Api>) -> R,
+    {
+        f(self)
+    }
 }
 
 impl<Env> AnnotatedValue<Env, BigUint<Env::Api>> for u64
@@ -107,10 +180,23 @@ where
     Env: TxEnv,
 {
     fn annotation(&self, env: &Env) -> ManagedBuffer<Env::Api> {
-        self.into_value(env).to_display()
+        self.to_value(env).to_display()
     }
 
-    fn into_value(self, _env: &Env) -> BigUint<Env::Api> {
-        BigUint::<Env::Api>::from(self)
+    fn to_value(&self, _env: &Env) -> BigUint<Env::Api> {
+        BigUint::from(*self)
+    }
+}
+
+impl<Env> AnnotatedValue<Env, BigUint<Env::Api>> for ()
+where
+    Env: TxEnv,
+{
+    fn annotation(&self, env: &Env) -> ManagedBuffer<Env::Api> {
+        ManagedBuffer::from("0")
+    }
+
+    fn to_value(&self, _env: &Env) -> BigUint<Env::Api> {
+        BigUint::zero()
     }
 }
diff --git a/framework/base/src/types/interaction/expr/address_expr.rs b/framework/base/src/types/interaction/expr/address_expr.rs
index ce2fa10fb5..dddfa5b53c 100644
--- a/framework/base/src/types/interaction/expr/address_expr.rs
+++ b/framework/base/src/types/interaction/expr/address_expr.rs
@@ -20,11 +20,12 @@ where
         result
     }
 
-    fn into_value(self, _env: &Env) -> ManagedAddress<Env::Api> {
+    fn to_value(&self, _env: &Env) -> ManagedAddress<Env::Api> {
         let expr: [u8; 32] = self.eval_to_array();
         expr.into()
     }
 }
+
 impl<Env> TxFrom<Env> for AddressExpr
 where
     Env: TxEnv,
@@ -36,19 +37,7 @@ where
 }
 impl<Env> TxFromSpecified<Env> for AddressExpr where Env: TxEnv {}
 impl<Env> TxTo<Env> for AddressExpr where Env: TxEnv {}
-impl<Env> TxToSpecified<Env> for AddressExpr
-where
-    Env: TxEnv,
-{
-    fn with_address_ref<F, R>(&self, _env: &Env, f: F) -> R
-    where
-        F: FnOnce(&ManagedAddress<Env::Api>) -> R,
-    {
-        let expr: [u8; 32] = self.eval_to_array();
-        let ma = expr.into();
-        f(&ma)
-    }
-}
+impl<Env> TxToSpecified<Env> for AddressExpr where Env: TxEnv {}
 
 impl AddressExpr {
     pub const fn eval_to_array(&self) -> [u8; 32] {
diff --git a/framework/base/src/types/interaction/expr/sc_expr.rs b/framework/base/src/types/interaction/expr/sc_expr.rs
index 1613587402..c84f8df02f 100644
--- a/framework/base/src/types/interaction/expr/sc_expr.rs
+++ b/framework/base/src/types/interaction/expr/sc_expr.rs
@@ -22,11 +22,12 @@ where
         result
     }
 
-    fn into_value(self, _env: &Env) -> ManagedAddress<Env::Api> {
+    fn to_value(&self, _env: &Env) -> ManagedAddress<Env::Api> {
         let expr: [u8; 32] = self.eval_to_array();
         expr.into()
     }
 }
+
 impl<'a, Env> TxFrom<Env> for ScExpr<'a>
 where
     Env: TxEnv,
@@ -38,19 +39,7 @@ where
 }
 impl<'a, Env> TxFromSpecified<Env> for ScExpr<'a> where Env: TxEnv {}
 impl<'a, Env> TxTo<Env> for ScExpr<'a> where Env: TxEnv {}
-impl<'a, Env> TxToSpecified<Env> for ScExpr<'a>
-where
-    Env: TxEnv,
-{
-    fn with_address_ref<F, R>(&self, _env: &Env, f: F) -> R
-    where
-        F: FnOnce(&ManagedAddress<Env::Api>) -> R,
-    {
-        let expr: [u8; 32] = self.eval_to_array();
-        let ma = expr.into();
-        f(&ma)
-    }
-}
+impl<'a, Env> TxToSpecified<Env> for ScExpr<'a> where Env: TxEnv {}
 
 impl<'a> ScExpr<'a> {
     pub const fn eval_to_array(&self) -> [u8; 32] {
diff --git a/framework/base/src/types/interaction/tx_call_deploy.rs b/framework/base/src/types/interaction/tx_call_deploy.rs
index 1b41ccb406..53814cd128 100644
--- a/framework/base/src/types/interaction/tx_call_deploy.rs
+++ b/framework/base/src/types/interaction/tx_call_deploy.rs
@@ -33,7 +33,7 @@ where
     fn execute_deploy_raw(self) -> (ManagedAddress<Api>, ManagedVec<Api, ManagedBuffer<Api>>, RH) {
         let gas_limit = self.gas.resolve_gas(&self.env);
 
-        let (new_address, raw_results) = self.payment.with_egld_value(|egld_value| {
+        let (new_address, raw_results) = self.payment.with_egld_value(&self.env, |egld_value| {
             SendRawWrapper::<Api>::new().deploy_contract(
                 gas_limit,
                 egld_value,
@@ -71,7 +71,7 @@ where
     ) -> (ManagedAddress<Api>, ManagedVec<Api, ManagedBuffer<Api>>, RH) {
         let gas_limit = self.gas.resolve_gas(&self.env);
 
-        let (new_address, raw_results) = self.payment.with_egld_value(|egld_value| {
+        let (new_address, raw_results) = self.payment.with_egld_value(&self.env, |egld_value| {
             SendRawWrapper::<Api>::new().deploy_from_source_contract(
                 gas_limit,
                 egld_value,
diff --git a/framework/base/src/types/interaction/tx_call_te.rs b/framework/base/src/types/interaction/tx_call_te.rs
index 5cb81a6f0f..6e81e7b8bb 100644
--- a/framework/base/src/types/interaction/tx_call_te.rs
+++ b/framework/base/src/types/interaction/tx_call_te.rs
@@ -25,7 +25,7 @@ where
     pub fn transfer_execute(self) {
         let gas_limit: u64;
         if self.data.is_no_call() {
-            if self.payment.is_no_payment() {
+            if self.payment.is_no_payment(&self.env) {
                 return;
             } else {
                 gas_limit = 0;
@@ -54,7 +54,7 @@ where
     ///
     /// Can only used for simple transfers.
     pub fn transfer_if_not_empty(self) {
-        if self.payment.is_no_payment() {
+        if self.payment.is_no_payment(&self.env) {
             return;
         }
 
diff --git a/framework/base/src/types/interaction/tx_call_upgrade.rs b/framework/base/src/types/interaction/tx_call_upgrade.rs
index 2d6af25fab..24438da3c3 100644
--- a/framework/base/src/types/interaction/tx_call_upgrade.rs
+++ b/framework/base/src/types/interaction/tx_call_upgrade.rs
@@ -33,7 +33,7 @@ where
     /// TODO: change return type to `!`.
     pub fn upgrade_async_call_and_exit(self) {
         let gas = self.gas.explicit_or_gas_left(&self.env);
-        self.payment.with_egld_value(|egld_value| {
+        self.payment.with_egld_value(&self.env, |egld_value| {
             SendRawWrapper::<Api>::new().upgrade_contract(
                 &self.to,
                 gas,
@@ -68,7 +68,7 @@ where
     /// TODO: change return type to `!`.
     pub fn upgrade_async_call_and_exit(self) {
         let gas = self.gas.explicit_or_gas_left(&self.env);
-        self.payment.with_egld_value(|egld_value| {
+        self.payment.with_egld_value(&self.env, |egld_value| {
             SendRawWrapper::<Api>::new().upgrade_from_source_contract(
                 &self.to,
                 gas,
@@ -98,7 +98,7 @@ where
     /// If another one was previously set in the `Tx` object, that one will be ignored.
     pub fn upgrade_contract(self, code: &ManagedBuffer<Api>, code_metadata: CodeMetadata) {
         let gas = self.gas.explicit_or_gas_left(&self.env);
-        self.payment.with_egld_value(|egld_value| {
+        self.payment.with_egld_value(&self.env, |egld_value| {
             SendRawWrapper::<Api>::new().upgrade_contract(
                 &self.to,
                 gas,
@@ -123,7 +123,7 @@ where
         code_metadata: CodeMetadata,
     ) {
         let gas = self.gas.explicit_or_gas_left(&self.env);
-        self.payment.with_egld_value(|egld_value| {
+        self.payment.with_egld_value(&self.env, |egld_value| {
             SendRawWrapper::<Api>::new().upgrade_from_source_contract(
                 &self.to,
                 gas,
diff --git a/framework/base/src/types/interaction/tx_payment.rs b/framework/base/src/types/interaction/tx_payment.rs
index 4b2f54e29f..978190a67a 100644
--- a/framework/base/src/types/interaction/tx_payment.rs
+++ b/framework/base/src/types/interaction/tx_payment.rs
@@ -18,7 +18,7 @@ use crate::{
     },
 };
 
-use super::{FunctionCall, TxEnv, TxFrom, TxToSpecified};
+use super::{AnnotatedValue, FunctionCall, TxEnv, TxFrom, TxToSpecified};
 
 /// Describes a payment that is part of a transaction.
 pub trait TxPayment<Env>
@@ -26,7 +26,7 @@ where
     Env: TxEnv,
 {
     /// Returns true if payment indicates transfer of either non-zero EGLD or ESDT amounts.
-    fn is_no_payment(&self) -> bool;
+    fn is_no_payment(&self, env: &Env) -> bool;
 
     /// Transfer-execute calls have different APIs for different payments types.
     /// This method selects between them.
@@ -57,15 +57,20 @@ where
 }
 
 /// Marks a payment object that only contains EGLD or nothing at all.
-pub trait TxPaymentEgldOnly<Env>: TxPayment<Env>
+pub trait TxPaymentEgldOnly<Env>: TxPayment<Env> + AnnotatedValue<Env, BigUint<Env::Api>>
 where
     Env: TxEnv,
 {
-    fn with_egld_value<F, R>(&self, f: F) -> R
+    fn with_egld_value<F, R>(&self, env: &Env, f: F) -> R
     where
-        F: FnOnce(&BigUint<Env::Api>) -> R;
+        F: FnOnce(&BigUint<Env::Api>) -> R,
+    {
+        self.with_value_ref(env, f)
+    }
 
-    fn into_egld_payment(self, env: &Env) -> BigUint<Env::Api>;
+    fn into_egld_payment(self, env: &Env) -> BigUint<Env::Api> {
+        self.into_value(env)
+    }
 }
 
 #[derive(Clone)]
diff --git a/framework/base/src/types/interaction/tx_payment/tx_payment_egld.rs b/framework/base/src/types/interaction/tx_payment/tx_payment_egld.rs
index a4881bda05..2c730591cd 100644
--- a/framework/base/src/types/interaction/tx_payment/tx_payment_egld.rs
+++ b/framework/base/src/types/interaction/tx_payment/tx_payment_egld.rs
@@ -1,5 +1,6 @@
 use crate::{
     contract_base::SendRawWrapper,
+    proxy_imports::{AnnotatedValue, ManagedBuffer},
     types::{BigUint, ManagedAddress, ManagedVec, TxFrom, TxToSpecified},
 };
 
@@ -18,18 +19,18 @@ where
     Env: TxEnv,
     EgldValue: TxEgldValue<Env>,
 {
-    fn is_no_payment(&self) -> bool {
-        self.0.with_egld_value(|egld_value| egld_value == &0u32)
+    fn is_no_payment(&self, env: &Env) -> bool {
+        self.0.with_value_ref(env, |egld_value| egld_value == &0u32)
     }
 
     fn perform_transfer_execute(
         self,
-        _env: &Env,
+        env: &Env,
         to: &ManagedAddress<Env::Api>,
         gas_limit: u64,
         fc: FunctionCall<Env::Api>,
     ) {
-        self.0.with_egld_value(|egld_value| {
+        self.0.with_value_ref(env, |egld_value| {
             let _ = SendRawWrapper::<Env::Api>::new().direct_egld_execute(
                 to,
                 egld_value,
@@ -55,7 +56,7 @@ where
     {
         to.with_address_ref(env, |to_addr| {
             self.0
-                .with_egld_value(|egld_value| f(to_addr, egld_value, &fc))
+                .with_value_ref(env, |egld_value| f(to_addr, egld_value, &fc))
         })
     }
 
@@ -67,19 +68,34 @@ where
     }
 }
 
-impl<Env, EgldValue> TxPaymentEgldOnly<Env> for Egld<EgldValue>
+impl<Env, EgldValue> AnnotatedValue<Env, BigUint<Env::Api>> for Egld<EgldValue>
 where
     Env: TxEnv,
     EgldValue: TxEgldValue<Env>,
 {
-    fn with_egld_value<F, R>(&self, f: F) -> R
+    fn annotation(&self, env: &Env) -> ManagedBuffer<Env::Api> {
+        self.0.annotation(env)
+    }
+
+    fn to_value(&self, env: &Env) -> BigUint<Env::Api> {
+        self.0.to_value(env)
+    }
+
+    fn into_value(self, env: &Env) -> BigUint<Env::Api> {
+        self.0.into_value(env)
+    }
+
+    fn with_value_ref<F, R>(&self, env: &Env, f: F) -> R
     where
         F: FnOnce(&BigUint<Env::Api>) -> R,
     {
-        self.0.with_egld_value(f)
+        self.0.with_value_ref(env, f)
     }
+}
 
-    fn into_egld_payment(self, env: &Env) -> BigUint<Env::Api> {
-        self.0.into_value(env)
-    }
+impl<Env, EgldValue> TxPaymentEgldOnly<Env> for Egld<EgldValue>
+where
+    Env: TxEnv,
+    EgldValue: TxEgldValue<Env>,
+{
 }
diff --git a/framework/base/src/types/interaction/tx_payment/tx_payment_egld_value.rs b/framework/base/src/types/interaction/tx_payment/tx_payment_egld_value.rs
index 561235eef2..8fcaab3ceb 100644
--- a/framework/base/src/types/interaction/tx_payment/tx_payment_egld_value.rs
+++ b/framework/base/src/types/interaction/tx_payment/tx_payment_egld_value.rs
@@ -6,43 +6,8 @@ pub trait TxEgldValue<Env>: AnnotatedValue<Env, BigUint<Env::Api>>
 where
     Env: TxEnv,
 {
-    fn with_egld_value<F, R>(&self, f: F) -> R
-    where
-        F: FnOnce(&BigUint<Env::Api>) -> R;
 }
 
-impl<Env> TxEgldValue<Env> for BigUint<Env::Api>
-where
-    Env: TxEnv,
-{
-    fn with_egld_value<F, R>(&self, f: F) -> R
-    where
-        F: FnOnce(&BigUint<Env::Api>) -> R,
-    {
-        f(self)
-    }
-}
-
-impl<Env> TxEgldValue<Env> for &BigUint<Env::Api>
-where
-    Env: TxEnv,
-{
-    fn with_egld_value<F, R>(&self, f: F) -> R
-    where
-        F: FnOnce(&BigUint<Env::Api>) -> R,
-    {
-        f(*self)
-    }
-}
-
-impl<Env> TxEgldValue<Env> for u64
-where
-    Env: TxEnv,
-{
-    fn with_egld_value<F, R>(&self, f: F) -> R
-    where
-        F: FnOnce(&BigUint<Env::Api>) -> R,
-    {
-        f(&BigUint::<Env::Api>::from(*self))
-    }
-}
+impl<Env> TxEgldValue<Env> for BigUint<Env::Api> where Env: TxEnv {}
+impl<Env> TxEgldValue<Env> for &BigUint<Env::Api> where Env: TxEnv {}
+impl<Env> TxEgldValue<Env> for u64 where Env: TxEnv {}
diff --git a/framework/base/src/types/interaction/tx_payment/tx_payment_multi_esdt.rs b/framework/base/src/types/interaction/tx_payment/tx_payment_multi_esdt.rs
index 39f0e6a64c..78acfd87f7 100644
--- a/framework/base/src/types/interaction/tx_payment/tx_payment_multi_esdt.rs
+++ b/framework/base/src/types/interaction/tx_payment/tx_payment_multi_esdt.rs
@@ -9,7 +9,7 @@ impl<Env> TxPayment<Env> for &MultiEsdtPayment<Env::Api>
 where
     Env: TxEnv,
 {
-    fn is_no_payment(&self) -> bool {
+    fn is_no_payment(&self, _env: &Env) -> bool {
         self.is_empty()
     }
 
@@ -64,7 +64,7 @@ impl<Env> TxPayment<Env> for MultiEsdtPayment<Env::Api>
 where
     Env: TxEnv,
 {
-    fn is_no_payment(&self) -> bool {
+    fn is_no_payment(&self, _env: &Env) -> bool {
         self.is_empty()
     }
 
diff --git a/framework/base/src/types/interaction/tx_payment/tx_payment_none.rs b/framework/base/src/types/interaction/tx_payment/tx_payment_none.rs
index d97143a2ad..54c82b3a3c 100644
--- a/framework/base/src/types/interaction/tx_payment/tx_payment_none.rs
+++ b/framework/base/src/types/interaction/tx_payment/tx_payment_none.rs
@@ -12,7 +12,7 @@ impl<Env> TxPayment<Env> for ()
 where
     Env: TxEnv,
 {
-    fn is_no_payment(&self) -> bool {
+    fn is_no_payment(&self, _env: &Env) -> bool {
         true
     }
 
@@ -47,18 +47,4 @@ where
     }
 }
 
-impl<Env> TxPaymentEgldOnly<Env> for ()
-where
-    Env: TxEnv,
-{
-    fn with_egld_value<F, R>(&self, f: F) -> R
-    where
-        F: FnOnce(&BigUint<Env::Api>) -> R,
-    {
-        f(&BigUint::zero())
-    }
-
-    fn into_egld_payment(self, _env: &Env) -> BigUint<Env::Api> {
-        BigUint::zero()
-    }
-}
+impl<Env> TxPaymentEgldOnly<Env> for () where Env: TxEnv {}
diff --git a/framework/base/src/types/interaction/tx_payment/tx_payment_other.rs b/framework/base/src/types/interaction/tx_payment/tx_payment_other.rs
index 5a28d80902..01d1c3a6bb 100644
--- a/framework/base/src/types/interaction/tx_payment/tx_payment_other.rs
+++ b/framework/base/src/types/interaction/tx_payment/tx_payment_other.rs
@@ -12,7 +12,7 @@ impl<Env> TxPayment<Env> for EgldOrEsdtTokenPayment<Env::Api>
 where
     Env: TxEnv,
 {
-    fn is_no_payment(&self) -> bool {
+    fn is_no_payment(&self, _env: &Env) -> bool {
         self.amount == 0u32
     }
 
@@ -63,7 +63,7 @@ impl<Env> TxPayment<Env> for EgldOrMultiEsdtPayment<Env::Api>
 where
     Env: TxEnv,
 {
-    fn is_no_payment(&self) -> bool {
+    fn is_no_payment(&self, _env: &Env) -> bool {
         self.is_empty()
     }
 
diff --git a/framework/base/src/types/interaction/tx_payment/tx_payment_single_esdt.rs b/framework/base/src/types/interaction/tx_payment/tx_payment_single_esdt.rs
index f5bf61c0f1..547ff12ba0 100644
--- a/framework/base/src/types/interaction/tx_payment/tx_payment_single_esdt.rs
+++ b/framework/base/src/types/interaction/tx_payment/tx_payment_single_esdt.rs
@@ -12,7 +12,7 @@ impl<Env> TxPayment<Env> for EsdtTokenPayment<Env::Api>
 where
     Env: TxEnv,
 {
-    fn is_no_payment(&self) -> bool {
+    fn is_no_payment(&self, _env: &Env) -> bool {
         self.amount == 0u32
     }
 
diff --git a/framework/base/src/types/interaction/tx_payment/tx_payment_single_esdt_ref.rs b/framework/base/src/types/interaction/tx_payment/tx_payment_single_esdt_ref.rs
index c0d568e11b..7128b0fc2b 100644
--- a/framework/base/src/types/interaction/tx_payment/tx_payment_single_esdt_ref.rs
+++ b/framework/base/src/types/interaction/tx_payment/tx_payment_single_esdt_ref.rs
@@ -13,7 +13,7 @@ impl<'a, Env> TxPayment<Env> for EsdtTokenPaymentRefs<'a, Env::Api>
 where
     Env: TxEnv,
 {
-    fn is_no_payment(&self) -> bool {
+    fn is_no_payment(&self, _env: &Env) -> bool {
         self.amount == &0u32
     }
 
diff --git a/framework/base/src/types/interaction/tx_to.rs b/framework/base/src/types/interaction/tx_to.rs
index 6d964bd0b5..03f3105858 100644
--- a/framework/base/src/types/interaction/tx_to.rs
+++ b/framework/base/src/types/interaction/tx_to.rs
@@ -24,60 +24,21 @@ where
     ///
     /// Other than that, does thesame as `AnnotatedValue::into_value`.
     fn with_address_ref<F, R>(&self, env: &Env, f: F) -> R
-    where
-        F: FnOnce(&ManagedAddress<Env::Api>) -> R;
-}
-
-impl<Env> TxTo<Env> for ManagedAddress<Env::Api> where Env: TxEnv {}
-impl<Env> TxToSpecified<Env> for ManagedAddress<Env::Api>
-where
-    Env: TxEnv,
-{
-    fn with_address_ref<F, R>(&self, _env: &Env, f: F) -> R
     where
         F: FnOnce(&ManagedAddress<Env::Api>) -> R,
     {
-        f(self)
+        self.with_value_ref(env, f)
     }
 }
 
+impl<Env> TxTo<Env> for ManagedAddress<Env::Api> where Env: TxEnv {}
+impl<Env> TxToSpecified<Env> for ManagedAddress<Env::Api> where Env: TxEnv {}
+
 impl<Env> TxTo<Env> for &ManagedAddress<Env::Api> where Env: TxEnv {}
-impl<Env> TxToSpecified<Env> for &ManagedAddress<Env::Api>
-where
-    Env: TxEnv,
-{
-    fn with_address_ref<F, R>(&self, _env: &Env, f: F) -> R
-    where
-        F: FnOnce(&ManagedAddress<Env::Api>) -> R,
-    {
-        f(self)
-    }
-}
+impl<Env> TxToSpecified<Env> for &ManagedAddress<Env::Api> where Env: TxEnv {}
 
 impl<Env> TxTo<Env> for Address where Env: TxEnv {}
-impl<Env> TxToSpecified<Env> for Address
-where
-    Env: TxEnv,
-{
-    fn with_address_ref<F, R>(&self, _env: &Env, f: F) -> R
-    where
-        F: FnOnce(&ManagedAddress<Env::Api>) -> R,
-    {
-        let managed_address = ManagedAddress::from(self);
-        f(&managed_address)
-    }
-}
+impl<Env> TxToSpecified<Env> for Address where Env: TxEnv {}
 
 impl<Env> TxTo<Env> for &Address where Env: TxEnv {}
-impl<Env> TxToSpecified<Env> for &Address
-where
-    Env: TxEnv,
-{
-    fn with_address_ref<F, R>(&self, _env: &Env, f: F) -> R
-    where
-        F: FnOnce(&ManagedAddress<Env::Api>) -> R,
-    {
-        let managed_address = ManagedAddress::from(*self);
-        f(&managed_address)
-    }
-}
+impl<Env> TxToSpecified<Env> for &Address where Env: TxEnv {}
diff --git a/framework/base/src/types/interaction/tx_to/tx_to_caller.rs b/framework/base/src/types/interaction/tx_to/tx_to_caller.rs
index 1e3b59db73..7217f47c8b 100644
--- a/framework/base/src/types/interaction/tx_to/tx_to_caller.rs
+++ b/framework/base/src/types/interaction/tx_to/tx_to_caller.rs
@@ -17,17 +17,11 @@ where
         self.with_address_ref(env, |addr_ref| addr_ref.hex_expr())
     }
 
-    fn into_value(self, _env: &TxScEnv<Api>) -> ManagedAddress<Api> {
+    fn to_value(&self, _env: &TxScEnv<Api>) -> ManagedAddress<Api> {
         BlockchainWrapper::<Api>::new().get_caller()
     }
-}
 
-impl<Api> TxTo<TxScEnv<Api>> for ToCaller where Api: CallTypeApi + BlockchainApi {}
-impl<Api> TxToSpecified<TxScEnv<Api>> for ToCaller
-where
-    Api: CallTypeApi + BlockchainApi,
-{
-    fn with_address_ref<F, R>(&self, env: &TxScEnv<Api>, f: F) -> R
+    fn with_value_ref<F, R>(&self, env: &TxScEnv<Api>, f: F) -> R
     where
         F: FnOnce(&ManagedAddress<Api>) -> R,
     {
@@ -36,3 +30,6 @@ where
         f(&ManagedAddress::from_handle(caller_handle))
     }
 }
+
+impl<Api> TxTo<TxScEnv<Api>> for ToCaller where Api: CallTypeApi + BlockchainApi {}
+impl<Api> TxToSpecified<TxScEnv<Api>> for ToCaller where Api: CallTypeApi + BlockchainApi {}
diff --git a/framework/base/src/types/interaction/tx_to/tx_to_self.rs b/framework/base/src/types/interaction/tx_to/tx_to_self.rs
index 87e068ae6f..72350c312e 100644
--- a/framework/base/src/types/interaction/tx_to/tx_to_self.rs
+++ b/framework/base/src/types/interaction/tx_to/tx_to_self.rs
@@ -17,17 +17,11 @@ where
         self.with_address_ref(env, |addr_ref| addr_ref.hex_expr())
     }
 
-    fn into_value(self, _env: &TxScEnv<Api>) -> ManagedAddress<Api> {
+    fn to_value(&self, _env: &TxScEnv<Api>) -> ManagedAddress<Api> {
         BlockchainWrapper::<Api>::new().get_sc_address()
     }
-}
 
-impl<Api> TxTo<TxScEnv<Api>> for ToSelf where Api: CallTypeApi + BlockchainApi {}
-impl<Api> TxToSpecified<TxScEnv<Api>> for ToSelf
-where
-    Api: CallTypeApi + BlockchainApi,
-{
-    fn with_address_ref<F, R>(&self, env: &TxScEnv<Api>, f: F) -> R
+    fn with_value_ref<F, R>(&self, env: &TxScEnv<Api>, f: F) -> R
     where
         F: FnOnce(&ManagedAddress<Api>) -> R,
     {
@@ -37,3 +31,6 @@ where
         f(&ManagedAddress::from_handle(sc_address_handle))
     }
 }
+
+impl<Api> TxTo<TxScEnv<Api>> for ToSelf where Api: CallTypeApi + BlockchainApi {}
+impl<Api> TxToSpecified<TxScEnv<Api>> for ToSelf where Api: CallTypeApi + BlockchainApi {}
diff --git a/framework/scenario/src/facade/contract_info.rs b/framework/scenario/src/facade/contract_info.rs
index 56095208e6..2652732494 100644
--- a/framework/scenario/src/facade/contract_info.rs
+++ b/framework/scenario/src/facade/contract_info.rs
@@ -117,7 +117,7 @@ where
         self.scenario_address_expr.original.as_str().into()
     }
 
-    fn into_value(self, _env: &Env) -> ManagedAddress<Env::Api> {
+    fn to_value(&self, _env: &Env) -> ManagedAddress<Env::Api> {
         (&self.scenario_address_expr.value).into()
     }
 }
@@ -148,11 +148,4 @@ where
     Env: TxEnv,
     P: ProxyObjNew,
 {
-    fn with_address_ref<F, R>(&self, _env: &Env, f: F) -> R
-    where
-        F: FnOnce(&ManagedAddress<Env::Api>) -> R,
-    {
-        let ma: ManagedAddress<Env::Api> = (&self.scenario_address_expr.value).into();
-        f(&ma)
-    }
 }
diff --git a/framework/scenario/src/facade/world_tx/expr/file_expr.rs b/framework/scenario/src/facade/world_tx/expr/file_expr.rs
index f42f6e84e0..d9d3c77756 100644
--- a/framework/scenario/src/facade/world_tx/expr/file_expr.rs
+++ b/framework/scenario/src/facade/world_tx/expr/file_expr.rs
@@ -23,7 +23,7 @@ impl<'a> AnnotatedValue<ScenarioTxEnvData, ManagedBuffer<StaticApi>> for FileExp
         result
     }
 
-    fn into_value(self, env: &ScenarioTxEnvData) -> ManagedBuffer<StaticApi> {
+    fn to_value(&self, env: &ScenarioTxEnvData) -> ManagedBuffer<StaticApi> {
         let context = InterpreterContext::new().with_dir(env.context_path.clone());
         let value = interpret_string(&format!("{FILE_PREFIX}{}", self.0), &context);
         value.into()
diff --git a/framework/scenario/src/facade/world_tx/expr/mxsc_expr.rs b/framework/scenario/src/facade/world_tx/expr/mxsc_expr.rs
index 6f95cf2b7a..c0f574e8cd 100644
--- a/framework/scenario/src/facade/world_tx/expr/mxsc_expr.rs
+++ b/framework/scenario/src/facade/world_tx/expr/mxsc_expr.rs
@@ -26,7 +26,7 @@ where
         result
     }
 
-    fn into_value(self, env: &Env) -> ManagedBuffer<Env::Api> {
+    fn to_value(&self, env: &Env) -> ManagedBuffer<Env::Api> {
         let context = InterpreterContext::new()
             .with_dir(env.env_data().context_path.clone())
             .with_allowed_missing_files();
diff --git a/framework/scenario/src/scenario/model/value/value_set_bytes.rs b/framework/scenario/src/scenario/model/value/value_set_bytes.rs
index eaed19cea0..627f2ace9c 100644
--- a/framework/scenario/src/scenario/model/value/value_set_bytes.rs
+++ b/framework/scenario/src/scenario/model/value/value_set_bytes.rs
@@ -145,8 +145,8 @@ where
         self.original.to_concatenated_string().into()
     }
 
-    fn into_value(self, _env: &Env) -> ManagedBuffer<Env::Api> {
-        self.value.into()
+    fn to_value(&self, _env: &Env) -> ManagedBuffer<Env::Api> {
+        self.value.clone().into()
     }
 }
 
@@ -160,7 +160,7 @@ where
         self.original.to_concatenated_string().into()
     }
 
-    fn into_value(self, _env: &Env) -> ManagedBuffer<Env::Api> {
+    fn to_value(&self, _env: &Env) -> ManagedBuffer<Env::Api> {
         self.value.clone().into()
     }
 }

From 0b229c24ec75ca89a76ae0d31d849fb3eb83b87f Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 27 Mar 2024 07:11:15 +0200
Subject: [PATCH 0569/1254] AnnotatedValue & TxEgldValue impl for ManagedRef of
 BigUint

---
 .../proxy-test-first/src/proxy-test-first.rs  |  2 +-
 contracts/modules/src/esdt.rs                 |  2 +-
 .../base/src/types/interaction/annotated.rs   | 29 ++++++++++++++++++-
 .../tx_payment/tx_payment_egld_value.rs       |  6 +++-
 .../src/types/managed/wrapped/managed_ref.rs  |  1 +
 5 files changed, 36 insertions(+), 4 deletions(-)

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 7d18e22e3b..26cc9eb679 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
@@ -81,7 +81,7 @@ pub trait ProxyTestFirst {
             .to(other_contract)
             .raw_upgrade()
             .argument(&456)
-            .egld(payment.clone_value())
+            .egld(payment)
             .upgrade_contract(&code, CodeMetadata::UPGRADEABLE);
     }
 
diff --git a/contracts/modules/src/esdt.rs b/contracts/modules/src/esdt.rs
index fa02cfd263..f39e5fe650 100644
--- a/contracts/modules/src/esdt.rs
+++ b/contracts/modules/src/esdt.rs
@@ -66,7 +66,7 @@ pub trait EsdtModule {
                 let egld_returned = self.call_value().egld_value();
                 self.tx()
                     .to(&initial_caller)
-                    .egld(&*egld_returned)
+                    .egld(egld_returned)
                     .transfer_if_not_empty();
             },
         }
diff --git a/framework/base/src/types/interaction/annotated.rs b/framework/base/src/types/interaction/annotated.rs
index afaecf184e..d6b75fc610 100644
--- a/framework/base/src/types/interaction/annotated.rs
+++ b/framework/base/src/types/interaction/annotated.rs
@@ -1,4 +1,7 @@
-use crate::types::{heap::Address, BigUint, ManagedAddress, ManagedBuffer};
+use crate::{
+    proxy_imports::ManagedRef,
+    types::{heap::Address, BigUint, ManagedAddress, ManagedBuffer},
+};
 
 use super::TxEnv;
 
@@ -175,6 +178,30 @@ where
     }
 }
 
+impl<'a, Env> AnnotatedValue<Env, BigUint<Env::Api>> for ManagedRef<'a, Env::Api, BigUint<Env::Api>>
+where
+    Env: TxEnv,
+{
+    fn annotation(&self, _env: &Env) -> ManagedBuffer<Env::Api> {
+        self.to_display()
+    }
+
+    fn to_value(&self, _env: &Env) -> BigUint<Env::Api> {
+        (*self).clone_value()
+    }
+
+    fn into_value(self, _env: &Env) -> BigUint<Env::Api> {
+        self.clone_value()
+    }
+
+    fn with_value_ref<F, R>(&self, env: &Env, f: F) -> R
+    where
+        F: FnOnce(&BigUint<Env::Api>) -> R,
+    {
+        f(self)
+    }
+}
+
 impl<Env> AnnotatedValue<Env, BigUint<Env::Api>> for u64
 where
     Env: TxEnv,
diff --git a/framework/base/src/types/interaction/tx_payment/tx_payment_egld_value.rs b/framework/base/src/types/interaction/tx_payment/tx_payment_egld_value.rs
index 8fcaab3ceb..b047e584b2 100644
--- a/framework/base/src/types/interaction/tx_payment/tx_payment_egld_value.rs
+++ b/framework/base/src/types/interaction/tx_payment/tx_payment_egld_value.rs
@@ -1,4 +1,7 @@
-use crate::types::{AnnotatedValue, BigUint};
+use crate::{
+    proxy_imports::ManagedRef,
+    types::{AnnotatedValue, BigUint},
+};
 
 use super::TxEnv;
 
@@ -10,4 +13,5 @@ where
 
 impl<Env> TxEgldValue<Env> for BigUint<Env::Api> where Env: TxEnv {}
 impl<Env> TxEgldValue<Env> for &BigUint<Env::Api> where Env: TxEnv {}
+impl<'a, Env> TxEgldValue<Env> for ManagedRef<'a, Env::Api, BigUint<Env::Api>> where Env: TxEnv {}
 impl<Env> TxEgldValue<Env> for u64 where Env: TxEnv {}
diff --git a/framework/base/src/types/managed/wrapped/managed_ref.rs b/framework/base/src/types/managed/wrapped/managed_ref.rs
index 748c704956..143d79e1d4 100644
--- a/framework/base/src/types/managed/wrapped/managed_ref.rs
+++ b/framework/base/src/types/managed/wrapped/managed_ref.rs
@@ -54,6 +54,7 @@ where
     M: ManagedTypeApi,
     T: ManagedType<M> + Clone,
 {
+    /// Syntactic sugar for dereferencing and cloning the object.
     pub fn clone_value(&self) -> T {
         self.deref().clone()
     }

From dc9c49b4178fdde0f4afedc0786e369c176b86c9 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 27 Mar 2024 07:40:20 +0200
Subject: [PATCH 0570/1254] AnnotatedValue impl split into several files

---
 .../base/src/types/interaction/annotated.rs   | 200 +-----------------
 .../annotated/annotated_impl_big_uint.rs      | 104 +++++++++
 .../annotated_impl_managed_address.rs         |  80 +++++++
 .../annotated_impl_managed_buffer.rs          |  30 +++
 4 files changed, 218 insertions(+), 196 deletions(-)
 create mode 100644 framework/base/src/types/interaction/annotated/annotated_impl_big_uint.rs
 create mode 100644 framework/base/src/types/interaction/annotated/annotated_impl_managed_address.rs
 create mode 100644 framework/base/src/types/interaction/annotated/annotated_impl_managed_buffer.rs

diff --git a/framework/base/src/types/interaction/annotated.rs b/framework/base/src/types/interaction/annotated.rs
index d6b75fc610..f3187d08ce 100644
--- a/framework/base/src/types/interaction/annotated.rs
+++ b/framework/base/src/types/interaction/annotated.rs
@@ -1,3 +1,7 @@
+mod annotated_impl_big_uint;
+mod annotated_impl_managed_address;
+mod annotated_impl_managed_buffer;
+
 use crate::{
     proxy_imports::ManagedRef,
     types::{heap::Address, BigUint, ManagedAddress, ManagedBuffer},
@@ -31,199 +35,3 @@ where
         f(&self.to_value(env))
     }
 }
-
-impl<Env> AnnotatedValue<Env, ManagedAddress<Env::Api>> for ManagedAddress<Env::Api>
-where
-    Env: TxEnv,
-{
-    fn annotation(&self, _env: &Env) -> ManagedBuffer<Env::Api> {
-        self.hex_expr()
-    }
-
-    fn to_value(&self, env: &Env) -> ManagedAddress<Env::Api> {
-        self.clone()
-    }
-
-    fn into_value(self, _env: &Env) -> ManagedAddress<Env::Api> {
-        self
-    }
-
-    fn with_value_ref<F, R>(&self, env: &Env, f: F) -> R
-    where
-        F: FnOnce(&ManagedAddress<Env::Api>) -> R,
-    {
-        f(self)
-    }
-}
-
-impl<Env> AnnotatedValue<Env, ManagedAddress<Env::Api>> for &ManagedAddress<Env::Api>
-where
-    Env: TxEnv,
-{
-    fn annotation(&self, _env: &Env) -> ManagedBuffer<Env::Api> {
-        self.hex_expr()
-    }
-
-    fn to_value(&self, env: &Env) -> ManagedAddress<Env::Api> {
-        (*self).clone()
-    }
-
-    fn into_value(self, _env: &Env) -> ManagedAddress<Env::Api> {
-        self.clone()
-    }
-
-    fn with_value_ref<F, R>(&self, env: &Env, f: F) -> R
-    where
-        F: FnOnce(&ManagedAddress<Env::Api>) -> R,
-    {
-        f(self)
-    }
-}
-
-impl<Env> AnnotatedValue<Env, ManagedAddress<Env::Api>> for Address
-where
-    Env: TxEnv,
-{
-    fn annotation(&self, _env: &Env) -> ManagedBuffer<Env::Api> {
-        ManagedAddress::from(self).hex_expr()
-    }
-
-    fn to_value(&self, env: &Env) -> ManagedAddress<Env::Api> {
-        ManagedAddress::from(self)
-    }
-}
-
-impl<Env> AnnotatedValue<Env, ManagedAddress<Env::Api>> for &Address
-where
-    Env: TxEnv,
-{
-    fn annotation(&self, _env: &Env) -> ManagedBuffer<Env::Api> {
-        ManagedAddress::from(*self).hex_expr()
-    }
-
-    fn to_value(&self, env: &Env) -> ManagedAddress<Env::Api> {
-        ManagedAddress::from(*self)
-    }
-}
-
-impl<Env> AnnotatedValue<Env, ManagedBuffer<Env::Api>> for ManagedBuffer<Env::Api>
-where
-    Env: TxEnv,
-{
-    fn annotation(&self, _env: &Env) -> ManagedBuffer<Env::Api> {
-        self.hex_expr()
-    }
-
-    fn to_value(&self, _env: &Env) -> ManagedBuffer<Env::Api> {
-        self.clone()
-    }
-
-    fn into_value(self, _env: &Env) -> ManagedBuffer<Env::Api> {
-        self
-    }
-
-    fn with_value_ref<F, R>(&self, env: &Env, f: F) -> R
-    where
-        F: FnOnce(&ManagedBuffer<Env::Api>) -> R,
-    {
-        f(self)
-    }
-}
-
-impl<Env> AnnotatedValue<Env, BigUint<Env::Api>> for BigUint<Env::Api>
-where
-    Env: TxEnv,
-{
-    fn annotation(&self, _env: &Env) -> ManagedBuffer<Env::Api> {
-        self.to_display()
-    }
-
-    fn to_value(&self, _env: &Env) -> BigUint<Env::Api> {
-        self.clone()
-    }
-
-    fn into_value(self, _env: &Env) -> BigUint<Env::Api> {
-        self
-    }
-
-    fn with_value_ref<F, R>(&self, env: &Env, f: F) -> R
-    where
-        F: FnOnce(&BigUint<Env::Api>) -> R,
-    {
-        f(self)
-    }
-}
-
-impl<Env> AnnotatedValue<Env, BigUint<Env::Api>> for &BigUint<Env::Api>
-where
-    Env: TxEnv,
-{
-    fn annotation(&self, _env: &Env) -> ManagedBuffer<Env::Api> {
-        self.to_display()
-    }
-
-    fn to_value(&self, _env: &Env) -> BigUint<Env::Api> {
-        (*self).clone()
-    }
-
-    fn into_value(self, _env: &Env) -> BigUint<Env::Api> {
-        self.clone()
-    }
-
-    fn with_value_ref<F, R>(&self, env: &Env, f: F) -> R
-    where
-        F: FnOnce(&BigUint<Env::Api>) -> R,
-    {
-        f(self)
-    }
-}
-
-impl<'a, Env> AnnotatedValue<Env, BigUint<Env::Api>> for ManagedRef<'a, Env::Api, BigUint<Env::Api>>
-where
-    Env: TxEnv,
-{
-    fn annotation(&self, _env: &Env) -> ManagedBuffer<Env::Api> {
-        self.to_display()
-    }
-
-    fn to_value(&self, _env: &Env) -> BigUint<Env::Api> {
-        (*self).clone_value()
-    }
-
-    fn into_value(self, _env: &Env) -> BigUint<Env::Api> {
-        self.clone_value()
-    }
-
-    fn with_value_ref<F, R>(&self, env: &Env, f: F) -> R
-    where
-        F: FnOnce(&BigUint<Env::Api>) -> R,
-    {
-        f(self)
-    }
-}
-
-impl<Env> AnnotatedValue<Env, BigUint<Env::Api>> for u64
-where
-    Env: TxEnv,
-{
-    fn annotation(&self, env: &Env) -> ManagedBuffer<Env::Api> {
-        self.to_value(env).to_display()
-    }
-
-    fn to_value(&self, _env: &Env) -> BigUint<Env::Api> {
-        BigUint::from(*self)
-    }
-}
-
-impl<Env> AnnotatedValue<Env, BigUint<Env::Api>> for ()
-where
-    Env: TxEnv,
-{
-    fn annotation(&self, env: &Env) -> ManagedBuffer<Env::Api> {
-        ManagedBuffer::from("0")
-    }
-
-    fn to_value(&self, _env: &Env) -> BigUint<Env::Api> {
-        BigUint::zero()
-    }
-}
diff --git a/framework/base/src/types/interaction/annotated/annotated_impl_big_uint.rs b/framework/base/src/types/interaction/annotated/annotated_impl_big_uint.rs
new file mode 100644
index 0000000000..29f41042aa
--- /dev/null
+++ b/framework/base/src/types/interaction/annotated/annotated_impl_big_uint.rs
@@ -0,0 +1,104 @@
+use crate::{
+    proxy_imports::ManagedRef,
+    types::{heap::Address, BigUint, ManagedAddress, ManagedBuffer},
+};
+
+use super::{AnnotatedValue, TxEnv};
+
+impl<Env> AnnotatedValue<Env, BigUint<Env::Api>> for BigUint<Env::Api>
+where
+    Env: TxEnv,
+{
+    fn annotation(&self, _env: &Env) -> ManagedBuffer<Env::Api> {
+        self.to_display()
+    }
+
+    fn to_value(&self, _env: &Env) -> BigUint<Env::Api> {
+        self.clone()
+    }
+
+    fn into_value(self, _env: &Env) -> BigUint<Env::Api> {
+        self
+    }
+
+    fn with_value_ref<F, R>(&self, env: &Env, f: F) -> R
+    where
+        F: FnOnce(&BigUint<Env::Api>) -> R,
+    {
+        f(self)
+    }
+}
+
+impl<Env> AnnotatedValue<Env, BigUint<Env::Api>> for &BigUint<Env::Api>
+where
+    Env: TxEnv,
+{
+    fn annotation(&self, _env: &Env) -> ManagedBuffer<Env::Api> {
+        self.to_display()
+    }
+
+    fn to_value(&self, _env: &Env) -> BigUint<Env::Api> {
+        (*self).clone()
+    }
+
+    fn into_value(self, _env: &Env) -> BigUint<Env::Api> {
+        self.clone()
+    }
+
+    fn with_value_ref<F, R>(&self, env: &Env, f: F) -> R
+    where
+        F: FnOnce(&BigUint<Env::Api>) -> R,
+    {
+        f(self)
+    }
+}
+
+impl<'a, Env> AnnotatedValue<Env, BigUint<Env::Api>> for ManagedRef<'a, Env::Api, BigUint<Env::Api>>
+where
+    Env: TxEnv,
+{
+    fn annotation(&self, _env: &Env) -> ManagedBuffer<Env::Api> {
+        self.to_display()
+    }
+
+    fn to_value(&self, _env: &Env) -> BigUint<Env::Api> {
+        (*self).clone_value()
+    }
+
+    fn into_value(self, _env: &Env) -> BigUint<Env::Api> {
+        self.clone_value()
+    }
+
+    fn with_value_ref<F, R>(&self, env: &Env, f: F) -> R
+    where
+        F: FnOnce(&BigUint<Env::Api>) -> R,
+    {
+        f(self)
+    }
+}
+
+impl<Env> AnnotatedValue<Env, BigUint<Env::Api>> for u64
+where
+    Env: TxEnv,
+{
+    fn annotation(&self, env: &Env) -> ManagedBuffer<Env::Api> {
+        self.to_value(env).to_display()
+    }
+
+    fn to_value(&self, _env: &Env) -> BigUint<Env::Api> {
+        BigUint::from(*self)
+    }
+}
+
+impl<Env> AnnotatedValue<Env, BigUint<Env::Api>> for ()
+where
+    Env: TxEnv,
+{
+    fn annotation(&self, env: &Env) -> ManagedBuffer<Env::Api> {
+        ManagedBuffer::from("0")
+    }
+
+    fn to_value(&self, _env: &Env) -> BigUint<Env::Api> {
+        BigUint::zero()
+    }
+}
diff --git a/framework/base/src/types/interaction/annotated/annotated_impl_managed_address.rs b/framework/base/src/types/interaction/annotated/annotated_impl_managed_address.rs
new file mode 100644
index 0000000000..87aebbb82e
--- /dev/null
+++ b/framework/base/src/types/interaction/annotated/annotated_impl_managed_address.rs
@@ -0,0 +1,80 @@
+use crate::{
+    proxy_imports::ManagedRef,
+    types::{heap::Address, BigUint, ManagedAddress, ManagedBuffer},
+};
+
+use super::{AnnotatedValue, TxEnv};
+
+impl<Env> AnnotatedValue<Env, ManagedAddress<Env::Api>> for ManagedAddress<Env::Api>
+where
+    Env: TxEnv,
+{
+    fn annotation(&self, _env: &Env) -> ManagedBuffer<Env::Api> {
+        self.hex_expr()
+    }
+
+    fn to_value(&self, env: &Env) -> ManagedAddress<Env::Api> {
+        self.clone()
+    }
+
+    fn into_value(self, _env: &Env) -> ManagedAddress<Env::Api> {
+        self
+    }
+
+    fn with_value_ref<F, R>(&self, env: &Env, f: F) -> R
+    where
+        F: FnOnce(&ManagedAddress<Env::Api>) -> R,
+    {
+        f(self)
+    }
+}
+
+impl<Env> AnnotatedValue<Env, ManagedAddress<Env::Api>> for &ManagedAddress<Env::Api>
+where
+    Env: TxEnv,
+{
+    fn annotation(&self, _env: &Env) -> ManagedBuffer<Env::Api> {
+        self.hex_expr()
+    }
+
+    fn to_value(&self, env: &Env) -> ManagedAddress<Env::Api> {
+        (*self).clone()
+    }
+
+    fn into_value(self, _env: &Env) -> ManagedAddress<Env::Api> {
+        self.clone()
+    }
+
+    fn with_value_ref<F, R>(&self, env: &Env, f: F) -> R
+    where
+        F: FnOnce(&ManagedAddress<Env::Api>) -> R,
+    {
+        f(self)
+    }
+}
+
+impl<Env> AnnotatedValue<Env, ManagedAddress<Env::Api>> for Address
+where
+    Env: TxEnv,
+{
+    fn annotation(&self, _env: &Env) -> ManagedBuffer<Env::Api> {
+        ManagedAddress::from(self).hex_expr()
+    }
+
+    fn to_value(&self, env: &Env) -> ManagedAddress<Env::Api> {
+        ManagedAddress::from(self)
+    }
+}
+
+impl<Env> AnnotatedValue<Env, ManagedAddress<Env::Api>> for &Address
+where
+    Env: TxEnv,
+{
+    fn annotation(&self, _env: &Env) -> ManagedBuffer<Env::Api> {
+        ManagedAddress::from(*self).hex_expr()
+    }
+
+    fn to_value(&self, env: &Env) -> ManagedAddress<Env::Api> {
+        ManagedAddress::from(*self)
+    }
+}
diff --git a/framework/base/src/types/interaction/annotated/annotated_impl_managed_buffer.rs b/framework/base/src/types/interaction/annotated/annotated_impl_managed_buffer.rs
new file mode 100644
index 0000000000..bf15a3a262
--- /dev/null
+++ b/framework/base/src/types/interaction/annotated/annotated_impl_managed_buffer.rs
@@ -0,0 +1,30 @@
+use crate::{
+    proxy_imports::ManagedRef,
+    types::{heap::Address, BigUint, ManagedAddress, ManagedBuffer},
+};
+
+use super::{AnnotatedValue, TxEnv};
+
+impl<Env> AnnotatedValue<Env, ManagedBuffer<Env::Api>> for ManagedBuffer<Env::Api>
+where
+    Env: TxEnv,
+{
+    fn annotation(&self, _env: &Env) -> ManagedBuffer<Env::Api> {
+        self.hex_expr()
+    }
+
+    fn to_value(&self, _env: &Env) -> ManagedBuffer<Env::Api> {
+        self.clone()
+    }
+
+    fn into_value(self, _env: &Env) -> ManagedBuffer<Env::Api> {
+        self
+    }
+
+    fn with_value_ref<F, R>(&self, env: &Env, f: F) -> R
+    where
+        F: FnOnce(&ManagedBuffer<Env::Api>) -> R,
+    {
+        f(self)
+    }
+}

From 45c431a58077562510222ba5952c3f3f41f07e0d Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 27 Mar 2024 08:53:26 +0200
Subject: [PATCH 0571/1254] unified syntax - gas annotations

---
 .../base/src/types/interaction/annotated.rs   |  1 +
 .../annotated/annotated_impl_big_uint.rs      |  2 +-
 .../annotated/annotated_impl_u64.rs           | 45 +++++++++++++++++++
 framework/base/src/types/interaction/tx.rs    | 35 ++++++++++++---
 .../interaction/tx_call_async_promises.rs     | 10 +++--
 .../src/types/interaction/tx_call_deploy.rs   |  4 +-
 .../src/types/interaction/tx_call_sync.rs     |  2 +-
 .../base/src/types/interaction/tx_call_te.rs  |  2 +-
 .../base/src/types/interaction/tx_env.rs      |  6 ++-
 .../base/src/types/interaction/tx_env_sc.rs   | 12 +++--
 .../base/src/types/interaction/tx_gas.rs      | 45 ++++++++++++++-----
 .../src/facade/world_tx/scenario_env.rs       |  9 ++--
 .../src/facade/world_tx/scenario_env_exec.rs  |  8 +++-
 .../src/facade/world_tx/scenario_env_query.rs | 12 +++--
 .../src/facade/world_tx/scenario_env_util.rs  | 23 +++++++---
 .../snippets/src/itx/interactor_env_exec.rs   |  8 +++-
 .../snippets/src/itx/interactor_env_query.rs  | 12 +++--
 17 files changed, 181 insertions(+), 55 deletions(-)
 create mode 100644 framework/base/src/types/interaction/annotated/annotated_impl_u64.rs

diff --git a/framework/base/src/types/interaction/annotated.rs b/framework/base/src/types/interaction/annotated.rs
index f3187d08ce..a7f18c6745 100644
--- a/framework/base/src/types/interaction/annotated.rs
+++ b/framework/base/src/types/interaction/annotated.rs
@@ -1,6 +1,7 @@
 mod annotated_impl_big_uint;
 mod annotated_impl_managed_address;
 mod annotated_impl_managed_buffer;
+mod annotated_impl_u64;
 
 use crate::{
     proxy_imports::ManagedRef,
diff --git a/framework/base/src/types/interaction/annotated/annotated_impl_big_uint.rs b/framework/base/src/types/interaction/annotated/annotated_impl_big_uint.rs
index 29f41042aa..823a796348 100644
--- a/framework/base/src/types/interaction/annotated/annotated_impl_big_uint.rs
+++ b/framework/base/src/types/interaction/annotated/annotated_impl_big_uint.rs
@@ -82,7 +82,7 @@ where
     Env: TxEnv,
 {
     fn annotation(&self, env: &Env) -> ManagedBuffer<Env::Api> {
-        self.to_value(env).to_display()
+        BigUint::from(*self).to_display()
     }
 
     fn to_value(&self, _env: &Env) -> BigUint<Env::Api> {
diff --git a/framework/base/src/types/interaction/annotated/annotated_impl_u64.rs b/framework/base/src/types/interaction/annotated/annotated_impl_u64.rs
new file mode 100644
index 0000000000..0905710c25
--- /dev/null
+++ b/framework/base/src/types/interaction/annotated/annotated_impl_u64.rs
@@ -0,0 +1,45 @@
+use crate::{
+    formatter::{FormatBuffer, SCDisplay},
+    proxy_imports::ManagedTypeApi,
+    types::{
+        heap::Address, BigUint, ManagedAddress, ManagedBuffer, ManagedBufferCachedBuilder,
+        ManagedRef,
+    },
+};
+
+use super::{AnnotatedValue, TxEnv};
+
+pub(crate) fn display_u64<Api>(n: u64) -> ManagedBuffer<Api>
+where
+    Api: ManagedTypeApi,
+{
+    let mut result = ManagedBufferCachedBuilder::new_from_slice(&[]);
+    result.append_display(&n);
+    result.into_managed_buffer()
+}
+
+impl<Env> AnnotatedValue<Env, u64> for u64
+where
+    Env: TxEnv,
+{
+    fn annotation(&self, env: &Env) -> ManagedBuffer<Env::Api> {
+        display_u64(*self)
+    }
+
+    fn to_value(&self, _env: &Env) -> u64 {
+        *self
+    }
+}
+
+impl<Env> AnnotatedValue<Env, u64> for i32
+where
+    Env: TxEnv,
+{
+    fn annotation(&self, env: &Env) -> ManagedBuffer<Env::Api> {
+        display_u64(*self as u64)
+    }
+
+    fn to_value(&self, _env: &Env) -> u64 {
+        *self as u64
+    }
+}
diff --git a/framework/base/src/types/interaction/tx.rs b/framework/base/src/types/interaction/tx.rs
index 548da703c8..2213380614 100644
--- a/framework/base/src/types/interaction/tx.rs
+++ b/framework/base/src/types/interaction/tx.rs
@@ -11,12 +11,13 @@ use crate::{
 use multiversx_sc_codec::TopEncodeMulti;
 
 use super::{
-    contract_call_exec::UNSPECIFIED_GAS_LIMIT, contract_call_trait::ContractCallBase, Code,
-    ContractCallNoPayment, ContractCallWithEgld, ContractDeploy, DeployCall, Egld, EgldPayment,
-    ExplicitGas, FromSource, FunctionCall, ManagedArgBuffer, OriginalResultMarker, RHList,
-    RHListAppendNoRet, RHListAppendRet, RHListItem, TxCodeSource, TxCodeValue, TxData, TxEgldValue,
-    TxEnv, TxFrom, TxFromSourceValue, TxGas, TxPayment, TxPaymentEgldOnly, TxProxyTrait,
-    TxResultHandler, TxScEnv, TxTo, TxToSpecified, UpgradeCall,
+    contract_call_exec::UNSPECIFIED_GAS_LIMIT, contract_call_trait::ContractCallBase,
+    AnnotatedValue, Code, ContractCallNoPayment, ContractCallWithEgld, ContractDeploy, DeployCall,
+    Egld, EgldPayment, ExplicitGas, FromSource, FunctionCall, ManagedArgBuffer,
+    OriginalResultMarker, RHList, RHListAppendNoRet, RHListAppendRet, RHListItem, TxCodeSource,
+    TxCodeValue, TxData, TxEgldValue, TxEnv, TxFrom, TxFromSourceValue, TxGas, TxGasValue,
+    TxPayment, TxPaymentEgldOnly, TxProxyTrait, TxResultHandler, TxScEnv, TxTo, TxToSpecified,
+    UpgradeCall,
 };
 
 #[must_use]
@@ -355,10 +356,30 @@ where
 {
     /// Sets an explicit gas limit to the call.
     #[inline]
+    pub fn gas<GasValue>(
+        self,
+        gas_value: GasValue,
+    ) -> Tx<Env, From, To, Payment, ExplicitGas<GasValue>, Data, RH>
+    where
+        GasValue: TxGasValue<Env>,
+    {
+        Tx {
+            env: self.env,
+            from: self.from,
+            to: self.to,
+            payment: self.payment,
+            gas: ExplicitGas(gas_value),
+            data: self.data,
+            result_handler: self.result_handler,
+        }
+    }
+
+    /// Backwards compatibility.
+    #[inline]
     pub fn with_gas_limit(
         self,
         gas_limit: u64,
-    ) -> Tx<Env, From, To, Payment, ExplicitGas, Data, RH> {
+    ) -> Tx<Env, From, To, Payment, ExplicitGas<u64>, Data, RH> {
         Tx {
             env: self.env,
             from: self.from,
diff --git a/framework/base/src/types/interaction/tx_call_async_promises.rs b/framework/base/src/types/interaction/tx_call_async_promises.rs
index f2560451cf..b3b8a1794d 100644
--- a/framework/base/src/types/interaction/tx_call_async_promises.rs
+++ b/framework/base/src/types/interaction/tx_call_async_promises.rs
@@ -6,7 +6,7 @@ use crate::{
 
 use super::{
     callback_closure::CallbackClosureWithGas, ExplicitGas, FunctionCall, OriginalResultMarker, Tx,
-    TxGas, TxPayment, TxResultHandler, TxScEnv, TxToSpecified,
+    TxGas, TxGasValue, TxPayment, TxResultHandler, TxScEnv, TxToSpecified,
 };
 
 pub trait TxPromisesCallback<Api>: TxResultHandler<TxScEnv<Api>>
@@ -117,12 +117,13 @@ where
     }
 }
 
-impl<Api, To, Payment, Callback>
-    Tx<TxScEnv<Api>, (), To, Payment, ExplicitGas, FunctionCall<Api>, Callback>
+impl<Api, To, Payment, GasValue, Callback>
+    Tx<TxScEnv<Api>, (), To, Payment, ExplicitGas<GasValue>, FunctionCall<Api>, Callback>
 where
     Api: CallTypeApi,
     To: TxToSpecified<TxScEnv<Api>>,
     Payment: TxPayment<TxScEnv<Api>>,
+    GasValue: TxGasValue<TxScEnv<Api>>,
     Callback: TxPromisesCallback<Api>,
 {
     pub fn register_promise(self) {
@@ -132,6 +133,7 @@ where
         self.result_handler
             .overwrite_with_serialized_args(&mut cb_closure_args_serialized);
         let extra_gas_for_callback = self.result_handler.gas_for_callback();
+        let gas = self.gas.gas_value(&self.env);
 
         self.payment.with_normalized(
             &self.env,
@@ -146,7 +148,7 @@ where
                     &norm_fc.arg_buffer,
                     callback_name,
                     callback_name,
-                    self.gas.0,
+                    gas,
                     extra_gas_for_callback,
                     &cb_closure_args_serialized,
                 )
diff --git a/framework/base/src/types/interaction/tx_call_deploy.rs b/framework/base/src/types/interaction/tx_call_deploy.rs
index 53814cd128..08cd815262 100644
--- a/framework/base/src/types/interaction/tx_call_deploy.rs
+++ b/framework/base/src/types/interaction/tx_call_deploy.rs
@@ -31,7 +31,7 @@ where
     RH: TxResultHandler<TxScEnv<Api>>,
 {
     fn execute_deploy_raw(self) -> (ManagedAddress<Api>, ManagedVec<Api, ManagedBuffer<Api>>, RH) {
-        let gas_limit = self.gas.resolve_gas(&self.env);
+        let gas_limit = self.gas.gas_value(&self.env);
 
         let (new_address, raw_results) = self.payment.with_egld_value(&self.env, |egld_value| {
             SendRawWrapper::<Api>::new().deploy_contract(
@@ -69,7 +69,7 @@ where
     fn execute_deploy_from_source_raw(
         self,
     ) -> (ManagedAddress<Api>, ManagedVec<Api, ManagedBuffer<Api>>, RH) {
-        let gas_limit = self.gas.resolve_gas(&self.env);
+        let gas_limit = self.gas.gas_value(&self.env);
 
         let (new_address, raw_results) = self.payment.with_egld_value(&self.env, |egld_value| {
             SendRawWrapper::<Api>::new().deploy_from_source_contract(
diff --git a/framework/base/src/types/interaction/tx_call_sync.rs b/framework/base/src/types/interaction/tx_call_sync.rs
index 9e45d09875..7b35b07a6a 100644
--- a/framework/base/src/types/interaction/tx_call_sync.rs
+++ b/framework/base/src/types/interaction/tx_call_sync.rs
@@ -28,7 +28,7 @@ where
     RH::ListReturns: NestedTupleFlatten,
 {
     fn execute_sync_call_raw(self) -> (ManagedVec<Api, ManagedBuffer<Api>>, RH) {
-        let gas_limit = self.gas.resolve_gas(&self.env);
+        let gas_limit = self.gas.gas_value(&self.env);
 
         let raw_result = self.payment.with_normalized(
             &self.env,
diff --git a/framework/base/src/types/interaction/tx_call_te.rs b/framework/base/src/types/interaction/tx_call_te.rs
index 6e81e7b8bb..8a62ca2bf8 100644
--- a/framework/base/src/types/interaction/tx_call_te.rs
+++ b/framework/base/src/types/interaction/tx_call_te.rs
@@ -31,7 +31,7 @@ where
                 gas_limit = 0;
             }
         } else {
-            gas_limit = self.gas.resolve_gas(&self.env);
+            gas_limit = self.gas.gas_value(&self.env);
         }
 
         self.transfer_execute_with_gas(gas_limit);
diff --git a/framework/base/src/types/interaction/tx_env.rs b/framework/base/src/types/interaction/tx_env.rs
index 482b0a0e8e..3ba108f788 100644
--- a/framework/base/src/types/interaction/tx_env.rs
+++ b/framework/base/src/types/interaction/tx_env.rs
@@ -1,4 +1,4 @@
-use crate::{api::CallTypeApi, types::ManagedAddress};
+use crate::{api::CallTypeApi, proxy_imports::ManagedBuffer, types::ManagedAddress};
 
 pub trait TxEnv: Sized {
     type Api: CallTypeApi;
@@ -8,5 +8,7 @@ pub trait TxEnv: Sized {
 
     fn resolve_sender_address(&self) -> ManagedAddress<Self::Api>;
 
-    fn default_gas(&self) -> u64;
+    fn default_gas_annotation(&self) -> ManagedBuffer<Self::Api>;
+
+    fn default_gas_value(&self) -> u64;
 }
diff --git a/framework/base/src/types/interaction/tx_env_sc.rs b/framework/base/src/types/interaction/tx_env_sc.rs
index f22c4a3dee..f4387275d2 100644
--- a/framework/base/src/types/interaction/tx_env_sc.rs
+++ b/framework/base/src/types/interaction/tx_env_sc.rs
@@ -3,10 +3,12 @@ use core::marker::PhantomData;
 use crate::{
     api::{BlockchainApiImpl, CallTypeApi},
     contract_base::BlockchainWrapper,
-    types::ManagedAddress,
+    types::{ManagedAddress, ManagedBuffer},
 };
 
-use super::{contract_call_exec::TRANSFER_EXECUTE_DEFAULT_LEFTOVER, Tx, TxBaseWithEnv, TxEnv};
+use super::{
+    contract_call_exec::TRANSFER_EXECUTE_DEFAULT_LEFTOVER, AnnotatedValue, Tx, TxBaseWithEnv, TxEnv,
+};
 
 pub struct TxScEnv<Api>
 where
@@ -47,7 +49,11 @@ where
         BlockchainWrapper::<Api>::new().get_sc_address()
     }
 
-    fn default_gas(&self) -> u64 {
+    fn default_gas_annotation(&self) -> ManagedBuffer<Self::Api> {
+        <u64 as AnnotatedValue<Self, u64>>::annotation(&self.default_gas_value(), self)
+    }
+
+    fn default_gas_value(&self) -> u64 {
         let mut gas_left = Api::blockchain_api_impl().get_gas_left();
         if gas_left > TRANSFER_EXECUTE_DEFAULT_LEFTOVER {
             gas_left -= TRANSFER_EXECUTE_DEFAULT_LEFTOVER;
diff --git a/framework/base/src/types/interaction/tx_gas.rs b/framework/base/src/types/interaction/tx_gas.rs
index eec1c19e4b..986361e473 100644
--- a/framework/base/src/types/interaction/tx_gas.rs
+++ b/framework/base/src/types/interaction/tx_gas.rs
@@ -1,11 +1,16 @@
-use super::TxEnv;
-use crate::api::{BlockchainApi, BlockchainApiImpl};
+use super::{AnnotatedValue, TxEnv};
+use crate::{
+    api::{BlockchainApi, BlockchainApiImpl},
+    types::ManagedBuffer,
+};
 
 pub trait TxGas<Env>
 where
     Env: TxEnv,
 {
-    fn resolve_gas(&self, env: &Env) -> u64;
+    fn gas_annotation(&self, env: &Env) -> ManagedBuffer<Env::Api>;
+
+    fn gas_value(&self, env: &Env) -> u64;
 
     fn explicit_or_gas_left(&self, env: &Env) -> u64;
 }
@@ -14,8 +19,12 @@ impl<Env> TxGas<Env> for ()
 where
     Env: TxEnv,
 {
-    fn resolve_gas(&self, env: &Env) -> u64 {
-        env.default_gas()
+    fn gas_annotation(&self, env: &Env) -> ManagedBuffer<<Env as TxEnv>::Api> {
+        env.default_gas_annotation()
+    }
+
+    fn gas_value(&self, env: &Env) -> u64 {
+        env.default_gas_value()
     }
 
     fn explicit_or_gas_left(&self, _env: &Env) -> u64 {
@@ -23,18 +32,30 @@ where
     }
 }
 
-pub struct ExplicitGas(pub u64);
+pub trait TxGasValue<Env>: AnnotatedValue<Env, u64>
+where
+    Env: TxEnv,
+{
+}
+
+impl<Env> TxGasValue<Env> for u64 where Env: TxEnv {}
+
+pub struct ExplicitGas<GasValue>(pub GasValue);
 
-impl<Env> TxGas<Env> for ExplicitGas
+impl<Env, GasValue> TxGas<Env> for ExplicitGas<GasValue>
 where
     Env: TxEnv,
+    GasValue: TxGasValue<Env>,
 {
-    #[inline]
-    fn resolve_gas(&self, _env: &Env) -> u64 {
-        self.0
+    fn gas_value(&self, env: &Env) -> u64 {
+        self.0.to_value(env)
     }
 
-    fn explicit_or_gas_left(&self, _env: &Env) -> u64 {
-        self.0
+    fn gas_annotation(&self, env: &Env) -> ManagedBuffer<<Env as TxEnv>::Api> {
+        self.0.annotation(env)
+    }
+
+    fn explicit_or_gas_left(&self, env: &Env) -> u64 {
+        self.gas_value(env)
     }
 }
diff --git a/framework/scenario/src/facade/world_tx/scenario_env.rs b/framework/scenario/src/facade/world_tx/scenario_env.rs
index 4589e36599..aac1952a34 100644
--- a/framework/scenario/src/facade/world_tx/scenario_env.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_env.rs
@@ -1,6 +1,6 @@
 use std::path::PathBuf;
 
-use multiversx_sc::types::{AnnotatedValue, ManagedAddress, TxBaseWithEnv, TxEnv};
+use multiversx_sc::types::{AnnotatedValue, ManagedAddress, ManagedBuffer, TxBaseWithEnv, TxEnv};
 
 use crate::{
     api::StaticApi,
@@ -28,8 +28,11 @@ impl TxEnv for ScenarioTxEnvData {
         panic!("Explicit sender address expected")
     }
 
-    fn default_gas(&self) -> u64 {
-        // TODO: annotate
+    fn default_gas_annotation(&self) -> multiversx_sc::types::ManagedBuffer<Self::Api> {
+        ManagedBuffer::from("5,000,000")
+    }
+
+    fn default_gas_value(&self) -> u64 {
         5_000_000
     }
 }
diff --git a/framework/scenario/src/facade/world_tx/scenario_env_exec.rs b/framework/scenario/src/facade/world_tx/scenario_env_exec.rs
index 25f738f5e4..8ea522c410 100644
--- a/framework/scenario/src/facade/world_tx/scenario_env_exec.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_env_exec.rs
@@ -33,8 +33,12 @@ impl<'w> TxEnv for ScenarioEnvExec<'w> {
         panic!("Explicit sender address expected")
     }
 
-    fn default_gas(&self) -> u64 {
-        self.data.default_gas()
+    fn default_gas_annotation(&self) -> ManagedBuffer<Self::Api> {
+        self.data.default_gas_annotation()
+    }
+
+    fn default_gas_value(&self) -> u64 {
+        self.data.default_gas_value()
     }
 }
 
diff --git a/framework/scenario/src/facade/world_tx/scenario_env_query.rs b/framework/scenario/src/facade/world_tx/scenario_env_query.rs
index c25d0f61db..dac9e68d83 100644
--- a/framework/scenario/src/facade/world_tx/scenario_env_query.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_env_query.rs
@@ -3,8 +3,8 @@ use std::path::PathBuf;
 use multiversx_sc::{
     tuple_util::NestedTupleFlatten,
     types::{
-        AnnotatedValue, FunctionCall, ManagedAddress, RHListExec, Tx, TxBaseWithEnv, TxEnv,
-        TxFromSpecified, TxGas, TxPayment, TxToSpecified,
+        AnnotatedValue, FunctionCall, ManagedAddress, ManagedBuffer, RHListExec, Tx, TxBaseWithEnv,
+        TxEnv, TxFromSpecified, TxGas, TxPayment, TxToSpecified,
     },
 };
 
@@ -30,8 +30,12 @@ impl<'w> TxEnv for ScenarioEnvQuery<'w> {
         panic!("Explicit sender address expected")
     }
 
-    fn default_gas(&self) -> u64 {
-        self.data.default_gas()
+    fn default_gas_annotation(&self) -> ManagedBuffer<Self::Api> {
+        self.data.default_gas_annotation()
+    }
+
+    fn default_gas_value(&self) -> u64 {
+        self.data.default_gas_value()
     }
 }
 
diff --git a/framework/scenario/src/facade/world_tx/scenario_env_util.rs b/framework/scenario/src/facade/world_tx/scenario_env_util.rs
index ffee5d5aea..8334b22cfb 100644
--- a/framework/scenario/src/facade/world_tx/scenario_env_util.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_env_util.rs
@@ -4,7 +4,7 @@ use multiversx_sc::{
     types::{
         AnnotatedValue, Code, DeployCall, FunctionCall, ManagedAddress, ManagedBuffer, RHListExec,
         Tx, TxBaseWithEnv, TxCodeSource, TxCodeSourceSpecified, TxCodeValue, TxEnv,
-        TxFromSpecified, TxGas, TxPayment, TxToSpecified,
+        TxFromSpecified, TxGas, TxGasValue, TxPayment, TxToSpecified,
     },
 };
 
@@ -41,6 +41,18 @@ where
     }
 }
 
+pub fn gas_annotated<Env, Gas>(env: &Env, gas: Gas) -> U64Value
+where
+    Env: TxEnv,
+    Gas: TxGas<Env>,
+{
+    let annotation = gas.gas_annotation(env).to_string();
+    U64Value {
+        value: gas.gas_value(env),
+        original: ValueSubTree::Str(annotation),
+    }
+}
+
 pub fn tx_to_sc_call_step<Env, From, To, Payment, Gas>(
     env: &Env,
     from: From,
@@ -64,8 +76,7 @@ where
         step.tx.arguments.push(arg.to_vec().into());
     }
 
-    let explicit_gas = gas.resolve_gas(env);
-    step.tx.gas_limit = U64Value::from(explicit_gas);
+    step.tx.gas_limit = gas_annotated(env, gas);
 
     let full_payment_data = payment.into_full_payment_data(env);
     if let Some(annotated_egld_payment) = full_payment_data.egld {
@@ -96,8 +107,7 @@ where
         step.tx.arguments.push(arg.to_vec().into());
     }
 
-    let explicit_gas = gas.resolve_gas(env);
-    step.tx.gas_limit = U64Value::from(explicit_gas);
+    step.tx.gas_limit = gas_annotated(env, gas);
 
     let full_payment_data = payment.into_full_payment_data(env);
     if let Some(annotated_egld_payment) = full_payment_data.egld {
@@ -140,8 +150,7 @@ where
         .from(address_annotated(env, from))
         .to(address_annotated(env, to));
 
-    let explicit_gas = gas.resolve_gas(env);
-    step.tx.gas_limit = U64Value::from(explicit_gas);
+    step.tx.gas_limit = gas_annotated(env, gas);
 
     let full_payment_data = payment.into_full_payment_data(env);
     if let Some(annotated_egld_payment) = full_payment_data.egld {
diff --git a/framework/snippets/src/itx/interactor_env_exec.rs b/framework/snippets/src/itx/interactor_env_exec.rs
index 15065c9191..235a580853 100644
--- a/framework/snippets/src/itx/interactor_env_exec.rs
+++ b/framework/snippets/src/itx/interactor_env_exec.rs
@@ -32,8 +32,12 @@ impl<'w> TxEnv for InteractorEnvExec<'w> {
         panic!("Explicit sender address expected")
     }
 
-    fn default_gas(&self) -> u64 {
-        self.data.default_gas()
+    fn default_gas_annotation(&self) -> ManagedBuffer<Self::Api> {
+        self.data.default_gas_annotation()
+    }
+
+    fn default_gas_value(&self) -> u64 {
+        self.data.default_gas_value()
     }
 }
 
diff --git a/framework/snippets/src/itx/interactor_env_query.rs b/framework/snippets/src/itx/interactor_env_query.rs
index 1ca5be149a..052fc8cc12 100644
--- a/framework/snippets/src/itx/interactor_env_query.rs
+++ b/framework/snippets/src/itx/interactor_env_query.rs
@@ -5,8 +5,8 @@ use multiversx_sc_scenario::{
     multiversx_sc::{
         tuple_util::NestedTupleFlatten,
         types::{
-            AnnotatedValue, FunctionCall, ManagedAddress, RHListExec, Tx, TxBaseWithEnv, TxEnv,
-            TxFromSpecified, TxGas, TxPayment, TxToSpecified,
+            AnnotatedValue, FunctionCall, ManagedAddress, ManagedBuffer, RHListExec, Tx,
+            TxBaseWithEnv, TxEnv, TxFromSpecified, TxGas, TxPayment, TxToSpecified,
         },
     },
     scenario_env_util::*,
@@ -30,8 +30,12 @@ impl<'w> TxEnv for InteractorEnvQuery<'w> {
         panic!("Explicit sender address expected")
     }
 
-    fn default_gas(&self) -> u64 {
-        self.data.default_gas()
+    fn default_gas_annotation(&self) -> ManagedBuffer<Self::Api> {
+        self.data.default_gas_annotation()
+    }
+
+    fn default_gas_value(&self) -> u64 {
+        self.data.default_gas_value()
     }
 }
 

From 9b7c228ec28efcee4c1f396177ed6bcd7f1d73db Mon Sep 17 00:00:00 2001
From: Alin Cruceat <alyn_509@yahoo.com>
Date: Wed, 27 Mar 2024 10:41:08 +0200
Subject: [PATCH 0572/1254] import FixedSupplyToken & Mergeable

---
 .../base/src/types/managed/wrapped/mod.rs     |  6 ++
 .../wrapped/traits/fixed_token_supply.rs      | 31 ++++++++++
 .../types/managed/wrapped/traits/mergeable.rs | 62 +++++++++++++++++++
 .../src/types/managed/wrapped/traits/mod.rs   |  2 +
 4 files changed, 101 insertions(+)
 create mode 100644 framework/base/src/types/managed/wrapped/traits/fixed_token_supply.rs
 create mode 100644 framework/base/src/types/managed/wrapped/traits/mergeable.rs
 create mode 100644 framework/base/src/types/managed/wrapped/traits/mod.rs

diff --git a/framework/base/src/types/managed/wrapped/mod.rs b/framework/base/src/types/managed/wrapped/mod.rs
index 8ac485fa38..d87389a87a 100644
--- a/framework/base/src/types/managed/wrapped/mod.rs
+++ b/framework/base/src/types/managed/wrapped/mod.rs
@@ -17,6 +17,7 @@ mod managed_vec_ref_iter;
 pub(crate) mod preloaded_managed_buffer;
 mod randomness_source;
 mod token_identifier;
+mod traits;
 
 pub use egld_or_esdt_token_identifier::EgldOrEsdtTokenIdentifier;
 pub use egld_or_esdt_token_payment::EgldOrEsdtTokenPayment;
@@ -37,3 +38,8 @@ pub use managed_vec_ref::ManagedVecRef;
 pub use managed_vec_ref_iter::ManagedVecRefIterator;
 pub use randomness_source::RandomnessSource;
 pub use token_identifier::TokenIdentifier;
+
+pub use self::traits::{
+    fixed_token_supply::FixedSupplyToken,
+    mergeable::{ExternallyMergeable, Mergeable},
+};
diff --git a/framework/base/src/types/managed/wrapped/traits/fixed_token_supply.rs b/framework/base/src/types/managed/wrapped/traits/fixed_token_supply.rs
new file mode 100644
index 0000000000..838486c203
--- /dev/null
+++ b/framework/base/src/types/managed/wrapped/traits/fixed_token_supply.rs
@@ -0,0 +1,31 @@
+use crate::imports::{BigUint, ErrorApiImpl, ManagedTypeApi};
+
+pub trait FixedSupplyToken<M: ManagedTypeApi> {
+    fn get_total_supply(&self) -> BigUint<M>;
+
+    fn into_part(self, payment_amount: &BigUint<M>) -> Self;
+
+    /// full_value * current_supply / total_supply
+    fn rule_of_three(&self, current_supply: &BigUint<M>, full_value: &BigUint<M>) -> BigUint<M> {
+        let total_supply = self.get_total_supply();
+        if current_supply == &total_supply {
+            return full_value.clone();
+        }
+
+        (full_value * current_supply) / total_supply
+    }
+
+    /// full_value * current_supply / total_supply
+    fn rule_of_three_non_zero_result(
+        &self,
+        current_supply: &BigUint<M>,
+        full_value: &BigUint<M>,
+    ) -> BigUint<M> {
+        let result = self.rule_of_three(current_supply, full_value);
+        if result == 0 {
+            M::error_api_impl().signal_error(b"Zero amount");
+        }
+
+        result
+    }
+}
diff --git a/framework/base/src/types/managed/wrapped/traits/mergeable.rs b/framework/base/src/types/managed/wrapped/traits/mergeable.rs
new file mode 100644
index 0000000000..2ed714973a
--- /dev/null
+++ b/framework/base/src/types/managed/wrapped/traits/mergeable.rs
@@ -0,0 +1,62 @@
+use crate::imports::{ErrorApiImpl, EsdtTokenPayment, ManagedTypeApi, ManagedVec, ManagedVecItem};
+
+pub static CANNOT_MERGE_ERR_MSG: &[u8] = b"Cannot merge";
+
+/// Used for types that can be merged locally.
+pub trait Mergeable<M: ManagedTypeApi> {
+    fn error_if_not_mergeable(&self, other: &Self) {
+        if !self.can_merge_with(other) {
+            throw_not_mergeable_error::<M>();
+        }
+    }
+
+    fn can_merge_with(&self, other: &Self) -> bool;
+
+    fn merge_with(&mut self, other: Self);
+
+    fn merge_with_multiple(&mut self, others: ManagedVec<M, Self>)
+    where
+        Self: Sized + ManagedVecItem,
+    {
+        for item in &others {
+            self.merge_with(item);
+        }
+    }
+}
+
+/// Used when merging is done through an external SC call.
+/// Generally, these only need to have the same token ID, with different nonces.
+pub trait ExternallyMergeable<M: ManagedTypeApi> {
+    fn error_if_not_externally_mergeable(&self, other: &Self) {
+        if !self.can_be_merged_externally_with(other) {
+            throw_not_mergeable_error::<M>();
+        }
+    }
+
+    fn can_be_merged_externally_with(&self, other: &Self) -> bool;
+}
+
+pub fn throw_not_mergeable_error<M: ManagedTypeApi>() -> ! {
+    M::error_api_impl().signal_error(CANNOT_MERGE_ERR_MSG);
+}
+
+impl<M: ManagedTypeApi> Mergeable<M> for EsdtTokenPayment<M> {
+    fn can_merge_with(&self, other: &Self) -> bool {
+        let same_token_id = self.token_identifier == other.token_identifier;
+        let same_token_nonce = self.token_nonce == other.token_nonce;
+
+        same_token_id && same_token_nonce
+    }
+
+    fn merge_with(&mut self, other: Self) {
+        self.error_if_not_mergeable(&other);
+
+        self.amount += other.amount;
+    }
+}
+
+impl<M: ManagedTypeApi> ExternallyMergeable<M> for EsdtTokenPayment<M> {
+    fn can_be_merged_externally_with(&self, other: &Self) -> bool {
+        self.token_identifier == other.token_identifier
+    }
+}
diff --git a/framework/base/src/types/managed/wrapped/traits/mod.rs b/framework/base/src/types/managed/wrapped/traits/mod.rs
new file mode 100644
index 0000000000..2a9f147fdc
--- /dev/null
+++ b/framework/base/src/types/managed/wrapped/traits/mod.rs
@@ -0,0 +1,2 @@
+pub(crate) mod fixed_token_supply;
+pub(crate) mod mergeable;

From 928ca501e0e461d322d954f75589ed6ba0bb5a6d Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 27 Mar 2024 12:26:36 +0200
Subject: [PATCH 0573/1254] NumExpr & GasLeft

---
 .../adder/interact/src/basic_interact.rs      |  4 +-
 .../interact/src/multisig_interact.rs         |  8 +--
 .../interact/src/multisig_interact_nfts.rs    | 12 ++---
 .../interact/src/multisig_interact_wegld.rs   |  9 ++--
 .../contract_base/wrappers/send_wrapper.rs    |  6 +--
 .../base/src/types/interaction/annotated.rs   | 13 ++++-
 .../annotated/annotated_impl_u64.rs           | 11 +---
 .../base/src/types/interaction/markers.rs     |  7 +++
 .../src/types/interaction/markers/gas_left.rs | 29 ++++++++++
 .../tx_to_caller.rs => markers/to_caller.rs}  |  6 +--
 .../tx_to_self.rs => markers/to_self.rs}      |  6 +--
 framework/base/src/types/interaction/mod.rs   |  2 +
 framework/base/src/types/interaction/tx_to.rs |  6 ---
 .../scenario/src/facade/world_tx/expr.rs      |  2 +
 .../src/facade/world_tx/expr/num_expr.rs      | 53 +++++++++++++++++++
 15 files changed, 133 insertions(+), 41 deletions(-)
 create mode 100644 framework/base/src/types/interaction/markers.rs
 create mode 100644 framework/base/src/types/interaction/markers/gas_left.rs
 rename framework/base/src/types/interaction/{tx_to/tx_to_caller.rs => markers/to_caller.rs} (91%)
 rename framework/base/src/types/interaction/{tx_to/tx_to_self.rs => markers/to_self.rs} (90%)
 create mode 100644 framework/scenario/src/facade/world_tx/expr/num_expr.rs

diff --git a/contracts/examples/adder/interact/src/basic_interact.rs b/contracts/examples/adder/interact/src/basic_interact.rs
index 7941bd7626..6664d030ba 100644
--- a/contracts/examples/adder/interact/src/basic_interact.rs
+++ b/contracts/examples/adder/interact/src/basic_interact.rs
@@ -17,7 +17,7 @@ use multiversx_sc_snippets::{
         scenario_format::interpret_trait::{InterpretableFrom, InterpreterContext},
         scenario_model::{BytesValue, ScDeployStep, Scenario},
         standalone::retrieve_account_as_scenario_set_state,
-        test_wallets, ContractInfo, WithRawTxResponse,
+        test_wallets, ContractInfo, NumExpr, WithRawTxResponse,
     },
     tokio, Interactor, InteractorPrepareAsync, StepBuffer,
 };
@@ -170,7 +170,7 @@ impl AdderInteract {
             .tx()
             .from(&self.wallet_address)
             .to(self.state.adder().to_address())
-            .egld(50000000000000000u64) // TODO: annotate "0,050000000000000000"
+            .egld(NumExpr("0,050000000000000000"))
             .prepare_async()
             .run()
             .await;
diff --git a/contracts/examples/multisig/interact/src/multisig_interact.rs b/contracts/examples/multisig/interact/src/multisig_interact.rs
index c60d0c9fac..83295c0b3e 100644
--- a/contracts/examples/multisig/interact/src/multisig_interact.rs
+++ b/contracts/examples/multisig/interact/src/multisig_interact.rs
@@ -16,7 +16,7 @@ use multiversx_sc_scenario::{
     multiversx_sc::types::{BigUint, ReturnsNewAddress, ReturnsResult},
     scenario_format::interpret_trait::InterpretableFrom,
     standalone::retrieve_account_as_scenario_set_state,
-    test_wallets,
+    test_wallets, NumExpr,
 };
 use multiversx_sc_snippets::{
     dns_address_for_name, env_logger,
@@ -167,7 +167,7 @@ impl MultisigInteract {
             .typed(multisig_proxy::MultisigProxy)
             .init(&Config::load_config().quorum(), board)
             .code(&self.multisig_code)
-            .with_gas_limit(100_000_000u64)
+            .gas(NumExpr("100,000,000"))
             .returns(ReturnsNewAddress)
             .prepare_async()
             .run()
@@ -260,7 +260,7 @@ impl MultisigInteract {
             .tx()
             .from(&self.wallet_address)
             .to(self.state.multisig().to_address())
-            .with_gas_limit(gas_expr)
+            .gas(gas_expr)
             .typed(multisig_proxy::MultisigProxy)
             .perform_action_endpoint(action_id)
             .prepare_async()
@@ -371,7 +371,7 @@ impl MultisigInteract {
             .tx()
             .from(&self.wallet_address)
             .to(self.state.multisig().to_address())
-            .with_gas_limit(30_000_000u64)
+            .gas(NumExpr("30,000,000"))
             .typed(multisig_proxy::MultisigProxy)
             .dns_register(dns_address, name)
             .prepare_async()
diff --git a/contracts/examples/multisig/interact/src/multisig_interact_nfts.rs b/contracts/examples/multisig/interact/src/multisig_interact_nfts.rs
index e1d48158fd..62314ef63c 100644
--- a/contracts/examples/multisig/interact/src/multisig_interact_nfts.rs
+++ b/contracts/examples/multisig/interact/src/multisig_interact_nfts.rs
@@ -5,7 +5,7 @@ use multiversx_sc_scenario::{
         codec::Empty,
         types::{FunctionCall, ReturnsResult},
     },
-    ReturnsNewTokenIdentifier,
+    NumExpr, ReturnsNewTokenIdentifier,
 };
 
 use super::*;
@@ -45,7 +45,7 @@ impl MultisigInteract {
             .tx()
             .from(&self.wallet_address)
             .to(self.state.multisig().to_address())
-            .with_gas_limit(10_000_000u64)
+            .gas(NumExpr("10,000,000"))
             .typed(multisig_proxy::MultisigProxy)
             .propose_async_call(
                 system_sc_address,
@@ -81,7 +81,7 @@ impl MultisigInteract {
             .tx()
             .from(&self.wallet_address)
             .to(&self.state.multisig().to_address())
-            .with_gas_limit(80_000_000u64)
+            .gas(NumExpr("80,000,000"))
             .typed(multisig_proxy::MultisigProxy)
             .perform_action_endpoint(action_id)
             .returns(ReturnsNewTokenIdentifier)
@@ -103,7 +103,7 @@ impl MultisigInteract {
             .tx()
             .from(&self.wallet_address)
             .to(&self.state.multisig().to_address())
-            .with_gas_limit(10_000_000u64)
+            .gas(NumExpr("10,000,000"))
             .typed(multisig_proxy::MultisigProxy)
             .propose_async_call(
                 system_sc_address,
@@ -136,7 +136,7 @@ impl MultisigInteract {
             .tx()
             .from(&self.wallet_address)
             .to(&self.state.multisig().to_address())
-            .with_gas_limit(80_000_000u64)
+            .gas(NumExpr("80,000,000"))
             .typed(multisig_proxy::MultisigProxy)
             .perform_action_endpoint(action_id)
             .returns(ReturnsNewTokenIdentifier)
@@ -158,7 +158,7 @@ impl MultisigInteract {
             .tx()
             .from(&self.wallet_address)
             .to(&self.state.multisig().to_address())
-            .with_gas_limit(10_000_000u64)
+            .gas(NumExpr("10,000,000"))
             .typed(multisig_proxy::MultisigProxy)
             .propose_async_call(
                 &self.system_sc_address,
diff --git a/contracts/examples/multisig/interact/src/multisig_interact_wegld.rs b/contracts/examples/multisig/interact/src/multisig_interact_wegld.rs
index 92efedc86e..6e3c10563e 100644
--- a/contracts/examples/multisig/interact/src/multisig_interact_wegld.rs
+++ b/contracts/examples/multisig/interact/src/multisig_interact_wegld.rs
@@ -1,6 +1,9 @@
 use std::time::Duration;
 
-use multiversx_sc_scenario::multiversx_sc::types::{ContractCallBase, FunctionCall, ReturnsResult};
+use multiversx_sc_scenario::{
+    multiversx_sc::types::{ContractCallBase, FunctionCall, ReturnsResult},
+    NumExpr,
+};
 #[allow(unused_imports)]
 use multiversx_sc_snippets::multiversx_sc::types::{
     EsdtTokenPayment, MultiValueEncoded, TokenIdentifier,
@@ -65,7 +68,7 @@ impl MultisigInteract {
             .tx()
             .from(&self.wallet_address)
             .to(&self.state.multisig().to_address())
-            .with_gas_limit(10_000_000u64)
+            .gas(NumExpr("10,000,000"))
             .typed(multisig_proxy::MultisigProxy)
             .propose_async_call(
                 bech32::decode(WEGLD_SWAP_SC_BECH32),
@@ -98,7 +101,7 @@ impl MultisigInteract {
             .tx()
             .from(&self.wallet_address)
             .to(&self.state.multisig().to_address())
-            .with_gas_limit(10_000_000u64)
+            .gas(NumExpr("10,000,000"))
             .typed(multisig_proxy::MultisigProxy)
             .propose_async_call(
                 contract_call.basic.to,
diff --git a/framework/base/src/contract_base/wrappers/send_wrapper.rs b/framework/base/src/contract_base/wrappers/send_wrapper.rs
index 6083b7b92a..dc63932e22 100644
--- a/framework/base/src/contract_base/wrappers/send_wrapper.rs
+++ b/framework/base/src/contract_base/wrappers/send_wrapper.rs
@@ -12,7 +12,7 @@ use crate::{
     },
     codec,
     esdt::ESDTSystemSmartContractProxy,
-    proxy_imports::{ReturnsRawResult, ToSelf},
+    proxy_imports::{GasLeft, ReturnsRawResult, ToSelf},
     types::{
         BigUint, ContractCall, ContractCallNoPayment, EgldOrEsdtTokenIdentifier, EsdtTokenPayment,
         ManagedAddress, ManagedArgBuffer, ManagedBuffer, ManagedType, ManagedVec, TokenIdentifier,
@@ -386,7 +386,7 @@ where
     ) -> ManagedVec<A, ManagedBuffer<A>> {
         Tx::new_tx_from_sc()
             .to(ToSelf)
-            .with_gas_limit(gas)
+            .gas(gas)
             .raw_call()
             .function_name(endpoint_name)
             .arguments_raw(arg_buffer)
@@ -401,7 +401,7 @@ where
     ) {
         Tx::new_tx_from_sc()
             .to(ToSelf)
-            .with_gas_limit(A::blockchain_api_impl().get_gas_left())
+            .gas(GasLeft)
             .raw_call()
             .function_name(function_name)
             .arguments_raw(arg_buffer)
diff --git a/framework/base/src/types/interaction/annotated.rs b/framework/base/src/types/interaction/annotated.rs
index a7f18c6745..ab2953b4fb 100644
--- a/framework/base/src/types/interaction/annotated.rs
+++ b/framework/base/src/types/interaction/annotated.rs
@@ -4,7 +4,8 @@ mod annotated_impl_managed_buffer;
 mod annotated_impl_u64;
 
 use crate::{
-    proxy_imports::ManagedRef,
+    formatter::FormatBuffer,
+    proxy_imports::{ManagedBufferCachedBuilder, ManagedRef, ManagedTypeApi},
     types::{heap::Address, BigUint, ManagedAddress, ManagedBuffer},
 };
 
@@ -36,3 +37,13 @@ where
         f(&self.to_value(env))
     }
 }
+
+/// Useful for u64 display in several places.
+pub(super) fn display_u64<Api>(n: u64) -> ManagedBuffer<Api>
+where
+    Api: ManagedTypeApi,
+{
+    let mut result = ManagedBufferCachedBuilder::new_from_slice(&[]);
+    result.append_display(&n);
+    result.into_managed_buffer()
+}
diff --git a/framework/base/src/types/interaction/annotated/annotated_impl_u64.rs b/framework/base/src/types/interaction/annotated/annotated_impl_u64.rs
index 0905710c25..9c1435c581 100644
--- a/framework/base/src/types/interaction/annotated/annotated_impl_u64.rs
+++ b/framework/base/src/types/interaction/annotated/annotated_impl_u64.rs
@@ -7,16 +7,7 @@ use crate::{
     },
 };
 
-use super::{AnnotatedValue, TxEnv};
-
-pub(crate) fn display_u64<Api>(n: u64) -> ManagedBuffer<Api>
-where
-    Api: ManagedTypeApi,
-{
-    let mut result = ManagedBufferCachedBuilder::new_from_slice(&[]);
-    result.append_display(&n);
-    result.into_managed_buffer()
-}
+use super::{display_u64, AnnotatedValue, TxEnv};
 
 impl<Env> AnnotatedValue<Env, u64> for u64
 where
diff --git a/framework/base/src/types/interaction/markers.rs b/framework/base/src/types/interaction/markers.rs
new file mode 100644
index 0000000000..10ccdea5d0
--- /dev/null
+++ b/framework/base/src/types/interaction/markers.rs
@@ -0,0 +1,7 @@
+mod gas_left;
+mod to_caller;
+mod to_self;
+
+pub use gas_left::GasLeft;
+pub use to_caller::ToCaller;
+pub use to_self::ToSelf;
diff --git a/framework/base/src/types/interaction/markers/gas_left.rs b/framework/base/src/types/interaction/markers/gas_left.rs
new file mode 100644
index 0000000000..69f43753f6
--- /dev/null
+++ b/framework/base/src/types/interaction/markers/gas_left.rs
@@ -0,0 +1,29 @@
+use crate::{
+    api::{BlockchainApi, BlockchainApiImpl, ManagedTypeApi},
+    formatter::FormatBuffer,
+    types::{
+        interaction::display_u64, AnnotatedValue, BigUint, ManagedAddress, ManagedBuffer,
+        ManagedBufferCachedBuilder, TxCodeValue, TxEgldValue, TxEnv, TxFrom, TxFromSpecified,
+        TxGasValue, TxTo, TxToSpecified,
+    },
+};
+
+/// Indicates that all remaining gas should be sent to a transaction.
+///
+/// Usually unwise, other than for synchronous calls, you always want to have some gas left in the contract after the call.
+pub struct GasLeft;
+
+impl<Env> AnnotatedValue<Env, u64> for GasLeft
+where
+    Env: TxEnv,
+{
+    fn annotation(&self, env: &Env) -> ManagedBuffer<Env::Api> {
+        display_u64(self.to_value(env))
+    }
+
+    fn to_value(&self, env: &Env) -> u64 {
+        Env::Api::blockchain_api_impl().get_gas_left()
+    }
+}
+
+impl<Env> TxGasValue<Env> for GasLeft where Env: TxEnv {}
diff --git a/framework/base/src/types/interaction/tx_to/tx_to_caller.rs b/framework/base/src/types/interaction/markers/to_caller.rs
similarity index 91%
rename from framework/base/src/types/interaction/tx_to/tx_to_caller.rs
rename to framework/base/src/types/interaction/markers/to_caller.rs
index 7217f47c8b..7d311438b9 100644
--- a/framework/base/src/types/interaction/tx_to/tx_to_caller.rs
+++ b/framework/base/src/types/interaction/markers/to_caller.rs
@@ -1,11 +1,11 @@
 use crate::{
     api::{const_handles, use_raw_handle, BlockchainApi, BlockchainApiImpl, CallTypeApi},
     contract_base::BlockchainWrapper,
-    types::{AnnotatedValue, ManagedAddress, ManagedBuffer, ManagedType, TxScEnv},
+    types::{
+        AnnotatedValue, ManagedAddress, ManagedBuffer, ManagedType, TxScEnv, TxTo, TxToSpecified,
+    },
 };
 
-use super::{TxTo, TxToSpecified};
-
 /// Indicates that transaction should be sent to the caller (the sender of the current transaction).
 pub struct ToCaller;
 
diff --git a/framework/base/src/types/interaction/tx_to/tx_to_self.rs b/framework/base/src/types/interaction/markers/to_self.rs
similarity index 90%
rename from framework/base/src/types/interaction/tx_to/tx_to_self.rs
rename to framework/base/src/types/interaction/markers/to_self.rs
index 72350c312e..7b8115b38e 100644
--- a/framework/base/src/types/interaction/tx_to/tx_to_self.rs
+++ b/framework/base/src/types/interaction/markers/to_self.rs
@@ -1,11 +1,11 @@
 use crate::{
     api::{const_handles, use_raw_handle, BlockchainApi, BlockchainApiImpl, CallTypeApi},
     contract_base::BlockchainWrapper,
-    types::{AnnotatedValue, ManagedAddress, ManagedBuffer, ManagedType, TxScEnv},
+    types::{
+        AnnotatedValue, ManagedAddress, ManagedBuffer, ManagedType, TxScEnv, TxTo, TxToSpecified,
+    },
 };
 
-use super::{TxTo, TxToSpecified};
-
 /// Indicates that transaction should be sent to itself.
 pub struct ToSelf;
 
diff --git a/framework/base/src/types/interaction/mod.rs b/framework/base/src/types/interaction/mod.rs
index 125f16150b..ffe4cec68f 100644
--- a/framework/base/src/types/interaction/mod.rs
+++ b/framework/base/src/types/interaction/mod.rs
@@ -19,6 +19,7 @@ mod deploy_call;
 mod expr;
 mod function_call;
 mod managed_arg_buffer;
+mod markers;
 mod tx;
 mod tx_call_async;
 mod tx_call_async_promises;
@@ -60,6 +61,7 @@ pub use deploy_call::*;
 pub use expr::*;
 pub use function_call::FunctionCall;
 pub use managed_arg_buffer::ManagedArgBuffer;
+pub use markers::*;
 pub use tx::*;
 pub use tx_call_async::*;
 pub use tx_call_async_promises::*;
diff --git a/framework/base/src/types/interaction/tx_to.rs b/framework/base/src/types/interaction/tx_to.rs
index 03f3105858..6ba0f6eec8 100644
--- a/framework/base/src/types/interaction/tx_to.rs
+++ b/framework/base/src/types/interaction/tx_to.rs
@@ -1,9 +1,3 @@
-mod tx_to_caller;
-mod tx_to_self;
-
-pub use tx_to_caller::ToCaller;
-pub use tx_to_self::ToSelf;
-
 use crate::types::{heap::Address, ManagedAddress};
 
 use super::{AnnotatedValue, TxEnv};
diff --git a/framework/scenario/src/facade/world_tx/expr.rs b/framework/scenario/src/facade/world_tx/expr.rs
index 2d28c5bdbd..37750ee973 100644
--- a/framework/scenario/src/facade/world_tx/expr.rs
+++ b/framework/scenario/src/facade/world_tx/expr.rs
@@ -1,5 +1,7 @@
 mod file_expr;
 mod mxsc_expr;
+mod num_expr;
 
 pub use file_expr::FileExpr;
 pub use mxsc_expr::MxscExpr;
+pub use num_expr::NumExpr;
diff --git a/framework/scenario/src/facade/world_tx/expr/num_expr.rs b/framework/scenario/src/facade/world_tx/expr/num_expr.rs
new file mode 100644
index 0000000000..de9137b8fc
--- /dev/null
+++ b/framework/scenario/src/facade/world_tx/expr/num_expr.rs
@@ -0,0 +1,53 @@
+use crate::{api::StaticApi, ScenarioEnvExec, ScenarioTxEnv, ScenarioTxEnvData};
+use core::ptr;
+use multiversx_chain_scenario_format::{
+    interpret_trait::InterpreterContext, value_interpreter::interpret_string,
+};
+use multiversx_sc::{
+    api::ManagedTypeApi,
+    types::{
+        AnnotatedValue, BigUint, ManagedAddress, ManagedBuffer, TxCodeValue, TxEgldValue, TxEnv,
+        TxFrom, TxFromSpecified, TxGasValue, TxTo, TxToSpecified,
+    },
+};
+use std::path::PathBuf;
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub struct NumExpr<'a>(pub &'a str);
+
+fn interpret_big_uint<Api>(s: &str) -> BigUint<Api>
+where
+    Api: ManagedTypeApi,
+{
+    let bytes = interpret_string(s, &InterpreterContext::new());
+    BigUint::from_bytes_be(&bytes)
+}
+
+impl<'a, Env> AnnotatedValue<Env, BigUint<Env::Api>> for NumExpr<'a>
+where
+    Env: ScenarioTxEnv,
+{
+    fn annotation(&self, _env: &Env) -> ManagedBuffer<Env::Api> {
+        self.0.into()
+    }
+
+    fn to_value(&self, env: &Env) -> BigUint<Env::Api> {
+        interpret_big_uint(self.0)
+    }
+}
+
+impl<'a, Env> AnnotatedValue<Env, u64> for NumExpr<'a>
+where
+    Env: ScenarioTxEnv,
+{
+    fn annotation(&self, _env: &Env) -> ManagedBuffer<Env::Api> {
+        self.0.into()
+    }
+
+    fn to_value(&self, env: &Env) -> u64 {
+        interpret_big_uint::<Env::Api>(self.0).to_u64().unwrap()
+    }
+}
+
+impl<'a, Env> TxEgldValue<Env> for NumExpr<'a> where Env: ScenarioTxEnv {}
+impl<'a, Env> TxGasValue<Env> for NumExpr<'a> where Env: ScenarioTxEnv {}

From d3437bf78fa2a87e1468615d8cfb559421037b27 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 27 Mar 2024 12:33:21 +0200
Subject: [PATCH 0574/1254] cleanup

---
 framework/base/src/contract_base/wrappers/send_wrapper.rs  | 5 ++---
 framework/base/src/types/interaction/annotated.rs          | 7 +++++--
 .../types/interaction/annotated/annotated_impl_big_uint.rs | 5 +----
 .../annotated/annotated_impl_managed_address.rs            | 5 +----
 .../interaction/annotated/annotated_impl_managed_buffer.rs | 5 +----
 .../src/types/interaction/annotated/annotated_impl_u64.rs  | 2 +-
 framework/base/src/types/interaction/tx.rs                 | 6 +++---
 framework/base/src/types/interaction/tx_call_upgrade.rs    | 2 +-
 framework/base/src/types/interaction/tx_env.rs             | 5 ++++-
 framework/base/src/types/interaction/tx_env_sc.rs          | 5 +++--
 .../src/types/interaction/tx_payment/tx_payment_egld.rs    | 5 +++--
 .../types/interaction/tx_payment/tx_payment_egld_value.rs  | 5 +----
 .../src/types/interaction/tx_rh_list/tx_rh_list_exec.rs    | 3 +--
 13 files changed, 27 insertions(+), 33 deletions(-)

diff --git a/framework/base/src/contract_base/wrappers/send_wrapper.rs b/framework/base/src/contract_base/wrappers/send_wrapper.rs
index dc63932e22..f761f1cb04 100644
--- a/framework/base/src/contract_base/wrappers/send_wrapper.rs
+++ b/framework/base/src/contract_base/wrappers/send_wrapper.rs
@@ -12,11 +12,10 @@ use crate::{
     },
     codec,
     esdt::ESDTSystemSmartContractProxy,
-    proxy_imports::{GasLeft, ReturnsRawResult, ToSelf},
     types::{
         BigUint, ContractCall, ContractCallNoPayment, EgldOrEsdtTokenIdentifier, EsdtTokenPayment,
-        ManagedAddress, ManagedArgBuffer, ManagedBuffer, ManagedType, ManagedVec, TokenIdentifier,
-        Tx,
+        GasLeft, ManagedAddress, ManagedArgBuffer, ManagedBuffer, ManagedType, ManagedVec,
+        ReturnsRawResult, ToSelf, TokenIdentifier, Tx,
     },
 };
 
diff --git a/framework/base/src/types/interaction/annotated.rs b/framework/base/src/types/interaction/annotated.rs
index ab2953b4fb..dc9e117e7e 100644
--- a/framework/base/src/types/interaction/annotated.rs
+++ b/framework/base/src/types/interaction/annotated.rs
@@ -4,9 +4,12 @@ mod annotated_impl_managed_buffer;
 mod annotated_impl_u64;
 
 use crate::{
+    api::ManagedTypeApi,
     formatter::FormatBuffer,
-    proxy_imports::{ManagedBufferCachedBuilder, ManagedRef, ManagedTypeApi},
-    types::{heap::Address, BigUint, ManagedAddress, ManagedBuffer},
+    types::{
+        heap::Address, BigUint, ManagedAddress, ManagedBuffer, ManagedBufferCachedBuilder,
+        ManagedRef,
+    },
 };
 
 use super::TxEnv;
diff --git a/framework/base/src/types/interaction/annotated/annotated_impl_big_uint.rs b/framework/base/src/types/interaction/annotated/annotated_impl_big_uint.rs
index 823a796348..36c11f1c70 100644
--- a/framework/base/src/types/interaction/annotated/annotated_impl_big_uint.rs
+++ b/framework/base/src/types/interaction/annotated/annotated_impl_big_uint.rs
@@ -1,7 +1,4 @@
-use crate::{
-    proxy_imports::ManagedRef,
-    types::{heap::Address, BigUint, ManagedAddress, ManagedBuffer},
-};
+use crate::types::{heap::Address, BigUint, ManagedAddress, ManagedBuffer, ManagedRef};
 
 use super::{AnnotatedValue, TxEnv};
 
diff --git a/framework/base/src/types/interaction/annotated/annotated_impl_managed_address.rs b/framework/base/src/types/interaction/annotated/annotated_impl_managed_address.rs
index 87aebbb82e..3d08368c53 100644
--- a/framework/base/src/types/interaction/annotated/annotated_impl_managed_address.rs
+++ b/framework/base/src/types/interaction/annotated/annotated_impl_managed_address.rs
@@ -1,7 +1,4 @@
-use crate::{
-    proxy_imports::ManagedRef,
-    types::{heap::Address, BigUint, ManagedAddress, ManagedBuffer},
-};
+use crate::types::{heap::Address, BigUint, ManagedAddress, ManagedBuffer, ManagedRef};
 
 use super::{AnnotatedValue, TxEnv};
 
diff --git a/framework/base/src/types/interaction/annotated/annotated_impl_managed_buffer.rs b/framework/base/src/types/interaction/annotated/annotated_impl_managed_buffer.rs
index bf15a3a262..433cf431af 100644
--- a/framework/base/src/types/interaction/annotated/annotated_impl_managed_buffer.rs
+++ b/framework/base/src/types/interaction/annotated/annotated_impl_managed_buffer.rs
@@ -1,7 +1,4 @@
-use crate::{
-    proxy_imports::ManagedRef,
-    types::{heap::Address, BigUint, ManagedAddress, ManagedBuffer},
-};
+use crate::types::{heap::Address, BigUint, ManagedAddress, ManagedBuffer, ManagedRef};
 
 use super::{AnnotatedValue, TxEnv};
 
diff --git a/framework/base/src/types/interaction/annotated/annotated_impl_u64.rs b/framework/base/src/types/interaction/annotated/annotated_impl_u64.rs
index 9c1435c581..04ad3fd7c0 100644
--- a/framework/base/src/types/interaction/annotated/annotated_impl_u64.rs
+++ b/framework/base/src/types/interaction/annotated/annotated_impl_u64.rs
@@ -1,6 +1,6 @@
 use crate::{
+    api::ManagedTypeApi,
     formatter::{FormatBuffer, SCDisplay},
-    proxy_imports::ManagedTypeApi,
     types::{
         heap::Address, BigUint, ManagedAddress, ManagedBuffer, ManagedBufferCachedBuilder,
         ManagedRef,
diff --git a/framework/base/src/types/interaction/tx.rs b/framework/base/src/types/interaction/tx.rs
index 2213380614..5c964746c2 100644
--- a/framework/base/src/types/interaction/tx.rs
+++ b/framework/base/src/types/interaction/tx.rs
@@ -1,10 +1,10 @@
 use crate::{
     api::CallTypeApi,
     contract_base::BlockchainWrapper,
-    proxy_imports::{EsdtTokenPaymentRefs, TokenIdentifier},
     types::{
-        BigUint, CodeMetadata, EgldOrEsdtTokenPayment, EsdtTokenPayment, ManagedAddress,
-        ManagedBuffer, ManagedOption, ManagedVec, MultiEsdtPayment,
+        BigUint, CodeMetadata, EgldOrEsdtTokenPayment, EsdtTokenPayment, EsdtTokenPaymentRefs,
+        ManagedAddress, ManagedBuffer, ManagedOption, ManagedVec, MultiEsdtPayment,
+        TokenIdentifier,
     },
 };
 
diff --git a/framework/base/src/types/interaction/tx_call_upgrade.rs b/framework/base/src/types/interaction/tx_call_upgrade.rs
index 24438da3c3..db56b8a230 100644
--- a/framework/base/src/types/interaction/tx_call_upgrade.rs
+++ b/framework/base/src/types/interaction/tx_call_upgrade.rs
@@ -1,8 +1,8 @@
 use crate::{
     api::CallTypeApi,
     contract_base::SendRawWrapper,
-    proxy_imports::{CodeMetadata, ManagedAddress, ManagedBuffer, ManagedVec},
     tuple_util::NestedTupleFlatten,
+    types::{CodeMetadata, ManagedAddress, ManagedBuffer, ManagedVec},
 };
 
 use super::{
diff --git a/framework/base/src/types/interaction/tx_env.rs b/framework/base/src/types/interaction/tx_env.rs
index 3ba108f788..16fd0da683 100644
--- a/framework/base/src/types/interaction/tx_env.rs
+++ b/framework/base/src/types/interaction/tx_env.rs
@@ -1,4 +1,7 @@
-use crate::{api::CallTypeApi, proxy_imports::ManagedBuffer, types::ManagedAddress};
+use crate::{
+    api::CallTypeApi,
+    types::{ManagedAddress, ManagedBuffer},
+};
 
 pub trait TxEnv: Sized {
     type Api: CallTypeApi;
diff --git a/framework/base/src/types/interaction/tx_env_sc.rs b/framework/base/src/types/interaction/tx_env_sc.rs
index f4387275d2..8186b6b4b4 100644
--- a/framework/base/src/types/interaction/tx_env_sc.rs
+++ b/framework/base/src/types/interaction/tx_env_sc.rs
@@ -7,7 +7,8 @@ use crate::{
 };
 
 use super::{
-    contract_call_exec::TRANSFER_EXECUTE_DEFAULT_LEFTOVER, AnnotatedValue, Tx, TxBaseWithEnv, TxEnv,
+    contract_call_exec::TRANSFER_EXECUTE_DEFAULT_LEFTOVER, display_u64, AnnotatedValue, Tx,
+    TxBaseWithEnv, TxEnv,
 };
 
 pub struct TxScEnv<Api>
@@ -50,7 +51,7 @@ where
     }
 
     fn default_gas_annotation(&self) -> ManagedBuffer<Self::Api> {
-        <u64 as AnnotatedValue<Self, u64>>::annotation(&self.default_gas_value(), self)
+        display_u64(self.default_gas_value())
     }
 
     fn default_gas_value(&self) -> u64 {
diff --git a/framework/base/src/types/interaction/tx_payment/tx_payment_egld.rs b/framework/base/src/types/interaction/tx_payment/tx_payment_egld.rs
index 2c730591cd..ad0969aca1 100644
--- a/framework/base/src/types/interaction/tx_payment/tx_payment_egld.rs
+++ b/framework/base/src/types/interaction/tx_payment/tx_payment_egld.rs
@@ -1,7 +1,8 @@
 use crate::{
     contract_base::SendRawWrapper,
-    proxy_imports::{AnnotatedValue, ManagedBuffer},
-    types::{BigUint, ManagedAddress, ManagedVec, TxFrom, TxToSpecified},
+    types::{
+        AnnotatedValue, BigUint, ManagedAddress, ManagedBuffer, ManagedVec, TxFrom, TxToSpecified,
+    },
 };
 
 use super::{
diff --git a/framework/base/src/types/interaction/tx_payment/tx_payment_egld_value.rs b/framework/base/src/types/interaction/tx_payment/tx_payment_egld_value.rs
index b047e584b2..99d91b618f 100644
--- a/framework/base/src/types/interaction/tx_payment/tx_payment_egld_value.rs
+++ b/framework/base/src/types/interaction/tx_payment/tx_payment_egld_value.rs
@@ -1,7 +1,4 @@
-use crate::{
-    proxy_imports::ManagedRef,
-    types::{AnnotatedValue, BigUint},
-};
+use crate::types::{AnnotatedValue, BigUint, ManagedRef};
 
 use super::TxEnv;
 
diff --git a/framework/base/src/types/interaction/tx_rh_list/tx_rh_list_exec.rs b/framework/base/src/types/interaction/tx_rh_list/tx_rh_list_exec.rs
index 06b2184366..3773d58629 100644
--- a/framework/base/src/types/interaction/tx_rh_list/tx_rh_list_exec.rs
+++ b/framework/base/src/types/interaction/tx_rh_list/tx_rh_list_exec.rs
@@ -1,7 +1,6 @@
 use crate::{
     api::CallTypeApi,
-    proxy_imports::{ManagedBuffer, OriginalResultMarker},
-    types::TxEnv,
+    types::{ManagedBuffer, OriginalResultMarker, TxEnv},
 };
 
 use super::{ConsNoRet, ConsRet, RHList, RHListItem};

From 2fb3dde749d6390b52033314631860197678d7e0 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 27 Mar 2024 06:06:28 +0200
Subject: [PATCH 0575/1254] sc 0.48.0-alpha.1

---
 CHANGELOG.md                                   |  3 +++
 Cargo.lock                                     | 18 +++++++++---------
 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 ++--
 .../mappers/linked-list-repeat/meta/Cargo.toml |  2 +-
 .../mappers/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 +-
 .../benchmarks/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 +-
 contracts/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 +-
 .../examples/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 +++---
 contracts/examples/check-pause/meta/Cargo.toml |  2 +-
 contracts/examples/check-pause/wasm/Cargo.toml |  2 +-
 .../examples/crowdfunding-esdt/Cargo.toml      |  4 ++--
 .../examples/crowdfunding-esdt/meta/Cargo.toml |  2 +-
 .../examples/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 +-
 .../examples/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 +-
 contracts/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 ++--
 contracts/examples/proxy-pause/meta/Cargo.toml |  2 +-
 contracts/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 +-
 .../wasm-alloc-mem-fail/Cargo.toml             |  2 +-
 .../wasm-alloc-mem-leaking/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 +-
 .../composability/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 +-
 .../composability/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 ++--
 .../erc-style-contracts/erc721/meta/Cargo.toml |  2 +-
 .../erc-style-contracts/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 ++--
 .../formatted-message-features/meta/Cargo.toml |  2 +-
 .../formatted-message-features/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 +-
 .../use-module/wasm-use-module-view/Cargo.toml |  2 +-
 .../feature-tests/use-module/wasm/Cargo.toml   |  2 +-
 contracts/modules/Cargo.toml                   |  4 ++--
 framework/base/Cargo.toml                      |  4 ++--
 framework/derive/Cargo.toml                    |  2 +-
 framework/meta/Cargo.toml                      |  4 ++--
 framework/scenario/Cargo.toml                  |  6 +++---
 framework/snippets/Cargo.toml                  |  4 ++--
 framework/wasm-adapter/Cargo.toml              |  4 ++--
 tools/mxpy-snippet-generator/Cargo.toml        |  2 +-
 tools/rust-debugger/format-tests/Cargo.toml    |  4 ++--
 259 files changed, 380 insertions(+), 377 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index db5a580558..334f2d476e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,6 +26,9 @@ 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.48.0-alpha.1] - 2024-03-27
+First pre-release of the unified syntax. Syntax not yet stabilized, should only be used for experimenting with various smart contracts.
+
 ## [sc 0.47.8] - 2024-03-22
 - Test coverage functionality in sc-meta.
 - Removed deprecation from legacy whitebox testing framework, since it is still used extensively.
diff --git a/Cargo.lock b/Cargo.lock
index 0362d5974b..9fd01b92b0 100755
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1782,7 +1782,7 @@ checksum = "b59072fa0624b55ae5ae3fa6bfa91515bbeb4ac440214bc4a509e2c8806d6e9f"
 
 [[package]]
 name = "multiversx-price-aggregator-sc"
-version = "0.47.8"
+version = "0.48.0-alpha.1"
 dependencies = [
  "arrayvec",
  "getrandom 0.2.12",
@@ -1803,7 +1803,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.8"
+version = "0.48.0-alpha.1"
 dependencies = [
  "bitflags 2.4.2",
  "hex-literal",
@@ -1833,7 +1833,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.8"
+version = "0.48.0-alpha.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -1844,7 +1844,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-meta"
-version = "0.47.8"
+version = "0.48.0-alpha.1"
 dependencies = [
  "clap",
  "colored",
@@ -1870,14 +1870,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.8"
+version = "0.48.0-alpha.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-scenario"
-version = "0.47.8"
+version = "0.48.0-alpha.1"
 dependencies = [
  "base64",
  "bech32",
@@ -1903,7 +1903,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-snippets"
-version = "0.47.8"
+version = "0.48.0-alpha.1"
 dependencies = [
  "base64",
  "env_logger",
@@ -1917,7 +1917,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.8"
+version = "0.48.0-alpha.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -1948,7 +1948,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-wegld-swap-sc"
-version = "0.47.8"
+version = "0.48.0-alpha.1"
 dependencies = [
  "multiversx-sc",
  "multiversx-sc-modules",
diff --git a/contracts/benchmarks/large-storage/Cargo.toml b/contracts/benchmarks/large-storage/Cargo.toml
index d8d51ae966..76d7afedeb 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.0-alpha.1"
 path = "../../../framework/scenario"
diff --git a/contracts/benchmarks/large-storage/meta/Cargo.toml b/contracts/benchmarks/large-storage/meta/Cargo.toml
index fc26387f50..2254c4420c 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.8"
+version = "0.48.0-alpha.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 43578fbca6..230e56af0d 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.8"
+version = "0.48.0-alpha.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 8677e1dc01..c1bbf5e83e 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.0-alpha.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 af3d114fd2..061048a6df 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.0-alpha.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 3c360bd518..b624e75086 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.8"
+version = "0.48.0-alpha.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 bb1eb11323..ace678f712 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.8"
+version = "0.48.0-alpha.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 18ff68251c..db9daa1423 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.0-alpha.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 2ef4df4850..546eae9b5f 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.8"
+version = "0.48.0-alpha.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 c49b4cfb90..712981fb56 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.8"
+version = "0.48.0-alpha.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 82615c61e9..c82d290d6e 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.0-alpha.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 6c017510da..c316ce1ffd 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.8"
+version = "0.48.0-alpha.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 ca9077b541..0d80a14323 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.8"
+version = "0.48.0-alpha.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 cfabe4e46d..3b3cd16b75 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.0-alpha.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 c722ed9b9e..3b521eb613 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.8"
+version = "0.48.0-alpha.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 8737881c35..5b58aaf06a 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.8"
+version = "0.48.0-alpha.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 456e49050c..55ec5ca196 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.0-alpha.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 efb702f58c..a697fed55e 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.8"
+version = "0.48.0-alpha.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 1373a98a29..8b2277fd26 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.8"
+version = "0.48.0-alpha.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 66a7f34c1e..62133b16bf 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.0-alpha.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 12c7a4952d..4e282f6b3f 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.8"
+version = "0.48.0-alpha.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 71308601eb..fa3c8776b7 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.8"
+version = "0.48.0-alpha.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 7284596303..c54ceceffd 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.0-alpha.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 0bc84fbdc2..347a13daa3 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.8"
+version = "0.48.0-alpha.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 c0c13946cc..fdb1d747bd 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/str-repeat/Cargo.toml b/contracts/benchmarks/str-repeat/Cargo.toml
index 116327da15..fe6f028e79 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.0-alpha.1"
 path = "../../../framework/scenario"
diff --git a/contracts/benchmarks/str-repeat/meta/Cargo.toml b/contracts/benchmarks/str-repeat/meta/Cargo.toml
index 6792de337f..352057cbf6 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.8"
+version = "0.48.0-alpha.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 a36fe3ee2c..d6925a89b2 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/core/price-aggregator/Cargo.toml b/contracts/core/price-aggregator/Cargo.toml
index ed988e0663..3c3798ff7b 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.8"
+version = "0.48.0-alpha.1"
 authors = [
     "Claudiu-Marcel Bruda <claudiu.bruda@multiversx.com>",
     "MultiversX <contact@multiversx.com>",
@@ -19,15 +19,15 @@ edition = "2021"
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "0.47.8"
+version = "0.48.0-alpha.1"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.47.8"
+version = "0.48.0-alpha.1"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.0-alpha.1"
 path = "../../../framework/scenario"
 
 [dependencies]
diff --git a/contracts/core/price-aggregator/meta/Cargo.toml b/contracts/core/price-aggregator/meta/Cargo.toml
index 2cd9bbab1a..5afc4b38ca 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.47.8"
+version = "0.48.0-alpha.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 b553602e97..efd3544255 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/core/wegld-swap/Cargo.toml b/contracts/core/wegld-swap/Cargo.toml
index 64157bb652..349888dde6 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.8"
+version = "0.48.0-alpha.1"
 
 authors = [
     "Dorin Iancu <dorin.iancu@multiversx.com>",
@@ -20,13 +20,13 @@ edition = "2021"
 path = "src/wegld.rs"
 
 [dependencies.multiversx-sc]
-version = "0.47.8"
+version = "0.48.0-alpha.1"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.47.8"
+version = "0.48.0-alpha.1"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.0-alpha.1"
 path = "../../../framework/scenario"
diff --git a/contracts/core/wegld-swap/meta/Cargo.toml b/contracts/core/wegld-swap/meta/Cargo.toml
index 213dfa0c5e..2f450b3e11 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.47.8"
+version = "0.48.0-alpha.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 3dee2153c4..c80d11696e 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/adder/Cargo.toml b/contracts/examples/adder/Cargo.toml
index f5a121ae40..08d2726ed0 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.0-alpha.1"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/adder/interact/Cargo.toml b/contracts/examples/adder/interact/Cargo.toml
index 142f39c28c..631be0f14f 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../../framework/snippets"
diff --git a/contracts/examples/adder/meta/Cargo.toml b/contracts/examples/adder/meta/Cargo.toml
index dfe91b3e7d..d8680ef04e 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/examples/adder/wasm/Cargo.toml b/contracts/examples/adder/wasm/Cargo.toml
index 21d0226bb2..52a8bdaa52 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.8"
+version = "0.48.0-alpha.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 214b810a7f..ea7d233a07 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.47.8"
+version = "0.48.0-alpha.1"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.0-alpha.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 531d3b0113..1e68dd7026 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.8"
+version = "0.48.0-alpha.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 f575a2ff9f..a66c323a82 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/check-pause/Cargo.toml b/contracts/examples/check-pause/Cargo.toml
index 008b308b83..200624dc5f 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.47.8"
+version = "0.48.0-alpha.1"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.0-alpha.1"
 path = "../../../framework/scenario"
 
diff --git a/contracts/examples/check-pause/meta/Cargo.toml b/contracts/examples/check-pause/meta/Cargo.toml
index c4b5f792f1..cc827958db 100644
--- a/contracts/examples/check-pause/meta/Cargo.toml
+++ b/contracts/examples/check-pause/meta/Cargo.toml
@@ -9,6 +9,6 @@ authors = ["Alin Cruceat <alin.cruceat@multiversx.com>"]
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.47.8"
+version = "0.48.0-alpha.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 1c40a1c120..080134a090 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/crowdfunding-esdt/Cargo.toml b/contracts/examples/crowdfunding-esdt/Cargo.toml
index e5a85e92fb..7572f709b4 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.0-alpha.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 100c48ff0b..38a87c8b3f 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.8"
+version = "0.48.0-alpha.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 2202fb5bf2..e1dacf90ee 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/crypto-bubbles/Cargo.toml b/contracts/examples/crypto-bubbles/Cargo.toml
index 2e3590429a..21598a91cd 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.0-alpha.1"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/crypto-bubbles/meta/Cargo.toml b/contracts/examples/crypto-bubbles/meta/Cargo.toml
index a1f11927a9..e9320b4dc1 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.8"
+version = "0.48.0-alpha.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 7075fe64da..e360e8b7e5 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.8"
+version = "0.48.0-alpha.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 23eaa019f3..b2d8319c3d 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.8"
+version = "0.48.0-alpha.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 cca99947d8..24109bcb9c 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.8"
+version = "0.48.0-alpha.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 9ee13ed08d..55b09c7d21 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.0-alpha.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 aaf92d9d1d..8e8c9610d6 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.8"
+version = "0.48.0-alpha.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 fd1bc05228..b537f4d0f0 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.8"
+version = "0.48.0-alpha.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 75ffc5989c..f28f89a1a5 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.0-alpha.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 17514bb97f..15da5dfffd 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.8"
+version = "0.48.0-alpha.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 ad70a987be..991b4e18be 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.8"
+version = "0.48.0-alpha.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 9d7e08a9cf..2fa49433d0 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.0-alpha.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 582fa4313f..706cd065e9 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.8"
+version = "0.48.0-alpha.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 6c7f572232..e325fb57e0 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/crypto-zombies/Cargo.toml b/contracts/examples/crypto-zombies/Cargo.toml
index 63d67d258b..7cb4431e16 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.0-alpha.1"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/crypto-zombies/meta/Cargo.toml b/contracts/examples/crypto-zombies/meta/Cargo.toml
index 8a3ac45fa8..c8db30c9e1 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.8"
+version = "0.48.0-alpha.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 fd7179dea8..8454eeeb29 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/digital-cash/Cargo.toml b/contracts/examples/digital-cash/Cargo.toml
index d9bdd6b52c..73ca72b72b 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.0-alpha.1"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/digital-cash/meta/Cargo.toml b/contracts/examples/digital-cash/meta/Cargo.toml
index 5692d13296..5231e4aeeb 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.8"
+version = "0.48.0-alpha.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 1a990dca60..2c775046d8 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/empty/Cargo.toml b/contracts/examples/empty/Cargo.toml
index 5ed6cf966f..4fc343c152 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.0-alpha.1"
 path = "../../../framework/scenario"
 
 [dev-dependencies]
diff --git a/contracts/examples/empty/meta/Cargo.toml b/contracts/examples/empty/meta/Cargo.toml
index c27adb6ad1..eb68c21f83 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/examples/empty/wasm/Cargo.toml b/contracts/examples/empty/wasm/Cargo.toml
index 1c3cae4528..2f8bd45e1f 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.8"
+version = "0.48.0-alpha.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 e56c0ace06..33b47ff4fa 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.0-alpha.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 b774dd1607..76e2d7ae12 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.8"
+version = "0.48.0-alpha.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 1c81968938..75c659fbe4 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/factorial/Cargo.toml b/contracts/examples/factorial/Cargo.toml
index bec69a21be..17d5602157 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.0-alpha.1"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/factorial/meta/Cargo.toml b/contracts/examples/factorial/meta/Cargo.toml
index 746a2c9143..676ae8b802 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/examples/factorial/wasm/Cargo.toml b/contracts/examples/factorial/wasm/Cargo.toml
index 550140a626..b3bcafb132 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/fractional-nfts/Cargo.toml b/contracts/examples/fractional-nfts/Cargo.toml
index 0709e73516..5224be8678 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.47.8"
+version = "0.48.0-alpha.1"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.0-alpha.1"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/fractional-nfts/meta/Cargo.toml b/contracts/examples/fractional-nfts/meta/Cargo.toml
index 9026904365..751ddf0965 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.8"
+version = "0.48.0-alpha.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 26ca3dc694..27c1d05a44 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/lottery-esdt/Cargo.toml b/contracts/examples/lottery-esdt/Cargo.toml
index 51341883a4..8b6c7349c5 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.0-alpha.1"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/lottery-esdt/meta/Cargo.toml b/contracts/examples/lottery-esdt/meta/Cargo.toml
index f528e0359d..4b83c85037 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.8"
+version = "0.48.0-alpha.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 c780b8253f..390ef7505b 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/multisig/Cargo.toml b/contracts/examples/multisig/Cargo.toml
index 5a4ac52971..e8ec49e74f 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.47.8"
+version = "0.48.0-alpha.1"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.0-alpha.1"
 path = "../../../framework/scenario"
 
 [dev-dependencies.adder]
@@ -27,7 +27,7 @@ path = "../adder"
 path = "../factorial"
 
 [dev-dependencies.multiversx-wegld-swap-sc]
-version = "0.47.8"
+version = "0.48.0-alpha.1"
 path = "../../core/wegld-swap"
 
 [dev-dependencies]
diff --git a/contracts/examples/multisig/interact/Cargo.toml b/contracts/examples/multisig/interact/Cargo.toml
index 06f7debcdc..dfeb1d6879 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../../contracts/modules"
 
 [dependencies.multiversx-sc-snippets]
-version = "0.47.8"
+version = "0.48.0-alpha.1"
 path = "../../../../framework/snippets"
 
 [dependencies.multiversx-sc-scenario]
-version = "=0.47.8"
+version = "=0.48.0-alpha.1"
 path = "../../../../framework/scenario"
diff --git a/contracts/examples/multisig/meta/Cargo.toml b/contracts/examples/multisig/meta/Cargo.toml
index 67b228a5dd..3ea34912ef 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.8"
+version = "0.48.0-alpha.1"
 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 004b0e97f5..9077af3ff4 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.8"
+version = "0.48.0-alpha.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 28b230710b..61bc9017ed 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/multisig/wasm/Cargo.toml b/contracts/examples/multisig/wasm/Cargo.toml
index 3a2268d369..2519fe66ab 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/nft-minter/Cargo.toml b/contracts/examples/nft-minter/Cargo.toml
index 89ee1e27f1..4ffe7159c1 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.0-alpha.1"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/nft-minter/meta/Cargo.toml b/contracts/examples/nft-minter/meta/Cargo.toml
index 6e3b2dfc81..fe7c2f84c0 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.8"
+version = "0.48.0-alpha.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 d9001e8b30..23384b01e3 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.8"
+version = "0.48.0-alpha.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 ee4e7cbf03..b27ec8aa94 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.0-alpha.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 faa27e4d8b..d3aa98a2da 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.8"
+version = "0.48.0-alpha.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 1e5478ddae..7781448eca 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/nft-subscription/Cargo.toml b/contracts/examples/nft-subscription/Cargo.toml
index deb7f32494..bac7decd50 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.47.8"
+version = "0.48.0-alpha.1"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.0-alpha.1"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/nft-subscription/meta/Cargo.toml b/contracts/examples/nft-subscription/meta/Cargo.toml
index 2d002e2afb..f735998859 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.8"
+version = "0.48.0-alpha.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 9d6afb20b4..3d3963ddf6 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.8"
+version = "0.48.0-alpha.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 89c01440da..3ac8bce8cc 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.0-alpha.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 9854915232..14474ac90b 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.8"
+version = "0.48.0-alpha.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 1d66994d44..5605781d5e 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.8"
+version = "0.48.0-alpha.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 0063356649..52b6054c35 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.0-alpha.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 b71a025162..903619b8dd 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.8"
+version = "0.48.0-alpha.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 08d0fb2c86..8a9be6d6d8 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.8"
+version = "0.48.0-alpha.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 ed353384c1..844dc3e629 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.0-alpha.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 627ba0bf33..a32f9f3835 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.8"
+version = "0.48.0-alpha.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 ca2420cd15..54aedf5a07 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/proxy-pause/Cargo.toml b/contracts/examples/proxy-pause/Cargo.toml
index 8f185a46a3..69ade59d6c 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.0-alpha.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 13a900ebe5..f1375cfebf 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.8"
+version = "0.48.0-alpha.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 214e9930eb..a05ff88ae4 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/rewards-distribution/Cargo.toml b/contracts/examples/rewards-distribution/Cargo.toml
index 6addeb95a8..a564a47312 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.47.8"
+version = "0.48.0-alpha.1"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.0-alpha.1"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/rewards-distribution/meta/Cargo.toml b/contracts/examples/rewards-distribution/meta/Cargo.toml
index 92c25000a7..0a4427819b 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 <claudiu.bruda@multiversx.com>"]
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.47.8"
+version = "0.48.0-alpha.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 e095d7be11..78f5ed1c1f 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.8"
+version = "0.48.0-alpha.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 f544ddebf2..314d73d3aa 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.47.8"
+version = "0.48.0-alpha.1"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.0-alpha.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 c9f4fb9159..ebc7b407da 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 <claudiu.bruda@multiversx.com>"]
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.47.8"
+version = "0.48.0-alpha.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 d32e1ba149..f51d8880e2 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/token-release/Cargo.toml b/contracts/examples/token-release/Cargo.toml
index 4909074ab7..b51a77c5ca 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.0-alpha.1"
 path = "../../../framework/scenario"
 
diff --git a/contracts/examples/token-release/meta/Cargo.toml b/contracts/examples/token-release/meta/Cargo.toml
index 2b61364559..5fe39835b4 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.8"
+version = "0.48.0-alpha.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 48ca0061b0..d2dc6ba436 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.8"
+version = "0.48.0-alpha.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 d2335a15b8..cabba294ae 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.0-alpha.1"
 path = "../../../framework/scenario"
 
 [dev-dependencies.multiversx-sc-meta]
-version = "0.47.8"
+version = "0.48.0-alpha.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 05ba923af6..40cc9a90b8 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.8"
+            "version": "0.48.0-alpha.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 5d1bde1cfa..a2f68b31a8 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.8"
+            "version": "0.48.0-alpha.1"
         }
     },
     "docs": [
diff --git a/contracts/feature-tests/abi-tester/meta/Cargo.toml b/contracts/feature-tests/abi-tester/meta/Cargo.toml
index f8070e33ff..b431521f53 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.8"
+version = "0.48.0-alpha.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 64cdfb6c85..456932b4b5 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.8"
+version = "0.48.0-alpha.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 a8952129d6..4eb67ed424 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.8"
+version = "0.48.0-alpha.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 814c55b656..5a143b2f63 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.0-alpha.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 62255e15fa..7acab627bc 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml
index 52c6563e32..26e7a2003c 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml
@@ -25,7 +25,7 @@ overflow-checks = false
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.47.8"
+version = "0.48.0-alpha.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml
index 1fac4d058d..7f9d0c84a3 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml
@@ -25,7 +25,7 @@ overflow-checks = false
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.47.8"
+version = "0.48.0-alpha.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/alloc-features/wasm/Cargo.toml b/contracts/feature-tests/alloc-features/wasm/Cargo.toml
index ab5fb829ca..2d4b3fc731 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.8"
+version = "0.48.0-alpha.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 5529ecea8d..8dd2f6ffc6 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.0-alpha.1"
 path = "../../../framework/scenario"
 
 [dependencies.multiversx-sc-modules]
-version = "0.47.8"
+version = "0.48.0-alpha.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 89b7ac2add..087c2d7e38 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.8"
+version = "0.48.0-alpha.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 327f8c74a4..b3104ee1e8 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.8"
+version = "0.48.0-alpha.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 661bc1146e..1aa4834c45 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.8"
+version = "0.48.0-alpha.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 3973b0842c..b1a386759a 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.8"
+version = "0.48.0-alpha.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 8ac9cfb28a..b72c34fd8c 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.0-alpha.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 ae56a96cbe..28401f7191 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.8"
+version = "0.48.0-alpha.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 6f693347c9..ea456bd0cd 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/Cargo.toml b/contracts/feature-tests/composability/Cargo.toml
index 72b9f9f248..b314421afc 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.0-alpha.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 ffa3071ea0..cae8c1d0dc 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.0-alpha.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 8ad49c4ae9..91b368c842 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.8"
+version = "0.48.0-alpha.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 5e5e2253c2..05b78da5f1 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.8"
+version = "0.48.0-alpha.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 7e9bdb354b..5459d9b52f 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.0-alpha.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 96088fcc89..bb9e6930c9 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.0-alpha.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 83d74291d0..88a844be6d 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.47.8"
+version = "0.48.0-alpha.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 3d060317d0..a66af7a97c 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.8"
+version = "0.48.0-alpha.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 158aae66f8..f45d0999b9 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.0-alpha.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 9d5bce7286..be0b399902 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.47.8"
+version = "0.48.0-alpha.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 ce110829f3..9b7d638276 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.8"
+version = "0.48.0-alpha.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 bcd33e4734..f52da32975 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.0-alpha.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 3b8cfb5174..c6ca99bdcb 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.0-alpha.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 850924c2d7..c4664ea131 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.47.8"
+version = "0.48.0-alpha.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 894f1e4a4b..6feb6c6d56 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.8"
+version = "0.48.0-alpha.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 f338b5dece..d099f933d3 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.0-alpha.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 571de47a23..09816573cc 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.47.8"
+version = "0.48.0-alpha.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 5efabe6632..dbf9a8623b 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.8"
+version = "0.48.0-alpha.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 45d7fd86c0..7d835d70ed 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.47.8"
+version = "0.48.0-alpha.1"
 path = "../../../../framework/wasm-adapter"
 optional = true
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.0-alpha.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 9683e7d49b..ccea52c3a0 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.8"
+version = "0.48.0-alpha.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 3b33f8dedc..3b46c1b3c7 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.8"
+version = "0.48.0-alpha.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 e50bec1684..4939e97e54 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.8"
+version = "0.48.0-alpha.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 63f7f1d1f9..b6abc588ae 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.0-alpha.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 f10e13d7dd..2b5bf43099 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.8"
+version = "0.48.0-alpha.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 3e70d341d7..812df9a2f4 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.8"
+version = "0.48.0-alpha.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 028cc4f9c8..bd7f6cfb9d 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.8"
+version = "0.48.0-alpha.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 82fdd0688b..1f0406d626 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.8"
+version = "0.48.0-alpha.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 92b1504a59..ef7808ab90 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.0-alpha.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 613c92b16e..83666be0ad 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.8"
+version = "0.48.0-alpha.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 5bb46d0307..d8d2afabb2 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.8"
+version = "0.48.0-alpha.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 b3721732fd..1732bca1cf 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../../contracts/modules"
 
 [dependencies.multiversx-sc-snippets]
-version = "0.47.8"
+version = "0.48.0-alpha.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 46f7436547..ec0374b708 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.0-alpha.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 999999a718..6d46d0c011 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.8"
+version = "0.48.0-alpha.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 bfca51da3a..7215f4f6b0 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.8"
+version = "0.48.0-alpha.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 342c5b1456..827049e51b 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.8"
+version = "0.48.0-alpha.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 c0375d049f..614e156c4e 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.8"
+version = "0.48.0-alpha.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 557e5818c2..e12230090c 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.8"
+version = "0.48.0-alpha.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 f3629b7af5..2cfed0aa33 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.0-alpha.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 68f5e3fce2..f9f6ef508b 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.8"
+version = "0.48.0-alpha.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 44d547460f..d419435c8c 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.8"
+version = "0.48.0-alpha.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 3f985bf59b..28501a5005 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.0-alpha.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 da932e6e3e..9207fe931b 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.8"
+version = "0.48.0-alpha.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 883b4ca57e..5ab1dcdf0d 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.8"
+version = "0.48.0-alpha.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 edf1153a21..93d1eee649 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.0-alpha.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 b7d04141e7..2ab709419b 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.8"
+version = "0.48.0-alpha.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 e4b324558a..f0f985fd86 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.8"
+version = "0.48.0-alpha.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 f8b73bd1ed..9b02e37f68 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.47.8"
+version = "0.48.0-alpha.1"
 path = "../../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.0-alpha.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 838f62ec07..900365c6a0 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.8"
+version = "0.48.0-alpha.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 7b4e0119bd..055f0918a1 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.8"
+version = "0.48.0-alpha.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 4ffd03f581..f11a37fc3c 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.0-alpha.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 0f93896e19..e116e46158 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.8"
+version = "0.48.0-alpha.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 2693692ecb..6ed938bf1f 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.8"
+version = "0.48.0-alpha.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 9a3472c495..e3657522f8 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.8"
+version = "0.48.0-alpha.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 13fd270b33..be501de22a 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.8"
+version = "0.48.0-alpha.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 8927b8f85e..3a8e039ab5 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.0-alpha.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 0450a2b95d..227fc64b2a 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.8"
+version = "0.48.0-alpha.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 7d42a6b0c3..f9c458d83b 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.8"
+version = "0.48.0-alpha.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 52e5e2a3d1..3bc9ac772b 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.0-alpha.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 f6a0e60410..ff7f3d8d1c 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.8"
+version = "0.48.0-alpha.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 d8fe625b1d..8de0fb1f91 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.8"
+version = "0.48.0-alpha.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 4827e78bf8..8232fe3035 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.0-alpha.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 1162ceb5ba..ea1fa444be 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.8"
+version = "0.48.0-alpha.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 ae8a024f7d..a19a42fc1d 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.8"
+version = "0.48.0-alpha.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 3fb1f66765..9d56ab0f6c 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.0-alpha.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 73652ff74a..746f4a29e3 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.8"
+version = "0.48.0-alpha.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 6ecc47676f..25081bfe5b 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.8"
+version = "0.48.0-alpha.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 b7406f877d..cc0cf4ba7e 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.0-alpha.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 e823cd155d..9516045226 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.8"
+version = "0.48.0-alpha.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 101d4d596f..ee4ccfc5ec 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.8"
+version = "0.48.0-alpha.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 d1a58ed741..34e579a3b7 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.0-alpha.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 bd511266c5..04cb2b9829 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.8"
+version = "0.48.0-alpha.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 d76eb68fd8..07b2b77316 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.8"
+version = "0.48.0-alpha.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 464c79efd7..650ed830ee 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.0-alpha.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 40901de7a7..15e1a719bc 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.8"
+version = "0.48.0-alpha.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 ec4f4653ac..791fc68492 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.8"
+version = "0.48.0-alpha.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 6cdb6d9217..813a94abd9 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.0-alpha.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 d66c92f437..e382f5b6f1 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.8"
+version = "0.48.0-alpha.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 910198734b..aed078c742 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.8"
+version = "0.48.0-alpha.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 13c5d9ec32..0c577093e6 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.0-alpha.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 6059435514..2ac13a08f9 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.8"
+version = "0.48.0-alpha.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 0ada82ca9b..16c05bc7e7 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.8"
+version = "0.48.0-alpha.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 cf64d6b26b..8315e238a3 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.0-alpha.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 022e576282..4c3a538c61 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.8"
+version = "0.48.0-alpha.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 b01e83de22..8defa0d9c5 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.8"
+version = "0.48.0-alpha.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 55b238d90f..660f6d59f0 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.0-alpha.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 7a30e9f032..084d63047b 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.8"
+version = "0.48.0-alpha.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 9e59c8cf59..01712bb698 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.8"
+version = "0.48.0-alpha.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 e455698505..a9ebd01d66 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.8"
+version = "0.48.0-alpha.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 c57395bee3..649efd91b3 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.8"
+version = "0.48.0-alpha.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 a4ccad2d0a..b7901f7525 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.8"
+version = "0.48.0-alpha.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 3c6eb639a6..1fa204ca02 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.0-alpha.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 b5b6de2443..68ef9a1a0a 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.8"
+version = "0.48.0-alpha.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 0df3393018..1ab11a8f36 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.8"
+version = "0.48.0-alpha.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 bcb27446c2..51536a65ec 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.0-alpha.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 baced24321..4b24111581 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.8"
+version = "0.48.0-alpha.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 58274256ad..26422dbb5e 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.8"
+version = "0.48.0-alpha.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 21ff7ba5f7..79ad57c40b 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.0-alpha.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 7415ce614c..ab9b991352 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.8"
+version = "0.48.0-alpha.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 a134a77263..547004c6cd 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.8"
+version = "0.48.0-alpha.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 deb116da19..b67c3480b9 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.8"
+// version = "0.48.0-alpha.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 62dc6c73a4..03a640b1e2 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.8"
+version = "0.48.0-alpha.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 1a5fa9375d..102e815b23 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.8"
+version = "0.48.0-alpha.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.8"
+version = "0.48.0-alpha.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 d9601c6185..e46f3de4b8 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.8"
+version = "0.48.0-alpha.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 aa6193531a..f2ddb2a432 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.8"
+version = "0.48.0-alpha.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 f0dd37e380..f6ef5f596c 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../contracts/modules"
 
 [dependencies.multiversx-sc]
-version = "0.47.8"
+version = "0.48.0-alpha.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.0-alpha.1"
 path = "../../../framework/scenario"
 
 [dev-dependencies.multiversx-sc-meta]
-version = "0.47.8"
+version = "0.48.0-alpha.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 c23e5696aa..cd44f99dc9 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.8"
+version = "0.48.0-alpha.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 41b204dcd7..576a8ff440 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.47.8"
+version = "0.48.0-alpha.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 b40f0e911c..c5951dfbcd 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.8"
+            "version": "0.48.0-alpha.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 a2e1621128..0bb0abafea 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.8"
+            "version": "0.48.0-alpha.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 55ded78fe6..c380f5082c 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.8"
+version = "0.48.0-alpha.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 571611596c..cc138543a1 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.8"
+version = "0.48.0-alpha.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/modules/Cargo.toml b/contracts/modules/Cargo.toml
index b7df46cac1..b54d610b1f 100644
--- a/contracts/modules/Cargo.toml
+++ b/contracts/modules/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-modules"
-version = "0.47.8"
+version = "0.48.0-alpha.1"
 edition = "2021"
 
 authors = ["MultiversX <contact@multiversx.com>"]
@@ -17,5 +17,5 @@ categories = ["no-std", "wasm", "cryptography::cryptocurrencies"]
 alloc = ["multiversx-sc/alloc"]
 
 [dependencies.multiversx-sc]
-version = "0.47.8"
+version = "0.48.0-alpha.1"
 path = "../../framework/base"
diff --git a/framework/base/Cargo.toml b/framework/base/Cargo.toml
index 9edc7414d7..89b821b545 100644
--- a/framework/base/Cargo.toml
+++ b/framework/base/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc"
-version = "0.47.8"
+version = "0.48.0-alpha.1"
 edition = "2021"
 
 authors = ["Andrei Marinica <andrei.marinica@multiversx.com>", "MultiversX <contact@multiversx.com>"]
@@ -27,7 +27,7 @@ bitflags = "=2.4.2"
 num-traits = { version = "=0.2.17", default-features = false }
 
 [dependencies.multiversx-sc-derive]
-version = "=0.47.8"
+version = "=0.48.0-alpha.1"
 path = "../derive"
 
 [dependencies.multiversx-sc-codec]
diff --git a/framework/derive/Cargo.toml b/framework/derive/Cargo.toml
index c615da8563..3330eca649 100644
--- a/framework/derive/Cargo.toml
+++ b/framework/derive/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-derive"
-version = "0.47.8"
+version = "0.48.0-alpha.1"
 edition = "2021"
 
 authors = ["Andrei Marinica <andrei.marinica@multiversx.com>", "MultiversX <contact@multiversx.com>"]
diff --git a/framework/meta/Cargo.toml b/framework/meta/Cargo.toml
index a8775be7a2..3122ecb04c 100644
--- a/framework/meta/Cargo.toml
+++ b/framework/meta/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-meta"
-version = "0.47.8"
+version = "0.48.0-alpha.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.8"
+version = "=0.48.0-alpha.1"
 path = "../base"
 features = ["alloc", "num-bigint"]
 
diff --git a/framework/scenario/Cargo.toml b/framework/scenario/Cargo.toml
index 0e138752e6..1b18eac149 100644
--- a/framework/scenario/Cargo.toml
+++ b/framework/scenario/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-scenario"
-version = "0.47.8"
+version = "0.48.0-alpha.1"
 edition = "2021"
 
 authors = [
@@ -40,12 +40,12 @@ path = "src/main.rs"
 run-go-tests = []
 
 [dependencies.multiversx-sc]
-version = "=0.47.8"
+version = "=0.48.0-alpha.1"
 features = ["alloc", "num-bigint"]
 path = "../base"
 
 [dependencies.multiversx-sc-meta]
-version = "=0.47.8"
+version = "=0.48.0-alpha.1"
 path = "../meta"
 
 [dependencies.multiversx-chain-scenario-format]
diff --git a/framework/snippets/Cargo.toml b/framework/snippets/Cargo.toml
index 14426e25fe..4d3e307d2b 100644
--- a/framework/snippets/Cargo.toml
+++ b/framework/snippets/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-snippets"
-version = "0.47.8"
+version = "0.48.0-alpha.1"
 edition = "2021"
 
 authors = ["MultiversX <contact@multiversx.com>"]
@@ -22,7 +22,7 @@ env_logger = "0.11"
 futures = "0.3"
 
 [dependencies.multiversx-sc-scenario]
-version = "=0.47.8"
+version = "=0.48.0-alpha.1"
 path = "../scenario"
 
 [dependencies.multiversx-sdk]
diff --git a/framework/wasm-adapter/Cargo.toml b/framework/wasm-adapter/Cargo.toml
index b75da45633..f74067f123 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.8"
+version = "0.48.0-alpha.1"
 edition = "2021"
 
 authors = [
@@ -22,5 +22,5 @@ categories = [
 ]
 
 [dependencies.multiversx-sc]
-version = "=0.47.8"
+version = "=0.48.0-alpha.1"
 path = "../base"
diff --git a/tools/mxpy-snippet-generator/Cargo.toml b/tools/mxpy-snippet-generator/Cargo.toml
index 4253ef6872..738aabebe6 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.8"
+version = "0.48.0-alpha.1"
 path = "../../framework/base"
 
 [dependencies]
diff --git a/tools/rust-debugger/format-tests/Cargo.toml b/tools/rust-debugger/format-tests/Cargo.toml
index c838a1d924..ab720903f5 100644
--- a/tools/rust-debugger/format-tests/Cargo.toml
+++ b/tools/rust-debugger/format-tests/Cargo.toml
@@ -9,11 +9,11 @@ name = "format-tests"
 path = "src/format_tests.rs"
 
 [dependencies.multiversx-sc]
-version = "=0.47.8"
+version = "=0.48.0-alpha.1"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-scenario]
-version = "=0.47.8"
+version = "=0.48.0-alpha.1"
 path = "../../../framework/scenario"
 
 [dependencies.multiversx-chain-vm]

From 3d13acf947ef0863ec187dc042a1fdfbf947c574 Mon Sep 17 00:00:00 2001
From: Laurentiu Ciobanu <laurentiu.ciobanu@multiversx.com>
Date: Wed, 27 Mar 2024 13:50:03 +0200
Subject: [PATCH 0576/1254] use shared sc-actions test-coverage job

---
 .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 278e4e30df..eb494e8342 100644
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -15,7 +15,7 @@ jobs:
   contracts:
     name: Contracts
     #    uses: multiversx/mx-sc-actions/.github/workflows/contracts.yml@v3.0.0
-    uses: multiversx/mx-sc-actions/.github/workflows/contracts.yml@3c37e52a9de8f4111f823da0b2412f1fc55b7d30
+    uses: multiversx/mx-sc-actions/.github/workflows/contracts.yml@v3.1.0
     with:
       rust-toolchain: nightly-2023-12-11
       path-to-sc-meta: framework/meta

From 493c865ac8dcd915d6a70c839cd5e07f906e62f0 Mon Sep 17 00:00:00 2001
From: Laurentiu Ciobanu <laurentiu.ciobanu@multiversx.com>
Date: Wed, 27 Mar 2024 13:50:14 +0200
Subject: [PATCH 0577/1254] use shared sc-actions test-coverage job

---
 .github/workflows/actions.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
index eb494e8342..d9d598ab33 100644
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -14,7 +14,6 @@ permissions:
 jobs:
   contracts:
     name: Contracts
-    #    uses: multiversx/mx-sc-actions/.github/workflows/contracts.yml@v3.0.0
     uses: multiversx/mx-sc-actions/.github/workflows/contracts.yml@v3.1.0
     with:
       rust-toolchain: nightly-2023-12-11

From e8c3c3fe41672b1b972ad7c9a98d40e3b4e29c2a Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Wed, 27 Mar 2024 18:23:20 +0100
Subject: [PATCH 0578/1254] migration to unified syntax

---
 .../src/builtin_func_features.rs              |  15 +--
 .../src/builtin_func_proxy.rs                 | 107 ++++++++++++++++--
 2 files changed, 108 insertions(+), 14 deletions(-)

diff --git a/contracts/feature-tests/composability/builtin-func-features/src/builtin_func_features.rs b/contracts/feature-tests/composability/builtin-func-features/src/builtin_func_features.rs
index 81df199e68..dd4183bb94 100644
--- a/contracts/feature-tests/composability/builtin-func-features/src/builtin_func_features.rs
+++ b/contracts/feature-tests/composability/builtin-func-features/src/builtin_func_features.rs
@@ -7,25 +7,26 @@ multiversx_sc::imports!();
 /// Test contract for investigating async calls.
 #[multiversx_sc::contract]
 pub trait BuiltinFuncFeatures {
-    #[proxy]
-    fn builtin_func_proxy(&self, to: ManagedAddress) -> builtin_func_proxy::Proxy<Self::Api>;
-
     #[init]
     fn init(&self) {}
 
     #[endpoint]
     fn call_set_user_name(&self, address: ManagedAddress, name: ManagedBuffer) {
-        self.builtin_func_proxy(address)
-            .set_user_name(&name)
+        self.tx()
+            .to(&address)
+            .typed(builtin_func_proxy::UserBuiltinProxy)
+            .set_user_name(name)
             .async_call()
             .call_and_exit()
     }
 
     #[endpoint]
     fn call_delete_user_name(&self, address: ManagedAddress) {
-        self.builtin_func_proxy(address)
+        self.tx()
+            .to(&address)
+            .typed(builtin_func_proxy::UserBuiltinProxy)
             .delete_user_name()
             .async_call()
-            .call_and_exit();
+            .call_and_exit()
     }
 }
diff --git a/contracts/feature-tests/composability/builtin-func-features/src/builtin_func_proxy.rs b/contracts/feature-tests/composability/builtin-func-features/src/builtin_func_proxy.rs
index 5499deee5e..66ed7a8fdf 100644
--- a/contracts/feature-tests/composability/builtin-func-features/src/builtin_func_proxy.rs
+++ b/contracts/feature-tests/composability/builtin-func-features/src/builtin_func_proxy.rs
@@ -1,10 +1,103 @@
-multiversx_sc::imports!();
+// Code generated by the multiversx-sc proxy generator. DO NOT EDIT.
 
-#[multiversx_sc::derive::proxy]
-pub trait UserBuiltin {
-    #[endpoint(SetUserName)]
-    fn set_user_name(&self, name: &ManagedBuffer);
+////////////////////////////////////////////////////
+////////////////// AUTO-GENERATED //////////////////
+////////////////////////////////////////////////////
 
-    #[endpoint(DeleteUserName)]
-    fn delete_user_name(&self);
+#![allow(dead_code)]
+#![allow(clippy::all)]
+
+use multiversx_sc::proxy_imports::*;
+
+pub struct UserBuiltinProxy;
+
+impl<Env, From, To, Gas> TxProxyTrait<Env, From, To, Gas> for UserBuiltinProxy
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    type TxProxyMethods = UserBuiltinProxyMethods<Env, From, To, Gas>;
+
+    fn proxy_methods(self, tx: Tx<Env, From, To, (), Gas, (), ()>) -> Self::TxProxyMethods {
+        UserBuiltinProxyMethods { wrapped_tx: tx }
+    }
+}
+
+pub struct UserBuiltinProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    wrapped_tx: Tx<Env, From, To, (), Gas, (), ()>,
+}
+
+#[rustfmt::skip]
+impl<Env, From, Gas> UserBuiltinProxyMethods<Env, From, (), Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn init(
+        self,
+    ) -> TxProxyDeploy<Env, From, Gas, ()> {
+        self.wrapped_tx
+            .raw_deploy()
+            .original_result()
+    }
+}
+
+#[rustfmt::skip]
+impl<Env, From, To, Gas> UserBuiltinProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn upgrade(
+        self,
+    ) -> TxProxyUpgrade<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_upgrade()
+            .original_result()
+    }
+}
+
+#[rustfmt::skip]
+impl<Env, From, To, Gas> UserBuiltinProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn set_user_name<
+        Arg0: CodecInto<ManagedBuffer<Env::Api>>,
+    >(
+        self,
+        name: Arg0,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("SetUserName")
+            .argument(&name)
+            .original_result()
+    }
+
+    pub fn delete_user_name(
+        self,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("DeleteUserName")
+            .original_result()
+    }
 }

From e626ba6a2cf1b8e1df9f559a7f6564d20fcdc18c Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Wed, 27 Mar 2024 18:39:18 +0100
Subject: [PATCH 0579/1254] proxy pause sc migration to new proxy and unified
 syntax

---
 .../proxy-pause/src/pause_sc_proxy.rs         | 99 +++++++++++++++++++
 .../examples/proxy-pause/src/proxy_pause.rs   | 26 ++---
 2 files changed, 107 insertions(+), 18 deletions(-)
 create mode 100644 contracts/examples/proxy-pause/src/pause_sc_proxy.rs

diff --git a/contracts/examples/proxy-pause/src/pause_sc_proxy.rs b/contracts/examples/proxy-pause/src/pause_sc_proxy.rs
new file mode 100644
index 0000000000..0984e09ea1
--- /dev/null
+++ b/contracts/examples/proxy-pause/src/pause_sc_proxy.rs
@@ -0,0 +1,99 @@
+// Code generated by the multiversx-sc proxy generator. DO NOT EDIT.
+
+////////////////////////////////////////////////////
+////////////////// AUTO-GENERATED //////////////////
+////////////////////////////////////////////////////
+
+#![allow(dead_code)]
+#![allow(clippy::all)]
+
+use multiversx_sc::proxy_imports::*;
+
+pub struct PausableProxy;
+
+impl<Env, From, To, Gas> TxProxyTrait<Env, From, To, Gas> for PausableProxy
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    type TxProxyMethods = PausableProxyMethods<Env, From, To, Gas>;
+
+    fn proxy_methods(self, tx: Tx<Env, From, To, (), Gas, (), ()>) -> Self::TxProxyMethods {
+        PausableProxyMethods { wrapped_tx: tx }
+    }
+}
+
+pub struct PausableProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    wrapped_tx: Tx<Env, From, To, (), Gas, (), ()>,
+}
+
+#[rustfmt::skip]
+impl<Env, From, Gas> PausableProxyMethods<Env, From, (), Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn init(
+        self,
+    ) -> TxProxyDeploy<Env, From, Gas, ()> {
+        self.wrapped_tx
+            .raw_deploy()
+            .original_result()
+    }
+}
+
+#[rustfmt::skip]
+impl<Env, From, To, Gas> PausableProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn upgrade(
+        self,
+    ) -> TxProxyUpgrade<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_upgrade()
+            .original_result()
+    }
+}
+
+#[rustfmt::skip]
+impl<Env, From, To, Gas> PausableProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn pause(
+        self,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("pause")
+            .original_result()
+    }
+
+    pub fn unpause(
+        self,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("unpause")
+            .original_result()
+    }
+}
diff --git a/contracts/examples/proxy-pause/src/proxy_pause.rs b/contracts/examples/proxy-pause/src/proxy_pause.rs
index 01dbfbf449..aa5f07e7d6 100644
--- a/contracts/examples/proxy-pause/src/proxy_pause.rs
+++ b/contracts/examples/proxy-pause/src/proxy_pause.rs
@@ -1,17 +1,7 @@
 #![no_std]
 
 use multiversx_sc::imports::*;
-
-mod pause_proxy {
-    #[multiversx_sc::proxy]
-    pub trait Pausable {
-        #[endpoint]
-        fn pause(&self);
-
-        #[endpoint]
-        fn unpause(&self);
-    }
-}
+pub mod pause_sc_proxy;
 
 #[multiversx_sc::contract]
 pub trait PauseProxy {
@@ -46,23 +36,26 @@ pub trait PauseProxy {
 
     fn for_each_contract<F>(&self, f: F)
     where
-        F: Fn(pause_proxy::ProxyTo<Self::Api>),
+        F: Fn(pause_sc_proxy::PausableProxyMethods<TxScEnv<Self::Api>, (), &ManagedAddress, ()>),
     {
         for contract_address in self.contracts().iter() {
-            f(self.pausable_contract().contract(contract_address));
+            f(self
+                .tx()
+                .to(&contract_address)
+                .typed(pause_sc_proxy::PausableProxy));
         }
     }
 
     #[endpoint]
     fn pause(&self) {
         self.require_owner();
-        self.for_each_contract(|mut contract| contract.pause().execute_on_dest_context());
+        self.for_each_contract(|contract| contract.pause().sync_call());
     }
 
     #[endpoint]
     fn unpause(&self) {
         self.require_owner();
-        self.for_each_contract(|mut contract| contract.unpause().execute_on_dest_context());
+        self.for_each_contract(|contract| contract.unpause().sync_call());
     }
 
     fn require_owner(&self) {
@@ -79,7 +72,4 @@ pub trait PauseProxy {
     #[view]
     #[storage_mapper("contracts")]
     fn contracts(&self) -> SetMapper<ManagedAddress>;
-
-    #[proxy]
-    fn pausable_contract(&self) -> pause_proxy::Proxy<Self::Api>;
 }

From c924c4986ac6516acdfcb195eed7c18e70490d5f Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Wed, 27 Mar 2024 18:58:21 +0100
Subject: [PATCH 0580/1254] encode error from basic features migration to new
 proxy and unified syntax

---
 .../basic-features/src/basic_features_main.rs |   1 +
 .../basic-features/src/codec_err_test.rs      |  30 ++----
 .../basic-features/src/encode_error_proxy.rs  | 100 ++++++++++++++++++
 3 files changed, 109 insertions(+), 22 deletions(-)
 create mode 100644 contracts/feature-tests/basic-features/src/encode_error_proxy.rs

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 2be5e1a535..1d3485b3f1 100644
--- a/contracts/feature-tests/basic-features/src/basic_features_main.rs
+++ b/contracts/feature-tests/basic-features/src/basic_features_main.rs
@@ -12,6 +12,7 @@ pub mod crypto_features;
 pub mod echo;
 pub mod echo_managed;
 pub mod elliptic_curve_features;
+pub mod encode_error_proxy;
 pub mod event_features;
 pub mod macro_features;
 pub mod managed_address_features;
diff --git a/contracts/feature-tests/basic-features/src/codec_err_test.rs b/contracts/feature-tests/basic-features/src/codec_err_test.rs
index 4fa4da2258..e72f71b44b 100644
--- a/contracts/feature-tests/basic-features/src/codec_err_test.rs
+++ b/contracts/feature-tests/basic-features/src/codec_err_test.rs
@@ -1,19 +1,5 @@
 multiversx_sc::imports!();
-use crate::types::CodecErrorTestType;
-
-mod encode_err_proxy {
-    multiversx_sc::imports!();
-    use crate::types::CodecErrorTestType;
-
-    #[multiversx_sc::proxy]
-    pub trait EncodeErrorProxy {
-        #[init]
-        fn init(&self, error_arg: CodecErrorTestType);
-
-        #[endpoint]
-        fn encode_error_method(&self, error_arg: CodecErrorTestType);
-    }
-}
+use crate::{encode_error_proxy, types::CodecErrorTestType};
 
 /// Test various serialization errors.
 #[multiversx_sc::module]
@@ -62,15 +48,14 @@ pub trait CodecErrorTest {
     fn codec_err_event_data(&self) {
         self.event_err_data(CodecErrorTestType);
     }
-
-    #[proxy]
-    fn encode_err_proxy(&self) -> encode_err_proxy::Proxy<Self::Api>;
-
     /// Never actually calls any deploy/upgrade, so it is appropriate in this contract.
     /// It just covers contract init serialization errors.
     #[endpoint]
     fn codec_err_contract_init(&self) {
-        let _ = self.encode_err_proxy().init(CodecErrorTestType);
+        let _ = self
+            .tx()
+            .typed(encode_error_proxy::EncodeErrorProxy)
+            .init(CodecErrorTestType);
     }
 
     /// Never actually calls any async/sync call, so it is appropriate in this contract.
@@ -78,8 +63,9 @@ pub trait CodecErrorTest {
     #[endpoint]
     fn codec_err_contract_call(&self) {
         let _ = self
-            .encode_err_proxy()
-            .contract(ManagedAddress::zero())
+            .tx()
+            .to(&ManagedAddress::zero())
+            .typed(encode_error_proxy::EncodeErrorProxy)
             .encode_error_method(CodecErrorTestType);
     }
 }
diff --git a/contracts/feature-tests/basic-features/src/encode_error_proxy.rs b/contracts/feature-tests/basic-features/src/encode_error_proxy.rs
new file mode 100644
index 0000000000..eee70b6ae2
--- /dev/null
+++ b/contracts/feature-tests/basic-features/src/encode_error_proxy.rs
@@ -0,0 +1,100 @@
+// Code generated by the multiversx-sc proxy generator. DO NOT EDIT.
+
+////////////////////////////////////////////////////
+////////////////// AUTO-GENERATED //////////////////
+////////////////////////////////////////////////////
+
+#![allow(dead_code)]
+#![allow(clippy::all)]
+
+use multiversx_sc::proxy_imports::*;
+
+use crate::types::CodecErrorTestType;
+
+pub struct EncodeErrorProxy;
+
+impl<Env, From, To, Gas> TxProxyTrait<Env, From, To, Gas> for EncodeErrorProxy
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    type TxProxyMethods = EncodeErrorProxyMethods<Env, From, To, Gas>;
+
+    fn proxy_methods(self, tx: Tx<Env, From, To, (), Gas, (), ()>) -> Self::TxProxyMethods {
+        EncodeErrorProxyMethods { wrapped_tx: tx }
+    }
+}
+
+pub struct EncodeErrorProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    wrapped_tx: Tx<Env, From, To, (), Gas, (), ()>,
+}
+
+#[rustfmt::skip]
+impl<Env, From, Gas> EncodeErrorProxyMethods<Env, From, (), Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn init<
+        Arg0: CodecInto<CodecErrorTestType>,
+    >(
+        self,
+        error_arg: Arg0,
+    ) -> TxProxyDeploy<Env, From, Gas, ()> {
+        self.wrapped_tx
+            .raw_deploy()
+            .argument(&error_arg)
+            .original_result()
+    }
+}
+
+#[rustfmt::skip]
+impl<Env, From, To, Gas> EncodeErrorProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn upgrade(
+        self,
+    ) -> TxProxyUpgrade<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_upgrade()
+            .original_result()
+    }
+}
+
+#[rustfmt::skip]
+impl<Env, From, To, Gas> EncodeErrorProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn encode_error_method<
+        Arg0: CodecInto<CodecErrorTestType>,
+    >(
+        self,
+        error_arg: Arg0,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("encode_error_method")
+            .argument(&error_arg)
+            .original_result()
+    }
+}

From c4627e7efee7e5f2acf27582bc53d2b565ae6e48 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Thu, 28 Mar 2024 10:36:49 +0100
Subject: [PATCH 0581/1254] parent child migration and new proxy

---
 .../child/sc-config.toml                      |   2 +
 .../parent/src/child_proxy.rs                 | 102 ++++++++++++++++++
 .../parent/src/lib.rs                         |  30 +++---
 3 files changed, 120 insertions(+), 14 deletions(-)
 create mode 100644 contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/child/sc-config.toml
 create mode 100644 contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/parent/src/child_proxy.rs

diff --git a/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/child/sc-config.toml b/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/child/sc-config.toml
new file mode 100644
index 0000000000..a80372b407
--- /dev/null
+++ b/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/child/sc-config.toml
@@ -0,0 +1,2 @@
+[settings]
+proxy-paths = ["../parent/src/child_proxy.rs"]
\ No newline at end of file
diff --git a/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/parent/src/child_proxy.rs b/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/parent/src/child_proxy.rs
new file mode 100644
index 0000000000..0c28cb1f96
--- /dev/null
+++ b/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/parent/src/child_proxy.rs
@@ -0,0 +1,102 @@
+// Code generated by the multiversx-sc proxy generator. DO NOT EDIT.
+
+////////////////////////////////////////////////////
+////////////////// AUTO-GENERATED //////////////////
+////////////////////////////////////////////////////
+
+#![allow(dead_code)]
+#![allow(clippy::all)]
+
+use multiversx_sc::proxy_imports::*;
+
+pub struct ChildProxy;
+
+impl<Env, From, To, Gas> TxProxyTrait<Env, From, To, Gas> for ChildProxy
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    type TxProxyMethods = ChildProxyMethods<Env, From, To, Gas>;
+
+    fn proxy_methods(self, tx: Tx<Env, From, To, (), Gas, (), ()>) -> Self::TxProxyMethods {
+        ChildProxyMethods { wrapped_tx: tx }
+    }
+}
+
+pub struct ChildProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    wrapped_tx: Tx<Env, From, To, (), Gas, (), ()>,
+}
+
+#[rustfmt::skip]
+impl<Env, From, Gas> ChildProxyMethods<Env, From, (), Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn init(
+        self,
+    ) -> TxProxyDeploy<Env, From, Gas, ()> {
+        self.wrapped_tx
+            .raw_deploy()
+            .original_result()
+    }
+}
+
+#[rustfmt::skip]
+impl<Env, From, To, Gas> ChildProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+}
+
+#[rustfmt::skip]
+impl<Env, From, To, Gas> ChildProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn issue_wrapped_egld<
+        Arg0: CodecInto<ManagedBuffer<Env::Api>>,
+        Arg1: CodecInto<ManagedBuffer<Env::Api>>,
+        Arg2: CodecInto<BigUint<Env::Api>>,
+    >(
+        self,
+        token_display_name: Arg0,
+        token_ticker: Arg1,
+        initial_supply: Arg2,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("issueWrappedEgld")
+            .argument(&token_display_name)
+            .argument(&token_ticker)
+            .argument(&initial_supply)
+            .original_result()
+    }
+
+    pub fn wrapped_egld_token_identifier(
+        self,
+    ) -> TxProxyCall<Env, From, To, Gas, TokenIdentifier<Env::Api>> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("getWrappedEgldTokenIdentifier")
+            .original_result()
+    }
+}
diff --git a/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/parent/src/lib.rs b/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/parent/src/lib.rs
index ddb8a09a09..f334c393f6 100644
--- a/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/parent/src/lib.rs
+++ b/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/parent/src/lib.rs
@@ -2,14 +2,13 @@
 
 multiversx_sc::imports!();
 
+pub mod child_proxy;
+
 // Base cost for standalone + estimate cost of actual sc call
 const ISSUE_EXPECTED_GAS_COST: u64 = 90_000_000 + 25_000_000;
 
 #[multiversx_sc::contract]
 pub trait Parent {
-    #[proxy]
-    fn child_proxy(&self, to: ManagedAddress) -> child::Proxy<Self::Api>;
-
     #[init]
     fn init(&self) {}
 
@@ -19,13 +18,14 @@ pub trait Parent {
 
     #[endpoint(deployChildContract)]
     fn deploy_child_contract(&self, code: ManagedBuffer) {
-        let (child_contract_address, _) = self.send_raw().deploy_contract(
-            self.blockchain().get_gas_left(),
-            &BigUint::zero(),
-            &code,
-            CodeMetadata::DEFAULT,
-            &ManagedArgBuffer::new(),
-        );
+        let gas_left = self.blockchain().get_gas_left();
+        let child_contract_address = self
+            .tx()
+            .raw_deploy()
+            .code(code)
+            .with_gas_limit(gas_left)
+            .returns(ReturnsNewAddress)
+            .sync_call();
 
         self.child_contract_address().set(&child_contract_address);
     }
@@ -40,12 +40,14 @@ pub trait Parent {
     ) {
         let issue_cost = self.call_value().egld_value();
         let child_contract_adress = self.child_contract_address().get();
-        let _: IgnoreValue = self
-            .child_proxy(child_contract_adress)
+
+        self.tx()
+            .to(&child_contract_adress)
+            .typed(child_proxy::ChildProxy)
             .issue_wrapped_egld(token_display_name, token_ticker, initial_supply)
-            .with_egld_transfer(issue_cost.clone_value())
+            .egld(issue_cost)
             .with_gas_limit(ISSUE_EXPECTED_GAS_COST)
-            .execute_on_dest_context();
+            .sync_call();
     }
 
     // storage

From d15172e2056466c725933caa94cdd6944cec85b2 Mon Sep 17 00:00:00 2001
From: Alin Cruceat <alyn_509@yahoo.com>
Date: Thu, 28 Mar 2024 12:15:53 +0200
Subject: [PATCH 0582/1254] exchange_features contract for testing the traits

---
 Cargo.lock                                    |  16 ++
 Cargo.toml                                    |   3 +
 .../exchange-features/Cargo.toml              |  17 ++
 .../exchange-features/meta/Cargo.toml         |  13 ++
 .../exchange-features/meta/src/main.rs        |   3 +
 .../exchange-features/multiversx.json         |   3 +
 .../src/exchange_features.rs                  |  77 ++++++++
 .../tests/exchange_features_blackbox_test.rs  |  83 +++++++++
 .../exchange-features/wasm/Cargo.lock         | 170 ++++++++++++++++++
 .../exchange-features/wasm/Cargo.toml         |  32 ++++
 .../exchange-features/wasm/src/lib.rs         |  29 +++
 .../base/src/types/managed/wrapped/mod.rs     |   2 +-
 12 files changed, 447 insertions(+), 1 deletion(-)
 create mode 100644 contracts/feature-tests/exchange-features/Cargo.toml
 create mode 100644 contracts/feature-tests/exchange-features/meta/Cargo.toml
 create mode 100644 contracts/feature-tests/exchange-features/meta/src/main.rs
 create mode 100644 contracts/feature-tests/exchange-features/multiversx.json
 create mode 100644 contracts/feature-tests/exchange-features/src/exchange_features.rs
 create mode 100644 contracts/feature-tests/exchange-features/tests/exchange_features_blackbox_test.rs
 create mode 100644 contracts/feature-tests/exchange-features/wasm/Cargo.lock
 create mode 100644 contracts/feature-tests/exchange-features/wasm/Cargo.toml
 create mode 100644 contracts/feature-tests/exchange-features/wasm/src/lib.rs

diff --git a/Cargo.lock b/Cargo.lock
index 0362d5974b..031c4b0647 100755
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -908,6 +908,22 @@ dependencies = [
  "multiversx-sc-meta",
 ]
 
+[[package]]
+name = "exchange-features"
+version = "0.0.0"
+dependencies = [
+ "multiversx-sc",
+ "multiversx-sc-scenario",
+]
+
+[[package]]
+name = "exchange-features-meta"
+version = "0.0.0"
+dependencies = [
+ "exchange-features",
+ "multiversx-sc-meta",
+]
+
 [[package]]
 name = "factorial"
 version = "0.0.0"
diff --git a/Cargo.toml b/Cargo.toml
index ef92a8a7b9..d97f1292e0 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/exchange-features",
+  "contracts/feature-tests/exchange-features/meta",
+
 ]
diff --git a/contracts/feature-tests/exchange-features/Cargo.toml b/contracts/feature-tests/exchange-features/Cargo.toml
new file mode 100644
index 0000000000..eaf84b2a99
--- /dev/null
+++ b/contracts/feature-tests/exchange-features/Cargo.toml
@@ -0,0 +1,17 @@
+[package]
+name = "exchange-features"
+version = "0.0.0"
+authors = ["you"]
+edition = "2021"
+publish = false
+
+[lib]
+path = "src/exchange_features.rs"
+
+[dependencies.multiversx-sc]
+version = "0.47.8"
+path = "../../../framework/base"
+
+[dev-dependencies.multiversx-sc-scenario]
+version = "0.47.8"
+path = "../../../framework/scenario"
diff --git a/contracts/feature-tests/exchange-features/meta/Cargo.toml b/contracts/feature-tests/exchange-features/meta/Cargo.toml
new file mode 100644
index 0000000000..ca186c0ec1
--- /dev/null
+++ b/contracts/feature-tests/exchange-features/meta/Cargo.toml
@@ -0,0 +1,13 @@
+[package]
+name = "exchange-features-meta"
+version = "0.0.0"
+edition = "2021"
+publish = false
+
+[dependencies.exchange-features]
+path = ".."
+
+[dependencies.multiversx-sc-meta]
+version = "0.47.8"
+path = "../../../../framework/meta"
+default-features = false
diff --git a/contracts/feature-tests/exchange-features/meta/src/main.rs b/contracts/feature-tests/exchange-features/meta/src/main.rs
new file mode 100644
index 0000000000..f9a8d31e06
--- /dev/null
+++ b/contracts/feature-tests/exchange-features/meta/src/main.rs
@@ -0,0 +1,3 @@
+fn main() {
+    multiversx_sc_meta::cli_main::<exchange_features::AbiProvider>();
+}
diff --git a/contracts/feature-tests/exchange-features/multiversx.json b/contracts/feature-tests/exchange-features/multiversx.json
new file mode 100644
index 0000000000..7365539625
--- /dev/null
+++ b/contracts/feature-tests/exchange-features/multiversx.json
@@ -0,0 +1,3 @@
+{
+    "language": "rust"
+}
\ No newline at end of file
diff --git a/contracts/feature-tests/exchange-features/src/exchange_features.rs b/contracts/feature-tests/exchange-features/src/exchange_features.rs
new file mode 100644
index 0000000000..430e33840b
--- /dev/null
+++ b/contracts/feature-tests/exchange-features/src/exchange_features.rs
@@ -0,0 +1,77 @@
+#![no_std]
+
+multiversx_sc::imports!();
+multiversx_sc::derive_imports!();
+
+pub const FULL_VALUE_SUPPLY: u64 = 16;
+
+#[derive(
+    ManagedVecItem,
+    TopEncode,
+    TopDecode,
+    NestedEncode,
+    NestedDecode,
+    TypeAbi,
+    Clone,
+    PartialEq,
+    Debug,
+)]
+pub struct TokenAttributes<M: ManagedTypeApi> {
+    pub amount: BigUint<M>,
+}
+
+impl<M: ManagedTypeApi> FixedSupplyToken<M> for TokenAttributes<M> {
+    fn get_total_supply(&self) -> BigUint<M> {
+        self.amount.clone()
+    }
+
+    fn into_part(self, payment_amount: &BigUint<M>) -> Self {
+        let new_amount =
+            self.rule_of_three_non_zero_result(payment_amount, &BigUint::from(FULL_VALUE_SUPPLY));
+        TokenAttributes {
+            amount: new_amount.clone(),
+        }
+    }
+}
+impl<M: ManagedTypeApi> Mergeable<M> for TokenAttributes<M> {
+    #[inline]
+    fn can_merge_with(&self, other: &Self) -> bool {
+        other.amount > 0u64
+    }
+
+    fn merge_with(&mut self, other: Self) {
+        self.error_if_not_mergeable(&other);
+
+        self.amount += other.amount
+    }
+}
+
+#[multiversx_sc::contract]
+pub trait ExchangeFeatures {
+    #[storage_mapper("supply")]
+    fn supply(&self) -> SingleValueMapper<TokenAttributes<Self::Api>>;
+
+    #[init]
+    fn init(&self, initial_value: BigUint) {
+        self.supply().set(TokenAttributes {
+            amount: initial_value,
+        });
+    }
+
+    #[upgrade]
+    fn upgrade(&self, value: BigUint) {
+        let token = self.supply().get();
+        self.supply().set(token.into_part(&value));
+    }
+
+    #[endpoint]
+    fn merge(&self, value: BigUint) {
+        self.supply()
+            .update(|token| token.merge_with(TokenAttributes { amount: value }));
+    }
+
+    #[endpoint]
+    fn get_supply(&self) -> BigUint {
+        self.supply().get().get_total_supply()
+    }
+}
diff --git a/contracts/feature-tests/exchange-features/tests/exchange_features_blackbox_test.rs b/contracts/feature-tests/exchange-features/tests/exchange_features_blackbox_test.rs
new file mode 100644
index 0000000000..82bca1794b
--- /dev/null
+++ b/contracts/feature-tests/exchange-features/tests/exchange_features_blackbox_test.rs
@@ -0,0 +1,83 @@
+use multiversx_sc_scenario::{scenario_model::*, *};
+
+const EXCHANGE_FEATURES_PATH_EXPR: &str = "mxsc:output/exchange-features.mxsc.json";
+
+fn world() -> ScenarioWorld {
+    let mut blockchain = ScenarioWorld::new();
+    blockchain.set_current_dir_from_workspace("contracts/feature-tests/exchange-features");
+
+    blockchain.register_contract(
+        EXCHANGE_FEATURES_PATH_EXPR,
+        exchange_features::ContractBuilder,
+    );
+    blockchain
+}
+
+#[test]
+fn exchange_features_blackbox_raw() {
+    let mut world = world();
+    let exchange_features_code = world.code_expression(EXCHANGE_FEATURES_PATH_EXPR);
+
+    world
+        .set_state_step(
+            SetStateStep::new()
+                .put_account("address:owner", Account::new().nonce(1))
+                .new_address("address:owner", 1, "sc:exchange-features"),
+        )
+        .sc_deploy(
+            ScDeployStep::new()
+                .from("address:owner")
+                .code(&exchange_features_code)
+                .argument("5")
+                .expect(TxExpect::ok().no_result()),
+        )
+        .sc_call(
+            ScCallStep::new()
+                .from("address:owner")
+                .to("sc:exchange-features")
+                .function("get_supply")
+                .expect(TxExpect::ok().result("5")),
+        )
+        .sc_call(
+            ScCallStep::new()
+                .from("address:owner")
+                .to("sc:exchange-features")
+                .function("merge")
+                .argument("3")
+                .expect(TxExpect::ok().no_result()),
+        )
+        .sc_call(
+            ScCallStep::new()
+                .from("address:owner")
+                .to("sc:exchange-features")
+                .function("get_supply")
+                .expect(TxExpect::ok().result("8")),
+        )
+        .sc_call(
+            ScCallStep::new()
+                .from("address:owner")
+                .to("sc:exchange-features")
+                .function("upgradeContract")
+                .argument(&exchange_features_code)
+                .argument("0x0502") // codeMetadata
+                .argument("0") // contract argument
+                .expect(TxExpect::user_error("str:Zero amount")),
+        )
+        .sc_call(
+            ScCallStep::new()
+                .from("address:owner")
+                .to("sc:exchange-features")
+                .function("upgradeContract")
+                .argument(exchange_features_code)
+                .argument("0x0502") // codeMetadata
+                .argument("3") // contract argument
+                .expect(TxExpect::ok().no_result()),
+        )
+        .sc_call(
+            ScCallStep::new()
+                .from("address:owner")
+                .to("sc:exchange-features")
+                .function("get_supply")
+                .expect(TxExpect::ok().result("6")),
+        );
+}
diff --git a/contracts/feature-tests/exchange-features/wasm/Cargo.lock b/contracts/feature-tests/exchange-features/wasm/Cargo.lock
new file mode 100644
index 0000000000..e9ffb74f36
--- /dev/null
+++ b/contracts/feature-tests/exchange-features/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.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+
+[[package]]
+name = "bitflags"
+version = "2.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+
+[[package]]
+name = "endian-type"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
+
+[[package]]
+name = "exchange-features"
+version = "0.0.0"
+dependencies = [
+ "multiversx-sc",
+]
+
+[[package]]
+name = "exchange-features-wasm"
+version = "0.0.0"
+dependencies = [
+ "exchange-features",
+ "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.47.8"
+dependencies = [
+ "bitflags",
+ "hex-literal",
+ "multiversx-sc-codec",
+ "multiversx-sc-derive",
+ "num-traits",
+]
+
+[[package]]
+name = "multiversx-sc-codec"
+version = "0.18.6"
+dependencies = [
+ "arrayvec",
+ "multiversx-sc-codec-derive",
+]
+
+[[package]]
+name = "multiversx-sc-codec-derive"
+version = "0.18.6"
+dependencies = [
+ "hex",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "multiversx-sc-derive"
+version = "0.47.8"
+dependencies = [
+ "hex",
+ "proc-macro2",
+ "quote",
+ "radix_trie",
+ "syn",
+]
+
+[[package]]
+name = "multiversx-sc-wasm-adapter"
+version = "0.47.8"
+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.78"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+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.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
+
+[[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/exchange-features/wasm/Cargo.toml b/contracts/feature-tests/exchange-features/wasm/Cargo.toml
new file mode 100644
index 0000000000..977914cedf
--- /dev/null
+++ b/contracts/feature-tests/exchange-features/wasm/Cargo.toml
@@ -0,0 +1,32 @@
+# Code generated by the multiversx-sc build system. DO NOT EDIT.
+
+# ##########################################
+# ############## AUTO-GENERATED #############
+# ##########################################
+
+[package]
+name = "exchange-features-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.exchange-features]
+path = ".."
+
+[dependencies.multiversx-sc-wasm-adapter]
+version = "0.47.8"
+path = "../../../../framework/wasm-adapter"
+
+[workspace]
+members = ["."]
diff --git a/contracts/feature-tests/exchange-features/wasm/src/lib.rs b/contracts/feature-tests/exchange-features/wasm/src/lib.rs
new file mode 100644
index 0000000000..b0842b89d6
--- /dev/null
+++ b/contracts/feature-tests/exchange-features/wasm/src/lib.rs
@@ -0,0 +1,29 @@
+// Code generated by the multiversx-sc build system. DO NOT EDIT.
+
+////////////////////////////////////////////////////
+////////////////// AUTO-GENERATED //////////////////
+////////////////////////////////////////////////////
+
+// Init:                                 1
+// Endpoints:                            3
+// Async Callback (empty):               1
+// Total number of exported functions:   5
+
+#![no_std]
+#![allow(internal_features)]
+#![feature(lang_items)]
+
+multiversx_sc_wasm_adapter::allocator!();
+multiversx_sc_wasm_adapter::panic_handler!();
+
+multiversx_sc_wasm_adapter::endpoints! {
+    exchange_features
+    (
+        init => init
+        upgrade => upgrade
+        merge => merge
+        get_supply => get_supply
+    )
+}
+
+multiversx_sc_wasm_adapter::async_callback_empty! {}
diff --git a/framework/base/src/types/managed/wrapped/mod.rs b/framework/base/src/types/managed/wrapped/mod.rs
index d87389a87a..7ead89e3a0 100644
--- a/framework/base/src/types/managed/wrapped/mod.rs
+++ b/framework/base/src/types/managed/wrapped/mod.rs
@@ -39,7 +39,7 @@ pub use managed_vec_ref_iter::ManagedVecRefIterator;
 pub use randomness_source::RandomnessSource;
 pub use token_identifier::TokenIdentifier;
 
-pub use self::traits::{
+pub use traits::{
     fixed_token_supply::FixedSupplyToken,
     mergeable::{ExternallyMergeable, Mergeable},
 };

From 6dfc61e74f3173d61a70b2797e60eedd2413f92a Mon Sep 17 00:00:00 2001
From: Alin Cruceat <alyn_509@yahoo.com>
Date: Thu, 28 Mar 2024 12:18:28 +0200
Subject: [PATCH 0583/1254] update Cargo.toml

---
 contracts/feature-tests/exchange-features/Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contracts/feature-tests/exchange-features/Cargo.toml b/contracts/feature-tests/exchange-features/Cargo.toml
index eaf84b2a99..bdb1a7dd66 100644
--- a/contracts/feature-tests/exchange-features/Cargo.toml
+++ b/contracts/feature-tests/exchange-features/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "exchange-features"
 version = "0.0.0"
-authors = ["you"]
+authors = ["Alin-Marius Cruceat <alin.cruceat@multiversx.com>"]
 edition = "2021"
 publish = false
 

From 18524321fc842200f7a5c9b5969cd02cff0eacb0 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Thu, 28 Mar 2024 11:55:37 +0100
Subject: [PATCH 0584/1254] promises-features migration to new proxy

---
 .../src/call_promise_direct.rs                |   3 -
 .../promises-features/src/call_promises.rs    |  30 +-
 .../promises-features/src/call_promises_bt.rs |  18 +-
 .../promises-features/src/call_sync_bt.rs     |  20 +-
 .../promises-features/src/promises_main.rs    |   1 +
 .../promises-features/src/vault_proxy.rs      | 278 ++++++++++++++++++
 .../composability/vault/sc-config.toml        |   5 +-
 7 files changed, 320 insertions(+), 35 deletions(-)
 create mode 100644 contracts/feature-tests/composability/promises-features/src/vault_proxy.rs

diff --git a/contracts/feature-tests/composability/promises-features/src/call_promise_direct.rs b/contracts/feature-tests/composability/promises-features/src/call_promise_direct.rs
index 8ce47a10c3..7ae949e214 100644
--- a/contracts/feature-tests/composability/promises-features/src/call_promise_direct.rs
+++ b/contracts/feature-tests/composability/promises-features/src/call_promise_direct.rs
@@ -3,9 +3,6 @@ multiversx_sc::imports!();
 /// Test contract for investigating the new async call framework.
 #[multiversx_sc::module]
 pub trait CallPromisesDirectModule {
-    #[proxy]
-    fn vault_proxy(&self) -> vault::Proxy<Self::Api>;
-
     #[endpoint]
     #[payable("*")]
     fn promise_raw_single_token(
diff --git a/contracts/feature-tests/composability/promises-features/src/call_promises.rs b/contracts/feature-tests/composability/promises-features/src/call_promises.rs
index 616d8c5cb0..6f2dc17287 100644
--- a/contracts/feature-tests/composability/promises-features/src/call_promises.rs
+++ b/contracts/feature-tests/composability/promises-features/src/call_promises.rs
@@ -1,24 +1,26 @@
 multiversx_sc::imports!();
 
-use crate::common::{self, CallbackData};
+use crate::{
+    common::{self, CallbackData},
+    vault_proxy,
+};
 
 #[multiversx_sc::module]
 pub trait CallPromisesModule: common::CommonModule {
-    #[proxy]
-    fn vault_proxy(&self) -> vault::Proxy<Self::Api>;
-
     #[endpoint]
     #[payable("*")]
     fn forward_promise_accept_funds(&self, to: ManagedAddress) {
         let payment = self.call_value().egld_or_single_esdt();
         let gas_limit = self.blockchain().get_gas_left() / 2;
-        self.vault_proxy()
-            .contract(to)
+
+        self.tx()
+            .to(&to)
+            .typed(vault_proxy::VaultProxy)
             .accept_funds()
-            .with_egld_or_single_esdt_transfer(payment)
             .with_gas_limit(gas_limit)
-            .async_call_promise()
-            .register_promise()
+            .with_egld_or_single_esdt_transfer(payment)
+            .async_call()
+            .register_promise();
     }
 
     #[endpoint]
@@ -30,14 +32,16 @@ pub trait CallPromisesModule: common::CommonModule {
         amount: BigUint,
     ) {
         let gas_limit = self.blockchain().get_gas_left() - 20_000_000;
-        self.vault_proxy()
-            .contract(to)
+
+        self.tx()
+            .to(&to)
+            .typed(vault_proxy::VaultProxy)
             .retrieve_funds(token, token_nonce, amount)
             .with_gas_limit(gas_limit)
-            .async_call_promise()
+            .async_call()
             .with_callback(self.callbacks().retrieve_funds_callback())
             .with_extra_gas_for_callback(10_000_000)
-            .register_promise()
+            .register_promise();
     }
 
     #[promises_callback]
diff --git a/contracts/feature-tests/composability/promises-features/src/call_promises_bt.rs b/contracts/feature-tests/composability/promises-features/src/call_promises_bt.rs
index e1e2188852..6f5d85179e 100644
--- a/contracts/feature-tests/composability/promises-features/src/call_promises_bt.rs
+++ b/contracts/feature-tests/composability/promises-features/src/call_promises_bt.rs
@@ -1,13 +1,12 @@
 multiversx_sc::imports!();
 multiversx_sc::derive_imports!();
 
-use crate::common::{self, CallbackData};
-
+use crate::{
+    common::{self, CallbackData},
+    vault_proxy,
+};
 #[multiversx_sc::module]
 pub trait CallPromisesBackTransfersModule: common::CommonModule {
-    #[proxy]
-    fn vault_proxy(&self) -> vault::Proxy<Self::Api>;
-
     #[endpoint]
     fn forward_promise_retrieve_funds_back_transfers(
         &self,
@@ -17,14 +16,15 @@ pub trait CallPromisesBackTransfersModule: common::CommonModule {
         amount: BigUint,
     ) {
         let gas_limit = self.blockchain().get_gas_left() - 20_000_000;
-        self.vault_proxy()
-            .contract(to)
+        self.tx()
+            .to(&to)
+            .typed(vault_proxy::VaultProxy)
             .retrieve_funds(token, token_nonce, amount)
             .with_gas_limit(gas_limit)
-            .async_call_promise()
+            .async_call()
             .with_callback(self.callbacks().retrieve_funds_back_transfers_callback())
             .with_extra_gas_for_callback(10_000_000)
-            .register_promise()
+            .register_promise();
     }
 
     #[promises_callback]
diff --git a/contracts/feature-tests/composability/promises-features/src/call_sync_bt.rs b/contracts/feature-tests/composability/promises-features/src/call_sync_bt.rs
index d3cc048ccc..1d228d30cd 100644
--- a/contracts/feature-tests/composability/promises-features/src/call_sync_bt.rs
+++ b/contracts/feature-tests/composability/promises-features/src/call_sync_bt.rs
@@ -1,11 +1,10 @@
+use crate::vault_proxy;
+
 multiversx_sc::imports!();
 
 /// Not directly related to promises, but this contract already has the setup for VM 1.5.
 #[multiversx_sc::module]
 pub trait BackTransfersFeatureModule {
-    #[proxy]
-    fn vault_proxy(&self) -> vault::Proxy<Self::Api>;
-
     #[endpoint]
     fn forward_sync_retrieve_funds_bt(
         &self,
@@ -15,8 +14,9 @@ pub trait BackTransfersFeatureModule {
         amount: BigUint,
     ) {
         let ((), back_transfers) = self
-            .vault_proxy()
-            .contract(to)
+            .tx()
+            .to(&to)
+            .typed(vault_proxy::VaultProxy)
             .retrieve_funds(token, token_nonce, amount)
             .execute_on_dest_context_with_back_transfers::<()>();
 
@@ -40,8 +40,9 @@ pub trait BackTransfersFeatureModule {
         amount: BigUint,
     ) {
         let ((), back_transfers) = self
-            .vault_proxy()
-            .contract(to.clone())
+            .tx()
+            .to(&to)
+            .typed(vault_proxy::VaultProxy)
             .retrieve_funds(token.clone(), token_nonce, amount.clone())
             .execute_on_dest_context_with_back_transfers::<()>();
 
@@ -56,8 +57,9 @@ pub trait BackTransfersFeatureModule {
         );
 
         let ((), back_transfers) = self
-            .vault_proxy()
-            .contract(to)
+            .tx()
+            .to(&to)
+            .typed(vault_proxy::VaultProxy)
             .retrieve_funds(token, token_nonce, amount)
             .execute_on_dest_context_with_back_transfers::<()>();
 
diff --git a/contracts/feature-tests/composability/promises-features/src/promises_main.rs b/contracts/feature-tests/composability/promises-features/src/promises_main.rs
index 11eb5d3935..ddcc00d965 100644
--- a/contracts/feature-tests/composability/promises-features/src/promises_main.rs
+++ b/contracts/feature-tests/composability/promises-features/src/promises_main.rs
@@ -6,6 +6,7 @@ mod call_promises;
 mod call_promises_bt;
 pub mod call_sync_bt;
 mod common;
+pub mod vault_proxy;
 
 multiversx_sc::imports!();
 
diff --git a/contracts/feature-tests/composability/promises-features/src/vault_proxy.rs b/contracts/feature-tests/composability/promises-features/src/vault_proxy.rs
new file mode 100644
index 0000000000..f04735e6a5
--- /dev/null
+++ b/contracts/feature-tests/composability/promises-features/src/vault_proxy.rs
@@ -0,0 +1,278 @@
+// Code generated by the multiversx-sc proxy generator. DO NOT EDIT.
+
+////////////////////////////////////////////////////
+////////////////// AUTO-GENERATED //////////////////
+////////////////////////////////////////////////////
+
+#![allow(dead_code)]
+#![allow(clippy::all)]
+
+use multiversx_sc::proxy_imports::*;
+
+pub struct VaultProxy;
+
+impl<Env, From, To, Gas> TxProxyTrait<Env, From, To, Gas> for VaultProxy
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    type TxProxyMethods = VaultProxyMethods<Env, From, To, Gas>;
+
+    fn proxy_methods(self, tx: Tx<Env, From, To, (), Gas, (), ()>) -> Self::TxProxyMethods {
+        VaultProxyMethods { wrapped_tx: tx }
+    }
+}
+
+pub struct VaultProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    wrapped_tx: Tx<Env, From, To, (), Gas, (), ()>,
+}
+
+#[rustfmt::skip]
+impl<Env, From, Gas> VaultProxyMethods<Env, From, (), Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn init<
+        Arg0: CodecInto<OptionalValue<ManagedBuffer<Env::Api>>>,
+    >(
+        self,
+        opt_arg_to_echo: Arg0,
+    ) -> TxProxyDeploy<Env, From, Gas, OptionalValue<ManagedBuffer<Env::Api>>> {
+        self.wrapped_tx
+            .raw_deploy()
+            .argument(&opt_arg_to_echo)
+            .original_result()
+    }
+}
+
+#[rustfmt::skip]
+impl<Env, From, To, Gas> VaultProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn upgrade<
+        Arg0: CodecInto<OptionalValue<ManagedBuffer<Env::Api>>>,
+    >(
+        self,
+        opt_arg_to_echo: Arg0,
+    ) -> TxProxyUpgrade<Env, From, To, Gas, MultiValue2<&'static str, OptionalValue<ManagedBuffer<Env::Api>>>> {
+        self.wrapped_tx
+            .raw_upgrade()
+            .argument(&opt_arg_to_echo)
+            .original_result()
+    }
+}
+
+#[rustfmt::skip]
+impl<Env, From, To, Gas> VaultProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn echo_arguments<
+        Arg0: CodecInto<MultiValueEncoded<Env::Api, ManagedBuffer<Env::Api>>>,
+    >(
+        self,
+        args: Arg0,
+    ) -> TxProxyCall<Env, From, To, Gas, MultiValueEncoded<Env::Api, ManagedBuffer<Env::Api>>> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("echo_arguments")
+            .argument(&args)
+            .original_result()
+    }
+
+    pub fn echo_arguments_without_storage<
+        Arg0: CodecInto<MultiValueEncoded<Env::Api, ManagedBuffer<Env::Api>>>,
+    >(
+        self,
+        args: Arg0,
+    ) -> TxProxyCall<Env, From, To, Gas, MultiValueEncoded<Env::Api, ManagedBuffer<Env::Api>>> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("echo_arguments_without_storage")
+            .argument(&args)
+            .original_result()
+    }
+
+    pub fn echo_caller(
+        self,
+    ) -> TxProxyCall<Env, From, To, Gas, ManagedAddress<Env::Api>> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("echo_caller")
+            .original_result()
+    }
+
+    pub fn accept_funds(
+        self,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("accept_funds")
+            .original_result()
+    }
+
+    pub fn accept_funds_echo_payment(
+        self,
+    ) -> TxProxyCall<Env, From, To, Gas, MultiValue2<BigUint<Env::Api>, MultiValueEncoded<Env::Api, EsdtTokenPaymentMultiValue<Env::Api>>>> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("accept_funds_echo_payment")
+            .original_result()
+    }
+
+    pub fn accept_funds_single_esdt_transfer(
+        self,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("accept_funds_single_esdt_transfer")
+            .original_result()
+    }
+
+    pub fn reject_funds(
+        self,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("reject_funds")
+            .original_result()
+    }
+
+    pub fn retrieve_funds_with_transfer_exec<
+        Arg0: CodecInto<TokenIdentifier<Env::Api>>,
+        Arg1: CodecInto<BigUint<Env::Api>>,
+        Arg2: CodecInto<OptionalValue<ManagedBuffer<Env::Api>>>,
+    >(
+        self,
+        token: Arg0,
+        amount: Arg1,
+        opt_receive_func: Arg2,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("retrieve_funds_with_transfer_exec")
+            .argument(&token)
+            .argument(&amount)
+            .argument(&opt_receive_func)
+            .original_result()
+    }
+
+    pub fn retrieve_funds_promises<
+        Arg0: CodecInto<OptionalValue<u64>>,
+        Arg1: CodecInto<OptionalValue<BigUint<Env::Api>>>,
+    >(
+        self,
+        back_transfers: Arg0,
+        back_transfer_value: Arg1,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("retrieve_funds_promises")
+            .argument(&back_transfers)
+            .argument(&back_transfer_value)
+            .original_result()
+    }
+
+    pub fn retrieve_funds<
+        Arg0: CodecInto<EgldOrEsdtTokenIdentifier<Env::Api>>,
+        Arg1: CodecInto<u64>,
+        Arg2: CodecInto<BigUint<Env::Api>>,
+    >(
+        self,
+        token: Arg0,
+        nonce: Arg1,
+        amount: Arg2,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("retrieve_funds")
+            .argument(&token)
+            .argument(&nonce)
+            .argument(&amount)
+            .original_result()
+    }
+
+    pub fn retrieve_multi_funds_async<
+        Arg0: CodecInto<MultiValueEncoded<Env::Api, MultiValue3<TokenIdentifier<Env::Api>, u64, BigUint<Env::Api>>>>,
+    >(
+        self,
+        token_payments: Arg0,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("retrieve_multi_funds_async")
+            .argument(&token_payments)
+            .original_result()
+    }
+
+    pub fn burn_and_create_retrive_async(
+        self,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("burn_and_create_retrive_async")
+            .original_result()
+    }
+
+    pub fn get_owner_address(
+        self,
+    ) -> TxProxyCall<Env, From, To, Gas, ManagedAddress<Env::Api>> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("get_owner_address")
+            .original_result()
+    }
+
+    /// We already leave a trace of the calls using the event logs; 
+    /// this additional counter has the role of showing that storage also gets saved correctly. 
+    pub fn call_counts<
+        Arg0: CodecInto<ManagedBuffer<Env::Api>>,
+    >(
+        self,
+        endpoint: Arg0,
+    ) -> TxProxyCall<Env, From, To, Gas, usize> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("call_counts")
+            .argument(&endpoint)
+            .original_result()
+    }
+
+    pub fn num_called_retrieve_funds_promises(
+        self,
+    ) -> TxProxyCall<Env, From, To, Gas, usize> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("num_called_retrieve_funds_promises")
+            .original_result()
+    }
+
+    pub fn num_async_calls_sent_from_child(
+        self,
+    ) -> TxProxyCall<Env, From, To, Gas, usize> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("num_async_calls_sent_from_child")
+            .original_result()
+    }
+}
diff --git a/contracts/feature-tests/composability/vault/sc-config.toml b/contracts/feature-tests/composability/vault/sc-config.toml
index 33b8945873..969ed9c2a3 100644
--- a/contracts/feature-tests/composability/vault/sc-config.toml
+++ b/contracts/feature-tests/composability/vault/sc-config.toml
@@ -1,6 +1,9 @@
 [settings]
 main = "main"
-proxy-paths = ["../forwarder/src/vault_proxy.rs"]
+proxy-paths = [
+    "../forwarder/src/vault_proxy.rs",
+    "../promises-features/src/vault_proxy.rs",
+]
 
 [contracts.main]
 name = "vault"

From d710bb91615b084dbdaae901cddc61ee96b1b7f3 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Thu, 28 Mar 2024 13:08:10 +0200
Subject: [PATCH 0585/1254] proxy gen - add path to struct and enums from
 different crates than proxy

---
 .../feature-tests/abi-tester/src/abi_proxy.rs | 115 ++++++++-----
 framework/derive/src/type_abi_derive.rs       |  20 +--
 .../contract/generate_proxy/proxy_gen_main.rs |   6 +-
 .../generate_proxy/proxy_gen_struct_enum.rs   | 156 ++++++++++++++----
 .../generate_proxy/proxy_sc_functions_gen.rs  |  84 ++++++----
 5 files changed, 253 insertions(+), 128 deletions(-)

diff --git a/contracts/feature-tests/abi-tester/src/abi_proxy.rs b/contracts/feature-tests/abi-tester/src/abi_proxy.rs
index 8759f224d8..c9c878010d 100644
--- a/contracts/feature-tests/abi-tester/src/abi_proxy.rs
+++ b/contracts/feature-tests/abi-tester/src/abi_proxy.rs
@@ -1,7 +1,10 @@
+// Code generated by the multiversx-sc proxy generator. DO NOT EDIT.
+
 ////////////////////////////////////////////////////
 ////////////////// AUTO-GENERATED //////////////////
 ////////////////////////////////////////////////////
 
+#![allow(dead_code)]
 #![allow(clippy::all)]
 
 use multiversx_sc::proxy_imports::*;
@@ -57,6 +60,32 @@ where
     }
 }
 
+#[rustfmt::skip]
+impl<Env, From, To, Gas> AbiTesterProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    /// Upgrade constructor. 
+    pub fn upgrade<
+        Arg0: CodecInto<i32>,
+        Arg1: CodecInto<OnlyShowsUpInConstructor>,
+    >(
+        self,
+        _constructor_arg_1: Arg0,
+        _constructor_arg_2: Arg1,
+    ) -> TxProxyUpgrade<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_upgrade()
+            .argument(&_constructor_arg_1)
+            .argument(&_constructor_arg_2)
+            .original_result()
+    }
+}
+
 #[rustfmt::skip]
 impl<Env, From, To, Gas> AbiTesterProxyMethods<Env, From, To, Gas>
 where
@@ -403,7 +432,8 @@ pub struct AbiTestType {
 }
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
-pub struct OnlyShowsUpAsNested01 {}
+pub struct OnlyShowsUpAsNested01 {
+}
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct OnlyShowsUpAsNested02 {
@@ -415,14 +445,19 @@ pub enum AbiEnum {
     Nothing,
     Something(i32),
     SomethingMore(u8, OnlyShowsUpAsNested08),
-    SomeStruct { a: u16, b: OnlyShowsUpAsNested09 },
+    SomeStruct {
+        a: u16,
+        b: OnlyShowsUpAsNested09,
+    },
 }
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
-pub struct OnlyShowsUpAsNested08 {}
+pub struct OnlyShowsUpAsNested08 {
+}
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
-pub struct OnlyShowsUpAsNested09 {}
+pub struct OnlyShowsUpAsNested09 {
+}
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct AbiManagedType<Api>
@@ -435,52 +470,36 @@ where
 }
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
-pub struct OnlyShowsUpAsNested03 {}
+pub struct OnlyShowsUpAsNested03 {
+}
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
-pub struct OnlyShowsUpAsNested04 {}
+pub struct OnlyShowsUpAsNested04 {
+}
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
-pub struct OnlyShowsUpAsNested05 {}
+pub struct OnlyShowsUpAsNested05 {
+}
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
-pub struct OnlyShowsUpAsNested06 {}
+pub struct OnlyShowsUpAsNested06 {
+}
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
-pub struct OnlyShowsUpAsNested07 {}
-
-#[derive(TopDecode, TopEncode, NestedDecode, NestedEncode, Clone, PartialEq, Eq, Debug, Copy)]
-pub enum EsdtLocalRole {
-    None,
-    Mint,
-    Burn,
-    NftCreate,
-    NftAddQuantity,
-    NftBurn,
-    NftAddUri,
-    NftUpdateAttributes,
-    Transfer,
-}
-
-#[derive(
-    TopDecode, TopEncode, NestedDecode, NestedEncode, Clone, PartialEq, Eq, Debug, ManagedVecItem,
-)]
-pub enum EsdtTokenType {
-    Fungible,
-    NonFungible,
-    SemiFungible,
-    Meta,
-    Invalid,
+pub struct OnlyShowsUpAsNested07 {
 }
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
-pub struct OnlyShowsUpAsNestedInSingleValueMapper {}
+pub struct OnlyShowsUpAsNestedInSingleValueMapper {
+}
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
-pub struct OnlyShowsUpAsNestedInVec {}
+pub struct OnlyShowsUpAsNestedInVec {
+}
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
-pub struct OnlyShowsUpAsNestedInArrayVec {}
+pub struct OnlyShowsUpAsNestedInArrayVec {
+}
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, ManagedVecItem)]
 pub struct AbiManagedVecItem {
@@ -489,22 +508,28 @@ pub struct AbiManagedVecItem {
 }
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
-pub struct OnlyShowsUpAsNestedInArray {}
+pub struct OnlyShowsUpAsNestedInArray {
+}
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
-pub struct OnlyShowsUpAsNestedInBox {}
+pub struct OnlyShowsUpAsNestedInBox {
+}
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
-pub struct OnlyShowsUpAsNestedInBoxedSlice {}
+pub struct OnlyShowsUpAsNestedInBoxedSlice {
+}
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
-pub struct OnlyShowsUpAsNestedInRef {}
+pub struct OnlyShowsUpAsNestedInRef {
+}
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
-pub struct OnlyShowsUpAsNestedInSlice {}
+pub struct OnlyShowsUpAsNestedInSlice {
+}
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
-pub struct OnlyShowsUpAsNestedInOption {}
+pub struct OnlyShowsUpAsNestedInOption {
+}
 
 #[derive(TopEncode, TopDecode)]
 pub struct OnlyShowsUpInEsdtAttr {
@@ -512,7 +537,8 @@ pub struct OnlyShowsUpInEsdtAttr {
 }
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
-pub struct OnlyShowsUpAsNested10 {}
+pub struct OnlyShowsUpAsNested10 {
+}
 
 #[derive(TopEncode, TopDecode)]
 pub enum ExplicitDiscriminant {
@@ -529,5 +555,8 @@ pub enum ExplicitDiscriminantMixed {
     Unit,
     Tuple(u16),
     Five,
-    Struct { a: u8, b: u16 },
+    Struct {
+        a: u8,
+        b: u16,
+    },
 }
diff --git a/framework/derive/src/type_abi_derive.rs b/framework/derive/src/type_abi_derive.rs
index 56bd71d600..6799aac9d2 100644
--- a/framework/derive/src/type_abi_derive.rs
+++ b/framework/derive/src/type_abi_derive.rs
@@ -1,7 +1,7 @@
 use crate::parse::attributes::extract_macro_attributes;
 
 use super::parse::attributes::extract_doc;
-use quote::{quote, ToTokens};
+use quote::quote;
 
 pub struct ExplicitDiscriminant {
     pub variant_index: usize,
@@ -122,17 +122,11 @@ pub fn type_abi_derive(input: proc_macro::TokenStream) -> proc_macro2::TokenStre
     let name = &ast.ident;
     let name_str = name.to_string();
     let (impl_generics, ty_generics, where_clause) = &ast.generics.split_for_impl();
-    let name_rust = extract_rust_type(ty_generics, name_str.clone());
     quote! {
         impl #impl_generics multiversx_sc::abi::TypeAbi for #name #ty_generics #where_clause {
             fn type_name() -> multiversx_sc::abi::TypeName {
                 #name_str.into()
             }
-
-            fn type_name_rust() -> multiversx_sc::abi::TypeName {
-                #name_rust.into()
-            }
-
             #type_description_impl
         }
     }
@@ -189,15 +183,3 @@ pub fn get_discriminant(
 
     quote! { #next_value}
 }
-
-fn extract_rust_type(ty_generics: &syn::TypeGenerics<'_>, mut output_name: String) -> String {
-    let mut ty_generics_tokens = proc_macro2::TokenStream::new();
-    ty_generics.to_tokens(&mut ty_generics_tokens);
-
-    if ty_generics_tokens.to_string().is_empty() {
-        return output_name;
-    }
-
-    output_name.push_str("<$API>");
-    output_name
-}
diff --git a/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_main.rs b/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_main.rs
index 2c0f730eca..dfac04fd8f 100644
--- a/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_main.rs
+++ b/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_main.rs
@@ -35,5 +35,9 @@ fn write_proxy_to_file(mut file: File, abi: &ContractAbi) {
     write_impl_for_tx_proxy(&mut file, &abi.name);
     write_struct_tx_proxy_methods(&mut file, &abi.name);
     write_content(&mut file, abi.clone());
-    write_types(&mut file, &abi.type_descriptions);
+    write_types(
+        &mut file,
+        &abi.type_descriptions,
+        abi.build_info.contract_crate.name,
+    );
 }
diff --git a/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_struct_enum.rs b/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_struct_enum.rs
index b82b071e16..0d07cb4985 100644
--- a/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_struct_enum.rs
+++ b/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_struct_enum.rs
@@ -5,43 +5,79 @@ use multiversx_sc::abi::{
     TypeDescriptionContainerImpl,
 };
 
+use crate::cmd::contract::generate_proxy::proxy_sc_functions_gen::adjust_type_name;
+
 const ZERO: &str = "0";
+const UNCALLABLE_API: &str = "multiversx_sc::api::uncallable::UncallableApi";
 
 /// Types defined in the framework don't need to be generated again in the proxy.
 const TYPES_FROM_FRAMEWORK: &[&str] = &[
-    "EsdtTokenPayment<$API>",
-    "EgldOrEsdtTokenPayment<$API>",
-    "EsdtTokenData<$API>",
-    "EgldOrEsdtTokenIdentifier<$API>",
-    "EgldOrEsdtTokenPayment<$API>",
-    "EgldOrMultiEsdtPayment<$API>",
-    "EsdtTokenData<$API>",
+    "EsdtTokenPayment",
+    "EgldOrEsdtTokenPayment",
+    "EsdtTokenData",
+    "EgldOrEsdtTokenIdentifier",
+    "EgldOrEsdtTokenPayment",
+    "EgldOrMultiEsdtPayment",
+    "EsdtTokenData",
+    "EsdtLocalRole",
 ];
 
-pub(crate) fn write_types(file: &mut File, types: &TypeDescriptionContainerImpl) {
+pub(crate) fn write_types(
+    file: &mut File,
+    types: &TypeDescriptionContainerImpl,
+    proxy_crate: &str,
+) {
     for (_, type_description) in &types.0 {
-        if TYPES_FROM_FRAMEWORK.contains(&type_description.names.rust.as_str()) {
+        let type_rust_name = type_description.names.rust.replace(UNCALLABLE_API, "Api");
+        let type_name = type_rust_name.split("::").last().unwrap();
+
+        println!(
+            "1. inital {} | 2. altered {}",
+            type_description.names.rust,
+            adjust_type_name(&type_description.names.rust, proxy_crate)
+        );
+
+        if TYPES_FROM_FRAMEWORK.contains(&type_name) {
+            continue;
+        }
+
+        if proxy_crate != extract_struct_crate(type_description.names.rust.as_str()) {
             continue;
         }
 
         match &type_description.contents {
-            TypeContents::Enum(enum_variants) => write_enum(file, enum_variants, type_description),
-            TypeContents::Struct(struct_fields) => {
-                write_struct(file, struct_fields, type_description)
-            },
+            TypeContents::Enum(enum_variants) => write_enum(
+                file,
+                enum_variants,
+                type_description,
+                type_name,
+                proxy_crate,
+            ),
+            TypeContents::Struct(struct_fields) => write_struct(
+                file,
+                struct_fields,
+                type_description,
+                type_name,
+                proxy_crate,
+            ),
             TypeContents::NotSpecified => {},
             TypeContents::ExplicitEnum(_) => {},
         }
     }
 }
 
-fn start_write_type(file: &mut File, type_type: &str, type_description: &TypeDescription) {
+fn start_write_type(
+    file: &mut File,
+    type_type: &str,
+    type_description: &TypeDescription,
+    name: &str,
+) {
     writeln!(file).unwrap();
-    let type_name = type_description.names.rust.replace("$API", "Api");
+    // let type_name = name.replace("multiversx_sc::api::uncallable::UncallableApi", "Api");
     write_macro_attributes(file, &type_description.macro_attributes);
-    write!(file, r#"pub {type_type} {type_name}"#).unwrap();
+    write!(file, r#"pub {type_type} {name}"#).unwrap();
 
-    if type_name.contains("<Api>") {
+    if name.contains("<Api>") {
         writeln!(
             file,
             r#"
@@ -60,17 +96,24 @@ fn write_struct(
     file: &mut File,
     struct_fields: &Vec<StructFieldDescription>,
     type_description: &TypeDescription,
+    name: &str,
+    proxy_crate: &str,
 ) {
-    start_write_type(file, "struct", type_description);
+    start_write_type(file, "struct", type_description, name);
 
     for field in struct_fields {
-        writeln!(
-            file,
-            "    pub {}: {},",
-            field.name,
-            field.field_type.rust.replace("$API", "Api")
-        )
-        .unwrap();
+        let field_rust_type = field.field_type.rust.replace("$API", "Api");
+        if proxy_crate != extract_struct_crate(type_description.names.rust.as_str()) {
+            writeln!(file, "    pub {}: {},", field.name, field_rust_type).unwrap()
+        } else {
+            writeln!(
+                file,
+                "    pub {}: {},",
+                field.name,
+                clean_paths(proxy_crate, &field_rust_type)
+            )
+            .unwrap();
+        }
     }
 
     writeln!(file, "}}").unwrap();
@@ -80,8 +123,10 @@ fn write_enum(
     file: &mut File,
     enum_variants: &Vec<EnumVariantDescription>,
     type_description: &TypeDescription,
+    name: &str,
+    proxy_crate: &str,
 ) {
-    start_write_type(file, "enum", type_description);
+    start_write_type(file, "enum", type_description, name);
 
     for variant in enum_variants {
         write!(file, "    {}", variant.name).unwrap();
@@ -91,9 +136,9 @@ fn write_enum(
         }
 
         if variant.fields[0].name == ZERO {
-            write_tuple_in_variant(file, &variant.fields);
+            write_tuple_in_variant(file, &variant.fields, proxy_crate);
         } else {
-            write_struct_in_variant(file, &variant.fields);
+            write_struct_in_variant(file, &variant.fields, proxy_crate);
         }
     }
     writeln!(file, "}}").unwrap();
@@ -107,7 +152,7 @@ fn write_macro_attributes(file: &mut File, macro_attributes: &[String]) {
     }
 }
 
-fn write_struct_in_variant(file: &mut File, fields: &[StructFieldDescription]) {
+fn write_struct_in_variant(file: &mut File, fields: &[StructFieldDescription], proxy_crate: &str) {
     writeln!(file, " {{").unwrap();
 
     for field in fields {
@@ -115,7 +160,7 @@ fn write_struct_in_variant(file: &mut File, fields: &[StructFieldDescription]) {
             file,
             "        {}: {},",
             field.name,
-            field.field_type.rust.replace("$API", "Api")
+            adjust_type_name(&field.field_type.rust.replace("$API", "Api"), proxy_crate)
         )
         .unwrap();
     }
@@ -123,13 +168,60 @@ fn write_struct_in_variant(file: &mut File, fields: &[StructFieldDescription]) {
     writeln!(file, "    }},").unwrap();
 }
 
-fn write_tuple_in_variant(file: &mut File, fields: &[StructFieldDescription]) {
+fn write_tuple_in_variant(file: &mut File, fields: &[StructFieldDescription], proxy_crate: &str) {
     write!(file, "(").unwrap();
     write!(file, "{}", fields[0].field_type.rust.replace("$API", "Api")).unwrap();
 
     for field in &fields[1..] {
-        write!(file, ", {}", field.field_type.rust.replace("$API", "Api")).unwrap();
+        write!(
+            file,
+            ", {}",
+            adjust_type_name(&field.field_type.rust.replace("$API", "Api"), proxy_crate)
+        )
+        .unwrap();
     }
 
     writeln!(file, "),").unwrap();
 }
+
+fn extract_struct_crate(struct_path: &str) -> String {
+    let struct_crate_name = struct_path
+        .replace('_', "-")
+        .replace(UNCALLABLE_API, "Api")
+        .to_string();
+    let crate_name = struct_crate_name
+        .split("::")
+        .next()
+        .unwrap_or_else(|| &struct_crate_name);
+    crate_name.to_string()
+}
+
+pub(crate) fn clean_paths(proxy_crate: &str, rust_type: &str) -> String {
+    let delimiters = "<>,()[] ";
+    let words: Vec<&str> = rust_type
+        .split(|c| delimiters.contains(c))
+        .filter(|s| !s.is_empty())
+        .collect();
+    let mut words_replacer: Vec<String> = Vec::new();
+    for word in &words {
+        let type_rust_name = word.split("::").last().unwrap().to_string();
+        // println!("###### {}", type_rust_name);
+        if proxy_crate == extract_struct_crate(word)
+            || TYPES_FROM_FRAMEWORK.contains(&type_rust_name.as_str())
+        {
+            words_replacer.push(type_rust_name);
+        } else {
+            words_replacer.push(word.to_string());
+        }
+    }
+
+    let mut rust_type_with_cleaned_path: String = rust_type.to_string().clone();
+    for index in 0..words.len() {
+        rust_type_with_cleaned_path = rust_type_with_cleaned_path.replace(
+            words.get(index).unwrap(),
+            words_replacer.get(index).unwrap(),
+        );
+    }
+
+    rust_type_with_cleaned_path
+}
diff --git a/framework/meta/src/cmd/contract/generate_proxy/proxy_sc_functions_gen.rs b/framework/meta/src/cmd/contract/generate_proxy/proxy_sc_functions_gen.rs
index 00ec38b490..5029e8790c 100644
--- a/framework/meta/src/cmd/contract/generate_proxy/proxy_sc_functions_gen.rs
+++ b/framework/meta/src/cmd/contract/generate_proxy/proxy_sc_functions_gen.rs
@@ -2,7 +2,7 @@ use std::{fs::File, io::Write};
 
 use multiversx_sc::abi::{ContractAbi, EndpointAbi, InputAbi, OutputAbi};
 
-use super::proxy_naming::proxy_methods_type_name;
+use super::{proxy_gen_struct_enum::clean_paths, proxy_naming::proxy_methods_type_name};
 
 pub(crate) fn write_content(file: &mut File, abi: ContractAbi) {
     write_header_impl_constructor(file, &abi.name);
@@ -10,7 +10,11 @@ pub(crate) fn write_content(file: &mut File, abi: ContractAbi) {
         if i > 0 {
             writeln!(file).unwrap();
         }
-        write_constructor_header(file, constructor_abi.clone());
+        write_constructor_header(
+            file,
+            constructor_abi.clone(),
+            abi.build_info.contract_crate.name,
+        );
         write_constructor_content(file, constructor_abi.inputs);
         write_end_of_function(file);
     }
@@ -22,7 +26,11 @@ pub(crate) fn write_content(file: &mut File, abi: ContractAbi) {
         if i > 0 {
             writeln!(file).unwrap();
         }
-        write_upgrade_constructor_header(file, upgrade_abi.clone());
+        write_upgrade_constructor_header(
+            file,
+            upgrade_abi.clone(),
+            abi.build_info.contract_crate.name,
+        );
         write_upgrade_constructor_content(file, upgrade_abi.inputs);
         write_end_of_function(file);
     }
@@ -34,7 +42,11 @@ pub(crate) fn write_content(file: &mut File, abi: ContractAbi) {
         if i > 0 {
             writeln!(file).unwrap();
         }
-        write_endpoint_header(file, endpoint_abi.clone());
+        write_endpoint_header(
+            file,
+            endpoint_abi.clone(),
+            abi.build_info.contract_crate.name,
+        );
         write_endpoint_content(file, endpoint_abi.name, endpoint_abi.inputs);
         write_end_of_function(file);
     }
@@ -95,25 +107,29 @@ where
     .unwrap();
 }
 
-fn write_constructor_header(file: &mut File, constructor_abi: EndpointAbi) {
-    write_fn_signature(file, constructor_abi.clone());
-    write_constructor_output(file, constructor_abi.outputs);
+fn write_constructor_header(file: &mut File, constructor_abi: EndpointAbi, proxy_crate: &str) {
+    write_fn_signature(file, constructor_abi.clone(), proxy_crate);
+    write_constructor_output(file, constructor_abi.outputs, proxy_crate);
 }
 
-fn write_upgrade_constructor_header(file: &mut File, upgrade_constructor_abi: EndpointAbi) {
-    write_fn_signature(file, upgrade_constructor_abi.clone());
-    write_upgrade_constructor_output(file, upgrade_constructor_abi.outputs);
+fn write_upgrade_constructor_header(
+    file: &mut File,
+    upgrade_constructor_abi: EndpointAbi,
+    proxy_crate: &str,
+) {
+    write_fn_signature(file, upgrade_constructor_abi.clone(), proxy_crate);
+    write_upgrade_constructor_output(file, upgrade_constructor_abi.outputs, proxy_crate);
 }
 
-fn write_endpoint_header(file: &mut File, constructor_abi: EndpointAbi) {
-    write_fn_signature(file, constructor_abi.clone());
-    write_endpoint_output(file, constructor_abi.outputs);
+fn write_endpoint_header(file: &mut File, constructor_abi: EndpointAbi, proxy_crate: &str) {
+    write_fn_signature(file, constructor_abi.clone(), proxy_crate);
+    write_endpoint_output(file, constructor_abi.outputs, proxy_crate);
 }
 
-fn write_fn_signature(file: &mut File, endpoint_abi: EndpointAbi) {
+fn write_fn_signature(file: &mut File, endpoint_abi: EndpointAbi, proxy_crate: &str) {
     write_endpoint_docs(file, endpoint_abi.docs);
     write_function_header_endpoint(file, endpoint_abi.rust_method_name);
-    write_args(file, endpoint_abi.inputs.clone());
+    write_args(file, endpoint_abi.inputs.clone(), proxy_crate);
     write_parameters(file, endpoint_abi.inputs);
 }
 
@@ -126,26 +142,26 @@ fn write_parameters(file: &mut File, inputs: Vec<InputAbi>) {
     write!(file, "    ) ").unwrap();
 }
 
-fn write_constructor_output(file: &mut File, outputs: Vec<OutputAbi>) {
+fn write_constructor_output(file: &mut File, outputs: Vec<OutputAbi>, proxy_crate: &str) {
     write!(file, "-> TxProxyDeploy<Env, From, Gas, ").unwrap();
 
-    parse_and_write_outputs(file, outputs);
+    parse_and_write_outputs(file, outputs, proxy_crate);
 
     writeln!(file, "> {{").unwrap();
 }
 
-fn write_upgrade_constructor_output(file: &mut File, outputs: Vec<OutputAbi>) {
+fn write_upgrade_constructor_output(file: &mut File, outputs: Vec<OutputAbi>, proxy_crate: &str) {
     write!(file, "-> TxProxyUpgrade<Env, From, To, Gas, ").unwrap();
 
-    parse_and_write_outputs(file, outputs);
+    parse_and_write_outputs(file, outputs, proxy_crate);
 
     writeln!(file, "> {{").unwrap();
 }
 
-fn write_endpoint_output(file: &mut File, outputs: Vec<OutputAbi>) {
+fn write_endpoint_output(file: &mut File, outputs: Vec<OutputAbi>, proxy_crate: &str) {
     write!(file, "-> TxProxyCall<Env, From, To, Gas, ").unwrap();
 
-    parse_and_write_outputs(file, outputs);
+    parse_and_write_outputs(file, outputs, proxy_crate);
 
     writeln!(file, "> {{").unwrap();
 }
@@ -203,7 +219,7 @@ fn write_endpoint_docs(file: &mut File, docs: Vec<String>) {
     }
 }
 
-fn write_args(file: &mut File, inputs: Vec<InputAbi>) {
+fn write_args(file: &mut File, inputs: Vec<InputAbi>, proxy_crate: &str) {
     if inputs.is_empty() {
         return;
     }
@@ -211,14 +227,14 @@ fn write_args(file: &mut File, inputs: Vec<InputAbi>) {
     writeln!(file, "<").unwrap();
 
     for (index, input) in inputs.iter().enumerate() {
-        write_argument(file, index, &input.type_names.rust);
+        write_argument(file, index, &input.type_names.rust, proxy_crate);
     }
 
     write!(file, "    >").unwrap();
 }
 
-fn write_argument(file: &mut File, index: usize, rust_name: &str) {
-    let adjusted = adjust_type_name(rust_name);
+fn write_argument(file: &mut File, index: usize, rust_name: &str, proxy_crate: &str) {
+    let adjusted = adjust_type_name(rust_name, proxy_crate);
     writeln!(file, "        Arg{index}: CodecInto<{adjusted}>,").unwrap();
 }
 
@@ -226,20 +242,22 @@ fn write_end_of_function(file: &mut File) {
     writeln!(file, "    }}").unwrap();
 }
 
-fn adjust_type_name(original_rust_name: &str) -> String {
-    original_rust_name
-        .replace("multiversx_sc::api::uncallable::UncallableApi", "Env::Api")
-        .replace("$API", "Env::Api")
-        .to_string()
+pub fn adjust_type_name(original_rust_name: &str, proxy_crate: &str) -> String {
+    clean_paths(
+        proxy_crate,
+        &original_rust_name
+            .replace("multiversx_sc::api::uncallable::UncallableApi", "Env::Api")
+            .replace("$API", "Env::Api"),
+    )
 }
 
-fn parse_and_write_outputs(file: &mut File, outputs: Vec<OutputAbi>) {
+fn parse_and_write_outputs(file: &mut File, outputs: Vec<OutputAbi>, proxy_crate: &str) {
     match outputs.len() {
         0 => {
             write!(file, "()").unwrap();
         },
         1 => {
-            let adjusted = adjust_type_name(&outputs[0].type_names.rust);
+            let adjusted = adjust_type_name(&outputs[0].type_names.rust, proxy_crate);
             write!(file, "{adjusted}").unwrap();
         },
         _ => {
@@ -248,7 +266,7 @@ fn parse_and_write_outputs(file: &mut File, outputs: Vec<OutputAbi>) {
                 if i > 0 {
                     write!(file, ", ").unwrap();
                 }
-                let adjusted = adjust_type_name(&output.type_names.rust);
+                let adjusted = adjust_type_name(&output.type_names.rust, proxy_crate);
                 write!(file, "{adjusted}").unwrap();
             }
             write!(file, ">").unwrap();

From 2c455bf9027b19df39a9205984b3fc1ef7daa6de Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Thu, 28 Mar 2024 14:43:51 +0200
Subject: [PATCH 0586/1254] proxy gen - cleanup

---
 .../generate_proxy/proxy_gen_struct_enum.rs   | 65 +++++++++----------
 1 file changed, 31 insertions(+), 34 deletions(-)

diff --git a/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_struct_enum.rs b/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_struct_enum.rs
index 0d07cb4985..7b32115081 100644
--- a/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_struct_enum.rs
+++ b/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_struct_enum.rs
@@ -5,10 +5,7 @@ use multiversx_sc::abi::{
     TypeDescriptionContainerImpl,
 };
 
-use crate::cmd::contract::generate_proxy::proxy_sc_functions_gen::adjust_type_name;
-
 const ZERO: &str = "0";
-const UNCALLABLE_API: &str = "multiversx_sc::api::uncallable::UncallableApi";
 
 /// Types defined in the framework don't need to be generated again in the proxy.
 const TYPES_FROM_FRAMEWORK: &[&str] = &[
@@ -28,20 +25,12 @@ pub(crate) fn write_types(
     proxy_crate: &str,
 ) {
     for (_, type_description) in &types.0 {
-        let type_rust_name = type_description.names.rust.replace(UNCALLABLE_API, "Api");
-        let type_name = type_rust_name.split("::").last().unwrap();
-
-        println!(
-            "1. inital {} | 2. altered {}",
-            type_description.names.rust,
-            adjust_type_name(&type_description.names.rust, proxy_crate)
-        );
-
-        if TYPES_FROM_FRAMEWORK.contains(&type_name) {
+        if proxy_crate != extract_struct_crate(type_description.names.rust.as_str()) {
             continue;
         }
 
-        if proxy_crate != extract_struct_crate(type_description.names.rust.as_str()) {
+        let type_name = adjust_type_name(&type_description.names.rust, proxy_crate);
+        if TYPES_FROM_FRAMEWORK.contains(&type_name.as_str()) {
             continue;
         }
 
@@ -50,14 +39,14 @@ pub(crate) fn write_types(
                 file,
                 enum_variants,
                 type_description,
-                type_name,
+                &type_name,
                 proxy_crate,
             ),
             TypeContents::Struct(struct_fields) => write_struct(
                 file,
                 struct_fields,
                 type_description,
-                type_name,
+                &type_name,
                 proxy_crate,
             ),
             TypeContents::NotSpecified => {},
@@ -73,7 +62,6 @@ fn start_write_type(
     name: &str,
 ) {
     writeln!(file).unwrap();
-    // let type_name = name.replace("multiversx_sc::api::uncallable::UncallableApi", "Api");
     write_macro_attributes(file, &type_description.macro_attributes);
     write!(file, r#"pub {type_type} {name}"#).unwrap();
 
@@ -102,18 +90,13 @@ fn write_struct(
     start_write_type(file, "struct", type_description, name);
 
     for field in struct_fields {
-        let field_rust_type = field.field_type.rust.replace("$API", "Api");
-        if proxy_crate != extract_struct_crate(type_description.names.rust.as_str()) {
-            writeln!(file, "    pub {}: {},", field.name, field_rust_type).unwrap()
-        } else {
-            writeln!(
-                file,
-                "    pub {}: {},",
-                field.name,
-                clean_paths(proxy_crate, &field_rust_type)
-            )
-            .unwrap();
-        }
+        writeln!(
+            file,
+            "    pub {}: {},",
+            field.name,
+            adjust_type_name(&field.field_type.rust, proxy_crate)
+        )
+        .unwrap();
     }
 
     writeln!(file, "}}").unwrap();
@@ -160,7 +143,7 @@ fn write_struct_in_variant(file: &mut File, fields: &[StructFieldDescription], p
             file,
             "        {}: {},",
             field.name,
-            adjust_type_name(&field.field_type.rust.replace("$API", "Api"), proxy_crate)
+            adjust_type_name(&field.field_type.rust, proxy_crate)
         )
         .unwrap();
     }
@@ -170,13 +153,18 @@ fn write_struct_in_variant(file: &mut File, fields: &[StructFieldDescription], p
 
 fn write_tuple_in_variant(file: &mut File, fields: &[StructFieldDescription], proxy_crate: &str) {
     write!(file, "(").unwrap();
-    write!(file, "{}", fields[0].field_type.rust.replace("$API", "Api")).unwrap();
+    write!(
+        file,
+        "{}",
+        adjust_type_name(&fields[0].field_type.rust, proxy_crate)
+    )
+    .unwrap();
 
     for field in &fields[1..] {
         write!(
             file,
             ", {}",
-            adjust_type_name(&field.field_type.rust.replace("$API", "Api"), proxy_crate)
+            adjust_type_name(&field.field_type.rust, proxy_crate)
         )
         .unwrap();
     }
@@ -187,7 +175,7 @@ fn write_tuple_in_variant(file: &mut File, fields: &[StructFieldDescription], pr
 fn extract_struct_crate(struct_path: &str) -> String {
     let struct_crate_name = struct_path
         .replace('_', "-")
-        .replace(UNCALLABLE_API, "Api")
+        .replace("multiversx_sc::api::uncallable::UncallableApi", "Api")
         .to_string();
     let crate_name = struct_crate_name
         .split("::")
@@ -202,10 +190,10 @@ pub(crate) fn clean_paths(proxy_crate: &str, rust_type: &str) -> String {
         .split(|c| delimiters.contains(c))
         .filter(|s| !s.is_empty())
         .collect();
+
     let mut words_replacer: Vec<String> = Vec::new();
     for word in &words {
         let type_rust_name = word.split("::").last().unwrap().to_string();
-        // println!("###### {}", type_rust_name);
         if proxy_crate == extract_struct_crate(word)
             || TYPES_FROM_FRAMEWORK.contains(&type_rust_name.as_str())
         {
@@ -225,3 +213,12 @@ pub(crate) fn clean_paths(proxy_crate: &str, rust_type: &str) -> String {
 
     rust_type_with_cleaned_path
 }
+
+pub fn adjust_type_name(original_rust_name: &str, proxy_crate: &str) -> String {
+    clean_paths(
+        proxy_crate,
+        &original_rust_name
+            .replace("multiversx_sc::api::uncallable::UncallableApi", "Api")
+            .replace("$API", "Api"),
+    )
+}

From f5c4a4d239b09277b85a1a1aebf79a7e99716e95 Mon Sep 17 00:00:00 2001
From: Alin Cruceat <alyn_509@yahoo.com>
Date: Thu, 28 Mar 2024 15:03:28 +0200
Subject: [PATCH 0587/1254] fix after review

---
 .../exchange-features/src/exchange_features.rs      | 13 ++++---------
 .../tests/exchange_features_blackbox_test.rs        |  2 +-
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/contracts/feature-tests/exchange-features/src/exchange_features.rs b/contracts/feature-tests/exchange-features/src/exchange_features.rs
index 430e33840b..fd048e72c8 100644
--- a/contracts/feature-tests/exchange-features/src/exchange_features.rs
+++ b/contracts/feature-tests/exchange-features/src/exchange_features.rs
@@ -3,8 +3,6 @@
 multiversx_sc::imports!();
 multiversx_sc::derive_imports!();
 
-pub const FULL_VALUE_SUPPLY: u64 = 16;
-
 #[derive(
     ManagedVecItem,
     TopEncode,
@@ -26,17 +24,14 @@ impl<M: ManagedTypeApi> FixedSupplyToken<M> for TokenAttributes<M> {
     }
 
     fn into_part(self, payment_amount: &BigUint<M>) -> Self {
-        let new_amount =
-            self.rule_of_three_non_zero_result(payment_amount, &BigUint::from(FULL_VALUE_SUPPLY));
-        TokenAttributes {
-            amount: new_amount.clone(),
-        }
+        let new_amount = self.rule_of_three_non_zero_result(payment_amount, &self.amount);
+        TokenAttributes { amount: new_amount }
     }
 }
 impl<M: ManagedTypeApi> Mergeable<M> for TokenAttributes<M> {
     #[inline]
-    fn can_merge_with(&self, other: &Self) -> bool {
-        other.amount > 0u64
+    fn can_merge_with(&self, _other: &Self) -> bool {
+        true
     }
 
     fn merge_with(&mut self, other: Self) {
diff --git a/contracts/feature-tests/exchange-features/tests/exchange_features_blackbox_test.rs b/contracts/feature-tests/exchange-features/tests/exchange_features_blackbox_test.rs
index 82bca1794b..6ea73fb3a6 100644
--- a/contracts/feature-tests/exchange-features/tests/exchange_features_blackbox_test.rs
+++ b/contracts/feature-tests/exchange-features/tests/exchange_features_blackbox_test.rs
@@ -78,6 +78,6 @@ fn exchange_features_blackbox_raw() {
                 .from("address:owner")
                 .to("sc:exchange-features")
                 .function("get_supply")
-                .expect(TxExpect::ok().result("6")),
+                .expect(TxExpect::ok().result("3")),
         );
 }

From c4ae9765d3751deb4ac97d7162f8fdd88458edc8 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Thu, 28 Mar 2024 14:09:39 +0100
Subject: [PATCH 0588/1254] fix after review

---
 .../promises-features/src/call_promises.rs        |  2 --
 .../promises-features/src/call_sync_bt.rs         | 15 +++++++++------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/contracts/feature-tests/composability/promises-features/src/call_promises.rs b/contracts/feature-tests/composability/promises-features/src/call_promises.rs
index 6f2dc17287..2b116215cc 100644
--- a/contracts/feature-tests/composability/promises-features/src/call_promises.rs
+++ b/contracts/feature-tests/composability/promises-features/src/call_promises.rs
@@ -19,7 +19,6 @@ pub trait CallPromisesModule: common::CommonModule {
             .accept_funds()
             .with_gas_limit(gas_limit)
             .with_egld_or_single_esdt_transfer(payment)
-            .async_call()
             .register_promise();
     }
 
@@ -38,7 +37,6 @@ pub trait CallPromisesModule: common::CommonModule {
             .typed(vault_proxy::VaultProxy)
             .retrieve_funds(token, token_nonce, amount)
             .with_gas_limit(gas_limit)
-            .async_call()
             .with_callback(self.callbacks().retrieve_funds_callback())
             .with_extra_gas_for_callback(10_000_000)
             .register_promise();
diff --git a/contracts/feature-tests/composability/promises-features/src/call_sync_bt.rs b/contracts/feature-tests/composability/promises-features/src/call_sync_bt.rs
index 1d228d30cd..d31ac022dc 100644
--- a/contracts/feature-tests/composability/promises-features/src/call_sync_bt.rs
+++ b/contracts/feature-tests/composability/promises-features/src/call_sync_bt.rs
@@ -13,12 +13,13 @@ pub trait BackTransfersFeatureModule {
         token_nonce: u64,
         amount: BigUint,
     ) {
-        let ((), back_transfers) = self
+        let back_transfers = self
             .tx()
             .to(&to)
             .typed(vault_proxy::VaultProxy)
             .retrieve_funds(token, token_nonce, amount)
-            .execute_on_dest_context_with_back_transfers::<()>();
+            .returns(ReturnsBackTransfers)
+            .sync_call();
 
         require!(
             back_transfers.esdt_payments.len() == 1 || back_transfers.total_egld_amount != 0,
@@ -39,12 +40,13 @@ pub trait BackTransfersFeatureModule {
         token_nonce: u64,
         amount: BigUint,
     ) {
-        let ((), back_transfers) = self
+        let back_transfers = self
             .tx()
             .to(&to)
             .typed(vault_proxy::VaultProxy)
             .retrieve_funds(token.clone(), token_nonce, amount.clone())
-            .execute_on_dest_context_with_back_transfers::<()>();
+            .returns(ReturnsBackTransfers)
+            .sync_call();
 
         require!(
             back_transfers.esdt_payments.len() == 1 || back_transfers.total_egld_amount != 0,
@@ -56,12 +58,13 @@ pub trait BackTransfersFeatureModule {
             &back_transfers.esdt_payments.into_multi_value(),
         );
 
-        let ((), back_transfers) = self
+        let back_transfers = self
             .tx()
             .to(&to)
             .typed(vault_proxy::VaultProxy)
             .retrieve_funds(token, token_nonce, amount)
-            .execute_on_dest_context_with_back_transfers::<()>();
+            .returns(ReturnsBackTransfers)
+            .sync_call();
 
         require!(
             back_transfers.esdt_payments.len() == 1 || back_transfers.total_egld_amount != 0,

From ccaa7abaf4c26224af9a15c7aceb08aafe4d6018 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Thu, 28 Mar 2024 15:09:51 +0100
Subject: [PATCH 0589/1254] proxy test first new proxy and migration to unified

---
 .../proxy-test-first/src/message_me_proxy.rs  | 107 ++++++++++++++++++
 .../proxy-test-first/src/pay_me_proxy.rs      | 107 ++++++++++++++++++
 .../proxy-test-first/src/proxy-test-first.rs  |  87 ++++++--------
 3 files changed, 251 insertions(+), 50 deletions(-)
 create mode 100644 contracts/feature-tests/composability/proxy-test-first/src/message_me_proxy.rs
 create mode 100644 contracts/feature-tests/composability/proxy-test-first/src/pay_me_proxy.rs

diff --git a/contracts/feature-tests/composability/proxy-test-first/src/message_me_proxy.rs b/contracts/feature-tests/composability/proxy-test-first/src/message_me_proxy.rs
new file mode 100644
index 0000000000..ea01aa79d5
--- /dev/null
+++ b/contracts/feature-tests/composability/proxy-test-first/src/message_me_proxy.rs
@@ -0,0 +1,107 @@
+// Code generated by the multiversx-sc proxy generator. DO NOT EDIT.
+
+////////////////////////////////////////////////////
+////////////////// AUTO-GENERATED //////////////////
+////////////////////////////////////////////////////
+
+#![allow(dead_code)]
+#![allow(clippy::all)]
+
+use multiversx_sc::proxy_imports::*;
+
+pub struct MessageMeProxy;
+
+impl<Env, From, To, Gas> TxProxyTrait<Env, From, To, Gas> for MessageMeProxy
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    type TxProxyMethods = MessageMeProxyMethods<Env, From, To, Gas>;
+
+    fn proxy_methods(self, tx: Tx<Env, From, To, (), Gas, (), ()>) -> Self::TxProxyMethods {
+        MessageMeProxyMethods { wrapped_tx: tx }
+    }
+}
+
+pub struct MessageMeProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    wrapped_tx: Tx<Env, From, To, (), Gas, (), ()>,
+}
+
+#[rustfmt::skip]
+impl<Env, From, Gas> MessageMeProxyMethods<Env, From, (), Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn init<
+        Arg0: CodecInto<i32>,
+    >(
+        self,
+        init_arg: Arg0,
+    ) -> TxProxyDeploy<Env, From, Gas, i32> {
+        self.wrapped_tx
+            .raw_deploy()
+            .argument(&init_arg)
+            .original_result()
+    }
+}
+
+#[rustfmt::skip]
+impl<Env, From, To, Gas> MessageMeProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn upgrade(
+        self,
+    ) -> TxProxyUpgrade<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_upgrade()
+            .original_result()
+    }
+}
+
+#[rustfmt::skip]
+impl<Env, From, To, Gas> MessageMeProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn message_me<
+        Arg0: CodecInto<i64>,
+        Arg1: CodecInto<BigUint<Env::Api>>,
+        Arg2: CodecInto<Vec<u8>>,
+        Arg3: CodecInto<ManagedAddress<Env::Api>>,
+    >(
+        self,
+        arg1: Arg0,
+        arg2: Arg1,
+        arg3: Arg2,
+        arg4: Arg3,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("messageMe")
+            .argument(&arg1)
+            .argument(&arg2)
+            .argument(&arg3)
+            .argument(&arg4)
+            .original_result()
+    }
+}
diff --git a/contracts/feature-tests/composability/proxy-test-first/src/pay_me_proxy.rs b/contracts/feature-tests/composability/proxy-test-first/src/pay_me_proxy.rs
new file mode 100644
index 0000000000..8cf9369cf9
--- /dev/null
+++ b/contracts/feature-tests/composability/proxy-test-first/src/pay_me_proxy.rs
@@ -0,0 +1,107 @@
+// Code generated by the multiversx-sc proxy generator. DO NOT EDIT.
+
+////////////////////////////////////////////////////
+////////////////// AUTO-GENERATED //////////////////
+////////////////////////////////////////////////////
+
+#![allow(dead_code)]
+#![allow(clippy::all)]
+
+use multiversx_sc::proxy_imports::*;
+
+pub struct PayMeProxy;
+
+impl<Env, From, To, Gas> TxProxyTrait<Env, From, To, Gas> for PayMeProxy
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    type TxProxyMethods = PayMeProxyMethods<Env, From, To, Gas>;
+
+    fn proxy_methods(self, tx: Tx<Env, From, To, (), Gas, (), ()>) -> Self::TxProxyMethods {
+        PayMeProxyMethods { wrapped_tx: tx }
+    }
+}
+
+pub struct PayMeProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    wrapped_tx: Tx<Env, From, To, (), Gas, (), ()>,
+}
+
+#[rustfmt::skip]
+impl<Env, From, Gas> PayMeProxyMethods<Env, From, (), Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn init(
+        self,
+    ) -> TxProxyDeploy<Env, From, Gas, ()> {
+        self.wrapped_tx
+            .raw_deploy()
+            .original_result()
+    }
+}
+
+#[rustfmt::skip]
+impl<Env, From, To, Gas> PayMeProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn upgrade(
+        self,
+    ) -> TxProxyUpgrade<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_upgrade()
+            .original_result()
+    }
+}
+
+#[rustfmt::skip]
+impl<Env, From, To, Gas> PayMeProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn pay_me<
+        Arg0: CodecInto<i64>,
+    >(
+        self,
+        arg1: Arg0,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("payMe")
+            .argument(&arg1)
+            .original_result()
+    }
+
+    pub fn pay_me_with_result<
+        Arg0: CodecInto<i64>,
+    >(
+        self,
+        arg1: Arg0,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("payMeWithResult")
+            .argument(&arg1)
+            .original_result()
+    }
+}
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 26cc9eb679..b3ddbf6d5e 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
@@ -4,46 +4,14 @@ multiversx_sc::imports!();
 
 use hex_literal::hex;
 
+pub mod message_me_proxy;
+pub mod pay_me_proxy;
+
 static HARDCODED_ADDRESS: [u8; 32] =
     hex!("fefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefe");
 
-mod pay_me_proxy {
-    multiversx_sc::imports!();
-
-    #[multiversx_sc::proxy]
-    pub trait PayMe {
-        #[payable("EGLD")]
-        #[endpoint(payMe)]
-        fn pay_me(&self, arg1: i64);
-
-        #[payable("EGLD")]
-        #[endpoint(payMeWithResult)]
-        fn pay_me_with_result(&self, arg1: i64);
-    }
-}
-
-mod message_me_proxy {
-    multiversx_sc::imports!();
-
-    #[multiversx_sc::proxy]
-    pub trait MessageMe {
-        #[init]
-        #[payable("EGLD")]
-        fn init(&self, init_arg: i32) -> i32;
-
-        #[endpoint(messageMe)]
-        fn message_me(&self, arg1: i64, arg2: &BigUint, arg3: Vec<u8>, arg4: &ManagedAddress);
-    }
-}
-
 #[multiversx_sc::contract]
 pub trait ProxyTestFirst {
-    #[proxy]
-    fn pay_me_proxy(&self) -> pay_me_proxy::Proxy<Self::Api>;
-
-    #[proxy]
-    fn message_me_proxy(&self) -> message_me_proxy::Proxy<Self::Api>;
-
     #[storage_get("other_contract")]
     fn get_other_contract(&self) -> ManagedAddress;
 
@@ -62,11 +30,26 @@ pub trait ProxyTestFirst {
     #[endpoint(deploySecondContract)]
     fn deploy_second_contract(&self, code: ManagedBuffer) -> i32 {
         let payment = self.call_value().egld_value();
+        // let (address, init_result) = self
+        //     .tx()
+        //     .egld(payment)
+        //     .raw_deploy()
+        //     .code(code)
+        //     .code_metadata(CodeMetadata::UPGRADEABLE)
+        //     .argument(&123)
+        //     .returns(ReturnsNewAddress)
+        //     .returns(ReturnsResult)
+        //     .sync_call();
+
         let (address, init_result) = self
-            .message_me_proxy()
+            .tx()
+            .typed(message_me_proxy::MessageMeProxy)
             .init(123)
-            .with_egld_transfer(payment.clone_value())
-            .deploy_contract::<i32>(&code, CodeMetadata::UPGRADEABLE);
+            .returns(ReturnsNewAddress)
+            .returns(ReturnsResult)
+            .egld(payment)
+            .sync_call();
+
         self.set_other_contract(&address);
         init_result + 1
     }
@@ -90,12 +73,13 @@ pub trait ProxyTestFirst {
     fn forward_to_other_contract(&self) {
         let payment = self.call_value().egld_value();
         let other_contract = self.get_other_contract();
-        self.pay_me_proxy()
-            .contract(other_contract)
+        self.tx()
+            .to(&other_contract)
+            .typed(pay_me_proxy::PayMeProxy)
             .pay_me(0x56)
-            .with_egld_transfer(payment.clone_value())
+            .egld(payment)
             .async_call()
-            .call_and_exit()
+            .call_and_exit();
     }
 
     #[payable("EGLD")]
@@ -103,20 +87,22 @@ pub trait ProxyTestFirst {
     fn forward_to_other_contract_with_callback(&self) {
         let payment = self.call_value().egld_value();
         let other_contract = self.get_other_contract();
-        self.pay_me_proxy()
-            .contract(other_contract)
+        self.tx()
+            .to(&other_contract)
+            .typed(pay_me_proxy::PayMeProxy)
             .pay_me_with_result(0x56)
-            .with_egld_transfer(payment.clone_value())
+            .egld(payment)
             .async_call()
             .with_callback(self.callbacks().pay_callback())
-            .call_and_exit()
+            .call_and_exit();
     }
 
     #[endpoint(messageOtherContract)]
     fn message_other_contract(&self) {
         let other_contract = self.get_other_contract();
-        self.message_me_proxy()
-            .contract(other_contract)
+        self.tx()
+            .to(&other_contract)
+            .typed(message_me_proxy::MessageMeProxy)
             .message_me(
                 0x01,
                 &BigUint::from(2u32),
@@ -130,8 +116,9 @@ pub trait ProxyTestFirst {
     #[endpoint(messageOtherContractWithCallback)]
     fn message_other_contract_with_callback(&self) {
         let other_contract = self.get_other_contract();
-        self.message_me_proxy()
-            .contract(other_contract)
+        self.tx()
+            .to(&other_contract)
+            .typed(message_me_proxy::MessageMeProxy)
             .message_me(
                 0x01,
                 &BigUint::from(2u32),

From 956112d586813c3fcb38a56b72a991dc6e6d2e63 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 28 Mar 2024 16:29:50 +0200
Subject: [PATCH 0590/1254] unified syntax - reorg legacy types & tx sc
 execution

---
 .../types/interaction/contract_call_legacy.rs | 15 ++++++++
 .../contract_call_convert.rs                  |  0
 .../contract_call_exec.rs                     | 33 +++-------------
 .../contract_call_no_payment.rs               | 10 ++---
 .../contract_call_trait.rs                    |  8 ++--
 .../contract_call_with_any_payment.rs         |  0
 .../contract_call_with_egld.rs                |  0
 .../contract_call_with_egld_or_single_esdt.rs |  0
 .../contract_call_with_multi_esdt.rs          |  0
 .../src/types/interaction/contract_deploy.rs  |  2 +-
 framework/base/src/types/interaction/mod.rs   | 31 ++-------------
 framework/base/src/types/interaction/tx.rs    | 13 +++----
 .../base/src/types/interaction/tx_exec.rs     | 38 +++++++++++++++++++
 .../interaction/{ => tx_exec}/tx_env_sc.rs    | 10 ++---
 .../tx_exec_async.rs}                         | 10 ++---
 .../tx_exec_async_promises.rs}                | 11 +++---
 .../tx_exec_deploy.rs}                        | 13 +++----
 .../tx_exec_sync.rs}                          | 12 +++---
 .../{tx_call_te.rs => tx_exec/tx_exec_te.rs}  |  2 +-
 .../tx_exec_upgrade.rs}                       | 12 +++---
 .../tx_result_handler/returns_result.rs       |  4 +-
 .../tx_result_handler/returns_result_conv.rs  |  4 +-
 .../tx_result_handler/with_result.rs          |  4 +-
 .../tx_result_handler/with_result_conv.rs     |  4 +-
 24 files changed, 117 insertions(+), 119 deletions(-)
 create mode 100644 framework/base/src/types/interaction/contract_call_legacy.rs
 rename framework/base/src/types/interaction/{ => contract_call_legacy}/contract_call_convert.rs (100%)
 rename framework/base/src/types/interaction/{ => contract_call_legacy}/contract_call_exec.rs (86%)
 rename framework/base/src/types/interaction/{ => contract_call_legacy}/contract_call_no_payment.rs (95%)
 rename framework/base/src/types/interaction/{ => contract_call_legacy}/contract_call_trait.rs (95%)
 rename framework/base/src/types/interaction/{ => contract_call_legacy}/contract_call_with_any_payment.rs (100%)
 rename framework/base/src/types/interaction/{ => contract_call_legacy}/contract_call_with_egld.rs (100%)
 rename framework/base/src/types/interaction/{ => contract_call_legacy}/contract_call_with_egld_or_single_esdt.rs (100%)
 rename framework/base/src/types/interaction/{ => contract_call_legacy}/contract_call_with_multi_esdt.rs (100%)
 create mode 100644 framework/base/src/types/interaction/tx_exec.rs
 rename framework/base/src/types/interaction/{ => tx_exec}/tx_env_sc.rs (86%)
 rename framework/base/src/types/interaction/{tx_call_async.rs => tx_exec/tx_exec_async.rs} (95%)
 rename framework/base/src/types/interaction/{tx_call_async_promises.rs => tx_exec/tx_exec_async_promises.rs} (94%)
 rename framework/base/src/types/interaction/{tx_call_deploy.rs => tx_exec/tx_exec_deploy.rs} (94%)
 rename framework/base/src/types/interaction/{tx_call_sync.rs => tx_exec/tx_exec_sync.rs} (91%)
 rename framework/base/src/types/interaction/{tx_call_te.rs => tx_exec/tx_exec_te.rs} (98%)
 rename framework/base/src/types/interaction/{tx_call_upgrade.rs => tx_exec/tx_exec_upgrade.rs} (93%)

diff --git a/framework/base/src/types/interaction/contract_call_legacy.rs b/framework/base/src/types/interaction/contract_call_legacy.rs
new file mode 100644
index 0000000000..d5ae5e04ed
--- /dev/null
+++ b/framework/base/src/types/interaction/contract_call_legacy.rs
@@ -0,0 +1,15 @@
+mod contract_call_convert;
+mod contract_call_exec;
+mod contract_call_no_payment;
+mod contract_call_trait;
+mod contract_call_with_any_payment;
+mod contract_call_with_egld;
+mod contract_call_with_egld_or_single_esdt;
+mod contract_call_with_multi_esdt;
+
+pub use contract_call_no_payment::ContractCallNoPayment;
+pub use contract_call_trait::{ContractCall, ContractCallBase};
+pub use contract_call_with_any_payment::ContractCallWithAnyPayment;
+pub use contract_call_with_egld::ContractCallWithEgld;
+pub use contract_call_with_egld_or_single_esdt::ContractCallWithEgldOrSingleEsdt;
+pub use contract_call_with_multi_esdt::ContractCallWithMultiEsdt;
diff --git a/framework/base/src/types/interaction/contract_call_convert.rs b/framework/base/src/types/interaction/contract_call_legacy/contract_call_convert.rs
similarity index 100%
rename from framework/base/src/types/interaction/contract_call_convert.rs
rename to framework/base/src/types/interaction/contract_call_legacy/contract_call_convert.rs
diff --git a/framework/base/src/types/interaction/contract_call_exec.rs b/framework/base/src/types/interaction/contract_call_legacy/contract_call_exec.rs
similarity index 86%
rename from framework/base/src/types/interaction/contract_call_exec.rs
rename to framework/base/src/types/interaction/contract_call_legacy/contract_call_exec.rs
index 29a1a0587c..d33083d2bb 100644
--- a/framework/base/src/types/interaction/contract_call_exec.rs
+++ b/framework/base/src/types/interaction/contract_call_legacy/contract_call_exec.rs
@@ -1,20 +1,16 @@
 use crate::{
-    api::{use_raw_handle, StaticVarApiImpl, StorageWriteApi},
+    api::{use_raw_handle, BlockchainApiImpl, CallTypeApi, StaticVarApiImpl, StorageWriteApi},
     codec::TopDecodeMulti,
-};
-
-use crate::{
-    api::{BlockchainApiImpl, CallTypeApi},
     contract_base::SendRawWrapper,
     formatter::SCLowerHex,
     io::{ArgErrorHandler, ArgId, ManagedResultArgLoader},
     types::{
-        BigUint, EsdtTokenPayment, ManagedBuffer, ManagedBufferCachedBuilder, ManagedType,
-        ManagedVec,
+        decode_result, AsyncCall, AsyncCallPromises, BigUint, EsdtTokenPayment, ManagedBuffer,
+        ManagedBufferCachedBuilder, ManagedType, ManagedVec, Tx, TRANSFER_EXECUTE_DEFAULT_LEFTOVER,
     },
 };
 
-use super::{AsyncCall, ContractCallNoPayment, ContractCallWithEgld, Tx};
+use super::{ContractCallNoPayment, ContractCallWithEgld};
 use crate::api::managed_types::handles::HandleConstraints;
 
 /// Using max u64 to represent maximum possible gas,
@@ -22,9 +18,6 @@ use crate::api::managed_types::handles::HandleConstraints;
 /// Leaving the gas limit unspecified will replace it with `api.get_gas_left()`.
 pub(super) const UNSPECIFIED_GAS_LIMIT: u64 = u64::MAX;
 
-/// In case of `transfer_execute`, we leave by default a little gas for the calling transaction to finish.
-pub(super) const TRANSFER_EXECUTE_DEFAULT_LEFTOVER: u64 = 100_000;
-
 impl<SA, OriginalResult> ContractCallWithEgld<SA, OriginalResult>
 where
     SA: CallTypeApi + 'static,
@@ -83,8 +76,8 @@ impl<SA, OriginalResult> ContractCallWithEgld<SA, OriginalResult>
 where
     SA: CallTypeApi + 'static,
 {
-    pub(super) fn build_async_call_promise(self) -> super::AsyncCallPromises<SA> {
-        super::AsyncCallPromises {
+    pub(super) fn build_async_call_promise(self) -> AsyncCallPromises<SA> {
+        AsyncCallPromises {
             to: self.basic.to,
             egld_payment: self.egld_payment,
             function_call: self.basic.function_call,
@@ -224,17 +217,3 @@ where
         }
     }
 }
-
-pub(super) fn decode_result<SA, RequestedResult>(
-    raw_result: ManagedVec<SA, ManagedBuffer<SA>>,
-) -> RequestedResult
-where
-    SA: CallTypeApi + 'static,
-    RequestedResult: TopDecodeMulti,
-{
-    let mut loader = ManagedResultArgLoader::new(raw_result);
-    let arg_id = ArgId::from(&b"sync result"[..]);
-    let h: ArgErrorHandler<SA> = ArgErrorHandler::<SA>::from(arg_id);
-    let Ok(result) = RequestedResult::multi_decode_or_handle_err(&mut loader, h);
-    result
-}
diff --git a/framework/base/src/types/interaction/contract_call_no_payment.rs b/framework/base/src/types/interaction/contract_call_legacy/contract_call_no_payment.rs
similarity index 95%
rename from framework/base/src/types/interaction/contract_call_no_payment.rs
rename to framework/base/src/types/interaction/contract_call_legacy/contract_call_no_payment.rs
index 75e03d9d07..2f39ff78f9 100644
--- a/framework/base/src/types/interaction/contract_call_no_payment.rs
+++ b/framework/base/src/types/interaction/contract_call_legacy/contract_call_no_payment.rs
@@ -6,7 +6,8 @@ use crate::{
     api::CallTypeApi,
     types::{
         BigUint, EgldOrEsdtTokenIdentifier, EgldOrEsdtTokenPayment, EgldOrMultiEsdtPayment,
-        EsdtTokenPayment, ManagedAddress, ManagedBuffer, ManagedVec, TokenIdentifier,
+        EsdtTokenPayment, FunctionCall, ManagedAddress, ManagedArgBuffer, ManagedBuffer,
+        ManagedVec, TokenIdentifier, Tx, TxScEnv,
     },
 };
 
@@ -14,8 +15,7 @@ use super::{
     contract_call_exec::UNSPECIFIED_GAS_LIMIT, contract_call_trait::ContractCallBase,
     contract_call_with_egld::ContractCallWithEgld,
     contract_call_with_multi_esdt::ContractCallWithMultiEsdt, ContractCall,
-    ContractCallWithAnyPayment, ContractCallWithEgldOrSingleEsdt, FunctionCall, ManagedArgBuffer,
-    Tx, TxScEnv,
+    ContractCallWithAnyPayment, ContractCallWithEgldOrSingleEsdt,
 };
 
 /// Holds metadata for calling another contract, without payments.
@@ -29,11 +29,11 @@ pub struct ContractCallNoPayment<SA, OriginalResult>
 where
     SA: CallTypeApi + 'static,
 {
-    pub(super) _phantom: PhantomData<SA>,
+    pub(crate) _phantom: PhantomData<SA>,
     pub to: ManagedAddress<SA>,
     pub function_call: FunctionCall<SA>,
     pub explicit_gas_limit: u64,
-    pub(super) _return_type: PhantomData<OriginalResult>,
+    pub(crate) _return_type: PhantomData<OriginalResult>,
 }
 
 impl<SA, OriginalResult> ContractCallBase<SA> for ContractCallNoPayment<SA, OriginalResult>
diff --git a/framework/base/src/types/interaction/contract_call_trait.rs b/framework/base/src/types/interaction/contract_call_legacy/contract_call_trait.rs
similarity index 95%
rename from framework/base/src/types/interaction/contract_call_trait.rs
rename to framework/base/src/types/interaction/contract_call_legacy/contract_call_trait.rs
index 3a3e034008..07b5b86868 100644
--- a/framework/base/src/types/interaction/contract_call_trait.rs
+++ b/framework/base/src/types/interaction/contract_call_legacy/contract_call_trait.rs
@@ -1,10 +1,10 @@
 use crate::{
     api::CallTypeApi,
     codec::{multi_types::IgnoreValue, TopDecodeMulti, TopEncodeMulti},
-    types::ManagedBuffer,
+    types::{AsyncCall, AsyncCallPromises, BackTransfers, ManagedArgBuffer, ManagedBuffer},
 };
 
-use super::{AsyncCall, ContractCallNoPayment, ContractCallWithEgld, ManagedArgBuffer};
+use super::{ContractCallNoPayment, ContractCallWithEgld};
 
 pub trait ContractCallBase<SA>
 where
@@ -85,7 +85,7 @@ where
 
     /// Converts to an async promise.
     #[inline]
-    fn async_call_promise(self) -> super::AsyncCallPromises<SA> {
+    fn async_call_promise(self) -> AsyncCallPromises<SA> {
         self.into_normalized().build_async_call_promise()
     }
 
@@ -104,7 +104,7 @@ where
     #[inline]
     fn execute_on_dest_context_with_back_transfers<RequestedResult>(
         self,
-    ) -> (RequestedResult, super::BackTransfers<SA>)
+    ) -> (RequestedResult, BackTransfers<SA>)
     where
         RequestedResult: TopDecodeMulti,
     {
diff --git a/framework/base/src/types/interaction/contract_call_with_any_payment.rs b/framework/base/src/types/interaction/contract_call_legacy/contract_call_with_any_payment.rs
similarity index 100%
rename from framework/base/src/types/interaction/contract_call_with_any_payment.rs
rename to framework/base/src/types/interaction/contract_call_legacy/contract_call_with_any_payment.rs
diff --git a/framework/base/src/types/interaction/contract_call_with_egld.rs b/framework/base/src/types/interaction/contract_call_legacy/contract_call_with_egld.rs
similarity index 100%
rename from framework/base/src/types/interaction/contract_call_with_egld.rs
rename to framework/base/src/types/interaction/contract_call_legacy/contract_call_with_egld.rs
diff --git a/framework/base/src/types/interaction/contract_call_with_egld_or_single_esdt.rs b/framework/base/src/types/interaction/contract_call_legacy/contract_call_with_egld_or_single_esdt.rs
similarity index 100%
rename from framework/base/src/types/interaction/contract_call_with_egld_or_single_esdt.rs
rename to framework/base/src/types/interaction/contract_call_legacy/contract_call_with_egld_or_single_esdt.rs
diff --git a/framework/base/src/types/interaction/contract_call_with_multi_esdt.rs b/framework/base/src/types/interaction/contract_call_legacy/contract_call_with_multi_esdt.rs
similarity index 100%
rename from framework/base/src/types/interaction/contract_call_with_multi_esdt.rs
rename to framework/base/src/types/interaction/contract_call_legacy/contract_call_with_multi_esdt.rs
diff --git a/framework/base/src/types/interaction/contract_deploy.rs b/framework/base/src/types/interaction/contract_deploy.rs
index 448d9f4684..1fbfa1f017 100644
--- a/framework/base/src/types/interaction/contract_deploy.rs
+++ b/framework/base/src/types/interaction/contract_deploy.rs
@@ -15,7 +15,7 @@ use super::ManagedArgBuffer;
 /// Using max u64 to represent maximum possible gas,
 /// so that the value zero is not reserved and can be specified explicitly.
 /// Leaving the gas limit unspecified will replace it with `api.get_gas_left()`.
-const UNSPECIFIED_GAS_LIMIT: u64 = u64::MAX;
+pub(crate) const UNSPECIFIED_GAS_LIMIT: u64 = u64::MAX;
 
 #[must_use]
 pub struct ContractDeploy<SA, OriginalResult>
diff --git a/framework/base/src/types/interaction/mod.rs b/framework/base/src/types/interaction/mod.rs
index ffe4cec68f..809bb0726c 100644
--- a/framework/base/src/types/interaction/mod.rs
+++ b/framework/base/src/types/interaction/mod.rs
@@ -6,14 +6,7 @@ mod async_call_promises;
 mod back_transfers;
 mod callback_closure;
 mod callback_selector_result;
-mod contract_call_convert;
-mod contract_call_exec;
-mod contract_call_no_payment;
-mod contract_call_trait;
-mod contract_call_with_any_payment;
-mod contract_call_with_egld;
-mod contract_call_with_egld_or_single_esdt;
-mod contract_call_with_multi_esdt;
+mod contract_call_legacy;
 mod contract_deploy;
 mod deploy_call;
 mod expr;
@@ -21,16 +14,10 @@ mod function_call;
 mod managed_arg_buffer;
 mod markers;
 mod tx;
-mod tx_call_async;
-mod tx_call_async_promises;
-mod tx_call_deploy;
-mod tx_call_sync;
-mod tx_call_te;
-mod tx_call_upgrade;
 mod tx_code_source;
 mod tx_data;
 mod tx_env;
-mod tx_env_sc;
+mod tx_exec;
 mod tx_from;
 mod tx_gas;
 mod tx_payment;
@@ -50,12 +37,7 @@ pub use callback_closure::{
     new_callback_call, CallbackClosure, CallbackClosureForDeser, CallbackClosureMatcher,
 };
 pub use callback_selector_result::CallbackSelectorResult;
-pub use contract_call_no_payment::ContractCallNoPayment;
-pub use contract_call_trait::{ContractCall, ContractCallBase};
-pub use contract_call_with_any_payment::ContractCallWithAnyPayment;
-pub use contract_call_with_egld::ContractCallWithEgld;
-pub use contract_call_with_egld_or_single_esdt::ContractCallWithEgldOrSingleEsdt;
-pub use contract_call_with_multi_esdt::ContractCallWithMultiEsdt;
+pub use contract_call_legacy::*;
 pub use contract_deploy::{new_contract_deploy, ContractDeploy};
 pub use deploy_call::*;
 pub use expr::*;
@@ -63,15 +45,10 @@ pub use function_call::FunctionCall;
 pub use managed_arg_buffer::ManagedArgBuffer;
 pub use markers::*;
 pub use tx::*;
-pub use tx_call_async::*;
-pub use tx_call_async_promises::*;
-pub use tx_call_deploy::*;
-pub use tx_call_sync::*;
-pub use tx_call_upgrade::*;
 pub use tx_code_source::*;
 pub use tx_data::*;
 pub use tx_env::*;
-pub use tx_env_sc::*;
+pub use tx_exec::*;
 pub use tx_from::*;
 pub use tx_gas::*;
 pub use tx_payment::*;
diff --git a/framework/base/src/types/interaction/tx.rs b/framework/base/src/types/interaction/tx.rs
index 5c964746c2..cb2945ff39 100644
--- a/framework/base/src/types/interaction/tx.rs
+++ b/framework/base/src/types/interaction/tx.rs
@@ -11,13 +11,12 @@ use crate::{
 use multiversx_sc_codec::TopEncodeMulti;
 
 use super::{
-    contract_call_exec::UNSPECIFIED_GAS_LIMIT, contract_call_trait::ContractCallBase,
-    AnnotatedValue, Code, ContractCallNoPayment, ContractCallWithEgld, ContractDeploy, DeployCall,
-    Egld, EgldPayment, ExplicitGas, FromSource, FunctionCall, ManagedArgBuffer,
-    OriginalResultMarker, RHList, RHListAppendNoRet, RHListAppendRet, RHListItem, TxCodeSource,
-    TxCodeValue, TxData, TxEgldValue, TxEnv, TxFrom, TxFromSourceValue, TxGas, TxGasValue,
-    TxPayment, TxPaymentEgldOnly, TxProxyTrait, TxResultHandler, TxScEnv, TxTo, TxToSpecified,
-    UpgradeCall,
+    contract_deploy::UNSPECIFIED_GAS_LIMIT, AnnotatedValue, Code, ContractCallBase,
+    ContractCallNoPayment, ContractCallWithEgld, ContractDeploy, DeployCall, Egld, EgldPayment,
+    ExplicitGas, FromSource, FunctionCall, ManagedArgBuffer, OriginalResultMarker, RHList,
+    RHListAppendNoRet, RHListAppendRet, RHListItem, TxCodeSource, TxCodeValue, TxData, TxEgldValue,
+    TxEnv, TxFrom, TxFromSourceValue, TxGas, TxGasValue, TxPayment, TxPaymentEgldOnly,
+    TxProxyTrait, TxResultHandler, TxScEnv, TxTo, TxToSpecified, UpgradeCall,
 };
 
 #[must_use]
diff --git a/framework/base/src/types/interaction/tx_exec.rs b/framework/base/src/types/interaction/tx_exec.rs
new file mode 100644
index 0000000000..3bf35975ed
--- /dev/null
+++ b/framework/base/src/types/interaction/tx_exec.rs
@@ -0,0 +1,38 @@
+mod tx_env_sc;
+mod tx_exec_async;
+mod tx_exec_async_promises;
+mod tx_exec_deploy;
+mod tx_exec_sync;
+mod tx_exec_te;
+mod tx_exec_upgrade;
+
+pub use tx_env_sc::*;
+pub use tx_exec_async::*;
+pub use tx_exec_async_promises::*;
+pub use tx_exec_deploy::*;
+pub use tx_exec_sync::*;
+pub use tx_exec_upgrade::*;
+
+use crate::{
+    api::CallTypeApi,
+    io::{ArgErrorHandler, ArgId, ManagedResultArgLoader},
+    types::{ManagedBuffer, ManagedVec},
+};
+use multiversx_sc_codec::TopDecodeMulti;
+
+/// In case of `transfer_execute`, we leave by default a little gas for the calling transaction to finish.
+pub(crate) const TRANSFER_EXECUTE_DEFAULT_LEFTOVER: u64 = 100_000;
+
+pub(crate) fn decode_result<SA, RequestedResult>(
+    raw_result: ManagedVec<SA, ManagedBuffer<SA>>,
+) -> RequestedResult
+where
+    SA: CallTypeApi + 'static,
+    RequestedResult: TopDecodeMulti,
+{
+    let mut loader = ManagedResultArgLoader::new(raw_result);
+    let arg_id = ArgId::from(&b"sync result"[..]);
+    let h: ArgErrorHandler<SA> = ArgErrorHandler::<SA>::from(arg_id);
+    let Ok(result) = RequestedResult::multi_decode_or_handle_err(&mut loader, h);
+    result
+}
diff --git a/framework/base/src/types/interaction/tx_env_sc.rs b/framework/base/src/types/interaction/tx_exec/tx_env_sc.rs
similarity index 86%
rename from framework/base/src/types/interaction/tx_env_sc.rs
rename to framework/base/src/types/interaction/tx_exec/tx_env_sc.rs
index 8186b6b4b4..cbbcc35dc2 100644
--- a/framework/base/src/types/interaction/tx_env_sc.rs
+++ b/framework/base/src/types/interaction/tx_exec/tx_env_sc.rs
@@ -3,12 +3,10 @@ use core::marker::PhantomData;
 use crate::{
     api::{BlockchainApiImpl, CallTypeApi},
     contract_base::BlockchainWrapper,
-    types::{ManagedAddress, ManagedBuffer},
-};
-
-use super::{
-    contract_call_exec::TRANSFER_EXECUTE_DEFAULT_LEFTOVER, display_u64, AnnotatedValue, Tx,
-    TxBaseWithEnv, TxEnv,
+    types::{
+        interaction::display_u64, AnnotatedValue, ManagedAddress, ManagedBuffer, Tx, TxBaseWithEnv,
+        TxEnv, TRANSFER_EXECUTE_DEFAULT_LEFTOVER,
+    },
 };
 
 pub struct TxScEnv<Api>
diff --git a/framework/base/src/types/interaction/tx_call_async.rs b/framework/base/src/types/interaction/tx_exec/tx_exec_async.rs
similarity index 95%
rename from framework/base/src/types/interaction/tx_call_async.rs
rename to framework/base/src/types/interaction/tx_exec/tx_exec_async.rs
index daa69013cf..02f145f635 100644
--- a/framework/base/src/types/interaction/tx_call_async.rs
+++ b/framework/base/src/types/interaction/tx_exec/tx_exec_async.rs
@@ -1,12 +1,10 @@
 use crate::{
     api::{CallTypeApi, StorageWriteApi},
     contract_base::SendRawWrapper,
-    types::CallbackClosure,
-};
-
-use super::{
-    OriginalResultMarker, Tx, TxData, TxDataFunctionCall, TxEnv, TxFrom, TxGas, TxPayment,
-    TxResultHandler, TxScEnv, TxTo, TxToSpecified,
+    types::{
+        CallbackClosure, OriginalResultMarker, Tx, TxData, TxDataFunctionCall, TxEnv, TxFrom,
+        TxGas, TxPayment, TxResultHandler, TxScEnv, TxTo, TxToSpecified,
+    },
 };
 
 pub trait TxAsyncCallCallback<Api>: TxResultHandler<TxScEnv<Api>>
diff --git a/framework/base/src/types/interaction/tx_call_async_promises.rs b/framework/base/src/types/interaction/tx_exec/tx_exec_async_promises.rs
similarity index 94%
rename from framework/base/src/types/interaction/tx_call_async_promises.rs
rename to framework/base/src/types/interaction/tx_exec/tx_exec_async_promises.rs
index b3b8a1794d..48bf520b05 100644
--- a/framework/base/src/types/interaction/tx_call_async_promises.rs
+++ b/framework/base/src/types/interaction/tx_exec/tx_exec_async_promises.rs
@@ -1,12 +1,11 @@
 use crate::{
     api::{const_handles, CallTypeApi},
     contract_base::SendRawWrapper,
-    types::{CallbackClosure, ManagedBuffer, ManagedType},
-};
-
-use super::{
-    callback_closure::CallbackClosureWithGas, ExplicitGas, FunctionCall, OriginalResultMarker, Tx,
-    TxGas, TxGasValue, TxPayment, TxResultHandler, TxScEnv, TxToSpecified,
+    types::{
+        interaction::callback_closure::CallbackClosureWithGas, CallbackClosure, ExplicitGas,
+        FunctionCall, ManagedBuffer, ManagedType, OriginalResultMarker, Tx, TxGas, TxGasValue,
+        TxPayment, TxResultHandler, TxScEnv, TxToSpecified,
+    },
 };
 
 pub trait TxPromisesCallback<Api>: TxResultHandler<TxScEnv<Api>>
diff --git a/framework/base/src/types/interaction/tx_call_deploy.rs b/framework/base/src/types/interaction/tx_exec/tx_exec_deploy.rs
similarity index 94%
rename from framework/base/src/types/interaction/tx_call_deploy.rs
rename to framework/base/src/types/interaction/tx_exec/tx_exec_deploy.rs
index 08cd815262..b9a77119ed 100644
--- a/framework/base/src/types/interaction/tx_call_deploy.rs
+++ b/framework/base/src/types/interaction/tx_exec/tx_exec_deploy.rs
@@ -4,13 +4,12 @@ use crate::{
     api::CallTypeApi,
     contract_base::SendRawWrapper,
     tuple_util::NestedTupleFlatten,
-    types::{CodeMetadata, ManagedAddress, ManagedBuffer, ManagedVec},
-};
-
-use super::{
-    contract_call_exec::decode_result, Code, ConsNoRet, ConsRet, DeployCall, FromSource,
-    OriginalResultMarker, RHList, RHListExec, RHListItem, Tx, TxCodeValue, TxEmptyResultHandler,
-    TxEnv, TxFromSourceValue, TxGas, TxPaymentEgldOnly, TxResultHandler, TxScEnv, UpgradeCall,
+    types::{
+        decode_result, Code, CodeMetadata, ConsNoRet, ConsRet, DeployCall, FromSource,
+        ManagedAddress, ManagedBuffer, ManagedVec, OriginalResultMarker, RHList, RHListExec,
+        RHListItem, Tx, TxCodeValue, TxEmptyResultHandler, TxEnv, TxFromSourceValue, TxGas,
+        TxPaymentEgldOnly, TxResultHandler, TxScEnv, UpgradeCall,
+    },
 };
 
 pub struct DeployRawResult<Api>
diff --git a/framework/base/src/types/interaction/tx_call_sync.rs b/framework/base/src/types/interaction/tx_exec/tx_exec_sync.rs
similarity index 91%
rename from framework/base/src/types/interaction/tx_call_sync.rs
rename to framework/base/src/types/interaction/tx_exec/tx_exec_sync.rs
index 7b35b07a6a..adb102d6fa 100644
--- a/framework/base/src/types/interaction/tx_call_sync.rs
+++ b/framework/base/src/types/interaction/tx_exec/tx_exec_sync.rs
@@ -4,13 +4,11 @@ use crate::{
     api::CallTypeApi,
     contract_base::SendRawWrapper,
     tuple_util::NestedTupleFlatten,
-    types::{ManagedBuffer, ManagedVec},
-};
-
-use super::{
-    contract_call_exec::decode_result, BackTransfers, ConsNoRet, ConsRet, OriginalResultMarker,
-    RHList, RHListExec, RHListItem, Tx, TxDataFunctionCall, TxEnv, TxGas, TxPayment, TxScEnv,
-    TxToSpecified,
+    types::{
+        decode_result, BackTransfers, ConsNoRet, ConsRet, ManagedBuffer, ManagedVec,
+        OriginalResultMarker, RHList, RHListExec, RHListItem, Tx, TxDataFunctionCall, TxEnv, TxGas,
+        TxPayment, TxScEnv, TxToSpecified,
+    },
 };
 
 pub struct SyncCallRawResult<Api>(pub ManagedVec<Api, ManagedBuffer<Api>>)
diff --git a/framework/base/src/types/interaction/tx_call_te.rs b/framework/base/src/types/interaction/tx_exec/tx_exec_te.rs
similarity index 98%
rename from framework/base/src/types/interaction/tx_call_te.rs
rename to framework/base/src/types/interaction/tx_exec/tx_exec_te.rs
index 8a62ca2bf8..a484dd2fdb 100644
--- a/framework/base/src/types/interaction/tx_call_te.rs
+++ b/framework/base/src/types/interaction/tx_exec/tx_exec_te.rs
@@ -1,6 +1,6 @@
 use crate::api::CallTypeApi;
 
-use super::{
+use crate::types::{
     FunctionCall, Tx, TxData, TxEmptyResultHandler, TxFrom, TxGas, TxPayment, TxScEnv,
     TxToSpecified,
 };
diff --git a/framework/base/src/types/interaction/tx_call_upgrade.rs b/framework/base/src/types/interaction/tx_exec/tx_exec_upgrade.rs
similarity index 93%
rename from framework/base/src/types/interaction/tx_call_upgrade.rs
rename to framework/base/src/types/interaction/tx_exec/tx_exec_upgrade.rs
index db56b8a230..5a08481640 100644
--- a/framework/base/src/types/interaction/tx_call_upgrade.rs
+++ b/framework/base/src/types/interaction/tx_exec/tx_exec_upgrade.rs
@@ -2,13 +2,11 @@ use crate::{
     api::CallTypeApi,
     contract_base::SendRawWrapper,
     tuple_util::NestedTupleFlatten,
-    types::{CodeMetadata, ManagedAddress, ManagedBuffer, ManagedVec},
-};
-
-use super::{
-    tx_from, Code, DeployRawResult, FromSource, RHListExec, Tx, TxCodeValue, TxEmptyResultHandler,
-    TxFrom, TxFromSourceValue, TxGas, TxPaymentEgldOnly, TxResultHandler, TxScEnv, TxTo,
-    UpgradeCall,
+    types::{
+        Code, CodeMetadata, DeployRawResult, FromSource, ManagedAddress, ManagedBuffer, ManagedVec,
+        RHListExec, Tx, TxCodeValue, TxEmptyResultHandler, TxFrom, TxFromSourceValue, TxGas,
+        TxPaymentEgldOnly, TxResultHandler, TxScEnv, TxTo, UpgradeCall,
+    },
 };
 
 impl<Api, Payment, Gas, CodeValue, RH>
diff --git a/framework/base/src/types/interaction/tx_result_handler/returns_result.rs b/framework/base/src/types/interaction/tx_result_handler/returns_result.rs
index 5082a6bff6..27c547c19e 100644
--- a/framework/base/src/types/interaction/tx_result_handler/returns_result.rs
+++ b/framework/base/src/types/interaction/tx_result_handler/returns_result.rs
@@ -1,8 +1,8 @@
 use multiversx_sc_codec::TopDecodeMulti;
 
 use crate::types::{
-    interaction::contract_call_exec::decode_result, DeployRawResult, ManagedBuffer, ManagedVec,
-    RHListItem, RHListItemExec, SyncCallRawResult, TxEnv,
+    interaction::decode_result, DeployRawResult, ManagedBuffer, ManagedVec, RHListItem,
+    RHListItemExec, SyncCallRawResult, TxEnv,
 };
 
 /// Indicates that result will be returned.
diff --git a/framework/base/src/types/interaction/tx_result_handler/returns_result_conv.rs b/framework/base/src/types/interaction/tx_result_handler/returns_result_conv.rs
index 1dbabc0bf1..e0f8cd3df1 100644
--- a/framework/base/src/types/interaction/tx_result_handler/returns_result_conv.rs
+++ b/framework/base/src/types/interaction/tx_result_handler/returns_result_conv.rs
@@ -3,8 +3,8 @@ use core::marker::PhantomData;
 use multiversx_sc_codec::{CodecFrom, TopEncodeMulti};
 
 use crate::types::{
-    interaction::contract_call_exec::decode_result, ManagedBuffer, ManagedVec, RHListItem,
-    RHListItemExec, SyncCallRawResult, TxEnv,
+    interaction::decode_result, ManagedBuffer, ManagedVec, RHListItem, RHListItemExec,
+    SyncCallRawResult, TxEnv,
 };
 
 /// Indicates that result will be returned.
diff --git a/framework/base/src/types/interaction/tx_result_handler/with_result.rs b/framework/base/src/types/interaction/tx_result_handler/with_result.rs
index 800ac30a7a..d9f11aed14 100644
--- a/framework/base/src/types/interaction/tx_result_handler/with_result.rs
+++ b/framework/base/src/types/interaction/tx_result_handler/with_result.rs
@@ -3,8 +3,8 @@ use core::marker::PhantomData;
 use multiversx_sc_codec::TopDecodeMulti;
 
 use crate::types::{
-    interaction::contract_call_exec::decode_result, ManagedBuffer, ManagedVec, RHListItem,
-    RHListItemExec, SyncCallRawResult, TxEnv,
+    interaction::decode_result, ManagedBuffer, ManagedVec, RHListItem, RHListItemExec,
+    SyncCallRawResult, TxEnv,
 };
 
 /// Defines a lambda function to be called on the decoded result.
diff --git a/framework/base/src/types/interaction/tx_result_handler/with_result_conv.rs b/framework/base/src/types/interaction/tx_result_handler/with_result_conv.rs
index 89831e8283..772bd9acd9 100644
--- a/framework/base/src/types/interaction/tx_result_handler/with_result_conv.rs
+++ b/framework/base/src/types/interaction/tx_result_handler/with_result_conv.rs
@@ -3,8 +3,8 @@ use core::marker::PhantomData;
 use multiversx_sc_codec::{CodecFrom, TopEncodeMulti};
 
 use crate::types::{
-    interaction::contract_call_exec::decode_result, ManagedBuffer, ManagedVec, RHListItem,
-    RHListItemExec, SyncCallRawResult, TxEnv,
+    interaction::decode_result, ManagedBuffer, ManagedVec, RHListItem, RHListItemExec,
+    SyncCallRawResult, TxEnv,
 };
 
 /// Defines a lambda function to be called on the decoded result.

From 9ecb3ecc5495a3a58f8b452e954cc48811afe731 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Thu, 28 Mar 2024 15:40:05 +0100
Subject: [PATCH 0591/1254] new proxy and migration for recursive caller

---
 .../recursive-caller/sc-config.toml           |   2 +
 .../recursive-caller/src/recursive_caller.rs  |  24 +-
 .../recursive-caller/src/self_proxy.rs        |  96 ++++++
 .../recursive-caller/src/vault_proxy.rs       | 278 ++++++++++++++++++
 .../composability/vault/sc-config.toml        |   1 +
 5 files changed, 389 insertions(+), 12 deletions(-)
 create mode 100644 contracts/feature-tests/composability/recursive-caller/sc-config.toml
 create mode 100644 contracts/feature-tests/composability/recursive-caller/src/self_proxy.rs
 create mode 100644 contracts/feature-tests/composability/recursive-caller/src/vault_proxy.rs

diff --git a/contracts/feature-tests/composability/recursive-caller/sc-config.toml b/contracts/feature-tests/composability/recursive-caller/sc-config.toml
new file mode 100644
index 0000000000..7b21858e3c
--- /dev/null
+++ b/contracts/feature-tests/composability/recursive-caller/sc-config.toml
@@ -0,0 +1,2 @@
+[settings]
+proxy-paths = ["src/self_proxy.rs"]
diff --git a/contracts/feature-tests/composability/recursive-caller/src/recursive_caller.rs b/contracts/feature-tests/composability/recursive-caller/src/recursive_caller.rs
index 617f29e901..407a681927 100644
--- a/contracts/feature-tests/composability/recursive-caller/src/recursive_caller.rs
+++ b/contracts/feature-tests/composability/recursive-caller/src/recursive_caller.rs
@@ -2,15 +2,12 @@
 
 multiversx_sc::imports!();
 
+pub mod self_proxy;
+pub mod vault_proxy;
+
 /// Test contract for investigating async calls.
 #[multiversx_sc::contract]
 pub trait RecursiveCaller {
-    #[proxy]
-    fn vault_proxy(&self) -> vault::Proxy<Self::Api>;
-
-    #[proxy]
-    fn self_proxy(&self) -> self::Proxy<Self::Api>;
-
     #[init]
     fn init(&self) {}
 
@@ -24,10 +21,11 @@ pub trait RecursiveCaller {
     ) {
         self.recursive_send_funds_event(to, token_identifier, amount, counter);
 
-        self.vault_proxy()
-            .contract(to.clone())
+        self.tx()
+            .to(to)
+            .typed(vault_proxy::VaultProxy)
             .accept_funds()
-            .with_egld_or_single_esdt_transfer((token_identifier.clone(), 0, amount.clone()))
+            .egld_or_single_esdt((token_identifier.clone(), 0, amount.clone()))
             .async_call()
             .with_callback(self.callbacks().recursive_send_funds_callback(
                 to,
@@ -35,7 +33,7 @@ pub trait RecursiveCaller {
                 amount,
                 counter,
             ))
-            .call_and_exit()
+            .call_and_exit();
     }
 
     #[callback]
@@ -49,8 +47,10 @@ pub trait RecursiveCaller {
         self.recursive_send_funds_callback_event(to, token_identifier, amount, counter);
 
         if counter > 1 {
-            self.self_proxy()
-                .contract(self.blockchain().get_sc_address())
+            let self_address = self.blockchain().get_sc_address();
+            self.tx()
+                .to(&self_address)
+                .typed(self_proxy::RecursiveCallerProxy)
                 .recursive_send_funds(to, token_identifier, amount, counter - 1)
                 .async_call()
                 .call_and_exit()
diff --git a/contracts/feature-tests/composability/recursive-caller/src/self_proxy.rs b/contracts/feature-tests/composability/recursive-caller/src/self_proxy.rs
new file mode 100644
index 0000000000..8aa039e203
--- /dev/null
+++ b/contracts/feature-tests/composability/recursive-caller/src/self_proxy.rs
@@ -0,0 +1,96 @@
+// Code generated by the multiversx-sc proxy generator. DO NOT EDIT.
+
+////////////////////////////////////////////////////
+////////////////// AUTO-GENERATED //////////////////
+////////////////////////////////////////////////////
+
+#![allow(dead_code)]
+#![allow(clippy::all)]
+
+use multiversx_sc::proxy_imports::*;
+
+pub struct RecursiveCallerProxy;
+
+impl<Env, From, To, Gas> TxProxyTrait<Env, From, To, Gas> for RecursiveCallerProxy
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    type TxProxyMethods = RecursiveCallerProxyMethods<Env, From, To, Gas>;
+
+    fn proxy_methods(self, tx: Tx<Env, From, To, (), Gas, (), ()>) -> Self::TxProxyMethods {
+        RecursiveCallerProxyMethods { wrapped_tx: tx }
+    }
+}
+
+pub struct RecursiveCallerProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    wrapped_tx: Tx<Env, From, To, (), Gas, (), ()>,
+}
+
+#[rustfmt::skip]
+impl<Env, From, Gas> RecursiveCallerProxyMethods<Env, From, (), Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn init(
+        self,
+    ) -> TxProxyDeploy<Env, From, Gas, ()> {
+        self.wrapped_tx
+            .raw_deploy()
+            .original_result()
+    }
+}
+
+#[rustfmt::skip]
+impl<Env, From, To, Gas> RecursiveCallerProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+}
+
+#[rustfmt::skip]
+impl<Env, From, To, Gas> RecursiveCallerProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn recursive_send_funds<
+        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+        Arg1: CodecInto<EgldOrEsdtTokenIdentifier<Env::Api>>,
+        Arg2: CodecInto<BigUint<Env::Api>>,
+        Arg3: CodecInto<u32>,
+    >(
+        self,
+        to: Arg0,
+        token_identifier: Arg1,
+        amount: Arg2,
+        counter: Arg3,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("recursive_send_funds")
+            .argument(&to)
+            .argument(&token_identifier)
+            .argument(&amount)
+            .argument(&counter)
+            .original_result()
+    }
+}
diff --git a/contracts/feature-tests/composability/recursive-caller/src/vault_proxy.rs b/contracts/feature-tests/composability/recursive-caller/src/vault_proxy.rs
new file mode 100644
index 0000000000..f04735e6a5
--- /dev/null
+++ b/contracts/feature-tests/composability/recursive-caller/src/vault_proxy.rs
@@ -0,0 +1,278 @@
+// Code generated by the multiversx-sc proxy generator. DO NOT EDIT.
+
+////////////////////////////////////////////////////
+////////////////// AUTO-GENERATED //////////////////
+////////////////////////////////////////////////////
+
+#![allow(dead_code)]
+#![allow(clippy::all)]
+
+use multiversx_sc::proxy_imports::*;
+
+pub struct VaultProxy;
+
+impl<Env, From, To, Gas> TxProxyTrait<Env, From, To, Gas> for VaultProxy
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    type TxProxyMethods = VaultProxyMethods<Env, From, To, Gas>;
+
+    fn proxy_methods(self, tx: Tx<Env, From, To, (), Gas, (), ()>) -> Self::TxProxyMethods {
+        VaultProxyMethods { wrapped_tx: tx }
+    }
+}
+
+pub struct VaultProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    wrapped_tx: Tx<Env, From, To, (), Gas, (), ()>,
+}
+
+#[rustfmt::skip]
+impl<Env, From, Gas> VaultProxyMethods<Env, From, (), Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn init<
+        Arg0: CodecInto<OptionalValue<ManagedBuffer<Env::Api>>>,
+    >(
+        self,
+        opt_arg_to_echo: Arg0,
+    ) -> TxProxyDeploy<Env, From, Gas, OptionalValue<ManagedBuffer<Env::Api>>> {
+        self.wrapped_tx
+            .raw_deploy()
+            .argument(&opt_arg_to_echo)
+            .original_result()
+    }
+}
+
+#[rustfmt::skip]
+impl<Env, From, To, Gas> VaultProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn upgrade<
+        Arg0: CodecInto<OptionalValue<ManagedBuffer<Env::Api>>>,
+    >(
+        self,
+        opt_arg_to_echo: Arg0,
+    ) -> TxProxyUpgrade<Env, From, To, Gas, MultiValue2<&'static str, OptionalValue<ManagedBuffer<Env::Api>>>> {
+        self.wrapped_tx
+            .raw_upgrade()
+            .argument(&opt_arg_to_echo)
+            .original_result()
+    }
+}
+
+#[rustfmt::skip]
+impl<Env, From, To, Gas> VaultProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn echo_arguments<
+        Arg0: CodecInto<MultiValueEncoded<Env::Api, ManagedBuffer<Env::Api>>>,
+    >(
+        self,
+        args: Arg0,
+    ) -> TxProxyCall<Env, From, To, Gas, MultiValueEncoded<Env::Api, ManagedBuffer<Env::Api>>> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("echo_arguments")
+            .argument(&args)
+            .original_result()
+    }
+
+    pub fn echo_arguments_without_storage<
+        Arg0: CodecInto<MultiValueEncoded<Env::Api, ManagedBuffer<Env::Api>>>,
+    >(
+        self,
+        args: Arg0,
+    ) -> TxProxyCall<Env, From, To, Gas, MultiValueEncoded<Env::Api, ManagedBuffer<Env::Api>>> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("echo_arguments_without_storage")
+            .argument(&args)
+            .original_result()
+    }
+
+    pub fn echo_caller(
+        self,
+    ) -> TxProxyCall<Env, From, To, Gas, ManagedAddress<Env::Api>> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("echo_caller")
+            .original_result()
+    }
+
+    pub fn accept_funds(
+        self,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("accept_funds")
+            .original_result()
+    }
+
+    pub fn accept_funds_echo_payment(
+        self,
+    ) -> TxProxyCall<Env, From, To, Gas, MultiValue2<BigUint<Env::Api>, MultiValueEncoded<Env::Api, EsdtTokenPaymentMultiValue<Env::Api>>>> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("accept_funds_echo_payment")
+            .original_result()
+    }
+
+    pub fn accept_funds_single_esdt_transfer(
+        self,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("accept_funds_single_esdt_transfer")
+            .original_result()
+    }
+
+    pub fn reject_funds(
+        self,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("reject_funds")
+            .original_result()
+    }
+
+    pub fn retrieve_funds_with_transfer_exec<
+        Arg0: CodecInto<TokenIdentifier<Env::Api>>,
+        Arg1: CodecInto<BigUint<Env::Api>>,
+        Arg2: CodecInto<OptionalValue<ManagedBuffer<Env::Api>>>,
+    >(
+        self,
+        token: Arg0,
+        amount: Arg1,
+        opt_receive_func: Arg2,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("retrieve_funds_with_transfer_exec")
+            .argument(&token)
+            .argument(&amount)
+            .argument(&opt_receive_func)
+            .original_result()
+    }
+
+    pub fn retrieve_funds_promises<
+        Arg0: CodecInto<OptionalValue<u64>>,
+        Arg1: CodecInto<OptionalValue<BigUint<Env::Api>>>,
+    >(
+        self,
+        back_transfers: Arg0,
+        back_transfer_value: Arg1,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("retrieve_funds_promises")
+            .argument(&back_transfers)
+            .argument(&back_transfer_value)
+            .original_result()
+    }
+
+    pub fn retrieve_funds<
+        Arg0: CodecInto<EgldOrEsdtTokenIdentifier<Env::Api>>,
+        Arg1: CodecInto<u64>,
+        Arg2: CodecInto<BigUint<Env::Api>>,
+    >(
+        self,
+        token: Arg0,
+        nonce: Arg1,
+        amount: Arg2,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("retrieve_funds")
+            .argument(&token)
+            .argument(&nonce)
+            .argument(&amount)
+            .original_result()
+    }
+
+    pub fn retrieve_multi_funds_async<
+        Arg0: CodecInto<MultiValueEncoded<Env::Api, MultiValue3<TokenIdentifier<Env::Api>, u64, BigUint<Env::Api>>>>,
+    >(
+        self,
+        token_payments: Arg0,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("retrieve_multi_funds_async")
+            .argument(&token_payments)
+            .original_result()
+    }
+
+    pub fn burn_and_create_retrive_async(
+        self,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("burn_and_create_retrive_async")
+            .original_result()
+    }
+
+    pub fn get_owner_address(
+        self,
+    ) -> TxProxyCall<Env, From, To, Gas, ManagedAddress<Env::Api>> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("get_owner_address")
+            .original_result()
+    }
+
+    /// We already leave a trace of the calls using the event logs; 
+    /// this additional counter has the role of showing that storage also gets saved correctly. 
+    pub fn call_counts<
+        Arg0: CodecInto<ManagedBuffer<Env::Api>>,
+    >(
+        self,
+        endpoint: Arg0,
+    ) -> TxProxyCall<Env, From, To, Gas, usize> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("call_counts")
+            .argument(&endpoint)
+            .original_result()
+    }
+
+    pub fn num_called_retrieve_funds_promises(
+        self,
+    ) -> TxProxyCall<Env, From, To, Gas, usize> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("num_called_retrieve_funds_promises")
+            .original_result()
+    }
+
+    pub fn num_async_calls_sent_from_child(
+        self,
+    ) -> TxProxyCall<Env, From, To, Gas, usize> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("num_async_calls_sent_from_child")
+            .original_result()
+    }
+}
diff --git a/contracts/feature-tests/composability/vault/sc-config.toml b/contracts/feature-tests/composability/vault/sc-config.toml
index 969ed9c2a3..107694e4fe 100644
--- a/contracts/feature-tests/composability/vault/sc-config.toml
+++ b/contracts/feature-tests/composability/vault/sc-config.toml
@@ -3,6 +3,7 @@ main = "main"
 proxy-paths = [
     "../forwarder/src/vault_proxy.rs",
     "../promises-features/src/vault_proxy.rs",
+    "../recursive-caller/src/vault_proxy.rs"
 ]
 
 [contracts.main]

From 3bb6cec953461bfd4eaefff96dac8f2bed5e493c Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 28 Mar 2024 16:48:08 +0200
Subject: [PATCH 0592/1254] proxy test first fix

---
 .../proxy-test-first/src/proxy-test-first.rs         | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

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 b3ddbf6d5e..58a2dd2684 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
@@ -30,21 +30,13 @@ pub trait ProxyTestFirst {
     #[endpoint(deploySecondContract)]
     fn deploy_second_contract(&self, code: ManagedBuffer) -> i32 {
         let payment = self.call_value().egld_value();
-        // let (address, init_result) = self
-        //     .tx()
-        //     .egld(payment)
-        //     .raw_deploy()
-        //     .code(code)
-        //     .code_metadata(CodeMetadata::UPGRADEABLE)
-        //     .argument(&123)
-        //     .returns(ReturnsNewAddress)
-        //     .returns(ReturnsResult)
-        //     .sync_call();
 
         let (address, init_result) = self
             .tx()
             .typed(message_me_proxy::MessageMeProxy)
             .init(123)
+            .code(code)
+            .code_metadata(CodeMetadata::UPGRADEABLE)
             .returns(ReturnsNewAddress)
             .returns(ReturnsResult)
             .egld(payment)

From 588574b6383d62f6f0580e586d555b3a3823ada2 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 28 Mar 2024 13:47:15 +0200
Subject: [PATCH 0593/1254] MultiValueManagedVec ABI fix

---
 .../types/managed/multi_value/multi_value_managed_vec.rs | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/framework/base/src/types/managed/multi_value/multi_value_managed_vec.rs b/framework/base/src/types/managed/multi_value/multi_value_managed_vec.rs
index a00042ed5b..6779df703b 100644
--- a/framework/base/src/types/managed/multi_value/multi_value_managed_vec.rs
+++ b/framework/base/src/types/managed/multi_value/multi_value_managed_vec.rs
@@ -216,10 +216,11 @@ where
     T: ManagedVecItem,
 {
     fn type_name() -> TypeName {
-        let mut repr = TypeName::from("variadic<");
-        repr.push_str(T::type_name().as_str());
-        repr.push('>');
-        repr
+        crate::abi::type_name_variadic::<T>()
+    }
+
+    fn type_name_rust() -> TypeName {
+        alloc::format!("MultiValueManagedVec<$API, {}>", T::type_name_rust())
     }
 
     fn provide_type_descriptions<TDC: TypeDescriptionContainer>(accumulator: &mut TDC) {

From 9fd738335c3a453e57e94b0ba1dcd52406e5d5a4 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Thu, 28 Mar 2024 16:11:12 +0100
Subject: [PATCH 0594/1254] removed init and upgrade from builtin proxy
 functions

---
 .../src/builtin_func_proxy.rs                 | 35 -------------------
 1 file changed, 35 deletions(-)

diff --git a/contracts/feature-tests/composability/builtin-func-features/src/builtin_func_proxy.rs b/contracts/feature-tests/composability/builtin-func-features/src/builtin_func_proxy.rs
index 66ed7a8fdf..8d7d106f66 100644
--- a/contracts/feature-tests/composability/builtin-func-features/src/builtin_func_proxy.rs
+++ b/contracts/feature-tests/composability/builtin-func-features/src/builtin_func_proxy.rs
@@ -35,41 +35,6 @@ where
     wrapped_tx: Tx<Env, From, To, (), Gas, (), ()>,
 }
 
-#[rustfmt::skip]
-impl<Env, From, Gas> UserBuiltinProxyMethods<Env, From, (), Gas>
-where
-    Env: TxEnv,
-    Env::Api: VMApi,
-    From: TxFrom<Env>,
-    Gas: TxGas<Env>,
-{
-    pub fn init(
-        self,
-    ) -> TxProxyDeploy<Env, From, Gas, ()> {
-        self.wrapped_tx
-            .raw_deploy()
-            .original_result()
-    }
-}
-
-#[rustfmt::skip]
-impl<Env, From, To, Gas> UserBuiltinProxyMethods<Env, From, To, Gas>
-where
-    Env: TxEnv,
-    Env::Api: VMApi,
-    From: TxFrom<Env>,
-    To: TxTo<Env>,
-    Gas: TxGas<Env>,
-{
-    pub fn upgrade(
-        self,
-    ) -> TxProxyUpgrade<Env, From, To, Gas, ()> {
-        self.wrapped_tx
-            .raw_upgrade()
-            .original_result()
-    }
-}
-
 #[rustfmt::skip]
 impl<Env, From, To, Gas> UserBuiltinProxyMethods<Env, From, To, Gas>
 where

From c6c9bd10dc7c61e580a9aed3219ba8e9696a1c9d Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 28 Mar 2024 17:25:45 +0200
Subject: [PATCH 0595/1254] unified syntax - multi esdt reference cleanup

---
 .../examples/digital-cash/src/digital_cash.rs |  2 +-
 .../digital-cash/src/signature_operations.rs  |  2 +-
 .../src/esdt_transfer_with_fee.rs             |  2 +-
 .../forwarder-raw/src/forwarder_raw_async.rs  |  2 +-
 contracts/modules/src/token_merge/mod.rs      |  4 +-
 .../contract_base/wrappers/send_wrapper.rs    |  5 +-
 framework/base/src/types/interaction/tx.rs    | 26 ++-------
 .../base/src/types/interaction/tx_payment.rs  |  1 +
 .../tx_payment/tx_payment_multi_esdt.rs       | 57 +++++++++++++++++++
 9 files changed, 70 insertions(+), 31 deletions(-)

diff --git a/contracts/examples/digital-cash/src/digital_cash.rs b/contracts/examples/digital-cash/src/digital_cash.rs
index 97875a1a15..c631256545 100644
--- a/contracts/examples/digital-cash/src/digital_cash.rs
+++ b/contracts/examples/digital-cash/src/digital_cash.rs
@@ -64,7 +64,7 @@ pub trait DigitalCash:
         if !collected_esdt_fees.is_empty() {
             self.tx()
                 .to(&caller_address)
-                .multi_esdt_ref(&collected_esdt_fees)
+                .multi_esdt(&collected_esdt_fees)
                 .transfer();
         }
     }
diff --git a/contracts/examples/digital-cash/src/signature_operations.rs b/contracts/examples/digital-cash/src/signature_operations.rs
index f729cb6061..fd69a91ef2 100644
--- a/contracts/examples/digital-cash/src/signature_operations.rs
+++ b/contracts/examples/digital-cash/src/signature_operations.rs
@@ -83,7 +83,7 @@ pub trait SignatureOperationsModule: storage::StorageModule + helpers::HelpersMo
         if !deposit.esdt_funds.is_empty() {
             self.tx()
                 .to(&caller_address)
-                .multi_esdt_ref(&deposit.esdt_funds)
+                .multi_esdt(&deposit.esdt_funds)
                 .transfer();
         }
         if deposited_fee.amount > 0 {
diff --git a/contracts/examples/esdt-transfer-with-fee/src/esdt_transfer_with_fee.rs b/contracts/examples/esdt-transfer-with-fee/src/esdt_transfer_with_fee.rs
index fc47ed9acd..495e8bb57e 100644
--- a/contracts/examples/esdt-transfer-with-fee/src/esdt_transfer_with_fee.rs
+++ b/contracts/examples/esdt-transfer-with-fee/src/esdt_transfer_with_fee.rs
@@ -40,7 +40,7 @@ pub trait EsdtTransferWithFee {
         }
         self.paid_fees().clear();
 
-        self.tx().to(ToCaller).multi_esdt_ref(&fees).transfer();
+        self.tx().to(ToCaller).multi_esdt(&fees).transfer();
     }
 
     #[payable("*")]
diff --git a/contracts/feature-tests/composability/forwarder-raw/src/forwarder_raw_async.rs b/contracts/feature-tests/composability/forwarder-raw/src/forwarder_raw_async.rs
index cdf3c8f42c..c25b6730f4 100644
--- a/contracts/feature-tests/composability/forwarder-raw/src/forwarder_raw_async.rs
+++ b/contracts/feature-tests/composability/forwarder-raw/src/forwarder_raw_async.rs
@@ -23,7 +23,7 @@ pub trait ForwarderRawAsync: super::forwarder_raw_common::ForwarderRawCommon {
     #[payable("*")]
     fn forward_direct_esdt_multi(&self, to: ManagedAddress) {
         let payments = self.call_value().all_esdt_transfers();
-        self.tx().to(&to).multi_esdt_ref(&payments).transfer();
+        self.tx().to(&to).multi_esdt(payments).transfer();
     }
 
     fn forward_contract_call(
diff --git a/contracts/modules/src/token_merge/mod.rs b/contracts/modules/src/token_merge/mod.rs
index 0acdce1af8..1164a44a45 100644
--- a/contracts/modules/src/token_merge/mod.rs
+++ b/contracts/modules/src/token_merge/mod.rs
@@ -120,7 +120,7 @@ pub trait TokenMergeModule:
 
         self.tx()
             .to(ToCaller)
-            .multi_esdt_ref(&output_payments)
+            .multi_esdt(&output_payments)
             .transfer();
 
         output_payments
@@ -169,7 +169,7 @@ pub trait TokenMergeModule:
 
         self.tx()
             .to(ToCaller)
-            .multi_esdt_ref(&tokens_to_remove)
+            .multi_esdt(&tokens_to_remove)
             .transfer();
 
         tokens_to_remove
diff --git a/framework/base/src/contract_base/wrappers/send_wrapper.rs b/framework/base/src/contract_base/wrappers/send_wrapper.rs
index f761f1cb04..b1de9d7ab9 100644
--- a/framework/base/src/contract_base/wrappers/send_wrapper.rs
+++ b/framework/base/src/contract_base/wrappers/send_wrapper.rs
@@ -291,10 +291,7 @@ where
         to: &ManagedAddress<A>,
         payments: &ManagedVec<A, EsdtTokenPayment<A>>,
     ) {
-        Tx::new_tx_from_sc()
-            .to(to)
-            .multi_esdt_ref(payments)
-            .transfer();
+        Tx::new_tx_from_sc().to(to).multi_esdt(payments).transfer();
     }
 
     /// Performs a simple ESDT/NFT transfer, but via async call.  
diff --git a/framework/base/src/types/interaction/tx.rs b/framework/base/src/types/interaction/tx.rs
index cb2945ff39..1126481bcc 100644
--- a/framework/base/src/types/interaction/tx.rs
+++ b/framework/base/src/types/interaction/tx.rs
@@ -16,7 +16,7 @@ use super::{
     ExplicitGas, FromSource, FunctionCall, ManagedArgBuffer, OriginalResultMarker, RHList,
     RHListAppendNoRet, RHListAppendRet, RHListItem, TxCodeSource, TxCodeValue, TxData, TxEgldValue,
     TxEnv, TxFrom, TxFromSourceValue, TxGas, TxGasValue, TxPayment, TxPaymentEgldOnly,
-    TxProxyTrait, TxResultHandler, TxScEnv, TxTo, TxToSpecified, UpgradeCall,
+    TxPaymentMultiEsdt, TxProxyTrait, TxResultHandler, TxScEnv, TxTo, TxToSpecified, UpgradeCall,
 };
 
 #[must_use]
@@ -229,26 +229,10 @@ where
     }
 
     /// Adds a collection of ESDT payments to a transaction.
-    pub fn multi_esdt(
-        self,
-        payments: MultiEsdtPayment<Env::Api>, // TODO: references
-    ) -> Tx<Env, From, To, MultiEsdtPayment<Env::Api>, Gas, Data, RH> {
-        Tx {
-            env: self.env,
-            from: self.from,
-            to: self.to,
-            payment: payments,
-            gas: self.gas,
-            data: self.data,
-            result_handler: self.result_handler,
-        }
-    }
-
-    /// Sets a reference to multiple ESDT payments.
-    pub fn multi_esdt_ref(
-        self,
-        payments: &MultiEsdtPayment<Env::Api>,
-    ) -> Tx<Env, From, To, &MultiEsdtPayment<Env::Api>, Gas, Data, RH> {
+    pub fn multi_esdt<Payment>(self, payments: Payment) -> Tx<Env, From, To, Payment, Gas, Data, RH>
+    where
+        Payment: TxPaymentMultiEsdt<Env>,
+    {
         Tx {
             env: self.env,
             from: self.from,
diff --git a/framework/base/src/types/interaction/tx_payment.rs b/framework/base/src/types/interaction/tx_payment.rs
index 978190a67a..953b3e4e3c 100644
--- a/framework/base/src/types/interaction/tx_payment.rs
+++ b/framework/base/src/types/interaction/tx_payment.rs
@@ -8,6 +8,7 @@ mod tx_payment_single_esdt_ref;
 
 pub use tx_payment_egld::{Egld, EgldPayment};
 pub use tx_payment_egld_value::TxEgldValue;
+pub use tx_payment_multi_esdt::TxPaymentMultiEsdt;
 
 use crate::{
     api::ManagedTypeApi,
diff --git a/framework/base/src/types/interaction/tx_payment/tx_payment_multi_esdt.rs b/framework/base/src/types/interaction/tx_payment/tx_payment_multi_esdt.rs
index 78acfd87f7..fe0b23ef02 100644
--- a/framework/base/src/types/interaction/tx_payment/tx_payment_multi_esdt.rs
+++ b/framework/base/src/types/interaction/tx_payment/tx_payment_multi_esdt.rs
@@ -1,10 +1,27 @@
+use core::ops::Deref;
+
 use crate::{
     contract_base::SendRawWrapper,
+    proxy_imports::ManagedRef,
     types::{BigUint, ManagedAddress, ManagedVec, MultiEsdtPayment, TxFrom, TxToSpecified},
 };
 
 use super::{AnnotatedEgldPayment, FullPaymentData, FunctionCall, TxEgldValue, TxEnv, TxPayment};
 
+/// Indicates that a payment object contains a multi-ESDT payment.
+pub trait TxPaymentMultiEsdt<Env>: TxPayment<Env>
+where
+    Env: TxEnv,
+{
+}
+
+impl<Env> TxPaymentMultiEsdt<Env> for MultiEsdtPayment<Env::Api> where Env: TxEnv {}
+impl<Env> TxPaymentMultiEsdt<Env> for &MultiEsdtPayment<Env::Api> where Env: TxEnv {}
+impl<'a, Env> TxPaymentMultiEsdt<Env> for ManagedRef<'a, Env::Api, MultiEsdtPayment<Env::Api>> where
+    Env: TxEnv
+{
+}
+
 impl<Env> TxPayment<Env> for &MultiEsdtPayment<Env::Api>
 where
     Env: TxEnv,
@@ -60,6 +77,46 @@ where
     }
 }
 
+impl<'a, Env> TxPayment<Env> for ManagedRef<'a, Env::Api, MultiEsdtPayment<Env::Api>>
+where
+    Env: TxEnv,
+{
+    fn is_no_payment(&self, _env: &Env) -> bool {
+        self.deref().is_empty()
+    }
+
+    fn perform_transfer_execute(
+        self,
+        env: &Env,
+        to: &ManagedAddress<Env::Api>,
+        gas_limit: u64,
+        fc: FunctionCall<Env::Api>,
+    ) {
+        self.deref()
+            .perform_transfer_execute(env, to, gas_limit, fc)
+    }
+
+    fn with_normalized<From, To, F, R>(
+        self,
+        env: &Env,
+        from: &From,
+        to: To,
+        fc: FunctionCall<Env::Api>,
+        f: F,
+    ) -> R
+    where
+        From: TxFrom<Env>,
+        To: TxToSpecified<Env>,
+        F: FnOnce(&ManagedAddress<Env::Api>, &BigUint<Env::Api>, &FunctionCall<Env::Api>) -> R,
+    {
+        self.deref().with_normalized(env, from, to, fc, f)
+    }
+
+    fn into_full_payment_data(self, env: &Env) -> FullPaymentData<Env::Api> {
+        self.deref().into_full_payment_data(env)
+    }
+}
+
 impl<Env> TxPayment<Env> for MultiEsdtPayment<Env::Api>
 where
     Env: TxEnv,

From 2665c3a37f88be4abca57abdc48bad8fdd9fedfc Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Thu, 28 Mar 2024 17:05:49 +0100
Subject: [PATCH 0596/1254] removed init and upgrade from proxy

---
 .../proxy-pause/src/pause_sc_proxy.rs         | 35 -------------------
 1 file changed, 35 deletions(-)

diff --git a/contracts/examples/proxy-pause/src/pause_sc_proxy.rs b/contracts/examples/proxy-pause/src/pause_sc_proxy.rs
index 0984e09ea1..addb769ed0 100644
--- a/contracts/examples/proxy-pause/src/pause_sc_proxy.rs
+++ b/contracts/examples/proxy-pause/src/pause_sc_proxy.rs
@@ -35,41 +35,6 @@ where
     wrapped_tx: Tx<Env, From, To, (), Gas, (), ()>,
 }
 
-#[rustfmt::skip]
-impl<Env, From, Gas> PausableProxyMethods<Env, From, (), Gas>
-where
-    Env: TxEnv,
-    Env::Api: VMApi,
-    From: TxFrom<Env>,
-    Gas: TxGas<Env>,
-{
-    pub fn init(
-        self,
-    ) -> TxProxyDeploy<Env, From, Gas, ()> {
-        self.wrapped_tx
-            .raw_deploy()
-            .original_result()
-    }
-}
-
-#[rustfmt::skip]
-impl<Env, From, To, Gas> PausableProxyMethods<Env, From, To, Gas>
-where
-    Env: TxEnv,
-    Env::Api: VMApi,
-    From: TxFrom<Env>,
-    To: TxTo<Env>,
-    Gas: TxGas<Env>,
-{
-    pub fn upgrade(
-        self,
-    ) -> TxProxyUpgrade<Env, From, To, Gas, ()> {
-        self.wrapped_tx
-            .raw_upgrade()
-            .original_result()
-    }
-}
-
 #[rustfmt::skip]
 impl<Env, From, To, Gas> PausableProxyMethods<Env, From, To, Gas>
 where

From 25fd2ae97196b84305a870b1ff38738df3decb61 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Thu, 28 Mar 2024 17:12:37 +0100
Subject: [PATCH 0597/1254] removed encode error proxy

---
 .../basic-features/src/basic_features_main.rs |   1 -
 .../basic-features/src/codec_err_test.rs      |  13 +--
 .../basic-features/src/encode_error_proxy.rs  | 100 ------------------
 3 files changed, 3 insertions(+), 111 deletions(-)
 delete mode 100644 contracts/feature-tests/basic-features/src/encode_error_proxy.rs

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 1d3485b3f1..2be5e1a535 100644
--- a/contracts/feature-tests/basic-features/src/basic_features_main.rs
+++ b/contracts/feature-tests/basic-features/src/basic_features_main.rs
@@ -12,7 +12,6 @@ pub mod crypto_features;
 pub mod echo;
 pub mod echo_managed;
 pub mod elliptic_curve_features;
-pub mod encode_error_proxy;
 pub mod event_features;
 pub mod macro_features;
 pub mod managed_address_features;
diff --git a/contracts/feature-tests/basic-features/src/codec_err_test.rs b/contracts/feature-tests/basic-features/src/codec_err_test.rs
index e72f71b44b..1e2a2d4719 100644
--- a/contracts/feature-tests/basic-features/src/codec_err_test.rs
+++ b/contracts/feature-tests/basic-features/src/codec_err_test.rs
@@ -1,5 +1,5 @@
 multiversx_sc::imports!();
-use crate::{encode_error_proxy, types::CodecErrorTestType};
+use crate::types::CodecErrorTestType;
 
 /// Test various serialization errors.
 #[multiversx_sc::module]
@@ -52,20 +52,13 @@ pub trait CodecErrorTest {
     /// It just covers contract init serialization errors.
     #[endpoint]
     fn codec_err_contract_init(&self) {
-        let _ = self
-            .tx()
-            .typed(encode_error_proxy::EncodeErrorProxy)
-            .init(CodecErrorTestType);
+        let _ = self.tx().raw_call().argument(&CodecErrorTestType);
     }
 
     /// Never actually calls any async/sync call, so it is appropriate in this contract.
     /// It just covers contract call serialization errors.
     #[endpoint]
     fn codec_err_contract_call(&self) {
-        let _ = self
-            .tx()
-            .to(&ManagedAddress::zero())
-            .typed(encode_error_proxy::EncodeErrorProxy)
-            .encode_error_method(CodecErrorTestType);
+        let _ = self.tx().raw_call().argument(&CodecErrorTestType);
     }
 }
diff --git a/contracts/feature-tests/basic-features/src/encode_error_proxy.rs b/contracts/feature-tests/basic-features/src/encode_error_proxy.rs
deleted file mode 100644
index eee70b6ae2..0000000000
--- a/contracts/feature-tests/basic-features/src/encode_error_proxy.rs
+++ /dev/null
@@ -1,100 +0,0 @@
-// Code generated by the multiversx-sc proxy generator. DO NOT EDIT.
-
-////////////////////////////////////////////////////
-////////////////// AUTO-GENERATED //////////////////
-////////////////////////////////////////////////////
-
-#![allow(dead_code)]
-#![allow(clippy::all)]
-
-use multiversx_sc::proxy_imports::*;
-
-use crate::types::CodecErrorTestType;
-
-pub struct EncodeErrorProxy;
-
-impl<Env, From, To, Gas> TxProxyTrait<Env, From, To, Gas> for EncodeErrorProxy
-where
-    Env: TxEnv,
-    From: TxFrom<Env>,
-    To: TxTo<Env>,
-    Gas: TxGas<Env>,
-{
-    type TxProxyMethods = EncodeErrorProxyMethods<Env, From, To, Gas>;
-
-    fn proxy_methods(self, tx: Tx<Env, From, To, (), Gas, (), ()>) -> Self::TxProxyMethods {
-        EncodeErrorProxyMethods { wrapped_tx: tx }
-    }
-}
-
-pub struct EncodeErrorProxyMethods<Env, From, To, Gas>
-where
-    Env: TxEnv,
-    From: TxFrom<Env>,
-    To: TxTo<Env>,
-    Gas: TxGas<Env>,
-{
-    wrapped_tx: Tx<Env, From, To, (), Gas, (), ()>,
-}
-
-#[rustfmt::skip]
-impl<Env, From, Gas> EncodeErrorProxyMethods<Env, From, (), Gas>
-where
-    Env: TxEnv,
-    Env::Api: VMApi,
-    From: TxFrom<Env>,
-    Gas: TxGas<Env>,
-{
-    pub fn init<
-        Arg0: CodecInto<CodecErrorTestType>,
-    >(
-        self,
-        error_arg: Arg0,
-    ) -> TxProxyDeploy<Env, From, Gas, ()> {
-        self.wrapped_tx
-            .raw_deploy()
-            .argument(&error_arg)
-            .original_result()
-    }
-}
-
-#[rustfmt::skip]
-impl<Env, From, To, Gas> EncodeErrorProxyMethods<Env, From, To, Gas>
-where
-    Env: TxEnv,
-    Env::Api: VMApi,
-    From: TxFrom<Env>,
-    To: TxTo<Env>,
-    Gas: TxGas<Env>,
-{
-    pub fn upgrade(
-        self,
-    ) -> TxProxyUpgrade<Env, From, To, Gas, ()> {
-        self.wrapped_tx
-            .raw_upgrade()
-            .original_result()
-    }
-}
-
-#[rustfmt::skip]
-impl<Env, From, To, Gas> EncodeErrorProxyMethods<Env, From, To, Gas>
-where
-    Env: TxEnv,
-    Env::Api: VMApi,
-    From: TxFrom<Env>,
-    To: TxTo<Env>,
-    Gas: TxGas<Env>,
-{
-    pub fn encode_error_method<
-        Arg0: CodecInto<CodecErrorTestType>,
-    >(
-        self,
-        error_arg: Arg0,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
-        self.wrapped_tx
-            .raw_call()
-            .function_name("encode_error_method")
-            .argument(&error_arg)
-            .original_result()
-    }
-}

From 0419ce4ec55f108e8b4d4c7d954f2009effe4b28 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 28 Mar 2024 18:38:51 +0200
Subject: [PATCH 0598/1254] egld or esdt payment types cleanup

---
 framework/base/src/types/interaction/tx.rs    | 143 +++++++-----------
 .../base/src/types/interaction/tx_payment.rs  |   3 +-
 .../tx_payment/tx_payment_egld_or_esdt.rs     |  60 ++++++++
 .../tx_payment_egld_or_multi_esdt.rs          |  52 +++----
 .../tx_payment_egld_or_multi_esdt_ref.rs      |  77 ++++++++++
 .../tx_payment/tx_payment_other.rs            | 120 ---------------
 6 files changed, 211 insertions(+), 244 deletions(-)
 create mode 100644 framework/base/src/types/interaction/tx_payment/tx_payment_egld_or_esdt.rs
 create mode 100644 framework/base/src/types/interaction/tx_payment/tx_payment_egld_or_multi_esdt_ref.rs
 delete mode 100644 framework/base/src/types/interaction/tx_payment/tx_payment_other.rs

diff --git a/framework/base/src/types/interaction/tx.rs b/framework/base/src/types/interaction/tx.rs
index 5f0ef2260e..72da11014b 100644
--- a/framework/base/src/types/interaction/tx.rs
+++ b/framework/base/src/types/interaction/tx.rs
@@ -1,6 +1,7 @@
 use crate::{
     api::CallTypeApi,
     contract_base::BlockchainWrapper,
+    proxy_imports::EgldOrMultiEsdtPayment,
     types::{
         BigUint, CodeMetadata, EgldOrEsdtTokenPayment, EgldOrMultiEsdtPaymentRefs,
         EsdtTokenPayment, EsdtTokenPaymentRefs, ManagedAddress, ManagedBuffer, ManagedOption,
@@ -151,41 +152,43 @@ where
     Data: TxData<Env>,
     RH: TxResultHandler<Env>,
 {
-    pub fn egld<EgldValue>(
-        self,
-        egld_value: EgldValue,
-    ) -> Tx<Env, From, To, Egld<EgldValue>, Gas, Data, RH>
+    /// Adds any payment to a transaction, if no payment has been added before.
+    pub fn payment<Payment>(self, payment: Payment) -> Tx<Env, From, To, Payment, Gas, Data, RH>
     where
-        EgldValue: TxEgldValue<Env>,
+        Payment: TxPayment<Env>,
     {
         Tx {
             env: self.env,
             from: self.from,
             to: self.to,
-            payment: Egld(egld_value),
+            payment: payment,
             gas: self.gas,
             data: self.data,
             result_handler: self.result_handler,
         }
     }
 
+    /// Adds EGLD value to a transaction.
+    ///
+    /// Accepts any type that can represent and EGLD amount: BigUint, &BigUint, etc.
+    pub fn egld<EgldValue>(
+        self,
+        egld_value: EgldValue,
+    ) -> Tx<Env, From, To, Egld<EgldValue>, Gas, Data, RH>
+    where
+        EgldValue: TxEgldValue<Env>,
+    {
+        self.payment(Egld(egld_value))
+    }
+
+    /// Backwards compatibility. Use method `egld` instead.
     pub fn with_egld_transfer(
         self,
         egld_amount: BigUint<Env::Api>,
     ) -> Tx<Env, From, To, EgldPayment<Env::Api>, Gas, Data, RH> {
         self.egld(egld_amount)
     }
-}
 
-impl<Env, From, To, Gas, Data, RH> Tx<Env, From, To, (), Gas, Data, RH>
-where
-    Env: TxEnv,
-    From: TxFrom<Env>,
-    To: TxTo<Env>,
-    Gas: TxGas<Env>,
-    Data: TxData<Env>,
-    RH: TxResultHandler<Env>,
-{
     /// Adds a single ESDT token transfer to a transaction.
     ///
     /// Since this is the first ESDT payment, a single payment tx is produced. Can be called again for multiple payments.
@@ -193,15 +196,7 @@ where
         self,
         payment: P,
     ) -> Tx<Env, From, To, EsdtTokenPayment<Env::Api>, Gas, Data, RH> {
-        Tx {
-            env: self.env,
-            from: self.from,
-            to: self.to,
-            payment: payment.into(),
-            gas: self.gas,
-            data: self.data,
-            result_handler: self.result_handler,
-        }
+        self.payment(payment.into())
     }
 
     /// Sets a single token payment, with the token identifier and amount kept as references.
@@ -213,65 +208,21 @@ where
         token_nonce: u64,
         amount: &'a BigUint<Env::Api>,
     ) -> Tx<Env, From, To, EsdtTokenPaymentRefs<'a, Env::Api>, Gas, Data, RH> {
-        Tx {
-            env: self.env,
-            from: self.from,
-            to: self.to,
-            payment: EsdtTokenPaymentRefs {
-                token_identifier,
-                token_nonce,
-                amount,
-            },
-            gas: self.gas,
-            data: self.data,
-            result_handler: self.result_handler,
-        }
+        self.payment(EsdtTokenPaymentRefs {
+            token_identifier,
+            token_nonce,
+            amount,
+        })
     }
 
-    /// Adds a collection of ESDT payments to a transaction.
+    /// Sets a collection of ESDT transfers as the payment of the transaction.
+    ///
+    /// Equivalend to just ``.payment(payments)`, but only accepts the multi-esdt types.
     pub fn multi_esdt<Payment>(self, payments: Payment) -> Tx<Env, From, To, Payment, Gas, Data, RH>
     where
         Payment: TxPaymentMultiEsdt<Env>,
     {
-        Tx {
-            env: self.env,
-            from: self.from,
-            to: self.to,
-            payment: payments,
-            gas: self.gas,
-            data: self.data,
-            result_handler: self.result_handler,
-        }
-    }
-
-    pub fn egld_ref(
-        self,
-        amount: &BigUint<Env::Api>,
-    ) -> Tx<Env, From, To, EgldOrMultiEsdtPaymentRefs<'_, Env::Api>, Gas, Data, RH> {
-        Tx {
-            env: self.env,
-            from: self.from,
-            to: self.to,
-            payment: EgldOrMultiEsdtPaymentRefs::Egld(amount),
-            gas: self.gas,
-            data: self.data,
-            result_handler: self.result_handler,
-        }
-    }
-
-    pub fn mult_esdt_payment_ref(
-        self,
-        amount: &ManagedVec<Env::Api, EsdtTokenPayment<Env::Api>>,
-    ) -> Tx<Env, From, To, EgldOrMultiEsdtPaymentRefs<'_, Env::Api>, Gas, Data, RH> {
-        Tx {
-            env: self.env,
-            from: self.from,
-            to: self.to,
-            payment: EgldOrMultiEsdtPaymentRefs::MultiEsdt(amount),
-            gas: self.gas,
-            data: self.data,
-            result_handler: self.result_handler,
-        }
+        self.payment(payments)
     }
 
     /// Backwards compatibility.
@@ -286,15 +237,7 @@ where
         self,
         payment: P,
     ) -> Tx<Env, From, To, EgldOrEsdtTokenPayment<Env::Api>, Gas, Data, RH> {
-        Tx {
-            env: self.env,
-            from: self.from,
-            to: self.to,
-            payment: payment.into(),
-            gas: self.gas,
-            data: self.data,
-            result_handler: self.result_handler,
-        }
+        self.payment(payment.into())
     }
 
     /// Backwards compatibility.
@@ -304,6 +247,13 @@ where
     ) -> Tx<Env, From, To, EgldOrEsdtTokenPayment<Env::Api>, Gas, Data, RH> {
         self.egld_or_single_esdt(payment)
     }
+
+    pub fn egld_or_multi_esdt<P: Into<EgldOrMultiEsdtPayment<Env::Api>>>(
+        self,
+        payment: P,
+    ) -> Tx<Env, From, To, EgldOrMultiEsdtPayment<Env::Api>, Gas, Data, RH> {
+        self.payment(payment.into())
+    }
 }
 
 impl<Env, From, To, Gas, Data, RH> Tx<Env, From, To, EsdtTokenPayment<Env::Api>, Gas, Data, RH>
@@ -318,7 +268,7 @@ where
     /// Adds a single ESDT token transfer to a contract call.
     ///
     /// Can be called multiple times on the same call.
-    pub fn with_esdt_transfer<P: Into<EsdtTokenPayment<Env::Api>>>(
+    pub fn esdt<P: Into<EsdtTokenPayment<Env::Api>>>(
         self,
         payment: P,
     ) -> Tx<Env, From, To, MultiEsdtPayment<Env::Api>, Gas, Data, RH> {
@@ -335,6 +285,14 @@ where
             result_handler: self.result_handler,
         }
     }
+
+    /// Backwards compatibility.
+    pub fn with_esdt_transfer<P: Into<EsdtTokenPayment<Env::Api>>>(
+        self,
+        payment: P,
+    ) -> Tx<Env, From, To, MultiEsdtPayment<Env::Api>, Gas, Data, RH> {
+        self.esdt(payment)
+    }
 }
 
 impl<Env, From, To, Gas, Data, RH> Tx<Env, From, To, MultiEsdtPayment<Env::Api>, Gas, Data, RH>
@@ -349,6 +307,15 @@ where
     /// Adds a single ESDT token transfer to a contract call.
     ///
     /// Can be called multiple times on the same call.
+    pub fn esdt<P: Into<EsdtTokenPayment<Env::Api>>>(
+        mut self,
+        payment: P,
+    ) -> Tx<Env, From, To, MultiEsdtPayment<Env::Api>, Gas, Data, RH> {
+        self.payment.push(payment.into());
+        self
+    }
+
+    /// Backwards compatibility.
     pub fn with_esdt_transfer<P: Into<EsdtTokenPayment<Env::Api>>>(
         mut self,
         payment: P,
diff --git a/framework/base/src/types/interaction/tx_payment.rs b/framework/base/src/types/interaction/tx_payment.rs
index 12a217e243..4e3c560bcb 100644
--- a/framework/base/src/types/interaction/tx_payment.rs
+++ b/framework/base/src/types/interaction/tx_payment.rs
@@ -1,9 +1,10 @@
 mod tx_payment_egld;
+mod tx_payment_egld_or_esdt;
 mod tx_payment_egld_or_multi_esdt;
+mod tx_payment_egld_or_multi_esdt_ref;
 mod tx_payment_egld_value;
 mod tx_payment_multi_esdt;
 mod tx_payment_none;
-mod tx_payment_other;
 mod tx_payment_single_esdt;
 mod tx_payment_single_esdt_ref;
 
diff --git a/framework/base/src/types/interaction/tx_payment/tx_payment_egld_or_esdt.rs b/framework/base/src/types/interaction/tx_payment/tx_payment_egld_or_esdt.rs
new file mode 100644
index 0000000000..adc5ef36f9
--- /dev/null
+++ b/framework/base/src/types/interaction/tx_payment/tx_payment_egld_or_esdt.rs
@@ -0,0 +1,60 @@
+use crate::{
+    contract_base::SendRawWrapper,
+    types::{
+        BigUint, Egld, EgldOrEsdtTokenPayment, EgldOrMultiEsdtPayment, ManagedAddress, ManagedVec,
+        TxFrom, TxToSpecified,
+    },
+};
+
+use super::{AnnotatedEgldPayment, FullPaymentData, FunctionCall, TxEgldValue, TxEnv, TxPayment};
+
+impl<Env> TxPayment<Env> for EgldOrEsdtTokenPayment<Env::Api>
+where
+    Env: TxEnv,
+{
+    fn is_no_payment(&self, _env: &Env) -> bool {
+        self.amount == 0u32
+    }
+
+    fn perform_transfer_execute(
+        self,
+        env: &Env,
+        to: &ManagedAddress<Env::Api>,
+        gas_limit: u64,
+        fc: FunctionCall<Env::Api>,
+    ) {
+        self.map_egld_or_esdt(
+            (to, fc),
+            |(to, fc), amount| Egld(amount).perform_transfer_execute(env, to, gas_limit, fc),
+            |(to, fc), esdt_payment| esdt_payment.perform_transfer_execute(env, to, gas_limit, fc),
+        )
+    }
+
+    fn with_normalized<From, To, F, R>(
+        self,
+        env: &Env,
+        from: &From,
+        to: To,
+        fc: FunctionCall<Env::Api>,
+        f: F,
+    ) -> R
+    where
+        From: TxFrom<Env>,
+        To: TxToSpecified<Env>,
+        F: FnOnce(&ManagedAddress<Env::Api>, &BigUint<Env::Api>, &FunctionCall<Env::Api>) -> R,
+    {
+        self.map_egld_or_esdt(
+            (to, fc, f),
+            |(to, fc, f), amount| Egld(amount).with_normalized(env, from, to, fc, f),
+            |(to, fc, f), esdt_payment| esdt_payment.with_normalized(env, from, to, fc, f),
+        )
+    }
+
+    fn into_full_payment_data(self, env: &Env) -> FullPaymentData<Env::Api> {
+        self.map_egld_or_esdt(
+            (),
+            |(), amount| TxPayment::<Env>::into_full_payment_data(Egld(amount), env),
+            |(), esdt_payment| TxPayment::<Env>::into_full_payment_data(esdt_payment, env),
+        )
+    }
+}
diff --git a/framework/base/src/types/interaction/tx_payment/tx_payment_egld_or_multi_esdt.rs b/framework/base/src/types/interaction/tx_payment/tx_payment_egld_or_multi_esdt.rs
index d5cd9a1a24..6cfcbb4a3c 100644
--- a/framework/base/src/types/interaction/tx_payment/tx_payment_egld_or_multi_esdt.rs
+++ b/framework/base/src/types/interaction/tx_payment/tx_payment_egld_or_multi_esdt.rs
@@ -3,18 +3,18 @@ use alloc::borrow::ToOwned;
 use crate::{
     api::ManagedTypeApi,
     contract_base::SendRawWrapper,
-    proxy_imports::{
-        AnnotatedValue, EgldOrMultiEsdtPayment, EgldOrMultiEsdtPaymentRefs, ManagedType,
-    },
+    proxy_imports::{AnnotatedValue, EgldOrMultiEsdtPayment, ManagedType},
     types::{
         BigUint, EsdtTokenPayment, EsdtTokenPaymentRefs, ManagedAddress, ManagedVec,
         MultiEsdtPayment, TxFrom, TxToSpecified,
     },
 };
 
-use super::{AnnotatedEgldPayment, FullPaymentData, FunctionCall, TxEgldValue, TxEnv, TxPayment};
+use super::{
+    AnnotatedEgldPayment, Egld, FullPaymentData, FunctionCall, TxEgldValue, TxEnv, TxPayment,
+};
 
-impl<'a, Env> TxPayment<Env> for EgldOrMultiEsdtPaymentRefs<'a, Env::Api>
+impl<Env> TxPayment<Env> for EgldOrMultiEsdtPayment<Env::Api>
 where
     Env: TxEnv,
 {
@@ -30,23 +30,11 @@ where
         fc: FunctionCall<Env::Api>,
     ) {
         match self {
-            EgldOrMultiEsdtPaymentRefs::Egld(egld_amount) => {
-                let _ = SendRawWrapper::<Env::Api>::new().direct_egld_execute(
-                    to,
-                    egld_amount,
-                    gas_limit,
-                    &fc.function_name,
-                    &fc.arg_buffer,
-                );
+            EgldOrMultiEsdtPayment::Egld(egld_amount) => {
+                Egld(egld_amount).perform_transfer_execute(env, to, gas_limit, fc)
             },
-            EgldOrMultiEsdtPaymentRefs::MultiEsdt(multi_esdt_payment) => {
-                let _ = SendRawWrapper::<Env::Api>::new().multi_esdt_transfer_execute(
-                    to,
-                    multi_esdt_payment,
-                    gas_limit,
-                    &fc.function_name,
-                    &fc.arg_buffer,
-                );
+            EgldOrMultiEsdtPayment::MultiEsdt(multi_esdt_payment) => {
+                multi_esdt_payment.perform_transfer_execute(env, to, gas_limit, fc)
             },
         }
     }
@@ -65,28 +53,22 @@ where
         F: FnOnce(&ManagedAddress<Env::Api>, &BigUint<Env::Api>, &FunctionCall<Env::Api>) -> R,
     {
         match self {
-            EgldOrMultiEsdtPaymentRefs::Egld(egld_amount) => {
-                to.with_address_ref(env, |to_addr| f(to_addr, &BigUint::zero(), &fc))
+            EgldOrMultiEsdtPayment::Egld(egld_amount) => {
+                Egld(egld_amount).with_normalized(env, from, to, fc, f)
             },
-            EgldOrMultiEsdtPaymentRefs::MultiEsdt(multi_esdt_payment) => {
-                to.with_address_ref(env, |to_addr| {
-                    let fc_conv =
-                        fc.convert_to_multi_transfer_esdt_call(to_addr, multi_esdt_payment);
-                    f(to_addr, &BigUint::zero(), &fc_conv)
-                })
+            EgldOrMultiEsdtPayment::MultiEsdt(multi_esdt_payment) => {
+                multi_esdt_payment.with_normalized(env, from, to, fc, f)
             },
         }
     }
 
     fn into_full_payment_data(self, env: &Env) -> FullPaymentData<Env::Api> {
         match self {
-            EgldOrMultiEsdtPaymentRefs::Egld(egld_amount) => FullPaymentData {
-                egld: Some(AnnotatedEgldPayment::new_egld(egld_amount.into_value(env))),
-                multi_esdt: ManagedVec::new(),
+            EgldOrMultiEsdtPayment::Egld(egld_amount) => {
+                TxPayment::<Env>::into_full_payment_data(Egld(egld_amount), env)
             },
-            EgldOrMultiEsdtPaymentRefs::MultiEsdt(multi_esdt_payment) => FullPaymentData {
-                egld: None,
-                multi_esdt: multi_esdt_payment.clone(),
+            EgldOrMultiEsdtPayment::MultiEsdt(multi_esdt_payment) => {
+                TxPayment::<Env>::into_full_payment_data(multi_esdt_payment, env)
             },
         }
     }
diff --git a/framework/base/src/types/interaction/tx_payment/tx_payment_egld_or_multi_esdt_ref.rs b/framework/base/src/types/interaction/tx_payment/tx_payment_egld_or_multi_esdt_ref.rs
new file mode 100644
index 0000000000..2c587cd448
--- /dev/null
+++ b/framework/base/src/types/interaction/tx_payment/tx_payment_egld_or_multi_esdt_ref.rs
@@ -0,0 +1,77 @@
+use alloc::borrow::ToOwned;
+
+use crate::{
+    api::ManagedTypeApi,
+    contract_base::SendRawWrapper,
+    proxy_imports::{
+        AnnotatedValue, EgldOrMultiEsdtPayment, EgldOrMultiEsdtPaymentRefs, ManagedType,
+    },
+    types::{
+        BigUint, EsdtTokenPayment, EsdtTokenPaymentRefs, ManagedAddress, ManagedVec,
+        MultiEsdtPayment, TxFrom, TxToSpecified,
+    },
+};
+
+use super::{
+    AnnotatedEgldPayment, Egld, FullPaymentData, FunctionCall, TxEgldValue, TxEnv, TxPayment,
+};
+
+impl<'a, Env> TxPayment<Env> for EgldOrMultiEsdtPaymentRefs<'a, Env::Api>
+where
+    Env: TxEnv,
+{
+    fn is_no_payment(&self, _env: &Env) -> bool {
+        self.is_empty()
+    }
+
+    fn perform_transfer_execute(
+        self,
+        env: &Env,
+        to: &ManagedAddress<Env::Api>,
+        gas_limit: u64,
+        fc: FunctionCall<Env::Api>,
+    ) {
+        match self {
+            EgldOrMultiEsdtPaymentRefs::Egld(egld_amount) => {
+                Egld(egld_amount).perform_transfer_execute(env, to, gas_limit, fc);
+            },
+            EgldOrMultiEsdtPaymentRefs::MultiEsdt(multi_esdt_payment) => {
+                multi_esdt_payment.perform_transfer_execute(env, to, gas_limit, fc);
+            },
+        }
+    }
+
+    fn with_normalized<From, To, F, R>(
+        self,
+        env: &Env,
+        from: &From,
+        to: To,
+        fc: FunctionCall<Env::Api>,
+        f: F,
+    ) -> R
+    where
+        From: TxFrom<Env>,
+        To: TxToSpecified<Env>,
+        F: FnOnce(&ManagedAddress<Env::Api>, &BigUint<Env::Api>, &FunctionCall<Env::Api>) -> R,
+    {
+        match self {
+            EgldOrMultiEsdtPaymentRefs::Egld(egld_amount) => {
+                Egld(egld_amount).with_normalized(env, from, to, fc, f)
+            },
+            EgldOrMultiEsdtPaymentRefs::MultiEsdt(multi_esdt_payment) => {
+                multi_esdt_payment.with_normalized(env, from, to, fc, f)
+            },
+        }
+    }
+
+    fn into_full_payment_data(self, env: &Env) -> FullPaymentData<Env::Api> {
+        match self {
+            EgldOrMultiEsdtPaymentRefs::Egld(egld_amount) => {
+                Egld(egld_amount).into_full_payment_data(env)
+            },
+            EgldOrMultiEsdtPaymentRefs::MultiEsdt(multi_esdt_payment) => {
+                multi_esdt_payment.into_full_payment_data(env)
+            },
+        }
+    }
+}
diff --git a/framework/base/src/types/interaction/tx_payment/tx_payment_other.rs b/framework/base/src/types/interaction/tx_payment/tx_payment_other.rs
deleted file mode 100644
index 01d1c3a6bb..0000000000
--- a/framework/base/src/types/interaction/tx_payment/tx_payment_other.rs
+++ /dev/null
@@ -1,120 +0,0 @@
-use crate::{
-    contract_base::SendRawWrapper,
-    types::{
-        BigUint, Egld, EgldOrEsdtTokenPayment, EgldOrMultiEsdtPayment, ManagedAddress, ManagedVec,
-        TxFrom, TxToSpecified,
-    },
-};
-
-use super::{AnnotatedEgldPayment, FullPaymentData, FunctionCall, TxEgldValue, TxEnv, TxPayment};
-
-impl<Env> TxPayment<Env> for EgldOrEsdtTokenPayment<Env::Api>
-where
-    Env: TxEnv,
-{
-    fn is_no_payment(&self, _env: &Env) -> bool {
-        self.amount == 0u32
-    }
-
-    fn perform_transfer_execute(
-        self,
-        env: &Env,
-        to: &ManagedAddress<Env::Api>,
-        gas_limit: u64,
-        fc: FunctionCall<Env::Api>,
-    ) {
-        self.map_egld_or_esdt(
-            (to, fc),
-            |(to, fc), amount| Egld(amount).perform_transfer_execute(env, to, gas_limit, fc),
-            |(to, fc), esdt_payment| esdt_payment.perform_transfer_execute(env, to, gas_limit, fc),
-        )
-    }
-
-    fn with_normalized<From, To, F, R>(
-        self,
-        env: &Env,
-        from: &From,
-        to: To,
-        fc: FunctionCall<Env::Api>,
-        f: F,
-    ) -> R
-    where
-        From: TxFrom<Env>,
-        To: TxToSpecified<Env>,
-        F: FnOnce(&ManagedAddress<Env::Api>, &BigUint<Env::Api>, &FunctionCall<Env::Api>) -> R,
-    {
-        self.map_egld_or_esdt(
-            (to, fc, f),
-            |(to, fc, f), amount| Egld(amount).with_normalized(env, from, to, fc, f),
-            |(to, fc, f), esdt_payment| esdt_payment.with_normalized(env, from, to, fc, f),
-        )
-    }
-
-    fn into_full_payment_data(self, env: &Env) -> FullPaymentData<Env::Api> {
-        self.map_egld_or_esdt(
-            (),
-            |(), amount| TxPayment::<Env>::into_full_payment_data(Egld(amount), env),
-            |(), esdt_payment| TxPayment::<Env>::into_full_payment_data(esdt_payment, env),
-        )
-    }
-}
-
-impl<Env> TxPayment<Env> for EgldOrMultiEsdtPayment<Env::Api>
-where
-    Env: TxEnv,
-{
-    fn is_no_payment(&self, _env: &Env) -> bool {
-        self.is_empty()
-    }
-
-    fn perform_transfer_execute(
-        self,
-        env: &Env,
-        to: &ManagedAddress<Env::Api>,
-        gas_limit: u64,
-        fc: FunctionCall<Env::Api>,
-    ) {
-        match self {
-            EgldOrMultiEsdtPayment::Egld(egld_amount) => {
-                Egld(egld_amount).perform_transfer_execute(env, to, gas_limit, fc)
-            },
-            EgldOrMultiEsdtPayment::MultiEsdt(multi_esdt_payment) => {
-                multi_esdt_payment.perform_transfer_execute(env, to, gas_limit, fc)
-            },
-        }
-    }
-
-    fn with_normalized<From, To, F, R>(
-        self,
-        env: &Env,
-        from: &From,
-        to: To,
-        fc: FunctionCall<Env::Api>,
-        f: F,
-    ) -> R
-    where
-        From: TxFrom<Env>,
-        To: TxToSpecified<Env>,
-        F: FnOnce(&ManagedAddress<Env::Api>, &BigUint<Env::Api>, &FunctionCall<Env::Api>) -> R,
-    {
-        match self {
-            EgldOrMultiEsdtPayment::Egld(egld_amount) => {
-                Egld(egld_amount).with_normalized(env, from, to, fc, f)
-            },
-            EgldOrMultiEsdtPayment::MultiEsdt(multi_esdt_payment) => {
-                multi_esdt_payment.with_normalized(env, from, to, fc, f)
-            },
-        }
-    }
-
-    fn into_full_payment_data(self, env: &Env) -> FullPaymentData<Env::Api> {
-        match self {
-            EgldOrMultiEsdtPayment::Egld(egld_amount) => {
-                TxPayment::<Env>::into_full_payment_data(Egld(egld_amount), env)
-            },
-            EgldOrMultiEsdtPayment::MultiEsdt(multi_esdt_payment) => {
-                TxPayment::<Env>::into_full_payment_data(multi_esdt_payment, env)
-            },
-        }
-    }
-}

From 744cb59d3b084321b3b18a36f4af522ea5f1c71f Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 28 Mar 2024 18:41:35 +0200
Subject: [PATCH 0599/1254] clippy fix

---
 framework/base/src/types/interaction/tx.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/framework/base/src/types/interaction/tx.rs b/framework/base/src/types/interaction/tx.rs
index 72da11014b..04f101347c 100644
--- a/framework/base/src/types/interaction/tx.rs
+++ b/framework/base/src/types/interaction/tx.rs
@@ -161,7 +161,7 @@ where
             env: self.env,
             from: self.from,
             to: self.to,
-            payment: payment,
+            payment,
             gas: self.gas,
             data: self.data,
             result_handler: self.result_handler,

From a320dca1e2345f1d90d2f92b4f870c2916c6b23a Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Thu, 28 Mar 2024 18:50:53 +0100
Subject: [PATCH 0600/1254] fix after review

---
 contracts/feature-tests/basic-features/src/codec_err_test.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contracts/feature-tests/basic-features/src/codec_err_test.rs b/contracts/feature-tests/basic-features/src/codec_err_test.rs
index 1e2a2d4719..cbe8f470b5 100644
--- a/contracts/feature-tests/basic-features/src/codec_err_test.rs
+++ b/contracts/feature-tests/basic-features/src/codec_err_test.rs
@@ -52,7 +52,7 @@ pub trait CodecErrorTest {
     /// It just covers contract init serialization errors.
     #[endpoint]
     fn codec_err_contract_init(&self) {
-        let _ = self.tx().raw_call().argument(&CodecErrorTestType);
+        let _ = self.tx().raw_deploy().argument(&CodecErrorTestType);
     }
 
     /// Never actually calls any async/sync call, so it is appropriate in this contract.

From e3f758a2d55565e8f305f9133416a145f6a41040 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Fri, 29 Mar 2024 09:54:24 +0100
Subject: [PATCH 0601/1254] removed generated tag and allows

---
 contracts/examples/proxy-pause/src/pause_sc_proxy.rs | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/contracts/examples/proxy-pause/src/pause_sc_proxy.rs b/contracts/examples/proxy-pause/src/pause_sc_proxy.rs
index addb769ed0..441b9b17c5 100644
--- a/contracts/examples/proxy-pause/src/pause_sc_proxy.rs
+++ b/contracts/examples/proxy-pause/src/pause_sc_proxy.rs
@@ -1,12 +1,3 @@
-// Code generated by the multiversx-sc proxy generator. DO NOT EDIT.
-
-////////////////////////////////////////////////////
-////////////////// AUTO-GENERATED //////////////////
-////////////////////////////////////////////////////
-
-#![allow(dead_code)]
-#![allow(clippy::all)]
-
 use multiversx_sc::proxy_imports::*;
 
 pub struct PausableProxy;

From f08c0127c2938a6d911eb438892dbadcf0a3e5f2 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Fri, 29 Mar 2024 13:04:09 +0100
Subject: [PATCH 0602/1254] more migrations for seed nft minter, fractional
 nfts, rewards distribution scs

---
 .../fractional-nfts/src/fractional_nfts.rs    |  29 +--
 .../src/nft_marketplace_proxy.rs              |  56 +++++
 contracts/examples/nft-minter/src/lib.rs      |  27 +--
 .../nft-minter/src/nft_marketplace_proxy.rs   |  56 +++++
 .../src/rewards_distribution.rs               |  41 ++--
 .../src/seed_nft_minter_proxy.rs              | 203 ++++++++++++++++++
 .../examples/seed-nft-minter/sc-config.toml   |   2 +
 .../src/distribution_module.rs                |   3 +-
 .../src/nft_marketplace_proxy.rs              |  73 +++++++
 .../seed-nft-minter/src/seed_nft_minter.rs    |  31 +--
 10 files changed, 428 insertions(+), 93 deletions(-)
 create mode 100644 contracts/examples/fractional-nfts/src/nft_marketplace_proxy.rs
 create mode 100644 contracts/examples/nft-minter/src/nft_marketplace_proxy.rs
 create mode 100644 contracts/examples/rewards-distribution/src/seed_nft_minter_proxy.rs
 create mode 100644 contracts/examples/seed-nft-minter/sc-config.toml
 create mode 100644 contracts/examples/seed-nft-minter/src/nft_marketplace_proxy.rs

diff --git a/contracts/examples/fractional-nfts/src/fractional_nfts.rs b/contracts/examples/fractional-nfts/src/fractional_nfts.rs
index 761eb1ec68..16f1c87aed 100644
--- a/contracts/examples/fractional-nfts/src/fractional_nfts.rs
+++ b/contracts/examples/fractional-nfts/src/fractional_nfts.rs
@@ -5,6 +5,7 @@ use multiversx_sc::imports::*;
 use multiversx_sc_modules::default_issue_callbacks;
 mod fractional_uri_info;
 use fractional_uri_info::FractionalUriInfo;
+pub mod nft_marketplace_proxy;
 
 #[multiversx_sc::contract]
 pub trait FractionalNfts: default_issue_callbacks::DefaultIssueCallbacksModule {
@@ -39,10 +40,11 @@ pub trait FractionalNfts: default_issue_callbacks::DefaultIssueCallbacksModule {
         token_nonce: u64,
     ) {
         let caller = self.blockchain().get_caller();
-        self.marketplace_proxy(marketplace_address)
+        self.tx()
+            .to(&marketplace_address)
+            .typed(nft_marketplace_proxy::NftMarketplaceProxy)
             .claim_tokens(caller, token_id, token_nonce)
-            .async_call()
-            .call_and_exit()
+            .async_call_and_exit();
     }
 
     #[payable("*")]
@@ -138,25 +140,4 @@ pub trait FractionalNfts: default_issue_callbacks::DefaultIssueCallbacksModule {
     #[view(getFractionalToken)]
     #[storage_mapper("fractional_token")]
     fn fractional_token(&self) -> NonFungibleTokenMapper;
-
-    #[proxy]
-    fn marketplace_proxy(
-        &self,
-        sc_address: ManagedAddress,
-    ) -> nft_marketplace_proxy::Proxy<Self::Api>;
-}
-
-mod nft_marketplace_proxy {
-    use multiversx_sc::imports::*;
-
-    #[multiversx_sc::proxy]
-    pub trait NftMarketplace {
-        #[endpoint(claimTokens)]
-        fn claim_tokens(
-            &self,
-            claim_destination: &ManagedAddress,
-            token_id: &EgldOrEsdtTokenIdentifier,
-            token_nonce: u64,
-        ) -> MultiValue2<BigUint, ManagedVec<EsdtTokenPayment>>;
-    }
 }
diff --git a/contracts/examples/fractional-nfts/src/nft_marketplace_proxy.rs b/contracts/examples/fractional-nfts/src/nft_marketplace_proxy.rs
new file mode 100644
index 0000000000..563e40b7af
--- /dev/null
+++ b/contracts/examples/fractional-nfts/src/nft_marketplace_proxy.rs
@@ -0,0 +1,56 @@
+use multiversx_sc::proxy_imports::*;
+
+pub struct NftMarketplaceProxy;
+
+impl<Env, From, To, Gas> TxProxyTrait<Env, From, To, Gas> for NftMarketplaceProxy
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    type TxProxyMethods = NftMarketplaceProxyMethods<Env, From, To, Gas>;
+
+    fn proxy_methods(self, tx: Tx<Env, From, To, (), Gas, (), ()>) -> Self::TxProxyMethods {
+        NftMarketplaceProxyMethods { wrapped_tx: tx }
+    }
+}
+
+pub struct NftMarketplaceProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    wrapped_tx: Tx<Env, From, To, (), Gas, (), ()>,
+}
+
+#[rustfmt::skip]
+impl<Env, From, To, Gas> NftMarketplaceProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn claim_tokens<
+        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+        Arg1: CodecInto<EgldOrEsdtTokenIdentifier<Env::Api>>,
+        Arg2: CodecInto<u64>,
+    >(
+        self,
+        claim_destination: Arg0,
+        token_id: Arg1,
+        token_nonce: Arg2,
+    ) -> TxProxyCall<Env, From, To, Gas, MultiValue2<BigUint<Env::Api>, ManagedVec<Env::Api, EsdtTokenPayment<Env::Api>>>> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("claimTokens")
+            .argument(&claim_destination)
+            .argument(&token_id)
+            .argument(&token_nonce)
+            .original_result()
+    }
+}
diff --git a/contracts/examples/nft-minter/src/lib.rs b/contracts/examples/nft-minter/src/lib.rs
index 5f0a8b3f01..4148f368c2 100644
--- a/contracts/examples/nft-minter/src/lib.rs
+++ b/contracts/examples/nft-minter/src/lib.rs
@@ -2,6 +2,7 @@
 
 use multiversx_sc::{derive_imports::*, imports::*};
 
+pub mod nft_marketplace_proxy;
 mod nft_module;
 
 #[derive(TypeAbi, TopEncode, TopDecode)]
@@ -72,28 +73,10 @@ pub trait NftMinter: nft_module::NftModule {
         token_nonce: u64,
     ) {
         let caller = self.blockchain().get_caller();
-        self.marketplace_proxy(marketplace_address)
+        self.tx()
+            .to(&marketplace_address)
+            .typed(nft_marketplace_proxy::NftMarketplaceProxy)
             .claim_tokens(token_id, token_nonce, caller)
-            .async_call()
-            .call_and_exit()
-    }
-
-    #[proxy]
-    fn marketplace_proxy(
-        &self,
-        sc_address: ManagedAddress,
-    ) -> nft_marketplace_proxy::Proxy<Self::Api>;
-}
-
-mod nft_marketplace_proxy {
-    #[multiversx_sc::proxy]
-    pub trait NftMarketplace {
-        #[endpoint(claimTokens)]
-        fn claim_tokens(
-            &self,
-            token_id: TokenIdentifier,
-            token_nonce: u64,
-            claim_destination: ManagedAddress,
-        );
+            .async_call_and_exit();
     }
 }
diff --git a/contracts/examples/nft-minter/src/nft_marketplace_proxy.rs b/contracts/examples/nft-minter/src/nft_marketplace_proxy.rs
new file mode 100644
index 0000000000..6c01ca3e1f
--- /dev/null
+++ b/contracts/examples/nft-minter/src/nft_marketplace_proxy.rs
@@ -0,0 +1,56 @@
+use multiversx_sc::proxy_imports::*;
+
+pub struct NftMarketplaceProxy;
+
+impl<Env, From, To, Gas> TxProxyTrait<Env, From, To, Gas> for NftMarketplaceProxy
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    type TxProxyMethods = NftMarketplaceProxyMethods<Env, From, To, Gas>;
+
+    fn proxy_methods(self, tx: Tx<Env, From, To, (), Gas, (), ()>) -> Self::TxProxyMethods {
+        NftMarketplaceProxyMethods { wrapped_tx: tx }
+    }
+}
+
+pub struct NftMarketplaceProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    wrapped_tx: Tx<Env, From, To, (), Gas, (), ()>,
+}
+
+#[rustfmt::skip]
+impl<Env, From, To, Gas> NftMarketplaceProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn claim_tokens<
+        Arg0: CodecInto<TokenIdentifier<Env::Api>>,
+        Arg1: CodecInto<u64>,
+        Arg2: CodecInto<ManagedAddress<Env::Api>>,
+    >(
+        self,
+        token_id: Arg0,
+        token_nonce: Arg1,
+        claim_destination: Arg2,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("claimTokens")
+            .argument(&token_id)
+            .argument(&token_nonce)
+            .argument(&claim_destination)
+            .original_result()
+    }
+}
diff --git a/contracts/examples/rewards-distribution/src/rewards_distribution.rs b/contracts/examples/rewards-distribution/src/rewards_distribution.rs
index cd4b01038c..c669b651f4 100644
--- a/contracts/examples/rewards-distribution/src/rewards_distribution.rs
+++ b/contracts/examples/rewards-distribution/src/rewards_distribution.rs
@@ -5,6 +5,8 @@ use multiversx_sc_modules::ongoing_operation::{
     CONTINUE_OP, DEFAULT_MIN_GAS_TO_SAVE_PROGRESS, STOP_OP,
 };
 
+pub mod seed_nft_minter_proxy;
+
 type Epoch = u64;
 
 pub const EPOCHS_IN_WEEK: Epoch = 7;
@@ -39,10 +41,14 @@ pub trait RewardsDistribution:
     fn init(&self, seed_nft_minter_address: ManagedAddress, brackets: ManagedVec<Bracket>) {
         self.seed_nft_minter_address().set(&seed_nft_minter_address);
 
-        let nft_token_id: TokenIdentifier = self
-            .seed_nft_minter_proxy(seed_nft_minter_address)
-            .get_nft_token_id()
-            .execute_on_dest_context();
+        let nft_token_id = self
+            .tx()
+            .to(&seed_nft_minter_address)
+            .typed(seed_nft_minter_proxy::SeedNftMinterProxy)
+            .nft_token_id()
+            .returns(ReturnsResult)
+            .sync_call();
+
         self.nft_token_id().set(nft_token_id);
 
         self.validate_brackets(&brackets);
@@ -175,10 +181,15 @@ pub trait RewardsDistribution:
         });
 
         let seed_nft_minter_address = self.seed_nft_minter_address().get();
-        let ticket_count: u64 = self
-            .seed_nft_minter_proxy(seed_nft_minter_address)
-            .get_nft_count()
-            .execute_on_dest_context();
+
+        let ticket_count = self
+            .tx()
+            .to(&seed_nft_minter_address)
+            .typed(seed_nft_minter_proxy::SeedNftMinterProxy)
+            .nft_count()
+            .returns(ReturnsResult)
+            .sync_call();
+
         let brackets = self.brackets().get();
 
         let computed_brackets = self.compute_brackets(brackets, ticket_count);
@@ -419,9 +430,6 @@ pub trait RewardsDistribution:
 
     #[storage_mapper("raffleProgress")]
     fn raffle_progress(&self) -> SingleValueMapper<Option<RaffleProgress<Self::Api>>>;
-
-    #[proxy]
-    fn seed_nft_minter_proxy(&self, address: ManagedAddress) -> seed_nft_minter::Proxy<Self::Api>;
 }
 
 fn ticket_to_storage(position: u64, ticket_id: u64) -> u64 {
@@ -439,14 +447,3 @@ fn ticket_from_storage(position: u64, ticket_id: u64) -> u64 {
         ticket_id
     }
 }
-
-mod seed_nft_minter {
-    #[multiversx_sc::proxy]
-    pub trait SeedNftMinter {
-        #[endpoint(getNftCount)]
-        fn get_nft_count(&self) -> u64;
-
-        #[endpoint(getNftTokenId)]
-        fn get_nft_token_id(&self) -> TokenIdentifier;
-    }
-}
diff --git a/contracts/examples/rewards-distribution/src/seed_nft_minter_proxy.rs b/contracts/examples/rewards-distribution/src/seed_nft_minter_proxy.rs
new file mode 100644
index 0000000000..23c1f71e97
--- /dev/null
+++ b/contracts/examples/rewards-distribution/src/seed_nft_minter_proxy.rs
@@ -0,0 +1,203 @@
+// Code generated by the multiversx-sc proxy generator. DO NOT EDIT.
+
+////////////////////////////////////////////////////
+////////////////// AUTO-GENERATED //////////////////
+////////////////////////////////////////////////////
+
+#![allow(dead_code)]
+#![allow(clippy::all)]
+
+use multiversx_sc::proxy_imports::*;
+
+pub struct SeedNftMinterProxy;
+
+impl<Env, From, To, Gas> TxProxyTrait<Env, From, To, Gas> for SeedNftMinterProxy
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    type TxProxyMethods = SeedNftMinterProxyMethods<Env, From, To, Gas>;
+
+    fn proxy_methods(self, tx: Tx<Env, From, To, (), Gas, (), ()>) -> Self::TxProxyMethods {
+        SeedNftMinterProxyMethods { wrapped_tx: tx }
+    }
+}
+
+pub struct SeedNftMinterProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    wrapped_tx: Tx<Env, From, To, (), Gas, (), ()>,
+}
+
+#[rustfmt::skip]
+impl<Env, From, Gas> SeedNftMinterProxyMethods<Env, From, (), Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn init<
+        Arg0: CodecInto<ManagedVec<Env::Api, ManagedAddress<Env::Api>>>,
+        Arg1: CodecInto<ManagedVec<Env::Api, Distribution<Env::Api>>>,
+    >(
+        self,
+        marketplaces: Arg0,
+        distribution: Arg1,
+    ) -> TxProxyDeploy<Env, From, Gas, ()> {
+        self.wrapped_tx
+            .raw_deploy()
+            .argument(&marketplaces)
+            .argument(&distribution)
+            .original_result()
+    }
+}
+
+#[rustfmt::skip]
+impl<Env, From, To, Gas> SeedNftMinterProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn create_nft<
+        Arg0: CodecInto<ManagedBuffer<Env::Api>>,
+        Arg1: CodecInto<BigUint<Env::Api>>,
+        Arg2: CodecInto<ManagedBuffer<Env::Api>>,
+        Arg3: CodecInto<BigUint<Env::Api>>,
+        Arg4: CodecInto<OptionalValue<TokenIdentifier<Env::Api>>>,
+        Arg5: CodecInto<OptionalValue<u64>>,
+    >(
+        self,
+        name: Arg0,
+        royalties: Arg1,
+        uri: Arg2,
+        selling_price: Arg3,
+        opt_token_used_as_payment: Arg4,
+        opt_token_used_as_payment_nonce: Arg5,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("createNft")
+            .argument(&name)
+            .argument(&royalties)
+            .argument(&uri)
+            .argument(&selling_price)
+            .argument(&opt_token_used_as_payment)
+            .argument(&opt_token_used_as_payment_nonce)
+            .original_result()
+    }
+
+    pub fn claim_and_distribute<
+        Arg0: CodecInto<EgldOrEsdtTokenIdentifier<Env::Api>>,
+        Arg1: CodecInto<u64>,
+    >(
+        self,
+        token_id: Arg0,
+        token_nonce: Arg1,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("claimAndDistribute")
+            .argument(&token_id)
+            .argument(&token_nonce)
+            .original_result()
+    }
+
+    pub fn marketplaces(
+        self,
+    ) -> TxProxyCall<Env, From, To, Gas, MultiValueEncoded<Env::Api, ManagedAddress<Env::Api>>> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("getMarketplaces")
+            .original_result()
+    }
+
+    pub fn nft_count(
+        self,
+    ) -> TxProxyCall<Env, From, To, Gas, u64> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("getNftCount")
+            .original_result()
+    }
+
+    pub fn distribution_rules(
+        self,
+    ) -> TxProxyCall<Env, From, To, Gas, ManagedVec<Env::Api, Distribution<Env::Api>>> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("getDistributionRules")
+            .original_result()
+    }
+
+    pub fn issue_token<
+        Arg0: CodecInto<ManagedBuffer<Env::Api>>,
+        Arg1: CodecInto<ManagedBuffer<Env::Api>>,
+    >(
+        self,
+        token_display_name: Arg0,
+        token_ticker: Arg1,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("issueToken")
+            .argument(&token_display_name)
+            .argument(&token_ticker)
+            .original_result()
+    }
+
+    pub fn buy_nft<
+        Arg0: CodecInto<u64>,
+    >(
+        self,
+        nft_nonce: Arg0,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("buyNft")
+            .argument(&nft_nonce)
+            .original_result()
+    }
+
+    pub fn get_nft_price<
+        Arg0: CodecInto<u64>,
+    >(
+        self,
+        nft_nonce: Arg0,
+    ) -> TxProxyCall<Env, From, To, Gas, OptionalValue<MultiValue3<EgldOrEsdtTokenIdentifier<Env::Api>, u64, BigUint<Env::Api>>>> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("getNftPrice")
+            .argument(&nft_nonce)
+            .original_result()
+    }
+
+    pub fn nft_token_id(
+        self,
+    ) -> TxProxyCall<Env, From, To, Gas, TokenIdentifier<Env::Api>> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("getNftTokenId")
+            .original_result()
+    }
+}
+
+#[derive(ManagedVecItem, NestedEncode, NestedDecode)]
+pub struct Distribution<Api>
+where
+    Api: ManagedTypeApi,
+{
+    pub address: ManagedAddress<Api>,
+    pub percentage: u64,
+    pub endpoint: ManagedBuffer<Api>,
+    pub gas_limit: u64,
+}
diff --git a/contracts/examples/seed-nft-minter/sc-config.toml b/contracts/examples/seed-nft-minter/sc-config.toml
new file mode 100644
index 0000000000..03b009a5fa
--- /dev/null
+++ b/contracts/examples/seed-nft-minter/sc-config.toml
@@ -0,0 +1,2 @@
+[settings]
+proxy-paths = ["../rewards-distribution/src/seed_nft_minter_proxy.rs"]
diff --git a/contracts/examples/seed-nft-minter/src/distribution_module.rs b/contracts/examples/seed-nft-minter/src/distribution_module.rs
index 9b3bb6d507..5190ba5505 100644
--- a/contracts/examples/seed-nft-minter/src/distribution_module.rs
+++ b/contracts/examples/seed-nft-minter/src/distribution_module.rs
@@ -2,7 +2,8 @@ use multiversx_sc::{derive_imports::*, imports::*};
 
 pub const MAX_DISTRIBUTION_PERCENTAGE: u64 = 100_000; // 100%
 
-#[derive(ManagedVecItem, NestedEncode, NestedDecode, TypeAbi)]
+#[type_abi]
+#[derive(ManagedVecItem, NestedEncode, NestedDecode)]
 pub struct Distribution<M: ManagedTypeApi> {
     pub address: ManagedAddress<M>,
     pub percentage: u64,
diff --git a/contracts/examples/seed-nft-minter/src/nft_marketplace_proxy.rs b/contracts/examples/seed-nft-minter/src/nft_marketplace_proxy.rs
new file mode 100644
index 0000000000..4b523c3828
--- /dev/null
+++ b/contracts/examples/seed-nft-minter/src/nft_marketplace_proxy.rs
@@ -0,0 +1,73 @@
+use multiversx_sc::proxy_imports::*;
+
+pub struct NftMarketplaceProxy;
+
+impl<Env, From, To, Gas> TxProxyTrait<Env, From, To, Gas> for NftMarketplaceProxy
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    type TxProxyMethods = NftMarketplaceProxyMethods<Env, From, To, Gas>;
+
+    fn proxy_methods(self, tx: Tx<Env, From, To, (), Gas, (), ()>) -> Self::TxProxyMethods {
+        NftMarketplaceProxyMethods { wrapped_tx: tx }
+    }
+}
+
+pub struct NftMarketplaceProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    wrapped_tx: Tx<Env, From, To, (), Gas, (), ()>,
+}
+
+#[rustfmt::skip]
+impl<Env, From, Gas> NftMarketplaceProxyMethods<Env, From, (), Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn init(
+        self,
+    ) -> TxProxyDeploy<Env, From, Gas, ()> {
+        self.wrapped_tx
+            .raw_deploy()
+            .original_result()
+    }
+}
+
+#[rustfmt::skip]
+impl<Env, From, To, Gas> NftMarketplaceProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn claim_tokens<
+        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+        Arg1: CodecInto<EgldOrEsdtTokenIdentifier<Env::Api>>,
+        Arg2: CodecInto<u64>,
+    >(
+        self,
+        claim_destination: Arg0,
+        token_id: Arg1,
+        token_nonce: Arg2,
+    ) -> TxProxyCall<Env, From, To, Gas, MultiValue2<BigUint<Env::Api>, ManagedVec<Env::Api, EsdtTokenPayment<Env::Api>>>> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("claimTokens")
+            .argument(&claim_destination)
+            .argument(&token_id)
+            .argument(&token_nonce)
+            .original_result()
+    }
+}
diff --git a/contracts/examples/seed-nft-minter/src/seed_nft_minter.rs b/contracts/examples/seed-nft-minter/src/seed_nft_minter.rs
index 42b064e5cd..1a6ac5ffe2 100644
--- a/contracts/examples/seed-nft-minter/src/seed_nft_minter.rs
+++ b/contracts/examples/seed-nft-minter/src/seed_nft_minter.rs
@@ -3,6 +3,7 @@
 use multiversx_sc::{derive_imports::*, imports::*};
 
 mod distribution_module;
+pub mod nft_marketplace_proxy;
 mod nft_module;
 
 use distribution_module::Distribution;
@@ -86,10 +87,13 @@ pub trait SeedNftMinter:
         let claim_destination = self.blockchain().get_sc_address();
         let mut total_amount = BigUint::zero();
         for address in self.marketplaces().iter() {
-            let results: MultiValue2<BigUint, ManagedVec<EsdtTokenPayment>> = self
-                .marketplace_proxy(address)
+            let results = self
+                .tx()
+                .to(&address)
+                .typed(nft_marketplace_proxy::NftMarketplaceProxy)
                 .claim_tokens(&claim_destination, token_id, token_nonce)
-                .execute_on_dest_context();
+                .returns(ReturnsResult)
+                .sync_call();
 
             let (egld_amount, esdt_payments) = results.into_tuple();
             let amount = if token_id.is_egld() {
@@ -113,25 +117,4 @@ pub trait SeedNftMinter:
     #[view(getNftCount)]
     #[storage_mapper("nftCount")]
     fn nft_count(&self) -> SingleValueMapper<u64>;
-
-    #[proxy]
-    fn marketplace_proxy(
-        &self,
-        sc_address: ManagedAddress,
-    ) -> nft_marketplace_proxy::Proxy<Self::Api>;
-}
-
-mod nft_marketplace_proxy {
-    use multiversx_sc::imports::*;
-
-    #[multiversx_sc::proxy]
-    pub trait NftMarketplace {
-        #[endpoint(claimTokens)]
-        fn claim_tokens(
-            &self,
-            claim_destination: &ManagedAddress,
-            token_id: &EgldOrEsdtTokenIdentifier,
-            token_nonce: u64,
-        ) -> MultiValue2<BigUint, ManagedVec<EsdtTokenPayment>>;
-    }
 }

From 230c1dd5033ba8121c37e7397caef9408b80c75a Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Fri, 29 Mar 2024 14:59:10 +0100
Subject: [PATCH 0603/1254] clippy

---
 contracts/examples/fractional-nfts/src/nft_marketplace_proxy.rs | 2 ++
 contracts/examples/seed-nft-minter/src/nft_marketplace_proxy.rs | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/contracts/examples/fractional-nfts/src/nft_marketplace_proxy.rs b/contracts/examples/fractional-nfts/src/nft_marketplace_proxy.rs
index 563e40b7af..78df59231f 100644
--- a/contracts/examples/fractional-nfts/src/nft_marketplace_proxy.rs
+++ b/contracts/examples/fractional-nfts/src/nft_marketplace_proxy.rs
@@ -1,3 +1,5 @@
+#![allow(clippy::all)]
+
 use multiversx_sc::proxy_imports::*;
 
 pub struct NftMarketplaceProxy;
diff --git a/contracts/examples/seed-nft-minter/src/nft_marketplace_proxy.rs b/contracts/examples/seed-nft-minter/src/nft_marketplace_proxy.rs
index 4b523c3828..d62c326542 100644
--- a/contracts/examples/seed-nft-minter/src/nft_marketplace_proxy.rs
+++ b/contracts/examples/seed-nft-minter/src/nft_marketplace_proxy.rs
@@ -1,3 +1,5 @@
+#![allow(clippy::all)]
+
 use multiversx_sc::proxy_imports::*;
 
 pub struct NftMarketplaceProxy;

From 6904d2b3841dd549ef87c46b2fabcf965f9eee63 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Fri, 29 Mar 2024 16:52:11 +0200
Subject: [PATCH 0604/1254] proxy gen - create struct ProxyGenerator

---
 .../meta/src/cmd/contract/generate_proxy.rs   |   3 +-
 .../contract/generate_proxy/proxy_gen_main.rs |  35 +-
 .../generate_proxy/proxy_gen_struct_enum.rs   | 224 --------
 .../generate_proxy/proxy_generator.rs         | 496 ++++++++++++++++++
 .../generate_proxy/proxy_sc_functions_gen.rs  | 275 ----------
 .../generate_proxy/proxy_template_gen.rs      | 128 +++--
 6 files changed, 597 insertions(+), 564 deletions(-)
 delete mode 100644 framework/meta/src/cmd/contract/generate_proxy/proxy_gen_struct_enum.rs
 create mode 100644 framework/meta/src/cmd/contract/generate_proxy/proxy_generator.rs
 delete mode 100644 framework/meta/src/cmd/contract/generate_proxy/proxy_sc_functions_gen.rs

diff --git a/framework/meta/src/cmd/contract/generate_proxy.rs b/framework/meta/src/cmd/contract/generate_proxy.rs
index 2aa854bc2e..0da27327c2 100644
--- a/framework/meta/src/cmd/contract/generate_proxy.rs
+++ b/framework/meta/src/cmd/contract/generate_proxy.rs
@@ -1,6 +1,5 @@
 pub mod proxy_crate_gen;
 pub mod proxy_gen_main;
-pub mod proxy_gen_struct_enum;
+mod proxy_generator;
 mod proxy_naming;
-pub mod proxy_sc_functions_gen;
 pub mod proxy_template_gen;
diff --git a/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_main.rs b/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_main.rs
index dfac04fd8f..63a8d7e757 100644
--- a/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_main.rs
+++ b/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_main.rs
@@ -1,43 +1,20 @@
-use std::fs::File;
-
-use multiversx_sc::abi::ContractAbi;
-
 use super::{
-    super::meta_config::MetaConfig,
-    proxy_crate_gen::create_file,
-    proxy_gen_struct_enum::write_types,
-    proxy_sc_functions_gen::write_content,
-    proxy_template_gen::{
-        write_header, write_impl_for_tx_proxy, write_struct_tx_proxy_methods,
-        write_tx_proxy_type_def,
-    },
+    super::meta_config::MetaConfig, proxy_crate_gen::create_file, proxy_generator::ProxyGenerator,
 };
 
 const OUTPUT_PROXY_PATH: &str = "/output/proxy.rs";
 
 impl MetaConfig {
     pub fn generate_proxy(&self) {
-        write_proxy_with_explicit_path(OUTPUT_PROXY_PATH, &self.original_contract_abi);
+        write_proxy_with_explicit_path(OUTPUT_PROXY_PATH, self);
         for path in &self.sc_config.proxy_paths {
-            write_proxy_with_explicit_path(path, &self.original_contract_abi);
+            write_proxy_with_explicit_path(path, self);
         }
     }
 }
 
-fn write_proxy_with_explicit_path(path: &str, abi: &ContractAbi) {
+fn write_proxy_with_explicit_path(path: &str, meta_config: &MetaConfig) {
     let file = create_file(path);
-    write_proxy_to_file(file, abi);
-}
-
-fn write_proxy_to_file(mut file: File, abi: &ContractAbi) {
-    write_header(&mut file);
-    write_tx_proxy_type_def(&mut file, &abi.name);
-    write_impl_for_tx_proxy(&mut file, &abi.name);
-    write_struct_tx_proxy_methods(&mut file, &abi.name);
-    write_content(&mut file, abi.clone());
-    write_types(
-        &mut file,
-        &abi.type_descriptions,
-        abi.build_info.contract_crate.name,
-    );
+    let proxy_generator = ProxyGenerator::new(meta_config);
+    proxy_generator.write_proxy_to_file(file);
 }
diff --git a/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_struct_enum.rs b/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_struct_enum.rs
deleted file mode 100644
index 7b32115081..0000000000
--- a/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_struct_enum.rs
+++ /dev/null
@@ -1,224 +0,0 @@
-use std::{fs::File, io::Write};
-
-use multiversx_sc::abi::{
-    EnumVariantDescription, StructFieldDescription, TypeContents, TypeDescription,
-    TypeDescriptionContainerImpl,
-};
-
-const ZERO: &str = "0";
-
-/// Types defined in the framework don't need to be generated again in the proxy.
-const TYPES_FROM_FRAMEWORK: &[&str] = &[
-    "EsdtTokenPayment",
-    "EgldOrEsdtTokenPayment",
-    "EsdtTokenData",
-    "EgldOrEsdtTokenIdentifier",
-    "EgldOrEsdtTokenPayment",
-    "EgldOrMultiEsdtPayment",
-    "EsdtTokenData",
-    "EsdtLocalRole",
-];
-
-pub(crate) fn write_types(
-    file: &mut File,
-    types: &TypeDescriptionContainerImpl,
-    proxy_crate: &str,
-) {
-    for (_, type_description) in &types.0 {
-        if proxy_crate != extract_struct_crate(type_description.names.rust.as_str()) {
-            continue;
-        }
-
-        let type_name = adjust_type_name(&type_description.names.rust, proxy_crate);
-        if TYPES_FROM_FRAMEWORK.contains(&type_name.as_str()) {
-            continue;
-        }
-
-        match &type_description.contents {
-            TypeContents::Enum(enum_variants) => write_enum(
-                file,
-                enum_variants,
-                type_description,
-                &type_name,
-                proxy_crate,
-            ),
-            TypeContents::Struct(struct_fields) => write_struct(
-                file,
-                struct_fields,
-                type_description,
-                &type_name,
-                proxy_crate,
-            ),
-            TypeContents::NotSpecified => {},
-            TypeContents::ExplicitEnum(_) => {},
-        }
-    }
-}
-
-fn start_write_type(
-    file: &mut File,
-    type_type: &str,
-    type_description: &TypeDescription,
-    name: &str,
-) {
-    writeln!(file).unwrap();
-    write_macro_attributes(file, &type_description.macro_attributes);
-    write!(file, r#"pub {type_type} {name}"#).unwrap();
-
-    if name.contains("<Api>") {
-        writeln!(
-            file,
-            r#"
-where
-    Api: ManagedTypeApi,"#
-        )
-        .unwrap();
-    } else {
-        write!(file, " ").unwrap();
-    }
-
-    writeln!(file, r#"{{"#).unwrap();
-}
-
-fn write_struct(
-    file: &mut File,
-    struct_fields: &Vec<StructFieldDescription>,
-    type_description: &TypeDescription,
-    name: &str,
-    proxy_crate: &str,
-) {
-    start_write_type(file, "struct", type_description, name);
-
-    for field in struct_fields {
-        writeln!(
-            file,
-            "    pub {}: {},",
-            field.name,
-            adjust_type_name(&field.field_type.rust, proxy_crate)
-        )
-        .unwrap();
-    }
-
-    writeln!(file, "}}").unwrap();
-}
-
-fn write_enum(
-    file: &mut File,
-    enum_variants: &Vec<EnumVariantDescription>,
-    type_description: &TypeDescription,
-    name: &str,
-    proxy_crate: &str,
-) {
-    start_write_type(file, "enum", type_description, name);
-
-    for variant in enum_variants {
-        write!(file, "    {}", variant.name).unwrap();
-        if variant.fields.is_empty() {
-            writeln!(file, ",").unwrap();
-            continue;
-        }
-
-        if variant.fields[0].name == ZERO {
-            write_tuple_in_variant(file, &variant.fields, proxy_crate);
-        } else {
-            write_struct_in_variant(file, &variant.fields, proxy_crate);
-        }
-    }
-    writeln!(file, "}}").unwrap();
-}
-
-fn write_macro_attributes(file: &mut File, macro_attributes: &[String]) {
-    if macro_attributes.is_empty() {
-        writeln!(file, "#[derive(TopEncode, TopDecode)]").unwrap();
-    } else {
-        writeln!(file, "#[derive({})]", macro_attributes.join(", ")).unwrap();
-    }
-}
-
-fn write_struct_in_variant(file: &mut File, fields: &[StructFieldDescription], proxy_crate: &str) {
-    writeln!(file, " {{").unwrap();
-
-    for field in fields {
-        writeln!(
-            file,
-            "        {}: {},",
-            field.name,
-            adjust_type_name(&field.field_type.rust, proxy_crate)
-        )
-        .unwrap();
-    }
-
-    writeln!(file, "    }},").unwrap();
-}
-
-fn write_tuple_in_variant(file: &mut File, fields: &[StructFieldDescription], proxy_crate: &str) {
-    write!(file, "(").unwrap();
-    write!(
-        file,
-        "{}",
-        adjust_type_name(&fields[0].field_type.rust, proxy_crate)
-    )
-    .unwrap();
-
-    for field in &fields[1..] {
-        write!(
-            file,
-            ", {}",
-            adjust_type_name(&field.field_type.rust, proxy_crate)
-        )
-        .unwrap();
-    }
-
-    writeln!(file, "),").unwrap();
-}
-
-fn extract_struct_crate(struct_path: &str) -> String {
-    let struct_crate_name = struct_path
-        .replace('_', "-")
-        .replace("multiversx_sc::api::uncallable::UncallableApi", "Api")
-        .to_string();
-    let crate_name = struct_crate_name
-        .split("::")
-        .next()
-        .unwrap_or_else(|| &struct_crate_name);
-    crate_name.to_string()
-}
-
-pub(crate) fn clean_paths(proxy_crate: &str, rust_type: &str) -> String {
-    let delimiters = "<>,()[] ";
-    let words: Vec<&str> = rust_type
-        .split(|c| delimiters.contains(c))
-        .filter(|s| !s.is_empty())
-        .collect();
-
-    let mut words_replacer: Vec<String> = Vec::new();
-    for word in &words {
-        let type_rust_name = word.split("::").last().unwrap().to_string();
-        if proxy_crate == extract_struct_crate(word)
-            || TYPES_FROM_FRAMEWORK.contains(&type_rust_name.as_str())
-        {
-            words_replacer.push(type_rust_name);
-        } else {
-            words_replacer.push(word.to_string());
-        }
-    }
-
-    let mut rust_type_with_cleaned_path: String = rust_type.to_string().clone();
-    for index in 0..words.len() {
-        rust_type_with_cleaned_path = rust_type_with_cleaned_path.replace(
-            words.get(index).unwrap(),
-            words_replacer.get(index).unwrap(),
-        );
-    }
-
-    rust_type_with_cleaned_path
-}
-
-pub fn adjust_type_name(original_rust_name: &str, proxy_crate: &str) -> String {
-    clean_paths(
-        proxy_crate,
-        &original_rust_name
-            .replace("multiversx_sc::api::uncallable::UncallableApi", "Api")
-            .replace("$API", "Api"),
-    )
-}
diff --git a/framework/meta/src/cmd/contract/generate_proxy/proxy_generator.rs b/framework/meta/src/cmd/contract/generate_proxy/proxy_generator.rs
new file mode 100644
index 0000000000..bd58f028ef
--- /dev/null
+++ b/framework/meta/src/cmd/contract/generate_proxy/proxy_generator.rs
@@ -0,0 +1,496 @@
+use std::{fs::File, io::Write};
+
+use multiversx_sc::abi::{
+    EndpointAbi, EnumVariantDescription, InputAbi, OutputAbi, StructFieldDescription, TypeContents,
+    TypeDescription,
+};
+
+use crate::cmd::contract::meta_config::MetaConfig;
+
+use super::{
+    proxy_naming::{proxy_methods_type_name, proxy_type_name},
+    proxy_template_gen::{
+        extract_struct_crate, start_write_type, write_constructor_content, write_end_of_function,
+        write_endpoint_content, write_endpoint_docs, write_function_header_endpoint, write_header,
+        write_parameters, write_upgrade_content,
+    },
+};
+
+const ZERO: &str = "0";
+
+/// Types defined in the framework don't need to be generated again in the proxy.
+const TYPES_FROM_FRAMEWORK: &[&str] = &[
+    "EsdtTokenPayment",
+    "EgldOrEsdtTokenPayment",
+    "EsdtTokenData",
+    "EgldOrEsdtTokenIdentifier",
+    "EgldOrEsdtTokenPayment",
+    "EgldOrMultiEsdtPayment",
+    "EsdtTokenData",
+    "EsdtLocalRole",
+];
+
+pub struct ProxyGenerator<'a> {
+    pub meta_config: &'a MetaConfig,
+}
+
+impl<'a> ProxyGenerator<'a> {
+    pub const fn new(meta_config: &'a MetaConfig) -> Self {
+        ProxyGenerator { meta_config }
+    }
+
+    pub fn write_proxy_to_file(&self, mut file: File) {
+        write_header(&mut file);
+        self.write_tx_proxy_type_def(&mut file);
+        self.write_impl_for_tx_proxy(&mut file);
+        self.write_struct_tx_proxy_methods(&mut file);
+        self.write_content(&mut file);
+        self.write_types(&mut file);
+    }
+
+    fn write_tx_proxy_type_def(&self, file: &mut File) {
+        let proxy_type_name = proxy_type_name(&self.meta_config.original_contract_abi.name);
+        writeln!(
+            file,
+            r#"
+pub struct {proxy_type_name};"#
+        )
+        .unwrap();
+    }
+
+    fn write_impl_for_tx_proxy(&self, file: &mut File) {
+        let proxy_type_name = proxy_type_name(&self.meta_config.original_contract_abi.name);
+        let proxy_methods_type_name =
+            proxy_methods_type_name(&self.meta_config.original_contract_abi.name);
+        writeln!(
+            file,
+            r#"
+impl<Env, From, To, Gas> TxProxyTrait<Env, From, To, Gas> for {proxy_type_name}
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{{
+    type TxProxyMethods = {proxy_methods_type_name}<Env, From, To, Gas>;
+
+    fn proxy_methods(self, tx: Tx<Env, From, To, (), Gas, (), ()>) -> Self::TxProxyMethods {{
+        {proxy_methods_type_name} {{ wrapped_tx: tx }}
+    }}
+}}"#
+        )
+        .unwrap();
+    }
+
+    fn write_struct_tx_proxy_methods(&self, file: &mut File) {
+        let proxy_methods_type_name =
+            proxy_methods_type_name(&self.meta_config.original_contract_abi.name);
+        writeln!(
+            file,
+            r#"
+pub struct {proxy_methods_type_name}<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{{
+    wrapped_tx: Tx<Env, From, To, (), Gas, (), ()>,
+}}"#
+        )
+        .unwrap();
+    }
+
+    fn write_content(&self, file: &mut File) {
+        if !self
+            .meta_config
+            .original_contract_abi
+            .constructors
+            .is_empty()
+        {
+            self.write_constructors(file);
+        }
+
+        if !self
+            .meta_config
+            .original_contract_abi
+            .upgrade_constructors
+            .is_empty()
+        {
+            self.write_upgrades(file);
+        }
+
+        if !self.meta_config.original_contract_abi.endpoints.is_empty() {
+            self.write_endpoints(file);
+        }
+    }
+
+    fn write_types(&self, file: &mut File) {
+        for (_, type_description) in &self.meta_config.original_contract_abi.type_descriptions.0 {
+            if self
+                .meta_config
+                .original_contract_abi
+                .build_info
+                .contract_crate
+                .name
+                != extract_struct_crate(type_description.names.rust.as_str())
+            {
+                continue;
+            }
+
+            let type_name = self.adjust_type_name_with_api(&type_description.names.rust);
+            if TYPES_FROM_FRAMEWORK.contains(&type_name.as_str()) {
+                continue;
+            }
+
+            match &type_description.contents {
+                TypeContents::Enum(enum_variants) => {
+                    self.write_enum(file, enum_variants, type_description, &type_name)
+                },
+                TypeContents::Struct(struct_fields) => {
+                    self.write_struct(file, struct_fields, type_description, &type_name)
+                },
+                TypeContents::NotSpecified => {},
+                TypeContents::ExplicitEnum(_) => {},
+            }
+        }
+    }
+
+    fn write_constructors(&self, file: &mut File) {
+        let constructors: Vec<EndpointAbi> =
+            self.meta_config.original_contract_abi.constructors.clone();
+
+        self.write_header_impl_constructor(file);
+        for (i, constructor_abi) in constructors.into_iter().enumerate() {
+            if i > 0 {
+                writeln!(file).unwrap();
+            }
+            self.write_constructor_header(file, &constructor_abi);
+            write_constructor_content(file, constructor_abi.inputs);
+            write_end_of_function(file);
+        }
+
+        writeln!(file, "}}").unwrap();
+    }
+
+    fn write_upgrades(&self, file: &mut File) {
+        self.write_header_impl_upgrade(file);
+        for (i, upgrade) in self
+            .meta_config
+            .original_contract_abi
+            .upgrade_constructors
+            .clone()
+            .into_iter()
+            .enumerate()
+        {
+            if i > 0 {
+                writeln!(file).unwrap();
+            }
+            self.write_upgrade_header(file, &upgrade);
+            write_upgrade_content(file, upgrade.inputs);
+            write_end_of_function(file);
+        }
+
+        writeln!(file, "}}").unwrap();
+    }
+
+    fn write_endpoints(&self, file: &mut File) {
+        let endpoints: Vec<EndpointAbi> = self.meta_config.original_contract_abi.endpoints.clone();
+
+        self.write_header_impl_endpoints(file);
+        for (i, endpoint_abi) in endpoints.into_iter().enumerate() {
+            if i > 0 {
+                writeln!(file).unwrap();
+            }
+            self.write_endpoint_header(file, &endpoint_abi);
+            write_endpoint_content(file, &endpoint_abi);
+            write_end_of_function(file);
+        }
+
+        writeln!(file, "}}").unwrap();
+    }
+
+    fn write_header_impl_constructor(&self, file: &mut File) {
+        let proxy_methods_type_name =
+            proxy_methods_type_name(&self.meta_config.original_contract_abi.name);
+        writeln!(
+            file,
+            r#"
+#[rustfmt::skip]
+impl<Env, From, Gas> {proxy_methods_type_name}<Env, From, (), Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    Gas: TxGas<Env>,
+{{"#
+        )
+        .unwrap();
+    }
+
+    fn write_header_impl_upgrade(&self, file: &mut File) {
+        let proxy_methods_type_name =
+            proxy_methods_type_name(&self.meta_config.original_contract_abi.name);
+        writeln!(
+            file,
+            r#"
+#[rustfmt::skip]
+impl<Env, From, To, Gas> {proxy_methods_type_name}<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{{"#
+        )
+        .unwrap();
+    }
+
+    fn write_header_impl_endpoints(&self, file: &mut File) {
+        let proxy_methods_type_name =
+            proxy_methods_type_name(&self.meta_config.original_contract_abi.name);
+        writeln!(
+            file,
+            r#"
+#[rustfmt::skip]
+impl<Env, From, To, Gas> {proxy_methods_type_name}<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{{"#
+        )
+        .unwrap();
+    }
+
+    fn write_constructor_header(&self, file: &mut File, constructor_abi: &EndpointAbi) {
+        self.write_fn_signature(file, constructor_abi);
+        self.write_constructor_output(file, &constructor_abi.outputs);
+    }
+
+    fn write_upgrade_header(&self, file: &mut File, constructor_abi: &EndpointAbi) {
+        self.write_fn_signature(file, constructor_abi);
+        self.write_upgrade_output(file, &constructor_abi.outputs);
+    }
+
+    fn write_endpoint_header(&self, file: &mut File, constructor_abi: &EndpointAbi) {
+        self.write_fn_signature(file, constructor_abi);
+        self.write_endpoint_output(file, &constructor_abi.outputs);
+    }
+
+    fn write_fn_signature(&self, file: &mut File, endpoint: &EndpointAbi) {
+        write_endpoint_docs(file, &endpoint.docs);
+        write_function_header_endpoint(file, &endpoint.rust_method_name);
+        self.write_args(file, &endpoint.inputs);
+        write_parameters(file, &endpoint.inputs);
+    }
+
+    fn write_args(&self, file: &mut File, inputs: &[InputAbi]) {
+        if inputs.is_empty() {
+            return;
+        }
+
+        writeln!(file, "<").unwrap();
+
+        for (index, input) in inputs.iter().enumerate() {
+            self.write_argument(file, index, &input.type_names.rust);
+        }
+
+        write!(file, "    >").unwrap();
+    }
+
+    fn write_argument(&self, file: &mut File, index: usize, rust_name: &str) {
+        let adjusted = self.adjust_type_name_with_env_api(rust_name);
+        writeln!(file, "        Arg{index}: CodecInto<{adjusted}>,").unwrap();
+    }
+
+    fn write_constructor_output(&self, file: &mut File, outputs: &[OutputAbi]) {
+        write!(file, "-> TxProxyDeploy<Env, From, Gas, ").unwrap();
+
+        self.parse_and_write_outputs(file, outputs);
+
+        writeln!(file, "> {{").unwrap();
+    }
+
+    fn write_upgrade_output(&self, file: &mut File, outputs: &[OutputAbi]) {
+        write!(file, "-> TxProxyUpgrade<Env, From, To, Gas, ").unwrap();
+
+        self.parse_and_write_outputs(file, outputs);
+
+        writeln!(file, "> {{").unwrap();
+    }
+
+    fn write_endpoint_output(&self, file: &mut File, outputs: &[OutputAbi]) {
+        write!(file, "-> TxProxyCall<Env, From, To, Gas, ").unwrap();
+
+        self.parse_and_write_outputs(file, outputs);
+
+        writeln!(file, "> {{").unwrap();
+    }
+
+    fn parse_and_write_outputs(&self, file: &mut File, outputs: &[OutputAbi]) {
+        match outputs.len() {
+            0 => {
+                write!(file, "()").unwrap();
+            },
+            1 => {
+                let adjusted = self.adjust_type_name_with_env_api(&outputs[0].type_names.rust);
+                write!(file, "{adjusted}").unwrap();
+            },
+            _ => {
+                write!(file, "MultiValue{}<", outputs.len()).unwrap();
+                for (i, output) in outputs.iter().enumerate() {
+                    if i > 0 {
+                        write!(file, ", ").unwrap();
+                    }
+                    let adjusted = self.adjust_type_name_with_env_api(&output.type_names.rust);
+                    write!(file, "{adjusted}").unwrap();
+                }
+                write!(file, ">").unwrap();
+            },
+        }
+    }
+
+    fn write_enum(
+        &self,
+        file: &mut File,
+        enum_variants: &Vec<EnumVariantDescription>,
+        type_description: &TypeDescription,
+        name: &str,
+    ) {
+        start_write_type(file, "enum", type_description, name);
+
+        for variant in enum_variants {
+            write!(file, "    {}", variant.name).unwrap();
+            if variant.fields.is_empty() {
+                writeln!(file, ",").unwrap();
+                continue;
+            }
+
+            if variant.fields[0].name == ZERO {
+                self.write_tuple_in_variant(file, &variant.fields);
+            } else {
+                self.write_struct_in_variant(file, &variant.fields);
+            }
+        }
+        writeln!(file, "}}").unwrap();
+    }
+
+    fn write_struct(
+        &self,
+        file: &mut File,
+        struct_fields: &Vec<StructFieldDescription>,
+        type_description: &TypeDescription,
+        name: &str,
+    ) {
+        start_write_type(file, "struct", type_description, name);
+
+        for field in struct_fields {
+            writeln!(
+                file,
+                "    pub {}: {},",
+                field.name,
+                self.adjust_type_name_with_api(&field.field_type.rust)
+            )
+            .unwrap();
+        }
+
+        writeln!(file, "}}").unwrap();
+    }
+
+    fn write_tuple_in_variant(&self, file: &mut File, fields: &[StructFieldDescription]) {
+        write!(file, "(").unwrap();
+        write!(
+            file,
+            "{}",
+            self.adjust_type_name_with_api(&fields[0].field_type.rust)
+        )
+        .unwrap();
+
+        for field in &fields[1..] {
+            write!(
+                file,
+                ", {}",
+                self.adjust_type_name_with_api(&field.field_type.rust)
+            )
+            .unwrap();
+        }
+
+        writeln!(file, "),").unwrap();
+    }
+
+    fn write_struct_in_variant(&self, file: &mut File, fields: &[StructFieldDescription]) {
+        writeln!(file, " {{").unwrap();
+
+        for field in fields {
+            writeln!(
+                file,
+                "        {}: {},",
+                field.name,
+                self.adjust_type_name_with_api(&field.field_type.rust)
+            )
+            .unwrap();
+        }
+
+        writeln!(file, "    }},").unwrap();
+    }
+
+    fn clean_paths(&self, proxy_crate: &str, rust_type: &str) -> String {
+        let delimiters = "<>,()[] ";
+        let words: Vec<&str> = rust_type
+            .split(|c| delimiters.contains(c))
+            .filter(|s| !s.is_empty())
+            .collect();
+
+        let mut words_replacer: Vec<String> = Vec::new();
+        for word in &words {
+            let type_rust_name = word.split("::").last().unwrap().to_string();
+            if proxy_crate == extract_struct_crate(word)
+                || TYPES_FROM_FRAMEWORK.contains(&type_rust_name.as_str())
+            {
+                words_replacer.push(type_rust_name);
+            } else {
+                words_replacer.push(word.to_string());
+            }
+        }
+
+        let mut rust_type_with_cleaned_path: String = rust_type.to_string().clone();
+        for index in 0..words.len() {
+            rust_type_with_cleaned_path = rust_type_with_cleaned_path.replace(
+                words.get(index).unwrap(),
+                words_replacer.get(index).unwrap(),
+            );
+        }
+
+        rust_type_with_cleaned_path
+    }
+
+    fn adjust_type_name_with_env_api(&self, original_rust_name: &str) -> String {
+        self.clean_paths(
+            self.meta_config
+                .original_contract_abi
+                .build_info
+                .contract_crate
+                .name,
+            &original_rust_name
+                .replace("multiversx_sc::api::uncallable::UncallableApi", "Env::Api")
+                .replace("$API", "Env::Api"),
+        )
+    }
+
+    fn adjust_type_name_with_api(&self, original_rust_name: &str) -> String {
+        self.clean_paths(
+            self.meta_config
+                .original_contract_abi
+                .build_info
+                .contract_crate
+                .name,
+            &original_rust_name
+                .replace("multiversx_sc::api::uncallable::UncallableApi", "Api")
+                .replace("$API", "Api"),
+        )
+    }
+}
diff --git a/framework/meta/src/cmd/contract/generate_proxy/proxy_sc_functions_gen.rs b/framework/meta/src/cmd/contract/generate_proxy/proxy_sc_functions_gen.rs
deleted file mode 100644
index 5029e8790c..0000000000
--- a/framework/meta/src/cmd/contract/generate_proxy/proxy_sc_functions_gen.rs
+++ /dev/null
@@ -1,275 +0,0 @@
-use std::{fs::File, io::Write};
-
-use multiversx_sc::abi::{ContractAbi, EndpointAbi, InputAbi, OutputAbi};
-
-use super::{proxy_gen_struct_enum::clean_paths, proxy_naming::proxy_methods_type_name};
-
-pub(crate) fn write_content(file: &mut File, abi: ContractAbi) {
-    write_header_impl_constructor(file, &abi.name);
-    for (i, constructor_abi) in abi.constructors.into_iter().enumerate() {
-        if i > 0 {
-            writeln!(file).unwrap();
-        }
-        write_constructor_header(
-            file,
-            constructor_abi.clone(),
-            abi.build_info.contract_crate.name,
-        );
-        write_constructor_content(file, constructor_abi.inputs);
-        write_end_of_function(file);
-    }
-
-    writeln!(file, "}}").unwrap();
-
-    write_header_impl_upgrade_constructor(file, &abi.name);
-    for (i, upgrade_abi) in abi.upgrade_constructors.clone().into_iter().enumerate() {
-        if i > 0 {
-            writeln!(file).unwrap();
-        }
-        write_upgrade_constructor_header(
-            file,
-            upgrade_abi.clone(),
-            abi.build_info.contract_crate.name,
-        );
-        write_upgrade_constructor_content(file, upgrade_abi.inputs);
-        write_end_of_function(file);
-    }
-
-    writeln!(file, "}}").unwrap();
-
-    write_header_impl_endpoints(file, &abi.name);
-    for (i, endpoint_abi) in abi.endpoints.into_iter().enumerate() {
-        if i > 0 {
-            writeln!(file).unwrap();
-        }
-        write_endpoint_header(
-            file,
-            endpoint_abi.clone(),
-            abi.build_info.contract_crate.name,
-        );
-        write_endpoint_content(file, endpoint_abi.name, endpoint_abi.inputs);
-        write_end_of_function(file);
-    }
-
-    writeln!(file, "}}").unwrap();
-}
-
-fn write_header_impl_constructor(file: &mut File, name: &str) {
-    let proxy_methods_type_name = proxy_methods_type_name(name);
-    writeln!(
-        file,
-        r#"
-#[rustfmt::skip]
-impl<Env, From, Gas> {proxy_methods_type_name}<Env, From, (), Gas>
-where
-    Env: TxEnv,
-    Env::Api: VMApi,
-    From: TxFrom<Env>,
-    Gas: TxGas<Env>,
-{{"#
-    )
-    .unwrap();
-}
-
-fn write_header_impl_upgrade_constructor(file: &mut File, name: &str) {
-    let proxy_methods_type_name = proxy_methods_type_name(name);
-    writeln!(
-        file,
-        r#"
-#[rustfmt::skip]
-impl<Env, From, To, Gas> {proxy_methods_type_name}<Env, From, To, Gas>
-where
-    Env: TxEnv,
-    Env::Api: VMApi,
-    From: TxFrom<Env>,
-    To: TxTo<Env>,
-    Gas: TxGas<Env>,
-{{"#
-    )
-    .unwrap();
-}
-
-fn write_header_impl_endpoints(file: &mut File, name: &str) {
-    let proxy_methods_type_name = proxy_methods_type_name(name);
-    writeln!(
-        file,
-        r#"
-#[rustfmt::skip]
-impl<Env, From, To, Gas> {proxy_methods_type_name}<Env, From, To, Gas>
-where
-    Env: TxEnv,
-    Env::Api: VMApi,
-    From: TxFrom<Env>,
-    To: TxTo<Env>,
-    Gas: TxGas<Env>,
-{{"#
-    )
-    .unwrap();
-}
-
-fn write_constructor_header(file: &mut File, constructor_abi: EndpointAbi, proxy_crate: &str) {
-    write_fn_signature(file, constructor_abi.clone(), proxy_crate);
-    write_constructor_output(file, constructor_abi.outputs, proxy_crate);
-}
-
-fn write_upgrade_constructor_header(
-    file: &mut File,
-    upgrade_constructor_abi: EndpointAbi,
-    proxy_crate: &str,
-) {
-    write_fn_signature(file, upgrade_constructor_abi.clone(), proxy_crate);
-    write_upgrade_constructor_output(file, upgrade_constructor_abi.outputs, proxy_crate);
-}
-
-fn write_endpoint_header(file: &mut File, constructor_abi: EndpointAbi, proxy_crate: &str) {
-    write_fn_signature(file, constructor_abi.clone(), proxy_crate);
-    write_endpoint_output(file, constructor_abi.outputs, proxy_crate);
-}
-
-fn write_fn_signature(file: &mut File, endpoint_abi: EndpointAbi, proxy_crate: &str) {
-    write_endpoint_docs(file, endpoint_abi.docs);
-    write_function_header_endpoint(file, endpoint_abi.rust_method_name);
-    write_args(file, endpoint_abi.inputs.clone(), proxy_crate);
-    write_parameters(file, endpoint_abi.inputs);
-}
-
-fn write_parameters(file: &mut File, inputs: Vec<InputAbi>) {
-    writeln!(file, "(").unwrap();
-    writeln!(file, "        self,").unwrap();
-    for (index, input) in inputs.iter().enumerate() {
-        writeln!(file, "        {}: Arg{index},", &input.arg_name).unwrap();
-    }
-    write!(file, "    ) ").unwrap();
-}
-
-fn write_constructor_output(file: &mut File, outputs: Vec<OutputAbi>, proxy_crate: &str) {
-    write!(file, "-> TxProxyDeploy<Env, From, Gas, ").unwrap();
-
-    parse_and_write_outputs(file, outputs, proxy_crate);
-
-    writeln!(file, "> {{").unwrap();
-}
-
-fn write_upgrade_constructor_output(file: &mut File, outputs: Vec<OutputAbi>, proxy_crate: &str) {
-    write!(file, "-> TxProxyUpgrade<Env, From, To, Gas, ").unwrap();
-
-    parse_and_write_outputs(file, outputs, proxy_crate);
-
-    writeln!(file, "> {{").unwrap();
-}
-
-fn write_endpoint_output(file: &mut File, outputs: Vec<OutputAbi>, proxy_crate: &str) {
-    write!(file, "-> TxProxyCall<Env, From, To, Gas, ").unwrap();
-
-    parse_and_write_outputs(file, outputs, proxy_crate);
-
-    writeln!(file, "> {{").unwrap();
-}
-
-fn write_constructor_content(file: &mut File, inputs: Vec<InputAbi>) {
-    writeln!(
-        file,
-        "        self.wrapped_tx
-            .raw_deploy()"
-    )
-    .unwrap();
-    for input in inputs.iter() {
-        writeln!(file, "            .argument(&{})", input.arg_name).unwrap();
-    }
-    writeln!(file, "            .original_result()").unwrap();
-}
-
-fn write_upgrade_constructor_content(file: &mut File, inputs: Vec<InputAbi>) {
-    writeln!(
-        file,
-        "        self.wrapped_tx
-            .raw_upgrade()"
-    )
-    .unwrap();
-    for input in inputs.iter() {
-        writeln!(file, "            .argument(&{})", input.arg_name).unwrap();
-    }
-    writeln!(file, "            .original_result()").unwrap();
-}
-
-fn write_endpoint_content(file: &mut File, function_name: String, inputs: Vec<InputAbi>) {
-    writeln!(
-        file,
-        "        self.wrapped_tx
-            .raw_call()
-            .function_name(\"{}\")",
-        function_name
-    )
-    .unwrap();
-
-    for input in inputs.iter() {
-        writeln!(file, "            .argument(&{})", input.arg_name).unwrap();
-    }
-
-    writeln!(file, "            .original_result()").unwrap();
-}
-
-fn write_function_header_endpoint(file: &mut File, rust_method_name: String) {
-    write!(file, "    pub fn {rust_method_name}").unwrap();
-}
-
-fn write_endpoint_docs(file: &mut File, docs: Vec<String>) {
-    for abi_doc in docs {
-        writeln!(file, "    /// {abi_doc} ").unwrap();
-    }
-}
-
-fn write_args(file: &mut File, inputs: Vec<InputAbi>, proxy_crate: &str) {
-    if inputs.is_empty() {
-        return;
-    }
-
-    writeln!(file, "<").unwrap();
-
-    for (index, input) in inputs.iter().enumerate() {
-        write_argument(file, index, &input.type_names.rust, proxy_crate);
-    }
-
-    write!(file, "    >").unwrap();
-}
-
-fn write_argument(file: &mut File, index: usize, rust_name: &str, proxy_crate: &str) {
-    let adjusted = adjust_type_name(rust_name, proxy_crate);
-    writeln!(file, "        Arg{index}: CodecInto<{adjusted}>,").unwrap();
-}
-
-fn write_end_of_function(file: &mut File) {
-    writeln!(file, "    }}").unwrap();
-}
-
-pub fn adjust_type_name(original_rust_name: &str, proxy_crate: &str) -> String {
-    clean_paths(
-        proxy_crate,
-        &original_rust_name
-            .replace("multiversx_sc::api::uncallable::UncallableApi", "Env::Api")
-            .replace("$API", "Env::Api"),
-    )
-}
-
-fn parse_and_write_outputs(file: &mut File, outputs: Vec<OutputAbi>, proxy_crate: &str) {
-    match outputs.len() {
-        0 => {
-            write!(file, "()").unwrap();
-        },
-        1 => {
-            let adjusted = adjust_type_name(&outputs[0].type_names.rust, proxy_crate);
-            write!(file, "{adjusted}").unwrap();
-        },
-        _ => {
-            write!(file, "MultiValue{}<", outputs.len()).unwrap();
-            for (i, output) in outputs.iter().enumerate() {
-                if i > 0 {
-                    write!(file, ", ").unwrap();
-                }
-                let adjusted = adjust_type_name(&output.type_names.rust, proxy_crate);
-                write!(file, "{adjusted}").unwrap();
-            }
-            write!(file, ">").unwrap();
-        },
-    }
-}
diff --git a/framework/meta/src/cmd/contract/generate_proxy/proxy_template_gen.rs b/framework/meta/src/cmd/contract/generate_proxy/proxy_template_gen.rs
index 6145315233..e91bf663ec 100644
--- a/framework/meta/src/cmd/contract/generate_proxy/proxy_template_gen.rs
+++ b/framework/meta/src/cmd/contract/generate_proxy/proxy_template_gen.rs
@@ -1,6 +1,6 @@
 use std::{fs::File, io::Write};
 
-use super::proxy_naming::{proxy_methods_type_name, proxy_type_name};
+use multiversx_sc::abi::{EndpointAbi, InputAbi, TypeDescription};
 
 const PRELUDE: &str = "// Code generated by the multiversx-sc proxy generator. DO NOT EDIT.
 
@@ -17,53 +17,113 @@ pub(crate) fn write_header(file: &mut File) {
     writeln!(file, r#"{PRELUDE}"#).unwrap();
 }
 
-pub(crate) fn write_tx_proxy_type_def(file: &mut File, name: &str) {
-    let proxy_type_name = proxy_type_name(name);
+pub fn write_endpoint_docs(file: &mut File, docs: &Vec<String>) {
+    for doc in docs {
+        writeln!(file, "    /// {doc} ").unwrap();
+    }
+}
+
+pub fn write_function_header_endpoint(file: &mut File, rust_method_name: &String) {
+    write!(file, "    pub fn {rust_method_name}").unwrap();
+}
+
+pub fn write_parameters(file: &mut File, inputs: &[InputAbi]) {
+    writeln!(file, "(").unwrap();
+    writeln!(file, "        self,").unwrap();
+    for (index, input) in inputs.iter().enumerate() {
+        writeln!(file, "        {}: Arg{index},", &input.arg_name).unwrap();
+    }
+    write!(file, "    ) ").unwrap();
+}
+
+pub fn write_constructor_content(file: &mut File, inputs: Vec<InputAbi>) {
     writeln!(
         file,
-        "
-pub struct {proxy_type_name};"
+        "        self.wrapped_tx
+            .raw_deploy()"
     )
     .unwrap();
+    for input in inputs.iter() {
+        writeln!(file, "            .argument(&{})", input.arg_name).unwrap();
+    }
+    writeln!(file, "            .original_result()").unwrap();
 }
 
-pub(crate) fn write_impl_for_tx_proxy(file: &mut File, name: &str) {
-    let proxy_type_name = proxy_type_name(name);
-    let proxy_methods_type_name = proxy_methods_type_name(name);
+pub fn write_upgrade_content(file: &mut File, inputs: Vec<InputAbi>) {
     writeln!(
         file,
-        r#"
-impl<Env, From, To, Gas> TxProxyTrait<Env, From, To, Gas> for {proxy_type_name}
-where
-    Env: TxEnv,
-    From: TxFrom<Env>,
-    To: TxTo<Env>,
-    Gas: TxGas<Env>,
-{{
-    type TxProxyMethods = {proxy_methods_type_name}<Env, From, To, Gas>;
-
-    fn proxy_methods(self, tx: Tx<Env, From, To, (), Gas, (), ()>) -> Self::TxProxyMethods {{
-        {proxy_methods_type_name} {{ wrapped_tx: tx }}
-    }}
-}}"#
+        "        self.wrapped_tx
+            .raw_upgrade()"
     )
     .unwrap();
+    for input in inputs.iter() {
+        writeln!(file, "            .argument(&{})", input.arg_name).unwrap();
+    }
+    writeln!(file, "            .original_result()").unwrap();
 }
 
-pub(crate) fn write_struct_tx_proxy_methods(file: &mut File, name: &str) {
-    let proxy_methods_type_name = proxy_methods_type_name(name);
+pub fn write_endpoint_content(file: &mut File, endpoint: &EndpointAbi) {
     writeln!(
         file,
-        r#"
-pub struct {proxy_methods_type_name}<Env, From, To, Gas>
-where
-    Env: TxEnv,
-    From: TxFrom<Env>,
-    To: TxTo<Env>,
-    Gas: TxGas<Env>,
-{{
-    wrapped_tx: Tx<Env, From, To, (), Gas, (), ()>,
-}}"#
+        "        self.wrapped_tx
+            .raw_call()
+            .function_name(\"{}\")",
+        endpoint.name
     )
     .unwrap();
+
+    for input in endpoint.inputs.iter() {
+        writeln!(file, "            .argument(&{})", input.arg_name).unwrap();
+    }
+
+    writeln!(file, "            .original_result()").unwrap();
+}
+
+pub fn write_end_of_function(file: &mut File) {
+    writeln!(file, "    }}").unwrap();
+}
+
+pub fn start_write_type(
+    file: &mut File,
+    type_type: &str,
+    type_description: &TypeDescription,
+    name: &str,
+) {
+    writeln!(file).unwrap();
+    write_macro_attributes(file, &type_description.macro_attributes);
+    write!(file, r#"pub {type_type} {name}"#).unwrap();
+
+    if name.contains("<Api>") {
+        writeln!(
+            file,
+            r#"
+where
+    Api: ManagedTypeApi,"#
+        )
+        .unwrap();
+    } else {
+        write!(file, " ").unwrap();
+    }
+
+    writeln!(file, r#"{{"#).unwrap();
+}
+
+pub fn write_macro_attributes(file: &mut File, macro_attributes: &[String]) {
+    if macro_attributes.is_empty() {
+        writeln!(file, "#[derive(TopEncode, TopDecode)]").unwrap();
+    } else {
+        writeln!(file, "#[derive({})]", macro_attributes.join(", ")).unwrap();
+    }
+}
+
+pub fn extract_struct_crate(struct_path: &str) -> String {
+    let struct_crate_name = struct_path
+        .replace('_', "-")
+        .replace("multiversx_sc::api::uncallable::UncallableApi", "Api")
+        .to_string();
+    let crate_name = struct_crate_name
+        .split("::")
+        .next()
+        .unwrap_or_else(|| &struct_crate_name);
+    crate_name.to_string()
 }

From a484045b114855df1856a48e43d921923872f21a Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Fri, 29 Mar 2024 16:51:58 +0100
Subject: [PATCH 0605/1254] more contract migrations to new proxy and unified
 syntax

---
 .../src/builtin_func_proxy.rs                 |   7 -
 .../src/crowdfunding_erc20.rs                 |  35 +--
 .../crowdfunding-erc20/src/erc20_proxy.rs     | 205 +++++++++++++
 .../erc1155-marketplace/src/erc1155_proxy.rs  | 282 ++++++++++++++++++
 .../erc1155-marketplace/src/lib.rs            |  14 +-
 .../erc1155/sc-config.toml                    |   1 +
 .../erc1155/src/erc1155.rs                    |  22 +-
 .../erc1155/src/erc1155_user_proxy.rs         | 107 +++++--
 .../erc-style-contracts/erc20/sc-config.toml  |   5 +
 .../lottery-erc20/src/erc20_proxy.rs          | 194 ++++++++++++
 .../lottery-erc20/src/lottery.rs              |  18 +-
 .../tests/use_module_scenario_rs_test.rs      |  23 +-
 .../use-module/tests/user_builtin_proxy.rs    |  52 ++++
 contracts/modules/src/dns.rs                  |  25 +-
 contracts/modules/src/dns_proxy.rs            |  52 ++++
 contracts/modules/src/lib.rs                  |   1 +
 16 files changed, 933 insertions(+), 110 deletions(-)
 create mode 100644 contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/src/erc20_proxy.rs
 create mode 100644 contracts/feature-tests/erc-style-contracts/erc1155-marketplace/src/erc1155_proxy.rs
 create mode 100644 contracts/feature-tests/erc-style-contracts/erc20/sc-config.toml
 create mode 100644 contracts/feature-tests/erc-style-contracts/lottery-erc20/src/erc20_proxy.rs
 create mode 100644 contracts/feature-tests/use-module/tests/user_builtin_proxy.rs
 create mode 100644 contracts/modules/src/dns_proxy.rs

diff --git a/contracts/feature-tests/composability/builtin-func-features/src/builtin_func_proxy.rs b/contracts/feature-tests/composability/builtin-func-features/src/builtin_func_proxy.rs
index 8d7d106f66..d9f5481db6 100644
--- a/contracts/feature-tests/composability/builtin-func-features/src/builtin_func_proxy.rs
+++ b/contracts/feature-tests/composability/builtin-func-features/src/builtin_func_proxy.rs
@@ -1,10 +1,3 @@
-// Code generated by the multiversx-sc proxy generator. DO NOT EDIT.
-
-////////////////////////////////////////////////////
-////////////////// AUTO-GENERATED //////////////////
-////////////////////////////////////////////////////
-
-#![allow(dead_code)]
 #![allow(clippy::all)]
 
 use multiversx_sc::proxy_imports::*;
diff --git a/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/src/crowdfunding_erc20.rs b/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/src/crowdfunding_erc20.rs
index fe509eba5b..72b1cf8708 100644
--- a/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/src/crowdfunding_erc20.rs
+++ b/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/src/crowdfunding_erc20.rs
@@ -3,6 +3,8 @@
 multiversx_sc::imports!();
 multiversx_sc::derive_imports!();
 
+pub mod erc20_proxy;
+
 #[derive(TopEncode, TopDecode, PartialEq, Eq, TypeAbi, Clone, Copy)]
 pub enum Status {
     FundingPeriod,
@@ -30,14 +32,15 @@ pub trait Crowdfunding {
         let erc20_address = self.erc20_contract_address().get();
         let cf_contract_address = self.blockchain().get_sc_address();
 
-        self.erc20_proxy(erc20_address)
+        self.tx()
+            .to(&erc20_address)
+            .typed(erc20_proxy::SimpleErc20TokenProxy)
             .transfer_from(caller.clone(), cf_contract_address, token_amount.clone())
-            .async_call()
             .with_callback(
                 self.callbacks()
                     .transfer_from_callback(caller, token_amount),
             )
-            .call_and_exit()
+            .async_call_and_exit();
     }
 
     #[view]
@@ -70,10 +73,11 @@ pub trait Crowdfunding {
 
                 let erc20_address = self.erc20_contract_address().get();
 
-                self.erc20_proxy(erc20_address)
+                self.tx()
+                    .to(&erc20_address)
+                    .typed(erc20_proxy::SimpleErc20TokenProxy)
                     .transfer(caller, balance)
-                    .async_call()
-                    .call_and_exit()
+                    .async_call_and_exit();
             },
             Status::Failed => {
                 let caller = self.blockchain().get_caller();
@@ -84,10 +88,11 @@ pub trait Crowdfunding {
 
                     let erc20_address = self.erc20_contract_address().get();
 
-                    self.erc20_proxy(erc20_address)
+                    self.tx()
+                        .to(&erc20_address)
+                        .typed(erc20_proxy::SimpleErc20TokenProxy)
                         .transfer(caller, deposit)
-                        .async_call()
-                        .call_and_exit()
+                        .async_call_and_exit();
                 }
             },
         }
@@ -106,10 +111,11 @@ pub trait Crowdfunding {
                 if self.blockchain().get_block_nonce() > self.deadline().get() {
                     let erc20_address = self.erc20_contract_address().get();
 
-                    self.erc20_proxy(erc20_address)
+                    self.tx()
+                        .to(&erc20_address)
+                        .typed(erc20_proxy::SimpleErc20TokenProxy)
                         .transfer(cb_sender, cb_amount)
-                        .async_call()
-                        .call_and_exit();
+                        .async_call_and_exit();
                 }
 
                 self.deposit(&cb_sender)
@@ -120,11 +126,6 @@ pub trait Crowdfunding {
         }
     }
 
-    // proxy
-
-    #[proxy]
-    fn erc20_proxy(&self, to: ManagedAddress) -> erc20::Proxy<Self::Api>;
-
     // storage
 
     #[view(get_target)]
diff --git a/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/src/erc20_proxy.rs b/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/src/erc20_proxy.rs
new file mode 100644
index 0000000000..fdbb416271
--- /dev/null
+++ b/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/src/erc20_proxy.rs
@@ -0,0 +1,205 @@
+// Code generated by the multiversx-sc proxy generator. DO NOT EDIT.
+
+////////////////////////////////////////////////////
+////////////////// AUTO-GENERATED //////////////////
+////////////////////////////////////////////////////
+
+#![allow(dead_code)]
+#![allow(clippy::all)]
+
+use multiversx_sc::proxy_imports::*;
+
+pub struct SimpleErc20TokenProxy;
+
+impl<Env, From, To, Gas> TxProxyTrait<Env, From, To, Gas> for SimpleErc20TokenProxy
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    type TxProxyMethods = SimpleErc20TokenProxyMethods<Env, From, To, Gas>;
+
+    fn proxy_methods(self, tx: Tx<Env, From, To, (), Gas, (), ()>) -> Self::TxProxyMethods {
+        SimpleErc20TokenProxyMethods { wrapped_tx: tx }
+    }
+}
+
+pub struct SimpleErc20TokenProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    wrapped_tx: Tx<Env, From, To, (), Gas, (), ()>,
+}
+
+#[rustfmt::skip]
+impl<Env, From, Gas> SimpleErc20TokenProxyMethods<Env, From, (), Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    Gas: TxGas<Env>,
+{
+    /// Constructor, is called immediately after the contract is created 
+    /// Will set the fixed global token supply and give all the supply to the creator. 
+    pub fn init<
+        Arg0: CodecInto<BigUint<Env::Api>>,
+    >(
+        self,
+        total_supply: Arg0,
+    ) -> TxProxyDeploy<Env, From, Gas, ()> {
+        self.wrapped_tx
+            .raw_deploy()
+            .argument(&total_supply)
+            .original_result()
+    }
+}
+
+#[rustfmt::skip]
+impl<Env, From, To, Gas> SimpleErc20TokenProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+}
+
+#[rustfmt::skip]
+impl<Env, From, To, Gas> SimpleErc20TokenProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    /// Total number of tokens in existence. 
+    pub fn total_supply(
+        self,
+    ) -> TxProxyCall<Env, From, To, Gas, BigUint<Env::Api>> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("totalSupply")
+            .original_result()
+    }
+
+    /// Gets the balance of the specified address. 
+    ///  
+    /// Arguments: 
+    ///  
+    /// * `address` The address to query the the balance of 
+    ///  
+    pub fn token_balance<
+        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+    >(
+        self,
+        address: Arg0,
+    ) -> TxProxyCall<Env, From, To, Gas, BigUint<Env::Api>> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("balanceOf")
+            .argument(&address)
+            .original_result()
+    }
+
+    /// The amount of tokens that an owner allowed to a spender. 
+    ///  
+    /// Arguments: 
+    ///  
+    /// * `owner` The address that owns the funds. 
+    /// * `spender` The address that will spend the funds. 
+    ///  
+    pub fn allowance<
+        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+        Arg1: CodecInto<ManagedAddress<Env::Api>>,
+    >(
+        self,
+        owner: Arg0,
+        spender: Arg1,
+    ) -> TxProxyCall<Env, From, To, Gas, BigUint<Env::Api>> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("allowance")
+            .argument(&owner)
+            .argument(&spender)
+            .original_result()
+    }
+
+    /// Transfer token to a specified address from sender. 
+    ///  
+    /// Arguments: 
+    ///  
+    /// * `to` The address to transfer to. 
+    ///  
+    pub fn transfer<
+        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+        Arg1: CodecInto<BigUint<Env::Api>>,
+    >(
+        self,
+        to: Arg0,
+        amount: Arg1,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("transfer")
+            .argument(&to)
+            .argument(&amount)
+            .original_result()
+    }
+
+    /// Use allowance to transfer funds between two accounts. 
+    ///  
+    /// Arguments: 
+    ///  
+    /// * `sender` The address to transfer from. 
+    /// * `recipient` The address to transfer to. 
+    /// * `amount` the amount of tokens to be transferred. 
+    ///  
+    pub fn transfer_from<
+        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+        Arg1: CodecInto<ManagedAddress<Env::Api>>,
+        Arg2: CodecInto<BigUint<Env::Api>>,
+    >(
+        self,
+        sender: Arg0,
+        recipient: Arg1,
+        amount: Arg2,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("transferFrom")
+            .argument(&sender)
+            .argument(&recipient)
+            .argument(&amount)
+            .original_result()
+    }
+
+    /// Approve the given address to spend the specified amount of tokens on behalf of the sender. 
+    /// It overwrites any previously existing allowance from sender to beneficiary. 
+    ///  
+    /// Arguments: 
+    ///  
+    /// * `spender` The address that will spend the funds. 
+    /// * `amount` The amount of tokens to be spent. 
+    ///  
+    pub fn approve<
+        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+        Arg1: CodecInto<BigUint<Env::Api>>,
+    >(
+        self,
+        spender: Arg0,
+        amount: Arg1,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("approve")
+            .argument(&spender)
+            .argument(&amount)
+            .original_result()
+    }
+}
diff --git a/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/src/erc1155_proxy.rs b/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/src/erc1155_proxy.rs
new file mode 100644
index 0000000000..44be409aa3
--- /dev/null
+++ b/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/src/erc1155_proxy.rs
@@ -0,0 +1,282 @@
+// Code generated by the multiversx-sc proxy generator. DO NOT EDIT.
+
+////////////////////////////////////////////////////
+////////////////// AUTO-GENERATED //////////////////
+////////////////////////////////////////////////////
+
+#![allow(dead_code)]
+#![allow(clippy::all)]
+
+use multiversx_sc::proxy_imports::*;
+
+pub struct Erc1155Proxy;
+
+impl<Env, From, To, Gas> TxProxyTrait<Env, From, To, Gas> for Erc1155Proxy
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    type TxProxyMethods = Erc1155ProxyMethods<Env, From, To, Gas>;
+
+    fn proxy_methods(self, tx: Tx<Env, From, To, (), Gas, (), ()>) -> Self::TxProxyMethods {
+        Erc1155ProxyMethods { wrapped_tx: tx }
+    }
+}
+
+pub struct Erc1155ProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    wrapped_tx: Tx<Env, From, To, (), Gas, (), ()>,
+}
+
+#[rustfmt::skip]
+impl<Env, From, Gas> Erc1155ProxyMethods<Env, From, (), Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn init(
+        self,
+    ) -> TxProxyDeploy<Env, From, Gas, ()> {
+        self.wrapped_tx
+            .raw_deploy()
+            .original_result()
+    }
+}
+
+#[rustfmt::skip]
+impl<Env, From, To, Gas> Erc1155ProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    /// `value` is amount for fungible, nft_id for non-fungible 
+    pub fn safe_transfer_from<
+        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+        Arg1: CodecInto<ManagedAddress<Env::Api>>,
+        Arg2: CodecInto<BigUint<Env::Api>>,
+        Arg3: CodecInto<BigUint<Env::Api>>,
+        Arg4: CodecInto<ManagedBuffer<Env::Api>>,
+    >(
+        self,
+        from: Arg0,
+        to: Arg1,
+        type_id: Arg2,
+        value: Arg3,
+        data: Arg4,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("safeTransferFrom")
+            .argument(&from)
+            .argument(&to)
+            .argument(&type_id)
+            .argument(&value)
+            .argument(&data)
+            .original_result()
+    }
+
+    /// `value` is amount for fungible, nft_id for non-fungible 
+    pub fn safe_batch_transfer_from<
+        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+        Arg1: CodecInto<ManagedAddress<Env::Api>>,
+        Arg2: CodecInto<Box<[BigUint<Env::Api>]>>,
+        Arg3: CodecInto<Box<[BigUint<Env::Api>]>>,
+        Arg4: CodecInto<ManagedBuffer<Env::Api>>,
+    >(
+        self,
+        from: Arg0,
+        to: Arg1,
+        type_ids: Arg2,
+        values: Arg3,
+        data: Arg4,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("safeBatchTransferFrom")
+            .argument(&from)
+            .argument(&to)
+            .argument(&type_ids)
+            .argument(&values)
+            .argument(&data)
+            .original_result()
+    }
+
+    pub fn set_approved_for_all<
+        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+        Arg1: CodecInto<bool>,
+    >(
+        self,
+        operator: Arg0,
+        approved: Arg1,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("setApprovalForAll")
+            .argument(&operator)
+            .argument(&approved)
+            .original_result()
+    }
+
+    pub fn create_token<
+        Arg0: CodecInto<BoxedBytes>,
+        Arg1: CodecInto<BigUint<Env::Api>>,
+        Arg2: CodecInto<bool>,
+    >(
+        self,
+        uri: Arg0,
+        initial_supply: Arg1,
+        is_fungible: Arg2,
+    ) -> TxProxyCall<Env, From, To, Gas, BigUint<Env::Api>> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("createToken")
+            .argument(&uri)
+            .argument(&initial_supply)
+            .argument(&is_fungible)
+            .original_result()
+    }
+
+    pub fn mint<
+        Arg0: CodecInto<BigUint<Env::Api>>,
+        Arg1: CodecInto<BigUint<Env::Api>>,
+    >(
+        self,
+        type_id: Arg0,
+        amount: Arg1,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("mint")
+            .argument(&type_id)
+            .argument(&amount)
+            .original_result()
+    }
+
+    pub fn burn<
+        Arg0: CodecInto<BigUint<Env::Api>>,
+        Arg1: CodecInto<BigUint<Env::Api>>,
+    >(
+        self,
+        type_id: Arg0,
+        amount: Arg1,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("burn")
+            .argument(&type_id)
+            .argument(&amount)
+            .original_result()
+    }
+
+    pub fn balance_of<
+        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+        Arg1: CodecInto<BigUint<Env::Api>>,
+    >(
+        self,
+        owner: Arg0,
+        type_id: Arg1,
+    ) -> TxProxyCall<Env, From, To, Gas, BigUint<Env::Api>> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("balanceOf")
+            .argument(&owner)
+            .argument(&type_id)
+            .original_result()
+    }
+
+    pub fn balance_of_batch<
+        Arg0: CodecInto<MultiValueEncoded<Env::Api, MultiValue2<ManagedAddress<Env::Api>, BigUint<Env::Api>>>>,
+    >(
+        self,
+        owner_type_id_pairs: Arg0,
+    ) -> TxProxyCall<Env, From, To, Gas, MultiValueEncoded<Env::Api, BigUint<Env::Api>>> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("balanceOfBatch")
+            .argument(&owner_type_id_pairs)
+            .original_result()
+    }
+
+    pub fn token_owner<
+        Arg0: CodecInto<BigUint<Env::Api>>,
+        Arg1: CodecInto<BigUint<Env::Api>>,
+    >(
+        self,
+        type_id: Arg0,
+        nft_id: Arg1,
+    ) -> TxProxyCall<Env, From, To, Gas, ManagedAddress<Env::Api>> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("getTokenOwner")
+            .argument(&type_id)
+            .argument(&nft_id)
+            .original_result()
+    }
+
+    pub fn token_type_creator<
+        Arg0: CodecInto<BigUint<Env::Api>>,
+    >(
+        self,
+        type_id: Arg0,
+    ) -> TxProxyCall<Env, From, To, Gas, ManagedAddress<Env::Api>> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("getTokenTypeCreator")
+            .argument(&type_id)
+            .original_result()
+    }
+
+    pub fn token_type_uri<
+        Arg0: CodecInto<BigUint<Env::Api>>,
+    >(
+        self,
+        type_id: Arg0,
+    ) -> TxProxyCall<Env, From, To, Gas, BoxedBytes> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("getTokenTypeUri")
+            .argument(&type_id)
+            .original_result()
+    }
+
+    pub fn is_fungible<
+        Arg0: CodecInto<BigUint<Env::Api>>,
+    >(
+        self,
+        type_id: Arg0,
+    ) -> TxProxyCall<Env, From, To, Gas, bool> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("isFungible")
+            .argument(&type_id)
+            .original_result()
+    }
+
+    pub fn is_approved<
+        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+        Arg1: CodecInto<ManagedAddress<Env::Api>>,
+    >(
+        self,
+        operator: Arg0,
+        owner: Arg1,
+    ) -> TxProxyCall<Env, From, To, Gas, bool> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("isApprovedForAll")
+            .argument(&operator)
+            .argument(&owner)
+            .original_result()
+    }
+}
diff --git a/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/src/lib.rs b/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/src/lib.rs
index 676b2b5b1d..08c0f09258 100644
--- a/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/src/lib.rs
+++ b/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/src/lib.rs
@@ -3,6 +3,8 @@
 multiversx_sc::imports!();
 multiversx_sc::derive_imports!();
 
+pub mod erc1155_proxy;
+
 const PERCENTAGE_TOTAL: u8 = 100;
 
 #[derive(TopEncode, TopDecode, TypeAbi)]
@@ -310,10 +312,11 @@ pub trait Erc1155Marketplace {
         let sc_own_address = self.blockchain().get_sc_address();
         let token_ownership_contract_address = self.token_ownership_contract_address().get();
 
-        self.erc1155_proxy(token_ownership_contract_address)
+        self.tx()
+            .to(&token_ownership_contract_address)
+            .typed(erc1155_proxy::Erc1155Proxy)
             .safe_transfer_from(sc_own_address, to, type_id, nft_id, &[])
-            .async_call()
-            .call_and_exit()
+            .async_call_and_exit();
     }
 
     fn calculate_cut_amount(&self, total_amount: &BigUint, cut_percentage: u8) -> BigUint {
@@ -332,11 +335,6 @@ pub trait Erc1155Marketplace {
         mapper.insert(token_identifier.clone(), BigUint::zero());
     }
 
-    // proxy
-
-    #[proxy]
-    fn erc1155_proxy(&self, to: ManagedAddress) -> erc1155::Proxy<Self::Api>;
-
     // storage
 
     // token ownership contract, i.e. the erc1155 SC
diff --git a/contracts/feature-tests/erc-style-contracts/erc1155/sc-config.toml b/contracts/feature-tests/erc-style-contracts/erc1155/sc-config.toml
index 9d5da94a85..e23006a55c 100644
--- a/contracts/feature-tests/erc-style-contracts/erc1155/sc-config.toml
+++ b/contracts/feature-tests/erc-style-contracts/erc1155/sc-config.toml
@@ -1,5 +1,6 @@
 [settings]
 main = "erc1155"
+proxy-paths = ["../erc1155-marketplace/src/erc1155_proxy.rs"]
 
 # the only purpose of this config is to specify the allocator
 [contracts.erc1155]
diff --git a/contracts/feature-tests/erc-style-contracts/erc1155/src/erc1155.rs b/contracts/feature-tests/erc-style-contracts/erc1155/src/erc1155.rs
index 9fb1fb5216..c6e9c5ce9a 100644
--- a/contracts/feature-tests/erc-style-contracts/erc1155/src/erc1155.rs
+++ b/contracts/feature-tests/erc-style-contracts/erc1155/src/erc1155.rs
@@ -350,16 +350,17 @@ pub trait Erc1155 {
     ) {
         let caller = self.blockchain().get_caller();
 
-        self.erc1155_user_proxy(to.clone())
+        self.tx()
+            .to(to.clone())
+            .typed(erc1155_user_proxy::Erc1155UserProxy)
             .on_erc1155_received(caller, from.clone(), type_id.clone(), value.clone(), data)
-            .async_call()
             .with_callback(self.callbacks().transfer_callback(
                 from,
                 to,
                 [type_id].to_vec(),
                 [value].to_vec(),
             ))
-            .call_and_exit()
+            .async_call_and_exit();
     }
 
     fn peform_async_call_batch_transfer(
@@ -372,7 +373,9 @@ pub trait Erc1155 {
     ) {
         let caller = self.blockchain().get_caller();
 
-        self.erc1155_user_proxy(to.clone())
+        self.tx()
+            .to(to.clone())
+            .typed(erc1155_user_proxy::Erc1155UserProxy)
             .on_erc1155_batch_received(
                 caller,
                 from.clone(),
@@ -380,14 +383,13 @@ pub trait Erc1155 {
                 values.to_vec(),
                 data,
             )
-            .async_call()
             .with_callback(self.callbacks().transfer_callback(
                 from,
                 to,
                 type_ids.to_vec(),
                 values.to_vec(),
             ))
-            .call_and_exit()
+            .async_call_and_exit();
     }
 
     // callbacks
@@ -418,14 +420,6 @@ pub trait Erc1155 {
         }
     }
 
-    // proxy
-
-    #[proxy]
-    fn erc1155_user_proxy(
-        &self,
-        sc_address: ManagedAddress,
-    ) -> erc1155_user_proxy::Proxy<Self::Api>;
-
     // storage
 
     // map for address -> type_id -> amount
diff --git a/contracts/feature-tests/erc-style-contracts/erc1155/src/erc1155_user_proxy.rs b/contracts/feature-tests/erc-style-contracts/erc1155/src/erc1155_user_proxy.rs
index 5c645bf4be..9d1f909079 100644
--- a/contracts/feature-tests/erc-style-contracts/erc1155/src/erc1155_user_proxy.rs
+++ b/contracts/feature-tests/erc-style-contracts/erc1155/src/erc1155_user_proxy.rs
@@ -1,24 +1,89 @@
-multiversx_sc::imports!();
+#![allow(clippy::all)]
 
-#[multiversx_sc::proxy]
-pub trait Erc1155UserProxy {
-    #[endpoint(onERC1155Received)]
-    fn on_erc1155_received(
-        &self,
-        operator: ManagedAddress,
-        from: ManagedAddress,
-        type_id: BigUint,
-        value: BigUint,
-        data: ManagedBuffer,
-    );
+use multiversx_sc::proxy_imports::*;
 
-    #[endpoint(onERC1155BatchReceived)]
-    fn on_erc1155_batch_received(
-        &self,
-        operator: ManagedAddress,
-        from: ManagedAddress,
-        type_ids: Vec<BigUint>,
-        values: Vec<BigUint>,
-        data: ManagedBuffer,
-    );
+pub struct Erc1155UserProxy;
+
+impl<Env, From, To, Gas> TxProxyTrait<Env, From, To, Gas> for Erc1155UserProxy
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    type TxProxyMethods = Erc1155UserProxyMethods<Env, From, To, Gas>;
+
+    fn proxy_methods(self, tx: Tx<Env, From, To, (), Gas, (), ()>) -> Self::TxProxyMethods {
+        Erc1155UserProxyMethods { wrapped_tx: tx }
+    }
+}
+
+pub struct Erc1155UserProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    wrapped_tx: Tx<Env, From, To, (), Gas, (), ()>,
+}
+
+#[rustfmt::skip]
+impl<Env, From, To, Gas> Erc1155UserProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn on_erc1155_received<
+        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+        Arg1: CodecInto<ManagedAddress<Env::Api>>,
+        Arg2: CodecInto<BigUint<Env::Api>>,
+        Arg3: CodecInto<BigUint<Env::Api>>,
+        Arg4: CodecInto<ManagedBuffer<Env::Api>>,
+    >(
+        self,
+        operator: Arg0,
+        from: Arg1,
+        type_id: Arg2,
+        value: Arg3,
+        data: Arg4,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("onERC1155Received")
+            .argument(&operator)
+            .argument(&from)
+            .argument(&type_id)
+            .argument(&value)
+            .argument(&data)
+            .original_result()
+    }
+
+    pub fn on_erc1155_batch_received<
+        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+        Arg1: CodecInto<ManagedAddress<Env::Api>>,
+        Arg2: CodecInto<Vec<BigUint<Env::Api>>>,
+        Arg3: CodecInto<Vec<BigUint<Env::Api>>>,
+        Arg4: CodecInto<ManagedBuffer<Env::Api>>,
+    >(
+        self,
+        operator: Arg0,
+        from: Arg1,
+        type_ids: Arg2,
+        values: Arg3,
+        data: Arg4,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("onERC1155BatchReceived")
+            .argument(&operator)
+            .argument(&from)
+            .argument(&type_ids)
+            .argument(&values)
+            .argument(&data)
+            .original_result()
+    }
 }
diff --git a/contracts/feature-tests/erc-style-contracts/erc20/sc-config.toml b/contracts/feature-tests/erc-style-contracts/erc20/sc-config.toml
new file mode 100644
index 0000000000..45d4fccdce
--- /dev/null
+++ b/contracts/feature-tests/erc-style-contracts/erc20/sc-config.toml
@@ -0,0 +1,5 @@
+[settings]
+proxy-paths = [
+    "../crowdfunding-erc20/src/erc20_proxy.rs",
+    "../lottery-erc20/src/erc20_proxy.rs",
+]
diff --git a/contracts/feature-tests/erc-style-contracts/lottery-erc20/src/erc20_proxy.rs b/contracts/feature-tests/erc-style-contracts/lottery-erc20/src/erc20_proxy.rs
new file mode 100644
index 0000000000..4acfd01eb2
--- /dev/null
+++ b/contracts/feature-tests/erc-style-contracts/lottery-erc20/src/erc20_proxy.rs
@@ -0,0 +1,194 @@
+// Code generated by the multiversx-sc proxy generator. DO NOT EDIT.
+
+////////////////////////////////////////////////////
+////////////////// AUTO-GENERATED //////////////////
+////////////////////////////////////////////////////
+
+#![allow(dead_code)]
+#![allow(clippy::all)]
+
+use multiversx_sc::proxy_imports::*;
+
+pub struct SimpleErc20TokenProxy;
+
+impl<Env, From, To, Gas> TxProxyTrait<Env, From, To, Gas> for SimpleErc20TokenProxy
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    type TxProxyMethods = SimpleErc20TokenProxyMethods<Env, From, To, Gas>;
+
+    fn proxy_methods(self, tx: Tx<Env, From, To, (), Gas, (), ()>) -> Self::TxProxyMethods {
+        SimpleErc20TokenProxyMethods { wrapped_tx: tx }
+    }
+}
+
+pub struct SimpleErc20TokenProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    wrapped_tx: Tx<Env, From, To, (), Gas, (), ()>,
+}
+
+#[rustfmt::skip]
+impl<Env, From, Gas> SimpleErc20TokenProxyMethods<Env, From, (), Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    Gas: TxGas<Env>,
+{
+    /// Constructor, is called immediately after the contract is created 
+    /// Will set the fixed global token supply and give all the supply to the creator. 
+    pub fn init<
+        Arg0: CodecInto<BigUint<Env::Api>>,
+    >(
+        self,
+        total_supply: Arg0,
+    ) -> TxProxyDeploy<Env, From, Gas, ()> {
+        self.wrapped_tx
+            .raw_deploy()
+            .argument(&total_supply)
+            .original_result()
+    }
+}
+
+#[rustfmt::skip]
+impl<Env, From, To, Gas> SimpleErc20TokenProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    /// Total number of tokens in existence. 
+    pub fn total_supply(
+        self,
+    ) -> TxProxyCall<Env, From, To, Gas, BigUint<Env::Api>> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("totalSupply")
+            .original_result()
+    }
+
+    /// Gets the balance of the specified address. 
+    ///  
+    /// Arguments: 
+    ///  
+    /// * `address` The address to query the the balance of 
+    ///  
+    pub fn token_balance<
+        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+    >(
+        self,
+        address: Arg0,
+    ) -> TxProxyCall<Env, From, To, Gas, BigUint<Env::Api>> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("balanceOf")
+            .argument(&address)
+            .original_result()
+    }
+
+    /// The amount of tokens that an owner allowed to a spender. 
+    ///  
+    /// Arguments: 
+    ///  
+    /// * `owner` The address that owns the funds. 
+    /// * `spender` The address that will spend the funds. 
+    ///  
+    pub fn allowance<
+        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+        Arg1: CodecInto<ManagedAddress<Env::Api>>,
+    >(
+        self,
+        owner: Arg0,
+        spender: Arg1,
+    ) -> TxProxyCall<Env, From, To, Gas, BigUint<Env::Api>> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("allowance")
+            .argument(&owner)
+            .argument(&spender)
+            .original_result()
+    }
+
+    /// Transfer token to a specified address from sender. 
+    ///  
+    /// Arguments: 
+    ///  
+    /// * `to` The address to transfer to. 
+    ///  
+    pub fn transfer<
+        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+        Arg1: CodecInto<BigUint<Env::Api>>,
+    >(
+        self,
+        to: Arg0,
+        amount: Arg1,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("transfer")
+            .argument(&to)
+            .argument(&amount)
+            .original_result()
+    }
+
+    /// Use allowance to transfer funds between two accounts. 
+    ///  
+    /// Arguments: 
+    ///  
+    /// * `sender` The address to transfer from. 
+    /// * `recipient` The address to transfer to. 
+    /// * `amount` the amount of tokens to be transferred. 
+    ///  
+    pub fn transfer_from<
+        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+        Arg1: CodecInto<ManagedAddress<Env::Api>>,
+        Arg2: CodecInto<BigUint<Env::Api>>,
+    >(
+        self,
+        sender: Arg0,
+        recipient: Arg1,
+        amount: Arg2,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("transferFrom")
+            .argument(&sender)
+            .argument(&recipient)
+            .argument(&amount)
+            .original_result()
+    }
+
+    /// Approve the given address to spend the specified amount of tokens on behalf of the sender. 
+    /// It overwrites any previously existing allowance from sender to beneficiary. 
+    ///  
+    /// Arguments: 
+    ///  
+    /// * `spender` The address that will spend the funds. 
+    /// * `amount` The amount of tokens to be spent. 
+    ///  
+    pub fn approve<
+        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+        Arg1: CodecInto<BigUint<Env::Api>>,
+    >(
+        self,
+        spender: Arg0,
+        amount: Arg1,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("approve")
+            .argument(&spender)
+            .argument(&amount)
+            .original_result()
+    }
+}
diff --git a/contracts/feature-tests/erc-style-contracts/lottery-erc20/src/lottery.rs b/contracts/feature-tests/erc-style-contracts/lottery-erc20/src/lottery.rs
index 318563e703..105b19b166 100644
--- a/contracts/feature-tests/erc-style-contracts/lottery-erc20/src/lottery.rs
+++ b/contracts/feature-tests/erc-style-contracts/lottery-erc20/src/lottery.rs
@@ -2,6 +2,7 @@
 
 multiversx_sc::imports!();
 
+mod erc20_proxy;
 mod lottery_info;
 mod random;
 mod status;
@@ -15,9 +16,6 @@ const THIRTY_DAYS_IN_SECONDS: u64 = 60 * 60 * 24 * 30;
 
 #[multiversx_sc::contract]
 pub trait Lottery {
-    #[proxy]
-    fn erc20_proxy(&self, to: ManagedAddress) -> erc20::Proxy<Self::Api>;
-
     #[init]
     fn init(&self, erc20_contract_address: ManagedAddress) {
         self.set_erc20_contract_address(&erc20_contract_address);
@@ -212,14 +210,15 @@ pub trait Lottery {
 
         let erc20_address = self.get_erc20_contract_address();
         let lottery_contract_address = self.blockchain().get_sc_address();
-        self.erc20_proxy(erc20_address)
+        self.tx()
+            .to(&erc20_address)
+            .typed(erc20_proxy::SimpleErc20TokenProxy)
             .transfer_from(caller.clone(), lottery_contract_address, token_amount)
-            .async_call()
             .with_callback(
                 self.callbacks()
                     .transfer_from_callback(lottery_name, &caller),
             )
-            .call_and_exit()
+            .async_call_and_exit();
     }
 
     fn reserve_ticket(&self, lottery_name: &BoxedBytes) {
@@ -282,11 +281,12 @@ pub trait Lottery {
 
         let erc20_address = self.get_erc20_contract_address();
 
-        self.erc20_proxy(erc20_address)
+        self.tx()
+            .to(&erc20_address)
+            .typed(erc20_proxy::SimpleErc20TokenProxy)
             .transfer(winner_address, prize)
-            .async_call()
             .with_callback(self.callbacks().distribute_prizes_callback(lottery_name))
-            .call_and_exit()
+            .async_call_and_exit();
     }
 
     fn get_random_winning_ticket_id(&self, prev_winners: &[u32], total_tickets: u32) -> u32 {
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 2ecb798d24..a234b631f2 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
@@ -1,30 +1,21 @@
-mod user_builtin {
-    multiversx_sc::imports!();
-
-    #[multiversx_sc::proxy]
-    pub trait UserBuiltin {
-        #[endpoint(SetUserName)]
-        fn set_user_name(&self, name: &BoxedBytes) -> BigUint;
-    }
-}
-
+pub mod user_builtin_proxy;
 mod dns_mock {
+    use crate::user_builtin_proxy;
+
     multiversx_sc::imports!();
 
     #[multiversx_sc::contract]
     pub trait DnsMock {
-        #[proxy]
-        fn user_builtin_proxy(&self, to: ManagedAddress) -> super::user_builtin::Proxy<Self::Api>;
-
         #[payable("EGLD")]
         #[endpoint]
         fn register(&self, name: BoxedBytes) {
             let _payment = self.call_value().egld_value();
             let address = self.blockchain().get_caller();
-            self.user_builtin_proxy(address)
+            self.tx()
+                .to(&address)
+                .typed(user_builtin_proxy::UserBuiltinProxy)
                 .set_user_name(&name)
-                .async_call()
-                .call_and_exit()
+                .async_call_and_exit();
         }
     }
 }
diff --git a/contracts/feature-tests/use-module/tests/user_builtin_proxy.rs b/contracts/feature-tests/use-module/tests/user_builtin_proxy.rs
new file mode 100644
index 0000000000..75e078f55a
--- /dev/null
+++ b/contracts/feature-tests/use-module/tests/user_builtin_proxy.rs
@@ -0,0 +1,52 @@
+#![allow(clippy::all)]
+
+use multiversx_sc::proxy_imports::*;
+
+pub struct UserBuiltinProxy;
+
+impl<Env, From, To, Gas> TxProxyTrait<Env, From, To, Gas> for UserBuiltinProxy
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    type TxProxyMethods = UserBuiltinProxyMethods<Env, From, To, Gas>;
+
+    fn proxy_methods(self, tx: Tx<Env, From, To, (), Gas, (), ()>) -> Self::TxProxyMethods {
+        UserBuiltinProxyMethods { wrapped_tx: tx }
+    }
+}
+
+pub struct UserBuiltinProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    wrapped_tx: Tx<Env, From, To, (), Gas, (), ()>,
+}
+
+#[rustfmt::skip]
+impl<Env, From, To, Gas> UserBuiltinProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn set_user_name<
+        Arg0: CodecInto<BoxedBytes>,
+    >(
+        self,
+        name: Arg0,
+    ) -> TxProxyCall<Env, From, To, Gas, BigUint<Env::Api>> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("SetUserName")
+            .argument(&name)
+            .original_result()
+    }
+}
diff --git a/contracts/modules/src/dns.rs b/contracts/modules/src/dns.rs
index 0bbeb38101..7e8123a0cf 100644
--- a/contracts/modules/src/dns.rs
+++ b/contracts/modules/src/dns.rs
@@ -1,13 +1,4 @@
-mod dns_proxy {
-    multiversx_sc::imports!();
-
-    #[multiversx_sc::proxy]
-    pub trait Dns {
-        #[payable("EGLD")]
-        #[endpoint]
-        fn register(&self, name: &ManagedBuffer);
-    }
-}
+use crate::dns_proxy;
 
 multiversx_sc::imports!();
 
@@ -18,18 +9,16 @@ multiversx_sc::imports!();
 ///
 #[multiversx_sc::module]
 pub trait DnsModule {
-    #[proxy]
-    fn dns_proxy(&self, to: ManagedAddress) -> dns_proxy::Proxy<Self::Api>;
-
     #[payable("EGLD")]
     #[only_owner]
     #[endpoint(dnsRegister)]
     fn dns_register(&self, dns_address: ManagedAddress, name: ManagedBuffer) {
         let payment = self.call_value().egld_value().clone_value();
-        self.dns_proxy(dns_address)
-            .register(&name)
-            .with_egld_transfer(payment)
-            .async_call()
-            .call_and_exit()
+        self.tx()
+            .to(&dns_address)
+            .typed(dns_proxy::DnsProxy)
+            .register(name)
+            .egld(payment)
+            .async_call_and_exit();
     }
 }
diff --git a/contracts/modules/src/dns_proxy.rs b/contracts/modules/src/dns_proxy.rs
new file mode 100644
index 0000000000..7b5a0bd8dc
--- /dev/null
+++ b/contracts/modules/src/dns_proxy.rs
@@ -0,0 +1,52 @@
+#![allow(clippy::all)]
+
+use multiversx_sc::proxy_imports::*;
+
+pub struct DnsProxy;
+
+impl<Env, From, To, Gas> TxProxyTrait<Env, From, To, Gas> for DnsProxy
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    type TxProxyMethods = DnsProxyMethods<Env, From, To, Gas>;
+
+    fn proxy_methods(self, tx: Tx<Env, From, To, (), Gas, (), ()>) -> Self::TxProxyMethods {
+        DnsProxyMethods { wrapped_tx: tx }
+    }
+}
+
+pub struct DnsProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    wrapped_tx: Tx<Env, From, To, (), Gas, (), ()>,
+}
+
+#[rustfmt::skip]
+impl<Env, From, To, Gas> DnsProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn register<
+        Arg0: CodecInto<ManagedBuffer<Env::Api>>,
+    >(
+        self,
+        name: Arg0,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("register")
+            .argument(&name)
+            .original_result()
+    }
+}
diff --git a/contracts/modules/src/lib.rs b/contracts/modules/src/lib.rs
index b1973e3fc0..58b5da9c73 100644
--- a/contracts/modules/src/lib.rs
+++ b/contracts/modules/src/lib.rs
@@ -5,6 +5,7 @@ pub mod bonding_curve;
 pub mod claim_developer_rewards;
 pub mod default_issue_callbacks;
 pub mod dns;
+pub mod dns_proxy;
 pub mod esdt;
 pub mod features;
 pub mod governance;

From 683e81cc164e05bfb01eababc491b3cf72f12079 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Fri, 29 Mar 2024 16:54:22 +0100
Subject: [PATCH 0606/1254] cleanup

---
 .../crowdfunding-erc20/src/erc20_proxy.rs             | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/src/erc20_proxy.rs b/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/src/erc20_proxy.rs
index fdbb416271..4acfd01eb2 100644
--- a/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/src/erc20_proxy.rs
+++ b/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/src/erc20_proxy.rs
@@ -58,17 +58,6 @@ where
     }
 }
 
-#[rustfmt::skip]
-impl<Env, From, To, Gas> SimpleErc20TokenProxyMethods<Env, From, To, Gas>
-where
-    Env: TxEnv,
-    Env::Api: VMApi,
-    From: TxFrom<Env>,
-    To: TxTo<Env>,
-    Gas: TxGas<Env>,
-{
-}
-
 #[rustfmt::skip]
 impl<Env, From, To, Gas> SimpleErc20TokenProxyMethods<Env, From, To, Gas>
 where

From 50ceeff92c1241c9860c098ff66c3eb770deacea Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Fri, 29 Mar 2024 18:13:02 +0100
Subject: [PATCH 0607/1254] crypto kitties migration progress

---
 .../crypto-kitties/common/kitty/src/color.rs  |   3 +-
 .../common/kitty/src/kitty_genes.rs           |   3 +-
 .../crypto-kitties/common/kitty/src/lib.rs    |   3 +-
 .../src/kitty_ownership_proxy.rs              | 386 ++++++++++++++++++
 .../crypto-kitties/kitty-auction/src/lib.rs   |  34 +-
 .../kitty-genetic-alg/sc-config.toml          |   2 +
 .../kitty-ownership/sc-config.toml            |   5 +
 .../src/kitty_genetic_alg_proxy.rs            |  57 +++
 .../crypto-kitties/kitty-ownership/src/lib.rs |  24 +-
 .../kitty-ownership/src/structs.rs            | 151 +++++++
 .../src/crypto_kitties_proxy.rs               |  46 ---
 .../src/kitty_ownership_proxy.rs              | 376 +++++++++++++++++
 contracts/examples/crypto-zombies/src/lib.rs  |   2 +-
 .../crypto-zombies/src/zombie_feeding.rs      |  11 +-
 14 files changed, 1017 insertions(+), 86 deletions(-)
 create mode 100644 contracts/examples/crypto-kitties/kitty-auction/src/kitty_ownership_proxy.rs
 create mode 100644 contracts/examples/crypto-kitties/kitty-genetic-alg/sc-config.toml
 create mode 100644 contracts/examples/crypto-kitties/kitty-ownership/sc-config.toml
 create mode 100644 contracts/examples/crypto-kitties/kitty-ownership/src/kitty_genetic_alg_proxy.rs
 create mode 100644 contracts/examples/crypto-kitties/kitty-ownership/src/structs.rs
 delete mode 100644 contracts/examples/crypto-zombies/src/crypto_kitties_proxy.rs
 create mode 100644 contracts/examples/crypto-zombies/src/kitty_ownership_proxy.rs

diff --git a/contracts/examples/crypto-kitties/common/kitty/src/color.rs b/contracts/examples/crypto-kitties/common/kitty/src/color.rs
index 0b02aecf49..408b5eb06e 100644
--- a/contracts/examples/crypto-kitties/common/kitty/src/color.rs
+++ b/contracts/examples/crypto-kitties/common/kitty/src/color.rs
@@ -2,7 +2,8 @@ use multiversx_sc::derive_imports::*;
 
 use random::*;
 
-#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, Clone, TypeAbi, Default)]
+#[type_abi]
+#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, Clone, Default)]
 pub struct Color {
     pub r: u8,
     pub g: u8,
diff --git a/contracts/examples/crypto-kitties/common/kitty/src/kitty_genes.rs b/contracts/examples/crypto-kitties/common/kitty/src/kitty_genes.rs
index 4deb4100e6..958543605e 100644
--- a/contracts/examples/crypto-kitties/common/kitty/src/kitty_genes.rs
+++ b/contracts/examples/crypto-kitties/common/kitty/src/kitty_genes.rs
@@ -3,7 +3,8 @@ use multiversx_sc::derive_imports::*;
 use super::color::*;
 use random::*;
 
-#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, Clone, TypeAbi, Default)]
+#[type_abi]
+#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, Clone, Default)]
 pub struct KittyGenes {
     pub fur_color: Color,
     pub eye_color: Color,
diff --git a/contracts/examples/crypto-kitties/common/kitty/src/lib.rs b/contracts/examples/crypto-kitties/common/kitty/src/lib.rs
index c06f376e8d..1a9a0ec436 100644
--- a/contracts/examples/crypto-kitties/common/kitty/src/lib.rs
+++ b/contracts/examples/crypto-kitties/common/kitty/src/lib.rs
@@ -12,7 +12,8 @@ pub mod kitty_genes;
 use color::*;
 use kitty_genes::*;
 
-#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, TypeAbi)]
+#[type_abi]
+#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct Kitty {
     pub genes: KittyGenes,
     pub birth_time: u64,   // timestamp
diff --git a/contracts/examples/crypto-kitties/kitty-auction/src/kitty_ownership_proxy.rs b/contracts/examples/crypto-kitties/kitty-auction/src/kitty_ownership_proxy.rs
new file mode 100644
index 0000000000..697d07bfce
--- /dev/null
+++ b/contracts/examples/crypto-kitties/kitty-auction/src/kitty_ownership_proxy.rs
@@ -0,0 +1,386 @@
+// Code generated by the multiversx-sc proxy generator. DO NOT EDIT.
+
+////////////////////////////////////////////////////
+////////////////// AUTO-GENERATED //////////////////
+////////////////////////////////////////////////////
+
+#![allow(dead_code)]
+#![allow(clippy::all)]
+
+use multiversx_sc::proxy_imports::*;
+
+pub struct KittyOwnershipProxy;
+
+impl<Env, From, To, Gas> TxProxyTrait<Env, From, To, Gas> for KittyOwnershipProxy
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    type TxProxyMethods = KittyOwnershipProxyMethods<Env, From, To, Gas>;
+
+    fn proxy_methods(self, tx: Tx<Env, From, To, (), Gas, (), ()>) -> Self::TxProxyMethods {
+        KittyOwnershipProxyMethods { wrapped_tx: tx }
+    }
+}
+
+pub struct KittyOwnershipProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    wrapped_tx: Tx<Env, From, To, (), Gas, (), ()>,
+}
+
+#[rustfmt::skip]
+impl<Env, From, Gas> KittyOwnershipProxyMethods<Env, From, (), Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn init<
+        Arg0: CodecInto<BigUint<Env::Api>>,
+        Arg1: CodecInto<OptionalValue<ManagedAddress<Env::Api>>>,
+        Arg2: CodecInto<OptionalValue<ManagedAddress<Env::Api>>>,
+    >(
+        self,
+        birth_fee: Arg0,
+        opt_gene_science_contract_address: Arg1,
+        opt_kitty_auction_contract_address: Arg2,
+    ) -> TxProxyDeploy<Env, From, Gas, ()> {
+        self.wrapped_tx
+            .raw_deploy()
+            .argument(&birth_fee)
+            .argument(&opt_gene_science_contract_address)
+            .argument(&opt_kitty_auction_contract_address)
+            .original_result()
+    }
+}
+
+#[rustfmt::skip]
+impl<Env, From, To, Gas> KittyOwnershipProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn set_gene_science_contract_address_endpoint<
+        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+    >(
+        self,
+        address: Arg0,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("setGeneScienceContractAddress")
+            .argument(&address)
+            .original_result()
+    }
+
+    pub fn set_kitty_auction_contract_address_endpoint<
+        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+    >(
+        self,
+        address: Arg0,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("setKittyAuctionContractAddress")
+            .argument(&address)
+            .original_result()
+    }
+
+    pub fn claim(
+        self,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("claim")
+            .original_result()
+    }
+
+    pub fn total_supply(
+        self,
+    ) -> TxProxyCall<Env, From, To, Gas, u32> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("totalSupply")
+            .original_result()
+    }
+
+    pub fn balance_of<
+        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+    >(
+        self,
+        address: Arg0,
+    ) -> TxProxyCall<Env, From, To, Gas, u32> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("balanceOf")
+            .argument(&address)
+            .original_result()
+    }
+
+    pub fn owner_of<
+        Arg0: CodecInto<u32>,
+    >(
+        self,
+        kitty_id: Arg0,
+    ) -> TxProxyCall<Env, From, To, Gas, ManagedAddress<Env::Api>> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("ownerOf")
+            .argument(&kitty_id)
+            .original_result()
+    }
+
+    pub fn approve<
+        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+        Arg1: CodecInto<u32>,
+    >(
+        self,
+        to: Arg0,
+        kitty_id: Arg1,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("approve")
+            .argument(&to)
+            .argument(&kitty_id)
+            .original_result()
+    }
+
+    pub fn transfer<
+        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+        Arg1: CodecInto<u32>,
+    >(
+        self,
+        to: Arg0,
+        kitty_id: Arg1,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("transfer")
+            .argument(&to)
+            .argument(&kitty_id)
+            .original_result()
+    }
+
+    pub fn transfer_from<
+        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+        Arg1: CodecInto<ManagedAddress<Env::Api>>,
+        Arg2: CodecInto<u32>,
+    >(
+        self,
+        from: Arg0,
+        to: Arg1,
+        kitty_id: Arg2,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("transfer_from")
+            .argument(&from)
+            .argument(&to)
+            .argument(&kitty_id)
+            .original_result()
+    }
+
+    pub fn tokens_of_owner<
+        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+    >(
+        self,
+        address: Arg0,
+    ) -> TxProxyCall<Env, From, To, Gas, MultiValueEncoded<Env::Api, u32>> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("tokensOfOwner")
+            .argument(&address)
+            .original_result()
+    }
+
+    pub fn allow_auctioning<
+        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+        Arg1: CodecInto<u32>,
+    >(
+        self,
+        by: Arg0,
+        kitty_id: Arg1,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("allowAuctioning")
+            .argument(&by)
+            .argument(&kitty_id)
+            .original_result()
+    }
+
+    pub fn approve_siring_and_return_kitty<
+        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+        Arg1: CodecInto<ManagedAddress<Env::Api>>,
+        Arg2: CodecInto<u32>,
+    >(
+        self,
+        approved_address: Arg0,
+        kitty_owner: Arg1,
+        kitty_id: Arg2,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("approveSiringAndReturnKitty")
+            .argument(&approved_address)
+            .argument(&kitty_owner)
+            .argument(&kitty_id)
+            .original_result()
+    }
+
+    pub fn create_gen_zero_kitty(
+        self,
+    ) -> TxProxyCall<Env, From, To, Gas, u32> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("createGenZeroKitty")
+            .original_result()
+    }
+
+    pub fn get_kitty_by_id_endpoint<
+        Arg0: CodecInto<u32>,
+    >(
+        self,
+        kitty_id: Arg0,
+    ) -> TxProxyCall<Env, From, To, Gas, Kitty> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("getKittyById")
+            .argument(&kitty_id)
+            .original_result()
+    }
+
+    pub fn is_ready_to_breed<
+        Arg0: CodecInto<u32>,
+    >(
+        self,
+        kitty_id: Arg0,
+    ) -> TxProxyCall<Env, From, To, Gas, bool> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("isReadyToBreed")
+            .argument(&kitty_id)
+            .original_result()
+    }
+
+    pub fn is_pregnant<
+        Arg0: CodecInto<u32>,
+    >(
+        self,
+        kitty_id: Arg0,
+    ) -> TxProxyCall<Env, From, To, Gas, bool> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("isPregnant")
+            .argument(&kitty_id)
+            .original_result()
+    }
+
+    pub fn can_breed_with<
+        Arg0: CodecInto<u32>,
+        Arg1: CodecInto<u32>,
+    >(
+        self,
+        matron_id: Arg0,
+        sire_id: Arg1,
+    ) -> TxProxyCall<Env, From, To, Gas, bool> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("canBreedWith")
+            .argument(&matron_id)
+            .argument(&sire_id)
+            .original_result()
+    }
+
+    pub fn approve_siring<
+        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+        Arg1: CodecInto<u32>,
+    >(
+        self,
+        address: Arg0,
+        kitty_id: Arg1,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("approveSiring")
+            .argument(&address)
+            .argument(&kitty_id)
+            .original_result()
+    }
+
+    pub fn breed_with<
+        Arg0: CodecInto<u32>,
+        Arg1: CodecInto<u32>,
+    >(
+        self,
+        matron_id: Arg0,
+        sire_id: Arg1,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("breedWith")
+            .argument(&matron_id)
+            .argument(&sire_id)
+            .original_result()
+    }
+
+    pub fn give_birth<
+        Arg0: CodecInto<u32>,
+    >(
+        self,
+        matron_id: Arg0,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("giveBirth")
+            .argument(&matron_id)
+            .original_result()
+    }
+
+    pub fn birth_fee(
+        self,
+    ) -> TxProxyCall<Env, From, To, Gas, BigUint<Env::Api>> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("birthFee")
+            .original_result()
+    }
+}
+
+#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
+pub struct Kitty {
+    pub genes: KittyGenes,
+    pub birth_time: u64,
+    pub cooldown_end: u64,
+    pub matron_id: u32,
+    pub sire_id: u32,
+    pub siring_with_id: u32,
+    pub nr_children: u16,
+    pub generation: u16,
+}
+
+#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, Clone, Default)]
+pub struct KittyGenes {
+    pub fur_color: Color,
+    pub eye_color: Color,
+    pub meow_power: u8,
+}
+
+#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, Clone, Default)]
+pub struct Color {
+    pub r: u8,
+    pub g: u8,
+    pub b: u8,
+}
diff --git a/contracts/examples/crypto-kitties/kitty-auction/src/lib.rs b/contracts/examples/crypto-kitties/kitty-auction/src/lib.rs
index a6bf8ae782..3b08682089 100644
--- a/contracts/examples/crypto-kitties/kitty-auction/src/lib.rs
+++ b/contracts/examples/crypto-kitties/kitty-auction/src/lib.rs
@@ -4,6 +4,7 @@ use multiversx_sc::imports::*;
 
 pub mod auction;
 use auction::*;
+pub mod kitty_ownership_proxy;
 
 #[multiversx_sc::contract]
 pub trait KittyAuction {
@@ -45,11 +46,12 @@ pub trait KittyAuction {
             "Kitty Ownership contract address not set!"
         );
 
-        self.kitty_ownership_proxy(kitty_ownership_contract_address)
+        self.tx()
+            .to(&kitty_ownership_contract_address)
+            .typed(kitty_ownership_proxy::KittyOwnershipProxy)
             .create_gen_zero_kitty()
-            .async_call()
             .with_callback(self.callbacks().create_gen_zero_kitty_callback())
-            .call_and_exit()
+            .async_call_and_exit();
     }
 
     // views
@@ -240,9 +242,10 @@ pub trait KittyAuction {
         let kitty_ownership_contract_address =
             self.get_kitty_ownership_contract_address_or_default();
         if !kitty_ownership_contract_address.is_zero() {
-            self.kitty_ownership_proxy(kitty_ownership_contract_address)
+            self.tx()
+                .to(&kitty_ownership_contract_address)
+                .typed(kitty_ownership_proxy::KittyOwnershipProxy)
                 .allow_auctioning(caller.clone(), kitty_id)
-                .async_call()
                 .with_callback(self.callbacks().allow_auctioning_callback(
                     auction_type,
                     kitty_id,
@@ -251,7 +254,7 @@ pub trait KittyAuction {
                     deadline,
                     caller,
                 ))
-                .call_and_exit();
+                .async_call_and_exit();
         }
     }
 
@@ -276,11 +279,12 @@ pub trait KittyAuction {
         let kitty_ownership_contract_address =
             self.get_kitty_ownership_contract_address_or_default();
         if !kitty_ownership_contract_address.is_zero() {
-            self.kitty_ownership_proxy(kitty_ownership_contract_address)
+            self.tx()
+                .to(&kitty_ownership_contract_address)
+                .typed(kitty_ownership_proxy::KittyOwnershipProxy)
                 .transfer(address, kitty_id)
-                .async_call()
                 .with_callback(self.callbacks().transfer_callback(kitty_id))
-                .call_and_exit()
+                .async_call_and_exit();
         }
     }
 
@@ -293,12 +297,13 @@ pub trait KittyAuction {
         let kitty_ownership_contract_address =
             self.get_kitty_ownership_contract_address_or_default();
         if !kitty_ownership_contract_address.is_zero() {
-            self.kitty_ownership_proxy(kitty_ownership_contract_address)
+            self.tx()
+                .to(&kitty_ownership_contract_address)
+                .typed(kitty_ownership_proxy::KittyOwnershipProxy)
                 .approve_siring_and_return_kitty(approved_address, kitty_owner, kitty_id)
                 // not a mistake, same callback for transfer and approveSiringAndReturnKitty
-                .async_call()
                 .with_callback(self.callbacks().transfer_callback(kitty_id))
-                .call_and_exit()
+                .async_call_and_exit();
         }
     }
 
@@ -407,11 +412,6 @@ pub trait KittyAuction {
         }
     }
 
-    // proxy
-
-    #[proxy]
-    fn kitty_ownership_proxy(&self, to: ManagedAddress) -> kitty_ownership::Proxy<Self::Api>;
-
     // storage
 
     // general
diff --git a/contracts/examples/crypto-kitties/kitty-genetic-alg/sc-config.toml b/contracts/examples/crypto-kitties/kitty-genetic-alg/sc-config.toml
new file mode 100644
index 0000000000..9ef6cb0474
--- /dev/null
+++ b/contracts/examples/crypto-kitties/kitty-genetic-alg/sc-config.toml
@@ -0,0 +1,2 @@
+[settings]
+proxy-paths = ["../kitty-ownership/src/kitty_genetic_alg_proxy.rs"]
diff --git a/contracts/examples/crypto-kitties/kitty-ownership/sc-config.toml b/contracts/examples/crypto-kitties/kitty-ownership/sc-config.toml
new file mode 100644
index 0000000000..3bde9040f9
--- /dev/null
+++ b/contracts/examples/crypto-kitties/kitty-ownership/sc-config.toml
@@ -0,0 +1,5 @@
+[settings]
+proxy-paths = [
+    "../kitty-auction/src/kitty_ownership_proxy.rs",
+    "../../crypto-zombies/src/kitty_ownership_proxy.rs",
+]
diff --git a/contracts/examples/crypto-kitties/kitty-ownership/src/kitty_genetic_alg_proxy.rs b/contracts/examples/crypto-kitties/kitty-ownership/src/kitty_genetic_alg_proxy.rs
new file mode 100644
index 0000000000..4a1bf33f88
--- /dev/null
+++ b/contracts/examples/crypto-kitties/kitty-ownership/src/kitty_genetic_alg_proxy.rs
@@ -0,0 +1,57 @@
+#![allow(clippy::all)]
+
+use multiversx_sc::proxy_imports::*;
+
+use crate::{Kitty, KittyGenes};
+
+pub struct KittyGeneticAlgProxy;
+
+impl<Env, From, To, Gas> TxProxyTrait<Env, From, To, Gas> for KittyGeneticAlgProxy
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    type TxProxyMethods = KittyGeneticAlgProxyMethods<Env, From, To, Gas>;
+
+    fn proxy_methods(self, tx: Tx<Env, From, To, (), Gas, (), ()>) -> Self::TxProxyMethods {
+        KittyGeneticAlgProxyMethods { wrapped_tx: tx }
+    }
+}
+
+pub struct KittyGeneticAlgProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    wrapped_tx: Tx<Env, From, To, (), Gas, (), ()>,
+}
+
+#[rustfmt::skip]
+impl<Env, From, To, Gas> KittyGeneticAlgProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn generate_kitty_genes<
+        Arg0: CodecInto<Kitty>,
+        Arg1: CodecInto<Kitty>,
+    >(
+        self,
+        matron: Arg0,
+        sire: Arg1,
+    ) -> TxProxyCall<Env, From, To, Gas, KittyGenes> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("generateKittyGenes")
+            .argument(&matron)
+            .argument(&sire)
+            .original_result()
+    }
+}
diff --git a/contracts/examples/crypto-kitties/kitty-ownership/src/lib.rs b/contracts/examples/crypto-kitties/kitty-ownership/src/lib.rs
index 21eadff6d9..51a433080a 100644
--- a/contracts/examples/crypto-kitties/kitty-ownership/src/lib.rs
+++ b/contracts/examples/crypto-kitties/kitty-ownership/src/lib.rs
@@ -1,12 +1,13 @@
 #![no_std]
 #![allow(clippy::suspicious_operation_groupings)]
 
-use multiversx_sc::imports::*;
+pub mod kitty_genetic_alg_proxy;
+pub mod structs;
 
+use crate::structs::*;
 use core::cmp::max;
-
-use kitty::{kitty_genes::*, Kitty};
-use random::*;
+use multiversx_sc::imports::*;
+use random::{Random, Randomizeable};
 
 #[multiversx_sc::contract]
 pub trait KittyOwnership {
@@ -323,6 +324,7 @@ pub trait KittyOwnership {
     fn give_birth(&self, matron_id: u32) {
         require!(self.is_valid_id(matron_id), "Invalid kitty id!");
 
+        let caller = self.blockchain().get_caller();
         let matron = self.kitty_by_id(matron_id).get();
 
         require!(
@@ -335,14 +337,15 @@ pub trait KittyOwnership {
 
         let gene_science_contract_address = self.get_gene_science_contract_address_or_default();
         if !gene_science_contract_address.is_zero() {
-            self.kitty_genetic_alg_proxy(gene_science_contract_address)
+            self.tx()
+                .to(&gene_science_contract_address)
+                .typed(kitty_genetic_alg_proxy::KittyGeneticAlgProxy)
                 .generate_kitty_genes(matron, sire)
-                .async_call()
                 .with_callback(
                     self.callbacks()
-                        .generate_kitty_genes_callback(matron_id, self.blockchain().get_caller()),
+                        .generate_kitty_genes_callback(matron_id, caller),
                 )
-                .call_and_exit()
+                .async_call_and_exit();
         } else {
             sc_panic!("Gene science contract address not set!")
         }
@@ -578,11 +581,6 @@ pub trait KittyOwnership {
         }
     }
 
-    // proxy
-
-    #[proxy]
-    fn kitty_genetic_alg_proxy(&self, to: ManagedAddress) -> kitty_genetic_alg::Proxy<Self::Api>;
-
     // storage - General
 
     #[storage_mapper("geneScienceContractAddress")]
diff --git a/contracts/examples/crypto-kitties/kitty-ownership/src/structs.rs b/contracts/examples/crypto-kitties/kitty-ownership/src/structs.rs
new file mode 100644
index 0000000000..7b17f52dc7
--- /dev/null
+++ b/contracts/examples/crypto-kitties/kitty-ownership/src/structs.rs
@@ -0,0 +1,151 @@
+use multiversx_sc::derive_imports::*;
+use random::{Random, Randomizeable};
+
+const SECONDS_PER_MINUTE: u64 = 60;
+const MAX_COOLDOWN: u64 = 60 * 60 * 24 * 7; // 7 days
+const MAX_TIREDNESS: u16 = 20;
+
+#[type_abi]
+#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
+pub struct Kitty {
+    pub genes: KittyGenes,
+    pub birth_time: u64,   // timestamp
+    pub cooldown_end: u64, // timestamp, used for pregnancy timer and siring cooldown
+    pub matron_id: u32,
+    pub sire_id: u32,
+    pub siring_with_id: u32, // for pregnant cats, 0 otherwise
+    pub nr_children: u16,    // cooldown period increases exponentially with every breeding/siring
+    pub generation: u16,     // max(sire_gen, matron_gen) + 1. Generation also influences cooldown.
+}
+
+impl Randomizeable for KittyGenes {
+    fn get_random(random: &mut Random) -> Self {
+        KittyGenes {
+            fur_color: Color::get_random(random),
+            eye_color: Color::get_random(random),
+            meow_power: random.next_u8(),
+        }
+    }
+}
+
+impl Kitty {
+    pub fn new(
+        genes: KittyGenes,
+        birth_time: u64,
+        matron_id: u32,
+        sire_id: u32,
+        generation: u16,
+    ) -> Self {
+        Kitty {
+            genes,
+            birth_time,
+            cooldown_end: 0,
+            matron_id,
+            sire_id,
+            siring_with_id: 0,
+            nr_children: 0,
+            generation,
+        }
+    }
+
+    pub fn get_next_cooldown_time(&self) -> u64 {
+        let tiredness = self.nr_children + self.generation / 2;
+        if tiredness > MAX_TIREDNESS {
+            return MAX_COOLDOWN;
+        }
+
+        let cooldown = SECONDS_PER_MINUTE << tiredness; // 2^(tiredness) minutes
+        if cooldown > MAX_COOLDOWN {
+            MAX_COOLDOWN
+        } else {
+            cooldown
+        }
+    }
+
+    pub fn get_fur_color(&self) -> Color {
+        self.genes.fur_color.clone()
+    }
+
+    pub fn get_eye_color(&self) -> Color {
+        self.genes.eye_color.clone()
+    }
+
+    pub fn get_meow_power(&self) -> u8 {
+        self.genes.meow_power
+    }
+
+    pub fn is_pregnant(&self) -> bool {
+        self.siring_with_id != 0
+    }
+}
+
+// The default Kitty, which is not a valid kitty. Used for Kitty with ID 0
+impl Default for Kitty {
+    fn default() -> Self {
+        Kitty {
+            genes: KittyGenes::default(),
+            birth_time: 0,
+            cooldown_end: u64::MAX,
+            matron_id: 0,
+            sire_id: 0,
+            siring_with_id: 0,
+            nr_children: 0,
+            generation: 0,
+        }
+    }
+}
+
+#[type_abi]
+#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, Clone, Default)]
+pub struct KittyGenes {
+    pub fur_color: Color,
+    pub eye_color: Color,
+    pub meow_power: u8, // the higher the value, the louder the cat
+}
+
+impl KittyGenes {
+    pub fn get_as_u64(&self) -> u64 {
+        (self.fur_color.as_u64() << 12 | self.eye_color.as_u64()) << 4
+            | self.meow_power.to_be() as u64
+    }
+}
+
+#[type_abi]
+#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, Clone, Default)]
+pub struct Color {
+    pub r: u8,
+    pub g: u8,
+    pub b: u8,
+}
+
+impl Color {
+    // ratios are integers, 0 < ratio < 100, ratioFirst + ratioSecond = 100
+    // checks should be done in the caller
+    #[must_use]
+    pub fn mix_with(&self, other_color: &Color, ratio_first: u8, ratio_second: u8) -> Color {
+        let r = ((self.r as u16 * ratio_first as u16 + other_color.r as u16 * ratio_second as u16)
+            / 100) as u8;
+
+        let g = ((self.g as u16 * ratio_first as u16 + other_color.g as u16 * ratio_second as u16)
+            / 100) as u8;
+
+        let b = ((self.b as u16 * ratio_first as u16 + other_color.b as u16 * ratio_second as u16)
+            / 100) as u8;
+
+        Color { r, g, b }
+    }
+
+    pub fn as_u64(&self) -> u64 {
+        ((self.r.to_be() as u64) << 4 | self.r.to_be() as u64) << 4 | self.r.to_be() as u64
+    }
+}
+
+impl Randomizeable for Color {
+    fn get_random(random: &mut Random) -> Self {
+        Color {
+            r: random.next_u8(),
+            g: random.next_u8(),
+            b: random.next_u8(),
+        }
+    }
+}
diff --git a/contracts/examples/crypto-zombies/src/crypto_kitties_proxy.rs b/contracts/examples/crypto-zombies/src/crypto_kitties_proxy.rs
deleted file mode 100644
index ea4d366994..0000000000
--- a/contracts/examples/crypto-zombies/src/crypto_kitties_proxy.rs
+++ /dev/null
@@ -1,46 +0,0 @@
-use multiversx_sc::derive_imports::*;
-
-#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, TypeAbi)]
-pub struct Kitty {
-    pub genes: KittyGenes,
-    pub birth_time: u64,   // timestamp
-    pub cooldown_end: u64, // timestamp, used for pregnancy timer and siring cooldown
-    pub matron_id: u32,
-    pub sire_id: u32,
-    pub siring_with_id: u32, // for pregnant cats, 0 otherwise
-    pub nr_children: u16,    // cooldown period increases exponentially with every breeding/siring
-    pub generation: u16,     // max(sire_gen, matron_gen) + 1. Generation also influences cooldown.
-}
-
-#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, TypeAbi)]
-pub struct KittyGenes {
-    pub fur_color: Color,
-    pub eye_color: Color,
-    pub meow_power: u8, // the higher the value, the louder the cat
-}
-
-#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, TypeAbi)]
-pub struct Color {
-    pub r: u8,
-    pub g: u8,
-    pub b: u8,
-}
-
-#[multiversx_sc::proxy]
-pub trait CryptoKitties {
-    #[endpoint]
-    fn get_kitty_by_id_endpoint(&self, kitty_id: u32) -> Kitty;
-}
-
-impl KittyGenes {
-    pub fn get_as_u64(&self) -> u64 {
-        (self.fur_color.as_u64() << 12 | self.eye_color.as_u64()) << 4
-            | self.meow_power.to_be() as u64
-    }
-}
-
-impl Color {
-    pub fn as_u64(&self) -> u64 {
-        ((self.r.to_be() as u64) << 4 | self.r.to_be() as u64) << 4 | self.r.to_be() as u64
-    }
-}
diff --git a/contracts/examples/crypto-zombies/src/kitty_ownership_proxy.rs b/contracts/examples/crypto-zombies/src/kitty_ownership_proxy.rs
new file mode 100644
index 0000000000..f00880324a
--- /dev/null
+++ b/contracts/examples/crypto-zombies/src/kitty_ownership_proxy.rs
@@ -0,0 +1,376 @@
+#![allow(clippy::all)]
+
+use multiversx_sc::proxy_imports::*;
+
+pub struct KittyOwnershipProxy;
+
+impl<Env, From, To, Gas> TxProxyTrait<Env, From, To, Gas> for KittyOwnershipProxy
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    type TxProxyMethods = KittyOwnershipProxyMethods<Env, From, To, Gas>;
+
+    fn proxy_methods(self, tx: Tx<Env, From, To, (), Gas, (), ()>) -> Self::TxProxyMethods {
+        KittyOwnershipProxyMethods { wrapped_tx: tx }
+    }
+}
+
+pub struct KittyOwnershipProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    wrapped_tx: Tx<Env, From, To, (), Gas, (), ()>,
+}
+
+#[rustfmt::skip]
+impl<Env, From, To, Gas> KittyOwnershipProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+}
+
+#[rustfmt::skip]
+impl<Env, From, To, Gas> KittyOwnershipProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn set_gene_science_contract_address_endpoint<
+        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+    >(
+        self,
+        address: Arg0,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("setGeneScienceContractAddress")
+            .argument(&address)
+            .original_result()
+    }
+
+    pub fn set_kitty_auction_contract_address_endpoint<
+        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+    >(
+        self,
+        address: Arg0,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("setKittyAuctionContractAddress")
+            .argument(&address)
+            .original_result()
+    }
+
+    pub fn claim(
+        self,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("claim")
+            .original_result()
+    }
+
+    pub fn total_supply(
+        self,
+    ) -> TxProxyCall<Env, From, To, Gas, u32> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("totalSupply")
+            .original_result()
+    }
+
+    pub fn balance_of<
+        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+    >(
+        self,
+        address: Arg0,
+    ) -> TxProxyCall<Env, From, To, Gas, u32> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("balanceOf")
+            .argument(&address)
+            .original_result()
+    }
+
+    pub fn owner_of<
+        Arg0: CodecInto<u32>,
+    >(
+        self,
+        kitty_id: Arg0,
+    ) -> TxProxyCall<Env, From, To, Gas, ManagedAddress<Env::Api>> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("ownerOf")
+            .argument(&kitty_id)
+            .original_result()
+    }
+
+    pub fn approve<
+        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+        Arg1: CodecInto<u32>,
+    >(
+        self,
+        to: Arg0,
+        kitty_id: Arg1,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("approve")
+            .argument(&to)
+            .argument(&kitty_id)
+            .original_result()
+    }
+
+    pub fn transfer<
+        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+        Arg1: CodecInto<u32>,
+    >(
+        self,
+        to: Arg0,
+        kitty_id: Arg1,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("transfer")
+            .argument(&to)
+            .argument(&kitty_id)
+            .original_result()
+    }
+
+    pub fn transfer_from<
+        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+        Arg1: CodecInto<ManagedAddress<Env::Api>>,
+        Arg2: CodecInto<u32>,
+    >(
+        self,
+        from: Arg0,
+        to: Arg1,
+        kitty_id: Arg2,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("transfer_from")
+            .argument(&from)
+            .argument(&to)
+            .argument(&kitty_id)
+            .original_result()
+    }
+
+    pub fn tokens_of_owner<
+        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+    >(
+        self,
+        address: Arg0,
+    ) -> TxProxyCall<Env, From, To, Gas, MultiValueEncoded<Env::Api, u32>> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("tokensOfOwner")
+            .argument(&address)
+            .original_result()
+    }
+
+    pub fn allow_auctioning<
+        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+        Arg1: CodecInto<u32>,
+    >(
+        self,
+        by: Arg0,
+        kitty_id: Arg1,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("allowAuctioning")
+            .argument(&by)
+            .argument(&kitty_id)
+            .original_result()
+    }
+
+    pub fn approve_siring_and_return_kitty<
+        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+        Arg1: CodecInto<ManagedAddress<Env::Api>>,
+        Arg2: CodecInto<u32>,
+    >(
+        self,
+        approved_address: Arg0,
+        kitty_owner: Arg1,
+        kitty_id: Arg2,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("approveSiringAndReturnKitty")
+            .argument(&approved_address)
+            .argument(&kitty_owner)
+            .argument(&kitty_id)
+            .original_result()
+    }
+
+    pub fn create_gen_zero_kitty(
+        self,
+    ) -> TxProxyCall<Env, From, To, Gas, u32> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("createGenZeroKitty")
+            .original_result()
+    }
+
+    pub fn get_kitty_by_id_endpoint<
+        Arg0: CodecInto<u32>,
+    >(
+        self,
+        kitty_id: Arg0,
+    ) -> TxProxyCall<Env, From, To, Gas, Kitty> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("getKittyById")
+            .argument(&kitty_id)
+            .original_result()
+    }
+
+    pub fn is_ready_to_breed<
+        Arg0: CodecInto<u32>,
+    >(
+        self,
+        kitty_id: Arg0,
+    ) -> TxProxyCall<Env, From, To, Gas, bool> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("isReadyToBreed")
+            .argument(&kitty_id)
+            .original_result()
+    }
+
+    pub fn is_pregnant<
+        Arg0: CodecInto<u32>,
+    >(
+        self,
+        kitty_id: Arg0,
+    ) -> TxProxyCall<Env, From, To, Gas, bool> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("isPregnant")
+            .argument(&kitty_id)
+            .original_result()
+    }
+
+    pub fn can_breed_with<
+        Arg0: CodecInto<u32>,
+        Arg1: CodecInto<u32>,
+    >(
+        self,
+        matron_id: Arg0,
+        sire_id: Arg1,
+    ) -> TxProxyCall<Env, From, To, Gas, bool> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("canBreedWith")
+            .argument(&matron_id)
+            .argument(&sire_id)
+            .original_result()
+    }
+
+    pub fn approve_siring<
+        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+        Arg1: CodecInto<u32>,
+    >(
+        self,
+        address: Arg0,
+        kitty_id: Arg1,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("approveSiring")
+            .argument(&address)
+            .argument(&kitty_id)
+            .original_result()
+    }
+
+    pub fn breed_with<
+        Arg0: CodecInto<u32>,
+        Arg1: CodecInto<u32>,
+    >(
+        self,
+        matron_id: Arg0,
+        sire_id: Arg1,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("breedWith")
+            .argument(&matron_id)
+            .argument(&sire_id)
+            .original_result()
+    }
+
+    pub fn give_birth<
+        Arg0: CodecInto<u32>,
+    >(
+        self,
+        matron_id: Arg0,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("giveBirth")
+            .argument(&matron_id)
+            .original_result()
+    }
+
+    pub fn birth_fee(
+        self,
+    ) -> TxProxyCall<Env, From, To, Gas, BigUint<Env::Api>> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("birthFee")
+            .original_result()
+    }
+}
+
+#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
+pub struct Kitty {
+    pub genes: KittyGenes,
+    pub birth_time: u64,
+    pub cooldown_end: u64,
+    pub matron_id: u32,
+    pub sire_id: u32,
+    pub siring_with_id: u32,
+    pub nr_children: u16,
+    pub generation: u16,
+}
+
+#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, Clone, Default)]
+pub struct KittyGenes {
+    pub fur_color: Color,
+    pub eye_color: Color,
+    pub meow_power: u8,
+}
+
+#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, Clone, Default)]
+pub struct Color {
+    pub r: u8,
+    pub g: u8,
+    pub b: u8,
+}
+
+impl KittyGenes {
+    pub fn get_as_u64(&self) -> u64 {
+        (self.fur_color.as_u64() << 12 | self.eye_color.as_u64()) << 4
+            | self.meow_power.to_be() as u64
+    }
+}
+
+impl Color {
+    pub fn as_u64(&self) -> u64 {
+        ((self.r.to_be() as u64) << 4 | self.r.to_be() as u64) << 4 | self.r.to_be() as u64
+    }
+}
diff --git a/contracts/examples/crypto-zombies/src/lib.rs b/contracts/examples/crypto-zombies/src/lib.rs
index 05364f6f31..9fea3b3099 100644
--- a/contracts/examples/crypto-zombies/src/lib.rs
+++ b/contracts/examples/crypto-zombies/src/lib.rs
@@ -2,7 +2,7 @@
 
 use multiversx_sc::imports::*;
 
-mod crypto_kitties_proxy;
+pub mod kitty_ownership_proxy;
 pub mod proxy_crypto_zombies;
 mod storage;
 mod zombie;
diff --git a/contracts/examples/crypto-zombies/src/zombie_feeding.rs b/contracts/examples/crypto-zombies/src/zombie_feeding.rs
index e27b3e69ad..7de7f4a41e 100644
--- a/contracts/examples/crypto-zombies/src/zombie_feeding.rs
+++ b/contracts/examples/crypto-zombies/src/zombie_feeding.rs
@@ -1,7 +1,7 @@
 use multiversx_sc::imports::*;
 
 use crate::{
-    crypto_kitties_proxy::{self, Kitty},
+    kitty_ownership_proxy::{self, Kitty},
     storage, zombie_factory, zombie_helper,
 };
 
@@ -56,12 +56,11 @@ pub trait ZombieFeeding:
     #[endpoint]
     fn feed_on_kitty(&self, zombie_id: usize, kitty_id: u32) {
         let crypto_kitties_sc_address = self.crypto_kitties_sc_address().get();
-        self.kitty_proxy(crypto_kitties_sc_address)
+        self.tx()
+            .to(&crypto_kitties_sc_address)
+            .typed(kitty_ownership_proxy::KittyOwnershipProxy)
             .get_kitty_by_id_endpoint(kitty_id)
-            .async_call()
             .with_callback(self.callbacks().get_kitty_callback(zombie_id))
-            .call_and_exit();
+            .async_call_and_exit();
     }
-    #[proxy]
-    fn kitty_proxy(&self, to: ManagedAddress) -> crypto_kitties_proxy::Proxy<Self::Api>;
 }

From 02929d2f1e58a07305549b25f1331ce246e997cc Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Mon, 1 Apr 2024 12:11:27 +0300
Subject: [PATCH 0608/1254] proxy gen - add File in ProxyGenerator

---
 .../meta/src/cmd/contract/generate_proxy.rs   |   1 -
 .../contract/generate_proxy/proxy_gen_main.rs |  15 +-
 .../generate_proxy/proxy_generator.rs         | 375 +++++++++++-------
 .../contract/generate_proxy/proxy_naming.rs   |  12 +
 .../generate_proxy/proxy_template_gen.rs      | 129 ------
 5 files changed, 251 insertions(+), 281 deletions(-)
 delete mode 100644 framework/meta/src/cmd/contract/generate_proxy/proxy_template_gen.rs

diff --git a/framework/meta/src/cmd/contract/generate_proxy.rs b/framework/meta/src/cmd/contract/generate_proxy.rs
index 0da27327c2..15f157de8a 100644
--- a/framework/meta/src/cmd/contract/generate_proxy.rs
+++ b/framework/meta/src/cmd/contract/generate_proxy.rs
@@ -2,4 +2,3 @@ pub mod proxy_crate_gen;
 pub mod proxy_gen_main;
 mod proxy_generator;
 mod proxy_naming;
-pub mod proxy_template_gen;
diff --git a/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_main.rs b/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_main.rs
index 63a8d7e757..a3a35062f6 100644
--- a/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_main.rs
+++ b/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_main.rs
@@ -5,16 +5,17 @@ use super::{
 const OUTPUT_PROXY_PATH: &str = "/output/proxy.rs";
 
 impl MetaConfig {
-    pub fn generate_proxy(&self) {
+    pub fn generate_proxy(&mut self) {
         write_proxy_with_explicit_path(OUTPUT_PROXY_PATH, self);
-        for path in &self.sc_config.proxy_paths {
-            write_proxy_with_explicit_path(path, self);
+        let proxy_paths = self.sc_config.proxy_paths.clone();
+        for path in proxy_paths {
+            write_proxy_with_explicit_path(&path, self);
         }
     }
 }
 
-fn write_proxy_with_explicit_path(path: &str, meta_config: &MetaConfig) {
-    let file = create_file(path);
-    let proxy_generator = ProxyGenerator::new(meta_config);
-    proxy_generator.write_proxy_to_file(file);
+fn write_proxy_with_explicit_path(path: &str, meta_config: &mut MetaConfig) {
+    let mut file = create_file(path);
+    let mut proxy_generator = ProxyGenerator::new(meta_config, &mut file);
+    proxy_generator.write_proxy_to_file();
 }
diff --git a/framework/meta/src/cmd/contract/generate_proxy/proxy_generator.rs b/framework/meta/src/cmd/contract/generate_proxy/proxy_generator.rs
index bd58f028ef..9bcaa8e831 100644
--- a/framework/meta/src/cmd/contract/generate_proxy/proxy_generator.rs
+++ b/framework/meta/src/cmd/contract/generate_proxy/proxy_generator.rs
@@ -7,14 +7,18 @@ use multiversx_sc::abi::{
 
 use crate::cmd::contract::meta_config::MetaConfig;
 
-use super::{
-    proxy_naming::{proxy_methods_type_name, proxy_type_name},
-    proxy_template_gen::{
-        extract_struct_crate, start_write_type, write_constructor_content, write_end_of_function,
-        write_endpoint_content, write_endpoint_docs, write_function_header_endpoint, write_header,
-        write_parameters, write_upgrade_content,
-    },
-};
+use super::proxy_naming::{extract_struct_crate, proxy_methods_type_name, proxy_type_name};
+
+const PRELUDE: &str = "// Code generated by the multiversx-sc proxy generator. DO NOT EDIT.
+
+////////////////////////////////////////////////////
+////////////////// AUTO-GENERATED //////////////////
+////////////////////////////////////////////////////
+
+#![allow(dead_code)]
+#![allow(clippy::all)]
+
+use multiversx_sc::proxy_imports::*;";
 
 const ZERO: &str = "0";
 
@@ -32,38 +36,42 @@ const TYPES_FROM_FRAMEWORK: &[&str] = &[
 
 pub struct ProxyGenerator<'a> {
     pub meta_config: &'a MetaConfig,
+    pub file: &'a mut File,
 }
-
 impl<'a> ProxyGenerator<'a> {
-    pub const fn new(meta_config: &'a MetaConfig) -> Self {
-        ProxyGenerator { meta_config }
+    pub fn new(meta_config: &'a MetaConfig, file: &'a mut File) -> Self {
+        Self { meta_config, file }
+    }
+
+    pub fn write_proxy_to_file(&mut self) {
+        self.write_header();
+        self.write_tx_proxy_type_def();
+        self.write_impl_for_tx_proxy();
+        self.write_struct_tx_proxy_methods();
+        self.write_content();
+        self.write_types();
     }
 
-    pub fn write_proxy_to_file(&self, mut file: File) {
-        write_header(&mut file);
-        self.write_tx_proxy_type_def(&mut file);
-        self.write_impl_for_tx_proxy(&mut file);
-        self.write_struct_tx_proxy_methods(&mut file);
-        self.write_content(&mut file);
-        self.write_types(&mut file);
+    fn write_header(&mut self) {
+        writeln!(self.file, r#"{PRELUDE}"#).unwrap();
     }
 
-    fn write_tx_proxy_type_def(&self, file: &mut File) {
+    fn write_tx_proxy_type_def(&mut self) {
         let proxy_type_name = proxy_type_name(&self.meta_config.original_contract_abi.name);
         writeln!(
-            file,
+            self.file,
             r#"
 pub struct {proxy_type_name};"#
         )
         .unwrap();
     }
 
-    fn write_impl_for_tx_proxy(&self, file: &mut File) {
+    fn write_impl_for_tx_proxy(&mut self) {
         let proxy_type_name = proxy_type_name(&self.meta_config.original_contract_abi.name);
         let proxy_methods_type_name =
             proxy_methods_type_name(&self.meta_config.original_contract_abi.name);
         writeln!(
-            file,
+            self.file,
             r#"
 impl<Env, From, To, Gas> TxProxyTrait<Env, From, To, Gas> for {proxy_type_name}
 where
@@ -82,11 +90,11 @@ where
         .unwrap();
     }
 
-    fn write_struct_tx_proxy_methods(&self, file: &mut File) {
+    fn write_struct_tx_proxy_methods(&mut self) {
         let proxy_methods_type_name =
             proxy_methods_type_name(&self.meta_config.original_contract_abi.name);
         writeln!(
-            file,
+            self.file,
             r#"
 pub struct {proxy_methods_type_name}<Env, From, To, Gas>
 where
@@ -101,14 +109,14 @@ where
         .unwrap();
     }
 
-    fn write_content(&self, file: &mut File) {
+    fn write_content(&mut self) {
         if !self
             .meta_config
             .original_contract_abi
             .constructors
             .is_empty()
         {
-            self.write_constructors(file);
+            self.write_constructors();
         }
 
         if !self
@@ -117,15 +125,15 @@ where
             .upgrade_constructors
             .is_empty()
         {
-            self.write_upgrades(file);
+            self.write_upgrades();
         }
 
         if !self.meta_config.original_contract_abi.endpoints.is_empty() {
-            self.write_endpoints(file);
+            self.write_endpoints();
         }
     }
 
-    fn write_types(&self, file: &mut File) {
+    fn write_types(&mut self) {
         for (_, type_description) in &self.meta_config.original_contract_abi.type_descriptions.0 {
             if self
                 .meta_config
@@ -145,10 +153,10 @@ where
 
             match &type_description.contents {
                 TypeContents::Enum(enum_variants) => {
-                    self.write_enum(file, enum_variants, type_description, &type_name)
+                    self.write_enum(enum_variants, type_description, &type_name)
                 },
                 TypeContents::Struct(struct_fields) => {
-                    self.write_struct(file, struct_fields, type_description, &type_name)
+                    self.write_struct(struct_fields, type_description, &type_name)
                 },
                 TypeContents::NotSpecified => {},
                 TypeContents::ExplicitEnum(_) => {},
@@ -156,25 +164,25 @@ where
         }
     }
 
-    fn write_constructors(&self, file: &mut File) {
+    fn write_constructors(&mut self) {
         let constructors: Vec<EndpointAbi> =
             self.meta_config.original_contract_abi.constructors.clone();
 
-        self.write_header_impl_constructor(file);
+        self.write_header_impl_constructor();
         for (i, constructor_abi) in constructors.into_iter().enumerate() {
             if i > 0 {
-                writeln!(file).unwrap();
+                writeln!(self.file).unwrap();
             }
-            self.write_constructor_header(file, &constructor_abi);
-            write_constructor_content(file, constructor_abi.inputs);
-            write_end_of_function(file);
+            self.write_constructor_header(&constructor_abi);
+            self.write_constructor_content(constructor_abi.inputs);
+            self.write_end_of_function();
         }
 
-        writeln!(file, "}}").unwrap();
+        writeln!(self.file, "}}").unwrap();
     }
 
-    fn write_upgrades(&self, file: &mut File) {
-        self.write_header_impl_upgrade(file);
+    fn write_upgrades(&mut self) {
+        self.write_header_impl_upgrade();
         for (i, upgrade) in self
             .meta_config
             .original_contract_abi
@@ -184,37 +192,37 @@ where
             .enumerate()
         {
             if i > 0 {
-                writeln!(file).unwrap();
+                writeln!(self.file).unwrap();
             }
-            self.write_upgrade_header(file, &upgrade);
-            write_upgrade_content(file, upgrade.inputs);
-            write_end_of_function(file);
+            self.write_upgrade_header(&upgrade);
+            self.write_upgrade_content(upgrade.inputs);
+            self.write_end_of_function();
         }
 
-        writeln!(file, "}}").unwrap();
+        writeln!(self.file, "}}").unwrap();
     }
 
-    fn write_endpoints(&self, file: &mut File) {
+    fn write_endpoints(&mut self) {
         let endpoints: Vec<EndpointAbi> = self.meta_config.original_contract_abi.endpoints.clone();
 
-        self.write_header_impl_endpoints(file);
+        self.write_header_impl_endpoints();
         for (i, endpoint_abi) in endpoints.into_iter().enumerate() {
             if i > 0 {
-                writeln!(file).unwrap();
+                writeln!(self.file).unwrap();
             }
-            self.write_endpoint_header(file, &endpoint_abi);
-            write_endpoint_content(file, &endpoint_abi);
-            write_end_of_function(file);
+            self.write_endpoint_header(&endpoint_abi);
+            self.write_endpoint_content(&endpoint_abi);
+            self.write_end_of_function();
         }
 
-        writeln!(file, "}}").unwrap();
+        writeln!(self.file, "}}").unwrap();
     }
 
-    fn write_header_impl_constructor(&self, file: &mut File) {
+    fn write_header_impl_constructor(&mut self) {
         let proxy_methods_type_name =
             proxy_methods_type_name(&self.meta_config.original_contract_abi.name);
         writeln!(
-            file,
+            self.file,
             r#"
 #[rustfmt::skip]
 impl<Env, From, Gas> {proxy_methods_type_name}<Env, From, (), Gas>
@@ -228,11 +236,11 @@ where
         .unwrap();
     }
 
-    fn write_header_impl_upgrade(&self, file: &mut File) {
+    fn write_header_impl_upgrade(&mut self) {
         let proxy_methods_type_name =
             proxy_methods_type_name(&self.meta_config.original_contract_abi.name);
         writeln!(
-            file,
+            self.file,
             r#"
 #[rustfmt::skip]
 impl<Env, From, To, Gas> {proxy_methods_type_name}<Env, From, To, Gas>
@@ -247,11 +255,11 @@ where
         .unwrap();
     }
 
-    fn write_header_impl_endpoints(&self, file: &mut File) {
+    fn write_header_impl_endpoints(&mut self) {
         let proxy_methods_type_name =
             proxy_methods_type_name(&self.meta_config.original_contract_abi.name);
         writeln!(
-            file,
+            self.file,
             r#"
 #[rustfmt::skip]
 impl<Env, From, To, Gas> {proxy_methods_type_name}<Env, From, To, Gas>
@@ -266,179 +274,221 @@ where
         .unwrap();
     }
 
-    fn write_constructor_header(&self, file: &mut File, constructor_abi: &EndpointAbi) {
-        self.write_fn_signature(file, constructor_abi);
-        self.write_constructor_output(file, &constructor_abi.outputs);
+    fn write_constructor_header(&mut self, constructor_abi: &EndpointAbi) {
+        self.write_fn_signature(constructor_abi);
+        self.write_constructor_output(&constructor_abi.outputs);
+    }
+
+    fn write_upgrade_header(&mut self, constructor_abi: &EndpointAbi) {
+        self.write_fn_signature(constructor_abi);
+        self.write_upgrade_output(&constructor_abi.outputs);
+    }
+
+    fn write_endpoint_header(&mut self, constructor_abi: &EndpointAbi) {
+        self.write_fn_signature(constructor_abi);
+        self.write_endpoint_output(&constructor_abi.outputs);
+    }
+
+    fn write_constructor_content(&mut self, inputs: Vec<InputAbi>) {
+        writeln!(
+            self.file,
+            "        self.wrapped_tx
+            .raw_deploy()"
+        )
+        .unwrap();
+        for input in inputs.iter() {
+            writeln!(self.file, "            .argument(&{})", input.arg_name).unwrap();
+        }
+        writeln!(self.file, "            .original_result()").unwrap();
+    }
+
+    fn write_upgrade_content(&mut self, inputs: Vec<InputAbi>) {
+        writeln!(
+            self.file,
+            "        self.wrapped_tx
+            .raw_upgrade()"
+        )
+        .unwrap();
+        for input in inputs.iter() {
+            writeln!(self.file, "            .argument(&{})", input.arg_name).unwrap();
+        }
+        writeln!(self.file, "            .original_result()").unwrap();
+    }
+
+    fn write_endpoint_content(&mut self, endpoint: &EndpointAbi) {
+        writeln!(
+            self.file,
+            "        self.wrapped_tx
+            .raw_call()
+            .function_name(\"{}\")",
+            endpoint.name
+        )
+        .unwrap();
+
+        for input in endpoint.inputs.iter() {
+            writeln!(self.file, "            .argument(&{})", input.arg_name).unwrap();
+        }
+
+        writeln!(self.file, "            .original_result()").unwrap();
     }
 
-    fn write_upgrade_header(&self, file: &mut File, constructor_abi: &EndpointAbi) {
-        self.write_fn_signature(file, constructor_abi);
-        self.write_upgrade_output(file, &constructor_abi.outputs);
+    fn write_fn_signature(&mut self, endpoint: &EndpointAbi) {
+        self.write_endpoint_docs(&endpoint.docs);
+        self.write_function_header_endpoint(&endpoint.rust_method_name);
+        self.write_args(&endpoint.inputs);
+        self.write_parameters(&endpoint.inputs);
     }
 
-    fn write_endpoint_header(&self, file: &mut File, constructor_abi: &EndpointAbi) {
-        self.write_fn_signature(file, constructor_abi);
-        self.write_endpoint_output(file, &constructor_abi.outputs);
+    fn write_endpoint_docs(&mut self, docs: &Vec<String>) {
+        for doc in docs {
+            writeln!(self.file, "    /// {doc} ").unwrap();
+        }
     }
 
-    fn write_fn_signature(&self, file: &mut File, endpoint: &EndpointAbi) {
-        write_endpoint_docs(file, &endpoint.docs);
-        write_function_header_endpoint(file, &endpoint.rust_method_name);
-        self.write_args(file, &endpoint.inputs);
-        write_parameters(file, &endpoint.inputs);
+    fn write_function_header_endpoint(&mut self, rust_method_name: &String) {
+        write!(self.file, "    pub fn {rust_method_name}").unwrap();
     }
 
-    fn write_args(&self, file: &mut File, inputs: &[InputAbi]) {
+    fn write_args(&mut self, inputs: &[InputAbi]) {
         if inputs.is_empty() {
             return;
         }
 
-        writeln!(file, "<").unwrap();
+        writeln!(self.file, "<").unwrap();
 
         for (index, input) in inputs.iter().enumerate() {
-            self.write_argument(file, index, &input.type_names.rust);
+            self.write_argument(index, &input.type_names.rust);
         }
 
-        write!(file, "    >").unwrap();
+        write!(self.file, "    >").unwrap();
     }
 
-    fn write_argument(&self, file: &mut File, index: usize, rust_name: &str) {
+    fn write_argument(&mut self, index: usize, rust_name: &str) {
         let adjusted = self.adjust_type_name_with_env_api(rust_name);
-        writeln!(file, "        Arg{index}: CodecInto<{adjusted}>,").unwrap();
+        writeln!(self.file, "        Arg{index}: CodecInto<{adjusted}>,").unwrap();
+    }
+
+    fn write_parameters(&mut self, inputs: &[InputAbi]) {
+        writeln!(self.file, "(").unwrap();
+        writeln!(self.file, "        self,").unwrap();
+        for (index, input) in inputs.iter().enumerate() {
+            writeln!(self.file, "        {}: Arg{index},", &input.arg_name).unwrap();
+        }
+        write!(self.file, "    ) ").unwrap();
     }
 
-    fn write_constructor_output(&self, file: &mut File, outputs: &[OutputAbi]) {
-        write!(file, "-> TxProxyDeploy<Env, From, Gas, ").unwrap();
+    fn write_constructor_output(&mut self, outputs: &[OutputAbi]) {
+        write!(self.file, "-> TxProxyDeploy<Env, From, Gas, ").unwrap();
 
-        self.parse_and_write_outputs(file, outputs);
+        self.parse_and_write_outputs(outputs);
 
-        writeln!(file, "> {{").unwrap();
+        writeln!(self.file, "> {{").unwrap();
     }
 
-    fn write_upgrade_output(&self, file: &mut File, outputs: &[OutputAbi]) {
-        write!(file, "-> TxProxyUpgrade<Env, From, To, Gas, ").unwrap();
+    fn write_upgrade_output(&mut self, outputs: &[OutputAbi]) {
+        write!(self.file, "-> TxProxyUpgrade<Env, From, To, Gas, ").unwrap();
 
-        self.parse_and_write_outputs(file, outputs);
+        self.parse_and_write_outputs(outputs);
 
-        writeln!(file, "> {{").unwrap();
+        writeln!(self.file, "> {{").unwrap();
     }
 
-    fn write_endpoint_output(&self, file: &mut File, outputs: &[OutputAbi]) {
-        write!(file, "-> TxProxyCall<Env, From, To, Gas, ").unwrap();
+    fn write_endpoint_output(&mut self, outputs: &[OutputAbi]) {
+        write!(self.file, "-> TxProxyCall<Env, From, To, Gas, ").unwrap();
 
-        self.parse_and_write_outputs(file, outputs);
+        self.parse_and_write_outputs(outputs);
 
-        writeln!(file, "> {{").unwrap();
+        writeln!(self.file, "> {{").unwrap();
     }
 
-    fn parse_and_write_outputs(&self, file: &mut File, outputs: &[OutputAbi]) {
+    fn parse_and_write_outputs(&mut self, outputs: &[OutputAbi]) {
         match outputs.len() {
             0 => {
-                write!(file, "()").unwrap();
+                write!(self.file, "()").unwrap();
             },
             1 => {
                 let adjusted = self.adjust_type_name_with_env_api(&outputs[0].type_names.rust);
-                write!(file, "{adjusted}").unwrap();
+                write!(self.file, "{adjusted}").unwrap();
             },
             _ => {
-                write!(file, "MultiValue{}<", outputs.len()).unwrap();
+                write!(self.file, "MultiValue{}<", outputs.len()).unwrap();
                 for (i, output) in outputs.iter().enumerate() {
                     if i > 0 {
-                        write!(file, ", ").unwrap();
+                        write!(self.file, ", ").unwrap();
                     }
                     let adjusted = self.adjust_type_name_with_env_api(&output.type_names.rust);
-                    write!(file, "{adjusted}").unwrap();
+                    write!(self.file, "{adjusted}").unwrap();
                 }
-                write!(file, ">").unwrap();
+                write!(self.file, ">").unwrap();
             },
         }
     }
 
     fn write_enum(
-        &self,
-        file: &mut File,
+        &mut self,
         enum_variants: &Vec<EnumVariantDescription>,
         type_description: &TypeDescription,
         name: &str,
     ) {
-        start_write_type(file, "enum", type_description, name);
+        self.start_write_type("enum", type_description, name);
 
         for variant in enum_variants {
-            write!(file, "    {}", variant.name).unwrap();
+            write!(self.file, "    {}", variant.name).unwrap();
             if variant.fields.is_empty() {
-                writeln!(file, ",").unwrap();
+                writeln!(self.file, ",").unwrap();
                 continue;
             }
 
             if variant.fields[0].name == ZERO {
-                self.write_tuple_in_variant(file, &variant.fields);
+                self.write_tuple_in_variant(&variant.fields);
             } else {
-                self.write_struct_in_variant(file, &variant.fields);
+                self.write_struct_in_variant(&variant.fields);
             }
         }
-        writeln!(file, "}}").unwrap();
+        writeln!(self.file, "}}").unwrap();
     }
 
     fn write_struct(
-        &self,
-        file: &mut File,
+        &mut self,
         struct_fields: &Vec<StructFieldDescription>,
         type_description: &TypeDescription,
         name: &str,
     ) {
-        start_write_type(file, "struct", type_description, name);
+        self.start_write_type("struct", type_description, name);
 
         for field in struct_fields {
-            writeln!(
-                file,
-                "    pub {}: {},",
-                field.name,
-                self.adjust_type_name_with_api(&field.field_type.rust)
-            )
-            .unwrap();
+            let adjusted_type_name = self.adjust_type_name_with_api(&field.field_type.rust);
+            writeln!(self.file, "    pub {}: {adjusted_type_name},", field.name).unwrap();
         }
 
-        writeln!(file, "}}").unwrap();
+        writeln!(self.file, "}}").unwrap();
     }
 
-    fn write_tuple_in_variant(&self, file: &mut File, fields: &[StructFieldDescription]) {
-        write!(file, "(").unwrap();
-        write!(
-            file,
-            "{}",
-            self.adjust_type_name_with_api(&fields[0].field_type.rust)
-        )
-        .unwrap();
+    fn write_tuple_in_variant(&mut self, fields: &[StructFieldDescription]) {
+        write!(self.file, "(").unwrap();
+        let adjusted_type_name = self.adjust_type_name_with_api(&fields[0].field_type.rust);
+        write!(self.file, "{adjusted_type_name}").unwrap();
 
         for field in &fields[1..] {
-            write!(
-                file,
-                ", {}",
-                self.adjust_type_name_with_api(&field.field_type.rust)
-            )
-            .unwrap();
+            let adjusted_type_name = self.adjust_type_name_with_api(&field.field_type.rust);
+            write!(self.file, ", {adjusted_type_name}").unwrap();
         }
 
-        writeln!(file, "),").unwrap();
+        writeln!(self.file, "),").unwrap();
     }
 
-    fn write_struct_in_variant(&self, file: &mut File, fields: &[StructFieldDescription]) {
-        writeln!(file, " {{").unwrap();
+    fn write_struct_in_variant(&mut self, fields: &[StructFieldDescription]) {
+        writeln!(self.file, " {{").unwrap();
 
         for field in fields {
-            writeln!(
-                file,
-                "        {}: {},",
-                field.name,
-                self.adjust_type_name_with_api(&field.field_type.rust)
-            )
-            .unwrap();
+            let adjusted_type_name = self.adjust_type_name_with_api(&field.field_type.rust);
+            writeln!(self.file, "        {}: {adjusted_type_name},", field.name,).unwrap();
         }
 
-        writeln!(file, "    }},").unwrap();
+        writeln!(self.file, "    }},").unwrap();
     }
 
-    fn clean_paths(&self, proxy_crate: &str, rust_type: &str) -> String {
+    fn clean_paths(&mut self, proxy_crate: &str, rust_type: &str) -> String {
         let delimiters = "<>,()[] ";
         let words: Vec<&str> = rust_type
             .split(|c| delimiters.contains(c))
@@ -468,7 +518,40 @@ where
         rust_type_with_cleaned_path
     }
 
-    fn adjust_type_name_with_env_api(&self, original_rust_name: &str) -> String {
+    fn start_write_type(
+        &mut self,
+        type_type: &str,
+        type_description: &TypeDescription,
+        name: &str,
+    ) {
+        writeln!(self.file).unwrap();
+        self.write_macro_attributes(&type_description.macro_attributes);
+        write!(self.file, r#"pub {type_type} {name}"#).unwrap();
+
+        if name.contains("<Api>") {
+            writeln!(
+                self.file,
+                r#"
+where
+    Api: ManagedTypeApi,"#
+            )
+            .unwrap();
+        } else {
+            write!(self.file, " ").unwrap();
+        }
+
+        writeln!(self.file, r#"{{"#).unwrap();
+    }
+
+    pub fn write_macro_attributes(&mut self, macro_attributes: &[String]) {
+        if macro_attributes.is_empty() {
+            writeln!(self.file, "#[derive(TopEncode, TopDecode)]").unwrap();
+        } else {
+            writeln!(self.file, "#[derive({})]", macro_attributes.join(", ")).unwrap();
+        }
+    }
+
+    fn adjust_type_name_with_env_api(&mut self, original_rust_name: &str) -> String {
         self.clean_paths(
             self.meta_config
                 .original_contract_abi
@@ -481,7 +564,7 @@ where
         )
     }
 
-    fn adjust_type_name_with_api(&self, original_rust_name: &str) -> String {
+    fn adjust_type_name_with_api(&mut self, original_rust_name: &str) -> String {
         self.clean_paths(
             self.meta_config
                 .original_contract_abi
@@ -493,4 +576,8 @@ where
                 .replace("$API", "Api"),
         )
     }
+
+    fn write_end_of_function(&mut self) {
+        writeln!(self.file, "    }}").unwrap();
+    }
 }
diff --git a/framework/meta/src/cmd/contract/generate_proxy/proxy_naming.rs b/framework/meta/src/cmd/contract/generate_proxy/proxy_naming.rs
index e71a6a0e64..ada7559e01 100644
--- a/framework/meta/src/cmd/contract/generate_proxy/proxy_naming.rs
+++ b/framework/meta/src/cmd/contract/generate_proxy/proxy_naming.rs
@@ -5,3 +5,15 @@ pub(super) fn proxy_type_name(contract_trait_name: &str) -> String {
 pub(super) fn proxy_methods_type_name(contract_trait_name: &str) -> String {
     format!("{contract_trait_name}ProxyMethods")
 }
+
+pub(super) fn extract_struct_crate(struct_path: &str) -> String {
+    let struct_crate_name = struct_path
+        .replace('_', "-")
+        .replace("multiversx_sc::api::uncallable::UncallableApi", "Api")
+        .to_string();
+    let crate_name = struct_crate_name
+        .split("::")
+        .next()
+        .unwrap_or_else(|| &struct_crate_name);
+    crate_name.to_string()
+}
diff --git a/framework/meta/src/cmd/contract/generate_proxy/proxy_template_gen.rs b/framework/meta/src/cmd/contract/generate_proxy/proxy_template_gen.rs
deleted file mode 100644
index e91bf663ec..0000000000
--- a/framework/meta/src/cmd/contract/generate_proxy/proxy_template_gen.rs
+++ /dev/null
@@ -1,129 +0,0 @@
-use std::{fs::File, io::Write};
-
-use multiversx_sc::abi::{EndpointAbi, InputAbi, TypeDescription};
-
-const PRELUDE: &str = "// Code generated by the multiversx-sc proxy generator. DO NOT EDIT.
-
-////////////////////////////////////////////////////
-////////////////// AUTO-GENERATED //////////////////
-////////////////////////////////////////////////////
-
-#![allow(dead_code)]
-#![allow(clippy::all)]
-
-use multiversx_sc::proxy_imports::*;";
-
-pub(crate) fn write_header(file: &mut File) {
-    writeln!(file, r#"{PRELUDE}"#).unwrap();
-}
-
-pub fn write_endpoint_docs(file: &mut File, docs: &Vec<String>) {
-    for doc in docs {
-        writeln!(file, "    /// {doc} ").unwrap();
-    }
-}
-
-pub fn write_function_header_endpoint(file: &mut File, rust_method_name: &String) {
-    write!(file, "    pub fn {rust_method_name}").unwrap();
-}
-
-pub fn write_parameters(file: &mut File, inputs: &[InputAbi]) {
-    writeln!(file, "(").unwrap();
-    writeln!(file, "        self,").unwrap();
-    for (index, input) in inputs.iter().enumerate() {
-        writeln!(file, "        {}: Arg{index},", &input.arg_name).unwrap();
-    }
-    write!(file, "    ) ").unwrap();
-}
-
-pub fn write_constructor_content(file: &mut File, inputs: Vec<InputAbi>) {
-    writeln!(
-        file,
-        "        self.wrapped_tx
-            .raw_deploy()"
-    )
-    .unwrap();
-    for input in inputs.iter() {
-        writeln!(file, "            .argument(&{})", input.arg_name).unwrap();
-    }
-    writeln!(file, "            .original_result()").unwrap();
-}
-
-pub fn write_upgrade_content(file: &mut File, inputs: Vec<InputAbi>) {
-    writeln!(
-        file,
-        "        self.wrapped_tx
-            .raw_upgrade()"
-    )
-    .unwrap();
-    for input in inputs.iter() {
-        writeln!(file, "            .argument(&{})", input.arg_name).unwrap();
-    }
-    writeln!(file, "            .original_result()").unwrap();
-}
-
-pub fn write_endpoint_content(file: &mut File, endpoint: &EndpointAbi) {
-    writeln!(
-        file,
-        "        self.wrapped_tx
-            .raw_call()
-            .function_name(\"{}\")",
-        endpoint.name
-    )
-    .unwrap();
-
-    for input in endpoint.inputs.iter() {
-        writeln!(file, "            .argument(&{})", input.arg_name).unwrap();
-    }
-
-    writeln!(file, "            .original_result()").unwrap();
-}
-
-pub fn write_end_of_function(file: &mut File) {
-    writeln!(file, "    }}").unwrap();
-}
-
-pub fn start_write_type(
-    file: &mut File,
-    type_type: &str,
-    type_description: &TypeDescription,
-    name: &str,
-) {
-    writeln!(file).unwrap();
-    write_macro_attributes(file, &type_description.macro_attributes);
-    write!(file, r#"pub {type_type} {name}"#).unwrap();
-
-    if name.contains("<Api>") {
-        writeln!(
-            file,
-            r#"
-where
-    Api: ManagedTypeApi,"#
-        )
-        .unwrap();
-    } else {
-        write!(file, " ").unwrap();
-    }
-
-    writeln!(file, r#"{{"#).unwrap();
-}
-
-pub fn write_macro_attributes(file: &mut File, macro_attributes: &[String]) {
-    if macro_attributes.is_empty() {
-        writeln!(file, "#[derive(TopEncode, TopDecode)]").unwrap();
-    } else {
-        writeln!(file, "#[derive({})]", macro_attributes.join(", ")).unwrap();
-    }
-}
-
-pub fn extract_struct_crate(struct_path: &str) -> String {
-    let struct_crate_name = struct_path
-        .replace('_', "-")
-        .replace("multiversx_sc::api::uncallable::UncallableApi", "Api")
-        .to_string();
-    let crate_name = struct_crate_name
-        .split("::")
-        .next()
-        .unwrap_or_else(|| &struct_crate_name);
-    crate_name.to_string()
-}

From 72e8e2247db1b05910b6f9d996f7627ee27621d8 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Mon, 1 Apr 2024 12:56:32 +0300
Subject: [PATCH 0609/1254] unified syntax - system SC proxy

---
 .../contract_base/wrappers/send_wrapper.rs    |  29 +-
 framework/base/src/esdt.rs                    |   5 -
 framework/base/src/lib.rs                     |   4 +-
 .../mappers/token/fungible_token_mapper.rs    |  28 +-
 .../token/non_fungible_token_mapper.rs        |  83 ++-
 .../src/storage/mappers/token/token_mapper.rs |  19 +-
 .../base/src/types/interaction/markers.rs     |   2 +
 .../interaction/markers/system_sc_address.rs  |  46 ++
 framework/base/src/types/interaction/mod.rs   |   1 +
 .../src/types/interaction/system_proxy.rs     |   6 +
 .../system_proxy/system_sc_proxy.rs           | 602 ++++++++++++++++++
 .../system_proxy/system_sc_proxy_legacy.rs}   |  14 +-
 .../system_proxy/token_properties.rs}         |   0
 framework/base/src/types/interaction/tx.rs    |   7 +-
 .../interaction/tx_exec/tx_exec_async.rs      |  12 +-
 .../tx_payment_egld_or_multi_esdt.rs          |   5 +-
 .../tx_payment_egld_or_multi_esdt_ref.rs      |   6 +-
 .../tx_payment/tx_payment_multi_esdt.rs       |   5 +-
 18 files changed, 772 insertions(+), 102 deletions(-)
 delete mode 100644 framework/base/src/esdt.rs
 create mode 100644 framework/base/src/types/interaction/markers/system_sc_address.rs
 create mode 100644 framework/base/src/types/interaction/system_proxy.rs
 create mode 100644 framework/base/src/types/interaction/system_proxy/system_sc_proxy.rs
 rename framework/base/src/{esdt/system_sc_proxy.rs => types/interaction/system_proxy/system_sc_proxy_legacy.rs} (98%)
 rename framework/base/src/{esdt/properties.rs => types/interaction/system_proxy/token_properties.rs} (100%)

diff --git a/framework/base/src/contract_base/wrappers/send_wrapper.rs b/framework/base/src/contract_base/wrappers/send_wrapper.rs
index b1de9d7ab9..0e809ebd51 100644
--- a/framework/base/src/contract_base/wrappers/send_wrapper.rs
+++ b/framework/base/src/contract_base/wrappers/send_wrapper.rs
@@ -11,11 +11,11 @@ use crate::{
         ESDT_NFT_UPDATE_ATTRIBUTES_FUNC_NAME,
     },
     codec,
-    esdt::ESDTSystemSmartContractProxy,
     types::{
-        BigUint, ContractCall, ContractCallNoPayment, EgldOrEsdtTokenIdentifier, EsdtTokenPayment,
-        GasLeft, ManagedAddress, ManagedArgBuffer, ManagedBuffer, ManagedType, ManagedVec,
-        ReturnsRawResult, ToSelf, TokenIdentifier, Tx,
+        system_proxy, system_proxy::SystemSCProxy, BigUint, ContractCall, ContractCallNoPayment,
+        EgldOrEsdtTokenIdentifier, EsdtTokenPayment, GasLeft, ManagedAddress, ManagedArgBuffer,
+        ManagedBuffer, ManagedType, ManagedVec, ReturnsRawResult, SystemSCAddress, ToSelf,
+        TokenIdentifier, Tx, TxScEnv,
     },
 };
 
@@ -51,12 +51,21 @@ where
         SendRawWrapper::new()
     }
 
-    /// A proxy for calling the system smart contract.
-    ///
-    /// Use the methods of this proxy to launch contract calls to the system SC.
-    #[inline]
-    pub fn esdt_system_sc_proxy(&self) -> ESDTSystemSmartContractProxy<A> {
-        ESDTSystemSmartContractProxy::new_proxy_obj()
+    /// Backwards compatibility, synonymous to `esdt_system_sc_tx`, which is the more appropriate name now.
+    pub fn esdt_system_sc_proxy(
+        &self,
+    ) -> system_proxy::SystemSCProxyMethods<TxScEnv<A>, (), SystemSCAddress, ()> {
+        self.esdt_system_sc_tx()
+    }
+
+    /// Prepares a proxy object to call the system SC.
+    /// It has the destination address set, as well as the contract type (as specified in the proxy).
+    pub fn esdt_system_sc_tx(
+        &self,
+    ) -> system_proxy::SystemSCProxyMethods<TxScEnv<A>, (), SystemSCAddress, ()> {
+        Tx::new_tx_from_sc()
+            .to(SystemSCAddress)
+            .typed(SystemSCProxy)
     }
 
     /// Convenient way to quickly instance a minimal contract call (with no EGLD, no arguments, etc.)
diff --git a/framework/base/src/esdt.rs b/framework/base/src/esdt.rs
deleted file mode 100644
index db1730be29..0000000000
--- a/framework/base/src/esdt.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-mod properties;
-mod system_sc_proxy;
-
-pub use properties::*;
-pub use system_sc_proxy::ESDTSystemSmartContractProxy;
diff --git a/framework/base/src/lib.rs b/framework/base/src/lib.rs
index aa1d477897..3d2fa0f9e5 100644
--- a/framework/base/src/lib.rs
+++ b/framework/base/src/lib.rs
@@ -23,7 +23,6 @@ pub mod abi;
 pub mod api;
 pub mod contract_base;
 pub mod err_msg;
-pub mod esdt;
 pub mod external_view_contract;
 pub mod formatter;
 pub mod hex_call_data;
@@ -51,13 +50,12 @@ pub mod imports {
         },
         contract_base::{ContractBase, ProxyObjBase, ProxyObjNew},
         err_msg,
-        esdt::*,
         io::*,
         non_zero_usize,
         non_zero_util::*,
         require, sc_format, sc_panic, sc_print,
         storage::mappers::*,
-        types::*,
+        types::{system_proxy::*, *},
     };
     pub use core::ops::{
         Add, AddAssign, BitAnd, BitAndAssign, BitOr, BitOrAssign, BitXor, BitXorAssign, Div,
diff --git a/framework/base/src/storage/mappers/token/fungible_token_mapper.rs b/framework/base/src/storage/mappers/token/fungible_token_mapper.rs
index 53f07eab56..5e1d3dd222 100644
--- a/framework/base/src/storage/mappers/token/fungible_token_mapper.rs
+++ b/framework/base/src/storage/mappers/token/fungible_token_mapper.rs
@@ -3,7 +3,10 @@ use crate::{
     api::ErrorApiImpl,
     codec::{CodecFrom, EncodeErrorHandler, TopEncodeMulti, TopEncodeMultiOutput},
     storage_clear, storage_get, storage_set,
-    types::Tx,
+    types::{
+        system_proxy::{FungibleTokenProperties, SystemSCProxy},
+        SystemSCAddress, Tx,
+    },
 };
 
 use super::{
@@ -15,11 +18,10 @@ use crate::{
     abi::TypeName,
     api::{CallTypeApi, StorageMapperApi},
     contract_base::{BlockchainWrapper, SendWrapper},
-    esdt::{ESDTSystemSmartContractProxy, FungibleTokenProperties},
     storage::StorageKey,
     types::{
-        BigUint, CallbackClosure, ContractCall, EsdtTokenPayment, EsdtTokenType, ManagedAddress,
-        ManagedBuffer, ManagedType, TokenIdentifier,
+        BigUint, CallbackClosure, EsdtTokenPayment, EsdtTokenType, ManagedAddress, ManagedBuffer,
+        ManagedType, TokenIdentifier,
     },
 };
 
@@ -114,7 +116,6 @@ where
     ) -> ! {
         check_not_set(self);
 
-        let system_sc_proxy = ESDTSystemSmartContractProxy::<SA>::new_proxy_obj();
         let callback = match opt_callback {
             Some(cb) => cb,
             None => self.default_callback_closure_obj(&initial_supply),
@@ -125,7 +126,9 @@ where
         };
 
         storage_set(self.get_storage_key(), &TokenMapperState::<SA>::Pending);
-        system_sc_proxy
+        Tx::new_tx_from_sc()
+            .to(SystemSCAddress)
+            .typed(SystemSCProxy)
             .issue_fungible(
                 issue_cost,
                 &token_display_name,
@@ -133,9 +136,8 @@ where
                 &initial_supply,
                 properties,
             )
-            .async_call()
-            .with_callback(callback)
-            .call_and_exit();
+            .callback(callback)
+            .async_call_and_exit()
     }
 
     /// Important: If you use custom callback, remember to save the token ID in the callback and clear the mapper in case of error! Clear is unusable outside this specific case.
@@ -166,14 +168,15 @@ where
     ) -> ! {
         check_not_set(self);
 
-        let system_sc_proxy = ESDTSystemSmartContractProxy::<SA>::new_proxy_obj();
         let callback = match opt_callback {
             Some(cb) => cb,
             None => self.default_callback_closure_obj(&BigUint::zero()),
         };
 
         storage_set(self.get_storage_key(), &TokenMapperState::<SA>::Pending);
-        system_sc_proxy
+        Tx::new_tx_from_sc()
+            .to(SystemSCAddress)
+            .typed(SystemSCProxy)
             .issue_and_set_all_roles(
                 issue_cost,
                 token_display_name,
@@ -181,9 +184,8 @@ where
                 EsdtTokenType::Fungible,
                 num_decimals,
             )
-            .async_call()
             .with_callback(callback)
-            .call_and_exit();
+            .async_call_and_exit();
     }
 
     pub fn clear(&mut self) {
diff --git a/framework/base/src/storage/mappers/token/non_fungible_token_mapper.rs b/framework/base/src/storage/mappers/token/non_fungible_token_mapper.rs
index a49db9846b..4a32900093 100644
--- a/framework/base/src/storage/mappers/token/non_fungible_token_mapper.rs
+++ b/framework/base/src/storage/mappers/token/non_fungible_token_mapper.rs
@@ -3,7 +3,10 @@ use crate::{
         CodecFrom, EncodeErrorHandler, TopDecode, TopEncode, TopEncodeMulti, TopEncodeMultiOutput,
     },
     storage_clear, storage_get, storage_set,
-    types::Tx,
+    types::{
+        system_proxy::SystemSCProxy, EgldPayment, FunctionCall, OriginalResultMarker,
+        SystemSCAddress, Tx, TxScEnv,
+    },
 };
 
 use super::{
@@ -16,20 +19,28 @@ use crate::{
     abi::{TypeAbi, TypeName},
     api::{CallTypeApi, ErrorApiImpl, StorageMapperApi},
     contract_base::{BlockchainWrapper, SendWrapper},
-    esdt::{
-        ESDTSystemSmartContractProxy, MetaTokenProperties, NonFungibleTokenProperties,
-        SemiFungibleTokenProperties,
-    },
     storage::StorageKey,
     types::{
-        BigUint, CallbackClosure, ContractCall, ContractCallWithEgld, EsdtTokenData,
-        EsdtTokenPayment, EsdtTokenType, ManagedAddress, ManagedBuffer, ManagedType,
-        TokenIdentifier,
+        system_proxy::{
+            MetaTokenProperties, NonFungibleTokenProperties, SemiFungibleTokenProperties,
+        },
+        BigUint, CallbackClosure, EsdtTokenData, EsdtTokenPayment, EsdtTokenType, ManagedAddress,
+        ManagedBuffer, ManagedType, TokenIdentifier,
     },
 };
 
 const INVALID_TOKEN_TYPE_ERR_MSG: &[u8] = b"Invalid token type for NonFungible issue";
 
+pub type IssueCallTo<Api> = Tx<
+    TxScEnv<Api>,
+    (),
+    SystemSCAddress,
+    EgldPayment<Api>,
+    (),
+    FunctionCall<Api>,
+    OriginalResultMarker<TokenIdentifier<Api>>,
+>;
+
 pub struct NonFungibleTokenMapper<SA>
 where
     SA: StorageMapperApi + CallTypeApi,
@@ -174,14 +185,15 @@ where
             SA::error_api_impl().signal_error(INVALID_TOKEN_TYPE_ERR_MSG);
         }
 
-        let system_sc_proxy = ESDTSystemSmartContractProxy::<SA>::new_proxy_obj();
         let callback = match opt_callback {
             Some(cb) => cb,
             None => self.default_callback_closure_obj(),
         };
 
         storage_set(self.get_storage_key(), &TokenMapperState::<SA>::Pending);
-        system_sc_proxy
+        Tx::new_tx_from_sc()
+            .to(SystemSCAddress)
+            .typed(SystemSCProxy)
             .issue_and_set_all_roles(
                 issue_cost,
                 token_display_name,
@@ -191,7 +203,7 @@ where
             )
             .async_call()
             .with_callback(callback)
-            .call_and_exit();
+            .call_and_exit()
     }
 
     pub fn clear(&mut self) {
@@ -216,28 +228,32 @@ where
         issue_cost: BigUint<SA>,
         token_display_name: ManagedBuffer<SA>,
         token_ticker: ManagedBuffer<SA>,
-    ) -> ContractCallWithEgld<SA, ()> {
-        let system_sc_proxy = ESDTSystemSmartContractProxy::<SA>::new_proxy_obj();
-        system_sc_proxy.issue_non_fungible(
-            issue_cost,
-            &token_display_name,
-            &token_ticker,
-            NonFungibleTokenProperties::default(),
-        )
+    ) -> IssueCallTo<SA> {
+        Tx::new_tx_from_sc()
+            .to(SystemSCAddress)
+            .typed(SystemSCProxy)
+            .issue_non_fungible(
+                issue_cost,
+                &token_display_name,
+                &token_ticker,
+                NonFungibleTokenProperties::default(),
+            )
     }
 
     fn sft_issue(
         issue_cost: BigUint<SA>,
         token_display_name: ManagedBuffer<SA>,
         token_ticker: ManagedBuffer<SA>,
-    ) -> ContractCallWithEgld<SA, ()> {
-        let system_sc_proxy = ESDTSystemSmartContractProxy::<SA>::new_proxy_obj();
-        system_sc_proxy.issue_semi_fungible(
-            issue_cost,
-            &token_display_name,
-            &token_ticker,
-            SemiFungibleTokenProperties::default(),
-        )
+    ) -> IssueCallTo<SA> {
+        Tx::new_tx_from_sc()
+            .to(SystemSCAddress)
+            .typed(SystemSCProxy)
+            .issue_semi_fungible(
+                issue_cost,
+                &token_display_name,
+                &token_ticker,
+                SemiFungibleTokenProperties::default(),
+            )
     }
 
     fn meta_issue(
@@ -245,19 +261,16 @@ where
         token_display_name: ManagedBuffer<SA>,
         token_ticker: ManagedBuffer<SA>,
         num_decimals: usize,
-    ) -> ContractCallWithEgld<SA, ()> {
-        let system_sc_proxy = ESDTSystemSmartContractProxy::<SA>::new_proxy_obj();
+    ) -> IssueCallTo<SA> {
         let properties = MetaTokenProperties {
             num_decimals,
             ..Default::default()
         };
 
-        system_sc_proxy.register_meta_esdt(
-            issue_cost,
-            &token_display_name,
-            &token_ticker,
-            properties,
-        )
+        Tx::new_tx_from_sc()
+            .to(SystemSCAddress)
+            .typed(SystemSCProxy)
+            .register_meta_esdt(issue_cost, &token_display_name, &token_ticker, properties)
     }
 
     pub fn nft_create<T: TopEncode>(
diff --git a/framework/base/src/storage/mappers/token/token_mapper.rs b/framework/base/src/storage/mappers/token/token_mapper.rs
index e0867f7414..965b5209e3 100644
--- a/framework/base/src/storage/mappers/token/token_mapper.rs
+++ b/framework/base/src/storage/mappers/token/token_mapper.rs
@@ -1,12 +1,11 @@
 use crate::{
     api::{CallTypeApi, ErrorApiImpl, StorageMapperApi},
     contract_base::BlockchainWrapper,
-    esdt::ESDTSystemSmartContractProxy,
     storage::StorageKey,
     storage_get, storage_get_len, storage_set,
     types::{
-        CallbackClosure, ContractCall, EsdtLocalRole, EsdtTokenPayment, ManagedAddress, ManagedRef,
-        ManagedVec, TokenIdentifier,
+        system_proxy::SystemSCProxy, CallbackClosure, EsdtLocalRole, EsdtTokenPayment,
+        ManagedAddress, ManagedRef, ManagedVec, SystemSCAddress, TokenIdentifier, Tx,
     },
 };
 
@@ -81,17 +80,13 @@ where
     ) -> ! {
         self.require_issued_or_set();
 
-        let system_sc_proxy = ESDTSystemSmartContractProxy::<SA>::new_proxy_obj();
         let token_id = self.get_token_id_ref();
-        let mut async_call = system_sc_proxy
+        Tx::new_tx_from_sc()
+            .to(SystemSCAddress)
+            .typed(SystemSCProxy)
             .set_special_roles(address, token_id, roles[..].iter().cloned())
-            .async_call();
-
-        if let Some(cb) = opt_callback {
-            async_call = async_call.with_callback(cb);
-        }
-
-        async_call.call_and_exit()
+            .callback(opt_callback)
+            .call_and_exit()
     }
 
     fn get_sc_address() -> ManagedAddress<SA> {
diff --git a/framework/base/src/types/interaction/markers.rs b/framework/base/src/types/interaction/markers.rs
index 10ccdea5d0..751ef755e7 100644
--- a/framework/base/src/types/interaction/markers.rs
+++ b/framework/base/src/types/interaction/markers.rs
@@ -1,7 +1,9 @@
 mod gas_left;
+mod system_sc_address;
 mod to_caller;
 mod to_self;
 
 pub use gas_left::GasLeft;
+pub use system_sc_address::SystemSCAddress;
 pub use to_caller::ToCaller;
 pub use to_self::ToSelf;
diff --git a/framework/base/src/types/interaction/markers/system_sc_address.rs b/framework/base/src/types/interaction/markers/system_sc_address.rs
new file mode 100644
index 0000000000..2365bacdd3
--- /dev/null
+++ b/framework/base/src/types/interaction/markers/system_sc_address.rs
@@ -0,0 +1,46 @@
+use hex_literal::hex;
+
+use crate::{
+    api::{
+        const_handles, use_raw_handle, BlockchainApi, BlockchainApiImpl, CallTypeApi,
+        ManagedTypeApi,
+    },
+    contract_base::BlockchainWrapper,
+    types::{
+        AnnotatedValue, ManagedAddress, ManagedBuffer, ManagedType, TxScEnv, TxTo, TxToSpecified,
+    },
+};
+
+/// Address of the system smart contract that manages ESDT.
+const SYSTEM_SC_ADDRESS_BYTES: [u8; 32] =
+    hex!("000000000000000000010000000000000000000000000000000000000002ffff");
+const SYSTEM_SC_ADDRESS_ANNOTATION: &str =
+    "bech32:erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u";
+
+/// Indicates the system SC address, which is the same on any MultiversX blockchain.
+pub struct SystemSCAddress;
+
+impl SystemSCAddress {
+    pub fn managed_address<Api>(self) -> ManagedAddress<Api>
+    where
+        Api: ManagedTypeApi,
+    {
+        ManagedAddress::from(SYSTEM_SC_ADDRESS_BYTES)
+    }
+}
+
+impl<Api> AnnotatedValue<TxScEnv<Api>, ManagedAddress<Api>> for SystemSCAddress
+where
+    Api: CallTypeApi,
+{
+    fn annotation(&self, env: &TxScEnv<Api>) -> ManagedBuffer<Api> {
+        ManagedBuffer::from(SYSTEM_SC_ADDRESS_ANNOTATION)
+    }
+
+    fn to_value(&self, _env: &TxScEnv<Api>) -> ManagedAddress<Api> {
+        SystemSCAddress.managed_address()
+    }
+}
+
+impl<Api> TxTo<TxScEnv<Api>> for SystemSCAddress where Api: CallTypeApi {}
+impl<Api> TxToSpecified<TxScEnv<Api>> for SystemSCAddress where Api: CallTypeApi {}
diff --git a/framework/base/src/types/interaction/mod.rs b/framework/base/src/types/interaction/mod.rs
index 809bb0726c..9703822387 100644
--- a/framework/base/src/types/interaction/mod.rs
+++ b/framework/base/src/types/interaction/mod.rs
@@ -13,6 +13,7 @@ mod expr;
 mod function_call;
 mod managed_arg_buffer;
 mod markers;
+pub mod system_proxy;
 mod tx;
 mod tx_code_source;
 mod tx_data;
diff --git a/framework/base/src/types/interaction/system_proxy.rs b/framework/base/src/types/interaction/system_proxy.rs
new file mode 100644
index 0000000000..1388554af4
--- /dev/null
+++ b/framework/base/src/types/interaction/system_proxy.rs
@@ -0,0 +1,6 @@
+mod system_sc_proxy;
+mod system_sc_proxy_legacy;
+pub(crate) mod token_properties;
+
+pub use system_sc_proxy::*;
+pub use token_properties::*;
diff --git a/framework/base/src/types/interaction/system_proxy/system_sc_proxy.rs b/framework/base/src/types/interaction/system_proxy/system_sc_proxy.rs
new file mode 100644
index 0000000000..96c5a72ca0
--- /dev/null
+++ b/framework/base/src/types/interaction/system_proxy/system_sc_proxy.rs
@@ -0,0 +1,602 @@
+use core::marker::PhantomData;
+
+use super::token_properties::*;
+use hex_literal::hex;
+
+use crate::{
+    api::{CallTypeApi, SendApi, VMApi},
+    types::{
+        BigUint, ContractCall, ContractCallNoPayment, ContractCallWithEgld, EgldPayment,
+        EsdtLocalRole, EsdtTokenType, FunctionCall, ManagedAddress, ManagedBuffer,
+        OriginalResultMarker, TokenIdentifier, Tx, TxEnv, TxFrom, TxGas, TxProxyCall, TxProxyTrait,
+        TxTo,
+    },
+};
+
+const ISSUE_FUNGIBLE_ENDPOINT_NAME: &str = "issue";
+const ISSUE_NON_FUNGIBLE_ENDPOINT_NAME: &str = "issueNonFungible";
+const ISSUE_SEMI_FUNGIBLE_ENDPOINT_NAME: &str = "issueSemiFungible";
+const REGISTER_META_ESDT_ENDPOINT_NAME: &str = "registerMetaESDT";
+const ISSUE_AND_SET_ALL_ROLES_ENDPOINT_NAME: &str = "registerAndSetAllRoles";
+
+pub type IssueCall<Env, From, To, Gas> = Tx<
+    Env,
+    From,
+    To,
+    EgldPayment<<Env as TxEnv>::Api>,
+    Gas,
+    FunctionCall<<Env as TxEnv>::Api>,
+    OriginalResultMarker<TokenIdentifier<<Env as TxEnv>::Api>>,
+>;
+
+/// Proxy for the ESDT system smart contract.
+pub struct SystemSCProxy;
+
+impl<Env, From, To, Gas> TxProxyTrait<Env, From, To, Gas> for SystemSCProxy
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    type TxProxyMethods = SystemSCProxyMethods<Env, From, To, Gas>;
+
+    fn proxy_methods(self, tx: Tx<Env, From, To, (), Gas, (), ()>) -> Self::TxProxyMethods {
+        SystemSCProxyMethods { wrapped_tx: tx }
+    }
+}
+
+pub struct SystemSCProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    wrapped_tx: Tx<Env, From, To, (), Gas, (), ()>,
+}
+
+impl<Env, From, To, Gas> SystemSCProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    /// Produces a contract call to the ESDT system SC,
+    /// which causes it to issue a new fungible ESDT token.
+    pub fn issue_fungible(
+        self,
+        issue_cost: BigUint<Env::Api>,
+        token_display_name: &ManagedBuffer<Env::Api>,
+        token_ticker: &ManagedBuffer<Env::Api>,
+        initial_supply: &BigUint<Env::Api>,
+        properties: FungibleTokenProperties,
+    ) -> IssueCall<Env, From, To, Gas> {
+        self.issue(
+            issue_cost,
+            EsdtTokenType::Fungible,
+            token_display_name,
+            token_ticker,
+            initial_supply,
+            TokenProperties {
+                num_decimals: properties.num_decimals,
+                can_freeze: properties.can_freeze,
+                can_wipe: properties.can_wipe,
+                can_pause: properties.can_pause,
+                can_transfer_create_role: false,
+                can_mint: properties.can_mint,
+                can_burn: properties.can_burn,
+                can_change_owner: properties.can_change_owner,
+                can_upgrade: properties.can_upgrade,
+                can_add_special_roles: properties.can_add_special_roles,
+            },
+        )
+    }
+
+    /// Produces a contract call to the ESDT system SC,
+    /// which causes it to issue a new non-fungible ESDT token.
+    pub fn issue_non_fungible(
+        self,
+        issue_cost: BigUint<Env::Api>,
+        token_display_name: &ManagedBuffer<Env::Api>,
+        token_ticker: &ManagedBuffer<Env::Api>,
+        properties: NonFungibleTokenProperties,
+    ) -> IssueCall<Env, From, To, Gas> {
+        let zero = BigUint::zero();
+        self.issue(
+            issue_cost,
+            EsdtTokenType::NonFungible,
+            token_display_name,
+            token_ticker,
+            &zero,
+            TokenProperties {
+                num_decimals: 0,
+                can_freeze: properties.can_freeze,
+                can_wipe: properties.can_wipe,
+                can_pause: properties.can_pause,
+                can_transfer_create_role: properties.can_transfer_create_role,
+                can_mint: false,
+                can_burn: false,
+                can_change_owner: properties.can_change_owner,
+                can_upgrade: properties.can_upgrade,
+                can_add_special_roles: properties.can_add_special_roles,
+            },
+        )
+    }
+
+    /// Produces a contract call to the ESDT system SC,
+    /// which causes it to issue a new semi-fungible ESDT token.
+    pub fn issue_semi_fungible(
+        self,
+        issue_cost: BigUint<Env::Api>,
+        token_display_name: &ManagedBuffer<Env::Api>,
+        token_ticker: &ManagedBuffer<Env::Api>,
+        properties: SemiFungibleTokenProperties,
+    ) -> IssueCall<Env, From, To, Gas> {
+        let zero = BigUint::zero();
+        self.issue(
+            issue_cost,
+            EsdtTokenType::SemiFungible,
+            token_display_name,
+            token_ticker,
+            &zero,
+            TokenProperties {
+                num_decimals: 0,
+                can_freeze: properties.can_freeze,
+                can_wipe: properties.can_wipe,
+                can_pause: properties.can_pause,
+                can_transfer_create_role: properties.can_transfer_create_role,
+                can_mint: false,
+                can_burn: false,
+                can_change_owner: properties.can_change_owner,
+                can_upgrade: properties.can_upgrade,
+                can_add_special_roles: properties.can_add_special_roles,
+            },
+        )
+    }
+
+    /// Produces a contract call to the ESDT system SC,
+    /// which causes it to register a new Meta ESDT token.
+    pub fn register_meta_esdt(
+        self,
+        issue_cost: BigUint<Env::Api>,
+        token_display_name: &ManagedBuffer<Env::Api>,
+        token_ticker: &ManagedBuffer<Env::Api>,
+        properties: MetaTokenProperties,
+    ) -> IssueCall<Env, From, To, Gas> {
+        let zero = BigUint::zero();
+        self.issue(
+            issue_cost,
+            EsdtTokenType::Meta,
+            token_display_name,
+            token_ticker,
+            &zero,
+            TokenProperties {
+                num_decimals: properties.num_decimals,
+                can_freeze: properties.can_freeze,
+                can_wipe: properties.can_wipe,
+                can_pause: properties.can_pause,
+                can_transfer_create_role: properties.can_transfer_create_role,
+                can_mint: false,
+                can_burn: false,
+                can_change_owner: properties.can_change_owner,
+                can_upgrade: properties.can_upgrade,
+                can_add_special_roles: properties.can_add_special_roles,
+            },
+        )
+    }
+
+    pub fn issue_and_set_all_roles(
+        self,
+        issue_cost: BigUint<Env::Api>,
+        token_display_name: ManagedBuffer<Env::Api>,
+        token_ticker: ManagedBuffer<Env::Api>,
+        token_type: EsdtTokenType,
+        num_decimals: usize,
+    ) -> IssueCall<Env, From, To, Gas> {
+        let token_type_name = match token_type {
+            EsdtTokenType::Fungible => "FNG",
+            EsdtTokenType::NonFungible => "NFT",
+            EsdtTokenType::SemiFungible => "SFT",
+            EsdtTokenType::Meta => "META",
+            EsdtTokenType::Invalid => "",
+        };
+
+        self.wrapped_tx
+            .raw_call()
+            .function_name(ISSUE_AND_SET_ALL_ROLES_ENDPOINT_NAME)
+            .egld(issue_cost)
+            .argument(&token_display_name)
+            .argument(&token_ticker)
+            .argument(&token_type_name)
+            .argument(&num_decimals)
+            .original_result()
+    }
+
+    /// Deduplicates code from all the possible issue functions
+    fn issue(
+        self,
+        issue_cost: BigUint<Env::Api>,
+        token_type: EsdtTokenType,
+        token_display_name: &ManagedBuffer<Env::Api>,
+        token_ticker: &ManagedBuffer<Env::Api>,
+        initial_supply: &BigUint<Env::Api>,
+        properties: TokenProperties,
+    ) -> IssueCall<Env, From, To, Gas> {
+        let endpoint_name = match token_type {
+            EsdtTokenType::Fungible => ISSUE_FUNGIBLE_ENDPOINT_NAME,
+            EsdtTokenType::NonFungible => ISSUE_NON_FUNGIBLE_ENDPOINT_NAME,
+            EsdtTokenType::SemiFungible => ISSUE_SEMI_FUNGIBLE_ENDPOINT_NAME,
+            EsdtTokenType::Meta => REGISTER_META_ESDT_ENDPOINT_NAME,
+            EsdtTokenType::Invalid => "",
+        };
+
+        let mut tx = self
+            .wrapped_tx
+            .raw_call()
+            .function_name(endpoint_name)
+            .egld(issue_cost)
+            .argument(token_display_name)
+            .argument(token_ticker);
+
+        if token_type == EsdtTokenType::Fungible {
+            tx = tx.argument(initial_supply);
+            tx = tx.argument(&properties.num_decimals);
+        } else if token_type == EsdtTokenType::Meta {
+            tx = tx.argument(&properties.num_decimals);
+        }
+
+        let mut token_prop_args = TokenPropertyArguments {
+            can_freeze: Some(properties.can_freeze),
+            can_wipe: Some(properties.can_wipe),
+            can_pause: Some(properties.can_pause),
+            can_change_owner: Some(properties.can_change_owner),
+            can_upgrade: Some(properties.can_upgrade),
+            can_add_special_roles: Some(properties.can_add_special_roles),
+            ..TokenPropertyArguments::default()
+        };
+
+        if token_type == EsdtTokenType::Fungible {
+            token_prop_args.can_mint = Some(properties.can_mint);
+            token_prop_args.can_burn = Some(properties.can_burn);
+        } else {
+            token_prop_args.can_transfer_create_role = Some(properties.can_transfer_create_role);
+        }
+
+        append_token_property_arguments(&mut tx.data, &token_prop_args);
+
+        tx.original_result()
+    }
+
+    /// Produces a contract call to the ESDT system SC,
+    /// which causes it to mint more fungible ESDT tokens.
+    /// It will fail if the SC is not the owner of the token.
+    pub fn mint(
+        self,
+        token_identifier: &TokenIdentifier<Env::Api>,
+        amount: &BigUint<Env::Api>,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("mint")
+            .argument(token_identifier)
+            .argument(amount)
+            .original_result()
+    }
+
+    /// Produces a contract call to the ESDT system SC,
+    /// which causes it to burn fungible ESDT tokens owned by the SC.
+    pub fn burn(
+        self,
+        token_identifier: &TokenIdentifier<Env::Api>,
+        amount: &BigUint<Env::Api>,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("ESDTBurn")
+            .argument(token_identifier)
+            .argument(amount)
+            .original_result()
+    }
+
+    /// The manager of an ESDT token may choose to suspend all transactions of the token,
+    /// except minting, freezing/unfreezing and wiping.
+    pub fn pause(
+        self,
+        token_identifier: &TokenIdentifier<Env::Api>,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("pause")
+            .argument(token_identifier)
+            .original_result()
+    }
+
+    /// The reverse operation of `pause`.
+    pub fn unpause(
+        self,
+        token_identifier: &TokenIdentifier<Env::Api>,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("unPause")
+            .argument(token_identifier)
+            .original_result()
+    }
+
+    /// The manager of an ESDT token may freeze the tokens held by a specific account.
+    /// As a consequence, no tokens may be transferred to or from the frozen account.
+    /// Freezing and unfreezing the tokens of an account are operations designed to help token managers to comply with regulations.
+    pub fn freeze(
+        self,
+        token_identifier: &TokenIdentifier<Env::Api>,
+        address: &ManagedAddress<Env::Api>,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("freeze")
+            .argument(token_identifier)
+            .argument(address)
+            .original_result()
+    }
+
+    /// The reverse operation of `freeze`, unfreezing, will allow further transfers to and from the account.
+    pub fn unfreeze(
+        self,
+        token_identifier: &TokenIdentifier<Env::Api>,
+        address: &ManagedAddress<Env::Api>,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("unFreeze")
+            .argument(token_identifier)
+            .argument(address)
+            .original_result()
+    }
+
+    /// The manager of an ESDT token may wipe out all the tokens held by a frozen account.
+    /// This operation is similar to burning the tokens, but the account must have been frozen beforehand,
+    /// and it must be done by the token manager.
+    /// Wiping the tokens of an account is an operation designed to help token managers to comply with regulations.
+    pub fn wipe(
+        self,
+        token_identifier: &TokenIdentifier<Env::Api>,
+        address: &ManagedAddress<Env::Api>,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("wipe")
+            .argument(token_identifier)
+            .argument(address)
+            .original_result()
+    }
+
+    /// The manager of an ESDT token may freeze the NFT held by a specific Account.
+    /// As a consequence, no NFT can be transferred to or from the frozen Account.
+    /// Freezing and unfreezing a single NFT of an Account are operations designed to help token managers to comply with regulations.
+    pub fn freeze_nft(
+        self,
+        token_identifier: &TokenIdentifier<Env::Api>,
+        nft_nonce: u64,
+        address: &ManagedAddress<Env::Api>,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("freezeSingleNFT")
+            .argument(token_identifier)
+            .argument(&nft_nonce)
+            .argument(address)
+            .original_result()
+    }
+
+    /// The reverse operation of `freeze`, unfreezing, will allow further transfers to and from the account.
+    pub fn unfreeze_nft(
+        self,
+        token_identifier: &TokenIdentifier<Env::Api>,
+        nft_nonce: u64,
+        address: &ManagedAddress<Env::Api>,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("unFreezeSingleNFT")
+            .argument(token_identifier)
+            .argument(&nft_nonce)
+            .argument(address)
+            .original_result()
+    }
+
+    /// The manager of an ESDT token may wipe out a single NFT held by a frozen Account.
+    /// This operation is similar to burning the quantity, but the Account must have been frozen beforehand,
+    /// and it must be done by the token manager.
+    /// Wiping the tokens of an Account is an operation designed to help token managers to comply with regulations.
+    pub fn wipe_nft(
+        self,
+        token_identifier: &TokenIdentifier<Env::Api>,
+        nft_nonce: u64,
+        address: &ManagedAddress<Env::Api>,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("wipeSingleNFT")
+            .argument(token_identifier)
+            .argument(&nft_nonce)
+            .argument(address)
+            .original_result()
+    }
+
+    /// This function converts an SFT to a metaESDT by adding decimals to its structure in the metachain ESDT System SC.
+    /// This function as almost all in case of ESDT can be called only by the owner.
+    pub fn change_sft_to_meta_esdt(
+        self,
+        token_identifier: &TokenIdentifier<Env::Api>,
+        num_decimals: usize,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("changeSFTToMetaESDT")
+            .argument(&token_identifier)
+            .argument(&num_decimals)
+            .original_result()
+    }
+
+    /// This function can be called only if canSetSpecialRoles was set to true.
+    /// The metachain system SC will evaluate the arguments and call “ESDTSetRole@tokenId@listOfRoles” for the given address.
+    /// This will be actually a cross shard call.
+    /// This function as almost all in case of ESDT can be called only by the owner.
+    pub fn set_special_roles<RoleIter: Iterator<Item = EsdtLocalRole>>(
+        self,
+        address: &ManagedAddress<Env::Api>,
+        token_identifier: &TokenIdentifier<Env::Api>,
+        roles_iter: RoleIter,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        let mut tx = self
+            .wrapped_tx
+            .raw_call()
+            .function_name("setSpecialRole")
+            .argument(token_identifier)
+            .argument(address);
+        for role in roles_iter {
+            if role != EsdtLocalRole::None {
+                tx = tx.argument(&role.as_role_name());
+            }
+        }
+
+        tx.original_result()
+    }
+
+    /// This function can be called only if canSetSpecialRoles was set to true.
+    /// The metachain system SC will evaluate the arguments and call “ESDTUnsetRole@tokenId@listOfRoles” for the given address.
+    /// This will be actually a cross shard call.
+    /// This function as almost all in case of ESDT can be called only by the owner.
+    pub fn unset_special_roles<RoleIter: Iterator<Item = EsdtLocalRole>>(
+        self,
+        address: &ManagedAddress<Env::Api>,
+        token_identifier: &TokenIdentifier<Env::Api>,
+        roles_iter: RoleIter,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        let mut tx = self
+            .wrapped_tx
+            .raw_call()
+            .function_name("unSetSpecialRole")
+            .argument(token_identifier)
+            .argument(address);
+        for role in roles_iter {
+            if role != EsdtLocalRole::None {
+                tx = tx.argument(&role.as_role_name());
+            }
+        }
+
+        tx.original_result()
+    }
+
+    pub fn transfer_ownership(
+        self,
+        token_identifier: &TokenIdentifier<Env::Api>,
+        new_owner: &ManagedAddress<Env::Api>,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("transferOwnership")
+            .argument(token_identifier)
+            .argument(new_owner)
+            .original_result()
+    }
+
+    pub fn transfer_nft_create_role(
+        self,
+        token_identifier: &TokenIdentifier<Env::Api>,
+        old_creator: &ManagedAddress<Env::Api>,
+        new_creator: &ManagedAddress<Env::Api>,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("transferNFTCreateRole")
+            .argument(token_identifier)
+            .argument(old_creator)
+            .argument(new_creator)
+            .original_result()
+    }
+
+    pub fn control_changes(
+        self,
+        token_identifier: &TokenIdentifier<Env::Api>,
+        property_arguments: &TokenPropertyArguments,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        let mut tx = self
+            .wrapped_tx
+            .raw_call()
+            .function_name("controlChanges")
+            .argument(token_identifier);
+        append_token_property_arguments(&mut tx.data, property_arguments);
+        tx.original_result()
+    }
+}
+
+const TRUE_STR: &str = "true";
+const FALSE_STR: &str = "false";
+
+fn bool_name_bytes(b: bool) -> &'static str {
+    if b {
+        TRUE_STR
+    } else {
+        FALSE_STR
+    }
+}
+
+fn set_token_property<Api>(contract_call: &mut FunctionCall<Api>, name: &str, value: bool)
+where
+    Api: CallTypeApi,
+{
+    contract_call.arg_buffer.push_multi_arg(&name);
+    contract_call
+        .arg_buffer
+        .push_multi_arg(&bool_name_bytes(value));
+}
+
+fn append_token_property_arguments<Api>(
+    contract_call: &mut FunctionCall<Api>,
+    token_prop_args: &TokenPropertyArguments,
+) where
+    Api: CallTypeApi,
+{
+    if let Some(can_freeze) = token_prop_args.can_freeze {
+        set_token_property(contract_call, "canFreeze", can_freeze);
+    }
+
+    if let Some(can_wipe) = token_prop_args.can_wipe {
+        set_token_property(contract_call, "canWipe", can_wipe);
+    }
+
+    if let Some(can_pause) = token_prop_args.can_pause {
+        set_token_property(contract_call, "canPause", can_pause);
+    }
+
+    if let Some(can_transfer_create_role) = token_prop_args.can_transfer_create_role {
+        set_token_property(
+            contract_call,
+            "canTransferNFTCreateRole",
+            can_transfer_create_role,
+        );
+    }
+
+    if let Some(can_mint) = token_prop_args.can_mint {
+        set_token_property(contract_call, "canMint", can_mint);
+    }
+
+    if let Some(can_burn) = token_prop_args.can_burn {
+        set_token_property(contract_call, "canBurn", can_burn);
+    }
+
+    if let Some(can_change_owner) = token_prop_args.can_change_owner {
+        set_token_property(contract_call, "canChangeOwner", can_change_owner);
+    }
+
+    if let Some(can_upgrade) = token_prop_args.can_upgrade {
+        set_token_property(contract_call, "canUpgrade", can_upgrade);
+    }
+
+    if let Some(can_add_special_roles) = token_prop_args.can_add_special_roles {
+        set_token_property(contract_call, "canAddSpecialRoles", can_add_special_roles);
+    }
+}
diff --git a/framework/base/src/esdt/system_sc_proxy.rs b/framework/base/src/types/interaction/system_proxy/system_sc_proxy_legacy.rs
similarity index 98%
rename from framework/base/src/esdt/system_sc_proxy.rs
rename to framework/base/src/types/interaction/system_proxy/system_sc_proxy_legacy.rs
index 62182eeb1a..4422b5b7b1 100644
--- a/framework/base/src/esdt/system_sc_proxy.rs
+++ b/framework/base/src/types/interaction/system_proxy/system_sc_proxy_legacy.rs
@@ -1,20 +1,18 @@
 use core::marker::PhantomData;
 
-use super::properties::*;
+// use super::properties::*;
 use hex_literal::hex;
 
 use crate::{
     api::{CallTypeApi, SendApi},
+    proxy_imports::SystemSCAddress,
     types::{
         BigUint, ContractCall, ContractCallNoPayment, ContractCallWithEgld, EsdtLocalRole,
         EsdtTokenType, ManagedAddress, ManagedBuffer, TokenIdentifier,
     },
 };
 
-/// Address of the system smart contract that manages ESDT.
-/// Bech32: erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u
-pub const ESDT_SYSTEM_SC_ADDRESS_ARRAY: [u8; 32] =
-    hex!("000000000000000000010000000000000000000000000000000000000002ffff");
+use super::token_properties::*;
 
 const ISSUE_FUNGIBLE_ENDPOINT_NAME: &str = "issue";
 const ISSUE_NON_FUNGIBLE_ENDPOINT_NAME: &str = "issueNonFungible";
@@ -25,6 +23,10 @@ const ISSUE_AND_SET_ALL_ROLES_ENDPOINT_NAME: &str = "registerAndSetAllRoles";
 /// Proxy for the ESDT system smart contract.
 /// Unlike other contract proxies, this one has a fixed address,
 /// so the proxy object doesn't really contain any data, it is more of a placeholder.
+#[deprecated(
+    since = "0.48.0",
+    note = "There is a new `SystemSCProxy`, which uses the new proxy model."
+)]
 pub struct ESDTSystemSmartContractProxy<SA>
 where
     SA: SendApi + 'static,
@@ -470,7 +472,7 @@ where
     }
 
     pub fn esdt_system_sc_address(&self) -> ManagedAddress<SA> {
-        ManagedAddress::new_from_bytes(&ESDT_SYSTEM_SC_ADDRESS_ARRAY)
+        SystemSCAddress.managed_address()
     }
 
     fn esdt_system_sc_call_no_args(
diff --git a/framework/base/src/esdt/properties.rs b/framework/base/src/types/interaction/system_proxy/token_properties.rs
similarity index 100%
rename from framework/base/src/esdt/properties.rs
rename to framework/base/src/types/interaction/system_proxy/token_properties.rs
diff --git a/framework/base/src/types/interaction/tx.rs b/framework/base/src/types/interaction/tx.rs
index 04f101347c..ceef2eba10 100644
--- a/framework/base/src/types/interaction/tx.rs
+++ b/framework/base/src/types/interaction/tx.rs
@@ -1,11 +1,10 @@
 use crate::{
     api::CallTypeApi,
     contract_base::BlockchainWrapper,
-    proxy_imports::EgldOrMultiEsdtPayment,
     types::{
-        BigUint, CodeMetadata, EgldOrEsdtTokenPayment, EgldOrMultiEsdtPaymentRefs,
-        EsdtTokenPayment, EsdtTokenPaymentRefs, ManagedAddress, ManagedBuffer, ManagedOption,
-        ManagedVec, MultiEsdtPayment, TokenIdentifier,
+        BigUint, CodeMetadata, EgldOrEsdtTokenPayment, EgldOrMultiEsdtPayment,
+        EgldOrMultiEsdtPaymentRefs, EsdtTokenPayment, EsdtTokenPaymentRefs, ManagedAddress,
+        ManagedBuffer, ManagedOption, ManagedVec, MultiEsdtPayment, TokenIdentifier,
     },
 };
 
diff --git a/framework/base/src/types/interaction/tx_exec/tx_exec_async.rs b/framework/base/src/types/interaction/tx_exec/tx_exec_async.rs
index 02f145f635..238b978139 100644
--- a/framework/base/src/types/interaction/tx_exec/tx_exec_async.rs
+++ b/framework/base/src/types/interaction/tx_exec/tx_exec_async.rs
@@ -2,8 +2,9 @@ use crate::{
     api::{CallTypeApi, StorageWriteApi},
     contract_base::SendRawWrapper,
     types::{
-        CallbackClosure, OriginalResultMarker, Tx, TxData, TxDataFunctionCall, TxEnv, TxFrom,
-        TxGas, TxPayment, TxResultHandler, TxScEnv, TxTo, TxToSpecified,
+        CallbackClosure, OriginalResultMarker, Tx, TxData, TxDataFunctionCall,
+        TxEmptyResultHandler, TxEnv, TxFrom, TxGas, TxPayment, TxResultHandler, TxScEnv, TxTo,
+        TxToSpecified,
     },
 };
 
@@ -62,13 +63,14 @@ where
     }
 }
 
-impl<Api, To, Payment, Gas, Data> Tx<TxScEnv<Api>, (), To, Payment, Gas, Data, ()>
+impl<Api, To, Payment, Gas, Data, EmptyRH> Tx<TxScEnv<Api>, (), To, Payment, Gas, Data, EmptyRH>
 where
     Api: CallTypeApi,
     To: TxTo<TxScEnv<Api>>,
     Payment: TxPayment<TxScEnv<Api>>,
     Gas: TxGas<TxScEnv<Api>>,
     Data: TxData<TxScEnv<Api>>,
+    EmptyRH: TxEmptyResultHandler<TxScEnv<Api>>,
 {
     #[inline]
     pub fn callback<RH>(self, callback: RH) -> Tx<TxScEnv<Api>, (), To, Payment, Gas, Data, RH>
@@ -87,14 +89,14 @@ where
     }
 }
 
-impl<Api, To, Payment, Gas, FC, OriginalResult>
-    Tx<TxScEnv<Api>, (), To, Payment, Gas, FC, OriginalResultMarker<OriginalResult>>
+impl<Api, To, Payment, Gas, FC, EmptyRH> Tx<TxScEnv<Api>, (), To, Payment, Gas, FC, EmptyRH>
 where
     Api: CallTypeApi,
     To: TxToSpecified<TxScEnv<Api>>,
     Payment: TxPayment<TxScEnv<Api>>,
     Gas: TxGas<TxScEnv<Api>>,
     FC: TxDataFunctionCall<TxScEnv<Api>>,
+    EmptyRH: TxEmptyResultHandler<TxScEnv<Api>>,
 {
     /// Backwards compatibility.
     pub fn with_callback<RH>(self, callback: RH) -> Tx<TxScEnv<Api>, (), To, Payment, Gas, FC, RH>
diff --git a/framework/base/src/types/interaction/tx_payment/tx_payment_egld_or_multi_esdt.rs b/framework/base/src/types/interaction/tx_payment/tx_payment_egld_or_multi_esdt.rs
index 6cfcbb4a3c..3ed53b9b8a 100644
--- a/framework/base/src/types/interaction/tx_payment/tx_payment_egld_or_multi_esdt.rs
+++ b/framework/base/src/types/interaction/tx_payment/tx_payment_egld_or_multi_esdt.rs
@@ -3,10 +3,9 @@ use alloc::borrow::ToOwned;
 use crate::{
     api::ManagedTypeApi,
     contract_base::SendRawWrapper,
-    proxy_imports::{AnnotatedValue, EgldOrMultiEsdtPayment, ManagedType},
     types::{
-        BigUint, EsdtTokenPayment, EsdtTokenPaymentRefs, ManagedAddress, ManagedVec,
-        MultiEsdtPayment, TxFrom, TxToSpecified,
+        AnnotatedValue, BigUint, EgldOrMultiEsdtPayment, EsdtTokenPayment, EsdtTokenPaymentRefs,
+        ManagedAddress, ManagedType, ManagedVec, MultiEsdtPayment, TxFrom, TxToSpecified,
     },
 };
 
diff --git a/framework/base/src/types/interaction/tx_payment/tx_payment_egld_or_multi_esdt_ref.rs b/framework/base/src/types/interaction/tx_payment/tx_payment_egld_or_multi_esdt_ref.rs
index 2c587cd448..06bda77eb3 100644
--- a/framework/base/src/types/interaction/tx_payment/tx_payment_egld_or_multi_esdt_ref.rs
+++ b/framework/base/src/types/interaction/tx_payment/tx_payment_egld_or_multi_esdt_ref.rs
@@ -3,11 +3,9 @@ use alloc::borrow::ToOwned;
 use crate::{
     api::ManagedTypeApi,
     contract_base::SendRawWrapper,
-    proxy_imports::{
-        AnnotatedValue, EgldOrMultiEsdtPayment, EgldOrMultiEsdtPaymentRefs, ManagedType,
-    },
     types::{
-        BigUint, EsdtTokenPayment, EsdtTokenPaymentRefs, ManagedAddress, ManagedVec,
+        AnnotatedValue, BigUint, EgldOrMultiEsdtPayment, EgldOrMultiEsdtPaymentRefs,
+        EsdtTokenPayment, EsdtTokenPaymentRefs, ManagedAddress, ManagedType, ManagedVec,
         MultiEsdtPayment, TxFrom, TxToSpecified,
     },
 };
diff --git a/framework/base/src/types/interaction/tx_payment/tx_payment_multi_esdt.rs b/framework/base/src/types/interaction/tx_payment/tx_payment_multi_esdt.rs
index fe0b23ef02..33543e51d4 100644
--- a/framework/base/src/types/interaction/tx_payment/tx_payment_multi_esdt.rs
+++ b/framework/base/src/types/interaction/tx_payment/tx_payment_multi_esdt.rs
@@ -2,8 +2,9 @@ use core::ops::Deref;
 
 use crate::{
     contract_base::SendRawWrapper,
-    proxy_imports::ManagedRef,
-    types::{BigUint, ManagedAddress, ManagedVec, MultiEsdtPayment, TxFrom, TxToSpecified},
+    types::{
+        BigUint, ManagedAddress, ManagedRef, ManagedVec, MultiEsdtPayment, TxFrom, TxToSpecified,
+    },
 };
 
 use super::{AnnotatedEgldPayment, FullPaymentData, FunctionCall, TxEgldValue, TxEnv, TxPayment};

From 6d92e45114855a64b3ec58bb852052508f3f20da Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Mon, 1 Apr 2024 13:07:43 +0300
Subject: [PATCH 0610/1254] moved UserBuiltinProxy to framework

---
 .../src/builtin_func_features.rs                     | 12 ++++--------
 framework/base/src/types/interaction/system_proxy.rs |  2 ++
 .../interaction/system_proxy}/builtin_func_proxy.rs  | 12 ++----------
 3 files changed, 8 insertions(+), 18 deletions(-)
 rename {contracts/feature-tests/composability/builtin-func-features/src => framework/base/src/types/interaction/system_proxy}/builtin_func_proxy.rs (81%)

diff --git a/contracts/feature-tests/composability/builtin-func-features/src/builtin_func_features.rs b/contracts/feature-tests/composability/builtin-func-features/src/builtin_func_features.rs
index dd4183bb94..de33932a9e 100644
--- a/contracts/feature-tests/composability/builtin-func-features/src/builtin_func_features.rs
+++ b/contracts/feature-tests/composability/builtin-func-features/src/builtin_func_features.rs
@@ -1,7 +1,5 @@
 #![no_std]
 
-pub mod builtin_func_proxy;
-
 multiversx_sc::imports!();
 
 /// Test contract for investigating async calls.
@@ -14,19 +12,17 @@ pub trait BuiltinFuncFeatures {
     fn call_set_user_name(&self, address: ManagedAddress, name: ManagedBuffer) {
         self.tx()
             .to(&address)
-            .typed(builtin_func_proxy::UserBuiltinProxy)
+            .typed(system_proxy::UserBuiltinProxy)
             .set_user_name(name)
-            .async_call()
-            .call_and_exit()
+            .async_call_and_exit()
     }
 
     #[endpoint]
     fn call_delete_user_name(&self, address: ManagedAddress) {
         self.tx()
             .to(&address)
-            .typed(builtin_func_proxy::UserBuiltinProxy)
+            .typed(system_proxy::UserBuiltinProxy)
             .delete_user_name()
-            .async_call()
-            .call_and_exit()
+            .async_call_and_exit()
     }
 }
diff --git a/framework/base/src/types/interaction/system_proxy.rs b/framework/base/src/types/interaction/system_proxy.rs
index 1388554af4..6cbb764ed0 100644
--- a/framework/base/src/types/interaction/system_proxy.rs
+++ b/framework/base/src/types/interaction/system_proxy.rs
@@ -1,6 +1,8 @@
+mod builtin_func_proxy;
 mod system_sc_proxy;
 mod system_sc_proxy_legacy;
 pub(crate) mod token_properties;
 
+pub use builtin_func_proxy::*;
 pub use system_sc_proxy::*;
 pub use token_properties::*;
diff --git a/contracts/feature-tests/composability/builtin-func-features/src/builtin_func_proxy.rs b/framework/base/src/types/interaction/system_proxy/builtin_func_proxy.rs
similarity index 81%
rename from contracts/feature-tests/composability/builtin-func-features/src/builtin_func_proxy.rs
rename to framework/base/src/types/interaction/system_proxy/builtin_func_proxy.rs
index 8d7d106f66..65501c2fcf 100644
--- a/contracts/feature-tests/composability/builtin-func-features/src/builtin_func_proxy.rs
+++ b/framework/base/src/types/interaction/system_proxy/builtin_func_proxy.rs
@@ -1,14 +1,6 @@
-// Code generated by the multiversx-sc proxy generator. DO NOT EDIT.
-
-////////////////////////////////////////////////////
-////////////////// AUTO-GENERATED //////////////////
-////////////////////////////////////////////////////
-
-#![allow(dead_code)]
-#![allow(clippy::all)]
-
-use multiversx_sc::proxy_imports::*;
+use crate::proxy_imports::*;
 
+/// Proxy describing the user builtin function signatures.
 pub struct UserBuiltinProxy;
 
 impl<Env, From, To, Gas> TxProxyTrait<Env, From, To, Gas> for UserBuiltinProxy

From be2e14d611edcdcde382469f687007cac294bb4a Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Mon, 1 Apr 2024 13:24:48 +0300
Subject: [PATCH 0611/1254] renamed SystemSC* -> ESDTSystemSC*

---
 .../contract_base/wrappers/send_wrapper.rs    | 16 +++++++-------
 .../mappers/token/fungible_token_mapper.rs    | 12 +++++-----
 .../token/non_fungible_token_mapper.rs        | 22 +++++++++----------
 .../src/storage/mappers/token/token_mapper.rs |  8 +++----
 .../base/src/types/interaction/markers.rs     |  4 ++--
 ...c_address.rs => esdt_system_sc_address.rs} | 12 +++++-----
 .../src/types/interaction/system_proxy.rs     |  6 ++---
 ...em_sc_proxy.rs => esdt_system_sc_proxy.rs} |  5 +++--
 ...xy_legacy.rs => legacy_system_sc_proxy.rs} |  6 ++---
 9 files changed, 46 insertions(+), 45 deletions(-)
 rename framework/base/src/types/interaction/markers/{system_sc_address.rs => esdt_system_sc_address.rs} (80%)
 rename framework/base/src/types/interaction/system_proxy/{system_sc_proxy.rs => esdt_system_sc_proxy.rs} (99%)
 rename framework/base/src/types/interaction/system_proxy/{system_sc_proxy_legacy.rs => legacy_system_sc_proxy.rs} (99%)

diff --git a/framework/base/src/contract_base/wrappers/send_wrapper.rs b/framework/base/src/contract_base/wrappers/send_wrapper.rs
index 0e809ebd51..0aef9b589f 100644
--- a/framework/base/src/contract_base/wrappers/send_wrapper.rs
+++ b/framework/base/src/contract_base/wrappers/send_wrapper.rs
@@ -12,10 +12,10 @@ use crate::{
     },
     codec,
     types::{
-        system_proxy, system_proxy::SystemSCProxy, BigUint, ContractCall, ContractCallNoPayment,
-        EgldOrEsdtTokenIdentifier, EsdtTokenPayment, GasLeft, ManagedAddress, ManagedArgBuffer,
-        ManagedBuffer, ManagedType, ManagedVec, ReturnsRawResult, SystemSCAddress, ToSelf,
-        TokenIdentifier, Tx, TxScEnv,
+        system_proxy, system_proxy::ESDTSystemSCProxy, BigUint, ContractCall,
+        ContractCallNoPayment, ESDTSystemSCAddress, EgldOrEsdtTokenIdentifier, EsdtTokenPayment,
+        GasLeft, ManagedAddress, ManagedArgBuffer, ManagedBuffer, ManagedType, ManagedVec,
+        ReturnsRawResult, ToSelf, TokenIdentifier, Tx, TxScEnv,
     },
 };
 
@@ -54,7 +54,7 @@ where
     /// Backwards compatibility, synonymous to `esdt_system_sc_tx`, which is the more appropriate name now.
     pub fn esdt_system_sc_proxy(
         &self,
-    ) -> system_proxy::SystemSCProxyMethods<TxScEnv<A>, (), SystemSCAddress, ()> {
+    ) -> system_proxy::SystemSCProxyMethods<TxScEnv<A>, (), ESDTSystemSCAddress, ()> {
         self.esdt_system_sc_tx()
     }
 
@@ -62,10 +62,10 @@ where
     /// It has the destination address set, as well as the contract type (as specified in the proxy).
     pub fn esdt_system_sc_tx(
         &self,
-    ) -> system_proxy::SystemSCProxyMethods<TxScEnv<A>, (), SystemSCAddress, ()> {
+    ) -> system_proxy::SystemSCProxyMethods<TxScEnv<A>, (), ESDTSystemSCAddress, ()> {
         Tx::new_tx_from_sc()
-            .to(SystemSCAddress)
-            .typed(SystemSCProxy)
+            .to(ESDTSystemSCAddress)
+            .typed(ESDTSystemSCProxy)
     }
 
     /// Convenient way to quickly instance a minimal contract call (with no EGLD, no arguments, etc.)
diff --git a/framework/base/src/storage/mappers/token/fungible_token_mapper.rs b/framework/base/src/storage/mappers/token/fungible_token_mapper.rs
index 5e1d3dd222..f24e6139bf 100644
--- a/framework/base/src/storage/mappers/token/fungible_token_mapper.rs
+++ b/framework/base/src/storage/mappers/token/fungible_token_mapper.rs
@@ -4,8 +4,8 @@ use crate::{
     codec::{CodecFrom, EncodeErrorHandler, TopEncodeMulti, TopEncodeMultiOutput},
     storage_clear, storage_get, storage_set,
     types::{
-        system_proxy::{FungibleTokenProperties, SystemSCProxy},
-        SystemSCAddress, Tx,
+        system_proxy::{ESDTSystemSCProxy, FungibleTokenProperties},
+        ESDTSystemSCAddress, Tx,
     },
 };
 
@@ -127,8 +127,8 @@ where
 
         storage_set(self.get_storage_key(), &TokenMapperState::<SA>::Pending);
         Tx::new_tx_from_sc()
-            .to(SystemSCAddress)
-            .typed(SystemSCProxy)
+            .to(ESDTSystemSCAddress)
+            .typed(ESDTSystemSCProxy)
             .issue_fungible(
                 issue_cost,
                 &token_display_name,
@@ -175,8 +175,8 @@ where
 
         storage_set(self.get_storage_key(), &TokenMapperState::<SA>::Pending);
         Tx::new_tx_from_sc()
-            .to(SystemSCAddress)
-            .typed(SystemSCProxy)
+            .to(ESDTSystemSCAddress)
+            .typed(ESDTSystemSCProxy)
             .issue_and_set_all_roles(
                 issue_cost,
                 token_display_name,
diff --git a/framework/base/src/storage/mappers/token/non_fungible_token_mapper.rs b/framework/base/src/storage/mappers/token/non_fungible_token_mapper.rs
index 4a32900093..666776e88b 100644
--- a/framework/base/src/storage/mappers/token/non_fungible_token_mapper.rs
+++ b/framework/base/src/storage/mappers/token/non_fungible_token_mapper.rs
@@ -4,8 +4,8 @@ use crate::{
     },
     storage_clear, storage_get, storage_set,
     types::{
-        system_proxy::SystemSCProxy, EgldPayment, FunctionCall, OriginalResultMarker,
-        SystemSCAddress, Tx, TxScEnv,
+        system_proxy::ESDTSystemSCProxy, ESDTSystemSCAddress, EgldPayment, FunctionCall,
+        OriginalResultMarker, Tx, TxScEnv,
     },
 };
 
@@ -34,7 +34,7 @@ const INVALID_TOKEN_TYPE_ERR_MSG: &[u8] = b"Invalid token type for NonFungible i
 pub type IssueCallTo<Api> = Tx<
     TxScEnv<Api>,
     (),
-    SystemSCAddress,
+    ESDTSystemSCAddress,
     EgldPayment<Api>,
     (),
     FunctionCall<Api>,
@@ -192,8 +192,8 @@ where
 
         storage_set(self.get_storage_key(), &TokenMapperState::<SA>::Pending);
         Tx::new_tx_from_sc()
-            .to(SystemSCAddress)
-            .typed(SystemSCProxy)
+            .to(ESDTSystemSCAddress)
+            .typed(ESDTSystemSCProxy)
             .issue_and_set_all_roles(
                 issue_cost,
                 token_display_name,
@@ -230,8 +230,8 @@ where
         token_ticker: ManagedBuffer<SA>,
     ) -> IssueCallTo<SA> {
         Tx::new_tx_from_sc()
-            .to(SystemSCAddress)
-            .typed(SystemSCProxy)
+            .to(ESDTSystemSCAddress)
+            .typed(ESDTSystemSCProxy)
             .issue_non_fungible(
                 issue_cost,
                 &token_display_name,
@@ -246,8 +246,8 @@ where
         token_ticker: ManagedBuffer<SA>,
     ) -> IssueCallTo<SA> {
         Tx::new_tx_from_sc()
-            .to(SystemSCAddress)
-            .typed(SystemSCProxy)
+            .to(ESDTSystemSCAddress)
+            .typed(ESDTSystemSCProxy)
             .issue_semi_fungible(
                 issue_cost,
                 &token_display_name,
@@ -268,8 +268,8 @@ where
         };
 
         Tx::new_tx_from_sc()
-            .to(SystemSCAddress)
-            .typed(SystemSCProxy)
+            .to(ESDTSystemSCAddress)
+            .typed(ESDTSystemSCProxy)
             .register_meta_esdt(issue_cost, &token_display_name, &token_ticker, properties)
     }
 
diff --git a/framework/base/src/storage/mappers/token/token_mapper.rs b/framework/base/src/storage/mappers/token/token_mapper.rs
index 965b5209e3..d9d923c2f8 100644
--- a/framework/base/src/storage/mappers/token/token_mapper.rs
+++ b/framework/base/src/storage/mappers/token/token_mapper.rs
@@ -4,8 +4,8 @@ use crate::{
     storage::StorageKey,
     storage_get, storage_get_len, storage_set,
     types::{
-        system_proxy::SystemSCProxy, CallbackClosure, EsdtLocalRole, EsdtTokenPayment,
-        ManagedAddress, ManagedRef, ManagedVec, SystemSCAddress, TokenIdentifier, Tx,
+        system_proxy::ESDTSystemSCProxy, CallbackClosure, ESDTSystemSCAddress, EsdtLocalRole,
+        EsdtTokenPayment, ManagedAddress, ManagedRef, ManagedVec, TokenIdentifier, Tx,
     },
 };
 
@@ -82,8 +82,8 @@ where
 
         let token_id = self.get_token_id_ref();
         Tx::new_tx_from_sc()
-            .to(SystemSCAddress)
-            .typed(SystemSCProxy)
+            .to(ESDTSystemSCAddress)
+            .typed(ESDTSystemSCProxy)
             .set_special_roles(address, token_id, roles[..].iter().cloned())
             .callback(opt_callback)
             .call_and_exit()
diff --git a/framework/base/src/types/interaction/markers.rs b/framework/base/src/types/interaction/markers.rs
index 751ef755e7..4ebce757cc 100644
--- a/framework/base/src/types/interaction/markers.rs
+++ b/framework/base/src/types/interaction/markers.rs
@@ -1,9 +1,9 @@
+mod esdt_system_sc_address;
 mod gas_left;
-mod system_sc_address;
 mod to_caller;
 mod to_self;
 
+pub use esdt_system_sc_address::ESDTSystemSCAddress;
 pub use gas_left::GasLeft;
-pub use system_sc_address::SystemSCAddress;
 pub use to_caller::ToCaller;
 pub use to_self::ToSelf;
diff --git a/framework/base/src/types/interaction/markers/system_sc_address.rs b/framework/base/src/types/interaction/markers/esdt_system_sc_address.rs
similarity index 80%
rename from framework/base/src/types/interaction/markers/system_sc_address.rs
rename to framework/base/src/types/interaction/markers/esdt_system_sc_address.rs
index 2365bacdd3..de8aadb1b6 100644
--- a/framework/base/src/types/interaction/markers/system_sc_address.rs
+++ b/framework/base/src/types/interaction/markers/esdt_system_sc_address.rs
@@ -18,9 +18,9 @@ const SYSTEM_SC_ADDRESS_ANNOTATION: &str =
     "bech32:erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u";
 
 /// Indicates the system SC address, which is the same on any MultiversX blockchain.
-pub struct SystemSCAddress;
+pub struct ESDTSystemSCAddress;
 
-impl SystemSCAddress {
+impl ESDTSystemSCAddress {
     pub fn managed_address<Api>(self) -> ManagedAddress<Api>
     where
         Api: ManagedTypeApi,
@@ -29,7 +29,7 @@ impl SystemSCAddress {
     }
 }
 
-impl<Api> AnnotatedValue<TxScEnv<Api>, ManagedAddress<Api>> for SystemSCAddress
+impl<Api> AnnotatedValue<TxScEnv<Api>, ManagedAddress<Api>> for ESDTSystemSCAddress
 where
     Api: CallTypeApi,
 {
@@ -38,9 +38,9 @@ where
     }
 
     fn to_value(&self, _env: &TxScEnv<Api>) -> ManagedAddress<Api> {
-        SystemSCAddress.managed_address()
+        ESDTSystemSCAddress.managed_address()
     }
 }
 
-impl<Api> TxTo<TxScEnv<Api>> for SystemSCAddress where Api: CallTypeApi {}
-impl<Api> TxToSpecified<TxScEnv<Api>> for SystemSCAddress where Api: CallTypeApi {}
+impl<Api> TxTo<TxScEnv<Api>> for ESDTSystemSCAddress where Api: CallTypeApi {}
+impl<Api> TxToSpecified<TxScEnv<Api>> for ESDTSystemSCAddress where Api: CallTypeApi {}
diff --git a/framework/base/src/types/interaction/system_proxy.rs b/framework/base/src/types/interaction/system_proxy.rs
index 6cbb764ed0..4963c5f86a 100644
--- a/framework/base/src/types/interaction/system_proxy.rs
+++ b/framework/base/src/types/interaction/system_proxy.rs
@@ -1,8 +1,8 @@
 mod builtin_func_proxy;
-mod system_sc_proxy;
-mod system_sc_proxy_legacy;
+mod esdt_system_sc_proxy;
+mod legacy_system_sc_proxy;
 pub(crate) mod token_properties;
 
 pub use builtin_func_proxy::*;
-pub use system_sc_proxy::*;
+pub use esdt_system_sc_proxy::*;
 pub use token_properties::*;
diff --git a/framework/base/src/types/interaction/system_proxy/system_sc_proxy.rs b/framework/base/src/types/interaction/system_proxy/esdt_system_sc_proxy.rs
similarity index 99%
rename from framework/base/src/types/interaction/system_proxy/system_sc_proxy.rs
rename to framework/base/src/types/interaction/system_proxy/esdt_system_sc_proxy.rs
index 96c5a72ca0..cea5add845 100644
--- a/framework/base/src/types/interaction/system_proxy/system_sc_proxy.rs
+++ b/framework/base/src/types/interaction/system_proxy/esdt_system_sc_proxy.rs
@@ -19,6 +19,7 @@ const ISSUE_SEMI_FUNGIBLE_ENDPOINT_NAME: &str = "issueSemiFungible";
 const REGISTER_META_ESDT_ENDPOINT_NAME: &str = "registerMetaESDT";
 const ISSUE_AND_SET_ALL_ROLES_ENDPOINT_NAME: &str = "registerAndSetAllRoles";
 
+/// The specific `Tx` type produces by the issue operations of the ESDTSystemSCProxy.
 pub type IssueCall<Env, From, To, Gas> = Tx<
     Env,
     From,
@@ -30,9 +31,9 @@ pub type IssueCall<Env, From, To, Gas> = Tx<
 >;
 
 /// Proxy for the ESDT system smart contract.
-pub struct SystemSCProxy;
+pub struct ESDTSystemSCProxy;
 
-impl<Env, From, To, Gas> TxProxyTrait<Env, From, To, Gas> for SystemSCProxy
+impl<Env, From, To, Gas> TxProxyTrait<Env, From, To, Gas> for ESDTSystemSCProxy
 where
     Env: TxEnv,
     From: TxFrom<Env>,
diff --git a/framework/base/src/types/interaction/system_proxy/system_sc_proxy_legacy.rs b/framework/base/src/types/interaction/system_proxy/legacy_system_sc_proxy.rs
similarity index 99%
rename from framework/base/src/types/interaction/system_proxy/system_sc_proxy_legacy.rs
rename to framework/base/src/types/interaction/system_proxy/legacy_system_sc_proxy.rs
index 4422b5b7b1..b161b28575 100644
--- a/framework/base/src/types/interaction/system_proxy/system_sc_proxy_legacy.rs
+++ b/framework/base/src/types/interaction/system_proxy/legacy_system_sc_proxy.rs
@@ -5,7 +5,7 @@ use hex_literal::hex;
 
 use crate::{
     api::{CallTypeApi, SendApi},
-    proxy_imports::SystemSCAddress,
+    proxy_imports::ESDTSystemSCAddress,
     types::{
         BigUint, ContractCall, ContractCallNoPayment, ContractCallWithEgld, EsdtLocalRole,
         EsdtTokenType, ManagedAddress, ManagedBuffer, TokenIdentifier,
@@ -25,7 +25,7 @@ const ISSUE_AND_SET_ALL_ROLES_ENDPOINT_NAME: &str = "registerAndSetAllRoles";
 /// so the proxy object doesn't really contain any data, it is more of a placeholder.
 #[deprecated(
     since = "0.48.0",
-    note = "There is a new `SystemSCProxy`, which uses the new proxy model."
+    note = "There is a new `ESDTSystemSCProxy`, which uses the new proxy model."
 )]
 pub struct ESDTSystemSmartContractProxy<SA>
 where
@@ -472,7 +472,7 @@ where
     }
 
     pub fn esdt_system_sc_address(&self) -> ManagedAddress<SA> {
-        SystemSCAddress.managed_address()
+        ESDTSystemSCAddress.managed_address()
     }
 
     fn esdt_system_sc_call_no_args(

From 6b14ba3005866a35225e67f16f23c9a605ef4629 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Mon, 1 Apr 2024 13:29:08 +0300
Subject: [PATCH 0612/1254] formatter test fix

---
 tools/rust-debugger/format-tests/src/format_tests.rs | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/tools/rust-debugger/format-tests/src/format_tests.rs b/tools/rust-debugger/format-tests/src/format_tests.rs
index 9595691c66..913851dbfa 100644
--- a/tools/rust-debugger/format-tests/src/format_tests.rs
+++ b/tools/rust-debugger/format-tests/src/format_tests.rs
@@ -1,14 +1,14 @@
 use multiversx_sc::{
     codec::multi_types::OptionalValue,
-    esdt::ESDTSystemSmartContractProxy,
     types::{
         heap::{Address, BoxedBytes},
-        BigFloat, BigInt, BigUint, EgldOrEsdtTokenIdentifier, EsdtTokenPayment, ManagedAddress,
-        ManagedBuffer, ManagedByteArray, ManagedOption, ManagedType, ManagedVec, TokenIdentifier,
+        BigFloat, BigInt, BigUint, ESDTSystemSCAddress, EgldOrEsdtTokenIdentifier,
+        EsdtTokenPayment, ManagedAddress, ManagedBuffer, ManagedByteArray, ManagedOption,
+        ManagedType, ManagedVec, TokenIdentifier,
     },
 };
 use multiversx_sc_scenario::{
-    api::{DebugHandle, DebugApi},
+    api::{DebugApi, DebugHandle},
     num_bigint::{BigInt as RustBigInt, BigUint as RustBigUint},
 };
 
@@ -65,8 +65,7 @@ fn main() {
     let token_identifier: TokenIdentifier<DebugApi> = TokenIdentifier::from("MYTOK-123456");
     push!(to_check, token_identifier, "\"MYTOK-123456\"");
 
-    let system_sc = ESDTSystemSmartContractProxy::<DebugApi>::new_proxy_obj();
-    let managed_address = system_sc.esdt_system_sc_address();
+    let managed_address = ESDTSystemSCAddress.managed_address::<DebugApi>();
     push!(
         to_check,
         managed_address,

From 464b6644df96a2a386586f2694715fb0a89933ec Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Mon, 1 Apr 2024 13:33:40 +0300
Subject: [PATCH 0613/1254] renamed SystemSC* -> ESDTSystemSC*

---
 .../src/contract_base/wrappers/send_wrapper.rs     | 14 +++++++-------
 .../system_proxy/esdt_system_sc_proxy.rs           |  9 +++++----
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/framework/base/src/contract_base/wrappers/send_wrapper.rs b/framework/base/src/contract_base/wrappers/send_wrapper.rs
index 0aef9b589f..e902c47d76 100644
--- a/framework/base/src/contract_base/wrappers/send_wrapper.rs
+++ b/framework/base/src/contract_base/wrappers/send_wrapper.rs
@@ -12,10 +12,10 @@ use crate::{
     },
     codec,
     types::{
-        system_proxy, system_proxy::ESDTSystemSCProxy, BigUint, ContractCall,
-        ContractCallNoPayment, ESDTSystemSCAddress, EgldOrEsdtTokenIdentifier, EsdtTokenPayment,
-        GasLeft, ManagedAddress, ManagedArgBuffer, ManagedBuffer, ManagedType, ManagedVec,
-        ReturnsRawResult, ToSelf, TokenIdentifier, Tx, TxScEnv,
+        system_proxy, BigUint, ContractCall, ContractCallNoPayment, ESDTSystemSCAddress,
+        EgldOrEsdtTokenIdentifier, EsdtTokenPayment, GasLeft, ManagedAddress, ManagedArgBuffer,
+        ManagedBuffer, ManagedType, ManagedVec, ReturnsRawResult, ToSelf, TokenIdentifier, Tx,
+        TxScEnv,
     },
 };
 
@@ -54,7 +54,7 @@ where
     /// Backwards compatibility, synonymous to `esdt_system_sc_tx`, which is the more appropriate name now.
     pub fn esdt_system_sc_proxy(
         &self,
-    ) -> system_proxy::SystemSCProxyMethods<TxScEnv<A>, (), ESDTSystemSCAddress, ()> {
+    ) -> system_proxy::ESDTSystemSCProxyMethods<TxScEnv<A>, (), ESDTSystemSCAddress, ()> {
         self.esdt_system_sc_tx()
     }
 
@@ -62,10 +62,10 @@ where
     /// It has the destination address set, as well as the contract type (as specified in the proxy).
     pub fn esdt_system_sc_tx(
         &self,
-    ) -> system_proxy::SystemSCProxyMethods<TxScEnv<A>, (), ESDTSystemSCAddress, ()> {
+    ) -> system_proxy::ESDTSystemSCProxyMethods<TxScEnv<A>, (), ESDTSystemSCAddress, ()> {
         Tx::new_tx_from_sc()
             .to(ESDTSystemSCAddress)
-            .typed(ESDTSystemSCProxy)
+            .typed(system_proxy::ESDTSystemSCProxy)
     }
 
     /// Convenient way to quickly instance a minimal contract call (with no EGLD, no arguments, etc.)
diff --git a/framework/base/src/types/interaction/system_proxy/esdt_system_sc_proxy.rs b/framework/base/src/types/interaction/system_proxy/esdt_system_sc_proxy.rs
index cea5add845..ebb76b2a52 100644
--- a/framework/base/src/types/interaction/system_proxy/esdt_system_sc_proxy.rs
+++ b/framework/base/src/types/interaction/system_proxy/esdt_system_sc_proxy.rs
@@ -40,14 +40,15 @@ where
     To: TxTo<Env>,
     Gas: TxGas<Env>,
 {
-    type TxProxyMethods = SystemSCProxyMethods<Env, From, To, Gas>;
+    type TxProxyMethods = ESDTSystemSCProxyMethods<Env, From, To, Gas>;
 
     fn proxy_methods(self, tx: Tx<Env, From, To, (), Gas, (), ()>) -> Self::TxProxyMethods {
-        SystemSCProxyMethods { wrapped_tx: tx }
+        ESDTSystemSCProxyMethods { wrapped_tx: tx }
     }
 }
 
-pub struct SystemSCProxyMethods<Env, From, To, Gas>
+/// Method container of the ESDT system smart contract proxy.
+pub struct ESDTSystemSCProxyMethods<Env, From, To, Gas>
 where
     Env: TxEnv,
     From: TxFrom<Env>,
@@ -57,7 +58,7 @@ where
     wrapped_tx: Tx<Env, From, To, (), Gas, (), ()>,
 }
 
-impl<Env, From, To, Gas> SystemSCProxyMethods<Env, From, To, Gas>
+impl<Env, From, To, Gas> ESDTSystemSCProxyMethods<Env, From, To, Gas>
 where
     Env: TxEnv,
     From: TxFrom<Env>,

From 310848923855d88c1c85aade8d085f3ecc906f1f Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Mon, 1 Apr 2024 14:00:50 +0300
Subject: [PATCH 0614/1254] unified syntax - raw call function name arg

---
 contracts/examples/adder/src/adder_proxy.rs   |  31 ++-
 .../src/crowdfunding_esdt_proxy.rs            |  75 +++----
 .../src/proxy_crypto_zombies.rs               |  72 +++----
 .../digital-cash/src/digital_cash_proxy.rs    |  50 ++---
 .../src/nft_marketplace_proxy.rs              |   3 +-
 .../examples/multisig/src/multisig_proxy.rs   | 112 +++++------
 .../nft-minter/src/nft_marketplace_proxy.rs   |   3 +-
 .../proxy-pause/src/pause_sc_proxy.rs         |   6 +-
 .../src/seed_nft_minter_proxy.rs              |  38 ++--
 .../src/nft_marketplace_proxy.rs              |   3 +-
 .../feature-tests/abi-tester/src/abi_proxy.rs | 187 ++++++++++--------
 .../basic-features/src/codec_err_test.rs      |   2 +-
 .../parent/src/child_proxy.rs                 |   6 +-
 .../forwarder-raw/src/forwarder_raw_sync.rs   |   3 +-
 .../forwarder/src/vault_proxy.rs              |  48 ++---
 .../promises-features/src/vault_proxy.rs      |  48 ++---
 .../proxy-test-first/src/message_me_proxy.rs  |   3 +-
 .../proxy-test-first/src/pay_me_proxy.rs      |   6 +-
 .../recursive-caller/src/self_proxy.rs        |   3 +-
 .../recursive-caller/src/vault_proxy.rs       |  48 ++---
 .../panic-message-features/tests/pmf_proxy.rs |  20 +-
 .../contract_base/wrappers/send_wrapper.rs    |   6 +-
 .../system_proxy/builtin_func_proxy.rs        |   6 +-
 .../system_proxy/esdt_system_sc_proxy.rs      |  54 ++---
 framework/base/src/types/interaction/tx.rs    |   7 +-
 framework/derive/src/generate/proxy_gen.rs    |   3 +-
 .../generate_proxy/proxy_sc_functions_gen.rs  |   3 +-
 27 files changed, 413 insertions(+), 433 deletions(-)

diff --git a/contracts/examples/adder/src/adder_proxy.rs b/contracts/examples/adder/src/adder_proxy.rs
index 9a460ca687..0b1b663669 100644
--- a/contracts/examples/adder/src/adder_proxy.rs
+++ b/contracts/examples/adder/src/adder_proxy.rs
@@ -1,7 +1,10 @@
+// Code generated by the multiversx-sc proxy generator. DO NOT EDIT.
+
 ////////////////////////////////////////////////////
 ////////////////// AUTO-GENERATED //////////////////
 ////////////////////////////////////////////////////
 
+#![allow(dead_code)]
 #![allow(clippy::all)]
 
 use multiversx_sc::proxy_imports::*;
@@ -53,6 +56,28 @@ where
     }
 }
 
+#[rustfmt::skip]
+impl<Env, From, To, Gas> AdderProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn upgrade<
+        Arg0: CodecInto<BigUint<Env::Api>>,
+    >(
+        self,
+        initial_value: Arg0,
+    ) -> TxProxyUpgrade<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_upgrade()
+            .argument(&initial_value)
+            .original_result()
+    }
+}
+
 #[rustfmt::skip]
 impl<Env, From, To, Gas> AdderProxyMethods<Env, From, To, Gas>
 where
@@ -66,8 +91,7 @@ where
         self,
     ) -> TxProxyCall<Env, From, To, Gas, BigUint<Env::Api>> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("getSum")
+            .raw_call("getSum")
             .original_result()
     }
 
@@ -79,8 +103,7 @@ where
         value: Arg0,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("add")
+            .raw_call("add")
             .argument(&value)
             .original_result()
     }
diff --git a/contracts/examples/crowdfunding-esdt/src/crowdfunding_esdt_proxy.rs b/contracts/examples/crowdfunding-esdt/src/crowdfunding_esdt_proxy.rs
index 5f73825a34..ec3a555967 100644
--- a/contracts/examples/crowdfunding-esdt/src/crowdfunding_esdt_proxy.rs
+++ b/contracts/examples/crowdfunding-esdt/src/crowdfunding_esdt_proxy.rs
@@ -1,7 +1,10 @@
+// Code generated by the multiversx-sc proxy generator. DO NOT EDIT.
+
 ////////////////////////////////////////////////////
 ////////////////// AUTO-GENERATED //////////////////
 ////////////////////////////////////////////////////
 
+#![allow(dead_code)]
 #![allow(clippy::all)]
 
 use multiversx_sc::proxy_imports::*;
@@ -32,6 +35,7 @@ where
     wrapped_tx: Tx<Env, From, To, (), Gas, (), ()>,
 }
 
+#[rustfmt::skip]
 impl<Env, From, Gas> CrowdfundingProxyMethods<Env, From, (), Gas>
 where
     Env: TxEnv,
@@ -48,7 +52,7 @@ where
         target: Arg0,
         deadline: Arg1,
         token_identifier: Arg2,
-    ) -> Tx<Env, From, (), (), Gas, DeployCall<Env, ()>, OriginalResultMarker<()>> {
+    ) -> TxProxyDeploy<Env, From, Gas, ()> {
         self.wrapped_tx
             .raw_deploy()
             .argument(&target)
@@ -57,6 +61,19 @@ where
             .original_result()
     }
 }
+
+#[rustfmt::skip]
+impl<Env, From, To, Gas> CrowdfundingProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+}
+
+#[rustfmt::skip]
 impl<Env, From, To, Gas> CrowdfundingProxyMethods<Env, From, To, Gas>
 where
     Env: TxEnv,
@@ -67,89 +84,73 @@ where
 {
     pub fn fund(
         self,
-    ) -> Tx<Env, From, To, (), Gas, FunctionCall<Env::Api>, OriginalResultMarker<()>> {
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("fund")
+            .raw_call("fund")
             .original_result()
     }
 
     pub fn status(
         self,
-    ) -> Tx<Env, From, To, (), Gas, FunctionCall<Env::Api>, OriginalResultMarker<Status>> {
+    ) -> TxProxyCall<Env, From, To, Gas, Status> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("status")
+            .raw_call("status")
             .original_result()
     }
 
     pub fn get_current_funds(
         self,
-    ) -> Tx<Env, From, To, (), Gas, FunctionCall<Env::Api>, OriginalResultMarker<BigUint<Env::Api>>>
-    {
+    ) -> TxProxyCall<Env, From, To, Gas, BigUint<Env::Api>> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("getCurrentFunds")
+            .raw_call("getCurrentFunds")
             .original_result()
     }
 
     pub fn claim(
         self,
-    ) -> Tx<Env, From, To, (), Gas, FunctionCall<Env::Api>, OriginalResultMarker<()>> {
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("claim")
+            .raw_call("claim")
             .original_result()
     }
 
     pub fn target(
         self,
-    ) -> Tx<Env, From, To, (), Gas, FunctionCall<Env::Api>, OriginalResultMarker<BigUint<Env::Api>>>
-    {
+    ) -> TxProxyCall<Env, From, To, Gas, BigUint<Env::Api>> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("getTarget")
+            .raw_call("getTarget")
             .original_result()
     }
 
     pub fn deadline(
         self,
-    ) -> Tx<Env, From, To, (), Gas, FunctionCall<Env::Api>, OriginalResultMarker<u64>> {
+    ) -> TxProxyCall<Env, From, To, Gas, u64> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("getDeadline")
+            .raw_call("getDeadline")
             .original_result()
     }
 
-    pub fn deposit<Arg0: CodecInto<ManagedAddress<Env::Api>>>(
+    pub fn deposit<
+        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+    >(
         self,
         donor: Arg0,
-    ) -> Tx<Env, From, To, (), Gas, FunctionCall<Env::Api>, OriginalResultMarker<BigUint<Env::Api>>>
-    {
+    ) -> TxProxyCall<Env, From, To, Gas, BigUint<Env::Api>> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("getDeposit")
+            .raw_call("getDeposit")
             .argument(&donor)
             .original_result()
     }
 
     pub fn cf_token_identifier(
         self,
-    ) -> Tx<
-        Env,
-        From,
-        To,
-        (),
-        Gas,
-        FunctionCall<Env::Api>,
-        OriginalResultMarker<EgldOrEsdtTokenIdentifier<Env::Api>>,
-    > {
+    ) -> TxProxyCall<Env, From, To, Gas, EgldOrEsdtTokenIdentifier<Env::Api>> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("getCrowdfundingTokenIdentifier")
+            .raw_call("getCrowdfundingTokenIdentifier")
             .original_result()
     }
 }
+
 #[derive(TopEncode, TopDecode, PartialEq, Eq, Clone, Copy, Debug)]
 pub enum Status {
     FundingPeriod,
diff --git a/contracts/examples/crypto-zombies/src/proxy_crypto_zombies.rs b/contracts/examples/crypto-zombies/src/proxy_crypto_zombies.rs
index ce6fcdd05b..1881df3acc 100644
--- a/contracts/examples/crypto-zombies/src/proxy_crypto_zombies.rs
+++ b/contracts/examples/crypto-zombies/src/proxy_crypto_zombies.rs
@@ -1,7 +1,10 @@
+// Code generated by the multiversx-sc proxy generator. DO NOT EDIT.
+
 ////////////////////////////////////////////////////
 ////////////////// AUTO-GENERATED //////////////////
 ////////////////////////////////////////////////////
 
+#![allow(dead_code)]
 #![allow(clippy::all)]
 
 use multiversx_sc::proxy_imports::*;
@@ -49,6 +52,24 @@ where
     }
 }
 
+#[rustfmt::skip]
+impl<Env, From, To, Gas> CryptoZombiesProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn upgrade(
+        self,
+    ) -> TxProxyUpgrade<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_upgrade()
+            .original_result()
+    }
+}
+
 #[rustfmt::skip]
 impl<Env, From, To, Gas> CryptoZombiesProxyMethods<Env, From, To, Gas>
 where
@@ -65,8 +86,7 @@ where
         address: Arg0,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("set_crypto_kitties_sc_address")
+            .raw_call("set_crypto_kitties_sc_address")
             .argument(&address)
             .original_result()
     }
@@ -75,8 +95,7 @@ where
         self,
     ) -> TxProxyCall<Env, From, To, Gas, u64> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("generate_random_dna")
+            .raw_call("generate_random_dna")
             .original_result()
     }
 
@@ -87,8 +106,7 @@ where
         name: Arg0,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("create_random_zombie")
+            .raw_call("create_random_zombie")
             .argument(&name)
             .original_result()
     }
@@ -100,8 +118,7 @@ where
         zombie_id: Arg0,
     ) -> TxProxyCall<Env, From, To, Gas, bool> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("is_ready")
+            .raw_call("is_ready")
             .argument(&zombie_id)
             .original_result()
     }
@@ -115,8 +132,7 @@ where
         kitty_id: Arg1,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("feed_on_kitty")
+            .raw_call("feed_on_kitty")
             .argument(&zombie_id)
             .argument(&kitty_id)
             .original_result()
@@ -126,8 +142,7 @@ where
         self,
     ) -> TxProxyCall<Env, From, To, Gas, u8> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("dna_digits")
+            .raw_call("dna_digits")
             .original_result()
     }
 
@@ -135,8 +150,7 @@ where
         self,
     ) -> TxProxyCall<Env, From, To, Gas, usize> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("zombies_count")
+            .raw_call("zombies_count")
             .original_result()
     }
 
@@ -147,8 +161,7 @@ where
         id: Arg0,
     ) -> TxProxyCall<Env, From, To, Gas, Zombie<Env::Api>> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("zombies")
+            .raw_call("zombies")
             .argument(&id)
             .original_result()
     }
@@ -160,8 +173,7 @@ where
         id: Arg0,
     ) -> TxProxyCall<Env, From, To, Gas, ManagedAddress<Env::Api>> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("zombie_owner")
+            .raw_call("zombie_owner")
             .argument(&id)
             .original_result()
     }
@@ -170,8 +182,7 @@ where
         self,
     ) -> TxProxyCall<Env, From, To, Gas, ManagedAddress<Env::Api>> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("crypto_kitties_sc_address")
+            .raw_call("crypto_kitties_sc_address")
             .original_result()
     }
 
@@ -179,8 +190,7 @@ where
         self,
     ) -> TxProxyCall<Env, From, To, Gas, u64> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("cooldown_time")
+            .raw_call("cooldown_time")
             .original_result()
     }
 
@@ -191,8 +201,7 @@ where
         owner: Arg0,
     ) -> TxProxyCall<Env, From, To, Gas, MultiValueEncoded<Env::Api, usize>> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("owned_zombies")
+            .raw_call("owned_zombies")
             .argument(&owner)
             .original_result()
     }
@@ -204,8 +213,7 @@ where
         zombie_id: Arg0,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("level_up")
+            .raw_call("level_up")
             .argument(&zombie_id)
             .original_result()
     }
@@ -214,8 +222,7 @@ where
         self,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("withdraw")
+            .raw_call("withdraw")
             .original_result()
     }
 
@@ -228,8 +235,7 @@ where
         name: Arg1,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("change_name")
+            .raw_call("change_name")
             .argument(&zombie_id)
             .argument(&name)
             .original_result()
@@ -244,8 +250,7 @@ where
         dna: Arg1,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("change_dna")
+            .raw_call("change_dna")
             .argument(&zombie_id)
             .argument(&dna)
             .original_result()
@@ -260,8 +265,7 @@ where
         target_id: Arg1,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("attack")
+            .raw_call("attack")
             .argument(&zombie_id)
             .argument(&target_id)
             .original_result()
diff --git a/contracts/examples/digital-cash/src/digital_cash_proxy.rs b/contracts/examples/digital-cash/src/digital_cash_proxy.rs
index c3d87f81c7..e3df8cf541 100644
--- a/contracts/examples/digital-cash/src/digital_cash_proxy.rs
+++ b/contracts/examples/digital-cash/src/digital_cash_proxy.rs
@@ -1,7 +1,10 @@
+// Code generated by the multiversx-sc proxy generator. DO NOT EDIT.
+
 ////////////////////////////////////////////////////
 ////////////////// AUTO-GENERATED //////////////////
 ////////////////////////////////////////////////////
 
+#![allow(dead_code)]
 #![allow(clippy::all)]
 
 use multiversx_sc::proxy_imports::*;
@@ -56,6 +59,17 @@ where
     }
 }
 
+#[rustfmt::skip]
+impl<Env, From, To, Gas> DigitalCashProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+}
+
 #[rustfmt::skip]
 impl<Env, From, To, Gas> DigitalCashProxyMethods<Env, From, To, Gas>
 where
@@ -74,8 +88,7 @@ where
         token: Arg1,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("whitelistFeeToken")
+            .raw_call("whitelistFeeToken")
             .argument(&fee)
             .argument(&token)
             .original_result()
@@ -88,8 +101,7 @@ where
         token: Arg0,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("blacklistFeeToken")
+            .raw_call("blacklistFeeToken")
             .argument(&token)
             .original_result()
     }
@@ -98,8 +110,7 @@ where
         self,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("claimFees")
+            .raw_call("claimFees")
             .original_result()
     }
 
@@ -114,8 +125,7 @@ where
         nonce: Arg2,
     ) -> TxProxyCall<Env, From, To, Gas, BigUint<Env::Api>> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("getAmount")
+            .raw_call("getAmount")
             .argument(&address)
             .argument(&token)
             .argument(&nonce)
@@ -131,8 +141,7 @@ where
         valability: Arg1,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("payFeeAndFundESDT")
+            .raw_call("payFeeAndFundESDT")
             .argument(&address)
             .argument(&valability)
             .original_result()
@@ -147,8 +156,7 @@ where
         valability: Arg1,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("payFeeAndFundEGLD")
+            .raw_call("payFeeAndFundEGLD")
             .argument(&address)
             .argument(&valability)
             .original_result()
@@ -163,8 +171,7 @@ where
         valability: Arg1,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("fund")
+            .raw_call("fund")
             .argument(&address)
             .argument(&valability)
             .original_result()
@@ -177,8 +184,7 @@ where
         address: Arg0,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("depositFees")
+            .raw_call("depositFees")
             .argument(&address)
             .original_result()
     }
@@ -190,8 +196,7 @@ where
         address: Arg0,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("withdraw")
+            .raw_call("withdraw")
             .argument(&address)
             .original_result()
     }
@@ -205,8 +210,7 @@ where
         signature: Arg1,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("claim")
+            .raw_call("claim")
             .argument(&address)
             .argument(&signature)
             .original_result()
@@ -223,8 +227,7 @@ where
         signature: Arg2,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("forward")
+            .raw_call("forward")
             .argument(&address)
             .argument(&forward_address)
             .argument(&signature)
@@ -238,8 +241,7 @@ where
         donor: Arg0,
     ) -> TxProxyCall<Env, From, To, Gas, DepositInfo<Env::Api>> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("deposit")
+            .raw_call("deposit")
             .argument(&donor)
             .original_result()
     }
diff --git a/contracts/examples/fractional-nfts/src/nft_marketplace_proxy.rs b/contracts/examples/fractional-nfts/src/nft_marketplace_proxy.rs
index 78df59231f..c8d8381ac0 100644
--- a/contracts/examples/fractional-nfts/src/nft_marketplace_proxy.rs
+++ b/contracts/examples/fractional-nfts/src/nft_marketplace_proxy.rs
@@ -48,8 +48,7 @@ where
         token_nonce: Arg2,
     ) -> TxProxyCall<Env, From, To, Gas, MultiValue2<BigUint<Env::Api>, ManagedVec<Env::Api, EsdtTokenPayment<Env::Api>>>> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("claimTokens")
+            .raw_call("claimTokens")
             .argument(&claim_destination)
             .argument(&token_id)
             .argument(&token_nonce)
diff --git a/contracts/examples/multisig/src/multisig_proxy.rs b/contracts/examples/multisig/src/multisig_proxy.rs
index a4f5c82bd7..4dca7b99db 100644
--- a/contracts/examples/multisig/src/multisig_proxy.rs
+++ b/contracts/examples/multisig/src/multisig_proxy.rs
@@ -1,7 +1,10 @@
+// Code generated by the multiversx-sc proxy generator. DO NOT EDIT.
+
 ////////////////////////////////////////////////////
 ////////////////// AUTO-GENERATED //////////////////
 ////////////////////////////////////////////////////
 
+#![allow(dead_code)]
 #![allow(clippy::all)]
 
 use multiversx_sc::proxy_imports::*;
@@ -56,6 +59,31 @@ where
     }
 }
 
+#[rustfmt::skip]
+impl<Env, From, To, Gas> MultisigProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn upgrade<
+        Arg0: CodecInto<usize>,
+        Arg1: CodecInto<MultiValueEncoded<Env::Api, ManagedAddress<Env::Api>>>,
+    >(
+        self,
+        quorum: Arg0,
+        board: Arg1,
+    ) -> TxProxyUpgrade<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_upgrade()
+            .argument(&quorum)
+            .argument(&board)
+            .original_result()
+    }
+}
+
 #[rustfmt::skip]
 impl<Env, From, To, Gas> MultisigProxyMethods<Env, From, To, Gas>
 where
@@ -70,8 +98,7 @@ where
         self,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("deposit")
+            .raw_call("deposit")
             .original_result()
     }
 
@@ -84,8 +111,7 @@ where
         self,
     ) -> TxProxyCall<Env, From, To, Gas, MultiValueEncoded<Env::Api, ActionFullInfo<Env::Api>>> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("getPendingActionFullInfo")
+            .raw_call("getPendingActionFullInfo")
             .original_result()
     }
 
@@ -100,8 +126,7 @@ where
         action_id: Arg1,
     ) -> TxProxyCall<Env, From, To, Gas, bool> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("signed")
+            .raw_call("signed")
             .argument(&user)
             .argument(&action_id)
             .original_result()
@@ -118,8 +143,7 @@ where
         user: Arg0,
     ) -> TxProxyCall<Env, From, To, Gas, UserRole> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("userRole")
+            .raw_call("userRole")
             .argument(&user)
             .original_result()
     }
@@ -129,8 +153,7 @@ where
         self,
     ) -> TxProxyCall<Env, From, To, Gas, MultiValueEncoded<Env::Api, ManagedAddress<Env::Api>>> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("getAllBoardMembers")
+            .raw_call("getAllBoardMembers")
             .original_result()
     }
 
@@ -139,8 +162,7 @@ where
         self,
     ) -> TxProxyCall<Env, From, To, Gas, MultiValueEncoded<Env::Api, ManagedAddress<Env::Api>>> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("getAllProposers")
+            .raw_call("getAllProposers")
             .original_result()
     }
 
@@ -152,8 +174,7 @@ where
         action_id: Arg0,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("sign")
+            .raw_call("sign")
             .argument(&action_id)
             .original_result()
     }
@@ -167,8 +188,7 @@ where
         action_id: Arg0,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("unsign")
+            .raw_call("unsign")
             .argument(&action_id)
             .original_result()
     }
@@ -183,8 +203,7 @@ where
         action_id: Arg0,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("discardAction")
+            .raw_call("discardAction")
             .argument(&action_id)
             .original_result()
     }
@@ -194,8 +213,7 @@ where
         self,
     ) -> TxProxyCall<Env, From, To, Gas, usize> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("getQuorum")
+            .raw_call("getQuorum")
             .original_result()
     }
 
@@ -205,8 +223,7 @@ where
         self,
     ) -> TxProxyCall<Env, From, To, Gas, usize> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("getNumBoardMembers")
+            .raw_call("getNumBoardMembers")
             .original_result()
     }
 
@@ -216,8 +233,7 @@ where
         self,
     ) -> TxProxyCall<Env, From, To, Gas, usize> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("getNumProposers")
+            .raw_call("getNumProposers")
             .original_result()
     }
 
@@ -227,8 +243,7 @@ where
         self,
     ) -> TxProxyCall<Env, From, To, Gas, usize> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("getActionLastIndex")
+            .raw_call("getActionLastIndex")
             .original_result()
     }
 
@@ -240,8 +255,7 @@ where
         action_id: Arg0,
     ) -> TxProxyCall<Env, From, To, Gas, Action<Env::Api>> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("getActionData")
+            .raw_call("getActionData")
             .argument(&action_id)
             .original_result()
     }
@@ -256,8 +270,7 @@ where
         action_id: Arg0,
     ) -> TxProxyCall<Env, From, To, Gas, ManagedVec<Env::Api, ManagedAddress<Env::Api>>> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("getActionSigners")
+            .raw_call("getActionSigners")
             .argument(&action_id)
             .original_result()
     }
@@ -271,8 +284,7 @@ where
         action_id: Arg0,
     ) -> TxProxyCall<Env, From, To, Gas, usize> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("getActionSignerCount")
+            .raw_call("getActionSignerCount")
             .argument(&action_id)
             .original_result()
     }
@@ -289,8 +301,7 @@ where
         action_id: Arg0,
     ) -> TxProxyCall<Env, From, To, Gas, usize> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("getActionValidSignerCount")
+            .raw_call("getActionValidSignerCount")
             .argument(&action_id)
             .original_result()
     }
@@ -304,8 +315,7 @@ where
         board_member_address: Arg0,
     ) -> TxProxyCall<Env, From, To, Gas, usize> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("proposeAddBoardMember")
+            .raw_call("proposeAddBoardMember")
             .argument(&board_member_address)
             .original_result()
     }
@@ -319,8 +329,7 @@ where
         proposer_address: Arg0,
     ) -> TxProxyCall<Env, From, To, Gas, usize> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("proposeAddProposer")
+            .raw_call("proposeAddProposer")
             .argument(&proposer_address)
             .original_result()
     }
@@ -333,8 +342,7 @@ where
         user_address: Arg0,
     ) -> TxProxyCall<Env, From, To, Gas, usize> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("proposeRemoveUser")
+            .raw_call("proposeRemoveUser")
             .argument(&user_address)
             .original_result()
     }
@@ -346,8 +354,7 @@ where
         new_quorum: Arg0,
     ) -> TxProxyCall<Env, From, To, Gas, usize> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("proposeChangeQuorum")
+            .raw_call("proposeChangeQuorum")
             .argument(&new_quorum)
             .original_result()
     }
@@ -367,8 +374,7 @@ where
         function_call: Arg2,
     ) -> TxProxyCall<Env, From, To, Gas, usize> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("proposeTransferExecute")
+            .raw_call("proposeTransferExecute")
             .argument(&to)
             .argument(&egld_amount)
             .argument(&function_call)
@@ -391,8 +397,7 @@ where
         function_call: Arg2,
     ) -> TxProxyCall<Env, From, To, Gas, usize> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("proposeAsyncCall")
+            .raw_call("proposeAsyncCall")
             .argument(&to)
             .argument(&egld_amount)
             .argument(&function_call)
@@ -412,8 +417,7 @@ where
         arguments: Arg3,
     ) -> TxProxyCall<Env, From, To, Gas, usize> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("proposeSCDeployFromSource")
+            .raw_call("proposeSCDeployFromSource")
             .argument(&amount)
             .argument(&source)
             .argument(&code_metadata)
@@ -436,8 +440,7 @@ where
         arguments: Arg4,
     ) -> TxProxyCall<Env, From, To, Gas, usize> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("proposeSCUpgradeFromSource")
+            .raw_call("proposeSCUpgradeFromSource")
             .argument(&sc_address)
             .argument(&amount)
             .argument(&source)
@@ -454,8 +457,7 @@ where
         action_id: Arg0,
     ) -> TxProxyCall<Env, From, To, Gas, bool> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("quorumReached")
+            .raw_call("quorumReached")
             .argument(&action_id)
             .original_result()
     }
@@ -468,8 +470,7 @@ where
         action_id: Arg0,
     ) -> TxProxyCall<Env, From, To, Gas, OptionalValue<ManagedAddress<Env::Api>>> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("performAction")
+            .raw_call("performAction")
             .argument(&action_id)
             .original_result()
     }
@@ -483,8 +484,7 @@ where
         name: Arg1,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("dnsRegister")
+            .raw_call("dnsRegister")
             .argument(&dns_address)
             .argument(&name)
             .original_result()
diff --git a/contracts/examples/nft-minter/src/nft_marketplace_proxy.rs b/contracts/examples/nft-minter/src/nft_marketplace_proxy.rs
index 6c01ca3e1f..7dbe98ed89 100644
--- a/contracts/examples/nft-minter/src/nft_marketplace_proxy.rs
+++ b/contracts/examples/nft-minter/src/nft_marketplace_proxy.rs
@@ -46,8 +46,7 @@ where
         claim_destination: Arg2,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("claimTokens")
+            .raw_call("claimTokens")
             .argument(&token_id)
             .argument(&token_nonce)
             .argument(&claim_destination)
diff --git a/contracts/examples/proxy-pause/src/pause_sc_proxy.rs b/contracts/examples/proxy-pause/src/pause_sc_proxy.rs
index 441b9b17c5..6f5fc834b9 100644
--- a/contracts/examples/proxy-pause/src/pause_sc_proxy.rs
+++ b/contracts/examples/proxy-pause/src/pause_sc_proxy.rs
@@ -39,8 +39,7 @@ where
         self,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("pause")
+            .raw_call("pause")
             .original_result()
     }
 
@@ -48,8 +47,7 @@ where
         self,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("unpause")
+            .raw_call("unpause")
             .original_result()
     }
 }
diff --git a/contracts/examples/rewards-distribution/src/seed_nft_minter_proxy.rs b/contracts/examples/rewards-distribution/src/seed_nft_minter_proxy.rs
index 23c1f71e97..c74e7a7e31 100644
--- a/contracts/examples/rewards-distribution/src/seed_nft_minter_proxy.rs
+++ b/contracts/examples/rewards-distribution/src/seed_nft_minter_proxy.rs
@@ -59,6 +59,17 @@ where
     }
 }
 
+#[rustfmt::skip]
+impl<Env, From, To, Gas> SeedNftMinterProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+}
+
 #[rustfmt::skip]
 impl<Env, From, To, Gas> SeedNftMinterProxyMethods<Env, From, To, Gas>
 where
@@ -85,8 +96,7 @@ where
         opt_token_used_as_payment_nonce: Arg5,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("createNft")
+            .raw_call("createNft")
             .argument(&name)
             .argument(&royalties)
             .argument(&uri)
@@ -105,8 +115,7 @@ where
         token_nonce: Arg1,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("claimAndDistribute")
+            .raw_call("claimAndDistribute")
             .argument(&token_id)
             .argument(&token_nonce)
             .original_result()
@@ -116,8 +125,7 @@ where
         self,
     ) -> TxProxyCall<Env, From, To, Gas, MultiValueEncoded<Env::Api, ManagedAddress<Env::Api>>> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("getMarketplaces")
+            .raw_call("getMarketplaces")
             .original_result()
     }
 
@@ -125,8 +133,7 @@ where
         self,
     ) -> TxProxyCall<Env, From, To, Gas, u64> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("getNftCount")
+            .raw_call("getNftCount")
             .original_result()
     }
 
@@ -134,8 +141,7 @@ where
         self,
     ) -> TxProxyCall<Env, From, To, Gas, ManagedVec<Env::Api, Distribution<Env::Api>>> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("getDistributionRules")
+            .raw_call("getDistributionRules")
             .original_result()
     }
 
@@ -148,8 +154,7 @@ where
         token_ticker: Arg1,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("issueToken")
+            .raw_call("issueToken")
             .argument(&token_display_name)
             .argument(&token_ticker)
             .original_result()
@@ -162,8 +167,7 @@ where
         nft_nonce: Arg0,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("buyNft")
+            .raw_call("buyNft")
             .argument(&nft_nonce)
             .original_result()
     }
@@ -175,8 +179,7 @@ where
         nft_nonce: Arg0,
     ) -> TxProxyCall<Env, From, To, Gas, OptionalValue<MultiValue3<EgldOrEsdtTokenIdentifier<Env::Api>, u64, BigUint<Env::Api>>>> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("getNftPrice")
+            .raw_call("getNftPrice")
             .argument(&nft_nonce)
             .original_result()
     }
@@ -185,8 +188,7 @@ where
         self,
     ) -> TxProxyCall<Env, From, To, Gas, TokenIdentifier<Env::Api>> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("getNftTokenId")
+            .raw_call("getNftTokenId")
             .original_result()
     }
 }
diff --git a/contracts/examples/seed-nft-minter/src/nft_marketplace_proxy.rs b/contracts/examples/seed-nft-minter/src/nft_marketplace_proxy.rs
index d62c326542..8cbc28e5df 100644
--- a/contracts/examples/seed-nft-minter/src/nft_marketplace_proxy.rs
+++ b/contracts/examples/seed-nft-minter/src/nft_marketplace_proxy.rs
@@ -65,8 +65,7 @@ where
         token_nonce: Arg2,
     ) -> TxProxyCall<Env, From, To, Gas, MultiValue2<BigUint<Env::Api>, ManagedVec<Env::Api, EsdtTokenPayment<Env::Api>>>> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("claimTokens")
+            .raw_call("claimTokens")
             .argument(&claim_destination)
             .argument(&token_id)
             .argument(&token_nonce)
diff --git a/contracts/feature-tests/abi-tester/src/abi_proxy.rs b/contracts/feature-tests/abi-tester/src/abi_proxy.rs
index 8759f224d8..bdb43be8f5 100644
--- a/contracts/feature-tests/abi-tester/src/abi_proxy.rs
+++ b/contracts/feature-tests/abi-tester/src/abi_proxy.rs
@@ -1,7 +1,10 @@
+// Code generated by the multiversx-sc proxy generator. DO NOT EDIT.
+
 ////////////////////////////////////////////////////
 ////////////////// AUTO-GENERATED //////////////////
 ////////////////////////////////////////////////////
 
+#![allow(dead_code)]
 #![allow(clippy::all)]
 
 use multiversx_sc::proxy_imports::*;
@@ -57,6 +60,32 @@ where
     }
 }
 
+#[rustfmt::skip]
+impl<Env, From, To, Gas> AbiTesterProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    /// Upgrade constructor. 
+    pub fn upgrade<
+        Arg0: CodecInto<i32>,
+        Arg1: CodecInto<OnlyShowsUpInConstructor>,
+    >(
+        self,
+        _constructor_arg_1: Arg0,
+        _constructor_arg_2: Arg1,
+    ) -> TxProxyUpgrade<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_upgrade()
+            .argument(&_constructor_arg_1)
+            .argument(&_constructor_arg_2)
+            .original_result()
+    }
+}
+
 #[rustfmt::skip]
 impl<Env, From, To, Gas> AbiTesterProxyMethods<Env, From, To, Gas>
 where
@@ -74,8 +103,7 @@ where
         att: Arg0,
     ) -> TxProxyCall<Env, From, To, Gas, AbiTestType> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("echo_abi_test_type")
+            .raw_call("echo_abi_test_type")
             .argument(&att)
             .original_result()
     }
@@ -87,8 +115,7 @@ where
         e: Arg0,
     ) -> TxProxyCall<Env, From, To, Gas, AbiEnum> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("echo_enum")
+            .raw_call("echo_enum")
             .argument(&e)
             .original_result()
     }
@@ -100,8 +127,7 @@ where
         _arg: Arg0,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("take_managed_type")
+            .raw_call("take_managed_type")
             .argument(&_arg)
             .original_result()
     }
@@ -110,8 +136,7 @@ where
         self,
     ) -> TxProxyCall<Env, From, To, Gas, MultiValue3<i32, [u8; 3], BoxedBytes>> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("multi_result_3")
+            .raw_call("multi_result_3")
             .original_result()
     }
 
@@ -119,8 +144,7 @@ where
         self,
     ) -> TxProxyCall<Env, From, To, Gas, MultiValue4<i32, [u8; 3], BoxedBytes, OnlyShowsUpAsNested03>> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("multi_result_4")
+            .raw_call("multi_result_4")
             .original_result()
     }
 
@@ -133,8 +157,7 @@ where
         _var_args: Arg1,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("var_args")
+            .raw_call("var_args")
             .argument(&_simple_arg)
             .argument(&_var_args)
             .original_result()
@@ -144,8 +167,7 @@ where
         self,
     ) -> TxProxyCall<Env, From, To, Gas, MultiValueVec<MultiValue3<OnlyShowsUpAsNested05, bool, ()>>> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("multi_result_vec")
+            .raw_call("multi_result_vec")
             .original_result()
     }
 
@@ -158,8 +180,7 @@ where
         _opt_args: Arg1,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("optional_arg")
+            .raw_call("optional_arg")
             .argument(&_simple_arg)
             .argument(&_opt_args)
             .original_result()
@@ -169,8 +190,7 @@ where
         self,
     ) -> TxProxyCall<Env, From, To, Gas, OptionalValue<OnlyShowsUpAsNested07>> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("optional_result")
+            .raw_call("optional_result")
             .original_result()
     }
 
@@ -183,8 +203,7 @@ where
         h256: Arg1,
     ) -> TxProxyCall<Env, From, To, Gas, MultiValue2<Address, H256>> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("address_vs_h256")
+            .raw_call("address_vs_h256")
             .argument(&address)
             .argument(&h256)
             .original_result()
@@ -199,8 +218,7 @@ where
         byte_array: Arg1,
     ) -> TxProxyCall<Env, From, To, Gas, MultiValue2<ManagedAddress<Env::Api>, ManagedByteArray<Env::Api, 32usize>>> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("managed_address_vs_byte_array")
+            .raw_call("managed_address_vs_byte_array")
             .argument(&address)
             .argument(&byte_array)
             .original_result()
@@ -210,8 +228,7 @@ where
         self,
     ) -> TxProxyCall<Env, From, To, Gas, EsdtLocalRole> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("esdt_local_role")
+            .raw_call("esdt_local_role")
             .original_result()
     }
 
@@ -219,8 +236,7 @@ where
         self,
     ) -> TxProxyCall<Env, From, To, Gas, EsdtTokenPayment<Env::Api>> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("esdt_token_payment")
+            .raw_call("esdt_token_payment")
             .original_result()
     }
 
@@ -228,8 +244,7 @@ where
         self,
     ) -> TxProxyCall<Env, From, To, Gas, EsdtTokenData<Env::Api>> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("esdt_token_data")
+            .raw_call("esdt_token_data")
             .original_result()
     }
 
@@ -237,8 +252,7 @@ where
         self,
     ) -> TxProxyCall<Env, From, To, Gas, OnlyShowsUpAsNestedInSingleValueMapper> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("sample_storage_mapper")
+            .raw_call("sample_storage_mapper")
             .original_result()
     }
 
@@ -246,8 +260,7 @@ where
         self,
     ) -> TxProxyCall<Env, From, To, Gas, Vec<OnlyShowsUpAsNestedInVec>> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("item_for_vec")
+            .raw_call("item_for_vec")
             .original_result()
     }
 
@@ -255,8 +268,7 @@ where
         self,
     ) -> TxProxyCall<Env, From, To, Gas, ArrayVec<OnlyShowsUpAsNestedInArrayVec, 3usize>> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("item_for_array_vec")
+            .raw_call("item_for_array_vec")
             .original_result()
     }
 
@@ -264,8 +276,7 @@ where
         self,
     ) -> TxProxyCall<Env, From, To, Gas, ManagedVec<Env::Api, AbiManagedVecItem>> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("item_for_managed_vec")
+            .raw_call("item_for_managed_vec")
             .original_result()
     }
 
@@ -276,8 +287,7 @@ where
         _array: Arg0,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("item_for_array")
+            .raw_call("item_for_array")
             .argument(&_array)
             .original_result()
     }
@@ -286,8 +296,7 @@ where
         self,
     ) -> TxProxyCall<Env, From, To, Gas, Box<OnlyShowsUpAsNestedInBox>> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("item_for_box")
+            .raw_call("item_for_box")
             .original_result()
     }
 
@@ -295,8 +304,7 @@ where
         self,
     ) -> TxProxyCall<Env, From, To, Gas, Box<[OnlyShowsUpAsNestedInBoxedSlice]>> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("item_for_boxed_slice")
+            .raw_call("item_for_boxed_slice")
             .original_result()
     }
 
@@ -307,8 +315,7 @@ where
         _ref: Arg0,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("item_for_ref")
+            .raw_call("item_for_ref")
             .argument(&_ref)
             .original_result()
     }
@@ -320,8 +327,7 @@ where
         _ref: Arg0,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("item_for_slice")
+            .raw_call("item_for_slice")
             .argument(&_ref)
             .original_result()
     }
@@ -330,8 +336,7 @@ where
         self,
     ) -> TxProxyCall<Env, From, To, Gas, Option<OnlyShowsUpAsNestedInOption>> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("item_for_option")
+            .raw_call("item_for_option")
             .original_result()
     }
 
@@ -339,8 +344,7 @@ where
         self,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("payable_egld")
+            .raw_call("payable_egld")
             .original_result()
     }
 
@@ -348,8 +352,7 @@ where
         self,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("payable_some_token")
+            .raw_call("payable_some_token")
             .original_result()
     }
 
@@ -357,8 +360,7 @@ where
         self,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("payable_any_token")
+            .raw_call("payable_any_token")
             .original_result()
     }
 
@@ -366,8 +368,7 @@ where
         self,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("external_view")
+            .raw_call("external_view")
             .original_result()
     }
 
@@ -375,8 +376,7 @@ where
         self,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("label_a")
+            .raw_call("label_a")
             .original_result()
     }
 
@@ -384,8 +384,7 @@ where
         self,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("label_b")
+            .raw_call("label_b")
             .original_result()
     }
 }
@@ -403,7 +402,8 @@ pub struct AbiTestType {
 }
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
-pub struct OnlyShowsUpAsNested01 {}
+pub struct OnlyShowsUpAsNested01 {
+}
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct OnlyShowsUpAsNested02 {
@@ -415,14 +415,19 @@ pub enum AbiEnum {
     Nothing,
     Something(i32),
     SomethingMore(u8, OnlyShowsUpAsNested08),
-    SomeStruct { a: u16, b: OnlyShowsUpAsNested09 },
+    SomeStruct {
+        a: u16,
+        b: OnlyShowsUpAsNested09,
+    },
 }
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
-pub struct OnlyShowsUpAsNested08 {}
+pub struct OnlyShowsUpAsNested08 {
+}
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
-pub struct OnlyShowsUpAsNested09 {}
+pub struct OnlyShowsUpAsNested09 {
+}
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct AbiManagedType<Api>
@@ -435,19 +440,24 @@ where
 }
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
-pub struct OnlyShowsUpAsNested03 {}
+pub struct OnlyShowsUpAsNested03 {
+}
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
-pub struct OnlyShowsUpAsNested04 {}
+pub struct OnlyShowsUpAsNested04 {
+}
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
-pub struct OnlyShowsUpAsNested05 {}
+pub struct OnlyShowsUpAsNested05 {
+}
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
-pub struct OnlyShowsUpAsNested06 {}
+pub struct OnlyShowsUpAsNested06 {
+}
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
-pub struct OnlyShowsUpAsNested07 {}
+pub struct OnlyShowsUpAsNested07 {
+}
 
 #[derive(TopDecode, TopEncode, NestedDecode, NestedEncode, Clone, PartialEq, Eq, Debug, Copy)]
 pub enum EsdtLocalRole {
@@ -462,9 +472,7 @@ pub enum EsdtLocalRole {
     Transfer,
 }
 
-#[derive(
-    TopDecode, TopEncode, NestedDecode, NestedEncode, Clone, PartialEq, Eq, Debug, ManagedVecItem,
-)]
+#[derive(TopDecode, TopEncode, NestedDecode, NestedEncode, Clone, PartialEq, Eq, Debug, ManagedVecItem)]
 pub enum EsdtTokenType {
     Fungible,
     NonFungible,
@@ -474,13 +482,16 @@ pub enum EsdtTokenType {
 }
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
-pub struct OnlyShowsUpAsNestedInSingleValueMapper {}
+pub struct OnlyShowsUpAsNestedInSingleValueMapper {
+}
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
-pub struct OnlyShowsUpAsNestedInVec {}
+pub struct OnlyShowsUpAsNestedInVec {
+}
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
-pub struct OnlyShowsUpAsNestedInArrayVec {}
+pub struct OnlyShowsUpAsNestedInArrayVec {
+}
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, ManagedVecItem)]
 pub struct AbiManagedVecItem {
@@ -489,22 +500,28 @@ pub struct AbiManagedVecItem {
 }
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
-pub struct OnlyShowsUpAsNestedInArray {}
+pub struct OnlyShowsUpAsNestedInArray {
+}
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
-pub struct OnlyShowsUpAsNestedInBox {}
+pub struct OnlyShowsUpAsNestedInBox {
+}
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
-pub struct OnlyShowsUpAsNestedInBoxedSlice {}
+pub struct OnlyShowsUpAsNestedInBoxedSlice {
+}
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
-pub struct OnlyShowsUpAsNestedInRef {}
+pub struct OnlyShowsUpAsNestedInRef {
+}
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
-pub struct OnlyShowsUpAsNestedInSlice {}
+pub struct OnlyShowsUpAsNestedInSlice {
+}
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
-pub struct OnlyShowsUpAsNestedInOption {}
+pub struct OnlyShowsUpAsNestedInOption {
+}
 
 #[derive(TopEncode, TopDecode)]
 pub struct OnlyShowsUpInEsdtAttr {
@@ -512,7 +529,8 @@ pub struct OnlyShowsUpInEsdtAttr {
 }
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
-pub struct OnlyShowsUpAsNested10 {}
+pub struct OnlyShowsUpAsNested10 {
+}
 
 #[derive(TopEncode, TopDecode)]
 pub enum ExplicitDiscriminant {
@@ -529,5 +547,8 @@ pub enum ExplicitDiscriminantMixed {
     Unit,
     Tuple(u16),
     Five,
-    Struct { a: u8, b: u16 },
+    Struct {
+        a: u8,
+        b: u16,
+    },
 }
diff --git a/contracts/feature-tests/basic-features/src/codec_err_test.rs b/contracts/feature-tests/basic-features/src/codec_err_test.rs
index cbe8f470b5..23e21310a6 100644
--- a/contracts/feature-tests/basic-features/src/codec_err_test.rs
+++ b/contracts/feature-tests/basic-features/src/codec_err_test.rs
@@ -59,6 +59,6 @@ pub trait CodecErrorTest {
     /// It just covers contract call serialization errors.
     #[endpoint]
     fn codec_err_contract_call(&self) {
-        let _ = self.tx().raw_call().argument(&CodecErrorTestType);
+        let _ = self.tx().raw_call("dummy").argument(&CodecErrorTestType);
     }
 }
diff --git a/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/parent/src/child_proxy.rs b/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/parent/src/child_proxy.rs
index 0c28cb1f96..162f38d1a9 100644
--- a/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/parent/src/child_proxy.rs
+++ b/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/parent/src/child_proxy.rs
@@ -83,8 +83,7 @@ where
         initial_supply: Arg2,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("issueWrappedEgld")
+            .raw_call("issueWrappedEgld")
             .argument(&token_display_name)
             .argument(&token_ticker)
             .argument(&initial_supply)
@@ -95,8 +94,7 @@ where
         self,
     ) -> TxProxyCall<Env, From, To, Gas, TokenIdentifier<Env::Api>> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("getWrappedEgldTokenIdentifier")
+            .raw_call("getWrappedEgldTokenIdentifier")
             .original_result()
     }
 }
diff --git a/contracts/feature-tests/composability/forwarder-raw/src/forwarder_raw_sync.rs b/contracts/feature-tests/composability/forwarder-raw/src/forwarder_raw_sync.rs
index 7fd9958479..662518d093 100644
--- a/contracts/feature-tests/composability/forwarder-raw/src/forwarder_raw_sync.rs
+++ b/contracts/feature-tests/composability/forwarder-raw/src/forwarder_raw_sync.rs
@@ -16,8 +16,7 @@ pub trait ForwarderRawSync: super::forwarder_raw_common::ForwarderRawCommon {
             .tx()
             .to(to)
             .egld(payment)
-            .raw_call()
-            .function_name(endpoint_name)
+            .raw_call(endpoint_name)
             .argument(&args)
             .with_gas_limit(half_gas)
             .returns(ReturnsRawResult)
diff --git a/contracts/feature-tests/composability/forwarder/src/vault_proxy.rs b/contracts/feature-tests/composability/forwarder/src/vault_proxy.rs
index f04735e6a5..81dc99b8f0 100644
--- a/contracts/feature-tests/composability/forwarder/src/vault_proxy.rs
+++ b/contracts/feature-tests/composability/forwarder/src/vault_proxy.rs
@@ -94,8 +94,7 @@ where
         args: Arg0,
     ) -> TxProxyCall<Env, From, To, Gas, MultiValueEncoded<Env::Api, ManagedBuffer<Env::Api>>> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("echo_arguments")
+            .raw_call("echo_arguments")
             .argument(&args)
             .original_result()
     }
@@ -107,8 +106,7 @@ where
         args: Arg0,
     ) -> TxProxyCall<Env, From, To, Gas, MultiValueEncoded<Env::Api, ManagedBuffer<Env::Api>>> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("echo_arguments_without_storage")
+            .raw_call("echo_arguments_without_storage")
             .argument(&args)
             .original_result()
     }
@@ -117,8 +115,7 @@ where
         self,
     ) -> TxProxyCall<Env, From, To, Gas, ManagedAddress<Env::Api>> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("echo_caller")
+            .raw_call("echo_caller")
             .original_result()
     }
 
@@ -126,8 +123,7 @@ where
         self,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("accept_funds")
+            .raw_call("accept_funds")
             .original_result()
     }
 
@@ -135,8 +131,7 @@ where
         self,
     ) -> TxProxyCall<Env, From, To, Gas, MultiValue2<BigUint<Env::Api>, MultiValueEncoded<Env::Api, EsdtTokenPaymentMultiValue<Env::Api>>>> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("accept_funds_echo_payment")
+            .raw_call("accept_funds_echo_payment")
             .original_result()
     }
 
@@ -144,8 +139,7 @@ where
         self,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("accept_funds_single_esdt_transfer")
+            .raw_call("accept_funds_single_esdt_transfer")
             .original_result()
     }
 
@@ -153,8 +147,7 @@ where
         self,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("reject_funds")
+            .raw_call("reject_funds")
             .original_result()
     }
 
@@ -169,8 +162,7 @@ where
         opt_receive_func: Arg2,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("retrieve_funds_with_transfer_exec")
+            .raw_call("retrieve_funds_with_transfer_exec")
             .argument(&token)
             .argument(&amount)
             .argument(&opt_receive_func)
@@ -186,8 +178,7 @@ where
         back_transfer_value: Arg1,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("retrieve_funds_promises")
+            .raw_call("retrieve_funds_promises")
             .argument(&back_transfers)
             .argument(&back_transfer_value)
             .original_result()
@@ -204,8 +195,7 @@ where
         amount: Arg2,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("retrieve_funds")
+            .raw_call("retrieve_funds")
             .argument(&token)
             .argument(&nonce)
             .argument(&amount)
@@ -219,8 +209,7 @@ where
         token_payments: Arg0,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("retrieve_multi_funds_async")
+            .raw_call("retrieve_multi_funds_async")
             .argument(&token_payments)
             .original_result()
     }
@@ -229,8 +218,7 @@ where
         self,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("burn_and_create_retrive_async")
+            .raw_call("burn_and_create_retrive_async")
             .original_result()
     }
 
@@ -238,8 +226,7 @@ where
         self,
     ) -> TxProxyCall<Env, From, To, Gas, ManagedAddress<Env::Api>> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("get_owner_address")
+            .raw_call("get_owner_address")
             .original_result()
     }
 
@@ -252,8 +239,7 @@ where
         endpoint: Arg0,
     ) -> TxProxyCall<Env, From, To, Gas, usize> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("call_counts")
+            .raw_call("call_counts")
             .argument(&endpoint)
             .original_result()
     }
@@ -262,8 +248,7 @@ where
         self,
     ) -> TxProxyCall<Env, From, To, Gas, usize> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("num_called_retrieve_funds_promises")
+            .raw_call("num_called_retrieve_funds_promises")
             .original_result()
     }
 
@@ -271,8 +256,7 @@ where
         self,
     ) -> TxProxyCall<Env, From, To, Gas, usize> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("num_async_calls_sent_from_child")
+            .raw_call("num_async_calls_sent_from_child")
             .original_result()
     }
 }
diff --git a/contracts/feature-tests/composability/promises-features/src/vault_proxy.rs b/contracts/feature-tests/composability/promises-features/src/vault_proxy.rs
index f04735e6a5..81dc99b8f0 100644
--- a/contracts/feature-tests/composability/promises-features/src/vault_proxy.rs
+++ b/contracts/feature-tests/composability/promises-features/src/vault_proxy.rs
@@ -94,8 +94,7 @@ where
         args: Arg0,
     ) -> TxProxyCall<Env, From, To, Gas, MultiValueEncoded<Env::Api, ManagedBuffer<Env::Api>>> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("echo_arguments")
+            .raw_call("echo_arguments")
             .argument(&args)
             .original_result()
     }
@@ -107,8 +106,7 @@ where
         args: Arg0,
     ) -> TxProxyCall<Env, From, To, Gas, MultiValueEncoded<Env::Api, ManagedBuffer<Env::Api>>> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("echo_arguments_without_storage")
+            .raw_call("echo_arguments_without_storage")
             .argument(&args)
             .original_result()
     }
@@ -117,8 +115,7 @@ where
         self,
     ) -> TxProxyCall<Env, From, To, Gas, ManagedAddress<Env::Api>> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("echo_caller")
+            .raw_call("echo_caller")
             .original_result()
     }
 
@@ -126,8 +123,7 @@ where
         self,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("accept_funds")
+            .raw_call("accept_funds")
             .original_result()
     }
 
@@ -135,8 +131,7 @@ where
         self,
     ) -> TxProxyCall<Env, From, To, Gas, MultiValue2<BigUint<Env::Api>, MultiValueEncoded<Env::Api, EsdtTokenPaymentMultiValue<Env::Api>>>> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("accept_funds_echo_payment")
+            .raw_call("accept_funds_echo_payment")
             .original_result()
     }
 
@@ -144,8 +139,7 @@ where
         self,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("accept_funds_single_esdt_transfer")
+            .raw_call("accept_funds_single_esdt_transfer")
             .original_result()
     }
 
@@ -153,8 +147,7 @@ where
         self,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("reject_funds")
+            .raw_call("reject_funds")
             .original_result()
     }
 
@@ -169,8 +162,7 @@ where
         opt_receive_func: Arg2,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("retrieve_funds_with_transfer_exec")
+            .raw_call("retrieve_funds_with_transfer_exec")
             .argument(&token)
             .argument(&amount)
             .argument(&opt_receive_func)
@@ -186,8 +178,7 @@ where
         back_transfer_value: Arg1,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("retrieve_funds_promises")
+            .raw_call("retrieve_funds_promises")
             .argument(&back_transfers)
             .argument(&back_transfer_value)
             .original_result()
@@ -204,8 +195,7 @@ where
         amount: Arg2,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("retrieve_funds")
+            .raw_call("retrieve_funds")
             .argument(&token)
             .argument(&nonce)
             .argument(&amount)
@@ -219,8 +209,7 @@ where
         token_payments: Arg0,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("retrieve_multi_funds_async")
+            .raw_call("retrieve_multi_funds_async")
             .argument(&token_payments)
             .original_result()
     }
@@ -229,8 +218,7 @@ where
         self,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("burn_and_create_retrive_async")
+            .raw_call("burn_and_create_retrive_async")
             .original_result()
     }
 
@@ -238,8 +226,7 @@ where
         self,
     ) -> TxProxyCall<Env, From, To, Gas, ManagedAddress<Env::Api>> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("get_owner_address")
+            .raw_call("get_owner_address")
             .original_result()
     }
 
@@ -252,8 +239,7 @@ where
         endpoint: Arg0,
     ) -> TxProxyCall<Env, From, To, Gas, usize> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("call_counts")
+            .raw_call("call_counts")
             .argument(&endpoint)
             .original_result()
     }
@@ -262,8 +248,7 @@ where
         self,
     ) -> TxProxyCall<Env, From, To, Gas, usize> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("num_called_retrieve_funds_promises")
+            .raw_call("num_called_retrieve_funds_promises")
             .original_result()
     }
 
@@ -271,8 +256,7 @@ where
         self,
     ) -> TxProxyCall<Env, From, To, Gas, usize> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("num_async_calls_sent_from_child")
+            .raw_call("num_async_calls_sent_from_child")
             .original_result()
     }
 }
diff --git a/contracts/feature-tests/composability/proxy-test-first/src/message_me_proxy.rs b/contracts/feature-tests/composability/proxy-test-first/src/message_me_proxy.rs
index ea01aa79d5..2a4242c2f2 100644
--- a/contracts/feature-tests/composability/proxy-test-first/src/message_me_proxy.rs
+++ b/contracts/feature-tests/composability/proxy-test-first/src/message_me_proxy.rs
@@ -96,8 +96,7 @@ where
         arg4: Arg3,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("messageMe")
+            .raw_call("messageMe")
             .argument(&arg1)
             .argument(&arg2)
             .argument(&arg3)
diff --git a/contracts/feature-tests/composability/proxy-test-first/src/pay_me_proxy.rs b/contracts/feature-tests/composability/proxy-test-first/src/pay_me_proxy.rs
index 8cf9369cf9..ff801b93f9 100644
--- a/contracts/feature-tests/composability/proxy-test-first/src/pay_me_proxy.rs
+++ b/contracts/feature-tests/composability/proxy-test-first/src/pay_me_proxy.rs
@@ -86,8 +86,7 @@ where
         arg1: Arg0,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("payMe")
+            .raw_call("payMe")
             .argument(&arg1)
             .original_result()
     }
@@ -99,8 +98,7 @@ where
         arg1: Arg0,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("payMeWithResult")
+            .raw_call("payMeWithResult")
             .argument(&arg1)
             .original_result()
     }
diff --git a/contracts/feature-tests/composability/recursive-caller/src/self_proxy.rs b/contracts/feature-tests/composability/recursive-caller/src/self_proxy.rs
index 8aa039e203..0b67327f44 100644
--- a/contracts/feature-tests/composability/recursive-caller/src/self_proxy.rs
+++ b/contracts/feature-tests/composability/recursive-caller/src/self_proxy.rs
@@ -85,8 +85,7 @@ where
         counter: Arg3,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("recursive_send_funds")
+            .raw_call("recursive_send_funds")
             .argument(&to)
             .argument(&token_identifier)
             .argument(&amount)
diff --git a/contracts/feature-tests/composability/recursive-caller/src/vault_proxy.rs b/contracts/feature-tests/composability/recursive-caller/src/vault_proxy.rs
index f04735e6a5..81dc99b8f0 100644
--- a/contracts/feature-tests/composability/recursive-caller/src/vault_proxy.rs
+++ b/contracts/feature-tests/composability/recursive-caller/src/vault_proxy.rs
@@ -94,8 +94,7 @@ where
         args: Arg0,
     ) -> TxProxyCall<Env, From, To, Gas, MultiValueEncoded<Env::Api, ManagedBuffer<Env::Api>>> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("echo_arguments")
+            .raw_call("echo_arguments")
             .argument(&args)
             .original_result()
     }
@@ -107,8 +106,7 @@ where
         args: Arg0,
     ) -> TxProxyCall<Env, From, To, Gas, MultiValueEncoded<Env::Api, ManagedBuffer<Env::Api>>> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("echo_arguments_without_storage")
+            .raw_call("echo_arguments_without_storage")
             .argument(&args)
             .original_result()
     }
@@ -117,8 +115,7 @@ where
         self,
     ) -> TxProxyCall<Env, From, To, Gas, ManagedAddress<Env::Api>> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("echo_caller")
+            .raw_call("echo_caller")
             .original_result()
     }
 
@@ -126,8 +123,7 @@ where
         self,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("accept_funds")
+            .raw_call("accept_funds")
             .original_result()
     }
 
@@ -135,8 +131,7 @@ where
         self,
     ) -> TxProxyCall<Env, From, To, Gas, MultiValue2<BigUint<Env::Api>, MultiValueEncoded<Env::Api, EsdtTokenPaymentMultiValue<Env::Api>>>> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("accept_funds_echo_payment")
+            .raw_call("accept_funds_echo_payment")
             .original_result()
     }
 
@@ -144,8 +139,7 @@ where
         self,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("accept_funds_single_esdt_transfer")
+            .raw_call("accept_funds_single_esdt_transfer")
             .original_result()
     }
 
@@ -153,8 +147,7 @@ where
         self,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("reject_funds")
+            .raw_call("reject_funds")
             .original_result()
     }
 
@@ -169,8 +162,7 @@ where
         opt_receive_func: Arg2,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("retrieve_funds_with_transfer_exec")
+            .raw_call("retrieve_funds_with_transfer_exec")
             .argument(&token)
             .argument(&amount)
             .argument(&opt_receive_func)
@@ -186,8 +178,7 @@ where
         back_transfer_value: Arg1,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("retrieve_funds_promises")
+            .raw_call("retrieve_funds_promises")
             .argument(&back_transfers)
             .argument(&back_transfer_value)
             .original_result()
@@ -204,8 +195,7 @@ where
         amount: Arg2,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("retrieve_funds")
+            .raw_call("retrieve_funds")
             .argument(&token)
             .argument(&nonce)
             .argument(&amount)
@@ -219,8 +209,7 @@ where
         token_payments: Arg0,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("retrieve_multi_funds_async")
+            .raw_call("retrieve_multi_funds_async")
             .argument(&token_payments)
             .original_result()
     }
@@ -229,8 +218,7 @@ where
         self,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("burn_and_create_retrive_async")
+            .raw_call("burn_and_create_retrive_async")
             .original_result()
     }
 
@@ -238,8 +226,7 @@ where
         self,
     ) -> TxProxyCall<Env, From, To, Gas, ManagedAddress<Env::Api>> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("get_owner_address")
+            .raw_call("get_owner_address")
             .original_result()
     }
 
@@ -252,8 +239,7 @@ where
         endpoint: Arg0,
     ) -> TxProxyCall<Env, From, To, Gas, usize> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("call_counts")
+            .raw_call("call_counts")
             .argument(&endpoint)
             .original_result()
     }
@@ -262,8 +248,7 @@ where
         self,
     ) -> TxProxyCall<Env, From, To, Gas, usize> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("num_called_retrieve_funds_promises")
+            .raw_call("num_called_retrieve_funds_promises")
             .original_result()
     }
 
@@ -271,8 +256,7 @@ where
         self,
     ) -> TxProxyCall<Env, From, To, Gas, usize> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("num_async_calls_sent_from_child")
+            .raw_call("num_async_calls_sent_from_child")
             .original_result()
     }
 }
diff --git a/contracts/feature-tests/panic-message-features/tests/pmf_proxy.rs b/contracts/feature-tests/panic-message-features/tests/pmf_proxy.rs
index 8226a1ec5f..9eeb6d69e8 100644
--- a/contracts/feature-tests/panic-message-features/tests/pmf_proxy.rs
+++ b/contracts/feature-tests/panic-message-features/tests/pmf_proxy.rs
@@ -52,6 +52,17 @@ where
     }
 }
 
+#[rustfmt::skip]
+impl<Env, From, To, Gas> PanicMessageFeaturesProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+}
+
 #[rustfmt::skip]
 impl<Env, From, To, Gas> PanicMessageFeaturesProxyMethods<Env, From, To, Gas>
 where
@@ -68,8 +79,7 @@ where
         some_value: Arg0,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("panicWithMessage")
+            .raw_call("panicWithMessage")
             .argument(&some_value)
             .original_result()
     }
@@ -79,8 +89,7 @@ where
         self,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("panicAfterLog")
+            .raw_call("panicAfterLog")
             .original_result()
     }
 
@@ -88,8 +97,7 @@ where
         self,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("sc_panic")
+            .raw_call("sc_panic")
             .original_result()
     }
 }
diff --git a/framework/base/src/contract_base/wrappers/send_wrapper.rs b/framework/base/src/contract_base/wrappers/send_wrapper.rs
index e902c47d76..f122ba81db 100644
--- a/framework/base/src/contract_base/wrappers/send_wrapper.rs
+++ b/framework/base/src/contract_base/wrappers/send_wrapper.rs
@@ -392,8 +392,7 @@ where
         Tx::new_tx_from_sc()
             .to(ToSelf)
             .gas(gas)
-            .raw_call()
-            .function_name(endpoint_name)
+            .raw_call(endpoint_name)
             .arguments_raw(arg_buffer)
             .returns(ReturnsRawResult)
             .sync_call()
@@ -407,8 +406,7 @@ where
         Tx::new_tx_from_sc()
             .to(ToSelf)
             .gas(GasLeft)
-            .raw_call()
-            .function_name(function_name)
+            .raw_call(function_name)
             .arguments_raw(arg_buffer)
             .sync_call()
     }
diff --git a/framework/base/src/types/interaction/system_proxy/builtin_func_proxy.rs b/framework/base/src/types/interaction/system_proxy/builtin_func_proxy.rs
index 65501c2fcf..dcc3d4b2d8 100644
--- a/framework/base/src/types/interaction/system_proxy/builtin_func_proxy.rs
+++ b/framework/base/src/types/interaction/system_proxy/builtin_func_proxy.rs
@@ -43,8 +43,7 @@ where
         name: Arg0,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("SetUserName")
+            .raw_call("SetUserName")
             .argument(&name)
             .original_result()
     }
@@ -53,8 +52,7 @@ where
         self,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("DeleteUserName")
+            .raw_call("DeleteUserName")
             .original_result()
     }
 }
diff --git a/framework/base/src/types/interaction/system_proxy/esdt_system_sc_proxy.rs b/framework/base/src/types/interaction/system_proxy/esdt_system_sc_proxy.rs
index ebb76b2a52..56b14ce83b 100644
--- a/framework/base/src/types/interaction/system_proxy/esdt_system_sc_proxy.rs
+++ b/framework/base/src/types/interaction/system_proxy/esdt_system_sc_proxy.rs
@@ -206,8 +206,7 @@ where
         };
 
         self.wrapped_tx
-            .raw_call()
-            .function_name(ISSUE_AND_SET_ALL_ROLES_ENDPOINT_NAME)
+            .raw_call(ISSUE_AND_SET_ALL_ROLES_ENDPOINT_NAME)
             .egld(issue_cost)
             .argument(&token_display_name)
             .argument(&token_ticker)
@@ -236,8 +235,7 @@ where
 
         let mut tx = self
             .wrapped_tx
-            .raw_call()
-            .function_name(endpoint_name)
+            .raw_call(endpoint_name)
             .egld(issue_cost)
             .argument(token_display_name)
             .argument(token_ticker);
@@ -280,8 +278,7 @@ where
         amount: &BigUint<Env::Api>,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("mint")
+            .raw_call("mint")
             .argument(token_identifier)
             .argument(amount)
             .original_result()
@@ -295,8 +292,7 @@ where
         amount: &BigUint<Env::Api>,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("ESDTBurn")
+            .raw_call("ESDTBurn")
             .argument(token_identifier)
             .argument(amount)
             .original_result()
@@ -309,8 +305,7 @@ where
         token_identifier: &TokenIdentifier<Env::Api>,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("pause")
+            .raw_call("pause")
             .argument(token_identifier)
             .original_result()
     }
@@ -321,8 +316,7 @@ where
         token_identifier: &TokenIdentifier<Env::Api>,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("unPause")
+            .raw_call("unPause")
             .argument(token_identifier)
             .original_result()
     }
@@ -336,8 +330,7 @@ where
         address: &ManagedAddress<Env::Api>,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("freeze")
+            .raw_call("freeze")
             .argument(token_identifier)
             .argument(address)
             .original_result()
@@ -350,8 +343,7 @@ where
         address: &ManagedAddress<Env::Api>,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("unFreeze")
+            .raw_call("unFreeze")
             .argument(token_identifier)
             .argument(address)
             .original_result()
@@ -367,8 +359,7 @@ where
         address: &ManagedAddress<Env::Api>,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("wipe")
+            .raw_call("wipe")
             .argument(token_identifier)
             .argument(address)
             .original_result()
@@ -384,8 +375,7 @@ where
         address: &ManagedAddress<Env::Api>,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("freezeSingleNFT")
+            .raw_call("freezeSingleNFT")
             .argument(token_identifier)
             .argument(&nft_nonce)
             .argument(address)
@@ -400,8 +390,7 @@ where
         address: &ManagedAddress<Env::Api>,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("unFreezeSingleNFT")
+            .raw_call("unFreezeSingleNFT")
             .argument(token_identifier)
             .argument(&nft_nonce)
             .argument(address)
@@ -419,8 +408,7 @@ where
         address: &ManagedAddress<Env::Api>,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("wipeSingleNFT")
+            .raw_call("wipeSingleNFT")
             .argument(token_identifier)
             .argument(&nft_nonce)
             .argument(address)
@@ -435,8 +423,7 @@ where
         num_decimals: usize,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("changeSFTToMetaESDT")
+            .raw_call("changeSFTToMetaESDT")
             .argument(&token_identifier)
             .argument(&num_decimals)
             .original_result()
@@ -454,8 +441,7 @@ where
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         let mut tx = self
             .wrapped_tx
-            .raw_call()
-            .function_name("setSpecialRole")
+            .raw_call("setSpecialRole")
             .argument(token_identifier)
             .argument(address);
         for role in roles_iter {
@@ -479,8 +465,7 @@ where
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         let mut tx = self
             .wrapped_tx
-            .raw_call()
-            .function_name("unSetSpecialRole")
+            .raw_call("unSetSpecialRole")
             .argument(token_identifier)
             .argument(address);
         for role in roles_iter {
@@ -498,8 +483,7 @@ where
         new_owner: &ManagedAddress<Env::Api>,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("transferOwnership")
+            .raw_call("transferOwnership")
             .argument(token_identifier)
             .argument(new_owner)
             .original_result()
@@ -512,8 +496,7 @@ where
         new_creator: &ManagedAddress<Env::Api>,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("transferNFTCreateRole")
+            .raw_call("transferNFTCreateRole")
             .argument(token_identifier)
             .argument(old_creator)
             .argument(new_creator)
@@ -527,8 +510,7 @@ where
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         let mut tx = self
             .wrapped_tx
-            .raw_call()
-            .function_name("controlChanges")
+            .raw_call("controlChanges")
             .argument(token_identifier);
         append_token_property_arguments(&mut tx.data, property_arguments);
         tx.original_result()
diff --git a/framework/base/src/types/interaction/tx.rs b/framework/base/src/types/interaction/tx.rs
index ceef2eba10..de33648ba2 100644
--- a/framework/base/src/types/interaction/tx.rs
+++ b/framework/base/src/types/interaction/tx.rs
@@ -381,14 +381,17 @@ where
     RH: TxResultHandler<Env>,
 {
     #[inline]
-    pub fn raw_call(self) -> Tx<Env, From, To, Payment, Gas, FunctionCall<Env::Api>, RH> {
+    pub fn raw_call<N: Into<ManagedBuffer<Env::Api>>>(
+        self,
+        function_name: N,
+    ) -> Tx<Env, From, To, Payment, Gas, FunctionCall<Env::Api>, RH> {
         Tx {
             env: self.env,
             from: self.from,
             to: self.to,
             payment: self.payment,
             gas: self.gas,
-            data: FunctionCall::empty(),
+            data: FunctionCall::new(function_name),
             result_handler: self.result_handler,
         }
     }
diff --git a/framework/derive/src/generate/proxy_gen.rs b/framework/derive/src/generate/proxy_gen.rs
index 2ea199ae54..9118c1f748 100644
--- a/framework/derive/src/generate/proxy_gen.rs
+++ b/framework/derive/src/generate/proxy_gen.rs
@@ -179,8 +179,7 @@ pub fn generate_proxy_endpoint(m: &Method, endpoint_name: String) -> proc_macro2
             multiversx_sc::types::TxBaseWithEnv::new_tx_from_sc()
                 .to(self.extract_proxy_to())
                 .original_result()
-                .raw_call()
-                .function_name(#endpoint_name)
+                .raw_call(#endpoint_name)
                 #payment_init
                 #(#arg_push_snippets)*
         }
diff --git a/framework/meta/src/cmd/contract/generate_proxy/proxy_sc_functions_gen.rs b/framework/meta/src/cmd/contract/generate_proxy/proxy_sc_functions_gen.rs
index 00ec38b490..bb79b507c5 100644
--- a/framework/meta/src/cmd/contract/generate_proxy/proxy_sc_functions_gen.rs
+++ b/framework/meta/src/cmd/contract/generate_proxy/proxy_sc_functions_gen.rs
@@ -180,8 +180,7 @@ fn write_endpoint_content(file: &mut File, function_name: String, inputs: Vec<In
     writeln!(
         file,
         "        self.wrapped_tx
-            .raw_call()
-            .function_name(\"{}\")",
+            .raw_call(\"{}\")",
         function_name
     )
     .unwrap();

From 85a63553218f6aee904d4bc33dcf65b886070e1d Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Mon, 1 Apr 2024 16:56:55 +0300
Subject: [PATCH 0615/1254] proxy gen - add unit test for clean_paths

---
 .../generate_proxy/proxy_generator.rs         | 80 ++++++++++++++++++-
 1 file changed, 79 insertions(+), 1 deletion(-)

diff --git a/framework/meta/src/cmd/contract/generate_proxy/proxy_generator.rs b/framework/meta/src/cmd/contract/generate_proxy/proxy_generator.rs
index 9bcaa8e831..9283451fc1 100644
--- a/framework/meta/src/cmd/contract/generate_proxy/proxy_generator.rs
+++ b/framework/meta/src/cmd/contract/generate_proxy/proxy_generator.rs
@@ -488,7 +488,7 @@ where
         writeln!(self.file, "    }},").unwrap();
     }
 
-    fn clean_paths(&mut self, proxy_crate: &str, rust_type: &str) -> String {
+    pub fn clean_paths(&mut self, proxy_crate: &str, rust_type: &str) -> String {
         let delimiters = "<>,()[] ";
         let words: Vec<&str> = rust_type
             .split(|c| delimiters.contains(c))
@@ -581,3 +581,81 @@ where
         writeln!(self.file, "    }}").unwrap();
     }
 }
+
+#[cfg(test)]
+pub mod tests {
+
+    use std::{fs::File, mem::MaybeUninit};
+
+    use multiversx_sc::abi::{BuildInfoAbi, ContractAbi, ContractCrateBuildAbi, FrameworkBuildAbi};
+
+    use crate::cmd::contract::meta_config::MetaConfig;
+
+    use super::ProxyGenerator;
+
+    #[test]
+    fn clean_paths_unsanitized_test() {
+        let build_info = BuildInfoAbi {
+            contract_crate: ContractCrateBuildAbi {
+                name: "test",
+                version: "0.0.0",
+                git_version: "0.0.0",
+            },
+            framework: FrameworkBuildAbi::create(),
+        };
+
+        let original_contract_abi = ContractAbi::new(build_info, &[""], "test", false);
+        let meta_config = MetaConfig::create(original_contract_abi, false);
+        let file = unsafe { &mut *(MaybeUninit::<File>::uninit().as_mut_ptr()) };
+        let mut proxy_generator = ProxyGenerator::new(&meta_config, file);
+        let name = proxy_generator
+            .meta_config
+            .original_contract_abi
+            .build_info
+            .contract_crate
+            .name;
+
+        let cleaned_path_unsanitized = proxy_generator.clean_paths(
+            name,
+            "(testt::path::test::to::TestStruct, Option<path::to::test::Box<AbiTestType>>)",
+        );
+        let expected_result_unsanitized =
+            "(testt::path::test::to::TestStruct, Option<path::to::test::Box<AbiTestType>>)";
+
+        assert_eq!(
+            expected_result_unsanitized,
+            cleaned_path_unsanitized.as_str()
+        );
+    }
+
+    #[test]
+    fn clean_paths_sanitized_test() {
+        let build_info = BuildInfoAbi {
+            contract_crate: ContractCrateBuildAbi {
+                name: "test",
+                version: "0.0.0",
+                git_version: "0.0.0",
+            },
+            framework: FrameworkBuildAbi::create(),
+        };
+
+        let original_contract_abi = ContractAbi::new(build_info, &[""], "test", false);
+        let meta_config = MetaConfig::create(original_contract_abi, false);
+        let file = unsafe { &mut *(MaybeUninit::<File>::uninit().as_mut_ptr()) };
+        let mut proxy_generator = ProxyGenerator::new(&meta_config, file);
+        let name = proxy_generator
+            .meta_config
+            .original_contract_abi
+            .build_info
+            .contract_crate
+            .name;
+
+        let cleaned_path_sanitized = proxy_generator.clean_paths(
+            name,
+            "(test::path::test::to::TestStruct, Option<test::path::to::test::Box<AbiTestType>>)",
+        );
+        let expected_result_sanitized = "(TestStruct, Option<Box<AbiTestType>>)";
+
+        assert_eq!(expected_result_sanitized, cleaned_path_sanitized.as_str());
+    }
+}

From dedf8d07eacd835682759e060de1f10d97c6913e Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Mon, 1 Apr 2024 19:44:16 +0300
Subject: [PATCH 0616/1254] proxy gen - cleanup

---
 .../generate_proxy/proxy_generator.rs         |  17 +-
 .../generate_proxy/proxy_sc_functions_gen.rs  | 257 ------------------
 2 files changed, 10 insertions(+), 264 deletions(-)
 delete mode 100644 framework/meta/src/cmd/contract/generate_proxy/proxy_sc_functions_gen.rs

diff --git a/framework/meta/src/cmd/contract/generate_proxy/proxy_generator.rs b/framework/meta/src/cmd/contract/generate_proxy/proxy_generator.rs
index 8276b66289..0f2410db50 100644
--- a/framework/meta/src/cmd/contract/generate_proxy/proxy_generator.rs
+++ b/framework/meta/src/cmd/contract/generate_proxy/proxy_generator.rs
@@ -18,7 +18,8 @@ const PRELUDE: &str = "// Code generated by the multiversx-sc proxy generator. D
 #![allow(dead_code)]
 #![allow(clippy::all)]
 
-use multiversx_sc::proxy_imports::*;";
+use multiversx_sc::proxy_imports::*;
+";
 
 const ZERO: &str = "0";
 
@@ -53,7 +54,7 @@ impl<'a> ProxyGenerator<'a> {
     }
 
     fn write_header(&mut self) {
-        writeln!(self.file, r#"{PRELUDE}"#).unwrap();
+        self.file.write_fmt(format_args!("{PRELUDE}")).unwrap()
     }
 
     fn write_tx_proxy_type_def(&mut self) {
@@ -584,7 +585,7 @@ where
 #[cfg(test)]
 pub mod tests {
 
-    use std::{fs::File, mem::MaybeUninit};
+    use std::fs::File;
 
     use multiversx_sc::abi::{BuildInfoAbi, ContractAbi, ContractCrateBuildAbi, FrameworkBuildAbi};
 
@@ -592,6 +593,8 @@ pub mod tests {
 
     use super::ProxyGenerator;
 
+    const CURRENT_FILE: &str = "src/cmd/contract/generate_proxy/proxy_generator.rs";
+
     #[test]
     fn clean_paths_unsanitized_test() {
         let build_info = BuildInfoAbi {
@@ -605,8 +608,8 @@ pub mod tests {
 
         let original_contract_abi = ContractAbi::new(build_info, &[""], "test", false);
         let meta_config = MetaConfig::create(original_contract_abi, false);
-        let file = unsafe { &mut *(MaybeUninit::<File>::uninit().as_mut_ptr()) };
-        let mut proxy_generator = ProxyGenerator::new(&meta_config, file);
+        let mut file = File::open(CURRENT_FILE).unwrap();
+        let mut proxy_generator = ProxyGenerator::new(&meta_config, &mut file);
         let name = proxy_generator
             .meta_config
             .original_contract_abi
@@ -640,8 +643,8 @@ pub mod tests {
 
         let original_contract_abi = ContractAbi::new(build_info, &[""], "test", false);
         let meta_config = MetaConfig::create(original_contract_abi, false);
-        let file = unsafe { &mut *(MaybeUninit::<File>::uninit().as_mut_ptr()) };
-        let mut proxy_generator = ProxyGenerator::new(&meta_config, file);
+        let mut file = File::open(CURRENT_FILE).unwrap();
+        let mut proxy_generator = ProxyGenerator::new(&meta_config, &mut file);
         let name = proxy_generator
             .meta_config
             .original_contract_abi
diff --git a/framework/meta/src/cmd/contract/generate_proxy/proxy_sc_functions_gen.rs b/framework/meta/src/cmd/contract/generate_proxy/proxy_sc_functions_gen.rs
deleted file mode 100644
index f2b502dd11..0000000000
--- a/framework/meta/src/cmd/contract/generate_proxy/proxy_sc_functions_gen.rs
+++ /dev/null
@@ -1,257 +0,0 @@
-use std::{fs::File, io::Write};
-
-use multiversx_sc::abi::{ContractAbi, EndpointAbi, InputAbi, OutputAbi};
-
-use super::proxy_naming::proxy_methods_type_name;
-
-pub(crate) fn write_content(file: &mut File, abi: ContractAbi) {
-    write_header_impl_constructor(file, &abi.name);
-    for (i, constructor_abi) in abi.constructors.into_iter().enumerate() {
-        if i > 0 {
-            writeln!(file).unwrap();
-        }
-        write_constructor_header(file, constructor_abi.clone());
-        write_constructor_content(file, constructor_abi.inputs);
-        write_end_of_function(file);
-    }
-
-    writeln!(file, "}}").unwrap();
-
-    write_header_impl_upgrade_constructor(file, &abi.name);
-    for (i, upgrade_abi) in abi.upgrade_constructors.clone().into_iter().enumerate() {
-        if i > 0 {
-            writeln!(file).unwrap();
-        }
-        write_upgrade_constructor_header(file, upgrade_abi.clone());
-        write_upgrade_constructor_content(file, upgrade_abi.inputs);
-        write_end_of_function(file);
-    }
-
-    writeln!(file, "}}").unwrap();
-
-    write_header_impl_endpoints(file, &abi.name);
-    for (i, endpoint_abi) in abi.endpoints.into_iter().enumerate() {
-        if i > 0 {
-            writeln!(file).unwrap();
-        }
-        write_endpoint_header(file, endpoint_abi.clone());
-        write_endpoint_content(file, endpoint_abi.name, endpoint_abi.inputs);
-        write_end_of_function(file);
-    }
-
-    writeln!(file, "}}").unwrap();
-}
-
-fn write_header_impl_constructor(file: &mut File, name: &str) {
-    let proxy_methods_type_name = proxy_methods_type_name(name);
-    writeln!(
-        file,
-        r#"
-#[rustfmt::skip]
-impl<Env, From, Gas> {proxy_methods_type_name}<Env, From, (), Gas>
-where
-    Env: TxEnv,
-    Env::Api: VMApi,
-    From: TxFrom<Env>,
-    Gas: TxGas<Env>,
-{{"#
-    )
-    .unwrap();
-}
-
-fn write_header_impl_upgrade_constructor(file: &mut File, name: &str) {
-    let proxy_methods_type_name = proxy_methods_type_name(name);
-    writeln!(
-        file,
-        r#"
-#[rustfmt::skip]
-impl<Env, From, To, Gas> {proxy_methods_type_name}<Env, From, To, Gas>
-where
-    Env: TxEnv,
-    Env::Api: VMApi,
-    From: TxFrom<Env>,
-    To: TxTo<Env>,
-    Gas: TxGas<Env>,
-{{"#
-    )
-    .unwrap();
-}
-
-fn write_header_impl_endpoints(file: &mut File, name: &str) {
-    let proxy_methods_type_name = proxy_methods_type_name(name);
-    writeln!(
-        file,
-        r#"
-#[rustfmt::skip]
-impl<Env, From, To, Gas> {proxy_methods_type_name}<Env, From, To, Gas>
-where
-    Env: TxEnv,
-    Env::Api: VMApi,
-    From: TxFrom<Env>,
-    To: TxTo<Env>,
-    Gas: TxGas<Env>,
-{{"#
-    )
-    .unwrap();
-}
-
-fn write_constructor_header(file: &mut File, constructor_abi: EndpointAbi) {
-    write_fn_signature(file, constructor_abi.clone());
-    write_constructor_output(file, constructor_abi.outputs);
-}
-
-fn write_upgrade_constructor_header(file: &mut File, upgrade_constructor_abi: EndpointAbi) {
-    write_fn_signature(file, upgrade_constructor_abi.clone());
-    write_upgrade_constructor_output(file, upgrade_constructor_abi.outputs);
-}
-
-fn write_endpoint_header(file: &mut File, constructor_abi: EndpointAbi) {
-    write_fn_signature(file, constructor_abi.clone());
-    write_endpoint_output(file, constructor_abi.outputs);
-}
-
-fn write_fn_signature(file: &mut File, endpoint_abi: EndpointAbi) {
-    write_endpoint_docs(file, endpoint_abi.docs);
-    write_function_header_endpoint(file, endpoint_abi.rust_method_name);
-    write_args(file, endpoint_abi.inputs.clone());
-    write_parameters(file, endpoint_abi.inputs);
-}
-
-fn write_parameters(file: &mut File, inputs: Vec<InputAbi>) {
-    writeln!(file, "(").unwrap();
-    writeln!(file, "        self,").unwrap();
-    for (index, input) in inputs.iter().enumerate() {
-        writeln!(file, "        {}: Arg{index},", &input.arg_name).unwrap();
-    }
-    write!(file, "    ) ").unwrap();
-}
-
-fn write_constructor_output(file: &mut File, outputs: Vec<OutputAbi>) {
-    write!(file, "-> TxProxyDeploy<Env, From, Gas, ").unwrap();
-
-    parse_and_write_outputs(file, outputs);
-
-    writeln!(file, "> {{").unwrap();
-}
-
-fn write_upgrade_constructor_output(file: &mut File, outputs: Vec<OutputAbi>) {
-    write!(file, "-> TxProxyUpgrade<Env, From, To, Gas, ").unwrap();
-
-    parse_and_write_outputs(file, outputs);
-
-    writeln!(file, "> {{").unwrap();
-}
-
-fn write_endpoint_output(file: &mut File, outputs: Vec<OutputAbi>) {
-    write!(file, "-> TxProxyCall<Env, From, To, Gas, ").unwrap();
-
-    parse_and_write_outputs(file, outputs);
-
-    writeln!(file, "> {{").unwrap();
-}
-
-fn write_constructor_content(file: &mut File, inputs: Vec<InputAbi>) {
-    writeln!(
-        file,
-        "        self.wrapped_tx
-            .raw_deploy()"
-    )
-    .unwrap();
-    for input in inputs.iter() {
-        writeln!(file, "            .argument(&{})", input.arg_name).unwrap();
-    }
-    writeln!(file, "            .original_result()").unwrap();
-}
-
-fn write_upgrade_constructor_content(file: &mut File, inputs: Vec<InputAbi>) {
-    writeln!(
-        file,
-        "        self.wrapped_tx
-            .raw_upgrade()"
-    )
-    .unwrap();
-    for input in inputs.iter() {
-        writeln!(file, "            .argument(&{})", input.arg_name).unwrap();
-    }
-    writeln!(file, "            .original_result()").unwrap();
-}
-
-fn write_endpoint_content(file: &mut File, function_name: String, inputs: Vec<InputAbi>) {
-    writeln!(
-        file,
-        "        self.wrapped_tx
-            .raw_call(\"{}\")",
-        function_name
-    )
-    .unwrap();
-
-    for input in inputs.iter() {
-        writeln!(file, "            .argument(&{})", input.arg_name).unwrap();
-    }
-
-    writeln!(file, "            .original_result()").unwrap();
-}
-
-fn write_function_header_endpoint(file: &mut File, rust_method_name: String) {
-    write!(file, "    pub fn {rust_method_name}").unwrap();
-}
-
-fn write_endpoint_docs(file: &mut File, docs: Vec<String>) {
-    for abi_doc in docs {
-        writeln!(file, "    /// {abi_doc} ").unwrap();
-    }
-}
-
-fn write_args(file: &mut File, inputs: Vec<InputAbi>) {
-    if inputs.is_empty() {
-        return;
-    }
-
-    writeln!(file, "<").unwrap();
-
-    for (index, input) in inputs.iter().enumerate() {
-        write_argument(file, index, &input.type_names.rust);
-    }
-
-    write!(file, "    >").unwrap();
-}
-
-fn write_argument(file: &mut File, index: usize, rust_name: &str) {
-    let adjusted = adjust_type_name(rust_name);
-    writeln!(file, "        Arg{index}: CodecInto<{adjusted}>,").unwrap();
-}
-
-fn write_end_of_function(file: &mut File) {
-    writeln!(file, "    }}").unwrap();
-}
-
-fn adjust_type_name(original_rust_name: &str) -> String {
-    original_rust_name
-        .replace("multiversx_sc::api::uncallable::UncallableApi", "Env::Api")
-        .replace("$API", "Env::Api")
-        .to_string()
-}
-
-fn parse_and_write_outputs(file: &mut File, outputs: Vec<OutputAbi>) {
-    match outputs.len() {
-        0 => {
-            write!(file, "()").unwrap();
-        },
-        1 => {
-            let adjusted = adjust_type_name(&outputs[0].type_names.rust);
-            write!(file, "{adjusted}").unwrap();
-        },
-        _ => {
-            write!(file, "MultiValue{}<", outputs.len()).unwrap();
-            for (i, output) in outputs.iter().enumerate() {
-                if i > 0 {
-                    write!(file, ", ").unwrap();
-                }
-                let adjusted = adjust_type_name(&output.type_names.rust);
-                write!(file, "{adjusted}").unwrap();
-            }
-            write!(file, ">").unwrap();
-        },
-    }
-}
-

From 4e1afae0e57accdef0b43de061f60b6dbcfa7477 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Mon, 1 Apr 2024 20:16:02 +0300
Subject: [PATCH 0617/1254] re-generated proxies

---
 .../src/crowdfunding_esdt_proxy.rs            | 11 ----------
 .../digital-cash/src/digital_cash_proxy.rs    | 11 ----------
 .../src/seed_nft_minter_proxy.rs              | 11 ----------
 .../feature-tests/abi-tester/src/abi_proxy.rs | 22 -------------------
 .../parent/src/child_proxy.rs                 | 11 ----------
 .../recursive-caller/src/self_proxy.rs        | 11 ----------
 .../panic-message-features/tests/pmf_proxy.rs | 11 ----------
 7 files changed, 88 deletions(-)

diff --git a/contracts/examples/crowdfunding-esdt/src/crowdfunding_esdt_proxy.rs b/contracts/examples/crowdfunding-esdt/src/crowdfunding_esdt_proxy.rs
index ec3a555967..385d77ce82 100644
--- a/contracts/examples/crowdfunding-esdt/src/crowdfunding_esdt_proxy.rs
+++ b/contracts/examples/crowdfunding-esdt/src/crowdfunding_esdt_proxy.rs
@@ -62,17 +62,6 @@ where
     }
 }
 
-#[rustfmt::skip]
-impl<Env, From, To, Gas> CrowdfundingProxyMethods<Env, From, To, Gas>
-where
-    Env: TxEnv,
-    Env::Api: VMApi,
-    From: TxFrom<Env>,
-    To: TxTo<Env>,
-    Gas: TxGas<Env>,
-{
-}
-
 #[rustfmt::skip]
 impl<Env, From, To, Gas> CrowdfundingProxyMethods<Env, From, To, Gas>
 where
diff --git a/contracts/examples/digital-cash/src/digital_cash_proxy.rs b/contracts/examples/digital-cash/src/digital_cash_proxy.rs
index e3df8cf541..644e17c671 100644
--- a/contracts/examples/digital-cash/src/digital_cash_proxy.rs
+++ b/contracts/examples/digital-cash/src/digital_cash_proxy.rs
@@ -59,17 +59,6 @@ where
     }
 }
 
-#[rustfmt::skip]
-impl<Env, From, To, Gas> DigitalCashProxyMethods<Env, From, To, Gas>
-where
-    Env: TxEnv,
-    Env::Api: VMApi,
-    From: TxFrom<Env>,
-    To: TxTo<Env>,
-    Gas: TxGas<Env>,
-{
-}
-
 #[rustfmt::skip]
 impl<Env, From, To, Gas> DigitalCashProxyMethods<Env, From, To, Gas>
 where
diff --git a/contracts/examples/rewards-distribution/src/seed_nft_minter_proxy.rs b/contracts/examples/rewards-distribution/src/seed_nft_minter_proxy.rs
index c74e7a7e31..10047be064 100644
--- a/contracts/examples/rewards-distribution/src/seed_nft_minter_proxy.rs
+++ b/contracts/examples/rewards-distribution/src/seed_nft_minter_proxy.rs
@@ -59,17 +59,6 @@ where
     }
 }
 
-#[rustfmt::skip]
-impl<Env, From, To, Gas> SeedNftMinterProxyMethods<Env, From, To, Gas>
-where
-    Env: TxEnv,
-    Env::Api: VMApi,
-    From: TxFrom<Env>,
-    To: TxTo<Env>,
-    Gas: TxGas<Env>,
-{
-}
-
 #[rustfmt::skip]
 impl<Env, From, To, Gas> SeedNftMinterProxyMethods<Env, From, To, Gas>
 where
diff --git a/contracts/feature-tests/abi-tester/src/abi_proxy.rs b/contracts/feature-tests/abi-tester/src/abi_proxy.rs
index bdb43be8f5..1f860018b5 100644
--- a/contracts/feature-tests/abi-tester/src/abi_proxy.rs
+++ b/contracts/feature-tests/abi-tester/src/abi_proxy.rs
@@ -459,28 +459,6 @@ pub struct OnlyShowsUpAsNested06 {
 pub struct OnlyShowsUpAsNested07 {
 }
 
-#[derive(TopDecode, TopEncode, NestedDecode, NestedEncode, Clone, PartialEq, Eq, Debug, Copy)]
-pub enum EsdtLocalRole {
-    None,
-    Mint,
-    Burn,
-    NftCreate,
-    NftAddQuantity,
-    NftBurn,
-    NftAddUri,
-    NftUpdateAttributes,
-    Transfer,
-}
-
-#[derive(TopDecode, TopEncode, NestedDecode, NestedEncode, Clone, PartialEq, Eq, Debug, ManagedVecItem)]
-pub enum EsdtTokenType {
-    Fungible,
-    NonFungible,
-    SemiFungible,
-    Meta,
-    Invalid,
-}
-
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct OnlyShowsUpAsNestedInSingleValueMapper {
 }
diff --git a/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/parent/src/child_proxy.rs b/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/parent/src/child_proxy.rs
index 162f38d1a9..bb3e97cc56 100644
--- a/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/parent/src/child_proxy.rs
+++ b/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/parent/src/child_proxy.rs
@@ -52,17 +52,6 @@ where
     }
 }
 
-#[rustfmt::skip]
-impl<Env, From, To, Gas> ChildProxyMethods<Env, From, To, Gas>
-where
-    Env: TxEnv,
-    Env::Api: VMApi,
-    From: TxFrom<Env>,
-    To: TxTo<Env>,
-    Gas: TxGas<Env>,
-{
-}
-
 #[rustfmt::skip]
 impl<Env, From, To, Gas> ChildProxyMethods<Env, From, To, Gas>
 where
diff --git a/contracts/feature-tests/composability/recursive-caller/src/self_proxy.rs b/contracts/feature-tests/composability/recursive-caller/src/self_proxy.rs
index 0b67327f44..bda44ef4b3 100644
--- a/contracts/feature-tests/composability/recursive-caller/src/self_proxy.rs
+++ b/contracts/feature-tests/composability/recursive-caller/src/self_proxy.rs
@@ -52,17 +52,6 @@ where
     }
 }
 
-#[rustfmt::skip]
-impl<Env, From, To, Gas> RecursiveCallerProxyMethods<Env, From, To, Gas>
-where
-    Env: TxEnv,
-    Env::Api: VMApi,
-    From: TxFrom<Env>,
-    To: TxTo<Env>,
-    Gas: TxGas<Env>,
-{
-}
-
 #[rustfmt::skip]
 impl<Env, From, To, Gas> RecursiveCallerProxyMethods<Env, From, To, Gas>
 where
diff --git a/contracts/feature-tests/panic-message-features/tests/pmf_proxy.rs b/contracts/feature-tests/panic-message-features/tests/pmf_proxy.rs
index 9eeb6d69e8..7413bf0ed9 100644
--- a/contracts/feature-tests/panic-message-features/tests/pmf_proxy.rs
+++ b/contracts/feature-tests/panic-message-features/tests/pmf_proxy.rs
@@ -52,17 +52,6 @@ where
     }
 }
 
-#[rustfmt::skip]
-impl<Env, From, To, Gas> PanicMessageFeaturesProxyMethods<Env, From, To, Gas>
-where
-    Env: TxEnv,
-    Env::Api: VMApi,
-    From: TxFrom<Env>,
-    To: TxTo<Env>,
-    Gas: TxGas<Env>,
-{
-}
-
 #[rustfmt::skip]
 impl<Env, From, To, Gas> PanicMessageFeaturesProxyMethods<Env, From, To, Gas>
 where

From c4b6fc5738811262655c80189879913f946761b8 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Mon, 1 Apr 2024 20:41:48 +0300
Subject: [PATCH 0618/1254] proxy gen - write refactor

---
 .../generate_proxy/proxy_generator.rs         | 184 +++++++++---------
 1 file changed, 87 insertions(+), 97 deletions(-)

diff --git a/framework/meta/src/cmd/contract/generate_proxy/proxy_generator.rs b/framework/meta/src/cmd/contract/generate_proxy/proxy_generator.rs
index 0f2410db50..055e9c402a 100644
--- a/framework/meta/src/cmd/contract/generate_proxy/proxy_generator.rs
+++ b/framework/meta/src/cmd/contract/generate_proxy/proxy_generator.rs
@@ -1,4 +1,4 @@
-use std::{fs::File, io::Write};
+use std::{fmt::Display, fs::File, io::Write};
 
 use multiversx_sc::abi::{
     EndpointAbi, EnumVariantDescription, InputAbi, OutputAbi, StructFieldDescription, TypeContents,
@@ -18,8 +18,7 @@ const PRELUDE: &str = "// Code generated by the multiversx-sc proxy generator. D
 #![allow(dead_code)]
 #![allow(clippy::all)]
 
-use multiversx_sc::proxy_imports::*;
-";
+use multiversx_sc::proxy_imports::*;";
 
 const ZERO: &str = "0";
 
@@ -44,6 +43,15 @@ impl<'a> ProxyGenerator<'a> {
         Self { meta_config, file }
     }
 
+    fn write(&mut self, s: impl Display) {
+        write!(self.file, "{s}").unwrap();
+    }
+
+    fn writeln(&mut self, s: impl Display) {
+        self.write(s);
+        self.write("\n");
+    }
+
     pub fn write_proxy_to_file(&mut self) {
         self.write_header();
         self.write_tx_proxy_type_def();
@@ -54,25 +62,22 @@ impl<'a> ProxyGenerator<'a> {
     }
 
     fn write_header(&mut self) {
-        self.file.write_fmt(format_args!("{PRELUDE}")).unwrap()
+        self.writeln(PRELUDE);
     }
 
     fn write_tx_proxy_type_def(&mut self) {
         let proxy_type_name = proxy_type_name(&self.meta_config.original_contract_abi.name);
-        writeln!(
-            self.file,
+        self.writeln(format!(
             r#"
 pub struct {proxy_type_name};"#
-        )
-        .unwrap();
+        ));
     }
 
     fn write_impl_for_tx_proxy(&mut self) {
         let proxy_type_name = proxy_type_name(&self.meta_config.original_contract_abi.name);
         let proxy_methods_type_name =
             proxy_methods_type_name(&self.meta_config.original_contract_abi.name);
-        writeln!(
-            self.file,
+        self.writeln(format!(
             r#"
 impl<Env, From, To, Gas> TxProxyTrait<Env, From, To, Gas> for {proxy_type_name}
 where
@@ -87,15 +92,13 @@ where
         {proxy_methods_type_name} {{ wrapped_tx: tx }}
     }}
 }}"#
-        )
-        .unwrap();
+        ));
     }
 
     fn write_struct_tx_proxy_methods(&mut self) {
         let proxy_methods_type_name =
             proxy_methods_type_name(&self.meta_config.original_contract_abi.name);
-        writeln!(
-            self.file,
+        self.writeln(format!(
             r#"
 pub struct {proxy_methods_type_name}<Env, From, To, Gas>
 where
@@ -106,8 +109,7 @@ where
 {{
     wrapped_tx: Tx<Env, From, To, (), Gas, (), ()>,
 }}"#
-        )
-        .unwrap();
+        ));
     }
 
     fn write_content(&mut self) {
@@ -172,14 +174,14 @@ where
         self.write_header_impl_constructor();
         for (i, constructor_abi) in constructors.into_iter().enumerate() {
             if i > 0 {
-                writeln!(self.file).unwrap();
+                self.writeln("");
             }
             self.write_constructor_header(&constructor_abi);
             self.write_constructor_content(constructor_abi.inputs);
             self.write_end_of_function();
         }
 
-        writeln!(self.file, "}}").unwrap();
+        self.writeln("}");
     }
 
     fn write_upgrades(&mut self) {
@@ -193,14 +195,14 @@ where
             .enumerate()
         {
             if i > 0 {
-                writeln!(self.file).unwrap();
+                self.writeln("");
             }
             self.write_upgrade_header(&upgrade);
             self.write_upgrade_content(upgrade.inputs);
             self.write_end_of_function();
         }
 
-        writeln!(self.file, "}}").unwrap();
+        self.writeln("}");
     }
 
     fn write_endpoints(&mut self) {
@@ -209,21 +211,20 @@ where
         self.write_header_impl_endpoints();
         for (i, endpoint_abi) in endpoints.into_iter().enumerate() {
             if i > 0 {
-                writeln!(self.file).unwrap();
+                self.writeln("");
             }
             self.write_endpoint_header(&endpoint_abi);
             self.write_endpoint_content(&endpoint_abi);
             self.write_end_of_function();
         }
 
-        writeln!(self.file, "}}").unwrap();
+        self.writeln("}");
     }
 
     fn write_header_impl_constructor(&mut self) {
         let proxy_methods_type_name =
             proxy_methods_type_name(&self.meta_config.original_contract_abi.name);
-        writeln!(
-            self.file,
+        self.writeln(format!(
             r#"
 #[rustfmt::skip]
 impl<Env, From, Gas> {proxy_methods_type_name}<Env, From, (), Gas>
@@ -233,15 +234,13 @@ where
     From: TxFrom<Env>,
     Gas: TxGas<Env>,
 {{"#
-        )
-        .unwrap();
+        ));
     }
 
     fn write_header_impl_upgrade(&mut self) {
         let proxy_methods_type_name =
             proxy_methods_type_name(&self.meta_config.original_contract_abi.name);
-        writeln!(
-            self.file,
+        self.writeln(format!(
             r#"
 #[rustfmt::skip]
 impl<Env, From, To, Gas> {proxy_methods_type_name}<Env, From, To, Gas>
@@ -252,15 +251,13 @@ where
     To: TxTo<Env>,
     Gas: TxGas<Env>,
 {{"#
-        )
-        .unwrap();
+        ));
     }
 
     fn write_header_impl_endpoints(&mut self) {
         let proxy_methods_type_name =
             proxy_methods_type_name(&self.meta_config.original_contract_abi.name);
-        writeln!(
-            self.file,
+        self.writeln(format!(
             r#"
 #[rustfmt::skip]
 impl<Env, From, To, Gas> {proxy_methods_type_name}<Env, From, To, Gas>
@@ -271,8 +268,7 @@ where
     To: TxTo<Env>,
     Gas: TxGas<Env>,
 {{"#
-        )
-        .unwrap();
+        ));
     }
 
     fn write_constructor_header(&mut self, constructor_abi: &EndpointAbi) {
@@ -291,45 +287,39 @@ where
     }
 
     fn write_constructor_content(&mut self, inputs: Vec<InputAbi>) {
-        writeln!(
-            self.file,
+        self.writeln(
             "        self.wrapped_tx
-            .raw_deploy()"
-        )
-        .unwrap();
+            .raw_deploy()",
+        );
         for input in inputs.iter() {
-            writeln!(self.file, "            .argument(&{})", input.arg_name).unwrap();
+            self.writeln(format!("            .argument(&{})", input.arg_name));
         }
-        writeln!(self.file, "            .original_result()").unwrap();
+        self.writeln("            .original_result()");
     }
 
     fn write_upgrade_content(&mut self, inputs: Vec<InputAbi>) {
-        writeln!(
-            self.file,
+        self.writeln(
             "        self.wrapped_tx
-            .raw_upgrade()"
-        )
-        .unwrap();
+            .raw_upgrade()",
+        );
         for input in inputs.iter() {
-            writeln!(self.file, "            .argument(&{})", input.arg_name).unwrap();
+            self.writeln(format!("            .argument(&{})", input.arg_name));
         }
-        writeln!(self.file, "            .original_result()").unwrap();
+        self.writeln("            .original_result()");
     }
 
     fn write_endpoint_content(&mut self, endpoint: &EndpointAbi) {
-        writeln!(
-            self.file,
+        self.writeln(format!(
             "        self.wrapped_tx
             .raw_call(\"{}\")",
             endpoint.name
-        )
-        .unwrap();
+        ));
 
         for input in endpoint.inputs.iter() {
-            writeln!(self.file, "            .argument(&{})", input.arg_name).unwrap();
+            self.writeln(format!("            .argument(&{})", input.arg_name));
         }
 
-        writeln!(self.file, "            .original_result()").unwrap();
+        self.writeln("            .original_result()");
     }
 
     fn write_fn_signature(&mut self, endpoint: &EndpointAbi) {
@@ -341,12 +331,12 @@ where
 
     fn write_endpoint_docs(&mut self, docs: &Vec<String>) {
         for doc in docs {
-            writeln!(self.file, "    /// {doc} ").unwrap();
+            self.writeln(format!("    /// {doc} "));
         }
     }
 
     fn write_function_header_endpoint(&mut self, rust_method_name: &String) {
-        write!(self.file, "    pub fn {rust_method_name}").unwrap();
+        self.write(format!("    pub fn {rust_method_name}"));
     }
 
     fn write_args(&mut self, inputs: &[InputAbi]) {
@@ -354,72 +344,72 @@ where
             return;
         }
 
-        writeln!(self.file, "<").unwrap();
+        self.writeln("<");
 
         for (index, input) in inputs.iter().enumerate() {
             self.write_argument(index, &input.type_names.rust);
         }
 
-        write!(self.file, "    >").unwrap();
+        self.write("    >");
     }
 
     fn write_argument(&mut self, index: usize, rust_name: &str) {
         let adjusted = self.adjust_type_name_with_env_api(rust_name);
-        writeln!(self.file, "        Arg{index}: CodecInto<{adjusted}>,").unwrap();
+        self.writeln(format!("        Arg{index}: CodecInto<{adjusted}>,"));
     }
 
     fn write_parameters(&mut self, inputs: &[InputAbi]) {
-        writeln!(self.file, "(").unwrap();
-        writeln!(self.file, "        self,").unwrap();
+        self.writeln("(");
+        self.writeln("        self,");
         for (index, input) in inputs.iter().enumerate() {
-            writeln!(self.file, "        {}: Arg{index},", &input.arg_name).unwrap();
+            self.writeln(format!("        {}: Arg{index},", &input.arg_name));
         }
-        write!(self.file, "    ) ").unwrap();
+        self.write("    ) ");
     }
 
     fn write_constructor_output(&mut self, outputs: &[OutputAbi]) {
-        write!(self.file, "-> TxProxyDeploy<Env, From, Gas, ").unwrap();
+        self.write("-> TxProxyDeploy<Env, From, Gas, ");
 
         self.parse_and_write_outputs(outputs);
 
-        writeln!(self.file, "> {{").unwrap();
+        self.writeln("> {");
     }
 
     fn write_upgrade_output(&mut self, outputs: &[OutputAbi]) {
-        write!(self.file, "-> TxProxyUpgrade<Env, From, To, Gas, ").unwrap();
+        self.write("-> TxProxyUpgrade<Env, From, To, Gas, ");
 
         self.parse_and_write_outputs(outputs);
 
-        writeln!(self.file, "> {{").unwrap();
+        self.writeln("> {");
     }
 
     fn write_endpoint_output(&mut self, outputs: &[OutputAbi]) {
-        write!(self.file, "-> TxProxyCall<Env, From, To, Gas, ").unwrap();
+        self.write("-> TxProxyCall<Env, From, To, Gas, ");
 
         self.parse_and_write_outputs(outputs);
 
-        writeln!(self.file, "> {{").unwrap();
+        self.writeln("> {");
     }
 
     fn parse_and_write_outputs(&mut self, outputs: &[OutputAbi]) {
         match outputs.len() {
             0 => {
-                write!(self.file, "()").unwrap();
+                self.write("()");
             },
             1 => {
                 let adjusted = self.adjust_type_name_with_env_api(&outputs[0].type_names.rust);
-                write!(self.file, "{adjusted}").unwrap();
+                self.write(adjusted);
             },
             _ => {
-                write!(self.file, "MultiValue{}<", outputs.len()).unwrap();
+                self.write(format!("MultiValue{}<", outputs.len()));
                 for (i, output) in outputs.iter().enumerate() {
                     if i > 0 {
-                        write!(self.file, ", ").unwrap();
+                        self.write(", ");
                     }
                     let adjusted = self.adjust_type_name_with_env_api(&output.type_names.rust);
-                    write!(self.file, "{adjusted}").unwrap();
+                    self.write(adjusted);
                 }
-                write!(self.file, ">").unwrap();
+                self.write(">");
             },
         }
     }
@@ -433,9 +423,9 @@ where
         self.start_write_type("enum", type_description, name);
 
         for variant in enum_variants {
-            write!(self.file, "    {}", variant.name).unwrap();
+            self.write(format!("    {}", variant.name));
             if variant.fields.is_empty() {
-                writeln!(self.file, ",").unwrap();
+                self.writeln(",");
                 continue;
             }
 
@@ -445,7 +435,7 @@ where
                 self.write_struct_in_variant(&variant.fields);
             }
         }
-        writeln!(self.file, "}}").unwrap();
+        self.writeln("}");
     }
 
     fn write_struct(
@@ -458,34 +448,34 @@ where
 
         for field in struct_fields {
             let adjusted_type_name = self.adjust_type_name_with_api(&field.field_type.rust);
-            writeln!(self.file, "    pub {}: {adjusted_type_name},", field.name).unwrap();
+            self.writeln(format!("    pub {}: {adjusted_type_name},", field.name));
         }
 
-        writeln!(self.file, "}}").unwrap();
+        self.writeln("}");
     }
 
     fn write_tuple_in_variant(&mut self, fields: &[StructFieldDescription]) {
-        write!(self.file, "(").unwrap();
-        let adjusted_type_name = self.adjust_type_name_with_api(&fields[0].field_type.rust);
-        write!(self.file, "{adjusted_type_name}").unwrap();
-
-        for field in &fields[1..] {
+        self.write("(");
+        for (i, field) in fields.iter().enumerate() {
+            if i > 0 {
+                self.write(", ");
+            }
             let adjusted_type_name = self.adjust_type_name_with_api(&field.field_type.rust);
-            write!(self.file, ", {adjusted_type_name}").unwrap();
+            self.write(adjusted_type_name);
         }
 
-        writeln!(self.file, "),").unwrap();
+        self.writeln("),");
     }
 
     fn write_struct_in_variant(&mut self, fields: &[StructFieldDescription]) {
-        writeln!(self.file, " {{").unwrap();
+        self.writeln(" {");
 
         for field in fields {
             let adjusted_type_name = self.adjust_type_name_with_api(&field.field_type.rust);
-            writeln!(self.file, "        {}: {adjusted_type_name},", field.name,).unwrap();
+            self.writeln(format!("        {}: {adjusted_type_name},", field.name,));
         }
 
-        writeln!(self.file, "    }},").unwrap();
+        self.writeln("    },");
     }
 
     pub fn clean_paths(&mut self, proxy_crate: &str, rust_type: &str) -> String {
@@ -524,9 +514,9 @@ where
         type_description: &TypeDescription,
         name: &str,
     ) {
-        writeln!(self.file).unwrap();
+        self.writeln("");
         self.write_macro_attributes(&type_description.macro_attributes);
-        write!(self.file, r#"pub {type_type} {name}"#).unwrap();
+        self.write(format!(r#"pub {type_type} {name}"#));
 
         if name.contains("<Api>") {
             writeln!(
@@ -537,17 +527,17 @@ where
             )
             .unwrap();
         } else {
-            write!(self.file, " ").unwrap();
+            self.write(" ");
         }
 
-        writeln!(self.file, r#"{{"#).unwrap();
+        self.writeln("{");
     }
 
     pub fn write_macro_attributes(&mut self, macro_attributes: &[String]) {
         if macro_attributes.is_empty() {
-            writeln!(self.file, "#[derive(TopEncode, TopDecode)]").unwrap();
+            self.writeln("#[derive(TopEncode, TopDecode)]");
         } else {
-            writeln!(self.file, "#[derive({})]", macro_attributes.join(", ")).unwrap();
+            self.writeln(format!("#[derive({})]", macro_attributes.join(", ")));
         }
     }
 
@@ -578,7 +568,7 @@ where
     }
 
     fn write_end_of_function(&mut self) {
-        writeln!(self.file, "    }}").unwrap();
+        self.writeln("    }");
     }
 }
 

From 2d520719921d35cafc1d21a9d956933d5afa2f34 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Mon, 1 Apr 2024 20:48:29 +0300
Subject: [PATCH 0619/1254] proxy gen - test refactor

---
 .../generate_proxy/proxy_generator.rs         | 37 ++++++++++---------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/framework/meta/src/cmd/contract/generate_proxy/proxy_generator.rs b/framework/meta/src/cmd/contract/generate_proxy/proxy_generator.rs
index 055e9c402a..f7b4d7f694 100644
--- a/framework/meta/src/cmd/contract/generate_proxy/proxy_generator.rs
+++ b/framework/meta/src/cmd/contract/generate_proxy/proxy_generator.rs
@@ -36,15 +36,19 @@ const TYPES_FROM_FRAMEWORK: &[&str] = &[
 
 pub struct ProxyGenerator<'a> {
     pub meta_config: &'a MetaConfig,
-    pub file: &'a mut File,
+    pub file: Option<&'a mut File>,
 }
 impl<'a> ProxyGenerator<'a> {
     pub fn new(meta_config: &'a MetaConfig, file: &'a mut File) -> Self {
-        Self { meta_config, file }
+        Self {
+            meta_config,
+            file: Some(file),
+        }
     }
 
     fn write(&mut self, s: impl Display) {
-        write!(self.file, "{s}").unwrap();
+        let file = self.file.as_mut().expect("output not configured");
+        write!(*file, "{s}").unwrap();
     }
 
     fn writeln(&mut self, s: impl Display) {
@@ -519,13 +523,11 @@ where
         self.write(format!(r#"pub {type_type} {name}"#));
 
         if name.contains("<Api>") {
-            writeln!(
-                self.file,
-                r#"
+            self.writeln(
+                "
 where
-    Api: ManagedTypeApi,"#
-            )
-            .unwrap();
+    Api: ManagedTypeApi,",
+            );
         } else {
             self.write(" ");
         }
@@ -574,17 +576,12 @@ where
 
 #[cfg(test)]
 pub mod tests {
-
-    use std::fs::File;
-
     use multiversx_sc::abi::{BuildInfoAbi, ContractAbi, ContractCrateBuildAbi, FrameworkBuildAbi};
 
     use crate::cmd::contract::meta_config::MetaConfig;
 
     use super::ProxyGenerator;
 
-    const CURRENT_FILE: &str = "src/cmd/contract/generate_proxy/proxy_generator.rs";
-
     #[test]
     fn clean_paths_unsanitized_test() {
         let build_info = BuildInfoAbi {
@@ -598,8 +595,10 @@ pub mod tests {
 
         let original_contract_abi = ContractAbi::new(build_info, &[""], "test", false);
         let meta_config = MetaConfig::create(original_contract_abi, false);
-        let mut file = File::open(CURRENT_FILE).unwrap();
-        let mut proxy_generator = ProxyGenerator::new(&meta_config, &mut file);
+        let mut proxy_generator = ProxyGenerator {
+            meta_config: &meta_config,
+            file: None,
+        };
         let name = proxy_generator
             .meta_config
             .original_contract_abi
@@ -633,8 +632,10 @@ pub mod tests {
 
         let original_contract_abi = ContractAbi::new(build_info, &[""], "test", false);
         let meta_config = MetaConfig::create(original_contract_abi, false);
-        let mut file = File::open(CURRENT_FILE).unwrap();
-        let mut proxy_generator = ProxyGenerator::new(&meta_config, &mut file);
+        let mut proxy_generator = ProxyGenerator {
+            meta_config: &meta_config,
+            file: None,
+        };
         let name = proxy_generator
             .meta_config
             .original_contract_abi

From f9b3056fba62bfd741649222ac2f634ebb991a1f Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Tue, 2 Apr 2024 11:57:49 +0300
Subject: [PATCH 0620/1254] proxy gen - changed path in unittests

---
 .../contract/generate_proxy/proxy_generator.rs    | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/framework/meta/src/cmd/contract/generate_proxy/proxy_generator.rs b/framework/meta/src/cmd/contract/generate_proxy/proxy_generator.rs
index f7b4d7f694..5cc4c6fc04 100644
--- a/framework/meta/src/cmd/contract/generate_proxy/proxy_generator.rs
+++ b/framework/meta/src/cmd/contract/generate_proxy/proxy_generator.rs
@@ -492,6 +492,7 @@ where
         let mut words_replacer: Vec<String> = Vec::new();
         for word in &words {
             let type_rust_name = word.split("::").last().unwrap().to_string();
+            // println!("type_rust_name >> {type_rust_name}");
             if proxy_crate == extract_struct_crate(word)
                 || TYPES_FROM_FRAMEWORK.contains(&type_rust_name.as_str())
             {
@@ -586,14 +587,14 @@ pub mod tests {
     fn clean_paths_unsanitized_test() {
         let build_info = BuildInfoAbi {
             contract_crate: ContractCrateBuildAbi {
-                name: "test",
+                name: "contract-crate",
                 version: "0.0.0",
                 git_version: "0.0.0",
             },
             framework: FrameworkBuildAbi::create(),
         };
 
-        let original_contract_abi = ContractAbi::new(build_info, &[""], "test", false);
+        let original_contract_abi = ContractAbi::new(build_info, &[""], "contract-crate", false);
         let meta_config = MetaConfig::create(original_contract_abi, false);
         let mut proxy_generator = ProxyGenerator {
             meta_config: &meta_config,
@@ -608,10 +609,10 @@ pub mod tests {
 
         let cleaned_path_unsanitized = proxy_generator.clean_paths(
             name,
-            "(testt::path::test::to::TestStruct, Option<path::to::test::Box<AbiTestType>>)",
+            "(other_crate::contract_crate::TestStruct, Option<contract_crate::other_crate::Box<AbiTestType>>)",
         );
         let expected_result_unsanitized =
-            "(testt::path::test::to::TestStruct, Option<path::to::test::Box<AbiTestType>>)";
+            "(other_crate::contract_crate::TestStruct, Option<Box<AbiTestType>>)";
 
         assert_eq!(
             expected_result_unsanitized,
@@ -623,14 +624,14 @@ pub mod tests {
     fn clean_paths_sanitized_test() {
         let build_info = BuildInfoAbi {
             contract_crate: ContractCrateBuildAbi {
-                name: "test",
+                name: "contract-crate",
                 version: "0.0.0",
                 git_version: "0.0.0",
             },
             framework: FrameworkBuildAbi::create(),
         };
 
-        let original_contract_abi = ContractAbi::new(build_info, &[""], "test", false);
+        let original_contract_abi = ContractAbi::new(build_info, &[""], "contract-crate", false);
         let meta_config = MetaConfig::create(original_contract_abi, false);
         let mut proxy_generator = ProxyGenerator {
             meta_config: &meta_config,
@@ -645,7 +646,7 @@ pub mod tests {
 
         let cleaned_path_sanitized = proxy_generator.clean_paths(
             name,
-            "(test::path::test::to::TestStruct, Option<test::path::to::test::Box<AbiTestType>>)",
+            "(contract_crate::other_crate::TestStruct, Option<contract_crate::Box<AbiTestType>>)",
         );
         let expected_result_sanitized = "(TestStruct, Option<Box<AbiTestType>>)";
 

From 0cf9262567ecdffaf83bda4d767b72ce94127e05 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Tue, 2 Apr 2024 12:00:57 +0300
Subject: [PATCH 0621/1254] proxy gen - cleanup

---
 .../meta/src/cmd/contract/generate_proxy/proxy_generator.rs      | 1 -
 1 file changed, 1 deletion(-)

diff --git a/framework/meta/src/cmd/contract/generate_proxy/proxy_generator.rs b/framework/meta/src/cmd/contract/generate_proxy/proxy_generator.rs
index 5cc4c6fc04..872ea416f8 100644
--- a/framework/meta/src/cmd/contract/generate_proxy/proxy_generator.rs
+++ b/framework/meta/src/cmd/contract/generate_proxy/proxy_generator.rs
@@ -492,7 +492,6 @@ where
         let mut words_replacer: Vec<String> = Vec::new();
         for word in &words {
             let type_rust_name = word.split("::").last().unwrap().to_string();
-            // println!("type_rust_name >> {type_rust_name}");
             if proxy_crate == extract_struct_crate(word)
                 || TYPES_FROM_FRAMEWORK.contains(&type_rust_name.as_str())
             {

From 515a373e670f92f8f6c25eb597f28f6efe3e8390 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Tue, 2 Apr 2024 12:20:52 +0200
Subject: [PATCH 0622/1254] replace contract_call and migrate to unified

---
 .../examples/multisig/src/multisig_perform.rs | 13 +++++-----
 .../src/distribution_module.rs                |  9 +++----
 .../src/forwarder_raw_alt_init.rs             | 10 ++++----
 .../forwarder-raw/src/forwarder_raw_async.rs  | 19 +++++++++++----
 .../src/call_promise_direct.rs                | 24 ++++++++++---------
 .../composability/vault/src/vault.rs          |  9 +++----
 contracts/modules/src/governance/mod.rs       | 16 +++++--------
 7 files changed, 55 insertions(+), 45 deletions(-)

diff --git a/contracts/examples/multisig/src/multisig_perform.rs b/contracts/examples/multisig/src/multisig_perform.rs
index 1912b85321..7efa2862bf 100644
--- a/contracts/examples/multisig/src/multisig_perform.rs
+++ b/contracts/examples/multisig/src/multisig_perform.rs
@@ -189,13 +189,14 @@ pub trait MultisigPerformModule:
                     &call_data.endpoint_name,
                     call_data.arguments.as_multi(),
                 );
-                self.send()
-                    .contract_call::<()>(call_data.to, call_data.endpoint_name)
-                    .with_egld_transfer(call_data.egld_amount)
-                    .with_raw_arguments(call_data.arguments.into())
-                    .async_call()
+
+                self.tx()
+                    .to(&call_data.to)
+                    .raw_call(call_data.endpoint_name)
+                    .arguments_raw(call_data.arguments.into())
+                    .egld(call_data.egld_amount)
                     .with_callback(self.callbacks().perform_async_call_callback())
-                    .call_and_exit()
+                    .async_call_and_exit();
             },
             Action::SCDeployFromSource {
                 amount,
diff --git a/contracts/examples/seed-nft-minter/src/distribution_module.rs b/contracts/examples/seed-nft-minter/src/distribution_module.rs
index 5190ba5505..d91d6e6ae2 100644
--- a/contracts/examples/seed-nft-minter/src/distribution_module.rs
+++ b/contracts/examples/seed-nft-minter/src/distribution_module.rs
@@ -33,10 +33,11 @@ pub trait DistributionModule {
             if payment_amount == 0 {
                 continue;
             }
-            self.send()
-                .contract_call::<IgnoreValue>(distribution.address, distribution.endpoint)
-                .with_egld_or_single_esdt_transfer((token_id.clone(), token_nonce, payment_amount))
-                .with_gas_limit(distribution.gas_limit)
+            self.tx()
+                .to(&distribution.address)
+                .raw_call(distribution.endpoint)
+                .egld_or_single_esdt((token_id.clone(), token_nonce, payment_amount))
+                .gas(distribution.gas_limit)
                 .transfer_execute();
         }
     }
diff --git a/contracts/feature-tests/composability/forwarder-raw/src/forwarder_raw_alt_init.rs b/contracts/feature-tests/composability/forwarder-raw/src/forwarder_raw_alt_init.rs
index d677842e41..0ded59b36d 100644
--- a/contracts/feature-tests/composability/forwarder-raw/src/forwarder_raw_alt_init.rs
+++ b/contracts/feature-tests/composability/forwarder-raw/src/forwarder_raw_alt_init.rs
@@ -17,11 +17,11 @@ pub trait ForwarderRawAlterativeInit: super::forwarder_raw_common::ForwarderRawC
         endpoint_name: ManagedBuffer,
         args: MultiValueEncoded<ManagedBuffer>,
     ) {
-        self.send()
-            .contract_call::<()>(to, endpoint_name)
-            .with_raw_arguments(args.to_arg_buffer())
-            .async_call()
-            .call_and_exit();
+        self.tx()
+            .to(&to)
+            .raw_call(endpoint_name)
+            .arguments_raw(args.to_arg_buffer())
+            .async_call_and_exit();
     }
 
     /// Will not work, only written for VM testing.
diff --git a/contracts/feature-tests/composability/forwarder-raw/src/forwarder_raw_async.rs b/contracts/feature-tests/composability/forwarder-raw/src/forwarder_raw_async.rs
index c25b6730f4..ad276c32b0 100644
--- a/contracts/feature-tests/composability/forwarder-raw/src/forwarder_raw_async.rs
+++ b/contracts/feature-tests/composability/forwarder-raw/src/forwarder_raw_async.rs
@@ -33,11 +33,20 @@ pub trait ForwarderRawAsync: super::forwarder_raw_common::ForwarderRawCommon {
         payment_amount: BigUint,
         endpoint_name: ManagedBuffer,
         args: MultiValueEncoded<ManagedBuffer>,
-    ) -> ContractCallWithEgldOrSingleEsdt<Self::Api, ()> {
-        self.send()
-            .contract_call(to, endpoint_name)
-            .with_raw_arguments(args.to_arg_buffer())
-            .with_egld_or_single_esdt_transfer((payment_token, 0, payment_amount))
+    ) -> Tx<
+        TxScEnv<Self::Api>,
+        (),
+        ManagedAddress,
+        EgldOrEsdtTokenPayment<Self::Api>,
+        (),
+        FunctionCall<Self::Api>,
+        (),
+    > {
+        self.tx()
+            .to(to)
+            .raw_call(endpoint_name)
+            .arguments_raw(args.to_arg_buffer())
+            .egld_or_single_esdt((payment_token, 0, payment_amount))
     }
 
     #[endpoint]
diff --git a/contracts/feature-tests/composability/promises-features/src/call_promise_direct.rs b/contracts/feature-tests/composability/promises-features/src/call_promise_direct.rs
index 7ae949e214..b47a1f4feb 100644
--- a/contracts/feature-tests/composability/promises-features/src/call_promise_direct.rs
+++ b/contracts/feature-tests/composability/promises-features/src/call_promise_direct.rs
@@ -14,14 +14,15 @@ pub trait CallPromisesDirectModule {
         args: MultiValueEncoded<ManagedBuffer>,
     ) {
         let payment = self.call_value().egld_or_single_esdt();
-        self.send()
-            .contract_call::<()>(to, endpoint_name)
-            .with_egld_or_single_esdt_transfer(payment)
-            .with_raw_arguments(args.to_arg_buffer())
-            .with_gas_limit(gas_limit)
+        self.tx()
+            .to(&to)
+            .raw_call(endpoint_name)
+            .egld_or_single_esdt(payment)
+            .arguments_raw(args.to_arg_buffer())
+            .gas(gas_limit)
             .async_call_promise()
-            .with_extra_gas_for_callback(extra_gas_for_callback)
             .with_callback(self.callbacks().the_one_callback(1001, 1002u32.into()))
+            .gas_for_callback(extra_gas_for_callback)
             .register_promise();
     }
 
@@ -40,13 +41,14 @@ pub trait CallPromisesDirectModule {
 
         let gas_limit = (self.blockchain().get_gas_left() - extra_gas_for_callback) * 9 / 10;
 
-        self.send()
-            .contract_call::<()>(to, endpoint_name)
-            .with_multi_token_transfer(token_payments_vec)
-            .with_gas_limit(gas_limit)
+        self.tx()
+            .to(&to)
+            .raw_call(endpoint_name)
+            .egld_or_multi_esdt(EgldOrMultiEsdtPayment::MultiEsdt(token_payments_vec))
+            .gas(gas_limit)
             .async_call_promise()
-            .with_extra_gas_for_callback(extra_gas_for_callback)
             .with_callback(self.callbacks().the_one_callback(2001, 2002u32.into()))
+            .gas_for_callback(extra_gas_for_callback)
             .register_promise();
     }
 
diff --git a/contracts/feature-tests/composability/vault/src/vault.rs b/contracts/feature-tests/composability/vault/src/vault.rs
index e7f11e25d9..9f293bae45 100644
--- a/contracts/feature-tests/composability/vault/src/vault.rs
+++ b/contracts/feature-tests/composability/vault/src/vault.rs
@@ -150,10 +150,11 @@ pub trait Vault {
         for _ in 0..nr_callbacks {
             self.num_async_calls_sent_from_child().update(|c| *c += 1);
 
-            self.send()
-                .contract_call::<()>(caller.clone(), endpoint_name.clone())
-                .with_egld_or_single_esdt_transfer(return_payment.clone())
-                .with_gas_limit(self.blockchain().get_gas_left() / 2)
+            self.tx()
+                .to(&caller)
+                .raw_call(endpoint_name.clone())
+                .egld_or_single_esdt(return_payment.clone())
+                .gas(self.blockchain().get_gas_left() / 2)
                 .transfer_execute()
         }
     }
diff --git a/contracts/modules/src/governance/mod.rs b/contracts/modules/src/governance/mod.rs
index 624a6949e1..92eeb038db 100644
--- a/contracts/modules/src/governance/mod.rs
+++ b/contracts/modules/src/governance/mod.rs
@@ -278,16 +278,12 @@ pub trait GovernanceModule:
         self.clear_proposal(proposal_id);
 
         for action in proposal.actions {
-            let mut contract_call = self
-                .send()
-                .contract_call::<()>(action.dest_address, action.function_name)
-                .with_gas_limit(action.gas_limit);
-
-            for arg in &action.arguments {
-                contract_call.push_raw_argument(arg);
-            }
-
-            contract_call.transfer_execute();
+            self.tx()
+                .to(&action.dest_address)
+                .raw_call(action.function_name)
+                .gas(action.gas_limit)
+                .arguments_raw(action.arguments.into())
+                .transfer_execute()
         }
 
         self.proposal_executed_event(proposal_id);

From 931d5624d89cdeb5a497107d913a24d2eee35d91 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Tue, 2 Apr 2024 12:26:20 +0200
Subject: [PATCH 0623/1254] callback fix

---
 contracts/examples/multisig/src/multisig_perform.rs           | 2 +-
 .../promises-features/src/call_promise_direct.rs              | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/contracts/examples/multisig/src/multisig_perform.rs b/contracts/examples/multisig/src/multisig_perform.rs
index 7efa2862bf..dfa7016340 100644
--- a/contracts/examples/multisig/src/multisig_perform.rs
+++ b/contracts/examples/multisig/src/multisig_perform.rs
@@ -195,7 +195,7 @@ pub trait MultisigPerformModule:
                     .raw_call(call_data.endpoint_name)
                     .arguments_raw(call_data.arguments.into())
                     .egld(call_data.egld_amount)
-                    .with_callback(self.callbacks().perform_async_call_callback())
+                    .callback(self.callbacks().perform_async_call_callback())
                     .async_call_and_exit();
             },
             Action::SCDeployFromSource {
diff --git a/contracts/feature-tests/composability/promises-features/src/call_promise_direct.rs b/contracts/feature-tests/composability/promises-features/src/call_promise_direct.rs
index b47a1f4feb..e98e9b0c3b 100644
--- a/contracts/feature-tests/composability/promises-features/src/call_promise_direct.rs
+++ b/contracts/feature-tests/composability/promises-features/src/call_promise_direct.rs
@@ -21,7 +21,7 @@ pub trait CallPromisesDirectModule {
             .arguments_raw(args.to_arg_buffer())
             .gas(gas_limit)
             .async_call_promise()
-            .with_callback(self.callbacks().the_one_callback(1001, 1002u32.into()))
+            .callback(self.callbacks().the_one_callback(1001, 1002u32.into()))
             .gas_for_callback(extra_gas_for_callback)
             .register_promise();
     }
@@ -47,7 +47,7 @@ pub trait CallPromisesDirectModule {
             .egld_or_multi_esdt(EgldOrMultiEsdtPayment::MultiEsdt(token_payments_vec))
             .gas(gas_limit)
             .async_call_promise()
-            .with_callback(self.callbacks().the_one_callback(2001, 2002u32.into()))
+            .callback(self.callbacks().the_one_callback(2001, 2002u32.into()))
             .gas_for_callback(extra_gas_for_callback)
             .register_promise();
     }

From fe664c34ff9869542b4e7beb2233937d15c28b28 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Tue, 2 Apr 2024 15:03:15 +0300
Subject: [PATCH 0624/1254] proxy gen - replace char removed

---
 .../generate_proxy/proxy_generator.rs         | 42 +++++--------------
 .../contract/generate_proxy/proxy_naming.rs   |  9 +---
 2 files changed, 11 insertions(+), 40 deletions(-)

diff --git a/framework/meta/src/cmd/contract/generate_proxy/proxy_generator.rs b/framework/meta/src/cmd/contract/generate_proxy/proxy_generator.rs
index 872ea416f8..4528f53af6 100644
--- a/framework/meta/src/cmd/contract/generate_proxy/proxy_generator.rs
+++ b/framework/meta/src/cmd/contract/generate_proxy/proxy_generator.rs
@@ -145,9 +145,7 @@ where
             if self
                 .meta_config
                 .original_contract_abi
-                .build_info
-                .contract_crate
-                .name
+                .get_crate_name_for_code()
                 != extract_struct_crate(type_description.names.rust.as_str())
             {
                 continue;
@@ -482,20 +480,24 @@ where
         self.writeln("    },");
     }
 
-    pub fn clean_paths(&mut self, proxy_crate: &str, rust_type: &str) -> String {
+    pub fn clean_paths(&mut self, rust_type: &str) -> String {
         let delimiters = "<>,()[] ";
         let words: Vec<&str> = rust_type
             .split(|c| delimiters.contains(c))
             .filter(|s| !s.is_empty())
             .collect();
 
+        let crate_name = self
+            .meta_config
+            .original_contract_abi
+            .get_crate_name_for_code();
         let mut words_replacer: Vec<String> = Vec::new();
         for word in &words {
-            let type_rust_name = word.split("::").last().unwrap().to_string();
-            if proxy_crate == extract_struct_crate(word)
-                || TYPES_FROM_FRAMEWORK.contains(&type_rust_name.as_str())
+            let type_rust_name = word.split("::").last().unwrap();
+            if crate_name == extract_struct_crate(word)
+                || TYPES_FROM_FRAMEWORK.contains(&type_rust_name)
             {
-                words_replacer.push(type_rust_name);
+                words_replacer.push(type_rust_name.to_string());
             } else {
                 words_replacer.push(word.to_string());
             }
@@ -545,11 +547,6 @@ where
 
     fn adjust_type_name_with_env_api(&mut self, original_rust_name: &str) -> String {
         self.clean_paths(
-            self.meta_config
-                .original_contract_abi
-                .build_info
-                .contract_crate
-                .name,
             &original_rust_name
                 .replace("multiversx_sc::api::uncallable::UncallableApi", "Env::Api")
                 .replace("$API", "Env::Api"),
@@ -558,11 +555,6 @@ where
 
     fn adjust_type_name_with_api(&mut self, original_rust_name: &str) -> String {
         self.clean_paths(
-            self.meta_config
-                .original_contract_abi
-                .build_info
-                .contract_crate
-                .name,
             &original_rust_name
                 .replace("multiversx_sc::api::uncallable::UncallableApi", "Api")
                 .replace("$API", "Api"),
@@ -599,15 +591,8 @@ pub mod tests {
             meta_config: &meta_config,
             file: None,
         };
-        let name = proxy_generator
-            .meta_config
-            .original_contract_abi
-            .build_info
-            .contract_crate
-            .name;
 
         let cleaned_path_unsanitized = proxy_generator.clean_paths(
-            name,
             "(other_crate::contract_crate::TestStruct, Option<contract_crate::other_crate::Box<AbiTestType>>)",
         );
         let expected_result_unsanitized =
@@ -636,15 +621,8 @@ pub mod tests {
             meta_config: &meta_config,
             file: None,
         };
-        let name = proxy_generator
-            .meta_config
-            .original_contract_abi
-            .build_info
-            .contract_crate
-            .name;
 
         let cleaned_path_sanitized = proxy_generator.clean_paths(
-            name,
             "(contract_crate::other_crate::TestStruct, Option<contract_crate::Box<AbiTestType>>)",
         );
         let expected_result_sanitized = "(TestStruct, Option<Box<AbiTestType>>)";
diff --git a/framework/meta/src/cmd/contract/generate_proxy/proxy_naming.rs b/framework/meta/src/cmd/contract/generate_proxy/proxy_naming.rs
index ada7559e01..3c4f1dac2e 100644
--- a/framework/meta/src/cmd/contract/generate_proxy/proxy_naming.rs
+++ b/framework/meta/src/cmd/contract/generate_proxy/proxy_naming.rs
@@ -7,13 +7,6 @@ pub(super) fn proxy_methods_type_name(contract_trait_name: &str) -> String {
 }
 
 pub(super) fn extract_struct_crate(struct_path: &str) -> String {
-    let struct_crate_name = struct_path
-        .replace('_', "-")
-        .replace("multiversx_sc::api::uncallable::UncallableApi", "Api")
-        .to_string();
-    let crate_name = struct_crate_name
-        .split("::")
-        .next()
-        .unwrap_or_else(|| &struct_crate_name);
+    let crate_name = struct_path.split("::").next().unwrap_or(struct_path);
     crate_name.to_string()
 }

From 0bd3e86fb8a6fc26c5e45339d995e8857b2c166e Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Tue, 2 Apr 2024 16:12:46 +0200
Subject: [PATCH 0625/1254] impl EgldOrEsdtTokenPaymentRefs

---
 .../base/src/types/interaction/tx_payment.rs  |   2 +
 .../tx_payment/tx_payment_egld_or_esdt_ref.rs | 117 ++++++++++++++++++
 2 files changed, 119 insertions(+)
 create mode 100644 framework/base/src/types/interaction/tx_payment/tx_payment_egld_or_esdt_ref.rs

diff --git a/framework/base/src/types/interaction/tx_payment.rs b/framework/base/src/types/interaction/tx_payment.rs
index 4e3c560bcb..aed63a90d4 100644
--- a/framework/base/src/types/interaction/tx_payment.rs
+++ b/framework/base/src/types/interaction/tx_payment.rs
@@ -1,5 +1,6 @@
 mod tx_payment_egld;
 mod tx_payment_egld_or_esdt;
+mod tx_payment_egld_or_esdt_ref;
 mod tx_payment_egld_or_multi_esdt;
 mod tx_payment_egld_or_multi_esdt_ref;
 mod tx_payment_egld_value;
@@ -9,6 +10,7 @@ mod tx_payment_single_esdt;
 mod tx_payment_single_esdt_ref;
 
 pub use tx_payment_egld::{Egld, EgldPayment};
+pub use tx_payment_egld_or_esdt_ref::*;
 pub use tx_payment_egld_value::TxEgldValue;
 pub use tx_payment_multi_esdt::TxPaymentMultiEsdt;
 
diff --git a/framework/base/src/types/interaction/tx_payment/tx_payment_egld_or_esdt_ref.rs b/framework/base/src/types/interaction/tx_payment/tx_payment_egld_or_esdt_ref.rs
new file mode 100644
index 0000000000..d7dc216308
--- /dev/null
+++ b/framework/base/src/types/interaction/tx_payment/tx_payment_egld_or_esdt_ref.rs
@@ -0,0 +1,117 @@
+use alloc::borrow::ToOwned;
+
+use crate::{
+    api::ManagedTypeApi,
+    contract_base::SendRawWrapper,
+    proxy_imports::EgldOrEsdtTokenIdentifier,
+    types::{
+        AnnotatedValue, BigUint, EgldOrEsdtTokenPayment, EgldOrMultiEsdtPayment, EsdtTokenPayment,
+        EsdtTokenPaymentRefs, ManagedAddress, ManagedType, ManagedVec, MultiEsdtPayment, TxFrom,
+        TxToSpecified,
+    },
+};
+
+use super::{
+    AnnotatedEgldPayment, Egld, FullPaymentData, FunctionCall, TxEgldValue, TxEnv, TxPayment,
+};
+
+impl<'a, Env> TxPayment<Env> for EgldOrEsdtTokenPaymentRefs<'a, Env::Api>
+where
+    Env: TxEnv,
+{
+    fn is_no_payment(&self, _env: &Env) -> bool {
+        self.is_empty()
+    }
+
+    fn perform_transfer_execute(
+        self,
+        env: &Env,
+        to: &ManagedAddress<Env::Api>,
+        gas_limit: u64,
+        fc: FunctionCall<Env::Api>,
+    ) {
+        self.map_egld_or_esdt(
+            (to, fc),
+            |(to, fc), amount| Egld(amount).perform_transfer_execute(env, to, gas_limit, fc),
+            |(to, fc), esdt_payment| esdt_payment.perform_transfer_execute(env, to, gas_limit, fc),
+        )
+    }
+
+    fn with_normalized<From, To, F, R>(
+        self,
+        env: &Env,
+        from: &From,
+        to: To,
+        fc: FunctionCall<Env::Api>,
+        f: F,
+    ) -> R
+    where
+        From: TxFrom<Env>,
+        To: TxToSpecified<Env>,
+        F: FnOnce(&ManagedAddress<Env::Api>, &BigUint<Env::Api>, &FunctionCall<Env::Api>) -> R,
+    {
+        self.map_egld_or_esdt(
+            (to, fc, f),
+            |(to, fc, f), amount| Egld(amount).with_normalized(env, from, to, fc, f),
+            |(to, fc, f), esdt_payment| esdt_payment.with_normalized(env, from, to, fc, f),
+        )
+    }
+
+    fn into_full_payment_data(self, env: &Env) -> FullPaymentData<Env::Api> {
+        self.map_egld_or_esdt(
+            (),
+            |(), amount| TxPayment::<Env>::into_full_payment_data(Egld(amount), env),
+            |(), esdt_payment| TxPayment::<Env>::into_full_payment_data(esdt_payment, env),
+        )
+    }
+}
+
+pub struct EgldOrEsdtTokenPaymentRefs<'a, M: ManagedTypeApi> {
+    pub token_identifier: &'a EgldOrEsdtTokenIdentifier<M>,
+    pub token_nonce: u64,
+    pub amount: &'a BigUint<M>,
+}
+
+impl<M: ManagedTypeApi> EgldOrEsdtTokenPayment<M> {
+    pub fn as_refs(&self) -> EgldOrEsdtTokenPaymentRefs<'_, M> {
+        EgldOrEsdtTokenPaymentRefs {
+            token_identifier: &self.token_identifier,
+            token_nonce: self.token_nonce,
+            amount: &self.amount,
+        }
+    }
+}
+
+impl<'a, M: ManagedTypeApi> EgldOrEsdtTokenPaymentRefs<'a, M> {
+    pub fn to_owned_payment(&self) -> EgldOrEsdtTokenPayment<M> {
+        EgldOrEsdtTokenPayment {
+            token_identifier: self.token_identifier.clone(),
+            token_nonce: self.token_nonce,
+            amount: self.amount.clone(),
+        }
+    }
+
+    pub fn is_empty(&self) -> bool {
+        self.amount == &BigUint::zero()
+    }
+
+    pub fn map_egld_or_esdt<Context, D, F, U>(self, context: Context, for_egld: D, for_esdt: F) -> U
+    where
+        D: FnOnce(Context, &BigUint<M>) -> U,
+        F: FnOnce(Context, EgldOrEsdtTokenPaymentRefs<M>) -> U,
+    {
+        if self.token_identifier.data.is_some() {
+            let token_identifier = unsafe { self.token_identifier.clone().data.unwrap_no_check() };
+            for_esdt(
+                context,
+                EgldOrEsdtTokenPaymentRefs {
+                    token_identifier: &EgldOrEsdtTokenIdentifier::esdt(token_identifier),
+                    token_nonce: self.token_nonce,
+                    amount: self.amount,
+                },
+            )
+        } else {
+            for_egld(context, self.amount)
+        }
+    }
+}

From 3506d2533f19b120f144f19ee8f4dffd4c1cca23 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 2 Apr 2024 21:55:10 +0300
Subject: [PATCH 0626/1254] Tx -> Step conversion refactor - part 1

---
 framework/scenario/src/facade/world_tx.rs     |   1 -
 .../facade/world_tx/scenario_env_deploy.rs    |  20 +-
 .../src/facade/world_tx/scenario_env_exec.rs  |  24 +--
 .../src/facade/world_tx/scenario_env_query.rs |  17 +-
 .../src/facade/world_tx/scenario_env_util.rs  | 175 ------------------
 .../src/{scenario/mod.rs => scenario.rs}      |   1 +
 framework/scenario/src/scenario/tx_to_step.rs |  11 ++
 .../scenario/tx_to_step/step_annotation.rs    |  40 ++++
 .../src/scenario/tx_to_step/step_wrapper.rs   |  48 +++++
 .../scenario/tx_to_step/tx_to_step_call.rs    |  75 ++++++++
 .../scenario/tx_to_step/tx_to_step_deploy.rs  |  67 +++++++
 .../scenario/tx_to_step/tx_to_step_query.rs   |  44 +++++
 .../scenario/tx_to_step/tx_to_step_trait.rs   |  17 ++
 .../tx_to_step/tx_to_step_transfer.rs         |  58 ++++++
 .../snippets/src/itx/interactor_env_deploy.rs |  41 ++--
 .../snippets/src/itx/interactor_env_exec.rs   |  39 ++--
 .../snippets/src/itx/interactor_env_query.rs  |  36 ++--
 .../snippets/src/itx/interactor_env_transf.rs |  18 +-
 18 files changed, 448 insertions(+), 284 deletions(-)
 delete mode 100644 framework/scenario/src/facade/world_tx/scenario_env_util.rs
 rename framework/scenario/src/{scenario/mod.rs => scenario.rs} (91%)
 create mode 100644 framework/scenario/src/scenario/tx_to_step.rs
 create mode 100644 framework/scenario/src/scenario/tx_to_step/step_annotation.rs
 create mode 100644 framework/scenario/src/scenario/tx_to_step/step_wrapper.rs
 create mode 100644 framework/scenario/src/scenario/tx_to_step/tx_to_step_call.rs
 create mode 100644 framework/scenario/src/scenario/tx_to_step/tx_to_step_deploy.rs
 create mode 100644 framework/scenario/src/scenario/tx_to_step/tx_to_step_query.rs
 create mode 100644 framework/scenario/src/scenario/tx_to_step/tx_to_step_trait.rs
 create mode 100644 framework/scenario/src/scenario/tx_to_step/tx_to_step_transfer.rs

diff --git a/framework/scenario/src/facade/world_tx.rs b/framework/scenario/src/facade/world_tx.rs
index 0ccbdd9514..b72fe5b88c 100644
--- a/framework/scenario/src/facade/world_tx.rs
+++ b/framework/scenario/src/facade/world_tx.rs
@@ -5,7 +5,6 @@ mod scenario_env;
 mod scenario_env_deploy;
 mod scenario_env_exec;
 mod scenario_env_query;
-pub mod scenario_env_util;
 mod scenario_rh_impl;
 
 pub use expr::*;
diff --git a/framework/scenario/src/facade/world_tx/scenario_env_deploy.rs b/framework/scenario/src/facade/world_tx/scenario_env_deploy.rs
index ef7b2a243f..c218f06869 100644
--- a/framework/scenario/src/facade/world_tx/scenario_env_deploy.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_env_deploy.rs
@@ -12,11 +12,12 @@ use multiversx_sc::{
 
 use crate::{
     api::StaticApi,
+    scenario::tx_to_step::TxToStep,
     scenario_model::{AddressValue, BytesValue, ScCallStep, ScDeployStep, TxResponse},
     ScenarioEnvExec, ScenarioTxEnv, ScenarioTxRun, ScenarioWorld,
 };
 
-use super::{scenario_env_util::*, ScenarioTxEnvData};
+use super::ScenarioTxEnvData;
 
 impl<'w, From, Payment, Gas, CodeValue, RH> ScenarioTxRun
     for Tx<
@@ -39,11 +40,9 @@ where
     type Returns = <RH::ListReturns as NestedTupleFlatten>::Unpacked;
 
     fn run(self) -> Self::Returns {
-        let mut step =
-            tx_to_sc_deploy_step(&self.env, self.from, self.payment, self.gas, self.data);
-        step.expect = Some(self.result_handler.list_tx_expect());
-        self.env.world.sc_deploy(&mut step);
-        process_result(step.response, self.result_handler)
+        let mut step_wrapper = self.tx_to_step();
+        step_wrapper.env.world.sc_deploy(&mut step_wrapper.step);
+        step_wrapper.process_result()
     }
 }
 
@@ -70,10 +69,11 @@ impl ScenarioWorld {
         let env = self.new_env_data();
         let tx_base = TxBaseWithEnv::new_with_env(env);
         let tx = f(tx_base);
-        let mut step = tx_to_sc_deploy_step(&tx.env, tx.from, tx.payment, tx.gas, tx.data);
-        self.sc_deploy(&mut step);
-        step.expect = Some(tx.result_handler.list_tx_expect());
-        process_result(step.response, tx.result_handler);
+
+        let mut step_wrapper = tx.tx_to_step();
+        self.sc_deploy(&mut step_wrapper.step);
+        step_wrapper.process_result();
+
         self
     }
 }
diff --git a/framework/scenario/src/facade/world_tx/scenario_env_exec.rs b/framework/scenario/src/facade/world_tx/scenario_env_exec.rs
index 8ea522c410..3c292bd650 100644
--- a/framework/scenario/src/facade/world_tx/scenario_env_exec.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_env_exec.rs
@@ -12,11 +12,12 @@ use multiversx_sc::{
 
 use crate::{
     api::StaticApi,
+    scenario::tx_to_step::TxToStep,
     scenario_model::{AddressValue, BytesValue, ScCallStep, ScDeployStep, TxExpect, TxResponse},
     ScenarioTxEnv, ScenarioTxRun, ScenarioWorld,
 };
 
-use super::{scenario_env_util::*, ScenarioTxEnvData};
+use super::ScenarioTxEnvData;
 
 /// Environment for executing transactions.
 pub struct ScenarioEnvExec<'w> {
@@ -61,17 +62,9 @@ where
     type Returns = <RH::ListReturns as NestedTupleFlatten>::Unpacked;
 
     fn run(self) -> Self::Returns {
-        let mut step = tx_to_sc_call_step(
-            &self.env,
-            self.from,
-            self.to,
-            self.payment,
-            self.gas,
-            self.data,
-        );
-        step.expect = Some(self.result_handler.list_tx_expect());
-        self.env.world.sc_call(&mut step);
-        process_result(step.response, self.result_handler)
+        let mut step_wrapper = self.tx_to_step();
+        step_wrapper.env.world.sc_call(&mut step_wrapper.step);
+        step_wrapper.process_result()
     }
 }
 
@@ -97,10 +90,9 @@ impl ScenarioWorld {
         let env = self.new_env_data();
         let tx_base = TxBaseWithEnv::new_with_env(env);
         let tx = f(tx_base);
-        let mut step = tx_to_sc_call_step(&tx.env, tx.from, tx.to, tx.payment, tx.gas, tx.data);
-        step.expect = Some(tx.result_handler.list_tx_expect());
-        self.sc_call(&mut step);
-        process_result(step.response, tx.result_handler);
+        let mut step_wrapper = tx.tx_to_step();
+        self.sc_call(&mut step_wrapper.step);
+        step_wrapper.process_result();
         self
     }
 }
diff --git a/framework/scenario/src/facade/world_tx/scenario_env_query.rs b/framework/scenario/src/facade/world_tx/scenario_env_query.rs
index dac9e68d83..08246b0f81 100644
--- a/framework/scenario/src/facade/world_tx/scenario_env_query.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_env_query.rs
@@ -10,12 +10,11 @@ use multiversx_sc::{
 
 use crate::{
     api::StaticApi,
+    scenario::tx_to_step::TxToQueryStep,
     scenario_model::{TxExpect, TxResponse},
     ScenarioTxEnv, ScenarioTxEnvData, ScenarioTxRun, ScenarioWorld,
 };
 
-use super::scenario_env_util::*;
-
 pub struct ScenarioEnvQuery<'w> {
     pub world: &'w mut ScenarioWorld,
     pub data: ScenarioTxEnvData,
@@ -55,10 +54,9 @@ where
     type Returns = <RH::ListReturns as NestedTupleFlatten>::Unpacked;
 
     fn run(self) -> Self::Returns {
-        let mut step = tx_to_sc_query_step(&self.env, self.to, self.data);
-        step.expect = Some(self.result_handler.list_tx_expect());
-        self.env.world.sc_query(&mut step);
-        process_result(step.response, self.result_handler)
+        let mut step_wrapper = self.tx_to_query_step();
+        step_wrapper.env.world.sc_query(&mut step_wrapper.step);
+        step_wrapper.process_result()
     }
 }
 
@@ -80,10 +78,9 @@ impl ScenarioWorld {
         let env = self.new_env_data();
         let tx_base = TxBaseWithEnv::new_with_env(env);
         let tx = f(tx_base);
-        let mut step = tx_to_sc_query_step(&tx.env, tx.to, tx.data);
-        self.sc_query(&mut step);
-        step.expect = Some(tx.result_handler.list_tx_expect());
-        process_result(step.response, tx.result_handler);
+        let mut step_wrapper = tx.tx_to_query_step();
+        self.sc_query(&mut step_wrapper.step);
+        step_wrapper.process_result();
         self
     }
 }
diff --git a/framework/scenario/src/facade/world_tx/scenario_env_util.rs b/framework/scenario/src/facade/world_tx/scenario_env_util.rs
deleted file mode 100644
index 8334b22cfb..0000000000
--- a/framework/scenario/src/facade/world_tx/scenario_env_util.rs
+++ /dev/null
@@ -1,175 +0,0 @@
-use multiversx_chain_scenario_format::serde_raw::ValueSubTree;
-use multiversx_sc::{
-    tuple_util::NestedTupleFlatten,
-    types::{
-        AnnotatedValue, Code, DeployCall, FunctionCall, ManagedAddress, ManagedBuffer, RHListExec,
-        Tx, TxBaseWithEnv, TxCodeSource, TxCodeSourceSpecified, TxCodeValue, TxEnv,
-        TxFromSpecified, TxGas, TxGasValue, TxPayment, TxToSpecified,
-    },
-};
-
-use crate::{
-    api::StaticApi,
-    scenario_model::{
-        AddressValue, BigUintValue, BytesValue, ScCallStep, ScDeployStep, ScQueryStep,
-        TransferStep, TxResponse, U64Value,
-    },
-    ScenarioEnvExec, ScenarioWorld,
-};
-
-pub fn address_annotated<Env, Addr>(env: &Env, from: Addr) -> AddressValue
-where
-    Env: TxEnv,
-    Addr: AnnotatedValue<Env, ManagedAddress<Env::Api>>,
-{
-    let annotation = from.annotation(env).to_string();
-    AddressValue {
-        value: from.into_value(env).to_address(),
-        original: ValueSubTree::Str(annotation),
-    }
-}
-
-pub fn code_annotated<Env, CodeValue>(env: &Env, code: Code<CodeValue>) -> BytesValue
-where
-    Env: TxEnv,
-    CodeValue: TxCodeValue<Env>,
-{
-    let annotation = code.0.annotation(env).to_string();
-    BytesValue {
-        value: code.0.into_value(env).to_vec(),
-        original: ValueSubTree::Str(annotation),
-    }
-}
-
-pub fn gas_annotated<Env, Gas>(env: &Env, gas: Gas) -> U64Value
-where
-    Env: TxEnv,
-    Gas: TxGas<Env>,
-{
-    let annotation = gas.gas_annotation(env).to_string();
-    U64Value {
-        value: gas.gas_value(env),
-        original: ValueSubTree::Str(annotation),
-    }
-}
-
-pub fn tx_to_sc_call_step<Env, From, To, Payment, Gas>(
-    env: &Env,
-    from: From,
-    to: To,
-    payment: Payment,
-    gas: Gas,
-    data: FunctionCall<Env::Api>,
-) -> ScCallStep
-where
-    Env: TxEnv,
-    From: TxFromSpecified<Env>,
-    To: TxToSpecified<Env>,
-    Payment: TxPayment<Env>,
-    Gas: TxGas<Env>,
-{
-    let mut step = ScCallStep::new()
-        .from(address_annotated(env, from))
-        .to(address_annotated(env, to))
-        .function(data.function_name.to_string().as_str());
-    for arg in data.arg_buffer.iter_buffers() {
-        step.tx.arguments.push(arg.to_vec().into());
-    }
-
-    step.tx.gas_limit = gas_annotated(env, gas);
-
-    let full_payment_data = payment.into_full_payment_data(env);
-    if let Some(annotated_egld_payment) = full_payment_data.egld {
-        step.tx.egld_value = annotated_egld_payment.into();
-    }
-
-    step
-}
-
-pub fn tx_to_sc_deploy_step<Env, From, Payment, Gas, CodeValue>(
-    env: &Env,
-    from: From,
-    payment: Payment,
-    gas: Gas,
-    data: DeployCall<Env, Code<CodeValue>>,
-) -> ScDeployStep
-where
-    Env: TxEnv,
-    From: TxFromSpecified<Env>,
-    Payment: TxPayment<Env>,
-    Gas: TxGas<Env>,
-    CodeValue: TxCodeValue<Env>,
-{
-    let mut step = ScDeployStep::new()
-        .from(address_annotated(env, from))
-        .code(code_annotated(env, data.code_source));
-    for arg in data.arg_buffer.iter_buffers() {
-        step.tx.arguments.push(arg.to_vec().into());
-    }
-
-    step.tx.gas_limit = gas_annotated(env, gas);
-
-    let full_payment_data = payment.into_full_payment_data(env);
-    if let Some(annotated_egld_payment) = full_payment_data.egld {
-        step.tx.egld_value = annotated_egld_payment.into();
-    }
-
-    step
-}
-
-pub fn tx_to_sc_query_step<Env, To>(env: &Env, to: To, data: FunctionCall<Env::Api>) -> ScQueryStep
-where
-    Env: TxEnv,
-    To: TxToSpecified<Env>,
-{
-    let mut step = ScQueryStep::new()
-        .to(address_annotated(env, to))
-        .function(data.function_name.to_string().as_str());
-    for arg in data.arg_buffer.iter_buffers() {
-        step.tx.arguments.push(arg.to_vec().into());
-    }
-
-    step
-}
-
-pub fn tx_to_transfer_step<Env, From, To, Payment, Gas>(
-    env: &Env,
-    from: From,
-    to: To,
-    payment: Payment,
-    gas: Gas,
-) -> TransferStep
-where
-    Env: TxEnv,
-    From: TxFromSpecified<Env>,
-    To: TxToSpecified<Env>,
-    Payment: TxPayment<Env>,
-    Gas: TxGas<Env>,
-{
-    let mut step = TransferStep::new()
-        .from(address_annotated(env, from))
-        .to(address_annotated(env, to));
-
-    step.tx.gas_limit = gas_annotated(env, gas);
-
-    let full_payment_data = payment.into_full_payment_data(env);
-    if let Some(annotated_egld_payment) = full_payment_data.egld {
-        step.tx.egld_value = annotated_egld_payment.into();
-    }
-
-    step
-}
-
-pub fn process_result<Env, RH>(
-    response: Option<TxResponse>,
-    result_handler: RH,
-) -> <RH::ListReturns as NestedTupleFlatten>::Unpacked
-where
-    Env: TxEnv,
-    RH: RHListExec<TxResponse, Env>,
-    RH::ListReturns: NestedTupleFlatten,
-{
-    let response = response.expect("step did not return result");
-    let tuple_result = result_handler.list_process_result(&response);
-    tuple_result.flatten_unpack()
-}
diff --git a/framework/scenario/src/scenario/mod.rs b/framework/scenario/src/scenario.rs
similarity index 91%
rename from framework/scenario/src/scenario/mod.rs
rename to framework/scenario/src/scenario.rs
index 3ffd41300f..70f8f5f285 100644
--- a/framework/scenario/src/scenario/mod.rs
+++ b/framework/scenario/src/scenario.rs
@@ -4,6 +4,7 @@ pub mod run_list;
 pub mod run_trace;
 pub mod run_vm;
 mod scenario_runner;
+pub mod tx_to_step;
 
 pub use parse_util::{parse_scenario, parse_scenario_raw};
 pub use scenario_runner::ScenarioRunner;
diff --git a/framework/scenario/src/scenario/tx_to_step.rs b/framework/scenario/src/scenario/tx_to_step.rs
new file mode 100644
index 0000000000..601d4d9b71
--- /dev/null
+++ b/framework/scenario/src/scenario/tx_to_step.rs
@@ -0,0 +1,11 @@
+mod step_annotation;
+mod step_wrapper;
+mod tx_to_step_call;
+mod tx_to_step_deploy;
+mod tx_to_step_query;
+mod tx_to_step_trait;
+mod tx_to_step_transfer;
+
+pub use step_annotation::*;
+pub use step_wrapper::StepWrapper;
+pub use tx_to_step_trait::*;
diff --git a/framework/scenario/src/scenario/tx_to_step/step_annotation.rs b/framework/scenario/src/scenario/tx_to_step/step_annotation.rs
new file mode 100644
index 0000000000..2defb50786
--- /dev/null
+++ b/framework/scenario/src/scenario/tx_to_step/step_annotation.rs
@@ -0,0 +1,40 @@
+use multiversx_chain_scenario_format::serde_raw::ValueSubTree;
+use multiversx_sc::types::{AnnotatedValue, Code, ManagedAddress, TxCodeValue, TxEnv, TxGas};
+
+use crate::scenario_model::{AddressValue, BytesValue, U64Value};
+
+pub fn address_annotated<Env, Addr>(env: &Env, from: Addr) -> AddressValue
+where
+    Env: TxEnv,
+    Addr: AnnotatedValue<Env, ManagedAddress<Env::Api>>,
+{
+    let annotation = from.annotation(env).to_string();
+    AddressValue {
+        value: from.into_value(env).to_address(),
+        original: ValueSubTree::Str(annotation),
+    }
+}
+
+pub fn code_annotated<Env, CodeValue>(env: &Env, code: Code<CodeValue>) -> BytesValue
+where
+    Env: TxEnv,
+    CodeValue: TxCodeValue<Env>,
+{
+    let annotation = code.0.annotation(env).to_string();
+    BytesValue {
+        value: code.0.into_value(env).to_vec(),
+        original: ValueSubTree::Str(annotation),
+    }
+}
+
+pub fn gas_annotated<Env, Gas>(env: &Env, gas: Gas) -> U64Value
+where
+    Env: TxEnv,
+    Gas: TxGas<Env>,
+{
+    let annotation = gas.gas_annotation(env).to_string();
+    U64Value {
+        value: gas.gas_value(env),
+        original: ValueSubTree::Str(annotation),
+    }
+}
diff --git a/framework/scenario/src/scenario/tx_to_step/step_wrapper.rs b/framework/scenario/src/scenario/tx_to_step/step_wrapper.rs
new file mode 100644
index 0000000000..9d9a0199d5
--- /dev/null
+++ b/framework/scenario/src/scenario/tx_to_step/step_wrapper.rs
@@ -0,0 +1,48 @@
+use multiversx_sc::{
+    tuple_util::NestedTupleFlatten,
+    types::{RHListExec, TxEnv},
+};
+
+use crate::scenario_model::{ScCallStep, ScDeployStep, ScQueryStep, TxResponse};
+
+pub struct StepWrapper<Env, Step, RH> {
+    pub env: Env,
+    pub step: Step,
+    pub result_handler: RH,
+}
+
+impl<Env, Step, RH> StepWrapper<Env, Step, RH>
+where
+    Env: TxEnv,
+    Step: StepWithResponse,
+    RH: RHListExec<TxResponse, Env>,
+    RH::ListReturns: NestedTupleFlatten,
+{
+    pub fn process_result(self) -> <RH::ListReturns as NestedTupleFlatten>::Unpacked {
+        let response = self.step.into_response();
+        let tuple_result = self.result_handler.list_process_result(&response);
+        tuple_result.flatten_unpack()
+    }
+}
+
+pub trait StepWithResponse {
+    fn into_response(self) -> TxResponse;
+}
+
+impl StepWithResponse for ScCallStep {
+    fn into_response(self) -> TxResponse {
+        self.response.expect("SC call step did not return result")
+    }
+}
+
+impl StepWithResponse for ScDeployStep {
+    fn into_response(self) -> TxResponse {
+        self.response.expect("SC deploy step did not return result")
+    }
+}
+
+impl StepWithResponse for ScQueryStep {
+    fn into_response(self) -> TxResponse {
+        self.response.expect("SC query step did not return result")
+    }
+}
diff --git a/framework/scenario/src/scenario/tx_to_step/tx_to_step_call.rs b/framework/scenario/src/scenario/tx_to_step/tx_to_step_call.rs
new file mode 100644
index 0000000000..dc4850b845
--- /dev/null
+++ b/framework/scenario/src/scenario/tx_to_step/tx_to_step_call.rs
@@ -0,0 +1,75 @@
+use multiversx_sc::types::{
+    FunctionCall, RHListExec, Tx, TxEnv, TxFromSpecified, TxGas, TxPayment, TxToSpecified,
+};
+
+use crate::scenario_model::{ScCallStep, TxExpect, TxResponse};
+
+use super::{address_annotated, gas_annotated, StepWrapper, TxToStep};
+
+impl<Env, From, To, Payment, Gas, RH> TxToStep
+    for Tx<Env, From, To, Payment, Gas, FunctionCall<Env::Api>, RH>
+where
+    Env: TxEnv<RHExpect = TxExpect>,
+    From: TxFromSpecified<Env>,
+    To: TxToSpecified<Env>,
+    Payment: TxPayment<Env>,
+    Gas: TxGas<Env>,
+    RH: RHListExec<TxResponse, Env>,
+{
+    type Env = Env;
+
+    type Step = ScCallStep;
+
+    type RH = RH;
+
+    fn tx_to_step(self) -> StepWrapper<Self::Env, Self::Step, Self::RH> {
+        let mut step = tx_to_sc_call_step(
+            &self.env,
+            self.from,
+            self.to,
+            self.payment,
+            self.gas,
+            self.data,
+        );
+        step.expect = Some(self.result_handler.list_tx_expect());
+
+        StepWrapper {
+            env: self.env,
+            step,
+            result_handler: self.result_handler,
+        }
+    }
+}
+
+pub fn tx_to_sc_call_step<Env, From, To, Payment, Gas>(
+    env: &Env,
+    from: From,
+    to: To,
+    payment: Payment,
+    gas: Gas,
+    data: FunctionCall<Env::Api>,
+) -> ScCallStep
+where
+    Env: TxEnv,
+    From: TxFromSpecified<Env>,
+    To: TxToSpecified<Env>,
+    Payment: TxPayment<Env>,
+    Gas: TxGas<Env>,
+{
+    let mut step = ScCallStep::new()
+        .from(address_annotated(env, from))
+        .to(address_annotated(env, to))
+        .function(data.function_name.to_string().as_str());
+    for arg in data.arg_buffer.iter_buffers() {
+        step.tx.arguments.push(arg.to_vec().into());
+    }
+
+    step.tx.gas_limit = gas_annotated(env, gas);
+
+    let full_payment_data = payment.into_full_payment_data(env);
+    if let Some(annotated_egld_payment) = full_payment_data.egld {
+        step.tx.egld_value = annotated_egld_payment.into();
+    }
+
+    step
+}
diff --git a/framework/scenario/src/scenario/tx_to_step/tx_to_step_deploy.rs b/framework/scenario/src/scenario/tx_to_step/tx_to_step_deploy.rs
new file mode 100644
index 0000000000..4378bbb682
--- /dev/null
+++ b/framework/scenario/src/scenario/tx_to_step/tx_to_step_deploy.rs
@@ -0,0 +1,67 @@
+use multiversx_sc::types::{
+    Code, DeployCall, RHListExec, Tx, TxCodeValue, TxEnv, TxFromSpecified, TxGas, TxPayment,
+};
+
+use crate::scenario_model::{ScDeployStep, TxExpect, TxResponse};
+
+use super::{address_annotated, code_annotated, gas_annotated, StepWrapper, TxToStep};
+
+impl<Env, From, Payment, Gas, CodeValue, RH> TxToStep
+    for Tx<Env, From, (), Payment, Gas, DeployCall<Env, Code<CodeValue>>, RH>
+where
+    Env: TxEnv<RHExpect = TxExpect>,
+    From: TxFromSpecified<Env>,
+    Payment: TxPayment<Env>,
+    Gas: TxGas<Env>,
+    CodeValue: TxCodeValue<Env>,
+    RH: RHListExec<TxResponse, Env>,
+{
+    type Env = Env;
+
+    type Step = ScDeployStep;
+
+    type RH = RH;
+
+    fn tx_to_step(self) -> StepWrapper<Self::Env, Self::Step, Self::RH> {
+        let mut step =
+            tx_to_sc_deploy_step(&self.env, self.from, self.payment, self.gas, self.data);
+        step.expect = Some(self.result_handler.list_tx_expect());
+
+        StepWrapper {
+            env: self.env,
+            step,
+            result_handler: self.result_handler,
+        }
+    }
+}
+
+pub fn tx_to_sc_deploy_step<Env, From, Payment, Gas, CodeValue>(
+    env: &Env,
+    from: From,
+    payment: Payment,
+    gas: Gas,
+    data: DeployCall<Env, Code<CodeValue>>,
+) -> ScDeployStep
+where
+    Env: TxEnv,
+    From: TxFromSpecified<Env>,
+    Payment: TxPayment<Env>,
+    Gas: TxGas<Env>,
+    CodeValue: TxCodeValue<Env>,
+{
+    let mut step = ScDeployStep::new()
+        .from(address_annotated(env, from))
+        .code(code_annotated(env, data.code_source));
+    for arg in data.arg_buffer.iter_buffers() {
+        step.tx.arguments.push(arg.to_vec().into());
+    }
+
+    step.tx.gas_limit = gas_annotated(env, gas);
+
+    let full_payment_data = payment.into_full_payment_data(env);
+    if let Some(annotated_egld_payment) = full_payment_data.egld {
+        step.tx.egld_value = annotated_egld_payment.into();
+    }
+
+    step
+}
diff --git a/framework/scenario/src/scenario/tx_to_step/tx_to_step_query.rs b/framework/scenario/src/scenario/tx_to_step/tx_to_step_query.rs
new file mode 100644
index 0000000000..427a8e62ce
--- /dev/null
+++ b/framework/scenario/src/scenario/tx_to_step/tx_to_step_query.rs
@@ -0,0 +1,44 @@
+use multiversx_sc::types::{FunctionCall, RHListExec, Tx, TxEnv, TxToSpecified};
+
+use crate::scenario_model::{ScQueryStep, TxExpect, TxResponse};
+
+use super::{address_annotated, StepWrapper, TxToQueryStep};
+
+impl<Env, To, RH> TxToQueryStep for Tx<Env, (), To, (), (), FunctionCall<Env::Api>, RH>
+where
+    Env: TxEnv<RHExpect = TxExpect>,
+    To: TxToSpecified<Env>,
+    RH: RHListExec<TxResponse, Env>,
+{
+    type Env = Env;
+
+    type Step = ScQueryStep;
+
+    type RH = RH;
+
+    fn tx_to_query_step(self) -> StepWrapper<Self::Env, Self::Step, Self::RH> {
+        let mut step = tx_to_sc_query_step(&self.env, self.to, self.data);
+        step.expect = Some(self.result_handler.list_tx_expect());
+
+        StepWrapper {
+            env: self.env,
+            step,
+            result_handler: self.result_handler,
+        }
+    }
+}
+
+pub fn tx_to_sc_query_step<Env, To>(env: &Env, to: To, data: FunctionCall<Env::Api>) -> ScQueryStep
+where
+    Env: TxEnv,
+    To: TxToSpecified<Env>,
+{
+    let mut step = ScQueryStep::new()
+        .to(address_annotated(env, to))
+        .function(data.function_name.to_string().as_str());
+    for arg in data.arg_buffer.iter_buffers() {
+        step.tx.arguments.push(arg.to_vec().into());
+    }
+
+    step
+}
diff --git a/framework/scenario/src/scenario/tx_to_step/tx_to_step_trait.rs b/framework/scenario/src/scenario/tx_to_step/tx_to_step_trait.rs
new file mode 100644
index 0000000000..708e7c8eea
--- /dev/null
+++ b/framework/scenario/src/scenario/tx_to_step/tx_to_step_trait.rs
@@ -0,0 +1,17 @@
+use super::StepWrapper;
+
+pub trait TxToStep {
+    type Env;
+    type Step;
+    type RH;
+
+    fn tx_to_step(self) -> StepWrapper<Self::Env, Self::Step, Self::RH>;
+}
+
+pub trait TxToQueryStep {
+    type Env;
+    type Step;
+    type RH;
+
+    fn tx_to_query_step(self) -> StepWrapper<Self::Env, Self::Step, Self::RH>;
+}
diff --git a/framework/scenario/src/scenario/tx_to_step/tx_to_step_transfer.rs b/framework/scenario/src/scenario/tx_to_step/tx_to_step_transfer.rs
new file mode 100644
index 0000000000..c2f31e6ff4
--- /dev/null
+++ b/framework/scenario/src/scenario/tx_to_step/tx_to_step_transfer.rs
@@ -0,0 +1,58 @@
+use multiversx_sc::types::{Tx, TxEnv, TxFromSpecified, TxGas, TxPayment, TxToSpecified};
+
+use crate::scenario_model::TransferStep;
+
+use super::{address_annotated, gas_annotated, StepWrapper, TxToStep};
+
+impl<Env, From, To, Payment, Gas> TxToStep for Tx<Env, From, To, Payment, Gas, (), ()>
+where
+    Env: TxEnv,
+    From: TxFromSpecified<Env>,
+    To: TxToSpecified<Env>,
+    Payment: TxPayment<Env>,
+    Gas: TxGas<Env>,
+{
+    type Env = Env;
+
+    type Step = TransferStep;
+
+    type RH = ();
+
+    fn tx_to_step(self) -> StepWrapper<Self::Env, Self::Step, Self::RH> {
+        let step = tx_to_transfer_step(&self.env, self.from, self.to, self.payment, self.gas);
+
+        StepWrapper {
+            env: self.env,
+            step,
+            result_handler: self.result_handler,
+        }
+    }
+}
+
+pub fn tx_to_transfer_step<Env, From, To, Payment, Gas>(
+    env: &Env,
+    from: From,
+    to: To,
+    payment: Payment,
+    gas: Gas,
+) -> TransferStep
+where
+    Env: TxEnv,
+    From: TxFromSpecified<Env>,
+    To: TxToSpecified<Env>,
+    Payment: TxPayment<Env>,
+    Gas: TxGas<Env>,
+{
+    let mut step = TransferStep::new()
+        .from(address_annotated(env, from))
+        .to(address_annotated(env, to));
+
+    step.tx.gas_limit = gas_annotated(env, gas);
+
+    let full_payment_data = payment.into_full_payment_data(env);
+    if let Some(annotated_egld_payment) = full_payment_data.egld {
+        step.tx.egld_value = annotated_egld_payment.into();
+    }
+
+    step
+}
diff --git a/framework/snippets/src/itx/interactor_env_deploy.rs b/framework/snippets/src/itx/interactor_env_deploy.rs
index 6fdd9dfb48..bf5e8e61bc 100644
--- a/framework/snippets/src/itx/interactor_env_deploy.rs
+++ b/framework/snippets/src/itx/interactor_env_deploy.rs
@@ -10,7 +10,7 @@ use multiversx_sc_scenario::{
             TxFromSpecified, TxGas, TxPayment, TxToSpecified,
         },
     },
-    scenario_env_util::*,
+    scenario::tx_to_step::{StepWrapper, TxToStep},
     scenario_model::{AddressValue, BytesValue, ScCallStep, ScDeployStep, TxResponse},
     ScenarioEnvExec, ScenarioTxEnv, ScenarioTxEnvData, ScenarioTxRun, ScenarioWorld,
 };
@@ -24,9 +24,7 @@ where
     RH: RHListExec<TxResponse, InteractorEnvExec<'w>>,
     RH::ListReturns: NestedTupleFlatten,
 {
-    world: &'w mut Interactor,
-    sc_deploy_step: ScDeployStep,
-    result_handler: RH,
+    step_wrapper: StepWrapper<InteractorEnvExec<'w>, ScDeployStep, RH>,
 }
 
 impl<'w, From, Payment, Gas, CodeValue, RH> InteractorPrepareAsync
@@ -50,12 +48,8 @@ where
     type Exec = InteractorDeployStep<'w, RH>;
 
     fn prepare_async(self) -> Self::Exec {
-        let mut sc_deploy_step =
-            tx_to_sc_deploy_step(&self.env, self.from, self.payment, self.gas, self.data);
         InteractorDeployStep {
-            world: self.env.world,
-            sc_deploy_step,
-            result_handler: self.result_handler,
+            step_wrapper: self.tx_to_step(),
         }
     }
 }
@@ -65,11 +59,13 @@ where
     RH: RHListExec<TxResponse, InteractorEnvExec<'w>>,
     RH::ListReturns: NestedTupleFlatten,
 {
-    pub async fn run(self) -> <RH::ListReturns as NestedTupleFlatten>::Unpacked {
-        let mut step = self.sc_deploy_step;
-        step.expect = Some(self.result_handler.list_tx_expect());
-        self.world.sc_deploy(&mut step).await;
-        process_result(step.response, self.result_handler)
+    pub async fn run(mut self) -> <RH::ListReturns as NestedTupleFlatten>::Unpacked {
+        self.step_wrapper
+            .env
+            .world
+            .sc_deploy(&mut self.step_wrapper.step)
+            .await;
+        self.step_wrapper.process_result()
     }
 }
 
@@ -96,10 +92,11 @@ impl Interactor {
         let env = self.new_env_data();
         let tx_base = TxBaseWithEnv::new_with_env(env);
         let tx = f(tx_base);
-        let mut step = tx_to_sc_deploy_step(&tx.env, tx.from, tx.payment, tx.gas, tx.data);
-        step.expect = Some(tx.result_handler.list_tx_expect());
-        self.sc_deploy(&mut step).await;
-        process_result(step.response, tx.result_handler);
+
+        let mut step_wrapper = tx.tx_to_step();
+        self.sc_deploy(&mut step_wrapper.step);
+        step_wrapper.process_result();
+
         self
     }
 
@@ -129,9 +126,9 @@ impl Interactor {
         let env = self.new_env_data();
         let tx_base = TxBaseWithEnv::new_with_env(env);
         let tx = f(tx_base);
-        let mut step = tx_to_sc_deploy_step(&tx.env, tx.from, tx.payment, tx.gas, tx.data);
-        step.expect = Some(tx.result_handler.list_tx_expect());
-        self.sc_deploy(&mut step).await;
-        process_result(step.response, tx.result_handler)
+
+        let mut step_wrapper = tx.tx_to_step();
+        self.sc_deploy(&mut step_wrapper.step);
+        step_wrapper.process_result()
     }
 }
diff --git a/framework/snippets/src/itx/interactor_env_exec.rs b/framework/snippets/src/itx/interactor_env_exec.rs
index 235a580853..8e6b4dc69c 100644
--- a/framework/snippets/src/itx/interactor_env_exec.rs
+++ b/framework/snippets/src/itx/interactor_env_exec.rs
@@ -10,7 +10,7 @@ use multiversx_sc_scenario::{
             TxFromSpecified, TxGas, TxPayment, TxToSpecified,
         },
     },
-    scenario_env_util::*,
+    scenario::tx_to_step::{StepWrapper, TxToStep},
     scenario_model::{AddressValue, BytesValue, ScCallStep, ScDeployStep, TxExpect, TxResponse},
     ScenarioTxEnv, ScenarioTxEnvData, ScenarioTxRun, ScenarioWorld,
 };
@@ -52,9 +52,7 @@ where
     RH: RHListExec<TxResponse, InteractorEnvExec<'w>>,
     RH::ListReturns: NestedTupleFlatten,
 {
-    world: &'w mut Interactor,
-    sc_call_step: ScCallStep,
-    result_handler: RH,
+    step_wrapper: StepWrapper<InteractorEnvExec<'w>, ScCallStep, RH>,
 }
 
 impl<'w, From, To, Payment, Gas, RH> InteractorPrepareAsync
@@ -70,18 +68,8 @@ where
     type Exec = InteractorCallStep<'w, RH>;
 
     fn prepare_async(self) -> Self::Exec {
-        let mut sc_call_step = tx_to_sc_call_step(
-            &self.env,
-            self.from,
-            self.to,
-            self.payment,
-            self.gas,
-            self.data,
-        );
         InteractorCallStep {
-            world: self.env.world,
-            sc_call_step,
-            result_handler: self.result_handler,
+            step_wrapper: self.tx_to_step(),
         }
     }
 }
@@ -91,11 +79,13 @@ where
     RH: RHListExec<TxResponse, InteractorEnvExec<'w>>,
     RH::ListReturns: NestedTupleFlatten,
 {
-    pub async fn run(self) -> <RH::ListReturns as NestedTupleFlatten>::Unpacked {
-        let mut step = self.sc_call_step;
-        step.expect = Some(self.result_handler.list_tx_expect());
-        self.world.sc_call(&mut step).await;
-        process_result(step.response, self.result_handler)
+    pub async fn run(mut self) -> <RH::ListReturns as NestedTupleFlatten>::Unpacked {
+        self.step_wrapper
+            .env
+            .world
+            .sc_call(&mut self.step_wrapper.step)
+            .await;
+        self.step_wrapper.process_result()
     }
 }
 
@@ -121,10 +111,11 @@ impl Interactor {
         let env = self.new_env_data();
         let tx_base = TxBaseWithEnv::new_with_env(env);
         let tx = f(tx_base);
-        let mut step = tx_to_sc_call_step(&tx.env, tx.from, tx.to, tx.payment, tx.gas, tx.data);
-        step.expect = Some(tx.result_handler.list_tx_expect());
-        self.sc_call(&mut step).await;
-        process_result(step.response, tx.result_handler);
+
+        let mut step_wrapper = tx.tx_to_step();
+        self.sc_call(&mut step_wrapper.step).await;
+        step_wrapper.process_result();
+        
         self
     }
 }
diff --git a/framework/snippets/src/itx/interactor_env_query.rs b/framework/snippets/src/itx/interactor_env_query.rs
index 052fc8cc12..881fc6b861 100644
--- a/framework/snippets/src/itx/interactor_env_query.rs
+++ b/framework/snippets/src/itx/interactor_env_query.rs
@@ -9,7 +9,7 @@ use multiversx_sc_scenario::{
             TxBaseWithEnv, TxEnv, TxFromSpecified, TxGas, TxPayment, TxToSpecified,
         },
     },
-    scenario_env_util::*,
+    scenario::tx_to_step::{StepWrapper, TxToQueryStep},
     scenario_model::{ScQueryStep, TxExpect, TxResponse},
     ScenarioTxEnv, ScenarioTxEnvData, ScenarioTxRun, ScenarioWorld,
 };
@@ -50,9 +50,7 @@ where
     RH: RHListExec<TxResponse, InteractorEnvQuery<'w>>,
     RH::ListReturns: NestedTupleFlatten,
 {
-    world: &'w mut Interactor,
-    sc_query_step: ScQueryStep,
-    result_handler: RH,
+    step_wrapper: StepWrapper<InteractorEnvQuery<'w>, ScQueryStep, RH>,
 }
 
 impl<'w, To, RH> InteractorPrepareAsync
@@ -65,11 +63,8 @@ where
     type Exec = InteractorQueryStep<'w, RH>;
 
     fn prepare_async(self) -> Self::Exec {
-        let mut sc_query_step = tx_to_sc_query_step(&self.env, self.to, self.data);
         InteractorQueryStep {
-            world: self.env.world,
-            sc_query_step,
-            result_handler: self.result_handler,
+            step_wrapper: self.tx_to_query_step(),
         }
     }
 }
@@ -79,11 +74,13 @@ where
     RH: RHListExec<TxResponse, InteractorEnvQuery<'w>>,
     RH::ListReturns: NestedTupleFlatten,
 {
-    pub async fn run(self) -> <RH::ListReturns as NestedTupleFlatten>::Unpacked {
-        let mut step = self.sc_query_step;
-        step.expect = Some(self.result_handler.list_tx_expect());
-        self.world.sc_query(&mut step).await;
-        process_result(step.response, self.result_handler)
+    pub async fn run(mut self) -> <RH::ListReturns as NestedTupleFlatten>::Unpacked {
+        self.step_wrapper
+            .env
+            .world
+            .sc_query(&mut self.step_wrapper.step)
+            .await;
+        self.step_wrapper.process_result()
     }
 }
 
@@ -105,10 +102,15 @@ impl Interactor {
         let env = self.new_env_data();
         let tx_base = TxBaseWithEnv::new_with_env(env);
         let tx = f(tx_base);
-        let mut step = tx_to_sc_query_step(&tx.env, tx.to, tx.data);
-        step.expect = Some(tx.result_handler.list_tx_expect());
-        self.sc_query(&mut step).await;
-        process_result(step.response, tx.result_handler);
+
+        let mut step_wrapper = tx.tx_to_query_step();
+        self.sc_query(&mut step_wrapper.step).await;
+        step_wrapper.process_result();
+
+        // let mut step = tx_to_sc_query_step(&tx.env, tx.to, tx.data);
+        // step.expect = Some(tx.result_handler.list_tx_expect());
+        // self.sc_query(&mut step).await;
+        // process_result(step.response, tx.result_handler);
         self
     }
 }
diff --git a/framework/snippets/src/itx/interactor_env_transf.rs b/framework/snippets/src/itx/interactor_env_transf.rs
index 19a161b18f..33b977dbac 100644
--- a/framework/snippets/src/itx/interactor_env_transf.rs
+++ b/framework/snippets/src/itx/interactor_env_transf.rs
@@ -10,7 +10,7 @@ use multiversx_sc_scenario::{
             TxFromSpecified, TxGas, TxPayment, TxToSpecified,
         },
     },
-    scenario_env_util::*,
+    scenario::tx_to_step::{StepWrapper, TxToStep},
     scenario_model::{
         AddressValue, BytesValue, ScCallStep, ScDeployStep, TransferStep, TxResponse,
     },
@@ -20,8 +20,7 @@ use multiversx_sc_scenario::{
 use crate::{Interactor, InteractorEnvExec, InteractorPrepareAsync};
 
 pub struct InteractorTransferStep<'w> {
-    world: &'w mut Interactor,
-    step: TransferStep,
+    step_wrapper: StepWrapper<InteractorEnvExec<'w>, TransferStep, ()>,
 }
 
 impl<'w, From, To, Payment, Gas> InteractorPrepareAsync
@@ -35,17 +34,18 @@ where
     type Exec = InteractorTransferStep<'w>;
 
     fn prepare_async(self) -> Self::Exec {
-        let mut sc_call_step =
-            tx_to_transfer_step(&self.env, self.from, self.to, self.payment, self.gas);
         InteractorTransferStep {
-            world: self.env.world,
-            step: sc_call_step,
+            step_wrapper: self.tx_to_step(),
         }
     }
 }
 
 impl<'w> InteractorTransferStep<'w> {
-    pub async fn run(self) {
-        self.world.transfer(self.step).await;
+    pub async fn run(mut self) {
+        self.step_wrapper
+            .env
+            .world
+            .transfer(self.step_wrapper.step)
+            .await;
     }
 }

From 8b905afcfaf102dd8cb5c11241139b86ab68f909 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 3 Apr 2024 00:52:43 +0300
Subject: [PATCH 0627/1254] unified syntax  - interactor refactor

---
 framework/snippets/src/interactor_tx.rs       |  17 +++
 .../src/interactor_tx/interactor_exec_call.rs |  76 +++++++++++
 .../interactor_exec_deploy.rs}                |  52 +++-----
 .../src/interactor_tx/interactor_exec_env.rs  |  46 +++++++
 .../src/interactor_tx/interactor_exec_step.rs |  15 +++
 .../interactor_tx/interactor_exec_transf.rs   |  34 +++++
 .../interactor_prepare_async.rs}              |   9 +-
 .../interactor_tx/interactor_query_call.rs    |  65 ++++++++++
 .../src/interactor_tx/interactor_query_env.rs |  45 +++++++
 .../interactor_tx/interactor_query_step.rs    |  15 +++
 framework/snippets/src/itx.rs                 |  13 --
 .../snippets/src/itx/interactor_env_exec.rs   | 121 ------------------
 .../snippets/src/itx/interactor_env_query.rs  | 116 -----------------
 .../snippets/src/itx/interactor_env_transf.rs |  51 --------
 framework/snippets/src/lib.rs                 |   4 +-
 15 files changed, 336 insertions(+), 343 deletions(-)
 create mode 100644 framework/snippets/src/interactor_tx.rs
 create mode 100644 framework/snippets/src/interactor_tx/interactor_exec_call.rs
 rename framework/snippets/src/{itx/interactor_env_deploy.rs => interactor_tx/interactor_exec_deploy.rs} (64%)
 create mode 100644 framework/snippets/src/interactor_tx/interactor_exec_env.rs
 create mode 100644 framework/snippets/src/interactor_tx/interactor_exec_step.rs
 create mode 100644 framework/snippets/src/interactor_tx/interactor_exec_transf.rs
 rename framework/snippets/src/{itx/interactor_env.rs => interactor_tx/interactor_prepare_async.rs} (56%)
 create mode 100644 framework/snippets/src/interactor_tx/interactor_query_call.rs
 create mode 100644 framework/snippets/src/interactor_tx/interactor_query_env.rs
 create mode 100644 framework/snippets/src/interactor_tx/interactor_query_step.rs
 delete mode 100644 framework/snippets/src/itx.rs
 delete mode 100644 framework/snippets/src/itx/interactor_env_exec.rs
 delete mode 100644 framework/snippets/src/itx/interactor_env_query.rs
 delete mode 100644 framework/snippets/src/itx/interactor_env_transf.rs

diff --git a/framework/snippets/src/interactor_tx.rs b/framework/snippets/src/interactor_tx.rs
new file mode 100644
index 0000000000..2c8bed0fda
--- /dev/null
+++ b/framework/snippets/src/interactor_tx.rs
@@ -0,0 +1,17 @@
+#![allow(unused_imports)] // TEMP
+
+mod interactor_exec_call;
+mod interactor_exec_deploy;
+mod interactor_exec_env;
+mod interactor_exec_step;
+mod interactor_exec_transf;
+mod interactor_prepare_async;
+mod interactor_query_call;
+mod interactor_query_env;
+mod interactor_query_step;
+
+pub use interactor_exec_env::InteractorExecEnv;
+pub use interactor_exec_step::InteractorExecStep;
+pub use interactor_prepare_async::InteractorPrepareAsync;
+pub use interactor_query_env::InteractorQueryEnv;
+pub use interactor_query_step::InteractorQueryStep;
diff --git a/framework/snippets/src/interactor_tx/interactor_exec_call.rs b/framework/snippets/src/interactor_tx/interactor_exec_call.rs
new file mode 100644
index 0000000000..71ff47c043
--- /dev/null
+++ b/framework/snippets/src/interactor_tx/interactor_exec_call.rs
@@ -0,0 +1,76 @@
+use multiversx_sc_scenario::{
+    api::StaticApi,
+    multiversx_sc::{
+        tuple_util::NestedTupleFlatten,
+        types::{
+            FunctionCall, RHListExec, Tx, TxBaseWithEnv, TxFromSpecified, TxGas, TxPayment,
+            TxToSpecified,
+        },
+    },
+    scenario::tx_to_step::TxToStep,
+    scenario_model::{ScCallStep, TxResponse},
+    ScenarioTxEnvData,
+};
+
+use crate::Interactor;
+
+use super::{InteractorExecEnv, InteractorExecStep, InteractorPrepareAsync};
+
+impl<'w, From, To, Payment, Gas, RH> InteractorPrepareAsync
+    for Tx<InteractorExecEnv<'w>, From, To, Payment, Gas, FunctionCall<StaticApi>, RH>
+where
+    From: TxFromSpecified<InteractorExecEnv<'w>>,
+    To: TxToSpecified<InteractorExecEnv<'w>>,
+    Payment: TxPayment<InteractorExecEnv<'w>>,
+    Gas: TxGas<InteractorExecEnv<'w>>,
+    RH: RHListExec<TxResponse, InteractorExecEnv<'w>>,
+    RH::ListReturns: NestedTupleFlatten,
+{
+    type Exec = InteractorExecStep<'w, ScCallStep, RH>;
+
+    fn prepare_async(self) -> Self::Exec {
+        InteractorExecStep {
+            step_wrapper: self.tx_to_step(),
+        }
+    }
+}
+
+impl<'w, RH> InteractorExecStep<'w, ScCallStep, RH>
+where
+    RH: RHListExec<TxResponse, InteractorExecEnv<'w>>,
+    RH::ListReturns: NestedTupleFlatten,
+{
+    pub async fn run(mut self) -> <RH::ListReturns as NestedTupleFlatten>::Unpacked {
+        self.step_wrapper
+            .env
+            .world
+            .sc_call(&mut self.step_wrapper.step)
+            .await;
+        self.step_wrapper.process_result()
+    }
+}
+
+impl Interactor {
+    pub async fn chain_call<From, To, Payment, Gas, RH, F>(&mut self, f: F) -> &mut Self
+    where
+        From: TxFromSpecified<ScenarioTxEnvData>,
+        To: TxToSpecified<ScenarioTxEnvData>,
+        Payment: TxPayment<ScenarioTxEnvData>,
+        Gas: TxGas<ScenarioTxEnvData>,
+        RH: RHListExec<TxResponse, ScenarioTxEnvData, ListReturns = ()>,
+        F: FnOnce(
+            TxBaseWithEnv<ScenarioTxEnvData>,
+        )
+            -> Tx<ScenarioTxEnvData, From, To, Payment, Gas, FunctionCall<StaticApi>, RH>,
+    {
+        let env = self.new_env_data();
+        let tx_base = TxBaseWithEnv::new_with_env(env);
+        let tx = f(tx_base);
+
+        let mut step_wrapper = tx.tx_to_step();
+        self.sc_call(&mut step_wrapper.step).await;
+        step_wrapper.process_result();
+
+        self
+    }
+}
diff --git a/framework/snippets/src/itx/interactor_env_deploy.rs b/framework/snippets/src/interactor_tx/interactor_exec_deploy.rs
similarity index 64%
rename from framework/snippets/src/itx/interactor_env_deploy.rs
rename to framework/snippets/src/interactor_tx/interactor_exec_deploy.rs
index bf5e8e61bc..30e30a34ab 100644
--- a/framework/snippets/src/itx/interactor_env_deploy.rs
+++ b/framework/snippets/src/interactor_tx/interactor_exec_deploy.rs
@@ -1,62 +1,50 @@
-use std::path::PathBuf;
-
 use multiversx_sc_scenario::{
-    api::StaticApi,
     multiversx_sc::{
         tuple_util::NestedTupleFlatten,
         types::{
-            AnnotatedValue, Code, DeployCall, FunctionCall, ManagedAddress, ManagedBuffer,
-            RHListExec, Tx, TxBaseWithEnv, TxCodeSource, TxCodeSourceSpecified, TxCodeValue, TxEnv,
-            TxFromSpecified, TxGas, TxPayment, TxToSpecified,
+            Code, DeployCall, RHListExec, Tx, TxBaseWithEnv, TxCodeValue, TxFromSpecified, TxGas,
+            TxPayment,
         },
     },
-    scenario::tx_to_step::{StepWrapper, TxToStep},
-    scenario_model::{AddressValue, BytesValue, ScCallStep, ScDeployStep, TxResponse},
-    ScenarioEnvExec, ScenarioTxEnv, ScenarioTxEnvData, ScenarioTxRun, ScenarioWorld,
+    scenario::tx_to_step::TxToStep,
+    scenario_model::{ScDeployStep, TxResponse},
+    ScenarioTxEnvData,
 };
 
-use crate::{Interactor, InteractorPrepareAsync};
-
-use super::InteractorEnvExec;
+use crate::Interactor;
 
-pub struct InteractorDeployStep<'w, RH>
-where
-    RH: RHListExec<TxResponse, InteractorEnvExec<'w>>,
-    RH::ListReturns: NestedTupleFlatten,
-{
-    step_wrapper: StepWrapper<InteractorEnvExec<'w>, ScDeployStep, RH>,
-}
+use super::{InteractorExecEnv, InteractorExecStep, InteractorPrepareAsync};
 
 impl<'w, From, Payment, Gas, CodeValue, RH> InteractorPrepareAsync
     for Tx<
-        InteractorEnvExec<'w>,
+        InteractorExecEnv<'w>,
         From,
         (),
         Payment,
         Gas,
-        DeployCall<InteractorEnvExec<'w>, Code<CodeValue>>,
+        DeployCall<InteractorExecEnv<'w>, Code<CodeValue>>,
         RH,
     >
 where
-    From: TxFromSpecified<InteractorEnvExec<'w>>,
-    Payment: TxPayment<InteractorEnvExec<'w>>,
-    Gas: TxGas<InteractorEnvExec<'w>>,
-    CodeValue: TxCodeValue<InteractorEnvExec<'w>>,
-    RH: RHListExec<TxResponse, InteractorEnvExec<'w>>,
+    From: TxFromSpecified<InteractorExecEnv<'w>>,
+    Payment: TxPayment<InteractorExecEnv<'w>>,
+    Gas: TxGas<InteractorExecEnv<'w>>,
+    CodeValue: TxCodeValue<InteractorExecEnv<'w>>,
+    RH: RHListExec<TxResponse, InteractorExecEnv<'w>>,
     RH::ListReturns: NestedTupleFlatten,
 {
-    type Exec = InteractorDeployStep<'w, RH>;
+    type Exec = InteractorExecStep<'w, ScDeployStep, RH>;
 
     fn prepare_async(self) -> Self::Exec {
-        InteractorDeployStep {
+        InteractorExecStep {
             step_wrapper: self.tx_to_step(),
         }
     }
 }
 
-impl<'w, RH> InteractorDeployStep<'w, RH>
+impl<'w, RH> InteractorExecStep<'w, ScDeployStep, RH>
 where
-    RH: RHListExec<TxResponse, InteractorEnvExec<'w>>,
+    RH: RHListExec<TxResponse, InteractorExecEnv<'w>>,
     RH::ListReturns: NestedTupleFlatten,
 {
     pub async fn run(mut self) -> <RH::ListReturns as NestedTupleFlatten>::Unpacked {
@@ -94,7 +82,7 @@ impl Interactor {
         let tx = f(tx_base);
 
         let mut step_wrapper = tx.tx_to_step();
-        self.sc_deploy(&mut step_wrapper.step);
+        self.sc_deploy(&mut step_wrapper.step).await;
         step_wrapper.process_result();
 
         self
@@ -128,7 +116,7 @@ impl Interactor {
         let tx = f(tx_base);
 
         let mut step_wrapper = tx.tx_to_step();
-        self.sc_deploy(&mut step_wrapper.step);
+        self.sc_deploy(&mut step_wrapper.step).await;
         step_wrapper.process_result()
     }
 }
diff --git a/framework/snippets/src/interactor_tx/interactor_exec_env.rs b/framework/snippets/src/interactor_tx/interactor_exec_env.rs
new file mode 100644
index 0000000000..935164f7eb
--- /dev/null
+++ b/framework/snippets/src/interactor_tx/interactor_exec_env.rs
@@ -0,0 +1,46 @@
+use multiversx_sc_scenario::{
+    api::StaticApi,
+    multiversx_sc::types::{ManagedAddress, ManagedBuffer, Tx, TxBaseWithEnv, TxEnv},
+    scenario_model::TxExpect,
+    ScenarioTxEnv, ScenarioTxEnvData,
+};
+
+use crate::Interactor;
+
+impl Interactor {
+    pub fn tx(&mut self) -> TxBaseWithEnv<InteractorExecEnv<'_>> {
+        let data = self.new_env_data();
+        let env = InteractorExecEnv { world: self, data };
+        Tx::new_with_env(env)
+    }
+}
+
+/// Environment for executing transactions.
+pub struct InteractorExecEnv<'w> {
+    pub world: &'w mut Interactor,
+    pub data: ScenarioTxEnvData,
+}
+
+impl<'w> TxEnv for InteractorExecEnv<'w> {
+    type Api = StaticApi;
+
+    type RHExpect = TxExpect;
+
+    fn resolve_sender_address(&self) -> ManagedAddress<Self::Api> {
+        panic!("Explicit sender address expected")
+    }
+
+    fn default_gas_annotation(&self) -> ManagedBuffer<Self::Api> {
+        self.data.default_gas_annotation()
+    }
+
+    fn default_gas_value(&self) -> u64 {
+        self.data.default_gas_value()
+    }
+}
+
+impl<'w> ScenarioTxEnv for InteractorExecEnv<'w> {
+    fn env_data(&self) -> &ScenarioTxEnvData {
+        &self.data
+    }
+}
diff --git a/framework/snippets/src/interactor_tx/interactor_exec_step.rs b/framework/snippets/src/interactor_tx/interactor_exec_step.rs
new file mode 100644
index 0000000000..3becfe81d9
--- /dev/null
+++ b/framework/snippets/src/interactor_tx/interactor_exec_step.rs
@@ -0,0 +1,15 @@
+use multiversx_sc_scenario::{
+    multiversx_sc::{tuple_util::NestedTupleFlatten, types::RHListExec},
+    scenario::tx_to_step::StepWrapper,
+    scenario_model::TxResponse,
+};
+
+use super::InteractorExecEnv;
+
+pub struct InteractorExecStep<'w, Step, RH>
+where
+    RH: RHListExec<TxResponse, InteractorExecEnv<'w>>,
+    RH::ListReturns: NestedTupleFlatten,
+{
+    pub(crate) step_wrapper: StepWrapper<InteractorExecEnv<'w>, Step, RH>,
+}
diff --git a/framework/snippets/src/interactor_tx/interactor_exec_transf.rs b/framework/snippets/src/interactor_tx/interactor_exec_transf.rs
new file mode 100644
index 0000000000..a19d54548d
--- /dev/null
+++ b/framework/snippets/src/interactor_tx/interactor_exec_transf.rs
@@ -0,0 +1,34 @@
+use multiversx_sc_scenario::{
+    multiversx_sc::types::{Tx, TxFromSpecified, TxGas, TxPayment, TxToSpecified},
+    scenario::tx_to_step::TxToStep,
+    scenario_model::TransferStep,
+};
+
+use super::{InteractorExecEnv, InteractorExecStep, InteractorPrepareAsync};
+
+impl<'w, From, To, Payment, Gas> InteractorPrepareAsync
+    for Tx<InteractorExecEnv<'w>, From, To, Payment, Gas, (), ()>
+where
+    From: TxFromSpecified<InteractorExecEnv<'w>>,
+    To: TxToSpecified<InteractorExecEnv<'w>>,
+    Payment: TxPayment<InteractorExecEnv<'w>>,
+    Gas: TxGas<InteractorExecEnv<'w>>,
+{
+    type Exec = InteractorExecStep<'w, TransferStep, ()>;
+
+    fn prepare_async(self) -> Self::Exec {
+        InteractorExecStep {
+            step_wrapper: self.tx_to_step(),
+        }
+    }
+}
+
+impl<'w> InteractorExecStep<'w, TransferStep, ()> {
+    pub async fn run(self) {
+        self.step_wrapper
+            .env
+            .world
+            .transfer(self.step_wrapper.step)
+            .await;
+    }
+}
diff --git a/framework/snippets/src/itx/interactor_env.rs b/framework/snippets/src/interactor_tx/interactor_prepare_async.rs
similarity index 56%
rename from framework/snippets/src/itx/interactor_env.rs
rename to framework/snippets/src/interactor_tx/interactor_prepare_async.rs
index 521389a713..167c7d9f27 100644
--- a/framework/snippets/src/itx/interactor_env.rs
+++ b/framework/snippets/src/interactor_tx/interactor_prepare_async.rs
@@ -1,11 +1,4 @@
-use std::path::PathBuf;
-
-use multiversx_sc_scenario::{
-    api::StaticApi,
-    multiversx_sc::types::{AnnotatedValue, ManagedAddress, TxBaseWithEnv, TxEnv},
-    scenario_model::TxResponse,
-    ScenarioTxEnvData, ScenarioWorld,
-};
+use multiversx_sc_scenario::ScenarioTxEnvData;
 
 use crate::Interactor;
 
diff --git a/framework/snippets/src/interactor_tx/interactor_query_call.rs b/framework/snippets/src/interactor_tx/interactor_query_call.rs
new file mode 100644
index 0000000000..55421743c5
--- /dev/null
+++ b/framework/snippets/src/interactor_tx/interactor_query_call.rs
@@ -0,0 +1,65 @@
+use multiversx_sc_scenario::{
+    api::StaticApi,
+    multiversx_sc::{
+        tuple_util::NestedTupleFlatten,
+        types::{FunctionCall, RHListExec, Tx, TxBaseWithEnv, TxToSpecified},
+    },
+    scenario::tx_to_step::TxToQueryStep,
+    scenario_model::TxResponse,
+    ScenarioTxEnvData,
+};
+
+use crate::Interactor;
+
+use super::{InteractorPrepareAsync, InteractorQueryEnv, InteractorQueryStep};
+
+impl<'w, To, RH> InteractorPrepareAsync
+    for Tx<InteractorQueryEnv<'w>, (), To, (), (), FunctionCall<StaticApi>, RH>
+where
+    To: TxToSpecified<InteractorQueryEnv<'w>>,
+    RH: RHListExec<TxResponse, InteractorQueryEnv<'w>>,
+    RH::ListReturns: NestedTupleFlatten,
+{
+    type Exec = InteractorQueryStep<'w, RH>;
+
+    fn prepare_async(self) -> Self::Exec {
+        InteractorQueryStep {
+            step_wrapper: self.tx_to_query_step(),
+        }
+    }
+}
+
+impl<'w, RH> InteractorQueryStep<'w, RH>
+where
+    RH: RHListExec<TxResponse, InteractorQueryEnv<'w>>,
+    RH::ListReturns: NestedTupleFlatten,
+{
+    pub async fn run(mut self) -> <RH::ListReturns as NestedTupleFlatten>::Unpacked {
+        self.step_wrapper
+            .env
+            .world
+            .sc_query(&mut self.step_wrapper.step)
+            .await;
+        self.step_wrapper.process_result()
+    }
+}
+
+impl Interactor {
+    pub async fn chain_query<To, RH, F>(&mut self, f: F) -> &mut Self
+    where
+        To: TxToSpecified<ScenarioTxEnvData>,
+        RH: RHListExec<TxResponse, ScenarioTxEnvData, ListReturns = ()>,
+        F: FnOnce(
+            TxBaseWithEnv<ScenarioTxEnvData>,
+        ) -> Tx<ScenarioTxEnvData, (), To, (), (), FunctionCall<StaticApi>, RH>,
+    {
+        let env = self.new_env_data();
+        let tx_base = TxBaseWithEnv::new_with_env(env);
+        let tx = f(tx_base);
+
+        let mut step_wrapper = tx.tx_to_query_step();
+        self.sc_query(&mut step_wrapper.step).await;
+        step_wrapper.process_result();
+        self
+    }
+}
diff --git a/framework/snippets/src/interactor_tx/interactor_query_env.rs b/framework/snippets/src/interactor_tx/interactor_query_env.rs
new file mode 100644
index 0000000000..1fa1142111
--- /dev/null
+++ b/framework/snippets/src/interactor_tx/interactor_query_env.rs
@@ -0,0 +1,45 @@
+use multiversx_sc_scenario::{
+    api::StaticApi,
+    multiversx_sc::types::{ManagedAddress, ManagedBuffer, Tx, TxBaseWithEnv, TxEnv},
+    scenario_model::TxExpect,
+    ScenarioTxEnv, ScenarioTxEnvData,
+};
+
+use crate::Interactor;
+
+impl Interactor {
+    pub fn query(&mut self) -> TxBaseWithEnv<InteractorQueryEnv<'_>> {
+        let data = self.new_env_data();
+        let env = InteractorQueryEnv { world: self, data };
+        Tx::new_with_env(env)
+    }
+}
+
+pub struct InteractorQueryEnv<'w> {
+    pub world: &'w mut Interactor,
+    pub data: ScenarioTxEnvData,
+}
+
+impl<'w> TxEnv for InteractorQueryEnv<'w> {
+    type Api = StaticApi;
+
+    type RHExpect = TxExpect;
+
+    fn resolve_sender_address(&self) -> ManagedAddress<Self::Api> {
+        panic!("Explicit sender address expected")
+    }
+
+    fn default_gas_annotation(&self) -> ManagedBuffer<Self::Api> {
+        self.data.default_gas_annotation()
+    }
+
+    fn default_gas_value(&self) -> u64 {
+        self.data.default_gas_value()
+    }
+}
+
+impl<'w> ScenarioTxEnv for InteractorQueryEnv<'w> {
+    fn env_data(&self) -> &ScenarioTxEnvData {
+        &self.data
+    }
+}
diff --git a/framework/snippets/src/interactor_tx/interactor_query_step.rs b/framework/snippets/src/interactor_tx/interactor_query_step.rs
new file mode 100644
index 0000000000..81c7542add
--- /dev/null
+++ b/framework/snippets/src/interactor_tx/interactor_query_step.rs
@@ -0,0 +1,15 @@
+use multiversx_sc_scenario::{
+    multiversx_sc::{tuple_util::NestedTupleFlatten, types::RHListExec},
+    scenario::tx_to_step::StepWrapper,
+    scenario_model::{ScQueryStep, TxResponse},
+};
+
+use super::InteractorQueryEnv;
+
+pub struct InteractorQueryStep<'w, RH>
+where
+    RH: RHListExec<TxResponse, InteractorQueryEnv<'w>>,
+    RH::ListReturns: NestedTupleFlatten,
+{
+    pub(crate) step_wrapper: StepWrapper<InteractorQueryEnv<'w>, ScQueryStep, RH>,
+}
diff --git a/framework/snippets/src/itx.rs b/framework/snippets/src/itx.rs
deleted file mode 100644
index 8cef20e699..0000000000
--- a/framework/snippets/src/itx.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-#![allow(unused)] // TEMP
-
-mod interactor_env;
-mod interactor_env_deploy;
-mod interactor_env_exec;
-mod interactor_env_query;
-mod interactor_env_transf;
-
-pub use interactor_env::*;
-pub use interactor_env_deploy::*;
-pub use interactor_env_exec::InteractorEnvExec;
-pub use interactor_env_query::InteractorEnvQuery;
-pub use interactor_env_transf::*;
diff --git a/framework/snippets/src/itx/interactor_env_exec.rs b/framework/snippets/src/itx/interactor_env_exec.rs
deleted file mode 100644
index 8e6b4dc69c..0000000000
--- a/framework/snippets/src/itx/interactor_env_exec.rs
+++ /dev/null
@@ -1,121 +0,0 @@
-use std::path::PathBuf;
-
-use multiversx_sc_scenario::{
-    api::StaticApi,
-    multiversx_sc::{
-        tuple_util::NestedTupleFlatten,
-        types::{
-            AnnotatedValue, Code, DeployCall, FunctionCall, ManagedAddress, ManagedBuffer,
-            RHListExec, Tx, TxBaseWithEnv, TxCodeSource, TxCodeSourceSpecified, TxCodeValue, TxEnv,
-            TxFromSpecified, TxGas, TxPayment, TxToSpecified,
-        },
-    },
-    scenario::tx_to_step::{StepWrapper, TxToStep},
-    scenario_model::{AddressValue, BytesValue, ScCallStep, ScDeployStep, TxExpect, TxResponse},
-    ScenarioTxEnv, ScenarioTxEnvData, ScenarioTxRun, ScenarioWorld,
-};
-
-use crate::{Interactor, InteractorPrepareAsync};
-
-/// Environment for executing transactions.
-pub struct InteractorEnvExec<'w> {
-    pub world: &'w mut Interactor,
-    pub data: ScenarioTxEnvData,
-}
-
-impl<'w> TxEnv for InteractorEnvExec<'w> {
-    type Api = StaticApi;
-
-    type RHExpect = TxExpect;
-
-    fn resolve_sender_address(&self) -> ManagedAddress<Self::Api> {
-        panic!("Explicit sender address expected")
-    }
-
-    fn default_gas_annotation(&self) -> ManagedBuffer<Self::Api> {
-        self.data.default_gas_annotation()
-    }
-
-    fn default_gas_value(&self) -> u64 {
-        self.data.default_gas_value()
-    }
-}
-
-impl<'w> ScenarioTxEnv for InteractorEnvExec<'w> {
-    fn env_data(&self) -> &ScenarioTxEnvData {
-        &self.data
-    }
-}
-
-pub struct InteractorCallStep<'w, RH>
-where
-    RH: RHListExec<TxResponse, InteractorEnvExec<'w>>,
-    RH::ListReturns: NestedTupleFlatten,
-{
-    step_wrapper: StepWrapper<InteractorEnvExec<'w>, ScCallStep, RH>,
-}
-
-impl<'w, From, To, Payment, Gas, RH> InteractorPrepareAsync
-    for Tx<InteractorEnvExec<'w>, From, To, Payment, Gas, FunctionCall<StaticApi>, RH>
-where
-    From: TxFromSpecified<InteractorEnvExec<'w>>,
-    To: TxToSpecified<InteractorEnvExec<'w>>,
-    Payment: TxPayment<InteractorEnvExec<'w>>,
-    Gas: TxGas<InteractorEnvExec<'w>>,
-    RH: RHListExec<TxResponse, InteractorEnvExec<'w>>,
-    RH::ListReturns: NestedTupleFlatten,
-{
-    type Exec = InteractorCallStep<'w, RH>;
-
-    fn prepare_async(self) -> Self::Exec {
-        InteractorCallStep {
-            step_wrapper: self.tx_to_step(),
-        }
-    }
-}
-
-impl<'w, RH> InteractorCallStep<'w, RH>
-where
-    RH: RHListExec<TxResponse, InteractorEnvExec<'w>>,
-    RH::ListReturns: NestedTupleFlatten,
-{
-    pub async fn run(mut self) -> <RH::ListReturns as NestedTupleFlatten>::Unpacked {
-        self.step_wrapper
-            .env
-            .world
-            .sc_call(&mut self.step_wrapper.step)
-            .await;
-        self.step_wrapper.process_result()
-    }
-}
-
-impl Interactor {
-    pub fn tx(&mut self) -> TxBaseWithEnv<InteractorEnvExec<'_>> {
-        let data = self.new_env_data();
-        let env = InteractorEnvExec { world: self, data };
-        Tx::new_with_env(env)
-    }
-
-    pub async fn chain_call<From, To, Payment, Gas, RH, F>(&mut self, f: F) -> &mut Self
-    where
-        From: TxFromSpecified<ScenarioTxEnvData>,
-        To: TxToSpecified<ScenarioTxEnvData>,
-        Payment: TxPayment<ScenarioTxEnvData>,
-        Gas: TxGas<ScenarioTxEnvData>,
-        RH: RHListExec<TxResponse, ScenarioTxEnvData, ListReturns = ()>,
-        F: FnOnce(
-            TxBaseWithEnv<ScenarioTxEnvData>,
-        )
-            -> Tx<ScenarioTxEnvData, From, To, Payment, Gas, FunctionCall<StaticApi>, RH>,
-    {
-        let env = self.new_env_data();
-        let tx_base = TxBaseWithEnv::new_with_env(env);
-        let tx = f(tx_base);
-
-        let mut step_wrapper = tx.tx_to_step();
-        self.sc_call(&mut step_wrapper.step).await;
-        step_wrapper.process_result();
-        
-        self
-    }
-}
diff --git a/framework/snippets/src/itx/interactor_env_query.rs b/framework/snippets/src/itx/interactor_env_query.rs
deleted file mode 100644
index 881fc6b861..0000000000
--- a/framework/snippets/src/itx/interactor_env_query.rs
+++ /dev/null
@@ -1,116 +0,0 @@
-use std::path::PathBuf;
-
-use multiversx_sc_scenario::{
-    api::StaticApi,
-    multiversx_sc::{
-        tuple_util::NestedTupleFlatten,
-        types::{
-            AnnotatedValue, FunctionCall, ManagedAddress, ManagedBuffer, RHListExec, Tx,
-            TxBaseWithEnv, TxEnv, TxFromSpecified, TxGas, TxPayment, TxToSpecified,
-        },
-    },
-    scenario::tx_to_step::{StepWrapper, TxToQueryStep},
-    scenario_model::{ScQueryStep, TxExpect, TxResponse},
-    ScenarioTxEnv, ScenarioTxEnvData, ScenarioTxRun, ScenarioWorld,
-};
-
-use crate::{Interactor, InteractorPrepareAsync};
-
-pub struct InteractorEnvQuery<'w> {
-    pub world: &'w mut Interactor,
-    pub data: ScenarioTxEnvData,
-}
-
-impl<'w> TxEnv for InteractorEnvQuery<'w> {
-    type Api = StaticApi;
-
-    type RHExpect = TxExpect;
-
-    fn resolve_sender_address(&self) -> ManagedAddress<Self::Api> {
-        panic!("Explicit sender address expected")
-    }
-
-    fn default_gas_annotation(&self) -> ManagedBuffer<Self::Api> {
-        self.data.default_gas_annotation()
-    }
-
-    fn default_gas_value(&self) -> u64 {
-        self.data.default_gas_value()
-    }
-}
-
-impl<'w> ScenarioTxEnv for InteractorEnvQuery<'w> {
-    fn env_data(&self) -> &ScenarioTxEnvData {
-        &self.data
-    }
-}
-
-pub struct InteractorQueryStep<'w, RH>
-where
-    RH: RHListExec<TxResponse, InteractorEnvQuery<'w>>,
-    RH::ListReturns: NestedTupleFlatten,
-{
-    step_wrapper: StepWrapper<InteractorEnvQuery<'w>, ScQueryStep, RH>,
-}
-
-impl<'w, To, RH> InteractorPrepareAsync
-    for Tx<InteractorEnvQuery<'w>, (), To, (), (), FunctionCall<StaticApi>, RH>
-where
-    To: TxToSpecified<InteractorEnvQuery<'w>>,
-    RH: RHListExec<TxResponse, InteractorEnvQuery<'w>>,
-    RH::ListReturns: NestedTupleFlatten,
-{
-    type Exec = InteractorQueryStep<'w, RH>;
-
-    fn prepare_async(self) -> Self::Exec {
-        InteractorQueryStep {
-            step_wrapper: self.tx_to_query_step(),
-        }
-    }
-}
-
-impl<'w, RH> InteractorQueryStep<'w, RH>
-where
-    RH: RHListExec<TxResponse, InteractorEnvQuery<'w>>,
-    RH::ListReturns: NestedTupleFlatten,
-{
-    pub async fn run(mut self) -> <RH::ListReturns as NestedTupleFlatten>::Unpacked {
-        self.step_wrapper
-            .env
-            .world
-            .sc_query(&mut self.step_wrapper.step)
-            .await;
-        self.step_wrapper.process_result()
-    }
-}
-
-impl Interactor {
-    pub fn query(&mut self) -> TxBaseWithEnv<InteractorEnvQuery<'_>> {
-        let data = self.new_env_data();
-        let env = InteractorEnvQuery { world: self, data };
-        Tx::new_with_env(env)
-    }
-
-    pub async fn chain_query<To, RH, F>(&mut self, f: F) -> &mut Self
-    where
-        To: TxToSpecified<ScenarioTxEnvData>,
-        RH: RHListExec<TxResponse, ScenarioTxEnvData, ListReturns = ()>,
-        F: FnOnce(
-            TxBaseWithEnv<ScenarioTxEnvData>,
-        ) -> Tx<ScenarioTxEnvData, (), To, (), (), FunctionCall<StaticApi>, RH>,
-    {
-        let env = self.new_env_data();
-        let tx_base = TxBaseWithEnv::new_with_env(env);
-        let tx = f(tx_base);
-
-        let mut step_wrapper = tx.tx_to_query_step();
-        self.sc_query(&mut step_wrapper.step).await;
-        step_wrapper.process_result();
-
-        // let mut step = tx_to_sc_query_step(&tx.env, tx.to, tx.data);
-        // step.expect = Some(tx.result_handler.list_tx_expect());
-        // self.sc_query(&mut step).await;
-        // process_result(step.response, tx.result_handler);
-        self
-    }
-}
diff --git a/framework/snippets/src/itx/interactor_env_transf.rs b/framework/snippets/src/itx/interactor_env_transf.rs
deleted file mode 100644
index 33b977dbac..0000000000
--- a/framework/snippets/src/itx/interactor_env_transf.rs
+++ /dev/null
@@ -1,51 +0,0 @@
-use std::path::PathBuf;
-
-use multiversx_sc_scenario::{
-    api::StaticApi,
-    multiversx_sc::{
-        tuple_util::NestedTupleFlatten,
-        types::{
-            AnnotatedValue, Code, DeployCall, FunctionCall, ManagedAddress, ManagedBuffer, Tx,
-            TxBaseWithEnv, TxCodeSource, TxCodeSourceSpecified, TxCodeValue, TxEnv,
-            TxFromSpecified, TxGas, TxPayment, TxToSpecified,
-        },
-    },
-    scenario::tx_to_step::{StepWrapper, TxToStep},
-    scenario_model::{
-        AddressValue, BytesValue, ScCallStep, ScDeployStep, TransferStep, TxResponse,
-    },
-    ScenarioTxEnv, ScenarioTxEnvData, ScenarioTxRun, ScenarioWorld,
-};
-
-use crate::{Interactor, InteractorEnvExec, InteractorPrepareAsync};
-
-pub struct InteractorTransferStep<'w> {
-    step_wrapper: StepWrapper<InteractorEnvExec<'w>, TransferStep, ()>,
-}
-
-impl<'w, From, To, Payment, Gas> InteractorPrepareAsync
-    for Tx<InteractorEnvExec<'w>, From, To, Payment, Gas, (), ()>
-where
-    From: TxFromSpecified<InteractorEnvExec<'w>>,
-    To: TxToSpecified<InteractorEnvExec<'w>>,
-    Payment: TxPayment<InteractorEnvExec<'w>>,
-    Gas: TxGas<InteractorEnvExec<'w>>,
-{
-    type Exec = InteractorTransferStep<'w>;
-
-    fn prepare_async(self) -> Self::Exec {
-        InteractorTransferStep {
-            step_wrapper: self.tx_to_step(),
-        }
-    }
-}
-
-impl<'w> InteractorTransferStep<'w> {
-    pub async fn run(mut self) {
-        self.step_wrapper
-            .env
-            .world
-            .transfer(self.step_wrapper.step)
-            .await;
-    }
-}
diff --git a/framework/snippets/src/lib.rs b/framework/snippets/src/lib.rs
index 9bf2c07e33..1a30aaa23a 100644
--- a/framework/snippets/src/lib.rs
+++ b/framework/snippets/src/lib.rs
@@ -8,9 +8,9 @@ mod interactor_sc_deploy;
 mod interactor_sc_extra;
 mod interactor_sc_transfer;
 mod interactor_sender;
+mod interactor_tx;
 mod interactor_tx_spec;
 mod interactor_vm_query;
-mod itx;
 mod step_buffer;
 
 pub use env_logger;
@@ -18,8 +18,8 @@ pub use hex;
 pub use interactor::*;
 pub use interactor_dns::*;
 pub use interactor_sender::*;
+pub use interactor_tx::*;
 pub use interactor_tx_spec::*;
-pub use itx::*;
 pub use log;
 pub use multiversx_sc_scenario::{self, multiversx_sc};
 pub use multiversx_sdk as erdrs; // TODO: remove

From 00b390f08533568f44e45f9c5ba83dfbd0e95308 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 3 Apr 2024 01:41:11 +0300
Subject: [PATCH 0628/1254] interactor refactor

---
 framework/snippets/src/interactor_multi_sc_exec.rs  |  8 ++++----
 .../{interactor_tx_spec.rs => interactor_step.rs}   | 13 +++++++------
 framework/snippets/src/lib.rs                       |  4 ++--
 framework/snippets/src/step_buffer.rs               |  6 +++---
 4 files changed, 16 insertions(+), 15 deletions(-)
 rename framework/snippets/src/{interactor_tx_spec.rs => interactor_step.rs} (79%)

diff --git a/framework/snippets/src/interactor_multi_sc_exec.rs b/framework/snippets/src/interactor_multi_sc_exec.rs
index b8035fbae6..08c4f9c6cd 100644
--- a/framework/snippets/src/interactor_multi_sc_exec.rs
+++ b/framework/snippets/src/interactor_multi_sc_exec.rs
@@ -1,6 +1,6 @@
 use crate::{
     interactor_multi_sc_process::{update_nonces_and_sign_tx, SenderSet, Txs},
-    Interactor, StepBuffer, TransactionSpec,
+    Interactor, InteractorStep, StepBuffer,
 };
 
 use multiversx_sc_scenario::scenario_model::TxResponse;
@@ -32,7 +32,7 @@ impl Interactor {
 
         for sc_call_step in &mut buffer.refs {
             let mut transaction = sc_call_step.to_transaction(self);
-            let sender_address = &sc_call_step.to_address().value;
+            let sender_address = &sc_call_step.sender_address().value;
             let sender = self
                 .sender_map
                 .get_mut(sender_address)
@@ -45,11 +45,11 @@ impl Interactor {
     }
 }
 
-fn retrieve_senders(sc_call_steps: &[&mut dyn TransactionSpec]) -> SenderSet {
+fn retrieve_senders(sc_call_steps: &[&mut dyn InteractorStep]) -> SenderSet {
     let mut senders = SenderSet::new();
 
     for sc_call_step in sc_call_steps {
-        let sender_address = &sc_call_step.to_address().value;
+        let sender_address = &sc_call_step.sender_address().value;
         senders.insert(sender_address.clone());
     }
     senders
diff --git a/framework/snippets/src/interactor_tx_spec.rs b/framework/snippets/src/interactor_step.rs
similarity index 79%
rename from framework/snippets/src/interactor_tx_spec.rs
rename to framework/snippets/src/interactor_step.rs
index 7463d37c5e..be172bbb82 100644
--- a/framework/snippets/src/interactor_tx_spec.rs
+++ b/framework/snippets/src/interactor_step.rs
@@ -6,22 +6,23 @@ use multiversx_sdk::data::transaction::Transaction;
 
 use crate::Interactor;
 
-pub trait TransactionSpec {
+/// Describes a scenario step that can be executed in an interactor.
+pub trait InteractorStep {
     fn to_transaction(&self, interactor: &Interactor) -> Transaction;
 
-    fn to_address(&self) -> &AddressValue;
+    fn sender_address(&self) -> &AddressValue;
 
     fn run_step(&mut self, step_runner: &mut dyn ScenarioRunner);
 
     fn set_response(&mut self, tx_response: TxResponse);
 }
 
-impl TransactionSpec for ScCallStep {
+impl InteractorStep for ScCallStep {
     fn to_transaction(&self, interactor: &Interactor) -> Transaction {
         interactor.tx_call_to_blockchain_tx(&self.tx)
     }
 
-    fn to_address(&self) -> &AddressValue {
+    fn sender_address(&self) -> &AddressValue {
         &self.tx.from
     }
 
@@ -35,12 +36,12 @@ impl TransactionSpec for ScCallStep {
     }
 }
 
-impl TransactionSpec for ScDeployStep {
+impl InteractorStep for ScDeployStep {
     fn to_transaction(&self, interactor: &Interactor) -> Transaction {
         interactor.sc_deploy_to_blockchain_tx(self)
     }
 
-    fn to_address(&self) -> &AddressValue {
+    fn sender_address(&self) -> &AddressValue {
         &self.tx.from
     }
 
diff --git a/framework/snippets/src/lib.rs b/framework/snippets/src/lib.rs
index 1a30aaa23a..e05bbf5f01 100644
--- a/framework/snippets/src/lib.rs
+++ b/framework/snippets/src/lib.rs
@@ -8,8 +8,8 @@ mod interactor_sc_deploy;
 mod interactor_sc_extra;
 mod interactor_sc_transfer;
 mod interactor_sender;
+mod interactor_step;
 mod interactor_tx;
-mod interactor_tx_spec;
 mod interactor_vm_query;
 mod step_buffer;
 
@@ -18,8 +18,8 @@ pub use hex;
 pub use interactor::*;
 pub use interactor_dns::*;
 pub use interactor_sender::*;
+pub use interactor_step::InteractorStep;
 pub use interactor_tx::*;
-pub use interactor_tx_spec::*;
 pub use log;
 pub use multiversx_sc_scenario::{self, multiversx_sc};
 pub use multiversx_sdk as erdrs; // TODO: remove
diff --git a/framework/snippets/src/step_buffer.rs b/framework/snippets/src/step_buffer.rs
index f4956ff3a0..529b790ff5 100644
--- a/framework/snippets/src/step_buffer.rs
+++ b/framework/snippets/src/step_buffer.rs
@@ -1,10 +1,10 @@
 use multiversx_sc_scenario::scenario_model::{ScCallStep, ScDeployStep};
 
-use crate::TransactionSpec;
+use crate::InteractorStep;
 
 #[derive(Default)]
 pub struct StepBuffer<'a> {
-    pub refs: Vec<&'a mut dyn TransactionSpec>,
+    pub refs: Vec<&'a mut dyn InteractorStep>,
 }
 
 impl<'a> StepBuffer<'a> {
@@ -54,7 +54,7 @@ impl<'a> StepBuffer<'a> {
         buffer
     }
 
-    pub fn to_refs_vec(&'a self) -> Vec<&'a dyn TransactionSpec> {
+    pub fn to_refs_vec(&'a self) -> Vec<&'a dyn InteractorStep> {
         self.refs.iter().map(|r| &**r).collect()
     }
 }

From 43934fd9ec5810ff2431351875ac193e2811ca07 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 3 Apr 2024 01:58:34 +0300
Subject: [PATCH 0629/1254] interactor refactor

---
 framework/snippets/src/interactor_scenario.rs      |  5 +++++
 .../interactor_sc_call.rs                          |  0
 .../interactor_sc_deploy.rs                        |  0
 .../interactor_sc_extra.rs                         |  0
 .../interactor_transfer.rs}                        |  0
 .../interactor_vm_query.rs                         |  0
 framework/snippets/src/lib.rs                      | 14 +++-----------
 framework/snippets/src/multi.rs                    |  7 +++++++
 .../src/{ => multi}/interactor_multi_sc_exec.rs    |  7 ++-----
 .../src/{ => multi}/interactor_multi_sc_process.rs |  0
 .../snippets/src/{ => multi}/interactor_step.rs    |  0
 framework/snippets/src/{ => multi}/step_buffer.rs  |  0
 12 files changed, 17 insertions(+), 16 deletions(-)
 create mode 100644 framework/snippets/src/interactor_scenario.rs
 rename framework/snippets/src/{ => interactor_scenario}/interactor_sc_call.rs (100%)
 rename framework/snippets/src/{ => interactor_scenario}/interactor_sc_deploy.rs (100%)
 rename framework/snippets/src/{ => interactor_scenario}/interactor_sc_extra.rs (100%)
 rename framework/snippets/src/{interactor_sc_transfer.rs => interactor_scenario/interactor_transfer.rs} (100%)
 rename framework/snippets/src/{ => interactor_scenario}/interactor_vm_query.rs (100%)
 create mode 100644 framework/snippets/src/multi.rs
 rename framework/snippets/src/{ => multi}/interactor_multi_sc_exec.rs (92%)
 rename framework/snippets/src/{ => multi}/interactor_multi_sc_process.rs (100%)
 rename framework/snippets/src/{ => multi}/interactor_step.rs (100%)
 rename framework/snippets/src/{ => multi}/step_buffer.rs (100%)

diff --git a/framework/snippets/src/interactor_scenario.rs b/framework/snippets/src/interactor_scenario.rs
new file mode 100644
index 0000000000..8449bf9edc
--- /dev/null
+++ b/framework/snippets/src/interactor_scenario.rs
@@ -0,0 +1,5 @@
+mod interactor_sc_call;
+mod interactor_sc_deploy;
+mod interactor_sc_extra;
+mod interactor_transfer;
+mod interactor_vm_query;
diff --git a/framework/snippets/src/interactor_sc_call.rs b/framework/snippets/src/interactor_scenario/interactor_sc_call.rs
similarity index 100%
rename from framework/snippets/src/interactor_sc_call.rs
rename to framework/snippets/src/interactor_scenario/interactor_sc_call.rs
diff --git a/framework/snippets/src/interactor_sc_deploy.rs b/framework/snippets/src/interactor_scenario/interactor_sc_deploy.rs
similarity index 100%
rename from framework/snippets/src/interactor_sc_deploy.rs
rename to framework/snippets/src/interactor_scenario/interactor_sc_deploy.rs
diff --git a/framework/snippets/src/interactor_sc_extra.rs b/framework/snippets/src/interactor_scenario/interactor_sc_extra.rs
similarity index 100%
rename from framework/snippets/src/interactor_sc_extra.rs
rename to framework/snippets/src/interactor_scenario/interactor_sc_extra.rs
diff --git a/framework/snippets/src/interactor_sc_transfer.rs b/framework/snippets/src/interactor_scenario/interactor_transfer.rs
similarity index 100%
rename from framework/snippets/src/interactor_sc_transfer.rs
rename to framework/snippets/src/interactor_scenario/interactor_transfer.rs
diff --git a/framework/snippets/src/interactor_vm_query.rs b/framework/snippets/src/interactor_scenario/interactor_vm_query.rs
similarity index 100%
rename from framework/snippets/src/interactor_vm_query.rs
rename to framework/snippets/src/interactor_scenario/interactor_vm_query.rs
diff --git a/framework/snippets/src/lib.rs b/framework/snippets/src/lib.rs
index e05bbf5f01..70f3f8e792 100644
--- a/framework/snippets/src/lib.rs
+++ b/framework/snippets/src/lib.rs
@@ -1,28 +1,20 @@
 mod interactor;
 mod interactor_dns;
-mod interactor_multi_sc_exec;
-mod interactor_multi_sc_process;
 mod interactor_retrieve;
-mod interactor_sc_call;
-mod interactor_sc_deploy;
-mod interactor_sc_extra;
-mod interactor_sc_transfer;
+mod interactor_scenario;
 mod interactor_sender;
-mod interactor_step;
 mod interactor_tx;
-mod interactor_vm_query;
-mod step_buffer;
+mod multi;
 
 pub use env_logger;
 pub use hex;
 pub use interactor::*;
 pub use interactor_dns::*;
 pub use interactor_sender::*;
-pub use interactor_step::InteractorStep;
 pub use interactor_tx::*;
 pub use log;
+pub use multi::*;
 pub use multiversx_sc_scenario::{self, multiversx_sc};
 pub use multiversx_sdk as erdrs; // TODO: remove
 pub use multiversx_sdk as sdk;
-pub use step_buffer::*;
 pub use tokio;
diff --git a/framework/snippets/src/multi.rs b/framework/snippets/src/multi.rs
new file mode 100644
index 0000000000..0353b8931b
--- /dev/null
+++ b/framework/snippets/src/multi.rs
@@ -0,0 +1,7 @@
+mod interactor_multi_sc_exec;
+mod interactor_multi_sc_process;
+mod interactor_step;
+mod step_buffer;
+
+pub use interactor_step::InteractorStep;
+pub use step_buffer::StepBuffer;
diff --git a/framework/snippets/src/interactor_multi_sc_exec.rs b/framework/snippets/src/multi/interactor_multi_sc_exec.rs
similarity index 92%
rename from framework/snippets/src/interactor_multi_sc_exec.rs
rename to framework/snippets/src/multi/interactor_multi_sc_exec.rs
index 08c4f9c6cd..d99df9c807 100644
--- a/framework/snippets/src/interactor_multi_sc_exec.rs
+++ b/framework/snippets/src/multi/interactor_multi_sc_exec.rs
@@ -1,8 +1,5 @@
-use crate::{
-    interactor_multi_sc_process::{update_nonces_and_sign_tx, SenderSet, Txs},
-    Interactor, InteractorStep, StepBuffer,
-};
-
+use super::interactor_multi_sc_process::{update_nonces_and_sign_tx, SenderSet, Txs};
+use crate::{Interactor, InteractorStep, StepBuffer};
 use multiversx_sc_scenario::scenario_model::TxResponse;
 use multiversx_sdk::data::transaction::Transaction;
 
diff --git a/framework/snippets/src/interactor_multi_sc_process.rs b/framework/snippets/src/multi/interactor_multi_sc_process.rs
similarity index 100%
rename from framework/snippets/src/interactor_multi_sc_process.rs
rename to framework/snippets/src/multi/interactor_multi_sc_process.rs
diff --git a/framework/snippets/src/interactor_step.rs b/framework/snippets/src/multi/interactor_step.rs
similarity index 100%
rename from framework/snippets/src/interactor_step.rs
rename to framework/snippets/src/multi/interactor_step.rs
diff --git a/framework/snippets/src/step_buffer.rs b/framework/snippets/src/multi/step_buffer.rs
similarity index 100%
rename from framework/snippets/src/step_buffer.rs
rename to framework/snippets/src/multi/step_buffer.rs

From 62fafc9bea04dd736aeef747b63dd879e2d35e84 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 3 Apr 2024 03:40:23 +0300
Subject: [PATCH 0630/1254] unified syntax - interactor multi tx

---
 contracts/examples/adder/interact/config.toml |  2 +-
 .../adder/interact/src/basic_interact.rs      | 44 +++++--------
 .../interact/src/basic_interact_state.rs      |  9 ---
 .../interact/src/multisig_interact.rs         | 49 +++++---------
 .../interact/src/multisig_interact_state.rs   |  9 ---
 framework/scenario/src/scenario/tx_to_step.rs |  2 +-
 framework/snippets/src/multi.rs               |  2 +
 .../src/multi/homogenous_tx_buffer.rs         | 65 +++++++++++++++++++
 8 files changed, 105 insertions(+), 77 deletions(-)
 create mode 100644 framework/snippets/src/multi/homogenous_tx_buffer.rs

diff --git a/contracts/examples/adder/interact/config.toml b/contracts/examples/adder/interact/config.toml
index b7fe10a560..61ac8dbf87 100644
--- a/contracts/examples/adder/interact/config.toml
+++ b/contracts/examples/adder/interact/config.toml
@@ -1 +1 @@
-gateway = 'https://testnet-gateway.multiversx.com'
+gateway = 'https://devnet-gateway.multiversx.com'
diff --git a/contracts/examples/adder/interact/src/basic_interact.rs b/contracts/examples/adder/interact/src/basic_interact.rs
index 6664d030ba..9179796675 100644
--- a/contracts/examples/adder/interact/src/basic_interact.rs
+++ b/contracts/examples/adder/interact/src/basic_interact.rs
@@ -2,7 +2,7 @@ mod basic_interact_cli;
 mod basic_interact_config;
 mod basic_interact_state;
 
-use adder::{adder_proxy, ProxyTrait};
+use adder::adder_proxy;
 use basic_interact_config::Config;
 use basic_interact_state::State;
 use clap::Parser;
@@ -15,11 +15,11 @@ use multiversx_sc_snippets::{
         mandos_system::ScenarioRunner,
         num_bigint::BigUint,
         scenario_format::interpret_trait::{InterpretableFrom, InterpreterContext},
-        scenario_model::{BytesValue, ScDeployStep, Scenario},
+        scenario_model::{BytesValue, Scenario},
         standalone::retrieve_account_as_scenario_set_state,
         test_wallets, ContractInfo, NumExpr, WithRawTxResponse,
     },
-    tokio, Interactor, InteractorPrepareAsync, StepBuffer,
+    tokio, Interactor, InteractorPrepareAsync,
 };
 
 const INTERACTOR_SCENARIO_TRACE_PATH: &str = "interactor_trace.scen.json";
@@ -135,33 +135,25 @@ impl AdderInteract {
         self.set_state().await;
         println!("deploying {count} contracts...");
 
-        let mut steps = Vec::new();
+        let mut buffer = self.interactor.homogenous_call_buffer();
         for _ in 0..*count {
-            let typed_sc_deploy = ScDeployStep::new()
-                .call(self.state.default_adder().init(0u32))
-                .from(&self.wallet_address)
-                .code(&self.adder_code)
-                .gas_limit("70,000,000");
-
-            steps.push(typed_sc_deploy);
+            buffer.push_tx(|tx| {
+                tx.from(&self.wallet_address)
+                    .typed(adder_proxy::AdderProxy)
+                    .init(0u32)
+                    .code(&self.adder_code)
+                    .gas(NumExpr("70,000,000"))
+                    .returns(ReturnsNewAddress)
+            });
         }
 
-        self.interactor
-            .multi_sc_exec(StepBuffer::from_sc_deploy_vec(&mut steps))
-            .await;
+        let results = buffer.run().await;
+        for result in results {
+            let new_address_bech32 = bech32::encode(&result.to_address());
+            println!("new address: {new_address_bech32}");
 
-        for step in steps.iter() {
-            // warning: multi deploy not yet fully supported
-            // only works with last deployed address
-            // will be addressed in future versions
-            let new_deployed_address = step.response().new_deployed_address.clone();
-            if let Some(new_address) = new_deployed_address {
-                let new_address_bech32 = bech32::encode(&new_address);
-                println!("new address: {new_address_bech32}");
-            } else {
-                println!("deploy failed");
-                return;
-            }
+            let new_address_expr = format!("bech32:{new_address_bech32}");
+            self.state.set_adder_address(&new_address_expr);
         }
     }
 
diff --git a/contracts/examples/adder/interact/src/basic_interact_state.rs b/contracts/examples/adder/interact/src/basic_interact_state.rs
index 445eb52075..7fe09dc0ed 100644
--- a/contracts/examples/adder/interact/src/basic_interact_state.rs
+++ b/contracts/examples/adder/interact/src/basic_interact_state.rs
@@ -5,10 +5,6 @@ use std::{
     path::Path,
 };
 
-/// Default adder address
-const DEFAULT_ADDER_ADDRESS: &str =
-    "0x0000000000000000000000000000000000000000000000000000000000000000";
-
 /// State file
 const STATE_FILE: &str = "state.toml";
 
@@ -46,11 +42,6 @@ impl State {
                 .expect("no known adder contract, deploy first"),
         )
     }
-
-    /// Returns the adder contract with default address
-    pub fn default_adder(&self) -> AdderContract {
-        AdderContract::new(DEFAULT_ADDER_ADDRESS)
-    }
 }
 
 impl Drop for State {
diff --git a/contracts/examples/multisig/interact/src/multisig_interact.rs b/contracts/examples/multisig/interact/src/multisig_interact.rs
index 83295c0b3e..9dc46fdf44 100644
--- a/contracts/examples/multisig/interact/src/multisig_interact.rs
+++ b/contracts/examples/multisig/interact/src/multisig_interact.rs
@@ -160,12 +160,13 @@ impl MultisigInteract {
 
         let board = self.board();
 
+        let quorum = Config::load_config().quorum();
         let new_address = self
             .interactor
             .tx()
             .from(&self.wallet_address)
             .typed(multisig_proxy::MultisigProxy)
-            .init(&Config::load_config().quorum(), board)
+            .init(quorum, board)
             .code(&self.multisig_code)
             .gas(NumExpr("100,000,000"))
             .returns(ReturnsNewAddress)
@@ -189,40 +190,26 @@ impl MultisigInteract {
         println!("deploying {count} contracts...");
 
         let board = self.board();
-        let mut steps = Vec::new();
+        let quorum = Config::load_config().quorum();
+        let mut buffer = self.interactor.homogenous_call_buffer();
         for _ in 0..*count {
-            let typed_sc_deploy = ScDeployStep::new()
-                .call(
-                    self.state
-                        .default_multisig()
-                        .init(Config::load_config().quorum(), board.clone()),
-                )
-                .from(&self.wallet_address)
-                .code(&self.multisig_code)
-                .gas_limit("70,000,000");
-
-            steps.push(typed_sc_deploy);
+            buffer.push_tx(|tx| {
+                tx.from(&self.wallet_address)
+                    .typed(multisig_proxy::MultisigProxy)
+                    .init(quorum, board.clone())
+                    .code(&self.multisig_code)
+                    .gas(NumExpr("70,000,000"))
+                    .returns(ReturnsNewAddress)
+            });
         }
 
-        self.interactor
-            .multi_sc_exec(StepBuffer::from_sc_deploy_vec(&mut steps))
-            .await;
+        let results = buffer.run().await;
+        for result in results {
+            let new_address_bech32 = bech32::encode(&result.to_address());
+            println!("new address: {new_address_bech32}");
 
-        for step in steps.iter() {
-            // warning: multi deploy not yet fully supported
-            // only works with last deployed address
-            // will be addressed in future versions
-            let new_deployed_address = step.response().new_deployed_address.clone();
-            if let Some(new_address) = new_deployed_address {
-                let new_address_bech32 = bech32::encode(&new_address);
-                println!("new address: {new_address_bech32}");
-
-                let new_address_expr = format!("bech32:{new_address_bech32}");
-                self.state.set_multisig_address(&new_address_expr);
-            } else {
-                println!("deploy failed");
-                return;
-            }
+            let new_address_expr = format!("bech32:{new_address_bech32}");
+            self.state.set_multisig_address(&new_address_expr);
         }
     }
 
diff --git a/contracts/examples/multisig/interact/src/multisig_interact_state.rs b/contracts/examples/multisig/interact/src/multisig_interact_state.rs
index fef8b8baff..f3c97482df 100644
--- a/contracts/examples/multisig/interact/src/multisig_interact_state.rs
+++ b/contracts/examples/multisig/interact/src/multisig_interact_state.rs
@@ -5,10 +5,6 @@ use std::{
     path::Path,
 };
 
-/// Default multisig address
-const DEFAULT_MULTISIG_ADDRESS: &str =
-    "0x0000000000000000000000000000000000000000000000000000000000000000";
-
 /// State file
 const STATE_FILE: &str = "state.toml";
 
@@ -42,11 +38,6 @@ impl State {
     pub fn multisig(&self) -> MultisigContract {
         MultisigContract::new(self.multisig_address.clone().unwrap())
     }
-
-    /// Returns the multisig contract with default address
-    pub fn default_multisig(&self) -> MultisigContract {
-        MultisigContract::new(DEFAULT_MULTISIG_ADDRESS)
-    }
 }
 
 impl Drop for State {
diff --git a/framework/scenario/src/scenario/tx_to_step.rs b/framework/scenario/src/scenario/tx_to_step.rs
index 601d4d9b71..82e236e48b 100644
--- a/framework/scenario/src/scenario/tx_to_step.rs
+++ b/framework/scenario/src/scenario/tx_to_step.rs
@@ -7,5 +7,5 @@ mod tx_to_step_trait;
 mod tx_to_step_transfer;
 
 pub use step_annotation::*;
-pub use step_wrapper::StepWrapper;
+pub use step_wrapper::{StepWithResponse, StepWrapper};
 pub use tx_to_step_trait::*;
diff --git a/framework/snippets/src/multi.rs b/framework/snippets/src/multi.rs
index 0353b8931b..973b159858 100644
--- a/framework/snippets/src/multi.rs
+++ b/framework/snippets/src/multi.rs
@@ -1,7 +1,9 @@
+mod homogenous_tx_buffer;
 mod interactor_multi_sc_exec;
 mod interactor_multi_sc_process;
 mod interactor_step;
 mod step_buffer;
 
+pub use homogenous_tx_buffer::HomogenousTxBuffer;
 pub use interactor_step::InteractorStep;
 pub use step_buffer::StepBuffer;
diff --git a/framework/snippets/src/multi/homogenous_tx_buffer.rs b/framework/snippets/src/multi/homogenous_tx_buffer.rs
new file mode 100644
index 0000000000..7d40474d59
--- /dev/null
+++ b/framework/snippets/src/multi/homogenous_tx_buffer.rs
@@ -0,0 +1,65 @@
+use multiversx_sc_scenario::{
+    multiversx_sc::{
+        tuple_util::NestedTupleFlatten,
+        types::{RHListExec, TxBaseWithEnv},
+    },
+    scenario::tx_to_step::{StepWithResponse, StepWrapper, TxToStep},
+    scenario_model::TxResponse,
+    ScenarioTxEnvData,
+};
+
+use crate::{Interactor, InteractorExecEnv, InteractorStep, StepBuffer};
+
+pub struct HomogenousTxBuffer<'w, Step, RH> {
+    env: InteractorExecEnv<'w>,
+    steps: Vec<StepWrapper<ScenarioTxEnvData, Step, RH>>,
+}
+
+impl Interactor {
+    /// Creates a buffer that can hold multiple transactions, and then execute them all at once.
+    ///
+    /// This buffer holds transactions of the same type (call/deploy) and with identical result handler types.
+    /// Therefore, after execution, all results will have the same type.
+    pub fn homogenous_call_buffer<Step, RH>(&mut self) -> HomogenousTxBuffer<'_, Step, RH> {
+        let data = self.new_env_data();
+        let env = InteractorExecEnv { world: self, data };
+        HomogenousTxBuffer {
+            env,
+            steps: Vec::new(),
+        }
+    }
+}
+
+impl<'w, Step, RH> HomogenousTxBuffer<'w, Step, RH>
+where
+    Step: InteractorStep + StepWithResponse,
+    RH: RHListExec<TxResponse, ScenarioTxEnvData>,
+    RH::ListReturns: NestedTupleFlatten,
+{
+    pub fn push_tx<Tx, F>(&mut self, f: F) -> &mut Self
+    where
+        Tx: TxToStep<Env = ScenarioTxEnvData, Step = Step, RH = RH>,
+        F: FnOnce(TxBaseWithEnv<ScenarioTxEnvData>) -> Tx,
+    {
+        let env = self.env.world.new_env_data();
+        let tx_base = TxBaseWithEnv::new_with_env(env);
+        let tx = f(tx_base);
+
+        self.steps.push(tx.tx_to_step());
+
+        self
+    }
+
+    pub async fn run(mut self) -> Vec<<RH::ListReturns as NestedTupleFlatten>::Unpacked> {
+        let mut step_buffer = StepBuffer::default();
+        for step in &mut self.steps {
+            step_buffer.refs.push(&mut step.step);
+        }
+        self.env.world.multi_sc_exec(step_buffer).await;
+
+        self.steps
+            .into_iter()
+            .map(|step| step.process_result())
+            .collect()
+    }
+}

From ea52e2c659162da5f4edf3c8a3296ab9b0ae20c1 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 3 Apr 2024 11:20:06 +0300
Subject: [PATCH 0631/1254] unified syntax - egld of esdt payment refs

---
 .../src/distribution_module.rs                |   2 +-
 .../forwarder-raw/src/forwarder_raw_async.rs  |   6 +-
 .../src/call_promise_direct.rs                |   2 +-
 .../recursive-caller/src/recursive_caller.rs  |   2 +-
 .../composability/vault/src/vault.rs          |   2 +-
 .../wrappers/blockchain_wrapper.rs            |   5 +-
 framework/base/src/types/interaction/tx.rs    |  24 ++--
 .../base/src/types/interaction/tx_payment.rs  |   3 +-
 .../tx_payment/tx_payment_egld_or_esdt.rs     |  51 +++++++-
 .../tx_payment/tx_payment_egld_or_esdt_ref.rs | 117 ------------------
 .../tx_payment_egld_or_esdt_refs.rs           |  66 ++++++++++
 .../wrapped/egld_or_esdt_token_identifier.rs  |  31 ++---
 .../wrapped/egld_or_esdt_token_payment.rs     | 103 +++++++++++++--
 .../managed/wrapped/esdt_token_payment.rs     |  18 ++-
 .../types/managed/wrapped/managed_option.rs   |  20 +--
 .../base/src/types/managed/wrapped/mod.rs     |   2 +-
 .../types/managed/wrapped/token_identifier.rs |   5 +-
 framework/derive/src/generate/proxy_gen.rs    |   2 +-
 18 files changed, 281 insertions(+), 180 deletions(-)
 delete mode 100644 framework/base/src/types/interaction/tx_payment/tx_payment_egld_or_esdt_ref.rs
 create mode 100644 framework/base/src/types/interaction/tx_payment/tx_payment_egld_or_esdt_refs.rs

diff --git a/contracts/examples/seed-nft-minter/src/distribution_module.rs b/contracts/examples/seed-nft-minter/src/distribution_module.rs
index d91d6e6ae2..54f8bf2586 100644
--- a/contracts/examples/seed-nft-minter/src/distribution_module.rs
+++ b/contracts/examples/seed-nft-minter/src/distribution_module.rs
@@ -36,7 +36,7 @@ pub trait DistributionModule {
             self.tx()
                 .to(&distribution.address)
                 .raw_call(distribution.endpoint)
-                .egld_or_single_esdt((token_id.clone(), token_nonce, payment_amount))
+                .egld_or_single_esdt(token_id, token_nonce, &payment_amount)
                 .gas(distribution.gas_limit)
                 .transfer_execute();
         }
diff --git a/contracts/feature-tests/composability/forwarder-raw/src/forwarder_raw_async.rs b/contracts/feature-tests/composability/forwarder-raw/src/forwarder_raw_async.rs
index ad276c32b0..944e3365b6 100644
--- a/contracts/feature-tests/composability/forwarder-raw/src/forwarder_raw_async.rs
+++ b/contracts/feature-tests/composability/forwarder-raw/src/forwarder_raw_async.rs
@@ -46,7 +46,11 @@ pub trait ForwarderRawAsync: super::forwarder_raw_common::ForwarderRawCommon {
             .to(to)
             .raw_call(endpoint_name)
             .arguments_raw(args.to_arg_buffer())
-            .egld_or_single_esdt((payment_token, 0, payment_amount))
+            .payment(EgldOrEsdtTokenPayment::new(
+                payment_token,
+                0,
+                payment_amount,
+            ))
     }
 
     #[endpoint]
diff --git a/contracts/feature-tests/composability/promises-features/src/call_promise_direct.rs b/contracts/feature-tests/composability/promises-features/src/call_promise_direct.rs
index e98e9b0c3b..55093fc8d6 100644
--- a/contracts/feature-tests/composability/promises-features/src/call_promise_direct.rs
+++ b/contracts/feature-tests/composability/promises-features/src/call_promise_direct.rs
@@ -17,7 +17,7 @@ pub trait CallPromisesDirectModule {
         self.tx()
             .to(&to)
             .raw_call(endpoint_name)
-            .egld_or_single_esdt(payment)
+            .payment(payment)
             .arguments_raw(args.to_arg_buffer())
             .gas(gas_limit)
             .async_call_promise()
diff --git a/contracts/feature-tests/composability/recursive-caller/src/recursive_caller.rs b/contracts/feature-tests/composability/recursive-caller/src/recursive_caller.rs
index 407a681927..94f26e7e8d 100644
--- a/contracts/feature-tests/composability/recursive-caller/src/recursive_caller.rs
+++ b/contracts/feature-tests/composability/recursive-caller/src/recursive_caller.rs
@@ -25,7 +25,7 @@ pub trait RecursiveCaller {
             .to(to)
             .typed(vault_proxy::VaultProxy)
             .accept_funds()
-            .egld_or_single_esdt((token_identifier.clone(), 0, amount.clone()))
+            .egld_or_single_esdt(token_identifier, 0, amount)
             .async_call()
             .with_callback(self.callbacks().recursive_send_funds_callback(
                 to,
diff --git a/contracts/feature-tests/composability/vault/src/vault.rs b/contracts/feature-tests/composability/vault/src/vault.rs
index 9f293bae45..ab22590572 100644
--- a/contracts/feature-tests/composability/vault/src/vault.rs
+++ b/contracts/feature-tests/composability/vault/src/vault.rs
@@ -153,7 +153,7 @@ pub trait Vault {
             self.tx()
                 .to(&caller)
                 .raw_call(endpoint_name.clone())
-                .egld_or_single_esdt(return_payment.clone())
+                .payment(&return_payment)
                 .gas(self.blockchain().get_gas_left() / 2)
                 .transfer_execute()
         }
diff --git a/framework/base/src/contract_base/wrappers/blockchain_wrapper.rs b/framework/base/src/contract_base/wrappers/blockchain_wrapper.rs
index 01ce71d189..5a7f36a722 100644
--- a/framework/base/src/contract_base/wrappers/blockchain_wrapper.rs
+++ b/framework/base/src/contract_base/wrappers/blockchain_wrapper.rs
@@ -153,8 +153,9 @@ where
     #[inline]
     pub fn get_sc_balance(&self, token: &EgldOrEsdtTokenIdentifier<A>, nonce: u64) -> BigUint<A> {
         token.map_ref_or_else(
-            || self.get_balance(&self.get_sc_address()),
-            |token_identifier| {
+            (),
+            |()| self.get_balance(&self.get_sc_address()),
+            |(), token_identifier| {
                 self.get_esdt_balance(&self.get_sc_address(), token_identifier, nonce)
             },
         )
diff --git a/framework/base/src/types/interaction/tx.rs b/framework/base/src/types/interaction/tx.rs
index de33648ba2..1524bb22fe 100644
--- a/framework/base/src/types/interaction/tx.rs
+++ b/framework/base/src/types/interaction/tx.rs
@@ -1,6 +1,7 @@
 use crate::{
     api::CallTypeApi,
     contract_base::BlockchainWrapper,
+    proxy_imports::{EgldOrEsdtTokenIdentifier, EgldOrEsdtTokenPaymentRefs},
     types::{
         BigUint, CodeMetadata, EgldOrEsdtTokenPayment, EgldOrMultiEsdtPayment,
         EgldOrMultiEsdtPaymentRefs, EsdtTokenPayment, EsdtTokenPaymentRefs, ManagedAddress,
@@ -214,6 +215,20 @@ where
         })
     }
 
+    /// Syntactic sugar for `self.payment(EgldOrEsdtTokenPaymentRefs::new(...)`. Takes references.
+    pub fn egld_or_single_esdt<'a>(
+        self,
+        token_identifier: &'a EgldOrEsdtTokenIdentifier<Env::Api>,
+        token_nonce: u64,
+        amount: &'a BigUint<Env::Api>,
+    ) -> Tx<Env, From, To, EgldOrEsdtTokenPaymentRefs<'a, Env::Api>, Gas, Data, RH> {
+        self.payment(EgldOrEsdtTokenPaymentRefs::new(
+            token_identifier,
+            token_nonce,
+            amount,
+        ))
+    }
+
     /// Sets a collection of ESDT transfers as the payment of the transaction.
     ///
     /// Equivalend to just ``.payment(payments)`, but only accepts the multi-esdt types.
@@ -232,19 +247,12 @@ where
         self.multi_esdt(payments)
     }
 
-    pub fn egld_or_single_esdt<P: Into<EgldOrEsdtTokenPayment<Env::Api>>>(
-        self,
-        payment: P,
-    ) -> Tx<Env, From, To, EgldOrEsdtTokenPayment<Env::Api>, Gas, Data, RH> {
-        self.payment(payment.into())
-    }
-
     /// Backwards compatibility.
     pub fn with_egld_or_single_esdt_transfer<P: Into<EgldOrEsdtTokenPayment<Env::Api>>>(
         self,
         payment: P,
     ) -> Tx<Env, From, To, EgldOrEsdtTokenPayment<Env::Api>, Gas, Data, RH> {
-        self.egld_or_single_esdt(payment)
+        self.payment(payment.into())
     }
 
     pub fn egld_or_multi_esdt<P: Into<EgldOrMultiEsdtPayment<Env::Api>>>(
diff --git a/framework/base/src/types/interaction/tx_payment.rs b/framework/base/src/types/interaction/tx_payment.rs
index aed63a90d4..252204edd8 100644
--- a/framework/base/src/types/interaction/tx_payment.rs
+++ b/framework/base/src/types/interaction/tx_payment.rs
@@ -1,6 +1,6 @@
 mod tx_payment_egld;
 mod tx_payment_egld_or_esdt;
-mod tx_payment_egld_or_esdt_ref;
+mod tx_payment_egld_or_esdt_refs;
 mod tx_payment_egld_or_multi_esdt;
 mod tx_payment_egld_or_multi_esdt_ref;
 mod tx_payment_egld_value;
@@ -10,7 +10,6 @@ mod tx_payment_single_esdt;
 mod tx_payment_single_esdt_ref;
 
 pub use tx_payment_egld::{Egld, EgldPayment};
-pub use tx_payment_egld_or_esdt_ref::*;
 pub use tx_payment_egld_value::TxEgldValue;
 pub use tx_payment_multi_esdt::TxPaymentMultiEsdt;
 
diff --git a/framework/base/src/types/interaction/tx_payment/tx_payment_egld_or_esdt.rs b/framework/base/src/types/interaction/tx_payment/tx_payment_egld_or_esdt.rs
index adc5ef36f9..e70c2919f2 100644
--- a/framework/base/src/types/interaction/tx_payment/tx_payment_egld_or_esdt.rs
+++ b/framework/base/src/types/interaction/tx_payment/tx_payment_egld_or_esdt.rs
@@ -8,7 +8,7 @@ use crate::{
 
 use super::{AnnotatedEgldPayment, FullPaymentData, FunctionCall, TxEgldValue, TxEnv, TxPayment};
 
-impl<Env> TxPayment<Env> for EgldOrEsdtTokenPayment<Env::Api>
+impl<Env> TxPayment<Env> for &EgldOrEsdtTokenPayment<Env::Api>
 where
     Env: TxEnv,
 {
@@ -23,13 +23,60 @@ where
         gas_limit: u64,
         fc: FunctionCall<Env::Api>,
     ) {
-        self.map_egld_or_esdt(
+        self.map_ref_egld_or_esdt(
             (to, fc),
             |(to, fc), amount| Egld(amount).perform_transfer_execute(env, to, gas_limit, fc),
             |(to, fc), esdt_payment| esdt_payment.perform_transfer_execute(env, to, gas_limit, fc),
         )
     }
 
+    fn with_normalized<From, To, F, R>(
+        self,
+        env: &Env,
+        from: &From,
+        to: To,
+        fc: FunctionCall<Env::Api>,
+        f: F,
+    ) -> R
+    where
+        From: TxFrom<Env>,
+        To: TxToSpecified<Env>,
+        F: FnOnce(&ManagedAddress<Env::Api>, &BigUint<Env::Api>, &FunctionCall<Env::Api>) -> R,
+    {
+        self.map_ref_egld_or_esdt(
+            (to, fc, f),
+            |(to, fc, f), amount| Egld(amount).with_normalized(env, from, to, fc, f),
+            |(to, fc, f), esdt_payment| esdt_payment.with_normalized(env, from, to, fc, f),
+        )
+    }
+
+    fn into_full_payment_data(self, env: &Env) -> FullPaymentData<Env::Api> {
+        self.map_ref_egld_or_esdt(
+            (),
+            |(), amount| TxPayment::<Env>::into_full_payment_data(Egld(amount), env),
+            |(), esdt_payment| TxPayment::<Env>::into_full_payment_data(esdt_payment, env),
+        )
+    }
+}
+
+impl<Env> TxPayment<Env> for EgldOrEsdtTokenPayment<Env::Api>
+where
+    Env: TxEnv,
+{
+    fn is_no_payment(&self, env: &Env) -> bool {
+        (&self).is_no_payment(env)
+    }
+
+    fn perform_transfer_execute(
+        self,
+        env: &Env,
+        to: &ManagedAddress<Env::Api>,
+        gas_limit: u64,
+        fc: FunctionCall<Env::Api>,
+    ) {
+        (&self).perform_transfer_execute(env, to, gas_limit, fc)
+    }
+
     fn with_normalized<From, To, F, R>(
         self,
         env: &Env,
diff --git a/framework/base/src/types/interaction/tx_payment/tx_payment_egld_or_esdt_ref.rs b/framework/base/src/types/interaction/tx_payment/tx_payment_egld_or_esdt_ref.rs
deleted file mode 100644
index d7dc216308..0000000000
--- a/framework/base/src/types/interaction/tx_payment/tx_payment_egld_or_esdt_ref.rs
+++ /dev/null
@@ -1,117 +0,0 @@
-use alloc::borrow::ToOwned;
-
-use crate::{
-    api::ManagedTypeApi,
-    contract_base::SendRawWrapper,
-    proxy_imports::EgldOrEsdtTokenIdentifier,
-    types::{
-        AnnotatedValue, BigUint, EgldOrEsdtTokenPayment, EgldOrMultiEsdtPayment, EsdtTokenPayment,
-        EsdtTokenPaymentRefs, ManagedAddress, ManagedType, ManagedVec, MultiEsdtPayment, TxFrom,
-        TxToSpecified,
-    },
-};
-
-use super::{
-    AnnotatedEgldPayment, Egld, FullPaymentData, FunctionCall, TxEgldValue, TxEnv, TxPayment,
-};
-
-impl<'a, Env> TxPayment<Env> for EgldOrEsdtTokenPaymentRefs<'a, Env::Api>
-where
-    Env: TxEnv,
-{
-    fn is_no_payment(&self, _env: &Env) -> bool {
-        self.is_empty()
-    }
-
-    fn perform_transfer_execute(
-        self,
-        env: &Env,
-        to: &ManagedAddress<Env::Api>,
-        gas_limit: u64,
-        fc: FunctionCall<Env::Api>,
-    ) {
-        self.map_egld_or_esdt(
-            (to, fc),
-            |(to, fc), amount| Egld(amount).perform_transfer_execute(env, to, gas_limit, fc),
-            |(to, fc), esdt_payment| esdt_payment.perform_transfer_execute(env, to, gas_limit, fc),
-        )
-    }
-
-    fn with_normalized<From, To, F, R>(
-        self,
-        env: &Env,
-        from: &From,
-        to: To,
-        fc: FunctionCall<Env::Api>,
-        f: F,
-    ) -> R
-    where
-        From: TxFrom<Env>,
-        To: TxToSpecified<Env>,
-        F: FnOnce(&ManagedAddress<Env::Api>, &BigUint<Env::Api>, &FunctionCall<Env::Api>) -> R,
-    {
-        self.map_egld_or_esdt(
-            (to, fc, f),
-            |(to, fc, f), amount| Egld(amount).with_normalized(env, from, to, fc, f),
-            |(to, fc, f), esdt_payment| esdt_payment.with_normalized(env, from, to, fc, f),
-        )
-    }
-
-    fn into_full_payment_data(self, env: &Env) -> FullPaymentData<Env::Api> {
-        self.map_egld_or_esdt(
-            (),
-            |(), amount| TxPayment::<Env>::into_full_payment_data(Egld(amount), env),
-            |(), esdt_payment| TxPayment::<Env>::into_full_payment_data(esdt_payment, env),
-        )
-    }
-}
-
-pub struct EgldOrEsdtTokenPaymentRefs<'a, M: ManagedTypeApi> {
-    pub token_identifier: &'a EgldOrEsdtTokenIdentifier<M>,
-    pub token_nonce: u64,
-    pub amount: &'a BigUint<M>,
-}
-
-impl<M: ManagedTypeApi> EgldOrEsdtTokenPayment<M> {
-    pub fn as_refs(&self) -> EgldOrEsdtTokenPaymentRefs<'_, M> {
-        EgldOrEsdtTokenPaymentRefs {
-            token_identifier: &self.token_identifier,
-            token_nonce: self.token_nonce,
-            amount: &self.amount,
-        }
-    }
-}
-
-impl<'a, M: ManagedTypeApi> EgldOrEsdtTokenPaymentRefs<'a, M> {
-    pub fn to_owned_payment(&self) -> EgldOrEsdtTokenPayment<M> {
-        EgldOrEsdtTokenPayment {
-            token_identifier: self.token_identifier.clone(),
-            token_nonce: self.token_nonce,
-            amount: self.amount.clone(),
-        }
-    }
-
-    pub fn is_empty(&self) -> bool {
-        self.amount == &BigUint::zero()
-    }
-
-    pub fn map_egld_or_esdt<Context, D, F, U>(self, context: Context, for_egld: D, for_esdt: F) -> U
-    where
-        D: FnOnce(Context, &BigUint<M>) -> U,
-        F: FnOnce(Context, EgldOrEsdtTokenPaymentRefs<M>) -> U,
-    {
-        if self.token_identifier.data.is_some() {
-            let token_identifier = unsafe { self.token_identifier.clone().data.unwrap_no_check() };
-            for_esdt(
-                context,
-                EgldOrEsdtTokenPaymentRefs {
-                    token_identifier: &EgldOrEsdtTokenIdentifier::esdt(token_identifier),
-                    token_nonce: self.token_nonce,
-                    amount: self.amount,
-                },
-            )
-        } else {
-            for_egld(context, self.amount)
-        }
-    }
-}
diff --git a/framework/base/src/types/interaction/tx_payment/tx_payment_egld_or_esdt_refs.rs b/framework/base/src/types/interaction/tx_payment/tx_payment_egld_or_esdt_refs.rs
new file mode 100644
index 0000000000..76c5a003f2
--- /dev/null
+++ b/framework/base/src/types/interaction/tx_payment/tx_payment_egld_or_esdt_refs.rs
@@ -0,0 +1,66 @@
+use alloc::borrow::ToOwned;
+
+use crate::{
+    api::ManagedTypeApi,
+    contract_base::SendRawWrapper,
+    types::{
+        AnnotatedValue, BigUint, EgldOrEsdtTokenIdentifier, EgldOrEsdtTokenPayment,
+        EgldOrEsdtTokenPaymentRefs, EgldOrMultiEsdtPayment, EsdtTokenPayment, EsdtTokenPaymentRefs,
+        ManagedAddress, ManagedType, ManagedVec, MultiEsdtPayment, TxFrom, TxToSpecified,
+    },
+};
+
+use super::{
+    AnnotatedEgldPayment, Egld, FullPaymentData, FunctionCall, TxEgldValue, TxEnv, TxPayment,
+};
+
+impl<'a, Env> TxPayment<Env> for EgldOrEsdtTokenPaymentRefs<'a, Env::Api>
+where
+    Env: TxEnv,
+{
+    fn is_no_payment(&self, _env: &Env) -> bool {
+        self.is_empty()
+    }
+
+    fn perform_transfer_execute(
+        self,
+        env: &Env,
+        to: &ManagedAddress<Env::Api>,
+        gas_limit: u64,
+        fc: FunctionCall<Env::Api>,
+    ) {
+        self.map_egld_or_esdt(
+            fc,
+            |fc, amount| Egld(amount).perform_transfer_execute(env, to, gas_limit, fc),
+            |fc, esdt_payment| esdt_payment.perform_transfer_execute(env, to, gas_limit, fc),
+        )
+    }
+
+    fn with_normalized<From, To, F, R>(
+        self,
+        env: &Env,
+        from: &From,
+        to: To,
+        fc: FunctionCall<Env::Api>,
+        f: F,
+    ) -> R
+    where
+        From: TxFrom<Env>,
+        To: TxToSpecified<Env>,
+        F: FnOnce(&ManagedAddress<Env::Api>, &BigUint<Env::Api>, &FunctionCall<Env::Api>) -> R,
+    {
+        self.map_egld_or_esdt(
+            (to, fc, f),
+            |(to, fc, f), amount| Egld(amount).with_normalized(env, from, to, fc, f),
+            |(to, fc, f), esdt_payment| esdt_payment.with_normalized(env, from, to, fc, f),
+        )
+    }
+
+    fn into_full_payment_data(self, env: &Env) -> FullPaymentData<Env::Api> {
+        self.map_egld_or_esdt(
+            (),
+            |(), amount| TxPayment::<Env>::into_full_payment_data(Egld(amount), env),
+            |(), esdt_payment| TxPayment::<Env>::into_full_payment_data(esdt_payment, env),
+        )
+    }
+}
diff --git a/framework/base/src/types/managed/wrapped/egld_or_esdt_token_identifier.rs b/framework/base/src/types/managed/wrapped/egld_or_esdt_token_identifier.rs
index 3635ddaba2..c363853203 100644
--- a/framework/base/src/types/managed/wrapped/egld_or_esdt_token_identifier.rs
+++ b/framework/base/src/types/managed/wrapped/egld_or_esdt_token_identifier.rs
@@ -81,8 +81,9 @@ impl<M: ManagedTypeApi> EgldOrEsdtTokenIdentifier<M> {
     #[inline]
     pub fn into_name(self) -> ManagedBuffer<M> {
         self.map_or_else(
-            || ManagedBuffer::from(&Self::EGLD_REPRESENTATION[..]),
-            |token_identifier| token_identifier.into_managed_buffer(),
+            (),
+            |()| ManagedBuffer::from(&Self::EGLD_REPRESENTATION[..]),
+            |(), token_identifier| token_identifier.into_managed_buffer(),
         )
     }
 
@@ -91,25 +92,26 @@ impl<M: ManagedTypeApi> EgldOrEsdtTokenIdentifier<M> {
     /// Will fail if it encodes an invalid ESDT token identifier.
     pub fn is_valid(&self) -> bool {
         self.map_ref_or_else(
-            || true,
-            |token_identifier| token_identifier.is_valid_esdt_identifier(),
+            (),
+            |()| true,
+            |(), token_identifier| token_identifier.is_valid_esdt_identifier(),
         )
     }
 
-    pub fn map_or_else<U, D, F>(self, for_egld: D, for_esdt: F) -> U
+    pub fn map_or_else<Context, D, F, R>(self, context: Context, for_egld: D, for_esdt: F) -> R
     where
-        D: FnOnce() -> U,
-        F: FnOnce(TokenIdentifier<M>) -> U,
+        D: FnOnce(Context) -> R,
+        F: FnOnce(Context, TokenIdentifier<M>) -> R,
     {
-        self.data.map_or_else(for_egld, for_esdt)
+        self.data.map_or_else(context, for_egld, for_esdt)
     }
 
-    pub fn map_ref_or_else<U, D, F>(&self, for_egld: D, for_esdt: F) -> U
+    pub fn map_ref_or_else<Context, D, F, R>(&self, context: Context, for_egld: D, for_esdt: F) -> R
     where
-        D: FnOnce() -> U,
-        F: FnOnce(&TokenIdentifier<M>) -> U,
+        D: FnOnce(Context) -> R,
+        F: FnOnce(Context, &TokenIdentifier<M>) -> R,
     {
-        self.data.map_ref_or_else(for_egld, for_esdt)
+        self.data.map_ref_or_else(context, for_egld, for_esdt)
     }
 
     pub fn unwrap_esdt(self) -> TokenIdentifier<M> {
@@ -142,8 +144,9 @@ impl<M: ManagedTypeApi> PartialEq<TokenIdentifier<M>> for EgldOrEsdtTokenIdentif
     #[inline]
     fn eq(&self, other: &TokenIdentifier<M>) -> bool {
         self.map_ref_or_else(
-            || false,
-            |self_esdt_token_identifier| self_esdt_token_identifier == other,
+            (),
+            |()| false,
+            |(), self_esdt_token_identifier| self_esdt_token_identifier == other,
         )
     }
 }
diff --git a/framework/base/src/types/managed/wrapped/egld_or_esdt_token_payment.rs b/framework/base/src/types/managed/wrapped/egld_or_esdt_token_payment.rs
index 8d5e692610..ffce0c44e7 100644
--- a/framework/base/src/types/managed/wrapped/egld_or_esdt_token_payment.rs
+++ b/framework/base/src/types/managed/wrapped/egld_or_esdt_token_payment.rs
@@ -12,7 +12,7 @@ use crate::codec::{
 use crate as multiversx_sc; // needed by the TypeAbi generated code
 use crate::derive::TypeAbi;
 
-use super::EsdtTokenPayment;
+use super::{EsdtTokenPayment, EsdtTokenPaymentRefs};
 
 #[derive(
     TopDecode, TopEncode, NestedDecode, NestedEncode, TypeAbi, Clone, PartialEq, Eq, Debug,
@@ -59,21 +59,46 @@ impl<M: ManagedTypeApi> EgldOrEsdtTokenPayment<M> {
     /// More precisely, since only one of the two closures `for_egld` and `for_esdt` is called,
     /// it is ok for them to have fully owned access to anything from the environment.
     /// The compiler doesn't know that only one of them can ever be called,
-    /// so if we pass context to both closures, it will complain that they are moved twice..
+    /// so if we pass context to both closures, it will complain that they are moved twice.
     pub fn map_egld_or_esdt<Context, D, F, U>(self, context: Context, for_egld: D, for_esdt: F) -> U
     where
         D: FnOnce(Context, BigUint<M>) -> U,
         F: FnOnce(Context, EsdtTokenPayment<M>) -> U,
     {
-        if self.token_identifier.data.is_some() {
-            let token_identifier = unsafe { self.token_identifier.data.unwrap_no_check() };
-            for_esdt(
-                context,
-                EsdtTokenPayment::new(token_identifier, self.token_nonce, self.amount),
-            )
-        } else {
-            for_egld(context, self.amount)
-        }
+        self.token_identifier.map_or_else(
+            (context, self.amount),
+            |(context, amount)| for_egld(context, amount),
+            |(context, amount), token_identifier| {
+                for_esdt(
+                    context,
+                    EsdtTokenPayment::new(token_identifier, self.token_nonce, amount),
+                )
+            },
+        )
+    }
+
+    /// Same as `map_egld_or_esdt`, but only takes a reference,
+    /// and consequently, the closures also only get references.
+    pub fn map_ref_egld_or_esdt<Context, D, F, U>(
+        &self,
+        context: Context,
+        for_egld: D,
+        for_esdt: F,
+    ) -> U
+    where
+        D: FnOnce(Context, &BigUint<M>) -> U,
+        F: FnOnce(Context, EsdtTokenPaymentRefs<'_, M>) -> U,
+    {
+        self.token_identifier.map_ref_or_else(
+            context,
+            |context| for_egld(context, &self.amount),
+            |context, token_identifier| {
+                for_esdt(
+                    context,
+                    EsdtTokenPaymentRefs::new(token_identifier, self.token_nonce, &self.amount),
+                )
+            },
+        )
     }
 
     pub fn into_tuple(self) -> (EgldOrEsdtTokenIdentifier<M>, u64, BigUint<M>) {
@@ -104,3 +129,59 @@ impl<M: ManagedTypeApi> From<EsdtTokenPayment<M>> for EgldOrEsdtTokenPayment<M>
 impl<M> CodecFromSelf for EgldOrEsdtTokenPayment<M> where M: ManagedTypeApi {}
 
 impl<M> CodecFrom<&[u8]> for EgldOrEsdtTokenPayment<M> where M: ManagedTypeApi {}
+
+impl<M: ManagedTypeApi> EgldOrEsdtTokenPayment<M> {
+    pub fn as_refs(&self) -> EgldOrEsdtTokenPaymentRefs<'_, M> {
+        EgldOrEsdtTokenPaymentRefs::new(&self.token_identifier, self.token_nonce, &self.amount)
+    }
+}
+
+/// Similar to `EgldOrEsdtTokenPayment`, but only contains references.
+pub struct EgldOrEsdtTokenPaymentRefs<'a, M: ManagedTypeApi> {
+    pub token_identifier: &'a EgldOrEsdtTokenIdentifier<M>,
+    pub token_nonce: u64,
+    pub amount: &'a BigUint<M>,
+}
+
+impl<'a, M: ManagedTypeApi> EgldOrEsdtTokenPaymentRefs<'a, M> {
+    pub fn new(
+        token_identifier: &'a EgldOrEsdtTokenIdentifier<M>,
+        token_nonce: u64,
+        amount: &'a BigUint<M>,
+    ) -> EgldOrEsdtTokenPaymentRefs<'a, M> {
+        EgldOrEsdtTokenPaymentRefs {
+            token_identifier,
+            token_nonce,
+            amount,
+        }
+    }
+
+    pub fn to_owned_payment(&self) -> EgldOrEsdtTokenPayment<M> {
+        EgldOrEsdtTokenPayment {
+            token_identifier: self.token_identifier.clone(),
+            token_nonce: self.token_nonce,
+            amount: self.amount.clone(),
+        }
+    }
+
+    pub fn is_empty(&self) -> bool {
+        self.amount == &BigUint::zero()
+    }
+
+    pub fn map_egld_or_esdt<Context, D, F, U>(self, context: Context, for_egld: D, for_esdt: F) -> U
+    where
+        D: FnOnce(Context, &BigUint<M>) -> U,
+        F: FnOnce(Context, EsdtTokenPaymentRefs<M>) -> U,
+    {
+        self.token_identifier.map_ref_or_else(
+            context,
+            |context| for_egld(context, self.amount),
+            |context, token_identifier| {
+                for_esdt(
+                    context,
+                    EsdtTokenPaymentRefs::new(token_identifier, self.token_nonce, self.amount),
+                )
+            },
+        )
+    }
+}
diff --git a/framework/base/src/types/managed/wrapped/esdt_token_payment.rs b/framework/base/src/types/managed/wrapped/esdt_token_payment.rs
index 161c2c1ee3..b074dc9bfe 100644
--- a/framework/base/src/types/managed/wrapped/esdt_token_payment.rs
+++ b/framework/base/src/types/managed/wrapped/esdt_token_payment.rs
@@ -232,15 +232,23 @@ pub struct EsdtTokenPaymentRefs<'a, M: ManagedTypeApi> {
 
 impl<M: ManagedTypeApi> EsdtTokenPayment<M> {
     pub fn as_refs(&self) -> EsdtTokenPaymentRefs<'_, M> {
-        EsdtTokenPaymentRefs {
-            token_identifier: &self.token_identifier,
-            token_nonce: self.token_nonce,
-            amount: &self.amount,
-        }
+        EsdtTokenPaymentRefs::new(&self.token_identifier, self.token_nonce, &self.amount)
     }
 }
 
 impl<'a, M: ManagedTypeApi> EsdtTokenPaymentRefs<'a, M> {
+    pub fn new(
+        token_identifier: &'a TokenIdentifier<M>,
+        token_nonce: u64,
+        amount: &'a BigUint<M>,
+    ) -> Self {
+        EsdtTokenPaymentRefs {
+            token_identifier,
+            token_nonce,
+            amount,
+        }
+    }
+
     /// Will clone the referenced values.
     pub fn to_owned_payment(&self) -> EsdtTokenPayment<M> {
         EsdtTokenPayment {
diff --git a/framework/base/src/types/managed/wrapped/managed_option.rs b/framework/base/src/types/managed/wrapped/managed_option.rs
index 422a5e7753..7dd8ed2dad 100644
--- a/framework/base/src/types/managed/wrapped/managed_option.rs
+++ b/framework/base/src/types/managed/wrapped/managed_option.rs
@@ -122,27 +122,27 @@ where
         }
     }
 
-    pub fn map_or_else<U, D, F>(self, default: D, f: F) -> U
+    pub fn map_or_else<Context, D, F, R>(self, context: Context, default: D, f: F) -> R
     where
-        D: FnOnce() -> U,
-        F: FnOnce(T) -> U,
+        D: FnOnce(Context) -> R,
+        F: FnOnce(Context, T) -> R,
     {
         if self.is_some() {
-            f(unsafe { self.unwrap_no_check() })
+            f(context, unsafe { self.unwrap_no_check() })
         } else {
-            default()
+            default(context)
         }
     }
 
-    pub fn map_ref_or_else<U, D, F>(&self, default: D, f: F) -> U
+    pub fn map_ref_or_else<Context, D, F, R>(&self, context: Context, default: D, f: F) -> R
     where
-        D: FnOnce() -> U,
-        F: FnOnce(&T) -> U,
+        D: FnOnce(Context) -> R,
+        F: FnOnce(Context, &T) -> R,
     {
         if self.is_some() {
-            f(&T::from_handle(self.handle.clone()))
+            f(context, &T::from_handle(self.handle.clone()))
         } else {
-            default()
+            default(context)
         }
     }
 }
diff --git a/framework/base/src/types/managed/wrapped/mod.rs b/framework/base/src/types/managed/wrapped/mod.rs
index 5a5e907403..58d706ed62 100644
--- a/framework/base/src/types/managed/wrapped/mod.rs
+++ b/framework/base/src/types/managed/wrapped/mod.rs
@@ -19,7 +19,7 @@ mod randomness_source;
 mod token_identifier;
 
 pub use egld_or_esdt_token_identifier::EgldOrEsdtTokenIdentifier;
-pub use egld_or_esdt_token_payment::EgldOrEsdtTokenPayment;
+pub use egld_or_esdt_token_payment::{EgldOrEsdtTokenPayment, EgldOrEsdtTokenPaymentRefs};
 pub use egld_or_multi_esdt_payment::{EgldOrMultiEsdtPayment, EgldOrMultiEsdtPaymentRefs};
 pub(crate) use encoded_managed_vec_item::EncodedManagedVecItem;
 pub use esdt_token_data::EsdtTokenData;
diff --git a/framework/base/src/types/managed/wrapped/token_identifier.rs b/framework/base/src/types/managed/wrapped/token_identifier.rs
index af113dbc4e..53078e09d7 100644
--- a/framework/base/src/types/managed/wrapped/token_identifier.rs
+++ b/framework/base/src/types/managed/wrapped/token_identifier.rs
@@ -109,8 +109,9 @@ impl<M: ManagedTypeApi> PartialEq<EgldOrEsdtTokenIdentifier<M>> for TokenIdentif
     #[inline]
     fn eq(&self, other: &EgldOrEsdtTokenIdentifier<M>) -> bool {
         other.map_ref_or_else(
-            || false,
-            |esdt_token_identifier| esdt_token_identifier == self,
+            (),
+            |()| false,
+            |(), esdt_token_identifier| esdt_token_identifier == self,
         )
     }
 }
diff --git a/framework/derive/src/generate/proxy_gen.rs b/framework/derive/src/generate/proxy_gen.rs
index 9118c1f748..b904c69f20 100644
--- a/framework/derive/src/generate/proxy_gen.rs
+++ b/framework/derive/src/generate/proxy_gen.rs
@@ -140,7 +140,7 @@ pub fn generate_proxy_endpoint(m: &Method, endpoint_name: String) -> proc_macro2
             payment_init = quote! { .egld(#payment_expr) };
         } else {
             payment_type = quote! { multiversx_sc::types::EgldOrEsdtTokenPayment<Self::Api> };
-            payment_init = quote! { .egld_or_single_esdt(
+            payment_init = quote! { .payment(
                 multiversx_sc::types::EgldOrEsdtTokenPayment::new(
                     #token_expr,
                     #nonce_expr,

From 34c22759423a4757916cc4280d71faedc3a4a9d3 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 3 Apr 2024 12:11:38 +0300
Subject: [PATCH 0632/1254] re-generated crypto kitty proxies

---
 .../src/kitty_ownership_proxy.rs              |  63 ++++-------
 .../src/kitty_genetic_alg_proxy.rs            |  35 ++++--
 .../src/kitty_ownership_proxy.rs              | 103 ++++++++----------
 .../crowdfunding-erc20/src/erc20_proxy.rs     |  18 +--
 .../erc1155-marketplace/src/erc1155_proxy.rs  |  39 +++----
 .../erc1155/src/erc1155_user_proxy.rs         |   6 +-
 .../lottery-erc20/src/erc20_proxy.rs          |  18 +--
 .../use-module/tests/user_builtin_proxy.rs    |   3 +-
 contracts/modules/src/dns_proxy.rs            |   3 +-
 9 files changed, 124 insertions(+), 164 deletions(-)

diff --git a/contracts/examples/crypto-kitties/kitty-auction/src/kitty_ownership_proxy.rs b/contracts/examples/crypto-kitties/kitty-auction/src/kitty_ownership_proxy.rs
index 697d07bfce..aa6b43a3ee 100644
--- a/contracts/examples/crypto-kitties/kitty-auction/src/kitty_ownership_proxy.rs
+++ b/contracts/examples/crypto-kitties/kitty-auction/src/kitty_ownership_proxy.rs
@@ -78,8 +78,7 @@ where
         address: Arg0,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("setGeneScienceContractAddress")
+            .raw_call("setGeneScienceContractAddress")
             .argument(&address)
             .original_result()
     }
@@ -91,8 +90,7 @@ where
         address: Arg0,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("setKittyAuctionContractAddress")
+            .raw_call("setKittyAuctionContractAddress")
             .argument(&address)
             .original_result()
     }
@@ -101,8 +99,7 @@ where
         self,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("claim")
+            .raw_call("claim")
             .original_result()
     }
 
@@ -110,8 +107,7 @@ where
         self,
     ) -> TxProxyCall<Env, From, To, Gas, u32> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("totalSupply")
+            .raw_call("totalSupply")
             .original_result()
     }
 
@@ -122,8 +118,7 @@ where
         address: Arg0,
     ) -> TxProxyCall<Env, From, To, Gas, u32> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("balanceOf")
+            .raw_call("balanceOf")
             .argument(&address)
             .original_result()
     }
@@ -135,8 +130,7 @@ where
         kitty_id: Arg0,
     ) -> TxProxyCall<Env, From, To, Gas, ManagedAddress<Env::Api>> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("ownerOf")
+            .raw_call("ownerOf")
             .argument(&kitty_id)
             .original_result()
     }
@@ -150,8 +144,7 @@ where
         kitty_id: Arg1,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("approve")
+            .raw_call("approve")
             .argument(&to)
             .argument(&kitty_id)
             .original_result()
@@ -166,8 +159,7 @@ where
         kitty_id: Arg1,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("transfer")
+            .raw_call("transfer")
             .argument(&to)
             .argument(&kitty_id)
             .original_result()
@@ -184,8 +176,7 @@ where
         kitty_id: Arg2,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("transfer_from")
+            .raw_call("transfer_from")
             .argument(&from)
             .argument(&to)
             .argument(&kitty_id)
@@ -199,8 +190,7 @@ where
         address: Arg0,
     ) -> TxProxyCall<Env, From, To, Gas, MultiValueEncoded<Env::Api, u32>> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("tokensOfOwner")
+            .raw_call("tokensOfOwner")
             .argument(&address)
             .original_result()
     }
@@ -214,8 +204,7 @@ where
         kitty_id: Arg1,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("allowAuctioning")
+            .raw_call("allowAuctioning")
             .argument(&by)
             .argument(&kitty_id)
             .original_result()
@@ -232,8 +221,7 @@ where
         kitty_id: Arg2,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("approveSiringAndReturnKitty")
+            .raw_call("approveSiringAndReturnKitty")
             .argument(&approved_address)
             .argument(&kitty_owner)
             .argument(&kitty_id)
@@ -244,8 +232,7 @@ where
         self,
     ) -> TxProxyCall<Env, From, To, Gas, u32> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("createGenZeroKitty")
+            .raw_call("createGenZeroKitty")
             .original_result()
     }
 
@@ -256,8 +243,7 @@ where
         kitty_id: Arg0,
     ) -> TxProxyCall<Env, From, To, Gas, Kitty> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("getKittyById")
+            .raw_call("getKittyById")
             .argument(&kitty_id)
             .original_result()
     }
@@ -269,8 +255,7 @@ where
         kitty_id: Arg0,
     ) -> TxProxyCall<Env, From, To, Gas, bool> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("isReadyToBreed")
+            .raw_call("isReadyToBreed")
             .argument(&kitty_id)
             .original_result()
     }
@@ -282,8 +267,7 @@ where
         kitty_id: Arg0,
     ) -> TxProxyCall<Env, From, To, Gas, bool> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("isPregnant")
+            .raw_call("isPregnant")
             .argument(&kitty_id)
             .original_result()
     }
@@ -297,8 +281,7 @@ where
         sire_id: Arg1,
     ) -> TxProxyCall<Env, From, To, Gas, bool> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("canBreedWith")
+            .raw_call("canBreedWith")
             .argument(&matron_id)
             .argument(&sire_id)
             .original_result()
@@ -313,8 +296,7 @@ where
         kitty_id: Arg1,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("approveSiring")
+            .raw_call("approveSiring")
             .argument(&address)
             .argument(&kitty_id)
             .original_result()
@@ -329,8 +311,7 @@ where
         sire_id: Arg1,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("breedWith")
+            .raw_call("breedWith")
             .argument(&matron_id)
             .argument(&sire_id)
             .original_result()
@@ -343,8 +324,7 @@ where
         matron_id: Arg0,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("giveBirth")
+            .raw_call("giveBirth")
             .argument(&matron_id)
             .original_result()
     }
@@ -353,8 +333,7 @@ where
         self,
     ) -> TxProxyCall<Env, From, To, Gas, BigUint<Env::Api>> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("birthFee")
+            .raw_call("birthFee")
             .original_result()
     }
 }
diff --git a/contracts/examples/crypto-kitties/kitty-ownership/src/kitty_genetic_alg_proxy.rs b/contracts/examples/crypto-kitties/kitty-ownership/src/kitty_genetic_alg_proxy.rs
index 4a1bf33f88..564481a7d3 100644
--- a/contracts/examples/crypto-kitties/kitty-ownership/src/kitty_genetic_alg_proxy.rs
+++ b/contracts/examples/crypto-kitties/kitty-ownership/src/kitty_genetic_alg_proxy.rs
@@ -1,9 +1,14 @@
+// Code generated by the multiversx-sc proxy generator. DO NOT EDIT.
+
+////////////////////////////////////////////////////
+////////////////// AUTO-GENERATED //////////////////
+////////////////////////////////////////////////////
+
+#![allow(dead_code)]
 #![allow(clippy::all)]
 
 use multiversx_sc::proxy_imports::*;
 
-use crate::{Kitty, KittyGenes};
-
 pub struct KittyGeneticAlgProxy;
 
 impl<Env, From, To, Gas> TxProxyTrait<Env, From, To, Gas> for KittyGeneticAlgProxy
@@ -30,6 +35,23 @@ where
     wrapped_tx: Tx<Env, From, To, (), Gas, (), ()>,
 }
 
+#[rustfmt::skip]
+impl<Env, From, Gas> KittyGeneticAlgProxyMethods<Env, From, (), Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn init(
+        self,
+    ) -> TxProxyDeploy<Env, From, Gas, ()> {
+        self.wrapped_tx
+            .raw_deploy()
+            .original_result()
+    }
+}
+
 #[rustfmt::skip]
 impl<Env, From, To, Gas> KittyGeneticAlgProxyMethods<Env, From, To, Gas>
 where
@@ -40,16 +62,15 @@ where
     Gas: TxGas<Env>,
 {
     pub fn generate_kitty_genes<
-        Arg0: CodecInto<Kitty>,
-        Arg1: CodecInto<Kitty>,
+        Arg0: CodecInto<kitty::Kitty>,
+        Arg1: CodecInto<kitty::Kitty>,
     >(
         self,
         matron: Arg0,
         sire: Arg1,
-    ) -> TxProxyCall<Env, From, To, Gas, KittyGenes> {
+    ) -> TxProxyCall<Env, From, To, Gas, kitty::kitty_genes::KittyGenes> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("generateKittyGenes")
+            .raw_call("generateKittyGenes")
             .argument(&matron)
             .argument(&sire)
             .original_result()
diff --git a/contracts/examples/crypto-zombies/src/kitty_ownership_proxy.rs b/contracts/examples/crypto-zombies/src/kitty_ownership_proxy.rs
index f00880324a..aa6b43a3ee 100644
--- a/contracts/examples/crypto-zombies/src/kitty_ownership_proxy.rs
+++ b/contracts/examples/crypto-zombies/src/kitty_ownership_proxy.rs
@@ -1,3 +1,10 @@
+// Code generated by the multiversx-sc proxy generator. DO NOT EDIT.
+
+////////////////////////////////////////////////////
+////////////////// AUTO-GENERATED //////////////////
+////////////////////////////////////////////////////
+
+#![allow(dead_code)]
 #![allow(clippy::all)]
 
 use multiversx_sc::proxy_imports::*;
@@ -29,14 +36,30 @@ where
 }
 
 #[rustfmt::skip]
-impl<Env, From, To, Gas> KittyOwnershipProxyMethods<Env, From, To, Gas>
+impl<Env, From, Gas> KittyOwnershipProxyMethods<Env, From, (), Gas>
 where
     Env: TxEnv,
     Env::Api: VMApi,
     From: TxFrom<Env>,
-    To: TxTo<Env>,
     Gas: TxGas<Env>,
 {
+    pub fn init<
+        Arg0: CodecInto<BigUint<Env::Api>>,
+        Arg1: CodecInto<OptionalValue<ManagedAddress<Env::Api>>>,
+        Arg2: CodecInto<OptionalValue<ManagedAddress<Env::Api>>>,
+    >(
+        self,
+        birth_fee: Arg0,
+        opt_gene_science_contract_address: Arg1,
+        opt_kitty_auction_contract_address: Arg2,
+    ) -> TxProxyDeploy<Env, From, Gas, ()> {
+        self.wrapped_tx
+            .raw_deploy()
+            .argument(&birth_fee)
+            .argument(&opt_gene_science_contract_address)
+            .argument(&opt_kitty_auction_contract_address)
+            .original_result()
+    }
 }
 
 #[rustfmt::skip]
@@ -55,8 +78,7 @@ where
         address: Arg0,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("setGeneScienceContractAddress")
+            .raw_call("setGeneScienceContractAddress")
             .argument(&address)
             .original_result()
     }
@@ -68,8 +90,7 @@ where
         address: Arg0,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("setKittyAuctionContractAddress")
+            .raw_call("setKittyAuctionContractAddress")
             .argument(&address)
             .original_result()
     }
@@ -78,8 +99,7 @@ where
         self,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("claim")
+            .raw_call("claim")
             .original_result()
     }
 
@@ -87,8 +107,7 @@ where
         self,
     ) -> TxProxyCall<Env, From, To, Gas, u32> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("totalSupply")
+            .raw_call("totalSupply")
             .original_result()
     }
 
@@ -99,8 +118,7 @@ where
         address: Arg0,
     ) -> TxProxyCall<Env, From, To, Gas, u32> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("balanceOf")
+            .raw_call("balanceOf")
             .argument(&address)
             .original_result()
     }
@@ -112,8 +130,7 @@ where
         kitty_id: Arg0,
     ) -> TxProxyCall<Env, From, To, Gas, ManagedAddress<Env::Api>> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("ownerOf")
+            .raw_call("ownerOf")
             .argument(&kitty_id)
             .original_result()
     }
@@ -127,8 +144,7 @@ where
         kitty_id: Arg1,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("approve")
+            .raw_call("approve")
             .argument(&to)
             .argument(&kitty_id)
             .original_result()
@@ -143,8 +159,7 @@ where
         kitty_id: Arg1,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("transfer")
+            .raw_call("transfer")
             .argument(&to)
             .argument(&kitty_id)
             .original_result()
@@ -161,8 +176,7 @@ where
         kitty_id: Arg2,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("transfer_from")
+            .raw_call("transfer_from")
             .argument(&from)
             .argument(&to)
             .argument(&kitty_id)
@@ -176,8 +190,7 @@ where
         address: Arg0,
     ) -> TxProxyCall<Env, From, To, Gas, MultiValueEncoded<Env::Api, u32>> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("tokensOfOwner")
+            .raw_call("tokensOfOwner")
             .argument(&address)
             .original_result()
     }
@@ -191,8 +204,7 @@ where
         kitty_id: Arg1,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("allowAuctioning")
+            .raw_call("allowAuctioning")
             .argument(&by)
             .argument(&kitty_id)
             .original_result()
@@ -209,8 +221,7 @@ where
         kitty_id: Arg2,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("approveSiringAndReturnKitty")
+            .raw_call("approveSiringAndReturnKitty")
             .argument(&approved_address)
             .argument(&kitty_owner)
             .argument(&kitty_id)
@@ -221,8 +232,7 @@ where
         self,
     ) -> TxProxyCall<Env, From, To, Gas, u32> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("createGenZeroKitty")
+            .raw_call("createGenZeroKitty")
             .original_result()
     }
 
@@ -233,8 +243,7 @@ where
         kitty_id: Arg0,
     ) -> TxProxyCall<Env, From, To, Gas, Kitty> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("getKittyById")
+            .raw_call("getKittyById")
             .argument(&kitty_id)
             .original_result()
     }
@@ -246,8 +255,7 @@ where
         kitty_id: Arg0,
     ) -> TxProxyCall<Env, From, To, Gas, bool> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("isReadyToBreed")
+            .raw_call("isReadyToBreed")
             .argument(&kitty_id)
             .original_result()
     }
@@ -259,8 +267,7 @@ where
         kitty_id: Arg0,
     ) -> TxProxyCall<Env, From, To, Gas, bool> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("isPregnant")
+            .raw_call("isPregnant")
             .argument(&kitty_id)
             .original_result()
     }
@@ -274,8 +281,7 @@ where
         sire_id: Arg1,
     ) -> TxProxyCall<Env, From, To, Gas, bool> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("canBreedWith")
+            .raw_call("canBreedWith")
             .argument(&matron_id)
             .argument(&sire_id)
             .original_result()
@@ -290,8 +296,7 @@ where
         kitty_id: Arg1,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("approveSiring")
+            .raw_call("approveSiring")
             .argument(&address)
             .argument(&kitty_id)
             .original_result()
@@ -306,8 +311,7 @@ where
         sire_id: Arg1,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("breedWith")
+            .raw_call("breedWith")
             .argument(&matron_id)
             .argument(&sire_id)
             .original_result()
@@ -320,8 +324,7 @@ where
         matron_id: Arg0,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("giveBirth")
+            .raw_call("giveBirth")
             .argument(&matron_id)
             .original_result()
     }
@@ -330,8 +333,7 @@ where
         self,
     ) -> TxProxyCall<Env, From, To, Gas, BigUint<Env::Api>> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("birthFee")
+            .raw_call("birthFee")
             .original_result()
     }
 }
@@ -361,16 +363,3 @@ pub struct Color {
     pub g: u8,
     pub b: u8,
 }
-
-impl KittyGenes {
-    pub fn get_as_u64(&self) -> u64 {
-        (self.fur_color.as_u64() << 12 | self.eye_color.as_u64()) << 4
-            | self.meow_power.to_be() as u64
-    }
-}
-
-impl Color {
-    pub fn as_u64(&self) -> u64 {
-        ((self.r.to_be() as u64) << 4 | self.r.to_be() as u64) << 4 | self.r.to_be() as u64
-    }
-}
diff --git a/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/src/erc20_proxy.rs b/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/src/erc20_proxy.rs
index 4acfd01eb2..5d53567a38 100644
--- a/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/src/erc20_proxy.rs
+++ b/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/src/erc20_proxy.rs
@@ -72,8 +72,7 @@ where
         self,
     ) -> TxProxyCall<Env, From, To, Gas, BigUint<Env::Api>> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("totalSupply")
+            .raw_call("totalSupply")
             .original_result()
     }
 
@@ -90,8 +89,7 @@ where
         address: Arg0,
     ) -> TxProxyCall<Env, From, To, Gas, BigUint<Env::Api>> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("balanceOf")
+            .raw_call("balanceOf")
             .argument(&address)
             .original_result()
     }
@@ -112,8 +110,7 @@ where
         spender: Arg1,
     ) -> TxProxyCall<Env, From, To, Gas, BigUint<Env::Api>> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("allowance")
+            .raw_call("allowance")
             .argument(&owner)
             .argument(&spender)
             .original_result()
@@ -134,8 +131,7 @@ where
         amount: Arg1,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("transfer")
+            .raw_call("transfer")
             .argument(&to)
             .argument(&amount)
             .original_result()
@@ -160,8 +156,7 @@ where
         amount: Arg2,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("transferFrom")
+            .raw_call("transferFrom")
             .argument(&sender)
             .argument(&recipient)
             .argument(&amount)
@@ -185,8 +180,7 @@ where
         amount: Arg1,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("approve")
+            .raw_call("approve")
             .argument(&spender)
             .argument(&amount)
             .original_result()
diff --git a/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/src/erc1155_proxy.rs b/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/src/erc1155_proxy.rs
index 44be409aa3..41773ae924 100644
--- a/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/src/erc1155_proxy.rs
+++ b/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/src/erc1155_proxy.rs
@@ -77,8 +77,7 @@ where
         data: Arg4,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("safeTransferFrom")
+            .raw_call("safeTransferFrom")
             .argument(&from)
             .argument(&to)
             .argument(&type_id)
@@ -103,8 +102,7 @@ where
         data: Arg4,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("safeBatchTransferFrom")
+            .raw_call("safeBatchTransferFrom")
             .argument(&from)
             .argument(&to)
             .argument(&type_ids)
@@ -122,8 +120,7 @@ where
         approved: Arg1,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("setApprovalForAll")
+            .raw_call("setApprovalForAll")
             .argument(&operator)
             .argument(&approved)
             .original_result()
@@ -140,8 +137,7 @@ where
         is_fungible: Arg2,
     ) -> TxProxyCall<Env, From, To, Gas, BigUint<Env::Api>> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("createToken")
+            .raw_call("createToken")
             .argument(&uri)
             .argument(&initial_supply)
             .argument(&is_fungible)
@@ -157,8 +153,7 @@ where
         amount: Arg1,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("mint")
+            .raw_call("mint")
             .argument(&type_id)
             .argument(&amount)
             .original_result()
@@ -173,8 +168,7 @@ where
         amount: Arg1,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("burn")
+            .raw_call("burn")
             .argument(&type_id)
             .argument(&amount)
             .original_result()
@@ -189,8 +183,7 @@ where
         type_id: Arg1,
     ) -> TxProxyCall<Env, From, To, Gas, BigUint<Env::Api>> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("balanceOf")
+            .raw_call("balanceOf")
             .argument(&owner)
             .argument(&type_id)
             .original_result()
@@ -203,8 +196,7 @@ where
         owner_type_id_pairs: Arg0,
     ) -> TxProxyCall<Env, From, To, Gas, MultiValueEncoded<Env::Api, BigUint<Env::Api>>> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("balanceOfBatch")
+            .raw_call("balanceOfBatch")
             .argument(&owner_type_id_pairs)
             .original_result()
     }
@@ -218,8 +210,7 @@ where
         nft_id: Arg1,
     ) -> TxProxyCall<Env, From, To, Gas, ManagedAddress<Env::Api>> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("getTokenOwner")
+            .raw_call("getTokenOwner")
             .argument(&type_id)
             .argument(&nft_id)
             .original_result()
@@ -232,8 +223,7 @@ where
         type_id: Arg0,
     ) -> TxProxyCall<Env, From, To, Gas, ManagedAddress<Env::Api>> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("getTokenTypeCreator")
+            .raw_call("getTokenTypeCreator")
             .argument(&type_id)
             .original_result()
     }
@@ -245,8 +235,7 @@ where
         type_id: Arg0,
     ) -> TxProxyCall<Env, From, To, Gas, BoxedBytes> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("getTokenTypeUri")
+            .raw_call("getTokenTypeUri")
             .argument(&type_id)
             .original_result()
     }
@@ -258,8 +247,7 @@ where
         type_id: Arg0,
     ) -> TxProxyCall<Env, From, To, Gas, bool> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("isFungible")
+            .raw_call("isFungible")
             .argument(&type_id)
             .original_result()
     }
@@ -273,8 +261,7 @@ where
         owner: Arg1,
     ) -> TxProxyCall<Env, From, To, Gas, bool> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("isApprovedForAll")
+            .raw_call("isApprovedForAll")
             .argument(&operator)
             .argument(&owner)
             .original_result()
diff --git a/contracts/feature-tests/erc-style-contracts/erc1155/src/erc1155_user_proxy.rs b/contracts/feature-tests/erc-style-contracts/erc1155/src/erc1155_user_proxy.rs
index 9d1f909079..8dd67d4061 100644
--- a/contracts/feature-tests/erc-style-contracts/erc1155/src/erc1155_user_proxy.rs
+++ b/contracts/feature-tests/erc-style-contracts/erc1155/src/erc1155_user_proxy.rs
@@ -52,8 +52,7 @@ where
         data: Arg4,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("onERC1155Received")
+            .raw_call("onERC1155Received")
             .argument(&operator)
             .argument(&from)
             .argument(&type_id)
@@ -77,8 +76,7 @@ where
         data: Arg4,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("onERC1155BatchReceived")
+            .raw_call("onERC1155BatchReceived")
             .argument(&operator)
             .argument(&from)
             .argument(&type_ids)
diff --git a/contracts/feature-tests/erc-style-contracts/lottery-erc20/src/erc20_proxy.rs b/contracts/feature-tests/erc-style-contracts/lottery-erc20/src/erc20_proxy.rs
index 4acfd01eb2..5d53567a38 100644
--- a/contracts/feature-tests/erc-style-contracts/lottery-erc20/src/erc20_proxy.rs
+++ b/contracts/feature-tests/erc-style-contracts/lottery-erc20/src/erc20_proxy.rs
@@ -72,8 +72,7 @@ where
         self,
     ) -> TxProxyCall<Env, From, To, Gas, BigUint<Env::Api>> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("totalSupply")
+            .raw_call("totalSupply")
             .original_result()
     }
 
@@ -90,8 +89,7 @@ where
         address: Arg0,
     ) -> TxProxyCall<Env, From, To, Gas, BigUint<Env::Api>> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("balanceOf")
+            .raw_call("balanceOf")
             .argument(&address)
             .original_result()
     }
@@ -112,8 +110,7 @@ where
         spender: Arg1,
     ) -> TxProxyCall<Env, From, To, Gas, BigUint<Env::Api>> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("allowance")
+            .raw_call("allowance")
             .argument(&owner)
             .argument(&spender)
             .original_result()
@@ -134,8 +131,7 @@ where
         amount: Arg1,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("transfer")
+            .raw_call("transfer")
             .argument(&to)
             .argument(&amount)
             .original_result()
@@ -160,8 +156,7 @@ where
         amount: Arg2,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("transferFrom")
+            .raw_call("transferFrom")
             .argument(&sender)
             .argument(&recipient)
             .argument(&amount)
@@ -185,8 +180,7 @@ where
         amount: Arg1,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("approve")
+            .raw_call("approve")
             .argument(&spender)
             .argument(&amount)
             .original_result()
diff --git a/contracts/feature-tests/use-module/tests/user_builtin_proxy.rs b/contracts/feature-tests/use-module/tests/user_builtin_proxy.rs
index 75e078f55a..fb57dffe11 100644
--- a/contracts/feature-tests/use-module/tests/user_builtin_proxy.rs
+++ b/contracts/feature-tests/use-module/tests/user_builtin_proxy.rs
@@ -44,8 +44,7 @@ where
         name: Arg0,
     ) -> TxProxyCall<Env, From, To, Gas, BigUint<Env::Api>> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("SetUserName")
+            .raw_call("SetUserName")
             .argument(&name)
             .original_result()
     }
diff --git a/contracts/modules/src/dns_proxy.rs b/contracts/modules/src/dns_proxy.rs
index 7b5a0bd8dc..bdaf2ed13b 100644
--- a/contracts/modules/src/dns_proxy.rs
+++ b/contracts/modules/src/dns_proxy.rs
@@ -44,8 +44,7 @@ where
         name: Arg0,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call()
-            .function_name("register")
+            .raw_call("register")
             .argument(&name)
             .original_result()
     }

From 8f20bd7fcaed7bce1e1f4b4b4881f91cb32ddb8d Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Wed, 3 Apr 2024 17:44:05 +0300
Subject: [PATCH 0633/1254] proxy multi config

---
 contracts/examples/adder/sc-config.toml       |  4 +-
 .../meta/src/cmd/contract/generate_proxy.rs   |  2 +-
 .../contract/generate_proxy/proxy_gen_main.rs | 18 ++--
 .../generate_proxy/proxy_generator.rs         | 95 ++++++++++++-------
 .../contract/generate_proxy/proxy_naming.rs   | 12 ---
 .../generate_proxy/proxy_process_type_name.rs | 37 ++++++++
 framework/meta/src/cmd/contract/sc_config.rs  |  2 +
 .../sc_config/contract_variant_builder.rs     |  4 +-
 .../cmd/contract/sc_config/sc_config_model.rs |  7 +-
 .../cmd/contract/sc_config/sc_config_proxy.rs | 37 ++++++++
 .../cmd/contract/sc_config/sc_config_serde.rs |  8 +-
 11 files changed, 159 insertions(+), 67 deletions(-)
 delete mode 100644 framework/meta/src/cmd/contract/generate_proxy/proxy_naming.rs
 create mode 100644 framework/meta/src/cmd/contract/generate_proxy/proxy_process_type_name.rs
 create mode 100644 framework/meta/src/cmd/contract/sc_config/sc_config_proxy.rs

diff --git a/contracts/examples/adder/sc-config.toml b/contracts/examples/adder/sc-config.toml
index 702f7844e9..b56f82b429 100644
--- a/contracts/examples/adder/sc-config.toml
+++ b/contracts/examples/adder/sc-config.toml
@@ -1,2 +1,4 @@
 [settings]
-proxy-paths = ["src/adder_proxy.rs"]
+
+[[proxy]]
+path = "src/adder_proxy.rs"
diff --git a/framework/meta/src/cmd/contract/generate_proxy.rs b/framework/meta/src/cmd/contract/generate_proxy.rs
index 15f157de8a..3a7443d612 100644
--- a/framework/meta/src/cmd/contract/generate_proxy.rs
+++ b/framework/meta/src/cmd/contract/generate_proxy.rs
@@ -1,4 +1,4 @@
 pub mod proxy_crate_gen;
 pub mod proxy_gen_main;
 mod proxy_generator;
-mod proxy_naming;
+mod proxy_process_type_name;
diff --git a/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_main.rs b/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_main.rs
index a3a35062f6..4ef8582bcb 100644
--- a/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_main.rs
+++ b/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_main.rs
@@ -1,21 +1,21 @@
+use crate::cmd::contract::sc_config::ProxyConfigSerde;
+
 use super::{
     super::meta_config::MetaConfig, proxy_crate_gen::create_file, proxy_generator::ProxyGenerator,
 };
 
-const OUTPUT_PROXY_PATH: &str = "/output/proxy.rs";
-
 impl MetaConfig {
     pub fn generate_proxy(&mut self) {
-        write_proxy_with_explicit_path(OUTPUT_PROXY_PATH, self);
-        let proxy_paths = self.sc_config.proxy_paths.clone();
-        for path in proxy_paths {
-            write_proxy_with_explicit_path(&path, self);
+        let default_proxy = ProxyConfigSerde::new();
+        write_proxy_with_explicit_path(&default_proxy, self);
+        for proxy_config in self.sc_config.proxy_configs.clone() {
+            write_proxy_with_explicit_path(&proxy_config, self);
         }
     }
 }
 
-fn write_proxy_with_explicit_path(path: &str, meta_config: &mut MetaConfig) {
-    let mut file = create_file(path);
-    let mut proxy_generator = ProxyGenerator::new(meta_config, &mut file);
+fn write_proxy_with_explicit_path(proxy_config: &ProxyConfigSerde, meta_config: &mut MetaConfig) {
+    let mut file = create_file(&proxy_config.path);
+    let mut proxy_generator = ProxyGenerator::new(meta_config, &mut file, proxy_config);
     proxy_generator.write_proxy_to_file();
 }
diff --git a/framework/meta/src/cmd/contract/generate_proxy/proxy_generator.rs b/framework/meta/src/cmd/contract/generate_proxy/proxy_generator.rs
index 4528f53af6..60e121cf06 100644
--- a/framework/meta/src/cmd/contract/generate_proxy/proxy_generator.rs
+++ b/framework/meta/src/cmd/contract/generate_proxy/proxy_generator.rs
@@ -5,9 +5,11 @@ use multiversx_sc::abi::{
     TypeDescription,
 };
 
-use crate::cmd::contract::meta_config::MetaConfig;
+use crate::cmd::contract::{meta_config::MetaConfig, sc_config::ProxyConfigSerde};
 
-use super::proxy_naming::{extract_struct_crate, proxy_methods_type_name, proxy_type_name};
+use super::proxy_process_type_name::{
+    extract_paths, extract_struct_crate, process_rust_type, proxy_methods_type_name, proxy_type_name
+};
 
 const PRELUDE: &str = "// Code generated by the multiversx-sc proxy generator. DO NOT EDIT.
 
@@ -17,8 +19,9 @@ const PRELUDE: &str = "// Code generated by the multiversx-sc proxy generator. D
 
 #![allow(dead_code)]
 #![allow(clippy::all)]
+";
 
-use multiversx_sc::proxy_imports::*;";
+const IMPORTS: &str = "use multiversx_sc::proxy_imports::*;";
 
 const ZERO: &str = "0";
 
@@ -37,12 +40,19 @@ const TYPES_FROM_FRAMEWORK: &[&str] = &[
 pub struct ProxyGenerator<'a> {
     pub meta_config: &'a MetaConfig,
     pub file: Option<&'a mut File>,
+    pub proxy_config: &'a ProxyConfigSerde,
 }
+
 impl<'a> ProxyGenerator<'a> {
-    pub fn new(meta_config: &'a MetaConfig, file: &'a mut File) -> Self {
+    pub fn new(
+        meta_config: &'a MetaConfig,
+        file: &'a mut File,
+        proxy_config: &'a ProxyConfigSerde,
+    ) -> Self {
         Self {
             meta_config,
             file: Some(file),
+            proxy_config,
         }
     }
 
@@ -67,6 +77,10 @@ impl<'a> ProxyGenerator<'a> {
 
     fn write_header(&mut self) {
         self.writeln(PRELUDE);
+        match &self.proxy_config.override_import {
+            Some(override_import) => self.writeln(override_import),
+            None => self.writeln(IMPORTS),
+        }
     }
 
     fn write_tx_proxy_type_def(&mut self) {
@@ -481,37 +495,11 @@ where
     }
 
     pub fn clean_paths(&mut self, rust_type: &str) -> String {
-        let delimiters = "<>,()[] ";
-        let words: Vec<&str> = rust_type
-            .split(|c| delimiters.contains(c))
-            .filter(|s| !s.is_empty())
-            .collect();
-
-        let crate_name = self
-            .meta_config
-            .original_contract_abi
-            .get_crate_name_for_code();
-        let mut words_replacer: Vec<String> = Vec::new();
-        for word in &words {
-            let type_rust_name = word.split("::").last().unwrap();
-            if crate_name == extract_struct_crate(word)
-                || TYPES_FROM_FRAMEWORK.contains(&type_rust_name)
-            {
-                words_replacer.push(type_rust_name.to_string());
-            } else {
-                words_replacer.push(word.to_string());
-            }
-        }
+        let paths = extract_paths(rust_type);
 
-        let mut rust_type_with_cleaned_path: String = rust_type.to_string().clone();
-        for index in 0..words.len() {
-            rust_type_with_cleaned_path = rust_type_with_cleaned_path.replace(
-                words.get(index).unwrap(),
-                words_replacer.get(index).unwrap(),
-            );
-        }
+        let processed_paths = self.process_paths(&paths);
 
-        rust_type_with_cleaned_path
+        process_rust_type(rust_type.to_string(), paths, processed_paths)
     }
 
     fn start_write_type(
@@ -564,13 +552,46 @@ where
     fn write_end_of_function(&mut self) {
         self.writeln("    }");
     }
+
+    fn extract_path_rename(&self) -> (&str, &str) {
+        if let Some(path_rename) = &self.proxy_config.path_rename {
+            return (&path_rename.from, &path_rename.to);
+        }
+
+        ("", "")
+    }
+
+    fn process_paths(&self, paths: &Vec<String>) -> Vec<String> {
+        let mut processed_paths: Vec<String> = Vec::new();
+        let (path_rename_from, path_rename_to) = self.extract_path_rename();
+        let crate_name = self
+            .meta_config
+            .original_contract_abi
+            .get_crate_name_for_code();
+
+        for path in paths {
+            let type_rust_name = path.split("::").last().unwrap();
+            let processed_path = match path {
+                p if p == path_rename_from => path_rename_to.to_string(),
+                p if crate_name == extract_struct_crate(p)
+                    || TYPES_FROM_FRAMEWORK.contains(&type_rust_name) =>
+                {
+                    type_rust_name.to_string()
+                },
+                _ => path.to_string(),
+            };
+            processed_paths.push(processed_path);
+        }
+
+        processed_paths
+    }
 }
 
 #[cfg(test)]
 pub mod tests {
     use multiversx_sc::abi::{BuildInfoAbi, ContractAbi, ContractCrateBuildAbi, FrameworkBuildAbi};
 
-    use crate::cmd::contract::meta_config::MetaConfig;
+    use crate::cmd::contract::{meta_config::MetaConfig, sc_config::ProxyConfigSerde};
 
     use super::ProxyGenerator;
 
@@ -590,10 +611,11 @@ pub mod tests {
         let mut proxy_generator = ProxyGenerator {
             meta_config: &meta_config,
             file: None,
+            proxy_config: &ProxyConfigSerde::new(),
         };
 
         let cleaned_path_unsanitized = proxy_generator.clean_paths(
-            "(other_crate::contract_crate::TestStruct, Option<contract_crate::other_crate::Box<AbiTestType>>)",
+            "(other_crate::contract_crate::TestStruct, Option<Box<contract_crate::other_crate::AbiTestType>>)",
         );
         let expected_result_unsanitized =
             "(other_crate::contract_crate::TestStruct, Option<Box<AbiTestType>>)";
@@ -620,10 +642,11 @@ pub mod tests {
         let mut proxy_generator = ProxyGenerator {
             meta_config: &meta_config,
             file: None,
+            proxy_config: &ProxyConfigSerde::new(),
         };
 
         let cleaned_path_sanitized = proxy_generator.clean_paths(
-            "(contract_crate::other_crate::TestStruct, Option<contract_crate::Box<AbiTestType>>)",
+            "(contract_crate::other_crate::TestStruct, Option<Box<contract_crate::AbiTestType>>)",
         );
         let expected_result_sanitized = "(TestStruct, Option<Box<AbiTestType>>)";
 
diff --git a/framework/meta/src/cmd/contract/generate_proxy/proxy_naming.rs b/framework/meta/src/cmd/contract/generate_proxy/proxy_naming.rs
deleted file mode 100644
index 3c4f1dac2e..0000000000
--- a/framework/meta/src/cmd/contract/generate_proxy/proxy_naming.rs
+++ /dev/null
@@ -1,12 +0,0 @@
-pub(super) fn proxy_type_name(contract_trait_name: &str) -> String {
-    format!("{contract_trait_name}Proxy")
-}
-
-pub(super) fn proxy_methods_type_name(contract_trait_name: &str) -> String {
-    format!("{contract_trait_name}ProxyMethods")
-}
-
-pub(super) fn extract_struct_crate(struct_path: &str) -> String {
-    let crate_name = struct_path.split("::").next().unwrap_or(struct_path);
-    crate_name.to_string()
-}
diff --git a/framework/meta/src/cmd/contract/generate_proxy/proxy_process_type_name.rs b/framework/meta/src/cmd/contract/generate_proxy/proxy_process_type_name.rs
new file mode 100644
index 0000000000..350243d662
--- /dev/null
+++ b/framework/meta/src/cmd/contract/generate_proxy/proxy_process_type_name.rs
@@ -0,0 +1,37 @@
+pub(super) fn proxy_type_name(contract_trait_name: &str) -> String {
+    format!("{contract_trait_name}Proxy")
+}
+
+pub(super) fn proxy_methods_type_name(contract_trait_name: &str) -> String {
+    format!("{contract_trait_name}ProxyMethods")
+}
+
+pub(super) fn extract_struct_crate(struct_path: &str) -> String {
+    let crate_name = struct_path.split("::").next().unwrap_or(struct_path);
+    crate_name.to_string()
+}
+
+pub(super) fn process_rust_type(
+    rust_type: String,
+    paths: Vec<String>,
+    processed_paths: Vec<String>,
+) -> String {
+    let mut processed_rust_type: String = rust_type.to_string().clone();
+    for index in 0..paths.len() {
+        processed_rust_type = processed_rust_type.replace(
+            paths.get(index).unwrap(),
+            processed_paths.get(index).unwrap(),
+        );
+    }
+
+    processed_rust_type
+}
+
+pub(super) fn extract_paths(rust_type: &str) -> Vec<String> {
+    let delimiters = "<>,()[] ";
+    rust_type
+        .split(|c| delimiters.contains(c))
+        .filter(|s| !s.is_empty())
+        .map(|s| s.to_string())
+        .collect()
+}
diff --git a/framework/meta/src/cmd/contract/sc_config.rs b/framework/meta/src/cmd/contract/sc_config.rs
index 16ac60826e..2fac2e38eb 100644
--- a/framework/meta/src/cmd/contract/sc_config.rs
+++ b/framework/meta/src/cmd/contract/sc_config.rs
@@ -3,6 +3,7 @@ mod contract_variant_builder;
 mod contract_variant_settings;
 mod contract_variant_validate;
 mod sc_config_model;
+mod sc_config_proxy;
 mod sc_config_serde;
 mod wasm_build;
 mod wasm_clean;
@@ -12,6 +13,7 @@ mod wasm_update;
 pub use contract_variant::ContractVariant;
 pub use contract_variant_settings::{ContractVariantProfile, ContractVariantSettings};
 pub use sc_config_model::ScConfig;
+pub use sc_config_proxy::ProxyConfigSerde;
 pub use sc_config_serde::{
     ContractVariantProfileSerde, ContractVariantSerde, MultiContractGeneralSettingsSerde,
     ScConfigSerde,
diff --git a/framework/meta/src/cmd/contract/sc_config/contract_variant_builder.rs b/framework/meta/src/cmd/contract/sc_config/contract_variant_builder.rs
index c2dc1058f5..bb6a439245 100644
--- a/framework/meta/src/cmd/contract/sc_config/contract_variant_builder.rs
+++ b/framework/meta/src/cmd/contract/sc_config/contract_variant_builder.rs
@@ -282,7 +282,7 @@ impl ScConfig {
         ScConfig {
             default_contract_config_name,
             contracts,
-            proxy_paths: config.settings.proxy_paths.clone(),
+            proxy_configs: config.proxy.clone(),
         }
     }
 }
@@ -315,7 +315,7 @@ impl ScConfig {
                 wasm_crate_name,
                 abi: original_abi.clone(),
             }],
-            proxy_paths: Vec::new(),
+            proxy_configs: Vec::new(),
         }
     }
 
diff --git a/framework/meta/src/cmd/contract/sc_config/sc_config_model.rs b/framework/meta/src/cmd/contract/sc_config/sc_config_model.rs
index f1d579a1a9..076e91a2f7 100644
--- a/framework/meta/src/cmd/contract/sc_config/sc_config_model.rs
+++ b/framework/meta/src/cmd/contract/sc_config/sc_config_model.rs
@@ -1,4 +1,7 @@
-use super::{contract_variant_validate::validate_contract_variant, ContractVariant};
+use super::{
+    contract_variant_validate::validate_contract_variant, sc_config_proxy::ProxyConfigSerde,
+    ContractVariant,
+};
 
 /// Allowed file names for the SC config.
 ///
@@ -15,7 +18,7 @@ pub const SC_CONFIG_FILE_NAMES: &[&str] = &["sc-config.toml", "multicontract.tom
 pub struct ScConfig {
     pub default_contract_config_name: String,
     pub contracts: Vec<ContractVariant>,
-    pub proxy_paths: Vec<String>,
+    pub proxy_configs: Vec<ProxyConfigSerde>,
 }
 
 impl ScConfig {
diff --git a/framework/meta/src/cmd/contract/sc_config/sc_config_proxy.rs b/framework/meta/src/cmd/contract/sc_config/sc_config_proxy.rs
new file mode 100644
index 0000000000..5521b1ee38
--- /dev/null
+++ b/framework/meta/src/cmd/contract/sc_config/sc_config_proxy.rs
@@ -0,0 +1,37 @@
+use serde::Deserialize;
+
+const DEFAULT_PATH: &str = "/output/proxy.rs";
+
+#[derive(Deserialize, Default, Debug, Clone, PartialEq, Eq)]
+#[serde(deny_unknown_fields)]
+pub struct ProxyConfigSerde {
+    #[serde(default)]
+    pub path: String,
+
+    #[serde(default)]
+    #[serde(rename = "override-import")]
+    pub override_import: Option<String>,
+
+    #[serde(default)]
+    #[serde(rename = "path-rename")]
+    pub path_rename: Option<PathRename>,
+}
+
+impl ProxyConfigSerde {
+    pub fn new() -> Self {
+        Self {
+            path: DEFAULT_PATH.to_string(),
+            override_import: None,
+            path_rename: None,
+        }
+    }
+}
+
+#[derive(Deserialize, Default, Debug, Clone, PartialEq, Eq)]
+pub struct PathRename {
+    #[serde(default)]
+    pub from: String,
+
+    #[serde(default)]
+    pub to: String,
+}
diff --git a/framework/meta/src/cmd/contract/sc_config/sc_config_serde.rs b/framework/meta/src/cmd/contract/sc_config/sc_config_serde.rs
index 4dd51a1a23..c3c6b94d30 100644
--- a/framework/meta/src/cmd/contract/sc_config/sc_config_serde.rs
+++ b/framework/meta/src/cmd/contract/sc_config/sc_config_serde.rs
@@ -1,6 +1,8 @@
 use serde::Deserialize;
 use std::collections::HashMap;
 
+use super::ProxyConfigSerde;
+
 #[derive(Deserialize, Debug)]
 #[serde(deny_unknown_fields)]
 pub struct ScConfigSerde {
@@ -9,6 +11,8 @@ pub struct ScConfigSerde {
     #[serde(default)]
     pub contracts: HashMap<String, ContractVariantSerde>,
     #[serde(default)]
+    pub proxy: Vec<ProxyConfigSerde>,
+    #[serde(default)]
     #[serde(rename = "labels-for-contracts")]
     pub labels_for_contracts: HashMap<String, Vec<String>>,
 }
@@ -62,10 +66,6 @@ pub struct ContractVariantSerde {
 #[serde(deny_unknown_fields)]
 pub struct MultiContractGeneralSettingsSerde {
     pub main: Option<String>,
-
-    #[serde(default)]
-    #[serde(rename = "proxy-paths")]
-    pub proxy_paths: Vec<String>,
 }
 
 #[derive(Deserialize, Default, Debug, Clone, PartialEq, Eq)]

From fc35cfb635762a8637dafc3dc0a9cf2ab19e919a Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Wed, 3 Apr 2024 18:06:12 +0300
Subject: [PATCH 0634/1254] proxy multi config - change sc-config

---
 .../examples/crowdfunding-esdt/sc-config.toml      |  4 ++--
 contracts/examples/crypto-zombies/sc-config.toml   |  4 ++--
 contracts/examples/digital-cash/sc-config.toml     |  4 ++--
 contracts/examples/multisig/sc-config.toml         |  4 +++-
 contracts/examples/seed-nft-minter/sc-config.toml  |  4 ++--
 contracts/feature-tests/abi-tester/sc-config.toml  |  9 +++++++--
 .../child/sc-config.toml                           |  4 ++--
 .../composability/recursive-caller/sc-config.toml  |  4 ++--
 .../composability/vault/sc-config.toml             | 14 +++++++++-----
 .../panic-message-features/sc-config.toml          |  4 +++-
 10 files changed, 34 insertions(+), 21 deletions(-)

diff --git a/contracts/examples/crowdfunding-esdt/sc-config.toml b/contracts/examples/crowdfunding-esdt/sc-config.toml
index 6539909c96..16f6430728 100644
--- a/contracts/examples/crowdfunding-esdt/sc-config.toml
+++ b/contracts/examples/crowdfunding-esdt/sc-config.toml
@@ -1,2 +1,2 @@
-[settings]
-proxy-paths = ["src/crowdfunding_esdt_proxy.rs"]
+[[proxy]]
+path = "src/crowdfunding_esdt_proxy.rs"
diff --git a/contracts/examples/crypto-zombies/sc-config.toml b/contracts/examples/crypto-zombies/sc-config.toml
index d43702bdfa..d1f317be2c 100644
--- a/contracts/examples/crypto-zombies/sc-config.toml
+++ b/contracts/examples/crypto-zombies/sc-config.toml
@@ -1,2 +1,2 @@
-[settings]
-proxy-paths = ["src/proxy_crypto_zombies.rs"]
\ No newline at end of file
+[[proxy]]
+path = "src/proxy_crypto_zombies.rs"
diff --git a/contracts/examples/digital-cash/sc-config.toml b/contracts/examples/digital-cash/sc-config.toml
index e33ce56689..39234c29d8 100644
--- a/contracts/examples/digital-cash/sc-config.toml
+++ b/contracts/examples/digital-cash/sc-config.toml
@@ -1,2 +1,2 @@
-[settings]
-proxy-paths = ["src/digital_cash_proxy.rs"]
\ No newline at end of file
+[[proxy]]
+path = "src/digital_cash_proxy.rs"
diff --git a/contracts/examples/multisig/sc-config.toml b/contracts/examples/multisig/sc-config.toml
index 00417afac7..79c3aeaa20 100644
--- a/contracts/examples/multisig/sc-config.toml
+++ b/contracts/examples/multisig/sc-config.toml
@@ -1,5 +1,4 @@
 [settings]
-proxy-paths = ["src/multisig_proxy.rs"]
 main = "main"
 
 [contracts.main]
@@ -15,3 +14,6 @@ name = "multisig-view"
 external-view = true
 add-unlabelled = false
 add-labels = ["multisig-external-view"]
+
+[[proxy]]
+path = "src/multisig_proxy.rs"
diff --git a/contracts/examples/seed-nft-minter/sc-config.toml b/contracts/examples/seed-nft-minter/sc-config.toml
index 03b009a5fa..5597c10092 100644
--- a/contracts/examples/seed-nft-minter/sc-config.toml
+++ b/contracts/examples/seed-nft-minter/sc-config.toml
@@ -1,2 +1,2 @@
-[settings]
-proxy-paths = ["../rewards-distribution/src/seed_nft_minter_proxy.rs"]
+[[proxy]]
+path = "../rewards-distribution/src/seed_nft_minter_proxy.rs"
diff --git a/contracts/feature-tests/abi-tester/sc-config.toml b/contracts/feature-tests/abi-tester/sc-config.toml
index 20d63c86b8..df90daa529 100644
--- a/contracts/feature-tests/abi-tester/sc-config.toml
+++ b/contracts/feature-tests/abi-tester/sc-config.toml
@@ -1,7 +1,6 @@
 # Abi-tester multi-contract config, used for testing.
 
 [settings]
-proxy-paths = ["src/abi_proxy.rs"]
 main = "main"
 
 [contracts.main]
@@ -12,4 +11,10 @@ name = "abi-tester-ev"
 external-view = true
 add-unlabelled = false
 add-labels = ["test-external-view"]
-add-endpoints = ["payable_any_token", "label_a"] # labels can be bypassed, endpoints added directly
+add-endpoints = [
+    "payable_any_token",
+    "label_a",
+] # labels can be bypassed, endpoints added directly
+
+[[proxy]]
+path = "src/abi_proxy.rs"
diff --git a/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/child/sc-config.toml b/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/child/sc-config.toml
index a80372b407..14d4385ae3 100644
--- a/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/child/sc-config.toml
+++ b/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/child/sc-config.toml
@@ -1,2 +1,2 @@
-[settings]
-proxy-paths = ["../parent/src/child_proxy.rs"]
\ No newline at end of file
+[[proxy]]
+path = "../parent/src/child_proxy.rs"
diff --git a/contracts/feature-tests/composability/recursive-caller/sc-config.toml b/contracts/feature-tests/composability/recursive-caller/sc-config.toml
index 7b21858e3c..48d2e6bb8f 100644
--- a/contracts/feature-tests/composability/recursive-caller/sc-config.toml
+++ b/contracts/feature-tests/composability/recursive-caller/sc-config.toml
@@ -1,2 +1,2 @@
-[settings]
-proxy-paths = ["src/self_proxy.rs"]
+[[proxy]]
+path = "src/self_proxy.rs"
diff --git a/contracts/feature-tests/composability/vault/sc-config.toml b/contracts/feature-tests/composability/vault/sc-config.toml
index 107694e4fe..130812eff2 100644
--- a/contracts/feature-tests/composability/vault/sc-config.toml
+++ b/contracts/feature-tests/composability/vault/sc-config.toml
@@ -1,10 +1,5 @@
 [settings]
 main = "main"
-proxy-paths = [
-    "../forwarder/src/vault_proxy.rs",
-    "../promises-features/src/vault_proxy.rs",
-    "../recursive-caller/src/vault_proxy.rs"
-]
 
 [contracts.main]
 name = "vault"
@@ -20,3 +15,12 @@ add-labels = ["promises-endpoint"]
 name = "vault-upgrade"
 add-unlabelled = false
 add-labels = ["upgrade"]
+
+[[proxy]]
+path = "../forwarder/src/vault_proxy.rs"
+
+[[proxy]]
+path = "../promises-features/src/vault_proxy.rs"
+
+[[proxy]]
+path = "../recursive-caller/src/vault_proxy.rs"
diff --git a/contracts/feature-tests/panic-message-features/sc-config.toml b/contracts/feature-tests/panic-message-features/sc-config.toml
index 7b60b5fb8c..a5d6671115 100644
--- a/contracts/feature-tests/panic-message-features/sc-config.toml
+++ b/contracts/feature-tests/panic-message-features/sc-config.toml
@@ -1,7 +1,9 @@
 [settings]
-proxy-paths = ["tests/pmf_proxy.rs"]
 main = "main"
 
 [contracts.main]
 name = "panic-message-features"
 panic-message = true
+
+[[proxy]]
+path = "tests/pmf_proxy.rs"

From 2a7679543e42aa2821cea196a7ac90c29feabd0a Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 3 Apr 2024 19:09:57 +0300
Subject: [PATCH 0635/1254] fix after merge

---
 contracts/feature-tests/exchange-features/Cargo.toml      | 4 ++--
 contracts/feature-tests/exchange-features/meta/Cargo.toml | 2 +-
 contracts/feature-tests/exchange-features/wasm/Cargo.toml | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/contracts/feature-tests/exchange-features/Cargo.toml b/contracts/feature-tests/exchange-features/Cargo.toml
index bdb1a7dd66..8e7f760f8a 100644
--- a/contracts/feature-tests/exchange-features/Cargo.toml
+++ b/contracts/feature-tests/exchange-features/Cargo.toml
@@ -9,9 +9,9 @@ publish = false
 path = "src/exchange_features.rs"
 
 [dependencies.multiversx-sc]
-version = "0.47.8"
+version = "0.48.0-alpha.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.0-alpha.1"
 path = "../../../framework/scenario"
diff --git a/contracts/feature-tests/exchange-features/meta/Cargo.toml b/contracts/feature-tests/exchange-features/meta/Cargo.toml
index ca186c0ec1..553871b6cb 100644
--- a/contracts/feature-tests/exchange-features/meta/Cargo.toml
+++ b/contracts/feature-tests/exchange-features/meta/Cargo.toml
@@ -8,6 +8,6 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.47.8"
+version = "0.48.0-alpha.1"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/feature-tests/exchange-features/wasm/Cargo.toml b/contracts/feature-tests/exchange-features/wasm/Cargo.toml
index 977914cedf..af96286900 100644
--- a/contracts/feature-tests/exchange-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/exchange-features/wasm/Cargo.toml
@@ -25,7 +25,7 @@ overflow-checks = false
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.47.8"
+version = "0.48.0-alpha.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]

From 7f2a1f8bb9b579850469575190e850b432f6b4e1 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Wed, 3 Apr 2024 22:34:52 +0300
Subject: [PATCH 0636/1254] crypto kitties migration - replace proxy

---
 .../kitty-auction/src/auction.rs              |   3 +-
 .../src/kitty_ownership_proxy.rs              |  28 +---
 .../crypto-kitties/kitty-ownership/src/lib.rs |   8 +-
 .../kitty-ownership/src/structs.rs            | 151 ------------------
 .../src/kitty_ownership_proxy.rs              |  22 +--
 5 files changed, 20 insertions(+), 192 deletions(-)
 delete mode 100644 contracts/examples/crypto-kitties/kitty-ownership/src/structs.rs

diff --git a/contracts/examples/crypto-kitties/kitty-auction/src/auction.rs b/contracts/examples/crypto-kitties/kitty-auction/src/auction.rs
index fda71eb13d..261def0cf0 100644
--- a/contracts/examples/crypto-kitties/kitty-auction/src/auction.rs
+++ b/contracts/examples/crypto-kitties/kitty-auction/src/auction.rs
@@ -11,7 +11,8 @@ pub enum AuctionType {
     Siring,
 }
 
-#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, TypeAbi)]
+#[type_abi]
+#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct Auction<M: ManagedTypeApi> {
     pub auction_type: AuctionType,
     pub starting_price: BigUint<M>,
diff --git a/contracts/examples/crypto-kitties/kitty-auction/src/kitty_ownership_proxy.rs b/contracts/examples/crypto-kitties/kitty-auction/src/kitty_ownership_proxy.rs
index aa6b43a3ee..e43a200ce2 100644
--- a/contracts/examples/crypto-kitties/kitty-auction/src/kitty_ownership_proxy.rs
+++ b/contracts/examples/crypto-kitties/kitty-auction/src/kitty_ownership_proxy.rs
@@ -241,7 +241,7 @@ where
     >(
         self,
         kitty_id: Arg0,
-    ) -> TxProxyCall<Env, From, To, Gas, Kitty> {
+    ) -> TxProxyCall<Env, From, To, Gas, kitty::Kitty> {
         self.wrapped_tx
             .raw_call("getKittyById")
             .argument(&kitty_id)
@@ -337,29 +337,3 @@ where
             .original_result()
     }
 }
-
-#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
-pub struct Kitty {
-    pub genes: KittyGenes,
-    pub birth_time: u64,
-    pub cooldown_end: u64,
-    pub matron_id: u32,
-    pub sire_id: u32,
-    pub siring_with_id: u32,
-    pub nr_children: u16,
-    pub generation: u16,
-}
-
-#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, Clone, Default)]
-pub struct KittyGenes {
-    pub fur_color: Color,
-    pub eye_color: Color,
-    pub meow_power: u8,
-}
-
-#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, Clone, Default)]
-pub struct Color {
-    pub r: u8,
-    pub g: u8,
-    pub b: u8,
-}
diff --git a/contracts/examples/crypto-kitties/kitty-ownership/src/lib.rs b/contracts/examples/crypto-kitties/kitty-ownership/src/lib.rs
index 51a433080a..730f6a3d0f 100644
--- a/contracts/examples/crypto-kitties/kitty-ownership/src/lib.rs
+++ b/contracts/examples/crypto-kitties/kitty-ownership/src/lib.rs
@@ -2,12 +2,12 @@
 #![allow(clippy::suspicious_operation_groupings)]
 
 pub mod kitty_genetic_alg_proxy;
-pub mod structs;
+use kitty::{kitty_genes::KittyGenes, Kitty};
+use multiversx_sc::imports::*;
 
-use crate::structs::*;
 use core::cmp::max;
-use multiversx_sc::imports::*;
-use random::{Random, Randomizeable};
+
+use random::*;
 
 #[multiversx_sc::contract]
 pub trait KittyOwnership {
diff --git a/contracts/examples/crypto-kitties/kitty-ownership/src/structs.rs b/contracts/examples/crypto-kitties/kitty-ownership/src/structs.rs
deleted file mode 100644
index 7b17f52dc7..0000000000
--- a/contracts/examples/crypto-kitties/kitty-ownership/src/structs.rs
+++ /dev/null
@@ -1,151 +0,0 @@
-use multiversx_sc::derive_imports::*;
-use random::{Random, Randomizeable};
-
-const SECONDS_PER_MINUTE: u64 = 60;
-const MAX_COOLDOWN: u64 = 60 * 60 * 24 * 7; // 7 days
-const MAX_TIREDNESS: u16 = 20;
-
-#[type_abi]
-#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
-pub struct Kitty {
-    pub genes: KittyGenes,
-    pub birth_time: u64,   // timestamp
-    pub cooldown_end: u64, // timestamp, used for pregnancy timer and siring cooldown
-    pub matron_id: u32,
-    pub sire_id: u32,
-    pub siring_with_id: u32, // for pregnant cats, 0 otherwise
-    pub nr_children: u16,    // cooldown period increases exponentially with every breeding/siring
-    pub generation: u16,     // max(sire_gen, matron_gen) + 1. Generation also influences cooldown.
-}
-
-impl Randomizeable for KittyGenes {
-    fn get_random(random: &mut Random) -> Self {
-        KittyGenes {
-            fur_color: Color::get_random(random),
-            eye_color: Color::get_random(random),
-            meow_power: random.next_u8(),
-        }
-    }
-}
-
-impl Kitty {
-    pub fn new(
-        genes: KittyGenes,
-        birth_time: u64,
-        matron_id: u32,
-        sire_id: u32,
-        generation: u16,
-    ) -> Self {
-        Kitty {
-            genes,
-            birth_time,
-            cooldown_end: 0,
-            matron_id,
-            sire_id,
-            siring_with_id: 0,
-            nr_children: 0,
-            generation,
-        }
-    }
-
-    pub fn get_next_cooldown_time(&self) -> u64 {
-        let tiredness = self.nr_children + self.generation / 2;
-        if tiredness > MAX_TIREDNESS {
-            return MAX_COOLDOWN;
-        }
-
-        let cooldown = SECONDS_PER_MINUTE << tiredness; // 2^(tiredness) minutes
-        if cooldown > MAX_COOLDOWN {
-            MAX_COOLDOWN
-        } else {
-            cooldown
-        }
-    }
-
-    pub fn get_fur_color(&self) -> Color {
-        self.genes.fur_color.clone()
-    }
-
-    pub fn get_eye_color(&self) -> Color {
-        self.genes.eye_color.clone()
-    }
-
-    pub fn get_meow_power(&self) -> u8 {
-        self.genes.meow_power
-    }
-
-    pub fn is_pregnant(&self) -> bool {
-        self.siring_with_id != 0
-    }
-}
-
-// The default Kitty, which is not a valid kitty. Used for Kitty with ID 0
-impl Default for Kitty {
-    fn default() -> Self {
-        Kitty {
-            genes: KittyGenes::default(),
-            birth_time: 0,
-            cooldown_end: u64::MAX,
-            matron_id: 0,
-            sire_id: 0,
-            siring_with_id: 0,
-            nr_children: 0,
-            generation: 0,
-        }
-    }
-}
-
-#[type_abi]
-#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, Clone, Default)]
-pub struct KittyGenes {
-    pub fur_color: Color,
-    pub eye_color: Color,
-    pub meow_power: u8, // the higher the value, the louder the cat
-}
-
-impl KittyGenes {
-    pub fn get_as_u64(&self) -> u64 {
-        (self.fur_color.as_u64() << 12 | self.eye_color.as_u64()) << 4
-            | self.meow_power.to_be() as u64
-    }
-}
-
-#[type_abi]
-#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, Clone, Default)]
-pub struct Color {
-    pub r: u8,
-    pub g: u8,
-    pub b: u8,
-}
-
-impl Color {
-    // ratios are integers, 0 < ratio < 100, ratioFirst + ratioSecond = 100
-    // checks should be done in the caller
-    #[must_use]
-    pub fn mix_with(&self, other_color: &Color, ratio_first: u8, ratio_second: u8) -> Color {
-        let r = ((self.r as u16 * ratio_first as u16 + other_color.r as u16 * ratio_second as u16)
-            / 100) as u8;
-
-        let g = ((self.g as u16 * ratio_first as u16 + other_color.g as u16 * ratio_second as u16)
-            / 100) as u8;
-
-        let b = ((self.b as u16 * ratio_first as u16 + other_color.b as u16 * ratio_second as u16)
-            / 100) as u8;
-
-        Color { r, g, b }
-    }
-
-    pub fn as_u64(&self) -> u64 {
-        ((self.r.to_be() as u64) << 4 | self.r.to_be() as u64) << 4 | self.r.to_be() as u64
-    }
-}
-
-impl Randomizeable for Color {
-    fn get_random(random: &mut Random) -> Self {
-        Color {
-            r: random.next_u8(),
-            g: random.next_u8(),
-            b: random.next_u8(),
-        }
-    }
-}
diff --git a/contracts/examples/crypto-zombies/src/kitty_ownership_proxy.rs b/contracts/examples/crypto-zombies/src/kitty_ownership_proxy.rs
index aa6b43a3ee..41b707e2be 100644
--- a/contracts/examples/crypto-zombies/src/kitty_ownership_proxy.rs
+++ b/contracts/examples/crypto-zombies/src/kitty_ownership_proxy.rs
@@ -1,12 +1,3 @@
-// Code generated by the multiversx-sc proxy generator. DO NOT EDIT.
-
-////////////////////////////////////////////////////
-////////////////// AUTO-GENERATED //////////////////
-////////////////////////////////////////////////////
-
-#![allow(dead_code)]
-#![allow(clippy::all)]
-
 use multiversx_sc::proxy_imports::*;
 
 pub struct KittyOwnershipProxy;
@@ -363,3 +354,16 @@ pub struct Color {
     pub g: u8,
     pub b: u8,
 }
+
+impl KittyGenes {
+    pub fn get_as_u64(&self) -> u64 {
+        (self.fur_color.as_u64() << 12 | self.eye_color.as_u64()) << 4
+            | self.meow_power.to_be() as u64
+    }
+}
+
+impl Color {
+    pub fn as_u64(&self) -> u64 {
+        ((self.r.to_be() as u64) << 4 | self.r.to_be() as u64) << 4 | self.r.to_be() as u64
+    }
+}

From 0ad4c78e8301c91c57db34da5e492319a888407d Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Thu, 4 Apr 2024 00:54:32 +0200
Subject: [PATCH 0637/1254] ContractCall* structs replace with unified syntax

---
 .../interact/src/multisig_interact_wegld.rs   | 29 +++----
 .../forwarder-queue/src/forwarder_queue.rs    | 36 ++++-----
 .../forwarder-raw/src/forwarder_raw_async.rs  | 12 ++-
 .../forwarder/src/vault_proxy.rs              |  4 +-
 .../promises-features/src/vault_proxy.rs      |  4 +-
 .../recursive-caller/src/vault_proxy.rs       |  4 +-
 .../transfer-role-features/src/lib.rs         |  4 +-
 .../tests/transfer_role_whitebox_test.rs      |  8 +-
 .../composability/vault/src/vault.rs          |  2 +-
 .../vault/wasm-vault-promises/src/lib.rs      |  2 +-
 .../composability/vault/wasm/src/lib.rs       |  2 +-
 contracts/modules/src/transfer_role_proxy.rs  | 75 ++++++++++---------
 framework/base/src/macros.rs                  |  7 --
 framework/base/src/types/interaction/tx.rs    | 24 +++++-
 .../interaction/tx_exec/tx_exec_async.rs      |  1 +
 .../tx_exec/tx_exec_async_promises.rs         | 19 +++++
 .../tx_payment_egld_or_multi_esdt.rs          | 60 +++++++++++++++
 17 files changed, 187 insertions(+), 106 deletions(-)

diff --git a/contracts/examples/multisig/interact/src/multisig_interact_wegld.rs b/contracts/examples/multisig/interact/src/multisig_interact_wegld.rs
index 6e3c10563e..b267f17357 100644
--- a/contracts/examples/multisig/interact/src/multisig_interact_wegld.rs
+++ b/contracts/examples/multisig/interact/src/multisig_interact_wegld.rs
@@ -1,19 +1,16 @@
 use std::time::Duration;
 
 use multiversx_sc_scenario::{
-    multiversx_sc::types::{ContractCallBase, FunctionCall, ReturnsResult},
+    multiversx_sc::types::{FunctionCall, ManagedAddress, ReturnsResult},
     NumExpr,
 };
 #[allow(unused_imports)]
 use multiversx_sc_snippets::multiversx_sc::types::{
     EsdtTokenPayment, MultiValueEncoded, TokenIdentifier,
 };
-use multiversx_sc_snippets::{
-    multiversx_sc::types::ContractCallNoPayment,
-    multiversx_sc_scenario::{
-        mandos_system::ScenarioRunner, scenario_format::interpret_trait::InterpretableFrom,
-        standalone::retrieve_account_as_scenario_set_state,
-    },
+use multiversx_sc_snippets::multiversx_sc_scenario::{
+    mandos_system::ScenarioRunner, scenario_format::interpret_trait::InterpretableFrom,
+    standalone::retrieve_account_as_scenario_set_state,
 };
 
 use super::*;
@@ -85,16 +82,13 @@ impl MultisigInteract {
     }
 
     async fn propose_unwrap_egld(&mut self) -> usize {
-        let contract_call = ContractCallNoPayment::<StaticApi, ()>::new(
-            bech32::decode(WEGLD_SWAP_SC_BECH32).into(),
-            "unwrapEgld",
-        )
-        .with_esdt_transfer(EsdtTokenPayment::new(
+        let to = ManagedAddress::<StaticApi>::from(bech32::decode(WEGLD_SWAP_SC_BECH32));
+        let payment = EsdtTokenPayment::new(
             TokenIdentifier::from(WEGLD_TOKEN_IDENTIFIER),
             0u64,
             UNWRAP_AMOUNT.into(),
-        ))
-        .into_normalized();
+        );
+        let function_call = FunctionCall::new("unwrapEgld");
 
         let action_id = self
             .interactor
@@ -103,11 +97,8 @@ impl MultisigInteract {
             .to(&self.state.multisig().to_address())
             .gas(NumExpr("10,000,000"))
             .typed(multisig_proxy::MultisigProxy)
-            .propose_async_call(
-                contract_call.basic.to,
-                0u64,
-                contract_call.basic.function_call,
-            )
+            .propose_async_call(to, 0u64, function_call)
+            .esdt(payment)
             .returns(ReturnsResult)
             .prepare_async()
             .run()
diff --git a/contracts/feature-tests/composability/forwarder-queue/src/forwarder_queue.rs b/contracts/feature-tests/composability/forwarder-queue/src/forwarder_queue.rs
index 66595bc54f..7b353e4ab0 100644
--- a/contracts/feature-tests/composability/forwarder-queue/src/forwarder_queue.rs
+++ b/contracts/feature-tests/composability/forwarder-queue/src/forwarder_queue.rs
@@ -172,30 +172,27 @@ pub trait ForwarderQueue {
                 },
             };
 
-            let contract_call = ContractCallWithAnyPayment::<_, ()>::new(
-                call.to,
-                call.endpoint_name,
-                call.payments,
-            );
+            let contract_call = self
+                .tx()
+                .raw_call(call.endpoint_name)
+                .to(&call.to)
+                .payment(&call.payments);
 
             match call.call_type {
                 QueuedCallType::Sync => {
-                    contract_call.execute_on_dest_context::<()>();
+                    contract_call.sync_call();
                 },
                 QueuedCallType::LegacyAsync => {
-                    contract_call.async_call().call_and_exit();
+                    contract_call.async_call_and_exit();
                 },
                 QueuedCallType::TransferExecute => {
-                    contract_call
-                        .with_gas_limit(call.gas_limit)
-                        .transfer_execute();
+                    contract_call.gas(call.gas_limit).transfer_execute();
                 },
                 QueuedCallType::Promise => {
                     contract_call
-                        .with_gas_limit(call.gas_limit)
-                        .with_raw_arguments(call.args)
-                        .async_call_promise()
-                        .with_callback(self.callbacks().promises_callback_method())
+                        .gas(call.gas_limit)
+                        .arguments_raw(call.args)
+                        .callback(self.callbacks().promises_callback_method())
                         .register_promise();
                 },
             }
@@ -208,10 +205,13 @@ pub trait ForwarderQueue {
         self.callback_count().update(|c| *c += 1);
         let payments = self.call_value().any_payment();
 
-        let payments_data_string =
-            ContractCallNoPayment::<_, ()>::new(ManagedAddress::default(), ManagedBuffer::new())
-                .with_any_payment(payments)
-                .into_call_data_string();
+        let payments_data_string = self
+            .tx()
+            .to(&ManagedAddress::default())
+            .payment(payments)
+            .function_call(FunctionCall::empty())
+            .to_call_data_string();
+
         self.callback_payments().set(payments_data_string);
     }
 
diff --git a/contracts/feature-tests/composability/forwarder-raw/src/forwarder_raw_async.rs b/contracts/feature-tests/composability/forwarder-raw/src/forwarder_raw_async.rs
index 944e3365b6..fbd0eec1a4 100644
--- a/contracts/feature-tests/composability/forwarder-raw/src/forwarder_raw_async.rs
+++ b/contracts/feature-tests/composability/forwarder-raw/src/forwarder_raw_async.rs
@@ -196,12 +196,10 @@ pub trait ForwarderRawAsync: super::forwarder_raw_common::ForwarderRawCommon {
             all_payments.push(EsdtTokenPayment::new(token_identifier, token_nonce, amount));
         }
 
-        ContractCallWithMultiEsdt::<Self::Api, ()>::new(
-            to,
-            "burn_and_create_retrive_async",
-            all_payments,
-        )
-        .async_call()
-        .call_and_exit_ignore_callback()
+        self.tx()
+            .raw_call("burn_and_create_retrieve_async")
+            .to(&to)
+            .payment(&all_payments)
+            .async_call_and_exit()
     }
 }
diff --git a/contracts/feature-tests/composability/forwarder/src/vault_proxy.rs b/contracts/feature-tests/composability/forwarder/src/vault_proxy.rs
index 81dc99b8f0..656db40983 100644
--- a/contracts/feature-tests/composability/forwarder/src/vault_proxy.rs
+++ b/contracts/feature-tests/composability/forwarder/src/vault_proxy.rs
@@ -214,11 +214,11 @@ where
             .original_result()
     }
 
-    pub fn burn_and_create_retrive_async(
+    pub fn burn_and_create_retrieve_async(
         self,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call("burn_and_create_retrive_async")
+            .raw_call("burn_and_create_retrieve_async")
             .original_result()
     }
 
diff --git a/contracts/feature-tests/composability/promises-features/src/vault_proxy.rs b/contracts/feature-tests/composability/promises-features/src/vault_proxy.rs
index 81dc99b8f0..656db40983 100644
--- a/contracts/feature-tests/composability/promises-features/src/vault_proxy.rs
+++ b/contracts/feature-tests/composability/promises-features/src/vault_proxy.rs
@@ -214,11 +214,11 @@ where
             .original_result()
     }
 
-    pub fn burn_and_create_retrive_async(
+    pub fn burn_and_create_retrieve_async(
         self,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call("burn_and_create_retrive_async")
+            .raw_call("burn_and_create_retrieve_async")
             .original_result()
     }
 
diff --git a/contracts/feature-tests/composability/recursive-caller/src/vault_proxy.rs b/contracts/feature-tests/composability/recursive-caller/src/vault_proxy.rs
index 81dc99b8f0..656db40983 100644
--- a/contracts/feature-tests/composability/recursive-caller/src/vault_proxy.rs
+++ b/contracts/feature-tests/composability/recursive-caller/src/vault_proxy.rs
@@ -214,11 +214,11 @@ where
             .original_result()
     }
 
-    pub fn burn_and_create_retrive_async(
+    pub fn burn_and_create_retrieve_async(
         self,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call("burn_and_create_retrive_async")
+            .raw_call("burn_and_create_retrieve_async")
             .original_result()
     }
 
diff --git a/contracts/feature-tests/composability/transfer-role-features/src/lib.rs b/contracts/feature-tests/composability/transfer-role-features/src/lib.rs
index b689b76d43..125cd4fb23 100644
--- a/contracts/feature-tests/composability/transfer-role-features/src/lib.rs
+++ b/contracts/feature-tests/composability/transfer-role-features/src/lib.rs
@@ -30,7 +30,7 @@ pub trait TransferRoleFeatures:
         }
 
         if !self.blockchain().is_smart_contract(&dest) {
-            self.transfer_to_user(original_caller, dest, payments.clone_value(), endpoint_name);
+            self.transfer_to_user(original_caller, dest, &payments, endpoint_name);
         } else {
             let mut args_buffer = ManagedArgBuffer::new();
             for arg in args {
@@ -40,7 +40,7 @@ pub trait TransferRoleFeatures:
             self.transfer_to_contract_raw(
                 original_caller,
                 dest,
-                payments.clone_value(),
+                &payments,
                 endpoint_name,
                 args_buffer,
                 None,
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 155f82ce9d..f50b2f88ba 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
@@ -104,7 +104,7 @@ fn test_transfer_role() {
             sc.transfer_to_user(
                 managed_address!(&address_expr_to_address(USER_ADDRESS_EXPR)),
                 managed_address!(&address_expr_to_address(OWNER_ADDRESS_EXPR)),
-                payments,
+                &payments,
                 managed_buffer!(b"enjoy"),
             );
         },
@@ -135,7 +135,7 @@ fn test_transfer_role() {
             sc.transfer_to_user(
                 managed_address!(&address_expr_to_address(USER_ADDRESS_EXPR)),
                 managed_address!(&Address::zero()),
-                payments,
+                &payments,
                 managed_buffer!(b"enjoy"),
             );
         },
@@ -159,7 +159,7 @@ fn test_transfer_role() {
             sc.transfer_to_contract_raw(
                 managed_address!(&address_expr_to_address(USER_ADDRESS_EXPR)),
                 managed_address!(&address_expr_to_address(VAULT_ADDRESS_EXPR)),
-                payments,
+                &payments,
                 managed_buffer!(ACCEPT_FUNDS_FUNC_NAME),
                 ManagedArgBuffer::new(),
                 None,
@@ -191,7 +191,7 @@ fn test_transfer_role() {
             sc.transfer_to_contract_raw(
                 managed_address!(&address_expr_to_address(USER_ADDRESS_EXPR)),
                 managed_address!(&address_expr_to_address(VAULT_ADDRESS_EXPR)),
-                payments,
+                &payments,
                 managed_buffer!(REJECT_FUNDS_FUNC_NAME),
                 ManagedArgBuffer::new(),
                 None,
diff --git a/contracts/feature-tests/composability/vault/src/vault.rs b/contracts/feature-tests/composability/vault/src/vault.rs
index ab22590572..d23123ca01 100644
--- a/contracts/feature-tests/composability/vault/src/vault.rs
+++ b/contracts/feature-tests/composability/vault/src/vault.rs
@@ -193,7 +193,7 @@ pub trait Vault {
 
     #[payable("*")]
     #[endpoint]
-    fn burn_and_create_retrive_async(&self) {
+    fn burn_and_create_retrieve_async(&self) {
         let payments = self.call_value().all_esdt_transfers();
         let mut uris = ManagedVec::new();
         uris.push(ManagedBuffer::new());
diff --git a/contracts/feature-tests/composability/vault/wasm-vault-promises/src/lib.rs b/contracts/feature-tests/composability/vault/wasm-vault-promises/src/lib.rs
index f1a599dafe..6a814f3b57 100644
--- a/contracts/feature-tests/composability/vault/wasm-vault-promises/src/lib.rs
+++ b/contracts/feature-tests/composability/vault/wasm-vault-promises/src/lib.rs
@@ -30,7 +30,7 @@ multiversx_sc_wasm_adapter::endpoints! {
         retrieve_funds_with_transfer_exec => retrieve_funds_with_transfer_exec
         retrieve_funds => retrieve_funds
         retrieve_multi_funds_async => retrieve_multi_funds_async
-        burn_and_create_retrive_async => burn_and_create_retrive_async
+        burn_and_create_retrieve_async => burn_and_create_retrieve_async
         get_owner_address => get_owner_address
         call_counts => call_counts
         num_called_retrieve_funds_promises => num_called_retrieve_funds_promises
diff --git a/contracts/feature-tests/composability/vault/wasm/src/lib.rs b/contracts/feature-tests/composability/vault/wasm/src/lib.rs
index c6e864fbbe..0c5cd48e03 100644
--- a/contracts/feature-tests/composability/vault/wasm/src/lib.rs
+++ b/contracts/feature-tests/composability/vault/wasm/src/lib.rs
@@ -32,7 +32,7 @@ multiversx_sc_wasm_adapter::endpoints! {
         retrieve_funds_with_transfer_exec => retrieve_funds_with_transfer_exec
         retrieve_funds => retrieve_funds
         retrieve_multi_funds_async => retrieve_multi_funds_async
-        burn_and_create_retrive_async => burn_and_create_retrive_async
+        burn_and_create_retrieve_async => burn_and_create_retrieve_async
         get_owner_address => get_owner_address
         call_counts => call_counts
         num_called_retrieve_funds_promises => num_called_retrieve_funds_promises
diff --git a/contracts/modules/src/transfer_role_proxy.rs b/contracts/modules/src/transfer_role_proxy.rs
index 2c272eb01b..9001de263d 100644
--- a/contracts/modules/src/transfer_role_proxy.rs
+++ b/contracts/modules/src/transfer_role_proxy.rs
@@ -13,19 +13,26 @@ pub trait TransferRoleProxyModule {
         &self,
         original_caller: ManagedAddress,
         dest: ManagedAddress,
-        payments: PaymentsVec<Self::Api>,
+        payments: &PaymentsVec<Self::Api>,
         data: ManagedBuffer,
     ) -> ! {
-        let contract_call =
-            ContractCallWithMultiEsdt::<Self::Api, ()>::new(dest, data, payments.clone());
+        let transaction = self.tx().to(&dest).raw_call(data).payment(payments);
 
-        self.execute_async_call(original_caller, payments, contract_call, None);
+        self.execute_async_call(original_caller, payments, transaction, None)
     }
 
     fn transfer_to_contract_typed_call<T>(
         &self,
         original_caller: ManagedAddress,
-        contract_call: ContractCallWithMultiEsdt<Self::Api, T>,
+        transaction: Tx<
+            TxScEnv<Self::Api>,
+            (),
+            &ManagedAddress,
+            &ManagedVec<Self::Api, EsdtTokenPayment<Self::Api>>,
+            (),
+            FunctionCall<Self::Api>,
+            (),
+        >,
         opt_custom_callback: Option<CallbackClosure<Self::Api>>,
     ) -> !
     where
@@ -33,8 +40,8 @@ pub trait TransferRoleProxyModule {
     {
         self.execute_async_call(
             original_caller,
-            contract_call.esdt_payments.clone(),
-            contract_call,
+            transaction.payment,
+            transaction,
             opt_custom_callback,
         );
     }
@@ -43,59 +50,55 @@ pub trait TransferRoleProxyModule {
         &self,
         original_caller: ManagedAddress,
         dest: ManagedAddress,
-        payments: PaymentsVec<Self::Api>,
+        payments: &PaymentsVec<Self::Api>,
         endpoint_name: ManagedBuffer,
         args: ManagedArgBuffer<Self::Api>,
         opt_custom_callback: Option<CallbackClosure<Self::Api>>,
     ) -> ! {
-        let contract_call =
-            ContractCallWithMultiEsdt::<Self::Api, ()>::new(dest, endpoint_name, payments.clone())
-                .with_raw_arguments(args);
-
-        self.execute_async_call(
-            original_caller,
-            payments,
-            contract_call,
-            opt_custom_callback,
-        );
+        let transaction = self
+            .tx()
+            .to(&dest)
+            .raw_call(endpoint_name)
+            .payment(payments)
+            .arguments_raw(args);
+
+        self.execute_async_call(original_caller, payments, transaction, opt_custom_callback)
     }
 
-    fn execute_async_call<T>(
+    fn execute_async_call(
         &self,
         original_caller: ManagedAddress,
-        initial_payments: PaymentsVec<Self::Api>,
-        contract_call: ContractCallWithMultiEsdt<Self::Api, T>,
+        initial_payments: &PaymentsVec<Self::Api>,
+        transaction: Tx<
+            TxScEnv<Self::Api>,
+            (),
+            &ManagedAddress,
+            &ManagedVec<Self::Api, EsdtTokenPayment<Self::Api>>,
+            (),
+            FunctionCall<Self::Api>,
+            (),
+        >,
         opt_custom_callback: Option<CallbackClosure<Self::Api>>,
-    ) -> !
-    where
-        T: TopEncodeMulti,
-    {
+    ) -> ! {
         require!(
-            self.destination_whitelist()
-                .contains(&contract_call.basic.to),
+            self.destination_whitelist().contains(transaction.to),
             "Destination address not whitelisted"
         );
 
         let remaining_gas = self.blockchain().get_gas_left();
-        let cb_gas_needed =
-            CALLBACK_RESERVED_GAS_PER_TOKEN * contract_call.esdt_payments.len() as u64;
+        let cb_gas_needed = CALLBACK_RESERVED_GAS_PER_TOKEN * transaction.payment.len() as u64;
         require!(
             remaining_gas > cb_gas_needed,
             "Not enough gas to launch async call"
         );
 
-        let async_call_gas = remaining_gas - cb_gas_needed;
         let cb = match opt_custom_callback {
             Some(custom_cb) => custom_cb,
             None => TransferRoleProxyModule::callbacks(self)
-                .transfer_callback(original_caller, initial_payments),
+                .transfer_callback(original_caller, initial_payments.clone()),
         };
 
-        contract_call
-            .with_gas_limit(async_call_gas)
-            .async_call()
-            .with_callback(cb)
-            .call_and_exit()
+        transaction.callback(cb).async_call_and_exit()
     }
 
     #[callback]
diff --git a/framework/base/src/macros.rs b/framework/base/src/macros.rs
index 99a8d1d779..06f84b77e9 100644
--- a/framework/base/src/macros.rs
+++ b/framework/base/src/macros.rs
@@ -186,13 +186,6 @@ macro_rules! non_zero_usize {
     };
 }
 
-#[macro_export]
-macro_rules! endpoints_proxy {
-    ($endpoint_name:ident, $address:ident) => {
-        multiversx_sc::types::ContractCallNoPayment::new($address, stringify!($endpoint_name));
-    };
-}
-
 #[macro_export]
 macro_rules! constructors_proxy {
     ($opt_address:ident) => {
diff --git a/framework/base/src/types/interaction/tx.rs b/framework/base/src/types/interaction/tx.rs
index 1524bb22fe..ccd88f65c1 100644
--- a/framework/base/src/types/interaction/tx.rs
+++ b/framework/base/src/types/interaction/tx.rs
@@ -1,7 +1,7 @@
 use crate::{
     api::CallTypeApi,
     contract_base::BlockchainWrapper,
-    proxy_imports::{EgldOrEsdtTokenIdentifier, EgldOrEsdtTokenPaymentRefs},
+    proxy_imports::{EgldOrEsdtTokenIdentifier, EgldOrEsdtTokenPaymentRefs, ManagedTypeApi},
     types::{
         BigUint, CodeMetadata, EgldOrEsdtTokenPayment, EgldOrMultiEsdtPayment,
         EgldOrMultiEsdtPaymentRefs, EsdtTokenPayment, EsdtTokenPaymentRefs, ManagedAddress,
@@ -15,9 +15,10 @@ use super::{
     contract_deploy::UNSPECIFIED_GAS_LIMIT, AnnotatedValue, Code, ContractCallBase,
     ContractCallNoPayment, ContractCallWithEgld, ContractDeploy, DeployCall, Egld, EgldPayment,
     ExplicitGas, FromSource, FunctionCall, ManagedArgBuffer, OriginalResultMarker, RHList,
-    RHListAppendNoRet, RHListAppendRet, RHListItem, TxCodeSource, TxCodeValue, TxData, TxEgldValue,
-    TxEnv, TxFrom, TxFromSourceValue, TxGas, TxGasValue, TxPayment, TxPaymentEgldOnly,
-    TxPaymentMultiEsdt, TxProxyTrait, TxResultHandler, TxScEnv, TxTo, TxToSpecified, UpgradeCall,
+    RHListAppendNoRet, RHListAppendRet, RHListItem, TxCodeSource, TxCodeValue, TxData,
+    TxDataFunctionCall, TxEgldValue, TxEnv, TxFrom, TxFromSourceValue, TxGas, TxGasValue,
+    TxPayment, TxPaymentEgldOnly, TxPaymentMultiEsdt, TxProxyTrait, TxResultHandler, TxScEnv, TxTo,
+    TxToSpecified, UpgradeCall,
 };
 
 #[must_use]
@@ -65,6 +66,21 @@ where
     }
 }
 
+impl<Env, From, To, Payment, Gas, Data, RH> Tx<Env, From, To, Payment, Gas, Data, RH>
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Payment: TxPayment<Env>,
+    Gas: TxGas<Env>,
+    Data: TxDataFunctionCall<Env>,
+    RH: TxResultHandler<Env>,
+{
+    pub fn to_call_data_string(&self) -> ManagedBuffer<Env::Api> {
+        self.data.to_call_data_string()
+    }
+}
+
 pub type TxBaseWithEnv<Env> = Tx<Env, (), (), (), (), (), ()>;
 
 impl<Env> TxBaseWithEnv<Env>
diff --git a/framework/base/src/types/interaction/tx_exec/tx_exec_async.rs b/framework/base/src/types/interaction/tx_exec/tx_exec_async.rs
index 238b978139..6973e1ef5b 100644
--- a/framework/base/src/types/interaction/tx_exec/tx_exec_async.rs
+++ b/framework/base/src/types/interaction/tx_exec/tx_exec_async.rs
@@ -1,6 +1,7 @@
 use crate::{
     api::{CallTypeApi, StorageWriteApi},
     contract_base::SendRawWrapper,
+    proxy_imports::{ExplicitGas, ManagedBuffer, TxGasValue},
     types::{
         CallbackClosure, OriginalResultMarker, Tx, TxData, TxDataFunctionCall,
         TxEmptyResultHandler, TxEnv, TxFrom, TxGas, TxPayment, TxResultHandler, TxScEnv, TxTo,
diff --git a/framework/base/src/types/interaction/tx_exec/tx_exec_async_promises.rs b/framework/base/src/types/interaction/tx_exec/tx_exec_async_promises.rs
index 48bf520b05..c795a4385b 100644
--- a/framework/base/src/types/interaction/tx_exec/tx_exec_async_promises.rs
+++ b/framework/base/src/types/interaction/tx_exec/tx_exec_async_promises.rs
@@ -1,6 +1,7 @@
 use crate::{
     api::{const_handles, CallTypeApi},
     contract_base::SendRawWrapper,
+    proxy_imports::GasLeft,
     types::{
         interaction::callback_closure::CallbackClosureWithGas, CallbackClosure, ExplicitGas,
         FunctionCall, ManagedBuffer, ManagedType, OriginalResultMarker, Tx, TxGas, TxGasValue,
@@ -53,6 +54,24 @@ where
     }
 }
 
+impl<Api> TxPromisesCallback<Api> for CallbackClosure<Api>
+where
+    Api: CallTypeApi,
+{
+    fn callback_name(&self) -> &'static str {
+        self.callback_name
+    }
+
+    fn overwrite_with_serialized_args(&self, cb_closure_args_serialized: &mut ManagedBuffer<Api>) {
+        self.closure_args
+            .serialize_overwrite(cb_closure_args_serialized);
+    }
+
+    fn gas_for_callback(&self) -> u64 {
+        0u64
+    }
+}
+
 impl<Api> TxResultHandler<TxScEnv<Api>> for CallbackClosureWithGas<Api>
 where
     Api: CallTypeApi,
diff --git a/framework/base/src/types/interaction/tx_payment/tx_payment_egld_or_multi_esdt.rs b/framework/base/src/types/interaction/tx_payment/tx_payment_egld_or_multi_esdt.rs
index 3ed53b9b8a..703166a601 100644
--- a/framework/base/src/types/interaction/tx_payment/tx_payment_egld_or_multi_esdt.rs
+++ b/framework/base/src/types/interaction/tx_payment/tx_payment_egld_or_multi_esdt.rs
@@ -72,3 +72,63 @@ where
         }
     }
 }
+
+impl<Env> TxPayment<Env> for &EgldOrMultiEsdtPayment<Env::Api>
+where
+    Env: TxEnv,
+{
+    fn is_no_payment(&self, _env: &Env) -> bool {
+        self.is_empty()
+    }
+
+    fn perform_transfer_execute(
+        self,
+        env: &Env,
+        to: &ManagedAddress<Env::Api>,
+        gas_limit: u64,
+        fc: FunctionCall<Env::Api>,
+    ) {
+        match self {
+            EgldOrMultiEsdtPayment::Egld(egld_amount) => {
+                Egld(egld_amount).perform_transfer_execute(env, to, gas_limit, fc)
+            },
+            EgldOrMultiEsdtPayment::MultiEsdt(multi_esdt_payment) => {
+                multi_esdt_payment.perform_transfer_execute(env, to, gas_limit, fc)
+            },
+        }
+    }
+
+    fn with_normalized<From, To, F, R>(
+        self,
+        env: &Env,
+        from: &From,
+        to: To,
+        fc: FunctionCall<Env::Api>,
+        f: F,
+    ) -> R
+    where
+        From: TxFrom<Env>,
+        To: TxToSpecified<Env>,
+        F: FnOnce(&ManagedAddress<Env::Api>, &BigUint<Env::Api>, &FunctionCall<Env::Api>) -> R,
+    {
+        match self {
+            EgldOrMultiEsdtPayment::Egld(egld_amount) => {
+                Egld(egld_amount).with_normalized(env, from, to, fc, f)
+            },
+            EgldOrMultiEsdtPayment::MultiEsdt(multi_esdt_payment) => {
+                multi_esdt_payment.with_normalized(env, from, to, fc, f)
+            },
+        }
+    }
+
+    fn into_full_payment_data(self, env: &Env) -> FullPaymentData<Env::Api> {
+        match self {
+            EgldOrMultiEsdtPayment::Egld(egld_amount) => {
+                TxPayment::<Env>::into_full_payment_data(Egld(egld_amount), env)
+            },
+            EgldOrMultiEsdtPayment::MultiEsdt(multi_esdt_payment) => {
+                TxPayment::<Env>::into_full_payment_data(multi_esdt_payment, env)
+            },
+        }
+    }
+}

From 3c9fbeae062382b70eb9823705e0da0411e3b1a8 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Thu, 4 Apr 2024 11:50:13 +0300
Subject: [PATCH 0638/1254] crypto kitties migration - remove struct from
 crypto zombies

---
 Cargo.lock                                    |  2 +
 contracts/examples/crypto-zombies/Cargo.toml  |  8 +++
 .../src/kitty_ownership_proxy.rs              | 50 ++++---------------
 .../crypto-zombies/src/zombie_feeding.rs      | 15 ++++--
 .../examples/crypto-zombies/wasm/Cargo.lock   | 23 +++++++--
 5 files changed, 52 insertions(+), 46 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 9fd01b92b0..07c87be825 100755
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -623,8 +623,10 @@ dependencies = [
 name = "crypto-zombies"
 version = "0.0.0"
 dependencies = [
+ "kitty",
  "multiversx-sc",
  "multiversx-sc-scenario",
+ "random",
 ]
 
 [[package]]
diff --git a/contracts/examples/crypto-zombies/Cargo.toml b/contracts/examples/crypto-zombies/Cargo.toml
index 7cb4431e16..31343fd127 100644
--- a/contracts/examples/crypto-zombies/Cargo.toml
+++ b/contracts/examples/crypto-zombies/Cargo.toml
@@ -15,3 +15,11 @@ path = "../../../framework/base"
 [dev-dependencies.multiversx-sc-scenario]
 version = "0.48.0-alpha.1"
 path = "../../../framework/scenario"
+
+[dependencies.kitty]
+version = "0.0.0"
+path = "../crypto-kitties/common/kitty"
+
+[dependencies.random]
+version = "0.0.0"
+path = "../crypto-kitties/common/random"
diff --git a/contracts/examples/crypto-zombies/src/kitty_ownership_proxy.rs b/contracts/examples/crypto-zombies/src/kitty_ownership_proxy.rs
index 41b707e2be..e43a200ce2 100644
--- a/contracts/examples/crypto-zombies/src/kitty_ownership_proxy.rs
+++ b/contracts/examples/crypto-zombies/src/kitty_ownership_proxy.rs
@@ -1,3 +1,12 @@
+// Code generated by the multiversx-sc proxy generator. DO NOT EDIT.
+
+////////////////////////////////////////////////////
+////////////////// AUTO-GENERATED //////////////////
+////////////////////////////////////////////////////
+
+#![allow(dead_code)]
+#![allow(clippy::all)]
+
 use multiversx_sc::proxy_imports::*;
 
 pub struct KittyOwnershipProxy;
@@ -232,7 +241,7 @@ where
     >(
         self,
         kitty_id: Arg0,
-    ) -> TxProxyCall<Env, From, To, Gas, Kitty> {
+    ) -> TxProxyCall<Env, From, To, Gas, kitty::Kitty> {
         self.wrapped_tx
             .raw_call("getKittyById")
             .argument(&kitty_id)
@@ -328,42 +337,3 @@ where
             .original_result()
     }
 }
-
-#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
-pub struct Kitty {
-    pub genes: KittyGenes,
-    pub birth_time: u64,
-    pub cooldown_end: u64,
-    pub matron_id: u32,
-    pub sire_id: u32,
-    pub siring_with_id: u32,
-    pub nr_children: u16,
-    pub generation: u16,
-}
-
-#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, Clone, Default)]
-pub struct KittyGenes {
-    pub fur_color: Color,
-    pub eye_color: Color,
-    pub meow_power: u8,
-}
-
-#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, Clone, Default)]
-pub struct Color {
-    pub r: u8,
-    pub g: u8,
-    pub b: u8,
-}
-
-impl KittyGenes {
-    pub fn get_as_u64(&self) -> u64 {
-        (self.fur_color.as_u64() << 12 | self.eye_color.as_u64()) << 4
-            | self.meow_power.to_be() as u64
-    }
-}
-
-impl Color {
-    pub fn as_u64(&self) -> u64 {
-        ((self.r.to_be() as u64) << 4 | self.r.to_be() as u64) << 4 | self.r.to_be() as u64
-    }
-}
diff --git a/contracts/examples/crypto-zombies/src/zombie_feeding.rs b/contracts/examples/crypto-zombies/src/zombie_feeding.rs
index 7de7f4a41e..716460e086 100644
--- a/contracts/examples/crypto-zombies/src/zombie_feeding.rs
+++ b/contracts/examples/crypto-zombies/src/zombie_feeding.rs
@@ -1,10 +1,19 @@
 use multiversx_sc::imports::*;
 
 use crate::{
-    kitty_ownership_proxy::{self, Kitty},
+    kitty_ownership_proxy::{self},
     storage, zombie_factory, zombie_helper,
 };
 
+pub fn get_as_u64(kitty_genes: kitty::kitty_genes::KittyGenes) -> u64 {
+    (as_u64(kitty_genes.fur_color) << 12 | as_u64(kitty_genes.eye_color)) << 4
+        | kitty_genes.meow_power.to_be() as u64
+}
+
+pub fn as_u64(color: kitty::color::Color) -> u64 {
+    ((color.r.to_be() as u64) << 4 | color.r.to_be() as u64) << 4 | color.r.to_be() as u64
+}
+
 #[multiversx_sc::module]
 pub trait ZombieFeeding:
     storage::Storage + zombie_factory::ZombieFactory + zombie_helper::ZombieHelper
@@ -41,12 +50,12 @@ pub trait ZombieFeeding:
     #[callback]
     fn get_kitty_callback(
         &self,
-        #[call_result] result: ManagedAsyncCallResult<Kitty>,
+        #[call_result] result: ManagedAsyncCallResult<kitty::Kitty>,
         zombie_id: usize,
     ) {
         match result {
             ManagedAsyncCallResult::Ok(kitty) => {
-                let kitty_dna = kitty.genes.get_as_u64();
+                let kitty_dna = get_as_u64(kitty.genes);
                 self.feed_and_multiply(zombie_id, kitty_dna, ManagedBuffer::from(b"kitty"));
             },
             ManagedAsyncCallResult::Err(_) => {},
diff --git a/contracts/examples/crypto-zombies/wasm/Cargo.lock b/contracts/examples/crypto-zombies/wasm/Cargo.lock
index 9052befd7e..6e2bf1a6ea 100755
--- a/contracts/examples/crypto-zombies/wasm/Cargo.lock
+++ b/contracts/examples/crypto-zombies/wasm/Cargo.lock
@@ -24,7 +24,9 @@ checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
 name = "crypto-zombies"
 version = "0.0.0"
 dependencies = [
+ "kitty",
  "multiversx-sc",
+ "random",
 ]
 
 [[package]]
@@ -53,9 +55,17 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
+[[package]]
+name = "kitty"
+version = "0.0.0"
+dependencies = [
+ "multiversx-sc",
+ "random",
+]
+
 [[package]]
 name = "multiversx-sc"
-version = "0.47.8"
+version = "0.48.0-alpha.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.8"
+version = "0.48.0-alpha.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.8"
+version = "0.48.0-alpha.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -146,6 +156,13 @@ dependencies = [
  "nibble_vec",
 ]
 
+[[package]]
+name = "random"
+version = "0.0.0"
+dependencies = [
+ "multiversx-sc",
+]
+
 [[package]]
 name = "smallvec"
 version = "1.13.2"

From dc44d5cdf67aedc726d72a41376b17b10a06ecc8 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Thu, 4 Apr 2024 12:18:21 +0300
Subject: [PATCH 0639/1254] crypto kitties migration - changed dependencies'
 path in crypto zombies

---
 contracts/examples/crypto-zombies/Cargo.toml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/contracts/examples/crypto-zombies/Cargo.toml b/contracts/examples/crypto-zombies/Cargo.toml
index 31343fd127..e900f23cb8 100644
--- a/contracts/examples/crypto-zombies/Cargo.toml
+++ b/contracts/examples/crypto-zombies/Cargo.toml
@@ -18,8 +18,8 @@ path = "../../../framework/scenario"
 
 [dependencies.kitty]
 version = "0.0.0"
-path = "../crypto-kitties/common/kitty"
+path = "../../../contracts/examples/crypto-kitties/common/kitty"
 
 [dependencies.random]
 version = "0.0.0"
-path = "../crypto-kitties/common/random"
+path = "../../../contracts/examples/crypto-kitties/common/random"

From a9c59253bcbe5e05258505febf44a4dc8efdc8fb Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 4 Apr 2024 14:17:49 +0300
Subject: [PATCH 0640/1254] crypto kitties path cleanup

---
 .../crypto-kitties/common/kitty/src/kitty.rs  | 89 +++++++++++++++++
 .../crypto-kitties/common/kitty/src/lib.rs    | 98 ++-----------------
 .../kitty-genetic-alg/src/lib.rs              |  2 +-
 .../src/kitty_genetic_alg_proxy.rs            |  2 +-
 .../crypto-kitties/kitty-ownership/src/lib.rs |  2 +-
 .../crypto-zombies/src/zombie_feeding.rs      |  4 +-
 6 files changed, 100 insertions(+), 97 deletions(-)
 create mode 100644 contracts/examples/crypto-kitties/common/kitty/src/kitty.rs

diff --git a/contracts/examples/crypto-kitties/common/kitty/src/kitty.rs b/contracts/examples/crypto-kitties/common/kitty/src/kitty.rs
new file mode 100644
index 0000000000..d234cac9f6
--- /dev/null
+++ b/contracts/examples/crypto-kitties/common/kitty/src/kitty.rs
@@ -0,0 +1,89 @@
+use crate::{Color, KittyGenes};
+
+use multiversx_sc::derive_imports::*;
+
+const SECONDS_PER_MINUTE: u64 = 60;
+const MAX_COOLDOWN: u64 = 60 * 60 * 24 * 7; // 7 days
+const MAX_TIREDNESS: u16 = 20;
+
+#[type_abi]
+#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
+pub struct Kitty {
+    pub genes: KittyGenes,
+    pub birth_time: u64,   // timestamp
+    pub cooldown_end: u64, // timestamp, used for pregnancy timer and siring cooldown
+    pub matron_id: u32,
+    pub sire_id: u32,
+    pub siring_with_id: u32, // for pregnant cats, 0 otherwise
+    pub nr_children: u16,    // cooldown period increases exponentially with every breeding/siring
+    pub generation: u16,     // max(sire_gen, matron_gen) + 1. Generation also influences cooldown.
+}
+
+impl Kitty {
+    pub fn new(
+        genes: KittyGenes,
+        birth_time: u64,
+        matron_id: u32,
+        sire_id: u32,
+        generation: u16,
+    ) -> Self {
+        Kitty {
+            genes,
+            birth_time,
+            cooldown_end: 0,
+            matron_id,
+            sire_id,
+            siring_with_id: 0,
+            nr_children: 0,
+            generation,
+        }
+    }
+}
+
+impl Kitty {
+    pub fn get_next_cooldown_time(&self) -> u64 {
+        let tiredness = self.nr_children + self.generation / 2;
+        if tiredness > MAX_TIREDNESS {
+            return MAX_COOLDOWN;
+        }
+
+        let cooldown = SECONDS_PER_MINUTE << tiredness; // 2^(tiredness) minutes
+        if cooldown > MAX_COOLDOWN {
+            MAX_COOLDOWN
+        } else {
+            cooldown
+        }
+    }
+
+    pub fn get_fur_color(&self) -> Color {
+        self.genes.fur_color.clone()
+    }
+
+    pub fn get_eye_color(&self) -> Color {
+        self.genes.eye_color.clone()
+    }
+
+    pub fn get_meow_power(&self) -> u8 {
+        self.genes.meow_power
+    }
+
+    pub fn is_pregnant(&self) -> bool {
+        self.siring_with_id != 0
+    }
+}
+
+// The default Kitty, which is not a valid kitty. Used for Kitty with ID 0
+impl Default for Kitty {
+    fn default() -> Self {
+        Kitty {
+            genes: KittyGenes::default(),
+            birth_time: 0,
+            cooldown_end: u64::MAX,
+            matron_id: 0,
+            sire_id: 0,
+            siring_with_id: 0,
+            nr_children: 0,
+            generation: 0,
+        }
+    }
+}
diff --git a/contracts/examples/crypto-kitties/common/kitty/src/lib.rs b/contracts/examples/crypto-kitties/common/kitty/src/lib.rs
index 1a9a0ec436..863944215c 100644
--- a/contracts/examples/crypto-kitties/common/kitty/src/lib.rs
+++ b/contracts/examples/crypto-kitties/common/kitty/src/lib.rs
@@ -1,95 +1,9 @@
 #![no_std]
 
-use multiversx_sc::derive_imports::*;
+mod color;
+mod kitty;
+mod kitty_genes;
 
-const SECONDS_PER_MINUTE: u64 = 60;
-const MAX_COOLDOWN: u64 = 60 * 60 * 24 * 7; // 7 days
-const MAX_TIREDNESS: u16 = 20;
-
-pub mod color;
-pub mod kitty_genes;
-
-use color::*;
-use kitty_genes::*;
-
-#[type_abi]
-#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
-pub struct Kitty {
-    pub genes: KittyGenes,
-    pub birth_time: u64,   // timestamp
-    pub cooldown_end: u64, // timestamp, used for pregnancy timer and siring cooldown
-    pub matron_id: u32,
-    pub sire_id: u32,
-    pub siring_with_id: u32, // for pregnant cats, 0 otherwise
-    pub nr_children: u16,    // cooldown period increases exponentially with every breeding/siring
-    pub generation: u16,     // max(sire_gen, matron_gen) + 1. Generation also influences cooldown.
-}
-
-impl Kitty {
-    pub fn new(
-        genes: KittyGenes,
-        birth_time: u64,
-        matron_id: u32,
-        sire_id: u32,
-        generation: u16,
-    ) -> Self {
-        Kitty {
-            genes,
-            birth_time,
-            cooldown_end: 0,
-            matron_id,
-            sire_id,
-            siring_with_id: 0,
-            nr_children: 0,
-            generation,
-        }
-    }
-}
-
-impl Kitty {
-    pub fn get_next_cooldown_time(&self) -> u64 {
-        let tiredness = self.nr_children + self.generation / 2;
-        if tiredness > MAX_TIREDNESS {
-            return MAX_COOLDOWN;
-        }
-
-        let cooldown = SECONDS_PER_MINUTE << tiredness; // 2^(tiredness) minutes
-        if cooldown > MAX_COOLDOWN {
-            MAX_COOLDOWN
-        } else {
-            cooldown
-        }
-    }
-
-    pub fn get_fur_color(&self) -> Color {
-        self.genes.fur_color.clone()
-    }
-
-    pub fn get_eye_color(&self) -> Color {
-        self.genes.eye_color.clone()
-    }
-
-    pub fn get_meow_power(&self) -> u8 {
-        self.genes.meow_power
-    }
-
-    pub fn is_pregnant(&self) -> bool {
-        self.siring_with_id != 0
-    }
-}
-
-// The default Kitty, which is not a valid kitty. Used for Kitty with ID 0
-impl Default for Kitty {
-    fn default() -> Self {
-        Kitty {
-            genes: KittyGenes::default(),
-            birth_time: 0,
-            cooldown_end: u64::MAX,
-            matron_id: 0,
-            sire_id: 0,
-            siring_with_id: 0,
-            nr_children: 0,
-            generation: 0,
-        }
-    }
-}
+pub use color::Color;
+pub use kitty::Kitty;
+pub use kitty_genes::KittyGenes;
diff --git a/contracts/examples/crypto-kitties/kitty-genetic-alg/src/lib.rs b/contracts/examples/crypto-kitties/kitty-genetic-alg/src/lib.rs
index aab6154cec..adc555585a 100644
--- a/contracts/examples/crypto-kitties/kitty-genetic-alg/src/lib.rs
+++ b/contracts/examples/crypto-kitties/kitty-genetic-alg/src/lib.rs
@@ -1,6 +1,6 @@
 #![no_std]
 
-use kitty::{kitty_genes::*, Kitty};
+use kitty::{Kitty, KittyGenes};
 use random::Random;
 
 #[multiversx_sc::contract]
diff --git a/contracts/examples/crypto-kitties/kitty-ownership/src/kitty_genetic_alg_proxy.rs b/contracts/examples/crypto-kitties/kitty-ownership/src/kitty_genetic_alg_proxy.rs
index 564481a7d3..53f3409e9f 100644
--- a/contracts/examples/crypto-kitties/kitty-ownership/src/kitty_genetic_alg_proxy.rs
+++ b/contracts/examples/crypto-kitties/kitty-ownership/src/kitty_genetic_alg_proxy.rs
@@ -68,7 +68,7 @@ where
         self,
         matron: Arg0,
         sire: Arg1,
-    ) -> TxProxyCall<Env, From, To, Gas, kitty::kitty_genes::KittyGenes> {
+    ) -> TxProxyCall<Env, From, To, Gas, kitty::KittyGenes> {
         self.wrapped_tx
             .raw_call("generateKittyGenes")
             .argument(&matron)
diff --git a/contracts/examples/crypto-kitties/kitty-ownership/src/lib.rs b/contracts/examples/crypto-kitties/kitty-ownership/src/lib.rs
index 730f6a3d0f..27f7474945 100644
--- a/contracts/examples/crypto-kitties/kitty-ownership/src/lib.rs
+++ b/contracts/examples/crypto-kitties/kitty-ownership/src/lib.rs
@@ -2,7 +2,7 @@
 #![allow(clippy::suspicious_operation_groupings)]
 
 pub mod kitty_genetic_alg_proxy;
-use kitty::{kitty_genes::KittyGenes, Kitty};
+use kitty::{Kitty, KittyGenes};
 use multiversx_sc::imports::*;
 
 use core::cmp::max;
diff --git a/contracts/examples/crypto-zombies/src/zombie_feeding.rs b/contracts/examples/crypto-zombies/src/zombie_feeding.rs
index 716460e086..c910aa412a 100644
--- a/contracts/examples/crypto-zombies/src/zombie_feeding.rs
+++ b/contracts/examples/crypto-zombies/src/zombie_feeding.rs
@@ -5,12 +5,12 @@ use crate::{
     storage, zombie_factory, zombie_helper,
 };
 
-pub fn get_as_u64(kitty_genes: kitty::kitty_genes::KittyGenes) -> u64 {
+pub fn get_as_u64(kitty_genes: kitty::KittyGenes) -> u64 {
     (as_u64(kitty_genes.fur_color) << 12 | as_u64(kitty_genes.eye_color)) << 4
         | kitty_genes.meow_power.to_be() as u64
 }
 
-pub fn as_u64(color: kitty::color::Color) -> u64 {
+pub fn as_u64(color: kitty::Color) -> u64 {
     ((color.r.to_be() as u64) << 4 | color.r.to_be() as u64) << 4 | color.r.to_be() as u64
 }
 

From fff4015ecc4742995e0b097fa500ac38d615677c Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Thu, 4 Apr 2024 13:23:29 +0200
Subject: [PATCH 0641/1254] returns new managed address result handler

---
 .../adder/interact/src/basic_interact.rs      |  4 +-
 .../interact/src/multisig_interact.rs         |  4 +-
 .../feature-tests/abi-tester/src/abi_proxy.rs | 64 ++++++-------------
 .../parent/src/lib.rs                         |  2 +-
 .../src/forwarder_raw_deploy_upgrade.rs       |  4 +-
 .../forwarder/src/contract_deploy.rs          |  4 +-
 .../proxy-test-first/src/proxy-test-first.rs  |  2 +-
 .../types/interaction/tx_result_handler.rs    |  2 +
 .../tx_result_handler/returns_new_address.rs  | 12 ++--
 .../returns_new_managed_address.rs            | 23 +++++++
 .../src/facade/world_tx/scenario_rh_impl.rs   | 19 +++++-
 11 files changed, 80 insertions(+), 60 deletions(-)
 create mode 100644 framework/base/src/types/interaction/tx_result_handler/returns_new_managed_address.rs

diff --git a/contracts/examples/adder/interact/src/basic_interact.rs b/contracts/examples/adder/interact/src/basic_interact.rs
index 9179796675..6f3d8dbb07 100644
--- a/contracts/examples/adder/interact/src/basic_interact.rs
+++ b/contracts/examples/adder/interact/src/basic_interact.rs
@@ -119,7 +119,7 @@ impl AdderInteract {
             .run()
             .await;
 
-        let new_address_bech32 = bech32::encode(&new_address.to_address());
+        let new_address_bech32 = bech32::encode(&new_address);
         println!("new address: {new_address_bech32}");
 
         let new_address_expr = format!("bech32:{new_address_bech32}");
@@ -149,7 +149,7 @@ impl AdderInteract {
 
         let results = buffer.run().await;
         for result in results {
-            let new_address_bech32 = bech32::encode(&result.to_address());
+            let new_address_bech32 = bech32::encode(&result);
             println!("new address: {new_address_bech32}");
 
             let new_address_expr = format!("bech32:{new_address_bech32}");
diff --git a/contracts/examples/multisig/interact/src/multisig_interact.rs b/contracts/examples/multisig/interact/src/multisig_interact.rs
index 9dc46fdf44..d80ab639f7 100644
--- a/contracts/examples/multisig/interact/src/multisig_interact.rs
+++ b/contracts/examples/multisig/interact/src/multisig_interact.rs
@@ -174,7 +174,7 @@ impl MultisigInteract {
             .run()
             .await;
 
-        let new_address_bech32 = bech32::encode(&new_address.to_address());
+        let new_address_bech32 = bech32::encode(&new_address);
         println!("new address: {new_address_bech32}");
 
         let new_address_expr = format!("bech32:{new_address_bech32}");
@@ -205,7 +205,7 @@ impl MultisigInteract {
 
         let results = buffer.run().await;
         for result in results {
-            let new_address_bech32 = bech32::encode(&result.to_address());
+            let new_address_bech32 = bech32::encode(&result);
             println!("new address: {new_address_bech32}");
 
             let new_address_expr = format!("bech32:{new_address_bech32}");
diff --git a/contracts/feature-tests/abi-tester/src/abi_proxy.rs b/contracts/feature-tests/abi-tester/src/abi_proxy.rs
index 1f860018b5..b6547d3385 100644
--- a/contracts/feature-tests/abi-tester/src/abi_proxy.rs
+++ b/contracts/feature-tests/abi-tester/src/abi_proxy.rs
@@ -402,8 +402,7 @@ pub struct AbiTestType {
 }
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
-pub struct OnlyShowsUpAsNested01 {
-}
+pub struct OnlyShowsUpAsNested01 {}
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct OnlyShowsUpAsNested02 {
@@ -415,19 +414,14 @@ pub enum AbiEnum {
     Nothing,
     Something(i32),
     SomethingMore(u8, OnlyShowsUpAsNested08),
-    SomeStruct {
-        a: u16,
-        b: OnlyShowsUpAsNested09,
-    },
+    SomeStruct { a: u16, b: OnlyShowsUpAsNested09 },
 }
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
-pub struct OnlyShowsUpAsNested08 {
-}
+pub struct OnlyShowsUpAsNested08 {}
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
-pub struct OnlyShowsUpAsNested09 {
-}
+pub struct OnlyShowsUpAsNested09 {}
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct AbiManagedType<Api>
@@ -440,36 +434,28 @@ where
 }
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
-pub struct OnlyShowsUpAsNested03 {
-}
+pub struct OnlyShowsUpAsNested03 {}
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
-pub struct OnlyShowsUpAsNested04 {
-}
+pub struct OnlyShowsUpAsNested04 {}
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
-pub struct OnlyShowsUpAsNested05 {
-}
+pub struct OnlyShowsUpAsNested05 {}
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
-pub struct OnlyShowsUpAsNested06 {
-}
+pub struct OnlyShowsUpAsNested06 {}
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
-pub struct OnlyShowsUpAsNested07 {
-}
+pub struct OnlyShowsUpAsNested07 {}
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
-pub struct OnlyShowsUpAsNestedInSingleValueMapper {
-}
+pub struct OnlyShowsUpAsNestedInSingleValueMapper {}
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
-pub struct OnlyShowsUpAsNestedInVec {
-}
+pub struct OnlyShowsUpAsNestedInVec {}
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
-pub struct OnlyShowsUpAsNestedInArrayVec {
-}
+pub struct OnlyShowsUpAsNestedInArrayVec {}
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, ManagedVecItem)]
 pub struct AbiManagedVecItem {
@@ -478,28 +464,22 @@ pub struct AbiManagedVecItem {
 }
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
-pub struct OnlyShowsUpAsNestedInArray {
-}
+pub struct OnlyShowsUpAsNestedInArray {}
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
-pub struct OnlyShowsUpAsNestedInBox {
-}
+pub struct OnlyShowsUpAsNestedInBox {}
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
-pub struct OnlyShowsUpAsNestedInBoxedSlice {
-}
+pub struct OnlyShowsUpAsNestedInBoxedSlice {}
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
-pub struct OnlyShowsUpAsNestedInRef {
-}
+pub struct OnlyShowsUpAsNestedInRef {}
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
-pub struct OnlyShowsUpAsNestedInSlice {
-}
+pub struct OnlyShowsUpAsNestedInSlice {}
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
-pub struct OnlyShowsUpAsNestedInOption {
-}
+pub struct OnlyShowsUpAsNestedInOption {}
 
 #[derive(TopEncode, TopDecode)]
 pub struct OnlyShowsUpInEsdtAttr {
@@ -507,8 +487,7 @@ pub struct OnlyShowsUpInEsdtAttr {
 }
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
-pub struct OnlyShowsUpAsNested10 {
-}
+pub struct OnlyShowsUpAsNested10 {}
 
 #[derive(TopEncode, TopDecode)]
 pub enum ExplicitDiscriminant {
@@ -525,8 +504,5 @@ pub enum ExplicitDiscriminantMixed {
     Unit,
     Tuple(u16),
     Five,
-    Struct {
-        a: u8,
-        b: u16,
-    },
+    Struct { a: u8, b: u16 },
 }
diff --git a/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/parent/src/lib.rs b/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/parent/src/lib.rs
index f334c393f6..d9dfe79d0e 100644
--- a/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/parent/src/lib.rs
+++ b/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/parent/src/lib.rs
@@ -24,7 +24,7 @@ pub trait Parent {
             .raw_deploy()
             .code(code)
             .with_gas_limit(gas_left)
-            .returns(ReturnsNewAddress)
+            .returns(ReturnsNewManagedAddress)
             .sync_call();
 
         self.child_contract_address().set(&child_contract_address);
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 acd385db2c..b57ac773e2 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
@@ -15,7 +15,7 @@ pub trait ForwarderRawDeployUpgrade {
             .code_metadata(code_metadata)
             .arguments_raw(args.to_arg_buffer())
             .with_gas_limit(self.blockchain().get_gas_left())
-            .returns(ReturnsNewAddress)
+            .returns(ReturnsNewManagedAddress)
             .returns(ReturnsRawResult)
             .sync_call()
             .into()
@@ -34,7 +34,7 @@ pub trait ForwarderRawDeployUpgrade {
             .code_metadata(code_metadata)
             .arguments_raw(args.to_arg_buffer())
             .with_gas_limit(self.blockchain().get_gas_left())
-            .returns(ReturnsNewAddress)
+            .returns(ReturnsNewManagedAddress)
             .sync_call()
     }
 
diff --git a/contracts/feature-tests/composability/forwarder/src/contract_deploy.rs b/contracts/feature-tests/composability/forwarder/src/contract_deploy.rs
index 30bc967665..7145f2555a 100644
--- a/contracts/feature-tests/composability/forwarder/src/contract_deploy.rs
+++ b/contracts/feature-tests/composability/forwarder/src/contract_deploy.rs
@@ -39,7 +39,7 @@ pub trait DeployContractModule {
             .typed(vault_proxy::VaultProxy)
             .init(opt_arg)
             .code(code.clone())
-            .returns(ReturnsNewAddress)
+            .returns(ReturnsNewManagedAddress)
             .returns(ReturnsResult)
             .sync_call()
     }
@@ -55,7 +55,7 @@ pub trait DeployContractModule {
             .init(opt_arg)
             .code_metadata(CodeMetadata::DEFAULT)
             .from_source(source_address)
-            .returns(ReturnsNewAddress)
+            .returns(ReturnsNewManagedAddress)
             .returns(ReturnsResult)
             .sync_call()
             .into()
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 58a2dd2684..bc3d648b56 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
@@ -37,7 +37,7 @@ pub trait ProxyTestFirst {
             .init(123)
             .code(code)
             .code_metadata(CodeMetadata::UPGRADEABLE)
-            .returns(ReturnsNewAddress)
+            .returns(ReturnsNewManagedAddress)
             .returns(ReturnsResult)
             .egld(payment)
             .sync_call();
diff --git a/framework/base/src/types/interaction/tx_result_handler.rs b/framework/base/src/types/interaction/tx_result_handler.rs
index 754c339931..4bfddb56a4 100644
--- a/framework/base/src/types/interaction/tx_result_handler.rs
+++ b/framework/base/src/types/interaction/tx_result_handler.rs
@@ -1,5 +1,6 @@
 mod returns_bt;
 mod returns_new_address;
+mod returns_new_managed_address;
 mod returns_raw_result;
 mod returns_result;
 mod returns_result_conv;
@@ -10,6 +11,7 @@ mod with_result_conv;
 
 pub use returns_bt::*;
 pub use returns_new_address::*;
+pub use returns_new_managed_address::*;
 pub use returns_raw_result::*;
 pub use returns_result::*;
 pub use returns_result_conv::*;
diff --git a/framework/base/src/types/interaction/tx_result_handler/returns_new_address.rs b/framework/base/src/types/interaction/tx_result_handler/returns_new_address.rs
index 89854b906a..1f22c48e85 100644
--- a/framework/base/src/types/interaction/tx_result_handler/returns_new_address.rs
+++ b/framework/base/src/types/interaction/tx_result_handler/returns_new_address.rs
@@ -1,5 +1,9 @@
-use crate::types::{
-    DeployRawResult, ManagedAddress, ManagedBuffer, ManagedVec, RHListItem, RHListItemExec, TxEnv,
+use crate::{
+    proxy_imports::Address,
+    types::{
+        DeployRawResult, ManagedAddress, ManagedBuffer, ManagedVec, RHListItem, RHListItemExec,
+        TxEnv,
+    },
 };
 
 /// Indicates that the newly deployed address will be returned after a deploy.
@@ -9,7 +13,7 @@ impl<Env, Original> RHListItem<Env, Original> for ReturnsNewAddress
 where
     Env: TxEnv,
 {
-    type Returns = ManagedAddress<Env::Api>;
+    type Returns = Address;
 }
 
 impl<Env, Original> RHListItemExec<DeployRawResult<Env::Api>, Env, Original> for ReturnsNewAddress
@@ -17,6 +21,6 @@ where
     Env: TxEnv,
 {
     fn item_process_result(self, raw_result: &DeployRawResult<Env::Api>) -> Self::Returns {
-        raw_result.new_address.clone()
+        raw_result.new_address.to_address()
     }
 }
diff --git a/framework/base/src/types/interaction/tx_result_handler/returns_new_managed_address.rs b/framework/base/src/types/interaction/tx_result_handler/returns_new_managed_address.rs
new file mode 100644
index 0000000000..04f923fef2
--- /dev/null
+++ b/framework/base/src/types/interaction/tx_result_handler/returns_new_managed_address.rs
@@ -0,0 +1,23 @@
+use crate::types::{
+    DeployRawResult, ManagedAddress, ManagedBuffer, ManagedVec, RHListItem, RHListItemExec, TxEnv,
+};
+
+/// Indicates that the newly deployed address will be returned after a deploy as a ManagedAddress.
+pub struct ReturnsNewManagedAddress;
+
+impl<Env, Original> RHListItem<Env, Original> for ReturnsNewManagedAddress
+where
+    Env: TxEnv,
+{
+    type Returns = ManagedAddress<Env::Api>;
+}
+
+impl<Env, Original> RHListItemExec<DeployRawResult<Env::Api>, Env, Original>
+    for ReturnsNewManagedAddress
+where
+    Env: TxEnv,
+{
+    fn item_process_result(self, raw_result: &DeployRawResult<Env::Api>) -> Self::Returns {
+        raw_result.new_address.clone()
+    }
+}
diff --git a/framework/scenario/src/facade/world_tx/scenario_rh_impl.rs b/framework/scenario/src/facade/world_tx/scenario_rh_impl.rs
index 19d5e3a9a8..db41e10b75 100644
--- a/framework/scenario/src/facade/world_tx/scenario_rh_impl.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_rh_impl.rs
@@ -1,8 +1,9 @@
 use multiversx_sc::{
     codec::{CodecFrom, TopDecodeMulti, TopEncodeMulti},
     types::{
-        ManagedAddress, RHList, RHListItem, RHListItemExec, ReturnsNewAddress, ReturnsResult,
-        ReturnsResultConv, TxEnv, WithNewAddress, WithResultConv,
+        ManagedAddress, RHList, RHListItem, RHListItemExec, ReturnsNewAddress,
+        ReturnsNewManagedAddress, ReturnsResult, ReturnsResultConv, TxEnv, WithNewAddress,
+        WithResultConv,
     },
 };
 
@@ -57,6 +58,20 @@ where
 }
 
 impl<Env, Original> RHListItemExec<TxResponse, Env, Original> for ReturnsNewAddress
+where
+    Env: TxEnv,
+{
+    fn item_process_result(self, tx_response: &TxResponse) -> Self::Returns {
+        let new_address = tx_response
+            .new_deployed_address
+            .clone()
+            .expect("missing returned address");
+
+        new_address
+    }
+}
+
+impl<Env, Original> RHListItemExec<TxResponse, Env, Original> for ReturnsNewManagedAddress
 where
     Env: TxEnv,
 {

From 6a16d24dfdc86deb481ab5f91889a29a474f4d85 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Thu, 4 Apr 2024 13:39:01 +0200
Subject: [PATCH 0642/1254] clippy and import fix

---
 .../interaction/tx_result_handler/returns_new_address.rs | 9 +++------
 .../scenario/src/facade/world_tx/scenario_rh_impl.rs     | 6 ++----
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/framework/base/src/types/interaction/tx_result_handler/returns_new_address.rs b/framework/base/src/types/interaction/tx_result_handler/returns_new_address.rs
index 1f22c48e85..6e73ecf1d1 100644
--- a/framework/base/src/types/interaction/tx_result_handler/returns_new_address.rs
+++ b/framework/base/src/types/interaction/tx_result_handler/returns_new_address.rs
@@ -1,9 +1,6 @@
-use crate::{
-    proxy_imports::Address,
-    types::{
-        DeployRawResult, ManagedAddress, ManagedBuffer, ManagedVec, RHListItem, RHListItemExec,
-        TxEnv,
-    },
+use crate::types::{
+    heap::Address, DeployRawResult, ManagedAddress, ManagedBuffer, ManagedVec, RHListItem,
+    RHListItemExec, TxEnv,
 };
 
 /// Indicates that the newly deployed address will be returned after a deploy.
diff --git a/framework/scenario/src/facade/world_tx/scenario_rh_impl.rs b/framework/scenario/src/facade/world_tx/scenario_rh_impl.rs
index db41e10b75..bbf29a0d03 100644
--- a/framework/scenario/src/facade/world_tx/scenario_rh_impl.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_rh_impl.rs
@@ -62,12 +62,10 @@ where
     Env: TxEnv,
 {
     fn item_process_result(self, tx_response: &TxResponse) -> Self::Returns {
-        let new_address = tx_response
+        tx_response
             .new_deployed_address
             .clone()
-            .expect("missing returned address");
-
-        new_address
+            .expect("missing returned address")
     }
 }
 

From 9ad9c3d156f36d5df3ac66f89dabb60418ca62e4 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 4 Apr 2024 14:48:50 +0300
Subject: [PATCH 0643/1254] cleanup & optimization

---
 Cargo.lock                                       |  1 -
 .../crypto-kitties/common/kitty/src/color.rs     |  6 ++++++
 .../common/kitty/src/kitty_genes.rs              |  7 +++++++
 .../crypto-kitties/kitty-auction/src/lib.rs      |  2 +-
 .../crypto-kitties/kitty-ownership/src/lib.rs    |  2 +-
 contracts/examples/crypto-zombies/Cargo.toml     |  4 ----
 .../crypto-zombies/src/zombie_feeding.rs         | 16 ++--------------
 7 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index fb7229bbaa..f4c87e8b84 100755
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -626,7 +626,6 @@ dependencies = [
  "kitty",
  "multiversx-sc",
  "multiversx-sc-scenario",
- "random",
 ]
 
 [[package]]
diff --git a/contracts/examples/crypto-kitties/common/kitty/src/color.rs b/contracts/examples/crypto-kitties/common/kitty/src/color.rs
index 408b5eb06e..37a97b1dfc 100644
--- a/contracts/examples/crypto-kitties/common/kitty/src/color.rs
+++ b/contracts/examples/crypto-kitties/common/kitty/src/color.rs
@@ -37,3 +37,9 @@ impl Randomizeable for Color {
         }
     }
 }
+
+impl Color {
+    pub fn as_u64(&self) -> u64 {
+        ((self.r.to_be() as u64) << 4 | self.r.to_be() as u64) << 4 | self.r.to_be() as u64
+    }
+}
diff --git a/contracts/examples/crypto-kitties/common/kitty/src/kitty_genes.rs b/contracts/examples/crypto-kitties/common/kitty/src/kitty_genes.rs
index 958543605e..61d6623bf9 100644
--- a/contracts/examples/crypto-kitties/common/kitty/src/kitty_genes.rs
+++ b/contracts/examples/crypto-kitties/common/kitty/src/kitty_genes.rs
@@ -20,3 +20,10 @@ impl Randomizeable for KittyGenes {
         }
     }
 }
+
+impl KittyGenes {
+    pub fn get_as_u64(&self) -> u64 {
+        (self.fur_color.as_u64() << 12 | self.eye_color.as_u64()) << 4
+            | self.meow_power.to_be() as u64
+    }
+}
diff --git a/contracts/examples/crypto-kitties/kitty-auction/src/lib.rs b/contracts/examples/crypto-kitties/kitty-auction/src/lib.rs
index 3b08682089..557673bb3d 100644
--- a/contracts/examples/crypto-kitties/kitty-auction/src/lib.rs
+++ b/contracts/examples/crypto-kitties/kitty-auction/src/lib.rs
@@ -245,7 +245,7 @@ pub trait KittyAuction {
             self.tx()
                 .to(&kitty_ownership_contract_address)
                 .typed(kitty_ownership_proxy::KittyOwnershipProxy)
-                .allow_auctioning(caller.clone(), kitty_id)
+                .allow_auctioning(&caller, kitty_id)
                 .with_callback(self.callbacks().allow_auctioning_callback(
                     auction_type,
                     kitty_id,
diff --git a/contracts/examples/crypto-kitties/kitty-ownership/src/lib.rs b/contracts/examples/crypto-kitties/kitty-ownership/src/lib.rs
index 27f7474945..d6e0771fa4 100644
--- a/contracts/examples/crypto-kitties/kitty-ownership/src/lib.rs
+++ b/contracts/examples/crypto-kitties/kitty-ownership/src/lib.rs
@@ -324,7 +324,6 @@ pub trait KittyOwnership {
     fn give_birth(&self, matron_id: u32) {
         require!(self.is_valid_id(matron_id), "Invalid kitty id!");
 
-        let caller = self.blockchain().get_caller();
         let matron = self.kitty_by_id(matron_id).get();
 
         require!(
@@ -337,6 +336,7 @@ pub trait KittyOwnership {
 
         let gene_science_contract_address = self.get_gene_science_contract_address_or_default();
         if !gene_science_contract_address.is_zero() {
+            let caller = self.blockchain().get_caller();
             self.tx()
                 .to(&gene_science_contract_address)
                 .typed(kitty_genetic_alg_proxy::KittyGeneticAlgProxy)
diff --git a/contracts/examples/crypto-zombies/Cargo.toml b/contracts/examples/crypto-zombies/Cargo.toml
index e900f23cb8..e7ce42e487 100644
--- a/contracts/examples/crypto-zombies/Cargo.toml
+++ b/contracts/examples/crypto-zombies/Cargo.toml
@@ -19,7 +19,3 @@ path = "../../../framework/scenario"
 [dependencies.kitty]
 version = "0.0.0"
 path = "../../../contracts/examples/crypto-kitties/common/kitty"
-
-[dependencies.random]
-version = "0.0.0"
-path = "../../../contracts/examples/crypto-kitties/common/random"
diff --git a/contracts/examples/crypto-zombies/src/zombie_feeding.rs b/contracts/examples/crypto-zombies/src/zombie_feeding.rs
index c910aa412a..7afd7a7be8 100644
--- a/contracts/examples/crypto-zombies/src/zombie_feeding.rs
+++ b/contracts/examples/crypto-zombies/src/zombie_feeding.rs
@@ -1,18 +1,6 @@
 use multiversx_sc::imports::*;
 
-use crate::{
-    kitty_ownership_proxy::{self},
-    storage, zombie_factory, zombie_helper,
-};
-
-pub fn get_as_u64(kitty_genes: kitty::KittyGenes) -> u64 {
-    (as_u64(kitty_genes.fur_color) << 12 | as_u64(kitty_genes.eye_color)) << 4
-        | kitty_genes.meow_power.to_be() as u64
-}
-
-pub fn as_u64(color: kitty::Color) -> u64 {
-    ((color.r.to_be() as u64) << 4 | color.r.to_be() as u64) << 4 | color.r.to_be() as u64
-}
+use crate::{kitty_ownership_proxy, storage, zombie_factory, zombie_helper};
 
 #[multiversx_sc::module]
 pub trait ZombieFeeding:
@@ -55,7 +43,7 @@ pub trait ZombieFeeding:
     ) {
         match result {
             ManagedAsyncCallResult::Ok(kitty) => {
-                let kitty_dna = get_as_u64(kitty.genes);
+                let kitty_dna = kitty.genes.get_as_u64();
                 self.feed_and_multiply(zombie_id, kitty_dna, ManagedBuffer::from(b"kitty"));
             },
             ManagedAsyncCallResult::Err(_) => {},

From 67b75c39c9d9ccab334b5abe1bece9e98fd83e8f Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 4 Apr 2024 15:07:46 +0300
Subject: [PATCH 0644/1254] use-module cleanup

---
 .../tests/use_module_scenario_rs_test.rs      |  5 +-
 .../use-module/tests/user_builtin_proxy.rs    | 51 -------------------
 2 files changed, 1 insertion(+), 55 deletions(-)
 delete mode 100644 contracts/feature-tests/use-module/tests/user_builtin_proxy.rs

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 a234b631f2..a7360462a4 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
@@ -1,7 +1,4 @@
-pub mod user_builtin_proxy;
 mod dns_mock {
-    use crate::user_builtin_proxy;
-
     multiversx_sc::imports!();
 
     #[multiversx_sc::contract]
@@ -13,7 +10,7 @@ mod dns_mock {
             let address = self.blockchain().get_caller();
             self.tx()
                 .to(&address)
-                .typed(user_builtin_proxy::UserBuiltinProxy)
+                .typed(system_proxy::UserBuiltinProxy)
                 .set_user_name(&name)
                 .async_call_and_exit();
         }
diff --git a/contracts/feature-tests/use-module/tests/user_builtin_proxy.rs b/contracts/feature-tests/use-module/tests/user_builtin_proxy.rs
deleted file mode 100644
index fb57dffe11..0000000000
--- a/contracts/feature-tests/use-module/tests/user_builtin_proxy.rs
+++ /dev/null
@@ -1,51 +0,0 @@
-#![allow(clippy::all)]
-
-use multiversx_sc::proxy_imports::*;
-
-pub struct UserBuiltinProxy;
-
-impl<Env, From, To, Gas> TxProxyTrait<Env, From, To, Gas> for UserBuiltinProxy
-where
-    Env: TxEnv,
-    From: TxFrom<Env>,
-    To: TxTo<Env>,
-    Gas: TxGas<Env>,
-{
-    type TxProxyMethods = UserBuiltinProxyMethods<Env, From, To, Gas>;
-
-    fn proxy_methods(self, tx: Tx<Env, From, To, (), Gas, (), ()>) -> Self::TxProxyMethods {
-        UserBuiltinProxyMethods { wrapped_tx: tx }
-    }
-}
-
-pub struct UserBuiltinProxyMethods<Env, From, To, Gas>
-where
-    Env: TxEnv,
-    From: TxFrom<Env>,
-    To: TxTo<Env>,
-    Gas: TxGas<Env>,
-{
-    wrapped_tx: Tx<Env, From, To, (), Gas, (), ()>,
-}
-
-#[rustfmt::skip]
-impl<Env, From, To, Gas> UserBuiltinProxyMethods<Env, From, To, Gas>
-where
-    Env: TxEnv,
-    Env::Api: VMApi,
-    From: TxFrom<Env>,
-    To: TxTo<Env>,
-    Gas: TxGas<Env>,
-{
-    pub fn set_user_name<
-        Arg0: CodecInto<BoxedBytes>,
-    >(
-        self,
-        name: Arg0,
-    ) -> TxProxyCall<Env, From, To, Gas, BigUint<Env::Api>> {
-        self.wrapped_tx
-            .raw_call("SetUserName")
-            .argument(&name)
-            .original_result()
-    }
-}

From 00689ceee7a410e98df91316534d0730fd849aed Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 4 Apr 2024 15:35:56 +0300
Subject: [PATCH 0645/1254] moved builtin_func_names to system_proxy

---
 framework/base/src/api.rs                       |  5 +++--
 .../src/contract_base/wrappers/send_wrapper.rs  | 17 +++++++++--------
 .../base/src/types/interaction/system_proxy.rs  |  1 +
 .../system_proxy/builtin_func_names.rs}         |  0
 .../system_proxy/builtin_func_proxy.rs          | 10 ++++++++--
 5 files changed, 21 insertions(+), 12 deletions(-)
 rename framework/base/src/{api/builtin_function_names.rs => types/interaction/system_proxy/builtin_func_names.rs} (100%)

diff --git a/framework/base/src/api.rs b/framework/base/src/api.rs
index 88f18ca94b..094522d1ac 100644
--- a/framework/base/src/api.rs
+++ b/framework/base/src/api.rs
@@ -1,5 +1,4 @@
 mod blockchain_api;
-mod builtin_function_names;
 mod call_value_api;
 mod composite_api;
 mod crypto_api;
@@ -16,7 +15,6 @@ pub mod uncallable;
 mod vm_api;
 
 pub use blockchain_api::*;
-pub use builtin_function_names::*;
 pub use call_value_api::*;
 pub use composite_api::*;
 pub use crypto_api::*;
@@ -30,3 +28,6 @@ pub use print_api::*;
 pub use send_api::*;
 pub use storage_api::*;
 pub use vm_api::VMApi;
+
+// Backwards compatibility.
+pub use crate::types::system_proxy::builtin_func_names::*;
diff --git a/framework/base/src/contract_base/wrappers/send_wrapper.rs b/framework/base/src/contract_base/wrappers/send_wrapper.rs
index f122ba81db..100c1002ff 100644
--- a/framework/base/src/contract_base/wrappers/send_wrapper.rs
+++ b/framework/base/src/contract_base/wrappers/send_wrapper.rs
@@ -3,16 +3,17 @@ use core::marker::PhantomData;
 use crate::codec::Empty;
 
 use crate::{
-    api::{
-        BlockchainApi, BlockchainApiImpl, CallTypeApi, StorageReadApi,
-        CHANGE_OWNER_BUILTIN_FUNC_NAME, CLAIM_DEVELOPER_REWARDS_FUNC_NAME,
-        ESDT_LOCAL_BURN_FUNC_NAME, ESDT_LOCAL_MINT_FUNC_NAME, ESDT_NFT_ADD_QUANTITY_FUNC_NAME,
-        ESDT_NFT_ADD_URI_FUNC_NAME, ESDT_NFT_BURN_FUNC_NAME, ESDT_NFT_CREATE_FUNC_NAME,
-        ESDT_NFT_UPDATE_ATTRIBUTES_FUNC_NAME,
-    },
+    api::{BlockchainApi, BlockchainApiImpl, CallTypeApi, StorageReadApi},
     codec,
     types::{
-        system_proxy, BigUint, ContractCall, ContractCallNoPayment, ESDTSystemSCAddress,
+        system_proxy,
+        system_proxy::builtin_func_names::{
+            CHANGE_OWNER_BUILTIN_FUNC_NAME, CLAIM_DEVELOPER_REWARDS_FUNC_NAME,
+            ESDT_LOCAL_BURN_FUNC_NAME, ESDT_LOCAL_MINT_FUNC_NAME, ESDT_NFT_ADD_QUANTITY_FUNC_NAME,
+            ESDT_NFT_ADD_URI_FUNC_NAME, ESDT_NFT_BURN_FUNC_NAME, ESDT_NFT_CREATE_FUNC_NAME,
+            ESDT_NFT_UPDATE_ATTRIBUTES_FUNC_NAME,
+        },
+        BigUint, ContractCall, ContractCallNoPayment, ESDTSystemSCAddress,
         EgldOrEsdtTokenIdentifier, EsdtTokenPayment, GasLeft, ManagedAddress, ManagedArgBuffer,
         ManagedBuffer, ManagedType, ManagedVec, ReturnsRawResult, ToSelf, TokenIdentifier, Tx,
         TxScEnv,
diff --git a/framework/base/src/types/interaction/system_proxy.rs b/framework/base/src/types/interaction/system_proxy.rs
index 4963c5f86a..42bbbcf53b 100644
--- a/framework/base/src/types/interaction/system_proxy.rs
+++ b/framework/base/src/types/interaction/system_proxy.rs
@@ -2,6 +2,7 @@ mod builtin_func_proxy;
 mod esdt_system_sc_proxy;
 mod legacy_system_sc_proxy;
 pub(crate) mod token_properties;
+pub mod builtin_func_names;
 
 pub use builtin_func_proxy::*;
 pub use esdt_system_sc_proxy::*;
diff --git a/framework/base/src/api/builtin_function_names.rs b/framework/base/src/types/interaction/system_proxy/builtin_func_names.rs
similarity index 100%
rename from framework/base/src/api/builtin_function_names.rs
rename to framework/base/src/types/interaction/system_proxy/builtin_func_names.rs
diff --git a/framework/base/src/types/interaction/system_proxy/builtin_func_proxy.rs b/framework/base/src/types/interaction/system_proxy/builtin_func_proxy.rs
index dcc3d4b2d8..748de5f870 100644
--- a/framework/base/src/types/interaction/system_proxy/builtin_func_proxy.rs
+++ b/framework/base/src/types/interaction/system_proxy/builtin_func_proxy.rs
@@ -1,3 +1,9 @@
+use self::builtin_func_names::{
+    CHANGE_OWNER_BUILTIN_FUNC_NAME, CLAIM_DEVELOPER_REWARDS_FUNC_NAME, DELETE_USERNAME_FUNC_NAME,
+    ESDT_LOCAL_BURN_FUNC_NAME, ESDT_LOCAL_MINT_FUNC_NAME, ESDT_NFT_ADD_QUANTITY_FUNC_NAME,
+    ESDT_NFT_ADD_URI_FUNC_NAME, ESDT_NFT_BURN_FUNC_NAME, ESDT_NFT_CREATE_FUNC_NAME,
+    ESDT_NFT_UPDATE_ATTRIBUTES_FUNC_NAME, SET_USERNAME_FUNC_NAME,
+};
 use crate::proxy_imports::*;
 
 /// Proxy describing the user builtin function signatures.
@@ -43,7 +49,7 @@ where
         name: Arg0,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call("SetUserName")
+            .raw_call(SET_USERNAME_FUNC_NAME)
             .argument(&name)
             .original_result()
     }
@@ -52,7 +58,7 @@ where
         self,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call("DeleteUserName")
+            .raw_call(DELETE_USERNAME_FUNC_NAME)
             .original_result()
     }
 }

From 9e3a529d5412573f6da23f259e34a61817c6be74 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Fri, 5 Apr 2024 09:23:24 +0200
Subject: [PATCH 0646/1254] multi exec interact progress

---
 .../interact/src/multisig_interact.rs         | 87 ++++++++-----------
 .../interact/src/multisig_interact_nfts.rs    | 41 +++------
 2 files changed, 51 insertions(+), 77 deletions(-)

diff --git a/contracts/examples/multisig/interact/src/multisig_interact.rs b/contracts/examples/multisig/interact/src/multisig_interact.rs
index d80ab639f7..07e4360a26 100644
--- a/contracts/examples/multisig/interact/src/multisig_interact.rs
+++ b/contracts/examples/multisig/interact/src/multisig_interact.rs
@@ -5,15 +5,15 @@ mod multisig_interact_state;
 mod multisig_interact_wegld;
 
 use clap::Parser;
-use multisig::{
-    multisig_perform::ProxyTrait as _, multisig_propose::ProxyTrait as _, multisig_proxy,
-    ProxyTrait as _,
-};
+use multisig::{multisig_perform::ProxyTrait as _, multisig_proxy, ProxyTrait as _};
 use multisig_interact_config::Config;
 use multisig_interact_state::State;
 use multiversx_sc_scenario::{
     mandos_system::ScenarioRunner,
-    multiversx_sc::types::{BigUint, ReturnsNewAddress, ReturnsResult},
+    multiversx_sc::{
+        imports::OptionalValue,
+        types::{BigUint, ReturnsNewAddress, ReturnsResult},
+    },
     scenario_format::interpret_trait::InterpretableFrom,
     standalone::retrieve_account_as_scenario_set_state,
     test_wallets, NumExpr,
@@ -257,36 +257,34 @@ impl MultisigInteract {
         println!("successfully performed action `{action_id}`");
     }
 
-    async fn perform_actions(&mut self, actions: Vec<usize>, gas_expr: &str) {
-        let mut steps = Vec::new();
-        for action_id in actions.iter() {
-            if !self.quorum_reached(*action_id).await && !self.sign(*action_id).await {
-                continue;
+    async fn perform_actions(&mut self, actions: Vec<usize>, gas_expr: u64) {
+        let mut buffer = self.interactor.homogenous_call_buffer();
+        let multisig_address = self.state.multisig().to_address();
+        let from = &self.wallet_address;
+
+        for &action_id in actions.iter() {
+            if self.quorum_reached(action_id).await && self.sign(action_id).await {
+                buffer.push_tx(|tx| {
+                    tx.from(from)
+                        .to(&multisig_address)
+                        .gas(gas_expr)
+                        .typed(multisig_proxy::MultisigProxy)
+                        .perform_action_endpoint(action_id)
+                        .returns(ReturnsResult)
+                });
             }
-            println!("quorum reached for action `{action_id}`");
-
-            let typed_sc_call = ScCallStep::new()
-                .call(self.state.multisig().perform_action_endpoint(action_id))
-                .from(&self.wallet_address)
-                .gas_limit(gas_expr);
-
-            steps.push(typed_sc_call);
         }
 
-        self.interactor
-            .multi_sc_exec(StepBuffer::from_sc_call_vec(&mut steps))
-            .await;
+        let deployed_addresses = buffer.run().await;
 
-        for (i, action_id) in actions.iter().enumerate() {
-            if !steps[i].response().is_success() {
+        for (action_id, address) in deployed_addresses.iter().enumerate() {
+            println!("successfully performed action `{action_id}`");
+            if address.is_some() {
                 println!(
-                    "perform action `{action_id}` failed with: {}",
-                    steps[i].response().tx_error
-                );
-                continue;
+                    "new deployed address for action `{action_id}: {:#?}`",
+                    address.clone().into_option().unwrap()
+                )
             }
-
-            println!("successfully performed action `{action_id}`");
         }
     }
 
@@ -316,7 +314,9 @@ impl MultisigInteract {
 
     async fn sign(&mut self, action_id: usize) -> bool {
         println!("signing action `{action_id}`...");
-        let mut steps = Vec::new();
+        let mut buffer = self.interactor.homogenous_call_buffer();
+        let multisig_address = self.state.multisig().to_address();
+
         for signer in self.board().iter() {
             if self.signed(signer, action_id).await {
                 println!(
@@ -326,27 +326,16 @@ impl MultisigInteract {
                 continue;
             }
 
-            let typed_sc_call = ScCallStep::new()
-                .call(self.state.multisig().sign(action_id))
-                .from(signer)
-                .gas_limit("15,000,000");
-
-            steps.push(typed_sc_call);
+            buffer.push_tx(|tx| {
+                tx.from(signer)
+                    .to(&multisig_address)
+                    .gas(15_000_000u64)
+                    .typed(multisig_proxy::MultisigProxy)
+                    .sign(action_id)
+            });
         }
 
-        self.interactor
-            .multi_sc_exec(StepBuffer::from_sc_call_vec(&mut steps))
-            .await;
-
-        for step in steps.iter() {
-            if !step.response().is_success() {
-                println!(
-                    "perform sign `{action_id}` failed with: {}",
-                    step.response().tx_error
-                );
-                return false;
-            }
-        }
+        buffer.run().await;
 
         println!("successfully performed sign action `{action_id}`");
         true
diff --git a/contracts/examples/multisig/interact/src/multisig_interact_nfts.rs b/contracts/examples/multisig/interact/src/multisig_interact_nfts.rs
index 62314ef63c..c677cf8fdf 100644
--- a/contracts/examples/multisig/interact/src/multisig_interact_nfts.rs
+++ b/contracts/examples/multisig/interact/src/multisig_interact_nfts.rs
@@ -189,17 +189,20 @@ impl MultisigInteract {
         println!("creating items...");
 
         let multisig_address = self.state.multisig().to_address();
-        let mut steps = Vec::new();
 
+        let mut buffer = self.interactor.homogenous_call_buffer();
         for item_index in 0..NUM_ITEMS {
             let item_name = format!("Test collection item #{item_index}");
             let image_cid = format!(
                 "https://ipfs.io/ipfs/QmYyAaEf1phJS5mN6wfou5de5GbpUddBxTY1VekKcjd5PC/nft{item_index:02}.png"
             );
 
-            let typed_sc_call = ScCallStep::new()
-                .call(
-                    self.state.multisig().propose_async_call(
+            buffer.push_tx(|tx| {
+                tx.from(&self.wallet_address)
+                    .to(&multisig_address)
+                    .gas(10_000_000u64)
+                    .typed(multisig_proxy::MultisigProxy)
+                    .propose_async_call(
                         &multisig_address,
                         0u64,
                         FunctionCall::new("ESDTNFTCreate")
@@ -210,34 +213,16 @@ impl MultisigInteract {
                             .argument(&Empty)
                             .argument(&METADATA)
                             .argument(&image_cid),
-                    ),
-                )
-                .from(&self.wallet_address)
-                .gas_limit("10,000,000");
-
-            steps.push(typed_sc_call);
+                    )
+                    .returns(ReturnsResult)
+            });
         }
 
-        self.interactor
-            .multi_sc_exec(StepBuffer::from_sc_call_vec(&mut steps))
-            .await;
-
-        let mut actions = Vec::new();
-        for step in steps.iter() {
-            let result = step.result();
-            if result.is_err() {
-                println!(
-                    "propose ESDTNFTCreate failed with: {}",
-                    result.err().unwrap()
-                );
-                return;
-            }
-
-            let action_id = result.unwrap();
+        let action_ids = buffer.run().await;
+        for action_id in action_ids.iter() {
             println!("successfully proposed ESDTNFTCreate action `{action_id}`");
-            actions.push(action_id);
         }
 
-        self.perform_actions(actions, "30,000,000").await;
+        self.perform_actions(action_ids, 30_000_000u64).await;
     }
 }

From f4a32054ccf73d2ebcc86cef4353bfab19a57157 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 5 Apr 2024 10:39:48 +0300
Subject: [PATCH 0647/1254] multi exec interactor migration & fix

---
 .../interact/src/multisig_interact.rs         | 42 +++++++++++--------
 1 file changed, 24 insertions(+), 18 deletions(-)

diff --git a/contracts/examples/multisig/interact/src/multisig_interact.rs b/contracts/examples/multisig/interact/src/multisig_interact.rs
index 07e4360a26..e407c4f641 100644
--- a/contracts/examples/multisig/interact/src/multisig_interact.rs
+++ b/contracts/examples/multisig/interact/src/multisig_interact.rs
@@ -5,15 +5,12 @@ mod multisig_interact_state;
 mod multisig_interact_wegld;
 
 use clap::Parser;
-use multisig::{multisig_perform::ProxyTrait as _, multisig_proxy, ProxyTrait as _};
+use multisig::multisig_proxy;
 use multisig_interact_config::Config;
 use multisig_interact_state::State;
 use multiversx_sc_scenario::{
     mandos_system::ScenarioRunner,
-    multiversx_sc::{
-        imports::OptionalValue,
-        types::{BigUint, ReturnsNewAddress, ReturnsResult},
-    },
+    multiversx_sc::types::{BigUint, ReturnsNewAddress, ReturnsResult},
     scenario_format::interpret_trait::InterpretableFrom,
     standalone::retrieve_account_as_scenario_set_state,
     test_wallets, NumExpr,
@@ -25,7 +22,7 @@ use multiversx_sc_snippets::{
         api::StaticApi, bech32, scenario_format::interpret_trait::InterpreterContext,
         scenario_model::*, ContractInfo,
     },
-    tokio, Interactor, InteractorPrepareAsync, StepBuffer,
+    tokio, Interactor, InteractorPrepareAsync,
 };
 
 const SYSTEM_SC_BECH32: &str = "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u";
@@ -258,23 +255,28 @@ impl MultisigInteract {
     }
 
     async fn perform_actions(&mut self, actions: Vec<usize>, gas_expr: u64) {
-        let mut buffer = self.interactor.homogenous_call_buffer();
         let multisig_address = self.state.multisig().to_address();
-        let from = &self.wallet_address;
 
+        let mut pending_action_ids = Vec::<usize>::new();
         for &action_id in actions.iter() {
             if self.quorum_reached(action_id).await && self.sign(action_id).await {
-                buffer.push_tx(|tx| {
-                    tx.from(from)
-                        .to(&multisig_address)
-                        .gas(gas_expr)
-                        .typed(multisig_proxy::MultisigProxy)
-                        .perform_action_endpoint(action_id)
-                        .returns(ReturnsResult)
-                });
+                pending_action_ids.push(action_id);
             }
         }
 
+        let from = &self.wallet_address;
+        let mut buffer = self.interactor.homogenous_call_buffer();
+        for action_id in pending_action_ids {
+            buffer.push_tx(|tx| {
+                tx.from(from)
+                    .to(&multisig_address)
+                    .gas(gas_expr)
+                    .typed(multisig_proxy::MultisigProxy)
+                    .perform_action_endpoint(action_id)
+                    .returns(ReturnsResult)
+            });
+        }
+
         let deployed_addresses = buffer.run().await;
 
         for (action_id, address) in deployed_addresses.iter().enumerate() {
@@ -314,18 +316,22 @@ impl MultisigInteract {
 
     async fn sign(&mut self, action_id: usize) -> bool {
         println!("signing action `{action_id}`...");
-        let mut buffer = self.interactor.homogenous_call_buffer();
         let multisig_address = self.state.multisig().to_address();
 
+        let mut pending_signers = Vec::<Address>::new();
         for signer in self.board().iter() {
             if self.signed(signer, action_id).await {
                 println!(
                     "{} - already signed action `{action_id}`",
                     bech32::encode(signer)
                 );
-                continue;
+            } else {
+                pending_signers.push(signer.clone());
             }
+        }
 
+        let mut buffer = self.interactor.homogenous_call_buffer();
+        for signer in pending_signers {
             buffer.push_tx(|tx| {
                 tx.from(signer)
                     .to(&multisig_address)

From 39d96f00e55f6e0179d710b4686111f9806c8700 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Fri, 5 Apr 2024 13:22:15 +0300
Subject: [PATCH 0648/1254] proxy multi config - multi path rename & fmt proxy
 gen

---
 .../kitty-genetic-alg/sc-config.toml          | 10 +++-
 .../kitty-ownership/sc-config.toml            | 16 ++++--
 .../feature-tests/abi-tester/src/abi_proxy.rs | 10 +++-
 .../erc1155/sc-config.toml                    |  4 +-
 .../erc-style-contracts/erc20/sc-config.toml  | 10 ++--
 .../generate_proxy/proxy_generator.rs         | 56 +++++++++++++------
 .../cmd/contract/sc_config/sc_config_proxy.rs |  2 +-
 7 files changed, 75 insertions(+), 33 deletions(-)

diff --git a/contracts/examples/crypto-kitties/kitty-genetic-alg/sc-config.toml b/contracts/examples/crypto-kitties/kitty-genetic-alg/sc-config.toml
index 9ef6cb0474..f18c45d308 100644
--- a/contracts/examples/crypto-kitties/kitty-genetic-alg/sc-config.toml
+++ b/contracts/examples/crypto-kitties/kitty-genetic-alg/sc-config.toml
@@ -1,2 +1,8 @@
-[settings]
-proxy-paths = ["../kitty-ownership/src/kitty_genetic_alg_proxy.rs"]
+[[proxy]]
+path = "../kitty-ownership/src/kitty_genetic_alg_proxy.rs"
+[[proxy.path-rename]]
+from = "kitty::kitty"
+to = "kitty"
+[[proxy.path-rename]]
+from = "kitty_genes"
+to = "kitty"
diff --git a/contracts/examples/crypto-kitties/kitty-ownership/sc-config.toml b/contracts/examples/crypto-kitties/kitty-ownership/sc-config.toml
index 3bde9040f9..202f19e321 100644
--- a/contracts/examples/crypto-kitties/kitty-ownership/sc-config.toml
+++ b/contracts/examples/crypto-kitties/kitty-ownership/sc-config.toml
@@ -1,5 +1,11 @@
-[settings]
-proxy-paths = [
-    "../kitty-auction/src/kitty_ownership_proxy.rs",
-    "../../crypto-zombies/src/kitty_ownership_proxy.rs",
-]
+[[proxy]]
+path = "../kitty-auction/src/kitty_ownership_proxy.rs"
+[[proxy.path-rename]]
+from = "kitty::kitty"
+to = "kitty"
+
+[[proxy]]
+path = "../../crypto-zombies/src/kitty_ownership_proxy.rs"
+[[proxy.path-rename]]
+from = "kitty::kitty"
+to = "kitty"
diff --git a/contracts/feature-tests/abi-tester/src/abi_proxy.rs b/contracts/feature-tests/abi-tester/src/abi_proxy.rs
index b6547d3385..eb5d717025 100644
--- a/contracts/feature-tests/abi-tester/src/abi_proxy.rs
+++ b/contracts/feature-tests/abi-tester/src/abi_proxy.rs
@@ -414,7 +414,10 @@ pub enum AbiEnum {
     Nothing,
     Something(i32),
     SomethingMore(u8, OnlyShowsUpAsNested08),
-    SomeStruct { a: u16, b: OnlyShowsUpAsNested09 },
+    SomeStruct {
+        a: u16,
+        b: OnlyShowsUpAsNested09,
+    },
 }
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
@@ -504,5 +507,8 @@ pub enum ExplicitDiscriminantMixed {
     Unit,
     Tuple(u16),
     Five,
-    Struct { a: u8, b: u16 },
+    Struct {
+        a: u8,
+        b: u16,
+    },
 }
diff --git a/contracts/feature-tests/erc-style-contracts/erc1155/sc-config.toml b/contracts/feature-tests/erc-style-contracts/erc1155/sc-config.toml
index e23006a55c..41ca1e2eee 100644
--- a/contracts/feature-tests/erc-style-contracts/erc1155/sc-config.toml
+++ b/contracts/feature-tests/erc-style-contracts/erc1155/sc-config.toml
@@ -1,6 +1,8 @@
 [settings]
 main = "erc1155"
-proxy-paths = ["../erc1155-marketplace/src/erc1155_proxy.rs"]
+
+[[proxy]]
+path = "../erc1155-marketplace/src/erc1155_proxy.rs"
 
 # the only purpose of this config is to specify the allocator
 [contracts.erc1155]
diff --git a/contracts/feature-tests/erc-style-contracts/erc20/sc-config.toml b/contracts/feature-tests/erc-style-contracts/erc20/sc-config.toml
index 45d4fccdce..68aff47cba 100644
--- a/contracts/feature-tests/erc-style-contracts/erc20/sc-config.toml
+++ b/contracts/feature-tests/erc-style-contracts/erc20/sc-config.toml
@@ -1,5 +1,7 @@
 [settings]
-proxy-paths = [
-    "../crowdfunding-erc20/src/erc20_proxy.rs",
-    "../lottery-erc20/src/erc20_proxy.rs",
-]
+
+[[proxy]]
+path = "../crowdfunding-erc20/src/erc20_proxy.rs"
+
+[[proxy]]
+path = "../lottery-erc20/src/erc20_proxy.rs"
diff --git a/framework/meta/src/cmd/contract/generate_proxy/proxy_generator.rs b/framework/meta/src/cmd/contract/generate_proxy/proxy_generator.rs
index 60e121cf06..68f2554ab4 100644
--- a/framework/meta/src/cmd/contract/generate_proxy/proxy_generator.rs
+++ b/framework/meta/src/cmd/contract/generate_proxy/proxy_generator.rs
@@ -8,7 +8,8 @@ use multiversx_sc::abi::{
 use crate::cmd::contract::{meta_config::MetaConfig, sc_config::ProxyConfigSerde};
 
 use super::proxy_process_type_name::{
-    extract_paths, extract_struct_crate, process_rust_type, proxy_methods_type_name, proxy_type_name
+    extract_paths, extract_struct_crate, process_rust_type, proxy_methods_type_name,
+    proxy_type_name,
 };
 
 const PRELUDE: &str = "// Code generated by the multiversx-sc proxy generator. DO NOT EDIT.
@@ -438,6 +439,13 @@ where
     ) {
         self.start_write_type("enum", type_description, name);
 
+        if enum_variants.is_empty() {
+            self.writeln("}");
+            return;
+        }
+
+        self.writeln("");
+
         for variant in enum_variants {
             self.write(format!("    {}", variant.name));
             if variant.fields.is_empty() {
@@ -462,6 +470,13 @@ where
     ) {
         self.start_write_type("struct", type_description, name);
 
+        if struct_fields.is_empty() {
+            self.writeln("}");
+            return;
+        }
+
+        self.writeln("");
+
         for field in struct_fields {
             let adjusted_type_name = self.adjust_type_name_with_api(&field.field_type.rust);
             self.writeln(format!("    pub {}: {adjusted_type_name},", field.name));
@@ -499,7 +514,9 @@ where
 
         let processed_paths = self.process_paths(&paths);
 
-        process_rust_type(rust_type.to_string(), paths, processed_paths)
+        let processed_rust_type = process_rust_type(rust_type.to_string(), paths, processed_paths);
+
+        self.rename_path_with_custome_config(&processed_rust_type)
     }
 
     fn start_write_type(
@@ -522,7 +539,7 @@ where
             self.write(" ");
         }
 
-        self.writeln("{");
+        self.write("{");
     }
 
     pub fn write_macro_attributes(&mut self, macro_attributes: &[String]) {
@@ -553,17 +570,23 @@ where
         self.writeln("    }");
     }
 
-    fn extract_path_rename(&self) -> (&str, &str) {
-        if let Some(path_rename) = &self.proxy_config.path_rename {
-            return (&path_rename.from, &path_rename.to);
+    fn rename_path_with_custome_config(&self, processed_type: &str) -> String {
+        let mut renamed_processed_type = processed_type.to_owned();
+
+        if let Some(paths_rename) = &self.proxy_config.path_rename {
+            for path_rename in paths_rename {
+                if processed_type.contains(&path_rename.from) {
+                    renamed_processed_type =
+                        renamed_processed_type.replace(&path_rename.from, &path_rename.to);
+                }
+            }
         }
 
-        ("", "")
+        renamed_processed_type
     }
 
     fn process_paths(&self, paths: &Vec<String>) -> Vec<String> {
         let mut processed_paths: Vec<String> = Vec::new();
-        let (path_rename_from, path_rename_to) = self.extract_path_rename();
         let crate_name = self
             .meta_config
             .original_contract_abi
@@ -571,16 +594,13 @@ where
 
         for path in paths {
             let type_rust_name = path.split("::").last().unwrap();
-            let processed_path = match path {
-                p if p == path_rename_from => path_rename_to.to_string(),
-                p if crate_name == extract_struct_crate(p)
-                    || TYPES_FROM_FRAMEWORK.contains(&type_rust_name) =>
-                {
-                    type_rust_name.to_string()
-                },
-                _ => path.to_string(),
-            };
-            processed_paths.push(processed_path);
+            if crate_name == extract_struct_crate(path)
+                || TYPES_FROM_FRAMEWORK.contains(&type_rust_name)
+            {
+                processed_paths.push(type_rust_name.to_string());
+            } else {
+                processed_paths.push(path.to_string());
+            }
         }
 
         processed_paths
diff --git a/framework/meta/src/cmd/contract/sc_config/sc_config_proxy.rs b/framework/meta/src/cmd/contract/sc_config/sc_config_proxy.rs
index 5521b1ee38..56c9a5257a 100644
--- a/framework/meta/src/cmd/contract/sc_config/sc_config_proxy.rs
+++ b/framework/meta/src/cmd/contract/sc_config/sc_config_proxy.rs
@@ -14,7 +14,7 @@ pub struct ProxyConfigSerde {
 
     #[serde(default)]
     #[serde(rename = "path-rename")]
-    pub path_rename: Option<PathRename>,
+    pub path_rename: Option<Vec<PathRename>>,
 }
 
 impl ProxyConfigSerde {

From 2b6f7a79bf5fadbf784dd850825a22c1127615c3 Mon Sep 17 00:00:00 2001
From: Laurentiu Ciobanu <laurentiu.ciobanu@multiversx.com>
Date: Fri, 5 Apr 2024 13:41:35 +0300
Subject: [PATCH 0649/1254] sc-meta install wasm32 target

---
 framework/meta/src/cli_args/cli_args_standalone.rs   |  6 ++++++
 framework/meta/src/cmd/standalone/install.rs         |  9 ++++++++-
 .../src/cmd/standalone/install/install_wasm32.rs     | 12 ++++++++++++
 3 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 framework/meta/src/cmd/standalone/install/install_wasm32.rs

diff --git a/framework/meta/src/cli_args/cli_args_standalone.rs b/framework/meta/src/cli_args/cli_args_standalone.rs
index 2f6c435e9c..02b5ac9f24 100644
--- a/framework/meta/src/cli_args/cli_args_standalone.rs
+++ b/framework/meta/src/cli_args/cli_args_standalone.rs
@@ -307,6 +307,9 @@ pub enum InstallCommand {
 
     #[command(about = "Installs the `mx-scenario-go` tool")]
     MxScenarioGo(InstallMxScenarioGoArgs),
+
+    #[command(name = "wasm32", about = "Installs the `wasm32` target")]
+    Wasm32(InstallWasm32Args),
 }
 
 #[derive(Default, Clone, PartialEq, Eq, Debug, Args)]
@@ -315,3 +318,6 @@ pub struct InstallMxScenarioGoArgs {
     #[arg(long, verbatim_doc_comment)]
     pub tag: Option<String>,
 }
+
+#[derive(Default, Clone, PartialEq, Eq, Debug, Args)]
+pub struct InstallWasm32Args {}
diff --git a/framework/meta/src/cmd/standalone/install.rs b/framework/meta/src/cmd/standalone/install.rs
index e96f23ad70..2c2befef95 100644
--- a/framework/meta/src/cmd/standalone/install.rs
+++ b/framework/meta/src/cmd/standalone/install.rs
@@ -1,7 +1,8 @@
 mod install_scenario_go;
+mod install_wasm32;
 mod system_info;
 
-use crate::cli_args::{InstallArgs, InstallCommand, InstallMxScenarioGoArgs};
+use crate::cli_args::{InstallArgs, InstallCommand, InstallMxScenarioGoArgs, InstallWasm32Args};
 
 use self::install_scenario_go::ScenarioGoInstaller;
 
@@ -14,11 +15,17 @@ pub fn install(args: &InstallArgs) {
     match command {
         InstallCommand::All => {
             install_scenario_go(&InstallMxScenarioGoArgs::default());
+            install_wasm32(&InstallWasm32Args::default());
         },
         InstallCommand::MxScenarioGo(sg_args) => install_scenario_go(sg_args),
+        InstallCommand::Wasm32(wam32_args) => install_wasm32(wam32_args),
     }
 }
 
 fn install_scenario_go(sg_args: &InstallMxScenarioGoArgs) {
     ScenarioGoInstaller::new(sg_args.tag.clone()).install();
 }
+
+fn install_wasm32(_wasm32_args: &InstallWasm32Args) {
+    install_wasm32::install_wasm32_target();
+}
diff --git a/framework/meta/src/cmd/standalone/install/install_wasm32.rs b/framework/meta/src/cmd/standalone/install/install_wasm32.rs
new file mode 100644
index 0000000000..dbe6cc5eb7
--- /dev/null
+++ b/framework/meta/src/cmd/standalone/install/install_wasm32.rs
@@ -0,0 +1,12 @@
+use std::process::Command;
+
+pub fn install_wasm32_target() {
+    let cmd = Command::new("rustup")
+        .args(vec!["target", "add", "wasm32-unknown-unknown"])
+        .status()
+        .expect("failed to execute `rustup`");
+
+    assert!(cmd.success(), "failed to install wasm32 target");
+
+    println!("wasm32 target installed successfully");
+}

From 595709dc5253e5489380c9242f78b381f3da01c2 Mon Sep 17 00:00:00 2001
From: Laurentiu Ciobanu <laurentiu.ciobanu@multiversx.com>
Date: Fri, 5 Apr 2024 14:41:46 +0300
Subject: [PATCH 0650/1254] sc-meta install wasm-opt

---
 framework/meta/src/cli_args/cli_args_standalone.rs |  6 ++++++
 framework/meta/src/cmd/standalone/install.rs       | 14 +++++++++++---
 .../{install_wasm32.rs => install_wasm_tools.rs}   | 11 +++++++++++
 3 files changed, 28 insertions(+), 3 deletions(-)
 rename framework/meta/src/cmd/standalone/install/{install_wasm32.rs => install_wasm_tools.rs} (55%)

diff --git a/framework/meta/src/cli_args/cli_args_standalone.rs b/framework/meta/src/cli_args/cli_args_standalone.rs
index 02b5ac9f24..00cf305e8d 100644
--- a/framework/meta/src/cli_args/cli_args_standalone.rs
+++ b/framework/meta/src/cli_args/cli_args_standalone.rs
@@ -310,6 +310,9 @@ pub enum InstallCommand {
 
     #[command(name = "wasm32", about = "Installs the `wasm32` target")]
     Wasm32(InstallWasm32Args),
+
+    #[command(name = "wasm-opt", about = "Installs the `wasm-opt` tool")]
+    WasmOpt(InstallWasmOptArgs),
 }
 
 #[derive(Default, Clone, PartialEq, Eq, Debug, Args)]
@@ -321,3 +324,6 @@ pub struct InstallMxScenarioGoArgs {
 
 #[derive(Default, Clone, PartialEq, Eq, Debug, Args)]
 pub struct InstallWasm32Args {}
+
+#[derive(Default, Clone, PartialEq, Eq, Debug, Args)]
+pub struct InstallWasmOptArgs {}
diff --git a/framework/meta/src/cmd/standalone/install.rs b/framework/meta/src/cmd/standalone/install.rs
index 2c2befef95..2a3fc387c0 100644
--- a/framework/meta/src/cmd/standalone/install.rs
+++ b/framework/meta/src/cmd/standalone/install.rs
@@ -1,8 +1,10 @@
 mod install_scenario_go;
-mod install_wasm32;
+mod install_wasm_tools;
 mod system_info;
 
-use crate::cli_args::{InstallArgs, InstallCommand, InstallMxScenarioGoArgs, InstallWasm32Args};
+use crate::cli_args::{
+    InstallArgs, InstallCommand, InstallMxScenarioGoArgs, InstallWasm32Args, InstallWasmOptArgs,
+};
 
 use self::install_scenario_go::ScenarioGoInstaller;
 
@@ -16,9 +18,11 @@ pub fn install(args: &InstallArgs) {
         InstallCommand::All => {
             install_scenario_go(&InstallMxScenarioGoArgs::default());
             install_wasm32(&InstallWasm32Args::default());
+            install_wasm_opt(&InstallWasmOptArgs::default());
         },
         InstallCommand::MxScenarioGo(sg_args) => install_scenario_go(sg_args),
         InstallCommand::Wasm32(wam32_args) => install_wasm32(wam32_args),
+        InstallCommand::WasmOpt(wasm_opt_args) => install_wasm_opt(wasm_opt_args),
     }
 }
 
@@ -27,5 +31,9 @@ fn install_scenario_go(sg_args: &InstallMxScenarioGoArgs) {
 }
 
 fn install_wasm32(_wasm32_args: &InstallWasm32Args) {
-    install_wasm32::install_wasm32_target();
+    install_wasm_tools::install_wasm32_target();
+}
+
+fn install_wasm_opt(_wasm_opt_args: &InstallWasmOptArgs) {
+    install_wasm_tools::install_wasm_opt();
 }
diff --git a/framework/meta/src/cmd/standalone/install/install_wasm32.rs b/framework/meta/src/cmd/standalone/install/install_wasm_tools.rs
similarity index 55%
rename from framework/meta/src/cmd/standalone/install/install_wasm32.rs
rename to framework/meta/src/cmd/standalone/install/install_wasm_tools.rs
index dbe6cc5eb7..90577107fe 100644
--- a/framework/meta/src/cmd/standalone/install/install_wasm32.rs
+++ b/framework/meta/src/cmd/standalone/install/install_wasm_tools.rs
@@ -10,3 +10,14 @@ pub fn install_wasm32_target() {
 
     println!("wasm32 target installed successfully");
 }
+
+pub fn install_wasm_opt() {
+    let cmd = Command::new("cargo")
+        .args(vec!["install", "wasm-opt"])
+        .status()
+        .expect("failed to execute `cargo`");
+
+    assert!(cmd.success(), "failed to install wasm-opt");
+
+    println!("wasm-opt installed successfully");
+}

From eba6e2897dec2f0974425aae6a8eb2c4a0c69b1a Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Fri, 5 Apr 2024 16:49:22 +0300
Subject: [PATCH 0651/1254] builtin func - claim dev rewards

---
 .../modules/src/claim_developer_rewards.rs      |  9 +++++----
 .../src/contract_base/wrappers/send_wrapper.rs  | 17 +++--------------
 .../system_proxy/builtin_func_proxy.rs          | 11 +++++++++++
 3 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/contracts/modules/src/claim_developer_rewards.rs b/contracts/modules/src/claim_developer_rewards.rs
index 05be2a0012..5a63ddd6bc 100644
--- a/contracts/modules/src/claim_developer_rewards.rs
+++ b/contracts/modules/src/claim_developer_rewards.rs
@@ -4,9 +4,10 @@ multiversx_sc::imports!();
 pub trait ClaimDeveloperRewardsModule {
     #[endpoint(claimDeveloperRewards)]
     fn claim_developer_rewards(&self, child_sc_address: ManagedAddress) {
-        let () = self
-            .send()
-            .claim_developer_rewards(child_sc_address)
-            .execute_on_dest_context();
+        self.tx()
+            .to(&child_sc_address)
+            .typed(system_proxy::UserBuiltinProxy)
+            .claim_developer_rewards()
+            .async_call_and_exit();
     }
 }
diff --git a/framework/base/src/contract_base/wrappers/send_wrapper.rs b/framework/base/src/contract_base/wrappers/send_wrapper.rs
index 100c1002ff..a90ff3e5c4 100644
--- a/framework/base/src/contract_base/wrappers/send_wrapper.rs
+++ b/framework/base/src/contract_base/wrappers/send_wrapper.rs
@@ -8,10 +8,9 @@ use crate::{
     types::{
         system_proxy,
         system_proxy::builtin_func_names::{
-            CHANGE_OWNER_BUILTIN_FUNC_NAME, CLAIM_DEVELOPER_REWARDS_FUNC_NAME,
-            ESDT_LOCAL_BURN_FUNC_NAME, ESDT_LOCAL_MINT_FUNC_NAME, ESDT_NFT_ADD_QUANTITY_FUNC_NAME,
-            ESDT_NFT_ADD_URI_FUNC_NAME, ESDT_NFT_BURN_FUNC_NAME, ESDT_NFT_CREATE_FUNC_NAME,
-            ESDT_NFT_UPDATE_ATTRIBUTES_FUNC_NAME,
+            CHANGE_OWNER_BUILTIN_FUNC_NAME, ESDT_LOCAL_BURN_FUNC_NAME, ESDT_LOCAL_MINT_FUNC_NAME,
+            ESDT_NFT_ADD_QUANTITY_FUNC_NAME, ESDT_NFT_ADD_URI_FUNC_NAME, ESDT_NFT_BURN_FUNC_NAME,
+            ESDT_NFT_CREATE_FUNC_NAME, ESDT_NFT_UPDATE_ATTRIBUTES_FUNC_NAME,
         },
         BigUint, ContractCall, ContractCallNoPayment, ESDTSystemSCAddress,
         EgldOrEsdtTokenIdentifier, EsdtTokenPayment, GasLeft, ManagedAddress, ManagedArgBuffer,
@@ -359,16 +358,6 @@ where
             .async_call_and_exit()
     }
 
-    /// Creates a call to the `ClaimDeveloperRewards` builtin function.
-    ///
-    /// In itself, this does nothing. You need to then call turn the contract call into an async call.
-    pub fn claim_developer_rewards(
-        &self,
-        child_sc_address: ManagedAddress<A>,
-    ) -> ContractCallNoPayment<A, ()> {
-        ContractCallNoPayment::new(child_sc_address, CLAIM_DEVELOPER_REWARDS_FUNC_NAME)
-    }
-
     /// Creates a call to the `ChangeOwnerAddress` builtin function.
     ///
     /// In itself, this does nothing. You need to then call turn the contract call into an async call.
diff --git a/framework/base/src/types/interaction/system_proxy/builtin_func_proxy.rs b/framework/base/src/types/interaction/system_proxy/builtin_func_proxy.rs
index 748de5f870..d71d398c75 100644
--- a/framework/base/src/types/interaction/system_proxy/builtin_func_proxy.rs
+++ b/framework/base/src/types/interaction/system_proxy/builtin_func_proxy.rs
@@ -61,4 +61,15 @@ where
             .raw_call(DELETE_USERNAME_FUNC_NAME)
             .original_result()
     }
+
+    /// Creates a call to the `ClaimDeveloperRewards` builtin function.
+    ///
+    /// In itself, this does nothing. You need to then call turn the contract call into an async call.
+    pub fn claim_developer_rewards(
+        self,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call(CLAIM_DEVELOPER_REWARDS_FUNC_NAME)
+            .original_result()
+    }
 }

From f4cce0d32a3952d66f713e820ab317c6e38e4bea Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 5 Apr 2024 19:17:10 +0300
Subject: [PATCH 0652/1254] ManagedBufferBuilder rename

---
 framework/base/src/io/finish.rs                |  8 ++++----
 framework/base/src/macros.rs                   |  4 ++--
 framework/base/src/storage/storage_set.rs      |  6 +++---
 .../types/interaction/contract_call_exec.rs    |  5 ++---
 .../src/types/interaction/function_call.rs     |  4 ++--
 .../base/src/types/managed/wrapped/builder.rs  |  5 +++++
 .../managed_buffer_builder.rs}                 | 18 +++++++++---------
 .../base/src/types/managed/wrapped/mod.rs      |  4 ++--
 .../src/preprocessing/substitution_list.rs     |  2 +-
 .../src/api/local_api_vh/print_api_vh.rs       |  4 ++--
 10 files changed, 32 insertions(+), 28 deletions(-)
 create mode 100644 framework/base/src/types/managed/wrapped/builder.rs
 rename framework/base/src/types/managed/wrapped/{managed_buffer_cached_builder.rs => builder/managed_buffer_builder.rs} (92%)

diff --git a/framework/base/src/io/finish.rs b/framework/base/src/io/finish.rs
index f44cc02c5e..49ec4c8560 100644
--- a/framework/base/src/io/finish.rs
+++ b/framework/base/src/io/finish.rs
@@ -8,8 +8,8 @@ use crate::{
     contract_base::ExitCodecErrorHandler,
     err_msg,
     types::{
-        BigInt, BigUint, ManagedBuffer, ManagedBufferCachedBuilder, ManagedSCError, ManagedType,
-        SCError, StaticSCError,
+        BigInt, BigUint, ManagedBuffer, ManagedBufferBuilder, ManagedSCError, ManagedType, SCError,
+        StaticSCError,
     },
 };
 
@@ -47,7 +47,7 @@ impl<FA> TopEncodeOutput for ApiOutputAdapter<FA>
 where
     FA: ManagedTypeApi + EndpointFinishApi,
 {
-    type NestedBuffer = ManagedBufferCachedBuilder<FA>;
+    type NestedBuffer = ManagedBufferBuilder<FA>;
 
     fn set_slice_u8(self, bytes: &[u8]) {
         FA::finish_api_impl().finish_slice_u8(bytes);
@@ -94,7 +94,7 @@ where
     }
 
     fn start_nested_encode(&self) -> Self::NestedBuffer {
-        ManagedBufferCachedBuilder::new_from_slice(&[])
+        ManagedBufferBuilder::new_from_slice(&[])
     }
 
     fn finalize_nested_encode(self, nb: Self::NestedBuffer) {
diff --git a/framework/base/src/macros.rs b/framework/base/src/macros.rs
index 1754688d03..86c963a057 100644
--- a/framework/base/src/macros.rs
+++ b/framework/base/src/macros.rs
@@ -63,7 +63,7 @@ macro_rules! require_old {
 macro_rules! sc_panic {
     ($msg:tt, $($arg:expr),+ $(,)?) => {{
         let mut ___buffer___ =
-            multiversx_sc::types::ManagedBufferCachedBuilder::<Self::Api>::new_from_slice(&[]);
+            multiversx_sc::types::ManagedBufferBuilder::<Self::Api>::new_from_slice(&[]);
         multiversx_sc::derive::format_receiver_args!(___buffer___, $msg, $($arg),+);
         multiversx_sc::contract_base::ErrorHelper::<Self::Api>::signal_error_with_message(___buffer___.into_managed_buffer());
     }};
@@ -123,7 +123,7 @@ macro_rules! sc_print {
 macro_rules! sc_format {
     ($msg:tt, $($arg:expr),+ $(,)?) => {{
         let mut ___buffer___ =
-            multiversx_sc::types::ManagedBufferCachedBuilder::<Self::Api>::new_from_slice(&[]);
+            multiversx_sc::types::ManagedBufferBuilder::<Self::Api>::new_from_slice(&[]);
         multiversx_sc::derive::format_receiver_args!(___buffer___, $msg, $($arg),+);
         ___buffer___.into_managed_buffer()
     }};
diff --git a/framework/base/src/storage/storage_set.rs b/framework/base/src/storage/storage_set.rs
index e988b47351..1a407617f5 100644
--- a/framework/base/src/storage/storage_set.rs
+++ b/framework/base/src/storage/storage_set.rs
@@ -6,7 +6,7 @@ use crate::{
     codec::*,
     contract_base::ExitCodecErrorHandler,
     err_msg,
-    types::{BigInt, BigUint, ManagedBuffer, ManagedBufferCachedBuilder, ManagedRef, ManagedType},
+    types::{BigInt, BigUint, ManagedBuffer, ManagedBufferBuilder, ManagedRef, ManagedType},
 };
 
 use super::StorageKey;
@@ -39,7 +39,7 @@ impl<'k, A> TopEncodeOutput for StorageSetOutput<'k, A>
 where
     A: StorageWriteApi + ManagedTypeApi + ErrorApi + 'static,
 {
-    type NestedBuffer = ManagedBufferCachedBuilder<A>;
+    type NestedBuffer = ManagedBufferBuilder<A>;
 
     fn set_slice_u8(self, bytes: &[u8]) {
         self.set_managed_buffer(&bytes.into())
@@ -71,7 +71,7 @@ where
     }
 
     fn start_nested_encode(&self) -> Self::NestedBuffer {
-        ManagedBufferCachedBuilder::new_from_slice(&[])
+        ManagedBufferBuilder::new_from_slice(&[])
     }
 
     fn finalize_nested_encode(self, nb: Self::NestedBuffer) {
diff --git a/framework/base/src/types/interaction/contract_call_exec.rs b/framework/base/src/types/interaction/contract_call_exec.rs
index 260897e1a6..fd9994f2b0 100644
--- a/framework/base/src/types/interaction/contract_call_exec.rs
+++ b/framework/base/src/types/interaction/contract_call_exec.rs
@@ -9,8 +9,7 @@ use crate::{
     formatter::SCLowerHex,
     io::{ArgErrorHandler, ArgId, ManagedResultArgLoader},
     types::{
-        BigUint, EsdtTokenPayment, ManagedBuffer, ManagedBufferCachedBuilder, ManagedType,
-        ManagedVec,
+        BigUint, EsdtTokenPayment, ManagedBuffer, ManagedBufferBuilder, ManagedType, ManagedVec,
     },
 };
 
@@ -56,7 +55,7 @@ where
     }
 
     pub fn to_call_data_string(&self) -> ManagedBuffer<SA> {
-        let mut result = ManagedBufferCachedBuilder::default();
+        let mut result = ManagedBufferBuilder::default();
         result.append_managed_buffer(&self.basic.function_call.function_name);
         for arg in self.basic.function_call.arg_buffer.raw_arg_iter() {
             result.append_bytes(b"@");
diff --git a/framework/base/src/types/interaction/function_call.rs b/framework/base/src/types/interaction/function_call.rs
index a2140f14fa..94740624f5 100644
--- a/framework/base/src/types/interaction/function_call.rs
+++ b/framework/base/src/types/interaction/function_call.rs
@@ -11,7 +11,7 @@ use crate::{
     },
     formatter::SCLowerHex,
     types::{
-        EsdtTokenPayment, ManagedAddress, ManagedBuffer, ManagedBufferCachedBuilder, ManagedVec,
+        EsdtTokenPayment, ManagedAddress, ManagedBuffer, ManagedBufferBuilder, ManagedVec,
         MultiValueEncoded,
     },
 };
@@ -64,7 +64,7 @@ where
     }
 
     pub fn to_call_data_string(&self) -> ManagedBuffer<Api> {
-        let mut result = ManagedBufferCachedBuilder::default();
+        let mut result = ManagedBufferBuilder::default();
         result.append_managed_buffer(&self.function_name);
         for arg in self.arg_buffer.raw_arg_iter() {
             result.append_bytes(b"@");
diff --git a/framework/base/src/types/managed/wrapped/builder.rs b/framework/base/src/types/managed/wrapped/builder.rs
new file mode 100644
index 0000000000..614edc8133
--- /dev/null
+++ b/framework/base/src/types/managed/wrapped/builder.rs
@@ -0,0 +1,5 @@
+mod managed_buffer_builder;
+
+pub use managed_buffer_builder::ManagedBufferBuilder;
+
+pub type ManagedBufferCachedBuilder<M> = ManagedBufferBuilder<M>;
diff --git a/framework/base/src/types/managed/wrapped/managed_buffer_cached_builder.rs b/framework/base/src/types/managed/wrapped/builder/managed_buffer_builder.rs
similarity index 92%
rename from framework/base/src/types/managed/wrapped/managed_buffer_cached_builder.rs
rename to framework/base/src/types/managed/wrapped/builder/managed_buffer_builder.rs
index 85d6c5a264..efe0301e67 100644
--- a/framework/base/src/types/managed/wrapped/managed_buffer_cached_builder.rs
+++ b/framework/base/src/types/managed/wrapped/builder/managed_buffer_builder.rs
@@ -12,7 +12,7 @@ use crate::{
 const HEX_CONVERSION_BUFFER_LEN: usize = 32;
 const BIN_CONVERSION_BUFFER_LEN: usize = 32;
 
-pub struct ManagedBufferCachedBuilder<M>
+pub struct ManagedBufferBuilder<M>
 where
     M: ManagedTypeApi,
 {
@@ -20,7 +20,7 @@ where
     static_cache: Option<StaticBufferRef<M>>,
 }
 
-impl<M> ManagedBufferCachedBuilder<M>
+impl<M> ManagedBufferBuilder<M>
 where
     M: ManagedTypeApi,
 {
@@ -31,12 +31,12 @@ where
     pub fn new_from_slice(slice: &[u8]) -> Self {
         let static_cache = StaticBufferRef::try_new(slice);
         if static_cache.is_some() {
-            ManagedBufferCachedBuilder {
+            ManagedBufferBuilder {
                 managed_buffer: ManagedBuffer::new(),
                 static_cache,
             }
         } else {
-            ManagedBufferCachedBuilder {
+            ManagedBufferBuilder {
                 managed_buffer: slice.into(),
                 static_cache: None,
             }
@@ -44,7 +44,7 @@ where
     }
 }
 
-impl<M> Default for ManagedBufferCachedBuilder<M>
+impl<M> Default for ManagedBufferBuilder<M>
 where
     M: ManagedTypeApi,
 {
@@ -54,7 +54,7 @@ where
     }
 }
 
-impl<M> ManagedBufferCachedBuilder<M>
+impl<M> ManagedBufferBuilder<M>
 where
     M: ManagedTypeApi,
 {
@@ -125,7 +125,7 @@ where
     }
 }
 
-impl<M: ManagedTypeApi> NestedEncodeOutput for ManagedBufferCachedBuilder<M> {
+impl<M: ManagedTypeApi> NestedEncodeOutput for ManagedBufferBuilder<M> {
     fn write(&mut self, bytes: &[u8]) {
         self.append_bytes(bytes);
     }
@@ -156,7 +156,7 @@ impl<M: ManagedTypeApi> NestedEncodeOutput for ManagedBufferCachedBuilder<M> {
     }
 }
 
-impl<M> FormatByteReceiver for ManagedBufferCachedBuilder<M>
+impl<M> FormatByteReceiver for ManagedBufferBuilder<M>
 where
     M: ManagedTypeApi,
 {
@@ -179,7 +179,7 @@ where
     }
 }
 
-impl<M: ManagedTypeApi> FormatBuffer for ManagedBufferCachedBuilder<M> {
+impl<M: ManagedTypeApi> FormatBuffer for ManagedBufferBuilder<M> {
     fn append_ascii(&mut self, ascii: &[u8]) {
         self.append_bytes(ascii)
     }
diff --git a/framework/base/src/types/managed/wrapped/mod.rs b/framework/base/src/types/managed/wrapped/mod.rs
index 7ead89e3a0..e883e67e93 100644
--- a/framework/base/src/types/managed/wrapped/mod.rs
+++ b/framework/base/src/types/managed/wrapped/mod.rs
@@ -1,3 +1,4 @@
+mod builder;
 mod egld_or_esdt_token_identifier;
 mod egld_or_esdt_token_payment;
 mod egld_or_multi_esdt_payment;
@@ -5,7 +6,6 @@ mod encoded_managed_vec_item;
 mod esdt_token_data;
 mod esdt_token_payment;
 mod managed_address;
-mod managed_buffer_cached_builder;
 mod managed_byte_array;
 mod managed_option;
 mod managed_ref;
@@ -19,6 +19,7 @@ mod randomness_source;
 mod token_identifier;
 mod traits;
 
+pub use builder::*;
 pub use egld_or_esdt_token_identifier::EgldOrEsdtTokenIdentifier;
 pub use egld_or_esdt_token_payment::EgldOrEsdtTokenPayment;
 pub use egld_or_multi_esdt_payment::EgldOrMultiEsdtPayment;
@@ -26,7 +27,6 @@ pub(crate) use encoded_managed_vec_item::EncodedManagedVecItem;
 pub use esdt_token_data::EsdtTokenData;
 pub use esdt_token_payment::{EsdtTokenPayment, MultiEsdtPayment};
 pub use managed_address::ManagedAddress;
-pub use managed_buffer_cached_builder::ManagedBufferCachedBuilder;
 pub(crate) use managed_byte_array::ManagedBufferSizeContext;
 pub use managed_byte_array::ManagedByteArray;
 pub use managed_option::ManagedOption;
diff --git a/framework/derive/src/preprocessing/substitution_list.rs b/framework/derive/src/preprocessing/substitution_list.rs
index 8084651a49..62fdb11823 100644
--- a/framework/derive/src/preprocessing/substitution_list.rs
+++ b/framework/derive/src/preprocessing/substitution_list.rs
@@ -71,7 +71,7 @@ fn add_managed_types(substitutions: &mut SubstitutionsMap) {
     add_managed_type(substitutions, &quote!(EsdtTokenData));
     add_managed_type(substitutions, &quote!(EsdtTokenPayment));
     add_managed_type(substitutions, &quote!(ManagedAddress));
-    add_managed_type(substitutions, &quote!(ManagedBufferCachedBuilder));
+    add_managed_type(substitutions, &quote!(ManagedBufferBuilder));
     add_managed_type_with_generics(substitutions, &quote!(ManagedByteArray));
     add_managed_type_with_generics(substitutions, &quote!(ManagedOption));
     add_managed_type_with_generics(substitutions, &quote!(ManagedRef));
diff --git a/framework/scenario/src/api/local_api_vh/print_api_vh.rs b/framework/scenario/src/api/local_api_vh/print_api_vh.rs
index 6774e9546d..58cdb7fd16 100644
--- a/framework/scenario/src/api/local_api_vh/print_api_vh.rs
+++ b/framework/scenario/src/api/local_api_vh/print_api_vh.rs
@@ -2,7 +2,7 @@ use std::cell::RefCell;
 
 use multiversx_sc::{
     api::{PrintApi, PrintApiImpl},
-    types::ManagedBufferCachedBuilder,
+    types::ManagedBufferBuilder,
 };
 
 use crate::api::{VMHooksApi, VMHooksApiBackend};
@@ -34,7 +34,7 @@ impl<VHB: VMHooksApiBackend> PrintApi for VMHooksApi<VHB> {
 }
 
 impl<VHB: VMHooksApiBackend> PrintApiImpl for VMHooksApi<VHB> {
-    type Buffer = ManagedBufferCachedBuilder<Self>;
+    type Buffer = ManagedBufferBuilder<Self>;
 
     fn print_buffer(&self, buffer: Self::Buffer) {
         let bytes = buffer.into_managed_buffer().to_boxed_bytes();

From 7dcde7911ac3d547224149727106187bb4ad7b65 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 5 Apr 2024 19:46:59 +0300
Subject: [PATCH 0653/1254] ManagedBufferBuilder separated implementation

---
 .../base/src/formatter/formatter_traits.rs    |  2 +-
 .../base/src/types/managed/wrapped/builder.rs |  6 ++
 .../wrapped/builder/managed_buffer_builder.rs | 88 +++++++------------
 .../builder/managed_buffer_builder_impl.rs    | 14 +++
 .../managed_buffer_builder_impl_cached.rs     | 83 +++++++++++++++++
 5 files changed, 138 insertions(+), 55 deletions(-)
 create mode 100644 framework/base/src/types/managed/wrapped/builder/managed_buffer_builder_impl.rs
 create mode 100644 framework/base/src/types/managed/wrapped/builder/managed_buffer_builder_impl_cached.rs

diff --git a/framework/base/src/formatter/formatter_traits.rs b/framework/base/src/formatter/formatter_traits.rs
index 7faa0b00f5..015641e3b6 100644
--- a/framework/base/src/formatter/formatter_traits.rs
+++ b/framework/base/src/formatter/formatter_traits.rs
@@ -19,7 +19,7 @@ pub trait FormatByteReceiver {
     fn append_managed_buffer_binary(&mut self, item: &ManagedBuffer<Self::Api>);
 }
 
-pub trait FormatBuffer: Default {
+pub trait FormatBuffer {
     fn append_ascii(&mut self, ascii: &[u8]);
 
     fn append_display<T: SCDisplay>(&mut self, item: &T);
diff --git a/framework/base/src/types/managed/wrapped/builder.rs b/framework/base/src/types/managed/wrapped/builder.rs
index 614edc8133..89bc92feb2 100644
--- a/framework/base/src/types/managed/wrapped/builder.rs
+++ b/framework/base/src/types/managed/wrapped/builder.rs
@@ -1,5 +1,11 @@
 mod managed_buffer_builder;
+mod managed_buffer_builder_impl;
+mod managed_buffer_builder_impl_cached;
 
 pub use managed_buffer_builder::ManagedBufferBuilder;
+pub use managed_buffer_builder_impl::ManagedBufferBuilderImpl;
+pub use managed_buffer_builder_impl_cached::ManagedBufferBuilderImplCached;
 
 pub type ManagedBufferCachedBuilder<M> = ManagedBufferBuilder<M>;
+
+pub type ManagedBufferImplDefault<M> = ManagedBufferBuilderImplCached<M>;
diff --git a/framework/base/src/types/managed/wrapped/builder/managed_buffer_builder.rs b/framework/base/src/types/managed/wrapped/builder/managed_buffer_builder.rs
index efe0301e67..ac3b733ac7 100644
--- a/framework/base/src/types/managed/wrapped/builder/managed_buffer_builder.rs
+++ b/framework/base/src/types/managed/wrapped/builder/managed_buffer_builder.rs
@@ -1,3 +1,5 @@
+use core::marker::PhantomData;
+
 use crate::codec::{EncodeError, EncodeErrorHandler, NestedEncodeOutput, TryStaticCast};
 
 use crate::{
@@ -6,45 +8,41 @@ use crate::{
         hex_util::{byte_to_binary_digits, byte_to_hex_digits},
         FormatBuffer, FormatByteReceiver, SCBinary, SCCodec, SCDisplay, SCLowerHex,
     },
-    types::{BigInt, BigUint, ManagedBuffer, StaticBufferRef},
+    types::ManagedBuffer,
 };
 
+use super::{ManagedBufferBuilderImpl, ManagedBufferImplDefault};
+
 const HEX_CONVERSION_BUFFER_LEN: usize = 32;
 const BIN_CONVERSION_BUFFER_LEN: usize = 32;
 
-pub struct ManagedBufferBuilder<M>
+pub struct ManagedBufferBuilder<M, Impl = ManagedBufferImplDefault<M>>
 where
     M: ManagedTypeApi,
+    Impl: ManagedBufferBuilderImpl<M>,
 {
-    managed_buffer: ManagedBuffer<M>,
-    static_cache: Option<StaticBufferRef<M>>,
+    _phantom: PhantomData<M>,
+    implementation: Impl,
 }
 
-impl<M> ManagedBufferBuilder<M>
+impl<M, Impl> ManagedBufferBuilder<M, Impl>
 where
     M: ManagedTypeApi,
+    Impl: ManagedBufferBuilderImpl<M>,
 {
     /// Creates instance as lazily as possible.
     /// If possible, the slice is loaded into the static buffer.
     /// If not, it is saved into the managed buffer so that the data is not lost.
     /// Use `flush_to_managed_buffer` after this to ensure that the managed buffer is populated.
     pub fn new_from_slice(slice: &[u8]) -> Self {
-        let static_cache = StaticBufferRef::try_new(slice);
-        if static_cache.is_some() {
-            ManagedBufferBuilder {
-                managed_buffer: ManagedBuffer::new(),
-                static_cache,
-            }
-        } else {
-            ManagedBufferBuilder {
-                managed_buffer: slice.into(),
-                static_cache: None,
-            }
+        ManagedBufferBuilder {
+            _phantom: PhantomData,
+            implementation: Impl::new_from_slice(slice),
         }
     }
 }
 
-impl<M> Default for ManagedBufferBuilder<M>
+impl<M> Default for ManagedBufferBuilder<M, ManagedBufferImplDefault<M>>
 where
     M: ManagedTypeApi,
 {
@@ -54,48 +52,21 @@ where
     }
 }
 
-impl<M> ManagedBufferBuilder<M>
+impl<M, Impl> ManagedBufferBuilder<M, Impl>
 where
     M: ManagedTypeApi,
+    Impl: ManagedBufferBuilderImpl<M>,
 {
-    pub fn into_managed_buffer(mut self) -> ManagedBuffer<M> {
-        self.flush_to_managed_buffer();
-        self.managed_buffer
-    }
-
-    fn flush_to_managed_buffer(&mut self) {
-        let old_static_cache = core::mem::take(&mut self.static_cache);
-        if let Some(static_cache) = &old_static_cache {
-            static_cache.with_buffer_contents(|bytes| {
-                self.managed_buffer.append_bytes(bytes);
-            });
-        }
+    pub fn into_managed_buffer(self) -> ManagedBuffer<M> {
+        self.implementation.into_managed_buffer()
     }
 
     pub fn append_bytes(&mut self, bytes: &[u8]) {
-        if let Some(static_cache) = &mut self.static_cache {
-            let success = static_cache.try_extend_from_slice(bytes);
-            if !success {
-                self.flush_to_managed_buffer();
-                self.managed_buffer.append_bytes(bytes);
-            }
-        } else {
-            self.managed_buffer.append_bytes(bytes);
-        }
+        self.implementation.append_bytes(bytes);
     }
 
     pub fn append_managed_buffer(&mut self, item: &ManagedBuffer<M>) {
-        if let Some(static_cache) = &mut self.static_cache {
-            let success = static_cache.try_extend_from_copy_bytes(item.len(), |dest_slice| {
-                let _ = item.load_slice(0, dest_slice);
-            });
-            if !success {
-                self.flush_to_managed_buffer();
-                self.managed_buffer.append(item);
-            }
-        } else {
-            self.managed_buffer.append(item);
-        }
+        self.implementation.append_managed_buffer(item);
     }
 
     /// Converts the input to hex and adds it to the current buffer.
@@ -125,14 +96,18 @@ where
     }
 }
 
-impl<M: ManagedTypeApi> NestedEncodeOutput for ManagedBufferBuilder<M> {
+impl<M, Impl> NestedEncodeOutput for ManagedBufferBuilder<M, Impl>
+where
+    M: ManagedTypeApi,
+    Impl: ManagedBufferBuilderImpl<M>,
+{
     fn write(&mut self, bytes: &[u8]) {
         self.append_bytes(bytes);
     }
 
     #[inline]
     fn supports_specialized_type<T: TryStaticCast>() -> bool {
-        T::type_eq::<ManagedBuffer<M>>() || T::type_eq::<BigUint<M>>() || T::type_eq::<BigInt<M>>()
+        T::type_eq::<ManagedBuffer<M>>()
     }
 
     #[inline]
@@ -156,9 +131,10 @@ impl<M: ManagedTypeApi> NestedEncodeOutput for ManagedBufferBuilder<M> {
     }
 }
 
-impl<M> FormatByteReceiver for ManagedBufferBuilder<M>
+impl<M, Impl> FormatByteReceiver for ManagedBufferBuilder<M, Impl>
 where
     M: ManagedTypeApi,
+    Impl: ManagedBufferBuilderImpl<M>,
 {
     type Api = M;
 
@@ -179,7 +155,11 @@ where
     }
 }
 
-impl<M: ManagedTypeApi> FormatBuffer for ManagedBufferBuilder<M> {
+impl<M, Impl> FormatBuffer for ManagedBufferBuilder<M, Impl>
+where
+    M: ManagedTypeApi,
+    Impl: ManagedBufferBuilderImpl<M>,
+{
     fn append_ascii(&mut self, ascii: &[u8]) {
         self.append_bytes(ascii)
     }
diff --git a/framework/base/src/types/managed/wrapped/builder/managed_buffer_builder_impl.rs b/framework/base/src/types/managed/wrapped/builder/managed_buffer_builder_impl.rs
new file mode 100644
index 0000000000..dfade9b6e3
--- /dev/null
+++ b/framework/base/src/types/managed/wrapped/builder/managed_buffer_builder_impl.rs
@@ -0,0 +1,14 @@
+use crate::{api::ManagedTypeApi, types::ManagedBuffer};
+
+pub trait ManagedBufferBuilderImpl<M>
+where
+    M: ManagedTypeApi,
+{
+    fn new_from_slice(slice: &[u8]) -> Self;
+
+    fn into_managed_buffer(self) -> ManagedBuffer<M>;
+
+    fn append_bytes(&mut self, bytes: &[u8]);
+
+    fn append_managed_buffer(&mut self, item: &ManagedBuffer<M>);
+}
diff --git a/framework/base/src/types/managed/wrapped/builder/managed_buffer_builder_impl_cached.rs b/framework/base/src/types/managed/wrapped/builder/managed_buffer_builder_impl_cached.rs
new file mode 100644
index 0000000000..c7977d056d
--- /dev/null
+++ b/framework/base/src/types/managed/wrapped/builder/managed_buffer_builder_impl_cached.rs
@@ -0,0 +1,83 @@
+use crate::{
+    api::ManagedTypeApi,
+    types::{ManagedBuffer, StaticBufferRef},
+};
+
+use super::ManagedBufferBuilderImpl;
+
+pub struct ManagedBufferBuilderImplCached<M>
+where
+    M: ManagedTypeApi,
+{
+    managed_buffer: ManagedBuffer<M>,
+    static_cache: Option<StaticBufferRef<M>>,
+}
+
+impl<M> ManagedBufferBuilderImplCached<M>
+where
+    M: ManagedTypeApi,
+{
+    fn flush_to_managed_buffer(&mut self) {
+        let old_static_cache = core::mem::take(&mut self.static_cache);
+        if let Some(static_cache) = &old_static_cache {
+            static_cache.with_buffer_contents(|bytes| {
+                self.managed_buffer.append_bytes(bytes);
+            });
+        }
+    }
+}
+
+impl<M> ManagedBufferBuilderImpl<M> for ManagedBufferBuilderImplCached<M>
+where
+    M: ManagedTypeApi,
+{
+    /// Creates instance as lazily as possible.
+    /// If possible, the slice is loaded into the static buffer.
+    /// If not, it is saved into the managed buffer so that the data is not lost.
+    /// Use `flush_to_managed_buffer` after this to ensure that the managed buffer is populated.
+    fn new_from_slice(slice: &[u8]) -> Self {
+        let static_cache = StaticBufferRef::try_new(slice);
+        if static_cache.is_some() {
+            ManagedBufferBuilderImplCached {
+                managed_buffer: ManagedBuffer::new(),
+                static_cache,
+            }
+        } else {
+            ManagedBufferBuilderImplCached {
+                managed_buffer: slice.into(),
+                static_cache: None,
+            }
+        }
+    }
+
+    fn into_managed_buffer(mut self) -> ManagedBuffer<M> {
+        self.flush_to_managed_buffer();
+        self.managed_buffer
+    }
+
+    fn append_bytes(&mut self, bytes: &[u8]) {
+        if let Some(static_cache) = &mut self.static_cache {
+            let success = static_cache.try_extend_from_slice(bytes);
+            if !success {
+                self.flush_to_managed_buffer();
+                self.managed_buffer.append_bytes(bytes);
+            }
+        } else {
+            self.managed_buffer.append_bytes(bytes);
+        }
+    }
+
+    fn append_managed_buffer(&mut self, item: &ManagedBuffer<M>) {
+        if let Some(static_cache) = &mut self.static_cache {
+            let success = static_cache.try_extend_from_copy_bytes(item.len(), |dest_slice| {
+                let _ = item.load_slice(0, dest_slice);
+            });
+            if !success {
+                self.flush_to_managed_buffer();
+                self.managed_buffer.append(item);
+            }
+        } else {
+            self.managed_buffer.append(item);
+        }
+    }
+}

From 38e452d2b732f5bb5604bd316b15f7c936d0a757 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 5 Apr 2024 22:32:43 +0300
Subject: [PATCH 0654/1254] ManagedBufferBuilder fix

---
 framework/base/src/formatter/formatter_traits.rs               | 2 +-
 .../types/managed/wrapped/builder/managed_buffer_builder.rs    | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/framework/base/src/formatter/formatter_traits.rs b/framework/base/src/formatter/formatter_traits.rs
index 015641e3b6..7faa0b00f5 100644
--- a/framework/base/src/formatter/formatter_traits.rs
+++ b/framework/base/src/formatter/formatter_traits.rs
@@ -19,7 +19,7 @@ pub trait FormatByteReceiver {
     fn append_managed_buffer_binary(&mut self, item: &ManagedBuffer<Self::Api>);
 }
 
-pub trait FormatBuffer {
+pub trait FormatBuffer: Default {
     fn append_ascii(&mut self, ascii: &[u8]);
 
     fn append_display<T: SCDisplay>(&mut self, item: &T);
diff --git a/framework/base/src/types/managed/wrapped/builder/managed_buffer_builder.rs b/framework/base/src/types/managed/wrapped/builder/managed_buffer_builder.rs
index ac3b733ac7..b65aa8e0e0 100644
--- a/framework/base/src/types/managed/wrapped/builder/managed_buffer_builder.rs
+++ b/framework/base/src/types/managed/wrapped/builder/managed_buffer_builder.rs
@@ -155,10 +155,9 @@ where
     }
 }
 
-impl<M, Impl> FormatBuffer for ManagedBufferBuilder<M, Impl>
+impl<M> FormatBuffer for ManagedBufferBuilder<M, ManagedBufferImplDefault<M>>
 where
     M: ManagedTypeApi,
-    Impl: ManagedBufferBuilderImpl<M>,
 {
     fn append_ascii(&mut self, ascii: &[u8]) {
         self.append_bytes(ascii)

From 36673864fc759cf10b6481a657c3520d9927bd11 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 5 Apr 2024 23:10:52 +0300
Subject: [PATCH 0655/1254] ManagedBufferBuilder removed cache by default

---
 framework/base/Cargo.toml                     |  1 +
 .../base/src/types/managed/wrapped/builder.rs |  7 ++++
 .../managed_buffer_builder_impl_basic.rs      | 40 +++++++++++++++++++
 .../managed_buffer_builder_impl_cached.rs     |  1 +
 4 files changed, 49 insertions(+)
 create mode 100644 framework/base/src/types/managed/wrapped/builder/managed_buffer_builder_impl_basic.rs

diff --git a/framework/base/Cargo.toml b/framework/base/Cargo.toml
index 9edc7414d7..961a0c59d5 100644
--- a/framework/base/Cargo.toml
+++ b/framework/base/Cargo.toml
@@ -19,6 +19,7 @@ all-features = true
 [features]
 num-bigint = ["multiversx-sc-codec/num-bigint"]
 alloc = ["multiversx-sc-codec/alloc"]
+managed-buffer-builder-cached = []
 esdt-token-payment-legacy-decode = []
 
 [dependencies]
diff --git a/framework/base/src/types/managed/wrapped/builder.rs b/framework/base/src/types/managed/wrapped/builder.rs
index 89bc92feb2..78f81f6e81 100644
--- a/framework/base/src/types/managed/wrapped/builder.rs
+++ b/framework/base/src/types/managed/wrapped/builder.rs
@@ -1,11 +1,18 @@
 mod managed_buffer_builder;
 mod managed_buffer_builder_impl;
+mod managed_buffer_builder_impl_basic;
 mod managed_buffer_builder_impl_cached;
 
 pub use managed_buffer_builder::ManagedBufferBuilder;
 pub use managed_buffer_builder_impl::ManagedBufferBuilderImpl;
+pub use managed_buffer_builder_impl_basic::ManagedBufferBuilderImplBasic;
 pub use managed_buffer_builder_impl_cached::ManagedBufferBuilderImplCached;
 
+#[deprecated(since = "0.48.0", note = "Renamed to ManagedBufferBuilder.")]
 pub type ManagedBufferCachedBuilder<M> = ManagedBufferBuilder<M>;
 
+#[cfg(feature = "managed-buffer-builder-cached")]
 pub type ManagedBufferImplDefault<M> = ManagedBufferBuilderImplCached<M>;
+
+#[cfg(not(feature = "managed-buffer-builder-cached"))]
+pub type ManagedBufferImplDefault<M> = ManagedBufferBuilderImplBasic<M>;
diff --git a/framework/base/src/types/managed/wrapped/builder/managed_buffer_builder_impl_basic.rs b/framework/base/src/types/managed/wrapped/builder/managed_buffer_builder_impl_basic.rs
new file mode 100644
index 0000000000..3c1e87c7fb
--- /dev/null
+++ b/framework/base/src/types/managed/wrapped/builder/managed_buffer_builder_impl_basic.rs
@@ -0,0 +1,40 @@
+use crate::{api::ManagedTypeApi, types::ManagedBuffer};
+
+use super::ManagedBufferBuilderImpl;
+
+/// Basic implementation of a ManagedBuffer builder, no caching.
+///
+/// It is the ManagedBuffer itself, we just append to it each time.
+pub struct ManagedBufferBuilderImplBasic<M>
+where
+    M: ManagedTypeApi,
+{
+    managed_buffer: ManagedBuffer<M>,
+}
+
+impl<M> ManagedBufferBuilderImpl<M> for ManagedBufferBuilderImplBasic<M>
+where
+    M: ManagedTypeApi,
+{
+    #[inline]
+    fn new_from_slice(slice: &[u8]) -> Self {
+        ManagedBufferBuilderImplBasic {
+            managed_buffer: slice.into(),
+        }
+    }
+
+    #[inline]
+    fn into_managed_buffer(self) -> ManagedBuffer<M> {
+        self.managed_buffer
+    }
+
+    #[inline]
+    fn append_bytes(&mut self, bytes: &[u8]) {
+        self.managed_buffer.append_bytes(bytes);
+    }
+
+    #[inline]
+    fn append_managed_buffer(&mut self, item: &ManagedBuffer<M>) {
+        self.managed_buffer.append(item);
+    }
+}
diff --git a/framework/base/src/types/managed/wrapped/builder/managed_buffer_builder_impl_cached.rs b/framework/base/src/types/managed/wrapped/builder/managed_buffer_builder_impl_cached.rs
index c7977d056d..ead06e151c 100644
--- a/framework/base/src/types/managed/wrapped/builder/managed_buffer_builder_impl_cached.rs
+++ b/framework/base/src/types/managed/wrapped/builder/managed_buffer_builder_impl_cached.rs
@@ -5,6 +5,7 @@ use crate::{
 
 use super::ManagedBufferBuilderImpl;
 
+/// A ManagedBuffer builder implementation that caches data to the static cache locally in the contract.
 pub struct ManagedBufferBuilderImplCached<M>
 where
     M: ManagedTypeApi,

From a358568c3b141796ac92bb27a66db2ea4ac559e6 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Sun, 7 Apr 2024 22:06:49 +0300
Subject: [PATCH 0656/1254] fixed retrieving new token identifier

---
 .../scenario/model/transaction/tx_response.rs | 264 ++++++++++++++++++
 sdk/core/src/data/transaction.rs              |   1 +
 2 files changed, 265 insertions(+)

diff --git a/framework/scenario/src/scenario/model/transaction/tx_response.rs b/framework/scenario/src/scenario/model/transaction/tx_response.rs
index 440db8258a..984d9ed810 100644
--- a/framework/scenario/src/scenario/model/transaction/tx_response.rs
+++ b/framework/scenario/src/scenario/model/transaction/tx_response.rs
@@ -208,11 +208,13 @@ impl TxResponse {
             let is_issue_semi_fungible = prev_tx.data.starts_with("issueSemiFungible@");
             let is_issue_non_fungible = prev_tx.data.starts_with("issueNonFungible@");
             let is_register_meta_esdt = prev_tx.data.starts_with("registerMetaESDT@");
+            let is_register_and_set_all_roles_esdt = prev_tx.data.starts_with("registerAndSetAllRoles@");
 
             if !is_issue_fungible
                 && !is_issue_semi_fungible
                 && !is_issue_non_fungible
                 && !is_register_meta_esdt
+                && !is_register_and_set_all_roles_esdt
             {
                 continue;
             }
@@ -2370,4 +2372,266 @@ mod tests {
 
         assert_eq!(tx_response.new_issued_token_identifier, expected)
     }
+
+    #[test]
+    fn test_multisig_issue_nft_and_set_all_roles() {
+        let data = r#"
+{
+  "data": {
+    "transaction": {
+      "type": "normal",
+      "processingTypeOnSource": "SCInvoking",
+      "processingTypeOnDestination": "SCInvoking",
+      "hash": "08582bc19734ad82d7390be88463c948e5d9f026f4b8f0bfc57620957c3433bd",
+      "nonce": 53,
+      "round": 3050972,
+      "epoch": 1246,
+      "value": "0",
+      "receiver": "erd1qqqqqqqqqqqqqpgqrp3n58vp2dmcaur4whazxngvuhac4xwqa4sq2pjl73",
+      "sender": "erd1uv40ahysflse896x4ktnh6ecx43u7cmy9wnxnvcyp7deg299a4sq6vaywa",
+      "gasPrice": 1000000000,
+      "gasLimit": 80000000,
+      "gasUsed": 80000000,
+      "data": "cGVyZm9ybUFjdGlvbkAwMQ==",
+      "signature": "cb67645595cee5f7967d8d85af05bb7db73e80d9b97611796819249d87cd174b69b4abfc2a3fbe52df1aec965bdea921f7eb34d2b1118aa480699ad1dc85790a",
+      "sourceShard": 0,
+      "destinationShard": 0,
+      "blockNonce": 2984930,
+      "blockHash": "644ae8703b826a23e89429953919ec37f875e34a547ea9f7edd53fb71a99c746",
+      "notarizedAtSourceInMetaNonce": 2988311,
+      "NotarizedAtSourceInMetaHash": "4f608a72e654dd9f466801cd489be8ee1a73fbcd77b128559cd46182d3b9455a",
+      "notarizedAtDestinationInMetaNonce": 2988311,
+      "notarizedAtDestinationInMetaHash": "4f608a72e654dd9f466801cd489be8ee1a73fbcd77b128559cd46182d3b9455a",
+      "miniblockType": "TxBlock",
+      "miniblockHash": "c5a73671bc1d37835ddd15b926157721bc83203ec4e00cd48ae0d46015cb5f0b",
+      "hyperblockNonce": 2988311,
+      "hyperblockHash": "4f608a72e654dd9f466801cd489be8ee1a73fbcd77b128559cd46182d3b9455a",
+      "timestamp": 1712305832,
+      "smartContractResults": [
+        {
+          "hash": "b0b3c8df519c33b314c0ee3d25abae6f17c4432fb3382676ce17a42690811cff",
+          "nonce": 0,
+          "value": 50000000000000000,
+          "receiver": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
+          "sender": "erd1qqqqqqqqqqqqqpgqrp3n58vp2dmcaur4whazxngvuhac4xwqa4sq2pjl73",
+          "data": "registerAndSetAllRoles@54657374436f6c6c656374696f6e31@54455354434f4c4c31@4e4654@@98fa4ff554b9c6990ce577fbb816a271f690dcbd6b148f6583fe7692868ae538@08582bc19734ad82d7390be88463c948e5d9f026f4b8f0bfc57620957c3433bd@5e2338",
+          "prevTxHash": "08582bc19734ad82d7390be88463c948e5d9f026f4b8f0bfc57620957c3433bd",
+          "originalTxHash": "08582bc19734ad82d7390be88463c948e5d9f026f4b8f0bfc57620957c3433bd",
+          "gasLimit": 73052300,
+          "gasPrice": 1000000000,
+          "callType": 1,
+          "originalSender": "erd1uv40ahysflse896x4ktnh6ecx43u7cmy9wnxnvcyp7deg299a4sq6vaywa",
+          "operation": "transfer",
+          "function": "registerAndSetAllRoles"
+        },
+        {
+          "hash": "5ae4f74e134e4fa63c8b92e06ff12b2a4b544233d01d80db6a922af35ee55356",
+          "nonce": 1,
+          "value": 196430610000000,
+          "receiver": "erd1qqqqqqqqqqqqqpgqrp3n58vp2dmcaur4whazxngvuhac4xwqa4sq2pjl73",
+          "sender": "erd1qqqqqqqqqqqqqpgqrp3n58vp2dmcaur4whazxngvuhac4xwqa4sq2pjl73",
+          "data": "@6f6b",
+          "prevTxHash": "c4a24b01b48d32308636310e2d335d6ed1f34dcbdfc1133aed7995e78e831c18",
+          "originalTxHash": "08582bc19734ad82d7390be88463c948e5d9f026f4b8f0bfc57620957c3433bd",
+          "gasLimit": 0,
+          "gasPrice": 1000000000,
+          "callType": 0,
+          "operation": "transfer",
+          "isRefund": true
+        },
+        {
+          "hash": "7589c1ad622d8a9ab2f186731fc82aeeab0aea5a8198cb94b6eba85a966e7962",
+          "nonce": 0,
+          "value": 0,
+          "receiver": "erd1llllllllllllllllllllllllllllllllllllllllllllllllluqq2m3f0f",
+          "sender": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
+          "data": "ESDTSetBurnRoleForAll@54455354434f4c4c312d356161383063",
+          "prevTxHash": "b0b3c8df519c33b314c0ee3d25abae6f17c4432fb3382676ce17a42690811cff",
+          "originalTxHash": "08582bc19734ad82d7390be88463c948e5d9f026f4b8f0bfc57620957c3433bd",
+          "gasLimit": 0,
+          "gasPrice": 1000000000,
+          "callType": 0,
+          "originalSender": "erd1uv40ahysflse896x4ktnh6ecx43u7cmy9wnxnvcyp7deg299a4sq6vaywa",
+          "logs": {
+            "address": "erd1llllllllllllllllllllllllllllllllllllllllllllllllluqq2m3f0f",
+            "events": [
+              {
+                "address": "erd1llllllllllllllllllllllllllllllllllllllllllllllllluqq2m3f0f",
+                "identifier": "completedTxEvent",
+                "topics": [
+                  "sLPI31GcM7MUwO49JauubxfEQy+zOCZ2zhekJpCBHP8="
+                ]
+              }
+            ]
+          },
+          "operation": "transfer"
+        },
+        {
+          "hash": "86d1ec3365ea1311dbde2f2366de4ea8627d7e49c29a974578c0869b66903cbc",
+          "nonce": 0,
+          "value": 0,
+          "receiver": "erd1qqqqqqqqqqqqqpgqrp3n58vp2dmcaur4whazxngvuhac4xwqa4sq2pjl73",
+          "sender": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
+          "data": "ESDTSetRole@54455354434f4c4c312d356161383063@45534454526f6c654e4654437265617465@45534454526f6c654e46544275726e@45534454526f6c654e465455706461746541747472696275746573@45534454526f6c654e4654416464555249",
+          "prevTxHash": "b0b3c8df519c33b314c0ee3d25abae6f17c4432fb3382676ce17a42690811cff",
+          "originalTxHash": "08582bc19734ad82d7390be88463c948e5d9f026f4b8f0bfc57620957c3433bd",
+          "gasLimit": 0,
+          "gasPrice": 1000000000,
+          "callType": 0,
+          "originalSender": "erd1uv40ahysflse896x4ktnh6ecx43u7cmy9wnxnvcyp7deg299a4sq6vaywa",
+          "logs": {
+            "address": "erd1qqqqqqqqqqqqqpgqrp3n58vp2dmcaur4whazxngvuhac4xwqa4sq2pjl73",
+            "events": [
+              {
+                "address": "erd1qqqqqqqqqqqqqpgqrp3n58vp2dmcaur4whazxngvuhac4xwqa4sq2pjl73",
+                "identifier": "ESDTSetRole",
+                "topics": [
+                  "VEVTVENPTEwxLTVhYTgwYw==",
+                  "",
+                  "",
+                  "RVNEVFJvbGVORlRDcmVhdGU=",
+                  "RVNEVFJvbGVORlRCdXJu",
+                  "RVNEVFJvbGVORlRVcGRhdGVBdHRyaWJ1dGVz",
+                  "RVNEVFJvbGVORlRBZGRVUkk="
+                ]
+              },
+              {
+                "address": "erd1qqqqqqqqqqqqqpgqrp3n58vp2dmcaur4whazxngvuhac4xwqa4sq2pjl73",
+                "identifier": "completedTxEvent",
+                "topics": [
+                  "sLPI31GcM7MUwO49JauubxfEQy+zOCZ2zhekJpCBHP8="
+                ]
+              }
+            ]
+          },
+          "operation": "ESDTSetRole",
+          "function": "ESDTSetRole"
+        },
+        {
+          "hash": "c4a24b01b48d32308636310e2d335d6ed1f34dcbdfc1133aed7995e78e831c18",
+          "nonce": 0,
+          "value": 0,
+          "receiver": "erd1qqqqqqqqqqqqqpgqrp3n58vp2dmcaur4whazxngvuhac4xwqa4sq2pjl73",
+          "sender": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
+          "data": "@00@54455354434f4c4c312d356161383063@3ec73c55022548038bbe06c0639156b3db70b7c770955e340f14fcfcd45df06a@98fa4ff554b9c6990ce577fbb816a271f690dcbd6b148f6583fe7692868ae538@08582bc19734ad82d7390be88463c948e5d9f026f4b8f0bfc57620957c3433bd@00",
+          "prevTxHash": "b0b3c8df519c33b314c0ee3d25abae6f17c4432fb3382676ce17a42690811cff",
+          "originalTxHash": "08582bc19734ad82d7390be88463c948e5d9f026f4b8f0bfc57620957c3433bd",
+          "gasLimit": 23052300,
+          "gasPrice": 1000000000,
+          "callType": 2,
+          "originalSender": "erd1uv40ahysflse896x4ktnh6ecx43u7cmy9wnxnvcyp7deg299a4sq6vaywa",
+          "logs": {
+            "address": "erd1qqqqqqqqqqqqqpgqrp3n58vp2dmcaur4whazxngvuhac4xwqa4sq2pjl73",
+            "events": [
+              {
+                "address": "erd1qqqqqqqqqqqqqpgqrp3n58vp2dmcaur4whazxngvuhac4xwqa4sq2pjl73",
+                "identifier": "callBack",
+                "topics": [
+                  "YXN5bmNDYWxsU3VjY2Vzcw==",
+                  "VEVTVENPTEwxLTVhYTgwYw=="
+                ],
+                "additionalData": [
+                  ""
+                ]
+              },
+              {
+                "address": "erd1qqqqqqqqqqqqqpgqrp3n58vp2dmcaur4whazxngvuhac4xwqa4sq2pjl73",
+                "identifier": "completedTxEvent",
+                "topics": [
+                  "sLPI31GcM7MUwO49JauubxfEQy+zOCZ2zhekJpCBHP8="
+                ]
+              }
+            ]
+          },
+          "operation": "transfer"
+        }
+      ],
+      "logs": {
+        "address": "erd1qqqqqqqqqqqqqpgqrp3n58vp2dmcaur4whazxngvuhac4xwqa4sq2pjl73",
+        "events": [
+          {
+            "address": "erd1qqqqqqqqqqqqqpgqrp3n58vp2dmcaur4whazxngvuhac4xwqa4sq2pjl73",
+            "identifier": "performAction",
+            "topics": [
+              "c3RhcnRQZXJmb3JtQWN0aW9u"
+            ],
+            "data": "AAAAAQYAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAL//wAAAAexorwuxQAAAAAAFnJlZ2lzdGVyQW5kU2V0QWxsUm9sZXMAAAAEAAAAD1Rlc3RDb2xsZWN0aW9uMQAAAAlURVNUQ09MTDEAAAADTkZUAAAAAAAAAATjKv7ckE/hk5dGrZc76zg1Y89jZCumabMED5uUKKXtYLE6AXQjw2bK/4zs+3ehJhChMPSIgTQSLHk3/q4NbX0XOvjZyUI7JXfGJSciwdkCEqQRH3ID+XRPdvz6HQoxADOyoRVVzlIeSUTgmrF1SdhbSH3NJshLUBejnjGjZwiJug==",
+            "additionalData": [
+              "AAAAAQYAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAL//wAAAAexorwuxQAAAAAAFnJlZ2lzdGVyQW5kU2V0QWxsUm9sZXMAAAAEAAAAD1Rlc3RDb2xsZWN0aW9uMQAAAAlURVNUQ09MTDEAAAADTkZUAAAAAAAAAATjKv7ckE/hk5dGrZc76zg1Y89jZCumabMED5uUKKXtYLE6AXQjw2bK/4zs+3ehJhChMPSIgTQSLHk3/q4NbX0XOvjZyUI7JXfGJSciwdkCEqQRH3ID+XRPdvz6HQoxADOyoRVVzlIeSUTgmrF1SdhbSH3NJshLUBejnjGjZwiJug=="
+            ]
+          },
+          {
+            "address": "erd1qqqqqqqqqqqqqpgqrp3n58vp2dmcaur4whazxngvuhac4xwqa4sq2pjl73",
+            "identifier": "performAction",
+            "topics": [
+              "cGVyZm9ybUFzeW5jQ2FsbA==",
+              "AQ==",
+              "AAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAC//8=",
+              "saK8LsUAAA==",
+              "BGa4HQ==",
+              "cmVnaXN0ZXJBbmRTZXRBbGxSb2xlcw==",
+              "VGVzdENvbGxlY3Rpb24x",
+              "VEVTVENPTEwx",
+              "TkZU",
+              ""
+            ],
+            "additionalData": [
+              ""
+            ]
+          },
+          {
+            "address": "erd1qqqqqqqqqqqqqpgqrp3n58vp2dmcaur4whazxngvuhac4xwqa4sq2pjl73",
+            "identifier": "transferValueOnly",
+            "topics": [
+              "saK8LsUAAA==",
+              "AAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAC//8="
+            ],
+            "data": "QXN5bmNDYWxs",
+            "additionalData": [
+              "QXN5bmNDYWxs",
+              "cmVnaXN0ZXJBbmRTZXRBbGxSb2xlcw==",
+              "VGVzdENvbGxlY3Rpb24x",
+              "VEVTVENPTEwx",
+              "TkZU",
+              ""
+            ]
+          },
+          {
+            "address": "erd1qqqqqqqqqqqqqpgqrp3n58vp2dmcaur4whazxngvuhac4xwqa4sq2pjl73",
+            "identifier": "writeLog",
+            "topics": [
+              "4yr+3JBP4ZOXRq2XO+s4NWPPY2QrpmmzBA+blCil7WA="
+            ],
+            "data": "QDZmNmI=",
+            "additionalData": [
+              "QDZmNmI="
+            ]
+          }
+        ]
+      },
+      "status": "success",
+      "operation": "transfer",
+      "function": "performAction",
+      "initiallyPaidFee": "873260000000000",
+      "fee": "873260000000000",
+      "chainID": "D",
+      "version": 1,
+      "options": 0
+    }
+  },
+  "code": "successful"
+}
+        "#;
+
+        let tx_on_network: TransactionOnNetwork = serde_json::from_str::<TransactionInfo>(data)
+            .unwrap()
+            .data
+            .unwrap()
+            .transaction;
+        let tx_response = TxResponse::from_network_tx(tx_on_network);
+
+        let expected = Some("TESTCOLL1-5aa80c".to_string());
+
+        assert_eq!(tx_response.new_issued_token_identifier, expected)
+    }
 }
diff --git a/sdk/core/src/data/transaction.rs b/sdk/core/src/data/transaction.rs
index 452f0d3679..2df6f37d87 100644
--- a/sdk/core/src/data/transaction.rs
+++ b/sdk/core/src/data/transaction.rs
@@ -132,6 +132,7 @@ pub struct TransactionInfoData {
 // TransactionInfo holds a transaction info response from the network
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct TransactionInfo {
+    #[serde(default)]
     pub error: String,
     pub code: String,
     pub data: Option<TransactionInfoData>,

From d123aead75124bebcf48e818385827cf22b2bdf2 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Mon, 8 Apr 2024 00:09:52 +0300
Subject: [PATCH 0657/1254] multisig replace send_raw

---
 .../examples/multisig/src/multisig_perform.rs | 51 ++++++++++---------
 1 file changed, 26 insertions(+), 25 deletions(-)

diff --git a/contracts/examples/multisig/src/multisig_perform.rs b/contracts/examples/multisig/src/multisig_perform.rs
index dfa7016340..3024df2696 100644
--- a/contracts/examples/multisig/src/multisig_perform.rs
+++ b/contracts/examples/multisig/src/multisig_perform.rs
@@ -167,16 +167,13 @@ pub trait MultisigPerformModule:
                     &call_data.endpoint_name,
                     call_data.arguments.as_multi(),
                 );
-                let result = self.send_raw().direct_egld_execute(
-                    &call_data.to,
-                    &call_data.egld_amount,
-                    gas,
-                    &call_data.endpoint_name,
-                    &call_data.arguments.into(),
-                );
-                if let Result::Err(e) = result {
-                    sc_panic!(e);
-                }
+                self.tx()
+                    .to(call_data.to)
+                    .egld(call_data.egld_amount)
+                    .gas(gas)
+                    .raw_call(call_data.endpoint_name)
+                    .arguments_raw(call_data.arguments.into())
+                    .transfer_execute();
                 OptionalValue::None
             },
             Action::SendAsyncCall(call_data) => {
@@ -213,13 +210,16 @@ pub trait MultisigPerformModule:
                     gas_left,
                     arguments.as_multi(),
                 );
-                let (new_address, _) = self.send_raw().deploy_from_source_contract(
-                    gas_left,
-                    &amount,
-                    &source,
-                    code_metadata,
-                    &arguments.into(),
-                );
+                let new_address = self
+                    .tx()
+                    .egld(amount)
+                    .gas(gas_left)
+                    .raw_deploy()
+                    .from_source(source)
+                    .code_metadata(code_metadata)
+                    .arguments_raw(arguments.into())
+                    .returns(ReturnsNewManagedAddress)
+                    .sync_call();
                 OptionalValue::Some(new_address)
             },
             Action::SCUpgradeFromSource {
@@ -239,14 +239,15 @@ pub trait MultisigPerformModule:
                     gas_left,
                     arguments.as_multi(),
                 );
-                self.send_raw().upgrade_from_source_contract(
-                    &sc_address,
-                    gas_left,
-                    &amount,
-                    &source,
-                    code_metadata,
-                    &arguments.into(),
-                );
+                self.tx()
+                    .to(sc_address)
+                    .egld(amount)
+                    .gas(gas_left)
+                    .raw_upgrade()
+                    .from_source(source)
+                    .code_metadata(code_metadata)
+                    .arguments_raw(arguments.into())
+                    .upgrade_async_call_and_exit();
                 OptionalValue::None
             },
         }

From 17c9e62b13510ec13a49e24a66ee9175d1eacb05 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Mon, 8 Apr 2024 00:12:37 +0300
Subject: [PATCH 0658/1254] multisig interactor - multi sign multiple actions

---
 .../interact/src/multisig_interact.rs         | 49 ++++++++++---------
 .../interact/src/multisig_interact_nfts.rs    |  9 ++--
 2 files changed, 32 insertions(+), 26 deletions(-)

diff --git a/contracts/examples/multisig/interact/src/multisig_interact.rs b/contracts/examples/multisig/interact/src/multisig_interact.rs
index e407c4f641..62074b08a8 100644
--- a/contracts/examples/multisig/interact/src/multisig_interact.rs
+++ b/contracts/examples/multisig/interact/src/multisig_interact.rs
@@ -235,8 +235,8 @@ impl MultisigInteract {
     }
 
     async fn perform_action(&mut self, action_id: usize, gas_expr: u64) {
-        if !self.quorum_reached(action_id).await && !self.sign(action_id).await {
-            return;
+        if !self.quorum_reached(action_id).await {
+            self.sign(&[action_id]).await
         }
         println!("quorum reached for action `{action_id}`");
 
@@ -254,19 +254,23 @@ impl MultisigInteract {
         println!("successfully performed action `{action_id}`");
     }
 
-    async fn perform_actions(&mut self, actions: Vec<usize>, gas_expr: u64) {
+    async fn perform_actions(&mut self, action_ids: Vec<usize>, gas_expr: u64) {
         let multisig_address = self.state.multisig().to_address();
 
-        let mut pending_action_ids = Vec::<usize>::new();
-        for &action_id in actions.iter() {
-            if self.quorum_reached(action_id).await && self.sign(action_id).await {
-                pending_action_ids.push(action_id);
+        let mut actions_no_quorum_reached = Vec::new();
+        for &action_id in &action_ids {
+            if self.quorum_reached(action_id).await {
+                println!("quorum reached for action `{action_id}`");
+            } else {
+                actions_no_quorum_reached.push(action_id)
             }
         }
 
+        self.sign(&actions_no_quorum_reached).await;
+
         let from = &self.wallet_address;
         let mut buffer = self.interactor.homogenous_call_buffer();
-        for action_id in pending_action_ids {
+        for action_id in action_ids {
             buffer.push_tx(|tx| {
                 tx.from(from)
                     .to(&multisig_address)
@@ -314,24 +318,26 @@ impl MultisigInteract {
             .await
     }
 
-    async fn sign(&mut self, action_id: usize) -> bool {
-        println!("signing action `{action_id}`...");
+    async fn sign(&mut self, action_ids: &[usize]) {
+        println!("signing actions `{action_ids:?}`...");
         let multisig_address = self.state.multisig().to_address();
 
-        let mut pending_signers = Vec::<Address>::new();
-        for signer in self.board().iter() {
-            if self.signed(signer, action_id).await {
-                println!(
-                    "{} - already signed action `{action_id}`",
-                    bech32::encode(signer)
-                );
-            } else {
-                pending_signers.push(signer.clone());
+        let mut pending_signers = Vec::<(Address, usize)>::new();
+        for &action_id in action_ids {
+            for signer in self.board().iter() {
+                if self.signed(signer, action_id).await {
+                    println!(
+                        "{} - already signed action `{action_id}`",
+                        bech32::encode(signer)
+                    );
+                } else {
+                    pending_signers.push((signer.clone(), action_id));
+                }
             }
         }
 
         let mut buffer = self.interactor.homogenous_call_buffer();
-        for signer in pending_signers {
+        for (signer, action_id) in pending_signers {
             buffer.push_tx(|tx| {
                 tx.from(signer)
                     .to(&multisig_address)
@@ -343,8 +349,7 @@ impl MultisigInteract {
 
         buffer.run().await;
 
-        println!("successfully performed sign action `{action_id}`");
-        true
+        println!("successfully performed sign action `{action_ids:?}`");
     }
 
     async fn dns_register(&mut self, name: &str) {
diff --git a/contracts/examples/multisig/interact/src/multisig_interact_nfts.rs b/contracts/examples/multisig/interact/src/multisig_interact_nfts.rs
index c677cf8fdf..e15000bc4c 100644
--- a/contracts/examples/multisig/interact/src/multisig_interact_nfts.rs
+++ b/contracts/examples/multisig/interact/src/multisig_interact_nfts.rs
@@ -71,8 +71,8 @@ impl MultisigInteract {
 
         println!("perfoming issue collection with all roles action `{action_id}`...");
 
-        if !self.quorum_reached(action_id).await && !self.sign(action_id).await {
-            return;
+        if !self.quorum_reached(action_id).await {
+            self.sign(&[action_id]).await;
         }
         println!("quorum reached for action `{action_id}`");
 
@@ -127,10 +127,11 @@ impl MultisigInteract {
 
         println!("perfoming issue collection action `{action_id}`...");
 
-        if !self.quorum_reached(action_id).await && !self.sign(action_id).await {
-            return;
+        if !self.quorum_reached(action_id).await {
+            self.sign(&[action_id]).await;
         }
         println!("quorum reached for action `{action_id}`");
+
         let new_token_id = self
             .interactor
             .tx()

From 9b91546652a6ac1283102748c39c3e48bc5f5aec Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Mon, 8 Apr 2024 00:15:36 +0300
Subject: [PATCH 0659/1254] multisig interactor minor refactor

---
 .../multisig/interact/src/multisig_interact.rs         |  7 +++++++
 .../multisig/interact/src/multisig_interact_nfts.rs    | 10 ++--------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/contracts/examples/multisig/interact/src/multisig_interact.rs b/contracts/examples/multisig/interact/src/multisig_interact.rs
index 62074b08a8..65b6c0dbb1 100644
--- a/contracts/examples/multisig/interact/src/multisig_interact.rs
+++ b/contracts/examples/multisig/interact/src/multisig_interact.rs
@@ -352,6 +352,13 @@ impl MultisigInteract {
         println!("successfully performed sign action `{action_ids:?}`");
     }
 
+    async fn sign_if_quorum_not_reached(&mut self, action_id: usize) {
+        if !self.quorum_reached(action_id).await {
+            self.sign(&[action_id]).await;
+        }
+        println!("quorum reached for action `{action_id}`");
+    }
+
     async fn dns_register(&mut self, name: &str) {
         let dns_address = dns_address_for_name(name);
         self.interactor
diff --git a/contracts/examples/multisig/interact/src/multisig_interact_nfts.rs b/contracts/examples/multisig/interact/src/multisig_interact_nfts.rs
index e15000bc4c..61788f99af 100644
--- a/contracts/examples/multisig/interact/src/multisig_interact_nfts.rs
+++ b/contracts/examples/multisig/interact/src/multisig_interact_nfts.rs
@@ -71,10 +71,7 @@ impl MultisigInteract {
 
         println!("perfoming issue collection with all roles action `{action_id}`...");
 
-        if !self.quorum_reached(action_id).await {
-            self.sign(&[action_id]).await;
-        }
-        println!("quorum reached for action `{action_id}`");
+        self.sign_if_quorum_not_reached(action_id).await;
 
         let new_token_id = self
             .interactor
@@ -127,10 +124,7 @@ impl MultisigInteract {
 
         println!("perfoming issue collection action `{action_id}`...");
 
-        if !self.quorum_reached(action_id).await {
-            self.sign(&[action_id]).await;
-        }
-        println!("quorum reached for action `{action_id}`");
+        self.sign_if_quorum_not_reached(action_id).await;
 
         let new_token_id = self
             .interactor

From 012cb6ffeb96e40329a9eb5ada9463af7a11f714 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Mon, 8 Apr 2024 01:30:35 +0300
Subject: [PATCH 0660/1254] test fix

---
 .../scenarios/ping-pong-call-pong-all-interrupted-2.scen.json   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 2b597650b6..9253cff4f8 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
@@ -21,7 +21,7 @@
                 "to": "sc:ping-pong",
                 "function": "pongAll",
                 "arguments": [],
-                "gasLimit": "6,100,000",
+                "gasLimit": "3,500,000",
                 "gasPrice": "0"
             },
             "expect": {

From 57eb90470f2eb9d46f11e6811c80beed0c9f66db Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Mon, 8 Apr 2024 02:15:55 +0300
Subject: [PATCH 0661/1254] test fix

---
 .../scenarios/use_module_ongoing_operation_example.scen.json    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 45a659c44e..3e43e9270a 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
@@ -52,7 +52,7 @@
                 "to": "sc:use_module",
                 "function": "countTo100",
                 "arguments": [],
-                "gasLimit": "5,350,000",
+                "gasLimit": "4,500,000",
                 "gasPrice": "0"
             },
             "expect": {

From ed8e28e99dc904cceddf4b3ddff1c87dc1df9af6 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Mon, 8 Apr 2024 12:53:35 +0300
Subject: [PATCH 0662/1254] ManagedBufferBuilder gas benchmark

---
 contracts/benchmarks/str-repeat/Cargo.toml    |   3 +
 .../benchmarks/str-repeat/sc-config.toml      |  12 +-
 .../scenarios/mb_builder_basic.scen.json      |  80 +++++++++
 .../scenarios/mb_builder_cached.scen.json     |  80 +++++++++
 .../benchmarks/str-repeat/src/str_repeat.rs   |  11 ++
 .../str-repeat/tests/scenario_go_test.rs      |  12 ++
 .../str-repeat/tests/scenario_rs_test.rs      |  18 ++
 .../Cargo.lock                                | 170 ++++++++++++++++++
 .../Cargo.toml                                |  32 ++++
 .../src/lib.rs                                |  27 +++
 .../Cargo.lock                                | 170 ++++++++++++++++++
 .../Cargo.toml                                |  33 ++++
 .../src/lib.rs                                |  27 +++
 13 files changed, 674 insertions(+), 1 deletion(-)
 create mode 100644 contracts/benchmarks/str-repeat/scenarios/mb_builder_basic.scen.json
 create mode 100644 contracts/benchmarks/str-repeat/scenarios/mb_builder_cached.scen.json
 create mode 100644 contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.lock
 create mode 100644 contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.toml
 create mode 100644 contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/src/lib.rs
 create mode 100644 contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.lock
 create mode 100644 contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.toml
 create mode 100644 contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/src/lib.rs

diff --git a/contracts/benchmarks/str-repeat/Cargo.toml b/contracts/benchmarks/str-repeat/Cargo.toml
index 116327da15..867b7a97fa 100644
--- a/contracts/benchmarks/str-repeat/Cargo.toml
+++ b/contracts/benchmarks/str-repeat/Cargo.toml
@@ -8,6 +8,9 @@ publish = false
 [lib]
 path = "src/str_repeat.rs"
 
+[features]
+managed-buffer-builder-cached = ["multiversx-sc/managed-buffer-builder-cached"]
+
 [dependencies.multiversx-sc]
 version = "0.47.8"
 path = "../../../framework/base"
diff --git a/contracts/benchmarks/str-repeat/sc-config.toml b/contracts/benchmarks/str-repeat/sc-config.toml
index a850f32470..964b5500c8 100644
--- a/contracts/benchmarks/str-repeat/sc-config.toml
+++ b/contracts/benchmarks/str-repeat/sc-config.toml
@@ -1,6 +1,16 @@
 [settings]
 main = "str-repeat"
 
-# the only purpose of this config is to specify the allocator
 [contracts.str-repeat]
 allocator = "leaking"
+
+[contracts.str-repeat-mb-builder-basic]
+add-unlabelled = false
+add-labels = ["mb-builder"]
+add-endpoints = ["init"]
+
+[contracts.str-repeat-mb-builder-cached]
+add-unlabelled = false
+add-labels = ["mb-builder"]
+add-endpoints = ["init"]
+features = ["managed-buffer-builder-cached"]
diff --git a/contracts/benchmarks/str-repeat/scenarios/mb_builder_basic.scen.json b/contracts/benchmarks/str-repeat/scenarios/mb_builder_basic.scen.json
new file mode 100644
index 0000000000..81086d866e
--- /dev/null
+++ b/contracts/benchmarks/str-repeat/scenarios/mb_builder_basic.scen.json
@@ -0,0 +1,80 @@
+{
+    "name": "str-repeat",
+    "steps": [
+        {
+            "step": "setState",
+            "accounts": {
+                "address:owner": {
+                    "nonce": "0",
+                    "balance": "0"
+                },
+                "sc:contract": {
+                    "code": "mxsc:../output/str-repeat-mb-builder-basic.mxsc.json"
+                }
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "benchmark-mb-builder-basic-10",
+            "comment": "code is smaller, so basic wins here",
+            "tx": {
+                "from": "address:owner",
+                "to": "sc:contract",
+                "function": "mb_builder_benchmark",
+                "arguments": [
+                    "0x01020304",
+                    "10"
+                ],
+                "gasLimit": "10,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": "*",
+                "status": "",
+                "gas": "8855882"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "benchmark-mb-builder-basic-tipping-point",
+            "comment": "the caching optimization starts to compensate the larger code size",
+            "tx": {
+                "from": "address:owner",
+                "to": "sc:contract",
+                "function": "mb_builder_benchmark",
+                "arguments": [
+                    "0x01020304",
+                    "22"
+                ],
+                "gasLimit": "10,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": "*",
+                "status": "",
+                "gas": "8778242"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "benchmark-mb-builder-basic",
+            "comment": "for many repeats, the cached version wins",
+            "tx": {
+                "from": "address:owner",
+                "to": "sc:contract",
+                "function": "mb_builder_benchmark",
+                "arguments": [
+                    "0x01020304",
+                    "10000"
+                ],
+                "gasLimit": "10,000,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": "*",
+                "status": "",
+                "gas": "9934220582"
+            }
+        }
+    ]
+}
diff --git a/contracts/benchmarks/str-repeat/scenarios/mb_builder_cached.scen.json b/contracts/benchmarks/str-repeat/scenarios/mb_builder_cached.scen.json
new file mode 100644
index 0000000000..9261fabd37
--- /dev/null
+++ b/contracts/benchmarks/str-repeat/scenarios/mb_builder_cached.scen.json
@@ -0,0 +1,80 @@
+{
+    "name": "str-repeat",
+    "steps": [
+        {
+            "step": "setState",
+            "accounts": {
+                "address:owner": {
+                    "nonce": "0",
+                    "balance": "0"
+                },
+                "sc:contract": {
+                    "code": "mxsc:../output/str-repeat-mb-builder-cached.mxsc.json"
+                }
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "benchmark-mb-builder-cached-10",
+            "comment": "code is smaller, so basic wins here",
+            "tx": {
+                "from": "address:owner",
+                "to": "sc:contract",
+                "function": "mb_builder_benchmark",
+                "arguments": [
+                    "0x01020304",
+                    "10"
+                ],
+                "gasLimit": "10,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": "*",
+                "status": "",
+                "gas": "8834532"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "benchmark-mb-builder-cached-tipping-point",
+            "comment": "the caching optimization starts to compensate the larger code size",
+            "tx": {
+                "from": "address:owner",
+                "to": "sc:contract",
+                "function": "mb_builder_benchmark",
+                "arguments": [
+                    "0x01020304",
+                    "22"
+                ],
+                "gasLimit": "10,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": "*",
+                "status": "",
+                "gas": "8779332"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "benchmark-mb-builder-cached",
+            "comment": "for many repeats, the cached version wins",
+            "tx": {
+                "from": "address:owner",
+                "to": "sc:contract",
+                "function": "mb_builder_benchmark",
+                "arguments": [
+                    "0x01020304",
+                    "10000"
+                ],
+                "gasLimit": "10,000,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": "*",
+                "status": "",
+                "gas": "9938367902"
+            }
+        }
+    ]
+}
diff --git a/contracts/benchmarks/str-repeat/src/str_repeat.rs b/contracts/benchmarks/str-repeat/src/str_repeat.rs
index 0cd6fb0325..81ad7fa874 100644
--- a/contracts/benchmarks/str-repeat/src/str_repeat.rs
+++ b/contracts/benchmarks/str-repeat/src/str_repeat.rs
@@ -25,4 +25,15 @@ pub trait StrRepeat {
     #[view(getByteArray)]
     #[storage_mapper("byteArray")]
     fn byte_array(&self) -> SingleValueMapper<Vec<u8>>;
+
+    #[view]
+    #[label("mb-builder")]
+    fn mb_builder_benchmark(&self, payload: u32, num_repeats: usize) -> ManagedBuffer {
+        let mut builder = ManagedBufferBuilder::default();
+        let payload_bytes = payload.to_be_bytes();
+        for _ in 0..num_repeats {
+            builder.append_bytes(&payload_bytes);
+        }
+        builder.into_managed_buffer()
+    }
 }
diff --git a/contracts/benchmarks/str-repeat/tests/scenario_go_test.rs b/contracts/benchmarks/str-repeat/tests/scenario_go_test.rs
index e1be038d02..325d9ac866 100644
--- a/contracts/benchmarks/str-repeat/tests/scenario_go_test.rs
+++ b/contracts/benchmarks/str-repeat/tests/scenario_go_test.rs
@@ -4,6 +4,18 @@ fn world() -> ScenarioWorld {
     ScenarioWorld::vm_go()
 }
 
+#[test]
+#[ignore = "gas benchmark, too brittle to include permanently"]
+fn mb_builder_basic_go() {
+    world().run("scenarios/mb_builder_basic.scen.json");
+}
+
+#[test]
+#[ignore = "gas benchmark, too brittle to include permanently"]
+fn mb_builder_cached_go() {
+    world().run("scenarios/mb_builder_cached.scen.json");
+}
+
 #[test]
 fn str_repeat_go() {
     world().run("scenarios/str_repeat.scen.json");
diff --git a/contracts/benchmarks/str-repeat/tests/scenario_rs_test.rs b/contracts/benchmarks/str-repeat/tests/scenario_rs_test.rs
index 42f585f314..4fcef41480 100644
--- a/contracts/benchmarks/str-repeat/tests/scenario_rs_test.rs
+++ b/contracts/benchmarks/str-repeat/tests/scenario_rs_test.rs
@@ -6,9 +6,27 @@ fn world() -> ScenarioWorld {
         "mxsc:output/str-repeat.mxsc.json",
         str_repeat::ContractBuilder,
     );
+    blockchain.register_contract(
+        "mxsc:output/str-repeat-mb-builder-basic.mxsc.json",
+        str_repeat::ContractBuilder,
+    );
+    blockchain.register_contract(
+        "mxsc:output/str-repeat-mb-builder-cached.mxsc.json",
+        str_repeat::ContractBuilder,
+    );
     blockchain
 }
 
+#[test]
+fn mb_builder_basic_rs() {
+    world().run("scenarios/mb_builder_basic.scen.json");
+}
+
+#[test]
+fn mb_builder_cached_rs() {
+    world().run("scenarios/mb_builder_cached.scen.json");
+}
+
 #[test]
 fn str_repeat_rs() {
     world().run("scenarios/str_repeat.scen.json");
diff --git a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.lock b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.lock
new file mode 100644
index 0000000000..7f11ee332c
--- /dev/null
+++ b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/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.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+
+[[package]]
+name = "bitflags"
+version = "2.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+
+[[package]]
+name = "endian-type"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
+
+[[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.47.8"
+dependencies = [
+ "bitflags",
+ "hex-literal",
+ "multiversx-sc-codec",
+ "multiversx-sc-derive",
+ "num-traits",
+]
+
+[[package]]
+name = "multiversx-sc-codec"
+version = "0.18.6"
+dependencies = [
+ "arrayvec",
+ "multiversx-sc-codec-derive",
+]
+
+[[package]]
+name = "multiversx-sc-codec-derive"
+version = "0.18.6"
+dependencies = [
+ "hex",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "multiversx-sc-derive"
+version = "0.47.8"
+dependencies = [
+ "hex",
+ "proc-macro2",
+ "quote",
+ "radix_trie",
+ "syn",
+]
+
+[[package]]
+name = "multiversx-sc-wasm-adapter"
+version = "0.47.8"
+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.78"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+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.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
+
+[[package]]
+name = "str-repeat"
+version = "0.0.0"
+dependencies = [
+ "multiversx-sc",
+]
+
+[[package]]
+name = "str-repeat-mb-builder-basic-wasm"
+version = "0.0.0"
+dependencies = [
+ "multiversx-sc-wasm-adapter",
+ "str-repeat",
+]
+
+[[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/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.toml b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.toml
new file mode 100644
index 0000000000..2e124ace9c
--- /dev/null
+++ b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.toml
@@ -0,0 +1,32 @@
+# Code generated by the multiversx-sc build system. DO NOT EDIT.
+
+# ##########################################
+# ############## AUTO-GENERATED #############
+# ##########################################
+
+[package]
+name = "str-repeat-mb-builder-basic-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.str-repeat]
+path = ".."
+
+[dependencies.multiversx-sc-wasm-adapter]
+version = "0.47.8"
+path = "../../../../framework/wasm-adapter"
+
+[workspace]
+members = ["."]
diff --git a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/src/lib.rs b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/src/lib.rs
new file mode 100644
index 0000000000..868b673634
--- /dev/null
+++ b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/src/lib.rs
@@ -0,0 +1,27 @@
+// Code generated by the multiversx-sc build system. DO NOT EDIT.
+
+////////////////////////////////////////////////////
+////////////////// AUTO-GENERATED //////////////////
+////////////////////////////////////////////////////
+
+// Init:                                 1
+// Endpoints:                            1
+// Async Callback (empty):               1
+// Total number of exported functions:   3
+
+#![no_std]
+#![allow(internal_features)]
+#![feature(lang_items)]
+
+multiversx_sc_wasm_adapter::allocator!();
+multiversx_sc_wasm_adapter::panic_handler!();
+
+multiversx_sc_wasm_adapter::endpoints! {
+    str_repeat
+    (
+        init => init
+        mb_builder_benchmark => mb_builder_benchmark
+    )
+}
+
+multiversx_sc_wasm_adapter::async_callback_empty! {}
diff --git a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.lock b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.lock
new file mode 100644
index 0000000000..a866ae3bba
--- /dev/null
+++ b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/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.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+
+[[package]]
+name = "bitflags"
+version = "2.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+
+[[package]]
+name = "endian-type"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
+
+[[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.47.8"
+dependencies = [
+ "bitflags",
+ "hex-literal",
+ "multiversx-sc-codec",
+ "multiversx-sc-derive",
+ "num-traits",
+]
+
+[[package]]
+name = "multiversx-sc-codec"
+version = "0.18.6"
+dependencies = [
+ "arrayvec",
+ "multiversx-sc-codec-derive",
+]
+
+[[package]]
+name = "multiversx-sc-codec-derive"
+version = "0.18.6"
+dependencies = [
+ "hex",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "multiversx-sc-derive"
+version = "0.47.8"
+dependencies = [
+ "hex",
+ "proc-macro2",
+ "quote",
+ "radix_trie",
+ "syn",
+]
+
+[[package]]
+name = "multiversx-sc-wasm-adapter"
+version = "0.47.8"
+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.78"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+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.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
+
+[[package]]
+name = "str-repeat"
+version = "0.0.0"
+dependencies = [
+ "multiversx-sc",
+]
+
+[[package]]
+name = "str-repeat-mb-builder-cached-wasm"
+version = "0.0.0"
+dependencies = [
+ "multiversx-sc-wasm-adapter",
+ "str-repeat",
+]
+
+[[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/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.toml b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.toml
new file mode 100644
index 0000000000..0ab57dce26
--- /dev/null
+++ b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.toml
@@ -0,0 +1,33 @@
+# Code generated by the multiversx-sc build system. DO NOT EDIT.
+
+# ##########################################
+# ############## AUTO-GENERATED #############
+# ##########################################
+
+[package]
+name = "str-repeat-mb-builder-cached-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.str-repeat]
+path = ".."
+features = ["managed-buffer-builder-cached"]
+
+[dependencies.multiversx-sc-wasm-adapter]
+version = "0.47.8"
+path = "../../../../framework/wasm-adapter"
+
+[workspace]
+members = ["."]
diff --git a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/src/lib.rs b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/src/lib.rs
new file mode 100644
index 0000000000..868b673634
--- /dev/null
+++ b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/src/lib.rs
@@ -0,0 +1,27 @@
+// Code generated by the multiversx-sc build system. DO NOT EDIT.
+
+////////////////////////////////////////////////////
+////////////////// AUTO-GENERATED //////////////////
+////////////////////////////////////////////////////
+
+// Init:                                 1
+// Endpoints:                            1
+// Async Callback (empty):               1
+// Total number of exported functions:   3
+
+#![no_std]
+#![allow(internal_features)]
+#![feature(lang_items)]
+
+multiversx_sc_wasm_adapter::allocator!();
+multiversx_sc_wasm_adapter::panic_handler!();
+
+multiversx_sc_wasm_adapter::endpoints! {
+    str_repeat
+    (
+        init => init
+        mb_builder_benchmark => mb_builder_benchmark
+    )
+}
+
+multiversx_sc_wasm_adapter::async_callback_empty! {}

From dee6e081c083f69e6574e1ca19d68059f699ed8e Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Mon, 8 Apr 2024 16:21:23 +0200
Subject: [PATCH 0663/1254] send_raw migration and other small impls and
 modifications

---
 .../crypto-kitties/kitty-auction/src/lib.rs   |  8 +-
 .../crypto-kitties/kitty-ownership/src/lib.rs |  2 +-
 .../crypto-zombies/src/zombie_feeding.rs      |  2 +-
 .../examples/multisig/src/multisig_perform.rs | 55 ++++++------
 .../examples/order-book/factory/src/lib.rs    | 20 +++--
 .../first-contract/src/lib.rs                 | 41 ++++-----
 .../parent/src/lib.rs                         |  4 +-
 .../src/forwarder_raw_alt_init.rs             | 17 ++--
 .../forwarder-raw/src/forwarder_raw_async.rs  | 21 +++--
 .../src/forwarder_raw_deploy_upgrade.rs       |  6 +-
 .../forwarder-raw/src/forwarder_raw_sync.rs   | 67 ++++++++------
 .../composability/forwarder/src/call_async.rs | 42 ++++-----
 .../composability/forwarder/src/call_sync.rs  | 18 ++--
 .../forwarder/src/call_transf_exec.rs         | 20 ++---
 .../composability/forwarder/src/nft.rs        | 17 ++--
 .../local-esdt-and-nft/src/lib.rs             | 18 ++--
 .../promises-features/src/call_promises.rs    | 10 +--
 .../promises-features/src/call_promises_bt.rs |  6 +-
 .../proxy-test-first/src/proxy-test-first.rs  | 10 +--
 .../recursive-caller/src/recursive_caller.rs  |  5 +-
 .../composability/vault/src/vault.rs          | 16 ++--
 .../src/crowdfunding_erc20.rs                 |  2 +-
 .../erc1155/src/erc1155.rs                    |  4 +-
 .../lottery-erc20/src/lottery.rs              |  4 +-
 .../rust-testing-framework-tester/src/lib.rs  | 40 ++++-----
 .../mappers/token/fungible_token_mapper.rs    |  2 +-
 .../token/non_fungible_token_mapper.rs        |  2 +-
 .../interaction/tx_exec/tx_exec_upgrade.rs    | 90 +++++++++++++++++++
 .../src/types/interaction/upgrade_call.rs     |  9 +-
 29 files changed, 331 insertions(+), 227 deletions(-)

diff --git a/contracts/examples/crypto-kitties/kitty-auction/src/lib.rs b/contracts/examples/crypto-kitties/kitty-auction/src/lib.rs
index 557673bb3d..60a30c382e 100644
--- a/contracts/examples/crypto-kitties/kitty-auction/src/lib.rs
+++ b/contracts/examples/crypto-kitties/kitty-auction/src/lib.rs
@@ -50,7 +50,7 @@ pub trait KittyAuction {
             .to(&kitty_ownership_contract_address)
             .typed(kitty_ownership_proxy::KittyOwnershipProxy)
             .create_gen_zero_kitty()
-            .with_callback(self.callbacks().create_gen_zero_kitty_callback())
+            .callback(self.callbacks().create_gen_zero_kitty_callback())
             .async_call_and_exit();
     }
 
@@ -246,7 +246,7 @@ pub trait KittyAuction {
                 .to(&kitty_ownership_contract_address)
                 .typed(kitty_ownership_proxy::KittyOwnershipProxy)
                 .allow_auctioning(&caller, kitty_id)
-                .with_callback(self.callbacks().allow_auctioning_callback(
+                .callback(self.callbacks().allow_auctioning_callback(
                     auction_type,
                     kitty_id,
                     starting_price,
@@ -283,7 +283,7 @@ pub trait KittyAuction {
                 .to(&kitty_ownership_contract_address)
                 .typed(kitty_ownership_proxy::KittyOwnershipProxy)
                 .transfer(address, kitty_id)
-                .with_callback(self.callbacks().transfer_callback(kitty_id))
+                .callback(self.callbacks().transfer_callback(kitty_id))
                 .async_call_and_exit();
         }
     }
@@ -302,7 +302,7 @@ pub trait KittyAuction {
                 .typed(kitty_ownership_proxy::KittyOwnershipProxy)
                 .approve_siring_and_return_kitty(approved_address, kitty_owner, kitty_id)
                 // not a mistake, same callback for transfer and approveSiringAndReturnKitty
-                .with_callback(self.callbacks().transfer_callback(kitty_id))
+                .callback(self.callbacks().transfer_callback(kitty_id))
                 .async_call_and_exit();
         }
     }
diff --git a/contracts/examples/crypto-kitties/kitty-ownership/src/lib.rs b/contracts/examples/crypto-kitties/kitty-ownership/src/lib.rs
index d6e0771fa4..dbde8aed52 100644
--- a/contracts/examples/crypto-kitties/kitty-ownership/src/lib.rs
+++ b/contracts/examples/crypto-kitties/kitty-ownership/src/lib.rs
@@ -341,7 +341,7 @@ pub trait KittyOwnership {
                 .to(&gene_science_contract_address)
                 .typed(kitty_genetic_alg_proxy::KittyGeneticAlgProxy)
                 .generate_kitty_genes(matron, sire)
-                .with_callback(
+                .callback(
                     self.callbacks()
                         .generate_kitty_genes_callback(matron_id, caller),
                 )
diff --git a/contracts/examples/crypto-zombies/src/zombie_feeding.rs b/contracts/examples/crypto-zombies/src/zombie_feeding.rs
index 7afd7a7be8..56ef89cb7c 100644
--- a/contracts/examples/crypto-zombies/src/zombie_feeding.rs
+++ b/contracts/examples/crypto-zombies/src/zombie_feeding.rs
@@ -57,7 +57,7 @@ pub trait ZombieFeeding:
             .to(&crypto_kitties_sc_address)
             .typed(kitty_ownership_proxy::KittyOwnershipProxy)
             .get_kitty_by_id_endpoint(kitty_id)
-            .with_callback(self.callbacks().get_kitty_callback(zombie_id))
+            .callback(self.callbacks().get_kitty_callback(zombie_id))
             .async_call_and_exit();
     }
 }
diff --git a/contracts/examples/multisig/src/multisig_perform.rs b/contracts/examples/multisig/src/multisig_perform.rs
index dfa7016340..ef7a3ec257 100644
--- a/contracts/examples/multisig/src/multisig_perform.rs
+++ b/contracts/examples/multisig/src/multisig_perform.rs
@@ -167,16 +167,15 @@ pub trait MultisigPerformModule:
                     &call_data.endpoint_name,
                     call_data.arguments.as_multi(),
                 );
-                let result = self.send_raw().direct_egld_execute(
-                    &call_data.to,
-                    &call_data.egld_amount,
-                    gas,
-                    &call_data.endpoint_name,
-                    &call_data.arguments.into(),
-                );
-                if let Result::Err(e) = result {
-                    sc_panic!(e);
-                }
+
+                self.tx()
+                    .to(&call_data.to)
+                    .raw_call(call_data.endpoint_name)
+                    .arguments_raw(call_data.arguments.into())
+                    .gas(gas)
+                    .egld(&call_data.egld_amount)
+                    .transfer_execute();
+
                 OptionalValue::None
             },
             Action::SendAsyncCall(call_data) => {
@@ -213,13 +212,17 @@ pub trait MultisigPerformModule:
                     gas_left,
                     arguments.as_multi(),
                 );
-                let (new_address, _) = self.send_raw().deploy_from_source_contract(
-                    gas_left,
-                    &amount,
-                    &source,
-                    code_metadata,
-                    &arguments.into(),
-                );
+                let new_address = self
+                    .tx()
+                    .gas(gas_left)
+                    .egld(&amount)
+                    .raw_deploy()
+                    .arguments_raw(arguments.into())
+                    .from_source(source)
+                    .code_metadata(code_metadata)
+                    .returns(ReturnsNewManagedAddress)
+                    .sync_call();
+
                 OptionalValue::Some(new_address)
             },
             Action::SCUpgradeFromSource {
@@ -239,14 +242,16 @@ pub trait MultisigPerformModule:
                     gas_left,
                     arguments.as_multi(),
                 );
-                self.send_raw().upgrade_from_source_contract(
-                    &sc_address,
-                    gas_left,
-                    &amount,
-                    &source,
-                    code_metadata,
-                    &arguments.into(),
-                );
+
+                self.tx()
+                    .to(&sc_address)
+                    .raw_upgrade()
+                    .arguments_raw(arguments.into())
+                    .egld(&amount)
+                    .from_source(source)
+                    .code_metadata(code_metadata)
+                    .upgrade_async_call_and_exit();
+
                 OptionalValue::None
             },
         }
diff --git a/contracts/examples/order-book/factory/src/lib.rs b/contracts/examples/order-book/factory/src/lib.rs
index cac1192361..fb83863ae3 100644
--- a/contracts/examples/order-book/factory/src/lib.rs
+++ b/contracts/examples/order-book/factory/src/lib.rs
@@ -23,13 +23,19 @@ pub trait Factory {
         arguments.push_arg(&token_id_pair.first_token_id);
         arguments.push_arg(&token_id_pair.second_token_id);
 
-        let (pair_address, _) = self.send_raw().deploy_from_source_contract(
-            self.blockchain().get_gas_left(),
-            &BigUint::zero(),
-            &self.pair_template_address().get(),
-            CodeMetadata::DEFAULT,
-            &arguments,
-        );
+        let gas_left = self.blockchain().get_gas_left();
+        let source = self.pair_template_address().get();
+
+        let pair_address = self
+            .tx()
+            .gas(gas_left)
+            .raw_deploy()
+            .arguments_raw(arguments)
+            .from_source(source)
+            .code_metadata(CodeMetadata::DEFAULT)
+            .returns(ReturnsNewManagedAddress)
+            .sync_call();
+
         self.pairs().insert(token_id_pair, pair_address.clone());
 
         pair_address
diff --git a/contracts/feature-tests/composability/esdt-contract-pair/first-contract/src/lib.rs b/contracts/feature-tests/composability/esdt-contract-pair/first-contract/src/lib.rs
index dfa6ff75e5..ad089ef4ce 100644
--- a/contracts/feature-tests/composability/esdt-contract-pair/first-contract/src/lib.rs
+++ b/contracts/feature-tests/composability/esdt-contract-pair/first-contract/src/lib.rs
@@ -90,14 +90,13 @@ pub trait FirstContract {
             "Wrong esdt token"
         );
 
-        let _ = self.send_raw().transfer_esdt_execute(
-            &second_contract_address,
-            &expected_token_identifier,
-            &esdt_value,
-            self.blockchain().get_gas_left(),
-            &ManagedBuffer::from(SECOND_CONTRACT_REJECT_ESDT_PAYMENT),
-            &ManagedArgBuffer::new(),
-        );
+        let gas_left = self.blockchain().get_gas_left();
+        self.tx()
+            .to(&second_contract_address)
+            .gas(gas_left)
+            .raw_call(ManagedBuffer::from(SECOND_CONTRACT_REJECT_ESDT_PAYMENT))
+            .single_esdt(&expected_token_identifier, 0u64, &esdt_value)
+            .transfer_execute();
     }
 
     #[payable("*")]
@@ -112,14 +111,13 @@ pub trait FirstContract {
             "Wrong esdt token"
         );
 
-        let _ = self.send_raw().transfer_esdt_execute(
-            &second_contract_address,
-            &expected_token_identifier,
-            &esdt_value,
-            self.blockchain().get_gas_left(),
-            &ManagedBuffer::from(SECOND_CONTRACT_ACCEPT_ESDT_PAYMENT),
-            &ManagedArgBuffer::new(),
-        );
+        let gas_left = self.blockchain().get_gas_left();
+        self.tx()
+            .to(&second_contract_address)
+            .gas(gas_left)
+            .raw_call(ManagedBuffer::from(SECOND_CONTRACT_ACCEPT_ESDT_PAYMENT))
+            .single_esdt(&expected_token_identifier, 0u64, &esdt_value)
+            .transfer_execute();
     }
 
     fn call_esdt_second_contract(
@@ -138,12 +136,11 @@ pub trait FirstContract {
             arg_buffer.push_arg_raw(arg);
         }
 
-        self.send_raw().async_call_raw(
-            to,
-            &BigUint::zero(),
-            &ManagedBuffer::from(ESDT_TRANSFER_STRING),
-            &arg_buffer,
-        );
+        self.tx()
+            .to(to)
+            .raw_call(ManagedBuffer::from(ESDT_TRANSFER_STRING))
+            .arguments_raw(arg_buffer)
+            .async_call_and_exit();
     }
 
     // storage
diff --git a/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/parent/src/lib.rs b/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/parent/src/lib.rs
index d9dfe79d0e..5c4bff50d0 100644
--- a/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/parent/src/lib.rs
+++ b/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/parent/src/lib.rs
@@ -23,7 +23,7 @@ pub trait Parent {
             .tx()
             .raw_deploy()
             .code(code)
-            .with_gas_limit(gas_left)
+            .gas(gas_left)
             .returns(ReturnsNewManagedAddress)
             .sync_call();
 
@@ -46,7 +46,7 @@ pub trait Parent {
             .typed(child_proxy::ChildProxy)
             .issue_wrapped_egld(token_display_name, token_ticker, initial_supply)
             .egld(issue_cost)
-            .with_gas_limit(ISSUE_EXPECTED_GAS_COST)
+            .gas(ISSUE_EXPECTED_GAS_COST)
             .sync_call();
     }
 
diff --git a/contracts/feature-tests/composability/forwarder-raw/src/forwarder_raw_alt_init.rs b/contracts/feature-tests/composability/forwarder-raw/src/forwarder_raw_alt_init.rs
index 0ded59b36d..f00a10d434 100644
--- a/contracts/feature-tests/composability/forwarder-raw/src/forwarder_raw_alt_init.rs
+++ b/contracts/feature-tests/composability/forwarder-raw/src/forwarder_raw_alt_init.rs
@@ -54,13 +54,16 @@ pub trait ForwarderRawAlterativeInit: super::forwarder_raw_common::ForwarderRawC
     ) {
         let payment = self.call_value().egld_value();
         let half_gas = self.blockchain().get_gas_left() / 2;
-        let result = self.send_raw().execute_on_dest_context_raw(
-            half_gas,
-            &to,
-            &payment,
-            &endpoint_name,
-            &args.to_arg_buffer(),
-        );
+
+        let result = self
+            .tx()
+            .to(&to)
+            .gas(half_gas)
+            .egld(payment)
+            .raw_call(endpoint_name)
+            .arguments_raw(args.to_arg_buffer())
+            .returns(ReturnsRawResult)
+            .sync_call();
 
         self.execute_on_dest_context_result(result);
     }
diff --git a/contracts/feature-tests/composability/forwarder-raw/src/forwarder_raw_async.rs b/contracts/feature-tests/composability/forwarder-raw/src/forwarder_raw_async.rs
index fbd0eec1a4..39638bbe6f 100644
--- a/contracts/feature-tests/composability/forwarder-raw/src/forwarder_raw_async.rs
+++ b/contracts/feature-tests/composability/forwarder-raw/src/forwarder_raw_async.rs
@@ -98,7 +98,7 @@ pub trait ForwarderRawAsync: super::forwarder_raw_common::ForwarderRawCommon {
             endpoint_name,
             args,
         )
-        .with_gas_limit(self.blockchain().get_gas_left() / 2)
+        .gas(self.blockchain().get_gas_left() / 2)
         .transfer_execute();
     }
 
@@ -118,7 +118,7 @@ pub trait ForwarderRawAsync: super::forwarder_raw_common::ForwarderRawCommon {
             endpoint_name,
             args,
         )
-        .with_gas_limit(self.blockchain().get_gas_left() / 2)
+        .gas(self.blockchain().get_gas_left() / 2)
         .transfer_execute();
     }
 
@@ -132,7 +132,7 @@ pub trait ForwarderRawAsync: super::forwarder_raw_common::ForwarderRawCommon {
     ) {
         let (token, payment) = self.call_value().egld_or_single_fungible_esdt();
         self.forward_contract_call(to, token, payment, endpoint_name, args)
-            .with_gas_limit(self.blockchain().get_gas_left() / 2)
+            .gas(self.blockchain().get_gas_left() / 2)
             .transfer_execute();
     }
 
@@ -153,10 +153,10 @@ pub trait ForwarderRawAsync: super::forwarder_raw_common::ForwarderRawCommon {
             endpoint_name.clone(),
             args.clone(),
         )
-        .with_gas_limit(self.blockchain().get_gas_left() / 2)
+        .gas(self.blockchain().get_gas_left() / 2)
         .transfer_execute();
         self.forward_contract_call(to, token, half_payment, endpoint_name, args)
-            .with_gas_limit(self.blockchain().get_gas_left() / 2)
+            .gas(self.blockchain().get_gas_left() / 2)
             .transfer_execute();
     }
 
@@ -175,12 +175,11 @@ pub trait ForwarderRawAsync: super::forwarder_raw_common::ForwarderRawCommon {
             arg_buffer.push_arg(amount);
         }
 
-        self.send_raw().async_call_raw(
-            &to,
-            &BigUint::zero(),
-            &ManagedBuffer::from(&b"retrieve_multi_funds_async"[..]),
-            &arg_buffer,
-        );
+        self.tx()
+            .to(&to)
+            .raw_call("retrieve_multi_funds_async")
+            .arguments_raw(arg_buffer)
+            .async_call_and_exit();
     }
 
     #[endpoint]
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 b57ac773e2..803119c140 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
@@ -14,7 +14,7 @@ pub trait ForwarderRawDeployUpgrade {
             .code(code)
             .code_metadata(code_metadata)
             .arguments_raw(args.to_arg_buffer())
-            .with_gas_limit(self.blockchain().get_gas_left())
+            .gas(self.blockchain().get_gas_left())
             .returns(ReturnsNewManagedAddress)
             .returns(ReturnsRawResult)
             .sync_call()
@@ -33,7 +33,7 @@ pub trait ForwarderRawDeployUpgrade {
             .from_source(source_contract_address)
             .code_metadata(code_metadata)
             .arguments_raw(args.to_arg_buffer())
-            .with_gas_limit(self.blockchain().get_gas_left())
+            .gas(self.blockchain().get_gas_left())
             .returns(ReturnsNewManagedAddress)
             .sync_call()
     }
@@ -69,7 +69,7 @@ pub trait ForwarderRawDeployUpgrade {
             .from_source(source_contract_address)
             .code_metadata(code_metadata)
             .arguments_raw(args.to_arg_buffer())
-            .with_gas_limit(self.blockchain().get_gas_left())
+            .gas(self.blockchain().get_gas_left())
             .upgrade_async_call_and_exit();
     }
 }
diff --git a/contracts/feature-tests/composability/forwarder-raw/src/forwarder_raw_sync.rs b/contracts/feature-tests/composability/forwarder-raw/src/forwarder_raw_sync.rs
index 662518d093..a4e98f36a7 100644
--- a/contracts/feature-tests/composability/forwarder-raw/src/forwarder_raw_sync.rs
+++ b/contracts/feature-tests/composability/forwarder-raw/src/forwarder_raw_sync.rs
@@ -18,7 +18,7 @@ pub trait ForwarderRawSync: super::forwarder_raw_common::ForwarderRawCommon {
             .egld(payment)
             .raw_call(endpoint_name)
             .argument(&args)
-            .with_gas_limit(half_gas)
+            .gas(half_gas)
             .returns(ReturnsRawResult)
             .sync_call();
 
@@ -38,22 +38,28 @@ pub trait ForwarderRawSync: super::forwarder_raw_common::ForwarderRawCommon {
         let half_payment = &*payment / 2u32;
         let arg_buffer = args.to_arg_buffer();
 
-        let result = self.send_raw().execute_on_dest_context_raw(
-            one_third_gas,
-            &to,
-            &half_payment,
-            &endpoint_name,
-            &arg_buffer,
-        );
+        let result = self
+            .tx()
+            .to(&to)
+            .gas(one_third_gas)
+            .egld(&half_payment)
+            .raw_call(endpoint_name.clone())
+            .arguments_raw(arg_buffer.clone())
+            .returns(ReturnsRawResult)
+            .sync_call();
+
         self.execute_on_dest_context_result(result);
 
-        let result = self.send_raw().execute_on_dest_context_raw(
-            one_third_gas,
-            &to,
-            &half_payment,
-            &endpoint_name,
-            &arg_buffer,
-        );
+        let result = self
+            .tx()
+            .to(&to)
+            .gas(one_third_gas)
+            .egld(&half_payment)
+            .raw_call(endpoint_name)
+            .arguments_raw(arg_buffer)
+            .returns(ReturnsRawResult)
+            .sync_call();
+
         self.execute_on_dest_context_result(result);
     }
 
@@ -67,13 +73,16 @@ pub trait ForwarderRawSync: super::forwarder_raw_common::ForwarderRawCommon {
     ) {
         let payment = self.call_value().egld_value();
         let half_gas = self.blockchain().get_gas_left() / 2;
-        let result = self.send_raw().execute_on_same_context_raw(
-            half_gas,
-            &to,
-            &payment,
-            &endpoint_name,
-            &args.to_arg_buffer(),
-        );
+
+        let result = self
+            .tx()
+            .to(&to)
+            .gas(half_gas)
+            .egld(payment)
+            .raw_call(endpoint_name)
+            .arguments_raw(args.to_arg_buffer())
+            .returns(ReturnsRawResult)
+            .sync_call();
 
         self.execute_on_same_context_result(result);
     }
@@ -86,12 +95,14 @@ pub trait ForwarderRawSync: super::forwarder_raw_common::ForwarderRawCommon {
         args: MultiValueEncoded<ManagedBuffer>,
     ) {
         let half_gas = self.blockchain().get_gas_left() / 2;
-        let result = self.send_raw().execute_on_dest_context_readonly_raw(
-            half_gas,
-            &to,
-            &endpoint_name,
-            &args.to_arg_buffer(),
-        );
+        let result = self
+            .tx()
+            .to(&to)
+            .gas(half_gas)
+            .raw_call(endpoint_name)
+            .arguments_raw(args.to_arg_buffer())
+            .returns(ReturnsRawResult)
+            .sync_call();
 
         self.execute_on_dest_context_result(result);
     }
diff --git a/contracts/feature-tests/composability/forwarder/src/call_async.rs b/contracts/feature-tests/composability/forwarder/src/call_async.rs
index 04ba78faab..2de43a6752 100644
--- a/contracts/feature-tests/composability/forwarder/src/call_async.rs
+++ b/contracts/feature-tests/composability/forwarder/src/call_async.rs
@@ -22,9 +22,8 @@ pub trait ForwarderAsyncCallModule {
             .to(&to)
             .typed(vault_proxy::VaultProxy)
             .echo_arguments(args)
-            .async_call()
-            .with_callback(self.callbacks().echo_args_callback())
-            .call_and_exit();
+            .callback(self.callbacks().echo_args_callback())
+            .async_call_and_exit();
     }
 
     #[callback]
@@ -61,7 +60,7 @@ pub trait ForwarderAsyncCallModule {
             .to(&to)
             .typed(vault_proxy::VaultProxy)
             .accept_funds()
-            .with_egld_or_single_esdt_transfer(payment)
+            .payment(payment)
             .async_call()
             .call_and_exit()
     }
@@ -75,11 +74,11 @@ pub trait ForwarderAsyncCallModule {
             .to(&to)
             .typed(vault_proxy::VaultProxy)
             .accept_funds()
-            .with_egld_or_single_esdt_transfer((
-                payment.token_identifier,
+            .egld_or_single_esdt(
+                &payment.token_identifier,
                 payment.token_nonce,
-                half_payment,
-            ))
+                &half_payment,
+            )
             .async_call()
             .call_and_exit()
     }
@@ -95,13 +94,12 @@ pub trait ForwarderAsyncCallModule {
             .to(&to)
             .typed(vault_proxy::VaultProxy)
             .accept_funds()
-            .with_egld_or_single_esdt_transfer((
-                payment.token_identifier,
+            .egld_or_single_esdt(
+                &payment.token_identifier,
                 payment.token_nonce,
-                amount_to_send,
-            ))
-            .async_call()
-            .call_and_exit()
+                &amount_to_send,
+            )
+            .async_call_and_exit();
     }
 
     #[endpoint]
@@ -117,7 +115,7 @@ pub trait ForwarderAsyncCallModule {
             .typed(vault_proxy::VaultProxy)
             .retrieve_funds(token, token_nonce, amount)
             .async_call()
-            .with_callback(self.callbacks().retrieve_funds_callback())
+            .callback(self.callbacks().retrieve_funds_callback())
             .call_and_exit()
     }
 
@@ -154,13 +152,12 @@ pub trait ForwarderAsyncCallModule {
             .to(to)
             .typed(vault_proxy::VaultProxy)
             .accept_funds()
-            .with_egld_or_single_esdt_transfer((token_identifier.clone(), 0u64, amount.clone()))
-            .async_call()
-            .with_callback(
+            .egld_or_single_esdt(token_identifier, 0u64, amount)
+            .callback(
                 self.callbacks()
                     .send_funds_twice_callback(to, token_identifier, amount),
             )
-            .call_and_exit();
+            .async_call_and_exit();
     }
 
     #[callback]
@@ -174,9 +171,8 @@ pub trait ForwarderAsyncCallModule {
             .to(to)
             .typed(vault_proxy::VaultProxy)
             .accept_funds()
-            .with_egld_or_single_esdt_transfer((token_identifier.clone(), 0u64, cb_amount.clone()))
-            .async_call()
-            .call_and_exit();
+            .egld_or_single_esdt(token_identifier, 0u64, cb_amount)
+            .async_call_and_exit();
     }
 
     #[endpoint]
@@ -198,7 +194,7 @@ pub trait ForwarderAsyncCallModule {
             .to(&to)
             .typed(vault_proxy::VaultProxy)
             .accept_funds()
-            .with_multi_token_transfer(all_token_payments)
+            .payment(all_token_payments)
             .async_call()
             .call_and_exit();
     }
diff --git a/contracts/feature-tests/composability/forwarder/src/call_sync.rs b/contracts/feature-tests/composability/forwarder/src/call_sync.rs
index 8366f0ae29..13fbcd40db 100644
--- a/contracts/feature-tests/composability/forwarder/src/call_sync.rs
+++ b/contracts/feature-tests/composability/forwarder/src/call_sync.rs
@@ -14,7 +14,7 @@ pub trait ForwarderSyncCallModule {
         let result = self
             .tx()
             .to(&to)
-            .with_gas_limit(half_gas)
+            .gas(half_gas)
             .typed(vault_proxy::VaultProxy)
             .echo_arguments(args)
             .returns(ReturnsResult)
@@ -35,7 +35,7 @@ pub trait ForwarderSyncCallModule {
         let result = self
             .tx()
             .to(&to)
-            .with_gas_limit(one_third_gas)
+            .gas(one_third_gas)
             .typed(vault_proxy::VaultProxy)
             .echo_arguments(args.clone())
             .returns(ReturnsResult)
@@ -46,7 +46,7 @@ pub trait ForwarderSyncCallModule {
         let result = self
             .tx()
             .to(&to)
-            .with_gas_limit(one_third_gas)
+            .gas(one_third_gas)
             .typed(vault_proxy::VaultProxy)
             .echo_arguments(args)
             .returns(ReturnsResult)
@@ -67,10 +67,10 @@ pub trait ForwarderSyncCallModule {
         let result = self
             .tx()
             .to(&to)
-            .with_gas_limit(half_gas)
+            .gas(half_gas)
             .typed(vault_proxy::VaultProxy)
             .accept_funds_echo_payment()
-            .with_egld_or_single_esdt_transfer(payment)
+            .payment(payment)
             .returns(ReturnsResult)
             .sync_call();
 
@@ -90,7 +90,7 @@ pub trait ForwarderSyncCallModule {
             .to(&to)
             .typed(vault_proxy::VaultProxy)
             .accept_funds()
-            .with_egld_or_single_esdt_transfer((token_id, 0u64, amount_to_send))
+            .egld_or_single_esdt(&token_id, 0u64, &amount_to_send)
             .returns(ReturnsResult)
             .sync_call();
     }
@@ -110,7 +110,7 @@ pub trait ForwarderSyncCallModule {
             .to(&to)
             .typed(vault_proxy::VaultProxy)
             .accept_funds()
-            .with_egld_or_single_esdt_transfer(payment)
+            .payment(payment)
             .sync_call();
 
         self.tx()
@@ -154,7 +154,7 @@ pub trait ForwarderSyncCallModule {
                 amount,
                 OptionalValue::<ManagedBuffer>::Some(b"accept_funds_func".into()),
             )
-            .with_multi_token_transfer(payments.clone_value())
+            .payment(payments)
             .sync_call();
     }
 
@@ -180,7 +180,7 @@ pub trait ForwarderSyncCallModule {
             .to(&to)
             .typed(vault_proxy::VaultProxy)
             .accept_funds()
-            .with_multi_token_transfer(all_token_payments)
+            .payment(all_token_payments)
             .sync_call();
     }
 }
diff --git a/contracts/feature-tests/composability/forwarder/src/call_transf_exec.rs b/contracts/feature-tests/composability/forwarder/src/call_transf_exec.rs
index 3573987867..952f50275c 100644
--- a/contracts/feature-tests/composability/forwarder/src/call_transf_exec.rs
+++ b/contracts/feature-tests/composability/forwarder/src/call_transf_exec.rs
@@ -14,7 +14,7 @@ pub trait ForwarderTransferExecuteModule {
             .to(&to)
             .typed(vault_proxy::VaultProxy)
             .accept_funds()
-            .with_egld_or_single_esdt_transfer(payment)
+            .payment(payment)
             .transfer_execute();
     }
 
@@ -33,7 +33,7 @@ pub trait ForwarderTransferExecuteModule {
             .to(&to)
             .typed(vault_proxy::VaultProxy)
             .accept_funds()
-            .with_egld_or_single_esdt_transfer((token_id, 0u64, amount_to_send))
+            .egld_or_single_esdt(&token_id, 0u64, &amount_to_send)
             .transfer_execute();
     }
 
@@ -48,16 +48,16 @@ pub trait ForwarderTransferExecuteModule {
             .to(&to)
             .typed(vault_proxy::VaultProxy)
             .accept_funds()
-            .with_egld_or_single_esdt_transfer((token.clone(), token_nonce, half_payment.clone()))
-            .with_gas_limit(half_gas)
+            .egld_or_single_esdt(&token, token_nonce, &half_payment)
+            .gas(half_gas)
             .transfer_execute();
 
         self.tx()
             .to(&to)
             .typed(vault_proxy::VaultProxy)
             .accept_funds()
-            .with_egld_or_single_esdt_transfer((token, token_nonce, half_payment))
-            .with_gas_limit(half_gas)
+            .egld_or_single_esdt(&token, token_nonce, &half_payment)
+            .gas(half_gas)
             .transfer_execute();
     }
 
@@ -77,7 +77,7 @@ pub trait ForwarderTransferExecuteModule {
             .to(&to)
             .typed(vault_proxy::VaultProxy)
             .accept_funds()
-            .with_egld_or_single_esdt_transfer(payment)
+            .payment(payment)
             .transfer_execute();
 
         let gas_left_after = self.blockchain().get_gas_left();
@@ -110,7 +110,7 @@ pub trait ForwarderTransferExecuteModule {
             .to(&to)
             .typed(vault_proxy::VaultProxy)
             .accept_funds()
-            .with_multi_token_transfer(all_token_payments)
+            .payment(all_token_payments)
             .transfer_execute()
     }
 
@@ -133,7 +133,7 @@ pub trait ForwarderTransferExecuteModule {
             .to(&to)
             .typed(vault_proxy::VaultProxy)
             .accept_funds()
-            .with_multi_token_transfer(all_token_payments)
+            .payment(all_token_payments)
             .transfer_execute()
     }
 
@@ -156,7 +156,7 @@ pub trait ForwarderTransferExecuteModule {
             .to(&to)
             .typed(vault_proxy::VaultProxy)
             .reject_funds()
-            .with_multi_token_transfer(all_token_payments)
+            .payment(all_token_payments)
             .transfer_execute()
     }
 }
diff --git a/contracts/feature-tests/composability/forwarder/src/nft.rs b/contracts/feature-tests/composability/forwarder/src/nft.rs
index 65e5eb7de1..8eae1e83c5 100644
--- a/contracts/feature-tests/composability/forwarder/src/nft.rs
+++ b/contracts/feature-tests/composability/forwarder/src/nft.rs
@@ -238,15 +238,14 @@ pub trait ForwarderNftModule: storage::ForwarderStorageModule {
         function: ManagedBuffer,
         arguments: MultiValueEncoded<ManagedBuffer>,
     ) {
-        let _ = self.send_raw().transfer_esdt_nft_execute(
-            &to,
-            &token_identifier,
-            nonce,
-            &amount,
-            self.blockchain().get_gas_left(),
-            &function,
-            &arguments.to_arg_buffer(),
-        );
+        let gas_left = self.blockchain().get_gas_left();
+        self.tx()
+            .to(&to)
+            .gas(gas_left)
+            .raw_call(function)
+            .arguments_raw(arguments.to_arg_buffer())
+            .single_esdt(&token_identifier, nonce, &amount)
+            .transfer_execute();
     }
 
     #[endpoint]
diff --git a/contracts/feature-tests/composability/local-esdt-and-nft/src/lib.rs b/contracts/feature-tests/composability/local-esdt-and-nft/src/lib.rs
index e65fd789b4..2f0bf64dc2 100644
--- a/contracts/feature-tests/composability/local-esdt-and-nft/src/lib.rs
+++ b/contracts/feature-tests/composability/local-esdt-and-nft/src/lib.rs
@@ -157,15 +157,15 @@ pub trait LocalEsdtAndEsdtNft {
             arg_buffer.push_arg_raw(arg);
         }
 
-        let _ = self.send_raw().transfer_esdt_nft_execute(
-            &to,
-            &token_identifier,
-            nonce,
-            &amount,
-            self.blockchain().get_gas_left(),
-            &function,
-            &arg_buffer,
-        );
+        let gas_left = self.blockchain().get_gas_left();
+
+        self.tx()
+            .to(&to)
+            .gas(gas_left)
+            .raw_call(function)
+            .arguments_raw(arg_buffer)
+            .single_esdt(&token_identifier, nonce, &amount)
+            .transfer_execute();
     }
 
     // Semi-Fungible
diff --git a/contracts/feature-tests/composability/promises-features/src/call_promises.rs b/contracts/feature-tests/composability/promises-features/src/call_promises.rs
index 2b116215cc..92a2c8e0e1 100644
--- a/contracts/feature-tests/composability/promises-features/src/call_promises.rs
+++ b/contracts/feature-tests/composability/promises-features/src/call_promises.rs
@@ -17,8 +17,8 @@ pub trait CallPromisesModule: common::CommonModule {
             .to(&to)
             .typed(vault_proxy::VaultProxy)
             .accept_funds()
-            .with_gas_limit(gas_limit)
-            .with_egld_or_single_esdt_transfer(payment)
+            .gas(gas_limit)
+            .payment(payment)
             .register_promise();
     }
 
@@ -36,9 +36,9 @@ pub trait CallPromisesModule: common::CommonModule {
             .to(&to)
             .typed(vault_proxy::VaultProxy)
             .retrieve_funds(token, token_nonce, amount)
-            .with_gas_limit(gas_limit)
-            .with_callback(self.callbacks().retrieve_funds_callback())
-            .with_extra_gas_for_callback(10_000_000)
+            .gas(gas_limit)
+            .callback(self.callbacks().retrieve_funds_callback())
+            .gas_for_callback(10_000_000)
             .register_promise();
     }
 
diff --git a/contracts/feature-tests/composability/promises-features/src/call_promises_bt.rs b/contracts/feature-tests/composability/promises-features/src/call_promises_bt.rs
index 6f5d85179e..f6cbbfa188 100644
--- a/contracts/feature-tests/composability/promises-features/src/call_promises_bt.rs
+++ b/contracts/feature-tests/composability/promises-features/src/call_promises_bt.rs
@@ -20,10 +20,10 @@ pub trait CallPromisesBackTransfersModule: common::CommonModule {
             .to(&to)
             .typed(vault_proxy::VaultProxy)
             .retrieve_funds(token, token_nonce, amount)
-            .with_gas_limit(gas_limit)
+            .gas(gas_limit)
             .async_call()
-            .with_callback(self.callbacks().retrieve_funds_back_transfers_callback())
-            .with_extra_gas_for_callback(10_000_000)
+            .callback(self.callbacks().retrieve_funds_back_transfers_callback())
+            .gas_for_callback(10_000_000)
             .register_promise();
     }
 
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 bc3d648b56..ccc9c45406 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
@@ -84,9 +84,8 @@ pub trait ProxyTestFirst {
             .typed(pay_me_proxy::PayMeProxy)
             .pay_me_with_result(0x56)
             .egld(payment)
-            .async_call()
-            .with_callback(self.callbacks().pay_callback())
-            .call_and_exit();
+            .callback(self.callbacks().pay_callback())
+            .async_call_and_exit();
     }
 
     #[endpoint(messageOtherContract)]
@@ -117,9 +116,8 @@ pub trait ProxyTestFirst {
                 [3u8; 3].to_vec(),
                 &ManagedAddress::from(&HARDCODED_ADDRESS),
             )
-            .async_call()
-            .with_callback(self.callbacks().message_callback())
-            .call_and_exit()
+            .callback(self.callbacks().message_callback())
+            .async_call_and_exit()
     }
 
     #[callback(payCallback)] // although uncommon, custom callback names are possible
diff --git a/contracts/feature-tests/composability/recursive-caller/src/recursive_caller.rs b/contracts/feature-tests/composability/recursive-caller/src/recursive_caller.rs
index 94f26e7e8d..339a9c7304 100644
--- a/contracts/feature-tests/composability/recursive-caller/src/recursive_caller.rs
+++ b/contracts/feature-tests/composability/recursive-caller/src/recursive_caller.rs
@@ -26,14 +26,13 @@ pub trait RecursiveCaller {
             .typed(vault_proxy::VaultProxy)
             .accept_funds()
             .egld_or_single_esdt(token_identifier, 0, amount)
-            .async_call()
-            .with_callback(self.callbacks().recursive_send_funds_callback(
+            .callback(self.callbacks().recursive_send_funds_callback(
                 to,
                 token_identifier,
                 amount,
                 counter,
             ))
-            .call_and_exit();
+            .async_call_and_exit();
     }
 
     #[callback]
diff --git a/contracts/feature-tests/composability/vault/src/vault.rs b/contracts/feature-tests/composability/vault/src/vault.rs
index d23123ca01..6984291b06 100644
--- a/contracts/feature-tests/composability/vault/src/vault.rs
+++ b/contracts/feature-tests/composability/vault/src/vault.rs
@@ -107,16 +107,12 @@ pub trait Vault {
         let caller = self.blockchain().get_caller();
         let func_name = opt_receive_func.into_option().unwrap_or_default();
 
-        self.send_raw()
-            .transfer_esdt_execute(
-                &caller,
-                &token,
-                &amount,
-                50_000_000,
-                &func_name,
-                &ManagedArgBuffer::new(),
-            )
-            .unwrap_or_else(|_| sc_panic!("ESDT transfer failed"));
+        self.tx()
+            .to(&caller)
+            .gas(50_000_000u64)
+            .raw_call(func_name)
+            .single_esdt(&token, 0u64, &amount)
+            .transfer_execute();
     }
 
     #[allow_multiple_var_args]
diff --git a/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/src/crowdfunding_erc20.rs b/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/src/crowdfunding_erc20.rs
index 72b1cf8708..019ec560a5 100644
--- a/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/src/crowdfunding_erc20.rs
+++ b/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/src/crowdfunding_erc20.rs
@@ -36,7 +36,7 @@ pub trait Crowdfunding {
             .to(&erc20_address)
             .typed(erc20_proxy::SimpleErc20TokenProxy)
             .transfer_from(caller.clone(), cf_contract_address, token_amount.clone())
-            .with_callback(
+            .callback(
                 self.callbacks()
                     .transfer_from_callback(caller, token_amount),
             )
diff --git a/contracts/feature-tests/erc-style-contracts/erc1155/src/erc1155.rs b/contracts/feature-tests/erc-style-contracts/erc1155/src/erc1155.rs
index c6e9c5ce9a..725cff90de 100644
--- a/contracts/feature-tests/erc-style-contracts/erc1155/src/erc1155.rs
+++ b/contracts/feature-tests/erc-style-contracts/erc1155/src/erc1155.rs
@@ -354,7 +354,7 @@ pub trait Erc1155 {
             .to(to.clone())
             .typed(erc1155_user_proxy::Erc1155UserProxy)
             .on_erc1155_received(caller, from.clone(), type_id.clone(), value.clone(), data)
-            .with_callback(self.callbacks().transfer_callback(
+            .callback(self.callbacks().transfer_callback(
                 from,
                 to,
                 [type_id].to_vec(),
@@ -383,7 +383,7 @@ pub trait Erc1155 {
                 values.to_vec(),
                 data,
             )
-            .with_callback(self.callbacks().transfer_callback(
+            .callback(self.callbacks().transfer_callback(
                 from,
                 to,
                 type_ids.to_vec(),
diff --git a/contracts/feature-tests/erc-style-contracts/lottery-erc20/src/lottery.rs b/contracts/feature-tests/erc-style-contracts/lottery-erc20/src/lottery.rs
index 105b19b166..1bbd1f7370 100644
--- a/contracts/feature-tests/erc-style-contracts/lottery-erc20/src/lottery.rs
+++ b/contracts/feature-tests/erc-style-contracts/lottery-erc20/src/lottery.rs
@@ -214,7 +214,7 @@ pub trait Lottery {
             .to(&erc20_address)
             .typed(erc20_proxy::SimpleErc20TokenProxy)
             .transfer_from(caller.clone(), lottery_contract_address, token_amount)
-            .with_callback(
+            .callback(
                 self.callbacks()
                     .transfer_from_callback(lottery_name, &caller),
             )
@@ -285,7 +285,7 @@ pub trait Lottery {
             .to(&erc20_address)
             .typed(erc20_proxy::SimpleErc20TokenProxy)
             .transfer(winner_address, prize)
-            .with_callback(self.callbacks().distribute_prizes_callback(lottery_name))
+            .callback(self.callbacks().distribute_prizes_callback(lottery_name))
             .async_call_and_exit();
     }
 
diff --git a/contracts/feature-tests/rust-testing-framework-tester/src/lib.rs b/contracts/feature-tests/rust-testing-framework-tester/src/lib.rs
index dae11542e4..7a5b181028 100644
--- a/contracts/feature-tests/rust-testing-framework-tester/src/lib.rs
+++ b/contracts/feature-tests/rust-testing-framework-tester/src/lib.rs
@@ -176,13 +176,14 @@ pub trait RustTestingFrameworkTester: dummy_module::DummyModule {
 
     #[endpoint]
     fn call_other_contract_execute_on_dest(&self, other_sc_address: ManagedAddress) -> BigUint {
-        let call_result = self.send_raw().execute_on_dest_context_raw(
-            self.blockchain().get_gas_left(),
-            &other_sc_address,
-            &BigUint::zero(),
-            &ManagedBuffer::new_from_bytes(b"getTotalValue"),
-            &ManagedArgBuffer::new(),
-        );
+        let gas_left = self.blockchain().get_gas_left();
+        let call_result = self
+            .tx()
+            .to(&other_sc_address)
+            .gas(gas_left)
+            .raw_call("getTotalValue")
+            .returns(ReturnsRawResult)
+            .sync_call();
         if let Some(raw_value) = call_result.try_get(0) {
             BigUint::from_bytes_be_buffer(&raw_value)
         } else {
@@ -195,12 +196,11 @@ pub trait RustTestingFrameworkTester: dummy_module::DummyModule {
         let mut args = ManagedArgBuffer::new();
         args.push_arg(&value);
 
-        self.send_raw().async_call_raw(
-            &other_sc_address,
-            &BigUint::zero(),
-            &ManagedBuffer::new_from_bytes(b"add"),
-            &args,
-        );
+        self.tx()
+            .to(&other_sc_address)
+            .raw_call("call")
+            .arguments_raw(args)
+            .async_call_and_exit();
     }
 
     #[callback_raw]
@@ -218,13 +218,13 @@ pub trait RustTestingFrameworkTester: dummy_module::DummyModule {
         let mut args = ManagedArgBuffer::new();
         args.push_arg(value);
 
-        let _ = self.send_raw().execute_on_dest_context_raw(
-            self.blockchain().get_gas_left(),
-            &other_sc_address,
-            &BigUint::zero(),
-            &ManagedBuffer::new_from_bytes(b"addValue"),
-            &args,
-        );
+        let gas_left = self.blockchain().get_gas_left();
+        self.tx()
+            .to(&other_sc_address)
+            .gas(gas_left)
+            .raw_call("addValue")
+            .arguments_raw(args)
+            .sync_call();
     }
 
     #[endpoint(addValue)]
diff --git a/framework/base/src/storage/mappers/token/fungible_token_mapper.rs b/framework/base/src/storage/mappers/token/fungible_token_mapper.rs
index f24e6139bf..efc322c2eb 100644
--- a/framework/base/src/storage/mappers/token/fungible_token_mapper.rs
+++ b/framework/base/src/storage/mappers/token/fungible_token_mapper.rs
@@ -184,7 +184,7 @@ where
                 EsdtTokenType::Fungible,
                 num_decimals,
             )
-            .with_callback(callback)
+            .callback(callback)
             .async_call_and_exit();
     }
 
diff --git a/framework/base/src/storage/mappers/token/non_fungible_token_mapper.rs b/framework/base/src/storage/mappers/token/non_fungible_token_mapper.rs
index 666776e88b..3e886f21de 100644
--- a/framework/base/src/storage/mappers/token/non_fungible_token_mapper.rs
+++ b/framework/base/src/storage/mappers/token/non_fungible_token_mapper.rs
@@ -202,7 +202,7 @@ where
                 num_decimals,
             )
             .async_call()
-            .with_callback(callback)
+            .callback(callback)
             .call_and_exit()
     }
 
diff --git a/framework/base/src/types/interaction/tx_exec/tx_exec_upgrade.rs b/framework/base/src/types/interaction/tx_exec/tx_exec_upgrade.rs
index 5a08481640..01a0107d68 100644
--- a/framework/base/src/types/interaction/tx_exec/tx_exec_upgrade.rs
+++ b/framework/base/src/types/interaction/tx_exec/tx_exec_upgrade.rs
@@ -79,6 +79,41 @@ where
     }
 }
 
+impl<Api, Payment, Gas, FromSourceValue, RH>
+    Tx<
+        TxScEnv<Api>,
+        (),
+        &ManagedAddress<Api>,
+        Payment,
+        Gas,
+        UpgradeCall<TxScEnv<Api>, FromSource<FromSourceValue>>,
+        RH,
+    >
+where
+    Api: CallTypeApi,
+    Payment: TxPaymentEgldOnly<TxScEnv<Api>>,
+    Gas: TxGas<TxScEnv<Api>>,
+    FromSourceValue: TxFromSourceValue<TxScEnv<Api>>,
+    RH: TxEmptyResultHandler<TxScEnv<Api>>,
+{
+    /// Launches the upgrade from source async call.
+    ///
+    /// TODO: change return type to `!`.
+    pub fn upgrade_async_call_and_exit(self) {
+        let gas = self.gas.explicit_or_gas_left(&self.env);
+        self.payment.with_egld_value(&self.env, |egld_value| {
+            SendRawWrapper::<Api>::new().upgrade_from_source_contract(
+                self.to,
+                gas,
+                egld_value,
+                &self.data.code_source.0.into_value(&self.env),
+                self.data.code_metadata,
+                &self.data.arg_buffer,
+            );
+        });
+    }
+}
+
 impl<Api, Payment, Gas, RH>
     Tx<TxScEnv<Api>, (), ManagedAddress<Api>, Payment, Gas, UpgradeCall<TxScEnv<Api>, ()>, RH>
 where
@@ -133,3 +168,58 @@ where
         });
     }
 }
+
+impl<Api, Payment, Gas, RH>
+    Tx<TxScEnv<Api>, (), &ManagedAddress<Api>, Payment, Gas, UpgradeCall<TxScEnv<Api>, ()>, RH>
+where
+    Api: CallTypeApi,
+    Payment: TxPaymentEgldOnly<TxScEnv<Api>>,
+    Gas: TxGas<TxScEnv<Api>>,
+    RH: TxEmptyResultHandler<TxScEnv<Api>>,
+{
+    /// Backwards compatibility, immitates the old API.
+    ///
+    /// Note that the data type (the `UpgradeCall`) doesn't have the code set.
+    /// This is because the old API was passing it as paramter, so we use it from the `code` argument.
+    ///
+    /// Also note that the code metadata is taken from the `code_metadata` argument.
+    /// If another one was previously set in the `Tx` object, that one will be ignored.
+    pub fn upgrade_contract(self, code: &ManagedBuffer<Api>, code_metadata: CodeMetadata) {
+        let gas = self.gas.explicit_or_gas_left(&self.env);
+        self.payment.with_egld_value(&self.env, |egld_value| {
+            SendRawWrapper::<Api>::new().upgrade_contract(
+                self.to,
+                gas,
+                egld_value,
+                code,
+                code_metadata,
+                &self.data.arg_buffer,
+            );
+        });
+    }
+
+    /// Backwards compatibility, immitates the old API.
+    ///
+    /// Note that the data type (the `UpgradeCall`) doesn't have the code set.
+    /// This is because the old API was passing it as paramter, so we use it from the `code` argument.
+    ///
+    /// Also note that the code metadata is taken from the `code_metadata` argument.
+    /// If another one was previously set in the `Tx` object, that one will be ignored.
+    pub fn upgrade_from_source(
+        self,
+        source_address: &ManagedAddress<Api>,
+        code_metadata: CodeMetadata,
+    ) {
+        let gas = self.gas.explicit_or_gas_left(&self.env);
+        self.payment.with_egld_value(&self.env, |egld_value| {
+            SendRawWrapper::<Api>::new().upgrade_from_source_contract(
+                self.to,
+                gas,
+                egld_value,
+                source_address,
+                code_metadata,
+                &self.data.arg_buffer,
+            );
+        });
+    }
+}
diff --git a/framework/base/src/types/interaction/upgrade_call.rs b/framework/base/src/types/interaction/upgrade_call.rs
index d69895f029..c33290e82b 100644
--- a/framework/base/src/types/interaction/upgrade_call.rs
+++ b/framework/base/src/types/interaction/upgrade_call.rs
@@ -1,8 +1,13 @@
 use multiversx_sc_codec::TopEncodeMulti;
 
-use crate::types::{CodeMetadata, ManagedBuffer, ManagedBufferCachedBuilder};
+use crate::{
+    proxy_imports::ManagedTypeApi,
+    types::{CodeMetadata, ManagedBuffer, ManagedBufferCachedBuilder},
+};
 
-use super::{ManagedArgBuffer, TxCodeSource, TxData, TxEnv};
+use super::{
+    FunctionCall, ManagedArgBuffer, TxCodeSource, TxData, TxDataFunctionCall, TxEnv, TxScEnv,
+};
 
 /// Holds deploy data: code, code metadata, and arguments.
 pub struct UpgradeCall<Env, CodeSource>

From 16ff8d198d0aeba4c209b0e08bbe4d868ea4f790 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Mon, 8 Apr 2024 16:41:54 +0200
Subject: [PATCH 0664/1254] fix mandos

---
 .../composability/scenarios/forw_raw_sync_echo.scen.json | 9 ++-------
 .../scenarios/forw_raw_sync_echo_caller.scen.json        | 7 ++-----
 2 files changed, 4 insertions(+), 12 deletions(-)

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 37715399ae..ed599f9492 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
@@ -91,12 +91,7 @@
                 "gasPrice": "0"
             },
             "expect": {
-                "out": [
-                    "1",
-                    "2",
-                    "1",
-                    "2"
-                ],
+                "out": [],
                 "status": "0",
                 "logs": [
                     {
@@ -163,4 +158,4 @@
             }
         }
     ]
-}
+}
\ No newline at end of file
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 50b291e3b4..0bfa9fd894 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
@@ -80,10 +80,7 @@
                 "gasPrice": "0"
             },
             "expect": {
-                "out": [
-                    "sc:forwarder",
-                    "sc:forwarder"
-                ],
+                "out": [],
                 "status": "0",
                 "logs": [
                     {
@@ -136,4 +133,4 @@
             }
         }
     ]
-}
+}
\ No newline at end of file

From 10dcd1d7bca7df233082d8bdd4e66a7ca7010676 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Mon, 8 Apr 2024 17:46:08 +0300
Subject: [PATCH 0665/1254] builtin func - claim dev rewards send wrapper

---
 contracts/modules/src/claim_developer_rewards.rs  |  6 +-----
 .../src/contract_base/wrappers/send_wrapper.rs    | 15 ++++++++++++++-
 .../system_proxy/builtin_func_proxy.rs            |  4 ----
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/contracts/modules/src/claim_developer_rewards.rs b/contracts/modules/src/claim_developer_rewards.rs
index 5a63ddd6bc..31911b815f 100644
--- a/contracts/modules/src/claim_developer_rewards.rs
+++ b/contracts/modules/src/claim_developer_rewards.rs
@@ -4,10 +4,6 @@ multiversx_sc::imports!();
 pub trait ClaimDeveloperRewardsModule {
     #[endpoint(claimDeveloperRewards)]
     fn claim_developer_rewards(&self, child_sc_address: ManagedAddress) {
-        self.tx()
-            .to(&child_sc_address)
-            .typed(system_proxy::UserBuiltinProxy)
-            .claim_developer_rewards()
-            .async_call_and_exit();
+        self.claim_developer_rewards(child_sc_address);
     }
 }
diff --git a/framework/base/src/contract_base/wrappers/send_wrapper.rs b/framework/base/src/contract_base/wrappers/send_wrapper.rs
index a90ff3e5c4..ce9a130eed 100644
--- a/framework/base/src/contract_base/wrappers/send_wrapper.rs
+++ b/framework/base/src/contract_base/wrappers/send_wrapper.rs
@@ -358,6 +358,19 @@ where
             .async_call_and_exit()
     }
 
+    /// Creates a call to the `ClaimDeveloperRewards` builtin function.
+    ///
+    /// In itself, this does nothing. You need to then call turn the contract call into an async call.
+    pub fn claim_developer_rewards(
+        &self,
+        child_sc_address: ManagedAddress<A>,
+    ) -> system_proxy::UserBuiltinProxyMethods<TxScEnv<A>, (), ManagedAddress<A>, ()> {
+        Tx::new_tx_from_sc()
+            .to(child_sc_address)
+            .typed(system_proxy::UserBuiltinProxy)
+            .claim_developer_rewards()
+    }
+
     /// Creates a call to the `ChangeOwnerAddress` builtin function.
     ///
     /// In itself, this does nothing. You need to then call turn the contract call into an async call.
@@ -398,7 +411,7 @@ where
             .gas(GasLeft)
             .raw_call(function_name)
             .arguments_raw(arg_buffer)
-            .sync_call()
+        // .sync_call()
     }
 
     /// Allows synchronous minting of ESDT/SFT (depending on nonce). Execution is resumed afterwards.
diff --git a/framework/base/src/types/interaction/system_proxy/builtin_func_proxy.rs b/framework/base/src/types/interaction/system_proxy/builtin_func_proxy.rs
index d71d398c75..e838bbc49f 100644
--- a/framework/base/src/types/interaction/system_proxy/builtin_func_proxy.rs
+++ b/framework/base/src/types/interaction/system_proxy/builtin_func_proxy.rs
@@ -37,7 +37,6 @@ where
 impl<Env, From, To, Gas> UserBuiltinProxyMethods<Env, From, To, Gas>
 where
     Env: TxEnv,
-    Env::Api: VMApi,
     From: TxFrom<Env>,
     To: TxTo<Env>,
     Gas: TxGas<Env>,
@@ -62,9 +61,6 @@ where
             .original_result()
     }
 
-    /// Creates a call to the `ClaimDeveloperRewards` builtin function.
-    ///
-    /// In itself, this does nothing. You need to then call turn the contract call into an async call.
     pub fn claim_developer_rewards(
         self,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {

From 70b4a4463d86d635e9ba8474bfdcf9b06a786e11 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Mon, 8 Apr 2024 18:01:25 +0300
Subject: [PATCH 0666/1254] builtin func - clam dev rewards fix

---
 contracts/modules/src/claim_developer_rewards.rs     |  4 +++-
 .../base/src/contract_base/wrappers/send_wrapper.rs  | 12 +++++++-----
 framework/base/src/types/interaction/system_proxy.rs |  2 +-
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/contracts/modules/src/claim_developer_rewards.rs b/contracts/modules/src/claim_developer_rewards.rs
index 31911b815f..ac1187ab20 100644
--- a/contracts/modules/src/claim_developer_rewards.rs
+++ b/contracts/modules/src/claim_developer_rewards.rs
@@ -4,6 +4,8 @@ multiversx_sc::imports!();
 pub trait ClaimDeveloperRewardsModule {
     #[endpoint(claimDeveloperRewards)]
     fn claim_developer_rewards(&self, child_sc_address: ManagedAddress) {
-        self.claim_developer_rewards(child_sc_address);
+        self.send()
+            .claim_developer_rewards(child_sc_address)
+            .sync_call();
     }
 }
diff --git a/framework/base/src/contract_base/wrappers/send_wrapper.rs b/framework/base/src/contract_base/wrappers/send_wrapper.rs
index ce9a130eed..959ae206f0 100644
--- a/framework/base/src/contract_base/wrappers/send_wrapper.rs
+++ b/framework/base/src/contract_base/wrappers/send_wrapper.rs
@@ -13,9 +13,9 @@ use crate::{
             ESDT_NFT_CREATE_FUNC_NAME, ESDT_NFT_UPDATE_ATTRIBUTES_FUNC_NAME,
         },
         BigUint, ContractCall, ContractCallNoPayment, ESDTSystemSCAddress,
-        EgldOrEsdtTokenIdentifier, EsdtTokenPayment, GasLeft, ManagedAddress, ManagedArgBuffer,
-        ManagedBuffer, ManagedType, ManagedVec, ReturnsRawResult, ToSelf, TokenIdentifier, Tx,
-        TxScEnv,
+        EgldOrEsdtTokenIdentifier, EsdtTokenPayment, FunctionCall, GasLeft, ManagedAddress,
+        ManagedArgBuffer, ManagedBuffer, ManagedType, ManagedVec, OriginalResultMarker,
+        ReturnsRawResult, ToSelf, TokenIdentifier, Tx, TxScEnv,
     },
 };
 
@@ -361,10 +361,12 @@ where
     /// Creates a call to the `ClaimDeveloperRewards` builtin function.
     ///
     /// In itself, this does nothing. You need to then call turn the contract call into an async call.
+    #[allow(clippy::type_complexity)]
     pub fn claim_developer_rewards(
         &self,
         child_sc_address: ManagedAddress<A>,
-    ) -> system_proxy::UserBuiltinProxyMethods<TxScEnv<A>, (), ManagedAddress<A>, ()> {
+    ) -> Tx<TxScEnv<A>, (), ManagedAddress<A>, (), (), FunctionCall<A>, OriginalResultMarker<()>>
+    {
         Tx::new_tx_from_sc()
             .to(child_sc_address)
             .typed(system_proxy::UserBuiltinProxy)
@@ -411,7 +413,7 @@ where
             .gas(GasLeft)
             .raw_call(function_name)
             .arguments_raw(arg_buffer)
-        // .sync_call()
+            .sync_call()
     }
 
     /// Allows synchronous minting of ESDT/SFT (depending on nonce). Execution is resumed afterwards.
diff --git a/framework/base/src/types/interaction/system_proxy.rs b/framework/base/src/types/interaction/system_proxy.rs
index 42bbbcf53b..d9ca05198d 100644
--- a/framework/base/src/types/interaction/system_proxy.rs
+++ b/framework/base/src/types/interaction/system_proxy.rs
@@ -1,8 +1,8 @@
+pub mod builtin_func_names;
 mod builtin_func_proxy;
 mod esdt_system_sc_proxy;
 mod legacy_system_sc_proxy;
 pub(crate) mod token_properties;
-pub mod builtin_func_names;
 
 pub use builtin_func_proxy::*;
 pub use esdt_system_sc_proxy::*;

From 978c5629f810318bfef196241e6f06b7b1033842 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Mon, 8 Apr 2024 18:28:26 +0300
Subject: [PATCH 0667/1254] codec - universal_decode_number optimziation

---
 .../src/impl_for_types/impl_num_signed.rs     |  8 ++--
 .../src/impl_for_types/impl_num_unsigned.rs   |  8 ++--
 data/codec/src/num_conv.rs                    | 41 +++++++++++--------
 data/codec/src/single/top_de_input.rs         |  9 ++--
 data/codec/tests/derive_hygiene.rs            |  1 +
 5 files changed, 39 insertions(+), 28 deletions(-)

diff --git a/data/codec/src/impl_for_types/impl_num_signed.rs b/data/codec/src/impl_for_types/impl_num_signed.rs
index 50cb85614e..3596c65e80 100644
--- a/data/codec/src/impl_for_types/impl_num_signed.rs
+++ b/data/codec/src/impl_for_types/impl_num_signed.rs
@@ -1,7 +1,7 @@
 use crate::{
-    dep_encode_num_mimic, num_conv::universal_decode_number, DecodeError, DecodeErrorHandler,
-    EncodeErrorHandler, NestedDecode, NestedDecodeInput, NestedEncode, NestedEncodeOutput,
-    TopDecode, TopDecodeInput, TopEncode, TopEncodeOutput,
+    dep_encode_num_mimic, num_conv::universal_decode_number_unchecked, DecodeError,
+    DecodeErrorHandler, EncodeErrorHandler, NestedDecode, NestedDecodeInput, NestedEncode,
+    NestedEncodeOutput, TopDecode, TopDecodeInput, TopEncode, TopEncodeOutput,
 };
 
 macro_rules! top_encode_num_signed {
@@ -42,7 +42,7 @@ macro_rules! dep_decode_num_signed {
             {
                 let mut bytes = [0u8; $num_bytes];
                 input.read_into(&mut bytes[..], h)?;
-                let num = universal_decode_number(&bytes[..], true) as $ty;
+                let num = universal_decode_number_unchecked(&bytes[..], true) as $ty;
                 Ok(num)
             }
         }
diff --git a/data/codec/src/impl_for_types/impl_num_unsigned.rs b/data/codec/src/impl_for_types/impl_num_unsigned.rs
index b9e98051fc..aa099628d2 100644
--- a/data/codec/src/impl_for_types/impl_num_unsigned.rs
+++ b/data/codec/src/impl_for_types/impl_num_unsigned.rs
@@ -1,7 +1,7 @@
 use crate::{
-    dep_encode_num_mimic, num_conv::universal_decode_number, DecodeError, DecodeErrorHandler,
-    EncodeErrorHandler, NestedDecode, NestedDecodeInput, NestedEncode, NestedEncodeOutput,
-    TopDecode, TopDecodeInput, TopEncode, TopEncodeOutput,
+    dep_encode_num_mimic, num_conv::universal_decode_number_unchecked, DecodeError,
+    DecodeErrorHandler, EncodeErrorHandler, NestedDecode, NestedDecodeInput, NestedEncode,
+    NestedEncodeOutput, TopDecode, TopDecodeInput, TopEncode, TopEncodeOutput,
 };
 
 // No reversing needed for u8, because it is a single byte.
@@ -102,7 +102,7 @@ macro_rules! dep_decode_num_unsigned {
             {
                 let mut bytes = [0u8; $num_bytes];
                 input.read_into(&mut bytes[..], h)?;
-                let num = universal_decode_number(&bytes[..], false) as $ty;
+                let num = universal_decode_number_unchecked(&bytes[..], false) as $ty;
                 Ok(num)
             }
         }
diff --git a/data/codec/src/num_conv.rs b/data/codec/src/num_conv.rs
index cfca20180b..38c3ba767f 100644
--- a/data/codec/src/num_conv.rs
+++ b/data/codec/src/num_conv.rs
@@ -110,23 +110,32 @@ fn fill_buffer_find_offset(x: u64, signed: bool, buffer: &mut TopEncodeNumberBuf
 ///
 /// No generics here, we avoid monomorphization to make the SC binary as small as possible.
 pub fn universal_decode_number(bytes: &[u8], signed: bool) -> u64 {
-    if bytes.is_empty() {
-        return 0;
-    }
-    let negative = signed && msbit_is_one(bytes[0]);
-    let mut result = if negative {
-        // start with all bits set to 1,
-        // to ensure that if there are fewer bytes than the result type width,
-        // the leading bits will be 1 instead of 0
-        u64::MAX
-    } else {
-        0u64
-    };
-    for byte in bytes.iter() {
-        result <<= 8;
-        result |= *byte as u64;
+    // it is almost impossible to get a slice longer than 8
+    // just a basic overflow/underflow protection
+    let safe_len = bytes.len() % 9;
+    universal_decode_number_impl(bytes, safe_len, signed)
+}
+
+/// Same as [`universal_decode_number`], but assumes that the input length does not exceed 8.
+pub fn universal_decode_number_unchecked(bytes: &[u8], signed: bool) -> u64 {
+    universal_decode_number_impl(bytes, bytes.len(), signed)
+}
+
+fn universal_decode_number_impl(bytes: &[u8], len: usize, signed: bool) -> u64 {
+    let negative = signed && len > 0 && msbit_is_one(bytes[0]);
+    let skippable_byte = skippable_byte(negative);
+
+    let mut extended_buffer = [skippable_byte; 8];
+    let offset = 8 - len;
+    unsafe {
+        core::ptr::copy_nonoverlapping(
+            bytes.as_ptr(),
+            extended_buffer.as_mut_ptr().add(offset),
+            len,
+        )
     }
-    result
+
+    u64::from_be_bytes(extended_buffer)
 }
 
 /// Most significant bit is 1.
diff --git a/data/codec/src/single/top_de_input.rs b/data/codec/src/single/top_de_input.rs
index 594785c35c..dc74370daf 100644
--- a/data/codec/src/single/top_de_input.rs
+++ b/data/codec/src/single/top_de_input.rs
@@ -1,6 +1,7 @@
 use crate::{
-    num_conv::universal_decode_number, transmute::vec_into_boxed_slice, DecodeError,
-    DecodeErrorHandler, NestedDecodeInput, OwnedBytesNestedDecodeInput, TryStaticCast,
+    num_conv::{universal_decode_number, universal_decode_number_unchecked},
+    transmute::vec_into_boxed_slice,
+    DecodeError, DecodeErrorHandler, NestedDecodeInput, OwnedBytesNestedDecodeInput, TryStaticCast,
 };
 use alloc::{boxed::Box, vec::Vec};
 
@@ -38,7 +39,7 @@ pub trait TopDecodeInput: Sized {
     {
         let mut buffer = [0u8; 8];
         let slice = self.into_max_size_buffer(&mut buffer, h)?;
-        Ok(universal_decode_number(slice, false))
+        Ok(universal_decode_number_unchecked(slice, false))
     }
 
     /// Retrieves the underlying data as a pre-parsed i64.
@@ -51,7 +52,7 @@ pub trait TopDecodeInput: Sized {
     {
         let mut buffer = [0u8; 8];
         let slice = self.into_max_size_buffer(&mut buffer, h)?;
-        Ok(universal_decode_number(slice, true) as i64)
+        Ok(universal_decode_number_unchecked(slice, true) as i64)
     }
 
     #[inline]
diff --git a/data/codec/tests/derive_hygiene.rs b/data/codec/tests/derive_hygiene.rs
index 4f9cc5e1f9..1ac67e6478 100644
--- a/data/codec/tests/derive_hygiene.rs
+++ b/data/codec/tests/derive_hygiene.rs
@@ -35,6 +35,7 @@ use crate::Result::{Err, Ok};
 // They are not used in the derive, but just to make sure:
 fn top_encode_number() {}
 fn universal_decode_number() {}
+fn universal_decode_number_unchecked() {}
 fn dep_decode_from_byte_slice() {}
 fn dep_encode_to_vec() {}
 fn top_decode_from_nested_or_handle_err() {}

From ac7efa72b8d7f56f5e6de454a2876b44de34edb5 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Mon, 8 Apr 2024 19:17:11 +0300
Subject: [PATCH 0668/1254] builtin func - change owner address & esdt local
 burn

---
 .../scenarios/stress_submit_test.scen.json    | 100 +++++++++---------
 .../forwarder/src/contract_change_owner.rs    |   2 +-
 .../contract_base/wrappers/send_wrapper.rs    |  45 ++++----
 .../system_proxy/builtin_func_proxy.rs        |  46 ++++++--
 4 files changed, 107 insertions(+), 86 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 6ed4ec81ac..e2b19c9966 100644
--- a/contracts/core/price-aggregator/scenarios/stress_submit_test.scen.json
+++ b/contracts/core/price-aggregator/scenarios/stress_submit_test.scen.json
@@ -1133,7 +1133,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x5f",
-                    "0x7e73f7325747f41e",
+                    "0xd7fd71920be3e621",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1154,7 +1154,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x67da5ce3a07967b4",
+                    "0x5a032236cff2ff06",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1175,7 +1175,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x42345d9c03249906",
+                    "0x2e874347688dffa1",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1196,7 +1196,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x729cbab7559d2418",
+                    "0x4c94033d5e15a73a",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1217,7 +1217,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x4b1f1fb91704289a",
+                    "0x2bd5b88173750be6",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1238,7 +1238,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x9041a66f9a8eddd3",
+                    "0xe4cb406e5f95d9d7",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1259,7 +1259,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x119426970178f4e8",
+                    "0xfd4dd723ed0b256e",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1280,7 +1280,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xa4a00453870b1413",
+                    "0x66b6bfe973064cfd",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1301,7 +1301,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x506335784433b85b",
+                    "0xbc6a51b940c5c479",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1322,7 +1322,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xa272188ead522f3c",
+                    "0x47ca1962093887df",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1343,7 +1343,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x899a358acd3a916d",
+                    "0xa9657f2b7c255e3c",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1364,7 +1364,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xa72819f377890189",
+                    "0xadaf4aaa5e63f2e5",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1385,7 +1385,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x67c7c355dbf99be8",
+                    "0x153a1384b3d68656",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1406,7 +1406,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xfbb7382befbf0ba3",
+                    "0x4ba5dda59b2ba4e9",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1427,7 +1427,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x3b6e67573e4e3f73",
+                    "0x973e0d62157afb51",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1448,7 +1448,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xf1cad9d61b5dea8e",
+                    "0xe18cb77b44399b45",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1469,7 +1469,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x0f125f34c142d4dd",
+                    "0x30a1ed7ed6069074",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1490,7 +1490,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xe78b1d333ef1d9cb",
+                    "0xfbd288d325739548",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1511,7 +1511,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x2d95a8f7484f98c5",
+                    "0x83ad3ad74745e6f5",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1532,7 +1532,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x7a97d84d6b233203",
+                    "0x0cc85234d5ea00b2",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1553,7 +1553,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xb874fdc44ac92cff",
+                    "0x8dae036c75e9a62c",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1574,7 +1574,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x8cb05ff6dcfb459f",
+                    "0x31549118c983eaa0",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1595,7 +1595,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xa402f6a3b4ee09e7",
+                    "0x8228096b6388b4bd",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1616,7 +1616,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x24f913b5c6d6d687",
+                    "0x2dc8b16251c44710",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1637,7 +1637,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x601430ad5b35c7b2",
+                    "0xbc66b6f85858d98c",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1658,7 +1658,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xa66e3496b143093d",
+                    "0x2937c9b0c1073c0b",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1679,7 +1679,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x10fbd80dee58e58c",
+                    "0xa2b7bd06214aabc4",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1700,7 +1700,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xdbe95503112f8855",
+                    "0x61ae8ac001144476",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1721,7 +1721,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x799a64362d43ecb5",
+                    "0x5f6de265c643495f",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1742,7 +1742,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xc4040f7c568dfe5f",
+                    "0x67430307e2f864f0",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1763,7 +1763,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x5f0934092a3b285e",
+                    "0x7de010a49d52cd3f",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1784,7 +1784,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xbab97635db0333b2",
+                    "0xb27799264f3b84ec",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1805,7 +1805,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x3a540081e9ccd62e",
+                    "0x53d7a1ade83e0f2e",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1826,7 +1826,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x05bea873f4825a82",
+                    "0x2ec40e01673b8ad7",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1847,7 +1847,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x67d016dd357634ca",
+                    "0xfb616537f76f8ffb",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1868,7 +1868,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x4d6b5212f854c77d",
+                    "0x387268d229f4ec9a",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1889,7 +1889,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x7c62a09f1a3336c8",
+                    "0xdea0f1c84325ea3a",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1910,7 +1910,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x21c179faeb48f1d7",
+                    "0x12eb7cb637de6e86",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1931,7 +1931,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xe7f11437e10fa779",
+                    "0x5f6b1784511d622d",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1952,7 +1952,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xb06dea0282c5fa22",
+                    "0x1a41106366209d8d",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1973,7 +1973,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x805ed8f4a0a71cce",
+                    "0x2324bca02526fec9",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -1994,7 +1994,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x483ef0b2517c0915",
+                    "0xccf33fc47ef34300",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -2015,7 +2015,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x45e24c96cc048c8e",
+                    "0xebfab26bff9c74a3",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -2036,7 +2036,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x2c9cfe97258a6099",
+                    "0x116a45e410db659b",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -2057,7 +2057,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xf0c3114cbb06b7ac",
+                    "0xc9bddc2b06ba1f1e",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -2078,7 +2078,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x9400e2a0a2b4c559",
+                    "0xde7473b9bfdfe96c",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -2099,7 +2099,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x6ff6239cf418528a",
+                    "0x91c2ff3a5c73267e",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -2120,7 +2120,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x3a1e0de1fb534547",
+                    "0x95bb44dffc62bb47",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -2141,7 +2141,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x3a549a5c074f3805",
+                    "0x2f28d194b7659f9f",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
@@ -2162,7 +2162,7 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xaebe838a44d1559e",
+                    "0xc1bd397146f3353e",
                     "0x"
                 ],
                 "gasLimit": "7,000,000"
diff --git a/contracts/feature-tests/composability/forwarder/src/contract_change_owner.rs b/contracts/feature-tests/composability/forwarder/src/contract_change_owner.rs
index e90920a29b..855abcc2fd 100644
--- a/contracts/feature-tests/composability/forwarder/src/contract_change_owner.rs
+++ b/contracts/feature-tests/composability/forwarder/src/contract_change_owner.rs
@@ -13,7 +13,7 @@ pub trait ChangeOwnerModule {
         let () = self
             .send()
             .change_owner_address(child_sc_address.clone(), &new_owner)
-            .execute_on_dest_context();
+            .sync_call();
 
         self.get_owner_of_vault_contract(child_sc_address)
     }
diff --git a/framework/base/src/contract_base/wrappers/send_wrapper.rs b/framework/base/src/contract_base/wrappers/send_wrapper.rs
index 959ae206f0..594079bf9b 100644
--- a/framework/base/src/contract_base/wrappers/send_wrapper.rs
+++ b/framework/base/src/contract_base/wrappers/send_wrapper.rs
@@ -8,14 +8,13 @@ use crate::{
     types::{
         system_proxy,
         system_proxy::builtin_func_names::{
-            CHANGE_OWNER_BUILTIN_FUNC_NAME, ESDT_LOCAL_BURN_FUNC_NAME, ESDT_LOCAL_MINT_FUNC_NAME,
-            ESDT_NFT_ADD_QUANTITY_FUNC_NAME, ESDT_NFT_ADD_URI_FUNC_NAME, ESDT_NFT_BURN_FUNC_NAME,
+            ESDT_LOCAL_MINT_FUNC_NAME, ESDT_NFT_ADD_QUANTITY_FUNC_NAME, ESDT_NFT_ADD_URI_FUNC_NAME,
             ESDT_NFT_CREATE_FUNC_NAME, ESDT_NFT_UPDATE_ATTRIBUTES_FUNC_NAME,
         },
-        BigUint, ContractCall, ContractCallNoPayment, ESDTSystemSCAddress,
-        EgldOrEsdtTokenIdentifier, EsdtTokenPayment, FunctionCall, GasLeft, ManagedAddress,
-        ManagedArgBuffer, ManagedBuffer, ManagedType, ManagedVec, OriginalResultMarker,
-        ReturnsRawResult, ToSelf, TokenIdentifier, Tx, TxScEnv,
+        BigUint, ContractCallNoPayment, ESDTSystemSCAddress, EgldOrEsdtTokenIdentifier,
+        EsdtTokenPayment, FunctionCall, GasLeft, ManagedAddress, ManagedArgBuffer, ManagedBuffer,
+        ManagedType, ManagedVec, OriginalResultMarker, ReturnsRawResult, ToSelf, TokenIdentifier,
+        Tx, TxScEnv,
     },
 };
 
@@ -359,8 +358,6 @@ where
     }
 
     /// Creates a call to the `ClaimDeveloperRewards` builtin function.
-    ///
-    /// In itself, this does nothing. You need to then call turn the contract call into an async call.
     #[allow(clippy::type_complexity)]
     pub fn claim_developer_rewards(
         &self,
@@ -374,15 +371,17 @@ where
     }
 
     /// Creates a call to the `ChangeOwnerAddress` builtin function.
-    ///
-    /// In itself, this does nothing. You need to then call turn the contract call into an async call.
+    #[allow(clippy::type_complexity)]
     pub fn change_owner_address(
         &self,
         child_sc_address: ManagedAddress<A>,
         new_owner: &ManagedAddress<A>,
-    ) -> ContractCallNoPayment<A, ()> {
-        self.contract_call(child_sc_address, CHANGE_OWNER_BUILTIN_FUNC_NAME)
-            .argument(&new_owner)
+    ) -> Tx<TxScEnv<A>, (), ManagedAddress<A>, (), (), FunctionCall<A>, OriginalResultMarker<()>>
+    {
+        Tx::new_tx_from_sc()
+            .to(child_sc_address)
+            .typed(system_proxy::UserBuiltinProxy)
+            .change_owner_address(new_owner)
     }
 
     /// Allows synchronously calling a local function by name. Execution is resumed afterwards.
@@ -468,20 +467,12 @@ where
     /// Note that the SC must have the ESDTLocalBurn or ESDTNftBurn roles set,
     /// or this will fail with "action is not allowed".
     pub fn esdt_local_burn(&self, token: &TokenIdentifier<A>, nonce: u64, amount: &BigUint<A>) {
-        let mut arg_buffer = ManagedArgBuffer::new();
-        let func_name: &str;
-
-        arg_buffer.push_arg(token);
-        if nonce == 0 {
-            func_name = ESDT_LOCAL_BURN_FUNC_NAME;
-        } else {
-            func_name = ESDT_NFT_BURN_FUNC_NAME;
-            arg_buffer.push_arg(nonce);
-        }
-
-        arg_buffer.push_arg(amount);
-
-        self.call_local_esdt_built_in_function_minimal(func_name, arg_buffer);
+        Tx::new_tx_from_sc()
+            .to(ToSelf)
+            .gas(GasLeft)
+            .typed(system_proxy::UserBuiltinProxy)
+            .esdt_local_burn(token, nonce, amount)
+            .sync_call()
     }
 
     /// Allows synchronous burning of ESDT/SFT/NFT (depending on nonce). Execution is resumed afterwards.
diff --git a/framework/base/src/types/interaction/system_proxy/builtin_func_proxy.rs b/framework/base/src/types/interaction/system_proxy/builtin_func_proxy.rs
index e838bbc49f..8018f3fdc1 100644
--- a/framework/base/src/types/interaction/system_proxy/builtin_func_proxy.rs
+++ b/framework/base/src/types/interaction/system_proxy/builtin_func_proxy.rs
@@ -33,7 +33,6 @@ where
     wrapped_tx: Tx<Env, From, To, (), Gas, (), ()>,
 }
 
-#[rustfmt::skip]
 impl<Env, From, To, Gas> UserBuiltinProxyMethods<Env, From, To, Gas>
 where
     Env: TxEnv,
@@ -41,9 +40,7 @@ where
     To: TxTo<Env>,
     Gas: TxGas<Env>,
 {
-    pub fn set_user_name<
-        Arg0: CodecInto<ManagedBuffer<Env::Api>>,
-    >(
+    pub fn set_user_name<Arg0: CodecInto<ManagedBuffer<Env::Api>>>(
         self,
         name: Arg0,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
@@ -53,19 +50,52 @@ where
             .original_result()
     }
 
-    pub fn delete_user_name(
+    pub fn delete_user_name(self) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call(DELETE_USERNAME_FUNC_NAME)
+            .original_result()
+    }
+
+    pub fn claim_developer_rewards(self) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call(CLAIM_DEVELOPER_REWARDS_FUNC_NAME)
+            .original_result()
+    }
+
+    pub fn change_owner_address<Arg0: CodecInto<ManagedAddress<Env::Api>>>(
         self,
+        new_owner: Arg0,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
-            .raw_call(DELETE_USERNAME_FUNC_NAME)
+            .raw_call(CHANGE_OWNER_BUILTIN_FUNC_NAME)
+            .argument(&new_owner)
             .original_result()
     }
 
-    pub fn claim_developer_rewards(
+    pub fn esdt_local_burn<
+        Arg0: CodecInto<TokenIdentifier<Env::Api>>,
+        Arg1: CodecInto<u64> + core::cmp::PartialEq<u64>,
+        Arg2: CodecInto<BigUint<Env::Api>>,
+    >(
         self,
+        token: &Arg0,
+        nonce: Arg1,
+        amount: &Arg2,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        if nonce.eq(&0) {
+            return self
+                .wrapped_tx
+                .raw_call(ESDT_LOCAL_BURN_FUNC_NAME)
+                .argument(token)
+                .argument(amount)
+                .original_result();
+        }
+
         self.wrapped_tx
-            .raw_call(CLAIM_DEVELOPER_REWARDS_FUNC_NAME)
+            .raw_call(ESDT_NFT_BURN_FUNC_NAME)
+            .argument(token)
+            .argument(&nonce)
+            .argument(amount)
             .original_result()
     }
 }

From bdea87726f387a6f8589e1b1ce224e00bfe311ee Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Mon, 8 Apr 2024 20:04:30 +0300
Subject: [PATCH 0669/1254] codec - universal_decode_number optimziation

---
 data/codec/src/num_conv.rs | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/data/codec/src/num_conv.rs b/data/codec/src/num_conv.rs
index 38c3ba767f..f68671596e 100644
--- a/data/codec/src/num_conv.rs
+++ b/data/codec/src/num_conv.rs
@@ -113,27 +113,23 @@ pub fn universal_decode_number(bytes: &[u8], signed: bool) -> u64 {
     // it is almost impossible to get a slice longer than 8
     // just a basic overflow/underflow protection
     let safe_len = bytes.len() % 9;
-    universal_decode_number_impl(bytes, safe_len, signed)
+
+    unsafe { universal_decode_number_impl(bytes.as_ptr(), safe_len, signed) }
 }
 
 /// Same as [`universal_decode_number`], but assumes that the input length does not exceed 8.
 pub fn universal_decode_number_unchecked(bytes: &[u8], signed: bool) -> u64 {
-    universal_decode_number_impl(bytes, bytes.len(), signed)
+    unsafe { universal_decode_number_impl(bytes.as_ptr(), bytes.len(), signed) }
 }
 
-fn universal_decode_number_impl(bytes: &[u8], len: usize, signed: bool) -> u64 {
-    let negative = signed && len > 0 && msbit_is_one(bytes[0]);
+#[inline(never)]
+unsafe fn universal_decode_number_impl(bytes: *const u8, len: usize, signed: bool) -> u64 {
+    let negative = signed && len > 0 && msbit_is_one(*bytes);
     let skippable_byte = skippable_byte(negative);
 
     let mut extended_buffer = [skippable_byte; 8];
-    let offset = 8 - len;
-    unsafe {
-        core::ptr::copy_nonoverlapping(
-            bytes.as_ptr(),
-            extended_buffer.as_mut_ptr().add(offset),
-            len,
-        )
-    }
+    let offset = 8usize.wrapping_sub(len);
+    core::ptr::copy_nonoverlapping(bytes, extended_buffer.as_mut_ptr().add(offset), len);
 
     u64::from_be_bytes(extended_buffer)
 }

From 3e8dd5fdf7b6de7e083775f70cf684cf69dca232 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Mon, 8 Apr 2024 23:49:58 +0300
Subject: [PATCH 0670/1254] builtin func - edst local mint & nft add multiple
 uri

---
 .../contract_base/wrappers/send_wrapper.rs    | 37 ++++-------
 .../system_proxy/builtin_func_proxy.rs        | 62 +++++++++++++++----
 2 files changed, 62 insertions(+), 37 deletions(-)

diff --git a/framework/base/src/contract_base/wrappers/send_wrapper.rs b/framework/base/src/contract_base/wrappers/send_wrapper.rs
index 594079bf9b..31f6c6a158 100644
--- a/framework/base/src/contract_base/wrappers/send_wrapper.rs
+++ b/framework/base/src/contract_base/wrappers/send_wrapper.rs
@@ -8,7 +8,6 @@ use crate::{
     types::{
         system_proxy,
         system_proxy::builtin_func_names::{
-            ESDT_LOCAL_MINT_FUNC_NAME, ESDT_NFT_ADD_QUANTITY_FUNC_NAME, ESDT_NFT_ADD_URI_FUNC_NAME,
             ESDT_NFT_CREATE_FUNC_NAME, ESDT_NFT_UPDATE_ATTRIBUTES_FUNC_NAME,
         },
         BigUint, ContractCallNoPayment, ESDTSystemSCAddress, EgldOrEsdtTokenIdentifier,
@@ -424,21 +423,12 @@ where
     ///
     /// This function cannot be used for NFTs.
     pub fn esdt_local_mint(&self, token: &TokenIdentifier<A>, nonce: u64, amount: &BigUint<A>) {
-        let mut arg_buffer = ManagedArgBuffer::new();
-        let func_name: &str;
-
-        arg_buffer.push_arg(token);
-
-        if nonce == 0 {
-            func_name = ESDT_LOCAL_MINT_FUNC_NAME;
-        } else {
-            func_name = ESDT_NFT_ADD_QUANTITY_FUNC_NAME;
-            arg_buffer.push_arg(nonce);
-        }
-
-        arg_buffer.push_arg(amount);
-
-        self.call_local_esdt_built_in_function_minimal(func_name, arg_buffer);
+        Tx::new_tx_from_sc()
+            .to(ToSelf)
+            .gas(GasLeft)
+            .typed(system_proxy::UserBuiltinProxy)
+            .esdt_local_mint(token, nonce, amount)
+            .sync_call()
     }
 
     /// Allows synchronous minting of ESDT/SFT (depending on nonce). Execution is resumed afterwards.
@@ -774,15 +764,12 @@ where
             return;
         }
 
-        let mut arg_buffer = ManagedArgBuffer::new();
-        arg_buffer.push_arg(token_id);
-        arg_buffer.push_arg(nft_nonce);
-
-        for uri in new_uris {
-            arg_buffer.push_arg(uri);
-        }
-
-        self.call_local_esdt_built_in_function_minimal(ESDT_NFT_ADD_URI_FUNC_NAME, arg_buffer);
+        Tx::new_tx_from_sc()
+            .to(ToSelf)
+            .gas(GasLeft)
+            .typed(system_proxy::UserBuiltinProxy)
+            .nft_add_multiple_uri(token_id, nft_nonce, new_uris)
+            .sync_call()
     }
 
     /// Changes attributes of an NFT, via a synchronous builtin function call.
diff --git a/framework/base/src/types/interaction/system_proxy/builtin_func_proxy.rs b/framework/base/src/types/interaction/system_proxy/builtin_func_proxy.rs
index 8018f3fdc1..53fd76d371 100644
--- a/framework/base/src/types/interaction/system_proxy/builtin_func_proxy.rs
+++ b/framework/base/src/types/interaction/system_proxy/builtin_func_proxy.rs
@@ -62,27 +62,23 @@ where
             .original_result()
     }
 
-    pub fn change_owner_address<Arg0: CodecInto<ManagedAddress<Env::Api>>>(
+    pub fn change_owner_address(
         self,
-        new_owner: Arg0,
+        new_owner: &ManagedAddress<Env::Api>,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
         self.wrapped_tx
             .raw_call(CHANGE_OWNER_BUILTIN_FUNC_NAME)
-            .argument(&new_owner)
+            .argument(new_owner)
             .original_result()
     }
 
-    pub fn esdt_local_burn<
-        Arg0: CodecInto<TokenIdentifier<Env::Api>>,
-        Arg1: CodecInto<u64> + core::cmp::PartialEq<u64>,
-        Arg2: CodecInto<BigUint<Env::Api>>,
-    >(
+    pub fn esdt_local_burn(
         self,
-        token: &Arg0,
-        nonce: Arg1,
-        amount: &Arg2,
+        token: &TokenIdentifier<Env::Api>,
+        nonce: u64,
+        amount: &BigUint<Env::Api>,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
-        if nonce.eq(&0) {
+        if nonce == 0 {
             return self
                 .wrapped_tx
                 .raw_call(ESDT_LOCAL_BURN_FUNC_NAME)
@@ -98,4 +94,46 @@ where
             .argument(amount)
             .original_result()
     }
+
+    pub fn esdt_local_mint(
+        self,
+        token: &TokenIdentifier<Env::Api>,
+        nonce: u64,
+        amount: &BigUint<Env::Api>,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        if nonce == 0 {
+            return self
+                .wrapped_tx
+                .raw_call(ESDT_LOCAL_MINT_FUNC_NAME)
+                .argument(token)
+                .argument(amount)
+                .original_result();
+        }
+        self.wrapped_tx
+            .raw_call(ESDT_NFT_ADD_QUANTITY_FUNC_NAME)
+            .argument(token)
+            .argument(&nonce)
+            .argument(amount)
+            .original_result()
+    }
+
+    pub fn nft_add_multiple_uri(
+        self,
+        token_id: &TokenIdentifier<Env::Api>,
+        nft_nonce: u64,
+        new_uris: &ManagedVec<Env::Api, ManagedBuffer<Env::Api>>,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        let mut arg_buffer = ManagedArgBuffer::new();
+        arg_buffer.push_arg(token_id);
+        arg_buffer.push_arg(nft_nonce);
+
+        for uri in new_uris {
+            arg_buffer.push_arg(uri);
+        }
+
+        self.wrapped_tx
+            .raw_call(ESDT_NFT_ADD_URI_FUNC_NAME)
+            .arguments_raw(arg_buffer)
+            .original_result()
+    }
 }

From bd70cef082c369ba72ca5f905a8789fc24fbd1ee Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Tue, 9 Apr 2024 02:47:45 +0200
Subject: [PATCH 0671/1254] fix after review

---
 .../first-contract/src/lib.rs                 |   2 +-
 .../scenarios/forw_raw_sync_echo.scen.json    |   2 +-
 .../forw_raw_sync_echo_caller.scen.json       |   2 +-
 .../rust-testing-framework-tester/src/lib.rs  |  12 +-
 .../interaction/tx_exec/tx_exec_upgrade.rs    | 132 ++++--------------
 5 files changed, 30 insertions(+), 120 deletions(-)

diff --git a/contracts/feature-tests/composability/esdt-contract-pair/first-contract/src/lib.rs b/contracts/feature-tests/composability/esdt-contract-pair/first-contract/src/lib.rs
index ad089ef4ce..7ce368781a 100644
--- a/contracts/feature-tests/composability/esdt-contract-pair/first-contract/src/lib.rs
+++ b/contracts/feature-tests/composability/esdt-contract-pair/first-contract/src/lib.rs
@@ -94,7 +94,7 @@ pub trait FirstContract {
         self.tx()
             .to(&second_contract_address)
             .gas(gas_left)
-            .raw_call(ManagedBuffer::from(SECOND_CONTRACT_REJECT_ESDT_PAYMENT))
+            .raw_call(SECOND_CONTRACT_REJECT_ESDT_PAYMENT)
             .single_esdt(&expected_token_identifier, 0u64, &esdt_value)
             .transfer_execute();
     }
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 ed599f9492..a34e9497fd 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
@@ -158,4 +158,4 @@
             }
         }
     ]
-}
\ No newline at end of file
+}
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 0bfa9fd894..a964ec9e19 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
@@ -133,4 +133,4 @@
             }
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/contracts/feature-tests/rust-testing-framework-tester/src/lib.rs b/contracts/feature-tests/rust-testing-framework-tester/src/lib.rs
index 7a5b181028..8aae4d0b79 100644
--- a/contracts/feature-tests/rust-testing-framework-tester/src/lib.rs
+++ b/contracts/feature-tests/rust-testing-framework-tester/src/lib.rs
@@ -193,13 +193,10 @@ pub trait RustTestingFrameworkTester: dummy_module::DummyModule {
 
     #[endpoint]
     fn call_other_contract_add_async_call(&self, other_sc_address: ManagedAddress, value: BigUint) {
-        let mut args = ManagedArgBuffer::new();
-        args.push_arg(&value);
-
         self.tx()
             .to(&other_sc_address)
-            .raw_call("call")
-            .arguments_raw(args)
+            .raw_call("add")
+            .argument(&value)
             .async_call_and_exit();
     }
 
@@ -215,15 +212,12 @@ pub trait RustTestingFrameworkTester: dummy_module::DummyModule {
 
     #[endpoint]
     fn execute_on_dest_add_value(&self, other_sc_address: ManagedAddress, value: BigUint) {
-        let mut args = ManagedArgBuffer::new();
-        args.push_arg(value);
-
         let gas_left = self.blockchain().get_gas_left();
         self.tx()
             .to(&other_sc_address)
             .gas(gas_left)
             .raw_call("addValue")
-            .arguments_raw(args)
+            .argument(&value)
             .sync_call();
     }
 
diff --git a/framework/base/src/types/interaction/tx_exec/tx_exec_upgrade.rs b/framework/base/src/types/interaction/tx_exec/tx_exec_upgrade.rs
index 01a0107d68..74285517c7 100644
--- a/framework/base/src/types/interaction/tx_exec/tx_exec_upgrade.rs
+++ b/framework/base/src/types/interaction/tx_exec/tx_exec_upgrade.rs
@@ -1,6 +1,7 @@
 use crate::{
     api::CallTypeApi,
     contract_base::SendRawWrapper,
+    proxy_imports::TxToSpecified,
     tuple_util::NestedTupleFlatten,
     types::{
         Code, CodeMetadata, DeployRawResult, FromSource, ManagedAddress, ManagedBuffer, ManagedVec,
@@ -79,100 +80,11 @@ where
     }
 }
 
-impl<Api, Payment, Gas, FromSourceValue, RH>
-    Tx<
-        TxScEnv<Api>,
-        (),
-        &ManagedAddress<Api>,
-        Payment,
-        Gas,
-        UpgradeCall<TxScEnv<Api>, FromSource<FromSourceValue>>,
-        RH,
-    >
-where
-    Api: CallTypeApi,
-    Payment: TxPaymentEgldOnly<TxScEnv<Api>>,
-    Gas: TxGas<TxScEnv<Api>>,
-    FromSourceValue: TxFromSourceValue<TxScEnv<Api>>,
-    RH: TxEmptyResultHandler<TxScEnv<Api>>,
-{
-    /// Launches the upgrade from source async call.
-    ///
-    /// TODO: change return type to `!`.
-    pub fn upgrade_async_call_and_exit(self) {
-        let gas = self.gas.explicit_or_gas_left(&self.env);
-        self.payment.with_egld_value(&self.env, |egld_value| {
-            SendRawWrapper::<Api>::new().upgrade_from_source_contract(
-                self.to,
-                gas,
-                egld_value,
-                &self.data.code_source.0.into_value(&self.env),
-                self.data.code_metadata,
-                &self.data.arg_buffer,
-            );
-        });
-    }
-}
-
-impl<Api, Payment, Gas, RH>
-    Tx<TxScEnv<Api>, (), ManagedAddress<Api>, Payment, Gas, UpgradeCall<TxScEnv<Api>, ()>, RH>
-where
-    Api: CallTypeApi,
-    Payment: TxPaymentEgldOnly<TxScEnv<Api>>,
-    Gas: TxGas<TxScEnv<Api>>,
-    RH: TxEmptyResultHandler<TxScEnv<Api>>,
-{
-    /// Backwards compatibility, immitates the old API.
-    ///
-    /// Note that the data type (the `UpgradeCall`) doesn't have the code set.
-    /// This is because the old API was passing it as paramter, so we use it from the `code` argument.
-    ///
-    /// Also note that the code metadata is taken from the `code_metadata` argument.
-    /// If another one was previously set in the `Tx` object, that one will be ignored.
-    pub fn upgrade_contract(self, code: &ManagedBuffer<Api>, code_metadata: CodeMetadata) {
-        let gas = self.gas.explicit_or_gas_left(&self.env);
-        self.payment.with_egld_value(&self.env, |egld_value| {
-            SendRawWrapper::<Api>::new().upgrade_contract(
-                &self.to,
-                gas,
-                egld_value,
-                code,
-                code_metadata,
-                &self.data.arg_buffer,
-            );
-        });
-    }
-
-    /// Backwards compatibility, immitates the old API.
-    ///
-    /// Note that the data type (the `UpgradeCall`) doesn't have the code set.
-    /// This is because the old API was passing it as paramter, so we use it from the `code` argument.
-    ///
-    /// Also note that the code metadata is taken from the `code_metadata` argument.
-    /// If another one was previously set in the `Tx` object, that one will be ignored.
-    pub fn upgrade_from_source(
-        self,
-        source_address: &ManagedAddress<Api>,
-        code_metadata: CodeMetadata,
-    ) {
-        let gas = self.gas.explicit_or_gas_left(&self.env);
-        self.payment.with_egld_value(&self.env, |egld_value| {
-            SendRawWrapper::<Api>::new().upgrade_from_source_contract(
-                &self.to,
-                gas,
-                egld_value,
-                source_address,
-                code_metadata,
-                &self.data.arg_buffer,
-            );
-        });
-    }
-}
-
-impl<Api, Payment, Gas, RH>
-    Tx<TxScEnv<Api>, (), &ManagedAddress<Api>, Payment, Gas, UpgradeCall<TxScEnv<Api>, ()>, RH>
+impl<Api, To, Payment, Gas, RH>
+    Tx<TxScEnv<Api>, (), To, Payment, Gas, UpgradeCall<TxScEnv<Api>, ()>, RH>
 where
     Api: CallTypeApi,
+    To: TxToSpecified<TxScEnv<Api>>,
     Payment: TxPaymentEgldOnly<TxScEnv<Api>>,
     Gas: TxGas<TxScEnv<Api>>,
     RH: TxEmptyResultHandler<TxScEnv<Api>>,
@@ -187,14 +99,16 @@ where
     pub fn upgrade_contract(self, code: &ManagedBuffer<Api>, code_metadata: CodeMetadata) {
         let gas = self.gas.explicit_or_gas_left(&self.env);
         self.payment.with_egld_value(&self.env, |egld_value| {
-            SendRawWrapper::<Api>::new().upgrade_contract(
-                self.to,
-                gas,
-                egld_value,
-                code,
-                code_metadata,
-                &self.data.arg_buffer,
-            );
+            self.to.with_value_ref(&self.env, |to| {
+                SendRawWrapper::<Api>::new().upgrade_contract(
+                    to,
+                    gas,
+                    egld_value,
+                    code,
+                    code_metadata,
+                    &self.data.arg_buffer,
+                );
+            });
         });
     }
 
@@ -212,14 +126,16 @@ where
     ) {
         let gas = self.gas.explicit_or_gas_left(&self.env);
         self.payment.with_egld_value(&self.env, |egld_value| {
-            SendRawWrapper::<Api>::new().upgrade_from_source_contract(
-                self.to,
-                gas,
-                egld_value,
-                source_address,
-                code_metadata,
-                &self.data.arg_buffer,
-            );
+            self.to.with_value_ref(&self.env, |to| {
+                SendRawWrapper::<Api>::new().upgrade_from_source_contract(
+                    to,
+                    gas,
+                    egld_value,
+                    source_address,
+                    code_metadata,
+                    &self.data.arg_buffer,
+                );
+            });
         });
     }
 }

From 43abcf3e69cffa1d24d534bf70255643689a27a1 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 9 Apr 2024 09:47:48 +0300
Subject: [PATCH 0672/1254] sc 0.48.0

---
 CHANGELOG.md                                   |  5 +++++
 Cargo.lock                                     | 18 +++++++++---------
 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 ++--
 .../mappers/linked-list-repeat/meta/Cargo.toml |  2 +-
 .../mappers/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 +-
 .../benchmarks/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 +-
 contracts/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 +-
 .../Cargo.toml                                 |  2 +-
 .../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 +-
 .../examples/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 +++---
 contracts/examples/check-pause/meta/Cargo.toml |  2 +-
 contracts/examples/check-pause/wasm/Cargo.toml |  2 +-
 .../examples/crowdfunding-esdt/Cargo.toml      |  4 ++--
 .../examples/crowdfunding-esdt/meta/Cargo.toml |  2 +-
 .../examples/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 +-
 .../examples/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 +-
 contracts/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 ++--
 contracts/examples/proxy-pause/meta/Cargo.toml |  2 +-
 contracts/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 +-
 .../wasm-alloc-mem-fail/Cargo.toml             |  2 +-
 .../wasm-alloc-mem-leaking/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 +-
 .../composability/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 +-
 .../composability/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 ++--
 .../erc-style-contracts/erc721/meta/Cargo.toml |  2 +-
 .../erc-style-contracts/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 +-
 .../feature-tests/exchange-features/Cargo.toml |  4 ++--
 .../exchange-features/meta/Cargo.toml          |  2 +-
 .../exchange-features/wasm/Cargo.toml          |  2 +-
 .../formatted-message-features/Cargo.toml      |  4 ++--
 .../formatted-message-features/meta/Cargo.toml |  2 +-
 .../formatted-message-features/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 +-
 .../use-module/wasm-use-module-view/Cargo.toml |  2 +-
 .../feature-tests/use-module/wasm/Cargo.toml   |  2 +-
 contracts/modules/Cargo.toml                   |  4 ++--
 framework/base/Cargo.toml                      |  4 ++--
 framework/derive/Cargo.toml                    |  2 +-
 framework/meta/Cargo.toml                      |  4 ++--
 .../generate_snippets/snippet_crate_gen.rs     |  2 +-
 framework/meta/src/cmd/contract/meta_config.rs |  4 ++--
 framework/meta/src/version_history.rs          |  3 ++-
 framework/scenario/Cargo.toml                  |  6 +++---
 framework/snippets/Cargo.toml                  |  4 ++--
 framework/wasm-adapter/Cargo.toml              |  4 ++--
 tools/mxpy-snippet-generator/Cargo.toml        |  2 +-
 tools/rust-debugger/format-tests/Cargo.toml    |  4 ++--
 267 files changed, 393 insertions(+), 387 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index db5a580558..8c22847501 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.48.0] - 2024-04-09
+- When serializing to a managed buffer, static buffer caching is disabled by default.
+- `sc-meta:` - installers for wasm32 target and wasm-opt.
+- Integrated traits for token management: `FixedSupplyToken`, `Mergeable`.
+
 ## [sc 0.47.8] - 2024-03-22
 - Test coverage functionality in sc-meta.
 - Removed deprecation from legacy whitebox testing framework, since it is still used extensively.
diff --git a/Cargo.lock b/Cargo.lock
index 031c4b0647..c8c6746cad 100755
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1798,7 +1798,7 @@ checksum = "b59072fa0624b55ae5ae3fa6bfa91515bbeb4ac440214bc4a509e2c8806d6e9f"
 
 [[package]]
 name = "multiversx-price-aggregator-sc"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "arrayvec",
  "getrandom 0.2.12",
@@ -1819,7 +1819,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "bitflags 2.4.2",
  "hex-literal",
@@ -1849,7 +1849,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -1860,7 +1860,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-meta"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "clap",
  "colored",
@@ -1886,14 +1886,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-scenario"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "base64",
  "bech32",
@@ -1919,7 +1919,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-snippets"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "base64",
  "env_logger",
@@ -1933,7 +1933,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -1964,7 +1964,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-wegld-swap-sc"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "multiversx-sc",
  "multiversx-sc-modules",
diff --git a/contracts/benchmarks/large-storage/Cargo.toml b/contracts/benchmarks/large-storage/Cargo.toml
index d8d51ae966..9aae12836b 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.8"
+version = "0.48.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.0"
 path = "../../../framework/scenario"
diff --git a/contracts/benchmarks/large-storage/meta/Cargo.toml b/contracts/benchmarks/large-storage/meta/Cargo.toml
index fc26387f50..0345a383dc 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.8"
+version = "0.48.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 43578fbca6..776e59a0ce 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.8"
+version = "0.48.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 8677e1dc01..4c5fdb3fbc 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.8"
+version = "0.48.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.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 af3d114fd2..e2edd8010e 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.8"
+version = "0.48.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.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 3c360bd518..d09a21b81b 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.8"
+version = "0.48.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 bb1eb11323..8289547693 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.8"
+version = "0.48.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 18ff68251c..8090f309d1 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.8"
+version = "0.48.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.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 2ef4df4850..3d4974e6c0 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.8"
+version = "0.48.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 c49b4cfb90..9653a54fc7 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.8"
+version = "0.48.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 82615c61e9..024846618c 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.8"
+version = "0.48.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.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 6c017510da..edba3ec0f0 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.8"
+version = "0.48.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 ca9077b541..77c061d305 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.8"
+version = "0.48.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 cfabe4e46d..84bcc8722d 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.8"
+version = "0.48.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.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 c722ed9b9e..e8f3967a3a 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.8"
+version = "0.48.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 8737881c35..31ca740ad8 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.8"
+version = "0.48.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 456e49050c..2975e1ae49 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.8"
+version = "0.48.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.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 efb702f58c..1633ab9cde 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.8"
+version = "0.48.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 1373a98a29..19af5c7c51 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.8"
+version = "0.48.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 66a7f34c1e..3cd913d909 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.8"
+version = "0.48.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.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 12c7a4952d..200297db20 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.8"
+version = "0.48.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 71308601eb..520aa883b1 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.8"
+version = "0.48.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 7284596303..d0bc9aa646 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.8"
+version = "0.48.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.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 0bc84fbdc2..d8b911fd5e 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.8"
+version = "0.48.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 c0c13946cc..14a876b56e 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.8"
+version = "0.48.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/str-repeat/Cargo.toml b/contracts/benchmarks/str-repeat/Cargo.toml
index 867b7a97fa..7d0b90f1ba 100644
--- a/contracts/benchmarks/str-repeat/Cargo.toml
+++ b/contracts/benchmarks/str-repeat/Cargo.toml
@@ -12,10 +12,10 @@ path = "src/str_repeat.rs"
 managed-buffer-builder-cached = ["multiversx-sc/managed-buffer-builder-cached"]
 
 [dependencies.multiversx-sc]
-version = "0.47.8"
+version = "0.48.0"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.0"
 path = "../../../framework/scenario"
diff --git a/contracts/benchmarks/str-repeat/meta/Cargo.toml b/contracts/benchmarks/str-repeat/meta/Cargo.toml
index 6792de337f..d27ba4d2ff 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.8"
+version = "0.48.0"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.toml b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.toml
index 2e124ace9c..07a34e0d0c 100644
--- a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.toml
+++ b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.toml
@@ -25,7 +25,7 @@ overflow-checks = false
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.47.8"
+version = "0.48.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.toml b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.toml
index 0ab57dce26..69a11ff01e 100644
--- a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.toml
+++ b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.toml
@@ -26,7 +26,7 @@ path = ".."
 features = ["managed-buffer-builder-cached"]
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.47.8"
+version = "0.48.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/str-repeat/wasm/Cargo.toml b/contracts/benchmarks/str-repeat/wasm/Cargo.toml
index a36fe3ee2c..e6f3ddba95 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.8"
+version = "0.48.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/core/price-aggregator/Cargo.toml b/contracts/core/price-aggregator/Cargo.toml
index ed988e0663..6ef93360eb 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.8"
+version = "0.48.0"
 authors = [
     "Claudiu-Marcel Bruda <claudiu.bruda@multiversx.com>",
     "MultiversX <contact@multiversx.com>",
@@ -19,15 +19,15 @@ edition = "2021"
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "0.47.8"
+version = "0.48.0"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.47.8"
+version = "0.48.0"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.0"
 path = "../../../framework/scenario"
 
 [dependencies]
diff --git a/contracts/core/price-aggregator/meta/Cargo.toml b/contracts/core/price-aggregator/meta/Cargo.toml
index 2cd9bbab1a..f8cbef8d57 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.8"
+version = "0.48.0"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.47.8"
+version = "0.48.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 b553602e97..dc2c54549f 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.8"
+version = "0.48.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/core/wegld-swap/Cargo.toml b/contracts/core/wegld-swap/Cargo.toml
index 64157bb652..f788d5c243 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.8"
+version = "0.48.0"
 
 authors = [
     "Dorin Iancu <dorin.iancu@multiversx.com>",
@@ -20,13 +20,13 @@ edition = "2021"
 path = "src/wegld.rs"
 
 [dependencies.multiversx-sc]
-version = "0.47.8"
+version = "0.48.0"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.47.8"
+version = "0.48.0"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.0"
 path = "../../../framework/scenario"
diff --git a/contracts/core/wegld-swap/meta/Cargo.toml b/contracts/core/wegld-swap/meta/Cargo.toml
index 213dfa0c5e..f9595aea8d 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.8"
+version = "0.48.0"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.47.8"
+version = "0.48.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 3dee2153c4..68037cc393 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.8"
+version = "0.48.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/adder/Cargo.toml b/contracts/examples/adder/Cargo.toml
index f5a121ae40..af28bd0554 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.8"
+version = "0.48.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.0"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/adder/interact/Cargo.toml b/contracts/examples/adder/interact/Cargo.toml
index 142f39c28c..3d4ad2fd1a 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.8"
+version = "0.48.0"
 path = "../../../../framework/snippets"
diff --git a/contracts/examples/adder/meta/Cargo.toml b/contracts/examples/adder/meta/Cargo.toml
index dfe91b3e7d..88f66d1c86 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.8"
+version = "0.48.0"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/examples/adder/wasm/Cargo.toml b/contracts/examples/adder/wasm/Cargo.toml
index 21d0226bb2..d7cff9ee02 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.8"
+version = "0.48.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 214b810a7f..9379cb6240 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.8"
+version = "0.48.0"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.47.8"
+version = "0.48.0"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.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 531d3b0113..42aedeffb2 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.8"
+version = "0.48.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 f575a2ff9f..351e890820 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.8"
+version = "0.48.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/check-pause/Cargo.toml b/contracts/examples/check-pause/Cargo.toml
index 008b308b83..3de8796660 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.8"
+version = "0.48.0"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.47.8"
+version = "0.48.0"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.0"
 path = "../../../framework/scenario"
 
diff --git a/contracts/examples/check-pause/meta/Cargo.toml b/contracts/examples/check-pause/meta/Cargo.toml
index c4b5f792f1..6fa4de8996 100644
--- a/contracts/examples/check-pause/meta/Cargo.toml
+++ b/contracts/examples/check-pause/meta/Cargo.toml
@@ -9,6 +9,6 @@ authors = ["Alin Cruceat <alin.cruceat@multiversx.com>"]
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.47.8"
+version = "0.48.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 1c40a1c120..16f0ab1ba3 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.8"
+version = "0.48.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/crowdfunding-esdt/Cargo.toml b/contracts/examples/crowdfunding-esdt/Cargo.toml
index e5a85e92fb..b2cdf8c41e 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.8"
+version = "0.48.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.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 100c48ff0b..a32bd3567a 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.8"
+version = "0.48.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 2202fb5bf2..51e3aa0862 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.8"
+version = "0.48.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/crypto-bubbles/Cargo.toml b/contracts/examples/crypto-bubbles/Cargo.toml
index 2e3590429a..47b0cc1c12 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.8"
+version = "0.48.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.0"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/crypto-bubbles/meta/Cargo.toml b/contracts/examples/crypto-bubbles/meta/Cargo.toml
index a1f11927a9..cff3b28c2e 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.8"
+version = "0.48.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 7075fe64da..3d0f3d9cd6 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.8"
+version = "0.48.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 23eaa019f3..97ff64e9ac 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.8"
+version = "0.48.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 cca99947d8..9b63e6b416 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.8"
+version = "0.48.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 9ee13ed08d..6fdda40603 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.8"
+version = "0.48.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.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 aaf92d9d1d..2c57c9ac05 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.8"
+version = "0.48.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 fd1bc05228..1f19435dce 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.8"
+version = "0.48.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 75ffc5989c..171ebb65f8 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.8"
+version = "0.48.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.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 17514bb97f..a9f0a17cfa 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.8"
+version = "0.48.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 ad70a987be..deb7ae9c6f 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.8"
+version = "0.48.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 9d7e08a9cf..da5800286f 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.8"
+version = "0.48.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.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 582fa4313f..ccf8cb2ea2 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.8"
+version = "0.48.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 6c7f572232..b00ca52a2b 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.8"
+version = "0.48.0"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/crypto-zombies/Cargo.toml b/contracts/examples/crypto-zombies/Cargo.toml
index 63d67d258b..b0e2a4e81e 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.8"
+version = "0.48.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.0"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/crypto-zombies/meta/Cargo.toml b/contracts/examples/crypto-zombies/meta/Cargo.toml
index 8a3ac45fa8..fc1eb0073f 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.8"
+version = "0.48.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 fd7179dea8..51f46ac505 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.8"
+version = "0.48.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/digital-cash/Cargo.toml b/contracts/examples/digital-cash/Cargo.toml
index d9bdd6b52c..6d75b7b98e 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.8"
+version = "0.48.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.0"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/digital-cash/meta/Cargo.toml b/contracts/examples/digital-cash/meta/Cargo.toml
index 5692d13296..7cdda9a523 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.8"
+version = "0.48.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 1a990dca60..14a1a7e95b 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.8"
+version = "0.48.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/empty/Cargo.toml b/contracts/examples/empty/Cargo.toml
index 5ed6cf966f..d36449cf82 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.8"
+version = "0.48.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.0"
 path = "../../../framework/scenario"
 
 [dev-dependencies]
diff --git a/contracts/examples/empty/meta/Cargo.toml b/contracts/examples/empty/meta/Cargo.toml
index c27adb6ad1..7b869c9cdf 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.8"
+version = "0.48.0"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/examples/empty/wasm/Cargo.toml b/contracts/examples/empty/wasm/Cargo.toml
index 1c3cae4528..50c6c7519c 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.8"
+version = "0.48.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 e56c0ace06..62efe492c6 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.8"
+version = "0.48.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.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 b774dd1607..41be9842d9 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.8"
+version = "0.48.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 1c81968938..8e57a857ec 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.8"
+version = "0.48.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/factorial/Cargo.toml b/contracts/examples/factorial/Cargo.toml
index bec69a21be..f49f2de799 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.8"
+version = "0.48.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.0"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/factorial/meta/Cargo.toml b/contracts/examples/factorial/meta/Cargo.toml
index 746a2c9143..561e5cc8bb 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.8"
+version = "0.48.0"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/examples/factorial/wasm/Cargo.toml b/contracts/examples/factorial/wasm/Cargo.toml
index 550140a626..33ef155fb4 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.8"
+version = "0.48.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/fractional-nfts/Cargo.toml b/contracts/examples/fractional-nfts/Cargo.toml
index 0709e73516..fda3f92c61 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.8"
+version = "0.48.0"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.47.8"
+version = "0.48.0"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.0"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/fractional-nfts/meta/Cargo.toml b/contracts/examples/fractional-nfts/meta/Cargo.toml
index 9026904365..330433a42f 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.8"
+version = "0.48.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 26ca3dc694..036b0bfd69 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.8"
+version = "0.48.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/lottery-esdt/Cargo.toml b/contracts/examples/lottery-esdt/Cargo.toml
index 51341883a4..47ef0326fd 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.8"
+version = "0.48.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.0"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/lottery-esdt/meta/Cargo.toml b/contracts/examples/lottery-esdt/meta/Cargo.toml
index f528e0359d..5b87c8ade8 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.8"
+version = "0.48.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 c780b8253f..6839c9dec0 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.8"
+version = "0.48.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/multisig/Cargo.toml b/contracts/examples/multisig/Cargo.toml
index 5a4ac52971..f7bdb30ed5 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.8"
+version = "0.48.0"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.47.8"
+version = "0.48.0"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.0"
 path = "../../../framework/scenario"
 
 [dev-dependencies.adder]
@@ -27,7 +27,7 @@ path = "../adder"
 path = "../factorial"
 
 [dev-dependencies.multiversx-wegld-swap-sc]
-version = "0.47.8"
+version = "0.48.0"
 path = "../../core/wegld-swap"
 
 [dev-dependencies]
diff --git a/contracts/examples/multisig/interact/Cargo.toml b/contracts/examples/multisig/interact/Cargo.toml
index 06f7debcdc..fef68a6a22 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.8"
+version = "0.48.0"
 path = "../../../../contracts/modules"
 
 [dependencies.multiversx-sc-snippets]
-version = "0.47.8"
+version = "0.48.0"
 path = "../../../../framework/snippets"
 
 [dependencies.multiversx-sc-scenario]
-version = "=0.47.8"
+version = "=0.48.0"
 path = "../../../../framework/scenario"
diff --git a/contracts/examples/multisig/meta/Cargo.toml b/contracts/examples/multisig/meta/Cargo.toml
index 67b228a5dd..02d4e80d81 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.8"
+version = "0.48.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 004b0e97f5..7660525b67 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.8"
+version = "0.48.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 28b230710b..49be4aa565 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.8"
+version = "0.48.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/multisig/wasm/Cargo.toml b/contracts/examples/multisig/wasm/Cargo.toml
index 3a2268d369..708980188e 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.8"
+version = "0.48.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/nft-minter/Cargo.toml b/contracts/examples/nft-minter/Cargo.toml
index 89ee1e27f1..b845b98fc9 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.8"
+version = "0.48.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.0"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/nft-minter/meta/Cargo.toml b/contracts/examples/nft-minter/meta/Cargo.toml
index 6e3b2dfc81..16bc48dabd 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.8"
+version = "0.48.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 d9001e8b30..800d0012f8 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.8"
+version = "0.48.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 ee4e7cbf03..b3fe4779eb 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.8"
+version = "0.48.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.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 faa27e4d8b..8bd9be5154 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.8"
+version = "0.48.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 1e5478ddae..4966016fe3 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.8"
+version = "0.48.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/nft-subscription/Cargo.toml b/contracts/examples/nft-subscription/Cargo.toml
index deb7f32494..fce4b0e4be 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.8"
+version = "0.48.0"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.47.8"
+version = "0.48.0"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.0"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/nft-subscription/meta/Cargo.toml b/contracts/examples/nft-subscription/meta/Cargo.toml
index 2d002e2afb..60363c9f03 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.8"
+version = "0.48.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 9d6afb20b4..20cfc13365 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.8"
+version = "0.48.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 89c01440da..1715338ef5 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.8"
+version = "0.48.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.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 9854915232..3b5a3f22e1 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.8"
+version = "0.48.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 1d66994d44..e198620a70 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.8"
+version = "0.48.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 0063356649..e87e2df5fd 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.8"
+version = "0.48.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.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 b71a025162..944ad90283 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.8"
+version = "0.48.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 08d0fb2c86..db63ea95cf 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.8"
+version = "0.48.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 ed353384c1..7b835c30a9 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.8"
+version = "0.48.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.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 627ba0bf33..35e1eb7004 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.8"
+version = "0.48.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 ca2420cd15..212fc83957 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.8"
+version = "0.48.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/proxy-pause/Cargo.toml b/contracts/examples/proxy-pause/Cargo.toml
index 8f185a46a3..1cb8060d0c 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.8"
+version = "0.48.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.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 13a900ebe5..654659ac3a 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.8"
+version = "0.48.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 214e9930eb..9071e6aad0 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.8"
+version = "0.48.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/rewards-distribution/Cargo.toml b/contracts/examples/rewards-distribution/Cargo.toml
index 6addeb95a8..d17e0cf877 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.8"
+version = "0.48.0"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.47.8"
+version = "0.48.0"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.0"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/rewards-distribution/meta/Cargo.toml b/contracts/examples/rewards-distribution/meta/Cargo.toml
index 92c25000a7..6e3700a114 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 <claudiu.bruda@multiversx.com>"]
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.47.8"
+version = "0.48.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 e095d7be11..0240cad321 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.8"
+version = "0.48.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 f544ddebf2..466ef0d0d0 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.8"
+version = "0.48.0"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.47.8"
+version = "0.48.0"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.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 c9f4fb9159..2a9164c5d5 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 <claudiu.bruda@multiversx.com>"]
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.47.8"
+version = "0.48.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 d32e1ba149..b16c0eb5be 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.8"
+version = "0.48.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/token-release/Cargo.toml b/contracts/examples/token-release/Cargo.toml
index 4909074ab7..1ef042c083 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.8"
+version = "0.48.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.0"
 path = "../../../framework/scenario"
 
diff --git a/contracts/examples/token-release/meta/Cargo.toml b/contracts/examples/token-release/meta/Cargo.toml
index 2b61364559..9f5e40cb3f 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.8"
+version = "0.48.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 48ca0061b0..a5e9ad9ebb 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.8"
+version = "0.48.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 d2335a15b8..388a559e3f 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.8"
+version = "0.48.0"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.0"
 path = "../../../framework/scenario"
 
 [dev-dependencies.multiversx-sc-meta]
-version = "0.47.8"
+version = "0.48.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 d3e2a4d8ac..2e2ef38272 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.8"
+            "version": "0.48.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 5d1bde1cfa..1219d4fe9b 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.8"
+            "version": "0.48.0"
         }
     },
     "docs": [
diff --git a/contracts/feature-tests/abi-tester/meta/Cargo.toml b/contracts/feature-tests/abi-tester/meta/Cargo.toml
index f8070e33ff..f494dd338d 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.8"
+version = "0.48.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 64cdfb6c85..05200dcfbb 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.8"
+version = "0.48.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 a8952129d6..6bc368141a 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.8"
+version = "0.48.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 814c55b656..ed5f30b32f 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.8"
+version = "0.48.0"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.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 62255e15fa..95d1615d64 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.8"
+version = "0.48.0"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml
index 52c6563e32..e79f7e1f26 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml
@@ -25,7 +25,7 @@ overflow-checks = false
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.47.8"
+version = "0.48.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml
index 1fac4d058d..e8ca98b331 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml
@@ -25,7 +25,7 @@ overflow-checks = false
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.47.8"
+version = "0.48.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/alloc-features/wasm/Cargo.toml b/contracts/feature-tests/alloc-features/wasm/Cargo.toml
index ab5fb829ca..b5565d0ed2 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.8"
+version = "0.48.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 5529ecea8d..a9d29b944a 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.8"
+version = "0.48.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.0"
 path = "../../../framework/scenario"
 
 [dependencies.multiversx-sc-modules]
-version = "0.47.8"
+version = "0.48.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 89b7ac2add..73201f5eaa 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.8"
+version = "0.48.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 327f8c74a4..8afa191498 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.8"
+version = "0.48.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 661bc1146e..d138f0ea4b 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.8"
+version = "0.48.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 3973b0842c..21bdef1ace 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.8"
+version = "0.48.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 8ac9cfb28a..720bcbd08e 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.8"
+version = "0.48.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.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 ae56a96cbe..e30a20c1c5 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.8"
+version = "0.48.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 6f693347c9..52dbbfc0b8 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.8"
+version = "0.48.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/Cargo.toml b/contracts/feature-tests/composability/Cargo.toml
index 72b9f9f248..abfaefa4b8 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.8"
+version = "0.48.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.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 ffa3071ea0..be47382548 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.8"
+version = "0.48.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.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 8ad49c4ae9..6bc3a0d913 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.8"
+version = "0.48.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 5e5e2253c2..07f233341c 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.8"
+version = "0.48.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 7e9bdb354b..7a5ca344e2 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.8"
+version = "0.48.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.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 96088fcc89..46f86e301b 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.8"
+version = "0.48.0"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.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 83d74291d0..08b8dc1856 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.8"
+version = "0.48.0"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.47.8"
+version = "0.48.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 3d060317d0..209e8f2846 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.8"
+version = "0.48.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 158aae66f8..862cbd2b83 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.8"
+version = "0.48.0"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.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 9d5bce7286..186a1e4e03 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.8"
+version = "0.48.0"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.47.8"
+version = "0.48.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 ce110829f3..0e23835bda 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.8"
+version = "0.48.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 bcd33e4734..fd79fe48f9 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.8"
+version = "0.48.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.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 3b8cfb5174..3059fd0285 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.8"
+version = "0.48.0"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.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 850924c2d7..060df7dcde 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.8"
+version = "0.48.0"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.47.8"
+version = "0.48.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 894f1e4a4b..680b44e189 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.8"
+version = "0.48.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 f338b5dece..503d0fc258 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.8"
+version = "0.48.0"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.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 571de47a23..046302572d 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.8"
+version = "0.48.0"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.47.8"
+version = "0.48.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 5efabe6632..a6be0ec3ff 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.8"
+version = "0.48.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 45d7fd86c0..7f9e36e869 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.8"
+version = "0.48.0"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.47.8"
+version = "0.48.0"
 path = "../../../../framework/wasm-adapter"
 optional = true
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.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 9683e7d49b..83a6f94e22 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.8"
+version = "0.48.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 3b33f8dedc..3f8605b67d 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.8"
+version = "0.48.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 e50bec1684..522720c797 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.8"
+version = "0.48.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 63f7f1d1f9..898735c43e 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.8"
+version = "0.48.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.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 f10e13d7dd..5cf1a567e8 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.8"
+version = "0.48.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 3e70d341d7..44f7e3b5eb 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.8"
+version = "0.48.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 028cc4f9c8..7f865a4e03 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.8"
+version = "0.48.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 82fdd0688b..cbc950745d 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.8"
+version = "0.48.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 92b1504a59..d4cd960015 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.8"
+version = "0.48.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.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 613c92b16e..677ae9b198 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.8"
+version = "0.48.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 5bb46d0307..87d3ac47c6 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.8"
+version = "0.48.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 b3721732fd..f06c1178a1 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.8"
+version = "0.48.0"
 path = "../../../../contracts/modules"
 
 [dependencies.multiversx-sc-snippets]
-version = "0.47.8"
+version = "0.48.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 46f7436547..8ad9825389 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.8"
+version = "0.48.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.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 999999a718..fea51513bd 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.8"
+version = "0.48.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 bfca51da3a..73dceaa520 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.8"
+version = "0.48.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 342c5b1456..9efa7a4a11 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.8"
+version = "0.48.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 c0375d049f..ca156aaf23 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.8"
+version = "0.48.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 557e5818c2..324dafa5d4 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.8"
+version = "0.48.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 f3629b7af5..fe652ba3d0 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.8"
+version = "0.48.0"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.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 68f5e3fce2..db20a499dd 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.8"
+version = "0.48.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 44d547460f..c1eebcc5b9 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.8"
+version = "0.48.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 3f985bf59b..1f84784bcc 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.8"
+version = "0.48.0"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.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 da932e6e3e..1838388c4a 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.8"
+version = "0.48.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 883b4ca57e..3dc55bf167 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.8"
+version = "0.48.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 edf1153a21..e68bc01059 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.8"
+version = "0.48.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.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 b7d04141e7..631c940ac7 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.8"
+version = "0.48.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 e4b324558a..d040ee6a0e 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.8"
+version = "0.48.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 f8b73bd1ed..ec4dd83adb 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.8"
+version = "0.48.0"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.47.8"
+version = "0.48.0"
 path = "../../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.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 838f62ec07..1e918a72cc 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.8"
+version = "0.48.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 7b4e0119bd..dca2b5415f 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.8"
+version = "0.48.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 4ffd03f581..a4a8ecc80c 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.8"
+version = "0.48.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.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 0f93896e19..e99529f668 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.8"
+version = "0.48.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 2693692ecb..f598ee7a66 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.8"
+version = "0.48.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 9a3472c495..cb8b2e5076 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.8"
+version = "0.48.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 13fd270b33..7513310bff 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.8"
+version = "0.48.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 8927b8f85e..ff4595fa13 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.8"
+version = "0.48.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.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 0450a2b95d..0dc9b2ca7f 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.8"
+version = "0.48.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 7d42a6b0c3..0aea0a7c62 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.8"
+version = "0.48.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 52e5e2a3d1..747b44ed09 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.8"
+version = "0.48.0"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.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 f6a0e60410..50152e90f4 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.8"
+version = "0.48.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 d8fe625b1d..516a43eb63 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.8"
+version = "0.48.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 4827e78bf8..29330a315c 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.8"
+version = "0.48.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.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 1162ceb5ba..5094698b9a 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.8"
+version = "0.48.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 ae8a024f7d..ceb1f2e24f 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.8"
+version = "0.48.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 3fb1f66765..ba949e755a 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.8"
+version = "0.48.0"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.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 73652ff74a..34f1067c10 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.8"
+version = "0.48.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 6ecc47676f..32dc473808 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.8"
+version = "0.48.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 b7406f877d..b4cf18bfad 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.8"
+version = "0.48.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.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 e823cd155d..41e8801b40 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.8"
+version = "0.48.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 101d4d596f..236319abc4 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.8"
+version = "0.48.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 d1a58ed741..4501c0b464 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.8"
+version = "0.48.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.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 bd511266c5..a9529971a8 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.8"
+version = "0.48.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 d76eb68fd8..e5db8a5667 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.8"
+version = "0.48.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 464c79efd7..3469c841a7 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.8"
+version = "0.48.0"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.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 40901de7a7..02486b2086 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.8"
+version = "0.48.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 ec4f4653ac..42237353f2 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.8"
+version = "0.48.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 6cdb6d9217..8740d1fdcb 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.8"
+version = "0.48.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.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 d66c92f437..88dc69e511 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.8"
+version = "0.48.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 910198734b..710f03a2f5 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.8"
+version = "0.48.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/exchange-features/Cargo.toml b/contracts/feature-tests/exchange-features/Cargo.toml
index bdb1a7dd66..adf86f8ae9 100644
--- a/contracts/feature-tests/exchange-features/Cargo.toml
+++ b/contracts/feature-tests/exchange-features/Cargo.toml
@@ -9,9 +9,9 @@ publish = false
 path = "src/exchange_features.rs"
 
 [dependencies.multiversx-sc]
-version = "0.47.8"
+version = "0.48.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.0"
 path = "../../../framework/scenario"
diff --git a/contracts/feature-tests/exchange-features/meta/Cargo.toml b/contracts/feature-tests/exchange-features/meta/Cargo.toml
index ca186c0ec1..589d79efaa 100644
--- a/contracts/feature-tests/exchange-features/meta/Cargo.toml
+++ b/contracts/feature-tests/exchange-features/meta/Cargo.toml
@@ -8,6 +8,6 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.47.8"
+version = "0.48.0"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/feature-tests/exchange-features/wasm/Cargo.toml b/contracts/feature-tests/exchange-features/wasm/Cargo.toml
index 977914cedf..ab4527595f 100644
--- a/contracts/feature-tests/exchange-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/exchange-features/wasm/Cargo.toml
@@ -25,7 +25,7 @@ overflow-checks = false
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.47.8"
+version = "0.48.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 13c5d9ec32..684fa23b9d 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.8"
+version = "0.48.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.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 6059435514..3657415363 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.8"
+version = "0.48.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 0ada82ca9b..4f674abe4b 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.8"
+version = "0.48.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 cf64d6b26b..cb63f04709 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.8"
+version = "0.48.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.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 022e576282..61694618e8 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.8"
+version = "0.48.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 b01e83de22..17766d61c0 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.8"
+version = "0.48.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 55b238d90f..3dbd436d23 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.8"
+version = "0.48.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.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 7a30e9f032..47d91e055b 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.8"
+version = "0.48.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 9e59c8cf59..d79a234dd7 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.8"
+version = "0.48.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 e455698505..e0860d7f9f 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.8"
+version = "0.48.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 c57395bee3..a54dbf64d6 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.8"
+version = "0.48.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 a4ccad2d0a..43733a6182 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.8"
+version = "0.48.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 3c6eb639a6..91e73a3ee1 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.8"
+version = "0.48.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.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 b5b6de2443..c456c8c35c 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.8"
+version = "0.48.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 0df3393018..06895f2613 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.8"
+version = "0.48.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 bcb27446c2..713b045b04 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.8"
+version = "0.48.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.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 baced24321..93e4981ee2 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.8"
+version = "0.48.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 58274256ad..790b323a3a 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.8"
+version = "0.48.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 21ff7ba5f7..e90edbe6d6 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.8"
+version = "0.48.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.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 7415ce614c..e0912a5305 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.8"
+version = "0.48.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 a134a77263..7395919b55 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.8"
+version = "0.48.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 deb116da19..4724df6a59 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.8"
+// version = "0.48.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 62dc6c73a4..60ad1ebb93 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.8"
+version = "0.48.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 1a5fa9375d..fcdf74843b 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.8"
+version = "0.48.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.47.8"
+version = "0.48.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 d9601c6185..cf03d27bcb 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.8"
+version = "0.48.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 aa6193531a..2431c1c2b8 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.8"
+version = "0.48.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 f0dd37e380..501ea6f461 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.8"
+version = "0.48.0"
 path = "../../../contracts/modules"
 
 [dependencies.multiversx-sc]
-version = "0.47.8"
+version = "0.48.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.47.8"
+version = "0.48.0"
 path = "../../../framework/scenario"
 
 [dev-dependencies.multiversx-sc-meta]
-version = "0.47.8"
+version = "0.48.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 c23e5696aa..c5f47f1892 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.8"
+version = "0.48.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 41b204dcd7..6a6a8b029c 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.8"
+version = "0.48.0"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.47.8"
+version = "0.48.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 b40f0e911c..cd34bba6d9 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.8"
+            "version": "0.48.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 a2e1621128..e91480ad37 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.8"
+            "version": "0.48.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 55ded78fe6..455a51b925 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.8"
+version = "0.48.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 571611596c..2a4a269055 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.8"
+version = "0.48.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/modules/Cargo.toml b/contracts/modules/Cargo.toml
index b7df46cac1..14775b4f4d 100644
--- a/contracts/modules/Cargo.toml
+++ b/contracts/modules/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-modules"
-version = "0.47.8"
+version = "0.48.0"
 edition = "2021"
 
 authors = ["MultiversX <contact@multiversx.com>"]
@@ -17,5 +17,5 @@ categories = ["no-std", "wasm", "cryptography::cryptocurrencies"]
 alloc = ["multiversx-sc/alloc"]
 
 [dependencies.multiversx-sc]
-version = "0.47.8"
+version = "0.48.0"
 path = "../../framework/base"
diff --git a/framework/base/Cargo.toml b/framework/base/Cargo.toml
index 961a0c59d5..646fc2fe56 100644
--- a/framework/base/Cargo.toml
+++ b/framework/base/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc"
-version = "0.47.8"
+version = "0.48.0"
 edition = "2021"
 
 authors = ["Andrei Marinica <andrei.marinica@multiversx.com>", "MultiversX <contact@multiversx.com>"]
@@ -28,7 +28,7 @@ bitflags = "=2.4.2"
 num-traits = { version = "=0.2.17", default-features = false }
 
 [dependencies.multiversx-sc-derive]
-version = "=0.47.8"
+version = "=0.48.0"
 path = "../derive"
 
 [dependencies.multiversx-sc-codec]
diff --git a/framework/derive/Cargo.toml b/framework/derive/Cargo.toml
index c615da8563..2130f5c384 100644
--- a/framework/derive/Cargo.toml
+++ b/framework/derive/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-derive"
-version = "0.47.8"
+version = "0.48.0"
 edition = "2021"
 
 authors = ["Andrei Marinica <andrei.marinica@multiversx.com>", "MultiversX <contact@multiversx.com>"]
diff --git a/framework/meta/Cargo.toml b/framework/meta/Cargo.toml
index a8775be7a2..9080bf7e04 100644
--- a/framework/meta/Cargo.toml
+++ b/framework/meta/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-meta"
-version = "0.47.8"
+version = "0.48.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.47.8"
+version = "=0.48.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 98e686cd90..a6dfb155a3 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.8"
+version = "0.48.0"
 
 # [workspace]
 
diff --git a/framework/meta/src/cmd/contract/meta_config.rs b/framework/meta/src/cmd/contract/meta_config.rs
index df9f1ab337..760e4f6b38 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.8\"
+version = \"0.48.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.47.8".to_string(),
+            framework_version: "0.48.0".to_string(),
             framework_path: Option::Some("../../../framework/base".to_string()),
             contract_features: Vec::<String>::new(),
         };
diff --git a/framework/meta/src/version_history.rs b/framework/meta/src/version_history.rs
index 7b79e2ff5b..45b66d2e25 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.8);
+pub const LAST_VERSION: FrameworkVersion = framework_version!(0.48.0);
 
 /// Indicates where to stop with the upgrades.
 pub const LAST_UPGRADE_VERSION: FrameworkVersion = LAST_VERSION;
@@ -66,6 +66,7 @@ pub const VERSIONS: &[FrameworkVersion] = framework_versions![
     0.47.6,
     0.47.7,
     0.47.8,
+    0.48.0,
 ];
 
 #[rustfmt::skip]
diff --git a/framework/scenario/Cargo.toml b/framework/scenario/Cargo.toml
index 0e138752e6..0d487891c3 100644
--- a/framework/scenario/Cargo.toml
+++ b/framework/scenario/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-scenario"
-version = "0.47.8"
+version = "0.48.0"
 edition = "2021"
 
 authors = [
@@ -40,12 +40,12 @@ path = "src/main.rs"
 run-go-tests = []
 
 [dependencies.multiversx-sc]
-version = "=0.47.8"
+version = "=0.48.0"
 features = ["alloc", "num-bigint"]
 path = "../base"
 
 [dependencies.multiversx-sc-meta]
-version = "=0.47.8"
+version = "=0.48.0"
 path = "../meta"
 
 [dependencies.multiversx-chain-scenario-format]
diff --git a/framework/snippets/Cargo.toml b/framework/snippets/Cargo.toml
index 14426e25fe..8fd24f67cb 100644
--- a/framework/snippets/Cargo.toml
+++ b/framework/snippets/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-snippets"
-version = "0.47.8"
+version = "0.48.0"
 edition = "2021"
 
 authors = ["MultiversX <contact@multiversx.com>"]
@@ -22,7 +22,7 @@ env_logger = "0.11"
 futures = "0.3"
 
 [dependencies.multiversx-sc-scenario]
-version = "=0.47.8"
+version = "=0.48.0"
 path = "../scenario"
 
 [dependencies.multiversx-sdk]
diff --git a/framework/wasm-adapter/Cargo.toml b/framework/wasm-adapter/Cargo.toml
index b75da45633..a73659240a 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.8"
+version = "0.48.0"
 edition = "2021"
 
 authors = [
@@ -22,5 +22,5 @@ categories = [
 ]
 
 [dependencies.multiversx-sc]
-version = "=0.47.8"
+version = "=0.48.0"
 path = "../base"
diff --git a/tools/mxpy-snippet-generator/Cargo.toml b/tools/mxpy-snippet-generator/Cargo.toml
index 4253ef6872..ca71edf2e8 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.8"
+version = "0.48.0"
 path = "../../framework/base"
 
 [dependencies]
diff --git a/tools/rust-debugger/format-tests/Cargo.toml b/tools/rust-debugger/format-tests/Cargo.toml
index c838a1d924..0e22178945 100644
--- a/tools/rust-debugger/format-tests/Cargo.toml
+++ b/tools/rust-debugger/format-tests/Cargo.toml
@@ -9,11 +9,11 @@ name = "format-tests"
 path = "src/format_tests.rs"
 
 [dependencies.multiversx-sc]
-version = "=0.47.8"
+version = "=0.48.0"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-scenario]
-version = "=0.47.8"
+version = "=0.48.0"
 path = "../../../framework/scenario"
 
 [dependencies.multiversx-chain-vm]

From 66e38cbfa399789053ab29e0d31346098ee0674f Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 9 Apr 2024 09:50:38 +0300
Subject: [PATCH 0673/1254] Cargo.lock update

---
 .../benchmarks/large-storage/wasm/Cargo.lock  | 10 ++++-----
 .../linked-list-repeat/wasm/Cargo.lock        | 10 ++++-----
 .../mappers/map-repeat/wasm/Cargo.lock        | 10 ++++-----
 .../mappers/queue-repeat/wasm/Cargo.lock      | 10 ++++-----
 .../mappers/set-repeat/wasm/Cargo.lock        | 10 ++++-----
 .../single-value-repeat/wasm/Cargo.lock       | 10 ++++-----
 .../mappers/vec-repeat/wasm/Cargo.lock        | 10 ++++-----
 .../benchmarks/send-tx-repeat/wasm/Cargo.lock | 10 ++++-----
 .../Cargo.lock                                |  6 ++---
 .../Cargo.lock                                |  6 ++---
 .../benchmarks/str-repeat/wasm/Cargo.lock     | 10 ++++-----
 .../core/price-aggregator/wasm/Cargo.lock     | 22 +++++++++----------
 contracts/examples/adder/wasm/Cargo.lock      | 10 ++++-----
 .../bonding-curve-contract/wasm/Cargo.lock    | 12 +++++-----
 .../examples/check-pause/wasm/Cargo.lock      | 12 +++++-----
 .../crowdfunding-esdt/wasm/Cargo.lock         | 10 ++++-----
 .../examples/crypto-bubbles/wasm/Cargo.lock   | 10 ++++-----
 .../kitty-auction/wasm/Cargo.lock             | 10 ++++-----
 .../kitty-genetic-alg/wasm/Cargo.lock         | 10 ++++-----
 .../kitty-ownership/wasm/Cargo.lock           | 10 ++++-----
 .../examples/crypto-zombies/wasm/Cargo.lock   | 10 ++++-----
 .../examples/digital-cash/wasm/Cargo.lock     | 10 ++++-----
 contracts/examples/empty/wasm/Cargo.lock      | 10 ++++-----
 .../esdt-transfer-with-fee/wasm/Cargo.lock    | 10 ++++-----
 contracts/examples/factorial/wasm/Cargo.lock  | 10 ++++-----
 .../examples/fractional-nfts/wasm/Cargo.lock  | 12 +++++-----
 .../examples/lottery-esdt/wasm/Cargo.lock     | 10 ++++-----
 .../multisig/wasm-multisig-full/Cargo.lock    | 12 +++++-----
 .../multisig/wasm-multisig-view/Cargo.lock    | 12 +++++-----
 contracts/examples/multisig/wasm/Cargo.lock   | 12 +++++-----
 contracts/examples/nft-minter/wasm/Cargo.lock | 10 ++++-----
 .../nft-storage-prepay/wasm/Cargo.lock        | 10 ++++-----
 .../examples/nft-subscription/wasm/Cargo.lock | 12 +++++-----
 .../order-book/factory/wasm/Cargo.lock        | 10 ++++-----
 .../examples/order-book/pair/wasm/Cargo.lock  | 10 ++++-----
 .../examples/ping-pong-egld/wasm/Cargo.lock   | 10 ++++-----
 .../examples/proxy-pause/wasm/Cargo.lock      | 10 ++++-----
 .../rewards-distribution/wasm/Cargo.lock      | 12 +++++-----
 .../examples/seed-nft-minter/wasm/Cargo.lock  | 12 +++++-----
 .../examples/token-release/wasm/Cargo.lock    | 10 ++++-----
 .../abi-tester/wasm-abi-tester-ev/Cargo.lock  | 10 ++++-----
 .../feature-tests/abi-tester/wasm/Cargo.lock  | 10 ++++-----
 .../wasm-alloc-mem-fail/Cargo.lock            | 10 ++++-----
 .../wasm-alloc-mem-leaking/Cargo.lock         | 10 ++++-----
 .../alloc-features/wasm/Cargo.lock            | 10 ++++-----
 .../Cargo.lock                                | 12 +++++-----
 .../basic-features/wasm/Cargo.lock            | 12 +++++-----
 .../big-float-features/wasm/Cargo.lock        | 10 ++++-----
 .../builtin-func-features/wasm/Cargo.lock     | 10 ++++-----
 .../first-contract/wasm/Cargo.lock            | 10 ++++-----
 .../second-contract/wasm/Cargo.lock           | 10 ++++-----
 .../child/wasm/Cargo.lock                     | 10 ++++-----
 .../parent/wasm/Cargo.lock                    | 10 ++++-----
 .../wasm-forwarder-queue-promises/Cargo.lock  | 10 ++++-----
 .../forwarder-queue/wasm/Cargo.lock           | 10 ++++-----
 .../Cargo.lock                                | 10 ++++-----
 .../Cargo.lock                                | 10 ++++-----
 .../forwarder-raw/wasm/Cargo.lock             | 10 ++++-----
 .../composability/forwarder/wasm/Cargo.lock   | 10 ++++-----
 .../local-esdt-and-nft/wasm/Cargo.lock        | 10 ++++-----
 .../promises-features/wasm/Cargo.lock         | 10 ++++-----
 .../proxy-test-first/wasm/Cargo.lock          | 10 ++++-----
 .../proxy-test-second/wasm/Cargo.lock         | 10 ++++-----
 .../recursive-caller/wasm/Cargo.lock          | 10 ++++-----
 .../transfer-role-features/wasm/Cargo.lock    | 12 +++++-----
 .../vault/wasm-vault-promises/Cargo.lock      | 10 ++++-----
 .../vault/wasm-vault-upgrade/Cargo.lock       | 10 ++++-----
 .../composability/vault/wasm/Cargo.lock       | 10 ++++-----
 .../crowdfunding-erc20/wasm/Cargo.lock        | 10 ++++-----
 .../erc1155-marketplace/wasm/Cargo.lock       | 10 ++++-----
 .../erc1155-user-mock/wasm/Cargo.lock         | 10 ++++-----
 .../erc1155/wasm/Cargo.lock                   | 10 ++++-----
 .../erc-style-contracts/erc20/wasm/Cargo.lock | 10 ++++-----
 .../erc721/wasm/Cargo.lock                    | 10 ++++-----
 .../lottery-erc20/wasm/Cargo.lock             | 10 ++++-----
 .../esdt-system-sc-mock/wasm/Cargo.lock       | 10 ++++-----
 .../exchange-features/wasm/Cargo.lock         |  6 ++---
 .../wasm/Cargo.lock                           | 10 ++++-----
 .../managed-map-features/wasm/Cargo.lock      | 10 ++++-----
 .../wasm-multi-contract-alt-impl/Cargo.lock   | 10 ++++-----
 .../Cargo.lock                                | 10 ++++-----
 .../Cargo.lock                                | 10 ++++-----
 .../multi-contract-features/wasm/Cargo.lock   | 10 ++++-----
 .../panic-message-features/wasm/Cargo.lock    | 10 ++++-----
 .../payable-features/wasm/Cargo.lock          | 10 ++++-----
 .../wasm/Cargo.lock                           | 10 ++++-----
 .../wasm/Cargo.lock                           | 10 ++++-----
 .../wasm-use-module-view/Cargo.lock           | 12 +++++-----
 .../feature-tests/use-module/wasm/Cargo.lock  | 12 +++++-----
 89 files changed, 459 insertions(+), 459 deletions(-)

diff --git a/contracts/benchmarks/large-storage/wasm/Cargo.lock b/contracts/benchmarks/large-storage/wasm/Cargo.lock
index 3b7ddf924d..cb13777edf 100755
--- a/contracts/benchmarks/large-storage/wasm/Cargo.lock
+++ b/contracts/benchmarks/large-storage/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
 
 [[package]]
 name = "bitflags"
@@ -55,7 +55,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.lock
index 1cf1efc122..78ff5aef10 100644
--- a/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.lock
+++ b/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
 
 [[package]]
 name = "benchmark-common"
@@ -63,7 +63,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -92,7 +92,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -103,7 +103,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.lock
index 946c9f3148..3ee28394b7 100644
--- a/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.lock
+++ b/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
 
 [[package]]
 name = "benchmark-common"
@@ -63,7 +63,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -92,7 +92,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -103,7 +103,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.lock
index 78846158be..4df3ab54da 100644
--- a/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.lock
+++ b/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
 
 [[package]]
 name = "benchmark-common"
@@ -47,7 +47,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.lock
index 9e34dfc959..4f8e72b115 100644
--- a/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.lock
+++ b/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
 
 [[package]]
 name = "benchmark-common"
@@ -47,7 +47,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.lock
index 5a1e115b0d..fdfa32de28 100644
--- a/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.lock
+++ b/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
 
 [[package]]
 name = "benchmark-common"
@@ -47,7 +47,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.lock
index 6a46869df7..f51214f9f1 100644
--- a/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.lock
+++ b/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
 
 [[package]]
 name = "benchmark-common"
@@ -47,7 +47,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/send-tx-repeat/wasm/Cargo.lock b/contracts/benchmarks/send-tx-repeat/wasm/Cargo.lock
index 8d5515d04d..13533956e8 100755
--- a/contracts/benchmarks/send-tx-repeat/wasm/Cargo.lock
+++ b/contracts/benchmarks/send-tx-repeat/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
 
 [[package]]
 name = "bitflags"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.lock b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.lock
index 7f11ee332c..4683a2b046 100644
--- a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.lock
+++ b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.lock
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.lock b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.lock
index a866ae3bba..f750a8d328 100644
--- a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.lock
+++ b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.lock
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/str-repeat/wasm/Cargo.lock b/contracts/benchmarks/str-repeat/wasm/Cargo.lock
index f85a43a545..e2b54817be 100755
--- a/contracts/benchmarks/str-repeat/wasm/Cargo.lock
+++ b/contracts/benchmarks/str-repeat/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
 
 [[package]]
 name = "bitflags"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/core/price-aggregator/wasm/Cargo.lock b/contracts/core/price-aggregator/wasm/Cargo.lock
index 4331327ffd..9e64d41b47 100644
--- a/contracts/core/price-aggregator/wasm/Cargo.lock
+++ b/contracts/core/price-aggregator/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
 
 [[package]]
 name = "bitflags"
@@ -22,9 +22,9 @@ checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
 
 [[package]]
 name = "bumpalo"
-version = "3.15.4"
+version = "3.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa"
+checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
 
 [[package]]
 name = "cfg-if"
@@ -40,9 +40,9 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "getrandom"
-version = "0.2.12"
+version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5"
+checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -86,7 +86,7 @@ checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
 
 [[package]]
 name = "multiversx-price-aggregator-sc"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "arrayvec",
  "getrandom",
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -134,7 +134,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -145,14 +145,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/adder/wasm/Cargo.lock b/contracts/examples/adder/wasm/Cargo.lock
index d0b2c19aa6..c7b8a8f917 100755
--- a/contracts/examples/adder/wasm/Cargo.lock
+++ b/contracts/examples/adder/wasm/Cargo.lock
@@ -25,9 +25,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
 
 [[package]]
 name = "bitflags"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/bonding-curve-contract/wasm/Cargo.lock b/contracts/examples/bonding-curve-contract/wasm/Cargo.lock
index d6238edca0..0fa9693639 100644
--- a/contracts/examples/bonding-curve-contract/wasm/Cargo.lock
+++ b/contracts/examples/bonding-curve-contract/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
 
 [[package]]
 name = "bitflags"
@@ -56,7 +56,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,14 +96,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/check-pause/wasm/Cargo.lock b/contracts/examples/check-pause/wasm/Cargo.lock
index 5ee107a05b..1d886bba04 100644
--- a/contracts/examples/check-pause/wasm/Cargo.lock
+++ b/contracts/examples/check-pause/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
 
 [[package]]
 name = "bitflags"
@@ -56,7 +56,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,14 +96,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crowdfunding-esdt/wasm/Cargo.lock b/contracts/examples/crowdfunding-esdt/wasm/Cargo.lock
index 8d30b32a98..9a14efccc8 100644
--- a/contracts/examples/crowdfunding-esdt/wasm/Cargo.lock
+++ b/contracts/examples/crowdfunding-esdt/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
 
 [[package]]
 name = "bitflags"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crypto-bubbles/wasm/Cargo.lock b/contracts/examples/crypto-bubbles/wasm/Cargo.lock
index 58d2a4be8b..6af31b83b6 100755
--- a/contracts/examples/crypto-bubbles/wasm/Cargo.lock
+++ b/contracts/examples/crypto-bubbles/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
 
 [[package]]
 name = "bitflags"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.lock b/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.lock
index aeaec8ffb0..82fd08dc78 100755
--- a/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.lock
+++ b/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
 
 [[package]]
 name = "bitflags"
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -113,7 +113,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -124,7 +124,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "multiversx-sc",
 ]
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 c3842dae09..95368370cb 100755
--- a/contracts/examples/crypto-kitties/kitty-genetic-alg/wasm/Cargo.lock
+++ b/contracts/examples/crypto-kitties/kitty-genetic-alg/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
 
 [[package]]
 name = "bitflags"
@@ -65,7 +65,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.lock b/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.lock
index f11b790b7f..d497d47054 100755
--- a/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.lock
+++ b/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
 
 [[package]]
 name = "bitflags"
@@ -75,7 +75,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -104,7 +104,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -115,7 +115,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crypto-zombies/wasm/Cargo.lock b/contracts/examples/crypto-zombies/wasm/Cargo.lock
index 9052befd7e..53c26db1eb 100755
--- a/contracts/examples/crypto-zombies/wasm/Cargo.lock
+++ b/contracts/examples/crypto-zombies/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
 
 [[package]]
 name = "bitflags"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/digital-cash/wasm/Cargo.lock b/contracts/examples/digital-cash/wasm/Cargo.lock
index 844e04e7d1..602c7d856b 100644
--- a/contracts/examples/digital-cash/wasm/Cargo.lock
+++ b/contracts/examples/digital-cash/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
 
 [[package]]
 name = "bitflags"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/empty/wasm/Cargo.lock b/contracts/examples/empty/wasm/Cargo.lock
index c697c0de43..5a87b422d2 100755
--- a/contracts/examples/empty/wasm/Cargo.lock
+++ b/contracts/examples/empty/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
 
 [[package]]
 name = "bitflags"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.lock b/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.lock
index fdf2a62489..cee7278178 100644
--- a/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.lock
+++ b/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
 
 [[package]]
 name = "bitflags"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/factorial/wasm/Cargo.lock b/contracts/examples/factorial/wasm/Cargo.lock
index de7d1ca2ae..4dff18babf 100755
--- a/contracts/examples/factorial/wasm/Cargo.lock
+++ b/contracts/examples/factorial/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
 
 [[package]]
 name = "bitflags"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/fractional-nfts/wasm/Cargo.lock b/contracts/examples/fractional-nfts/wasm/Cargo.lock
index d13522f894..f95919526e 100644
--- a/contracts/examples/fractional-nfts/wasm/Cargo.lock
+++ b/contracts/examples/fractional-nfts/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
 
 [[package]]
 name = "bitflags"
@@ -56,7 +56,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,14 +96,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/lottery-esdt/wasm/Cargo.lock b/contracts/examples/lottery-esdt/wasm/Cargo.lock
index ce9560173c..6f1cace25d 100755
--- a/contracts/examples/lottery-esdt/wasm/Cargo.lock
+++ b/contracts/examples/lottery-esdt/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
 
 [[package]]
 name = "bitflags"
@@ -55,7 +55,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/multisig/wasm-multisig-full/Cargo.lock b/contracts/examples/multisig/wasm-multisig-full/Cargo.lock
index 83333cc9d2..953a8551f3 100644
--- a/contracts/examples/multisig/wasm-multisig-full/Cargo.lock
+++ b/contracts/examples/multisig/wasm-multisig-full/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
 
 [[package]]
 name = "bitflags"
@@ -56,7 +56,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,14 +96,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/multisig/wasm-multisig-view/Cargo.lock b/contracts/examples/multisig/wasm-multisig-view/Cargo.lock
index 7e84c623fa..df77559d67 100644
--- a/contracts/examples/multisig/wasm-multisig-view/Cargo.lock
+++ b/contracts/examples/multisig/wasm-multisig-view/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
 
 [[package]]
 name = "bitflags"
@@ -56,7 +56,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,14 +96,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/multisig/wasm/Cargo.lock b/contracts/examples/multisig/wasm/Cargo.lock
index b56f8b9f00..d72aa67e30 100755
--- a/contracts/examples/multisig/wasm/Cargo.lock
+++ b/contracts/examples/multisig/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
 
 [[package]]
 name = "bitflags"
@@ -56,7 +56,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,14 +96,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/nft-minter/wasm/Cargo.lock b/contracts/examples/nft-minter/wasm/Cargo.lock
index 89c376064b..ce0b2650f9 100644
--- a/contracts/examples/nft-minter/wasm/Cargo.lock
+++ b/contracts/examples/nft-minter/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
 
 [[package]]
 name = "bitflags"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/nft-storage-prepay/wasm/Cargo.lock b/contracts/examples/nft-storage-prepay/wasm/Cargo.lock
index 161c20f4ee..319176681e 100755
--- a/contracts/examples/nft-storage-prepay/wasm/Cargo.lock
+++ b/contracts/examples/nft-storage-prepay/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
 
 [[package]]
 name = "bitflags"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/nft-subscription/wasm/Cargo.lock b/contracts/examples/nft-subscription/wasm/Cargo.lock
index b862e4314c..2244415577 100644
--- a/contracts/examples/nft-subscription/wasm/Cargo.lock
+++ b/contracts/examples/nft-subscription/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
 
 [[package]]
 name = "bitflags"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,14 +80,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/order-book/factory/wasm/Cargo.lock b/contracts/examples/order-book/factory/wasm/Cargo.lock
index 884b17c296..60c0b2cabd 100644
--- a/contracts/examples/order-book/factory/wasm/Cargo.lock
+++ b/contracts/examples/order-book/factory/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
 
 [[package]]
 name = "bitflags"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/order-book/pair/wasm/Cargo.lock b/contracts/examples/order-book/pair/wasm/Cargo.lock
index 6488a5eaa5..14b8551309 100644
--- a/contracts/examples/order-book/pair/wasm/Cargo.lock
+++ b/contracts/examples/order-book/pair/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
 
 [[package]]
 name = "bitflags"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/ping-pong-egld/wasm/Cargo.lock b/contracts/examples/ping-pong-egld/wasm/Cargo.lock
index 1d697bc89d..a86f53d6dd 100755
--- a/contracts/examples/ping-pong-egld/wasm/Cargo.lock
+++ b/contracts/examples/ping-pong-egld/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
 
 [[package]]
 name = "bitflags"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/proxy-pause/wasm/Cargo.lock b/contracts/examples/proxy-pause/wasm/Cargo.lock
index 7847d7e907..73d7607641 100644
--- a/contracts/examples/proxy-pause/wasm/Cargo.lock
+++ b/contracts/examples/proxy-pause/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
 
 [[package]]
 name = "bitflags"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/rewards-distribution/wasm/Cargo.lock b/contracts/examples/rewards-distribution/wasm/Cargo.lock
index ed367793e0..d5303f9494 100644
--- a/contracts/examples/rewards-distribution/wasm/Cargo.lock
+++ b/contracts/examples/rewards-distribution/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
 
 [[package]]
 name = "bitflags"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,14 +80,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/seed-nft-minter/wasm/Cargo.lock b/contracts/examples/seed-nft-minter/wasm/Cargo.lock
index 5b0c14e4c0..d322f26404 100644
--- a/contracts/examples/seed-nft-minter/wasm/Cargo.lock
+++ b/contracts/examples/seed-nft-minter/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
 
 [[package]]
 name = "bitflags"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,14 +80,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/token-release/wasm/Cargo.lock b/contracts/examples/token-release/wasm/Cargo.lock
index 982ffe7e5b..0d4d728f3e 100644
--- a/contracts/examples/token-release/wasm/Cargo.lock
+++ b/contracts/examples/token-release/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
 
 [[package]]
 name = "bitflags"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "multiversx-sc",
 ]
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 6224f94e8e..a99ecaccaf 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
@@ -25,9 +25,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
 
 [[package]]
 name = "bitflags"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/abi-tester/wasm/Cargo.lock b/contracts/feature-tests/abi-tester/wasm/Cargo.lock
index 648921bf93..db59638442 100755
--- a/contracts/feature-tests/abi-tester/wasm/Cargo.lock
+++ b/contracts/feature-tests/abi-tester/wasm/Cargo.lock
@@ -25,9 +25,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
 
 [[package]]
 name = "bitflags"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock
index f7d9075764..1a3bc7da70 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock
@@ -25,9 +25,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
 
 [[package]]
 name = "bitflags"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.lock b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.lock
index e278d208aa..b32efb0d4a 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.lock
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.lock
@@ -25,9 +25,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
 
 [[package]]
 name = "bitflags"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/alloc-features/wasm/Cargo.lock b/contracts/feature-tests/alloc-features/wasm/Cargo.lock
index 911763d1ee..6a0f3330d7 100644
--- a/contracts/feature-tests/alloc-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/alloc-features/wasm/Cargo.lock
@@ -25,9 +25,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
 
 [[package]]
 name = "bitflags"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "multiversx-sc",
 ]
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 4096da06a6..f5d8794bb9 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
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
 
 [[package]]
 name = "basic-features"
@@ -56,7 +56,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,14 +96,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/basic-features/wasm/Cargo.lock b/contracts/feature-tests/basic-features/wasm/Cargo.lock
index b771e88a45..bfb8c41ea7 100755
--- a/contracts/feature-tests/basic-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/basic-features/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
 
 [[package]]
 name = "basic-features"
@@ -56,7 +56,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,14 +96,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/big-float-features/wasm/Cargo.lock b/contracts/feature-tests/big-float-features/wasm/Cargo.lock
index e219eb63f1..40beaf8d03 100644
--- a/contracts/feature-tests/big-float-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/big-float-features/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
 
 [[package]]
 name = "big-float-features"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "multiversx-sc",
 ]
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 b24993d7ef..bb57eeb64e 100644
--- a/contracts/feature-tests/composability/builtin-func-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/builtin-func-features/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
 
 [[package]]
 name = "bitflags"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "multiversx-sc",
 ]
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 2df38c78c8..a2c55964c7 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
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
 
 [[package]]
 name = "bitflags"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "multiversx-sc",
 ]
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 dae06b0b1b..99cd973235 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
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
 
 [[package]]
 name = "bitflags"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "multiversx-sc",
 ]
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 ceffed2f48..b7b7846eb2 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
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
 
 [[package]]
 name = "bitflags"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "multiversx-sc",
 ]
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 543b947e37..fd4d0794e8 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
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
 
 [[package]]
 name = "bitflags"
@@ -47,7 +47,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "multiversx-sc",
 ]
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 ad9a1f4b49..9ce03493b3 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
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
 
 [[package]]
 name = "bitflags"
@@ -56,7 +56,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,7 +96,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock
index 4e148e341c..dbef7fe1c4 100644
--- a/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
 
 [[package]]
 name = "bitflags"
@@ -56,7 +56,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,7 +96,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "multiversx-sc",
 ]
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 8d5690eae5..1b3b56c133 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
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
 
 [[package]]
 name = "bitflags"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "multiversx-sc",
 ]
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 1e4d942595..dcb63c28ef 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
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
 
 [[package]]
 name = "bitflags"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.lock
index 951a706535..4b56a477a5 100755
--- a/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
 
 [[package]]
 name = "bitflags"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock
index 9fb9899a61..14ba905f98 100755
--- a/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
 
 [[package]]
 name = "bitflags"
@@ -56,7 +56,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,7 +96,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "multiversx-sc",
 ]
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 3ecce8a599..cf8b7eaeb8 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
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
 
 [[package]]
 name = "bitflags"
@@ -55,7 +55,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/promises-features/wasm/Cargo.lock b/contracts/feature-tests/composability/promises-features/wasm/Cargo.lock
index 74b8399729..1cce0c20ac 100644
--- a/contracts/feature-tests/composability/promises-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/promises-features/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
 
 [[package]]
 name = "bitflags"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "multiversx-sc",
 ]
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 c4e3b77125..2616a0e326 100755
--- a/contracts/feature-tests/composability/proxy-test-first/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/proxy-test-first/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
 
 [[package]]
 name = "bitflags"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "multiversx-sc",
 ]
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 b45fac9e48..cb41667a6d 100755
--- a/contracts/feature-tests/composability/proxy-test-second/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/proxy-test-second/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
 
 [[package]]
 name = "bitflags"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.lock b/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.lock
index d3ff7c1587..d2e41ac725 100755
--- a/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
 
 [[package]]
 name = "bitflags"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "multiversx-sc",
 ]
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 8f6bc439b6..bbbb12c9f9 100644
--- a/contracts/feature-tests/composability/transfer-role-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/transfer-role-features/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
 
 [[package]]
 name = "bitflags"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,14 +80,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "multiversx-sc",
 ]
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 547f949bf0..e86afd77c4 100644
--- a/contracts/feature-tests/composability/vault/wasm-vault-promises/Cargo.lock
+++ b/contracts/feature-tests/composability/vault/wasm-vault-promises/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
 
 [[package]]
 name = "bitflags"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "multiversx-sc",
 ]
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 8a1fb523c4..0b7112be8c 100644
--- a/contracts/feature-tests/composability/vault/wasm-vault-upgrade/Cargo.lock
+++ b/contracts/feature-tests/composability/vault/wasm-vault-upgrade/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
 
 [[package]]
 name = "bitflags"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/vault/wasm/Cargo.lock b/contracts/feature-tests/composability/vault/wasm/Cargo.lock
index fad7e9967d..6d0b58aed6 100755
--- a/contracts/feature-tests/composability/vault/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/vault/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
 
 [[package]]
 name = "bitflags"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "multiversx-sc",
 ]
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 542c92a53d..ad10f006f4 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
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
 
 [[package]]
 name = "bitflags"
@@ -63,7 +63,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -92,7 +92,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -103,7 +103,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "multiversx-sc",
 ]
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 c0031acd5f..0a96032377 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
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
 
 [[package]]
 name = "bitflags"
@@ -63,7 +63,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -92,7 +92,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -103,7 +103,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "multiversx-sc",
 ]
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 556081cf37..a6f053b5c8 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
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
 
 [[package]]
 name = "bitflags"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "multiversx-sc",
 ]
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 8e9ff2e68a..90f97cfb61 100644
--- a/contracts/feature-tests/erc-style-contracts/erc1155/wasm/Cargo.lock
+++ b/contracts/feature-tests/erc-style-contracts/erc1155/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
 
 [[package]]
 name = "bitflags"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "multiversx-sc",
 ]
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 9d4ae04370..c7d25eb4e2 100644
--- a/contracts/feature-tests/erc-style-contracts/erc20/wasm/Cargo.lock
+++ b/contracts/feature-tests/erc-style-contracts/erc20/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
 
 [[package]]
 name = "bitflags"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "multiversx-sc",
 ]
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 391b426bb2..b91f78bb52 100644
--- a/contracts/feature-tests/erc-style-contracts/erc721/wasm/Cargo.lock
+++ b/contracts/feature-tests/erc-style-contracts/erc721/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
 
 [[package]]
 name = "bitflags"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "multiversx-sc",
 ]
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 b24dd728d1..36b9febca3 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
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
 
 [[package]]
 name = "bitflags"
@@ -63,7 +63,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -92,7 +92,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -103,7 +103,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "multiversx-sc",
 ]
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 cd0ce287fb..d52e047711 100644
--- a/contracts/feature-tests/esdt-system-sc-mock/wasm/Cargo.lock
+++ b/contracts/feature-tests/esdt-system-sc-mock/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
 
 [[package]]
 name = "bitflags"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/exchange-features/wasm/Cargo.lock b/contracts/feature-tests/exchange-features/wasm/Cargo.lock
index e9ffb74f36..09349d87e7 100644
--- a/contracts/feature-tests/exchange-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/exchange-features/wasm/Cargo.lock
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/formatted-message-features/wasm/Cargo.lock b/contracts/feature-tests/formatted-message-features/wasm/Cargo.lock
index fc222834e1..9dbe2ad726 100644
--- a/contracts/feature-tests/formatted-message-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/formatted-message-features/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
 
 [[package]]
 name = "bitflags"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/managed-map-features/wasm/Cargo.lock b/contracts/feature-tests/managed-map-features/wasm/Cargo.lock
index a01751bebe..a555da68eb 100644
--- a/contracts/feature-tests/managed-map-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/managed-map-features/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
 
 [[package]]
 name = "bitflags"
@@ -55,7 +55,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "multiversx-sc",
 ]
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 6a372a85c5..3997752036 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
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
 
 [[package]]
 name = "bitflags"
@@ -55,7 +55,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "multiversx-sc",
 ]
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 e6c247041d..13230fc27c 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
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
 
 [[package]]
 name = "bitflags"
@@ -55,7 +55,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "multiversx-sc",
 ]
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 eb10f6d145..b1fa6d8b6b 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
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
 
 [[package]]
 name = "bitflags"
@@ -55,7 +55,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/multi-contract-features/wasm/Cargo.lock b/contracts/feature-tests/multi-contract-features/wasm/Cargo.lock
index db59aa094a..2815c003c8 100755
--- a/contracts/feature-tests/multi-contract-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/multi-contract-features/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
 
 [[package]]
 name = "bitflags"
@@ -55,7 +55,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/panic-message-features/wasm/Cargo.lock b/contracts/feature-tests/panic-message-features/wasm/Cargo.lock
index 59e64f220b..ddf9332c59 100755
--- a/contracts/feature-tests/panic-message-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/panic-message-features/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
 
 [[package]]
 name = "bitflags"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/payable-features/wasm/Cargo.lock b/contracts/feature-tests/payable-features/wasm/Cargo.lock
index 29d59c1f86..3ffdf49ece 100755
--- a/contracts/feature-tests/payable-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/payable-features/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
 
 [[package]]
 name = "bitflags"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "multiversx-sc",
 ]
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 4398ef5691..b8d98314e7 100644
--- a/contracts/feature-tests/rust-snippets-generator-test/wasm/Cargo.lock
+++ b/contracts/feature-tests/rust-snippets-generator-test/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
 
 [[package]]
 name = "bitflags"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "multiversx-sc",
 ]
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 39a57994af..f95eb564c3 100644
--- a/contracts/feature-tests/rust-testing-framework-tester/wasm/Cargo.lock
+++ b/contracts/feature-tests/rust-testing-framework-tester/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
 
 [[package]]
 name = "bitflags"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "multiversx-sc",
 ]
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 f01d124f6d..969d71832f 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
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
 
 [[package]]
 name = "bitflags"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,14 +80,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/use-module/wasm/Cargo.lock b/contracts/feature-tests/use-module/wasm/Cargo.lock
index 49e4869bf9..c97622bd31 100644
--- a/contracts/feature-tests/use-module/wasm/Cargo.lock
+++ b/contracts/feature-tests/use-module/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
 
 [[package]]
 name = "bitflags"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,14 +80,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.47.8"
+version = "0.48.0"
 dependencies = [
  "multiversx-sc",
 ]

From 7f2a441aabd08fe7eaf697bd256b738af26fb85e Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Tue, 9 Apr 2024 10:36:31 +0300
Subject: [PATCH 0674/1254] builtin func - nft update attributes & esdt nft
 create

---
 .../contract_base/wrappers/send_wrapper.rs    | 73 +++++--------------
 .../system_proxy/builtin_func_proxy.rs        | 50 +++++++++++++
 2 files changed, 68 insertions(+), 55 deletions(-)

diff --git a/framework/base/src/contract_base/wrappers/send_wrapper.rs b/framework/base/src/contract_base/wrappers/send_wrapper.rs
index 31f6c6a158..e763a12f39 100644
--- a/framework/base/src/contract_base/wrappers/send_wrapper.rs
+++ b/framework/base/src/contract_base/wrappers/send_wrapper.rs
@@ -3,17 +3,13 @@ use core::marker::PhantomData;
 use crate::codec::Empty;
 
 use crate::{
-    api::{BlockchainApi, BlockchainApiImpl, CallTypeApi, StorageReadApi},
+    api::{BlockchainApi, CallTypeApi, StorageReadApi},
     codec,
     types::{
-        system_proxy,
-        system_proxy::builtin_func_names::{
-            ESDT_NFT_CREATE_FUNC_NAME, ESDT_NFT_UPDATE_ATTRIBUTES_FUNC_NAME,
-        },
-        BigUint, ContractCallNoPayment, ESDTSystemSCAddress, EgldOrEsdtTokenIdentifier,
-        EsdtTokenPayment, FunctionCall, GasLeft, ManagedAddress, ManagedArgBuffer, ManagedBuffer,
-        ManagedType, ManagedVec, OriginalResultMarker, ReturnsRawResult, ToSelf, TokenIdentifier,
-        Tx, TxScEnv,
+        system_proxy, BigUint, ContractCallNoPayment, ESDTSystemSCAddress,
+        EgldOrEsdtTokenIdentifier, EsdtTokenPayment, FunctionCall, GasLeft, ManagedAddress,
+        ManagedArgBuffer, ManagedBuffer, ManagedType, ManagedVec, OriginalResultMarker,
+        ReturnsRawResult, ToSelf, TokenIdentifier, Tx, TxScEnv,
     },
 };
 
@@ -401,19 +397,6 @@ where
             .sync_call()
     }
 
-    fn call_local_esdt_built_in_function_minimal(
-        &self,
-        function_name: &str,
-        arg_buffer: ManagedArgBuffer<A>,
-    ) {
-        Tx::new_tx_from_sc()
-            .to(ToSelf)
-            .gas(GasLeft)
-            .raw_call(function_name)
-            .arguments_raw(arg_buffer)
-            .sync_call()
-    }
-
     /// Allows synchronous minting of ESDT/SFT (depending on nonce). Execution is resumed afterwards.
     ///
     /// Note that the SC must have the ESDTLocalMint or ESDTNftAddQuantity roles set,
@@ -530,30 +513,13 @@ where
         attributes: &T,
         uris: &ManagedVec<A, ManagedBuffer<A>>,
     ) -> u64 {
-        let mut arg_buffer = ManagedArgBuffer::new();
-        arg_buffer.push_arg(token);
-        arg_buffer.push_arg(amount);
-        arg_buffer.push_arg(name);
-        arg_buffer.push_arg(royalties);
-        arg_buffer.push_arg(hash);
-        arg_buffer.push_arg(attributes);
-
-        if uris.is_empty() {
-            // at least one URI is required, so we push an empty one
-            arg_buffer.push_arg(codec::Empty);
-        } else {
-            // The API function has the last argument as variadic,
-            // so we top-encode each and send as separate argument
-            for uri in uris {
-                arg_buffer.push_arg(uri);
-            }
-        }
-
-        let output = self.call_local_esdt_built_in_function(
-            A::blockchain_api_impl().get_gas_left(),
-            ManagedBuffer::from(ESDT_NFT_CREATE_FUNC_NAME),
-            arg_buffer,
-        );
+        let output = Tx::new_tx_from_sc()
+            .to(ToSelf)
+            .gas(GasLeft)
+            .typed(system_proxy::UserBuiltinProxy)
+            .esdt_nft_create(token, amount, name, royalties, hash, attributes, uris)
+            .returns(ReturnsRawResult)
+            .sync_call();
 
         if let Some(first_result_bytes) = output.try_get(0) {
             first_result_bytes.parse_as_u64().unwrap_or_default()
@@ -779,14 +745,11 @@ where
         nft_nonce: u64,
         new_attributes: &T,
     ) {
-        let mut arg_buffer = ManagedArgBuffer::new();
-        arg_buffer.push_arg(token_id);
-        arg_buffer.push_arg(nft_nonce);
-        arg_buffer.push_arg(new_attributes);
-
-        self.call_local_esdt_built_in_function_minimal(
-            ESDT_NFT_UPDATE_ATTRIBUTES_FUNC_NAME,
-            arg_buffer,
-        );
+        Tx::new_tx_from_sc()
+            .to(ToSelf)
+            .gas(GasLeft)
+            .typed(system_proxy::UserBuiltinProxy)
+            .nft_update_attributes(token_id, nft_nonce, new_attributes)
+            .sync_call()
     }
 }
diff --git a/framework/base/src/types/interaction/system_proxy/builtin_func_proxy.rs b/framework/base/src/types/interaction/system_proxy/builtin_func_proxy.rs
index 53fd76d371..746ca8a664 100644
--- a/framework/base/src/types/interaction/system_proxy/builtin_func_proxy.rs
+++ b/framework/base/src/types/interaction/system_proxy/builtin_func_proxy.rs
@@ -136,4 +136,54 @@ where
             .arguments_raw(arg_buffer)
             .original_result()
     }
+
+    pub fn nft_update_attributes<T: codec::TopEncode>(
+        self,
+        token_id: &TokenIdentifier<Env::Api>,
+        nft_nonce: u64,
+        new_attributes: &T,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call(ESDT_NFT_UPDATE_ATTRIBUTES_FUNC_NAME)
+            .argument(token_id)
+            .argument(&nft_nonce)
+            .argument(new_attributes)
+            .original_result()
+    }
+
+    #[allow(clippy::too_many_arguments)]
+    pub fn esdt_nft_create<T: codec::TopEncode>(
+        self,
+        token: &TokenIdentifier<Env::Api>,
+        amount: &BigUint<Env::Api>,
+        name: &ManagedBuffer<Env::Api>,
+        royalties: &BigUint<Env::Api>,
+        hash: &ManagedBuffer<Env::Api>,
+        attributes: &T,
+        uris: &ManagedVec<Env::Api, ManagedBuffer<Env::Api>>,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        let mut arg_buffer = ManagedArgBuffer::new();
+        arg_buffer.push_arg(token);
+        arg_buffer.push_arg(amount);
+        arg_buffer.push_arg(name);
+        arg_buffer.push_arg(royalties);
+        arg_buffer.push_arg(hash);
+        arg_buffer.push_arg(attributes);
+
+        if uris.is_empty() {
+            // at least one URI is required, so we push an empty one
+            arg_buffer.push_arg(codec::Empty);
+        } else {
+            // The API function has the last argument as variadic,
+            // so we top-encode each and send as separate argument
+            for uri in uris {
+                arg_buffer.push_arg(uri);
+            }
+        }
+
+        self.wrapped_tx
+            .raw_call(ESDT_NFT_CREATE_FUNC_NAME)
+            .arguments_raw(arg_buffer)
+            .original_result()
+    }
 }

From 413023412ae96a8b714df1be8c9e282037de46d9 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 9 Apr 2024 13:14:33 +0300
Subject: [PATCH 0675/1254] builtin func - ESDT NFT create proxy returns u64

---
 .../src/contract_base/wrappers/send_wrapper.rs     | 14 ++++----------
 .../interaction/system_proxy/builtin_func_proxy.rs |  2 +-
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/framework/base/src/contract_base/wrappers/send_wrapper.rs b/framework/base/src/contract_base/wrappers/send_wrapper.rs
index e763a12f39..74180719b4 100644
--- a/framework/base/src/contract_base/wrappers/send_wrapper.rs
+++ b/framework/base/src/contract_base/wrappers/send_wrapper.rs
@@ -9,7 +9,7 @@ use crate::{
         system_proxy, BigUint, ContractCallNoPayment, ESDTSystemSCAddress,
         EgldOrEsdtTokenIdentifier, EsdtTokenPayment, FunctionCall, GasLeft, ManagedAddress,
         ManagedArgBuffer, ManagedBuffer, ManagedType, ManagedVec, OriginalResultMarker,
-        ReturnsRawResult, ToSelf, TokenIdentifier, Tx, TxScEnv,
+        ReturnsRawResult, ReturnsResult, ToSelf, TokenIdentifier, Tx, TxScEnv,
     },
 };
 
@@ -513,19 +513,13 @@ where
         attributes: &T,
         uris: &ManagedVec<A, ManagedBuffer<A>>,
     ) -> u64 {
-        let output = Tx::new_tx_from_sc()
+        Tx::new_tx_from_sc()
             .to(ToSelf)
             .gas(GasLeft)
             .typed(system_proxy::UserBuiltinProxy)
             .esdt_nft_create(token, amount, name, royalties, hash, attributes, uris)
-            .returns(ReturnsRawResult)
-            .sync_call();
-
-        if let Some(first_result_bytes) = output.try_get(0) {
-            first_result_bytes.parse_as_u64().unwrap_or_default()
-        } else {
-            0
-        }
+            .returns(ReturnsResult)
+            .sync_call()
     }
 
     /// Creates a new NFT token of a certain type (determined by `token_identifier`).
diff --git a/framework/base/src/types/interaction/system_proxy/builtin_func_proxy.rs b/framework/base/src/types/interaction/system_proxy/builtin_func_proxy.rs
index 746ca8a664..df94d09dc9 100644
--- a/framework/base/src/types/interaction/system_proxy/builtin_func_proxy.rs
+++ b/framework/base/src/types/interaction/system_proxy/builtin_func_proxy.rs
@@ -161,7 +161,7 @@ where
         hash: &ManagedBuffer<Env::Api>,
         attributes: &T,
         uris: &ManagedVec<Env::Api, ManagedBuffer<Env::Api>>,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxProxyCall<Env, From, To, Gas, u64> {
         let mut arg_buffer = ManagedArgBuffer::new();
         arg_buffer.push_arg(token);
         arg_buffer.push_arg(amount);

From 615c0fbf2d5624fca1fb9e7a5a0a3876dacce19d Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 9 Apr 2024 13:20:17 +0300
Subject: [PATCH 0676/1254] builtin func proxy small optimization

---
 .../system_proxy/builtin_func_proxy.rs        | 40 +++++++++----------
 1 file changed, 19 insertions(+), 21 deletions(-)

diff --git a/framework/base/src/types/interaction/system_proxy/builtin_func_proxy.rs b/framework/base/src/types/interaction/system_proxy/builtin_func_proxy.rs
index df94d09dc9..77dec351c5 100644
--- a/framework/base/src/types/interaction/system_proxy/builtin_func_proxy.rs
+++ b/framework/base/src/types/interaction/system_proxy/builtin_func_proxy.rs
@@ -123,18 +123,17 @@ where
         nft_nonce: u64,
         new_uris: &ManagedVec<Env::Api, ManagedBuffer<Env::Api>>,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
-        let mut arg_buffer = ManagedArgBuffer::new();
-        arg_buffer.push_arg(token_id);
-        arg_buffer.push_arg(nft_nonce);
+        let mut tx = self
+            .wrapped_tx
+            .raw_call(ESDT_NFT_ADD_URI_FUNC_NAME)
+            .argument(token_id)
+            .argument(&nft_nonce);
 
         for uri in new_uris {
-            arg_buffer.push_arg(uri);
+            tx = tx.argument(&uri);
         }
 
-        self.wrapped_tx
-            .raw_call(ESDT_NFT_ADD_URI_FUNC_NAME)
-            .arguments_raw(arg_buffer)
-            .original_result()
+        tx.original_result()
     }
 
     pub fn nft_update_attributes<T: codec::TopEncode>(
@@ -162,28 +161,27 @@ where
         attributes: &T,
         uris: &ManagedVec<Env::Api, ManagedBuffer<Env::Api>>,
     ) -> TxProxyCall<Env, From, To, Gas, u64> {
-        let mut arg_buffer = ManagedArgBuffer::new();
-        arg_buffer.push_arg(token);
-        arg_buffer.push_arg(amount);
-        arg_buffer.push_arg(name);
-        arg_buffer.push_arg(royalties);
-        arg_buffer.push_arg(hash);
-        arg_buffer.push_arg(attributes);
+        let mut tx = self
+            .wrapped_tx
+            .raw_call(ESDT_NFT_CREATE_FUNC_NAME)
+            .argument(token)
+            .argument(amount)
+            .argument(name)
+            .argument(royalties)
+            .argument(hash)
+            .argument(attributes);
 
         if uris.is_empty() {
             // at least one URI is required, so we push an empty one
-            arg_buffer.push_arg(codec::Empty);
+            tx = tx.argument(&codec::Empty);
         } else {
             // The API function has the last argument as variadic,
             // so we top-encode each and send as separate argument
             for uri in uris {
-                arg_buffer.push_arg(uri);
+                tx = tx.argument(&uri);
             }
         }
 
-        self.wrapped_tx
-            .raw_call(ESDT_NFT_CREATE_FUNC_NAME)
-            .arguments_raw(arg_buffer)
-            .original_result()
+        tx.original_result()
     }
 }

From aaaf7d68e238c4e31de946518097e1aca28eca04 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Tue, 9 Apr 2024 15:25:56 +0300
Subject: [PATCH 0677/1254] fmt TxProxy - rustfmt skip on enums that contain
 struct as variant

---
 .../examples/multisig/src/multisig_proxy.rs   |  1 +
 .../feature-tests/abi-tester/src/abi_proxy.rs |  2 ++
 .../generate_proxy/proxy_generator.rs         | 19 +++++++++++++++++++
 3 files changed, 22 insertions(+)

diff --git a/contracts/examples/multisig/src/multisig_proxy.rs b/contracts/examples/multisig/src/multisig_proxy.rs
index 4dca7b99db..616fb88be5 100644
--- a/contracts/examples/multisig/src/multisig_proxy.rs
+++ b/contracts/examples/multisig/src/multisig_proxy.rs
@@ -501,6 +501,7 @@ where
     pub signers: ManagedVec<Api, ManagedAddress<Api>>,
 }
 
+#[rustfmt::skip]
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, Clone)]
 pub enum Action<Api>
 where
diff --git a/contracts/feature-tests/abi-tester/src/abi_proxy.rs b/contracts/feature-tests/abi-tester/src/abi_proxy.rs
index eb5d717025..b5b4b931c2 100644
--- a/contracts/feature-tests/abi-tester/src/abi_proxy.rs
+++ b/contracts/feature-tests/abi-tester/src/abi_proxy.rs
@@ -409,6 +409,7 @@ pub struct OnlyShowsUpAsNested02 {
     pub something: [u8; 0],
 }
 
+#[rustfmt::skip]
 #[derive(TopEncode, TopDecode)]
 pub enum AbiEnum {
     Nothing,
@@ -501,6 +502,7 @@ pub enum ExplicitDiscriminant {
     FiftyOne,
 }
 
+#[rustfmt::skip]
 #[derive(TopEncode, TopDecode)]
 pub enum ExplicitDiscriminantMixed {
     Zero,
diff --git a/framework/meta/src/cmd/contract/generate_proxy/proxy_generator.rs b/framework/meta/src/cmd/contract/generate_proxy/proxy_generator.rs
index 68f2554ab4..532f08ada3 100644
--- a/framework/meta/src/cmd/contract/generate_proxy/proxy_generator.rs
+++ b/framework/meta/src/cmd/contract/generate_proxy/proxy_generator.rs
@@ -437,6 +437,11 @@ where
         type_description: &TypeDescription,
         name: &str,
     ) {
+        if self.enum_contains_struct_variant(enum_variants) {
+            self.writeln("");
+            self.write(format!("#[rustfmt::skip]"));
+        }
+
         self.start_write_type("enum", type_description, name);
 
         if enum_variants.is_empty() {
@@ -605,6 +610,20 @@ where
 
         processed_paths
     }
+
+    fn enum_contains_struct_variant(&self, enum_variants: &Vec<EnumVariantDescription>) -> bool {
+        for variant in enum_variants {
+            if variant.fields.is_empty() {
+                continue;
+            }
+
+            if variant.fields[0].name != ZERO {
+                return true;
+            }
+        }
+
+        false
+    }
 }
 
 #[cfg(test)]

From 56500de69515eb4c8f0ebc7660c7b6f0eb00d491 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Tue, 9 Apr 2024 15:34:20 +0300
Subject: [PATCH 0678/1254] fmt TxProxy - fix clippy

---
 .../meta/src/cmd/contract/generate_proxy/proxy_generator.rs     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/framework/meta/src/cmd/contract/generate_proxy/proxy_generator.rs b/framework/meta/src/cmd/contract/generate_proxy/proxy_generator.rs
index 532f08ada3..e66da1e45d 100644
--- a/framework/meta/src/cmd/contract/generate_proxy/proxy_generator.rs
+++ b/framework/meta/src/cmd/contract/generate_proxy/proxy_generator.rs
@@ -439,7 +439,7 @@ where
     ) {
         if self.enum_contains_struct_variant(enum_variants) {
             self.writeln("");
-            self.write(format!("#[rustfmt::skip]"));
+            self.write(r#"#[rustfmt::skip]"#);
         }
 
         self.start_write_type("enum", type_description, name);

From 354e5bbcbe9e95e6d31293610ae32a37e595f107 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Tue, 9 Apr 2024 15:49:46 +0300
Subject: [PATCH 0679/1254] fmt TxProxy - aggregate 2 write lines into 1

---
 .../meta/src/cmd/contract/generate_proxy/proxy_generator.rs    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/framework/meta/src/cmd/contract/generate_proxy/proxy_generator.rs b/framework/meta/src/cmd/contract/generate_proxy/proxy_generator.rs
index e66da1e45d..82f37cdfba 100644
--- a/framework/meta/src/cmd/contract/generate_proxy/proxy_generator.rs
+++ b/framework/meta/src/cmd/contract/generate_proxy/proxy_generator.rs
@@ -438,8 +438,7 @@ where
         name: &str,
     ) {
         if self.enum_contains_struct_variant(enum_variants) {
-            self.writeln("");
-            self.write(r#"#[rustfmt::skip]"#);
+            self.write("\n#[rustfmt::skip]");
         }
 
         self.start_write_type("enum", type_description, name);

From 718acb5c4934f924440002a3c97559ece080947e Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Tue, 9 Apr 2024 15:38:06 +0200
Subject: [PATCH 0680/1254] partial test fix

---
 .../scenarios/forw_raw_init_sync_echo.scen.json              | 5 +----
 .../composability/scenarios/forw_raw_sync_readonly.scen.json | 5 +----
 .../scenarios/forw_raw_sync_same_context.scen.json           | 5 +----
 3 files changed, 3 insertions(+), 12 deletions(-)

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 2c1bc8dff7..085233e5a9 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
@@ -37,10 +37,7 @@
                 "gasPrice": "0"
             },
             "expect": {
-                "out": [
-                    "1",
-                    "2"
-                ],
+                "out": [],
                 "status": "",
                 "logs": [
                     {
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 f1b53d61ea..0da08b7c08 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
@@ -37,10 +37,7 @@
                 "gasPrice": "0"
             },
             "expect": {
-                "out": [
-                    "1",
-                    "2"
-                ],
+                "out": [],
                 "status": "",
                 "gas": "*",
                 "refund": "*"
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 08b6b3349b..ff8b81238c 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
@@ -38,10 +38,7 @@
                 "gasPrice": "0"
             },
             "expect": {
-                "out": [
-                    "1",
-                    "2"
-                ],
+                "out": [],
                 "status": "",
                 "logs": [
                     {

From 4feff9a9958a48afc0c2b0b766123a1a84642400 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 9 Apr 2024 15:08:25 +0300
Subject: [PATCH 0681/1254] imports - base framework cleanup

---
 framework/base/src/imports_reexport.rs        | 41 +++++++++++++++++
 framework/base/src/lib.rs                     | 44 ++-----------------
 .../system_proxy/builtin_func_proxy.rs        | 19 +++++---
 .../system_proxy/legacy_system_sc_proxy.rs    |  5 +--
 framework/base/src/types/interaction/tx.rs    | 10 ++---
 .../interaction/tx_exec/tx_exec_async.rs      |  7 ++-
 .../tx_exec/tx_exec_async_promises.rs         |  5 +--
 .../wrapped/traits/fixed_token_supply.rs      |  5 ++-
 .../types/managed/wrapped/traits/mergeable.rs |  5 ++-
 9 files changed, 78 insertions(+), 63 deletions(-)
 create mode 100644 framework/base/src/imports_reexport.rs

diff --git a/framework/base/src/imports_reexport.rs b/framework/base/src/imports_reexport.rs
new file mode 100644
index 0000000000..710bd8bbf3
--- /dev/null
+++ b/framework/base/src/imports_reexport.rs
@@ -0,0 +1,41 @@
+/// Conveniently groups all framework imports required by a smart contract form the framework.
+pub mod imports {
+    pub use crate::{
+        abi::TypeAbi,
+        api::{ErrorApiImpl, ManagedTypeApi, VMApi},
+        arrayvec::ArrayVec,
+        codec::{
+            multi_types::*, CodecFrom, CodecFromSelf, CodecInto, DecodeError, IntoMultiValue,
+            NestedDecode, NestedEncode, TopDecode, TopEncode,
+        },
+        contract_base::{ContractBase, ProxyObjBase, ProxyObjNew},
+        err_msg,
+        io::*,
+        non_zero_usize,
+        non_zero_util::*,
+        require, sc_format, sc_panic, sc_print,
+        storage::mappers::*,
+        types::{system_proxy::*, *},
+    };
+    pub use core::ops::{
+        Add, AddAssign, BitAnd, BitAndAssign, BitOr, BitOrAssign, BitXor, BitXorAssign, Div,
+        DivAssign, Mul, MulAssign, Rem, RemAssign, Shl, ShlAssign, Shr, ShrAssign, Sub, SubAssign,
+    };
+}
+
+/// Conveniently groups all imports required for deriving framework-related traits for types.
+pub mod derive_imports {
+    pub use crate::{
+        codec,
+        codec::derive::{
+            NestedDecode, NestedEncode, TopDecode, TopDecodeOrDefault, TopEncode,
+            TopEncodeOrDefault,
+        },
+        derive::{type_abi, ManagedVecItem, TypeAbi},
+    };
+}
+
+/// Conveniently groups all imports required for generated proxies.
+pub mod proxy_imports {
+    pub use super::{derive_imports::*, imports::*};
+}
diff --git a/framework/base/src/lib.rs b/framework/base/src/lib.rs
index 3d2fa0f9e5..b5aaecd378 100644
--- a/framework/base/src/lib.rs
+++ b/framework/base/src/lib.rs
@@ -38,44 +38,6 @@ pub use hex_call_data::*;
 pub use hex_literal;
 pub use storage::{storage_clear, storage_get, storage_get_len, storage_set};
 
-/// Conveniently groups all framework imports required by a smart contract form the framework.
-pub mod imports {
-    pub use crate::{
-        abi::TypeAbi,
-        api::{ErrorApiImpl, ManagedTypeApi, VMApi},
-        arrayvec::ArrayVec,
-        codec::{
-            multi_types::*, CodecFrom, CodecFromSelf, CodecInto, DecodeError, IntoMultiValue,
-            NestedDecode, NestedEncode, TopDecode, TopEncode,
-        },
-        contract_base::{ContractBase, ProxyObjBase, ProxyObjNew},
-        err_msg,
-        io::*,
-        non_zero_usize,
-        non_zero_util::*,
-        require, sc_format, sc_panic, sc_print,
-        storage::mappers::*,
-        types::{system_proxy::*, *},
-    };
-    pub use core::ops::{
-        Add, AddAssign, BitAnd, BitAndAssign, BitOr, BitOrAssign, BitXor, BitXorAssign, Div,
-        DivAssign, Mul, MulAssign, Rem, RemAssign, Shl, ShlAssign, Shr, ShrAssign, Sub, SubAssign,
-    };
-}
-
-/// Conveniently groups all imports required for deriving framework-related traits for types.
-pub mod derive_imports {
-    pub use crate::{
-        codec,
-        codec::derive::{
-            NestedDecode, NestedEncode, TopDecode, TopDecodeOrDefault, TopEncode,
-            TopEncodeOrDefault,
-        },
-        derive::{type_abi, ManagedVecItem, TypeAbi},
-    };
-}
-
-/// Conveniently groups all imports required for generated proxies.
-pub mod proxy_imports {
-    pub use crate::{derive_imports::*, imports::*};
-}
+// not to be used internally
+mod imports_reexport;
+pub use imports_reexport::{derive_imports, imports, proxy_imports};
diff --git a/framework/base/src/types/interaction/system_proxy/builtin_func_proxy.rs b/framework/base/src/types/interaction/system_proxy/builtin_func_proxy.rs
index 77dec351c5..66a660a6d8 100644
--- a/framework/base/src/types/interaction/system_proxy/builtin_func_proxy.rs
+++ b/framework/base/src/types/interaction/system_proxy/builtin_func_proxy.rs
@@ -1,10 +1,19 @@
-use self::builtin_func_names::{
+use multiversx_sc_codec::{CodecInto, Empty, TopEncode};
+
+use crate::{
+    api::VMApi,
+    types::{
+        BigUint, ManagedAddress, ManagedBuffer, ManagedVec, TokenIdentifier, Tx, TxEnv, TxFrom,
+        TxGas, TxProxyCall, TxProxyTrait, TxTo,
+    },
+};
+
+use super::builtin_func_names::{
     CHANGE_OWNER_BUILTIN_FUNC_NAME, CLAIM_DEVELOPER_REWARDS_FUNC_NAME, DELETE_USERNAME_FUNC_NAME,
     ESDT_LOCAL_BURN_FUNC_NAME, ESDT_LOCAL_MINT_FUNC_NAME, ESDT_NFT_ADD_QUANTITY_FUNC_NAME,
     ESDT_NFT_ADD_URI_FUNC_NAME, ESDT_NFT_BURN_FUNC_NAME, ESDT_NFT_CREATE_FUNC_NAME,
     ESDT_NFT_UPDATE_ATTRIBUTES_FUNC_NAME, SET_USERNAME_FUNC_NAME,
 };
-use crate::proxy_imports::*;
 
 /// Proxy describing the user builtin function signatures.
 pub struct UserBuiltinProxy;
@@ -136,7 +145,7 @@ where
         tx.original_result()
     }
 
-    pub fn nft_update_attributes<T: codec::TopEncode>(
+    pub fn nft_update_attributes<T: TopEncode>(
         self,
         token_id: &TokenIdentifier<Env::Api>,
         nft_nonce: u64,
@@ -151,7 +160,7 @@ where
     }
 
     #[allow(clippy::too_many_arguments)]
-    pub fn esdt_nft_create<T: codec::TopEncode>(
+    pub fn esdt_nft_create<T: TopEncode>(
         self,
         token: &TokenIdentifier<Env::Api>,
         amount: &BigUint<Env::Api>,
@@ -173,7 +182,7 @@ where
 
         if uris.is_empty() {
             // at least one URI is required, so we push an empty one
-            tx = tx.argument(&codec::Empty);
+            tx = tx.argument(&Empty);
         } else {
             // The API function has the last argument as variadic,
             // so we top-encode each and send as separate argument
diff --git a/framework/base/src/types/interaction/system_proxy/legacy_system_sc_proxy.rs b/framework/base/src/types/interaction/system_proxy/legacy_system_sc_proxy.rs
index b161b28575..b784da1f8e 100644
--- a/framework/base/src/types/interaction/system_proxy/legacy_system_sc_proxy.rs
+++ b/framework/base/src/types/interaction/system_proxy/legacy_system_sc_proxy.rs
@@ -5,10 +5,9 @@ use hex_literal::hex;
 
 use crate::{
     api::{CallTypeApi, SendApi},
-    proxy_imports::ESDTSystemSCAddress,
     types::{
-        BigUint, ContractCall, ContractCallNoPayment, ContractCallWithEgld, EsdtLocalRole,
-        EsdtTokenType, ManagedAddress, ManagedBuffer, TokenIdentifier,
+        BigUint, ContractCall, ContractCallNoPayment, ContractCallWithEgld, ESDTSystemSCAddress,
+        EsdtLocalRole, EsdtTokenType, ManagedAddress, ManagedBuffer, TokenIdentifier,
     },
 };
 
diff --git a/framework/base/src/types/interaction/tx.rs b/framework/base/src/types/interaction/tx.rs
index ccd88f65c1..75d565b97b 100644
--- a/framework/base/src/types/interaction/tx.rs
+++ b/framework/base/src/types/interaction/tx.rs
@@ -1,11 +1,11 @@
 use crate::{
-    api::CallTypeApi,
+    api::{CallTypeApi, ManagedTypeApi},
     contract_base::BlockchainWrapper,
-    proxy_imports::{EgldOrEsdtTokenIdentifier, EgldOrEsdtTokenPaymentRefs, ManagedTypeApi},
     types::{
-        BigUint, CodeMetadata, EgldOrEsdtTokenPayment, EgldOrMultiEsdtPayment,
-        EgldOrMultiEsdtPaymentRefs, EsdtTokenPayment, EsdtTokenPaymentRefs, ManagedAddress,
-        ManagedBuffer, ManagedOption, ManagedVec, MultiEsdtPayment, TokenIdentifier,
+        BigUint, CodeMetadata, EgldOrEsdtTokenIdentifier, EgldOrEsdtTokenPayment,
+        EgldOrEsdtTokenPaymentRefs, EgldOrMultiEsdtPayment, EgldOrMultiEsdtPaymentRefs,
+        EsdtTokenPayment, EsdtTokenPaymentRefs, ManagedAddress, ManagedBuffer, ManagedOption,
+        ManagedVec, MultiEsdtPayment, TokenIdentifier,
     },
 };
 
diff --git a/framework/base/src/types/interaction/tx_exec/tx_exec_async.rs b/framework/base/src/types/interaction/tx_exec/tx_exec_async.rs
index 6973e1ef5b..0e883eca3a 100644
--- a/framework/base/src/types/interaction/tx_exec/tx_exec_async.rs
+++ b/framework/base/src/types/interaction/tx_exec/tx_exec_async.rs
@@ -1,11 +1,10 @@
 use crate::{
     api::{CallTypeApi, StorageWriteApi},
     contract_base::SendRawWrapper,
-    proxy_imports::{ExplicitGas, ManagedBuffer, TxGasValue},
     types::{
-        CallbackClosure, OriginalResultMarker, Tx, TxData, TxDataFunctionCall,
-        TxEmptyResultHandler, TxEnv, TxFrom, TxGas, TxPayment, TxResultHandler, TxScEnv, TxTo,
-        TxToSpecified,
+        CallbackClosure, ExplicitGas, ManagedBuffer, OriginalResultMarker, Tx, TxData,
+        TxDataFunctionCall, TxEmptyResultHandler, TxEnv, TxFrom, TxGas, TxGasValue, TxPayment,
+        TxResultHandler, TxScEnv, TxTo, TxToSpecified,
     },
 };
 
diff --git a/framework/base/src/types/interaction/tx_exec/tx_exec_async_promises.rs b/framework/base/src/types/interaction/tx_exec/tx_exec_async_promises.rs
index c795a4385b..4b6fadc102 100644
--- a/framework/base/src/types/interaction/tx_exec/tx_exec_async_promises.rs
+++ b/framework/base/src/types/interaction/tx_exec/tx_exec_async_promises.rs
@@ -1,11 +1,10 @@
 use crate::{
     api::{const_handles, CallTypeApi},
     contract_base::SendRawWrapper,
-    proxy_imports::GasLeft,
     types::{
         interaction::callback_closure::CallbackClosureWithGas, CallbackClosure, ExplicitGas,
-        FunctionCall, ManagedBuffer, ManagedType, OriginalResultMarker, Tx, TxGas, TxGasValue,
-        TxPayment, TxResultHandler, TxScEnv, TxToSpecified,
+        FunctionCall, GasLeft, ManagedBuffer, ManagedType, OriginalResultMarker, Tx, TxGas,
+        TxGasValue, TxPayment, TxResultHandler, TxScEnv, TxToSpecified,
     },
 };
 
diff --git a/framework/base/src/types/managed/wrapped/traits/fixed_token_supply.rs b/framework/base/src/types/managed/wrapped/traits/fixed_token_supply.rs
index 838486c203..0b94cbbf6b 100644
--- a/framework/base/src/types/managed/wrapped/traits/fixed_token_supply.rs
+++ b/framework/base/src/types/managed/wrapped/traits/fixed_token_supply.rs
@@ -1,4 +1,7 @@
-use crate::imports::{BigUint, ErrorApiImpl, ManagedTypeApi};
+use crate::{
+    api::{ErrorApiImpl, ManagedTypeApi},
+    types::BigUint,
+};
 
 pub trait FixedSupplyToken<M: ManagedTypeApi> {
     fn get_total_supply(&self) -> BigUint<M>;
diff --git a/framework/base/src/types/managed/wrapped/traits/mergeable.rs b/framework/base/src/types/managed/wrapped/traits/mergeable.rs
index 2ed714973a..51298ba130 100644
--- a/framework/base/src/types/managed/wrapped/traits/mergeable.rs
+++ b/framework/base/src/types/managed/wrapped/traits/mergeable.rs
@@ -1,4 +1,7 @@
-use crate::imports::{ErrorApiImpl, EsdtTokenPayment, ManagedTypeApi, ManagedVec, ManagedVecItem};
+use crate::{
+    api::{ErrorApiImpl, ManagedTypeApi},
+    types::{EsdtTokenPayment, ManagedVec, ManagedVecItem},
+};
 
 pub static CANNOT_MERGE_ERR_MSG: &[u8] = b"Cannot merge";
 

From 4ffca0ea5af3834bc0661e2820ff665cf0bd3bbe Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 9 Apr 2024 16:45:44 +0300
Subject: [PATCH 0682/1254] imports - scenario & snippets

---
 .../tests/linked_list_repeat_blackbox_test.rs |  3 +--
 .../tests/price_aggregator_blackbox_test.rs   | 12 ++-------
 .../tests/price_aggregator_stress_blackbox.rs | 12 ++-------
 .../tests/price_aggregator_whitebox_test.rs   |  5 +---
 .../adder/interact/src/basic_interact.rs      | 19 +++----------
 .../tests/adder_blackbox_chained_test.rs      |  5 ++--
 .../tests/adder_blackbox_legacy_proxy_test.rs |  8 +++---
 .../tests/adder_blackbox_raw_steps_test.rs    |  2 +-
 .../adder/tests/adder_blackbox_test.rs        |  5 ++--
 .../tests/adder_blackbox_upgrade_test.rs      |  2 +-
 .../adder/tests/adder_whitebox_test.rs        |  2 +-
 .../tests/crowdfunding_esdt_blackbox_test.rs  | 14 ++--------
 .../interact/src/multisig_interact.rs         | 18 ++-----------
 .../interact/src/multisig_interact_nfts.rs    |  8 +-----
 .../interact/src/multisig_interact_wegld.rs   | 13 +--------
 .../multisig/tests/multisig_blackbox_test.rs  | 19 +++----------
 .../multisig/tests/multisig_whitebox_test.rs  | 21 +--------------
 .../rewards_distribution_blackbox_test.rs     | 18 +------------
 .../feature-tests/abi-tester/src/abi_proxy.rs | 10 ++-----
 .../interact/src/bf_interact.rs               | 16 ++---------
 .../basic_features_managed_buffer_test.rs     |  3 +--
 .../tests/basic_features_managed_vec_test.rs  |  3 +--
 ...basic_features_ordered_binary_tree_test.rs |  6 ++---
 .../basic_features_token_identifier_test.rs   |  3 +--
 .../tests/forwarder_blackbox_test.rs          |  8 +-----
 .../tests/forwarder_whitebox_test.rs          |  9 +------
 .../src/call_tree_calling_functions.rs        | 13 +++------
 .../interact/src/call_tree_deploy.rs          | 14 ++--------
 .../interact/src/comp_interact_config.rs      |  6 ++---
 .../interact/src/comp_interact_controller.rs  | 12 ++-------
 .../interact/src/comp_interact_main.rs        |  6 +----
 .../tests/promises_feature_blackbox_test.rs   |  6 +----
 .../tests/transfer_role_blackbox_test.rs      | 10 +------
 .../tests/transfer_role_whitebox_test.rs      | 11 +-------
 .../tests/exchange_features_blackbox_test.rs  |  2 +-
 .../tests/pmf_blackbox_test.rs                |  4 +--
 .../tests/payable_blackbox_test.rs            |  2 +-
 .../interact-rs/src/interactor_main.rs        | 14 +---------
 .../tests/tester_blackbox_test.rs             |  4 +--
 .../tests/tester_whitebox_legacy_test.rs      | 15 +++--------
 .../tests/gov_module_whitebox_test.rs         |  9 +------
 .../tests/staking_module_whitebox_test.rs     |  9 +------
 .../tests/token_merge_module_whitebox_test.rs | 16 ++---------
 framework/base/src/imports_reexport.rs        |  4 +--
 .../generate_snippets/snippet_template_gen.rs | 14 +---------
 framework/scenario/src/facade.rs              |  5 ++--
 .../src/facade/{world_tx => }/expr.rs         |  0
 .../facade/{world_tx => }/expr/file_expr.rs   |  8 +-----
 .../facade/{world_tx => }/expr/mxsc_expr.rs   | 10 ++-----
 .../facade/{world_tx => }/expr/num_expr.rs    | 14 ++++------
 framework/scenario/src/facade/world_tx.rs     |  4 +--
 framework/scenario/src/imports.rs             | 27 +++++++++++++++++++
 framework/scenario/src/lib.rs                 |  5 +++-
 framework/snippets/src/imports.rs             |  6 +++++
 framework/snippets/src/lib.rs                 |  3 +++
 55 files changed, 125 insertions(+), 372 deletions(-)
 rename framework/scenario/src/facade/{world_tx => }/expr.rs (100%)
 rename framework/scenario/src/facade/{world_tx => }/expr/file_expr.rs (83%)
 rename framework/scenario/src/facade/{world_tx => }/expr/mxsc_expr.rs (78%)
 rename framework/scenario/src/facade/{world_tx => }/expr/num_expr.rs (73%)
 create mode 100644 framework/scenario/src/imports.rs
 create mode 100644 framework/snippets/src/imports.rs

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 47af800bb8..12fde7ba31 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
@@ -1,7 +1,6 @@
 use benchmark_common::ExampleStruct;
 use linked_list_repeat::ProxyTrait;
-use multiversx_sc::types::{MultiValueEncoded, TokenIdentifier};
-use multiversx_sc_scenario::{api::StaticApi, scenario_model::*, *};
+use multiversx_sc_scenario::imports::*;
 
 const WASM_PATH_EXPR: &str = "mxsc:output/linked-list-repeat.mxsc.json";
 
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 b1b28e4fcf..cc2dc7b994 100644
--- a/contracts/core/price-aggregator/tests/price_aggregator_blackbox_test.rs
+++ b/contracts/core/price-aggregator/tests/price_aggregator_blackbox_test.rs
@@ -2,17 +2,9 @@ use multiversx_price_aggregator_sc::{
     price_aggregator_data::{OracleStatus, TimestampedPrice, TokenPair},
     ContractObj, PriceAggregator, ProxyTrait as _, MAX_ROUND_DURATION_SECONDS,
 };
-use multiversx_sc::{
-    codec::multi_types::MultiValueVec,
-    types::{Address, EgldOrEsdtTokenIdentifier},
-};
 use multiversx_sc_modules::{pause::ProxyTrait, staking::ProxyTrait as _};
-use multiversx_sc_scenario::{
-    api::StaticApi,
-    managed_address, managed_biguint, managed_buffer,
-    scenario_model::{Account, AddressValue, ScCallStep, ScDeployStep, SetStateStep, TxExpect},
-    ContractInfo, DebugApi, ScenarioWorld, WhiteboxContract,
-};
+
+use multiversx_sc_scenario::imports::*;
 
 const DECIMALS: u8 = 0;
 const EGLD_TICKER: &[u8] = b"EGLD";
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 1170a4d964..44650679d3 100644
--- a/contracts/core/price-aggregator/tests/price_aggregator_stress_blackbox.rs
+++ b/contracts/core/price-aggregator/tests/price_aggregator_stress_blackbox.rs
@@ -2,17 +2,9 @@ use multiversx_price_aggregator_sc::{
     price_aggregator_data::{OracleStatus, TokenPair},
     ContractObj, PriceAggregator, ProxyTrait as _,
 };
-use multiversx_sc::{
-    codec::multi_types::MultiValueVec, contract_base::ContractBase,
-    types::EgldOrEsdtTokenIdentifier,
-};
 use multiversx_sc_modules::{pause::ProxyTrait, staking::ProxyTrait as _};
-use multiversx_sc_scenario::{
-    api::StaticApi,
-    managed_address, managed_buffer,
-    scenario_model::{Account, AddressValue, ScCallStep, ScDeployStep, SetStateStep},
-    ContractInfo, DebugApi, ScenarioWorld, WhiteboxContract,
-};
+
+use multiversx_sc_scenario::imports::*;
 
 const DECIMALS: u8 = 0;
 const EGLD_TICKER: &[u8] = b"EGLD";
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 a2a432127e..50b05a6a41 100644
--- a/contracts/core/price-aggregator/tests/price_aggregator_whitebox_test.rs
+++ b/contracts/core/price-aggregator/tests/price_aggregator_whitebox_test.rs
@@ -2,14 +2,11 @@ use multiversx_price_aggregator_sc::{
     price_aggregator_data::{OracleStatus, TimestampedPrice, TokenPair},
     PriceAggregator, MAX_ROUND_DURATION_SECONDS,
 };
-use multiversx_sc::types::{EgldOrEsdtTokenIdentifier, MultiValueEncoded};
 use multiversx_sc_modules::{
     pause::EndpointWrappers as PauseEndpointWrappers,
     staking::EndpointWrappers as StakingEndpointWrappers,
 };
-use multiversx_sc_scenario::{
-    managed_address, managed_biguint, managed_buffer, scenario_model::*, WhiteboxContract, *,
-};
+use multiversx_sc_scenario::imports::*;
 
 pub const DECIMALS: u8 = 0;
 pub const EGLD_TICKER: &[u8] = b"EGLD";
diff --git a/contracts/examples/adder/interact/src/basic_interact.rs b/contracts/examples/adder/interact/src/basic_interact.rs
index 6f3d8dbb07..4fc748c95e 100644
--- a/contracts/examples/adder/interact/src/basic_interact.rs
+++ b/contracts/examples/adder/interact/src/basic_interact.rs
@@ -6,21 +6,8 @@ use adder::adder_proxy;
 use basic_interact_config::Config;
 use basic_interact_state::State;
 use clap::Parser;
-use multiversx_sc_snippets::{
-    env_logger,
-    multiversx_sc::types::{Address, ReturnsNewAddress, ReturnsResultConv},
-    multiversx_sc_scenario::{
-        api::StaticApi,
-        bech32,
-        mandos_system::ScenarioRunner,
-        num_bigint::BigUint,
-        scenario_format::interpret_trait::{InterpretableFrom, InterpreterContext},
-        scenario_model::{BytesValue, Scenario},
-        standalone::retrieve_account_as_scenario_set_state,
-        test_wallets, ContractInfo, NumExpr, WithRawTxResponse,
-    },
-    tokio, Interactor, InteractorPrepareAsync,
-};
+
+use multiversx_sc_snippets::imports::*;
 
 const INTERACTOR_SCENARIO_TRACE_PATH: &str = "interactor_trace.scen.json";
 
@@ -189,7 +176,7 @@ impl AdderInteract {
             .to(self.state.adder().to_address())
             .typed(adder_proxy::AdderProxy)
             .sum()
-            .returns(ReturnsResultConv::<BigUint>::new())
+            .returns(ReturnsResultConv::<RustBigUint>::new())
             .prepare_async()
             .run()
             .await;
diff --git a/contracts/examples/adder/tests/adder_blackbox_chained_test.rs b/contracts/examples/adder/tests/adder_blackbox_chained_test.rs
index 05b95ba905..b10b3e3a54 100644
--- a/contracts/examples/adder/tests/adder_blackbox_chained_test.rs
+++ b/contracts/examples/adder/tests/adder_blackbox_chained_test.rs
@@ -1,6 +1,7 @@
+use multiversx_sc_scenario::imports::*;
+use num_bigint::BigUint;
+
 use adder::*;
-use multiversx_sc::types::{AddressExpr, ScExpr, WithNewAddress, WithResultConv};
-use multiversx_sc_scenario::{api::StaticApi, num_bigint::BigUint, scenario_model::*, *};
 
 const ADDER_PATH_EXPR: &str = "mxsc:output/adder.mxsc.json";
 
diff --git a/contracts/examples/adder/tests/adder_blackbox_legacy_proxy_test.rs b/contracts/examples/adder/tests/adder_blackbox_legacy_proxy_test.rs
index 1370a064fc..e3a2540386 100644
--- a/contracts/examples/adder/tests/adder_blackbox_legacy_proxy_test.rs
+++ b/contracts/examples/adder/tests/adder_blackbox_legacy_proxy_test.rs
@@ -1,9 +1,7 @@
+use multiversx_sc_scenario::imports::*;
+use num_bigint::BigUint;
+
 use adder::*;
-use multiversx_sc::{
-    storage::mappers::SingleValue,
-    types::{AddressExpr, ReturnsResultConv, WithNewAddress},
-};
-use multiversx_sc_scenario::{api::StaticApi, num_bigint::BigUint, scenario_model::*, *};
 
 const ADDER_PATH_EXPR: &str = "mxsc:output/adder.mxsc.json";
 
diff --git a/contracts/examples/adder/tests/adder_blackbox_raw_steps_test.rs b/contracts/examples/adder/tests/adder_blackbox_raw_steps_test.rs
index 92dba83b12..a88e4eb9b6 100644
--- a/contracts/examples/adder/tests/adder_blackbox_raw_steps_test.rs
+++ b/contracts/examples/adder/tests/adder_blackbox_raw_steps_test.rs
@@ -1,4 +1,4 @@
-use multiversx_sc_scenario::{scenario_model::*, *};
+use multiversx_sc_scenario::imports::*;
 
 const ADDER_PATH_EXPR: &str = "mxsc:output/adder.mxsc.json";
 
diff --git a/contracts/examples/adder/tests/adder_blackbox_test.rs b/contracts/examples/adder/tests/adder_blackbox_test.rs
index ec98935ba4..6a3142a207 100644
--- a/contracts/examples/adder/tests/adder_blackbox_test.rs
+++ b/contracts/examples/adder/tests/adder_blackbox_test.rs
@@ -1,6 +1,7 @@
+use multiversx_sc_scenario::imports::*;
+use num_bigint::BigUint;
+
 use adder::*;
-use multiversx_sc::types::{AddressExpr, ReturnsResultConv, ScExpr, WithNewAddress};
-use multiversx_sc_scenario::{api::StaticApi, num_bigint::BigUint, scenario_model::*, *};
 
 const ADDER_PATH_EXPR: &str = "mxsc:output/adder.mxsc.json";
 
diff --git a/contracts/examples/adder/tests/adder_blackbox_upgrade_test.rs b/contracts/examples/adder/tests/adder_blackbox_upgrade_test.rs
index 4cb12cad54..5a38f7c5df 100644
--- a/contracts/examples/adder/tests/adder_blackbox_upgrade_test.rs
+++ b/contracts/examples/adder/tests/adder_blackbox_upgrade_test.rs
@@ -1,4 +1,4 @@
-use multiversx_sc_scenario::{scenario_model::*, *};
+use multiversx_sc_scenario::imports::*;
 
 const ADDER_PATH_EXPR: &str = "mxsc:output/adder.mxsc.json";
 
diff --git a/contracts/examples/adder/tests/adder_whitebox_test.rs b/contracts/examples/adder/tests/adder_whitebox_test.rs
index d068aa1b1d..50ad95faa6 100644
--- a/contracts/examples/adder/tests/adder_whitebox_test.rs
+++ b/contracts/examples/adder/tests/adder_whitebox_test.rs
@@ -1,5 +1,5 @@
 use adder::*;
-use multiversx_sc_scenario::{scenario_model::*, *};
+use multiversx_sc_scenario::imports::*;
 
 const ADDER_PATH_EXPR: &str = "mxsc:output/adder.mxsc.json";
 
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 c6387e5c43..5dceba3659 100644
--- a/contracts/examples/crowdfunding-esdt/tests/crowdfunding_esdt_blackbox_test.rs
+++ b/contracts/examples/crowdfunding-esdt/tests/crowdfunding_esdt_blackbox_test.rs
@@ -1,16 +1,6 @@
 use crowdfunding_esdt::{ProxyTrait as _, Status};
-use multiversx_sc::{
-    storage::mappers::SingleValue,
-    types::{Address, EgldOrEsdtTokenIdentifier},
-};
-use multiversx_sc_scenario::{
-    api::StaticApi,
-    scenario_model::{
-        Account, AddressValue, CheckAccount, CheckStateStep, ScCallStep, ScDeployStep, ScQueryStep,
-        SetStateStep, TxExpect,
-    },
-    ContractInfo, ScenarioWorld,
-};
+
+use multiversx_sc_scenario::imports::*;
 use num_bigint::BigUint;
 
 const CF_DEADLINE: u64 = 7 * 24 * 60 * 60; // 1 week in seconds
diff --git a/contracts/examples/multisig/interact/src/multisig_interact.rs b/contracts/examples/multisig/interact/src/multisig_interact.rs
index 65b6c0dbb1..9148af2e86 100644
--- a/contracts/examples/multisig/interact/src/multisig_interact.rs
+++ b/contracts/examples/multisig/interact/src/multisig_interact.rs
@@ -8,22 +8,8 @@ use clap::Parser;
 use multisig::multisig_proxy;
 use multisig_interact_config::Config;
 use multisig_interact_state::State;
-use multiversx_sc_scenario::{
-    mandos_system::ScenarioRunner,
-    multiversx_sc::types::{BigUint, ReturnsNewAddress, ReturnsResult},
-    scenario_format::interpret_trait::InterpretableFrom,
-    standalone::retrieve_account_as_scenario_set_state,
-    test_wallets, NumExpr,
-};
-use multiversx_sc_snippets::{
-    dns_address_for_name, env_logger,
-    multiversx_sc::{codec::multi_types::MultiValueVec, types::Address},
-    multiversx_sc_scenario::{
-        api::StaticApi, bech32, scenario_format::interpret_trait::InterpreterContext,
-        scenario_model::*, ContractInfo,
-    },
-    tokio, Interactor, InteractorPrepareAsync,
-};
+
+use multiversx_sc_snippets::imports::*;
 
 const SYSTEM_SC_BECH32: &str = "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u";
 const INTERACTOR_SCENARIO_TRACE_PATH: &str = "interactor_trace.scen.json";
diff --git a/contracts/examples/multisig/interact/src/multisig_interact_nfts.rs b/contracts/examples/multisig/interact/src/multisig_interact_nfts.rs
index 61788f99af..e7fb0104af 100644
--- a/contracts/examples/multisig/interact/src/multisig_interact_nfts.rs
+++ b/contracts/examples/multisig/interact/src/multisig_interact_nfts.rs
@@ -1,12 +1,6 @@
 use std::time::Duration;
 
-use multiversx_sc_scenario::{
-    multiversx_sc::{
-        codec::Empty,
-        types::{FunctionCall, ReturnsResult},
-    },
-    NumExpr, ReturnsNewTokenIdentifier,
-};
+use multiversx_sc_snippets::imports::*;
 
 use super::*;
 
diff --git a/contracts/examples/multisig/interact/src/multisig_interact_wegld.rs b/contracts/examples/multisig/interact/src/multisig_interact_wegld.rs
index b267f17357..fbfdd6f4a6 100644
--- a/contracts/examples/multisig/interact/src/multisig_interact_wegld.rs
+++ b/contracts/examples/multisig/interact/src/multisig_interact_wegld.rs
@@ -1,17 +1,6 @@
 use std::time::Duration;
 
-use multiversx_sc_scenario::{
-    multiversx_sc::types::{FunctionCall, ManagedAddress, ReturnsResult},
-    NumExpr,
-};
-#[allow(unused_imports)]
-use multiversx_sc_snippets::multiversx_sc::types::{
-    EsdtTokenPayment, MultiValueEncoded, TokenIdentifier,
-};
-use multiversx_sc_snippets::multiversx_sc_scenario::{
-    mandos_system::ScenarioRunner, scenario_format::interpret_trait::InterpretableFrom,
-    standalone::retrieve_account_as_scenario_set_state,
-};
+use multiversx_sc_snippets::imports::*;
 
 use super::*;
 
diff --git a/contracts/examples/multisig/tests/multisig_blackbox_test.rs b/contracts/examples/multisig/tests/multisig_blackbox_test.rs
index 7107a6628e..691c2750db 100644
--- a/contracts/examples/multisig/tests/multisig_blackbox_test.rs
+++ b/contracts/examples/multisig/tests/multisig_blackbox_test.rs
@@ -1,24 +1,11 @@
+use multiversx_sc::codec::top_encode_to_vec_u8_or_panic;
+use multiversx_sc_scenario::imports::*;
+
 use adder::ProxyTrait as _;
 use multisig::{
     multisig_perform::ProxyTrait as _, multisig_propose::ProxyTrait as _, user_role::UserRole,
     ProxyTrait as _,
 };
-use multiversx_sc::{
-    codec::{
-        multi_types::{MultiValueVec, OptionalValue},
-        test_util::top_encode_to_vec_u8_or_panic,
-    },
-    storage::mappers::SingleValue,
-    types::{Address, AddressExpr, CodeMetadata, FunctionCall, ReturnsResult},
-};
-use multiversx_sc_scenario::{
-    api::StaticApi,
-    scenario_model::{
-        Account, AddressValue, CheckAccount, CheckStateStep, ScCallStep, ScDeployStep, ScQueryStep,
-        SetStateStep, TxExpect,
-    },
-    ContractInfo, ScenarioTxRun, ScenarioWorld,
-};
 use num_bigint::BigUint;
 
 const ADDER_ADDRESS_EXPR: &str = "sc:adder";
diff --git a/contracts/examples/multisig/tests/multisig_whitebox_test.rs b/contracts/examples/multisig/tests/multisig_whitebox_test.rs
index 227c012bc7..456fc9f96f 100644
--- a/contracts/examples/multisig/tests/multisig_whitebox_test.rs
+++ b/contracts/examples/multisig/tests/multisig_whitebox_test.rs
@@ -1,5 +1,6 @@
 #![allow(unused)]
 
+use multiversx_sc_scenario::imports::*;
 use std::borrow::Borrow;
 
 use adder::Adder;
@@ -8,26 +9,6 @@ use multisig::{
     multisig_perform::MultisigPerformModule, multisig_propose::MultisigProposeModule,
     user_role::UserRole, Multisig,
 };
-use multiversx_sc::{
-    api::ManagedTypeApi,
-    codec::multi_types::OptionalValue,
-    storage::mappers::SingleValue,
-    types::{
-        Address, BigUint, BoxedBytes, CodeMetadata, FunctionCall, ManagedAddress, ManagedBuffer,
-        ManagedVec,
-    },
-};
-use multiversx_sc_scenario::{
-    managed_address, managed_biguint,
-    multiversx_chain_vm::types::VMAddress,
-    rust_biguint,
-    scenario_model::{
-        Account, AddressValue, CheckAccount, CheckStateStep, ScCallStep, ScDeployStep, ScQueryStep,
-        SetStateStep, TxExpect, TypedScQuery,
-    },
-    testing_framework::TxResult,
-    DebugApi, ScenarioWorld, WhiteboxContract,
-};
 
 const OWNER_ADDRESS_EXPR: &str = "address:owner";
 const PROPOSER_ADDRESS_EXPR: &str = "address:proposer";
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 2902c7832c..4380f0122f 100644
--- a/contracts/examples/rewards-distribution/tests/rewards_distribution_blackbox_test.rs
+++ b/contracts/examples/rewards-distribution/tests/rewards_distribution_blackbox_test.rs
@@ -1,25 +1,9 @@
 mod mock_seed_nft_minter;
 mod utils;
 
+use multiversx_sc_scenario::imports::*;
 use std::iter::zip;
 
-use multiversx_sc::{
-    codec::multi_types::MultiValue2,
-    storage::mappers::SingleValue,
-    types::{
-        Address, BigUint, EgldOrEsdtTokenIdentifier, ManagedVec, MultiValueEncoded,
-        OperationCompletionStatus, TokenIdentifier,
-    },
-};
-use multiversx_sc_scenario::{
-    api::StaticApi,
-    scenario_model::{
-        Account, AddressValue, CheckAccount, CheckStateStep, ScCallStep, ScDeployStep, ScQueryStep,
-        SetStateStep, TxESDT, TypedResponse,
-    },
-    ContractInfo, DebugApi, ScenarioWorld, WhiteboxContract,
-};
-
 use crate::mock_seed_nft_minter::ProxyTrait as _;
 use rewards_distribution::{
     Bracket, ContractObj, ProxyTrait as _, RewardsDistribution, DIVISION_SAFETY_CONSTANT,
diff --git a/contracts/feature-tests/abi-tester/src/abi_proxy.rs b/contracts/feature-tests/abi-tester/src/abi_proxy.rs
index b5b4b931c2..66548a21d8 100644
--- a/contracts/feature-tests/abi-tester/src/abi_proxy.rs
+++ b/contracts/feature-tests/abi-tester/src/abi_proxy.rs
@@ -415,10 +415,7 @@ pub enum AbiEnum {
     Nothing,
     Something(i32),
     SomethingMore(u8, OnlyShowsUpAsNested08),
-    SomeStruct {
-        a: u16,
-        b: OnlyShowsUpAsNested09,
-    },
+    SomeStruct { a: u16, b: OnlyShowsUpAsNested09 },
 }
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
@@ -509,8 +506,5 @@ pub enum ExplicitDiscriminantMixed {
     Unit,
     Tuple(u16),
     Five,
-    Struct {
-        a: u8,
-        b: u16,
-    },
+    Struct { a: u8, b: u16 },
 }
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 ceca3ace12..b93f0baac3 100644
--- a/contracts/feature-tests/basic-features/interact/src/bf_interact.rs
+++ b/contracts/feature-tests/basic-features/interact/src/bf_interact.rs
@@ -8,20 +8,8 @@ use basic_features::{
 use bf_interact_config::Config;
 use bf_interact_state::State;
 use clap::Parser;
-use multiversx_sc_snippets::{
-    env_logger,
-    multiversx_sc::{codec::multi_types::IgnoreValue, types::Address},
-    multiversx_sc_scenario::{
-        api::StaticApi,
-        bech32,
-        mandos_system::ScenarioRunner,
-        scenario_format::interpret_trait::{InterpretableFrom, InterpreterContext},
-        scenario_model::{BytesValue, ScCallStep, ScDeployStep, Scenario, TxExpect},
-        standalone::retrieve_account_as_scenario_set_state,
-        test_wallets, ContractInfo,
-    },
-    tokio, Interactor,
-};
+
+use multiversx_sc_snippets::imports::*;
 
 const INTERACTOR_SCENARIO_TRACE_PATH: &str = "interactor_trace.scen.json";
 
diff --git a/contracts/feature-tests/basic-features/tests/basic_features_managed_buffer_test.rs b/contracts/feature-tests/basic-features/tests/basic_features_managed_buffer_test.rs
index cde4caa56e..88320b17f6 100644
--- a/contracts/feature-tests/basic-features/tests/basic_features_managed_buffer_test.rs
+++ b/contracts/feature-tests/basic-features/tests/basic_features_managed_buffer_test.rs
@@ -1,5 +1,4 @@
-use multiversx_sc::types::{ManagedAddress, ManagedBuffer};
-use multiversx_sc_scenario::{api::StaticApi, *};
+use multiversx_sc_scenario::imports::*;
 
 use basic_features::managed_buffer_features::ManagedBufferFeatures;
 
diff --git a/contracts/feature-tests/basic-features/tests/basic_features_managed_vec_test.rs b/contracts/feature-tests/basic-features/tests/basic_features_managed_vec_test.rs
index 62790660d0..fccc91e431 100644
--- a/contracts/feature-tests/basic-features/tests/basic_features_managed_vec_test.rs
+++ b/contracts/feature-tests/basic-features/tests/basic_features_managed_vec_test.rs
@@ -1,5 +1,4 @@
-use multiversx_sc::types::{BigUint, ManagedVec};
-use multiversx_sc_scenario::{api::StaticApi, *};
+use multiversx_sc_scenario::imports::*;
 
 use basic_features::managed_vec_features::ManagedVecFeatures;
 
diff --git a/contracts/feature-tests/basic-features/tests/basic_features_ordered_binary_tree_test.rs b/contracts/feature-tests/basic-features/tests/basic_features_ordered_binary_tree_test.rs
index 071da4a958..fe48caecba 100644
--- a/contracts/feature-tests/basic-features/tests/basic_features_ordered_binary_tree_test.rs
+++ b/contracts/feature-tests/basic-features/tests/basic_features_ordered_binary_tree_test.rs
@@ -1,10 +1,8 @@
 #![allow(deprecated)]
 
 use basic_features::BasicFeatures;
-use multiversx_sc::imports::{OrderedBinaryTreeNode, NULL_NODE_ID};
-use multiversx_sc_scenario::{
-    managed_biguint, rust_biguint, testing_framework::BlockchainStateWrapper,
-};
+
+use multiversx_sc_scenario::imports::*;
 
 #[test]
 fn ordered_binary_tree_test() {
diff --git a/contracts/feature-tests/basic-features/tests/basic_features_token_identifier_test.rs b/contracts/feature-tests/basic-features/tests/basic_features_token_identifier_test.rs
index 3b85d24b4f..8cfe9ba2d2 100644
--- a/contracts/feature-tests/basic-features/tests/basic_features_token_identifier_test.rs
+++ b/contracts/feature-tests/basic-features/tests/basic_features_token_identifier_test.rs
@@ -1,5 +1,4 @@
-use multiversx_sc::types::{EgldOrEsdtTokenIdentifier, ManagedBuffer, TokenIdentifier};
-use multiversx_sc_scenario::{api::StaticApi, *};
+use multiversx_sc_scenario::imports::*;
 
 use basic_features::token_identifier_features::TokenIdentifierFeatures;
 
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 bbe8d68ecb..f6812aa0bc 100644
--- a/contracts/feature-tests/composability/forwarder/tests/forwarder_blackbox_test.rs
+++ b/contracts/feature-tests/composability/forwarder/tests/forwarder_blackbox_test.rs
@@ -1,12 +1,6 @@
 use forwarder::nft::{Color, ProxyTrait as _};
 
-use multiversx_sc_scenario::{
-    api::StaticApi,
-    scenario_model::{
-        Account, CheckAccount, CheckStateStep, ScCallStep, SetStateStep, TransferStep,
-    },
-    ContractInfo, ScenarioWorld,
-};
+use multiversx_sc_scenario::imports::*;
 
 const USER_ADDRESS_EXPR: &str = "address:user";
 const FORWARDER_ADDRESS_EXPR: &str = "sc:forwarder";
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 4cb15d884f..0adb09b286 100644
--- a/contracts/feature-tests/composability/forwarder/tests/forwarder_whitebox_test.rs
+++ b/contracts/feature-tests/composability/forwarder/tests/forwarder_whitebox_test.rs
@@ -1,12 +1,5 @@
 use forwarder::nft::{Color, ForwarderNftModule};
-use multiversx_sc::{contract_base::ContractBase, types::Address};
-use multiversx_sc_scenario::{
-    managed_address, managed_biguint, managed_token_id,
-    scenario_model::{
-        Account, AddressValue, CheckAccount, CheckStateStep, ScCallStep, SetStateStep,
-    },
-    ScenarioWorld, WhiteboxContract,
-};
+use multiversx_sc_scenario::imports::*;
 
 const USER_ADDRESS_EXPR: &str = "address:user";
 const FORWARDER_ADDRESS_EXPR: &str = "sc:forwarder";
diff --git a/contracts/feature-tests/composability/interact/src/call_tree_calling_functions.rs b/contracts/feature-tests/composability/interact/src/call_tree_calling_functions.rs
index 9e86f5dfdb..9305aca3be 100644
--- a/contracts/feature-tests/composability/interact/src/call_tree_calling_functions.rs
+++ b/contracts/feature-tests/composability/interact/src/call_tree_calling_functions.rs
@@ -1,16 +1,9 @@
 use std::{cell::RefCell, rc::Rc};
 
 use forwarder_queue::QueuedCallType;
-use multiversx_sc_snippets::{
-    multiversx_sc::types::{EgldOrEsdtTokenIdentifier, EgldOrEsdtTokenPayment, MultiValueEncoded},
-    multiversx_sc_scenario::{
-        api::StaticApi,
-        bech32,
-        num_bigint::BigUint,
-        scenario_model::{ScCallStep, TxExpect},
-    },
-    StepBuffer,
-};
+
+use multiversx_sc_snippets::imports::*;
+use num_bigint::BigUint;
 
 use crate::{
     call_tree::{CallNode, CallState, ForwarderQueueTarget},
diff --git a/contracts/feature-tests/composability/interact/src/call_tree_deploy.rs b/contracts/feature-tests/composability/interact/src/call_tree_deploy.rs
index c9c2f1498c..46e5c4804d 100644
--- a/contracts/feature-tests/composability/interact/src/call_tree_deploy.rs
+++ b/contracts/feature-tests/composability/interact/src/call_tree_deploy.rs
@@ -1,20 +1,10 @@
 use crate::{call_tree::CallState, comp_interact_controller::ComposabilityInteract};
 
 use forwarder_queue::ProxyTrait as _;
-use multiversx_sc_snippets::{
-    multiversx_sc::{
-        codec::multi_types::OptionalValue,
-        types::{BoxedBytes, ManagedBuffer},
-    },
-    multiversx_sc_scenario::{
-        api::StaticApi,
-        bech32,
-        scenario_model::{ScDeployStep, TypedScDeploy},
-    },
-    StepBuffer,
-};
 use vault::ProxyTrait as _;
 
+use multiversx_sc_snippets::imports::*;
+
 impl ComposabilityInteract {
     pub async fn deploy_call_tree_contracts(&mut self, call_state: &CallState) {
         let mut typed_vault_deploys = self.typed_sc_deploy_vault(call_state).await;
diff --git a/contracts/feature-tests/composability/interact/src/comp_interact_config.rs b/contracts/feature-tests/composability/interact/src/comp_interact_config.rs
index c27957a9fb..cbe6d6498f 100644
--- a/contracts/feature-tests/composability/interact/src/comp_interact_config.rs
+++ b/contracts/feature-tests/composability/interact/src/comp_interact_config.rs
@@ -1,8 +1,6 @@
 use forwarder_queue::QueuedCallType;
-use multiversx_sc_snippets::{
-    multiversx_sc::types::{EgldOrEsdtTokenIdentifier, TokenIdentifier},
-    multiversx_sc_scenario::{api::StaticApi, num_bigint::BigUint},
-};
+use multiversx_sc_snippets::imports::*;
+use num_bigint::BigUint;
 use serde::Deserialize;
 use std::{fmt::Debug, io::Read, str::FromStr};
 
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 f5851d6e6c..409ce234a7 100644
--- a/contracts/feature-tests/composability/interact/src/comp_interact_controller.rs
+++ b/contracts/feature-tests/composability/interact/src/comp_interact_controller.rs
@@ -1,14 +1,6 @@
 use crate::{call_tree::CallState, comp_interact_config::Config, comp_interact_state::State};
 
-use multiversx_sc_snippets::{
-    multiversx_sc::types::Address,
-    multiversx_sc_scenario::{
-        scenario_format::interpret_trait::{InterpretableFrom, InterpreterContext},
-        scenario_model::BytesValue,
-        test_wallets::judy,
-    },
-    Interactor,
-};
+use multiversx_sc_snippets::imports::*;
 
 const INTERACTOR_SCENARIO_TRACE_PATH: &str = "comp_interact_trace.scen.json";
 
@@ -27,7 +19,7 @@ impl ComposabilityInteract {
             .await
             .with_tracer(INTERACTOR_SCENARIO_TRACE_PATH)
             .await;
-        let wallet_address = interactor.register_wallet(judy());
+        let wallet_address = interactor.register_wallet(test_wallets::judy());
         let forw_queue_code = BytesValue::interpret_from(
             "mxsc:../forwarder-queue/output/forwarder-queue.mxsc.json",
             &InterpreterContext::default(),
diff --git a/contracts/feature-tests/composability/interact/src/comp_interact_main.rs b/contracts/feature-tests/composability/interact/src/comp_interact_main.rs
index b6e0ba9778..cefa9272f2 100644
--- a/contracts/feature-tests/composability/interact/src/comp_interact_main.rs
+++ b/contracts/feature-tests/composability/interact/src/comp_interact_main.rs
@@ -12,11 +12,7 @@ use clap::Parser;
 
 use comp_interact_controller::ComposabilityInteract;
 
-use multiversx_sc_snippets::{
-    env_logger,
-    multiversx_sc_scenario::{api::StaticApi, ContractInfo},
-    tokio,
-};
+use multiversx_sc_snippets::imports::*;
 
 #[tokio::main]
 async fn main() {
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 a2ee00c631..e29ff1c7ca 100644
--- a/contracts/feature-tests/composability/tests/promises_feature_blackbox_test.rs
+++ b/contracts/feature-tests/composability/tests/promises_feature_blackbox_test.rs
@@ -1,9 +1,5 @@
 use multiversx_sc::types::BigUint;
-use multiversx_sc_scenario::{
-    api::StaticApi,
-    scenario_model::{Account, CheckAccount, CheckStateStep, ScCallStep, SetStateStep},
-    ContractInfo, ScenarioWorld,
-};
+use multiversx_sc_scenario::imports::*;
 
 use promises_features::call_sync_bt::ProxyTrait;
 
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 acaefbfb1d..2428a9a6bc 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
@@ -1,12 +1,4 @@
-use multiversx_sc::{codec::multi_types::MultiValueVec, types::Address};
-use multiversx_sc_scenario::{
-    api::StaticApi,
-    scenario_model::{
-        Account, AddressValue, CheckAccount, CheckStateStep, ScCallStep, ScDeployStep,
-        SetStateStep, TxExpect,
-    },
-    ContractInfo, ScenarioWorld,
-};
+use multiversx_sc_scenario::imports::*;
 use transfer_role_features::ProxyTrait as _;
 
 const ACCEPT_FUNDS_FUNC_NAME: &[u8] = b"accept_funds";
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 f50b2f88ba..dc733dede9 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
@@ -1,14 +1,5 @@
-use multiversx_sc::types::{
-    Address, EsdtTokenPayment, ManagedArgBuffer, ManagedVec, MultiValueEncoded,
-};
 use multiversx_sc_modules::transfer_role_proxy::TransferRoleProxyModule;
-use multiversx_sc_scenario::{
-    managed_address, managed_biguint, managed_buffer, managed_token_id,
-    scenario_model::{
-        Account, AddressValue, CheckAccount, CheckStateStep, ScCallStep, ScDeployStep, SetStateStep,
-    },
-    ScenarioWorld, WhiteboxContract,
-};
+use multiversx_sc_scenario::imports::*;
 use transfer_role_features::TransferRoleFeatures;
 
 const OWNER_ADDRESS_EXPR: &str = "address:owner";
diff --git a/contracts/feature-tests/exchange-features/tests/exchange_features_blackbox_test.rs b/contracts/feature-tests/exchange-features/tests/exchange_features_blackbox_test.rs
index 6ea73fb3a6..88c87e3931 100644
--- a/contracts/feature-tests/exchange-features/tests/exchange_features_blackbox_test.rs
+++ b/contracts/feature-tests/exchange-features/tests/exchange_features_blackbox_test.rs
@@ -1,4 +1,4 @@
-use multiversx_sc_scenario::{scenario_model::*, *};
+use multiversx_sc_scenario::imports::*;
 
 const EXCHANGE_FEATURES_PATH_EXPR: &str = "mxsc:output/exchange-features.mxsc.json";
 
diff --git a/contracts/feature-tests/panic-message-features/tests/pmf_blackbox_test.rs b/contracts/feature-tests/panic-message-features/tests/pmf_blackbox_test.rs
index ff14571fd9..66b2d9527e 100644
--- a/contracts/feature-tests/panic-message-features/tests/pmf_blackbox_test.rs
+++ b/contracts/feature-tests/panic-message-features/tests/pmf_blackbox_test.rs
@@ -1,6 +1,6 @@
 mod pmf_proxy;
-use multiversx_sc::types::{AddressExpr, ScExpr};
-use multiversx_sc_scenario::{scenario_model::*, *};
+
+use multiversx_sc_scenario::imports::*;
 
 const OWNER: AddressExpr = AddressExpr("owner");
 const SC_PMF: ScExpr = ScExpr("pmf");
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 6d86ebe77f..82581c8170 100644
--- a/contracts/feature-tests/payable-features/tests/payable_blackbox_test.rs
+++ b/contracts/feature-tests/payable-features/tests/payable_blackbox_test.rs
@@ -1,4 +1,4 @@
-use multiversx_sc_scenario::{scenario_model::*, *};
+use multiversx_sc_scenario::imports::*;
 
 const PF_PATH_EXPR: &str = "mxsc:output/payable-features.mxsc.json";
 
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 e0999b7644..92d00a227d 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
@@ -2,19 +2,7 @@
 
 use rust_snippets_generator_test::{ProxyTrait as _, *};
 
-use multiversx_sc_snippets::{
-    env_logger,
-    erdrs::wallet::Wallet,
-    multiversx_sc::{codec::multi_types::*, types::*},
-    multiversx_sc_scenario::{
-        api::StaticApi,
-        bech32,
-        scenario_format::interpret_trait::{InterpretableFrom, InterpreterContext},
-        scenario_model::*,
-        ContractInfo,
-    },
-    sdk, tokio, Interactor,
-};
+use multiversx_sc_snippets::imports::*;
 
 const GATEWAY: &str = sdk::blockchain::DEVNET_GATEWAY;
 const PEM: &str = "alice.pem";
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 d544af3a04..d927b1ba4a 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,5 +1,5 @@
-use multiversx_sc_scenario::{api::StaticApi, scenario_model::*, *};
-use rust_testing_framework_tester::*; // TODO: clean up imports
+use multiversx_sc_scenario::imports::*;
+use rust_testing_framework_tester::*;
 
 const WASM_PATH_EXPR: &str = "mxsc:output/rust-testing-framework-tester.mxsc.json";
 
diff --git a/contracts/feature-tests/rust-testing-framework-tester/tests/tester_whitebox_legacy_test.rs b/contracts/feature-tests/rust-testing-framework-tester/tests/tester_whitebox_legacy_test.rs
index 1f56f5bb21..1fad8f653a 100644
--- a/contracts/feature-tests/rust-testing-framework-tester/tests/tester_whitebox_legacy_test.rs
+++ b/contracts/feature-tests/rust-testing-framework-tester/tests/tester_whitebox_legacy_test.rs
@@ -1,20 +1,11 @@
 #![allow(deprecated)] // TODO: migrate tests
 
-use adder::*;
-use forwarder::call_sync::*;
+use multiversx_sc_scenario::imports::*;
 use num_traits::ToPrimitive;
 
+use adder::*;
 use basic_features::BasicFeatures;
-use multiversx_sc::{
-    codec::Empty,
-    contract_base::ContractBase,
-    err_msg,
-    types::{Address, BigUint, EsdtLocalRole, EsdtTokenPayment, ManagedVec, TokenIdentifier},
-};
-use multiversx_sc_scenario::{
-    api::DebugApi, assert_values_eq, managed_address, managed_biguint, managed_buffer,
-    managed_token_id, rust_biguint, testing_framework::*,
-};
+use forwarder::call_sync::*;
 use rust_testing_framework_tester::{dummy_module::DummyModule, *};
 
 const TEST_OUTPUT_PATH: &str = "test.scen.json";
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 fe90f658e4..267639fd6f 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
@@ -1,15 +1,8 @@
-use multiversx_sc::types::{Address, ManagedVec, MultiValueEncoded};
 use multiversx_sc_modules::governance::{
     governance_configurable::GovernanceConfigurablePropertiesModule, governance_proposal::VoteType,
     GovernanceModule,
 };
-use multiversx_sc_scenario::{
-    managed_address, managed_biguint, managed_buffer, managed_token_id,
-    scenario_model::{
-        Account, AddressValue, CheckAccount, CheckStateStep, ScCallStep, ScDeployStep, SetStateStep,
-    },
-    ScenarioWorld, WhiteboxContract,
-};
+use multiversx_sc_scenario::imports::*;
 
 const GOV_TOKEN_ID_EXPR: &str = "str:GOV-123456";
 const GOV_TOKEN_ID: &[u8] = b"GOV-123456";
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 91a96db16a..049936bb44 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
@@ -1,12 +1,5 @@
-use multiversx_sc::types::{Address, EgldOrEsdtTokenIdentifier, ManagedVec};
 use multiversx_sc_modules::staking::StakingModule;
-use multiversx_sc_scenario::{
-    managed_address, managed_biguint, managed_token_id,
-    scenario_model::{
-        Account, AddressValue, CheckAccount, CheckStateStep, ScCallStep, ScDeployStep, SetStateStep,
-    },
-    ScenarioWorld, WhiteboxContract,
-};
+use multiversx_sc_scenario::imports::*;
 
 const STAKING_TOKEN_ID_EXPR: &str = "str:STAKE-123456";
 const STAKING_TOKEN_ID: &[u8] = b"STAKE-123456";
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 a970685918..eb93ff155a 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
@@ -1,20 +1,8 @@
-use multiversx_sc::{
-    arrayvec::ArrayVec,
-    codec::{test_util::top_encode_to_vec_u8_or_panic, Empty},
-    contract_base::ContractBase,
-    storage::mappers::StorageTokenWrapper,
-    types::{Address, EsdtTokenPayment, ManagedVec},
-};
+use multiversx_sc_scenario::imports::*;
+
 use multiversx_sc_modules::token_merge::{
     merged_token_instances::MergedTokenInstances, merged_token_setup::MergedTokenSetupModule,
 };
-use multiversx_sc_scenario::{
-    managed_address, managed_biguint, managed_token_id,
-    scenario_model::{
-        Account, AddressValue, CheckAccount, CheckStateStep, ScCallStep, SetStateStep, TxESDT,
-    },
-    ScenarioWorld, WhiteboxContract,
-};
 use use_module::token_merge_mod_impl::{CustomAttributes, TokenMergeModImpl};
 
 const OWNER_ADDRESS_EXPR: &str = "address:owner";
diff --git a/framework/base/src/imports_reexport.rs b/framework/base/src/imports_reexport.rs
index 710bd8bbf3..e023525e9d 100644
--- a/framework/base/src/imports_reexport.rs
+++ b/framework/base/src/imports_reexport.rs
@@ -5,8 +5,8 @@ pub mod imports {
         api::{ErrorApiImpl, ManagedTypeApi, VMApi},
         arrayvec::ArrayVec,
         codec::{
-            multi_types::*, CodecFrom, CodecFromSelf, CodecInto, DecodeError, IntoMultiValue,
-            NestedDecode, NestedEncode, TopDecode, TopEncode,
+            multi_types::*, CodecFrom, CodecFromSelf, CodecInto, DecodeError, Empty,
+            IntoMultiValue, NestedDecode, NestedEncode, TopDecode, TopEncode,
         },
         contract_base::{ContractBase, ProxyObjBase, ProxyObjNew},
         err_msg,
diff --git a/framework/meta/src/cmd/contract/generate_snippets/snippet_template_gen.rs b/framework/meta/src/cmd/contract/generate_snippets/snippet_template_gen.rs
index 0feb12e562..093afa908c 100644
--- a/framework/meta/src/cmd/contract/generate_snippets/snippet_template_gen.rs
+++ b/framework/meta/src/cmd/contract/generate_snippets/snippet_template_gen.rs
@@ -12,19 +12,7 @@ pub(crate) fn write_snippet_imports(file: &mut File, contract_crate_name: &str)
 use {contract_crate_name}::ProxyTrait as _;
 use {contract_crate_name}::*;
 
-use multiversx_sc_snippets::{{
-    env_logger,
-    erdrs::wallet::Wallet,
-    multiversx_sc::{{codec::multi_types::*, types::*}},
-    multiversx_sc_scenario::{{
-        api::StaticApi,
-        bech32,
-        scenario_format::interpret_trait::{{InterpretableFrom, InterpreterContext}},
-        scenario_model::*,
-        ContractInfo,
-    }},
-    sdk, tokio, Interactor,
-}};
+use multiversx_sc_snippets::imports::*;
 "
     )
     .unwrap();
diff --git a/framework/scenario/src/facade.rs b/framework/scenario/src/facade.rs
index a37265e0b4..77a00e4792 100644
--- a/framework/scenario/src/facade.rs
+++ b/framework/scenario/src/facade.rs
@@ -1,13 +1,14 @@
 mod contract_info;
 mod debugger_backend;
-pub(crate) mod result_handlers;
+pub mod expr;
+pub mod result_handlers;
 mod scenario_world;
 mod scenario_world_runner;
 mod scenario_world_steps;
 mod scenario_world_steps_deprecated;
 mod scenario_world_whitebox;
 mod whitebox_contract;
-pub(crate) mod world_tx;
+pub mod world_tx;
 
 pub use contract_info::ContractInfo;
 pub use scenario_world::ScenarioWorld;
diff --git a/framework/scenario/src/facade/world_tx/expr.rs b/framework/scenario/src/facade/expr.rs
similarity index 100%
rename from framework/scenario/src/facade/world_tx/expr.rs
rename to framework/scenario/src/facade/expr.rs
diff --git a/framework/scenario/src/facade/world_tx/expr/file_expr.rs b/framework/scenario/src/facade/expr/file_expr.rs
similarity index 83%
rename from framework/scenario/src/facade/world_tx/expr/file_expr.rs
rename to framework/scenario/src/facade/expr/file_expr.rs
index d9d3c77756..f197ce4e16 100644
--- a/framework/scenario/src/facade/world_tx/expr/file_expr.rs
+++ b/framework/scenario/src/facade/expr/file_expr.rs
@@ -1,13 +1,7 @@
-use core::ptr;
-use std::path::PathBuf;
-
 use multiversx_chain_scenario_format::{
     interpret_trait::InterpreterContext, value_interpreter::interpret_string,
 };
-use multiversx_sc::types::{
-    AnnotatedValue, ManagedAddress, ManagedBuffer, TxEnv, TxFrom, TxFromSpecified, TxTo,
-    TxToSpecified,
-};
+use multiversx_sc::types::{AnnotatedValue, ManagedBuffer};
 
 use crate::{api::StaticApi, ScenarioTxEnvData};
 
diff --git a/framework/scenario/src/facade/world_tx/expr/mxsc_expr.rs b/framework/scenario/src/facade/expr/mxsc_expr.rs
similarity index 78%
rename from framework/scenario/src/facade/world_tx/expr/mxsc_expr.rs
rename to framework/scenario/src/facade/expr/mxsc_expr.rs
index c0f574e8cd..0946b93327 100644
--- a/framework/scenario/src/facade/world_tx/expr/mxsc_expr.rs
+++ b/framework/scenario/src/facade/expr/mxsc_expr.rs
@@ -1,15 +1,9 @@
-use core::ptr;
-use std::path::PathBuf;
-
 use multiversx_chain_scenario_format::{
     interpret_trait::InterpreterContext, value_interpreter::interpret_string,
 };
-use multiversx_sc::types::{
-    AnnotatedValue, ManagedAddress, ManagedBuffer, TxCodeValue, TxEnv, TxFrom, TxFromSpecified,
-    TxTo, TxToSpecified,
-};
+use multiversx_sc::types::{AnnotatedValue, ManagedBuffer, TxCodeValue};
 
-use crate::{api::StaticApi, ScenarioEnvExec, ScenarioTxEnv, ScenarioTxEnvData};
+use crate::ScenarioTxEnv;
 
 const MXSC_PREFIX: &str = "mxsc:";
 
diff --git a/framework/scenario/src/facade/world_tx/expr/num_expr.rs b/framework/scenario/src/facade/expr/num_expr.rs
similarity index 73%
rename from framework/scenario/src/facade/world_tx/expr/num_expr.rs
rename to framework/scenario/src/facade/expr/num_expr.rs
index de9137b8fc..704f52496b 100644
--- a/framework/scenario/src/facade/world_tx/expr/num_expr.rs
+++ b/framework/scenario/src/facade/expr/num_expr.rs
@@ -1,16 +1,12 @@
-use crate::{api::StaticApi, ScenarioEnvExec, ScenarioTxEnv, ScenarioTxEnvData};
-use core::ptr;
+use crate::ScenarioTxEnv;
+
 use multiversx_chain_scenario_format::{
     interpret_trait::InterpreterContext, value_interpreter::interpret_string,
 };
 use multiversx_sc::{
     api::ManagedTypeApi,
-    types::{
-        AnnotatedValue, BigUint, ManagedAddress, ManagedBuffer, TxCodeValue, TxEgldValue, TxEnv,
-        TxFrom, TxFromSpecified, TxGasValue, TxTo, TxToSpecified,
-    },
+    types::{AnnotatedValue, BigUint, ManagedBuffer, TxEgldValue, TxGasValue},
 };
-use std::path::PathBuf;
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
 pub struct NumExpr<'a>(pub &'a str);
@@ -31,7 +27,7 @@ where
         self.0.into()
     }
 
-    fn to_value(&self, env: &Env) -> BigUint<Env::Api> {
+    fn to_value(&self, _env: &Env) -> BigUint<Env::Api> {
         interpret_big_uint(self.0)
     }
 }
@@ -44,7 +40,7 @@ where
         self.0.into()
     }
 
-    fn to_value(&self, env: &Env) -> u64 {
+    fn to_value(&self, _env: &Env) -> u64 {
         interpret_big_uint::<Env::Api>(self.0).to_u64().unwrap()
     }
 }
diff --git a/framework/scenario/src/facade/world_tx.rs b/framework/scenario/src/facade/world_tx.rs
index b72fe5b88c..2fa69c744e 100644
--- a/framework/scenario/src/facade/world_tx.rs
+++ b/framework/scenario/src/facade/world_tx.rs
@@ -1,13 +1,11 @@
 #![allow(unused)] // TEMP
 
-mod expr;
 mod scenario_env;
 mod scenario_env_deploy;
 mod scenario_env_exec;
 mod scenario_env_query;
 mod scenario_rh_impl;
 
-pub use expr::*;
-pub use scenario_env::*;
+pub use scenario_env::{ScenarioTxEnv, ScenarioTxEnvData, ScenarioTxRun};
 pub use scenario_env_exec::ScenarioEnvExec;
 pub use scenario_env_query::ScenarioEnvQuery;
diff --git a/framework/scenario/src/imports.rs b/framework/scenario/src/imports.rs
new file mode 100644
index 0000000000..aa30283dc3
--- /dev/null
+++ b/framework/scenario/src/imports.rs
@@ -0,0 +1,27 @@
+pub use crate::multiversx_sc::imports::*;
+
+pub use crate::multiversx_sc::codec::test_util::*;
+
+pub use crate::{
+    api::{DebugApi, StaticApi},
+    assert_values_eq, bech32,
+    facade::{
+        expr::*, result_handlers::*, world_tx::*, ContractInfo, ScenarioWorld, WhiteboxContract,
+    },
+    managed_address, managed_biguint, managed_buffer, managed_token_id, num_bigint,
+    num_bigint::BigUint as RustBigUint,
+    rust_biguint,
+    scenario::{
+        model::{
+            Account, AddressValue, BytesValue, CheckAccount, CheckStateStep, ScCallStep,
+            ScDeployStep, ScQueryStep, Scenario, SetStateStep, TransferStep, TxESDT, TxExpect,
+            TypedResponse, TypedScCall, TypedScDeploy,
+        },
+        ScenarioRunner,
+    },
+    scenario_format::interpret_trait::{InterpretableFrom, InterpreterContext},
+    standalone::retrieve_account_as_scenario_set_state,
+    test_wallets,
+    whitebox_legacy::*,
+    ScenarioTxRun,
+};
diff --git a/framework/scenario/src/lib.rs b/framework/scenario/src/lib.rs
index 64229851af..4d3fb3b1dc 100644
--- a/framework/scenario/src/lib.rs
+++ b/framework/scenario/src/lib.rs
@@ -8,7 +8,7 @@ pub mod display_util;
 mod facade;
 pub mod managed_test_util;
 pub mod scenario;
-mod scenario_macros;
+pub mod scenario_macros;
 pub mod standalone;
 pub mod test_wallets;
 mod vm_go_tool;
@@ -43,6 +43,9 @@ pub use facade::{result_handlers::*, world_tx::*, ContractInfo, ScenarioWorld, W
 
 use std::path::Path;
 
+/// Imports normally needed in integration tests, grouped together.
+pub mod imports;
+
 /// Legacy function for running a scenario test using the Go VM tool.
 ///
 /// Use `sc-meta test-gen` to replace all calls to it automatically.
diff --git a/framework/snippets/src/imports.rs b/framework/snippets/src/imports.rs
new file mode 100644
index 0000000000..b031e0769c
--- /dev/null
+++ b/framework/snippets/src/imports.rs
@@ -0,0 +1,6 @@
+pub use crate::multiversx_sc_scenario::imports::*;
+
+pub use crate::{dns_address_for_name, Interactor, InteractorPrepareAsync, StepBuffer};
+
+pub use env_logger;
+pub use tokio;
diff --git a/framework/snippets/src/lib.rs b/framework/snippets/src/lib.rs
index 70f3f8e792..b94a6517d9 100644
--- a/framework/snippets/src/lib.rs
+++ b/framework/snippets/src/lib.rs
@@ -18,3 +18,6 @@ pub use multiversx_sc_scenario::{self, multiversx_sc};
 pub use multiversx_sdk as erdrs; // TODO: remove
 pub use multiversx_sdk as sdk;
 pub use tokio;
+
+/// Imports normally needed in interactors, grouped together.
+pub mod imports;

From 0c7440141e222295def164d05a816b6a03231eea Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 9 Apr 2024 16:45:58 +0300
Subject: [PATCH 0683/1254] cleanup

---
 .../tests/tester_whitebox_legacy_test.rs                        | 2 --
 framework/scenario/src/whitebox_legacy.rs                       | 2 --
 2 files changed, 4 deletions(-)

diff --git a/contracts/feature-tests/rust-testing-framework-tester/tests/tester_whitebox_legacy_test.rs b/contracts/feature-tests/rust-testing-framework-tester/tests/tester_whitebox_legacy_test.rs
index 1fad8f653a..0acd222cc9 100644
--- a/contracts/feature-tests/rust-testing-framework-tester/tests/tester_whitebox_legacy_test.rs
+++ b/contracts/feature-tests/rust-testing-framework-tester/tests/tester_whitebox_legacy_test.rs
@@ -1,5 +1,3 @@
-#![allow(deprecated)] // TODO: migrate tests
-
 use multiversx_sc_scenario::imports::*;
 use num_traits::ToPrimitive;
 
diff --git a/framework/scenario/src/whitebox_legacy.rs b/framework/scenario/src/whitebox_legacy.rs
index aec0d8c980..9d90a4cb7e 100644
--- a/framework/scenario/src/whitebox_legacy.rs
+++ b/framework/scenario/src/whitebox_legacy.rs
@@ -1,5 +1,3 @@
-#![allow(deprecated)]
-
 mod address_factory;
 mod contract_obj_wrapper;
 mod mandos_generator;

From 3df1695fe4b510b06fa425cb08bf2b9db7bd1df6 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 9 Apr 2024 16:55:30 +0300
Subject: [PATCH 0684/1254] imports - base framework refactor

---
 framework/base/src/derive_imports.rs   |  7 +++++
 framework/base/src/imports.rs          | 22 ++++++++++++++
 framework/base/src/imports_reexport.rs | 41 --------------------------
 framework/base/src/lib.rs              | 13 ++++++--
 4 files changed, 39 insertions(+), 44 deletions(-)
 create mode 100644 framework/base/src/derive_imports.rs
 create mode 100644 framework/base/src/imports.rs
 delete mode 100644 framework/base/src/imports_reexport.rs

diff --git a/framework/base/src/derive_imports.rs b/framework/base/src/derive_imports.rs
new file mode 100644
index 0000000000..64f45ead1d
--- /dev/null
+++ b/framework/base/src/derive_imports.rs
@@ -0,0 +1,7 @@
+pub use crate::{
+    codec,
+    codec::derive::{
+        NestedDecode, NestedEncode, TopDecode, TopDecodeOrDefault, TopEncode, TopEncodeOrDefault,
+    },
+    derive::{type_abi, ManagedVecItem, TypeAbi},
+};
diff --git a/framework/base/src/imports.rs b/framework/base/src/imports.rs
new file mode 100644
index 0000000000..016aa7bb4e
--- /dev/null
+++ b/framework/base/src/imports.rs
@@ -0,0 +1,22 @@
+pub use crate::{
+    abi::TypeAbi,
+    api::{ErrorApiImpl, ManagedTypeApi, VMApi},
+    arrayvec::ArrayVec,
+    codec::{
+        multi_types::*, CodecFrom, CodecFromSelf, CodecInto, DecodeError, Empty, IntoMultiValue,
+        NestedDecode, NestedEncode, TopDecode, TopEncode,
+    },
+    contract_base::{ContractBase, ProxyObjBase, ProxyObjNew},
+    err_msg,
+    io::*,
+    non_zero_usize,
+    non_zero_util::*,
+    require, sc_format, sc_panic, sc_print,
+    storage::mappers::*,
+    types::{system_proxy::*, *},
+};
+
+pub use core::ops::{
+    Add, AddAssign, BitAnd, BitAndAssign, BitOr, BitOrAssign, BitXor, BitXorAssign, Div, DivAssign,
+    Mul, MulAssign, Rem, RemAssign, Shl, ShlAssign, Shr, ShrAssign, Sub, SubAssign,
+};
diff --git a/framework/base/src/imports_reexport.rs b/framework/base/src/imports_reexport.rs
deleted file mode 100644
index e023525e9d..0000000000
--- a/framework/base/src/imports_reexport.rs
+++ /dev/null
@@ -1,41 +0,0 @@
-/// Conveniently groups all framework imports required by a smart contract form the framework.
-pub mod imports {
-    pub use crate::{
-        abi::TypeAbi,
-        api::{ErrorApiImpl, ManagedTypeApi, VMApi},
-        arrayvec::ArrayVec,
-        codec::{
-            multi_types::*, CodecFrom, CodecFromSelf, CodecInto, DecodeError, Empty,
-            IntoMultiValue, NestedDecode, NestedEncode, TopDecode, TopEncode,
-        },
-        contract_base::{ContractBase, ProxyObjBase, ProxyObjNew},
-        err_msg,
-        io::*,
-        non_zero_usize,
-        non_zero_util::*,
-        require, sc_format, sc_panic, sc_print,
-        storage::mappers::*,
-        types::{system_proxy::*, *},
-    };
-    pub use core::ops::{
-        Add, AddAssign, BitAnd, BitAndAssign, BitOr, BitOrAssign, BitXor, BitXorAssign, Div,
-        DivAssign, Mul, MulAssign, Rem, RemAssign, Shl, ShlAssign, Shr, ShrAssign, Sub, SubAssign,
-    };
-}
-
-/// Conveniently groups all imports required for deriving framework-related traits for types.
-pub mod derive_imports {
-    pub use crate::{
-        codec,
-        codec::derive::{
-            NestedDecode, NestedEncode, TopDecode, TopDecodeOrDefault, TopEncode,
-            TopEncodeOrDefault,
-        },
-        derive::{type_abi, ManagedVecItem, TypeAbi},
-    };
-}
-
-/// Conveniently groups all imports required for generated proxies.
-pub mod proxy_imports {
-    pub use super::{derive_imports::*, imports::*};
-}
diff --git a/framework/base/src/lib.rs b/framework/base/src/lib.rs
index b5aaecd378..043ba4bebb 100644
--- a/framework/base/src/lib.rs
+++ b/framework/base/src/lib.rs
@@ -38,6 +38,13 @@ pub use hex_call_data::*;
 pub use hex_literal;
 pub use storage::{storage_clear, storage_get, storage_get_len, storage_set};
 
-// not to be used internally
-mod imports_reexport;
-pub use imports_reexport::{derive_imports, imports, proxy_imports};
+/// Conveniently groups all framework imports required by a smart contract form the framework.
+pub mod imports;
+
+/// Conveniently groups all imports required for deriving framework-related traits for types.
+pub mod derive_imports;
+
+/// Conveniently groups all imports required for generated proxies.
+pub mod proxy_imports {
+    pub use super::{derive_imports::*, imports::*};
+}

From f9c19fd08dd3cba2d83ed6aaf6541e8c256dbf48 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 9 Apr 2024 17:59:15 +0300
Subject: [PATCH 0685/1254] sc 0.49.0-alpha.2

---
 CHANGELOG.md                                   |  6 +++++-
 Cargo.lock                                     | 18 +++++++++---------
 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 ++--
 .../mappers/linked-list-repeat/meta/Cargo.toml |  2 +-
 .../mappers/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 +-
 .../benchmarks/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 +-
 contracts/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 +-
 .../Cargo.toml                                 |  2 +-
 .../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 +-
 .../examples/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 +++---
 contracts/examples/check-pause/meta/Cargo.toml |  2 +-
 contracts/examples/check-pause/wasm/Cargo.toml |  2 +-
 .../examples/crowdfunding-esdt/Cargo.toml      |  4 ++--
 .../examples/crowdfunding-esdt/meta/Cargo.toml |  2 +-
 .../examples/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 +-
 .../examples/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 +-
 contracts/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 ++--
 contracts/examples/proxy-pause/meta/Cargo.toml |  2 +-
 contracts/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 +-
 .../wasm-alloc-mem-fail/Cargo.toml             |  2 +-
 .../wasm-alloc-mem-leaking/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 +-
 .../composability/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 +-
 .../composability/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 ++--
 .../erc-style-contracts/erc721/meta/Cargo.toml |  2 +-
 .../erc-style-contracts/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 +-
 .../feature-tests/exchange-features/Cargo.toml |  4 ++--
 .../exchange-features/meta/Cargo.toml          |  2 +-
 .../exchange-features/wasm/Cargo.toml          |  2 +-
 .../formatted-message-features/Cargo.toml      |  4 ++--
 .../formatted-message-features/meta/Cargo.toml |  2 +-
 .../formatted-message-features/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 +-
 .../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 +-
 .../use-module/wasm-use-module-view/Cargo.toml |  2 +-
 .../feature-tests/use-module/wasm/Cargo.toml   |  2 +-
 contracts/modules/Cargo.toml                   |  4 ++--
 framework/base/Cargo.toml                      |  4 ++--
 .../system_proxy/legacy_system_sc_proxy.rs     |  2 +-
 framework/derive/Cargo.toml                    |  2 +-
 framework/meta/Cargo.toml                      |  4 ++--
 framework/scenario/Cargo.toml                  |  6 +++---
 framework/snippets/Cargo.toml                  |  4 ++--
 framework/wasm-adapter/Cargo.toml              |  4 ++--
 tools/mxpy-snippet-generator/Cargo.toml        |  2 +-
 tools/rust-debugger/format-tests/Cargo.toml    |  4 ++--
 264 files changed, 388 insertions(+), 384 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9f1117ce8b..fb3a19b767 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,12 +26,16 @@ 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.49.0-alpha.2] - 2024-04-09
+Second pre-release of the unified syntax. Most features done, including fully featured interactors.
+Still missing: set state/check state in tests.
+
 ## [sc 0.48.0] - 2024-04-09
 - When serializing to a managed buffer, static buffer caching is disabled by default.
 - `sc-meta:` - installers for wasm32 target and wasm-opt.
 - Integrated traits for token management: `FixedSupplyToken`, `Mergeable`.
 
-## [sc 0.48.0-alpha.1] - 2024-03-27
+## [sc 0.48.0-alpha.1] - 2024-03-27 (actually alpha release of 0.49.0)
 First pre-release of the unified syntax. Syntax not yet stabilized, should only be used for experimenting with various smart contracts.
 
 ## [sc 0.47.8] - 2024-03-22
diff --git a/Cargo.lock b/Cargo.lock
index 912c3647f2..a63206b567 100755
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1799,7 +1799,7 @@ checksum = "b59072fa0624b55ae5ae3fa6bfa91515bbeb4ac440214bc4a509e2c8806d6e9f"
 
 [[package]]
 name = "multiversx-price-aggregator-sc"
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 dependencies = [
  "arrayvec",
  "getrandom 0.2.12",
@@ -1820,7 +1820,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 dependencies = [
  "bitflags 2.4.2",
  "hex-literal",
@@ -1850,7 +1850,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -1861,7 +1861,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-meta"
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 dependencies = [
  "clap",
  "colored",
@@ -1887,14 +1887,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-scenario"
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 dependencies = [
  "base64",
  "bech32",
@@ -1920,7 +1920,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-snippets"
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 dependencies = [
  "base64",
  "env_logger",
@@ -1934,7 +1934,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 dependencies = [
  "multiversx-sc",
 ]
@@ -1965,7 +1965,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-wegld-swap-sc"
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 dependencies = [
  "multiversx-sc",
  "multiversx-sc-modules",
diff --git a/contracts/benchmarks/large-storage/Cargo.toml b/contracts/benchmarks/large-storage/Cargo.toml
index 9aae12836b..cab5a60bcf 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../framework/scenario"
diff --git a/contracts/benchmarks/large-storage/meta/Cargo.toml b/contracts/benchmarks/large-storage/meta/Cargo.toml
index 0345a383dc..25bcd6a266 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.48.0"
+version = "0.49.0-alpha.2"
 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 776e59a0ce..16614c89ce 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/mappers/benchmark-common/Cargo.toml b/contracts/benchmarks/mappers/benchmark-common/Cargo.toml
index 4c5fdb3fbc..9d20e7403b 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../framework/scenario"
diff --git a/contracts/benchmarks/mappers/linked-list-repeat/Cargo.toml b/contracts/benchmarks/mappers/linked-list-repeat/Cargo.toml
index e2edd8010e..8b1eb2748a 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 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 d09a21b81b..12019a1f0a 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.48.0"
+version = "0.49.0-alpha.2"
 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 8289547693..74d5d41e13 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/mappers/map-repeat/Cargo.toml b/contracts/benchmarks/mappers/map-repeat/Cargo.toml
index 8090f309d1..f83947344d 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../framework/scenario"
diff --git a/contracts/benchmarks/mappers/map-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/map-repeat/meta/Cargo.toml
index 3d4974e6c0..77201f9be8 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.48.0"
+version = "0.49.0-alpha.2"
 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 9653a54fc7..2d5c99b109 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/mappers/queue-repeat/Cargo.toml b/contracts/benchmarks/mappers/queue-repeat/Cargo.toml
index 024846618c..eb45b07d3b 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../framework/scenario"
diff --git a/contracts/benchmarks/mappers/queue-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/queue-repeat/meta/Cargo.toml
index edba3ec0f0..23d9d35f8e 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.48.0"
+version = "0.49.0-alpha.2"
 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 77c061d305..787fcab3a9 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/mappers/set-repeat/Cargo.toml b/contracts/benchmarks/mappers/set-repeat/Cargo.toml
index 84bcc8722d..64e7ef03b3 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../framework/scenario"
diff --git a/contracts/benchmarks/mappers/set-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/set-repeat/meta/Cargo.toml
index e8f3967a3a..4dca3acc7c 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.48.0"
+version = "0.49.0-alpha.2"
 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 31ca740ad8..d58a2820e6 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.48.0"
+version = "0.49.0-alpha.2"
 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 2975e1ae49..034f72b2c2 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 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 1633ab9cde..48286ca62c 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.48.0"
+version = "0.49.0-alpha.2"
 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 19af5c7c51..74eb88203c 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/mappers/vec-repeat/Cargo.toml b/contracts/benchmarks/mappers/vec-repeat/Cargo.toml
index 3cd913d909..96cb7ac06e 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../framework/scenario"
diff --git a/contracts/benchmarks/mappers/vec-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/vec-repeat/meta/Cargo.toml
index 200297db20..d0b11469ea 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.48.0"
+version = "0.49.0-alpha.2"
 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 520aa883b1..c8066692c5 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/send-tx-repeat/Cargo.toml b/contracts/benchmarks/send-tx-repeat/Cargo.toml
index d0bc9aa646..3951fb1a7b 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../framework/scenario"
diff --git a/contracts/benchmarks/send-tx-repeat/meta/Cargo.toml b/contracts/benchmarks/send-tx-repeat/meta/Cargo.toml
index d8b911fd5e..899ad17ad8 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.48.0"
+version = "0.49.0-alpha.2"
 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 14a876b56e..ebc7e32f0f 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/str-repeat/Cargo.toml b/contracts/benchmarks/str-repeat/Cargo.toml
index 7d0b90f1ba..9dd124e9ad 100644
--- a/contracts/benchmarks/str-repeat/Cargo.toml
+++ b/contracts/benchmarks/str-repeat/Cargo.toml
@@ -12,10 +12,10 @@ path = "src/str_repeat.rs"
 managed-buffer-builder-cached = ["multiversx-sc/managed-buffer-builder-cached"]
 
 [dependencies.multiversx-sc]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../framework/scenario"
diff --git a/contracts/benchmarks/str-repeat/meta/Cargo.toml b/contracts/benchmarks/str-repeat/meta/Cargo.toml
index d27ba4d2ff..7ae209e09b 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.toml b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.toml
index 07a34e0d0c..18217e1786 100644
--- a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.toml
+++ b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.toml
@@ -25,7 +25,7 @@ overflow-checks = false
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.toml b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.toml
index 69a11ff01e..cd29b1bc3c 100644
--- a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.toml
+++ b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.toml
@@ -26,7 +26,7 @@ path = ".."
 features = ["managed-buffer-builder-cached"]
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/str-repeat/wasm/Cargo.toml b/contracts/benchmarks/str-repeat/wasm/Cargo.toml
index e6f3ddba95..cd02b379b2 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/core/price-aggregator/Cargo.toml b/contracts/core/price-aggregator/Cargo.toml
index 6ef93360eb..8f8f7bc975 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.48.0"
+version = "0.49.0-alpha.2"
 authors = [
     "Claudiu-Marcel Bruda <claudiu.bruda@multiversx.com>",
     "MultiversX <contact@multiversx.com>",
@@ -19,15 +19,15 @@ edition = "2021"
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../framework/scenario"
 
 [dependencies]
diff --git a/contracts/core/price-aggregator/meta/Cargo.toml b/contracts/core/price-aggregator/meta/Cargo.toml
index f8cbef8d57..0e8d6732bc 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 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 dc2c54549f..934a5a6feb 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/core/wegld-swap/Cargo.toml b/contracts/core/wegld-swap/Cargo.toml
index f788d5c243..ec6d025440 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.48.0"
+version = "0.49.0-alpha.2"
 
 authors = [
     "Dorin Iancu <dorin.iancu@multiversx.com>",
@@ -20,13 +20,13 @@ edition = "2021"
 path = "src/wegld.rs"
 
 [dependencies.multiversx-sc]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../framework/scenario"
diff --git a/contracts/core/wegld-swap/meta/Cargo.toml b/contracts/core/wegld-swap/meta/Cargo.toml
index f9595aea8d..4503b24e93 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 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 68037cc393..af55512e72 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/adder/Cargo.toml b/contracts/examples/adder/Cargo.toml
index af28bd0554..77e0e77979 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/adder/interact/Cargo.toml b/contracts/examples/adder/interact/Cargo.toml
index 3d4ad2fd1a..dc6a5533ea 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../framework/snippets"
diff --git a/contracts/examples/adder/meta/Cargo.toml b/contracts/examples/adder/meta/Cargo.toml
index 88f66d1c86..03da88815e 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/examples/adder/wasm/Cargo.toml b/contracts/examples/adder/wasm/Cargo.toml
index d7cff9ee02..716593e814 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/bonding-curve-contract/Cargo.toml b/contracts/examples/bonding-curve-contract/Cargo.toml
index 9379cb6240..16a18869ff 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../framework/scenario"
 
diff --git a/contracts/examples/bonding-curve-contract/meta/Cargo.toml b/contracts/examples/bonding-curve-contract/meta/Cargo.toml
index 42aedeffb2..c1fc7e8517 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.48.0"
+version = "0.49.0-alpha.2"
 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 351e890820..d0666d9679 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/check-pause/Cargo.toml b/contracts/examples/check-pause/Cargo.toml
index 3de8796660..290ffbc562 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../framework/scenario"
 
diff --git a/contracts/examples/check-pause/meta/Cargo.toml b/contracts/examples/check-pause/meta/Cargo.toml
index 6fa4de8996..a526576983 100644
--- a/contracts/examples/check-pause/meta/Cargo.toml
+++ b/contracts/examples/check-pause/meta/Cargo.toml
@@ -9,6 +9,6 @@ authors = ["Alin Cruceat <alin.cruceat@multiversx.com>"]
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 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 16f0ab1ba3..1471f77b76 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/crowdfunding-esdt/Cargo.toml b/contracts/examples/crowdfunding-esdt/Cargo.toml
index b2cdf8c41e..c982172007 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../framework/scenario"
 
 [dev-dependencies]
diff --git a/contracts/examples/crowdfunding-esdt/meta/Cargo.toml b/contracts/examples/crowdfunding-esdt/meta/Cargo.toml
index a32bd3567a..2877f2c877 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.48.0"
+version = "0.49.0-alpha.2"
 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 51e3aa0862..b560b3fb61 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/crypto-bubbles/Cargo.toml b/contracts/examples/crypto-bubbles/Cargo.toml
index 47b0cc1c12..05bbae4ea6 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/crypto-bubbles/meta/Cargo.toml b/contracts/examples/crypto-bubbles/meta/Cargo.toml
index cff3b28c2e..4c0bf972fe 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.48.0"
+version = "0.49.0-alpha.2"
 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 3d0f3d9cd6..0515a1046f 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.48.0"
+version = "0.49.0-alpha.2"
 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 97ff64e9ac..2cde4b803f 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.48.0"
+version = "0.49.0-alpha.2"
 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 9b63e6b416..8f04c8950d 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../../framework/base"
diff --git a/contracts/examples/crypto-kitties/kitty-auction/Cargo.toml b/contracts/examples/crypto-kitties/kitty-auction/Cargo.toml
index 6fdda40603..c350697701 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 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 2c57c9ac05..a112a3b69c 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.48.0"
+version = "0.49.0-alpha.2"
 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 1f19435dce..257e449243 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.48.0"
+version = "0.49.0-alpha.2"
 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 171ebb65f8..f2e197c104 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 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 a9f0a17cfa..a26801542e 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.48.0"
+version = "0.49.0-alpha.2"
 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 deb7ae9c6f..7e4fd09b60 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.48.0"
+version = "0.49.0-alpha.2"
 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 da5800286f..d99ec3d2d7 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 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 ccf8cb2ea2..723a9f1ced 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.48.0"
+version = "0.49.0-alpha.2"
 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 b00ca52a2b..867b708bbc 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/crypto-zombies/Cargo.toml b/contracts/examples/crypto-zombies/Cargo.toml
index 7460e9f2d2..eaf7930699 100644
--- a/contracts/examples/crypto-zombies/Cargo.toml
+++ b/contracts/examples/crypto-zombies/Cargo.toml
@@ -9,11 +9,11 @@ publish = false
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../framework/scenario"
 
 [dependencies.kitty]
diff --git a/contracts/examples/crypto-zombies/meta/Cargo.toml b/contracts/examples/crypto-zombies/meta/Cargo.toml
index fc1eb0073f..b7d51e7216 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.48.0"
+version = "0.49.0-alpha.2"
 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 51f46ac505..29e2f90339 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/digital-cash/Cargo.toml b/contracts/examples/digital-cash/Cargo.toml
index 6d75b7b98e..f6c2eee8c7 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/digital-cash/meta/Cargo.toml b/contracts/examples/digital-cash/meta/Cargo.toml
index 7cdda9a523..5bea40a8b4 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.48.0"
+version = "0.49.0-alpha.2"
 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 14a1a7e95b..34e178511e 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/empty/Cargo.toml b/contracts/examples/empty/Cargo.toml
index d36449cf82..cbe9d305c9 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../framework/scenario"
 
 [dev-dependencies]
diff --git a/contracts/examples/empty/meta/Cargo.toml b/contracts/examples/empty/meta/Cargo.toml
index 7b869c9cdf..931c9a1806 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/examples/empty/wasm/Cargo.toml b/contracts/examples/empty/wasm/Cargo.toml
index 50c6c7519c..cc030dad95 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.48.0"
+version = "0.49.0-alpha.2"
 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 62efe492c6..9f8e06c391 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 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 41be9842d9..a60f8c4877 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.48.0"
+version = "0.49.0-alpha.2"
 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 8e57a857ec..5057d0f972 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/factorial/Cargo.toml b/contracts/examples/factorial/Cargo.toml
index f49f2de799..50c79d55b7 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/factorial/meta/Cargo.toml b/contracts/examples/factorial/meta/Cargo.toml
index 561e5cc8bb..5c76e48e8e 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/examples/factorial/wasm/Cargo.toml b/contracts/examples/factorial/wasm/Cargo.toml
index 33ef155fb4..0fd3f40ad7 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/fractional-nfts/Cargo.toml b/contracts/examples/fractional-nfts/Cargo.toml
index fda3f92c61..120f1ca2a3 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/fractional-nfts/meta/Cargo.toml b/contracts/examples/fractional-nfts/meta/Cargo.toml
index 330433a42f..8c42e9c567 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.48.0"
+version = "0.49.0-alpha.2"
 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 036b0bfd69..2e36eae6fb 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/lottery-esdt/Cargo.toml b/contracts/examples/lottery-esdt/Cargo.toml
index 47ef0326fd..f218aa93ad 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/lottery-esdt/meta/Cargo.toml b/contracts/examples/lottery-esdt/meta/Cargo.toml
index 5b87c8ade8..1b05f3c86d 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.48.0"
+version = "0.49.0-alpha.2"
 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 6839c9dec0..478f2fc345 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/multisig/Cargo.toml b/contracts/examples/multisig/Cargo.toml
index f7bdb30ed5..05643e6af2 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../framework/scenario"
 
 [dev-dependencies.adder]
@@ -27,7 +27,7 @@ path = "../adder"
 path = "../factorial"
 
 [dev-dependencies.multiversx-wegld-swap-sc]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 path = "../../core/wegld-swap"
 
 [dev-dependencies]
diff --git a/contracts/examples/multisig/interact/Cargo.toml b/contracts/examples/multisig/interact/Cargo.toml
index fef68a6a22..2cafd006f9 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../contracts/modules"
 
 [dependencies.multiversx-sc-snippets]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../framework/snippets"
 
 [dependencies.multiversx-sc-scenario]
-version = "=0.48.0"
+version = "=0.49.0-alpha.2"
 path = "../../../../framework/scenario"
diff --git a/contracts/examples/multisig/meta/Cargo.toml b/contracts/examples/multisig/meta/Cargo.toml
index 02d4e80d81..e7544b2c11 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.48.0"
+version = "0.49.0-alpha.2"
 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 7660525b67..ed54fb3f09 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.48.0"
+version = "0.49.0-alpha.2"
 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 49be4aa565..0b0ffd57c2 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/multisig/wasm/Cargo.toml b/contracts/examples/multisig/wasm/Cargo.toml
index 708980188e..3c39f4e812 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/nft-minter/Cargo.toml b/contracts/examples/nft-minter/Cargo.toml
index b845b98fc9..8b70aba861 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/nft-minter/meta/Cargo.toml b/contracts/examples/nft-minter/meta/Cargo.toml
index 16bc48dabd..7cf76194d1 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.48.0"
+version = "0.49.0-alpha.2"
 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 800d0012f8..da6e4d3c21 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/nft-storage-prepay/Cargo.toml b/contracts/examples/nft-storage-prepay/Cargo.toml
index b3fe4779eb..faffbc1a54 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/nft-storage-prepay/meta/Cargo.toml b/contracts/examples/nft-storage-prepay/meta/Cargo.toml
index 8bd9be5154..a47735c0d9 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.48.0"
+version = "0.49.0-alpha.2"
 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 4966016fe3..63ba85a7d0 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/nft-subscription/Cargo.toml b/contracts/examples/nft-subscription/Cargo.toml
index fce4b0e4be..bf9b4f419f 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/nft-subscription/meta/Cargo.toml b/contracts/examples/nft-subscription/meta/Cargo.toml
index 60363c9f03..3775f5cee5 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.48.0"
+version = "0.49.0-alpha.2"
 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 20cfc13365..1ffeadbe56 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/order-book/factory/Cargo.toml b/contracts/examples/order-book/factory/Cargo.toml
index 1715338ef5..4e17fa774b 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../framework/scenario"
 
diff --git a/contracts/examples/order-book/factory/meta/Cargo.toml b/contracts/examples/order-book/factory/meta/Cargo.toml
index 3b5a3f22e1..194a432f9c 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.48.0"
+version = "0.49.0-alpha.2"
 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 e198620a70..ce10c37c7f 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/order-book/pair/Cargo.toml b/contracts/examples/order-book/pair/Cargo.toml
index e87e2df5fd..8f961c51be 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../framework/scenario"
diff --git a/contracts/examples/order-book/pair/meta/Cargo.toml b/contracts/examples/order-book/pair/meta/Cargo.toml
index 944ad90283..45ef69dbd6 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.48.0"
+version = "0.49.0-alpha.2"
 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 db63ea95cf..9ed18aeb20 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/ping-pong-egld/Cargo.toml b/contracts/examples/ping-pong-egld/Cargo.toml
index 7b835c30a9..e968442b7c 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../framework/scenario"
 
diff --git a/contracts/examples/ping-pong-egld/meta/Cargo.toml b/contracts/examples/ping-pong-egld/meta/Cargo.toml
index 35e1eb7004..b6492950a1 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.48.0"
+version = "0.49.0-alpha.2"
 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 212fc83957..0d7ac94d72 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/proxy-pause/Cargo.toml b/contracts/examples/proxy-pause/Cargo.toml
index 1cb8060d0c..6903e9a658 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 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 654659ac3a..bbdce3a720 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.48.0"
+version = "0.49.0-alpha.2"
 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 9071e6aad0..ade889dbf1 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/rewards-distribution/Cargo.toml b/contracts/examples/rewards-distribution/Cargo.toml
index d17e0cf877..46e3c7426c 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/rewards-distribution/meta/Cargo.toml b/contracts/examples/rewards-distribution/meta/Cargo.toml
index 6e3700a114..af8b1e3fdb 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 <claudiu.bruda@multiversx.com>"]
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 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 0240cad321..06205454f5 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/seed-nft-minter/Cargo.toml b/contracts/examples/seed-nft-minter/Cargo.toml
index 466ef0d0d0..d47f7a103b 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/seed-nft-minter/meta/Cargo.toml b/contracts/examples/seed-nft-minter/meta/Cargo.toml
index 2a9164c5d5..113bf6fcbb 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 <claudiu.bruda@multiversx.com>"]
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 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 b16c0eb5be..844ec4ce9c 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/token-release/Cargo.toml b/contracts/examples/token-release/Cargo.toml
index 1ef042c083..9e84276585 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../framework/scenario"
 
diff --git a/contracts/examples/token-release/meta/Cargo.toml b/contracts/examples/token-release/meta/Cargo.toml
index 9f5e40cb3f..245912467e 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.48.0"
+version = "0.49.0-alpha.2"
 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 a5e9ad9ebb..0863733c27 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/abi-tester/Cargo.toml b/contracts/feature-tests/abi-tester/Cargo.toml
index 388a559e3f..afaa799635 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../framework/scenario"
 
 [dev-dependencies.multiversx-sc-meta]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 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 881869d35c..457e86a074 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.48.0"
+            "version": "0.49.0-alpha.2"
         }
     },
     "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 1219d4fe9b..20d4ee7906 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.48.0"
+            "version": "0.49.0-alpha.2"
         }
     },
     "docs": [
diff --git a/contracts/feature-tests/abi-tester/meta/Cargo.toml b/contracts/feature-tests/abi-tester/meta/Cargo.toml
index f494dd338d..b3d94a1fb1 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.48.0"
+version = "0.49.0-alpha.2"
 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 05200dcfbb..60b4c4d018 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.48.0"
+version = "0.49.0-alpha.2"
 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 6bc368141a..cfbf6696e6 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/alloc-features/Cargo.toml b/contracts/feature-tests/alloc-features/Cargo.toml
index ed5f30b32f..519f3892f1 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 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 95d1615d64..e5d1f0e801 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml
index e79f7e1f26..fe0fb46c53 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml
@@ -25,7 +25,7 @@ overflow-checks = false
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml
index e8ca98b331..59a3b1e893 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml
@@ -25,7 +25,7 @@ overflow-checks = false
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/alloc-features/wasm/Cargo.toml b/contracts/feature-tests/alloc-features/wasm/Cargo.toml
index b5565d0ed2..c5c9cf50ce 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/basic-features/Cargo.toml b/contracts/feature-tests/basic-features/Cargo.toml
index a9d29b944a..170e7947a3 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../framework/scenario"
 
 [dependencies.multiversx-sc-modules]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 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 73201f5eaa..52f74fd411 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../framework/snippets"
diff --git a/contracts/feature-tests/basic-features/meta/Cargo.toml b/contracts/feature-tests/basic-features/meta/Cargo.toml
index 8afa191498..b11857dcff 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.48.0"
+version = "0.49.0-alpha.2"
 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 d138f0ea4b..8a3e03b97a 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.48.0"
+version = "0.49.0-alpha.2"
 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 21bdef1ace..939489e8f0 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.48.0"
+version = "0.49.0-alpha.2"
 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 720bcbd08e..abb7d894ca 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 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 e30a20c1c5..9c685118f9 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.48.0"
+version = "0.49.0-alpha.2"
 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 52dbbfc0b8..318d83673b 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/Cargo.toml b/contracts/feature-tests/composability/Cargo.toml
index abfaefa4b8..61bf52fe14 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 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 be47382548..603387dcec 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 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 6bc3a0d913..57d609aa8c 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.48.0"
+version = "0.49.0-alpha.2"
 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 07f233341c..b92baea5d0 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.48.0"
+version = "0.49.0-alpha.2"
 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 7a5ca344e2..775eec997d 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 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 46f86e301b..ebb8656515 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 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 08b8dc1856..cd02f10c2c 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 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 209e8f2846..b3f7654bd7 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.48.0"
+version = "0.49.0-alpha.2"
 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 862cbd2b83..3d5ec4343c 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 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 186a1e4e03..98115fbd0f 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 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 0e23835bda..5b7f33d216 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.48.0"
+version = "0.49.0-alpha.2"
 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 fd79fe48f9..136c7346f1 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 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 3059fd0285..e55b31e0c0 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 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 060df7dcde..81c849a074 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 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 680b44e189..247bbec770 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.48.0"
+version = "0.49.0-alpha.2"
 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 503d0fc258..c06c523eb9 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 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 046302572d..02b3fb2b9f 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 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 a6be0ec3ff..5e25d80dee 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.48.0"
+version = "0.49.0-alpha.2"
 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 7f9e36e869..b9e68812b1 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../framework/wasm-adapter"
 optional = true
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 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 83a6f94e22..f465a1a111 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.48.0"
+version = "0.49.0-alpha.2"
 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 3f8605b67d..cb1ae3c65c 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.48.0"
+version = "0.49.0-alpha.2"
 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 522720c797..829e9f792d 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.48.0"
+version = "0.49.0-alpha.2"
 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 898735c43e..7cc1b41bdc 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 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 5cf1a567e8..92175b201b 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.48.0"
+version = "0.49.0-alpha.2"
 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 44f7e3b5eb..538475d3b1 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.48.0"
+version = "0.49.0-alpha.2"
 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 7f865a4e03..7365f87735 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.48.0"
+version = "0.49.0-alpha.2"
 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 cbc950745d..cb9092dc7b 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/forwarder/Cargo.toml b/contracts/feature-tests/composability/forwarder/Cargo.toml
index d4cd960015..23c091082c 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../framework/scenario"
 
diff --git a/contracts/feature-tests/composability/forwarder/meta/Cargo.toml b/contracts/feature-tests/composability/forwarder/meta/Cargo.toml
index 677ae9b198..5bab38b0ed 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.48.0"
+version = "0.49.0-alpha.2"
 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 87d3ac47c6..5d65561d9f 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/interact/Cargo.toml b/contracts/feature-tests/composability/interact/Cargo.toml
index f06c1178a1..9b763b7bb0 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../contracts/modules"
 
 [dependencies.multiversx-sc-snippets]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 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 8ad9825389..2f2cfc6b07 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 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 fea51513bd..b43117afb7 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.48.0"
+version = "0.49.0-alpha.2"
 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 73dceaa520..7b0d418800 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.48.0"
+version = "0.49.0-alpha.2"
 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 9efa7a4a11..aa14e0b1ac 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.48.0"
+version = "0.49.0-alpha.2"
 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 ca156aaf23..612ac28984 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.48.0"
+version = "0.49.0-alpha.2"
 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 324dafa5d4..9f4fbe32c3 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.48.0"
+version = "0.49.0-alpha.2"
 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 fe652ba3d0..8cebc36d6f 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 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 db20a499dd..e18657f249 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.48.0"
+version = "0.49.0-alpha.2"
 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 c1eebcc5b9..2261045523 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.48.0"
+version = "0.49.0-alpha.2"
 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 1f84784bcc..615d809aa5 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 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 1838388c4a..12e84b7230 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.48.0"
+version = "0.49.0-alpha.2"
 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 3dc55bf167..268ff3f2f5 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.48.0"
+version = "0.49.0-alpha.2"
 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 e68bc01059..a0a6278b38 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 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 631c940ac7..599841d5fb 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.48.0"
+version = "0.49.0-alpha.2"
 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 d040ee6a0e..9c75f7ec7f 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.48.0"
+version = "0.49.0-alpha.2"
 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 ec4dd83adb..b5acba41f5 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 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 1e918a72cc..c1c4f4df1e 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.48.0"
+version = "0.49.0-alpha.2"
 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 dca2b5415f..773143455c 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/vault/Cargo.toml b/contracts/feature-tests/composability/vault/Cargo.toml
index a4a8ecc80c..b50ef91a46 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../framework/scenario"
diff --git a/contracts/feature-tests/composability/vault/meta/Cargo.toml b/contracts/feature-tests/composability/vault/meta/Cargo.toml
index e99529f668..5f23118119 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.48.0"
+version = "0.49.0-alpha.2"
 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 f598ee7a66..9039df2a4c 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.48.0"
+version = "0.49.0-alpha.2"
 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 cb8b2e5076..1d0df10024 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.48.0"
+version = "0.49.0-alpha.2"
 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 7513310bff..9c5cb3ac00 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.48.0"
+version = "0.49.0-alpha.2"
 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 ff4595fa13..5cb374cf2f 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 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 0dc9b2ca7f..edbca52c79 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.48.0"
+version = "0.49.0-alpha.2"
 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 0aea0a7c62..bd96532634 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.48.0"
+version = "0.49.0-alpha.2"
 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 747b44ed09..f40d3515e1 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 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 50152e90f4..521545335f 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.48.0"
+version = "0.49.0-alpha.2"
 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 516a43eb63..840f16343b 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.48.0"
+version = "0.49.0-alpha.2"
 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 29330a315c..d43e1a740f 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 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 5094698b9a..76c3595d6c 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.48.0"
+version = "0.49.0-alpha.2"
 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 ceb1f2e24f..acfe93462e 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.48.0"
+version = "0.49.0-alpha.2"
 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 ba949e755a..7b174d1c34 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 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 34f1067c10..62714e29b5 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.48.0"
+version = "0.49.0-alpha.2"
 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 32dc473808..4b97617741 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.48.0"
+version = "0.49.0-alpha.2"
 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 b4cf18bfad..8c19ff102d 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 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 41e8801b40..2d02fbd210 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.48.0"
+version = "0.49.0-alpha.2"
 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 236319abc4..d5f6957015 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.48.0"
+version = "0.49.0-alpha.2"
 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 4501c0b464..254a40cb7c 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 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 a9529971a8..2fee5bb8f9 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.48.0"
+version = "0.49.0-alpha.2"
 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 e5db8a5667..22edbf129b 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.48.0"
+version = "0.49.0-alpha.2"
 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 3469c841a7..2d569594b0 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 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 02486b2086..d433dc152e 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.48.0"
+version = "0.49.0-alpha.2"
 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 42237353f2..773ab49014 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.48.0"
+version = "0.49.0-alpha.2"
 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 8740d1fdcb..110a8e9bd9 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 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 88dc69e511..4003060c14 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.48.0"
+version = "0.49.0-alpha.2"
 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 710f03a2f5..35572ee7f2 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/exchange-features/Cargo.toml b/contracts/feature-tests/exchange-features/Cargo.toml
index adf86f8ae9..c5f62b4c5a 100644
--- a/contracts/feature-tests/exchange-features/Cargo.toml
+++ b/contracts/feature-tests/exchange-features/Cargo.toml
@@ -9,9 +9,9 @@ publish = false
 path = "src/exchange_features.rs"
 
 [dependencies.multiversx-sc]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../framework/scenario"
diff --git a/contracts/feature-tests/exchange-features/meta/Cargo.toml b/contracts/feature-tests/exchange-features/meta/Cargo.toml
index 589d79efaa..f7a183430f 100644
--- a/contracts/feature-tests/exchange-features/meta/Cargo.toml
+++ b/contracts/feature-tests/exchange-features/meta/Cargo.toml
@@ -8,6 +8,6 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/feature-tests/exchange-features/wasm/Cargo.toml b/contracts/feature-tests/exchange-features/wasm/Cargo.toml
index ab4527595f..fa2c693992 100644
--- a/contracts/feature-tests/exchange-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/exchange-features/wasm/Cargo.toml
@@ -25,7 +25,7 @@ overflow-checks = false
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 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 684fa23b9d..cc124713b7 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 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 3657415363..b0d9228ef7 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.48.0"
+version = "0.49.0-alpha.2"
 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 4f674abe4b..57f367e7b7 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.48.0"
+version = "0.49.0-alpha.2"
 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 cb63f04709..39a114ccee 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 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 61694618e8..70337ef43e 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.48.0"
+version = "0.49.0-alpha.2"
 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 17766d61c0..320c50a632 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.48.0"
+version = "0.49.0-alpha.2"
 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 3dbd436d23..9715f9ed8f 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 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 47d91e055b..573b351f94 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.48.0"
+version = "0.49.0-alpha.2"
 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 d79a234dd7..e2208ba71b 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.48.0"
+version = "0.49.0-alpha.2"
 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 e0860d7f9f..56e59eb3c5 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.48.0"
+version = "0.49.0-alpha.2"
 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 a54dbf64d6..d285b18931 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.48.0"
+version = "0.49.0-alpha.2"
 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 43733a6182..9d6e21c6ea 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.48.0"
+version = "0.49.0-alpha.2"
 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 91e73a3ee1..3698a878b9 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 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 c456c8c35c..99414c7e02 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.48.0"
+version = "0.49.0-alpha.2"
 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 06895f2613..63bee8f3d1 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/payable-features/Cargo.toml b/contracts/feature-tests/payable-features/Cargo.toml
index 713b045b04..1955cc0d71 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../framework/scenario"
diff --git a/contracts/feature-tests/payable-features/meta/Cargo.toml b/contracts/feature-tests/payable-features/meta/Cargo.toml
index 93e4981ee2..b138fb0932 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.48.0"
+version = "0.49.0-alpha.2"
 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 790b323a3a..049b406aa5 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.48.0"
+version = "0.49.0-alpha.2"
 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 e90edbe6d6..3e8a6469a5 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 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 e0912a5305..40979f73f1 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.48.0"
+version = "0.49.0-alpha.2"
 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 7395919b55..fc87dc6b82 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../framework/meta"
 default-features = false
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 60ad1ebb93..08c7eb2512 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.48.0"
+version = "0.49.0-alpha.2"
 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 fcdf74843b..0ecc629875 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../framework/base"
 features = [ "alloc" ]
 
@@ -17,7 +17,7 @@ path = "../../examples/adder"
 path = "../../feature-tests/basic-features"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 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 cf03d27bcb..abfddefb59 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.48.0"
+version = "0.49.0-alpha.2"
 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 2431c1c2b8..dc5966b935 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/use-module/Cargo.toml b/contracts/feature-tests/use-module/Cargo.toml
index 501ea6f461..905ede62be 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../contracts/modules"
 
 [dependencies.multiversx-sc]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../framework/scenario"
 
 [dev-dependencies.multiversx-sc-meta]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../framework/meta"
diff --git a/contracts/feature-tests/use-module/meta/Cargo.toml b/contracts/feature-tests/use-module/meta/Cargo.toml
index c5f47f1892..557e9f5fad 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.48.0"
+version = "0.49.0-alpha.2"
 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 6a6a8b029c..3184d932c3 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 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 cd34bba6d9..7bdd9cdc73 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.48.0"
+            "version": "0.49.0-alpha.2"
         }
     },
     "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 e91480ad37..bb8b10e3dd 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.48.0"
+            "version": "0.49.0-alpha.2"
         }
     },
     "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 455a51b925..9e0975de50 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.48.0"
+version = "0.49.0-alpha.2"
 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 2a4a269055..ee8e101689 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/modules/Cargo.toml b/contracts/modules/Cargo.toml
index 14775b4f4d..87cd42fe2d 100644
--- a/contracts/modules/Cargo.toml
+++ b/contracts/modules/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-modules"
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 edition = "2021"
 
 authors = ["MultiversX <contact@multiversx.com>"]
@@ -17,5 +17,5 @@ categories = ["no-std", "wasm", "cryptography::cryptocurrencies"]
 alloc = ["multiversx-sc/alloc"]
 
 [dependencies.multiversx-sc]
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 path = "../../framework/base"
diff --git a/framework/base/Cargo.toml b/framework/base/Cargo.toml
index 646fc2fe56..226844c6b4 100644
--- a/framework/base/Cargo.toml
+++ b/framework/base/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc"
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 edition = "2021"
 
 authors = ["Andrei Marinica <andrei.marinica@multiversx.com>", "MultiversX <contact@multiversx.com>"]
@@ -28,7 +28,7 @@ bitflags = "=2.4.2"
 num-traits = { version = "=0.2.17", default-features = false }
 
 [dependencies.multiversx-sc-derive]
-version = "=0.48.0"
+version = "=0.49.0-alpha.2"
 path = "../derive"
 
 [dependencies.multiversx-sc-codec]
diff --git a/framework/base/src/types/interaction/system_proxy/legacy_system_sc_proxy.rs b/framework/base/src/types/interaction/system_proxy/legacy_system_sc_proxy.rs
index b784da1f8e..35486c6c04 100644
--- a/framework/base/src/types/interaction/system_proxy/legacy_system_sc_proxy.rs
+++ b/framework/base/src/types/interaction/system_proxy/legacy_system_sc_proxy.rs
@@ -23,7 +23,7 @@ const ISSUE_AND_SET_ALL_ROLES_ENDPOINT_NAME: &str = "registerAndSetAllRoles";
 /// Unlike other contract proxies, this one has a fixed address,
 /// so the proxy object doesn't really contain any data, it is more of a placeholder.
 #[deprecated(
-    since = "0.48.0",
+    since = "0.49.0",
     note = "There is a new `ESDTSystemSCProxy`, which uses the new proxy model."
 )]
 pub struct ESDTSystemSmartContractProxy<SA>
diff --git a/framework/derive/Cargo.toml b/framework/derive/Cargo.toml
index 2130f5c384..e3c39d67b6 100644
--- a/framework/derive/Cargo.toml
+++ b/framework/derive/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 edition = "2021"
 
 authors = ["Andrei Marinica <andrei.marinica@multiversx.com>", "MultiversX <contact@multiversx.com>"]
diff --git a/framework/meta/Cargo.toml b/framework/meta/Cargo.toml
index 9080bf7e04..a63b1b7e61 100644
--- a/framework/meta/Cargo.toml
+++ b/framework/meta/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-meta"
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 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.48.0"
+version = "=0.49.0-alpha.2"
 path = "../base"
 features = ["alloc", "num-bigint"]
 
diff --git a/framework/scenario/Cargo.toml b/framework/scenario/Cargo.toml
index 0d487891c3..ac7b78cd25 100644
--- a/framework/scenario/Cargo.toml
+++ b/framework/scenario/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-scenario"
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 edition = "2021"
 
 authors = [
@@ -40,12 +40,12 @@ path = "src/main.rs"
 run-go-tests = []
 
 [dependencies.multiversx-sc]
-version = "=0.48.0"
+version = "=0.49.0-alpha.2"
 features = ["alloc", "num-bigint"]
 path = "../base"
 
 [dependencies.multiversx-sc-meta]
-version = "=0.48.0"
+version = "=0.49.0-alpha.2"
 path = "../meta"
 
 [dependencies.multiversx-chain-scenario-format]
diff --git a/framework/snippets/Cargo.toml b/framework/snippets/Cargo.toml
index 8fd24f67cb..03a0d48c6c 100644
--- a/framework/snippets/Cargo.toml
+++ b/framework/snippets/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-snippets"
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 edition = "2021"
 
 authors = ["MultiversX <contact@multiversx.com>"]
@@ -22,7 +22,7 @@ env_logger = "0.11"
 futures = "0.3"
 
 [dependencies.multiversx-sc-scenario]
-version = "=0.48.0"
+version = "=0.49.0-alpha.2"
 path = "../scenario"
 
 [dependencies.multiversx-sdk]
diff --git a/framework/wasm-adapter/Cargo.toml b/framework/wasm-adapter/Cargo.toml
index a73659240a..9220813f9b 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.48.0"
+version = "0.49.0-alpha.2"
 edition = "2021"
 
 authors = [
@@ -22,5 +22,5 @@ categories = [
 ]
 
 [dependencies.multiversx-sc]
-version = "=0.48.0"
+version = "=0.49.0-alpha.2"
 path = "../base"
diff --git a/tools/mxpy-snippet-generator/Cargo.toml b/tools/mxpy-snippet-generator/Cargo.toml
index ca71edf2e8..1cda1d668a 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.48.0"
+version = "0.49.0-alpha.2"
 path = "../../framework/base"
 
 [dependencies]
diff --git a/tools/rust-debugger/format-tests/Cargo.toml b/tools/rust-debugger/format-tests/Cargo.toml
index 0e22178945..1f8412b35d 100644
--- a/tools/rust-debugger/format-tests/Cargo.toml
+++ b/tools/rust-debugger/format-tests/Cargo.toml
@@ -9,11 +9,11 @@ name = "format-tests"
 path = "src/format_tests.rs"
 
 [dependencies.multiversx-sc]
-version = "=0.48.0"
+version = "=0.49.0-alpha.2"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-scenario]
-version = "=0.48.0"
+version = "=0.49.0-alpha.2"
 path = "../../../framework/scenario"
 
 [dependencies.multiversx-chain-vm]

From 251bff4c2dbac03454fe0ad3eff250dd56b12743 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 9 Apr 2024 23:14:36 +0300
Subject: [PATCH 0686/1254] result handler cleanup in examples

---
 .../examples/adder/interact/src/basic_interact.rs     |  9 ---------
 contracts/examples/adder/tests/adder_blackbox_test.rs | 11 ++++-------
 .../panic-message-features/tests/pmf_blackbox_test.rs |  8 ++++----
 3 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/contracts/examples/adder/interact/src/basic_interact.rs b/contracts/examples/adder/interact/src/basic_interact.rs
index 4fc748c95e..83d3e609ca 100644
--- a/contracts/examples/adder/interact/src/basic_interact.rs
+++ b/contracts/examples/adder/interact/src/basic_interact.rs
@@ -92,15 +92,6 @@ impl AdderInteract {
             .typed(adder_proxy::AdderProxy)
             .init(0u32)
             .code(&self.adder_code)
-            .with_result(WithRawTxResponse(|response| {
-                let err = &response.tx_error;
-                assert!(
-                    err.is_success(),
-                    "deploy failed: status: {}, message: {}",
-                    err.status,
-                    err.message
-                );
-            }))
             .returns(ReturnsNewAddress)
             .prepare_async()
             .run()
diff --git a/contracts/examples/adder/tests/adder_blackbox_test.rs b/contracts/examples/adder/tests/adder_blackbox_test.rs
index 6a3142a207..e52c8c3ddb 100644
--- a/contracts/examples/adder/tests/adder_blackbox_test.rs
+++ b/contracts/examples/adder/tests/adder_blackbox_test.rs
@@ -31,17 +31,17 @@ fn adder_blackbox() {
             .new_address(owner_address, 1, "sc:adder"),
     );
 
-    world
+    let new_address = world
         .tx()
         .from(OWNER)
         .typed(adder_proxy::AdderProxy)
         .init(5u32)
         .code(CODE_EXPR)
-        .with_result(WithNewAddress::new(|new_address| {
-            assert_eq!(new_address.to_address(), adder_contract.to_address());
-        }))
+        .returns(ReturnsNewAddress)
         .run();
 
+    assert_eq!(new_address, adder_contract.to_address());
+
     let value = world
         .query()
         .to(SC_ADDER)
@@ -57,9 +57,6 @@ fn adder_blackbox() {
         .to(SC_ADDER)
         .typed(adder_proxy::AdderProxy)
         .add(1u32)
-        .with_result(WithRawTxResponse(|response| {
-            assert!(response.tx_error.is_success());
-        }))
         .run();
 
     world.check_state_step(
diff --git a/contracts/feature-tests/panic-message-features/tests/pmf_blackbox_test.rs b/contracts/feature-tests/panic-message-features/tests/pmf_blackbox_test.rs
index 66b2d9527e..3d13175c09 100644
--- a/contracts/feature-tests/panic-message-features/tests/pmf_blackbox_test.rs
+++ b/contracts/feature-tests/panic-message-features/tests/pmf_blackbox_test.rs
@@ -73,8 +73,8 @@ fn tx_expect_error_test() {
         .to(SC_PMF)
         .typed(pmf_proxy::PanicMessageFeaturesProxy)
         .sc_panic()
-        .returns(ExpectStatus(4))
-        .returns(ExpectMessage("sc_panic! test"))
+        .with_result(ExpectStatus(4))
+        .with_result(ExpectMessage("sc_panic! test"))
         .run();
 }
 
@@ -87,7 +87,7 @@ fn query_expect_error_test() {
         .to(SC_PMF)
         .typed(pmf_proxy::PanicMessageFeaturesProxy)
         .sc_panic()
-        .returns(ExpectStatus(4))
-        .returns(ExpectMessage("sc_panic! test"))
+        .with_result(ExpectStatus(4))
+        .with_result(ExpectMessage("sc_panic! test"))
         .run();
 }

From 9db6c7313c08a4cd0dd1fe7b8506db3e38cca9f0 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 10 Apr 2024 01:46:40 +0300
Subject: [PATCH 0687/1254] Bech32Address & interactor cleanup

---
 .../adder/interact/src/basic_interact.rs      |  33 ++-
 .../interact/src/basic_interact_state.rs      |  20 +-
 .../interact/src/multisig_interact.rs         |  48 ++---
 .../interact/src/multisig_interact_nfts.rs    |  21 +-
 .../interact/src/multisig_interact_state.rs   |  17 +-
 .../interact/src/multisig_interact_wegld.rs   |   4 +-
 framework/scenario/src/bech32.rs              |   3 +-
 framework/scenario/src/facade/expr.rs         |   2 +
 .../src/facade/expr/bech32_address.rs         | 190 ++++++++++++++++++
 .../scenario/src/facade/result_handlers.rs    |   2 +
 .../returns_new_bech32_address.rs             |  27 +++
 .../src/scenario/model/value/address_key.rs   |  22 +-
 .../src/scenario/model/value/address_value.rs |  29 ++-
 .../interactor_sc_deploy.rs                   |  11 +-
 14 files changed, 335 insertions(+), 94 deletions(-)
 create mode 100644 framework/scenario/src/facade/expr/bech32_address.rs
 create mode 100644 framework/scenario/src/facade/result_handlers/returns_new_bech32_address.rs

diff --git a/contracts/examples/adder/interact/src/basic_interact.rs b/contracts/examples/adder/interact/src/basic_interact.rs
index 83d3e609ca..8a8a6c22fd 100644
--- a/contracts/examples/adder/interact/src/basic_interact.rs
+++ b/contracts/examples/adder/interact/src/basic_interact.rs
@@ -41,7 +41,7 @@ async fn main() {
 #[allow(unused)]
 struct AdderInteract {
     interactor: Interactor,
-    wallet_address: Address,
+    wallet_address: Bech32Address,
     adder_code: BytesValue,
     state: State,
 }
@@ -61,17 +61,17 @@ impl AdderInteract {
 
         Self {
             interactor,
-            wallet_address,
+            wallet_address: wallet_address.into(),
             adder_code,
             state: State::load_state(),
         }
     }
 
     async fn set_state(&mut self) {
-        println!("wallet address: {}", bech32::encode(&self.wallet_address));
+        println!("wallet address: {}", &self.wallet_address);
         let scenario_raw = retrieve_account_as_scenario_set_state(
             Config::load_config().gateway().to_string(),
-            bech32::encode(&self.wallet_address),
+            self.wallet_address.to_bech32_string(),
             true,
         )
         .await;
@@ -92,16 +92,13 @@ impl AdderInteract {
             .typed(adder_proxy::AdderProxy)
             .init(0u32)
             .code(&self.adder_code)
-            .returns(ReturnsNewAddress)
+            .returns(ReturnsNewBech32Address)
             .prepare_async()
             .run()
             .await;
 
-        let new_address_bech32 = bech32::encode(&new_address);
-        println!("new address: {new_address_bech32}");
-
-        let new_address_expr = format!("bech32:{new_address_bech32}");
-        self.state.set_adder_address(&new_address_expr);
+        println!("new address: {new_address}");
+        self.state.set_adder_address(new_address);
     }
 
     async fn multi_deploy(&mut self, count: &u8) {
@@ -121,17 +118,15 @@ impl AdderInteract {
                     .init(0u32)
                     .code(&self.adder_code)
                     .gas(NumExpr("70,000,000"))
-                    .returns(ReturnsNewAddress)
+                    .returns(ReturnsNewBech32Address)
             });
         }
 
         let results = buffer.run().await;
-        for result in results {
-            let new_address_bech32 = bech32::encode(&result);
-            println!("new address: {new_address_bech32}");
+        for new_address in results {
+            println!("new address: {new_address}");
 
-            let new_address_expr = format!("bech32:{new_address_bech32}");
-            self.state.set_adder_address(&new_address_expr);
+            self.state.set_adder_address(new_address);
         }
     }
 
@@ -139,7 +134,7 @@ impl AdderInteract {
         self.interactor
             .tx()
             .from(&self.wallet_address)
-            .to(self.state.adder().to_address())
+            .to(self.state.current_adder_address())
             .egld(NumExpr("0,050000000000000000"))
             .prepare_async()
             .run()
@@ -150,7 +145,7 @@ impl AdderInteract {
         self.interactor
             .tx()
             .from(&self.wallet_address)
-            .to(self.state.adder().to_address())
+            .to(self.state.current_adder_address())
             .typed(adder_proxy::AdderProxy)
             .add(value)
             .prepare_async()
@@ -164,7 +159,7 @@ impl AdderInteract {
         let sum = self
             .interactor
             .query()
-            .to(self.state.adder().to_address())
+            .to(self.state.current_adder_address())
             .typed(adder_proxy::AdderProxy)
             .sum()
             .returns(ReturnsResultConv::<RustBigUint>::new())
diff --git a/contracts/examples/adder/interact/src/basic_interact_state.rs b/contracts/examples/adder/interact/src/basic_interact_state.rs
index 7fe09dc0ed..41453e36fd 100644
--- a/contracts/examples/adder/interact/src/basic_interact_state.rs
+++ b/contracts/examples/adder/interact/src/basic_interact_state.rs
@@ -1,4 +1,4 @@
-use crate::{ContractInfo, StaticApi};
+use multiversx_sc_snippets::imports::*;
 use serde::{Deserialize, Serialize};
 use std::{
     io::{Read, Write},
@@ -8,12 +8,10 @@ use std::{
 /// State file
 const STATE_FILE: &str = "state.toml";
 
-pub type AdderContract = ContractInfo<adder::Proxy<StaticApi>>;
-
 /// Multisig Interact state
 #[derive(Debug, Default, Serialize, Deserialize)]
 pub struct State {
-    adder_address: Option<String>,
+    adder_address: Option<Bech32Address>,
 }
 
 impl State {
@@ -30,17 +28,15 @@ impl State {
     }
 
     /// Sets the adder address
-    pub fn set_adder_address(&mut self, address: &str) {
-        self.adder_address = Some(String::from(address));
+    pub fn set_adder_address(&mut self, address: Bech32Address) {
+        self.adder_address = Some(address);
     }
 
     /// Returns the adder contract
-    pub fn adder(&self) -> AdderContract {
-        AdderContract::new(
-            self.adder_address
-                .clone()
-                .expect("no known adder contract, deploy first"),
-        )
+    pub fn current_adder_address(&self) -> &Bech32Address {
+        self.adder_address
+            .as_ref()
+            .expect("no known adder contract, deploy first")
     }
 }
 
diff --git a/contracts/examples/multisig/interact/src/multisig_interact.rs b/contracts/examples/multisig/interact/src/multisig_interact.rs
index 9148af2e86..5975c7299c 100644
--- a/contracts/examples/multisig/interact/src/multisig_interact.rs
+++ b/contracts/examples/multisig/interact/src/multisig_interact.rs
@@ -76,7 +76,7 @@ async fn main() {
 
 struct MultisigInteract {
     interactor: Interactor,
-    wallet_address: Address,
+    wallet_address: Bech32Address,
     system_sc_address: Address,
     collection_token_identifier: String,
     multisig_code: BytesValue,
@@ -98,7 +98,7 @@ impl MultisigInteract {
 
         Self {
             interactor,
-            wallet_address,
+            wallet_address: wallet_address.into(),
             system_sc_address: bech32::decode(SYSTEM_SC_BECH32),
             collection_token_identifier: String::new(),
             multisig_code,
@@ -152,16 +152,14 @@ impl MultisigInteract {
             .init(quorum, board)
             .code(&self.multisig_code)
             .gas(NumExpr("100,000,000"))
-            .returns(ReturnsNewAddress)
+            .returns(ReturnsNewBech32Address)
             .prepare_async()
             .run()
             .await;
 
-        let new_address_bech32 = bech32::encode(&new_address);
-        println!("new address: {new_address_bech32}");
+        println!("new address: {new_address}");
 
-        let new_address_expr = format!("bech32:{new_address_bech32}");
-        self.state.set_multisig_address(&new_address_expr);
+        self.state.set_multisig_address(new_address);
     }
 
     async fn multi_deploy(&mut self, count: &u8) {
@@ -182,17 +180,14 @@ impl MultisigInteract {
                     .init(quorum, board.clone())
                     .code(&self.multisig_code)
                     .gas(NumExpr("70,000,000"))
-                    .returns(ReturnsNewAddress)
+                    .returns(ReturnsNewBech32Address)
             });
         }
 
         let results = buffer.run().await;
-        for result in results {
-            let new_address_bech32 = bech32::encode(&result);
-            println!("new address: {new_address_bech32}");
-
-            let new_address_expr = format!("bech32:{new_address_bech32}");
-            self.state.set_multisig_address(&new_address_expr);
+        for new_address in results {
+            println!("new address: {new_address}");
+            self.state.set_multisig_address(new_address);
         }
     }
 
@@ -202,7 +197,7 @@ impl MultisigInteract {
         let eve = test_wallets::eve();
 
         MultiValueVec::from([
-            self.wallet_address.clone(),
+            self.wallet_address.to_address(),
             carol.address().to_bytes().into(),
             dan.address().to_bytes().into(),
             eve.address().to_bytes().into(),
@@ -213,7 +208,7 @@ impl MultisigInteract {
         self.interactor
             .tx()
             .from(&self.wallet_address)
-            .to(self.state.multisig().to_address())
+            .to(self.state.current_multisig_address())
             .egld(BigUint::from(50_000_000_000_000_000u64)) // 0,05 or 5 * 10^16
             .prepare_async()
             .run()
@@ -229,7 +224,7 @@ impl MultisigInteract {
         self.interactor
             .tx()
             .from(&self.wallet_address)
-            .to(self.state.multisig().to_address())
+            .to(self.state.current_multisig_address())
             .gas(gas_expr)
             .typed(multisig_proxy::MultisigProxy)
             .perform_action_endpoint(action_id)
@@ -241,8 +236,6 @@ impl MultisigInteract {
     }
 
     async fn perform_actions(&mut self, action_ids: Vec<usize>, gas_expr: u64) {
-        let multisig_address = self.state.multisig().to_address();
-
         let mut actions_no_quorum_reached = Vec::new();
         for &action_id in &action_ids {
             if self.quorum_reached(action_id).await {
@@ -256,10 +249,11 @@ impl MultisigInteract {
 
         let from = &self.wallet_address;
         let mut buffer = self.interactor.homogenous_call_buffer();
+        let multisig_address = self.state.current_multisig_address();
         for action_id in action_ids {
             buffer.push_tx(|tx| {
                 tx.from(from)
-                    .to(&multisig_address)
+                    .to(multisig_address)
                     .gas(gas_expr)
                     .typed(multisig_proxy::MultisigProxy)
                     .perform_action_endpoint(action_id)
@@ -283,7 +277,7 @@ impl MultisigInteract {
     async fn quorum_reached(&mut self, action_id: usize) -> bool {
         self.interactor
             .query()
-            .to(self.state.multisig().to_address())
+            .to(self.state.current_multisig_address())
             .typed(multisig_proxy::MultisigProxy)
             .quorum_reached(action_id)
             .returns(ReturnsResult)
@@ -295,7 +289,7 @@ impl MultisigInteract {
     async fn signed(&mut self, signer: &Address, action_id: usize) -> bool {
         self.interactor
             .query()
-            .to(self.state.multisig().to_address())
+            .to(self.state.current_multisig_address())
             .typed(multisig_proxy::MultisigProxy)
             .signed(signer, action_id)
             .returns(ReturnsResult)
@@ -306,7 +300,6 @@ impl MultisigInteract {
 
     async fn sign(&mut self, action_ids: &[usize]) {
         println!("signing actions `{action_ids:?}`...");
-        let multisig_address = self.state.multisig().to_address();
 
         let mut pending_signers = Vec::<(Address, usize)>::new();
         for &action_id in action_ids {
@@ -323,10 +316,11 @@ impl MultisigInteract {
         }
 
         let mut buffer = self.interactor.homogenous_call_buffer();
+        let multisig_address = self.state.current_multisig_address();
         for (signer, action_id) in pending_signers {
             buffer.push_tx(|tx| {
                 tx.from(signer)
-                    .to(&multisig_address)
+                    .to(multisig_address)
                     .gas(15_000_000u64)
                     .typed(multisig_proxy::MultisigProxy)
                     .sign(action_id)
@@ -350,7 +344,7 @@ impl MultisigInteract {
         self.interactor
             .tx()
             .from(&self.wallet_address)
-            .to(self.state.multisig().to_address())
+            .to(self.state.current_multisig_address())
             .gas(NumExpr("30,000,000"))
             .typed(multisig_proxy::MultisigProxy)
             .dns_register(dns_address, name)
@@ -365,7 +359,7 @@ impl MultisigInteract {
         let quorum = self
             .interactor
             .query()
-            .to(self.state.multisig().to_address())
+            .to(self.state.current_multisig_address())
             .typed(multisig_proxy::MultisigProxy)
             .quorum()
             .returns(ReturnsResult)
@@ -380,7 +374,7 @@ impl MultisigInteract {
         let board = self
             .interactor
             .query()
-            .to(self.state.multisig().to_address())
+            .to(self.state.current_multisig_address())
             .typed(multisig_proxy::MultisigProxy)
             .num_board_members()
             .returns(ReturnsResult)
diff --git a/contracts/examples/multisig/interact/src/multisig_interact_nfts.rs b/contracts/examples/multisig/interact/src/multisig_interact_nfts.rs
index e7fb0104af..ebc30300ef 100644
--- a/contracts/examples/multisig/interact/src/multisig_interact_nfts.rs
+++ b/contracts/examples/multisig/interact/src/multisig_interact_nfts.rs
@@ -38,7 +38,7 @@ impl MultisigInteract {
             .interactor
             .tx()
             .from(&self.wallet_address)
-            .to(self.state.multisig().to_address())
+            .to(self.state.current_multisig_address())
             .gas(NumExpr("10,000,000"))
             .typed(multisig_proxy::MultisigProxy)
             .propose_async_call(
@@ -71,7 +71,7 @@ impl MultisigInteract {
             .interactor
             .tx()
             .from(&self.wallet_address)
-            .to(&self.state.multisig().to_address())
+            .to(self.state.current_multisig_address())
             .gas(NumExpr("80,000,000"))
             .typed(multisig_proxy::MultisigProxy)
             .perform_action_endpoint(action_id)
@@ -93,7 +93,7 @@ impl MultisigInteract {
             .interactor
             .tx()
             .from(&self.wallet_address)
-            .to(&self.state.multisig().to_address())
+            .to(self.state.current_multisig_address())
             .gas(NumExpr("10,000,000"))
             .typed(multisig_proxy::MultisigProxy)
             .propose_async_call(
@@ -124,7 +124,7 @@ impl MultisigInteract {
             .interactor
             .tx()
             .from(&self.wallet_address)
-            .to(&self.state.multisig().to_address())
+            .to(self.state.current_multisig_address())
             .gas(NumExpr("80,000,000"))
             .typed(multisig_proxy::MultisigProxy)
             .perform_action_endpoint(action_id)
@@ -141,12 +141,12 @@ impl MultisigInteract {
     }
 
     pub async fn propose_set_special_role(&mut self) -> usize {
-        let multisig_address = self.state.multisig().to_address();
+        let multisig_address = self.state.current_multisig_address();
         let action_id = self
             .interactor
             .tx()
             .from(&self.wallet_address)
-            .to(&self.state.multisig().to_address())
+            .to(self.state.current_multisig_address())
             .gas(NumExpr("10,000,000"))
             .typed(multisig_proxy::MultisigProxy)
             .propose_async_call(
@@ -154,7 +154,7 @@ impl MultisigInteract {
                 0u64,
                 FunctionCall::new("setSpecialRole")
                     .argument(&self.collection_token_identifier)
-                    .argument(&multisig_address)
+                    .argument(multisig_address)
                     .argument(&"ESDTRoleNFTCreate"),
             )
             .returns(ReturnsResult)
@@ -177,9 +177,8 @@ impl MultisigInteract {
     pub async fn create_items(&mut self) {
         println!("creating items...");
 
-        let multisig_address = self.state.multisig().to_address();
-
         let mut buffer = self.interactor.homogenous_call_buffer();
+        let multisig_address = self.state.current_multisig_address();
         for item_index in 0..NUM_ITEMS {
             let item_name = format!("Test collection item #{item_index}");
             let image_cid = format!(
@@ -188,11 +187,11 @@ impl MultisigInteract {
 
             buffer.push_tx(|tx| {
                 tx.from(&self.wallet_address)
-                    .to(&multisig_address)
+                    .to(multisig_address)
                     .gas(10_000_000u64)
                     .typed(multisig_proxy::MultisigProxy)
                     .propose_async_call(
-                        &multisig_address,
+                        multisig_address,
                         0u64,
                         FunctionCall::new("ESDTNFTCreate")
                             .argument(&self.collection_token_identifier)
diff --git a/contracts/examples/multisig/interact/src/multisig_interact_state.rs b/contracts/examples/multisig/interact/src/multisig_interact_state.rs
index f3c97482df..d5ff8bb7c1 100644
--- a/contracts/examples/multisig/interact/src/multisig_interact_state.rs
+++ b/contracts/examples/multisig/interact/src/multisig_interact_state.rs
@@ -1,4 +1,4 @@
-use crate::{ContractInfo, StaticApi};
+use multiversx_sc_scenario::imports::Bech32Address;
 use serde::{Deserialize, Serialize};
 use std::{
     io::{Read, Write},
@@ -8,12 +8,10 @@ use std::{
 /// State file
 const STATE_FILE: &str = "state.toml";
 
-pub type MultisigContract = ContractInfo<multisig::Proxy<StaticApi>>;
-
 /// Multisig Interact state
 #[derive(Debug, Default, Serialize, Deserialize)]
 pub struct State {
-    multisig_address: Option<String>,
+    multisig_address: Option<Bech32Address>,
 }
 
 impl State {
@@ -30,13 +28,14 @@ impl State {
     }
 
     /// Sets the multisig address
-    pub fn set_multisig_address(&mut self, address: &str) {
-        self.multisig_address = Some(String::from(address));
+    pub fn set_multisig_address(&mut self, address: Bech32Address) {
+        self.multisig_address = Some(address);
     }
 
-    /// Returns the multisig contract
-    pub fn multisig(&self) -> MultisigContract {
-        MultisigContract::new(self.multisig_address.clone().unwrap())
+    pub fn current_multisig_address(&self) -> &Bech32Address {
+        self.multisig_address
+            .as_ref()
+            .expect("no known multisig contract, deploy first")
     }
 }
 
diff --git a/contracts/examples/multisig/interact/src/multisig_interact_wegld.rs b/contracts/examples/multisig/interact/src/multisig_interact_wegld.rs
index fbfdd6f4a6..c9156e991d 100644
--- a/contracts/examples/multisig/interact/src/multisig_interact_wegld.rs
+++ b/contracts/examples/multisig/interact/src/multisig_interact_wegld.rs
@@ -53,7 +53,7 @@ impl MultisigInteract {
             .interactor
             .tx()
             .from(&self.wallet_address)
-            .to(&self.state.multisig().to_address())
+            .to(self.state.current_multisig_address())
             .gas(NumExpr("10,000,000"))
             .typed(multisig_proxy::MultisigProxy)
             .propose_async_call(
@@ -83,7 +83,7 @@ impl MultisigInteract {
             .interactor
             .tx()
             .from(&self.wallet_address)
-            .to(&self.state.multisig().to_address())
+            .to(self.state.current_multisig_address())
             .gas(NumExpr("10,000,000"))
             .typed(multisig_proxy::MultisigProxy)
             .propose_async_call(to, 0u64, function_call)
diff --git a/framework/scenario/src/bech32.rs b/framework/scenario/src/bech32.rs
index 4b72107bb8..aa224cee95 100644
--- a/framework/scenario/src/bech32.rs
+++ b/framework/scenario/src/bech32.rs
@@ -2,7 +2,8 @@ use bech32::{FromBase32, ToBase32, Variant};
 use multiversx_sc::types::heap::Address;
 
 pub fn decode(bech32_address: &str) -> Address {
-    let (_, dest_address_bytes_u5, _) = bech32::decode(bech32_address).unwrap();
+    let (_, dest_address_bytes_u5, _) = bech32::decode(bech32_address)
+        .unwrap_or_else(|err| panic!("bech32 decode error for {bech32_address}: {err}"));
     let dest_address_bytes = Vec::<u8>::from_base32(&dest_address_bytes_u5).unwrap();
     if dest_address_bytes.len() != 32 {
         panic!("Invalid address length after decoding")
diff --git a/framework/scenario/src/facade/expr.rs b/framework/scenario/src/facade/expr.rs
index 37750ee973..6ea8595740 100644
--- a/framework/scenario/src/facade/expr.rs
+++ b/framework/scenario/src/facade/expr.rs
@@ -1,7 +1,9 @@
+mod bech32_address;
 mod file_expr;
 mod mxsc_expr;
 mod num_expr;
 
+pub use bech32_address::Bech32Address;
 pub use file_expr::FileExpr;
 pub use mxsc_expr::MxscExpr;
 pub use num_expr::NumExpr;
diff --git a/framework/scenario/src/facade/expr/bech32_address.rs b/framework/scenario/src/facade/expr/bech32_address.rs
new file mode 100644
index 0000000000..a327e44a6b
--- /dev/null
+++ b/framework/scenario/src/facade/expr/bech32_address.rs
@@ -0,0 +1,190 @@
+use std::fmt::Display;
+
+use crate::bech32;
+use multiversx_sc::{
+    api::ManagedTypeApi,
+    codec::*,
+    types::{
+        Address, AnnotatedValue, ManagedAddress, ManagedBuffer, TxEnv, TxFrom, TxFromSpecified,
+        TxTo, TxToSpecified,
+    },
+};
+use serde::{Deserialize, Serialize};
+
+const BECH32_PREFIX: &str = "bech32:";
+
+/// Wraps and address, and presents it as a bech32 expression wherever possible.
+///
+/// In order to avoid repeated conversions, it redundantly keeps the bech32 representation inside.
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub struct Bech32Address {
+    address: Address,
+    bech32: String,
+}
+
+impl From<Address> for Bech32Address {
+    fn from(value: Address) -> Self {
+        let bech32 = bech32::encode(&value);
+        Bech32Address {
+            address: value,
+            bech32,
+        }
+    }
+}
+
+impl Bech32Address {
+    pub fn from_bech32_string(bech32: String) -> Self {
+        let address = bech32::decode(&bech32);
+        Bech32Address { address, bech32 }
+    }
+
+    pub fn to_bech32_str(&self) -> &str {
+        &self.bech32
+    }
+
+    pub fn to_bech32_string(&self) -> String {
+        self.bech32.to_owned()
+    }
+
+    pub fn as_address(&self) -> &Address {
+        &self.address
+    }
+
+    pub fn to_address(&self) -> Address {
+        self.address.clone()
+    }
+
+    pub fn into_address(self) -> Address {
+        self.address
+    }
+
+    pub fn to_bech32_expr(&self) -> String {
+        format!("{BECH32_PREFIX}{}", &self.bech32)
+    }
+}
+
+impl<Env> AnnotatedValue<Env, ManagedAddress<Env::Api>> for Bech32Address
+where
+    Env: TxEnv,
+{
+    fn annotation(&self, _env: &Env) -> ManagedBuffer<Env::Api> {
+        self.to_bech32_expr().into()
+    }
+
+    fn to_value(&self, env: &Env) -> ManagedAddress<Env::Api> {
+        self.address.to_value(env)
+    }
+}
+
+impl<Env> TxFrom<Env> for Bech32Address
+where
+    Env: TxEnv,
+{
+    fn resolve_address(&self, env: &Env) -> ManagedAddress<Env::Api> {
+        self.address.resolve_address(env)
+    }
+}
+impl<Env> TxFromSpecified<Env> for Bech32Address where Env: TxEnv {}
+impl<Env> TxTo<Env> for Bech32Address where Env: TxEnv {}
+impl<Env> TxToSpecified<Env> for Bech32Address where Env: TxEnv {}
+
+impl<Env> AnnotatedValue<Env, ManagedAddress<Env::Api>> for &Bech32Address
+where
+    Env: TxEnv,
+{
+    fn annotation(&self, _env: &Env) -> ManagedBuffer<Env::Api> {
+        self.to_bech32_expr().into()
+    }
+
+    fn to_value(&self, env: &Env) -> ManagedAddress<Env::Api> {
+        self.address.to_value(env)
+    }
+}
+
+impl<Env> TxFrom<Env> for &Bech32Address
+where
+    Env: TxEnv,
+{
+    fn resolve_address(&self, env: &Env) -> ManagedAddress<Env::Api> {
+        self.address.resolve_address(env)
+    }
+}
+impl<Env> TxFromSpecified<Env> for &Bech32Address where Env: TxEnv {}
+impl<Env> TxTo<Env> for &Bech32Address where Env: TxEnv {}
+impl<Env> TxToSpecified<Env> for &Bech32Address where Env: TxEnv {}
+
+impl Display for Bech32Address {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.write_str(&self.bech32)
+    }
+}
+
+impl NestedEncode for Bech32Address {
+    fn dep_encode_or_handle_err<O, H>(&self, dest: &mut O, h: H) -> Result<(), H::HandledErr>
+    where
+        O: NestedEncodeOutput,
+        H: EncodeErrorHandler,
+    {
+        self.address.dep_encode_or_handle_err(dest, h)
+    }
+}
+
+impl TopEncode for Bech32Address {
+    fn top_encode_or_handle_err<O, H>(&self, output: O, h: H) -> Result<(), H::HandledErr>
+    where
+        O: TopEncodeOutput,
+        H: EncodeErrorHandler,
+    {
+        self.address.top_encode_or_handle_err(output, h)
+    }
+}
+
+impl NestedDecode for Bech32Address {
+    fn dep_decode_or_handle_err<I, H>(input: &mut I, h: H) -> Result<Self, H::HandledErr>
+    where
+        I: NestedDecodeInput,
+        H: DecodeErrorHandler,
+    {
+        Ok(Bech32Address::from(Address::dep_decode_or_handle_err(
+            input, h,
+        )?))
+    }
+}
+
+impl TopDecode for Bech32Address {
+    fn top_decode_or_handle_err<I, H>(input: I, h: H) -> Result<Self, H::HandledErr>
+    where
+        I: TopDecodeInput,
+        H: DecodeErrorHandler,
+    {
+        Ok(Bech32Address::from(Address::top_decode_or_handle_err(
+            input, h,
+        )?))
+    }
+}
+
+impl<M> CodecFrom<Bech32Address> for ManagedAddress<M> where M: ManagedTypeApi {}
+impl<M> CodecFrom<&Bech32Address> for ManagedAddress<M> where M: ManagedTypeApi {}
+
+impl Serialize for Bech32Address {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: serde::Serializer,
+    {
+        self.bech32.serialize(serializer)
+    }
+}
+
+impl<'de> Deserialize<'de> for Bech32Address {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: serde::Deserializer<'de>,
+    {
+        // some old interactors have it serialized like this
+        let mut bech32 = String::deserialize(deserializer)?;
+        if let Some(stripped) = bech32.strip_prefix("bech32:") {
+            bech32 = stripped.to_owned();
+        }
+        Ok(Bech32Address::from_bech32_string(bech32))
+    }
+}
diff --git a/framework/scenario/src/facade/result_handlers.rs b/framework/scenario/src/facade/result_handlers.rs
index f8b43a5ebd..30823bf6f5 100644
--- a/framework/scenario/src/facade/result_handlers.rs
+++ b/framework/scenario/src/facade/result_handlers.rs
@@ -1,6 +1,7 @@
 mod expect_message;
 mod expect_status;
 mod returns_message;
+mod returns_new_bech32_address;
 mod returns_new_token_identifier;
 mod returns_status;
 mod with_tx_raw_response;
@@ -8,6 +9,7 @@ mod with_tx_raw_response;
 pub use expect_message::ExpectMessage;
 pub use expect_status::ExpectStatus;
 pub use returns_message::ReturnsMessage;
+pub use returns_new_bech32_address::ReturnsNewBech32Address;
 pub use returns_new_token_identifier::ReturnsNewTokenIdentifier;
 pub use returns_status::ReturnsStatus;
 pub use with_tx_raw_response::WithRawTxResponse;
diff --git a/framework/scenario/src/facade/result_handlers/returns_new_bech32_address.rs b/framework/scenario/src/facade/result_handlers/returns_new_bech32_address.rs
new file mode 100644
index 0000000000..6e898c6088
--- /dev/null
+++ b/framework/scenario/src/facade/result_handlers/returns_new_bech32_address.rs
@@ -0,0 +1,27 @@
+use multiversx_sc::types::{RHListItem, RHListItemExec, TxEnv};
+
+use crate::{facade::expr::Bech32Address, scenario_model::TxResponse};
+
+/// Indicates that the newly deployed address will be returned after a deploy.
+pub struct ReturnsNewBech32Address;
+
+impl<Env, Original> RHListItem<Env, Original> for ReturnsNewBech32Address
+where
+    Env: TxEnv,
+{
+    type Returns = Bech32Address;
+}
+
+impl<Env, Original> RHListItemExec<TxResponse, Env, Original> for ReturnsNewBech32Address
+where
+    Env: TxEnv,
+{
+    fn item_process_result(self, tx_response: &TxResponse) -> Self::Returns {
+        let new_address = tx_response
+            .new_deployed_address
+            .clone()
+            .expect("missing returned address");
+
+        new_address.into()
+    }
+}
diff --git a/framework/scenario/src/scenario/model/value/address_key.rs b/framework/scenario/src/scenario/model/value/address_key.rs
index 889cca69ae..d705439b1d 100644
--- a/framework/scenario/src/scenario/model/value/address_key.rs
+++ b/framework/scenario/src/scenario/model/value/address_key.rs
@@ -1,8 +1,8 @@
-use multiversx_sc::types::{AddressExpr, ScExpr};
+use multiversx_sc::types::{Address, AddressExpr, ScExpr};
 
 use super::{value_from_slice, AddressValue};
 use crate::{
-    multiversx_sc::types::Address,
+    facade::expr::Bech32Address,
     scenario_format::{
         interpret_trait::{InterpretableFrom, InterpreterContext, IntoRaw},
         value_interpreter::interpret_string,
@@ -117,6 +117,24 @@ impl From<&Address> for AddressKey {
     }
 }
 
+impl From<&Bech32Address> for AddressKey {
+    fn from(from: &Bech32Address) -> Self {
+        AddressKey {
+            value: from.to_address().clone(),
+            original: from.to_bech32_expr(),
+        }
+    }
+}
+
+impl From<Bech32Address> for AddressKey {
+    fn from(from: Bech32Address) -> Self {
+        AddressKey {
+            original: from.to_bech32_expr(),
+            value: from.into_address(),
+        }
+    }
+}
+
 impl From<AddressExpr> for AddressKey {
     fn from(from: AddressExpr) -> Self {
         AddressKey {
diff --git a/framework/scenario/src/scenario/model/value/address_value.rs b/framework/scenario/src/scenario/model/value/address_value.rs
index 85886e4cf8..640451a63c 100644
--- a/framework/scenario/src/scenario/model/value/address_value.rs
+++ b/framework/scenario/src/scenario/model/value/address_value.rs
@@ -2,10 +2,13 @@ use std::fmt;
 
 use crate::multiversx_sc::types::Address;
 
-use crate::scenario_format::{
-    interpret_trait::{InterpretableFrom, InterpreterContext, IntoRaw},
-    serde_raw::ValueSubTree,
-    value_interpreter::{interpret_string, interpret_subtree},
+use crate::{
+    facade::expr::Bech32Address,
+    scenario_format::{
+        interpret_trait::{InterpretableFrom, InterpreterContext, IntoRaw},
+        serde_raw::ValueSubTree,
+        value_interpreter::{interpret_string, interpret_subtree},
+    },
 };
 
 use super::AddressKey;
@@ -107,6 +110,24 @@ impl From<&Address> for AddressValue {
     }
 }
 
+impl From<&Bech32Address> for AddressValue {
+    fn from(from: &Bech32Address) -> Self {
+        AddressValue {
+            value: from.to_address().clone(),
+            original: ValueSubTree::Str(from.to_bech32_expr()),
+        }
+    }
+}
+
+impl From<Bech32Address> for AddressValue {
+    fn from(from: Bech32Address) -> Self {
+        AddressValue {
+            original: ValueSubTree::Str(from.to_bech32_expr()),
+            value: from.into_address(),
+        }
+    }
+}
+
 impl From<&str> for AddressValue {
     fn from(from: &str) -> Self {
         AddressValue::interpret_from(from, &InterpreterContext::default())
diff --git a/framework/snippets/src/interactor_scenario/interactor_sc_deploy.rs b/framework/snippets/src/interactor_scenario/interactor_sc_deploy.rs
index 63e8ae80db..87d17dff7f 100644
--- a/framework/snippets/src/interactor_scenario/interactor_sc_deploy.rs
+++ b/framework/snippets/src/interactor_scenario/interactor_sc_deploy.rs
@@ -1,7 +1,7 @@
 use crate::{mandos_to_erdrs_address, Interactor};
 use log::info;
 use multiversx_sc_scenario::{
-    bech32,
+    imports::Bech32Address,
     mandos_system::ScenarioRunner,
     scenario_model::{ScDeployStep, SetStateStep, TxResponse},
 };
@@ -64,14 +64,11 @@ impl Interactor {
             .new_deployed_address
             .clone()
             .unwrap();
+        let deploy_address_bech32 = Bech32Address::from(deploy_address);
 
-        let set_state_step = SetStateStep::new().new_address(
-            addr,
-            nonce,
-            format!("0x{}", hex::encode(&deploy_address)).as_str(),
-        );
+        let set_state_step = SetStateStep::new().new_address(addr, nonce, &deploy_address_bech32);
 
-        println!("deploy address: {}", bech32::encode(&deploy_address));
+        println!("deploy address: {deploy_address_bech32}");
         self.pre_runners.run_set_state_step(&set_state_step);
         self.post_runners.run_set_state_step(&set_state_step);
 

From 46288c9ac9c8433cfbaa2ea7f10d3a053b8ee35e Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 10 Apr 2024 01:59:46 +0300
Subject: [PATCH 0688/1254] ESDTSystemSCAddress used in interactors directly

---
 .../interact/src/multisig_interact.rs         |  3 ---
 .../interact/src/multisig_interact_nfts.rs    |  8 +++----
 .../interact-rs/src/interactor_main.rs        |  1 -
 .../markers/esdt_system_sc_address.rs         | 21 +++++++++++++++++++
 .../scenario/model/transaction/tx_response.rs |  6 ++----
 5 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/contracts/examples/multisig/interact/src/multisig_interact.rs b/contracts/examples/multisig/interact/src/multisig_interact.rs
index 5975c7299c..48cfb05a6d 100644
--- a/contracts/examples/multisig/interact/src/multisig_interact.rs
+++ b/contracts/examples/multisig/interact/src/multisig_interact.rs
@@ -11,7 +11,6 @@ use multisig_interact_state::State;
 
 use multiversx_sc_snippets::imports::*;
 
-const SYSTEM_SC_BECH32: &str = "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u";
 const INTERACTOR_SCENARIO_TRACE_PATH: &str = "interactor_trace.scen.json";
 
 #[tokio::main]
@@ -77,7 +76,6 @@ async fn main() {
 struct MultisigInteract {
     interactor: Interactor,
     wallet_address: Bech32Address,
-    system_sc_address: Address,
     collection_token_identifier: String,
     multisig_code: BytesValue,
     state: State,
@@ -99,7 +97,6 @@ impl MultisigInteract {
         Self {
             interactor,
             wallet_address: wallet_address.into(),
-            system_sc_address: bech32::decode(SYSTEM_SC_BECH32),
             collection_token_identifier: String::new(),
             multisig_code,
             state: State::load_state(),
diff --git a/contracts/examples/multisig/interact/src/multisig_interact_nfts.rs b/contracts/examples/multisig/interact/src/multisig_interact_nfts.rs
index ebc30300ef..2efda8e4d6 100644
--- a/contracts/examples/multisig/interact/src/multisig_interact_nfts.rs
+++ b/contracts/examples/multisig/interact/src/multisig_interact_nfts.rs
@@ -33,7 +33,6 @@ impl MultisigInteract {
     }
 
     pub async fn propose_issue_collection_with_all_roles(&mut self) -> usize {
-        let system_sc_address = bech32::decode(SYSTEM_SC_BECH32);
         let action_id = self
             .interactor
             .tx()
@@ -42,7 +41,7 @@ impl MultisigInteract {
             .gas(NumExpr("10,000,000"))
             .typed(multisig_proxy::MultisigProxy)
             .propose_async_call(
-                system_sc_address,
+                ESDTSystemSCAddress,
                 ISSUE_COST,
                 FunctionCall::new("registerAndSetAllRoles")
                     .argument(&COLLECTION_NAME)
@@ -88,7 +87,6 @@ impl MultisigInteract {
     }
 
     pub async fn propose_issue_collection(&mut self) -> usize {
-        let system_sc_address = bech32::decode(SYSTEM_SC_BECH32);
         let action_id = self
             .interactor
             .tx()
@@ -97,7 +95,7 @@ impl MultisigInteract {
             .gas(NumExpr("10,000,000"))
             .typed(multisig_proxy::MultisigProxy)
             .propose_async_call(
-                system_sc_address,
+                ESDTSystemSCAddress,
                 ISSUE_COST,
                 FunctionCall::new("issueNonFungible")
                     .argument(&COLLECTION_NAME)
@@ -150,7 +148,7 @@ impl MultisigInteract {
             .gas(NumExpr("10,000,000"))
             .typed(multisig_proxy::MultisigProxy)
             .propose_async_call(
-                &self.system_sc_address,
+                ESDTSystemSCAddress,
                 0u64,
                 FunctionCall::new("setSpecialRole")
                     .argument(&self.collection_token_identifier)
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 92d00a227d..389c717f2c 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
@@ -8,7 +8,6 @@ const GATEWAY: &str = sdk::blockchain::DEVNET_GATEWAY;
 const PEM: &str = "alice.pem";
 const SC_ADDRESS: &str = "";
 
-const SYSTEM_SC_BECH32: &str = "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u";
 const DEFAULT_ADDRESS_EXPR: &str =
     "0x0000000000000000000000000000000000000000000000000000000000000000";
 const TOKEN_ISSUE_COST: u64 = 50_000_000_000_000_000;
diff --git a/framework/base/src/types/interaction/markers/esdt_system_sc_address.rs b/framework/base/src/types/interaction/markers/esdt_system_sc_address.rs
index de8aadb1b6..e43ee5f2ce 100644
--- a/framework/base/src/types/interaction/markers/esdt_system_sc_address.rs
+++ b/framework/base/src/types/interaction/markers/esdt_system_sc_address.rs
@@ -1,4 +1,5 @@
 use hex_literal::hex;
+use multiversx_sc_codec::{CodecFrom, EncodeErrorHandler, TopEncode, TopEncodeOutput};
 
 use crate::{
     api::{
@@ -14,6 +15,8 @@ use crate::{
 /// Address of the system smart contract that manages ESDT.
 const SYSTEM_SC_ADDRESS_BYTES: [u8; 32] =
     hex!("000000000000000000010000000000000000000000000000000000000002ffff");
+const SYSTEM_SC_ADDRESS_BECH32: &str =
+    "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u";
 const SYSTEM_SC_ADDRESS_ANNOTATION: &str =
     "bech32:erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u";
 
@@ -44,3 +47,21 @@ where
 
 impl<Api> TxTo<TxScEnv<Api>> for ESDTSystemSCAddress where Api: CallTypeApi {}
 impl<Api> TxToSpecified<TxScEnv<Api>> for ESDTSystemSCAddress where Api: CallTypeApi {}
+
+impl TopEncode for ESDTSystemSCAddress {
+    fn top_encode_or_handle_err<O, H>(&self, output: O, h: H) -> Result<(), H::HandledErr>
+    where
+        O: TopEncodeOutput,
+        H: EncodeErrorHandler,
+    {
+        SYSTEM_SC_ADDRESS_BYTES.top_encode_or_handle_err(output, h)
+    }
+}
+
+impl<M> CodecFrom<ESDTSystemSCAddress> for ManagedAddress<M> where M: ManagedTypeApi {}
+
+impl core::fmt::Display for ESDTSystemSCAddress {
+    fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
+        f.write_str(SYSTEM_SC_ADDRESS_BECH32)
+    }
+}
diff --git a/framework/scenario/src/scenario/model/transaction/tx_response.rs b/framework/scenario/src/scenario/model/transaction/tx_response.rs
index ee844865bc..a2dbed5f5a 100644
--- a/framework/scenario/src/scenario/model/transaction/tx_response.rs
+++ b/framework/scenario/src/scenario/model/transaction/tx_response.rs
@@ -1,5 +1,5 @@
 use multiversx_chain_vm::{crypto_functions::keccak256, tx_mock::TxResult};
-use multiversx_sc::types::Address;
+use multiversx_sc::types::{Address, ESDTSystemSCAddress};
 use multiversx_sdk::{
     data::transaction::{ApiLogs, ApiSmartContractResult, Events, TransactionOnNetwork},
     utils::base64_decode,
@@ -12,8 +12,6 @@ use super::{
 const SC_DEPLOY_PROCESSING_TYPE: &str = "SCDeployment";
 const LOG_IDENTIFIER_SIGNAL_ERROR: &str = "signalError";
 
-const SYSTEM_SC_BECH32: &str = "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u";
-
 #[derive(Debug, Default, Clone)]
 /// The response of a transaction.
 pub struct TxResponse {
@@ -196,7 +194,7 @@ 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 {
+            if scr.sender.to_string() != ESDTSystemSCAddress.to_string() {
                 continue;
             }
 

From 216ef102b33c4ef03c1a7b680a678eb5c572fe58 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 10 Apr 2024 10:15:31 +0300
Subject: [PATCH 0689/1254] cleanup

---
 .../interaction/markers/esdt_system_sc_address.rs    | 12 ++++++++++--
 .../system_proxy/legacy_system_sc_proxy.rs           |  2 +-
 .../src/scenario/model/transaction/tx_response.rs    |  2 +-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/framework/base/src/types/interaction/markers/esdt_system_sc_address.rs b/framework/base/src/types/interaction/markers/esdt_system_sc_address.rs
index e43ee5f2ce..f9d1f94ce2 100644
--- a/framework/base/src/types/interaction/markers/esdt_system_sc_address.rs
+++ b/framework/base/src/types/interaction/markers/esdt_system_sc_address.rs
@@ -24,12 +24,20 @@ const SYSTEM_SC_ADDRESS_ANNOTATION: &str =
 pub struct ESDTSystemSCAddress;
 
 impl ESDTSystemSCAddress {
-    pub fn managed_address<Api>(self) -> ManagedAddress<Api>
+    pub fn to_managed_address<Api>(self) -> ManagedAddress<Api>
     where
         Api: ManagedTypeApi,
     {
         ManagedAddress::from(SYSTEM_SC_ADDRESS_BYTES)
     }
+
+    pub fn to_bech32_str(&self) -> &str {
+        SYSTEM_SC_ADDRESS_BECH32
+    }
+
+    pub fn to_bech32_string(&self) -> alloc::string::String {
+        SYSTEM_SC_ADDRESS_BECH32.into()
+    }
 }
 
 impl<Api> AnnotatedValue<TxScEnv<Api>, ManagedAddress<Api>> for ESDTSystemSCAddress
@@ -41,7 +49,7 @@ where
     }
 
     fn to_value(&self, _env: &TxScEnv<Api>) -> ManagedAddress<Api> {
-        ESDTSystemSCAddress.managed_address()
+        ESDTSystemSCAddress.to_managed_address()
     }
 }
 
diff --git a/framework/base/src/types/interaction/system_proxy/legacy_system_sc_proxy.rs b/framework/base/src/types/interaction/system_proxy/legacy_system_sc_proxy.rs
index 35486c6c04..c19fe2e4e6 100644
--- a/framework/base/src/types/interaction/system_proxy/legacy_system_sc_proxy.rs
+++ b/framework/base/src/types/interaction/system_proxy/legacy_system_sc_proxy.rs
@@ -471,7 +471,7 @@ where
     }
 
     pub fn esdt_system_sc_address(&self) -> ManagedAddress<SA> {
-        ESDTSystemSCAddress.managed_address()
+        ESDTSystemSCAddress.to_managed_address()
     }
 
     fn esdt_system_sc_call_no_args(
diff --git a/framework/scenario/src/scenario/model/transaction/tx_response.rs b/framework/scenario/src/scenario/model/transaction/tx_response.rs
index a2dbed5f5a..d4171c6590 100644
--- a/framework/scenario/src/scenario/model/transaction/tx_response.rs
+++ b/framework/scenario/src/scenario/model/transaction/tx_response.rs
@@ -194,7 +194,7 @@ impl TxResponse {
 
     fn process_new_issued_token_identifier(mut self) -> Self {
         for scr in self.api_scrs.iter() {
-            if scr.sender.to_string() != ESDTSystemSCAddress.to_string() {
+            if scr.sender.to_bech32_string().unwrap() != ESDTSystemSCAddress.to_bech32_string() {
                 continue;
             }
 

From ec71f0acd823c4d46326fc78aa9dd424fb2cfcbc Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Wed, 10 Apr 2024 14:05:41 +0300
Subject: [PATCH 0690/1254] unified syntax - repl deploy

---
 .../tests/crowdfunding_esdt_blackbox_test.rs  | 75 ++++++++++---------
 1 file changed, 41 insertions(+), 34 deletions(-)

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 5dceba3659..a23ecc3854 100644
--- a/contracts/examples/crowdfunding-esdt/tests/crowdfunding_esdt_blackbox_test.rs
+++ b/contracts/examples/crowdfunding-esdt/tests/crowdfunding_esdt_blackbox_test.rs
@@ -1,4 +1,4 @@
-use crowdfunding_esdt::{ProxyTrait as _, Status};
+use crowdfunding_esdt::{crowdfunding_esdt_proxy, ProxyTrait as _, Status};
 
 use multiversx_sc_scenario::imports::*;
 use num_bigint::BigUint;
@@ -9,8 +9,13 @@ const CF_TOKEN_ID_EXPR: &str = "str:CROWD-123456";
 const CROWDFUNDING_ESDT_ADDRESS_EXPR: &str = "sc:crowdfunding-esdt";
 const CROWDFUNDING_ESDT_PATH_EXPR: &str = "mxsc:output/crowdfunding-esdt.mxsc.json";
 const FIRST_USER_ADDRESS_EXPR: &str = "address:first-user";
+const FIRST_USER_ADDRESS_EXPR_REPL: AddressExpr = AddressExpr("first-user");
 const OWNER_ADDRESS_EXPR: &str = "address:owner";
+const OWNER_ADDRESS_EXPR_REPL: AddressExpr = AddressExpr("owner");
 const SECOND_USER_ADDRESS_EXPR: &str = "address:second-user";
+const SECOND_USER_ADDRESS_EXPR_REPL: AddressExpr = AddressExpr("second-user");
+const CODE_EXPR: MxscExpr = MxscExpr("output/crowdfunding-esdt.mxsc.json");
+const SC_CROWDFUNDING_ESDT_EXPR: ScExpr = ScExpr("crowdfunding-esdt");
 
 type CrowdfundingESDTContract = ContractInfo<crowdfunding_esdt::Proxy<StaticApi>>;
 
@@ -35,20 +40,21 @@ struct CrowdfundingESDTTestState {
 impl CrowdfundingESDTTestState {
     fn new() -> Self {
         let mut world = world();
+        let owner_address = "address:owner";
 
         world.set_state_step(
             SetStateStep::new()
-                .put_account(OWNER_ADDRESS_EXPR, Account::new().nonce(1))
-                .new_address(OWNER_ADDRESS_EXPR, 1, CROWDFUNDING_ESDT_ADDRESS_EXPR)
+                .put_account(OWNER_ADDRESS_EXPR_REPL, Account::new().nonce(1))
+                .new_address(owner_address, 1, CROWDFUNDING_ESDT_ADDRESS_EXPR)
                 .put_account(
-                    FIRST_USER_ADDRESS_EXPR,
+                    FIRST_USER_ADDRESS_EXPR_REPL,
                     Account::new()
                         .nonce(1)
                         .balance("1_000")
                         .esdt_balance(CF_TOKEN_ID_EXPR, "1_000"),
                 )
                 .put_account(
-                    SECOND_USER_ADDRESS_EXPR,
+                    SECOND_USER_ADDRESS_EXPR_REPL,
                     Account::new()
                         .nonce(1)
                         .esdt_balance(CF_TOKEN_ID_EXPR, "1_000"),
@@ -69,32 +75,33 @@ impl CrowdfundingESDTTestState {
         }
     }
 
-    fn deploy(&mut self) -> &mut Self {
-        let crowdfunding_esdt_code = self.world.code_expression(CROWDFUNDING_ESDT_PATH_EXPR);
-
-        self.world.sc_deploy(
-            ScDeployStep::new()
-                .from(OWNER_ADDRESS_EXPR)
-                .code(crowdfunding_esdt_code)
-                .call(self.crowdfunding_esdt_contract.init(
-                    2_000u32,
-                    CF_DEADLINE,
-                    EgldOrEsdtTokenIdentifier::esdt(CF_TOKEN_ID),
-                )),
-        );
-
-        self
+    fn deploy(&mut self) {
+        self.world
+            .tx()
+            .from(OWNER_ADDRESS_EXPR_REPL)
+            .typed(crowdfunding_esdt_proxy::CrowdfundingProxy)
+            .init(
+                2_000u32,
+                CF_DEADLINE,
+                EgldOrEsdtTokenIdentifier::esdt(CF_TOKEN_ID),
+            )
+            .code(CODE_EXPR)
+            .run();
     }
 
-    fn fund(&mut self, address: &str, amount: &str) -> &mut Self {
-        self.world.sc_call(
-            ScCallStep::new()
-                .from(address)
-                .esdt_transfer(CF_TOKEN_ID_EXPR, 0, amount)
-                .call(self.crowdfunding_esdt_contract.fund()),
-        );
-
-        self
+    fn fund(&mut self, address: AddressExpr, amount: u64) {
+        self.world
+            .tx()
+            .from(address)
+            .to(SC_CROWDFUNDING_ESDT_EXPR)
+            .typed(crowdfunding_esdt_proxy::CrowdfundingProxy)
+            .fund()
+            .single_esdt(
+                &TokenIdentifier::from(CF_TOKEN_ID_EXPR),
+                0u64,
+                &multiversx_sc::proxy_imports::BigUint::from(amount),
+            )
+            .run();
     }
 
     fn check_deposit(&mut self, donor: Address, amount: u64) -> &mut Self {
@@ -150,7 +157,7 @@ fn test_fund() {
     let mut state = CrowdfundingESDTTestState::new();
     state.deploy();
 
-    state.fund(FIRST_USER_ADDRESS_EXPR, "1000");
+    state.fund(FIRST_USER_ADDRESS_EXPR_REPL, 1_000);
     state.check_deposit(state.first_user_address.clone(), 1_000);
 }
 
@@ -191,11 +198,11 @@ fn test_successful_cf() {
     state.deploy();
 
     // first user fund
-    state.fund(FIRST_USER_ADDRESS_EXPR, "1_000");
+    state.fund(FIRST_USER_ADDRESS_EXPR_REPL, 1000);
     state.check_deposit(state.first_user_address.clone(), 1_000);
 
     // second user fund
-    state.fund(SECOND_USER_ADDRESS_EXPR, "1_000");
+    state.fund(SECOND_USER_ADDRESS_EXPR_REPL, 1000);
     state.check_deposit(state.second_user_address.clone(), 1_000);
 
     // set block timestamp after deadline
@@ -228,11 +235,11 @@ fn test_failed_cf() {
     state.deploy();
 
     // first user fund
-    state.fund(FIRST_USER_ADDRESS_EXPR, "300");
+    state.fund(FIRST_USER_ADDRESS_EXPR_REPL, 300);
     state.check_deposit(state.first_user_address.clone(), 300u64);
 
     // second user fund
-    state.fund(SECOND_USER_ADDRESS_EXPR, "600");
+    state.fund(SECOND_USER_ADDRESS_EXPR_REPL, 600);
     state.check_deposit(state.second_user_address.clone(), 600u64);
 
     // set block timestamp after deadline

From 86156a6ae28fc8456c83b9f2b0a9fb6124def1af Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 10 Apr 2024 15:28:00 +0300
Subject: [PATCH 0691/1254] test fix

---
 tools/rust-debugger/format-tests/src/format_tests.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/rust-debugger/format-tests/src/format_tests.rs b/tools/rust-debugger/format-tests/src/format_tests.rs
index 913851dbfa..5df781b92b 100644
--- a/tools/rust-debugger/format-tests/src/format_tests.rs
+++ b/tools/rust-debugger/format-tests/src/format_tests.rs
@@ -65,7 +65,7 @@ fn main() {
     let token_identifier: TokenIdentifier<DebugApi> = TokenIdentifier::from("MYTOK-123456");
     push!(to_check, token_identifier, "\"MYTOK-123456\"");
 
-    let managed_address = ESDTSystemSCAddress.managed_address::<DebugApi>();
+    let managed_address = ESDTSystemSCAddress.to_managed_address::<DebugApi>();
     push!(
         to_check,
         managed_address,

From 6302f14c09a601cf2b64dbb656f1de82d1721528 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Wed, 10 Apr 2024 15:11:46 +0200
Subject: [PATCH 0692/1254] blackbox tests migration for price aggregator

---
 .../core/price-aggregator/sc-config.toml      |   2 +
 .../tests/price_aggregator_blackbox_test.rs   | 129 +++---
 .../tests/price_aggregator_proxy.rs           | 366 ++++++++++++++++++
 .../tests/price_aggregator_stress_blackbox.rs | 103 ++---
 4 files changed, 498 insertions(+), 102 deletions(-)
 create mode 100644 contracts/core/price-aggregator/sc-config.toml
 create mode 100644 contracts/core/price-aggregator/tests/price_aggregator_proxy.rs

diff --git a/contracts/core/price-aggregator/sc-config.toml b/contracts/core/price-aggregator/sc-config.toml
new file mode 100644
index 0000000000..56b3e816a6
--- /dev/null
+++ b/contracts/core/price-aggregator/sc-config.toml
@@ -0,0 +1,2 @@
+[[proxy]]
+path = "tests/price_aggregator_proxy.rs"
\ No newline at end of file
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 cc2dc7b994..db64b7749c 100644
--- a/contracts/core/price-aggregator/tests/price_aggregator_blackbox_test.rs
+++ b/contracts/core/price-aggregator/tests/price_aggregator_blackbox_test.rs
@@ -1,11 +1,13 @@
 use multiversx_price_aggregator_sc::{
     price_aggregator_data::{OracleStatus, TimestampedPrice, TokenPair},
-    ContractObj, PriceAggregator, ProxyTrait as _, MAX_ROUND_DURATION_SECONDS,
+    ContractObj, PriceAggregator, MAX_ROUND_DURATION_SECONDS,
 };
-use multiversx_sc_modules::{pause::ProxyTrait, staking::ProxyTrait as _};
+use multiversx_sc_modules::staking::ProxyTrait as _;
 
 use multiversx_sc_scenario::imports::*;
 
+mod price_aggregator_proxy;
+
 const DECIMALS: u8 = 0;
 const EGLD_TICKER: &[u8] = b"EGLD";
 const NR_ORACLES: usize = 4;
@@ -18,6 +20,9 @@ const STAKE_AMOUNT: u64 = 20;
 const SUBMISSION_COUNT: usize = 3;
 const USD_TICKER: &[u8] = b"USDC";
 
+const PRICE_AGGREGATOR: ScExpr = ScExpr("price-aggregator");
+const OWNER: AddressExpr = AddressExpr("owner");
+
 type PriceAggregatorContract = ContractInfo<multiversx_price_aggregator_sc::Proxy<StaticApi>>;
 
 fn world() -> ScenarioWorld {
@@ -44,7 +49,7 @@ impl PriceAggregatorTestState {
         let mut world = world();
 
         let mut set_state_step = SetStateStep::new()
-            .put_account(OWNER_ADDRESS_EXPR, Account::new().nonce(1))
+            .put_account(OWNER, Account::new().nonce(1))
             .new_address(OWNER_ADDRESS_EXPR, 1, PRICE_AGGREGATOR_ADDRESS_EXPR)
             .block_timestamp(100);
 
@@ -86,59 +91,69 @@ impl PriceAggregatorTestState {
                 .collect::<Vec<_>>(),
         );
 
-        self.world.sc_deploy(
-            ScDeployStep::new()
-                .from(OWNER_ADDRESS_EXPR)
-                .code(price_aggregator_code)
-                .call(self.price_aggregator_contract.init(
-                    EgldOrEsdtTokenIdentifier::egld(),
-                    STAKE_AMOUNT,
-                    SLASH_AMOUNT,
-                    SLASH_QUORUM,
-                    SUBMISSION_COUNT,
-                    oracles,
-                )),
-        );
+        self.world
+            .tx()
+            .from(OWNER)
+            .typed(price_aggregator_proxy::PriceAggregatorProxy)
+            .init(
+                EgldOrEsdtTokenIdentifier::egld(),
+                STAKE_AMOUNT,
+                SLASH_AMOUNT,
+                SLASH_QUORUM,
+                SUBMISSION_COUNT,
+                oracles,
+            )
+            .code(price_aggregator_code)
+            .run();
 
         for address in self.oracles.iter() {
-            self.world.sc_call(
-                ScCallStep::new()
-                    .from(address)
-                    .egld_value(STAKE_AMOUNT)
-                    .call(self.price_aggregator_contract.stake()),
-            );
+            self.world
+                .tx()
+                .from(&address.to_address())
+                .to(PRICE_AGGREGATOR)
+                .typed(price_aggregator_proxy::PriceAggregatorProxy)
+                .stake()
+                .egld(STAKE_AMOUNT)
+                .run();
         }
 
         self
     }
 
     fn set_pair_decimals(&mut self) {
-        self.world.sc_call(
-            ScCallStep::new().from(OWNER_ADDRESS_EXPR).call(
-                self.price_aggregator_contract
-                    .set_pair_decimals(EGLD_TICKER, USD_TICKER, DECIMALS),
-            ),
-        );
+        self.world
+            .tx()
+            .from(OWNER)
+            .to(PRICE_AGGREGATOR)
+            .typed(price_aggregator_proxy::PriceAggregatorProxy)
+            .set_pair_decimals(EGLD_TICKER, USD_TICKER, DECIMALS)
+            .run();
     }
 
     fn unpause_endpoint(&mut self) {
-        self.world.sc_call(
-            ScCallStep::new()
-                .from(OWNER_ADDRESS_EXPR)
-                .call(self.price_aggregator_contract.unpause_endpoint()),
-        );
+        self.world
+            .tx()
+            .from(OWNER)
+            .to(PRICE_AGGREGATOR)
+            .typed(price_aggregator_proxy::PriceAggregatorProxy)
+            .unpause_endpoint()
+            .run();
     }
 
     fn submit(&mut self, from: &AddressValue, submission_timestamp: u64, price: u64) {
-        self.world.sc_call(ScCallStep::new().from(from).call(
-            self.price_aggregator_contract.submit(
+        self.world
+            .tx()
+            .from(&from.to_address())
+            .to(PRICE_AGGREGATOR)
+            .typed(price_aggregator_proxy::PriceAggregatorProxy)
+            .submit(
                 EGLD_TICKER,
                 USD_TICKER,
                 submission_timestamp,
                 price,
                 DECIMALS,
-            ),
-        ));
+            )
+            .run();
     }
 
     fn submit_and_expect_err(
@@ -148,27 +163,31 @@ impl PriceAggregatorTestState {
         price: u64,
         err_message: &str,
     ) {
-        self.world.sc_call(
-            ScCallStep::new()
-                .from(from)
-                .call(self.price_aggregator_contract.submit(
-                    EGLD_TICKER,
-                    USD_TICKER,
-                    submission_timestamp,
-                    price,
-                    DECIMALS,
-                ))
-                .expect(TxExpect::user_error("str:".to_string() + err_message)),
-        );
+        self.world
+            .tx()
+            .from(&from.to_address())
+            .to(PRICE_AGGREGATOR)
+            .typed(price_aggregator_proxy::PriceAggregatorProxy)
+            .submit(
+                EGLD_TICKER,
+                USD_TICKER,
+                submission_timestamp,
+                price,
+                DECIMALS,
+            )
+            .with_result(ExpectStatus(4))
+            .with_result(ExpectMessage(err_message))
+            .run();
     }
 
     fn vote_slash_member(&mut self, from: &AddressValue, member_to_slash: Address) {
-        self.world.sc_call(
-            ScCallStep::new().from(from).call(
-                self.price_aggregator_contract
-                    .vote_slash_member(member_to_slash),
-            ),
-        );
+        self.world
+            .tx()
+            .from(&from.to_address())
+            .to(PRICE_AGGREGATOR)
+            .typed(price_aggregator_proxy::PriceAggregatorProxy)
+            .vote_slash_member(member_to_slash)
+            .run();
     }
 }
 
diff --git a/contracts/core/price-aggregator/tests/price_aggregator_proxy.rs b/contracts/core/price-aggregator/tests/price_aggregator_proxy.rs
new file mode 100644
index 0000000000..c7b05acaf5
--- /dev/null
+++ b/contracts/core/price-aggregator/tests/price_aggregator_proxy.rs
@@ -0,0 +1,366 @@
+// Code generated by the multiversx-sc proxy generator. DO NOT EDIT.
+
+////////////////////////////////////////////////////
+////////////////// AUTO-GENERATED //////////////////
+////////////////////////////////////////////////////
+
+#![allow(dead_code)]
+#![allow(clippy::all)]
+
+use multiversx_sc::proxy_imports::*;
+
+pub struct PriceAggregatorProxy;
+
+impl<Env, From, To, Gas> TxProxyTrait<Env, From, To, Gas> for PriceAggregatorProxy
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    type TxProxyMethods = PriceAggregatorProxyMethods<Env, From, To, Gas>;
+
+    fn proxy_methods(self, tx: Tx<Env, From, To, (), Gas, (), ()>) -> Self::TxProxyMethods {
+        PriceAggregatorProxyMethods { wrapped_tx: tx }
+    }
+}
+
+pub struct PriceAggregatorProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    wrapped_tx: Tx<Env, From, To, (), Gas, (), ()>,
+}
+
+#[rustfmt::skip]
+impl<Env, From, Gas> PriceAggregatorProxyMethods<Env, From, (), Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn init<
+        Arg0: CodecInto<EgldOrEsdtTokenIdentifier<Env::Api>>,
+        Arg1: CodecInto<BigUint<Env::Api>>,
+        Arg2: CodecInto<BigUint<Env::Api>>,
+        Arg3: CodecInto<usize>,
+        Arg4: CodecInto<usize>,
+        Arg5: CodecInto<MultiValueEncoded<Env::Api, ManagedAddress<Env::Api>>>,
+    >(
+        self,
+        staking_token: Arg0,
+        staking_amount: Arg1,
+        slash_amount: Arg2,
+        slash_quorum: Arg3,
+        submission_count: Arg4,
+        oracles: Arg5,
+    ) -> TxProxyDeploy<Env, From, Gas, ()> {
+        self.wrapped_tx
+            .raw_deploy()
+            .argument(&staking_token)
+            .argument(&staking_amount)
+            .argument(&slash_amount)
+            .argument(&slash_quorum)
+            .argument(&submission_count)
+            .argument(&oracles)
+            .original_result()
+    }
+}
+
+#[rustfmt::skip]
+impl<Env, From, To, Gas> PriceAggregatorProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn change_amounts<
+        Arg0: CodecInto<BigUint<Env::Api>>,
+        Arg1: CodecInto<BigUint<Env::Api>>,
+    >(
+        self,
+        staking_amount: Arg0,
+        slash_amount: Arg1,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call("changeAmounts")
+            .argument(&staking_amount)
+            .argument(&slash_amount)
+            .original_result()
+    }
+
+    pub fn add_oracles<
+        Arg0: CodecInto<MultiValueEncoded<Env::Api, ManagedAddress<Env::Api>>>,
+    >(
+        self,
+        oracles: Arg0,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call("addOracles")
+            .argument(&oracles)
+            .original_result()
+    }
+
+    /// Also receives submission count, 
+    /// so the owner does not have to update it manually with setSubmissionCount before this call 
+    pub fn remove_oracles<
+        Arg0: CodecInto<usize>,
+        Arg1: CodecInto<MultiValueEncoded<Env::Api, ManagedAddress<Env::Api>>>,
+    >(
+        self,
+        submission_count: Arg0,
+        oracles: Arg1,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call("removeOracles")
+            .argument(&submission_count)
+            .argument(&oracles)
+            .original_result()
+    }
+
+    pub fn submit<
+        Arg0: CodecInto<ManagedBuffer<Env::Api>>,
+        Arg1: CodecInto<ManagedBuffer<Env::Api>>,
+        Arg2: CodecInto<u64>,
+        Arg3: CodecInto<BigUint<Env::Api>>,
+        Arg4: CodecInto<u8>,
+    >(
+        self,
+        from: Arg0,
+        to: Arg1,
+        submission_timestamp: Arg2,
+        price: Arg3,
+        decimals: Arg4,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call("submit")
+            .argument(&from)
+            .argument(&to)
+            .argument(&submission_timestamp)
+            .argument(&price)
+            .argument(&decimals)
+            .original_result()
+    }
+
+    pub fn submit_batch<
+        Arg0: CodecInto<MultiValueEncoded<Env::Api, MultiValue5<ManagedBuffer<Env::Api>, ManagedBuffer<Env::Api>, u64, BigUint<Env::Api>, u8>>>,
+    >(
+        self,
+        submissions: Arg0,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call("submitBatch")
+            .argument(&submissions)
+            .original_result()
+    }
+
+    pub fn latest_round_data(
+        self,
+    ) -> TxProxyCall<Env, From, To, Gas, MultiValueEncoded<Env::Api, PriceFeed<Env::Api>>> {
+        self.wrapped_tx
+            .raw_call("latestRoundData")
+            .original_result()
+    }
+
+    pub fn latest_price_feed<
+        Arg0: CodecInto<ManagedBuffer<Env::Api>>,
+        Arg1: CodecInto<ManagedBuffer<Env::Api>>,
+    >(
+        self,
+        from: Arg0,
+        to: Arg1,
+    ) -> TxProxyCall<Env, From, To, Gas, MultiValue6<u32, ManagedBuffer<Env::Api>, ManagedBuffer<Env::Api>, u64, BigUint<Env::Api>, u8>> {
+        self.wrapped_tx
+            .raw_call("latestPriceFeed")
+            .argument(&from)
+            .argument(&to)
+            .original_result()
+    }
+
+    pub fn latest_price_feed_optional<
+        Arg0: CodecInto<ManagedBuffer<Env::Api>>,
+        Arg1: CodecInto<ManagedBuffer<Env::Api>>,
+    >(
+        self,
+        from: Arg0,
+        to: Arg1,
+    ) -> TxProxyCall<Env, From, To, Gas, OptionalValue<MultiValue6<u32, ManagedBuffer<Env::Api>, ManagedBuffer<Env::Api>, u64, BigUint<Env::Api>, u8>>> {
+        self.wrapped_tx
+            .raw_call("latestPriceFeedOptional")
+            .argument(&from)
+            .argument(&to)
+            .original_result()
+    }
+
+    pub fn set_submission_count<
+        Arg0: CodecInto<usize>,
+    >(
+        self,
+        submission_count: Arg0,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call("setSubmissionCount")
+            .argument(&submission_count)
+            .original_result()
+    }
+
+    pub fn get_oracles(
+        self,
+    ) -> TxProxyCall<Env, From, To, Gas, MultiValueEncoded<Env::Api, ManagedAddress<Env::Api>>> {
+        self.wrapped_tx
+            .raw_call("getOracles")
+            .original_result()
+    }
+
+    pub fn set_pair_decimals<
+        Arg0: CodecInto<ManagedBuffer<Env::Api>>,
+        Arg1: CodecInto<ManagedBuffer<Env::Api>>,
+        Arg2: CodecInto<u8>,
+    >(
+        self,
+        from: Arg0,
+        to: Arg1,
+        decimals: Arg2,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call("setPairDecimals")
+            .argument(&from)
+            .argument(&to)
+            .argument(&decimals)
+            .original_result()
+    }
+
+    pub fn get_pair_decimals<
+        Arg0: CodecInto<ManagedBuffer<Env::Api>>,
+        Arg1: CodecInto<ManagedBuffer<Env::Api>>,
+    >(
+        self,
+        from: Arg0,
+        to: Arg1,
+    ) -> TxProxyCall<Env, From, To, Gas, u8> {
+        self.wrapped_tx
+            .raw_call("getPairDecimals")
+            .argument(&from)
+            .argument(&to)
+            .original_result()
+    }
+
+    pub fn submission_count(
+        self,
+    ) -> TxProxyCall<Env, From, To, Gas, usize> {
+        self.wrapped_tx
+            .raw_call("submission_count")
+            .original_result()
+    }
+
+    pub fn pause_endpoint(
+        self,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call("pause")
+            .original_result()
+    }
+
+    pub fn unpause_endpoint(
+        self,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call("unpause")
+            .original_result()
+    }
+
+    pub fn paused_status(
+        self,
+    ) -> TxProxyCall<Env, From, To, Gas, bool> {
+        self.wrapped_tx
+            .raw_call("isPaused")
+            .original_result()
+    }
+
+    pub fn stake(
+        self,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call("stake")
+            .original_result()
+    }
+
+    pub fn unstake<
+        Arg0: CodecInto<BigUint<Env::Api>>,
+    >(
+        self,
+        unstake_amount: Arg0,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call("unstake")
+            .argument(&unstake_amount)
+            .original_result()
+    }
+
+    pub fn vote_slash_member<
+        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+    >(
+        self,
+        member_to_slash: Arg0,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call("voteSlashMember")
+            .argument(&member_to_slash)
+            .original_result()
+    }
+
+    pub fn cancel_vote_slash_member<
+        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+    >(
+        self,
+        member_to_slash: Arg0,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call("cancelVoteSlashMember")
+            .argument(&member_to_slash)
+            .original_result()
+    }
+
+    pub fn slash_member<
+        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+    >(
+        self,
+        member_to_slash: Arg0,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call("slashMember")
+            .argument(&member_to_slash)
+            .original_result()
+    }
+}
+
+#[derive(TopEncode, TopDecode)]
+pub struct PriceFeed<Api>
+where
+    Api: ManagedTypeApi,
+{
+    pub round_id: u32,
+    pub from: ManagedBuffer<Api>,
+    pub to: ManagedBuffer<Api>,
+    pub timestamp: u64,
+    pub price: BigUint<Api>,
+    pub decimals: u8,
+}
+
+#[derive(TopEncode, TopDecode)]
+pub struct NewRoundEvent<Api>
+where
+    Api: ManagedTypeApi,
+{
+    pub price: BigUint<Api>,
+    pub timestamp: u64,
+    pub decimals: u8,
+    pub block: u64,
+    pub epoch: u64,
+}
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 44650679d3..4c01ab175f 100644
--- a/contracts/core/price-aggregator/tests/price_aggregator_stress_blackbox.rs
+++ b/contracts/core/price-aggregator/tests/price_aggregator_stress_blackbox.rs
@@ -1,8 +1,7 @@
 use multiversx_price_aggregator_sc::{
     price_aggregator_data::{OracleStatus, TokenPair},
-    ContractObj, PriceAggregator, ProxyTrait as _,
+    ContractObj, PriceAggregator,
 };
-use multiversx_sc_modules::{pause::ProxyTrait, staking::ProxyTrait as _};
 
 use multiversx_sc_scenario::imports::*;
 
@@ -18,6 +17,8 @@ const STAKE_AMOUNT: u64 = 20;
 const SUBMISSION_COUNT: usize = 50;
 const USD_TICKER: &[u8] = b"USDC";
 
+mod price_aggregator_proxy;
+
 type PriceAggregatorContract = ContractInfo<multiversx_price_aggregator_sc::Proxy<StaticApi>>;
 
 fn world() -> ScenarioWorld {
@@ -86,65 +87,73 @@ impl PriceAggregatorTestState {
                 .collect::<Vec<_>>(),
         );
 
-        self.world.sc_deploy(
-            ScDeployStep::new()
-                .from(OWNER_ADDRESS_EXPR)
-                .code(price_aggregator_code)
-                .call(self.price_aggregator_contract.init(
-                    EgldOrEsdtTokenIdentifier::egld(),
-                    STAKE_AMOUNT,
-                    SLASH_AMOUNT,
-                    SLASH_QUORUM,
-                    SUBMISSION_COUNT,
-                    oracles,
-                ))
-                .gas_limit("120,000,000"),
-        );
+        self.world
+            .tx()
+            .from(AddressExpr("owner"))
+            .gas(120_000_000u64)
+            .typed(price_aggregator_proxy::PriceAggregatorProxy)
+            .init(
+                EgldOrEsdtTokenIdentifier::egld(),
+                STAKE_AMOUNT,
+                SLASH_AMOUNT,
+                SLASH_QUORUM,
+                SUBMISSION_COUNT,
+                oracles,
+            )
+            .code(price_aggregator_code)
+            .run();
 
         for address in self.oracles.iter() {
-            self.world.sc_call(
-                ScCallStep::new()
-                    .from(address)
-                    .egld_value(STAKE_AMOUNT)
-                    .call(self.price_aggregator_contract.stake())
-                    .gas_limit("5,000,000"),
-            );
+            self.world
+                .tx()
+                .from(&address.to_address())
+                .to(&self.price_aggregator_contract.to_address())
+                .gas(5_000_000u64)
+                .typed(price_aggregator_proxy::PriceAggregatorProxy)
+                .stake()
+                .egld(STAKE_AMOUNT)
+                .run();
         }
 
         self
     }
 
     fn set_pair_decimals(&mut self) {
-        self.world.sc_call(
-            ScCallStep::new().from(OWNER_ADDRESS_EXPR).call(
-                self.price_aggregator_contract
-                    .set_pair_decimals(EGLD_TICKER, USD_TICKER, DECIMALS),
-            ),
-        );
+        self.world
+            .tx()
+            .from(AddressExpr("owner"))
+            .to(&self.price_aggregator_contract.to_address())
+            .typed(price_aggregator_proxy::PriceAggregatorProxy)
+            .set_pair_decimals(EGLD_TICKER, USD_TICKER, DECIMALS)
+            .run();
     }
 
     fn unpause_endpoint(&mut self) {
-        self.world.sc_call(
-            ScCallStep::new()
-                .from(OWNER_ADDRESS_EXPR)
-                .call(self.price_aggregator_contract.unpause_endpoint())
-                .gas_limit("5,000,000"),
-        );
+        self.world
+            .tx()
+            .from(AddressExpr("owner"))
+            .to(&self.price_aggregator_contract.to_address())
+            .gas(5_000_000u64)
+            .typed(price_aggregator_proxy::PriceAggregatorProxy)
+            .unpause_endpoint()
+            .run();
     }
 
     fn submit(&mut self, from: &AddressValue, submission_timestamp: u64, price: u64) {
-        self.world.sc_call(
-            ScCallStep::new()
-                .from(from)
-                .call(self.price_aggregator_contract.submit(
-                    EGLD_TICKER,
-                    USD_TICKER,
-                    submission_timestamp,
-                    price,
-                    DECIMALS,
-                ))
-                .gas_limit("7,000,000"),
-        );
+        self.world
+            .tx()
+            .from(&from.to_address())
+            .to(&self.price_aggregator_contract.to_address())
+            .gas(7_000_000u64)
+            .typed(price_aggregator_proxy::PriceAggregatorProxy)
+            .submit(
+                EGLD_TICKER,
+                USD_TICKER,
+                submission_timestamp,
+                price,
+                DECIMALS,
+            )
+            .run();
     }
 }
 

From bd2bf9cc09f483caa46aca84a8087b0a9ef0e62a Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 11 Apr 2024 11:16:34 +0300
Subject: [PATCH 0693/1254] TxToStep refactor

---
 .../src/scenario/tx_to_step/tx_to_step_call.rs       |  8 ++------
 .../src/scenario/tx_to_step/tx_to_step_deploy.rs     |  8 ++------
 .../src/scenario/tx_to_step/tx_to_step_query.rs      |  8 ++------
 .../src/scenario/tx_to_step/tx_to_step_trait.rs      | 12 ++++--------
 .../src/scenario/tx_to_step/tx_to_step_transfer.rs   |  8 ++------
 framework/snippets/src/multi/homogenous_tx_buffer.rs |  2 +-
 6 files changed, 13 insertions(+), 33 deletions(-)

diff --git a/framework/scenario/src/scenario/tx_to_step/tx_to_step_call.rs b/framework/scenario/src/scenario/tx_to_step/tx_to_step_call.rs
index dc4850b845..b155ac66df 100644
--- a/framework/scenario/src/scenario/tx_to_step/tx_to_step_call.rs
+++ b/framework/scenario/src/scenario/tx_to_step/tx_to_step_call.rs
@@ -6,7 +6,7 @@ use crate::scenario_model::{ScCallStep, TxExpect, TxResponse};
 
 use super::{address_annotated, gas_annotated, StepWrapper, TxToStep};
 
-impl<Env, From, To, Payment, Gas, RH> TxToStep
+impl<Env, From, To, Payment, Gas, RH> TxToStep<Env, RH>
     for Tx<Env, From, To, Payment, Gas, FunctionCall<Env::Api>, RH>
 where
     Env: TxEnv<RHExpect = TxExpect>,
@@ -16,13 +16,9 @@ where
     Gas: TxGas<Env>,
     RH: RHListExec<TxResponse, Env>,
 {
-    type Env = Env;
-
     type Step = ScCallStep;
 
-    type RH = RH;
-
-    fn tx_to_step(self) -> StepWrapper<Self::Env, Self::Step, Self::RH> {
+    fn tx_to_step(self) -> StepWrapper<Env, Self::Step, RH> {
         let mut step = tx_to_sc_call_step(
             &self.env,
             self.from,
diff --git a/framework/scenario/src/scenario/tx_to_step/tx_to_step_deploy.rs b/framework/scenario/src/scenario/tx_to_step/tx_to_step_deploy.rs
index 4378bbb682..3221de4b45 100644
--- a/framework/scenario/src/scenario/tx_to_step/tx_to_step_deploy.rs
+++ b/framework/scenario/src/scenario/tx_to_step/tx_to_step_deploy.rs
@@ -6,7 +6,7 @@ use crate::scenario_model::{ScDeployStep, TxExpect, TxResponse};
 
 use super::{address_annotated, code_annotated, gas_annotated, StepWrapper, TxToStep};
 
-impl<Env, From, Payment, Gas, CodeValue, RH> TxToStep
+impl<Env, From, Payment, Gas, CodeValue, RH> TxToStep<Env, RH>
     for Tx<Env, From, (), Payment, Gas, DeployCall<Env, Code<CodeValue>>, RH>
 where
     Env: TxEnv<RHExpect = TxExpect>,
@@ -16,13 +16,9 @@ where
     CodeValue: TxCodeValue<Env>,
     RH: RHListExec<TxResponse, Env>,
 {
-    type Env = Env;
-
     type Step = ScDeployStep;
 
-    type RH = RH;
-
-    fn tx_to_step(self) -> StepWrapper<Self::Env, Self::Step, Self::RH> {
+    fn tx_to_step(self) -> StepWrapper<Env, Self::Step, RH> {
         let mut step =
             tx_to_sc_deploy_step(&self.env, self.from, self.payment, self.gas, self.data);
         step.expect = Some(self.result_handler.list_tx_expect());
diff --git a/framework/scenario/src/scenario/tx_to_step/tx_to_step_query.rs b/framework/scenario/src/scenario/tx_to_step/tx_to_step_query.rs
index 427a8e62ce..9cfbb5d39e 100644
--- a/framework/scenario/src/scenario/tx_to_step/tx_to_step_query.rs
+++ b/framework/scenario/src/scenario/tx_to_step/tx_to_step_query.rs
@@ -4,19 +4,15 @@ use crate::scenario_model::{ScQueryStep, TxExpect, TxResponse};
 
 use super::{address_annotated, StepWrapper, TxToQueryStep};
 
-impl<Env, To, RH> TxToQueryStep for Tx<Env, (), To, (), (), FunctionCall<Env::Api>, RH>
+impl<Env, To, RH> TxToQueryStep<Env, RH> for Tx<Env, (), To, (), (), FunctionCall<Env::Api>, RH>
 where
     Env: TxEnv<RHExpect = TxExpect>,
     To: TxToSpecified<Env>,
     RH: RHListExec<TxResponse, Env>,
 {
-    type Env = Env;
-
     type Step = ScQueryStep;
 
-    type RH = RH;
-
-    fn tx_to_query_step(self) -> StepWrapper<Self::Env, Self::Step, Self::RH> {
+    fn tx_to_query_step(self) -> StepWrapper<Env, Self::Step, RH> {
         let mut step = tx_to_sc_query_step(&self.env, self.to, self.data);
         step.expect = Some(self.result_handler.list_tx_expect());
 
diff --git a/framework/scenario/src/scenario/tx_to_step/tx_to_step_trait.rs b/framework/scenario/src/scenario/tx_to_step/tx_to_step_trait.rs
index 708e7c8eea..60615e6bb5 100644
--- a/framework/scenario/src/scenario/tx_to_step/tx_to_step_trait.rs
+++ b/framework/scenario/src/scenario/tx_to_step/tx_to_step_trait.rs
@@ -1,17 +1,13 @@
 use super::StepWrapper;
 
-pub trait TxToStep {
-    type Env;
+pub trait TxToStep<Env, RH> {
     type Step;
-    type RH;
 
-    fn tx_to_step(self) -> StepWrapper<Self::Env, Self::Step, Self::RH>;
+    fn tx_to_step(self) -> StepWrapper<Env, Self::Step, RH>;
 }
 
-pub trait TxToQueryStep {
-    type Env;
+pub trait TxToQueryStep<Env, RH> {
     type Step;
-    type RH;
 
-    fn tx_to_query_step(self) -> StepWrapper<Self::Env, Self::Step, Self::RH>;
+    fn tx_to_query_step(self) -> StepWrapper<Env, Self::Step, RH>;
 }
diff --git a/framework/scenario/src/scenario/tx_to_step/tx_to_step_transfer.rs b/framework/scenario/src/scenario/tx_to_step/tx_to_step_transfer.rs
index c2f31e6ff4..637d840e4e 100644
--- a/framework/scenario/src/scenario/tx_to_step/tx_to_step_transfer.rs
+++ b/framework/scenario/src/scenario/tx_to_step/tx_to_step_transfer.rs
@@ -4,7 +4,7 @@ use crate::scenario_model::TransferStep;
 
 use super::{address_annotated, gas_annotated, StepWrapper, TxToStep};
 
-impl<Env, From, To, Payment, Gas> TxToStep for Tx<Env, From, To, Payment, Gas, (), ()>
+impl<Env, From, To, Payment, Gas> TxToStep<Env, ()> for Tx<Env, From, To, Payment, Gas, (), ()>
 where
     Env: TxEnv,
     From: TxFromSpecified<Env>,
@@ -12,13 +12,9 @@ where
     Payment: TxPayment<Env>,
     Gas: TxGas<Env>,
 {
-    type Env = Env;
-
     type Step = TransferStep;
 
-    type RH = ();
-
-    fn tx_to_step(self) -> StepWrapper<Self::Env, Self::Step, Self::RH> {
+    fn tx_to_step(self) -> StepWrapper<Env, Self::Step, ()> {
         let step = tx_to_transfer_step(&self.env, self.from, self.to, self.payment, self.gas);
 
         StepWrapper {
diff --git a/framework/snippets/src/multi/homogenous_tx_buffer.rs b/framework/snippets/src/multi/homogenous_tx_buffer.rs
index 7d40474d59..da177d1658 100644
--- a/framework/snippets/src/multi/homogenous_tx_buffer.rs
+++ b/framework/snippets/src/multi/homogenous_tx_buffer.rs
@@ -38,7 +38,7 @@ where
 {
     pub fn push_tx<Tx, F>(&mut self, f: F) -> &mut Self
     where
-        Tx: TxToStep<Env = ScenarioTxEnvData, Step = Step, RH = RH>,
+        Tx: TxToStep<ScenarioTxEnvData, RH, Step = Step>,
         F: FnOnce(TxBaseWithEnv<ScenarioTxEnvData>) -> Tx,
     {
         let env = self.env.world.new_env_data();

From c04bf6a7d6ebb969cb909c457e6b5d7ffdb6ec4d Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Thu, 11 Apr 2024 16:44:05 +0300
Subject: [PATCH 0694/1254] refactor - removed parameters
 retrieve_account_as_scenario_set_state

---
 .../adder/interact/src/basic_interact.rs      | 14 +------
 contracts/examples/adder/wasm/Cargo.lock      |  6 +--
 .../interact/src/multisig_interact.rs         | 14 ++-----
 .../interact/src/multisig_interact_wegld.rs   | 16 +++-----
 .../interact/src/bf_interact.rs               | 12 +-----
 .../src/facade/expr/bech32_address.rs         | 10 +++++
 .../scenario/src/standalone/account_tool.rs   | 40 ++++++++-----------
 .../scenario/src/standalone/scenario_cli.rs   | 11 ++++-
 framework/snippets/src/interactor.rs          | 11 +++++
 9 files changed, 60 insertions(+), 74 deletions(-)

diff --git a/contracts/examples/adder/interact/src/basic_interact.rs b/contracts/examples/adder/interact/src/basic_interact.rs
index 8a8a6c22fd..a0fa99f17a 100644
--- a/contracts/examples/adder/interact/src/basic_interact.rs
+++ b/contracts/examples/adder/interact/src/basic_interact.rs
@@ -68,18 +68,8 @@ impl AdderInteract {
     }
 
     async fn set_state(&mut self) {
-        println!("wallet address: {}", &self.wallet_address);
-        let scenario_raw = retrieve_account_as_scenario_set_state(
-            Config::load_config().gateway().to_string(),
-            self.wallet_address.to_bech32_string(),
-            true,
-        )
-        .await;
-
-        let scenario = Scenario::interpret_from(scenario_raw, &InterpreterContext::default());
-
-        self.interactor.pre_runners.run_scenario(&scenario);
-        self.interactor.post_runners.run_scenario(&scenario);
+        println!("wallet address: {}", self.wallet_address);
+        self.interactor.retrieve_account(&self.wallet_address).await;
     }
 
     async fn deploy(&mut self) {
diff --git a/contracts/examples/adder/wasm/Cargo.lock b/contracts/examples/adder/wasm/Cargo.lock
index c7b8a8f917..1aea528c2d 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.48.0"
+version = "0.49.0-alpha.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.49.0-alpha.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/multisig/interact/src/multisig_interact.rs b/contracts/examples/multisig/interact/src/multisig_interact.rs
index 48cfb05a6d..b8f1ec2be4 100644
--- a/contracts/examples/multisig/interact/src/multisig_interact.rs
+++ b/contracts/examples/multisig/interact/src/multisig_interact.rs
@@ -119,17 +119,9 @@ impl MultisigInteract {
                 "board member address: {}",
                 bech32::encode(board_member_address)
             );
-            let scenario_raw = retrieve_account_as_scenario_set_state(
-                Config::load_config().gateway().to_string(),
-                bech32::encode(board_member_address),
-                true,
-            )
-            .await;
-
-            let scenario = Scenario::interpret_from(scenario_raw, &InterpreterContext::default());
-
-            self.interactor.pre_runners.run_scenario(&scenario);
-            self.interactor.post_runners.run_scenario(&scenario);
+            self.interactor
+                .retrieve_account(&Bech32Address::from(board_member_address))
+                .await;
         }
 
         self.wegld_swap_set_state().await;
diff --git a/contracts/examples/multisig/interact/src/multisig_interact_wegld.rs b/contracts/examples/multisig/interact/src/multisig_interact_wegld.rs
index c9156e991d..a59e686e2a 100644
--- a/contracts/examples/multisig/interact/src/multisig_interact_wegld.rs
+++ b/contracts/examples/multisig/interact/src/multisig_interact_wegld.rs
@@ -35,17 +35,11 @@ impl MultisigInteract {
     }
 
     pub async fn wegld_swap_set_state(&mut self) {
-        let scenario_raw = retrieve_account_as_scenario_set_state(
-            Config::load_config().gateway().to_string(),
-            WEGLD_SWAP_SC_BECH32.to_string(),
-            true,
-        )
-        .await;
-
-        let scenario = Scenario::interpret_from(scenario_raw, &InterpreterContext::default());
-
-        self.interactor.pre_runners.run_scenario(&scenario);
-        self.interactor.post_runners.run_scenario(&scenario);
+        self.interactor
+            .retrieve_account(&Bech32Address::from_bech32_string(
+                WEGLD_SWAP_SC_BECH32.to_owned(),
+            ))
+            .await;
     }
 
     async fn propose_wrap_egld(&mut self) -> usize {
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 b93f0baac3..8a36a12749 100644
--- a/contracts/feature-tests/basic-features/interact/src/bf_interact.rs
+++ b/contracts/feature-tests/basic-features/interact/src/bf_interact.rs
@@ -73,17 +73,7 @@ impl BasicFeaturesInteract {
 
     async fn set_state(&mut self) {
         println!("wallet address: {}", bech32::encode(&self.wallet_address));
-        let scenario_raw = retrieve_account_as_scenario_set_state(
-            Config::load_config().gateway().to_string(),
-            bech32::encode(&self.wallet_address),
-            true,
-        )
-        .await;
-
-        let scenario = Scenario::interpret_from(scenario_raw, &InterpreterContext::default());
-
-        self.interactor.pre_runners.run_scenario(&scenario);
-        self.interactor.post_runners.run_scenario(&scenario);
+        self.interactor.retrieve_account(&Bech32Address::from(&self.wallet_address)).await;
     }
 
     async fn deploy(&mut self) {
diff --git a/framework/scenario/src/facade/expr/bech32_address.rs b/framework/scenario/src/facade/expr/bech32_address.rs
index a327e44a6b..9b7291ad16 100644
--- a/framework/scenario/src/facade/expr/bech32_address.rs
+++ b/framework/scenario/src/facade/expr/bech32_address.rs
@@ -32,6 +32,16 @@ impl From<Address> for Bech32Address {
     }
 }
 
+impl From<&Address> for Bech32Address {
+    fn from(value: &Address) -> Self {
+        let bech32 = bech32::encode(value);
+        Bech32Address {
+            address: value.clone(),
+            bech32,
+        }
+    }
+}
+
 impl Bech32Address {
     pub fn from_bech32_string(bech32: String) -> Self {
         let address = bech32::decode(&bech32);
diff --git a/framework/scenario/src/standalone/account_tool.rs b/framework/scenario/src/standalone/account_tool.rs
index c1f4c5f605..90fdb61857 100644
--- a/framework/scenario/src/standalone/account_tool.rs
+++ b/framework/scenario/src/standalone/account_tool.rs
@@ -1,54 +1,46 @@
-use super::scenario_cli::AccountArgs;
+use crate::imports::Bech32Address;
+
 use multiversx_chain_scenario_format::serde_raw::{
     AccountRaw, EsdtFullRaw, EsdtInstanceRaw, EsdtRaw, ScenarioRaw, StepRaw, ValueSubTree,
 };
+use multiversx_chain_vm::display_util::key_hex;
 use multiversx_sdk::{
     blockchain::CommunicationProxy,
     data::{address::Address, esdt::EsdtBalance},
 };
 use std::collections::{BTreeMap, HashMap};
 
-pub async fn print_account_as_scenario_set_state(api: String, args: &AccountArgs) {
-    let scenario_raw =
-        retrieve_account_as_scenario_set_state(api, args.address.clone(), false).await;
+pub async fn print_account_as_scenario_set_state(
+    api: &CommunicationProxy,
+    address: &Bech32Address,
+) {
+    let scenario_raw = retrieve_account_as_scenario_set_state(api, address).await;
     println!("{}", scenario_raw.to_json_string());
 }
 
 pub async fn retrieve_account_as_scenario_set_state(
-    api: String,
-    addr: String,
-    hex_encoded: bool,
+    api: &CommunicationProxy,
+    addr: &Bech32Address,
 ) -> ScenarioRaw {
-    let address = Address::from_bech32_string(&addr).unwrap();
-    let blockchain = CommunicationProxy::new(api);
-    let account = blockchain.get_account(&address).await.unwrap();
+    let address = Address::from_bech32_string(addr.to_bech32_str()).unwrap();
+    let account = api.get_account(&address).await.unwrap();
 
-    let account_esdt = blockchain
+    let account_esdt = api
         .get_account_esdt_tokens(&address)
         .await
         .unwrap_or_else(|err| panic!("failed to retrieve ESDT tokens for address {addr}: {err}"));
-    let account_esdt_roles = blockchain
+    let account_esdt_roles = api
         .get_account_esdt_roles(&address)
         .await
         .unwrap_or_else(|err| panic!("failed to retrieve ESDT roles for address {addr}: {err}"));
-    let account_storage = blockchain
+    let account_storage = api
         .get_account_storage_keys(&address)
         .await
         .unwrap_or_else(|err| panic!("failed to retrieve storage for address {addr}: {err}"));
 
-    let addr_pretty = if !hex_encoded {
-        if account.code.is_empty() {
-            format!("address:{addr}")
-        } else {
-            format!("sc:{addr}")
-        }
-    } else {
-        format!("0x{}", hex::encode(address.to_bytes()))
-    };
-
     let mut accounts = BTreeMap::new();
     accounts.insert(
-        addr_pretty,
+        key_hex(&address.to_bytes()),
         AccountRaw {
             nonce: Some(ValueSubTree::Str(account.nonce.to_string())),
             balance: Some(ValueSubTree::Str(account.balance.to_string())),
diff --git a/framework/scenario/src/standalone/scenario_cli.rs b/framework/scenario/src/standalone/scenario_cli.rs
index c7049728f4..624b316ef0 100644
--- a/framework/scenario/src/standalone/scenario_cli.rs
+++ b/framework/scenario/src/standalone/scenario_cli.rs
@@ -1,4 +1,7 @@
 use clap::{Args, Parser, Subcommand};
+use multiversx_sdk::blockchain::CommunicationProxy;
+
+use crate::imports::Bech32Address;
 
 use super::account_tool;
 
@@ -34,10 +37,14 @@ pub struct AccountArgs {
 /// Entry point in the program when calling it as a standalone tool.
 pub async fn cli_main() {
     let cli_args = ScenarioCliArgs::parse();
-    let api = cli_args.api.expect("API needs tp be specified");
+    let api = CommunicationProxy::new(cli_args.api.expect("API needs tp be specified"));
     match &cli_args.command {
         Some(ScenarioCliAction::Account(args)) => {
-            account_tool::print_account_as_scenario_set_state(api, args).await;
+            account_tool::print_account_as_scenario_set_state(
+                &api,
+                &Bech32Address::from_bech32_string(args.address.to_string()),
+            )
+            .await;
         },
         None => {},
     }
diff --git a/framework/snippets/src/interactor.rs b/framework/snippets/src/interactor.rs
index 346d117f80..d1f49d2653 100644
--- a/framework/snippets/src/interactor.rs
+++ b/framework/snippets/src/interactor.rs
@@ -1,4 +1,5 @@
 use multiversx_sc_scenario::{
+    imports::{retrieve_account_as_scenario_set_state, Bech32Address, InterpretableFrom, InterpreterContext, Scenario, ScenarioRunner},
     mandos_system::{run_list::ScenarioRunnerList, run_trace::ScenarioTraceFile},
     multiversx_sc::types::Address,
     scenario_model::AddressValue,
@@ -67,6 +68,16 @@ impl Interactor {
         self.post_runners.push(ScenarioTraceFile::new(path));
         self
     }
+
+    pub async fn retrieve_account(&mut self, wallet_address: &Bech32Address) {
+        let scenario_raw =
+            retrieve_account_as_scenario_set_state(&self.proxy, wallet_address).await;
+
+        let scenario = Scenario::interpret_from(scenario_raw, &InterpreterContext::default());
+
+        self.pre_runners.run_scenario(&scenario);
+        self.post_runners.run_scenario(&scenario);
+    }
 }
 
 pub(crate) fn mandos_to_erdrs_address(mandos_address: &AddressValue) -> ErdrsAddress {

From 13e283f67684aea27ec98be067854eae947094c0 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Thu, 11 Apr 2024 17:53:09 +0200
Subject: [PATCH 0695/1254] scenario test contract added in feature tests

---
 Cargo.lock                                    |  16 ++
 Cargo.toml                                    |   3 +
 .../feature-tests/scenario-tester/.gitignore  |  10 +
 .../feature-tests/scenario-tester/Cargo.toml  |  17 ++
 .../feature-tests/scenario-tester/README.md   |   3 +
 .../scenario-tester/interact/.gitignore       |   8 +
 .../scenario-tester/interact/Cargo.toml       |  22 +++
 .../scenario-tester/interact/config.toml      |   1 +
 .../interact/src/basic_interact.rs            | 172 ++++++++++++++++++
 .../interact/src/basic_interact_cli.rs        |  39 ++++
 .../interact/src/basic_interact_config.rs     |  26 +++
 .../interact/src/basic_interact_state.rs      |  50 +++++
 .../interaction/devnet.snippets.sh            |  25 +++
 .../interaction/testnet.snippets.sh           |  26 +++
 .../scenario-tester/meta/Cargo.toml           |  13 ++
 .../scenario-tester/meta/src/main.rs          |   3 +
 .../scenario-tester/multiversx.json           |   3 +
 .../scenario-tester/mxsc-template.toml        |  24 +++
 .../scenario-tester/sc-config.toml            |   4 +
 .../scenario-tester/scenarios/adder.scen.json |  99 ++++++++++
 .../scenarios/interactor_trace.scen.json      |  76 ++++++++
 .../feature-tests/scenario-tester/src/lib.rs  |  30 +++
 .../src/scenario_tester_proxy.rs              | 110 +++++++++++
 .../tests/adder_blackbox_chained_test.rs      |  64 +++++++
 .../tests/adder_blackbox_legacy_proxy_test.rs |  77 ++++++++
 .../tests/adder_blackbox_raw_steps_test.rs    |  53 ++++++
 .../tests/adder_blackbox_test.rs              |  72 ++++++++
 .../tests/adder_blackbox_upgrade_test.rs      |  50 +++++
 .../tests/adder_scenario_go_test.rs           |  15 ++
 .../tests/adder_scenario_rs_test.rs           |  19 ++
 .../scenario-tester/tests/adder_unit_test.rs  |  17 ++
 .../tests/adder_whitebox_test.rs              |  50 +++++
 .../scenario-tester/wasm/Cargo.lock           | 170 +++++++++++++++++
 .../scenario-tester/wasm/Cargo.toml           |  32 ++++
 .../scenario-tester/wasm/src/lib.rs           |  30 +++
 35 files changed, 1429 insertions(+)
 create mode 100644 contracts/feature-tests/scenario-tester/.gitignore
 create mode 100644 contracts/feature-tests/scenario-tester/Cargo.toml
 create mode 100644 contracts/feature-tests/scenario-tester/README.md
 create mode 100644 contracts/feature-tests/scenario-tester/interact/.gitignore
 create mode 100644 contracts/feature-tests/scenario-tester/interact/Cargo.toml
 create mode 100644 contracts/feature-tests/scenario-tester/interact/config.toml
 create mode 100644 contracts/feature-tests/scenario-tester/interact/src/basic_interact.rs
 create mode 100644 contracts/feature-tests/scenario-tester/interact/src/basic_interact_cli.rs
 create mode 100644 contracts/feature-tests/scenario-tester/interact/src/basic_interact_config.rs
 create mode 100644 contracts/feature-tests/scenario-tester/interact/src/basic_interact_state.rs
 create mode 100644 contracts/feature-tests/scenario-tester/interaction/devnet.snippets.sh
 create mode 100644 contracts/feature-tests/scenario-tester/interaction/testnet.snippets.sh
 create mode 100644 contracts/feature-tests/scenario-tester/meta/Cargo.toml
 create mode 100644 contracts/feature-tests/scenario-tester/meta/src/main.rs
 create mode 100644 contracts/feature-tests/scenario-tester/multiversx.json
 create mode 100644 contracts/feature-tests/scenario-tester/mxsc-template.toml
 create mode 100644 contracts/feature-tests/scenario-tester/sc-config.toml
 create mode 100644 contracts/feature-tests/scenario-tester/scenarios/adder.scen.json
 create mode 100644 contracts/feature-tests/scenario-tester/scenarios/interactor_trace.scen.json
 create mode 100644 contracts/feature-tests/scenario-tester/src/lib.rs
 create mode 100644 contracts/feature-tests/scenario-tester/src/scenario_tester_proxy.rs
 create mode 100644 contracts/feature-tests/scenario-tester/tests/adder_blackbox_chained_test.rs
 create mode 100644 contracts/feature-tests/scenario-tester/tests/adder_blackbox_legacy_proxy_test.rs
 create mode 100644 contracts/feature-tests/scenario-tester/tests/adder_blackbox_raw_steps_test.rs
 create mode 100644 contracts/feature-tests/scenario-tester/tests/adder_blackbox_test.rs
 create mode 100644 contracts/feature-tests/scenario-tester/tests/adder_blackbox_upgrade_test.rs
 create mode 100644 contracts/feature-tests/scenario-tester/tests/adder_scenario_go_test.rs
 create mode 100644 contracts/feature-tests/scenario-tester/tests/adder_scenario_rs_test.rs
 create mode 100644 contracts/feature-tests/scenario-tester/tests/adder_unit_test.rs
 create mode 100644 contracts/feature-tests/scenario-tester/tests/adder_whitebox_test.rs
 create mode 100755 contracts/feature-tests/scenario-tester/wasm/Cargo.lock
 create mode 100644 contracts/feature-tests/scenario-tester/wasm/Cargo.toml
 create mode 100644 contracts/feature-tests/scenario-tester/wasm/src/lib.rs

diff --git a/Cargo.lock b/Cargo.lock
index a63206b567..9ad27741d0 100755
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2755,6 +2755,22 @@ dependencies = [
  "winapi-util",
 ]
 
+[[package]]
+name = "scenario-tester-meta"
+version = "0.0.0"
+dependencies = [
+ "multiversx-sc-meta",
+ "scenario_tester",
+]
+
+[[package]]
+name = "scenario_tester"
+version = "0.0.0"
+dependencies = [
+ "multiversx-sc",
+ "multiversx-sc-scenario",
+]
+
 [[package]]
 name = "schannel"
 version = "0.1.23"
diff --git a/Cargo.toml b/Cargo.toml
index d97f1292e0..459624af85 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -178,4 +178,7 @@ members = [
   "contracts/feature-tests/exchange-features",
   "contracts/feature-tests/exchange-features/meta",
 
+  "contracts/feature-tests/scenario-tester",
+  "contracts/feature-tests/scenario-tester/meta"
+
 ]
diff --git a/contracts/feature-tests/scenario-tester/.gitignore b/contracts/feature-tests/scenario-tester/.gitignore
new file mode 100644
index 0000000000..dd49a95243
--- /dev/null
+++ b/contracts/feature-tests/scenario-tester/.gitignore
@@ -0,0 +1,10 @@
+# Generated by Cargo
+# will have compiled files and executables
+/target/
+*/target/
+
+# The mxpy output
+/output*/
+
+# Mandos test trace
+trace*.scen.json
diff --git a/contracts/feature-tests/scenario-tester/Cargo.toml b/contracts/feature-tests/scenario-tester/Cargo.toml
new file mode 100644
index 0000000000..a8faf14f1c
--- /dev/null
+++ b/contracts/feature-tests/scenario-tester/Cargo.toml
@@ -0,0 +1,17 @@
+[package]
+name = "scenario_tester"
+version = "0.0.0"
+authors = ["Andrei Marinica <andrei.marinica@multiversx.com>"]
+edition = "2021"
+publish = false
+
+[lib]
+path = "src/lib.rs"
+
+[dependencies.multiversx-sc]
+version = "0.49.0-alpha.2"
+path = "../../../framework/base"
+
+[dev-dependencies.multiversx-sc-scenario]
+version = "0.49.0-alpha.2"
+path = "../../../framework/scenario"
diff --git a/contracts/feature-tests/scenario-tester/README.md b/contracts/feature-tests/scenario-tester/README.md
new file mode 100644
index 0000000000..4538caeca9
--- /dev/null
+++ b/contracts/feature-tests/scenario-tester/README.md
@@ -0,0 +1,3 @@
+# Adder
+
+`Adder` is a simple Smart Contract.
diff --git a/contracts/feature-tests/scenario-tester/interact/.gitignore b/contracts/feature-tests/scenario-tester/interact/.gitignore
new file mode 100644
index 0000000000..ea1b920080
--- /dev/null
+++ b/contracts/feature-tests/scenario-tester/interact/.gitignore
@@ -0,0 +1,8 @@
+# Pem files are used for interactions, but shouldn't be committed
+*.pem
+
+# Temporary storage of deployed contract address, so we can preserve the context between executions.
+state.toml
+
+# Trace file of interactor tooling
+interactor_trace.scen.json
diff --git a/contracts/feature-tests/scenario-tester/interact/Cargo.toml b/contracts/feature-tests/scenario-tester/interact/Cargo.toml
new file mode 100644
index 0000000000..dc6a5533ea
--- /dev/null
+++ b/contracts/feature-tests/scenario-tester/interact/Cargo.toml
@@ -0,0 +1,22 @@
+[package]
+name = "basic-interact"
+version = "0.0.0"
+authors = ["Ovidiu Stinga <ovidiu.stinga@multiversx.com>"]
+edition = "2021"
+publish = false
+
+[[bin]]
+name = "basic-interact"
+path = "src/basic_interact.rs"
+
+[dependencies]
+clap = { version = "4.4.7", features = ["derive"] }
+serde = { version = "1.0", features = ["derive"] }
+toml = "0.8.6"
+
+[dependencies.adder]
+path = ".."
+
+[dependencies.multiversx-sc-snippets]
+version = "0.49.0-alpha.2"
+path = "../../../../framework/snippets"
diff --git a/contracts/feature-tests/scenario-tester/interact/config.toml b/contracts/feature-tests/scenario-tester/interact/config.toml
new file mode 100644
index 0000000000..61ac8dbf87
--- /dev/null
+++ b/contracts/feature-tests/scenario-tester/interact/config.toml
@@ -0,0 +1 @@
+gateway = 'https://devnet-gateway.multiversx.com'
diff --git a/contracts/feature-tests/scenario-tester/interact/src/basic_interact.rs b/contracts/feature-tests/scenario-tester/interact/src/basic_interact.rs
new file mode 100644
index 0000000000..8a8a6c22fd
--- /dev/null
+++ b/contracts/feature-tests/scenario-tester/interact/src/basic_interact.rs
@@ -0,0 +1,172 @@
+mod basic_interact_cli;
+mod basic_interact_config;
+mod basic_interact_state;
+
+use adder::adder_proxy;
+use basic_interact_config::Config;
+use basic_interact_state::State;
+use clap::Parser;
+
+use multiversx_sc_snippets::imports::*;
+
+const INTERACTOR_SCENARIO_TRACE_PATH: &str = "interactor_trace.scen.json";
+
+#[tokio::main]
+async fn main() {
+    env_logger::init();
+
+    let mut basic_interact = AdderInteract::init().await;
+
+    let cli = basic_interact_cli::InteractCli::parse();
+    match &cli.command {
+        Some(basic_interact_cli::InteractCliCommand::Add(args)) => {
+            basic_interact.add(args.value).await;
+        },
+        Some(basic_interact_cli::InteractCliCommand::Deploy) => {
+            basic_interact.deploy().await;
+        },
+        Some(basic_interact_cli::InteractCliCommand::Feed) => {
+            basic_interact.feed_contract_egld().await;
+        },
+        Some(basic_interact_cli::InteractCliCommand::MultiDeploy(args)) => {
+            basic_interact.multi_deploy(&args.count).await;
+        },
+        Some(basic_interact_cli::InteractCliCommand::Sum) => {
+            basic_interact.print_sum().await;
+        },
+        None => {},
+    }
+}
+
+#[allow(unused)]
+struct AdderInteract {
+    interactor: Interactor,
+    wallet_address: Bech32Address,
+    adder_code: BytesValue,
+    state: State,
+}
+
+impl AdderInteract {
+    async fn init() -> Self {
+        let config = Config::load_config();
+        let mut interactor = Interactor::new(config.gateway())
+            .await
+            .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(),
+        );
+
+        Self {
+            interactor,
+            wallet_address: wallet_address.into(),
+            adder_code,
+            state: State::load_state(),
+        }
+    }
+
+    async fn set_state(&mut self) {
+        println!("wallet address: {}", &self.wallet_address);
+        let scenario_raw = retrieve_account_as_scenario_set_state(
+            Config::load_config().gateway().to_string(),
+            self.wallet_address.to_bech32_string(),
+            true,
+        )
+        .await;
+
+        let scenario = Scenario::interpret_from(scenario_raw, &InterpreterContext::default());
+
+        self.interactor.pre_runners.run_scenario(&scenario);
+        self.interactor.post_runners.run_scenario(&scenario);
+    }
+
+    async fn deploy(&mut self) {
+        self.set_state().await;
+
+        let new_address = self
+            .interactor
+            .tx()
+            .from(&self.wallet_address)
+            .typed(adder_proxy::AdderProxy)
+            .init(0u32)
+            .code(&self.adder_code)
+            .returns(ReturnsNewBech32Address)
+            .prepare_async()
+            .run()
+            .await;
+
+        println!("new address: {new_address}");
+        self.state.set_adder_address(new_address);
+    }
+
+    async fn multi_deploy(&mut self, count: &u8) {
+        if *count == 0 {
+            println!("count must be greater than 0");
+            return;
+        }
+
+        self.set_state().await;
+        println!("deploying {count} contracts...");
+
+        let mut buffer = self.interactor.homogenous_call_buffer();
+        for _ in 0..*count {
+            buffer.push_tx(|tx| {
+                tx.from(&self.wallet_address)
+                    .typed(adder_proxy::AdderProxy)
+                    .init(0u32)
+                    .code(&self.adder_code)
+                    .gas(NumExpr("70,000,000"))
+                    .returns(ReturnsNewBech32Address)
+            });
+        }
+
+        let results = buffer.run().await;
+        for new_address in results {
+            println!("new address: {new_address}");
+
+            self.state.set_adder_address(new_address);
+        }
+    }
+
+    async fn feed_contract_egld(&mut self) {
+        self.interactor
+            .tx()
+            .from(&self.wallet_address)
+            .to(self.state.current_adder_address())
+            .egld(NumExpr("0,050000000000000000"))
+            .prepare_async()
+            .run()
+            .await;
+    }
+
+    async fn add(&mut self, value: u64) {
+        self.interactor
+            .tx()
+            .from(&self.wallet_address)
+            .to(self.state.current_adder_address())
+            .typed(adder_proxy::AdderProxy)
+            .add(value)
+            .prepare_async()
+            .run()
+            .await;
+
+        println!("successfully performed add");
+    }
+
+    async fn print_sum(&mut self) {
+        let sum = self
+            .interactor
+            .query()
+            .to(self.state.current_adder_address())
+            .typed(adder_proxy::AdderProxy)
+            .sum()
+            .returns(ReturnsResultConv::<RustBigUint>::new())
+            .prepare_async()
+            .run()
+            .await;
+
+        println!("sum: {sum}");
+    }
+}
diff --git a/contracts/feature-tests/scenario-tester/interact/src/basic_interact_cli.rs b/contracts/feature-tests/scenario-tester/interact/src/basic_interact_cli.rs
new file mode 100644
index 0000000000..8818c1bb60
--- /dev/null
+++ b/contracts/feature-tests/scenario-tester/interact/src/basic_interact_cli.rs
@@ -0,0 +1,39 @@
+use clap::{Args, Parser, Subcommand};
+
+/// Adder Interact CLI
+#[derive(Default, PartialEq, Eq, Debug, Parser)]
+#[command(version, about)]
+#[command(propagate_version = true)]
+pub struct InteractCli {
+    #[command(subcommand)]
+    pub command: Option<InteractCliCommand>,
+}
+
+/// Adder Interact CLI Commands
+#[derive(Clone, PartialEq, Eq, Debug, Subcommand)]
+pub enum InteractCliCommand {
+    #[command(name = "add", about = "Add value")]
+    Add(AddArgs),
+    #[command(name = "deploy", about = "Deploy contract")]
+    Deploy,
+    #[command(name = "feed", about = "Feed contract EGLD")]
+    Feed,
+    #[command(name = "multi-deploy", about = "Multiple deploy contracts")]
+    MultiDeploy(MultiDeployArgs),
+    #[command(name = "sum", about = "Print sum")]
+    Sum,
+}
+
+#[derive(Default, Clone, PartialEq, Eq, Debug, Args)]
+pub struct AddArgs {
+    /// The value to add
+    #[arg(short = 'v', long = "value", verbatim_doc_comment)]
+    pub value: u64,
+}
+
+#[derive(Default, Clone, PartialEq, Eq, Debug, Args)]
+pub struct MultiDeployArgs {
+    /// The number of contracts to deploy
+    #[arg(short = 'c', long = "count", verbatim_doc_comment)]
+    pub count: u8,
+}
diff --git a/contracts/feature-tests/scenario-tester/interact/src/basic_interact_config.rs b/contracts/feature-tests/scenario-tester/interact/src/basic_interact_config.rs
new file mode 100644
index 0000000000..e17d0cbe65
--- /dev/null
+++ b/contracts/feature-tests/scenario-tester/interact/src/basic_interact_config.rs
@@ -0,0 +1,26 @@
+use serde::Deserialize;
+use std::io::Read;
+
+/// Config file
+const CONFIG_FILE: &str = "config.toml";
+
+/// Adder Interact configuration
+#[derive(Debug, Deserialize)]
+pub struct Config {
+    gateway: String,
+}
+
+impl Config {
+    // Deserializes config from file
+    pub fn load_config() -> Self {
+        let mut file = std::fs::File::open(CONFIG_FILE).unwrap();
+        let mut content = String::new();
+        file.read_to_string(&mut content).unwrap();
+        toml::from_str(&content).unwrap()
+    }
+
+    // Returns the gateway
+    pub fn gateway(&self) -> &str {
+        &self.gateway
+    }
+}
diff --git a/contracts/feature-tests/scenario-tester/interact/src/basic_interact_state.rs b/contracts/feature-tests/scenario-tester/interact/src/basic_interact_state.rs
new file mode 100644
index 0000000000..41453e36fd
--- /dev/null
+++ b/contracts/feature-tests/scenario-tester/interact/src/basic_interact_state.rs
@@ -0,0 +1,50 @@
+use multiversx_sc_snippets::imports::*;
+use serde::{Deserialize, Serialize};
+use std::{
+    io::{Read, Write},
+    path::Path,
+};
+
+/// State file
+const STATE_FILE: &str = "state.toml";
+
+/// Multisig Interact state
+#[derive(Debug, Default, Serialize, Deserialize)]
+pub struct State {
+    adder_address: Option<Bech32Address>,
+}
+
+impl State {
+    // Deserializes state from file
+    pub fn load_state() -> Self {
+        if Path::new(STATE_FILE).exists() {
+            let mut file = std::fs::File::open(STATE_FILE).unwrap();
+            let mut content = String::new();
+            file.read_to_string(&mut content).unwrap();
+            toml::from_str(&content).unwrap()
+        } else {
+            Self::default()
+        }
+    }
+
+    /// Sets the adder address
+    pub fn set_adder_address(&mut self, address: Bech32Address) {
+        self.adder_address = Some(address);
+    }
+
+    /// Returns the adder contract
+    pub fn current_adder_address(&self) -> &Bech32Address {
+        self.adder_address
+            .as_ref()
+            .expect("no known adder contract, deploy first")
+    }
+}
+
+impl Drop for State {
+    // Serializes state to file
+    fn drop(&mut self) {
+        let mut file = std::fs::File::create(STATE_FILE).unwrap();
+        file.write_all(toml::to_string(self).unwrap().as_bytes())
+            .unwrap();
+    }
+}
diff --git a/contracts/feature-tests/scenario-tester/interaction/devnet.snippets.sh b/contracts/feature-tests/scenario-tester/interaction/devnet.snippets.sh
new file mode 100644
index 0000000000..1966381cde
--- /dev/null
+++ b/contracts/feature-tests/scenario-tester/interaction/devnet.snippets.sh
@@ -0,0 +1,25 @@
+ALICE="${USERS}/alice.pem"
+ADDRESS=$(mxpy data load --key=address-devnet)
+DEPLOY_TRANSACTION=$(mxpy data load --key=deployTransaction-devnet)
+
+deploy() {
+    mxpy --verbose contract deploy --project=${PROJECT} --recall-nonce --pem=${ALICE} --gas-limit=50000000 --arguments 0 --send --outfile="deploy-devnet.interaction.json" || return
+
+    TRANSACTION=$(mxpy data parse --file="deploy-devnet.interaction.json" --expression="data['emittedTransactionHash']")
+    ADDRESS=$(mxpy data parse --file="deploy-devnet.interaction.json" --expression="data['contractAddress']")
+
+    mxpy data store --key=address-devnet --value=${ADDRESS}
+    mxpy data store --key=deployTransaction-devnet --value=${TRANSACTION}
+
+    echo ""
+    echo "Smart contract address: ${ADDRESS}"
+}
+
+add() {
+    read -p "Enter number: " NUMBER
+    mxpy --verbose contract call ${ADDRESS} --recall-nonce --pem=${ALICE} --gas-limit=50000000 --function="add" --arguments ${NUMBER} --send
+}
+
+getSum() {
+    mxpy --verbose contract query ${ADDRESS} --function="getSum"
+}
diff --git a/contracts/feature-tests/scenario-tester/interaction/testnet.snippets.sh b/contracts/feature-tests/scenario-tester/interaction/testnet.snippets.sh
new file mode 100644
index 0000000000..06bb13e3ba
--- /dev/null
+++ b/contracts/feature-tests/scenario-tester/interaction/testnet.snippets.sh
@@ -0,0 +1,26 @@
+ALICE="${USERS}/alice.pem"
+ADDRESS=$(mxpy data load --key=address-testnet)
+DEPLOY_TRANSACTION=$(mxpy data load --key=deployTransaction-testnet)
+PROXY=https://testnet-api.multiversx.com
+
+deploy() {
+    mxpy --verbose contract deploy --project=${PROJECT} --recall-nonce --pem=${ALICE} --gas-limit=50000000 --arguments 0 --send --outfile="deploy-testnet.interaction.json" --proxy=${PROXY} --chain=T || return
+
+    TRANSACTION=$(mxpy data parse --file="deploy-testnet.interaction.json" --expression="data['emittedTransactionHash']")
+    ADDRESS=$(mxpy data parse --file="deploy-testnet.interaction.json" --expression="data['contractAddress']")
+
+    mxpy data store --key=address-testnet --value=${ADDRESS}
+    mxpy data store --key=deployTransaction-testnet --value=${TRANSACTION}
+
+    echo ""
+    echo "Smart contract address: ${ADDRESS}"
+}
+
+add() {
+    read -p "Enter number: " NUMBER
+    mxpy --verbose contract call ${ADDRESS} --recall-nonce --pem=${ALICE} --gas-limit=5000000 --function="add" --arguments ${NUMBER} --send --proxy=${PROXY} --chain=T
+}
+
+getSum() {
+    mxpy --verbose contract query ${ADDRESS} --function="getSum" --proxy=${PROXY}
+}
diff --git a/contracts/feature-tests/scenario-tester/meta/Cargo.toml b/contracts/feature-tests/scenario-tester/meta/Cargo.toml
new file mode 100644
index 0000000000..5962cb3d93
--- /dev/null
+++ b/contracts/feature-tests/scenario-tester/meta/Cargo.toml
@@ -0,0 +1,13 @@
+[package]
+name = "scenario-tester-meta"
+version = "0.0.0"
+edition = "2021"
+publish = false
+
+[dependencies.scenario_tester]
+path = ".."
+
+[dependencies.multiversx-sc-meta]
+version = "0.49.0-alpha.2"
+path = "../../../../framework/meta"
+default-features = false
diff --git a/contracts/feature-tests/scenario-tester/meta/src/main.rs b/contracts/feature-tests/scenario-tester/meta/src/main.rs
new file mode 100644
index 0000000000..d88f5e7545
--- /dev/null
+++ b/contracts/feature-tests/scenario-tester/meta/src/main.rs
@@ -0,0 +1,3 @@
+fn main() {
+    multiversx_sc_meta::cli_main::<scenario_tester::AbiProvider>();
+}
diff --git a/contracts/feature-tests/scenario-tester/multiversx.json b/contracts/feature-tests/scenario-tester/multiversx.json
new file mode 100644
index 0000000000..7365539625
--- /dev/null
+++ b/contracts/feature-tests/scenario-tester/multiversx.json
@@ -0,0 +1,3 @@
+{
+    "language": "rust"
+}
\ No newline at end of file
diff --git a/contracts/feature-tests/scenario-tester/mxsc-template.toml b/contracts/feature-tests/scenario-tester/mxsc-template.toml
new file mode 100644
index 0000000000..f7a17bd7a8
--- /dev/null
+++ b/contracts/feature-tests/scenario-tester/mxsc-template.toml
@@ -0,0 +1,24 @@
+name = "scenario_tester"
+contract_trait = "Adder"
+src_file = "adder.rs"
+rename_pairs = [
+    [
+        "blockchain.set_current_dir_from_workspace(\"contracts/examples/adder\");",
+        "// blockchain.set_current_dir_from_workspace(\"relative path to your workspace, if applicable\");",
+    ],
+]
+files_include = [
+    "meta",
+    "scenarios",
+    "src",
+    "tests",
+    "Cargo.toml",
+    "README.md",
+    "sc-config.toml",
+    "multiversx.json",
+    "interact/Cargo.toml",
+    "interact/config.toml",
+    "interact/.gitignore",
+    "interact/src",
+]
+has_interactor = true
diff --git a/contracts/feature-tests/scenario-tester/sc-config.toml b/contracts/feature-tests/scenario-tester/sc-config.toml
new file mode 100644
index 0000000000..b56f82b429
--- /dev/null
+++ b/contracts/feature-tests/scenario-tester/sc-config.toml
@@ -0,0 +1,4 @@
+[settings]
+
+[[proxy]]
+path = "src/adder_proxy.rs"
diff --git a/contracts/feature-tests/scenario-tester/scenarios/adder.scen.json b/contracts/feature-tests/scenario-tester/scenarios/adder.scen.json
new file mode 100644
index 0000000000..08ecb79e3f
--- /dev/null
+++ b/contracts/feature-tests/scenario-tester/scenarios/adder.scen.json
@@ -0,0 +1,99 @@
+{
+    "name": "adder",
+    "comment": "add then check",
+    "gasSchedule": "v3",
+    "steps": [
+        {
+            "step": "setState",
+            "accounts": {
+                "address:owner": {
+                    "nonce": "1",
+                    "balance": "0"
+                }
+            },
+            "newAddresses": [
+                {
+                    "creatorAddress": "address:owner",
+                    "creatorNonce": "1",
+                    "newAddress": "sc:adder"
+                }
+            ]
+        },
+        {
+            "step": "scDeploy",
+            "id": "1",
+            "tx": {
+                "from": "address:owner",
+                "contractCode": "mxsc:../output/adder.mxsc.json",
+                "arguments": [
+                    "5"
+                ],
+                "gasLimit": "5,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": [],
+                "status": "",
+                "logs": "*",
+                "gas": "*",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scQuery",
+            "id": "2",
+            "tx": {
+                "to": "sc:adder",
+                "function": "getSum",
+                "arguments": []
+            },
+            "expect": {
+                "out": [
+                    "5"
+                ],
+                "status": "",
+                "logs": []
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "3",
+            "tx": {
+                "from": "address:owner",
+                "to": "sc:adder",
+                "function": "add",
+                "arguments": [
+                    "3"
+                ],
+                "gasLimit": "5,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": [],
+                "status": "",
+                "logs": "*",
+                "gas": "*",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "checkState",
+            "accounts": {
+                "address:owner": {
+                    "nonce": "*",
+                    "balance": "0",
+                    "storage": {},
+                    "code": ""
+                },
+                "sc:adder": {
+                    "nonce": "0",
+                    "balance": "0",
+                    "storage": {
+                        "str:sum": "8"
+                    },
+                    "code": "mxsc:../output/adder.mxsc.json"
+                }
+            }
+        }
+    ]
+}
diff --git a/contracts/feature-tests/scenario-tester/scenarios/interactor_trace.scen.json b/contracts/feature-tests/scenario-tester/scenarios/interactor_trace.scen.json
new file mode 100644
index 0000000000..e0824697fe
--- /dev/null
+++ b/contracts/feature-tests/scenario-tester/scenarios/interactor_trace.scen.json
@@ -0,0 +1,76 @@
+{
+    "steps": [
+        {
+            "step": "setState",
+            "accounts": {
+                "0xe32afedc904fe1939746ad973beb383563cf63642ba669b3040f9b9428a5ed60": {
+                    "nonce": "481",
+                    "balance": "106274669842530000003",
+                    "esdt": {
+                        "str:CAN-14dc0a": "1000",
+                        "str:CAN-2abf4b": "1000",
+                        "str:CAN-6d39e6": "1000",
+                        "str:CAN-ac1592": "1000"
+                    }
+                }
+            }
+        },
+        {
+            "step": "setState",
+            "newAddresses": [
+                {
+                    "creatorAddress": "0xe32afedc904fe1939746ad973beb383563cf63642ba669b3040f9b9428a5ed60",
+                    "creatorNonce": "481",
+                    "newAddress": "0x0000000000000000050028600ceb73ac22ec0b6f257aff7bed74dffa3ebfed60"
+                }
+            ]
+        },
+        {
+            "step": "scDeploy",
+            "tx": {
+                "from": "0xe32afedc904fe1939746ad973beb383563cf63642ba669b3040f9b9428a5ed60",
+                "contractCode": "mxsc:../output/adder.mxsc.json",
+                "arguments": [
+                    "0x00"
+                ],
+                "gasLimit": "70,000,000"
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "tx": {
+                "from": "0xe32afedc904fe1939746ad973beb383563cf63642ba669b3040f9b9428a5ed60",
+                "to": "0x0000000000000000050028600ceb73ac22ec0b6f257aff7bed74dffa3ebfed60",
+                "function": "add",
+                "arguments": [
+                    "0x07"
+                ],
+                "gasLimit": "70,000,000"
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "tx": {
+                "from": "0xe32afedc904fe1939746ad973beb383563cf63642ba669b3040f9b9428a5ed60",
+                "to": "0x0000000000000000050028600ceb73ac22ec0b6f257aff7bed74dffa3ebfed60",
+                "function": "add",
+                "arguments": [
+                    "0x05"
+                ],
+                "gasLimit": "70,000,000"
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        }
+    ]
+}
diff --git a/contracts/feature-tests/scenario-tester/src/lib.rs b/contracts/feature-tests/scenario-tester/src/lib.rs
new file mode 100644
index 0000000000..015b3e82c2
--- /dev/null
+++ b/contracts/feature-tests/scenario-tester/src/lib.rs
@@ -0,0 +1,30 @@
+#![no_std]
+
+use multiversx_sc::imports::*;
+
+pub mod scenario_tester_proxy;
+
+/// One of the simplest smart contracts possible,
+/// it holds a single variable in storage, which anyone can increment.
+#[multiversx_sc::contract]
+pub trait ScenarioTester {
+    #[view(getSum)]
+    #[storage_mapper("sum")]
+    fn sum(&self) -> SingleValueMapper<BigUint>;
+
+    #[init]
+    fn init(&self, initial_value: BigUint) {
+        self.sum().set(initial_value);
+    }
+
+    #[upgrade]
+    fn upgrade(&self, initial_value: BigUint) {
+        self.init(initial_value);
+    }
+
+    /// Add desired amount to the storage variable.
+    #[endpoint]
+    fn add(&self, value: BigUint) {
+        self.sum().update(|sum| *sum += value);
+    }
+}
diff --git a/contracts/feature-tests/scenario-tester/src/scenario_tester_proxy.rs b/contracts/feature-tests/scenario-tester/src/scenario_tester_proxy.rs
new file mode 100644
index 0000000000..d3abf4b9b7
--- /dev/null
+++ b/contracts/feature-tests/scenario-tester/src/scenario_tester_proxy.rs
@@ -0,0 +1,110 @@
+// Code generated by the multiversx-sc proxy generator. DO NOT EDIT.
+
+////////////////////////////////////////////////////
+////////////////// AUTO-GENERATED //////////////////
+////////////////////////////////////////////////////
+
+#![allow(dead_code)]
+#![allow(clippy::all)]
+
+use multiversx_sc::proxy_imports::*;
+
+pub struct ScenarioTesterProxy;
+
+impl<Env, From, To, Gas> TxProxyTrait<Env, From, To, Gas> for ScenarioTesterProxy
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    type TxProxyMethods = ScenarioTesterProxyMethods<Env, From, To, Gas>;
+
+    fn proxy_methods(self, tx: Tx<Env, From, To, (), Gas, (), ()>) -> Self::TxProxyMethods {
+        ScenarioTesterProxyMethods { wrapped_tx: tx }
+    }
+}
+
+pub struct ScenarioTesterProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    wrapped_tx: Tx<Env, From, To, (), Gas, (), ()>,
+}
+
+#[rustfmt::skip]
+impl<Env, From, Gas> ScenarioTesterProxyMethods<Env, From, (), Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn init<
+        Arg0: CodecInto<BigUint<Env::Api>>,
+    >(
+        self,
+        initial_value: Arg0,
+    ) -> TxProxyDeploy<Env, From, Gas, ()> {
+        self.wrapped_tx
+            .raw_deploy()
+            .argument(&initial_value)
+            .original_result()
+    }
+}
+
+#[rustfmt::skip]
+impl<Env, From, To, Gas> ScenarioTesterProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn upgrade<
+        Arg0: CodecInto<BigUint<Env::Api>>,
+    >(
+        self,
+        initial_value: Arg0,
+    ) -> TxProxyUpgrade<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_upgrade()
+            .argument(&initial_value)
+            .original_result()
+    }
+}
+
+#[rustfmt::skip]
+impl<Env, From, To, Gas> ScenarioTesterProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn sum(
+        self,
+    ) -> TxProxyCall<Env, From, To, Gas, BigUint<Env::Api>> {
+        self.wrapped_tx
+            .raw_call("getSum")
+            .original_result()
+    }
+
+    /// Add desired amount to the storage variable. 
+    pub fn add<
+        Arg0: CodecInto<BigUint<Env::Api>>,
+    >(
+        self,
+        value: Arg0,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call("add")
+            .argument(&value)
+            .original_result()
+    }
+}
diff --git a/contracts/feature-tests/scenario-tester/tests/adder_blackbox_chained_test.rs b/contracts/feature-tests/scenario-tester/tests/adder_blackbox_chained_test.rs
new file mode 100644
index 0000000000..b10b3e3a54
--- /dev/null
+++ b/contracts/feature-tests/scenario-tester/tests/adder_blackbox_chained_test.rs
@@ -0,0 +1,64 @@
+use multiversx_sc_scenario::imports::*;
+use num_bigint::BigUint;
+
+use adder::*;
+
+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(ADDER_PATH_EXPR, adder::ContractBuilder);
+    blockchain
+}
+
+#[test]
+fn adder_blackbox_chained() {
+    let mut world = world();
+    let owner_address = "address:owner";
+    let adder_contract = ContractInfo::<adder::Proxy<StaticApi>>::new("sc:adder");
+
+    world
+        .start_trace()
+        .set_state_step(
+            SetStateStep::new()
+                .put_account(owner_address, Account::new().nonce(1))
+                .new_address(owner_address, 1, "sc:adder"),
+        )
+        .chain_deploy(|tx| {
+            tx.from(AddressExpr("owner"))
+                .typed(adder_proxy::AdderProxy)
+                .init(5u32)
+                .code(MxscExpr("output/adder.mxsc.json"))
+                .with_result(WithNewAddress::new(|new_address| {
+                    assert_eq!(new_address.to_address(), adder_contract.to_address());
+                }))
+        })
+        .chain_query(|tx| {
+            tx.to(ScExpr("adder"))
+                .typed(adder_proxy::AdderProxy)
+                .sum()
+                .with_result(WithResultConv::new(|value: BigUint| {
+                    assert_eq!(value, BigUint::from(5u32));
+                }))
+        })
+        .chain_call(|tx| {
+            tx.from(AddressExpr("owner"))
+                .to(ScExpr("adder"))
+                .typed(adder_proxy::AdderProxy)
+                .add(3u32)
+                .with_result(WithRawTxResponse(|response| {
+                    assert!(response.tx_error.is_success());
+                }))
+        })
+        .check_state_step(
+            CheckStateStep::new()
+                .put_account(owner_address, CheckAccount::new())
+                .put_account(
+                    &adder_contract,
+                    CheckAccount::new().check_storage("str:sum", "8"),
+                ),
+        )
+        .write_scenario_trace("trace2.scen.json");
+}
diff --git a/contracts/feature-tests/scenario-tester/tests/adder_blackbox_legacy_proxy_test.rs b/contracts/feature-tests/scenario-tester/tests/adder_blackbox_legacy_proxy_test.rs
new file mode 100644
index 0000000000..e3a2540386
--- /dev/null
+++ b/contracts/feature-tests/scenario-tester/tests/adder_blackbox_legacy_proxy_test.rs
@@ -0,0 +1,77 @@
+use multiversx_sc_scenario::imports::*;
+use num_bigint::BigUint;
+
+use adder::*;
+
+const ADDER_PATH_EXPR: &str = "mxsc:output/adder.mxsc.json";
+
+const OWNER: AddressExpr = AddressExpr("owner");
+const CODE_EXPR: MxscExpr = MxscExpr("output/adder.mxsc.json");
+
+fn world() -> ScenarioWorld {
+    let mut blockchain = ScenarioWorld::new();
+    blockchain.set_current_dir_from_workspace("contracts/examples/adder");
+
+    blockchain.register_contract(ADDER_PATH_EXPR, adder::ContractBuilder);
+    blockchain
+}
+
+#[test]
+fn adder_blackbox_legacy_proxy() {
+    let mut world = world();
+    let owner_address = "address:owner";
+    let mut adder_contract = ContractInfo::<adder::Proxy<StaticApi>>::new("sc:adder");
+
+    world.start_trace();
+
+    world.set_state_step(
+        SetStateStep::new()
+            .put_account(owner_address, Account::new().nonce(1))
+            .new_address(owner_address, 1, "sc:adder"),
+    );
+
+    world
+        .tx()
+        .from(OWNER)
+        .typed(adder_proxy::AdderProxy)
+        .init(5u32)
+        .code(CODE_EXPR)
+        .with_result(WithNewAddress::new(|new_address| {
+            assert_eq!(new_address.to_address(), adder_contract.to_address());
+        }))
+        .run();
+
+    world.sc_query(
+        ScQueryStep::new()
+            .to(&adder_contract)
+            .call(adder_contract.sum())
+            .expect_value(SingleValue::from(BigUint::from(5u32))),
+    );
+
+    let value = world
+        .query()
+        .call(adder_contract.sum())
+        .returns(ReturnsResultConv::<SingleValue<BigUint>>::new())
+        .run();
+    assert_eq!(value.into(), BigUint::from(5u32));
+
+    world
+        .tx()
+        .from(OWNER)
+        .call(adder_contract.add(3u32))
+        .with_result(WithRawTxResponse(|response| {
+            assert!(response.tx_error.is_success());
+        }))
+        .run();
+
+    world.check_state_step(
+        CheckStateStep::new()
+            .put_account(owner_address, CheckAccount::new())
+            .put_account(
+                &adder_contract,
+                CheckAccount::new().check_storage("str:sum", "8"),
+            ),
+    );
+
+    world.write_scenario_trace("trace1.scen.json");
+}
diff --git a/contracts/feature-tests/scenario-tester/tests/adder_blackbox_raw_steps_test.rs b/contracts/feature-tests/scenario-tester/tests/adder_blackbox_raw_steps_test.rs
new file mode 100644
index 0000000000..fc6b5d02a0
--- /dev/null
+++ b/contracts/feature-tests/scenario-tester/tests/adder_blackbox_raw_steps_test.rs
@@ -0,0 +1,53 @@
+use multiversx_sc_scenario::imports::*;
+
+const SCENARIO_TESTER_PATH_EXPR: &str = "mxsc:output/scenario-tester.mxsc.json";
+
+fn world() -> ScenarioWorld {
+    let mut blockchain = ScenarioWorld::new();
+    blockchain.set_current_dir_from_workspace("contracts/feature-tests/scenario-tester");
+
+    blockchain.register_contract(SCENARIO_TESTER_PATH_EXPR, scenario_tester::ContractBuilder);
+    blockchain
+}
+
+#[test]
+fn scenario_tester_blackbox_raw() {
+    let mut world = world();
+    let scenario_tester_code = world.code_expression(SCENARIO_TESTER_PATH_EXPR);
+
+    world
+        .set_state_step(
+            SetStateStep::new()
+                .put_account("address:owner", Account::new().nonce(1))
+                .new_address("address:owner", 1, "sc:scenario-tester"),
+        )
+        .sc_deploy(
+            ScDeployStep::new()
+                .from("address:owner")
+                .code(scenario_tester_code)
+                .argument("5")
+                .expect(TxExpect::ok().no_result()),
+        )
+        .sc_query(
+            ScQueryStep::new()
+                .to("sc:scenario-tester")
+                .function("getSum")
+                .expect(TxExpect::ok().result("5")),
+        )
+        .sc_call(
+            ScCallStep::new()
+                .from("address:owner")
+                .to("sc:scenario-tester")
+                .function("add")
+                .argument("3")
+                .expect(TxExpect::ok().no_result()),
+        )
+        .check_state_step(
+            CheckStateStep::new()
+                .put_account("address:owner", CheckAccount::new())
+                .put_account(
+                    "sc:scenario-tester",
+                    CheckAccount::new().check_storage("str:sum", "8"),
+                ),
+        );
+}
diff --git a/contracts/feature-tests/scenario-tester/tests/adder_blackbox_test.rs b/contracts/feature-tests/scenario-tester/tests/adder_blackbox_test.rs
new file mode 100644
index 0000000000..9149a25e3b
--- /dev/null
+++ b/contracts/feature-tests/scenario-tester/tests/adder_blackbox_test.rs
@@ -0,0 +1,72 @@
+use multiversx_sc_scenario::imports::*;
+use num_bigint::BigUint;
+
+use scenario_tester::*;
+
+const ADDER_PATH_EXPR: &str = "mxsc:output/scenario-tester.mxsc.json";
+
+const OWNER: AddressExpr = AddressExpr("owner");
+const SC_ADDER: ScExpr = ScExpr("scenario-tester");
+const CODE_EXPR: MxscExpr = MxscExpr("output/scenario-tester.mxsc.json");
+
+fn world() -> ScenarioWorld {
+    let mut blockchain = ScenarioWorld::new();
+    blockchain.set_current_dir_from_workspace("contracts/examples/scenario-tester");
+
+    blockchain.register_contract(ADDER_PATH_EXPR, scenario_tester::ContractBuilder);
+    blockchain
+}
+
+#[test]
+fn adder_blackbox() {
+    let mut world = world();
+    let owner_address = "address:owner";
+    let adder_contract = ContractInfo::<scenario_tester::Proxy<StaticApi>>::new("sc:scenario-tester");
+
+    world.start_trace();
+
+    world.set_state_step(
+        SetStateStep::new()
+            .put_account(owner_address, Account::new().nonce(1))
+            .new_address(owner_address, 1, "sc:scenario-tester"),
+    );
+
+    let new_address = world
+        .tx()
+        .from(OWNER)
+        .typed(scenario_tester_proxy::ScenarioTesterProxy)
+        .init(5u32)
+        .code(CODE_EXPR)
+        .returns(ReturnsNewAddress)
+        .run();
+
+    assert_eq!(new_address, adder_contract.to_address());
+
+    let value = world
+        .query()
+        .to(SC_ADDER)
+        .typed(scenario_tester_proxy::ScenarioTesterProxy)
+        .sum()
+        .returns(ReturnsResultConv::<BigUint>::new())
+        .run();
+    assert_eq!(value, BigUint::from(5u32));
+
+    world
+        .tx()
+        .from(OWNER)
+        .to(SC_ADDER)
+        .typed(scenario_tester_proxy::ScenarioTesterProxy)
+        .add(1u32)
+        .run();
+
+    world.check_state_step(
+        CheckStateStep::new()
+            .put_account(owner_address, CheckAccount::new())
+            .put_account(
+                &adder_contract,
+                CheckAccount::new().check_storage("str:sum", "6"),
+            ),
+    );
+
+    world.write_scenario_trace("trace1.scen.json");
+}
diff --git a/contracts/feature-tests/scenario-tester/tests/adder_blackbox_upgrade_test.rs b/contracts/feature-tests/scenario-tester/tests/adder_blackbox_upgrade_test.rs
new file mode 100644
index 0000000000..5a38f7c5df
--- /dev/null
+++ b/contracts/feature-tests/scenario-tester/tests/adder_blackbox_upgrade_test.rs
@@ -0,0 +1,50 @@
+use multiversx_sc_scenario::imports::*;
+
+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("mxsc:output/adder.mxsc.json", adder::ContractBuilder);
+    blockchain
+}
+
+#[test]
+fn adder_blackbox_upgrade() {
+    let mut world = world();
+    let adder_code = world.code_expression(ADDER_PATH_EXPR);
+
+    world
+        .set_state_step(
+            SetStateStep::new()
+                .put_account("address:owner", Account::new().nonce(1))
+                .new_address("address:owner", 1, "sc:adder"),
+        )
+        .sc_deploy(
+            ScDeployStep::new()
+                .from("address:owner")
+                .code(&adder_code)
+                .argument("5")
+                .gas_limit("5,000,000")
+                .expect(TxExpect::ok().no_result()),
+        )
+        .sc_call(
+            ScCallStep::new()
+                .from("address:owner")
+                .to("sc:adder")
+                .function("upgradeContract")
+                .argument(&adder_code)
+                .argument("0x0502") // codeMetadata
+                .argument("8") // contract argument
+                .expect(TxExpect::ok().no_result()),
+        )
+        .check_state_step(
+            CheckStateStep::new()
+                .put_account("address:owner", CheckAccount::new())
+                .put_account(
+                    "sc:adder",
+                    CheckAccount::new().check_storage("str:sum", "8"),
+                ),
+        );
+}
diff --git a/contracts/feature-tests/scenario-tester/tests/adder_scenario_go_test.rs b/contracts/feature-tests/scenario-tester/tests/adder_scenario_go_test.rs
new file mode 100644
index 0000000000..bed4ae016d
--- /dev/null
+++ b/contracts/feature-tests/scenario-tester/tests/adder_scenario_go_test.rs
@@ -0,0 +1,15 @@
+use multiversx_sc_scenario::*;
+
+fn world() -> ScenarioWorld {
+    ScenarioWorld::vm_go()
+}
+
+#[test]
+fn adder_go() {
+    world().run("scenarios/adder.scen.json");
+}
+
+#[test]
+fn interactor_trace_go() {
+    world().run("scenarios/interactor_trace.scen.json");
+}
diff --git a/contracts/feature-tests/scenario-tester/tests/adder_scenario_rs_test.rs b/contracts/feature-tests/scenario-tester/tests/adder_scenario_rs_test.rs
new file mode 100644
index 0000000000..c467100633
--- /dev/null
+++ b/contracts/feature-tests/scenario-tester/tests/adder_scenario_rs_test.rs
@@ -0,0 +1,19 @@
+use multiversx_sc_scenario::*;
+
+fn world() -> ScenarioWorld {
+    let mut blockchain = ScenarioWorld::new();
+    blockchain.set_current_dir_from_workspace("contracts/examples/adder");
+
+    blockchain.register_contract("mxsc:output/adder.mxsc.json", adder::ContractBuilder);
+    blockchain
+}
+
+#[test]
+fn adder_rs() {
+    world().run("scenarios/adder.scen.json");
+}
+
+#[test]
+fn interactor_trace_rs() {
+    world().run("scenarios/interactor_trace.scen.json");
+}
diff --git a/contracts/feature-tests/scenario-tester/tests/adder_unit_test.rs b/contracts/feature-tests/scenario-tester/tests/adder_unit_test.rs
new file mode 100644
index 0000000000..3839382866
--- /dev/null
+++ b/contracts/feature-tests/scenario-tester/tests/adder_unit_test.rs
@@ -0,0 +1,17 @@
+use adder::*;
+use multiversx_sc::types::BigUint;
+use multiversx_sc_scenario::api::SingleTxApi;
+
+#[test]
+fn adder_unit_test() {
+    let adder = adder::contract_obj::<SingleTxApi>();
+
+    adder.init(BigUint::from(5u32));
+    assert_eq!(BigUint::from(5u32), adder.sum().get());
+
+    adder.add(BigUint::from(7u32));
+    assert_eq!(BigUint::from(12u32), adder.sum().get());
+
+    adder.add(BigUint::from(1u32));
+    assert_eq!(BigUint::from(13u32), adder.sum().get());
+}
diff --git a/contracts/feature-tests/scenario-tester/tests/adder_whitebox_test.rs b/contracts/feature-tests/scenario-tester/tests/adder_whitebox_test.rs
new file mode 100644
index 0000000000..50ad95faa6
--- /dev/null
+++ b/contracts/feature-tests/scenario-tester/tests/adder_whitebox_test.rs
@@ -0,0 +1,50 @@
+use adder::*;
+use multiversx_sc_scenario::imports::*;
+
+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("mxsc:output/adder.mxsc.json", adder::ContractBuilder);
+    blockchain
+}
+
+#[test]
+fn adder_whitebox() {
+    let mut world = world();
+    let adder_whitebox = WhiteboxContract::new("sc:adder", adder::contract_obj);
+    let adder_code = world.code_expression(ADDER_PATH_EXPR);
+
+    world
+        .set_state_step(
+            SetStateStep::new()
+                .put_account("address:owner", Account::new().nonce(1))
+                .new_address("address:owner", 1, "sc:adder"),
+        )
+        .whitebox_deploy(
+            &adder_whitebox,
+            ScDeployStep::new().from("address:owner").code(adder_code),
+            |sc| {
+                sc.init(5u32.into());
+            },
+        )
+        .whitebox_query(&adder_whitebox, |sc| {
+            let sum_value = sc.sum();
+            assert_eq!(sum_value.get(), 5u32);
+        })
+        .whitebox_call(
+            &adder_whitebox,
+            ScCallStep::new().from("address:owner"),
+            |sc| sc.add(3u32.into()),
+        )
+        .check_state_step(
+            CheckStateStep::new()
+                .put_account("address:owner", CheckAccount::new())
+                .put_account(
+                    "sc:adder",
+                    CheckAccount::new().check_storage("str:sum", "8"),
+                ),
+        );
+}
diff --git a/contracts/feature-tests/scenario-tester/wasm/Cargo.lock b/contracts/feature-tests/scenario-tester/wasm/Cargo.lock
new file mode 100755
index 0000000000..9bc1e41879
--- /dev/null
+++ b/contracts/feature-tests/scenario-tester/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.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+
+[[package]]
+name = "bitflags"
+version = "2.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+
+[[package]]
+name = "endian-type"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
+
+[[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.49.0-alpha.2"
+dependencies = [
+ "bitflags",
+ "hex-literal",
+ "multiversx-sc-codec",
+ "multiversx-sc-derive",
+ "num-traits",
+]
+
+[[package]]
+name = "multiversx-sc-codec"
+version = "0.18.6"
+dependencies = [
+ "arrayvec",
+ "multiversx-sc-codec-derive",
+]
+
+[[package]]
+name = "multiversx-sc-codec-derive"
+version = "0.18.6"
+dependencies = [
+ "hex",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "multiversx-sc-derive"
+version = "0.49.0-alpha.2"
+dependencies = [
+ "hex",
+ "proc-macro2",
+ "quote",
+ "radix_trie",
+ "syn",
+]
+
+[[package]]
+name = "multiversx-sc-wasm-adapter"
+version = "0.49.0-alpha.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.78"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+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 = "scenario_tester"
+version = "0.0.0"
+dependencies = [
+ "multiversx-sc",
+]
+
+[[package]]
+name = "scenario_tester-wasm"
+version = "0.0.0"
+dependencies = [
+ "multiversx-sc-wasm-adapter",
+ "scenario_tester",
+]
+
+[[package]]
+name = "smallvec"
+version = "1.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
+
+[[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/scenario-tester/wasm/Cargo.toml b/contracts/feature-tests/scenario-tester/wasm/Cargo.toml
new file mode 100644
index 0000000000..6de4181a2b
--- /dev/null
+++ b/contracts/feature-tests/scenario-tester/wasm/Cargo.toml
@@ -0,0 +1,32 @@
+# Code generated by the multiversx-sc build system. DO NOT EDIT.
+
+# ##########################################
+# ############## AUTO-GENERATED #############
+# ##########################################
+
+[package]
+name = "scenario_tester-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.scenario_tester]
+path = ".."
+
+[dependencies.multiversx-sc-wasm-adapter]
+version = "0.49.0-alpha.2"
+path = "../../../../framework/wasm-adapter"
+
+[workspace]
+members = ["."]
diff --git a/contracts/feature-tests/scenario-tester/wasm/src/lib.rs b/contracts/feature-tests/scenario-tester/wasm/src/lib.rs
new file mode 100644
index 0000000000..e4a29325bf
--- /dev/null
+++ b/contracts/feature-tests/scenario-tester/wasm/src/lib.rs
@@ -0,0 +1,30 @@
+// Code generated by the multiversx-sc build system. DO NOT EDIT.
+
+////////////////////////////////////////////////////
+////////////////// AUTO-GENERATED //////////////////
+////////////////////////////////////////////////////
+
+// Init:                                 1
+// Upgrade:                              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! {
+    scenario_tester
+    (
+        init => init
+        upgrade => upgrade
+        getSum => sum
+        add => add
+    )
+}
+
+multiversx_sc_wasm_adapter::async_callback_empty! {}

From e4a04611c5523fce65d16cb05c6f1fba393a0cc1 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Thu, 11 Apr 2024 19:00:57 +0300
Subject: [PATCH 0696/1254] refactor - replace return response from ScenarioRaw
 to SetStateStep

---
 .../scenario/src/standalone/account_tool.rs   | 131 ++++++------------
 framework/scenario/src/standalone/mod.rs      |   2 +-
 framework/snippets/src/interactor.rs          |   9 +-
 3 files changed, 49 insertions(+), 93 deletions(-)

diff --git a/framework/scenario/src/standalone/account_tool.rs b/framework/scenario/src/standalone/account_tool.rs
index 90fdb61857..2e31b01b35 100644
--- a/framework/scenario/src/standalone/account_tool.rs
+++ b/framework/scenario/src/standalone/account_tool.rs
@@ -1,8 +1,9 @@
-use crate::imports::Bech32Address;
-
-use multiversx_chain_scenario_format::serde_raw::{
-    AccountRaw, EsdtFullRaw, EsdtInstanceRaw, EsdtRaw, ScenarioRaw, StepRaw, ValueSubTree,
+use crate::{
+    imports::Bech32Address,
+    scenario_model::{Account, BytesKey, BytesValue, Scenario, SetStateStep},
 };
+
+use multiversx_chain_scenario_format::interpret_trait::IntoRaw;
 use multiversx_chain_vm::display_util::key_hex;
 use multiversx_sdk::{
     blockchain::CommunicationProxy,
@@ -14,14 +15,15 @@ pub async fn print_account_as_scenario_set_state(
     api: &CommunicationProxy,
     address: &Bech32Address,
 ) {
-    let scenario_raw = retrieve_account_as_scenario_set_state(api, address).await;
-    println!("{}", scenario_raw.to_json_string());
+    let set_state = retrieve_account_as_scenario_set_state(api, address).await;
+    let scenario = build_scenario(set_state);
+    println!("{}", scenario.into_raw().to_json_string());
 }
 
 pub async fn retrieve_account_as_scenario_set_state(
     api: &CommunicationProxy,
     addr: &Bech32Address,
-) -> ScenarioRaw {
+) -> SetStateStep {
     let address = Address::from_bech32_string(addr.to_bech32_str()).unwrap();
     let account = api.get_account(&address).await.unwrap();
 
@@ -38,97 +40,52 @@ pub async fn retrieve_account_as_scenario_set_state(
         .await
         .unwrap_or_else(|err| panic!("failed to retrieve storage for address {addr}: {err}"));
 
-    let mut accounts = BTreeMap::new();
-    accounts.insert(
-        key_hex(&address.to_bytes()),
-        AccountRaw {
-            nonce: Some(ValueSubTree::Str(account.nonce.to_string())),
-            balance: Some(ValueSubTree::Str(account.balance.to_string())),
-            esdt: convert_esdt(account_esdt, account_esdt_roles),
-            username: Some(ValueSubTree::Str(account.username.to_string())),
-            storage: convert_storage(account_storage),
-            comment: None,
-            code: retrieve_code(account.code),
-            code_metadata: None, // TODO: retrieve code metadata
-            owner: None,
-            developer_rewards: None,
-        },
-    );
+    let account_state = set_account(account, account_storage, account_esdt, account_esdt_roles);
 
-    ScenarioRaw {
-        check_gas: None,
-        comment: None,
-        gas_schedule: None,
-        name: None,
-        steps: vec![StepRaw::SetState {
-            accounts,
-            block_hashes: Vec::new(),
-            new_addresses: Vec::new(),
-            new_token_identifiers: Vec::new(),
-            comment: None,
-            current_block_info: None,
-            previous_block_info: None,
-        }],
-    }
+    let set_state_step = SetStateStep::new();
+    set_state_step.put_account(key_hex(&address.to_bytes()), account_state)
 }
 
-fn retrieve_code(code: String) -> Option<ValueSubTree> {
-    if code.is_empty() {
-        None
-    } else {
-        Some(ValueSubTree::Str(format!("0x{code}")))
+pub fn build_scenario(set_state: SetStateStep) -> Scenario {
+    Scenario {
+        name: None,
+        comment: None,
+        check_gas: None,
+        steps: vec![crate::scenario_model::Step::SetState(set_state)],
     }
 }
 
-fn convert_storage(account_storage: HashMap<String, String>) -> BTreeMap<String, ValueSubTree> {
-    account_storage
-        .into_iter()
-        .filter(|(k, _)| !k.starts_with("454c524f4e44"))
-        .map(|(k, v)| (format!("0x{k}"), ValueSubTree::Str(format!("0x{v}"))))
-        .collect()
-}
+pub fn set_account(
+    account: multiversx_sdk::data::account::Account,
+    account_storage: HashMap<String, String>,
+    account_esdt: HashMap<String, EsdtBalance>,
+    account_esdt_roles: HashMap<String, Vec<String>>,
+) -> Account {
+    let mut account_state = Account::new()
+        .nonce(account.nonce)
+        .balance(account.balance.as_str())
+        .code(account.code);
+    account_state.username = Some(account.username.as_str().into());
+    account_state.storage = convert_storage(account_storage);
 
-fn convert_esdt(
-    sdk_esdt: HashMap<String, EsdtBalance>,
-    sdk_esdt_roles: HashMap<String, Vec<String>>,
-) -> BTreeMap<String, EsdtRaw> {
-    let mut result = BTreeMap::new();
-    for (key, value) in sdk_esdt.into_iter() {
-        let (token_identifier, nonce) = split_token_identifer_nonce(key);
-        let esdt_raw = result
-            .entry(format!("str:{}", token_identifier.clone()))
-            .or_insert(EsdtRaw::Full(EsdtFullRaw::default()));
-        if let EsdtRaw::Full(esdt_full_raw) = esdt_raw {
-            esdt_full_raw.instances.push(EsdtInstanceRaw {
-                nonce: Some(ValueSubTree::Str(nonce.to_string())),
-                balance: Some(ValueSubTree::Str(value.balance)),
-                // TODO: add creator, royalties, etc ...
-                ..Default::default()
-            });
-        }
+    for (_, esdt_balance) in account_esdt.iter() {
+        account_state = account_state.esdt_balance(
+            esdt_balance.token_identifier.as_str(),
+            esdt_balance.balance.as_str(),
+        );
     }
 
-    for (key, roles) in sdk_esdt_roles.into_iter() {
-        let (token_identifier, _) = split_token_identifer_nonce(key);
-        let esdt_raw = result
-            .entry(format!("str:{}", token_identifier.clone()))
-            .or_insert(EsdtRaw::Full(EsdtFullRaw::default()));
-        if let EsdtRaw::Full(esdt_full_raw) = esdt_raw {
-            esdt_full_raw.roles = roles;
-        }
+    for (token_id, esdt_roles) in account_esdt_roles {
+        account_state = account_state.esdt_roles(token_id.as_str(), esdt_roles);
     }
 
-    result
+    account_state
 }
 
-fn split_token_identifer_nonce(full_identifier: String) -> (String, u64) {
-    let tokens = full_identifier.split('-').collect::<Vec<_>>();
-    match tokens.len() {
-        2 => (full_identifier, 0),
-        3 => (
-            format!("{}-{}", tokens[0], tokens[1]),
-            u64::from_str_radix(tokens[2], 16).unwrap(),
-        ),
-        _ => panic!("could not process token identifier: {full_identifier}"),
-    }
+fn convert_storage(account_storage: HashMap<String, String>) -> BTreeMap<BytesKey, BytesValue> {
+    account_storage
+        .into_iter()
+        .filter(|(k, _)| !k.starts_with("454c524f4e44"))
+        .map(|(k, v)| (BytesKey::from(k.as_str()), BytesValue::from(v)))
+        .collect()
 }
diff --git a/framework/scenario/src/standalone/mod.rs b/framework/scenario/src/standalone/mod.rs
index 84ecea3916..ce7559a948 100644
--- a/framework/scenario/src/standalone/mod.rs
+++ b/framework/scenario/src/standalone/mod.rs
@@ -1,5 +1,5 @@
 mod account_tool;
 mod scenario_cli;
 
-pub use account_tool::retrieve_account_as_scenario_set_state;
+pub use account_tool::{build_scenario, retrieve_account_as_scenario_set_state};
 pub use scenario_cli::cli_main;
diff --git a/framework/snippets/src/interactor.rs b/framework/snippets/src/interactor.rs
index d1f49d2653..85d6a4503c 100644
--- a/framework/snippets/src/interactor.rs
+++ b/framework/snippets/src/interactor.rs
@@ -1,8 +1,9 @@
 use multiversx_sc_scenario::{
-    imports::{retrieve_account_as_scenario_set_state, Bech32Address, InterpretableFrom, InterpreterContext, Scenario, ScenarioRunner},
+    imports::{retrieve_account_as_scenario_set_state, Bech32Address, ScenarioRunner},
     mandos_system::{run_list::ScenarioRunnerList, run_trace::ScenarioTraceFile},
     multiversx_sc::types::Address,
     scenario_model::AddressValue,
+    standalone::build_scenario,
 };
 use multiversx_sdk::{
     blockchain::CommunicationProxy,
@@ -70,10 +71,8 @@ impl Interactor {
     }
 
     pub async fn retrieve_account(&mut self, wallet_address: &Bech32Address) {
-        let scenario_raw =
-            retrieve_account_as_scenario_set_state(&self.proxy, wallet_address).await;
-
-        let scenario = Scenario::interpret_from(scenario_raw, &InterpreterContext::default());
+        let set_state = retrieve_account_as_scenario_set_state(&self.proxy, wallet_address).await;
+        let scenario = build_scenario(set_state);
 
         self.pre_runners.run_scenario(&scenario);
         self.post_runners.run_scenario(&scenario);

From 74a477160f3dc1e7b8bca88de3401968fbeb1c6a Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 11 Apr 2024 19:25:51 +0300
Subject: [PATCH 0697/1254] scenario test contract & adder cleanup

---
 Cargo.lock                                    |  12 +-
 .../tests/adder_blackbox_raw_steps_test.rs    |  53 ------
 .../tests/adder_blackbox_upgrade_test.rs      |  50 -----
 .../feature-tests/scenario-tester/Cargo.toml  |   2 +-
 .../scenario-tester/interact/.gitignore       |   8 -
 .../scenario-tester/interact/Cargo.toml       |  22 ---
 .../scenario-tester/interact/config.toml      |   1 -
 .../interact/src/basic_interact.rs            | 172 ------------------
 .../interact/src/basic_interact_cli.rs        |  39 ----
 .../interact/src/basic_interact_config.rs     |  26 ---
 .../interact/src/basic_interact_state.rs      |  50 -----
 .../interaction/devnet.snippets.sh            |  25 ---
 .../interaction/testnet.snippets.sh           |  26 ---
 .../scenario-tester/meta/Cargo.toml           |   2 +-
 .../scenario-tester/mxsc-template.toml        |  24 ---
 .../scenario-tester/sc-config.toml            |   2 +-
 .../scenarios/interactor_trace.scen.json      |   2 +-
 .../{adder.scen.json => st-adder.scen.json}   |   4 +-
 .../tests/adder_blackbox_chained_test.rs      |  64 -------
 .../tests/adder_blackbox_legacy_proxy_test.rs |  77 --------
 .../tests/adder_scenario_rs_test.rs           |  19 --
 .../scenario-tester/tests/adder_unit_test.rs  |  17 --
 .../tests/st_blackbox_chained_test.rs}        |  24 +--
 .../tests/st_blackbox_legacy_proxy_test.rs}   |  22 +--
 ..._test.rs => st_blackbox_raw_steps_test.rs} |   0
 ...r_blackbox_test.rs => st_blackbox_test.rs} |   8 +-
 ...de_test.rs => st_blackbox_upgrade_test.rs} |  14 +-
 ...ario_go_test.rs => st_scenario_go_test.rs} |   8 +-
 .../tests/st_scenario_rs_test.rs              |  19 ++
 .../scenario-tester/tests/st_unit_test.rs     |  17 ++
 ...r_whitebox_test.rs => st_whitebox_test.rs} |  22 +--
 .../scenario-tester/wasm/Cargo.lock           |   6 +-
 .../scenario-tester/wasm/Cargo.toml           |   4 +-
 33 files changed, 102 insertions(+), 739 deletions(-)
 delete mode 100644 contracts/examples/adder/tests/adder_blackbox_raw_steps_test.rs
 delete mode 100644 contracts/examples/adder/tests/adder_blackbox_upgrade_test.rs
 delete mode 100644 contracts/feature-tests/scenario-tester/interact/.gitignore
 delete mode 100644 contracts/feature-tests/scenario-tester/interact/Cargo.toml
 delete mode 100644 contracts/feature-tests/scenario-tester/interact/config.toml
 delete mode 100644 contracts/feature-tests/scenario-tester/interact/src/basic_interact.rs
 delete mode 100644 contracts/feature-tests/scenario-tester/interact/src/basic_interact_cli.rs
 delete mode 100644 contracts/feature-tests/scenario-tester/interact/src/basic_interact_config.rs
 delete mode 100644 contracts/feature-tests/scenario-tester/interact/src/basic_interact_state.rs
 delete mode 100644 contracts/feature-tests/scenario-tester/interaction/devnet.snippets.sh
 delete mode 100644 contracts/feature-tests/scenario-tester/interaction/testnet.snippets.sh
 delete mode 100644 contracts/feature-tests/scenario-tester/mxsc-template.toml
 rename contracts/feature-tests/scenario-tester/scenarios/{adder.scen.json => st-adder.scen.json} (94%)
 delete mode 100644 contracts/feature-tests/scenario-tester/tests/adder_blackbox_chained_test.rs
 delete mode 100644 contracts/feature-tests/scenario-tester/tests/adder_blackbox_legacy_proxy_test.rs
 delete mode 100644 contracts/feature-tests/scenario-tester/tests/adder_scenario_rs_test.rs
 delete mode 100644 contracts/feature-tests/scenario-tester/tests/adder_unit_test.rs
 rename contracts/{examples/adder/tests/adder_blackbox_chained_test.rs => feature-tests/scenario-tester/tests/st_blackbox_chained_test.rs} (66%)
 rename contracts/{examples/adder/tests/adder_blackbox_legacy_proxy_test.rs => feature-tests/scenario-tester/tests/st_blackbox_legacy_proxy_test.rs} (75%)
 rename contracts/feature-tests/scenario-tester/tests/{adder_blackbox_raw_steps_test.rs => st_blackbox_raw_steps_test.rs} (100%)
 rename contracts/feature-tests/scenario-tester/tests/{adder_blackbox_test.rs => st_blackbox_test.rs} (89%)
 rename contracts/feature-tests/scenario-tester/tests/{adder_blackbox_upgrade_test.rs => st_blackbox_upgrade_test.rs} (74%)
 rename contracts/feature-tests/scenario-tester/tests/{adder_scenario_go_test.rs => st_scenario_go_test.rs} (74%)
 create mode 100644 contracts/feature-tests/scenario-tester/tests/st_scenario_rs_test.rs
 create mode 100644 contracts/feature-tests/scenario-tester/tests/st_unit_test.rs
 rename contracts/feature-tests/scenario-tester/tests/{adder_whitebox_test.rs => st_whitebox_test.rs} (61%)

diff --git a/Cargo.lock b/Cargo.lock
index 9ad27741d0..b111db8536 100755
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2756,19 +2756,19 @@ dependencies = [
 ]
 
 [[package]]
-name = "scenario-tester-meta"
+name = "scenario-tester"
 version = "0.0.0"
 dependencies = [
- "multiversx-sc-meta",
- "scenario_tester",
+ "multiversx-sc",
+ "multiversx-sc-scenario",
 ]
 
 [[package]]
-name = "scenario_tester"
+name = "scenario-tester-meta"
 version = "0.0.0"
 dependencies = [
- "multiversx-sc",
- "multiversx-sc-scenario",
+ "multiversx-sc-meta",
+ "scenario-tester",
 ]
 
 [[package]]
diff --git a/contracts/examples/adder/tests/adder_blackbox_raw_steps_test.rs b/contracts/examples/adder/tests/adder_blackbox_raw_steps_test.rs
deleted file mode 100644
index a88e4eb9b6..0000000000
--- a/contracts/examples/adder/tests/adder_blackbox_raw_steps_test.rs
+++ /dev/null
@@ -1,53 +0,0 @@
-use multiversx_sc_scenario::imports::*;
-
-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(ADDER_PATH_EXPR, adder::ContractBuilder);
-    blockchain
-}
-
-#[test]
-fn adder_blackbox_raw() {
-    let mut world = world();
-    let adder_code = world.code_expression(ADDER_PATH_EXPR);
-
-    world
-        .set_state_step(
-            SetStateStep::new()
-                .put_account("address:owner", Account::new().nonce(1))
-                .new_address("address:owner", 1, "sc:adder"),
-        )
-        .sc_deploy(
-            ScDeployStep::new()
-                .from("address:owner")
-                .code(adder_code)
-                .argument("5")
-                .expect(TxExpect::ok().no_result()),
-        )
-        .sc_query(
-            ScQueryStep::new()
-                .to("sc:adder")
-                .function("getSum")
-                .expect(TxExpect::ok().result("5")),
-        )
-        .sc_call(
-            ScCallStep::new()
-                .from("address:owner")
-                .to("sc:adder")
-                .function("add")
-                .argument("3")
-                .expect(TxExpect::ok().no_result()),
-        )
-        .check_state_step(
-            CheckStateStep::new()
-                .put_account("address:owner", CheckAccount::new())
-                .put_account(
-                    "sc:adder",
-                    CheckAccount::new().check_storage("str:sum", "8"),
-                ),
-        );
-}
diff --git a/contracts/examples/adder/tests/adder_blackbox_upgrade_test.rs b/contracts/examples/adder/tests/adder_blackbox_upgrade_test.rs
deleted file mode 100644
index 5a38f7c5df..0000000000
--- a/contracts/examples/adder/tests/adder_blackbox_upgrade_test.rs
+++ /dev/null
@@ -1,50 +0,0 @@
-use multiversx_sc_scenario::imports::*;
-
-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("mxsc:output/adder.mxsc.json", adder::ContractBuilder);
-    blockchain
-}
-
-#[test]
-fn adder_blackbox_upgrade() {
-    let mut world = world();
-    let adder_code = world.code_expression(ADDER_PATH_EXPR);
-
-    world
-        .set_state_step(
-            SetStateStep::new()
-                .put_account("address:owner", Account::new().nonce(1))
-                .new_address("address:owner", 1, "sc:adder"),
-        )
-        .sc_deploy(
-            ScDeployStep::new()
-                .from("address:owner")
-                .code(&adder_code)
-                .argument("5")
-                .gas_limit("5,000,000")
-                .expect(TxExpect::ok().no_result()),
-        )
-        .sc_call(
-            ScCallStep::new()
-                .from("address:owner")
-                .to("sc:adder")
-                .function("upgradeContract")
-                .argument(&adder_code)
-                .argument("0x0502") // codeMetadata
-                .argument("8") // contract argument
-                .expect(TxExpect::ok().no_result()),
-        )
-        .check_state_step(
-            CheckStateStep::new()
-                .put_account("address:owner", CheckAccount::new())
-                .put_account(
-                    "sc:adder",
-                    CheckAccount::new().check_storage("str:sum", "8"),
-                ),
-        );
-}
diff --git a/contracts/feature-tests/scenario-tester/Cargo.toml b/contracts/feature-tests/scenario-tester/Cargo.toml
index a8faf14f1c..192916d27e 100644
--- a/contracts/feature-tests/scenario-tester/Cargo.toml
+++ b/contracts/feature-tests/scenario-tester/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "scenario_tester"
+name = "scenario-tester"
 version = "0.0.0"
 authors = ["Andrei Marinica <andrei.marinica@multiversx.com>"]
 edition = "2021"
diff --git a/contracts/feature-tests/scenario-tester/interact/.gitignore b/contracts/feature-tests/scenario-tester/interact/.gitignore
deleted file mode 100644
index ea1b920080..0000000000
--- a/contracts/feature-tests/scenario-tester/interact/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-# Pem files are used for interactions, but shouldn't be committed
-*.pem
-
-# Temporary storage of deployed contract address, so we can preserve the context between executions.
-state.toml
-
-# Trace file of interactor tooling
-interactor_trace.scen.json
diff --git a/contracts/feature-tests/scenario-tester/interact/Cargo.toml b/contracts/feature-tests/scenario-tester/interact/Cargo.toml
deleted file mode 100644
index dc6a5533ea..0000000000
--- a/contracts/feature-tests/scenario-tester/interact/Cargo.toml
+++ /dev/null
@@ -1,22 +0,0 @@
-[package]
-name = "basic-interact"
-version = "0.0.0"
-authors = ["Ovidiu Stinga <ovidiu.stinga@multiversx.com>"]
-edition = "2021"
-publish = false
-
-[[bin]]
-name = "basic-interact"
-path = "src/basic_interact.rs"
-
-[dependencies]
-clap = { version = "4.4.7", features = ["derive"] }
-serde = { version = "1.0", features = ["derive"] }
-toml = "0.8.6"
-
-[dependencies.adder]
-path = ".."
-
-[dependencies.multiversx-sc-snippets]
-version = "0.49.0-alpha.2"
-path = "../../../../framework/snippets"
diff --git a/contracts/feature-tests/scenario-tester/interact/config.toml b/contracts/feature-tests/scenario-tester/interact/config.toml
deleted file mode 100644
index 61ac8dbf87..0000000000
--- a/contracts/feature-tests/scenario-tester/interact/config.toml
+++ /dev/null
@@ -1 +0,0 @@
-gateway = 'https://devnet-gateway.multiversx.com'
diff --git a/contracts/feature-tests/scenario-tester/interact/src/basic_interact.rs b/contracts/feature-tests/scenario-tester/interact/src/basic_interact.rs
deleted file mode 100644
index 8a8a6c22fd..0000000000
--- a/contracts/feature-tests/scenario-tester/interact/src/basic_interact.rs
+++ /dev/null
@@ -1,172 +0,0 @@
-mod basic_interact_cli;
-mod basic_interact_config;
-mod basic_interact_state;
-
-use adder::adder_proxy;
-use basic_interact_config::Config;
-use basic_interact_state::State;
-use clap::Parser;
-
-use multiversx_sc_snippets::imports::*;
-
-const INTERACTOR_SCENARIO_TRACE_PATH: &str = "interactor_trace.scen.json";
-
-#[tokio::main]
-async fn main() {
-    env_logger::init();
-
-    let mut basic_interact = AdderInteract::init().await;
-
-    let cli = basic_interact_cli::InteractCli::parse();
-    match &cli.command {
-        Some(basic_interact_cli::InteractCliCommand::Add(args)) => {
-            basic_interact.add(args.value).await;
-        },
-        Some(basic_interact_cli::InteractCliCommand::Deploy) => {
-            basic_interact.deploy().await;
-        },
-        Some(basic_interact_cli::InteractCliCommand::Feed) => {
-            basic_interact.feed_contract_egld().await;
-        },
-        Some(basic_interact_cli::InteractCliCommand::MultiDeploy(args)) => {
-            basic_interact.multi_deploy(&args.count).await;
-        },
-        Some(basic_interact_cli::InteractCliCommand::Sum) => {
-            basic_interact.print_sum().await;
-        },
-        None => {},
-    }
-}
-
-#[allow(unused)]
-struct AdderInteract {
-    interactor: Interactor,
-    wallet_address: Bech32Address,
-    adder_code: BytesValue,
-    state: State,
-}
-
-impl AdderInteract {
-    async fn init() -> Self {
-        let config = Config::load_config();
-        let mut interactor = Interactor::new(config.gateway())
-            .await
-            .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(),
-        );
-
-        Self {
-            interactor,
-            wallet_address: wallet_address.into(),
-            adder_code,
-            state: State::load_state(),
-        }
-    }
-
-    async fn set_state(&mut self) {
-        println!("wallet address: {}", &self.wallet_address);
-        let scenario_raw = retrieve_account_as_scenario_set_state(
-            Config::load_config().gateway().to_string(),
-            self.wallet_address.to_bech32_string(),
-            true,
-        )
-        .await;
-
-        let scenario = Scenario::interpret_from(scenario_raw, &InterpreterContext::default());
-
-        self.interactor.pre_runners.run_scenario(&scenario);
-        self.interactor.post_runners.run_scenario(&scenario);
-    }
-
-    async fn deploy(&mut self) {
-        self.set_state().await;
-
-        let new_address = self
-            .interactor
-            .tx()
-            .from(&self.wallet_address)
-            .typed(adder_proxy::AdderProxy)
-            .init(0u32)
-            .code(&self.adder_code)
-            .returns(ReturnsNewBech32Address)
-            .prepare_async()
-            .run()
-            .await;
-
-        println!("new address: {new_address}");
-        self.state.set_adder_address(new_address);
-    }
-
-    async fn multi_deploy(&mut self, count: &u8) {
-        if *count == 0 {
-            println!("count must be greater than 0");
-            return;
-        }
-
-        self.set_state().await;
-        println!("deploying {count} contracts...");
-
-        let mut buffer = self.interactor.homogenous_call_buffer();
-        for _ in 0..*count {
-            buffer.push_tx(|tx| {
-                tx.from(&self.wallet_address)
-                    .typed(adder_proxy::AdderProxy)
-                    .init(0u32)
-                    .code(&self.adder_code)
-                    .gas(NumExpr("70,000,000"))
-                    .returns(ReturnsNewBech32Address)
-            });
-        }
-
-        let results = buffer.run().await;
-        for new_address in results {
-            println!("new address: {new_address}");
-
-            self.state.set_adder_address(new_address);
-        }
-    }
-
-    async fn feed_contract_egld(&mut self) {
-        self.interactor
-            .tx()
-            .from(&self.wallet_address)
-            .to(self.state.current_adder_address())
-            .egld(NumExpr("0,050000000000000000"))
-            .prepare_async()
-            .run()
-            .await;
-    }
-
-    async fn add(&mut self, value: u64) {
-        self.interactor
-            .tx()
-            .from(&self.wallet_address)
-            .to(self.state.current_adder_address())
-            .typed(adder_proxy::AdderProxy)
-            .add(value)
-            .prepare_async()
-            .run()
-            .await;
-
-        println!("successfully performed add");
-    }
-
-    async fn print_sum(&mut self) {
-        let sum = self
-            .interactor
-            .query()
-            .to(self.state.current_adder_address())
-            .typed(adder_proxy::AdderProxy)
-            .sum()
-            .returns(ReturnsResultConv::<RustBigUint>::new())
-            .prepare_async()
-            .run()
-            .await;
-
-        println!("sum: {sum}");
-    }
-}
diff --git a/contracts/feature-tests/scenario-tester/interact/src/basic_interact_cli.rs b/contracts/feature-tests/scenario-tester/interact/src/basic_interact_cli.rs
deleted file mode 100644
index 8818c1bb60..0000000000
--- a/contracts/feature-tests/scenario-tester/interact/src/basic_interact_cli.rs
+++ /dev/null
@@ -1,39 +0,0 @@
-use clap::{Args, Parser, Subcommand};
-
-/// Adder Interact CLI
-#[derive(Default, PartialEq, Eq, Debug, Parser)]
-#[command(version, about)]
-#[command(propagate_version = true)]
-pub struct InteractCli {
-    #[command(subcommand)]
-    pub command: Option<InteractCliCommand>,
-}
-
-/// Adder Interact CLI Commands
-#[derive(Clone, PartialEq, Eq, Debug, Subcommand)]
-pub enum InteractCliCommand {
-    #[command(name = "add", about = "Add value")]
-    Add(AddArgs),
-    #[command(name = "deploy", about = "Deploy contract")]
-    Deploy,
-    #[command(name = "feed", about = "Feed contract EGLD")]
-    Feed,
-    #[command(name = "multi-deploy", about = "Multiple deploy contracts")]
-    MultiDeploy(MultiDeployArgs),
-    #[command(name = "sum", about = "Print sum")]
-    Sum,
-}
-
-#[derive(Default, Clone, PartialEq, Eq, Debug, Args)]
-pub struct AddArgs {
-    /// The value to add
-    #[arg(short = 'v', long = "value", verbatim_doc_comment)]
-    pub value: u64,
-}
-
-#[derive(Default, Clone, PartialEq, Eq, Debug, Args)]
-pub struct MultiDeployArgs {
-    /// The number of contracts to deploy
-    #[arg(short = 'c', long = "count", verbatim_doc_comment)]
-    pub count: u8,
-}
diff --git a/contracts/feature-tests/scenario-tester/interact/src/basic_interact_config.rs b/contracts/feature-tests/scenario-tester/interact/src/basic_interact_config.rs
deleted file mode 100644
index e17d0cbe65..0000000000
--- a/contracts/feature-tests/scenario-tester/interact/src/basic_interact_config.rs
+++ /dev/null
@@ -1,26 +0,0 @@
-use serde::Deserialize;
-use std::io::Read;
-
-/// Config file
-const CONFIG_FILE: &str = "config.toml";
-
-/// Adder Interact configuration
-#[derive(Debug, Deserialize)]
-pub struct Config {
-    gateway: String,
-}
-
-impl Config {
-    // Deserializes config from file
-    pub fn load_config() -> Self {
-        let mut file = std::fs::File::open(CONFIG_FILE).unwrap();
-        let mut content = String::new();
-        file.read_to_string(&mut content).unwrap();
-        toml::from_str(&content).unwrap()
-    }
-
-    // Returns the gateway
-    pub fn gateway(&self) -> &str {
-        &self.gateway
-    }
-}
diff --git a/contracts/feature-tests/scenario-tester/interact/src/basic_interact_state.rs b/contracts/feature-tests/scenario-tester/interact/src/basic_interact_state.rs
deleted file mode 100644
index 41453e36fd..0000000000
--- a/contracts/feature-tests/scenario-tester/interact/src/basic_interact_state.rs
+++ /dev/null
@@ -1,50 +0,0 @@
-use multiversx_sc_snippets::imports::*;
-use serde::{Deserialize, Serialize};
-use std::{
-    io::{Read, Write},
-    path::Path,
-};
-
-/// State file
-const STATE_FILE: &str = "state.toml";
-
-/// Multisig Interact state
-#[derive(Debug, Default, Serialize, Deserialize)]
-pub struct State {
-    adder_address: Option<Bech32Address>,
-}
-
-impl State {
-    // Deserializes state from file
-    pub fn load_state() -> Self {
-        if Path::new(STATE_FILE).exists() {
-            let mut file = std::fs::File::open(STATE_FILE).unwrap();
-            let mut content = String::new();
-            file.read_to_string(&mut content).unwrap();
-            toml::from_str(&content).unwrap()
-        } else {
-            Self::default()
-        }
-    }
-
-    /// Sets the adder address
-    pub fn set_adder_address(&mut self, address: Bech32Address) {
-        self.adder_address = Some(address);
-    }
-
-    /// Returns the adder contract
-    pub fn current_adder_address(&self) -> &Bech32Address {
-        self.adder_address
-            .as_ref()
-            .expect("no known adder contract, deploy first")
-    }
-}
-
-impl Drop for State {
-    // Serializes state to file
-    fn drop(&mut self) {
-        let mut file = std::fs::File::create(STATE_FILE).unwrap();
-        file.write_all(toml::to_string(self).unwrap().as_bytes())
-            .unwrap();
-    }
-}
diff --git a/contracts/feature-tests/scenario-tester/interaction/devnet.snippets.sh b/contracts/feature-tests/scenario-tester/interaction/devnet.snippets.sh
deleted file mode 100644
index 1966381cde..0000000000
--- a/contracts/feature-tests/scenario-tester/interaction/devnet.snippets.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-ALICE="${USERS}/alice.pem"
-ADDRESS=$(mxpy data load --key=address-devnet)
-DEPLOY_TRANSACTION=$(mxpy data load --key=deployTransaction-devnet)
-
-deploy() {
-    mxpy --verbose contract deploy --project=${PROJECT} --recall-nonce --pem=${ALICE} --gas-limit=50000000 --arguments 0 --send --outfile="deploy-devnet.interaction.json" || return
-
-    TRANSACTION=$(mxpy data parse --file="deploy-devnet.interaction.json" --expression="data['emittedTransactionHash']")
-    ADDRESS=$(mxpy data parse --file="deploy-devnet.interaction.json" --expression="data['contractAddress']")
-
-    mxpy data store --key=address-devnet --value=${ADDRESS}
-    mxpy data store --key=deployTransaction-devnet --value=${TRANSACTION}
-
-    echo ""
-    echo "Smart contract address: ${ADDRESS}"
-}
-
-add() {
-    read -p "Enter number: " NUMBER
-    mxpy --verbose contract call ${ADDRESS} --recall-nonce --pem=${ALICE} --gas-limit=50000000 --function="add" --arguments ${NUMBER} --send
-}
-
-getSum() {
-    mxpy --verbose contract query ${ADDRESS} --function="getSum"
-}
diff --git a/contracts/feature-tests/scenario-tester/interaction/testnet.snippets.sh b/contracts/feature-tests/scenario-tester/interaction/testnet.snippets.sh
deleted file mode 100644
index 06bb13e3ba..0000000000
--- a/contracts/feature-tests/scenario-tester/interaction/testnet.snippets.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-ALICE="${USERS}/alice.pem"
-ADDRESS=$(mxpy data load --key=address-testnet)
-DEPLOY_TRANSACTION=$(mxpy data load --key=deployTransaction-testnet)
-PROXY=https://testnet-api.multiversx.com
-
-deploy() {
-    mxpy --verbose contract deploy --project=${PROJECT} --recall-nonce --pem=${ALICE} --gas-limit=50000000 --arguments 0 --send --outfile="deploy-testnet.interaction.json" --proxy=${PROXY} --chain=T || return
-
-    TRANSACTION=$(mxpy data parse --file="deploy-testnet.interaction.json" --expression="data['emittedTransactionHash']")
-    ADDRESS=$(mxpy data parse --file="deploy-testnet.interaction.json" --expression="data['contractAddress']")
-
-    mxpy data store --key=address-testnet --value=${ADDRESS}
-    mxpy data store --key=deployTransaction-testnet --value=${TRANSACTION}
-
-    echo ""
-    echo "Smart contract address: ${ADDRESS}"
-}
-
-add() {
-    read -p "Enter number: " NUMBER
-    mxpy --verbose contract call ${ADDRESS} --recall-nonce --pem=${ALICE} --gas-limit=5000000 --function="add" --arguments ${NUMBER} --send --proxy=${PROXY} --chain=T
-}
-
-getSum() {
-    mxpy --verbose contract query ${ADDRESS} --function="getSum" --proxy=${PROXY}
-}
diff --git a/contracts/feature-tests/scenario-tester/meta/Cargo.toml b/contracts/feature-tests/scenario-tester/meta/Cargo.toml
index 5962cb3d93..a4c669e5f1 100644
--- a/contracts/feature-tests/scenario-tester/meta/Cargo.toml
+++ b/contracts/feature-tests/scenario-tester/meta/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.0.0"
 edition = "2021"
 publish = false
 
-[dependencies.scenario_tester]
+[dependencies.scenario-tester]
 path = ".."
 
 [dependencies.multiversx-sc-meta]
diff --git a/contracts/feature-tests/scenario-tester/mxsc-template.toml b/contracts/feature-tests/scenario-tester/mxsc-template.toml
deleted file mode 100644
index f7a17bd7a8..0000000000
--- a/contracts/feature-tests/scenario-tester/mxsc-template.toml
+++ /dev/null
@@ -1,24 +0,0 @@
-name = "scenario_tester"
-contract_trait = "Adder"
-src_file = "adder.rs"
-rename_pairs = [
-    [
-        "blockchain.set_current_dir_from_workspace(\"contracts/examples/adder\");",
-        "// blockchain.set_current_dir_from_workspace(\"relative path to your workspace, if applicable\");",
-    ],
-]
-files_include = [
-    "meta",
-    "scenarios",
-    "src",
-    "tests",
-    "Cargo.toml",
-    "README.md",
-    "sc-config.toml",
-    "multiversx.json",
-    "interact/Cargo.toml",
-    "interact/config.toml",
-    "interact/.gitignore",
-    "interact/src",
-]
-has_interactor = true
diff --git a/contracts/feature-tests/scenario-tester/sc-config.toml b/contracts/feature-tests/scenario-tester/sc-config.toml
index b56f82b429..0a83428cbd 100644
--- a/contracts/feature-tests/scenario-tester/sc-config.toml
+++ b/contracts/feature-tests/scenario-tester/sc-config.toml
@@ -1,4 +1,4 @@
 [settings]
 
 [[proxy]]
-path = "src/adder_proxy.rs"
+path = "src/st_proxy.rs"
diff --git a/contracts/feature-tests/scenario-tester/scenarios/interactor_trace.scen.json b/contracts/feature-tests/scenario-tester/scenarios/interactor_trace.scen.json
index e0824697fe..07fd7f68ca 100644
--- a/contracts/feature-tests/scenario-tester/scenarios/interactor_trace.scen.json
+++ b/contracts/feature-tests/scenario-tester/scenarios/interactor_trace.scen.json
@@ -29,7 +29,7 @@
             "step": "scDeploy",
             "tx": {
                 "from": "0xe32afedc904fe1939746ad973beb383563cf63642ba669b3040f9b9428a5ed60",
-                "contractCode": "mxsc:../output/adder.mxsc.json",
+                "contractCode": "mxsc:../output/scenario-tester.mxsc.json",
                 "arguments": [
                     "0x00"
                 ],
diff --git a/contracts/feature-tests/scenario-tester/scenarios/adder.scen.json b/contracts/feature-tests/scenario-tester/scenarios/st-adder.scen.json
similarity index 94%
rename from contracts/feature-tests/scenario-tester/scenarios/adder.scen.json
rename to contracts/feature-tests/scenario-tester/scenarios/st-adder.scen.json
index 08ecb79e3f..94ba305ed2 100644
--- a/contracts/feature-tests/scenario-tester/scenarios/adder.scen.json
+++ b/contracts/feature-tests/scenario-tester/scenarios/st-adder.scen.json
@@ -24,7 +24,7 @@
             "id": "1",
             "tx": {
                 "from": "address:owner",
-                "contractCode": "mxsc:../output/adder.mxsc.json",
+                "contractCode": "mxsc:../output/scenario-tester.mxsc.json",
                 "arguments": [
                     "5"
                 ],
@@ -91,7 +91,7 @@
                     "storage": {
                         "str:sum": "8"
                     },
-                    "code": "mxsc:../output/adder.mxsc.json"
+                    "code": "mxsc:../output/scenario-tester.mxsc.json"
                 }
             }
         }
diff --git a/contracts/feature-tests/scenario-tester/tests/adder_blackbox_chained_test.rs b/contracts/feature-tests/scenario-tester/tests/adder_blackbox_chained_test.rs
deleted file mode 100644
index b10b3e3a54..0000000000
--- a/contracts/feature-tests/scenario-tester/tests/adder_blackbox_chained_test.rs
+++ /dev/null
@@ -1,64 +0,0 @@
-use multiversx_sc_scenario::imports::*;
-use num_bigint::BigUint;
-
-use adder::*;
-
-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(ADDER_PATH_EXPR, adder::ContractBuilder);
-    blockchain
-}
-
-#[test]
-fn adder_blackbox_chained() {
-    let mut world = world();
-    let owner_address = "address:owner";
-    let adder_contract = ContractInfo::<adder::Proxy<StaticApi>>::new("sc:adder");
-
-    world
-        .start_trace()
-        .set_state_step(
-            SetStateStep::new()
-                .put_account(owner_address, Account::new().nonce(1))
-                .new_address(owner_address, 1, "sc:adder"),
-        )
-        .chain_deploy(|tx| {
-            tx.from(AddressExpr("owner"))
-                .typed(adder_proxy::AdderProxy)
-                .init(5u32)
-                .code(MxscExpr("output/adder.mxsc.json"))
-                .with_result(WithNewAddress::new(|new_address| {
-                    assert_eq!(new_address.to_address(), adder_contract.to_address());
-                }))
-        })
-        .chain_query(|tx| {
-            tx.to(ScExpr("adder"))
-                .typed(adder_proxy::AdderProxy)
-                .sum()
-                .with_result(WithResultConv::new(|value: BigUint| {
-                    assert_eq!(value, BigUint::from(5u32));
-                }))
-        })
-        .chain_call(|tx| {
-            tx.from(AddressExpr("owner"))
-                .to(ScExpr("adder"))
-                .typed(adder_proxy::AdderProxy)
-                .add(3u32)
-                .with_result(WithRawTxResponse(|response| {
-                    assert!(response.tx_error.is_success());
-                }))
-        })
-        .check_state_step(
-            CheckStateStep::new()
-                .put_account(owner_address, CheckAccount::new())
-                .put_account(
-                    &adder_contract,
-                    CheckAccount::new().check_storage("str:sum", "8"),
-                ),
-        )
-        .write_scenario_trace("trace2.scen.json");
-}
diff --git a/contracts/feature-tests/scenario-tester/tests/adder_blackbox_legacy_proxy_test.rs b/contracts/feature-tests/scenario-tester/tests/adder_blackbox_legacy_proxy_test.rs
deleted file mode 100644
index e3a2540386..0000000000
--- a/contracts/feature-tests/scenario-tester/tests/adder_blackbox_legacy_proxy_test.rs
+++ /dev/null
@@ -1,77 +0,0 @@
-use multiversx_sc_scenario::imports::*;
-use num_bigint::BigUint;
-
-use adder::*;
-
-const ADDER_PATH_EXPR: &str = "mxsc:output/adder.mxsc.json";
-
-const OWNER: AddressExpr = AddressExpr("owner");
-const CODE_EXPR: MxscExpr = MxscExpr("output/adder.mxsc.json");
-
-fn world() -> ScenarioWorld {
-    let mut blockchain = ScenarioWorld::new();
-    blockchain.set_current_dir_from_workspace("contracts/examples/adder");
-
-    blockchain.register_contract(ADDER_PATH_EXPR, adder::ContractBuilder);
-    blockchain
-}
-
-#[test]
-fn adder_blackbox_legacy_proxy() {
-    let mut world = world();
-    let owner_address = "address:owner";
-    let mut adder_contract = ContractInfo::<adder::Proxy<StaticApi>>::new("sc:adder");
-
-    world.start_trace();
-
-    world.set_state_step(
-        SetStateStep::new()
-            .put_account(owner_address, Account::new().nonce(1))
-            .new_address(owner_address, 1, "sc:adder"),
-    );
-
-    world
-        .tx()
-        .from(OWNER)
-        .typed(adder_proxy::AdderProxy)
-        .init(5u32)
-        .code(CODE_EXPR)
-        .with_result(WithNewAddress::new(|new_address| {
-            assert_eq!(new_address.to_address(), adder_contract.to_address());
-        }))
-        .run();
-
-    world.sc_query(
-        ScQueryStep::new()
-            .to(&adder_contract)
-            .call(adder_contract.sum())
-            .expect_value(SingleValue::from(BigUint::from(5u32))),
-    );
-
-    let value = world
-        .query()
-        .call(adder_contract.sum())
-        .returns(ReturnsResultConv::<SingleValue<BigUint>>::new())
-        .run();
-    assert_eq!(value.into(), BigUint::from(5u32));
-
-    world
-        .tx()
-        .from(OWNER)
-        .call(adder_contract.add(3u32))
-        .with_result(WithRawTxResponse(|response| {
-            assert!(response.tx_error.is_success());
-        }))
-        .run();
-
-    world.check_state_step(
-        CheckStateStep::new()
-            .put_account(owner_address, CheckAccount::new())
-            .put_account(
-                &adder_contract,
-                CheckAccount::new().check_storage("str:sum", "8"),
-            ),
-    );
-
-    world.write_scenario_trace("trace1.scen.json");
-}
diff --git a/contracts/feature-tests/scenario-tester/tests/adder_scenario_rs_test.rs b/contracts/feature-tests/scenario-tester/tests/adder_scenario_rs_test.rs
deleted file mode 100644
index c467100633..0000000000
--- a/contracts/feature-tests/scenario-tester/tests/adder_scenario_rs_test.rs
+++ /dev/null
@@ -1,19 +0,0 @@
-use multiversx_sc_scenario::*;
-
-fn world() -> ScenarioWorld {
-    let mut blockchain = ScenarioWorld::new();
-    blockchain.set_current_dir_from_workspace("contracts/examples/adder");
-
-    blockchain.register_contract("mxsc:output/adder.mxsc.json", adder::ContractBuilder);
-    blockchain
-}
-
-#[test]
-fn adder_rs() {
-    world().run("scenarios/adder.scen.json");
-}
-
-#[test]
-fn interactor_trace_rs() {
-    world().run("scenarios/interactor_trace.scen.json");
-}
diff --git a/contracts/feature-tests/scenario-tester/tests/adder_unit_test.rs b/contracts/feature-tests/scenario-tester/tests/adder_unit_test.rs
deleted file mode 100644
index 3839382866..0000000000
--- a/contracts/feature-tests/scenario-tester/tests/adder_unit_test.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-use adder::*;
-use multiversx_sc::types::BigUint;
-use multiversx_sc_scenario::api::SingleTxApi;
-
-#[test]
-fn adder_unit_test() {
-    let adder = adder::contract_obj::<SingleTxApi>();
-
-    adder.init(BigUint::from(5u32));
-    assert_eq!(BigUint::from(5u32), adder.sum().get());
-
-    adder.add(BigUint::from(7u32));
-    assert_eq!(BigUint::from(12u32), adder.sum().get());
-
-    adder.add(BigUint::from(1u32));
-    assert_eq!(BigUint::from(13u32), adder.sum().get());
-}
diff --git a/contracts/examples/adder/tests/adder_blackbox_chained_test.rs b/contracts/feature-tests/scenario-tester/tests/st_blackbox_chained_test.rs
similarity index 66%
rename from contracts/examples/adder/tests/adder_blackbox_chained_test.rs
rename to contracts/feature-tests/scenario-tester/tests/st_blackbox_chained_test.rs
index b10b3e3a54..165e4c62f3 100644
--- a/contracts/examples/adder/tests/adder_blackbox_chained_test.rs
+++ b/contracts/feature-tests/scenario-tester/tests/st_blackbox_chained_test.rs
@@ -1,23 +1,23 @@
 use multiversx_sc_scenario::imports::*;
 use num_bigint::BigUint;
 
-use adder::*;
+use scenario_tester::*;
 
-const ADDER_PATH_EXPR: &str = "mxsc:output/adder.mxsc.json";
+const ADDER_PATH_EXPR: &str = "mxsc:output/scenario-tester.mxsc.json";
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
-    blockchain.set_current_dir_from_workspace("contracts/examples/adder");
+    blockchain.set_current_dir_from_workspace("contracts/feature-tests/scenario-tester");
 
-    blockchain.register_contract(ADDER_PATH_EXPR, adder::ContractBuilder);
+    blockchain.register_contract(ADDER_PATH_EXPR, scenario_tester::ContractBuilder);
     blockchain
 }
 
 #[test]
-fn adder_blackbox_chained() {
+fn st_blackbox_chained() {
     let mut world = world();
     let owner_address = "address:owner";
-    let adder_contract = ContractInfo::<adder::Proxy<StaticApi>>::new("sc:adder");
+    let st_contract = ContractInfo::<scenario_tester::Proxy<StaticApi>>::new("sc:adder");
 
     world
         .start_trace()
@@ -28,16 +28,16 @@ fn adder_blackbox_chained() {
         )
         .chain_deploy(|tx| {
             tx.from(AddressExpr("owner"))
-                .typed(adder_proxy::AdderProxy)
+                .typed(scenario_tester_proxy::ScenarioTesterProxy)
                 .init(5u32)
-                .code(MxscExpr("output/adder.mxsc.json"))
+                .code(MxscExpr("output/scenario-tester.mxsc.json"))
                 .with_result(WithNewAddress::new(|new_address| {
-                    assert_eq!(new_address.to_address(), adder_contract.to_address());
+                    assert_eq!(new_address.to_address(), st_contract.to_address());
                 }))
         })
         .chain_query(|tx| {
             tx.to(ScExpr("adder"))
-                .typed(adder_proxy::AdderProxy)
+                .typed(scenario_tester_proxy::ScenarioTesterProxy)
                 .sum()
                 .with_result(WithResultConv::new(|value: BigUint| {
                     assert_eq!(value, BigUint::from(5u32));
@@ -46,7 +46,7 @@ fn adder_blackbox_chained() {
         .chain_call(|tx| {
             tx.from(AddressExpr("owner"))
                 .to(ScExpr("adder"))
-                .typed(adder_proxy::AdderProxy)
+                .typed(scenario_tester_proxy::ScenarioTesterProxy)
                 .add(3u32)
                 .with_result(WithRawTxResponse(|response| {
                     assert!(response.tx_error.is_success());
@@ -56,7 +56,7 @@ fn adder_blackbox_chained() {
             CheckStateStep::new()
                 .put_account(owner_address, CheckAccount::new())
                 .put_account(
-                    &adder_contract,
+                    &st_contract,
                     CheckAccount::new().check_storage("str:sum", "8"),
                 ),
         )
diff --git a/contracts/examples/adder/tests/adder_blackbox_legacy_proxy_test.rs b/contracts/feature-tests/scenario-tester/tests/st_blackbox_legacy_proxy_test.rs
similarity index 75%
rename from contracts/examples/adder/tests/adder_blackbox_legacy_proxy_test.rs
rename to contracts/feature-tests/scenario-tester/tests/st_blackbox_legacy_proxy_test.rs
index e3a2540386..09e8e87c17 100644
--- a/contracts/examples/adder/tests/adder_blackbox_legacy_proxy_test.rs
+++ b/contracts/feature-tests/scenario-tester/tests/st_blackbox_legacy_proxy_test.rs
@@ -1,7 +1,7 @@
 use multiversx_sc_scenario::imports::*;
 use num_bigint::BigUint;
 
-use adder::*;
+use scenario_tester::*;
 
 const ADDER_PATH_EXPR: &str = "mxsc:output/adder.mxsc.json";
 
@@ -12,15 +12,15 @@ fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
     blockchain.set_current_dir_from_workspace("contracts/examples/adder");
 
-    blockchain.register_contract(ADDER_PATH_EXPR, adder::ContractBuilder);
+    blockchain.register_contract(ADDER_PATH_EXPR, scenario_tester::ContractBuilder);
     blockchain
 }
 
 #[test]
-fn adder_blackbox_legacy_proxy() {
+fn st_blackbox_legacy_proxy() {
     let mut world = world();
     let owner_address = "address:owner";
-    let mut adder_contract = ContractInfo::<adder::Proxy<StaticApi>>::new("sc:adder");
+    let mut st_contract = ContractInfo::<scenario_tester::Proxy<StaticApi>>::new("sc:adder");
 
     world.start_trace();
 
@@ -33,24 +33,24 @@ fn adder_blackbox_legacy_proxy() {
     world
         .tx()
         .from(OWNER)
-        .typed(adder_proxy::AdderProxy)
+        .typed(scenario_tester_proxy::ScenarioTesterProxy)
         .init(5u32)
         .code(CODE_EXPR)
         .with_result(WithNewAddress::new(|new_address| {
-            assert_eq!(new_address.to_address(), adder_contract.to_address());
+            assert_eq!(new_address.to_address(), st_contract.to_address());
         }))
         .run();
 
     world.sc_query(
         ScQueryStep::new()
-            .to(&adder_contract)
-            .call(adder_contract.sum())
+            .to(&st_contract)
+            .call(st_contract.sum())
             .expect_value(SingleValue::from(BigUint::from(5u32))),
     );
 
     let value = world
         .query()
-        .call(adder_contract.sum())
+        .call(st_contract.sum())
         .returns(ReturnsResultConv::<SingleValue<BigUint>>::new())
         .run();
     assert_eq!(value.into(), BigUint::from(5u32));
@@ -58,7 +58,7 @@ fn adder_blackbox_legacy_proxy() {
     world
         .tx()
         .from(OWNER)
-        .call(adder_contract.add(3u32))
+        .call(st_contract.add(3u32))
         .with_result(WithRawTxResponse(|response| {
             assert!(response.tx_error.is_success());
         }))
@@ -68,7 +68,7 @@ fn adder_blackbox_legacy_proxy() {
         CheckStateStep::new()
             .put_account(owner_address, CheckAccount::new())
             .put_account(
-                &adder_contract,
+                &st_contract,
                 CheckAccount::new().check_storage("str:sum", "8"),
             ),
     );
diff --git a/contracts/feature-tests/scenario-tester/tests/adder_blackbox_raw_steps_test.rs b/contracts/feature-tests/scenario-tester/tests/st_blackbox_raw_steps_test.rs
similarity index 100%
rename from contracts/feature-tests/scenario-tester/tests/adder_blackbox_raw_steps_test.rs
rename to contracts/feature-tests/scenario-tester/tests/st_blackbox_raw_steps_test.rs
diff --git a/contracts/feature-tests/scenario-tester/tests/adder_blackbox_test.rs b/contracts/feature-tests/scenario-tester/tests/st_blackbox_test.rs
similarity index 89%
rename from contracts/feature-tests/scenario-tester/tests/adder_blackbox_test.rs
rename to contracts/feature-tests/scenario-tester/tests/st_blackbox_test.rs
index 9149a25e3b..b3eafe218b 100644
--- a/contracts/feature-tests/scenario-tester/tests/adder_blackbox_test.rs
+++ b/contracts/feature-tests/scenario-tester/tests/st_blackbox_test.rs
@@ -18,10 +18,10 @@ fn world() -> ScenarioWorld {
 }
 
 #[test]
-fn adder_blackbox() {
+fn st_blackbox() {
     let mut world = world();
     let owner_address = "address:owner";
-    let adder_contract = ContractInfo::<scenario_tester::Proxy<StaticApi>>::new("sc:scenario-tester");
+    let st_contract = ContractInfo::<scenario_tester::Proxy<StaticApi>>::new("sc:scenario-tester");
 
     world.start_trace();
 
@@ -40,7 +40,7 @@ fn adder_blackbox() {
         .returns(ReturnsNewAddress)
         .run();
 
-    assert_eq!(new_address, adder_contract.to_address());
+    assert_eq!(new_address, st_contract.to_address());
 
     let value = world
         .query()
@@ -63,7 +63,7 @@ fn adder_blackbox() {
         CheckStateStep::new()
             .put_account(owner_address, CheckAccount::new())
             .put_account(
-                &adder_contract,
+                &st_contract,
                 CheckAccount::new().check_storage("str:sum", "6"),
             ),
     );
diff --git a/contracts/feature-tests/scenario-tester/tests/adder_blackbox_upgrade_test.rs b/contracts/feature-tests/scenario-tester/tests/st_blackbox_upgrade_test.rs
similarity index 74%
rename from contracts/feature-tests/scenario-tester/tests/adder_blackbox_upgrade_test.rs
rename to contracts/feature-tests/scenario-tester/tests/st_blackbox_upgrade_test.rs
index 5a38f7c5df..081f6037ba 100644
--- a/contracts/feature-tests/scenario-tester/tests/adder_blackbox_upgrade_test.rs
+++ b/contracts/feature-tests/scenario-tester/tests/st_blackbox_upgrade_test.rs
@@ -1,19 +1,19 @@
 use multiversx_sc_scenario::imports::*;
 
-const ADDER_PATH_EXPR: &str = "mxsc:output/adder.mxsc.json";
+const ADDER_PATH_EXPR: &str = "mxsc:output/scenario-tester.mxsc.json";
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
-    blockchain.set_current_dir_from_workspace("contracts/examples/adder");
+    blockchain.set_current_dir_from_workspace("contracts/feature-tests/scenario-tester");
 
-    blockchain.register_contract("mxsc:output/adder.mxsc.json", adder::ContractBuilder);
+    blockchain.register_contract("mxsc:output/scenario-tester.mxsc.json", scenario_tester::ContractBuilder);
     blockchain
 }
 
 #[test]
-fn adder_blackbox_upgrade() {
+fn st_blackbox_upgrade() {
     let mut world = world();
-    let adder_code = world.code_expression(ADDER_PATH_EXPR);
+    let st_code = world.code_expression(ADDER_PATH_EXPR);
 
     world
         .set_state_step(
@@ -24,7 +24,7 @@ fn adder_blackbox_upgrade() {
         .sc_deploy(
             ScDeployStep::new()
                 .from("address:owner")
-                .code(&adder_code)
+                .code(&st_code)
                 .argument("5")
                 .gas_limit("5,000,000")
                 .expect(TxExpect::ok().no_result()),
@@ -34,7 +34,7 @@ fn adder_blackbox_upgrade() {
                 .from("address:owner")
                 .to("sc:adder")
                 .function("upgradeContract")
-                .argument(&adder_code)
+                .argument(&st_code)
                 .argument("0x0502") // codeMetadata
                 .argument("8") // contract argument
                 .expect(TxExpect::ok().no_result()),
diff --git a/contracts/feature-tests/scenario-tester/tests/adder_scenario_go_test.rs b/contracts/feature-tests/scenario-tester/tests/st_scenario_go_test.rs
similarity index 74%
rename from contracts/feature-tests/scenario-tester/tests/adder_scenario_go_test.rs
rename to contracts/feature-tests/scenario-tester/tests/st_scenario_go_test.rs
index bed4ae016d..a62c9ea10f 100644
--- a/contracts/feature-tests/scenario-tester/tests/adder_scenario_go_test.rs
+++ b/contracts/feature-tests/scenario-tester/tests/st_scenario_go_test.rs
@@ -5,11 +5,11 @@ fn world() -> ScenarioWorld {
 }
 
 #[test]
-fn adder_go() {
-    world().run("scenarios/adder.scen.json");
+fn interactor_trace_go() {
+    world().run("scenarios/interactor_trace.scen.json");
 }
 
 #[test]
-fn interactor_trace_go() {
-    world().run("scenarios/interactor_trace.scen.json");
+fn st_adder_go() {
+    world().run("scenarios/st-adder.scen.json");
 }
diff --git a/contracts/feature-tests/scenario-tester/tests/st_scenario_rs_test.rs b/contracts/feature-tests/scenario-tester/tests/st_scenario_rs_test.rs
new file mode 100644
index 0000000000..c92fdaa1e0
--- /dev/null
+++ b/contracts/feature-tests/scenario-tester/tests/st_scenario_rs_test.rs
@@ -0,0 +1,19 @@
+use multiversx_sc_scenario::*;
+
+fn world() -> ScenarioWorld {
+    let mut blockchain = ScenarioWorld::new();
+    blockchain.set_current_dir_from_workspace("contracts/feature-tests/scenario-tester");
+
+    blockchain.register_contract("mxsc:output/scenario-tester.mxsc.json", scenario_tester::ContractBuilder);
+    blockchain
+}
+
+#[test]
+fn interactor_trace_rs() {
+    world().run("scenarios/interactor_trace.scen.json");
+}
+
+#[test]
+fn st_adder_rs() {
+    world().run("scenarios/st-adder.scen.json");
+}
diff --git a/contracts/feature-tests/scenario-tester/tests/st_unit_test.rs b/contracts/feature-tests/scenario-tester/tests/st_unit_test.rs
new file mode 100644
index 0000000000..2c099f53e9
--- /dev/null
+++ b/contracts/feature-tests/scenario-tester/tests/st_unit_test.rs
@@ -0,0 +1,17 @@
+use scenario_tester::*;
+use multiversx_sc::types::BigUint;
+use multiversx_sc_scenario::api::SingleTxApi;
+
+#[test]
+fn st_unit_test() {
+    let contract = scenario_tester::contract_obj::<SingleTxApi>();
+
+    contract.init(BigUint::from(5u32));
+    assert_eq!(BigUint::from(5u32), contract.sum().get());
+
+    contract.add(BigUint::from(7u32));
+    assert_eq!(BigUint::from(12u32), contract.sum().get());
+
+    contract.add(BigUint::from(1u32));
+    assert_eq!(BigUint::from(13u32), contract.sum().get());
+}
diff --git a/contracts/feature-tests/scenario-tester/tests/adder_whitebox_test.rs b/contracts/feature-tests/scenario-tester/tests/st_whitebox_test.rs
similarity index 61%
rename from contracts/feature-tests/scenario-tester/tests/adder_whitebox_test.rs
rename to contracts/feature-tests/scenario-tester/tests/st_whitebox_test.rs
index 50ad95faa6..c7fddee6cc 100644
--- a/contracts/feature-tests/scenario-tester/tests/adder_whitebox_test.rs
+++ b/contracts/feature-tests/scenario-tester/tests/st_whitebox_test.rs
@@ -1,21 +1,21 @@
-use adder::*;
+use scenario_tester::*;
 use multiversx_sc_scenario::imports::*;
 
-const ADDER_PATH_EXPR: &str = "mxsc:output/adder.mxsc.json";
+const ADDER_PATH_EXPR: &str = "mxsc:output/scenario-tester.mxsc.json";
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
-    blockchain.set_current_dir_from_workspace("contracts/examples/adder");
+    blockchain.set_current_dir_from_workspace("contracts/feature-tests/scenario-tester");
 
-    blockchain.register_contract("mxsc:output/adder.mxsc.json", adder::ContractBuilder);
+    blockchain.register_contract("mxsc:output/scenario-tester.mxsc.json", scenario_tester::ContractBuilder);
     blockchain
 }
 
 #[test]
-fn adder_whitebox() {
+fn st_whitebox() {
     let mut world = world();
-    let adder_whitebox = WhiteboxContract::new("sc:adder", adder::contract_obj);
-    let adder_code = world.code_expression(ADDER_PATH_EXPR);
+    let st_whitebox = WhiteboxContract::new("sc:adder", scenario_tester::contract_obj);
+    let st_code = world.code_expression(ADDER_PATH_EXPR);
 
     world
         .set_state_step(
@@ -24,18 +24,18 @@ fn adder_whitebox() {
                 .new_address("address:owner", 1, "sc:adder"),
         )
         .whitebox_deploy(
-            &adder_whitebox,
-            ScDeployStep::new().from("address:owner").code(adder_code),
+            &st_whitebox,
+            ScDeployStep::new().from("address:owner").code(st_code),
             |sc| {
                 sc.init(5u32.into());
             },
         )
-        .whitebox_query(&adder_whitebox, |sc| {
+        .whitebox_query(&st_whitebox, |sc| {
             let sum_value = sc.sum();
             assert_eq!(sum_value.get(), 5u32);
         })
         .whitebox_call(
-            &adder_whitebox,
+            &st_whitebox,
             ScCallStep::new().from("address:owner"),
             |sc| sc.add(3u32.into()),
         )
diff --git a/contracts/feature-tests/scenario-tester/wasm/Cargo.lock b/contracts/feature-tests/scenario-tester/wasm/Cargo.lock
index 9bc1e41879..dd7e298064 100755
--- a/contracts/feature-tests/scenario-tester/wasm/Cargo.lock
+++ b/contracts/feature-tests/scenario-tester/wasm/Cargo.lock
@@ -132,18 +132,18 @@ dependencies = [
 ]
 
 [[package]]
-name = "scenario_tester"
+name = "scenario-tester"
 version = "0.0.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
-name = "scenario_tester-wasm"
+name = "scenario-tester-wasm"
 version = "0.0.0"
 dependencies = [
  "multiversx-sc-wasm-adapter",
- "scenario_tester",
+ "scenario-tester",
 ]
 
 [[package]]
diff --git a/contracts/feature-tests/scenario-tester/wasm/Cargo.toml b/contracts/feature-tests/scenario-tester/wasm/Cargo.toml
index 6de4181a2b..1baaa13b44 100644
--- a/contracts/feature-tests/scenario-tester/wasm/Cargo.toml
+++ b/contracts/feature-tests/scenario-tester/wasm/Cargo.toml
@@ -5,7 +5,7 @@
 # ##########################################
 
 [package]
-name = "scenario_tester-wasm"
+name = "scenario-tester-wasm"
 version = "0.0.0"
 edition = "2021"
 publish = false
@@ -21,7 +21,7 @@ debug = false
 panic = "abort"
 overflow-checks = false
 
-[dependencies.scenario_tester]
+[dependencies.scenario-tester]
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]

From 5b0a7009c97b47975386be0886a06157c569eb40 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 11 Apr 2024 20:29:10 +0300
Subject: [PATCH 0698/1254] more refactor in
 retrieve_account_as_scenario_set_state

---
 .../scenario/src/standalone/account_tool.rs   | 29 ++++++++++++-------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/framework/scenario/src/standalone/account_tool.rs b/framework/scenario/src/standalone/account_tool.rs
index 2e31b01b35..fde5adf87f 100644
--- a/framework/scenario/src/standalone/account_tool.rs
+++ b/framework/scenario/src/standalone/account_tool.rs
@@ -22,28 +22,35 @@ pub async fn print_account_as_scenario_set_state(
 
 pub async fn retrieve_account_as_scenario_set_state(
     api: &CommunicationProxy,
-    addr: &Bech32Address,
+    address: &Bech32Address,
 ) -> SetStateStep {
-    let address = Address::from_bech32_string(addr.to_bech32_str()).unwrap();
-    let account = api.get_account(&address).await.unwrap();
+    let sdk_address = Address::from_bech32_string(address.to_bech32_str()).unwrap();
+    let sdk_account = api.get_account(&sdk_address).await.unwrap();
 
     let account_esdt = api
-        .get_account_esdt_tokens(&address)
+        .get_account_esdt_tokens(&sdk_address)
         .await
-        .unwrap_or_else(|err| panic!("failed to retrieve ESDT tokens for address {addr}: {err}"));
+        .unwrap_or_else(|err| {
+            panic!("failed to retrieve ESDT tokens for address {address}: {err}")
+        });
     let account_esdt_roles = api
-        .get_account_esdt_roles(&address)
+        .get_account_esdt_roles(&sdk_address)
         .await
-        .unwrap_or_else(|err| panic!("failed to retrieve ESDT roles for address {addr}: {err}"));
+        .unwrap_or_else(|err| panic!("failed to retrieve ESDT roles for address {address}: {err}"));
     let account_storage = api
-        .get_account_storage_keys(&address)
+        .get_account_storage_keys(&sdk_address)
         .await
-        .unwrap_or_else(|err| panic!("failed to retrieve storage for address {addr}: {err}"));
+        .unwrap_or_else(|err| panic!("failed to retrieve storage for address {address}: {err}"));
 
-    let account_state = set_account(account, account_storage, account_esdt, account_esdt_roles);
+    let account_state = set_account(
+        sdk_account,
+        account_storage,
+        account_esdt,
+        account_esdt_roles,
+    );
 
     let set_state_step = SetStateStep::new();
-    set_state_step.put_account(key_hex(&address.to_bytes()), account_state)
+    set_state_step.put_account(address, account_state)
 }
 
 pub fn build_scenario(set_state: SetStateStep) -> Scenario {

From af63bee485b9e86bbdc1ed001ec3f0c06373ae3b Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 11 Apr 2024 20:48:29 +0300
Subject: [PATCH 0699/1254] retrieve accounts - more minor refactoring

---
 .../interact/src/multisig_interact.rs         |  2 +-
 .../interact/src/bf_interact.rs               |  4 +++-
 .../scenario/src/standalone/account_tool.rs   | 19 +++++++++----------
 framework/scenario/src/standalone/mod.rs      |  2 +-
 framework/snippets/src/interactor.rs          |  7 ++-----
 5 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/contracts/examples/multisig/interact/src/multisig_interact.rs b/contracts/examples/multisig/interact/src/multisig_interact.rs
index b8f1ec2be4..eaef5d8448 100644
--- a/contracts/examples/multisig/interact/src/multisig_interact.rs
+++ b/contracts/examples/multisig/interact/src/multisig_interact.rs
@@ -120,7 +120,7 @@ impl MultisigInteract {
                 bech32::encode(board_member_address)
             );
             self.interactor
-                .retrieve_account(&Bech32Address::from(board_member_address))
+                .retrieve_account(&board_member_address.into())
                 .await;
         }
 
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 8a36a12749..acc8b90715 100644
--- a/contracts/feature-tests/basic-features/interact/src/bf_interact.rs
+++ b/contracts/feature-tests/basic-features/interact/src/bf_interact.rs
@@ -73,7 +73,9 @@ impl BasicFeaturesInteract {
 
     async fn set_state(&mut self) {
         println!("wallet address: {}", bech32::encode(&self.wallet_address));
-        self.interactor.retrieve_account(&Bech32Address::from(&self.wallet_address)).await;
+        self.interactor
+            .retrieve_account(&Bech32Address::from(&self.wallet_address))
+            .await;
     }
 
     async fn deploy(&mut self) {
diff --git a/framework/scenario/src/standalone/account_tool.rs b/framework/scenario/src/standalone/account_tool.rs
index fde5adf87f..76ecd693a5 100644
--- a/framework/scenario/src/standalone/account_tool.rs
+++ b/framework/scenario/src/standalone/account_tool.rs
@@ -4,7 +4,6 @@ use crate::{
 };
 
 use multiversx_chain_scenario_format::interpret_trait::IntoRaw;
-use multiversx_chain_vm::display_util::key_hex;
 use multiversx_sdk::{
     blockchain::CommunicationProxy,
     data::{address::Address, esdt::EsdtBalance},
@@ -20,6 +19,15 @@ pub async fn print_account_as_scenario_set_state(
     println!("{}", scenario.into_raw().to_json_string());
 }
 
+fn build_scenario(set_state: SetStateStep) -> Scenario {
+    Scenario {
+        name: None,
+        comment: None,
+        check_gas: None,
+        steps: vec![crate::scenario_model::Step::SetState(set_state)],
+    }
+}
+
 pub async fn retrieve_account_as_scenario_set_state(
     api: &CommunicationProxy,
     address: &Bech32Address,
@@ -53,15 +61,6 @@ pub async fn retrieve_account_as_scenario_set_state(
     set_state_step.put_account(address, account_state)
 }
 
-pub fn build_scenario(set_state: SetStateStep) -> Scenario {
-    Scenario {
-        name: None,
-        comment: None,
-        check_gas: None,
-        steps: vec![crate::scenario_model::Step::SetState(set_state)],
-    }
-}
-
 pub fn set_account(
     account: multiversx_sdk::data::account::Account,
     account_storage: HashMap<String, String>,
diff --git a/framework/scenario/src/standalone/mod.rs b/framework/scenario/src/standalone/mod.rs
index ce7559a948..84ecea3916 100644
--- a/framework/scenario/src/standalone/mod.rs
+++ b/framework/scenario/src/standalone/mod.rs
@@ -1,5 +1,5 @@
 mod account_tool;
 mod scenario_cli;
 
-pub use account_tool::{build_scenario, retrieve_account_as_scenario_set_state};
+pub use account_tool::retrieve_account_as_scenario_set_state;
 pub use scenario_cli::cli_main;
diff --git a/framework/snippets/src/interactor.rs b/framework/snippets/src/interactor.rs
index 85d6a4503c..35d53a4a86 100644
--- a/framework/snippets/src/interactor.rs
+++ b/framework/snippets/src/interactor.rs
@@ -3,7 +3,6 @@ use multiversx_sc_scenario::{
     mandos_system::{run_list::ScenarioRunnerList, run_trace::ScenarioTraceFile},
     multiversx_sc::types::Address,
     scenario_model::AddressValue,
-    standalone::build_scenario,
 };
 use multiversx_sdk::{
     blockchain::CommunicationProxy,
@@ -72,10 +71,8 @@ impl Interactor {
 
     pub async fn retrieve_account(&mut self, wallet_address: &Bech32Address) {
         let set_state = retrieve_account_as_scenario_set_state(&self.proxy, wallet_address).await;
-        let scenario = build_scenario(set_state);
-
-        self.pre_runners.run_scenario(&scenario);
-        self.post_runners.run_scenario(&scenario);
+        self.pre_runners.run_set_state_step(&set_state);
+        self.post_runners.run_set_state_step(&set_state);
     }
 }
 

From b9d05bd6b7a8c4b48734a9594da234b70f70e84f Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Fri, 12 Apr 2024 11:12:03 +0200
Subject: [PATCH 0700/1254] impl for check state builder, tests and fmt

---
 .../scenario-tester/tests/st_blackbox_test.rs |  17 +-
 .../tests/st_blackbox_upgrade_test.rs         |   5 +-
 .../tests/st_scenario_rs_test.rs              |   5 +-
 .../scenario-tester/tests/st_unit_test.rs     |   2 +-
 .../scenario-tester/tests/st_whitebox_test.rs |   7 +-
 .../src/facade/world_tx/scenario_env_query.rs | 227 +++++++++++++++++-
 6 files changed, 246 insertions(+), 17 deletions(-)

diff --git a/contracts/feature-tests/scenario-tester/tests/st_blackbox_test.rs b/contracts/feature-tests/scenario-tester/tests/st_blackbox_test.rs
index b3eafe218b..bac228f0be 100644
--- a/contracts/feature-tests/scenario-tester/tests/st_blackbox_test.rs
+++ b/contracts/feature-tests/scenario-tester/tests/st_blackbox_test.rs
@@ -27,7 +27,7 @@ fn st_blackbox() {
 
     world.set_state_step(
         SetStateStep::new()
-            .put_account(owner_address, Account::new().nonce(1))
+            .put_account(owner_address, Account::new().nonce(1).balance("100"))
             .new_address(owner_address, 1, "sc:scenario-tester"),
     );
 
@@ -59,14 +59,13 @@ fn st_blackbox() {
         .add(1u32)
         .run();
 
-    world.check_state_step(
-        CheckStateStep::new()
-            .put_account(owner_address, CheckAccount::new())
-            .put_account(
-                &st_contract,
-                CheckAccount::new().check_storage("str:sum", "6"),
-            ),
-    );
+    world
+        .check_state_account(owner_address)
+        .nonce("3")
+        .balance("100")
+        .check_state_account(st_contract)
+        .check_storage("str:sum", "6")
+        .commit();
 
     world.write_scenario_trace("trace1.scen.json");
 }
diff --git a/contracts/feature-tests/scenario-tester/tests/st_blackbox_upgrade_test.rs b/contracts/feature-tests/scenario-tester/tests/st_blackbox_upgrade_test.rs
index 081f6037ba..786fea9725 100644
--- a/contracts/feature-tests/scenario-tester/tests/st_blackbox_upgrade_test.rs
+++ b/contracts/feature-tests/scenario-tester/tests/st_blackbox_upgrade_test.rs
@@ -6,7 +6,10 @@ fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
     blockchain.set_current_dir_from_workspace("contracts/feature-tests/scenario-tester");
 
-    blockchain.register_contract("mxsc:output/scenario-tester.mxsc.json", scenario_tester::ContractBuilder);
+    blockchain.register_contract(
+        "mxsc:output/scenario-tester.mxsc.json",
+        scenario_tester::ContractBuilder,
+    );
     blockchain
 }
 
diff --git a/contracts/feature-tests/scenario-tester/tests/st_scenario_rs_test.rs b/contracts/feature-tests/scenario-tester/tests/st_scenario_rs_test.rs
index c92fdaa1e0..32f289733d 100644
--- a/contracts/feature-tests/scenario-tester/tests/st_scenario_rs_test.rs
+++ b/contracts/feature-tests/scenario-tester/tests/st_scenario_rs_test.rs
@@ -4,7 +4,10 @@ fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
     blockchain.set_current_dir_from_workspace("contracts/feature-tests/scenario-tester");
 
-    blockchain.register_contract("mxsc:output/scenario-tester.mxsc.json", scenario_tester::ContractBuilder);
+    blockchain.register_contract(
+        "mxsc:output/scenario-tester.mxsc.json",
+        scenario_tester::ContractBuilder,
+    );
     blockchain
 }
 
diff --git a/contracts/feature-tests/scenario-tester/tests/st_unit_test.rs b/contracts/feature-tests/scenario-tester/tests/st_unit_test.rs
index 2c099f53e9..e9b418dfad 100644
--- a/contracts/feature-tests/scenario-tester/tests/st_unit_test.rs
+++ b/contracts/feature-tests/scenario-tester/tests/st_unit_test.rs
@@ -1,6 +1,6 @@
-use scenario_tester::*;
 use multiversx_sc::types::BigUint;
 use multiversx_sc_scenario::api::SingleTxApi;
+use scenario_tester::*;
 
 #[test]
 fn st_unit_test() {
diff --git a/contracts/feature-tests/scenario-tester/tests/st_whitebox_test.rs b/contracts/feature-tests/scenario-tester/tests/st_whitebox_test.rs
index c7fddee6cc..072292ed91 100644
--- a/contracts/feature-tests/scenario-tester/tests/st_whitebox_test.rs
+++ b/contracts/feature-tests/scenario-tester/tests/st_whitebox_test.rs
@@ -1,5 +1,5 @@
-use scenario_tester::*;
 use multiversx_sc_scenario::imports::*;
+use scenario_tester::*;
 
 const ADDER_PATH_EXPR: &str = "mxsc:output/scenario-tester.mxsc.json";
 
@@ -7,7 +7,10 @@ fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
     blockchain.set_current_dir_from_workspace("contracts/feature-tests/scenario-tester");
 
-    blockchain.register_contract("mxsc:output/scenario-tester.mxsc.json", scenario_tester::ContractBuilder);
+    blockchain.register_contract(
+        "mxsc:output/scenario-tester.mxsc.json",
+        scenario_tester::ContractBuilder,
+    );
     blockchain
 }
 
diff --git a/framework/scenario/src/facade/world_tx/scenario_env_query.rs b/framework/scenario/src/facade/world_tx/scenario_env_query.rs
index 08246b0f81..387ad0f444 100644
--- a/framework/scenario/src/facade/world_tx/scenario_env_query.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_env_query.rs
@@ -1,6 +1,12 @@
-use std::path::PathBuf;
+use std::{
+    collections::{btree_map::Entry, BTreeMap},
+    path::PathBuf,
+};
 
+use multiversx_chain_scenario_format::interpret_trait::{InterpretableFrom, InterpreterContext};
 use multiversx_sc::{
+    codec::test_util::top_encode_to_vec_u8_or_panic,
+    proxy_imports::TopEncode,
     tuple_util::NestedTupleFlatten,
     types::{
         AnnotatedValue, FunctionCall, ManagedAddress, ManagedBuffer, RHListExec, Tx, TxBaseWithEnv,
@@ -10,8 +16,12 @@ use multiversx_sc::{
 
 use crate::{
     api::StaticApi,
-    scenario::tx_to_step::TxToQueryStep,
-    scenario_model::{TxExpect, TxResponse},
+    scenario::{tx_to_step::TxToQueryStep, ScenarioRunner},
+    scenario_model::{
+        AddressKey, BigUintValue, BytesKey, BytesValue, CheckAccount, CheckEsdt, CheckEsdtData,
+        CheckEsdtInstances, CheckEsdtMap, CheckEsdtMapContents, CheckStateStep, CheckStorage,
+        CheckStorageDetails, CheckValue, TxExpect, TxResponse, U64Value,
+    },
     ScenarioTxEnv, ScenarioTxEnvData, ScenarioTxRun, ScenarioWorld,
 };
 
@@ -83,4 +93,215 @@ impl ScenarioWorld {
         step_wrapper.process_result();
         self
     }
+
+    pub fn check_state_account<A>(&mut self, address: A) -> CheckStateBuilder<'_>
+    where
+        AddressKey: From<A>,
+    {
+        CheckStateBuilder::new(self, address.into())
+    }
+}
+
+pub struct CheckStateBuilder<'w> {
+    world: &'w mut ScenarioWorld,
+    check_state_step: CheckStateStep,
+    current_account: CheckAccount,
+    current_address: AddressKey,
+}
+
+impl<'w> CheckStateBuilder<'w> {
+    pub(crate) fn new(world: &'w mut ScenarioWorld, address: AddressKey) -> CheckStateBuilder<'w> {
+        let mut builder = CheckStateBuilder {
+            world,
+            check_state_step: CheckStateStep::new(),
+            current_account: CheckAccount::new(),
+            current_address: AddressKey::default(),
+        };
+        builder.reset_account(address);
+        builder
+    }
+
+    /// Starts building of a new account.
+    pub fn check_state_account<A>(mut self, address_expr: A) -> Self
+    where
+        AddressKey: From<A>,
+    {
+        self.add_current_acount();
+        self.reset_account(address_expr.into());
+        self
+    }
+
+    fn add_current_acount(&mut self) {
+        if let Entry::Vacant(entry) = self
+            .check_state_step
+            .accounts
+            .accounts
+            .entry(core::mem::take(&mut self.current_address))
+        {
+            entry.insert(core::mem::take(&mut self.current_account));
+        };
+    }
+
+    fn reset_account(&mut self, address: AddressKey) {
+        self.current_address = address;
+        self.current_account = CheckAccount::default();
+    }
+
+    /// Finished and sets all account in the blockchain mock.
+    fn commit_accounts(&mut self) {
+        self.add_current_acount();
+        self.world.run_check_state_step(&self.check_state_step);
+    }
+
+    /// Forces value drop and commit accounts.
+    pub fn commit(self) {}
+
+    pub fn nonce<V>(mut self, nonce: V) -> Self
+    where
+        U64Value: InterpretableFrom<V>,
+    {
+        self.current_account.nonce = CheckValue::Equal(U64Value::interpret_from(
+            nonce,
+            &InterpreterContext::default(),
+        ));
+        self
+    }
+
+    pub fn balance<V>(mut self, balance_expr: V) -> Self
+    where
+        BigUintValue: InterpretableFrom<V>,
+    {
+        self.current_account.balance = CheckValue::Equal(BigUintValue::interpret_from(
+            balance_expr,
+            &InterpreterContext::default(),
+        ));
+        self
+    }
+
+    pub fn code<V>(mut self, code_expr: V) -> Self
+    where
+        BytesValue: InterpretableFrom<V>,
+    {
+        self.current_account.code = CheckValue::Equal(BytesValue::interpret_from(
+            code_expr,
+            &InterpreterContext::default(),
+        ));
+        self
+    }
+
+    pub fn code_metadata<V>(mut self, code_metadata_expr: V) -> Self
+    where
+        BytesValue: InterpretableFrom<V>,
+    {
+        self.current_account.code_metadata = CheckValue::Equal(BytesValue::interpret_from(
+            code_metadata_expr,
+            &InterpreterContext::default(),
+        ));
+        self
+    }
+
+    pub fn esdt_balance<K, V>(mut self, token_id_expr: K, balance_expr: V) -> Self
+    where
+        BytesKey: From<K>,
+        BigUintValue: From<V>,
+    {
+        let token_id = BytesKey::from(token_id_expr);
+        let balance = BigUintValue::from(balance_expr);
+
+        match &mut self.current_account.esdt {
+            CheckEsdtMap::Unspecified | CheckEsdtMap::Star => {
+                let mut new_esdt_map = BTreeMap::new();
+                let _ = new_esdt_map.insert(token_id, CheckEsdt::Short(balance));
+
+                let new_check_esdt_map = CheckEsdtMapContents {
+                    contents: new_esdt_map,
+                    other_esdts_allowed: true,
+                };
+
+                self.current_account.esdt = CheckEsdtMap::Equal(new_check_esdt_map);
+            },
+            CheckEsdtMap::Equal(check_esdt_map) => {
+                if check_esdt_map.contents.contains_key(&token_id) {
+                    let prev_entry = check_esdt_map.contents.get_mut(&token_id).unwrap();
+                    match prev_entry {
+                        CheckEsdt::Short(prev_balance_check) => *prev_balance_check = balance,
+                        CheckEsdt::Full(prev_esdt_check) => match prev_esdt_check.instances {
+                            CheckEsdtInstances::Star => todo!(),
+                            CheckEsdtInstances::Equal(_) => todo!(),
+                        },
+                    }
+                }
+            },
+        }
+
+        self
+    }
+
+    pub fn esdt_nft_balance_and_attributes<K, N, V, T>(
+        mut self,
+        token_id_expr: K,
+        nonce_expr: N,
+        balance_expr: V,
+        attributes_expr: Option<T>,
+    ) -> Self
+    where
+        BytesKey: From<K>,
+        U64Value: From<N>,
+        BigUintValue: From<V>,
+        T: TopEncode,
+    {
+        let token_id = BytesKey::from(token_id_expr);
+
+        if let CheckEsdtMap::Unspecified = &self.current_account.esdt {
+            let mut check_esdt = CheckEsdt::Full(CheckEsdtData::default());
+
+            if let Some(attributes_expr) = attributes_expr {
+                check_esdt.add_balance_and_attributes_check(
+                    nonce_expr,
+                    balance_expr,
+                    top_encode_to_vec_u8_or_panic(&attributes_expr),
+                );
+            } else {
+                check_esdt.add_balance_and_attributes_check(
+                    nonce_expr,
+                    balance_expr,
+                    Vec::<u8>::new(),
+                );
+            }
+
+            let mut new_esdt_map = BTreeMap::new();
+            let _ = new_esdt_map.insert(token_id, check_esdt);
+
+            let new_check_esdt_map = CheckEsdtMapContents {
+                contents: new_esdt_map,
+                other_esdts_allowed: true,
+            };
+
+            self.current_account.esdt = CheckEsdtMap::Equal(new_check_esdt_map);
+        }
+
+        self
+    }
+
+    pub fn check_storage(mut self, key: &str, value: &str) -> Self {
+        let mut details = match &self.current_account.storage {
+            CheckStorage::Star => CheckStorageDetails::default(),
+            CheckStorage::Equal(details) => details.clone(),
+        };
+        details.storages.insert(
+            BytesKey::interpret_from(key, &InterpreterContext::default()),
+            CheckValue::Equal(BytesValue::interpret_from(
+                value,
+                &InterpreterContext::default(),
+            )),
+        );
+        self.current_account.storage = CheckStorage::Equal(details);
+        self
+    }
+}
+
+impl<'w> Drop for CheckStateBuilder<'w> {
+    fn drop(&mut self) {
+        self.commit_accounts();
+    }
 }

From 5bfaca8cfca1c901a80d124506e716e263e8ecd2 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Fri, 12 Apr 2024 12:23:10 +0300
Subject: [PATCH 0701/1254] create expect error

---
 .../tests/pmf_blackbox_test.rs                |  6 ++---
 .../scenario/src/facade/result_handlers.rs    |  6 ++---
 .../{expect_message.rs => expect_error.rs}    |  9 ++++---
 .../facade/result_handlers/expect_status.rs   | 27 -------------------
 4 files changed, 9 insertions(+), 39 deletions(-)
 rename framework/scenario/src/facade/result_handlers/{expect_message.rs => expect_error.rs} (76%)
 delete mode 100644 framework/scenario/src/facade/result_handlers/expect_status.rs

diff --git a/contracts/feature-tests/panic-message-features/tests/pmf_blackbox_test.rs b/contracts/feature-tests/panic-message-features/tests/pmf_blackbox_test.rs
index 3d13175c09..52671b8de3 100644
--- a/contracts/feature-tests/panic-message-features/tests/pmf_blackbox_test.rs
+++ b/contracts/feature-tests/panic-message-features/tests/pmf_blackbox_test.rs
@@ -73,8 +73,7 @@ fn tx_expect_error_test() {
         .to(SC_PMF)
         .typed(pmf_proxy::PanicMessageFeaturesProxy)
         .sc_panic()
-        .with_result(ExpectStatus(4))
-        .with_result(ExpectMessage("sc_panic! test"))
+        .with_result(ExpectError("sc_panic! test", 4))
         .run();
 }
 
@@ -87,7 +86,6 @@ fn query_expect_error_test() {
         .to(SC_PMF)
         .typed(pmf_proxy::PanicMessageFeaturesProxy)
         .sc_panic()
-        .with_result(ExpectStatus(4))
-        .with_result(ExpectMessage("sc_panic! test"))
+        .with_result(ExpectError("sc_panic! test", 4))
         .run();
 }
diff --git a/framework/scenario/src/facade/result_handlers.rs b/framework/scenario/src/facade/result_handlers.rs
index 30823bf6f5..258c47ae62 100644
--- a/framework/scenario/src/facade/result_handlers.rs
+++ b/framework/scenario/src/facade/result_handlers.rs
@@ -1,13 +1,11 @@
-mod expect_message;
-mod expect_status;
+mod expect_error;
 mod returns_message;
 mod returns_new_bech32_address;
 mod returns_new_token_identifier;
 mod returns_status;
 mod with_tx_raw_response;
 
-pub use expect_message::ExpectMessage;
-pub use expect_status::ExpectStatus;
+pub use expect_error::ExpectError;
 pub use returns_message::ReturnsMessage;
 pub use returns_new_bech32_address::ReturnsNewBech32Address;
 pub use returns_new_token_identifier::ReturnsNewTokenIdentifier;
diff --git a/framework/scenario/src/facade/result_handlers/expect_message.rs b/framework/scenario/src/facade/result_handlers/expect_error.rs
similarity index 76%
rename from framework/scenario/src/facade/result_handlers/expect_message.rs
rename to framework/scenario/src/facade/result_handlers/expect_error.rs
index 4f46d05b59..39cb02342c 100644
--- a/framework/scenario/src/facade/result_handlers/expect_message.rs
+++ b/framework/scenario/src/facade/result_handlers/expect_error.rs
@@ -3,19 +3,19 @@ use multiversx_sc::types::{RHListItem, RHListItemExec, TxEnv};
 
 use crate::scenario_model::{BytesValue, CheckValue, TxExpect, TxResponse};
 
-/// Verifies that transaction result message matches the given one.
+/// Verifies that transaction result error matches the given one.
 ///
 /// Can only be used in tests and interactors, not available in contracts.
-pub struct ExpectMessage<'a>(pub &'a str);
+pub struct ExpectError<'a>(pub &'a str, pub u64);
 
-impl<'a, Env, Original> RHListItem<Env, Original> for ExpectMessage<'a>
+impl<'a, Env, Original> RHListItem<Env, Original> for ExpectError<'a>
 where
     Env: TxEnv,
 {
     type Returns = ();
 }
 
-impl<'a, Env, Original> RHListItemExec<TxResponse, Env, Original> for ExpectMessage<'a>
+impl<'a, Env, Original> RHListItemExec<TxResponse, Env, Original> for ExpectError<'a>
 where
     Env: TxEnv<RHExpect = TxExpect>,
 {
@@ -25,6 +25,7 @@ where
             original: ValueSubTree::Str(format!("str:{}", self.0)),
         };
         prev.message = CheckValue::Equal(expect_message_expr);
+        prev.status = CheckValue::Equal(self.1.into());
         prev
     }
 
diff --git a/framework/scenario/src/facade/result_handlers/expect_status.rs b/framework/scenario/src/facade/result_handlers/expect_status.rs
deleted file mode 100644
index 127982739b..0000000000
--- a/framework/scenario/src/facade/result_handlers/expect_status.rs
+++ /dev/null
@@ -1,27 +0,0 @@
-use multiversx_sc::types::{RHListItem, RHListItemExec, TxEnv};
-
-use crate::scenario_model::{CheckValue, TxExpect, TxResponse};
-
-/// Verifies that transaction result status matches the given one.
-///
-/// Can only be used in tests and interactors, not available in contracts.
-pub struct ExpectStatus(pub u64);
-
-impl<Env, Original> RHListItem<Env, Original> for ExpectStatus
-where
-    Env: TxEnv,
-{
-    type Returns = ();
-}
-
-impl<Env, Original> RHListItemExec<TxResponse, Env, Original> for ExpectStatus
-where
-    Env: TxEnv<RHExpect = TxExpect>,
-{
-    fn item_tx_expect(&self, mut prev: TxExpect) -> TxExpect {
-        prev.status = CheckValue::Equal(self.0.into());
-        prev
-    }
-
-    fn item_process_result(self, _: &TxResponse) -> Self::Returns {}
-}

From 1d476eb24771b5a4f8e9106ce91d311c664366a6 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Fri, 12 Apr 2024 11:39:50 +0200
Subject: [PATCH 0702/1254] set state builder impl, tests and fmt

---
 .../scenario-tester/tests/st_blackbox_test.rs |  57 ++++-
 .../tests/st_blackbox_upgrade_test.rs         |   5 +-
 .../tests/st_scenario_rs_test.rs              |   5 +-
 .../scenario-tester/tests/st_unit_test.rs     |   2 +-
 .../scenario-tester/tests/st_whitebox_test.rs |   7 +-
 .../src/facade/world_tx/scenario_env_exec.rs  | 242 +++++++++++++++++-
 6 files changed, 297 insertions(+), 21 deletions(-)

diff --git a/contracts/feature-tests/scenario-tester/tests/st_blackbox_test.rs b/contracts/feature-tests/scenario-tester/tests/st_blackbox_test.rs
index b3eafe218b..fafc3c9090 100644
--- a/contracts/feature-tests/scenario-tester/tests/st_blackbox_test.rs
+++ b/contracts/feature-tests/scenario-tester/tests/st_blackbox_test.rs
@@ -1,19 +1,23 @@
-use multiversx_sc_scenario::imports::*;
+use multiversx_sc_scenario::{imports::*, scenario_model::U64Value};
 use num_bigint::BigUint;
 
 use scenario_tester::*;
 
-const ADDER_PATH_EXPR: &str = "mxsc:output/scenario-tester.mxsc.json";
+const SC_SCENARIO_TESTER_PATH_EXPR: &str = "mxsc:output/scenario-tester.mxsc.json";
 
 const OWNER: AddressExpr = AddressExpr("owner");
-const SC_ADDER: ScExpr = ScExpr("scenario-tester");
+const OTHER: AddressExpr = AddressExpr("other");
+const SC_SCENARIO_TESTER: ScExpr = ScExpr("scenario-tester");
 const CODE_EXPR: MxscExpr = MxscExpr("output/scenario-tester.mxsc.json");
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
     blockchain.set_current_dir_from_workspace("contracts/examples/scenario-tester");
 
-    blockchain.register_contract(ADDER_PATH_EXPR, scenario_tester::ContractBuilder);
+    blockchain.register_contract(
+        SC_SCENARIO_TESTER_PATH_EXPR,
+        scenario_tester::ContractBuilder,
+    );
     blockchain
 }
 
@@ -21,16 +25,41 @@ fn world() -> ScenarioWorld {
 fn st_blackbox() {
     let mut world = world();
     let owner_address = "address:owner";
+    let other_address = "address:other";
+
     let st_contract = ContractInfo::<scenario_tester::Proxy<StaticApi>>::new("sc:scenario-tester");
 
     world.start_trace();
 
-    world.set_state_step(
-        SetStateStep::new()
-            .put_account(owner_address, Account::new().nonce(1))
-            .new_address(owner_address, 1, "sc:scenario-tester"),
+    world
+        .account(owner_address)
+        .nonce(1)
+        .balance("100")
+        .account(other_address)
+        .nonce(2)
+        .balance("300")
+        .esdt_balance("str:TOKEN-123456", "500")
+        .commit();
+
+    world.check_state_step(
+        CheckStateStep::new()
+            .put_account(
+                owner_address,
+                CheckAccount::new()
+                    .nonce(U64Value::from(1u64))
+                    .balance("100"),
+            )
+            .put_account(
+                other_address,
+                CheckAccount::new()
+                    .nonce(U64Value::from(2u64))
+                    .balance("300")
+                    .esdt_balance("str:TOKEN-123456", "500"),
+            ),
     );
 
+    world.set_state_step(SetStateStep::new().new_address(owner_address, 1, "sc:scenario-tester"));
+
     let new_address = world
         .tx()
         .from(OWNER)
@@ -44,7 +73,7 @@ fn st_blackbox() {
 
     let value = world
         .query()
-        .to(SC_ADDER)
+        .to(SC_SCENARIO_TESTER)
         .typed(scenario_tester_proxy::ScenarioTesterProxy)
         .sum()
         .returns(ReturnsResultConv::<BigUint>::new())
@@ -54,7 +83,7 @@ fn st_blackbox() {
     world
         .tx()
         .from(OWNER)
-        .to(SC_ADDER)
+        .to(SC_SCENARIO_TESTER)
         .typed(scenario_tester_proxy::ScenarioTesterProxy)
         .add(1u32)
         .run();
@@ -68,5 +97,13 @@ fn st_blackbox() {
             ),
     );
 
+    world
+        .tx()
+        .from(OTHER)
+        .to(SC_SCENARIO_TESTER)
+        .typed(scenario_tester_proxy::ScenarioTesterProxy)
+        .add(1u32)
+        .run();
+
     world.write_scenario_trace("trace1.scen.json");
 }
diff --git a/contracts/feature-tests/scenario-tester/tests/st_blackbox_upgrade_test.rs b/contracts/feature-tests/scenario-tester/tests/st_blackbox_upgrade_test.rs
index 081f6037ba..786fea9725 100644
--- a/contracts/feature-tests/scenario-tester/tests/st_blackbox_upgrade_test.rs
+++ b/contracts/feature-tests/scenario-tester/tests/st_blackbox_upgrade_test.rs
@@ -6,7 +6,10 @@ fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
     blockchain.set_current_dir_from_workspace("contracts/feature-tests/scenario-tester");
 
-    blockchain.register_contract("mxsc:output/scenario-tester.mxsc.json", scenario_tester::ContractBuilder);
+    blockchain.register_contract(
+        "mxsc:output/scenario-tester.mxsc.json",
+        scenario_tester::ContractBuilder,
+    );
     blockchain
 }
 
diff --git a/contracts/feature-tests/scenario-tester/tests/st_scenario_rs_test.rs b/contracts/feature-tests/scenario-tester/tests/st_scenario_rs_test.rs
index c92fdaa1e0..32f289733d 100644
--- a/contracts/feature-tests/scenario-tester/tests/st_scenario_rs_test.rs
+++ b/contracts/feature-tests/scenario-tester/tests/st_scenario_rs_test.rs
@@ -4,7 +4,10 @@ fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
     blockchain.set_current_dir_from_workspace("contracts/feature-tests/scenario-tester");
 
-    blockchain.register_contract("mxsc:output/scenario-tester.mxsc.json", scenario_tester::ContractBuilder);
+    blockchain.register_contract(
+        "mxsc:output/scenario-tester.mxsc.json",
+        scenario_tester::ContractBuilder,
+    );
     blockchain
 }
 
diff --git a/contracts/feature-tests/scenario-tester/tests/st_unit_test.rs b/contracts/feature-tests/scenario-tester/tests/st_unit_test.rs
index 2c099f53e9..e9b418dfad 100644
--- a/contracts/feature-tests/scenario-tester/tests/st_unit_test.rs
+++ b/contracts/feature-tests/scenario-tester/tests/st_unit_test.rs
@@ -1,6 +1,6 @@
-use scenario_tester::*;
 use multiversx_sc::types::BigUint;
 use multiversx_sc_scenario::api::SingleTxApi;
+use scenario_tester::*;
 
 #[test]
 fn st_unit_test() {
diff --git a/contracts/feature-tests/scenario-tester/tests/st_whitebox_test.rs b/contracts/feature-tests/scenario-tester/tests/st_whitebox_test.rs
index c7fddee6cc..072292ed91 100644
--- a/contracts/feature-tests/scenario-tester/tests/st_whitebox_test.rs
+++ b/contracts/feature-tests/scenario-tester/tests/st_whitebox_test.rs
@@ -1,5 +1,5 @@
-use scenario_tester::*;
 use multiversx_sc_scenario::imports::*;
+use scenario_tester::*;
 
 const ADDER_PATH_EXPR: &str = "mxsc:output/scenario-tester.mxsc.json";
 
@@ -7,7 +7,10 @@ fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
     blockchain.set_current_dir_from_workspace("contracts/feature-tests/scenario-tester");
 
-    blockchain.register_contract("mxsc:output/scenario-tester.mxsc.json", scenario_tester::ContractBuilder);
+    blockchain.register_contract(
+        "mxsc:output/scenario-tester.mxsc.json",
+        scenario_tester::ContractBuilder,
+    );
     blockchain
 }
 
diff --git a/framework/scenario/src/facade/world_tx/scenario_env_exec.rs b/framework/scenario/src/facade/world_tx/scenario_env_exec.rs
index 3c292bd650..29d4b390c6 100644
--- a/framework/scenario/src/facade/world_tx/scenario_env_exec.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_env_exec.rs
@@ -1,19 +1,23 @@
-use std::path::PathBuf;
+use std::{collections::btree_map::Entry, ops::Add, path::PathBuf};
 
 use multiversx_chain_scenario_format::serde_raw::ValueSubTree;
 use multiversx_sc::{
     tuple_util::NestedTupleFlatten,
     types::{
-        AnnotatedValue, Code, DeployCall, FunctionCall, ManagedAddress, ManagedBuffer, RHListExec,
-        Tx, TxBaseWithEnv, TxCodeSource, TxCodeSourceSpecified, TxCodeValue, TxEnv,
-        TxFromSpecified, TxGas, TxPayment, TxToSpecified,
+        Address, AddressExpr, AnnotatedValue, Code, DeployCall, FunctionCall, ManagedAddress,
+        ManagedBuffer, RHListExec, Tx, TxBaseWithEnv, TxCodeSource, TxCodeSourceSpecified,
+        TxCodeValue, TxEnv, TxFromSpecified, TxGas, TxPayment, TxTo, TxToSpecified,
     },
 };
+use serde_json::map::OccupiedEntry;
 
 use crate::{
     api::StaticApi,
-    scenario::tx_to_step::TxToStep,
-    scenario_model::{AddressValue, BytesValue, ScCallStep, ScDeployStep, TxExpect, TxResponse},
+    scenario::{tx_to_step::TxToStep, ScenarioRunner},
+    scenario_model::{
+        Account, AddressKey, AddressValue, BigUintValue, BytesKey, BytesValue, Esdt, EsdtObject,
+        NewAddress, ScCallStep, ScDeployStep, SetStateStep, TxExpect, TxResponse, U64Value,
+    },
     ScenarioTxEnv, ScenarioTxRun, ScenarioWorld,
 };
 
@@ -95,4 +99,230 @@ impl ScenarioWorld {
         step_wrapper.process_result();
         self
     }
+
+    pub fn account<A>(&mut self, address_expr: A) -> SetStateBuilder<'_>
+    where
+        AddressKey: From<A>,
+    {
+        SetStateBuilder::new(self, address_expr.into())
+    }
+}
+
+pub struct SetStateBuilder<'w> {
+    world: &'w mut ScenarioWorld,
+    set_state_step: SetStateStep,
+    current_account: Account,
+    current_address: AddressKey,
+}
+
+impl<'w> SetStateBuilder<'w> {
+    pub(crate) fn new(world: &'w mut ScenarioWorld, address: AddressKey) -> SetStateBuilder<'w> {
+        let mut builder = SetStateBuilder {
+            world,
+            set_state_step: SetStateStep::new(),
+            current_address: AddressKey::default(),
+            current_account: Account::new(),
+        };
+        builder.reset_account(address);
+        builder
+    }
+
+    fn add_current_acount(&mut self) {
+        if let Entry::Vacant(entry) = self
+            .set_state_step
+            .accounts
+            .entry(core::mem::take(&mut self.current_address))
+        {
+            entry.insert(core::mem::take(&mut self.current_account));
+        };
+    }
+
+    fn reset_account(&mut self, address: AddressKey) {
+        // assert!(
+        //     self.world
+        //         .get_debugger_backend()
+        //         .vm_runner
+        //         .blockchain_mock
+        //         .state
+        //         .account_exists(&address.to_vm_address()),
+        //     "updating existing accounts currently not supported"
+        // );
+
+        self.current_address = address;
+        self.current_account = Account::default();
+    }
+
+    /// Starts building of a new account.
+    pub fn account<A>(mut self, address_expr: A) -> Self
+    where
+        AddressKey: From<A>,
+    {
+        self.add_current_acount();
+        self.reset_account(address_expr.into());
+        self
+    }
+
+    /// Finished and sets all account in the blockchain mock.
+    fn commit_accounts(&mut self) {
+        self.add_current_acount();
+        self.world.run_set_state_step(&self.set_state_step);
+    }
+
+    /// Forces value drop and commit accounts.
+    pub fn commit(self) {}
+
+    pub fn nonce<V>(mut self, nonce: V) -> Self
+    where
+        U64Value: From<V>,
+    {
+        self.current_account.nonce = Some(U64Value::from(nonce));
+        self
+    }
+
+    pub fn balance<V>(mut self, balance_expr: V) -> Self
+    where
+        BigUintValue: From<V>,
+    {
+        self.current_account.balance = Some(BigUintValue::from(balance_expr));
+        self
+    }
+
+    pub fn esdt_balance<K, V>(mut self, token_id_expr: K, balance_expr: V) -> Self
+    where
+        BytesKey: From<K>,
+        BigUintValue: From<V>,
+    {
+        let token_id = BytesKey::from(token_id_expr);
+        let esdt_data_ref = self.get_esdt_data_or_create(&token_id);
+        esdt_data_ref.set_balance(0u64, balance_expr);
+
+        self
+    }
+
+    pub fn esdt_nft_balance<K, N, V, T>(
+        mut self,
+        token_id_expr: K,
+        nonce_expr: N,
+        balance_expr: V,
+        opt_attributes_expr: Option<T>,
+    ) -> Self
+    where
+        N: Clone,
+        BytesKey: From<K>,
+        U64Value: From<N>,
+        BigUintValue: From<V>,
+        BytesValue: From<T>,
+    {
+        let token_id = BytesKey::from(token_id_expr);
+
+        let esdt_obj_ref = self
+            .get_esdt_data_or_create(&token_id)
+            .get_mut_esdt_object();
+        esdt_obj_ref.set_balance(nonce_expr.clone(), balance_expr);
+
+        if let Some(attributes_expr) = opt_attributes_expr {
+            esdt_obj_ref.set_token_attributes(nonce_expr, attributes_expr);
+        }
+
+        self
+    }
+
+    #[allow(clippy::too_many_arguments)]
+    pub fn esdt_nft_all_properties<K, N, V, T>(
+        mut self,
+        token_id_expr: K,
+        nonce_expr: N,
+        balance_expr: V,
+        opt_attributes_expr: Option<T>,
+        royalties_expr: N,
+        creator_expr: Option<T>,
+        hash_expr: Option<T>,
+        uris_expr: Vec<T>,
+    ) -> Self
+    where
+        BytesKey: From<K>,
+        U64Value: From<N>,
+        BigUintValue: From<V>,
+        BytesValue: From<T>,
+    {
+        let token_id = BytesKey::from(token_id_expr);
+
+        let esdt_obj_ref = self
+            .get_esdt_data_or_create(&token_id)
+            .get_mut_esdt_object();
+
+        esdt_obj_ref.set_token_all_properties(
+            nonce_expr,
+            balance_expr,
+            opt_attributes_expr,
+            royalties_expr,
+            creator_expr,
+            hash_expr,
+            uris_expr,
+        );
+
+        self
+    }
+
+    pub fn esdt_nft_last_nonce<K, N>(mut self, token_id_expr: K, last_nonce_expr: N) -> Self
+    where
+        BytesKey: From<K>,
+        U64Value: From<N>,
+    {
+        let token_id = BytesKey::from(token_id_expr);
+
+        let esdt_obj_ref = self
+            .get_esdt_data_or_create(&token_id)
+            .get_mut_esdt_object();
+        esdt_obj_ref.set_last_nonce(last_nonce_expr);
+
+        self
+    }
+
+    // TODO: Find a better way to pass roles
+    pub fn esdt_roles<K>(mut self, token_id_expr: K, roles: Vec<String>) -> Self
+    where
+        BytesKey: From<K>,
+    {
+        let token_id = BytesKey::from(token_id_expr);
+
+        let esdt_obj_ref = self
+            .get_esdt_data_or_create(&token_id)
+            .get_mut_esdt_object();
+        esdt_obj_ref.set_roles(roles);
+
+        self
+    }
+
+    fn get_esdt_data_or_create(&mut self, token_id: &BytesKey) -> &mut Esdt {
+        if !self.current_account.esdt.contains_key(token_id) {
+            self.current_account
+                .esdt
+                .insert(token_id.clone(), Esdt::Full(EsdtObject::default()));
+        }
+
+        self.current_account.esdt.get_mut(token_id).unwrap()
+    }
+
+    pub fn code<V>(mut self, code_expr: V) -> Self
+    where
+        BytesValue: From<V>,
+    {
+        self.current_account.code = Some(BytesValue::from(code_expr));
+        self
+    }
+
+    pub fn owner<V>(mut self, owner_expr: V) -> Self
+    where
+        AddressValue: From<V>,
+    {
+        self.current_account.owner = Some(AddressValue::from(owner_expr));
+        self
+    }
+}
+
+impl<'w> Drop for SetStateBuilder<'w> {
+    fn drop(&mut self) {
+        self.commit_accounts();
+    }
 }

From 8f9614c406f7d212a4702845547e350ea324c7c8 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Fri, 12 Apr 2024 12:46:05 +0200
Subject: [PATCH 0703/1254] decomment condition searching for existing account

---
 .../src/facade/world_tx/scenario_env_exec.rs  | 19 ++++++++++---------
 vm/src/world_mock/blockchain_state.rs         |  3 +--
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/framework/scenario/src/facade/world_tx/scenario_env_exec.rs b/framework/scenario/src/facade/world_tx/scenario_env_exec.rs
index 29d4b390c6..5eef522784 100644
--- a/framework/scenario/src/facade/world_tx/scenario_env_exec.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_env_exec.rs
@@ -138,15 +138,16 @@ impl<'w> SetStateBuilder<'w> {
     }
 
     fn reset_account(&mut self, address: AddressKey) {
-        // assert!(
-        //     self.world
-        //         .get_debugger_backend()
-        //         .vm_runner
-        //         .blockchain_mock
-        //         .state
-        //         .account_exists(&address.to_vm_address()),
-        //     "updating existing accounts currently not supported"
-        // );
+        assert!(
+            !self
+                .world
+                .get_debugger_backend()
+                .vm_runner
+                .blockchain_mock
+                .state
+                .account_exists(&address.to_vm_address()),
+            "updating existing accounts currently not supported"
+        );
 
         self.current_address = address;
         self.current_account = Account::default();
diff --git a/vm/src/world_mock/blockchain_state.rs b/vm/src/world_mock/blockchain_state.rs
index 28a339f54b..6890517215 100644
--- a/vm/src/world_mock/blockchain_state.rs
+++ b/vm/src/world_mock/blockchain_state.rs
@@ -1,7 +1,6 @@
-use std::{collections::HashMap, fmt::Debug};
-
 use num_bigint::BigUint;
 use num_traits::Zero;
+use std::{collections::HashMap, fmt::Debug};
 
 use crate::{tx_mock::BlockchainUpdate, types::VMAddress};
 

From 1077bbe7cc10220aa2a55883c7e61b49e863e2e9 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Fri, 12 Apr 2024 14:45:34 +0300
Subject: [PATCH 0704/1254] fix review

---
 .../tests/pmf_blackbox_test.rs                |  8 +++--
 .../scenario/src/facade/result_handlers.rs    |  4 +++
 .../facade/result_handlers/expect_error.rs    |  8 ++---
 .../facade/result_handlers/expect_message.rs  | 32 +++++++++++++++++++
 .../facade/result_handlers/expect_status.rs   | 27 ++++++++++++++++
 5 files changed, 73 insertions(+), 6 deletions(-)
 create mode 100644 framework/scenario/src/facade/result_handlers/expect_message.rs
 create mode 100644 framework/scenario/src/facade/result_handlers/expect_status.rs

diff --git a/contracts/feature-tests/panic-message-features/tests/pmf_blackbox_test.rs b/contracts/feature-tests/panic-message-features/tests/pmf_blackbox_test.rs
index 52671b8de3..28499c0e84 100644
--- a/contracts/feature-tests/panic-message-features/tests/pmf_blackbox_test.rs
+++ b/contracts/feature-tests/panic-message-features/tests/pmf_blackbox_test.rs
@@ -73,7 +73,9 @@ fn tx_expect_error_test() {
         .to(SC_PMF)
         .typed(pmf_proxy::PanicMessageFeaturesProxy)
         .sc_panic()
-        .with_result(ExpectError("sc_panic! test", 4))
+        .with_result(ExpectStatus(4))
+        .with_result(ExpectMessage("sc_panic! test"))
+        .with_result(ExpectError(4, "sc_panic! test"))
         .run();
 }
 
@@ -86,6 +88,8 @@ fn query_expect_error_test() {
         .to(SC_PMF)
         .typed(pmf_proxy::PanicMessageFeaturesProxy)
         .sc_panic()
-        .with_result(ExpectError("sc_panic! test", 4))
+        .with_result(ExpectStatus(4))
+        .with_result(ExpectMessage("sc_panic! test"))
+        .with_result(ExpectError(4, "sc_panic! test"))
         .run();
 }
diff --git a/framework/scenario/src/facade/result_handlers.rs b/framework/scenario/src/facade/result_handlers.rs
index 258c47ae62..24709626ea 100644
--- a/framework/scenario/src/facade/result_handlers.rs
+++ b/framework/scenario/src/facade/result_handlers.rs
@@ -1,4 +1,6 @@
 mod expect_error;
+mod expect_message;
+mod expect_status;
 mod returns_message;
 mod returns_new_bech32_address;
 mod returns_new_token_identifier;
@@ -6,6 +8,8 @@ mod returns_status;
 mod with_tx_raw_response;
 
 pub use expect_error::ExpectError;
+pub use expect_message::ExpectMessage;
+pub use expect_status::ExpectStatus;
 pub use returns_message::ReturnsMessage;
 pub use returns_new_bech32_address::ReturnsNewBech32Address;
 pub use returns_new_token_identifier::ReturnsNewTokenIdentifier;
diff --git a/framework/scenario/src/facade/result_handlers/expect_error.rs b/framework/scenario/src/facade/result_handlers/expect_error.rs
index 39cb02342c..a06a227424 100644
--- a/framework/scenario/src/facade/result_handlers/expect_error.rs
+++ b/framework/scenario/src/facade/result_handlers/expect_error.rs
@@ -6,7 +6,7 @@ use crate::scenario_model::{BytesValue, CheckValue, TxExpect, TxResponse};
 /// Verifies that transaction result error matches the given one.
 ///
 /// Can only be used in tests and interactors, not available in contracts.
-pub struct ExpectError<'a>(pub &'a str, pub u64);
+pub struct ExpectError<'a>(pub u64, pub &'a str);
 
 impl<'a, Env, Original> RHListItem<Env, Original> for ExpectError<'a>
 where
@@ -20,12 +20,12 @@ where
     Env: TxEnv<RHExpect = TxExpect>,
 {
     fn item_tx_expect(&self, mut prev: TxExpect) -> TxExpect {
+        prev.status = CheckValue::Equal(self.0.into());
         let expect_message_expr = BytesValue {
-            value: self.0.to_string().into_bytes(),
-            original: ValueSubTree::Str(format!("str:{}", self.0)),
+            value: self.1.to_string().into_bytes(),
+            original: ValueSubTree::Str(format!("str:{}", self.1)),
         };
         prev.message = CheckValue::Equal(expect_message_expr);
-        prev.status = CheckValue::Equal(self.1.into());
         prev
     }
 
diff --git a/framework/scenario/src/facade/result_handlers/expect_message.rs b/framework/scenario/src/facade/result_handlers/expect_message.rs
new file mode 100644
index 0000000000..4f46d05b59
--- /dev/null
+++ b/framework/scenario/src/facade/result_handlers/expect_message.rs
@@ -0,0 +1,32 @@
+use multiversx_chain_scenario_format::serde_raw::ValueSubTree;
+use multiversx_sc::types::{RHListItem, RHListItemExec, TxEnv};
+
+use crate::scenario_model::{BytesValue, CheckValue, TxExpect, TxResponse};
+
+/// Verifies that transaction result message matches the given one.
+///
+/// Can only be used in tests and interactors, not available in contracts.
+pub struct ExpectMessage<'a>(pub &'a str);
+
+impl<'a, Env, Original> RHListItem<Env, Original> for ExpectMessage<'a>
+where
+    Env: TxEnv,
+{
+    type Returns = ();
+}
+
+impl<'a, Env, Original> RHListItemExec<TxResponse, Env, Original> for ExpectMessage<'a>
+where
+    Env: TxEnv<RHExpect = TxExpect>,
+{
+    fn item_tx_expect(&self, mut prev: TxExpect) -> TxExpect {
+        let expect_message_expr = BytesValue {
+            value: self.0.to_string().into_bytes(),
+            original: ValueSubTree::Str(format!("str:{}", self.0)),
+        };
+        prev.message = CheckValue::Equal(expect_message_expr);
+        prev
+    }
+
+    fn item_process_result(self, _: &TxResponse) -> Self::Returns {}
+}
diff --git a/framework/scenario/src/facade/result_handlers/expect_status.rs b/framework/scenario/src/facade/result_handlers/expect_status.rs
new file mode 100644
index 0000000000..127982739b
--- /dev/null
+++ b/framework/scenario/src/facade/result_handlers/expect_status.rs
@@ -0,0 +1,27 @@
+use multiversx_sc::types::{RHListItem, RHListItemExec, TxEnv};
+
+use crate::scenario_model::{CheckValue, TxExpect, TxResponse};
+
+/// Verifies that transaction result status matches the given one.
+///
+/// Can only be used in tests and interactors, not available in contracts.
+pub struct ExpectStatus(pub u64);
+
+impl<Env, Original> RHListItem<Env, Original> for ExpectStatus
+where
+    Env: TxEnv,
+{
+    type Returns = ();
+}
+
+impl<Env, Original> RHListItemExec<TxResponse, Env, Original> for ExpectStatus
+where
+    Env: TxEnv<RHExpect = TxExpect>,
+{
+    fn item_tx_expect(&self, mut prev: TxExpect) -> TxExpect {
+        prev.status = CheckValue::Equal(self.0.into());
+        prev
+    }
+
+    fn item_process_result(self, _: &TxResponse) -> Self::Returns {}
+}

From 011cbc26bc467f72f96e4745b362e460cafa5457 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Fri, 12 Apr 2024 14:01:04 +0200
Subject: [PATCH 0705/1254] added separate set state test

---
 .../scenario-tester/tests/st_blackbox_test.rs | 105 ++++++++++++++++++
 1 file changed, 105 insertions(+)

diff --git a/contracts/feature-tests/scenario-tester/tests/st_blackbox_test.rs b/contracts/feature-tests/scenario-tester/tests/st_blackbox_test.rs
index fafc3c9090..a14184d47c 100644
--- a/contracts/feature-tests/scenario-tester/tests/st_blackbox_test.rs
+++ b/contracts/feature-tests/scenario-tester/tests/st_blackbox_test.rs
@@ -107,3 +107,108 @@ fn st_blackbox() {
 
     world.write_scenario_trace("trace1.scen.json");
 }
+
+#[test]
+fn set_state_test() {
+    let mut world = world();
+    let first = "address:first";
+    let second = "address:second";
+    let third = "address:third";
+    let fourth = "address:fourth";
+    let fifth = "address:fifth";
+    let sixth = "address:sixth";
+
+    world.start_trace();
+
+    world
+        .account(first)
+        .nonce(1)
+        .balance("100")
+        .account(second)
+        .nonce(2)
+        .balance("300")
+        .esdt_balance("str:TOKEN-123456", "500")
+        .commit();
+
+    world.check_state_step(
+        CheckStateStep::new()
+            .put_account(
+                first,
+                CheckAccount::new()
+                    .nonce(U64Value::from(1u64))
+                    .balance("100"),
+            )
+            .put_account(
+                second,
+                CheckAccount::new()
+                    .nonce(U64Value::from(2u64))
+                    .balance("300")
+                    .esdt_balance("str:TOKEN-123456", "500"),
+            ),
+    );
+
+    world
+        .account(third)
+        .nonce(3)
+        .balance("50")
+        .esdt_nft_balance("str:NFT-123456", "2", "1", Some(Vec::<u8>::new()))
+        .commit();
+
+    world.check_state_step(
+        CheckStateStep::new().put_account(
+            third,
+            CheckAccount::new()
+                .nonce(U64Value::from(3u64))
+                .balance("50")
+                .esdt_nft_balance_and_attributes(
+                    "str:NFT-123456",
+                    "2",
+                    "1",
+                    Some(Vec::<u8>::new()),
+                ),
+        ),
+    );
+
+    // using no commit should drop the value naturally
+    world
+        .account(fourth)
+        .nonce(4)
+        .balance("400")
+        .account(fifth)
+        .nonce(5)
+        .balance("250")
+        .esdt_balance("str:TOKEN-123456", "2");
+
+    world.check_state_step(
+        CheckStateStep::new()
+            .put_account(
+                fourth,
+                CheckAccount::new()
+                    .nonce(U64Value::from(4u64))
+                    .balance("400"),
+            )
+            .put_account(
+                fifth,
+                CheckAccount::new()
+                    .nonce(U64Value::from(5u64))
+                    .balance("250")
+                    .esdt_balance("str:TOKEN-123456", "2"),
+            ),
+    );
+
+    world
+        .account(sixth)
+        .nonce(6)
+        .balance("600")
+        .esdt_balance("str:TOKEN-123456", "60");
+
+    world.check_state_step(
+        CheckStateStep::new().put_account(
+            sixth,
+            CheckAccount::new()
+                .nonce(U64Value::from(6u64))
+                .balance("600")
+                .esdt_balance("str:TOKEN-123456", "60"),
+        ),
+    );
+}

From 974c23e12bd95b8d8134e045607254196e7cbc91 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 12 Apr 2024 13:49:39 +0300
Subject: [PATCH 0706/1254] legacy ESDTSystemSmartContractProxy made public

---
 framework/base/src/types/interaction/system_proxy.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/framework/base/src/types/interaction/system_proxy.rs b/framework/base/src/types/interaction/system_proxy.rs
index d9ca05198d..3b1fb836d6 100644
--- a/framework/base/src/types/interaction/system_proxy.rs
+++ b/framework/base/src/types/interaction/system_proxy.rs
@@ -5,5 +5,6 @@ mod legacy_system_sc_proxy;
 pub(crate) mod token_properties;
 
 pub use builtin_func_proxy::*;
-pub use esdt_system_sc_proxy::*;
+pub use esdt_system_sc_proxy::{ESDTSystemSCProxy, ESDTSystemSCProxyMethods, IssueCall};
+pub use legacy_system_sc_proxy::ESDTSystemSmartContractProxy;
 pub use token_properties::*;

From 0429cefb8eed04fbf7ac0b0607e9f3a09fef6779 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 12 Apr 2024 15:21:15 +0300
Subject: [PATCH 0707/1254] forwarder-legacy (adapted from master)

---
 Cargo.lock                                    |  18 ++
 Cargo.toml                                    |  12 +-
 .../feature-tests/composability/Cargo.toml    |   3 +
 .../composability/forwarder-legacy/Cargo.toml |  21 ++
 .../forwarder-legacy/meta/Cargo.toml          |  13 +
 .../forwarder-legacy/meta/src/main.rs         |   3 +
 .../forwarder-legacy/multiversx.json          |   3 +
 .../forwarder-legacy/src/call_async_legacy.rs | 229 ++++++++++++++
 .../forwarder-legacy/src/call_sync_legacy.rs  | 173 ++++++++++
 .../src/call_transf_exec_legacy.rs            | 155 +++++++++
 .../src/contract_change_owner_legacy.rs       |  28 ++
 .../src/contract_deploy_legacy.rs             |  55 ++++
 .../src/contract_upgrade_legacy.rs            |  31 ++
 .../forwarder-legacy/src/esdt_legacy.rs       | 215 +++++++++++++
 .../src/forwarder_legacy_main.rs              |  41 +++
 .../forwarder-legacy/src/nft_legacy.rs        | 296 ++++++++++++++++++
 .../forwarder-legacy/src/roles_legacy.rs      |  48 +++
 .../forwarder-legacy/src/sft_legacy.rs        |  57 ++++
 .../forwarder-legacy/src/storage_legacy.rs    |  12 +
 .../tests/forwarder_blackbox_legacy_test.rs   | 140 +++++++++
 .../tests/forwarder_blackbox_test.rs          |   0
 .../tests/forwarder_whitebox_legacy_test.rs   | 118 +++++++
 .../tests/forwarder_whitebox_test.rs          |   0
 23 files changed, 1665 insertions(+), 6 deletions(-)
 create mode 100644 contracts/feature-tests/composability/forwarder-legacy/Cargo.toml
 create mode 100644 contracts/feature-tests/composability/forwarder-legacy/meta/Cargo.toml
 create mode 100644 contracts/feature-tests/composability/forwarder-legacy/meta/src/main.rs
 create mode 100644 contracts/feature-tests/composability/forwarder-legacy/multiversx.json
 create mode 100644 contracts/feature-tests/composability/forwarder-legacy/src/call_async_legacy.rs
 create mode 100644 contracts/feature-tests/composability/forwarder-legacy/src/call_sync_legacy.rs
 create mode 100644 contracts/feature-tests/composability/forwarder-legacy/src/call_transf_exec_legacy.rs
 create mode 100644 contracts/feature-tests/composability/forwarder-legacy/src/contract_change_owner_legacy.rs
 create mode 100644 contracts/feature-tests/composability/forwarder-legacy/src/contract_deploy_legacy.rs
 create mode 100644 contracts/feature-tests/composability/forwarder-legacy/src/contract_upgrade_legacy.rs
 create mode 100644 contracts/feature-tests/composability/forwarder-legacy/src/esdt_legacy.rs
 create mode 100644 contracts/feature-tests/composability/forwarder-legacy/src/forwarder_legacy_main.rs
 create mode 100644 contracts/feature-tests/composability/forwarder-legacy/src/nft_legacy.rs
 create mode 100644 contracts/feature-tests/composability/forwarder-legacy/src/roles_legacy.rs
 create mode 100644 contracts/feature-tests/composability/forwarder-legacy/src/sft_legacy.rs
 create mode 100644 contracts/feature-tests/composability/forwarder-legacy/src/storage_legacy.rs
 create mode 100644 contracts/feature-tests/composability/tests/forwarder_blackbox_legacy_test.rs
 rename contracts/feature-tests/composability/{forwarder => }/tests/forwarder_blackbox_test.rs (100%)
 create mode 100644 contracts/feature-tests/composability/tests/forwarder_whitebox_legacy_test.rs
 rename contracts/feature-tests/composability/{forwarder => }/tests/forwarder_whitebox_test.rs (100%)

diff --git a/Cargo.lock b/Cargo.lock
index b111db8536..a0fb9cfca9 100755
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -469,6 +469,7 @@ version = "0.0.0"
 dependencies = [
  "builtin-func-features",
  "forwarder",
+ "forwarder-legacy",
  "forwarder-queue",
  "forwarder-raw",
  "multiversx-sc",
@@ -1037,6 +1038,23 @@ dependencies = [
  "vault",
 ]
 
+[[package]]
+name = "forwarder-legacy"
+version = "0.0.0"
+dependencies = [
+ "multiversx-sc",
+ "multiversx-sc-scenario",
+ "vault",
+]
+
+[[package]]
+name = "forwarder-legacy-meta"
+version = "0.0.0"
+dependencies = [
+ "forwarder-legacy",
+ "multiversx-sc-meta",
+]
+
 [[package]]
 name = "forwarder-meta"
 version = "0.0.0"
diff --git a/Cargo.toml b/Cargo.toml
index 459624af85..8554af9b00 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -125,6 +125,8 @@ members = [
   "contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/child/meta",
   "contracts/feature-tests/composability/forwarder",
   "contracts/feature-tests/composability/forwarder/meta",
+  "contracts/feature-tests/composability/forwarder-legacy",
+  "contracts/feature-tests/composability/forwarder-legacy/meta",
   "contracts/feature-tests/composability/forwarder-queue",
   "contracts/feature-tests/composability/forwarder-queue/meta",
   "contracts/feature-tests/composability/forwarder-raw",
@@ -159,6 +161,8 @@ members = [
   "contracts/feature-tests/erc-style-contracts/lottery-erc20/meta",
   "contracts/feature-tests/esdt-system-sc-mock",
   "contracts/feature-tests/esdt-system-sc-mock/meta",
+  "contracts/feature-tests/exchange-features",
+  "contracts/feature-tests/exchange-features/meta",
   "contracts/feature-tests/formatted-message-features",
   "contracts/feature-tests/formatted-message-features/meta",
   "contracts/feature-tests/managed-map-features",
@@ -173,12 +177,8 @@ members = [
   "contracts/feature-tests/rust-snippets-generator-test/meta",
   "contracts/feature-tests/rust-testing-framework-tester",
   "contracts/feature-tests/rust-testing-framework-tester/meta",
+  "contracts/feature-tests/scenario-tester",
+  "contracts/feature-tests/scenario-tester/meta",
   "contracts/feature-tests/use-module",
   "contracts/feature-tests/use-module/meta",
-  "contracts/feature-tests/exchange-features",
-  "contracts/feature-tests/exchange-features/meta",
-
-  "contracts/feature-tests/scenario-tester",
-  "contracts/feature-tests/scenario-tester/meta"
-
 ]
diff --git a/contracts/feature-tests/composability/Cargo.toml b/contracts/feature-tests/composability/Cargo.toml
index 61bf52fe14..938768f769 100644
--- a/contracts/feature-tests/composability/Cargo.toml
+++ b/contracts/feature-tests/composability/Cargo.toml
@@ -11,6 +11,9 @@ path = "builtin-func-features"
 [dev-dependencies.forwarder]
 path = "forwarder"
 
+[dev-dependencies.forwarder-legacy]
+path = "forwarder-legacy"
+
 [dev-dependencies.forwarder-queue]
 path = "forwarder-queue"
 
diff --git a/contracts/feature-tests/composability/forwarder-legacy/Cargo.toml b/contracts/feature-tests/composability/forwarder-legacy/Cargo.toml
new file mode 100644
index 0000000000..b751258cfa
--- /dev/null
+++ b/contracts/feature-tests/composability/forwarder-legacy/Cargo.toml
@@ -0,0 +1,21 @@
+[package]
+name = "forwarder-legacy"
+version = "0.0.0"
+authors = ["Andrei Marinica <andrei.marinica@multiversx.com>"]
+edition = "2021"
+publish = false
+
+[lib]
+path = "src/forwarder_legacy_main.rs"
+
+[dependencies.vault]
+path = "../vault"
+
+[dependencies.multiversx-sc]
+version = "0.49.0-alpha.2"
+path = "../../../../framework/base"
+
+[dev-dependencies.multiversx-sc-scenario]
+version = "0.49.0-alpha.2"
+path = "../../../../framework/scenario"
+
diff --git a/contracts/feature-tests/composability/forwarder-legacy/meta/Cargo.toml b/contracts/feature-tests/composability/forwarder-legacy/meta/Cargo.toml
new file mode 100644
index 0000000000..559f4b20e2
--- /dev/null
+++ b/contracts/feature-tests/composability/forwarder-legacy/meta/Cargo.toml
@@ -0,0 +1,13 @@
+[package]
+name = "forwarder-legacy-meta"
+version = "0.0.0"
+edition = "2021"
+publish = false
+
+[dependencies.forwarder-legacy]
+path = ".."
+
+[dependencies.multiversx-sc-meta]
+version = "0.49.0-alpha.2"
+path = "../../../../../framework/meta"
+default-features = false
diff --git a/contracts/feature-tests/composability/forwarder-legacy/meta/src/main.rs b/contracts/feature-tests/composability/forwarder-legacy/meta/src/main.rs
new file mode 100644
index 0000000000..a6e424dff6
--- /dev/null
+++ b/contracts/feature-tests/composability/forwarder-legacy/meta/src/main.rs
@@ -0,0 +1,3 @@
+fn main() {
+    multiversx_sc_meta::cli_main::<forwarder_legacy::AbiProvider>();
+}
diff --git a/contracts/feature-tests/composability/forwarder-legacy/multiversx.json b/contracts/feature-tests/composability/forwarder-legacy/multiversx.json
new file mode 100644
index 0000000000..8d77ca316c
--- /dev/null
+++ b/contracts/feature-tests/composability/forwarder-legacy/multiversx.json
@@ -0,0 +1,3 @@
+{
+    "language": "rust"
+}
diff --git a/contracts/feature-tests/composability/forwarder-legacy/src/call_async_legacy.rs b/contracts/feature-tests/composability/forwarder-legacy/src/call_async_legacy.rs
new file mode 100644
index 0000000000..8826c2db48
--- /dev/null
+++ b/contracts/feature-tests/composability/forwarder-legacy/src/call_async_legacy.rs
@@ -0,0 +1,229 @@
+multiversx_sc::imports!();
+multiversx_sc::derive_imports!();
+
+#[derive(TopEncode, TopDecode, TypeAbi)]
+pub struct CallbackData<M: ManagedTypeApi> {
+    callback_name: ManagedBuffer<M>,
+    token_identifier: EgldOrEsdtTokenIdentifier<M>,
+    token_nonce: u64,
+    token_amount: BigUint<M>,
+    args: ManagedVec<M, ManagedBuffer<M>>,
+}
+
+const PERCENTAGE_TOTAL: u64 = 10_000; // 100%
+
+#[multiversx_sc::module]
+pub trait ForwarderAsyncCallModule {
+    #[proxy]
+    fn vault_proxy(&self) -> vault::Proxy<Self::Api>;
+
+    #[endpoint]
+    fn echo_args_async(&self, to: ManagedAddress, args: MultiValueEncoded<ManagedBuffer>) {
+        self.vault_proxy()
+            .contract(to)
+            .echo_arguments(args)
+            .async_call()
+            .with_callback(self.callbacks().echo_args_callback())
+            .call_and_exit();
+    }
+
+    #[callback]
+    fn echo_args_callback(
+        &self,
+        #[call_result] result: ManagedAsyncCallResult<MultiValueEncoded<ManagedBuffer>>,
+    ) -> MultiValueEncoded<ManagedBuffer> {
+        match result {
+            ManagedAsyncCallResult::Ok(results) => {
+                let mut cb_result =
+                    ManagedVec::from_single_item(ManagedBuffer::new_from_bytes(b"success"));
+                cb_result.append_vec(results.into_vec_of_buffers());
+
+                cb_result.into()
+            },
+            ManagedAsyncCallResult::Err(err) => {
+                let mut cb_result =
+                    ManagedVec::from_single_item(ManagedBuffer::new_from_bytes(b"error"));
+                cb_result.push(ManagedBuffer::new_from_bytes(
+                    &err.err_code.to_be_bytes()[..],
+                ));
+                cb_result.push(err.err_msg);
+
+                cb_result.into()
+            },
+        }
+    }
+
+    #[endpoint]
+    #[payable("*")]
+    fn forward_async_accept_funds(&self, to: ManagedAddress) {
+        let payment = self.call_value().egld_or_single_esdt();
+        self.vault_proxy()
+            .contract(to)
+            .accept_funds()
+            .with_egld_or_single_esdt_transfer(payment)
+            .async_call()
+            .call_and_exit()
+    }
+
+    #[endpoint]
+    #[payable("*")]
+    fn forward_async_accept_funds_half_payment(&self, to: ManagedAddress) {
+        let payment = self.call_value().egld_or_single_esdt();
+        let half_payment = payment.amount / 2u32;
+        self.vault_proxy()
+            .contract(to)
+            .accept_funds()
+            .with_egld_or_single_esdt_transfer((
+                payment.token_identifier,
+                payment.token_nonce,
+                half_payment,
+            ))
+            .async_call()
+            .call_and_exit()
+    }
+
+    #[payable("*")]
+    #[endpoint]
+    fn forward_async_accept_funds_with_fees(&self, to: ManagedAddress, percentage_fees: BigUint) {
+        let payment = self.call_value().egld_or_single_esdt();
+        let fees = &payment.amount * &percentage_fees / PERCENTAGE_TOTAL;
+        let amount_to_send = &payment.amount - &fees;
+
+        self.vault_proxy()
+            .contract(to)
+            .accept_funds()
+            .with_egld_or_single_esdt_transfer((
+                payment.token_identifier,
+                payment.token_nonce,
+                amount_to_send,
+            ))
+            .async_call()
+            .call_and_exit()
+    }
+
+    #[endpoint]
+    fn forward_async_retrieve_funds(
+        &self,
+        to: ManagedAddress,
+        token: EgldOrEsdtTokenIdentifier,
+        token_nonce: u64,
+        amount: BigUint,
+    ) {
+        self.vault_proxy()
+            .contract(to)
+            .retrieve_funds(token, token_nonce, amount)
+            .async_call()
+            .with_callback(self.callbacks().retrieve_funds_callback())
+            .call_and_exit()
+    }
+
+    #[callback]
+    fn retrieve_funds_callback(&self) {
+        let (token, nonce, payment) = self.call_value().egld_or_single_esdt().into_tuple();
+        self.retrieve_funds_callback_event(&token, nonce, &payment);
+
+        let _ = self.callback_data().push(&CallbackData {
+            callback_name: ManagedBuffer::from(b"retrieve_funds_callback"),
+            token_identifier: token,
+            token_nonce: nonce,
+            token_amount: payment,
+            args: ManagedVec::new(),
+        });
+    }
+
+    #[event("retrieve_funds_callback")]
+    fn retrieve_funds_callback_event(
+        &self,
+        #[indexed] token: &EgldOrEsdtTokenIdentifier,
+        #[indexed] nonce: u64,
+        #[indexed] payment: &BigUint,
+    );
+
+    #[endpoint]
+    fn send_funds_twice(
+        &self,
+        to: &ManagedAddress,
+        token_identifier: &EgldOrEsdtTokenIdentifier,
+        amount: &BigUint,
+    ) {
+        self.vault_proxy()
+            .contract(to.clone())
+            .accept_funds()
+            .with_egld_or_single_esdt_transfer((token_identifier.clone(), 0, amount.clone()))
+            .async_call()
+            .with_callback(
+                self.callbacks()
+                    .send_funds_twice_callback(to, token_identifier, amount),
+            )
+            .call_and_exit()
+    }
+
+    #[callback]
+    fn send_funds_twice_callback(
+        &self,
+        to: &ManagedAddress,
+        token_identifier: &EgldOrEsdtTokenIdentifier,
+        cb_amount: &BigUint,
+    ) {
+        self.vault_proxy()
+            .contract(to.clone())
+            .accept_funds()
+            .with_egld_or_single_esdt_transfer((token_identifier.clone(), 0, cb_amount.clone()))
+            .async_call()
+            .call_and_exit()
+    }
+
+    #[endpoint]
+    fn send_async_accept_multi_transfer(
+        &self,
+        to: ManagedAddress,
+        token_payments: MultiValueEncoded<MultiValue3<TokenIdentifier, u64, BigUint>>,
+    ) {
+        let mut all_token_payments = ManagedVec::new();
+
+        for multi_arg in token_payments.into_iter() {
+            let (token_identifier, token_nonce, amount) = multi_arg.into_tuple();
+            let payment = EsdtTokenPayment::new(token_identifier, token_nonce, amount);
+
+            all_token_payments.push(payment);
+        }
+
+        self.vault_proxy()
+            .contract(to)
+            .accept_funds()
+            .with_multi_token_transfer(all_token_payments)
+            .async_call()
+            .call_and_exit()
+    }
+
+    #[view]
+    #[storage_mapper("callback_data")]
+    fn callback_data(&self) -> VecMapper<CallbackData<Self::Api>>;
+
+    #[view]
+    fn callback_data_at_index(
+        &self,
+        index: usize,
+    ) -> MultiValue5<
+        ManagedBuffer,
+        EgldOrEsdtTokenIdentifier,
+        u64,
+        BigUint,
+        MultiValueManagedVec<Self::Api, ManagedBuffer>,
+    > {
+        let cb_data = self.callback_data().get(index);
+        (
+            cb_data.callback_name,
+            cb_data.token_identifier,
+            cb_data.token_nonce,
+            cb_data.token_amount,
+            cb_data.args.into(),
+        )
+            .into()
+    }
+
+    #[endpoint]
+    fn clear_callback_data(&self) {
+        self.callback_data().clear();
+    }
+}
diff --git a/contracts/feature-tests/composability/forwarder-legacy/src/call_sync_legacy.rs b/contracts/feature-tests/composability/forwarder-legacy/src/call_sync_legacy.rs
new file mode 100644
index 0000000000..67d923936e
--- /dev/null
+++ b/contracts/feature-tests/composability/forwarder-legacy/src/call_sync_legacy.rs
@@ -0,0 +1,173 @@
+multiversx_sc::imports!();
+
+const PERCENTAGE_TOTAL: u64 = 10_000; // 100%
+
+#[multiversx_sc::module]
+pub trait ForwarderSyncCallModule {
+    #[proxy]
+    fn vault_proxy(&self) -> vault::Proxy<Self::Api>;
+
+    #[endpoint]
+    #[payable("*")]
+    fn echo_arguments_sync(&self, to: ManagedAddress, args: MultiValueEncoded<ManagedBuffer>) {
+        let half_gas = self.blockchain().get_gas_left() / 2;
+
+        let result: MultiValueEncoded<ManagedBuffer> = self
+            .vault_proxy()
+            .contract(to)
+            .echo_arguments(args)
+            .with_gas_limit(half_gas)
+            .execute_on_dest_context();
+
+        self.execute_on_dest_context_result_event(&result.into_vec_of_buffers());
+    }
+
+    #[endpoint]
+    #[payable("*")]
+    fn echo_arguments_sync_twice(
+        &self,
+        to: ManagedAddress,
+        args: MultiValueEncoded<ManagedBuffer>,
+    ) {
+        let one_third_gas = self.blockchain().get_gas_left() / 3;
+
+        let result: MultiValueEncoded<ManagedBuffer> = self
+            .vault_proxy()
+            .contract(to.clone())
+            .echo_arguments(&args)
+            .with_gas_limit(one_third_gas)
+            .execute_on_dest_context();
+
+        self.execute_on_dest_context_result_event(&result.into_vec_of_buffers());
+
+        let result: MultiValueEncoded<ManagedBuffer> = self
+            .vault_proxy()
+            .contract(to)
+            .echo_arguments(&args)
+            .with_gas_limit(one_third_gas)
+            .execute_on_dest_context();
+
+        self.execute_on_dest_context_result_event(&result.into_vec_of_buffers());
+    }
+
+    #[event("echo_arguments_sync_result")]
+    fn execute_on_dest_context_result_event(&self, result: &ManagedVec<Self::Api, ManagedBuffer>);
+
+    #[endpoint]
+    #[payable("*")]
+    fn forward_sync_accept_funds(&self, to: ManagedAddress) {
+        let payment = self.call_value().egld_or_single_esdt();
+        let half_gas = self.blockchain().get_gas_left() / 2;
+
+        let result: MultiValue2<BigUint, MultiValueEncoded<EsdtTokenPaymentMultiValue>> = self
+            .vault_proxy()
+            .contract(to)
+            .accept_funds_echo_payment()
+            .with_egld_or_single_esdt_transfer(payment)
+            .with_gas_limit(half_gas)
+            .execute_on_dest_context();
+        let (egld_value, esdt_transfers_multi) = result.into_tuple();
+
+        self.accept_funds_sync_result_event(&egld_value, &esdt_transfers_multi);
+    }
+
+    #[payable("*")]
+    #[endpoint]
+    fn forward_sync_accept_funds_with_fees(&self, to: ManagedAddress, percentage_fees: BigUint) {
+        let (token_id, payment) = self.call_value().egld_or_single_fungible_esdt();
+        let fees = &payment * &percentage_fees / PERCENTAGE_TOTAL;
+        let amount_to_send = payment - fees;
+
+        let () = self
+            .vault_proxy()
+            .contract(to)
+            .accept_funds()
+            .with_egld_or_single_esdt_transfer((token_id, 0, amount_to_send))
+            .execute_on_dest_context();
+    }
+
+    #[event("accept_funds_sync_result")]
+    fn accept_funds_sync_result_event(
+        &self,
+        #[indexed] egld_value: &BigUint,
+        #[indexed] multi_esdt: &MultiValueEncoded<EsdtTokenPaymentMultiValue>,
+    );
+
+    #[endpoint]
+    #[payable("*")]
+    fn forward_sync_accept_funds_then_read(&self, to: ManagedAddress) -> usize {
+        let payment = self.call_value().egld_or_single_esdt();
+        self.vault_proxy()
+            .contract(to.clone())
+            .accept_funds()
+            .with_egld_or_single_esdt_transfer(payment)
+            .execute_on_dest_context::<()>();
+
+        self.vault_proxy()
+            .contract(to)
+            .call_counts(b"accept_funds")
+            .execute_on_dest_context::<SingleValue<usize>>()
+            .into()
+    }
+
+    #[endpoint]
+    fn forward_sync_retrieve_funds(
+        &self,
+        to: ManagedAddress,
+        token: EgldOrEsdtTokenIdentifier,
+        token_nonce: u64,
+        amount: BigUint,
+    ) {
+        self.vault_proxy()
+            .contract(to)
+            .retrieve_funds(token, token_nonce, amount)
+            .execute_on_dest_context::<()>();
+    }
+
+    #[payable("*")]
+    #[endpoint]
+    fn forward_sync_retrieve_funds_with_accept_func(
+        &self,
+        to: ManagedAddress,
+        token: TokenIdentifier,
+        amount: BigUint,
+    ) {
+        let payments = self.call_value().all_esdt_transfers();
+
+        self.vault_proxy()
+            .contract(to)
+            .retrieve_funds_with_transfer_exec(
+                token,
+                amount,
+                OptionalValue::<ManagedBuffer>::Some(b"accept_funds_func".into()),
+            )
+            .with_multi_token_transfer(payments.clone_value())
+            .execute_on_dest_context::<()>();
+    }
+
+    #[payable("*")]
+    #[endpoint]
+    fn accept_funds_func(&self) {}
+
+    #[endpoint]
+    fn forward_sync_accept_funds_multi_transfer(
+        &self,
+        to: ManagedAddress,
+        token_payments: MultiValueEncoded<MultiValue3<TokenIdentifier, u64, BigUint>>,
+    ) {
+        let mut all_token_payments = ManagedVec::new();
+
+        for multi_arg in token_payments.into_iter() {
+            let (token_identifier, token_nonce, amount) = multi_arg.into_tuple();
+            let payment = EsdtTokenPayment::new(token_identifier, token_nonce, amount);
+            all_token_payments.push(payment);
+        }
+
+        let () = self
+            .vault_proxy()
+            .contract(to)
+            .accept_funds()
+            .with_multi_token_transfer(all_token_payments)
+            .execute_on_dest_context();
+    }
+}
diff --git a/contracts/feature-tests/composability/forwarder-legacy/src/call_transf_exec_legacy.rs b/contracts/feature-tests/composability/forwarder-legacy/src/call_transf_exec_legacy.rs
new file mode 100644
index 0000000000..e402ea5316
--- /dev/null
+++ b/contracts/feature-tests/composability/forwarder-legacy/src/call_transf_exec_legacy.rs
@@ -0,0 +1,155 @@
+multiversx_sc::imports!();
+
+const PERCENTAGE_TOTAL: u64 = 10_000; // 100%
+
+#[multiversx_sc::module]
+pub trait ForwarderTransferExecuteModule {
+    #[proxy]
+    fn vault_proxy(&self) -> vault::Proxy<Self::Api>;
+
+    #[endpoint]
+    #[payable("*")]
+    fn forward_transf_exec_accept_funds(&self, to: ManagedAddress) {
+        let payment = self.call_value().egld_or_single_esdt();
+        self.vault_proxy()
+            .contract(to)
+            .accept_funds()
+            .with_egld_or_single_esdt_transfer(payment)
+            .transfer_execute();
+    }
+
+    #[endpoint]
+    #[payable("*")]
+    fn forward_transf_execu_accept_funds_with_fees(
+        &self,
+        to: ManagedAddress,
+        percentage_fees: BigUint,
+    ) {
+        let (token_id, payment) = self.call_value().egld_or_single_fungible_esdt();
+        let fees = &payment * &percentage_fees / PERCENTAGE_TOTAL;
+        let amount_to_send = payment - fees;
+
+        self.vault_proxy()
+            .contract(to)
+            .accept_funds()
+            .with_egld_or_single_esdt_transfer((token_id, 0, amount_to_send))
+            .transfer_execute();
+    }
+
+    #[endpoint]
+    #[payable("*")]
+    fn forward_transf_exec_accept_funds_twice(&self, to: ManagedAddress) {
+        let (token, token_nonce, payment) = self.call_value().egld_or_single_esdt().into_tuple();
+        let half_payment = payment / 2u32;
+        let half_gas = self.blockchain().get_gas_left() / 2;
+
+        self.vault_proxy()
+            .contract(to.clone())
+            .accept_funds()
+            .with_egld_or_single_esdt_transfer((token.clone(), token_nonce, half_payment.clone()))
+            .with_gas_limit(half_gas)
+            .transfer_execute();
+
+        self.vault_proxy()
+            .contract(to)
+            .accept_funds()
+            .with_egld_or_single_esdt_transfer((token, token_nonce, half_payment))
+            .with_gas_limit(half_gas)
+            .transfer_execute();
+    }
+
+    /// Test that the default gas provided to the transfer_execute call
+    /// leaves enough in the transaction for finish to happen.
+    #[endpoint]
+    #[payable("*")]
+    fn forward_transf_exec_accept_funds_return_values(
+        &self,
+        to: ManagedAddress,
+    ) -> MultiValue4<u64, u64, BigUint, EgldOrEsdtTokenIdentifier> {
+        let payment = self.call_value().egld_or_single_esdt();
+        let payment_token = payment.token_identifier.clone();
+        let gas_left_before = self.blockchain().get_gas_left();
+
+        self.vault_proxy()
+            .contract(to)
+            .accept_funds()
+            .with_egld_or_single_esdt_transfer(payment)
+            .transfer_execute();
+
+        let gas_left_after = self.blockchain().get_gas_left();
+
+        (
+            gas_left_before,
+            gas_left_after,
+            BigUint::zero(),
+            payment_token,
+        )
+            .into()
+    }
+
+    #[endpoint]
+    fn transf_exec_multi_accept_funds(
+        &self,
+        to: ManagedAddress,
+        token_payments: MultiValueEncoded<MultiValue3<TokenIdentifier, u64, BigUint>>,
+    ) {
+        let mut all_token_payments = ManagedVec::new();
+
+        for multi_arg in token_payments.into_iter() {
+            let (token_identifier, token_nonce, amount) = multi_arg.into_tuple();
+            let payment = EsdtTokenPayment::new(token_identifier, token_nonce, amount);
+
+            all_token_payments.push(payment);
+        }
+
+        self.vault_proxy()
+            .contract(to)
+            .accept_funds()
+            .with_multi_token_transfer(all_token_payments)
+            .transfer_execute()
+    }
+
+    #[endpoint]
+    fn forward_transf_exec_reject_funds_multi_transfer(
+        &self,
+        to: ManagedAddress,
+        token_payments: MultiValueEncoded<MultiValue3<TokenIdentifier, u64, BigUint>>,
+    ) {
+        let mut all_token_payments = ManagedVec::new();
+
+        for multi_arg in token_payments.into_iter() {
+            let (token_identifier, token_nonce, amount) = multi_arg.into_tuple();
+            let payment = EsdtTokenPayment::new(token_identifier, token_nonce, amount);
+
+            all_token_payments.push(payment);
+        }
+
+        self.vault_proxy()
+            .contract(to)
+            .accept_funds()
+            .with_multi_token_transfer(all_token_payments)
+            .transfer_execute()
+    }
+
+    #[endpoint]
+    fn transf_exec_multi_reject_funds(
+        &self,
+        to: ManagedAddress,
+        token_payments: MultiValueEncoded<MultiValue3<TokenIdentifier, u64, BigUint>>,
+    ) {
+        let mut all_token_payments = ManagedVec::new();
+
+        for multi_arg in token_payments.into_iter() {
+            let (token_identifier, token_nonce, amount) = multi_arg.into_tuple();
+            let payment = EsdtTokenPayment::new(token_identifier, token_nonce, amount);
+
+            all_token_payments.push(payment);
+        }
+
+        self.vault_proxy()
+            .contract(to)
+            .reject_funds()
+            .with_multi_token_transfer(all_token_payments)
+            .transfer_execute()
+    }
+}
diff --git a/contracts/feature-tests/composability/forwarder-legacy/src/contract_change_owner_legacy.rs b/contracts/feature-tests/composability/forwarder-legacy/src/contract_change_owner_legacy.rs
new file mode 100644
index 0000000000..8c5a140e8d
--- /dev/null
+++ b/contracts/feature-tests/composability/forwarder-legacy/src/contract_change_owner_legacy.rs
@@ -0,0 +1,28 @@
+multiversx_sc::imports!();
+
+#[multiversx_sc::module]
+pub trait ChangeOwnerModule {
+    #[proxy]
+    fn vault_proxy(&self) -> vault::Proxy<Self::Api>;
+
+    #[endpoint(changeOwnerAddress)]
+    fn change_owner(
+        &self,
+        child_sc_address: ManagedAddress,
+        new_owner: ManagedAddress,
+    ) -> ManagedAddress {
+        let () = self
+            .send()
+            .change_owner_address(child_sc_address.clone(), &new_owner)
+            .execute_on_dest_context();
+
+        self.get_owner_of_vault_contract(child_sc_address)
+    }
+
+    fn get_owner_of_vault_contract(&self, address: ManagedAddress) -> ManagedAddress {
+        self.vault_proxy()
+            .contract(address)
+            .get_owner_address()
+            .execute_on_dest_context()
+    }
+}
diff --git a/contracts/feature-tests/composability/forwarder-legacy/src/contract_deploy_legacy.rs b/contracts/feature-tests/composability/forwarder-legacy/src/contract_deploy_legacy.rs
new file mode 100644
index 0000000000..d573b45ec0
--- /dev/null
+++ b/contracts/feature-tests/composability/forwarder-legacy/src/contract_deploy_legacy.rs
@@ -0,0 +1,55 @@
+multiversx_sc::imports!();
+
+#[multiversx_sc::module]
+pub trait DeployContractModule {
+    #[proxy]
+    fn vault_proxy(&self) -> vault::Proxy<Self::Api>;
+
+    #[endpoint]
+    fn deploy_contract(
+        &self,
+        code: ManagedBuffer,
+        opt_arg: OptionalValue<ManagedBuffer>,
+    ) -> MultiValue2<ManagedAddress, OptionalValue<ManagedBuffer>> {
+        self.perform_deploy_vault(&code, opt_arg).into()
+    }
+
+    #[endpoint]
+    fn deploy_two_contracts(
+        &self,
+        code: ManagedBuffer,
+    ) -> MultiValue2<ManagedAddress, ManagedAddress> {
+        let (first_deployed_contract_address, _) =
+            self.perform_deploy_vault(&code, OptionalValue::None);
+        let (second_deployed_contract_address, _) =
+            self.perform_deploy_vault(&code, OptionalValue::None);
+
+        (
+            first_deployed_contract_address,
+            second_deployed_contract_address,
+        )
+            .into()
+    }
+
+    fn perform_deploy_vault(
+        &self,
+        code: &ManagedBuffer,
+        opt_arg: OptionalValue<ManagedBuffer>,
+    ) -> (ManagedAddress, OptionalValue<ManagedBuffer>) {
+        self.vault_proxy()
+            .init(opt_arg)
+            .deploy_contract(code, CodeMetadata::DEFAULT)
+    }
+
+    #[endpoint]
+    fn deploy_vault_from_source(
+        &self,
+        source_address: ManagedAddress,
+        opt_arg: OptionalValue<ManagedBuffer>,
+    ) -> MultiValue2<ManagedAddress, OptionalValue<ManagedBuffer>> {
+        self.vault_proxy()
+            .init(opt_arg)
+            .deploy_from_source(&source_address, CodeMetadata::DEFAULT)
+            .into()
+    }
+}
diff --git a/contracts/feature-tests/composability/forwarder-legacy/src/contract_upgrade_legacy.rs b/contracts/feature-tests/composability/forwarder-legacy/src/contract_upgrade_legacy.rs
new file mode 100644
index 0000000000..b1629eeaa1
--- /dev/null
+++ b/contracts/feature-tests/composability/forwarder-legacy/src/contract_upgrade_legacy.rs
@@ -0,0 +1,31 @@
+multiversx_sc::imports!();
+
+#[multiversx_sc::module]
+pub trait UpgradeContractModule {
+    #[proxy]
+    fn vault_proxy(&self, sc_address: ManagedAddress) -> vault::Proxy<Self::Api>;
+
+    #[endpoint(upgradeVault)]
+    fn upgrade_vault(
+        &self,
+        child_sc_address: ManagedAddress,
+        new_code: ManagedBuffer,
+        opt_arg: OptionalValue<ManagedBuffer>,
+    ) {
+        self.vault_proxy(child_sc_address)
+            .init(opt_arg)
+            .upgrade_contract(&new_code, CodeMetadata::UPGRADEABLE);
+    }
+
+    #[endpoint]
+    fn upgrade_vault_from_source(
+        &self,
+        child_sc_address: ManagedAddress,
+        source_address: ManagedAddress,
+        opt_arg: OptionalValue<ManagedBuffer>,
+    ) {
+        self.vault_proxy(child_sc_address)
+            .init(opt_arg)
+            .upgrade_from_source(&source_address, CodeMetadata::UPGRADEABLE)
+    }
+}
diff --git a/contracts/feature-tests/composability/forwarder-legacy/src/esdt_legacy.rs b/contracts/feature-tests/composability/forwarder-legacy/src/esdt_legacy.rs
new file mode 100644
index 0000000000..900620c0c1
--- /dev/null
+++ b/contracts/feature-tests/composability/forwarder-legacy/src/esdt_legacy.rs
@@ -0,0 +1,215 @@
+multiversx_sc::imports!();
+
+use super::storage_legacy;
+
+const PERCENTAGE_TOTAL: u64 = 10_000; // 100%
+
+pub type EsdtTokenDataMultiValue<M> = MultiValue9<
+    EsdtTokenType,
+    BigUint<M>,
+    bool,
+    ManagedBuffer<M>,
+    ManagedBuffer<M>,
+    ManagedBuffer<M>,
+    ManagedAddress<M>,
+    BigUint<M>,
+    ManagedVec<M, ManagedBuffer<M>>,
+>;
+
+#[multiversx_sc::module]
+pub trait ForwarderEsdtModule: storage_legacy::ForwarderStorageModule {
+    #[view(getFungibleEsdtBalance)]
+    fn get_fungible_esdt_balance(&self, token_identifier: &TokenIdentifier) -> BigUint {
+        self.blockchain()
+            .get_esdt_balance(&self.blockchain().get_sc_address(), token_identifier, 0)
+    }
+
+    #[view(getCurrentNftNonce)]
+    fn get_current_nft_nonce(&self, token_identifier: &TokenIdentifier) -> u64 {
+        self.blockchain()
+            .get_current_esdt_nft_nonce(&self.blockchain().get_sc_address(), token_identifier)
+    }
+
+    #[endpoint]
+    fn send_esdt(&self, to: &ManagedAddress, token_id: TokenIdentifier, amount: &BigUint) {
+        self.send().direct_esdt(to, &token_id, 0, amount);
+    }
+
+    #[payable("*")]
+    #[endpoint]
+    fn send_esdt_with_fees(&self, to: ManagedAddress, percentage_fees: BigUint) {
+        let (token_id, payment) = self.call_value().single_fungible_esdt();
+        let fees = &payment * &percentage_fees / PERCENTAGE_TOTAL;
+        let amount_to_send = payment - fees;
+
+        self.send().direct_esdt(&to, &token_id, 0, &amount_to_send);
+    }
+
+    #[endpoint]
+    fn send_esdt_twice(
+        &self,
+        to: &ManagedAddress,
+        token_id: TokenIdentifier,
+        amount_first_time: &BigUint,
+        amount_second_time: &BigUint,
+    ) {
+        self.send().direct_esdt(to, &token_id, 0, amount_first_time);
+        self.send()
+            .direct_esdt(to, &token_id, 0, amount_second_time);
+    }
+
+    #[endpoint]
+    fn send_esdt_direct_multi_transfer(
+        &self,
+        to: ManagedAddress,
+        token_payments: MultiValueEncoded<MultiValue3<TokenIdentifier, u64, BigUint>>,
+    ) {
+        let mut all_token_payments = ManagedVec::new();
+
+        for multi_arg in token_payments.into_iter() {
+            let (token_identifier, token_nonce, amount) = multi_arg.into_tuple();
+            let payment = EsdtTokenPayment::new(token_identifier, token_nonce, amount);
+
+            all_token_payments.push(payment);
+        }
+
+        let _ = self.send_raw().multi_esdt_transfer_execute(
+            &to,
+            &all_token_payments,
+            self.blockchain().get_gas_left(),
+            &ManagedBuffer::new(),
+            &ManagedArgBuffer::new(),
+        );
+    }
+
+    #[payable("EGLD")]
+    #[endpoint]
+    fn issue_fungible_token(
+        &self,
+        token_display_name: ManagedBuffer,
+        token_ticker: ManagedBuffer,
+        initial_supply: BigUint,
+    ) {
+        let issue_cost = self.call_value().egld_value();
+        let caller = self.blockchain().get_caller();
+
+        self.send()
+            .esdt_system_sc_proxy()
+            .issue_fungible(
+                issue_cost.clone_value(),
+                &token_display_name,
+                &token_ticker,
+                &initial_supply,
+                FungibleTokenProperties {
+                    num_decimals: 0,
+                    can_freeze: true,
+                    can_wipe: true,
+                    can_pause: true,
+                    can_mint: true,
+                    can_burn: true,
+                    can_change_owner: true,
+                    can_upgrade: true,
+                    can_add_special_roles: true,
+                },
+            )
+            .async_call()
+            .with_callback(self.callbacks().esdt_issue_callback(&caller))
+            .call_and_exit()
+    }
+
+    #[callback]
+    fn esdt_issue_callback(
+        &self,
+        caller: &ManagedAddress,
+        #[call_result] result: ManagedAsyncCallResult<()>,
+    ) {
+        let (token_identifier, returned_tokens) = self.call_value().egld_or_single_fungible_esdt();
+        // callback is called with ESDTTransfer of the newly issued token, with the amount requested,
+        // so we can get the token identifier and amount from the call data
+        match result {
+            ManagedAsyncCallResult::Ok(()) => {
+                self.last_issued_token()
+                    .set(&token_identifier.unwrap_esdt());
+                self.last_error_message().clear();
+            },
+            ManagedAsyncCallResult::Err(message) => {
+                // return issue cost to the caller
+                if token_identifier.is_egld() && returned_tokens > 0 {
+                    self.send().direct_egld(caller, &returned_tokens);
+                }
+
+                self.last_error_message().set(&message.err_msg);
+            },
+        }
+    }
+
+    #[endpoint]
+    fn local_mint(&self, token_identifier: TokenIdentifier, amount: BigUint) {
+        self.send().esdt_local_mint(&token_identifier, 0, &amount);
+    }
+
+    #[endpoint]
+    fn local_burn(&self, token_identifier: TokenIdentifier, amount: BigUint) {
+        self.send().esdt_local_burn(&token_identifier, 0, &amount);
+    }
+
+    #[view]
+    fn get_esdt_local_roles(&self, token_id: TokenIdentifier) -> MultiValueEncoded<ManagedBuffer> {
+        let roles = self.blockchain().get_esdt_local_roles(&token_id);
+        let mut result = MultiValueEncoded::new();
+        for role in roles.iter_roles() {
+            result.push(role.as_role_name().into());
+        }
+        result
+    }
+
+    #[view]
+    fn get_esdt_token_data(
+        &self,
+        address: ManagedAddress,
+        token_id: TokenIdentifier,
+        nonce: u64,
+    ) -> EsdtTokenDataMultiValue<Self::Api> {
+        let token_data = self
+            .blockchain()
+            .get_esdt_token_data(&address, &token_id, nonce);
+
+        (
+            token_data.token_type,
+            token_data.amount,
+            token_data.frozen,
+            token_data.hash,
+            token_data.name,
+            token_data.attributes,
+            token_data.creator,
+            token_data.royalties,
+            token_data.uris,
+        )
+            .into()
+    }
+
+    #[view]
+    fn is_esdt_frozen(
+        &self,
+        address: &ManagedAddress,
+        token_id: &TokenIdentifier,
+        nonce: u64,
+    ) -> bool {
+        self.blockchain().is_esdt_frozen(address, token_id, nonce)
+    }
+
+    #[view]
+    fn is_esdt_paused(&self, token_id: &TokenIdentifier) -> bool {
+        self.blockchain().is_esdt_paused(token_id)
+    }
+
+    #[view]
+    fn is_esdt_limited_transfer(&self, token_id: &TokenIdentifier) -> bool {
+        self.blockchain().is_esdt_limited_transfer(token_id)
+    }
+
+    #[view]
+    fn validate_token_identifier(&self, token_id: TokenIdentifier) -> bool {
+        token_id.is_valid_esdt_identifier()
+    }
+}
diff --git a/contracts/feature-tests/composability/forwarder-legacy/src/forwarder_legacy_main.rs b/contracts/feature-tests/composability/forwarder-legacy/src/forwarder_legacy_main.rs
new file mode 100644
index 0000000000..a4c71bce23
--- /dev/null
+++ b/contracts/feature-tests/composability/forwarder-legacy/src/forwarder_legacy_main.rs
@@ -0,0 +1,41 @@
+#![no_std]
+#![allow(clippy::type_complexity)]
+#![allow(clippy::let_unit_value)]
+
+pub mod call_async_legacy;
+pub mod call_sync_legacy;
+pub mod call_transf_exec_legacy;
+pub mod contract_change_owner_legacy;
+pub mod contract_deploy_legacy;
+// pub mod contract_upgrade_legacy;
+pub mod esdt_legacy;
+pub mod nft_legacy;
+pub mod roles_legacy;
+pub mod sft_legacy;
+pub mod storage_legacy;
+
+multiversx_sc::imports!();
+
+/// Test contract for investigating backwards compatibility in smart contract calls.
+#[multiversx_sc::contract]
+pub trait ForwarderLegacy:
+    call_sync_legacy::ForwarderSyncCallModule
+    + call_async_legacy::ForwarderAsyncCallModule
+    + call_transf_exec_legacy::ForwarderTransferExecuteModule
+    + contract_change_owner_legacy::ChangeOwnerModule
+    + contract_deploy_legacy::DeployContractModule
+    // + contract_upgrade_legacy::UpgradeContractModule
+    + esdt_legacy::ForwarderEsdtModule
+    + sft_legacy::ForwarderSftModule
+    + nft_legacy::ForwarderNftModule
+    + roles_legacy::ForwarderRolesModule
+    + storage_legacy::ForwarderStorageModule
+{
+    #[init]
+    fn init(&self) {}
+
+    #[endpoint]
+    fn send_egld(&self, to: &ManagedAddress, amount: &BigUint) {
+        self.send().direct_egld(to, amount);
+    }
+}
diff --git a/contracts/feature-tests/composability/forwarder-legacy/src/nft_legacy.rs b/contracts/feature-tests/composability/forwarder-legacy/src/nft_legacy.rs
new file mode 100644
index 0000000000..91fc37d85f
--- /dev/null
+++ b/contracts/feature-tests/composability/forwarder-legacy/src/nft_legacy.rs
@@ -0,0 +1,296 @@
+multiversx_sc::imports!();
+multiversx_sc::derive_imports!();
+
+use super::storage_legacy;
+
+// used as mock attributes for NFTs
+#[derive(TopEncode, TopDecode, TypeAbi, Clone, Copy, PartialEq, Debug)]
+pub struct Color {
+    pub r: u8,
+    pub g: u8,
+    pub b: u8,
+}
+
+#[derive(TopEncode, TopDecode, TypeAbi, PartialEq, Eq, Clone)]
+pub struct ComplexAttributes<M: ManagedTypeApi> {
+    pub biguint: BigUint<M>,
+    pub vec_u8: ManagedBuffer<M>,
+    pub token_id: TokenIdentifier<M>,
+    pub boolean: bool,
+    pub boxed_bytes: ManagedBuffer<M>,
+}
+
+#[multiversx_sc::module]
+pub trait ForwarderNftModule: storage_legacy::ForwarderStorageModule {
+    #[view]
+    fn get_nft_balance(&self, token_identifier: &TokenIdentifier, nonce: u64) -> BigUint {
+        self.blockchain().get_esdt_balance(
+            &self.blockchain().get_sc_address(),
+            token_identifier,
+            nonce,
+        )
+    }
+
+    #[payable("*")]
+    #[endpoint]
+    fn buy_nft(&self, nft_id: TokenIdentifier, nft_nonce: u64, nft_amount: BigUint) -> BigUint {
+        let payment = self.call_value().egld_or_single_esdt();
+
+        self.send().sell_nft(
+            &nft_id,
+            nft_nonce,
+            &nft_amount,
+            &self.blockchain().get_caller(),
+            &payment.token_identifier,
+            payment.token_nonce,
+            &payment.amount,
+        )
+    }
+
+    #[payable("EGLD")]
+    #[endpoint]
+    fn nft_issue(&self, token_display_name: ManagedBuffer, token_ticker: ManagedBuffer) {
+        let issue_cost = self.call_value().egld_value();
+        let caller = self.blockchain().get_caller();
+
+        self.send()
+            .esdt_system_sc_proxy()
+            .issue_non_fungible(
+                issue_cost.clone_value(),
+                &token_display_name,
+                &token_ticker,
+                NonFungibleTokenProperties {
+                    can_freeze: true,
+                    can_wipe: true,
+                    can_pause: true,
+                    can_transfer_create_role: true,
+                    can_change_owner: true,
+                    can_upgrade: true,
+                    can_add_special_roles: true,
+                },
+            )
+            .async_call()
+            .with_callback(self.callbacks().nft_issue_callback(&caller))
+            .call_and_exit()
+    }
+
+    #[callback]
+    fn nft_issue_callback(
+        &self,
+        caller: &ManagedAddress,
+        #[call_result] result: ManagedAsyncCallResult<TokenIdentifier>,
+    ) {
+        match result {
+            ManagedAsyncCallResult::Ok(token_identifier) => {
+                self.last_issued_token().set(&token_identifier);
+                self.last_error_message().clear();
+            },
+            ManagedAsyncCallResult::Err(message) => {
+                // return issue cost to the caller
+                let (token_identifier, returned_tokens) =
+                    self.call_value().egld_or_single_fungible_esdt();
+                if token_identifier.is_egld() && returned_tokens > 0 {
+                    self.send().direct_egld(caller, &returned_tokens);
+                }
+
+                self.last_error_message().set(&message.err_msg);
+            },
+        }
+    }
+
+    #[endpoint]
+    fn nft_create(
+        &self,
+        token_identifier: TokenIdentifier,
+        amount: BigUint,
+        name: ManagedBuffer,
+        royalties: BigUint,
+        hash: ManagedBuffer,
+        color: Color,
+        uri: ManagedBuffer,
+    ) -> u64 {
+        let mut uris = ManagedVec::new();
+        uris.push(uri);
+        let token_nonce = self.send().esdt_nft_create::<Color>(
+            &token_identifier,
+            &amount,
+            &name,
+            &royalties,
+            &hash,
+            &color,
+            &uris,
+        );
+
+        self.create_event(&token_identifier, token_nonce, &amount);
+
+        token_nonce
+    }
+
+    #[endpoint]
+    fn nft_create_compact(&self, token_identifier: TokenIdentifier, amount: BigUint, color: Color) {
+        self.send()
+            .esdt_nft_create_compact(&token_identifier, &amount, &color);
+    }
+
+    #[endpoint]
+    fn nft_add_uris(
+        &self,
+        token_identifier: TokenIdentifier,
+        nonce: u64,
+        uris: MultiValueEncoded<ManagedBuffer>,
+    ) {
+        self.send()
+            .nft_add_multiple_uri(&token_identifier, nonce, &uris.to_vec());
+    }
+
+    #[endpoint]
+    fn nft_update_attributes(
+        &self,
+        token_identifier: TokenIdentifier,
+        nonce: u64,
+        new_attributes: Color,
+    ) {
+        self.send()
+            .nft_update_attributes(&token_identifier, nonce, &new_attributes);
+    }
+
+    #[endpoint]
+    fn nft_decode_complex_attributes(
+        &self,
+        token_identifier: TokenIdentifier,
+        amount: BigUint,
+        name: ManagedBuffer,
+        royalties: BigUint,
+        hash: ManagedBuffer,
+        uri: ManagedBuffer,
+        attrs_arg: MultiValue5<BigUint, ManagedBuffer, TokenIdentifier, bool, ManagedBuffer>,
+    ) {
+        let attrs_pieces = attrs_arg.into_tuple();
+        let orig_attr = ComplexAttributes {
+            biguint: attrs_pieces.0,
+            vec_u8: attrs_pieces.1,
+            token_id: attrs_pieces.2,
+            boolean: attrs_pieces.3,
+            boxed_bytes: attrs_pieces.4,
+        };
+
+        let mut uris = ManagedVec::new();
+        uris.push(uri);
+        let token_nonce = self.send().esdt_nft_create::<ComplexAttributes<Self::Api>>(
+            &token_identifier,
+            &amount,
+            &name,
+            &royalties,
+            &hash,
+            &orig_attr,
+            &uris,
+        );
+
+        let token_info = self.blockchain().get_esdt_token_data(
+            &self.blockchain().get_sc_address(),
+            &token_identifier,
+            token_nonce,
+        );
+
+        let decoded_attr = token_info.decode_attributes::<ComplexAttributes<Self::Api>>();
+
+        require!(
+            orig_attr.biguint == decoded_attr.biguint
+                && orig_attr.vec_u8 == decoded_attr.vec_u8
+                && orig_attr.token_id == decoded_attr.token_id
+                && orig_attr.boolean == decoded_attr.boolean
+                && orig_attr.boxed_bytes == decoded_attr.boxed_bytes,
+            "orig_attr != decoded_attr"
+        );
+    }
+
+    #[endpoint]
+    fn nft_add_quantity(&self, token_identifier: TokenIdentifier, nonce: u64, amount: BigUint) {
+        self.send()
+            .esdt_local_mint(&token_identifier, nonce, &amount);
+    }
+
+    #[endpoint]
+    fn nft_burn(&self, token_identifier: TokenIdentifier, nonce: u64, amount: BigUint) {
+        self.send()
+            .esdt_local_burn(&token_identifier, nonce, &amount);
+    }
+
+    #[endpoint]
+    fn transfer_nft_via_async_call(
+        &self,
+        to: ManagedAddress,
+        token_identifier: TokenIdentifier,
+        nonce: u64,
+        amount: BigUint,
+    ) {
+        self.send()
+            .transfer_esdt_via_async_call(to, token_identifier, nonce, amount);
+    }
+
+    #[endpoint]
+    fn transfer_nft_and_execute(
+        &self,
+        to: ManagedAddress,
+        token_identifier: TokenIdentifier,
+        nonce: u64,
+        amount: BigUint,
+        function: ManagedBuffer,
+        arguments: MultiValueEncoded<ManagedBuffer>,
+    ) {
+        let _ = self.send_raw().transfer_esdt_nft_execute(
+            &to,
+            &token_identifier,
+            nonce,
+            &amount,
+            self.blockchain().get_gas_left(),
+            &function,
+            &arguments.to_arg_buffer(),
+        );
+    }
+
+    #[endpoint]
+    fn create_and_send(
+        &self,
+        to: ManagedAddress,
+        token_identifier: TokenIdentifier,
+        amount: BigUint,
+        name: ManagedBuffer,
+        royalties: BigUint,
+        hash: ManagedBuffer,
+        color: Color,
+        uri: ManagedBuffer,
+    ) {
+        let token_nonce = self.nft_create(
+            token_identifier.clone(),
+            amount.clone(),
+            name,
+            royalties,
+            hash,
+            color,
+            uri,
+        );
+
+        self.send()
+            .direct_esdt(&to, &token_identifier, token_nonce, &amount);
+
+        self.send_event(&to, &token_identifier, token_nonce, &amount);
+    }
+
+    #[event("create")]
+    fn create_event(
+        &self,
+        #[indexed] token_id: &TokenIdentifier,
+        #[indexed] token_nonce: u64,
+        #[indexed] amount: &BigUint,
+    );
+
+    #[event("send")]
+    fn send_event(
+        &self,
+        #[indexed] to: &ManagedAddress,
+        #[indexed] token_id: &TokenIdentifier,
+        #[indexed] token_nonce: u64,
+        #[indexed] amount: &BigUint,
+    );
+}
diff --git a/contracts/feature-tests/composability/forwarder-legacy/src/roles_legacy.rs b/contracts/feature-tests/composability/forwarder-legacy/src/roles_legacy.rs
new file mode 100644
index 0000000000..9c795bfa7b
--- /dev/null
+++ b/contracts/feature-tests/composability/forwarder-legacy/src/roles_legacy.rs
@@ -0,0 +1,48 @@
+multiversx_sc::imports!();
+
+use super::storage_legacy;
+
+#[multiversx_sc::module]
+pub trait ForwarderRolesModule: storage_legacy::ForwarderStorageModule {
+    #[endpoint(setLocalRoles)]
+    fn set_local_roles(
+        &self,
+        address: ManagedAddress,
+        token_identifier: TokenIdentifier,
+        roles: MultiValueEncoded<EsdtLocalRole>,
+    ) {
+        self.send()
+            .esdt_system_sc_proxy()
+            .set_special_roles(&address, &token_identifier, roles.into_iter())
+            .async_call()
+            .with_callback(self.callbacks().change_roles_callback())
+            .call_and_exit()
+    }
+
+    #[endpoint(unsetLocalRoles)]
+    fn unset_local_roles(
+        &self,
+        address: ManagedAddress,
+        token_identifier: TokenIdentifier,
+        roles: MultiValueEncoded<EsdtLocalRole>,
+    ) {
+        self.send()
+            .esdt_system_sc_proxy()
+            .unset_special_roles(&address, &token_identifier, roles.into_iter())
+            .async_call()
+            .with_callback(self.callbacks().change_roles_callback())
+            .call_and_exit()
+    }
+
+    #[callback]
+    fn change_roles_callback(&self, #[call_result] result: ManagedAsyncCallResult<()>) {
+        match result {
+            ManagedAsyncCallResult::Ok(()) => {
+                self.last_error_message().clear();
+            },
+            ManagedAsyncCallResult::Err(message) => {
+                self.last_error_message().set(&message.err_msg);
+            },
+        }
+    }
+}
diff --git a/contracts/feature-tests/composability/forwarder-legacy/src/sft_legacy.rs b/contracts/feature-tests/composability/forwarder-legacy/src/sft_legacy.rs
new file mode 100644
index 0000000000..4b0a5c2f3c
--- /dev/null
+++ b/contracts/feature-tests/composability/forwarder-legacy/src/sft_legacy.rs
@@ -0,0 +1,57 @@
+multiversx_sc::imports!();
+
+use super::storage_legacy;
+
+#[multiversx_sc::module]
+pub trait ForwarderSftModule: storage_legacy::ForwarderStorageModule {
+    #[payable("EGLD")]
+    #[endpoint]
+    fn sft_issue(&self, token_display_name: ManagedBuffer, token_ticker: ManagedBuffer) {
+        let issue_cost = self.call_value().egld_value();
+        let caller = self.blockchain().get_caller();
+
+        self.send()
+            .esdt_system_sc_proxy()
+            .issue_semi_fungible(
+                issue_cost.clone_value(),
+                &token_display_name,
+                &token_ticker,
+                SemiFungibleTokenProperties {
+                    can_freeze: true,
+                    can_wipe: true,
+                    can_pause: true,
+                    can_transfer_create_role: true,
+                    can_change_owner: true,
+                    can_upgrade: true,
+                    can_add_special_roles: true,
+                },
+            )
+            .async_call()
+            .with_callback(self.callbacks().sft_issue_callback(&caller))
+            .call_and_exit()
+    }
+
+    #[callback]
+    fn sft_issue_callback(
+        &self,
+        caller: &ManagedAddress,
+        #[call_result] result: ManagedAsyncCallResult<TokenIdentifier>,
+    ) {
+        match result {
+            ManagedAsyncCallResult::Ok(token_identifier) => {
+                self.last_issued_token().set(&token_identifier);
+                self.last_error_message().clear();
+            },
+            ManagedAsyncCallResult::Err(message) => {
+                // return issue cost to the caller
+                let (token_identifier, returned_tokens) =
+                    self.call_value().egld_or_single_fungible_esdt();
+                if token_identifier.is_egld() && returned_tokens > 0 {
+                    self.send().direct_egld(caller, &returned_tokens);
+                }
+
+                self.last_error_message().set(&message.err_msg);
+            },
+        }
+    }
+}
diff --git a/contracts/feature-tests/composability/forwarder-legacy/src/storage_legacy.rs b/contracts/feature-tests/composability/forwarder-legacy/src/storage_legacy.rs
new file mode 100644
index 0000000000..f27887b63f
--- /dev/null
+++ b/contracts/feature-tests/composability/forwarder-legacy/src/storage_legacy.rs
@@ -0,0 +1,12 @@
+multiversx_sc::imports!();
+
+#[multiversx_sc::module]
+pub trait ForwarderStorageModule {
+    #[view(lastIssuedToken)]
+    #[storage_mapper("lastIssuedToken")]
+    fn last_issued_token(&self) -> SingleValueMapper<TokenIdentifier>;
+
+    #[view(lastErrorMessage)]
+    #[storage_mapper("lastErrorMessage")]
+    fn last_error_message(&self) -> SingleValueMapper<ManagedBuffer>;
+}
diff --git a/contracts/feature-tests/composability/tests/forwarder_blackbox_legacy_test.rs b/contracts/feature-tests/composability/tests/forwarder_blackbox_legacy_test.rs
new file mode 100644
index 0000000000..9620e12277
--- /dev/null
+++ b/contracts/feature-tests/composability/tests/forwarder_blackbox_legacy_test.rs
@@ -0,0 +1,140 @@
+use forwarder_legacy::nft_legacy::{Color, ProxyTrait as _};
+
+use multiversx_sc_scenario::{
+    api::StaticApi,
+    scenario_model::{
+        Account, CheckAccount, CheckStateStep, ScCallStep, SetStateStep, TransferStep,
+    },
+    ContractInfo, ScenarioWorld,
+};
+
+const USER_ADDRESS_EXPR: &str = "address:user";
+const FORWARDER_ADDRESS_EXPR: &str = "sc:forwarder_legacy";
+const FORWARDER_PATH_EXPR: &str = "mxsc:output/forwarder_legacy.mxsc.json";
+
+const NFT_TOKEN_ID_EXPR: &str = "str:COOL-123456";
+const NFT_TOKEN_ID: &[u8] = b"COOL-123456";
+
+type ForwarderContract = ContractInfo<forwarder_legacy::Proxy<StaticApi>>;
+
+fn world() -> ScenarioWorld {
+    let mut blockchain = ScenarioWorld::new();
+    blockchain.set_current_dir_from_workspace("contracts/composability/");
+
+    blockchain.register_contract(FORWARDER_PATH_EXPR, forwarder_legacy::ContractBuilder);
+    blockchain
+}
+
+struct ForwarderTestState {
+    world: ScenarioWorld,
+    forwarder_legacy_contract: ForwarderContract,
+}
+
+impl ForwarderTestState {
+    fn new() -> Self {
+        let mut world = world();
+
+        let forwarder_legacy_code = world.code_expression(FORWARDER_PATH_EXPR);
+        let roles = vec![
+            "ESDTRoleNFTCreate".to_string(),
+            "ESDTRoleNFTUpdateAttributes".to_string(),
+        ];
+
+        world.set_state_step(
+            SetStateStep::new()
+                .put_account(USER_ADDRESS_EXPR, Account::new().nonce(1))
+                .put_account(
+                    FORWARDER_ADDRESS_EXPR,
+                    Account::new()
+                        .nonce(1)
+                        .code(forwarder_legacy_code)
+                        .esdt_roles(NFT_TOKEN_ID_EXPR, roles),
+                ),
+        );
+
+        let forwarder_legacy_contract = ForwarderContract::new(FORWARDER_ADDRESS_EXPR);
+
+        Self {
+            world,
+            forwarder_legacy_contract,
+        }
+    }
+}
+
+#[test]
+fn test_nft_update_attributes_and_send() {
+    let mut state = ForwarderTestState::new();
+
+    let original_attributes = Color { r: 0, g: 0, b: 0 };
+
+    state.world.sc_call(
+        ScCallStep::new().from(USER_ADDRESS_EXPR).call(
+            state.forwarder_legacy_contract.nft_create_compact(
+                NFT_TOKEN_ID,
+                1u64,
+                original_attributes,
+            ),
+        ),
+    );
+
+    state.world.transfer_step(
+        TransferStep::new()
+            .from(FORWARDER_ADDRESS_EXPR)
+            .to(USER_ADDRESS_EXPR)
+            .esdt_transfer(NFT_TOKEN_ID, 1, "1"),
+    );
+
+    state
+        .world
+        .check_state_step(CheckStateStep::new().put_account(
+            USER_ADDRESS_EXPR,
+            CheckAccount::new().esdt_nft_balance_and_attributes(
+                NFT_TOKEN_ID_EXPR,
+                1,
+                "1",
+                Some(original_attributes),
+            ),
+        ));
+
+    let new_attributes = Color {
+        r: 255,
+        g: 255,
+        b: 255,
+    };
+
+    state.world.transfer_step(
+        TransferStep::new()
+            .from(USER_ADDRESS_EXPR)
+            .to(FORWARDER_ADDRESS_EXPR)
+            .esdt_transfer(NFT_TOKEN_ID, 1, "1"),
+    );
+
+    state.world.sc_call(
+        ScCallStep::new().from(USER_ADDRESS_EXPR).call(
+            state.forwarder_legacy_contract.nft_update_attributes(
+                NFT_TOKEN_ID,
+                1u64,
+                new_attributes,
+            ),
+        ),
+    );
+
+    state.world.transfer_step(
+        TransferStep::new()
+            .from(FORWARDER_ADDRESS_EXPR)
+            .to(USER_ADDRESS_EXPR)
+            .esdt_transfer(NFT_TOKEN_ID, 1, "1"),
+    );
+
+    state
+        .world
+        .check_state_step(CheckStateStep::new().put_account(
+            USER_ADDRESS_EXPR,
+            CheckAccount::new().esdt_nft_balance_and_attributes(
+                NFT_TOKEN_ID_EXPR,
+                1,
+                "1",
+                Some(new_attributes),
+            ),
+        ));
+}
diff --git a/contracts/feature-tests/composability/forwarder/tests/forwarder_blackbox_test.rs b/contracts/feature-tests/composability/tests/forwarder_blackbox_test.rs
similarity index 100%
rename from contracts/feature-tests/composability/forwarder/tests/forwarder_blackbox_test.rs
rename to contracts/feature-tests/composability/tests/forwarder_blackbox_test.rs
diff --git a/contracts/feature-tests/composability/tests/forwarder_whitebox_legacy_test.rs b/contracts/feature-tests/composability/tests/forwarder_whitebox_legacy_test.rs
new file mode 100644
index 0000000000..d829016176
--- /dev/null
+++ b/contracts/feature-tests/composability/tests/forwarder_whitebox_legacy_test.rs
@@ -0,0 +1,118 @@
+use forwarder_legacy::nft_legacy::{Color, ForwarderNftModule};
+use multiversx_sc::{contract_base::ContractBase, types::Address};
+use multiversx_sc_scenario::{
+    managed_address, managed_biguint, managed_token_id,
+    scenario_model::{
+        Account, AddressValue, CheckAccount, CheckStateStep, ScCallStep, SetStateStep,
+    },
+    ScenarioWorld, WhiteboxContract,
+};
+
+const USER_ADDRESS_EXPR: &str = "address:user";
+const FORWARDER_ADDRESS_EXPR: &str = "sc:forwarder_legacy";
+const FORWARDER_PATH_EXPR: &str = "mxsc:output/forwarder_legacy.mxsc.json";
+
+const NFT_TOKEN_ID_EXPR: &str = "str:COOL-123456";
+const NFT_TOKEN_ID: &[u8] = b"COOL-123456";
+
+fn world() -> ScenarioWorld {
+    let mut blockchain = ScenarioWorld::new();
+    blockchain.set_current_dir_from_workspace("contracts/composability/forwarder_legacy");
+
+    blockchain.register_contract(FORWARDER_PATH_EXPR, forwarder_legacy::ContractBuilder);
+    blockchain
+}
+
+#[test]
+fn test_nft_update_attributes_and_send() {
+    let mut world = world();
+
+    let forwarder_legacy_code = world.code_expression(FORWARDER_PATH_EXPR);
+    let roles = vec![
+        "ESDTRoleNFTCreate".to_string(),
+        "ESDTRoleNFTUpdateAttributes".to_string(),
+    ];
+
+    world.set_state_step(
+        SetStateStep::new()
+            .put_account(USER_ADDRESS_EXPR, Account::new().nonce(1))
+            .put_account(
+                FORWARDER_ADDRESS_EXPR,
+                Account::new()
+                    .nonce(1)
+                    .code(forwarder_legacy_code)
+                    .esdt_roles(NFT_TOKEN_ID_EXPR, roles),
+            ),
+    );
+
+    let forwarder_legacy_whitebox =
+        WhiteboxContract::new(FORWARDER_ADDRESS_EXPR, forwarder_legacy::contract_obj);
+
+    let original_attributes = Color { r: 0, g: 0, b: 0 };
+
+    world.whitebox_call(
+        &forwarder_legacy_whitebox,
+        ScCallStep::new().from(USER_ADDRESS_EXPR),
+        |sc| {
+            sc.nft_create_compact(
+                managed_token_id!(NFT_TOKEN_ID),
+                managed_biguint!(1),
+                original_attributes,
+            );
+
+            sc.send().direct_esdt(
+                &managed_address!(&address_expr_to_address(USER_ADDRESS_EXPR)),
+                &managed_token_id!(NFT_TOKEN_ID),
+                1,
+                &managed_biguint!(1),
+            );
+        },
+    );
+
+    world.check_state_step(CheckStateStep::new().put_account(
+        USER_ADDRESS_EXPR,
+        CheckAccount::new().esdt_nft_balance_and_attributes(
+            NFT_TOKEN_ID_EXPR,
+            1,
+            "1",
+            Some(original_attributes),
+        ),
+    ));
+
+    let new_attributes = Color {
+        r: 255,
+        g: 255,
+        b: 255,
+    };
+
+    world.whitebox_call(
+        &forwarder_legacy_whitebox,
+        ScCallStep::new()
+            .from(USER_ADDRESS_EXPR)
+            .esdt_transfer(NFT_TOKEN_ID, 1, "1"),
+        |sc| {
+            sc.nft_update_attributes(managed_token_id!(NFT_TOKEN_ID), 1, new_attributes);
+
+            sc.send().direct_esdt(
+                &managed_address!(&address_expr_to_address(USER_ADDRESS_EXPR)),
+                &managed_token_id!(NFT_TOKEN_ID),
+                1,
+                &managed_biguint!(1),
+            );
+        },
+    );
+
+    world.check_state_step(CheckStateStep::new().put_account(
+        USER_ADDRESS_EXPR,
+        CheckAccount::new().esdt_nft_balance_and_attributes(
+            NFT_TOKEN_ID_EXPR,
+            1,
+            "1",
+            Some(new_attributes),
+        ),
+    ));
+}
+
+fn address_expr_to_address(address_expr: &str) -> Address {
+    AddressValue::from(address_expr).to_address()
+}
diff --git a/contracts/feature-tests/composability/forwarder/tests/forwarder_whitebox_test.rs b/contracts/feature-tests/composability/tests/forwarder_whitebox_test.rs
similarity index 100%
rename from contracts/feature-tests/composability/forwarder/tests/forwarder_whitebox_test.rs
rename to contracts/feature-tests/composability/tests/forwarder_whitebox_test.rs

From 635c5f50c4130e77cf8aefb844e101cbea43a671 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 12 Apr 2024 16:12:11 +0300
Subject: [PATCH 0708/1254] fixed backwards compatibility for upgrade_contract
 and upgrade_from_source

---
 .../src/contract_upgrade_legacy.rs            |  2 +
 .../src/forwarder_legacy_main.rs              |  4 +-
 .../proxy-test-first/src/proxy-test-first.rs  |  7 +-
 .../interaction/tx_exec/tx_exec_deploy.rs     | 79 +++++++++++++++++++
 .../interaction/tx_exec/tx_exec_upgrade.rs    | 12 ++-
 5 files changed, 98 insertions(+), 6 deletions(-)

diff --git a/contracts/feature-tests/composability/forwarder-legacy/src/contract_upgrade_legacy.rs b/contracts/feature-tests/composability/forwarder-legacy/src/contract_upgrade_legacy.rs
index b1629eeaa1..32e92844c7 100644
--- a/contracts/feature-tests/composability/forwarder-legacy/src/contract_upgrade_legacy.rs
+++ b/contracts/feature-tests/composability/forwarder-legacy/src/contract_upgrade_legacy.rs
@@ -1,3 +1,5 @@
+#![allow(deprecated)]
+
 multiversx_sc::imports!();
 
 #[multiversx_sc::module]
diff --git a/contracts/feature-tests/composability/forwarder-legacy/src/forwarder_legacy_main.rs b/contracts/feature-tests/composability/forwarder-legacy/src/forwarder_legacy_main.rs
index a4c71bce23..feae6a9965 100644
--- a/contracts/feature-tests/composability/forwarder-legacy/src/forwarder_legacy_main.rs
+++ b/contracts/feature-tests/composability/forwarder-legacy/src/forwarder_legacy_main.rs
@@ -7,7 +7,7 @@ pub mod call_sync_legacy;
 pub mod call_transf_exec_legacy;
 pub mod contract_change_owner_legacy;
 pub mod contract_deploy_legacy;
-// pub mod contract_upgrade_legacy;
+pub mod contract_upgrade_legacy;
 pub mod esdt_legacy;
 pub mod nft_legacy;
 pub mod roles_legacy;
@@ -24,7 +24,7 @@ pub trait ForwarderLegacy:
     + call_transf_exec_legacy::ForwarderTransferExecuteModule
     + contract_change_owner_legacy::ChangeOwnerModule
     + contract_deploy_legacy::DeployContractModule
-    // + contract_upgrade_legacy::UpgradeContractModule
+    + contract_upgrade_legacy::UpgradeContractModule
     + esdt_legacy::ForwarderEsdtModule
     + sft_legacy::ForwarderSftModule
     + nft_legacy::ForwarderNftModule
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 bc3d648b56..8ca0ffc3b3 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
@@ -54,10 +54,13 @@ pub trait ProxyTestFirst {
 
         self.tx()
             .to(other_contract)
-            .raw_upgrade()
+            .typed(pay_me_proxy::PayMeProxy)
+            .upgrade()
             .argument(&456)
             .egld(payment)
-            .upgrade_contract(&code, CodeMetadata::UPGRADEABLE);
+            .code(code)
+            .code_metadata(CodeMetadata::UPGRADEABLE)
+            .upgrade_async_call_and_exit();
     }
 
     #[payable("EGLD")]
diff --git a/framework/base/src/types/interaction/tx_exec/tx_exec_deploy.rs b/framework/base/src/types/interaction/tx_exec/tx_exec_deploy.rs
index b9a77119ed..28608a33f5 100644
--- a/framework/base/src/types/interaction/tx_exec/tx_exec_deploy.rs
+++ b/framework/base/src/types/interaction/tx_exec/tx_exec_deploy.rs
@@ -202,3 +202,82 @@ where
         (new_address, decode_result(raw_results))
     }
 }
+
+impl<Api, Payment, Gas, OriginalResult>
+    Tx<
+        TxScEnv<Api>,
+        (),
+        ManagedAddress<Api>,
+        Payment,
+        Gas,
+        DeployCall<TxScEnv<Api>, ()>,
+        OriginalResultMarker<OriginalResult>,
+    >
+where
+    Api: CallTypeApi,
+    Payment: TxPaymentEgldOnly<TxScEnv<Api>>,
+    Gas: TxGas<TxScEnv<Api>>,
+    OriginalResult: TopEncodeMulti,
+{
+    /// Backwards compatibility, immitates the old API.
+    /// 
+    /// Should no longer be used, which is why unlike all the rest of the old syntax, was deprecated.
+    /// 
+    /// Uses a `DeployCall` instead of the correct `UpgradeCall`, because the old syntax did not know about upgrades.
+    ///
+    /// Note that the data type (the `DeployCall`) doesn't have the code set.
+    /// This is because the old API was passing it as paramter, so we use it from the `code` argument.
+    ///
+    /// Also note that the code metadata is taken from the `code_metadata` argument.
+    /// If another one was previously set in the `Tx` object, that one will be ignored.
+    #[deprecated(
+        since = "0.49.0",
+        note = "The legacy upgrade method does not correctly take the upgrade constructor into account. Please switch to the new syntax."
+    )]
+    pub fn upgrade_contract(self, code: &ManagedBuffer<Api>, code_metadata: CodeMetadata) {
+        let gas = self.gas.explicit_or_gas_left(&self.env);
+        self.payment.with_egld_value(&self.env, |egld_value| {
+            SendRawWrapper::<Api>::new().upgrade_contract(
+                &self.to,
+                gas,
+                egld_value,
+                code,
+                code_metadata,
+                &self.data.arg_buffer,
+            );
+        });
+    }
+
+    /// Backwards compatibility, immitates the old API.
+    /// 
+    /// Should no longer be used, which is why unlike all the rest of the old syntax, was deprecated.
+    /// 
+    /// Uses a `DeployCall` instead of the correct `UpgradeCall`, because the old syntax did not know about upgrades.
+    ///
+    /// Note that the data type (the `DeployCall`) doesn't have the code set.
+    /// This is because the old API was passing it as paramter, so we use it from the `code` argument.
+    ///
+    /// Also note that the code metadata is taken from the `code_metadata` argument.
+    /// If another one was previously set in the `Tx` object, that one will be ignored.
+    #[deprecated(
+        since = "0.49.0",
+        note = "The legacy upgrade method does not correctly take the upgrade constructor into account. Please switch to the new syntax."
+    )]
+    pub fn upgrade_from_source(
+        self,
+        source_address: &ManagedAddress<Api>,
+        code_metadata: CodeMetadata,
+    ) {
+        let gas = self.gas.explicit_or_gas_left(&self.env);
+        self.payment.with_egld_value(&self.env, |egld_value| {
+            SendRawWrapper::<Api>::new().upgrade_from_source_contract(
+                &self.to,
+                gas,
+                egld_value,
+                source_address,
+                code_metadata,
+                &self.data.arg_buffer,
+            );
+        });
+    }
+}
diff --git a/framework/base/src/types/interaction/tx_exec/tx_exec_upgrade.rs b/framework/base/src/types/interaction/tx_exec/tx_exec_upgrade.rs
index 5a08481640..0f71ae64bb 100644
--- a/framework/base/src/types/interaction/tx_exec/tx_exec_upgrade.rs
+++ b/framework/base/src/types/interaction/tx_exec/tx_exec_upgrade.rs
@@ -87,13 +87,17 @@ where
     Gas: TxGas<TxScEnv<Api>>,
     RH: TxEmptyResultHandler<TxScEnv<Api>>,
 {
-    /// Backwards compatibility, immitates the old API.
+    /// Transition syntax, immitates the old API.
     ///
     /// Note that the data type (the `UpgradeCall`) doesn't have the code set.
     /// This is because the old API was passing it as paramter, so we use it from the `code` argument.
     ///
     /// Also note that the code metadata is taken from the `code_metadata` argument.
     /// If another one was previously set in the `Tx` object, that one will be ignored.
+    #[deprecated(
+        since = "0.49.0",
+        note = "This is a transition syntax, it would not have been reachable before 0.49.0. Use [upgrade_async_call_and_exit] instead."
+    )]
     pub fn upgrade_contract(self, code: &ManagedBuffer<Api>, code_metadata: CodeMetadata) {
         let gas = self.gas.explicit_or_gas_left(&self.env);
         self.payment.with_egld_value(&self.env, |egld_value| {
@@ -108,13 +112,17 @@ where
         });
     }
 
-    /// Backwards compatibility, immitates the old API.
+    /// Transition syntax, immitates the old API.
     ///
     /// Note that the data type (the `UpgradeCall`) doesn't have the code set.
     /// This is because the old API was passing it as paramter, so we use it from the `code` argument.
     ///
     /// Also note that the code metadata is taken from the `code_metadata` argument.
     /// If another one was previously set in the `Tx` object, that one will be ignored.
+    #[deprecated(
+        since = "0.49.0",
+        note = "This is a transition syntax, it would not have been reachable before 0.49.0. Use [upgrade_async_call_and_exit] instead."
+    )]
     pub fn upgrade_from_source(
         self,
         source_address: &ManagedAddress<Api>,

From 766064c72f4877750c637bfa45f07d48c16f879a Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 12 Apr 2024 17:32:11 +0300
Subject: [PATCH 0709/1254] fixed backwards compatibility for
 with_esdt_transfer, changed multi_esdt, cleanup

---
 .../examples/digital-cash/src/digital_cash.rs |  2 +-
 .../digital-cash/src/signature_operations.rs  |  4 +-
 .../src/esdt_transfer_with_fee.rs             |  4 +-
 .../src/rewards_distribution.rs               |  7 +--
 .../src/call_transf_exec_legacy.rs            | 21 +++++++
 .../forwarder-raw/src/forwarder_raw_async.rs  |  2 +-
 .../composability/forwarder/src/call_async.rs |  2 +-
 .../composability/forwarder/src/call_sync.rs  |  4 +-
 .../forwarder/src/call_transf_exec.rs         |  6 +-
 .../composability/forwarder/src/esdt.rs       |  2 +-
 .../composability/vault/src/vault.rs          |  4 +-
 contracts/modules/src/token_merge/mod.rs      | 10 +---
 contracts/modules/src/transfer_role_proxy.rs  |  2 +-
 .../contract_base/wrappers/send_wrapper.rs    |  4 +-
 framework/base/src/types/interaction/tx.rs    | 57 +++++++++++++------
 .../interaction/tx_exec/tx_exec_deploy.rs     |  8 +--
 .../managed/wrapped/esdt_token_payment.rs     | 21 +++++++
 17 files changed, 107 insertions(+), 53 deletions(-)

diff --git a/contracts/examples/digital-cash/src/digital_cash.rs b/contracts/examples/digital-cash/src/digital_cash.rs
index c631256545..c1d96c9132 100644
--- a/contracts/examples/digital-cash/src/digital_cash.rs
+++ b/contracts/examples/digital-cash/src/digital_cash.rs
@@ -64,7 +64,7 @@ pub trait DigitalCash:
         if !collected_esdt_fees.is_empty() {
             self.tx()
                 .to(&caller_address)
-                .multi_esdt(&collected_esdt_fees)
+                .payment(&collected_esdt_fees)
                 .transfer();
         }
     }
diff --git a/contracts/examples/digital-cash/src/signature_operations.rs b/contracts/examples/digital-cash/src/signature_operations.rs
index fd69a91ef2..9c68951f05 100644
--- a/contracts/examples/digital-cash/src/signature_operations.rs
+++ b/contracts/examples/digital-cash/src/signature_operations.rs
@@ -42,7 +42,7 @@ pub trait SignatureOperationsModule: storage::StorageModule + helpers::HelpersMo
         if !esdt_funds.is_empty() {
             self.tx()
                 .to(&deposit.depositor_address)
-                .multi_esdt(esdt_funds)
+                .payment(esdt_funds)
                 .transfer();
         }
     }
@@ -83,7 +83,7 @@ pub trait SignatureOperationsModule: storage::StorageModule + helpers::HelpersMo
         if !deposit.esdt_funds.is_empty() {
             self.tx()
                 .to(&caller_address)
-                .multi_esdt(&deposit.esdt_funds)
+                .payment(&deposit.esdt_funds)
                 .transfer();
         }
         if deposited_fee.amount > 0 {
diff --git a/contracts/examples/esdt-transfer-with-fee/src/esdt_transfer_with_fee.rs b/contracts/examples/esdt-transfer-with-fee/src/esdt_transfer_with_fee.rs
index 495e8bb57e..de883ef83a 100644
--- a/contracts/examples/esdt-transfer-with-fee/src/esdt_transfer_with_fee.rs
+++ b/contracts/examples/esdt-transfer-with-fee/src/esdt_transfer_with_fee.rs
@@ -40,7 +40,7 @@ pub trait EsdtTransferWithFee {
         }
         self.paid_fees().clear();
 
-        self.tx().to(ToCaller).multi_esdt(&fees).transfer();
+        self.tx().to(ToCaller).payment(fees).transfer();
     }
 
     #[payable("*")]
@@ -81,7 +81,7 @@ pub trait EsdtTransferWithFee {
                 },
             }
         }
-        self.tx().to(&address).multi_esdt(new_payments).transfer();
+        self.tx().to(&address).payment(new_payments).transfer();
     }
 
     fn get_payment_after_fees(
diff --git a/contracts/examples/rewards-distribution/src/rewards_distribution.rs b/contracts/examples/rewards-distribution/src/rewards_distribution.rs
index c669b651f4..880b4ed835 100644
--- a/contracts/examples/rewards-distribution/src/rewards_distribution.rs
+++ b/contracts/examples/rewards-distribution/src/rewards_distribution.rs
@@ -278,11 +278,8 @@ pub trait RewardsDistribution:
         }
 
         self.tx().to(&caller).egld(total_egld_reward).transfer();
-        self.tx().to(&caller).multi_esdt(rewards).transfer();
-        self.tx()
-            .to(&caller)
-            .multi_esdt(nfts.clone_value())
-            .transfer();
+        self.tx().to(&caller).payment(rewards).transfer();
+        self.tx().to(&caller).payment(nfts).transfer();
     }
 
     fn claim_reward_token(
diff --git a/contracts/feature-tests/composability/forwarder-legacy/src/call_transf_exec_legacy.rs b/contracts/feature-tests/composability/forwarder-legacy/src/call_transf_exec_legacy.rs
index e402ea5316..f113edd27e 100644
--- a/contracts/feature-tests/composability/forwarder-legacy/src/call_transf_exec_legacy.rs
+++ b/contracts/feature-tests/composability/forwarder-legacy/src/call_transf_exec_legacy.rs
@@ -109,6 +109,27 @@ pub trait ForwarderTransferExecuteModule {
             .transfer_execute()
     }
 
+    #[endpoint]
+    fn transf_exec_multi_accept_funds_v2(
+        &self,
+        to: ManagedAddress,
+        token_payments: MultiValueEncoded<MultiValue3<TokenIdentifier, u64, BigUint>>,
+    ) {
+        let mut tx = self
+            .vault_proxy()
+            .contract(to)
+            .accept_funds()
+            .multi_esdt(());
+
+        for multi_arg in token_payments.into_iter() {
+            let (token_identifier, token_nonce, amount) = multi_arg.into_tuple();
+            let payment_triple = (token_identifier, token_nonce, amount);
+            tx = tx.with_esdt_transfer(payment_triple);
+        }
+
+        tx.transfer_execute()
+    }
+
     #[endpoint]
     fn forward_transf_exec_reject_funds_multi_transfer(
         &self,
diff --git a/contracts/feature-tests/composability/forwarder-raw/src/forwarder_raw_async.rs b/contracts/feature-tests/composability/forwarder-raw/src/forwarder_raw_async.rs
index fbd0eec1a4..55f00f079e 100644
--- a/contracts/feature-tests/composability/forwarder-raw/src/forwarder_raw_async.rs
+++ b/contracts/feature-tests/composability/forwarder-raw/src/forwarder_raw_async.rs
@@ -23,7 +23,7 @@ pub trait ForwarderRawAsync: super::forwarder_raw_common::ForwarderRawCommon {
     #[payable("*")]
     fn forward_direct_esdt_multi(&self, to: ManagedAddress) {
         let payments = self.call_value().all_esdt_transfers();
-        self.tx().to(&to).multi_esdt(payments).transfer();
+        self.tx().to(&to).payment(payments).transfer();
     }
 
     fn forward_contract_call(
diff --git a/contracts/feature-tests/composability/forwarder/src/call_async.rs b/contracts/feature-tests/composability/forwarder/src/call_async.rs
index 04ba78faab..3335b7df46 100644
--- a/contracts/feature-tests/composability/forwarder/src/call_async.rs
+++ b/contracts/feature-tests/composability/forwarder/src/call_async.rs
@@ -198,7 +198,7 @@ pub trait ForwarderAsyncCallModule {
             .to(&to)
             .typed(vault_proxy::VaultProxy)
             .accept_funds()
-            .with_multi_token_transfer(all_token_payments)
+            .payment(all_token_payments)
             .async_call()
             .call_and_exit();
     }
diff --git a/contracts/feature-tests/composability/forwarder/src/call_sync.rs b/contracts/feature-tests/composability/forwarder/src/call_sync.rs
index 8366f0ae29..28365c77b4 100644
--- a/contracts/feature-tests/composability/forwarder/src/call_sync.rs
+++ b/contracts/feature-tests/composability/forwarder/src/call_sync.rs
@@ -154,7 +154,7 @@ pub trait ForwarderSyncCallModule {
                 amount,
                 OptionalValue::<ManagedBuffer>::Some(b"accept_funds_func".into()),
             )
-            .with_multi_token_transfer(payments.clone_value())
+            .payment(payments.clone_value())
             .sync_call();
     }
 
@@ -180,7 +180,7 @@ pub trait ForwarderSyncCallModule {
             .to(&to)
             .typed(vault_proxy::VaultProxy)
             .accept_funds()
-            .with_multi_token_transfer(all_token_payments)
+            .payment(all_token_payments)
             .sync_call();
     }
 }
diff --git a/contracts/feature-tests/composability/forwarder/src/call_transf_exec.rs b/contracts/feature-tests/composability/forwarder/src/call_transf_exec.rs
index 3573987867..9051446954 100644
--- a/contracts/feature-tests/composability/forwarder/src/call_transf_exec.rs
+++ b/contracts/feature-tests/composability/forwarder/src/call_transf_exec.rs
@@ -110,7 +110,7 @@ pub trait ForwarderTransferExecuteModule {
             .to(&to)
             .typed(vault_proxy::VaultProxy)
             .accept_funds()
-            .with_multi_token_transfer(all_token_payments)
+            .payment(all_token_payments)
             .transfer_execute()
     }
 
@@ -133,7 +133,7 @@ pub trait ForwarderTransferExecuteModule {
             .to(&to)
             .typed(vault_proxy::VaultProxy)
             .accept_funds()
-            .with_multi_token_transfer(all_token_payments)
+            .payment(all_token_payments)
             .transfer_execute()
     }
 
@@ -156,7 +156,7 @@ pub trait ForwarderTransferExecuteModule {
             .to(&to)
             .typed(vault_proxy::VaultProxy)
             .reject_funds()
-            .with_multi_token_transfer(all_token_payments)
+            .payment(all_token_payments)
             .transfer_execute()
     }
 }
diff --git a/contracts/feature-tests/composability/forwarder/src/esdt.rs b/contracts/feature-tests/composability/forwarder/src/esdt.rs
index 844329ae65..7a3e938c06 100644
--- a/contracts/feature-tests/composability/forwarder/src/esdt.rs
+++ b/contracts/feature-tests/composability/forwarder/src/esdt.rs
@@ -84,7 +84,7 @@ pub trait ForwarderEsdtModule: storage::ForwarderStorageModule {
             all_token_payments.push(payment);
         }
 
-        self.tx().to(&to).multi_esdt(all_token_payments).transfer();
+        self.tx().to(&to).payment(all_token_payments).transfer();
     }
 
     #[payable("EGLD")]
diff --git a/contracts/feature-tests/composability/vault/src/vault.rs b/contracts/feature-tests/composability/vault/src/vault.rs
index d23123ca01..c90c54bb6c 100644
--- a/contracts/feature-tests/composability/vault/src/vault.rs
+++ b/contracts/feature-tests/composability/vault/src/vault.rs
@@ -188,7 +188,7 @@ pub trait Vault {
             all_payments.push(EsdtTokenPayment::new(token_id, nonce, amount));
         }
 
-        self.tx().to(caller).multi_esdt(all_payments).transfer();
+        self.tx().to(caller).payment(all_payments).transfer();
     }
 
     #[payable("*")]
@@ -226,7 +226,7 @@ pub trait Vault {
             ));
         }
 
-        self.tx().to_caller().multi_esdt(new_tokens).transfer();
+        self.tx().to_caller().payment(new_tokens).transfer();
     }
 
     #[event("accept_funds")]
diff --git a/contracts/modules/src/token_merge/mod.rs b/contracts/modules/src/token_merge/mod.rs
index 1164a44a45..2e4fe85668 100644
--- a/contracts/modules/src/token_merge/mod.rs
+++ b/contracts/modules/src/token_merge/mod.rs
@@ -118,10 +118,7 @@ pub trait TokenMergeModule:
                 .esdt_local_burn(&token.token_identifier, token.token_nonce, &token.amount);
         }
 
-        self.tx()
-            .to(ToCaller)
-            .multi_esdt(&output_payments)
-            .transfer();
+        self.tx().to(ToCaller).payment(&output_payments).transfer();
 
         output_payments
     }
@@ -167,10 +164,7 @@ pub trait TokenMergeModule:
         );
         tokens_to_remove.push(new_merged_token);
 
-        self.tx()
-            .to(ToCaller)
-            .multi_esdt(&tokens_to_remove)
-            .transfer();
+        self.tx().to(ToCaller).payment(&tokens_to_remove).transfer();
 
         tokens_to_remove
     }
diff --git a/contracts/modules/src/transfer_role_proxy.rs b/contracts/modules/src/transfer_role_proxy.rs
index 9001de263d..d5249ce04c 100644
--- a/contracts/modules/src/transfer_role_proxy.rs
+++ b/contracts/modules/src/transfer_role_proxy.rs
@@ -114,7 +114,7 @@ pub trait TransferRoleProxyModule {
                 if !initial_payments.is_empty() {
                     self.tx()
                         .to(&original_caller)
-                        .multi_esdt(initial_payments)
+                        .payment(initial_payments)
                         .transfer();
                 }
 
diff --git a/framework/base/src/contract_base/wrappers/send_wrapper.rs b/framework/base/src/contract_base/wrappers/send_wrapper.rs
index 74180719b4..11a8f748fc 100644
--- a/framework/base/src/contract_base/wrappers/send_wrapper.rs
+++ b/framework/base/src/contract_base/wrappers/send_wrapper.rs
@@ -294,7 +294,7 @@ where
         to: &ManagedAddress<A>,
         payments: &ManagedVec<A, EsdtTokenPayment<A>>,
     ) {
-        Tx::new_tx_from_sc().to(to).multi_esdt(payments).transfer();
+        Tx::new_tx_from_sc().to(to).payment(payments).transfer();
     }
 
     /// Performs a simple ESDT/NFT transfer, but via async call.  
@@ -348,7 +348,7 @@ where
     ) -> ! {
         Tx::new_tx_from_sc()
             .to(to)
-            .multi_esdt(payments)
+            .payment(payments)
             .async_call_and_exit()
     }
 
diff --git a/framework/base/src/types/interaction/tx.rs b/framework/base/src/types/interaction/tx.rs
index 75d565b97b..3d89a96115 100644
--- a/framework/base/src/types/interaction/tx.rs
+++ b/framework/base/src/types/interaction/tx.rs
@@ -205,9 +205,11 @@ where
         self.egld(egld_amount)
     }
 
-    /// Adds a single ESDT token transfer to a transaction.
+    /// Adds the first single, owned ESDT token payment to a transaction.
     ///
-    /// Since this is the first ESDT payment, a single payment tx is produced. Can be called again for multiple payments.
+    /// Since this is the first ESDT payment, a single payment tx is produced.
+    ///
+    /// Can subsequently be called again for multiple payments.
     pub fn esdt<P: Into<EsdtTokenPayment<Env::Api>>>(
         self,
         payment: P,
@@ -247,18 +249,32 @@ where
 
     /// Sets a collection of ESDT transfers as the payment of the transaction.
     ///
-    /// Equivalend to just ``.payment(payments)`, but only accepts the multi-esdt types.
-    pub fn multi_esdt<Payment>(self, payments: Payment) -> Tx<Env, From, To, Payment, Gas, Data, RH>
+    /// Can be formed from single ESDT payments, but the result will always be a collection.
+    ///
+    /// Always converts the argument into an owned collection of ESDT payments. For work with references, use `.payment(&p)` instead.
+    pub fn multi_esdt<IntoMulti>(
+        self,
+        payments: IntoMulti,
+    ) -> Tx<Env, From, To, MultiEsdtPayment<Env::Api>, Gas, Data, RH>
     where
-        Payment: TxPaymentMultiEsdt<Env>,
+        IntoMulti: Into<MultiEsdtPayment<Env::Api>>,
     {
-        self.payment(payments)
+        self.payment(payments.into())
+    }
+
+    /// Backwards compatibility.
+    pub fn with_esdt_transfer<P: Into<EsdtTokenPayment<Env::Api>>>(
+        mut self,
+        payment: P,
+    ) -> Tx<Env, From, To, MultiEsdtPayment<Env::Api>, Gas, Data, RH> {
+        self.payment(MultiEsdtPayment::new())
+            .with_esdt_transfer(payment)
     }
 
     /// Backwards compatibility.
     pub fn with_multi_token_transfer(
         self,
-        payments: MultiEsdtPayment<Env::Api>, // TODO: references
+        payments: MultiEsdtPayment<Env::Api>,
     ) -> Tx<Env, From, To, MultiEsdtPayment<Env::Api>, Gas, Data, RH> {
         self.multi_esdt(payments)
     }
@@ -288,9 +304,12 @@ where
     Data: TxData<Env>,
     RH: TxResultHandler<Env>,
 {
-    /// Adds a single ESDT token transfer to a contract call.
+    /// Adds the second ESDT token transfer to a contract call.
     ///
     /// Can be called multiple times on the same call.
+    ///
+    /// When the Tx already contains a single (owned) ESDT payment,
+    /// adding the second one will convert it to a list.
     pub fn esdt<P: Into<EsdtTokenPayment<Env::Api>>>(
         self,
         payment: P,
@@ -308,14 +327,6 @@ where
             result_handler: self.result_handler,
         }
     }
-
-    /// Backwards compatibility.
-    pub fn with_esdt_transfer<P: Into<EsdtTokenPayment<Env::Api>>>(
-        self,
-        payment: P,
-    ) -> Tx<Env, From, To, MultiEsdtPayment<Env::Api>, Gas, Data, RH> {
-        self.esdt(payment)
-    }
 }
 
 impl<Env, From, To, Gas, Data, RH> Tx<Env, From, To, MultiEsdtPayment<Env::Api>, Gas, Data, RH>
@@ -338,13 +349,23 @@ where
         self
     }
 
+    /// When the Tx already contains an owned collection of ESDT payments,
+    /// calling `multi_esdt` is equivalent to `esdt`, it just adds another payment to the list.
+    ///
+    /// Can be called multiple times.
+    pub fn multi_esdt<P: Into<EsdtTokenPayment<Env::Api>>>(
+        mut self,
+        payment: P,
+    ) -> Tx<Env, From, To, MultiEsdtPayment<Env::Api>, Gas, Data, RH> {
+        self.esdt(payment)
+    }
+
     /// Backwards compatibility.
     pub fn with_esdt_transfer<P: Into<EsdtTokenPayment<Env::Api>>>(
         mut self,
         payment: P,
     ) -> Tx<Env, From, To, MultiEsdtPayment<Env::Api>, Gas, Data, RH> {
-        self.payment.push(payment.into());
-        self
+        self.multi_esdt(payment)
     }
 }
 
diff --git a/framework/base/src/types/interaction/tx_exec/tx_exec_deploy.rs b/framework/base/src/types/interaction/tx_exec/tx_exec_deploy.rs
index 28608a33f5..040bf6f4af 100644
--- a/framework/base/src/types/interaction/tx_exec/tx_exec_deploy.rs
+++ b/framework/base/src/types/interaction/tx_exec/tx_exec_deploy.rs
@@ -220,9 +220,9 @@ where
     OriginalResult: TopEncodeMulti,
 {
     /// Backwards compatibility, immitates the old API.
-    /// 
+    ///
     /// Should no longer be used, which is why unlike all the rest of the old syntax, was deprecated.
-    /// 
+    ///
     /// Uses a `DeployCall` instead of the correct `UpgradeCall`, because the old syntax did not know about upgrades.
     ///
     /// Note that the data type (the `DeployCall`) doesn't have the code set.
@@ -249,9 +249,9 @@ where
     }
 
     /// Backwards compatibility, immitates the old API.
-    /// 
+    ///
     /// Should no longer be used, which is why unlike all the rest of the old syntax, was deprecated.
-    /// 
+    ///
     /// Uses a `DeployCall` instead of the correct `UpgradeCall`, because the old syntax did not know about upgrades.
     ///
     /// Note that the data type (the `DeployCall`) doesn't have the code set.
diff --git a/framework/base/src/types/managed/wrapped/esdt_token_payment.rs b/framework/base/src/types/managed/wrapped/esdt_token_payment.rs
index b074dc9bfe..ac7a54c442 100644
--- a/framework/base/src/types/managed/wrapped/esdt_token_payment.rs
+++ b/framework/base/src/types/managed/wrapped/esdt_token_payment.rs
@@ -258,3 +258,24 @@ impl<'a, M: ManagedTypeApi> EsdtTokenPaymentRefs<'a, M> {
         }
     }
 }
+
+impl<M: ManagedTypeApi> From<()> for MultiEsdtPayment<M> {
+    #[inline]
+    fn from(_value: ()) -> Self {
+        MultiEsdtPayment::new()
+    }
+}
+
+impl<M: ManagedTypeApi> From<EsdtTokenPayment<M>> for MultiEsdtPayment<M> {
+    #[inline]
+    fn from(value: EsdtTokenPayment<M>) -> Self {
+        MultiEsdtPayment::from_single_item(value)
+    }
+}
+
+impl<M: ManagedTypeApi> From<(TokenIdentifier<M>, u64, BigUint<M>)> for MultiEsdtPayment<M> {
+    #[inline]
+    fn from(value: (TokenIdentifier<M>, u64, BigUint<M>)) -> Self {
+        MultiEsdtPayment::from_single_item(value.into())
+    }
+}

From 145eb1bc52391ead3890fb57d9fc0c9654142ee5 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 12 Apr 2024 17:45:13 +0300
Subject: [PATCH 0710/1254] ESDTPayment triple as TxPayment

---
 .../src/call_transf_exec_legacy.rs            | 14 ++++++
 .../base/src/types/interaction/tx_payment.rs  |  1 +
 .../tx_payment_single_esdt_triple.rs          | 48 +++++++++++++++++++
 3 files changed, 63 insertions(+)
 create mode 100644 framework/base/src/types/interaction/tx_payment/tx_payment_single_esdt_triple.rs

diff --git a/contracts/feature-tests/composability/forwarder-legacy/src/call_transf_exec_legacy.rs b/contracts/feature-tests/composability/forwarder-legacy/src/call_transf_exec_legacy.rs
index f113edd27e..e789e4644f 100644
--- a/contracts/feature-tests/composability/forwarder-legacy/src/call_transf_exec_legacy.rs
+++ b/contracts/feature-tests/composability/forwarder-legacy/src/call_transf_exec_legacy.rs
@@ -18,6 +18,20 @@ pub trait ForwarderTransferExecuteModule {
             .transfer_execute();
     }
 
+    /// Tests triple as ESDTTokenPayment.
+    ///
+    /// TODO: move somewhere else after release
+    #[endpoint]
+    #[payable("*")]
+    fn forward_transf_exec_accept_single_esdt(&self, to: ManagedAddress) {
+        let payment = self.call_value().single_esdt();
+        self.vault_proxy()
+            .contract(to)
+            .accept_funds()
+            .payment((payment.token_identifier, 0, payment.amount))
+            .transfer_execute();
+    }
+
     #[endpoint]
     #[payable("*")]
     fn forward_transf_execu_accept_funds_with_fees(
diff --git a/framework/base/src/types/interaction/tx_payment.rs b/framework/base/src/types/interaction/tx_payment.rs
index 252204edd8..75b93f0ee4 100644
--- a/framework/base/src/types/interaction/tx_payment.rs
+++ b/framework/base/src/types/interaction/tx_payment.rs
@@ -8,6 +8,7 @@ mod tx_payment_multi_esdt;
 mod tx_payment_none;
 mod tx_payment_single_esdt;
 mod tx_payment_single_esdt_ref;
+mod tx_payment_single_esdt_triple;
 
 pub use tx_payment_egld::{Egld, EgldPayment};
 pub use tx_payment_egld_value::TxEgldValue;
diff --git a/framework/base/src/types/interaction/tx_payment/tx_payment_single_esdt_triple.rs b/framework/base/src/types/interaction/tx_payment/tx_payment_single_esdt_triple.rs
new file mode 100644
index 0000000000..6adf3dacc5
--- /dev/null
+++ b/framework/base/src/types/interaction/tx_payment/tx_payment_single_esdt_triple.rs
@@ -0,0 +1,48 @@
+use crate::{
+    contract_base::SendRawWrapper,
+    types::{
+        BigUint, EsdtTokenPayment, ManagedAddress, ManagedVec, MultiEsdtPayment, TokenIdentifier,
+        TxFrom, TxToSpecified,
+    },
+};
+
+use super::{AnnotatedEgldPayment, FullPaymentData, FunctionCall, TxEgldValue, TxEnv, TxPayment};
+
+impl<Env> TxPayment<Env> for (TokenIdentifier<Env::Api>, u64, BigUint<Env::Api>)
+where
+    Env: TxEnv,
+{
+    fn is_no_payment(&self, _env: &Env) -> bool {
+        self.2 == 0u32
+    }
+
+    fn perform_transfer_execute(
+        self,
+        env: &Env,
+        to: &ManagedAddress<Env::Api>,
+        gas_limit: u64,
+        fc: FunctionCall<Env::Api>,
+    ) {
+        EsdtTokenPayment::from(self).perform_transfer_execute(env, to, gas_limit, fc)
+    }
+
+    fn with_normalized<From, To, F, R>(
+        self,
+        env: &Env,
+        from: &From,
+        to: To,
+        fc: FunctionCall<Env::Api>,
+        f: F,
+    ) -> R
+    where
+        From: TxFrom<Env>,
+        To: TxToSpecified<Env>,
+        F: FnOnce(&ManagedAddress<Env::Api>, &BigUint<Env::Api>, &FunctionCall<Env::Api>) -> R,
+    {
+        EsdtTokenPayment::from(self).with_normalized(env, from, to, fc, f)
+    }
+
+    fn into_full_payment_data(self, env: &Env) -> FullPaymentData<Env::Api> {
+        EsdtTokenPayment::from(self).into_full_payment_data(env)
+    }
+}

From 62a7ff225515cb681c8b61e97fc39c715b35e9ee Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Fri, 12 Apr 2024 18:36:06 +0200
Subject: [PATCH 0711/1254] u64 values for nonces

---
 .../scenario-tester/tests/st_blackbox_test.rs       | 13 ++++++-------
 .../src/scenario/model/value/value_set_u64.rs       |  9 +++++++++
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/contracts/feature-tests/scenario-tester/tests/st_blackbox_test.rs b/contracts/feature-tests/scenario-tester/tests/st_blackbox_test.rs
index 1a997b698e..ae3e29da45 100644
--- a/contracts/feature-tests/scenario-tester/tests/st_blackbox_test.rs
+++ b/contracts/feature-tests/scenario-tester/tests/st_blackbox_test.rs
@@ -61,7 +61,6 @@ fn st_blackbox() {
         .code(CODE_EXPR)
         .returns(ReturnsNewAddress)
         .run();
-
     assert_eq!(new_address, st_contract.to_address());
 
     let value = world
@@ -124,10 +123,10 @@ fn set_state_test() {
 
     world
         .check_state_account(first)
-        .nonce("1")
+        .nonce(1)
         .balance("100")
         .check_state_account(second)
-        .nonce("2")
+        .nonce(2)
         .balance("300")
         .esdt_balance("str:TOKEN-123456", "500")
         .commit();
@@ -141,7 +140,7 @@ fn set_state_test() {
 
     world
         .check_state_account(third)
-        .nonce("3")
+        .nonce(3)
         .balance("50")
         .esdt_nft_balance_and_attributes("str:NFT-123456", "2", "1", Some(Vec::<u8>::new()))
         .commit();
@@ -158,10 +157,10 @@ fn set_state_test() {
 
     world
         .check_state_account(fourth)
-        .nonce("4")
+        .nonce(4)
         .balance("400")
         .check_state_account(fifth)
-        .nonce("5")
+        .nonce(5)
         .balance("250")
         .esdt_balance("str:TOKEN-123456", "2");
 
@@ -173,7 +172,7 @@ fn set_state_test() {
 
     world
         .check_state_account(sixth)
-        .nonce("6")
+        .nonce(6)
         .balance("600")
         .esdt_balance("str:TOKEN-123456", "60");
 }
diff --git a/framework/scenario/src/scenario/model/value/value_set_u64.rs b/framework/scenario/src/scenario/model/value/value_set_u64.rs
index 1fdabe5cf7..b332543116 100644
--- a/framework/scenario/src/scenario/model/value/value_set_u64.rs
+++ b/framework/scenario/src/scenario/model/value/value_set_u64.rs
@@ -36,6 +36,15 @@ impl Default for U64Value {
     }
 }
 
+impl InterpretableFrom<u64> for U64Value {
+    fn interpret_from(from: u64, _context: &InterpreterContext) -> Self {
+        U64Value {
+            value: from,
+            original: ValueSubTree::Str(from.to_string()),
+        }
+    }
+}
+
 impl InterpretableFrom<ValueSubTree> for U64Value {
     fn interpret_from(from: ValueSubTree, context: &InterpreterContext) -> Self {
         let bytes = interpret_subtree(&from, context);

From f6901a274d49c78592e3835225af558d837d0e66 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 12 Apr 2024 13:44:30 +0300
Subject: [PATCH 0712/1254] fix unused

---
 .../base/src/types/interaction/annotated.rs   |  5 +---
 .../annotated/annotated_impl_big_uint.rs      | 12 ++++-----
 .../annotated_impl_managed_address.rs         | 14 +++++-----
 .../annotated_impl_managed_buffer.rs          |  4 +--
 .../annotated/annotated_impl_u64.rs           | 13 +++------
 .../contract_call_exec.rs                     |  4 +--
 .../src/types/interaction/function_call.rs    |  5 ++--
 .../markers/esdt_system_sc_address.rs         | 12 +++------
 .../src/types/interaction/markers/gas_left.rs | 11 +++-----
 .../types/interaction/markers/to_caller.rs    |  2 +-
 .../src/types/interaction/markers/to_self.rs  |  2 +-
 framework/base/src/types/interaction/mod.rs   |  2 --
 .../system_proxy/builtin_func_proxy.rs        |  9 +++----
 .../system_proxy/esdt_system_sc_proxy.rs      | 12 +++------
 .../system_proxy/legacy_system_sc_proxy.rs    |  1 -
 framework/base/src/types/interaction/tx.rs    | 27 +++++++++----------
 .../base/src/types/interaction/tx_data.rs     |  2 +-
 .../base/src/types/interaction/tx_exec.rs     |  1 -
 .../types/interaction/tx_exec/tx_env_sc.rs    |  4 +--
 .../interaction/tx_exec/tx_exec_async.rs      |  6 ++---
 .../tx_exec/tx_exec_async_promises.rs         |  4 +--
 .../interaction/tx_exec/tx_exec_deploy.rs     |  7 +++--
 .../types/interaction/tx_exec/tx_exec_sync.rs |  5 ++--
 .../interaction/tx_exec/tx_exec_upgrade.rs    |  6 ++---
 .../base/src/types/interaction/tx_payment.rs  |  6 +----
 .../tx_payment/tx_payment_egld_or_esdt.rs     | 10 ++-----
 .../tx_payment_egld_or_esdt_refs.rs           | 16 ++---------
 .../tx_payment_egld_or_multi_esdt.rs          | 15 ++---------
 .../tx_payment_egld_or_multi_esdt_ref.rs      | 16 ++---------
 .../tx_payment/tx_payment_multi_esdt.rs       |  8 +++---
 .../interaction/tx_payment/tx_payment_none.rs | 10 ++-----
 .../tx_payment/tx_payment_single_esdt.rs      | 10 +++----
 .../tx_payment/tx_payment_single_esdt_ref.rs  |  8 +++---
 .../tx_payment_single_esdt_triple.rs          | 10 +++----
 .../types/interaction/tx_result_handler.rs    |  2 ++
 .../tx_result_handler/returns_bt.rs           |  4 +--
 .../tx_result_handler/returns_new_address.rs  |  5 +---
 .../returns_new_managed_address.rs            |  4 +--
 .../tx_result_handler/returns_raw_result.rs   |  4 +--
 .../tx_result_handler/returns_result.rs       |  4 +--
 .../tx_result_handler/returns_result_conv.rs  |  3 +--
 .../tx_result_handler/with_new_address.rs     |  4 +--
 .../tx_result_handler/with_result.rs          |  3 +--
 .../tx_result_handler/with_result_conv.rs     |  3 +--
 .../interaction/tx_rh_list/tx_rh_list_exec.rs |  5 +---
 45 files changed, 102 insertions(+), 218 deletions(-)

diff --git a/framework/base/src/types/interaction/annotated.rs b/framework/base/src/types/interaction/annotated.rs
index dc9e117e7e..5586168651 100644
--- a/framework/base/src/types/interaction/annotated.rs
+++ b/framework/base/src/types/interaction/annotated.rs
@@ -6,10 +6,7 @@ mod annotated_impl_u64;
 use crate::{
     api::ManagedTypeApi,
     formatter::FormatBuffer,
-    types::{
-        heap::Address, BigUint, ManagedAddress, ManagedBuffer, ManagedBufferCachedBuilder,
-        ManagedRef,
-    },
+    types::{ManagedBuffer, ManagedBufferCachedBuilder},
 };
 
 use super::TxEnv;
diff --git a/framework/base/src/types/interaction/annotated/annotated_impl_big_uint.rs b/framework/base/src/types/interaction/annotated/annotated_impl_big_uint.rs
index 36c11f1c70..ea2250399d 100644
--- a/framework/base/src/types/interaction/annotated/annotated_impl_big_uint.rs
+++ b/framework/base/src/types/interaction/annotated/annotated_impl_big_uint.rs
@@ -1,4 +1,4 @@
-use crate::types::{heap::Address, BigUint, ManagedAddress, ManagedBuffer, ManagedRef};
+use crate::types::{BigUint, ManagedBuffer, ManagedRef};
 
 use super::{AnnotatedValue, TxEnv};
 
@@ -18,7 +18,7 @@ where
         self
     }
 
-    fn with_value_ref<F, R>(&self, env: &Env, f: F) -> R
+    fn with_value_ref<F, R>(&self, _env: &Env, f: F) -> R
     where
         F: FnOnce(&BigUint<Env::Api>) -> R,
     {
@@ -42,7 +42,7 @@ where
         self.clone()
     }
 
-    fn with_value_ref<F, R>(&self, env: &Env, f: F) -> R
+    fn with_value_ref<F, R>(&self, _env: &Env, f: F) -> R
     where
         F: FnOnce(&BigUint<Env::Api>) -> R,
     {
@@ -66,7 +66,7 @@ where
         self.clone_value()
     }
 
-    fn with_value_ref<F, R>(&self, env: &Env, f: F) -> R
+    fn with_value_ref<F, R>(&self, _env: &Env, f: F) -> R
     where
         F: FnOnce(&BigUint<Env::Api>) -> R,
     {
@@ -78,7 +78,7 @@ impl<Env> AnnotatedValue<Env, BigUint<Env::Api>> for u64
 where
     Env: TxEnv,
 {
-    fn annotation(&self, env: &Env) -> ManagedBuffer<Env::Api> {
+    fn annotation(&self, _env: &Env) -> ManagedBuffer<Env::Api> {
         BigUint::from(*self).to_display()
     }
 
@@ -91,7 +91,7 @@ impl<Env> AnnotatedValue<Env, BigUint<Env::Api>> for ()
 where
     Env: TxEnv,
 {
-    fn annotation(&self, env: &Env) -> ManagedBuffer<Env::Api> {
+    fn annotation(&self, _env: &Env) -> ManagedBuffer<Env::Api> {
         ManagedBuffer::from("0")
     }
 
diff --git a/framework/base/src/types/interaction/annotated/annotated_impl_managed_address.rs b/framework/base/src/types/interaction/annotated/annotated_impl_managed_address.rs
index 3d08368c53..403ccf4603 100644
--- a/framework/base/src/types/interaction/annotated/annotated_impl_managed_address.rs
+++ b/framework/base/src/types/interaction/annotated/annotated_impl_managed_address.rs
@@ -1,4 +1,4 @@
-use crate::types::{heap::Address, BigUint, ManagedAddress, ManagedBuffer, ManagedRef};
+use crate::types::{heap::Address, ManagedAddress, ManagedBuffer};
 
 use super::{AnnotatedValue, TxEnv};
 
@@ -10,7 +10,7 @@ where
         self.hex_expr()
     }
 
-    fn to_value(&self, env: &Env) -> ManagedAddress<Env::Api> {
+    fn to_value(&self, _env: &Env) -> ManagedAddress<Env::Api> {
         self.clone()
     }
 
@@ -18,7 +18,7 @@ where
         self
     }
 
-    fn with_value_ref<F, R>(&self, env: &Env, f: F) -> R
+    fn with_value_ref<F, R>(&self, _env: &Env, f: F) -> R
     where
         F: FnOnce(&ManagedAddress<Env::Api>) -> R,
     {
@@ -34,7 +34,7 @@ where
         self.hex_expr()
     }
 
-    fn to_value(&self, env: &Env) -> ManagedAddress<Env::Api> {
+    fn to_value(&self, _env: &Env) -> ManagedAddress<Env::Api> {
         (*self).clone()
     }
 
@@ -42,7 +42,7 @@ where
         self.clone()
     }
 
-    fn with_value_ref<F, R>(&self, env: &Env, f: F) -> R
+    fn with_value_ref<F, R>(&self, _env: &Env, f: F) -> R
     where
         F: FnOnce(&ManagedAddress<Env::Api>) -> R,
     {
@@ -58,7 +58,7 @@ where
         ManagedAddress::from(self).hex_expr()
     }
 
-    fn to_value(&self, env: &Env) -> ManagedAddress<Env::Api> {
+    fn to_value(&self, _env: &Env) -> ManagedAddress<Env::Api> {
         ManagedAddress::from(self)
     }
 }
@@ -71,7 +71,7 @@ where
         ManagedAddress::from(*self).hex_expr()
     }
 
-    fn to_value(&self, env: &Env) -> ManagedAddress<Env::Api> {
+    fn to_value(&self, _env: &Env) -> ManagedAddress<Env::Api> {
         ManagedAddress::from(*self)
     }
 }
diff --git a/framework/base/src/types/interaction/annotated/annotated_impl_managed_buffer.rs b/framework/base/src/types/interaction/annotated/annotated_impl_managed_buffer.rs
index 433cf431af..b8d4fc8fd7 100644
--- a/framework/base/src/types/interaction/annotated/annotated_impl_managed_buffer.rs
+++ b/framework/base/src/types/interaction/annotated/annotated_impl_managed_buffer.rs
@@ -1,4 +1,4 @@
-use crate::types::{heap::Address, BigUint, ManagedAddress, ManagedBuffer, ManagedRef};
+use crate::types::ManagedBuffer;
 
 use super::{AnnotatedValue, TxEnv};
 
@@ -18,7 +18,7 @@ where
         self
     }
 
-    fn with_value_ref<F, R>(&self, env: &Env, f: F) -> R
+    fn with_value_ref<F, R>(&self, _env: &Env, f: F) -> R
     where
         F: FnOnce(&ManagedBuffer<Env::Api>) -> R,
     {
diff --git a/framework/base/src/types/interaction/annotated/annotated_impl_u64.rs b/framework/base/src/types/interaction/annotated/annotated_impl_u64.rs
index 04ad3fd7c0..ed310d1f43 100644
--- a/framework/base/src/types/interaction/annotated/annotated_impl_u64.rs
+++ b/framework/base/src/types/interaction/annotated/annotated_impl_u64.rs
@@ -1,11 +1,4 @@
-use crate::{
-    api::ManagedTypeApi,
-    formatter::{FormatBuffer, SCDisplay},
-    types::{
-        heap::Address, BigUint, ManagedAddress, ManagedBuffer, ManagedBufferCachedBuilder,
-        ManagedRef,
-    },
-};
+use crate::types::ManagedBuffer;
 
 use super::{display_u64, AnnotatedValue, TxEnv};
 
@@ -13,7 +6,7 @@ impl<Env> AnnotatedValue<Env, u64> for u64
 where
     Env: TxEnv,
 {
-    fn annotation(&self, env: &Env) -> ManagedBuffer<Env::Api> {
+    fn annotation(&self, _env: &Env) -> ManagedBuffer<Env::Api> {
         display_u64(*self)
     }
 
@@ -26,7 +19,7 @@ impl<Env> AnnotatedValue<Env, u64> for i32
 where
     Env: TxEnv,
 {
-    fn annotation(&self, env: &Env) -> ManagedBuffer<Env::Api> {
+    fn annotation(&self, _env: &Env) -> ManagedBuffer<Env::Api> {
         display_u64(*self as u64)
     }
 
diff --git a/framework/base/src/types/interaction/contract_call_legacy/contract_call_exec.rs b/framework/base/src/types/interaction/contract_call_legacy/contract_call_exec.rs
index 4c8a0e3497..6ec1d82009 100644
--- a/framework/base/src/types/interaction/contract_call_legacy/contract_call_exec.rs
+++ b/framework/base/src/types/interaction/contract_call_legacy/contract_call_exec.rs
@@ -3,11 +3,9 @@ use crate::{
     codec::TopDecodeMulti,
     contract_base::SendRawWrapper,
     formatter::SCLowerHex,
-    io::{ArgErrorHandler, ArgId, ManagedResultArgLoader},
     types::{
         decode_result, AsyncCall, AsyncCallPromises, BigUint, EsdtTokenPayment, ManagedBuffer,
-        ManagedBufferBuilder, ManagedBufferCachedBuilder, ManagedType, ManagedVec, Tx,
-        TRANSFER_EXECUTE_DEFAULT_LEFTOVER,
+        ManagedBufferBuilder, ManagedType, ManagedVec, Tx, TRANSFER_EXECUTE_DEFAULT_LEFTOVER,
     },
 };
 
diff --git a/framework/base/src/types/interaction/function_call.rs b/framework/base/src/types/interaction/function_call.rs
index f18ded4c2c..1d78735a79 100644
--- a/framework/base/src/types/interaction/function_call.rs
+++ b/framework/base/src/types/interaction/function_call.rs
@@ -9,10 +9,9 @@ use crate::{
         CallTypeApi, ManagedTypeApi, ESDT_MULTI_TRANSFER_FUNC_NAME, ESDT_NFT_TRANSFER_FUNC_NAME,
         ESDT_TRANSFER_FUNC_NAME,
     },
-    formatter::SCLowerHex,
     types::{
-        EsdtTokenPayment, EsdtTokenPaymentRefs, ManagedAddress, ManagedBuffer,
-        ManagedBufferBuilder, ManagedVec, MultiValueEncoded,
+        EsdtTokenPayment, EsdtTokenPaymentRefs, ManagedAddress, ManagedBuffer, ManagedVec,
+        MultiValueEncoded,
     },
 };
 
diff --git a/framework/base/src/types/interaction/markers/esdt_system_sc_address.rs b/framework/base/src/types/interaction/markers/esdt_system_sc_address.rs
index f9d1f94ce2..8d59b682be 100644
--- a/framework/base/src/types/interaction/markers/esdt_system_sc_address.rs
+++ b/framework/base/src/types/interaction/markers/esdt_system_sc_address.rs
@@ -2,14 +2,8 @@ use hex_literal::hex;
 use multiversx_sc_codec::{CodecFrom, EncodeErrorHandler, TopEncode, TopEncodeOutput};
 
 use crate::{
-    api::{
-        const_handles, use_raw_handle, BlockchainApi, BlockchainApiImpl, CallTypeApi,
-        ManagedTypeApi,
-    },
-    contract_base::BlockchainWrapper,
-    types::{
-        AnnotatedValue, ManagedAddress, ManagedBuffer, ManagedType, TxScEnv, TxTo, TxToSpecified,
-    },
+    api::{CallTypeApi, ManagedTypeApi},
+    types::{AnnotatedValue, ManagedAddress, ManagedBuffer, TxScEnv, TxTo, TxToSpecified},
 };
 
 /// Address of the system smart contract that manages ESDT.
@@ -44,7 +38,7 @@ impl<Api> AnnotatedValue<TxScEnv<Api>, ManagedAddress<Api>> for ESDTSystemSCAddr
 where
     Api: CallTypeApi,
 {
-    fn annotation(&self, env: &TxScEnv<Api>) -> ManagedBuffer<Api> {
+    fn annotation(&self, _env: &TxScEnv<Api>) -> ManagedBuffer<Api> {
         ManagedBuffer::from(SYSTEM_SC_ADDRESS_ANNOTATION)
     }
 
diff --git a/framework/base/src/types/interaction/markers/gas_left.rs b/framework/base/src/types/interaction/markers/gas_left.rs
index 69f43753f6..d30209b3d1 100644
--- a/framework/base/src/types/interaction/markers/gas_left.rs
+++ b/framework/base/src/types/interaction/markers/gas_left.rs
@@ -1,11 +1,6 @@
 use crate::{
-    api::{BlockchainApi, BlockchainApiImpl, ManagedTypeApi},
-    formatter::FormatBuffer,
-    types::{
-        interaction::display_u64, AnnotatedValue, BigUint, ManagedAddress, ManagedBuffer,
-        ManagedBufferCachedBuilder, TxCodeValue, TxEgldValue, TxEnv, TxFrom, TxFromSpecified,
-        TxGasValue, TxTo, TxToSpecified,
-    },
+    api::{BlockchainApi, BlockchainApiImpl},
+    types::{interaction::display_u64, AnnotatedValue, ManagedBuffer, TxEnv, TxGasValue},
 };
 
 /// Indicates that all remaining gas should be sent to a transaction.
@@ -21,7 +16,7 @@ where
         display_u64(self.to_value(env))
     }
 
-    fn to_value(&self, env: &Env) -> u64 {
+    fn to_value(&self, _env: &Env) -> u64 {
         Env::Api::blockchain_api_impl().get_gas_left()
     }
 }
diff --git a/framework/base/src/types/interaction/markers/to_caller.rs b/framework/base/src/types/interaction/markers/to_caller.rs
index 7d311438b9..f24191ce9f 100644
--- a/framework/base/src/types/interaction/markers/to_caller.rs
+++ b/framework/base/src/types/interaction/markers/to_caller.rs
@@ -21,7 +21,7 @@ where
         BlockchainWrapper::<Api>::new().get_caller()
     }
 
-    fn with_value_ref<F, R>(&self, env: &TxScEnv<Api>, f: F) -> R
+    fn with_value_ref<F, R>(&self, _env: &TxScEnv<Api>, f: F) -> R
     where
         F: FnOnce(&ManagedAddress<Api>) -> R,
     {
diff --git a/framework/base/src/types/interaction/markers/to_self.rs b/framework/base/src/types/interaction/markers/to_self.rs
index 7b8115b38e..dee4d5ed3a 100644
--- a/framework/base/src/types/interaction/markers/to_self.rs
+++ b/framework/base/src/types/interaction/markers/to_self.rs
@@ -21,7 +21,7 @@ where
         BlockchainWrapper::<Api>::new().get_sc_address()
     }
 
-    fn with_value_ref<F, R>(&self, env: &TxScEnv<Api>, f: F) -> R
+    fn with_value_ref<F, R>(&self, _env: &TxScEnv<Api>, f: F) -> R
     where
         F: FnOnce(&ManagedAddress<Api>) -> R,
     {
diff --git a/framework/base/src/types/interaction/mod.rs b/framework/base/src/types/interaction/mod.rs
index 9703822387..e05d420cdf 100644
--- a/framework/base/src/types/interaction/mod.rs
+++ b/framework/base/src/types/interaction/mod.rs
@@ -1,5 +1,3 @@
-#![allow(unused)] // TEMP
-
 mod annotated;
 mod async_call;
 mod async_call_promises;
diff --git a/framework/base/src/types/interaction/system_proxy/builtin_func_proxy.rs b/framework/base/src/types/interaction/system_proxy/builtin_func_proxy.rs
index 66a660a6d8..fe421c5ef7 100644
--- a/framework/base/src/types/interaction/system_proxy/builtin_func_proxy.rs
+++ b/framework/base/src/types/interaction/system_proxy/builtin_func_proxy.rs
@@ -1,11 +1,8 @@
 use multiversx_sc_codec::{CodecInto, Empty, TopEncode};
 
-use crate::{
-    api::VMApi,
-    types::{
-        BigUint, ManagedAddress, ManagedBuffer, ManagedVec, TokenIdentifier, Tx, TxEnv, TxFrom,
-        TxGas, TxProxyCall, TxProxyTrait, TxTo,
-    },
+use crate::types::{
+    BigUint, ManagedAddress, ManagedBuffer, ManagedVec, TokenIdentifier, Tx, TxEnv, TxFrom, TxGas,
+    TxProxyCall, TxProxyTrait, TxTo,
 };
 
 use super::builtin_func_names::{
diff --git a/framework/base/src/types/interaction/system_proxy/esdt_system_sc_proxy.rs b/framework/base/src/types/interaction/system_proxy/esdt_system_sc_proxy.rs
index 56b14ce83b..3589f4ce28 100644
--- a/framework/base/src/types/interaction/system_proxy/esdt_system_sc_proxy.rs
+++ b/framework/base/src/types/interaction/system_proxy/esdt_system_sc_proxy.rs
@@ -1,15 +1,11 @@
-use core::marker::PhantomData;
-
 use super::token_properties::*;
-use hex_literal::hex;
 
 use crate::{
-    api::{CallTypeApi, SendApi, VMApi},
+    api::CallTypeApi,
     types::{
-        BigUint, ContractCall, ContractCallNoPayment, ContractCallWithEgld, EgldPayment,
-        EsdtLocalRole, EsdtTokenType, FunctionCall, ManagedAddress, ManagedBuffer,
-        OriginalResultMarker, TokenIdentifier, Tx, TxEnv, TxFrom, TxGas, TxProxyCall, TxProxyTrait,
-        TxTo,
+        BigUint, EgldPayment, EsdtLocalRole, EsdtTokenType, FunctionCall, ManagedAddress,
+        ManagedBuffer, OriginalResultMarker, TokenIdentifier, Tx, TxEnv, TxFrom, TxGas,
+        TxProxyCall, TxProxyTrait, TxTo,
     },
 };
 
diff --git a/framework/base/src/types/interaction/system_proxy/legacy_system_sc_proxy.rs b/framework/base/src/types/interaction/system_proxy/legacy_system_sc_proxy.rs
index c19fe2e4e6..6f74b80812 100644
--- a/framework/base/src/types/interaction/system_proxy/legacy_system_sc_proxy.rs
+++ b/framework/base/src/types/interaction/system_proxy/legacy_system_sc_proxy.rs
@@ -1,7 +1,6 @@
 use core::marker::PhantomData;
 
 // use super::properties::*;
-use hex_literal::hex;
 
 use crate::{
     api::{CallTypeApi, SendApi},
diff --git a/framework/base/src/types/interaction/tx.rs b/framework/base/src/types/interaction/tx.rs
index 3d89a96115..98d88e499a 100644
--- a/framework/base/src/types/interaction/tx.rs
+++ b/framework/base/src/types/interaction/tx.rs
@@ -1,24 +1,23 @@
 use crate::{
-    api::{CallTypeApi, ManagedTypeApi},
+    api::CallTypeApi,
     contract_base::BlockchainWrapper,
     types::{
         BigUint, CodeMetadata, EgldOrEsdtTokenIdentifier, EgldOrEsdtTokenPayment,
-        EgldOrEsdtTokenPaymentRefs, EgldOrMultiEsdtPayment, EgldOrMultiEsdtPaymentRefs,
-        EsdtTokenPayment, EsdtTokenPaymentRefs, ManagedAddress, ManagedBuffer, ManagedOption,
-        ManagedVec, MultiEsdtPayment, TokenIdentifier,
+        EgldOrEsdtTokenPaymentRefs, EgldOrMultiEsdtPayment, EsdtTokenPayment, EsdtTokenPaymentRefs,
+        ManagedAddress, ManagedBuffer, ManagedOption, ManagedVec, MultiEsdtPayment,
+        TokenIdentifier,
     },
 };
 
 use multiversx_sc_codec::TopEncodeMulti;
 
 use super::{
-    contract_deploy::UNSPECIFIED_GAS_LIMIT, AnnotatedValue, Code, ContractCallBase,
-    ContractCallNoPayment, ContractCallWithEgld, ContractDeploy, DeployCall, Egld, EgldPayment,
-    ExplicitGas, FromSource, FunctionCall, ManagedArgBuffer, OriginalResultMarker, RHList,
-    RHListAppendNoRet, RHListAppendRet, RHListItem, TxCodeSource, TxCodeValue, TxData,
-    TxDataFunctionCall, TxEgldValue, TxEnv, TxFrom, TxFromSourceValue, TxGas, TxGasValue,
-    TxPayment, TxPaymentEgldOnly, TxPaymentMultiEsdt, TxProxyTrait, TxResultHandler, TxScEnv, TxTo,
-    TxToSpecified, UpgradeCall,
+    contract_deploy::UNSPECIFIED_GAS_LIMIT, Code, ContractCallBase, ContractCallNoPayment,
+    ContractCallWithEgld, ContractDeploy, DeployCall, Egld, EgldPayment, ExplicitGas, FromSource,
+    FunctionCall, ManagedArgBuffer, OriginalResultMarker, RHList, RHListAppendNoRet,
+    RHListAppendRet, RHListItem, TxCodeSource, TxCodeValue, TxData, TxDataFunctionCall,
+    TxEgldValue, TxEnv, TxFrom, TxFromSourceValue, TxGas, TxGasValue, TxPayment, TxPaymentEgldOnly,
+    TxProxyTrait, TxResultHandler, TxScEnv, TxTo, TxToSpecified, UpgradeCall,
 };
 
 #[must_use]
@@ -264,7 +263,7 @@ where
 
     /// Backwards compatibility.
     pub fn with_esdt_transfer<P: Into<EsdtTokenPayment<Env::Api>>>(
-        mut self,
+        self,
         payment: P,
     ) -> Tx<Env, From, To, MultiEsdtPayment<Env::Api>, Gas, Data, RH> {
         self.payment(MultiEsdtPayment::new())
@@ -354,7 +353,7 @@ where
     ///
     /// Can be called multiple times.
     pub fn multi_esdt<P: Into<EsdtTokenPayment<Env::Api>>>(
-        mut self,
+        self,
         payment: P,
     ) -> Tx<Env, From, To, MultiEsdtPayment<Env::Api>, Gas, Data, RH> {
         self.esdt(payment)
@@ -362,7 +361,7 @@ where
 
     /// Backwards compatibility.
     pub fn with_esdt_transfer<P: Into<EsdtTokenPayment<Env::Api>>>(
-        mut self,
+        self,
         payment: P,
     ) -> Tx<Env, From, To, MultiEsdtPayment<Env::Api>, Gas, Data, RH> {
         self.multi_esdt(payment)
diff --git a/framework/base/src/types/interaction/tx_data.rs b/framework/base/src/types/interaction/tx_data.rs
index 2475737df0..7ea227deaa 100644
--- a/framework/base/src/types/interaction/tx_data.rs
+++ b/framework/base/src/types/interaction/tx_data.rs
@@ -1,6 +1,6 @@
 use crate::{
     formatter::SCLowerHex,
-    types::{ManagedBuffer, ManagedBufferBuilder, ManagedBufferCachedBuilder},
+    types::{ManagedBuffer, ManagedBufferBuilder},
 };
 
 use super::{FunctionCall, TxEnv};
diff --git a/framework/base/src/types/interaction/tx_exec.rs b/framework/base/src/types/interaction/tx_exec.rs
index 3bf35975ed..0ee6371b72 100644
--- a/framework/base/src/types/interaction/tx_exec.rs
+++ b/framework/base/src/types/interaction/tx_exec.rs
@@ -11,7 +11,6 @@ pub use tx_exec_async::*;
 pub use tx_exec_async_promises::*;
 pub use tx_exec_deploy::*;
 pub use tx_exec_sync::*;
-pub use tx_exec_upgrade::*;
 
 use crate::{
     api::CallTypeApi,
diff --git a/framework/base/src/types/interaction/tx_exec/tx_env_sc.rs b/framework/base/src/types/interaction/tx_exec/tx_env_sc.rs
index cbbcc35dc2..48cf21b0bb 100644
--- a/framework/base/src/types/interaction/tx_exec/tx_env_sc.rs
+++ b/framework/base/src/types/interaction/tx_exec/tx_env_sc.rs
@@ -4,8 +4,8 @@ use crate::{
     api::{BlockchainApiImpl, CallTypeApi},
     contract_base::BlockchainWrapper,
     types::{
-        interaction::display_u64, AnnotatedValue, ManagedAddress, ManagedBuffer, Tx, TxBaseWithEnv,
-        TxEnv, TRANSFER_EXECUTE_DEFAULT_LEFTOVER,
+        interaction::display_u64, ManagedAddress, ManagedBuffer, Tx, TxBaseWithEnv, TxEnv,
+        TRANSFER_EXECUTE_DEFAULT_LEFTOVER,
     },
 };
 
diff --git a/framework/base/src/types/interaction/tx_exec/tx_exec_async.rs b/framework/base/src/types/interaction/tx_exec/tx_exec_async.rs
index 0e883eca3a..238b978139 100644
--- a/framework/base/src/types/interaction/tx_exec/tx_exec_async.rs
+++ b/framework/base/src/types/interaction/tx_exec/tx_exec_async.rs
@@ -2,9 +2,9 @@ use crate::{
     api::{CallTypeApi, StorageWriteApi},
     contract_base::SendRawWrapper,
     types::{
-        CallbackClosure, ExplicitGas, ManagedBuffer, OriginalResultMarker, Tx, TxData,
-        TxDataFunctionCall, TxEmptyResultHandler, TxEnv, TxFrom, TxGas, TxGasValue, TxPayment,
-        TxResultHandler, TxScEnv, TxTo, TxToSpecified,
+        CallbackClosure, OriginalResultMarker, Tx, TxData, TxDataFunctionCall,
+        TxEmptyResultHandler, TxEnv, TxFrom, TxGas, TxPayment, TxResultHandler, TxScEnv, TxTo,
+        TxToSpecified,
     },
 };
 
diff --git a/framework/base/src/types/interaction/tx_exec/tx_exec_async_promises.rs b/framework/base/src/types/interaction/tx_exec/tx_exec_async_promises.rs
index 4b6fadc102..ad8d8d4145 100644
--- a/framework/base/src/types/interaction/tx_exec/tx_exec_async_promises.rs
+++ b/framework/base/src/types/interaction/tx_exec/tx_exec_async_promises.rs
@@ -3,8 +3,8 @@ use crate::{
     contract_base::SendRawWrapper,
     types::{
         interaction::callback_closure::CallbackClosureWithGas, CallbackClosure, ExplicitGas,
-        FunctionCall, GasLeft, ManagedBuffer, ManagedType, OriginalResultMarker, Tx, TxGas,
-        TxGasValue, TxPayment, TxResultHandler, TxScEnv, TxToSpecified,
+        FunctionCall, ManagedBuffer, ManagedType, OriginalResultMarker, Tx, TxGas, TxGasValue,
+        TxPayment, TxResultHandler, TxScEnv, TxToSpecified,
     },
 };
 
diff --git a/framework/base/src/types/interaction/tx_exec/tx_exec_deploy.rs b/framework/base/src/types/interaction/tx_exec/tx_exec_deploy.rs
index 040bf6f4af..9ccb4bdd2a 100644
--- a/framework/base/src/types/interaction/tx_exec/tx_exec_deploy.rs
+++ b/framework/base/src/types/interaction/tx_exec/tx_exec_deploy.rs
@@ -5,10 +5,9 @@ use crate::{
     contract_base::SendRawWrapper,
     tuple_util::NestedTupleFlatten,
     types::{
-        decode_result, Code, CodeMetadata, ConsNoRet, ConsRet, DeployCall, FromSource,
-        ManagedAddress, ManagedBuffer, ManagedVec, OriginalResultMarker, RHList, RHListExec,
-        RHListItem, Tx, TxCodeValue, TxEmptyResultHandler, TxEnv, TxFromSourceValue, TxGas,
-        TxPaymentEgldOnly, TxResultHandler, TxScEnv, UpgradeCall,
+        decode_result, Code, CodeMetadata, DeployCall, FromSource, ManagedAddress, ManagedBuffer,
+        ManagedVec, OriginalResultMarker, RHListExec, Tx, TxCodeValue, TxFromSourceValue, TxGas,
+        TxPaymentEgldOnly, TxResultHandler, TxScEnv,
     },
 };
 
diff --git a/framework/base/src/types/interaction/tx_exec/tx_exec_sync.rs b/framework/base/src/types/interaction/tx_exec/tx_exec_sync.rs
index adb102d6fa..78169a665b 100644
--- a/framework/base/src/types/interaction/tx_exec/tx_exec_sync.rs
+++ b/framework/base/src/types/interaction/tx_exec/tx_exec_sync.rs
@@ -5,9 +5,8 @@ use crate::{
     contract_base::SendRawWrapper,
     tuple_util::NestedTupleFlatten,
     types::{
-        decode_result, BackTransfers, ConsNoRet, ConsRet, ManagedBuffer, ManagedVec,
-        OriginalResultMarker, RHList, RHListExec, RHListItem, Tx, TxDataFunctionCall, TxEnv, TxGas,
-        TxPayment, TxScEnv, TxToSpecified,
+        decode_result, BackTransfers, ManagedBuffer, ManagedVec, OriginalResultMarker, RHListExec,
+        Tx, TxDataFunctionCall, TxGas, TxPayment, TxScEnv, TxToSpecified,
     },
 };
 
diff --git a/framework/base/src/types/interaction/tx_exec/tx_exec_upgrade.rs b/framework/base/src/types/interaction/tx_exec/tx_exec_upgrade.rs
index 0f71ae64bb..b97591ab12 100644
--- a/framework/base/src/types/interaction/tx_exec/tx_exec_upgrade.rs
+++ b/framework/base/src/types/interaction/tx_exec/tx_exec_upgrade.rs
@@ -1,11 +1,9 @@
 use crate::{
     api::CallTypeApi,
     contract_base::SendRawWrapper,
-    tuple_util::NestedTupleFlatten,
     types::{
-        Code, CodeMetadata, DeployRawResult, FromSource, ManagedAddress, ManagedBuffer, ManagedVec,
-        RHListExec, Tx, TxCodeValue, TxEmptyResultHandler, TxFrom, TxFromSourceValue, TxGas,
-        TxPaymentEgldOnly, TxResultHandler, TxScEnv, TxTo, UpgradeCall,
+        Code, CodeMetadata, FromSource, ManagedAddress, ManagedBuffer, Tx, TxCodeValue,
+        TxEmptyResultHandler, TxFromSourceValue, TxGas, TxPaymentEgldOnly, TxScEnv, UpgradeCall,
     },
 };
 
diff --git a/framework/base/src/types/interaction/tx_payment.rs b/framework/base/src/types/interaction/tx_payment.rs
index 75b93f0ee4..e72a5b9fa6 100644
--- a/framework/base/src/types/interaction/tx_payment.rs
+++ b/framework/base/src/types/interaction/tx_payment.rs
@@ -16,11 +16,7 @@ pub use tx_payment_multi_esdt::TxPaymentMultiEsdt;
 
 use crate::{
     api::ManagedTypeApi,
-    contract_base::SendRawWrapper,
-    types::{
-        BigUint, EgldOrEsdtTokenPayment, EgldOrMultiEsdtPayment, EsdtTokenPayment, ManagedAddress,
-        ManagedBuffer, MultiEsdtPayment,
-    },
+    types::{BigUint, ManagedAddress, ManagedBuffer, MultiEsdtPayment},
 };
 
 use super::{AnnotatedValue, FunctionCall, TxEnv, TxFrom, TxToSpecified};
diff --git a/framework/base/src/types/interaction/tx_payment/tx_payment_egld_or_esdt.rs b/framework/base/src/types/interaction/tx_payment/tx_payment_egld_or_esdt.rs
index e70c2919f2..a4ac0577ff 100644
--- a/framework/base/src/types/interaction/tx_payment/tx_payment_egld_or_esdt.rs
+++ b/framework/base/src/types/interaction/tx_payment/tx_payment_egld_or_esdt.rs
@@ -1,12 +1,6 @@
-use crate::{
-    contract_base::SendRawWrapper,
-    types::{
-        BigUint, Egld, EgldOrEsdtTokenPayment, EgldOrMultiEsdtPayment, ManagedAddress, ManagedVec,
-        TxFrom, TxToSpecified,
-    },
-};
+use crate::types::{BigUint, Egld, EgldOrEsdtTokenPayment, ManagedAddress, TxFrom, TxToSpecified};
 
-use super::{AnnotatedEgldPayment, FullPaymentData, FunctionCall, TxEgldValue, TxEnv, TxPayment};
+use super::{FullPaymentData, FunctionCall, TxEnv, TxPayment};
 
 impl<Env> TxPayment<Env> for &EgldOrEsdtTokenPayment<Env::Api>
 where
diff --git a/framework/base/src/types/interaction/tx_payment/tx_payment_egld_or_esdt_refs.rs b/framework/base/src/types/interaction/tx_payment/tx_payment_egld_or_esdt_refs.rs
index 76c5a003f2..fe0bc1352d 100644
--- a/framework/base/src/types/interaction/tx_payment/tx_payment_egld_or_esdt_refs.rs
+++ b/framework/base/src/types/interaction/tx_payment/tx_payment_egld_or_esdt_refs.rs
@@ -1,18 +1,6 @@
-use alloc::borrow::ToOwned;
+use crate::types::{BigUint, EgldOrEsdtTokenPaymentRefs, ManagedAddress, TxFrom, TxToSpecified};
 
-use crate::{
-    api::ManagedTypeApi,
-    contract_base::SendRawWrapper,
-    types::{
-        AnnotatedValue, BigUint, EgldOrEsdtTokenIdentifier, EgldOrEsdtTokenPayment,
-        EgldOrEsdtTokenPaymentRefs, EgldOrMultiEsdtPayment, EsdtTokenPayment, EsdtTokenPaymentRefs,
-        ManagedAddress, ManagedType, ManagedVec, MultiEsdtPayment, TxFrom, TxToSpecified,
-    },
-};
-
-use super::{
-    AnnotatedEgldPayment, Egld, FullPaymentData, FunctionCall, TxEgldValue, TxEnv, TxPayment,
-};
+use super::{Egld, FullPaymentData, FunctionCall, TxEnv, TxPayment};
 
 impl<'a, Env> TxPayment<Env> for EgldOrEsdtTokenPaymentRefs<'a, Env::Api>
 where
diff --git a/framework/base/src/types/interaction/tx_payment/tx_payment_egld_or_multi_esdt.rs b/framework/base/src/types/interaction/tx_payment/tx_payment_egld_or_multi_esdt.rs
index 703166a601..2538383494 100644
--- a/framework/base/src/types/interaction/tx_payment/tx_payment_egld_or_multi_esdt.rs
+++ b/framework/base/src/types/interaction/tx_payment/tx_payment_egld_or_multi_esdt.rs
@@ -1,17 +1,6 @@
-use alloc::borrow::ToOwned;
+use crate::types::{BigUint, EgldOrMultiEsdtPayment, ManagedAddress, TxFrom, TxToSpecified};
 
-use crate::{
-    api::ManagedTypeApi,
-    contract_base::SendRawWrapper,
-    types::{
-        AnnotatedValue, BigUint, EgldOrMultiEsdtPayment, EsdtTokenPayment, EsdtTokenPaymentRefs,
-        ManagedAddress, ManagedType, ManagedVec, MultiEsdtPayment, TxFrom, TxToSpecified,
-    },
-};
-
-use super::{
-    AnnotatedEgldPayment, Egld, FullPaymentData, FunctionCall, TxEgldValue, TxEnv, TxPayment,
-};
+use super::{Egld, FullPaymentData, FunctionCall, TxEnv, TxPayment};
 
 impl<Env> TxPayment<Env> for EgldOrMultiEsdtPayment<Env::Api>
 where
diff --git a/framework/base/src/types/interaction/tx_payment/tx_payment_egld_or_multi_esdt_ref.rs b/framework/base/src/types/interaction/tx_payment/tx_payment_egld_or_multi_esdt_ref.rs
index 06bda77eb3..2bce84e1ff 100644
--- a/framework/base/src/types/interaction/tx_payment/tx_payment_egld_or_multi_esdt_ref.rs
+++ b/framework/base/src/types/interaction/tx_payment/tx_payment_egld_or_multi_esdt_ref.rs
@@ -1,18 +1,6 @@
-use alloc::borrow::ToOwned;
+use crate::types::{BigUint, EgldOrMultiEsdtPaymentRefs, ManagedAddress, TxFrom, TxToSpecified};
 
-use crate::{
-    api::ManagedTypeApi,
-    contract_base::SendRawWrapper,
-    types::{
-        AnnotatedValue, BigUint, EgldOrMultiEsdtPayment, EgldOrMultiEsdtPaymentRefs,
-        EsdtTokenPayment, EsdtTokenPaymentRefs, ManagedAddress, ManagedType, ManagedVec,
-        MultiEsdtPayment, TxFrom, TxToSpecified,
-    },
-};
-
-use super::{
-    AnnotatedEgldPayment, Egld, FullPaymentData, FunctionCall, TxEgldValue, TxEnv, TxPayment,
-};
+use super::{Egld, FullPaymentData, FunctionCall, TxEnv, TxPayment};
 
 impl<'a, Env> TxPayment<Env> for EgldOrMultiEsdtPaymentRefs<'a, Env::Api>
 where
diff --git a/framework/base/src/types/interaction/tx_payment/tx_payment_multi_esdt.rs b/framework/base/src/types/interaction/tx_payment/tx_payment_multi_esdt.rs
index 33543e51d4..892fd2c114 100644
--- a/framework/base/src/types/interaction/tx_payment/tx_payment_multi_esdt.rs
+++ b/framework/base/src/types/interaction/tx_payment/tx_payment_multi_esdt.rs
@@ -2,12 +2,10 @@ use core::ops::Deref;
 
 use crate::{
     contract_base::SendRawWrapper,
-    types::{
-        BigUint, ManagedAddress, ManagedRef, ManagedVec, MultiEsdtPayment, TxFrom, TxToSpecified,
-    },
+    types::{BigUint, ManagedAddress, ManagedRef, MultiEsdtPayment, TxFrom, TxToSpecified},
 };
 
-use super::{AnnotatedEgldPayment, FullPaymentData, FunctionCall, TxEgldValue, TxEnv, TxPayment};
+use super::{FullPaymentData, FunctionCall, TxEnv, TxPayment};
 
 /// Indicates that a payment object contains a multi-ESDT payment.
 pub trait TxPaymentMultiEsdt<Env>: TxPayment<Env>
@@ -33,7 +31,7 @@ where
 
     fn perform_transfer_execute(
         self,
-        env: &Env,
+        _env: &Env,
         to: &ManagedAddress<Env::Api>,
         gas_limit: u64,
         fc: FunctionCall<Env::Api>,
diff --git a/framework/base/src/types/interaction/tx_payment/tx_payment_none.rs b/framework/base/src/types/interaction/tx_payment/tx_payment_none.rs
index 54c82b3a3c..fe6016e43b 100644
--- a/framework/base/src/types/interaction/tx_payment/tx_payment_none.rs
+++ b/framework/base/src/types/interaction/tx_payment/tx_payment_none.rs
@@ -1,12 +1,6 @@
-use crate::{
-    contract_base::SendRawWrapper,
-    types::{BigUint, ManagedAddress, ManagedVec, TxFrom, TxToSpecified},
-};
+use crate::types::{BigUint, ManagedAddress, TxFrom, TxToSpecified};
 
-use super::{
-    AnnotatedEgldPayment, Egld, FullPaymentData, FunctionCall, TxEgldValue, TxEnv, TxPayment,
-    TxPaymentEgldOnly,
-};
+use super::{Egld, FullPaymentData, FunctionCall, TxEnv, TxPayment, TxPaymentEgldOnly};
 
 impl<Env> TxPayment<Env> for ()
 where
diff --git a/framework/base/src/types/interaction/tx_payment/tx_payment_single_esdt.rs b/framework/base/src/types/interaction/tx_payment/tx_payment_single_esdt.rs
index 547ff12ba0..66e3374aa0 100644
--- a/framework/base/src/types/interaction/tx_payment/tx_payment_single_esdt.rs
+++ b/framework/base/src/types/interaction/tx_payment/tx_payment_single_esdt.rs
@@ -1,12 +1,8 @@
-use crate::{
-    contract_base::SendRawWrapper,
-    types::{
-        BigUint, EsdtTokenPayment, ManagedAddress, ManagedVec, MultiEsdtPayment, TxFrom,
-        TxToSpecified,
-    },
+use crate::types::{
+    BigUint, EsdtTokenPayment, ManagedAddress, MultiEsdtPayment, TxFrom, TxToSpecified,
 };
 
-use super::{AnnotatedEgldPayment, FullPaymentData, FunctionCall, TxEgldValue, TxEnv, TxPayment};
+use super::{FullPaymentData, FunctionCall, TxEnv, TxPayment};
 
 impl<Env> TxPayment<Env> for EsdtTokenPayment<Env::Api>
 where
diff --git a/framework/base/src/types/interaction/tx_payment/tx_payment_single_esdt_ref.rs b/framework/base/src/types/interaction/tx_payment/tx_payment_single_esdt_ref.rs
index 1c93e5065b..bc5e2532a8 100644
--- a/framework/base/src/types/interaction/tx_payment/tx_payment_single_esdt_ref.rs
+++ b/framework/base/src/types/interaction/tx_payment/tx_payment_single_esdt_ref.rs
@@ -1,13 +1,11 @@
 use crate::{
-    api::ManagedTypeApi,
     contract_base::SendRawWrapper,
     types::{
-        BigUint, EsdtTokenPaymentRefs, ManagedAddress, ManagedVec, MultiEsdtPayment,
-        TokenIdentifier, TxFrom, TxToSpecified,
+        BigUint, EsdtTokenPaymentRefs, ManagedAddress, MultiEsdtPayment, TxFrom, TxToSpecified,
     },
 };
 
-use super::{AnnotatedEgldPayment, FullPaymentData, FunctionCall, TxEgldValue, TxEnv, TxPayment};
+use super::{FullPaymentData, FunctionCall, TxEnv, TxPayment};
 
 impl<'a, Env> TxPayment<Env> for EsdtTokenPaymentRefs<'a, Env::Api>
 where
@@ -19,7 +17,7 @@ where
 
     fn perform_transfer_execute(
         self,
-        env: &Env,
+        _env: &Env,
         to: &ManagedAddress<Env::Api>,
         gas_limit: u64,
         fc: FunctionCall<Env::Api>,
diff --git a/framework/base/src/types/interaction/tx_payment/tx_payment_single_esdt_triple.rs b/framework/base/src/types/interaction/tx_payment/tx_payment_single_esdt_triple.rs
index 6adf3dacc5..c49062eb27 100644
--- a/framework/base/src/types/interaction/tx_payment/tx_payment_single_esdt_triple.rs
+++ b/framework/base/src/types/interaction/tx_payment/tx_payment_single_esdt_triple.rs
@@ -1,12 +1,8 @@
-use crate::{
-    contract_base::SendRawWrapper,
-    types::{
-        BigUint, EsdtTokenPayment, ManagedAddress, ManagedVec, MultiEsdtPayment, TokenIdentifier,
-        TxFrom, TxToSpecified,
-    },
+use crate::types::{
+    BigUint, EsdtTokenPayment, ManagedAddress, TokenIdentifier, TxFrom, TxToSpecified,
 };
 
-use super::{AnnotatedEgldPayment, FullPaymentData, FunctionCall, TxEgldValue, TxEnv, TxPayment};
+use super::{FullPaymentData, FunctionCall, TxEnv, TxPayment};
 
 impl<Env> TxPayment<Env> for (TokenIdentifier<Env::Api>, u64, BigUint<Env::Api>)
 where
diff --git a/framework/base/src/types/interaction/tx_result_handler.rs b/framework/base/src/types/interaction/tx_result_handler.rs
index 4bfddb56a4..ed43a292df 100644
--- a/framework/base/src/types/interaction/tx_result_handler.rs
+++ b/framework/base/src/types/interaction/tx_result_handler.rs
@@ -16,6 +16,8 @@ pub use returns_raw_result::*;
 pub use returns_result::*;
 pub use returns_result_conv::*;
 pub use with_new_address::*;
+pub use with_raw_result::WithRawResult;
+pub use with_result::WithResult;
 pub use with_result_conv::*;
 
 use super::TxEnv;
diff --git a/framework/base/src/types/interaction/tx_result_handler/returns_bt.rs b/framework/base/src/types/interaction/tx_result_handler/returns_bt.rs
index a04469930c..e61abf256d 100644
--- a/framework/base/src/types/interaction/tx_result_handler/returns_bt.rs
+++ b/framework/base/src/types/interaction/tx_result_handler/returns_bt.rs
@@ -1,8 +1,6 @@
 use crate::{
     contract_base::BlockchainWrapper,
-    types::{
-        BackTransfers, ManagedAddress, ManagedBuffer, ManagedVec, RHListItem, RHListItemExec, TxEnv,
-    },
+    types::{BackTransfers, RHListItem, RHListItemExec, TxEnv},
 };
 
 /// Indicates that back-transfers will be returned.
diff --git a/framework/base/src/types/interaction/tx_result_handler/returns_new_address.rs b/framework/base/src/types/interaction/tx_result_handler/returns_new_address.rs
index 6e73ecf1d1..eaa523828b 100644
--- a/framework/base/src/types/interaction/tx_result_handler/returns_new_address.rs
+++ b/framework/base/src/types/interaction/tx_result_handler/returns_new_address.rs
@@ -1,7 +1,4 @@
-use crate::types::{
-    heap::Address, DeployRawResult, ManagedAddress, ManagedBuffer, ManagedVec, RHListItem,
-    RHListItemExec, TxEnv,
-};
+use crate::types::{heap::Address, DeployRawResult, RHListItem, RHListItemExec, TxEnv};
 
 /// Indicates that the newly deployed address will be returned after a deploy.
 pub struct ReturnsNewAddress;
diff --git a/framework/base/src/types/interaction/tx_result_handler/returns_new_managed_address.rs b/framework/base/src/types/interaction/tx_result_handler/returns_new_managed_address.rs
index 04f923fef2..15ed220dc4 100644
--- a/framework/base/src/types/interaction/tx_result_handler/returns_new_managed_address.rs
+++ b/framework/base/src/types/interaction/tx_result_handler/returns_new_managed_address.rs
@@ -1,6 +1,4 @@
-use crate::types::{
-    DeployRawResult, ManagedAddress, ManagedBuffer, ManagedVec, RHListItem, RHListItemExec, TxEnv,
-};
+use crate::types::{DeployRawResult, ManagedAddress, RHListItem, RHListItemExec, TxEnv};
 
 /// Indicates that the newly deployed address will be returned after a deploy as a ManagedAddress.
 pub struct ReturnsNewManagedAddress;
diff --git a/framework/base/src/types/interaction/tx_result_handler/returns_raw_result.rs b/framework/base/src/types/interaction/tx_result_handler/returns_raw_result.rs
index 2627d99065..807ce5cf82 100644
--- a/framework/base/src/types/interaction/tx_result_handler/returns_raw_result.rs
+++ b/framework/base/src/types/interaction/tx_result_handler/returns_raw_result.rs
@@ -1,6 +1,6 @@
 use crate::types::{
-    DeployRawResult, ManagedAddress, ManagedBuffer, ManagedVec, RHListItem, RHListItemExec,
-    SyncCallRawResult, TxEnv,
+    DeployRawResult, ManagedBuffer, ManagedVec, RHListItem, RHListItemExec, SyncCallRawResult,
+    TxEnv,
 };
 
 /// Indicates that the raw result data will be returned.
diff --git a/framework/base/src/types/interaction/tx_result_handler/returns_result.rs b/framework/base/src/types/interaction/tx_result_handler/returns_result.rs
index 27c547c19e..b5c4a5c491 100644
--- a/framework/base/src/types/interaction/tx_result_handler/returns_result.rs
+++ b/framework/base/src/types/interaction/tx_result_handler/returns_result.rs
@@ -1,8 +1,8 @@
 use multiversx_sc_codec::TopDecodeMulti;
 
 use crate::types::{
-    interaction::decode_result, DeployRawResult, ManagedBuffer, ManagedVec, RHListItem,
-    RHListItemExec, SyncCallRawResult, TxEnv,
+    interaction::decode_result, DeployRawResult, RHListItem, RHListItemExec, SyncCallRawResult,
+    TxEnv,
 };
 
 /// Indicates that result will be returned.
diff --git a/framework/base/src/types/interaction/tx_result_handler/returns_result_conv.rs b/framework/base/src/types/interaction/tx_result_handler/returns_result_conv.rs
index e0f8cd3df1..1583d0ecbe 100644
--- a/framework/base/src/types/interaction/tx_result_handler/returns_result_conv.rs
+++ b/framework/base/src/types/interaction/tx_result_handler/returns_result_conv.rs
@@ -3,8 +3,7 @@ use core::marker::PhantomData;
 use multiversx_sc_codec::{CodecFrom, TopEncodeMulti};
 
 use crate::types::{
-    interaction::decode_result, ManagedBuffer, ManagedVec, RHListItem, RHListItemExec,
-    SyncCallRawResult, TxEnv,
+    interaction::decode_result, RHListItem, RHListItemExec, SyncCallRawResult, TxEnv,
 };
 
 /// Indicates that result will be returned.
diff --git a/framework/base/src/types/interaction/tx_result_handler/with_new_address.rs b/framework/base/src/types/interaction/tx_result_handler/with_new_address.rs
index 2a8840f744..f26d12983c 100644
--- a/framework/base/src/types/interaction/tx_result_handler/with_new_address.rs
+++ b/framework/base/src/types/interaction/tx_result_handler/with_new_address.rs
@@ -1,8 +1,6 @@
 use core::marker::PhantomData;
 
-use crate::types::{
-    DeployRawResult, ManagedAddress, ManagedBuffer, ManagedVec, RHListItem, RHListItemExec, TxEnv,
-};
+use crate::types::{DeployRawResult, ManagedAddress, RHListItem, RHListItemExec, TxEnv};
 
 /// Defines a lambda function to be called on the newly deployed address, after a deploy.
 pub struct WithNewAddress<Env, F>
diff --git a/framework/base/src/types/interaction/tx_result_handler/with_result.rs b/framework/base/src/types/interaction/tx_result_handler/with_result.rs
index d9f11aed14..ad4daea57d 100644
--- a/framework/base/src/types/interaction/tx_result_handler/with_result.rs
+++ b/framework/base/src/types/interaction/tx_result_handler/with_result.rs
@@ -3,8 +3,7 @@ use core::marker::PhantomData;
 use multiversx_sc_codec::TopDecodeMulti;
 
 use crate::types::{
-    interaction::decode_result, ManagedBuffer, ManagedVec, RHListItem, RHListItemExec,
-    SyncCallRawResult, TxEnv,
+    interaction::decode_result, RHListItem, RHListItemExec, SyncCallRawResult, TxEnv,
 };
 
 /// Defines a lambda function to be called on the decoded result.
diff --git a/framework/base/src/types/interaction/tx_result_handler/with_result_conv.rs b/framework/base/src/types/interaction/tx_result_handler/with_result_conv.rs
index 772bd9acd9..263017fe87 100644
--- a/framework/base/src/types/interaction/tx_result_handler/with_result_conv.rs
+++ b/framework/base/src/types/interaction/tx_result_handler/with_result_conv.rs
@@ -3,8 +3,7 @@ use core::marker::PhantomData;
 use multiversx_sc_codec::{CodecFrom, TopEncodeMulti};
 
 use crate::types::{
-    interaction::decode_result, ManagedBuffer, ManagedVec, RHListItem, RHListItemExec,
-    SyncCallRawResult, TxEnv,
+    interaction::decode_result, RHListItem, RHListItemExec, SyncCallRawResult, TxEnv,
 };
 
 /// Defines a lambda function to be called on the decoded result.
diff --git a/framework/base/src/types/interaction/tx_rh_list/tx_rh_list_exec.rs b/framework/base/src/types/interaction/tx_rh_list/tx_rh_list_exec.rs
index 3773d58629..93f559b4ba 100644
--- a/framework/base/src/types/interaction/tx_rh_list/tx_rh_list_exec.rs
+++ b/framework/base/src/types/interaction/tx_rh_list/tx_rh_list_exec.rs
@@ -1,7 +1,4 @@
-use crate::{
-    api::CallTypeApi,
-    types::{ManagedBuffer, OriginalResultMarker, TxEnv},
-};
+use crate::types::{OriginalResultMarker, TxEnv};
 
 use super::{ConsNoRet, ConsRet, RHList, RHListItem};
 

From 00eeb401eceff0e536ac3614832c7fab429f2cb1 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Sat, 13 Apr 2024 17:35:11 +0300
Subject: [PATCH 0713/1254] removed dependencies that are no longer used

---
 Cargo.lock                                                    | 4 ----
 .../esdt-contract-pair/first-contract/Cargo.toml              | 1 -
 .../execute-on-dest-esdt-issue-callback/parent/Cargo.toml     | 4 ----
 .../feature-tests/composability/forwarder-queue/Cargo.toml    | 3 ---
 contracts/feature-tests/composability/forwarder/Cargo.toml    | 3 ---
 .../composability/forwarder/src/contract_change_owner.rs      | 3 +--
 .../composability/forwarder/src/forwarder_main.rs             | 1 -
 .../feature-tests/composability/promises-features/Cargo.toml  | 3 ---
 8 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a0fb9cfca9..9c165c5319 100755
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1035,7 +1035,6 @@ version = "0.0.0"
 dependencies = [
  "multiversx-sc",
  "multiversx-sc-scenario",
- "vault",
 ]
 
 [[package]]
@@ -1070,7 +1069,6 @@ dependencies = [
  "multiversx-sc",
  "multiversx-sc-scenario",
  "multiversx-sc-wasm-adapter",
- "vault",
 ]
 
 [[package]]
@@ -2234,7 +2232,6 @@ dependencies = [
 name = "parent"
 version = "0.0.0"
 dependencies = [
- "child",
  "multiversx-sc",
  "multiversx-sc-scenario",
 ]
@@ -2372,7 +2369,6 @@ name = "promises-features"
 version = "0.0.0"
 dependencies = [
  "multiversx-sc",
- "vault",
 ]
 
 [[package]]
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 ebb8656515..c984035267 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
@@ -8,7 +8,6 @@ publish = false
 [lib]
 path = "src/lib.rs"
 
-
 [dependencies.multiversx-sc]
 version = "0.49.0-alpha.2"
 path = "../../../../../framework/base"
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 c06c523eb9..4a004fea30 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
@@ -8,10 +8,6 @@ publish = false
 [lib]
 path = "src/lib.rs"
 
-
-[dependencies.child]
-path = "../child"
-
 [dependencies.multiversx-sc]
 version = "0.49.0-alpha.2"
 path = "../../../../../framework/base"
diff --git a/contracts/feature-tests/composability/forwarder-queue/Cargo.toml b/contracts/feature-tests/composability/forwarder-queue/Cargo.toml
index b9e68812b1..2705677cbe 100644
--- a/contracts/feature-tests/composability/forwarder-queue/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-queue/Cargo.toml
@@ -8,9 +8,6 @@ publish = false
 [lib]
 path = "src/forwarder_queue.rs"
 
-[dependencies.vault]
-path = "../vault"
-
 [dependencies.multiversx-sc]
 version = "0.49.0-alpha.2"
 path = "../../../../framework/base"
diff --git a/contracts/feature-tests/composability/forwarder/Cargo.toml b/contracts/feature-tests/composability/forwarder/Cargo.toml
index 23c091082c..f87b7190b3 100644
--- a/contracts/feature-tests/composability/forwarder/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder/Cargo.toml
@@ -8,9 +8,6 @@ publish = false
 [lib]
 path = "src/forwarder_main.rs"
 
-[dependencies.vault]
-path = "../vault"
-
 [dependencies.multiversx-sc]
 version = "0.49.0-alpha.2"
 path = "../../../../framework/base"
diff --git a/contracts/feature-tests/composability/forwarder/src/contract_change_owner.rs b/contracts/feature-tests/composability/forwarder/src/contract_change_owner.rs
index 855abcc2fd..672d55c3f7 100644
--- a/contracts/feature-tests/composability/forwarder/src/contract_change_owner.rs
+++ b/contracts/feature-tests/composability/forwarder/src/contract_change_owner.rs
@@ -10,8 +10,7 @@ pub trait ChangeOwnerModule {
         child_sc_address: ManagedAddress,
         new_owner: ManagedAddress,
     ) -> ManagedAddress {
-        let () = self
-            .send()
+        self.send()
             .change_owner_address(child_sc_address.clone(), &new_owner)
             .sync_call();
 
diff --git a/contracts/feature-tests/composability/forwarder/src/forwarder_main.rs b/contracts/feature-tests/composability/forwarder/src/forwarder_main.rs
index 61dcbad468..92d3289a21 100644
--- a/contracts/feature-tests/composability/forwarder/src/forwarder_main.rs
+++ b/contracts/feature-tests/composability/forwarder/src/forwarder_main.rs
@@ -1,6 +1,5 @@
 #![no_std]
 #![allow(clippy::type_complexity)]
-#![allow(clippy::let_unit_value)]
 
 pub mod call_async;
 pub mod call_sync;
diff --git a/contracts/feature-tests/composability/promises-features/Cargo.toml b/contracts/feature-tests/composability/promises-features/Cargo.toml
index aa14e0b1ac..8e81f87942 100644
--- a/contracts/feature-tests/composability/promises-features/Cargo.toml
+++ b/contracts/feature-tests/composability/promises-features/Cargo.toml
@@ -8,9 +8,6 @@ publish = false
 [lib]
 path = "src/promises_main.rs"
 
-[dependencies.vault]
-path = "../vault"
-
 [dependencies.multiversx-sc]
 version = "0.49.0-alpha.2"
 path = "../../../../framework/base"

From cd7ab6bc29e6855ce586f967faa474f7376faabe Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Sat, 13 Apr 2024 17:43:01 +0300
Subject: [PATCH 0714/1254] sc 0.49.0-alpha.3

---
 CHANGELOG.md                                   |  3 +++
 Cargo.lock                                     | 18 +++++++++---------
 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 ++--
 .../mappers/linked-list-repeat/meta/Cargo.toml |  2 +-
 .../mappers/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 +-
 .../benchmarks/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 +-
 contracts/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 +-
 .../Cargo.toml                                 |  2 +-
 .../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 +-
 .../examples/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 +++---
 contracts/examples/check-pause/meta/Cargo.toml |  2 +-
 contracts/examples/check-pause/wasm/Cargo.toml |  2 +-
 .../examples/crowdfunding-esdt/Cargo.toml      |  4 ++--
 .../examples/crowdfunding-esdt/meta/Cargo.toml |  2 +-
 .../examples/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 +-
 .../examples/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 +-
 contracts/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 ++--
 contracts/examples/proxy-pause/meta/Cargo.toml |  2 +-
 contracts/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 +-
 .../wasm-alloc-mem-fail/Cargo.toml             |  2 +-
 .../wasm-alloc-mem-leaking/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-legacy/Cargo.toml  |  4 ++--
 .../forwarder-legacy/meta/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 +-
 .../composability/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 +-
 .../composability/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 ++--
 .../erc-style-contracts/erc721/meta/Cargo.toml |  2 +-
 .../erc-style-contracts/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 +-
 .../feature-tests/exchange-features/Cargo.toml |  4 ++--
 .../exchange-features/meta/Cargo.toml          |  2 +-
 .../exchange-features/wasm/Cargo.toml          |  2 +-
 .../formatted-message-features/Cargo.toml      |  4 ++--
 .../formatted-message-features/meta/Cargo.toml |  2 +-
 .../formatted-message-features/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 +-
 .../wasm/Cargo.toml                            |  2 +-
 .../rust-testing-framework-tester/Cargo.toml   |  4 ++--
 .../meta/Cargo.toml                            |  2 +-
 .../wasm/Cargo.toml                            |  2 +-
 .../feature-tests/scenario-tester/Cargo.toml   |  4 ++--
 .../scenario-tester/meta/Cargo.toml            |  2 +-
 .../scenario-tester/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 +-
 .../use-module/wasm-use-module-view/Cargo.toml |  2 +-
 .../feature-tests/use-module/wasm/Cargo.toml   |  2 +-
 contracts/modules/Cargo.toml                   |  4 ++--
 framework/base/Cargo.toml                      |  4 ++--
 framework/derive/Cargo.toml                    |  2 +-
 framework/meta/Cargo.toml                      |  4 ++--
 framework/scenario/Cargo.toml                  |  6 +++---
 framework/snippets/Cargo.toml                  |  4 ++--
 framework/wasm-adapter/Cargo.toml              |  4 ++--
 tools/mxpy-snippet-generator/Cargo.toml        |  2 +-
 tools/rust-debugger/format-tests/Cargo.toml    |  4 ++--
 268 files changed, 392 insertions(+), 389 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fb3a19b767..32de5c4b7d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,6 +26,9 @@ 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.49.0-alpha.3] - 2024-04-13
+Third pre-release of the unified syntax, includes backwards compatibility fixes and testing set state/check state.
+
 ## [sc 0.49.0-alpha.2] - 2024-04-09
 Second pre-release of the unified syntax. Most features done, including fully featured interactors.
 Still missing: set state/check state in tests.
diff --git a/Cargo.lock b/Cargo.lock
index 9c165c5319..32adcdf5bf 100755
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1815,7 +1815,7 @@ checksum = "b59072fa0624b55ae5ae3fa6bfa91515bbeb4ac440214bc4a509e2c8806d6e9f"
 
 [[package]]
 name = "multiversx-price-aggregator-sc"
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 dependencies = [
  "arrayvec",
  "getrandom 0.2.12",
@@ -1836,7 +1836,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 dependencies = [
  "bitflags 2.4.2",
  "hex-literal",
@@ -1866,7 +1866,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -1877,7 +1877,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-meta"
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 dependencies = [
  "clap",
  "colored",
@@ -1903,14 +1903,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-scenario"
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 dependencies = [
  "base64",
  "bech32",
@@ -1936,7 +1936,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-snippets"
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 dependencies = [
  "base64",
  "env_logger",
@@ -1950,7 +1950,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 dependencies = [
  "multiversx-sc",
 ]
@@ -1981,7 +1981,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-wegld-swap-sc"
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 dependencies = [
  "multiversx-sc",
  "multiversx-sc-modules",
diff --git a/contracts/benchmarks/large-storage/Cargo.toml b/contracts/benchmarks/large-storage/Cargo.toml
index cab5a60bcf..e937ae69a1 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../framework/scenario"
diff --git a/contracts/benchmarks/large-storage/meta/Cargo.toml b/contracts/benchmarks/large-storage/meta/Cargo.toml
index 25bcd6a266..a8861c9cfc 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 16614c89ce..c177dffe51 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/mappers/benchmark-common/Cargo.toml b/contracts/benchmarks/mappers/benchmark-common/Cargo.toml
index 9d20e7403b..16074cce04 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../framework/scenario"
diff --git a/contracts/benchmarks/mappers/linked-list-repeat/Cargo.toml b/contracts/benchmarks/mappers/linked-list-repeat/Cargo.toml
index 8b1eb2748a..92aa9e00a0 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 12019a1f0a..67c262e06a 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 74d5d41e13..225bb4bc46 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/mappers/map-repeat/Cargo.toml b/contracts/benchmarks/mappers/map-repeat/Cargo.toml
index f83947344d..f554b0b088 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../framework/scenario"
diff --git a/contracts/benchmarks/mappers/map-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/map-repeat/meta/Cargo.toml
index 77201f9be8..e5bf0384e1 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 2d5c99b109..a5ff1b5db3 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/mappers/queue-repeat/Cargo.toml b/contracts/benchmarks/mappers/queue-repeat/Cargo.toml
index eb45b07d3b..a04e9481a2 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../framework/scenario"
diff --git a/contracts/benchmarks/mappers/queue-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/queue-repeat/meta/Cargo.toml
index 23d9d35f8e..3add869333 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 787fcab3a9..ccbefcb68d 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/mappers/set-repeat/Cargo.toml b/contracts/benchmarks/mappers/set-repeat/Cargo.toml
index 64e7ef03b3..c1d4afd20a 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../framework/scenario"
diff --git a/contracts/benchmarks/mappers/set-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/set-repeat/meta/Cargo.toml
index 4dca3acc7c..c93fb7908e 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 d58a2820e6..4b90afe784 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 034f72b2c2..2d8e92e82a 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 48286ca62c..a125bba2c5 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 74eb88203c..411ec9a1ca 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/mappers/vec-repeat/Cargo.toml b/contracts/benchmarks/mappers/vec-repeat/Cargo.toml
index 96cb7ac06e..d812225d87 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../framework/scenario"
diff --git a/contracts/benchmarks/mappers/vec-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/vec-repeat/meta/Cargo.toml
index d0b11469ea..cec4fc321f 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 c8066692c5..f360097a23 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/send-tx-repeat/Cargo.toml b/contracts/benchmarks/send-tx-repeat/Cargo.toml
index 3951fb1a7b..64789aa2d0 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../framework/scenario"
diff --git a/contracts/benchmarks/send-tx-repeat/meta/Cargo.toml b/contracts/benchmarks/send-tx-repeat/meta/Cargo.toml
index 899ad17ad8..fca6291503 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 ebc7e32f0f..62ea6206bf 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/str-repeat/Cargo.toml b/contracts/benchmarks/str-repeat/Cargo.toml
index 9dd124e9ad..d000c531d5 100644
--- a/contracts/benchmarks/str-repeat/Cargo.toml
+++ b/contracts/benchmarks/str-repeat/Cargo.toml
@@ -12,10 +12,10 @@ path = "src/str_repeat.rs"
 managed-buffer-builder-cached = ["multiversx-sc/managed-buffer-builder-cached"]
 
 [dependencies.multiversx-sc]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../framework/scenario"
diff --git a/contracts/benchmarks/str-repeat/meta/Cargo.toml b/contracts/benchmarks/str-repeat/meta/Cargo.toml
index 7ae209e09b..4b7f1c6022 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.toml b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.toml
index 18217e1786..64863e4645 100644
--- a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.toml
+++ b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.toml
@@ -25,7 +25,7 @@ overflow-checks = false
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.toml b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.toml
index cd29b1bc3c..36033c9f95 100644
--- a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.toml
+++ b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.toml
@@ -26,7 +26,7 @@ path = ".."
 features = ["managed-buffer-builder-cached"]
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/str-repeat/wasm/Cargo.toml b/contracts/benchmarks/str-repeat/wasm/Cargo.toml
index cd02b379b2..a62bedbaca 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/core/price-aggregator/Cargo.toml b/contracts/core/price-aggregator/Cargo.toml
index 8f8f7bc975..5ac8cd49db 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 authors = [
     "Claudiu-Marcel Bruda <claudiu.bruda@multiversx.com>",
     "MultiversX <contact@multiversx.com>",
@@ -19,15 +19,15 @@ edition = "2021"
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../framework/scenario"
 
 [dependencies]
diff --git a/contracts/core/price-aggregator/meta/Cargo.toml b/contracts/core/price-aggregator/meta/Cargo.toml
index 0e8d6732bc..17751a1628 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 934a5a6feb..d402bd0d78 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/core/wegld-swap/Cargo.toml b/contracts/core/wegld-swap/Cargo.toml
index ec6d025440..f889200683 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 
 authors = [
     "Dorin Iancu <dorin.iancu@multiversx.com>",
@@ -20,13 +20,13 @@ edition = "2021"
 path = "src/wegld.rs"
 
 [dependencies.multiversx-sc]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../framework/scenario"
diff --git a/contracts/core/wegld-swap/meta/Cargo.toml b/contracts/core/wegld-swap/meta/Cargo.toml
index 4503b24e93..b4cd52cd9f 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 af55512e72..b9fa10fa9f 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/adder/Cargo.toml b/contracts/examples/adder/Cargo.toml
index 77e0e77979..e4bb857c31 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/adder/interact/Cargo.toml b/contracts/examples/adder/interact/Cargo.toml
index dc6a5533ea..d955f0bfb6 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../framework/snippets"
diff --git a/contracts/examples/adder/meta/Cargo.toml b/contracts/examples/adder/meta/Cargo.toml
index 03da88815e..1581fb0874 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/examples/adder/wasm/Cargo.toml b/contracts/examples/adder/wasm/Cargo.toml
index 716593e814..613d0060ce 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/bonding-curve-contract/Cargo.toml b/contracts/examples/bonding-curve-contract/Cargo.toml
index 16a18869ff..03d2d06db9 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../framework/scenario"
 
diff --git a/contracts/examples/bonding-curve-contract/meta/Cargo.toml b/contracts/examples/bonding-curve-contract/meta/Cargo.toml
index c1fc7e8517..9678ba1852 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 d0666d9679..c7487594f9 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/check-pause/Cargo.toml b/contracts/examples/check-pause/Cargo.toml
index 290ffbc562..1838cf3cd0 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../framework/scenario"
 
diff --git a/contracts/examples/check-pause/meta/Cargo.toml b/contracts/examples/check-pause/meta/Cargo.toml
index a526576983..85b2e19f06 100644
--- a/contracts/examples/check-pause/meta/Cargo.toml
+++ b/contracts/examples/check-pause/meta/Cargo.toml
@@ -9,6 +9,6 @@ authors = ["Alin Cruceat <alin.cruceat@multiversx.com>"]
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 1471f77b76..7545ebf696 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/crowdfunding-esdt/Cargo.toml b/contracts/examples/crowdfunding-esdt/Cargo.toml
index c982172007..9a9f88f258 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../framework/scenario"
 
 [dev-dependencies]
diff --git a/contracts/examples/crowdfunding-esdt/meta/Cargo.toml b/contracts/examples/crowdfunding-esdt/meta/Cargo.toml
index 2877f2c877..3fa9486d89 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 b560b3fb61..88e4c7b4c5 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/crypto-bubbles/Cargo.toml b/contracts/examples/crypto-bubbles/Cargo.toml
index 05bbae4ea6..992a7df997 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/crypto-bubbles/meta/Cargo.toml b/contracts/examples/crypto-bubbles/meta/Cargo.toml
index 4c0bf972fe..6966cd9bff 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 0515a1046f..7ed5a2fe05 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 2cde4b803f..2f81bfefd2 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 8f04c8950d..1471748b18 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../../framework/base"
diff --git a/contracts/examples/crypto-kitties/kitty-auction/Cargo.toml b/contracts/examples/crypto-kitties/kitty-auction/Cargo.toml
index c350697701..f8481bac43 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 a112a3b69c..07c6da37c1 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 257e449243..59dd92f035 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 f2e197c104..82976fe38b 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 a26801542e..662321fef8 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 7e4fd09b60..e1b8fc8e9f 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 d99ec3d2d7..1804881778 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 723a9f1ced..8c5c36e49e 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 867b708bbc..533db13539 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/crypto-zombies/Cargo.toml b/contracts/examples/crypto-zombies/Cargo.toml
index eaf7930699..d3ab2af074 100644
--- a/contracts/examples/crypto-zombies/Cargo.toml
+++ b/contracts/examples/crypto-zombies/Cargo.toml
@@ -9,11 +9,11 @@ publish = false
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../framework/scenario"
 
 [dependencies.kitty]
diff --git a/contracts/examples/crypto-zombies/meta/Cargo.toml b/contracts/examples/crypto-zombies/meta/Cargo.toml
index b7d51e7216..8d208fd522 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 29e2f90339..12124bb027 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/digital-cash/Cargo.toml b/contracts/examples/digital-cash/Cargo.toml
index f6c2eee8c7..a38a59b831 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/digital-cash/meta/Cargo.toml b/contracts/examples/digital-cash/meta/Cargo.toml
index 5bea40a8b4..42c42bdd13 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 34e178511e..f46d4873a3 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/empty/Cargo.toml b/contracts/examples/empty/Cargo.toml
index cbe9d305c9..1ef8b5c4c2 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../framework/scenario"
 
 [dev-dependencies]
diff --git a/contracts/examples/empty/meta/Cargo.toml b/contracts/examples/empty/meta/Cargo.toml
index 931c9a1806..4405415a13 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/examples/empty/wasm/Cargo.toml b/contracts/examples/empty/wasm/Cargo.toml
index cc030dad95..ac45db4841 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 9f8e06c391..05712405c8 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 a60f8c4877..3b7d671fa5 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 5057d0f972..607cf21443 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/factorial/Cargo.toml b/contracts/examples/factorial/Cargo.toml
index 50c79d55b7..d58309586d 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/factorial/meta/Cargo.toml b/contracts/examples/factorial/meta/Cargo.toml
index 5c76e48e8e..2ed75a17e5 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/examples/factorial/wasm/Cargo.toml b/contracts/examples/factorial/wasm/Cargo.toml
index 0fd3f40ad7..fe4e508dc9 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/fractional-nfts/Cargo.toml b/contracts/examples/fractional-nfts/Cargo.toml
index 120f1ca2a3..8c11b19fdc 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/fractional-nfts/meta/Cargo.toml b/contracts/examples/fractional-nfts/meta/Cargo.toml
index 8c42e9c567..ecb2f5f2f1 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 2e36eae6fb..f20930d2ad 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/lottery-esdt/Cargo.toml b/contracts/examples/lottery-esdt/Cargo.toml
index f218aa93ad..e7eb4659ab 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/lottery-esdt/meta/Cargo.toml b/contracts/examples/lottery-esdt/meta/Cargo.toml
index 1b05f3c86d..8233b7c512 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 478f2fc345..69c7b818d5 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/multisig/Cargo.toml b/contracts/examples/multisig/Cargo.toml
index 05643e6af2..bcce2fa6d0 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../framework/scenario"
 
 [dev-dependencies.adder]
@@ -27,7 +27,7 @@ path = "../adder"
 path = "../factorial"
 
 [dev-dependencies.multiversx-wegld-swap-sc]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../core/wegld-swap"
 
 [dev-dependencies]
diff --git a/contracts/examples/multisig/interact/Cargo.toml b/contracts/examples/multisig/interact/Cargo.toml
index 2cafd006f9..2f1e91bbdd 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../contracts/modules"
 
 [dependencies.multiversx-sc-snippets]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../framework/snippets"
 
 [dependencies.multiversx-sc-scenario]
-version = "=0.49.0-alpha.2"
+version = "=0.49.0-alpha.3"
 path = "../../../../framework/scenario"
diff --git a/contracts/examples/multisig/meta/Cargo.toml b/contracts/examples/multisig/meta/Cargo.toml
index e7544b2c11..5c26bd8270 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 ed54fb3f09..5f9c065231 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 0b0ffd57c2..699aee56ba 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/multisig/wasm/Cargo.toml b/contracts/examples/multisig/wasm/Cargo.toml
index 3c39f4e812..6001a724d2 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/nft-minter/Cargo.toml b/contracts/examples/nft-minter/Cargo.toml
index 8b70aba861..c5918b6f7b 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/nft-minter/meta/Cargo.toml b/contracts/examples/nft-minter/meta/Cargo.toml
index 7cf76194d1..9b562d0350 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 da6e4d3c21..1243696a1c 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/nft-storage-prepay/Cargo.toml b/contracts/examples/nft-storage-prepay/Cargo.toml
index faffbc1a54..87521e853e 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/nft-storage-prepay/meta/Cargo.toml b/contracts/examples/nft-storage-prepay/meta/Cargo.toml
index a47735c0d9..5682886f56 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 63ba85a7d0..229c6a4717 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/nft-subscription/Cargo.toml b/contracts/examples/nft-subscription/Cargo.toml
index bf9b4f419f..b26f94c434 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/nft-subscription/meta/Cargo.toml b/contracts/examples/nft-subscription/meta/Cargo.toml
index 3775f5cee5..8b62235f45 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 1ffeadbe56..ca9a314ce2 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/order-book/factory/Cargo.toml b/contracts/examples/order-book/factory/Cargo.toml
index 4e17fa774b..9fb1974147 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../framework/scenario"
 
diff --git a/contracts/examples/order-book/factory/meta/Cargo.toml b/contracts/examples/order-book/factory/meta/Cargo.toml
index 194a432f9c..c5fe703a4a 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 ce10c37c7f..06ae5207f1 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/order-book/pair/Cargo.toml b/contracts/examples/order-book/pair/Cargo.toml
index 8f961c51be..3b5064a83b 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../framework/scenario"
diff --git a/contracts/examples/order-book/pair/meta/Cargo.toml b/contracts/examples/order-book/pair/meta/Cargo.toml
index 45ef69dbd6..99e08d3bf3 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 9ed18aeb20..61aef735af 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/ping-pong-egld/Cargo.toml b/contracts/examples/ping-pong-egld/Cargo.toml
index e968442b7c..674b90d665 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../framework/scenario"
 
diff --git a/contracts/examples/ping-pong-egld/meta/Cargo.toml b/contracts/examples/ping-pong-egld/meta/Cargo.toml
index b6492950a1..98bcbcba8c 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 0d7ac94d72..c7dcdf0380 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/proxy-pause/Cargo.toml b/contracts/examples/proxy-pause/Cargo.toml
index 6903e9a658..9accf4aeea 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 bbdce3a720..6dcc4e30ab 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 ade889dbf1..ca38a58a94 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/rewards-distribution/Cargo.toml b/contracts/examples/rewards-distribution/Cargo.toml
index 46e3c7426c..e52b38c28c 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/rewards-distribution/meta/Cargo.toml b/contracts/examples/rewards-distribution/meta/Cargo.toml
index af8b1e3fdb..746938fde8 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 <claudiu.bruda@multiversx.com>"]
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 06205454f5..3cee3848c2 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/seed-nft-minter/Cargo.toml b/contracts/examples/seed-nft-minter/Cargo.toml
index d47f7a103b..f1c0ccd1c5 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/seed-nft-minter/meta/Cargo.toml b/contracts/examples/seed-nft-minter/meta/Cargo.toml
index 113bf6fcbb..b62a153697 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 <claudiu.bruda@multiversx.com>"]
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 844ec4ce9c..ebf2f8df94 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/token-release/Cargo.toml b/contracts/examples/token-release/Cargo.toml
index 9e84276585..01ff068282 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../framework/scenario"
 
diff --git a/contracts/examples/token-release/meta/Cargo.toml b/contracts/examples/token-release/meta/Cargo.toml
index 245912467e..e2afb339ec 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 0863733c27..064f98b3c8 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/abi-tester/Cargo.toml b/contracts/feature-tests/abi-tester/Cargo.toml
index afaa799635..c19e464f3e 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../framework/scenario"
 
 [dev-dependencies.multiversx-sc-meta]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 457e86a074..33e1e2787e 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.49.0-alpha.2"
+            "version": "0.49.0-alpha.3"
         }
     },
     "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 20d4ee7906..478b195d18 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.49.0-alpha.2"
+            "version": "0.49.0-alpha.3"
         }
     },
     "docs": [
diff --git a/contracts/feature-tests/abi-tester/meta/Cargo.toml b/contracts/feature-tests/abi-tester/meta/Cargo.toml
index b3d94a1fb1..9b7c4a08c9 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 60b4c4d018..8bfa480843 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 cfbf6696e6..65a7038c2b 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/alloc-features/Cargo.toml b/contracts/feature-tests/alloc-features/Cargo.toml
index 519f3892f1..1b07610469 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 e5d1f0e801..c3ad60f909 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml
index fe0fb46c53..59084bf018 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml
@@ -25,7 +25,7 @@ overflow-checks = false
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml
index 59a3b1e893..7c0ebffec7 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml
@@ -25,7 +25,7 @@ overflow-checks = false
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/alloc-features/wasm/Cargo.toml b/contracts/feature-tests/alloc-features/wasm/Cargo.toml
index c5c9cf50ce..784dd52e8b 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/basic-features/Cargo.toml b/contracts/feature-tests/basic-features/Cargo.toml
index 170e7947a3..c6ba72f9b7 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../framework/scenario"
 
 [dependencies.multiversx-sc-modules]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 52f74fd411..81e892886e 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../framework/snippets"
diff --git a/contracts/feature-tests/basic-features/meta/Cargo.toml b/contracts/feature-tests/basic-features/meta/Cargo.toml
index b11857dcff..30215e3488 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 8a3e03b97a..bcbd853f58 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 939489e8f0..d348b58457 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 abb7d894ca..7f39fd1c2b 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 9c685118f9..07f567b2f3 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 318d83673b..04f16e8c5c 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/Cargo.toml b/contracts/feature-tests/composability/Cargo.toml
index 938768f769..d2c31be93d 100644
--- a/contracts/feature-tests/composability/Cargo.toml
+++ b/contracts/feature-tests/composability/Cargo.toml
@@ -36,9 +36,9 @@ path = "recursive-caller"
 path = "vault"
 
 [dependencies.multiversx-sc]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 603387dcec..988a74e311 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 57d609aa8c..8809391c73 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 b92baea5d0..6e67682cd7 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 775eec997d..cf497b77d8 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 c984035267..95b8bb3e7a 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
@@ -9,10 +9,10 @@ publish = false
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 cd02f10c2c..b688de7b7e 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 b3f7654bd7..5eea19a304 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 3d5ec4343c..ee50706ffe 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 98115fbd0f..a2c8472890 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 5b7f33d216..dccf91ee2d 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 136c7346f1..6beeb65885 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 e55b31e0c0..7d56002e94 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 81c849a074..2e59dd11f1 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 247bbec770..111c39dc04 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 4a004fea30..3719359f0d 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
@@ -9,10 +9,10 @@ publish = false
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 02b3fb2b9f..0f9b09b643 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 5e25d80dee..49cce44ba0 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/forwarder-legacy/Cargo.toml b/contracts/feature-tests/composability/forwarder-legacy/Cargo.toml
index b751258cfa..b7be9a2b09 100644
--- a/contracts/feature-tests/composability/forwarder-legacy/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-legacy/Cargo.toml
@@ -12,10 +12,10 @@ path = "src/forwarder_legacy_main.rs"
 path = "../vault"
 
 [dependencies.multiversx-sc]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../framework/scenario"
 
diff --git a/contracts/feature-tests/composability/forwarder-legacy/meta/Cargo.toml b/contracts/feature-tests/composability/forwarder-legacy/meta/Cargo.toml
index 559f4b20e2..de2b7deb4f 100644
--- a/contracts/feature-tests/composability/forwarder-legacy/meta/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-legacy/meta/Cargo.toml
@@ -8,6 +8,6 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../../framework/meta"
 default-features = false
diff --git a/contracts/feature-tests/composability/forwarder-queue/Cargo.toml b/contracts/feature-tests/composability/forwarder-queue/Cargo.toml
index 2705677cbe..807a48e584 100644
--- a/contracts/feature-tests/composability/forwarder-queue/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-queue/Cargo.toml
@@ -9,14 +9,14 @@ publish = false
 path = "src/forwarder_queue.rs"
 
 [dependencies.multiversx-sc]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../framework/wasm-adapter"
 optional = true
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 f465a1a111..3ccbf42df7 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 cb1ae3c65c..df35b3e625 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 829e9f792d..2caa94fdf6 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 7cc1b41bdc..4ff47c8dcc 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 92175b201b..7db4c8cc8b 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 538475d3b1..0691deeb91 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 7365f87735..87467a5713 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 cb9092dc7b..49a2aaccc5 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/forwarder/Cargo.toml b/contracts/feature-tests/composability/forwarder/Cargo.toml
index f87b7190b3..43287d2f99 100644
--- a/contracts/feature-tests/composability/forwarder/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder/Cargo.toml
@@ -9,10 +9,10 @@ publish = false
 path = "src/forwarder_main.rs"
 
 [dependencies.multiversx-sc]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../framework/scenario"
 
diff --git a/contracts/feature-tests/composability/forwarder/meta/Cargo.toml b/contracts/feature-tests/composability/forwarder/meta/Cargo.toml
index 5bab38b0ed..373e719d27 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 5d65561d9f..840717266b 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/interact/Cargo.toml b/contracts/feature-tests/composability/interact/Cargo.toml
index 9b763b7bb0..eee6ad38e7 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../contracts/modules"
 
 [dependencies.multiversx-sc-snippets]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 2f2cfc6b07..f5d6597a04 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 b43117afb7..197d6d771a 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 7b0d418800..d5fa591652 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 8e81f87942..b36abd2473 100644
--- a/contracts/feature-tests/composability/promises-features/Cargo.toml
+++ b/contracts/feature-tests/composability/promises-features/Cargo.toml
@@ -9,6 +9,6 @@ publish = false
 path = "src/promises_main.rs"
 
 [dependencies.multiversx-sc]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 612ac28984..c74045ba74 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 9f4fbe32c3..38a99b57d1 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 8cebc36d6f..2ac10d9906 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 e18657f249..de0d156d9a 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 2261045523..3288ee5579 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 615d809aa5..be7e7245e3 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 12e84b7230..559e0ab0b2 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 268ff3f2f5..99fb50fdae 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 a0a6278b38..5af4f6b07d 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 599841d5fb..96bc818532 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 9c75f7ec7f..a72b6b1e24 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 b5acba41f5..b79e8d56b0 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 c1c4f4df1e..79476b840c 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 773143455c..ef7b1f1428 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/vault/Cargo.toml b/contracts/feature-tests/composability/vault/Cargo.toml
index b50ef91a46..e31b239684 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../framework/scenario"
diff --git a/contracts/feature-tests/composability/vault/meta/Cargo.toml b/contracts/feature-tests/composability/vault/meta/Cargo.toml
index 5f23118119..8d1b082bab 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 9039df2a4c..b09fa9bbe9 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 1d0df10024..3014a523c9 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 9c5cb3ac00..c298a50dbd 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 5cb374cf2f..3c19ea4d30 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 edbca52c79..1c7cafcd1d 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 bd96532634..33abc78a59 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 f40d3515e1..3ca5de7c09 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 521545335f..df8110b562 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 840f16343b..6a20d7350e 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 d43e1a740f..f9bfaf993c 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 76c3595d6c..6671d757bb 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 acfe93462e..a7a481f28c 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 7b174d1c34..e9b17b91f2 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 62714e29b5..cac8f568a7 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 4b97617741..76b0cf4614 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 8c19ff102d..83ed113938 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 2d02fbd210..359adb0799 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 d5f6957015..5dcd945afd 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 254a40cb7c..a10fafd483 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 2fee5bb8f9..1a13e5b8ac 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 22edbf129b..62f50069de 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 2d569594b0..044e9c98ee 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 d433dc152e..2325b11301 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 773ab49014..86bf125ffb 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 110a8e9bd9..d6a741ce2a 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 4003060c14..703b7a9353 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 35572ee7f2..e95c73f7c7 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/exchange-features/Cargo.toml b/contracts/feature-tests/exchange-features/Cargo.toml
index c5f62b4c5a..d88b0bfe55 100644
--- a/contracts/feature-tests/exchange-features/Cargo.toml
+++ b/contracts/feature-tests/exchange-features/Cargo.toml
@@ -9,9 +9,9 @@ publish = false
 path = "src/exchange_features.rs"
 
 [dependencies.multiversx-sc]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../framework/scenario"
diff --git a/contracts/feature-tests/exchange-features/meta/Cargo.toml b/contracts/feature-tests/exchange-features/meta/Cargo.toml
index f7a183430f..a136b96009 100644
--- a/contracts/feature-tests/exchange-features/meta/Cargo.toml
+++ b/contracts/feature-tests/exchange-features/meta/Cargo.toml
@@ -8,6 +8,6 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/feature-tests/exchange-features/wasm/Cargo.toml b/contracts/feature-tests/exchange-features/wasm/Cargo.toml
index fa2c693992..b5faf4bc2a 100644
--- a/contracts/feature-tests/exchange-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/exchange-features/wasm/Cargo.toml
@@ -25,7 +25,7 @@ overflow-checks = false
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 cc124713b7..449928d8e1 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 b0d9228ef7..4a1af3ce58 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 57f367e7b7..ad6413abb0 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 39a114ccee..2d0005c680 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 70337ef43e..58b74efc31 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 320c50a632..e9281f9976 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 9715f9ed8f..ef65d67f43 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 573b351f94..6ebca90110 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 e2208ba71b..e8162e6df5 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 56e59eb3c5..bfa63ab7ea 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 d285b18931..82a1d0906f 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 9d6e21c6ea..462466dc27 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 3698a878b9..5a51dbe4ab 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 99414c7e02..6f1b4f7b20 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 63bee8f3d1..a8bb519333 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/payable-features/Cargo.toml b/contracts/feature-tests/payable-features/Cargo.toml
index 1955cc0d71..f393b769a0 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../framework/scenario"
diff --git a/contracts/feature-tests/payable-features/meta/Cargo.toml b/contracts/feature-tests/payable-features/meta/Cargo.toml
index b138fb0932..b0e53733be 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 049b406aa5..e8005d93c3 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 3e8a6469a5..25e0ba5e4d 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 40979f73f1..654a8d30d2 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 fc87dc6b82..dd54362752 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../framework/meta"
 default-features = false
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 08c7eb2512..6be0e2b462 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 0ecc629875..83b382a1b6 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../framework/base"
 features = [ "alloc" ]
 
@@ -17,7 +17,7 @@ path = "../../examples/adder"
 path = "../../feature-tests/basic-features"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 abfddefb59..d8ebeebdfe 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 dc5966b935..844da5b804 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/scenario-tester/Cargo.toml b/contracts/feature-tests/scenario-tester/Cargo.toml
index 192916d27e..eb15243aa1 100644
--- a/contracts/feature-tests/scenario-tester/Cargo.toml
+++ b/contracts/feature-tests/scenario-tester/Cargo.toml
@@ -9,9 +9,9 @@ publish = false
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../framework/scenario"
diff --git a/contracts/feature-tests/scenario-tester/meta/Cargo.toml b/contracts/feature-tests/scenario-tester/meta/Cargo.toml
index a4c669e5f1..551bd6efe7 100644
--- a/contracts/feature-tests/scenario-tester/meta/Cargo.toml
+++ b/contracts/feature-tests/scenario-tester/meta/Cargo.toml
@@ -8,6 +8,6 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/feature-tests/scenario-tester/wasm/Cargo.toml b/contracts/feature-tests/scenario-tester/wasm/Cargo.toml
index 1baaa13b44..026d4b7463 100644
--- a/contracts/feature-tests/scenario-tester/wasm/Cargo.toml
+++ b/contracts/feature-tests/scenario-tester/wasm/Cargo.toml
@@ -25,7 +25,7 @@ overflow-checks = false
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/use-module/Cargo.toml b/contracts/feature-tests/use-module/Cargo.toml
index 905ede62be..f55b44c58c 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../contracts/modules"
 
 [dependencies.multiversx-sc]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../framework/scenario"
 
 [dev-dependencies.multiversx-sc-meta]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../framework/meta"
diff --git a/contracts/feature-tests/use-module/meta/Cargo.toml b/contracts/feature-tests/use-module/meta/Cargo.toml
index 557e9f5fad..bfbc356ab4 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 3184d932c3..f4a72800b6 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 7bdd9cdc73..fedbb5c8c4 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.49.0-alpha.2"
+            "version": "0.49.0-alpha.3"
         }
     },
     "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 bb8b10e3dd..75b41e0f02 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.49.0-alpha.2"
+            "version": "0.49.0-alpha.3"
         }
     },
     "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 9e0975de50..a5c2d575ab 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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 ee8e101689..f95cab10e3 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/modules/Cargo.toml b/contracts/modules/Cargo.toml
index 87cd42fe2d..338ab2ae7d 100644
--- a/contracts/modules/Cargo.toml
+++ b/contracts/modules/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-modules"
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 edition = "2021"
 
 authors = ["MultiversX <contact@multiversx.com>"]
@@ -17,5 +17,5 @@ categories = ["no-std", "wasm", "cryptography::cryptocurrencies"]
 alloc = ["multiversx-sc/alloc"]
 
 [dependencies.multiversx-sc]
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../framework/base"
diff --git a/framework/base/Cargo.toml b/framework/base/Cargo.toml
index 226844c6b4..9537ff48ee 100644
--- a/framework/base/Cargo.toml
+++ b/framework/base/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc"
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 edition = "2021"
 
 authors = ["Andrei Marinica <andrei.marinica@multiversx.com>", "MultiversX <contact@multiversx.com>"]
@@ -28,7 +28,7 @@ bitflags = "=2.4.2"
 num-traits = { version = "=0.2.17", default-features = false }
 
 [dependencies.multiversx-sc-derive]
-version = "=0.49.0-alpha.2"
+version = "=0.49.0-alpha.3"
 path = "../derive"
 
 [dependencies.multiversx-sc-codec]
diff --git a/framework/derive/Cargo.toml b/framework/derive/Cargo.toml
index e3c39d67b6..b15e244e7d 100644
--- a/framework/derive/Cargo.toml
+++ b/framework/derive/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-derive"
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 edition = "2021"
 
 authors = ["Andrei Marinica <andrei.marinica@multiversx.com>", "MultiversX <contact@multiversx.com>"]
diff --git a/framework/meta/Cargo.toml b/framework/meta/Cargo.toml
index a63b1b7e61..f0c8b354f7 100644
--- a/framework/meta/Cargo.toml
+++ b/framework/meta/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-meta"
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 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.49.0-alpha.2"
+version = "=0.49.0-alpha.3"
 path = "../base"
 features = ["alloc", "num-bigint"]
 
diff --git a/framework/scenario/Cargo.toml b/framework/scenario/Cargo.toml
index ac7b78cd25..59aa246985 100644
--- a/framework/scenario/Cargo.toml
+++ b/framework/scenario/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-scenario"
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 edition = "2021"
 
 authors = [
@@ -40,12 +40,12 @@ path = "src/main.rs"
 run-go-tests = []
 
 [dependencies.multiversx-sc]
-version = "=0.49.0-alpha.2"
+version = "=0.49.0-alpha.3"
 features = ["alloc", "num-bigint"]
 path = "../base"
 
 [dependencies.multiversx-sc-meta]
-version = "=0.49.0-alpha.2"
+version = "=0.49.0-alpha.3"
 path = "../meta"
 
 [dependencies.multiversx-chain-scenario-format]
diff --git a/framework/snippets/Cargo.toml b/framework/snippets/Cargo.toml
index 03a0d48c6c..d07d310522 100644
--- a/framework/snippets/Cargo.toml
+++ b/framework/snippets/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-snippets"
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 edition = "2021"
 
 authors = ["MultiversX <contact@multiversx.com>"]
@@ -22,7 +22,7 @@ env_logger = "0.11"
 futures = "0.3"
 
 [dependencies.multiversx-sc-scenario]
-version = "=0.49.0-alpha.2"
+version = "=0.49.0-alpha.3"
 path = "../scenario"
 
 [dependencies.multiversx-sdk]
diff --git a/framework/wasm-adapter/Cargo.toml b/framework/wasm-adapter/Cargo.toml
index 9220813f9b..148d6d74ee 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 edition = "2021"
 
 authors = [
@@ -22,5 +22,5 @@ categories = [
 ]
 
 [dependencies.multiversx-sc]
-version = "=0.49.0-alpha.2"
+version = "=0.49.0-alpha.3"
 path = "../base"
diff --git a/tools/mxpy-snippet-generator/Cargo.toml b/tools/mxpy-snippet-generator/Cargo.toml
index 1cda1d668a..029658ccf8 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.49.0-alpha.2"
+version = "0.49.0-alpha.3"
 path = "../../framework/base"
 
 [dependencies]
diff --git a/tools/rust-debugger/format-tests/Cargo.toml b/tools/rust-debugger/format-tests/Cargo.toml
index 1f8412b35d..3a6a5987c1 100644
--- a/tools/rust-debugger/format-tests/Cargo.toml
+++ b/tools/rust-debugger/format-tests/Cargo.toml
@@ -9,11 +9,11 @@ name = "format-tests"
 path = "src/format_tests.rs"
 
 [dependencies.multiversx-sc]
-version = "=0.49.0-alpha.2"
+version = "=0.49.0-alpha.3"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-scenario]
-version = "=0.49.0-alpha.2"
+version = "=0.49.0-alpha.3"
 path = "../../../framework/scenario"
 
 [dependencies.multiversx-chain-vm]

From 82f90d746e11c42050897ab8800cf4c7235dd47e Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Mon, 15 Apr 2024 12:18:44 +0200
Subject: [PATCH 0715/1254] cleanup

---
 .../tests/price_aggregator_blackbox_test.rs   | 22 ++++++++-----------
 1 file changed, 9 insertions(+), 13 deletions(-)

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 db64b7749c..c57e36711e 100644
--- a/contracts/core/price-aggregator/tests/price_aggregator_blackbox_test.rs
+++ b/contracts/core/price-aggregator/tests/price_aggregator_blackbox_test.rs
@@ -2,7 +2,6 @@ use multiversx_price_aggregator_sc::{
     price_aggregator_data::{OracleStatus, TimestampedPrice, TokenPair},
     ContractObj, PriceAggregator, MAX_ROUND_DURATION_SECONDS,
 };
-use multiversx_sc_modules::staking::ProxyTrait as _;
 
 use multiversx_sc_scenario::imports::*;
 
@@ -23,8 +22,6 @@ const USD_TICKER: &[u8] = b"USDC";
 const PRICE_AGGREGATOR: ScExpr = ScExpr("price-aggregator");
 const OWNER: AddressExpr = AddressExpr("owner");
 
-type PriceAggregatorContract = ContractInfo<multiversx_price_aggregator_sc::Proxy<StaticApi>>;
-
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
 
@@ -40,7 +37,6 @@ fn world() -> ScenarioWorld {
 struct PriceAggregatorTestState {
     world: ScenarioWorld,
     oracles: Vec<AddressValue>,
-    price_aggregator_contract: PriceAggregatorContract,
     price_aggregator_whitebox: WhiteboxContract<ContractObj<DebugApi>>,
 }
 
@@ -67,7 +63,7 @@ impl PriceAggregatorTestState {
         }
         world.set_state_step(set_state_step);
 
-        let price_aggregator_contract = PriceAggregatorContract::new(PRICE_AGGREGATOR_ADDRESS_EXPR);
+        // let price_aggregator_contract = PriceAggregatorContract::new(PRICE_AGGREGATOR_ADDRESS_EXPR);
         let price_aggregator_whitebox = WhiteboxContract::new(
             PRICE_AGGREGATOR_ADDRESS_EXPR,
             multiversx_price_aggregator_sc::contract_obj,
@@ -76,7 +72,6 @@ impl PriceAggregatorTestState {
         Self {
             world,
             oracles,
-            price_aggregator_contract,
             price_aggregator_whitebox,
         }
     }
@@ -380,13 +375,14 @@ fn test_price_aggregator_slashing() {
     state.vote_slash_member(&state.oracles[2].clone(), state.oracles[1].to_address());
     state.vote_slash_member(&state.oracles[3].clone(), state.oracles[1].to_address());
 
-    state.world.sc_call(
-        ScCallStep::new().from(&state.oracles[0]).call(
-            state
-                .price_aggregator_contract
-                .slash_member(state.oracles[1].to_address()),
-        ),
-    );
+    state
+        .world
+        .tx()
+        .from(&state.oracles[0].to_address())
+        .to(PRICE_AGGREGATOR)
+        .typed(price_aggregator_proxy::PriceAggregatorProxy)
+        .slash_member(state.oracles[1].to_address())
+        .run();
 
     // oracle 1 try submit after slashing
     state.submit_and_expect_err(

From 24f35ac75cad8595f977ac5b5f82df9629ca43a6 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Mon, 15 Apr 2024 17:46:33 +0200
Subject: [PATCH 0716/1254] block info builder impl

---
 framework/scenario/src/facade/world_tx.rs     |   1 +
 .../src/facade/world_tx/block_info_builder.rs | 146 ++++++++++++++++++
 .../src/facade/world_tx/scenario_env_exec.rs  |   6 +-
 3 files changed, 152 insertions(+), 1 deletion(-)
 create mode 100644 framework/scenario/src/facade/world_tx/block_info_builder.rs

diff --git a/framework/scenario/src/facade/world_tx.rs b/framework/scenario/src/facade/world_tx.rs
index 2fa69c744e..11a4ed554f 100644
--- a/framework/scenario/src/facade/world_tx.rs
+++ b/framework/scenario/src/facade/world_tx.rs
@@ -1,5 +1,6 @@
 #![allow(unused)] // TEMP
 
+mod block_info_builder;
 mod scenario_env;
 mod scenario_env_deploy;
 mod scenario_env_exec;
diff --git a/framework/scenario/src/facade/world_tx/block_info_builder.rs b/framework/scenario/src/facade/world_tx/block_info_builder.rs
new file mode 100644
index 0000000000..a03b312255
--- /dev/null
+++ b/framework/scenario/src/facade/world_tx/block_info_builder.rs
@@ -0,0 +1,146 @@
+use crate::{
+    scenario::ScenarioRunner,
+    scenario_model::{BlockInfo, BytesValue, SetStateStep, U64Value},
+    ScenarioWorld,
+};
+
+pub struct BlockInfoBuilder<'w> {
+    world: &'w mut ScenarioWorld,
+    set_state_step: SetStateStep,
+    current_block: BlockInfo,
+    previous_block: BlockInfo,
+}
+
+impl<'w> BlockInfoBuilder<'w> {
+    pub(crate) fn new(world: &'w mut ScenarioWorld) -> BlockInfoBuilder<'w> {
+        let mut builder = BlockInfoBuilder {
+            world,
+            set_state_step: SetStateStep::new(),
+            current_block: BlockInfo::default(),
+            previous_block: BlockInfo::default(),
+        };
+        builder
+    }
+
+    // Forces value drop and commit block info.
+    pub fn commit(self) {}
+
+    /// Finished and sets all account in the blockchain mock.
+    fn commit_block_info(&mut self) {
+        self.add_current_block_info();
+        self.world.run_set_state_step(&self.set_state_step);
+    }
+
+    fn add_current_block_info(&mut self) {
+        self.set_state_step.previous_block_info =
+            Box::new(Some(core::mem::take(&mut self.previous_block)));
+        self.set_state_step.current_block_info =
+            Box::new(Some(core::mem::take(&mut self.current_block)));
+    }
+
+    pub fn block_epoch<N>(mut self, block_epoch_expr: N) -> Self
+    where
+        U64Value: From<N>,
+    {
+        let block_epoch = U64Value::from(block_epoch_expr);
+
+        self.current_block.block_epoch = Some(block_epoch);
+        self
+    }
+
+    pub fn block_nonce<N>(mut self, block_nonce_expr: N) -> Self
+    where
+        U64Value: From<N>,
+    {
+        let block_nonce = U64Value::from(block_nonce_expr);
+
+        self.current_block.block_nonce = Some(block_nonce);
+        self
+    }
+
+    pub fn block_round<N>(mut self, block_round_expr: N) -> Self
+    where
+        U64Value: From<N>,
+    {
+        let block_round = U64Value::from(block_round_expr);
+
+        self.current_block.block_round = Some(block_round);
+        self
+    }
+
+    pub fn block_timestamp<N>(mut self, block_timestamp_expr: N) -> Self
+    where
+        U64Value: From<N>,
+    {
+        let block_timestamp = U64Value::from(block_timestamp_expr);
+
+        self.current_block.block_timestamp = Some(block_timestamp);
+        self
+    }
+
+    pub fn block_random_seed<B>(mut self, block_random_seed_expr: B) -> Self
+    where
+        BytesValue: From<B>,
+    {
+        let block_random_seed = BytesValue::from(block_random_seed_expr);
+
+        self.current_block.block_random_seed = Some(block_random_seed);
+        self
+    }
+
+    pub fn prev_block_epoch<N>(mut self, block_epoch_expr: N) -> Self
+    where
+        U64Value: From<N>,
+    {
+        let prev_block_epoch = U64Value::from(block_epoch_expr);
+
+        self.previous_block.block_epoch = Some(prev_block_epoch);
+        self
+    }
+
+    pub fn prev_block_nonce<N>(mut self, block_nonce_expr: N) -> Self
+    where
+        U64Value: From<N>,
+    {
+        let prev_block_nonce = U64Value::from(block_nonce_expr);
+
+        self.previous_block.block_nonce = Some(prev_block_nonce);
+        self
+    }
+
+    pub fn prev_block_round<N>(mut self, block_round_expr: N) -> Self
+    where
+        U64Value: From<N>,
+    {
+        let prev_block_round = U64Value::from(block_round_expr);
+
+        self.previous_block.block_round = Some(prev_block_round);
+        self
+    }
+
+    pub fn prev_block_timestamp<N>(mut self, block_timestamp_expr: N) -> Self
+    where
+        U64Value: From<N>,
+    {
+        let prev_block_timestamp = U64Value::from(block_timestamp_expr);
+
+        self.previous_block.block_timestamp = Some(prev_block_timestamp);
+        self
+    }
+
+    pub fn prev_block_random_seed<B>(mut self, block_random_seed_expr: B) -> Self
+    where
+        BytesValue: From<B>,
+    {
+        let prev_block_random_seed = BytesValue::from(block_random_seed_expr);
+
+        self.previous_block.block_random_seed = Some(prev_block_random_seed);
+        self
+    }
+}
+
+impl Drop for BlockInfoBuilder<'_> {
+    fn drop(&mut self) {
+        self.commit_block_info();
+    }
+}
diff --git a/framework/scenario/src/facade/world_tx/scenario_env_exec.rs b/framework/scenario/src/facade/world_tx/scenario_env_exec.rs
index 5eef522784..3dcd1de553 100644
--- a/framework/scenario/src/facade/world_tx/scenario_env_exec.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_env_exec.rs
@@ -21,7 +21,7 @@ use crate::{
     ScenarioTxEnv, ScenarioTxRun, ScenarioWorld,
 };
 
-use super::ScenarioTxEnvData;
+use super::{block_info_builder::BlockInfoBuilder, ScenarioTxEnvData};
 
 /// Environment for executing transactions.
 pub struct ScenarioEnvExec<'w> {
@@ -106,6 +106,10 @@ impl ScenarioWorld {
     {
         SetStateBuilder::new(self, address_expr.into())
     }
+
+    pub fn block_info(&mut self) -> BlockInfoBuilder<'_> {
+        BlockInfoBuilder::new(self)
+    }
 }
 
 pub struct SetStateBuilder<'w> {

From 29078f1ce20a59b6f8db9a338f0fe6cf348eb9a4 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Mon, 15 Apr 2024 18:58:12 +0300
Subject: [PATCH 0717/1254] unified syntas - added inlines

---
 .../interaction/annotated/annotated_impl_big_uint.rs      | 5 +++++
 .../annotated/annotated_impl_managed_buffer.rs            | 3 +++
 framework/base/src/types/interaction/markers/to_self.rs   | 1 +
 .../interaction/system_proxy/esdt_system_sc_proxy.rs      | 2 +-
 framework/base/src/types/interaction/tx_payment.rs        | 1 +
 .../src/types/interaction/tx_payment/tx_payment_egld.rs   | 4 ++++
 .../types/interaction/tx_payment/tx_payment_multi_esdt.rs | 8 +++++++-
 .../src/types/interaction/tx_payment/tx_payment_none.rs   | 7 +++++--
 .../interaction/tx_payment/tx_payment_single_esdt_ref.rs  | 4 ++--
 framework/base/src/types/interaction/tx_to.rs             | 1 +
 framework/base/src/types/managed/basic/big_uint.rs        | 7 +++++++
 .../types/managed/wrapped/egld_or_esdt_token_payment.rs   | 2 +-
 12 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/framework/base/src/types/interaction/annotated/annotated_impl_big_uint.rs b/framework/base/src/types/interaction/annotated/annotated_impl_big_uint.rs
index ea2250399d..92802fba00 100644
--- a/framework/base/src/types/interaction/annotated/annotated_impl_big_uint.rs
+++ b/framework/base/src/types/interaction/annotated/annotated_impl_big_uint.rs
@@ -18,6 +18,7 @@ where
         self
     }
 
+    #[inline]
     fn with_value_ref<F, R>(&self, _env: &Env, f: F) -> R
     where
         F: FnOnce(&BigUint<Env::Api>) -> R,
@@ -38,10 +39,12 @@ where
         (*self).clone()
     }
 
+    #[inline]
     fn into_value(self, _env: &Env) -> BigUint<Env::Api> {
         self.clone()
     }
 
+    #[inline]
     fn with_value_ref<F, R>(&self, _env: &Env, f: F) -> R
     where
         F: FnOnce(&BigUint<Env::Api>) -> R,
@@ -58,6 +61,7 @@ where
         self.to_display()
     }
 
+    #[inline]
     fn to_value(&self, _env: &Env) -> BigUint<Env::Api> {
         (*self).clone_value()
     }
@@ -66,6 +70,7 @@ where
         self.clone_value()
     }
 
+    #[inline]
     fn with_value_ref<F, R>(&self, _env: &Env, f: F) -> R
     where
         F: FnOnce(&BigUint<Env::Api>) -> R,
diff --git a/framework/base/src/types/interaction/annotated/annotated_impl_managed_buffer.rs b/framework/base/src/types/interaction/annotated/annotated_impl_managed_buffer.rs
index b8d4fc8fd7..61cf142dfb 100644
--- a/framework/base/src/types/interaction/annotated/annotated_impl_managed_buffer.rs
+++ b/framework/base/src/types/interaction/annotated/annotated_impl_managed_buffer.rs
@@ -10,14 +10,17 @@ where
         self.hex_expr()
     }
 
+    #[inline]
     fn to_value(&self, _env: &Env) -> ManagedBuffer<Env::Api> {
         self.clone()
     }
 
+    #[inline]
     fn into_value(self, _env: &Env) -> ManagedBuffer<Env::Api> {
         self
     }
 
+    #[inline]
     fn with_value_ref<F, R>(&self, _env: &Env, f: F) -> R
     where
         F: FnOnce(&ManagedBuffer<Env::Api>) -> R,
diff --git a/framework/base/src/types/interaction/markers/to_self.rs b/framework/base/src/types/interaction/markers/to_self.rs
index dee4d5ed3a..f339a448e2 100644
--- a/framework/base/src/types/interaction/markers/to_self.rs
+++ b/framework/base/src/types/interaction/markers/to_self.rs
@@ -17,6 +17,7 @@ where
         self.with_address_ref(env, |addr_ref| addr_ref.hex_expr())
     }
 
+    #[inline]
     fn to_value(&self, _env: &TxScEnv<Api>) -> ManagedAddress<Api> {
         BlockchainWrapper::<Api>::new().get_sc_address()
     }
diff --git a/framework/base/src/types/interaction/system_proxy/esdt_system_sc_proxy.rs b/framework/base/src/types/interaction/system_proxy/esdt_system_sc_proxy.rs
index 3589f4ce28..4463c9ec64 100644
--- a/framework/base/src/types/interaction/system_proxy/esdt_system_sc_proxy.rs
+++ b/framework/base/src/types/interaction/system_proxy/esdt_system_sc_proxy.rs
@@ -101,7 +101,7 @@ where
         token_ticker: &ManagedBuffer<Env::Api>,
         properties: NonFungibleTokenProperties,
     ) -> IssueCall<Env, From, To, Gas> {
-        let zero = BigUint::zero();
+        let zero = BigUint::zero_ref();
         self.issue(
             issue_cost,
             EsdtTokenType::NonFungible,
diff --git a/framework/base/src/types/interaction/tx_payment.rs b/framework/base/src/types/interaction/tx_payment.rs
index e72a5b9fa6..b8979bf50c 100644
--- a/framework/base/src/types/interaction/tx_payment.rs
+++ b/framework/base/src/types/interaction/tx_payment.rs
@@ -62,6 +62,7 @@ pub trait TxPaymentEgldOnly<Env>: TxPayment<Env> + AnnotatedValue<Env, BigUint<E
 where
     Env: TxEnv,
 {
+    #[inline]
     fn with_egld_value<F, R>(&self, env: &Env, f: F) -> R
     where
         F: FnOnce(&BigUint<Env::Api>) -> R,
diff --git a/framework/base/src/types/interaction/tx_payment/tx_payment_egld.rs b/framework/base/src/types/interaction/tx_payment/tx_payment_egld.rs
index ad0969aca1..6bda81cd29 100644
--- a/framework/base/src/types/interaction/tx_payment/tx_payment_egld.rs
+++ b/framework/base/src/types/interaction/tx_payment/tx_payment_egld.rs
@@ -42,6 +42,7 @@ where
         })
     }
 
+    #[inline]
     fn with_normalized<From, To, F, R>(
         self,
         env: &Env,
@@ -78,14 +79,17 @@ where
         self.0.annotation(env)
     }
 
+    #[inline]
     fn to_value(&self, env: &Env) -> BigUint<Env::Api> {
         self.0.to_value(env)
     }
 
+    #[inline]
     fn into_value(self, env: &Env) -> BigUint<Env::Api> {
         self.0.into_value(env)
     }
 
+    #[inline]
     fn with_value_ref<F, R>(&self, env: &Env, f: F) -> R
     where
         F: FnOnce(&BigUint<Env::Api>) -> R,
diff --git a/framework/base/src/types/interaction/tx_payment/tx_payment_multi_esdt.rs b/framework/base/src/types/interaction/tx_payment/tx_payment_multi_esdt.rs
index 892fd2c114..7cb062c50b 100644
--- a/framework/base/src/types/interaction/tx_payment/tx_payment_multi_esdt.rs
+++ b/framework/base/src/types/interaction/tx_payment/tx_payment_multi_esdt.rs
@@ -63,7 +63,7 @@ where
             1 => self.get(0).as_refs().with_normalized(env, from, to, fc, f),
             _ => to.with_address_ref(env, |to_addr| {
                 let fc_conv = fc.convert_to_multi_transfer_esdt_call(to_addr, self);
-                f(&from.resolve_address(env), &BigUint::zero(), &fc_conv)
+                f(&from.resolve_address(env), &*BigUint::zero_ref(), &fc_conv)
             }),
         }
     }
@@ -80,10 +80,12 @@ impl<'a, Env> TxPayment<Env> for ManagedRef<'a, Env::Api, MultiEsdtPayment<Env::
 where
     Env: TxEnv,
 {
+    #[inline]
     fn is_no_payment(&self, _env: &Env) -> bool {
         self.deref().is_empty()
     }
 
+    #[inline]
     fn perform_transfer_execute(
         self,
         env: &Env,
@@ -95,6 +97,7 @@ where
             .perform_transfer_execute(env, to, gas_limit, fc)
     }
 
+    #[inline]
     fn with_normalized<From, To, F, R>(
         self,
         env: &Env,
@@ -120,10 +123,12 @@ impl<Env> TxPayment<Env> for MultiEsdtPayment<Env::Api>
 where
     Env: TxEnv,
 {
+    #[inline]
     fn is_no_payment(&self, _env: &Env) -> bool {
         self.is_empty()
     }
 
+    #[inline]
     fn perform_transfer_execute(
         self,
         env: &Env,
@@ -134,6 +139,7 @@ where
         (&self).perform_transfer_execute(env, to, gas_limit, fc);
     }
 
+    #[inline]
     fn with_normalized<From, To, F, R>(
         self,
         env: &Env,
diff --git a/framework/base/src/types/interaction/tx_payment/tx_payment_none.rs b/framework/base/src/types/interaction/tx_payment/tx_payment_none.rs
index fe6016e43b..8725163f67 100644
--- a/framework/base/src/types/interaction/tx_payment/tx_payment_none.rs
+++ b/framework/base/src/types/interaction/tx_payment/tx_payment_none.rs
@@ -6,10 +6,12 @@ impl<Env> TxPayment<Env> for ()
 where
     Env: TxEnv,
 {
+    #[inline]
     fn is_no_payment(&self, _env: &Env) -> bool {
         true
     }
 
+    #[inline]
     fn perform_transfer_execute(
         self,
         env: &Env,
@@ -17,9 +19,10 @@ where
         gas_limit: u64,
         fc: FunctionCall<Env::Api>,
     ) {
-        Egld(BigUint::zero()).perform_transfer_execute(env, to, gas_limit, fc);
+        Egld(BigUint::zero_ref()).perform_transfer_execute(env, to, gas_limit, fc);
     }
 
+    #[inline]
     fn with_normalized<From, To, F, R>(
         self,
         env: &Env,
@@ -33,7 +36,7 @@ where
         To: TxToSpecified<Env>,
         F: FnOnce(&ManagedAddress<Env::Api>, &BigUint<Env::Api>, &FunctionCall<Env::Api>) -> R,
     {
-        to.with_address_ref(env, |to_addr| f(to_addr, &BigUint::zero(), &fc))
+        to.with_address_ref(env, |to_addr| f(to_addr, &*BigUint::zero_ref(), &fc))
     }
 
     fn into_full_payment_data(self, _env: &Env) -> FullPaymentData<Env::Api> {
diff --git a/framework/base/src/types/interaction/tx_payment/tx_payment_single_esdt_ref.rs b/framework/base/src/types/interaction/tx_payment/tx_payment_single_esdt_ref.rs
index bc5e2532a8..e19a35123d 100644
--- a/framework/base/src/types/interaction/tx_payment/tx_payment_single_esdt_ref.rs
+++ b/framework/base/src/types/interaction/tx_payment/tx_payment_single_esdt_ref.rs
@@ -62,10 +62,10 @@ where
         to.with_address_ref(env, |to_addr| {
             if self.token_nonce == 0 {
                 let fc_conv = fc.convert_to_single_transfer_fungible_call(self);
-                f(to_addr, &BigUint::zero(), &fc_conv)
+                f(to_addr, &*BigUint::zero_ref(), &fc_conv)
             } else {
                 let fc_conv = fc.convert_to_single_transfer_nft_call(to_addr, self);
-                f(&from.resolve_address(env), &BigUint::zero(), &fc_conv)
+                f(&from.resolve_address(env), &*BigUint::zero_ref(), &fc_conv)
             }
         })
     }
diff --git a/framework/base/src/types/interaction/tx_to.rs b/framework/base/src/types/interaction/tx_to.rs
index 6ba0f6eec8..c365809f05 100644
--- a/framework/base/src/types/interaction/tx_to.rs
+++ b/framework/base/src/types/interaction/tx_to.rs
@@ -17,6 +17,7 @@ where
     /// Avoids a clone when performing transfer-execute.
     ///
     /// Other than that, does thesame as `AnnotatedValue::into_value`.
+    #[inline]
     fn with_address_ref<F, R>(&self, env: &Env, f: F) -> R
     where
         F: FnOnce(&ManagedAddress<Env::Api>) -> R,
diff --git a/framework/base/src/types/managed/basic/big_uint.rs b/framework/base/src/types/managed/basic/big_uint.rs
index 5f32388093..eb34d765cf 100644
--- a/framework/base/src/types/managed/basic/big_uint.rs
+++ b/framework/base/src/types/managed/basic/big_uint.rs
@@ -12,6 +12,7 @@ use crate::{
         TopEncodeOutput, TryStaticCast,
     },
     formatter::{hex_util::encode_bytes_as_hex, FormatBuffer, FormatByteReceiver, SCDisplay},
+    proxy_imports::ManagedRef,
     types::{heap::BoxedBytes, ManagedBuffer, ManagedBufferCachedBuilder, ManagedType},
 };
 
@@ -146,6 +147,12 @@ impl<M: ManagedTypeApi> BigUint<M> {
         BigUint::from_handle(handle)
     }
 
+    pub fn zero_ref() -> ManagedRef<'static, M, BigUint<M>> {
+        let handle: M::BigIntHandle = use_raw_handle(const_handles::BIG_INT_CONST_ZERO);
+        M::managed_type_impl().bi_set_int64(handle.clone(), 0);
+        unsafe { ManagedRef::wrap_handle(handle) }
+    }
+
     #[inline]
     pub fn to_u64(&self) -> Option<u64> {
         let api = M::managed_type_impl();
diff --git a/framework/base/src/types/managed/wrapped/egld_or_esdt_token_payment.rs b/framework/base/src/types/managed/wrapped/egld_or_esdt_token_payment.rs
index ffce0c44e7..12670295cf 100644
--- a/framework/base/src/types/managed/wrapped/egld_or_esdt_token_payment.rs
+++ b/framework/base/src/types/managed/wrapped/egld_or_esdt_token_payment.rs
@@ -165,7 +165,7 @@ impl<'a, M: ManagedTypeApi> EgldOrEsdtTokenPaymentRefs<'a, M> {
     }
 
     pub fn is_empty(&self) -> bool {
-        self.amount == &BigUint::zero()
+        self.amount == &0u32
     }
 
     pub fn map_egld_or_esdt<Context, D, F, U>(self, context: Context, for_egld: D, for_esdt: F) -> U

From df8b61ac0a9a04e74f3cfde27d5544f38cabbd31 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Mon, 15 Apr 2024 18:11:07 +0200
Subject: [PATCH 0718/1254] tx to step fix for esdt payments

---
 .../src/scenario/model/transaction/tx_esdt.rs      | 14 ++++++++++++++
 .../src/scenario/tx_to_step/tx_to_step_call.rs     |  8 +++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/framework/scenario/src/scenario/model/transaction/tx_esdt.rs b/framework/scenario/src/scenario/model/transaction/tx_esdt.rs
index cf17a76a19..67ccf99956 100644
--- a/framework/scenario/src/scenario/model/transaction/tx_esdt.rs
+++ b/framework/scenario/src/scenario/model/transaction/tx_esdt.rs
@@ -1,3 +1,5 @@
+use multiversx_sc::{api::ManagedTypeApi, types::EsdtTokenPayment};
+
 use crate::{
     scenario::model::{BigUintValue, BytesValue, U64Value},
     scenario_format::{
@@ -33,6 +35,18 @@ impl IntoRaw<TxESDTRaw> for TxESDT {
     }
 }
 
+impl<M: ManagedTypeApi> From<EsdtTokenPayment<M>> for TxESDT {
+    fn from(value: EsdtTokenPayment<M>) -> Self {
+        TxESDT {
+            esdt_token_identifier: BytesValue::from(
+                value.token_identifier.as_managed_buffer().to_vec(),
+            ),
+            nonce: U64Value::from(value.token_nonce),
+            esdt_value: BigUintValue::from(value.amount),
+        }
+    }
+}
+
 fn interpret_esdt_token_identifier(
     esdt_token_identifier: Option<ValueSubTree>,
     context: &InterpreterContext,
diff --git a/framework/scenario/src/scenario/tx_to_step/tx_to_step_call.rs b/framework/scenario/src/scenario/tx_to_step/tx_to_step_call.rs
index b155ac66df..d111116a5c 100644
--- a/framework/scenario/src/scenario/tx_to_step/tx_to_step_call.rs
+++ b/framework/scenario/src/scenario/tx_to_step/tx_to_step_call.rs
@@ -2,7 +2,7 @@ use multiversx_sc::types::{
     FunctionCall, RHListExec, Tx, TxEnv, TxFromSpecified, TxGas, TxPayment, TxToSpecified,
 };
 
-use crate::scenario_model::{ScCallStep, TxExpect, TxResponse};
+use crate::scenario_model::{ScCallStep, TxESDT, TxExpect, TxResponse};
 
 use super::{address_annotated, gas_annotated, StepWrapper, TxToStep};
 
@@ -65,6 +65,12 @@ where
     let full_payment_data = payment.into_full_payment_data(env);
     if let Some(annotated_egld_payment) = full_payment_data.egld {
         step.tx.egld_value = annotated_egld_payment.into();
+    } else {
+        step.tx.esdt_value = full_payment_data
+            .multi_esdt
+            .iter()
+            .map(TxESDT::from)
+            .collect();
     }
 
     step

From 3773481048b6be9169670e462ff568f96525bb32 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Mon, 15 Apr 2024 18:14:35 +0200
Subject: [PATCH 0719/1254] clippy

---
 framework/scenario/src/facade/world_tx/block_info_builder.rs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/framework/scenario/src/facade/world_tx/block_info_builder.rs b/framework/scenario/src/facade/world_tx/block_info_builder.rs
index a03b312255..0defeb61d9 100644
--- a/framework/scenario/src/facade/world_tx/block_info_builder.rs
+++ b/framework/scenario/src/facade/world_tx/block_info_builder.rs
@@ -13,13 +13,12 @@ pub struct BlockInfoBuilder<'w> {
 
 impl<'w> BlockInfoBuilder<'w> {
     pub(crate) fn new(world: &'w mut ScenarioWorld) -> BlockInfoBuilder<'w> {
-        let mut builder = BlockInfoBuilder {
+        BlockInfoBuilder {
             world,
             set_state_step: SetStateStep::new(),
             current_block: BlockInfo::default(),
             previous_block: BlockInfo::default(),
-        };
-        builder
+        }
     }
 
     // Forces value drop and commit block info.

From d94ae8f075011926027a52bf9c916e48d1ba7580 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 16 Apr 2024 16:56:31 +0300
Subject: [PATCH 0720/1254] unified syntax - inlines & code deduplication

---
 .../tx_payment/tx_payment_egld_or_esdt.rs     |  2 +
 .../tx_payment_egld_or_multi_esdt.rs          | 64 +++++--------------
 .../tx_payment/tx_payment_single_esdt.rs      |  3 +
 .../tx_payment/tx_payment_single_esdt_ref.rs  |  1 +
 .../tx_payment_single_esdt_triple.rs          |  3 +
 .../managed/wrapped/esdt_token_payment.rs     |  1 +
 6 files changed, 25 insertions(+), 49 deletions(-)

diff --git a/framework/base/src/types/interaction/tx_payment/tx_payment_egld_or_esdt.rs b/framework/base/src/types/interaction/tx_payment/tx_payment_egld_or_esdt.rs
index a4ac0577ff..8c5d62e49a 100644
--- a/framework/base/src/types/interaction/tx_payment/tx_payment_egld_or_esdt.rs
+++ b/framework/base/src/types/interaction/tx_payment/tx_payment_egld_or_esdt.rs
@@ -57,10 +57,12 @@ impl<Env> TxPayment<Env> for EgldOrEsdtTokenPayment<Env::Api>
 where
     Env: TxEnv,
 {
+    #[inline]
     fn is_no_payment(&self, env: &Env) -> bool {
         (&self).is_no_payment(env)
     }
 
+    #[inline]
     fn perform_transfer_execute(
         self,
         env: &Env,
diff --git a/framework/base/src/types/interaction/tx_payment/tx_payment_egld_or_multi_esdt.rs b/framework/base/src/types/interaction/tx_payment/tx_payment_egld_or_multi_esdt.rs
index 2538383494..bde3528eb3 100644
--- a/framework/base/src/types/interaction/tx_payment/tx_payment_egld_or_multi_esdt.rs
+++ b/framework/base/src/types/interaction/tx_payment/tx_payment_egld_or_multi_esdt.rs
@@ -1,6 +1,6 @@
 use crate::types::{BigUint, EgldOrMultiEsdtPayment, ManagedAddress, TxFrom, TxToSpecified};
 
-use super::{Egld, FullPaymentData, FunctionCall, TxEnv, TxPayment};
+use super::{FullPaymentData, FunctionCall, TxEnv, TxPayment};
 
 impl<Env> TxPayment<Env> for EgldOrMultiEsdtPayment<Env::Api>
 where
@@ -10,6 +10,7 @@ where
         self.is_empty()
     }
 
+    #[inline]
     fn perform_transfer_execute(
         self,
         env: &Env,
@@ -17,16 +18,11 @@ where
         gas_limit: u64,
         fc: FunctionCall<Env::Api>,
     ) {
-        match self {
-            EgldOrMultiEsdtPayment::Egld(egld_amount) => {
-                Egld(egld_amount).perform_transfer_execute(env, to, gas_limit, fc)
-            },
-            EgldOrMultiEsdtPayment::MultiEsdt(multi_esdt_payment) => {
-                multi_esdt_payment.perform_transfer_execute(env, to, gas_limit, fc)
-            },
-        }
+        self.as_refs()
+            .perform_transfer_execute(env, to, gas_limit, fc)
     }
 
+    #[inline]
     fn with_normalized<From, To, F, R>(
         self,
         env: &Env,
@@ -40,25 +36,12 @@ where
         To: TxToSpecified<Env>,
         F: FnOnce(&ManagedAddress<Env::Api>, &BigUint<Env::Api>, &FunctionCall<Env::Api>) -> R,
     {
-        match self {
-            EgldOrMultiEsdtPayment::Egld(egld_amount) => {
-                Egld(egld_amount).with_normalized(env, from, to, fc, f)
-            },
-            EgldOrMultiEsdtPayment::MultiEsdt(multi_esdt_payment) => {
-                multi_esdt_payment.with_normalized(env, from, to, fc, f)
-            },
-        }
+        self.as_refs().with_normalized(env, from, to, fc, f)
     }
 
+    #[inline]
     fn into_full_payment_data(self, env: &Env) -> FullPaymentData<Env::Api> {
-        match self {
-            EgldOrMultiEsdtPayment::Egld(egld_amount) => {
-                TxPayment::<Env>::into_full_payment_data(Egld(egld_amount), env)
-            },
-            EgldOrMultiEsdtPayment::MultiEsdt(multi_esdt_payment) => {
-                TxPayment::<Env>::into_full_payment_data(multi_esdt_payment, env)
-            },
-        }
+        self.as_refs().into_full_payment_data(env)
     }
 }
 
@@ -70,6 +53,7 @@ where
         self.is_empty()
     }
 
+    #[inline]
     fn perform_transfer_execute(
         self,
         env: &Env,
@@ -77,16 +61,11 @@ where
         gas_limit: u64,
         fc: FunctionCall<Env::Api>,
     ) {
-        match self {
-            EgldOrMultiEsdtPayment::Egld(egld_amount) => {
-                Egld(egld_amount).perform_transfer_execute(env, to, gas_limit, fc)
-            },
-            EgldOrMultiEsdtPayment::MultiEsdt(multi_esdt_payment) => {
-                multi_esdt_payment.perform_transfer_execute(env, to, gas_limit, fc)
-            },
-        }
+        self.as_refs()
+            .perform_transfer_execute(env, to, gas_limit, fc)
     }
 
+    #[inline]
     fn with_normalized<From, To, F, R>(
         self,
         env: &Env,
@@ -100,24 +79,11 @@ where
         To: TxToSpecified<Env>,
         F: FnOnce(&ManagedAddress<Env::Api>, &BigUint<Env::Api>, &FunctionCall<Env::Api>) -> R,
     {
-        match self {
-            EgldOrMultiEsdtPayment::Egld(egld_amount) => {
-                Egld(egld_amount).with_normalized(env, from, to, fc, f)
-            },
-            EgldOrMultiEsdtPayment::MultiEsdt(multi_esdt_payment) => {
-                multi_esdt_payment.with_normalized(env, from, to, fc, f)
-            },
-        }
+        self.as_refs().with_normalized(env, from, to, fc, f)
     }
 
+    #[inline]
     fn into_full_payment_data(self, env: &Env) -> FullPaymentData<Env::Api> {
-        match self {
-            EgldOrMultiEsdtPayment::Egld(egld_amount) => {
-                TxPayment::<Env>::into_full_payment_data(Egld(egld_amount), env)
-            },
-            EgldOrMultiEsdtPayment::MultiEsdt(multi_esdt_payment) => {
-                TxPayment::<Env>::into_full_payment_data(multi_esdt_payment, env)
-            },
-        }
+        self.as_refs().into_full_payment_data(env)
     }
 }
diff --git a/framework/base/src/types/interaction/tx_payment/tx_payment_single_esdt.rs b/framework/base/src/types/interaction/tx_payment/tx_payment_single_esdt.rs
index 66e3374aa0..fe1a0371dd 100644
--- a/framework/base/src/types/interaction/tx_payment/tx_payment_single_esdt.rs
+++ b/framework/base/src/types/interaction/tx_payment/tx_payment_single_esdt.rs
@@ -8,10 +8,12 @@ impl<Env> TxPayment<Env> for EsdtTokenPayment<Env::Api>
 where
     Env: TxEnv,
 {
+    #[inline]
     fn is_no_payment(&self, _env: &Env) -> bool {
         self.amount == 0u32
     }
 
+    #[inline]
     fn perform_transfer_execute(
         self,
         env: &Env,
@@ -23,6 +25,7 @@ where
             .perform_transfer_execute(env, to, gas_limit, fc);
     }
 
+    #[inline]
     fn with_normalized<From, To, F, R>(
         self,
         env: &Env,
diff --git a/framework/base/src/types/interaction/tx_payment/tx_payment_single_esdt_ref.rs b/framework/base/src/types/interaction/tx_payment/tx_payment_single_esdt_ref.rs
index e19a35123d..c17ec71c8e 100644
--- a/framework/base/src/types/interaction/tx_payment/tx_payment_single_esdt_ref.rs
+++ b/framework/base/src/types/interaction/tx_payment/tx_payment_single_esdt_ref.rs
@@ -11,6 +11,7 @@ impl<'a, Env> TxPayment<Env> for EsdtTokenPaymentRefs<'a, Env::Api>
 where
     Env: TxEnv,
 {
+    #[inline]
     fn is_no_payment(&self, _env: &Env) -> bool {
         self.amount == &0u32
     }
diff --git a/framework/base/src/types/interaction/tx_payment/tx_payment_single_esdt_triple.rs b/framework/base/src/types/interaction/tx_payment/tx_payment_single_esdt_triple.rs
index c49062eb27..458e631a30 100644
--- a/framework/base/src/types/interaction/tx_payment/tx_payment_single_esdt_triple.rs
+++ b/framework/base/src/types/interaction/tx_payment/tx_payment_single_esdt_triple.rs
@@ -12,6 +12,7 @@ where
         self.2 == 0u32
     }
 
+    #[inline]
     fn perform_transfer_execute(
         self,
         env: &Env,
@@ -22,6 +23,7 @@ where
         EsdtTokenPayment::from(self).perform_transfer_execute(env, to, gas_limit, fc)
     }
 
+    #[inline]
     fn with_normalized<From, To, F, R>(
         self,
         env: &Env,
@@ -38,6 +40,7 @@ where
         EsdtTokenPayment::from(self).with_normalized(env, from, to, fc, f)
     }
 
+    #[inline]
     fn into_full_payment_data(self, env: &Env) -> FullPaymentData<Env::Api> {
         EsdtTokenPayment::from(self).into_full_payment_data(env)
     }
diff --git a/framework/base/src/types/managed/wrapped/esdt_token_payment.rs b/framework/base/src/types/managed/wrapped/esdt_token_payment.rs
index ac7a54c442..5dcfeceaab 100644
--- a/framework/base/src/types/managed/wrapped/esdt_token_payment.rs
+++ b/framework/base/src/types/managed/wrapped/esdt_token_payment.rs
@@ -237,6 +237,7 @@ impl<M: ManagedTypeApi> EsdtTokenPayment<M> {
 }
 
 impl<'a, M: ManagedTypeApi> EsdtTokenPaymentRefs<'a, M> {
+    #[inline]
     pub fn new(
         token_identifier: &'a TokenIdentifier<M>,
         token_nonce: u64,

From 9b4d31707cfeaa2bc1d8cb747a4cff08b3e7a96e Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 16 Apr 2024 17:30:28 +0300
Subject: [PATCH 0721/1254] unified syntax - more migrations

---
 .../src/crowdfunding_esdt.rs                  | 11 +++--
 .../examples/lottery-esdt/src/lottery.rs      | 16 +++----
 .../examples/nft-minter/src/nft_module.rs     | 11 +----
 .../forwarder-raw/src/forwarder_raw_async.rs  |  5 +-
 .../local-esdt-and-nft/src/lib.rs             |  6 ++-
 .../erc1155-marketplace/src/lib.rs            | 25 +++++-----
 .../rust-testing-framework-tester/src/lib.rs  |  8 +---
 .../src/bonding_curve/utils/user_endpoints.rs | 17 +++----
 contracts/modules/src/staking.rs              |  6 ++-
 contracts/modules/src/token_merge/mod.rs      |  8 ++--
 .../tx_payment/tx_payment_single_esdt.rs      | 46 +++++++++++++++++++
 11 files changed, 103 insertions(+), 56 deletions(-)

diff --git a/contracts/examples/crowdfunding-esdt/src/crowdfunding_esdt.rs b/contracts/examples/crowdfunding-esdt/src/crowdfunding_esdt.rs
index abe8420d82..1dea493562 100644
--- a/contracts/examples/crowdfunding-esdt/src/crowdfunding_esdt.rs
+++ b/contracts/examples/crowdfunding-esdt/src/crowdfunding_esdt.rs
@@ -75,8 +75,10 @@ pub trait Crowdfunding {
                 let token_identifier = self.cf_token_identifier().get();
                 let sc_balance = self.get_current_funds();
 
-                self.send()
-                    .direct(&caller, &token_identifier, 0, &sc_balance);
+                self.tx()
+                    .to(&caller)
+                    .egld_or_single_esdt(&token_identifier, 0, &sc_balance)
+                    .transfer();
             },
             Status::Failed => {
                 let caller = self.blockchain().get_caller();
@@ -86,7 +88,10 @@ pub trait Crowdfunding {
                     let token_identifier = self.cf_token_identifier().get();
 
                     self.deposit(&caller).clear();
-                    self.send().direct(&caller, &token_identifier, 0, &deposit);
+                    self.tx()
+                        .to(&caller)
+                        .egld_or_single_esdt(&token_identifier, 0, &deposit)
+                        .transfer();
                 }
             },
         }
diff --git a/contracts/examples/lottery-esdt/src/lottery.rs b/contracts/examples/lottery-esdt/src/lottery.rs
index 48a94b14b2..3c5d9040b1 100644
--- a/contracts/examples/lottery-esdt/src/lottery.rs
+++ b/contracts/examples/lottery-esdt/src/lottery.rs
@@ -291,19 +291,19 @@ pub trait Lottery {
                 &BigUint::from(info.prize_distribution.get(i)),
             );
 
-            self.send()
-                .direct(&winner_address, &info.token_identifier, 0, &prize);
+            self.tx()
+                .to(&winner_address)
+                .egld_or_single_esdt(&info.token_identifier, 0, &prize)
+                .transfer();
             info.prize_pool -= prize;
         }
 
         // send leftover to first place
         let first_place_winner = ticket_holders_mapper.get(winning_tickets[0]);
-        self.send().direct(
-            &first_place_winner,
-            &info.token_identifier,
-            0,
-            &info.prize_pool,
-        );
+        self.tx()
+            .to(&first_place_winner)
+            .egld_or_single_esdt(&info.token_identifier, 0, &info.prize_pool)
+            .transfer();
     }
 
     fn clear_storage(&self, lottery_name: &ManagedBuffer) {
diff --git a/contracts/examples/nft-minter/src/nft_module.rs b/contracts/examples/nft-minter/src/nft_module.rs
index 05b937f432..6b324fefee 100644
--- a/contracts/examples/nft-minter/src/nft_module.rs
+++ b/contracts/examples/nft-minter/src/nft_module.rs
@@ -95,12 +95,7 @@ pub trait NftModule {
             .transfer();
 
         let owner = self.blockchain().get_owner_address();
-        self.send().direct(
-            &owner,
-            &payment.token_identifier,
-            payment.token_nonce,
-            &payment.amount,
-        );
+        self.tx().to(owner).payment(payment).transfer();
     }
 
     // views
@@ -133,11 +128,9 @@ pub trait NftModule {
                 self.nft_token_id().set(&token_id.unwrap_esdt());
             },
             ManagedAsyncCallResult::Err(_) => {
-                let caller = self.blockchain().get_owner_address();
                 let returned = self.call_value().egld_or_single_esdt();
                 if returned.token_identifier.is_egld() && returned.amount > 0 {
-                    self.send()
-                        .direct(&caller, &returned.token_identifier, 0, &returned.amount);
+                    self.tx().to(ToCaller).egld(returned.amount).transfer();
                 }
             },
         }
diff --git a/contracts/feature-tests/composability/forwarder-raw/src/forwarder_raw_async.rs b/contracts/feature-tests/composability/forwarder-raw/src/forwarder_raw_async.rs
index 55f00f079e..7c26b40c60 100644
--- a/contracts/feature-tests/composability/forwarder-raw/src/forwarder_raw_async.rs
+++ b/contracts/feature-tests/composability/forwarder-raw/src/forwarder_raw_async.rs
@@ -6,7 +6,10 @@ pub trait ForwarderRawAsync: super::forwarder_raw_common::ForwarderRawCommon {
     #[payable("*")]
     fn forward_payment(&self, to: ManagedAddress) {
         let (token, payment) = self.call_value().egld_or_single_fungible_esdt();
-        self.send().direct(&to, &token, 0, &payment);
+        self.tx()
+            .to(to)
+            .egld_or_single_esdt(&token, 0, &payment)
+            .transfer();
     }
 
     #[endpoint]
diff --git a/contracts/feature-tests/composability/local-esdt-and-nft/src/lib.rs b/contracts/feature-tests/composability/local-esdt-and-nft/src/lib.rs
index e65fd789b4..b51fd3ab9c 100644
--- a/contracts/feature-tests/composability/local-esdt-and-nft/src/lib.rs
+++ b/contracts/feature-tests/composability/local-esdt-and-nft/src/lib.rs
@@ -138,8 +138,10 @@ pub trait LocalEsdtAndEsdtNft {
         nonce: u64,
         amount: BigUint,
     ) {
-        self.send()
-            .transfer_esdt_via_async_call(to, token_identifier, nonce, amount);
+        self.tx()
+            .to(to)
+            .esdt((token_identifier, nonce, amount))
+            .async_call_and_exit();
     }
 
     #[endpoint]
diff --git a/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/src/lib.rs b/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/src/lib.rs
index 08c0f09258..7aa633d71c 100644
--- a/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/src/lib.rs
+++ b/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/src/lib.rs
@@ -108,7 +108,10 @@ pub trait Erc1155Marketplace {
 
         let claimable_funds_mapper = self.get_claimable_funds_mapper();
         for (token_identifier, amount) in claimable_funds_mapper.iter() {
-            self.send().direct(&caller, &token_identifier, 0, &amount);
+            self.tx()
+                .to(&caller)
+                .egld_or_single_esdt(&token_identifier, 0, &amount)
+                .transfer();
             self.clear_claimable_funds(&token_identifier);
         }
     }
@@ -178,12 +181,10 @@ pub trait Erc1155Marketplace {
 
         // refund losing bid
         if !auction.current_winner.is_zero() {
-            self.send().direct(
-                &auction.current_winner,
-                &auction.token_identifier,
-                0,
-                &auction.current_bid,
-            );
+            self.tx()
+                .to(&auction.current_winner)
+                .egld_or_single_esdt(&auction.token_identifier, 0, &auction.current_bid)
+                .transfer();
         }
 
         // update auction bid and winner
@@ -217,12 +218,10 @@ pub trait Erc1155Marketplace {
             self.add_claimable_funds(&auction.token_identifier, &cut_amount);
 
             // send part of the bid to the original owner
-            self.send().direct(
-                &auction.original_owner,
-                &auction.token_identifier,
-                0,
-                &amount_to_send,
-            );
+            self.tx()
+                .to(&auction.original_owner)
+                .egld_or_single_esdt(&auction.token_identifier, 0, &amount_to_send)
+                .transfer();
 
             // send token to winner
             self.async_transfer_token(type_id, nft_id, auction.current_winner);
diff --git a/contracts/feature-tests/rust-testing-framework-tester/src/lib.rs b/contracts/feature-tests/rust-testing-framework-tester/src/lib.rs
index dae11542e4..d535041664 100644
--- a/contracts/feature-tests/rust-testing-framework-tester/src/lib.rs
+++ b/contracts/feature-tests/rust-testing-framework-tester/src/lib.rs
@@ -62,14 +62,8 @@ pub trait RustTestingFrameworkTester: dummy_module::DummyModule {
     #[payable("EGLD")]
     #[endpoint]
     fn recieve_egld_half(&self) {
-        let caller = self.blockchain().get_caller();
         let payment_amount = &*self.call_value().egld_value() / 2u32;
-        self.send().direct(
-            &caller,
-            &EgldOrEsdtTokenIdentifier::egld(),
-            0,
-            &payment_amount,
-        );
+        self.tx().to(ToCaller).egld(payment_amount).transfer();
     }
 
     #[payable("*")]
diff --git a/contracts/modules/src/bonding_curve/utils/user_endpoints.rs b/contracts/modules/src/bonding_curve/utils/user_endpoints.rs
index d81fc4f2b1..f627d26256 100644
--- a/contracts/modules/src/bonding_curve/utils/user_endpoints.rs
+++ b/contracts/modules/src/bonding_curve/utils/user_endpoints.rs
@@ -48,8 +48,11 @@ pub trait UserEndpointsModule: storage::StorageModule + events::EventsModule {
         self.nonce_amount(&offered_token, nonce)
             .update(|val| *val += sell_amount);
 
-        self.send()
-            .direct(&caller, &payment_token, 0u64, &calculated_price);
+        self.tx()
+            .to(&caller)
+            .egld_or_single_esdt(&payment_token, 0u64, &calculated_price)
+            .transfer();
+
         self.token_details(&offered_token)
             .update(|details| details.add_nonce(nonce));
 
@@ -116,12 +119,10 @@ pub trait UserEndpointsModule: storage::StorageModule + events::EventsModule {
             },
         };
 
-        self.send().direct(
-            &caller,
-            &offered_token,
-            0u64,
-            &(&payment - &calculated_price),
-        );
+        self.tx()
+            .to(&caller)
+            .egld_or_single_esdt(&offered_token, 0u64, &(&payment - &calculated_price))
+            .transfer();
 
         self.buy_token_event(&caller, &calculated_price);
     }
diff --git a/contracts/modules/src/staking.rs b/contracts/modules/src/staking.rs
index 3db2350fb1..e30a457e51 100644
--- a/contracts/modules/src/staking.rs
+++ b/contracts/modules/src/staking.rs
@@ -90,8 +90,10 @@ pub trait StakingModule {
         staked_amount_mapper.set(&leftover_amount);
 
         let staking_token = self.staking_token().get();
-        self.send()
-            .direct(&caller, &staking_token, 0, &unstake_amount);
+        self.tx()
+            .to(caller)
+            .egld_or_single_esdt(&staking_token, 0, &unstake_amount)
+            .transfer();
     }
 
     #[endpoint(voteSlashMember)]
diff --git a/contracts/modules/src/token_merge/mod.rs b/contracts/modules/src/token_merge/mod.rs
index 2e4fe85668..b940980dfe 100644
--- a/contracts/modules/src/token_merge/mod.rs
+++ b/contracts/modules/src/token_merge/mod.rs
@@ -74,9 +74,11 @@ pub trait TokenMergeModule:
 
         let merged_token_payment =
             self.create_merged_token(merged_token_id, &all_merged_instances, attr_creator);
-        let caller = self.blockchain().get_caller();
-        self.send()
-            .direct_non_zero_esdt_payment(&caller, &merged_token_payment);
+
+        self.tx()
+            .to(ToCaller)
+            .payment(&merged_token_payment)
+            .transfer_if_not_empty();
 
         merged_token_payment
     }
diff --git a/framework/base/src/types/interaction/tx_payment/tx_payment_single_esdt.rs b/framework/base/src/types/interaction/tx_payment/tx_payment_single_esdt.rs
index 66e3374aa0..975a5d0d78 100644
--- a/framework/base/src/types/interaction/tx_payment/tx_payment_single_esdt.rs
+++ b/framework/base/src/types/interaction/tx_payment/tx_payment_single_esdt.rs
@@ -46,3 +46,49 @@ where
         }
     }
 }
+
+impl<Env> TxPayment<Env> for &EsdtTokenPayment<Env::Api>
+where
+    Env: TxEnv,
+{
+    #[inline]
+    fn is_no_payment(&self, _env: &Env) -> bool {
+        self.amount == 0u32
+    }
+
+    #[inline]
+    fn perform_transfer_execute(
+        self,
+        env: &Env,
+        to: &ManagedAddress<Env::Api>,
+        gas_limit: u64,
+        fc: FunctionCall<Env::Api>,
+    ) {
+        self.as_refs()
+            .perform_transfer_execute(env, to, gas_limit, fc);
+    }
+
+    #[inline]
+    fn with_normalized<From, To, F, R>(
+        self,
+        env: &Env,
+        from: &From,
+        to: To,
+        fc: FunctionCall<Env::Api>,
+        f: F,
+    ) -> R
+    where
+        From: TxFrom<Env>,
+        To: TxToSpecified<Env>,
+        F: FnOnce(&ManagedAddress<Env::Api>, &BigUint<Env::Api>, &FunctionCall<Env::Api>) -> R,
+    {
+        self.as_refs().with_normalized(env, from, to, fc, f)
+    }
+
+    fn into_full_payment_data(self, _env: &Env) -> FullPaymentData<Env::Api> {
+        FullPaymentData {
+            egld: None,
+            multi_esdt: MultiEsdtPayment::from_single_item(self.clone()),
+        }
+    }
+}

From 7bb85c9553605d9661219be3e022304fcebf1180 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Tue, 16 Apr 2024 20:14:03 +0300
Subject: [PATCH 0722/1254] check deposit problem

---
 .../tests/crowdfunding_esdt_blackbox_test.rs  | 100 ++++++++++--------
 1 file changed, 55 insertions(+), 45 deletions(-)

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 a23ecc3854..b821b070fb 100644
--- a/contracts/examples/crowdfunding-esdt/tests/crowdfunding_esdt_blackbox_test.rs
+++ b/contracts/examples/crowdfunding-esdt/tests/crowdfunding_esdt_blackbox_test.rs
@@ -6,7 +6,6 @@ use num_bigint::BigUint;
 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 = "mxsc:output/crowdfunding-esdt.mxsc.json";
 const FIRST_USER_ADDRESS_EXPR: &str = "address:first-user";
 const FIRST_USER_ADDRESS_EXPR_REPL: AddressExpr = AddressExpr("first-user");
@@ -40,32 +39,31 @@ struct CrowdfundingESDTTestState {
 impl CrowdfundingESDTTestState {
     fn new() -> Self {
         let mut world = world();
-        let owner_address = "address:owner";
-
-        world.set_state_step(
-            SetStateStep::new()
-                .put_account(OWNER_ADDRESS_EXPR_REPL, Account::new().nonce(1))
-                .new_address(owner_address, 1, CROWDFUNDING_ESDT_ADDRESS_EXPR)
-                .put_account(
-                    FIRST_USER_ADDRESS_EXPR_REPL,
-                    Account::new()
-                        .nonce(1)
-                        .balance("1_000")
-                        .esdt_balance(CF_TOKEN_ID_EXPR, "1_000"),
-                )
-                .put_account(
-                    SECOND_USER_ADDRESS_EXPR_REPL,
-                    Account::new()
-                        .nonce(1)
-                        .esdt_balance(CF_TOKEN_ID_EXPR, "1_000"),
-                ),
-        );
-
-        let crowdfunding_esdt_contract =
-            CrowdfundingESDTContract::new(CROWDFUNDING_ESDT_ADDRESS_EXPR);
-
-        let first_user_address = AddressValue::from(FIRST_USER_ADDRESS_EXPR).to_address();
-        let second_user_address = AddressValue::from(SECOND_USER_ADDRESS_EXPR).to_address();
+        // let owner_address = "address:owner";
+
+        world
+            .account(OWNER_ADDRESS_EXPR)
+            .nonce(1)
+            .account(FIRST_USER_ADDRESS_EXPR_REPL)
+            .nonce(1)
+            .balance("1000")
+            .esdt_balance(CF_TOKEN_ID_EXPR, "1000")
+            .account(SECOND_USER_ADDRESS_EXPR_REPL)
+            .nonce(1)
+            .esdt_balance(CF_TOKEN_ID_EXPR, "1000");
+
+        world.set_state_step(SetStateStep::new().new_address(
+            OWNER_ADDRESS_EXPR,
+            1,
+            SC_CROWDFUNDING_ESDT_EXPR.eval_to_expr().as_str(),
+        ));
+
+        let crowdfunding_esdt_contract = CrowdfundingESDTContract::new(SC_CROWDFUNDING_ESDT_EXPR);
+
+        let first_user_address =
+            AddressValue::from(FIRST_USER_ADDRESS_EXPR_REPL.eval_to_expr().as_str()).to_address();
+        let second_user_address =
+            AddressValue::from(SECOND_USER_ADDRESS_EXPR_REPL.eval_to_expr().as_str()).to_address();
 
         Self {
             world,
@@ -96,22 +94,24 @@ impl CrowdfundingESDTTestState {
             .to(SC_CROWDFUNDING_ESDT_EXPR)
             .typed(crowdfunding_esdt_proxy::CrowdfundingProxy)
             .fund()
-            .single_esdt(
-                &TokenIdentifier::from(CF_TOKEN_ID_EXPR),
+            .egld_or_single_esdt(
+                &EgldOrEsdtTokenIdentifier::esdt(CF_TOKEN_ID),
                 0u64,
                 &multiversx_sc::proxy_imports::BigUint::from(amount),
             )
             .run();
     }
 
-    fn check_deposit(&mut self, donor: Address, amount: u64) -> &mut Self {
-        self.world.sc_query(
-            ScQueryStep::new()
-                .call(self.crowdfunding_esdt_contract.deposit(&donor))
-                .expect_value(SingleValue::from(BigUint::from(amount))),
-        );
+    fn check_deposit(&mut self, donor: Address, amount: u64) {
+        let value = world()
+            .query()
+            .to(SC_CROWDFUNDING_ESDT_EXPR)
+            .typed(crowdfunding_esdt_proxy::CrowdfundingProxy)
+            .deposit(&donor)
+            .returns(ReturnsResultConv::<BigUint>::new())
+            .run();
 
-        self
+        assert_eq!(value, amount.into());
     }
 
     fn check_status(&mut self, expected_value: Status) -> &mut Self {
@@ -157,8 +157,8 @@ fn test_fund() {
     let mut state = CrowdfundingESDTTestState::new();
     state.deploy();
 
-    state.fund(FIRST_USER_ADDRESS_EXPR_REPL, 1_000);
-    state.check_deposit(state.first_user_address.clone(), 1_000);
+    state.fund(FIRST_USER_ADDRESS_EXPR_REPL, 1_000u64);
+    state.check_deposit(state.first_user_address.clone(), 1_000u64);
 }
 
 #[test]
@@ -198,12 +198,14 @@ fn test_successful_cf() {
     state.deploy();
 
     // first user fund
-    state.fund(FIRST_USER_ADDRESS_EXPR_REPL, 1000);
-    state.check_deposit(state.first_user_address.clone(), 1_000);
+    state.fund(FIRST_USER_ADDRESS_EXPR_REPL, 1_000u64); //.eval_to_expr().as_str(), "1000");
+                                                        // state.check_deposit(state.first_user_address.clone(), 1_000);
+                                                        // state.check_deposit(FIRST_USER_ADDRESS_EXPR_REPL, 1_000);
 
     // second user fund
     state.fund(SECOND_USER_ADDRESS_EXPR_REPL, 1000);
-    state.check_deposit(state.second_user_address.clone(), 1_000);
+    // state.check_deposit(SECOND_USER_ADDRESS_EXPR_REPL, 1_000);
+    // state.check_deposit(state.second_user_address.clone(), 1_000);
 
     // set block timestamp after deadline
     state.set_block_timestamp(CF_DEADLINE + 1);
@@ -235,12 +237,20 @@ fn test_failed_cf() {
     state.deploy();
 
     // first user fund
-    state.fund(FIRST_USER_ADDRESS_EXPR_REPL, 300);
-    state.check_deposit(state.first_user_address.clone(), 300u64);
+    state.fund(
+        FIRST_USER_ADDRESS_EXPR_REPL, //.eval_to_expr().as_str()
+        300,
+    );
+    // state.check_deposit(FIRST_USER_ADDRESS_EXPR_REPL, 300u64);
+    // state.check_deposit(state.first_user_address.clone(), 300u64);
 
     // second user fund
-    state.fund(SECOND_USER_ADDRESS_EXPR_REPL, 600);
-    state.check_deposit(state.second_user_address.clone(), 600u64);
+    state.fund(
+        SECOND_USER_ADDRESS_EXPR_REPL, //.eval_to_expr().as_str()
+        600,
+    );
+    // state.check_deposit(SECOND_USER_ADDRESS_EXPR_REPL, 600u64);
+    // state.check_deposit(state.second_user_address.clone(), 600u64);
 
     // set block timestamp after deadline
     state.set_block_timestamp(CF_DEADLINE + 1);

From b015b41494ff6b62452abec81590a19e85691f04 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 17 Apr 2024 09:46:30 +0300
Subject: [PATCH 0723/1254] wasm crate comment fix

---
 contracts/examples/adder/wasm/src/lib.rs      |  2 +-
 .../examples/crypto-zombies/wasm/src/lib.rs   |  2 +-
 contracts/examples/empty/wasm/src/lib.rs      |  2 +-
 contracts/examples/factorial/wasm/src/lib.rs  |  2 +-
 .../multisig/wasm-multisig-full/src/lib.rs    |  2 +-
 contracts/examples/multisig/wasm/src/lib.rs   |  2 +-
 .../examples/ping-pong-egld/wasm/src/lib.rs   |  2 +-
 .../feature-tests/abi-tester/wasm/src/lib.rs  |  2 +-
 .../forwarder-legacy/wasm/Cargo.toml          | 32 +++++++
 .../forwarder-legacy/wasm/src/lib.rs          | 94 +++++++++++++++++++
 .../src/lib.rs                                |  2 +-
 .../proxy-test-second/wasm/src/lib.rs         |  2 +-
 .../vault/wasm-vault-upgrade/src/lib.rs       |  2 +-
 .../composability/vault/wasm/src/lib.rs       |  2 +-
 .../exchange-features/wasm/src/lib.rs         |  3 +-
 .../scenario-tester/wasm/src/lib.rs           |  2 +-
 .../cmd/contract/sc_config/wasm_crate_gen.rs  |  4 +-
 17 files changed, 144 insertions(+), 15 deletions(-)
 create mode 100644 contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.toml
 create mode 100644 contracts/feature-tests/composability/forwarder-legacy/wasm/src/lib.rs

diff --git a/contracts/examples/adder/wasm/src/lib.rs b/contracts/examples/adder/wasm/src/lib.rs
index 38c36e9d2c..f5f1d356c2 100644
--- a/contracts/examples/adder/wasm/src/lib.rs
+++ b/contracts/examples/adder/wasm/src/lib.rs
@@ -8,7 +8,7 @@
 // Upgrade:                              1
 // Endpoints:                            2
 // Async Callback (empty):               1
-// Total number of exported functions:   4
+// Total number of exported functions:   5
 
 #![no_std]
 #![allow(internal_features)]
diff --git a/contracts/examples/crypto-zombies/wasm/src/lib.rs b/contracts/examples/crypto-zombies/wasm/src/lib.rs
index ffc350bc7d..13e3db684c 100644
--- a/contracts/examples/crypto-zombies/wasm/src/lib.rs
+++ b/contracts/examples/crypto-zombies/wasm/src/lib.rs
@@ -8,7 +8,7 @@
 // Upgrade:                              1
 // Endpoints:                           17
 // Async Callback:                       1
-// Total number of exported functions:  19
+// Total number of exported functions:  20
 
 #![no_std]
 #![allow(internal_features)]
diff --git a/contracts/examples/empty/wasm/src/lib.rs b/contracts/examples/empty/wasm/src/lib.rs
index 6267772e3b..53a9c2f2f1 100644
--- a/contracts/examples/empty/wasm/src/lib.rs
+++ b/contracts/examples/empty/wasm/src/lib.rs
@@ -8,7 +8,7 @@
 // Upgrade:                              1
 // Endpoints:                            0
 // Async Callback (empty):               1
-// Total number of exported functions:   2
+// Total number of exported functions:   3
 
 #![no_std]
 #![allow(internal_features)]
diff --git a/contracts/examples/factorial/wasm/src/lib.rs b/contracts/examples/factorial/wasm/src/lib.rs
index 0b5b352a7c..969872f107 100644
--- a/contracts/examples/factorial/wasm/src/lib.rs
+++ b/contracts/examples/factorial/wasm/src/lib.rs
@@ -8,7 +8,7 @@
 // Upgrade:                              1
 // Endpoints:                            1
 // Async Callback (empty):               1
-// Total number of exported functions:   3
+// Total number of exported functions:   4
 
 #![no_std]
 #![allow(internal_features)]
diff --git a/contracts/examples/multisig/wasm-multisig-full/src/lib.rs b/contracts/examples/multisig/wasm-multisig-full/src/lib.rs
index bc725882a2..254c27444a 100644
--- a/contracts/examples/multisig/wasm-multisig-full/src/lib.rs
+++ b/contracts/examples/multisig/wasm-multisig-full/src/lib.rs
@@ -8,7 +8,7 @@
 // Upgrade:                              1
 // Endpoints:                           28
 // Async Callback:                       1
-// Total number of exported functions:  30
+// Total number of exported functions:  31
 
 #![no_std]
 #![allow(internal_features)]
diff --git a/contracts/examples/multisig/wasm/src/lib.rs b/contracts/examples/multisig/wasm/src/lib.rs
index 553df1cde9..ab19ce2ad3 100644
--- a/contracts/examples/multisig/wasm/src/lib.rs
+++ b/contracts/examples/multisig/wasm/src/lib.rs
@@ -8,7 +8,7 @@
 // Upgrade:                              1
 // Endpoints:                           20
 // Async Callback:                       1
-// Total number of exported functions:  22
+// Total number of exported functions:  23
 
 #![no_std]
 #![allow(internal_features)]
diff --git a/contracts/examples/ping-pong-egld/wasm/src/lib.rs b/contracts/examples/ping-pong-egld/wasm/src/lib.rs
index 32ace34885..b3fb0e62cb 100644
--- a/contracts/examples/ping-pong-egld/wasm/src/lib.rs
+++ b/contracts/examples/ping-pong-egld/wasm/src/lib.rs
@@ -8,7 +8,7 @@
 // Upgrade:                              1
 // Endpoints:                           10
 // Async Callback (empty):               1
-// Total number of exported functions:  12
+// Total number of exported functions:  13
 
 #![no_std]
 #![allow(internal_features)]
diff --git a/contracts/feature-tests/abi-tester/wasm/src/lib.rs b/contracts/feature-tests/abi-tester/wasm/src/lib.rs
index e38197e707..b8183ee1af 100644
--- a/contracts/feature-tests/abi-tester/wasm/src/lib.rs
+++ b/contracts/feature-tests/abi-tester/wasm/src/lib.rs
@@ -8,7 +8,7 @@
 // Upgrade:                              1
 // Endpoints:                           27
 // Async Callback (empty):               1
-// Total number of exported functions:  29
+// Total number of exported functions:  30
 
 #![no_std]
 #![allow(internal_features)]
diff --git a/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.toml b/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.toml
new file mode 100644
index 0000000000..58f24599a1
--- /dev/null
+++ b/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.toml
@@ -0,0 +1,32 @@
+# Code generated by the multiversx-sc build system. DO NOT EDIT.
+
+# ##########################################
+# ############## AUTO-GENERATED #############
+# ##########################################
+
+[package]
+name = "forwarder-legacy-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.forwarder-legacy]
+path = ".."
+
+[dependencies.multiversx-sc-wasm-adapter]
+version = "0.49.0-alpha.3"
+path = "../../../../../framework/wasm-adapter"
+
+[workspace]
+members = ["."]
diff --git a/contracts/feature-tests/composability/forwarder-legacy/wasm/src/lib.rs b/contracts/feature-tests/composability/forwarder-legacy/wasm/src/lib.rs
new file mode 100644
index 0000000000..180b626b66
--- /dev/null
+++ b/contracts/feature-tests/composability/forwarder-legacy/wasm/src/lib.rs
@@ -0,0 +1,94 @@
+// Code generated by the multiversx-sc build system. DO NOT EDIT.
+
+////////////////////////////////////////////////////
+////////////////// AUTO-GENERATED //////////////////
+////////////////////////////////////////////////////
+
+// Init:                                 1
+// Endpoints:                           68
+// Async Callback:                       1
+// Total number of exported functions:  70
+
+#![no_std]
+#![allow(internal_features)]
+#![feature(lang_items)]
+
+multiversx_sc_wasm_adapter::allocator!();
+multiversx_sc_wasm_adapter::panic_handler!();
+
+multiversx_sc_wasm_adapter::endpoints! {
+    forwarder_legacy
+    (
+        init => init
+        send_egld => send_egld
+        echo_arguments_sync => echo_arguments_sync
+        echo_arguments_sync_twice => echo_arguments_sync_twice
+        forward_sync_accept_funds => forward_sync_accept_funds
+        forward_sync_accept_funds_with_fees => forward_sync_accept_funds_with_fees
+        forward_sync_accept_funds_then_read => forward_sync_accept_funds_then_read
+        forward_sync_retrieve_funds => forward_sync_retrieve_funds
+        forward_sync_retrieve_funds_with_accept_func => forward_sync_retrieve_funds_with_accept_func
+        accept_funds_func => accept_funds_func
+        forward_sync_accept_funds_multi_transfer => forward_sync_accept_funds_multi_transfer
+        echo_args_async => echo_args_async
+        forward_async_accept_funds => forward_async_accept_funds
+        forward_async_accept_funds_half_payment => forward_async_accept_funds_half_payment
+        forward_async_accept_funds_with_fees => forward_async_accept_funds_with_fees
+        forward_async_retrieve_funds => forward_async_retrieve_funds
+        send_funds_twice => send_funds_twice
+        send_async_accept_multi_transfer => send_async_accept_multi_transfer
+        callback_data => callback_data
+        callback_data_at_index => callback_data_at_index
+        clear_callback_data => clear_callback_data
+        forward_transf_exec_accept_funds => forward_transf_exec_accept_funds
+        forward_transf_exec_accept_single_esdt => forward_transf_exec_accept_single_esdt
+        forward_transf_execu_accept_funds_with_fees => forward_transf_execu_accept_funds_with_fees
+        forward_transf_exec_accept_funds_twice => forward_transf_exec_accept_funds_twice
+        forward_transf_exec_accept_funds_return_values => forward_transf_exec_accept_funds_return_values
+        transf_exec_multi_accept_funds => transf_exec_multi_accept_funds
+        transf_exec_multi_accept_funds_v2 => transf_exec_multi_accept_funds_v2
+        forward_transf_exec_reject_funds_multi_transfer => forward_transf_exec_reject_funds_multi_transfer
+        transf_exec_multi_reject_funds => transf_exec_multi_reject_funds
+        changeOwnerAddress => change_owner
+        deploy_contract => deploy_contract
+        deploy_two_contracts => deploy_two_contracts
+        deploy_vault_from_source => deploy_vault_from_source
+        upgradeVault => upgrade_vault
+        upgrade_vault_from_source => upgrade_vault_from_source
+        getFungibleEsdtBalance => get_fungible_esdt_balance
+        getCurrentNftNonce => get_current_nft_nonce
+        send_esdt => send_esdt
+        send_esdt_with_fees => send_esdt_with_fees
+        send_esdt_twice => send_esdt_twice
+        send_esdt_direct_multi_transfer => send_esdt_direct_multi_transfer
+        issue_fungible_token => issue_fungible_token
+        local_mint => local_mint
+        local_burn => local_burn
+        get_esdt_local_roles => get_esdt_local_roles
+        get_esdt_token_data => get_esdt_token_data
+        is_esdt_frozen => is_esdt_frozen
+        is_esdt_paused => is_esdt_paused
+        is_esdt_limited_transfer => is_esdt_limited_transfer
+        validate_token_identifier => validate_token_identifier
+        sft_issue => sft_issue
+        get_nft_balance => get_nft_balance
+        buy_nft => buy_nft
+        nft_issue => nft_issue
+        nft_create => nft_create
+        nft_create_compact => nft_create_compact
+        nft_add_uris => nft_add_uris
+        nft_update_attributes => nft_update_attributes
+        nft_decode_complex_attributes => nft_decode_complex_attributes
+        nft_add_quantity => nft_add_quantity
+        nft_burn => nft_burn
+        transfer_nft_via_async_call => transfer_nft_via_async_call
+        transfer_nft_and_execute => transfer_nft_and_execute
+        create_and_send => create_and_send
+        setLocalRoles => set_local_roles
+        unsetLocalRoles => unset_local_roles
+        lastIssuedToken => last_issued_token
+        lastErrorMessage => last_error_message
+    )
+}
+
+multiversx_sc_wasm_adapter::async_callback! { forwarder_legacy }
diff --git a/contracts/feature-tests/composability/forwarder-raw/wasm-forwarder-raw-init-async-call/src/lib.rs b/contracts/feature-tests/composability/forwarder-raw/wasm-forwarder-raw-init-async-call/src/lib.rs
index c81e3182c8..cd1297b69f 100644
--- a/contracts/feature-tests/composability/forwarder-raw/wasm-forwarder-raw-init-async-call/src/lib.rs
+++ b/contracts/feature-tests/composability/forwarder-raw/wasm-forwarder-raw-init-async-call/src/lib.rs
@@ -8,7 +8,7 @@
 // Upgrade:                              1
 // Endpoints:                            0
 // Async Callback:                       1
-// Total number of exported functions:   2
+// Total number of exported functions:   3
 
 #![no_std]
 #![allow(internal_features)]
diff --git a/contracts/feature-tests/composability/proxy-test-second/wasm/src/lib.rs b/contracts/feature-tests/composability/proxy-test-second/wasm/src/lib.rs
index bf6cc294c2..d920e6b80c 100644
--- a/contracts/feature-tests/composability/proxy-test-second/wasm/src/lib.rs
+++ b/contracts/feature-tests/composability/proxy-test-second/wasm/src/lib.rs
@@ -8,7 +8,7 @@
 // Upgrade:                              1
 // Endpoints:                            3
 // Async Callback (empty):               1
-// Total number of exported functions:   5
+// Total number of exported functions:   6
 
 #![no_std]
 #![allow(internal_features)]
diff --git a/contracts/feature-tests/composability/vault/wasm-vault-upgrade/src/lib.rs b/contracts/feature-tests/composability/vault/wasm-vault-upgrade/src/lib.rs
index 772ffc92ba..1592f8eec6 100644
--- a/contracts/feature-tests/composability/vault/wasm-vault-upgrade/src/lib.rs
+++ b/contracts/feature-tests/composability/vault/wasm-vault-upgrade/src/lib.rs
@@ -7,7 +7,7 @@
 // Upgrade:                              1
 // Endpoints:                            0
 // Async Callback (empty):               1
-// Total number of exported functions:   1
+// Total number of exported functions:   2
 
 #![no_std]
 #![allow(internal_features)]
diff --git a/contracts/feature-tests/composability/vault/wasm/src/lib.rs b/contracts/feature-tests/composability/vault/wasm/src/lib.rs
index 0c5cd48e03..30a7fadf8b 100644
--- a/contracts/feature-tests/composability/vault/wasm/src/lib.rs
+++ b/contracts/feature-tests/composability/vault/wasm/src/lib.rs
@@ -8,7 +8,7 @@
 // Upgrade:                              1
 // Endpoints:                           15
 // Async Callback (empty):               1
-// Total number of exported functions:  17
+// Total number of exported functions:  18
 
 #![no_std]
 #![allow(internal_features)]
diff --git a/contracts/feature-tests/exchange-features/wasm/src/lib.rs b/contracts/feature-tests/exchange-features/wasm/src/lib.rs
index b0842b89d6..944349b256 100644
--- a/contracts/feature-tests/exchange-features/wasm/src/lib.rs
+++ b/contracts/feature-tests/exchange-features/wasm/src/lib.rs
@@ -5,7 +5,8 @@
 ////////////////////////////////////////////////////
 
 // Init:                                 1
-// Endpoints:                            3
+// Upgrade:                              1
+// Endpoints:                            2
 // Async Callback (empty):               1
 // Total number of exported functions:   5
 
diff --git a/contracts/feature-tests/scenario-tester/wasm/src/lib.rs b/contracts/feature-tests/scenario-tester/wasm/src/lib.rs
index e4a29325bf..ae1ba48ffd 100644
--- a/contracts/feature-tests/scenario-tester/wasm/src/lib.rs
+++ b/contracts/feature-tests/scenario-tester/wasm/src/lib.rs
@@ -8,7 +8,7 @@
 // Upgrade:                              1
 // Endpoints:                            2
 // Async Callback (empty):               1
-// Total number of exported functions:   4
+// Total number of exported functions:   5
 
 #![no_std]
 #![allow(internal_features)]
diff --git a/framework/meta/src/cmd/contract/sc_config/wasm_crate_gen.rs b/framework/meta/src/cmd/contract/sc_config/wasm_crate_gen.rs
index e4d0230490..4117cc24f8 100644
--- a/framework/meta/src/cmd/contract/sc_config/wasm_crate_gen.rs
+++ b/framework/meta/src/cmd/contract/sc_config/wasm_crate_gen.rs
@@ -18,6 +18,7 @@ const PREFIX_AUTO_GENERATED: &str =
 ";
 
 const NUM_INIT: usize = 1;
+const NUM_UPGRADE: usize = 1;
 const NUM_ASYNC_CB: usize = 1;
 
 const VER_1_71: &str = "1.71.0-nightly";
@@ -117,7 +118,8 @@ impl ContractVariant {
             total += NUM_INIT;
         }
         if !self.abi.upgrade_constructors.is_empty() {
-            write_stat_comment(wasm_lib_file, "Upgrade:", NUM_INIT);
+            write_stat_comment(wasm_lib_file, "Upgrade:", NUM_UPGRADE);
+            total += NUM_UPGRADE;
         }
 
         write_stat_comment(wasm_lib_file, "Endpoints:", self.abi.endpoints.len());

From e6449ff9fa5a3f8a2203d9be0a2e0dc8ebec3685 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 17 Apr 2024 09:48:29 +0300
Subject: [PATCH 0724/1254] gitignore tweak

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 7c530277be..8295450d89 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,7 @@
 # The root Cargo.lock is kept for dependabot.
 contracts/**/Cargo.lock
 !contracts/**/wasm*/Cargo.lock
+contracts/**/output*/
 data/**/Cargo.lock
 framework/**/Cargo.lock
 sdk/**/Cargo.lock

From 96e5f0bf47ae49f4369c7efaa013d8d62f26fd6d Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Wed, 17 Apr 2024 16:20:21 +0300
Subject: [PATCH 0725/1254] replace with new syntax

---
 .../tests/crowdfunding_esdt_blackbox_test.rs  | 180 +++++++-----------
 1 file changed, 74 insertions(+), 106 deletions(-)

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 b821b070fb..735c2f48f9 100644
--- a/contracts/examples/crowdfunding-esdt/tests/crowdfunding_esdt_blackbox_test.rs
+++ b/contracts/examples/crowdfunding-esdt/tests/crowdfunding_esdt_blackbox_test.rs
@@ -1,4 +1,4 @@
-use crowdfunding_esdt::{crowdfunding_esdt_proxy, ProxyTrait as _, Status};
+use crowdfunding_esdt::crowdfunding_esdt_proxy;
 
 use multiversx_sc_scenario::imports::*;
 use num_bigint::BigUint;
@@ -6,43 +6,33 @@ use num_bigint::BigUint;
 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_PATH_EXPR: &str = "mxsc:output/crowdfunding-esdt.mxsc.json";
-const FIRST_USER_ADDRESS_EXPR: &str = "address:first-user";
 const FIRST_USER_ADDRESS_EXPR_REPL: AddressExpr = AddressExpr("first-user");
-const OWNER_ADDRESS_EXPR: &str = "address:owner";
 const OWNER_ADDRESS_EXPR_REPL: AddressExpr = AddressExpr("owner");
-const SECOND_USER_ADDRESS_EXPR: &str = "address:second-user";
 const SECOND_USER_ADDRESS_EXPR_REPL: AddressExpr = AddressExpr("second-user");
 const CODE_EXPR: MxscExpr = MxscExpr("output/crowdfunding-esdt.mxsc.json");
 const SC_CROWDFUNDING_ESDT_EXPR: ScExpr = ScExpr("crowdfunding-esdt");
 
-type CrowdfundingESDTContract = ContractInfo<crowdfunding_esdt::Proxy<StaticApi>>;
-
 fn world() -> ScenarioWorld {
+    let contract_path: &str = "mxsc:output/crowdfunding-esdt.mxsc.json";
+
     let mut blockchain = ScenarioWorld::new();
     blockchain.set_current_dir_from_workspace("contracts/examples/crowdfunding-esdt");
 
-    blockchain.register_contract(
-        CROWDFUNDING_ESDT_PATH_EXPR,
-        crowdfunding_esdt::ContractBuilder,
-    );
+    blockchain.register_contract(contract_path, crowdfunding_esdt::ContractBuilder);
     blockchain
 }
 
 struct CrowdfundingESDTTestState {
     world: ScenarioWorld,
-    crowdfunding_esdt_contract: CrowdfundingESDTContract,
-    first_user_address: Address,
-    second_user_address: Address,
 }
 
 impl CrowdfundingESDTTestState {
     fn new() -> Self {
         let mut world = world();
-        // let owner_address = "address:owner";
+        let owner_address: &str = "address:owner";
 
         world
-            .account(OWNER_ADDRESS_EXPR)
+            .account(owner_address)
             .nonce(1)
             .account(FIRST_USER_ADDRESS_EXPR_REPL)
             .nonce(1)
@@ -53,24 +43,12 @@ impl CrowdfundingESDTTestState {
             .esdt_balance(CF_TOKEN_ID_EXPR, "1000");
 
         world.set_state_step(SetStateStep::new().new_address(
-            OWNER_ADDRESS_EXPR,
+            owner_address,
             1,
             SC_CROWDFUNDING_ESDT_EXPR.eval_to_expr().as_str(),
         ));
 
-        let crowdfunding_esdt_contract = CrowdfundingESDTContract::new(SC_CROWDFUNDING_ESDT_EXPR);
-
-        let first_user_address =
-            AddressValue::from(FIRST_USER_ADDRESS_EXPR_REPL.eval_to_expr().as_str()).to_address();
-        let second_user_address =
-            AddressValue::from(SECOND_USER_ADDRESS_EXPR_REPL.eval_to_expr().as_str()).to_address();
-
-        Self {
-            world,
-            crowdfunding_esdt_contract,
-            first_user_address,
-            second_user_address,
-        }
+        Self { world }
     }
 
     fn deploy(&mut self) {
@@ -102,53 +80,51 @@ impl CrowdfundingESDTTestState {
             .run();
     }
 
-    fn check_deposit(&mut self, donor: Address, amount: u64) {
-        let value = world()
+    fn check_deposit(&mut self, donor: AddressExpr, amount: u64) {
+        let value = self
+            .world
             .query()
             .to(SC_CROWDFUNDING_ESDT_EXPR)
             .typed(crowdfunding_esdt_proxy::CrowdfundingProxy)
-            .deposit(&donor)
+            .deposit(donor.eval_to_array())
             .returns(ReturnsResultConv::<BigUint>::new())
             .run();
 
         assert_eq!(value, amount.into());
     }
 
-    fn check_status(&mut self, expected_value: Status) -> &mut Self {
-        self.world.sc_query(
-            ScQueryStep::new()
-                .call(self.crowdfunding_esdt_contract.status())
-                .expect_value(expected_value),
-        );
+    fn check_status(&mut self, expected_value: crowdfunding_esdt_proxy::Status) {
+        let status = self
+            .world
+            .query()
+            .to(SC_CROWDFUNDING_ESDT_EXPR)
+            .typed(crowdfunding_esdt_proxy::CrowdfundingProxy)
+            .status()
+            .returns(ReturnsResult)
+            .run();
 
-        self
+        assert_eq!(status, expected_value);
     }
 
-    fn claim(&mut self, address: &str) -> &mut Self {
-        self.world.sc_call(
-            ScCallStep::new()
-                .from(address)
-                .call(self.crowdfunding_esdt_contract.claim()),
-        );
-
-        self
+    fn claim(&mut self, address: AddressExpr) {
+        self.world
+            .tx()
+            .from(address)
+            .to(SC_CROWDFUNDING_ESDT_EXPR)
+            .typed(crowdfunding_esdt_proxy::CrowdfundingProxy)
+            .claim()
+            .run();
     }
 
-    fn check_esdt_balance(&mut self, address_expr: &str, balance_expr: &str) -> &mut Self {
+    fn check_esdt_balance(&mut self, address: AddressExpr, balance_expr: &str) {
         self.world
-            .check_state_step(CheckStateStep::new().put_account(
-                address_expr,
-                CheckAccount::new().esdt_balance(CF_TOKEN_ID_EXPR, balance_expr),
-            ));
-
-        self
+            .check_state_account(address)
+            .esdt_balance(CF_TOKEN_ID_EXPR, balance_expr);
     }
 
-    fn set_block_timestamp(&mut self, block_timestamp_expr: u64) -> &mut Self {
+    fn set_block_timestamp(&mut self, block_timestamp_expr: u64) {
         self.world
             .set_state_step(SetStateStep::new().block_timestamp(block_timestamp_expr));
-
-        self
     }
 }
 
@@ -158,7 +134,7 @@ fn test_fund() {
     state.deploy();
 
     state.fund(FIRST_USER_ADDRESS_EXPR_REPL, 1_000u64);
-    state.check_deposit(state.first_user_address.clone(), 1_000u64);
+    state.check_deposit(FIRST_USER_ADDRESS_EXPR_REPL, 1_000u64);
 }
 
 #[test]
@@ -166,7 +142,7 @@ fn test_status() {
     let mut state = CrowdfundingESDTTestState::new();
     state.deploy();
 
-    state.check_status(Status::FundingPeriod);
+    state.check_status(crowdfunding_esdt_proxy::Status::FundingPeriod);
 }
 
 #[test]
@@ -174,22 +150,18 @@ fn test_sc_error() {
     let mut state = CrowdfundingESDTTestState::new();
     state.deploy();
 
-    state.world.sc_call(
-        ScCallStep::new()
-            .from(FIRST_USER_ADDRESS_EXPR)
-            .egld_value("1_000")
-            .call(state.crowdfunding_esdt_contract.fund())
-            .expect(TxExpect::user_error("str:wrong token")),
-    );
-    state.world.sc_query(
-        ScQueryStep::new()
-            .call(
-                state
-                    .crowdfunding_esdt_contract
-                    .deposit(&state.first_user_address),
-            )
-            .expect(TxExpect::ok().result("0x")),
-    );
+    state
+        .world
+        .tx()
+        .from(FIRST_USER_ADDRESS_EXPR_REPL)
+        .to(SC_CROWDFUNDING_ESDT_EXPR)
+        .typed(crowdfunding_esdt_proxy::CrowdfundingProxy)
+        .fund()
+        .egld(1000)
+        .with_result(ExpectError(4, "wrong token"))
+        .run();
+
+    state.check_deposit(FIRST_USER_ADDRESS_EXPR_REPL, 0);
 }
 
 #[test]
@@ -198,37 +170,35 @@ fn test_successful_cf() {
     state.deploy();
 
     // first user fund
-    state.fund(FIRST_USER_ADDRESS_EXPR_REPL, 1_000u64); //.eval_to_expr().as_str(), "1000");
-                                                        // state.check_deposit(state.first_user_address.clone(), 1_000);
-                                                        // state.check_deposit(FIRST_USER_ADDRESS_EXPR_REPL, 1_000);
+    state.fund(FIRST_USER_ADDRESS_EXPR_REPL, 1_000u64);
+    state.check_deposit(FIRST_USER_ADDRESS_EXPR_REPL, 1_000);
 
     // second user fund
     state.fund(SECOND_USER_ADDRESS_EXPR_REPL, 1000);
-    // state.check_deposit(SECOND_USER_ADDRESS_EXPR_REPL, 1_000);
-    // state.check_deposit(state.second_user_address.clone(), 1_000);
+    state.check_deposit(SECOND_USER_ADDRESS_EXPR_REPL, 1_000);
 
     // set block timestamp after deadline
     state.set_block_timestamp(CF_DEADLINE + 1);
 
     // check status successful
-    state.check_status(Status::Successful);
-
-    // user try claim
-    state.world.sc_call(
-        ScCallStep::new()
-            .from(FIRST_USER_ADDRESS_EXPR)
-            .call(state.crowdfunding_esdt_contract.claim())
-            .expect(TxExpect::user_error(
-                "str:only owner can claim successful funding",
-            )),
-    );
+    state.check_status(crowdfunding_esdt_proxy::Status::Successful);
+
+    state
+        .world
+        .tx()
+        .from(FIRST_USER_ADDRESS_EXPR_REPL)
+        .to(SC_CROWDFUNDING_ESDT_EXPR)
+        .typed(crowdfunding_esdt_proxy::CrowdfundingProxy)
+        .claim()
+        .with_result(ExpectError(4, "only owner can claim successful funding"))
+        .run();
 
     // owner claim
-    state.claim(OWNER_ADDRESS_EXPR);
+    state.claim(OWNER_ADDRESS_EXPR_REPL);
 
-    state.check_esdt_balance(OWNER_ADDRESS_EXPR, "2_000");
-    state.check_esdt_balance(FIRST_USER_ADDRESS_EXPR, "0");
-    state.check_esdt_balance(SECOND_USER_ADDRESS_EXPR, "0");
+    state.check_esdt_balance(OWNER_ADDRESS_EXPR_REPL, "2_000");
+    state.check_esdt_balance(FIRST_USER_ADDRESS_EXPR_REPL, "0");
+    state.check_esdt_balance(SECOND_USER_ADDRESS_EXPR_REPL, "0");
 }
 
 #[test]
@@ -241,30 +211,28 @@ fn test_failed_cf() {
         FIRST_USER_ADDRESS_EXPR_REPL, //.eval_to_expr().as_str()
         300,
     );
-    // state.check_deposit(FIRST_USER_ADDRESS_EXPR_REPL, 300u64);
-    // state.check_deposit(state.first_user_address.clone(), 300u64);
+    state.check_deposit(FIRST_USER_ADDRESS_EXPR_REPL, 300u64);
 
     // second user fund
     state.fund(
         SECOND_USER_ADDRESS_EXPR_REPL, //.eval_to_expr().as_str()
         600,
     );
-    // state.check_deposit(SECOND_USER_ADDRESS_EXPR_REPL, 600u64);
-    // state.check_deposit(state.second_user_address.clone(), 600u64);
+    state.check_deposit(SECOND_USER_ADDRESS_EXPR_REPL, 600u64);
 
     // set block timestamp after deadline
     state.set_block_timestamp(CF_DEADLINE + 1);
 
     // check status failed
-    state.check_status(Status::Failed);
+    state.check_status(crowdfunding_esdt_proxy::Status::Failed);
 
     // first user claim
-    state.claim(FIRST_USER_ADDRESS_EXPR);
+    state.claim(FIRST_USER_ADDRESS_EXPR_REPL);
 
     // second user claim
-    state.claim(SECOND_USER_ADDRESS_EXPR);
+    state.claim(SECOND_USER_ADDRESS_EXPR_REPL);
 
-    state.check_esdt_balance(OWNER_ADDRESS_EXPR, "0");
-    state.check_esdt_balance(FIRST_USER_ADDRESS_EXPR, "1_000");
-    state.check_esdt_balance(SECOND_USER_ADDRESS_EXPR, "1_000");
+    state.check_esdt_balance(OWNER_ADDRESS_EXPR_REPL, "0");
+    state.check_esdt_balance(FIRST_USER_ADDRESS_EXPR_REPL, "1_000");
+    state.check_esdt_balance(SECOND_USER_ADDRESS_EXPR_REPL, "1_000");
 }

From f0bf082830b02a3455c66d1bb9715559fa263373 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Wed, 17 Apr 2024 16:44:26 +0300
Subject: [PATCH 0726/1254] reaname const

---
 .../tests/crowdfunding_esdt_blackbox_test.rs  | 56 +++++++++----------
 1 file changed, 28 insertions(+), 28 deletions(-)

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 735c2f48f9..cc4235704c 100644
--- a/contracts/examples/crowdfunding-esdt/tests/crowdfunding_esdt_blackbox_test.rs
+++ b/contracts/examples/crowdfunding-esdt/tests/crowdfunding_esdt_blackbox_test.rs
@@ -6,9 +6,9 @@ use num_bigint::BigUint;
 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 FIRST_USER_ADDRESS_EXPR_REPL: AddressExpr = AddressExpr("first-user");
-const OWNER_ADDRESS_EXPR_REPL: AddressExpr = AddressExpr("owner");
-const SECOND_USER_ADDRESS_EXPR_REPL: AddressExpr = AddressExpr("second-user");
+const FIRST_USER_ADDRESS: AddressExpr = AddressExpr("first-user");
+const OWNER_ADDRESS: AddressExpr = AddressExpr("owner");
+const SECOND_USER_ADDRESS: AddressExpr = AddressExpr("second-user");
 const CODE_EXPR: MxscExpr = MxscExpr("output/crowdfunding-esdt.mxsc.json");
 const SC_CROWDFUNDING_ESDT_EXPR: ScExpr = ScExpr("crowdfunding-esdt");
 
@@ -34,11 +34,11 @@ impl CrowdfundingESDTTestState {
         world
             .account(owner_address)
             .nonce(1)
-            .account(FIRST_USER_ADDRESS_EXPR_REPL)
+            .account(FIRST_USER_ADDRESS)
             .nonce(1)
             .balance("1000")
             .esdt_balance(CF_TOKEN_ID_EXPR, "1000")
-            .account(SECOND_USER_ADDRESS_EXPR_REPL)
+            .account(SECOND_USER_ADDRESS)
             .nonce(1)
             .esdt_balance(CF_TOKEN_ID_EXPR, "1000");
 
@@ -54,7 +54,7 @@ impl CrowdfundingESDTTestState {
     fn deploy(&mut self) {
         self.world
             .tx()
-            .from(OWNER_ADDRESS_EXPR_REPL)
+            .from(OWNER_ADDRESS)
             .typed(crowdfunding_esdt_proxy::CrowdfundingProxy)
             .init(
                 2_000u32,
@@ -133,8 +133,8 @@ fn test_fund() {
     let mut state = CrowdfundingESDTTestState::new();
     state.deploy();
 
-    state.fund(FIRST_USER_ADDRESS_EXPR_REPL, 1_000u64);
-    state.check_deposit(FIRST_USER_ADDRESS_EXPR_REPL, 1_000u64);
+    state.fund(FIRST_USER_ADDRESS, 1_000u64);
+    state.check_deposit(FIRST_USER_ADDRESS, 1_000u64);
 }
 
 #[test]
@@ -153,7 +153,7 @@ fn test_sc_error() {
     state
         .world
         .tx()
-        .from(FIRST_USER_ADDRESS_EXPR_REPL)
+        .from(FIRST_USER_ADDRESS)
         .to(SC_CROWDFUNDING_ESDT_EXPR)
         .typed(crowdfunding_esdt_proxy::CrowdfundingProxy)
         .fund()
@@ -161,7 +161,7 @@ fn test_sc_error() {
         .with_result(ExpectError(4, "wrong token"))
         .run();
 
-    state.check_deposit(FIRST_USER_ADDRESS_EXPR_REPL, 0);
+    state.check_deposit(FIRST_USER_ADDRESS, 0);
 }
 
 #[test]
@@ -170,12 +170,12 @@ fn test_successful_cf() {
     state.deploy();
 
     // first user fund
-    state.fund(FIRST_USER_ADDRESS_EXPR_REPL, 1_000u64);
-    state.check_deposit(FIRST_USER_ADDRESS_EXPR_REPL, 1_000);
+    state.fund(FIRST_USER_ADDRESS, 1_000u64);
+    state.check_deposit(FIRST_USER_ADDRESS, 1_000);
 
     // second user fund
-    state.fund(SECOND_USER_ADDRESS_EXPR_REPL, 1000);
-    state.check_deposit(SECOND_USER_ADDRESS_EXPR_REPL, 1_000);
+    state.fund(SECOND_USER_ADDRESS, 1000);
+    state.check_deposit(SECOND_USER_ADDRESS, 1_000);
 
     // set block timestamp after deadline
     state.set_block_timestamp(CF_DEADLINE + 1);
@@ -186,7 +186,7 @@ fn test_successful_cf() {
     state
         .world
         .tx()
-        .from(FIRST_USER_ADDRESS_EXPR_REPL)
+        .from(FIRST_USER_ADDRESS)
         .to(SC_CROWDFUNDING_ESDT_EXPR)
         .typed(crowdfunding_esdt_proxy::CrowdfundingProxy)
         .claim()
@@ -194,11 +194,11 @@ fn test_successful_cf() {
         .run();
 
     // owner claim
-    state.claim(OWNER_ADDRESS_EXPR_REPL);
+    state.claim(OWNER_ADDRESS);
 
-    state.check_esdt_balance(OWNER_ADDRESS_EXPR_REPL, "2_000");
-    state.check_esdt_balance(FIRST_USER_ADDRESS_EXPR_REPL, "0");
-    state.check_esdt_balance(SECOND_USER_ADDRESS_EXPR_REPL, "0");
+    state.check_esdt_balance(OWNER_ADDRESS, "2_000");
+    state.check_esdt_balance(FIRST_USER_ADDRESS, "0");
+    state.check_esdt_balance(SECOND_USER_ADDRESS, "0");
 }
 
 #[test]
@@ -208,17 +208,17 @@ fn test_failed_cf() {
 
     // first user fund
     state.fund(
-        FIRST_USER_ADDRESS_EXPR_REPL, //.eval_to_expr().as_str()
+        FIRST_USER_ADDRESS, //.eval_to_expr().as_str()
         300,
     );
-    state.check_deposit(FIRST_USER_ADDRESS_EXPR_REPL, 300u64);
+    state.check_deposit(FIRST_USER_ADDRESS, 300u64);
 
     // second user fund
     state.fund(
-        SECOND_USER_ADDRESS_EXPR_REPL, //.eval_to_expr().as_str()
+        SECOND_USER_ADDRESS, //.eval_to_expr().as_str()
         600,
     );
-    state.check_deposit(SECOND_USER_ADDRESS_EXPR_REPL, 600u64);
+    state.check_deposit(SECOND_USER_ADDRESS, 600u64);
 
     // set block timestamp after deadline
     state.set_block_timestamp(CF_DEADLINE + 1);
@@ -227,12 +227,12 @@ fn test_failed_cf() {
     state.check_status(crowdfunding_esdt_proxy::Status::Failed);
 
     // first user claim
-    state.claim(FIRST_USER_ADDRESS_EXPR_REPL);
+    state.claim(FIRST_USER_ADDRESS);
 
     // second user claim
-    state.claim(SECOND_USER_ADDRESS_EXPR_REPL);
+    state.claim(SECOND_USER_ADDRESS);
 
-    state.check_esdt_balance(OWNER_ADDRESS_EXPR_REPL, "0");
-    state.check_esdt_balance(FIRST_USER_ADDRESS_EXPR_REPL, "1_000");
-    state.check_esdt_balance(SECOND_USER_ADDRESS_EXPR_REPL, "1_000");
+    state.check_esdt_balance(OWNER_ADDRESS, "0");
+    state.check_esdt_balance(FIRST_USER_ADDRESS, "1_000");
+    state.check_esdt_balance(SECOND_USER_ADDRESS, "1_000");
 }

From 0330c4ff7ce73772a134dec81b2f8c647c95db47 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 17 Apr 2024 17:34:05 +0300
Subject: [PATCH 0727/1254] unified syntax - expect value

---
 .../adder/tests/adder_blackbox_test.rs        | 33 ++++++++-------
 .../src/types/interaction/expr/sc_expr.rs     | 16 ++++++--
 .../src/facade/expr/bech32_address.rs         |  4 ++
 .../scenario/src/facade/result_handlers.rs    |  2 +
 .../facade/result_handlers/expect_value.rs    | 40 +++++++++++++++++++
 .../src/scenario/model/value/address_value.rs | 20 +++++++++-
 6 files changed, 94 insertions(+), 21 deletions(-)
 create mode 100644 framework/scenario/src/facade/result_handlers/expect_value.rs

diff --git a/contracts/examples/adder/tests/adder_blackbox_test.rs b/contracts/examples/adder/tests/adder_blackbox_test.rs
index e52c8c3ddb..1dafca181a 100644
--- a/contracts/examples/adder/tests/adder_blackbox_test.rs
+++ b/contracts/examples/adder/tests/adder_blackbox_test.rs
@@ -1,5 +1,4 @@
 use multiversx_sc_scenario::imports::*;
-use num_bigint::BigUint;
 
 use adder::*;
 
@@ -20,16 +19,12 @@ fn world() -> ScenarioWorld {
 #[test]
 fn adder_blackbox() {
     let mut world = world();
-    let owner_address = "address:owner";
-    let adder_contract = ContractInfo::<adder::Proxy<StaticApi>>::new("sc:adder");
 
     world.start_trace();
 
-    world.set_state_step(
-        SetStateStep::new()
-            .put_account(owner_address, Account::new().nonce(1))
-            .new_address(owner_address, 1, "sc:adder"),
-    );
+    world.account(OWNER).nonce(1);
+
+    world.set_state_step(SetStateStep::new().new_address(OWNER, 1, SC_ADDER));
 
     let new_address = world
         .tx()
@@ -40,16 +35,15 @@ fn adder_blackbox() {
         .returns(ReturnsNewAddress)
         .run();
 
-    assert_eq!(new_address, adder_contract.to_address());
+    assert_eq!(new_address, SC_ADDER.to_address());
 
-    let value = world
+    world
         .query()
         .to(SC_ADDER)
         .typed(adder_proxy::AdderProxy)
         .sum()
-        .returns(ReturnsResultConv::<BigUint>::new())
+        .returns(ExpectValue(5u32))
         .run();
-    assert_eq!(value, BigUint::from(5u32));
 
     world
         .tx()
@@ -59,13 +53,18 @@ fn adder_blackbox() {
         .add(1u32)
         .run();
 
+    world
+        .query()
+        .to(SC_ADDER)
+        .typed(adder_proxy::AdderProxy)
+        .sum()
+        .returns(ExpectValue(6u32))
+        .run();
+
     world.check_state_step(
         CheckStateStep::new()
-            .put_account(owner_address, CheckAccount::new())
-            .put_account(
-                &adder_contract,
-                CheckAccount::new().check_storage("str:sum", "6"),
-            ),
+            .put_account(OWNER, CheckAccount::new())
+            .put_account(SC_ADDER, CheckAccount::new().check_storage("str:sum", "6")),
     );
 
     world.write_scenario_trace("trace1.scen.json");
diff --git a/framework/base/src/types/interaction/expr/sc_expr.rs b/framework/base/src/types/interaction/expr/sc_expr.rs
index c84f8df02f..f51ca88051 100644
--- a/framework/base/src/types/interaction/expr/sc_expr.rs
+++ b/framework/base/src/types/interaction/expr/sc_expr.rs
@@ -1,8 +1,11 @@
 use core::ptr;
 
-use crate::types::{
-    AnnotatedValue, ManagedAddress, ManagedBuffer, TxEnv, TxFrom, TxFromSpecified, TxTo,
-    TxToSpecified,
+use crate::{
+    proxy_imports::Address,
+    types::{
+        AnnotatedValue, ManagedAddress, ManagedBuffer, TxEnv, TxFrom, TxFromSpecified, TxTo,
+        TxToSpecified,
+    },
 };
 
 const SC_PREFIX: &str = "sc:";
@@ -28,6 +31,13 @@ where
     }
 }
 
+impl<'a> ScExpr<'a> {
+    pub fn to_address(&self) -> Address {
+        let expr: [u8; 32] = self.eval_to_array();
+        expr.into()
+    }
+}
+
 impl<'a, Env> TxFrom<Env> for ScExpr<'a>
 where
     Env: TxEnv,
diff --git a/framework/scenario/src/facade/expr/bech32_address.rs b/framework/scenario/src/facade/expr/bech32_address.rs
index 9b7291ad16..abc9d00cff 100644
--- a/framework/scenario/src/facade/expr/bech32_address.rs
+++ b/framework/scenario/src/facade/expr/bech32_address.rs
@@ -56,6 +56,10 @@ impl Bech32Address {
         self.bech32.to_owned()
     }
 
+    pub fn to_hex(&self) -> String {
+        hex::encode(&self.address)
+    }
+
     pub fn as_address(&self) -> &Address {
         &self.address
     }
diff --git a/framework/scenario/src/facade/result_handlers.rs b/framework/scenario/src/facade/result_handlers.rs
index 24709626ea..1893647b45 100644
--- a/framework/scenario/src/facade/result_handlers.rs
+++ b/framework/scenario/src/facade/result_handlers.rs
@@ -1,6 +1,7 @@
 mod expect_error;
 mod expect_message;
 mod expect_status;
+mod expect_value;
 mod returns_message;
 mod returns_new_bech32_address;
 mod returns_new_token_identifier;
@@ -10,6 +11,7 @@ mod with_tx_raw_response;
 pub use expect_error::ExpectError;
 pub use expect_message::ExpectMessage;
 pub use expect_status::ExpectStatus;
+pub use expect_value::ExpectValue;
 pub use returns_message::ReturnsMessage;
 pub use returns_new_bech32_address::ReturnsNewBech32Address;
 pub use returns_new_token_identifier::ReturnsNewTokenIdentifier;
diff --git a/framework/scenario/src/facade/result_handlers/expect_value.rs b/framework/scenario/src/facade/result_handlers/expect_value.rs
new file mode 100644
index 0000000000..05ebe0f79f
--- /dev/null
+++ b/framework/scenario/src/facade/result_handlers/expect_value.rs
@@ -0,0 +1,40 @@
+use multiversx_sc::{
+    codec::{CodecFrom, TopEncodeMulti},
+    types::{RHListItem, RHListItemExec, TxEnv},
+};
+
+use crate::scenario_model::{BytesValue, CheckValue, TxExpect, TxResponse};
+
+/// Verifies that transaction result matches the given value.
+///
+/// Can only be used in tests and interactors, not available in contracts.
+pub struct ExpectValue<T>(pub T);
+
+impl<Env, Original, T> RHListItem<Env, Original> for ExpectValue<T>
+where
+    Env: TxEnv,
+    T: TopEncodeMulti,
+    Original: CodecFrom<T>,
+{
+    type Returns = ();
+}
+
+impl<Env, Original, T> RHListItemExec<TxResponse, Env, Original> for ExpectValue<T>
+where
+    Env: TxEnv<RHExpect = TxExpect>,
+    T: TopEncodeMulti,
+    Original: CodecFrom<T>,
+{
+    fn item_tx_expect(&self, mut prev: TxExpect) -> TxExpect {
+        let mut encoded = Vec::<Vec<u8>>::new();
+        self.0.multi_encode(&mut encoded).expect("encoding error");
+        let out_values = encoded
+            .into_iter()
+            .map(|value| CheckValue::Equal(BytesValue::from(value)))
+            .collect();
+        prev.out = CheckValue::Equal(out_values);
+        prev
+    }
+
+    fn item_process_result(self, _: &TxResponse) -> Self::Returns {}
+}
diff --git a/framework/scenario/src/scenario/model/value/address_value.rs b/framework/scenario/src/scenario/model/value/address_value.rs
index 640451a63c..1315a4fbd5 100644
--- a/framework/scenario/src/scenario/model/value/address_value.rs
+++ b/framework/scenario/src/scenario/model/value/address_value.rs
@@ -1,6 +1,6 @@
 use std::fmt;
 
-use crate::multiversx_sc::types::Address;
+use crate::multiversx_sc::types::{Address, AddressExpr, ScExpr};
 
 use crate::{
     facade::expr::Bech32Address,
@@ -133,3 +133,21 @@ impl From<&str> for AddressValue {
         AddressValue::interpret_from(from, &InterpreterContext::default())
     }
 }
+
+impl From<AddressExpr> for AddressValue {
+    fn from(from: AddressExpr) -> Self {
+        AddressValue {
+            value: from.eval_to_array().into(),
+            original: ValueSubTree::Str(from.eval_to_expr()),
+        }
+    }
+}
+
+impl From<ScExpr<'_>> for AddressValue {
+    fn from(from: ScExpr) -> Self {
+        AddressValue {
+            value: from.eval_to_array().into(),
+            original: ValueSubTree::Str(from.eval_to_expr()),
+        }
+    }
+}

From b4145b07015bcbd65bf3734bcf611f82eadc65f1 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 17 Apr 2024 18:01:26 +0300
Subject: [PATCH 0728/1254] build fix

---
 framework/base/src/types/interaction/expr/sc_expr.rs | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/framework/base/src/types/interaction/expr/sc_expr.rs b/framework/base/src/types/interaction/expr/sc_expr.rs
index f51ca88051..aa57b1af30 100644
--- a/framework/base/src/types/interaction/expr/sc_expr.rs
+++ b/framework/base/src/types/interaction/expr/sc_expr.rs
@@ -1,11 +1,8 @@
 use core::ptr;
 
-use crate::{
-    proxy_imports::Address,
-    types::{
-        AnnotatedValue, ManagedAddress, ManagedBuffer, TxEnv, TxFrom, TxFromSpecified, TxTo,
-        TxToSpecified,
-    },
+use crate::types::{
+    heap::Address, AnnotatedValue, ManagedAddress, ManagedBuffer, TxEnv, TxFrom, TxFromSpecified,
+    TxTo, TxToSpecified,
 };
 
 const SC_PREFIX: &str = "sc:";

From 43edef0cb8a36f1d59d408b155b5c9f666c70bb5 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 17 Apr 2024 17:44:12 +0300
Subject: [PATCH 0729/1254] scenario tx file rename

---
 framework/scenario/src/facade/world_tx.rs          | 14 +++++++-------
 ...{scenario_env_exec.rs => scenario_exec_call.rs} |  0
 ...nario_env_deploy.rs => scenario_exec_deploy.rs} |  0
 ...cenario_env_query.rs => scenario_query_call.rs} |  0
 .../{scenario_env.rs => scenario_tx_env.rs}        |  0
 5 files changed, 7 insertions(+), 7 deletions(-)
 rename framework/scenario/src/facade/world_tx/{scenario_env_exec.rs => scenario_exec_call.rs} (100%)
 rename framework/scenario/src/facade/world_tx/{scenario_env_deploy.rs => scenario_exec_deploy.rs} (100%)
 rename framework/scenario/src/facade/world_tx/{scenario_env_query.rs => scenario_query_call.rs} (100%)
 rename framework/scenario/src/facade/world_tx/{scenario_env.rs => scenario_tx_env.rs} (100%)

diff --git a/framework/scenario/src/facade/world_tx.rs b/framework/scenario/src/facade/world_tx.rs
index 2fa69c744e..005421c933 100644
--- a/framework/scenario/src/facade/world_tx.rs
+++ b/framework/scenario/src/facade/world_tx.rs
@@ -1,11 +1,11 @@
 #![allow(unused)] // TEMP
 
-mod scenario_env;
-mod scenario_env_deploy;
-mod scenario_env_exec;
-mod scenario_env_query;
+mod scenario_exec_call;
+mod scenario_exec_deploy;
+mod scenario_query_call;
 mod scenario_rh_impl;
+mod scenario_tx_env;
 
-pub use scenario_env::{ScenarioTxEnv, ScenarioTxEnvData, ScenarioTxRun};
-pub use scenario_env_exec::ScenarioEnvExec;
-pub use scenario_env_query::ScenarioEnvQuery;
+pub use scenario_exec_call::ScenarioEnvExec;
+pub use scenario_query_call::ScenarioEnvQuery;
+pub use scenario_tx_env::{ScenarioTxEnv, ScenarioTxEnvData, ScenarioTxRun};
diff --git a/framework/scenario/src/facade/world_tx/scenario_env_exec.rs b/framework/scenario/src/facade/world_tx/scenario_exec_call.rs
similarity index 100%
rename from framework/scenario/src/facade/world_tx/scenario_env_exec.rs
rename to framework/scenario/src/facade/world_tx/scenario_exec_call.rs
diff --git a/framework/scenario/src/facade/world_tx/scenario_env_deploy.rs b/framework/scenario/src/facade/world_tx/scenario_exec_deploy.rs
similarity index 100%
rename from framework/scenario/src/facade/world_tx/scenario_env_deploy.rs
rename to framework/scenario/src/facade/world_tx/scenario_exec_deploy.rs
diff --git a/framework/scenario/src/facade/world_tx/scenario_env_query.rs b/framework/scenario/src/facade/world_tx/scenario_query_call.rs
similarity index 100%
rename from framework/scenario/src/facade/world_tx/scenario_env_query.rs
rename to framework/scenario/src/facade/world_tx/scenario_query_call.rs
diff --git a/framework/scenario/src/facade/world_tx/scenario_env.rs b/framework/scenario/src/facade/world_tx/scenario_tx_env.rs
similarity index 100%
rename from framework/scenario/src/facade/world_tx/scenario_env.rs
rename to framework/scenario/src/facade/world_tx/scenario_tx_env.rs

From 02556f8a8b2b216ac3adfcb751690ac4d1587f72 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 17 Apr 2024 18:12:43 +0300
Subject: [PATCH 0730/1254] scenario exec - rename, reorg, cleanup

---
 framework/scenario/src/facade/world_tx.rs     |   4 +-
 .../facade/world_tx/scenario_check_state.rs   | 227 ++++++++++++++++
 .../src/facade/world_tx/scenario_exec_call.rs | 243 +-----------------
 .../facade/world_tx/scenario_exec_deploy.rs   |  14 +-
 .../facade/world_tx/scenario_query_call.rs    | 231 +----------------
 .../src/facade/world_tx/scenario_rh_impl.rs   |  12 +-
 .../src/facade/world_tx/scenario_set_state.rs | 239 +++++++++++++++++
 .../src/facade/world_tx/scenario_tx_env.rs    |   8 +-
 8 files changed, 485 insertions(+), 493 deletions(-)
 create mode 100644 framework/scenario/src/facade/world_tx/scenario_check_state.rs
 create mode 100644 framework/scenario/src/facade/world_tx/scenario_set_state.rs

diff --git a/framework/scenario/src/facade/world_tx.rs b/framework/scenario/src/facade/world_tx.rs
index 005421c933..a2d7373a42 100644
--- a/framework/scenario/src/facade/world_tx.rs
+++ b/framework/scenario/src/facade/world_tx.rs
@@ -1,9 +1,9 @@
-#![allow(unused)] // TEMP
-
+mod scenario_check_state;
 mod scenario_exec_call;
 mod scenario_exec_deploy;
 mod scenario_query_call;
 mod scenario_rh_impl;
+mod scenario_set_state;
 mod scenario_tx_env;
 
 pub use scenario_exec_call::ScenarioEnvExec;
diff --git a/framework/scenario/src/facade/world_tx/scenario_check_state.rs b/framework/scenario/src/facade/world_tx/scenario_check_state.rs
new file mode 100644
index 0000000000..ab54d7411f
--- /dev/null
+++ b/framework/scenario/src/facade/world_tx/scenario_check_state.rs
@@ -0,0 +1,227 @@
+use std::collections::{btree_map::Entry, BTreeMap};
+
+use multiversx_chain_scenario_format::interpret_trait::{InterpretableFrom, InterpreterContext};
+use multiversx_sc::{codec::test_util::top_encode_to_vec_u8_or_panic, proxy_imports::TopEncode};
+
+use crate::{
+    scenario::ScenarioRunner,
+    scenario_model::{
+        AddressKey, BigUintValue, BytesKey, BytesValue, CheckAccount, CheckEsdt, CheckEsdtData,
+        CheckEsdtInstances, CheckEsdtMap, CheckEsdtMapContents, CheckStateStep, CheckStorage,
+        CheckStorageDetails, CheckValue, U64Value,
+    },
+    ScenarioWorld,
+};
+
+impl ScenarioWorld {
+    pub fn check_state_account<A>(&mut self, address: A) -> CheckStateBuilder<'_>
+    where
+        AddressKey: From<A>,
+    {
+        CheckStateBuilder::new(self, address.into())
+    }
+}
+
+pub struct CheckStateBuilder<'w> {
+    world: &'w mut ScenarioWorld,
+    check_state_step: CheckStateStep,
+    current_account: CheckAccount,
+    current_address: AddressKey,
+}
+
+impl<'w> CheckStateBuilder<'w> {
+    pub(crate) fn new(world: &'w mut ScenarioWorld, address: AddressKey) -> CheckStateBuilder<'w> {
+        let mut builder = CheckStateBuilder {
+            world,
+            check_state_step: CheckStateStep::new(),
+            current_account: CheckAccount::new(),
+            current_address: AddressKey::default(),
+        };
+        builder.reset_account(address);
+        builder
+    }
+
+    /// Starts building of a new account.
+    pub fn check_state_account<A>(mut self, address_expr: A) -> Self
+    where
+        AddressKey: From<A>,
+    {
+        self.add_current_acount();
+        self.reset_account(address_expr.into());
+        self
+    }
+
+    fn add_current_acount(&mut self) {
+        if let Entry::Vacant(entry) = self
+            .check_state_step
+            .accounts
+            .accounts
+            .entry(core::mem::take(&mut self.current_address))
+        {
+            entry.insert(core::mem::take(&mut self.current_account));
+        };
+    }
+
+    fn reset_account(&mut self, address: AddressKey) {
+        self.current_address = address;
+        self.current_account = CheckAccount::default();
+    }
+
+    /// Finished and sets all account in the blockchain mock.
+    fn commit_accounts(&mut self) {
+        self.add_current_acount();
+        self.world.run_check_state_step(&self.check_state_step);
+    }
+
+    /// Forces value drop and commit accounts.
+    pub fn commit(self) {}
+
+    pub fn nonce<V>(mut self, nonce: V) -> Self
+    where
+        U64Value: InterpretableFrom<V>,
+    {
+        self.current_account.nonce = CheckValue::Equal(U64Value::interpret_from(
+            nonce,
+            &InterpreterContext::default(),
+        ));
+        self
+    }
+
+    pub fn balance<V>(mut self, balance_expr: V) -> Self
+    where
+        BigUintValue: InterpretableFrom<V>,
+    {
+        self.current_account.balance = CheckValue::Equal(BigUintValue::interpret_from(
+            balance_expr,
+            &InterpreterContext::default(),
+        ));
+        self
+    }
+
+    pub fn code<V>(mut self, code_expr: V) -> Self
+    where
+        BytesValue: InterpretableFrom<V>,
+    {
+        self.current_account.code = CheckValue::Equal(BytesValue::interpret_from(
+            code_expr,
+            &InterpreterContext::default(),
+        ));
+        self
+    }
+
+    pub fn code_metadata<V>(mut self, code_metadata_expr: V) -> Self
+    where
+        BytesValue: InterpretableFrom<V>,
+    {
+        self.current_account.code_metadata = CheckValue::Equal(BytesValue::interpret_from(
+            code_metadata_expr,
+            &InterpreterContext::default(),
+        ));
+        self
+    }
+
+    pub fn esdt_balance<K, V>(mut self, token_id_expr: K, balance_expr: V) -> Self
+    where
+        BytesKey: From<K>,
+        BigUintValue: From<V>,
+    {
+        let token_id = BytesKey::from(token_id_expr);
+        let balance = BigUintValue::from(balance_expr);
+
+        match &mut self.current_account.esdt {
+            CheckEsdtMap::Unspecified | CheckEsdtMap::Star => {
+                let mut new_esdt_map = BTreeMap::new();
+                let _ = new_esdt_map.insert(token_id, CheckEsdt::Short(balance));
+
+                let new_check_esdt_map = CheckEsdtMapContents {
+                    contents: new_esdt_map,
+                    other_esdts_allowed: true,
+                };
+
+                self.current_account.esdt = CheckEsdtMap::Equal(new_check_esdt_map);
+            },
+            CheckEsdtMap::Equal(check_esdt_map) => {
+                if check_esdt_map.contents.contains_key(&token_id) {
+                    let prev_entry = check_esdt_map.contents.get_mut(&token_id).unwrap();
+                    match prev_entry {
+                        CheckEsdt::Short(prev_balance_check) => *prev_balance_check = balance,
+                        CheckEsdt::Full(prev_esdt_check) => match prev_esdt_check.instances {
+                            CheckEsdtInstances::Star => todo!(),
+                            CheckEsdtInstances::Equal(_) => todo!(),
+                        },
+                    }
+                }
+            },
+        }
+
+        self
+    }
+
+    pub fn esdt_nft_balance_and_attributes<K, N, V, T>(
+        mut self,
+        token_id_expr: K,
+        nonce_expr: N,
+        balance_expr: V,
+        attributes_expr: Option<T>,
+    ) -> Self
+    where
+        BytesKey: From<K>,
+        U64Value: From<N>,
+        BigUintValue: From<V>,
+        T: TopEncode,
+    {
+        let token_id = BytesKey::from(token_id_expr);
+
+        if let CheckEsdtMap::Unspecified = &self.current_account.esdt {
+            let mut check_esdt = CheckEsdt::Full(CheckEsdtData::default());
+
+            if let Some(attributes_expr) = attributes_expr {
+                check_esdt.add_balance_and_attributes_check(
+                    nonce_expr,
+                    balance_expr,
+                    top_encode_to_vec_u8_or_panic(&attributes_expr),
+                );
+            } else {
+                check_esdt.add_balance_and_attributes_check(
+                    nonce_expr,
+                    balance_expr,
+                    Vec::<u8>::new(),
+                );
+            }
+
+            let mut new_esdt_map = BTreeMap::new();
+            let _ = new_esdt_map.insert(token_id, check_esdt);
+
+            let new_check_esdt_map = CheckEsdtMapContents {
+                contents: new_esdt_map,
+                other_esdts_allowed: true,
+            };
+
+            self.current_account.esdt = CheckEsdtMap::Equal(new_check_esdt_map);
+        }
+
+        self
+    }
+
+    pub fn check_storage(mut self, key: &str, value: &str) -> Self {
+        let mut details = match &self.current_account.storage {
+            CheckStorage::Star => CheckStorageDetails::default(),
+            CheckStorage::Equal(details) => details.clone(),
+        };
+        details.storages.insert(
+            BytesKey::interpret_from(key, &InterpreterContext::default()),
+            CheckValue::Equal(BytesValue::interpret_from(
+                value,
+                &InterpreterContext::default(),
+            )),
+        );
+        self.current_account.storage = CheckStorage::Equal(details);
+        self
+    }
+}
+
+impl<'w> Drop for CheckStateBuilder<'w> {
+    fn drop(&mut self) {
+        self.commit_accounts();
+    }
+}
diff --git a/framework/scenario/src/facade/world_tx/scenario_exec_call.rs b/framework/scenario/src/facade/world_tx/scenario_exec_call.rs
index 5eef522784..e92e38087c 100644
--- a/framework/scenario/src/facade/world_tx/scenario_exec_call.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_exec_call.rs
@@ -1,23 +1,15 @@
-use std::{collections::btree_map::Entry, ops::Add, path::PathBuf};
-
-use multiversx_chain_scenario_format::serde_raw::ValueSubTree;
 use multiversx_sc::{
     tuple_util::NestedTupleFlatten,
     types::{
-        Address, AddressExpr, AnnotatedValue, Code, DeployCall, FunctionCall, ManagedAddress,
-        ManagedBuffer, RHListExec, Tx, TxBaseWithEnv, TxCodeSource, TxCodeSourceSpecified,
-        TxCodeValue, TxEnv, TxFromSpecified, TxGas, TxPayment, TxTo, TxToSpecified,
+        FunctionCall, ManagedAddress, ManagedBuffer, RHListExec, Tx, TxBaseWithEnv, TxEnv,
+        TxFromSpecified, TxGas, TxPayment, TxToSpecified,
     },
 };
-use serde_json::map::OccupiedEntry;
 
 use crate::{
     api::StaticApi,
-    scenario::{tx_to_step::TxToStep, ScenarioRunner},
-    scenario_model::{
-        Account, AddressKey, AddressValue, BigUintValue, BytesKey, BytesValue, Esdt, EsdtObject,
-        NewAddress, ScCallStep, ScDeployStep, SetStateStep, TxExpect, TxResponse, U64Value,
-    },
+    scenario::tx_to_step::TxToStep,
+    scenario_model::{TxExpect, TxResponse},
     ScenarioTxEnv, ScenarioTxRun, ScenarioWorld,
 };
 
@@ -99,231 +91,4 @@ impl ScenarioWorld {
         step_wrapper.process_result();
         self
     }
-
-    pub fn account<A>(&mut self, address_expr: A) -> SetStateBuilder<'_>
-    where
-        AddressKey: From<A>,
-    {
-        SetStateBuilder::new(self, address_expr.into())
-    }
-}
-
-pub struct SetStateBuilder<'w> {
-    world: &'w mut ScenarioWorld,
-    set_state_step: SetStateStep,
-    current_account: Account,
-    current_address: AddressKey,
-}
-
-impl<'w> SetStateBuilder<'w> {
-    pub(crate) fn new(world: &'w mut ScenarioWorld, address: AddressKey) -> SetStateBuilder<'w> {
-        let mut builder = SetStateBuilder {
-            world,
-            set_state_step: SetStateStep::new(),
-            current_address: AddressKey::default(),
-            current_account: Account::new(),
-        };
-        builder.reset_account(address);
-        builder
-    }
-
-    fn add_current_acount(&mut self) {
-        if let Entry::Vacant(entry) = self
-            .set_state_step
-            .accounts
-            .entry(core::mem::take(&mut self.current_address))
-        {
-            entry.insert(core::mem::take(&mut self.current_account));
-        };
-    }
-
-    fn reset_account(&mut self, address: AddressKey) {
-        assert!(
-            !self
-                .world
-                .get_debugger_backend()
-                .vm_runner
-                .blockchain_mock
-                .state
-                .account_exists(&address.to_vm_address()),
-            "updating existing accounts currently not supported"
-        );
-
-        self.current_address = address;
-        self.current_account = Account::default();
-    }
-
-    /// Starts building of a new account.
-    pub fn account<A>(mut self, address_expr: A) -> Self
-    where
-        AddressKey: From<A>,
-    {
-        self.add_current_acount();
-        self.reset_account(address_expr.into());
-        self
-    }
-
-    /// Finished and sets all account in the blockchain mock.
-    fn commit_accounts(&mut self) {
-        self.add_current_acount();
-        self.world.run_set_state_step(&self.set_state_step);
-    }
-
-    /// Forces value drop and commit accounts.
-    pub fn commit(self) {}
-
-    pub fn nonce<V>(mut self, nonce: V) -> Self
-    where
-        U64Value: From<V>,
-    {
-        self.current_account.nonce = Some(U64Value::from(nonce));
-        self
-    }
-
-    pub fn balance<V>(mut self, balance_expr: V) -> Self
-    where
-        BigUintValue: From<V>,
-    {
-        self.current_account.balance = Some(BigUintValue::from(balance_expr));
-        self
-    }
-
-    pub fn esdt_balance<K, V>(mut self, token_id_expr: K, balance_expr: V) -> Self
-    where
-        BytesKey: From<K>,
-        BigUintValue: From<V>,
-    {
-        let token_id = BytesKey::from(token_id_expr);
-        let esdt_data_ref = self.get_esdt_data_or_create(&token_id);
-        esdt_data_ref.set_balance(0u64, balance_expr);
-
-        self
-    }
-
-    pub fn esdt_nft_balance<K, N, V, T>(
-        mut self,
-        token_id_expr: K,
-        nonce_expr: N,
-        balance_expr: V,
-        opt_attributes_expr: Option<T>,
-    ) -> Self
-    where
-        N: Clone,
-        BytesKey: From<K>,
-        U64Value: From<N>,
-        BigUintValue: From<V>,
-        BytesValue: From<T>,
-    {
-        let token_id = BytesKey::from(token_id_expr);
-
-        let esdt_obj_ref = self
-            .get_esdt_data_or_create(&token_id)
-            .get_mut_esdt_object();
-        esdt_obj_ref.set_balance(nonce_expr.clone(), balance_expr);
-
-        if let Some(attributes_expr) = opt_attributes_expr {
-            esdt_obj_ref.set_token_attributes(nonce_expr, attributes_expr);
-        }
-
-        self
-    }
-
-    #[allow(clippy::too_many_arguments)]
-    pub fn esdt_nft_all_properties<K, N, V, T>(
-        mut self,
-        token_id_expr: K,
-        nonce_expr: N,
-        balance_expr: V,
-        opt_attributes_expr: Option<T>,
-        royalties_expr: N,
-        creator_expr: Option<T>,
-        hash_expr: Option<T>,
-        uris_expr: Vec<T>,
-    ) -> Self
-    where
-        BytesKey: From<K>,
-        U64Value: From<N>,
-        BigUintValue: From<V>,
-        BytesValue: From<T>,
-    {
-        let token_id = BytesKey::from(token_id_expr);
-
-        let esdt_obj_ref = self
-            .get_esdt_data_or_create(&token_id)
-            .get_mut_esdt_object();
-
-        esdt_obj_ref.set_token_all_properties(
-            nonce_expr,
-            balance_expr,
-            opt_attributes_expr,
-            royalties_expr,
-            creator_expr,
-            hash_expr,
-            uris_expr,
-        );
-
-        self
-    }
-
-    pub fn esdt_nft_last_nonce<K, N>(mut self, token_id_expr: K, last_nonce_expr: N) -> Self
-    where
-        BytesKey: From<K>,
-        U64Value: From<N>,
-    {
-        let token_id = BytesKey::from(token_id_expr);
-
-        let esdt_obj_ref = self
-            .get_esdt_data_or_create(&token_id)
-            .get_mut_esdt_object();
-        esdt_obj_ref.set_last_nonce(last_nonce_expr);
-
-        self
-    }
-
-    // TODO: Find a better way to pass roles
-    pub fn esdt_roles<K>(mut self, token_id_expr: K, roles: Vec<String>) -> Self
-    where
-        BytesKey: From<K>,
-    {
-        let token_id = BytesKey::from(token_id_expr);
-
-        let esdt_obj_ref = self
-            .get_esdt_data_or_create(&token_id)
-            .get_mut_esdt_object();
-        esdt_obj_ref.set_roles(roles);
-
-        self
-    }
-
-    fn get_esdt_data_or_create(&mut self, token_id: &BytesKey) -> &mut Esdt {
-        if !self.current_account.esdt.contains_key(token_id) {
-            self.current_account
-                .esdt
-                .insert(token_id.clone(), Esdt::Full(EsdtObject::default()));
-        }
-
-        self.current_account.esdt.get_mut(token_id).unwrap()
-    }
-
-    pub fn code<V>(mut self, code_expr: V) -> Self
-    where
-        BytesValue: From<V>,
-    {
-        self.current_account.code = Some(BytesValue::from(code_expr));
-        self
-    }
-
-    pub fn owner<V>(mut self, owner_expr: V) -> Self
-    where
-        AddressValue: From<V>,
-    {
-        self.current_account.owner = Some(AddressValue::from(owner_expr));
-        self
-    }
-}
-
-impl<'w> Drop for SetStateBuilder<'w> {
-    fn drop(&mut self) {
-        self.commit_accounts();
-    }
 }
diff --git a/framework/scenario/src/facade/world_tx/scenario_exec_deploy.rs b/framework/scenario/src/facade/world_tx/scenario_exec_deploy.rs
index c218f06869..866d4f562f 100644
--- a/framework/scenario/src/facade/world_tx/scenario_exec_deploy.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_exec_deploy.rs
@@ -1,20 +1,14 @@
-use std::path::PathBuf;
-
-use multiversx_chain_scenario_format::serde_raw::ValueSubTree;
 use multiversx_sc::{
     tuple_util::NestedTupleFlatten,
     types::{
-        AnnotatedValue, Code, DeployCall, FunctionCall, ManagedAddress, ManagedBuffer, RHListExec,
-        Tx, TxBaseWithEnv, TxCodeSource, TxCodeSourceSpecified, TxCodeValue, TxEnv,
-        TxFromSpecified, TxGas, TxPayment, TxToSpecified,
+        Code, DeployCall, RHListExec, Tx, TxBaseWithEnv, TxCodeValue, TxFromSpecified, TxGas,
+        TxPayment,
     },
 };
 
 use crate::{
-    api::StaticApi,
-    scenario::tx_to_step::TxToStep,
-    scenario_model::{AddressValue, BytesValue, ScCallStep, ScDeployStep, TxResponse},
-    ScenarioEnvExec, ScenarioTxEnv, ScenarioTxRun, ScenarioWorld,
+    scenario::tx_to_step::TxToStep, scenario_model::TxResponse, ScenarioEnvExec, ScenarioTxRun,
+    ScenarioWorld,
 };
 
 use super::ScenarioTxEnvData;
diff --git a/framework/scenario/src/facade/world_tx/scenario_query_call.rs b/framework/scenario/src/facade/world_tx/scenario_query_call.rs
index 387ad0f444..dbcf3130f5 100644
--- a/framework/scenario/src/facade/world_tx/scenario_query_call.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_query_call.rs
@@ -1,27 +1,15 @@
-use std::{
-    collections::{btree_map::Entry, BTreeMap},
-    path::PathBuf,
-};
-
-use multiversx_chain_scenario_format::interpret_trait::{InterpretableFrom, InterpreterContext};
 use multiversx_sc::{
-    codec::test_util::top_encode_to_vec_u8_or_panic,
-    proxy_imports::TopEncode,
     tuple_util::NestedTupleFlatten,
     types::{
-        AnnotatedValue, FunctionCall, ManagedAddress, ManagedBuffer, RHListExec, Tx, TxBaseWithEnv,
-        TxEnv, TxFromSpecified, TxGas, TxPayment, TxToSpecified,
+        FunctionCall, ManagedAddress, ManagedBuffer, RHListExec, Tx, TxBaseWithEnv, TxEnv,
+        TxToSpecified,
     },
 };
 
 use crate::{
     api::StaticApi,
-    scenario::{tx_to_step::TxToQueryStep, ScenarioRunner},
-    scenario_model::{
-        AddressKey, BigUintValue, BytesKey, BytesValue, CheckAccount, CheckEsdt, CheckEsdtData,
-        CheckEsdtInstances, CheckEsdtMap, CheckEsdtMapContents, CheckStateStep, CheckStorage,
-        CheckStorageDetails, CheckValue, TxExpect, TxResponse, U64Value,
-    },
+    scenario::tx_to_step::TxToQueryStep,
+    scenario_model::{TxExpect, TxResponse},
     ScenarioTxEnv, ScenarioTxEnvData, ScenarioTxRun, ScenarioWorld,
 };
 
@@ -93,215 +81,4 @@ impl ScenarioWorld {
         step_wrapper.process_result();
         self
     }
-
-    pub fn check_state_account<A>(&mut self, address: A) -> CheckStateBuilder<'_>
-    where
-        AddressKey: From<A>,
-    {
-        CheckStateBuilder::new(self, address.into())
-    }
-}
-
-pub struct CheckStateBuilder<'w> {
-    world: &'w mut ScenarioWorld,
-    check_state_step: CheckStateStep,
-    current_account: CheckAccount,
-    current_address: AddressKey,
-}
-
-impl<'w> CheckStateBuilder<'w> {
-    pub(crate) fn new(world: &'w mut ScenarioWorld, address: AddressKey) -> CheckStateBuilder<'w> {
-        let mut builder = CheckStateBuilder {
-            world,
-            check_state_step: CheckStateStep::new(),
-            current_account: CheckAccount::new(),
-            current_address: AddressKey::default(),
-        };
-        builder.reset_account(address);
-        builder
-    }
-
-    /// Starts building of a new account.
-    pub fn check_state_account<A>(mut self, address_expr: A) -> Self
-    where
-        AddressKey: From<A>,
-    {
-        self.add_current_acount();
-        self.reset_account(address_expr.into());
-        self
-    }
-
-    fn add_current_acount(&mut self) {
-        if let Entry::Vacant(entry) = self
-            .check_state_step
-            .accounts
-            .accounts
-            .entry(core::mem::take(&mut self.current_address))
-        {
-            entry.insert(core::mem::take(&mut self.current_account));
-        };
-    }
-
-    fn reset_account(&mut self, address: AddressKey) {
-        self.current_address = address;
-        self.current_account = CheckAccount::default();
-    }
-
-    /// Finished and sets all account in the blockchain mock.
-    fn commit_accounts(&mut self) {
-        self.add_current_acount();
-        self.world.run_check_state_step(&self.check_state_step);
-    }
-
-    /// Forces value drop and commit accounts.
-    pub fn commit(self) {}
-
-    pub fn nonce<V>(mut self, nonce: V) -> Self
-    where
-        U64Value: InterpretableFrom<V>,
-    {
-        self.current_account.nonce = CheckValue::Equal(U64Value::interpret_from(
-            nonce,
-            &InterpreterContext::default(),
-        ));
-        self
-    }
-
-    pub fn balance<V>(mut self, balance_expr: V) -> Self
-    where
-        BigUintValue: InterpretableFrom<V>,
-    {
-        self.current_account.balance = CheckValue::Equal(BigUintValue::interpret_from(
-            balance_expr,
-            &InterpreterContext::default(),
-        ));
-        self
-    }
-
-    pub fn code<V>(mut self, code_expr: V) -> Self
-    where
-        BytesValue: InterpretableFrom<V>,
-    {
-        self.current_account.code = CheckValue::Equal(BytesValue::interpret_from(
-            code_expr,
-            &InterpreterContext::default(),
-        ));
-        self
-    }
-
-    pub fn code_metadata<V>(mut self, code_metadata_expr: V) -> Self
-    where
-        BytesValue: InterpretableFrom<V>,
-    {
-        self.current_account.code_metadata = CheckValue::Equal(BytesValue::interpret_from(
-            code_metadata_expr,
-            &InterpreterContext::default(),
-        ));
-        self
-    }
-
-    pub fn esdt_balance<K, V>(mut self, token_id_expr: K, balance_expr: V) -> Self
-    where
-        BytesKey: From<K>,
-        BigUintValue: From<V>,
-    {
-        let token_id = BytesKey::from(token_id_expr);
-        let balance = BigUintValue::from(balance_expr);
-
-        match &mut self.current_account.esdt {
-            CheckEsdtMap::Unspecified | CheckEsdtMap::Star => {
-                let mut new_esdt_map = BTreeMap::new();
-                let _ = new_esdt_map.insert(token_id, CheckEsdt::Short(balance));
-
-                let new_check_esdt_map = CheckEsdtMapContents {
-                    contents: new_esdt_map,
-                    other_esdts_allowed: true,
-                };
-
-                self.current_account.esdt = CheckEsdtMap::Equal(new_check_esdt_map);
-            },
-            CheckEsdtMap::Equal(check_esdt_map) => {
-                if check_esdt_map.contents.contains_key(&token_id) {
-                    let prev_entry = check_esdt_map.contents.get_mut(&token_id).unwrap();
-                    match prev_entry {
-                        CheckEsdt::Short(prev_balance_check) => *prev_balance_check = balance,
-                        CheckEsdt::Full(prev_esdt_check) => match prev_esdt_check.instances {
-                            CheckEsdtInstances::Star => todo!(),
-                            CheckEsdtInstances::Equal(_) => todo!(),
-                        },
-                    }
-                }
-            },
-        }
-
-        self
-    }
-
-    pub fn esdt_nft_balance_and_attributes<K, N, V, T>(
-        mut self,
-        token_id_expr: K,
-        nonce_expr: N,
-        balance_expr: V,
-        attributes_expr: Option<T>,
-    ) -> Self
-    where
-        BytesKey: From<K>,
-        U64Value: From<N>,
-        BigUintValue: From<V>,
-        T: TopEncode,
-    {
-        let token_id = BytesKey::from(token_id_expr);
-
-        if let CheckEsdtMap::Unspecified = &self.current_account.esdt {
-            let mut check_esdt = CheckEsdt::Full(CheckEsdtData::default());
-
-            if let Some(attributes_expr) = attributes_expr {
-                check_esdt.add_balance_and_attributes_check(
-                    nonce_expr,
-                    balance_expr,
-                    top_encode_to_vec_u8_or_panic(&attributes_expr),
-                );
-            } else {
-                check_esdt.add_balance_and_attributes_check(
-                    nonce_expr,
-                    balance_expr,
-                    Vec::<u8>::new(),
-                );
-            }
-
-            let mut new_esdt_map = BTreeMap::new();
-            let _ = new_esdt_map.insert(token_id, check_esdt);
-
-            let new_check_esdt_map = CheckEsdtMapContents {
-                contents: new_esdt_map,
-                other_esdts_allowed: true,
-            };
-
-            self.current_account.esdt = CheckEsdtMap::Equal(new_check_esdt_map);
-        }
-
-        self
-    }
-
-    pub fn check_storage(mut self, key: &str, value: &str) -> Self {
-        let mut details = match &self.current_account.storage {
-            CheckStorage::Star => CheckStorageDetails::default(),
-            CheckStorage::Equal(details) => details.clone(),
-        };
-        details.storages.insert(
-            BytesKey::interpret_from(key, &InterpreterContext::default()),
-            CheckValue::Equal(BytesValue::interpret_from(
-                value,
-                &InterpreterContext::default(),
-            )),
-        );
-        self.current_account.storage = CheckStorage::Equal(details);
-        self
-    }
-}
-
-impl<'w> Drop for CheckStateBuilder<'w> {
-    fn drop(&mut self) {
-        self.commit_accounts();
-    }
 }
diff --git a/framework/scenario/src/facade/world_tx/scenario_rh_impl.rs b/framework/scenario/src/facade/world_tx/scenario_rh_impl.rs
index bbf29a0d03..d040f0bc3a 100644
--- a/framework/scenario/src/facade/world_tx/scenario_rh_impl.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_rh_impl.rs
@@ -1,18 +1,12 @@
 use multiversx_sc::{
     codec::{CodecFrom, TopDecodeMulti, TopEncodeMulti},
     types::{
-        ManagedAddress, RHList, RHListItem, RHListItemExec, ReturnsNewAddress,
-        ReturnsNewManagedAddress, ReturnsResult, ReturnsResultConv, TxEnv, WithNewAddress,
-        WithResultConv,
+        ManagedAddress, RHListItemExec, ReturnsNewAddress, ReturnsNewManagedAddress, ReturnsResult,
+        ReturnsResultConv, TxEnv, WithNewAddress, WithResultConv,
     },
 };
 
-use crate::{
-    api::StaticApi,
-    scenario_model::{TxResponse, TypedResponse},
-};
-
-use super::ScenarioTxEnvData;
+use crate::scenario_model::{TxResponse, TypedResponse};
 
 impl<Env, Original> RHListItemExec<TxResponse, Env, Original> for ReturnsResult
 where
diff --git a/framework/scenario/src/facade/world_tx/scenario_set_state.rs b/framework/scenario/src/facade/world_tx/scenario_set_state.rs
new file mode 100644
index 0000000000..110b1b9692
--- /dev/null
+++ b/framework/scenario/src/facade/world_tx/scenario_set_state.rs
@@ -0,0 +1,239 @@
+use std::collections::btree_map::Entry;
+
+use crate::{
+    scenario::ScenarioRunner,
+    scenario_model::{
+        Account, AddressKey, AddressValue, BigUintValue, BytesKey, BytesValue, Esdt, EsdtObject,
+        SetStateStep, U64Value,
+    },
+    ScenarioWorld,
+};
+
+impl ScenarioWorld {
+    pub fn account<A>(&mut self, address_expr: A) -> SetStateBuilder<'_>
+    where
+        AddressKey: From<A>,
+    {
+        SetStateBuilder::new(self, address_expr.into())
+    }
+}
+
+pub struct SetStateBuilder<'w> {
+    world: &'w mut ScenarioWorld,
+    set_state_step: SetStateStep,
+    current_account: Account,
+    current_address: AddressKey,
+}
+
+impl<'w> SetStateBuilder<'w> {
+    pub(crate) fn new(world: &'w mut ScenarioWorld, address: AddressKey) -> SetStateBuilder<'w> {
+        let mut builder = SetStateBuilder {
+            world,
+            set_state_step: SetStateStep::new(),
+            current_address: AddressKey::default(),
+            current_account: Account::new(),
+        };
+        builder.reset_account(address);
+        builder
+    }
+
+    fn add_current_acount(&mut self) {
+        if let Entry::Vacant(entry) = self
+            .set_state_step
+            .accounts
+            .entry(core::mem::take(&mut self.current_address))
+        {
+            entry.insert(core::mem::take(&mut self.current_account));
+        };
+    }
+
+    fn reset_account(&mut self, address: AddressKey) {
+        assert!(
+            !self
+                .world
+                .get_debugger_backend()
+                .vm_runner
+                .blockchain_mock
+                .state
+                .account_exists(&address.to_vm_address()),
+            "updating existing accounts currently not supported"
+        );
+
+        self.current_address = address;
+        self.current_account = Account::default();
+    }
+
+    /// Starts building of a new account.
+    pub fn account<A>(mut self, address_expr: A) -> Self
+    where
+        AddressKey: From<A>,
+    {
+        self.add_current_acount();
+        self.reset_account(address_expr.into());
+        self
+    }
+
+    /// Finished and sets all account in the blockchain mock.
+    fn commit_accounts(&mut self) {
+        self.add_current_acount();
+        self.world.run_set_state_step(&self.set_state_step);
+    }
+
+    /// Forces value drop and commit accounts.
+    pub fn commit(self) {}
+
+    pub fn nonce<V>(mut self, nonce: V) -> Self
+    where
+        U64Value: From<V>,
+    {
+        self.current_account.nonce = Some(U64Value::from(nonce));
+        self
+    }
+
+    pub fn balance<V>(mut self, balance_expr: V) -> Self
+    where
+        BigUintValue: From<V>,
+    {
+        self.current_account.balance = Some(BigUintValue::from(balance_expr));
+        self
+    }
+
+    pub fn esdt_balance<K, V>(mut self, token_id_expr: K, balance_expr: V) -> Self
+    where
+        BytesKey: From<K>,
+        BigUintValue: From<V>,
+    {
+        let token_id = BytesKey::from(token_id_expr);
+        let esdt_data_ref = self.get_esdt_data_or_create(&token_id);
+        esdt_data_ref.set_balance(0u64, balance_expr);
+
+        self
+    }
+
+    pub fn esdt_nft_balance<K, N, V, T>(
+        mut self,
+        token_id_expr: K,
+        nonce_expr: N,
+        balance_expr: V,
+        opt_attributes_expr: Option<T>,
+    ) -> Self
+    where
+        N: Clone,
+        BytesKey: From<K>,
+        U64Value: From<N>,
+        BigUintValue: From<V>,
+        BytesValue: From<T>,
+    {
+        let token_id = BytesKey::from(token_id_expr);
+
+        let esdt_obj_ref = self
+            .get_esdt_data_or_create(&token_id)
+            .get_mut_esdt_object();
+        esdt_obj_ref.set_balance(nonce_expr.clone(), balance_expr);
+
+        if let Some(attributes_expr) = opt_attributes_expr {
+            esdt_obj_ref.set_token_attributes(nonce_expr, attributes_expr);
+        }
+
+        self
+    }
+
+    #[allow(clippy::too_many_arguments)]
+    pub fn esdt_nft_all_properties<K, N, V, T>(
+        mut self,
+        token_id_expr: K,
+        nonce_expr: N,
+        balance_expr: V,
+        opt_attributes_expr: Option<T>,
+        royalties_expr: N,
+        creator_expr: Option<T>,
+        hash_expr: Option<T>,
+        uris_expr: Vec<T>,
+    ) -> Self
+    where
+        BytesKey: From<K>,
+        U64Value: From<N>,
+        BigUintValue: From<V>,
+        BytesValue: From<T>,
+    {
+        let token_id = BytesKey::from(token_id_expr);
+
+        let esdt_obj_ref = self
+            .get_esdt_data_or_create(&token_id)
+            .get_mut_esdt_object();
+
+        esdt_obj_ref.set_token_all_properties(
+            nonce_expr,
+            balance_expr,
+            opt_attributes_expr,
+            royalties_expr,
+            creator_expr,
+            hash_expr,
+            uris_expr,
+        );
+
+        self
+    }
+
+    pub fn esdt_nft_last_nonce<K, N>(mut self, token_id_expr: K, last_nonce_expr: N) -> Self
+    where
+        BytesKey: From<K>,
+        U64Value: From<N>,
+    {
+        let token_id = BytesKey::from(token_id_expr);
+
+        let esdt_obj_ref = self
+            .get_esdt_data_or_create(&token_id)
+            .get_mut_esdt_object();
+        esdt_obj_ref.set_last_nonce(last_nonce_expr);
+
+        self
+    }
+
+    // TODO: Find a better way to pass roles
+    pub fn esdt_roles<K>(mut self, token_id_expr: K, roles: Vec<String>) -> Self
+    where
+        BytesKey: From<K>,
+    {
+        let token_id = BytesKey::from(token_id_expr);
+
+        let esdt_obj_ref = self
+            .get_esdt_data_or_create(&token_id)
+            .get_mut_esdt_object();
+        esdt_obj_ref.set_roles(roles);
+
+        self
+    }
+
+    fn get_esdt_data_or_create(&mut self, token_id: &BytesKey) -> &mut Esdt {
+        if !self.current_account.esdt.contains_key(token_id) {
+            self.current_account
+                .esdt
+                .insert(token_id.clone(), Esdt::Full(EsdtObject::default()));
+        }
+
+        self.current_account.esdt.get_mut(token_id).unwrap()
+    }
+
+    pub fn code<V>(mut self, code_expr: V) -> Self
+    where
+        BytesValue: From<V>,
+    {
+        self.current_account.code = Some(BytesValue::from(code_expr));
+        self
+    }
+
+    pub fn owner<V>(mut self, owner_expr: V) -> Self
+    where
+        AddressValue: From<V>,
+    {
+        self.current_account.owner = Some(AddressValue::from(owner_expr));
+        self
+    }
+}
+
+impl<'w> Drop for SetStateBuilder<'w> {
+    fn drop(&mut self) {
+        self.commit_accounts();
+    }
+}
diff --git a/framework/scenario/src/facade/world_tx/scenario_tx_env.rs b/framework/scenario/src/facade/world_tx/scenario_tx_env.rs
index aac1952a34..d195a7600d 100644
--- a/framework/scenario/src/facade/world_tx/scenario_tx_env.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_tx_env.rs
@@ -1,12 +1,8 @@
 use std::path::PathBuf;
 
-use multiversx_sc::types::{AnnotatedValue, ManagedAddress, ManagedBuffer, TxBaseWithEnv, TxEnv};
+use multiversx_sc::types::{ManagedAddress, ManagedBuffer, TxEnv};
 
-use crate::{
-    api::StaticApi,
-    scenario_model::{TxExpect, TxResponse},
-    ScenarioWorld,
-};
+use crate::{api::StaticApi, scenario_model::TxExpect, ScenarioWorld};
 
 /// Designates a tx environment suitable for running scenarios locally.
 pub trait ScenarioTxEnv: TxEnv {

From 9549b7e327c5020a95691e30ed413e4c9010ad69 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 17 Apr 2024 18:23:02 +0300
Subject: [PATCH 0731/1254] check state refactor

---
 .../adder/tests/adder_blackbox_test.rs        |  8 +++-----
 .../tests/crowdfunding_esdt_blackbox_test.rs  |  2 +-
 .../scenario-tester/tests/st_blackbox_test.rs | 20 +++++++++----------
 .../facade/world_tx/scenario_check_state.rs   |  4 ++--
 4 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/contracts/examples/adder/tests/adder_blackbox_test.rs b/contracts/examples/adder/tests/adder_blackbox_test.rs
index 1dafca181a..4b0f740343 100644
--- a/contracts/examples/adder/tests/adder_blackbox_test.rs
+++ b/contracts/examples/adder/tests/adder_blackbox_test.rs
@@ -61,11 +61,9 @@ fn adder_blackbox() {
         .returns(ExpectValue(6u32))
         .run();
 
-    world.check_state_step(
-        CheckStateStep::new()
-            .put_account(OWNER, CheckAccount::new())
-            .put_account(SC_ADDER, CheckAccount::new().check_storage("str:sum", "6")),
-    );
+    world.check_account(OWNER);
+
+    world.check_account(SC_ADDER).check_storage("str:sum", "6");
 
     world.write_scenario_trace("trace1.scen.json");
 }
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 cc4235704c..c3a1e383f3 100644
--- a/contracts/examples/crowdfunding-esdt/tests/crowdfunding_esdt_blackbox_test.rs
+++ b/contracts/examples/crowdfunding-esdt/tests/crowdfunding_esdt_blackbox_test.rs
@@ -118,7 +118,7 @@ impl CrowdfundingESDTTestState {
 
     fn check_esdt_balance(&mut self, address: AddressExpr, balance_expr: &str) {
         self.world
-            .check_state_account(address)
+            .check_account(address)
             .esdt_balance(CF_TOKEN_ID_EXPR, balance_expr);
     }
 
diff --git a/contracts/feature-tests/scenario-tester/tests/st_blackbox_test.rs b/contracts/feature-tests/scenario-tester/tests/st_blackbox_test.rs
index ae3e29da45..de877fb76b 100644
--- a/contracts/feature-tests/scenario-tester/tests/st_blackbox_test.rs
+++ b/contracts/feature-tests/scenario-tester/tests/st_blackbox_test.rs
@@ -42,10 +42,10 @@ fn st_blackbox() {
         .commit();
 
     world
-        .check_state_account(owner_address)
+        .check_account(owner_address)
         .nonce("1")
         .balance("100")
-        .check_state_account(other_address)
+        .check_account(other_address)
         .nonce("2")
         .balance("300")
         .esdt_balance("str:TOKEN-123456", "500")
@@ -81,10 +81,10 @@ fn st_blackbox() {
         .run();
 
     world
-        .check_state_account(owner_address)
+        .check_account(owner_address)
         .nonce("3")
         .balance("100")
-        .check_state_account(st_contract)
+        .check_account(st_contract)
         .check_storage("str:sum", "6")
         .commit();
 
@@ -122,10 +122,10 @@ fn set_state_test() {
         .commit();
 
     world
-        .check_state_account(first)
+        .check_account(first)
         .nonce(1)
         .balance("100")
-        .check_state_account(second)
+        .check_account(second)
         .nonce(2)
         .balance("300")
         .esdt_balance("str:TOKEN-123456", "500")
@@ -139,7 +139,7 @@ fn set_state_test() {
         .commit();
 
     world
-        .check_state_account(third)
+        .check_account(third)
         .nonce(3)
         .balance("50")
         .esdt_nft_balance_and_attributes("str:NFT-123456", "2", "1", Some(Vec::<u8>::new()))
@@ -156,10 +156,10 @@ fn set_state_test() {
         .esdt_balance("str:TOKEN-123456", "2");
 
     world
-        .check_state_account(fourth)
+        .check_account(fourth)
         .nonce(4)
         .balance("400")
-        .check_state_account(fifth)
+        .check_account(fifth)
         .nonce(5)
         .balance("250")
         .esdt_balance("str:TOKEN-123456", "2");
@@ -171,7 +171,7 @@ fn set_state_test() {
         .esdt_balance("str:TOKEN-123456", "60");
 
     world
-        .check_state_account(sixth)
+        .check_account(sixth)
         .nonce(6)
         .balance("600")
         .esdt_balance("str:TOKEN-123456", "60");
diff --git a/framework/scenario/src/facade/world_tx/scenario_check_state.rs b/framework/scenario/src/facade/world_tx/scenario_check_state.rs
index ab54d7411f..ffb4a2754b 100644
--- a/framework/scenario/src/facade/world_tx/scenario_check_state.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_check_state.rs
@@ -14,7 +14,7 @@ use crate::{
 };
 
 impl ScenarioWorld {
-    pub fn check_state_account<A>(&mut self, address: A) -> CheckStateBuilder<'_>
+    pub fn check_account<A>(&mut self, address: A) -> CheckStateBuilder<'_>
     where
         AddressKey: From<A>,
     {
@@ -42,7 +42,7 @@ impl<'w> CheckStateBuilder<'w> {
     }
 
     /// Starts building of a new account.
-    pub fn check_state_account<A>(mut self, address_expr: A) -> Self
+    pub fn check_account<A>(mut self, address_expr: A) -> Self
     where
         AddressKey: From<A>,
     {

From a372df542b3922ae98d6a00599571b35b1417981 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 18 Apr 2024 12:03:40 +0300
Subject: [PATCH 0732/1254] set state - refactor

---
 framework/scenario/src/facade/world_tx.rs     |   1 +
 .../src/facade/world_tx/scenario_set_state.rs | 256 ++++--------------
 .../world_tx/scenario_set_state_account.rs    | 173 ++++++++++++
 3 files changed, 234 insertions(+), 196 deletions(-)
 create mode 100644 framework/scenario/src/facade/world_tx/scenario_set_state_account.rs

diff --git a/framework/scenario/src/facade/world_tx.rs b/framework/scenario/src/facade/world_tx.rs
index b0a694afbf..236a9b95b6 100644
--- a/framework/scenario/src/facade/world_tx.rs
+++ b/framework/scenario/src/facade/world_tx.rs
@@ -6,6 +6,7 @@ mod scenario_query_call;
 mod scenario_rh_impl;
 mod scenario_set_state;
 mod scenario_tx_env;
+mod scenario_set_state_account;
 
 pub use scenario_exec_call::ScenarioEnvExec;
 pub use scenario_query_call::ScenarioEnvQuery;
diff --git a/framework/scenario/src/facade/world_tx/scenario_set_state.rs b/framework/scenario/src/facade/world_tx/scenario_set_state.rs
index e59ca32ba6..3cfee4b9cc 100644
--- a/framework/scenario/src/facade/world_tx/scenario_set_state.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_set_state.rs
@@ -1,22 +1,22 @@
-use std::collections::btree_map::Entry;
-
 use crate::{
     scenario::ScenarioRunner,
-    scenario_model::{
-        Account, AddressKey, AddressValue, BigUintValue, BytesKey, BytesValue, Esdt, EsdtObject,
-        SetStateStep, U64Value,
-    },
+    scenario_model::{Account, AddressKey, SetStateStep},
     ScenarioWorld,
 };
 
-use super::block_info_builder::BlockInfoBuilder;
+use super::{block_info_builder::BlockInfoBuilder, scenario_set_state_account::CurrentAccount};
 
 impl ScenarioWorld {
-    pub fn account<A>(&mut self, address_expr: A) -> SetStateBuilder<'_>
+    pub fn account<A>(&mut self, address_expr: A) -> SetStateBuilder<'_, CurrentAccount>
     where
         AddressKey: From<A>,
     {
-        SetStateBuilder::new(self, address_expr.into())
+        let base = SetStateBuilderBase::new(self);
+        let item = base.start_account(address_expr.into());
+        SetStateBuilder {
+            base: Some(base),
+            item,
+        }
     }
 
     pub fn block_info(&mut self) -> BlockInfoBuilder<'_> {
@@ -24,36 +24,36 @@ impl ScenarioWorld {
     }
 }
 
-pub struct SetStateBuilder<'w> {
-    world: &'w mut ScenarioWorld,
-    set_state_step: SetStateStep,
-    current_account: Account,
-    current_address: AddressKey,
+pub trait SetStateBuilderItem {
+    fn commit_to_step(&mut self, step: &mut SetStateStep);
 }
 
-impl<'w> SetStateBuilder<'w> {
-    pub(crate) fn new(world: &'w mut ScenarioWorld, address: AddressKey) -> SetStateBuilder<'w> {
-        let mut builder = SetStateBuilder {
+impl SetStateBuilderItem for () {
+    fn commit_to_step(&mut self, _step: &mut SetStateStep) {}
+}
+
+pub(crate) struct SetStateBuilderBase<'w> {
+    pub(crate) world: &'w mut ScenarioWorld,
+    pub(crate) set_state_step: SetStateStep,
+}
+
+pub struct SetStateBuilder<'w, Current>
+where
+    Current: SetStateBuilderItem,
+{
+    pub(crate) base: Option<SetStateBuilderBase<'w>>,
+    pub(crate) item: Current,
+}
+
+impl<'w> SetStateBuilderBase<'w> {
+    fn new(world: &'w mut ScenarioWorld) -> Self {
+        SetStateBuilderBase {
             world,
             set_state_step: SetStateStep::new(),
-            current_address: AddressKey::default(),
-            current_account: Account::new(),
-        };
-        builder.reset_account(address);
-        builder
-    }
-
-    fn add_current_acount(&mut self) {
-        if let Entry::Vacant(entry) = self
-            .set_state_step
-            .accounts
-            .entry(core::mem::take(&mut self.current_address))
-        {
-            entry.insert(core::mem::take(&mut self.current_account));
-        };
+        }
     }
 
-    fn reset_account(&mut self, address: AddressKey) {
+    fn start_account(&self, address: AddressKey) -> CurrentAccount {
         assert!(
             !self
                 .world
@@ -65,181 +65,45 @@ impl<'w> SetStateBuilder<'w> {
             "updating existing accounts currently not supported"
         );
 
-        self.current_address = address;
-        self.current_account = Account::default();
+        CurrentAccount {
+            address,
+            account: Account::default(),
+        }
     }
+}
+
+impl<'w> SetStateBuilder<'w, ()> {}
 
+impl<'w, Item> SetStateBuilder<'w, Item>
+where
+    Item: SetStateBuilderItem,
+{
     /// Starts building of a new account.
-    pub fn account<A>(mut self, address_expr: A) -> Self
+    pub fn account<A>(mut self, address_expr: A) -> SetStateBuilder<'w, CurrentAccount>
     where
         AddressKey: From<A>,
     {
-        self.add_current_acount();
-        self.reset_account(address_expr.into());
-        self
-    }
-
-    /// Finished and sets all account in the blockchain mock.
-    fn commit_accounts(&mut self) {
-        self.add_current_acount();
-        self.world.run_set_state_step(&self.set_state_step);
+        let mut base = core::mem::take(&mut self.base).unwrap();
+        self.item.commit_to_step(&mut base.set_state_step);
+        let item = base.start_account(address_expr.into());
+        SetStateBuilder {
+            base: Some(base),
+            item,
+        }
     }
 
     /// Forces value drop and commit accounts.
     pub fn commit(self) {}
-
-    pub fn nonce<V>(mut self, nonce: V) -> Self
-    where
-        U64Value: From<V>,
-    {
-        self.current_account.nonce = Some(U64Value::from(nonce));
-        self
-    }
-
-    pub fn balance<V>(mut self, balance_expr: V) -> Self
-    where
-        BigUintValue: From<V>,
-    {
-        self.current_account.balance = Some(BigUintValue::from(balance_expr));
-        self
-    }
-
-    pub fn esdt_balance<K, V>(mut self, token_id_expr: K, balance_expr: V) -> Self
-    where
-        BytesKey: From<K>,
-        BigUintValue: From<V>,
-    {
-        let token_id = BytesKey::from(token_id_expr);
-        let esdt_data_ref = self.get_esdt_data_or_create(&token_id);
-        esdt_data_ref.set_balance(0u64, balance_expr);
-
-        self
-    }
-
-    pub fn esdt_nft_balance<K, N, V, T>(
-        mut self,
-        token_id_expr: K,
-        nonce_expr: N,
-        balance_expr: V,
-        opt_attributes_expr: Option<T>,
-    ) -> Self
-    where
-        N: Clone,
-        BytesKey: From<K>,
-        U64Value: From<N>,
-        BigUintValue: From<V>,
-        BytesValue: From<T>,
-    {
-        let token_id = BytesKey::from(token_id_expr);
-
-        let esdt_obj_ref = self
-            .get_esdt_data_or_create(&token_id)
-            .get_mut_esdt_object();
-        esdt_obj_ref.set_balance(nonce_expr.clone(), balance_expr);
-
-        if let Some(attributes_expr) = opt_attributes_expr {
-            esdt_obj_ref.set_token_attributes(nonce_expr, attributes_expr);
-        }
-
-        self
-    }
-
-    #[allow(clippy::too_many_arguments)]
-    pub fn esdt_nft_all_properties<K, N, V, T>(
-        mut self,
-        token_id_expr: K,
-        nonce_expr: N,
-        balance_expr: V,
-        opt_attributes_expr: Option<T>,
-        royalties_expr: N,
-        creator_expr: Option<T>,
-        hash_expr: Option<T>,
-        uris_expr: Vec<T>,
-    ) -> Self
-    where
-        BytesKey: From<K>,
-        U64Value: From<N>,
-        BigUintValue: From<V>,
-        BytesValue: From<T>,
-    {
-        let token_id = BytesKey::from(token_id_expr);
-
-        let esdt_obj_ref = self
-            .get_esdt_data_or_create(&token_id)
-            .get_mut_esdt_object();
-
-        esdt_obj_ref.set_token_all_properties(
-            nonce_expr,
-            balance_expr,
-            opt_attributes_expr,
-            royalties_expr,
-            creator_expr,
-            hash_expr,
-            uris_expr,
-        );
-
-        self
-    }
-
-    pub fn esdt_nft_last_nonce<K, N>(mut self, token_id_expr: K, last_nonce_expr: N) -> Self
-    where
-        BytesKey: From<K>,
-        U64Value: From<N>,
-    {
-        let token_id = BytesKey::from(token_id_expr);
-
-        let esdt_obj_ref = self
-            .get_esdt_data_or_create(&token_id)
-            .get_mut_esdt_object();
-        esdt_obj_ref.set_last_nonce(last_nonce_expr);
-
-        self
-    }
-
-    // TODO: Find a better way to pass roles
-    pub fn esdt_roles<K>(mut self, token_id_expr: K, roles: Vec<String>) -> Self
-    where
-        BytesKey: From<K>,
-    {
-        let token_id = BytesKey::from(token_id_expr);
-
-        let esdt_obj_ref = self
-            .get_esdt_data_or_create(&token_id)
-            .get_mut_esdt_object();
-        esdt_obj_ref.set_roles(roles);
-
-        self
-    }
-
-    fn get_esdt_data_or_create(&mut self, token_id: &BytesKey) -> &mut Esdt {
-        if !self.current_account.esdt.contains_key(token_id) {
-            self.current_account
-                .esdt
-                .insert(token_id.clone(), Esdt::Full(EsdtObject::default()));
-        }
-
-        self.current_account.esdt.get_mut(token_id).unwrap()
-    }
-
-    pub fn code<V>(mut self, code_expr: V) -> Self
-    where
-        BytesValue: From<V>,
-    {
-        self.current_account.code = Some(BytesValue::from(code_expr));
-        self
-    }
-
-    pub fn owner<V>(mut self, owner_expr: V) -> Self
-    where
-        AddressValue: From<V>,
-    {
-        self.current_account.owner = Some(AddressValue::from(owner_expr));
-        self
-    }
 }
 
-impl<'w> Drop for SetStateBuilder<'w> {
+impl<'w, Current> Drop for SetStateBuilder<'w, Current>
+where
+    Current: SetStateBuilderItem,
+{
     fn drop(&mut self) {
-        self.commit_accounts();
+        if let Some(base) = &mut self.base {
+            self.item.commit_to_step(&mut base.set_state_step);
+            base.world.run_set_state_step(&base.set_state_step);
+        }
     }
 }
diff --git a/framework/scenario/src/facade/world_tx/scenario_set_state_account.rs b/framework/scenario/src/facade/world_tx/scenario_set_state_account.rs
new file mode 100644
index 0000000000..4dc49fd116
--- /dev/null
+++ b/framework/scenario/src/facade/world_tx/scenario_set_state_account.rs
@@ -0,0 +1,173 @@
+use std::collections::btree_map::Entry;
+
+use crate::scenario_model::{
+    Account, AddressKey, AddressValue, BigUintValue, BytesKey, BytesValue, Esdt, EsdtObject,
+    SetStateStep, U64Value,
+};
+
+use super::scenario_set_state::{SetStateBuilder, SetStateBuilderItem};
+
+pub struct CurrentAccount {
+    pub(crate) address: AddressKey,
+    pub(crate) account: Account,
+}
+
+impl SetStateBuilderItem for CurrentAccount {
+    fn commit_to_step(&mut self, step: &mut SetStateStep) {
+        if let Entry::Vacant(entry) = step.accounts.entry(core::mem::take(&mut self.address)) {
+            entry.insert(core::mem::take(&mut self.account));
+        };
+    }
+}
+
+impl<'w> SetStateBuilder<'w, CurrentAccount> {
+    pub fn nonce<V>(mut self, nonce: V) -> Self
+    where
+        U64Value: From<V>,
+    {
+        self.item.account.nonce = Some(U64Value::from(nonce));
+        self
+    }
+
+    pub fn balance<V>(mut self, balance_expr: V) -> Self
+    where
+        BigUintValue: From<V>,
+    {
+        self.item.account.balance = Some(BigUintValue::from(balance_expr));
+        self
+    }
+
+    pub fn esdt_balance<K, V>(mut self, token_id_expr: K, balance_expr: V) -> Self
+    where
+        BytesKey: From<K>,
+        BigUintValue: From<V>,
+    {
+        let token_id = BytesKey::from(token_id_expr);
+        let esdt_data_ref = self.get_esdt_data_or_create(&token_id);
+        esdt_data_ref.set_balance(0u64, balance_expr);
+
+        self
+    }
+
+    pub fn esdt_nft_balance<K, N, V, T>(
+        mut self,
+        token_id_expr: K,
+        nonce_expr: N,
+        balance_expr: V,
+        opt_attributes_expr: Option<T>,
+    ) -> Self
+    where
+        N: Clone,
+        BytesKey: From<K>,
+        U64Value: From<N>,
+        BigUintValue: From<V>,
+        BytesValue: From<T>,
+    {
+        let token_id = BytesKey::from(token_id_expr);
+
+        let esdt_obj_ref = self
+            .get_esdt_data_or_create(&token_id)
+            .get_mut_esdt_object();
+        esdt_obj_ref.set_balance(nonce_expr.clone(), balance_expr);
+
+        if let Some(attributes_expr) = opt_attributes_expr {
+            esdt_obj_ref.set_token_attributes(nonce_expr, attributes_expr);
+        }
+
+        self
+    }
+
+    #[allow(clippy::too_many_arguments)]
+    pub fn esdt_nft_all_properties<K, N, V, T>(
+        mut self,
+        token_id_expr: K,
+        nonce_expr: N,
+        balance_expr: V,
+        opt_attributes_expr: Option<T>,
+        royalties_expr: N,
+        creator_expr: Option<T>,
+        hash_expr: Option<T>,
+        uris_expr: Vec<T>,
+    ) -> Self
+    where
+        BytesKey: From<K>,
+        U64Value: From<N>,
+        BigUintValue: From<V>,
+        BytesValue: From<T>,
+    {
+        let token_id = BytesKey::from(token_id_expr);
+
+        let esdt_obj_ref = self
+            .get_esdt_data_or_create(&token_id)
+            .get_mut_esdt_object();
+
+        esdt_obj_ref.set_token_all_properties(
+            nonce_expr,
+            balance_expr,
+            opt_attributes_expr,
+            royalties_expr,
+            creator_expr,
+            hash_expr,
+            uris_expr,
+        );
+
+        self
+    }
+
+    pub fn esdt_nft_last_nonce<K, N>(mut self, token_id_expr: K, last_nonce_expr: N) -> Self
+    where
+        BytesKey: From<K>,
+        U64Value: From<N>,
+    {
+        let token_id = BytesKey::from(token_id_expr);
+
+        let esdt_obj_ref = self
+            .get_esdt_data_or_create(&token_id)
+            .get_mut_esdt_object();
+        esdt_obj_ref.set_last_nonce(last_nonce_expr);
+
+        self
+    }
+
+    // TODO: Find a better way to pass roles
+    pub fn esdt_roles<K>(mut self, token_id_expr: K, roles: Vec<String>) -> Self
+    where
+        BytesKey: From<K>,
+    {
+        let token_id = BytesKey::from(token_id_expr);
+
+        let esdt_obj_ref = self
+            .get_esdt_data_or_create(&token_id)
+            .get_mut_esdt_object();
+        esdt_obj_ref.set_roles(roles);
+
+        self
+    }
+
+    fn get_esdt_data_or_create(&mut self, token_id: &BytesKey) -> &mut Esdt {
+        if !self.item.account.esdt.contains_key(token_id) {
+            self.item
+                .account
+                .esdt
+                .insert(token_id.clone(), Esdt::Full(EsdtObject::default()));
+        }
+
+        self.item.account.esdt.get_mut(token_id).unwrap()
+    }
+
+    pub fn code<V>(mut self, code_expr: V) -> Self
+    where
+        BytesValue: From<V>,
+    {
+        self.item.account.code = Some(BytesValue::from(code_expr));
+        self
+    }
+
+    pub fn owner<V>(mut self, owner_expr: V) -> Self
+    where
+        AddressValue: From<V>,
+    {
+        self.item.account.owner = Some(AddressValue::from(owner_expr));
+        self
+    }
+}

From cc1d2156d778e0f7b95d2eb4ee353750fc20a4fa Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Thu, 18 Apr 2024 13:06:28 +0300
Subject: [PATCH 0733/1254] check tx - fix expect message when status is empty

---
 .../panic-message-features/tests/pmf_blackbox_test.rs       | 2 +-
 .../scenario/src/facade/result_handlers/expect_message.rs   | 6 +++++-
 framework/scenario/src/scenario/model/value/value_check.rs  | 4 ++++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/contracts/feature-tests/panic-message-features/tests/pmf_blackbox_test.rs b/contracts/feature-tests/panic-message-features/tests/pmf_blackbox_test.rs
index 28499c0e84..371bf0aeb3 100644
--- a/contracts/feature-tests/panic-message-features/tests/pmf_blackbox_test.rs
+++ b/contracts/feature-tests/panic-message-features/tests/pmf_blackbox_test.rs
@@ -73,9 +73,9 @@ fn tx_expect_error_test() {
         .to(SC_PMF)
         .typed(pmf_proxy::PanicMessageFeaturesProxy)
         .sc_panic()
-        .with_result(ExpectStatus(4))
         .with_result(ExpectMessage("sc_panic! test"))
         .with_result(ExpectError(4, "sc_panic! test"))
+        .with_result(ExpectStatus(4))
         .run();
 }
 
diff --git a/framework/scenario/src/facade/result_handlers/expect_message.rs b/framework/scenario/src/facade/result_handlers/expect_message.rs
index 4f46d05b59..af5fa2a429 100644
--- a/framework/scenario/src/facade/result_handlers/expect_message.rs
+++ b/framework/scenario/src/facade/result_handlers/expect_message.rs
@@ -1,7 +1,7 @@
 use multiversx_chain_scenario_format::serde_raw::ValueSubTree;
 use multiversx_sc::types::{RHListItem, RHListItemExec, TxEnv};
 
-use crate::scenario_model::{BytesValue, CheckValue, TxExpect, TxResponse};
+use crate::scenario_model::{BytesValue, CheckValue, TxExpect, TxResponse, U64Value};
 
 /// Verifies that transaction result message matches the given one.
 ///
@@ -20,6 +20,10 @@ where
     Env: TxEnv<RHExpect = TxExpect>,
 {
     fn item_tx_expect(&self, mut prev: TxExpect) -> TxExpect {
+        if prev.status.is_equal_to(U64Value::empty()) {
+            prev.status = CheckValue::Star;
+        }
+
         let expect_message_expr = BytesValue {
             value: self.0.to_string().into_bytes(),
             original: ValueSubTree::Str(format!("str:{}", self.0)),
diff --git a/framework/scenario/src/scenario/model/value/value_check.rs b/framework/scenario/src/scenario/model/value/value_check.rs
index 5299aa9e1b..9091f73594 100644
--- a/framework/scenario/src/scenario/model/value/value_check.rs
+++ b/framework/scenario/src/scenario/model/value/value_check.rs
@@ -21,6 +21,10 @@ where
     pub fn is_star(&self) -> bool {
         matches!(self, CheckValue::Star)
     }
+
+    pub fn is_equal_to(&self, _value: T) -> bool {
+        matches!(self, CheckValue::Equal(_value))
+    }
 }
 
 impl<T> InterpretableFrom<CheckBytesValueRaw> for CheckValue<T>

From 7c291a5961577788fcf223bfd02e0102ba8e4f2e Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 18 Apr 2024 18:55:29 +0300
Subject: [PATCH 0734/1254] set state - integrated block info

---
 framework/scenario/src/facade/world_tx.rs     |   2 +-
 .../src/facade/world_tx/block_info_builder.rs | 132 ++++++------------
 .../src/facade/world_tx/scenario_set_state.rs |  16 ++-
 3 files changed, 55 insertions(+), 95 deletions(-)

diff --git a/framework/scenario/src/facade/world_tx.rs b/framework/scenario/src/facade/world_tx.rs
index 236a9b95b6..9d805cb30d 100644
--- a/framework/scenario/src/facade/world_tx.rs
+++ b/framework/scenario/src/facade/world_tx.rs
@@ -5,8 +5,8 @@ mod scenario_exec_deploy;
 mod scenario_query_call;
 mod scenario_rh_impl;
 mod scenario_set_state;
-mod scenario_tx_env;
 mod scenario_set_state_account;
+mod scenario_tx_env;
 
 pub use scenario_exec_call::ScenarioEnvExec;
 pub use scenario_query_call::ScenarioEnvQuery;
diff --git a/framework/scenario/src/facade/world_tx/block_info_builder.rs b/framework/scenario/src/facade/world_tx/block_info_builder.rs
index 0defeb61d9..91ac2a0620 100644
--- a/framework/scenario/src/facade/world_tx/block_info_builder.rs
+++ b/framework/scenario/src/facade/world_tx/block_info_builder.rs
@@ -1,49 +1,55 @@
-use crate::{
-    scenario::ScenarioRunner,
-    scenario_model::{BlockInfo, BytesValue, SetStateStep, U64Value},
-    ScenarioWorld,
-};
-
-pub struct BlockInfoBuilder<'w> {
-    world: &'w mut ScenarioWorld,
-    set_state_step: SetStateStep,
-    current_block: BlockInfo,
-    previous_block: BlockInfo,
+use crate::scenario_model::{BlockInfo, BytesValue, SetStateStep, U64Value};
+
+use super::scenario_set_state::{SetStateBuilder, SetStateBuilderItem};
+
+pub enum BlockInfoTarget {
+    Current,
+    Previous,
+}
+
+pub struct BlockItem {
+    target: BlockInfoTarget,
+    block_info: BlockInfo,
 }
 
-impl<'w> BlockInfoBuilder<'w> {
-    pub(crate) fn new(world: &'w mut ScenarioWorld) -> BlockInfoBuilder<'w> {
-        BlockInfoBuilder {
-            world,
-            set_state_step: SetStateStep::new(),
-            current_block: BlockInfo::default(),
-            previous_block: BlockInfo::default(),
+impl BlockItem {
+    pub fn new_current() -> Self {
+        BlockItem {
+            target: BlockInfoTarget::Current,
+            block_info: BlockInfo::default(),
         }
     }
 
-    // Forces value drop and commit block info.
-    pub fn commit(self) {}
-
-    /// Finished and sets all account in the blockchain mock.
-    fn commit_block_info(&mut self) {
-        self.add_current_block_info();
-        self.world.run_set_state_step(&self.set_state_step);
+    pub fn new_prev() -> Self {
+        BlockItem {
+            target: BlockInfoTarget::Previous,
+            block_info: BlockInfo::default(),
+        }
     }
+}
 
-    fn add_current_block_info(&mut self) {
-        self.set_state_step.previous_block_info =
-            Box::new(Some(core::mem::take(&mut self.previous_block)));
-        self.set_state_step.current_block_info =
-            Box::new(Some(core::mem::take(&mut self.current_block)));
+impl SetStateBuilderItem for BlockItem {
+    fn commit_to_step(&mut self, step: &mut SetStateStep) {
+        let block_info = core::mem::take(&mut self.block_info);
+        match self.target {
+            BlockInfoTarget::Current => {
+                step.current_block_info = Box::new(Some(block_info));
+            },
+            BlockInfoTarget::Previous => {
+                step.previous_block_info = Box::new(Some(block_info));
+            },
+        }
     }
+}
 
+impl<'w> SetStateBuilder<'w, BlockItem> {
     pub fn block_epoch<N>(mut self, block_epoch_expr: N) -> Self
     where
         U64Value: From<N>,
     {
         let block_epoch = U64Value::from(block_epoch_expr);
 
-        self.current_block.block_epoch = Some(block_epoch);
+        self.item.block_info.block_epoch = Some(block_epoch);
         self
     }
 
@@ -53,7 +59,7 @@ impl<'w> BlockInfoBuilder<'w> {
     {
         let block_nonce = U64Value::from(block_nonce_expr);
 
-        self.current_block.block_nonce = Some(block_nonce);
+        self.item.block_info.block_nonce = Some(block_nonce);
         self
     }
 
@@ -63,7 +69,7 @@ impl<'w> BlockInfoBuilder<'w> {
     {
         let block_round = U64Value::from(block_round_expr);
 
-        self.current_block.block_round = Some(block_round);
+        self.item.block_info.block_round = Some(block_round);
         self
     }
 
@@ -73,7 +79,7 @@ impl<'w> BlockInfoBuilder<'w> {
     {
         let block_timestamp = U64Value::from(block_timestamp_expr);
 
-        self.current_block.block_timestamp = Some(block_timestamp);
+        self.item.block_info.block_timestamp = Some(block_timestamp);
         self
     }
 
@@ -83,63 +89,7 @@ impl<'w> BlockInfoBuilder<'w> {
     {
         let block_random_seed = BytesValue::from(block_random_seed_expr);
 
-        self.current_block.block_random_seed = Some(block_random_seed);
-        self
-    }
-
-    pub fn prev_block_epoch<N>(mut self, block_epoch_expr: N) -> Self
-    where
-        U64Value: From<N>,
-    {
-        let prev_block_epoch = U64Value::from(block_epoch_expr);
-
-        self.previous_block.block_epoch = Some(prev_block_epoch);
-        self
-    }
-
-    pub fn prev_block_nonce<N>(mut self, block_nonce_expr: N) -> Self
-    where
-        U64Value: From<N>,
-    {
-        let prev_block_nonce = U64Value::from(block_nonce_expr);
-
-        self.previous_block.block_nonce = Some(prev_block_nonce);
+        self.item.block_info.block_random_seed = Some(block_random_seed);
         self
     }
-
-    pub fn prev_block_round<N>(mut self, block_round_expr: N) -> Self
-    where
-        U64Value: From<N>,
-    {
-        let prev_block_round = U64Value::from(block_round_expr);
-
-        self.previous_block.block_round = Some(prev_block_round);
-        self
-    }
-
-    pub fn prev_block_timestamp<N>(mut self, block_timestamp_expr: N) -> Self
-    where
-        U64Value: From<N>,
-    {
-        let prev_block_timestamp = U64Value::from(block_timestamp_expr);
-
-        self.previous_block.block_timestamp = Some(prev_block_timestamp);
-        self
-    }
-
-    pub fn prev_block_random_seed<B>(mut self, block_random_seed_expr: B) -> Self
-    where
-        BytesValue: From<B>,
-    {
-        let prev_block_random_seed = BytesValue::from(block_random_seed_expr);
-
-        self.previous_block.block_random_seed = Some(prev_block_random_seed);
-        self
-    }
-}
-
-impl Drop for BlockInfoBuilder<'_> {
-    fn drop(&mut self) {
-        self.commit_block_info();
-    }
 }
diff --git a/framework/scenario/src/facade/world_tx/scenario_set_state.rs b/framework/scenario/src/facade/world_tx/scenario_set_state.rs
index 3cfee4b9cc..b1df67bbf5 100644
--- a/framework/scenario/src/facade/world_tx/scenario_set_state.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_set_state.rs
@@ -4,7 +4,7 @@ use crate::{
     ScenarioWorld,
 };
 
-use super::{block_info_builder::BlockInfoBuilder, scenario_set_state_account::CurrentAccount};
+use super::{block_info_builder::BlockItem, scenario_set_state_account::CurrentAccount};
 
 impl ScenarioWorld {
     pub fn account<A>(&mut self, address_expr: A) -> SetStateBuilder<'_, CurrentAccount>
@@ -19,8 +19,18 @@ impl ScenarioWorld {
         }
     }
 
-    pub fn block_info(&mut self) -> BlockInfoBuilder<'_> {
-        BlockInfoBuilder::new(self)
+    pub fn current_block(&mut self) -> SetStateBuilder<'_, BlockItem> {
+        SetStateBuilder {
+            base: Some(SetStateBuilderBase::new(self)),
+            item: BlockItem::new_current(),
+        }
+    }
+
+    pub fn previous_block(&mut self) -> SetStateBuilder<'_, BlockItem> {
+        SetStateBuilder {
+            base: Some(SetStateBuilderBase::new(self)),
+            item: BlockItem::new_current(),
+        }
     }
 }
 

From 27861624f53d69e94c6e8c29d5358131d2184333 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 18 Apr 2024 19:03:37 +0300
Subject: [PATCH 0735/1254] set state - refactor

---
 framework/scenario/src/facade/world_tx.rs     |  2 --
 .../src/facade/world_tx/scenario_set_state.rs | 19 +++++++++--------
 .../scenario_set_account.rs}                  | 21 +++++++++++++------
 .../scenario_set_block.rs}                    | 14 ++++++-------
 4 files changed, 32 insertions(+), 24 deletions(-)
 rename framework/scenario/src/facade/world_tx/{scenario_set_state_account.rs => scenario_set_state/scenario_set_account.rs} (92%)
 rename framework/scenario/src/facade/world_tx/{block_info_builder.rs => scenario_set_state/scenario_set_block.rs} (87%)

diff --git a/framework/scenario/src/facade/world_tx.rs b/framework/scenario/src/facade/world_tx.rs
index 9d805cb30d..a2d7373a42 100644
--- a/framework/scenario/src/facade/world_tx.rs
+++ b/framework/scenario/src/facade/world_tx.rs
@@ -1,11 +1,9 @@
-mod block_info_builder;
 mod scenario_check_state;
 mod scenario_exec_call;
 mod scenario_exec_deploy;
 mod scenario_query_call;
 mod scenario_rh_impl;
 mod scenario_set_state;
-mod scenario_set_state_account;
 mod scenario_tx_env;
 
 pub use scenario_exec_call::ScenarioEnvExec;
diff --git a/framework/scenario/src/facade/world_tx/scenario_set_state.rs b/framework/scenario/src/facade/world_tx/scenario_set_state.rs
index b1df67bbf5..cc5874d0de 100644
--- a/framework/scenario/src/facade/world_tx/scenario_set_state.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_set_state.rs
@@ -1,13 +1,17 @@
+mod scenario_set_account;
+mod scenario_set_block;
+
 use crate::{
     scenario::ScenarioRunner,
-    scenario_model::{Account, AddressKey, SetStateStep},
+    scenario_model::{AddressKey, SetStateStep},
     ScenarioWorld,
 };
 
-use super::{block_info_builder::BlockItem, scenario_set_state_account::CurrentAccount};
+use scenario_set_account::AccountItem;
+use scenario_set_block::BlockItem;
 
 impl ScenarioWorld {
-    pub fn account<A>(&mut self, address_expr: A) -> SetStateBuilder<'_, CurrentAccount>
+    pub fn account<A>(&mut self, address_expr: A) -> SetStateBuilder<'_, AccountItem>
     where
         AddressKey: From<A>,
     {
@@ -63,7 +67,7 @@ impl<'w> SetStateBuilderBase<'w> {
         }
     }
 
-    fn start_account(&self, address: AddressKey) -> CurrentAccount {
+    fn start_account(&self, address: AddressKey) -> AccountItem {
         assert!(
             !self
                 .world
@@ -75,10 +79,7 @@ impl<'w> SetStateBuilderBase<'w> {
             "updating existing accounts currently not supported"
         );
 
-        CurrentAccount {
-            address,
-            account: Account::default(),
-        }
+        AccountItem::new(address)
     }
 }
 
@@ -89,7 +90,7 @@ where
     Item: SetStateBuilderItem,
 {
     /// Starts building of a new account.
-    pub fn account<A>(mut self, address_expr: A) -> SetStateBuilder<'w, CurrentAccount>
+    pub fn account<A>(mut self, address_expr: A) -> SetStateBuilder<'w, AccountItem>
     where
         AddressKey: From<A>,
     {
diff --git a/framework/scenario/src/facade/world_tx/scenario_set_state_account.rs b/framework/scenario/src/facade/world_tx/scenario_set_state/scenario_set_account.rs
similarity index 92%
rename from framework/scenario/src/facade/world_tx/scenario_set_state_account.rs
rename to framework/scenario/src/facade/world_tx/scenario_set_state/scenario_set_account.rs
index 4dc49fd116..d985cbed66 100644
--- a/framework/scenario/src/facade/world_tx/scenario_set_state_account.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_set_state/scenario_set_account.rs
@@ -5,14 +5,23 @@ use crate::scenario_model::{
     SetStateStep, U64Value,
 };
 
-use super::scenario_set_state::{SetStateBuilder, SetStateBuilderItem};
+use super::{SetStateBuilder, SetStateBuilderItem};
 
-pub struct CurrentAccount {
-    pub(crate) address: AddressKey,
-    pub(crate) account: Account,
+pub struct AccountItem {
+    address: AddressKey,
+    account: Account,
 }
 
-impl SetStateBuilderItem for CurrentAccount {
+impl AccountItem {
+    pub fn new(address: AddressKey) -> Self {
+        AccountItem {
+            address,
+            account: Account::default(),
+        }
+    }
+}
+
+impl SetStateBuilderItem for AccountItem {
     fn commit_to_step(&mut self, step: &mut SetStateStep) {
         if let Entry::Vacant(entry) = step.accounts.entry(core::mem::take(&mut self.address)) {
             entry.insert(core::mem::take(&mut self.account));
@@ -20,7 +29,7 @@ impl SetStateBuilderItem for CurrentAccount {
     }
 }
 
-impl<'w> SetStateBuilder<'w, CurrentAccount> {
+impl<'w> SetStateBuilder<'w, AccountItem> {
     pub fn nonce<V>(mut self, nonce: V) -> Self
     where
         U64Value: From<V>,
diff --git a/framework/scenario/src/facade/world_tx/block_info_builder.rs b/framework/scenario/src/facade/world_tx/scenario_set_state/scenario_set_block.rs
similarity index 87%
rename from framework/scenario/src/facade/world_tx/block_info_builder.rs
rename to framework/scenario/src/facade/world_tx/scenario_set_state/scenario_set_block.rs
index 91ac2a0620..9b487859e4 100644
--- a/framework/scenario/src/facade/world_tx/block_info_builder.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_set_state/scenario_set_block.rs
@@ -1,28 +1,28 @@
 use crate::scenario_model::{BlockInfo, BytesValue, SetStateStep, U64Value};
 
-use super::scenario_set_state::{SetStateBuilder, SetStateBuilderItem};
+use super::{SetStateBuilder, SetStateBuilderItem};
 
-pub enum BlockInfoTarget {
+pub enum BlockItemTarget {
     Current,
     Previous,
 }
 
 pub struct BlockItem {
-    target: BlockInfoTarget,
+    target: BlockItemTarget,
     block_info: BlockInfo,
 }
 
 impl BlockItem {
     pub fn new_current() -> Self {
         BlockItem {
-            target: BlockInfoTarget::Current,
+            target: BlockItemTarget::Current,
             block_info: BlockInfo::default(),
         }
     }
 
     pub fn new_prev() -> Self {
         BlockItem {
-            target: BlockInfoTarget::Previous,
+            target: BlockItemTarget::Previous,
             block_info: BlockInfo::default(),
         }
     }
@@ -32,10 +32,10 @@ impl SetStateBuilderItem for BlockItem {
     fn commit_to_step(&mut self, step: &mut SetStateStep) {
         let block_info = core::mem::take(&mut self.block_info);
         match self.target {
-            BlockInfoTarget::Current => {
+            BlockItemTarget::Current => {
                 step.current_block_info = Box::new(Some(block_info));
             },
-            BlockInfoTarget::Previous => {
+            BlockItemTarget::Previous => {
                 step.previous_block_info = Box::new(Some(block_info));
             },
         }

From f20cb3b91d45aee63741c21953cab2c46b74f6bd Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 18 Apr 2024 19:19:49 +0300
Subject: [PATCH 0736/1254] set state - refactor

---
 .../src/facade/world_tx/scenario_set_state.rs | 42 ++++++++++++-------
 1 file changed, 28 insertions(+), 14 deletions(-)

diff --git a/framework/scenario/src/facade/world_tx/scenario_set_state.rs b/framework/scenario/src/facade/world_tx/scenario_set_state.rs
index cc5874d0de..30de24fbc2 100644
--- a/framework/scenario/src/facade/world_tx/scenario_set_state.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_set_state.rs
@@ -11,30 +11,26 @@ use scenario_set_account::AccountItem;
 use scenario_set_block::BlockItem;
 
 impl ScenarioWorld {
+    fn empty_builder(&mut self) -> SetStateBuilder<'_, ()> {
+        SetStateBuilder {
+            base: Some(SetStateBuilderBase::new(self)),
+            item: (),
+        }
+    }
+
     pub fn account<A>(&mut self, address_expr: A) -> SetStateBuilder<'_, AccountItem>
     where
         AddressKey: From<A>,
     {
-        let base = SetStateBuilderBase::new(self);
-        let item = base.start_account(address_expr.into());
-        SetStateBuilder {
-            base: Some(base),
-            item,
-        }
+        self.empty_builder().account(address_expr)
     }
 
     pub fn current_block(&mut self) -> SetStateBuilder<'_, BlockItem> {
-        SetStateBuilder {
-            base: Some(SetStateBuilderBase::new(self)),
-            item: BlockItem::new_current(),
-        }
+        self.empty_builder().current_block()
     }
 
     pub fn previous_block(&mut self) -> SetStateBuilder<'_, BlockItem> {
-        SetStateBuilder {
-            base: Some(SetStateBuilderBase::new(self)),
-            item: BlockItem::new_current(),
-        }
+        self.empty_builder().previous_block()
     }
 }
 
@@ -103,6 +99,24 @@ where
         }
     }
 
+    pub fn current_block(&mut self) -> SetStateBuilder<'w, BlockItem> {
+        let mut base = core::mem::take(&mut self.base).unwrap();
+        self.item.commit_to_step(&mut base.set_state_step);
+        SetStateBuilder {
+            base: Some(base),
+            item: BlockItem::new_current(),
+        }
+    }
+
+    pub fn previous_block(&mut self) -> SetStateBuilder<'w, BlockItem> {
+        let mut base = core::mem::take(&mut self.base).unwrap();
+        self.item.commit_to_step(&mut base.set_state_step);
+        SetStateBuilder {
+            base: Some(base),
+            item: BlockItem::new_prev(),
+        }
+    }
+
     /// Forces value drop and commit accounts.
     pub fn commit(self) {}
 }

From 618854a2a5b36d88bccb1b1195a5bed9b5bc5897 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 18 Apr 2024 19:34:42 +0300
Subject: [PATCH 0737/1254] set state - new address

---
 .../adder/tests/adder_blackbox_test.rs        |  2 +-
 .../tests/crowdfunding_esdt_blackbox_test.rs  |  4 +-
 .../src/facade/world_tx/scenario_set_state.rs | 44 ++++++++++++++++++-
 .../scenario_set_new_address.rs               | 14 ++++++
 .../src/scenario/model/new_address.rs         |  2 +-
 5 files changed, 61 insertions(+), 5 deletions(-)
 create mode 100644 framework/scenario/src/facade/world_tx/scenario_set_state/scenario_set_new_address.rs

diff --git a/contracts/examples/adder/tests/adder_blackbox_test.rs b/contracts/examples/adder/tests/adder_blackbox_test.rs
index 4b0f740343..9c6dc26dd5 100644
--- a/contracts/examples/adder/tests/adder_blackbox_test.rs
+++ b/contracts/examples/adder/tests/adder_blackbox_test.rs
@@ -24,7 +24,7 @@ fn adder_blackbox() {
 
     world.account(OWNER).nonce(1);
 
-    world.set_state_step(SetStateStep::new().new_address(OWNER, 1, SC_ADDER));
+    world.new_address(OWNER, 1, SC_ADDER);
 
     let new_address = world
         .tx()
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 c3a1e383f3..fae306ed35 100644
--- a/contracts/examples/crowdfunding-esdt/tests/crowdfunding_esdt_blackbox_test.rs
+++ b/contracts/examples/crowdfunding-esdt/tests/crowdfunding_esdt_blackbox_test.rs
@@ -42,11 +42,11 @@ impl CrowdfundingESDTTestState {
             .nonce(1)
             .esdt_balance(CF_TOKEN_ID_EXPR, "1000");
 
-        world.set_state_step(SetStateStep::new().new_address(
+        world.new_address(
             owner_address,
             1,
             SC_CROWDFUNDING_ESDT_EXPR.eval_to_expr().as_str(),
-        ));
+        );
 
         Self { world }
     }
diff --git a/framework/scenario/src/facade/world_tx/scenario_set_state.rs b/framework/scenario/src/facade/world_tx/scenario_set_state.rs
index 30de24fbc2..11fd25a3f6 100644
--- a/framework/scenario/src/facade/world_tx/scenario_set_state.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_set_state.rs
@@ -1,14 +1,16 @@
 mod scenario_set_account;
 mod scenario_set_block;
+mod scenario_set_new_address;
 
 use crate::{
     scenario::ScenarioRunner,
-    scenario_model::{AddressKey, SetStateStep},
+    scenario_model::{AddressKey, AddressValue, NewAddress, SetStateStep, U64Value},
     ScenarioWorld,
 };
 
 use scenario_set_account::AccountItem;
 use scenario_set_block::BlockItem;
+use scenario_set_new_address::NewAddressItem;
 
 impl ScenarioWorld {
     fn empty_builder(&mut self) -> SetStateBuilder<'_, ()> {
@@ -25,6 +27,21 @@ impl ScenarioWorld {
         self.empty_builder().account(address_expr)
     }
 
+    pub fn new_address<CA, CN, NA>(
+        &mut self,
+        creator_address_expr: CA,
+        creator_nonce_expr: CN,
+        new_address_expr: NA,
+    ) -> SetStateBuilder<'_, NewAddressItem>
+    where
+        AddressValue: From<CA>,
+        U64Value: From<CN>,
+        AddressValue: From<NA>,
+    {
+        self.empty_builder()
+            .new_address(creator_address_expr, creator_nonce_expr, new_address_expr)
+    }
+
     pub fn current_block(&mut self) -> SetStateBuilder<'_, BlockItem> {
         self.empty_builder().current_block()
     }
@@ -99,6 +116,31 @@ where
         }
     }
 
+    pub fn new_address<CA, CN, NA>(
+        mut self,
+        creator_address_expr: CA,
+        creator_nonce_expr: CN,
+        new_address_expr: NA,
+    ) -> SetStateBuilder<'w, NewAddressItem>
+    where
+        AddressValue: From<CA>,
+        U64Value: From<CN>,
+        AddressValue: From<NA>,
+    {
+        let mut base = core::mem::take(&mut self.base).unwrap();
+        self.item.commit_to_step(&mut base.set_state_step);
+        SetStateBuilder {
+            base: Some(base),
+            item: NewAddressItem {
+                new_address: NewAddress {
+                    creator_address: AddressValue::from(creator_address_expr),
+                    creator_nonce: U64Value::from(creator_nonce_expr),
+                    new_address: AddressValue::from(new_address_expr),
+                },
+            },
+        }
+    }
+
     pub fn current_block(&mut self) -> SetStateBuilder<'w, BlockItem> {
         let mut base = core::mem::take(&mut self.base).unwrap();
         self.item.commit_to_step(&mut base.set_state_step);
diff --git a/framework/scenario/src/facade/world_tx/scenario_set_state/scenario_set_new_address.rs b/framework/scenario/src/facade/world_tx/scenario_set_state/scenario_set_new_address.rs
new file mode 100644
index 0000000000..35a8ae392b
--- /dev/null
+++ b/framework/scenario/src/facade/world_tx/scenario_set_state/scenario_set_new_address.rs
@@ -0,0 +1,14 @@
+use crate::scenario_model::{NewAddress, SetStateStep};
+
+use super::SetStateBuilderItem;
+
+pub struct NewAddressItem {
+    pub(super) new_address: NewAddress,
+}
+
+impl SetStateBuilderItem for NewAddressItem {
+    fn commit_to_step(&mut self, step: &mut SetStateStep) {
+        step.new_addresses
+            .push(core::mem::take(&mut self.new_address));
+    }
+}
diff --git a/framework/scenario/src/scenario/model/new_address.rs b/framework/scenario/src/scenario/model/new_address.rs
index f4893978d1..3ef0ddba2c 100644
--- a/framework/scenario/src/scenario/model/new_address.rs
+++ b/framework/scenario/src/scenario/model/new_address.rs
@@ -5,7 +5,7 @@ use crate::scenario_format::{
 
 use super::{AddressValue, U64Value};
 
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, Default)]
 pub struct NewAddress {
     pub creator_address: AddressValue,
     pub creator_nonce: U64Value,

From 108d73de15ca8e6b79126c5334884b1a0789aecf Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 18 Apr 2024 19:39:41 +0300
Subject: [PATCH 0738/1254] set state - cleanup

---
 .../scenario/src/facade/world_tx/scenario_set_state.rs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/framework/scenario/src/facade/world_tx/scenario_set_state.rs b/framework/scenario/src/facade/world_tx/scenario_set_state.rs
index 11fd25a3f6..9376050f58 100644
--- a/framework/scenario/src/facade/world_tx/scenario_set_state.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_set_state.rs
@@ -59,17 +59,17 @@ impl SetStateBuilderItem for () {
     fn commit_to_step(&mut self, _step: &mut SetStateStep) {}
 }
 
-pub(crate) struct SetStateBuilderBase<'w> {
-    pub(crate) world: &'w mut ScenarioWorld,
-    pub(crate) set_state_step: SetStateStep,
+struct SetStateBuilderBase<'w> {
+    world: &'w mut ScenarioWorld,
+    set_state_step: SetStateStep,
 }
 
 pub struct SetStateBuilder<'w, Current>
 where
     Current: SetStateBuilderItem,
 {
-    pub(crate) base: Option<SetStateBuilderBase<'w>>,
-    pub(crate) item: Current,
+    base: Option<SetStateBuilderBase<'w>>,
+    item: Current,
 }
 
 impl<'w> SetStateBuilderBase<'w> {

From cc6febd2570a2d7bbdb75604abca0fa6b4c9e799 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Thu, 18 Apr 2024 23:07:40 +0300
Subject: [PATCH 0739/1254] unified syntax - migrate multisig blackbox tests

---
 contracts/examples/adder/sc-config.toml       |   3 +
 .../tests/crowdfunding_esdt_blackbox_test.rs  |  20 +-
 .../examples/multisig/src/adder_proxy.rs      | 110 ++++
 .../multisig/tests/multisig_blackbox_test.rs  | 578 ++++++++++--------
 4 files changed, 441 insertions(+), 270 deletions(-)
 create mode 100644 contracts/examples/multisig/src/adder_proxy.rs

diff --git a/contracts/examples/adder/sc-config.toml b/contracts/examples/adder/sc-config.toml
index b56f82b429..091de3f7f6 100644
--- a/contracts/examples/adder/sc-config.toml
+++ b/contracts/examples/adder/sc-config.toml
@@ -2,3 +2,6 @@
 
 [[proxy]]
 path = "src/adder_proxy.rs"
+
+[[proxy]]
+path = "../multisig/src/adder_proxy.rs"
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 c3a1e383f3..d7b8d616a0 100644
--- a/contracts/examples/crowdfunding-esdt/tests/crowdfunding_esdt_blackbox_test.rs
+++ b/contracts/examples/crowdfunding-esdt/tests/crowdfunding_esdt_blackbox_test.rs
@@ -1,7 +1,6 @@
 use crowdfunding_esdt::crowdfunding_esdt_proxy;
 
 use multiversx_sc_scenario::imports::*;
-use num_bigint::BigUint;
 
 const CF_DEADLINE: u64 = 7 * 24 * 60 * 60; // 1 week in seconds
 const CF_TOKEN_ID: &[u8] = b"CROWD-123456";
@@ -29,10 +28,9 @@ struct CrowdfundingESDTTestState {
 impl CrowdfundingESDTTestState {
     fn new() -> Self {
         let mut world = world();
-        let owner_address: &str = "address:owner";
 
         world
-            .account(owner_address)
+            .account(OWNER_ADDRESS)
             .nonce(1)
             .account(FIRST_USER_ADDRESS)
             .nonce(1)
@@ -43,7 +41,7 @@ impl CrowdfundingESDTTestState {
             .esdt_balance(CF_TOKEN_ID_EXPR, "1000");
 
         world.set_state_step(SetStateStep::new().new_address(
-            owner_address,
+            OWNER_ADDRESS.eval_to_expr().as_str(),
             1,
             SC_CROWDFUNDING_ESDT_EXPR.eval_to_expr().as_str(),
         ));
@@ -81,29 +79,23 @@ impl CrowdfundingESDTTestState {
     }
 
     fn check_deposit(&mut self, donor: AddressExpr, amount: u64) {
-        let value = self
-            .world
+        self.world
             .query()
             .to(SC_CROWDFUNDING_ESDT_EXPR)
             .typed(crowdfunding_esdt_proxy::CrowdfundingProxy)
             .deposit(donor.eval_to_array())
-            .returns(ReturnsResultConv::<BigUint>::new())
+            .returns(ExpectValue(amount))
             .run();
-
-        assert_eq!(value, amount.into());
     }
 
     fn check_status(&mut self, expected_value: crowdfunding_esdt_proxy::Status) {
-        let status = self
-            .world
+        self.world
             .query()
             .to(SC_CROWDFUNDING_ESDT_EXPR)
             .typed(crowdfunding_esdt_proxy::CrowdfundingProxy)
             .status()
-            .returns(ReturnsResult)
+            .returns(ExpectValue(expected_value))
             .run();
-
-        assert_eq!(status, expected_value);
     }
 
     fn claim(&mut self, address: AddressExpr) {
diff --git a/contracts/examples/multisig/src/adder_proxy.rs b/contracts/examples/multisig/src/adder_proxy.rs
new file mode 100644
index 0000000000..0b1b663669
--- /dev/null
+++ b/contracts/examples/multisig/src/adder_proxy.rs
@@ -0,0 +1,110 @@
+// Code generated by the multiversx-sc proxy generator. DO NOT EDIT.
+
+////////////////////////////////////////////////////
+////////////////// AUTO-GENERATED //////////////////
+////////////////////////////////////////////////////
+
+#![allow(dead_code)]
+#![allow(clippy::all)]
+
+use multiversx_sc::proxy_imports::*;
+
+pub struct AdderProxy;
+
+impl<Env, From, To, Gas> TxProxyTrait<Env, From, To, Gas> for AdderProxy
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    type TxProxyMethods = AdderProxyMethods<Env, From, To, Gas>;
+
+    fn proxy_methods(self, tx: Tx<Env, From, To, (), Gas, (), ()>) -> Self::TxProxyMethods {
+        AdderProxyMethods { wrapped_tx: tx }
+    }
+}
+
+pub struct AdderProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    wrapped_tx: Tx<Env, From, To, (), Gas, (), ()>,
+}
+
+#[rustfmt::skip]
+impl<Env, From, Gas> AdderProxyMethods<Env, From, (), Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn init<
+        Arg0: CodecInto<BigUint<Env::Api>>,
+    >(
+        self,
+        initial_value: Arg0,
+    ) -> TxProxyDeploy<Env, From, Gas, ()> {
+        self.wrapped_tx
+            .raw_deploy()
+            .argument(&initial_value)
+            .original_result()
+    }
+}
+
+#[rustfmt::skip]
+impl<Env, From, To, Gas> AdderProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn upgrade<
+        Arg0: CodecInto<BigUint<Env::Api>>,
+    >(
+        self,
+        initial_value: Arg0,
+    ) -> TxProxyUpgrade<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_upgrade()
+            .argument(&initial_value)
+            .original_result()
+    }
+}
+
+#[rustfmt::skip]
+impl<Env, From, To, Gas> AdderProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn sum(
+        self,
+    ) -> TxProxyCall<Env, From, To, Gas, BigUint<Env::Api>> {
+        self.wrapped_tx
+            .raw_call("getSum")
+            .original_result()
+    }
+
+    /// Add desired amount to the storage variable. 
+    pub fn add<
+        Arg0: CodecInto<BigUint<Env::Api>>,
+    >(
+        self,
+        value: Arg0,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call("add")
+            .argument(&value)
+            .original_result()
+    }
+}
diff --git a/contracts/examples/multisig/tests/multisig_blackbox_test.rs b/contracts/examples/multisig/tests/multisig_blackbox_test.rs
index 691c2750db..1529746ec6 100644
--- a/contracts/examples/multisig/tests/multisig_blackbox_test.rs
+++ b/contracts/examples/multisig/tests/multisig_blackbox_test.rs
@@ -1,21 +1,23 @@
 use multiversx_sc::codec::top_encode_to_vec_u8_or_panic;
 use multiversx_sc_scenario::imports::*;
 
-use adder::ProxyTrait as _;
-use multisig::{
-    multisig_perform::ProxyTrait as _, multisig_propose::ProxyTrait as _, user_role::UserRole,
-    ProxyTrait as _,
-};
+use adder::{adder_proxy, ProxyTrait as _};
+use multisig::{multisig_perform::ProxyTrait as _, multisig_proxy};
 use num_bigint::BigUint;
 
 const ADDER_ADDRESS_EXPR: &str = "sc:adder";
-const ADDER_OWNER_ADDRESS_EXPR: &str = "address:adder-owner";
+const SC_ADDER_EXPR: ScExpr = ScExpr("adder");
+const ADDER_OWNER_ADDRESS_EXPR: AddressExpr = AddressExpr("adder-owner");
 const ADDER_PATH_EXPR: &str = "mxsc:test-contracts/adder.mxsc.json";
+const ADDER_CODE_EXPR: MxscExpr = MxscExpr("test-contracts/adder.mxsc.json");
 const BOARD_MEMBER_ADDRESS_EXPR: &str = "address:board-member";
+const BOARD_MEMBER_ADDRESS_EXPR_REPL: AddressExpr = AddressExpr("board-member");
 const MULTISIG_ADDRESS_EXPR: &str = "sc:multisig";
+const SC_MULTISIG_EXPR: ScExpr = ScExpr("multisig");
 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 MULTISIG_CODE_EXPR: MxscExpr = MxscExpr("output/multisig.mxsc.json");
+const OWNER_ADDRESS_EXPR_REPL: AddressExpr = AddressExpr("owner");
+const PROPOSER_ADDRESS_EXPR: AddressExpr = AddressExpr("proposer");
 const PROPOSER_BALANCE_EXPR: &str = "100,000,000";
 const QUORUM_SIZE: usize = 1;
 
@@ -33,8 +35,6 @@ fn world() -> ScenarioWorld {
 
 struct MultisigTestState {
     world: ScenarioWorld,
-    proposer_address: Address,
-    board_member_address: Address,
     multisig_contract: MultisigContract,
     adder_contract: AdderContract,
     adder_address: Address,
@@ -43,29 +43,36 @@ struct MultisigTestState {
 impl MultisigTestState {
     fn new() -> Self {
         let mut world = world();
-        world.set_state_step(
-            SetStateStep::new()
-                .put_account(OWNER_ADDRESS_EXPR, Account::new().nonce(1))
-                .new_address(OWNER_ADDRESS_EXPR, 1, MULTISIG_ADDRESS_EXPR)
-                .put_account(
-                    PROPOSER_ADDRESS_EXPR,
-                    Account::new().nonce(1).balance(PROPOSER_BALANCE_EXPR),
-                )
-                .put_account(BOARD_MEMBER_ADDRESS_EXPR, Account::new().nonce(1))
-                .put_account(ADDER_OWNER_ADDRESS_EXPR, Account::new().nonce(1))
-                .new_address(ADDER_OWNER_ADDRESS_EXPR, 1, ADDER_ADDRESS_EXPR),
-        );
-
-        let proposer_address = AddressValue::from(PROPOSER_ADDRESS_EXPR).to_address();
-        let board_member_address = AddressValue::from(BOARD_MEMBER_ADDRESS_EXPR).to_address();
-        let multisig_contract = MultisigContract::new(MULTISIG_ADDRESS_EXPR);
-        let adder_contract = AdderContract::new(ADDER_ADDRESS_EXPR);
-        let adder_address = AddressValue::from(ADDER_ADDRESS_EXPR).to_address();
+
+        world
+            .account(OWNER_ADDRESS_EXPR_REPL)
+            .nonce(1)
+            .account(PROPOSER_ADDRESS_EXPR)
+            .nonce(1)
+            .balance(PROPOSER_BALANCE_EXPR)
+            .account(BOARD_MEMBER_ADDRESS_EXPR_REPL)
+            .nonce(1)
+            .account(ADDER_OWNER_ADDRESS_EXPR)
+            .nonce(1);
+
+        world.set_state_step(SetStateStep::new().new_address(
+            OWNER_ADDRESS_EXPR_REPL.eval_to_expr().as_str(),
+            1,
+            SC_MULTISIG_EXPR.eval_to_expr().as_str(),
+        ));
+
+        world.set_state_step(SetStateStep::new().new_address(
+            ADDER_OWNER_ADDRESS_EXPR.eval_to_expr().as_str(),
+            1,
+            SC_ADDER_EXPR.eval_to_expr().as_str(),
+        ));
+
+        let multisig_contract = MultisigContract::new(SC_MULTISIG_EXPR.eval_to_expr().as_str());
+        let adder_contract = AdderContract::new(SC_ADDER_EXPR.eval_to_expr().as_str());
+        let adder_address = AddressValue::from(SC_ADDER_EXPR.eval_to_expr().as_str()).to_address();
 
         Self {
             world,
-            proposer_address,
-            board_member_address,
             multisig_contract,
             adder_contract,
             adder_address,
@@ -73,70 +80,76 @@ impl MultisigTestState {
     }
 
     fn deploy_multisig_contract(&mut self) -> &mut Self {
-        let multisig_code = self.world.code_expression(MULTISIG_PATH_EXPR);
-        let board_members = MultiValueVec::from(vec![self.board_member_address.clone()]);
-
-        self.world.sc_deploy(
-            ScDeployStep::new()
-                .from(OWNER_ADDRESS_EXPR)
-                .code(multisig_code)
-                .call(self.multisig_contract.init(QUORUM_SIZE, board_members)),
-        );
-
-        let action_id: usize = self.world.sc_call_get_result(
-            ScCallStep::new().from(BOARD_MEMBER_ADDRESS_EXPR).call(
-                self.multisig_contract
-                    .propose_add_proposer(self.proposer_address.clone()),
-            ),
-        );
+        let board_members =
+            MultiValueVec::from(vec![BOARD_MEMBER_ADDRESS_EXPR_REPL.eval_to_array()]);
+
+        self.world
+            .tx()
+            .from(OWNER_ADDRESS_EXPR_REPL)
+            .typed(multisig_proxy::MultisigProxy)
+            .init(QUORUM_SIZE, board_members)
+            .code(MULTISIG_CODE_EXPR)
+            .run();
+
+        let action_id: usize = self
+            .world
+            .tx()
+            .from(BOARD_MEMBER_ADDRESS_EXPR_REPL)
+            .to(SC_MULTISIG_EXPR)
+            .typed(multisig_proxy::MultisigProxy)
+            .propose_add_proposer(PROPOSER_ADDRESS_EXPR.eval_to_array())
+            .returns(ReturnsResult)
+            .run();
+
         self.sign(action_id);
         self.perform(action_id);
 
-        self.expect_user_role(&self.proposer_address.clone(), UserRole::Proposer);
+        self.expect_user_role(PROPOSER_ADDRESS_EXPR, multisig_proxy::UserRole::Proposer);
 
         self
     }
 
-    fn deploy_adder_contract(&mut self) -> &mut Self {
-        let adder_code = self.world.code_expression(ADDER_PATH_EXPR);
-
-        self.world.sc_deploy(
-            ScDeployStep::new()
-                .from(ADDER_OWNER_ADDRESS_EXPR)
-                .code(adder_code)
-                .call(self.adder_contract.init(5u64)),
-        );
-
-        self
+    fn deploy_adder_contract(&mut self) {
+        self.world
+            .tx()
+            .from(ADDER_OWNER_ADDRESS_EXPR)
+            .typed(adder_proxy::AdderProxy)
+            .init(5u64)
+            .code(ADDER_CODE_EXPR)
+            .run();
     }
 
-    fn propose_add_board_member(&mut self, board_member_address: Address) -> usize {
+    fn propose_add_board_member(&mut self, board_member_address: AddressExpr) -> usize {
         self.world
             .tx()
-            .from(AddressExpr("proposer"))
-            .call(
-                self.multisig_contract
-                    .propose_add_board_member(board_member_address),
-            )
+            .from(PROPOSER_ADDRESS_EXPR)
+            .to(SC_MULTISIG_EXPR)
+            .typed(multisig_proxy::MultisigProxy)
+            .propose_add_board_member(board_member_address.eval_to_array())
             .returns(ReturnsResult)
             .run()
     }
 
-    fn propose_add_proposer(&mut self, proposer_address: Address) -> usize {
-        self.world.sc_call_get_result(
-            ScCallStep::new().from(PROPOSER_ADDRESS_EXPR).call(
-                self.multisig_contract
-                    .propose_add_proposer(proposer_address),
-            ),
-        )
+    fn propose_add_proposer(&mut self, proposer_address: AddressExpr) -> usize {
+        self.world
+            .tx()
+            .from(PROPOSER_ADDRESS_EXPR)
+            .to(SC_MULTISIG_EXPR)
+            .typed(multisig_proxy::MultisigProxy)
+            .propose_add_proposer(proposer_address.eval_to_array())
+            .returns(ReturnsResult)
+            .run()
     }
 
     fn propose_change_quorum(&mut self, new_quorum: usize) -> usize {
-        self.world.sc_call_get_result(
-            ScCallStep::new()
-                .from(PROPOSER_ADDRESS_EXPR)
-                .call(self.multisig_contract.propose_change_quorum(new_quorum)),
-        )
+        self.world
+            .tx()
+            .from(PROPOSER_ADDRESS_EXPR)
+            .to(SC_MULTISIG_EXPR)
+            .typed(multisig_proxy::MultisigProxy)
+            .propose_change_quorum(new_quorum)
+            .returns(ReturnsResult)
+            .run()
     }
 
     fn propose_transfer_execute(
@@ -145,12 +158,14 @@ impl MultisigTestState {
         egld_amount: u64,
         contract_call: FunctionCall<StaticApi>,
     ) -> usize {
-        self.world.sc_call_get_result(
-            ScCallStep::new().from(PROPOSER_ADDRESS_EXPR).call(
-                self.multisig_contract
-                    .propose_transfer_execute(to, egld_amount, contract_call),
-            ),
-        )
+        self.world
+            .tx()
+            .from(PROPOSER_ADDRESS_EXPR)
+            .to(SC_MULTISIG_EXPR)
+            .typed(multisig_proxy::MultisigProxy)
+            .propose_transfer_execute(to, egld_amount, contract_call)
+            .returns(ReturnsResult)
+            .run()
     }
 
     fn propose_async_call(
@@ -159,20 +174,25 @@ impl MultisigTestState {
         egld_amount: u64,
         contract_call: FunctionCall<StaticApi>,
     ) -> usize {
-        self.world.sc_call_get_result(
-            ScCallStep::new().from(PROPOSER_ADDRESS_EXPR).call(
-                self.multisig_contract
-                    .propose_async_call(to, egld_amount, contract_call),
-            ),
-        )
+        self.world
+            .tx()
+            .from(PROPOSER_ADDRESS_EXPR)
+            .to(SC_MULTISIG_EXPR)
+            .typed(multisig_proxy::MultisigProxy)
+            .propose_async_call(to, egld_amount, contract_call)
+            .returns(ReturnsResult)
+            .run()
     }
 
-    fn propose_remove_user(&mut self, user_address: Address) -> usize {
-        self.world.sc_call_get_result(
-            ScCallStep::new()
-                .from(PROPOSER_ADDRESS_EXPR)
-                .call(self.multisig_contract.propose_remove_user(user_address)),
-        )
+    fn propose_remove_user(&mut self, user_address: AddressExpr) -> usize {
+        self.world
+            .tx()
+            .from(PROPOSER_ADDRESS_EXPR)
+            .to(SC_MULTISIG_EXPR)
+            .typed(multisig_proxy::MultisigProxy)
+            .propose_remove_user(user_address.eval_to_array())
+            .returns(ReturnsResult)
+            .run()
     }
 
     fn propose_sc_deploy_from_source(
@@ -183,14 +203,13 @@ impl MultisigTestState {
         arguments: MultiValueVec<Vec<u8>>,
     ) -> usize {
         self.world
-            .sc_call_get_result(ScCallStep::new().from(PROPOSER_ADDRESS_EXPR).call(
-                self.multisig_contract.propose_sc_deploy_from_source(
-                    amount,
-                    source,
-                    code_metadata,
-                    arguments,
-                ),
-            ))
+            .tx()
+            .from(PROPOSER_ADDRESS_EXPR)
+            .to(SC_MULTISIG_EXPR)
+            .typed(multisig_proxy::MultisigProxy)
+            .propose_sc_deploy_from_source(amount, source, code_metadata, arguments)
+            .returns(ReturnsResult)
+            .run()
     }
 
     fn propose_sc_upgrade_from_source(
@@ -202,48 +221,58 @@ impl MultisigTestState {
         arguments: MultiValueVec<Vec<u8>>,
     ) -> usize {
         self.world
-            .sc_call_get_result(ScCallStep::new().from(PROPOSER_ADDRESS_EXPR).call(
-                self.multisig_contract.propose_sc_upgrade_from_source(
-                    sc_address,
-                    amount,
-                    source,
-                    code_metadata,
-                    arguments,
-                ),
-            ))
+            .tx()
+            .from(PROPOSER_ADDRESS_EXPR)
+            .to(SC_MULTISIG_EXPR)
+            .typed(multisig_proxy::MultisigProxy)
+            .propose_sc_upgrade_from_source(sc_address, amount, source, code_metadata, arguments)
+            .returns(ReturnsResult)
+            .run()
     }
 
     fn perform(&mut self, action_id: usize) {
-        self.world.sc_call(
-            ScCallStep::new()
-                .from(BOARD_MEMBER_ADDRESS_EXPR)
-                .call(self.multisig_contract.perform_action_endpoint(action_id)),
-        );
+        self.world
+            .tx()
+            .from(BOARD_MEMBER_ADDRESS_EXPR_REPL)
+            .to(SC_MULTISIG_EXPR)
+            .typed(multisig_proxy::MultisigProxy)
+            .perform_action_endpoint(action_id)
+            .run();
     }
 
     fn perform_and_expect_err(&mut self, action_id: usize, err_message: &str) {
-        self.world.sc_call(
-            ScCallStep::new()
-                .from(BOARD_MEMBER_ADDRESS_EXPR)
-                .call(self.multisig_contract.perform_action_endpoint(action_id))
-                .expect(TxExpect::user_error("str:".to_string() + err_message)),
-        );
+        self.world
+            .tx()
+            .from(BOARD_MEMBER_ADDRESS_EXPR_REPL)
+            .to(SC_MULTISIG_EXPR)
+            .typed(multisig_proxy::MultisigProxy)
+            .perform_action_endpoint(action_id)
+            .with_result(ExpectError(4, err_message))
+            .run();
     }
 
     fn sign(&mut self, action_id: usize) {
-        self.world.sc_call(
-            ScCallStep::new()
-                .from(BOARD_MEMBER_ADDRESS_EXPR)
-                .call(self.multisig_contract.sign(action_id)),
-        );
+        self.world
+            .tx()
+            .from(BOARD_MEMBER_ADDRESS_EXPR_REPL)
+            .to(SC_MULTISIG_EXPR)
+            .typed(multisig_proxy::MultisigProxy)
+            .sign(action_id)
+            .run();
     }
 
-    fn expect_user_role(&mut self, user: &Address, expected_user_role: UserRole) {
-        self.world.sc_query(
-            ScQueryStep::new()
-                .call(self.multisig_contract.user_role(user.clone()))
-                .expect_value(expected_user_role),
-        );
+    fn expect_user_role(
+        &mut self,
+        user: AddressExpr,
+        expected_user_role: multisig_proxy::UserRole,
+    ) {
+        self.world
+            .query()
+            .to(SC_MULTISIG_EXPR)
+            .typed(multisig_proxy::MultisigProxy)
+            .user_role(user.eval_to_array())
+            .returns(ExpectValue(expected_user_role))
+            .run();
     }
 }
 
@@ -252,28 +281,30 @@ fn test_add_board_member() {
     let mut state = MultisigTestState::new();
     state.deploy_multisig_contract();
 
-    const NEW_BOARD_MEMBER_ADDRESS_EXPR: &str = "address:new-board-member";
-    let new_board_member_address = AddressValue::from(NEW_BOARD_MEMBER_ADDRESS_EXPR).to_address();
+    let new_board_member_expr: AddressExpr = AddressExpr("new-board-member");
 
-    state.world.set_state_step(
-        SetStateStep::new().put_account(NEW_BOARD_MEMBER_ADDRESS_EXPR, Account::new().nonce(1)),
-    );
+    state.world.account(new_board_member_expr).nonce(1);
 
-    state.expect_user_role(&new_board_member_address, UserRole::None);
+    state.expect_user_role(new_board_member_expr, multisig_proxy::UserRole::None);
 
-    let action_id = state.propose_add_board_member(new_board_member_address.clone());
+    let action_id = state.propose_add_board_member(new_board_member_expr);
     state.sign(action_id);
     state.perform(action_id);
 
-    state.expect_user_role(&new_board_member_address, UserRole::BoardMember);
-    state.world.sc_query(
-        ScQueryStep::new()
-            .call(state.multisig_contract.get_all_board_members())
-            .expect_value(MultiValueVec::<Address>::from(vec![
-                state.board_member_address.clone(),
-                new_board_member_address.clone(),
-            ])),
-    );
+    let expected_value = MultiValueVec::from(vec![
+        BOARD_MEMBER_ADDRESS_EXPR_REPL.eval_to_array(),
+        new_board_member_expr.eval_to_array(),
+    ]);
+
+    state.expect_user_role(new_board_member_expr, multisig_proxy::UserRole::BoardMember);
+    state
+        .world
+        .query()
+        .to(SC_MULTISIG_EXPR)
+        .typed(multisig_proxy::MultisigProxy)
+        .get_all_board_members()
+        .returns(ExpectValue(expected_value))
+        .run()
 }
 
 #[test]
@@ -281,28 +312,33 @@ fn test_add_proposer() {
     let mut state = MultisigTestState::new();
     state.deploy_multisig_contract();
 
-    const NEW_PROPOSER_ADDRESS_EXPR: &str = "address:new-proposer";
-    let new_proposer_address = AddressValue::from(NEW_PROPOSER_ADDRESS_EXPR).to_address();
+    let new_proposer_address_expr: AddressExpr = AddressExpr("new-proposer");
 
-    state.world.set_state_step(
-        SetStateStep::new().put_account(NEW_PROPOSER_ADDRESS_EXPR, Account::new().nonce(1)),
-    );
+    state.world.account(new_proposer_address_expr).nonce(1);
 
-    state.expect_user_role(&new_proposer_address, UserRole::None);
+    state.expect_user_role(new_proposer_address_expr, multisig_proxy::UserRole::None);
 
-    let action_id = state.propose_add_proposer(new_proposer_address.clone());
+    let action_id = state.propose_add_proposer(new_proposer_address_expr);
     state.sign(action_id);
     state.perform(action_id);
 
-    state.expect_user_role(&new_proposer_address, UserRole::Proposer);
-    state.world.sc_query(
-        ScQueryStep::new()
-            .call(state.multisig_contract.get_all_proposers())
-            .expect_value(MultiValueVec::<Address>::from(vec![
-                state.proposer_address.clone(),
-                new_proposer_address.clone(),
-            ])),
+    state.expect_user_role(
+        new_proposer_address_expr,
+        multisig_proxy::UserRole::Proposer,
     );
+
+    let expected_value = MultiValueVec::from(vec![
+        PROPOSER_ADDRESS_EXPR.eval_to_array(),
+        new_proposer_address_expr.eval_to_array(),
+    ]);
+    state
+        .world
+        .query()
+        .to(SC_MULTISIG_EXPR)
+        .typed(multisig_proxy::MultisigProxy)
+        .get_all_proposers()
+        .returns(ExpectValue(expected_value))
+        .run();
 }
 
 #[test]
@@ -310,18 +346,21 @@ fn test_remove_proposer() {
     let mut state = MultisigTestState::new();
     state.deploy_multisig_contract();
 
-    state.expect_user_role(&state.proposer_address.clone(), UserRole::Proposer);
+    state.expect_user_role(PROPOSER_ADDRESS_EXPR, multisig_proxy::UserRole::Proposer);
 
-    let action_id = state.propose_remove_user(state.proposer_address.clone());
+    let action_id = state.propose_remove_user(PROPOSER_ADDRESS_EXPR);
     state.sign(action_id);
     state.perform(action_id);
 
-    state.expect_user_role(&state.proposer_address.clone(), UserRole::None);
-    state.world.sc_query(
-        ScQueryStep::new()
-            .call(state.multisig_contract.get_all_proposers())
-            .expect_value(MultiValueVec::<Address>::new()),
-    );
+    state.expect_user_role(PROPOSER_ADDRESS_EXPR, multisig_proxy::UserRole::None);
+    state
+        .world
+        .query()
+        .to(SC_MULTISIG_EXPR)
+        .typed(multisig_proxy::MultisigProxy)
+        .get_all_proposers()
+        .returns(ExpectValue(MultiValueVec::<Address>::new()))
+        .run();
 }
 
 #[test]
@@ -329,7 +368,7 @@ fn test_try_remove_all_board_members() {
     let mut state = MultisigTestState::new();
     state.deploy_multisig_contract();
 
-    let action_id = state.propose_remove_user(state.board_member_address.clone());
+    let action_id = state.propose_remove_user(BOARD_MEMBER_ADDRESS_EXPR_REPL);
     state.sign(action_id);
     state.perform_and_expect_err(action_id, "quorum cannot exceed board size")
 }
@@ -346,45 +385,55 @@ fn test_change_quorum() {
     state.perform_and_expect_err(action_id, "quorum cannot exceed board size");
 
     // try discard before unsigning
-    state.world.sc_call(
-        ScCallStep::new()
-            .from(BOARD_MEMBER_ADDRESS_EXPR)
-            .call(state.multisig_contract.discard_action(action_id))
-            .expect(TxExpect::user_error(
-                "str:cannot discard action with valid signatures",
-            )),
-    );
+    state
+        .world
+        .tx()
+        .from(BOARD_MEMBER_ADDRESS_EXPR_REPL)
+        .to(SC_MULTISIG_EXPR)
+        .typed(multisig_proxy::MultisigProxy)
+        .discard_action(action_id)
+        .with_result(ExpectError(
+            4,
+            "cannot discard action with valid signatures",
+        ))
+        .run();
 
     // unsign and discard action
-    state.world.sc_call(
-        ScCallStep::new()
-            .from(BOARD_MEMBER_ADDRESS_EXPR)
-            .call(state.multisig_contract.unsign(action_id)),
-    );
+    state
+        .world
+        .tx()
+        .from(BOARD_MEMBER_ADDRESS_EXPR_REPL)
+        .to(SC_MULTISIG_EXPR)
+        .typed(multisig_proxy::MultisigProxy)
+        .unsign(action_id)
+        .run();
 
-    state.world.sc_call(
-        ScCallStep::new()
-            .from(BOARD_MEMBER_ADDRESS_EXPR)
-            .call(state.multisig_contract.discard_action(action_id)),
-    );
+    state
+        .world
+        .tx()
+        .from(BOARD_MEMBER_ADDRESS_EXPR_REPL)
+        .to(SC_MULTISIG_EXPR)
+        .typed(multisig_proxy::MultisigProxy)
+        .discard_action(action_id)
+        .run();
 
     // try sign discarded action
-    state.world.sc_call(
-        ScCallStep::new()
-            .from(BOARD_MEMBER_ADDRESS_EXPR)
-            .call(state.multisig_contract.sign(action_id))
-            .expect(TxExpect::user_error("str:action does not exist")),
-    );
+    state
+        .world
+        .tx()
+        .from(BOARD_MEMBER_ADDRESS_EXPR_REPL)
+        .to(SC_MULTISIG_EXPR)
+        .typed(multisig_proxy::MultisigProxy)
+        .sign(action_id)
+        .with_result(ExpectError(4, "action does not exist"))
+        .run();
 
     // add another board member
-    const NEW_BOARD_MEMBER_ADDRESS_EXPR: &str = "address:new-board-member";
-    let new_board_member_address = AddressValue::from(NEW_BOARD_MEMBER_ADDRESS_EXPR).to_address();
+    let new_board_member_address_expr: AddressExpr = AddressExpr("new-board-member");
 
-    state.world.set_state_step(
-        SetStateStep::new().put_account(NEW_BOARD_MEMBER_ADDRESS_EXPR, Account::new().nonce(1)),
-    );
+    state.world.account(new_board_member_address_expr).nonce(1);
 
-    let action_id = state.propose_add_board_member(new_board_member_address);
+    let action_id = state.propose_add_board_member(new_board_member_address_expr);
     state.sign(action_id);
     state.perform(action_id);
 
@@ -399,57 +448,62 @@ fn test_transfer_execute_to_user() {
     let mut state = MultisigTestState::new();
     state.deploy_multisig_contract();
 
-    const NEW_USER_ADDRESS_EXPR: &str = "address:new-user";
-    state.world.set_state_step(
-        SetStateStep::new().put_account(NEW_USER_ADDRESS_EXPR, Account::new().nonce(1)),
-    );
+    let new_user_address_expr: AddressExpr = AddressExpr("new-user");
+    state.world.account(new_user_address_expr).nonce(1);
 
-    const AMOUNT: &str = "100";
+    let amount: u64 = 100;
 
-    state.world.sc_call(
-        ScCallStep::new()
-            .from(PROPOSER_ADDRESS_EXPR)
-            .egld_value(AMOUNT)
-            .call(state.multisig_contract.deposit()),
-    );
+    state
+        .world
+        .tx()
+        .from(PROPOSER_ADDRESS_EXPR)
+        .to(SC_MULTISIG_EXPR)
+        .typed(multisig_proxy::MultisigProxy)
+        .deposit()
+        .egld(amount)
+        .run();
 
-    state.world.check_state_step(
-        CheckStateStep::new()
-            .put_account(MULTISIG_ADDRESS_EXPR, CheckAccount::new().balance(AMOUNT)),
-    );
+    state
+        .world
+        .check_account(SC_MULTISIG_EXPR)
+        .balance(amount.to_string().as_str());
 
     // failed attempt
-    let new_user_address = AddressValue::from(NEW_USER_ADDRESS_EXPR).to_address();
-
-    state.world.sc_call(
-        ScCallStep::new()
-            .from(PROPOSER_ADDRESS_EXPR)
-            .call(state.multisig_contract.propose_transfer_execute(
-                new_user_address.clone(),
-                0u64,
-                FunctionCall::empty(),
-            ))
-            .expect(TxExpect::user_error("str:proposed action has no effect")),
-    );
+    state
+        .world
+        .tx()
+        .from(PROPOSER_ADDRESS_EXPR)
+        .to(SC_MULTISIG_EXPR)
+        .typed(multisig_proxy::MultisigProxy)
+        .propose_transfer_execute(
+            new_user_address_expr.eval_to_array(),
+            0u64,
+            FunctionCall::empty(),
+        )
+        .with_result(ExpectError(4, "proposed action has no effect"))
+        .run();
 
     // propose
-    let action_id =
-        state
-            .world
-            .sc_call_get_result(ScCallStep::new().from(PROPOSER_ADDRESS_EXPR).call(
-                state.multisig_contract.propose_transfer_execute(
-                    new_user_address,
-                    AMOUNT.parse::<u64>().unwrap(),
-                    FunctionCall::empty(),
-                ),
-            ));
+    let action_id = state
+        .world
+        .tx()
+        .from(PROPOSER_ADDRESS_EXPR)
+        .to(SC_MULTISIG_EXPR)
+        .typed(multisig_proxy::MultisigProxy)
+        .propose_transfer_execute(
+            new_user_address_expr.eval_to_array(),
+            amount,
+            FunctionCall::empty(),
+        )
+        .returns(ReturnsResult)
+        .run();
     state.sign(action_id);
     state.perform(action_id);
 
-    state.world.check_state_step(
-        CheckStateStep::new()
-            .put_account(NEW_USER_ADDRESS_EXPR, CheckAccount::new().balance(AMOUNT)),
-    );
+    state
+        .world
+        .check_account(new_user_address_expr)
+        .balance(amount.to_string().as_str());
 }
 
 #[test]
@@ -457,17 +511,26 @@ fn test_transfer_execute_sc_all() {
     let mut state = MultisigTestState::new();
     state.deploy_multisig_contract().deploy_adder_contract();
 
-    let adder_call = state.adder_contract.add(5u64).into_function_call();
+    let adder_call = state
+        .world
+        .tx()
+        .typed(adder_proxy::AdderProxy)
+        .add(5u64)
+        .into_function_call();
+    let adder_address = AddressValue::from(SC_ADDER_EXPR.eval_to_expr().as_str()).to_address();
 
-    let action_id = state.propose_transfer_execute(state.adder_address.clone(), 0u64, adder_call);
+    let action_id = state.propose_transfer_execute(adder_address, 0u64, adder_call);
     state.sign(action_id);
     state.perform(action_id);
 
-    state.world.sc_query(
-        ScQueryStep::new()
-            .call(state.adder_contract.sum())
-            .expect_value(SingleValue::from(BigUint::from(10u64))),
-    );
+    state
+        .world
+        .query()
+        .to(SC_ADDER_EXPR)
+        .typed(adder_proxy::AdderProxy)
+        .sum()
+        .with_result(ExpectValue(BigUint::from(10u64)))
+        .run();
 }
 
 #[test]
@@ -481,11 +544,14 @@ fn test_async_call_to_sc() {
     state.sign(action_id);
     state.perform(action_id);
 
-    state.world.sc_query(
-        ScQueryStep::new()
-            .call(state.adder_contract.sum())
-            .expect_value(SingleValue::from(BigUint::from(10u64))),
-    );
+    state
+        .world
+        .query()
+        .to(SC_ADDER_EXPR)
+        .typed(adder_proxy::AdderProxy)
+        .sum()
+        .returns(ExpectValue(10u64))
+        .run();
 }
 
 #[test]

From 8eb704cc9e811b22d48e3621e6f3e463627a2bea Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Fri, 19 Apr 2024 13:22:17 +0300
Subject: [PATCH 0740/1254] unified syntax - migrate all tests

---
 .../tests/crowdfunding_esdt_blackbox_test.rs  |  12 +-
 .../multisig/tests/multisig_blackbox_test.rs  | 196 +++++++++---------
 .../scenario/src/facade/expr/mxsc_expr.rs     |  20 ++
 3 files changed, 128 insertions(+), 100 deletions(-)

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 d7b8d616a0..e47e5ea385 100644
--- a/contracts/examples/crowdfunding-esdt/tests/crowdfunding_esdt_blackbox_test.rs
+++ b/contracts/examples/crowdfunding-esdt/tests/crowdfunding_esdt_blackbox_test.rs
@@ -12,12 +12,12 @@ const CODE_EXPR: MxscExpr = MxscExpr("output/crowdfunding-esdt.mxsc.json");
 const SC_CROWDFUNDING_ESDT_EXPR: ScExpr = ScExpr("crowdfunding-esdt");
 
 fn world() -> ScenarioWorld {
-    let contract_path: &str = "mxsc:output/crowdfunding-esdt.mxsc.json";
-
     let mut blockchain = ScenarioWorld::new();
-    blockchain.set_current_dir_from_workspace("contracts/examples/crowdfunding-esdt");
 
-    blockchain.register_contract(contract_path, crowdfunding_esdt::ContractBuilder);
+    blockchain.register_contract(
+        CODE_EXPR.eval_to_expr().as_str(),
+        crowdfunding_esdt::ContractBuilder,
+    );
     blockchain
 }
 
@@ -41,9 +41,9 @@ impl CrowdfundingESDTTestState {
             .esdt_balance(CF_TOKEN_ID_EXPR, "1000");
 
         world.set_state_step(SetStateStep::new().new_address(
-            OWNER_ADDRESS.eval_to_expr().as_str(),
+            OWNER_ADDRESS,
             1,
-            SC_CROWDFUNDING_ESDT_EXPR.eval_to_expr().as_str(),
+            SC_CROWDFUNDING_ESDT_EXPR,
         ));
 
         Self { world }
diff --git a/contracts/examples/multisig/tests/multisig_blackbox_test.rs b/contracts/examples/multisig/tests/multisig_blackbox_test.rs
index 1529746ec6..22a4219fd4 100644
--- a/contracts/examples/multisig/tests/multisig_blackbox_test.rs
+++ b/contracts/examples/multisig/tests/multisig_blackbox_test.rs
@@ -1,43 +1,38 @@
 use multiversx_sc::codec::top_encode_to_vec_u8_or_panic;
 use multiversx_sc_scenario::imports::*;
 
-use adder::{adder_proxy, ProxyTrait as _};
-use multisig::{multisig_perform::ProxyTrait as _, multisig_proxy};
+use adder::adder_proxy;
+use multisig::multisig_proxy;
 use num_bigint::BigUint;
 
-const ADDER_ADDRESS_EXPR: &str = "sc:adder";
 const SC_ADDER_EXPR: ScExpr = ScExpr("adder");
 const ADDER_OWNER_ADDRESS_EXPR: AddressExpr = AddressExpr("adder-owner");
-const ADDER_PATH_EXPR: &str = "mxsc:test-contracts/adder.mxsc.json";
 const ADDER_CODE_EXPR: MxscExpr = MxscExpr("test-contracts/adder.mxsc.json");
-const BOARD_MEMBER_ADDRESS_EXPR: &str = "address:board-member";
-const BOARD_MEMBER_ADDRESS_EXPR_REPL: AddressExpr = AddressExpr("board-member");
-const MULTISIG_ADDRESS_EXPR: &str = "sc:multisig";
+const BOARD_MEMBER_ADDRESS_EXPR: AddressExpr = AddressExpr("board-member");
 const SC_MULTISIG_EXPR: ScExpr = ScExpr("multisig");
-const MULTISIG_PATH_EXPR: &str = "mxsc:output/multisig.mxsc.json";
 const MULTISIG_CODE_EXPR: MxscExpr = MxscExpr("output/multisig.mxsc.json");
-const OWNER_ADDRESS_EXPR_REPL: AddressExpr = AddressExpr("owner");
+const OWNER_ADDRESS_EXPR: AddressExpr = AddressExpr("owner");
 const PROPOSER_ADDRESS_EXPR: AddressExpr = AddressExpr("proposer");
 const PROPOSER_BALANCE_EXPR: &str = "100,000,000";
 const QUORUM_SIZE: usize = 1;
 
-type MultisigContract = ContractInfo<multisig::Proxy<StaticApi>>;
-type AdderContract = ContractInfo<adder::Proxy<StaticApi>>;
-
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
     blockchain.set_current_dir_from_workspace("contracts/examples/multisig");
 
-    blockchain.register_contract(MULTISIG_PATH_EXPR, multisig::ContractBuilder);
-    blockchain.register_contract(ADDER_PATH_EXPR, adder::ContractBuilder);
+    blockchain.register_contract(
+        MULTISIG_CODE_EXPR.eval_to_expr().as_str(),
+        multisig::ContractBuilder,
+    );
+    blockchain.register_contract(
+        ADDER_CODE_EXPR.eval_to_expr().as_str(),
+        adder::ContractBuilder,
+    );
     blockchain
 }
 
 struct MultisigTestState {
     world: ScenarioWorld,
-    multisig_contract: MultisigContract,
-    adder_contract: AdderContract,
-    adder_address: Address,
 }
 
 impl MultisigTestState {
@@ -45,47 +40,37 @@ impl MultisigTestState {
         let mut world = world();
 
         world
-            .account(OWNER_ADDRESS_EXPR_REPL)
+            .account(OWNER_ADDRESS_EXPR)
             .nonce(1)
             .account(PROPOSER_ADDRESS_EXPR)
             .nonce(1)
             .balance(PROPOSER_BALANCE_EXPR)
-            .account(BOARD_MEMBER_ADDRESS_EXPR_REPL)
+            .account(BOARD_MEMBER_ADDRESS_EXPR)
             .nonce(1)
             .account(ADDER_OWNER_ADDRESS_EXPR)
             .nonce(1);
 
         world.set_state_step(SetStateStep::new().new_address(
-            OWNER_ADDRESS_EXPR_REPL.eval_to_expr().as_str(),
+            OWNER_ADDRESS_EXPR,
             1,
-            SC_MULTISIG_EXPR.eval_to_expr().as_str(),
+            SC_MULTISIG_EXPR,
         ));
 
         world.set_state_step(SetStateStep::new().new_address(
-            ADDER_OWNER_ADDRESS_EXPR.eval_to_expr().as_str(),
+            ADDER_OWNER_ADDRESS_EXPR,
             1,
-            SC_ADDER_EXPR.eval_to_expr().as_str(),
+            SC_ADDER_EXPR,
         ));
 
-        let multisig_contract = MultisigContract::new(SC_MULTISIG_EXPR.eval_to_expr().as_str());
-        let adder_contract = AdderContract::new(SC_ADDER_EXPR.eval_to_expr().as_str());
-        let adder_address = AddressValue::from(SC_ADDER_EXPR.eval_to_expr().as_str()).to_address();
-
-        Self {
-            world,
-            multisig_contract,
-            adder_contract,
-            adder_address,
-        }
+        Self { world }
     }
 
     fn deploy_multisig_contract(&mut self) -> &mut Self {
-        let board_members =
-            MultiValueVec::from(vec![BOARD_MEMBER_ADDRESS_EXPR_REPL.eval_to_array()]);
+        let board_members = MultiValueVec::from(vec![BOARD_MEMBER_ADDRESS_EXPR.eval_to_array()]);
 
         self.world
             .tx()
-            .from(OWNER_ADDRESS_EXPR_REPL)
+            .from(OWNER_ADDRESS_EXPR)
             .typed(multisig_proxy::MultisigProxy)
             .init(QUORUM_SIZE, board_members)
             .code(MULTISIG_CODE_EXPR)
@@ -94,7 +79,7 @@ impl MultisigTestState {
         let action_id: usize = self
             .world
             .tx()
-            .from(BOARD_MEMBER_ADDRESS_EXPR_REPL)
+            .from(BOARD_MEMBER_ADDRESS_EXPR)
             .to(SC_MULTISIG_EXPR)
             .typed(multisig_proxy::MultisigProxy)
             .propose_add_proposer(PROPOSER_ADDRESS_EXPR.eval_to_array())
@@ -154,7 +139,7 @@ impl MultisigTestState {
 
     fn propose_transfer_execute(
         &mut self,
-        to: Address,
+        to: ScExpr,
         egld_amount: u64,
         contract_call: FunctionCall<StaticApi>,
     ) -> usize {
@@ -163,14 +148,14 @@ impl MultisigTestState {
             .from(PROPOSER_ADDRESS_EXPR)
             .to(SC_MULTISIG_EXPR)
             .typed(multisig_proxy::MultisigProxy)
-            .propose_transfer_execute(to, egld_amount, contract_call)
+            .propose_transfer_execute(to.eval_to_array(), egld_amount, contract_call)
             .returns(ReturnsResult)
             .run()
     }
 
     fn propose_async_call(
         &mut self,
-        to: Address,
+        to: ScExpr,
         egld_amount: u64,
         contract_call: FunctionCall<StaticApi>,
     ) -> usize {
@@ -179,7 +164,7 @@ impl MultisigTestState {
             .from(PROPOSER_ADDRESS_EXPR)
             .to(SC_MULTISIG_EXPR)
             .typed(multisig_proxy::MultisigProxy)
-            .propose_async_call(to, egld_amount, contract_call)
+            .propose_async_call(to.eval_to_array(), egld_amount, contract_call)
             .returns(ReturnsResult)
             .run()
     }
@@ -198,7 +183,7 @@ impl MultisigTestState {
     fn propose_sc_deploy_from_source(
         &mut self,
         amount: u64,
-        source: Address,
+        source: ScExpr,
         code_metadata: CodeMetadata,
         arguments: MultiValueVec<Vec<u8>>,
     ) -> usize {
@@ -207,16 +192,16 @@ impl MultisigTestState {
             .from(PROPOSER_ADDRESS_EXPR)
             .to(SC_MULTISIG_EXPR)
             .typed(multisig_proxy::MultisigProxy)
-            .propose_sc_deploy_from_source(amount, source, code_metadata, arguments)
+            .propose_sc_deploy_from_source(amount, source.eval_to_array(), code_metadata, arguments)
             .returns(ReturnsResult)
             .run()
     }
 
     fn propose_sc_upgrade_from_source(
         &mut self,
-        sc_address: Address,
+        sc_address: ScExpr,
         amount: u64,
-        source: Address,
+        source: ScExpr,
         code_metadata: CodeMetadata,
         arguments: MultiValueVec<Vec<u8>>,
     ) -> usize {
@@ -225,7 +210,13 @@ impl MultisigTestState {
             .from(PROPOSER_ADDRESS_EXPR)
             .to(SC_MULTISIG_EXPR)
             .typed(multisig_proxy::MultisigProxy)
-            .propose_sc_upgrade_from_source(sc_address, amount, source, code_metadata, arguments)
+            .propose_sc_upgrade_from_source(
+                sc_address.eval_to_array(),
+                amount,
+                source.eval_to_array(),
+                code_metadata,
+                arguments,
+            )
             .returns(ReturnsResult)
             .run()
     }
@@ -233,7 +224,7 @@ impl MultisigTestState {
     fn perform(&mut self, action_id: usize) {
         self.world
             .tx()
-            .from(BOARD_MEMBER_ADDRESS_EXPR_REPL)
+            .from(BOARD_MEMBER_ADDRESS_EXPR)
             .to(SC_MULTISIG_EXPR)
             .typed(multisig_proxy::MultisigProxy)
             .perform_action_endpoint(action_id)
@@ -243,7 +234,7 @@ impl MultisigTestState {
     fn perform_and_expect_err(&mut self, action_id: usize, err_message: &str) {
         self.world
             .tx()
-            .from(BOARD_MEMBER_ADDRESS_EXPR_REPL)
+            .from(BOARD_MEMBER_ADDRESS_EXPR)
             .to(SC_MULTISIG_EXPR)
             .typed(multisig_proxy::MultisigProxy)
             .perform_action_endpoint(action_id)
@@ -254,7 +245,7 @@ impl MultisigTestState {
     fn sign(&mut self, action_id: usize) {
         self.world
             .tx()
-            .from(BOARD_MEMBER_ADDRESS_EXPR_REPL)
+            .from(BOARD_MEMBER_ADDRESS_EXPR)
             .to(SC_MULTISIG_EXPR)
             .typed(multisig_proxy::MultisigProxy)
             .sign(action_id)
@@ -292,7 +283,7 @@ fn test_add_board_member() {
     state.perform(action_id);
 
     let expected_value = MultiValueVec::from(vec![
-        BOARD_MEMBER_ADDRESS_EXPR_REPL.eval_to_array(),
+        BOARD_MEMBER_ADDRESS_EXPR.eval_to_array(),
         new_board_member_expr.eval_to_array(),
     ]);
 
@@ -368,7 +359,7 @@ fn test_try_remove_all_board_members() {
     let mut state = MultisigTestState::new();
     state.deploy_multisig_contract();
 
-    let action_id = state.propose_remove_user(BOARD_MEMBER_ADDRESS_EXPR_REPL);
+    let action_id = state.propose_remove_user(BOARD_MEMBER_ADDRESS_EXPR);
     state.sign(action_id);
     state.perform_and_expect_err(action_id, "quorum cannot exceed board size")
 }
@@ -388,7 +379,7 @@ fn test_change_quorum() {
     state
         .world
         .tx()
-        .from(BOARD_MEMBER_ADDRESS_EXPR_REPL)
+        .from(BOARD_MEMBER_ADDRESS_EXPR)
         .to(SC_MULTISIG_EXPR)
         .typed(multisig_proxy::MultisigProxy)
         .discard_action(action_id)
@@ -402,7 +393,7 @@ fn test_change_quorum() {
     state
         .world
         .tx()
-        .from(BOARD_MEMBER_ADDRESS_EXPR_REPL)
+        .from(BOARD_MEMBER_ADDRESS_EXPR)
         .to(SC_MULTISIG_EXPR)
         .typed(multisig_proxy::MultisigProxy)
         .unsign(action_id)
@@ -411,7 +402,7 @@ fn test_change_quorum() {
     state
         .world
         .tx()
-        .from(BOARD_MEMBER_ADDRESS_EXPR_REPL)
+        .from(BOARD_MEMBER_ADDRESS_EXPR)
         .to(SC_MULTISIG_EXPR)
         .typed(multisig_proxy::MultisigProxy)
         .discard_action(action_id)
@@ -421,7 +412,7 @@ fn test_change_quorum() {
     state
         .world
         .tx()
-        .from(BOARD_MEMBER_ADDRESS_EXPR_REPL)
+        .from(BOARD_MEMBER_ADDRESS_EXPR)
         .to(SC_MULTISIG_EXPR)
         .typed(multisig_proxy::MultisigProxy)
         .sign(action_id)
@@ -517,9 +508,8 @@ fn test_transfer_execute_sc_all() {
         .typed(adder_proxy::AdderProxy)
         .add(5u64)
         .into_function_call();
-    let adder_address = AddressValue::from(SC_ADDER_EXPR.eval_to_expr().as_str()).to_address();
 
-    let action_id = state.propose_transfer_execute(adder_address, 0u64, adder_call);
+    let action_id = state.propose_transfer_execute(SC_ADDER_EXPR, 0u64, adder_call);
     state.sign(action_id);
     state.perform(action_id);
 
@@ -538,9 +528,14 @@ fn test_async_call_to_sc() {
     let mut state = MultisigTestState::new();
     state.deploy_multisig_contract().deploy_adder_contract();
 
-    let adder_call = state.adder_contract.add(5u64).into_function_call();
+    let adder_call = state
+        .world
+        .tx()
+        .typed(adder_proxy::AdderProxy)
+        .add(5u64)
+        .into_function_call();
 
-    let action_id = state.propose_async_call(state.adder_address.clone(), 0u64, adder_call);
+    let action_id = state.propose_async_call(SC_ADDER_EXPR, 0u64, adder_call);
     state.sign(action_id);
     state.perform(action_id);
 
@@ -559,69 +554,82 @@ fn test_deploy_and_upgrade_from_source() {
     let mut state = MultisigTestState::new();
     state.deploy_multisig_contract().deploy_adder_contract();
 
-    const NEW_ADDER_ADDRESS_EXPR: &str = "sc:new-adder";
+    let new_adder_address_expr: ScExpr = ScExpr("new-adder");
     state.world.set_state_step(SetStateStep::new().new_address(
-        MULTISIG_ADDRESS_EXPR,
+        SC_MULTISIG_EXPR,
         0,
-        NEW_ADDER_ADDRESS_EXPR,
+        new_adder_address_expr,
     ));
 
-    let new_adder_address = AddressValue::from(NEW_ADDER_ADDRESS_EXPR).to_address();
-
     let action_id = state.propose_sc_deploy_from_source(
         0u64,
-        state.adder_address.clone(),
+        SC_ADDER_EXPR,
         CodeMetadata::all(),
         MultiValueVec::from([top_encode_to_vec_u8_or_panic(&5u64)]),
     );
     state.sign(action_id);
-    state.world.sc_call(
-        ScCallStep::new()
-            .from(BOARD_MEMBER_ADDRESS_EXPR)
-            .call(state.multisig_contract.perform_action_endpoint(action_id))
-            .expect_value(OptionalValue::Some(new_adder_address.clone())),
-    );
+    state
+        .world
+        .tx()
+        .from(BOARD_MEMBER_ADDRESS_EXPR)
+        .to(SC_MULTISIG_EXPR)
+        .typed(multisig_proxy::MultisigProxy)
+        .perform_action_endpoint(action_id)
+        .returns(ExpectValue(OptionalValue::Some(
+            new_adder_address_expr.to_address(),
+        )))
+        .run();
 
-    let adder_call = state.adder_contract.add(5u64).into_function_call();
+    let adder_call = state
+        .world
+        .tx()
+        .to(SC_ADDER_EXPR)
+        .typed(adder_proxy::AdderProxy)
+        .add(5u64)
+        .into_function_call();
 
-    let action_id = state.propose_transfer_execute(new_adder_address, 0u64, adder_call);
+    let action_id = state.propose_transfer_execute(new_adder_address_expr, 0u64, adder_call);
     state.sign(action_id);
     state.perform(action_id);
 
-    let mut new_adder_contract = AdderContract::new(NEW_ADDER_ADDRESS_EXPR);
+    state
+        .world
+        .query()
+        .to(new_adder_address_expr)
+        .typed(adder_proxy::AdderProxy)
+        .sum()
+        .returns(ExpectValue(BigUint::from(10u64)))
+        .run();
 
-    state.world.sc_query(
-        ScQueryStep::new()
-            .call(new_adder_contract.sum())
-            .expect_value(SingleValue::from(BigUint::from(10u64))),
-    );
+    let factorial_address_expr: ScExpr = ScExpr("factorial");
+    let factorial_path_expr: MxscExpr = MxscExpr("test-contracts/factorial.mxsc.json");
 
-    const FACTORIAL_ADDRESS_EXPR: &str = "sc:factorial";
-    const FACTORIAL_PATH_EXPR: &str = "mxsc:test-contracts/factorial.mxsc.json";
+    let factorial_code = state
+        .world
+        .code_expression(factorial_path_expr.eval_to_expr().as_str());
 
-    let factorial_code = state.world.code_expression(FACTORIAL_PATH_EXPR);
-    let factorial_address = AddressValue::from(FACTORIAL_ADDRESS_EXPR).to_address();
+    state.world.register_contract(
+        factorial_path_expr.eval_to_expr().as_str(),
+        factorial::ContractBuilder,
+    );
 
     state
         .world
-        .register_contract(FACTORIAL_PATH_EXPR, factorial::ContractBuilder);
-    state.world.set_state_step(SetStateStep::new().put_account(
-        FACTORIAL_ADDRESS_EXPR,
-        Account::new().nonce(1).code(factorial_code.clone()),
-    ));
+        .account(factorial_address_expr)
+        .code(factorial_code.clone());
 
     let action_id = state.propose_sc_upgrade_from_source(
-        state.adder_address.clone(),
+        SC_ADDER_EXPR,
         0u64,
-        factorial_address,
+        factorial_address_expr,
         CodeMetadata::all(),
         MultiValueVec::new(),
     );
     state.sign(action_id);
     state.perform(action_id);
 
-    state.world.check_state_step(
-        CheckStateStep::new()
-            .put_account(ADDER_ADDRESS_EXPR, CheckAccount::new().code(factorial_code)),
-    );
+    state
+        .world
+        .check_account(SC_ADDER_EXPR)
+        .code(factorial_path_expr.eval_to_expr().as_str());
 }
diff --git a/framework/scenario/src/facade/expr/mxsc_expr.rs b/framework/scenario/src/facade/expr/mxsc_expr.rs
index 0946b93327..d130102600 100644
--- a/framework/scenario/src/facade/expr/mxsc_expr.rs
+++ b/framework/scenario/src/facade/expr/mxsc_expr.rs
@@ -30,3 +30,23 @@ where
 }
 
 impl<'a, Env> TxCodeValue<Env> for MxscExpr<'a> where Env: ScenarioTxEnv {}
+
+impl<'a> MxscExpr<'a> {
+    pub fn eval_to_expr(&self) -> String {
+        format!("{MXSC_PREFIX}{}", self.0)
+    }
+}
+
+#[cfg(test)]
+pub mod tests {
+    use crate::imports::MxscExpr;
+
+    fn assert_eq_eval(expr: &'static str, expected: &str) {
+        assert_eq!(&MxscExpr(expr).eval_to_expr(), expected);
+    }
+
+    #[test]
+    fn test_address_value() {
+        assert_eq_eval("output/adder.mxsc.json", "mxsc:output/adder.mxsc.json");
+    }
+}

From 73638aa9c3721f6ceff0953ca1b50fd2084b880c Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Sun, 21 Apr 2024 17:06:25 +0300
Subject: [PATCH 0741/1254] unified syntax - sync call same context & readonly

---
 .../forwarder-raw/src/forwarder_raw_sync.rs   |  4 +-
 .../types/interaction/tx_exec/tx_exec_sync.rs | 66 +++++++++++++++++++
 2 files changed, 68 insertions(+), 2 deletions(-)

diff --git a/contracts/feature-tests/composability/forwarder-raw/src/forwarder_raw_sync.rs b/contracts/feature-tests/composability/forwarder-raw/src/forwarder_raw_sync.rs
index a4e98f36a7..799ce0cb83 100644
--- a/contracts/feature-tests/composability/forwarder-raw/src/forwarder_raw_sync.rs
+++ b/contracts/feature-tests/composability/forwarder-raw/src/forwarder_raw_sync.rs
@@ -82,7 +82,7 @@ pub trait ForwarderRawSync: super::forwarder_raw_common::ForwarderRawCommon {
             .raw_call(endpoint_name)
             .arguments_raw(args.to_arg_buffer())
             .returns(ReturnsRawResult)
-            .sync_call();
+            .sync_call_same_context();
 
         self.execute_on_same_context_result(result);
     }
@@ -102,7 +102,7 @@ pub trait ForwarderRawSync: super::forwarder_raw_common::ForwarderRawCommon {
             .raw_call(endpoint_name)
             .arguments_raw(args.to_arg_buffer())
             .returns(ReturnsRawResult)
-            .sync_call();
+            .sync_call_readonly();
 
         self.execute_on_dest_context_result(result);
     }
diff --git a/framework/base/src/types/interaction/tx_exec/tx_exec_sync.rs b/framework/base/src/types/interaction/tx_exec/tx_exec_sync.rs
index 78169a665b..e66e76cf26 100644
--- a/framework/base/src/types/interaction/tx_exec/tx_exec_sync.rs
+++ b/framework/base/src/types/interaction/tx_exec/tx_exec_sync.rs
@@ -54,6 +54,72 @@ where
         let tuple_result = result_handler.list_process_result(&sync_raw_result);
         tuple_result.flatten_unpack()
     }
+
+    fn execute_sync_call_same_context_raw(self) -> (ManagedVec<Api, ManagedBuffer<Api>>, RH) {
+        let gas_limit = self.gas.gas_value(&self.env);
+
+        let raw_result = self.payment.with_normalized(
+            &self.env,
+            &self.from,
+            self.to,
+            self.data.into(),
+            |norm_to, norm_egld, norm_fc| {
+                SendRawWrapper::<Api>::new().execute_on_same_context_raw(
+                    gas_limit,
+                    norm_to,
+                    norm_egld,
+                    &norm_fc.function_name,
+                    &norm_fc.arg_buffer,
+                )
+            },
+        );
+
+        SendRawWrapper::<Api>::new().clean_return_data();
+
+        (raw_result, self.result_handler)
+    }
+
+    pub fn sync_call_same_context(self) -> <RH::ListReturns as NestedTupleFlatten>::Unpacked {
+        let (raw_result, result_handler) = self.execute_sync_call_same_context_raw();
+        let sync_raw_result = SyncCallRawResult(raw_result);
+        let tuple_result = result_handler.list_process_result(&sync_raw_result);
+        tuple_result.flatten_unpack()
+    }
+}
+
+impl<Api, To, Gas, FC, RH> Tx<TxScEnv<Api>, (), To, (), Gas, FC, RH>
+where
+    Api: CallTypeApi,
+    To: TxToSpecified<TxScEnv<Api>>,
+    Gas: TxGas<TxScEnv<Api>>,
+    FC: TxDataFunctionCall<TxScEnv<Api>>,
+    RH: RHListExec<SyncCallRawResult<Api>, TxScEnv<Api>>,
+    RH::ListReturns: NestedTupleFlatten,
+{
+    fn execute_sync_call_readonly_raw(self) -> (ManagedVec<Api, ManagedBuffer<Api>>, RH) {
+        let gas_limit = self.gas.gas_value(&self.env);
+        let function_call = self.data.into();
+
+        let raw_result = self.to.with_value_ref(&self.env, |to| {
+            SendRawWrapper::<Api>::new().execute_on_dest_context_readonly_raw(
+                gas_limit,
+                to,
+                &function_call.function_name,
+                &function_call.arg_buffer,
+            )
+        });
+
+        SendRawWrapper::<Api>::new().clean_return_data();
+
+        (raw_result, self.result_handler)
+    }
+
+    pub fn sync_call_readonly(self) -> <RH::ListReturns as NestedTupleFlatten>::Unpacked {
+        let (raw_result, result_handler) = self.execute_sync_call_readonly_raw();
+        let sync_raw_result = SyncCallRawResult(raw_result);
+        let tuple_result = result_handler.list_process_result(&sync_raw_result);
+        tuple_result.flatten_unpack()
+    }
 }
 
 impl<Api, To, Payment, Gas, FC, OriginalResult>

From 1114009f96fb759ee634f9642ad7143ac03b6efb Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Sun, 21 Apr 2024 20:19:35 +0300
Subject: [PATCH 0742/1254] cleanup

---
 .../esdt-contract-pair/first-contract/src/lib.rs       | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/contracts/feature-tests/composability/esdt-contract-pair/first-contract/src/lib.rs b/contracts/feature-tests/composability/esdt-contract-pair/first-contract/src/lib.rs
index 7ce368781a..2d35ac5ea8 100644
--- a/contracts/feature-tests/composability/esdt-contract-pair/first-contract/src/lib.rs
+++ b/contracts/feature-tests/composability/esdt-contract-pair/first-contract/src/lib.rs
@@ -2,9 +2,9 @@
 
 multiversx_sc::imports!();
 
-const ESDT_TRANSFER_STRING: &[u8] = b"ESDTTransfer";
-const SECOND_CONTRACT_ACCEPT_ESDT_PAYMENT: &[u8] = b"acceptEsdtPayment";
-const SECOND_CONTRACT_REJECT_ESDT_PAYMENT: &[u8] = b"rejectEsdtPayment";
+const ESDT_TRANSFER_STRING: &str = "ESDTTransfer";
+const SECOND_CONTRACT_ACCEPT_ESDT_PAYMENT: &str = "acceptEsdtPayment";
+const SECOND_CONTRACT_REJECT_ESDT_PAYMENT: &str = "rejectEsdtPayment";
 
 #[multiversx_sc::contract]
 pub trait FirstContract {
@@ -115,7 +115,7 @@ pub trait FirstContract {
         self.tx()
             .to(&second_contract_address)
             .gas(gas_left)
-            .raw_call(ManagedBuffer::from(SECOND_CONTRACT_ACCEPT_ESDT_PAYMENT))
+            .raw_call(SECOND_CONTRACT_ACCEPT_ESDT_PAYMENT)
             .single_esdt(&expected_token_identifier, 0u64, &esdt_value)
             .transfer_execute();
     }
@@ -138,7 +138,7 @@ pub trait FirstContract {
 
         self.tx()
             .to(to)
-            .raw_call(ManagedBuffer::from(ESDT_TRANSFER_STRING))
+            .raw_call(ESDT_TRANSFER_STRING)
             .arguments_raw(arg_buffer)
             .async_call_and_exit();
     }

From 68a6df617e3cbc1ef56e1aa3c6a251fc68d66846 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Mon, 22 Apr 2024 13:59:09 +0300
Subject: [PATCH 0743/1254] cleanup

---
 contracts/examples/adder/sc-config.toml       |   3 -
 .../examples/multisig/src/adder_proxy.rs      | 110 ------------------
 2 files changed, 113 deletions(-)
 delete mode 100644 contracts/examples/multisig/src/adder_proxy.rs

diff --git a/contracts/examples/adder/sc-config.toml b/contracts/examples/adder/sc-config.toml
index 091de3f7f6..b56f82b429 100644
--- a/contracts/examples/adder/sc-config.toml
+++ b/contracts/examples/adder/sc-config.toml
@@ -2,6 +2,3 @@
 
 [[proxy]]
 path = "src/adder_proxy.rs"
-
-[[proxy]]
-path = "../multisig/src/adder_proxy.rs"
diff --git a/contracts/examples/multisig/src/adder_proxy.rs b/contracts/examples/multisig/src/adder_proxy.rs
deleted file mode 100644
index 0b1b663669..0000000000
--- a/contracts/examples/multisig/src/adder_proxy.rs
+++ /dev/null
@@ -1,110 +0,0 @@
-// Code generated by the multiversx-sc proxy generator. DO NOT EDIT.
-
-////////////////////////////////////////////////////
-////////////////// AUTO-GENERATED //////////////////
-////////////////////////////////////////////////////
-
-#![allow(dead_code)]
-#![allow(clippy::all)]
-
-use multiversx_sc::proxy_imports::*;
-
-pub struct AdderProxy;
-
-impl<Env, From, To, Gas> TxProxyTrait<Env, From, To, Gas> for AdderProxy
-where
-    Env: TxEnv,
-    From: TxFrom<Env>,
-    To: TxTo<Env>,
-    Gas: TxGas<Env>,
-{
-    type TxProxyMethods = AdderProxyMethods<Env, From, To, Gas>;
-
-    fn proxy_methods(self, tx: Tx<Env, From, To, (), Gas, (), ()>) -> Self::TxProxyMethods {
-        AdderProxyMethods { wrapped_tx: tx }
-    }
-}
-
-pub struct AdderProxyMethods<Env, From, To, Gas>
-where
-    Env: TxEnv,
-    From: TxFrom<Env>,
-    To: TxTo<Env>,
-    Gas: TxGas<Env>,
-{
-    wrapped_tx: Tx<Env, From, To, (), Gas, (), ()>,
-}
-
-#[rustfmt::skip]
-impl<Env, From, Gas> AdderProxyMethods<Env, From, (), Gas>
-where
-    Env: TxEnv,
-    Env::Api: VMApi,
-    From: TxFrom<Env>,
-    Gas: TxGas<Env>,
-{
-    pub fn init<
-        Arg0: CodecInto<BigUint<Env::Api>>,
-    >(
-        self,
-        initial_value: Arg0,
-    ) -> TxProxyDeploy<Env, From, Gas, ()> {
-        self.wrapped_tx
-            .raw_deploy()
-            .argument(&initial_value)
-            .original_result()
-    }
-}
-
-#[rustfmt::skip]
-impl<Env, From, To, Gas> AdderProxyMethods<Env, From, To, Gas>
-where
-    Env: TxEnv,
-    Env::Api: VMApi,
-    From: TxFrom<Env>,
-    To: TxTo<Env>,
-    Gas: TxGas<Env>,
-{
-    pub fn upgrade<
-        Arg0: CodecInto<BigUint<Env::Api>>,
-    >(
-        self,
-        initial_value: Arg0,
-    ) -> TxProxyUpgrade<Env, From, To, Gas, ()> {
-        self.wrapped_tx
-            .raw_upgrade()
-            .argument(&initial_value)
-            .original_result()
-    }
-}
-
-#[rustfmt::skip]
-impl<Env, From, To, Gas> AdderProxyMethods<Env, From, To, Gas>
-where
-    Env: TxEnv,
-    Env::Api: VMApi,
-    From: TxFrom<Env>,
-    To: TxTo<Env>,
-    Gas: TxGas<Env>,
-{
-    pub fn sum(
-        self,
-    ) -> TxProxyCall<Env, From, To, Gas, BigUint<Env::Api>> {
-        self.wrapped_tx
-            .raw_call("getSum")
-            .original_result()
-    }
-
-    /// Add desired amount to the storage variable. 
-    pub fn add<
-        Arg0: CodecInto<BigUint<Env::Api>>,
-    >(
-        self,
-        value: Arg0,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
-        self.wrapped_tx
-            .raw_call("add")
-            .argument(&value)
-            .original_result()
-    }
-}

From 5f03f836413342ece941d0eaf7c51b3d2ebba9eb Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Mon, 22 Apr 2024 14:44:28 +0200
Subject: [PATCH 0744/1254] optimization for transaction fetching for
 interactor and small fix for fetching esdt balances

---
 Cargo.lock                                    |  1 +
 .../scenario/src/standalone/account_tool.rs   |  2 +-
 framework/snippets/Cargo.toml                 |  1 +
 framework/snippets/src/interactor_retrieve.rs | 90 ++++++++-----------
 sdk/core/src/data/address.rs                  |  6 ++
 sdk/core/src/data/transaction.rs              | 14 +--
 6 files changed, 54 insertions(+), 60 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 32adcdf5bf..0b6d17acb1 100755
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1945,6 +1945,7 @@ dependencies = [
  "log",
  "multiversx-sc-scenario",
  "multiversx-sdk",
+ "rand 0.8.5",
  "tokio",
 ]
 
diff --git a/framework/scenario/src/standalone/account_tool.rs b/framework/scenario/src/standalone/account_tool.rs
index 76ecd693a5..1ea1e2f6b4 100644
--- a/framework/scenario/src/standalone/account_tool.rs
+++ b/framework/scenario/src/standalone/account_tool.rs
@@ -76,7 +76,7 @@ pub fn set_account(
 
     for (_, esdt_balance) in account_esdt.iter() {
         account_state = account_state.esdt_balance(
-            esdt_balance.token_identifier.as_str(),
+            format!("str:{}", esdt_balance.token_identifier).as_str(),
             esdt_balance.balance.as_str(),
         );
     }
diff --git a/framework/snippets/Cargo.toml b/framework/snippets/Cargo.toml
index d07d310522..4a2476136f 100644
--- a/framework/snippets/Cargo.toml
+++ b/framework/snippets/Cargo.toml
@@ -20,6 +20,7 @@ base64 = "0.21.5"
 log = "0.4.17"
 env_logger = "0.11"
 futures = "0.3"
+rand = "0.8.5"
 
 [dependencies.multiversx-sc-scenario]
 version = "=0.49.0-alpha.3"
diff --git a/framework/snippets/src/interactor_retrieve.rs b/framework/snippets/src/interactor_retrieve.rs
index c19392095a..6dfa0c5085 100644
--- a/framework/snippets/src/interactor_retrieve.rs
+++ b/framework/snippets/src/interactor_retrieve.rs
@@ -1,64 +1,50 @@
 use crate::Interactor;
 use log::info;
 use multiversx_sdk::data::transaction::TransactionOnNetwork;
-use std::time::Duration;
+use rand::Rng;
+use std::time::{Duration, Instant};
 
-const TX_GET_RESULTS_NUM_RETRIES: usize = 8;
-const EXTRA_WAITING_TIME_MS: Duration = Duration::from_millis(8000);
-const WAITING_TIME_MS: Duration = Duration::from_secs(25);
-const WAIT: u64 = 1000;
+const INITIAL_BACKOFF_DELAY: f32 = 1.4;
+const MAX_RETRIES: usize = 8;
+const MAX_BACKOFF_DELAY: Duration = Duration::from_secs(6);
 
 impl Interactor {
     /// Retrieves a transaction from the network.
     pub(crate) async fn retrieve_tx_on_network(&self, tx_hash: String) -> TransactionOnNetwork {
-        let mut waiting_time_ms = 0;
-        let mut break_outer = false;
-        sleep(&mut waiting_time_ms, WAITING_TIME_MS).await;
-
-        let tx = 'outer: loop {
-            let mut retries = TX_GET_RESULTS_NUM_RETRIES;
-            let mut wait = WAIT;
-            loop {
-                let tx_info_result = self.proxy.get_transaction_info_with_results(&tx_hash).await;
-                match tx_info_result {
-                    Ok(tx) => {
-                        if break_outer {
-                            break 'outer tx;
-                        }
-
-                        // reset waiting time
-                        waiting_time_ms = WAITING_TIME_MS.as_millis() as u64;
-
-                        tokio::time::sleep(EXTRA_WAITING_TIME_MS).await;
-                        break_outer = true;
-
+        let mut rng = rand::thread_rng();
+        let mut retries = 0;
+        let mut backoff_delay = Duration::from_secs_f32(INITIAL_BACKOFF_DELAY);
+        let start_time = Instant::now();
+
+        loop {
+            match self.proxy.get_transaction_info_with_results(&tx_hash).await {
+                Ok(tx) => {
+                    info!("Transaction retrieved successfully: {:#?}", tx);
+                    return tx;
+                },
+                Err(err) => {
+                    retries += 1;
+                    if retries >= MAX_RETRIES {
+                        info!("Transaction failed, max retries exceeded: {}", err);
+                        println!("Transaction failed, max retries exceeded: {}", err);
                         break;
-                    },
-                    Err(err) => {
-                        assert!(
-                            retries > 0,
-                            "still no answer after {TX_GET_RESULTS_NUM_RETRIES} retries"
-                        );
-
-                        info!(
-                            "tx result fetch error after {} ms: {}",
-                            self.waiting_time_ms, err
-                        );
-                        retries -= 1;
-                        sleep(&mut waiting_time_ms, Duration::from_millis(wait)).await;
-                        wait *= 2;
-                    },
-                }
+                    }
+
+                    let backoff_time = backoff_delay
+                        .mul_f32(rng.gen_range(0.8..1.2))
+                        .min(MAX_BACKOFF_DELAY);
+                    tokio::time::sleep(backoff_time).await;
+                    backoff_delay *= 2; // exponential backoff
+                },
             }
-        };
-
-        info!("tx with results: {:#?}", tx);
-        tx
+        }
+
+        // retries have been exhausted
+        let elapsed_time = start_time.elapsed();
+        println!(
+            "Fetching transaction failed and retries exhausted, returning default transaction. Total elapsed time: {:?}",
+            elapsed_time
+        );
+        TransactionOnNetwork::default()
     }
 }
-
-/// Sleeps for the given duration and adds the duration to the waiting time.
-pub async fn sleep(waiting_time_ms: &mut u64, duration: Duration) {
-    *waiting_time_ms += duration.as_millis() as u64;
-    tokio::time::sleep(duration).await;
-}
diff --git a/sdk/core/src/data/address.rs b/sdk/core/src/data/address.rs
index 9612157326..8c4af1fb37 100644
--- a/sdk/core/src/data/address.rs
+++ b/sdk/core/src/data/address.rs
@@ -63,6 +63,12 @@ impl Debug for Address {
     }
 }
 
+impl Default for Address {
+    fn default() -> Self {
+        Address::from_bytes([0u8; 32])
+    }
+}
+
 impl Serialize for Address {
     fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
     where
diff --git a/sdk/core/src/data/transaction.rs b/sdk/core/src/data/transaction.rs
index 2df6f37d87..ed0a51b8df 100644
--- a/sdk/core/src/data/transaction.rs
+++ b/sdk/core/src/data/transaction.rs
@@ -48,7 +48,7 @@ pub struct ResponseTxCost {
 }
 
 // TransactionOnNetwork holds a transaction's info entry in a hyper block
-#[derive(Debug, Clone, Serialize, Deserialize)]
+#[derive(Debug, Clone, Serialize, Deserialize, Default)]
 #[serde(rename_all = "camelCase")]
 pub struct TransactionOnNetwork {
     #[serde(rename = "type")]
@@ -67,19 +67,19 @@ pub struct TransactionOnNetwork {
     pub destination_shard: u32,
     pub block_nonce: u64,
     pub block_hash: String,
-    pub notarized_at_source_in_meta_nonce: u64,
+    pub notarized_at_source_in_meta_nonce: Option<u64>,
     #[serde(rename = "NotarizedAtSourceInMetaHash")]
-    pub notarized_at_source_in_meta_hash: String,
-    pub notarized_at_destination_in_meta_nonce: u64,
-    pub notarized_at_destination_in_meta_hash: String,
+    pub notarized_at_source_in_meta_hash: Option<String>,
+    pub notarized_at_destination_in_meta_nonce: Option<u64>,
+    pub notarized_at_destination_in_meta_hash: Option<String>,
     pub processing_type_on_destination: String,
     pub miniblock_type: String,
     pub miniblock_hash: String,
     pub timestamp: u64,
     pub data: Option<String>,
     pub status: String,
-    pub hyperblock_nonce: u64,
-    pub hyperblock_hash: String,
+    pub hyperblock_nonce: Option<u64>,
+    pub hyperblock_hash: Option<String>,
     pub smart_contract_results: Option<Vec<ApiSmartContractResult>>,
     pub logs: Option<ApiLogs>,
 }

From dbf0e2b181536e2cfd7889323a82881884605d57 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Mon, 22 Apr 2024 16:47:04 +0200
Subject: [PATCH 0745/1254] cleanup and extra impls for AddressValue

---
 .../tests/price_aggregator_blackbox_test.rs   | 36 ++++----
 .../src/scenario/model/value/address_value.rs | 84 +++++++++++++++++++
 2 files changed, 102 insertions(+), 18 deletions(-)

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 c57e36711e..bd73790c0a 100644
--- a/contracts/core/price-aggregator/tests/price_aggregator_blackbox_test.rs
+++ b/contracts/core/price-aggregator/tests/price_aggregator_blackbox_test.rs
@@ -44,26 +44,24 @@ impl PriceAggregatorTestState {
     fn new() -> Self {
         let mut world = world();
 
-        let mut set_state_step = SetStateStep::new()
-            .put_account(OWNER, Account::new().nonce(1))
-            .new_address(OWNER_ADDRESS_EXPR, 1, PRICE_AGGREGATOR_ADDRESS_EXPR)
-            .block_timestamp(100);
+        world.account(OWNER).nonce(1);
+        world.current_block().block_timestamp(100);
+
+        world.set_state_step(SetStateStep::new()).new_address(
+            OWNER_ADDRESS_EXPR,
+            1,
+            PRICE_AGGREGATOR_ADDRESS_EXPR,
+        );
 
         let mut oracles = Vec::new();
         for i in 1..=NR_ORACLES {
             let address_expr = format!("address:oracle{}", i);
             let address_value = AddressValue::from(address_expr.as_str());
 
-            set_state_step = set_state_step.put_account(
-                address_expr.as_str(),
-                Account::new().nonce(1).balance(STAKE_AMOUNT),
-            );
-
+            world.account(address_expr).nonce(1).balance(STAKE_AMOUNT);
             oracles.push(address_value);
         }
-        world.set_state_step(set_state_step);
 
-        // let price_aggregator_contract = PriceAggregatorContract::new(PRICE_AGGREGATOR_ADDRESS_EXPR);
         let price_aggregator_whitebox = WhiteboxContract::new(
             PRICE_AGGREGATOR_ADDRESS_EXPR,
             multiversx_price_aggregator_sc::contract_obj,
@@ -104,7 +102,7 @@ impl PriceAggregatorTestState {
         for address in self.oracles.iter() {
             self.world
                 .tx()
-                .from(&address.to_address())
+                .from(address)
                 .to(PRICE_AGGREGATOR)
                 .typed(price_aggregator_proxy::PriceAggregatorProxy)
                 .stake()
@@ -138,7 +136,7 @@ impl PriceAggregatorTestState {
     fn submit(&mut self, from: &AddressValue, submission_timestamp: u64, price: u64) {
         self.world
             .tx()
-            .from(&from.to_address())
+            .from(from)
             .to(PRICE_AGGREGATOR)
             .typed(price_aggregator_proxy::PriceAggregatorProxy)
             .submit(
@@ -160,7 +158,7 @@ impl PriceAggregatorTestState {
     ) {
         self.world
             .tx()
-            .from(&from.to_address())
+            .from(from)
             .to(PRICE_AGGREGATOR)
             .typed(price_aggregator_proxy::PriceAggregatorProxy)
             .submit(
@@ -178,7 +176,7 @@ impl PriceAggregatorTestState {
     fn vote_slash_member(&mut self, from: &AddressValue, member_to_slash: Address) {
         self.world
             .tx()
-            .from(&from.to_address())
+            .from(from)
             .to(PRICE_AGGREGATOR)
             .typed(price_aggregator_proxy::PriceAggregatorProxy)
             .vote_slash_member(member_to_slash)
@@ -283,7 +281,8 @@ fn test_price_aggregator_submit_round_ok() {
     let current_timestamp = 110;
     state
         .world
-        .set_state_step(SetStateStep::new().block_timestamp(current_timestamp));
+        .current_block()
+        .block_timestamp(current_timestamp);
 
     // submit second
     state.submit(&state.oracles[1].clone(), 101, 11_000);
@@ -340,7 +339,8 @@ fn test_price_aggregator_discarded_round() {
     let current_timestamp = 100 + MAX_ROUND_DURATION_SECONDS + 1;
     state
         .world
-        .set_state_step(SetStateStep::new().block_timestamp(current_timestamp));
+        .current_block()
+        .block_timestamp(current_timestamp);
 
     // submit second - this will discard the previous submission
     state.submit(&state.oracles[1].clone(), current_timestamp - 1, 11_000);
@@ -378,7 +378,7 @@ fn test_price_aggregator_slashing() {
     state
         .world
         .tx()
-        .from(&state.oracles[0].to_address())
+        .from(&state.oracles[0])
         .to(PRICE_AGGREGATOR)
         .typed(price_aggregator_proxy::PriceAggregatorProxy)
         .slash_member(state.oracles[1].to_address())
diff --git a/framework/scenario/src/scenario/model/value/address_value.rs b/framework/scenario/src/scenario/model/value/address_value.rs
index 1315a4fbd5..8564bb6e47 100644
--- a/framework/scenario/src/scenario/model/value/address_value.rs
+++ b/framework/scenario/src/scenario/model/value/address_value.rs
@@ -1,3 +1,7 @@
+use multiversx_sc::{
+    api::ManagedTypeApi,
+    types::{AnnotatedValue, ManagedAddress, ManagedBuffer, TxEnv, TxFrom, TxFromSpecified},
+};
 use std::fmt;
 
 use crate::multiversx_sc::types::{Address, AddressExpr, ScExpr};
@@ -151,3 +155,83 @@ impl From<ScExpr<'_>> for AddressValue {
         }
     }
 }
+
+impl<M> From<&AddressValue> for ManagedAddress<M>
+where
+    M: ManagedTypeApi,
+{
+    #[inline]
+    fn from(address_value: &AddressValue) -> Self {
+        ManagedAddress::from_address(&address_value.value)
+    }
+}
+
+impl<Env> TxFrom<Env> for AddressValue
+where
+    Env: TxEnv,
+{
+    fn resolve_address(&self, _env: &Env) -> ManagedAddress<Env::Api> {
+        self.into()
+    }
+}
+
+impl<Env> AnnotatedValue<Env, ManagedAddress<Env::Api>> for AddressValue
+where
+    Env: TxEnv,
+{
+    fn annotation(&self, _env: &Env) -> multiversx_sc::types::ManagedBuffer<Env::Api> {
+        ManagedBuffer::from(self.original.to_string())
+    }
+
+    fn to_value(&self, _env: &Env) -> ManagedAddress<Env::Api> {
+        ManagedAddress::from_address(&self.value)
+    }
+
+    fn into_value(self, _env: &Env) -> ManagedAddress<Env::Api> {
+        ManagedAddress::from_address(&self.value)
+    }
+
+    fn with_value_ref<F, R>(&self, _env: &Env, f: F) -> R
+    where
+        F: FnOnce(&ManagedAddress<Env::Api>) -> R,
+    {
+        f(&ManagedAddress::from_address(&self.value))
+    }
+}
+
+impl<Env> AnnotatedValue<Env, ManagedAddress<Env::Api>> for &AddressValue
+where
+    Env: TxEnv,
+{
+    fn annotation(&self, _env: &Env) -> multiversx_sc::types::ManagedBuffer<Env::Api> {
+        ManagedBuffer::from(self.original.to_string())
+    }
+
+    fn to_value(&self, _env: &Env) -> ManagedAddress<Env::Api> {
+        ManagedAddress::from_address(&self.value)
+    }
+
+    fn into_value(self, _env: &Env) -> ManagedAddress<Env::Api> {
+        ManagedAddress::from_address(&self.value)
+    }
+
+    fn with_value_ref<F, R>(&self, _env: &Env, f: F) -> R
+    where
+        F: FnOnce(&ManagedAddress<Env::Api>) -> R,
+    {
+        f(&ManagedAddress::from_address(&self.value))
+    }
+}
+
+impl<Env> TxFromSpecified<Env> for AddressValue where Env: TxEnv {}
+
+impl<Env> TxFrom<Env> for &AddressValue
+where
+    Env: TxEnv,
+{
+    fn resolve_address(&self, _env: &Env) -> ManagedAddress<Env::Api> {
+        ManagedAddress::from_address(&self.value)
+    }
+}
+
+impl<Env> TxFromSpecified<Env> for &AddressValue where Env: TxEnv {}

From 4be479b85b6f8d18eff7691efc7aadc35115b0b6 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Mon, 22 Apr 2024 18:51:01 +0200
Subject: [PATCH 0746/1254] #[type_abi] for structs and proxy regen

---
 contracts/core/price-aggregator/src/events.rs        |  3 ++-
 .../price-aggregator/src/price_aggregator_data.rs    | 12 ++++++++----
 .../price-aggregator/tests/price_aggregator_proxy.rs |  4 ++--
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/contracts/core/price-aggregator/src/events.rs b/contracts/core/price-aggregator/src/events.rs
index f2212815c9..d485e622db 100644
--- a/contracts/core/price-aggregator/src/events.rs
+++ b/contracts/core/price-aggregator/src/events.rs
@@ -3,7 +3,8 @@ multiversx_sc::derive_imports!();
 
 use crate::price_aggregator_data::{TimestampedPrice, TokenPair};
 
-#[derive(TypeAbi, TopEncode)]
+#[type_abi]
+#[derive(TopEncode)]
 pub struct NewRoundEvent<M: ManagedTypeApi> {
     price: BigUint<M>,
     timestamp: u64,
diff --git a/contracts/core/price-aggregator/src/price_aggregator_data.rs b/contracts/core/price-aggregator/src/price_aggregator_data.rs
index 13249216ba..c348b67d22 100644
--- a/contracts/core/price-aggregator/src/price_aggregator_data.rs
+++ b/contracts/core/price-aggregator/src/price_aggregator_data.rs
@@ -1,13 +1,15 @@
 multiversx_sc::imports!();
 multiversx_sc::derive_imports!();
 
-#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, TypeAbi, Clone)]
+#[type_abi]
+#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, Clone)]
 pub struct TokenPair<M: ManagedTypeApi> {
     pub from: ManagedBuffer<M>,
     pub to: ManagedBuffer<M>,
 }
 
-#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, TypeAbi)]
+#[type_abi]
+#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct PriceFeed<M: ManagedTypeApi> {
     pub round_id: u32,
     pub from: ManagedBuffer<M>,
@@ -17,14 +19,16 @@ pub struct PriceFeed<M: ManagedTypeApi> {
     pub decimals: u8,
 }
 
-#[derive(TopEncode, TopDecode, TypeAbi, Debug, PartialEq, Eq)]
+#[type_abi]
+#[derive(TopEncode, TopDecode, Debug, PartialEq, Eq)]
 pub struct TimestampedPrice<M: ManagedTypeApi> {
     pub price: BigUint<M>,
     pub timestamp: u64,
     pub decimals: u8,
 }
 
-#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, TypeAbi, Debug, PartialEq, Eq)]
+#[type_abi]
+#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, Debug, PartialEq, Eq)]
 pub struct OracleStatus {
     pub accepted_submissions: u64,
     pub total_submissions: u64,
diff --git a/contracts/core/price-aggregator/tests/price_aggregator_proxy.rs b/contracts/core/price-aggregator/tests/price_aggregator_proxy.rs
index c7b05acaf5..fbdab94593 100644
--- a/contracts/core/price-aggregator/tests/price_aggregator_proxy.rs
+++ b/contracts/core/price-aggregator/tests/price_aggregator_proxy.rs
@@ -340,7 +340,7 @@ where
     }
 }
 
-#[derive(TopEncode, TopDecode)]
+#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct PriceFeed<Api>
 where
     Api: ManagedTypeApi,
@@ -353,7 +353,7 @@ where
     pub decimals: u8,
 }
 
-#[derive(TopEncode, TopDecode)]
+#[derive(TopEncode)]
 pub struct NewRoundEvent<Api>
 where
     Api: ManagedTypeApi,

From 99d6177d3d64f17af00ee3f137bded51d33af8b4 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Mon, 22 Apr 2024 21:54:36 +0300
Subject: [PATCH 0747/1254] unified syntax - removed method to_caller

---
 contracts/feature-tests/composability/vault/src/vault.rs | 2 +-
 framework/base/src/types/interaction/tx.rs               | 9 +--------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/contracts/feature-tests/composability/vault/src/vault.rs b/contracts/feature-tests/composability/vault/src/vault.rs
index a14da93521..1fb32cccdd 100644
--- a/contracts/feature-tests/composability/vault/src/vault.rs
+++ b/contracts/feature-tests/composability/vault/src/vault.rs
@@ -222,7 +222,7 @@ pub trait Vault {
             ));
         }
 
-        self.tx().to_caller().payment(new_tokens).transfer();
+        self.tx().to(ToCaller).payment(new_tokens).transfer();
     }
 
     #[event("accept_funds")]
diff --git a/framework/base/src/types/interaction/tx.rs b/framework/base/src/types/interaction/tx.rs
index 98d88e499a..c7a72eaa75 100644
--- a/framework/base/src/types/interaction/tx.rs
+++ b/framework/base/src/types/interaction/tx.rs
@@ -1,11 +1,9 @@
 use crate::{
     api::CallTypeApi,
-    contract_base::BlockchainWrapper,
     types::{
         BigUint, CodeMetadata, EgldOrEsdtTokenIdentifier, EgldOrEsdtTokenPayment,
         EgldOrEsdtTokenPaymentRefs, EgldOrMultiEsdtPayment, EsdtTokenPayment, EsdtTokenPaymentRefs,
-        ManagedAddress, ManagedBuffer, ManagedOption, ManagedVec, MultiEsdtPayment,
-        TokenIdentifier,
+        ManagedBuffer, ManagedOption, ManagedVec, MultiEsdtPayment, TokenIdentifier,
     },
 };
 
@@ -151,11 +149,6 @@ where
             result_handler: self.result_handler,
         }
     }
-
-    pub fn to_caller(self) -> Tx<Env, From, ManagedAddress<Env::Api>, Payment, Gas, Data, RH> {
-        let caller = BlockchainWrapper::<Env::Api>::new().get_caller();
-        self.to(caller)
-    }
 }
 
 impl<Env, From, To, Gas, Data, RH> Tx<Env, From, To, (), Gas, Data, RH>

From a2539b66b3994e98e084658a658fa6e7d2ff77f2 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Mon, 22 Apr 2024 23:32:01 +0300
Subject: [PATCH 0748/1254] unified syntax - migrate rewards distribution

---
 .../rewards-distribution/sc-config.toml       |   5 +
 .../src/rewards_distribution.rs               |   7 +-
 .../src/rewards_distribution_proxy.rs         | 233 +++++++++++++++
 .../tests/mock_seed_nft_minter_proxy.rs       |  86 ++++++
 .../rewards_distribution_blackbox_test.rs     | 276 ++++++++----------
 5 files changed, 455 insertions(+), 152 deletions(-)
 create mode 100644 contracts/examples/rewards-distribution/sc-config.toml
 create mode 100644 contracts/examples/rewards-distribution/src/rewards_distribution_proxy.rs
 create mode 100644 contracts/examples/rewards-distribution/tests/mock_seed_nft_minter_proxy.rs

diff --git a/contracts/examples/rewards-distribution/sc-config.toml b/contracts/examples/rewards-distribution/sc-config.toml
new file mode 100644
index 0000000000..888d97a79f
--- /dev/null
+++ b/contracts/examples/rewards-distribution/sc-config.toml
@@ -0,0 +1,5 @@
+[[proxy]]
+path = "src/rewards_distribution_proxy.rs"
+[[proxy.path-rename]]
+from = "multiversx_sc::types::io::operation_completion_status::"
+to = ""
diff --git a/contracts/examples/rewards-distribution/src/rewards_distribution.rs b/contracts/examples/rewards-distribution/src/rewards_distribution.rs
index 880b4ed835..a964d8e63b 100644
--- a/contracts/examples/rewards-distribution/src/rewards_distribution.rs
+++ b/contracts/examples/rewards-distribution/src/rewards_distribution.rs
@@ -5,6 +5,7 @@ use multiversx_sc_modules::ongoing_operation::{
     CONTINUE_OP, DEFAULT_MIN_GAS_TO_SAVE_PROGRESS, STOP_OP,
 };
 
+pub mod rewards_distribution_proxy;
 pub mod seed_nft_minter_proxy;
 
 type Epoch = u64;
@@ -13,13 +14,15 @@ pub const EPOCHS_IN_WEEK: Epoch = 7;
 pub const MAX_PERCENTAGE: u64 = 100_000; // 100%
 pub const DIVISION_SAFETY_CONSTANT: u64 = 1_000_000_000_000;
 
-#[derive(ManagedVecItem, NestedEncode, NestedDecode, TypeAbi)]
+#[type_abi]
+#[derive(ManagedVecItem, NestedEncode, NestedDecode)]
 pub struct Bracket {
     pub index_percent: u64,
     pub bracket_reward_percent: u64,
 }
 
-#[derive(ManagedVecItem, NestedEncode, NestedDecode, TypeAbi)]
+#[type_abi]
+#[derive(ManagedVecItem, NestedEncode, NestedDecode)]
 pub struct ComputedBracket<M: ManagedTypeApi> {
     pub end_index: u64,
     pub nft_reward_percent: BigUint<M>,
diff --git a/contracts/examples/rewards-distribution/src/rewards_distribution_proxy.rs b/contracts/examples/rewards-distribution/src/rewards_distribution_proxy.rs
new file mode 100644
index 0000000000..4a02c6c098
--- /dev/null
+++ b/contracts/examples/rewards-distribution/src/rewards_distribution_proxy.rs
@@ -0,0 +1,233 @@
+// Code generated by the multiversx-sc proxy generator. DO NOT EDIT.
+
+////////////////////////////////////////////////////
+////////////////// AUTO-GENERATED //////////////////
+////////////////////////////////////////////////////
+
+#![allow(dead_code)]
+#![allow(clippy::all)]
+
+use multiversx_sc::proxy_imports::*;
+
+pub struct RewardsDistributionProxy;
+
+impl<Env, From, To, Gas> TxProxyTrait<Env, From, To, Gas> for RewardsDistributionProxy
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    type TxProxyMethods = RewardsDistributionProxyMethods<Env, From, To, Gas>;
+
+    fn proxy_methods(self, tx: Tx<Env, From, To, (), Gas, (), ()>) -> Self::TxProxyMethods {
+        RewardsDistributionProxyMethods { wrapped_tx: tx }
+    }
+}
+
+pub struct RewardsDistributionProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    wrapped_tx: Tx<Env, From, To, (), Gas, (), ()>,
+}
+
+#[rustfmt::skip]
+impl<Env, From, Gas> RewardsDistributionProxyMethods<Env, From, (), Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn init<
+        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+        Arg1: CodecInto<ManagedVec<Env::Api, Bracket>>,
+    >(
+        self,
+        seed_nft_minter_address: Arg0,
+        brackets: Arg1,
+    ) -> TxProxyDeploy<Env, From, Gas, ()> {
+        self.wrapped_tx
+            .raw_deploy()
+            .argument(&seed_nft_minter_address)
+            .argument(&brackets)
+            .original_result()
+    }
+}
+
+#[rustfmt::skip]
+impl<Env, From, To, Gas> RewardsDistributionProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn deposit_royalties(
+        self,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call("depositRoyalties")
+            .original_result()
+    }
+
+    pub fn raffle(
+        self,
+    ) -> TxProxyCall<Env, From, To, Gas, OperationCompletionStatus> {
+        self.wrapped_tx
+            .raw_call("raffle")
+            .original_result()
+    }
+
+    pub fn claim_rewards<
+        Arg0: CodecInto<u64>,
+        Arg1: CodecInto<u64>,
+        Arg2: CodecInto<MultiValueEncoded<Env::Api, MultiValue2<EgldOrEsdtTokenIdentifier<Env::Api>, u64>>>,
+    >(
+        self,
+        raffle_id_start: Arg0,
+        raffle_id_end: Arg1,
+        reward_tokens: Arg2,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call("claimRewards")
+            .argument(&raffle_id_start)
+            .argument(&raffle_id_end)
+            .argument(&reward_tokens)
+            .original_result()
+    }
+
+    pub fn compute_claimable_amount<
+        Arg0: CodecInto<u64>,
+        Arg1: CodecInto<EgldOrEsdtTokenIdentifier<Env::Api>>,
+        Arg2: CodecInto<u64>,
+        Arg3: CodecInto<u64>,
+    >(
+        self,
+        raffle_id: Arg0,
+        reward_token_id: Arg1,
+        reward_token_nonce: Arg2,
+        nft_nonce: Arg3,
+    ) -> TxProxyCall<Env, From, To, Gas, BigUint<Env::Api>> {
+        self.wrapped_tx
+            .raw_call("computeClaimableAmount")
+            .argument(&raffle_id)
+            .argument(&reward_token_id)
+            .argument(&reward_token_nonce)
+            .argument(&nft_nonce)
+            .original_result()
+    }
+
+    pub fn raffle_id(
+        self,
+    ) -> TxProxyCall<Env, From, To, Gas, u64> {
+        self.wrapped_tx
+            .raw_call("getRaffleId")
+            .original_result()
+    }
+
+    pub fn completed_raffle_id_count(
+        self,
+    ) -> TxProxyCall<Env, From, To, Gas, u64> {
+        self.wrapped_tx
+            .raw_call("getCompletedRaffleIdCount")
+            .original_result()
+    }
+
+    pub fn royalties<
+        Arg0: CodecInto<u64>,
+        Arg1: CodecInto<EgldOrEsdtTokenIdentifier<Env::Api>>,
+        Arg2: CodecInto<u64>,
+    >(
+        self,
+        raffle_id: Arg0,
+        reward_token_id: Arg1,
+        reward_token_nonce: Arg2,
+    ) -> TxProxyCall<Env, From, To, Gas, BigUint<Env::Api>> {
+        self.wrapped_tx
+            .raw_call("getRoyalties")
+            .argument(&raffle_id)
+            .argument(&reward_token_id)
+            .argument(&reward_token_nonce)
+            .original_result()
+    }
+
+    pub fn nft_reward_percent<
+        Arg0: CodecInto<u64>,
+        Arg1: CodecInto<u64>,
+    >(
+        self,
+        raffle_id: Arg0,
+        nft_nonce: Arg1,
+    ) -> TxProxyCall<Env, From, To, Gas, BigUint<Env::Api>> {
+        self.wrapped_tx
+            .raw_call("getNftRewardPercent")
+            .argument(&raffle_id)
+            .argument(&nft_nonce)
+            .original_result()
+    }
+
+    pub fn was_claimed<
+        Arg0: CodecInto<u64>,
+        Arg1: CodecInto<EgldOrEsdtTokenIdentifier<Env::Api>>,
+        Arg2: CodecInto<u64>,
+        Arg3: CodecInto<u64>,
+    >(
+        self,
+        raffle_id: Arg0,
+        reward_token_id: Arg1,
+        reward_token_nonce: Arg2,
+        nft_nonce: Arg3,
+    ) -> TxProxyCall<Env, From, To, Gas, bool> {
+        self.wrapped_tx
+            .raw_call("getWasClaimed")
+            .argument(&raffle_id)
+            .argument(&reward_token_id)
+            .argument(&reward_token_nonce)
+            .argument(&nft_nonce)
+            .original_result()
+    }
+
+    pub fn seed_nft_minter_address(
+        self,
+    ) -> TxProxyCall<Env, From, To, Gas, ManagedAddress<Env::Api>> {
+        self.wrapped_tx
+            .raw_call("getSeedNftMinterAddress")
+            .original_result()
+    }
+
+    pub fn brackets(
+        self,
+    ) -> TxProxyCall<Env, From, To, Gas, ManagedVec<Env::Api, Bracket>> {
+        self.wrapped_tx
+            .raw_call("getBrackets")
+            .original_result()
+    }
+
+    pub fn last_raffle_epoch(
+        self,
+    ) -> TxProxyCall<Env, From, To, Gas, u64> {
+        self.wrapped_tx
+            .raw_call("getLastRaffleEpoch")
+            .original_result()
+    }
+
+    pub fn nft_token_id(
+        self,
+    ) -> TxProxyCall<Env, From, To, Gas, TokenIdentifier<Env::Api>> {
+        self.wrapped_tx
+            .raw_call("getNftTokenId")
+            .original_result()
+    }
+}
+
+#[derive(ManagedVecItem, NestedEncode, NestedDecode)]
+pub struct Bracket {
+    pub index_percent: u64,
+    pub bracket_reward_percent: u64,
+}
diff --git a/contracts/examples/rewards-distribution/tests/mock_seed_nft_minter_proxy.rs b/contracts/examples/rewards-distribution/tests/mock_seed_nft_minter_proxy.rs
new file mode 100644
index 0000000000..6fd95b934c
--- /dev/null
+++ b/contracts/examples/rewards-distribution/tests/mock_seed_nft_minter_proxy.rs
@@ -0,0 +1,86 @@
+use multiversx_sc::proxy_imports::*;
+
+pub struct MockSeedNftMinterProxy;
+
+impl<Env, From, To, Gas> TxProxyTrait<Env, From, To, Gas> for MockSeedNftMinterProxy
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    type TxProxyMethods = MockSeedNftMinterProxyMethods<Env, From, To, Gas>;
+
+    fn proxy_methods(self, tx: Tx<Env, From, To, (), Gas, (), ()>) -> Self::TxProxyMethods {
+        MockSeedNftMinterProxyMethods { wrapped_tx: tx }
+    }
+}
+
+pub struct MockSeedNftMinterProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    wrapped_tx: Tx<Env, From, To, (), Gas, (), ()>,
+}
+
+#[rustfmt::skip]
+impl<Env, From, Gas> MockSeedNftMinterProxyMethods<Env, From, (), Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn init<
+        Arg0: CodecInto<TokenIdentifier<Env::Api>>,
+    >(
+        self,
+        nft_token_id: Arg0,
+    ) -> TxProxyDeploy<Env, From, Gas, ()> {
+        self.wrapped_tx
+            .raw_deploy()
+            .argument(&nft_token_id)
+            .original_result()
+    }
+}
+
+#[rustfmt::skip]
+impl<Env, From, To, Gas> MockSeedNftMinterProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn set_nft_count<
+        Arg0: CodecInto<u64>,
+    >(
+        self,
+        nft_count: Arg0,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call("setNftCount")
+            .argument(&nft_count)
+            .original_result()
+    }
+
+    pub fn nft_count(
+        self,
+    ) -> TxProxyCall<Env, From, To, Gas, u64> {
+        self.wrapped_tx
+            .raw_call("getNftCount")
+            .original_result()
+    }
+
+    pub fn nft_token_id(
+        self,
+    ) -> TxProxyCall<Env, From, To, Gas, TokenIdentifier<Env::Api>> {
+        self.wrapped_tx
+            .raw_call("getNftTokenId")
+            .original_result()
+    }
+}
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 4380f0122f..a670ef91ca 100644
--- a/contracts/examples/rewards-distribution/tests/rewards_distribution_blackbox_test.rs
+++ b/contracts/examples/rewards-distribution/tests/rewards_distribution_blackbox_test.rs
@@ -1,37 +1,37 @@
 mod mock_seed_nft_minter;
+mod mock_seed_nft_minter_proxy;
 mod utils;
 
 use multiversx_sc_scenario::imports::*;
 use std::iter::zip;
 
-use crate::mock_seed_nft_minter::ProxyTrait as _;
 use rewards_distribution::{
-    Bracket, ContractObj, ProxyTrait as _, RewardsDistribution, DIVISION_SAFETY_CONSTANT,
+    rewards_distribution_proxy, ContractObj, ProxyTrait as _, RewardsDistribution,
+    DIVISION_SAFETY_CONSTANT,
 };
 
 const NFT_TOKEN_ID: &[u8] = b"NFT-123456";
 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 = "mxsc:output/rewards-distribution.mxsc.json";
-const SEED_NFT_MINTER_ADDRESS_EXPR: &str = "sc:seed-nft-minter";
-const SEED_NFT_MINTER_PATH_EXPR: &str = "mxsc:../seed-nft-minter/output/seed-nft-minter.mxsc.json";
+const ALICE_ADDRESS_EXPR: AddressExpr = AddressExpr("alice");
+const OWNER_ADDRESS_EXPR: AddressExpr = AddressExpr("owner");
+const REWARDS_DISTRIBUTION_ADDRESS_EXPR: ScExpr = ScExpr("rewards-distribution");
+const REWARDS_DISTRIBUTION_PATH_EXPR: MxscExpr = MxscExpr("output/rewards-distribution.mxsc.json");
+const SEED_NFT_MINTER_ADDRESS_EXPR: ScExpr = ScExpr("seed-nft-minter");
+const SEED_NFT_MINTER_PATH_EXPR: MxscExpr =
+    MxscExpr("../seed-nft-minter/output/seed-nft-minter.mxsc.json");
 
 type RewardsDistributionContract = ContractInfo<rewards_distribution::Proxy<StaticApi>>;
-type SeedNFTMinterContract = ContractInfo<mock_seed_nft_minter::Proxy<StaticApi>>;
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
-    blockchain.set_current_dir_from_workspace("contracts/examples/rewards-distribution");
 
     blockchain.register_contract(
-        REWARDS_DISTRIBUTION_PATH_EXPR,
+        REWARDS_DISTRIBUTION_PATH_EXPR.eval_to_expr().as_str(),
         rewards_distribution::ContractBuilder,
     );
     blockchain.register_contract(
-        SEED_NFT_MINTER_PATH_EXPR,
+        SEED_NFT_MINTER_PATH_EXPR.eval_to_expr().as_str(),
         mock_seed_nft_minter::ContractBuilder,
     );
     blockchain
@@ -39,8 +39,6 @@ fn world() -> ScenarioWorld {
 
 struct RewardsDistributionTestState {
     world: ScenarioWorld,
-    seed_nft_minter_address: Address,
-    seed_nft_minter_contract: SeedNFTMinterContract,
     rewards_distribution_contract: RewardsDistributionContract,
     rewards_distribution_whitebox: WhiteboxContract<ContractObj<DebugApi>>,
 }
@@ -49,13 +47,8 @@ impl RewardsDistributionTestState {
     fn new() -> Self {
         let mut world = world();
 
-        world.set_state_step(
-            SetStateStep::new().put_account(OWNER_ADDRESS_EXPR, Account::new().nonce(1)),
-        );
-
-        let seed_nft_minter_address = AddressValue::from(SEED_NFT_MINTER_ADDRESS_EXPR).to_address();
+        world.account(OWNER_ADDRESS_EXPR).nonce(1);
 
-        let seed_nft_minter_contract = SeedNFTMinterContract::new(SEED_NFT_MINTER_ADDRESS_EXPR);
         let rewards_distribution_contract =
             RewardsDistributionContract::new(REWARDS_DISTRIBUTION_ADDRESS_EXPR);
         let rewards_distribution_whitebox = WhiteboxContract::new(
@@ -65,38 +58,32 @@ impl RewardsDistributionTestState {
 
         Self {
             world,
-            seed_nft_minter_address,
-            seed_nft_minter_contract,
             rewards_distribution_contract,
             rewards_distribution_whitebox,
         }
     }
 
     fn deploy_seed_nft_minter_contract(&mut self) -> &mut Self {
-        let seed_nft_miinter_code = self.world.code_expression(SEED_NFT_MINTER_PATH_EXPR);
-
-        self.world.sc_deploy(
-            ScDeployStep::new()
-                .from(OWNER_ADDRESS_EXPR)
-                .code(seed_nft_miinter_code)
-                .call(
-                    self.seed_nft_minter_contract
-                        .init(TokenIdentifier::from_esdt_bytes(NFT_TOKEN_ID)),
-                ),
-        );
-
-        self.world.sc_call(
-            ScCallStep::new()
-                .from(OWNER_ADDRESS_EXPR)
-                .call(self.seed_nft_minter_contract.set_nft_count(10_000u64)),
-        );
+        self.world
+            .tx()
+            .from(OWNER_ADDRESS_EXPR)
+            .typed(mock_seed_nft_minter_proxy::MockSeedNftMinterProxy)
+            .init(TokenIdentifier::from_esdt_bytes(NFT_TOKEN_ID))
+            .code(SEED_NFT_MINTER_PATH_EXPR)
+            .run();
+
+        self.world
+            .tx()
+            .from(OWNER_ADDRESS_EXPR)
+            .to(SEED_NFT_MINTER_ADDRESS_EXPR)
+            .typed(mock_seed_nft_minter_proxy::MockSeedNftMinterProxy)
+            .set_nft_count(10_000u64)
+            .run();
 
         self
     }
 
     fn deploy_rewards_distribution_contract(&mut self) -> &mut Self {
-        let rewards_distribution_code = self.world.code_expression(REWARDS_DISTRIBUTION_PATH_EXPR);
-
         let brackets_vec = &[
             (10, 2_000),
             (90, 6_000),
@@ -105,22 +92,20 @@ impl RewardsDistributionTestState {
             (25_000, 35_000),
             (72_000, 40_000),
         ];
-        let mut brackets = ManagedVec::<StaticApi, Bracket>::new();
+        let mut brackets = ManagedVec::new();
         for (index_percent, bracket_reward_percent) in brackets_vec.iter().cloned() {
-            brackets.push(Bracket {
+            brackets.push(rewards_distribution_proxy::Bracket {
                 index_percent,
                 bracket_reward_percent,
             });
         }
-        self.world.sc_deploy(
-            ScDeployStep::new()
-                .from(OWNER_ADDRESS_EXPR)
-                .code(rewards_distribution_code)
-                .call(
-                    self.rewards_distribution_contract
-                        .init(self.seed_nft_minter_address.clone(), brackets),
-                ),
-        );
+        self.world
+            .tx()
+            .from(OWNER_ADDRESS_EXPR)
+            .typed(rewards_distribution_proxy::RewardsDistributionProxy)
+            .init(SEED_NFT_MINTER_ADDRESS_EXPR.to_address(), brackets)
+            .code(REWARDS_DISTRIBUTION_PATH_EXPR)
+            .run();
 
         self
     }
@@ -130,18 +115,17 @@ impl RewardsDistributionTestState {
 fn test_compute_brackets() {
     let mut state = RewardsDistributionTestState::new();
 
-    let rewards_distribution_code = state.world.code_expression(REWARDS_DISTRIBUTION_PATH_EXPR);
+    let rewards_distribution_code = state
+        .world
+        .code_expression(REWARDS_DISTRIBUTION_PATH_EXPR.eval_to_expr().as_str());
 
-    state.world.set_state_step(
-        SetStateStep::new().put_account(
-            REWARDS_DISTRIBUTION_ADDRESS_EXPR,
-            Account::new()
-                .nonce(1)
-                .owner(OWNER_ADDRESS_EXPR)
-                .code(rewards_distribution_code)
-                .balance("0"),
-        ),
-    );
+    state
+        .world
+        .account(REWARDS_DISTRIBUTION_ADDRESS_EXPR)
+        .nonce(1)
+        .owner(OWNER_ADDRESS_EXPR)
+        .code(rewards_distribution_code)
+        .balance("0");
 
     state.world.whitebox_call(
         &state.rewards_distribution_whitebox,
@@ -182,24 +166,30 @@ fn test_raffle_and_claim() {
     let mut state = RewardsDistributionTestState::new();
 
     let nft_nonces: [u64; 6] = [1, 2, 3, 4, 5, 6];
-    let nft_payments: Vec<TxESDT> = nft_nonces
-        .iter()
-        .map(|nonce| TxESDT {
-            esdt_token_identifier: NFT_TOKEN_ID.into(),
-            nonce: (*nonce).into(),
-            esdt_value: 1u64.into(),
-        })
-        .collect();
-
-    let mut alice_account = Account::new().nonce(1).balance("2_070_000_000");
-    for nonce in nft_nonces.iter() {
-        alice_account =
-            alice_account.esdt_nft_balance(NFT_TOKEN_ID_EXPR, *nonce, "1", Option::<&[u8]>::None);
+    let mut nft_payments = ManagedVec::new();
+    for nonce in nft_nonces.into_iter() {
+        let payment = EsdtTokenPayment::new(NFT_TOKEN_ID.into(), nonce, 1u64.into());
+        nft_payments.push(payment);
+    }
+
+    {
+        let mut account_setter = state
+            .world
+            .account(ALICE_ADDRESS_EXPR)
+            .nonce(1)
+            .balance("2_070_000_000");
+        for nft_nonce in nft_nonces {
+            account_setter = account_setter.esdt_nft_balance(
+                NFT_TOKEN_ID_EXPR,
+                nft_nonce,
+                "1",
+                Option::<&[u8]>::None,
+            );
+        }
     }
 
     state.world.set_state_step(
         SetStateStep::new()
-            .put_account(ALICE_ADDRESS_EXPR, alice_account)
             .new_address(OWNER_ADDRESS_EXPR, 1, SEED_NFT_MINTER_ADDRESS_EXPR)
             .new_address(OWNER_ADDRESS_EXPR, 3, REWARDS_DISTRIBUTION_ADDRESS_EXPR),
     );
@@ -209,12 +199,15 @@ fn test_raffle_and_claim() {
         .deploy_rewards_distribution_contract();
 
     // deposit royalties
-    state.world.sc_call(
-        ScCallStep::new()
-            .from(ALICE_ADDRESS_EXPR)
-            .egld_value("2_070_000_000")
-            .call(state.rewards_distribution_contract.deposit_royalties()),
-    );
+    state
+        .world
+        .tx()
+        .from(ALICE_ADDRESS_EXPR)
+        .to(REWARDS_DISTRIBUTION_ADDRESS_EXPR)
+        .typed(rewards_distribution_proxy::RewardsDistributionProxy)
+        .deposit_royalties()
+        .egld(2_070_000_000)
+        .run();
 
     // run the raffle
     state.world.sc_call(
@@ -228,19 +221,16 @@ fn test_raffle_and_claim() {
     let mut rewards: Vec<BigUint<StaticApi>> = Vec::new();
     // post-raffle reward amount frequency checksstate
     for nonce in 1u64..=10_000u64 {
-        state.world.sc_call_use_result(
-            ScCallStep::new().from(ALICE_ADDRESS_EXPR).call(
-                state
-                    .rewards_distribution_contract
-                    .compute_claimable_amount(
-                        0u64,
-                        &EgldOrEsdtTokenIdentifier::egld(),
-                        0u64,
-                        nonce,
-                    ),
-            ),
-            |r: TypedResponse<BigUint<StaticApi>>| rewards.push(r.result.unwrap()),
-        );
+        let reward = state
+            .world
+            .tx()
+            .from(ALICE_ADDRESS_EXPR)
+            .to(REWARDS_DISTRIBUTION_ADDRESS_EXPR)
+            .typed(rewards_distribution_proxy::RewardsDistributionProxy)
+            .compute_claimable_amount(0u64, &EgldOrEsdtTokenIdentifier::egld(), 0u64, nonce)
+            .returns(ReturnsResult)
+            .run();
+        rewards.push(reward);
     }
 
     assert_eq!(rewards.len() as u64, 10_000u64);
@@ -272,21 +262,15 @@ fn test_raffle_and_claim() {
     let expected_rewards = [114_999, 114_999, 114_999, 828_000, 114_999, 114_999];
 
     for (nonce, expected_reward) in std::iter::zip(nft_nonces, expected_rewards) {
-        state.world.sc_call_use_result(
-            ScCallStep::new().from(ALICE_ADDRESS_EXPR).call(
-                state
-                    .rewards_distribution_contract
-                    .compute_claimable_amount(
-                        0u64,
-                        &EgldOrEsdtTokenIdentifier::egld(),
-                        0u64,
-                        nonce,
-                    ),
-            ),
-            |r: TypedResponse<BigUint<StaticApi>>| {
-                assert_eq!(r.result.unwrap().to_u64().unwrap(), expected_reward);
-            },
-        );
+        state
+            .world
+            .tx()
+            .from(ALICE_ADDRESS_EXPR)
+            .to(REWARDS_DISTRIBUTION_ADDRESS_EXPR)
+            .typed(rewards_distribution_proxy::RewardsDistributionProxy)
+            .compute_claimable_amount(0u64, &EgldOrEsdtTokenIdentifier::egld(), 0u64, nonce)
+            .returns(ExpectValue(expected_reward))
+            .run();
     }
 
     // claim rewards
@@ -295,41 +279,36 @@ fn test_raffle_and_claim() {
         MultiValue2<EgldOrEsdtTokenIdentifier<StaticApi>, u64>,
     > = MultiValueEncoded::new();
     reward_tokens.push((EgldOrEsdtTokenIdentifier::egld(), 0).into());
-    state.world.sc_call(
-        ScCallStep::new()
-            .from(ALICE_ADDRESS_EXPR)
-            .multi_esdt_transfer(nft_payments.clone())
-            .call(
-                state
-                    .rewards_distribution_contract
-                    .claim_rewards(0u64, 0u64, reward_tokens),
-            ),
-    );
+    state
+        .world
+        .tx()
+        .from(ALICE_ADDRESS_EXPR)
+        .to(REWARDS_DISTRIBUTION_ADDRESS_EXPR)
+        .typed(rewards_distribution_proxy::RewardsDistributionProxy)
+        .claim_rewards(0u64, 0u64, reward_tokens)
+        .with_multi_token_transfer(nft_payments.clone())
+        .run();
 
     // check that the rewards were claimed
     for nonce in nft_nonces.iter() {
-        state.world.sc_query(
-            ScQueryStep::new()
-                .call(state.rewards_distribution_contract.was_claimed(
-                    0u64,
-                    &EgldOrEsdtTokenIdentifier::egld(),
-                    0u64,
-                    nonce,
-                ))
-                .expect_value(SingleValue::from(true)),
-        );
+        state
+            .world
+            .query()
+            .to(REWARDS_DISTRIBUTION_ADDRESS_EXPR)
+            .typed(rewards_distribution_proxy::RewardsDistributionProxy)
+            .was_claimed(0u64, &EgldOrEsdtTokenIdentifier::egld(), 0u64, nonce)
+            .returns(ExpectValue(true))
+            .run();
     }
 
     // confirm the received amount matches the sum of the queried rewards
     let alice_balance_after_claim: u64 = expected_rewards.iter().sum();
-    let balance_expr = alice_balance_after_claim.to_string();
+    let balance_expr: &str = &alice_balance_after_claim.to_string();
 
     state
         .world
-        .check_state_step(CheckStateStep::new().put_account(
-            ALICE_ADDRESS_EXPR,
-            CheckAccount::new().balance(balance_expr.as_str()),
-        ));
+        .check_account(ALICE_ADDRESS_EXPR)
+        .balance(balance_expr);
 
     // a second claim with the same nfts should succeed, but return no more rewards
     let mut reward_tokens: MultiValueEncoded<
@@ -337,21 +316,18 @@ fn test_raffle_and_claim() {
         MultiValue2<EgldOrEsdtTokenIdentifier<StaticApi>, u64>,
     > = MultiValueEncoded::new();
     reward_tokens.push((EgldOrEsdtTokenIdentifier::egld(), 0).into());
-    state.world.sc_call(
-        ScCallStep::new()
-            .from(ALICE_ADDRESS_EXPR)
-            .multi_esdt_transfer(nft_payments)
-            .call(
-                state
-                    .rewards_distribution_contract
-                    .claim_rewards(0u64, 0u64, reward_tokens),
-            ),
-    );
+    state
+        .world
+        .tx()
+        .from(ALICE_ADDRESS_EXPR)
+        .to(REWARDS_DISTRIBUTION_ADDRESS_EXPR)
+        .typed(rewards_distribution_proxy::RewardsDistributionProxy)
+        .claim_rewards(0u64, 0u64, reward_tokens)
+        .with_multi_token_transfer(nft_payments)
+        .run();
 
     state
         .world
-        .check_state_step(CheckStateStep::new().put_account(
-            ALICE_ADDRESS_EXPR,
-            CheckAccount::new().balance(balance_expr.as_str()),
-        ));
+        .check_account(ALICE_ADDRESS_EXPR)
+        .balance(balance_expr);
 }

From ccde5de2dd0977a9bb2f74b9d7507081fa20691b Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Mon, 22 Apr 2024 23:36:03 +0300
Subject: [PATCH 0749/1254] fix clippy

---
 .../tests/mock_seed_nft_minter_proxy.rs          | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/contracts/examples/rewards-distribution/tests/mock_seed_nft_minter_proxy.rs b/contracts/examples/rewards-distribution/tests/mock_seed_nft_minter_proxy.rs
index 6fd95b934c..22d9e055cd 100644
--- a/contracts/examples/rewards-distribution/tests/mock_seed_nft_minter_proxy.rs
+++ b/contracts/examples/rewards-distribution/tests/mock_seed_nft_minter_proxy.rs
@@ -67,20 +67,4 @@ where
             .argument(&nft_count)
             .original_result()
     }
-
-    pub fn nft_count(
-        self,
-    ) -> TxProxyCall<Env, From, To, Gas, u64> {
-        self.wrapped_tx
-            .raw_call("getNftCount")
-            .original_result()
-    }
-
-    pub fn nft_token_id(
-        self,
-    ) -> TxProxyCall<Env, From, To, Gas, TokenIdentifier<Env::Api>> {
-        self.wrapped_tx
-            .raw_call("getNftTokenId")
-            .original_result()
-    }
 }

From 48cfe2a9712a1d289d1d9a3db42d460cf9ae2e30 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 23 Apr 2024 02:02:03 +0300
Subject: [PATCH 0750/1254] unified syntax - new address in deploy tx

---
 .../adder/tests/adder_blackbox_test.rs        |  3 +-
 .../multisig/tests/multisig_blackbox_test.rs  | 23 ++++--------
 .../scenario-tester/tests/st_blackbox_test.rs |  2 +-
 framework/base/src/types/interaction/tx.rs    | 36 +++++++++++++++----
 .../base/src/types/interaction/tx_env.rs      |  9 +++++
 .../src/facade/world_tx/scenario_exec_call.rs | 30 ++++++++++++++--
 .../scenario/tx_to_step/step_annotation.rs    |  4 +--
 .../scenario/tx_to_step/tx_to_step_call.rs    |  4 +--
 .../scenario/tx_to_step/tx_to_step_deploy.rs  |  2 +-
 .../scenario/tx_to_step/tx_to_step_query.rs   |  2 +-
 .../tx_to_step/tx_to_step_transfer.rs         |  4 +--
 11 files changed, 82 insertions(+), 37 deletions(-)

diff --git a/contracts/examples/adder/tests/adder_blackbox_test.rs b/contracts/examples/adder/tests/adder_blackbox_test.rs
index 9c6dc26dd5..9ca51ccbeb 100644
--- a/contracts/examples/adder/tests/adder_blackbox_test.rs
+++ b/contracts/examples/adder/tests/adder_blackbox_test.rs
@@ -24,14 +24,13 @@ fn adder_blackbox() {
 
     world.account(OWNER).nonce(1);
 
-    world.new_address(OWNER, 1, SC_ADDER);
-
     let new_address = world
         .tx()
         .from(OWNER)
         .typed(adder_proxy::AdderProxy)
         .init(5u32)
         .code(CODE_EXPR)
+        .new_address(SC_ADDER)
         .returns(ReturnsNewAddress)
         .run();
 
diff --git a/contracts/examples/multisig/tests/multisig_blackbox_test.rs b/contracts/examples/multisig/tests/multisig_blackbox_test.rs
index 22a4219fd4..5be8e9d52b 100644
--- a/contracts/examples/multisig/tests/multisig_blackbox_test.rs
+++ b/contracts/examples/multisig/tests/multisig_blackbox_test.rs
@@ -50,18 +50,6 @@ impl MultisigTestState {
             .account(ADDER_OWNER_ADDRESS_EXPR)
             .nonce(1);
 
-        world.set_state_step(SetStateStep::new().new_address(
-            OWNER_ADDRESS_EXPR,
-            1,
-            SC_MULTISIG_EXPR,
-        ));
-
-        world.set_state_step(SetStateStep::new().new_address(
-            ADDER_OWNER_ADDRESS_EXPR,
-            1,
-            SC_ADDER_EXPR,
-        ));
-
         Self { world }
     }
 
@@ -74,6 +62,7 @@ impl MultisigTestState {
             .typed(multisig_proxy::MultisigProxy)
             .init(QUORUM_SIZE, board_members)
             .code(MULTISIG_CODE_EXPR)
+            .new_address(SC_MULTISIG_EXPR)
             .run();
 
         let action_id: usize = self
@@ -101,6 +90,7 @@ impl MultisigTestState {
             .typed(adder_proxy::AdderProxy)
             .init(5u64)
             .code(ADDER_CODE_EXPR)
+            .new_address(SC_ADDER_EXPR)
             .run();
     }
 
@@ -555,11 +545,10 @@ fn test_deploy_and_upgrade_from_source() {
     state.deploy_multisig_contract().deploy_adder_contract();
 
     let new_adder_address_expr: ScExpr = ScExpr("new-adder");
-    state.world.set_state_step(SetStateStep::new().new_address(
-        SC_MULTISIG_EXPR,
-        0,
-        new_adder_address_expr,
-    ));
+
+    state
+        .world
+        .new_address(SC_MULTISIG_EXPR, 0, new_adder_address_expr);
 
     let action_id = state.propose_sc_deploy_from_source(
         0u64,
diff --git a/contracts/feature-tests/scenario-tester/tests/st_blackbox_test.rs b/contracts/feature-tests/scenario-tester/tests/st_blackbox_test.rs
index de877fb76b..1af150a76f 100644
--- a/contracts/feature-tests/scenario-tester/tests/st_blackbox_test.rs
+++ b/contracts/feature-tests/scenario-tester/tests/st_blackbox_test.rs
@@ -51,7 +51,7 @@ fn st_blackbox() {
         .esdt_balance("str:TOKEN-123456", "500")
         .commit();
 
-    world.set_state_step(SetStateStep::new().new_address(owner_address, 1, "sc:scenario-tester"));
+    world.new_address(owner_address, 1, "sc:scenario-tester");
 
     let new_address = world
         .tx()
diff --git a/framework/base/src/types/interaction/tx.rs b/framework/base/src/types/interaction/tx.rs
index 98d88e499a..ca5beddb0a 100644
--- a/framework/base/src/types/interaction/tx.rs
+++ b/framework/base/src/types/interaction/tx.rs
@@ -12,12 +12,13 @@ use crate::{
 use multiversx_sc_codec::TopEncodeMulti;
 
 use super::{
-    contract_deploy::UNSPECIFIED_GAS_LIMIT, Code, ContractCallBase, ContractCallNoPayment,
-    ContractCallWithEgld, ContractDeploy, DeployCall, Egld, EgldPayment, ExplicitGas, FromSource,
-    FunctionCall, ManagedArgBuffer, OriginalResultMarker, RHList, RHListAppendNoRet,
-    RHListAppendRet, RHListItem, TxCodeSource, TxCodeValue, TxData, TxDataFunctionCall,
-    TxEgldValue, TxEnv, TxFrom, TxFromSourceValue, TxGas, TxGasValue, TxPayment, TxPaymentEgldOnly,
-    TxProxyTrait, TxResultHandler, TxScEnv, TxTo, TxToSpecified, UpgradeCall,
+    contract_deploy::UNSPECIFIED_GAS_LIMIT, AnnotatedValue, Code, ContractCallBase,
+    ContractCallNoPayment, ContractCallWithEgld, ContractDeploy, DeployCall, Egld, EgldPayment,
+    ExplicitGas, FromSource, FunctionCall, ManagedArgBuffer, OriginalResultMarker, RHList,
+    RHListAppendNoRet, RHListAppendRet, RHListItem, TxCodeSource, TxCodeValue, TxData,
+    TxDataFunctionCall, TxEgldValue, TxEnv, TxEnvMockDeployAddress, TxFrom, TxFromSourceValue,
+    TxFromSpecified, TxGas, TxGasValue, TxPayment, TxPaymentEgldOnly, TxProxyTrait,
+    TxResultHandler, TxScEnv, TxTo, TxToSpecified, UpgradeCall,
 };
 
 #[must_use]
@@ -827,6 +828,29 @@ where
     }
 }
 
+impl<Env, From, To, Payment, Gas, CodeSource, RH>
+    Tx<Env, From, To, Payment, Gas, DeployCall<Env, CodeSource>, RH>
+where
+    Env: TxEnvMockDeployAddress,
+    From: TxFromSpecified<Env>,
+    To: TxTo<Env>,
+    Payment: TxPaymentEgldOnly<Env>,
+    Gas: TxGas<Env>,
+    CodeSource: TxCodeSource<Env>,
+    RH: TxResultHandler<Env>,
+{
+    /// Sets the new mock address to be used for the newly deployed contract.
+    ///
+    /// Only allowed in tests.
+    pub fn new_address<NA>(mut self, new_address: NA) -> Self
+    where
+        NA: AnnotatedValue<Env, ManagedAddress<Env::Api>>,
+    {
+        self.env.mock_deploy_new_address(&self.from, new_address);
+        self
+    }
+}
+
 impl<Env, From, To, Payment, Gas, CodeSource, RH>
     Tx<Env, From, To, Payment, Gas, UpgradeCall<Env, CodeSource>, RH>
 where
diff --git a/framework/base/src/types/interaction/tx_env.rs b/framework/base/src/types/interaction/tx_env.rs
index 16fd0da683..11e7b91e6a 100644
--- a/framework/base/src/types/interaction/tx_env.rs
+++ b/framework/base/src/types/interaction/tx_env.rs
@@ -3,6 +3,8 @@ use crate::{
     types::{ManagedAddress, ManagedBuffer},
 };
 
+use super::{AnnotatedValue, TxFromSpecified};
+
 pub trait TxEnv: Sized {
     type Api: CallTypeApi;
 
@@ -15,3 +17,10 @@ pub trait TxEnv: Sized {
 
     fn default_gas_value(&self) -> u64;
 }
+
+pub trait TxEnvMockDeployAddress: TxEnv {
+    fn mock_deploy_new_address<From, NA>(&mut self, from: &From, new_address: NA)
+    where
+        From: TxFromSpecified<Self>,
+        NA: AnnotatedValue<Self, ManagedAddress<Self::Api>>;
+}
diff --git a/framework/scenario/src/facade/world_tx/scenario_exec_call.rs b/framework/scenario/src/facade/world_tx/scenario_exec_call.rs
index e92e38087c..dd258da3b4 100644
--- a/framework/scenario/src/facade/world_tx/scenario_exec_call.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_exec_call.rs
@@ -2,14 +2,14 @@ use multiversx_sc::{
     tuple_util::NestedTupleFlatten,
     types::{
         FunctionCall, ManagedAddress, ManagedBuffer, RHListExec, Tx, TxBaseWithEnv, TxEnv,
-        TxFromSpecified, TxGas, TxPayment, TxToSpecified,
+        TxEnvMockDeployAddress, TxFromSpecified, TxGas, TxPayment, TxToSpecified,
     },
 };
 
 use crate::{
     api::StaticApi,
-    scenario::tx_to_step::TxToStep,
-    scenario_model::{TxExpect, TxResponse},
+    scenario::tx_to_step::{address_annotated, TxToStep},
+    scenario_model::{SetStateStep, TxExpect, TxResponse},
     ScenarioTxEnv, ScenarioTxRun, ScenarioWorld,
 };
 
@@ -39,6 +39,30 @@ impl<'w> TxEnv for ScenarioEnvExec<'w> {
     }
 }
 
+impl<'w> TxEnvMockDeployAddress for ScenarioEnvExec<'w> {
+    fn mock_deploy_new_address<From, NA>(&mut self, from: &From, new_address: NA)
+    where
+        From: TxFromSpecified<Self>,
+        NA: multiversx_sc::types::AnnotatedValue<Self, ManagedAddress<Self::Api>>,
+    {
+        let from_value = address_annotated(self, from);
+        let sender_nonce = self
+            .world
+            .get_state()
+            .accounts
+            .get(&from_value.to_vm_address())
+            .expect("sender does not exist")
+            .nonce;
+        let new_address_value = address_annotated(self, &new_address);
+
+        self.world.set_state_step(SetStateStep::new().new_address(
+            from_value,
+            sender_nonce,
+            new_address_value,
+        ));
+    }
+}
+
 impl<'w> ScenarioTxEnv for ScenarioEnvExec<'w> {
     fn env_data(&self) -> &ScenarioTxEnvData {
         &self.data
diff --git a/framework/scenario/src/scenario/tx_to_step/step_annotation.rs b/framework/scenario/src/scenario/tx_to_step/step_annotation.rs
index 2defb50786..c341427ab7 100644
--- a/framework/scenario/src/scenario/tx_to_step/step_annotation.rs
+++ b/framework/scenario/src/scenario/tx_to_step/step_annotation.rs
@@ -3,14 +3,14 @@ use multiversx_sc::types::{AnnotatedValue, Code, ManagedAddress, TxCodeValue, Tx
 
 use crate::scenario_model::{AddressValue, BytesValue, U64Value};
 
-pub fn address_annotated<Env, Addr>(env: &Env, from: Addr) -> AddressValue
+pub fn address_annotated<Env, Addr>(env: &Env, from: &Addr) -> AddressValue
 where
     Env: TxEnv,
     Addr: AnnotatedValue<Env, ManagedAddress<Env::Api>>,
 {
     let annotation = from.annotation(env).to_string();
     AddressValue {
-        value: from.into_value(env).to_address(),
+        value: from.to_value(env).to_address(),
         original: ValueSubTree::Str(annotation),
     }
 }
diff --git a/framework/scenario/src/scenario/tx_to_step/tx_to_step_call.rs b/framework/scenario/src/scenario/tx_to_step/tx_to_step_call.rs
index d111116a5c..7daa8ac810 100644
--- a/framework/scenario/src/scenario/tx_to_step/tx_to_step_call.rs
+++ b/framework/scenario/src/scenario/tx_to_step/tx_to_step_call.rs
@@ -53,8 +53,8 @@ where
     Gas: TxGas<Env>,
 {
     let mut step = ScCallStep::new()
-        .from(address_annotated(env, from))
-        .to(address_annotated(env, to))
+        .from(address_annotated(env, &from))
+        .to(address_annotated(env, &to))
         .function(data.function_name.to_string().as_str());
     for arg in data.arg_buffer.iter_buffers() {
         step.tx.arguments.push(arg.to_vec().into());
diff --git a/framework/scenario/src/scenario/tx_to_step/tx_to_step_deploy.rs b/framework/scenario/src/scenario/tx_to_step/tx_to_step_deploy.rs
index 3221de4b45..4e49be51b4 100644
--- a/framework/scenario/src/scenario/tx_to_step/tx_to_step_deploy.rs
+++ b/framework/scenario/src/scenario/tx_to_step/tx_to_step_deploy.rs
@@ -46,7 +46,7 @@ where
     CodeValue: TxCodeValue<Env>,
 {
     let mut step = ScDeployStep::new()
-        .from(address_annotated(env, from))
+        .from(address_annotated(env, &from))
         .code(code_annotated(env, data.code_source));
     for arg in data.arg_buffer.iter_buffers() {
         step.tx.arguments.push(arg.to_vec().into());
diff --git a/framework/scenario/src/scenario/tx_to_step/tx_to_step_query.rs b/framework/scenario/src/scenario/tx_to_step/tx_to_step_query.rs
index 9cfbb5d39e..aaeb3b70c3 100644
--- a/framework/scenario/src/scenario/tx_to_step/tx_to_step_query.rs
+++ b/framework/scenario/src/scenario/tx_to_step/tx_to_step_query.rs
@@ -30,7 +30,7 @@ where
     To: TxToSpecified<Env>,
 {
     let mut step = ScQueryStep::new()
-        .to(address_annotated(env, to))
+        .to(address_annotated(env, &to))
         .function(data.function_name.to_string().as_str());
     for arg in data.arg_buffer.iter_buffers() {
         step.tx.arguments.push(arg.to_vec().into());
diff --git a/framework/scenario/src/scenario/tx_to_step/tx_to_step_transfer.rs b/framework/scenario/src/scenario/tx_to_step/tx_to_step_transfer.rs
index 637d840e4e..d2bf9636c9 100644
--- a/framework/scenario/src/scenario/tx_to_step/tx_to_step_transfer.rs
+++ b/framework/scenario/src/scenario/tx_to_step/tx_to_step_transfer.rs
@@ -40,8 +40,8 @@ where
     Gas: TxGas<Env>,
 {
     let mut step = TransferStep::new()
-        .from(address_annotated(env, from))
-        .to(address_annotated(env, to));
+        .from(address_annotated(env, &from))
+        .to(address_annotated(env, &to));
 
     step.tx.gas_limit = gas_annotated(env, gas);
 

From ffcf2e665c71606171278e6142918af366307c25 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Tue, 23 Apr 2024 11:32:59 +0300
Subject: [PATCH 0751/1254] remove redundant balance set

---
 .../tests/rewards_distribution_blackbox_test.rs                | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

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 a670ef91ca..9958a518ca 100644
--- a/contracts/examples/rewards-distribution/tests/rewards_distribution_blackbox_test.rs
+++ b/contracts/examples/rewards-distribution/tests/rewards_distribution_blackbox_test.rs
@@ -124,8 +124,7 @@ fn test_compute_brackets() {
         .account(REWARDS_DISTRIBUTION_ADDRESS_EXPR)
         .nonce(1)
         .owner(OWNER_ADDRESS_EXPR)
-        .code(rewards_distribution_code)
-        .balance("0");
+        .code(rewards_distribution_code);
 
     state.world.whitebox_call(
         &state.rewards_distribution_whitebox,

From 9037d847753ee324434145c1800f99c1fd535ee3 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 23 Apr 2024 15:55:45 +0300
Subject: [PATCH 0752/1254] sc 0.49.0-alpha.4, sdk 0.4.0-alpha.4

---
 CHANGELOG.md                                  |  4 ++++
 Cargo.lock                                    | 20 +++++++++----------
 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 +-
 .../Cargo.toml                                |  2 +-
 .../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 +-
 .../wasm-alloc-mem-fail/Cargo.toml            |  2 +-
 .../wasm-alloc-mem-leaking/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-legacy/Cargo.toml |  4 ++--
 .../forwarder-legacy/meta/Cargo.toml          |  2 +-
 .../forwarder-legacy/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 +-
 .../exchange-features/Cargo.toml              |  4 ++--
 .../exchange-features/meta/Cargo.toml         |  2 +-
 .../exchange-features/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 +-
 .../wasm/Cargo.toml                           |  2 +-
 .../rust-testing-framework-tester/Cargo.toml  |  4 ++--
 .../meta/Cargo.toml                           |  2 +-
 .../wasm/Cargo.toml                           |  2 +-
 .../feature-tests/scenario-tester/Cargo.toml  |  4 ++--
 .../scenario-tester/meta/Cargo.toml           |  2 +-
 .../scenario-tester/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 ++--
 framework/base/Cargo.toml                     |  4 ++--
 framework/base/src/types/interaction/tx.rs    |  3 ++-
 framework/derive/Cargo.toml                   |  2 +-
 framework/meta/Cargo.toml                     |  4 ++--
 framework/scenario/Cargo.toml                 |  8 ++++----
 framework/snippets/Cargo.toml                 |  6 +++---
 framework/wasm-adapter/Cargo.toml             |  4 ++--
 sdk/core/Cargo.toml                           |  2 +-
 tools/mxpy-snippet-generator/Cargo.toml       |  2 +-
 tools/rust-debugger/format-tests/Cargo.toml   |  4 ++--
 271 files changed, 400 insertions(+), 395 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 32de5c4b7d..c936792ccb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,6 +26,10 @@ 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.49.0-alpha.4, sdk 0.4.0-alpha.4] - 2024-04-23
+Fourth pre-release, contains many interactor improvements, including improved tx polling.
+
 ## [sc 0.49.0-alpha.3] - 2024-04-13
 Third pre-release of the unified syntax, includes backwards compatibility fixes and testing set state/check state.
 
diff --git a/Cargo.lock b/Cargo.lock
index 0b6d17acb1..4ecc1b6d04 100755
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1815,7 +1815,7 @@ checksum = "b59072fa0624b55ae5ae3fa6bfa91515bbeb4ac440214bc4a509e2c8806d6e9f"
 
 [[package]]
 name = "multiversx-price-aggregator-sc"
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 dependencies = [
  "arrayvec",
  "getrandom 0.2.12",
@@ -1836,7 +1836,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 dependencies = [
  "bitflags 2.4.2",
  "hex-literal",
@@ -1866,7 +1866,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -1877,7 +1877,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-meta"
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 dependencies = [
  "clap",
  "colored",
@@ -1903,14 +1903,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-scenario"
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 dependencies = [
  "base64",
  "bech32",
@@ -1936,7 +1936,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-snippets"
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 dependencies = [
  "base64",
  "env_logger",
@@ -1951,14 +1951,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sdk"
-version = "0.3.2"
+version = "0.4.0-alpha.4"
 dependencies = [
  "anyhow",
  "base64",
@@ -1982,7 +1982,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-wegld-swap-sc"
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
  "multiversx-sc-modules",
diff --git a/contracts/benchmarks/large-storage/Cargo.toml b/contracts/benchmarks/large-storage/Cargo.toml
index e937ae69a1..238cfc0286 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../framework/scenario"
diff --git a/contracts/benchmarks/large-storage/meta/Cargo.toml b/contracts/benchmarks/large-storage/meta/Cargo.toml
index a8861c9cfc..5ab3b3f4ea 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 c177dffe51..ee513468bf 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/mappers/benchmark-common/Cargo.toml b/contracts/benchmarks/mappers/benchmark-common/Cargo.toml
index 16074cce04..3143c4c059 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../framework/scenario"
diff --git a/contracts/benchmarks/mappers/linked-list-repeat/Cargo.toml b/contracts/benchmarks/mappers/linked-list-repeat/Cargo.toml
index 92aa9e00a0..390e9c729a 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 67c262e06a..f719432fba 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 225bb4bc46..5218df0664 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/mappers/map-repeat/Cargo.toml b/contracts/benchmarks/mappers/map-repeat/Cargo.toml
index f554b0b088..53a9c8cb30 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../framework/scenario"
diff --git a/contracts/benchmarks/mappers/map-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/map-repeat/meta/Cargo.toml
index e5bf0384e1..b8d61cf474 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 a5ff1b5db3..6153f35d8f 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/mappers/queue-repeat/Cargo.toml b/contracts/benchmarks/mappers/queue-repeat/Cargo.toml
index a04e9481a2..7eae0e8177 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../framework/scenario"
diff --git a/contracts/benchmarks/mappers/queue-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/queue-repeat/meta/Cargo.toml
index 3add869333..ef5d420e27 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 ccbefcb68d..2ebeda1f2e 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/mappers/set-repeat/Cargo.toml b/contracts/benchmarks/mappers/set-repeat/Cargo.toml
index c1d4afd20a..ebf2958e90 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../framework/scenario"
diff --git a/contracts/benchmarks/mappers/set-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/set-repeat/meta/Cargo.toml
index c93fb7908e..269df5be03 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 4b90afe784..aa37b34c3e 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 2d8e92e82a..34e3426254 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 a125bba2c5..8487ef015b 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 411ec9a1ca..3ac2ae3b96 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/mappers/vec-repeat/Cargo.toml b/contracts/benchmarks/mappers/vec-repeat/Cargo.toml
index d812225d87..8c7b4a9d8e 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../framework/scenario"
diff --git a/contracts/benchmarks/mappers/vec-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/vec-repeat/meta/Cargo.toml
index cec4fc321f..fc6c8ebd33 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 f360097a23..8779eaa521 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/send-tx-repeat/Cargo.toml b/contracts/benchmarks/send-tx-repeat/Cargo.toml
index 64789aa2d0..440bfa0946 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../framework/scenario"
diff --git a/contracts/benchmarks/send-tx-repeat/meta/Cargo.toml b/contracts/benchmarks/send-tx-repeat/meta/Cargo.toml
index fca6291503..fb2c8f50cf 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 62ea6206bf..f42955ebbd 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/str-repeat/Cargo.toml b/contracts/benchmarks/str-repeat/Cargo.toml
index d000c531d5..0d46d631dd 100644
--- a/contracts/benchmarks/str-repeat/Cargo.toml
+++ b/contracts/benchmarks/str-repeat/Cargo.toml
@@ -12,10 +12,10 @@ path = "src/str_repeat.rs"
 managed-buffer-builder-cached = ["multiversx-sc/managed-buffer-builder-cached"]
 
 [dependencies.multiversx-sc]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../framework/scenario"
diff --git a/contracts/benchmarks/str-repeat/meta/Cargo.toml b/contracts/benchmarks/str-repeat/meta/Cargo.toml
index 4b7f1c6022..dbf074583d 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.toml b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.toml
index 64863e4645..b840dd0a3b 100644
--- a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.toml
+++ b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.toml
@@ -25,7 +25,7 @@ overflow-checks = false
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.toml b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.toml
index 36033c9f95..53db7f0b4a 100644
--- a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.toml
+++ b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.toml
@@ -26,7 +26,7 @@ path = ".."
 features = ["managed-buffer-builder-cached"]
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/str-repeat/wasm/Cargo.toml b/contracts/benchmarks/str-repeat/wasm/Cargo.toml
index a62bedbaca..fa54772480 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/core/price-aggregator/Cargo.toml b/contracts/core/price-aggregator/Cargo.toml
index 5ac8cd49db..aad9c4ce9c 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 authors = [
     "Claudiu-Marcel Bruda <claudiu.bruda@multiversx.com>",
     "MultiversX <contact@multiversx.com>",
@@ -19,15 +19,15 @@ edition = "2021"
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../framework/scenario"
 
 [dependencies]
diff --git a/contracts/core/price-aggregator/meta/Cargo.toml b/contracts/core/price-aggregator/meta/Cargo.toml
index 17751a1628..5b01eac017 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 d402bd0d78..c4d502a4ca 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/core/wegld-swap/Cargo.toml b/contracts/core/wegld-swap/Cargo.toml
index f889200683..d61623cc64 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 
 authors = [
     "Dorin Iancu <dorin.iancu@multiversx.com>",
@@ -20,13 +20,13 @@ edition = "2021"
 path = "src/wegld.rs"
 
 [dependencies.multiversx-sc]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../framework/scenario"
diff --git a/contracts/core/wegld-swap/meta/Cargo.toml b/contracts/core/wegld-swap/meta/Cargo.toml
index b4cd52cd9f..2956444fc8 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 b9fa10fa9f..f21e9e13cb 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/adder/Cargo.toml b/contracts/examples/adder/Cargo.toml
index e4bb857c31..489904d6d6 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/adder/interact/Cargo.toml b/contracts/examples/adder/interact/Cargo.toml
index d955f0bfb6..3cd72a5e2b 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../framework/snippets"
diff --git a/contracts/examples/adder/meta/Cargo.toml b/contracts/examples/adder/meta/Cargo.toml
index 1581fb0874..3e56ed66d7 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/examples/adder/wasm/Cargo.toml b/contracts/examples/adder/wasm/Cargo.toml
index 613d0060ce..a759e0edf8 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/bonding-curve-contract/Cargo.toml b/contracts/examples/bonding-curve-contract/Cargo.toml
index 03d2d06db9..4a9d90bddc 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../framework/scenario"
 
diff --git a/contracts/examples/bonding-curve-contract/meta/Cargo.toml b/contracts/examples/bonding-curve-contract/meta/Cargo.toml
index 9678ba1852..dbcdbc57e0 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 c7487594f9..bf4f7f2d5b 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/check-pause/Cargo.toml b/contracts/examples/check-pause/Cargo.toml
index 1838cf3cd0..355224e160 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../framework/scenario"
 
diff --git a/contracts/examples/check-pause/meta/Cargo.toml b/contracts/examples/check-pause/meta/Cargo.toml
index 85b2e19f06..21465dc7ed 100644
--- a/contracts/examples/check-pause/meta/Cargo.toml
+++ b/contracts/examples/check-pause/meta/Cargo.toml
@@ -9,6 +9,6 @@ authors = ["Alin Cruceat <alin.cruceat@multiversx.com>"]
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 7545ebf696..0602c3b653 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/crowdfunding-esdt/Cargo.toml b/contracts/examples/crowdfunding-esdt/Cargo.toml
index 9a9f88f258..498b1999b6 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../framework/scenario"
 
 [dev-dependencies]
diff --git a/contracts/examples/crowdfunding-esdt/meta/Cargo.toml b/contracts/examples/crowdfunding-esdt/meta/Cargo.toml
index 3fa9486d89..191c2d0a28 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 88e4c7b4c5..93c39e692f 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/crypto-bubbles/Cargo.toml b/contracts/examples/crypto-bubbles/Cargo.toml
index 992a7df997..6e841be6b9 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/crypto-bubbles/meta/Cargo.toml b/contracts/examples/crypto-bubbles/meta/Cargo.toml
index 6966cd9bff..60b167f206 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 7ed5a2fe05..cbfe399baf 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 2f81bfefd2..d83a9fdd5d 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 1471748b18..bfab4a12d7 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../../framework/base"
diff --git a/contracts/examples/crypto-kitties/kitty-auction/Cargo.toml b/contracts/examples/crypto-kitties/kitty-auction/Cargo.toml
index f8481bac43..ce7971579f 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 07c6da37c1..938f83ffd6 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 59dd92f035..5234956e51 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 82976fe38b..3027dad875 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 662321fef8..c0e781f92f 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 e1b8fc8e9f..f4a92c4b71 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 1804881778..642afa1862 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 8c5c36e49e..8937e968d2 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 533db13539..def5af05df 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/crypto-zombies/Cargo.toml b/contracts/examples/crypto-zombies/Cargo.toml
index d3ab2af074..3888d9ecb7 100644
--- a/contracts/examples/crypto-zombies/Cargo.toml
+++ b/contracts/examples/crypto-zombies/Cargo.toml
@@ -9,11 +9,11 @@ publish = false
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../framework/scenario"
 
 [dependencies.kitty]
diff --git a/contracts/examples/crypto-zombies/meta/Cargo.toml b/contracts/examples/crypto-zombies/meta/Cargo.toml
index 8d208fd522..2d94d2d074 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 12124bb027..d99df32433 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/digital-cash/Cargo.toml b/contracts/examples/digital-cash/Cargo.toml
index a38a59b831..05df36f381 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/digital-cash/meta/Cargo.toml b/contracts/examples/digital-cash/meta/Cargo.toml
index 42c42bdd13..a54b5f1ea3 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 f46d4873a3..fd23cf19e3 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/empty/Cargo.toml b/contracts/examples/empty/Cargo.toml
index 1ef8b5c4c2..ff22118a94 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../framework/scenario"
 
 [dev-dependencies]
diff --git a/contracts/examples/empty/meta/Cargo.toml b/contracts/examples/empty/meta/Cargo.toml
index 4405415a13..80e2c84bdf 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/examples/empty/wasm/Cargo.toml b/contracts/examples/empty/wasm/Cargo.toml
index ac45db4841..61cf8db541 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 05712405c8..10ef50f36c 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 3b7d671fa5..a40832325b 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 607cf21443..07cb085e0f 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/factorial/Cargo.toml b/contracts/examples/factorial/Cargo.toml
index d58309586d..49724f1760 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/factorial/meta/Cargo.toml b/contracts/examples/factorial/meta/Cargo.toml
index 2ed75a17e5..2a5a7f7a8f 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/examples/factorial/wasm/Cargo.toml b/contracts/examples/factorial/wasm/Cargo.toml
index fe4e508dc9..4625a90cc9 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/fractional-nfts/Cargo.toml b/contracts/examples/fractional-nfts/Cargo.toml
index 8c11b19fdc..ec60d9d32a 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/fractional-nfts/meta/Cargo.toml b/contracts/examples/fractional-nfts/meta/Cargo.toml
index ecb2f5f2f1..d7a32ed9b1 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 f20930d2ad..47c9c4a88c 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/lottery-esdt/Cargo.toml b/contracts/examples/lottery-esdt/Cargo.toml
index e7eb4659ab..c4d7d29cd3 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/lottery-esdt/meta/Cargo.toml b/contracts/examples/lottery-esdt/meta/Cargo.toml
index 8233b7c512..b2cd28df5c 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 69c7b818d5..5da7483f04 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/multisig/Cargo.toml b/contracts/examples/multisig/Cargo.toml
index bcce2fa6d0..035057ec58 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../framework/scenario"
 
 [dev-dependencies.adder]
@@ -27,7 +27,7 @@ path = "../adder"
 path = "../factorial"
 
 [dev-dependencies.multiversx-wegld-swap-sc]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../core/wegld-swap"
 
 [dev-dependencies]
diff --git a/contracts/examples/multisig/interact/Cargo.toml b/contracts/examples/multisig/interact/Cargo.toml
index 2f1e91bbdd..32869be20c 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../contracts/modules"
 
 [dependencies.multiversx-sc-snippets]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../framework/snippets"
 
 [dependencies.multiversx-sc-scenario]
-version = "=0.49.0-alpha.3"
+version = "=0.49.0-alpha.4"
 path = "../../../../framework/scenario"
diff --git a/contracts/examples/multisig/meta/Cargo.toml b/contracts/examples/multisig/meta/Cargo.toml
index 5c26bd8270..0e29c29265 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 5f9c065231..a2d98375aa 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 699aee56ba..2c6a48b470 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/multisig/wasm/Cargo.toml b/contracts/examples/multisig/wasm/Cargo.toml
index 6001a724d2..f2202ffdb1 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/nft-minter/Cargo.toml b/contracts/examples/nft-minter/Cargo.toml
index c5918b6f7b..eb2ec96156 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/nft-minter/meta/Cargo.toml b/contracts/examples/nft-minter/meta/Cargo.toml
index 9b562d0350..cee7821359 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 1243696a1c..241a4215e2 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/nft-storage-prepay/Cargo.toml b/contracts/examples/nft-storage-prepay/Cargo.toml
index 87521e853e..136281df96 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/nft-storage-prepay/meta/Cargo.toml b/contracts/examples/nft-storage-prepay/meta/Cargo.toml
index 5682886f56..c1ddf2adc1 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 229c6a4717..99a5c3c1a6 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/nft-subscription/Cargo.toml b/contracts/examples/nft-subscription/Cargo.toml
index b26f94c434..be7a39917e 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/nft-subscription/meta/Cargo.toml b/contracts/examples/nft-subscription/meta/Cargo.toml
index 8b62235f45..d122df52df 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 ca9a314ce2..532cc400e4 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/order-book/factory/Cargo.toml b/contracts/examples/order-book/factory/Cargo.toml
index 9fb1974147..9a4978df8a 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../framework/scenario"
 
diff --git a/contracts/examples/order-book/factory/meta/Cargo.toml b/contracts/examples/order-book/factory/meta/Cargo.toml
index c5fe703a4a..3518de30d2 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 06ae5207f1..1ee94f9d8e 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/order-book/pair/Cargo.toml b/contracts/examples/order-book/pair/Cargo.toml
index 3b5064a83b..a93917179a 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../framework/scenario"
diff --git a/contracts/examples/order-book/pair/meta/Cargo.toml b/contracts/examples/order-book/pair/meta/Cargo.toml
index 99e08d3bf3..6f4ba52f4e 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 61aef735af..dd343a9dfc 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/ping-pong-egld/Cargo.toml b/contracts/examples/ping-pong-egld/Cargo.toml
index 674b90d665..fc86298452 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../framework/scenario"
 
diff --git a/contracts/examples/ping-pong-egld/meta/Cargo.toml b/contracts/examples/ping-pong-egld/meta/Cargo.toml
index 98bcbcba8c..a8bc467391 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 c7dcdf0380..8438778f1b 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/proxy-pause/Cargo.toml b/contracts/examples/proxy-pause/Cargo.toml
index 9accf4aeea..382dfd9f27 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 6dcc4e30ab..4be34a41ba 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 ca38a58a94..939f828e70 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/rewards-distribution/Cargo.toml b/contracts/examples/rewards-distribution/Cargo.toml
index e52b38c28c..d518ea5586 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/rewards-distribution/meta/Cargo.toml b/contracts/examples/rewards-distribution/meta/Cargo.toml
index 746938fde8..bfddb43d6f 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 <claudiu.bruda@multiversx.com>"]
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 3cee3848c2..a62cac8525 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/seed-nft-minter/Cargo.toml b/contracts/examples/seed-nft-minter/Cargo.toml
index f1c0ccd1c5..a57db6b6dc 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/seed-nft-minter/meta/Cargo.toml b/contracts/examples/seed-nft-minter/meta/Cargo.toml
index b62a153697..af481426af 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 <claudiu.bruda@multiversx.com>"]
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 ebf2f8df94..e6a61820c9 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/token-release/Cargo.toml b/contracts/examples/token-release/Cargo.toml
index 01ff068282..7c7c810787 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../framework/scenario"
 
diff --git a/contracts/examples/token-release/meta/Cargo.toml b/contracts/examples/token-release/meta/Cargo.toml
index e2afb339ec..68be5330b2 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 064f98b3c8..bce00fce24 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/abi-tester/Cargo.toml b/contracts/feature-tests/abi-tester/Cargo.toml
index c19e464f3e..714c488750 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../framework/scenario"
 
 [dev-dependencies.multiversx-sc-meta]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 33e1e2787e..a9bcc8d151 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.49.0-alpha.3"
+            "version": "0.49.0-alpha.4"
         }
     },
     "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 478b195d18..fcc5546404 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.49.0-alpha.3"
+            "version": "0.49.0-alpha.4"
         }
     },
     "docs": [
diff --git a/contracts/feature-tests/abi-tester/meta/Cargo.toml b/contracts/feature-tests/abi-tester/meta/Cargo.toml
index 9b7c4a08c9..7edae725e5 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 8bfa480843..963ef8f870 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 65a7038c2b..f5700ad92e 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/alloc-features/Cargo.toml b/contracts/feature-tests/alloc-features/Cargo.toml
index 1b07610469..3dd34d56a7 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 c3ad60f909..3ed3b16104 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml
index 59084bf018..130a20cf6e 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml
@@ -25,7 +25,7 @@ overflow-checks = false
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml
index 7c0ebffec7..aa66bcb1cb 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml
@@ -25,7 +25,7 @@ overflow-checks = false
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/alloc-features/wasm/Cargo.toml b/contracts/feature-tests/alloc-features/wasm/Cargo.toml
index 784dd52e8b..0a8f7e641a 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/basic-features/Cargo.toml b/contracts/feature-tests/basic-features/Cargo.toml
index c6ba72f9b7..f3633e8bd1 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../framework/scenario"
 
 [dependencies.multiversx-sc-modules]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 81e892886e..ef0209cab4 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../framework/snippets"
diff --git a/contracts/feature-tests/basic-features/meta/Cargo.toml b/contracts/feature-tests/basic-features/meta/Cargo.toml
index 30215e3488..670da00dbd 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 bcbd853f58..7d1cc921f4 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 d348b58457..cf42ff107a 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 7f39fd1c2b..ae27c92b74 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 07f567b2f3..603f584ece 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 04f16e8c5c..13c3fb8bdc 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/Cargo.toml b/contracts/feature-tests/composability/Cargo.toml
index d2c31be93d..5d372b4128 100644
--- a/contracts/feature-tests/composability/Cargo.toml
+++ b/contracts/feature-tests/composability/Cargo.toml
@@ -36,9 +36,9 @@ path = "recursive-caller"
 path = "vault"
 
 [dependencies.multiversx-sc]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 988a74e311..58c9d24215 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 8809391c73..3c33b8d81d 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 6e67682cd7..63dbe95fcb 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 cf497b77d8..63b7e46395 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 95b8bb3e7a..49c6e25659 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
@@ -9,10 +9,10 @@ publish = false
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 b688de7b7e..ccf10c89ad 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 5eea19a304..57c15b6fe2 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 ee50706ffe..89fe5071b8 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 a2c8472890..8788acf4ac 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 dccf91ee2d..aa93fcf9d7 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 6beeb65885..c90b451b29 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 7d56002e94..a084afe56c 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 2e59dd11f1..a1b68d9807 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 111c39dc04..b9678d7c3e 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 3719359f0d..7fbc51b49a 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
@@ -9,10 +9,10 @@ publish = false
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 0f9b09b643..8e9105a3ad 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 49cce44ba0..62fb2dc77c 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/forwarder-legacy/Cargo.toml b/contracts/feature-tests/composability/forwarder-legacy/Cargo.toml
index b7be9a2b09..8d985f30c1 100644
--- a/contracts/feature-tests/composability/forwarder-legacy/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-legacy/Cargo.toml
@@ -12,10 +12,10 @@ path = "src/forwarder_legacy_main.rs"
 path = "../vault"
 
 [dependencies.multiversx-sc]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../framework/scenario"
 
diff --git a/contracts/feature-tests/composability/forwarder-legacy/meta/Cargo.toml b/contracts/feature-tests/composability/forwarder-legacy/meta/Cargo.toml
index de2b7deb4f..de74469420 100644
--- a/contracts/feature-tests/composability/forwarder-legacy/meta/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-legacy/meta/Cargo.toml
@@ -8,6 +8,6 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../../framework/meta"
 default-features = false
diff --git a/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.toml b/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.toml
index 58f24599a1..3ce5ef1de3 100644
--- a/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.toml
@@ -25,7 +25,7 @@ overflow-checks = false
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 807a48e584..accf0696e9 100644
--- a/contracts/feature-tests/composability/forwarder-queue/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-queue/Cargo.toml
@@ -9,14 +9,14 @@ publish = false
 path = "src/forwarder_queue.rs"
 
 [dependencies.multiversx-sc]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../framework/wasm-adapter"
 optional = true
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 3ccbf42df7..6347cdc858 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 df35b3e625..ea15c56706 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 2caa94fdf6..ae6dab9b35 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 4ff47c8dcc..98838bf0e4 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 7db4c8cc8b..221d44e4eb 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 0691deeb91..208dcd4d05 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 87467a5713..5b4c266c48 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 49a2aaccc5..63cfbfed3b 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/forwarder/Cargo.toml b/contracts/feature-tests/composability/forwarder/Cargo.toml
index 43287d2f99..6790cc028c 100644
--- a/contracts/feature-tests/composability/forwarder/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder/Cargo.toml
@@ -9,10 +9,10 @@ publish = false
 path = "src/forwarder_main.rs"
 
 [dependencies.multiversx-sc]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../framework/scenario"
 
diff --git a/contracts/feature-tests/composability/forwarder/meta/Cargo.toml b/contracts/feature-tests/composability/forwarder/meta/Cargo.toml
index 373e719d27..a6b2ad50fa 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 840717266b..2395849caf 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/interact/Cargo.toml b/contracts/feature-tests/composability/interact/Cargo.toml
index eee6ad38e7..97cd3f93f5 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../contracts/modules"
 
 [dependencies.multiversx-sc-snippets]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 f5d6597a04..b969ae9c8b 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 197d6d771a..d9aa379fde 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 d5fa591652..89dfb08625 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 b36abd2473..d8f4c2ed7e 100644
--- a/contracts/feature-tests/composability/promises-features/Cargo.toml
+++ b/contracts/feature-tests/composability/promises-features/Cargo.toml
@@ -9,6 +9,6 @@ publish = false
 path = "src/promises_main.rs"
 
 [dependencies.multiversx-sc]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 c74045ba74..16159a0190 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 38a99b57d1..cdb0aa0d3e 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 2ac10d9906..6a9fcceaaf 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 de0d156d9a..02488e11e3 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 3288ee5579..88a44946b0 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 be7e7245e3..d3d878969d 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 559e0ab0b2..dcfd56990b 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 99fb50fdae..b93eb8a20f 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 5af4f6b07d..bd7b5fa4af 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 96bc818532..4b2f4f93b8 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 a72b6b1e24..d12fc3c8c6 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 b79e8d56b0..9f1da71c0b 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 79476b840c..3100fcd04c 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 ef7b1f1428..6a49bd9d5c 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/vault/Cargo.toml b/contracts/feature-tests/composability/vault/Cargo.toml
index e31b239684..58201feda6 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../framework/scenario"
diff --git a/contracts/feature-tests/composability/vault/meta/Cargo.toml b/contracts/feature-tests/composability/vault/meta/Cargo.toml
index 8d1b082bab..e7d99c51cc 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 b09fa9bbe9..9d3799aedb 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 3014a523c9..d0e8dd308b 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 c298a50dbd..7b8ee74e2c 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 3c19ea4d30..f3e9127598 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 1c7cafcd1d..fdee90fda9 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 33abc78a59..20285a8b66 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 3ca5de7c09..630c24b5f2 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 df8110b562..64f519f9a3 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 6a20d7350e..b4b0a71b4c 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 f9bfaf993c..27c5f2d2a6 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 6671d757bb..d662e3f8e9 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 a7a481f28c..0af2d54c37 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 e9b17b91f2..1566019c49 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 cac8f568a7..8cad0e03b2 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 76b0cf4614..6299d90bcb 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 83ed113938..8d12e823b9 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 359adb0799..0db234389f 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 5dcd945afd..060cf6a1a1 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 a10fafd483..b0aff72a5c 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 1a13e5b8ac..05ee5b504e 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 62f50069de..c18d25cd9b 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 044e9c98ee..3995505b5a 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 2325b11301..81e598d14e 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 86bf125ffb..0bcd0316c2 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 d6a741ce2a..8e8b693ebe 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 703b7a9353..425d3ee8eb 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 e95c73f7c7..690f09686b 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/exchange-features/Cargo.toml b/contracts/feature-tests/exchange-features/Cargo.toml
index d88b0bfe55..2963251bb9 100644
--- a/contracts/feature-tests/exchange-features/Cargo.toml
+++ b/contracts/feature-tests/exchange-features/Cargo.toml
@@ -9,9 +9,9 @@ publish = false
 path = "src/exchange_features.rs"
 
 [dependencies.multiversx-sc]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../framework/scenario"
diff --git a/contracts/feature-tests/exchange-features/meta/Cargo.toml b/contracts/feature-tests/exchange-features/meta/Cargo.toml
index a136b96009..a5bb2c339e 100644
--- a/contracts/feature-tests/exchange-features/meta/Cargo.toml
+++ b/contracts/feature-tests/exchange-features/meta/Cargo.toml
@@ -8,6 +8,6 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/feature-tests/exchange-features/wasm/Cargo.toml b/contracts/feature-tests/exchange-features/wasm/Cargo.toml
index b5faf4bc2a..9aed886551 100644
--- a/contracts/feature-tests/exchange-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/exchange-features/wasm/Cargo.toml
@@ -25,7 +25,7 @@ overflow-checks = false
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 449928d8e1..3ae3030b5d 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 4a1af3ce58..1dbe41b175 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 ad6413abb0..8230ed884b 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 2d0005c680..552cbb84b0 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 58b74efc31..91c7eb646a 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 e9281f9976..5762a40856 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 ef65d67f43..213f19e779 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 6ebca90110..866bfa5da1 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 e8162e6df5..1f77f836ed 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 bfa63ab7ea..f6ebe4edb9 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 82a1d0906f..28a8f95c7c 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 462466dc27..ba28d1f0d1 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 5a51dbe4ab..11eb995356 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 6f1b4f7b20..7e1007837d 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 a8bb519333..3b0455e096 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/payable-features/Cargo.toml b/contracts/feature-tests/payable-features/Cargo.toml
index f393b769a0..7973c85f03 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../framework/scenario"
diff --git a/contracts/feature-tests/payable-features/meta/Cargo.toml b/contracts/feature-tests/payable-features/meta/Cargo.toml
index b0e53733be..bc934da0cf 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 e8005d93c3..8cd5e49030 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 25e0ba5e4d..4f4fb8ba56 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 654a8d30d2..c84332da38 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 dd54362752..5260217e43 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../framework/meta"
 default-features = false
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 6be0e2b462..38946bc17a 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 83b382a1b6..aa9942a6d7 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../framework/base"
 features = [ "alloc" ]
 
@@ -17,7 +17,7 @@ path = "../../examples/adder"
 path = "../../feature-tests/basic-features"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 d8ebeebdfe..7e63f066fa 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 844da5b804..26a2d8d271 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/scenario-tester/Cargo.toml b/contracts/feature-tests/scenario-tester/Cargo.toml
index eb15243aa1..33c6f5cdcc 100644
--- a/contracts/feature-tests/scenario-tester/Cargo.toml
+++ b/contracts/feature-tests/scenario-tester/Cargo.toml
@@ -9,9 +9,9 @@ publish = false
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../framework/scenario"
diff --git a/contracts/feature-tests/scenario-tester/meta/Cargo.toml b/contracts/feature-tests/scenario-tester/meta/Cargo.toml
index 551bd6efe7..2d689e8a13 100644
--- a/contracts/feature-tests/scenario-tester/meta/Cargo.toml
+++ b/contracts/feature-tests/scenario-tester/meta/Cargo.toml
@@ -8,6 +8,6 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/feature-tests/scenario-tester/wasm/Cargo.toml b/contracts/feature-tests/scenario-tester/wasm/Cargo.toml
index 026d4b7463..fc67b3c6dc 100644
--- a/contracts/feature-tests/scenario-tester/wasm/Cargo.toml
+++ b/contracts/feature-tests/scenario-tester/wasm/Cargo.toml
@@ -25,7 +25,7 @@ overflow-checks = false
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/use-module/Cargo.toml b/contracts/feature-tests/use-module/Cargo.toml
index f55b44c58c..24efcdf34c 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../contracts/modules"
 
 [dependencies.multiversx-sc]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../framework/scenario"
 
 [dev-dependencies.multiversx-sc-meta]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../framework/meta"
diff --git a/contracts/feature-tests/use-module/meta/Cargo.toml b/contracts/feature-tests/use-module/meta/Cargo.toml
index bfbc356ab4..bd6cec3fee 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 f4a72800b6..7d3415622f 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 fedbb5c8c4..372d1ca170 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.49.0-alpha.3"
+            "version": "0.49.0-alpha.4"
         }
     },
     "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 75b41e0f02..7b0ae08a4f 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.49.0-alpha.3"
+            "version": "0.49.0-alpha.4"
         }
     },
     "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 a5c2d575ab..62a866a3e3 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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 f95cab10e3..f514309260 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/modules/Cargo.toml b/contracts/modules/Cargo.toml
index 338ab2ae7d..924bbab515 100644
--- a/contracts/modules/Cargo.toml
+++ b/contracts/modules/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-modules"
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 edition = "2021"
 
 authors = ["MultiversX <contact@multiversx.com>"]
@@ -17,5 +17,5 @@ categories = ["no-std", "wasm", "cryptography::cryptocurrencies"]
 alloc = ["multiversx-sc/alloc"]
 
 [dependencies.multiversx-sc]
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../framework/base"
diff --git a/framework/base/Cargo.toml b/framework/base/Cargo.toml
index 9537ff48ee..ab11b368e2 100644
--- a/framework/base/Cargo.toml
+++ b/framework/base/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc"
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 edition = "2021"
 
 authors = ["Andrei Marinica <andrei.marinica@multiversx.com>", "MultiversX <contact@multiversx.com>"]
@@ -28,7 +28,7 @@ bitflags = "=2.4.2"
 num-traits = { version = "=0.2.17", default-features = false }
 
 [dependencies.multiversx-sc-derive]
-version = "=0.49.0-alpha.3"
+version = "=0.49.0-alpha.4"
 path = "../derive"
 
 [dependencies.multiversx-sc-codec]
diff --git a/framework/base/src/types/interaction/tx.rs b/framework/base/src/types/interaction/tx.rs
index 075a78d50a..4b079db48e 100644
--- a/framework/base/src/types/interaction/tx.rs
+++ b/framework/base/src/types/interaction/tx.rs
@@ -3,7 +3,8 @@ use crate::{
     types::{
         BigUint, CodeMetadata, EgldOrEsdtTokenIdentifier, EgldOrEsdtTokenPayment,
         EgldOrEsdtTokenPaymentRefs, EgldOrMultiEsdtPayment, EsdtTokenPayment, EsdtTokenPaymentRefs,
-        ManagedBuffer, ManagedOption, ManagedVec, MultiEsdtPayment, TokenIdentifier,
+        ManagedAddress, ManagedBuffer, ManagedOption, ManagedVec, MultiEsdtPayment,
+        TokenIdentifier,
     },
 };
 
diff --git a/framework/derive/Cargo.toml b/framework/derive/Cargo.toml
index b15e244e7d..c9c1c4635c 100644
--- a/framework/derive/Cargo.toml
+++ b/framework/derive/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-derive"
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 edition = "2021"
 
 authors = ["Andrei Marinica <andrei.marinica@multiversx.com>", "MultiversX <contact@multiversx.com>"]
diff --git a/framework/meta/Cargo.toml b/framework/meta/Cargo.toml
index f0c8b354f7..805f3e7942 100644
--- a/framework/meta/Cargo.toml
+++ b/framework/meta/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-meta"
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 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.49.0-alpha.3"
+version = "=0.49.0-alpha.4"
 path = "../base"
 features = ["alloc", "num-bigint"]
 
diff --git a/framework/scenario/Cargo.toml b/framework/scenario/Cargo.toml
index 59aa246985..d946575a3c 100644
--- a/framework/scenario/Cargo.toml
+++ b/framework/scenario/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-scenario"
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 edition = "2021"
 
 authors = [
@@ -40,12 +40,12 @@ path = "src/main.rs"
 run-go-tests = []
 
 [dependencies.multiversx-sc]
-version = "=0.49.0-alpha.3"
+version = "=0.49.0-alpha.4"
 features = ["alloc", "num-bigint"]
 path = "../base"
 
 [dependencies.multiversx-sc-meta]
-version = "=0.49.0-alpha.3"
+version = "=0.49.0-alpha.4"
 path = "../meta"
 
 [dependencies.multiversx-chain-scenario-format]
@@ -60,5 +60,5 @@ version = "=0.8.3"
 path = "../../vm"
 
 [dependencies.multiversx-sdk]
-version = "=0.3.2"
+version = "=0.4.0-alpha.4"
 path = "../../sdk/core"
diff --git a/framework/snippets/Cargo.toml b/framework/snippets/Cargo.toml
index 4a2476136f..954ebb2ea9 100644
--- a/framework/snippets/Cargo.toml
+++ b/framework/snippets/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-snippets"
-version = "0.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 edition = "2021"
 
 authors = ["MultiversX <contact@multiversx.com>"]
@@ -23,9 +23,9 @@ futures = "0.3"
 rand = "0.8.5"
 
 [dependencies.multiversx-sc-scenario]
-version = "=0.49.0-alpha.3"
+version = "=0.49.0-alpha.4"
 path = "../scenario"
 
 [dependencies.multiversx-sdk]
-version = "=0.3.2"
+version = "=0.4.0-alpha.4"
 path = "../../sdk/core"
diff --git a/framework/wasm-adapter/Cargo.toml b/framework/wasm-adapter/Cargo.toml
index 148d6d74ee..8db81d396e 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 edition = "2021"
 
 authors = [
@@ -22,5 +22,5 @@ categories = [
 ]
 
 [dependencies.multiversx-sc]
-version = "=0.49.0-alpha.3"
+version = "=0.49.0-alpha.4"
 path = "../base"
diff --git a/sdk/core/Cargo.toml b/sdk/core/Cargo.toml
index c3f7aefd73..88b496cd3d 100644
--- a/sdk/core/Cargo.toml
+++ b/sdk/core/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sdk"
-version = "0.3.2"
+version = "0.4.0-alpha.4"
 edition = "2021"
 
 authors = [
diff --git a/tools/mxpy-snippet-generator/Cargo.toml b/tools/mxpy-snippet-generator/Cargo.toml
index 029658ccf8..8390f16c01 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.49.0-alpha.3"
+version = "0.49.0-alpha.4"
 path = "../../framework/base"
 
 [dependencies]
diff --git a/tools/rust-debugger/format-tests/Cargo.toml b/tools/rust-debugger/format-tests/Cargo.toml
index 3a6a5987c1..b44925e9d1 100644
--- a/tools/rust-debugger/format-tests/Cargo.toml
+++ b/tools/rust-debugger/format-tests/Cargo.toml
@@ -9,11 +9,11 @@ name = "format-tests"
 path = "src/format_tests.rs"
 
 [dependencies.multiversx-sc]
-version = "=0.49.0-alpha.3"
+version = "=0.49.0-alpha.4"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-scenario]
-version = "=0.49.0-alpha.3"
+version = "=0.49.0-alpha.4"
 path = "../../../framework/scenario"
 
 [dependencies.multiversx-chain-vm]

From 30d58a8d6e3cec01d09b9a9de0b83adcbf572d79 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 23 Apr 2024 16:12:57 +0300
Subject: [PATCH 0753/1254] Cargo.lock update

---
 .../benchmarks/large-storage/wasm/Cargo.lock  |   6 +-
 .../linked-list-repeat/wasm/Cargo.lock        |   6 +-
 .../mappers/map-repeat/wasm/Cargo.lock        |   6 +-
 .../mappers/queue-repeat/wasm/Cargo.lock      |   6 +-
 .../mappers/set-repeat/wasm/Cargo.lock        |   6 +-
 .../single-value-repeat/wasm/Cargo.lock       |   6 +-
 .../mappers/vec-repeat/wasm/Cargo.lock        |   6 +-
 .../benchmarks/send-tx-repeat/wasm/Cargo.lock |   6 +-
 .../Cargo.lock                                |   6 +-
 .../Cargo.lock                                |   6 +-
 .../benchmarks/str-repeat/wasm/Cargo.lock     |   6 +-
 .../core/price-aggregator/wasm/Cargo.lock     |  10 +-
 contracts/examples/adder/wasm/Cargo.lock      |   6 +-
 .../bonding-curve-contract/wasm/Cargo.lock    |   8 +-
 .../examples/check-pause/wasm/Cargo.lock      |   8 +-
 .../crowdfunding-esdt/wasm/Cargo.lock         |   6 +-
 .../examples/crypto-bubbles/wasm/Cargo.lock   |   6 +-
 .../kitty-auction/wasm/Cargo.lock             |   6 +-
 .../kitty-genetic-alg/wasm/Cargo.lock         |   6 +-
 .../kitty-ownership/wasm/Cargo.lock           |   6 +-
 .../examples/crypto-zombies/wasm/Cargo.lock   |   7 +-
 .../examples/digital-cash/wasm/Cargo.lock     |   6 +-
 contracts/examples/empty/wasm/Cargo.lock      |   6 +-
 .../esdt-transfer-with-fee/wasm/Cargo.lock    |   6 +-
 contracts/examples/factorial/wasm/Cargo.lock  |   6 +-
 .../examples/fractional-nfts/wasm/Cargo.lock  |   8 +-
 .../examples/lottery-esdt/wasm/Cargo.lock     |   6 +-
 .../multisig/wasm-multisig-full/Cargo.lock    |   8 +-
 .../multisig/wasm-multisig-view/Cargo.lock    |   8 +-
 contracts/examples/multisig/wasm/Cargo.lock   |   8 +-
 contracts/examples/nft-minter/wasm/Cargo.lock |   6 +-
 .../nft-storage-prepay/wasm/Cargo.lock        |   6 +-
 .../examples/nft-subscription/wasm/Cargo.lock |   8 +-
 .../order-book/factory/wasm/Cargo.lock        |   6 +-
 .../examples/order-book/pair/wasm/Cargo.lock  |   6 +-
 .../examples/ping-pong-egld/wasm/Cargo.lock   |   6 +-
 .../examples/proxy-pause/wasm/Cargo.lock      |   6 +-
 .../rewards-distribution/wasm/Cargo.lock      |   8 +-
 .../examples/seed-nft-minter/wasm/Cargo.lock  |   8 +-
 .../examples/token-release/wasm/Cargo.lock    |   6 +-
 .../abi-tester/wasm-abi-tester-ev/Cargo.lock  |   6 +-
 .../feature-tests/abi-tester/wasm/Cargo.lock  |   6 +-
 .../wasm-alloc-mem-fail/Cargo.lock            |   6 +-
 .../wasm-alloc-mem-leaking/Cargo.lock         |   6 +-
 .../alloc-features/wasm/Cargo.lock            |   6 +-
 .../Cargo.lock                                |   8 +-
 .../basic-features/wasm/Cargo.lock            |   8 +-
 .../big-float-features/wasm/Cargo.lock        |   6 +-
 .../builtin-func-features/wasm/Cargo.lock     |   6 +-
 .../first-contract/wasm/Cargo.lock            |   6 +-
 .../second-contract/wasm/Cargo.lock           |   6 +-
 .../child/wasm/Cargo.lock                     |   6 +-
 .../parent/wasm/Cargo.lock                    |  14 +-
 .../forwarder-legacy/wasm/Cargo.lock          | 178 ++++++++++++++++++
 .../wasm-forwarder-queue-promises/Cargo.lock  |  14 +-
 .../forwarder-queue/wasm/Cargo.lock           |  14 +-
 .../Cargo.lock                                |   6 +-
 .../Cargo.lock                                |   6 +-
 .../forwarder-raw/wasm/Cargo.lock             |   6 +-
 .../composability/forwarder/wasm/Cargo.lock   |  14 +-
 .../local-esdt-and-nft/wasm/Cargo.lock        |   6 +-
 .../promises-features/wasm/Cargo.lock         |  14 +-
 .../proxy-test-first/wasm/Cargo.lock          |   6 +-
 .../proxy-test-second/wasm/Cargo.lock         |   6 +-
 .../recursive-caller/wasm/Cargo.lock          |   6 +-
 .../transfer-role-features/wasm/Cargo.lock    |   8 +-
 .../vault/wasm-vault-promises/Cargo.lock      |   6 +-
 .../vault/wasm-vault-upgrade/Cargo.lock       |   6 +-
 .../composability/vault/wasm/Cargo.lock       |   6 +-
 .../crowdfunding-erc20/wasm/Cargo.lock        |   6 +-
 .../erc1155-marketplace/wasm/Cargo.lock       |   6 +-
 .../erc1155-user-mock/wasm/Cargo.lock         |   6 +-
 .../erc1155/wasm/Cargo.lock                   |   6 +-
 .../erc-style-contracts/erc20/wasm/Cargo.lock |   6 +-
 .../erc721/wasm/Cargo.lock                    |   6 +-
 .../lottery-erc20/wasm/Cargo.lock             |   6 +-
 .../esdt-system-sc-mock/wasm/Cargo.lock       |   6 +-
 .../exchange-features/wasm/Cargo.lock         |   6 +-
 .../wasm/Cargo.lock                           |   6 +-
 .../managed-map-features/wasm/Cargo.lock      |   6 +-
 .../wasm-multi-contract-alt-impl/Cargo.lock   |   6 +-
 .../Cargo.lock                                |   6 +-
 .../Cargo.lock                                |   6 +-
 .../multi-contract-features/wasm/Cargo.lock   |   6 +-
 .../panic-message-features/wasm/Cargo.lock    |   6 +-
 .../payable-features/wasm/Cargo.lock          |   6 +-
 .../wasm/Cargo.lock                           |   6 +-
 .../wasm/Cargo.lock                           |   6 +-
 .../scenario-tester/wasm/Cargo.lock           |   6 +-
 .../wasm-use-module-view/Cargo.lock           |   8 +-
 .../feature-tests/use-module/wasm/Cargo.lock  |   8 +-
 91 files changed, 464 insertions(+), 327 deletions(-)
 create mode 100644 contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.lock

diff --git a/contracts/benchmarks/large-storage/wasm/Cargo.lock b/contracts/benchmarks/large-storage/wasm/Cargo.lock
index cb13777edf..6708e4f729 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.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.lock
index 78ff5aef10..d31c788662 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.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -92,7 +92,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -103,7 +103,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.lock
index 3ee28394b7..9142220cb1 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.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -92,7 +92,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -103,7 +103,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.lock
index 4df3ab54da..83c707f963 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.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.lock
index 4f8e72b115..7ad0062925 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.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.lock
index fdfa32de28..03db275999 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.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.lock
index f51214f9f1..bd459c71c4 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.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/send-tx-repeat/wasm/Cargo.lock b/contracts/benchmarks/send-tx-repeat/wasm/Cargo.lock
index 13533956e8..83d1d9a328 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.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.lock b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.lock
index 4683a2b046..2196d6249d 100644
--- a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.lock
+++ b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.lock
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.lock b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.lock
index f750a8d328..e25c06bd30 100644
--- a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.lock
+++ b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.lock
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/str-repeat/wasm/Cargo.lock b/contracts/benchmarks/str-repeat/wasm/Cargo.lock
index e2b54817be..8df220c83a 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.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/core/price-aggregator/wasm/Cargo.lock b/contracts/core/price-aggregator/wasm/Cargo.lock
index 9e64d41b47..e8278c9e49 100644
--- a/contracts/core/price-aggregator/wasm/Cargo.lock
+++ b/contracts/core/price-aggregator/wasm/Cargo.lock
@@ -86,7 +86,7 @@ checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
 
 [[package]]
 name = "multiversx-price-aggregator-sc"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "arrayvec",
  "getrandom",
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -134,7 +134,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -145,14 +145,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/adder/wasm/Cargo.lock b/contracts/examples/adder/wasm/Cargo.lock
index 1aea528c2d..94b2bd585c 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.49.0-alpha.2"
+version = "0.49.0-alpha.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/bonding-curve-contract/wasm/Cargo.lock b/contracts/examples/bonding-curve-contract/wasm/Cargo.lock
index 0fa9693639..6091dfa920 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.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,14 +96,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/check-pause/wasm/Cargo.lock b/contracts/examples/check-pause/wasm/Cargo.lock
index 1d886bba04..c1e288a067 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.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,14 +96,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crowdfunding-esdt/wasm/Cargo.lock b/contracts/examples/crowdfunding-esdt/wasm/Cargo.lock
index 9a14efccc8..d2c12aee7e 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.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crypto-bubbles/wasm/Cargo.lock b/contracts/examples/crypto-bubbles/wasm/Cargo.lock
index 6af31b83b6..083af51877 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.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.lock b/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.lock
index 82fd08dc78..b9cc0ec1cf 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.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -113,7 +113,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -124,7 +124,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
 ]
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 95368370cb..eb39c5f440 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.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.lock b/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.lock
index d497d47054..99fec426ee 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.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -104,7 +104,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -115,7 +115,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crypto-zombies/wasm/Cargo.lock b/contracts/examples/crypto-zombies/wasm/Cargo.lock
index 656ebf0e03..66258245b1 100755
--- a/contracts/examples/crypto-zombies/wasm/Cargo.lock
+++ b/contracts/examples/crypto-zombies/wasm/Cargo.lock
@@ -26,7 +26,6 @@ version = "0.0.0"
 dependencies = [
  "kitty",
  "multiversx-sc",
- "random",
 ]
 
 [[package]]
@@ -65,7 +64,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -94,7 +93,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -105,7 +104,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/digital-cash/wasm/Cargo.lock b/contracts/examples/digital-cash/wasm/Cargo.lock
index 602c7d856b..cfa4657a3c 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.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/empty/wasm/Cargo.lock b/contracts/examples/empty/wasm/Cargo.lock
index 5a87b422d2..e8fb6ec964 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.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.lock b/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.lock
index cee7278178..87ca70552e 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.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/factorial/wasm/Cargo.lock b/contracts/examples/factorial/wasm/Cargo.lock
index 4dff18babf..a60c60b3f9 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.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/fractional-nfts/wasm/Cargo.lock b/contracts/examples/fractional-nfts/wasm/Cargo.lock
index f95919526e..188bb02f09 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.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,14 +96,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/lottery-esdt/wasm/Cargo.lock b/contracts/examples/lottery-esdt/wasm/Cargo.lock
index 6f1cace25d..fe712bd8bd 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.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/multisig/wasm-multisig-full/Cargo.lock b/contracts/examples/multisig/wasm-multisig-full/Cargo.lock
index 953a8551f3..124322c53e 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.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,14 +96,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/multisig/wasm-multisig-view/Cargo.lock b/contracts/examples/multisig/wasm-multisig-view/Cargo.lock
index df77559d67..8e31c2566b 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.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,14 +96,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/multisig/wasm/Cargo.lock b/contracts/examples/multisig/wasm/Cargo.lock
index d72aa67e30..0ec303cb70 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.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,14 +96,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/nft-minter/wasm/Cargo.lock b/contracts/examples/nft-minter/wasm/Cargo.lock
index ce0b2650f9..47ea0d8306 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.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/nft-storage-prepay/wasm/Cargo.lock b/contracts/examples/nft-storage-prepay/wasm/Cargo.lock
index 319176681e..7513e4a0f6 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.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/nft-subscription/wasm/Cargo.lock b/contracts/examples/nft-subscription/wasm/Cargo.lock
index 2244415577..e89f4e2eb7 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.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,14 +80,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/order-book/factory/wasm/Cargo.lock b/contracts/examples/order-book/factory/wasm/Cargo.lock
index 60c0b2cabd..8c1f3b9084 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.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/order-book/pair/wasm/Cargo.lock b/contracts/examples/order-book/pair/wasm/Cargo.lock
index 14b8551309..7a899b10a5 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.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/ping-pong-egld/wasm/Cargo.lock b/contracts/examples/ping-pong-egld/wasm/Cargo.lock
index a86f53d6dd..bae852197d 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.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/proxy-pause/wasm/Cargo.lock b/contracts/examples/proxy-pause/wasm/Cargo.lock
index 73d7607641..161bc13f68 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.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/rewards-distribution/wasm/Cargo.lock b/contracts/examples/rewards-distribution/wasm/Cargo.lock
index d5303f9494..886ab12580 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.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,14 +80,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/seed-nft-minter/wasm/Cargo.lock b/contracts/examples/seed-nft-minter/wasm/Cargo.lock
index d322f26404..9241783954 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.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,14 +80,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/token-release/wasm/Cargo.lock b/contracts/examples/token-release/wasm/Cargo.lock
index 0d4d728f3e..aa56882a90 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.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
 ]
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 a99ecaccaf..99a94c03ec 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.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/abi-tester/wasm/Cargo.lock b/contracts/feature-tests/abi-tester/wasm/Cargo.lock
index db59638442..e0be6b9819 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.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock
index 1a3bc7da70..7588f39311 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.lock b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.lock
index b32efb0d4a..c98821ddb9 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.lock
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.lock
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/alloc-features/wasm/Cargo.lock b/contracts/feature-tests/alloc-features/wasm/Cargo.lock
index 6a0f3330d7..17c1644f6e 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.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
 ]
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 f5d8794bb9..d78191614a 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.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,14 +96,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/basic-features/wasm/Cargo.lock b/contracts/feature-tests/basic-features/wasm/Cargo.lock
index bfb8c41ea7..a87d0db4a0 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.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,14 +96,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/big-float-features/wasm/Cargo.lock b/contracts/feature-tests/big-float-features/wasm/Cargo.lock
index 40beaf8d03..894e6a71d8 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.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
 ]
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 bb57eeb64e..44ac5b066c 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.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
 ]
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 a2c55964c7..a1a6b4e57c 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.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
 ]
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 99cd973235..b085b55d5a 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.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
 ]
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 b7b7846eb2..fd4281c8c4 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.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
 ]
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 fd4d0794e8..1cc5525f78 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
@@ -20,13 +20,6 @@ version = "2.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
 
-[[package]]
-name = "child"
-version = "0.0.0"
-dependencies = [
- "multiversx-sc",
-]
-
 [[package]]
 name = "endian-type"
 version = "0.1.2"
@@ -47,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -76,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
 ]
@@ -114,7 +107,6 @@ dependencies = [
 name = "parent"
 version = "0.0.0"
 dependencies = [
- "child",
  "multiversx-sc",
 ]
 
diff --git a/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.lock
new file mode 100644
index 0000000000..6f2efbb4a7
--- /dev/null
+++ b/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.lock
@@ -0,0 +1,178 @@
+# 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.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+
+[[package]]
+name = "bitflags"
+version = "2.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+
+[[package]]
+name = "endian-type"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
+
+[[package]]
+name = "forwarder-legacy"
+version = "0.0.0"
+dependencies = [
+ "multiversx-sc",
+ "vault",
+]
+
+[[package]]
+name = "forwarder-legacy-wasm"
+version = "0.0.0"
+dependencies = [
+ "forwarder-legacy",
+ "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.49.0-alpha.4"
+dependencies = [
+ "bitflags",
+ "hex-literal",
+ "multiversx-sc-codec",
+ "multiversx-sc-derive",
+ "num-traits",
+]
+
+[[package]]
+name = "multiversx-sc-codec"
+version = "0.18.6"
+dependencies = [
+ "arrayvec",
+ "multiversx-sc-codec-derive",
+]
+
+[[package]]
+name = "multiversx-sc-codec-derive"
+version = "0.18.6"
+dependencies = [
+ "hex",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "multiversx-sc-derive"
+version = "0.49.0-alpha.4"
+dependencies = [
+ "hex",
+ "proc-macro2",
+ "quote",
+ "radix_trie",
+ "syn",
+]
+
+[[package]]
+name = "multiversx-sc-wasm-adapter"
+version = "0.49.0-alpha.4"
+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.78"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+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.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
+
+[[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"
+
+[[package]]
+name = "vault"
+version = "0.0.0"
+dependencies = [
+ "multiversx-sc",
+]
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 9ce03493b3..0ae3a27158 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
@@ -31,7 +31,6 @@ name = "forwarder-queue"
 version = "0.0.0"
 dependencies = [
  "multiversx-sc",
- "vault",
 ]
 
 [[package]]
@@ -56,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -85,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
 ]
@@ -169,10 +168,3 @@ name = "unicode-ident"
 version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
-
-[[package]]
-name = "vault"
-version = "0.0.0"
-dependencies = [
- "multiversx-sc",
-]
diff --git a/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock
index dbef7fe1c4..860461a0f0 100644
--- a/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock
@@ -31,7 +31,6 @@ name = "forwarder-queue"
 version = "0.0.0"
 dependencies = [
  "multiversx-sc",
- "vault",
 ]
 
 [[package]]
@@ -56,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -85,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
 ]
@@ -169,10 +168,3 @@ name = "unicode-ident"
 version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
-
-[[package]]
-name = "vault"
-version = "0.0.0"
-dependencies = [
- "multiversx-sc",
-]
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 1b3b56c133..8c45f982fd 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.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
 ]
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 dcb63c28ef..0dcd90a47b 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.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.lock
index 4b56a477a5..9c2550453a 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.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock
index 14ba905f98..9394670d78 100755
--- a/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock
@@ -31,7 +31,6 @@ name = "forwarder"
 version = "0.0.0"
 dependencies = [
  "multiversx-sc",
- "vault",
 ]
 
 [[package]]
@@ -56,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -85,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
 ]
@@ -169,10 +168,3 @@ name = "unicode-ident"
 version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
-
-[[package]]
-name = "vault"
-version = "0.0.0"
-dependencies = [
- "multiversx-sc",
-]
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 cf8b7eaeb8..306d6ca1f6 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.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/promises-features/wasm/Cargo.lock b/contracts/feature-tests/composability/promises-features/wasm/Cargo.lock
index 1cce0c20ac..dcfdbef311 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.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
 ]
@@ -117,7 +117,6 @@ name = "promises-features"
 version = "0.0.0"
 dependencies = [
  "multiversx-sc",
- "vault",
 ]
 
 [[package]]
@@ -169,10 +168,3 @@ name = "unicode-ident"
 version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
-
-[[package]]
-name = "vault"
-version = "0.0.0"
-dependencies = [
- "multiversx-sc",
-]
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 2616a0e326..fe997fa86f 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.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
 ]
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 cb41667a6d..a0b07ff2f6 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.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.lock b/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.lock
index d2e41ac725..00977f8bbd 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.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
 ]
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 bbbb12c9f9..2bed78bf9a 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.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,14 +80,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
 ]
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 e86afd77c4..d710aceb72 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.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
 ]
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 0b7112be8c..5e2cc3f66c 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.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/vault/wasm/Cargo.lock b/contracts/feature-tests/composability/vault/wasm/Cargo.lock
index 6d0b58aed6..297c3796f0 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.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
 ]
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 ad10f006f4..0bc315e9fb 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.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -92,7 +92,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -103,7 +103,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
 ]
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 0a96032377..dd889a0faa 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.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -92,7 +92,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -103,7 +103,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
 ]
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 a6f053b5c8..3a434c71fb 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.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
 ]
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 90f97cfb61..7caccdf499 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.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
 ]
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 c7d25eb4e2..7982edf7d2 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.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
 ]
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 b91f78bb52..bd877a1118 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.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
 ]
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 36b9febca3..8990616f04 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.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -92,7 +92,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -103,7 +103,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
 ]
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 d52e047711..7dd4fb648b 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.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/exchange-features/wasm/Cargo.lock b/contracts/feature-tests/exchange-features/wasm/Cargo.lock
index 09349d87e7..61605d1f7f 100644
--- a/contracts/feature-tests/exchange-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/exchange-features/wasm/Cargo.lock
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/formatted-message-features/wasm/Cargo.lock b/contracts/feature-tests/formatted-message-features/wasm/Cargo.lock
index 9dbe2ad726..753027d794 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.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/managed-map-features/wasm/Cargo.lock b/contracts/feature-tests/managed-map-features/wasm/Cargo.lock
index a555da68eb..cab5358a51 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.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
 ]
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 3997752036..c9c7649dc8 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.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
 ]
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 13230fc27c..76a09ced3b 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.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
 ]
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 b1fa6d8b6b..93f165d078 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.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/multi-contract-features/wasm/Cargo.lock b/contracts/feature-tests/multi-contract-features/wasm/Cargo.lock
index 2815c003c8..615ffffd84 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.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/panic-message-features/wasm/Cargo.lock b/contracts/feature-tests/panic-message-features/wasm/Cargo.lock
index ddf9332c59..dc78f4d79f 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.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/payable-features/wasm/Cargo.lock b/contracts/feature-tests/payable-features/wasm/Cargo.lock
index 3ffdf49ece..ef5d30915a 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.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
 ]
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 b8d98314e7..6e9141b444 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.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
 ]
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 f95eb564c3..baaa27b189 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.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/scenario-tester/wasm/Cargo.lock b/contracts/feature-tests/scenario-tester/wasm/Cargo.lock
index dd7e298064..c92359d81b 100755
--- a/contracts/feature-tests/scenario-tester/wasm/Cargo.lock
+++ b/contracts/feature-tests/scenario-tester/wasm/Cargo.lock
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0-alpha.2"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
 ]
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 969d71832f..eaf5904701 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.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,14 +80,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/use-module/wasm/Cargo.lock b/contracts/feature-tests/use-module/wasm/Cargo.lock
index c97622bd31..5ff85f74d5 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.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,14 +80,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.49.0-alpha.4"
 dependencies = [
  "multiversx-sc",
 ]

From 50a269eba275e668453a9adf152b547003141a11 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Tue, 23 Apr 2024 20:27:12 +0300
Subject: [PATCH 0754/1254] impl tx_hash - data not stored

---
 .../rewards-distribution/src/proxy.rs         | 233 ++++++++++++++++++
 .../src/rewards_distribution.rs               |   2 +-
 .../rewards_distribution_blackbox_test.rs     |  25 +-
 framework/base/src/types/interaction/tx.rs    |  32 ++-
 .../base/src/types/interaction/tx_env.rs      |   6 +
 .../src/facade/world_tx/scenario_exec_call.rs |  14 +-
 .../src/facade/world_tx/scenario_tx_env.rs    |   8 +-
 .../interactor_tx/interactor_prepare_async.rs |   1 +
 8 files changed, 305 insertions(+), 16 deletions(-)
 create mode 100644 contracts/examples/rewards-distribution/src/proxy.rs

diff --git a/contracts/examples/rewards-distribution/src/proxy.rs b/contracts/examples/rewards-distribution/src/proxy.rs
new file mode 100644
index 0000000000..4a02c6c098
--- /dev/null
+++ b/contracts/examples/rewards-distribution/src/proxy.rs
@@ -0,0 +1,233 @@
+// Code generated by the multiversx-sc proxy generator. DO NOT EDIT.
+
+////////////////////////////////////////////////////
+////////////////// AUTO-GENERATED //////////////////
+////////////////////////////////////////////////////
+
+#![allow(dead_code)]
+#![allow(clippy::all)]
+
+use multiversx_sc::proxy_imports::*;
+
+pub struct RewardsDistributionProxy;
+
+impl<Env, From, To, Gas> TxProxyTrait<Env, From, To, Gas> for RewardsDistributionProxy
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    type TxProxyMethods = RewardsDistributionProxyMethods<Env, From, To, Gas>;
+
+    fn proxy_methods(self, tx: Tx<Env, From, To, (), Gas, (), ()>) -> Self::TxProxyMethods {
+        RewardsDistributionProxyMethods { wrapped_tx: tx }
+    }
+}
+
+pub struct RewardsDistributionProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    wrapped_tx: Tx<Env, From, To, (), Gas, (), ()>,
+}
+
+#[rustfmt::skip]
+impl<Env, From, Gas> RewardsDistributionProxyMethods<Env, From, (), Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn init<
+        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+        Arg1: CodecInto<ManagedVec<Env::Api, Bracket>>,
+    >(
+        self,
+        seed_nft_minter_address: Arg0,
+        brackets: Arg1,
+    ) -> TxProxyDeploy<Env, From, Gas, ()> {
+        self.wrapped_tx
+            .raw_deploy()
+            .argument(&seed_nft_minter_address)
+            .argument(&brackets)
+            .original_result()
+    }
+}
+
+#[rustfmt::skip]
+impl<Env, From, To, Gas> RewardsDistributionProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn deposit_royalties(
+        self,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call("depositRoyalties")
+            .original_result()
+    }
+
+    pub fn raffle(
+        self,
+    ) -> TxProxyCall<Env, From, To, Gas, OperationCompletionStatus> {
+        self.wrapped_tx
+            .raw_call("raffle")
+            .original_result()
+    }
+
+    pub fn claim_rewards<
+        Arg0: CodecInto<u64>,
+        Arg1: CodecInto<u64>,
+        Arg2: CodecInto<MultiValueEncoded<Env::Api, MultiValue2<EgldOrEsdtTokenIdentifier<Env::Api>, u64>>>,
+    >(
+        self,
+        raffle_id_start: Arg0,
+        raffle_id_end: Arg1,
+        reward_tokens: Arg2,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call("claimRewards")
+            .argument(&raffle_id_start)
+            .argument(&raffle_id_end)
+            .argument(&reward_tokens)
+            .original_result()
+    }
+
+    pub fn compute_claimable_amount<
+        Arg0: CodecInto<u64>,
+        Arg1: CodecInto<EgldOrEsdtTokenIdentifier<Env::Api>>,
+        Arg2: CodecInto<u64>,
+        Arg3: CodecInto<u64>,
+    >(
+        self,
+        raffle_id: Arg0,
+        reward_token_id: Arg1,
+        reward_token_nonce: Arg2,
+        nft_nonce: Arg3,
+    ) -> TxProxyCall<Env, From, To, Gas, BigUint<Env::Api>> {
+        self.wrapped_tx
+            .raw_call("computeClaimableAmount")
+            .argument(&raffle_id)
+            .argument(&reward_token_id)
+            .argument(&reward_token_nonce)
+            .argument(&nft_nonce)
+            .original_result()
+    }
+
+    pub fn raffle_id(
+        self,
+    ) -> TxProxyCall<Env, From, To, Gas, u64> {
+        self.wrapped_tx
+            .raw_call("getRaffleId")
+            .original_result()
+    }
+
+    pub fn completed_raffle_id_count(
+        self,
+    ) -> TxProxyCall<Env, From, To, Gas, u64> {
+        self.wrapped_tx
+            .raw_call("getCompletedRaffleIdCount")
+            .original_result()
+    }
+
+    pub fn royalties<
+        Arg0: CodecInto<u64>,
+        Arg1: CodecInto<EgldOrEsdtTokenIdentifier<Env::Api>>,
+        Arg2: CodecInto<u64>,
+    >(
+        self,
+        raffle_id: Arg0,
+        reward_token_id: Arg1,
+        reward_token_nonce: Arg2,
+    ) -> TxProxyCall<Env, From, To, Gas, BigUint<Env::Api>> {
+        self.wrapped_tx
+            .raw_call("getRoyalties")
+            .argument(&raffle_id)
+            .argument(&reward_token_id)
+            .argument(&reward_token_nonce)
+            .original_result()
+    }
+
+    pub fn nft_reward_percent<
+        Arg0: CodecInto<u64>,
+        Arg1: CodecInto<u64>,
+    >(
+        self,
+        raffle_id: Arg0,
+        nft_nonce: Arg1,
+    ) -> TxProxyCall<Env, From, To, Gas, BigUint<Env::Api>> {
+        self.wrapped_tx
+            .raw_call("getNftRewardPercent")
+            .argument(&raffle_id)
+            .argument(&nft_nonce)
+            .original_result()
+    }
+
+    pub fn was_claimed<
+        Arg0: CodecInto<u64>,
+        Arg1: CodecInto<EgldOrEsdtTokenIdentifier<Env::Api>>,
+        Arg2: CodecInto<u64>,
+        Arg3: CodecInto<u64>,
+    >(
+        self,
+        raffle_id: Arg0,
+        reward_token_id: Arg1,
+        reward_token_nonce: Arg2,
+        nft_nonce: Arg3,
+    ) -> TxProxyCall<Env, From, To, Gas, bool> {
+        self.wrapped_tx
+            .raw_call("getWasClaimed")
+            .argument(&raffle_id)
+            .argument(&reward_token_id)
+            .argument(&reward_token_nonce)
+            .argument(&nft_nonce)
+            .original_result()
+    }
+
+    pub fn seed_nft_minter_address(
+        self,
+    ) -> TxProxyCall<Env, From, To, Gas, ManagedAddress<Env::Api>> {
+        self.wrapped_tx
+            .raw_call("getSeedNftMinterAddress")
+            .original_result()
+    }
+
+    pub fn brackets(
+        self,
+    ) -> TxProxyCall<Env, From, To, Gas, ManagedVec<Env::Api, Bracket>> {
+        self.wrapped_tx
+            .raw_call("getBrackets")
+            .original_result()
+    }
+
+    pub fn last_raffle_epoch(
+        self,
+    ) -> TxProxyCall<Env, From, To, Gas, u64> {
+        self.wrapped_tx
+            .raw_call("getLastRaffleEpoch")
+            .original_result()
+    }
+
+    pub fn nft_token_id(
+        self,
+    ) -> TxProxyCall<Env, From, To, Gas, TokenIdentifier<Env::Api>> {
+        self.wrapped_tx
+            .raw_call("getNftTokenId")
+            .original_result()
+    }
+}
+
+#[derive(ManagedVecItem, NestedEncode, NestedDecode)]
+pub struct Bracket {
+    pub index_percent: u64,
+    pub bracket_reward_percent: u64,
+}
diff --git a/contracts/examples/rewards-distribution/src/rewards_distribution.rs b/contracts/examples/rewards-distribution/src/rewards_distribution.rs
index 880b4ed835..eb69173c62 100644
--- a/contracts/examples/rewards-distribution/src/rewards_distribution.rs
+++ b/contracts/examples/rewards-distribution/src/rewards_distribution.rs
@@ -5,8 +5,8 @@ use multiversx_sc_modules::ongoing_operation::{
     CONTINUE_OP, DEFAULT_MIN_GAS_TO_SAVE_PROGRESS, STOP_OP,
 };
 
+pub mod proxy;
 pub mod seed_nft_minter_proxy;
-
 type Epoch = u64;
 
 pub const EPOCHS_IN_WEEK: Epoch = 7;
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 4380f0122f..e70f273015 100644
--- a/contracts/examples/rewards-distribution/tests/rewards_distribution_blackbox_test.rs
+++ b/contracts/examples/rewards-distribution/tests/rewards_distribution_blackbox_test.rs
@@ -6,18 +6,24 @@ use std::iter::zip;
 
 use crate::mock_seed_nft_minter::ProxyTrait as _;
 use rewards_distribution::{
-    Bracket, ContractObj, ProxyTrait as _, RewardsDistribution, DIVISION_SAFETY_CONSTANT,
+    proxy, Bracket, ContractObj, ProxyTrait as _, RewardsDistribution, DIVISION_SAFETY_CONSTANT,
 };
 
 const NFT_TOKEN_ID: &[u8] = b"NFT-123456";
 const NFT_TOKEN_ID_EXPR: &str = "str:NFT-123456";
 
 const ALICE_ADDRESS_EXPR: &str = "address:alice";
+const ALICE_ADDRESS_EXPR_REPL: AddressExpr = AddressExpr("alice");
 const OWNER_ADDRESS_EXPR: &str = "address:owner";
 const REWARDS_DISTRIBUTION_ADDRESS_EXPR: &str = "sc:rewards-distribution";
+const REWARDS_DISTRIBUTION_ADDRESS_EXPR_REPL: ScExpr = ScExpr("rewards-distribution");
 const REWARDS_DISTRIBUTION_PATH_EXPR: &str = "mxsc:output/rewards-distribution.mxsc.json";
+const REWARDS_DISTRIBUTION_PATH_EXPR_REPL: MxscExpr =
+    MxscExpr("output/rewards-distribution.mxsc.json");
 const SEED_NFT_MINTER_ADDRESS_EXPR: &str = "sc:seed-nft-minter";
 const SEED_NFT_MINTER_PATH_EXPR: &str = "mxsc:../seed-nft-minter/output/seed-nft-minter.mxsc.json";
+const SEED_NFT_MINTER_PATH_EXPR_REPL: MxscExpr =
+    MxscExpr("../seed-nft-minter/output/seed-nft-minter.mxsc.json");
 
 type RewardsDistributionContract = ContractInfo<rewards_distribution::Proxy<StaticApi>>;
 type SeedNFTMinterContract = ContractInfo<mock_seed_nft_minter::Proxy<StaticApi>>;
@@ -216,14 +222,17 @@ fn test_raffle_and_claim() {
             .call(state.rewards_distribution_contract.deposit_royalties()),
     );
 
+    let vect = &[0u8; 32];
     // run the raffle
-    state.world.sc_call(
-        ScCallStep::new()
-            .from(ALICE_ADDRESS_EXPR)
-            .tx_hash(&[0u8; 32]) // blockchain rng is deterministic, so we can use a fixed hash
-            .call(state.rewards_distribution_contract.raffle())
-            .expect_value(OperationCompletionStatus::Completed),
-    );
+    state
+        .world
+        .tx()
+        .from(ALICE_ADDRESS_EXPR_REPL)
+        .to(REWARDS_DISTRIBUTION_ADDRESS_EXPR_REPL)
+        .typed(proxy::RewardsDistributionProxy)
+        .raffle()
+        .tx_hash(ManagedBuffer::from(vect))
+        .run();
 
     let mut rewards: Vec<BigUint<StaticApi>> = Vec::new();
     // post-raffle reward amount frequency checksstate
diff --git a/framework/base/src/types/interaction/tx.rs b/framework/base/src/types/interaction/tx.rs
index 075a78d50a..e5313ef198 100644
--- a/framework/base/src/types/interaction/tx.rs
+++ b/framework/base/src/types/interaction/tx.rs
@@ -3,7 +3,8 @@ use crate::{
     types::{
         BigUint, CodeMetadata, EgldOrEsdtTokenIdentifier, EgldOrEsdtTokenPayment,
         EgldOrEsdtTokenPaymentRefs, EgldOrMultiEsdtPayment, EsdtTokenPayment, EsdtTokenPaymentRefs,
-        ManagedBuffer, ManagedOption, ManagedVec, MultiEsdtPayment, TokenIdentifier,
+        ManagedAddress, ManagedBuffer, ManagedOption, ManagedVec, MultiEsdtPayment,
+        TokenIdentifier,
     },
 };
 
@@ -14,9 +15,9 @@ use super::{
     ContractCallNoPayment, ContractCallWithEgld, ContractDeploy, DeployCall, Egld, EgldPayment,
     ExplicitGas, FromSource, FunctionCall, ManagedArgBuffer, OriginalResultMarker, RHList,
     RHListAppendNoRet, RHListAppendRet, RHListItem, TxCodeSource, TxCodeValue, TxData,
-    TxDataFunctionCall, TxEgldValue, TxEnv, TxEnvMockDeployAddress, TxFrom, TxFromSourceValue,
-    TxFromSpecified, TxGas, TxGasValue, TxPayment, TxPaymentEgldOnly, TxProxyTrait,
-    TxResultHandler, TxScEnv, TxTo, TxToSpecified, UpgradeCall,
+    TxDataFunctionCall, TxEgldValue, TxEnv, TxEnvMockDeployAddress, TxEnvWithTxHash, TxFrom,
+    TxFromSourceValue, TxFromSpecified, TxGas, TxGasValue, TxPayment, TxPaymentEgldOnly,
+    TxProxyTrait, TxResultHandler, TxScEnv, TxTo, TxToSpecified, UpgradeCall,
 };
 
 #[must_use]
@@ -844,6 +845,29 @@ where
     }
 }
 
+impl<Env, From, To, Payment, Gas, Data, RH> Tx<Env, From, To, Payment, Gas, Data, RH>
+where
+    Env: TxEnvWithTxHash,
+    From: TxFromSpecified<Env>,
+    To: TxTo<Env>,
+    Payment: TxPaymentEgldOnly<Env>,
+    Gas: TxGas<Env>,
+    Data: TxDataFunctionCall<Env>,
+    RH: TxResultHandler<Env>,
+{
+    /// Sets the new mock address to be used for the newly deployed contract.
+    ///
+    /// Only allowed in tests.
+    pub fn tx_hash<TH>(mut self, tx_hash: TH) -> Self
+    where
+        TH: AnnotatedValue<Env, ManagedBuffer<Env::Api>>,
+    {
+        self.env.set_tx_hash(tx_hash);
+        let str = "str";
+        self
+    }
+}
+
 impl<Env, From, To, Payment, Gas, CodeSource, RH>
     Tx<Env, From, To, Payment, Gas, UpgradeCall<Env, CodeSource>, RH>
 where
diff --git a/framework/base/src/types/interaction/tx_env.rs b/framework/base/src/types/interaction/tx_env.rs
index 11e7b91e6a..d8f82c4309 100644
--- a/framework/base/src/types/interaction/tx_env.rs
+++ b/framework/base/src/types/interaction/tx_env.rs
@@ -24,3 +24,9 @@ pub trait TxEnvMockDeployAddress: TxEnv {
         From: TxFromSpecified<Self>,
         NA: AnnotatedValue<Self, ManagedAddress<Self::Api>>;
 }
+
+pub trait TxEnvWithTxHash: TxEnv {
+    fn set_tx_hash<TH>(&mut self, tx_hash: TH)
+    where
+        TH: AnnotatedValue<Self, ManagedBuffer<Self::Api>>;
+}
diff --git a/framework/scenario/src/facade/world_tx/scenario_exec_call.rs b/framework/scenario/src/facade/world_tx/scenario_exec_call.rs
index dd258da3b4..159e065817 100644
--- a/framework/scenario/src/facade/world_tx/scenario_exec_call.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_exec_call.rs
@@ -2,14 +2,14 @@ use multiversx_sc::{
     tuple_util::NestedTupleFlatten,
     types::{
         FunctionCall, ManagedAddress, ManagedBuffer, RHListExec, Tx, TxBaseWithEnv, TxEnv,
-        TxEnvMockDeployAddress, TxFromSpecified, TxGas, TxPayment, TxToSpecified,
+        TxEnvMockDeployAddress, TxEnvWithTxHash, TxFromSpecified, TxGas, TxPayment, TxToSpecified,
     },
 };
 
 use crate::{
     api::StaticApi,
     scenario::tx_to_step::{address_annotated, TxToStep},
-    scenario_model::{SetStateStep, TxExpect, TxResponse},
+    scenario_model::{BytesValue, SetStateStep, TxExpect, TxResponse},
     ScenarioTxEnv, ScenarioTxRun, ScenarioWorld,
 };
 
@@ -88,6 +88,16 @@ where
     }
 }
 
+impl<'w> TxEnvWithTxHash for ScenarioEnvExec<'w> {
+    fn set_tx_hash<TH>(&mut self, tx_hash: TH)
+    where
+        TH: multiversx_sc::types::AnnotatedValue<Self, ManagedBuffer<Self::Api>>,
+    {
+        let bytes_tx_hash = BytesValue::from(tx_hash.into_value(&self).to_vec());
+        self.data.tx_hash = Some(bytes_tx_hash);
+    }
+}
+
 impl ScenarioWorld {
     pub fn tx(&mut self) -> TxBaseWithEnv<ScenarioEnvExec<'_>> {
         let data = self.new_env_data();
diff --git a/framework/scenario/src/facade/world_tx/scenario_tx_env.rs b/framework/scenario/src/facade/world_tx/scenario_tx_env.rs
index d195a7600d..33bd562ea6 100644
--- a/framework/scenario/src/facade/world_tx/scenario_tx_env.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_tx_env.rs
@@ -2,7 +2,11 @@ use std::path::PathBuf;
 
 use multiversx_sc::types::{ManagedAddress, ManagedBuffer, TxEnv};
 
-use crate::{api::StaticApi, scenario_model::TxExpect, ScenarioWorld};
+use crate::{
+    api::StaticApi,
+    scenario_model::{BytesValue, TxExpect},
+    ScenarioWorld,
+};
 
 /// Designates a tx environment suitable for running scenarios locally.
 pub trait ScenarioTxEnv: TxEnv {
@@ -13,6 +17,7 @@ pub trait ScenarioTxEnv: TxEnv {
 #[derive(Default, Debug, Clone)]
 pub struct ScenarioTxEnvData {
     pub context_path: PathBuf,
+    pub tx_hash: Option<BytesValue>,
 }
 
 impl TxEnv for ScenarioTxEnvData {
@@ -43,6 +48,7 @@ impl ScenarioWorld {
     pub(crate) fn new_env_data(&self) -> ScenarioTxEnvData {
         ScenarioTxEnvData {
             context_path: self.current_dir.clone(),
+            tx_hash: None,
         }
     }
 }
diff --git a/framework/snippets/src/interactor_tx/interactor_prepare_async.rs b/framework/snippets/src/interactor_tx/interactor_prepare_async.rs
index 167c7d9f27..43ca7c403c 100644
--- a/framework/snippets/src/interactor_tx/interactor_prepare_async.rs
+++ b/framework/snippets/src/interactor_tx/interactor_prepare_async.rs
@@ -6,6 +6,7 @@ impl Interactor {
     pub(crate) fn new_env_data(&self) -> ScenarioTxEnvData {
         ScenarioTxEnvData {
             context_path: self.current_dir.clone(),
+            tx_hash: None,
         }
     }
 }

From 85903ebf37486641a46ba2bf88f2c3dc0cb1058f Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Tue, 23 Apr 2024 20:37:36 +0300
Subject: [PATCH 0755/1254] cleanup

---
 framework/base/src/types/interaction/tx.rs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/framework/base/src/types/interaction/tx.rs b/framework/base/src/types/interaction/tx.rs
index e5313ef198..3535222de0 100644
--- a/framework/base/src/types/interaction/tx.rs
+++ b/framework/base/src/types/interaction/tx.rs
@@ -863,7 +863,6 @@ where
         TH: AnnotatedValue<Env, ManagedBuffer<Env::Api>>,
     {
         self.env.set_tx_hash(tx_hash);
-        let str = "str";
         self
     }
 }

From c40217625a223f42edb809115ffac0a431774670 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 23 Apr 2024 22:17:17 +0300
Subject: [PATCH 0756/1254] impl tx_hash

---
 framework/base/src/types/interaction/tx.rs      | 12 ++++++------
 framework/base/src/types/interaction/tx_env.rs  |  6 ++----
 .../src/facade/world_tx/scenario_exec_call.rs   | 17 ++++++++---------
 .../src/facade/world_tx/scenario_exec_deploy.rs |  1 +
 .../src/facade/world_tx/scenario_tx_env.rs      | 10 +++-------
 5 files changed, 20 insertions(+), 26 deletions(-)

diff --git a/framework/base/src/types/interaction/tx.rs b/framework/base/src/types/interaction/tx.rs
index 3535222de0..36b9a27d77 100644
--- a/framework/base/src/types/interaction/tx.rs
+++ b/framework/base/src/types/interaction/tx.rs
@@ -1,7 +1,7 @@
 use crate::{
     api::CallTypeApi,
     types::{
-        BigUint, CodeMetadata, EgldOrEsdtTokenIdentifier, EgldOrEsdtTokenPayment,
+        heap::H256, BigUint, CodeMetadata, EgldOrEsdtTokenIdentifier, EgldOrEsdtTokenPayment,
         EgldOrEsdtTokenPaymentRefs, EgldOrMultiEsdtPayment, EsdtTokenPayment, EsdtTokenPaymentRefs,
         ManagedAddress, ManagedBuffer, ManagedOption, ManagedVec, MultiEsdtPayment,
         TokenIdentifier,
@@ -845,10 +845,10 @@ where
     }
 }
 
-impl<Env, From, To, Payment, Gas, Data, RH> Tx<Env, From, To, Payment, Gas, Data, RH>
+impl<Env, From_, To, Payment, Gas, Data, RH> Tx<Env, From_, To, Payment, Gas, Data, RH>
 where
     Env: TxEnvWithTxHash,
-    From: TxFromSpecified<Env>,
+    From_: TxFromSpecified<Env>,
     To: TxTo<Env>,
     Payment: TxPaymentEgldOnly<Env>,
     Gas: TxGas<Env>,
@@ -858,11 +858,11 @@ where
     /// Sets the new mock address to be used for the newly deployed contract.
     ///
     /// Only allowed in tests.
-    pub fn tx_hash<TH>(mut self, tx_hash: TH) -> Self
+    pub fn tx_hash<H>(mut self, tx_hash: H) -> Self
     where
-        TH: AnnotatedValue<Env, ManagedBuffer<Env::Api>>,
+        H256: From<H>,
     {
-        self.env.set_tx_hash(tx_hash);
+        self.env.set_tx_hash(H256::from(tx_hash));
         self
     }
 }
diff --git a/framework/base/src/types/interaction/tx_env.rs b/framework/base/src/types/interaction/tx_env.rs
index d8f82c4309..37e18d7dec 100644
--- a/framework/base/src/types/interaction/tx_env.rs
+++ b/framework/base/src/types/interaction/tx_env.rs
@@ -1,6 +1,6 @@
 use crate::{
     api::CallTypeApi,
-    types::{ManagedAddress, ManagedBuffer},
+    types::{heap::H256, ManagedAddress, ManagedBuffer},
 };
 
 use super::{AnnotatedValue, TxFromSpecified};
@@ -26,7 +26,5 @@ pub trait TxEnvMockDeployAddress: TxEnv {
 }
 
 pub trait TxEnvWithTxHash: TxEnv {
-    fn set_tx_hash<TH>(&mut self, tx_hash: TH)
-    where
-        TH: AnnotatedValue<Self, ManagedBuffer<Self::Api>>;
+    fn set_tx_hash(&mut self, tx_hash: H256);
 }
diff --git a/framework/scenario/src/facade/world_tx/scenario_exec_call.rs b/framework/scenario/src/facade/world_tx/scenario_exec_call.rs
index 159e065817..42a29ef378 100644
--- a/framework/scenario/src/facade/world_tx/scenario_exec_call.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_exec_call.rs
@@ -1,15 +1,16 @@
 use multiversx_sc::{
     tuple_util::NestedTupleFlatten,
     types::{
-        FunctionCall, ManagedAddress, ManagedBuffer, RHListExec, Tx, TxBaseWithEnv, TxEnv,
-        TxEnvMockDeployAddress, TxEnvWithTxHash, TxFromSpecified, TxGas, TxPayment, TxToSpecified,
+        heap::H256, FunctionCall, ManagedAddress, ManagedBuffer, RHListExec, Tx, TxBaseWithEnv,
+        TxEnv, TxEnvMockDeployAddress, TxEnvWithTxHash, TxFromSpecified, TxGas, TxPayment,
+        TxToSpecified,
     },
 };
 
 use crate::{
     api::StaticApi,
     scenario::tx_to_step::{address_annotated, TxToStep},
-    scenario_model::{BytesValue, SetStateStep, TxExpect, TxResponse},
+    scenario_model::{SetStateStep, TxExpect, TxResponse},
     ScenarioTxEnv, ScenarioTxRun, ScenarioWorld,
 };
 
@@ -83,18 +84,16 @@ where
 
     fn run(self) -> Self::Returns {
         let mut step_wrapper = self.tx_to_step();
+        step_wrapper.step.explicit_tx_hash = core::mem::take(&mut step_wrapper.env.data.tx_hash);
         step_wrapper.env.world.sc_call(&mut step_wrapper.step);
         step_wrapper.process_result()
     }
 }
 
 impl<'w> TxEnvWithTxHash for ScenarioEnvExec<'w> {
-    fn set_tx_hash<TH>(&mut self, tx_hash: TH)
-    where
-        TH: multiversx_sc::types::AnnotatedValue<Self, ManagedBuffer<Self::Api>>,
-    {
-        let bytes_tx_hash = BytesValue::from(tx_hash.into_value(&self).to_vec());
-        self.data.tx_hash = Some(bytes_tx_hash);
+    fn set_tx_hash(&mut self, tx_hash: H256) {
+        assert!(self.data.tx_hash.is_none(), "tx hash set twice");
+        self.data.tx_hash = Some(tx_hash);
     }
 }
 
diff --git a/framework/scenario/src/facade/world_tx/scenario_exec_deploy.rs b/framework/scenario/src/facade/world_tx/scenario_exec_deploy.rs
index 866d4f562f..40fbbaa878 100644
--- a/framework/scenario/src/facade/world_tx/scenario_exec_deploy.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_exec_deploy.rs
@@ -35,6 +35,7 @@ where
 
     fn run(self) -> Self::Returns {
         let mut step_wrapper = self.tx_to_step();
+        step_wrapper.step.explicit_tx_hash = core::mem::take(&mut step_wrapper.env.data.tx_hash);
         step_wrapper.env.world.sc_deploy(&mut step_wrapper.step);
         step_wrapper.process_result()
     }
diff --git a/framework/scenario/src/facade/world_tx/scenario_tx_env.rs b/framework/scenario/src/facade/world_tx/scenario_tx_env.rs
index 33bd562ea6..7613f94116 100644
--- a/framework/scenario/src/facade/world_tx/scenario_tx_env.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_tx_env.rs
@@ -1,12 +1,8 @@
 use std::path::PathBuf;
 
-use multiversx_sc::types::{ManagedAddress, ManagedBuffer, TxEnv};
+use multiversx_sc::types::{ManagedAddress, ManagedBuffer, TxEnv, H256};
 
-use crate::{
-    api::StaticApi,
-    scenario_model::{BytesValue, TxExpect},
-    ScenarioWorld,
-};
+use crate::{api::StaticApi, scenario_model::TxExpect, ScenarioWorld};
 
 /// Designates a tx environment suitable for running scenarios locally.
 pub trait ScenarioTxEnv: TxEnv {
@@ -17,7 +13,7 @@ pub trait ScenarioTxEnv: TxEnv {
 #[derive(Default, Debug, Clone)]
 pub struct ScenarioTxEnvData {
     pub context_path: PathBuf,
-    pub tx_hash: Option<BytesValue>,
+    pub tx_hash: Option<H256>,
 }
 
 impl TxEnv for ScenarioTxEnvData {

From 551e3ef00810f312051a3d4c51bedeecfb448a52 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Tue, 23 Apr 2024 23:08:01 +0300
Subject: [PATCH 0757/1254] fix test

---
 .../tests/rewards_distribution_blackbox_test.rs            | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

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 e70f273015..135af91f3f 100644
--- a/contracts/examples/rewards-distribution/tests/rewards_distribution_blackbox_test.rs
+++ b/contracts/examples/rewards-distribution/tests/rewards_distribution_blackbox_test.rs
@@ -18,12 +18,8 @@ const OWNER_ADDRESS_EXPR: &str = "address:owner";
 const REWARDS_DISTRIBUTION_ADDRESS_EXPR: &str = "sc:rewards-distribution";
 const REWARDS_DISTRIBUTION_ADDRESS_EXPR_REPL: ScExpr = ScExpr("rewards-distribution");
 const REWARDS_DISTRIBUTION_PATH_EXPR: &str = "mxsc:output/rewards-distribution.mxsc.json";
-const REWARDS_DISTRIBUTION_PATH_EXPR_REPL: MxscExpr =
-    MxscExpr("output/rewards-distribution.mxsc.json");
 const SEED_NFT_MINTER_ADDRESS_EXPR: &str = "sc:seed-nft-minter";
 const SEED_NFT_MINTER_PATH_EXPR: &str = "mxsc:../seed-nft-minter/output/seed-nft-minter.mxsc.json";
-const SEED_NFT_MINTER_PATH_EXPR_REPL: MxscExpr =
-    MxscExpr("../seed-nft-minter/output/seed-nft-minter.mxsc.json");
 
 type RewardsDistributionContract = ContractInfo<rewards_distribution::Proxy<StaticApi>>;
 type SeedNFTMinterContract = ContractInfo<mock_seed_nft_minter::Proxy<StaticApi>>;
@@ -222,7 +218,6 @@ fn test_raffle_and_claim() {
             .call(state.rewards_distribution_contract.deposit_royalties()),
     );
 
-    let vect = &[0u8; 32];
     // run the raffle
     state
         .world
@@ -231,7 +226,7 @@ fn test_raffle_and_claim() {
         .to(REWARDS_DISTRIBUTION_ADDRESS_EXPR_REPL)
         .typed(proxy::RewardsDistributionProxy)
         .raffle()
-        .tx_hash(ManagedBuffer::from(vect))
+        .tx_hash(&[0u8; 32])
         .run();
 
     let mut rewards: Vec<BigUint<StaticApi>> = Vec::new();

From 776dd0579375e852619e1d105e424a88e035de24 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 24 Apr 2024 06:29:40 +0300
Subject: [PATCH 0758/1254] cleanup

---
 framework/base/src/types/interaction/tx.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/framework/base/src/types/interaction/tx.rs b/framework/base/src/types/interaction/tx.rs
index 36b9a27d77..486e4ade83 100644
--- a/framework/base/src/types/interaction/tx.rs
+++ b/framework/base/src/types/interaction/tx.rs
@@ -845,22 +845,22 @@ where
     }
 }
 
-impl<Env, From_, To, Payment, Gas, Data, RH> Tx<Env, From_, To, Payment, Gas, Data, RH>
+impl<Env, From, To, Payment, Gas, Data, RH> Tx<Env, From, To, Payment, Gas, Data, RH>
 where
     Env: TxEnvWithTxHash,
-    From_: TxFromSpecified<Env>,
+    From: TxFromSpecified<Env>,
     To: TxTo<Env>,
     Payment: TxPaymentEgldOnly<Env>,
     Gas: TxGas<Env>,
     Data: TxDataFunctionCall<Env>,
     RH: TxResultHandler<Env>,
 {
-    /// Sets the new mock address to be used for the newly deployed contract.
+    /// Sets the mock transaction hash to be used in a test.
     ///
     /// Only allowed in tests.
     pub fn tx_hash<H>(mut self, tx_hash: H) -> Self
     where
-        H256: From<H>,
+        H256: core::convert::From<H>,
     {
         self.env.set_tx_hash(H256::from(tx_hash));
         self

From 30e33686ddc8c76224097b1f0861a4c8445e2f97 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 24 Apr 2024 06:36:00 +0300
Subject: [PATCH 0759/1254] comment

---
 .../tests/rewards_distribution_blackbox_test.rs                 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 135af91f3f..e01c9dafcf 100644
--- a/contracts/examples/rewards-distribution/tests/rewards_distribution_blackbox_test.rs
+++ b/contracts/examples/rewards-distribution/tests/rewards_distribution_blackbox_test.rs
@@ -226,7 +226,7 @@ fn test_raffle_and_claim() {
         .to(REWARDS_DISTRIBUTION_ADDRESS_EXPR_REPL)
         .typed(proxy::RewardsDistributionProxy)
         .raffle()
-        .tx_hash(&[0u8; 32])
+        .tx_hash([0u8; 32]) // blockchain rng is deterministic, so we can use a fixed hash
         .run();
 
     let mut rewards: Vec<BigUint<StaticApi>> = Vec::new();

From 30c422f46525b7ba5ea2500e241702650b32426f Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 12 Apr 2024 15:55:23 +0300
Subject: [PATCH 0760/1254] moved legacy contract_deploy.rs

---
 .../src/types/interaction/contract_call_legacy.rs  |  7 +++++++
 .../contract_call_legacy/contract_call_exec.rs     |  7 +------
 .../contract_call_no_payment.rs                    |  5 ++---
 .../{ => contract_call_legacy}/contract_deploy.rs  | 12 +++++-------
 framework/base/src/types/interaction/mod.rs        |  2 --
 framework/base/src/types/interaction/tx.rs         | 14 +++++++-------
 6 files changed, 22 insertions(+), 25 deletions(-)
 rename framework/base/src/types/interaction/{ => contract_call_legacy}/contract_deploy.rs (93%)

diff --git a/framework/base/src/types/interaction/contract_call_legacy.rs b/framework/base/src/types/interaction/contract_call_legacy.rs
index d5ae5e04ed..22ebc84d7d 100644
--- a/framework/base/src/types/interaction/contract_call_legacy.rs
+++ b/framework/base/src/types/interaction/contract_call_legacy.rs
@@ -6,6 +6,7 @@ mod contract_call_with_any_payment;
 mod contract_call_with_egld;
 mod contract_call_with_egld_or_single_esdt;
 mod contract_call_with_multi_esdt;
+mod contract_deploy;
 
 pub use contract_call_no_payment::ContractCallNoPayment;
 pub use contract_call_trait::{ContractCall, ContractCallBase};
@@ -13,3 +14,9 @@ pub use contract_call_with_any_payment::ContractCallWithAnyPayment;
 pub use contract_call_with_egld::ContractCallWithEgld;
 pub use contract_call_with_egld_or_single_esdt::ContractCallWithEgldOrSingleEsdt;
 pub use contract_call_with_multi_esdt::ContractCallWithMultiEsdt;
+pub use contract_deploy::{new_contract_deploy, ContractDeploy};
+
+/// Using max u64 to represent maximum possible gas,
+/// so that the value zero is not reserved and can be specified explicitly.
+/// Leaving the gas limit unspecified will replace it with `api.get_gas_left()`.
+pub(crate) const UNSPECIFIED_GAS_LIMIT: u64 = u64::MAX;
diff --git a/framework/base/src/types/interaction/contract_call_legacy/contract_call_exec.rs b/framework/base/src/types/interaction/contract_call_legacy/contract_call_exec.rs
index 6ec1d82009..6928ee862b 100644
--- a/framework/base/src/types/interaction/contract_call_legacy/contract_call_exec.rs
+++ b/framework/base/src/types/interaction/contract_call_legacy/contract_call_exec.rs
@@ -9,14 +9,9 @@ use crate::{
     },
 };
 
-use super::{ContractCallNoPayment, ContractCallWithEgld};
+use super::{ContractCallNoPayment, ContractCallWithEgld, UNSPECIFIED_GAS_LIMIT};
 use crate::api::managed_types::handles::HandleConstraints;
 
-/// Using max u64 to represent maximum possible gas,
-/// so that the value zero is not reserved and can be specified explicitly.
-/// Leaving the gas limit unspecified will replace it with `api.get_gas_left()`.
-pub(super) const UNSPECIFIED_GAS_LIMIT: u64 = u64::MAX;
-
 impl<SA, OriginalResult> ContractCallWithEgld<SA, OriginalResult>
 where
     SA: CallTypeApi + 'static,
diff --git a/framework/base/src/types/interaction/contract_call_legacy/contract_call_no_payment.rs b/framework/base/src/types/interaction/contract_call_legacy/contract_call_no_payment.rs
index 2f39ff78f9..db5d0c8561 100644
--- a/framework/base/src/types/interaction/contract_call_legacy/contract_call_no_payment.rs
+++ b/framework/base/src/types/interaction/contract_call_legacy/contract_call_no_payment.rs
@@ -12,10 +12,9 @@ use crate::{
 };
 
 use super::{
-    contract_call_exec::UNSPECIFIED_GAS_LIMIT, contract_call_trait::ContractCallBase,
-    contract_call_with_egld::ContractCallWithEgld,
+    contract_call_trait::ContractCallBase, contract_call_with_egld::ContractCallWithEgld,
     contract_call_with_multi_esdt::ContractCallWithMultiEsdt, ContractCall,
-    ContractCallWithAnyPayment, ContractCallWithEgldOrSingleEsdt,
+    ContractCallWithAnyPayment, ContractCallWithEgldOrSingleEsdt, UNSPECIFIED_GAS_LIMIT,
 };
 
 /// Holds metadata for calling another contract, without payments.
diff --git a/framework/base/src/types/interaction/contract_deploy.rs b/framework/base/src/types/interaction/contract_call_legacy/contract_deploy.rs
similarity index 93%
rename from framework/base/src/types/interaction/contract_deploy.rs
rename to framework/base/src/types/interaction/contract_call_legacy/contract_deploy.rs
index 1fbfa1f017..bdc15e5509 100644
--- a/framework/base/src/types/interaction/contract_deploy.rs
+++ b/framework/base/src/types/interaction/contract_call_legacy/contract_deploy.rs
@@ -7,15 +7,13 @@ use crate::{
     contract_base::{ExitCodecErrorHandler, SendRawWrapper},
     err_msg,
     io::{ArgErrorHandler, ArgId, ManagedResultArgLoader},
-    types::{BigUint, CodeMetadata, ManagedAddress, ManagedBuffer, ManagedOption, ManagedVec},
+    types::{
+        BigUint, CodeMetadata, ManagedAddress, ManagedArgBuffer, ManagedBuffer, ManagedOption,
+        ManagedVec,
+    },
 };
 
-use super::ManagedArgBuffer;
-
-/// Using max u64 to represent maximum possible gas,
-/// so that the value zero is not reserved and can be specified explicitly.
-/// Leaving the gas limit unspecified will replace it with `api.get_gas_left()`.
-pub(crate) const UNSPECIFIED_GAS_LIMIT: u64 = u64::MAX;
+use super::UNSPECIFIED_GAS_LIMIT;
 
 #[must_use]
 pub struct ContractDeploy<SA, OriginalResult>
diff --git a/framework/base/src/types/interaction/mod.rs b/framework/base/src/types/interaction/mod.rs
index e05d420cdf..739e91a1ec 100644
--- a/framework/base/src/types/interaction/mod.rs
+++ b/framework/base/src/types/interaction/mod.rs
@@ -5,7 +5,6 @@ mod back_transfers;
 mod callback_closure;
 mod callback_selector_result;
 mod contract_call_legacy;
-mod contract_deploy;
 mod deploy_call;
 mod expr;
 mod function_call;
@@ -37,7 +36,6 @@ pub use callback_closure::{
 };
 pub use callback_selector_result::CallbackSelectorResult;
 pub use contract_call_legacy::*;
-pub use contract_deploy::{new_contract_deploy, ContractDeploy};
 pub use deploy_call::*;
 pub use expr::*;
 pub use function_call::FunctionCall;
diff --git a/framework/base/src/types/interaction/tx.rs b/framework/base/src/types/interaction/tx.rs
index 486e4ade83..7fc12c896b 100644
--- a/framework/base/src/types/interaction/tx.rs
+++ b/framework/base/src/types/interaction/tx.rs
@@ -11,13 +11,13 @@ use crate::{
 use multiversx_sc_codec::TopEncodeMulti;
 
 use super::{
-    contract_deploy::UNSPECIFIED_GAS_LIMIT, AnnotatedValue, Code, ContractCallBase,
-    ContractCallNoPayment, ContractCallWithEgld, ContractDeploy, DeployCall, Egld, EgldPayment,
-    ExplicitGas, FromSource, FunctionCall, ManagedArgBuffer, OriginalResultMarker, RHList,
-    RHListAppendNoRet, RHListAppendRet, RHListItem, TxCodeSource, TxCodeValue, TxData,
-    TxDataFunctionCall, TxEgldValue, TxEnv, TxEnvMockDeployAddress, TxEnvWithTxHash, TxFrom,
-    TxFromSourceValue, TxFromSpecified, TxGas, TxGasValue, TxPayment, TxPaymentEgldOnly,
-    TxProxyTrait, TxResultHandler, TxScEnv, TxTo, TxToSpecified, UpgradeCall,
+    AnnotatedValue, Code, ContractCallBase, ContractCallNoPayment, ContractCallWithEgld,
+    ContractDeploy, DeployCall, Egld, EgldPayment, ExplicitGas, FromSource, FunctionCall,
+    ManagedArgBuffer, OriginalResultMarker, RHList, RHListAppendNoRet, RHListAppendRet, RHListItem,
+    TxCodeSource, TxCodeValue, TxData, TxDataFunctionCall, TxEgldValue, TxEnv,
+    TxEnvMockDeployAddress, TxEnvWithTxHash, TxFrom, TxFromSourceValue, TxFromSpecified, TxGas,
+    TxGasValue, TxPayment, TxPaymentEgldOnly, TxProxyTrait, TxResultHandler, TxScEnv, TxTo,
+    TxToSpecified, UpgradeCall, UNSPECIFIED_GAS_LIMIT,
 };
 
 #[must_use]

From 652732bc139dbdf274e99e7ee3d4336bd4d930b3 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 24 Apr 2024 07:20:41 +0300
Subject: [PATCH 0761/1254] moved legacy AsyncCall objects

---
 framework/base/src/types/interaction/contract_call_legacy.rs  | 4 ++++
 .../interaction/{ => contract_call_legacy}/async_call.rs      | 4 +---
 .../{ => contract_call_legacy}/async_call_promises.rs         | 4 +---
 framework/base/src/types/interaction/mod.rs                   | 4 ----
 4 files changed, 6 insertions(+), 10 deletions(-)
 rename framework/base/src/types/interaction/{ => contract_call_legacy}/async_call.rs (86%)
 rename framework/base/src/types/interaction/{ => contract_call_legacy}/async_call_promises.rs (95%)

diff --git a/framework/base/src/types/interaction/contract_call_legacy.rs b/framework/base/src/types/interaction/contract_call_legacy.rs
index 22ebc84d7d..5be09c0a36 100644
--- a/framework/base/src/types/interaction/contract_call_legacy.rs
+++ b/framework/base/src/types/interaction/contract_call_legacy.rs
@@ -1,3 +1,5 @@
+mod async_call;
+mod async_call_promises;
 mod contract_call_convert;
 mod contract_call_exec;
 mod contract_call_no_payment;
@@ -8,6 +10,8 @@ mod contract_call_with_egld_or_single_esdt;
 mod contract_call_with_multi_esdt;
 mod contract_deploy;
 
+pub use async_call::AsyncCall;
+pub use async_call_promises::AsyncCallPromises;
 pub use contract_call_no_payment::ContractCallNoPayment;
 pub use contract_call_trait::{ContractCall, ContractCallBase};
 pub use contract_call_with_any_payment::ContractCallWithAnyPayment;
diff --git a/framework/base/src/types/interaction/async_call.rs b/framework/base/src/types/interaction/contract_call_legacy/async_call.rs
similarity index 86%
rename from framework/base/src/types/interaction/async_call.rs
rename to framework/base/src/types/interaction/contract_call_legacy/async_call.rs
index 5c3b60a41f..62396de515 100644
--- a/framework/base/src/types/interaction/async_call.rs
+++ b/framework/base/src/types/interaction/contract_call_legacy/async_call.rs
@@ -1,10 +1,8 @@
 use crate::{
     api::{CallTypeApi, StorageWriteApi},
-    types::{CallbackClosure, EgldPayment, ManagedAddress},
+    types::{CallbackClosure, EgldPayment, FunctionCall, ManagedAddress, Tx, TxScEnv},
 };
 
-use super::{FunctionCall, Tx, TxScEnv};
-
 pub type AsyncCall<Api> = Tx<
     TxScEnv<Api>,
     (),
diff --git a/framework/base/src/types/interaction/async_call_promises.rs b/framework/base/src/types/interaction/contract_call_legacy/async_call_promises.rs
similarity index 95%
rename from framework/base/src/types/interaction/async_call_promises.rs
rename to framework/base/src/types/interaction/contract_call_legacy/async_call_promises.rs
index ea03c0e777..be22afd129 100644
--- a/framework/base/src/types/interaction/async_call_promises.rs
+++ b/framework/base/src/types/interaction/contract_call_legacy/async_call_promises.rs
@@ -1,11 +1,9 @@
 use crate::{
     api::CallTypeApi,
     contract_base::SendRawWrapper,
-    types::{BigUint, CallbackClosure, ManagedAddress, ManagedBuffer},
+    types::{BigUint, CallbackClosure, FunctionCall, ManagedAddress, ManagedBuffer},
 };
 
-use super::FunctionCall;
-
 /// Will be renamed to `AsyncCall` and `AsyncCall` to `AsyncCallLegacy` when the promises end up on the mainnet.
 #[must_use]
 pub struct AsyncCallPromises<SA>
diff --git a/framework/base/src/types/interaction/mod.rs b/framework/base/src/types/interaction/mod.rs
index 739e91a1ec..b55bb02954 100644
--- a/framework/base/src/types/interaction/mod.rs
+++ b/framework/base/src/types/interaction/mod.rs
@@ -1,6 +1,4 @@
 mod annotated;
-mod async_call;
-mod async_call_promises;
 mod back_transfers;
 mod callback_closure;
 mod callback_selector_result;
@@ -28,8 +26,6 @@ mod typed_function_call;
 mod upgrade_call;
 
 pub use annotated::*;
-pub use async_call::AsyncCall;
-pub use async_call_promises::AsyncCallPromises;
 pub use back_transfers::BackTransfers;
 pub use callback_closure::{
     new_callback_call, CallbackClosure, CallbackClosureForDeser, CallbackClosureMatcher,

From a39cc62b984b4f5a4bd4e306e67b2c79234759e9 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 24 Apr 2024 07:26:17 +0300
Subject: [PATCH 0762/1254] deprecated TypedFunctionCall

---
 .../base/src/types/interaction/contract_call_legacy.rs    | 2 ++
 .../{ => contract_call_legacy}/typed_function_call.rs     | 8 +++-----
 framework/base/src/types/interaction/mod.rs               | 2 --
 3 files changed, 5 insertions(+), 7 deletions(-)
 rename framework/base/src/types/interaction/{ => contract_call_legacy}/typed_function_call.rs (73%)

diff --git a/framework/base/src/types/interaction/contract_call_legacy.rs b/framework/base/src/types/interaction/contract_call_legacy.rs
index 5be09c0a36..8532f6de09 100644
--- a/framework/base/src/types/interaction/contract_call_legacy.rs
+++ b/framework/base/src/types/interaction/contract_call_legacy.rs
@@ -9,6 +9,7 @@ mod contract_call_with_egld;
 mod contract_call_with_egld_or_single_esdt;
 mod contract_call_with_multi_esdt;
 mod contract_deploy;
+mod typed_function_call;
 
 pub use async_call::AsyncCall;
 pub use async_call_promises::AsyncCallPromises;
@@ -19,6 +20,7 @@ pub use contract_call_with_egld::ContractCallWithEgld;
 pub use contract_call_with_egld_or_single_esdt::ContractCallWithEgldOrSingleEsdt;
 pub use contract_call_with_multi_esdt::ContractCallWithMultiEsdt;
 pub use contract_deploy::{new_contract_deploy, ContractDeploy};
+pub use typed_function_call::TypedFunctionCall;
 
 /// Using max u64 to represent maximum possible gas,
 /// so that the value zero is not reserved and can be specified explicitly.
diff --git a/framework/base/src/types/interaction/typed_function_call.rs b/framework/base/src/types/interaction/contract_call_legacy/typed_function_call.rs
similarity index 73%
rename from framework/base/src/types/interaction/typed_function_call.rs
rename to framework/base/src/types/interaction/contract_call_legacy/typed_function_call.rs
index 39679247fc..835ae8995b 100644
--- a/framework/base/src/types/interaction/typed_function_call.rs
+++ b/framework/base/src/types/interaction/contract_call_legacy/typed_function_call.rs
@@ -1,12 +1,10 @@
 use core::marker::PhantomData;
 
 use crate::api::ManagedTypeApi;
+use crate::types::FunctionCall;
 
-use super::FunctionCall;
-
-/// Encodes a function call on the blockchain, together with the original result type.
-///
-/// Can be used as a multi-argument, to embed a call within a call.
+/// Old attempt at grouping FunctionCall + OriginalTypeMarker.
+#[deprecated(since = "0.49.0", note = "Not clear if it still used anywhere, will delete soon.")]
 pub struct TypedFunctionCall<Api, OriginalResult>
 where
     Api: ManagedTypeApi,
diff --git a/framework/base/src/types/interaction/mod.rs b/framework/base/src/types/interaction/mod.rs
index b55bb02954..2b0913a101 100644
--- a/framework/base/src/types/interaction/mod.rs
+++ b/framework/base/src/types/interaction/mod.rs
@@ -22,7 +22,6 @@ mod tx_result_handler;
 mod tx_rh_list;
 mod tx_rh_original_result;
 mod tx_to;
-mod typed_function_call;
 mod upgrade_call;
 
 pub use annotated::*;
@@ -50,7 +49,6 @@ pub use tx_result_handler::*;
 pub use tx_rh_list::*;
 pub use tx_rh_original_result::*;
 pub use tx_to::*;
-pub use typed_function_call::*;
 pub use upgrade_call::*;
 
 pub type TxScBase<Api> = TxBaseWithEnv<TxScEnv<Api>>;

From 118d3780385b89bcd30647372bda18e0feac0d67 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 24 Apr 2024 09:39:52 +0300
Subject: [PATCH 0763/1254] tx_data dir

---
 .../contract_call_legacy/typed_function_call.rs      |  8 +++++---
 framework/base/src/types/interaction/mod.rs          |  8 --------
 framework/base/src/types/interaction/tx_data.rs      | 12 +++++++++++-
 .../types/interaction/{ => tx_data}/deploy_call.rs   |  4 ++--
 .../types/interaction/{ => tx_data}/function_call.rs | 12 +++++-------
 .../interaction/{ => tx_data}/tx_code_source.rs      |  4 +---
 .../types/interaction/{ => tx_data}/upgrade_call.rs  |  7 ++++---
 7 files changed, 28 insertions(+), 27 deletions(-)
 rename framework/base/src/types/interaction/{ => tx_data}/deploy_call.rs (93%)
 rename framework/base/src/types/interaction/{ => tx_data}/function_call.rs (93%)
 rename framework/base/src/types/interaction/{ => tx_data}/tx_code_source.rs (93%)
 rename framework/base/src/types/interaction/{ => tx_data}/upgrade_call.rs (93%)

diff --git a/framework/base/src/types/interaction/contract_call_legacy/typed_function_call.rs b/framework/base/src/types/interaction/contract_call_legacy/typed_function_call.rs
index 835ae8995b..8589a0dc28 100644
--- a/framework/base/src/types/interaction/contract_call_legacy/typed_function_call.rs
+++ b/framework/base/src/types/interaction/contract_call_legacy/typed_function_call.rs
@@ -1,10 +1,12 @@
 use core::marker::PhantomData;
 
-use crate::api::ManagedTypeApi;
-use crate::types::FunctionCall;
+use crate::{api::ManagedTypeApi, types::FunctionCall};
 
 /// Old attempt at grouping FunctionCall + OriginalTypeMarker.
-#[deprecated(since = "0.49.0", note = "Not clear if it still used anywhere, will delete soon.")]
+#[deprecated(
+    since = "0.49.0",
+    note = "Not clear if it still used anywhere, will delete soon."
+)]
 pub struct TypedFunctionCall<Api, OriginalResult>
 where
     Api: ManagedTypeApi,
diff --git a/framework/base/src/types/interaction/mod.rs b/framework/base/src/types/interaction/mod.rs
index 2b0913a101..e36cac1edb 100644
--- a/framework/base/src/types/interaction/mod.rs
+++ b/framework/base/src/types/interaction/mod.rs
@@ -3,14 +3,11 @@ mod back_transfers;
 mod callback_closure;
 mod callback_selector_result;
 mod contract_call_legacy;
-mod deploy_call;
 mod expr;
-mod function_call;
 mod managed_arg_buffer;
 mod markers;
 pub mod system_proxy;
 mod tx;
-mod tx_code_source;
 mod tx_data;
 mod tx_env;
 mod tx_exec;
@@ -22,7 +19,6 @@ mod tx_result_handler;
 mod tx_rh_list;
 mod tx_rh_original_result;
 mod tx_to;
-mod upgrade_call;
 
 pub use annotated::*;
 pub use back_transfers::BackTransfers;
@@ -31,13 +27,10 @@ pub use callback_closure::{
 };
 pub use callback_selector_result::CallbackSelectorResult;
 pub use contract_call_legacy::*;
-pub use deploy_call::*;
 pub use expr::*;
-pub use function_call::FunctionCall;
 pub use managed_arg_buffer::ManagedArgBuffer;
 pub use markers::*;
 pub use tx::*;
-pub use tx_code_source::*;
 pub use tx_data::*;
 pub use tx_env::*;
 pub use tx_exec::*;
@@ -49,6 +42,5 @@ pub use tx_result_handler::*;
 pub use tx_rh_list::*;
 pub use tx_rh_original_result::*;
 pub use tx_to::*;
-pub use upgrade_call::*;
 
 pub type TxScBase<Api> = TxBaseWithEnv<TxScEnv<Api>>;
diff --git a/framework/base/src/types/interaction/tx_data.rs b/framework/base/src/types/interaction/tx_data.rs
index 7ea227deaa..dc6db88135 100644
--- a/framework/base/src/types/interaction/tx_data.rs
+++ b/framework/base/src/types/interaction/tx_data.rs
@@ -1,9 +1,19 @@
+mod deploy_call;
+mod function_call;
+mod tx_code_source;
+mod upgrade_call;
+
+pub use deploy_call::DeployCall;
+pub use function_call::FunctionCall;
+pub use tx_code_source::*;
+pub use upgrade_call::UpgradeCall;
+
 use crate::{
     formatter::SCLowerHex,
     types::{ManagedBuffer, ManagedBufferBuilder},
 };
 
-use super::{FunctionCall, TxEnv};
+use super::TxEnv;
 
 pub trait TxData<Env>
 where
diff --git a/framework/base/src/types/interaction/deploy_call.rs b/framework/base/src/types/interaction/tx_data/deploy_call.rs
similarity index 93%
rename from framework/base/src/types/interaction/deploy_call.rs
rename to framework/base/src/types/interaction/tx_data/deploy_call.rs
index ad087d34b8..a742901736 100644
--- a/framework/base/src/types/interaction/deploy_call.rs
+++ b/framework/base/src/types/interaction/tx_data/deploy_call.rs
@@ -1,8 +1,8 @@
 use multiversx_sc_codec::TopEncodeMulti;
 
-use crate::types::{CodeMetadata, ManagedBuffer, ManagedBufferCachedBuilder};
+use crate::types::{CodeMetadata, ManagedArgBuffer, ManagedBuffer, ManagedBufferCachedBuilder};
 
-use super::{ManagedArgBuffer, TxCodeSource, TxData, TxEnv};
+use super::{TxCodeSource, TxData, TxEnv};
 
 /// Holds deploy data: code, code metadata, and arguments.
 pub struct DeployCall<Env, CodeSource>
diff --git a/framework/base/src/types/interaction/function_call.rs b/framework/base/src/types/interaction/tx_data/function_call.rs
similarity index 93%
rename from framework/base/src/types/interaction/function_call.rs
rename to framework/base/src/types/interaction/tx_data/function_call.rs
index 1d78735a79..9242e141cf 100644
--- a/framework/base/src/types/interaction/function_call.rs
+++ b/framework/base/src/types/interaction/tx_data/function_call.rs
@@ -10,13 +10,11 @@ use crate::{
         ESDT_TRANSFER_FUNC_NAME,
     },
     types::{
-        EsdtTokenPayment, EsdtTokenPaymentRefs, ManagedAddress, ManagedBuffer, ManagedVec,
-        MultiValueEncoded,
+        ContractCallNoPayment, EsdtTokenPayment, EsdtTokenPaymentRefs, ManagedAddress,
+        ManagedArgBuffer, ManagedBuffer, ManagedVec, MultiValueEncoded, TypedFunctionCall,
     },
 };
 
-use super::{ContractCallNoPayment, ManagedArgBuffer, TypedFunctionCall};
-
 /// Encodes a function call on the blockchain, composed of a function name and its encoded arguments.
 ///
 /// Can be used as a multi-argument, to embed a call within a call.
@@ -160,7 +158,7 @@ where
     Api: ManagedTypeApi,
 {
     /// Constructs `ESDTTransfer` builtin function call.
-    pub(super) fn convert_to_single_transfer_fungible_call(
+    pub(crate) fn convert_to_single_transfer_fungible_call(
         self,
         payment: EsdtTokenPaymentRefs<'_, Api>,
     ) -> FunctionCall<Api> {
@@ -177,7 +175,7 @@ where
     /// arg1 - nonce
     /// arg2 - quantity to transfer
     /// arg3 - destination address
-    pub(super) fn convert_to_single_transfer_nft_call(
+    pub(crate) fn convert_to_single_transfer_nft_call(
         self,
         to: &ManagedAddress<Api>,
         payment: EsdtTokenPaymentRefs<'_, Api>,
@@ -191,7 +189,7 @@ where
     }
 
     /// Constructs `MultiESDTNFTTransfer` builtin function call.
-    pub(super) fn convert_to_multi_transfer_esdt_call(
+    pub(crate) fn convert_to_multi_transfer_esdt_call(
         self,
         to: &ManagedAddress<Api>,
         payments: &ManagedVec<Api, EsdtTokenPayment<Api>>,
diff --git a/framework/base/src/types/interaction/tx_code_source.rs b/framework/base/src/types/interaction/tx_data/tx_code_source.rs
similarity index 93%
rename from framework/base/src/types/interaction/tx_code_source.rs
rename to framework/base/src/types/interaction/tx_data/tx_code_source.rs
index d7013a9cde..e7bb0817ea 100644
--- a/framework/base/src/types/interaction/tx_code_source.rs
+++ b/framework/base/src/types/interaction/tx_data/tx_code_source.rs
@@ -1,6 +1,4 @@
-use crate::types::{ManagedAddress, ManagedBuffer};
-
-use super::{AnnotatedValue, TxEnv};
+use crate::types::{AnnotatedValue, ManagedAddress, ManagedBuffer, TxEnv};
 
 pub trait TxCodeSource<Env>
 where
diff --git a/framework/base/src/types/interaction/upgrade_call.rs b/framework/base/src/types/interaction/tx_data/upgrade_call.rs
similarity index 93%
rename from framework/base/src/types/interaction/upgrade_call.rs
rename to framework/base/src/types/interaction/tx_data/upgrade_call.rs
index d69895f029..591e8accb5 100644
--- a/framework/base/src/types/interaction/upgrade_call.rs
+++ b/framework/base/src/types/interaction/tx_data/upgrade_call.rs
@@ -1,8 +1,9 @@
 use multiversx_sc_codec::TopEncodeMulti;
 
-use crate::types::{CodeMetadata, ManagedBuffer, ManagedBufferCachedBuilder};
-
-use super::{ManagedArgBuffer, TxCodeSource, TxData, TxEnv};
+use crate::types::{
+    CodeMetadata, ManagedArgBuffer, ManagedBuffer, ManagedBufferCachedBuilder, TxCodeSource,
+    TxData, TxEnv,
+};
 
 /// Holds deploy data: code, code metadata, and arguments.
 pub struct UpgradeCall<Env, CodeSource>

From 8926fd81fa1c2c0cc82b28d20770ee0703f0112a Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 24 Apr 2024 09:43:15 +0300
Subject: [PATCH 0764/1254] result hadnlers reorg

---
 framework/base/src/types/interaction/mod.rs                 | 6 ++----
 .../{tx_result_handler.rs => result_handlers.rs}            | 0
 .../{tx_result_handler => result_handlers}/returns_bt.rs    | 0
 .../returns_new_address.rs                                  | 0
 .../returns_new_managed_address.rs                          | 0
 .../returns_raw_result.rs                                   | 0
 .../returns_result.rs                                       | 0
 .../returns_result_conv.rs                                  | 0
 .../with_new_address.rs                                     | 0
 .../with_raw_result.rs                                      | 0
 .../{tx_result_handler => result_handlers}/with_result.rs   | 0
 .../with_result_conv.rs                                     | 0
 framework/base/src/types/interaction/tx_rh_list.rs          | 2 ++
 .../interaction/{ => tx_rh_list}/tx_rh_original_result.rs   | 2 +-
 14 files changed, 5 insertions(+), 5 deletions(-)
 rename framework/base/src/types/interaction/{tx_result_handler.rs => result_handlers.rs} (100%)
 rename framework/base/src/types/interaction/{tx_result_handler => result_handlers}/returns_bt.rs (100%)
 rename framework/base/src/types/interaction/{tx_result_handler => result_handlers}/returns_new_address.rs (100%)
 rename framework/base/src/types/interaction/{tx_result_handler => result_handlers}/returns_new_managed_address.rs (100%)
 rename framework/base/src/types/interaction/{tx_result_handler => result_handlers}/returns_raw_result.rs (100%)
 rename framework/base/src/types/interaction/{tx_result_handler => result_handlers}/returns_result.rs (100%)
 rename framework/base/src/types/interaction/{tx_result_handler => result_handlers}/returns_result_conv.rs (100%)
 rename framework/base/src/types/interaction/{tx_result_handler => result_handlers}/with_new_address.rs (100%)
 rename framework/base/src/types/interaction/{tx_result_handler => result_handlers}/with_raw_result.rs (100%)
 rename framework/base/src/types/interaction/{tx_result_handler => result_handlers}/with_result.rs (100%)
 rename framework/base/src/types/interaction/{tx_result_handler => result_handlers}/with_result_conv.rs (100%)
 rename framework/base/src/types/interaction/{ => tx_rh_list}/tx_rh_original_result.rs (92%)

diff --git a/framework/base/src/types/interaction/mod.rs b/framework/base/src/types/interaction/mod.rs
index e36cac1edb..e73cf9491b 100644
--- a/framework/base/src/types/interaction/mod.rs
+++ b/framework/base/src/types/interaction/mod.rs
@@ -6,6 +6,7 @@ mod contract_call_legacy;
 mod expr;
 mod managed_arg_buffer;
 mod markers;
+mod result_handlers;
 pub mod system_proxy;
 mod tx;
 mod tx_data;
@@ -15,9 +16,7 @@ mod tx_from;
 mod tx_gas;
 mod tx_payment;
 mod tx_proxy;
-mod tx_result_handler;
 mod tx_rh_list;
-mod tx_rh_original_result;
 mod tx_to;
 
 pub use annotated::*;
@@ -30,6 +29,7 @@ pub use contract_call_legacy::*;
 pub use expr::*;
 pub use managed_arg_buffer::ManagedArgBuffer;
 pub use markers::*;
+pub use result_handlers::*;
 pub use tx::*;
 pub use tx_data::*;
 pub use tx_env::*;
@@ -38,9 +38,7 @@ pub use tx_from::*;
 pub use tx_gas::*;
 pub use tx_payment::*;
 pub use tx_proxy::*;
-pub use tx_result_handler::*;
 pub use tx_rh_list::*;
-pub use tx_rh_original_result::*;
 pub use tx_to::*;
 
 pub type TxScBase<Api> = TxBaseWithEnv<TxScEnv<Api>>;
diff --git a/framework/base/src/types/interaction/tx_result_handler.rs b/framework/base/src/types/interaction/result_handlers.rs
similarity index 100%
rename from framework/base/src/types/interaction/tx_result_handler.rs
rename to framework/base/src/types/interaction/result_handlers.rs
diff --git a/framework/base/src/types/interaction/tx_result_handler/returns_bt.rs b/framework/base/src/types/interaction/result_handlers/returns_bt.rs
similarity index 100%
rename from framework/base/src/types/interaction/tx_result_handler/returns_bt.rs
rename to framework/base/src/types/interaction/result_handlers/returns_bt.rs
diff --git a/framework/base/src/types/interaction/tx_result_handler/returns_new_address.rs b/framework/base/src/types/interaction/result_handlers/returns_new_address.rs
similarity index 100%
rename from framework/base/src/types/interaction/tx_result_handler/returns_new_address.rs
rename to framework/base/src/types/interaction/result_handlers/returns_new_address.rs
diff --git a/framework/base/src/types/interaction/tx_result_handler/returns_new_managed_address.rs b/framework/base/src/types/interaction/result_handlers/returns_new_managed_address.rs
similarity index 100%
rename from framework/base/src/types/interaction/tx_result_handler/returns_new_managed_address.rs
rename to framework/base/src/types/interaction/result_handlers/returns_new_managed_address.rs
diff --git a/framework/base/src/types/interaction/tx_result_handler/returns_raw_result.rs b/framework/base/src/types/interaction/result_handlers/returns_raw_result.rs
similarity index 100%
rename from framework/base/src/types/interaction/tx_result_handler/returns_raw_result.rs
rename to framework/base/src/types/interaction/result_handlers/returns_raw_result.rs
diff --git a/framework/base/src/types/interaction/tx_result_handler/returns_result.rs b/framework/base/src/types/interaction/result_handlers/returns_result.rs
similarity index 100%
rename from framework/base/src/types/interaction/tx_result_handler/returns_result.rs
rename to framework/base/src/types/interaction/result_handlers/returns_result.rs
diff --git a/framework/base/src/types/interaction/tx_result_handler/returns_result_conv.rs b/framework/base/src/types/interaction/result_handlers/returns_result_conv.rs
similarity index 100%
rename from framework/base/src/types/interaction/tx_result_handler/returns_result_conv.rs
rename to framework/base/src/types/interaction/result_handlers/returns_result_conv.rs
diff --git a/framework/base/src/types/interaction/tx_result_handler/with_new_address.rs b/framework/base/src/types/interaction/result_handlers/with_new_address.rs
similarity index 100%
rename from framework/base/src/types/interaction/tx_result_handler/with_new_address.rs
rename to framework/base/src/types/interaction/result_handlers/with_new_address.rs
diff --git a/framework/base/src/types/interaction/tx_result_handler/with_raw_result.rs b/framework/base/src/types/interaction/result_handlers/with_raw_result.rs
similarity index 100%
rename from framework/base/src/types/interaction/tx_result_handler/with_raw_result.rs
rename to framework/base/src/types/interaction/result_handlers/with_raw_result.rs
diff --git a/framework/base/src/types/interaction/tx_result_handler/with_result.rs b/framework/base/src/types/interaction/result_handlers/with_result.rs
similarity index 100%
rename from framework/base/src/types/interaction/tx_result_handler/with_result.rs
rename to framework/base/src/types/interaction/result_handlers/with_result.rs
diff --git a/framework/base/src/types/interaction/tx_result_handler/with_result_conv.rs b/framework/base/src/types/interaction/result_handlers/with_result_conv.rs
similarity index 100%
rename from framework/base/src/types/interaction/tx_result_handler/with_result_conv.rs
rename to framework/base/src/types/interaction/result_handlers/with_result_conv.rs
diff --git a/framework/base/src/types/interaction/tx_rh_list.rs b/framework/base/src/types/interaction/tx_rh_list.rs
index b4ca45bc58..7c4ccf74bd 100644
--- a/framework/base/src/types/interaction/tx_rh_list.rs
+++ b/framework/base/src/types/interaction/tx_rh_list.rs
@@ -1,7 +1,9 @@
 mod tx_rh_list_cons;
 mod tx_rh_list_exec;
 mod tx_rh_list_item;
+mod tx_rh_original_result;
 
 pub use tx_rh_list_cons::*;
 pub use tx_rh_list_exec::*;
 pub use tx_rh_list_item::*;
+pub use tx_rh_original_result::OriginalResultMarker;
diff --git a/framework/base/src/types/interaction/tx_rh_original_result.rs b/framework/base/src/types/interaction/tx_rh_list/tx_rh_original_result.rs
similarity index 92%
rename from framework/base/src/types/interaction/tx_rh_original_result.rs
rename to framework/base/src/types/interaction/tx_rh_list/tx_rh_original_result.rs
index cfbe36aef8..175f5c6404 100644
--- a/framework/base/src/types/interaction/tx_rh_original_result.rs
+++ b/framework/base/src/types/interaction/tx_rh_list/tx_rh_original_result.rs
@@ -1,6 +1,6 @@
 use core::marker::PhantomData;
 
-use super::{TxEmptyResultHandler, TxEnv, TxResultHandler};
+use crate::types::{TxEmptyResultHandler, TxEnv, TxResultHandler};
 
 /// Contains no data.
 ///

From 48d81ea90c138d671e1b7d470f0a606edc0c7b0f Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Wed, 24 Apr 2024 11:32:52 +0300
Subject: [PATCH 0765/1254] cleanup

---
 .../rewards-distribution/src/proxy.rs         | 233 ------------------
 .../rewards_distribution_blackbox_test.rs     |  15 +-
 2 files changed, 4 insertions(+), 244 deletions(-)
 delete mode 100644 contracts/examples/rewards-distribution/src/proxy.rs

diff --git a/contracts/examples/rewards-distribution/src/proxy.rs b/contracts/examples/rewards-distribution/src/proxy.rs
deleted file mode 100644
index 4a02c6c098..0000000000
--- a/contracts/examples/rewards-distribution/src/proxy.rs
+++ /dev/null
@@ -1,233 +0,0 @@
-// Code generated by the multiversx-sc proxy generator. DO NOT EDIT.
-
-////////////////////////////////////////////////////
-////////////////// AUTO-GENERATED //////////////////
-////////////////////////////////////////////////////
-
-#![allow(dead_code)]
-#![allow(clippy::all)]
-
-use multiversx_sc::proxy_imports::*;
-
-pub struct RewardsDistributionProxy;
-
-impl<Env, From, To, Gas> TxProxyTrait<Env, From, To, Gas> for RewardsDistributionProxy
-where
-    Env: TxEnv,
-    From: TxFrom<Env>,
-    To: TxTo<Env>,
-    Gas: TxGas<Env>,
-{
-    type TxProxyMethods = RewardsDistributionProxyMethods<Env, From, To, Gas>;
-
-    fn proxy_methods(self, tx: Tx<Env, From, To, (), Gas, (), ()>) -> Self::TxProxyMethods {
-        RewardsDistributionProxyMethods { wrapped_tx: tx }
-    }
-}
-
-pub struct RewardsDistributionProxyMethods<Env, From, To, Gas>
-where
-    Env: TxEnv,
-    From: TxFrom<Env>,
-    To: TxTo<Env>,
-    Gas: TxGas<Env>,
-{
-    wrapped_tx: Tx<Env, From, To, (), Gas, (), ()>,
-}
-
-#[rustfmt::skip]
-impl<Env, From, Gas> RewardsDistributionProxyMethods<Env, From, (), Gas>
-where
-    Env: TxEnv,
-    Env::Api: VMApi,
-    From: TxFrom<Env>,
-    Gas: TxGas<Env>,
-{
-    pub fn init<
-        Arg0: CodecInto<ManagedAddress<Env::Api>>,
-        Arg1: CodecInto<ManagedVec<Env::Api, Bracket>>,
-    >(
-        self,
-        seed_nft_minter_address: Arg0,
-        brackets: Arg1,
-    ) -> TxProxyDeploy<Env, From, Gas, ()> {
-        self.wrapped_tx
-            .raw_deploy()
-            .argument(&seed_nft_minter_address)
-            .argument(&brackets)
-            .original_result()
-    }
-}
-
-#[rustfmt::skip]
-impl<Env, From, To, Gas> RewardsDistributionProxyMethods<Env, From, To, Gas>
-where
-    Env: TxEnv,
-    Env::Api: VMApi,
-    From: TxFrom<Env>,
-    To: TxTo<Env>,
-    Gas: TxGas<Env>,
-{
-    pub fn deposit_royalties(
-        self,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
-        self.wrapped_tx
-            .raw_call("depositRoyalties")
-            .original_result()
-    }
-
-    pub fn raffle(
-        self,
-    ) -> TxProxyCall<Env, From, To, Gas, OperationCompletionStatus> {
-        self.wrapped_tx
-            .raw_call("raffle")
-            .original_result()
-    }
-
-    pub fn claim_rewards<
-        Arg0: CodecInto<u64>,
-        Arg1: CodecInto<u64>,
-        Arg2: CodecInto<MultiValueEncoded<Env::Api, MultiValue2<EgldOrEsdtTokenIdentifier<Env::Api>, u64>>>,
-    >(
-        self,
-        raffle_id_start: Arg0,
-        raffle_id_end: Arg1,
-        reward_tokens: Arg2,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
-        self.wrapped_tx
-            .raw_call("claimRewards")
-            .argument(&raffle_id_start)
-            .argument(&raffle_id_end)
-            .argument(&reward_tokens)
-            .original_result()
-    }
-
-    pub fn compute_claimable_amount<
-        Arg0: CodecInto<u64>,
-        Arg1: CodecInto<EgldOrEsdtTokenIdentifier<Env::Api>>,
-        Arg2: CodecInto<u64>,
-        Arg3: CodecInto<u64>,
-    >(
-        self,
-        raffle_id: Arg0,
-        reward_token_id: Arg1,
-        reward_token_nonce: Arg2,
-        nft_nonce: Arg3,
-    ) -> TxProxyCall<Env, From, To, Gas, BigUint<Env::Api>> {
-        self.wrapped_tx
-            .raw_call("computeClaimableAmount")
-            .argument(&raffle_id)
-            .argument(&reward_token_id)
-            .argument(&reward_token_nonce)
-            .argument(&nft_nonce)
-            .original_result()
-    }
-
-    pub fn raffle_id(
-        self,
-    ) -> TxProxyCall<Env, From, To, Gas, u64> {
-        self.wrapped_tx
-            .raw_call("getRaffleId")
-            .original_result()
-    }
-
-    pub fn completed_raffle_id_count(
-        self,
-    ) -> TxProxyCall<Env, From, To, Gas, u64> {
-        self.wrapped_tx
-            .raw_call("getCompletedRaffleIdCount")
-            .original_result()
-    }
-
-    pub fn royalties<
-        Arg0: CodecInto<u64>,
-        Arg1: CodecInto<EgldOrEsdtTokenIdentifier<Env::Api>>,
-        Arg2: CodecInto<u64>,
-    >(
-        self,
-        raffle_id: Arg0,
-        reward_token_id: Arg1,
-        reward_token_nonce: Arg2,
-    ) -> TxProxyCall<Env, From, To, Gas, BigUint<Env::Api>> {
-        self.wrapped_tx
-            .raw_call("getRoyalties")
-            .argument(&raffle_id)
-            .argument(&reward_token_id)
-            .argument(&reward_token_nonce)
-            .original_result()
-    }
-
-    pub fn nft_reward_percent<
-        Arg0: CodecInto<u64>,
-        Arg1: CodecInto<u64>,
-    >(
-        self,
-        raffle_id: Arg0,
-        nft_nonce: Arg1,
-    ) -> TxProxyCall<Env, From, To, Gas, BigUint<Env::Api>> {
-        self.wrapped_tx
-            .raw_call("getNftRewardPercent")
-            .argument(&raffle_id)
-            .argument(&nft_nonce)
-            .original_result()
-    }
-
-    pub fn was_claimed<
-        Arg0: CodecInto<u64>,
-        Arg1: CodecInto<EgldOrEsdtTokenIdentifier<Env::Api>>,
-        Arg2: CodecInto<u64>,
-        Arg3: CodecInto<u64>,
-    >(
-        self,
-        raffle_id: Arg0,
-        reward_token_id: Arg1,
-        reward_token_nonce: Arg2,
-        nft_nonce: Arg3,
-    ) -> TxProxyCall<Env, From, To, Gas, bool> {
-        self.wrapped_tx
-            .raw_call("getWasClaimed")
-            .argument(&raffle_id)
-            .argument(&reward_token_id)
-            .argument(&reward_token_nonce)
-            .argument(&nft_nonce)
-            .original_result()
-    }
-
-    pub fn seed_nft_minter_address(
-        self,
-    ) -> TxProxyCall<Env, From, To, Gas, ManagedAddress<Env::Api>> {
-        self.wrapped_tx
-            .raw_call("getSeedNftMinterAddress")
-            .original_result()
-    }
-
-    pub fn brackets(
-        self,
-    ) -> TxProxyCall<Env, From, To, Gas, ManagedVec<Env::Api, Bracket>> {
-        self.wrapped_tx
-            .raw_call("getBrackets")
-            .original_result()
-    }
-
-    pub fn last_raffle_epoch(
-        self,
-    ) -> TxProxyCall<Env, From, To, Gas, u64> {
-        self.wrapped_tx
-            .raw_call("getLastRaffleEpoch")
-            .original_result()
-    }
-
-    pub fn nft_token_id(
-        self,
-    ) -> TxProxyCall<Env, From, To, Gas, TokenIdentifier<Env::Api>> {
-        self.wrapped_tx
-            .raw_call("getNftTokenId")
-            .original_result()
-    }
-}
-
-#[derive(ManagedVecItem, NestedEncode, NestedDecode)]
-pub struct Bracket {
-    pub index_percent: u64,
-    pub bracket_reward_percent: u64,
-}
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 919bf04f91..a375614dab 100644
--- a/contracts/examples/rewards-distribution/tests/rewards_distribution_blackbox_test.rs
+++ b/contracts/examples/rewards-distribution/tests/rewards_distribution_blackbox_test.rs
@@ -6,8 +6,7 @@ use multiversx_sc_scenario::imports::*;
 use std::iter::zip;
 
 use rewards_distribution::{
-    rewards_distribution_proxy, ContractObj, ProxyTrait as _, RewardsDistribution,
-    DIVISION_SAFETY_CONSTANT,
+    rewards_distribution_proxy, ContractObj, RewardsDistribution, DIVISION_SAFETY_CONSTANT,
 };
 
 const NFT_TOKEN_ID: &[u8] = b"NFT-123456";
@@ -21,8 +20,6 @@ const SEED_NFT_MINTER_ADDRESS_EXPR: ScExpr = ScExpr("seed-nft-minter");
 const SEED_NFT_MINTER_PATH_EXPR: MxscExpr =
     MxscExpr("../seed-nft-minter/output/seed-nft-minter.mxsc.json");
 
-type RewardsDistributionContract = ContractInfo<rewards_distribution::Proxy<StaticApi>>;
-
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
 
@@ -39,7 +36,6 @@ fn world() -> ScenarioWorld {
 
 struct RewardsDistributionTestState {
     world: ScenarioWorld,
-    rewards_distribution_contract: RewardsDistributionContract,
     rewards_distribution_whitebox: WhiteboxContract<ContractObj<DebugApi>>,
 }
 
@@ -49,8 +45,6 @@ impl RewardsDistributionTestState {
 
         world.account(OWNER_ADDRESS_EXPR).nonce(1);
 
-        let rewards_distribution_contract =
-            RewardsDistributionContract::new(REWARDS_DISTRIBUTION_ADDRESS_EXPR);
         let rewards_distribution_whitebox = WhiteboxContract::new(
             REWARDS_DISTRIBUTION_ADDRESS_EXPR,
             rewards_distribution::contract_obj,
@@ -58,7 +52,6 @@ impl RewardsDistributionTestState {
 
         Self {
             world,
-            rewards_distribution_contract,
             rewards_distribution_whitebox,
         }
     }
@@ -212,9 +205,9 @@ fn test_raffle_and_claim() {
     state
         .world
         .tx()
-        .from(ALICE_ADDRESS_EXPR_REPL)
-        .to(REWARDS_DISTRIBUTION_ADDRESS_EXPR_REPL)
-        .typed(proxy::RewardsDistributionProxy)
+        .from(ALICE_ADDRESS_EXPR)
+        .to(REWARDS_DISTRIBUTION_ADDRESS_EXPR)
+        .typed(rewards_distribution_proxy::RewardsDistributionProxy)
         .raffle()
         .tx_hash([0u8; 32]) // blockchain rng is deterministic, so we can use a fixed hash
         .run();

From 53dd069a1ee3c8621e84e8da01c4e7a6820c9948 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Wed, 24 Apr 2024 11:34:03 +0300
Subject: [PATCH 0766/1254] rename test

---
 ..._blackbox_test.rs => rewards_distribution_integration_test.rs} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename contracts/examples/rewards-distribution/tests/{rewards_distribution_blackbox_test.rs => rewards_distribution_integration_test.rs} (100%)

diff --git a/contracts/examples/rewards-distribution/tests/rewards_distribution_blackbox_test.rs b/contracts/examples/rewards-distribution/tests/rewards_distribution_integration_test.rs
similarity index 100%
rename from contracts/examples/rewards-distribution/tests/rewards_distribution_blackbox_test.rs
rename to contracts/examples/rewards-distribution/tests/rewards_distribution_integration_test.rs

From b5ffe043d3c161254c2840a2a7dc455ced9606f9 Mon Sep 17 00:00:00 2001
From: Laurentiu Ciobanu <laurentiu.ciobanu@multiversx.com>
Date: Wed, 24 Apr 2024 13:12:25 +0300
Subject: [PATCH 0767/1254] coverage renderer panics if we try to render a file
 that is not in root

---
 framework/meta/src/cmd/standalone/test_coverage/render.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/framework/meta/src/cmd/standalone/test_coverage/render.rs b/framework/meta/src/cmd/standalone/test_coverage/render.rs
index 3b0d8d1307..58d65adc06 100644
--- a/framework/meta/src/cmd/standalone/test_coverage/render.rs
+++ b/framework/meta/src/cmd/standalone/test_coverage/render.rs
@@ -70,7 +70,7 @@ fn render_files(output: &mut String, files: &[FileSummary], root: &str) {
 
 fn render_file(output: &mut String, file: &FileSummary, root: &str) {
     let summary = &file.summary;
-    let filename = file.filename.strip_prefix(root).unwrap();
+    let filename = file.filename.strip_prefix(root).unwrap_or(&file.filename);
 
     writeln_output_str(
         output,

From 95fa5c72c0be98fac1ed4714ad2514fef5962cfd Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Wed, 24 Apr 2024 15:45:23 +0300
Subject: [PATCH 0768/1254] impl create account raw and set egld balance

---
 .../src/facade/world_tx/scenario_set_state.rs      | 14 +++++++++++++-
 .../scenario_set_state/scenario_set_account.rs     |  8 ++++++++
 .../src/whitebox_legacy/contract_obj_wrapper.rs    |  4 ++--
 3 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/framework/scenario/src/facade/world_tx/scenario_set_state.rs b/framework/scenario/src/facade/world_tx/scenario_set_state.rs
index 9376050f58..87c2672538 100644
--- a/framework/scenario/src/facade/world_tx/scenario_set_state.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_set_state.rs
@@ -4,7 +4,7 @@ mod scenario_set_new_address;
 
 use crate::{
     scenario::ScenarioRunner,
-    scenario_model::{AddressKey, AddressValue, NewAddress, SetStateStep, U64Value},
+    scenario_model::{AddressKey, AddressValue, BigUintValue, NewAddress, SetStateStep, U64Value},
     ScenarioWorld,
 };
 
@@ -42,6 +42,18 @@ impl ScenarioWorld {
             .new_address(creator_address_expr, creator_nonce_expr, new_address_expr)
     }
 
+    pub fn create_account_raw<CA, V>(
+        &mut self,
+        address: CA,
+        egld_balance: V,
+    ) -> SetStateBuilder<'_, AccountItem>
+    where
+        AddressKey: From<CA>,
+        BigUintValue: From<V>,
+    {
+        self.empty_builder().account(address).balance(egld_balance)
+    }
+
     pub fn current_block(&mut self) -> SetStateBuilder<'_, BlockItem> {
         self.empty_builder().current_block()
     }
diff --git a/framework/scenario/src/facade/world_tx/scenario_set_state/scenario_set_account.rs b/framework/scenario/src/facade/world_tx/scenario_set_state/scenario_set_account.rs
index d985cbed66..70c5369659 100644
--- a/framework/scenario/src/facade/world_tx/scenario_set_state/scenario_set_account.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_set_state/scenario_set_account.rs
@@ -179,4 +179,12 @@ impl<'w> SetStateBuilder<'w, AccountItem> {
         self.item.account.owner = Some(AddressValue::from(owner_expr));
         self
     }
+
+    pub fn set_egld_balance<V>(mut self, balance: V) -> Self
+    where
+        BigUintValue: From<V>,
+    {
+        self.item.account.balance = Some(BigUintValue::from(balance));
+        self
+    }
 }
diff --git a/framework/scenario/src/whitebox_legacy/contract_obj_wrapper.rs b/framework/scenario/src/whitebox_legacy/contract_obj_wrapper.rs
index edb4f8f019..2091ce6b46 100644
--- a/framework/scenario/src/whitebox_legacy/contract_obj_wrapper.rs
+++ b/framework/scenario/src/whitebox_legacy/contract_obj_wrapper.rs
@@ -180,7 +180,7 @@ impl BlockchainStateWrapper {
 impl BlockchainStateWrapper {
     pub fn create_user_account(&mut self, egld_balance: &num_bigint::BigUint) -> Address {
         let address = self.address_factory.new_address();
-        self.create_account_raw(&address, egld_balance, None, None, None);
+        self.world.create_account_raw(&address, egld_balance);
 
         address
     }
@@ -190,7 +190,7 @@ impl BlockchainStateWrapper {
         address: &Address,
         egld_balance: &num_bigint::BigUint,
     ) {
-        self.create_account_raw(address, egld_balance, None, None, None);
+        self.world.create_account_raw(address, egld_balance);
     }
 
     pub fn create_sc_account<CB, ContractObjBuilder>(

From d9d7b9f5d7d1f184c97853a708e4ffd696a07703 Mon Sep 17 00:00:00 2001
From: Fusee <quentus123@orange.fr>
Date: Wed, 24 Apr 2024 18:06:12 +0200
Subject: [PATCH 0769/1254] added reset function on the StaticApi

---
 .../scenario/src/api/impl_vh/static_api.rs    | 27 ++++++++++++++++---
 1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/framework/scenario/src/api/impl_vh/static_api.rs b/framework/scenario/src/api/impl_vh/static_api.rs
index 7834227314..ca1d8602e5 100644
--- a/framework/scenario/src/api/impl_vh/static_api.rs
+++ b/framework/scenario/src/api/impl_vh/static_api.rs
@@ -1,3 +1,4 @@
+use std::sync::Mutex;
 use multiversx_chain_vm::{
     executor::VMHooks,
     vm_hooks::{StaticApiVMHooksHandler, VMHooksDispatcher, VMHooksHandler},
@@ -14,9 +15,9 @@ fn new_static_api_vh() -> VMHooksDispatcher {
 }
 
 thread_local! {
-    static STATIC_API_VH_CELL: VMHooksDispatcher = new_static_api_vh();
+    static STATIC_API_VH_CELL: Mutex<VMHooksDispatcher> = Mutex::new(new_static_api_vh());
 
-    static STATIC_API_STATIC_CELL: StaticVarData = StaticVarData::default();
+    static STATIC_API_STATIC_CELL: Mutex<StaticVarData> = Mutex::new(StaticVarData::default());
 }
 
 #[derive(Clone)]
@@ -29,14 +30,20 @@ impl VMHooksApiBackend for StaticApiBackend {
     where
         F: FnOnce(&dyn VMHooks) -> R,
     {
-        STATIC_API_VH_CELL.with(|vh| f(vh))
+        STATIC_API_VH_CELL.with(|vh_mutex| {
+            let vh = vh_mutex.lock().unwrap();
+            f(&*vh)
+        })
     }
 
     fn with_static_data<R, F>(f: F) -> R
     where
         F: FnOnce(&StaticVarData) -> R,
     {
-        STATIC_API_STATIC_CELL.with(|data| f(data))
+        STATIC_API_STATIC_CELL.with(|data_mutex| {
+            let data = data_mutex.lock().unwrap();
+            f(&data)
+        })
     }
 }
 
@@ -50,6 +57,18 @@ impl StaticApi {
     pub fn is_current_address_placeholder(address: &Address) -> bool {
         address.as_array() == StaticApiVMHooksHandler::CURRENT_ADDRESS_PLACEHOLDER.as_array()
     }
+
+    pub fn reset() {
+        STATIC_API_VH_CELL.with(|vh_mutex| {
+            let mut vh = vh_mutex.lock().unwrap();
+            *vh = new_static_api_vh()
+        });
+
+        STATIC_API_STATIC_CELL.with(|data_mutex| {
+            let mut data = data_mutex.lock().unwrap();
+            *data = StaticVarData::default()
+        })
+    }
 }
 
 impl std::fmt::Debug for StaticApi {

From 19dac1826e461d68018e84634dca42500f49bcfe Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Thu, 25 Apr 2024 15:03:58 +0300
Subject: [PATCH 0770/1254] set nft properties

---
 .../src/facade/world_tx/scenario_set_state.rs | 83 ++++++++++++++++++-
 .../scenario_set_account.rs                   |  7 --
 .../whitebox_legacy/contract_obj_wrapper.rs   | 46 ++++------
 3 files changed, 95 insertions(+), 41 deletions(-)

diff --git a/framework/scenario/src/facade/world_tx/scenario_set_state.rs b/framework/scenario/src/facade/world_tx/scenario_set_state.rs
index 87c2672538..83030e8d52 100644
--- a/framework/scenario/src/facade/world_tx/scenario_set_state.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_set_state.rs
@@ -8,6 +8,8 @@ use crate::{
     ScenarioWorld,
 };
 
+use multiversx_chain_vm::world_mock::EsdtInstanceMetadata;
+use multiversx_sc::codec::TopEncode;
 use scenario_set_account::AccountItem;
 use scenario_set_block::BlockItem;
 use scenario_set_new_address::NewAddressItem;
@@ -42,18 +44,93 @@ impl ScenarioWorld {
             .new_address(creator_address_expr, creator_nonce_expr, new_address_expr)
     }
 
-    pub fn create_account_raw<CA, V>(
+    pub fn create_account_raw<A, V>(
         &mut self,
-        address: CA,
+        address: A,
         egld_balance: V,
     ) -> SetStateBuilder<'_, AccountItem>
     where
-        AddressKey: From<CA>,
+        AddressKey: From<A>,
         BigUintValue: From<V>,
     {
         self.empty_builder().account(address).balance(egld_balance)
     }
 
+    pub fn set_egld_balance<A: Copy, V: Copy>(&mut self, address: A, balance: V)
+    where
+        AddressKey: From<A>,
+        BigUintValue: From<V>,
+    {
+        let vm_address = AddressKey::from(address).to_vm_address();
+        let accounts = &mut self.get_mut_state().accounts;
+        for (vm_address_key, account) in accounts.iter_mut() {
+            if vm_address_key == &vm_address {
+                account.egld_balance = BigUintValue::from(balance).value.clone();
+            }
+        }
+    }
+
+    pub fn set_esdt_balance<A: Copy, V: Copy>(&mut self, address: A, token_id: &[u8], balance: V)
+    where
+        AddressKey: From<A>,
+        BigUintValue: From<V>,
+    {
+        // let token_id = BytesKey::from(token_id);
+        let accounts = &mut self.get_mut_state().accounts;
+        for (vm_address, account) in accounts.iter_mut() {
+            if vm_address == &AddressKey::from(address).to_vm_address() {
+                account.esdt.set_esdt_balance(
+                    token_id.to_vec(),
+                    0,
+                    &BigUintValue::from(balance).value.clone(),
+                    EsdtInstanceMetadata::default(),
+                )
+            }
+        }
+    }
+
+    pub fn set_nft_balance_all_properties<A: Copy, V: Copy, NR: Copy, T: TopEncode>(
+        &mut self,
+        address: A,
+        token_id: &[u8],
+        nonce: NR,
+        balance: V,
+        attributes: &T,
+        royalties: NR,
+        creator: Option<A>,
+        name: Option<&[u8]>,
+        hash: Option<&[u8]>,
+        uris: &[Vec<u8>],
+    ) where
+        AddressKey: From<A>,
+        BigUintValue: From<V>,
+        U64Value: From<NR>,
+    {
+        let mut esdt_attributes = Vec::new();
+        let _ = attributes.top_encode(&mut esdt_attributes);
+        let accounts = &mut self.get_mut_state().accounts;
+        for (vm_address, account) in accounts.iter_mut() {
+            if vm_address == &AddressKey::from(address).to_vm_address() {
+                account.esdt.set_esdt_balance(
+                    token_id.to_vec(),
+                    U64Value::from(nonce).value,
+                    &BigUintValue::from(balance).value.clone(),
+                    EsdtInstanceMetadata {
+                        creator: match creator {
+                            Some(c) => Some(AddressKey::from(c).to_vm_address()),
+                            None => None,
+                        },
+                        attributes: esdt_attributes.clone(),
+                        royalties: U64Value::from(royalties).value,
+                        name: name.unwrap_or_default().to_vec(),
+                        hash: hash.map(|h| h.to_vec()),
+                        uri: uris.to_vec(),
+                    },
+                )
+            }
+        }
+    }
+
     pub fn current_block(&mut self) -> SetStateBuilder<'_, BlockItem> {
         self.empty_builder().current_block()
     }
diff --git a/framework/scenario/src/facade/world_tx/scenario_set_state/scenario_set_account.rs b/framework/scenario/src/facade/world_tx/scenario_set_state/scenario_set_account.rs
index 70c5369659..a695fa155a 100644
--- a/framework/scenario/src/facade/world_tx/scenario_set_state/scenario_set_account.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_set_state/scenario_set_account.rs
@@ -180,11 +180,4 @@ impl<'w> SetStateBuilder<'w, AccountItem> {
         self
     }
 
-    pub fn set_egld_balance<V>(mut self, balance: V) -> Self
-    where
-        BigUintValue: From<V>,
-    {
-        self.item.account.balance = Some(BigUintValue::from(balance));
-        self
-    }
 }
diff --git a/framework/scenario/src/whitebox_legacy/contract_obj_wrapper.rs b/framework/scenario/src/whitebox_legacy/contract_obj_wrapper.rs
index 2091ce6b46..26edf73aed 100644
--- a/framework/scenario/src/whitebox_legacy/contract_obj_wrapper.rs
+++ b/framework/scenario/src/whitebox_legacy/contract_obj_wrapper.rs
@@ -344,19 +344,7 @@ impl BlockchainStateWrapper {
     }
 
     pub fn set_egld_balance(&mut self, address: &Address, balance: &num_bigint::BigUint) {
-        let vm_address = to_vm_address(address);
-        match self.world.get_mut_state().accounts.get_mut(&vm_address) {
-            Some(acc) => {
-                acc.egld_balance = balance.clone();
-
-                self.add_mandos_set_account(address);
-            },
-
-            None => panic!(
-                "set_egld_balance: Account {:?} does not exist",
-                address_to_hex(address)
-            ),
-        }
+        self.world.set_egld_balance(address, balance);
     }
 
     pub fn set_esdt_balance(
@@ -365,23 +353,7 @@ impl BlockchainStateWrapper {
         token_id: &[u8],
         balance: &num_bigint::BigUint,
     ) {
-        let vm_address = to_vm_address(address);
-        match self.world.get_mut_state().accounts.get_mut(&vm_address) {
-            Some(acc) => {
-                acc.esdt.set_esdt_balance(
-                    token_id.to_vec(),
-                    0,
-                    balance,
-                    EsdtInstanceMetadata::default(),
-                );
-
-                self.add_mandos_set_account(address);
-            },
-            None => panic!(
-                "set_esdt_balance: Account {:?} does not exist",
-                address_to_hex(address)
-            ),
-        }
+        self.world.set_esdt_balance(address, token_id, balance);
     }
 
     pub fn set_nft_balance<T: TopEncode>(
@@ -392,7 +364,7 @@ impl BlockchainStateWrapper {
         balance: &num_bigint::BigUint,
         attributes: &T,
     ) {
-        self.set_nft_balance_all_properties(
+        self.world.set_nft_balance_all_properties(
             address,
             token_id,
             nonce,
@@ -404,6 +376,18 @@ impl BlockchainStateWrapper {
             None,
             &[],
         );
+        // self.set_nft_balance_all_properties(
+        //     address,
+        //     token_id,
+        //     nonce,
+        //     balance,
+        //     attributes,
+        //     0,
+        //     None,
+        //     None,
+        //     None,
+        //     &[],
+        // );
     }
 
     pub fn set_developer_rewards(

From fbd49fcd745fb4dff55296be541ca807b5ab33dc Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Thu, 25 Apr 2024 17:54:52 +0300
Subject: [PATCH 0771/1254] impl set developer rewards

---
 .../src/facade/world_tx/scenario_set_state.rs | 25 +++++--
 .../whitebox_legacy/contract_obj_wrapper.rs   | 68 ++++---------------
 2 files changed, 31 insertions(+), 62 deletions(-)

diff --git a/framework/scenario/src/facade/world_tx/scenario_set_state.rs b/framework/scenario/src/facade/world_tx/scenario_set_state.rs
index 83030e8d52..3a8e5d2b30 100644
--- a/framework/scenario/src/facade/world_tx/scenario_set_state.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_set_state.rs
@@ -4,7 +4,10 @@ mod scenario_set_new_address;
 
 use crate::{
     scenario::ScenarioRunner,
-    scenario_model::{AddressKey, AddressValue, BigUintValue, NewAddress, SetStateStep, U64Value},
+    scenario_model::{
+        AddressKey, AddressValue, BigUintValue, BytesKey, BytesValue, NewAddress, SetStateStep,
+        U64Value,
+    },
     ScenarioWorld,
 };
 
@@ -75,7 +78,6 @@ impl ScenarioWorld {
         AddressKey: From<A>,
         BigUintValue: From<V>,
     {
-        // let token_id = BytesKey::from(token_id);
         let accounts = &mut self.get_mut_state().accounts;
         for (vm_address, account) in accounts.iter_mut() {
             if vm_address == &AddressKey::from(address).to_vm_address() {
@@ -89,6 +91,7 @@ impl ScenarioWorld {
         }
     }
 
+    #[allow(clippy::too_many_arguments)]
     pub fn set_nft_balance_all_properties<A: Copy, V: Copy, NR: Copy, T: TopEncode>(
         &mut self,
         address: A,
@@ -116,10 +119,7 @@ impl ScenarioWorld {
                     U64Value::from(nonce).value,
                     &BigUintValue::from(balance).value.clone(),
                     EsdtInstanceMetadata {
-                        creator: match creator {
-                            Some(c) => Some(AddressKey::from(c).to_vm_address()),
-                            None => None,
-                        },
+                        creator: creator.map(|c| AddressKey::from(c).to_vm_address()),
                         attributes: esdt_attributes.clone(),
                         royalties: U64Value::from(royalties).value,
                         name: name.unwrap_or_default().to_vec(),
@@ -131,6 +131,19 @@ impl ScenarioWorld {
         }
     }
 
+    pub fn set_developer_rewards<A: Copy, V: Copy>(&mut self, address: A, developer_rewards: V)
+    where
+        AddressKey: From<A>,
+        BigUintValue: From<V>,
+    {
+        let accounts = &mut self.get_mut_state().accounts;
+        for (vm_address, account) in accounts.iter_mut() {
+            if vm_address == &AddressKey::from(address).to_vm_address() {
+                account.developer_rewards = BigUintValue::from(developer_rewards).value.clone();
+            }
+        }
+    }
+
     pub fn current_block(&mut self) -> SetStateBuilder<'_, BlockItem> {
         self.empty_builder().current_block()
     }
diff --git a/framework/scenario/src/whitebox_legacy/contract_obj_wrapper.rs b/framework/scenario/src/whitebox_legacy/contract_obj_wrapper.rs
index 26edf73aed..e7503cdcd6 100644
--- a/framework/scenario/src/whitebox_legacy/contract_obj_wrapper.rs
+++ b/framework/scenario/src/whitebox_legacy/contract_obj_wrapper.rs
@@ -16,7 +16,6 @@ use multiversx_chain_scenario_format::interpret_trait::InterpretableFrom;
 use multiversx_chain_vm::{
     tx_mock::{TxContext, TxContextStack, TxFunctionName, TxResult},
     types::VMAddress,
-    world_mock::EsdtInstanceMetadata,
 };
 use multiversx_sc::types::H256;
 use num_traits::Zero;
@@ -376,18 +375,6 @@ impl BlockchainStateWrapper {
             None,
             &[],
         );
-        // self.set_nft_balance_all_properties(
-        //     address,
-        //     token_id,
-        //     nonce,
-        //     balance,
-        //     attributes,
-        //     0,
-        //     None,
-        //     None,
-        //     None,
-        //     &[],
-        // );
     }
 
     pub fn set_developer_rewards(
@@ -395,18 +382,8 @@ impl BlockchainStateWrapper {
         address: &Address,
         developer_rewards: num_bigint::BigUint,
     ) {
-        let vm_address: VMAddress = to_vm_address(address);
-        match self.world.get_mut_state().accounts.get_mut(&vm_address) {
-            Some(acc) => {
-                acc.developer_rewards = developer_rewards;
-
-                self.add_mandos_set_account(address);
-            },
-            None => panic!(
-                "set_developer_rewards: Account {:?} does not exist",
-                address_to_hex(address)
-            ),
-        }
+        self.world
+            .set_developer_rewards(address, &developer_rewards);
     }
 
     #[allow(clippy::too_many_arguments)]
@@ -423,30 +400,9 @@ impl BlockchainStateWrapper {
         hash: Option<&[u8]>,
         uris: &[Vec<u8>],
     ) {
-        let vm_address = to_vm_address(address);
-        match self.world.get_mut_state().accounts.get_mut(&vm_address) {
-            Some(acc) => {
-                acc.esdt.set_esdt_balance(
-                    token_id.to_vec(),
-                    nonce,
-                    balance,
-                    EsdtInstanceMetadata {
-                        creator: creator.map(to_vm_address),
-                        attributes: serialize_attributes(attributes),
-                        royalties,
-                        name: name.unwrap_or_default().to_vec(),
-                        hash: hash.map(|h| h.to_vec()),
-                        uri: uris.to_vec(),
-                    },
-                );
-
-                self.add_mandos_set_account(address);
-            },
-            None => panic!(
-                "set_nft_balance: Account {:?} does not exist",
-                address_to_hex(address)
-            ),
-        }
+        self.world.set_nft_balance_all_properties(
+            address, token_id, nonce, balance, attributes, royalties, creator, name, hash, uris,
+        );
     }
 
     pub fn set_esdt_local_roles(
@@ -840,14 +796,14 @@ fn address_to_hex(address: &Address) -> String {
     hex::encode(address.as_bytes())
 }
 
-fn serialize_attributes<T: TopEncode>(attributes: &T) -> Vec<u8> {
-    let mut serialized_attributes = Vec::new();
-    if let Result::Err(err) = attributes.top_encode(&mut serialized_attributes) {
-        panic!("Failed to encode attributes: {err:?}")
-    }
+// fn serialize_attributes<T: TopEncode>(attributes: &T) -> Vec<u8> {
+//     let mut serialized_attributes = Vec::new();
+//     if let Result::Err(err) = attributes.top_encode(&mut serialized_attributes) {
+//         panic!("Failed to encode attributes: {err:?}")
+//     }
 
-    serialized_attributes
-}
+//     serialized_attributes
+// }
 
 fn print_token_balance_raw(
     token_nonce: u64,

From 050eb243985e567a1517e4f95d5cf544e2dfc4ad Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 25 Apr 2024 22:38:59 +0300
Subject: [PATCH 0772/1254] ScearioWorld register contract new file

---
 framework/scenario/src/facade.rs              |   1 +
 .../scenario/src/facade/scenario_world.rs     | 104 -----------------
 .../src/facade/scenario_world_register.rs     | 110 ++++++++++++++++++
 3 files changed, 111 insertions(+), 104 deletions(-)
 create mode 100644 framework/scenario/src/facade/scenario_world_register.rs

diff --git a/framework/scenario/src/facade.rs b/framework/scenario/src/facade.rs
index 77a00e4792..75a688a36a 100644
--- a/framework/scenario/src/facade.rs
+++ b/framework/scenario/src/facade.rs
@@ -3,6 +3,7 @@ mod debugger_backend;
 pub mod expr;
 pub mod result_handlers;
 mod scenario_world;
+mod scenario_world_register;
 mod scenario_world_runner;
 mod scenario_world_steps;
 mod scenario_world_steps_deprecated;
diff --git a/framework/scenario/src/facade/scenario_world.rs b/framework/scenario/src/facade/scenario_world.rs
index d760c1743a..f5b05024bd 100644
--- a/framework/scenario/src/facade/scenario_world.rs
+++ b/framework/scenario/src/facade/scenario_world.rs
@@ -1,17 +1,7 @@
-use multiversx_chain_scenario_format::interpret_trait::InterpretableFrom;
 use multiversx_chain_vm::world_mock::BlockchainState;
-use multiversx_sc_meta::cmd::contract::sc_config::ContractVariant;
 
 use crate::{
-    api::DebugApi,
-    debug_executor::ContractContainer,
-    multiversx_sc::{
-        api,
-        contract_base::{CallableContractBuilder, ContractAbiProvider},
-    },
     scenario::{run_trace::ScenarioTrace, run_vm::ScenarioVMRunner},
-    scenario_format::{interpret_trait::InterpreterContext, value_interpreter::interpret_string},
-    scenario_model::BytesValue,
     vm_go_tool::run_mx_scenario_go,
 };
 use multiversx_sc_meta::find_workspace::find_current_workspace;
@@ -126,100 +116,6 @@ impl ScenarioWorld {
         &self.current_dir
     }
 
-    pub fn interpreter_context(&self) -> InterpreterContext {
-        InterpreterContext::default()
-            .with_dir(self.current_dir.clone())
-            .with_allowed_missing_files()
-    }
-
-    /// Convenient way of creating a code expression based on the current context
-    /// (i.e. with the paths resolved, as configured).
-    pub fn code_expression(&self, path: &str) -> BytesValue {
-        BytesValue::interpret_from(path, &self.interpreter_context())
-    }
-
-    pub fn register_contract_container(
-        &mut self,
-        expression: &str,
-        contract_container: ContractContainer,
-    ) {
-        let contract_bytes = interpret_string(expression, &self.interpreter_context());
-        self.get_mut_debugger_backend()
-            .vm_runner
-            .contract_map_ref
-            .lock()
-            .register_contract(contract_bytes, contract_container);
-    }
-
-    /// Links a contract path in a test to a contract implementation.
-    pub fn register_contract<B: CallableContractBuilder>(
-        &mut self,
-        expression: &str,
-        contract_builder: B,
-    ) {
-        self.register_contract_container(
-            expression,
-            ContractContainer::new(contract_builder.new_contract_obj::<DebugApi>(), None, false),
-        )
-    }
-
-    #[deprecated(
-        since = "0.37.0",
-        note = "Got renamed to `register_contract`, but not completely removed, in order to ease test migration. Please replace with `register_contract`."
-    )]
-    pub fn register_contract_builder<B: CallableContractBuilder>(
-        &mut self,
-        expression: &str,
-        contract_builder: B,
-    ) {
-        self.register_contract(expression, contract_builder)
-    }
-
-    /// Links a contract path in a test to a multi-contract output.
-    ///
-    /// This simulates the effects of building such a contract with only part of the endpoints.
-    pub fn register_partial_contract<Abi, B>(
-        &mut self,
-        expression: &str,
-        contract_builder: B,
-        sub_contract_name: &str,
-    ) where
-        Abi: ContractAbiProvider,
-        B: CallableContractBuilder,
-    {
-        let multi_contract_config =
-            multiversx_sc_meta::multi_contract_config::<Abi>(self.current_dir.as_path());
-        let contract_variant = multi_contract_config.find_contract(sub_contract_name);
-        self.register_contract_variant(expression, contract_builder, contract_variant);
-    }
-
-    /// Links a contract path in a test to a multi-contract output.
-    ///
-    /// This simulates the effects of building such a contract with only part of the endpoints.
-    pub fn register_contract_variant<B>(
-        &mut self,
-        expression: &str,
-        contract_builder: B,
-        contract_variant: &ContractVariant,
-    ) where
-        B: CallableContractBuilder,
-    {
-        let contract_obj = if contract_variant.settings.external_view {
-            contract_builder.new_contract_obj::<api::ExternalViewApi<DebugApi>>()
-        } else {
-            contract_builder.new_contract_obj::<DebugApi>()
-        };
-
-        self.register_contract_container(
-            expression,
-            ContractContainer::new(
-                contract_obj,
-                Some(contract_variant.all_exported_function_names()),
-                contract_variant.settings.panic_message,
-            ),
-        );
-    }
-
     /// Exports current scenario to a JSON file, as created.
     pub fn write_scenario_trace<P: AsRef<Path>>(&mut self, file_path: P) {
         if let Some(trace) = &mut self.get_mut_debugger_backend().trace {
diff --git a/framework/scenario/src/facade/scenario_world_register.rs b/framework/scenario/src/facade/scenario_world_register.rs
new file mode 100644
index 0000000000..9833cd7da1
--- /dev/null
+++ b/framework/scenario/src/facade/scenario_world_register.rs
@@ -0,0 +1,110 @@
+use crate::{
+    api::DebugApi,
+    debug_executor::ContractContainer,
+    multiversx_sc::{
+        api,
+        contract_base::{CallableContractBuilder, ContractAbiProvider},
+    },
+    scenario_format::{interpret_trait::InterpreterContext, value_interpreter::interpret_string},
+    scenario_model::BytesValue,
+    ScenarioWorld,
+};
+use multiversx_chain_scenario_format::interpret_trait::InterpretableFrom;
+
+use multiversx_sc_meta::cmd::contract::sc_config::ContractVariant;
+
+impl ScenarioWorld {
+    pub fn interpreter_context(&self) -> InterpreterContext {
+        InterpreterContext::default()
+            .with_dir(self.current_dir.clone())
+            .with_allowed_missing_files()
+    }
+
+    /// Convenient way of creating a code expression based on the current context
+    /// (i.e. with the paths resolved, as configured).
+    pub fn code_expression(&self, path: &str) -> BytesValue {
+        BytesValue::interpret_from(path, &self.interpreter_context())
+    }
+
+    pub fn register_contract_container(
+        &mut self,
+        expression: &str,
+        contract_container: ContractContainer,
+    ) {
+        let contract_bytes = interpret_string(expression, &self.interpreter_context());
+        self.get_mut_debugger_backend()
+            .vm_runner
+            .contract_map_ref
+            .lock()
+            .register_contract(contract_bytes, contract_container);
+    }
+
+    /// Links a contract path in a test to a contract implementation.
+    pub fn register_contract<B: CallableContractBuilder>(
+        &mut self,
+        expression: &str,
+        contract_builder: B,
+    ) {
+        self.register_contract_container(
+            expression,
+            ContractContainer::new(contract_builder.new_contract_obj::<DebugApi>(), None, false),
+        )
+    }
+
+    #[deprecated(
+        since = "0.37.0",
+        note = "Got renamed to `register_contract`, but not completely removed, in order to ease test migration. Please replace with `register_contract`."
+    )]
+    pub fn register_contract_builder<B: CallableContractBuilder>(
+        &mut self,
+        expression: &str,
+        contract_builder: B,
+    ) {
+        self.register_contract(expression, contract_builder)
+    }
+
+    /// Links a contract path in a test to a multi-contract output.
+    ///
+    /// This simulates the effects of building such a contract with only part of the endpoints.
+    pub fn register_partial_contract<Abi, B>(
+        &mut self,
+        expression: &str,
+        contract_builder: B,
+        sub_contract_name: &str,
+    ) where
+        Abi: ContractAbiProvider,
+        B: CallableContractBuilder,
+    {
+        let multi_contract_config =
+            multiversx_sc_meta::multi_contract_config::<Abi>(self.current_dir.as_path());
+        let contract_variant = multi_contract_config.find_contract(sub_contract_name);
+        self.register_contract_variant(expression, contract_builder, contract_variant);
+    }
+
+    /// Links a contract path in a test to a multi-contract output.
+    ///
+    /// This simulates the effects of building such a contract with only part of the endpoints.
+    pub fn register_contract_variant<B>(
+        &mut self,
+        expression: &str,
+        contract_builder: B,
+        contract_variant: &ContractVariant,
+    ) where
+        B: CallableContractBuilder,
+    {
+        let contract_obj = if contract_variant.settings.external_view {
+            contract_builder.new_contract_obj::<api::ExternalViewApi<DebugApi>>()
+        } else {
+            contract_builder.new_contract_obj::<DebugApi>()
+        };
+
+        self.register_contract_container(
+            expression,
+            ContractContainer::new(
+                contract_obj,
+                Some(contract_variant.all_exported_function_names()),
+                contract_variant.settings.panic_message,
+            ),
+        );
+    }
+}

From 2cafacf0ae9675d28f640bd9abb4c2715c201870 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 25 Apr 2024 23:53:07 +0300
Subject: [PATCH 0773/1254] register_contract generic code source

---
 .../adder/tests/adder_blackbox_test.rs        |  4 +-
 .../tests/crowdfunding_esdt_blackbox_test.rs  | 21 ++--------
 .../multisig/tests/multisig_blackbox_test.rs  | 17 +++-----
 framework/scenario/src/facade/expr.rs         |  2 +
 .../scenario/src/facade/expr/file_expr.rs     | 42 ++++++++++++++-----
 .../scenario/src/facade/expr/mxsc_expr.rs     | 31 ++++++++------
 .../src/facade/expr/register_code_source.rs   | 28 +++++++++++++
 .../src/facade/scenario_world_register.rs     | 14 ++++---
 .../src/facade/world_tx/scenario_tx_env.rs    |  9 ++++
 9 files changed, 107 insertions(+), 61 deletions(-)
 create mode 100644 framework/scenario/src/facade/expr/register_code_source.rs

diff --git a/contracts/examples/adder/tests/adder_blackbox_test.rs b/contracts/examples/adder/tests/adder_blackbox_test.rs
index 9ca51ccbeb..e5370fc61d 100644
--- a/contracts/examples/adder/tests/adder_blackbox_test.rs
+++ b/contracts/examples/adder/tests/adder_blackbox_test.rs
@@ -2,8 +2,6 @@ use multiversx_sc_scenario::imports::*;
 
 use adder::*;
 
-const ADDER_PATH_EXPR: &str = "mxsc:output/adder.mxsc.json";
-
 const OWNER: AddressExpr = AddressExpr("owner");
 const SC_ADDER: ScExpr = ScExpr("adder");
 const CODE_EXPR: MxscExpr = MxscExpr("output/adder.mxsc.json");
@@ -12,7 +10,7 @@ fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
     blockchain.set_current_dir_from_workspace("contracts/examples/adder");
 
-    blockchain.register_contract(ADDER_PATH_EXPR, adder::ContractBuilder);
+    blockchain.register_contract(CODE_EXPR, adder::ContractBuilder);
     blockchain
 }
 
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 04ea60cf3e..7b5c5805a9 100644
--- a/contracts/examples/crowdfunding-esdt/tests/crowdfunding_esdt_blackbox_test.rs
+++ b/contracts/examples/crowdfunding-esdt/tests/crowdfunding_esdt_blackbox_test.rs
@@ -14,10 +14,7 @@ const SC_CROWDFUNDING_ESDT_EXPR: ScExpr = ScExpr("crowdfunding-esdt");
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
 
-    blockchain.register_contract(
-        CODE_EXPR.eval_to_expr().as_str(),
-        crowdfunding_esdt::ContractBuilder,
-    );
+    blockchain.register_contract(CODE_EXPR, crowdfunding_esdt::ContractBuilder);
     blockchain
 }
 
@@ -40,11 +37,7 @@ impl CrowdfundingESDTTestState {
             .nonce(1)
             .esdt_balance(CF_TOKEN_ID_EXPR, "1000");
 
-        world.new_address(
-            OWNER_ADDRESS,
-            1,
-            SC_CROWDFUNDING_ESDT_EXPR.eval_to_expr().as_str(),
-        );
+        world.new_address(OWNER_ADDRESS, 1, SC_CROWDFUNDING_ESDT_EXPR);
 
         Self { world }
     }
@@ -199,17 +192,11 @@ fn test_failed_cf() {
     state.deploy();
 
     // first user fund
-    state.fund(
-        FIRST_USER_ADDRESS, //.eval_to_expr().as_str()
-        300,
-    );
+    state.fund(FIRST_USER_ADDRESS, 300);
     state.check_deposit(FIRST_USER_ADDRESS, 300u64);
 
     // second user fund
-    state.fund(
-        SECOND_USER_ADDRESS, //.eval_to_expr().as_str()
-        600,
-    );
+    state.fund(SECOND_USER_ADDRESS, 600);
     state.check_deposit(SECOND_USER_ADDRESS, 600u64);
 
     // set block timestamp after deadline
diff --git a/contracts/examples/multisig/tests/multisig_blackbox_test.rs b/contracts/examples/multisig/tests/multisig_blackbox_test.rs
index 5be8e9d52b..d276fb8067 100644
--- a/contracts/examples/multisig/tests/multisig_blackbox_test.rs
+++ b/contracts/examples/multisig/tests/multisig_blackbox_test.rs
@@ -20,14 +20,8 @@ fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
     blockchain.set_current_dir_from_workspace("contracts/examples/multisig");
 
-    blockchain.register_contract(
-        MULTISIG_CODE_EXPR.eval_to_expr().as_str(),
-        multisig::ContractBuilder,
-    );
-    blockchain.register_contract(
-        ADDER_CODE_EXPR.eval_to_expr().as_str(),
-        adder::ContractBuilder,
-    );
+    blockchain.register_contract(MULTISIG_CODE_EXPR, multisig::ContractBuilder);
+    blockchain.register_contract(ADDER_CODE_EXPR, adder::ContractBuilder);
     blockchain
 }
 
@@ -597,10 +591,9 @@ fn test_deploy_and_upgrade_from_source() {
         .world
         .code_expression(factorial_path_expr.eval_to_expr().as_str());
 
-    state.world.register_contract(
-        factorial_path_expr.eval_to_expr().as_str(),
-        factorial::ContractBuilder,
-    );
+    state
+        .world
+        .register_contract(factorial_path_expr, factorial::ContractBuilder);
 
     state
         .world
diff --git a/framework/scenario/src/facade/expr.rs b/framework/scenario/src/facade/expr.rs
index 6ea8595740..de36abef97 100644
--- a/framework/scenario/src/facade/expr.rs
+++ b/framework/scenario/src/facade/expr.rs
@@ -2,8 +2,10 @@ mod bech32_address;
 mod file_expr;
 mod mxsc_expr;
 mod num_expr;
+mod register_code_source;
 
 pub use bech32_address::Bech32Address;
 pub use file_expr::FileExpr;
 pub use mxsc_expr::MxscExpr;
 pub use num_expr::NumExpr;
+pub use register_code_source::RegisterCodeSource;
diff --git a/framework/scenario/src/facade/expr/file_expr.rs b/framework/scenario/src/facade/expr/file_expr.rs
index f197ce4e16..4430046a7c 100644
--- a/framework/scenario/src/facade/expr/file_expr.rs
+++ b/framework/scenario/src/facade/expr/file_expr.rs
@@ -1,25 +1,45 @@
 use multiversx_chain_scenario_format::{
     interpret_trait::InterpreterContext, value_interpreter::interpret_string,
 };
-use multiversx_sc::types::{AnnotatedValue, ManagedBuffer};
+use multiversx_sc::types::{AnnotatedValue, ManagedBuffer, TxCodeValue};
 
-use crate::{api::StaticApi, ScenarioTxEnvData};
+use crate::{ScenarioTxEnv, ScenarioTxEnvData};
+
+use super::RegisterCodeSource;
 
 const FILE_PREFIX: &str = "file:";
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
 pub struct FileExpr<'a>(pub &'a str);
 
-impl<'a> AnnotatedValue<ScenarioTxEnvData, ManagedBuffer<StaticApi>> for FileExpr<'a> {
-    fn annotation(&self, _env: &ScenarioTxEnvData) -> ManagedBuffer<StaticApi> {
-        let mut result = ManagedBuffer::new_from_bytes(FILE_PREFIX.as_bytes());
-        result.append_bytes(self.0.as_bytes());
-        result
+impl<'a> FileExpr<'a> {
+    pub fn eval_to_expr(&self) -> String {
+        format!("{FILE_PREFIX}{}", self.0)
+    }
+
+    pub fn resolve_contents(&self, context: &InterpreterContext) -> Vec<u8> {
+        interpret_string(&format!("{FILE_PREFIX}{}", self.0), context)
+    }
+}
+
+impl<'a, Env> AnnotatedValue<Env, ManagedBuffer<Env::Api>> for FileExpr<'a>
+where
+    Env: ScenarioTxEnv,
+{
+    fn annotation(&self, _env: &Env) -> ManagedBuffer<Env::Api> {
+        self.eval_to_expr().into()
+    }
+
+    fn to_value(&self, env: &Env) -> ManagedBuffer<Env::Api> {
+        self.resolve_contents(&env.env_data().interpreter_context())
+            .into()
     }
+}
+
+impl<'a, Env> TxCodeValue<Env> for FileExpr<'a> where Env: ScenarioTxEnv {}
 
-    fn to_value(&self, env: &ScenarioTxEnvData) -> ManagedBuffer<StaticApi> {
-        let context = InterpreterContext::new().with_dir(env.context_path.clone());
-        let value = interpret_string(&format!("{FILE_PREFIX}{}", self.0), &context);
-        value.into()
+impl<'a> RegisterCodeSource for FileExpr<'a> {
+    fn into_code(self, env_data: ScenarioTxEnvData) -> Vec<u8> {
+        self.resolve_contents(&env_data.interpreter_context())
     }
 }
diff --git a/framework/scenario/src/facade/expr/mxsc_expr.rs b/framework/scenario/src/facade/expr/mxsc_expr.rs
index d130102600..886fb91503 100644
--- a/framework/scenario/src/facade/expr/mxsc_expr.rs
+++ b/framework/scenario/src/facade/expr/mxsc_expr.rs
@@ -3,37 +3,44 @@ use multiversx_chain_scenario_format::{
 };
 use multiversx_sc::types::{AnnotatedValue, ManagedBuffer, TxCodeValue};
 
-use crate::ScenarioTxEnv;
+use crate::{ScenarioTxEnv, ScenarioTxEnvData};
+
+use super::RegisterCodeSource;
 
 const MXSC_PREFIX: &str = "mxsc:";
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
 pub struct MxscExpr<'a>(pub &'a str);
 
+impl<'a> MxscExpr<'a> {
+    pub fn eval_to_expr(&self) -> String {
+        format!("{MXSC_PREFIX}{}", self.0)
+    }
+
+    pub fn resolve_contents(&self, context: &InterpreterContext) -> Vec<u8> {
+        interpret_string(&format!("{MXSC_PREFIX}{}", self.0), context)
+    }
+}
+
 impl<'a, Env> AnnotatedValue<Env, ManagedBuffer<Env::Api>> for MxscExpr<'a>
 where
     Env: ScenarioTxEnv,
 {
     fn annotation(&self, _env: &Env) -> ManagedBuffer<Env::Api> {
-        let mut result = ManagedBuffer::new_from_bytes(MXSC_PREFIX.as_bytes());
-        result.append_bytes(self.0.as_bytes());
-        result
+        self.eval_to_expr().into()
     }
 
     fn to_value(&self, env: &Env) -> ManagedBuffer<Env::Api> {
-        let context = InterpreterContext::new()
-            .with_dir(env.env_data().context_path.clone())
-            .with_allowed_missing_files();
-        let value = interpret_string(&format!("{MXSC_PREFIX}{}", self.0), &context);
-        value.into()
+        self.resolve_contents(&env.env_data().interpreter_context())
+            .into()
     }
 }
 
 impl<'a, Env> TxCodeValue<Env> for MxscExpr<'a> where Env: ScenarioTxEnv {}
 
-impl<'a> MxscExpr<'a> {
-    pub fn eval_to_expr(&self) -> String {
-        format!("{MXSC_PREFIX}{}", self.0)
+impl<'a> RegisterCodeSource for MxscExpr<'a> {
+    fn into_code(self, env_data: ScenarioTxEnvData) -> Vec<u8> {
+        self.resolve_contents(&env_data.interpreter_context())
     }
 }
 
diff --git a/framework/scenario/src/facade/expr/register_code_source.rs b/framework/scenario/src/facade/expr/register_code_source.rs
new file mode 100644
index 0000000000..d586498a0f
--- /dev/null
+++ b/framework/scenario/src/facade/expr/register_code_source.rs
@@ -0,0 +1,28 @@
+use multiversx_chain_scenario_format::value_interpreter::interpret_string;
+
+use crate::ScenarioTxEnvData;
+
+/// Used when registering a contract for debugging.
+///
+/// Any type that implements this trait can be passed to the `register_contract` method, and to its variants.
+pub trait RegisterCodeSource {
+    fn into_code(self, env_data: ScenarioTxEnvData) -> Vec<u8>;
+}
+
+impl RegisterCodeSource for &str {
+    fn into_code(self, env_data: ScenarioTxEnvData) -> Vec<u8> {
+        interpret_string(self, &env_data.interpreter_context())
+    }
+}
+
+impl RegisterCodeSource for String {
+    fn into_code(self, env_data: ScenarioTxEnvData) -> Vec<u8> {
+        self.as_str().into_code(env_data)
+    }
+}
+
+impl RegisterCodeSource for &String {
+    fn into_code(self, env_data: ScenarioTxEnvData) -> Vec<u8> {
+        self.as_str().into_code(env_data)
+    }
+}
diff --git a/framework/scenario/src/facade/scenario_world_register.rs b/framework/scenario/src/facade/scenario_world_register.rs
index 9833cd7da1..4fccdec3e6 100644
--- a/framework/scenario/src/facade/scenario_world_register.rs
+++ b/framework/scenario/src/facade/scenario_world_register.rs
@@ -5,7 +5,7 @@ use crate::{
         api,
         contract_base::{CallableContractBuilder, ContractAbiProvider},
     },
-    scenario_format::{interpret_trait::InterpreterContext, value_interpreter::interpret_string},
+    scenario_format::interpret_trait::InterpreterContext,
     scenario_model::BytesValue,
     ScenarioWorld,
 };
@@ -13,6 +13,8 @@ use multiversx_chain_scenario_format::interpret_trait::InterpretableFrom;
 
 use multiversx_sc_meta::cmd::contract::sc_config::ContractVariant;
 
+use super::expr::RegisterCodeSource;
+
 impl ScenarioWorld {
     pub fn interpreter_context(&self) -> InterpreterContext {
         InterpreterContext::default()
@@ -28,10 +30,10 @@ impl ScenarioWorld {
 
     pub fn register_contract_container(
         &mut self,
-        expression: &str,
+        expression: impl RegisterCodeSource,
         contract_container: ContractContainer,
     ) {
-        let contract_bytes = interpret_string(expression, &self.interpreter_context());
+        let contract_bytes = expression.into_code(self.new_env_data());
         self.get_mut_debugger_backend()
             .vm_runner
             .contract_map_ref
@@ -42,7 +44,7 @@ impl ScenarioWorld {
     /// Links a contract path in a test to a contract implementation.
     pub fn register_contract<B: CallableContractBuilder>(
         &mut self,
-        expression: &str,
+        expression: impl RegisterCodeSource,
         contract_builder: B,
     ) {
         self.register_contract_container(
@@ -68,7 +70,7 @@ impl ScenarioWorld {
     /// This simulates the effects of building such a contract with only part of the endpoints.
     pub fn register_partial_contract<Abi, B>(
         &mut self,
-        expression: &str,
+        expression: impl RegisterCodeSource,
         contract_builder: B,
         sub_contract_name: &str,
     ) where
@@ -86,7 +88,7 @@ impl ScenarioWorld {
     /// This simulates the effects of building such a contract with only part of the endpoints.
     pub fn register_contract_variant<B>(
         &mut self,
-        expression: &str,
+        expression: impl RegisterCodeSource,
         contract_builder: B,
         contract_variant: &ContractVariant,
     ) where
diff --git a/framework/scenario/src/facade/world_tx/scenario_tx_env.rs b/framework/scenario/src/facade/world_tx/scenario_tx_env.rs
index 7613f94116..91aa212fc3 100644
--- a/framework/scenario/src/facade/world_tx/scenario_tx_env.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_tx_env.rs
@@ -1,5 +1,6 @@
 use std::path::PathBuf;
 
+use multiversx_chain_scenario_format::interpret_trait::InterpreterContext;
 use multiversx_sc::types::{ManagedAddress, ManagedBuffer, TxEnv, H256};
 
 use crate::{api::StaticApi, scenario_model::TxExpect, ScenarioWorld};
@@ -34,6 +35,14 @@ impl TxEnv for ScenarioTxEnvData {
     }
 }
 
+impl ScenarioTxEnvData {
+    pub fn interpreter_context(&self) -> InterpreterContext {
+        InterpreterContext::default()
+            .with_dir(self.context_path.clone())
+            .with_allowed_missing_files()
+    }
+}
+
 impl ScenarioTxEnv for ScenarioTxEnvData {
     fn env_data(&self) -> &ScenarioTxEnvData {
         self

From 9d85f0adc6910ef7cfe4b02efc75a253b1644802 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 26 Apr 2024 02:33:03 +0300
Subject: [PATCH 0774/1254] expr refactor: address

---
 .../tests/price_aggregator_blackbox_test.rs   |  2 +-
 .../tests/price_aggregator_stress_blackbox.rs |  7 +-
 .../adder/tests/adder_blackbox_test.rs        |  2 +-
 .../tests/crowdfunding_esdt_blackbox_test.rs  |  6 +-
 .../multisig/tests/multisig_blackbox_test.rs  | 16 ++---
 .../tests/pmf_blackbox_test.rs                |  2 +-
 .../tests/st_blackbox_chained_test.rs         |  4 +-
 .../tests/st_blackbox_legacy_proxy_test.rs    |  2 +-
 .../scenario-tester/tests/st_blackbox_test.rs |  4 +-
 framework/base/src/imports.rs                 |  1 +
 framework/base/src/macros.rs                  |  7 ++
 .../types/interaction/expr/address_expr.rs    | 66 +++++++++++--------
 .../src/types/interaction/expr/sc_expr.rs     |  4 ++
 .../src/scenario/model/value/address_key.rs   |  2 +-
 .../src/scenario/model/value/address_value.rs |  2 +-
 15 files changed, 75 insertions(+), 52 deletions(-)

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 bd73790c0a..50b486210f 100644
--- a/contracts/core/price-aggregator/tests/price_aggregator_blackbox_test.rs
+++ b/contracts/core/price-aggregator/tests/price_aggregator_blackbox_test.rs
@@ -20,7 +20,7 @@ const SUBMISSION_COUNT: usize = 3;
 const USD_TICKER: &[u8] = b"USDC";
 
 const PRICE_AGGREGATOR: ScExpr = ScExpr("price-aggregator");
-const OWNER: AddressExpr = AddressExpr("owner");
+const_address_expr!(OWNER = "owner");
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
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 4c01ab175f..6d47282622 100644
--- a/contracts/core/price-aggregator/tests/price_aggregator_stress_blackbox.rs
+++ b/contracts/core/price-aggregator/tests/price_aggregator_stress_blackbox.rs
@@ -9,6 +9,7 @@ const DECIMALS: u8 = 0;
 const EGLD_TICKER: &[u8] = b"EGLD";
 const NR_ORACLES: usize = 50;
 const OWNER_ADDRESS_EXPR: &str = "address:owner";
+const_address_expr!(OWNER = "owner");
 const PRICE_AGGREGATOR_ADDRESS_EXPR: &str = "sc:price-aggregator";
 const PRICE_AGGREGATOR_PATH_EXPR: &str = "mxsc:../output/multiversx-price-aggregator-sc.mxsc.json";
 const SLASH_AMOUNT: u64 = 10;
@@ -89,7 +90,7 @@ impl PriceAggregatorTestState {
 
         self.world
             .tx()
-            .from(AddressExpr("owner"))
+            .from(OWNER)
             .gas(120_000_000u64)
             .typed(price_aggregator_proxy::PriceAggregatorProxy)
             .init(
@@ -121,7 +122,7 @@ impl PriceAggregatorTestState {
     fn set_pair_decimals(&mut self) {
         self.world
             .tx()
-            .from(AddressExpr("owner"))
+            .from(OWNER)
             .to(&self.price_aggregator_contract.to_address())
             .typed(price_aggregator_proxy::PriceAggregatorProxy)
             .set_pair_decimals(EGLD_TICKER, USD_TICKER, DECIMALS)
@@ -131,7 +132,7 @@ impl PriceAggregatorTestState {
     fn unpause_endpoint(&mut self) {
         self.world
             .tx()
-            .from(AddressExpr("owner"))
+            .from(OWNER)
             .to(&self.price_aggregator_contract.to_address())
             .gas(5_000_000u64)
             .typed(price_aggregator_proxy::PriceAggregatorProxy)
diff --git a/contracts/examples/adder/tests/adder_blackbox_test.rs b/contracts/examples/adder/tests/adder_blackbox_test.rs
index e5370fc61d..d0d2a00103 100644
--- a/contracts/examples/adder/tests/adder_blackbox_test.rs
+++ b/contracts/examples/adder/tests/adder_blackbox_test.rs
@@ -2,7 +2,7 @@ use multiversx_sc_scenario::imports::*;
 
 use adder::*;
 
-const OWNER: AddressExpr = AddressExpr("owner");
+const_address_expr!(OWNER = "owner");
 const SC_ADDER: ScExpr = ScExpr("adder");
 const CODE_EXPR: MxscExpr = MxscExpr("output/adder.mxsc.json");
 
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 7b5c5805a9..ad198ad50e 100644
--- a/contracts/examples/crowdfunding-esdt/tests/crowdfunding_esdt_blackbox_test.rs
+++ b/contracts/examples/crowdfunding-esdt/tests/crowdfunding_esdt_blackbox_test.rs
@@ -5,9 +5,9 @@ use multiversx_sc_scenario::imports::*;
 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 FIRST_USER_ADDRESS: AddressExpr = AddressExpr("first-user");
-const OWNER_ADDRESS: AddressExpr = AddressExpr("owner");
-const SECOND_USER_ADDRESS: AddressExpr = AddressExpr("second-user");
+const_address_expr!(FIRST_USER_ADDRESS = "first-user");
+const_address_expr!(OWNER_ADDRESS = "owner");
+const_address_expr!(SECOND_USER_ADDRESS = "second-user");
 const CODE_EXPR: MxscExpr = MxscExpr("output/crowdfunding-esdt.mxsc.json");
 const SC_CROWDFUNDING_ESDT_EXPR: ScExpr = ScExpr("crowdfunding-esdt");
 
diff --git a/contracts/examples/multisig/tests/multisig_blackbox_test.rs b/contracts/examples/multisig/tests/multisig_blackbox_test.rs
index d276fb8067..fc1ab1fa52 100644
--- a/contracts/examples/multisig/tests/multisig_blackbox_test.rs
+++ b/contracts/examples/multisig/tests/multisig_blackbox_test.rs
@@ -6,13 +6,13 @@ use multisig::multisig_proxy;
 use num_bigint::BigUint;
 
 const SC_ADDER_EXPR: ScExpr = ScExpr("adder");
-const ADDER_OWNER_ADDRESS_EXPR: AddressExpr = AddressExpr("adder-owner");
+const_address_expr!(ADDER_OWNER_ADDRESS_EXPR = "adder-owner");
 const ADDER_CODE_EXPR: MxscExpr = MxscExpr("test-contracts/adder.mxsc.json");
-const BOARD_MEMBER_ADDRESS_EXPR: AddressExpr = AddressExpr("board-member");
+const_address_expr!(BOARD_MEMBER_ADDRESS_EXPR = "board-member");
 const SC_MULTISIG_EXPR: ScExpr = ScExpr("multisig");
 const MULTISIG_CODE_EXPR: MxscExpr = MxscExpr("output/multisig.mxsc.json");
-const OWNER_ADDRESS_EXPR: AddressExpr = AddressExpr("owner");
-const PROPOSER_ADDRESS_EXPR: AddressExpr = AddressExpr("proposer");
+const_address_expr!(OWNER_ADDRESS_EXPR = "owner");
+const_address_expr!(PROPOSER_ADDRESS_EXPR = "proposer");
 const PROPOSER_BALANCE_EXPR: &str = "100,000,000";
 const QUORUM_SIZE: usize = 1;
 
@@ -256,7 +256,7 @@ fn test_add_board_member() {
     let mut state = MultisigTestState::new();
     state.deploy_multisig_contract();
 
-    let new_board_member_expr: AddressExpr = AddressExpr("new-board-member");
+    let new_board_member_expr: AddressExpr = AddressExpr::new("new-board-member");
 
     state.world.account(new_board_member_expr).nonce(1);
 
@@ -287,7 +287,7 @@ fn test_add_proposer() {
     let mut state = MultisigTestState::new();
     state.deploy_multisig_contract();
 
-    let new_proposer_address_expr: AddressExpr = AddressExpr("new-proposer");
+    let new_proposer_address_expr = AddressExpr::new("new-proposer");
 
     state.world.account(new_proposer_address_expr).nonce(1);
 
@@ -404,7 +404,7 @@ fn test_change_quorum() {
         .run();
 
     // add another board member
-    let new_board_member_address_expr: AddressExpr = AddressExpr("new-board-member");
+    let new_board_member_address_expr = AddressExpr::new("new-board-member");
 
     state.world.account(new_board_member_address_expr).nonce(1);
 
@@ -423,7 +423,7 @@ fn test_transfer_execute_to_user() {
     let mut state = MultisigTestState::new();
     state.deploy_multisig_contract();
 
-    let new_user_address_expr: AddressExpr = AddressExpr("new-user");
+    let new_user_address_expr = AddressExpr::new("new-user");
     state.world.account(new_user_address_expr).nonce(1);
 
     let amount: u64 = 100;
diff --git a/contracts/feature-tests/panic-message-features/tests/pmf_blackbox_test.rs b/contracts/feature-tests/panic-message-features/tests/pmf_blackbox_test.rs
index 371bf0aeb3..a768279a71 100644
--- a/contracts/feature-tests/panic-message-features/tests/pmf_blackbox_test.rs
+++ b/contracts/feature-tests/panic-message-features/tests/pmf_blackbox_test.rs
@@ -2,7 +2,7 @@ mod pmf_proxy;
 
 use multiversx_sc_scenario::imports::*;
 
-const OWNER: AddressExpr = AddressExpr("owner");
+const_address_expr!(OWNER = "owner");
 const SC_PMF: ScExpr = ScExpr("pmf");
 const CODE_EXPR: &str = "mxsc:output/panic-message-features.mxsc.json";
 
diff --git a/contracts/feature-tests/scenario-tester/tests/st_blackbox_chained_test.rs b/contracts/feature-tests/scenario-tester/tests/st_blackbox_chained_test.rs
index 165e4c62f3..94a330ebea 100644
--- a/contracts/feature-tests/scenario-tester/tests/st_blackbox_chained_test.rs
+++ b/contracts/feature-tests/scenario-tester/tests/st_blackbox_chained_test.rs
@@ -27,7 +27,7 @@ fn st_blackbox_chained() {
                 .new_address(owner_address, 1, "sc:adder"),
         )
         .chain_deploy(|tx| {
-            tx.from(AddressExpr("owner"))
+            tx.from(AddressExpr::new("owner"))
                 .typed(scenario_tester_proxy::ScenarioTesterProxy)
                 .init(5u32)
                 .code(MxscExpr("output/scenario-tester.mxsc.json"))
@@ -44,7 +44,7 @@ fn st_blackbox_chained() {
                 }))
         })
         .chain_call(|tx| {
-            tx.from(AddressExpr("owner"))
+            tx.from(AddressExpr::new("owner"))
                 .to(ScExpr("adder"))
                 .typed(scenario_tester_proxy::ScenarioTesterProxy)
                 .add(3u32)
diff --git a/contracts/feature-tests/scenario-tester/tests/st_blackbox_legacy_proxy_test.rs b/contracts/feature-tests/scenario-tester/tests/st_blackbox_legacy_proxy_test.rs
index 09e8e87c17..1fa7d00839 100644
--- a/contracts/feature-tests/scenario-tester/tests/st_blackbox_legacy_proxy_test.rs
+++ b/contracts/feature-tests/scenario-tester/tests/st_blackbox_legacy_proxy_test.rs
@@ -5,7 +5,7 @@ use scenario_tester::*;
 
 const ADDER_PATH_EXPR: &str = "mxsc:output/adder.mxsc.json";
 
-const OWNER: AddressExpr = AddressExpr("owner");
+const_address_expr!(OWNER = "owner");
 const CODE_EXPR: MxscExpr = MxscExpr("output/adder.mxsc.json");
 
 fn world() -> ScenarioWorld {
diff --git a/contracts/feature-tests/scenario-tester/tests/st_blackbox_test.rs b/contracts/feature-tests/scenario-tester/tests/st_blackbox_test.rs
index 1af150a76f..c8a6044dde 100644
--- a/contracts/feature-tests/scenario-tester/tests/st_blackbox_test.rs
+++ b/contracts/feature-tests/scenario-tester/tests/st_blackbox_test.rs
@@ -5,8 +5,8 @@ use scenario_tester::*;
 
 const SC_SCENARIO_TESTER_PATH_EXPR: &str = "mxsc:output/scenario-tester.mxsc.json";
 
-const OWNER: AddressExpr = AddressExpr("owner");
-const OTHER: AddressExpr = AddressExpr("other");
+const_address_expr!(OWNER = "owner");
+const_address_expr!(OTHER = "other");
 const SC_SCENARIO_TESTER: ScExpr = ScExpr("scenario-tester");
 const CODE_EXPR: MxscExpr = MxscExpr("output/scenario-tester.mxsc.json");
 
diff --git a/framework/base/src/imports.rs b/framework/base/src/imports.rs
index 016aa7bb4e..41677ee71e 100644
--- a/framework/base/src/imports.rs
+++ b/framework/base/src/imports.rs
@@ -6,6 +6,7 @@ pub use crate::{
         multi_types::*, CodecFrom, CodecFromSelf, CodecInto, DecodeError, Empty, IntoMultiValue,
         NestedDecode, NestedEncode, TopDecode, TopEncode,
     },
+    const_address_expr,
     contract_base::{ContractBase, ProxyObjBase, ProxyObjNew},
     err_msg,
     io::*,
diff --git a/framework/base/src/macros.rs b/framework/base/src/macros.rs
index 55d023ad79..ddc9331f9f 100644
--- a/framework/base/src/macros.rs
+++ b/framework/base/src/macros.rs
@@ -210,3 +210,10 @@ macro_rules! extract_address {
             .unwrap_or_sc_panic(multiversx_sc::err_msg::RECIPIENT_ADDRESS_NOT_SET)
     }};
 }
+
+#[macro_export]
+macro_rules! const_address_expr {
+    ($const_name:ident = $name:expr) => {
+        const $const_name: AddressExpr = AddressExpr::new($name);
+    };
+}
diff --git a/framework/base/src/types/interaction/expr/address_expr.rs b/framework/base/src/types/interaction/expr/address_expr.rs
index dddfa5b53c..764c3ea3e3 100644
--- a/framework/base/src/types/interaction/expr/address_expr.rs
+++ b/framework/base/src/types/interaction/expr/address_expr.rs
@@ -7,16 +7,46 @@ use crate::types::{
 
 const ADDRESS_PREFIX: &str = "address:";
 
+/// Encodes a dummy address, to be used for tests.
+/// 
+/// It is designed to be usable from contracts (especiall test contracts), with a minimal footprint.
+/// For this reason, its inner structure is subject to change.
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub struct AddressExpr(pub &'static str);
+pub struct AddressExpr<'a> {
+    name: &'a str,
+}
+
+impl<'a> AddressExpr<'a> {
+    pub const fn new(name: &'a str) -> Self {
+        AddressExpr { name }
+    }
 
-impl<Env> AnnotatedValue<Env, ManagedAddress<Env::Api>> for AddressExpr
+    pub const fn eval_to_array(&self) -> [u8; 32] {
+        let result = [b'_'; 32];
+        let expr_bytes = self.name.as_bytes();
+        let mut len = expr_bytes.len();
+        if len > 32 {
+            len = 32;
+        }
+        unsafe {
+            ptr::copy_nonoverlapping(expr_bytes.as_ptr(), result.as_ptr() as *mut u8, len);
+        }
+        result
+    }
+
+    #[cfg(feature = "alloc")]
+    pub fn eval_to_expr(&self) -> alloc::string::String {
+        alloc::format!("{ADDRESS_PREFIX}{}", self.name)
+    }
+}
+
+impl<'a, Env> AnnotatedValue<Env, ManagedAddress<Env::Api>> for AddressExpr<'a>
 where
     Env: TxEnv,
 {
     fn annotation(&self, _env: &Env) -> ManagedBuffer<Env::Api> {
         let mut result = ManagedBuffer::new_from_bytes(ADDRESS_PREFIX.as_bytes());
-        result.append_bytes(self.0.as_bytes());
+        result.append_bytes(self.name.as_bytes());
         result
     }
 
@@ -26,7 +56,7 @@ where
     }
 }
 
-impl<Env> TxFrom<Env> for AddressExpr
+impl<'a, Env> TxFrom<Env> for AddressExpr<'a>
 where
     Env: TxEnv,
 {
@@ -35,36 +65,16 @@ where
         expr.into()
     }
 }
-impl<Env> TxFromSpecified<Env> for AddressExpr where Env: TxEnv {}
-impl<Env> TxTo<Env> for AddressExpr where Env: TxEnv {}
-impl<Env> TxToSpecified<Env> for AddressExpr where Env: TxEnv {}
-
-impl AddressExpr {
-    pub const fn eval_to_array(&self) -> [u8; 32] {
-        let result = [b'_'; 32];
-        let expr_bytes = self.0.as_bytes();
-        let mut len = expr_bytes.len();
-        if len > 32 {
-            len = 32;
-        }
-        unsafe {
-            ptr::copy_nonoverlapping(expr_bytes.as_ptr(), result.as_ptr() as *mut u8, len);
-        }
-        result
-    }
-
-    #[cfg(feature = "alloc")]
-    pub fn eval_to_expr(&self) -> alloc::string::String {
-        alloc::format!("{ADDRESS_PREFIX}{}", self.0)
-    }
-}
+impl<'a, Env> TxFromSpecified<Env> for AddressExpr<'a> where Env: TxEnv {}
+impl<'a, Env> TxTo<Env> for AddressExpr<'a> where Env: TxEnv {}
+impl<'a, Env> TxToSpecified<Env> for AddressExpr<'a> where Env: TxEnv {}
 
 #[cfg(test)]
 pub mod tests {
     use super::*;
 
     fn assert_eq_eval(expr: &'static str, expected: &[u8; 32]) {
-        assert_eq!(&AddressExpr(expr).eval_to_array(), expected);
+        assert_eq!(&AddressExpr::new(expr).eval_to_array(), expected);
     }
 
     #[test]
diff --git a/framework/base/src/types/interaction/expr/sc_expr.rs b/framework/base/src/types/interaction/expr/sc_expr.rs
index aa57b1af30..0c43ccddcc 100644
--- a/framework/base/src/types/interaction/expr/sc_expr.rs
+++ b/framework/base/src/types/interaction/expr/sc_expr.rs
@@ -9,6 +9,10 @@ const SC_PREFIX: &str = "sc:";
 const VM_TYPE_LEN: usize = 2;
 const DEFAULT_VM_TYPE: &[u8] = &[5, 0];
 
+/// Encodes a dummy address, to be used for tests.
+///
+/// It is designed to be usable from contracts (especiall test contracts), with a minimal footprint.
+/// For this reason, its inner structure is subject to change.
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
 pub struct ScExpr<'a>(pub &'a str);
 
diff --git a/framework/scenario/src/scenario/model/value/address_key.rs b/framework/scenario/src/scenario/model/value/address_key.rs
index d705439b1d..ddb6169a66 100644
--- a/framework/scenario/src/scenario/model/value/address_key.rs
+++ b/framework/scenario/src/scenario/model/value/address_key.rs
@@ -135,7 +135,7 @@ impl From<Bech32Address> for AddressKey {
     }
 }
 
-impl From<AddressExpr> for AddressKey {
+impl From<AddressExpr<'_>> for AddressKey {
     fn from(from: AddressExpr) -> Self {
         AddressKey {
             value: from.eval_to_array().into(),
diff --git a/framework/scenario/src/scenario/model/value/address_value.rs b/framework/scenario/src/scenario/model/value/address_value.rs
index 8564bb6e47..57499a8463 100644
--- a/framework/scenario/src/scenario/model/value/address_value.rs
+++ b/framework/scenario/src/scenario/model/value/address_value.rs
@@ -138,7 +138,7 @@ impl From<&str> for AddressValue {
     }
 }
 
-impl From<AddressExpr> for AddressValue {
+impl From<AddressExpr<'_>> for AddressValue {
     fn from(from: AddressExpr) -> Self {
         AddressValue {
             value: from.eval_to_array().into(),

From 65208e1e3b1cd3d15283ff6596cbf4de36509f00 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 26 Apr 2024 02:33:56 +0300
Subject: [PATCH 0775/1254] expr refactor: sc

---
 .../tests/price_aggregator_blackbox_test.rs   |  2 +-
 .../adder/tests/adder_blackbox_test.rs        |  2 +-
 .../tests/crowdfunding_esdt_blackbox_test.rs  |  2 +-
 .../multisig/tests/multisig_blackbox_test.rs  |  8 +++----
 .../tests/pmf_blackbox_test.rs                |  2 +-
 .../tests/st_blackbox_chained_test.rs         |  4 ++--
 .../scenario-tester/tests/st_blackbox_test.rs |  2 +-
 framework/base/src/imports.rs                 |  2 +-
 framework/base/src/macros.rs                  | 14 +++++++++++++
 .../types/interaction/expr/address_expr.rs    |  2 +-
 .../src/types/interaction/expr/sc_expr.rs     | 21 +++++++++++++------
 11 files changed, 42 insertions(+), 19 deletions(-)

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 50b486210f..e65bf545ea 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 STAKE_AMOUNT: u64 = 20;
 const SUBMISSION_COUNT: usize = 3;
 const USD_TICKER: &[u8] = b"USDC";
 
-const PRICE_AGGREGATOR: ScExpr = ScExpr("price-aggregator");
+const_sc_expr!(PRICE_AGGREGATOR = "price-aggregator");
 const_address_expr!(OWNER = "owner");
 
 fn world() -> ScenarioWorld {
diff --git a/contracts/examples/adder/tests/adder_blackbox_test.rs b/contracts/examples/adder/tests/adder_blackbox_test.rs
index d0d2a00103..d1a754bf87 100644
--- a/contracts/examples/adder/tests/adder_blackbox_test.rs
+++ b/contracts/examples/adder/tests/adder_blackbox_test.rs
@@ -3,7 +3,7 @@ use multiversx_sc_scenario::imports::*;
 use adder::*;
 
 const_address_expr!(OWNER = "owner");
-const SC_ADDER: ScExpr = ScExpr("adder");
+const_sc_expr!(SC_ADDER = "adder");
 const CODE_EXPR: MxscExpr = MxscExpr("output/adder.mxsc.json");
 
 fn world() -> ScenarioWorld {
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 ad198ad50e..79144f716a 100644
--- a/contracts/examples/crowdfunding-esdt/tests/crowdfunding_esdt_blackbox_test.rs
+++ b/contracts/examples/crowdfunding-esdt/tests/crowdfunding_esdt_blackbox_test.rs
@@ -9,7 +9,7 @@ const_address_expr!(FIRST_USER_ADDRESS = "first-user");
 const_address_expr!(OWNER_ADDRESS = "owner");
 const_address_expr!(SECOND_USER_ADDRESS = "second-user");
 const CODE_EXPR: MxscExpr = MxscExpr("output/crowdfunding-esdt.mxsc.json");
-const SC_CROWDFUNDING_ESDT_EXPR: ScExpr = ScExpr("crowdfunding-esdt");
+const_sc_expr!(SC_CROWDFUNDING_ESDT_EXPR = "crowdfunding-esdt");
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
diff --git a/contracts/examples/multisig/tests/multisig_blackbox_test.rs b/contracts/examples/multisig/tests/multisig_blackbox_test.rs
index fc1ab1fa52..79dde417ac 100644
--- a/contracts/examples/multisig/tests/multisig_blackbox_test.rs
+++ b/contracts/examples/multisig/tests/multisig_blackbox_test.rs
@@ -5,11 +5,11 @@ use adder::adder_proxy;
 use multisig::multisig_proxy;
 use num_bigint::BigUint;
 
-const SC_ADDER_EXPR: ScExpr = ScExpr("adder");
+const_sc_expr!(SC_ADDER_EXPR = "adder");
 const_address_expr!(ADDER_OWNER_ADDRESS_EXPR = "adder-owner");
 const ADDER_CODE_EXPR: MxscExpr = MxscExpr("test-contracts/adder.mxsc.json");
 const_address_expr!(BOARD_MEMBER_ADDRESS_EXPR = "board-member");
-const SC_MULTISIG_EXPR: ScExpr = ScExpr("multisig");
+const_sc_expr!(SC_MULTISIG_EXPR = "multisig");
 const MULTISIG_CODE_EXPR: MxscExpr = MxscExpr("output/multisig.mxsc.json");
 const_address_expr!(OWNER_ADDRESS_EXPR = "owner");
 const_address_expr!(PROPOSER_ADDRESS_EXPR = "proposer");
@@ -538,7 +538,7 @@ fn test_deploy_and_upgrade_from_source() {
     let mut state = MultisigTestState::new();
     state.deploy_multisig_contract().deploy_adder_contract();
 
-    let new_adder_address_expr: ScExpr = ScExpr("new-adder");
+    let new_adder_address_expr = ScExpr::new("new-adder");
 
     state
         .world
@@ -584,7 +584,7 @@ fn test_deploy_and_upgrade_from_source() {
         .returns(ExpectValue(BigUint::from(10u64)))
         .run();
 
-    let factorial_address_expr: ScExpr = ScExpr("factorial");
+    let factorial_address_expr: ScExpr = ScExpr::new("factorial");
     let factorial_path_expr: MxscExpr = MxscExpr("test-contracts/factorial.mxsc.json");
 
     let factorial_code = state
diff --git a/contracts/feature-tests/panic-message-features/tests/pmf_blackbox_test.rs b/contracts/feature-tests/panic-message-features/tests/pmf_blackbox_test.rs
index a768279a71..f18abeb9e2 100644
--- a/contracts/feature-tests/panic-message-features/tests/pmf_blackbox_test.rs
+++ b/contracts/feature-tests/panic-message-features/tests/pmf_blackbox_test.rs
@@ -3,7 +3,7 @@ mod pmf_proxy;
 use multiversx_sc_scenario::imports::*;
 
 const_address_expr!(OWNER = "owner");
-const SC_PMF: ScExpr = ScExpr("pmf");
+const_sc_expr!(SC_PMF = "pmf");
 const CODE_EXPR: &str = "mxsc:output/panic-message-features.mxsc.json";
 
 fn world() -> ScenarioWorld {
diff --git a/contracts/feature-tests/scenario-tester/tests/st_blackbox_chained_test.rs b/contracts/feature-tests/scenario-tester/tests/st_blackbox_chained_test.rs
index 94a330ebea..d2fdfdae22 100644
--- a/contracts/feature-tests/scenario-tester/tests/st_blackbox_chained_test.rs
+++ b/contracts/feature-tests/scenario-tester/tests/st_blackbox_chained_test.rs
@@ -36,7 +36,7 @@ fn st_blackbox_chained() {
                 }))
         })
         .chain_query(|tx| {
-            tx.to(ScExpr("adder"))
+            tx.to(ScExpr::new("adder"))
                 .typed(scenario_tester_proxy::ScenarioTesterProxy)
                 .sum()
                 .with_result(WithResultConv::new(|value: BigUint| {
@@ -45,7 +45,7 @@ fn st_blackbox_chained() {
         })
         .chain_call(|tx| {
             tx.from(AddressExpr::new("owner"))
-                .to(ScExpr("adder"))
+                .to(ScExpr::new("adder"))
                 .typed(scenario_tester_proxy::ScenarioTesterProxy)
                 .add(3u32)
                 .with_result(WithRawTxResponse(|response| {
diff --git a/contracts/feature-tests/scenario-tester/tests/st_blackbox_test.rs b/contracts/feature-tests/scenario-tester/tests/st_blackbox_test.rs
index c8a6044dde..f7b303944b 100644
--- a/contracts/feature-tests/scenario-tester/tests/st_blackbox_test.rs
+++ b/contracts/feature-tests/scenario-tester/tests/st_blackbox_test.rs
@@ -7,7 +7,7 @@ const SC_SCENARIO_TESTER_PATH_EXPR: &str = "mxsc:output/scenario-tester.mxsc.jso
 
 const_address_expr!(OWNER = "owner");
 const_address_expr!(OTHER = "other");
-const SC_SCENARIO_TESTER: ScExpr = ScExpr("scenario-tester");
+const_sc_expr!(SC_SCENARIO_TESTER = "scenario-tester");
 const CODE_EXPR: MxscExpr = MxscExpr("output/scenario-tester.mxsc.json");
 
 fn world() -> ScenarioWorld {
diff --git a/framework/base/src/imports.rs b/framework/base/src/imports.rs
index 41677ee71e..6bd58a66ac 100644
--- a/framework/base/src/imports.rs
+++ b/framework/base/src/imports.rs
@@ -6,7 +6,7 @@ pub use crate::{
         multi_types::*, CodecFrom, CodecFromSelf, CodecInto, DecodeError, Empty, IntoMultiValue,
         NestedDecode, NestedEncode, TopDecode, TopEncode,
     },
-    const_address_expr,
+    const_address_expr, const_sc_expr,
     contract_base::{ContractBase, ProxyObjBase, ProxyObjNew},
     err_msg,
     io::*,
diff --git a/framework/base/src/macros.rs b/framework/base/src/macros.rs
index ddc9331f9f..d8f11d945f 100644
--- a/framework/base/src/macros.rs
+++ b/framework/base/src/macros.rs
@@ -217,3 +217,17 @@ macro_rules! const_address_expr {
         const $const_name: AddressExpr = AddressExpr::new($name);
     };
 }
+
+#[macro_export]
+macro_rules! const_sc_expr {
+    ($const_name:ident = $name:expr) => {
+        const $const_name: ScExpr = ScExpr::new($name);
+    };
+}
+
+#[macro_export]
+macro_rules! const_expr {
+    ($const_name:ident = address $name:expr) => {
+        const $const_name: ScExpr = ScExpr::new($name);
+    };
+}
diff --git a/framework/base/src/types/interaction/expr/address_expr.rs b/framework/base/src/types/interaction/expr/address_expr.rs
index 764c3ea3e3..5310809d2c 100644
--- a/framework/base/src/types/interaction/expr/address_expr.rs
+++ b/framework/base/src/types/interaction/expr/address_expr.rs
@@ -8,7 +8,7 @@ use crate::types::{
 const ADDRESS_PREFIX: &str = "address:";
 
 /// Encodes a dummy address, to be used for tests.
-/// 
+///
 /// It is designed to be usable from contracts (especiall test contracts), with a minimal footprint.
 /// For this reason, its inner structure is subject to change.
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
diff --git a/framework/base/src/types/interaction/expr/sc_expr.rs b/framework/base/src/types/interaction/expr/sc_expr.rs
index 0c43ccddcc..0a9579e379 100644
--- a/framework/base/src/types/interaction/expr/sc_expr.rs
+++ b/framework/base/src/types/interaction/expr/sc_expr.rs
@@ -9,12 +9,21 @@ const SC_PREFIX: &str = "sc:";
 const VM_TYPE_LEN: usize = 2;
 const DEFAULT_VM_TYPE: &[u8] = &[5, 0];
 
-/// Encodes a dummy address, to be used for tests.
+/// Encodes a dummy SC address, to be used for tests.
 ///
 /// It is designed to be usable from contracts (especiall test contracts), with a minimal footprint.
 /// For this reason, its inner structure is subject to change.
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub struct ScExpr<'a>(pub &'a str);
+
+pub struct ScExpr<'a> {
+    name: &'a str,
+}
+
+impl<'a> ScExpr<'a> {
+    pub const fn new(name: &'a str) -> Self {
+        ScExpr { name }
+    }
+}
 
 impl<'a, Env> AnnotatedValue<Env, ManagedAddress<Env::Api>> for ScExpr<'a>
 where
@@ -22,7 +31,7 @@ where
 {
     fn annotation(&self, _env: &Env) -> ManagedBuffer<Env::Api> {
         let mut result = ManagedBuffer::new_from_bytes(SC_PREFIX.as_bytes());
-        result.append_bytes(self.0.as_bytes());
+        result.append_bytes(self.name.as_bytes());
         result
     }
 
@@ -55,7 +64,7 @@ impl<'a, Env> TxToSpecified<Env> for ScExpr<'a> where Env: TxEnv {}
 impl<'a> ScExpr<'a> {
     pub const fn eval_to_array(&self) -> [u8; 32] {
         let result = *b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00______________________";
-        let expr_bytes = self.0.as_bytes();
+        let expr_bytes = self.name.as_bytes();
         let mut len = expr_bytes.len();
         if len > 22 {
             len = 22;
@@ -77,7 +86,7 @@ impl<'a> ScExpr<'a> {
 
     #[cfg(feature = "alloc")]
     pub fn eval_to_expr(&self) -> alloc::string::String {
-        alloc::format!("{SC_PREFIX}{}", self.0)
+        alloc::format!("{SC_PREFIX}{}", self.name)
     }
 }
 
@@ -86,7 +95,7 @@ pub mod tests {
     use super::*;
 
     fn assert_eq_eval(expr: &'static str, expected: &[u8; 32]) {
-        assert_eq!(&ScExpr(expr).eval_to_array(), expected);
+        assert_eq!(&ScExpr::new(expr).eval_to_array(), expected);
     }
 
     #[test]

From c3d1a30a1637033a00b17e783d9692a5cd5a7caf Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 26 Apr 2024 02:43:47 +0300
Subject: [PATCH 0776/1254] expr refactor: mxsc

---
 .../examples/adder/tests/adder_blackbox_test.rs  |  2 +-
 .../tests/crowdfunding_esdt_blackbox_test.rs     |  2 +-
 .../multisig/tests/multisig_blackbox_test.rs     |  6 +++---
 .../tests/st_blackbox_chained_test.rs            |  2 +-
 .../tests/st_blackbox_legacy_proxy_test.rs       |  2 +-
 .../scenario-tester/tests/st_blackbox_test.rs    |  2 +-
 framework/base/src/imports.rs                    |  2 +-
 framework/base/src/macros.rs                     |  6 +++---
 .../base/src/types/interaction/expr/sc_expr.rs   |  1 -
 framework/scenario/src/facade/expr/mxsc_expr.rs  | 16 ++++++++++++----
 10 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/contracts/examples/adder/tests/adder_blackbox_test.rs b/contracts/examples/adder/tests/adder_blackbox_test.rs
index d1a754bf87..b4afcff8c8 100644
--- a/contracts/examples/adder/tests/adder_blackbox_test.rs
+++ b/contracts/examples/adder/tests/adder_blackbox_test.rs
@@ -4,7 +4,7 @@ use adder::*;
 
 const_address_expr!(OWNER = "owner");
 const_sc_expr!(SC_ADDER = "adder");
-const CODE_EXPR: MxscExpr = MxscExpr("output/adder.mxsc.json");
+const_mxsc_expr!(CODE_EXPR = "output/adder.mxsc.json");
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
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 79144f716a..22359032e7 100644
--- a/contracts/examples/crowdfunding-esdt/tests/crowdfunding_esdt_blackbox_test.rs
+++ b/contracts/examples/crowdfunding-esdt/tests/crowdfunding_esdt_blackbox_test.rs
@@ -8,7 +8,7 @@ const CF_TOKEN_ID_EXPR: &str = "str:CROWD-123456";
 const_address_expr!(FIRST_USER_ADDRESS = "first-user");
 const_address_expr!(OWNER_ADDRESS = "owner");
 const_address_expr!(SECOND_USER_ADDRESS = "second-user");
-const CODE_EXPR: MxscExpr = MxscExpr("output/crowdfunding-esdt.mxsc.json");
+const_mxsc_expr!(CODE_EXPR = "output/crowdfunding-esdt.mxsc.json");
 const_sc_expr!(SC_CROWDFUNDING_ESDT_EXPR = "crowdfunding-esdt");
 
 fn world() -> ScenarioWorld {
diff --git a/contracts/examples/multisig/tests/multisig_blackbox_test.rs b/contracts/examples/multisig/tests/multisig_blackbox_test.rs
index 79dde417ac..32457bcbec 100644
--- a/contracts/examples/multisig/tests/multisig_blackbox_test.rs
+++ b/contracts/examples/multisig/tests/multisig_blackbox_test.rs
@@ -7,10 +7,10 @@ use num_bigint::BigUint;
 
 const_sc_expr!(SC_ADDER_EXPR = "adder");
 const_address_expr!(ADDER_OWNER_ADDRESS_EXPR = "adder-owner");
-const ADDER_CODE_EXPR: MxscExpr = MxscExpr("test-contracts/adder.mxsc.json");
+const_mxsc_expr!(ADDER_CODE_EXPR = "test-contracts/adder.mxsc.json");
 const_address_expr!(BOARD_MEMBER_ADDRESS_EXPR = "board-member");
 const_sc_expr!(SC_MULTISIG_EXPR = "multisig");
-const MULTISIG_CODE_EXPR: MxscExpr = MxscExpr("output/multisig.mxsc.json");
+const_mxsc_expr!(MULTISIG_CODE_EXPR = "output/multisig.mxsc.json");
 const_address_expr!(OWNER_ADDRESS_EXPR = "owner");
 const_address_expr!(PROPOSER_ADDRESS_EXPR = "proposer");
 const PROPOSER_BALANCE_EXPR: &str = "100,000,000";
@@ -585,7 +585,7 @@ fn test_deploy_and_upgrade_from_source() {
         .run();
 
     let factorial_address_expr: ScExpr = ScExpr::new("factorial");
-    let factorial_path_expr: MxscExpr = MxscExpr("test-contracts/factorial.mxsc.json");
+    let factorial_path_expr: MxscExpr = MxscExpr::new("test-contracts/factorial.mxsc.json");
 
     let factorial_code = state
         .world
diff --git a/contracts/feature-tests/scenario-tester/tests/st_blackbox_chained_test.rs b/contracts/feature-tests/scenario-tester/tests/st_blackbox_chained_test.rs
index d2fdfdae22..4587e96fd5 100644
--- a/contracts/feature-tests/scenario-tester/tests/st_blackbox_chained_test.rs
+++ b/contracts/feature-tests/scenario-tester/tests/st_blackbox_chained_test.rs
@@ -30,7 +30,7 @@ fn st_blackbox_chained() {
             tx.from(AddressExpr::new("owner"))
                 .typed(scenario_tester_proxy::ScenarioTesterProxy)
                 .init(5u32)
-                .code(MxscExpr("output/scenario-tester.mxsc.json"))
+                .code(MxscExpr::new("output/scenario-tester.mxsc.json"))
                 .with_result(WithNewAddress::new(|new_address| {
                     assert_eq!(new_address.to_address(), st_contract.to_address());
                 }))
diff --git a/contracts/feature-tests/scenario-tester/tests/st_blackbox_legacy_proxy_test.rs b/contracts/feature-tests/scenario-tester/tests/st_blackbox_legacy_proxy_test.rs
index 1fa7d00839..9dda2aa2d1 100644
--- a/contracts/feature-tests/scenario-tester/tests/st_blackbox_legacy_proxy_test.rs
+++ b/contracts/feature-tests/scenario-tester/tests/st_blackbox_legacy_proxy_test.rs
@@ -6,7 +6,7 @@ use scenario_tester::*;
 const ADDER_PATH_EXPR: &str = "mxsc:output/adder.mxsc.json";
 
 const_address_expr!(OWNER = "owner");
-const CODE_EXPR: MxscExpr = MxscExpr("output/adder.mxsc.json");
+const_mxsc_expr!(CODE_EXPR = "output/adder.mxsc.json");
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
diff --git a/contracts/feature-tests/scenario-tester/tests/st_blackbox_test.rs b/contracts/feature-tests/scenario-tester/tests/st_blackbox_test.rs
index f7b303944b..70e291d4a2 100644
--- a/contracts/feature-tests/scenario-tester/tests/st_blackbox_test.rs
+++ b/contracts/feature-tests/scenario-tester/tests/st_blackbox_test.rs
@@ -8,7 +8,7 @@ const SC_SCENARIO_TESTER_PATH_EXPR: &str = "mxsc:output/scenario-tester.mxsc.jso
 const_address_expr!(OWNER = "owner");
 const_address_expr!(OTHER = "other");
 const_sc_expr!(SC_SCENARIO_TESTER = "scenario-tester");
-const CODE_EXPR: MxscExpr = MxscExpr("output/scenario-tester.mxsc.json");
+const_mxsc_expr!(CODE_EXPR = "output/scenario-tester.mxsc.json");
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
diff --git a/framework/base/src/imports.rs b/framework/base/src/imports.rs
index 6bd58a66ac..ef16187edf 100644
--- a/framework/base/src/imports.rs
+++ b/framework/base/src/imports.rs
@@ -6,7 +6,7 @@ pub use crate::{
         multi_types::*, CodecFrom, CodecFromSelf, CodecInto, DecodeError, Empty, IntoMultiValue,
         NestedDecode, NestedEncode, TopDecode, TopEncode,
     },
-    const_address_expr, const_sc_expr,
+    const_address_expr, const_mxsc_expr, const_sc_expr,
     contract_base::{ContractBase, ProxyObjBase, ProxyObjNew},
     err_msg,
     io::*,
diff --git a/framework/base/src/macros.rs b/framework/base/src/macros.rs
index d8f11d945f..8e20d6b459 100644
--- a/framework/base/src/macros.rs
+++ b/framework/base/src/macros.rs
@@ -226,8 +226,8 @@ macro_rules! const_sc_expr {
 }
 
 #[macro_export]
-macro_rules! const_expr {
-    ($const_name:ident = address $name:expr) => {
-        const $const_name: ScExpr = ScExpr::new($name);
+macro_rules! const_mxsc_expr {
+    ($const_name:ident = $name:expr) => {
+        const $const_name: MxscExpr = MxscExpr::new($name);
     };
 }
diff --git a/framework/base/src/types/interaction/expr/sc_expr.rs b/framework/base/src/types/interaction/expr/sc_expr.rs
index 0a9579e379..c4d48351ee 100644
--- a/framework/base/src/types/interaction/expr/sc_expr.rs
+++ b/framework/base/src/types/interaction/expr/sc_expr.rs
@@ -14,7 +14,6 @@ const DEFAULT_VM_TYPE: &[u8] = &[5, 0];
 /// It is designed to be usable from contracts (especiall test contracts), with a minimal footprint.
 /// For this reason, its inner structure is subject to change.
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
-
 pub struct ScExpr<'a> {
     name: &'a str,
 }
diff --git a/framework/scenario/src/facade/expr/mxsc_expr.rs b/framework/scenario/src/facade/expr/mxsc_expr.rs
index 886fb91503..0f4be9f05d 100644
--- a/framework/scenario/src/facade/expr/mxsc_expr.rs
+++ b/framework/scenario/src/facade/expr/mxsc_expr.rs
@@ -10,15 +10,23 @@ use super::RegisterCodeSource;
 const MXSC_PREFIX: &str = "mxsc:";
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub struct MxscExpr<'a>(pub &'a str);
+pub struct MxscExpr<'a> {
+    path: &'a str,
+}
+
+impl<'a> MxscExpr<'a> {
+    pub const fn new(path: &'a str) -> Self {
+        MxscExpr { path }
+    }
+}
 
 impl<'a> MxscExpr<'a> {
     pub fn eval_to_expr(&self) -> String {
-        format!("{MXSC_PREFIX}{}", self.0)
+        format!("{MXSC_PREFIX}{}", self.path)
     }
 
     pub fn resolve_contents(&self, context: &InterpreterContext) -> Vec<u8> {
-        interpret_string(&format!("{MXSC_PREFIX}{}", self.0), context)
+        interpret_string(&format!("{MXSC_PREFIX}{}", self.path), context)
     }
 }
 
@@ -49,7 +57,7 @@ pub mod tests {
     use crate::imports::MxscExpr;
 
     fn assert_eq_eval(expr: &'static str, expected: &str) {
-        assert_eq!(&MxscExpr(expr).eval_to_expr(), expected);
+        assert_eq!(&MxscExpr::new(expr).eval_to_expr(), expected);
     }
 
     #[test]

From 6055b7cb2f566f1624e7f54202abba8ba754d261 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 26 Apr 2024 14:13:51 +0300
Subject: [PATCH 0777/1254] expr refactor: rename, reverted macros

---
 .../tests/price_aggregator_blackbox_test.rs   |  4 +-
 .../tests/price_aggregator_stress_blackbox.rs |  2 +-
 .../adder/tests/adder_blackbox_test.rs        |  6 +--
 .../tests/crowdfunding_esdt_blackbox_test.rs  | 18 +++----
 .../multisig/tests/multisig_blackbox_test.rs  | 48 +++++++++----------
 .../rewards_distribution_integration_test.rs  | 15 +++---
 .../tests/pmf_blackbox_test.rs                |  4 +-
 .../tests/st_blackbox_chained_test.rs         | 10 ++--
 .../tests/st_blackbox_legacy_proxy_test.rs    |  4 +-
 .../scenario-tester/tests/st_blackbox_test.rs |  8 ++--
 framework/base/src/imports.rs                 |  1 -
 framework/base/src/macros.rs                  | 21 --------
 framework/base/src/types/interaction/expr.rs  |  8 ++--
 .../expr/{address_expr.rs => test_address.rs} | 18 +++----
 .../expr/{sc_expr.rs => test_sc_address.rs}   | 22 ++++-----
 framework/scenario/src/facade/expr.rs         |  8 ++--
 .../expr/{file_expr.rs => file_path.rs}       | 10 ++--
 .../expr/{mxsc_expr.rs => mxsc_path.rs}       | 18 +++----
 .../src/scenario/model/value/address_key.rs   | 10 ++--
 .../src/scenario/model/value/address_value.rs | 10 ++--
 20 files changed, 112 insertions(+), 133 deletions(-)
 rename framework/base/src/types/interaction/expr/{address_expr.rs => test_address.rs} (85%)
 rename framework/base/src/types/interaction/expr/{sc_expr.rs => test_sc_address.rs} (84%)
 rename framework/scenario/src/facade/expr/{file_expr.rs => file_path.rs} (85%)
 rename framework/scenario/src/facade/expr/{mxsc_expr.rs => mxsc_path.rs} (81%)

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 e65bf545ea..c1d8056769 100644
--- a/contracts/core/price-aggregator/tests/price_aggregator_blackbox_test.rs
+++ b/contracts/core/price-aggregator/tests/price_aggregator_blackbox_test.rs
@@ -19,8 +19,8 @@ const STAKE_AMOUNT: u64 = 20;
 const SUBMISSION_COUNT: usize = 3;
 const USD_TICKER: &[u8] = b"USDC";
 
-const_sc_expr!(PRICE_AGGREGATOR = "price-aggregator");
-const_address_expr!(OWNER = "owner");
+const PRICE_AGGREGATOR: TestScAddress = TestScAddress::new("price-aggregator");
+const OWNER: TestAddress = TestAddress::new("owner");
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
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 6d47282622..46ddf296d3 100644
--- a/contracts/core/price-aggregator/tests/price_aggregator_stress_blackbox.rs
+++ b/contracts/core/price-aggregator/tests/price_aggregator_stress_blackbox.rs
@@ -9,7 +9,7 @@ const DECIMALS: u8 = 0;
 const EGLD_TICKER: &[u8] = b"EGLD";
 const NR_ORACLES: usize = 50;
 const OWNER_ADDRESS_EXPR: &str = "address:owner";
-const_address_expr!(OWNER = "owner");
+const OWNER: TestAddress = TestAddress::new("owner");
 const PRICE_AGGREGATOR_ADDRESS_EXPR: &str = "sc:price-aggregator";
 const PRICE_AGGREGATOR_PATH_EXPR: &str = "mxsc:../output/multiversx-price-aggregator-sc.mxsc.json";
 const SLASH_AMOUNT: u64 = 10;
diff --git a/contracts/examples/adder/tests/adder_blackbox_test.rs b/contracts/examples/adder/tests/adder_blackbox_test.rs
index b4afcff8c8..59b47ba405 100644
--- a/contracts/examples/adder/tests/adder_blackbox_test.rs
+++ b/contracts/examples/adder/tests/adder_blackbox_test.rs
@@ -2,9 +2,9 @@ use multiversx_sc_scenario::imports::*;
 
 use adder::*;
 
-const_address_expr!(OWNER = "owner");
-const_sc_expr!(SC_ADDER = "adder");
-const_mxsc_expr!(CODE_EXPR = "output/adder.mxsc.json");
+const OWNER: TestAddress = TestAddress::new("owner");
+const SC_ADDER: TestScAddress = TestScAddress::new("adder");
+const CODE_EXPR: MxscPath = MxscPath::new("output/adder.mxsc.json");
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
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 22359032e7..d44541751d 100644
--- a/contracts/examples/crowdfunding-esdt/tests/crowdfunding_esdt_blackbox_test.rs
+++ b/contracts/examples/crowdfunding-esdt/tests/crowdfunding_esdt_blackbox_test.rs
@@ -5,11 +5,11 @@ use multiversx_sc_scenario::imports::*;
 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_address_expr!(FIRST_USER_ADDRESS = "first-user");
-const_address_expr!(OWNER_ADDRESS = "owner");
-const_address_expr!(SECOND_USER_ADDRESS = "second-user");
-const_mxsc_expr!(CODE_EXPR = "output/crowdfunding-esdt.mxsc.json");
-const_sc_expr!(SC_CROWDFUNDING_ESDT_EXPR = "crowdfunding-esdt");
+const FIRST_USER_ADDRESS: TestAddress = TestAddress::new("first-user");
+const OWNER_ADDRESS: TestAddress = TestAddress::new("owner");
+const SECOND_USER_ADDRESS: TestAddress = TestAddress::new("second-user");
+const CODE_EXPR: MxscPath = MxscPath::new("output/crowdfunding-esdt.mxsc.json");
+const SC_CROWDFUNDING_ESDT_EXPR: TestScAddress = TestScAddress::new("crowdfunding-esdt");
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
@@ -56,7 +56,7 @@ impl CrowdfundingESDTTestState {
             .run();
     }
 
-    fn fund(&mut self, address: AddressExpr, amount: u64) {
+    fn fund(&mut self, address: TestAddress, amount: u64) {
         self.world
             .tx()
             .from(address)
@@ -71,7 +71,7 @@ impl CrowdfundingESDTTestState {
             .run();
     }
 
-    fn check_deposit(&mut self, donor: AddressExpr, amount: u64) {
+    fn check_deposit(&mut self, donor: TestAddress, amount: u64) {
         self.world
             .query()
             .to(SC_CROWDFUNDING_ESDT_EXPR)
@@ -91,7 +91,7 @@ impl CrowdfundingESDTTestState {
             .run();
     }
 
-    fn claim(&mut self, address: AddressExpr) {
+    fn claim(&mut self, address: TestAddress) {
         self.world
             .tx()
             .from(address)
@@ -101,7 +101,7 @@ impl CrowdfundingESDTTestState {
             .run();
     }
 
-    fn check_esdt_balance(&mut self, address: AddressExpr, balance_expr: &str) {
+    fn check_esdt_balance(&mut self, address: TestAddress, balance_expr: &str) {
         self.world
             .check_account(address)
             .esdt_balance(CF_TOKEN_ID_EXPR, balance_expr);
diff --git a/contracts/examples/multisig/tests/multisig_blackbox_test.rs b/contracts/examples/multisig/tests/multisig_blackbox_test.rs
index 32457bcbec..05d8171bff 100644
--- a/contracts/examples/multisig/tests/multisig_blackbox_test.rs
+++ b/contracts/examples/multisig/tests/multisig_blackbox_test.rs
@@ -5,14 +5,14 @@ use adder::adder_proxy;
 use multisig::multisig_proxy;
 use num_bigint::BigUint;
 
-const_sc_expr!(SC_ADDER_EXPR = "adder");
-const_address_expr!(ADDER_OWNER_ADDRESS_EXPR = "adder-owner");
-const_mxsc_expr!(ADDER_CODE_EXPR = "test-contracts/adder.mxsc.json");
-const_address_expr!(BOARD_MEMBER_ADDRESS_EXPR = "board-member");
-const_sc_expr!(SC_MULTISIG_EXPR = "multisig");
-const_mxsc_expr!(MULTISIG_CODE_EXPR = "output/multisig.mxsc.json");
-const_address_expr!(OWNER_ADDRESS_EXPR = "owner");
-const_address_expr!(PROPOSER_ADDRESS_EXPR = "proposer");
+const SC_ADDER_EXPR: TestScAddress = TestScAddress::new("adder");
+const ADDER_OWNER_ADDRESS_EXPR: TestAddress = TestAddress::new("adder-owner");
+const ADDER_CODE_EXPR: MxscPath = MxscPath::new("test-contracts/adder.mxsc.json");
+const BOARD_MEMBER_ADDRESS_EXPR: TestAddress = TestAddress::new("board-member");
+const SC_MULTISIG_EXPR: TestScAddress = TestScAddress::new("multisig");
+const MULTISIG_CODE_EXPR: MxscPath = MxscPath::new("output/multisig.mxsc.json");
+const OWNER_ADDRESS_EXPR: TestAddress = TestAddress::new("owner");
+const PROPOSER_ADDRESS_EXPR: TestAddress = TestAddress::new("proposer");
 const PROPOSER_BALANCE_EXPR: &str = "100,000,000";
 const QUORUM_SIZE: usize = 1;
 
@@ -88,7 +88,7 @@ impl MultisigTestState {
             .run();
     }
 
-    fn propose_add_board_member(&mut self, board_member_address: AddressExpr) -> usize {
+    fn propose_add_board_member(&mut self, board_member_address: TestAddress) -> usize {
         self.world
             .tx()
             .from(PROPOSER_ADDRESS_EXPR)
@@ -99,7 +99,7 @@ impl MultisigTestState {
             .run()
     }
 
-    fn propose_add_proposer(&mut self, proposer_address: AddressExpr) -> usize {
+    fn propose_add_proposer(&mut self, proposer_address: TestAddress) -> usize {
         self.world
             .tx()
             .from(PROPOSER_ADDRESS_EXPR)
@@ -123,7 +123,7 @@ impl MultisigTestState {
 
     fn propose_transfer_execute(
         &mut self,
-        to: ScExpr,
+        to: TestScAddress,
         egld_amount: u64,
         contract_call: FunctionCall<StaticApi>,
     ) -> usize {
@@ -139,7 +139,7 @@ impl MultisigTestState {
 
     fn propose_async_call(
         &mut self,
-        to: ScExpr,
+        to: TestScAddress,
         egld_amount: u64,
         contract_call: FunctionCall<StaticApi>,
     ) -> usize {
@@ -153,7 +153,7 @@ impl MultisigTestState {
             .run()
     }
 
-    fn propose_remove_user(&mut self, user_address: AddressExpr) -> usize {
+    fn propose_remove_user(&mut self, user_address: TestAddress) -> usize {
         self.world
             .tx()
             .from(PROPOSER_ADDRESS_EXPR)
@@ -167,7 +167,7 @@ impl MultisigTestState {
     fn propose_sc_deploy_from_source(
         &mut self,
         amount: u64,
-        source: ScExpr,
+        source: TestScAddress,
         code_metadata: CodeMetadata,
         arguments: MultiValueVec<Vec<u8>>,
     ) -> usize {
@@ -183,9 +183,9 @@ impl MultisigTestState {
 
     fn propose_sc_upgrade_from_source(
         &mut self,
-        sc_address: ScExpr,
+        sc_address: TestScAddress,
         amount: u64,
-        source: ScExpr,
+        source: TestScAddress,
         code_metadata: CodeMetadata,
         arguments: MultiValueVec<Vec<u8>>,
     ) -> usize {
@@ -238,7 +238,7 @@ impl MultisigTestState {
 
     fn expect_user_role(
         &mut self,
-        user: AddressExpr,
+        user: TestAddress,
         expected_user_role: multisig_proxy::UserRole,
     ) {
         self.world
@@ -256,7 +256,7 @@ fn test_add_board_member() {
     let mut state = MultisigTestState::new();
     state.deploy_multisig_contract();
 
-    let new_board_member_expr: AddressExpr = AddressExpr::new("new-board-member");
+    let new_board_member_expr: TestAddress = TestAddress::new("new-board-member");
 
     state.world.account(new_board_member_expr).nonce(1);
 
@@ -287,7 +287,7 @@ fn test_add_proposer() {
     let mut state = MultisigTestState::new();
     state.deploy_multisig_contract();
 
-    let new_proposer_address_expr = AddressExpr::new("new-proposer");
+    let new_proposer_address_expr = TestAddress::new("new-proposer");
 
     state.world.account(new_proposer_address_expr).nonce(1);
 
@@ -404,7 +404,7 @@ fn test_change_quorum() {
         .run();
 
     // add another board member
-    let new_board_member_address_expr = AddressExpr::new("new-board-member");
+    let new_board_member_address_expr = TestAddress::new("new-board-member");
 
     state.world.account(new_board_member_address_expr).nonce(1);
 
@@ -423,7 +423,7 @@ fn test_transfer_execute_to_user() {
     let mut state = MultisigTestState::new();
     state.deploy_multisig_contract();
 
-    let new_user_address_expr = AddressExpr::new("new-user");
+    let new_user_address_expr = TestAddress::new("new-user");
     state.world.account(new_user_address_expr).nonce(1);
 
     let amount: u64 = 100;
@@ -538,7 +538,7 @@ fn test_deploy_and_upgrade_from_source() {
     let mut state = MultisigTestState::new();
     state.deploy_multisig_contract().deploy_adder_contract();
 
-    let new_adder_address_expr = ScExpr::new("new-adder");
+    let new_adder_address_expr = TestScAddress::new("new-adder");
 
     state
         .world
@@ -584,8 +584,8 @@ fn test_deploy_and_upgrade_from_source() {
         .returns(ExpectValue(BigUint::from(10u64)))
         .run();
 
-    let factorial_address_expr: ScExpr = ScExpr::new("factorial");
-    let factorial_path_expr: MxscExpr = MxscExpr::new("test-contracts/factorial.mxsc.json");
+    let factorial_address_expr: TestScAddress = TestScAddress::new("factorial");
+    let factorial_path_expr: MxscPath = MxscPath::new("test-contracts/factorial.mxsc.json");
 
     let factorial_code = state
         .world
diff --git a/contracts/examples/rewards-distribution/tests/rewards_distribution_integration_test.rs b/contracts/examples/rewards-distribution/tests/rewards_distribution_integration_test.rs
index a375614dab..4843386494 100644
--- a/contracts/examples/rewards-distribution/tests/rewards_distribution_integration_test.rs
+++ b/contracts/examples/rewards-distribution/tests/rewards_distribution_integration_test.rs
@@ -12,13 +12,14 @@ use rewards_distribution::{
 const NFT_TOKEN_ID: &[u8] = b"NFT-123456";
 const NFT_TOKEN_ID_EXPR: &str = "str:NFT-123456";
 
-const ALICE_ADDRESS_EXPR: AddressExpr = AddressExpr("alice");
-const OWNER_ADDRESS_EXPR: AddressExpr = AddressExpr("owner");
-const REWARDS_DISTRIBUTION_ADDRESS_EXPR: ScExpr = ScExpr("rewards-distribution");
-const REWARDS_DISTRIBUTION_PATH_EXPR: MxscExpr = MxscExpr("output/rewards-distribution.mxsc.json");
-const SEED_NFT_MINTER_ADDRESS_EXPR: ScExpr = ScExpr("seed-nft-minter");
-const SEED_NFT_MINTER_PATH_EXPR: MxscExpr =
-    MxscExpr("../seed-nft-minter/output/seed-nft-minter.mxsc.json");
+const ALICE_ADDRESS_EXPR: TestAddress = TestAddress::new("alice");
+const OWNER_ADDRESS_EXPR: TestAddress = TestAddress::new("owner");
+const REWARDS_DISTRIBUTION_ADDRESS_EXPR: TestScAddress = TestScAddress::new("rewards-distribution");
+const REWARDS_DISTRIBUTION_PATH_EXPR: MxscPath =
+    MxscPath::new("output/rewards-distribution.mxsc.json");
+const SEED_NFT_MINTER_ADDRESS_EXPR: TestScAddress = TestScAddress::new("seed-nft-minter");
+const SEED_NFT_MINTER_PATH_EXPR: MxscPath =
+    MxscPath::new("../seed-nft-minter/output/seed-nft-minter.mxsc.json");
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
diff --git a/contracts/feature-tests/panic-message-features/tests/pmf_blackbox_test.rs b/contracts/feature-tests/panic-message-features/tests/pmf_blackbox_test.rs
index f18abeb9e2..550679fff4 100644
--- a/contracts/feature-tests/panic-message-features/tests/pmf_blackbox_test.rs
+++ b/contracts/feature-tests/panic-message-features/tests/pmf_blackbox_test.rs
@@ -2,8 +2,8 @@ mod pmf_proxy;
 
 use multiversx_sc_scenario::imports::*;
 
-const_address_expr!(OWNER = "owner");
-const_sc_expr!(SC_PMF = "pmf");
+const OWNER: TestAddress = TestAddress::new("owner");
+const SC_PMF: TestScAddress = TestScAddress::new("pmf");
 const CODE_EXPR: &str = "mxsc:output/panic-message-features.mxsc.json";
 
 fn world() -> ScenarioWorld {
diff --git a/contracts/feature-tests/scenario-tester/tests/st_blackbox_chained_test.rs b/contracts/feature-tests/scenario-tester/tests/st_blackbox_chained_test.rs
index 4587e96fd5..5183d72923 100644
--- a/contracts/feature-tests/scenario-tester/tests/st_blackbox_chained_test.rs
+++ b/contracts/feature-tests/scenario-tester/tests/st_blackbox_chained_test.rs
@@ -27,16 +27,16 @@ fn st_blackbox_chained() {
                 .new_address(owner_address, 1, "sc:adder"),
         )
         .chain_deploy(|tx| {
-            tx.from(AddressExpr::new("owner"))
+            tx.from(TestAddress::new("owner"))
                 .typed(scenario_tester_proxy::ScenarioTesterProxy)
                 .init(5u32)
-                .code(MxscExpr::new("output/scenario-tester.mxsc.json"))
+                .code(MxscPath::new("output/scenario-tester.mxsc.json"))
                 .with_result(WithNewAddress::new(|new_address| {
                     assert_eq!(new_address.to_address(), st_contract.to_address());
                 }))
         })
         .chain_query(|tx| {
-            tx.to(ScExpr::new("adder"))
+            tx.to(TestScAddress::new("adder"))
                 .typed(scenario_tester_proxy::ScenarioTesterProxy)
                 .sum()
                 .with_result(WithResultConv::new(|value: BigUint| {
@@ -44,8 +44,8 @@ fn st_blackbox_chained() {
                 }))
         })
         .chain_call(|tx| {
-            tx.from(AddressExpr::new("owner"))
-                .to(ScExpr::new("adder"))
+            tx.from(TestAddress::new("owner"))
+                .to(TestScAddress::new("adder"))
                 .typed(scenario_tester_proxy::ScenarioTesterProxy)
                 .add(3u32)
                 .with_result(WithRawTxResponse(|response| {
diff --git a/contracts/feature-tests/scenario-tester/tests/st_blackbox_legacy_proxy_test.rs b/contracts/feature-tests/scenario-tester/tests/st_blackbox_legacy_proxy_test.rs
index 9dda2aa2d1..7dfd815d55 100644
--- a/contracts/feature-tests/scenario-tester/tests/st_blackbox_legacy_proxy_test.rs
+++ b/contracts/feature-tests/scenario-tester/tests/st_blackbox_legacy_proxy_test.rs
@@ -5,8 +5,8 @@ use scenario_tester::*;
 
 const ADDER_PATH_EXPR: &str = "mxsc:output/adder.mxsc.json";
 
-const_address_expr!(OWNER = "owner");
-const_mxsc_expr!(CODE_EXPR = "output/adder.mxsc.json");
+const OWNER: TestAddress = TestAddress::new("owner");
+const CODE_EXPR: MxscPath = MxscPath::new("output/adder.mxsc.json");
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
diff --git a/contracts/feature-tests/scenario-tester/tests/st_blackbox_test.rs b/contracts/feature-tests/scenario-tester/tests/st_blackbox_test.rs
index 70e291d4a2..203868331f 100644
--- a/contracts/feature-tests/scenario-tester/tests/st_blackbox_test.rs
+++ b/contracts/feature-tests/scenario-tester/tests/st_blackbox_test.rs
@@ -5,10 +5,10 @@ use scenario_tester::*;
 
 const SC_SCENARIO_TESTER_PATH_EXPR: &str = "mxsc:output/scenario-tester.mxsc.json";
 
-const_address_expr!(OWNER = "owner");
-const_address_expr!(OTHER = "other");
-const_sc_expr!(SC_SCENARIO_TESTER = "scenario-tester");
-const_mxsc_expr!(CODE_EXPR = "output/scenario-tester.mxsc.json");
+const OWNER: TestAddress = TestAddress::new("owner");
+const OTHER: TestAddress = TestAddress::new("other");
+const SC_SCENARIO_TESTER: TestScAddress = TestScAddress::new("scenario-tester");
+const CODE_EXPR: MxscPath = MxscPath::new("output/scenario-tester.mxsc.json");
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
diff --git a/framework/base/src/imports.rs b/framework/base/src/imports.rs
index ef16187edf..016aa7bb4e 100644
--- a/framework/base/src/imports.rs
+++ b/framework/base/src/imports.rs
@@ -6,7 +6,6 @@ pub use crate::{
         multi_types::*, CodecFrom, CodecFromSelf, CodecInto, DecodeError, Empty, IntoMultiValue,
         NestedDecode, NestedEncode, TopDecode, TopEncode,
     },
-    const_address_expr, const_mxsc_expr, const_sc_expr,
     contract_base::{ContractBase, ProxyObjBase, ProxyObjNew},
     err_msg,
     io::*,
diff --git a/framework/base/src/macros.rs b/framework/base/src/macros.rs
index 8e20d6b459..55d023ad79 100644
--- a/framework/base/src/macros.rs
+++ b/framework/base/src/macros.rs
@@ -210,24 +210,3 @@ macro_rules! extract_address {
             .unwrap_or_sc_panic(multiversx_sc::err_msg::RECIPIENT_ADDRESS_NOT_SET)
     }};
 }
-
-#[macro_export]
-macro_rules! const_address_expr {
-    ($const_name:ident = $name:expr) => {
-        const $const_name: AddressExpr = AddressExpr::new($name);
-    };
-}
-
-#[macro_export]
-macro_rules! const_sc_expr {
-    ($const_name:ident = $name:expr) => {
-        const $const_name: ScExpr = ScExpr::new($name);
-    };
-}
-
-#[macro_export]
-macro_rules! const_mxsc_expr {
-    ($const_name:ident = $name:expr) => {
-        const $const_name: MxscExpr = MxscExpr::new($name);
-    };
-}
diff --git a/framework/base/src/types/interaction/expr.rs b/framework/base/src/types/interaction/expr.rs
index c43da390f9..48939cbf00 100644
--- a/framework/base/src/types/interaction/expr.rs
+++ b/framework/base/src/types/interaction/expr.rs
@@ -1,5 +1,5 @@
-mod address_expr;
-mod sc_expr;
+mod test_address;
+mod test_sc_address;
 
-pub use address_expr::AddressExpr;
-pub use sc_expr::ScExpr;
+pub use test_address::TestAddress;
+pub use test_sc_address::TestScAddress;
diff --git a/framework/base/src/types/interaction/expr/address_expr.rs b/framework/base/src/types/interaction/expr/test_address.rs
similarity index 85%
rename from framework/base/src/types/interaction/expr/address_expr.rs
rename to framework/base/src/types/interaction/expr/test_address.rs
index 5310809d2c..0d3278c67c 100644
--- a/framework/base/src/types/interaction/expr/address_expr.rs
+++ b/framework/base/src/types/interaction/expr/test_address.rs
@@ -12,13 +12,13 @@ const ADDRESS_PREFIX: &str = "address:";
 /// It is designed to be usable from contracts (especiall test contracts), with a minimal footprint.
 /// For this reason, its inner structure is subject to change.
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub struct AddressExpr<'a> {
+pub struct TestAddress<'a> {
     name: &'a str,
 }
 
-impl<'a> AddressExpr<'a> {
+impl<'a> TestAddress<'a> {
     pub const fn new(name: &'a str) -> Self {
-        AddressExpr { name }
+        TestAddress { name }
     }
 
     pub const fn eval_to_array(&self) -> [u8; 32] {
@@ -40,7 +40,7 @@ impl<'a> AddressExpr<'a> {
     }
 }
 
-impl<'a, Env> AnnotatedValue<Env, ManagedAddress<Env::Api>> for AddressExpr<'a>
+impl<'a, Env> AnnotatedValue<Env, ManagedAddress<Env::Api>> for TestAddress<'a>
 where
     Env: TxEnv,
 {
@@ -56,7 +56,7 @@ where
     }
 }
 
-impl<'a, Env> TxFrom<Env> for AddressExpr<'a>
+impl<'a, Env> TxFrom<Env> for TestAddress<'a>
 where
     Env: TxEnv,
 {
@@ -65,16 +65,16 @@ where
         expr.into()
     }
 }
-impl<'a, Env> TxFromSpecified<Env> for AddressExpr<'a> where Env: TxEnv {}
-impl<'a, Env> TxTo<Env> for AddressExpr<'a> where Env: TxEnv {}
-impl<'a, Env> TxToSpecified<Env> for AddressExpr<'a> where Env: TxEnv {}
+impl<'a, Env> TxFromSpecified<Env> for TestAddress<'a> where Env: TxEnv {}
+impl<'a, Env> TxTo<Env> for TestAddress<'a> where Env: TxEnv {}
+impl<'a, Env> TxToSpecified<Env> for TestAddress<'a> where Env: TxEnv {}
 
 #[cfg(test)]
 pub mod tests {
     use super::*;
 
     fn assert_eq_eval(expr: &'static str, expected: &[u8; 32]) {
-        assert_eq!(&AddressExpr::new(expr).eval_to_array(), expected);
+        assert_eq!(&TestAddress::new(expr).eval_to_array(), expected);
     }
 
     #[test]
diff --git a/framework/base/src/types/interaction/expr/sc_expr.rs b/framework/base/src/types/interaction/expr/test_sc_address.rs
similarity index 84%
rename from framework/base/src/types/interaction/expr/sc_expr.rs
rename to framework/base/src/types/interaction/expr/test_sc_address.rs
index c4d48351ee..4c93024420 100644
--- a/framework/base/src/types/interaction/expr/sc_expr.rs
+++ b/framework/base/src/types/interaction/expr/test_sc_address.rs
@@ -14,17 +14,17 @@ const DEFAULT_VM_TYPE: &[u8] = &[5, 0];
 /// It is designed to be usable from contracts (especiall test contracts), with a minimal footprint.
 /// For this reason, its inner structure is subject to change.
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub struct ScExpr<'a> {
+pub struct TestScAddress<'a> {
     name: &'a str,
 }
 
-impl<'a> ScExpr<'a> {
+impl<'a> TestScAddress<'a> {
     pub const fn new(name: &'a str) -> Self {
-        ScExpr { name }
+        TestScAddress { name }
     }
 }
 
-impl<'a, Env> AnnotatedValue<Env, ManagedAddress<Env::Api>> for ScExpr<'a>
+impl<'a, Env> AnnotatedValue<Env, ManagedAddress<Env::Api>> for TestScAddress<'a>
 where
     Env: TxEnv,
 {
@@ -40,14 +40,14 @@ where
     }
 }
 
-impl<'a> ScExpr<'a> {
+impl<'a> TestScAddress<'a> {
     pub fn to_address(&self) -> Address {
         let expr: [u8; 32] = self.eval_to_array();
         expr.into()
     }
 }
 
-impl<'a, Env> TxFrom<Env> for ScExpr<'a>
+impl<'a, Env> TxFrom<Env> for TestScAddress<'a>
 where
     Env: TxEnv,
 {
@@ -56,11 +56,11 @@ where
         expr.into()
     }
 }
-impl<'a, Env> TxFromSpecified<Env> for ScExpr<'a> where Env: TxEnv {}
-impl<'a, Env> TxTo<Env> for ScExpr<'a> where Env: TxEnv {}
-impl<'a, Env> TxToSpecified<Env> for ScExpr<'a> where Env: TxEnv {}
+impl<'a, Env> TxFromSpecified<Env> for TestScAddress<'a> where Env: TxEnv {}
+impl<'a, Env> TxTo<Env> for TestScAddress<'a> where Env: TxEnv {}
+impl<'a, Env> TxToSpecified<Env> for TestScAddress<'a> where Env: TxEnv {}
 
-impl<'a> ScExpr<'a> {
+impl<'a> TestScAddress<'a> {
     pub const fn eval_to_array(&self) -> [u8; 32] {
         let result = *b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00______________________";
         let expr_bytes = self.name.as_bytes();
@@ -94,7 +94,7 @@ pub mod tests {
     use super::*;
 
     fn assert_eq_eval(expr: &'static str, expected: &[u8; 32]) {
-        assert_eq!(&ScExpr::new(expr).eval_to_array(), expected);
+        assert_eq!(&TestScAddress::new(expr).eval_to_array(), expected);
     }
 
     #[test]
diff --git a/framework/scenario/src/facade/expr.rs b/framework/scenario/src/facade/expr.rs
index de36abef97..2ca60a5192 100644
--- a/framework/scenario/src/facade/expr.rs
+++ b/framework/scenario/src/facade/expr.rs
@@ -1,11 +1,11 @@
 mod bech32_address;
-mod file_expr;
-mod mxsc_expr;
+mod file_path;
+mod mxsc_path;
 mod num_expr;
 mod register_code_source;
 
 pub use bech32_address::Bech32Address;
-pub use file_expr::FileExpr;
-pub use mxsc_expr::MxscExpr;
+pub use file_path::FilePath;
+pub use mxsc_path::MxscPath;
 pub use num_expr::NumExpr;
 pub use register_code_source::RegisterCodeSource;
diff --git a/framework/scenario/src/facade/expr/file_expr.rs b/framework/scenario/src/facade/expr/file_path.rs
similarity index 85%
rename from framework/scenario/src/facade/expr/file_expr.rs
rename to framework/scenario/src/facade/expr/file_path.rs
index 4430046a7c..8d779a6fd1 100644
--- a/framework/scenario/src/facade/expr/file_expr.rs
+++ b/framework/scenario/src/facade/expr/file_path.rs
@@ -10,9 +10,9 @@ use super::RegisterCodeSource;
 const FILE_PREFIX: &str = "file:";
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub struct FileExpr<'a>(pub &'a str);
+pub struct FilePath<'a>(pub &'a str);
 
-impl<'a> FileExpr<'a> {
+impl<'a> FilePath<'a> {
     pub fn eval_to_expr(&self) -> String {
         format!("{FILE_PREFIX}{}", self.0)
     }
@@ -22,7 +22,7 @@ impl<'a> FileExpr<'a> {
     }
 }
 
-impl<'a, Env> AnnotatedValue<Env, ManagedBuffer<Env::Api>> for FileExpr<'a>
+impl<'a, Env> AnnotatedValue<Env, ManagedBuffer<Env::Api>> for FilePath<'a>
 where
     Env: ScenarioTxEnv,
 {
@@ -36,9 +36,9 @@ where
     }
 }
 
-impl<'a, Env> TxCodeValue<Env> for FileExpr<'a> where Env: ScenarioTxEnv {}
+impl<'a, Env> TxCodeValue<Env> for FilePath<'a> where Env: ScenarioTxEnv {}
 
-impl<'a> RegisterCodeSource for FileExpr<'a> {
+impl<'a> RegisterCodeSource for FilePath<'a> {
     fn into_code(self, env_data: ScenarioTxEnvData) -> Vec<u8> {
         self.resolve_contents(&env_data.interpreter_context())
     }
diff --git a/framework/scenario/src/facade/expr/mxsc_expr.rs b/framework/scenario/src/facade/expr/mxsc_path.rs
similarity index 81%
rename from framework/scenario/src/facade/expr/mxsc_expr.rs
rename to framework/scenario/src/facade/expr/mxsc_path.rs
index 0f4be9f05d..465eb5f097 100644
--- a/framework/scenario/src/facade/expr/mxsc_expr.rs
+++ b/framework/scenario/src/facade/expr/mxsc_path.rs
@@ -10,17 +10,17 @@ use super::RegisterCodeSource;
 const MXSC_PREFIX: &str = "mxsc:";
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub struct MxscExpr<'a> {
+pub struct MxscPath<'a> {
     path: &'a str,
 }
 
-impl<'a> MxscExpr<'a> {
+impl<'a> MxscPath<'a> {
     pub const fn new(path: &'a str) -> Self {
-        MxscExpr { path }
+        MxscPath { path }
     }
 }
 
-impl<'a> MxscExpr<'a> {
+impl<'a> MxscPath<'a> {
     pub fn eval_to_expr(&self) -> String {
         format!("{MXSC_PREFIX}{}", self.path)
     }
@@ -30,7 +30,7 @@ impl<'a> MxscExpr<'a> {
     }
 }
 
-impl<'a, Env> AnnotatedValue<Env, ManagedBuffer<Env::Api>> for MxscExpr<'a>
+impl<'a, Env> AnnotatedValue<Env, ManagedBuffer<Env::Api>> for MxscPath<'a>
 where
     Env: ScenarioTxEnv,
 {
@@ -44,9 +44,9 @@ where
     }
 }
 
-impl<'a, Env> TxCodeValue<Env> for MxscExpr<'a> where Env: ScenarioTxEnv {}
+impl<'a, Env> TxCodeValue<Env> for MxscPath<'a> where Env: ScenarioTxEnv {}
 
-impl<'a> RegisterCodeSource for MxscExpr<'a> {
+impl<'a> RegisterCodeSource for MxscPath<'a> {
     fn into_code(self, env_data: ScenarioTxEnvData) -> Vec<u8> {
         self.resolve_contents(&env_data.interpreter_context())
     }
@@ -54,10 +54,10 @@ impl<'a> RegisterCodeSource for MxscExpr<'a> {
 
 #[cfg(test)]
 pub mod tests {
-    use crate::imports::MxscExpr;
+    use crate::imports::MxscPath;
 
     fn assert_eq_eval(expr: &'static str, expected: &str) {
-        assert_eq!(&MxscExpr::new(expr).eval_to_expr(), expected);
+        assert_eq!(&MxscPath::new(expr).eval_to_expr(), expected);
     }
 
     #[test]
diff --git a/framework/scenario/src/scenario/model/value/address_key.rs b/framework/scenario/src/scenario/model/value/address_key.rs
index ddb6169a66..b5308e87a1 100644
--- a/framework/scenario/src/scenario/model/value/address_key.rs
+++ b/framework/scenario/src/scenario/model/value/address_key.rs
@@ -1,4 +1,4 @@
-use multiversx_sc::types::{Address, AddressExpr, ScExpr};
+use multiversx_sc::types::{Address, TestAddress, TestScAddress};
 
 use super::{value_from_slice, AddressValue};
 use crate::{
@@ -135,8 +135,8 @@ impl From<Bech32Address> for AddressKey {
     }
 }
 
-impl From<AddressExpr<'_>> for AddressKey {
-    fn from(from: AddressExpr) -> Self {
+impl From<TestAddress<'_>> for AddressKey {
+    fn from(from: TestAddress) -> Self {
         AddressKey {
             value: from.eval_to_array().into(),
             original: from.eval_to_expr(),
@@ -144,8 +144,8 @@ impl From<AddressExpr<'_>> for AddressKey {
     }
 }
 
-impl From<ScExpr<'_>> for AddressKey {
-    fn from(from: ScExpr) -> Self {
+impl From<TestScAddress<'_>> for AddressKey {
+    fn from(from: TestScAddress) -> Self {
         AddressKey {
             value: from.eval_to_array().into(),
             original: from.eval_to_expr(),
diff --git a/framework/scenario/src/scenario/model/value/address_value.rs b/framework/scenario/src/scenario/model/value/address_value.rs
index 57499a8463..831574c26b 100644
--- a/framework/scenario/src/scenario/model/value/address_value.rs
+++ b/framework/scenario/src/scenario/model/value/address_value.rs
@@ -4,7 +4,7 @@ use multiversx_sc::{
 };
 use std::fmt;
 
-use crate::multiversx_sc::types::{Address, AddressExpr, ScExpr};
+use crate::multiversx_sc::types::{Address, TestAddress, TestScAddress};
 
 use crate::{
     facade::expr::Bech32Address,
@@ -138,8 +138,8 @@ impl From<&str> for AddressValue {
     }
 }
 
-impl From<AddressExpr<'_>> for AddressValue {
-    fn from(from: AddressExpr) -> Self {
+impl From<TestAddress<'_>> for AddressValue {
+    fn from(from: TestAddress) -> Self {
         AddressValue {
             value: from.eval_to_array().into(),
             original: ValueSubTree::Str(from.eval_to_expr()),
@@ -147,8 +147,8 @@ impl From<AddressExpr<'_>> for AddressValue {
     }
 }
 
-impl From<ScExpr<'_>> for AddressValue {
-    fn from(from: ScExpr) -> Self {
+impl From<TestScAddress<'_>> for AddressValue {
+    fn from(from: TestScAddress) -> Self {
         AddressValue {
             value: from.eval_to_array().into(),
             original: ValueSubTree::Str(from.eval_to_expr()),

From b47133cf476dbcd858b35cdfec19db0acaa65af1 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 26 Apr 2024 14:22:23 +0300
Subject: [PATCH 0778/1254] expr refactor: rename

---
 .../tests/price_aggregator_blackbox_test.rs   |  2 +-
 .../adder/tests/adder_blackbox_test.rs        |  2 +-
 .../tests/crowdfunding_esdt_blackbox_test.rs  |  2 +-
 .../multisig/tests/multisig_blackbox_test.rs  | 18 +++++++--------
 .../rewards_distribution_integration_test.rs  |  4 ++--
 .../tests/pmf_blackbox_test.rs                |  2 +-
 .../tests/st_blackbox_chained_test.rs         |  4 ++--
 .../scenario-tester/tests/st_blackbox_test.rs |  2 +-
 framework/base/src/types/interaction/expr.rs  |  2 +-
 .../types/interaction/expr/test_sc_address.rs | 22 +++++++++----------
 .../src/scenario/model/value/address_key.rs   |  6 ++---
 .../src/scenario/model/value/address_value.rs |  6 ++---
 12 files changed, 36 insertions(+), 36 deletions(-)

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 c1d8056769..00a997399a 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 STAKE_AMOUNT: u64 = 20;
 const SUBMISSION_COUNT: usize = 3;
 const USD_TICKER: &[u8] = b"USDC";
 
-const PRICE_AGGREGATOR: TestScAddress = TestScAddress::new("price-aggregator");
+const PRICE_AGGREGATOR: TestSCAddress = TestSCAddress::new("price-aggregator");
 const OWNER: TestAddress = TestAddress::new("owner");
 
 fn world() -> ScenarioWorld {
diff --git a/contracts/examples/adder/tests/adder_blackbox_test.rs b/contracts/examples/adder/tests/adder_blackbox_test.rs
index 59b47ba405..61daec8c25 100644
--- a/contracts/examples/adder/tests/adder_blackbox_test.rs
+++ b/contracts/examples/adder/tests/adder_blackbox_test.rs
@@ -3,7 +3,7 @@ use multiversx_sc_scenario::imports::*;
 use adder::*;
 
 const OWNER: TestAddress = TestAddress::new("owner");
-const SC_ADDER: TestScAddress = TestScAddress::new("adder");
+const SC_ADDER: TestSCAddress = TestSCAddress::new("adder");
 const CODE_EXPR: MxscPath = MxscPath::new("output/adder.mxsc.json");
 
 fn world() -> ScenarioWorld {
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 d44541751d..0109329c4c 100644
--- a/contracts/examples/crowdfunding-esdt/tests/crowdfunding_esdt_blackbox_test.rs
+++ b/contracts/examples/crowdfunding-esdt/tests/crowdfunding_esdt_blackbox_test.rs
@@ -9,7 +9,7 @@ const FIRST_USER_ADDRESS: TestAddress = TestAddress::new("first-user");
 const OWNER_ADDRESS: TestAddress = TestAddress::new("owner");
 const SECOND_USER_ADDRESS: TestAddress = TestAddress::new("second-user");
 const CODE_EXPR: MxscPath = MxscPath::new("output/crowdfunding-esdt.mxsc.json");
-const SC_CROWDFUNDING_ESDT_EXPR: TestScAddress = TestScAddress::new("crowdfunding-esdt");
+const SC_CROWDFUNDING_ESDT_EXPR: TestSCAddress = TestSCAddress::new("crowdfunding-esdt");
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
diff --git a/contracts/examples/multisig/tests/multisig_blackbox_test.rs b/contracts/examples/multisig/tests/multisig_blackbox_test.rs
index 05d8171bff..8d1e81f6cf 100644
--- a/contracts/examples/multisig/tests/multisig_blackbox_test.rs
+++ b/contracts/examples/multisig/tests/multisig_blackbox_test.rs
@@ -5,11 +5,11 @@ use adder::adder_proxy;
 use multisig::multisig_proxy;
 use num_bigint::BigUint;
 
-const SC_ADDER_EXPR: TestScAddress = TestScAddress::new("adder");
+const SC_ADDER_EXPR: TestSCAddress = TestSCAddress::new("adder");
 const ADDER_OWNER_ADDRESS_EXPR: TestAddress = TestAddress::new("adder-owner");
 const ADDER_CODE_EXPR: MxscPath = MxscPath::new("test-contracts/adder.mxsc.json");
 const BOARD_MEMBER_ADDRESS_EXPR: TestAddress = TestAddress::new("board-member");
-const SC_MULTISIG_EXPR: TestScAddress = TestScAddress::new("multisig");
+const SC_MULTISIG_EXPR: TestSCAddress = TestSCAddress::new("multisig");
 const MULTISIG_CODE_EXPR: MxscPath = MxscPath::new("output/multisig.mxsc.json");
 const OWNER_ADDRESS_EXPR: TestAddress = TestAddress::new("owner");
 const PROPOSER_ADDRESS_EXPR: TestAddress = TestAddress::new("proposer");
@@ -123,7 +123,7 @@ impl MultisigTestState {
 
     fn propose_transfer_execute(
         &mut self,
-        to: TestScAddress,
+        to: TestSCAddress,
         egld_amount: u64,
         contract_call: FunctionCall<StaticApi>,
     ) -> usize {
@@ -139,7 +139,7 @@ impl MultisigTestState {
 
     fn propose_async_call(
         &mut self,
-        to: TestScAddress,
+        to: TestSCAddress,
         egld_amount: u64,
         contract_call: FunctionCall<StaticApi>,
     ) -> usize {
@@ -167,7 +167,7 @@ impl MultisigTestState {
     fn propose_sc_deploy_from_source(
         &mut self,
         amount: u64,
-        source: TestScAddress,
+        source: TestSCAddress,
         code_metadata: CodeMetadata,
         arguments: MultiValueVec<Vec<u8>>,
     ) -> usize {
@@ -183,9 +183,9 @@ impl MultisigTestState {
 
     fn propose_sc_upgrade_from_source(
         &mut self,
-        sc_address: TestScAddress,
+        sc_address: TestSCAddress,
         amount: u64,
-        source: TestScAddress,
+        source: TestSCAddress,
         code_metadata: CodeMetadata,
         arguments: MultiValueVec<Vec<u8>>,
     ) -> usize {
@@ -538,7 +538,7 @@ fn test_deploy_and_upgrade_from_source() {
     let mut state = MultisigTestState::new();
     state.deploy_multisig_contract().deploy_adder_contract();
 
-    let new_adder_address_expr = TestScAddress::new("new-adder");
+    let new_adder_address_expr = TestSCAddress::new("new-adder");
 
     state
         .world
@@ -584,7 +584,7 @@ fn test_deploy_and_upgrade_from_source() {
         .returns(ExpectValue(BigUint::from(10u64)))
         .run();
 
-    let factorial_address_expr: TestScAddress = TestScAddress::new("factorial");
+    let factorial_address_expr: TestSCAddress = TestSCAddress::new("factorial");
     let factorial_path_expr: MxscPath = MxscPath::new("test-contracts/factorial.mxsc.json");
 
     let factorial_code = state
diff --git a/contracts/examples/rewards-distribution/tests/rewards_distribution_integration_test.rs b/contracts/examples/rewards-distribution/tests/rewards_distribution_integration_test.rs
index 4843386494..d540805eaf 100644
--- a/contracts/examples/rewards-distribution/tests/rewards_distribution_integration_test.rs
+++ b/contracts/examples/rewards-distribution/tests/rewards_distribution_integration_test.rs
@@ -14,10 +14,10 @@ const NFT_TOKEN_ID_EXPR: &str = "str:NFT-123456";
 
 const ALICE_ADDRESS_EXPR: TestAddress = TestAddress::new("alice");
 const OWNER_ADDRESS_EXPR: TestAddress = TestAddress::new("owner");
-const REWARDS_DISTRIBUTION_ADDRESS_EXPR: TestScAddress = TestScAddress::new("rewards-distribution");
+const REWARDS_DISTRIBUTION_ADDRESS_EXPR: TestSCAddress = TestSCAddress::new("rewards-distribution");
 const REWARDS_DISTRIBUTION_PATH_EXPR: MxscPath =
     MxscPath::new("output/rewards-distribution.mxsc.json");
-const SEED_NFT_MINTER_ADDRESS_EXPR: TestScAddress = TestScAddress::new("seed-nft-minter");
+const SEED_NFT_MINTER_ADDRESS_EXPR: TestSCAddress = TestSCAddress::new("seed-nft-minter");
 const SEED_NFT_MINTER_PATH_EXPR: MxscPath =
     MxscPath::new("../seed-nft-minter/output/seed-nft-minter.mxsc.json");
 
diff --git a/contracts/feature-tests/panic-message-features/tests/pmf_blackbox_test.rs b/contracts/feature-tests/panic-message-features/tests/pmf_blackbox_test.rs
index 550679fff4..5dbd41fc01 100644
--- a/contracts/feature-tests/panic-message-features/tests/pmf_blackbox_test.rs
+++ b/contracts/feature-tests/panic-message-features/tests/pmf_blackbox_test.rs
@@ -3,7 +3,7 @@ mod pmf_proxy;
 use multiversx_sc_scenario::imports::*;
 
 const OWNER: TestAddress = TestAddress::new("owner");
-const SC_PMF: TestScAddress = TestScAddress::new("pmf");
+const SC_PMF: TestSCAddress = TestSCAddress::new("pmf");
 const CODE_EXPR: &str = "mxsc:output/panic-message-features.mxsc.json";
 
 fn world() -> ScenarioWorld {
diff --git a/contracts/feature-tests/scenario-tester/tests/st_blackbox_chained_test.rs b/contracts/feature-tests/scenario-tester/tests/st_blackbox_chained_test.rs
index 5183d72923..439dc586de 100644
--- a/contracts/feature-tests/scenario-tester/tests/st_blackbox_chained_test.rs
+++ b/contracts/feature-tests/scenario-tester/tests/st_blackbox_chained_test.rs
@@ -36,7 +36,7 @@ fn st_blackbox_chained() {
                 }))
         })
         .chain_query(|tx| {
-            tx.to(TestScAddress::new("adder"))
+            tx.to(TestSCAddress::new("adder"))
                 .typed(scenario_tester_proxy::ScenarioTesterProxy)
                 .sum()
                 .with_result(WithResultConv::new(|value: BigUint| {
@@ -45,7 +45,7 @@ fn st_blackbox_chained() {
         })
         .chain_call(|tx| {
             tx.from(TestAddress::new("owner"))
-                .to(TestScAddress::new("adder"))
+                .to(TestSCAddress::new("adder"))
                 .typed(scenario_tester_proxy::ScenarioTesterProxy)
                 .add(3u32)
                 .with_result(WithRawTxResponse(|response| {
diff --git a/contracts/feature-tests/scenario-tester/tests/st_blackbox_test.rs b/contracts/feature-tests/scenario-tester/tests/st_blackbox_test.rs
index 203868331f..db1e011dcc 100644
--- a/contracts/feature-tests/scenario-tester/tests/st_blackbox_test.rs
+++ b/contracts/feature-tests/scenario-tester/tests/st_blackbox_test.rs
@@ -7,7 +7,7 @@ const SC_SCENARIO_TESTER_PATH_EXPR: &str = "mxsc:output/scenario-tester.mxsc.jso
 
 const OWNER: TestAddress = TestAddress::new("owner");
 const OTHER: TestAddress = TestAddress::new("other");
-const SC_SCENARIO_TESTER: TestScAddress = TestScAddress::new("scenario-tester");
+const SC_SCENARIO_TESTER: TestSCAddress = TestSCAddress::new("scenario-tester");
 const CODE_EXPR: MxscPath = MxscPath::new("output/scenario-tester.mxsc.json");
 
 fn world() -> ScenarioWorld {
diff --git a/framework/base/src/types/interaction/expr.rs b/framework/base/src/types/interaction/expr.rs
index 48939cbf00..ca1e1c44b1 100644
--- a/framework/base/src/types/interaction/expr.rs
+++ b/framework/base/src/types/interaction/expr.rs
@@ -2,4 +2,4 @@ mod test_address;
 mod test_sc_address;
 
 pub use test_address::TestAddress;
-pub use test_sc_address::TestScAddress;
+pub use test_sc_address::TestSCAddress;
diff --git a/framework/base/src/types/interaction/expr/test_sc_address.rs b/framework/base/src/types/interaction/expr/test_sc_address.rs
index 4c93024420..3f603160b1 100644
--- a/framework/base/src/types/interaction/expr/test_sc_address.rs
+++ b/framework/base/src/types/interaction/expr/test_sc_address.rs
@@ -14,17 +14,17 @@ const DEFAULT_VM_TYPE: &[u8] = &[5, 0];
 /// It is designed to be usable from contracts (especiall test contracts), with a minimal footprint.
 /// For this reason, its inner structure is subject to change.
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub struct TestScAddress<'a> {
+pub struct TestSCAddress<'a> {
     name: &'a str,
 }
 
-impl<'a> TestScAddress<'a> {
+impl<'a> TestSCAddress<'a> {
     pub const fn new(name: &'a str) -> Self {
-        TestScAddress { name }
+        TestSCAddress { name }
     }
 }
 
-impl<'a, Env> AnnotatedValue<Env, ManagedAddress<Env::Api>> for TestScAddress<'a>
+impl<'a, Env> AnnotatedValue<Env, ManagedAddress<Env::Api>> for TestSCAddress<'a>
 where
     Env: TxEnv,
 {
@@ -40,14 +40,14 @@ where
     }
 }
 
-impl<'a> TestScAddress<'a> {
+impl<'a> TestSCAddress<'a> {
     pub fn to_address(&self) -> Address {
         let expr: [u8; 32] = self.eval_to_array();
         expr.into()
     }
 }
 
-impl<'a, Env> TxFrom<Env> for TestScAddress<'a>
+impl<'a, Env> TxFrom<Env> for TestSCAddress<'a>
 where
     Env: TxEnv,
 {
@@ -56,11 +56,11 @@ where
         expr.into()
     }
 }
-impl<'a, Env> TxFromSpecified<Env> for TestScAddress<'a> where Env: TxEnv {}
-impl<'a, Env> TxTo<Env> for TestScAddress<'a> where Env: TxEnv {}
-impl<'a, Env> TxToSpecified<Env> for TestScAddress<'a> where Env: TxEnv {}
+impl<'a, Env> TxFromSpecified<Env> for TestSCAddress<'a> where Env: TxEnv {}
+impl<'a, Env> TxTo<Env> for TestSCAddress<'a> where Env: TxEnv {}
+impl<'a, Env> TxToSpecified<Env> for TestSCAddress<'a> where Env: TxEnv {}
 
-impl<'a> TestScAddress<'a> {
+impl<'a> TestSCAddress<'a> {
     pub const fn eval_to_array(&self) -> [u8; 32] {
         let result = *b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00______________________";
         let expr_bytes = self.name.as_bytes();
@@ -94,7 +94,7 @@ pub mod tests {
     use super::*;
 
     fn assert_eq_eval(expr: &'static str, expected: &[u8; 32]) {
-        assert_eq!(&TestScAddress::new(expr).eval_to_array(), expected);
+        assert_eq!(&TestSCAddress::new(expr).eval_to_array(), expected);
     }
 
     #[test]
diff --git a/framework/scenario/src/scenario/model/value/address_key.rs b/framework/scenario/src/scenario/model/value/address_key.rs
index b5308e87a1..f54e05b2f3 100644
--- a/framework/scenario/src/scenario/model/value/address_key.rs
+++ b/framework/scenario/src/scenario/model/value/address_key.rs
@@ -1,4 +1,4 @@
-use multiversx_sc::types::{Address, TestAddress, TestScAddress};
+use multiversx_sc::types::{Address, TestAddress, TestSCAddress};
 
 use super::{value_from_slice, AddressValue};
 use crate::{
@@ -144,8 +144,8 @@ impl From<TestAddress<'_>> for AddressKey {
     }
 }
 
-impl From<TestScAddress<'_>> for AddressKey {
-    fn from(from: TestScAddress) -> Self {
+impl From<TestSCAddress<'_>> for AddressKey {
+    fn from(from: TestSCAddress) -> Self {
         AddressKey {
             value: from.eval_to_array().into(),
             original: from.eval_to_expr(),
diff --git a/framework/scenario/src/scenario/model/value/address_value.rs b/framework/scenario/src/scenario/model/value/address_value.rs
index 831574c26b..fdde631ede 100644
--- a/framework/scenario/src/scenario/model/value/address_value.rs
+++ b/framework/scenario/src/scenario/model/value/address_value.rs
@@ -4,7 +4,7 @@ use multiversx_sc::{
 };
 use std::fmt;
 
-use crate::multiversx_sc::types::{Address, TestAddress, TestScAddress};
+use crate::multiversx_sc::types::{Address, TestAddress, TestSCAddress};
 
 use crate::{
     facade::expr::Bech32Address,
@@ -147,8 +147,8 @@ impl From<TestAddress<'_>> for AddressValue {
     }
 }
 
-impl From<TestScAddress<'_>> for AddressValue {
-    fn from(from: TestScAddress) -> Self {
+impl From<TestSCAddress<'_>> for AddressValue {
+    fn from(from: TestSCAddress) -> Self {
         AddressValue {
             value: from.eval_to_array().into(),
             original: ValueSubTree::Str(from.eval_to_expr()),

From 3b81210db4192dc9e2c301a163b20e118cc83815 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 26 Apr 2024 14:31:08 +0300
Subject: [PATCH 0779/1254] expr refactor: rename in tests

---
 .../tests/price_aggregator_blackbox_test.rs   |  26 +--
 .../adder/tests/adder_blackbox_test.rs        |  32 ++--
 .../tests/crowdfunding_esdt_blackbox_test.rs  |  22 +--
 .../multisig/tests/multisig_blackbox_test.rs  | 180 +++++++++---------
 .../rewards_distribution_integration_test.rs  |  79 ++++----
 .../tests/pmf_blackbox_test.rs                |   8 +-
 .../scenario-tester/tests/st_blackbox_test.rs |  22 +--
 7 files changed, 185 insertions(+), 184 deletions(-)

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 00a997399a..5eca754439 100644
--- a/contracts/core/price-aggregator/tests/price_aggregator_blackbox_test.rs
+++ b/contracts/core/price-aggregator/tests/price_aggregator_blackbox_test.rs
@@ -19,8 +19,8 @@ const STAKE_AMOUNT: u64 = 20;
 const SUBMISSION_COUNT: usize = 3;
 const USD_TICKER: &[u8] = b"USDC";
 
-const PRICE_AGGREGATOR: TestSCAddress = TestSCAddress::new("price-aggregator");
-const OWNER: TestAddress = TestAddress::new("owner");
+const PRICE_AGGREGATOR_ADDRESS: TestSCAddress = TestSCAddress::new("price-aggregator");
+const OWNER_ADDRESS: TestAddress = TestAddress::new("owner");
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
@@ -44,7 +44,7 @@ impl PriceAggregatorTestState {
     fn new() -> Self {
         let mut world = world();
 
-        world.account(OWNER).nonce(1);
+        world.account(OWNER_ADDRESS).nonce(1);
         world.current_block().block_timestamp(100);
 
         world.set_state_step(SetStateStep::new()).new_address(
@@ -86,7 +86,7 @@ impl PriceAggregatorTestState {
 
         self.world
             .tx()
-            .from(OWNER)
+            .from(OWNER_ADDRESS)
             .typed(price_aggregator_proxy::PriceAggregatorProxy)
             .init(
                 EgldOrEsdtTokenIdentifier::egld(),
@@ -103,7 +103,7 @@ impl PriceAggregatorTestState {
             self.world
                 .tx()
                 .from(address)
-                .to(PRICE_AGGREGATOR)
+                .to(PRICE_AGGREGATOR_ADDRESS)
                 .typed(price_aggregator_proxy::PriceAggregatorProxy)
                 .stake()
                 .egld(STAKE_AMOUNT)
@@ -116,8 +116,8 @@ impl PriceAggregatorTestState {
     fn set_pair_decimals(&mut self) {
         self.world
             .tx()
-            .from(OWNER)
-            .to(PRICE_AGGREGATOR)
+            .from(OWNER_ADDRESS)
+            .to(PRICE_AGGREGATOR_ADDRESS)
             .typed(price_aggregator_proxy::PriceAggregatorProxy)
             .set_pair_decimals(EGLD_TICKER, USD_TICKER, DECIMALS)
             .run();
@@ -126,8 +126,8 @@ impl PriceAggregatorTestState {
     fn unpause_endpoint(&mut self) {
         self.world
             .tx()
-            .from(OWNER)
-            .to(PRICE_AGGREGATOR)
+            .from(OWNER_ADDRESS)
+            .to(PRICE_AGGREGATOR_ADDRESS)
             .typed(price_aggregator_proxy::PriceAggregatorProxy)
             .unpause_endpoint()
             .run();
@@ -137,7 +137,7 @@ impl PriceAggregatorTestState {
         self.world
             .tx()
             .from(from)
-            .to(PRICE_AGGREGATOR)
+            .to(PRICE_AGGREGATOR_ADDRESS)
             .typed(price_aggregator_proxy::PriceAggregatorProxy)
             .submit(
                 EGLD_TICKER,
@@ -159,7 +159,7 @@ impl PriceAggregatorTestState {
         self.world
             .tx()
             .from(from)
-            .to(PRICE_AGGREGATOR)
+            .to(PRICE_AGGREGATOR_ADDRESS)
             .typed(price_aggregator_proxy::PriceAggregatorProxy)
             .submit(
                 EGLD_TICKER,
@@ -177,7 +177,7 @@ impl PriceAggregatorTestState {
         self.world
             .tx()
             .from(from)
-            .to(PRICE_AGGREGATOR)
+            .to(PRICE_AGGREGATOR_ADDRESS)
             .typed(price_aggregator_proxy::PriceAggregatorProxy)
             .vote_slash_member(member_to_slash)
             .run();
@@ -379,7 +379,7 @@ fn test_price_aggregator_slashing() {
         .world
         .tx()
         .from(&state.oracles[0])
-        .to(PRICE_AGGREGATOR)
+        .to(PRICE_AGGREGATOR_ADDRESS)
         .typed(price_aggregator_proxy::PriceAggregatorProxy)
         .slash_member(state.oracles[1].to_address())
         .run();
diff --git a/contracts/examples/adder/tests/adder_blackbox_test.rs b/contracts/examples/adder/tests/adder_blackbox_test.rs
index 61daec8c25..a0064a65d0 100644
--- a/contracts/examples/adder/tests/adder_blackbox_test.rs
+++ b/contracts/examples/adder/tests/adder_blackbox_test.rs
@@ -2,15 +2,15 @@ use multiversx_sc_scenario::imports::*;
 
 use adder::*;
 
-const OWNER: TestAddress = TestAddress::new("owner");
-const SC_ADDER: TestSCAddress = TestSCAddress::new("adder");
-const CODE_EXPR: MxscPath = MxscPath::new("output/adder.mxsc.json");
+const OWNER_ADDRESS: TestAddress = TestAddress::new("owner");
+const ADDER_ADDRESS: TestSCAddress = TestSCAddress::new("adder");
+const CODE_PATH: MxscPath = MxscPath::new("output/adder.mxsc.json");
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
     blockchain.set_current_dir_from_workspace("contracts/examples/adder");
 
-    blockchain.register_contract(CODE_EXPR, adder::ContractBuilder);
+    blockchain.register_contract(CODE_PATH, adder::ContractBuilder);
     blockchain
 }
 
@@ -20,23 +20,23 @@ fn adder_blackbox() {
 
     world.start_trace();
 
-    world.account(OWNER).nonce(1);
+    world.account(OWNER_ADDRESS).nonce(1);
 
     let new_address = world
         .tx()
-        .from(OWNER)
+        .from(OWNER_ADDRESS)
         .typed(adder_proxy::AdderProxy)
         .init(5u32)
-        .code(CODE_EXPR)
-        .new_address(SC_ADDER)
+        .code(CODE_PATH)
+        .new_address(ADDER_ADDRESS)
         .returns(ReturnsNewAddress)
         .run();
 
-    assert_eq!(new_address, SC_ADDER.to_address());
+    assert_eq!(new_address, ADDER_ADDRESS.to_address());
 
     world
         .query()
-        .to(SC_ADDER)
+        .to(ADDER_ADDRESS)
         .typed(adder_proxy::AdderProxy)
         .sum()
         .returns(ExpectValue(5u32))
@@ -44,23 +44,25 @@ fn adder_blackbox() {
 
     world
         .tx()
-        .from(OWNER)
-        .to(SC_ADDER)
+        .from(OWNER_ADDRESS)
+        .to(ADDER_ADDRESS)
         .typed(adder_proxy::AdderProxy)
         .add(1u32)
         .run();
 
     world
         .query()
-        .to(SC_ADDER)
+        .to(ADDER_ADDRESS)
         .typed(adder_proxy::AdderProxy)
         .sum()
         .returns(ExpectValue(6u32))
         .run();
 
-    world.check_account(OWNER);
+    world.check_account(OWNER_ADDRESS);
 
-    world.check_account(SC_ADDER).check_storage("str:sum", "6");
+    world
+        .check_account(ADDER_ADDRESS)
+        .check_storage("str:sum", "6");
 
     world.write_scenario_trace("trace1.scen.json");
 }
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 0109329c4c..b46225a396 100644
--- a/contracts/examples/crowdfunding-esdt/tests/crowdfunding_esdt_blackbox_test.rs
+++ b/contracts/examples/crowdfunding-esdt/tests/crowdfunding_esdt_blackbox_test.rs
@@ -8,13 +8,13 @@ const CF_TOKEN_ID_EXPR: &str = "str:CROWD-123456";
 const FIRST_USER_ADDRESS: TestAddress = TestAddress::new("first-user");
 const OWNER_ADDRESS: TestAddress = TestAddress::new("owner");
 const SECOND_USER_ADDRESS: TestAddress = TestAddress::new("second-user");
-const CODE_EXPR: MxscPath = MxscPath::new("output/crowdfunding-esdt.mxsc.json");
-const SC_CROWDFUNDING_ESDT_EXPR: TestSCAddress = TestSCAddress::new("crowdfunding-esdt");
+const CODE_PATH: MxscPath = MxscPath::new("output/crowdfunding-esdt.mxsc.json");
+const CROWDFUNDING_ADDRESS: TestSCAddress = TestSCAddress::new("crowdfunding-esdt");
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
 
-    blockchain.register_contract(CODE_EXPR, crowdfunding_esdt::ContractBuilder);
+    blockchain.register_contract(CODE_PATH, crowdfunding_esdt::ContractBuilder);
     blockchain
 }
 
@@ -37,7 +37,7 @@ impl CrowdfundingESDTTestState {
             .nonce(1)
             .esdt_balance(CF_TOKEN_ID_EXPR, "1000");
 
-        world.new_address(OWNER_ADDRESS, 1, SC_CROWDFUNDING_ESDT_EXPR);
+        world.new_address(OWNER_ADDRESS, 1, CROWDFUNDING_ADDRESS);
 
         Self { world }
     }
@@ -52,7 +52,7 @@ impl CrowdfundingESDTTestState {
                 CF_DEADLINE,
                 EgldOrEsdtTokenIdentifier::esdt(CF_TOKEN_ID),
             )
-            .code(CODE_EXPR)
+            .code(CODE_PATH)
             .run();
     }
 
@@ -60,7 +60,7 @@ impl CrowdfundingESDTTestState {
         self.world
             .tx()
             .from(address)
-            .to(SC_CROWDFUNDING_ESDT_EXPR)
+            .to(CROWDFUNDING_ADDRESS)
             .typed(crowdfunding_esdt_proxy::CrowdfundingProxy)
             .fund()
             .egld_or_single_esdt(
@@ -74,7 +74,7 @@ impl CrowdfundingESDTTestState {
     fn check_deposit(&mut self, donor: TestAddress, amount: u64) {
         self.world
             .query()
-            .to(SC_CROWDFUNDING_ESDT_EXPR)
+            .to(CROWDFUNDING_ADDRESS)
             .typed(crowdfunding_esdt_proxy::CrowdfundingProxy)
             .deposit(donor.eval_to_array())
             .returns(ExpectValue(amount))
@@ -84,7 +84,7 @@ impl CrowdfundingESDTTestState {
     fn check_status(&mut self, expected_value: crowdfunding_esdt_proxy::Status) {
         self.world
             .query()
-            .to(SC_CROWDFUNDING_ESDT_EXPR)
+            .to(CROWDFUNDING_ADDRESS)
             .typed(crowdfunding_esdt_proxy::CrowdfundingProxy)
             .status()
             .returns(ExpectValue(expected_value))
@@ -95,7 +95,7 @@ impl CrowdfundingESDTTestState {
         self.world
             .tx()
             .from(address)
-            .to(SC_CROWDFUNDING_ESDT_EXPR)
+            .to(CROWDFUNDING_ADDRESS)
             .typed(crowdfunding_esdt_proxy::CrowdfundingProxy)
             .claim()
             .run();
@@ -139,7 +139,7 @@ fn test_sc_error() {
         .world
         .tx()
         .from(FIRST_USER_ADDRESS)
-        .to(SC_CROWDFUNDING_ESDT_EXPR)
+        .to(CROWDFUNDING_ADDRESS)
         .typed(crowdfunding_esdt_proxy::CrowdfundingProxy)
         .fund()
         .egld(1000)
@@ -172,7 +172,7 @@ fn test_successful_cf() {
         .world
         .tx()
         .from(FIRST_USER_ADDRESS)
-        .to(SC_CROWDFUNDING_ESDT_EXPR)
+        .to(CROWDFUNDING_ADDRESS)
         .typed(crowdfunding_esdt_proxy::CrowdfundingProxy)
         .claim()
         .with_result(ExpectError(4, "only owner can claim successful funding"))
diff --git a/contracts/examples/multisig/tests/multisig_blackbox_test.rs b/contracts/examples/multisig/tests/multisig_blackbox_test.rs
index 8d1e81f6cf..7444700e31 100644
--- a/contracts/examples/multisig/tests/multisig_blackbox_test.rs
+++ b/contracts/examples/multisig/tests/multisig_blackbox_test.rs
@@ -5,14 +5,14 @@ use adder::adder_proxy;
 use multisig::multisig_proxy;
 use num_bigint::BigUint;
 
-const SC_ADDER_EXPR: TestSCAddress = TestSCAddress::new("adder");
-const ADDER_OWNER_ADDRESS_EXPR: TestAddress = TestAddress::new("adder-owner");
-const ADDER_CODE_EXPR: MxscPath = MxscPath::new("test-contracts/adder.mxsc.json");
-const BOARD_MEMBER_ADDRESS_EXPR: TestAddress = TestAddress::new("board-member");
-const SC_MULTISIG_EXPR: TestSCAddress = TestSCAddress::new("multisig");
-const MULTISIG_CODE_EXPR: MxscPath = MxscPath::new("output/multisig.mxsc.json");
-const OWNER_ADDRESS_EXPR: TestAddress = TestAddress::new("owner");
-const PROPOSER_ADDRESS_EXPR: TestAddress = TestAddress::new("proposer");
+const ADDER_ADDRESS: TestSCAddress = TestSCAddress::new("adder");
+const ADDER_OWNER_ADDRESS: TestAddress = TestAddress::new("adder-owner");
+const ADDER_CODE_PATH: MxscPath = MxscPath::new("test-contracts/adder.mxsc.json");
+const BOARD_MEMBER_ADDRESS: TestAddress = TestAddress::new("board-member");
+const MULTISIG_ADDRESS: TestSCAddress = TestSCAddress::new("multisig");
+const MULTISIG_CODE_PATH: MxscPath = MxscPath::new("output/multisig.mxsc.json");
+const OWNER_ADDRESS: TestAddress = TestAddress::new("owner");
+const PROPOSER_ADDRESS: TestAddress = TestAddress::new("proposer");
 const PROPOSER_BALANCE_EXPR: &str = "100,000,000";
 const QUORUM_SIZE: usize = 1;
 
@@ -20,8 +20,8 @@ fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
     blockchain.set_current_dir_from_workspace("contracts/examples/multisig");
 
-    blockchain.register_contract(MULTISIG_CODE_EXPR, multisig::ContractBuilder);
-    blockchain.register_contract(ADDER_CODE_EXPR, adder::ContractBuilder);
+    blockchain.register_contract(MULTISIG_CODE_PATH, multisig::ContractBuilder);
+    blockchain.register_contract(ADDER_CODE_PATH, adder::ContractBuilder);
     blockchain
 }
 
@@ -34,45 +34,45 @@ impl MultisigTestState {
         let mut world = world();
 
         world
-            .account(OWNER_ADDRESS_EXPR)
+            .account(OWNER_ADDRESS)
             .nonce(1)
-            .account(PROPOSER_ADDRESS_EXPR)
+            .account(PROPOSER_ADDRESS)
             .nonce(1)
             .balance(PROPOSER_BALANCE_EXPR)
-            .account(BOARD_MEMBER_ADDRESS_EXPR)
+            .account(BOARD_MEMBER_ADDRESS)
             .nonce(1)
-            .account(ADDER_OWNER_ADDRESS_EXPR)
+            .account(ADDER_OWNER_ADDRESS)
             .nonce(1);
 
         Self { world }
     }
 
     fn deploy_multisig_contract(&mut self) -> &mut Self {
-        let board_members = MultiValueVec::from(vec![BOARD_MEMBER_ADDRESS_EXPR.eval_to_array()]);
+        let board_members = MultiValueVec::from(vec![BOARD_MEMBER_ADDRESS.eval_to_array()]);
 
         self.world
             .tx()
-            .from(OWNER_ADDRESS_EXPR)
+            .from(OWNER_ADDRESS)
             .typed(multisig_proxy::MultisigProxy)
             .init(QUORUM_SIZE, board_members)
-            .code(MULTISIG_CODE_EXPR)
-            .new_address(SC_MULTISIG_EXPR)
+            .code(MULTISIG_CODE_PATH)
+            .new_address(MULTISIG_ADDRESS)
             .run();
 
         let action_id: usize = self
             .world
             .tx()
-            .from(BOARD_MEMBER_ADDRESS_EXPR)
-            .to(SC_MULTISIG_EXPR)
+            .from(BOARD_MEMBER_ADDRESS)
+            .to(MULTISIG_ADDRESS)
             .typed(multisig_proxy::MultisigProxy)
-            .propose_add_proposer(PROPOSER_ADDRESS_EXPR.eval_to_array())
+            .propose_add_proposer(PROPOSER_ADDRESS.eval_to_array())
             .returns(ReturnsResult)
             .run();
 
         self.sign(action_id);
         self.perform(action_id);
 
-        self.expect_user_role(PROPOSER_ADDRESS_EXPR, multisig_proxy::UserRole::Proposer);
+        self.expect_user_role(PROPOSER_ADDRESS, multisig_proxy::UserRole::Proposer);
 
         self
     }
@@ -80,19 +80,19 @@ impl MultisigTestState {
     fn deploy_adder_contract(&mut self) {
         self.world
             .tx()
-            .from(ADDER_OWNER_ADDRESS_EXPR)
+            .from(ADDER_OWNER_ADDRESS)
             .typed(adder_proxy::AdderProxy)
             .init(5u64)
-            .code(ADDER_CODE_EXPR)
-            .new_address(SC_ADDER_EXPR)
+            .code(ADDER_CODE_PATH)
+            .new_address(ADDER_ADDRESS)
             .run();
     }
 
     fn propose_add_board_member(&mut self, board_member_address: TestAddress) -> usize {
         self.world
             .tx()
-            .from(PROPOSER_ADDRESS_EXPR)
-            .to(SC_MULTISIG_EXPR)
+            .from(PROPOSER_ADDRESS)
+            .to(MULTISIG_ADDRESS)
             .typed(multisig_proxy::MultisigProxy)
             .propose_add_board_member(board_member_address.eval_to_array())
             .returns(ReturnsResult)
@@ -102,8 +102,8 @@ impl MultisigTestState {
     fn propose_add_proposer(&mut self, proposer_address: TestAddress) -> usize {
         self.world
             .tx()
-            .from(PROPOSER_ADDRESS_EXPR)
-            .to(SC_MULTISIG_EXPR)
+            .from(PROPOSER_ADDRESS)
+            .to(MULTISIG_ADDRESS)
             .typed(multisig_proxy::MultisigProxy)
             .propose_add_proposer(proposer_address.eval_to_array())
             .returns(ReturnsResult)
@@ -113,8 +113,8 @@ impl MultisigTestState {
     fn propose_change_quorum(&mut self, new_quorum: usize) -> usize {
         self.world
             .tx()
-            .from(PROPOSER_ADDRESS_EXPR)
-            .to(SC_MULTISIG_EXPR)
+            .from(PROPOSER_ADDRESS)
+            .to(MULTISIG_ADDRESS)
             .typed(multisig_proxy::MultisigProxy)
             .propose_change_quorum(new_quorum)
             .returns(ReturnsResult)
@@ -129,8 +129,8 @@ impl MultisigTestState {
     ) -> usize {
         self.world
             .tx()
-            .from(PROPOSER_ADDRESS_EXPR)
-            .to(SC_MULTISIG_EXPR)
+            .from(PROPOSER_ADDRESS)
+            .to(MULTISIG_ADDRESS)
             .typed(multisig_proxy::MultisigProxy)
             .propose_transfer_execute(to.eval_to_array(), egld_amount, contract_call)
             .returns(ReturnsResult)
@@ -145,8 +145,8 @@ impl MultisigTestState {
     ) -> usize {
         self.world
             .tx()
-            .from(PROPOSER_ADDRESS_EXPR)
-            .to(SC_MULTISIG_EXPR)
+            .from(PROPOSER_ADDRESS)
+            .to(MULTISIG_ADDRESS)
             .typed(multisig_proxy::MultisigProxy)
             .propose_async_call(to.eval_to_array(), egld_amount, contract_call)
             .returns(ReturnsResult)
@@ -156,8 +156,8 @@ impl MultisigTestState {
     fn propose_remove_user(&mut self, user_address: TestAddress) -> usize {
         self.world
             .tx()
-            .from(PROPOSER_ADDRESS_EXPR)
-            .to(SC_MULTISIG_EXPR)
+            .from(PROPOSER_ADDRESS)
+            .to(MULTISIG_ADDRESS)
             .typed(multisig_proxy::MultisigProxy)
             .propose_remove_user(user_address.eval_to_array())
             .returns(ReturnsResult)
@@ -173,8 +173,8 @@ impl MultisigTestState {
     ) -> usize {
         self.world
             .tx()
-            .from(PROPOSER_ADDRESS_EXPR)
-            .to(SC_MULTISIG_EXPR)
+            .from(PROPOSER_ADDRESS)
+            .to(MULTISIG_ADDRESS)
             .typed(multisig_proxy::MultisigProxy)
             .propose_sc_deploy_from_source(amount, source.eval_to_array(), code_metadata, arguments)
             .returns(ReturnsResult)
@@ -191,8 +191,8 @@ impl MultisigTestState {
     ) -> usize {
         self.world
             .tx()
-            .from(PROPOSER_ADDRESS_EXPR)
-            .to(SC_MULTISIG_EXPR)
+            .from(PROPOSER_ADDRESS)
+            .to(MULTISIG_ADDRESS)
             .typed(multisig_proxy::MultisigProxy)
             .propose_sc_upgrade_from_source(
                 sc_address.eval_to_array(),
@@ -208,8 +208,8 @@ impl MultisigTestState {
     fn perform(&mut self, action_id: usize) {
         self.world
             .tx()
-            .from(BOARD_MEMBER_ADDRESS_EXPR)
-            .to(SC_MULTISIG_EXPR)
+            .from(BOARD_MEMBER_ADDRESS)
+            .to(MULTISIG_ADDRESS)
             .typed(multisig_proxy::MultisigProxy)
             .perform_action_endpoint(action_id)
             .run();
@@ -218,8 +218,8 @@ impl MultisigTestState {
     fn perform_and_expect_err(&mut self, action_id: usize, err_message: &str) {
         self.world
             .tx()
-            .from(BOARD_MEMBER_ADDRESS_EXPR)
-            .to(SC_MULTISIG_EXPR)
+            .from(BOARD_MEMBER_ADDRESS)
+            .to(MULTISIG_ADDRESS)
             .typed(multisig_proxy::MultisigProxy)
             .perform_action_endpoint(action_id)
             .with_result(ExpectError(4, err_message))
@@ -229,8 +229,8 @@ impl MultisigTestState {
     fn sign(&mut self, action_id: usize) {
         self.world
             .tx()
-            .from(BOARD_MEMBER_ADDRESS_EXPR)
-            .to(SC_MULTISIG_EXPR)
+            .from(BOARD_MEMBER_ADDRESS)
+            .to(MULTISIG_ADDRESS)
             .typed(multisig_proxy::MultisigProxy)
             .sign(action_id)
             .run();
@@ -243,7 +243,7 @@ impl MultisigTestState {
     ) {
         self.world
             .query()
-            .to(SC_MULTISIG_EXPR)
+            .to(MULTISIG_ADDRESS)
             .typed(multisig_proxy::MultisigProxy)
             .user_role(user.eval_to_array())
             .returns(ExpectValue(expected_user_role))
@@ -267,7 +267,7 @@ fn test_add_board_member() {
     state.perform(action_id);
 
     let expected_value = MultiValueVec::from(vec![
-        BOARD_MEMBER_ADDRESS_EXPR.eval_to_array(),
+        BOARD_MEMBER_ADDRESS.eval_to_array(),
         new_board_member_expr.eval_to_array(),
     ]);
 
@@ -275,7 +275,7 @@ fn test_add_board_member() {
     state
         .world
         .query()
-        .to(SC_MULTISIG_EXPR)
+        .to(MULTISIG_ADDRESS)
         .typed(multisig_proxy::MultisigProxy)
         .get_all_board_members()
         .returns(ExpectValue(expected_value))
@@ -303,13 +303,13 @@ fn test_add_proposer() {
     );
 
     let expected_value = MultiValueVec::from(vec![
-        PROPOSER_ADDRESS_EXPR.eval_to_array(),
+        PROPOSER_ADDRESS.eval_to_array(),
         new_proposer_address_expr.eval_to_array(),
     ]);
     state
         .world
         .query()
-        .to(SC_MULTISIG_EXPR)
+        .to(MULTISIG_ADDRESS)
         .typed(multisig_proxy::MultisigProxy)
         .get_all_proposers()
         .returns(ExpectValue(expected_value))
@@ -321,17 +321,17 @@ fn test_remove_proposer() {
     let mut state = MultisigTestState::new();
     state.deploy_multisig_contract();
 
-    state.expect_user_role(PROPOSER_ADDRESS_EXPR, multisig_proxy::UserRole::Proposer);
+    state.expect_user_role(PROPOSER_ADDRESS, multisig_proxy::UserRole::Proposer);
 
-    let action_id = state.propose_remove_user(PROPOSER_ADDRESS_EXPR);
+    let action_id = state.propose_remove_user(PROPOSER_ADDRESS);
     state.sign(action_id);
     state.perform(action_id);
 
-    state.expect_user_role(PROPOSER_ADDRESS_EXPR, multisig_proxy::UserRole::None);
+    state.expect_user_role(PROPOSER_ADDRESS, multisig_proxy::UserRole::None);
     state
         .world
         .query()
-        .to(SC_MULTISIG_EXPR)
+        .to(MULTISIG_ADDRESS)
         .typed(multisig_proxy::MultisigProxy)
         .get_all_proposers()
         .returns(ExpectValue(MultiValueVec::<Address>::new()))
@@ -343,7 +343,7 @@ fn test_try_remove_all_board_members() {
     let mut state = MultisigTestState::new();
     state.deploy_multisig_contract();
 
-    let action_id = state.propose_remove_user(BOARD_MEMBER_ADDRESS_EXPR);
+    let action_id = state.propose_remove_user(BOARD_MEMBER_ADDRESS);
     state.sign(action_id);
     state.perform_and_expect_err(action_id, "quorum cannot exceed board size")
 }
@@ -363,8 +363,8 @@ fn test_change_quorum() {
     state
         .world
         .tx()
-        .from(BOARD_MEMBER_ADDRESS_EXPR)
-        .to(SC_MULTISIG_EXPR)
+        .from(BOARD_MEMBER_ADDRESS)
+        .to(MULTISIG_ADDRESS)
         .typed(multisig_proxy::MultisigProxy)
         .discard_action(action_id)
         .with_result(ExpectError(
@@ -377,8 +377,8 @@ fn test_change_quorum() {
     state
         .world
         .tx()
-        .from(BOARD_MEMBER_ADDRESS_EXPR)
-        .to(SC_MULTISIG_EXPR)
+        .from(BOARD_MEMBER_ADDRESS)
+        .to(MULTISIG_ADDRESS)
         .typed(multisig_proxy::MultisigProxy)
         .unsign(action_id)
         .run();
@@ -386,8 +386,8 @@ fn test_change_quorum() {
     state
         .world
         .tx()
-        .from(BOARD_MEMBER_ADDRESS_EXPR)
-        .to(SC_MULTISIG_EXPR)
+        .from(BOARD_MEMBER_ADDRESS)
+        .to(MULTISIG_ADDRESS)
         .typed(multisig_proxy::MultisigProxy)
         .discard_action(action_id)
         .run();
@@ -396,8 +396,8 @@ fn test_change_quorum() {
     state
         .world
         .tx()
-        .from(BOARD_MEMBER_ADDRESS_EXPR)
-        .to(SC_MULTISIG_EXPR)
+        .from(BOARD_MEMBER_ADDRESS)
+        .to(MULTISIG_ADDRESS)
         .typed(multisig_proxy::MultisigProxy)
         .sign(action_id)
         .with_result(ExpectError(4, "action does not exist"))
@@ -431,8 +431,8 @@ fn test_transfer_execute_to_user() {
     state
         .world
         .tx()
-        .from(PROPOSER_ADDRESS_EXPR)
-        .to(SC_MULTISIG_EXPR)
+        .from(PROPOSER_ADDRESS)
+        .to(MULTISIG_ADDRESS)
         .typed(multisig_proxy::MultisigProxy)
         .deposit()
         .egld(amount)
@@ -440,15 +440,15 @@ fn test_transfer_execute_to_user() {
 
     state
         .world
-        .check_account(SC_MULTISIG_EXPR)
+        .check_account(MULTISIG_ADDRESS)
         .balance(amount.to_string().as_str());
 
     // failed attempt
     state
         .world
         .tx()
-        .from(PROPOSER_ADDRESS_EXPR)
-        .to(SC_MULTISIG_EXPR)
+        .from(PROPOSER_ADDRESS)
+        .to(MULTISIG_ADDRESS)
         .typed(multisig_proxy::MultisigProxy)
         .propose_transfer_execute(
             new_user_address_expr.eval_to_array(),
@@ -462,8 +462,8 @@ fn test_transfer_execute_to_user() {
     let action_id = state
         .world
         .tx()
-        .from(PROPOSER_ADDRESS_EXPR)
-        .to(SC_MULTISIG_EXPR)
+        .from(PROPOSER_ADDRESS)
+        .to(MULTISIG_ADDRESS)
         .typed(multisig_proxy::MultisigProxy)
         .propose_transfer_execute(
             new_user_address_expr.eval_to_array(),
@@ -493,14 +493,14 @@ fn test_transfer_execute_sc_all() {
         .add(5u64)
         .into_function_call();
 
-    let action_id = state.propose_transfer_execute(SC_ADDER_EXPR, 0u64, adder_call);
+    let action_id = state.propose_transfer_execute(ADDER_ADDRESS, 0u64, adder_call);
     state.sign(action_id);
     state.perform(action_id);
 
     state
         .world
         .query()
-        .to(SC_ADDER_EXPR)
+        .to(ADDER_ADDRESS)
         .typed(adder_proxy::AdderProxy)
         .sum()
         .with_result(ExpectValue(BigUint::from(10u64)))
@@ -519,14 +519,14 @@ fn test_async_call_to_sc() {
         .add(5u64)
         .into_function_call();
 
-    let action_id = state.propose_async_call(SC_ADDER_EXPR, 0u64, adder_call);
+    let action_id = state.propose_async_call(ADDER_ADDRESS, 0u64, adder_call);
     state.sign(action_id);
     state.perform(action_id);
 
     state
         .world
         .query()
-        .to(SC_ADDER_EXPR)
+        .to(ADDER_ADDRESS)
         .typed(adder_proxy::AdderProxy)
         .sum()
         .returns(ExpectValue(10u64))
@@ -542,11 +542,11 @@ fn test_deploy_and_upgrade_from_source() {
 
     state
         .world
-        .new_address(SC_MULTISIG_EXPR, 0, new_adder_address_expr);
+        .new_address(MULTISIG_ADDRESS, 0, new_adder_address_expr);
 
     let action_id = state.propose_sc_deploy_from_source(
         0u64,
-        SC_ADDER_EXPR,
+        ADDER_ADDRESS,
         CodeMetadata::all(),
         MultiValueVec::from([top_encode_to_vec_u8_or_panic(&5u64)]),
     );
@@ -554,8 +554,8 @@ fn test_deploy_and_upgrade_from_source() {
     state
         .world
         .tx()
-        .from(BOARD_MEMBER_ADDRESS_EXPR)
-        .to(SC_MULTISIG_EXPR)
+        .from(BOARD_MEMBER_ADDRESS)
+        .to(MULTISIG_ADDRESS)
         .typed(multisig_proxy::MultisigProxy)
         .perform_action_endpoint(action_id)
         .returns(ExpectValue(OptionalValue::Some(
@@ -566,7 +566,7 @@ fn test_deploy_and_upgrade_from_source() {
     let adder_call = state
         .world
         .tx()
-        .to(SC_ADDER_EXPR)
+        .to(ADDER_ADDRESS)
         .typed(adder_proxy::AdderProxy)
         .add(5u64)
         .into_function_call();
@@ -584,26 +584,26 @@ fn test_deploy_and_upgrade_from_source() {
         .returns(ExpectValue(BigUint::from(10u64)))
         .run();
 
-    let factorial_address_expr: TestSCAddress = TestSCAddress::new("factorial");
-    let factorial_path_expr: MxscPath = MxscPath::new("test-contracts/factorial.mxsc.json");
+    let factorial_address: TestSCAddress = TestSCAddress::new("factorial");
+    let factorial_path: MxscPath = MxscPath::new("test-contracts/factorial.mxsc.json");
 
     let factorial_code = state
         .world
-        .code_expression(factorial_path_expr.eval_to_expr().as_str());
+        .code_expression(factorial_path.eval_to_expr().as_str());
 
     state
         .world
-        .register_contract(factorial_path_expr, factorial::ContractBuilder);
+        .register_contract(factorial_path, factorial::ContractBuilder);
 
     state
         .world
-        .account(factorial_address_expr)
+        .account(factorial_address)
         .code(factorial_code.clone());
 
     let action_id = state.propose_sc_upgrade_from_source(
-        SC_ADDER_EXPR,
+        ADDER_ADDRESS,
         0u64,
-        factorial_address_expr,
+        factorial_address,
         CodeMetadata::all(),
         MultiValueVec::new(),
     );
@@ -612,6 +612,6 @@ fn test_deploy_and_upgrade_from_source() {
 
     state
         .world
-        .check_account(SC_ADDER_EXPR)
-        .code(factorial_path_expr.eval_to_expr().as_str());
+        .check_account(ADDER_ADDRESS)
+        .code(factorial_path.eval_to_expr().as_str());
 }
diff --git a/contracts/examples/rewards-distribution/tests/rewards_distribution_integration_test.rs b/contracts/examples/rewards-distribution/tests/rewards_distribution_integration_test.rs
index d540805eaf..8acc4bada8 100644
--- a/contracts/examples/rewards-distribution/tests/rewards_distribution_integration_test.rs
+++ b/contracts/examples/rewards-distribution/tests/rewards_distribution_integration_test.rs
@@ -12,24 +12,23 @@ use rewards_distribution::{
 const NFT_TOKEN_ID: &[u8] = b"NFT-123456";
 const NFT_TOKEN_ID_EXPR: &str = "str:NFT-123456";
 
-const ALICE_ADDRESS_EXPR: TestAddress = TestAddress::new("alice");
-const OWNER_ADDRESS_EXPR: TestAddress = TestAddress::new("owner");
-const REWARDS_DISTRIBUTION_ADDRESS_EXPR: TestSCAddress = TestSCAddress::new("rewards-distribution");
-const REWARDS_DISTRIBUTION_PATH_EXPR: MxscPath =
-    MxscPath::new("output/rewards-distribution.mxsc.json");
-const SEED_NFT_MINTER_ADDRESS_EXPR: TestSCAddress = TestSCAddress::new("seed-nft-minter");
-const SEED_NFT_MINTER_PATH_EXPR: MxscPath =
+const ALICE_ADDRESS: TestAddress = TestAddress::new("alice");
+const OWNER_ADDRESS: TestAddress = TestAddress::new("owner");
+const REWARDS_DISTRIBUTION_ADDRESS: TestSCAddress = TestSCAddress::new("rewards-distribution");
+const REWARDS_DISTRIBUTION_PATH: MxscPath = MxscPath::new("output/rewards-distribution.mxsc.json");
+const SEED_NFT_MINTER_ADDRESS: TestSCAddress = TestSCAddress::new("seed-nft-minter");
+const SEED_NFT_MINTER_PATH: MxscPath =
     MxscPath::new("../seed-nft-minter/output/seed-nft-minter.mxsc.json");
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
 
     blockchain.register_contract(
-        REWARDS_DISTRIBUTION_PATH_EXPR.eval_to_expr().as_str(),
+        REWARDS_DISTRIBUTION_PATH.eval_to_expr().as_str(),
         rewards_distribution::ContractBuilder,
     );
     blockchain.register_contract(
-        SEED_NFT_MINTER_PATH_EXPR.eval_to_expr().as_str(),
+        SEED_NFT_MINTER_PATH.eval_to_expr().as_str(),
         mock_seed_nft_minter::ContractBuilder,
     );
     blockchain
@@ -44,10 +43,10 @@ impl RewardsDistributionTestState {
     fn new() -> Self {
         let mut world = world();
 
-        world.account(OWNER_ADDRESS_EXPR).nonce(1);
+        world.account(OWNER_ADDRESS).nonce(1);
 
         let rewards_distribution_whitebox = WhiteboxContract::new(
-            REWARDS_DISTRIBUTION_ADDRESS_EXPR,
+            REWARDS_DISTRIBUTION_ADDRESS,
             rewards_distribution::contract_obj,
         );
 
@@ -60,16 +59,16 @@ impl RewardsDistributionTestState {
     fn deploy_seed_nft_minter_contract(&mut self) -> &mut Self {
         self.world
             .tx()
-            .from(OWNER_ADDRESS_EXPR)
+            .from(OWNER_ADDRESS)
             .typed(mock_seed_nft_minter_proxy::MockSeedNftMinterProxy)
             .init(TokenIdentifier::from_esdt_bytes(NFT_TOKEN_ID))
-            .code(SEED_NFT_MINTER_PATH_EXPR)
+            .code(SEED_NFT_MINTER_PATH)
             .run();
 
         self.world
             .tx()
-            .from(OWNER_ADDRESS_EXPR)
-            .to(SEED_NFT_MINTER_ADDRESS_EXPR)
+            .from(OWNER_ADDRESS)
+            .to(SEED_NFT_MINTER_ADDRESS)
             .typed(mock_seed_nft_minter_proxy::MockSeedNftMinterProxy)
             .set_nft_count(10_000u64)
             .run();
@@ -95,10 +94,10 @@ impl RewardsDistributionTestState {
         }
         self.world
             .tx()
-            .from(OWNER_ADDRESS_EXPR)
+            .from(OWNER_ADDRESS)
             .typed(rewards_distribution_proxy::RewardsDistributionProxy)
-            .init(SEED_NFT_MINTER_ADDRESS_EXPR.to_address(), brackets)
-            .code(REWARDS_DISTRIBUTION_PATH_EXPR)
+            .init(SEED_NFT_MINTER_ADDRESS.to_address(), brackets)
+            .code(REWARDS_DISTRIBUTION_PATH)
             .run();
 
         self
@@ -111,18 +110,18 @@ fn test_compute_brackets() {
 
     let rewards_distribution_code = state
         .world
-        .code_expression(REWARDS_DISTRIBUTION_PATH_EXPR.eval_to_expr().as_str());
+        .code_expression(REWARDS_DISTRIBUTION_PATH.eval_to_expr().as_str());
 
     state
         .world
-        .account(REWARDS_DISTRIBUTION_ADDRESS_EXPR)
+        .account(REWARDS_DISTRIBUTION_ADDRESS)
         .nonce(1)
-        .owner(OWNER_ADDRESS_EXPR)
+        .owner(OWNER_ADDRESS)
         .code(rewards_distribution_code);
 
     state.world.whitebox_call(
         &state.rewards_distribution_whitebox,
-        ScCallStep::new().from(OWNER_ADDRESS_EXPR),
+        ScCallStep::new().from(OWNER_ADDRESS),
         |sc| {
             let brackets = utils::to_brackets(&[
                 (10, 2_000),
@@ -168,7 +167,7 @@ fn test_raffle_and_claim() {
     {
         let mut account_setter = state
             .world
-            .account(ALICE_ADDRESS_EXPR)
+            .account(ALICE_ADDRESS)
             .nonce(1)
             .balance("2_070_000_000");
         for nft_nonce in nft_nonces {
@@ -183,8 +182,8 @@ fn test_raffle_and_claim() {
 
     state.world.set_state_step(
         SetStateStep::new()
-            .new_address(OWNER_ADDRESS_EXPR, 1, SEED_NFT_MINTER_ADDRESS_EXPR)
-            .new_address(OWNER_ADDRESS_EXPR, 3, REWARDS_DISTRIBUTION_ADDRESS_EXPR),
+            .new_address(OWNER_ADDRESS, 1, SEED_NFT_MINTER_ADDRESS)
+            .new_address(OWNER_ADDRESS, 3, REWARDS_DISTRIBUTION_ADDRESS),
     );
 
     state
@@ -195,8 +194,8 @@ fn test_raffle_and_claim() {
     state
         .world
         .tx()
-        .from(ALICE_ADDRESS_EXPR)
-        .to(REWARDS_DISTRIBUTION_ADDRESS_EXPR)
+        .from(ALICE_ADDRESS)
+        .to(REWARDS_DISTRIBUTION_ADDRESS)
         .typed(rewards_distribution_proxy::RewardsDistributionProxy)
         .deposit_royalties()
         .egld(2_070_000_000)
@@ -206,8 +205,8 @@ fn test_raffle_and_claim() {
     state
         .world
         .tx()
-        .from(ALICE_ADDRESS_EXPR)
-        .to(REWARDS_DISTRIBUTION_ADDRESS_EXPR)
+        .from(ALICE_ADDRESS)
+        .to(REWARDS_DISTRIBUTION_ADDRESS)
         .typed(rewards_distribution_proxy::RewardsDistributionProxy)
         .raffle()
         .tx_hash([0u8; 32]) // blockchain rng is deterministic, so we can use a fixed hash
@@ -219,8 +218,8 @@ fn test_raffle_and_claim() {
         let reward = state
             .world
             .tx()
-            .from(ALICE_ADDRESS_EXPR)
-            .to(REWARDS_DISTRIBUTION_ADDRESS_EXPR)
+            .from(ALICE_ADDRESS)
+            .to(REWARDS_DISTRIBUTION_ADDRESS)
             .typed(rewards_distribution_proxy::RewardsDistributionProxy)
             .compute_claimable_amount(0u64, &EgldOrEsdtTokenIdentifier::egld(), 0u64, nonce)
             .returns(ReturnsResult)
@@ -260,8 +259,8 @@ fn test_raffle_and_claim() {
         state
             .world
             .tx()
-            .from(ALICE_ADDRESS_EXPR)
-            .to(REWARDS_DISTRIBUTION_ADDRESS_EXPR)
+            .from(ALICE_ADDRESS)
+            .to(REWARDS_DISTRIBUTION_ADDRESS)
             .typed(rewards_distribution_proxy::RewardsDistributionProxy)
             .compute_claimable_amount(0u64, &EgldOrEsdtTokenIdentifier::egld(), 0u64, nonce)
             .returns(ExpectValue(expected_reward))
@@ -277,8 +276,8 @@ fn test_raffle_and_claim() {
     state
         .world
         .tx()
-        .from(ALICE_ADDRESS_EXPR)
-        .to(REWARDS_DISTRIBUTION_ADDRESS_EXPR)
+        .from(ALICE_ADDRESS)
+        .to(REWARDS_DISTRIBUTION_ADDRESS)
         .typed(rewards_distribution_proxy::RewardsDistributionProxy)
         .claim_rewards(0u64, 0u64, reward_tokens)
         .with_multi_token_transfer(nft_payments.clone())
@@ -289,7 +288,7 @@ fn test_raffle_and_claim() {
         state
             .world
             .query()
-            .to(REWARDS_DISTRIBUTION_ADDRESS_EXPR)
+            .to(REWARDS_DISTRIBUTION_ADDRESS)
             .typed(rewards_distribution_proxy::RewardsDistributionProxy)
             .was_claimed(0u64, &EgldOrEsdtTokenIdentifier::egld(), 0u64, nonce)
             .returns(ExpectValue(true))
@@ -302,7 +301,7 @@ fn test_raffle_and_claim() {
 
     state
         .world
-        .check_account(ALICE_ADDRESS_EXPR)
+        .check_account(ALICE_ADDRESS)
         .balance(balance_expr);
 
     // a second claim with the same nfts should succeed, but return no more rewards
@@ -314,8 +313,8 @@ fn test_raffle_and_claim() {
     state
         .world
         .tx()
-        .from(ALICE_ADDRESS_EXPR)
-        .to(REWARDS_DISTRIBUTION_ADDRESS_EXPR)
+        .from(ALICE_ADDRESS)
+        .to(REWARDS_DISTRIBUTION_ADDRESS)
         .typed(rewards_distribution_proxy::RewardsDistributionProxy)
         .claim_rewards(0u64, 0u64, reward_tokens)
         .with_multi_token_transfer(nft_payments)
@@ -323,6 +322,6 @@ fn test_raffle_and_claim() {
 
     state
         .world
-        .check_account(ALICE_ADDRESS_EXPR)
+        .check_account(ALICE_ADDRESS)
         .balance(balance_expr);
 }
diff --git a/contracts/feature-tests/panic-message-features/tests/pmf_blackbox_test.rs b/contracts/feature-tests/panic-message-features/tests/pmf_blackbox_test.rs
index 5dbd41fc01..e8ad3c2a33 100644
--- a/contracts/feature-tests/panic-message-features/tests/pmf_blackbox_test.rs
+++ b/contracts/feature-tests/panic-message-features/tests/pmf_blackbox_test.rs
@@ -2,7 +2,7 @@ mod pmf_proxy;
 
 use multiversx_sc_scenario::imports::*;
 
-const OWNER: TestAddress = TestAddress::new("owner");
+const OWNER_ADDRESS: TestAddress = TestAddress::new("owner");
 const SC_PMF: TestSCAddress = TestSCAddress::new("pmf");
 const CODE_EXPR: &str = "mxsc:output/panic-message-features.mxsc.json";
 
@@ -20,7 +20,7 @@ fn setup() -> ScenarioWorld {
 
     world.set_state_step(
         SetStateStep::new()
-            .put_account(OWNER, Account::new().nonce(1))
+            .put_account(OWNER_ADDRESS, Account::new().nonce(1))
             .put_account(SC_PMF, Account::new().code(code)),
     );
 
@@ -34,7 +34,7 @@ fn tx_returns_error_test() {
 
     let (status, message) = world
         .tx()
-        .from(OWNER)
+        .from(OWNER_ADDRESS)
         .to(SC_PMF)
         .typed(pmf_proxy::PanicMessageFeaturesProxy)
         .sc_panic()
@@ -69,7 +69,7 @@ fn tx_expect_error_test() {
 
     world
         .tx()
-        .from(OWNER)
+        .from(OWNER_ADDRESS)
         .to(SC_PMF)
         .typed(pmf_proxy::PanicMessageFeaturesProxy)
         .sc_panic()
diff --git a/contracts/feature-tests/scenario-tester/tests/st_blackbox_test.rs b/contracts/feature-tests/scenario-tester/tests/st_blackbox_test.rs
index db1e011dcc..0c62e96110 100644
--- a/contracts/feature-tests/scenario-tester/tests/st_blackbox_test.rs
+++ b/contracts/feature-tests/scenario-tester/tests/st_blackbox_test.rs
@@ -5,10 +5,10 @@ use scenario_tester::*;
 
 const SC_SCENARIO_TESTER_PATH_EXPR: &str = "mxsc:output/scenario-tester.mxsc.json";
 
-const OWNER: TestAddress = TestAddress::new("owner");
-const OTHER: TestAddress = TestAddress::new("other");
-const SC_SCENARIO_TESTER: TestSCAddress = TestSCAddress::new("scenario-tester");
-const CODE_EXPR: MxscPath = MxscPath::new("output/scenario-tester.mxsc.json");
+const OWNER_ADDRESS: TestAddress = TestAddress::new("owner");
+const OTHER_ADDRESS: TestAddress = TestAddress::new("other");
+const SC_SCENARIO_TESTER_ADDRESS: TestSCAddress = TestSCAddress::new("scenario-tester");
+const CODE_PATH: MxscPath = MxscPath::new("output/scenario-tester.mxsc.json");
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
@@ -55,17 +55,17 @@ fn st_blackbox() {
 
     let new_address = world
         .tx()
-        .from(OWNER)
+        .from(OWNER_ADDRESS)
         .typed(scenario_tester_proxy::ScenarioTesterProxy)
         .init(5u32)
-        .code(CODE_EXPR)
+        .code(CODE_PATH)
         .returns(ReturnsNewAddress)
         .run();
     assert_eq!(new_address, st_contract.to_address());
 
     let value = world
         .query()
-        .to(SC_SCENARIO_TESTER)
+        .to(SC_SCENARIO_TESTER_ADDRESS)
         .typed(scenario_tester_proxy::ScenarioTesterProxy)
         .sum()
         .returns(ReturnsResultConv::<BigUint>::new())
@@ -74,8 +74,8 @@ fn st_blackbox() {
 
     world
         .tx()
-        .from(OWNER)
-        .to(SC_SCENARIO_TESTER)
+        .from(OWNER_ADDRESS)
+        .to(SC_SCENARIO_TESTER_ADDRESS)
         .typed(scenario_tester_proxy::ScenarioTesterProxy)
         .add(1u32)
         .run();
@@ -90,8 +90,8 @@ fn st_blackbox() {
 
     world
         .tx()
-        .from(OTHER)
-        .to(SC_SCENARIO_TESTER)
+        .from(OTHER_ADDRESS)
+        .to(SC_SCENARIO_TESTER_ADDRESS)
         .typed(scenario_tester_proxy::ScenarioTesterProxy)
         .add(1u32)
         .run();

From 796af0984d69aa0100af336ac59e762677ec7f31 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Fri, 26 Apr 2024 18:24:17 +0300
Subject: [PATCH 0780/1254] set local roles

---
 .../src/facade/world_tx/scenario_set_state.rs | 29 ++++++++++++---
 .../scenario_set_account.rs                   |  1 -
 .../whitebox_legacy/contract_obj_wrapper.rs   | 36 ++-----------------
 3 files changed, 26 insertions(+), 40 deletions(-)

diff --git a/framework/scenario/src/facade/world_tx/scenario_set_state.rs b/framework/scenario/src/facade/world_tx/scenario_set_state.rs
index 3a8e5d2b30..3c9575ad5c 100644
--- a/framework/scenario/src/facade/world_tx/scenario_set_state.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_set_state.rs
@@ -4,15 +4,12 @@ mod scenario_set_new_address;
 
 use crate::{
     scenario::ScenarioRunner,
-    scenario_model::{
-        AddressKey, AddressValue, BigUintValue, BytesKey, BytesValue, NewAddress, SetStateStep,
-        U64Value,
-    },
+    scenario_model::{AddressKey, AddressValue, BigUintValue, NewAddress, SetStateStep, U64Value},
     ScenarioWorld,
 };
 
 use multiversx_chain_vm::world_mock::EsdtInstanceMetadata;
-use multiversx_sc::codec::TopEncode;
+use multiversx_sc::{codec::TopEncode, types::EsdtLocalRole};
 use scenario_set_account::AccountItem;
 use scenario_set_block::BlockItem;
 use scenario_set_new_address::NewAddressItem;
@@ -144,6 +141,28 @@ impl ScenarioWorld {
         }
     }
 
+    pub fn set_esdt_local_roles<A: Copy>(
+        &mut self,
+        address: A,
+        token_id: &[u8],
+        roles: &[EsdtLocalRole],
+    ) where
+        AddressKey: From<A>,
+    {
+        let accounts = &mut self.get_mut_state().accounts;
+        for (vm_address, account) in accounts.iter_mut() {
+            if vm_address == &AddressKey::from(address).to_vm_address() {
+                account.esdt.set_roles(
+                    token_id.to_vec(),
+                    roles
+                        .iter()
+                        .map(|role| role.as_role_name().to_vec())
+                        .collect(),
+                );
+            }
+        }
+    }
+
     pub fn current_block(&mut self) -> SetStateBuilder<'_, BlockItem> {
         self.empty_builder().current_block()
     }
diff --git a/framework/scenario/src/facade/world_tx/scenario_set_state/scenario_set_account.rs b/framework/scenario/src/facade/world_tx/scenario_set_state/scenario_set_account.rs
index a695fa155a..d985cbed66 100644
--- a/framework/scenario/src/facade/world_tx/scenario_set_state/scenario_set_account.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_set_state/scenario_set_account.rs
@@ -179,5 +179,4 @@ impl<'w> SetStateBuilder<'w, AccountItem> {
         self.item.account.owner = Some(AddressValue::from(owner_expr));
         self
     }
-
 }
diff --git a/framework/scenario/src/whitebox_legacy/contract_obj_wrapper.rs b/framework/scenario/src/whitebox_legacy/contract_obj_wrapper.rs
index e7503cdcd6..26ee6bc1d4 100644
--- a/framework/scenario/src/whitebox_legacy/contract_obj_wrapper.rs
+++ b/framework/scenario/src/whitebox_legacy/contract_obj_wrapper.rs
@@ -287,15 +287,7 @@ impl BlockchainStateWrapper {
         _sc_identifier: Option<Vec<u8>>,
         _sc_mandos_path_expr: Option<Vec<u8>>,
     ) {
-        let vm_address = to_vm_address(address);
-        if self.world.get_state().account_exists(&vm_address) {
-            panic!("Address already used: {:?}", address_to_hex(address));
-        }
-
-        let account = Account::new().balance(egld_balance);
-
-        self.world
-            .set_state_step(SetStateStep::new().put_account(address, account));
+        self.world.create_account_raw(address, egld_balance);
     }
 
     // Has to be used before perfoming a deploy from a SC
@@ -411,22 +403,7 @@ impl BlockchainStateWrapper {
         token_id: &[u8],
         roles: &[EsdtLocalRole],
     ) {
-        let vm_address = to_vm_address(address);
-        match self.world.get_mut_state().accounts.get_mut(&vm_address) {
-            Some(acc) => {
-                let mut roles_raw = Vec::new();
-                for role in roles {
-                    roles_raw.push(role.as_role_name().to_vec());
-                }
-                acc.esdt.set_roles(token_id.to_vec(), roles_raw);
-
-                self.add_mandos_set_account(address);
-            },
-            None => panic!(
-                "set_esdt_local_roles: Account {:?} does not exist",
-                address_to_hex(address)
-            ),
-        }
+        self.world.set_esdt_local_roles(address, token_id, roles);
     }
 
     pub fn set_block_epoch(&mut self, block_epoch: u64) {
@@ -796,15 +773,6 @@ fn address_to_hex(address: &Address) -> String {
     hex::encode(address.as_bytes())
 }
 
-// fn serialize_attributes<T: TopEncode>(attributes: &T) -> Vec<u8> {
-//     let mut serialized_attributes = Vec::new();
-//     if let Result::Err(err) = attributes.top_encode(&mut serialized_attributes) {
-//         panic!("Failed to encode attributes: {err:?}")
-//     }
-
-//     serialized_attributes
-// }
-
 fn print_token_balance_raw(
     token_nonce: u64,
     token_balance: &num_bigint::BigUint,

From 5a2cae8355985af209b55fae08b4293b35c7384e Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 26 Apr 2024 18:57:40 +0300
Subject: [PATCH 0781/1254] set state via AnnotatedValue - account address

---
 .../tests/price_aggregator_blackbox_test.rs   | 24 +++++------
 .../scenario-tester/tests/st_blackbox_test.rs | 40 +++++++++----------
 .../facade/world_tx/scenario_check_state.rs   | 24 +++++++----
 .../src/facade/world_tx/scenario_set_state.rs | 38 +++++++++++-------
 .../scenario/tx_to_step/step_annotation.rs    | 12 ++++++
 5 files changed, 80 insertions(+), 58 deletions(-)

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 5eca754439..05c9b161f7 100644
--- a/contracts/core/price-aggregator/tests/price_aggregator_blackbox_test.rs
+++ b/contracts/core/price-aggregator/tests/price_aggregator_blackbox_test.rs
@@ -10,9 +10,6 @@ mod price_aggregator_proxy;
 const DECIMALS: u8 = 0;
 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 = "mxsc:output/multiversx-price-aggregator-sc.mxsc.json";
 const SLASH_AMOUNT: u64 = 10;
 const SLASH_QUORUM: usize = 3;
 const STAKE_AMOUNT: u64 = 20;
@@ -21,13 +18,15 @@ const USD_TICKER: &[u8] = b"USDC";
 
 const PRICE_AGGREGATOR_ADDRESS: TestSCAddress = TestSCAddress::new("price-aggregator");
 const OWNER_ADDRESS: TestAddress = TestAddress::new("owner");
+const PRICE_AGGREGATOR_PATH: MxscPath =
+    MxscPath::new("output/multiversx-price-aggregator-sc.mxsc.json");
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
 
     blockchain.set_current_dir_from_workspace("contracts/core/price-aggregator");
     blockchain.register_contract(
-        PRICE_AGGREGATOR_PATH_EXPR,
+        PRICE_AGGREGATOR_PATH,
         multiversx_price_aggregator_sc::ContractBuilder,
     );
 
@@ -48,22 +47,23 @@ impl PriceAggregatorTestState {
         world.current_block().block_timestamp(100);
 
         world.set_state_step(SetStateStep::new()).new_address(
-            OWNER_ADDRESS_EXPR,
+            OWNER_ADDRESS,
             1,
-            PRICE_AGGREGATOR_ADDRESS_EXPR,
+            PRICE_AGGREGATOR_ADDRESS,
         );
 
         let mut oracles = Vec::new();
         for i in 1..=NR_ORACLES {
-            let address_expr = format!("address:oracle{}", i);
-            let address_value = AddressValue::from(address_expr.as_str());
+            let address_name = format!("oracle{i}");
+            let address = TestAddress::new(&address_name);
+            let address_value = AddressValue::from(address);
 
-            world.account(address_expr).nonce(1).balance(STAKE_AMOUNT);
+            world.account(address).nonce(1).balance(STAKE_AMOUNT);
             oracles.push(address_value);
         }
 
         let price_aggregator_whitebox = WhiteboxContract::new(
-            PRICE_AGGREGATOR_ADDRESS_EXPR,
+            PRICE_AGGREGATOR_ADDRESS,
             multiversx_price_aggregator_sc::contract_obj,
         );
 
@@ -75,8 +75,6 @@ impl PriceAggregatorTestState {
     }
 
     fn deploy(&mut self) -> &mut Self {
-        let price_aggregator_code = self.world.code_expression(PRICE_AGGREGATOR_PATH_EXPR);
-
         let oracles = MultiValueVec::from(
             self.oracles
                 .iter()
@@ -96,7 +94,7 @@ impl PriceAggregatorTestState {
                 SUBMISSION_COUNT,
                 oracles,
             )
-            .code(price_aggregator_code)
+            .code(PRICE_AGGREGATOR_PATH)
             .run();
 
         for address in self.oracles.iter() {
diff --git a/contracts/feature-tests/scenario-tester/tests/st_blackbox_test.rs b/contracts/feature-tests/scenario-tester/tests/st_blackbox_test.rs
index 0c62e96110..fc2dc44fde 100644
--- a/contracts/feature-tests/scenario-tester/tests/st_blackbox_test.rs
+++ b/contracts/feature-tests/scenario-tester/tests/st_blackbox_test.rs
@@ -7,7 +7,7 @@ const SC_SCENARIO_TESTER_PATH_EXPR: &str = "mxsc:output/scenario-tester.mxsc.jso
 
 const OWNER_ADDRESS: TestAddress = TestAddress::new("owner");
 const OTHER_ADDRESS: TestAddress = TestAddress::new("other");
-const SC_SCENARIO_TESTER_ADDRESS: TestSCAddress = TestSCAddress::new("scenario-tester");
+const ST_ADDRESS: TestSCAddress = TestSCAddress::new("scenario-tester");
 const CODE_PATH: MxscPath = MxscPath::new("output/scenario-tester.mxsc.json");
 
 fn world() -> ScenarioWorld {
@@ -24,34 +24,30 @@ fn world() -> ScenarioWorld {
 #[test]
 fn st_blackbox() {
     let mut world = world();
-    let owner_address = "address:owner";
-    let other_address = "address:other";
-
-    let st_contract = ContractInfo::<scenario_tester::Proxy<StaticApi>>::new("sc:scenario-tester");
 
     world.start_trace();
 
     world
-        .account(owner_address)
+        .account(OWNER_ADDRESS)
         .nonce(1)
         .balance("100")
-        .account(other_address)
+        .account(OTHER_ADDRESS)
         .nonce(2)
         .balance("300")
         .esdt_balance("str:TOKEN-123456", "500")
         .commit();
 
     world
-        .check_account(owner_address)
+        .check_account(OWNER_ADDRESS)
         .nonce("1")
         .balance("100")
-        .check_account(other_address)
+        .check_account(OTHER_ADDRESS)
         .nonce("2")
         .balance("300")
         .esdt_balance("str:TOKEN-123456", "500")
         .commit();
 
-    world.new_address(owner_address, 1, "sc:scenario-tester");
+    world.new_address(OWNER_ADDRESS, 1, ST_ADDRESS);
 
     let new_address = world
         .tx()
@@ -61,11 +57,11 @@ fn st_blackbox() {
         .code(CODE_PATH)
         .returns(ReturnsNewAddress)
         .run();
-    assert_eq!(new_address, st_contract.to_address());
+    assert_eq!(new_address, ST_ADDRESS.to_address());
 
     let value = world
         .query()
-        .to(SC_SCENARIO_TESTER_ADDRESS)
+        .to(ST_ADDRESS)
         .typed(scenario_tester_proxy::ScenarioTesterProxy)
         .sum()
         .returns(ReturnsResultConv::<BigUint>::new())
@@ -75,23 +71,23 @@ fn st_blackbox() {
     world
         .tx()
         .from(OWNER_ADDRESS)
-        .to(SC_SCENARIO_TESTER_ADDRESS)
+        .to(ST_ADDRESS)
         .typed(scenario_tester_proxy::ScenarioTesterProxy)
         .add(1u32)
         .run();
 
     world
-        .check_account(owner_address)
+        .check_account(OWNER_ADDRESS)
         .nonce("3")
         .balance("100")
-        .check_account(st_contract)
+        .check_account(ST_ADDRESS)
         .check_storage("str:sum", "6")
         .commit();
 
     world
         .tx()
         .from(OTHER_ADDRESS)
-        .to(SC_SCENARIO_TESTER_ADDRESS)
+        .to(ST_ADDRESS)
         .typed(scenario_tester_proxy::ScenarioTesterProxy)
         .add(1u32)
         .run();
@@ -102,12 +98,12 @@ fn st_blackbox() {
 #[test]
 fn set_state_test() {
     let mut world = world();
-    let first = "address:first";
-    let second = "address:second";
-    let third = "address:third";
-    let fourth = "address:fourth";
-    let fifth = "address:fifth";
-    let sixth = "address:sixth";
+    let first = TestAddress::new("first");
+    let second = TestAddress::new("second");
+    let third = TestAddress::new("third");
+    let fourth = TestAddress::new("fourth");
+    let fifth = TestAddress::new("fifth");
+    let sixth = TestAddress::new("sixth");
 
     world.start_trace();
 
diff --git a/framework/scenario/src/facade/world_tx/scenario_check_state.rs b/framework/scenario/src/facade/world_tx/scenario_check_state.rs
index ffb4a2754b..7c63ddd0b6 100644
--- a/framework/scenario/src/facade/world_tx/scenario_check_state.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_check_state.rs
@@ -1,24 +1,30 @@
 use std::collections::{btree_map::Entry, BTreeMap};
 
 use multiversx_chain_scenario_format::interpret_trait::{InterpretableFrom, InterpreterContext};
-use multiversx_sc::{codec::test_util::top_encode_to_vec_u8_or_panic, proxy_imports::TopEncode};
+use multiversx_sc::{
+    codec::test_util::top_encode_to_vec_u8_or_panic,
+    proxy_imports::TopEncode,
+    types::{AnnotatedValue, ManagedAddress},
+};
 
 use crate::{
-    scenario::ScenarioRunner,
+    api::StaticApi,
+    scenario::{tx_to_step::address_annotated, ScenarioRunner},
     scenario_model::{
         AddressKey, BigUintValue, BytesKey, BytesValue, CheckAccount, CheckEsdt, CheckEsdtData,
         CheckEsdtInstances, CheckEsdtMap, CheckEsdtMapContents, CheckStateStep, CheckStorage,
         CheckStorageDetails, CheckValue, U64Value,
     },
-    ScenarioWorld,
+    ScenarioTxEnvData, ScenarioWorld,
 };
 
 impl ScenarioWorld {
     pub fn check_account<A>(&mut self, address: A) -> CheckStateBuilder<'_>
     where
-        AddressKey: From<A>,
+        A: AnnotatedValue<ScenarioTxEnvData, ManagedAddress<StaticApi>>,
     {
-        CheckStateBuilder::new(self, address.into())
+        let address_value = address_annotated(&self.new_env_data(), &address);
+        CheckStateBuilder::new(self, address_value.into())
     }
 }
 
@@ -42,12 +48,14 @@ impl<'w> CheckStateBuilder<'w> {
     }
 
     /// Starts building of a new account.
-    pub fn check_account<A>(mut self, address_expr: A) -> Self
+    pub fn check_account<A>(mut self, address: A) -> Self
     where
-        AddressKey: From<A>,
+        A: AnnotatedValue<ScenarioTxEnvData, ManagedAddress<StaticApi>>,
     {
         self.add_current_acount();
-        self.reset_account(address_expr.into());
+        let env = self.world.new_env_data();
+        let address_value = address_annotated(&env, &address);
+        self.reset_account(address_value.into());
         self
     }
 
diff --git a/framework/scenario/src/facade/world_tx/scenario_set_state.rs b/framework/scenario/src/facade/world_tx/scenario_set_state.rs
index 9376050f58..8bfccc3a43 100644
--- a/framework/scenario/src/facade/world_tx/scenario_set_state.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_set_state.rs
@@ -3,11 +3,16 @@ mod scenario_set_block;
 mod scenario_set_new_address;
 
 use crate::{
-    scenario::ScenarioRunner,
-    scenario_model::{AddressKey, AddressValue, NewAddress, SetStateStep, U64Value},
-    ScenarioWorld,
+    imports::StaticApi,
+    scenario::{
+        tx_to_step::{address_annotated, u64_annotated},
+        ScenarioRunner,
+    },
+    scenario_model::{AddressKey, NewAddress, SetStateStep},
+    ScenarioTxEnvData, ScenarioWorld,
 };
 
+use multiversx_sc::types::{AnnotatedValue, ManagedAddress};
 use scenario_set_account::AccountItem;
 use scenario_set_block::BlockItem;
 use scenario_set_new_address::NewAddressItem;
@@ -22,7 +27,7 @@ impl ScenarioWorld {
 
     pub fn account<A>(&mut self, address_expr: A) -> SetStateBuilder<'_, AccountItem>
     where
-        AddressKey: From<A>,
+        A: AnnotatedValue<ScenarioTxEnvData, ManagedAddress<StaticApi>>,
     {
         self.empty_builder().account(address_expr)
     }
@@ -34,9 +39,9 @@ impl ScenarioWorld {
         new_address_expr: NA,
     ) -> SetStateBuilder<'_, NewAddressItem>
     where
-        AddressValue: From<CA>,
-        U64Value: From<CN>,
-        AddressValue: From<NA>,
+        CA: AnnotatedValue<ScenarioTxEnvData, ManagedAddress<StaticApi>>,
+        CN: AnnotatedValue<ScenarioTxEnvData, u64>,
+        NA: AnnotatedValue<ScenarioTxEnvData, ManagedAddress<StaticApi>>,
     {
         self.empty_builder()
             .new_address(creator_address_expr, creator_nonce_expr, new_address_expr)
@@ -105,11 +110,13 @@ where
     /// Starts building of a new account.
     pub fn account<A>(mut self, address_expr: A) -> SetStateBuilder<'w, AccountItem>
     where
-        AddressKey: From<A>,
+        A: AnnotatedValue<ScenarioTxEnvData, ManagedAddress<StaticApi>>,
     {
         let mut base = core::mem::take(&mut self.base).unwrap();
+        let env = base.world.new_env_data();
+        let address_value = address_annotated(&env, &address_expr);
         self.item.commit_to_step(&mut base.set_state_step);
-        let item = base.start_account(address_expr.into());
+        let item = base.start_account(address_value.into());
         SetStateBuilder {
             base: Some(base),
             item,
@@ -123,19 +130,20 @@ where
         new_address_expr: NA,
     ) -> SetStateBuilder<'w, NewAddressItem>
     where
-        AddressValue: From<CA>,
-        U64Value: From<CN>,
-        AddressValue: From<NA>,
+        CA: AnnotatedValue<ScenarioTxEnvData, ManagedAddress<StaticApi>>,
+        CN: AnnotatedValue<ScenarioTxEnvData, u64>,
+        NA: AnnotatedValue<ScenarioTxEnvData, ManagedAddress<StaticApi>>,
     {
         let mut base = core::mem::take(&mut self.base).unwrap();
         self.item.commit_to_step(&mut base.set_state_step);
+        let env = base.world.new_env_data();
         SetStateBuilder {
             base: Some(base),
             item: NewAddressItem {
                 new_address: NewAddress {
-                    creator_address: AddressValue::from(creator_address_expr),
-                    creator_nonce: U64Value::from(creator_nonce_expr),
-                    new_address: AddressValue::from(new_address_expr),
+                    creator_address: address_annotated(&env, &creator_address_expr),
+                    creator_nonce: u64_annotated(&env, &creator_nonce_expr),
+                    new_address: address_annotated(&env, &new_address_expr),
                 },
             },
         }
diff --git a/framework/scenario/src/scenario/tx_to_step/step_annotation.rs b/framework/scenario/src/scenario/tx_to_step/step_annotation.rs
index c341427ab7..3e0901b838 100644
--- a/framework/scenario/src/scenario/tx_to_step/step_annotation.rs
+++ b/framework/scenario/src/scenario/tx_to_step/step_annotation.rs
@@ -15,6 +15,18 @@ where
     }
 }
 
+pub fn u64_annotated<Env, Num>(env: &Env, from: &Num) -> U64Value
+where
+    Env: TxEnv,
+    Num: AnnotatedValue<Env, u64>,
+{
+    let annotation = from.annotation(env).to_string();
+    U64Value {
+        value: from.to_value(env),
+        original: ValueSubTree::Str(annotation),
+    }
+}
+
 pub fn code_annotated<Env, CodeValue>(env: &Env, code: Code<CodeValue>) -> BytesValue
 where
     Env: TxEnv,

From 1276f1756b83c211cf5b5f20cb89a1b14ef00cf8 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 26 Apr 2024 20:22:18 +0300
Subject: [PATCH 0782/1254] set state via AnnotatedValue - balance, nonce

---
 .../tests/crowdfunding_esdt_blackbox_test.rs  |  2 +-
 .../multisig/tests/multisig_blackbox_test.rs  | 11 ++---
 .../rewards_distribution_integration_test.rs  |  7 ++--
 .../scenario-tester/tests/st_blackbox_test.rs | 40 +++++++++----------
 .../annotated/annotated_impl_big_uint.rs      | 13 ++++++
 .../facade/world_tx/scenario_check_state.rs   | 31 +++++++-------
 .../src/facade/world_tx/scenario_set_state.rs |  4 ++
 .../scenario_set_account.rs                   | 23 +++++++----
 .../scenario/tx_to_step/step_annotation.rs    | 38 ++++++++++++++----
 9 files changed, 108 insertions(+), 61 deletions(-)

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 b46225a396..318c2f020b 100644
--- a/contracts/examples/crowdfunding-esdt/tests/crowdfunding_esdt_blackbox_test.rs
+++ b/contracts/examples/crowdfunding-esdt/tests/crowdfunding_esdt_blackbox_test.rs
@@ -31,7 +31,7 @@ impl CrowdfundingESDTTestState {
             .nonce(1)
             .account(FIRST_USER_ADDRESS)
             .nonce(1)
-            .balance("1000")
+            .balance(1000)
             .esdt_balance(CF_TOKEN_ID_EXPR, "1000")
             .account(SECOND_USER_ADDRESS)
             .nonce(1)
diff --git a/contracts/examples/multisig/tests/multisig_blackbox_test.rs b/contracts/examples/multisig/tests/multisig_blackbox_test.rs
index 7444700e31..714adf2f9e 100644
--- a/contracts/examples/multisig/tests/multisig_blackbox_test.rs
+++ b/contracts/examples/multisig/tests/multisig_blackbox_test.rs
@@ -13,7 +13,7 @@ const MULTISIG_ADDRESS: TestSCAddress = TestSCAddress::new("multisig");
 const MULTISIG_CODE_PATH: MxscPath = MxscPath::new("output/multisig.mxsc.json");
 const OWNER_ADDRESS: TestAddress = TestAddress::new("owner");
 const PROPOSER_ADDRESS: TestAddress = TestAddress::new("proposer");
-const PROPOSER_BALANCE_EXPR: &str = "100,000,000";
+const PROPOSER_BALANCE: u64 = 100_000_000;
 const QUORUM_SIZE: usize = 1;
 
 fn world() -> ScenarioWorld {
@@ -38,7 +38,7 @@ impl MultisigTestState {
             .nonce(1)
             .account(PROPOSER_ADDRESS)
             .nonce(1)
-            .balance(PROPOSER_BALANCE_EXPR)
+            .balance(PROPOSER_BALANCE)
             .account(BOARD_MEMBER_ADDRESS)
             .nonce(1)
             .account(ADDER_OWNER_ADDRESS)
@@ -438,10 +438,7 @@ fn test_transfer_execute_to_user() {
         .egld(amount)
         .run();
 
-    state
-        .world
-        .check_account(MULTISIG_ADDRESS)
-        .balance(amount.to_string().as_str());
+    state.world.check_account(MULTISIG_ADDRESS).balance(amount);
 
     // failed attempt
     state
@@ -478,7 +475,7 @@ fn test_transfer_execute_to_user() {
     state
         .world
         .check_account(new_user_address_expr)
-        .balance(amount.to_string().as_str());
+        .balance(amount);
 }
 
 #[test]
diff --git a/contracts/examples/rewards-distribution/tests/rewards_distribution_integration_test.rs b/contracts/examples/rewards-distribution/tests/rewards_distribution_integration_test.rs
index 8acc4bada8..a99ecf7559 100644
--- a/contracts/examples/rewards-distribution/tests/rewards_distribution_integration_test.rs
+++ b/contracts/examples/rewards-distribution/tests/rewards_distribution_integration_test.rs
@@ -169,7 +169,7 @@ fn test_raffle_and_claim() {
             .world
             .account(ALICE_ADDRESS)
             .nonce(1)
-            .balance("2_070_000_000");
+            .balance(2_070_000_000);
         for nft_nonce in nft_nonces {
             account_setter = account_setter.esdt_nft_balance(
                 NFT_TOKEN_ID_EXPR,
@@ -297,12 +297,11 @@ fn test_raffle_and_claim() {
 
     // confirm the received amount matches the sum of the queried rewards
     let alice_balance_after_claim: u64 = expected_rewards.iter().sum();
-    let balance_expr: &str = &alice_balance_after_claim.to_string();
 
     state
         .world
         .check_account(ALICE_ADDRESS)
-        .balance(balance_expr);
+        .balance(alice_balance_after_claim);
 
     // a second claim with the same nfts should succeed, but return no more rewards
     let mut reward_tokens: MultiValueEncoded<
@@ -323,5 +322,5 @@ fn test_raffle_and_claim() {
     state
         .world
         .check_account(ALICE_ADDRESS)
-        .balance(balance_expr);
+        .balance(alice_balance_after_claim);
 }
diff --git a/contracts/feature-tests/scenario-tester/tests/st_blackbox_test.rs b/contracts/feature-tests/scenario-tester/tests/st_blackbox_test.rs
index fc2dc44fde..ca32c471e4 100644
--- a/contracts/feature-tests/scenario-tester/tests/st_blackbox_test.rs
+++ b/contracts/feature-tests/scenario-tester/tests/st_blackbox_test.rs
@@ -30,20 +30,20 @@ fn st_blackbox() {
     world
         .account(OWNER_ADDRESS)
         .nonce(1)
-        .balance("100")
+        .balance(100)
         .account(OTHER_ADDRESS)
         .nonce(2)
-        .balance("300")
+        .balance(300)
         .esdt_balance("str:TOKEN-123456", "500")
         .commit();
 
     world
         .check_account(OWNER_ADDRESS)
-        .nonce("1")
-        .balance("100")
+        .nonce(1)
+        .balance(100)
         .check_account(OTHER_ADDRESS)
-        .nonce("2")
-        .balance("300")
+        .nonce(2)
+        .balance(300)
         .esdt_balance("str:TOKEN-123456", "500")
         .commit();
 
@@ -78,8 +78,8 @@ fn st_blackbox() {
 
     world
         .check_account(OWNER_ADDRESS)
-        .nonce("3")
-        .balance("100")
+        .nonce(3)
+        .balance(100)
         .check_account(ST_ADDRESS)
         .check_storage("str:sum", "6")
         .commit();
@@ -110,34 +110,34 @@ fn set_state_test() {
     world
         .account(first)
         .nonce(1)
-        .balance("100")
+        .balance(100)
         .account(second)
         .nonce(2)
-        .balance("300")
+        .balance(300)
         .esdt_balance("str:TOKEN-123456", "500")
         .commit();
 
     world
         .check_account(first)
         .nonce(1)
-        .balance("100")
+        .balance(100)
         .check_account(second)
         .nonce(2)
-        .balance("300")
+        .balance(300)
         .esdt_balance("str:TOKEN-123456", "500")
         .commit();
 
     world
         .account(third)
         .nonce(3)
-        .balance("50")
+        .balance(50)
         .esdt_nft_balance("str:NFT-123456", "2", "1", Some(Vec::<u8>::new()))
         .commit();
 
     world
         .check_account(third)
         .nonce(3)
-        .balance("50")
+        .balance(50)
         .esdt_nft_balance_and_attributes("str:NFT-123456", "2", "1", Some(Vec::<u8>::new()))
         .commit();
 
@@ -145,30 +145,30 @@ fn set_state_test() {
     world
         .account(fourth)
         .nonce(4)
-        .balance("400")
+        .balance(400)
         .account(fifth)
         .nonce(5)
-        .balance("250")
+        .balance(250)
         .esdt_balance("str:TOKEN-123456", "2");
 
     world
         .check_account(fourth)
         .nonce(4)
-        .balance("400")
+        .balance(400)
         .check_account(fifth)
         .nonce(5)
-        .balance("250")
+        .balance(250)
         .esdt_balance("str:TOKEN-123456", "2");
 
     world
         .account(sixth)
         .nonce(6)
-        .balance("600")
+        .balance(600)
         .esdt_balance("str:TOKEN-123456", "60");
 
     world
         .check_account(sixth)
         .nonce(6)
-        .balance("600")
+        .balance(600)
         .esdt_balance("str:TOKEN-123456", "60");
 }
diff --git a/framework/base/src/types/interaction/annotated/annotated_impl_big_uint.rs b/framework/base/src/types/interaction/annotated/annotated_impl_big_uint.rs
index ea2250399d..685af7fdb3 100644
--- a/framework/base/src/types/interaction/annotated/annotated_impl_big_uint.rs
+++ b/framework/base/src/types/interaction/annotated/annotated_impl_big_uint.rs
@@ -87,6 +87,19 @@ where
     }
 }
 
+impl<Env> AnnotatedValue<Env, BigUint<Env::Api>> for i32
+where
+    Env: TxEnv,
+{
+    fn annotation(&self, _env: &Env) -> ManagedBuffer<Env::Api> {
+        BigUint::from(*self as u64).to_display()
+    }
+
+    fn to_value(&self, _env: &Env) -> BigUint<Env::Api> {
+        BigUint::from(*self as u64)
+    }
+}
+
 impl<Env> AnnotatedValue<Env, BigUint<Env::Api>> for ()
 where
     Env: TxEnv,
diff --git a/framework/scenario/src/facade/world_tx/scenario_check_state.rs b/framework/scenario/src/facade/world_tx/scenario_check_state.rs
index 7c63ddd0b6..fd7d640e10 100644
--- a/framework/scenario/src/facade/world_tx/scenario_check_state.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_check_state.rs
@@ -4,12 +4,15 @@ use multiversx_chain_scenario_format::interpret_trait::{InterpretableFrom, Inter
 use multiversx_sc::{
     codec::test_util::top_encode_to_vec_u8_or_panic,
     proxy_imports::TopEncode,
-    types::{AnnotatedValue, ManagedAddress},
+    types::{AnnotatedValue, BigUint, ManagedAddress},
 };
 
 use crate::{
     api::StaticApi,
-    scenario::{tx_to_step::address_annotated, ScenarioRunner},
+    scenario::{
+        tx_to_step::{address_annotated, big_uint_annotated, u64_annotated},
+        ScenarioRunner,
+    },
     scenario_model::{
         AddressKey, BigUintValue, BytesKey, BytesValue, CheckAccount, CheckEsdt, CheckEsdtData,
         CheckEsdtInstances, CheckEsdtMap, CheckEsdtMapContents, CheckStateStep, CheckStorage,
@@ -47,13 +50,17 @@ impl<'w> CheckStateBuilder<'w> {
         builder
     }
 
+    fn new_env_data(&self) -> ScenarioTxEnvData {
+        self.world.new_env_data()
+    }
+
     /// Starts building of a new account.
     pub fn check_account<A>(mut self, address: A) -> Self
     where
         A: AnnotatedValue<ScenarioTxEnvData, ManagedAddress<StaticApi>>,
     {
         self.add_current_acount();
-        let env = self.world.new_env_data();
+        let env = self.new_env_data();
         let address_value = address_annotated(&env, &address);
         self.reset_account(address_value.into());
         self
@@ -86,23 +93,19 @@ impl<'w> CheckStateBuilder<'w> {
 
     pub fn nonce<V>(mut self, nonce: V) -> Self
     where
-        U64Value: InterpretableFrom<V>,
+        V: AnnotatedValue<ScenarioTxEnvData, u64>,
     {
-        self.current_account.nonce = CheckValue::Equal(U64Value::interpret_from(
-            nonce,
-            &InterpreterContext::default(),
-        ));
+        let env = self.new_env_data();
+        self.current_account.nonce = CheckValue::Equal(u64_annotated(&env, &nonce));
         self
     }
 
-    pub fn balance<V>(mut self, balance_expr: V) -> Self
+    pub fn balance<V>(mut self, balance: V) -> Self
     where
-        BigUintValue: InterpretableFrom<V>,
+        V: AnnotatedValue<ScenarioTxEnvData, BigUint<StaticApi>>,
     {
-        self.current_account.balance = CheckValue::Equal(BigUintValue::interpret_from(
-            balance_expr,
-            &InterpreterContext::default(),
-        ));
+        let env = self.new_env_data();
+        self.current_account.balance = CheckValue::Equal(big_uint_annotated(&env, &balance));
         self
     }
 
diff --git a/framework/scenario/src/facade/world_tx/scenario_set_state.rs b/framework/scenario/src/facade/world_tx/scenario_set_state.rs
index 8bfccc3a43..b4c3fc6681 100644
--- a/framework/scenario/src/facade/world_tx/scenario_set_state.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_set_state.rs
@@ -107,6 +107,10 @@ impl<'w, Item> SetStateBuilder<'w, Item>
 where
     Item: SetStateBuilderItem,
 {
+    fn new_env_data(&self) -> ScenarioTxEnvData {
+        self.base.as_ref().unwrap().world.new_env_data()
+    }
+
     /// Starts building of a new account.
     pub fn account<A>(mut self, address_expr: A) -> SetStateBuilder<'w, AccountItem>
     where
diff --git a/framework/scenario/src/facade/world_tx/scenario_set_state/scenario_set_account.rs b/framework/scenario/src/facade/world_tx/scenario_set_state/scenario_set_account.rs
index d985cbed66..e817b09c57 100644
--- a/framework/scenario/src/facade/world_tx/scenario_set_state/scenario_set_account.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_set_state/scenario_set_account.rs
@@ -1,8 +1,15 @@
 use std::collections::btree_map::Entry;
 
-use crate::scenario_model::{
-    Account, AddressKey, AddressValue, BigUintValue, BytesKey, BytesValue, Esdt, EsdtObject,
-    SetStateStep, U64Value,
+use multiversx_sc::types::{AnnotatedValue, BigUint};
+
+use crate::{
+    imports::StaticApi,
+    scenario::tx_to_step::{big_uint_annotated, u64_annotated},
+    scenario_model::{
+        Account, AddressKey, AddressValue, BigUintValue, BytesKey, BytesValue, Esdt, EsdtObject,
+        SetStateStep, U64Value,
+    },
+    ScenarioTxEnvData,
 };
 
 use super::{SetStateBuilder, SetStateBuilderItem};
@@ -32,17 +39,19 @@ impl SetStateBuilderItem for AccountItem {
 impl<'w> SetStateBuilder<'w, AccountItem> {
     pub fn nonce<V>(mut self, nonce: V) -> Self
     where
-        U64Value: From<V>,
+        V: AnnotatedValue<ScenarioTxEnvData, u64>,
     {
-        self.item.account.nonce = Some(U64Value::from(nonce));
+        let env = self.new_env_data();
+        self.item.account.nonce = Some(u64_annotated(&env, &nonce));
         self
     }
 
     pub fn balance<V>(mut self, balance_expr: V) -> Self
     where
-        BigUintValue: From<V>,
+        V: AnnotatedValue<ScenarioTxEnvData, BigUint<StaticApi>>,
     {
-        self.item.account.balance = Some(BigUintValue::from(balance_expr));
+        let env = self.new_env_data();
+        self.item.account.balance = Some(big_uint_annotated(&env, &balance_expr));
         self
     }
 
diff --git a/framework/scenario/src/scenario/tx_to_step/step_annotation.rs b/framework/scenario/src/scenario/tx_to_step/step_annotation.rs
index 3e0901b838..186d835344 100644
--- a/framework/scenario/src/scenario/tx_to_step/step_annotation.rs
+++ b/framework/scenario/src/scenario/tx_to_step/step_annotation.rs
@@ -1,7 +1,9 @@
 use multiversx_chain_scenario_format::serde_raw::ValueSubTree;
-use multiversx_sc::types::{AnnotatedValue, Code, ManagedAddress, TxCodeValue, TxEnv, TxGas};
+use multiversx_sc::types::{
+    AnnotatedValue, BigUint, Code, ManagedAddress, ManagedBuffer, TxCodeValue, TxEnv, TxGas,
+};
 
-use crate::scenario_model::{AddressValue, BytesValue, U64Value};
+use crate::scenario_model::{AddressValue, BigUintValue, BytesValue, U64Value};
 
 pub fn address_annotated<Env, Addr>(env: &Env, from: &Addr) -> AddressValue
 where
@@ -15,10 +17,10 @@ where
     }
 }
 
-pub fn u64_annotated<Env, Num>(env: &Env, from: &Num) -> U64Value
+pub fn u64_annotated<Env, T>(env: &Env, from: &T) -> U64Value
 where
     Env: TxEnv,
-    Num: AnnotatedValue<Env, u64>,
+    T: AnnotatedValue<Env, u64>,
 {
     let annotation = from.annotation(env).to_string();
     U64Value {
@@ -27,18 +29,38 @@ where
     }
 }
 
-pub fn code_annotated<Env, CodeValue>(env: &Env, code: Code<CodeValue>) -> BytesValue
+pub fn big_uint_annotated<Env, T>(env: &Env, from: &T) -> BigUintValue
 where
     Env: TxEnv,
-    CodeValue: TxCodeValue<Env>,
+    T: AnnotatedValue<Env, BigUint<Env::Api>>,
 {
-    let annotation = code.0.annotation(env).to_string();
+    let annotation = from.annotation(env).to_string();
+    BigUintValue {
+        value: from.to_value(env).to_alloc(),
+        original: ValueSubTree::Str(annotation),
+    }
+}
+
+pub fn bytes_annotated<Env, T>(env: &Env, value: T) -> BytesValue
+where
+    Env: TxEnv,
+    T: AnnotatedValue<Env, ManagedBuffer<Env::Api>>,
+{
+    let annotation = value.annotation(env).to_string();
     BytesValue {
-        value: code.0.into_value(env).to_vec(),
+        value: value.into_value(env).to_vec(),
         original: ValueSubTree::Str(annotation),
     }
 }
 
+pub fn code_annotated<Env, CodeValue>(env: &Env, code: Code<CodeValue>) -> BytesValue
+where
+    Env: TxEnv,
+    CodeValue: TxCodeValue<Env>,
+{
+    bytes_annotated(env, code.0)
+}
+
 pub fn gas_annotated<Env, Gas>(env: &Env, gas: Gas) -> U64Value
 where
     Env: TxEnv,

From 88fb5535319864452c74639178ea296711c1fd0c Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Sat, 27 Apr 2024 13:09:33 +0300
Subject: [PATCH 0783/1254] simplified small number nested encode/decode

---
 data/codec/src/impl_for_types/impl_num_signed.rs  | 15 ++++++++++++---
 .../codec/src/impl_for_types/impl_num_unsigned.rs | 15 ++++++++++++---
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/data/codec/src/impl_for_types/impl_num_signed.rs b/data/codec/src/impl_for_types/impl_num_signed.rs
index 50cb85614e..f7901fc599 100644
--- a/data/codec/src/impl_for_types/impl_num_signed.rs
+++ b/data/codec/src/impl_for_types/impl_num_signed.rs
@@ -1,5 +1,5 @@
 use crate::{
-    dep_encode_num_mimic, num_conv::universal_decode_number, DecodeError, DecodeErrorHandler,
+    dep_encode_num_mimic, DecodeError, DecodeErrorHandler,
     EncodeErrorHandler, NestedDecode, NestedDecodeInput, NestedEncode, NestedEncodeOutput,
     TopDecode, TopDecodeInput, TopEncode, TopEncodeOutput,
 };
@@ -42,7 +42,7 @@ macro_rules! dep_decode_num_signed {
             {
                 let mut bytes = [0u8; $num_bytes];
                 input.read_into(&mut bytes[..], h)?;
-                let num = universal_decode_number(&bytes[..], true) as $ty;
+                let num = <$ty>::from_be_bytes(bytes);
                 Ok(num)
             }
         }
@@ -52,9 +52,18 @@ macro_rules! dep_decode_num_signed {
 dep_decode_num_signed!(i8, 1);
 dep_decode_num_signed!(i16, 2);
 dep_decode_num_signed!(i32, 4);
-dep_decode_num_signed!(isize, 4);
 dep_decode_num_signed!(i64, 8);
 
+impl NestedDecode for isize {
+    fn dep_decode_or_handle_err<I, H>(input: &mut I, h: H) -> Result<Self, H::HandledErr>
+    where
+        I: NestedDecodeInput,
+        H: DecodeErrorHandler,
+    {
+        i32::dep_decode_or_handle_err(input, h).map(|num| num as isize)
+    }
+}
+
 macro_rules! top_decode_num_signed {
     ($ty:ty, $bounds_ty:ty) => {
         impl TopDecode for $ty {
diff --git a/data/codec/src/impl_for_types/impl_num_unsigned.rs b/data/codec/src/impl_for_types/impl_num_unsigned.rs
index b9e98051fc..b6515d6e36 100644
--- a/data/codec/src/impl_for_types/impl_num_unsigned.rs
+++ b/data/codec/src/impl_for_types/impl_num_unsigned.rs
@@ -1,5 +1,5 @@
 use crate::{
-    dep_encode_num_mimic, num_conv::universal_decode_number, DecodeError, DecodeErrorHandler,
+    dep_encode_num_mimic, DecodeError, DecodeErrorHandler,
     EncodeErrorHandler, NestedDecode, NestedDecodeInput, NestedEncode, NestedEncodeOutput,
     TopDecode, TopDecodeInput, TopEncode, TopEncodeOutput,
 };
@@ -102,7 +102,7 @@ macro_rules! dep_decode_num_unsigned {
             {
                 let mut bytes = [0u8; $num_bytes];
                 input.read_into(&mut bytes[..], h)?;
-                let num = universal_decode_number(&bytes[..], false) as $ty;
+                let num = <$ty>::from_be_bytes(bytes);
                 Ok(num)
             }
         }
@@ -111,9 +111,18 @@ macro_rules! dep_decode_num_unsigned {
 
 dep_decode_num_unsigned!(u16, 2);
 dep_decode_num_unsigned!(u32, 4);
-dep_decode_num_unsigned!(usize, 4);
 dep_decode_num_unsigned!(u64, 8);
 
+impl NestedDecode for usize {
+    fn dep_decode_or_handle_err<I, H>(input: &mut I, h: H) -> Result<Self, H::HandledErr>
+    where
+        I: NestedDecodeInput,
+        H: DecodeErrorHandler,
+    {
+        u32::dep_decode_or_handle_err(input, h).map(|num| num as usize)
+    }
+}
+
 macro_rules! top_decode_num_unsigned {
     ($ty:ty, $bounds_ty:ty) => {
         impl TopDecode for $ty {

From 04a10d98b598081fb2f33f20bc49a8ad93b327c2 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Sun, 28 Apr 2024 01:31:39 +0300
Subject: [PATCH 0784/1254] abi fix - OperationCompletionStatus

---
 .../abi_tester_expected_main.abi.json         | 27 +++++++++++++++++++
 .../abi_tester_expected_view.abi.json         | 17 ++++++++++++
 .../feature-tests/abi-tester/src/abi_proxy.rs | 18 +++++++++++--
 .../abi-tester/src/abi_tester.rs              |  5 ++++
 .../feature-tests/abi-tester/wasm/src/lib.rs  |  5 ++--
 .../types/io/operation_completion_status.rs   |  4 +++
 6 files changed, 72 insertions(+), 4 deletions(-)

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 a9bcc8d151..77d8423bfb 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
@@ -379,6 +379,16 @@
                 }
             ]
         },
+        {
+            "name": "operation_completion_status",
+            "mutability": "readonly",
+            "inputs": [],
+            "outputs": [
+                {
+                    "type": "OperationCompletionStatus"
+                }
+            ]
+        },
         {
             "name": "payable_egld",
             "mutability": "mutable",
@@ -926,6 +936,23 @@
                     "type": "OnlyShowsUpAsNested10"
                 }
             ]
+        },
+        "OperationCompletionStatus": {
+            "type": "explicit-enum",
+            "variants": [
+                {
+                    "docs": [
+                        "indicates that operation was completed"
+                    ],
+                    "name": "completed"
+                },
+                {
+                    "docs": [
+                        "indicates that operation was interrupted prematurely, due to low gas"
+                    ],
+                    "name": "interrupted"
+                }
+            ]
         }
     }
 }
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 fcc5546404..f678f60c87 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
@@ -587,6 +587,23 @@
                     "type": "OnlyShowsUpAsNested10"
                 }
             ]
+        },
+        "OperationCompletionStatus": {
+            "type": "explicit-enum",
+            "variants": [
+                {
+                    "docs": [
+                        "indicates that operation was completed"
+                    ],
+                    "name": "completed"
+                },
+                {
+                    "docs": [
+                        "indicates that operation was interrupted prematurely, due to low gas"
+                    ],
+                    "name": "interrupted"
+                }
+            ]
         }
     }
 }
diff --git a/contracts/feature-tests/abi-tester/src/abi_proxy.rs b/contracts/feature-tests/abi-tester/src/abi_proxy.rs
index 66548a21d8..feea268d49 100644
--- a/contracts/feature-tests/abi-tester/src/abi_proxy.rs
+++ b/contracts/feature-tests/abi-tester/src/abi_proxy.rs
@@ -340,6 +340,14 @@ where
             .original_result()
     }
 
+    pub fn operation_completion_status(
+        self,
+    ) -> TxProxyCall<Env, From, To, Gas, OperationCompletionStatus> {
+        self.wrapped_tx
+            .raw_call("operation_completion_status")
+            .original_result()
+    }
+
     pub fn payable_egld(
         self,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
@@ -415,7 +423,10 @@ pub enum AbiEnum {
     Nothing,
     Something(i32),
     SomethingMore(u8, OnlyShowsUpAsNested08),
-    SomeStruct { a: u16, b: OnlyShowsUpAsNested09 },
+    SomeStruct {
+        a: u16,
+        b: OnlyShowsUpAsNested09,
+    },
 }
 
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
@@ -506,5 +517,8 @@ pub enum ExplicitDiscriminantMixed {
     Unit,
     Tuple(u16),
     Five,
-    Struct { a: u8, b: u16 },
+    Struct {
+        a: u8,
+        b: u16,
+    },
 }
diff --git a/contracts/feature-tests/abi-tester/src/abi_tester.rs b/contracts/feature-tests/abi-tester/src/abi_tester.rs
index 1d7226c0f9..22b4c2e26d 100644
--- a/contracts/feature-tests/abi-tester/src/abi_tester.rs
+++ b/contracts/feature-tests/abi-tester/src/abi_tester.rs
@@ -165,6 +165,11 @@ pub trait AbiTester {
         None
     }
 
+    #[view]
+    fn operation_completion_status(&self) -> OperationCompletionStatus {
+        OperationCompletionStatus::Completed
+    }
+
     #[endpoint]
     #[payable("EGLD")]
     fn payable_egld(&self) {}
diff --git a/contracts/feature-tests/abi-tester/wasm/src/lib.rs b/contracts/feature-tests/abi-tester/wasm/src/lib.rs
index b8183ee1af..cf9aa68978 100644
--- a/contracts/feature-tests/abi-tester/wasm/src/lib.rs
+++ b/contracts/feature-tests/abi-tester/wasm/src/lib.rs
@@ -6,9 +6,9 @@
 
 // Init:                                 1
 // Upgrade:                              1
-// Endpoints:                           27
+// Endpoints:                           28
 // Async Callback (empty):               1
-// Total number of exported functions:  30
+// Total number of exported functions:  31
 
 #![no_std]
 #![allow(internal_features)]
@@ -46,6 +46,7 @@ multiversx_sc_wasm_adapter::endpoints! {
         item_for_ref => item_for_ref
         item_for_slice => item_for_slice
         item_for_option => item_for_option
+        operation_completion_status => operation_completion_status
         payable_egld => payable_egld
         payable_some_token => payable_some_token
         payable_any_token => payable_any_token
diff --git a/framework/base/src/types/io/operation_completion_status.rs b/framework/base/src/types/io/operation_completion_status.rs
index b69af9624a..7e8327f392 100644
--- a/framework/base/src/types/io/operation_completion_status.rs
+++ b/framework/base/src/types/io/operation_completion_status.rs
@@ -80,6 +80,10 @@ impl TypeAbi for OperationCompletionStatus {
         TypeName::from("OperationCompletionStatus")
     }
 
+    fn type_name_rust() -> TypeName {
+        TypeName::from("OperationCompletionStatus")
+    }
+
     fn provide_type_descriptions<TDC: TypeDescriptionContainer>(accumulator: &mut TDC) {
         let type_names = Self::type_names();
 

From c8dfdbe3ebd01c3ae5280f3e07ff933f1606ad35 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Sun, 28 Apr 2024 02:37:42 +0300
Subject: [PATCH 0785/1254] set state via AnnotatedValue - fungible ESDT

---
 .../tests/crowdfunding_esdt_blackbox_test.rs  | 32 +++++------
 .../scenario-tester/tests/st_blackbox_test.rs | 17 +++---
 .../base/src/types/interaction/annotated.rs   |  1 +
 .../annotated_impl_token_identifier.rs        | 56 +++++++++++++++++++
 framework/base/src/types/interaction/expr.rs  |  2 +
 .../interaction/expr/test_token_identifier.rs | 50 +++++++++++++++++
 .../facade/world_tx/scenario_check_state.rs   | 25 +++++----
 .../scenario_set_account.rs                   | 23 ++++----
 .../scenario/tx_to_step/step_annotation.rs    | 17 +++++-
 9 files changed, 176 insertions(+), 47 deletions(-)
 create mode 100644 framework/base/src/types/interaction/annotated/annotated_impl_token_identifier.rs
 create mode 100644 framework/base/src/types/interaction/expr/test_token_identifier.rs

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 318c2f020b..8b895e42a3 100644
--- a/contracts/examples/crowdfunding-esdt/tests/crowdfunding_esdt_blackbox_test.rs
+++ b/contracts/examples/crowdfunding-esdt/tests/crowdfunding_esdt_blackbox_test.rs
@@ -3,8 +3,7 @@ use crowdfunding_esdt::crowdfunding_esdt_proxy;
 use multiversx_sc_scenario::imports::*;
 
 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 CF_TOKEN_ID: TestTokenIdentifier = TestTokenIdentifier::new("CROWD-123456");
 const FIRST_USER_ADDRESS: TestAddress = TestAddress::new("first-user");
 const OWNER_ADDRESS: TestAddress = TestAddress::new("owner");
 const SECOND_USER_ADDRESS: TestAddress = TestAddress::new("second-user");
@@ -26,18 +25,18 @@ impl CrowdfundingESDTTestState {
     fn new() -> Self {
         let mut world = world();
 
+        world.account(OWNER_ADDRESS).nonce(1);
+
         world
-            .account(OWNER_ADDRESS)
-            .nonce(1)
             .account(FIRST_USER_ADDRESS)
             .nonce(1)
             .balance(1000)
-            .esdt_balance(CF_TOKEN_ID_EXPR, "1000")
+            .esdt_balance(CF_TOKEN_ID, 1000);
+
+        world
             .account(SECOND_USER_ADDRESS)
             .nonce(1)
-            .esdt_balance(CF_TOKEN_ID_EXPR, "1000");
-
-        world.new_address(OWNER_ADDRESS, 1, CROWDFUNDING_ADDRESS);
+            .esdt_balance(CF_TOKEN_ID, 1000);
 
         Self { world }
     }
@@ -53,6 +52,7 @@ impl CrowdfundingESDTTestState {
                 EgldOrEsdtTokenIdentifier::esdt(CF_TOKEN_ID),
             )
             .code(CODE_PATH)
+            .new_address(CROWDFUNDING_ADDRESS)
             .run();
     }
 
@@ -101,10 +101,10 @@ impl CrowdfundingESDTTestState {
             .run();
     }
 
-    fn check_esdt_balance(&mut self, address: TestAddress, balance_expr: &str) {
+    fn check_esdt_balance(&mut self, address: TestAddress, balance: u64) {
         self.world
             .check_account(address)
-            .esdt_balance(CF_TOKEN_ID_EXPR, balance_expr);
+            .esdt_balance(CF_TOKEN_ID, balance);
     }
 
     fn set_block_timestamp(&mut self, block_timestamp_expr: u64) {
@@ -181,9 +181,9 @@ fn test_successful_cf() {
     // owner claim
     state.claim(OWNER_ADDRESS);
 
-    state.check_esdt_balance(OWNER_ADDRESS, "2_000");
-    state.check_esdt_balance(FIRST_USER_ADDRESS, "0");
-    state.check_esdt_balance(SECOND_USER_ADDRESS, "0");
+    state.check_esdt_balance(OWNER_ADDRESS, 2000);
+    state.check_esdt_balance(FIRST_USER_ADDRESS, 0);
+    state.check_esdt_balance(SECOND_USER_ADDRESS, 0);
 }
 
 #[test]
@@ -211,7 +211,7 @@ fn test_failed_cf() {
     // second user claim
     state.claim(SECOND_USER_ADDRESS);
 
-    state.check_esdt_balance(OWNER_ADDRESS, "0");
-    state.check_esdt_balance(FIRST_USER_ADDRESS, "1_000");
-    state.check_esdt_balance(SECOND_USER_ADDRESS, "1_000");
+    state.check_esdt_balance(OWNER_ADDRESS, 0);
+    state.check_esdt_balance(FIRST_USER_ADDRESS, 1000);
+    state.check_esdt_balance(SECOND_USER_ADDRESS, 1000);
 }
diff --git a/contracts/feature-tests/scenario-tester/tests/st_blackbox_test.rs b/contracts/feature-tests/scenario-tester/tests/st_blackbox_test.rs
index ca32c471e4..62630a0289 100644
--- a/contracts/feature-tests/scenario-tester/tests/st_blackbox_test.rs
+++ b/contracts/feature-tests/scenario-tester/tests/st_blackbox_test.rs
@@ -9,6 +9,7 @@ const OWNER_ADDRESS: TestAddress = TestAddress::new("owner");
 const OTHER_ADDRESS: TestAddress = TestAddress::new("other");
 const ST_ADDRESS: TestSCAddress = TestSCAddress::new("scenario-tester");
 const CODE_PATH: MxscPath = MxscPath::new("output/scenario-tester.mxsc.json");
+const TOKEN_ID: TestTokenIdentifier = TestTokenIdentifier::new("TOKEN-123456");
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
@@ -34,7 +35,7 @@ fn st_blackbox() {
         .account(OTHER_ADDRESS)
         .nonce(2)
         .balance(300)
-        .esdt_balance("str:TOKEN-123456", "500")
+        .esdt_balance(TOKEN_ID, 500)
         .commit();
 
     world
@@ -44,7 +45,7 @@ fn st_blackbox() {
         .check_account(OTHER_ADDRESS)
         .nonce(2)
         .balance(300)
-        .esdt_balance("str:TOKEN-123456", "500")
+        .esdt_balance(TOKEN_ID, 500)
         .commit();
 
     world.new_address(OWNER_ADDRESS, 1, ST_ADDRESS);
@@ -114,7 +115,7 @@ fn set_state_test() {
         .account(second)
         .nonce(2)
         .balance(300)
-        .esdt_balance("str:TOKEN-123456", "500")
+        .esdt_balance(TOKEN_ID, 500)
         .commit();
 
     world
@@ -124,7 +125,7 @@ fn set_state_test() {
         .check_account(second)
         .nonce(2)
         .balance(300)
-        .esdt_balance("str:TOKEN-123456", "500")
+        .esdt_balance(TOKEN_ID, 500)
         .commit();
 
     world
@@ -149,7 +150,7 @@ fn set_state_test() {
         .account(fifth)
         .nonce(5)
         .balance(250)
-        .esdt_balance("str:TOKEN-123456", "2");
+        .esdt_balance(TOKEN_ID, 2);
 
     world
         .check_account(fourth)
@@ -158,17 +159,17 @@ fn set_state_test() {
         .check_account(fifth)
         .nonce(5)
         .balance(250)
-        .esdt_balance("str:TOKEN-123456", "2");
+        .esdt_balance(TOKEN_ID, 2);
 
     world
         .account(sixth)
         .nonce(6)
         .balance(600)
-        .esdt_balance("str:TOKEN-123456", "60");
+        .esdt_balance(TOKEN_ID, 60);
 
     world
         .check_account(sixth)
         .nonce(6)
         .balance(600)
-        .esdt_balance("str:TOKEN-123456", "60");
+        .esdt_balance(TOKEN_ID, 60);
 }
diff --git a/framework/base/src/types/interaction/annotated.rs b/framework/base/src/types/interaction/annotated.rs
index 5586168651..015aa4e648 100644
--- a/framework/base/src/types/interaction/annotated.rs
+++ b/framework/base/src/types/interaction/annotated.rs
@@ -1,6 +1,7 @@
 mod annotated_impl_big_uint;
 mod annotated_impl_managed_address;
 mod annotated_impl_managed_buffer;
+mod annotated_impl_token_identifier;
 mod annotated_impl_u64;
 
 use crate::{
diff --git a/framework/base/src/types/interaction/annotated/annotated_impl_token_identifier.rs b/framework/base/src/types/interaction/annotated/annotated_impl_token_identifier.rs
new file mode 100644
index 0000000000..c689024632
--- /dev/null
+++ b/framework/base/src/types/interaction/annotated/annotated_impl_token_identifier.rs
@@ -0,0 +1,56 @@
+use crate::{
+    proxy_imports::ManagedBufferBuilder,
+    types::{ManagedBuffer, TokenIdentifier},
+};
+
+use super::{AnnotatedValue, TxEnv};
+
+impl<Env> AnnotatedValue<Env, TokenIdentifier<Env::Api>> for TokenIdentifier<Env::Api>
+where
+    Env: TxEnv,
+{
+    fn annotation(&self, env: &Env) -> ManagedBuffer<Env::Api> {
+        (&self).annotation(env)
+    }
+
+    fn to_value(&self, _env: &Env) -> TokenIdentifier<Env::Api> {
+        self.clone()
+    }
+
+    fn into_value(self, _env: &Env) -> TokenIdentifier<Env::Api> {
+        self
+    }
+
+    fn with_value_ref<F, R>(&self, _env: &Env, f: F) -> R
+    where
+        F: FnOnce(&TokenIdentifier<Env::Api>) -> R,
+    {
+        f(self)
+    }
+}
+
+impl<Env> AnnotatedValue<Env, TokenIdentifier<Env::Api>> for &TokenIdentifier<Env::Api>
+where
+    Env: TxEnv,
+{
+    fn annotation(&self, _env: &Env) -> ManagedBuffer<Env::Api> {
+        let mut annot = ManagedBufferBuilder::<Env::Api>::new_from_slice("str:".as_bytes());
+        annot.append_managed_buffer(self.as_managed_buffer());
+        annot.into_managed_buffer()
+    }
+
+    fn to_value(&self, _env: &Env) -> TokenIdentifier<Env::Api> {
+        (*self).clone()
+    }
+
+    fn into_value(self, _env: &Env) -> TokenIdentifier<Env::Api> {
+        (*self).clone()
+    }
+
+    fn with_value_ref<F, R>(&self, _env: &Env, f: F) -> R
+    where
+        F: FnOnce(&TokenIdentifier<Env::Api>) -> R,
+    {
+        f(self)
+    }
+}
diff --git a/framework/base/src/types/interaction/expr.rs b/framework/base/src/types/interaction/expr.rs
index ca1e1c44b1..9ecbd18112 100644
--- a/framework/base/src/types/interaction/expr.rs
+++ b/framework/base/src/types/interaction/expr.rs
@@ -1,5 +1,7 @@
 mod test_address;
 mod test_sc_address;
+mod test_token_identifier;
 
 pub use test_address::TestAddress;
 pub use test_sc_address::TestSCAddress;
+pub use test_token_identifier::TestTokenIdentifier;
diff --git a/framework/base/src/types/interaction/expr/test_token_identifier.rs b/framework/base/src/types/interaction/expr/test_token_identifier.rs
new file mode 100644
index 0000000000..62c03d8177
--- /dev/null
+++ b/framework/base/src/types/interaction/expr/test_token_identifier.rs
@@ -0,0 +1,50 @@
+use crate::{
+    api::ManagedTypeApi,
+    types::{AnnotatedValue, ManagedBuffer, TokenIdentifier, TxEnv},
+};
+
+const STR_PREFIX: &str = "str:";
+
+/// Encodes a dummy address, to be used for tests.
+///
+/// It is designed to be usable from contracts (especiall test contracts), with a minimal footprint.
+/// For this reason, its inner structure is subject to change.
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub struct TestTokenIdentifier<'a> {
+    name: &'a str,
+}
+
+impl<'a> TestTokenIdentifier<'a> {
+    pub const fn new(name: &'a str) -> Self {
+        TestTokenIdentifier { name }
+    }
+
+    #[cfg(feature = "alloc")]
+    pub fn eval_to_expr(&self) -> alloc::string::String {
+        alloc::format!("{STR_PREFIX}{}", self.name)
+    }
+}
+
+impl<'a, Env> AnnotatedValue<Env, TokenIdentifier<Env::Api>> for TestTokenIdentifier<'a>
+where
+    Env: TxEnv,
+{
+    fn annotation(&self, _env: &Env) -> ManagedBuffer<Env::Api> {
+        let mut result = ManagedBuffer::new_from_bytes(STR_PREFIX.as_bytes());
+        result.append_bytes(self.name.as_bytes());
+        result
+    }
+
+    fn to_value(&self, _env: &Env) -> TokenIdentifier<Env::Api> {
+        self.name.into()
+    }
+}
+
+impl<'a, Api> From<TestTokenIdentifier<'a>> for TokenIdentifier<Api>
+where
+    Api: ManagedTypeApi,
+{
+    fn from(value: TestTokenIdentifier<'a>) -> Self {
+        TokenIdentifier::from_esdt_bytes(value.name)
+    }
+}
diff --git a/framework/scenario/src/facade/world_tx/scenario_check_state.rs b/framework/scenario/src/facade/world_tx/scenario_check_state.rs
index fd7d640e10..011aca29b3 100644
--- a/framework/scenario/src/facade/world_tx/scenario_check_state.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_check_state.rs
@@ -4,13 +4,15 @@ use multiversx_chain_scenario_format::interpret_trait::{InterpretableFrom, Inter
 use multiversx_sc::{
     codec::test_util::top_encode_to_vec_u8_or_panic,
     proxy_imports::TopEncode,
-    types::{AnnotatedValue, BigUint, ManagedAddress},
+    types::{AnnotatedValue, BigUint, ManagedAddress, TokenIdentifier},
 };
 
 use crate::{
     api::StaticApi,
     scenario::{
-        tx_to_step::{address_annotated, big_uint_annotated, u64_annotated},
+        tx_to_step::{
+            address_annotated, big_uint_annotated, token_identifier_annotated, u64_annotated,
+        },
         ScenarioRunner,
     },
     scenario_model::{
@@ -131,18 +133,19 @@ impl<'w> CheckStateBuilder<'w> {
         self
     }
 
-    pub fn esdt_balance<K, V>(mut self, token_id_expr: K, balance_expr: V) -> Self
+    pub fn esdt_balance<K, V>(mut self, token_id: K, balance: V) -> Self
     where
-        BytesKey: From<K>,
-        BigUintValue: From<V>,
+        K: AnnotatedValue<ScenarioTxEnvData, TokenIdentifier<StaticApi>>,
+        V: AnnotatedValue<ScenarioTxEnvData, BigUint<StaticApi>>,
     {
-        let token_id = BytesKey::from(token_id_expr);
-        let balance = BigUintValue::from(balance_expr);
+        let env = self.new_env_data();
+        let token_id_key = token_identifier_annotated(&env, token_id);
+        let balance_value = big_uint_annotated(&env, &balance);
 
         match &mut self.current_account.esdt {
             CheckEsdtMap::Unspecified | CheckEsdtMap::Star => {
                 let mut new_esdt_map = BTreeMap::new();
-                let _ = new_esdt_map.insert(token_id, CheckEsdt::Short(balance));
+                let _ = new_esdt_map.insert(token_id_key, CheckEsdt::Short(balance_value));
 
                 let new_check_esdt_map = CheckEsdtMapContents {
                     contents: new_esdt_map,
@@ -152,10 +155,10 @@ impl<'w> CheckStateBuilder<'w> {
                 self.current_account.esdt = CheckEsdtMap::Equal(new_check_esdt_map);
             },
             CheckEsdtMap::Equal(check_esdt_map) => {
-                if check_esdt_map.contents.contains_key(&token_id) {
-                    let prev_entry = check_esdt_map.contents.get_mut(&token_id).unwrap();
+                if check_esdt_map.contents.contains_key(&token_id_key) {
+                    let prev_entry = check_esdt_map.contents.get_mut(&token_id_key).unwrap();
                     match prev_entry {
-                        CheckEsdt::Short(prev_balance_check) => *prev_balance_check = balance,
+                        CheckEsdt::Short(prev_balance_check) => *prev_balance_check = balance_value,
                         CheckEsdt::Full(prev_esdt_check) => match prev_esdt_check.instances {
                             CheckEsdtInstances::Star => todo!(),
                             CheckEsdtInstances::Equal(_) => todo!(),
diff --git a/framework/scenario/src/facade/world_tx/scenario_set_state/scenario_set_account.rs b/framework/scenario/src/facade/world_tx/scenario_set_state/scenario_set_account.rs
index e817b09c57..ecba63090e 100644
--- a/framework/scenario/src/facade/world_tx/scenario_set_state/scenario_set_account.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_set_state/scenario_set_account.rs
@@ -1,10 +1,10 @@
 use std::collections::btree_map::Entry;
 
-use multiversx_sc::types::{AnnotatedValue, BigUint};
+use multiversx_sc::types::{AnnotatedValue, BigUint, TokenIdentifier};
 
 use crate::{
     imports::StaticApi,
-    scenario::tx_to_step::{big_uint_annotated, u64_annotated},
+    scenario::tx_to_step::{big_uint_annotated, token_identifier_annotated, u64_annotated},
     scenario_model::{
         Account, AddressKey, AddressValue, BigUintValue, BytesKey, BytesValue, Esdt, EsdtObject,
         SetStateStep, U64Value,
@@ -46,23 +46,26 @@ impl<'w> SetStateBuilder<'w, AccountItem> {
         self
     }
 
-    pub fn balance<V>(mut self, balance_expr: V) -> Self
+    pub fn balance<V>(mut self, balance: V) -> Self
     where
         V: AnnotatedValue<ScenarioTxEnvData, BigUint<StaticApi>>,
     {
         let env = self.new_env_data();
-        self.item.account.balance = Some(big_uint_annotated(&env, &balance_expr));
+        self.item.account.balance = Some(big_uint_annotated(&env, &balance));
         self
     }
 
-    pub fn esdt_balance<K, V>(mut self, token_id_expr: K, balance_expr: V) -> Self
+    pub fn esdt_balance<K, V>(mut self, token_id: K, balance: V) -> Self
     where
-        BytesKey: From<K>,
-        BigUintValue: From<V>,
+        K: AnnotatedValue<ScenarioTxEnvData, TokenIdentifier<StaticApi>>,
+        V: AnnotatedValue<ScenarioTxEnvData, BigUint<StaticApi>>,
     {
-        let token_id = BytesKey::from(token_id_expr);
-        let esdt_data_ref = self.get_esdt_data_or_create(&token_id);
-        esdt_data_ref.set_balance(0u64, balance_expr);
+        let env = self.new_env_data();
+        let token_id_key = token_identifier_annotated(&env, token_id);
+        let balance_value = big_uint_annotated(&env, &balance);
+
+        let esdt_data_ref = self.get_esdt_data_or_create(&token_id_key);
+        esdt_data_ref.set_balance(0u64, balance_value);
 
         self
     }
diff --git a/framework/scenario/src/scenario/tx_to_step/step_annotation.rs b/framework/scenario/src/scenario/tx_to_step/step_annotation.rs
index 186d835344..2a5a2dac51 100644
--- a/framework/scenario/src/scenario/tx_to_step/step_annotation.rs
+++ b/framework/scenario/src/scenario/tx_to_step/step_annotation.rs
@@ -1,9 +1,10 @@
 use multiversx_chain_scenario_format::serde_raw::ValueSubTree;
 use multiversx_sc::types::{
-    AnnotatedValue, BigUint, Code, ManagedAddress, ManagedBuffer, TxCodeValue, TxEnv, TxGas,
+    AnnotatedValue, BigUint, Code, ManagedAddress, ManagedBuffer, TokenIdentifier, TxCodeValue,
+    TxEnv, TxGas,
 };
 
-use crate::scenario_model::{AddressValue, BigUintValue, BytesValue, U64Value};
+use crate::scenario_model::{AddressValue, BigUintValue, BytesKey, BytesValue, U64Value};
 
 pub fn address_annotated<Env, Addr>(env: &Env, from: &Addr) -> AddressValue
 where
@@ -53,6 +54,18 @@ where
     }
 }
 
+pub fn token_identifier_annotated<Env, T>(env: &Env, value: T) -> BytesKey
+where
+    Env: TxEnv,
+    T: AnnotatedValue<Env, TokenIdentifier<Env::Api>>,
+{
+    let annotation = value.annotation(env).to_string();
+    BytesKey {
+        value: value.into_value(env).into_managed_buffer().to_vec(),
+        original: annotation,
+    }
+}
+
 pub fn code_annotated<Env, CodeValue>(env: &Env, code: Code<CodeValue>) -> BytesValue
 where
     Env: TxEnv,

From 04707803afd27d5426f385a8a8d0566b2a925237 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Sun, 28 Apr 2024 17:13:10 +0300
Subject: [PATCH 0786/1254] set state via AnnotatedValue - esdt_nft_balance

---
 .../rewards_distribution_integration_test.rs  | 13 ++----
 .../scenario-tester/tests/st_blackbox_test.rs |  3 +-
 .../annotated_impl_managed_buffer.rs          | 13 ++++++
 .../types/interaction/expr/test_address.rs    | 23 +++++++++--
 .../types/interaction/expr/test_sc_address.rs | 23 +++++++++--
 .../interaction/expr/test_token_identifier.rs | 14 +++++++
 .../scenario_set_account.rs                   | 41 ++++++++++---------
 7 files changed, 94 insertions(+), 36 deletions(-)

diff --git a/contracts/examples/rewards-distribution/tests/rewards_distribution_integration_test.rs b/contracts/examples/rewards-distribution/tests/rewards_distribution_integration_test.rs
index a99ecf7559..03ef580983 100644
--- a/contracts/examples/rewards-distribution/tests/rewards_distribution_integration_test.rs
+++ b/contracts/examples/rewards-distribution/tests/rewards_distribution_integration_test.rs
@@ -9,9 +9,6 @@ use rewards_distribution::{
     rewards_distribution_proxy, ContractObj, RewardsDistribution, DIVISION_SAFETY_CONSTANT,
 };
 
-const NFT_TOKEN_ID: &[u8] = b"NFT-123456";
-const NFT_TOKEN_ID_EXPR: &str = "str:NFT-123456";
-
 const ALICE_ADDRESS: TestAddress = TestAddress::new("alice");
 const OWNER_ADDRESS: TestAddress = TestAddress::new("owner");
 const REWARDS_DISTRIBUTION_ADDRESS: TestSCAddress = TestSCAddress::new("rewards-distribution");
@@ -19,6 +16,7 @@ const REWARDS_DISTRIBUTION_PATH: MxscPath = MxscPath::new("output/rewards-distri
 const SEED_NFT_MINTER_ADDRESS: TestSCAddress = TestSCAddress::new("seed-nft-minter");
 const SEED_NFT_MINTER_PATH: MxscPath =
     MxscPath::new("../seed-nft-minter/output/seed-nft-minter.mxsc.json");
+const NFT_TOKEN_ID: TestTokenIdentifier = TestTokenIdentifier::new("NFT-123456");
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
@@ -61,7 +59,7 @@ impl RewardsDistributionTestState {
             .tx()
             .from(OWNER_ADDRESS)
             .typed(mock_seed_nft_minter_proxy::MockSeedNftMinterProxy)
-            .init(TokenIdentifier::from_esdt_bytes(NFT_TOKEN_ID))
+            .init(NFT_TOKEN_ID)
             .code(SEED_NFT_MINTER_PATH)
             .run();
 
@@ -171,12 +169,7 @@ fn test_raffle_and_claim() {
             .nonce(1)
             .balance(2_070_000_000);
         for nft_nonce in nft_nonces {
-            account_setter = account_setter.esdt_nft_balance(
-                NFT_TOKEN_ID_EXPR,
-                nft_nonce,
-                "1",
-                Option::<&[u8]>::None,
-            );
+            account_setter = account_setter.esdt_nft_balance(NFT_TOKEN_ID, nft_nonce, 1, ());
         }
     }
 
diff --git a/contracts/feature-tests/scenario-tester/tests/st_blackbox_test.rs b/contracts/feature-tests/scenario-tester/tests/st_blackbox_test.rs
index 62630a0289..0eecb8682c 100644
--- a/contracts/feature-tests/scenario-tester/tests/st_blackbox_test.rs
+++ b/contracts/feature-tests/scenario-tester/tests/st_blackbox_test.rs
@@ -10,6 +10,7 @@ const OTHER_ADDRESS: TestAddress = TestAddress::new("other");
 const ST_ADDRESS: TestSCAddress = TestSCAddress::new("scenario-tester");
 const CODE_PATH: MxscPath = MxscPath::new("output/scenario-tester.mxsc.json");
 const TOKEN_ID: TestTokenIdentifier = TestTokenIdentifier::new("TOKEN-123456");
+const NFT_ID: TestTokenIdentifier = TestTokenIdentifier::new("NFT-123456");
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
@@ -132,7 +133,7 @@ fn set_state_test() {
         .account(third)
         .nonce(3)
         .balance(50)
-        .esdt_nft_balance("str:NFT-123456", "2", "1", Some(Vec::<u8>::new()))
+        .esdt_nft_balance(NFT_ID, 2, 1, ())
         .commit();
 
     world
diff --git a/framework/base/src/types/interaction/annotated/annotated_impl_managed_buffer.rs b/framework/base/src/types/interaction/annotated/annotated_impl_managed_buffer.rs
index b8d4fc8fd7..547e88fefb 100644
--- a/framework/base/src/types/interaction/annotated/annotated_impl_managed_buffer.rs
+++ b/framework/base/src/types/interaction/annotated/annotated_impl_managed_buffer.rs
@@ -25,3 +25,16 @@ where
         f(self)
     }
 }
+
+impl<Env> AnnotatedValue<Env, ManagedBuffer<Env::Api>> for ()
+where
+    Env: TxEnv,
+{
+    fn annotation(&self, _env: &Env) -> ManagedBuffer<Env::Api> {
+        ManagedBuffer::new()
+    }
+
+    fn to_value(&self, _env: &Env) -> ManagedBuffer<Env::Api> {
+        ManagedBuffer::new()
+    }
+}
diff --git a/framework/base/src/types/interaction/expr/test_address.rs b/framework/base/src/types/interaction/expr/test_address.rs
index 0d3278c67c..b01840ce06 100644
--- a/framework/base/src/types/interaction/expr/test_address.rs
+++ b/framework/base/src/types/interaction/expr/test_address.rs
@@ -1,8 +1,13 @@
 use core::ptr;
 
-use crate::types::{
-    AnnotatedValue, ManagedAddress, ManagedBuffer, TxEnv, TxFrom, TxFromSpecified, TxTo,
-    TxToSpecified,
+use multiversx_sc_codec::{CodecFrom, EncodeErrorHandler, TopEncode, TopEncodeOutput};
+
+use crate::{
+    api::ManagedTypeApi,
+    types::{
+        AnnotatedValue, ManagedAddress, ManagedBuffer, TxEnv, TxFrom, TxFromSpecified, TxTo,
+        TxToSpecified,
+    },
 };
 
 const ADDRESS_PREFIX: &str = "address:";
@@ -69,6 +74,18 @@ impl<'a, Env> TxFromSpecified<Env> for TestAddress<'a> where Env: TxEnv {}
 impl<'a, Env> TxTo<Env> for TestAddress<'a> where Env: TxEnv {}
 impl<'a, Env> TxToSpecified<Env> for TestAddress<'a> where Env: TxEnv {}
 
+impl<'a> TopEncode for TestAddress<'a> {
+    fn top_encode_or_handle_err<O, H>(&self, output: O, h: H) -> Result<(), H::HandledErr>
+    where
+        O: TopEncodeOutput,
+        H: EncodeErrorHandler,
+    {
+        self.eval_to_array().top_encode_or_handle_err(output, h)
+    }
+}
+
+impl<'a, Api> CodecFrom<TestAddress<'a>> for ManagedAddress<Api> where Api: ManagedTypeApi {}
+
 #[cfg(test)]
 pub mod tests {
     use super::*;
diff --git a/framework/base/src/types/interaction/expr/test_sc_address.rs b/framework/base/src/types/interaction/expr/test_sc_address.rs
index 3f603160b1..973ab80d92 100644
--- a/framework/base/src/types/interaction/expr/test_sc_address.rs
+++ b/framework/base/src/types/interaction/expr/test_sc_address.rs
@@ -1,8 +1,13 @@
 use core::ptr;
 
-use crate::types::{
-    heap::Address, AnnotatedValue, ManagedAddress, ManagedBuffer, TxEnv, TxFrom, TxFromSpecified,
-    TxTo, TxToSpecified,
+use multiversx_sc_codec::{CodecFrom, EncodeErrorHandler, TopEncode, TopEncodeOutput};
+
+use crate::{
+    api::ManagedTypeApi,
+    types::{
+        heap::Address, AnnotatedValue, ManagedAddress, ManagedBuffer, TxEnv, TxFrom,
+        TxFromSpecified, TxTo, TxToSpecified,
+    },
 };
 
 const SC_PREFIX: &str = "sc:";
@@ -89,6 +94,18 @@ impl<'a> TestSCAddress<'a> {
     }
 }
 
+impl<'a> TopEncode for TestSCAddress<'a> {
+    fn top_encode_or_handle_err<O, H>(&self, output: O, h: H) -> Result<(), H::HandledErr>
+    where
+        O: TopEncodeOutput,
+        H: EncodeErrorHandler,
+    {
+        self.eval_to_array().top_encode_or_handle_err(output, h)
+    }
+}
+
+impl<'a, Api> CodecFrom<TestSCAddress<'a>> for ManagedAddress<Api> where Api: ManagedTypeApi {}
+
 #[cfg(test)]
 pub mod tests {
     use super::*;
diff --git a/framework/base/src/types/interaction/expr/test_token_identifier.rs b/framework/base/src/types/interaction/expr/test_token_identifier.rs
index 62c03d8177..b22854b507 100644
--- a/framework/base/src/types/interaction/expr/test_token_identifier.rs
+++ b/framework/base/src/types/interaction/expr/test_token_identifier.rs
@@ -1,3 +1,5 @@
+use multiversx_sc_codec::{CodecFrom, EncodeErrorHandler, TopEncode, TopEncodeOutput};
+
 use crate::{
     api::ManagedTypeApi,
     types::{AnnotatedValue, ManagedBuffer, TokenIdentifier, TxEnv},
@@ -48,3 +50,15 @@ where
         TokenIdentifier::from_esdt_bytes(value.name)
     }
 }
+
+impl<'a> TopEncode for TestTokenIdentifier<'a> {
+    fn top_encode_or_handle_err<O, H>(&self, output: O, h: H) -> Result<(), H::HandledErr>
+    where
+        O: TopEncodeOutput,
+        H: EncodeErrorHandler,
+    {
+        self.name.top_encode_or_handle_err(output, h)
+    }
+}
+
+impl<'a, Api> CodecFrom<TestTokenIdentifier<'a>> for TokenIdentifier<Api> where Api: ManagedTypeApi {}
diff --git a/framework/scenario/src/facade/world_tx/scenario_set_state/scenario_set_account.rs b/framework/scenario/src/facade/world_tx/scenario_set_state/scenario_set_account.rs
index ecba63090e..82c64ba988 100644
--- a/framework/scenario/src/facade/world_tx/scenario_set_state/scenario_set_account.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_set_state/scenario_set_account.rs
@@ -1,10 +1,12 @@
 use std::collections::btree_map::Entry;
 
-use multiversx_sc::types::{AnnotatedValue, BigUint, TokenIdentifier};
+use multiversx_sc::types::{AnnotatedValue, BigUint, ManagedBuffer, TokenIdentifier};
 
 use crate::{
     imports::StaticApi,
-    scenario::tx_to_step::{big_uint_annotated, token_identifier_annotated, u64_annotated},
+    scenario::tx_to_step::{
+        big_uint_annotated, bytes_annotated, token_identifier_annotated, u64_annotated,
+    },
     scenario_model::{
         Account, AddressKey, AddressValue, BigUintValue, BytesKey, BytesValue, Esdt, EsdtObject,
         SetStateStep, U64Value,
@@ -37,9 +39,9 @@ impl SetStateBuilderItem for AccountItem {
 }
 
 impl<'w> SetStateBuilder<'w, AccountItem> {
-    pub fn nonce<V>(mut self, nonce: V) -> Self
+    pub fn nonce<N>(mut self, nonce: N) -> Self
     where
-        V: AnnotatedValue<ScenarioTxEnvData, u64>,
+        N: AnnotatedValue<ScenarioTxEnvData, u64>,
     {
         let env = self.new_env_data();
         self.item.account.nonce = Some(u64_annotated(&env, &nonce));
@@ -72,28 +74,29 @@ impl<'w> SetStateBuilder<'w, AccountItem> {
 
     pub fn esdt_nft_balance<K, N, V, T>(
         mut self,
-        token_id_expr: K,
-        nonce_expr: N,
-        balance_expr: V,
-        opt_attributes_expr: Option<T>,
+        token_id: K,
+        nonce: N,
+        balance: V,
+        attributes_expr: T,
     ) -> Self
     where
-        N: Clone,
-        BytesKey: From<K>,
-        U64Value: From<N>,
-        BigUintValue: From<V>,
-        BytesValue: From<T>,
+        K: AnnotatedValue<ScenarioTxEnvData, TokenIdentifier<StaticApi>>,
+        N: AnnotatedValue<ScenarioTxEnvData, u64>,
+        V: AnnotatedValue<ScenarioTxEnvData, BigUint<StaticApi>>,
+        T: AnnotatedValue<ScenarioTxEnvData, ManagedBuffer<StaticApi>>,
     {
-        let token_id = BytesKey::from(token_id_expr);
+        let env = self.new_env_data();
+        let token_id_key = token_identifier_annotated(&env, token_id);
+        let nonce_value = u64_annotated(&env, &nonce);
+        let balance_value = big_uint_annotated(&env, &balance);
 
         let esdt_obj_ref = self
-            .get_esdt_data_or_create(&token_id)
+            .get_esdt_data_or_create(&token_id_key)
             .get_mut_esdt_object();
-        esdt_obj_ref.set_balance(nonce_expr.clone(), balance_expr);
+        esdt_obj_ref.set_balance(nonce_value.clone(), balance_value);
 
-        if let Some(attributes_expr) = opt_attributes_expr {
-            esdt_obj_ref.set_token_attributes(nonce_expr, attributes_expr);
-        }
+        let attributes_value = bytes_annotated(&env, attributes_expr);
+        esdt_obj_ref.set_token_attributes(nonce_value, attributes_value);
 
         self
     }

From 2799dcddea0a2ae4380d20d0d148a48beab00e2f Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Sun, 28 Apr 2024 17:24:33 +0300
Subject: [PATCH 0787/1254] set state via AnnotatedValue -
 esdt_nft_balance_and_attributes

---
 .../scenario-tester/tests/st_blackbox_test.rs |  2 +-
 .../facade/world_tx/scenario_check_state.rs   | 55 +++++++++----------
 .../scenario_set_account.rs                   |  4 +-
 3 files changed, 28 insertions(+), 33 deletions(-)

diff --git a/contracts/feature-tests/scenario-tester/tests/st_blackbox_test.rs b/contracts/feature-tests/scenario-tester/tests/st_blackbox_test.rs
index 0eecb8682c..9f0b9091d3 100644
--- a/contracts/feature-tests/scenario-tester/tests/st_blackbox_test.rs
+++ b/contracts/feature-tests/scenario-tester/tests/st_blackbox_test.rs
@@ -140,7 +140,7 @@ fn set_state_test() {
         .check_account(third)
         .nonce(3)
         .balance(50)
-        .esdt_nft_balance_and_attributes("str:NFT-123456", "2", "1", Some(Vec::<u8>::new()))
+        .esdt_nft_balance_and_attributes(NFT_ID, 2, 1, ())
         .commit();
 
     // using no commit should drop the value naturally
diff --git a/framework/scenario/src/facade/world_tx/scenario_check_state.rs b/framework/scenario/src/facade/world_tx/scenario_check_state.rs
index 011aca29b3..047ea428a4 100644
--- a/framework/scenario/src/facade/world_tx/scenario_check_state.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_check_state.rs
@@ -1,24 +1,23 @@
 use std::collections::{btree_map::Entry, BTreeMap};
 
 use multiversx_chain_scenario_format::interpret_trait::{InterpretableFrom, InterpreterContext};
-use multiversx_sc::{
-    codec::test_util::top_encode_to_vec_u8_or_panic,
-    proxy_imports::TopEncode,
-    types::{AnnotatedValue, BigUint, ManagedAddress, TokenIdentifier},
+use multiversx_sc::types::{
+    AnnotatedValue, BigUint, ManagedAddress, ManagedBuffer, TokenIdentifier,
 };
 
 use crate::{
     api::StaticApi,
     scenario::{
         tx_to_step::{
-            address_annotated, big_uint_annotated, token_identifier_annotated, u64_annotated,
+            address_annotated, big_uint_annotated, bytes_annotated, token_identifier_annotated,
+            u64_annotated,
         },
         ScenarioRunner,
     },
     scenario_model::{
-        AddressKey, BigUintValue, BytesKey, BytesValue, CheckAccount, CheckEsdt, CheckEsdtData,
+        AddressKey, BytesKey, BytesValue, CheckAccount, CheckEsdt, CheckEsdtData,
         CheckEsdtInstances, CheckEsdtMap, CheckEsdtMapContents, CheckStateStep, CheckStorage,
-        CheckStorageDetails, CheckValue, U64Value,
+        CheckStorageDetails, CheckValue,
     },
     ScenarioTxEnvData, ScenarioWorld,
 };
@@ -173,38 +172,34 @@ impl<'w> CheckStateBuilder<'w> {
 
     pub fn esdt_nft_balance_and_attributes<K, N, V, T>(
         mut self,
-        token_id_expr: K,
-        nonce_expr: N,
-        balance_expr: V,
-        attributes_expr: Option<T>,
+        token_id: K,
+        nonce: N,
+        balance: V,
+        attributes: T,
     ) -> Self
     where
-        BytesKey: From<K>,
-        U64Value: From<N>,
-        BigUintValue: From<V>,
-        T: TopEncode,
+        K: AnnotatedValue<ScenarioTxEnvData, TokenIdentifier<StaticApi>>,
+        N: AnnotatedValue<ScenarioTxEnvData, u64>,
+        V: AnnotatedValue<ScenarioTxEnvData, BigUint<StaticApi>>,
+        T: AnnotatedValue<ScenarioTxEnvData, ManagedBuffer<StaticApi>>,
     {
-        let token_id = BytesKey::from(token_id_expr);
+        let env = self.new_env_data();
+        let token_id_key = token_identifier_annotated(&env, token_id);
+        let nonce_value = u64_annotated(&env, &nonce);
+        let balance_value = big_uint_annotated(&env, &balance);
+        let attributes_value = bytes_annotated(&env, attributes);
 
         if let CheckEsdtMap::Unspecified = &self.current_account.esdt {
             let mut check_esdt = CheckEsdt::Full(CheckEsdtData::default());
 
-            if let Some(attributes_expr) = attributes_expr {
-                check_esdt.add_balance_and_attributes_check(
-                    nonce_expr,
-                    balance_expr,
-                    top_encode_to_vec_u8_or_panic(&attributes_expr),
-                );
-            } else {
-                check_esdt.add_balance_and_attributes_check(
-                    nonce_expr,
-                    balance_expr,
-                    Vec::<u8>::new(),
-                );
-            }
+            check_esdt.add_balance_and_attributes_check(
+                nonce_value,
+                balance_value,
+                attributes_value,
+            );
 
             let mut new_esdt_map = BTreeMap::new();
-            let _ = new_esdt_map.insert(token_id, check_esdt);
+            let _ = new_esdt_map.insert(token_id_key, check_esdt);
 
             let new_check_esdt_map = CheckEsdtMapContents {
                 contents: new_esdt_map,
diff --git a/framework/scenario/src/facade/world_tx/scenario_set_state/scenario_set_account.rs b/framework/scenario/src/facade/world_tx/scenario_set_state/scenario_set_account.rs
index 82c64ba988..e61dcd1052 100644
--- a/framework/scenario/src/facade/world_tx/scenario_set_state/scenario_set_account.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_set_state/scenario_set_account.rs
@@ -77,7 +77,7 @@ impl<'w> SetStateBuilder<'w, AccountItem> {
         token_id: K,
         nonce: N,
         balance: V,
-        attributes_expr: T,
+        attributes: T,
     ) -> Self
     where
         K: AnnotatedValue<ScenarioTxEnvData, TokenIdentifier<StaticApi>>,
@@ -89,13 +89,13 @@ impl<'w> SetStateBuilder<'w, AccountItem> {
         let token_id_key = token_identifier_annotated(&env, token_id);
         let nonce_value = u64_annotated(&env, &nonce);
         let balance_value = big_uint_annotated(&env, &balance);
+        let attributes_value = bytes_annotated(&env, attributes);
 
         let esdt_obj_ref = self
             .get_esdt_data_or_create(&token_id_key)
             .get_mut_esdt_object();
         esdt_obj_ref.set_balance(nonce_value.clone(), balance_value);
 
-        let attributes_value = bytes_annotated(&env, attributes_expr);
         esdt_obj_ref.set_token_attributes(nonce_value, attributes_value);
 
         self

From e066ac9baf87d9407b684de5add6e885b312bbca Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Sun, 28 Apr 2024 17:41:42 +0300
Subject: [PATCH 0788/1254] set state via AnnotatedValue - code, owner

---
 .../scenario_set_account.rs                   | 27 ++++++++++++-------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/framework/scenario/src/facade/world_tx/scenario_set_state/scenario_set_account.rs b/framework/scenario/src/facade/world_tx/scenario_set_state/scenario_set_account.rs
index e61dcd1052..ce238d34b9 100644
--- a/framework/scenario/src/facade/world_tx/scenario_set_state/scenario_set_account.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_set_state/scenario_set_account.rs
@@ -1,15 +1,18 @@
 use std::collections::btree_map::Entry;
 
-use multiversx_sc::types::{AnnotatedValue, BigUint, ManagedBuffer, TokenIdentifier};
+use multiversx_sc::types::{
+    AnnotatedValue, BigUint, ManagedAddress, ManagedBuffer, TokenIdentifier,
+};
 
 use crate::{
     imports::StaticApi,
     scenario::tx_to_step::{
-        big_uint_annotated, bytes_annotated, token_identifier_annotated, u64_annotated,
+        address_annotated, big_uint_annotated, bytes_annotated, token_identifier_annotated,
+        u64_annotated,
     },
     scenario_model::{
-        Account, AddressKey, AddressValue, BigUintValue, BytesKey, BytesValue, Esdt, EsdtObject,
-        SetStateStep, U64Value,
+        Account, AddressKey, BigUintValue, BytesKey, BytesValue, Esdt, EsdtObject, SetStateStep,
+        U64Value,
     },
     ScenarioTxEnvData,
 };
@@ -179,19 +182,23 @@ impl<'w> SetStateBuilder<'w, AccountItem> {
         self.item.account.esdt.get_mut(token_id).unwrap()
     }
 
-    pub fn code<V>(mut self, code_expr: V) -> Self
+    pub fn code<C>(mut self, code: C) -> Self
     where
-        BytesValue: From<V>,
+        C: AnnotatedValue<ScenarioTxEnvData, ManagedBuffer<StaticApi>>,
     {
-        self.item.account.code = Some(BytesValue::from(code_expr));
+        let env = self.new_env_data();
+        let code_value = bytes_annotated(&env, code);
+        self.item.account.code = Some(code_value);
         self
     }
 
-    pub fn owner<V>(mut self, owner_expr: V) -> Self
+    pub fn owner<V>(mut self, owner: V) -> Self
     where
-        AddressValue: From<V>,
+        V: AnnotatedValue<ScenarioTxEnvData, ManagedAddress<StaticApi>>,
     {
-        self.item.account.owner = Some(AddressValue::from(owner_expr));
+        let env = self.new_env_data();
+        let owner_value = address_annotated(&env, &owner);
+        self.item.account.owner = Some(owner_value);
         self
     }
 }

From 352ec3de9bf1fe7c24d947662e03a4d23b29e228 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Mon, 29 Apr 2024 13:00:03 +0300
Subject: [PATCH 0789/1254] set state via AnnotatedValue -
 esdt_nft_all_properties, esdt_nft_last_nonce, esdt_roles

---
 .../scenario_set_account.rs                   | 82 +++++++++++--------
 1 file changed, 47 insertions(+), 35 deletions(-)

diff --git a/framework/scenario/src/facade/world_tx/scenario_set_state/scenario_set_account.rs b/framework/scenario/src/facade/world_tx/scenario_set_state/scenario_set_account.rs
index ce238d34b9..0c14dc6b16 100644
--- a/framework/scenario/src/facade/world_tx/scenario_set_state/scenario_set_account.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_set_state/scenario_set_account.rs
@@ -10,10 +10,7 @@ use crate::{
         address_annotated, big_uint_annotated, bytes_annotated, token_identifier_annotated,
         u64_annotated,
     },
-    scenario_model::{
-        Account, AddressKey, BigUintValue, BytesKey, BytesValue, Esdt, EsdtObject, SetStateStep,
-        U64Value,
-    },
+    scenario_model::{Account, AddressKey, BytesKey, Esdt, EsdtObject, SetStateStep},
     ScenarioTxEnvData,
 };
 
@@ -107,64 +104,79 @@ impl<'w> SetStateBuilder<'w, AccountItem> {
     #[allow(clippy::too_many_arguments)]
     pub fn esdt_nft_all_properties<K, N, V, T>(
         mut self,
-        token_id_expr: K,
-        nonce_expr: N,
-        balance_expr: V,
-        opt_attributes_expr: Option<T>,
-        royalties_expr: N,
-        creator_expr: Option<T>,
-        hash_expr: Option<T>,
-        uris_expr: Vec<T>,
+        token_id: K,
+        nonce: N,
+        balance: V,
+        attributes: T,
+        royalties: N,
+        creator: T,
+        hash: T,
+        uris: Vec<T>,
     ) -> Self
     where
-        BytesKey: From<K>,
-        U64Value: From<N>,
-        BigUintValue: From<V>,
-        BytesValue: From<T>,
+        K: AnnotatedValue<ScenarioTxEnvData, TokenIdentifier<StaticApi>>,
+        N: AnnotatedValue<ScenarioTxEnvData, u64>,
+        V: AnnotatedValue<ScenarioTxEnvData, BigUint<StaticApi>>,
+        T: AnnotatedValue<ScenarioTxEnvData, ManagedBuffer<StaticApi>>,
     {
-        let token_id = BytesKey::from(token_id_expr);
+        let env = self.new_env_data();
+        let token_id_key = token_identifier_annotated(&env, token_id);
+        let nonce_value = u64_annotated(&env, &nonce);
+        let royalties_value = u64_annotated(&env, &royalties);
+        let balance_value = big_uint_annotated(&env, &balance);
+        let attributes_value = bytes_annotated(&env, attributes);
+        let creator_value = bytes_annotated(&env, creator);
+        let hash_value = bytes_annotated(&env, hash);
+        let mut uris_value = Vec::new();
+        for uri in uris {
+            let uri_value = bytes_annotated(&env, uri);
+            uris_value.push(uri_value);
+        }
 
         let esdt_obj_ref = self
-            .get_esdt_data_or_create(&token_id)
+            .get_esdt_data_or_create(&token_id_key)
             .get_mut_esdt_object();
 
         esdt_obj_ref.set_token_all_properties(
-            nonce_expr,
-            balance_expr,
-            opt_attributes_expr,
-            royalties_expr,
-            creator_expr,
-            hash_expr,
-            uris_expr,
+            nonce_value,
+            balance_value,
+            Some(attributes_value),
+            royalties_value,
+            Some(creator_value),
+            Some(hash_value),
+            uris_value,
         );
 
         self
     }
 
-    pub fn esdt_nft_last_nonce<K, N>(mut self, token_id_expr: K, last_nonce_expr: N) -> Self
+    pub fn esdt_nft_last_nonce<K, N>(mut self, token_id: K, last_nonce: N) -> Self
     where
-        BytesKey: From<K>,
-        U64Value: From<N>,
+        K: AnnotatedValue<ScenarioTxEnvData, TokenIdentifier<StaticApi>>,
+        N: AnnotatedValue<ScenarioTxEnvData, u64>,
     {
-        let token_id = BytesKey::from(token_id_expr);
+        let env = self.new_env_data();
+        let token_id_key = token_identifier_annotated(&env, token_id);
+        let nonce_value = u64_annotated(&env, &last_nonce);
 
         let esdt_obj_ref = self
-            .get_esdt_data_or_create(&token_id)
+            .get_esdt_data_or_create(&token_id_key)
             .get_mut_esdt_object();
-        esdt_obj_ref.set_last_nonce(last_nonce_expr);
+        esdt_obj_ref.set_last_nonce(nonce_value);
 
         self
     }
 
     // TODO: Find a better way to pass roles
-    pub fn esdt_roles<K>(mut self, token_id_expr: K, roles: Vec<String>) -> Self
+    pub fn esdt_roles<K>(mut self, token_id: K, roles: Vec<String>) -> Self
     where
-        BytesKey: From<K>,
+        K: AnnotatedValue<ScenarioTxEnvData, TokenIdentifier<StaticApi>>,
     {
-        let token_id = BytesKey::from(token_id_expr);
+        let env = self.new_env_data();
+        let token_id_key = token_identifier_annotated(&env, token_id);
 
         let esdt_obj_ref = self
-            .get_esdt_data_or_create(&token_id)
+            .get_esdt_data_or_create(&token_id_key)
             .get_mut_esdt_object();
         esdt_obj_ref.set_roles(roles);
 

From f18b36ec7947ed36a4e375408e4feef4473cc69e Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Mon, 29 Apr 2024 13:03:35 +0300
Subject: [PATCH 0790/1254] set block via AnnotatedValue - block_epoch,
 block_nonce, block_round, block_timestamp, block_random_seed

---
 .../scenario_set_state/scenario_set_block.rs  | 54 +++++++++++--------
 1 file changed, 33 insertions(+), 21 deletions(-)

diff --git a/framework/scenario/src/facade/world_tx/scenario_set_state/scenario_set_block.rs b/framework/scenario/src/facade/world_tx/scenario_set_state/scenario_set_block.rs
index 9b487859e4..3ef0d06cca 100644
--- a/framework/scenario/src/facade/world_tx/scenario_set_state/scenario_set_block.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_set_state/scenario_set_block.rs
@@ -1,4 +1,11 @@
-use crate::scenario_model::{BlockInfo, BytesValue, SetStateStep, U64Value};
+use multiversx_sc::types::{AnnotatedValue, ManagedBuffer};
+
+use crate::{
+    imports::StaticApi,
+    scenario::tx_to_step::{bytes_annotated, u64_annotated},
+    scenario_model::{BlockInfo, SetStateStep},
+    ScenarioTxEnvData,
+};
 
 use super::{SetStateBuilder, SetStateBuilderItem};
 
@@ -43,53 +50,58 @@ impl SetStateBuilderItem for BlockItem {
 }
 
 impl<'w> SetStateBuilder<'w, BlockItem> {
-    pub fn block_epoch<N>(mut self, block_epoch_expr: N) -> Self
+    pub fn block_epoch<N>(mut self, block_epoch: N) -> Self
     where
-        U64Value: From<N>,
+        N: AnnotatedValue<ScenarioTxEnvData, u64>,
     {
-        let block_epoch = U64Value::from(block_epoch_expr);
+        let env = self.new_env_data();
+        let block_epoch_value = u64_annotated(&env, &block_epoch);
 
-        self.item.block_info.block_epoch = Some(block_epoch);
+        self.item.block_info.block_epoch = Some(block_epoch_value);
         self
     }
 
-    pub fn block_nonce<N>(mut self, block_nonce_expr: N) -> Self
+    pub fn block_nonce<N>(mut self, block_nonce: N) -> Self
     where
-        U64Value: From<N>,
+        N: AnnotatedValue<ScenarioTxEnvData, u64>,
     {
-        let block_nonce = U64Value::from(block_nonce_expr);
+        let env = self.new_env_data();
+        let block_nonce_value = u64_annotated(&env, &block_nonce);
 
-        self.item.block_info.block_nonce = Some(block_nonce);
+        self.item.block_info.block_nonce = Some(block_nonce_value);
         self
     }
 
-    pub fn block_round<N>(mut self, block_round_expr: N) -> Self
+    pub fn block_round<N>(mut self, block_round: N) -> Self
     where
-        U64Value: From<N>,
+        N: AnnotatedValue<ScenarioTxEnvData, u64>,
     {
-        let block_round = U64Value::from(block_round_expr);
+        let env = self.new_env_data();
+        let block_round_value = u64_annotated(&env, &block_round);
 
-        self.item.block_info.block_round = Some(block_round);
+        self.item.block_info.block_round = Some(block_round_value);
         self
     }
 
-    pub fn block_timestamp<N>(mut self, block_timestamp_expr: N) -> Self
+    pub fn block_timestamp<N>(mut self, block_timestamp: N) -> Self
     where
-        U64Value: From<N>,
+        N: AnnotatedValue<ScenarioTxEnvData, u64>,
     {
-        let block_timestamp = U64Value::from(block_timestamp_expr);
+        let env = self.new_env_data();
+        let block_timestamp_value = u64_annotated(&env, &block_timestamp);
 
-        self.item.block_info.block_timestamp = Some(block_timestamp);
+        self.item.block_info.block_timestamp = Some(block_timestamp_value);
         self
     }
 
-    pub fn block_random_seed<B>(mut self, block_random_seed_expr: B) -> Self
+    pub fn block_random_seed<B>(mut self, block_random_seed: B) -> Self
     where
-        BytesValue: From<B>,
+        B: AnnotatedValue<ScenarioTxEnvData, ManagedBuffer<StaticApi>>,
     {
-        let block_random_seed = BytesValue::from(block_random_seed_expr);
+        let env = self.new_env_data();
+        let block_random_seed_value = bytes_annotated(&env, block_random_seed);
 
-        self.item.block_info.block_random_seed = Some(block_random_seed);
+        self.item.block_info.block_random_seed = Some(block_random_seed_value);
         self
     }
 }

From c8bda97430318b4a4e0b1b09a4da252949c21585 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Mon, 29 Apr 2024 13:04:14 +0300
Subject: [PATCH 0791/1254] check state via AnnotatedValue - code

---
 .../multisig/tests/multisig_blackbox_test.rs         |  2 +-
 .../src/facade/world_tx/scenario_check_state.rs      | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/contracts/examples/multisig/tests/multisig_blackbox_test.rs b/contracts/examples/multisig/tests/multisig_blackbox_test.rs
index 714adf2f9e..7d439a00fc 100644
--- a/contracts/examples/multisig/tests/multisig_blackbox_test.rs
+++ b/contracts/examples/multisig/tests/multisig_blackbox_test.rs
@@ -610,5 +610,5 @@ fn test_deploy_and_upgrade_from_source() {
     state
         .world
         .check_account(ADDER_ADDRESS)
-        .code(factorial_path.eval_to_expr().as_str());
+        .code(factorial_path);
 }
diff --git a/framework/scenario/src/facade/world_tx/scenario_check_state.rs b/framework/scenario/src/facade/world_tx/scenario_check_state.rs
index 047ea428a4..e79756ad1d 100644
--- a/framework/scenario/src/facade/world_tx/scenario_check_state.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_check_state.rs
@@ -110,14 +110,14 @@ impl<'w> CheckStateBuilder<'w> {
         self
     }
 
-    pub fn code<V>(mut self, code_expr: V) -> Self
+    pub fn code<V>(mut self, code: V) -> Self
     where
-        BytesValue: InterpretableFrom<V>,
+        V: AnnotatedValue<ScenarioTxEnvData, ManagedBuffer<StaticApi>>,
     {
-        self.current_account.code = CheckValue::Equal(BytesValue::interpret_from(
-            code_expr,
-            &InterpreterContext::default(),
-        ));
+        let env = self.new_env_data();
+        let code_value = bytes_annotated(&env, code);
+
+        self.current_account.code = CheckValue::Equal(code_value);
         self
     }
 

From 64cfb775ff7fc36602f5c0cb37c54eb1799141c5 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Mon, 29 Apr 2024 13:10:24 +0200
Subject: [PATCH 0792/1254] api fetch optimization, test reorg and unit test

---
 .../scenario/model/transaction/tx_response.rs | 2380 ---------------
 framework/scenario/tests/tx_response_tests.rs | 2661 +++++++++++++++++
 framework/snippets/src/interactor_retrieve.rs |   25 +-
 3 files changed, 2682 insertions(+), 2384 deletions(-)
 create mode 100644 framework/scenario/tests/tx_response_tests.rs

diff --git a/framework/scenario/src/scenario/model/transaction/tx_response.rs b/framework/scenario/src/scenario/model/transaction/tx_response.rs
index d4171c6590..1465885476 100644
--- a/framework/scenario/src/scenario/model/transaction/tx_response.rs
+++ b/framework/scenario/src/scenario/model/transaction/tx_response.rs
@@ -254,2383 +254,3 @@ impl TxResponse {
         }
     }
 }
-
-#[cfg(test)]
-mod tests {
-    use crate::scenario_model::TxResponse;
-    use multiversx_sc::types::Address;
-    use multiversx_sdk::data::transaction::{TransactionInfo, TransactionOnNetwork};
-
-    #[test]
-    fn test_deployed_address() {
-        let data = r#"
-        {
-  "data": {
-    "transaction": {
-      "type": "normal",
-      "processingTypeOnSource": "SCDeployment",
-      "processingTypeOnDestination": "SCDeployment",
-      "hash": "07a176d1734d1901d396be344f97e1d80f076269e9559f9b2110f6f11c4f74de",
-      "nonce": 427,
-      "round": 2190715,
-      "epoch": 887,
-      "value": "0",
-      "receiver": "erd1qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqq6gq4hu",
-      "sender": "erd1j6kua7p67qnaw3y4sudmk25xsuv4k8ws6pwvax8fd2vtmuc3q33s840l87",
-      "gasPrice": 1000000000,
-      "gasLimit": 600000000,
-      "data": "0061736d010000000198011960027f7f0060017f017f6000006000017f60027f7f017f60037f7f7f0060017f0060047f7f7f7f0060057f7f7f7f7f0060037f7f7f017f60047f7f7f7f017f60027f7e0060017f017e60027f7f017e60057f7f7e7f7f017f60067e7f7f7f7f7f017f60017e006000017e60017e017f60047f7f7e7f0060057e7f7f7f7f017f60047f7f7f7e0060017e017e60047f7e7f7f0060027e7f0002c1072903656e76126d616e616765645369676e616c4572726f72000603656e760e626967496e74536574496e743634000b03656e7609626967496e74416464000503656e760b7369676e616c4572726f72000003656e760a6d4275666665724e6577000303656e760d6d427566666572417070656e64000403656e76096d4275666665724571000403656e760d6d42756666657246696e697368000103656e76226d616e616765644d756c74695472616e73666572455344544e465445786563757465000e03656e761b6d616e61676564457865637574654f6e44657374436f6e74657874000f03656e760d6d616e6167656443616c6c6572000603656e76106d616e61676564534341646472657373000603656e76136d616e616765644f776e657241646472657373000603656e761c6d616e616765644765744d756c74694553445443616c6c56616c7565000603656e76126d427566666572476574417267756d656e74000403656e76126d427566666572417070656e644279746573000903656e7619626967496e74476574556e7369676e6564417267756d656e74000003656e761b736d616c6c496e74476574556e7369676e6564417267756d656e74000c03656e76106d4275666665724765744c656e677468000103656e760f6765744e756d417267756d656e7473000303656e7616736d616c6c496e7446696e697368556e7369676e6564001003656e7609626967496e74537562000503656e760a6765744761734c656674001103656e760f636c65616e52657475726e44617461000203656e760f6d4275666665725365744279746573000903656e7609626967496e74436d70000403656e760a626967496e7454446976000503656e7609626967496e744d756c000503656e76196d42756666657246726f6d426967496e74556e7369676e6564000403656e76176d427566666572546f426967496e74556e7369676e6564000403656e7609626967496e74506f77000503656e76146d427566666572436f707942797465536c696365000a03656e76126d42756666657253746f726167654c6f6164000403656e76136d42756666657253746f7261676553746f7265000403656e760e636865636b4e6f5061796d656e74000203656e76176d616e616765644765744261636b5472616e7366657273000003656e760f6d616e6167656457726974654c6f67000003656e7614626967496e7446696e697368556e7369676e6564000603656e760666696e697368000003656e760a626967496e745369676e000103656e76136d42756666657247657442797465536c696365000a03d301d1010103080201120104000107060606000401090100010000000013030014030303020301070400030901090909000707010006060106060c0501080500010b00080715070808000a0016010106010000000500000103000601001705050a070400040a00040404000404040404010100040d070707080a000501010505060101000b0b0101010101050d0105000000050500000000000c070707070000081803030300030300010407030303030101030303030202020202020202020202020202020202020202020202020202020202080805030100030616037f01418080080b7f0041e9db080b7f0041f0db080b07c70520066d656d6f7279020004696e697400db01077570677261646500dc01076465706f73697400dd0108776974686472617700de0108636f6d706f756e6400df010e676574546f74616c41737365747300e0010f6765745661756c744164647265737300e101176765744173736574546f6b656e4964656e74696669657200e2011d6765744d6f6e65794d61726b6574546f6b656e4964656e74696669657200e301226765744d6f6e65794d61726b6574556e6465726c79696e674964656e74696669657200e4011f676574426f6f737465725374616b6564546f6b656e4964656e74696669657200e50114676574436f6e74726f6c6c65724164647265737300e601156765744d6f6e65794d61726b65744164647265737300e7011d6765745772617070656445676c64436f6e74726163744164647265737300e8011d6765745772617070656445676c64546f6b656e4964656e74696669657200e90111676574426f6f737465724164647265737300ea0119676574436f6d706f756e645845786368616e6765537761707300eb0117676574436f6d706f756e6441736873776170537761707300ec0116676574436f6d706f756e644665657350657263656e7400ed0119676574506572666f726d616e63654665657350657263656e7400ee010e7374616b65496e426f6f7374657200ef011b726562616c616e6365506f7274666f6c696f496e426f6f7374657200f00112756e7374616b6546726f6d426f6f7374657200f10118636c61696d4d756c7469706c6546726f6d426f6f7374657200f20119736574506572666f726d616e63654665657350657263656e7400f30116736574436f6d706f756e644665657350657263656e7400f40110736574436f6d706f756e64537761707300f5010d6765744e61747572616c41505900f6010863616c6c4261636b00f7010a5f5f646174615f656e6403010b5f5f686561705f6261736503020a9aa901d1011601017f102a220142001001200120012000100220010b1901017f41c88d0841c88d0828020041016b220036020020000b2e000240200120024d0440200220044d0d01102c000b102c000b2000200220016b3602042000200120036a3602000b0b0041b88d08410e1003000b1301017f102a22012000ad42ff0183100120010b2101017f102a21012000420053044041b2850841111003000b20012000100120010b0f01017f10042201200010051a20010b0b0020002001100641004a0b2d01017f230041206b2202240020022000103241c08008410810332002200136021820021034200241206a24000b1900200041feffffff0746044041c8800841191003000b20000b2a0020022003104d2102104321032000427f3703082000200336020420002002360200200020013602100b7d01037f230041106b22012400200029030810712000280210200028021820002802002000280204104521021017410021002002101221032001410036020c200120023602042001200341027622023602080340200020024f450440200141046a10751a20012802082102200128020c21000c010b0b200141106a24000b3601027f230041106b22012400200141086a103620012802082102200020012d000c4101713a000420002002360200200141106a24000b6d01027f230041106b220124002000027f41e0db082d0000220245044041e0db0841013a000041dcdb084100360200200141086a4100109f012001280208200128020c41b88d084100105710430c010b41b88d084100104d0b360200200020024101733a0004200141106a24000b0b0020002001103810071a0b4901017f230041106b22022400200220013a000c20022000360208200241086a10a501200228020820022d000c044041dcdb08410036020041e0db0841003a00000b200241106a24000b0e002000418a8508410b103a103b0b130020002000200120021052200120021085010b0d002000102a2200101d1a20000b0a002000103d2001103e0b0f01017f102a22012000101c1a20010b5101027f230041106b22022400200220001012220341187420034180fe03714108747220034108764180fe03712003411876727236020c20012002410c6a410410a3012001200010bd01200241106a24000b0a002000103d200110400b5101027f230041106b22022400200220001012220341187420034180fe03714108747220034108764180fe03712003411876727236020c20012002410c6a4104100f1a20012000108b01200241106a24000b0900200020011003000b5001047f1043210610432107230041106b22042400104321052001102f210120042003102936020c20042002370300200420013602082005200410442000200542002006200710081a200441106a24000b1301017f102a220041b88d08410010181a20000bd20102027f017e230041106b2203240020032001280208220241187420024180fe03714108747220024108764180fe0371200241187672723602002003200128020c220241187420024180fe03714108747220024108764180fe03712002411876727236020c20032001290300220442388620044280fe0383422886842004428080fc0783421886200442808080f80f834208868484200442088842808080f80f832004421888428080fc07838420044228884280fe03832004423888848484370204200020034110100f1a200341106a24000b150020002001200220032004102a220110091a20010b0c01017f102a2200100a20000b0c01017f102a2200100b20000b0c01017f102a2200100c20000b150010481046103004400f0b41928d0841241003000b2b01017f41e8db082d000022000440416b41ffffffff0720001b0f0b41e8db0841013a0000416b100d416b0b0d002000102a2200100e1a20000b2e01017f41d583084117104d220420002001100f1a200441ec83084103100f1a200420022003100f1a20041000000b1101017f102a22022000200110181a20020b4601017f230041106b220224002002200141187420014180fe03714108747220014108764180fe03712001411876727236020c20002002410c6a4104100f1a200241106a24000b0e01017f4100102a2200101020000b1f002000104b2200101241204704402001200241b086084110104c000b20000bd90301097f230041406a220124002000104b210210432106200210122100200141246a41003a0000200141206a20003602002001200236021c200120003602182001410036021441002102037f2000200246047f20012d0024044041dcdb08410036020041e0db0841003a00000b200141406b2400200605200141146a2200419787084116103a210420004197870841161052210010432103034020000440200141146a2205419787084116105221072005419787084116105321082005419787084116103a2109410021020240024002402005419787084116105441ff01710e020201000b41978708411641ed8608410d104c000b410121020b200120023a0034200120093602302001200836022c200120073602282003200141286a1055200041016b21000c010b0b200142003703282001200441187420044180fe03714108747220044108764180fe03712004411876727236023c200141086a200141286a22004100410410562001280208200128020c2001413c6a2202410410572001200341187420034180fe03714108747220034108764180fe03712003411876727236023c2001200041044108105620012802002001280204200241041057200620004108100f1a20012802142102200128021821000c010b0b0b3702017f017e230041106b220324002003410036020c20002003410c6a220041042001200210c5012000410410b101200341106a2400a70b0d0020004120200120021085010b3001017f230041106b22032400200341003a000f20002003410f6a41012001200210c50120032d000f200341106a24000bf60201057f230041d0006b22022400200242003700352002420037033020022001280200220341187420034180fe03714108747220034108764180fe037120034118767272360240200241286a200241306a220541004104109b012002280228200228022c200241406b220441041057200241c8006a41003a00002002420037034020022001280204220341187420034180fe03714108747220034108764180fe03712003411876727236024c200241206a200441004104109c0120022802202002280224200241cc006a2206410410572002200141086a280200220341187420034180fe03714108747220034108764180fe03712003411876727236024c200241186a200441044108109c012002280218200228021c20064104105720022001410c6a2d00003a004c200241106a200441084109109c0120022802102002280214200641011057200241086a20054104410d109b012002280208200228020c20044109105720002005410d100f1a200241d0006a24000b0f002000200120022003410810f9010bb50201067f200120034604402001220341104f04402000410020006b41037122046a210520040440200221010340200020012d00003a0000200141016a2101200041016a22002005490d000b0b2005200320046b2203417c7122066a21000240200220046a22044103710440200641004c0d012004410374220141187121072004417c71220841046a2102410020016b4118712109200828020021010340200520012007762002280200220120097472360200200241046a2102200541046a22052000490d000b0c010b200641004c0d0020042102034020052002280200360200200241046a2102200541046a22052000490d000b0b20034103712103200420066a21020b20030440200020036a21010340200020022d00003a0000200241016a2102200041016a22002001490d000b0b0f0b102c000ba20301077f230041406a220124002000104b2102104321052002101221002001412c6a41003a0000200141286a200036020020012002360224200120003602202001410036021c41002102037f2000200246047f20012d002c044041dcdb08410036020041e0db0841003a00000b200141406b24002005052001411c6a220041ad87084118103a2103200041ad8708411810522100104321020340200004402001411c6a220441ad8708411810522106200441ad8708411810532107200441ad87084118103a21042001200636023820012004360234200120073602302002200141306a1059200041016b21000c010b0b200142003703302001200341187420034180fe03714108747220034108764180fe03712003411876727236023c200141106a200141306a2200410041041056200128021020012802142001413c6a2203410410572001200241187420024180fe03714108747220024108764180fe03712002411876727236023c200141086a20004104410810562001280208200128020c200341041057200520004108100f1a200128021c2102200128022021000c010b0b0bb80201047f230041406a22022400200241286a41003602002002420037032020022001280208220341187420034180fe03714108747220034108764180fe037120034118767272360230200241186a200241206a220541004104109a012002280218200228021c200241306a2204410410572002420037033020022001280200220341187420034180fe03714108747220034108764180fe03712003411876727236023c200241106a2004410041041056200228021020022802142002413c6a22034104105720022001280204220141187420014180fe03714108747220014108764180fe03712001411876727236023c200241086a20044104410810562002280208200228020c200341041057200220054104410c109a012002280200200228020420044108105720002005410c100f1a200241406b24000b1400101320004604400f0b4192840841191003000b09002000105c10071a0b1d00200010a70122001012412047044041b086084110108801000b20000b0a00200010a70110071a0b08002000105f10140b6102027f017e230041106b2201240020014200370308200010a70122001012220241094f044041958508410e108801000b2001200141086a200210b001200041002001280200220020012802042202108a011a2000200210b101200141106a24000b1f0020002001200210152000106141ff017104400f0b41ab840841301003000b1500410241012000102722001b4100200041004e1b0bf80101047f230041d0006b2205240020052004360228200541206a41db840841141063200528022021072005280224220620031064200410652103104322082003ad106620062008104e200520041012360234200541003602302005200541286a36022c0340200541386a2005412c6a10672005290338500440200520072006200120021068200528020421012000200528020036020020002001360204200541d0006a240005200528024c2103200541186a2007200620052802481069200541106a2005280218200528021c2005290340106a200541086a200528021020052802142003106b200528020c2106200528020821070c010b0b0b180020012002104d210120001043360204200020013602000b100010431a20002001280200102f104e0b0900200010124104760b3801017f230041106b2202240020024200370308200220014100200241086a10820120002002280200200228020410181a200241106a24000ba70102057f017e230041206b2202240020002001280204220441106a220520012802084d047e2001280200200241106a4200370300200242003703082802002004200241086a22034110106f1a2002410036021c20032002411c6a22061098012104200320061099012107200041146a200241086a2002411c6a109801360200200041106a2004360200200020073703082001200536020442010542000b370300200241206a24000b910101037f230041106b22052400024020031012450d0020022003106e200410122106410021030340200341046a220720064b0d012005410036020c200420032005410c6a4104106f1a2002200528020c220341187420034180fe03714108747220034108764180fe037120034118767272106e200721030c000b000b2000200236020420002001360200200541106a24000b160020022003106e20002002360204200020013602000b2001017f104322042003106620022004104e20002002360204200020013602000b160020032002107020002002360204200020013602000ba30101027f230041306b22052400200541286a41ef8408410f1063200541206a2005280228200528022c20042802081069200541186a200528022020052802242004290300106a200541106a2005280218200528021c200428020c106b200528021021042005280214210610431a20062003102f104e200541086a20042006200120021068200528020c21012000200528020836020020002001360204200541306a24000b7101017f230041206b22052400200541186a41fe8408410c1063200541106a2005280218200528021c20031069200541086a200528021020052802142004106b20052005280208200528020c200120021068200528020421012000200528020036020020002001360204200541206a24000b0d0010431a20002001102f104e0b0d002000200120022003108a010b0d0010431a20012000103d104e0b0f002000427f51047e10160520000b0b3001017e20002903082201427f51047e10160520010b20002802102000280218200028020020002802041045101710730b3b01027f230041106b220124002000101221022001410036020c2001200036020420012002410276360208200141046a1075103b200141106a24000b24002000290308107120002802102000280218200028020020002802041045101710121a0b7d01037f230041106b22012400200028020821032001410036020c200028020020034102742001410c6a4104106f450440200128020c21022000200341016a360208200241187420024180fe03714108747220024108764180fe037120024118767272102f200141106a24000f0b418a8508410b41ef83084111104c000b900202027f017e230041d0006b2202240020012903082204427f51047e10160520040b2001280210200128021820012802002001280204104521011017200110122103200241003602142002200136020c200220034102763602102002410c6a10752203101221012002413c6a41003a0000200241386a200136020020022003360234200220013602302002410036022c200241406b2002412c6a10772002280230200228022c460440200241206a2201200241c8006a2903003703002002200229034037031820022d003c044041dcdb08410036020041e0db0841003a00000b20002002290318370300200041086a2001290300370300200241d0006a24000f0b418a8508410b41958508410e104c000b3002017f017e2001418a8508410b103a2102200110be01210320002001103936020c20002002360208200020033703000b100010431a20002001280200103d104e0b0e0020014504402002200010700b0b810101057f230041106b220324001043102f210420012802001012210503402005200241046a22064f04402003410036020c200128020020022003410c6a4104106f1a200328020c220241187420024180fe03714108747220024108764180fe0371200241187672722004103f200621020c010b0b20002004104e200341106a24000b820101057f230041106b220324001043102f210420012802001012210503402005200241046a22064f04402003410036020c200128020020022003410c6a4104106f1a2004200328020c220241187420024180fe03714108747220024108764180fe03712002411876727210051a200621020c010b0b20002004104e200341106a24000b4d01027f230041206b22012400107d2102200141106a200041106a290300370300200141086a200041086a290300370300200120023602182001200029030037030020011072200141206a24000b0e01017f102a22004200100120000b4f01027f230041206b22022400107d2103200241106a200141106a290300370300200241086a200141086a2903003703002002200336021820022001290300370300200020021076200241206a24000b4d01027f230041206b22012400107d2102200141106a200041106a290300370300200141086a200041086a290300370300200120023602182001200029030037030020011034200141206a24000b7602057f017e230041106b22012400107d210220002802102103200028020421042000280200210520002903082206427f51047e10160520060b20032002200520041045210010172000101221022001410036020c2001200036020420012002410276360208200141046a1075102f200141106a24000b4701027f230041106b22022400104321032002420037030820022001ad42ff01834101200241086a10820120032002280200200228020410181a20002003104e200241106a24000b8f0202047f017e2003200142388620014280fe0383422886842001428080fc0783421886200142808080f80f834208868484200142088842808080f80f832001421888428080fc0783842001423888220820014228884280fe03838484843700000240200150044041b88d0821030c010b200204402001427f510440200341076a2103410121040c020b2008a7c022054107752106200541004821050b200641ff0171210603400240024020044108470440200320046a2d000022072006460d02200245200741077620054672450440200441016b220441094f0d020b200320046a2103410820046b21040c040b102c000b102c000b200441016a21040c000b000b20002004360204200020033602000ba30102037f017e230041106b22032400027f2002290300500440200128021021042003200128020020012802042002280208200228020c106d2003280200210520032802040c010b10472104200341086a2001280200200128020420012802102002106c20032802082105200328020c0b2102200129030821062000107d36021820002004360210200020063703082000200236020420002005360200200341106a24000b3f01017f1043210320002001290300370300200041106a200141106a290300370300200041086a200141086a290300370300200320021044200020033602180b5201027f230041106b22042400200441086a200028020820002802002205200110860120042802084101460440200428020c2000200120056a360200200441106a24000f0b2002200341a38508410f104c000b1f0020012002200310042201101f21022000200136020420002002453602000b4f01037f230041106b22022400200241086a200028020820002802002203200110860120022802084101460440200228020c2000200120036a360200200241106a24000f0b41a38508410f108801000b1a01017f41f185084116104d220220002001100f1a20021000000b1500417f200020011019220041004720004100481b0b0f00200020012003200210284100470b09002000200110051a0b0c00200020002001100220000b0c00200020002001101a20000b0c00200020002001101b20000b0a0020002000200110020b0c00200020002001106020000b1001017f102a220220002001100220020b1001017f102a220220002001101b20020b1001017f102a220220002001106020020b1901017f102a210241722001ad1001200220004172101e20020b0e01017f104322012000104420010b4c01027f230041106b22012400104321022001200041187420004180fe03714108747220004108764180fe03712000411876727236020c20022001410c6a4104100f1a200141106a240020020b840102047f017e230041206b22022400200241106a42003703002002420037030820014100200241086a22034110106f2002410036021c20032002411c6a22041098012105200320041099012106200241086a2002411c6a1098012103044041c38508411d1003000b2000200336020c2000200536020820002006370300200241206a24000b7401017f230041106b220224002002410036020c20022000411020012802002200200041046a2200109d012002410c6a410420022802002002280204105720012000360200200228020c2100200241106a2400200041187420004180fe03714108747220004108764180fe0371200041187672720ba80102017e017f230041106b220324002003420037030820032000411020012802002200200041086a2200109d01200341086a41082003280200200328020410572001200036020020032903082102200341106a2400200242388620024280fe0383422886842002428080fc0783421886200242808080f80f834208868484200242088842808080f80f832002421888428080fc07838420024228884280fe038320024238888484840b0f002000200120022003410c10f9010b0f002000200120022003410d10f9010b0f002000200120022003410910f9010b2f000240200320044d044020022004490d012000200420036b3602042000200120036a3602000f0b102c000b102c000bb40101037f230041106b22042400027f024020002d000845044020002802002205101222064190ce004b0d0141e0db082d00000d0141dcdb08200636020041e0db0841013a0000200441086a2006109f01200541002004280208200428020c106f1a200041013a00080b4101200120036a220041dcdb082802004b0d011a20042001200010a0012002200320042802002004280204105741000c010b200041003a00082005200120022003106f0b200441106a24000b3e01017f230041106b22022400200241086a41cc8d084190ce00200110d001200228020c21012000200228020836020020002001360204200241106a24000b32000240200120024d044020024190ce004d0d01102c000b102c000b2000200220016b3602042000200141cc8d086a3602000b1900200041feffffff0746044041e08508410d1003000b20000b4d01017f230041106b220124002000101241044604402001410036020c200041002001410c6a4104108a011a41feffffff072000200128020c41c58eb1a204461b21000b200141106a240020000b800101027f230041106b220324000240024020002d000404404190ce0041dcdb0828020022046b2002490d01200341086a2004200220046a220010a4012003280208200328020c20012002105741dcdb0820003602000c020b200028020020012002100f1a0c010b200010a501200028020020012002100f1a0b200341106a24000b3f01017f230041106b22032400200341086a2001200241cc8d084190ce00102b200328020c21012000200328020836020020002001360204200341106a24000b5801027f230041106b2201240020002d0004200041003a00040440200141086a410041dcdb0828020010a00120002802002001280208200128020c100f1a41dcdb08410036020041e0db0841003a00000b200141106a24000b0d002000416710201a416710120b0d002000102a220010201a20000b1200200010a6014504402000200110211a0b0b1200200010a6014504402000200110aa010b0b3801017f230041106b2202240020024200370308200220014100200241086a10820120002002280200200228020410b801200241106a24000b0a00200010a70110a2010bb90101047f230041206b22012400200010a701210210432104200210122100200141106a41003a00002001410c6a2000360200200120023602082001200036020420014100360200037f2000200346047f20012d0010044041dcdb08410036020041e0db0841003a00000b200141206a2400200405200110ad012100200110ae012102200110af0121032001200036021c20012003360218200120023602142004200141146a105920012802002103200128020421000c010b0b0b3302017f017e230041106b220124002001410036020c20002001410c6a2200410410b3012000410410b101200141106a2400a70b0900200041201087010b0c002000200010ad011087010b3a01017f230041106b22032400200341086a20014108200210d001200328020c21012000200328020836020020002001360204200341106a24000b3401017e02402001450d0003402001450d01200141016b210120003100002002420886842102200041016a21000c000b000b20020bfd0101067f230041306b22012400200010a701210210432104200210122100200141186a41003a0000200141146a2000360200200120023602102001200036020c20014100360208037f2000200346047f20012d0018044041dcdb08410036020041e0db0841003a00000b200141306a2400200405200141086a220210ad012103200210ae012105200210af01210641002100200141003a002f20022001412f6a410110b30102400240024020012d002f0e020201000b41ed8608410d108801000b410121000b200120003a002820012006360224200120053602202001200336021c20042001411c6a105520012802082103200128020c21000c010b0b0b2d00200041086a200028020020012002109e01044041a38508410f108801000b2000200028020020026a3602000b870101017f230041306b220224002002200136020820021035200220022d00043a00102002200228020036020c20022001101236021c200241003602182002200241086a3602140340200241206a200241146a10b50120022d002c410246450440200241206a2002410c6a10b6010c010b0b2000200228020c20022d001010b701200241306a24000bc50301077f230041d0006b22022400024020012802042204410d6a220820012802084d0440200128020020024200370035200242003703302802002004200241306a2203410d106f1a20024100360240200241286a20034100410410bf01200241406b220541042002280228200228022c105720022802402104200241c8006a41003a000020024200370340200241206a20034104410d10bf01200541092002280220200228022410572002410036024c200241186a20054100410410c001200241cc006a220741042002280218200228021c1057200228024c21032002410036024c200241106a20054104410810c00120074104200228021020022802141057200228024c2106200241003a004c200241086a20054108410910c001200741012002280208200228020c1057200020022d004c4100473a000c2000200641187420064180fe03714108747220064108764180fe0371200641187672723602082000200341187420034180fe03714108747220034108764180fe0371200341187672723602042000200441187420044180fe03714108747220044108764180fe037120044118767272360200200120083602040c010b200041023a000c0b200241d0006a24000b4d01017f230041106b220224002000280200200110bc012001200028020410bd01200041086a2802002001103e20022000410c6a2d00003a000f20012002410f6a410110a301200241106a24000b0d00200020012002103810211a0b0d00200020012002104d10211a0b870101017f230041306b220224002002200136020820021035200220022d00043a00102002200228020036020c20022001101236021c200241003602182002200241086a360214200241246a21010340200241206a200241146a10ba012002280220044020012002410c6a10bb010c010b0b2000200228020c20022d001010b701200241306a24000b890301067f230041406a22022400200020012802042203410c6a220620012802084d047f2001280200200241286a4100360200200242003703202802002003200241206a2203410c106f1a20024100360230200241186a20034100410410c101200241306a220541042002280218200228021c10572002280230210420024200370330200241106a20034104410c10c101200541082002280210200228021410572002410036023c200241086a20054100410410c2012002413c6a220741042002280208200228020c1057200228023c21032002410036023c200220054104410810c20120074104200228020020022802041057200228023c21052000410c6a200441187420044180fe03714108747220044108764180fe0371200441187672723602002000200341187420034180fe03714108747220034108764180fe03712003411876727236020420012006360204200041086a200541187420054180fe03714108747220054108764180fe03712005411876727236020041010541000b360200200241406b24000b1f002000280208200110bc012001200028020010bd0120002802042001103e0b4601017f230041106b220224002002200041187420004180fe03714108747220004108764180fe03712000411876727236020c20012002410c6a410410a301200241106a24000b810101037f230041106b220224000240024020002d000404402001101222044190ce0041dcdb0828020022036b4b0d01200241086a2003200320046a220010a401200141002002280208200228020c106f1a41dcdb0820003602000c020b20002802002001108b010c010b200010a50120002802002001108b010b200241106a24000b3802017f017e230041106b22012400200142003703082000200141086a22004108418a8508410b10c5012000410810b101200141106a24000b0f002000200120022003410d10f8010b0f002000200120022003410910f8010b0f002000200120022003410c10f8010b0f002000200120022003410810f8010b800201057f230041206b2202240020002001280204220341086a220520012802084d047f2001280200200242003703102802002003200241106a22034108106f1a2002410036021c200241086a20034100410410c2012002411c6a220641042002280208200228020c1057200228021c21042002410036021c200220034104410810c20120064104200228020020022802041057200228021c21032000200441187420044180fe03714108747220044108764180fe03712004411876727236020420012005360204200041086a200341187420034180fe03714108747220034108764180fe03712003411876727236020041010541000b360200200241206a24000b8a0101047f230041106b220324002001280204220241046a220420012802084b047f41000520012802002003410036020c28020020022003410c6a4104106f1a200328020c210220012004360204200241187420024180fe03714108747220024108764180fe037120024118767272210241010b21012000200236020420002001360200200341106a24000b3000200041086a200028020020012002109e0104402003200441a38508410f104c000b2000200028020020026a3602000b7801017f230041106b220224002002200042388620004280fe0383422886842000428080fc0783421886200042808080f80f834208868484200042088842808080f80f832000421888428080fc07838420004228884280fe038320004238888484843703082001200241086a410810a301200241106a24000bd60101067f230041406a2200240010c801105c2101200010c901105c3602082000104736020c200041286a22022001103241f7800841101033200028022c2201200041086a106420012000410c6a1064200041206a2201200041386a2203290300370300200041186a2204200041306a2205290300370300200020002903283703102000200041106a107c360204200210c901105c103241f5810841181033200028022c200041046a1078200120032903003703002004200529030037030020002000290328370310200041106a107c200041406b24000b0a00419588084112104d0b0a00418188084114104d0ba90302057f017e23004180016b2202240010cb0110ab012103200128020c210420012903002107200128020821010240200341feffffff07460440200141feffffff07460d01200110a101210120022004360214200220073703082002200136021010cc01105c2103200410292104200241e0006a22012003103241a18008410a1033200241406b22032001200241086a1084012001200310cd01200110344200210741feffffff0721010b200241e0006a2000103241c081084112103320022802641a200241286a2200200241f0006a2205290300370300200241206a2203200241e8006a2206290300370300200220022903603703180240200141feffffff074704402005200029030037030020062003290300370300200220022903183703602002107d360278200110a10121002002200436023c2002200737033020022000360238200241406b200241e0006a200241306a1083010c010b200241d0006a2000290300370300200241c8006a200329030037030020022002290318370340200220043602580b200241e0006a200241406b107620024180016a24000f0b41ca8808411f1041000b0a0041e88c084122104d0b0a0041fa8608411d104d0bff0202037f027e230041d0006b22022400200241306a2204200141106a290300370300200241286a2203200141086a290300370300200220012903003703202002107d36023802400240024002402001280218220110650e020102000b10472103200241086a2002280220200228022420042001106220022903082105200229032821062000107d3602182000200336021020002006370308200020053703000c020b20002002290320370300200041186a200241386a290300370300200041106a2004290300370300200041086a20032903003703000c010b200241406b2001109701027f200229034050044020022802302101200241106a200228022020022802242002280248200228024c106d2002280210210320022802140c010b10472101200241186a200228022020022802242002280230200241406b106c20022802182103200228021c0b2104200229032821052000107d360218200020013602102000200537030820002004360204200020033602000b200241d0006a24000b0d002000106141ff017141014b0b17002000280200200128020010890141ff017141ff01460b3b01017f230041106b22042400200441086a4100200320012002102b200428020c21012000200428020836020020002001360204200441106a24000b0a0041bd8808410d104d0b0a0041f28708410f104d0b0a0041dd87084115104d0b0a0041a788084116104d0b1901017f419787084116104d210120002802002001104020010b1901017f41ad87084118104d210120002802002001104020010b0a0041c587084118104d0b0a00418f8c08411d104d0b0a0041ac8c08411d104d0b0a0041c98c08411f104d0ba705020d7f027e230041406a220024001022410a105a410041bd8808410d105021094101104b210241024195880841121050210a410341818808411410502105410441f28708410f1050210641051011210d41061011210e410710582107410810512108410941fa8608411d10502104200020083602102000200736020c2005102f1032210141e68108410f104d21031043210b107d210c10162001200c2003200b10452101101720011012210320004100360230200020013602282000200341027636022c200041286a22031075102f10a201210120032004102f102f103241ab8008411510332003108001210302400240200141feffffff074704402001102f10a101200210300d0141e9880841d1001041000b200220031030450d010b10cc01200410a80110d901200310a801024010cb01220410a6010d00200141feffffff074704402004200110211a0c010b200441ed8508410410b8010b10d101200910a80110d401200210a80110c801200a10a80110c9012005102f10a80110d801200041286a22012005103241b68108410a1033200110800110a80110d2012006102f10a80110da0120012006103241868308410f1033200110800110a80120002007101236021c2000410036021820002000410c6a36021403400240200041286a200041146a10c301200028022845044020002008101236021c200041003602182000200041106a3602140340200041286a200041146a10c3012000280228450d022000200028023022013602242000200028022c360220200041206a10d501220210a6010d002002200110b4010c000b000b2000200028023022013602242000200028022c360220200041206a10d601220210a6010d012002200110b9010c010b0b10d301200d10a90110d701200e10a901200041406b24000f0b41ba890841c8001041000b080010224100105a0bc70101057f230041306b220024004100105a02400240104610d101105c10300440104610d101105c1030450d012000104a220136020810d40110a701210210c901105c2103200020011012360214200041003602102000200041086a36020c200041206a210103400240200041186a2000410c6a10672000290318500d00200028022c200028022820021030450d0410ce01450d042003102f200110ca010c010b0b200041306a24000f0b41828a0841161041000b41828a0841161041000b41988a08410d1041000bc70702097f017e23004180016b2200240010224101105a2000104f36022c10d101105c210102400240024010462207200110300440200010c901105c2201360234200041e0006a22022001102f1032418d82084118103320002802642000412c6a1078200041d8006a2201200041f0006a2206290300370300200041d0006a2203200041e8006a220429030037030020002000290360370348200041c8006a2205107c2108200210c801105c103241e18008410a103320002802642202200041346a10642002410020081079200120062903003703002003200429030037030020002000290360370348200041386a2005107e200028024410ce01450d0120002802341032210141a582084106104d21041043220341012000107910432202200041386a1044200020013602702000427f37036820002003360264200020043602602000107d22053602780240024002400240200210650e020200010b200041c8006a2002109701027f2000290348500440200041186a2004200320002802502000280254106d20002802182104200028021c0c010b1047200041206a200420032001200041c8006a106c20002802202104210120002802240b2103107d21050c010b10472101200041106a20042003200620021062200029036821092000280214210320002802102104107d21052009427f520d010b101621090b2009200120052004200310452101101720011012210220004100360250200020013602482000200241027636024c200041c8006a1075220210122101200041f0006a41003a0000200041ec006a2001360200200020023602682000200136026420004100360260200041e0006a2201418a8508410b103a10a2012102200110be01210920011039210120002802642000280260470d0220002d0070044041dcdb08410036020041e0db0841003a00000b0240200241feffffff07470440200210a10121030c010b10d90110a701210310cc01105c200110291031420021090b200110ce01450d03200720032009200110422000200136026c20002003360268200020093703602000200041e0006a1095012201360230200041086a1035200020002d000c3a003c200020002802083602382000200110123602502000410036024c2000200041306a3602480340200041e0006a200041c8006a106720002903605045044020002802742000280270200041386a2201103e2000290368200110c6012001103c0c010b0b200028023820002d003c103720004180016a24000f0b41828a0841161041000b41e78a08411f1041000b418a8508410b41958508410e104c000b41868b08411a1041000bf31d02167f027e230041a0026b2200240010224100105a10c801105c2101200010c901105c2214102f1096013602f001200010433602a00120004180026a22092001103241eb8008410c10332000280284022201410010810120014101108101200141001081012001200041f0016a2211107b2001200041a0016a2207107b200041e0016a220520004190026a2204290300370300200041d8016a220220004188026a220329030037030020002000290380023703d001200041d0016a2206107f10d201105c210120002014102f1096013602f001200010433602a00120092001103241eb8008410c10332000280284022201410010810120012011107b20012007107b2001410120001079200520042903003703002002200329030037030020002000290380023703d0012006107f102a2203102a22061023200610ce01044010cc01105c20061029103110d90110a70121012000200636028c0220004200370380022000200136028802200320004180026a10440b200020033602900102400240024020031065044010d40110a701210e107d210d2000200028029001101236029c012000410036029801200020004190016a3602940120004190026a210a200041c0016a210f200041a8016a21150340200041a0016a20004194016a106720002903a00150044042808090bbbad6adf00d102e2101200d10d301105f102e1092012001108d012205200d10d701105f102e1092012001108d012206109101200d10890141ff01714102490d05200d200510930120061090012102200e102f210120002002102936028c0220004200370380022000200136028802201420004180026a10ca01200e102f2101200510ce010440104620014200200510420b200610ce0104401048200e4200200610420b104321041043102f2106200141feffffff07460d032001200610400c040b200f201541086a290300370300200020152903003703b801200f10d60110ac012112200f10d50110b2012113200f280200210c20002802c401210420002903b801211620121012210120131012410d6e2001410c6e6a21114100210103400240024020012011470440200141016a2106410021022012101221050240024003402002410c6a220320054b0d0120004188026a2209410036020020004200370380022012200220004180026a2202410c108a011a200041003602d00120004188016a20024100410410c101200041d0016a22074104200028028801200028028c01105720002802d0012108200042003703d00120004180016a20024104410c10c101200741082000280280012000280284011057200041003602f001200041f8006a20074100410410c201200041f0016a220241042000280278200028027c105720002802f001210b200041003602f001200041f0006a20074104410810c2012002410420002802702000280274105720032102200841187420084180fe03714108747220084108764180fe0371200841187672722001470d000b20002802f0012103200b411874200b4180fe037141087472200b4108764180fe0371200b4118767272102f2101200341187420034180fe03714108747220034108764180fe0371200341187672722207102f21054101102d20004180026a22032001103241d986084114103320002802840222012005106e20011070200041e0016a2202200a290300370300200041d8016a2201200929030037030020002000290380023703d001104321052000200436028c022000200c360288022000201637038002200520031044200a200229030037030020092001290300370300200020002903d001370380022000107d360298020240024002400240200510650e020102000b10472101200041e8006a200028028002200028028402200a200510622000290368211720002903880221162000107d3602e801200020013602e001200020163703d801200020173703d0010c020b200041e8016a20004198026a2903003703002002200a2903003703002001200929030037030020002000290380023703d0010c010b200041f0016a22012005109701200041d0016a20004180026a20011083010b20004180026a200041d0016a1076200028028802220c20071030450d01200028028c0221042000290380022116200621010c050b4100210220131012210503402002410d6a220320054b0d03200042003700850220004200370380022013200220004180026a2202410d108a011a200041003602d001200041e0006a20024100410410bf01200041d0016a2208410420002802602000280264105720002802d0012109200041d8016a220b41003a0000200042003703d001200041d8006a20024104410d10bf01200841092000280258200028025c1057200041003602f001200041d0006a20084100410410c001200041f0016a2202410420002802502000280254105720002802f0012110200041003602f001200041c8006a20084104410810c001200241042000280248200028024c105720002802f0012107200041003a00f001200041406b20084108410910c0012002410120002802402000280244105720032102200941187420094180fe03714108747220094108764180fe0371200941187672722001470d000b20002d00f001200741187420074180fe03714108747220074108764180fe0371200741187672722108200c102f2109200410292107201041187420104180fe03714108747220104108764180fe037120104118767272102f21054504404101102d20004180026a22012005103241a88608410810332000280284021070200041e0016a2202200a290300370300200b20004188026a220329030037030020002000290380023703d001104321042000200736028c0220002009360288022000201637038002200420011044200a20022903003703002003200b290300370300200020002903d001370380022000107d360298020240024002400240200410650e020102000b10472101200041106a200028028002200028028402200a200410622000290310211720002903880221162000107d3602e801200020013602e001200020163703d801200020173703d0010c020b200041e8016a20004198026a2903003703002002200a290300370300200b200329030037030020002000290380023703d0010c010b200041f0016a2004109701027f20002903f0015004402000280290022103200041186a20002802800220002802840220002802f80120002802fc01106d200028021c210220002802180c010b10472103200041206a200028028002200028028402200028029002200041f0016a106c2000280224210220002802200b210120002903880221162000107d3602e801200020033602e001200020163703d801200020023602d401200020013602d0010b200041d0016a107221032008102f21012000200336028c022000420037038002200020013602880220004180026a10950121010c040b2008102f21044101102d20051032210341a886084108104d2101104322052004106e20051070104321042000200736028c0220002009360288022000201637038002200420004180026a104420002003360290022000427f37038802200020053602840220002001360280022000107d36029802027f027e024002400240200410650e020102000b10472102200041286a200028028002200028028402200a20041062200028022c2103200028022821012000290388020c020b20002802900221022000290388022116200028028402210320002802800221012000280298020c020b200041d0016a2004109701027f20002903d0015004402000280290022102200041306a20002802800220002802840220002802d80120002802dc01106d2000280234210320002802300c010b10472102200041386a200028028002200028028402200028029002200041d0016a106c200028023c210320002802380b21012000290388020b2116107d0b21042016427f51047e10160520160b200220042001200310452103101741002102200310122101200041003602f801200020033602f001200020014102763602f401200041f0016a1075102f210410432101200410122103200041003a0090022000200336028c0220002004360288022000200336028402200041003602800203402002200346044020002d009002450d0541dcdb08410036020041e0db0841003a00000c0505200041d0016a220320004180026a1077200120031044200028028002210220002802840221030c010b000b000b41c0860841191041000b200c200e10300440200d2004108f010c040b41d48a0841131041000b200041086a1036200020002d000c3a008402200020002802083602800220004180026a220641808008412110a301230041406a220324002003410020036b41037122046a210720040440200321020340200241003a0000200241016a22022007490d000b0b200741c00020046b2205417c7122046a2102200441004a0440034020074100360200200741046a22072002490d000b0b200541037122040440200220046a21040340200241003a0000200241016a22022004490d000b0b20062003027f200104402001ad2116413f2101024003402016500d012001413f4d0440200120036a20162016420a802216420a7e7da74130723a0000200141016b21010c010b0b102c000b200141016a0c010b200341303a003f413f0b22016a41c00020016b10a301200341406b240020002802800220002d00840210381000000b200020013602cc01107d2102107d21042000200110123602d801200041003602d4012000200041cc016a3602d00102400340024020004180026a200041d0016a1067200029038002500d002000280294022105200221032000280290022201200c103045044020042103200120081030450d030b20032005108f010c010b0b2008102f210c42002116200621010c010b0b0b4187860841211041000b41a58a0841151041000b200041808080203602d0012006200041d0016a4104100f1a200641ed85084104100f1a0b200042003703d0012006200041d0016a22034108100f1a20052006103f20042006104e10c70110432201418a8d084108104d104e20021043102f2202103f2002103f200120021024200020043602d00120002004101236028802200041003602840220002003360280020340200020004180026a10c40120002802000440200028020410071a0c010b0b200041a0026a24000f0b41ba8a08411a1041000b0d0010224100105a10c70110250b0d0010224100105a10d101105b0b0d0010224100105a10d401105d0b0d0010224100105a10d801105d0b2a01017f10224100105a10cb0110ab01220041feffffff07470440200010071a0f0b41ed8508410410260b0d0010224100105a10da01105d0b0d0010224100105a10c801105b0b0d0010224100105a10c901105b0b0d0010224100105a10cc01105b0b0d0010224100105a10d901105d0b0d0010224100105a10d201105b0ba10101027f230041406a2200240010224101105a20004100104b3602142000200041146a10d60110ac012201360218200041086a1035200020002d000c3a00202000200028020836021c20002001101236022c200041003602282000200041186a360224200041346a21010340200041306a200041246a10ba012000280230044020012000411c6a10bb010c010b0b200028021c20002d00201037200041406b24000ba00101027f230041406a2200240010224101105a20004100104b3602142000200041146a10d50110b2012201360218200041086a1035200020002d000c3a00202000200028020836021c20002001101236022c200041003602282000200041186a3602240340200041306a200041246a10b50120002d003c4102470440200041306a2000411c6a10b6010c010b0b200028021c20002d00201037200041406b24000b0d0010224100105a10d301105e0b0d0010224100105a10d701105e0be30302057f027e23004190016b2200240010494100105a2000104a2201360214024020011065410146044020011012210120004100360234200020013602302000410036022c2000200041146a3602282000413c6a2102200041f4006a2103200041f8006a21010340200041f0006a200041286a10672000290370500d02200041e0006a200141086a290300220537030020002001290300220637035820002000280234220441016a360234200341086a200537020020032006370200200041406b2001290200370300200041c8006a20004180016a280200360200200020002902703703382004450440200041206a200241086a290200370300200020022902003703180c010b0b102c000b41b3830841221003000b200041086a2201200041206a2903003703002000200029031837030010da0110a701210220012802002002103045044041988a08410d1041000b10d201105c21022000104336021820001043360228200041f0006a22012002103241a783084105103320002802742202200041186a107b2002200041286a107a200041e8006a20004180016a290300370300200041e0006a200041f8006a29030037030020002000290370370358200041386a2202200041d8006a20001084012001200210cd012001107420004190016a24000b8c0101027f230041406a2200240010494100105a10d201105c21012000104336020020001043360204200041086a200110324195830841121033200028020c22012000107b2001200041046a107a200041306a200041186a290300370300200041286a200041106a290300370300200020002903083703202000107d360238200041206a1074200041406b24000bff0102057f017e230041306b22002400102210494101105a2000104f36021010d201105c20001043360214200010433602181032210241ac83084107104d210310432201200041106a10782001200041146a107b2001200041186a107a107d210410162002200420032001104521011017200110122102200041003602242000200136021c200020024102763602202000411c6a107521012000420037032820011012220241094904400240200041086a200041286a200210b0012001410020002802082201200028020c2202108a011a2001200210b10122054280808080105a0d0020051014200041306a24000f0b0b418a8508410b41958508410e104c000b980302057f017e230041e0006b220024001022104941e4db08101336020041e4db08280200410048044041ef830841111003000b2000410036023810432103200041386a22042802002101034041e4db0828020020014a04402004200141016a220236020020032001104b104e200221010c010b0b2003210141e4db0828020020002802384a04404180840841121003000b2000200136021c200410d201105c103241f98208410d103320002001101236025c2000410036025820002000411c6a360254200028023c21010340200041106a200041d4006a10c4012000280210044020012000280214106e0c010b0b200041286a200041406b290300370300200041306a200041c8006a29030037030020002000290338370320200041386a200041206a107e02402000280244220110ce01450440200028024021020c010b1046200028024022024200200110420b2000290338200041086a1035200020002d000c3a003c200020002802083602382002200041386a2202103e200210c60120012002103c200028023820002d003c1037200041e0006a24000b3101017e102210494101105a41001011220042818090bbbad6adf00d5a044041ef8b0841201041000b10d701200010aa010b3101017e102210494101105a41001011220042818090bbbad6adf00d5a044041d28b08411d1041000b10d301200010aa010be30101037f230041306b22002400102210494102105a410010582101200041011051220236020c20002001360208200020011012360218200041003602142000200041086a36021003402000411c6a200041106a10c301200028021c044020002000280224220136022c20002000280220360228200041286a10d601200110b9010c01052000200210123602182000410036021420002000410c6a36021003402000411c6a200041106a10c301200028021c044020002000280224220136022c20002000280220360228200041286a10d501200110b4010c010b0b200041306a24000b0b0baa07020b7f017e230041306b2200240010224100105a10c901105c2209102f1032210141d281084114104d210210432106107d21071016200120072002200610452101101720011012210220004100360210200020013602082000200241027636020c200041086a1075220210122101200041286a41003a0000200041246a2001360200200020023602202000200136021c200041003602180240027f024002402001450d00024002400240200041186a418a8508410b105441ff01710e020201000b418a8508410b41ed8608410d104c000b41012103200041186a418a8508410b105321010b200028021c2000280218470d0320002d0028044041dcdb08410036020041e0db0841003a00000b2003450d00200041186a22042001102f103241e482084115103320002004107c220336020020042001102f103241b28208410b1033200041186a107c42be8a860f102e108e01210620042001102f103241c98208410d1033200041186a107c200310920142be8a860f102e108e01410a102d4112109401108d01210720042001102f103241bd8208410c1033200041186a107c410a102d41121094012003109001108e0142be8a860f102e108e01410a102d4112109401108d01210a20042009102f2202102f103241878108410f10332000200041186a107c220536021420042002102f103241ab820841071033200041186a107c210820042002103241a6810841101033200041186a107c2102200020082005109101200210900136020820042001103241d68208410e1033200028021c2201200041146a10782001200041086a107820002802282102200028021821052000290320107d21081071200220082005200110452101101720002001107336020442808090bbbad6adf00d102e21022000107d360218200041046a200410cf012105107d220120050d021a2001200028020410890141016a41ff017141014d0440200041046a200010cf010d02200028020021030b20002802042003109301200a108e012101410a102d4112109401200028020010900121032006200210920120072002109201108c0120012002108e012003108d01108c010c020b41a08b0841321041000b2000280204200710920121012006200210920120012002108e012000280200108d01108c010b2101200041186a22032009103241968108411010332003107c2102410a102d411210940121032000280204200110920120032002109301108e0120034103109401108d011025200041306a24000f0b418a8508410b41958508410e104c000b0300010b3c01017f230041106b22052400200541086a2001200420022003109d01200528020c21012000200528020836020020002001360204200541106a24000b3b01017f230041106b22052400200541086a2002200320012004102b200528020c21012000200528020836020020002001360204200541106a24000b0bda0d0200418080080bc60d4e6f2073776170206f7065726174696f6e20666f756e6420617420696e64657820756e7772617045676c646765745772617070656445676c64546f6b656e49647772617045676c64726563697069656e742061646472657373206e6f7420736574657869744d61726b6574636c61696d526577617264736765744163636f756e74546f6b656e73676574546f74616c426f72726f777367657452657365727665466163746f72676574546f74616c5265736572766573676574546f6b656e49646d696e74416e64456e7465724d61726b6574676574496e746572657374526174654d6f64656c676574556e6465726c79696e674964746f6b656e73546f556e6465726c79696e67416d6f756e74756e6465726c79696e67416d6f756e74546f546f6b656e7372656465656d6765744361736867657442617365526174656765744c617374536c6f70656765744669727374536c6f70656765745574696c697a6174696f6e6765744f7074696d616c5574696c697a6174696f6e636c61696d4d756c7469706c656765745374616b65546f6b656e4964726562616c616e6365506f7274666f6c696f7374616b65756e7374616b65696e636f7272656374206e756d626572206f662045534454207472616e7366657273617267756d656e74206465636f6465206572726f722028293a20746f6f2066657720617267756d656e7473746f6f206d616e7920617267756d656e747377726f6e67206e756d626572206f6620617267756d656e747363616e6e6f74207375627472616374206265636175736520726573756c7420776f756c64206265206e656761746976654d756c7469455344544e46545472616e73666572455344544e46545472616e73666572455344545472616e7366657273796e6320726573756c74696e70757420746f6f206c6f6e67696e70757420746f6f2073686f72746361737420746f20693634206572726f724d616e6167656456656320696e646578206f7574206f662072616e67654553445420657870656374656445474c4473746f72616765206465636f6465206572726f723a20756e6b6e6f776e20726563656976656420746f6b656e206166746572207377617065786368616e6765626164206172726179206c656e67746877726f6e672072657475726e6564207377617020746f6b656e73776170546f6b656e734669786564496e707574696e76616c69642076616c7565777261707065645f65676c645f636f6e74726163745f61646472657373636f6d706f756e645f617368737761705f7377617073636f6d706f756e645f7865786368616e67655f7377617073706572666f726d616e63655f666565735f70657263656e74636f6d706f756e645f666565735f70657263656e74626f6f737465725f616464726573736d6f6e65795f6d61726b65745f61646472657373636f6e74726f6c6c65725f6164647265737361737365745f746f6b656e5f6964656e7469666965727661756c745f616464726573737061796d656e742073686f756c6420626520616e204553445420746f6b656e54686520617373657420746f6b656e206964656e74696669657220616e6420746865206d6f6e6579206d61726b657420756e6465726c79696e67206964656e74696669657220646f6e2774206d617463685768656e20746172676574696e6720616e2045474c44206d61726b65742074686520617373657420746f6b656e206964656e7469666965722073686f756c64206265205745474c4443616c6c65722073686f756c64206265207661756c7477726f6e67207061796d656e746e6f2072657761726420746f20636f6d706f756e646e6f206c65667420616d6f756e7420746f20636f6d706f756e6477726f6e67207377617070656420746f6b656e6e6f2065786974206d61726b6574207061796d656e742072656365697665646e6f2072656465656d207061796d656e742072656365697665644e6f20696e7465726573742072617465206d6f64656c2070726573656e74206f6e20746865206d6f6e6579206d61726b65746e657720636f6d706f756e6420666565732065786365656420313030256e657720706572666f726d616e636520666565732065786365656420313030256d6f6e65795f6d61726b65745f746f6b656e5f6964656e746966696572777261707065645f65676c645f746f6b656e5f6964656e746966696572626f6f737465725f7374616b65645f746f6b656e5f6964656e7469666965726d6f6e65795f6d61726b65745f756e6465726c79696e675f6964656e746966696572636f6d706f756e64456e64706f696e742063616e206f6e6c792062652063616c6c6564206279206f776e6572000070616e6963206f636375727265640041c88d080b049cffffff@0500@0100@0000000000000000000000000000000000000000000000000000000000000000@5745474c442d613238633539@00000000000000000500a3b666902d5f4bbf0ff93748fb915aeb43124cbf6509@0000000000000000050032de4f40f17a2f41c4e40c21f596e36a846994e36509@00000000000000000500f8836686f7c6c0f13d7275151b78f59f8f2f729a6509@@@@@000000000000000005000b1e5b244325095849f4e37134661d5bfdcd925e7ceb",
-      "signature": "edf0ec99b6f60414fa5e36d40cfb1d0075d01fd7c4ad7ba59bbe62b8b48eb892beb0c18bba203ff32b83827c3953847b190cdc89a4806f4615565dc2b3b5940f",
-      "sourceShard": 1,
-      "destinationShard": 1,
-      "blockNonce": 2127577,
-      "blockHash": "e3aea17b5345b45f61b233834d3b4ba0ac6f2b7d53eb3f1b1cf2bf0534ba567f",
-      "notarizedAtSourceInMetaNonce": 2129029,
-      "NotarizedAtSourceInMetaHash": "73ee8458f55bf5c9ea4a9974c0c838ced51a236c2b13238761f444598f40575e",
-      "notarizedAtDestinationInMetaNonce": 2129029,
-      "notarizedAtDestinationInMetaHash": "73ee8458f55bf5c9ea4a9974c0c838ced51a236c2b13238761f444598f40575e",
-      "miniblockType": "TxBlock",
-      "miniblockHash": "cc7e81e68269c2c633daf997fd2d52fc82d8ba3bb699d7e75250008bd9b7aa29",
-      "hyperblockNonce": 2129029,
-      "hyperblockHash": "73ee8458f55bf5c9ea4a9974c0c838ced51a236c2b13238761f444598f40575e",
-      "timestamp": 1707144290,
-      "status": "success",
-      "operation": "scDeploy",
-      "initiallyPaidFee": "82333950000000000",
-      "chainID": "D",
-      "version": 1,
-      "options": 0
-    }
-  },
-  "error": "",
-  "code": "successful"
-}
-        "#;
-
-        let tx_on_network: TransactionOnNetwork = serde_json::from_str::<TransactionInfo>(data)
-            .unwrap()
-            .data
-            .unwrap()
-            .transaction;
-        let tx_response = TxResponse::from_network_tx(tx_on_network);
-        let opt_address = tx_response.new_deployed_address.map(|e| {
-            multiversx_sdk::data::address::Address::from_bytes(*e.as_array())
-                .to_bech32_string()
-                .unwrap()
-        });
-
-        let expected =
-            Some("erd1qqqqqqqqqqqqqpgqwpdf84ggxzqzmr2zmw959q4nlf9nz562q33sak25ze".to_string());
-
-        assert_eq!(opt_address, expected)
-    }
-
-    #[test]
-    fn test_deployed_address_should_be_none_if_not_a_sc_deployment_tx() {
-        let data = r#"
-        {
-  "data": {
-    "transaction": {
-      "type": "normal",
-      "processingTypeOnSource": "BuiltInFunctionCall",
-      "processingTypeOnDestination": "SCInvoking",
-      "hash": "238ad6dbe75dab1d53caeb9cabd584aabc6fc113c849a983afef5a5e439ce9e5",
-      "nonce": 13,
-      "round": 2192628,
-      "epoch": 888,
-      "value": "0",
-      "receiver": "erd1qqqqqqqqqqqqqpgqydwpdrplefjlwp3sp9xmn3vevdxdelfkwmfsw6e5xw",
-      "sender": "erd179xw6t04ug48m74jzyw9zq028hv66jhqayelzpzvgds0ptnzmckq2jf07f",
-      "gasPrice": 1000000000,
-      "gasLimit": 20000000,
-      "data": "RVNEVFRyYW5zZmVyQDRmNTU1MjRmMmQ2NDM4MzEzNzMxNjZAMDI0NmQyZDBiNmI1ZjBANjI3NTc5QDFiYzE2ZDY3NGVjODAwMDA=",
-      "signature": "ce984b4d785ccc7aca4b1cdea57ddcd568a502209f81e6b5bc678e1dd52b78d764fe46ea3ff77b926eb9f70eb52ae8f3f2afa2e9d0efa82655e361641458b900",
-      "sourceShard": 0,
-      "destinationShard": 1,
-      "blockNonce": 2129490,
-      "blockHash": "0ab10909b27565c5b7b59e8e1ee4a68d7046f49225fcde4c12d4b1ea3f512b8a",
-      "notarizedAtSourceInMetaNonce": 2130938,
-      "NotarizedAtSourceInMetaHash": "0c545160fd37f09f0196505b9cd2e730596bcd99438978a5bb415b9e1be1849d",
-      "notarizedAtDestinationInMetaNonce": 2130942,
-      "notarizedAtDestinationInMetaHash": "1ddd6b7aeeff824b5d11f2936a6284e470fc5abe41e34a8df229b719dc1a537d",
-      "miniblockType": "TxBlock",
-      "miniblockHash": "dc8ae41e1ae321c0fccbeb807194d11ff6e0f4ed71163764d850f1daaa60bd22",
-      "hyperblockNonce": 2130942,
-      "hyperblockHash": "1ddd6b7aeeff824b5d11f2936a6284e470fc5abe41e34a8df229b719dc1a537d",
-      "timestamp": 1707155768,
-      "status": "success",
-      "tokens": [
-        "OURO-d8171f"
-      ],
-      "esdtValues": [
-        "640821212132848"
-      ],
-      "operation": "ESDTTransfer",
-      "function": "buy",
-      "initiallyPaidFee": "359390000000000",
-      "chainID": "D",
-      "version": 1,
-      "options": 0
-    }
-  },
-  "error": "",
-  "code": "successful"
-}
-        "#;
-
-        let tx_on_network: TransactionOnNetwork = serde_json::from_str::<TransactionInfo>(data)
-            .unwrap()
-            .data
-            .unwrap()
-            .transaction;
-        let tx_response = TxResponse::from_network_tx(tx_on_network);
-        let opt_address = tx_response.new_deployed_address;
-
-        let expected: Option<Address> = None;
-
-        assert_eq!(opt_address, expected)
-    }
-
-    #[test]
-    fn test_with_tx_that_has_sc_result() {
-        // transaction data from the devnet, an artificial "10" result has been appended on the original result
-        let data = r#"
-            {
-              "data": {
-                "transaction": {
-                  "type": "normal",
-                  "processingTypeOnSource": "BuiltInFunctionCall",
-                  "processingTypeOnDestination": "SCInvoking",
-                  "hash": "d4058bd3c13db0b14832c7c58fe163db2f579ff6544380586b8a27d88b4a5070",
-                  "nonce": 30,
-                  "round": 7639115,
-                  "epoch": 6333,
-                  "value": "0",
-                  "receiver": "erd1qqqqqqqqqqqqqpgq5400a82at6ttplyrdhyn8kk9lhxaed5d0n4s9s77kz",
-                  "sender": "erd14r7m6drneg69jyxvxxnrsss6x5gg2cqqwreyhdwanj0fcza0ynnq5jmy4g",
-                  "gasPrice": 1000000000,
-                  "gasLimit": 25500000,
-                  "gasUsed": 15297149,
-                  "data": "RVNEVFRyYW5zZmVyQDQ4NTQ0ZDJkNjY2NTMxNjYzNjM5QDBkZTBiNmIzYTc2NDAwMDBANzM3NzYxNzA1NDZmNmI2NTZlNzM0NjY5Nzg2NTY0NDk2ZTcwNzU3NEA1NzQ1NDc0YzQ0MmQ2NDM3NjMzNjYyNjJAMDM3Yzc3OGZjY2U5YzU1Yg==",
-                  "signature": "e912fae4b7a9e51ddf316a5e82a0f457d453a62e3c17477f5d6175e1b33c5e92ddb187d65f54cf3131a0603321290279a0456c20778039f2ab09b54e33c60f0d",
-                  "sourceShard": 2,
-                  "destinationShard": 1,
-                  "blockNonce": 7585351,
-                  "blockHash": "e456f38f11fec78ed26d5fda068e912739dceedb2e5ce559bf17614b8386c039",
-                  "notarizedAtSourceInMetaNonce": 7601495,
-                  "NotarizedAtSourceInMetaHash": "e28c6011d4b3f73f3945cae70ff251e675dfea331a70077c5ab3310e3101af17",
-                  "notarizedAtDestinationInMetaNonce": 7601499,
-                  "notarizedAtDestinationInMetaHash": "333d4266614e981cc1c5654f85ef496038a8cddac46dfc0ad0b7c44c37ab489d",
-                  "miniblockType": "TxBlock",
-                  "miniblockHash": "13e041f32fde79ebf1abdcfe692e99516f9ec6778dcb917251b440daa7f1210a",
-                  "hyperblockNonce": 7601499,
-                  "hyperblockHash": "333d4266614e981cc1c5654f85ef496038a8cddac46dfc0ad0b7c44c37ab489d",
-                  "timestamp": 1694386290,
-                  "smartContractResults": [
-                    {
-                      "hash": "a23faa3c80bae0b968f007ff0fad3afdec05b4e71d749c3d583dec10c6eb05a2",
-                      "nonce": 0,
-                      "value": 0,
-                      "receiver": "erd14r7m6drneg69jyxvxxnrsss6x5gg2cqqwreyhdwanj0fcza0ynnq5jmy4g",
-                      "sender": "erd1qqqqqqqqqqqqqpgq5400a82at6ttplyrdhyn8kk9lhxaed5d0n4s9s77kz",
-                      "data": "ESDTTransfer@5745474c442d643763366262@03856446ff9a304b",
-                      "prevTxHash": "d4058bd3c13db0b14832c7c58fe163db2f579ff6544380586b8a27d88b4a5070",
-                      "originalTxHash": "d4058bd3c13db0b14832c7c58fe163db2f579ff6544380586b8a27d88b4a5070",
-                      "gasLimit": 0,
-                      "gasPrice": 1000000000,
-                      "callType": 0,
-                      "logs": {
-                        "address": "erd14r7m6drneg69jyxvxxnrsss6x5gg2cqqwreyhdwanj0fcza0ynnq5jmy4g",
-                        "events": [
-                          {
-                            "address": "erd1qqqqqqqqqqqqqpgq5400a82at6ttplyrdhyn8kk9lhxaed5d0n4s9s77kz",
-                            "identifier": "ESDTTransfer",
-                            "topics": [
-                              "V0VHTEQtZDdjNmJi",
-                              "",
-                              "A4VkRv+aMEs=",
-                              "qP29NHPKNFkQzDGmOEIaNRCFYABw8ku13ZyenAuvJOY="
-                            ],
-                            "data": null
-                          },
-                          {
-                            "address": "erd14r7m6drneg69jyxvxxnrsss6x5gg2cqqwreyhdwanj0fcza0ynnq5jmy4g",
-                            "identifier": "writeLog",
-                            "topics": [
-                              "AAAAAAAAAAAFAKVe/p1dXpaw/INtyTPaxf3N3LaNfOs="
-                            ],
-                            "data": "QDZmNmI="
-                          },
-                          {
-                            "address": "erd14r7m6drneg69jyxvxxnrsss6x5gg2cqqwreyhdwanj0fcza0ynnq5jmy4g",
-                            "identifier": "completedTxEvent",
-                            "topics": [
-                              "1AWL08E9sLFIMsfFj+Fj2y9Xn/ZUQ4BYa4on2ItKUHA="
-                            ],
-                            "data": null
-                          }
-                        ]
-                      },
-                      "tokens": [
-                        "WEGLD-d7c6bb"
-                      ],
-                      "esdtValues": [
-                        "253719210115084363"
-                      ],
-                      "operation": "ESDTTransfer"
-                    },
-                    {
-                      "hash": "b7b4d15917fd215399d8e772c3c4e732008baaedc2b8172f71c91708ba7523f0",
-                      "nonce": 31,
-                      "value": 102028510000000,
-                      "receiver": "erd14r7m6drneg69jyxvxxnrsss6x5gg2cqqwreyhdwanj0fcza0ynnq5jmy4g",
-                      "sender": "erd1qqqqqqqqqqqqqpgq5400a82at6ttplyrdhyn8kk9lhxaed5d0n4s9s77kz",
-                      "data": "@6f6b@0000000c5745474c442d64376336626200000000000000000000000803856446ff9a304b@10",
-                      "prevTxHash": "d4058bd3c13db0b14832c7c58fe163db2f579ff6544380586b8a27d88b4a5070",
-                      "originalTxHash": "d4058bd3c13db0b14832c7c58fe163db2f579ff6544380586b8a27d88b4a5070",
-                      "gasLimit": 0,
-                      "gasPrice": 1000000000,
-                      "callType": 0,
-                      "logs": {
-                        "address": "erd14r7m6drneg69jyxvxxnrsss6x5gg2cqqwreyhdwanj0fcza0ynnq5jmy4g",
-                        "events": [
-                          {
-                            "address": "erd14r7m6drneg69jyxvxxnrsss6x5gg2cqqwreyhdwanj0fcza0ynnq5jmy4g",
-                            "identifier": "completedTxEvent",
-                            "topics": [
-                              "1AWL08E9sLFIMsfFj+Fj2y9Xn/ZUQ4BYa4on2ItKUHA="
-                            ],
-                            "data": null
-                          }
-                        ]
-                      },
-                      "operation": "transfer",
-                      "isRefund": true
-                    },
-                    {
-                      "hash": "05a766ca05d2053d1c0fbeb1797116474a06c86402a3bfd6c132c9a24cfa1bb0",
-                      "nonce": 0,
-                      "value": 0,
-                      "receiver": "erd1qqqqqqqqqqqqqpgq5400a82at6ttplyrdhyn8kk9lhxaed5d0n4s9s77kz",
-                      "sender": "erd1qqqqqqqqqqqqqpgq5400a82at6ttplyrdhyn8kk9lhxaed5d0n4s9s77kz",
-                      "data": "swapTokensFixedInput@5745474c442d643763366262@037c778fcce9c55b",
-                      "prevTxHash": "d4058bd3c13db0b14832c7c58fe163db2f579ff6544380586b8a27d88b4a5070",
-                      "originalTxHash": "d4058bd3c13db0b14832c7c58fe163db2f579ff6544380586b8a27d88b4a5070",
-                      "gasLimit": 25050500,
-                      "gasPrice": 1000000000,
-                      "callType": 0,
-                      "operation": "transfer",
-                      "function": "swapTokensFixedInput"
-                    },
-                    {
-                      "hash": "4e639c80822d5d7780c8326d683fa9cd6d59649d14122dfabc5a96dda36da527",
-                      "nonce": 0,
-                      "value": 0,
-                      "receiver": "erd1qqqqqqqqqqqqqpgquu5rsa4ee6l4azz6vdu4hjp8z4p6tt8m0n4suht3dy",
-                      "sender": "erd1qqqqqqqqqqqqqpgq5400a82at6ttplyrdhyn8kk9lhxaed5d0n4s9s77kz",
-                      "data": "ESDTTransfer@5745474c442d643763366262@e7730d1ef1b0@737761704e6f466565416e64466f7277617264@4d45582d646332383963@0000000000000000000000000000000000000000000000000000000000000000",
-                      "prevTxHash": "d4058bd3c13db0b14832c7c58fe163db2f579ff6544380586b8a27d88b4a5070",
-                      "originalTxHash": "d4058bd3c13db0b14832c7c58fe163db2f579ff6544380586b8a27d88b4a5070",
-                      "gasLimit": 0,
-                      "gasPrice": 1000000000,
-                      "callType": 0,
-                      "tokens": [
-                        "WEGLD-d7c6bb"
-                      ],
-                      "esdtValues": [
-                        "254481327387056"
-                      ],
-                      "operation": "ESDTTransfer",
-                      "function": "swapNoFeeAndForward"
-                    }
-                  ],
-                  "logs": {
-                    "address": "erd1qqqqqqqqqqqqqpgq5400a82at6ttplyrdhyn8kk9lhxaed5d0n4s9s77kz",
-                    "events": [
-                      {
-                        "address": "erd14r7m6drneg69jyxvxxnrsss6x5gg2cqqwreyhdwanj0fcza0ynnq5jmy4g",
-                        "identifier": "ESDTTransfer",
-                        "topics": [
-                          "SFRNLWZlMWY2OQ==",
-                          "",
-                          "DeC2s6dkAAA=",
-                          "AAAAAAAAAAAFAKVe/p1dXpaw/INtyTPaxf3N3LaNfOs="
-                        ],
-                        "data": null
-                      },
-                      {
-                        "address": "erd1qqqqqqqqqqqqqpgq5400a82at6ttplyrdhyn8kk9lhxaed5d0n4s9s77kz",
-                        "identifier": "ESDTTransfer",
-                        "topics": [
-                          "V0VHTEQtZDdjNmJi",
-                          "",
-                          "53MNHvGw",
-                          "AAAAAAAAAAAFAOcoOHa5zr9eiFpjeVvIJxVDpaz7fOs="
-                        ],
-                        "data": null
-                      },
-                      {
-                        "address": "erd1qqqqqqqqqqqqqpgquu5rsa4ee6l4azz6vdu4hjp8z4p6tt8m0n4suht3dy",
-                        "identifier": "ESDTLocalBurn",
-                        "topics": [
-                          "TUVYLWRjMjg5Yw==",
-                          "",
-                          "AuMDPq1jy03x"
-                        ],
-                        "data": null
-                      },
-                      {
-                        "address": "erd1qqqqqqqqqqqqqpgquu5rsa4ee6l4azz6vdu4hjp8z4p6tt8m0n4suht3dy",
-                        "identifier": "swapNoFeeAndForward",
-                        "topics": [
-                          "c3dhcF9ub19mZWVfYW5kX2ZvcndhcmQ=",
-                          "TUVYLWRjMjg5Yw==",
-                          "AAAAAAAAAAAFAKVe/p1dXpaw/INtyTPaxf3N3LaNfOs=",
-                          "GL0="
-                        ],
-                        "data": "AAAAAAAAAAAFAKVe/p1dXpaw/INtyTPaxf3N3LaNfOsAAAAMV0VHTEQtZDdjNmJiAAAABudzDR7xsAAAAApNRVgtZGMyODljAAAACQLjAz6tY8tN8QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABzvkcAAAAAAAAYvQAAAABk/khy"
-                      },
-                      {
-                        "address": "erd1qqqqqqqqqqqqqpgq5400a82at6ttplyrdhyn8kk9lhxaed5d0n4s9s77kz",
-                        "identifier": "ESDTTransfer",
-                        "topics": [
-                          "V0VHTEQtZDdjNmJi",
-                          "",
-                          "A4VkRv+aMEs=",
-                          "qP29NHPKNFkQzDGmOEIaNRCFYABw8ku13ZyenAuvJOY="
-                        ],
-                        "data": null
-                      },
-                      {
-                        "address": "erd1qqqqqqqqqqqqqpgq5400a82at6ttplyrdhyn8kk9lhxaed5d0n4s9s77kz",
-                        "identifier": "swapTokensFixedInput",
-                        "topics": [
-                          "c3dhcA==",
-                          "SFRNLWZlMWY2OQ==",
-                          "V0VHTEQtZDdjNmJi",
-                          "qP29NHPKNFkQzDGmOEIaNRCFYABw8ku13ZyenAuvJOY=",
-                          "GL0="
-                        ],
-                        "data": "qP29NHPKNFkQzDGmOEIaNRCFYABw8ku13ZyenAuvJOYAAAAKSFRNLWZlMWY2OQAAAAgN4Lazp2QAAAAAAAxXRUdMRC1kN2M2YmIAAAAIA4VkRv+aMEsAAAAHA41+pMaAAAAAAAoofxtJRPkr8X9kAAAACgpOPCsHUu261HUAAAAAAHO+RwAAAAAAABi9AAAAAGT+SHI="
-                      }
-                    ]
-                  },
-                  "status": "success",
-                  "tokens": [
-                    "HTM-fe1f69"
-                  ],
-                  "esdtValues": [
-                    "1000000000000000000"
-                  ],
-                  "operation": "ESDTTransfer",
-                  "function": "swapTokensFixedInput",
-                  "initiallyPaidFee": "502005000000000",
-                  "fee": "399976490000000",
-                  "chainID": "D",
-                  "version": 1,
-                  "options": 0
-                }
-              },
-              "error": "",
-              "code": "successful"
-            }
-        "#;
-
-        let tx_on_network: TransactionOnNetwork = serde_json::from_str::<TransactionInfo>(data)
-            .unwrap()
-            .data
-            .unwrap()
-            .transaction;
-        let tx_response = TxResponse::from_network_tx(tx_on_network);
-
-        let expected: Vec<Vec<u8>> = vec![
-            hex::decode("0000000c5745474c442d64376336626200000000000000000000000803856446ff9a304b")
-                .unwrap(),
-            hex::decode("10").unwrap(),
-        ];
-
-        assert_eq!(tx_response.out, expected)
-    }
-
-    #[test]
-    fn test_with_tx_that_has_no_sc_result() {
-        // transaction data from the devnet
-        let data = r#"
-            {
-              "data": {
-                "transaction": {
-                  "type": "normal",
-                  "processingTypeOnSource": "SCInvoking",
-                  "processingTypeOnDestination": "SCInvoking",
-                  "hash": "6afac3ec13c89cc56154d06efdb457a24f58361699eee00a48202a8f8adc8c8a",
-                  "nonce": 17,
-                  "round": 7548071,
-                  "epoch": 6257,
-                  "value": "0",
-                  "receiver": "erd1qqqqqqqqqqqqqpgq4nlkk7jwhqgp4r08lal46tqt70jdv0685u7qrr3l2d",
-                  "sender": "erd1uh67c2lkhyj4vh73akv7jky9sfgvus8awwcj64uju69mmfne5u7q299t7g",
-                  "gasPrice": 1000000000,
-                  "gasLimit": 600000000,
-                  "gasUsed": 600000000,
-                  "data": "cmV0dXJuVHdvVTY0",
-                  "signature": "f3a3ca96a78c90c9cf1b08541e1777010f0176a5e1e525e631155b2784932cbfd74c9168d03ba201fd5434d1a1b4789895ddade9883eca2ee9e0bce18468fb00",
-                  "sourceShard": 0,
-                  "destinationShard": 0,
-                  "blockNonce": 7502091,
-                  "blockHash": "5ec66c651cb1514cba200e7e80a4491880f0db678ce7631c397872e3842f0aa2",
-                  "notarizedAtSourceInMetaNonce": 7510505,
-                  "NotarizedAtSourceInMetaHash": "8410309ec5b988af79b4dcfb44fd4729d46874ebd796672c78e417e314409051",
-                  "notarizedAtDestinationInMetaNonce": 7510505,
-                  "notarizedAtDestinationInMetaHash": "8410309ec5b988af79b4dcfb44fd4729d46874ebd796672c78e417e314409051",
-                  "miniblockType": "TxBlock",
-                  "miniblockHash": "fb150e515449c9b658879ed06f256b429239cbe78ec2c2821deb4b283ff21554",
-                  "hyperblockNonce": 7510505,
-                  "hyperblockHash": "8410309ec5b988af79b4dcfb44fd4729d46874ebd796672c78e417e314409051",
-                  "timestamp": 1693840026,
-                  "logs": {
-                    "address": "erd1qqqqqqqqqqqqqpgq4nlkk7jwhqgp4r08lal46tqt70jdv0685u7qrr3l2d",
-                    "events": [
-                      {
-                        "address": "erd1qqqqqqqqqqqqqpgq4nlkk7jwhqgp4r08lal46tqt70jdv0685u7qrr3l2d",
-                        "identifier": "writeLog",
-                        "topics": [
-                          "5fXsK/a5JVZf0e2Z6ViFglDOQP1zsS1XkuaLvaZ5pzw=",
-                          "QHRvbyBtdWNoIGdhcyBwcm92aWRlZCBmb3IgcHJvY2Vzc2luZzogZ2FzIHByb3ZpZGVkID0gNTk5OTMyMDAwLCBnYXMgdXNlZCA9IDE4NDE2NjU="
-                        ],
-                        "data": "QDZmNmJAMGFAMDIxODcxMWEwMA=="
-                      },
-                      {
-                        "address": "erd1qqqqqqqqqqqqqpgq4nlkk7jwhqgp4r08lal46tqt70jdv0685u7qrr3l2d",
-                        "identifier": "completedTxEvent",
-                        "topics": [
-                          "avrD7BPInMVhVNBu/bRXok9YNhaZ7uAKSCAqj4rcjIo="
-                        ],
-                        "data": null
-                      }
-                    ]
-                  },
-                  "status": "success",
-                  "operation": "transfer",
-                  "function": "returnTwoU64",
-                  "initiallyPaidFee": "6067320000000000",
-                  "fee": "6067320000000000",
-                  "chainID": "D",
-                  "version": 1,
-                  "options": 0
-                }
-              },
-              "error": "",
-              "code": "successful"
-            }
-        "#;
-
-        let tx_on_network: TransactionOnNetwork = serde_json::from_str::<TransactionInfo>(data)
-            .unwrap()
-            .data
-            .unwrap()
-            .transaction;
-        let tx_response = TxResponse::from_network_tx(tx_on_network);
-
-        let expected: Vec<Vec<u8>> = vec![
-            hex::decode("0a").unwrap(),
-            hex::decode("0218711a00").unwrap(),
-        ];
-
-        assert_eq!(tx_response.out, expected)
-    }
-
-    #[test]
-    fn test_with_multi_contract_same_shard_tx_that_has_no_sc_result() {
-        // transaction data from the devnet
-        // context : user -> A --call--> B, B returns a MultiValue2<u64, u64>, A returns the B's returned value
-        let data = r#"
-            {
-              "data": {
-                "transaction": {
-                  "type": "normal",
-                  "processingTypeOnSource": "SCInvoking",
-                  "processingTypeOnDestination": "SCInvoking",
-                  "hash": "e914857f1bfd003ba411bae372266703e5f706fa412c378feb37faa5e18c3d73",
-                  "nonce": 49,
-                  "round": 7646960,
-                  "epoch": 6339,
-                  "value": "0",
-                  "receiver": "erd1qqqqqqqqqqqqqpgqshqmekudxlxwp0d9j368etjamr5dw7k45u7qx40w6h",
-                  "sender": "erd1uh67c2lkhyj4vh73akv7jky9sfgvus8awwcj64uju69mmfne5u7q299t7g",
-                  "gasPrice": 1000000000,
-                  "gasLimit": 600000000,
-                  "gasUsed": 600000000,
-                  "data": "Y2FsbEFub3RoZXJDb250cmFjdFJldHVyblR3b1U2NEAwMDAwMDAwMDAwMDAwMDAwMDUwMEFDRkY2QjdBNEVCODEwMUE4REU3RkY3RjVEMkMwQkYzRTRENjNGNDdBNzND",
-                  "signature": "53cc6496647287d735bd7950f4ec79d7b51f884defda1d6d840d722b7d0d869900ccecc01602da7a7c717955e8d4ed0711b92acd980d64ed6eebd6eaed0c4608",
-                  "sourceShard": 0,
-                  "destinationShard": 0,
-                  "blockNonce": 7600794,
-                  "blockHash": "77eb0904e56d6dd596c0d72821cf33b326fde383e72903ca4df5c2f200b0ea75",
-                  "notarizedAtSourceInMetaNonce": 7609344,
-                  "NotarizedAtSourceInMetaHash": "12df3fe65cacde2c9742b9506ac2261d34f3c72d690301192fd8016430d51913",
-                  "notarizedAtDestinationInMetaNonce": 7609344,
-                  "notarizedAtDestinationInMetaHash": "12df3fe65cacde2c9742b9506ac2261d34f3c72d690301192fd8016430d51913",
-                  "miniblockType": "TxBlock",
-                  "miniblockHash": "03219ac7427f7511687f0768c722c759c1b1428b2664b44a0cbe2072154851ee",
-                  "hyperblockNonce": 7609344,
-                  "hyperblockHash": "12df3fe65cacde2c9742b9506ac2261d34f3c72d690301192fd8016430d51913",
-                  "timestamp": 1694433360,
-                  "logs": {
-                    "address": "erd1qqqqqqqqqqqqqpgqshqmekudxlxwp0d9j368etjamr5dw7k45u7qx40w6h",
-                    "events": [
-                      {
-                        "address": "erd1qqqqqqqqqqqqqpgqshqmekudxlxwp0d9j368etjamr5dw7k45u7qx40w6h",
-                        "identifier": "writeLog",
-                        "topics": [
-                          "5fXsK/a5JVZf0e2Z6ViFglDOQP1zsS1XkuaLvaZ5pzw=",
-                          "QHRvbyBtdWNoIGdhcyBwcm92aWRlZCBmb3IgcHJvY2Vzc2luZzogZ2FzIHByb3ZpZGVkID0gNTk5ODA2MDAwLCBnYXMgdXNlZCA9IDM4NDcyNDA="
-                        ],
-                        "data": "QDZmNmJAMGFAMDIxODcxMWEwMA=="
-                      },
-                      {
-                        "address": "erd1qqqqqqqqqqqqqpgqshqmekudxlxwp0d9j368etjamr5dw7k45u7qx40w6h",
-                        "identifier": "completedTxEvent",
-                        "topics": [
-                          "6RSFfxv9ADukEbrjciZnA+X3BvpBLDeP6zf6peGMPXM="
-                        ],
-                        "data": null
-                      }
-                    ]
-                  },
-                  "status": "success",
-                  "operation": "transfer",
-                  "function": "callAnotherContractReturnTwoU64",
-                  "initiallyPaidFee": "6192060000000000",
-                  "fee": "6192060000000000",
-                  "chainID": "D",
-                  "version": 2,
-                  "options": 0
-                }
-              },
-              "error": "",
-              "code": "successful"
-            }
-        "#;
-
-        let tx_on_network: TransactionOnNetwork = serde_json::from_str::<TransactionInfo>(data)
-            .unwrap()
-            .data
-            .unwrap()
-            .transaction;
-        let tx_response = TxResponse::from_network_tx(tx_on_network);
-
-        let expected: Vec<Vec<u8>> = vec![
-            hex::decode("0a").unwrap(),
-            hex::decode("0218711a00").unwrap(),
-        ];
-
-        assert_eq!(tx_response.out, expected)
-    }
-
-    #[test]
-    fn test_with_multi_contract_cross_shard_tx_that_has_no_callback() {
-        // transaction data from the devnet
-        // context : user -> A --async call--> B, no callback
-        let data = r#"
-            {
-              "data": {
-                "transaction": {
-                  "type": "normal",
-                  "processingTypeOnSource": "SCInvoking",
-                  "processingTypeOnDestination": "SCInvoking",
-                  "hash": "4d50a055663dfee2479851684d7fb83cf00695b6f03f4dbbdf0f9232477cafc4",
-                  "nonce": 51,
-                  "round": 7647523,
-                  "epoch": 6340,
-                  "value": "0",
-                  "receiver": "erd1qqqqqqqqqqqqqpgqllqglpjdrz5kn3m0k9uf9hdqjmg3xdhk6r7se3wvlk",
-                  "sender": "erd1uh67c2lkhyj4vh73akv7jky9sfgvus8awwcj64uju69mmfne5u7q299t7g",
-                  "gasPrice": 1000000000,
-                  "gasLimit": 600000000,
-                  "gasUsed": 600000000,
-                  "data": "YXN5bmNDYWxsQW5vdGhlckNvbnRyYWN0UmV0dXJuVHdvVTY0Tm9DYWxsYmFja0AwMDAwMDAwMDAwMDAwMDAwMDUwMEFDRkY2QjdBNEVCODEwMUE4REU3RkY3RjVEMkMwQkYzRTRENjNGNDdBNzND",
-                  "signature": "0fc30cddaa8e5365662a14344e3434cbccf287f357be99b3ed4add182f64dded774ec0d095ab1589e7c6c07e00de3b7239efc96eb2e0e97b48c1ef87084cec01",
-                  "sourceShard": 0,
-                  "destinationShard": 1,
-                  "blockNonce": 7593758,
-                  "blockHash": "a828c0ca58ef1c8aff60e512ab59f18204f1915d4a6c8285cfceb1c5725b88e8",
-                  "notarizedAtSourceInMetaNonce": 7609903,
-                  "NotarizedAtSourceInMetaHash": "4e90fe45c2fdccd5cf6977c1422e5f4ffa41c4e9f31fb4a50c20455f87df1e99",
-                  "notarizedAtDestinationInMetaNonce": 7609907,
-                  "notarizedAtDestinationInMetaHash": "10b8666a44411c3babbe20af7154fb3d47efcb1cb10d955523ec68fece26e517",
-                  "miniblockType": "TxBlock",
-                  "miniblockHash": "4ff4bb1ac88911d617c9b0342aeb5158db78490c2fe414cad08adcc584a77be7",
-                  "hyperblockNonce": 7609907,
-                  "hyperblockHash": "10b8666a44411c3babbe20af7154fb3d47efcb1cb10d955523ec68fece26e517",
-                  "timestamp": 1694436738,
-                  "smartContractResults": [
-                    {
-                      "hash": "462b56a1530e6070dc7c15f755e51a97a6972c8cd7891f3be4635b93211890c5",
-                      "nonce": 0,
-                      "value": 0,
-                      "receiver": "erd1qqqqqqqqqqqqqpgqllqglpjdrz5kn3m0k9uf9hdqjmg3xdhk6r7se3wvlk",
-                      "sender": "erd1qqqqqqqqqqqqqpgq4nlkk7jwhqgp4r08lal46tqt70jdv0685u7qrr3l2d",
-                      "data": "@00@0a@0218711a00",
-                      "prevTxHash": "41d56fdacf3e14de67e821427c732b62ebfa07c82d2e5db6de75fe3a1c828d9b",
-                      "originalTxHash": "4d50a055663dfee2479851684d7fb83cf00695b6f03f4dbbdf0f9232477cafc4",
-                      "gasLimit": 595637825,
-                      "gasPrice": 1000000000,
-                      "callType": 2,
-                      "logs": {
-                        "address": "erd1qqqqqqqqqqqqqpgqllqglpjdrz5kn3m0k9uf9hdqjmg3xdhk6r7se3wvlk",
-                        "events": [
-                          {
-                            "address": "erd1qqqqqqqqqqqqqpgqllqglpjdrz5kn3m0k9uf9hdqjmg3xdhk6r7se3wvlk",
-                            "identifier": "writeLog",
-                            "topics": [
-                              "AAAAAAAAAAAFAP/Aj4ZNGKlpx2+xeJLdoJbREzb20P0=",
-                              "QHRvbyBtdWNoIGdhcyBwcm92aWRlZCBmb3IgcHJvY2Vzc2luZzogZ2FzIHByb3ZpZGVkID0gNTk1NjM3ODI1LCBnYXMgdXNlZCA9IDIxNjE3NzA="
-                            ],
-                            "data": "QDZmNmI="
-                          },
-                          {
-                            "address": "erd1qqqqqqqqqqqqqpgqllqglpjdrz5kn3m0k9uf9hdqjmg3xdhk6r7se3wvlk",
-                            "identifier": "completedTxEvent",
-                            "topics": [
-                              "QdVv2s8+FN5n6CFCfHMrYuv6B8gtLl223nX+OhyCjZs="
-                            ],
-                            "data": null
-                          }
-                        ]
-                      },
-                      "operation": "transfer"
-                    },
-                    {
-                      "hash": "41d56fdacf3e14de67e821427c732b62ebfa07c82d2e5db6de75fe3a1c828d9b",
-                      "nonce": 0,
-                      "value": 0,
-                      "receiver": "erd1qqqqqqqqqqqqqpgq4nlkk7jwhqgp4r08lal46tqt70jdv0685u7qrr3l2d",
-                      "sender": "erd1qqqqqqqqqqqqqpgqllqglpjdrz5kn3m0k9uf9hdqjmg3xdhk6r7se3wvlk",
-                      "data": "returnTwoU64@4f3c60",
-                      "prevTxHash": "4d50a055663dfee2479851684d7fb83cf00695b6f03f4dbbdf0f9232477cafc4",
-                      "originalTxHash": "4d50a055663dfee2479851684d7fb83cf00695b6f03f4dbbdf0f9232477cafc4",
-                      "gasLimit": 597479490,
-                      "gasPrice": 1000000000,
-                      "callType": 1,
-                      "operation": "transfer",
-                      "function": "returnTwoU64"
-                    }
-                  ],
-                  "logs": {
-                    "address": "erd1qqqqqqqqqqqqqpgqllqglpjdrz5kn3m0k9uf9hdqjmg3xdhk6r7se3wvlk",
-                    "events": [
-                      {
-                        "address": "erd1qqqqqqqqqqqqqpgqllqglpjdrz5kn3m0k9uf9hdqjmg3xdhk6r7se3wvlk",
-                        "identifier": "writeLog",
-                        "topics": [
-                          "5fXsK/a5JVZf0e2Z6ViFglDOQP1zsS1XkuaLvaZ5pzw="
-                        ],
-                        "data": "QDZmNmI="
-                      }
-                    ]
-                  },
-                  "status": "success",
-                  "operation": "transfer",
-                  "function": "asyncCallAnotherContractReturnTwoU64NoCallback",
-                  "initiallyPaidFee": "6214335000000000",
-                  "fee": "6214335000000000",
-                  "chainID": "D",
-                  "version": 2,
-                  "options": 0
-                }
-              },
-              "error": "",
-              "code": "successful"
-            }
-        "#;
-
-        let tx_on_network: TransactionOnNetwork = serde_json::from_str::<TransactionInfo>(data)
-            .unwrap()
-            .data
-            .unwrap()
-            .transaction;
-        let tx_response = TxResponse::from_network_tx(tx_on_network);
-
-        let expected: Vec<Vec<u8>> = vec![];
-
-        assert_eq!(tx_response.out, expected)
-    }
-
-    #[test]
-    fn test_with_multi_contract_cross_shard_tx_that_has_non_returning_callback() {
-        // transaction data from the devnet
-        // context : user -> A --async call--> B --callback--> A, the callback returns ()
-        let data = r#"
-            {
-              "data": {
-                "transaction": {
-                  "type": "normal",
-                  "processingTypeOnSource": "SCInvoking",
-                  "processingTypeOnDestination": "SCInvoking",
-                  "hash": "4f7f19e448176e4d47a0f844cbd6bdb1b6c68035dafe927e8249ed60af1c3b17",
-                  "nonce": 52,
-                  "round": 7647560,
-                  "epoch": 6340,
-                  "value": "0",
-                  "receiver": "erd1qqqqqqqqqqqqqpgqllqglpjdrz5kn3m0k9uf9hdqjmg3xdhk6r7se3wvlk",
-                  "sender": "erd1uh67c2lkhyj4vh73akv7jky9sfgvus8awwcj64uju69mmfne5u7q299t7g",
-                  "gasPrice": 1000000000,
-                  "gasLimit": 600000000,
-                  "gasUsed": 600000000,
-                  "data": "YXN5bmNDYWxsQW5vdGhlckNvbnRyYWN0UmV0dXJuVHdvVTY0V2l0aE5vblJldHVybmluZ0NhbGxiYWNrQDAwMDAwMDAwMDAwMDAwMDAwNTAwQUNGRjZCN0E0RUI4MTAxQThERTdGRjdGNUQyQzBCRjNFNEQ2M0Y0N0E3M0M=",
-                  "signature": "3918fce429b2059b2321b709011079755dbb835e12839278ee510e4741180540e80c6111eea1d3312b2c63446de08b20e01f6040358fa94d1633c355bb65bc0f",
-                  "sourceShard": 0,
-                  "destinationShard": 1,
-                  "blockNonce": 7593795,
-                  "blockHash": "c17e727f90025225670b7852ea9807c67753c9b3f21b6ec7cc40077e3849a8b7",
-                  "notarizedAtSourceInMetaNonce": 7609940,
-                  "NotarizedAtSourceInMetaHash": "c67b5c550986cfd6c94d00f4b90234eb38ee196ff0d79a00d916f3bd24be272c",
-                  "notarizedAtDestinationInMetaNonce": 7609944,
-                  "notarizedAtDestinationInMetaHash": "d59b7398d962ce3119679af59d5d74e10083e62c3ee2b15421cc0d607979ca18",
-                  "miniblockType": "TxBlock",
-                  "miniblockHash": "2977affeffeb6cf41117bed442662021cb713528cdb1d0dce4537b01caeb8e0b",
-                  "hyperblockNonce": 7609944,
-                  "hyperblockHash": "d59b7398d962ce3119679af59d5d74e10083e62c3ee2b15421cc0d607979ca18",
-                  "timestamp": 1694436960,
-                  "smartContractResults": [
-                    {
-                      "hash": "fe7474188d5ca4b84c7577f03fc778d22d53c070dfcb05a9cda840229d30e4d3",
-                      "nonce": 0,
-                      "value": 0,
-                      "receiver": "erd1qqqqqqqqqqqqqpgq4nlkk7jwhqgp4r08lal46tqt70jdv0685u7qrr3l2d",
-                      "sender": "erd1qqqqqqqqqqqqqpgqllqglpjdrz5kn3m0k9uf9hdqjmg3xdhk6r7se3wvlk",
-                      "data": "returnTwoU64@4f3c60",
-                      "prevTxHash": "4f7f19e448176e4d47a0f844cbd6bdb1b6c68035dafe927e8249ed60af1c3b17",
-                      "originalTxHash": "4f7f19e448176e4d47a0f844cbd6bdb1b6c68035dafe927e8249ed60af1c3b17",
-                      "gasLimit": 596979545,
-                      "gasPrice": 1000000000,
-                      "callType": 1,
-                      "operation": "transfer",
-                      "function": "returnTwoU64"
-                    },
-                    {
-                      "hash": "948dc6702b376d1e043db8de2f87ca12907c342f54cfad7dfebadf59145ca3ac",
-                      "nonce": 0,
-                      "value": 0,
-                      "receiver": "erd1qqqqqqqqqqqqqpgqllqglpjdrz5kn3m0k9uf9hdqjmg3xdhk6r7se3wvlk",
-                      "sender": "erd1qqqqqqqqqqqqqpgq4nlkk7jwhqgp4r08lal46tqt70jdv0685u7qrr3l2d",
-                      "data": "@00@0a@0218711a00",
-                      "prevTxHash": "fe7474188d5ca4b84c7577f03fc778d22d53c070dfcb05a9cda840229d30e4d3",
-                      "originalTxHash": "4f7f19e448176e4d47a0f844cbd6bdb1b6c68035dafe927e8249ed60af1c3b17",
-                      "gasLimit": 595137880,
-                      "gasPrice": 1000000000,
-                      "callType": 2,
-                      "logs": {
-                        "address": "erd1qqqqqqqqqqqqqpgqllqglpjdrz5kn3m0k9uf9hdqjmg3xdhk6r7se3wvlk",
-                        "events": [
-                          {
-                            "address": "erd1qqqqqqqqqqqqqpgqllqglpjdrz5kn3m0k9uf9hdqjmg3xdhk6r7se3wvlk",
-                            "identifier": "writeLog",
-                            "topics": [
-                              "AAAAAAAAAAAFAP/Aj4ZNGKlpx2+xeJLdoJbREzb20P0=",
-                              "QHRvbyBtdWNoIGdhcyBwcm92aWRlZCBmb3IgcHJvY2Vzc2luZzogZ2FzIHByb3ZpZGVkID0gNTk1MTM3ODgwLCBnYXMgdXNlZCA9IDIyODg1NTA="
-                            ],
-                            "data": "QDZmNmJAMGFAMDIxODcxMWEwMA=="
-                          },
-                          {
-                            "address": "erd1qqqqqqqqqqqqqpgqllqglpjdrz5kn3m0k9uf9hdqjmg3xdhk6r7se3wvlk",
-                            "identifier": "completedTxEvent",
-                            "topics": [
-                              "/nR0GI1cpLhMdXfwP8d40i1TwHDfywWpzahAIp0w5NM="
-                            ],
-                            "data": null
-                          }
-                        ]
-                      },
-                      "operation": "transfer"
-                    }
-                  ],
-                  "logs": {
-                    "address": "erd1qqqqqqqqqqqqqpgqllqglpjdrz5kn3m0k9uf9hdqjmg3xdhk6r7se3wvlk",
-                    "events": [
-                      {
-                        "address": "erd1qqqqqqqqqqqqqpgqllqglpjdrz5kn3m0k9uf9hdqjmg3xdhk6r7se3wvlk",
-                        "identifier": "writeLog",
-                        "topics": [
-                          "5fXsK/a5JVZf0e2Z6ViFglDOQP1zsS1XkuaLvaZ5pzw="
-                        ],
-                        "data": "QDZmNmI="
-                      }
-                    ]
-                  },
-                  "status": "success",
-                  "operation": "transfer",
-                  "function": "asyncCallAnotherContractReturnTwoU64WithNonReturningCallback",
-                  "initiallyPaidFee": "6235125000000000",
-                  "fee": "6235125000000000",
-                  "chainID": "D",
-                  "version": 2,
-                  "options": 0
-                }
-              },
-              "error": "",
-              "code": "successful"
-            }
-        "#;
-
-        let tx_on_network: TransactionOnNetwork = serde_json::from_str::<TransactionInfo>(data)
-            .unwrap()
-            .data
-            .unwrap()
-            .transaction;
-        let tx_response = TxResponse::from_network_tx(tx_on_network);
-
-        let expected: Vec<Vec<u8>> = vec![];
-
-        assert_eq!(tx_response.out, expected)
-    }
-
-    #[test]
-    fn test_with_multi_contract_cross_shard_tx_that_has_returning_callback() {
-        // transaction data from the devnet
-        // context : user -> A --async call--> B --callback--> A, the callback returns a MultiValue2<u64, u64>
-        let data = r#"
-            {
-              "data": {
-                "transaction": {
-                  "type": "normal",
-                  "processingTypeOnSource": "SCInvoking",
-                  "processingTypeOnDestination": "SCInvoking",
-                  "hash": "f34e136ca81c0e32f6fb532b753612715675073f3718b5db009bb275d246fd7a",
-                  "nonce": 53,
-                  "round": 7647583,
-                  "epoch": 6340,
-                  "value": "0",
-                  "receiver": "erd1qqqqqqqqqqqqqpgqllqglpjdrz5kn3m0k9uf9hdqjmg3xdhk6r7se3wvlk",
-                  "sender": "erd1uh67c2lkhyj4vh73akv7jky9sfgvus8awwcj64uju69mmfne5u7q299t7g",
-                  "gasPrice": 1000000000,
-                  "gasLimit": 600000000,
-                  "gasUsed": 600000000,
-                  "data": "YXN5bmNDYWxsQW5vdGhlckNvbnRyYWN0UmV0dXJuVHdvVTY0V2l0aFJldHVybmluZ0NhbGxiYWNrQDAwMDAwMDAwMDAwMDAwMDAwNTAwQUNGRjZCN0E0RUI4MTAxQThERTdGRjdGNUQyQzBCRjNFNEQ2M0Y0N0E3M0M=",
-                  "signature": "858958d4aaf9cb0220ab2933edad3f65e1cb4c58aa7940cb0f40b489d0bd9fdf5c4736a40d6e813743ee622bb91e9f86eacf01b9a31e0ff53f9c84f13c500304",
-                  "sourceShard": 0,
-                  "destinationShard": 1,
-                  "blockNonce": 7593818,
-                  "blockHash": "b19f97110ca38d3cb15f802a00ab403491b0e5804ebc701527ab50064dc06825",
-                  "notarizedAtSourceInMetaNonce": 7609963,
-                  "NotarizedAtSourceInMetaHash": "4d9db6de610ca778114d44fe91dd036fac7c375c373ae9e77130d3fb9efc8391",
-                  "notarizedAtDestinationInMetaNonce": 7609967,
-                  "notarizedAtDestinationInMetaHash": "a4573d388c31860f9bd6f9507b65d1b3130e445abcada538f10704feba4614e7",
-                  "miniblockType": "TxBlock",
-                  "miniblockHash": "530f5fa3c7af474a187caca8dcea02a7a155017414147871d083bed5c49ec8f5",
-                  "hyperblockNonce": 7609967,
-                  "hyperblockHash": "a4573d388c31860f9bd6f9507b65d1b3130e445abcada538f10704feba4614e7",
-                  "timestamp": 1694437098,
-                  "smartContractResults": [
-                    {
-                      "hash": "065291164a8acd27c26b5a8f09664810081fda18cd54fca635196cf9b200297a",
-                      "nonce": 0,
-                      "value": 0,
-                      "receiver": "erd1qqqqqqqqqqqqqpgq4nlkk7jwhqgp4r08lal46tqt70jdv0685u7qrr3l2d",
-                      "sender": "erd1qqqqqqqqqqqqqpgqllqglpjdrz5kn3m0k9uf9hdqjmg3xdhk6r7se3wvlk",
-                      "data": "returnTwoU64@4f3c60",
-                      "prevTxHash": "f34e136ca81c0e32f6fb532b753612715675073f3718b5db009bb275d246fd7a",
-                      "originalTxHash": "f34e136ca81c0e32f6fb532b753612715675073f3718b5db009bb275d246fd7a",
-                      "gasLimit": 596994205,
-                      "gasPrice": 1000000000,
-                      "callType": 1,
-                      "operation": "transfer",
-                      "function": "returnTwoU64"
-                    },
-                    {
-                      "hash": "bc31cb153ae615204625df84fe9ae3a159aa412b7342f3dca958dd5517a08197",
-                      "nonce": 0,
-                      "value": 0,
-                      "receiver": "erd1qqqqqqqqqqqqqpgqllqglpjdrz5kn3m0k9uf9hdqjmg3xdhk6r7se3wvlk",
-                      "sender": "erd1qqqqqqqqqqqqqpgq4nlkk7jwhqgp4r08lal46tqt70jdv0685u7qrr3l2d",
-                      "data": "@00@0a@0218711a00",
-                      "prevTxHash": "065291164a8acd27c26b5a8f09664810081fda18cd54fca635196cf9b200297a",
-                      "originalTxHash": "f34e136ca81c0e32f6fb532b753612715675073f3718b5db009bb275d246fd7a",
-                      "gasLimit": 595152540,
-                      "gasPrice": 1000000000,
-                      "callType": 2,
-                      "logs": {
-                        "address": "erd1qqqqqqqqqqqqqpgqllqglpjdrz5kn3m0k9uf9hdqjmg3xdhk6r7se3wvlk",
-                        "events": [
-                          {
-                            "address": "erd1qqqqqqqqqqqqqpgqllqglpjdrz5kn3m0k9uf9hdqjmg3xdhk6r7se3wvlk",
-                            "identifier": "writeLog",
-                            "topics": [
-                              "AAAAAAAAAAAFAP/Aj4ZNGKlpx2+xeJLdoJbREzb20P0=",
-                              "QHRvbyBtdWNoIGdhcyBwcm92aWRlZCBmb3IgcHJvY2Vzc2luZzogZ2FzIHByb3ZpZGVkID0gNTk1MTUyNTQwLCBnYXMgdXNlZCA9IDIyODgwMTU="
-                            ],
-                            "data": "QDZmNmJAMGFAMDIxODcxMWEwMA=="
-                          },
-                          {
-                            "address": "erd1qqqqqqqqqqqqqpgqllqglpjdrz5kn3m0k9uf9hdqjmg3xdhk6r7se3wvlk",
-                            "identifier": "completedTxEvent",
-                            "topics": [
-                              "BlKRFkqKzSfCa1qPCWZIEAgf2hjNVPymNRls+bIAKXo="
-                            ],
-                            "data": null
-                          }
-                        ]
-                      },
-                      "operation": "transfer"
-                    }
-                  ],
-                  "logs": {
-                    "address": "erd1qqqqqqqqqqqqqpgqllqglpjdrz5kn3m0k9uf9hdqjmg3xdhk6r7se3wvlk",
-                    "events": [
-                      {
-                        "address": "erd1qqqqqqqqqqqqqpgqllqglpjdrz5kn3m0k9uf9hdqjmg3xdhk6r7se3wvlk",
-                        "identifier": "writeLog",
-                        "topics": [
-                          "5fXsK/a5JVZf0e2Z6ViFglDOQP1zsS1XkuaLvaZ5pzw="
-                        ],
-                        "data": "QDZmNmI="
-                      }
-                    ]
-                  },
-                  "status": "success",
-                  "operation": "transfer",
-                  "function": "asyncCallAnotherContractReturnTwoU64WithReturningCallback",
-                  "initiallyPaidFee": "6230670000000000",
-                  "fee": "6230670000000000",
-                  "chainID": "D",
-                  "version": 2,
-                  "options": 0
-                }
-              },
-              "error": "",
-              "code": "successful"
-            }
-        "#;
-
-        let tx_on_network: TransactionOnNetwork = serde_json::from_str::<TransactionInfo>(data)
-            .unwrap()
-            .data
-            .unwrap()
-            .transaction;
-        let tx_response = TxResponse::from_network_tx(tx_on_network);
-
-        let expected: Vec<Vec<u8>> = vec![];
-
-        assert_eq!(tx_response.out, expected)
-    }
-
-    #[test]
-    fn test_process_issued_token_identifier_fungible() {
-        let data = r#"
-        {
-  "data": {
-    "transaction": {
-      "type": "normal",
-      "processingTypeOnSource": "SCInvoking",
-      "processingTypeOnDestination": "SCInvoking",
-      "hash": "b78170cc5ca5ba441ea46fe84540db9610ccab243ccd4cd3cd976e170c4864c8",
-      "nonce": 61,
-      "round": 173598,
-      "epoch": 72,
-      "value": "50000000000000000",
-      "receiver": "erd1qqqqqqqqqqqqqpgqa7hv0nahgsl8tz0psat46x0tchm0wuyc0n4s6q28ad",
-      "sender": "erd1x39tc3q3nn72ecjnmcz7x0qp09kp97t080x99dgyhx7zh95j0n4szskhlv",
-      "gasPrice": 1000000000,
-      "gasLimit": 100000000,
-      "gasUsed": 100000000,
-      "data": "aXNzdWVMcFRva2VuQDAwMDAwMDAwMDAwMDAwMDAwNTAwMTM5ZWQ3YWU0YWEwMzc5MmU2YmNiMzMyMzk0YTQwZmU3NDZlZWZhNDdjZWJANDU0NzRjNDQ0ZDQ1NTg0YzUwQDQ1NDc0YzQ0NGQ0NTU4",
-      "signature": "b5049d2906adc1305a6a8d0f42749254ca6259c6996d9a35e7dc7528b3c87b48a421879aff70bc6d81483a7559b75e5dcf9be499dcb7d57aa9f25c79ac2ad40d",
-      "sourceShard": 1,
-      "destinationShard": 1,
-      "blockNonce": 173354,
-      "blockHash": "09d85ac264a54e12e7613395211c53fe0ee5a7d3b7111bf5fec1d02794caaacd",
-      "notarizedAtSourceInMetaNonce": 173321,
-      "NotarizedAtSourceInMetaHash": "64a83759da97fe8305cd4cda4b518f2d41ef0a8f3995d264460821edad45e09e",
-      "notarizedAtDestinationInMetaNonce": 173321,
-      "notarizedAtDestinationInMetaHash": "64a83759da97fe8305cd4cda4b518f2d41ef0a8f3995d264460821edad45e09e",
-      "miniblockType": "TxBlock",
-      "miniblockHash": "7f45eee4e35ffc1fbce66b92e4dd2aeae2acb092416aa5aa775b96493256b81d",
-      "hyperblockNonce": 173321,
-      "hyperblockHash": "64a83759da97fe8305cd4cda4b518f2d41ef0a8f3995d264460821edad45e09e",
-      "timestamp": 1695041588,
-      "smartContractResults": [
-        {
-          "hash": "bce3d0dceb0b3e5c8c5780d7da3755c3f7492d551685d493a73bf66ebd36754b",
-          "nonce": 0,
-          "value": 50000000000000000,
-          "receiver": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
-          "sender": "erd1qqqqqqqqqqqqqpgqa7hv0nahgsl8tz0psat46x0tchm0wuyc0n4s6q28ad",
-          "data": "issue@45474c444d45584c50@45474c444d4558@03e8@12@63616e467265657a65@74727565@63616e57697065@74727565@63616e5061757365@74727565@63616e4d696e74@74727565@63616e4275726e@74727565@63616e4368616e67654f776e6572@74727565@63616e55706772616465@74727565@63616e4164645370656369616c526f6c6573@74727565@65ba30",
-          "prevTxHash": "b78170cc5ca5ba441ea46fe84540db9610ccab243ccd4cd3cd976e170c4864c8",
-          "originalTxHash": "b78170cc5ca5ba441ea46fe84540db9610ccab243ccd4cd3cd976e170c4864c8",
-          "gasLimit": 89624222,
-          "gasPrice": 1000000000,
-          "callType": 1,
-          "originalSender": "erd1x39tc3q3nn72ecjnmcz7x0qp09kp97t080x99dgyhx7zh95j0n4szskhlv",
-          "operation": "transfer",
-          "function": "issue"
-        },
-        {
-          "hash": "2a452ff652791d79be5f6933fb583cc5503e876893e54b3b51381a92aa2e904d",
-          "nonce": 0,
-          "value": 0,
-          "receiver": "erd1llllllllllllllllllllllllllllllllllllllllllllllllluqsl6e366",
-          "sender": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
-          "data": "ESDTSetBurnRoleForAll@45474c444d45582d393563366435",
-          "prevTxHash": "bce3d0dceb0b3e5c8c5780d7da3755c3f7492d551685d493a73bf66ebd36754b",
-          "originalTxHash": "b78170cc5ca5ba441ea46fe84540db9610ccab243ccd4cd3cd976e170c4864c8",
-          "gasLimit": 0,
-          "gasPrice": 1000000000,
-          "callType": 0,
-          "logs": {
-            "address": "erd1llllllllllllllllllllllllllllllllllllllllllllllllluqsl6e366",
-            "events": [
-              {
-                "address": "erd1llllllllllllllllllllllllllllllllllllllllllllllllluqsl6e366",
-                "identifier": "completedTxEvent",
-                "topics": [
-                  "vOPQ3OsLPlyMV4DX2jdVw/dJLVUWhdSTpzv2br02dUs="
-                ],
-                "data": null,
-                "additionalData": null
-              }
-            ]
-          },
-          "operation": "transfer"
-        },
-        {
-          "hash": "2c84740ccb3376ea9fa00dab6c6c93fe7a35ee0a1d6dbfa0a1e61064853b0874",
-          "nonce": 0,
-          "value": 0,
-          "receiver": "erd1qqqqqqqqqqqqqpgqa7hv0nahgsl8tz0psat46x0tchm0wuyc0n4s6q28ad",
-          "sender": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
-          "data": "ESDTTransfer@45474c444d45582d393563366435@03e8@00",
-          "prevTxHash": "bce3d0dceb0b3e5c8c5780d7da3755c3f7492d551685d493a73bf66ebd36754b",
-          "originalTxHash": "b78170cc5ca5ba441ea46fe84540db9610ccab243ccd4cd3cd976e170c4864c8",
-          "gasLimit": 39624222,
-          "gasPrice": 1000000000,
-          "callType": 2,
-          "logs": {
-            "address": "erd1qqqqqqqqqqqqqpgqa7hv0nahgsl8tz0psat46x0tchm0wuyc0n4s6q28ad",
-            "events": [
-              {
-                "address": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
-                "identifier": "ESDTTransfer",
-                "topics": [
-                  "RUdMRE1FWC05NWM2ZDU=",
-                  "",
-                  "A+g=",
-                  "AAAAAAAAAAAFAO+ux8+3RD51ieGHV10Z68X293CYfOs="
-                ],
-                "data": null,
-                "additionalData": null
-              },
-              {
-                "address": "erd1qqqqqqqqqqqqqpgqa7hv0nahgsl8tz0psat46x0tchm0wuyc0n4s6q28ad",
-                "identifier": "completedTxEvent",
-                "topics": [
-                  "vOPQ3OsLPlyMV4DX2jdVw/dJLVUWhdSTpzv2br02dUs="
-                ],
-                "data": null,
-                "additionalData": null
-              }
-            ]
-          },
-          "tokens": [
-            "EGLDMEX-95c6d5"
-          ],
-          "esdtValues": [
-            "1000"
-          ],
-          "operation": "ESDTTransfer",
-          "function": "\u0000"
-        },
-        {
-          "hash": "c9dfc4de3c3cee319123087a4f5dd03cc051e728ec6070707a63ea977b535227",
-          "nonce": 0,
-          "value": 0,
-          "receiver": "erd1qqqqqqqqqqqqqpgqa7hv0nahgsl8tz0psat46x0tchm0wuyc0n4s6q28ad",
-          "sender": "erd1qqqqqqqqqqqqqpgqa7hv0nahgsl8tz0psat46x0tchm0wuyc0n4s6q28ad",
-          "data": "\u0000",
-          "prevTxHash": "2c84740ccb3376ea9fa00dab6c6c93fe7a35ee0a1d6dbfa0a1e61064853b0874",
-          "originalTxHash": "b78170cc5ca5ba441ea46fe84540db9610ccab243ccd4cd3cd976e170c4864c8",
-          "gasLimit": 39424222,
-          "gasPrice": 1000000000,
-          "callType": 2,
-          "operation": "transfer",
-          "function": "\u0000"
-        },
-        {
-          "hash": "609c3a8e1903680fef1f6d9e47527b1b5c1259664b868af600162120ce0b8192",
-          "nonce": 1,
-          "value": 300925400000000,
-          "receiver": "erd1qqqqqqqqqqqqqpgqa7hv0nahgsl8tz0psat46x0tchm0wuyc0n4s6q28ad",
-          "sender": "erd1qqqqqqqqqqqqqpgqa7hv0nahgsl8tz0psat46x0tchm0wuyc0n4s6q28ad",
-          "data": "@6f6b",
-          "prevTxHash": "2c84740ccb3376ea9fa00dab6c6c93fe7a35ee0a1d6dbfa0a1e61064853b0874",
-          "originalTxHash": "b78170cc5ca5ba441ea46fe84540db9610ccab243ccd4cd3cd976e170c4864c8",
-          "gasLimit": 0,
-          "gasPrice": 1000000000,
-          "callType": 0,
-          "operation": "transfer",
-          "isRefund": true
-        }
-      ],
-      "logs": {
-        "address": "erd1qqqqqqqqqqqqqpgqa7hv0nahgsl8tz0psat46x0tchm0wuyc0n4s6q28ad",
-        "events": [
-          {
-            "address": "erd1qqqqqqqqqqqqqpgqa7hv0nahgsl8tz0psat46x0tchm0wuyc0n4s6q28ad",
-            "identifier": "transferValueOnly",
-            "topics": [
-              "AAAAAAAAAAAFAO+ux8+3RD51ieGHV10Z68X293CYfOs=",
-              "AAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAC//8=",
-              "saK8LsUAAA=="
-            ],
-            "data": null,
-            "additionalData": null
-          },
-          {
-            "address": "erd1qqqqqqqqqqqqqpgqa7hv0nahgsl8tz0psat46x0tchm0wuyc0n4s6q28ad",
-            "identifier": "writeLog",
-            "topics": [
-              "NEq8RBGc/KziU94F4zwBeWwS+W87zFK1BLm8K5aSfOs="
-            ],
-            "data": "QDZmNmI=",
-            "additionalData": null
-          }
-        ]
-      },
-      "status": "success",
-      "operation": "transfer",
-      "function": "issueLpToken",
-      "initiallyPaidFee": "1214335000000000",
-      "fee": "1214335000000000",
-      "chainID": "D",
-      "version": 2,
-      "options": 0
-    }
-  },
-  "error": "",
-  "code": "successful"
-}
-      "#;
-
-        let tx_on_network: TransactionOnNetwork = serde_json::from_str::<TransactionInfo>(data)
-            .unwrap()
-            .data
-            .unwrap()
-            .transaction;
-        let tx_response = TxResponse::from_network_tx(tx_on_network);
-
-        let expected: Option<String> = Some("EGLDMEX-95c6d5".to_string());
-
-        assert_eq!(tx_response.new_issued_token_identifier, expected)
-    }
-
-    #[test]
-    fn test_process_issued_token_identifier_semi_fungible() {
-        let data = r#"
-        {
-  "data": {
-    "transaction": {
-      "type": "normal",
-      "processingTypeOnSource": "SCInvoking",
-      "processingTypeOnDestination": "SCInvoking",
-      "hash": "0634b9c1db9fd6bfa065fc937d51cec37958fd5d33d0c934a0da3d27776a33ae",
-      "nonce": 65,
-      "round": 8422527,
-      "epoch": 584,
-      "value": "50000000000000000",
-      "receiver": "erd1qqqqqqqqqqqqqpgq06w7lq7relxyh2h6xzh98q8x24psf3fqssvqn4ptek",
-      "sender": "erd1x3g000ew7zzv6kyqhj9jl2wy5g6cc72qahvvxz29zv76jwq6ssvqt0d998",
-      "gasPrice": 1000000000,
-      "gasLimit": 80000000,
-      "gasUsed": 80000000,
-      "data": "aXNzdWVUb2tlbkA0NDZmNzA2NTU0NjU3Mzc0QDQ0NGY1MDQ1NTQ0NTUzNTQ=",
-      "signature": "0191848976e930996f6c62d4921e732f9b0ada8b41ca3b5b63d6bfd304fd44c2a1e8e6643479618ba4a764a36e87f53882b4f707600d5b7d476f2fdd2bac040e",
-      "sourceShard": 0,
-      "destinationShard": 0,
-      "blockNonce": 8420241,
-      "blockHash": "4d302220f6015876c95e7961b770cc67f8ab63c5f0ab69b4d6c2fb15c8bc23bd",
-      "notarizedAtSourceInMetaNonce": 8403647,
-      "NotarizedAtSourceInMetaHash": "f8b83b6d38fa45dacc167b15c93dd07ee5c40db906de34f26e11e7a24f539e30",
-      "notarizedAtDestinationInMetaNonce": 8403647,
-      "notarizedAtDestinationInMetaHash": "f8b83b6d38fa45dacc167b15c93dd07ee5c40db906de34f26e11e7a24f539e30",
-      "miniblockType": "TxBlock",
-      "miniblockHash": "b7b8fc9f3b81d7daae1113cbf73457e16ee31f3a864ef3729a1a21f3a929e112",
-      "hyperblockNonce": 8403647,
-      "hyperblockHash": "f8b83b6d38fa45dacc167b15c93dd07ee5c40db906de34f26e11e7a24f539e30",
-      "timestamp": 1646652762,
-      "smartContractResults": [
-        {
-          "hash": "9aecf3bd5dd5c706a28d1cc7059ac20db74340f136816f667dbefcc58daa3aba",
-          "nonce": 0,
-          "value": 50000000000000000,
-          "receiver": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
-          "sender": "erd1qqqqqqqqqqqqqpgq06w7lq7relxyh2h6xzh98q8x24psf3fqssvqn4ptek",
-          "data": "issueSemiFungible@446f706554657374@444f504554455354@63616e467265657a65@74727565@63616e57697065@74727565@63616e5061757365@74727565@63616e4368616e67654f776e6572@74727565@63616e55706772616465@74727565@63616e4164645370656369616c526f6c6573@74727565@5ca148",
-          "prevTxHash": "0634b9c1db9fd6bfa065fc937d51cec37958fd5d33d0c934a0da3d27776a33ae",
-          "originalTxHash": "0634b9c1db9fd6bfa065fc937d51cec37958fd5d33d0c934a0da3d27776a33ae",
-          "gasLimit": 75958360,
-          "gasPrice": 1000000000,
-          "callType": 1,
-          "originalSender": "erd1x3g000ew7zzv6kyqhj9jl2wy5g6cc72qahvvxz29zv76jwq6ssvqt0d998",
-          "operation": "transfer",
-          "function": "issueSemiFungible"
-        },
-        {
-          "hash": "aacfe9088bb9d2d5b3fbe9cab2b2f1c6a7e9cbab2f1a41020e2c819fc9b43570",
-          "nonce": 66,
-          "value": 0,
-          "receiver": "erd1x3g000ew7zzv6kyqhj9jl2wy5g6cc72qahvvxz29zv76jwq6ssvqt0d998",
-          "sender": "erd1qqqqqqqqqqqqqpgq06w7lq7relxyh2h6xzh98q8x24psf3fqssvqn4ptek",
-          "data": "@6f6b",
-          "prevTxHash": "0634b9c1db9fd6bfa065fc937d51cec37958fd5d33d0c934a0da3d27776a33ae",
-          "originalTxHash": "0634b9c1db9fd6bfa065fc937d51cec37958fd5d33d0c934a0da3d27776a33ae",
-          "gasLimit": 0,
-          "gasPrice": 1000000000,
-          "callType": 0,
-          "operation": "transfer"
-        },
-        {
-          "hash": "3f6f0f3de9e942884e7e1592823a7db7ce935a3f9d3359d8c1ee98a5645332d8",
-          "nonce": 0,
-          "value": 0,
-          "receiver": "erd1qqqqqqqqqqqqqpgq06w7lq7relxyh2h6xzh98q8x24psf3fqssvqn4ptek",
-          "sender": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
-          "data": "@00@444f5045544553542d373732303063",
-          "prevTxHash": "9aecf3bd5dd5c706a28d1cc7059ac20db74340f136816f667dbefcc58daa3aba",
-          "originalTxHash": "0634b9c1db9fd6bfa065fc937d51cec37958fd5d33d0c934a0da3d27776a33ae",
-          "gasLimit": 25958360,
-          "gasPrice": 1000000000,
-          "callType": 2,
-          "originalSender": "erd1qqqqqqqqqqqqqpgq06w7lq7relxyh2h6xzh98q8x24psf3fqssvqn4ptek",
-          "logs": {
-            "address": "erd1qqqqqqqqqqqqqpgq06w7lq7relxyh2h6xzh98q8x24psf3fqssvqn4ptek",
-            "events": [
-              {
-                "address": "erd1qqqqqqqqqqqqqpgq06w7lq7relxyh2h6xzh98q8x24psf3fqssvqn4ptek",
-                "identifier": "completedTxEvent",
-                "topics": [
-                  "muzzvV3VxwaijRzHBZrCDbdDQPE2gW9mfb78xY2qOro="
-                ],
-                "data": null
-              }
-            ]
-          },
-          "operation": "transfer"
-        },
-        {
-          "hash": "c6e4f7c5da455009fb4f6967ce8a273a97b826aa617fa798ffd0cf17bde6b97a",
-          "nonce": 1,
-          "value": 225516180000000,
-          "receiver": "erd1qqqqqqqqqqqqqpgq06w7lq7relxyh2h6xzh98q8x24psf3fqssvqn4ptek",
-          "sender": "erd1qqqqqqqqqqqqqpgq06w7lq7relxyh2h6xzh98q8x24psf3fqssvqn4ptek",
-          "data": "@6f6b",
-          "prevTxHash": "3f6f0f3de9e942884e7e1592823a7db7ce935a3f9d3359d8c1ee98a5645332d8",
-          "originalTxHash": "0634b9c1db9fd6bfa065fc937d51cec37958fd5d33d0c934a0da3d27776a33ae",
-          "gasLimit": 0,
-          "gasPrice": 1000000000,
-          "callType": 0,
-          "operation": "transfer",
-          "isRefund": true
-        }
-      ],
-      "logs": {
-        "address": "erd1qqqqqqqqqqqqqpgq06w7lq7relxyh2h6xzh98q8x24psf3fqssvqn4ptek",
-        "events": [
-          {
-            "address": "erd1qqqqqqqqqqqqqpgq06w7lq7relxyh2h6xzh98q8x24psf3fqssvqn4ptek",
-            "identifier": "transferValueOnly",
-            "topics": [
-              "AAAAAAAAAAAFAH6d74PDz8xLqvowrlOA5lVDBMUghBg=",
-              "AAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAC//8=",
-              "saK8LsUAAA=="
-            ],
-            "data": null
-          },
-          {
-            "address": "erd1qqqqqqqqqqqqqpgq06w7lq7relxyh2h6xzh98q8x24psf3fqssvqn4ptek",
-            "identifier": "writeLog",
-            "topics": [
-              "NFD3vy7whM1YgLyLL6nEojWMeUDt2MMJRRM9qTgahBg="
-            ],
-            "data": "QDZmNmI="
-          }
-        ]
-      },
-      "status": "success",
-      "operation": "transfer",
-      "function": "issueToken",
-      "initiallyPaidFee": "914840000000000",
-      "fee": "914840000000000",
-      "chainID": "1",
-      "version": 1,
-      "options": 0
-    }
-  },
-  "error": "",
-  "code": "successful"
-}
-        "#;
-
-        let tx_on_network: TransactionOnNetwork = serde_json::from_str::<TransactionInfo>(data)
-            .unwrap()
-            .data
-            .unwrap()
-            .transaction;
-        let tx_response = TxResponse::from_network_tx(tx_on_network);
-
-        let expected: Option<String> = Some("DOPETEST-77200c".to_string());
-
-        assert_eq!(tx_response.new_issued_token_identifier, expected)
-    }
-
-    #[test]
-    fn test_process_issued_token_identifier_non_fungible() {
-        let data = r#"
-        {
-  "data": {
-    "transaction": {
-      "type": "normal",
-      "processingTypeOnSource": "SCInvoking",
-      "processingTypeOnDestination": "SCInvoking",
-      "hash": "d296186b432d7e7937bde37d725cd52b765ef334c00b95adcb079933bc2277bb",
-      "nonce": 16,
-      "round": 820170,
-      "epoch": 341,
-      "value": "50000000000000000",
-      "receiver": "erd1qqqqqqqqqqqqqpgqmegl4z2rcfhxjv6pn7dm0n4hndllfaam4fdqwqxld8",
-      "sender": "erd162knt53z7m0f9jjms9wxphr3q9d7zu4ky85xs2cc0ekrqz7k4fdq85lkuc",
-      "gasPrice": 1000000000,
-      "gasLimit": 200000000,
-      "gasUsed": 200000000,
-      "data": "aXNzdWVUb2tlbkA2NzY1NmU2NTdhNzk3M0A0NzQ1NGU=",
-      "signature": "e80d45f4de419799a2bbff1cae1235521c8eef1853ee45b02f95c2da74ce50d241bf75b6ab0c650245562700862ea9759caad40f3e381ac0c4d82cfe56e67c09",
-      "sourceShard": 2,
-      "destinationShard": 2,
-      "blockNonce": 819313,
-      "blockHash": "a1db4ef13f07b86678000df9cc78f244d83dcc35ae51de545f333bf616930d39",
-      "notarizedAtSourceInMetaNonce": 819396,
-      "NotarizedAtSourceInMetaHash": "6d9e511e46d318aa5b77cbfdfde14d2ce8515ce4e954b286f130a6b518ddf26a",
-      "notarizedAtDestinationInMetaNonce": 819396,
-      "notarizedAtDestinationInMetaHash": "6d9e511e46d318aa5b77cbfdfde14d2ce8515ce4e954b286f130a6b518ddf26a",
-      "miniblockType": "TxBlock",
-      "miniblockHash": "afdb278522181aeb9b12f08840e6c534e398e6af9c7f757548308e300e7ec4e9",
-      "hyperblockNonce": 819396,
-      "hyperblockHash": "6d9e511e46d318aa5b77cbfdfde14d2ce8515ce4e954b286f130a6b518ddf26a",
-      "timestamp": 1698921020,
-      "smartContractResults": [
-        {
-          "hash": "6fe0cc002802af1744f394eee4a69224b5e775961d8386e04e7a5b9242f7ff65",
-          "nonce": 0,
-          "value": 50000000000000000,
-          "receiver": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
-          "sender": "erd1qqqqqqqqqqqqqpgqmegl4z2rcfhxjv6pn7dm0n4hndllfaam4fdqwqxld8",
-          "data": "issueNonFungible@67656e657a7973@47454e@63616e467265657a65@74727565@63616e57697065@74727565@63616e5061757365@74727565@63616e5472616e736665724e4654437265617465526f6c65@74727565@63616e4368616e67654f776e6572@66616c7365@63616e55706772616465@66616c7365@63616e4164645370656369616c526f6c6573@74727565@5e30e4",
-          "prevTxHash": "d296186b432d7e7937bde37d725cd52b765ef334c00b95adcb079933bc2277bb",
-          "originalTxHash": "d296186b432d7e7937bde37d725cd52b765ef334c00b95adcb079933bc2277bb",
-          "gasLimit": 196098365,
-          "gasPrice": 1000000000,
-          "callType": 1,
-          "originalSender": "erd162knt53z7m0f9jjms9wxphr3q9d7zu4ky85xs2cc0ekrqz7k4fdq85lkuc",
-          "operation": "transfer",
-          "function": "issueNonFungible"
-        },
-        {
-          "hash": "98afe82512c79f1caaf171bd5919ee469d11ba0c4f725aefcab834278c0f1e58",
-          "nonce": 0,
-          "value": 0,
-          "receiver": "erd1lllllllllllllllllllllllllllllllllllllllllllllllllupq9x7ny0",
-          "sender": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
-          "data": "ESDTSetBurnRoleForAll@47454e2d383638353933",
-          "prevTxHash": "6fe0cc002802af1744f394eee4a69224b5e775961d8386e04e7a5b9242f7ff65",
-          "originalTxHash": "d296186b432d7e7937bde37d725cd52b765ef334c00b95adcb079933bc2277bb",
-          "gasLimit": 0,
-          "gasPrice": 1000000000,
-          "callType": 0,
-          "logs": {
-            "address": "erd1lllllllllllllllllllllllllllllllllllllllllllllllllupq9x7ny0",
-            "events": [
-              {
-                "address": "erd1lllllllllllllllllllllllllllllllllllllllllllllllllupq9x7ny0",
-                "identifier": "completedTxEvent",
-                "topics": [
-                  "b+DMACgCrxdE85Tu5KaSJLXndZYdg4bgTnpbkkL3/2U="
-                ],
-                "data": null,
-                "additionalData": null
-              }
-            ]
-          },
-          "operation": "transfer"
-        },
-        {
-          "hash": "83494ad9369738b574a7266cbfb12ce63ccf634950cd6b0ec16107b8fb42f8f6",
-          "nonce": 0,
-          "value": 0,
-          "receiver": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
-          "sender": "erd1qqqqqqqqqqqqqpgqmegl4z2rcfhxjv6pn7dm0n4hndllfaam4fdqwqxld8",
-          "data": "setSpecialRole@47454e2d383638353933@00000000000000000500de51fa8943c26e6933419f9bb7ceb79b7ff4f7bbaa5a@45534454526f6c654e4654437265617465@5e30e4",
-          "prevTxHash": "112d18ec0364b4700b1bfb3df517c80dba547a53373ece2a9e71acd5266e7b64",
-          "originalTxHash": "d296186b432d7e7937bde37d725cd52b765ef334c00b95adcb079933bc2277bb",
-          "gasLimit": 142399698,
-          "gasPrice": 1000000000,
-          "callType": 1,
-          "operation": "transfer",
-          "function": "setSpecialRole"
-        },
-        {
-          "hash": "112d18ec0364b4700b1bfb3df517c80dba547a53373ece2a9e71acd5266e7b64",
-          "nonce": 0,
-          "value": 0,
-          "receiver": "erd1qqqqqqqqqqqqqpgqmegl4z2rcfhxjv6pn7dm0n4hndllfaam4fdqwqxld8",
-          "sender": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
-          "data": "@00@47454e2d383638353933",
-          "prevTxHash": "6fe0cc002802af1744f394eee4a69224b5e775961d8386e04e7a5b9242f7ff65",
-          "originalTxHash": "d296186b432d7e7937bde37d725cd52b765ef334c00b95adcb079933bc2277bb",
-          "gasLimit": 146098365,
-          "gasPrice": 1000000000,
-          "callType": 2,
-          "originalSender": "erd1qqqqqqqqqqqqqpgqmegl4z2rcfhxjv6pn7dm0n4hndllfaam4fdqwqxld8",
-          "logs": {
-            "address": "erd1qqqqqqqqqqqqqpgqmegl4z2rcfhxjv6pn7dm0n4hndllfaam4fdqwqxld8",
-            "events": [
-              {
-                "address": "erd1qqqqqqqqqqqqqpgqmegl4z2rcfhxjv6pn7dm0n4hndllfaam4fdqwqxld8",
-                "identifier": "writeLog",
-                "topics": [
-                  "AAAAAAAAAAAFAN5R+olDwm5pM0Gfm7fOt5t/9Pe7qlo="
-                ],
-                "data": "QDZmNmI=",
-                "additionalData": null
-              }
-            ]
-          },
-          "operation": "transfer"
-        },
-        {
-          "hash": "db5d74970374337956fa61fb4fd90057b3f6a82ea3e259b389934b71a1652e5f",
-          "nonce": 0,
-          "value": 0,
-          "receiver": "erd1qqqqqqqqqqqqqpgqmegl4z2rcfhxjv6pn7dm0n4hndllfaam4fdqwqxld8",
-          "sender": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
-          "data": "ESDTSetRole@47454e2d383638353933@45534454526f6c654e4654437265617465",
-          "prevTxHash": "83494ad9369738b574a7266cbfb12ce63ccf634950cd6b0ec16107b8fb42f8f6",
-          "originalTxHash": "d296186b432d7e7937bde37d725cd52b765ef334c00b95adcb079933bc2277bb",
-          "gasLimit": 0,
-          "gasPrice": 1000000000,
-          "callType": 0,
-          "logs": {
-            "address": "erd1qqqqqqqqqqqqqpgqmegl4z2rcfhxjv6pn7dm0n4hndllfaam4fdqwqxld8",
-            "events": [
-              {
-                "address": "erd1qqqqqqqqqqqqqpgqmegl4z2rcfhxjv6pn7dm0n4hndllfaam4fdqwqxld8",
-                "identifier": "ESDTSetRole",
-                "topics": [
-                  "R0VOLTg2ODU5Mw==",
-                  "",
-                  "",
-                  "RVNEVFJvbGVORlRDcmVhdGU="
-                ],
-                "data": null,
-                "additionalData": null
-              },
-              {
-                "address": "erd1qqqqqqqqqqqqqpgqmegl4z2rcfhxjv6pn7dm0n4hndllfaam4fdqwqxld8",
-                "identifier": "completedTxEvent",
-                "topics": [
-                  "g0lK2TaXOLV0pyZsv7Es5jzPY0lQzWsOwWEHuPtC+PY="
-                ],
-                "data": null,
-                "additionalData": null
-              }
-            ]
-          },
-          "operation": "ESDTSetRole",
-          "function": "ESDTSetRole"
-        },
-        {
-          "hash": "a6a665f47977a59c4c2baf460281fc938e04ae0f87ac2e78040a14ae27822701",
-          "nonce": 0,
-          "value": 0,
-          "receiver": "erd1qqqqqqqqqqqqqpgqmegl4z2rcfhxjv6pn7dm0n4hndllfaam4fdqwqxld8",
-          "sender": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
-          "data": "@00",
-          "prevTxHash": "83494ad9369738b574a7266cbfb12ce63ccf634950cd6b0ec16107b8fb42f8f6",
-          "originalTxHash": "d296186b432d7e7937bde37d725cd52b765ef334c00b95adcb079933bc2277bb",
-          "gasLimit": 92399698,
-          "gasPrice": 1000000000,
-          "callType": 2,
-          "originalSender": "erd1qqqqqqqqqqqqqpgqmegl4z2rcfhxjv6pn7dm0n4hndllfaam4fdqwqxld8",
-          "logs": {
-            "address": "erd1qqqqqqqqqqqqqpgqmegl4z2rcfhxjv6pn7dm0n4hndllfaam4fdqwqxld8",
-            "events": [
-              {
-                "address": "erd1qqqqqqqqqqqqqpgqmegl4z2rcfhxjv6pn7dm0n4hndllfaam4fdqwqxld8",
-                "identifier": "writeLog",
-                "topics": [
-                  "AAAAAAAAAAAFAN5R+olDwm5pM0Gfm7fOt5t/9Pe7qlo=",
-                  "QHRvbyBtdWNoIGdhcyBwcm92aWRlZCBmb3IgcHJvY2Vzc2luZzogZ2FzIHByb3ZpZGVkID0gOTIzOTk2OTgsIGdhcyB1c2VkID0gMzE0MTg4MA=="
-                ],
-                "data": "QDZmNmI=",
-                "additionalData": null
-              },
-              {
-                "address": "erd1qqqqqqqqqqqqqpgqmegl4z2rcfhxjv6pn7dm0n4hndllfaam4fdqwqxld8",
-                "identifier": "completedTxEvent",
-                "topics": [
-                  "g0lK2TaXOLV0pyZsv7Es5jzPY0lQzWsOwWEHuPtC+PY="
-                ],
-                "data": null,
-                "additionalData": null
-              }
-            ]
-          },
-          "operation": "transfer"
-        }
-      ],
-      "logs": {
-        "address": "erd1qqqqqqqqqqqqqpgqmegl4z2rcfhxjv6pn7dm0n4hndllfaam4fdqwqxld8",
-        "events": [
-          {
-            "address": "erd1qqqqqqqqqqqqqpgqmegl4z2rcfhxjv6pn7dm0n4hndllfaam4fdqwqxld8",
-            "identifier": "transferValueOnly",
-            "topics": [
-              "AAAAAAAAAAAFAN5R+olDwm5pM0Gfm7fOt5t/9Pe7qlo=",
-              "AAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAC//8=",
-              "saK8LsUAAA=="
-            ],
-            "data": null,
-            "additionalData": null
-          },
-          {
-            "address": "erd1qqqqqqqqqqqqqpgqmegl4z2rcfhxjv6pn7dm0n4hndllfaam4fdqwqxld8",
-            "identifier": "writeLog",
-            "topics": [
-              "0q010iL23pLKW4FcYNxxAVvhcrYh6GgrGH5sMAvWqlo="
-            ],
-            "data": "QDZmNmI=",
-            "additionalData": null
-          }
-        ]
-      },
-      "status": "success",
-      "operation": "transfer",
-      "function": "issueToken",
-      "initiallyPaidFee": "2097020000000000",
-      "fee": "2097020000000000",
-      "chainID": "D",
-      "version": 1,
-      "options": 0
-    }
-  },
-  "error": "",
-  "code": "successful"
-}
-        "#;
-
-        let tx_on_network: TransactionOnNetwork = serde_json::from_str::<TransactionInfo>(data)
-            .unwrap()
-            .data
-            .unwrap()
-            .transaction;
-        let tx_response = TxResponse::from_network_tx(tx_on_network);
-
-        let expected: Option<String> = Some("GEN-868593".to_string());
-
-        assert_eq!(tx_response.new_issued_token_identifier, expected)
-    }
-
-    #[test]
-    fn test_process_issued_token_identifier_meta_esdt() {
-        let data = r#"
-        {
-  "data": {
-    "transaction": {
-      "type": "normal",
-      "processingTypeOnSource": "SCInvoking",
-      "processingTypeOnDestination": "SCInvoking",
-      "hash": "408433c5db749f4666bee6a8b599944071bf493c43ff5f01282a74c22ea2ea43",
-      "nonce": 419,
-      "round": 1787093,
-      "epoch": 744,
-      "value": "50000000000000000",
-      "receiver": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
-      "sender": "erd1j6kua7p67qnaw3y4sudmk25xsuv4k8ws6pwvax8fd2vtmuc3q33s840l87",
-      "gasPrice": 1000000000,
-      "gasLimit": 600000000,
-      "gasUsed": 157220928,
-      "data": "ZGVwbG95QXNoc3dhcExQQUNTdHJhdGVneUA0MTRjNTAyZDYzNjE2NTYxNjMzNUA0MTU0NTMyZDM0NjMzMDM5MzIzMEAwM2U4QDAzZThAQDNiOWFjYTAwQDAwMDAwMDAwMDAwMDAwMDAwNTAwOTU3MzkwYWVkYTQzMmY1MmE0MTFkNTE5NzRmZTkzZDQwZDI3NzMzZTA0NjNAMDAwMDAwMDAwMDAwMDAwMDA1MDBkMTJjYzczY2JkYTZmMjY1OWM5NTllNWQ1NzU4YWY5MmNhMTM4NDg2NTIzM0AwMDAwMDAwMDAwMDAwMDAwMDUwMDUxZGY3MTc1OGNmMmFjYTViNDZkZWQ4MTU1OGI1NTE1ZGMyOWYzZjM1MjMzQEAwMDAwMDAwMDAwMDAwMDAwMDUwMDdlNGExZGZjNDM3Y2VkNDlkYjlmMTYzNzk4NDE2Yjg0YWMyMWQ0Yzk3Y2ViMDAwMDAwMGM1NzQ1NDc0YzQ0MmQ2MTMyMzg2MzM1MzkwMDAwMDAwMDAwMDAwMDAwMDUwMGE4YmE5ZTY4NjI2YmJjOTkzZmQ3OTVlOGJiNmY0Nzk0M2IyZjVmZmE3Y2ViMDAwMDAwMGE1NTU0NGIyZDMxMzQ2NDM1Mzc2NEAwMDAwMDAwMTAwMDAwMDAwMDAwMDAwMDAwNTAwNTFkZjcxNzU4Y2YyYWNhNWI0NmRlZDgxNTU4YjU1MTVkYzI5ZjNmMzUyMzMwMDAwMDAwYjQyNTU1MzQ0MmQ2NDM0NjMzMDMxMzQwMDAwMDAwMDAwQDAxODZhMEAyNzEw",
-      "signature": "4648af0b96eb430e4986b9fb760549742de09c809b46b984e5d995c898d80c25bfc0717c30da34bd89cd3005d98ee895afa39ee588b7b74b4807c63cbeade807",
-      "sourceShard": 1,
-      "destinationShard": 1,
-      "blockNonce": 1785520,
-      "blockHash": "8f926a5d79fa84bc69949a21bfbba17447091a8a074ac172fa0b88e4475a1214",
-      "notarizedAtSourceInMetaNonce": 1785568,
-      "NotarizedAtSourceInMetaHash": "eebd1aa5c3dde083f9c367242c054affedd36bfc95f7bcc1d4e2d90beb5754e9",
-      "notarizedAtDestinationInMetaNonce": 1785568,
-      "notarizedAtDestinationInMetaHash": "eebd1aa5c3dde083f9c367242c054affedd36bfc95f7bcc1d4e2d90beb5754e9",
-      "miniblockType": "TxBlock",
-      "miniblockHash": "b85d82db6d69cbc1911b3455d2837eeb3170b391926efa2eacb4d9c8e3c96ee4",
-      "hyperblockNonce": 1785568,
-      "hyperblockHash": "eebd1aa5c3dde083f9c367242c054affedd36bfc95f7bcc1d4e2d90beb5754e9",
-      "timestamp": 1704722558,
-      "smartContractResults": [
-        {
-          "hash": "ea9a96c079e66249e6b73c0341991dad96ca81f855f2fc4abe0d432be117a882",
-          "nonce": 420,
-          "value": 4427790720000000,
-          "receiver": "erd1j6kua7p67qnaw3y4sudmk25xsuv4k8ws6pwvax8fd2vtmuc3q33s840l87",
-          "sender": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
-          "data": "@6f6b",
-          "prevTxHash": "408433c5db749f4666bee6a8b599944071bf493c43ff5f01282a74c22ea2ea43",
-          "originalTxHash": "408433c5db749f4666bee6a8b599944071bf493c43ff5f01282a74c22ea2ea43",
-          "gasLimit": 0,
-          "gasPrice": 1000000000,
-          "callType": 0,
-          "operation": "transfer",
-          "isRefund": true
-        },
-        {
-          "hash": "6082975132a2c9d8197dfd0f9852b454ad344740eebdbdf93f620b2796ab723b",
-          "nonce": 0,
-          "value": 50000000000000000,
-          "receiver": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
-          "sender": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
-          "data": "registerMetaESDT@415453417368537761704c5041435661756c74@4156415348@12@63616e467265657a65@66616c7365@63616e57697065@66616c7365@63616e5061757365@66616c7365@63616e5472616e736665724e4654437265617465526f6c65@66616c7365@63616e4368616e67654f776e6572@66616c7365@63616e55706772616465@66616c7365@63616e4164645370656369616c526f6c6573@74727565@9eb30a87c92674ab1469700c0b385b3850e86de80f87dec6cf3213c7e379a646@408433c5db749f4666bee6a8b599944071bf493c43ff5f01282a74c22ea2ea43@03eb4a30",
-          "prevTxHash": "408433c5db749f4666bee6a8b599944071bf493c43ff5f01282a74c22ea2ea43",
-          "originalTxHash": "408433c5db749f4666bee6a8b599944071bf493c43ff5f01282a74c22ea2ea43",
-          "gasLimit": 125751600,
-          "gasPrice": 1000000000,
-          "callType": 1,
-          "originalSender": "erd1j6kua7p67qnaw3y4sudmk25xsuv4k8ws6pwvax8fd2vtmuc3q33s840l87",
-          "operation": "transfer",
-          "function": "registerMetaESDT"
-        },
-        {
-          "hash": "290f85d7ec2f7d5797510290358e9e0f76bb880451efaacb0d69280b8d94c67a",
-          "nonce": 0,
-          "value": 0,
-          "receiver": "erd1llllllllllllllllllllllllllllllllllllllllllllllllluqsl6e366",
-          "sender": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
-          "data": "ESDTSetBurnRoleForAll@41564153482d376438623564",
-          "prevTxHash": "6082975132a2c9d8197dfd0f9852b454ad344740eebdbdf93f620b2796ab723b",
-          "originalTxHash": "408433c5db749f4666bee6a8b599944071bf493c43ff5f01282a74c22ea2ea43",
-          "gasLimit": 0,
-          "gasPrice": 1000000000,
-          "callType": 0,
-          "originalSender": "erd1j6kua7p67qnaw3y4sudmk25xsuv4k8ws6pwvax8fd2vtmuc3q33s840l87",
-          "logs": {
-            "address": "erd1llllllllllllllllllllllllllllllllllllllllllllllllluqsl6e366",
-            "events": [
-              {
-                "address": "erd1llllllllllllllllllllllllllllllllllllllllllllllllluqsl6e366",
-                "identifier": "completedTxEvent",
-                "topics": [
-                  "YIKXUTKiydgZff0PmFK0VK00R0Duvb35P2ILJ5arcjs="
-                ],
-                "data": null,
-                "additionalData": null
-              }
-            ]
-          },
-          "operation": "transfer"
-        },
-        {
-          "hash": "1aa62a6251edd216bd4e5ae59f7e676d5d2f88597685e0ec0e25ac4434bfccdb",
-          "nonce": 0,
-          "value": 0,
-          "receiver": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
-          "sender": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
-          "data": "@00@41564153482d376438623564@d0644194444642fd16ee156307f6fda0e8f8baf4c496e1a1dc85e027ecc08a4a@9eb30a87c92674ab1469700c0b385b3850e86de80f87dec6cf3213c7e379a646@408433c5db749f4666bee6a8b599944071bf493c43ff5f01282a74c22ea2ea43@00",
-          "prevTxHash": "6082975132a2c9d8197dfd0f9852b454ad344740eebdbdf93f620b2796ab723b",
-          "originalTxHash": "408433c5db749f4666bee6a8b599944071bf493c43ff5f01282a74c22ea2ea43",
-          "gasLimit": 75751600,
-          "gasPrice": 1000000000,
-          "callType": 2,
-          "originalSender": "erd1j6kua7p67qnaw3y4sudmk25xsuv4k8ws6pwvax8fd2vtmuc3q33s840l87",
-          "logs": {
-            "address": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
-            "events": [
-              {
-                "address": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
-                "identifier": "writeLog",
-                "topics": [
-                  "AAAAAAAAAAAFAH6UefeHERqHcLpMz2gC3xXGhFsJBGM=",
-                  "QHRvbyBtdWNoIGdhcyBwcm92aWRlZCBmb3IgcHJvY2Vzc2luZzogZ2FzIHByb3ZpZGVkID0gNzU3NTE2MDAsIGdhcyB1c2VkID0gNDE3NjA1OQ=="
-                ],
-                "data": "QDZmNmI=",
-                "additionalData": [
-                  "QDZmNmI="
-                ]
-              },
-              {
-                "address": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
-                "identifier": "completedTxEvent",
-                "topics": [
-                  "YIKXUTKiydgZff0PmFK0VK00R0Duvb35P2ILJ5arcjs="
-                ],
-                "data": null,
-                "additionalData": null
-              }
-            ]
-          },
-          "operation": "transfer"
-        }
-      ],
-      "logs": {
-        "address": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
-        "events": [
-          {
-            "address": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
-            "identifier": "transferValueOnly",
-            "topics": [
-              "",
-              "AAAAAAAAAAAFANAMwOY4h/9reS00I0pE56xrV11LBGM="
-            ],
-            "data": "RGVwbG95RnJvbVNvdXJjZQ==",
-            "additionalData": [
-              "RGVwbG95RnJvbVNvdXJjZQ==",
-              "aW5pdA==",
-              "QUxQLWNhZWFjNQ==",
-              "QVRTLTRjMDkyMA==",
-              "A+g=",
-              "A+g=",
-              "",
-              "O5rKAA=="
-            ]
-          },
-          {
-            "address": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
-            "identifier": "transferValueOnly",
-            "topics": [
-              "",
-              "AAAAAAAAAAAFADJ0SE0vUW6bO5SurLeFIMfK/HtBBGM="
-            ],
-            "data": "RGVwbG95RnJvbVNvdXJjZQ==",
-            "additionalData": [
-              "RGVwbG95RnJvbVNvdXJjZQ==",
-              "aW5pdA==",
-              "AAAAAAAAAAAFANAMwOY4h/9reS00I0pE56xrV11LBGM=",
-              "AAAAAAAAAAAFAJVzkK7aQy9SpBHVGXT+k9QNJ3M+BGM=",
-              "AAAAAAAAAAAFANEsxzy9pvJlnJWeXVdYr5LKE4SGUjM=",
-              "AAAAAAAAAAAFAFHfcXWM8qyltG3tgVWLVRXcKfPzUjM=",
-              "",
-              "AAAAAAAAAAAFAH5KHfxDfO1J258WN5hBa4SsIdTJfOsAAAAMV0VHTEQtYTI4YzU5AAAAAAAAAAAFAKi6nmhia7yZP9eV6LtvR5Q7L1/6fOsAAAAKVVRLLTE0ZDU3ZA==",
-              "AAAAAQAAAAAAAAAABQBR33F1jPKspbRt7YFVi1UV3Cnz81IzAAAAC0JVU0QtZDRjMDE0AAAAAAA=",
-              "AYag",
-              "JxA="
-            ]
-          },
-          {
-            "address": "erd1qqqqqqqqqqqqqpgqxf6ysnf029hfkwu546kt0pfqcl90c76pq33s0a320f",
-            "identifier": "transferValueOnly",
-            "topics": [
-              "",
-              "AAAAAAAAAAAFANEsxzy9pvJlnJWeXVdYr5LKE4SGUjM="
-            ],
-            "data": "RXhlY3V0ZU9uRGVzdENvbnRleHQ=",
-            "additionalData": [
-              "RXhlY3V0ZU9uRGVzdENvbnRleHQ=",
-              "Z2V0RmFybWluZ1Rva2VuSWQ="
-            ]
-          },
-          {
-            "address": "erd1qqqqqqqqqqqqqpgqxf6ysnf029hfkwu546kt0pfqcl90c76pq33s0a320f",
-            "identifier": "transferValueOnly",
-            "topics": [
-              "",
-              "AAAAAAAAAAAFANEsxzy9pvJlnJWeXVdYr5LKE4SGUjM="
-            ],
-            "data": "RXhlY3V0ZU9uRGVzdENvbnRleHQ=",
-            "additionalData": [
-              "RXhlY3V0ZU9uRGVzdENvbnRleHQ=",
-              "Z2V0RmFybVRva2VuSWQ="
-            ]
-          },
-          {
-            "address": "erd1qqqqqqqqqqqqqpgqxf6ysnf029hfkwu546kt0pfqcl90c76pq33s0a320f",
-            "identifier": "transferValueOnly",
-            "topics": [
-              "",
-              "AAAAAAAAAAAFANEsxzy9pvJlnJWeXVdYr5LKE4SGUjM="
-            ],
-            "data": "RXhlY3V0ZU9uRGVzdENvbnRleHQ=",
-            "additionalData": [
-              "RXhlY3V0ZU9uRGVzdENvbnRleHQ=",
-              "Z2V0UmV3YXJkVG9rZW5JZA=="
-            ]
-          },
-          {
-            "address": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
-            "identifier": "transferValueOnly",
-            "topics": [
-              "saK8LsUAAA==",
-              "AAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAC//8="
-            ],
-            "data": "QXN5bmNDYWxs",
-            "additionalData": [
-              "QXN5bmNDYWxs",
-              "cmVnaXN0ZXJNZXRhRVNEVA==",
-              "QVRTQXNoU3dhcExQQUNWYXVsdA==",
-              "QVZBU0g=",
-              "Eg==",
-              "Y2FuRnJlZXpl",
-              "ZmFsc2U=",
-              "Y2FuV2lwZQ==",
-              "ZmFsc2U=",
-              "Y2FuUGF1c2U=",
-              "ZmFsc2U=",
-              "Y2FuVHJhbnNmZXJORlRDcmVhdGVSb2xl",
-              "ZmFsc2U=",
-              "Y2FuQ2hhbmdlT3duZXI=",
-              "ZmFsc2U=",
-              "Y2FuVXBncmFkZQ==",
-              "ZmFsc2U=",
-              "Y2FuQWRkU3BlY2lhbFJvbGVz",
-              "dHJ1ZQ=="
-            ]
-          },
-          {
-            "address": "erd1qqqqqqqqqqqqqpgqxf6ysnf029hfkwu546kt0pfqcl90c76pq33s0a320f",
-            "identifier": "SCDeploy",
-            "topics": [
-              "AAAAAAAAAAAFADJ0SE0vUW6bO5SurLeFIMfK/HtBBGM=",
-              "AAAAAAAAAAAFAH6UefeHERqHcLpMz2gC3xXGhFsJBGM=",
-              "fvRqbue54Womde/CN2IkRGkrx8tsU+xkLvi3+uwMkhY="
-            ],
-            "data": null,
-            "additionalData": null
-          },
-          {
-            "address": "erd1qqqqqqqqqqqqqpgq6qxvpe3csllkk7fdxs3553884344wh2tq33sakulat",
-            "identifier": "SCDeploy",
-            "topics": [
-              "AAAAAAAAAAAFANAMwOY4h/9reS00I0pE56xrV11LBGM=",
-              "AAAAAAAAAAAFAH6UefeHERqHcLpMz2gC3xXGhFsJBGM=",
-              "E3blQfRJfCKLWDr06Od703DSZenIzq8KND+xUjmGY/M="
-            ],
-            "data": null,
-            "additionalData": null
-          }
-        ]
-      },
-      "status": "success",
-      "operation": "transfer",
-      "function": "deployAshswapLPACStrategy",
-      "initiallyPaidFee": "6936045000000000",
-      "fee": "2508254280000000",
-      "chainID": "D",
-      "version": 1,
-      "options": 0
-    }
-  },
-  "error": "",
-  "code": "successful"
-}
-        "#;
-
-        let tx_on_network: TransactionOnNetwork = serde_json::from_str::<TransactionInfo>(data)
-            .unwrap()
-            .data
-            .unwrap()
-            .transaction;
-        let tx_response = TxResponse::from_network_tx(tx_on_network);
-
-        let expected: Option<String> = Some("AVASH-7d8b5d".to_string());
-
-        assert_eq!(tx_response.new_issued_token_identifier, expected)
-    }
-
-    #[test]
-    fn test_set_special_roles_should_not_process_issued_token_identifier() {
-        let data = r#"
-        {
-  "data": {
-    "transaction": {
-      "type": "normal",
-      "processingTypeOnSource": "SCInvoking",
-      "processingTypeOnDestination": "SCInvoking",
-      "hash": "cbb1f866da564a04332297dfc4f637be2e50e62bbf4441bf42247ad429747ce0",
-      "nonce": 420,
-      "round": 1787109,
-      "epoch": 744,
-      "value": "0",
-      "receiver": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
-      "sender": "erd1j6kua7p67qnaw3y4sudmk25xsuv4k8ws6pwvax8fd2vtmuc3q33s840l87",
-      "gasPrice": 1000000000,
-      "gasLimit": 600000000,
-      "gasUsed": 129636807,
-      "data": "ZmluaXNoVmF1bHREZXBsb3ltZW50cw==",
-      "signature": "dca943ef1a788bfa6cb0e9aa3900b8340e4908075cbfefaa2a66688f6f0c0fed349edb2eb48eec427cd9098822fba875e4d66072fbdb44cb7f4c1a416736e20c",
-      "sourceShard": 1,
-      "destinationShard": 1,
-      "blockNonce": 1785536,
-      "blockHash": "93ca539e81612768b67a85b7135f7c104e76bec031a758a6b1782910ae49dd8f",
-      "notarizedAtSourceInMetaNonce": 1785584,
-      "NotarizedAtSourceInMetaHash": "71d17afe660282bb42de1ea3eec3e3534a179bd32aa1471c2861ce411bf30552",
-      "notarizedAtDestinationInMetaNonce": 1785584,
-      "notarizedAtDestinationInMetaHash": "71d17afe660282bb42de1ea3eec3e3534a179bd32aa1471c2861ce411bf30552",
-      "miniblockType": "TxBlock",
-      "miniblockHash": "f8c60565af746e92d2c9c09a92734e5eb8da7e42c67a86854c93b349bfe287eb",
-      "hyperblockNonce": 1785584,
-      "hyperblockHash": "71d17afe660282bb42de1ea3eec3e3534a179bd32aa1471c2861ce411bf30552",
-      "timestamp": 1704722654,
-      "smartContractResults": [
-        {
-          "hash": "c3ce9c364de3823ffae250c2bfb40aaf2b18f771ed4bd37bf788ad83a2c651f3",
-          "nonce": 421,
-          "value": 4703631930000000,
-          "receiver": "erd1j6kua7p67qnaw3y4sudmk25xsuv4k8ws6pwvax8fd2vtmuc3q33s840l87",
-          "sender": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
-          "data": "@6f6b",
-          "prevTxHash": "cbb1f866da564a04332297dfc4f637be2e50e62bbf4441bf42247ad429747ce0",
-          "originalTxHash": "cbb1f866da564a04332297dfc4f637be2e50e62bbf4441bf42247ad429747ce0",
-          "gasLimit": 0,
-          "gasPrice": 1000000000,
-          "callType": 0,
-          "operation": "transfer",
-          "isRefund": true
-        },
-        {
-          "hash": "50f9c25a1402ce6d87ae9f890659c8a67462292e471e02c74d64ff7ba1995e60",
-          "nonce": 0,
-          "value": 0,
-          "receiver": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
-          "sender": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
-          "data": "setSpecialRole@41564153482d376438623564@00000000000000000500d00cc0e63887ff6b792d34234a44e7ac6b575d4b0463@45534454526f6c654e4654437265617465@45534454526f6c654e46544164645175616e74697479@45534454526f6c654e46544275726e@0192c6db2c69f50b6968fb22ac558337a851719519cfd1e6bbf79a07bbcf18bc@cbb1f866da564a04332297dfc4f637be2e50e62bbf4441bf42247ad429747ce0@03eb4a30",
-          "prevTxHash": "cbb1f866da564a04332297dfc4f637be2e50e62bbf4441bf42247ad429747ce0",
-          "originalTxHash": "cbb1f866da564a04332297dfc4f637be2e50e62bbf4441bf42247ad429747ce0",
-          "gasLimit": 125751600,
-          "gasPrice": 1000000000,
-          "callType": 1,
-          "originalSender": "erd1j6kua7p67qnaw3y4sudmk25xsuv4k8ws6pwvax8fd2vtmuc3q33s840l87",
-          "operation": "transfer",
-          "function": "setSpecialRole"
-        },
-        {
-          "hash": "d6a5824a60b6c9050462c3f5a02ace00c36e8b4ba1958d132bd394e2ed1e7226",
-          "nonce": 0,
-          "value": 0,
-          "receiver": "erd1qqqqqqqqqqqqqpgq6qxvpe3csllkk7fdxs3553884344wh2tq33sakulat",
-          "sender": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
-          "data": "ESDTSetRole@41564153482d376438623564@45534454526f6c654e4654437265617465@45534454526f6c654e46544164645175616e74697479@45534454526f6c654e46544275726e",
-          "prevTxHash": "50f9c25a1402ce6d87ae9f890659c8a67462292e471e02c74d64ff7ba1995e60",
-          "originalTxHash": "cbb1f866da564a04332297dfc4f637be2e50e62bbf4441bf42247ad429747ce0",
-          "gasLimit": 0,
-          "gasPrice": 1000000000,
-          "callType": 0,
-          "originalSender": "erd1j6kua7p67qnaw3y4sudmk25xsuv4k8ws6pwvax8fd2vtmuc3q33s840l87",
-          "logs": {
-            "address": "erd1qqqqqqqqqqqqqpgq6qxvpe3csllkk7fdxs3553884344wh2tq33sakulat",
-            "events": [
-              {
-                "address": "erd1qqqqqqqqqqqqqpgq6qxvpe3csllkk7fdxs3553884344wh2tq33sakulat",
-                "identifier": "ESDTSetRole",
-                "topics": [
-                  "QVZBU0gtN2Q4YjVk",
-                  "",
-                  "",
-                  "RVNEVFJvbGVORlRDcmVhdGU=",
-                  "RVNEVFJvbGVORlRBZGRRdWFudGl0eQ==",
-                  "RVNEVFJvbGVORlRCdXJu"
-                ],
-                "data": null,
-                "additionalData": null
-              },
-              {
-                "address": "erd1qqqqqqqqqqqqqpgq6qxvpe3csllkk7fdxs3553884344wh2tq33sakulat",
-                "identifier": "completedTxEvent",
-                "topics": [
-                  "UPnCWhQCzm2Hrp+JBlnIpnRiKS5HHgLHTWT/e6GZXmA="
-                ],
-                "data": null,
-                "additionalData": null
-              }
-            ]
-          },
-          "operation": "ESDTSetRole",
-          "function": "ESDTSetRole"
-        },
-        {
-          "hash": "bf1b8b4b301ff548368dfd972896489d5e2a088d5cbdfa1bfe2421cc7f641f7a",
-          "nonce": 0,
-          "value": 0,
-          "receiver": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
-          "sender": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
-          "data": "@00@a68d44c751eba85db0713db8dc9c10c78749189ec0d6f1af5fc67bb656c1254b@0192c6db2c69f50b6968fb22ac558337a851719519cfd1e6bbf79a07bbcf18bc@cbb1f866da564a04332297dfc4f637be2e50e62bbf4441bf42247ad429747ce0@00",
-          "prevTxHash": "50f9c25a1402ce6d87ae9f890659c8a67462292e471e02c74d64ff7ba1995e60",
-          "originalTxHash": "cbb1f866da564a04332297dfc4f637be2e50e62bbf4441bf42247ad429747ce0",
-          "gasLimit": 75751600,
-          "gasPrice": 1000000000,
-          "callType": 2,
-          "originalSender": "erd1j6kua7p67qnaw3y4sudmk25xsuv4k8ws6pwvax8fd2vtmuc3q33s840l87",
-          "logs": {
-            "address": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
-            "events": [
-              {
-                "address": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
-                "identifier": "transferValueOnly",
-                "topics": [
-                  "",
-                  "AAAAAAAAAAAFANAMwOY4h/9reS00I0pE56xrV11LBGM="
-                ],
-                "data": "RXhlY3V0ZU9uRGVzdENvbnRleHQ=",
-                "additionalData": [
-                  "RXhlY3V0ZU9uRGVzdENvbnRleHQ=",
-                  "c2V0U2hhcmVUb2tlbklkZW50aWZpZXI=",
-                  "QVZBU0gtN2Q4YjVk"
-                ]
-              },
-              {
-                "address": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
-                "identifier": "transferValueOnly",
-                "topics": [
-                  "",
-                  "AAAAAAAAAAAFANAMwOY4h/9reS00I0pE56xrV11LBGM="
-                ],
-                "data": "RXhlY3V0ZU9uRGVzdENvbnRleHQ=",
-                "additionalData": [
-                  "RXhlY3V0ZU9uRGVzdENvbnRleHQ=",
-                  "c2V0U3RyYXRlZ3lBZGRyZXNz",
-                  "AAAAAAAAAAAFADJ0SE0vUW6bO5SurLeFIMfK/HtBBGM="
-                ]
-              },
-              {
-                "address": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
-                "identifier": "completedTxEvent",
-                "topics": [
-                  "UPnCWhQCzm2Hrp+JBlnIpnRiKS5HHgLHTWT/e6GZXmA="
-                ],
-                "data": null,
-                "additionalData": null
-              }
-            ]
-          },
-          "operation": "transfer"
-        },
-        {
-          "hash": "9d75a398545f488d4764149245e6ec3101debfce99477c353ac11c3239acd897",
-          "nonce": 1,
-          "value": 648519550000000,
-          "receiver": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
-          "sender": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
-          "data": "@6f6b",
-          "prevTxHash": "bf1b8b4b301ff548368dfd972896489d5e2a088d5cbdfa1bfe2421cc7f641f7a",
-          "originalTxHash": "cbb1f866da564a04332297dfc4f637be2e50e62bbf4441bf42247ad429747ce0",
-          "gasLimit": 0,
-          "gasPrice": 1000000000,
-          "callType": 0,
-          "operation": "transfer",
-          "isRefund": true
-        }
-      ],
-      "logs": {
-        "address": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
-        "events": [
-          {
-            "address": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
-            "identifier": "transferValueOnly",
-            "topics": [
-              "",
-              "AAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAC//8="
-            ],
-            "data": "QXN5bmNDYWxs",
-            "additionalData": [
-              "QXN5bmNDYWxs",
-              "c2V0U3BlY2lhbFJvbGU=",
-              "QVZBU0gtN2Q4YjVk",
-              "AAAAAAAAAAAFANAMwOY4h/9reS00I0pE56xrV11LBGM=",
-              "RVNEVFJvbGVORlRDcmVhdGU=",
-              "RVNEVFJvbGVORlRBZGRRdWFudGl0eQ==",
-              "RVNEVFJvbGVORlRCdXJu"
-            ]
-          }
-        ]
-      },
-      "status": "success",
-      "operation": "transfer",
-      "function": "finishVaultDeployments",
-      "initiallyPaidFee": "6082170000000000",
-      "fee": "1378538070000000",
-      "chainID": "D",
-      "version": 1,
-      "options": 0
-    }
-  },
-  "error": "",
-  "code": "successful"
-}
-        "#;
-
-        let tx_on_network: TransactionOnNetwork = serde_json::from_str::<TransactionInfo>(data)
-            .unwrap()
-            .data
-            .unwrap()
-            .transaction;
-        let tx_response = TxResponse::from_network_tx(tx_on_network);
-
-        let expected: Option<String> = None;
-
-        assert_eq!(tx_response.new_issued_token_identifier, expected)
-    }
-
-    #[test]
-    fn test_multisig_issue_nft_and_set_all_roles() {
-        let data = r#"
-{
-  "data": {
-    "transaction": {
-      "type": "normal",
-      "processingTypeOnSource": "SCInvoking",
-      "processingTypeOnDestination": "SCInvoking",
-      "hash": "08582bc19734ad82d7390be88463c948e5d9f026f4b8f0bfc57620957c3433bd",
-      "nonce": 53,
-      "round": 3050972,
-      "epoch": 1246,
-      "value": "0",
-      "receiver": "erd1qqqqqqqqqqqqqpgqrp3n58vp2dmcaur4whazxngvuhac4xwqa4sq2pjl73",
-      "sender": "erd1uv40ahysflse896x4ktnh6ecx43u7cmy9wnxnvcyp7deg299a4sq6vaywa",
-      "gasPrice": 1000000000,
-      "gasLimit": 80000000,
-      "gasUsed": 80000000,
-      "data": "cGVyZm9ybUFjdGlvbkAwMQ==",
-      "signature": "cb67645595cee5f7967d8d85af05bb7db73e80d9b97611796819249d87cd174b69b4abfc2a3fbe52df1aec965bdea921f7eb34d2b1118aa480699ad1dc85790a",
-      "sourceShard": 0,
-      "destinationShard": 0,
-      "blockNonce": 2984930,
-      "blockHash": "644ae8703b826a23e89429953919ec37f875e34a547ea9f7edd53fb71a99c746",
-      "notarizedAtSourceInMetaNonce": 2988311,
-      "NotarizedAtSourceInMetaHash": "4f608a72e654dd9f466801cd489be8ee1a73fbcd77b128559cd46182d3b9455a",
-      "notarizedAtDestinationInMetaNonce": 2988311,
-      "notarizedAtDestinationInMetaHash": "4f608a72e654dd9f466801cd489be8ee1a73fbcd77b128559cd46182d3b9455a",
-      "miniblockType": "TxBlock",
-      "miniblockHash": "c5a73671bc1d37835ddd15b926157721bc83203ec4e00cd48ae0d46015cb5f0b",
-      "hyperblockNonce": 2988311,
-      "hyperblockHash": "4f608a72e654dd9f466801cd489be8ee1a73fbcd77b128559cd46182d3b9455a",
-      "timestamp": 1712305832,
-      "smartContractResults": [
-        {
-          "hash": "b0b3c8df519c33b314c0ee3d25abae6f17c4432fb3382676ce17a42690811cff",
-          "nonce": 0,
-          "value": 50000000000000000,
-          "receiver": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
-          "sender": "erd1qqqqqqqqqqqqqpgqrp3n58vp2dmcaur4whazxngvuhac4xwqa4sq2pjl73",
-          "data": "registerAndSetAllRoles@54657374436f6c6c656374696f6e31@54455354434f4c4c31@4e4654@@98fa4ff554b9c6990ce577fbb816a271f690dcbd6b148f6583fe7692868ae538@08582bc19734ad82d7390be88463c948e5d9f026f4b8f0bfc57620957c3433bd@5e2338",
-          "prevTxHash": "08582bc19734ad82d7390be88463c948e5d9f026f4b8f0bfc57620957c3433bd",
-          "originalTxHash": "08582bc19734ad82d7390be88463c948e5d9f026f4b8f0bfc57620957c3433bd",
-          "gasLimit": 73052300,
-          "gasPrice": 1000000000,
-          "callType": 1,
-          "originalSender": "erd1uv40ahysflse896x4ktnh6ecx43u7cmy9wnxnvcyp7deg299a4sq6vaywa",
-          "operation": "transfer",
-          "function": "registerAndSetAllRoles"
-        },
-        {
-          "hash": "5ae4f74e134e4fa63c8b92e06ff12b2a4b544233d01d80db6a922af35ee55356",
-          "nonce": 1,
-          "value": 196430610000000,
-          "receiver": "erd1qqqqqqqqqqqqqpgqrp3n58vp2dmcaur4whazxngvuhac4xwqa4sq2pjl73",
-          "sender": "erd1qqqqqqqqqqqqqpgqrp3n58vp2dmcaur4whazxngvuhac4xwqa4sq2pjl73",
-          "data": "@6f6b",
-          "prevTxHash": "c4a24b01b48d32308636310e2d335d6ed1f34dcbdfc1133aed7995e78e831c18",
-          "originalTxHash": "08582bc19734ad82d7390be88463c948e5d9f026f4b8f0bfc57620957c3433bd",
-          "gasLimit": 0,
-          "gasPrice": 1000000000,
-          "callType": 0,
-          "operation": "transfer",
-          "isRefund": true
-        },
-        {
-          "hash": "7589c1ad622d8a9ab2f186731fc82aeeab0aea5a8198cb94b6eba85a966e7962",
-          "nonce": 0,
-          "value": 0,
-          "receiver": "erd1llllllllllllllllllllllllllllllllllllllllllllllllluqq2m3f0f",
-          "sender": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
-          "data": "ESDTSetBurnRoleForAll@54455354434f4c4c312d356161383063",
-          "prevTxHash": "b0b3c8df519c33b314c0ee3d25abae6f17c4432fb3382676ce17a42690811cff",
-          "originalTxHash": "08582bc19734ad82d7390be88463c948e5d9f026f4b8f0bfc57620957c3433bd",
-          "gasLimit": 0,
-          "gasPrice": 1000000000,
-          "callType": 0,
-          "originalSender": "erd1uv40ahysflse896x4ktnh6ecx43u7cmy9wnxnvcyp7deg299a4sq6vaywa",
-          "logs": {
-            "address": "erd1llllllllllllllllllllllllllllllllllllllllllllllllluqq2m3f0f",
-            "events": [
-              {
-                "address": "erd1llllllllllllllllllllllllllllllllllllllllllllllllluqq2m3f0f",
-                "identifier": "completedTxEvent",
-                "topics": [
-                  "sLPI31GcM7MUwO49JauubxfEQy+zOCZ2zhekJpCBHP8="
-                ]
-              }
-            ]
-          },
-          "operation": "transfer"
-        },
-        {
-          "hash": "86d1ec3365ea1311dbde2f2366de4ea8627d7e49c29a974578c0869b66903cbc",
-          "nonce": 0,
-          "value": 0,
-          "receiver": "erd1qqqqqqqqqqqqqpgqrp3n58vp2dmcaur4whazxngvuhac4xwqa4sq2pjl73",
-          "sender": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
-          "data": "ESDTSetRole@54455354434f4c4c312d356161383063@45534454526f6c654e4654437265617465@45534454526f6c654e46544275726e@45534454526f6c654e465455706461746541747472696275746573@45534454526f6c654e4654416464555249",
-          "prevTxHash": "b0b3c8df519c33b314c0ee3d25abae6f17c4432fb3382676ce17a42690811cff",
-          "originalTxHash": "08582bc19734ad82d7390be88463c948e5d9f026f4b8f0bfc57620957c3433bd",
-          "gasLimit": 0,
-          "gasPrice": 1000000000,
-          "callType": 0,
-          "originalSender": "erd1uv40ahysflse896x4ktnh6ecx43u7cmy9wnxnvcyp7deg299a4sq6vaywa",
-          "logs": {
-            "address": "erd1qqqqqqqqqqqqqpgqrp3n58vp2dmcaur4whazxngvuhac4xwqa4sq2pjl73",
-            "events": [
-              {
-                "address": "erd1qqqqqqqqqqqqqpgqrp3n58vp2dmcaur4whazxngvuhac4xwqa4sq2pjl73",
-                "identifier": "ESDTSetRole",
-                "topics": [
-                  "VEVTVENPTEwxLTVhYTgwYw==",
-                  "",
-                  "",
-                  "RVNEVFJvbGVORlRDcmVhdGU=",
-                  "RVNEVFJvbGVORlRCdXJu",
-                  "RVNEVFJvbGVORlRVcGRhdGVBdHRyaWJ1dGVz",
-                  "RVNEVFJvbGVORlRBZGRVUkk="
-                ]
-              },
-              {
-                "address": "erd1qqqqqqqqqqqqqpgqrp3n58vp2dmcaur4whazxngvuhac4xwqa4sq2pjl73",
-                "identifier": "completedTxEvent",
-                "topics": [
-                  "sLPI31GcM7MUwO49JauubxfEQy+zOCZ2zhekJpCBHP8="
-                ]
-              }
-            ]
-          },
-          "operation": "ESDTSetRole",
-          "function": "ESDTSetRole"
-        },
-        {
-          "hash": "c4a24b01b48d32308636310e2d335d6ed1f34dcbdfc1133aed7995e78e831c18",
-          "nonce": 0,
-          "value": 0,
-          "receiver": "erd1qqqqqqqqqqqqqpgqrp3n58vp2dmcaur4whazxngvuhac4xwqa4sq2pjl73",
-          "sender": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
-          "data": "@00@54455354434f4c4c312d356161383063@3ec73c55022548038bbe06c0639156b3db70b7c770955e340f14fcfcd45df06a@98fa4ff554b9c6990ce577fbb816a271f690dcbd6b148f6583fe7692868ae538@08582bc19734ad82d7390be88463c948e5d9f026f4b8f0bfc57620957c3433bd@00",
-          "prevTxHash": "b0b3c8df519c33b314c0ee3d25abae6f17c4432fb3382676ce17a42690811cff",
-          "originalTxHash": "08582bc19734ad82d7390be88463c948e5d9f026f4b8f0bfc57620957c3433bd",
-          "gasLimit": 23052300,
-          "gasPrice": 1000000000,
-          "callType": 2,
-          "originalSender": "erd1uv40ahysflse896x4ktnh6ecx43u7cmy9wnxnvcyp7deg299a4sq6vaywa",
-          "logs": {
-            "address": "erd1qqqqqqqqqqqqqpgqrp3n58vp2dmcaur4whazxngvuhac4xwqa4sq2pjl73",
-            "events": [
-              {
-                "address": "erd1qqqqqqqqqqqqqpgqrp3n58vp2dmcaur4whazxngvuhac4xwqa4sq2pjl73",
-                "identifier": "callBack",
-                "topics": [
-                  "YXN5bmNDYWxsU3VjY2Vzcw==",
-                  "VEVTVENPTEwxLTVhYTgwYw=="
-                ],
-                "additionalData": [
-                  ""
-                ]
-              },
-              {
-                "address": "erd1qqqqqqqqqqqqqpgqrp3n58vp2dmcaur4whazxngvuhac4xwqa4sq2pjl73",
-                "identifier": "completedTxEvent",
-                "topics": [
-                  "sLPI31GcM7MUwO49JauubxfEQy+zOCZ2zhekJpCBHP8="
-                ]
-              }
-            ]
-          },
-          "operation": "transfer"
-        }
-      ],
-      "logs": {
-        "address": "erd1qqqqqqqqqqqqqpgqrp3n58vp2dmcaur4whazxngvuhac4xwqa4sq2pjl73",
-        "events": [
-          {
-            "address": "erd1qqqqqqqqqqqqqpgqrp3n58vp2dmcaur4whazxngvuhac4xwqa4sq2pjl73",
-            "identifier": "performAction",
-            "topics": [
-              "c3RhcnRQZXJmb3JtQWN0aW9u"
-            ],
-            "data": "AAAAAQYAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAL//wAAAAexorwuxQAAAAAAFnJlZ2lzdGVyQW5kU2V0QWxsUm9sZXMAAAAEAAAAD1Rlc3RDb2xsZWN0aW9uMQAAAAlURVNUQ09MTDEAAAADTkZUAAAAAAAAAATjKv7ckE/hk5dGrZc76zg1Y89jZCumabMED5uUKKXtYLE6AXQjw2bK/4zs+3ehJhChMPSIgTQSLHk3/q4NbX0XOvjZyUI7JXfGJSciwdkCEqQRH3ID+XRPdvz6HQoxADOyoRVVzlIeSUTgmrF1SdhbSH3NJshLUBejnjGjZwiJug==",
-            "additionalData": [
-              "AAAAAQYAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAL//wAAAAexorwuxQAAAAAAFnJlZ2lzdGVyQW5kU2V0QWxsUm9sZXMAAAAEAAAAD1Rlc3RDb2xsZWN0aW9uMQAAAAlURVNUQ09MTDEAAAADTkZUAAAAAAAAAATjKv7ckE/hk5dGrZc76zg1Y89jZCumabMED5uUKKXtYLE6AXQjw2bK/4zs+3ehJhChMPSIgTQSLHk3/q4NbX0XOvjZyUI7JXfGJSciwdkCEqQRH3ID+XRPdvz6HQoxADOyoRVVzlIeSUTgmrF1SdhbSH3NJshLUBejnjGjZwiJug=="
-            ]
-          },
-          {
-            "address": "erd1qqqqqqqqqqqqqpgqrp3n58vp2dmcaur4whazxngvuhac4xwqa4sq2pjl73",
-            "identifier": "performAction",
-            "topics": [
-              "cGVyZm9ybUFzeW5jQ2FsbA==",
-              "AQ==",
-              "AAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAC//8=",
-              "saK8LsUAAA==",
-              "BGa4HQ==",
-              "cmVnaXN0ZXJBbmRTZXRBbGxSb2xlcw==",
-              "VGVzdENvbGxlY3Rpb24x",
-              "VEVTVENPTEwx",
-              "TkZU",
-              ""
-            ],
-            "additionalData": [
-              ""
-            ]
-          },
-          {
-            "address": "erd1qqqqqqqqqqqqqpgqrp3n58vp2dmcaur4whazxngvuhac4xwqa4sq2pjl73",
-            "identifier": "transferValueOnly",
-            "topics": [
-              "saK8LsUAAA==",
-              "AAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAC//8="
-            ],
-            "data": "QXN5bmNDYWxs",
-            "additionalData": [
-              "QXN5bmNDYWxs",
-              "cmVnaXN0ZXJBbmRTZXRBbGxSb2xlcw==",
-              "VGVzdENvbGxlY3Rpb24x",
-              "VEVTVENPTEwx",
-              "TkZU",
-              ""
-            ]
-          },
-          {
-            "address": "erd1qqqqqqqqqqqqqpgqrp3n58vp2dmcaur4whazxngvuhac4xwqa4sq2pjl73",
-            "identifier": "writeLog",
-            "topics": [
-              "4yr+3JBP4ZOXRq2XO+s4NWPPY2QrpmmzBA+blCil7WA="
-            ],
-            "data": "QDZmNmI=",
-            "additionalData": [
-              "QDZmNmI="
-            ]
-          }
-        ]
-      },
-      "status": "success",
-      "operation": "transfer",
-      "function": "performAction",
-      "initiallyPaidFee": "873260000000000",
-      "fee": "873260000000000",
-      "chainID": "D",
-      "version": 1,
-      "options": 0
-    }
-  },
-  "code": "successful"
-}
-        "#;
-
-        let tx_on_network: TransactionOnNetwork = serde_json::from_str::<TransactionInfo>(data)
-            .unwrap()
-            .data
-            .unwrap()
-            .transaction;
-        let tx_response = TxResponse::from_network_tx(tx_on_network);
-
-        let expected = Some("TESTCOLL1-5aa80c".to_string());
-
-        assert_eq!(tx_response.new_issued_token_identifier, expected)
-    }
-}
diff --git a/framework/scenario/tests/tx_response_tests.rs b/framework/scenario/tests/tx_response_tests.rs
new file mode 100644
index 0000000000..a1d9da5a34
--- /dev/null
+++ b/framework/scenario/tests/tx_response_tests.rs
@@ -0,0 +1,2661 @@
+use multiversx_sc::types::Address;
+use multiversx_sc_scenario::scenario_model::{is_out_scr, TxResponse};
+use multiversx_sdk::data::transaction::{TransactionInfo, TransactionOnNetwork};
+
+#[test]
+fn test_transaction_multiple_sc_results() {
+    let data = r#"
+        {
+          "data": {
+            "transaction": {
+              "type": "normal",
+              "processingTypeOnSource": "BuiltInFunctionCall",
+              "processingTypeOnDestination": "SCInvoking",
+              "hash": "c6dc718c56c8795156d847f4f9768f2b1976a516d390fdce0f5b8bad1ac3cce5",
+              "nonce": 236,
+              "round": 3353069,
+              "epoch": 1371,
+              "value": "0",
+              "receiver": "erd1qqqqqqqqqqqqqpgq4zafu6rzdw7fj07hjh5tkm68jsaj7hl60n4s8py4ra",
+              "sender": "erd1uv40ahysflse896x4ktnh6ecx43u7cmy9wnxnvcyp7deg299a4sq6vaywa",
+              "gasPrice": 1000000000,
+              "gasLimit": 100000000,
+              "gasUsed": 12767998,
+              "data": "RVNEVFRyYW5zZmVyQDU1NTQ0YjJkMzEzNDY0MzUzNzY0QDhhYzcyMzA0ODllODAwMDBANzM3NzYxNzA1NDZmNmI2NTZlNzM0NjY5Nzg2NTY0NDk2ZTcwNzU3NEA1NzQ1NDc0YzQ0MmQ2MTMyMzg2MzM1MzlAZThkNGE1MTAwMA==",
+              "signature": "caed340339e3ae17a92783f5f08f96ac875885e44c25510cd11251ce23f22994985a6605c4d36f841b7110288a5e928f624f150a66a9de8ade36b68028a9af09",
+              "sourceShard": 0,
+              "destinationShard": 1,
+              "blockNonce": 3288476,
+              "blockHash": "0e70ea5fb26c58b1029c84e24eb9a661272b6253d30c668af91f167bfd67b2b0",
+              "notarizedAtSourceInMetaNonce": 3290316,
+              "NotarizedAtSourceInMetaHash": "8200662ca3ade8fa8e1dd3a4184b0a74d4c43de8f4153170a506f60c94ad3e8b",
+              "notarizedAtDestinationInMetaNonce": 3290320,
+              "notarizedAtDestinationInMetaHash": "e5f332a8f2070fd1c4ff90f5dc1ee691f36e4ecb9cb5c37e8e7c8595036c3792",
+              "miniblockType": "TxBlock",
+              "miniblockHash": "d271ad87c6cf8653cc950272f3ee5e976820ada80468518fa35fe45b6e33dca8",
+              "hyperblockNonce": 3290320,
+              "hyperblockHash": "e5f332a8f2070fd1c4ff90f5dc1ee691f36e4ecb9cb5c37e8e7c8595036c3792",
+              "timestamp": 1714118414,
+              "smartContractResults": [
+                {
+                  "hash": "c0e63f1018ece1036e3e6dc405553e5f6badfe0f5d2a104f4cd4457a872d02f9",
+                  "nonce": 0,
+                  "value": 0,
+                  "receiver": "erd1qqqqqqqqqqqqqpgq4zafu6rzdw7fj07hjh5tkm68jsaj7hl60n4s8py4ra",
+                  "sender": "erd1qqqqqqqqqqqqqpgq4zafu6rzdw7fj07hjh5tkm68jsaj7hl60n4s8py4ra",
+                  "data": "swapTokensFixedInput@5745474c442d613238633539@e8d4a51000",
+                  "prevTxHash": "c6dc718c56c8795156d847f4f9768f2b1976a516d390fdce0f5b8bad1ac3cce5",
+                  "originalTxHash": "c6dc718c56c8795156d847f4f9768f2b1976a516d390fdce0f5b8bad1ac3cce5",
+                  "gasLimit": 99559500,
+                  "gasPrice": 1000000000,
+                  "callType": 0,
+                  "originalSender": "erd1uv40ahysflse896x4ktnh6ecx43u7cmy9wnxnvcyp7deg299a4sq6vaywa",
+                  "operation": "transfer",
+                  "function": "swapTokensFixedInput"
+                },
+                {
+                  "hash": "40078cec63b6e0d0d9522ea5e6d2d0cb6f21ebae981f354de3dc3545ac2928ad",
+                  "nonce": 0,
+                  "value": 0,
+                  "receiver": "erd1uv40ahysflse896x4ktnh6ecx43u7cmy9wnxnvcyp7deg299a4sq6vaywa",
+                  "sender": "erd1qqqqqqqqqqqqqpgq4zafu6rzdw7fj07hjh5tkm68jsaj7hl60n4s8py4ra",
+                  "data": "ESDTTransfer@5745474c442d613238633539@9b35e4dd3902b9",
+                  "prevTxHash": "c6dc718c56c8795156d847f4f9768f2b1976a516d390fdce0f5b8bad1ac3cce5",
+                  "originalTxHash": "c6dc718c56c8795156d847f4f9768f2b1976a516d390fdce0f5b8bad1ac3cce5",
+                  "gasLimit": 0,
+                  "gasPrice": 1000000000,
+                  "callType": 0,
+                  "originalSender": "erd1uv40ahysflse896x4ktnh6ecx43u7cmy9wnxnvcyp7deg299a4sq6vaywa",
+                  "logs": {
+                    "address": "erd1uv40ahysflse896x4ktnh6ecx43u7cmy9wnxnvcyp7deg299a4sq6vaywa",
+                    "events": [
+                      {
+                        "address": "erd1qqqqqqqqqqqqqpgq4zafu6rzdw7fj07hjh5tkm68jsaj7hl60n4s8py4ra",
+                        "identifier": "ESDTTransfer",
+                        "topics": [
+                          "V0VHTEQtYTI4YzU5",
+                          "",
+                          "mzXk3TkCuQ==",
+                          "4yr+3JBP4ZOXRq2XO+s4NWPPY2QrpmmzBA+blCil7WA="
+                        ],
+                        "data": null,
+                        "additionalData": [
+                          "",
+                          "RVNEVFRyYW5zZmVy",
+                          "V0VHTEQtYTI4YzU5",
+                          "mzXk3TkCuQ=="
+                        ]
+                      },
+                      {
+                        "address": "erd1uv40ahysflse896x4ktnh6ecx43u7cmy9wnxnvcyp7deg299a4sq6vaywa",
+                        "identifier": "writeLog",
+                        "topics": [
+                          "AAAAAAAAAAAFAKi6nmhia7yZP9eV6LtvR5Q7L1/6fOs="
+                        ],
+                        "data": "QDZmNmI=",
+                        "additionalData": [
+                          "QDZmNmI="
+                        ]
+                      },
+                      {
+                        "address": "erd1uv40ahysflse896x4ktnh6ecx43u7cmy9wnxnvcyp7deg299a4sq6vaywa",
+                        "identifier": "completedTxEvent",
+                        "topics": [
+                          "xtxxjFbIeVFW2Ef0+XaPKxl2pRbTkP3OD1uLrRrDzOU="
+                        ],
+                        "data": null,
+                        "additionalData": null
+                      }
+                    ]
+                  },
+                  "tokens": [
+                    "WEGLD-a28c59"
+                  ],
+                  "esdtValues": [
+                    "43687878470468281"
+                  ],
+                  "operation": "ESDTTransfer"
+                },
+                {
+                  "hash": "26487a550721b8282ceafe603bb4d53ee93929ffd9ded39b08e7422adb4d8795",
+                  "nonce": 237,
+                  "value": 872320020000000,
+                  "receiver": "erd1uv40ahysflse896x4ktnh6ecx43u7cmy9wnxnvcyp7deg299a4sq6vaywa",
+                  "sender": "erd1qqqqqqqqqqqqqpgq4zafu6rzdw7fj07hjh5tkm68jsaj7hl60n4s8py4ra",
+                  "data": "@6f6b@0000000c5745474c442d6132386335390000000000000000000000079b35e4dd3902b9",
+                  "prevTxHash": "c6dc718c56c8795156d847f4f9768f2b1976a516d390fdce0f5b8bad1ac3cce5",
+                  "originalTxHash": "c6dc718c56c8795156d847f4f9768f2b1976a516d390fdce0f5b8bad1ac3cce5",
+                  "gasLimit": 0,
+                  "gasPrice": 1000000000,
+                  "callType": 0,
+                  "logs": {
+                    "address": "erd1uv40ahysflse896x4ktnh6ecx43u7cmy9wnxnvcyp7deg299a4sq6vaywa",
+                    "events": [
+                      {
+                        "address": "erd1uv40ahysflse896x4ktnh6ecx43u7cmy9wnxnvcyp7deg299a4sq6vaywa",
+                        "identifier": "completedTxEvent",
+                        "topics": [
+                          "xtxxjFbIeVFW2Ef0+XaPKxl2pRbTkP3OD1uLrRrDzOU="
+                        ],
+                        "data": null,
+                        "additionalData": null
+                      }
+                    ]
+                  },
+                  "operation": "transfer",
+                  "isRefund": true
+                },
+                {
+                  "hash": "798ba4333a7cedb62f811d942dedb8c0c09bf9945a0d2ccede2eaed967eba135",
+                  "nonce": 0,
+                  "value": 0,
+                  "receiver": "erd1qqqqqqqqqqqqqpgqw88ux2l44eufvwz2uhvduhq03g8pxc4j0n4s0frzjz",
+                  "sender": "erd1qqqqqqqqqqqqqpgq4zafu6rzdw7fj07hjh5tkm68jsaj7hl60n4s8py4ra",
+                  "data": "ESDTTransfer@55544b2d313464353764@2d79883d2000@6465706f7369745377617046656573",
+                  "prevTxHash": "c6dc718c56c8795156d847f4f9768f2b1976a516d390fdce0f5b8bad1ac3cce5",
+                  "originalTxHash": "c6dc718c56c8795156d847f4f9768f2b1976a516d390fdce0f5b8bad1ac3cce5",
+                  "gasLimit": 0,
+                  "gasPrice": 1000000000,
+                  "callType": 0,
+                  "originalSender": "erd1uv40ahysflse896x4ktnh6ecx43u7cmy9wnxnvcyp7deg299a4sq6vaywa",
+                  "tokens": [
+                    "UTK-14d57d"
+                  ],
+                  "esdtValues": [
+                    "50000000000000"
+                  ],
+                  "operation": "ESDTTransfer",
+                  "function": "depositSwapFees"
+                }
+              ],
+              "logs": {
+                "address": "erd1qqqqqqqqqqqqqpgq4zafu6rzdw7fj07hjh5tkm68jsaj7hl60n4s8py4ra",
+                "events": [
+                  {
+                    "address": "erd1uv40ahysflse896x4ktnh6ecx43u7cmy9wnxnvcyp7deg299a4sq6vaywa",
+                    "identifier": "ESDTTransfer",
+                    "topics": [
+                      "VVRLLTE0ZDU3ZA==",
+                      "",
+                      "iscjBInoAAA=",
+                      "AAAAAAAAAAAFAKi6nmhia7yZP9eV6LtvR5Q7L1/6fOs="
+                    ],
+                    "data": null,
+                    "additionalData": [
+                      "",
+                      "RVNEVFRyYW5zZmVy",
+                      "VVRLLTE0ZDU3ZA==",
+                      "iscjBInoAAA=",
+                      "c3dhcFRva2Vuc0ZpeGVkSW5wdXQ=",
+                      "V0VHTEQtYTI4YzU5",
+                      "6NSlEAA="
+                    ]
+                  },
+                  {
+                    "address": "erd1qqqqqqqqqqqqqpgq4zafu6rzdw7fj07hjh5tkm68jsaj7hl60n4s8py4ra",
+                    "identifier": "ESDTTransfer",
+                    "topics": [
+                      "VVRLLTE0ZDU3ZA==",
+                      "",
+                      "LXmIPSAA",
+                      "AAAAAAAAAAAFAHHPwyv1rniWOErl2N5cD4oOE2KyfOs="
+                    ],
+                    "data": "RXhlY3V0ZU9uRGVzdENvbnRleHQ=",
+                    "additionalData": [
+                      "RXhlY3V0ZU9uRGVzdENvbnRleHQ=",
+                      "RVNEVFRyYW5zZmVy",
+                      "VVRLLTE0ZDU3ZA==",
+                      "LXmIPSAA",
+                      "ZGVwb3NpdFN3YXBGZWVz"
+                    ]
+                  },
+                  {
+                    "address": "erd1qqqqqqqqqqqqqpgqw88ux2l44eufvwz2uhvduhq03g8pxc4j0n4s0frzjz",
+                    "identifier": "depositSwapFees",
+                    "topics": [
+                      "ZGVwb3NpdF9zd2FwX2ZlZXNfZXZlbnQ=",
+                      "AAAAAAAAAAAFAKi6nmhia7yZP9eV6LtvR5Q7L1/6fOs=",
+                      "ug==",
+                      "AAAAClVUSy0xNGQ1N2QAAAAAAAAAAAAAAAYteYg9IAA="
+                    ],
+                    "data": null,
+                    "additionalData": [
+                      ""
+                    ]
+                  },
+                  {
+                    "address": "erd1qqqqqqqqqqqqqpgq4zafu6rzdw7fj07hjh5tkm68jsaj7hl60n4s8py4ra",
+                    "identifier": "ESDTTransfer",
+                    "topics": [
+                      "V0VHTEQtYTI4YzU5",
+                      "",
+                      "mzXk3TkCuQ==",
+                      "4yr+3JBP4ZOXRq2XO+s4NWPPY2QrpmmzBA+blCil7WA="
+                    ],
+                    "data": "RGlyZWN0Q2FsbA==",
+                    "additionalData": [
+                      "RGlyZWN0Q2FsbA==",
+                      "RVNEVFRyYW5zZmVy",
+                      "V0VHTEQtYTI4YzU5",
+                      "mzXk3TkCuQ=="
+                    ]
+                  },
+                  {
+                    "address": "erd1qqqqqqqqqqqqqpgq4zafu6rzdw7fj07hjh5tkm68jsaj7hl60n4s8py4ra",
+                    "identifier": "swapTokensFixedInput",
+                    "topics": [
+                      "c3dhcA==",
+                      "VVRLLTE0ZDU3ZA==",
+                      "V0VHTEQtYTI4YzU5",
+                      "4yr+3JBP4ZOXRq2XO+s4NWPPY2QrpmmzBA+blCil7WA=",
+                      "BVs="
+                    ],
+                    "data": "4yr+3JBP4ZOXRq2XO+s4NWPPY2QrpmmzBA+blCil7WAAAAAKVVRLLTE0ZDU3ZAAAAAiKxyMEiegAAAAAAAxXRUdMRC1hMjhjNTkAAAAHmzXk3TkCuQAAAAcjhvJvwQAAAAAACwGBykedC25GCD5kAAAACgGwxHNBlOj27dQAAAAAADItnAAAAAAAAAVbAAAAAGYrXw4=",
+                    "additionalData": [
+                      "4yr+3JBP4ZOXRq2XO+s4NWPPY2QrpmmzBA+blCil7WAAAAAKVVRLLTE0ZDU3ZAAAAAiKxyMEiegAAAAAAAxXRUdMRC1hMjhjNTkAAAAHmzXk3TkCuQAAAAcjhvJvwQAAAAAACwGBykedC25GCD5kAAAACgGwxHNBlOj27dQAAAAAADItnAAAAAAAAAVbAAAAAGYrXw4="
+                    ]
+                  }
+                ]
+              },
+              "status": "success",
+              "tokens": [
+                "UTK-14d57d"
+              ],
+              "esdtValues": [
+                "10000000000000000000"
+              ],
+              "operation": "ESDTTransfer",
+              "function": "swapTokensFixedInput",
+              "initiallyPaidFee": "1238095000000000",
+              "fee": "365774980000000",
+              "chainID": "D",
+              "version": 1,
+              "options": 0
+            }
+          },
+          "error": "",
+          "code": "successful"
+        }"#;
+
+    let tx_on_network: TransactionOnNetwork = serde_json::from_str::<TransactionInfo>(data)
+        .unwrap()
+        .data
+        .unwrap()
+        .transaction;
+    let tx_response = TxResponse::from_network_tx(tx_on_network);
+    assert_eq!(tx_response.api_scrs.len(), 4usize);
+    assert!(is_out_scr(&tx_response.api_scrs.get(2).unwrap()));
+}
+
+#[test]
+fn test_deployed_address() {
+    let data = r#"
+        {
+  "data": {
+    "transaction": {
+      "type": "normal",
+      "processingTypeOnSource": "SCDeployment",
+      "processingTypeOnDestination": "SCDeployment",
+      "hash": "07a176d1734d1901d396be344f97e1d80f076269e9559f9b2110f6f11c4f74de",
+      "nonce": 427,
+      "round": 2190715,
+      "epoch": 887,
+      "value": "0",
+      "receiver": "erd1qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqq6gq4hu",
+      "sender": "erd1j6kua7p67qnaw3y4sudmk25xsuv4k8ws6pwvax8fd2vtmuc3q33s840l87",
+      "gasPrice": 1000000000,
+      "gasLimit": 600000000,
+      "data": "0061736d010000000198011960027f7f0060017f017f6000006000017f60027f7f017f60037f7f7f0060017f0060047f7f7f7f0060057f7f7f7f7f0060037f7f7f017f60047f7f7f7f017f60027f7e0060017f017e60027f7f017e60057f7f7e7f7f017f60067e7f7f7f7f7f017f60017e006000017e60017e017f60047f7f7e7f0060057e7f7f7f7f017f60047f7f7f7e0060017e017e60047f7e7f7f0060027e7f0002c1072903656e76126d616e616765645369676e616c4572726f72000603656e760e626967496e74536574496e743634000b03656e7609626967496e74416464000503656e760b7369676e616c4572726f72000003656e760a6d4275666665724e6577000303656e760d6d427566666572417070656e64000403656e76096d4275666665724571000403656e760d6d42756666657246696e697368000103656e76226d616e616765644d756c74695472616e73666572455344544e465445786563757465000e03656e761b6d616e61676564457865637574654f6e44657374436f6e74657874000f03656e760d6d616e6167656443616c6c6572000603656e76106d616e61676564534341646472657373000603656e76136d616e616765644f776e657241646472657373000603656e761c6d616e616765644765744d756c74694553445443616c6c56616c7565000603656e76126d427566666572476574417267756d656e74000403656e76126d427566666572417070656e644279746573000903656e7619626967496e74476574556e7369676e6564417267756d656e74000003656e761b736d616c6c496e74476574556e7369676e6564417267756d656e74000c03656e76106d4275666665724765744c656e677468000103656e760f6765744e756d417267756d656e7473000303656e7616736d616c6c496e7446696e697368556e7369676e6564001003656e7609626967496e74537562000503656e760a6765744761734c656674001103656e760f636c65616e52657475726e44617461000203656e760f6d4275666665725365744279746573000903656e7609626967496e74436d70000403656e760a626967496e7454446976000503656e7609626967496e744d756c000503656e76196d42756666657246726f6d426967496e74556e7369676e6564000403656e76176d427566666572546f426967496e74556e7369676e6564000403656e7609626967496e74506f77000503656e76146d427566666572436f707942797465536c696365000a03656e76126d42756666657253746f726167654c6f6164000403656e76136d42756666657253746f7261676553746f7265000403656e760e636865636b4e6f5061796d656e74000203656e76176d616e616765644765744261636b5472616e7366657273000003656e760f6d616e6167656457726974654c6f67000003656e7614626967496e7446696e697368556e7369676e6564000603656e760666696e697368000003656e760a626967496e745369676e000103656e76136d42756666657247657442797465536c696365000a03d301d1010103080201120104000107060606000401090100010000000013030014030303020301070400030901090909000707010006060106060c0501080500010b00080715070808000a0016010106010000000500000103000601001705050a070400040a00040404000404040404010100040d070707080a000501010505060101000b0b0101010101050d0105000000050500000000000c070707070000081803030300030300010407030303030101030303030202020202020202020202020202020202020202020202020202020202080805030100030616037f01418080080b7f0041e9db080b7f0041f0db080b07c70520066d656d6f7279020004696e697400db01077570677261646500dc01076465706f73697400dd0108776974686472617700de0108636f6d706f756e6400df010e676574546f74616c41737365747300e0010f6765745661756c744164647265737300e101176765744173736574546f6b656e4964656e74696669657200e2011d6765744d6f6e65794d61726b6574546f6b656e4964656e74696669657200e301226765744d6f6e65794d61726b6574556e6465726c79696e674964656e74696669657200e4011f676574426f6f737465725374616b6564546f6b656e4964656e74696669657200e50114676574436f6e74726f6c6c65724164647265737300e601156765744d6f6e65794d61726b65744164647265737300e7011d6765745772617070656445676c64436f6e74726163744164647265737300e8011d6765745772617070656445676c64546f6b656e4964656e74696669657200e90111676574426f6f737465724164647265737300ea0119676574436f6d706f756e645845786368616e6765537761707300eb0117676574436f6d706f756e6441736873776170537761707300ec0116676574436f6d706f756e644665657350657263656e7400ed0119676574506572666f726d616e63654665657350657263656e7400ee010e7374616b65496e426f6f7374657200ef011b726562616c616e6365506f7274666f6c696f496e426f6f7374657200f00112756e7374616b6546726f6d426f6f7374657200f10118636c61696d4d756c7469706c6546726f6d426f6f7374657200f20119736574506572666f726d616e63654665657350657263656e7400f30116736574436f6d706f756e644665657350657263656e7400f40110736574436f6d706f756e64537761707300f5010d6765744e61747572616c41505900f6010863616c6c4261636b00f7010a5f5f646174615f656e6403010b5f5f686561705f6261736503020a9aa901d1011601017f102a220142001001200120012000100220010b1901017f41c88d0841c88d0828020041016b220036020020000b2e000240200120024d0440200220044d0d01102c000b102c000b2000200220016b3602042000200120036a3602000b0b0041b88d08410e1003000b1301017f102a22012000ad42ff0183100120010b2101017f102a21012000420053044041b2850841111003000b20012000100120010b0f01017f10042201200010051a20010b0b0020002001100641004a0b2d01017f230041206b2202240020022000103241c08008410810332002200136021820021034200241206a24000b1900200041feffffff0746044041c8800841191003000b20000b2a0020022003104d2102104321032000427f3703082000200336020420002002360200200020013602100b7d01037f230041106b22012400200029030810712000280210200028021820002802002000280204104521021017410021002002101221032001410036020c200120023602042001200341027622023602080340200020024f450440200141046a10751a20012802082102200128020c21000c010b0b200141106a24000b3601027f230041106b22012400200141086a103620012802082102200020012d000c4101713a000420002002360200200141106a24000b6d01027f230041106b220124002000027f41e0db082d0000220245044041e0db0841013a000041dcdb084100360200200141086a4100109f012001280208200128020c41b88d084100105710430c010b41b88d084100104d0b360200200020024101733a0004200141106a24000b0b0020002001103810071a0b4901017f230041106b22022400200220013a000c20022000360208200241086a10a501200228020820022d000c044041dcdb08410036020041e0db0841003a00000b200241106a24000b0e002000418a8508410b103a103b0b130020002000200120021052200120021085010b0d002000102a2200101d1a20000b0a002000103d2001103e0b0f01017f102a22012000101c1a20010b5101027f230041106b22022400200220001012220341187420034180fe03714108747220034108764180fe03712003411876727236020c20012002410c6a410410a3012001200010bd01200241106a24000b0a002000103d200110400b5101027f230041106b22022400200220001012220341187420034180fe03714108747220034108764180fe03712003411876727236020c20012002410c6a4104100f1a20012000108b01200241106a24000b0900200020011003000b5001047f1043210610432107230041106b22042400104321052001102f210120042003102936020c20042002370300200420013602082005200410442000200542002006200710081a200441106a24000b1301017f102a220041b88d08410010181a20000bd20102027f017e230041106b2203240020032001280208220241187420024180fe03714108747220024108764180fe0371200241187672723602002003200128020c220241187420024180fe03714108747220024108764180fe03712002411876727236020c20032001290300220442388620044280fe0383422886842004428080fc0783421886200442808080f80f834208868484200442088842808080f80f832004421888428080fc07838420044228884280fe03832004423888848484370204200020034110100f1a200341106a24000b150020002001200220032004102a220110091a20010b0c01017f102a2200100a20000b0c01017f102a2200100b20000b0c01017f102a2200100c20000b150010481046103004400f0b41928d0841241003000b2b01017f41e8db082d000022000440416b41ffffffff0720001b0f0b41e8db0841013a0000416b100d416b0b0d002000102a2200100e1a20000b2e01017f41d583084117104d220420002001100f1a200441ec83084103100f1a200420022003100f1a20041000000b1101017f102a22022000200110181a20020b4601017f230041106b220224002002200141187420014180fe03714108747220014108764180fe03712001411876727236020c20002002410c6a4104100f1a200241106a24000b0e01017f4100102a2200101020000b1f002000104b2200101241204704402001200241b086084110104c000b20000bd90301097f230041406a220124002000104b210210432106200210122100200141246a41003a0000200141206a20003602002001200236021c200120003602182001410036021441002102037f2000200246047f20012d0024044041dcdb08410036020041e0db0841003a00000b200141406b2400200605200141146a2200419787084116103a210420004197870841161052210010432103034020000440200141146a2205419787084116105221072005419787084116105321082005419787084116103a2109410021020240024002402005419787084116105441ff01710e020201000b41978708411641ed8608410d104c000b410121020b200120023a0034200120093602302001200836022c200120073602282003200141286a1055200041016b21000c010b0b200142003703282001200441187420044180fe03714108747220044108764180fe03712004411876727236023c200141086a200141286a22004100410410562001280208200128020c2001413c6a2202410410572001200341187420034180fe03714108747220034108764180fe03712003411876727236023c2001200041044108105620012802002001280204200241041057200620004108100f1a20012802142102200128021821000c010b0b0b3702017f017e230041106b220324002003410036020c20002003410c6a220041042001200210c5012000410410b101200341106a2400a70b0d0020004120200120021085010b3001017f230041106b22032400200341003a000f20002003410f6a41012001200210c50120032d000f200341106a24000bf60201057f230041d0006b22022400200242003700352002420037033020022001280200220341187420034180fe03714108747220034108764180fe037120034118767272360240200241286a200241306a220541004104109b012002280228200228022c200241406b220441041057200241c8006a41003a00002002420037034020022001280204220341187420034180fe03714108747220034108764180fe03712003411876727236024c200241206a200441004104109c0120022802202002280224200241cc006a2206410410572002200141086a280200220341187420034180fe03714108747220034108764180fe03712003411876727236024c200241186a200441044108109c012002280218200228021c20064104105720022001410c6a2d00003a004c200241106a200441084109109c0120022802102002280214200641011057200241086a20054104410d109b012002280208200228020c20044109105720002005410d100f1a200241d0006a24000b0f002000200120022003410810f9010bb50201067f200120034604402001220341104f04402000410020006b41037122046a210520040440200221010340200020012d00003a0000200141016a2101200041016a22002005490d000b0b2005200320046b2203417c7122066a21000240200220046a22044103710440200641004c0d012004410374220141187121072004417c71220841046a2102410020016b4118712109200828020021010340200520012007762002280200220120097472360200200241046a2102200541046a22052000490d000b0c010b200641004c0d0020042102034020052002280200360200200241046a2102200541046a22052000490d000b0b20034103712103200420066a21020b20030440200020036a21010340200020022d00003a0000200241016a2102200041016a22002001490d000b0b0f0b102c000ba20301077f230041406a220124002000104b2102104321052002101221002001412c6a41003a0000200141286a200036020020012002360224200120003602202001410036021c41002102037f2000200246047f20012d002c044041dcdb08410036020041e0db0841003a00000b200141406b24002005052001411c6a220041ad87084118103a2103200041ad8708411810522100104321020340200004402001411c6a220441ad8708411810522106200441ad8708411810532107200441ad87084118103a21042001200636023820012004360234200120073602302002200141306a1059200041016b21000c010b0b200142003703302001200341187420034180fe03714108747220034108764180fe03712003411876727236023c200141106a200141306a2200410041041056200128021020012802142001413c6a2203410410572001200241187420024180fe03714108747220024108764180fe03712002411876727236023c200141086a20004104410810562001280208200128020c200341041057200520004108100f1a200128021c2102200128022021000c010b0b0bb80201047f230041406a22022400200241286a41003602002002420037032020022001280208220341187420034180fe03714108747220034108764180fe037120034118767272360230200241186a200241206a220541004104109a012002280218200228021c200241306a2204410410572002420037033020022001280200220341187420034180fe03714108747220034108764180fe03712003411876727236023c200241106a2004410041041056200228021020022802142002413c6a22034104105720022001280204220141187420014180fe03714108747220014108764180fe03712001411876727236023c200241086a20044104410810562002280208200228020c200341041057200220054104410c109a012002280200200228020420044108105720002005410c100f1a200241406b24000b1400101320004604400f0b4192840841191003000b09002000105c10071a0b1d00200010a70122001012412047044041b086084110108801000b20000b0a00200010a70110071a0b08002000105f10140b6102027f017e230041106b2201240020014200370308200010a70122001012220241094f044041958508410e108801000b2001200141086a200210b001200041002001280200220020012802042202108a011a2000200210b101200141106a24000b1f0020002001200210152000106141ff017104400f0b41ab840841301003000b1500410241012000102722001b4100200041004e1b0bf80101047f230041d0006b2205240020052004360228200541206a41db840841141063200528022021072005280224220620031064200410652103104322082003ad106620062008104e200520041012360234200541003602302005200541286a36022c0340200541386a2005412c6a10672005290338500440200520072006200120021068200528020421012000200528020036020020002001360204200541d0006a240005200528024c2103200541186a2007200620052802481069200541106a2005280218200528021c2005290340106a200541086a200528021020052802142003106b200528020c2106200528020821070c010b0b0b180020012002104d210120001043360204200020013602000b100010431a20002001280200102f104e0b0900200010124104760b3801017f230041106b2202240020024200370308200220014100200241086a10820120002002280200200228020410181a200241106a24000ba70102057f017e230041206b2202240020002001280204220441106a220520012802084d047e2001280200200241106a4200370300200242003703082802002004200241086a22034110106f1a2002410036021c20032002411c6a22061098012104200320061099012107200041146a200241086a2002411c6a109801360200200041106a2004360200200020073703082001200536020442010542000b370300200241206a24000b910101037f230041106b22052400024020031012450d0020022003106e200410122106410021030340200341046a220720064b0d012005410036020c200420032005410c6a4104106f1a2002200528020c220341187420034180fe03714108747220034108764180fe037120034118767272106e200721030c000b000b2000200236020420002001360200200541106a24000b160020022003106e20002002360204200020013602000b2001017f104322042003106620022004104e20002002360204200020013602000b160020032002107020002002360204200020013602000ba30101027f230041306b22052400200541286a41ef8408410f1063200541206a2005280228200528022c20042802081069200541186a200528022020052802242004290300106a200541106a2005280218200528021c200428020c106b200528021021042005280214210610431a20062003102f104e200541086a20042006200120021068200528020c21012000200528020836020020002001360204200541306a24000b7101017f230041206b22052400200541186a41fe8408410c1063200541106a2005280218200528021c20031069200541086a200528021020052802142004106b20052005280208200528020c200120021068200528020421012000200528020036020020002001360204200541206a24000b0d0010431a20002001102f104e0b0d002000200120022003108a010b0d0010431a20012000103d104e0b0f002000427f51047e10160520000b0b3001017e20002903082201427f51047e10160520010b20002802102000280218200028020020002802041045101710730b3b01027f230041106b220124002000101221022001410036020c2001200036020420012002410276360208200141046a1075103b200141106a24000b24002000290308107120002802102000280218200028020020002802041045101710121a0b7d01037f230041106b22012400200028020821032001410036020c200028020020034102742001410c6a4104106f450440200128020c21022000200341016a360208200241187420024180fe03714108747220024108764180fe037120024118767272102f200141106a24000f0b418a8508410b41ef83084111104c000b900202027f017e230041d0006b2202240020012903082204427f51047e10160520040b2001280210200128021820012802002001280204104521011017200110122103200241003602142002200136020c200220034102763602102002410c6a10752203101221012002413c6a41003a0000200241386a200136020020022003360234200220013602302002410036022c200241406b2002412c6a10772002280230200228022c460440200241206a2201200241c8006a2903003703002002200229034037031820022d003c044041dcdb08410036020041e0db0841003a00000b20002002290318370300200041086a2001290300370300200241d0006a24000f0b418a8508410b41958508410e104c000b3002017f017e2001418a8508410b103a2102200110be01210320002001103936020c20002002360208200020033703000b100010431a20002001280200103d104e0b0e0020014504402002200010700b0b810101057f230041106b220324001043102f210420012802001012210503402005200241046a22064f04402003410036020c200128020020022003410c6a4104106f1a200328020c220241187420024180fe03714108747220024108764180fe0371200241187672722004103f200621020c010b0b20002004104e200341106a24000b820101057f230041106b220324001043102f210420012802001012210503402005200241046a22064f04402003410036020c200128020020022003410c6a4104106f1a2004200328020c220241187420024180fe03714108747220024108764180fe03712002411876727210051a200621020c010b0b20002004104e200341106a24000b4d01027f230041206b22012400107d2102200141106a200041106a290300370300200141086a200041086a290300370300200120023602182001200029030037030020011072200141206a24000b0e01017f102a22004200100120000b4f01027f230041206b22022400107d2103200241106a200141106a290300370300200241086a200141086a2903003703002002200336021820022001290300370300200020021076200241206a24000b4d01027f230041206b22012400107d2102200141106a200041106a290300370300200141086a200041086a290300370300200120023602182001200029030037030020011034200141206a24000b7602057f017e230041106b22012400107d210220002802102103200028020421042000280200210520002903082206427f51047e10160520060b20032002200520041045210010172000101221022001410036020c2001200036020420012002410276360208200141046a1075102f200141106a24000b4701027f230041106b22022400104321032002420037030820022001ad42ff01834101200241086a10820120032002280200200228020410181a20002003104e200241106a24000b8f0202047f017e2003200142388620014280fe0383422886842001428080fc0783421886200142808080f80f834208868484200142088842808080f80f832001421888428080fc0783842001423888220820014228884280fe03838484843700000240200150044041b88d0821030c010b200204402001427f510440200341076a2103410121040c020b2008a7c022054107752106200541004821050b200641ff0171210603400240024020044108470440200320046a2d000022072006460d02200245200741077620054672450440200441016b220441094f0d020b200320046a2103410820046b21040c040b102c000b102c000b200441016a21040c000b000b20002004360204200020033602000ba30102037f017e230041106b22032400027f2002290300500440200128021021042003200128020020012802042002280208200228020c106d2003280200210520032802040c010b10472104200341086a2001280200200128020420012802102002106c20032802082105200328020c0b2102200129030821062000107d36021820002004360210200020063703082000200236020420002005360200200341106a24000b3f01017f1043210320002001290300370300200041106a200141106a290300370300200041086a200141086a290300370300200320021044200020033602180b5201027f230041106b22042400200441086a200028020820002802002205200110860120042802084101460440200428020c2000200120056a360200200441106a24000f0b2002200341a38508410f104c000b1f0020012002200310042201101f21022000200136020420002002453602000b4f01037f230041106b22022400200241086a200028020820002802002203200110860120022802084101460440200228020c2000200120036a360200200241106a24000f0b41a38508410f108801000b1a01017f41f185084116104d220220002001100f1a20021000000b1500417f200020011019220041004720004100481b0b0f00200020012003200210284100470b09002000200110051a0b0c00200020002001100220000b0c00200020002001101a20000b0c00200020002001101b20000b0a0020002000200110020b0c00200020002001106020000b1001017f102a220220002001100220020b1001017f102a220220002001101b20020b1001017f102a220220002001106020020b1901017f102a210241722001ad1001200220004172101e20020b0e01017f104322012000104420010b4c01027f230041106b22012400104321022001200041187420004180fe03714108747220004108764180fe03712000411876727236020c20022001410c6a4104100f1a200141106a240020020b840102047f017e230041206b22022400200241106a42003703002002420037030820014100200241086a22034110106f2002410036021c20032002411c6a22041098012105200320041099012106200241086a2002411c6a1098012103044041c38508411d1003000b2000200336020c2000200536020820002006370300200241206a24000b7401017f230041106b220224002002410036020c20022000411020012802002200200041046a2200109d012002410c6a410420022802002002280204105720012000360200200228020c2100200241106a2400200041187420004180fe03714108747220004108764180fe0371200041187672720ba80102017e017f230041106b220324002003420037030820032000411020012802002200200041086a2200109d01200341086a41082003280200200328020410572001200036020020032903082102200341106a2400200242388620024280fe0383422886842002428080fc0783421886200242808080f80f834208868484200242088842808080f80f832002421888428080fc07838420024228884280fe038320024238888484840b0f002000200120022003410c10f9010b0f002000200120022003410d10f9010b0f002000200120022003410910f9010b2f000240200320044d044020022004490d012000200420036b3602042000200120036a3602000f0b102c000b102c000bb40101037f230041106b22042400027f024020002d000845044020002802002205101222064190ce004b0d0141e0db082d00000d0141dcdb08200636020041e0db0841013a0000200441086a2006109f01200541002004280208200428020c106f1a200041013a00080b4101200120036a220041dcdb082802004b0d011a20042001200010a0012002200320042802002004280204105741000c010b200041003a00082005200120022003106f0b200441106a24000b3e01017f230041106b22022400200241086a41cc8d084190ce00200110d001200228020c21012000200228020836020020002001360204200241106a24000b32000240200120024d044020024190ce004d0d01102c000b102c000b2000200220016b3602042000200141cc8d086a3602000b1900200041feffffff0746044041e08508410d1003000b20000b4d01017f230041106b220124002000101241044604402001410036020c200041002001410c6a4104108a011a41feffffff072000200128020c41c58eb1a204461b21000b200141106a240020000b800101027f230041106b220324000240024020002d000404404190ce0041dcdb0828020022046b2002490d01200341086a2004200220046a220010a4012003280208200328020c20012002105741dcdb0820003602000c020b200028020020012002100f1a0c010b200010a501200028020020012002100f1a0b200341106a24000b3f01017f230041106b22032400200341086a2001200241cc8d084190ce00102b200328020c21012000200328020836020020002001360204200341106a24000b5801027f230041106b2201240020002d0004200041003a00040440200141086a410041dcdb0828020010a00120002802002001280208200128020c100f1a41dcdb08410036020041e0db0841003a00000b200141106a24000b0d002000416710201a416710120b0d002000102a220010201a20000b1200200010a6014504402000200110211a0b0b1200200010a6014504402000200110aa010b0b3801017f230041106b2202240020024200370308200220014100200241086a10820120002002280200200228020410b801200241106a24000b0a00200010a70110a2010bb90101047f230041206b22012400200010a701210210432104200210122100200141106a41003a00002001410c6a2000360200200120023602082001200036020420014100360200037f2000200346047f20012d0010044041dcdb08410036020041e0db0841003a00000b200141206a2400200405200110ad012100200110ae012102200110af0121032001200036021c20012003360218200120023602142004200141146a105920012802002103200128020421000c010b0b0b3302017f017e230041106b220124002001410036020c20002001410c6a2200410410b3012000410410b101200141106a2400a70b0900200041201087010b0c002000200010ad011087010b3a01017f230041106b22032400200341086a20014108200210d001200328020c21012000200328020836020020002001360204200341106a24000b3401017e02402001450d0003402001450d01200141016b210120003100002002420886842102200041016a21000c000b000b20020bfd0101067f230041306b22012400200010a701210210432104200210122100200141186a41003a0000200141146a2000360200200120023602102001200036020c20014100360208037f2000200346047f20012d0018044041dcdb08410036020041e0db0841003a00000b200141306a2400200405200141086a220210ad012103200210ae012105200210af01210641002100200141003a002f20022001412f6a410110b30102400240024020012d002f0e020201000b41ed8608410d108801000b410121000b200120003a002820012006360224200120053602202001200336021c20042001411c6a105520012802082103200128020c21000c010b0b0b2d00200041086a200028020020012002109e01044041a38508410f108801000b2000200028020020026a3602000b870101017f230041306b220224002002200136020820021035200220022d00043a00102002200228020036020c20022001101236021c200241003602182002200241086a3602140340200241206a200241146a10b50120022d002c410246450440200241206a2002410c6a10b6010c010b0b2000200228020c20022d001010b701200241306a24000bc50301077f230041d0006b22022400024020012802042204410d6a220820012802084d0440200128020020024200370035200242003703302802002004200241306a2203410d106f1a20024100360240200241286a20034100410410bf01200241406b220541042002280228200228022c105720022802402104200241c8006a41003a000020024200370340200241206a20034104410d10bf01200541092002280220200228022410572002410036024c200241186a20054100410410c001200241cc006a220741042002280218200228021c1057200228024c21032002410036024c200241106a20054104410810c00120074104200228021020022802141057200228024c2106200241003a004c200241086a20054108410910c001200741012002280208200228020c1057200020022d004c4100473a000c2000200641187420064180fe03714108747220064108764180fe0371200641187672723602082000200341187420034180fe03714108747220034108764180fe0371200341187672723602042000200441187420044180fe03714108747220044108764180fe037120044118767272360200200120083602040c010b200041023a000c0b200241d0006a24000b4d01017f230041106b220224002000280200200110bc012001200028020410bd01200041086a2802002001103e20022000410c6a2d00003a000f20012002410f6a410110a301200241106a24000b0d00200020012002103810211a0b0d00200020012002104d10211a0b870101017f230041306b220224002002200136020820021035200220022d00043a00102002200228020036020c20022001101236021c200241003602182002200241086a360214200241246a21010340200241206a200241146a10ba012002280220044020012002410c6a10bb010c010b0b2000200228020c20022d001010b701200241306a24000b890301067f230041406a22022400200020012802042203410c6a220620012802084d047f2001280200200241286a4100360200200242003703202802002003200241206a2203410c106f1a20024100360230200241186a20034100410410c101200241306a220541042002280218200228021c10572002280230210420024200370330200241106a20034104410c10c101200541082002280210200228021410572002410036023c200241086a20054100410410c2012002413c6a220741042002280208200228020c1057200228023c21032002410036023c200220054104410810c20120074104200228020020022802041057200228023c21052000410c6a200441187420044180fe03714108747220044108764180fe0371200441187672723602002000200341187420034180fe03714108747220034108764180fe03712003411876727236020420012006360204200041086a200541187420054180fe03714108747220054108764180fe03712005411876727236020041010541000b360200200241406b24000b1f002000280208200110bc012001200028020010bd0120002802042001103e0b4601017f230041106b220224002002200041187420004180fe03714108747220004108764180fe03712000411876727236020c20012002410c6a410410a301200241106a24000b810101037f230041106b220224000240024020002d000404402001101222044190ce0041dcdb0828020022036b4b0d01200241086a2003200320046a220010a401200141002002280208200228020c106f1a41dcdb0820003602000c020b20002802002001108b010c010b200010a50120002802002001108b010b200241106a24000b3802017f017e230041106b22012400200142003703082000200141086a22004108418a8508410b10c5012000410810b101200141106a24000b0f002000200120022003410d10f8010b0f002000200120022003410910f8010b0f002000200120022003410c10f8010b0f002000200120022003410810f8010b800201057f230041206b2202240020002001280204220341086a220520012802084d047f2001280200200242003703102802002003200241106a22034108106f1a2002410036021c200241086a20034100410410c2012002411c6a220641042002280208200228020c1057200228021c21042002410036021c200220034104410810c20120064104200228020020022802041057200228021c21032000200441187420044180fe03714108747220044108764180fe03712004411876727236020420012005360204200041086a200341187420034180fe03714108747220034108764180fe03712003411876727236020041010541000b360200200241206a24000b8a0101047f230041106b220324002001280204220241046a220420012802084b047f41000520012802002003410036020c28020020022003410c6a4104106f1a200328020c210220012004360204200241187420024180fe03714108747220024108764180fe037120024118767272210241010b21012000200236020420002001360200200341106a24000b3000200041086a200028020020012002109e0104402003200441a38508410f104c000b2000200028020020026a3602000b7801017f230041106b220224002002200042388620004280fe0383422886842000428080fc0783421886200042808080f80f834208868484200042088842808080f80f832000421888428080fc07838420004228884280fe038320004238888484843703082001200241086a410810a301200241106a24000bd60101067f230041406a2200240010c801105c2101200010c901105c3602082000104736020c200041286a22022001103241f7800841101033200028022c2201200041086a106420012000410c6a1064200041206a2201200041386a2203290300370300200041186a2204200041306a2205290300370300200020002903283703102000200041106a107c360204200210c901105c103241f5810841181033200028022c200041046a1078200120032903003703002004200529030037030020002000290328370310200041106a107c200041406b24000b0a00419588084112104d0b0a00418188084114104d0ba90302057f017e23004180016b2202240010cb0110ab012103200128020c210420012903002107200128020821010240200341feffffff07460440200141feffffff07460d01200110a101210120022004360214200220073703082002200136021010cc01105c2103200410292104200241e0006a22012003103241a18008410a1033200241406b22032001200241086a1084012001200310cd01200110344200210741feffffff0721010b200241e0006a2000103241c081084112103320022802641a200241286a2200200241f0006a2205290300370300200241206a2203200241e8006a2206290300370300200220022903603703180240200141feffffff074704402005200029030037030020062003290300370300200220022903183703602002107d360278200110a10121002002200436023c2002200737033020022000360238200241406b200241e0006a200241306a1083010c010b200241d0006a2000290300370300200241c8006a200329030037030020022002290318370340200220043602580b200241e0006a200241406b107620024180016a24000f0b41ca8808411f1041000b0a0041e88c084122104d0b0a0041fa8608411d104d0bff0202037f027e230041d0006b22022400200241306a2204200141106a290300370300200241286a2203200141086a290300370300200220012903003703202002107d36023802400240024002402001280218220110650e020102000b10472103200241086a2002280220200228022420042001106220022903082105200229032821062000107d3602182000200336021020002006370308200020053703000c020b20002002290320370300200041186a200241386a290300370300200041106a2004290300370300200041086a20032903003703000c010b200241406b2001109701027f200229034050044020022802302101200241106a200228022020022802242002280248200228024c106d2002280210210320022802140c010b10472101200241186a200228022020022802242002280230200241406b106c20022802182103200228021c0b2104200229032821052000107d360218200020013602102000200537030820002004360204200020033602000b200241d0006a24000b0d002000106141ff017141014b0b17002000280200200128020010890141ff017141ff01460b3b01017f230041106b22042400200441086a4100200320012002102b200428020c21012000200428020836020020002001360204200441106a24000b0a0041bd8808410d104d0b0a0041f28708410f104d0b0a0041dd87084115104d0b0a0041a788084116104d0b1901017f419787084116104d210120002802002001104020010b1901017f41ad87084118104d210120002802002001104020010b0a0041c587084118104d0b0a00418f8c08411d104d0b0a0041ac8c08411d104d0b0a0041c98c08411f104d0ba705020d7f027e230041406a220024001022410a105a410041bd8808410d105021094101104b210241024195880841121050210a410341818808411410502105410441f28708410f1050210641051011210d41061011210e410710582107410810512108410941fa8608411d10502104200020083602102000200736020c2005102f1032210141e68108410f104d21031043210b107d210c10162001200c2003200b10452101101720011012210320004100360230200020013602282000200341027636022c200041286a22031075102f10a201210120032004102f102f103241ab8008411510332003108001210302400240200141feffffff074704402001102f10a101200210300d0141e9880841d1001041000b200220031030450d010b10cc01200410a80110d901200310a801024010cb01220410a6010d00200141feffffff074704402004200110211a0c010b200441ed8508410410b8010b10d101200910a80110d401200210a80110c801200a10a80110c9012005102f10a80110d801200041286a22012005103241b68108410a1033200110800110a80110d2012006102f10a80110da0120012006103241868308410f1033200110800110a80120002007101236021c2000410036021820002000410c6a36021403400240200041286a200041146a10c301200028022845044020002008101236021c200041003602182000200041106a3602140340200041286a200041146a10c3012000280228450d022000200028023022013602242000200028022c360220200041206a10d501220210a6010d002002200110b4010c000b000b2000200028023022013602242000200028022c360220200041206a10d601220210a6010d012002200110b9010c010b0b10d301200d10a90110d701200e10a901200041406b24000f0b41ba890841c8001041000b080010224100105a0bc70101057f230041306b220024004100105a02400240104610d101105c10300440104610d101105c1030450d012000104a220136020810d40110a701210210c901105c2103200020011012360214200041003602102000200041086a36020c200041206a210103400240200041186a2000410c6a10672000290318500d00200028022c200028022820021030450d0410ce01450d042003102f200110ca010c010b0b200041306a24000f0b41828a0841161041000b41828a0841161041000b41988a08410d1041000bc70702097f017e23004180016b2200240010224101105a2000104f36022c10d101105c210102400240024010462207200110300440200010c901105c2201360234200041e0006a22022001102f1032418d82084118103320002802642000412c6a1078200041d8006a2201200041f0006a2206290300370300200041d0006a2203200041e8006a220429030037030020002000290360370348200041c8006a2205107c2108200210c801105c103241e18008410a103320002802642202200041346a10642002410020081079200120062903003703002003200429030037030020002000290360370348200041386a2005107e200028024410ce01450d0120002802341032210141a582084106104d21041043220341012000107910432202200041386a1044200020013602702000427f37036820002003360264200020043602602000107d22053602780240024002400240200210650e020200010b200041c8006a2002109701027f2000290348500440200041186a2004200320002802502000280254106d20002802182104200028021c0c010b1047200041206a200420032001200041c8006a106c20002802202104210120002802240b2103107d21050c010b10472101200041106a20042003200620021062200029036821092000280214210320002802102104107d21052009427f520d010b101621090b2009200120052004200310452101101720011012210220004100360250200020013602482000200241027636024c200041c8006a1075220210122101200041f0006a41003a0000200041ec006a2001360200200020023602682000200136026420004100360260200041e0006a2201418a8508410b103a10a2012102200110be01210920011039210120002802642000280260470d0220002d0070044041dcdb08410036020041e0db0841003a00000b0240200241feffffff07470440200210a10121030c010b10d90110a701210310cc01105c200110291031420021090b200110ce01450d03200720032009200110422000200136026c20002003360268200020093703602000200041e0006a1095012201360230200041086a1035200020002d000c3a003c200020002802083602382000200110123602502000410036024c2000200041306a3602480340200041e0006a200041c8006a106720002903605045044020002802742000280270200041386a2201103e2000290368200110c6012001103c0c010b0b200028023820002d003c103720004180016a24000f0b41828a0841161041000b41e78a08411f1041000b418a8508410b41958508410e104c000b41868b08411a1041000bf31d02167f027e230041a0026b2200240010224100105a10c801105c2101200010c901105c2214102f1096013602f001200010433602a00120004180026a22092001103241eb8008410c10332000280284022201410010810120014101108101200141001081012001200041f0016a2211107b2001200041a0016a2207107b200041e0016a220520004190026a2204290300370300200041d8016a220220004188026a220329030037030020002000290380023703d001200041d0016a2206107f10d201105c210120002014102f1096013602f001200010433602a00120092001103241eb8008410c10332000280284022201410010810120012011107b20012007107b2001410120001079200520042903003703002002200329030037030020002000290380023703d0012006107f102a2203102a22061023200610ce01044010cc01105c20061029103110d90110a70121012000200636028c0220004200370380022000200136028802200320004180026a10440b200020033602900102400240024020031065044010d40110a701210e107d210d2000200028029001101236029c012000410036029801200020004190016a3602940120004190026a210a200041c0016a210f200041a8016a21150340200041a0016a20004194016a106720002903a00150044042808090bbbad6adf00d102e2101200d10d301105f102e1092012001108d012205200d10d701105f102e1092012001108d012206109101200d10890141ff01714102490d05200d200510930120061090012102200e102f210120002002102936028c0220004200370380022000200136028802201420004180026a10ca01200e102f2101200510ce010440104620014200200510420b200610ce0104401048200e4200200610420b104321041043102f2106200141feffffff07460d032001200610400c040b200f201541086a290300370300200020152903003703b801200f10d60110ac012112200f10d50110b2012113200f280200210c20002802c401210420002903b801211620121012210120131012410d6e2001410c6e6a21114100210103400240024020012011470440200141016a2106410021022012101221050240024003402002410c6a220320054b0d0120004188026a2209410036020020004200370380022012200220004180026a2202410c108a011a200041003602d00120004188016a20024100410410c101200041d0016a22074104200028028801200028028c01105720002802d0012108200042003703d00120004180016a20024104410c10c101200741082000280280012000280284011057200041003602f001200041f8006a20074100410410c201200041f0016a220241042000280278200028027c105720002802f001210b200041003602f001200041f0006a20074104410810c2012002410420002802702000280274105720032102200841187420084180fe03714108747220084108764180fe0371200841187672722001470d000b20002802f0012103200b411874200b4180fe037141087472200b4108764180fe0371200b4118767272102f2101200341187420034180fe03714108747220034108764180fe0371200341187672722207102f21054101102d20004180026a22032001103241d986084114103320002802840222012005106e20011070200041e0016a2202200a290300370300200041d8016a2201200929030037030020002000290380023703d001104321052000200436028c022000200c360288022000201637038002200520031044200a200229030037030020092001290300370300200020002903d001370380022000107d360298020240024002400240200510650e020102000b10472101200041e8006a200028028002200028028402200a200510622000290368211720002903880221162000107d3602e801200020013602e001200020163703d801200020173703d0010c020b200041e8016a20004198026a2903003703002002200a2903003703002001200929030037030020002000290380023703d0010c010b200041f0016a22012005109701200041d0016a20004180026a20011083010b20004180026a200041d0016a1076200028028802220c20071030450d01200028028c0221042000290380022116200621010c050b4100210220131012210503402002410d6a220320054b0d03200042003700850220004200370380022013200220004180026a2202410d108a011a200041003602d001200041e0006a20024100410410bf01200041d0016a2208410420002802602000280264105720002802d0012109200041d8016a220b41003a0000200042003703d001200041d8006a20024104410d10bf01200841092000280258200028025c1057200041003602f001200041d0006a20084100410410c001200041f0016a2202410420002802502000280254105720002802f0012110200041003602f001200041c8006a20084104410810c001200241042000280248200028024c105720002802f0012107200041003a00f001200041406b20084108410910c0012002410120002802402000280244105720032102200941187420094180fe03714108747220094108764180fe0371200941187672722001470d000b20002d00f001200741187420074180fe03714108747220074108764180fe0371200741187672722108200c102f2109200410292107201041187420104180fe03714108747220104108764180fe037120104118767272102f21054504404101102d20004180026a22012005103241a88608410810332000280284021070200041e0016a2202200a290300370300200b20004188026a220329030037030020002000290380023703d001104321042000200736028c0220002009360288022000201637038002200420011044200a20022903003703002003200b290300370300200020002903d001370380022000107d360298020240024002400240200410650e020102000b10472101200041106a200028028002200028028402200a200410622000290310211720002903880221162000107d3602e801200020013602e001200020163703d801200020173703d0010c020b200041e8016a20004198026a2903003703002002200a290300370300200b200329030037030020002000290380023703d0010c010b200041f0016a2004109701027f20002903f0015004402000280290022103200041186a20002802800220002802840220002802f80120002802fc01106d200028021c210220002802180c010b10472103200041206a200028028002200028028402200028029002200041f0016a106c2000280224210220002802200b210120002903880221162000107d3602e801200020033602e001200020163703d801200020023602d401200020013602d0010b200041d0016a107221032008102f21012000200336028c022000420037038002200020013602880220004180026a10950121010c040b2008102f21044101102d20051032210341a886084108104d2101104322052004106e20051070104321042000200736028c0220002009360288022000201637038002200420004180026a104420002003360290022000427f37038802200020053602840220002001360280022000107d36029802027f027e024002400240200410650e020102000b10472102200041286a200028028002200028028402200a20041062200028022c2103200028022821012000290388020c020b20002802900221022000290388022116200028028402210320002802800221012000280298020c020b200041d0016a2004109701027f20002903d0015004402000280290022102200041306a20002802800220002802840220002802d80120002802dc01106d2000280234210320002802300c010b10472102200041386a200028028002200028028402200028029002200041d0016a106c200028023c210320002802380b21012000290388020b2116107d0b21042016427f51047e10160520160b200220042001200310452103101741002102200310122101200041003602f801200020033602f001200020014102763602f401200041f0016a1075102f210410432101200410122103200041003a0090022000200336028c0220002004360288022000200336028402200041003602800203402002200346044020002d009002450d0541dcdb08410036020041e0db0841003a00000c0505200041d0016a220320004180026a1077200120031044200028028002210220002802840221030c010b000b000b41c0860841191041000b200c200e10300440200d2004108f010c040b41d48a0841131041000b200041086a1036200020002d000c3a008402200020002802083602800220004180026a220641808008412110a301230041406a220324002003410020036b41037122046a210720040440200321020340200241003a0000200241016a22022007490d000b0b200741c00020046b2205417c7122046a2102200441004a0440034020074100360200200741046a22072002490d000b0b200541037122040440200220046a21040340200241003a0000200241016a22022004490d000b0b20062003027f200104402001ad2116413f2101024003402016500d012001413f4d0440200120036a20162016420a802216420a7e7da74130723a0000200141016b21010c010b0b102c000b200141016a0c010b200341303a003f413f0b22016a41c00020016b10a301200341406b240020002802800220002d00840210381000000b200020013602cc01107d2102107d21042000200110123602d801200041003602d4012000200041cc016a3602d00102400340024020004180026a200041d0016a1067200029038002500d002000280294022105200221032000280290022201200c103045044020042103200120081030450d030b20032005108f010c010b0b2008102f210c42002116200621010c010b0b0b4187860841211041000b41a58a0841151041000b200041808080203602d0012006200041d0016a4104100f1a200641ed85084104100f1a0b200042003703d0012006200041d0016a22034108100f1a20052006103f20042006104e10c70110432201418a8d084108104d104e20021043102f2202103f2002103f200120021024200020043602d00120002004101236028802200041003602840220002003360280020340200020004180026a10c40120002802000440200028020410071a0c010b0b200041a0026a24000f0b41ba8a08411a1041000b0d0010224100105a10c70110250b0d0010224100105a10d101105b0b0d0010224100105a10d401105d0b0d0010224100105a10d801105d0b2a01017f10224100105a10cb0110ab01220041feffffff07470440200010071a0f0b41ed8508410410260b0d0010224100105a10da01105d0b0d0010224100105a10c801105b0b0d0010224100105a10c901105b0b0d0010224100105a10cc01105b0b0d0010224100105a10d901105d0b0d0010224100105a10d201105b0ba10101027f230041406a2200240010224101105a20004100104b3602142000200041146a10d60110ac012201360218200041086a1035200020002d000c3a00202000200028020836021c20002001101236022c200041003602282000200041186a360224200041346a21010340200041306a200041246a10ba012000280230044020012000411c6a10bb010c010b0b200028021c20002d00201037200041406b24000ba00101027f230041406a2200240010224101105a20004100104b3602142000200041146a10d50110b2012201360218200041086a1035200020002d000c3a00202000200028020836021c20002001101236022c200041003602282000200041186a3602240340200041306a200041246a10b50120002d003c4102470440200041306a2000411c6a10b6010c010b0b200028021c20002d00201037200041406b24000b0d0010224100105a10d301105e0b0d0010224100105a10d701105e0be30302057f027e23004190016b2200240010494100105a2000104a2201360214024020011065410146044020011012210120004100360234200020013602302000410036022c2000200041146a3602282000413c6a2102200041f4006a2103200041f8006a21010340200041f0006a200041286a10672000290370500d02200041e0006a200141086a290300220537030020002001290300220637035820002000280234220441016a360234200341086a200537020020032006370200200041406b2001290200370300200041c8006a20004180016a280200360200200020002902703703382004450440200041206a200241086a290200370300200020022902003703180c010b0b102c000b41b3830841221003000b200041086a2201200041206a2903003703002000200029031837030010da0110a701210220012802002002103045044041988a08410d1041000b10d201105c21022000104336021820001043360228200041f0006a22012002103241a783084105103320002802742202200041186a107b2002200041286a107a200041e8006a20004180016a290300370300200041e0006a200041f8006a29030037030020002000290370370358200041386a2202200041d8006a20001084012001200210cd012001107420004190016a24000b8c0101027f230041406a2200240010494100105a10d201105c21012000104336020020001043360204200041086a200110324195830841121033200028020c22012000107b2001200041046a107a200041306a200041186a290300370300200041286a200041106a290300370300200020002903083703202000107d360238200041206a1074200041406b24000bff0102057f017e230041306b22002400102210494101105a2000104f36021010d201105c20001043360214200010433602181032210241ac83084107104d210310432201200041106a10782001200041146a107b2001200041186a107a107d210410162002200420032001104521011017200110122102200041003602242000200136021c200020024102763602202000411c6a107521012000420037032820011012220241094904400240200041086a200041286a200210b0012001410020002802082201200028020c2202108a011a2001200210b10122054280808080105a0d0020051014200041306a24000f0b0b418a8508410b41958508410e104c000b980302057f017e230041e0006b220024001022104941e4db08101336020041e4db08280200410048044041ef830841111003000b2000410036023810432103200041386a22042802002101034041e4db0828020020014a04402004200141016a220236020020032001104b104e200221010c010b0b2003210141e4db0828020020002802384a04404180840841121003000b2000200136021c200410d201105c103241f98208410d103320002001101236025c2000410036025820002000411c6a360254200028023c21010340200041106a200041d4006a10c4012000280210044020012000280214106e0c010b0b200041286a200041406b290300370300200041306a200041c8006a29030037030020002000290338370320200041386a200041206a107e02402000280244220110ce01450440200028024021020c010b1046200028024022024200200110420b2000290338200041086a1035200020002d000c3a003c200020002802083602382002200041386a2202103e200210c60120012002103c200028023820002d003c1037200041e0006a24000b3101017e102210494101105a41001011220042818090bbbad6adf00d5a044041ef8b0841201041000b10d701200010aa010b3101017e102210494101105a41001011220042818090bbbad6adf00d5a044041d28b08411d1041000b10d301200010aa010be30101037f230041306b22002400102210494102105a410010582101200041011051220236020c20002001360208200020011012360218200041003602142000200041086a36021003402000411c6a200041106a10c301200028021c044020002000280224220136022c20002000280220360228200041286a10d601200110b9010c01052000200210123602182000410036021420002000410c6a36021003402000411c6a200041106a10c301200028021c044020002000280224220136022c20002000280220360228200041286a10d501200110b4010c010b0b200041306a24000b0b0baa07020b7f017e230041306b2200240010224100105a10c901105c2209102f1032210141d281084114104d210210432106107d21071016200120072002200610452101101720011012210220004100360210200020013602082000200241027636020c200041086a1075220210122101200041286a41003a0000200041246a2001360200200020023602202000200136021c200041003602180240027f024002402001450d00024002400240200041186a418a8508410b105441ff01710e020201000b418a8508410b41ed8608410d104c000b41012103200041186a418a8508410b105321010b200028021c2000280218470d0320002d0028044041dcdb08410036020041e0db0841003a00000b2003450d00200041186a22042001102f103241e482084115103320002004107c220336020020042001102f103241b28208410b1033200041186a107c42be8a860f102e108e01210620042001102f103241c98208410d1033200041186a107c200310920142be8a860f102e108e01410a102d4112109401108d01210720042001102f103241bd8208410c1033200041186a107c410a102d41121094012003109001108e0142be8a860f102e108e01410a102d4112109401108d01210a20042009102f2202102f103241878108410f10332000200041186a107c220536021420042002102f103241ab820841071033200041186a107c210820042002103241a6810841101033200041186a107c2102200020082005109101200210900136020820042001103241d68208410e1033200028021c2201200041146a10782001200041086a107820002802282102200028021821052000290320107d21081071200220082005200110452101101720002001107336020442808090bbbad6adf00d102e21022000107d360218200041046a200410cf012105107d220120050d021a2001200028020410890141016a41ff017141014d0440200041046a200010cf010d02200028020021030b20002802042003109301200a108e012101410a102d4112109401200028020010900121032006200210920120072002109201108c0120012002108e012003108d01108c010c020b41a08b0841321041000b2000280204200710920121012006200210920120012002108e012000280200108d01108c010b2101200041186a22032009103241968108411010332003107c2102410a102d411210940121032000280204200110920120032002109301108e0120034103109401108d011025200041306a24000f0b418a8508410b41958508410e104c000b0300010b3c01017f230041106b22052400200541086a2001200420022003109d01200528020c21012000200528020836020020002001360204200541106a24000b3b01017f230041106b22052400200541086a2002200320012004102b200528020c21012000200528020836020020002001360204200541106a24000b0bda0d0200418080080bc60d4e6f2073776170206f7065726174696f6e20666f756e6420617420696e64657820756e7772617045676c646765745772617070656445676c64546f6b656e49647772617045676c64726563697069656e742061646472657373206e6f7420736574657869744d61726b6574636c61696d526577617264736765744163636f756e74546f6b656e73676574546f74616c426f72726f777367657452657365727665466163746f72676574546f74616c5265736572766573676574546f6b656e49646d696e74416e64456e7465724d61726b6574676574496e746572657374526174654d6f64656c676574556e6465726c79696e674964746f6b656e73546f556e6465726c79696e67416d6f756e74756e6465726c79696e67416d6f756e74546f546f6b656e7372656465656d6765744361736867657442617365526174656765744c617374536c6f70656765744669727374536c6f70656765745574696c697a6174696f6e6765744f7074696d616c5574696c697a6174696f6e636c61696d4d756c7469706c656765745374616b65546f6b656e4964726562616c616e6365506f7274666f6c696f7374616b65756e7374616b65696e636f7272656374206e756d626572206f662045534454207472616e7366657273617267756d656e74206465636f6465206572726f722028293a20746f6f2066657720617267756d656e7473746f6f206d616e7920617267756d656e747377726f6e67206e756d626572206f6620617267756d656e747363616e6e6f74207375627472616374206265636175736520726573756c7420776f756c64206265206e656761746976654d756c7469455344544e46545472616e73666572455344544e46545472616e73666572455344545472616e7366657273796e6320726573756c74696e70757420746f6f206c6f6e67696e70757420746f6f2073686f72746361737420746f20693634206572726f724d616e6167656456656320696e646578206f7574206f662072616e67654553445420657870656374656445474c4473746f72616765206465636f6465206572726f723a20756e6b6e6f776e20726563656976656420746f6b656e206166746572207377617065786368616e6765626164206172726179206c656e67746877726f6e672072657475726e6564207377617020746f6b656e73776170546f6b656e734669786564496e707574696e76616c69642076616c7565777261707065645f65676c645f636f6e74726163745f61646472657373636f6d706f756e645f617368737761705f7377617073636f6d706f756e645f7865786368616e67655f7377617073706572666f726d616e63655f666565735f70657263656e74636f6d706f756e645f666565735f70657263656e74626f6f737465725f616464726573736d6f6e65795f6d61726b65745f61646472657373636f6e74726f6c6c65725f6164647265737361737365745f746f6b656e5f6964656e7469666965727661756c745f616464726573737061796d656e742073686f756c6420626520616e204553445420746f6b656e54686520617373657420746f6b656e206964656e74696669657220616e6420746865206d6f6e6579206d61726b657420756e6465726c79696e67206964656e74696669657220646f6e2774206d617463685768656e20746172676574696e6720616e2045474c44206d61726b65742074686520617373657420746f6b656e206964656e7469666965722073686f756c64206265205745474c4443616c6c65722073686f756c64206265207661756c7477726f6e67207061796d656e746e6f2072657761726420746f20636f6d706f756e646e6f206c65667420616d6f756e7420746f20636f6d706f756e6477726f6e67207377617070656420746f6b656e6e6f2065786974206d61726b6574207061796d656e742072656365697665646e6f2072656465656d207061796d656e742072656365697665644e6f20696e7465726573742072617465206d6f64656c2070726573656e74206f6e20746865206d6f6e6579206d61726b65746e657720636f6d706f756e6420666565732065786365656420313030256e657720706572666f726d616e636520666565732065786365656420313030256d6f6e65795f6d61726b65745f746f6b656e5f6964656e746966696572777261707065645f65676c645f746f6b656e5f6964656e746966696572626f6f737465725f7374616b65645f746f6b656e5f6964656e7469666965726d6f6e65795f6d61726b65745f756e6465726c79696e675f6964656e746966696572636f6d706f756e64456e64706f696e742063616e206f6e6c792062652063616c6c6564206279206f776e6572000070616e6963206f636375727265640041c88d080b049cffffff@0500@0100@0000000000000000000000000000000000000000000000000000000000000000@5745474c442d613238633539@00000000000000000500a3b666902d5f4bbf0ff93748fb915aeb43124cbf6509@0000000000000000050032de4f40f17a2f41c4e40c21f596e36a846994e36509@00000000000000000500f8836686f7c6c0f13d7275151b78f59f8f2f729a6509@@@@@000000000000000005000b1e5b244325095849f4e37134661d5bfdcd925e7ceb",
+      "signature": "edf0ec99b6f60414fa5e36d40cfb1d0075d01fd7c4ad7ba59bbe62b8b48eb892beb0c18bba203ff32b83827c3953847b190cdc89a4806f4615565dc2b3b5940f",
+      "sourceShard": 1,
+      "destinationShard": 1,
+      "blockNonce": 2127577,
+      "blockHash": "e3aea17b5345b45f61b233834d3b4ba0ac6f2b7d53eb3f1b1cf2bf0534ba567f",
+      "notarizedAtSourceInMetaNonce": 2129029,
+      "NotarizedAtSourceInMetaHash": "73ee8458f55bf5c9ea4a9974c0c838ced51a236c2b13238761f444598f40575e",
+      "notarizedAtDestinationInMetaNonce": 2129029,
+      "notarizedAtDestinationInMetaHash": "73ee8458f55bf5c9ea4a9974c0c838ced51a236c2b13238761f444598f40575e",
+      "miniblockType": "TxBlock",
+      "miniblockHash": "cc7e81e68269c2c633daf997fd2d52fc82d8ba3bb699d7e75250008bd9b7aa29",
+      "hyperblockNonce": 2129029,
+      "hyperblockHash": "73ee8458f55bf5c9ea4a9974c0c838ced51a236c2b13238761f444598f40575e",
+      "timestamp": 1707144290,
+      "status": "success",
+      "operation": "scDeploy",
+      "initiallyPaidFee": "82333950000000000",
+      "chainID": "D",
+      "version": 1,
+      "options": 0
+    }
+  },
+  "error": "",
+  "code": "successful"
+}
+        "#;
+
+    let tx_on_network: TransactionOnNetwork = serde_json::from_str::<TransactionInfo>(data)
+        .unwrap()
+        .data
+        .unwrap()
+        .transaction;
+    let tx_response = TxResponse::from_network_tx(tx_on_network);
+    let opt_address = tx_response.new_deployed_address.map(|e| {
+        multiversx_sdk::data::address::Address::from_bytes(*e.as_array())
+            .to_bech32_string()
+            .unwrap()
+    });
+
+    let expected =
+        Some("erd1qqqqqqqqqqqqqpgqwpdf84ggxzqzmr2zmw959q4nlf9nz562q33sak25ze".to_string());
+
+    assert_eq!(opt_address, expected)
+}
+
+#[test]
+fn test_deployed_address_should_be_none_if_not_a_sc_deployment_tx() {
+    let data = r#"
+        {
+  "data": {
+    "transaction": {
+      "type": "normal",
+      "processingTypeOnSource": "BuiltInFunctionCall",
+      "processingTypeOnDestination": "SCInvoking",
+      "hash": "238ad6dbe75dab1d53caeb9cabd584aabc6fc113c849a983afef5a5e439ce9e5",
+      "nonce": 13,
+      "round": 2192628,
+      "epoch": 888,
+      "value": "0",
+      "receiver": "erd1qqqqqqqqqqqqqpgqydwpdrplefjlwp3sp9xmn3vevdxdelfkwmfsw6e5xw",
+      "sender": "erd179xw6t04ug48m74jzyw9zq028hv66jhqayelzpzvgds0ptnzmckq2jf07f",
+      "gasPrice": 1000000000,
+      "gasLimit": 20000000,
+      "data": "RVNEVFRyYW5zZmVyQDRmNTU1MjRmMmQ2NDM4MzEzNzMxNjZAMDI0NmQyZDBiNmI1ZjBANjI3NTc5QDFiYzE2ZDY3NGVjODAwMDA=",
+      "signature": "ce984b4d785ccc7aca4b1cdea57ddcd568a502209f81e6b5bc678e1dd52b78d764fe46ea3ff77b926eb9f70eb52ae8f3f2afa2e9d0efa82655e361641458b900",
+      "sourceShard": 0,
+      "destinationShard": 1,
+      "blockNonce": 2129490,
+      "blockHash": "0ab10909b27565c5b7b59e8e1ee4a68d7046f49225fcde4c12d4b1ea3f512b8a",
+      "notarizedAtSourceInMetaNonce": 2130938,
+      "NotarizedAtSourceInMetaHash": "0c545160fd37f09f0196505b9cd2e730596bcd99438978a5bb415b9e1be1849d",
+      "notarizedAtDestinationInMetaNonce": 2130942,
+      "notarizedAtDestinationInMetaHash": "1ddd6b7aeeff824b5d11f2936a6284e470fc5abe41e34a8df229b719dc1a537d",
+      "miniblockType": "TxBlock",
+      "miniblockHash": "dc8ae41e1ae321c0fccbeb807194d11ff6e0f4ed71163764d850f1daaa60bd22",
+      "hyperblockNonce": 2130942,
+      "hyperblockHash": "1ddd6b7aeeff824b5d11f2936a6284e470fc5abe41e34a8df229b719dc1a537d",
+      "timestamp": 1707155768,
+      "status": "success",
+      "tokens": [
+        "OURO-d8171f"
+      ],
+      "esdtValues": [
+        "640821212132848"
+      ],
+      "operation": "ESDTTransfer",
+      "function": "buy",
+      "initiallyPaidFee": "359390000000000",
+      "chainID": "D",
+      "version": 1,
+      "options": 0
+    }
+  },
+  "error": "",
+  "code": "successful"
+}
+        "#;
+
+    let tx_on_network: TransactionOnNetwork = serde_json::from_str::<TransactionInfo>(data)
+        .unwrap()
+        .data
+        .unwrap()
+        .transaction;
+    let tx_response = TxResponse::from_network_tx(tx_on_network);
+    let opt_address = tx_response.new_deployed_address;
+
+    let expected: Option<Address> = None;
+
+    assert_eq!(opt_address, expected)
+}
+
+#[test]
+fn test_with_tx_that_has_sc_result() {
+    // transaction data from the devnet, an artificial "10" result has been appended on the original result
+    let data = r#"
+            {
+              "data": {
+                "transaction": {
+                  "type": "normal",
+                  "processingTypeOnSource": "BuiltInFunctionCall",
+                  "processingTypeOnDestination": "SCInvoking",
+                  "hash": "d4058bd3c13db0b14832c7c58fe163db2f579ff6544380586b8a27d88b4a5070",
+                  "nonce": 30,
+                  "round": 7639115,
+                  "epoch": 6333,
+                  "value": "0",
+                  "receiver": "erd1qqqqqqqqqqqqqpgq5400a82at6ttplyrdhyn8kk9lhxaed5d0n4s9s77kz",
+                  "sender": "erd14r7m6drneg69jyxvxxnrsss6x5gg2cqqwreyhdwanj0fcza0ynnq5jmy4g",
+                  "gasPrice": 1000000000,
+                  "gasLimit": 25500000,
+                  "gasUsed": 15297149,
+                  "data": "RVNEVFRyYW5zZmVyQDQ4NTQ0ZDJkNjY2NTMxNjYzNjM5QDBkZTBiNmIzYTc2NDAwMDBANzM3NzYxNzA1NDZmNmI2NTZlNzM0NjY5Nzg2NTY0NDk2ZTcwNzU3NEA1NzQ1NDc0YzQ0MmQ2NDM3NjMzNjYyNjJAMDM3Yzc3OGZjY2U5YzU1Yg==",
+                  "signature": "e912fae4b7a9e51ddf316a5e82a0f457d453a62e3c17477f5d6175e1b33c5e92ddb187d65f54cf3131a0603321290279a0456c20778039f2ab09b54e33c60f0d",
+                  "sourceShard": 2,
+                  "destinationShard": 1,
+                  "blockNonce": 7585351,
+                  "blockHash": "e456f38f11fec78ed26d5fda068e912739dceedb2e5ce559bf17614b8386c039",
+                  "notarizedAtSourceInMetaNonce": 7601495,
+                  "NotarizedAtSourceInMetaHash": "e28c6011d4b3f73f3945cae70ff251e675dfea331a70077c5ab3310e3101af17",
+                  "notarizedAtDestinationInMetaNonce": 7601499,
+                  "notarizedAtDestinationInMetaHash": "333d4266614e981cc1c5654f85ef496038a8cddac46dfc0ad0b7c44c37ab489d",
+                  "miniblockType": "TxBlock",
+                  "miniblockHash": "13e041f32fde79ebf1abdcfe692e99516f9ec6778dcb917251b440daa7f1210a",
+                  "hyperblockNonce": 7601499,
+                  "hyperblockHash": "333d4266614e981cc1c5654f85ef496038a8cddac46dfc0ad0b7c44c37ab489d",
+                  "timestamp": 1694386290,
+                  "smartContractResults": [
+                    {
+                      "hash": "a23faa3c80bae0b968f007ff0fad3afdec05b4e71d749c3d583dec10c6eb05a2",
+                      "nonce": 0,
+                      "value": 0,
+                      "receiver": "erd14r7m6drneg69jyxvxxnrsss6x5gg2cqqwreyhdwanj0fcza0ynnq5jmy4g",
+                      "sender": "erd1qqqqqqqqqqqqqpgq5400a82at6ttplyrdhyn8kk9lhxaed5d0n4s9s77kz",
+                      "data": "ESDTTransfer@5745474c442d643763366262@03856446ff9a304b",
+                      "prevTxHash": "d4058bd3c13db0b14832c7c58fe163db2f579ff6544380586b8a27d88b4a5070",
+                      "originalTxHash": "d4058bd3c13db0b14832c7c58fe163db2f579ff6544380586b8a27d88b4a5070",
+                      "gasLimit": 0,
+                      "gasPrice": 1000000000,
+                      "callType": 0,
+                      "logs": {
+                        "address": "erd14r7m6drneg69jyxvxxnrsss6x5gg2cqqwreyhdwanj0fcza0ynnq5jmy4g",
+                        "events": [
+                          {
+                            "address": "erd1qqqqqqqqqqqqqpgq5400a82at6ttplyrdhyn8kk9lhxaed5d0n4s9s77kz",
+                            "identifier": "ESDTTransfer",
+                            "topics": [
+                              "V0VHTEQtZDdjNmJi",
+                              "",
+                              "A4VkRv+aMEs=",
+                              "qP29NHPKNFkQzDGmOEIaNRCFYABw8ku13ZyenAuvJOY="
+                            ],
+                            "data": null
+                          },
+                          {
+                            "address": "erd14r7m6drneg69jyxvxxnrsss6x5gg2cqqwreyhdwanj0fcza0ynnq5jmy4g",
+                            "identifier": "writeLog",
+                            "topics": [
+                              "AAAAAAAAAAAFAKVe/p1dXpaw/INtyTPaxf3N3LaNfOs="
+                            ],
+                            "data": "QDZmNmI="
+                          },
+                          {
+                            "address": "erd14r7m6drneg69jyxvxxnrsss6x5gg2cqqwreyhdwanj0fcza0ynnq5jmy4g",
+                            "identifier": "completedTxEvent",
+                            "topics": [
+                              "1AWL08E9sLFIMsfFj+Fj2y9Xn/ZUQ4BYa4on2ItKUHA="
+                            ],
+                            "data": null
+                          }
+                        ]
+                      },
+                      "tokens": [
+                        "WEGLD-d7c6bb"
+                      ],
+                      "esdtValues": [
+                        "253719210115084363"
+                      ],
+                      "operation": "ESDTTransfer"
+                    },
+                    {
+                      "hash": "b7b4d15917fd215399d8e772c3c4e732008baaedc2b8172f71c91708ba7523f0",
+                      "nonce": 31,
+                      "value": 102028510000000,
+                      "receiver": "erd14r7m6drneg69jyxvxxnrsss6x5gg2cqqwreyhdwanj0fcza0ynnq5jmy4g",
+                      "sender": "erd1qqqqqqqqqqqqqpgq5400a82at6ttplyrdhyn8kk9lhxaed5d0n4s9s77kz",
+                      "data": "@6f6b@0000000c5745474c442d64376336626200000000000000000000000803856446ff9a304b@10",
+                      "prevTxHash": "d4058bd3c13db0b14832c7c58fe163db2f579ff6544380586b8a27d88b4a5070",
+                      "originalTxHash": "d4058bd3c13db0b14832c7c58fe163db2f579ff6544380586b8a27d88b4a5070",
+                      "gasLimit": 0,
+                      "gasPrice": 1000000000,
+                      "callType": 0,
+                      "logs": {
+                        "address": "erd14r7m6drneg69jyxvxxnrsss6x5gg2cqqwreyhdwanj0fcza0ynnq5jmy4g",
+                        "events": [
+                          {
+                            "address": "erd14r7m6drneg69jyxvxxnrsss6x5gg2cqqwreyhdwanj0fcza0ynnq5jmy4g",
+                            "identifier": "completedTxEvent",
+                            "topics": [
+                              "1AWL08E9sLFIMsfFj+Fj2y9Xn/ZUQ4BYa4on2ItKUHA="
+                            ],
+                            "data": null
+                          }
+                        ]
+                      },
+                      "operation": "transfer",
+                      "isRefund": true
+                    },
+                    {
+                      "hash": "05a766ca05d2053d1c0fbeb1797116474a06c86402a3bfd6c132c9a24cfa1bb0",
+                      "nonce": 0,
+                      "value": 0,
+                      "receiver": "erd1qqqqqqqqqqqqqpgq5400a82at6ttplyrdhyn8kk9lhxaed5d0n4s9s77kz",
+                      "sender": "erd1qqqqqqqqqqqqqpgq5400a82at6ttplyrdhyn8kk9lhxaed5d0n4s9s77kz",
+                      "data": "swapTokensFixedInput@5745474c442d643763366262@037c778fcce9c55b",
+                      "prevTxHash": "d4058bd3c13db0b14832c7c58fe163db2f579ff6544380586b8a27d88b4a5070",
+                      "originalTxHash": "d4058bd3c13db0b14832c7c58fe163db2f579ff6544380586b8a27d88b4a5070",
+                      "gasLimit": 25050500,
+                      "gasPrice": 1000000000,
+                      "callType": 0,
+                      "operation": "transfer",
+                      "function": "swapTokensFixedInput"
+                    },
+                    {
+                      "hash": "4e639c80822d5d7780c8326d683fa9cd6d59649d14122dfabc5a96dda36da527",
+                      "nonce": 0,
+                      "value": 0,
+                      "receiver": "erd1qqqqqqqqqqqqqpgquu5rsa4ee6l4azz6vdu4hjp8z4p6tt8m0n4suht3dy",
+                      "sender": "erd1qqqqqqqqqqqqqpgq5400a82at6ttplyrdhyn8kk9lhxaed5d0n4s9s77kz",
+                      "data": "ESDTTransfer@5745474c442d643763366262@e7730d1ef1b0@737761704e6f466565416e64466f7277617264@4d45582d646332383963@0000000000000000000000000000000000000000000000000000000000000000",
+                      "prevTxHash": "d4058bd3c13db0b14832c7c58fe163db2f579ff6544380586b8a27d88b4a5070",
+                      "originalTxHash": "d4058bd3c13db0b14832c7c58fe163db2f579ff6544380586b8a27d88b4a5070",
+                      "gasLimit": 0,
+                      "gasPrice": 1000000000,
+                      "callType": 0,
+                      "tokens": [
+                        "WEGLD-d7c6bb"
+                      ],
+                      "esdtValues": [
+                        "254481327387056"
+                      ],
+                      "operation": "ESDTTransfer",
+                      "function": "swapNoFeeAndForward"
+                    }
+                  ],
+                  "logs": {
+                    "address": "erd1qqqqqqqqqqqqqpgq5400a82at6ttplyrdhyn8kk9lhxaed5d0n4s9s77kz",
+                    "events": [
+                      {
+                        "address": "erd14r7m6drneg69jyxvxxnrsss6x5gg2cqqwreyhdwanj0fcza0ynnq5jmy4g",
+                        "identifier": "ESDTTransfer",
+                        "topics": [
+                          "SFRNLWZlMWY2OQ==",
+                          "",
+                          "DeC2s6dkAAA=",
+                          "AAAAAAAAAAAFAKVe/p1dXpaw/INtyTPaxf3N3LaNfOs="
+                        ],
+                        "data": null
+                      },
+                      {
+                        "address": "erd1qqqqqqqqqqqqqpgq5400a82at6ttplyrdhyn8kk9lhxaed5d0n4s9s77kz",
+                        "identifier": "ESDTTransfer",
+                        "topics": [
+                          "V0VHTEQtZDdjNmJi",
+                          "",
+                          "53MNHvGw",
+                          "AAAAAAAAAAAFAOcoOHa5zr9eiFpjeVvIJxVDpaz7fOs="
+                        ],
+                        "data": null
+                      },
+                      {
+                        "address": "erd1qqqqqqqqqqqqqpgquu5rsa4ee6l4azz6vdu4hjp8z4p6tt8m0n4suht3dy",
+                        "identifier": "ESDTLocalBurn",
+                        "topics": [
+                          "TUVYLWRjMjg5Yw==",
+                          "",
+                          "AuMDPq1jy03x"
+                        ],
+                        "data": null
+                      },
+                      {
+                        "address": "erd1qqqqqqqqqqqqqpgquu5rsa4ee6l4azz6vdu4hjp8z4p6tt8m0n4suht3dy",
+                        "identifier": "swapNoFeeAndForward",
+                        "topics": [
+                          "c3dhcF9ub19mZWVfYW5kX2ZvcndhcmQ=",
+                          "TUVYLWRjMjg5Yw==",
+                          "AAAAAAAAAAAFAKVe/p1dXpaw/INtyTPaxf3N3LaNfOs=",
+                          "GL0="
+                        ],
+                        "data": "AAAAAAAAAAAFAKVe/p1dXpaw/INtyTPaxf3N3LaNfOsAAAAMV0VHTEQtZDdjNmJiAAAABudzDR7xsAAAAApNRVgtZGMyODljAAAACQLjAz6tY8tN8QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABzvkcAAAAAAAAYvQAAAABk/khy"
+                      },
+                      {
+                        "address": "erd1qqqqqqqqqqqqqpgq5400a82at6ttplyrdhyn8kk9lhxaed5d0n4s9s77kz",
+                        "identifier": "ESDTTransfer",
+                        "topics": [
+                          "V0VHTEQtZDdjNmJi",
+                          "",
+                          "A4VkRv+aMEs=",
+                          "qP29NHPKNFkQzDGmOEIaNRCFYABw8ku13ZyenAuvJOY="
+                        ],
+                        "data": null
+                      },
+                      {
+                        "address": "erd1qqqqqqqqqqqqqpgq5400a82at6ttplyrdhyn8kk9lhxaed5d0n4s9s77kz",
+                        "identifier": "swapTokensFixedInput",
+                        "topics": [
+                          "c3dhcA==",
+                          "SFRNLWZlMWY2OQ==",
+                          "V0VHTEQtZDdjNmJi",
+                          "qP29NHPKNFkQzDGmOEIaNRCFYABw8ku13ZyenAuvJOY=",
+                          "GL0="
+                        ],
+                        "data": "qP29NHPKNFkQzDGmOEIaNRCFYABw8ku13ZyenAuvJOYAAAAKSFRNLWZlMWY2OQAAAAgN4Lazp2QAAAAAAAxXRUdMRC1kN2M2YmIAAAAIA4VkRv+aMEsAAAAHA41+pMaAAAAAAAoofxtJRPkr8X9kAAAACgpOPCsHUu261HUAAAAAAHO+RwAAAAAAABi9AAAAAGT+SHI="
+                      }
+                    ]
+                  },
+                  "status": "success",
+                  "tokens": [
+                    "HTM-fe1f69"
+                  ],
+                  "esdtValues": [
+                    "1000000000000000000"
+                  ],
+                  "operation": "ESDTTransfer",
+                  "function": "swapTokensFixedInput",
+                  "initiallyPaidFee": "502005000000000",
+                  "fee": "399976490000000",
+                  "chainID": "D",
+                  "version": 1,
+                  "options": 0
+                }
+              },
+              "error": "",
+              "code": "successful"
+            }
+        "#;
+
+    let tx_on_network: TransactionOnNetwork = serde_json::from_str::<TransactionInfo>(data)
+        .unwrap()
+        .data
+        .unwrap()
+        .transaction;
+    let tx_response = TxResponse::from_network_tx(tx_on_network);
+
+    let expected: Vec<Vec<u8>> = vec![
+        hex::decode("0000000c5745474c442d64376336626200000000000000000000000803856446ff9a304b")
+            .unwrap(),
+        hex::decode("10").unwrap(),
+    ];
+
+    assert_eq!(tx_response.out, expected)
+}
+
+#[test]
+fn test_with_tx_that_has_no_sc_result() {
+    // transaction data from the devnet
+    let data = r#"
+            {
+              "data": {
+                "transaction": {
+                  "type": "normal",
+                  "processingTypeOnSource": "SCInvoking",
+                  "processingTypeOnDestination": "SCInvoking",
+                  "hash": "6afac3ec13c89cc56154d06efdb457a24f58361699eee00a48202a8f8adc8c8a",
+                  "nonce": 17,
+                  "round": 7548071,
+                  "epoch": 6257,
+                  "value": "0",
+                  "receiver": "erd1qqqqqqqqqqqqqpgq4nlkk7jwhqgp4r08lal46tqt70jdv0685u7qrr3l2d",
+                  "sender": "erd1uh67c2lkhyj4vh73akv7jky9sfgvus8awwcj64uju69mmfne5u7q299t7g",
+                  "gasPrice": 1000000000,
+                  "gasLimit": 600000000,
+                  "gasUsed": 600000000,
+                  "data": "cmV0dXJuVHdvVTY0",
+                  "signature": "f3a3ca96a78c90c9cf1b08541e1777010f0176a5e1e525e631155b2784932cbfd74c9168d03ba201fd5434d1a1b4789895ddade9883eca2ee9e0bce18468fb00",
+                  "sourceShard": 0,
+                  "destinationShard": 0,
+                  "blockNonce": 7502091,
+                  "blockHash": "5ec66c651cb1514cba200e7e80a4491880f0db678ce7631c397872e3842f0aa2",
+                  "notarizedAtSourceInMetaNonce": 7510505,
+                  "NotarizedAtSourceInMetaHash": "8410309ec5b988af79b4dcfb44fd4729d46874ebd796672c78e417e314409051",
+                  "notarizedAtDestinationInMetaNonce": 7510505,
+                  "notarizedAtDestinationInMetaHash": "8410309ec5b988af79b4dcfb44fd4729d46874ebd796672c78e417e314409051",
+                  "miniblockType": "TxBlock",
+                  "miniblockHash": "fb150e515449c9b658879ed06f256b429239cbe78ec2c2821deb4b283ff21554",
+                  "hyperblockNonce": 7510505,
+                  "hyperblockHash": "8410309ec5b988af79b4dcfb44fd4729d46874ebd796672c78e417e314409051",
+                  "timestamp": 1693840026,
+                  "logs": {
+                    "address": "erd1qqqqqqqqqqqqqpgq4nlkk7jwhqgp4r08lal46tqt70jdv0685u7qrr3l2d",
+                    "events": [
+                      {
+                        "address": "erd1qqqqqqqqqqqqqpgq4nlkk7jwhqgp4r08lal46tqt70jdv0685u7qrr3l2d",
+                        "identifier": "writeLog",
+                        "topics": [
+                          "5fXsK/a5JVZf0e2Z6ViFglDOQP1zsS1XkuaLvaZ5pzw=",
+                          "QHRvbyBtdWNoIGdhcyBwcm92aWRlZCBmb3IgcHJvY2Vzc2luZzogZ2FzIHByb3ZpZGVkID0gNTk5OTMyMDAwLCBnYXMgdXNlZCA9IDE4NDE2NjU="
+                        ],
+                        "data": "QDZmNmJAMGFAMDIxODcxMWEwMA=="
+                      },
+                      {
+                        "address": "erd1qqqqqqqqqqqqqpgq4nlkk7jwhqgp4r08lal46tqt70jdv0685u7qrr3l2d",
+                        "identifier": "completedTxEvent",
+                        "topics": [
+                          "avrD7BPInMVhVNBu/bRXok9YNhaZ7uAKSCAqj4rcjIo="
+                        ],
+                        "data": null
+                      }
+                    ]
+                  },
+                  "status": "success",
+                  "operation": "transfer",
+                  "function": "returnTwoU64",
+                  "initiallyPaidFee": "6067320000000000",
+                  "fee": "6067320000000000",
+                  "chainID": "D",
+                  "version": 1,
+                  "options": 0
+                }
+              },
+              "error": "",
+              "code": "successful"
+            }
+        "#;
+
+    let tx_on_network: TransactionOnNetwork = serde_json::from_str::<TransactionInfo>(data)
+        .unwrap()
+        .data
+        .unwrap()
+        .transaction;
+    let tx_response = TxResponse::from_network_tx(tx_on_network);
+
+    let expected: Vec<Vec<u8>> = vec![
+        hex::decode("0a").unwrap(),
+        hex::decode("0218711a00").unwrap(),
+    ];
+
+    assert_eq!(tx_response.out, expected)
+}
+
+#[test]
+fn test_with_multi_contract_same_shard_tx_that_has_no_sc_result() {
+    // transaction data from the devnet
+    // context : user -> A --call--> B, B returns a MultiValue2<u64, u64>, A returns the B's returned value
+    let data = r#"
+            {
+              "data": {
+                "transaction": {
+                  "type": "normal",
+                  "processingTypeOnSource": "SCInvoking",
+                  "processingTypeOnDestination": "SCInvoking",
+                  "hash": "e914857f1bfd003ba411bae372266703e5f706fa412c378feb37faa5e18c3d73",
+                  "nonce": 49,
+                  "round": 7646960,
+                  "epoch": 6339,
+                  "value": "0",
+                  "receiver": "erd1qqqqqqqqqqqqqpgqshqmekudxlxwp0d9j368etjamr5dw7k45u7qx40w6h",
+                  "sender": "erd1uh67c2lkhyj4vh73akv7jky9sfgvus8awwcj64uju69mmfne5u7q299t7g",
+                  "gasPrice": 1000000000,
+                  "gasLimit": 600000000,
+                  "gasUsed": 600000000,
+                  "data": "Y2FsbEFub3RoZXJDb250cmFjdFJldHVyblR3b1U2NEAwMDAwMDAwMDAwMDAwMDAwMDUwMEFDRkY2QjdBNEVCODEwMUE4REU3RkY3RjVEMkMwQkYzRTRENjNGNDdBNzND",
+                  "signature": "53cc6496647287d735bd7950f4ec79d7b51f884defda1d6d840d722b7d0d869900ccecc01602da7a7c717955e8d4ed0711b92acd980d64ed6eebd6eaed0c4608",
+                  "sourceShard": 0,
+                  "destinationShard": 0,
+                  "blockNonce": 7600794,
+                  "blockHash": "77eb0904e56d6dd596c0d72821cf33b326fde383e72903ca4df5c2f200b0ea75",
+                  "notarizedAtSourceInMetaNonce": 7609344,
+                  "NotarizedAtSourceInMetaHash": "12df3fe65cacde2c9742b9506ac2261d34f3c72d690301192fd8016430d51913",
+                  "notarizedAtDestinationInMetaNonce": 7609344,
+                  "notarizedAtDestinationInMetaHash": "12df3fe65cacde2c9742b9506ac2261d34f3c72d690301192fd8016430d51913",
+                  "miniblockType": "TxBlock",
+                  "miniblockHash": "03219ac7427f7511687f0768c722c759c1b1428b2664b44a0cbe2072154851ee",
+                  "hyperblockNonce": 7609344,
+                  "hyperblockHash": "12df3fe65cacde2c9742b9506ac2261d34f3c72d690301192fd8016430d51913",
+                  "timestamp": 1694433360,
+                  "logs": {
+                    "address": "erd1qqqqqqqqqqqqqpgqshqmekudxlxwp0d9j368etjamr5dw7k45u7qx40w6h",
+                    "events": [
+                      {
+                        "address": "erd1qqqqqqqqqqqqqpgqshqmekudxlxwp0d9j368etjamr5dw7k45u7qx40w6h",
+                        "identifier": "writeLog",
+                        "topics": [
+                          "5fXsK/a5JVZf0e2Z6ViFglDOQP1zsS1XkuaLvaZ5pzw=",
+                          "QHRvbyBtdWNoIGdhcyBwcm92aWRlZCBmb3IgcHJvY2Vzc2luZzogZ2FzIHByb3ZpZGVkID0gNTk5ODA2MDAwLCBnYXMgdXNlZCA9IDM4NDcyNDA="
+                        ],
+                        "data": "QDZmNmJAMGFAMDIxODcxMWEwMA=="
+                      },
+                      {
+                        "address": "erd1qqqqqqqqqqqqqpgqshqmekudxlxwp0d9j368etjamr5dw7k45u7qx40w6h",
+                        "identifier": "completedTxEvent",
+                        "topics": [
+                          "6RSFfxv9ADukEbrjciZnA+X3BvpBLDeP6zf6peGMPXM="
+                        ],
+                        "data": null
+                      }
+                    ]
+                  },
+                  "status": "success",
+                  "operation": "transfer",
+                  "function": "callAnotherContractReturnTwoU64",
+                  "initiallyPaidFee": "6192060000000000",
+                  "fee": "6192060000000000",
+                  "chainID": "D",
+                  "version": 2,
+                  "options": 0
+                }
+              },
+              "error": "",
+              "code": "successful"
+            }
+        "#;
+
+    let tx_on_network: TransactionOnNetwork = serde_json::from_str::<TransactionInfo>(data)
+        .unwrap()
+        .data
+        .unwrap()
+        .transaction;
+    let tx_response = TxResponse::from_network_tx(tx_on_network);
+
+    let expected: Vec<Vec<u8>> = vec![
+        hex::decode("0a").unwrap(),
+        hex::decode("0218711a00").unwrap(),
+    ];
+
+    assert_eq!(tx_response.out, expected)
+}
+
+#[test]
+fn test_with_multi_contract_cross_shard_tx_that_has_no_callback() {
+    // transaction data from the devnet
+    // context : user -> A --async call--> B, no callback
+    let data = r#"
+            {
+              "data": {
+                "transaction": {
+                  "type": "normal",
+                  "processingTypeOnSource": "SCInvoking",
+                  "processingTypeOnDestination": "SCInvoking",
+                  "hash": "4d50a055663dfee2479851684d7fb83cf00695b6f03f4dbbdf0f9232477cafc4",
+                  "nonce": 51,
+                  "round": 7647523,
+                  "epoch": 6340,
+                  "value": "0",
+                  "receiver": "erd1qqqqqqqqqqqqqpgqllqglpjdrz5kn3m0k9uf9hdqjmg3xdhk6r7se3wvlk",
+                  "sender": "erd1uh67c2lkhyj4vh73akv7jky9sfgvus8awwcj64uju69mmfne5u7q299t7g",
+                  "gasPrice": 1000000000,
+                  "gasLimit": 600000000,
+                  "gasUsed": 600000000,
+                  "data": "YXN5bmNDYWxsQW5vdGhlckNvbnRyYWN0UmV0dXJuVHdvVTY0Tm9DYWxsYmFja0AwMDAwMDAwMDAwMDAwMDAwMDUwMEFDRkY2QjdBNEVCODEwMUE4REU3RkY3RjVEMkMwQkYzRTRENjNGNDdBNzND",
+                  "signature": "0fc30cddaa8e5365662a14344e3434cbccf287f357be99b3ed4add182f64dded774ec0d095ab1589e7c6c07e00de3b7239efc96eb2e0e97b48c1ef87084cec01",
+                  "sourceShard": 0,
+                  "destinationShard": 1,
+                  "blockNonce": 7593758,
+                  "blockHash": "a828c0ca58ef1c8aff60e512ab59f18204f1915d4a6c8285cfceb1c5725b88e8",
+                  "notarizedAtSourceInMetaNonce": 7609903,
+                  "NotarizedAtSourceInMetaHash": "4e90fe45c2fdccd5cf6977c1422e5f4ffa41c4e9f31fb4a50c20455f87df1e99",
+                  "notarizedAtDestinationInMetaNonce": 7609907,
+                  "notarizedAtDestinationInMetaHash": "10b8666a44411c3babbe20af7154fb3d47efcb1cb10d955523ec68fece26e517",
+                  "miniblockType": "TxBlock",
+                  "miniblockHash": "4ff4bb1ac88911d617c9b0342aeb5158db78490c2fe414cad08adcc584a77be7",
+                  "hyperblockNonce": 7609907,
+                  "hyperblockHash": "10b8666a44411c3babbe20af7154fb3d47efcb1cb10d955523ec68fece26e517",
+                  "timestamp": 1694436738,
+                  "smartContractResults": [
+                    {
+                      "hash": "462b56a1530e6070dc7c15f755e51a97a6972c8cd7891f3be4635b93211890c5",
+                      "nonce": 0,
+                      "value": 0,
+                      "receiver": "erd1qqqqqqqqqqqqqpgqllqglpjdrz5kn3m0k9uf9hdqjmg3xdhk6r7se3wvlk",
+                      "sender": "erd1qqqqqqqqqqqqqpgq4nlkk7jwhqgp4r08lal46tqt70jdv0685u7qrr3l2d",
+                      "data": "@00@0a@0218711a00",
+                      "prevTxHash": "41d56fdacf3e14de67e821427c732b62ebfa07c82d2e5db6de75fe3a1c828d9b",
+                      "originalTxHash": "4d50a055663dfee2479851684d7fb83cf00695b6f03f4dbbdf0f9232477cafc4",
+                      "gasLimit": 595637825,
+                      "gasPrice": 1000000000,
+                      "callType": 2,
+                      "logs": {
+                        "address": "erd1qqqqqqqqqqqqqpgqllqglpjdrz5kn3m0k9uf9hdqjmg3xdhk6r7se3wvlk",
+                        "events": [
+                          {
+                            "address": "erd1qqqqqqqqqqqqqpgqllqglpjdrz5kn3m0k9uf9hdqjmg3xdhk6r7se3wvlk",
+                            "identifier": "writeLog",
+                            "topics": [
+                              "AAAAAAAAAAAFAP/Aj4ZNGKlpx2+xeJLdoJbREzb20P0=",
+                              "QHRvbyBtdWNoIGdhcyBwcm92aWRlZCBmb3IgcHJvY2Vzc2luZzogZ2FzIHByb3ZpZGVkID0gNTk1NjM3ODI1LCBnYXMgdXNlZCA9IDIxNjE3NzA="
+                            ],
+                            "data": "QDZmNmI="
+                          },
+                          {
+                            "address": "erd1qqqqqqqqqqqqqpgqllqglpjdrz5kn3m0k9uf9hdqjmg3xdhk6r7se3wvlk",
+                            "identifier": "completedTxEvent",
+                            "topics": [
+                              "QdVv2s8+FN5n6CFCfHMrYuv6B8gtLl223nX+OhyCjZs="
+                            ],
+                            "data": null
+                          }
+                        ]
+                      },
+                      "operation": "transfer"
+                    },
+                    {
+                      "hash": "41d56fdacf3e14de67e821427c732b62ebfa07c82d2e5db6de75fe3a1c828d9b",
+                      "nonce": 0,
+                      "value": 0,
+                      "receiver": "erd1qqqqqqqqqqqqqpgq4nlkk7jwhqgp4r08lal46tqt70jdv0685u7qrr3l2d",
+                      "sender": "erd1qqqqqqqqqqqqqpgqllqglpjdrz5kn3m0k9uf9hdqjmg3xdhk6r7se3wvlk",
+                      "data": "returnTwoU64@4f3c60",
+                      "prevTxHash": "4d50a055663dfee2479851684d7fb83cf00695b6f03f4dbbdf0f9232477cafc4",
+                      "originalTxHash": "4d50a055663dfee2479851684d7fb83cf00695b6f03f4dbbdf0f9232477cafc4",
+                      "gasLimit": 597479490,
+                      "gasPrice": 1000000000,
+                      "callType": 1,
+                      "operation": "transfer",
+                      "function": "returnTwoU64"
+                    }
+                  ],
+                  "logs": {
+                    "address": "erd1qqqqqqqqqqqqqpgqllqglpjdrz5kn3m0k9uf9hdqjmg3xdhk6r7se3wvlk",
+                    "events": [
+                      {
+                        "address": "erd1qqqqqqqqqqqqqpgqllqglpjdrz5kn3m0k9uf9hdqjmg3xdhk6r7se3wvlk",
+                        "identifier": "writeLog",
+                        "topics": [
+                          "5fXsK/a5JVZf0e2Z6ViFglDOQP1zsS1XkuaLvaZ5pzw="
+                        ],
+                        "data": "QDZmNmI="
+                      }
+                    ]
+                  },
+                  "status": "success",
+                  "operation": "transfer",
+                  "function": "asyncCallAnotherContractReturnTwoU64NoCallback",
+                  "initiallyPaidFee": "6214335000000000",
+                  "fee": "6214335000000000",
+                  "chainID": "D",
+                  "version": 2,
+                  "options": 0
+                }
+              },
+              "error": "",
+              "code": "successful"
+            }
+        "#;
+
+    let tx_on_network: TransactionOnNetwork = serde_json::from_str::<TransactionInfo>(data)
+        .unwrap()
+        .data
+        .unwrap()
+        .transaction;
+    let tx_response = TxResponse::from_network_tx(tx_on_network);
+
+    let expected: Vec<Vec<u8>> = vec![];
+
+    assert_eq!(tx_response.out, expected)
+}
+
+#[test]
+fn test_with_multi_contract_cross_shard_tx_that_has_non_returning_callback() {
+    // transaction data from the devnet
+    // context : user -> A --async call--> B --callback--> A, the callback returns ()
+    let data = r#"
+            {
+              "data": {
+                "transaction": {
+                  "type": "normal",
+                  "processingTypeOnSource": "SCInvoking",
+                  "processingTypeOnDestination": "SCInvoking",
+                  "hash": "4f7f19e448176e4d47a0f844cbd6bdb1b6c68035dafe927e8249ed60af1c3b17",
+                  "nonce": 52,
+                  "round": 7647560,
+                  "epoch": 6340,
+                  "value": "0",
+                  "receiver": "erd1qqqqqqqqqqqqqpgqllqglpjdrz5kn3m0k9uf9hdqjmg3xdhk6r7se3wvlk",
+                  "sender": "erd1uh67c2lkhyj4vh73akv7jky9sfgvus8awwcj64uju69mmfne5u7q299t7g",
+                  "gasPrice": 1000000000,
+                  "gasLimit": 600000000,
+                  "gasUsed": 600000000,
+                  "data": "YXN5bmNDYWxsQW5vdGhlckNvbnRyYWN0UmV0dXJuVHdvVTY0V2l0aE5vblJldHVybmluZ0NhbGxiYWNrQDAwMDAwMDAwMDAwMDAwMDAwNTAwQUNGRjZCN0E0RUI4MTAxQThERTdGRjdGNUQyQzBCRjNFNEQ2M0Y0N0E3M0M=",
+                  "signature": "3918fce429b2059b2321b709011079755dbb835e12839278ee510e4741180540e80c6111eea1d3312b2c63446de08b20e01f6040358fa94d1633c355bb65bc0f",
+                  "sourceShard": 0,
+                  "destinationShard": 1,
+                  "blockNonce": 7593795,
+                  "blockHash": "c17e727f90025225670b7852ea9807c67753c9b3f21b6ec7cc40077e3849a8b7",
+                  "notarizedAtSourceInMetaNonce": 7609940,
+                  "NotarizedAtSourceInMetaHash": "c67b5c550986cfd6c94d00f4b90234eb38ee196ff0d79a00d916f3bd24be272c",
+                  "notarizedAtDestinationInMetaNonce": 7609944,
+                  "notarizedAtDestinationInMetaHash": "d59b7398d962ce3119679af59d5d74e10083e62c3ee2b15421cc0d607979ca18",
+                  "miniblockType": "TxBlock",
+                  "miniblockHash": "2977affeffeb6cf41117bed442662021cb713528cdb1d0dce4537b01caeb8e0b",
+                  "hyperblockNonce": 7609944,
+                  "hyperblockHash": "d59b7398d962ce3119679af59d5d74e10083e62c3ee2b15421cc0d607979ca18",
+                  "timestamp": 1694436960,
+                  "smartContractResults": [
+                    {
+                      "hash": "fe7474188d5ca4b84c7577f03fc778d22d53c070dfcb05a9cda840229d30e4d3",
+                      "nonce": 0,
+                      "value": 0,
+                      "receiver": "erd1qqqqqqqqqqqqqpgq4nlkk7jwhqgp4r08lal46tqt70jdv0685u7qrr3l2d",
+                      "sender": "erd1qqqqqqqqqqqqqpgqllqglpjdrz5kn3m0k9uf9hdqjmg3xdhk6r7se3wvlk",
+                      "data": "returnTwoU64@4f3c60",
+                      "prevTxHash": "4f7f19e448176e4d47a0f844cbd6bdb1b6c68035dafe927e8249ed60af1c3b17",
+                      "originalTxHash": "4f7f19e448176e4d47a0f844cbd6bdb1b6c68035dafe927e8249ed60af1c3b17",
+                      "gasLimit": 596979545,
+                      "gasPrice": 1000000000,
+                      "callType": 1,
+                      "operation": "transfer",
+                      "function": "returnTwoU64"
+                    },
+                    {
+                      "hash": "948dc6702b376d1e043db8de2f87ca12907c342f54cfad7dfebadf59145ca3ac",
+                      "nonce": 0,
+                      "value": 0,
+                      "receiver": "erd1qqqqqqqqqqqqqpgqllqglpjdrz5kn3m0k9uf9hdqjmg3xdhk6r7se3wvlk",
+                      "sender": "erd1qqqqqqqqqqqqqpgq4nlkk7jwhqgp4r08lal46tqt70jdv0685u7qrr3l2d",
+                      "data": "@00@0a@0218711a00",
+                      "prevTxHash": "fe7474188d5ca4b84c7577f03fc778d22d53c070dfcb05a9cda840229d30e4d3",
+                      "originalTxHash": "4f7f19e448176e4d47a0f844cbd6bdb1b6c68035dafe927e8249ed60af1c3b17",
+                      "gasLimit": 595137880,
+                      "gasPrice": 1000000000,
+                      "callType": 2,
+                      "logs": {
+                        "address": "erd1qqqqqqqqqqqqqpgqllqglpjdrz5kn3m0k9uf9hdqjmg3xdhk6r7se3wvlk",
+                        "events": [
+                          {
+                            "address": "erd1qqqqqqqqqqqqqpgqllqglpjdrz5kn3m0k9uf9hdqjmg3xdhk6r7se3wvlk",
+                            "identifier": "writeLog",
+                            "topics": [
+                              "AAAAAAAAAAAFAP/Aj4ZNGKlpx2+xeJLdoJbREzb20P0=",
+                              "QHRvbyBtdWNoIGdhcyBwcm92aWRlZCBmb3IgcHJvY2Vzc2luZzogZ2FzIHByb3ZpZGVkID0gNTk1MTM3ODgwLCBnYXMgdXNlZCA9IDIyODg1NTA="
+                            ],
+                            "data": "QDZmNmJAMGFAMDIxODcxMWEwMA=="
+                          },
+                          {
+                            "address": "erd1qqqqqqqqqqqqqpgqllqglpjdrz5kn3m0k9uf9hdqjmg3xdhk6r7se3wvlk",
+                            "identifier": "completedTxEvent",
+                            "topics": [
+                              "/nR0GI1cpLhMdXfwP8d40i1TwHDfywWpzahAIp0w5NM="
+                            ],
+                            "data": null
+                          }
+                        ]
+                      },
+                      "operation": "transfer"
+                    }
+                  ],
+                  "logs": {
+                    "address": "erd1qqqqqqqqqqqqqpgqllqglpjdrz5kn3m0k9uf9hdqjmg3xdhk6r7se3wvlk",
+                    "events": [
+                      {
+                        "address": "erd1qqqqqqqqqqqqqpgqllqglpjdrz5kn3m0k9uf9hdqjmg3xdhk6r7se3wvlk",
+                        "identifier": "writeLog",
+                        "topics": [
+                          "5fXsK/a5JVZf0e2Z6ViFglDOQP1zsS1XkuaLvaZ5pzw="
+                        ],
+                        "data": "QDZmNmI="
+                      }
+                    ]
+                  },
+                  "status": "success",
+                  "operation": "transfer",
+                  "function": "asyncCallAnotherContractReturnTwoU64WithNonReturningCallback",
+                  "initiallyPaidFee": "6235125000000000",
+                  "fee": "6235125000000000",
+                  "chainID": "D",
+                  "version": 2,
+                  "options": 0
+                }
+              },
+              "error": "",
+              "code": "successful"
+            }
+        "#;
+
+    let tx_on_network: TransactionOnNetwork = serde_json::from_str::<TransactionInfo>(data)
+        .unwrap()
+        .data
+        .unwrap()
+        .transaction;
+    let tx_response = TxResponse::from_network_tx(tx_on_network);
+
+    let expected: Vec<Vec<u8>> = vec![];
+
+    assert_eq!(tx_response.out, expected)
+}
+
+#[test]
+fn test_with_multi_contract_cross_shard_tx_that_has_returning_callback() {
+    // transaction data from the devnet
+    // context : user -> A --async call--> B --callback--> A, the callback returns a MultiValue2<u64, u64>
+    let data = r#"
+            {
+              "data": {
+                "transaction": {
+                  "type": "normal",
+                  "processingTypeOnSource": "SCInvoking",
+                  "processingTypeOnDestination": "SCInvoking",
+                  "hash": "f34e136ca81c0e32f6fb532b753612715675073f3718b5db009bb275d246fd7a",
+                  "nonce": 53,
+                  "round": 7647583,
+                  "epoch": 6340,
+                  "value": "0",
+                  "receiver": "erd1qqqqqqqqqqqqqpgqllqglpjdrz5kn3m0k9uf9hdqjmg3xdhk6r7se3wvlk",
+                  "sender": "erd1uh67c2lkhyj4vh73akv7jky9sfgvus8awwcj64uju69mmfne5u7q299t7g",
+                  "gasPrice": 1000000000,
+                  "gasLimit": 600000000,
+                  "gasUsed": 600000000,
+                  "data": "YXN5bmNDYWxsQW5vdGhlckNvbnRyYWN0UmV0dXJuVHdvVTY0V2l0aFJldHVybmluZ0NhbGxiYWNrQDAwMDAwMDAwMDAwMDAwMDAwNTAwQUNGRjZCN0E0RUI4MTAxQThERTdGRjdGNUQyQzBCRjNFNEQ2M0Y0N0E3M0M=",
+                  "signature": "858958d4aaf9cb0220ab2933edad3f65e1cb4c58aa7940cb0f40b489d0bd9fdf5c4736a40d6e813743ee622bb91e9f86eacf01b9a31e0ff53f9c84f13c500304",
+                  "sourceShard": 0,
+                  "destinationShard": 1,
+                  "blockNonce": 7593818,
+                  "blockHash": "b19f97110ca38d3cb15f802a00ab403491b0e5804ebc701527ab50064dc06825",
+                  "notarizedAtSourceInMetaNonce": 7609963,
+                  "NotarizedAtSourceInMetaHash": "4d9db6de610ca778114d44fe91dd036fac7c375c373ae9e77130d3fb9efc8391",
+                  "notarizedAtDestinationInMetaNonce": 7609967,
+                  "notarizedAtDestinationInMetaHash": "a4573d388c31860f9bd6f9507b65d1b3130e445abcada538f10704feba4614e7",
+                  "miniblockType": "TxBlock",
+                  "miniblockHash": "530f5fa3c7af474a187caca8dcea02a7a155017414147871d083bed5c49ec8f5",
+                  "hyperblockNonce": 7609967,
+                  "hyperblockHash": "a4573d388c31860f9bd6f9507b65d1b3130e445abcada538f10704feba4614e7",
+                  "timestamp": 1694437098,
+                  "smartContractResults": [
+                    {
+                      "hash": "065291164a8acd27c26b5a8f09664810081fda18cd54fca635196cf9b200297a",
+                      "nonce": 0,
+                      "value": 0,
+                      "receiver": "erd1qqqqqqqqqqqqqpgq4nlkk7jwhqgp4r08lal46tqt70jdv0685u7qrr3l2d",
+                      "sender": "erd1qqqqqqqqqqqqqpgqllqglpjdrz5kn3m0k9uf9hdqjmg3xdhk6r7se3wvlk",
+                      "data": "returnTwoU64@4f3c60",
+                      "prevTxHash": "f34e136ca81c0e32f6fb532b753612715675073f3718b5db009bb275d246fd7a",
+                      "originalTxHash": "f34e136ca81c0e32f6fb532b753612715675073f3718b5db009bb275d246fd7a",
+                      "gasLimit": 596994205,
+                      "gasPrice": 1000000000,
+                      "callType": 1,
+                      "operation": "transfer",
+                      "function": "returnTwoU64"
+                    },
+                    {
+                      "hash": "bc31cb153ae615204625df84fe9ae3a159aa412b7342f3dca958dd5517a08197",
+                      "nonce": 0,
+                      "value": 0,
+                      "receiver": "erd1qqqqqqqqqqqqqpgqllqglpjdrz5kn3m0k9uf9hdqjmg3xdhk6r7se3wvlk",
+                      "sender": "erd1qqqqqqqqqqqqqpgq4nlkk7jwhqgp4r08lal46tqt70jdv0685u7qrr3l2d",
+                      "data": "@00@0a@0218711a00",
+                      "prevTxHash": "065291164a8acd27c26b5a8f09664810081fda18cd54fca635196cf9b200297a",
+                      "originalTxHash": "f34e136ca81c0e32f6fb532b753612715675073f3718b5db009bb275d246fd7a",
+                      "gasLimit": 595152540,
+                      "gasPrice": 1000000000,
+                      "callType": 2,
+                      "logs": {
+                        "address": "erd1qqqqqqqqqqqqqpgqllqglpjdrz5kn3m0k9uf9hdqjmg3xdhk6r7se3wvlk",
+                        "events": [
+                          {
+                            "address": "erd1qqqqqqqqqqqqqpgqllqglpjdrz5kn3m0k9uf9hdqjmg3xdhk6r7se3wvlk",
+                            "identifier": "writeLog",
+                            "topics": [
+                              "AAAAAAAAAAAFAP/Aj4ZNGKlpx2+xeJLdoJbREzb20P0=",
+                              "QHRvbyBtdWNoIGdhcyBwcm92aWRlZCBmb3IgcHJvY2Vzc2luZzogZ2FzIHByb3ZpZGVkID0gNTk1MTUyNTQwLCBnYXMgdXNlZCA9IDIyODgwMTU="
+                            ],
+                            "data": "QDZmNmJAMGFAMDIxODcxMWEwMA=="
+                          },
+                          {
+                            "address": "erd1qqqqqqqqqqqqqpgqllqglpjdrz5kn3m0k9uf9hdqjmg3xdhk6r7se3wvlk",
+                            "identifier": "completedTxEvent",
+                            "topics": [
+                              "BlKRFkqKzSfCa1qPCWZIEAgf2hjNVPymNRls+bIAKXo="
+                            ],
+                            "data": null
+                          }
+                        ]
+                      },
+                      "operation": "transfer"
+                    }
+                  ],
+                  "logs": {
+                    "address": "erd1qqqqqqqqqqqqqpgqllqglpjdrz5kn3m0k9uf9hdqjmg3xdhk6r7se3wvlk",
+                    "events": [
+                      {
+                        "address": "erd1qqqqqqqqqqqqqpgqllqglpjdrz5kn3m0k9uf9hdqjmg3xdhk6r7se3wvlk",
+                        "identifier": "writeLog",
+                        "topics": [
+                          "5fXsK/a5JVZf0e2Z6ViFglDOQP1zsS1XkuaLvaZ5pzw="
+                        ],
+                        "data": "QDZmNmI="
+                      }
+                    ]
+                  },
+                  "status": "success",
+                  "operation": "transfer",
+                  "function": "asyncCallAnotherContractReturnTwoU64WithReturningCallback",
+                  "initiallyPaidFee": "6230670000000000",
+                  "fee": "6230670000000000",
+                  "chainID": "D",
+                  "version": 2,
+                  "options": 0
+                }
+              },
+              "error": "",
+              "code": "successful"
+            }
+        "#;
+
+    let tx_on_network: TransactionOnNetwork = serde_json::from_str::<TransactionInfo>(data)
+        .unwrap()
+        .data
+        .unwrap()
+        .transaction;
+    let tx_response = TxResponse::from_network_tx(tx_on_network);
+
+    let expected: Vec<Vec<u8>> = vec![];
+
+    assert_eq!(tx_response.out, expected)
+}
+
+#[test]
+fn test_process_issued_token_identifier_fungible() {
+    let data = r#"
+        {
+  "data": {
+    "transaction": {
+      "type": "normal",
+      "processingTypeOnSource": "SCInvoking",
+      "processingTypeOnDestination": "SCInvoking",
+      "hash": "b78170cc5ca5ba441ea46fe84540db9610ccab243ccd4cd3cd976e170c4864c8",
+      "nonce": 61,
+      "round": 173598,
+      "epoch": 72,
+      "value": "50000000000000000",
+      "receiver": "erd1qqqqqqqqqqqqqpgqa7hv0nahgsl8tz0psat46x0tchm0wuyc0n4s6q28ad",
+      "sender": "erd1x39tc3q3nn72ecjnmcz7x0qp09kp97t080x99dgyhx7zh95j0n4szskhlv",
+      "gasPrice": 1000000000,
+      "gasLimit": 100000000,
+      "gasUsed": 100000000,
+      "data": "aXNzdWVMcFRva2VuQDAwMDAwMDAwMDAwMDAwMDAwNTAwMTM5ZWQ3YWU0YWEwMzc5MmU2YmNiMzMyMzk0YTQwZmU3NDZlZWZhNDdjZWJANDU0NzRjNDQ0ZDQ1NTg0YzUwQDQ1NDc0YzQ0NGQ0NTU4",
+      "signature": "b5049d2906adc1305a6a8d0f42749254ca6259c6996d9a35e7dc7528b3c87b48a421879aff70bc6d81483a7559b75e5dcf9be499dcb7d57aa9f25c79ac2ad40d",
+      "sourceShard": 1,
+      "destinationShard": 1,
+      "blockNonce": 173354,
+      "blockHash": "09d85ac264a54e12e7613395211c53fe0ee5a7d3b7111bf5fec1d02794caaacd",
+      "notarizedAtSourceInMetaNonce": 173321,
+      "NotarizedAtSourceInMetaHash": "64a83759da97fe8305cd4cda4b518f2d41ef0a8f3995d264460821edad45e09e",
+      "notarizedAtDestinationInMetaNonce": 173321,
+      "notarizedAtDestinationInMetaHash": "64a83759da97fe8305cd4cda4b518f2d41ef0a8f3995d264460821edad45e09e",
+      "miniblockType": "TxBlock",
+      "miniblockHash": "7f45eee4e35ffc1fbce66b92e4dd2aeae2acb092416aa5aa775b96493256b81d",
+      "hyperblockNonce": 173321,
+      "hyperblockHash": "64a83759da97fe8305cd4cda4b518f2d41ef0a8f3995d264460821edad45e09e",
+      "timestamp": 1695041588,
+      "smartContractResults": [
+        {
+          "hash": "bce3d0dceb0b3e5c8c5780d7da3755c3f7492d551685d493a73bf66ebd36754b",
+          "nonce": 0,
+          "value": 50000000000000000,
+          "receiver": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
+          "sender": "erd1qqqqqqqqqqqqqpgqa7hv0nahgsl8tz0psat46x0tchm0wuyc0n4s6q28ad",
+          "data": "issue@45474c444d45584c50@45474c444d4558@03e8@12@63616e467265657a65@74727565@63616e57697065@74727565@63616e5061757365@74727565@63616e4d696e74@74727565@63616e4275726e@74727565@63616e4368616e67654f776e6572@74727565@63616e55706772616465@74727565@63616e4164645370656369616c526f6c6573@74727565@65ba30",
+          "prevTxHash": "b78170cc5ca5ba441ea46fe84540db9610ccab243ccd4cd3cd976e170c4864c8",
+          "originalTxHash": "b78170cc5ca5ba441ea46fe84540db9610ccab243ccd4cd3cd976e170c4864c8",
+          "gasLimit": 89624222,
+          "gasPrice": 1000000000,
+          "callType": 1,
+          "originalSender": "erd1x39tc3q3nn72ecjnmcz7x0qp09kp97t080x99dgyhx7zh95j0n4szskhlv",
+          "operation": "transfer",
+          "function": "issue"
+        },
+        {
+          "hash": "2a452ff652791d79be5f6933fb583cc5503e876893e54b3b51381a92aa2e904d",
+          "nonce": 0,
+          "value": 0,
+          "receiver": "erd1llllllllllllllllllllllllllllllllllllllllllllllllluqsl6e366",
+          "sender": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
+          "data": "ESDTSetBurnRoleForAll@45474c444d45582d393563366435",
+          "prevTxHash": "bce3d0dceb0b3e5c8c5780d7da3755c3f7492d551685d493a73bf66ebd36754b",
+          "originalTxHash": "b78170cc5ca5ba441ea46fe84540db9610ccab243ccd4cd3cd976e170c4864c8",
+          "gasLimit": 0,
+          "gasPrice": 1000000000,
+          "callType": 0,
+          "logs": {
+            "address": "erd1llllllllllllllllllllllllllllllllllllllllllllllllluqsl6e366",
+            "events": [
+              {
+                "address": "erd1llllllllllllllllllllllllllllllllllllllllllllllllluqsl6e366",
+                "identifier": "completedTxEvent",
+                "topics": [
+                  "vOPQ3OsLPlyMV4DX2jdVw/dJLVUWhdSTpzv2br02dUs="
+                ],
+                "data": null,
+                "additionalData": null
+              }
+            ]
+          },
+          "operation": "transfer"
+        },
+        {
+          "hash": "2c84740ccb3376ea9fa00dab6c6c93fe7a35ee0a1d6dbfa0a1e61064853b0874",
+          "nonce": 0,
+          "value": 0,
+          "receiver": "erd1qqqqqqqqqqqqqpgqa7hv0nahgsl8tz0psat46x0tchm0wuyc0n4s6q28ad",
+          "sender": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
+          "data": "ESDTTransfer@45474c444d45582d393563366435@03e8@00",
+          "prevTxHash": "bce3d0dceb0b3e5c8c5780d7da3755c3f7492d551685d493a73bf66ebd36754b",
+          "originalTxHash": "b78170cc5ca5ba441ea46fe84540db9610ccab243ccd4cd3cd976e170c4864c8",
+          "gasLimit": 39624222,
+          "gasPrice": 1000000000,
+          "callType": 2,
+          "logs": {
+            "address": "erd1qqqqqqqqqqqqqpgqa7hv0nahgsl8tz0psat46x0tchm0wuyc0n4s6q28ad",
+            "events": [
+              {
+                "address": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
+                "identifier": "ESDTTransfer",
+                "topics": [
+                  "RUdMRE1FWC05NWM2ZDU=",
+                  "",
+                  "A+g=",
+                  "AAAAAAAAAAAFAO+ux8+3RD51ieGHV10Z68X293CYfOs="
+                ],
+                "data": null,
+                "additionalData": null
+              },
+              {
+                "address": "erd1qqqqqqqqqqqqqpgqa7hv0nahgsl8tz0psat46x0tchm0wuyc0n4s6q28ad",
+                "identifier": "completedTxEvent",
+                "topics": [
+                  "vOPQ3OsLPlyMV4DX2jdVw/dJLVUWhdSTpzv2br02dUs="
+                ],
+                "data": null,
+                "additionalData": null
+              }
+            ]
+          },
+          "tokens": [
+            "EGLDMEX-95c6d5"
+          ],
+          "esdtValues": [
+            "1000"
+          ],
+          "operation": "ESDTTransfer",
+          "function": "\u0000"
+        },
+        {
+          "hash": "c9dfc4de3c3cee319123087a4f5dd03cc051e728ec6070707a63ea977b535227",
+          "nonce": 0,
+          "value": 0,
+          "receiver": "erd1qqqqqqqqqqqqqpgqa7hv0nahgsl8tz0psat46x0tchm0wuyc0n4s6q28ad",
+          "sender": "erd1qqqqqqqqqqqqqpgqa7hv0nahgsl8tz0psat46x0tchm0wuyc0n4s6q28ad",
+          "data": "\u0000",
+          "prevTxHash": "2c84740ccb3376ea9fa00dab6c6c93fe7a35ee0a1d6dbfa0a1e61064853b0874",
+          "originalTxHash": "b78170cc5ca5ba441ea46fe84540db9610ccab243ccd4cd3cd976e170c4864c8",
+          "gasLimit": 39424222,
+          "gasPrice": 1000000000,
+          "callType": 2,
+          "operation": "transfer",
+          "function": "\u0000"
+        },
+        {
+          "hash": "609c3a8e1903680fef1f6d9e47527b1b5c1259664b868af600162120ce0b8192",
+          "nonce": 1,
+          "value": 300925400000000,
+          "receiver": "erd1qqqqqqqqqqqqqpgqa7hv0nahgsl8tz0psat46x0tchm0wuyc0n4s6q28ad",
+          "sender": "erd1qqqqqqqqqqqqqpgqa7hv0nahgsl8tz0psat46x0tchm0wuyc0n4s6q28ad",
+          "data": "@6f6b",
+          "prevTxHash": "2c84740ccb3376ea9fa00dab6c6c93fe7a35ee0a1d6dbfa0a1e61064853b0874",
+          "originalTxHash": "b78170cc5ca5ba441ea46fe84540db9610ccab243ccd4cd3cd976e170c4864c8",
+          "gasLimit": 0,
+          "gasPrice": 1000000000,
+          "callType": 0,
+          "operation": "transfer",
+          "isRefund": true
+        }
+      ],
+      "logs": {
+        "address": "erd1qqqqqqqqqqqqqpgqa7hv0nahgsl8tz0psat46x0tchm0wuyc0n4s6q28ad",
+        "events": [
+          {
+            "address": "erd1qqqqqqqqqqqqqpgqa7hv0nahgsl8tz0psat46x0tchm0wuyc0n4s6q28ad",
+            "identifier": "transferValueOnly",
+            "topics": [
+              "AAAAAAAAAAAFAO+ux8+3RD51ieGHV10Z68X293CYfOs=",
+              "AAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAC//8=",
+              "saK8LsUAAA=="
+            ],
+            "data": null,
+            "additionalData": null
+          },
+          {
+            "address": "erd1qqqqqqqqqqqqqpgqa7hv0nahgsl8tz0psat46x0tchm0wuyc0n4s6q28ad",
+            "identifier": "writeLog",
+            "topics": [
+              "NEq8RBGc/KziU94F4zwBeWwS+W87zFK1BLm8K5aSfOs="
+            ],
+            "data": "QDZmNmI=",
+            "additionalData": null
+          }
+        ]
+      },
+      "status": "success",
+      "operation": "transfer",
+      "function": "issueLpToken",
+      "initiallyPaidFee": "1214335000000000",
+      "fee": "1214335000000000",
+      "chainID": "D",
+      "version": 2,
+      "options": 0
+    }
+  },
+  "error": "",
+  "code": "successful"
+}
+      "#;
+
+    let tx_on_network: TransactionOnNetwork = serde_json::from_str::<TransactionInfo>(data)
+        .unwrap()
+        .data
+        .unwrap()
+        .transaction;
+    let tx_response = TxResponse::from_network_tx(tx_on_network);
+
+    let expected: Option<String> = Some("EGLDMEX-95c6d5".to_string());
+
+    assert_eq!(tx_response.new_issued_token_identifier, expected)
+}
+
+#[test]
+fn test_process_issued_token_identifier_semi_fungible() {
+    let data = r#"
+        {
+  "data": {
+    "transaction": {
+      "type": "normal",
+      "processingTypeOnSource": "SCInvoking",
+      "processingTypeOnDestination": "SCInvoking",
+      "hash": "0634b9c1db9fd6bfa065fc937d51cec37958fd5d33d0c934a0da3d27776a33ae",
+      "nonce": 65,
+      "round": 8422527,
+      "epoch": 584,
+      "value": "50000000000000000",
+      "receiver": "erd1qqqqqqqqqqqqqpgq06w7lq7relxyh2h6xzh98q8x24psf3fqssvqn4ptek",
+      "sender": "erd1x3g000ew7zzv6kyqhj9jl2wy5g6cc72qahvvxz29zv76jwq6ssvqt0d998",
+      "gasPrice": 1000000000,
+      "gasLimit": 80000000,
+      "gasUsed": 80000000,
+      "data": "aXNzdWVUb2tlbkA0NDZmNzA2NTU0NjU3Mzc0QDQ0NGY1MDQ1NTQ0NTUzNTQ=",
+      "signature": "0191848976e930996f6c62d4921e732f9b0ada8b41ca3b5b63d6bfd304fd44c2a1e8e6643479618ba4a764a36e87f53882b4f707600d5b7d476f2fdd2bac040e",
+      "sourceShard": 0,
+      "destinationShard": 0,
+      "blockNonce": 8420241,
+      "blockHash": "4d302220f6015876c95e7961b770cc67f8ab63c5f0ab69b4d6c2fb15c8bc23bd",
+      "notarizedAtSourceInMetaNonce": 8403647,
+      "NotarizedAtSourceInMetaHash": "f8b83b6d38fa45dacc167b15c93dd07ee5c40db906de34f26e11e7a24f539e30",
+      "notarizedAtDestinationInMetaNonce": 8403647,
+      "notarizedAtDestinationInMetaHash": "f8b83b6d38fa45dacc167b15c93dd07ee5c40db906de34f26e11e7a24f539e30",
+      "miniblockType": "TxBlock",
+      "miniblockHash": "b7b8fc9f3b81d7daae1113cbf73457e16ee31f3a864ef3729a1a21f3a929e112",
+      "hyperblockNonce": 8403647,
+      "hyperblockHash": "f8b83b6d38fa45dacc167b15c93dd07ee5c40db906de34f26e11e7a24f539e30",
+      "timestamp": 1646652762,
+      "smartContractResults": [
+        {
+          "hash": "9aecf3bd5dd5c706a28d1cc7059ac20db74340f136816f667dbefcc58daa3aba",
+          "nonce": 0,
+          "value": 50000000000000000,
+          "receiver": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
+          "sender": "erd1qqqqqqqqqqqqqpgq06w7lq7relxyh2h6xzh98q8x24psf3fqssvqn4ptek",
+          "data": "issueSemiFungible@446f706554657374@444f504554455354@63616e467265657a65@74727565@63616e57697065@74727565@63616e5061757365@74727565@63616e4368616e67654f776e6572@74727565@63616e55706772616465@74727565@63616e4164645370656369616c526f6c6573@74727565@5ca148",
+          "prevTxHash": "0634b9c1db9fd6bfa065fc937d51cec37958fd5d33d0c934a0da3d27776a33ae",
+          "originalTxHash": "0634b9c1db9fd6bfa065fc937d51cec37958fd5d33d0c934a0da3d27776a33ae",
+          "gasLimit": 75958360,
+          "gasPrice": 1000000000,
+          "callType": 1,
+          "originalSender": "erd1x3g000ew7zzv6kyqhj9jl2wy5g6cc72qahvvxz29zv76jwq6ssvqt0d998",
+          "operation": "transfer",
+          "function": "issueSemiFungible"
+        },
+        {
+          "hash": "aacfe9088bb9d2d5b3fbe9cab2b2f1c6a7e9cbab2f1a41020e2c819fc9b43570",
+          "nonce": 66,
+          "value": 0,
+          "receiver": "erd1x3g000ew7zzv6kyqhj9jl2wy5g6cc72qahvvxz29zv76jwq6ssvqt0d998",
+          "sender": "erd1qqqqqqqqqqqqqpgq06w7lq7relxyh2h6xzh98q8x24psf3fqssvqn4ptek",
+          "data": "@6f6b",
+          "prevTxHash": "0634b9c1db9fd6bfa065fc937d51cec37958fd5d33d0c934a0da3d27776a33ae",
+          "originalTxHash": "0634b9c1db9fd6bfa065fc937d51cec37958fd5d33d0c934a0da3d27776a33ae",
+          "gasLimit": 0,
+          "gasPrice": 1000000000,
+          "callType": 0,
+          "operation": "transfer"
+        },
+        {
+          "hash": "3f6f0f3de9e942884e7e1592823a7db7ce935a3f9d3359d8c1ee98a5645332d8",
+          "nonce": 0,
+          "value": 0,
+          "receiver": "erd1qqqqqqqqqqqqqpgq06w7lq7relxyh2h6xzh98q8x24psf3fqssvqn4ptek",
+          "sender": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
+          "data": "@00@444f5045544553542d373732303063",
+          "prevTxHash": "9aecf3bd5dd5c706a28d1cc7059ac20db74340f136816f667dbefcc58daa3aba",
+          "originalTxHash": "0634b9c1db9fd6bfa065fc937d51cec37958fd5d33d0c934a0da3d27776a33ae",
+          "gasLimit": 25958360,
+          "gasPrice": 1000000000,
+          "callType": 2,
+          "originalSender": "erd1qqqqqqqqqqqqqpgq06w7lq7relxyh2h6xzh98q8x24psf3fqssvqn4ptek",
+          "logs": {
+            "address": "erd1qqqqqqqqqqqqqpgq06w7lq7relxyh2h6xzh98q8x24psf3fqssvqn4ptek",
+            "events": [
+              {
+                "address": "erd1qqqqqqqqqqqqqpgq06w7lq7relxyh2h6xzh98q8x24psf3fqssvqn4ptek",
+                "identifier": "completedTxEvent",
+                "topics": [
+                  "muzzvV3VxwaijRzHBZrCDbdDQPE2gW9mfb78xY2qOro="
+                ],
+                "data": null
+              }
+            ]
+          },
+          "operation": "transfer"
+        },
+        {
+          "hash": "c6e4f7c5da455009fb4f6967ce8a273a97b826aa617fa798ffd0cf17bde6b97a",
+          "nonce": 1,
+          "value": 225516180000000,
+          "receiver": "erd1qqqqqqqqqqqqqpgq06w7lq7relxyh2h6xzh98q8x24psf3fqssvqn4ptek",
+          "sender": "erd1qqqqqqqqqqqqqpgq06w7lq7relxyh2h6xzh98q8x24psf3fqssvqn4ptek",
+          "data": "@6f6b",
+          "prevTxHash": "3f6f0f3de9e942884e7e1592823a7db7ce935a3f9d3359d8c1ee98a5645332d8",
+          "originalTxHash": "0634b9c1db9fd6bfa065fc937d51cec37958fd5d33d0c934a0da3d27776a33ae",
+          "gasLimit": 0,
+          "gasPrice": 1000000000,
+          "callType": 0,
+          "operation": "transfer",
+          "isRefund": true
+        }
+      ],
+      "logs": {
+        "address": "erd1qqqqqqqqqqqqqpgq06w7lq7relxyh2h6xzh98q8x24psf3fqssvqn4ptek",
+        "events": [
+          {
+            "address": "erd1qqqqqqqqqqqqqpgq06w7lq7relxyh2h6xzh98q8x24psf3fqssvqn4ptek",
+            "identifier": "transferValueOnly",
+            "topics": [
+              "AAAAAAAAAAAFAH6d74PDz8xLqvowrlOA5lVDBMUghBg=",
+              "AAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAC//8=",
+              "saK8LsUAAA=="
+            ],
+            "data": null
+          },
+          {
+            "address": "erd1qqqqqqqqqqqqqpgq06w7lq7relxyh2h6xzh98q8x24psf3fqssvqn4ptek",
+            "identifier": "writeLog",
+            "topics": [
+              "NFD3vy7whM1YgLyLL6nEojWMeUDt2MMJRRM9qTgahBg="
+            ],
+            "data": "QDZmNmI="
+          }
+        ]
+      },
+      "status": "success",
+      "operation": "transfer",
+      "function": "issueToken",
+      "initiallyPaidFee": "914840000000000",
+      "fee": "914840000000000",
+      "chainID": "1",
+      "version": 1,
+      "options": 0
+    }
+  },
+  "error": "",
+  "code": "successful"
+}
+        "#;
+
+    let tx_on_network: TransactionOnNetwork = serde_json::from_str::<TransactionInfo>(data)
+        .unwrap()
+        .data
+        .unwrap()
+        .transaction;
+    let tx_response = TxResponse::from_network_tx(tx_on_network);
+
+    let expected: Option<String> = Some("DOPETEST-77200c".to_string());
+
+    assert_eq!(tx_response.new_issued_token_identifier, expected)
+}
+
+#[test]
+fn test_process_issued_token_identifier_non_fungible() {
+    let data = r#"
+        {
+  "data": {
+    "transaction": {
+      "type": "normal",
+      "processingTypeOnSource": "SCInvoking",
+      "processingTypeOnDestination": "SCInvoking",
+      "hash": "d296186b432d7e7937bde37d725cd52b765ef334c00b95adcb079933bc2277bb",
+      "nonce": 16,
+      "round": 820170,
+      "epoch": 341,
+      "value": "50000000000000000",
+      "receiver": "erd1qqqqqqqqqqqqqpgqmegl4z2rcfhxjv6pn7dm0n4hndllfaam4fdqwqxld8",
+      "sender": "erd162knt53z7m0f9jjms9wxphr3q9d7zu4ky85xs2cc0ekrqz7k4fdq85lkuc",
+      "gasPrice": 1000000000,
+      "gasLimit": 200000000,
+      "gasUsed": 200000000,
+      "data": "aXNzdWVUb2tlbkA2NzY1NmU2NTdhNzk3M0A0NzQ1NGU=",
+      "signature": "e80d45f4de419799a2bbff1cae1235521c8eef1853ee45b02f95c2da74ce50d241bf75b6ab0c650245562700862ea9759caad40f3e381ac0c4d82cfe56e67c09",
+      "sourceShard": 2,
+      "destinationShard": 2,
+      "blockNonce": 819313,
+      "blockHash": "a1db4ef13f07b86678000df9cc78f244d83dcc35ae51de545f333bf616930d39",
+      "notarizedAtSourceInMetaNonce": 819396,
+      "NotarizedAtSourceInMetaHash": "6d9e511e46d318aa5b77cbfdfde14d2ce8515ce4e954b286f130a6b518ddf26a",
+      "notarizedAtDestinationInMetaNonce": 819396,
+      "notarizedAtDestinationInMetaHash": "6d9e511e46d318aa5b77cbfdfde14d2ce8515ce4e954b286f130a6b518ddf26a",
+      "miniblockType": "TxBlock",
+      "miniblockHash": "afdb278522181aeb9b12f08840e6c534e398e6af9c7f757548308e300e7ec4e9",
+      "hyperblockNonce": 819396,
+      "hyperblockHash": "6d9e511e46d318aa5b77cbfdfde14d2ce8515ce4e954b286f130a6b518ddf26a",
+      "timestamp": 1698921020,
+      "smartContractResults": [
+        {
+          "hash": "6fe0cc002802af1744f394eee4a69224b5e775961d8386e04e7a5b9242f7ff65",
+          "nonce": 0,
+          "value": 50000000000000000,
+          "receiver": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
+          "sender": "erd1qqqqqqqqqqqqqpgqmegl4z2rcfhxjv6pn7dm0n4hndllfaam4fdqwqxld8",
+          "data": "issueNonFungible@67656e657a7973@47454e@63616e467265657a65@74727565@63616e57697065@74727565@63616e5061757365@74727565@63616e5472616e736665724e4654437265617465526f6c65@74727565@63616e4368616e67654f776e6572@66616c7365@63616e55706772616465@66616c7365@63616e4164645370656369616c526f6c6573@74727565@5e30e4",
+          "prevTxHash": "d296186b432d7e7937bde37d725cd52b765ef334c00b95adcb079933bc2277bb",
+          "originalTxHash": "d296186b432d7e7937bde37d725cd52b765ef334c00b95adcb079933bc2277bb",
+          "gasLimit": 196098365,
+          "gasPrice": 1000000000,
+          "callType": 1,
+          "originalSender": "erd162knt53z7m0f9jjms9wxphr3q9d7zu4ky85xs2cc0ekrqz7k4fdq85lkuc",
+          "operation": "transfer",
+          "function": "issueNonFungible"
+        },
+        {
+          "hash": "98afe82512c79f1caaf171bd5919ee469d11ba0c4f725aefcab834278c0f1e58",
+          "nonce": 0,
+          "value": 0,
+          "receiver": "erd1lllllllllllllllllllllllllllllllllllllllllllllllllupq9x7ny0",
+          "sender": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
+          "data": "ESDTSetBurnRoleForAll@47454e2d383638353933",
+          "prevTxHash": "6fe0cc002802af1744f394eee4a69224b5e775961d8386e04e7a5b9242f7ff65",
+          "originalTxHash": "d296186b432d7e7937bde37d725cd52b765ef334c00b95adcb079933bc2277bb",
+          "gasLimit": 0,
+          "gasPrice": 1000000000,
+          "callType": 0,
+          "logs": {
+            "address": "erd1lllllllllllllllllllllllllllllllllllllllllllllllllupq9x7ny0",
+            "events": [
+              {
+                "address": "erd1lllllllllllllllllllllllllllllllllllllllllllllllllupq9x7ny0",
+                "identifier": "completedTxEvent",
+                "topics": [
+                  "b+DMACgCrxdE85Tu5KaSJLXndZYdg4bgTnpbkkL3/2U="
+                ],
+                "data": null,
+                "additionalData": null
+              }
+            ]
+          },
+          "operation": "transfer"
+        },
+        {
+          "hash": "83494ad9369738b574a7266cbfb12ce63ccf634950cd6b0ec16107b8fb42f8f6",
+          "nonce": 0,
+          "value": 0,
+          "receiver": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
+          "sender": "erd1qqqqqqqqqqqqqpgqmegl4z2rcfhxjv6pn7dm0n4hndllfaam4fdqwqxld8",
+          "data": "setSpecialRole@47454e2d383638353933@00000000000000000500de51fa8943c26e6933419f9bb7ceb79b7ff4f7bbaa5a@45534454526f6c654e4654437265617465@5e30e4",
+          "prevTxHash": "112d18ec0364b4700b1bfb3df517c80dba547a53373ece2a9e71acd5266e7b64",
+          "originalTxHash": "d296186b432d7e7937bde37d725cd52b765ef334c00b95adcb079933bc2277bb",
+          "gasLimit": 142399698,
+          "gasPrice": 1000000000,
+          "callType": 1,
+          "operation": "transfer",
+          "function": "setSpecialRole"
+        },
+        {
+          "hash": "112d18ec0364b4700b1bfb3df517c80dba547a53373ece2a9e71acd5266e7b64",
+          "nonce": 0,
+          "value": 0,
+          "receiver": "erd1qqqqqqqqqqqqqpgqmegl4z2rcfhxjv6pn7dm0n4hndllfaam4fdqwqxld8",
+          "sender": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
+          "data": "@00@47454e2d383638353933",
+          "prevTxHash": "6fe0cc002802af1744f394eee4a69224b5e775961d8386e04e7a5b9242f7ff65",
+          "originalTxHash": "d296186b432d7e7937bde37d725cd52b765ef334c00b95adcb079933bc2277bb",
+          "gasLimit": 146098365,
+          "gasPrice": 1000000000,
+          "callType": 2,
+          "originalSender": "erd1qqqqqqqqqqqqqpgqmegl4z2rcfhxjv6pn7dm0n4hndllfaam4fdqwqxld8",
+          "logs": {
+            "address": "erd1qqqqqqqqqqqqqpgqmegl4z2rcfhxjv6pn7dm0n4hndllfaam4fdqwqxld8",
+            "events": [
+              {
+                "address": "erd1qqqqqqqqqqqqqpgqmegl4z2rcfhxjv6pn7dm0n4hndllfaam4fdqwqxld8",
+                "identifier": "writeLog",
+                "topics": [
+                  "AAAAAAAAAAAFAN5R+olDwm5pM0Gfm7fOt5t/9Pe7qlo="
+                ],
+                "data": "QDZmNmI=",
+                "additionalData": null
+              }
+            ]
+          },
+          "operation": "transfer"
+        },
+        {
+          "hash": "db5d74970374337956fa61fb4fd90057b3f6a82ea3e259b389934b71a1652e5f",
+          "nonce": 0,
+          "value": 0,
+          "receiver": "erd1qqqqqqqqqqqqqpgqmegl4z2rcfhxjv6pn7dm0n4hndllfaam4fdqwqxld8",
+          "sender": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
+          "data": "ESDTSetRole@47454e2d383638353933@45534454526f6c654e4654437265617465",
+          "prevTxHash": "83494ad9369738b574a7266cbfb12ce63ccf634950cd6b0ec16107b8fb42f8f6",
+          "originalTxHash": "d296186b432d7e7937bde37d725cd52b765ef334c00b95adcb079933bc2277bb",
+          "gasLimit": 0,
+          "gasPrice": 1000000000,
+          "callType": 0,
+          "logs": {
+            "address": "erd1qqqqqqqqqqqqqpgqmegl4z2rcfhxjv6pn7dm0n4hndllfaam4fdqwqxld8",
+            "events": [
+              {
+                "address": "erd1qqqqqqqqqqqqqpgqmegl4z2rcfhxjv6pn7dm0n4hndllfaam4fdqwqxld8",
+                "identifier": "ESDTSetRole",
+                "topics": [
+                  "R0VOLTg2ODU5Mw==",
+                  "",
+                  "",
+                  "RVNEVFJvbGVORlRDcmVhdGU="
+                ],
+                "data": null,
+                "additionalData": null
+              },
+              {
+                "address": "erd1qqqqqqqqqqqqqpgqmegl4z2rcfhxjv6pn7dm0n4hndllfaam4fdqwqxld8",
+                "identifier": "completedTxEvent",
+                "topics": [
+                  "g0lK2TaXOLV0pyZsv7Es5jzPY0lQzWsOwWEHuPtC+PY="
+                ],
+                "data": null,
+                "additionalData": null
+              }
+            ]
+          },
+          "operation": "ESDTSetRole",
+          "function": "ESDTSetRole"
+        },
+        {
+          "hash": "a6a665f47977a59c4c2baf460281fc938e04ae0f87ac2e78040a14ae27822701",
+          "nonce": 0,
+          "value": 0,
+          "receiver": "erd1qqqqqqqqqqqqqpgqmegl4z2rcfhxjv6pn7dm0n4hndllfaam4fdqwqxld8",
+          "sender": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
+          "data": "@00",
+          "prevTxHash": "83494ad9369738b574a7266cbfb12ce63ccf634950cd6b0ec16107b8fb42f8f6",
+          "originalTxHash": "d296186b432d7e7937bde37d725cd52b765ef334c00b95adcb079933bc2277bb",
+          "gasLimit": 92399698,
+          "gasPrice": 1000000000,
+          "callType": 2,
+          "originalSender": "erd1qqqqqqqqqqqqqpgqmegl4z2rcfhxjv6pn7dm0n4hndllfaam4fdqwqxld8",
+          "logs": {
+            "address": "erd1qqqqqqqqqqqqqpgqmegl4z2rcfhxjv6pn7dm0n4hndllfaam4fdqwqxld8",
+            "events": [
+              {
+                "address": "erd1qqqqqqqqqqqqqpgqmegl4z2rcfhxjv6pn7dm0n4hndllfaam4fdqwqxld8",
+                "identifier": "writeLog",
+                "topics": [
+                  "AAAAAAAAAAAFAN5R+olDwm5pM0Gfm7fOt5t/9Pe7qlo=",
+                  "QHRvbyBtdWNoIGdhcyBwcm92aWRlZCBmb3IgcHJvY2Vzc2luZzogZ2FzIHByb3ZpZGVkID0gOTIzOTk2OTgsIGdhcyB1c2VkID0gMzE0MTg4MA=="
+                ],
+                "data": "QDZmNmI=",
+                "additionalData": null
+              },
+              {
+                "address": "erd1qqqqqqqqqqqqqpgqmegl4z2rcfhxjv6pn7dm0n4hndllfaam4fdqwqxld8",
+                "identifier": "completedTxEvent",
+                "topics": [
+                  "g0lK2TaXOLV0pyZsv7Es5jzPY0lQzWsOwWEHuPtC+PY="
+                ],
+                "data": null,
+                "additionalData": null
+              }
+            ]
+          },
+          "operation": "transfer"
+        }
+      ],
+      "logs": {
+        "address": "erd1qqqqqqqqqqqqqpgqmegl4z2rcfhxjv6pn7dm0n4hndllfaam4fdqwqxld8",
+        "events": [
+          {
+            "address": "erd1qqqqqqqqqqqqqpgqmegl4z2rcfhxjv6pn7dm0n4hndllfaam4fdqwqxld8",
+            "identifier": "transferValueOnly",
+            "topics": [
+              "AAAAAAAAAAAFAN5R+olDwm5pM0Gfm7fOt5t/9Pe7qlo=",
+              "AAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAC//8=",
+              "saK8LsUAAA=="
+            ],
+            "data": null,
+            "additionalData": null
+          },
+          {
+            "address": "erd1qqqqqqqqqqqqqpgqmegl4z2rcfhxjv6pn7dm0n4hndllfaam4fdqwqxld8",
+            "identifier": "writeLog",
+            "topics": [
+              "0q010iL23pLKW4FcYNxxAVvhcrYh6GgrGH5sMAvWqlo="
+            ],
+            "data": "QDZmNmI=",
+            "additionalData": null
+          }
+        ]
+      },
+      "status": "success",
+      "operation": "transfer",
+      "function": "issueToken",
+      "initiallyPaidFee": "2097020000000000",
+      "fee": "2097020000000000",
+      "chainID": "D",
+      "version": 1,
+      "options": 0
+    }
+  },
+  "error": "",
+  "code": "successful"
+}
+        "#;
+
+    let tx_on_network: TransactionOnNetwork = serde_json::from_str::<TransactionInfo>(data)
+        .unwrap()
+        .data
+        .unwrap()
+        .transaction;
+    let tx_response = TxResponse::from_network_tx(tx_on_network);
+
+    let expected: Option<String> = Some("GEN-868593".to_string());
+
+    assert_eq!(tx_response.new_issued_token_identifier, expected)
+}
+
+#[test]
+fn test_process_issued_token_identifier_meta_esdt() {
+    let data = r#"
+        {
+  "data": {
+    "transaction": {
+      "type": "normal",
+      "processingTypeOnSource": "SCInvoking",
+      "processingTypeOnDestination": "SCInvoking",
+      "hash": "408433c5db749f4666bee6a8b599944071bf493c43ff5f01282a74c22ea2ea43",
+      "nonce": 419,
+      "round": 1787093,
+      "epoch": 744,
+      "value": "50000000000000000",
+      "receiver": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
+      "sender": "erd1j6kua7p67qnaw3y4sudmk25xsuv4k8ws6pwvax8fd2vtmuc3q33s840l87",
+      "gasPrice": 1000000000,
+      "gasLimit": 600000000,
+      "gasUsed": 157220928,
+      "data": "ZGVwbG95QXNoc3dhcExQQUNTdHJhdGVneUA0MTRjNTAyZDYzNjE2NTYxNjMzNUA0MTU0NTMyZDM0NjMzMDM5MzIzMEAwM2U4QDAzZThAQDNiOWFjYTAwQDAwMDAwMDAwMDAwMDAwMDAwNTAwOTU3MzkwYWVkYTQzMmY1MmE0MTFkNTE5NzRmZTkzZDQwZDI3NzMzZTA0NjNAMDAwMDAwMDAwMDAwMDAwMDA1MDBkMTJjYzczY2JkYTZmMjY1OWM5NTllNWQ1NzU4YWY5MmNhMTM4NDg2NTIzM0AwMDAwMDAwMDAwMDAwMDAwMDUwMDUxZGY3MTc1OGNmMmFjYTViNDZkZWQ4MTU1OGI1NTE1ZGMyOWYzZjM1MjMzQEAwMDAwMDAwMDAwMDAwMDAwMDUwMDdlNGExZGZjNDM3Y2VkNDlkYjlmMTYzNzk4NDE2Yjg0YWMyMWQ0Yzk3Y2ViMDAwMDAwMGM1NzQ1NDc0YzQ0MmQ2MTMyMzg2MzM1MzkwMDAwMDAwMDAwMDAwMDAwMDUwMGE4YmE5ZTY4NjI2YmJjOTkzZmQ3OTVlOGJiNmY0Nzk0M2IyZjVmZmE3Y2ViMDAwMDAwMGE1NTU0NGIyZDMxMzQ2NDM1Mzc2NEAwMDAwMDAwMTAwMDAwMDAwMDAwMDAwMDAwNTAwNTFkZjcxNzU4Y2YyYWNhNWI0NmRlZDgxNTU4YjU1MTVkYzI5ZjNmMzUyMzMwMDAwMDAwYjQyNTU1MzQ0MmQ2NDM0NjMzMDMxMzQwMDAwMDAwMDAwQDAxODZhMEAyNzEw",
+      "signature": "4648af0b96eb430e4986b9fb760549742de09c809b46b984e5d995c898d80c25bfc0717c30da34bd89cd3005d98ee895afa39ee588b7b74b4807c63cbeade807",
+      "sourceShard": 1,
+      "destinationShard": 1,
+      "blockNonce": 1785520,
+      "blockHash": "8f926a5d79fa84bc69949a21bfbba17447091a8a074ac172fa0b88e4475a1214",
+      "notarizedAtSourceInMetaNonce": 1785568,
+      "NotarizedAtSourceInMetaHash": "eebd1aa5c3dde083f9c367242c054affedd36bfc95f7bcc1d4e2d90beb5754e9",
+      "notarizedAtDestinationInMetaNonce": 1785568,
+      "notarizedAtDestinationInMetaHash": "eebd1aa5c3dde083f9c367242c054affedd36bfc95f7bcc1d4e2d90beb5754e9",
+      "miniblockType": "TxBlock",
+      "miniblockHash": "b85d82db6d69cbc1911b3455d2837eeb3170b391926efa2eacb4d9c8e3c96ee4",
+      "hyperblockNonce": 1785568,
+      "hyperblockHash": "eebd1aa5c3dde083f9c367242c054affedd36bfc95f7bcc1d4e2d90beb5754e9",
+      "timestamp": 1704722558,
+      "smartContractResults": [
+        {
+          "hash": "ea9a96c079e66249e6b73c0341991dad96ca81f855f2fc4abe0d432be117a882",
+          "nonce": 420,
+          "value": 4427790720000000,
+          "receiver": "erd1j6kua7p67qnaw3y4sudmk25xsuv4k8ws6pwvax8fd2vtmuc3q33s840l87",
+          "sender": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
+          "data": "@6f6b",
+          "prevTxHash": "408433c5db749f4666bee6a8b599944071bf493c43ff5f01282a74c22ea2ea43",
+          "originalTxHash": "408433c5db749f4666bee6a8b599944071bf493c43ff5f01282a74c22ea2ea43",
+          "gasLimit": 0,
+          "gasPrice": 1000000000,
+          "callType": 0,
+          "operation": "transfer",
+          "isRefund": true
+        },
+        {
+          "hash": "6082975132a2c9d8197dfd0f9852b454ad344740eebdbdf93f620b2796ab723b",
+          "nonce": 0,
+          "value": 50000000000000000,
+          "receiver": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
+          "sender": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
+          "data": "registerMetaESDT@415453417368537761704c5041435661756c74@4156415348@12@63616e467265657a65@66616c7365@63616e57697065@66616c7365@63616e5061757365@66616c7365@63616e5472616e736665724e4654437265617465526f6c65@66616c7365@63616e4368616e67654f776e6572@66616c7365@63616e55706772616465@66616c7365@63616e4164645370656369616c526f6c6573@74727565@9eb30a87c92674ab1469700c0b385b3850e86de80f87dec6cf3213c7e379a646@408433c5db749f4666bee6a8b599944071bf493c43ff5f01282a74c22ea2ea43@03eb4a30",
+          "prevTxHash": "408433c5db749f4666bee6a8b599944071bf493c43ff5f01282a74c22ea2ea43",
+          "originalTxHash": "408433c5db749f4666bee6a8b599944071bf493c43ff5f01282a74c22ea2ea43",
+          "gasLimit": 125751600,
+          "gasPrice": 1000000000,
+          "callType": 1,
+          "originalSender": "erd1j6kua7p67qnaw3y4sudmk25xsuv4k8ws6pwvax8fd2vtmuc3q33s840l87",
+          "operation": "transfer",
+          "function": "registerMetaESDT"
+        },
+        {
+          "hash": "290f85d7ec2f7d5797510290358e9e0f76bb880451efaacb0d69280b8d94c67a",
+          "nonce": 0,
+          "value": 0,
+          "receiver": "erd1llllllllllllllllllllllllllllllllllllllllllllllllluqsl6e366",
+          "sender": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
+          "data": "ESDTSetBurnRoleForAll@41564153482d376438623564",
+          "prevTxHash": "6082975132a2c9d8197dfd0f9852b454ad344740eebdbdf93f620b2796ab723b",
+          "originalTxHash": "408433c5db749f4666bee6a8b599944071bf493c43ff5f01282a74c22ea2ea43",
+          "gasLimit": 0,
+          "gasPrice": 1000000000,
+          "callType": 0,
+          "originalSender": "erd1j6kua7p67qnaw3y4sudmk25xsuv4k8ws6pwvax8fd2vtmuc3q33s840l87",
+          "logs": {
+            "address": "erd1llllllllllllllllllllllllllllllllllllllllllllllllluqsl6e366",
+            "events": [
+              {
+                "address": "erd1llllllllllllllllllllllllllllllllllllllllllllllllluqsl6e366",
+                "identifier": "completedTxEvent",
+                "topics": [
+                  "YIKXUTKiydgZff0PmFK0VK00R0Duvb35P2ILJ5arcjs="
+                ],
+                "data": null,
+                "additionalData": null
+              }
+            ]
+          },
+          "operation": "transfer"
+        },
+        {
+          "hash": "1aa62a6251edd216bd4e5ae59f7e676d5d2f88597685e0ec0e25ac4434bfccdb",
+          "nonce": 0,
+          "value": 0,
+          "receiver": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
+          "sender": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
+          "data": "@00@41564153482d376438623564@d0644194444642fd16ee156307f6fda0e8f8baf4c496e1a1dc85e027ecc08a4a@9eb30a87c92674ab1469700c0b385b3850e86de80f87dec6cf3213c7e379a646@408433c5db749f4666bee6a8b599944071bf493c43ff5f01282a74c22ea2ea43@00",
+          "prevTxHash": "6082975132a2c9d8197dfd0f9852b454ad344740eebdbdf93f620b2796ab723b",
+          "originalTxHash": "408433c5db749f4666bee6a8b599944071bf493c43ff5f01282a74c22ea2ea43",
+          "gasLimit": 75751600,
+          "gasPrice": 1000000000,
+          "callType": 2,
+          "originalSender": "erd1j6kua7p67qnaw3y4sudmk25xsuv4k8ws6pwvax8fd2vtmuc3q33s840l87",
+          "logs": {
+            "address": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
+            "events": [
+              {
+                "address": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
+                "identifier": "writeLog",
+                "topics": [
+                  "AAAAAAAAAAAFAH6UefeHERqHcLpMz2gC3xXGhFsJBGM=",
+                  "QHRvbyBtdWNoIGdhcyBwcm92aWRlZCBmb3IgcHJvY2Vzc2luZzogZ2FzIHByb3ZpZGVkID0gNzU3NTE2MDAsIGdhcyB1c2VkID0gNDE3NjA1OQ=="
+                ],
+                "data": "QDZmNmI=",
+                "additionalData": [
+                  "QDZmNmI="
+                ]
+              },
+              {
+                "address": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
+                "identifier": "completedTxEvent",
+                "topics": [
+                  "YIKXUTKiydgZff0PmFK0VK00R0Duvb35P2ILJ5arcjs="
+                ],
+                "data": null,
+                "additionalData": null
+              }
+            ]
+          },
+          "operation": "transfer"
+        }
+      ],
+      "logs": {
+        "address": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
+        "events": [
+          {
+            "address": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
+            "identifier": "transferValueOnly",
+            "topics": [
+              "",
+              "AAAAAAAAAAAFANAMwOY4h/9reS00I0pE56xrV11LBGM="
+            ],
+            "data": "RGVwbG95RnJvbVNvdXJjZQ==",
+            "additionalData": [
+              "RGVwbG95RnJvbVNvdXJjZQ==",
+              "aW5pdA==",
+              "QUxQLWNhZWFjNQ==",
+              "QVRTLTRjMDkyMA==",
+              "A+g=",
+              "A+g=",
+              "",
+              "O5rKAA=="
+            ]
+          },
+          {
+            "address": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
+            "identifier": "transferValueOnly",
+            "topics": [
+              "",
+              "AAAAAAAAAAAFADJ0SE0vUW6bO5SurLeFIMfK/HtBBGM="
+            ],
+            "data": "RGVwbG95RnJvbVNvdXJjZQ==",
+            "additionalData": [
+              "RGVwbG95RnJvbVNvdXJjZQ==",
+              "aW5pdA==",
+              "AAAAAAAAAAAFANAMwOY4h/9reS00I0pE56xrV11LBGM=",
+              "AAAAAAAAAAAFAJVzkK7aQy9SpBHVGXT+k9QNJ3M+BGM=",
+              "AAAAAAAAAAAFANEsxzy9pvJlnJWeXVdYr5LKE4SGUjM=",
+              "AAAAAAAAAAAFAFHfcXWM8qyltG3tgVWLVRXcKfPzUjM=",
+              "",
+              "AAAAAAAAAAAFAH5KHfxDfO1J258WN5hBa4SsIdTJfOsAAAAMV0VHTEQtYTI4YzU5AAAAAAAAAAAFAKi6nmhia7yZP9eV6LtvR5Q7L1/6fOsAAAAKVVRLLTE0ZDU3ZA==",
+              "AAAAAQAAAAAAAAAABQBR33F1jPKspbRt7YFVi1UV3Cnz81IzAAAAC0JVU0QtZDRjMDE0AAAAAAA=",
+              "AYag",
+              "JxA="
+            ]
+          },
+          {
+            "address": "erd1qqqqqqqqqqqqqpgqxf6ysnf029hfkwu546kt0pfqcl90c76pq33s0a320f",
+            "identifier": "transferValueOnly",
+            "topics": [
+              "",
+              "AAAAAAAAAAAFANEsxzy9pvJlnJWeXVdYr5LKE4SGUjM="
+            ],
+            "data": "RXhlY3V0ZU9uRGVzdENvbnRleHQ=",
+            "additionalData": [
+              "RXhlY3V0ZU9uRGVzdENvbnRleHQ=",
+              "Z2V0RmFybWluZ1Rva2VuSWQ="
+            ]
+          },
+          {
+            "address": "erd1qqqqqqqqqqqqqpgqxf6ysnf029hfkwu546kt0pfqcl90c76pq33s0a320f",
+            "identifier": "transferValueOnly",
+            "topics": [
+              "",
+              "AAAAAAAAAAAFANEsxzy9pvJlnJWeXVdYr5LKE4SGUjM="
+            ],
+            "data": "RXhlY3V0ZU9uRGVzdENvbnRleHQ=",
+            "additionalData": [
+              "RXhlY3V0ZU9uRGVzdENvbnRleHQ=",
+              "Z2V0RmFybVRva2VuSWQ="
+            ]
+          },
+          {
+            "address": "erd1qqqqqqqqqqqqqpgqxf6ysnf029hfkwu546kt0pfqcl90c76pq33s0a320f",
+            "identifier": "transferValueOnly",
+            "topics": [
+              "",
+              "AAAAAAAAAAAFANEsxzy9pvJlnJWeXVdYr5LKE4SGUjM="
+            ],
+            "data": "RXhlY3V0ZU9uRGVzdENvbnRleHQ=",
+            "additionalData": [
+              "RXhlY3V0ZU9uRGVzdENvbnRleHQ=",
+              "Z2V0UmV3YXJkVG9rZW5JZA=="
+            ]
+          },
+          {
+            "address": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
+            "identifier": "transferValueOnly",
+            "topics": [
+              "saK8LsUAAA==",
+              "AAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAC//8="
+            ],
+            "data": "QXN5bmNDYWxs",
+            "additionalData": [
+              "QXN5bmNDYWxs",
+              "cmVnaXN0ZXJNZXRhRVNEVA==",
+              "QVRTQXNoU3dhcExQQUNWYXVsdA==",
+              "QVZBU0g=",
+              "Eg==",
+              "Y2FuRnJlZXpl",
+              "ZmFsc2U=",
+              "Y2FuV2lwZQ==",
+              "ZmFsc2U=",
+              "Y2FuUGF1c2U=",
+              "ZmFsc2U=",
+              "Y2FuVHJhbnNmZXJORlRDcmVhdGVSb2xl",
+              "ZmFsc2U=",
+              "Y2FuQ2hhbmdlT3duZXI=",
+              "ZmFsc2U=",
+              "Y2FuVXBncmFkZQ==",
+              "ZmFsc2U=",
+              "Y2FuQWRkU3BlY2lhbFJvbGVz",
+              "dHJ1ZQ=="
+            ]
+          },
+          {
+            "address": "erd1qqqqqqqqqqqqqpgqxf6ysnf029hfkwu546kt0pfqcl90c76pq33s0a320f",
+            "identifier": "SCDeploy",
+            "topics": [
+              "AAAAAAAAAAAFADJ0SE0vUW6bO5SurLeFIMfK/HtBBGM=",
+              "AAAAAAAAAAAFAH6UefeHERqHcLpMz2gC3xXGhFsJBGM=",
+              "fvRqbue54Womde/CN2IkRGkrx8tsU+xkLvi3+uwMkhY="
+            ],
+            "data": null,
+            "additionalData": null
+          },
+          {
+            "address": "erd1qqqqqqqqqqqqqpgq6qxvpe3csllkk7fdxs3553884344wh2tq33sakulat",
+            "identifier": "SCDeploy",
+            "topics": [
+              "AAAAAAAAAAAFANAMwOY4h/9reS00I0pE56xrV11LBGM=",
+              "AAAAAAAAAAAFAH6UefeHERqHcLpMz2gC3xXGhFsJBGM=",
+              "E3blQfRJfCKLWDr06Od703DSZenIzq8KND+xUjmGY/M="
+            ],
+            "data": null,
+            "additionalData": null
+          }
+        ]
+      },
+      "status": "success",
+      "operation": "transfer",
+      "function": "deployAshswapLPACStrategy",
+      "initiallyPaidFee": "6936045000000000",
+      "fee": "2508254280000000",
+      "chainID": "D",
+      "version": 1,
+      "options": 0
+    }
+  },
+  "error": "",
+  "code": "successful"
+}
+        "#;
+
+    let tx_on_network: TransactionOnNetwork = serde_json::from_str::<TransactionInfo>(data)
+        .unwrap()
+        .data
+        .unwrap()
+        .transaction;
+    let tx_response = TxResponse::from_network_tx(tx_on_network);
+
+    let expected: Option<String> = Some("AVASH-7d8b5d".to_string());
+
+    assert_eq!(tx_response.new_issued_token_identifier, expected)
+}
+
+#[test]
+fn test_set_special_roles_should_not_process_issued_token_identifier() {
+    let data = r#"
+        {
+  "data": {
+    "transaction": {
+      "type": "normal",
+      "processingTypeOnSource": "SCInvoking",
+      "processingTypeOnDestination": "SCInvoking",
+      "hash": "cbb1f866da564a04332297dfc4f637be2e50e62bbf4441bf42247ad429747ce0",
+      "nonce": 420,
+      "round": 1787109,
+      "epoch": 744,
+      "value": "0",
+      "receiver": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
+      "sender": "erd1j6kua7p67qnaw3y4sudmk25xsuv4k8ws6pwvax8fd2vtmuc3q33s840l87",
+      "gasPrice": 1000000000,
+      "gasLimit": 600000000,
+      "gasUsed": 129636807,
+      "data": "ZmluaXNoVmF1bHREZXBsb3ltZW50cw==",
+      "signature": "dca943ef1a788bfa6cb0e9aa3900b8340e4908075cbfefaa2a66688f6f0c0fed349edb2eb48eec427cd9098822fba875e4d66072fbdb44cb7f4c1a416736e20c",
+      "sourceShard": 1,
+      "destinationShard": 1,
+      "blockNonce": 1785536,
+      "blockHash": "93ca539e81612768b67a85b7135f7c104e76bec031a758a6b1782910ae49dd8f",
+      "notarizedAtSourceInMetaNonce": 1785584,
+      "NotarizedAtSourceInMetaHash": "71d17afe660282bb42de1ea3eec3e3534a179bd32aa1471c2861ce411bf30552",
+      "notarizedAtDestinationInMetaNonce": 1785584,
+      "notarizedAtDestinationInMetaHash": "71d17afe660282bb42de1ea3eec3e3534a179bd32aa1471c2861ce411bf30552",
+      "miniblockType": "TxBlock",
+      "miniblockHash": "f8c60565af746e92d2c9c09a92734e5eb8da7e42c67a86854c93b349bfe287eb",
+      "hyperblockNonce": 1785584,
+      "hyperblockHash": "71d17afe660282bb42de1ea3eec3e3534a179bd32aa1471c2861ce411bf30552",
+      "timestamp": 1704722654,
+      "smartContractResults": [
+        {
+          "hash": "c3ce9c364de3823ffae250c2bfb40aaf2b18f771ed4bd37bf788ad83a2c651f3",
+          "nonce": 421,
+          "value": 4703631930000000,
+          "receiver": "erd1j6kua7p67qnaw3y4sudmk25xsuv4k8ws6pwvax8fd2vtmuc3q33s840l87",
+          "sender": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
+          "data": "@6f6b",
+          "prevTxHash": "cbb1f866da564a04332297dfc4f637be2e50e62bbf4441bf42247ad429747ce0",
+          "originalTxHash": "cbb1f866da564a04332297dfc4f637be2e50e62bbf4441bf42247ad429747ce0",
+          "gasLimit": 0,
+          "gasPrice": 1000000000,
+          "callType": 0,
+          "operation": "transfer",
+          "isRefund": true
+        },
+        {
+          "hash": "50f9c25a1402ce6d87ae9f890659c8a67462292e471e02c74d64ff7ba1995e60",
+          "nonce": 0,
+          "value": 0,
+          "receiver": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
+          "sender": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
+          "data": "setSpecialRole@41564153482d376438623564@00000000000000000500d00cc0e63887ff6b792d34234a44e7ac6b575d4b0463@45534454526f6c654e4654437265617465@45534454526f6c654e46544164645175616e74697479@45534454526f6c654e46544275726e@0192c6db2c69f50b6968fb22ac558337a851719519cfd1e6bbf79a07bbcf18bc@cbb1f866da564a04332297dfc4f637be2e50e62bbf4441bf42247ad429747ce0@03eb4a30",
+          "prevTxHash": "cbb1f866da564a04332297dfc4f637be2e50e62bbf4441bf42247ad429747ce0",
+          "originalTxHash": "cbb1f866da564a04332297dfc4f637be2e50e62bbf4441bf42247ad429747ce0",
+          "gasLimit": 125751600,
+          "gasPrice": 1000000000,
+          "callType": 1,
+          "originalSender": "erd1j6kua7p67qnaw3y4sudmk25xsuv4k8ws6pwvax8fd2vtmuc3q33s840l87",
+          "operation": "transfer",
+          "function": "setSpecialRole"
+        },
+        {
+          "hash": "d6a5824a60b6c9050462c3f5a02ace00c36e8b4ba1958d132bd394e2ed1e7226",
+          "nonce": 0,
+          "value": 0,
+          "receiver": "erd1qqqqqqqqqqqqqpgq6qxvpe3csllkk7fdxs3553884344wh2tq33sakulat",
+          "sender": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
+          "data": "ESDTSetRole@41564153482d376438623564@45534454526f6c654e4654437265617465@45534454526f6c654e46544164645175616e74697479@45534454526f6c654e46544275726e",
+          "prevTxHash": "50f9c25a1402ce6d87ae9f890659c8a67462292e471e02c74d64ff7ba1995e60",
+          "originalTxHash": "cbb1f866da564a04332297dfc4f637be2e50e62bbf4441bf42247ad429747ce0",
+          "gasLimit": 0,
+          "gasPrice": 1000000000,
+          "callType": 0,
+          "originalSender": "erd1j6kua7p67qnaw3y4sudmk25xsuv4k8ws6pwvax8fd2vtmuc3q33s840l87",
+          "logs": {
+            "address": "erd1qqqqqqqqqqqqqpgq6qxvpe3csllkk7fdxs3553884344wh2tq33sakulat",
+            "events": [
+              {
+                "address": "erd1qqqqqqqqqqqqqpgq6qxvpe3csllkk7fdxs3553884344wh2tq33sakulat",
+                "identifier": "ESDTSetRole",
+                "topics": [
+                  "QVZBU0gtN2Q4YjVk",
+                  "",
+                  "",
+                  "RVNEVFJvbGVORlRDcmVhdGU=",
+                  "RVNEVFJvbGVORlRBZGRRdWFudGl0eQ==",
+                  "RVNEVFJvbGVORlRCdXJu"
+                ],
+                "data": null,
+                "additionalData": null
+              },
+              {
+                "address": "erd1qqqqqqqqqqqqqpgq6qxvpe3csllkk7fdxs3553884344wh2tq33sakulat",
+                "identifier": "completedTxEvent",
+                "topics": [
+                  "UPnCWhQCzm2Hrp+JBlnIpnRiKS5HHgLHTWT/e6GZXmA="
+                ],
+                "data": null,
+                "additionalData": null
+              }
+            ]
+          },
+          "operation": "ESDTSetRole",
+          "function": "ESDTSetRole"
+        },
+        {
+          "hash": "bf1b8b4b301ff548368dfd972896489d5e2a088d5cbdfa1bfe2421cc7f641f7a",
+          "nonce": 0,
+          "value": 0,
+          "receiver": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
+          "sender": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
+          "data": "@00@a68d44c751eba85db0713db8dc9c10c78749189ec0d6f1af5fc67bb656c1254b@0192c6db2c69f50b6968fb22ac558337a851719519cfd1e6bbf79a07bbcf18bc@cbb1f866da564a04332297dfc4f637be2e50e62bbf4441bf42247ad429747ce0@00",
+          "prevTxHash": "50f9c25a1402ce6d87ae9f890659c8a67462292e471e02c74d64ff7ba1995e60",
+          "originalTxHash": "cbb1f866da564a04332297dfc4f637be2e50e62bbf4441bf42247ad429747ce0",
+          "gasLimit": 75751600,
+          "gasPrice": 1000000000,
+          "callType": 2,
+          "originalSender": "erd1j6kua7p67qnaw3y4sudmk25xsuv4k8ws6pwvax8fd2vtmuc3q33s840l87",
+          "logs": {
+            "address": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
+            "events": [
+              {
+                "address": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
+                "identifier": "transferValueOnly",
+                "topics": [
+                  "",
+                  "AAAAAAAAAAAFANAMwOY4h/9reS00I0pE56xrV11LBGM="
+                ],
+                "data": "RXhlY3V0ZU9uRGVzdENvbnRleHQ=",
+                "additionalData": [
+                  "RXhlY3V0ZU9uRGVzdENvbnRleHQ=",
+                  "c2V0U2hhcmVUb2tlbklkZW50aWZpZXI=",
+                  "QVZBU0gtN2Q4YjVk"
+                ]
+              },
+              {
+                "address": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
+                "identifier": "transferValueOnly",
+                "topics": [
+                  "",
+                  "AAAAAAAAAAAFANAMwOY4h/9reS00I0pE56xrV11LBGM="
+                ],
+                "data": "RXhlY3V0ZU9uRGVzdENvbnRleHQ=",
+                "additionalData": [
+                  "RXhlY3V0ZU9uRGVzdENvbnRleHQ=",
+                  "c2V0U3RyYXRlZ3lBZGRyZXNz",
+                  "AAAAAAAAAAAFADJ0SE0vUW6bO5SurLeFIMfK/HtBBGM="
+                ]
+              },
+              {
+                "address": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
+                "identifier": "completedTxEvent",
+                "topics": [
+                  "UPnCWhQCzm2Hrp+JBlnIpnRiKS5HHgLHTWT/e6GZXmA="
+                ],
+                "data": null,
+                "additionalData": null
+              }
+            ]
+          },
+          "operation": "transfer"
+        },
+        {
+          "hash": "9d75a398545f488d4764149245e6ec3101debfce99477c353ac11c3239acd897",
+          "nonce": 1,
+          "value": 648519550000000,
+          "receiver": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
+          "sender": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
+          "data": "@6f6b",
+          "prevTxHash": "bf1b8b4b301ff548368dfd972896489d5e2a088d5cbdfa1bfe2421cc7f641f7a",
+          "originalTxHash": "cbb1f866da564a04332297dfc4f637be2e50e62bbf4441bf42247ad429747ce0",
+          "gasLimit": 0,
+          "gasPrice": 1000000000,
+          "callType": 0,
+          "operation": "transfer",
+          "isRefund": true
+        }
+      ],
+      "logs": {
+        "address": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
+        "events": [
+          {
+            "address": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
+            "identifier": "transferValueOnly",
+            "topics": [
+              "",
+              "AAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAC//8="
+            ],
+            "data": "QXN5bmNDYWxs",
+            "additionalData": [
+              "QXN5bmNDYWxs",
+              "c2V0U3BlY2lhbFJvbGU=",
+              "QVZBU0gtN2Q4YjVk",
+              "AAAAAAAAAAAFANAMwOY4h/9reS00I0pE56xrV11LBGM=",
+              "RVNEVFJvbGVORlRDcmVhdGU=",
+              "RVNEVFJvbGVORlRBZGRRdWFudGl0eQ==",
+              "RVNEVFJvbGVORlRCdXJu"
+            ]
+          }
+        ]
+      },
+      "status": "success",
+      "operation": "transfer",
+      "function": "finishVaultDeployments",
+      "initiallyPaidFee": "6082170000000000",
+      "fee": "1378538070000000",
+      "chainID": "D",
+      "version": 1,
+      "options": 0
+    }
+  },
+  "error": "",
+  "code": "successful"
+}
+        "#;
+
+    let tx_on_network: TransactionOnNetwork = serde_json::from_str::<TransactionInfo>(data)
+        .unwrap()
+        .data
+        .unwrap()
+        .transaction;
+    let tx_response = TxResponse::from_network_tx(tx_on_network);
+
+    let expected: Option<String> = None;
+
+    assert_eq!(tx_response.new_issued_token_identifier, expected)
+}
+
+#[test]
+fn test_multisig_issue_nft_and_set_all_roles() {
+    let data = r#"
+{
+  "data": {
+    "transaction": {
+      "type": "normal",
+      "processingTypeOnSource": "SCInvoking",
+      "processingTypeOnDestination": "SCInvoking",
+      "hash": "08582bc19734ad82d7390be88463c948e5d9f026f4b8f0bfc57620957c3433bd",
+      "nonce": 53,
+      "round": 3050972,
+      "epoch": 1246,
+      "value": "0",
+      "receiver": "erd1qqqqqqqqqqqqqpgqrp3n58vp2dmcaur4whazxngvuhac4xwqa4sq2pjl73",
+      "sender": "erd1uv40ahysflse896x4ktnh6ecx43u7cmy9wnxnvcyp7deg299a4sq6vaywa",
+      "gasPrice": 1000000000,
+      "gasLimit": 80000000,
+      "gasUsed": 80000000,
+      "data": "cGVyZm9ybUFjdGlvbkAwMQ==",
+      "signature": "cb67645595cee5f7967d8d85af05bb7db73e80d9b97611796819249d87cd174b69b4abfc2a3fbe52df1aec965bdea921f7eb34d2b1118aa480699ad1dc85790a",
+      "sourceShard": 0,
+      "destinationShard": 0,
+      "blockNonce": 2984930,
+      "blockHash": "644ae8703b826a23e89429953919ec37f875e34a547ea9f7edd53fb71a99c746",
+      "notarizedAtSourceInMetaNonce": 2988311,
+      "NotarizedAtSourceInMetaHash": "4f608a72e654dd9f466801cd489be8ee1a73fbcd77b128559cd46182d3b9455a",
+      "notarizedAtDestinationInMetaNonce": 2988311,
+      "notarizedAtDestinationInMetaHash": "4f608a72e654dd9f466801cd489be8ee1a73fbcd77b128559cd46182d3b9455a",
+      "miniblockType": "TxBlock",
+      "miniblockHash": "c5a73671bc1d37835ddd15b926157721bc83203ec4e00cd48ae0d46015cb5f0b",
+      "hyperblockNonce": 2988311,
+      "hyperblockHash": "4f608a72e654dd9f466801cd489be8ee1a73fbcd77b128559cd46182d3b9455a",
+      "timestamp": 1712305832,
+      "smartContractResults": [
+        {
+          "hash": "b0b3c8df519c33b314c0ee3d25abae6f17c4432fb3382676ce17a42690811cff",
+          "nonce": 0,
+          "value": 50000000000000000,
+          "receiver": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
+          "sender": "erd1qqqqqqqqqqqqqpgqrp3n58vp2dmcaur4whazxngvuhac4xwqa4sq2pjl73",
+          "data": "registerAndSetAllRoles@54657374436f6c6c656374696f6e31@54455354434f4c4c31@4e4654@@98fa4ff554b9c6990ce577fbb816a271f690dcbd6b148f6583fe7692868ae538@08582bc19734ad82d7390be88463c948e5d9f026f4b8f0bfc57620957c3433bd@5e2338",
+          "prevTxHash": "08582bc19734ad82d7390be88463c948e5d9f026f4b8f0bfc57620957c3433bd",
+          "originalTxHash": "08582bc19734ad82d7390be88463c948e5d9f026f4b8f0bfc57620957c3433bd",
+          "gasLimit": 73052300,
+          "gasPrice": 1000000000,
+          "callType": 1,
+          "originalSender": "erd1uv40ahysflse896x4ktnh6ecx43u7cmy9wnxnvcyp7deg299a4sq6vaywa",
+          "operation": "transfer",
+          "function": "registerAndSetAllRoles"
+        },
+        {
+          "hash": "5ae4f74e134e4fa63c8b92e06ff12b2a4b544233d01d80db6a922af35ee55356",
+          "nonce": 1,
+          "value": 196430610000000,
+          "receiver": "erd1qqqqqqqqqqqqqpgqrp3n58vp2dmcaur4whazxngvuhac4xwqa4sq2pjl73",
+          "sender": "erd1qqqqqqqqqqqqqpgqrp3n58vp2dmcaur4whazxngvuhac4xwqa4sq2pjl73",
+          "data": "@6f6b",
+          "prevTxHash": "c4a24b01b48d32308636310e2d335d6ed1f34dcbdfc1133aed7995e78e831c18",
+          "originalTxHash": "08582bc19734ad82d7390be88463c948e5d9f026f4b8f0bfc57620957c3433bd",
+          "gasLimit": 0,
+          "gasPrice": 1000000000,
+          "callType": 0,
+          "operation": "transfer",
+          "isRefund": true
+        },
+        {
+          "hash": "7589c1ad622d8a9ab2f186731fc82aeeab0aea5a8198cb94b6eba85a966e7962",
+          "nonce": 0,
+          "value": 0,
+          "receiver": "erd1llllllllllllllllllllllllllllllllllllllllllllllllluqq2m3f0f",
+          "sender": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
+          "data": "ESDTSetBurnRoleForAll@54455354434f4c4c312d356161383063",
+          "prevTxHash": "b0b3c8df519c33b314c0ee3d25abae6f17c4432fb3382676ce17a42690811cff",
+          "originalTxHash": "08582bc19734ad82d7390be88463c948e5d9f026f4b8f0bfc57620957c3433bd",
+          "gasLimit": 0,
+          "gasPrice": 1000000000,
+          "callType": 0,
+          "originalSender": "erd1uv40ahysflse896x4ktnh6ecx43u7cmy9wnxnvcyp7deg299a4sq6vaywa",
+          "logs": {
+            "address": "erd1llllllllllllllllllllllllllllllllllllllllllllllllluqq2m3f0f",
+            "events": [
+              {
+                "address": "erd1llllllllllllllllllllllllllllllllllllllllllllllllluqq2m3f0f",
+                "identifier": "completedTxEvent",
+                "topics": [
+                  "sLPI31GcM7MUwO49JauubxfEQy+zOCZ2zhekJpCBHP8="
+                ]
+              }
+            ]
+          },
+          "operation": "transfer"
+        },
+        {
+          "hash": "86d1ec3365ea1311dbde2f2366de4ea8627d7e49c29a974578c0869b66903cbc",
+          "nonce": 0,
+          "value": 0,
+          "receiver": "erd1qqqqqqqqqqqqqpgqrp3n58vp2dmcaur4whazxngvuhac4xwqa4sq2pjl73",
+          "sender": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
+          "data": "ESDTSetRole@54455354434f4c4c312d356161383063@45534454526f6c654e4654437265617465@45534454526f6c654e46544275726e@45534454526f6c654e465455706461746541747472696275746573@45534454526f6c654e4654416464555249",
+          "prevTxHash": "b0b3c8df519c33b314c0ee3d25abae6f17c4432fb3382676ce17a42690811cff",
+          "originalTxHash": "08582bc19734ad82d7390be88463c948e5d9f026f4b8f0bfc57620957c3433bd",
+          "gasLimit": 0,
+          "gasPrice": 1000000000,
+          "callType": 0,
+          "originalSender": "erd1uv40ahysflse896x4ktnh6ecx43u7cmy9wnxnvcyp7deg299a4sq6vaywa",
+          "logs": {
+            "address": "erd1qqqqqqqqqqqqqpgqrp3n58vp2dmcaur4whazxngvuhac4xwqa4sq2pjl73",
+            "events": [
+              {
+                "address": "erd1qqqqqqqqqqqqqpgqrp3n58vp2dmcaur4whazxngvuhac4xwqa4sq2pjl73",
+                "identifier": "ESDTSetRole",
+                "topics": [
+                  "VEVTVENPTEwxLTVhYTgwYw==",
+                  "",
+                  "",
+                  "RVNEVFJvbGVORlRDcmVhdGU=",
+                  "RVNEVFJvbGVORlRCdXJu",
+                  "RVNEVFJvbGVORlRVcGRhdGVBdHRyaWJ1dGVz",
+                  "RVNEVFJvbGVORlRBZGRVUkk="
+                ]
+              },
+              {
+                "address": "erd1qqqqqqqqqqqqqpgqrp3n58vp2dmcaur4whazxngvuhac4xwqa4sq2pjl73",
+                "identifier": "completedTxEvent",
+                "topics": [
+                  "sLPI31GcM7MUwO49JauubxfEQy+zOCZ2zhekJpCBHP8="
+                ]
+              }
+            ]
+          },
+          "operation": "ESDTSetRole",
+          "function": "ESDTSetRole"
+        },
+        {
+          "hash": "c4a24b01b48d32308636310e2d335d6ed1f34dcbdfc1133aed7995e78e831c18",
+          "nonce": 0,
+          "value": 0,
+          "receiver": "erd1qqqqqqqqqqqqqpgqrp3n58vp2dmcaur4whazxngvuhac4xwqa4sq2pjl73",
+          "sender": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
+          "data": "@00@54455354434f4c4c312d356161383063@3ec73c55022548038bbe06c0639156b3db70b7c770955e340f14fcfcd45df06a@98fa4ff554b9c6990ce577fbb816a271f690dcbd6b148f6583fe7692868ae538@08582bc19734ad82d7390be88463c948e5d9f026f4b8f0bfc57620957c3433bd@00",
+          "prevTxHash": "b0b3c8df519c33b314c0ee3d25abae6f17c4432fb3382676ce17a42690811cff",
+          "originalTxHash": "08582bc19734ad82d7390be88463c948e5d9f026f4b8f0bfc57620957c3433bd",
+          "gasLimit": 23052300,
+          "gasPrice": 1000000000,
+          "callType": 2,
+          "originalSender": "erd1uv40ahysflse896x4ktnh6ecx43u7cmy9wnxnvcyp7deg299a4sq6vaywa",
+          "logs": {
+            "address": "erd1qqqqqqqqqqqqqpgqrp3n58vp2dmcaur4whazxngvuhac4xwqa4sq2pjl73",
+            "events": [
+              {
+                "address": "erd1qqqqqqqqqqqqqpgqrp3n58vp2dmcaur4whazxngvuhac4xwqa4sq2pjl73",
+                "identifier": "callBack",
+                "topics": [
+                  "YXN5bmNDYWxsU3VjY2Vzcw==",
+                  "VEVTVENPTEwxLTVhYTgwYw=="
+                ],
+                "additionalData": [
+                  ""
+                ]
+              },
+              {
+                "address": "erd1qqqqqqqqqqqqqpgqrp3n58vp2dmcaur4whazxngvuhac4xwqa4sq2pjl73",
+                "identifier": "completedTxEvent",
+                "topics": [
+                  "sLPI31GcM7MUwO49JauubxfEQy+zOCZ2zhekJpCBHP8="
+                ]
+              }
+            ]
+          },
+          "operation": "transfer"
+        }
+      ],
+      "logs": {
+        "address": "erd1qqqqqqqqqqqqqpgqrp3n58vp2dmcaur4whazxngvuhac4xwqa4sq2pjl73",
+        "events": [
+          {
+            "address": "erd1qqqqqqqqqqqqqpgqrp3n58vp2dmcaur4whazxngvuhac4xwqa4sq2pjl73",
+            "identifier": "performAction",
+            "topics": [
+              "c3RhcnRQZXJmb3JtQWN0aW9u"
+            ],
+            "data": "AAAAAQYAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAL//wAAAAexorwuxQAAAAAAFnJlZ2lzdGVyQW5kU2V0QWxsUm9sZXMAAAAEAAAAD1Rlc3RDb2xsZWN0aW9uMQAAAAlURVNUQ09MTDEAAAADTkZUAAAAAAAAAATjKv7ckE/hk5dGrZc76zg1Y89jZCumabMED5uUKKXtYLE6AXQjw2bK/4zs+3ehJhChMPSIgTQSLHk3/q4NbX0XOvjZyUI7JXfGJSciwdkCEqQRH3ID+XRPdvz6HQoxADOyoRVVzlIeSUTgmrF1SdhbSH3NJshLUBejnjGjZwiJug==",
+            "additionalData": [
+              "AAAAAQYAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAL//wAAAAexorwuxQAAAAAAFnJlZ2lzdGVyQW5kU2V0QWxsUm9sZXMAAAAEAAAAD1Rlc3RDb2xsZWN0aW9uMQAAAAlURVNUQ09MTDEAAAADTkZUAAAAAAAAAATjKv7ckE/hk5dGrZc76zg1Y89jZCumabMED5uUKKXtYLE6AXQjw2bK/4zs+3ehJhChMPSIgTQSLHk3/q4NbX0XOvjZyUI7JXfGJSciwdkCEqQRH3ID+XRPdvz6HQoxADOyoRVVzlIeSUTgmrF1SdhbSH3NJshLUBejnjGjZwiJug=="
+            ]
+          },
+          {
+            "address": "erd1qqqqqqqqqqqqqpgqrp3n58vp2dmcaur4whazxngvuhac4xwqa4sq2pjl73",
+            "identifier": "performAction",
+            "topics": [
+              "cGVyZm9ybUFzeW5jQ2FsbA==",
+              "AQ==",
+              "AAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAC//8=",
+              "saK8LsUAAA==",
+              "BGa4HQ==",
+              "cmVnaXN0ZXJBbmRTZXRBbGxSb2xlcw==",
+              "VGVzdENvbGxlY3Rpb24x",
+              "VEVTVENPTEwx",
+              "TkZU",
+              ""
+            ],
+            "additionalData": [
+              ""
+            ]
+          },
+          {
+            "address": "erd1qqqqqqqqqqqqqpgqrp3n58vp2dmcaur4whazxngvuhac4xwqa4sq2pjl73",
+            "identifier": "transferValueOnly",
+            "topics": [
+              "saK8LsUAAA==",
+              "AAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAC//8="
+            ],
+            "data": "QXN5bmNDYWxs",
+            "additionalData": [
+              "QXN5bmNDYWxs",
+              "cmVnaXN0ZXJBbmRTZXRBbGxSb2xlcw==",
+              "VGVzdENvbGxlY3Rpb24x",
+              "VEVTVENPTEwx",
+              "TkZU",
+              ""
+            ]
+          },
+          {
+            "address": "erd1qqqqqqqqqqqqqpgqrp3n58vp2dmcaur4whazxngvuhac4xwqa4sq2pjl73",
+            "identifier": "writeLog",
+            "topics": [
+              "4yr+3JBP4ZOXRq2XO+s4NWPPY2QrpmmzBA+blCil7WA="
+            ],
+            "data": "QDZmNmI=",
+            "additionalData": [
+              "QDZmNmI="
+            ]
+          }
+        ]
+      },
+      "status": "success",
+      "operation": "transfer",
+      "function": "performAction",
+      "initiallyPaidFee": "873260000000000",
+      "fee": "873260000000000",
+      "chainID": "D",
+      "version": 1,
+      "options": 0
+    }
+  },
+  "code": "successful"
+}
+        "#;
+
+    let tx_on_network: TransactionOnNetwork = serde_json::from_str::<TransactionInfo>(data)
+        .unwrap()
+        .data
+        .unwrap()
+        .transaction;
+    let tx_response = TxResponse::from_network_tx(tx_on_network);
+
+    let expected = Some("TESTCOLL1-5aa80c".to_string());
+
+    assert_eq!(tx_response.new_issued_token_identifier, expected)
+}
diff --git a/framework/snippets/src/interactor_retrieve.rs b/framework/snippets/src/interactor_retrieve.rs
index 6dfa0c5085..8b9e0031ab 100644
--- a/framework/snippets/src/interactor_retrieve.rs
+++ b/framework/snippets/src/interactor_retrieve.rs
@@ -17,10 +17,27 @@ impl Interactor {
         let start_time = Instant::now();
 
         loop {
-            match self.proxy.get_transaction_info_with_results(&tx_hash).await {
-                Ok(tx) => {
-                    info!("Transaction retrieved successfully: {:#?}", tx);
-                    return tx;
+            match self.proxy.get_transaction_status(&tx_hash).await {
+                Ok(status) => {
+                    // checks if transaction status is final
+                    match status.as_str() {
+                        "success" | "fail" => {
+                            // retrieve transaction info with results
+                            let transaction_info_with_results = self
+                                .proxy
+                                .get_transaction_info_with_results(&tx_hash)
+                                .await
+                                .unwrap();
+                            info!(
+                                "Transaction retrieved successfully, with status {}: {:#?}",
+                                status, transaction_info_with_results
+                            );
+                            return transaction_info_with_results;
+                        },
+                        _ => {
+                            continue;
+                        },
+                    }
                 },
                 Err(err) => {
                     retries += 1;

From 9ff6a1aaff3aa6c18cba061bd3b94ecdc798f2a1 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Mon, 29 Apr 2024 15:01:05 +0300
Subject: [PATCH 0793/1254] set state via AnnotatedValue - replace in multisig,
 rewards, price_aggregator_stress

---
 .../tests/price_aggregator_stress_blackbox.rs | 48 +++++++---------
 .../tests/crowdfunding_esdt_blackbox_test.rs  |  2 +-
 .../multisig/tests/multisig_blackbox_test.rs  | 57 +++++--------------
 .../rewards_distribution_integration_test.rs  | 13 +----
 4 files changed, 39 insertions(+), 81 deletions(-)

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 46ddf296d3..660bbf1dda 100644
--- a/contracts/core/price-aggregator/tests/price_aggregator_stress_blackbox.rs
+++ b/contracts/core/price-aggregator/tests/price_aggregator_stress_blackbox.rs
@@ -8,10 +8,10 @@ use multiversx_sc_scenario::imports::*;
 const DECIMALS: u8 = 0;
 const EGLD_TICKER: &[u8] = b"EGLD";
 const NR_ORACLES: usize = 50;
-const OWNER_ADDRESS_EXPR: &str = "address:owner";
 const OWNER: TestAddress = TestAddress::new("owner");
-const PRICE_AGGREGATOR_ADDRESS_EXPR: &str = "sc:price-aggregator";
-const PRICE_AGGREGATOR_PATH_EXPR: &str = "mxsc:../output/multiversx-price-aggregator-sc.mxsc.json";
+const PRICE_AGGREGATOR_ADDRESS: TestSCAddress = TestSCAddress::new("price-aggregator");
+const PRICE_AGGREGATOR_PATH: MxscPath =
+    MxscPath::new("../output/multiversx-price-aggregator-sc.mxsc.json");
 const SLASH_AMOUNT: u64 = 10;
 const SLASH_QUORUM: usize = 3;
 const STAKE_AMOUNT: u64 = 20;
@@ -20,14 +20,11 @@ const USD_TICKER: &[u8] = b"USDC";
 
 mod price_aggregator_proxy;
 
-type PriceAggregatorContract = ContractInfo<multiversx_price_aggregator_sc::Proxy<StaticApi>>;
-
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
 
-    blockchain.set_current_dir_from_workspace("contracts/core/price-aggregator");
     blockchain.register_contract(
-        PRICE_AGGREGATOR_PATH_EXPR,
+        PRICE_AGGREGATOR_PATH,
         multiversx_price_aggregator_sc::ContractBuilder,
     );
 
@@ -37,50 +34,45 @@ fn world() -> ScenarioWorld {
 struct PriceAggregatorTestState {
     world: ScenarioWorld,
     oracles: Vec<AddressValue>,
-    price_aggregator_contract: PriceAggregatorContract,
     price_aggregator_whitebox: WhiteboxContract<ContractObj<DebugApi>>,
 }
 
 impl PriceAggregatorTestState {
     fn new() -> Self {
         let mut world = world();
+        world.start_trace();
 
-        let mut set_state_step = SetStateStep::new()
-            .put_account(OWNER_ADDRESS_EXPR, Account::new().nonce(1))
-            .new_address(OWNER_ADDRESS_EXPR, 1, PRICE_AGGREGATOR_ADDRESS_EXPR)
+        world
+            .account(OWNER)
+            .nonce(1)
+            .new_address(OWNER, 1, PRICE_AGGREGATOR_ADDRESS)
+            .current_block()
             .block_timestamp(100);
 
         let mut oracles = Vec::new();
         for i in 1..=NR_ORACLES {
-            let address_expr = format!("address:oracle{}", i);
-            let address_value = AddressValue::from(address_expr.as_str());
+            let address_expr = format!("oracle{}", i);
+            let address: TestAddress = TestAddress::new(address_expr.as_str());
+            let address_value = AddressValue::from(address.eval_to_expr().as_str());
 
-            set_state_step = set_state_step.put_account(
-                address_expr.as_str(),
-                Account::new().nonce(1).balance(STAKE_AMOUNT),
-            );
+            world.account(address).nonce(1).balance(STAKE_AMOUNT);
 
             oracles.push(address_value);
         }
-        world.start_trace().set_state_step(set_state_step);
 
-        let price_aggregator_contract = PriceAggregatorContract::new(PRICE_AGGREGATOR_ADDRESS_EXPR);
         let price_aggregator_whitebox = WhiteboxContract::new(
-            PRICE_AGGREGATOR_ADDRESS_EXPR,
+            PRICE_AGGREGATOR_ADDRESS,
             multiversx_price_aggregator_sc::contract_obj,
         );
 
         Self {
             world,
             oracles,
-            price_aggregator_contract,
             price_aggregator_whitebox,
         }
     }
 
     fn deploy(&mut self) -> &mut Self {
-        let price_aggregator_code = self.world.code_expression(PRICE_AGGREGATOR_PATH_EXPR);
-
         let oracles = MultiValueVec::from(
             self.oracles
                 .iter()
@@ -101,14 +93,14 @@ impl PriceAggregatorTestState {
                 SUBMISSION_COUNT,
                 oracles,
             )
-            .code(price_aggregator_code)
+            .code(PRICE_AGGREGATOR_PATH)
             .run();
 
         for address in self.oracles.iter() {
             self.world
                 .tx()
                 .from(&address.to_address())
-                .to(&self.price_aggregator_contract.to_address())
+                .to(PRICE_AGGREGATOR_ADDRESS)
                 .gas(5_000_000u64)
                 .typed(price_aggregator_proxy::PriceAggregatorProxy)
                 .stake()
@@ -123,7 +115,7 @@ impl PriceAggregatorTestState {
         self.world
             .tx()
             .from(OWNER)
-            .to(&self.price_aggregator_contract.to_address())
+            .to(PRICE_AGGREGATOR_ADDRESS)
             .typed(price_aggregator_proxy::PriceAggregatorProxy)
             .set_pair_decimals(EGLD_TICKER, USD_TICKER, DECIMALS)
             .run();
@@ -133,7 +125,7 @@ impl PriceAggregatorTestState {
         self.world
             .tx()
             .from(OWNER)
-            .to(&self.price_aggregator_contract.to_address())
+            .to(PRICE_AGGREGATOR_ADDRESS)
             .gas(5_000_000u64)
             .typed(price_aggregator_proxy::PriceAggregatorProxy)
             .unpause_endpoint()
@@ -144,7 +136,7 @@ impl PriceAggregatorTestState {
         self.world
             .tx()
             .from(&from.to_address())
-            .to(&self.price_aggregator_contract.to_address())
+            .to(PRICE_AGGREGATOR_ADDRESS)
             .gas(7_000_000u64)
             .typed(price_aggregator_proxy::PriceAggregatorProxy)
             .submit(
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 8b895e42a3..1a07b42101 100644
--- a/contracts/examples/crowdfunding-esdt/tests/crowdfunding_esdt_blackbox_test.rs
+++ b/contracts/examples/crowdfunding-esdt/tests/crowdfunding_esdt_blackbox_test.rs
@@ -76,7 +76,7 @@ impl CrowdfundingESDTTestState {
             .query()
             .to(CROWDFUNDING_ADDRESS)
             .typed(crowdfunding_esdt_proxy::CrowdfundingProxy)
-            .deposit(donor.eval_to_array())
+            .deposit(donor)
             .returns(ExpectValue(amount))
             .run();
     }
diff --git a/contracts/examples/multisig/tests/multisig_blackbox_test.rs b/contracts/examples/multisig/tests/multisig_blackbox_test.rs
index 7d439a00fc..322abd9348 100644
--- a/contracts/examples/multisig/tests/multisig_blackbox_test.rs
+++ b/contracts/examples/multisig/tests/multisig_blackbox_test.rs
@@ -48,7 +48,7 @@ impl MultisigTestState {
     }
 
     fn deploy_multisig_contract(&mut self) -> &mut Self {
-        let board_members = MultiValueVec::from(vec![BOARD_MEMBER_ADDRESS.eval_to_array()]);
+        let board_members = MultiValueVec::from(vec![BOARD_MEMBER_ADDRESS]);
 
         self.world
             .tx()
@@ -65,7 +65,7 @@ impl MultisigTestState {
             .from(BOARD_MEMBER_ADDRESS)
             .to(MULTISIG_ADDRESS)
             .typed(multisig_proxy::MultisigProxy)
-            .propose_add_proposer(PROPOSER_ADDRESS.eval_to_array())
+            .propose_add_proposer(PROPOSER_ADDRESS)
             .returns(ReturnsResult)
             .run();
 
@@ -94,7 +94,7 @@ impl MultisigTestState {
             .from(PROPOSER_ADDRESS)
             .to(MULTISIG_ADDRESS)
             .typed(multisig_proxy::MultisigProxy)
-            .propose_add_board_member(board_member_address.eval_to_array())
+            .propose_add_board_member(board_member_address)
             .returns(ReturnsResult)
             .run()
     }
@@ -105,7 +105,7 @@ impl MultisigTestState {
             .from(PROPOSER_ADDRESS)
             .to(MULTISIG_ADDRESS)
             .typed(multisig_proxy::MultisigProxy)
-            .propose_add_proposer(proposer_address.eval_to_array())
+            .propose_add_proposer(proposer_address)
             .returns(ReturnsResult)
             .run()
     }
@@ -132,7 +132,7 @@ impl MultisigTestState {
             .from(PROPOSER_ADDRESS)
             .to(MULTISIG_ADDRESS)
             .typed(multisig_proxy::MultisigProxy)
-            .propose_transfer_execute(to.eval_to_array(), egld_amount, contract_call)
+            .propose_transfer_execute(to, egld_amount, contract_call)
             .returns(ReturnsResult)
             .run()
     }
@@ -148,7 +148,7 @@ impl MultisigTestState {
             .from(PROPOSER_ADDRESS)
             .to(MULTISIG_ADDRESS)
             .typed(multisig_proxy::MultisigProxy)
-            .propose_async_call(to.eval_to_array(), egld_amount, contract_call)
+            .propose_async_call(to, egld_amount, contract_call)
             .returns(ReturnsResult)
             .run()
     }
@@ -159,7 +159,7 @@ impl MultisigTestState {
             .from(PROPOSER_ADDRESS)
             .to(MULTISIG_ADDRESS)
             .typed(multisig_proxy::MultisigProxy)
-            .propose_remove_user(user_address.eval_to_array())
+            .propose_remove_user(user_address)
             .returns(ReturnsResult)
             .run()
     }
@@ -176,7 +176,7 @@ impl MultisigTestState {
             .from(PROPOSER_ADDRESS)
             .to(MULTISIG_ADDRESS)
             .typed(multisig_proxy::MultisigProxy)
-            .propose_sc_deploy_from_source(amount, source.eval_to_array(), code_metadata, arguments)
+            .propose_sc_deploy_from_source(amount, source, code_metadata, arguments)
             .returns(ReturnsResult)
             .run()
     }
@@ -194,13 +194,7 @@ impl MultisigTestState {
             .from(PROPOSER_ADDRESS)
             .to(MULTISIG_ADDRESS)
             .typed(multisig_proxy::MultisigProxy)
-            .propose_sc_upgrade_from_source(
-                sc_address.eval_to_array(),
-                amount,
-                source.eval_to_array(),
-                code_metadata,
-                arguments,
-            )
+            .propose_sc_upgrade_from_source(sc_address, amount, source, code_metadata, arguments)
             .returns(ReturnsResult)
             .run()
     }
@@ -245,7 +239,7 @@ impl MultisigTestState {
             .query()
             .to(MULTISIG_ADDRESS)
             .typed(multisig_proxy::MultisigProxy)
-            .user_role(user.eval_to_array())
+            .user_role(user)
             .returns(ExpectValue(expected_user_role))
             .run();
     }
@@ -266,10 +260,7 @@ fn test_add_board_member() {
     state.sign(action_id);
     state.perform(action_id);
 
-    let expected_value = MultiValueVec::from(vec![
-        BOARD_MEMBER_ADDRESS.eval_to_array(),
-        new_board_member_expr.eval_to_array(),
-    ]);
+    let expected_value = MultiValueVec::from(vec![BOARD_MEMBER_ADDRESS, new_board_member_expr]);
 
     state.expect_user_role(new_board_member_expr, multisig_proxy::UserRole::BoardMember);
     state
@@ -302,10 +293,7 @@ fn test_add_proposer() {
         multisig_proxy::UserRole::Proposer,
     );
 
-    let expected_value = MultiValueVec::from(vec![
-        PROPOSER_ADDRESS.eval_to_array(),
-        new_proposer_address_expr.eval_to_array(),
-    ]);
+    let expected_value = MultiValueVec::from(vec![PROPOSER_ADDRESS, new_proposer_address_expr]);
     state
         .world
         .query()
@@ -447,11 +435,7 @@ fn test_transfer_execute_to_user() {
         .from(PROPOSER_ADDRESS)
         .to(MULTISIG_ADDRESS)
         .typed(multisig_proxy::MultisigProxy)
-        .propose_transfer_execute(
-            new_user_address_expr.eval_to_array(),
-            0u64,
-            FunctionCall::empty(),
-        )
+        .propose_transfer_execute(new_user_address_expr, 0u64, FunctionCall::empty())
         .with_result(ExpectError(4, "proposed action has no effect"))
         .run();
 
@@ -462,11 +446,7 @@ fn test_transfer_execute_to_user() {
         .from(PROPOSER_ADDRESS)
         .to(MULTISIG_ADDRESS)
         .typed(multisig_proxy::MultisigProxy)
-        .propose_transfer_execute(
-            new_user_address_expr.eval_to_array(),
-            amount,
-            FunctionCall::empty(),
-        )
+        .propose_transfer_execute(new_user_address_expr, amount, FunctionCall::empty())
         .returns(ReturnsResult)
         .run();
     state.sign(action_id);
@@ -584,18 +564,11 @@ fn test_deploy_and_upgrade_from_source() {
     let factorial_address: TestSCAddress = TestSCAddress::new("factorial");
     let factorial_path: MxscPath = MxscPath::new("test-contracts/factorial.mxsc.json");
 
-    let factorial_code = state
-        .world
-        .code_expression(factorial_path.eval_to_expr().as_str());
-
     state
         .world
         .register_contract(factorial_path, factorial::ContractBuilder);
 
-    state
-        .world
-        .account(factorial_address)
-        .code(factorial_code.clone());
+    state.world.account(factorial_address).code(factorial_path);
 
     let action_id = state.propose_sc_upgrade_from_source(
         ADDER_ADDRESS,
diff --git a/contracts/examples/rewards-distribution/tests/rewards_distribution_integration_test.rs b/contracts/examples/rewards-distribution/tests/rewards_distribution_integration_test.rs
index 03ef580983..be3a4cb788 100644
--- a/contracts/examples/rewards-distribution/tests/rewards_distribution_integration_test.rs
+++ b/contracts/examples/rewards-distribution/tests/rewards_distribution_integration_test.rs
@@ -22,13 +22,10 @@ fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
 
     blockchain.register_contract(
-        REWARDS_DISTRIBUTION_PATH.eval_to_expr().as_str(),
+        REWARDS_DISTRIBUTION_PATH,
         rewards_distribution::ContractBuilder,
     );
-    blockchain.register_contract(
-        SEED_NFT_MINTER_PATH.eval_to_expr().as_str(),
-        mock_seed_nft_minter::ContractBuilder,
-    );
+    blockchain.register_contract(SEED_NFT_MINTER_PATH, mock_seed_nft_minter::ContractBuilder);
     blockchain
 }
 
@@ -106,16 +103,12 @@ impl RewardsDistributionTestState {
 fn test_compute_brackets() {
     let mut state = RewardsDistributionTestState::new();
 
-    let rewards_distribution_code = state
-        .world
-        .code_expression(REWARDS_DISTRIBUTION_PATH.eval_to_expr().as_str());
-
     state
         .world
         .account(REWARDS_DISTRIBUTION_ADDRESS)
         .nonce(1)
         .owner(OWNER_ADDRESS)
-        .code(rewards_distribution_code);
+        .code(REWARDS_DISTRIBUTION_PATH);
 
     state.world.whitebox_call(
         &state.rewards_distribution_whitebox,

From d8e36e9bc7c2187d789b5184501df2538bb5348d Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Mon, 29 Apr 2024 17:07:53 +0300
Subject: [PATCH 0794/1254] set state via AnnotatedValue - whitebox framework

---
 .../src/facade/world_tx/scenario_set_state.rs | 26 +++++++++----------
 .../whitebox_legacy/contract_obj_wrapper.rs   | 13 ++++++++--
 2 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/framework/scenario/src/facade/world_tx/scenario_set_state.rs b/framework/scenario/src/facade/world_tx/scenario_set_state.rs
index f31477d180..8cee5eaede 100644
--- a/framework/scenario/src/facade/world_tx/scenario_set_state.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_set_state.rs
@@ -8,7 +8,7 @@ use crate::{
         tx_to_step::{address_annotated, big_uint_annotated, u64_annotated},
         ScenarioRunner,
     },
-    scenario_model::{AddressKey, BigUintValue, NewAddress, SetStateStep, U64Value},
+    scenario_model::{AddressKey, BigUintValue, NewAddress, SetStateStep},
     ScenarioTxEnvData, ScenarioWorld,
 };
 
@@ -101,7 +101,7 @@ impl ScenarioWorld {
     }
 
     #[allow(clippy::too_many_arguments)]
-    pub fn set_nft_balance_all_properties<A, V: Copy, NR: Copy, T: TopEncode>(
+    pub fn set_nft_balance_all_properties<A: Copy, V, NR, T: TopEncode>(
         &mut self,
         address: A,
         token_id: &[u8],
@@ -116,11 +116,13 @@ impl ScenarioWorld {
     ) where
         A: AnnotatedValue<ScenarioTxEnvData, ManagedAddress<StaticApi>>,
         V: AnnotatedValue<ScenarioTxEnvData, BigUint<StaticApi>>,
-        U64Value: From<NR>,
+        NR: AnnotatedValue<ScenarioTxEnvData, u64>,
     {
         let env = self.new_env_data();
         let address_value = address_annotated(&env, &address);
         let balance_value = big_uint_annotated(&env, &balance);
+        let nonce_value = u64_annotated(&env, &nonce);
+        let royalties_value = u64_annotated(&env, &royalties);
 
         let mut esdt_attributes = Vec::new();
         let _ = attributes.top_encode(&mut esdt_attributes);
@@ -129,12 +131,12 @@ impl ScenarioWorld {
             if vm_address == &address_value.to_vm_address() {
                 account.esdt.set_esdt_balance(
                     token_id.to_vec(),
-                    U64Value::from(nonce).value,
+                    nonce_value.value,
                     &balance_value.value,
                     EsdtInstanceMetadata {
                         creator: creator.map(|c| address_annotated(&env, &c).to_vm_address()),
                         attributes: esdt_attributes.clone(),
-                        royalties: U64Value::from(royalties).value,
+                        royalties: royalties_value.value,
                         name: name.unwrap_or_default().to_vec(),
                         hash: hash.map(|h| h.to_vec()),
                         uri: uris.to_vec(),
@@ -157,17 +159,15 @@ impl ScenarioWorld {
         }
     }
 
-    pub fn set_esdt_local_roles<A: Copy>(
-        &mut self,
-        address: A,
-        token_id: &[u8],
-        roles: &[EsdtLocalRole],
-    ) where
-        AddressKey: From<A>,
+    pub fn set_esdt_local_roles<A>(&mut self, address: A, token_id: &[u8], roles: &[EsdtLocalRole])
+    where
+        A: AnnotatedValue<ScenarioTxEnvData, ManagedAddress<StaticApi>>,
     {
+        let env = self.new_env_data();
+        let address_value = address_annotated(&env, &address);
         let accounts = &mut self.get_mut_state().accounts;
         for (vm_address, account) in accounts.iter_mut() {
-            if vm_address == &AddressKey::from(address).to_vm_address() {
+            if vm_address == &address_value.to_vm_address() {
                 account.esdt.set_roles(
                     token_id.to_vec(),
                     roles
diff --git a/framework/scenario/src/whitebox_legacy/contract_obj_wrapper.rs b/framework/scenario/src/whitebox_legacy/contract_obj_wrapper.rs
index c03a11c0de..7540d23056 100644
--- a/framework/scenario/src/whitebox_legacy/contract_obj_wrapper.rs
+++ b/framework/scenario/src/whitebox_legacy/contract_obj_wrapper.rs
@@ -363,7 +363,7 @@ impl BlockchainStateWrapper {
             address,
             token_id,
             nonce,
-            balance,
+            BigUint::from(balance),
             attributes,
             0,
             None,
@@ -397,7 +397,16 @@ impl BlockchainStateWrapper {
         uris: &[Vec<u8>],
     ) {
         self.world.set_nft_balance_all_properties(
-            address, token_id, nonce, balance, attributes, royalties, creator, name, hash, uris,
+            address,
+            token_id,
+            nonce,
+            BigUint::from(balance),
+            attributes,
+            royalties,
+            creator,
+            name,
+            hash,
+            uris,
         );
     }
 

From 6937665cbb69f8ad4c1fec061217d9374d944cf1 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Mon, 29 Apr 2024 17:13:30 +0200
Subject: [PATCH 0795/1254] test reorg in separate files

---
 .../tests/test_tx_deployed_address.rs         |  133 +
 .../tests/test_tx_issued_token_identifier.rs  | 1422 +++++++++
 .../tests/test_tx_multi_contract_sc_result.rs |  477 +++
 .../tests/test_tx_multiple_sc_results.rs      |  287 ++
 framework/scenario/tests/test_tx_sc_result.rs |  350 +++
 framework/scenario/tests/tx_response_tests.rs | 2661 -----------------
 6 files changed, 2669 insertions(+), 2661 deletions(-)
 create mode 100644 framework/scenario/tests/test_tx_deployed_address.rs
 create mode 100644 framework/scenario/tests/test_tx_issued_token_identifier.rs
 create mode 100644 framework/scenario/tests/test_tx_multi_contract_sc_result.rs
 create mode 100644 framework/scenario/tests/test_tx_multiple_sc_results.rs
 create mode 100644 framework/scenario/tests/test_tx_sc_result.rs
 delete mode 100644 framework/scenario/tests/tx_response_tests.rs

diff --git a/framework/scenario/tests/test_tx_deployed_address.rs b/framework/scenario/tests/test_tx_deployed_address.rs
new file mode 100644
index 0000000000..b040ace618
--- /dev/null
+++ b/framework/scenario/tests/test_tx_deployed_address.rs
@@ -0,0 +1,133 @@
+use multiversx_sc::types::Address;
+use multiversx_sc_scenario::scenario_model::TxResponse;
+use multiversx_sdk::data::transaction::{TransactionInfo, TransactionOnNetwork};
+
+#[test]
+fn test_deployed_address() {
+    let data = r#"
+        {
+  "data": {
+    "transaction": {
+      "type": "normal",
+      "processingTypeOnSource": "SCDeployment",
+      "processingTypeOnDestination": "SCDeployment",
+      "hash": "07a176d1734d1901d396be344f97e1d80f076269e9559f9b2110f6f11c4f74de",
+      "nonce": 427,
+      "round": 2190715,
+      "epoch": 887,
+      "value": "0",
+      "receiver": "erd1qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqq6gq4hu",
+      "sender": "erd1j6kua7p67qnaw3y4sudmk25xsuv4k8ws6pwvax8fd2vtmuc3q33s840l87",
+      "gasPrice": 1000000000,
+      "gasLimit": 600000000,
+      "data": "0061736d010000000198011960027f7f0060017f017f6000006000017f60027f7f017f60037f7f7f0060017f0060047f7f7f7f0060057f7f7f7f7f0060037f7f7f017f60047f7f7f7f017f60027f7e0060017f017e60027f7f017e60057f7f7e7f7f017f60067e7f7f7f7f7f017f60017e006000017e60017e017f60047f7f7e7f0060057e7f7f7f7f017f60047f7f7f7e0060017e017e60047f7e7f7f0060027e7f0002c1072903656e76126d616e616765645369676e616c4572726f72000603656e760e626967496e74536574496e743634000b03656e7609626967496e74416464000503656e760b7369676e616c4572726f72000003656e760a6d4275666665724e6577000303656e760d6d427566666572417070656e64000403656e76096d4275666665724571000403656e760d6d42756666657246696e697368000103656e76226d616e616765644d756c74695472616e73666572455344544e465445786563757465000e03656e761b6d616e61676564457865637574654f6e44657374436f6e74657874000f03656e760d6d616e6167656443616c6c6572000603656e76106d616e61676564534341646472657373000603656e76136d616e616765644f776e657241646472657373000603656e761c6d616e616765644765744d756c74694553445443616c6c56616c7565000603656e76126d427566666572476574417267756d656e74000403656e76126d427566666572417070656e644279746573000903656e7619626967496e74476574556e7369676e6564417267756d656e74000003656e761b736d616c6c496e74476574556e7369676e6564417267756d656e74000c03656e76106d4275666665724765744c656e677468000103656e760f6765744e756d417267756d656e7473000303656e7616736d616c6c496e7446696e697368556e7369676e6564001003656e7609626967496e74537562000503656e760a6765744761734c656674001103656e760f636c65616e52657475726e44617461000203656e760f6d4275666665725365744279746573000903656e7609626967496e74436d70000403656e760a626967496e7454446976000503656e7609626967496e744d756c000503656e76196d42756666657246726f6d426967496e74556e7369676e6564000403656e76176d427566666572546f426967496e74556e7369676e6564000403656e7609626967496e74506f77000503656e76146d427566666572436f707942797465536c696365000a03656e76126d42756666657253746f726167654c6f6164000403656e76136d42756666657253746f7261676553746f7265000403656e760e636865636b4e6f5061796d656e74000203656e76176d616e616765644765744261636b5472616e7366657273000003656e760f6d616e6167656457726974654c6f67000003656e7614626967496e7446696e697368556e7369676e6564000603656e760666696e697368000003656e760a626967496e745369676e000103656e76136d42756666657247657442797465536c696365000a03d301d1010103080201120104000107060606000401090100010000000013030014030303020301070400030901090909000707010006060106060c0501080500010b00080715070808000a0016010106010000000500000103000601001705050a070400040a00040404000404040404010100040d070707080a000501010505060101000b0b0101010101050d0105000000050500000000000c070707070000081803030300030300010407030303030101030303030202020202020202020202020202020202020202020202020202020202080805030100030616037f01418080080b7f0041e9db080b7f0041f0db080b07c70520066d656d6f7279020004696e697400db01077570677261646500dc01076465706f73697400dd0108776974686472617700de0108636f6d706f756e6400df010e676574546f74616c41737365747300e0010f6765745661756c744164647265737300e101176765744173736574546f6b656e4964656e74696669657200e2011d6765744d6f6e65794d61726b6574546f6b656e4964656e74696669657200e301226765744d6f6e65794d61726b6574556e6465726c79696e674964656e74696669657200e4011f676574426f6f737465725374616b6564546f6b656e4964656e74696669657200e50114676574436f6e74726f6c6c65724164647265737300e601156765744d6f6e65794d61726b65744164647265737300e7011d6765745772617070656445676c64436f6e74726163744164647265737300e8011d6765745772617070656445676c64546f6b656e4964656e74696669657200e90111676574426f6f737465724164647265737300ea0119676574436f6d706f756e645845786368616e6765537761707300eb0117676574436f6d706f756e6441736873776170537761707300ec0116676574436f6d706f756e644665657350657263656e7400ed0119676574506572666f726d616e63654665657350657263656e7400ee010e7374616b65496e426f6f7374657200ef011b726562616c616e6365506f7274666f6c696f496e426f6f7374657200f00112756e7374616b6546726f6d426f6f7374657200f10118636c61696d4d756c7469706c6546726f6d426f6f7374657200f20119736574506572666f726d616e63654665657350657263656e7400f30116736574436f6d706f756e644665657350657263656e7400f40110736574436f6d706f756e64537761707300f5010d6765744e61747572616c41505900f6010863616c6c4261636b00f7010a5f5f646174615f656e6403010b5f5f686561705f6261736503020a9aa901d1011601017f102a220142001001200120012000100220010b1901017f41c88d0841c88d0828020041016b220036020020000b2e000240200120024d0440200220044d0d01102c000b102c000b2000200220016b3602042000200120036a3602000b0b0041b88d08410e1003000b1301017f102a22012000ad42ff0183100120010b2101017f102a21012000420053044041b2850841111003000b20012000100120010b0f01017f10042201200010051a20010b0b0020002001100641004a0b2d01017f230041206b2202240020022000103241c08008410810332002200136021820021034200241206a24000b1900200041feffffff0746044041c8800841191003000b20000b2a0020022003104d2102104321032000427f3703082000200336020420002002360200200020013602100b7d01037f230041106b22012400200029030810712000280210200028021820002802002000280204104521021017410021002002101221032001410036020c200120023602042001200341027622023602080340200020024f450440200141046a10751a20012802082102200128020c21000c010b0b200141106a24000b3601027f230041106b22012400200141086a103620012802082102200020012d000c4101713a000420002002360200200141106a24000b6d01027f230041106b220124002000027f41e0db082d0000220245044041e0db0841013a000041dcdb084100360200200141086a4100109f012001280208200128020c41b88d084100105710430c010b41b88d084100104d0b360200200020024101733a0004200141106a24000b0b0020002001103810071a0b4901017f230041106b22022400200220013a000c20022000360208200241086a10a501200228020820022d000c044041dcdb08410036020041e0db0841003a00000b200241106a24000b0e002000418a8508410b103a103b0b130020002000200120021052200120021085010b0d002000102a2200101d1a20000b0a002000103d2001103e0b0f01017f102a22012000101c1a20010b5101027f230041106b22022400200220001012220341187420034180fe03714108747220034108764180fe03712003411876727236020c20012002410c6a410410a3012001200010bd01200241106a24000b0a002000103d200110400b5101027f230041106b22022400200220001012220341187420034180fe03714108747220034108764180fe03712003411876727236020c20012002410c6a4104100f1a20012000108b01200241106a24000b0900200020011003000b5001047f1043210610432107230041106b22042400104321052001102f210120042003102936020c20042002370300200420013602082005200410442000200542002006200710081a200441106a24000b1301017f102a220041b88d08410010181a20000bd20102027f017e230041106b2203240020032001280208220241187420024180fe03714108747220024108764180fe0371200241187672723602002003200128020c220241187420024180fe03714108747220024108764180fe03712002411876727236020c20032001290300220442388620044280fe0383422886842004428080fc0783421886200442808080f80f834208868484200442088842808080f80f832004421888428080fc07838420044228884280fe03832004423888848484370204200020034110100f1a200341106a24000b150020002001200220032004102a220110091a20010b0c01017f102a2200100a20000b0c01017f102a2200100b20000b0c01017f102a2200100c20000b150010481046103004400f0b41928d0841241003000b2b01017f41e8db082d000022000440416b41ffffffff0720001b0f0b41e8db0841013a0000416b100d416b0b0d002000102a2200100e1a20000b2e01017f41d583084117104d220420002001100f1a200441ec83084103100f1a200420022003100f1a20041000000b1101017f102a22022000200110181a20020b4601017f230041106b220224002002200141187420014180fe03714108747220014108764180fe03712001411876727236020c20002002410c6a4104100f1a200241106a24000b0e01017f4100102a2200101020000b1f002000104b2200101241204704402001200241b086084110104c000b20000bd90301097f230041406a220124002000104b210210432106200210122100200141246a41003a0000200141206a20003602002001200236021c200120003602182001410036021441002102037f2000200246047f20012d0024044041dcdb08410036020041e0db0841003a00000b200141406b2400200605200141146a2200419787084116103a210420004197870841161052210010432103034020000440200141146a2205419787084116105221072005419787084116105321082005419787084116103a2109410021020240024002402005419787084116105441ff01710e020201000b41978708411641ed8608410d104c000b410121020b200120023a0034200120093602302001200836022c200120073602282003200141286a1055200041016b21000c010b0b200142003703282001200441187420044180fe03714108747220044108764180fe03712004411876727236023c200141086a200141286a22004100410410562001280208200128020c2001413c6a2202410410572001200341187420034180fe03714108747220034108764180fe03712003411876727236023c2001200041044108105620012802002001280204200241041057200620004108100f1a20012802142102200128021821000c010b0b0b3702017f017e230041106b220324002003410036020c20002003410c6a220041042001200210c5012000410410b101200341106a2400a70b0d0020004120200120021085010b3001017f230041106b22032400200341003a000f20002003410f6a41012001200210c50120032d000f200341106a24000bf60201057f230041d0006b22022400200242003700352002420037033020022001280200220341187420034180fe03714108747220034108764180fe037120034118767272360240200241286a200241306a220541004104109b012002280228200228022c200241406b220441041057200241c8006a41003a00002002420037034020022001280204220341187420034180fe03714108747220034108764180fe03712003411876727236024c200241206a200441004104109c0120022802202002280224200241cc006a2206410410572002200141086a280200220341187420034180fe03714108747220034108764180fe03712003411876727236024c200241186a200441044108109c012002280218200228021c20064104105720022001410c6a2d00003a004c200241106a200441084109109c0120022802102002280214200641011057200241086a20054104410d109b012002280208200228020c20044109105720002005410d100f1a200241d0006a24000b0f002000200120022003410810f9010bb50201067f200120034604402001220341104f04402000410020006b41037122046a210520040440200221010340200020012d00003a0000200141016a2101200041016a22002005490d000b0b2005200320046b2203417c7122066a21000240200220046a22044103710440200641004c0d012004410374220141187121072004417c71220841046a2102410020016b4118712109200828020021010340200520012007762002280200220120097472360200200241046a2102200541046a22052000490d000b0c010b200641004c0d0020042102034020052002280200360200200241046a2102200541046a22052000490d000b0b20034103712103200420066a21020b20030440200020036a21010340200020022d00003a0000200241016a2102200041016a22002001490d000b0b0f0b102c000ba20301077f230041406a220124002000104b2102104321052002101221002001412c6a41003a0000200141286a200036020020012002360224200120003602202001410036021c41002102037f2000200246047f20012d002c044041dcdb08410036020041e0db0841003a00000b200141406b24002005052001411c6a220041ad87084118103a2103200041ad8708411810522100104321020340200004402001411c6a220441ad8708411810522106200441ad8708411810532107200441ad87084118103a21042001200636023820012004360234200120073602302002200141306a1059200041016b21000c010b0b200142003703302001200341187420034180fe03714108747220034108764180fe03712003411876727236023c200141106a200141306a2200410041041056200128021020012802142001413c6a2203410410572001200241187420024180fe03714108747220024108764180fe03712002411876727236023c200141086a20004104410810562001280208200128020c200341041057200520004108100f1a200128021c2102200128022021000c010b0b0bb80201047f230041406a22022400200241286a41003602002002420037032020022001280208220341187420034180fe03714108747220034108764180fe037120034118767272360230200241186a200241206a220541004104109a012002280218200228021c200241306a2204410410572002420037033020022001280200220341187420034180fe03714108747220034108764180fe03712003411876727236023c200241106a2004410041041056200228021020022802142002413c6a22034104105720022001280204220141187420014180fe03714108747220014108764180fe03712001411876727236023c200241086a20044104410810562002280208200228020c200341041057200220054104410c109a012002280200200228020420044108105720002005410c100f1a200241406b24000b1400101320004604400f0b4192840841191003000b09002000105c10071a0b1d00200010a70122001012412047044041b086084110108801000b20000b0a00200010a70110071a0b08002000105f10140b6102027f017e230041106b2201240020014200370308200010a70122001012220241094f044041958508410e108801000b2001200141086a200210b001200041002001280200220020012802042202108a011a2000200210b101200141106a24000b1f0020002001200210152000106141ff017104400f0b41ab840841301003000b1500410241012000102722001b4100200041004e1b0bf80101047f230041d0006b2205240020052004360228200541206a41db840841141063200528022021072005280224220620031064200410652103104322082003ad106620062008104e200520041012360234200541003602302005200541286a36022c0340200541386a2005412c6a10672005290338500440200520072006200120021068200528020421012000200528020036020020002001360204200541d0006a240005200528024c2103200541186a2007200620052802481069200541106a2005280218200528021c2005290340106a200541086a200528021020052802142003106b200528020c2106200528020821070c010b0b0b180020012002104d210120001043360204200020013602000b100010431a20002001280200102f104e0b0900200010124104760b3801017f230041106b2202240020024200370308200220014100200241086a10820120002002280200200228020410181a200241106a24000ba70102057f017e230041206b2202240020002001280204220441106a220520012802084d047e2001280200200241106a4200370300200242003703082802002004200241086a22034110106f1a2002410036021c20032002411c6a22061098012104200320061099012107200041146a200241086a2002411c6a109801360200200041106a2004360200200020073703082001200536020442010542000b370300200241206a24000b910101037f230041106b22052400024020031012450d0020022003106e200410122106410021030340200341046a220720064b0d012005410036020c200420032005410c6a4104106f1a2002200528020c220341187420034180fe03714108747220034108764180fe037120034118767272106e200721030c000b000b2000200236020420002001360200200541106a24000b160020022003106e20002002360204200020013602000b2001017f104322042003106620022004104e20002002360204200020013602000b160020032002107020002002360204200020013602000ba30101027f230041306b22052400200541286a41ef8408410f1063200541206a2005280228200528022c20042802081069200541186a200528022020052802242004290300106a200541106a2005280218200528021c200428020c106b200528021021042005280214210610431a20062003102f104e200541086a20042006200120021068200528020c21012000200528020836020020002001360204200541306a24000b7101017f230041206b22052400200541186a41fe8408410c1063200541106a2005280218200528021c20031069200541086a200528021020052802142004106b20052005280208200528020c200120021068200528020421012000200528020036020020002001360204200541206a24000b0d0010431a20002001102f104e0b0d002000200120022003108a010b0d0010431a20012000103d104e0b0f002000427f51047e10160520000b0b3001017e20002903082201427f51047e10160520010b20002802102000280218200028020020002802041045101710730b3b01027f230041106b220124002000101221022001410036020c2001200036020420012002410276360208200141046a1075103b200141106a24000b24002000290308107120002802102000280218200028020020002802041045101710121a0b7d01037f230041106b22012400200028020821032001410036020c200028020020034102742001410c6a4104106f450440200128020c21022000200341016a360208200241187420024180fe03714108747220024108764180fe037120024118767272102f200141106a24000f0b418a8508410b41ef83084111104c000b900202027f017e230041d0006b2202240020012903082204427f51047e10160520040b2001280210200128021820012802002001280204104521011017200110122103200241003602142002200136020c200220034102763602102002410c6a10752203101221012002413c6a41003a0000200241386a200136020020022003360234200220013602302002410036022c200241406b2002412c6a10772002280230200228022c460440200241206a2201200241c8006a2903003703002002200229034037031820022d003c044041dcdb08410036020041e0db0841003a00000b20002002290318370300200041086a2001290300370300200241d0006a24000f0b418a8508410b41958508410e104c000b3002017f017e2001418a8508410b103a2102200110be01210320002001103936020c20002002360208200020033703000b100010431a20002001280200103d104e0b0e0020014504402002200010700b0b810101057f230041106b220324001043102f210420012802001012210503402005200241046a22064f04402003410036020c200128020020022003410c6a4104106f1a200328020c220241187420024180fe03714108747220024108764180fe0371200241187672722004103f200621020c010b0b20002004104e200341106a24000b820101057f230041106b220324001043102f210420012802001012210503402005200241046a22064f04402003410036020c200128020020022003410c6a4104106f1a2004200328020c220241187420024180fe03714108747220024108764180fe03712002411876727210051a200621020c010b0b20002004104e200341106a24000b4d01027f230041206b22012400107d2102200141106a200041106a290300370300200141086a200041086a290300370300200120023602182001200029030037030020011072200141206a24000b0e01017f102a22004200100120000b4f01027f230041206b22022400107d2103200241106a200141106a290300370300200241086a200141086a2903003703002002200336021820022001290300370300200020021076200241206a24000b4d01027f230041206b22012400107d2102200141106a200041106a290300370300200141086a200041086a290300370300200120023602182001200029030037030020011034200141206a24000b7602057f017e230041106b22012400107d210220002802102103200028020421042000280200210520002903082206427f51047e10160520060b20032002200520041045210010172000101221022001410036020c2001200036020420012002410276360208200141046a1075102f200141106a24000b4701027f230041106b22022400104321032002420037030820022001ad42ff01834101200241086a10820120032002280200200228020410181a20002003104e200241106a24000b8f0202047f017e2003200142388620014280fe0383422886842001428080fc0783421886200142808080f80f834208868484200142088842808080f80f832001421888428080fc0783842001423888220820014228884280fe03838484843700000240200150044041b88d0821030c010b200204402001427f510440200341076a2103410121040c020b2008a7c022054107752106200541004821050b200641ff0171210603400240024020044108470440200320046a2d000022072006460d02200245200741077620054672450440200441016b220441094f0d020b200320046a2103410820046b21040c040b102c000b102c000b200441016a21040c000b000b20002004360204200020033602000ba30102037f017e230041106b22032400027f2002290300500440200128021021042003200128020020012802042002280208200228020c106d2003280200210520032802040c010b10472104200341086a2001280200200128020420012802102002106c20032802082105200328020c0b2102200129030821062000107d36021820002004360210200020063703082000200236020420002005360200200341106a24000b3f01017f1043210320002001290300370300200041106a200141106a290300370300200041086a200141086a290300370300200320021044200020033602180b5201027f230041106b22042400200441086a200028020820002802002205200110860120042802084101460440200428020c2000200120056a360200200441106a24000f0b2002200341a38508410f104c000b1f0020012002200310042201101f21022000200136020420002002453602000b4f01037f230041106b22022400200241086a200028020820002802002203200110860120022802084101460440200228020c2000200120036a360200200241106a24000f0b41a38508410f108801000b1a01017f41f185084116104d220220002001100f1a20021000000b1500417f200020011019220041004720004100481b0b0f00200020012003200210284100470b09002000200110051a0b0c00200020002001100220000b0c00200020002001101a20000b0c00200020002001101b20000b0a0020002000200110020b0c00200020002001106020000b1001017f102a220220002001100220020b1001017f102a220220002001101b20020b1001017f102a220220002001106020020b1901017f102a210241722001ad1001200220004172101e20020b0e01017f104322012000104420010b4c01027f230041106b22012400104321022001200041187420004180fe03714108747220004108764180fe03712000411876727236020c20022001410c6a4104100f1a200141106a240020020b840102047f017e230041206b22022400200241106a42003703002002420037030820014100200241086a22034110106f2002410036021c20032002411c6a22041098012105200320041099012106200241086a2002411c6a1098012103044041c38508411d1003000b2000200336020c2000200536020820002006370300200241206a24000b7401017f230041106b220224002002410036020c20022000411020012802002200200041046a2200109d012002410c6a410420022802002002280204105720012000360200200228020c2100200241106a2400200041187420004180fe03714108747220004108764180fe0371200041187672720ba80102017e017f230041106b220324002003420037030820032000411020012802002200200041086a2200109d01200341086a41082003280200200328020410572001200036020020032903082102200341106a2400200242388620024280fe0383422886842002428080fc0783421886200242808080f80f834208868484200242088842808080f80f832002421888428080fc07838420024228884280fe038320024238888484840b0f002000200120022003410c10f9010b0f002000200120022003410d10f9010b0f002000200120022003410910f9010b2f000240200320044d044020022004490d012000200420036b3602042000200120036a3602000f0b102c000b102c000bb40101037f230041106b22042400027f024020002d000845044020002802002205101222064190ce004b0d0141e0db082d00000d0141dcdb08200636020041e0db0841013a0000200441086a2006109f01200541002004280208200428020c106f1a200041013a00080b4101200120036a220041dcdb082802004b0d011a20042001200010a0012002200320042802002004280204105741000c010b200041003a00082005200120022003106f0b200441106a24000b3e01017f230041106b22022400200241086a41cc8d084190ce00200110d001200228020c21012000200228020836020020002001360204200241106a24000b32000240200120024d044020024190ce004d0d01102c000b102c000b2000200220016b3602042000200141cc8d086a3602000b1900200041feffffff0746044041e08508410d1003000b20000b4d01017f230041106b220124002000101241044604402001410036020c200041002001410c6a4104108a011a41feffffff072000200128020c41c58eb1a204461b21000b200141106a240020000b800101027f230041106b220324000240024020002d000404404190ce0041dcdb0828020022046b2002490d01200341086a2004200220046a220010a4012003280208200328020c20012002105741dcdb0820003602000c020b200028020020012002100f1a0c010b200010a501200028020020012002100f1a0b200341106a24000b3f01017f230041106b22032400200341086a2001200241cc8d084190ce00102b200328020c21012000200328020836020020002001360204200341106a24000b5801027f230041106b2201240020002d0004200041003a00040440200141086a410041dcdb0828020010a00120002802002001280208200128020c100f1a41dcdb08410036020041e0db0841003a00000b200141106a24000b0d002000416710201a416710120b0d002000102a220010201a20000b1200200010a6014504402000200110211a0b0b1200200010a6014504402000200110aa010b0b3801017f230041106b2202240020024200370308200220014100200241086a10820120002002280200200228020410b801200241106a24000b0a00200010a70110a2010bb90101047f230041206b22012400200010a701210210432104200210122100200141106a41003a00002001410c6a2000360200200120023602082001200036020420014100360200037f2000200346047f20012d0010044041dcdb08410036020041e0db0841003a00000b200141206a2400200405200110ad012100200110ae012102200110af0121032001200036021c20012003360218200120023602142004200141146a105920012802002103200128020421000c010b0b0b3302017f017e230041106b220124002001410036020c20002001410c6a2200410410b3012000410410b101200141106a2400a70b0900200041201087010b0c002000200010ad011087010b3a01017f230041106b22032400200341086a20014108200210d001200328020c21012000200328020836020020002001360204200341106a24000b3401017e02402001450d0003402001450d01200141016b210120003100002002420886842102200041016a21000c000b000b20020bfd0101067f230041306b22012400200010a701210210432104200210122100200141186a41003a0000200141146a2000360200200120023602102001200036020c20014100360208037f2000200346047f20012d0018044041dcdb08410036020041e0db0841003a00000b200141306a2400200405200141086a220210ad012103200210ae012105200210af01210641002100200141003a002f20022001412f6a410110b30102400240024020012d002f0e020201000b41ed8608410d108801000b410121000b200120003a002820012006360224200120053602202001200336021c20042001411c6a105520012802082103200128020c21000c010b0b0b2d00200041086a200028020020012002109e01044041a38508410f108801000b2000200028020020026a3602000b870101017f230041306b220224002002200136020820021035200220022d00043a00102002200228020036020c20022001101236021c200241003602182002200241086a3602140340200241206a200241146a10b50120022d002c410246450440200241206a2002410c6a10b6010c010b0b2000200228020c20022d001010b701200241306a24000bc50301077f230041d0006b22022400024020012802042204410d6a220820012802084d0440200128020020024200370035200242003703302802002004200241306a2203410d106f1a20024100360240200241286a20034100410410bf01200241406b220541042002280228200228022c105720022802402104200241c8006a41003a000020024200370340200241206a20034104410d10bf01200541092002280220200228022410572002410036024c200241186a20054100410410c001200241cc006a220741042002280218200228021c1057200228024c21032002410036024c200241106a20054104410810c00120074104200228021020022802141057200228024c2106200241003a004c200241086a20054108410910c001200741012002280208200228020c1057200020022d004c4100473a000c2000200641187420064180fe03714108747220064108764180fe0371200641187672723602082000200341187420034180fe03714108747220034108764180fe0371200341187672723602042000200441187420044180fe03714108747220044108764180fe037120044118767272360200200120083602040c010b200041023a000c0b200241d0006a24000b4d01017f230041106b220224002000280200200110bc012001200028020410bd01200041086a2802002001103e20022000410c6a2d00003a000f20012002410f6a410110a301200241106a24000b0d00200020012002103810211a0b0d00200020012002104d10211a0b870101017f230041306b220224002002200136020820021035200220022d00043a00102002200228020036020c20022001101236021c200241003602182002200241086a360214200241246a21010340200241206a200241146a10ba012002280220044020012002410c6a10bb010c010b0b2000200228020c20022d001010b701200241306a24000b890301067f230041406a22022400200020012802042203410c6a220620012802084d047f2001280200200241286a4100360200200242003703202802002003200241206a2203410c106f1a20024100360230200241186a20034100410410c101200241306a220541042002280218200228021c10572002280230210420024200370330200241106a20034104410c10c101200541082002280210200228021410572002410036023c200241086a20054100410410c2012002413c6a220741042002280208200228020c1057200228023c21032002410036023c200220054104410810c20120074104200228020020022802041057200228023c21052000410c6a200441187420044180fe03714108747220044108764180fe0371200441187672723602002000200341187420034180fe03714108747220034108764180fe03712003411876727236020420012006360204200041086a200541187420054180fe03714108747220054108764180fe03712005411876727236020041010541000b360200200241406b24000b1f002000280208200110bc012001200028020010bd0120002802042001103e0b4601017f230041106b220224002002200041187420004180fe03714108747220004108764180fe03712000411876727236020c20012002410c6a410410a301200241106a24000b810101037f230041106b220224000240024020002d000404402001101222044190ce0041dcdb0828020022036b4b0d01200241086a2003200320046a220010a401200141002002280208200228020c106f1a41dcdb0820003602000c020b20002802002001108b010c010b200010a50120002802002001108b010b200241106a24000b3802017f017e230041106b22012400200142003703082000200141086a22004108418a8508410b10c5012000410810b101200141106a24000b0f002000200120022003410d10f8010b0f002000200120022003410910f8010b0f002000200120022003410c10f8010b0f002000200120022003410810f8010b800201057f230041206b2202240020002001280204220341086a220520012802084d047f2001280200200242003703102802002003200241106a22034108106f1a2002410036021c200241086a20034100410410c2012002411c6a220641042002280208200228020c1057200228021c21042002410036021c200220034104410810c20120064104200228020020022802041057200228021c21032000200441187420044180fe03714108747220044108764180fe03712004411876727236020420012005360204200041086a200341187420034180fe03714108747220034108764180fe03712003411876727236020041010541000b360200200241206a24000b8a0101047f230041106b220324002001280204220241046a220420012802084b047f41000520012802002003410036020c28020020022003410c6a4104106f1a200328020c210220012004360204200241187420024180fe03714108747220024108764180fe037120024118767272210241010b21012000200236020420002001360200200341106a24000b3000200041086a200028020020012002109e0104402003200441a38508410f104c000b2000200028020020026a3602000b7801017f230041106b220224002002200042388620004280fe0383422886842000428080fc0783421886200042808080f80f834208868484200042088842808080f80f832000421888428080fc07838420004228884280fe038320004238888484843703082001200241086a410810a301200241106a24000bd60101067f230041406a2200240010c801105c2101200010c901105c3602082000104736020c200041286a22022001103241f7800841101033200028022c2201200041086a106420012000410c6a1064200041206a2201200041386a2203290300370300200041186a2204200041306a2205290300370300200020002903283703102000200041106a107c360204200210c901105c103241f5810841181033200028022c200041046a1078200120032903003703002004200529030037030020002000290328370310200041106a107c200041406b24000b0a00419588084112104d0b0a00418188084114104d0ba90302057f017e23004180016b2202240010cb0110ab012103200128020c210420012903002107200128020821010240200341feffffff07460440200141feffffff07460d01200110a101210120022004360214200220073703082002200136021010cc01105c2103200410292104200241e0006a22012003103241a18008410a1033200241406b22032001200241086a1084012001200310cd01200110344200210741feffffff0721010b200241e0006a2000103241c081084112103320022802641a200241286a2200200241f0006a2205290300370300200241206a2203200241e8006a2206290300370300200220022903603703180240200141feffffff074704402005200029030037030020062003290300370300200220022903183703602002107d360278200110a10121002002200436023c2002200737033020022000360238200241406b200241e0006a200241306a1083010c010b200241d0006a2000290300370300200241c8006a200329030037030020022002290318370340200220043602580b200241e0006a200241406b107620024180016a24000f0b41ca8808411f1041000b0a0041e88c084122104d0b0a0041fa8608411d104d0bff0202037f027e230041d0006b22022400200241306a2204200141106a290300370300200241286a2203200141086a290300370300200220012903003703202002107d36023802400240024002402001280218220110650e020102000b10472103200241086a2002280220200228022420042001106220022903082105200229032821062000107d3602182000200336021020002006370308200020053703000c020b20002002290320370300200041186a200241386a290300370300200041106a2004290300370300200041086a20032903003703000c010b200241406b2001109701027f200229034050044020022802302101200241106a200228022020022802242002280248200228024c106d2002280210210320022802140c010b10472101200241186a200228022020022802242002280230200241406b106c20022802182103200228021c0b2104200229032821052000107d360218200020013602102000200537030820002004360204200020033602000b200241d0006a24000b0d002000106141ff017141014b0b17002000280200200128020010890141ff017141ff01460b3b01017f230041106b22042400200441086a4100200320012002102b200428020c21012000200428020836020020002001360204200441106a24000b0a0041bd8808410d104d0b0a0041f28708410f104d0b0a0041dd87084115104d0b0a0041a788084116104d0b1901017f419787084116104d210120002802002001104020010b1901017f41ad87084118104d210120002802002001104020010b0a0041c587084118104d0b0a00418f8c08411d104d0b0a0041ac8c08411d104d0b0a0041c98c08411f104d0ba705020d7f027e230041406a220024001022410a105a410041bd8808410d105021094101104b210241024195880841121050210a410341818808411410502105410441f28708410f1050210641051011210d41061011210e410710582107410810512108410941fa8608411d10502104200020083602102000200736020c2005102f1032210141e68108410f104d21031043210b107d210c10162001200c2003200b10452101101720011012210320004100360230200020013602282000200341027636022c200041286a22031075102f10a201210120032004102f102f103241ab8008411510332003108001210302400240200141feffffff074704402001102f10a101200210300d0141e9880841d1001041000b200220031030450d010b10cc01200410a80110d901200310a801024010cb01220410a6010d00200141feffffff074704402004200110211a0c010b200441ed8508410410b8010b10d101200910a80110d401200210a80110c801200a10a80110c9012005102f10a80110d801200041286a22012005103241b68108410a1033200110800110a80110d2012006102f10a80110da0120012006103241868308410f1033200110800110a80120002007101236021c2000410036021820002000410c6a36021403400240200041286a200041146a10c301200028022845044020002008101236021c200041003602182000200041106a3602140340200041286a200041146a10c3012000280228450d022000200028023022013602242000200028022c360220200041206a10d501220210a6010d002002200110b4010c000b000b2000200028023022013602242000200028022c360220200041206a10d601220210a6010d012002200110b9010c010b0b10d301200d10a90110d701200e10a901200041406b24000f0b41ba890841c8001041000b080010224100105a0bc70101057f230041306b220024004100105a02400240104610d101105c10300440104610d101105c1030450d012000104a220136020810d40110a701210210c901105c2103200020011012360214200041003602102000200041086a36020c200041206a210103400240200041186a2000410c6a10672000290318500d00200028022c200028022820021030450d0410ce01450d042003102f200110ca010c010b0b200041306a24000f0b41828a0841161041000b41828a0841161041000b41988a08410d1041000bc70702097f017e23004180016b2200240010224101105a2000104f36022c10d101105c210102400240024010462207200110300440200010c901105c2201360234200041e0006a22022001102f1032418d82084118103320002802642000412c6a1078200041d8006a2201200041f0006a2206290300370300200041d0006a2203200041e8006a220429030037030020002000290360370348200041c8006a2205107c2108200210c801105c103241e18008410a103320002802642202200041346a10642002410020081079200120062903003703002003200429030037030020002000290360370348200041386a2005107e200028024410ce01450d0120002802341032210141a582084106104d21041043220341012000107910432202200041386a1044200020013602702000427f37036820002003360264200020043602602000107d22053602780240024002400240200210650e020200010b200041c8006a2002109701027f2000290348500440200041186a2004200320002802502000280254106d20002802182104200028021c0c010b1047200041206a200420032001200041c8006a106c20002802202104210120002802240b2103107d21050c010b10472101200041106a20042003200620021062200029036821092000280214210320002802102104107d21052009427f520d010b101621090b2009200120052004200310452101101720011012210220004100360250200020013602482000200241027636024c200041c8006a1075220210122101200041f0006a41003a0000200041ec006a2001360200200020023602682000200136026420004100360260200041e0006a2201418a8508410b103a10a2012102200110be01210920011039210120002802642000280260470d0220002d0070044041dcdb08410036020041e0db0841003a00000b0240200241feffffff07470440200210a10121030c010b10d90110a701210310cc01105c200110291031420021090b200110ce01450d03200720032009200110422000200136026c20002003360268200020093703602000200041e0006a1095012201360230200041086a1035200020002d000c3a003c200020002802083602382000200110123602502000410036024c2000200041306a3602480340200041e0006a200041c8006a106720002903605045044020002802742000280270200041386a2201103e2000290368200110c6012001103c0c010b0b200028023820002d003c103720004180016a24000f0b41828a0841161041000b41e78a08411f1041000b418a8508410b41958508410e104c000b41868b08411a1041000bf31d02167f027e230041a0026b2200240010224100105a10c801105c2101200010c901105c2214102f1096013602f001200010433602a00120004180026a22092001103241eb8008410c10332000280284022201410010810120014101108101200141001081012001200041f0016a2211107b2001200041a0016a2207107b200041e0016a220520004190026a2204290300370300200041d8016a220220004188026a220329030037030020002000290380023703d001200041d0016a2206107f10d201105c210120002014102f1096013602f001200010433602a00120092001103241eb8008410c10332000280284022201410010810120012011107b20012007107b2001410120001079200520042903003703002002200329030037030020002000290380023703d0012006107f102a2203102a22061023200610ce01044010cc01105c20061029103110d90110a70121012000200636028c0220004200370380022000200136028802200320004180026a10440b200020033602900102400240024020031065044010d40110a701210e107d210d2000200028029001101236029c012000410036029801200020004190016a3602940120004190026a210a200041c0016a210f200041a8016a21150340200041a0016a20004194016a106720002903a00150044042808090bbbad6adf00d102e2101200d10d301105f102e1092012001108d012205200d10d701105f102e1092012001108d012206109101200d10890141ff01714102490d05200d200510930120061090012102200e102f210120002002102936028c0220004200370380022000200136028802201420004180026a10ca01200e102f2101200510ce010440104620014200200510420b200610ce0104401048200e4200200610420b104321041043102f2106200141feffffff07460d032001200610400c040b200f201541086a290300370300200020152903003703b801200f10d60110ac012112200f10d50110b2012113200f280200210c20002802c401210420002903b801211620121012210120131012410d6e2001410c6e6a21114100210103400240024020012011470440200141016a2106410021022012101221050240024003402002410c6a220320054b0d0120004188026a2209410036020020004200370380022012200220004180026a2202410c108a011a200041003602d00120004188016a20024100410410c101200041d0016a22074104200028028801200028028c01105720002802d0012108200042003703d00120004180016a20024104410c10c101200741082000280280012000280284011057200041003602f001200041f8006a20074100410410c201200041f0016a220241042000280278200028027c105720002802f001210b200041003602f001200041f0006a20074104410810c2012002410420002802702000280274105720032102200841187420084180fe03714108747220084108764180fe0371200841187672722001470d000b20002802f0012103200b411874200b4180fe037141087472200b4108764180fe0371200b4118767272102f2101200341187420034180fe03714108747220034108764180fe0371200341187672722207102f21054101102d20004180026a22032001103241d986084114103320002802840222012005106e20011070200041e0016a2202200a290300370300200041d8016a2201200929030037030020002000290380023703d001104321052000200436028c022000200c360288022000201637038002200520031044200a200229030037030020092001290300370300200020002903d001370380022000107d360298020240024002400240200510650e020102000b10472101200041e8006a200028028002200028028402200a200510622000290368211720002903880221162000107d3602e801200020013602e001200020163703d801200020173703d0010c020b200041e8016a20004198026a2903003703002002200a2903003703002001200929030037030020002000290380023703d0010c010b200041f0016a22012005109701200041d0016a20004180026a20011083010b20004180026a200041d0016a1076200028028802220c20071030450d01200028028c0221042000290380022116200621010c050b4100210220131012210503402002410d6a220320054b0d03200042003700850220004200370380022013200220004180026a2202410d108a011a200041003602d001200041e0006a20024100410410bf01200041d0016a2208410420002802602000280264105720002802d0012109200041d8016a220b41003a0000200042003703d001200041d8006a20024104410d10bf01200841092000280258200028025c1057200041003602f001200041d0006a20084100410410c001200041f0016a2202410420002802502000280254105720002802f0012110200041003602f001200041c8006a20084104410810c001200241042000280248200028024c105720002802f0012107200041003a00f001200041406b20084108410910c0012002410120002802402000280244105720032102200941187420094180fe03714108747220094108764180fe0371200941187672722001470d000b20002d00f001200741187420074180fe03714108747220074108764180fe0371200741187672722108200c102f2109200410292107201041187420104180fe03714108747220104108764180fe037120104118767272102f21054504404101102d20004180026a22012005103241a88608410810332000280284021070200041e0016a2202200a290300370300200b20004188026a220329030037030020002000290380023703d001104321042000200736028c0220002009360288022000201637038002200420011044200a20022903003703002003200b290300370300200020002903d001370380022000107d360298020240024002400240200410650e020102000b10472101200041106a200028028002200028028402200a200410622000290310211720002903880221162000107d3602e801200020013602e001200020163703d801200020173703d0010c020b200041e8016a20004198026a2903003703002002200a290300370300200b200329030037030020002000290380023703d0010c010b200041f0016a2004109701027f20002903f0015004402000280290022103200041186a20002802800220002802840220002802f80120002802fc01106d200028021c210220002802180c010b10472103200041206a200028028002200028028402200028029002200041f0016a106c2000280224210220002802200b210120002903880221162000107d3602e801200020033602e001200020163703d801200020023602d401200020013602d0010b200041d0016a107221032008102f21012000200336028c022000420037038002200020013602880220004180026a10950121010c040b2008102f21044101102d20051032210341a886084108104d2101104322052004106e20051070104321042000200736028c0220002009360288022000201637038002200420004180026a104420002003360290022000427f37038802200020053602840220002001360280022000107d36029802027f027e024002400240200410650e020102000b10472102200041286a200028028002200028028402200a20041062200028022c2103200028022821012000290388020c020b20002802900221022000290388022116200028028402210320002802800221012000280298020c020b200041d0016a2004109701027f20002903d0015004402000280290022102200041306a20002802800220002802840220002802d80120002802dc01106d2000280234210320002802300c010b10472102200041386a200028028002200028028402200028029002200041d0016a106c200028023c210320002802380b21012000290388020b2116107d0b21042016427f51047e10160520160b200220042001200310452103101741002102200310122101200041003602f801200020033602f001200020014102763602f401200041f0016a1075102f210410432101200410122103200041003a0090022000200336028c0220002004360288022000200336028402200041003602800203402002200346044020002d009002450d0541dcdb08410036020041e0db0841003a00000c0505200041d0016a220320004180026a1077200120031044200028028002210220002802840221030c010b000b000b41c0860841191041000b200c200e10300440200d2004108f010c040b41d48a0841131041000b200041086a1036200020002d000c3a008402200020002802083602800220004180026a220641808008412110a301230041406a220324002003410020036b41037122046a210720040440200321020340200241003a0000200241016a22022007490d000b0b200741c00020046b2205417c7122046a2102200441004a0440034020074100360200200741046a22072002490d000b0b200541037122040440200220046a21040340200241003a0000200241016a22022004490d000b0b20062003027f200104402001ad2116413f2101024003402016500d012001413f4d0440200120036a20162016420a802216420a7e7da74130723a0000200141016b21010c010b0b102c000b200141016a0c010b200341303a003f413f0b22016a41c00020016b10a301200341406b240020002802800220002d00840210381000000b200020013602cc01107d2102107d21042000200110123602d801200041003602d4012000200041cc016a3602d00102400340024020004180026a200041d0016a1067200029038002500d002000280294022105200221032000280290022201200c103045044020042103200120081030450d030b20032005108f010c010b0b2008102f210c42002116200621010c010b0b0b4187860841211041000b41a58a0841151041000b200041808080203602d0012006200041d0016a4104100f1a200641ed85084104100f1a0b200042003703d0012006200041d0016a22034108100f1a20052006103f20042006104e10c70110432201418a8d084108104d104e20021043102f2202103f2002103f200120021024200020043602d00120002004101236028802200041003602840220002003360280020340200020004180026a10c40120002802000440200028020410071a0c010b0b200041a0026a24000f0b41ba8a08411a1041000b0d0010224100105a10c70110250b0d0010224100105a10d101105b0b0d0010224100105a10d401105d0b0d0010224100105a10d801105d0b2a01017f10224100105a10cb0110ab01220041feffffff07470440200010071a0f0b41ed8508410410260b0d0010224100105a10da01105d0b0d0010224100105a10c801105b0b0d0010224100105a10c901105b0b0d0010224100105a10cc01105b0b0d0010224100105a10d901105d0b0d0010224100105a10d201105b0ba10101027f230041406a2200240010224101105a20004100104b3602142000200041146a10d60110ac012201360218200041086a1035200020002d000c3a00202000200028020836021c20002001101236022c200041003602282000200041186a360224200041346a21010340200041306a200041246a10ba012000280230044020012000411c6a10bb010c010b0b200028021c20002d00201037200041406b24000ba00101027f230041406a2200240010224101105a20004100104b3602142000200041146a10d50110b2012201360218200041086a1035200020002d000c3a00202000200028020836021c20002001101236022c200041003602282000200041186a3602240340200041306a200041246a10b50120002d003c4102470440200041306a2000411c6a10b6010c010b0b200028021c20002d00201037200041406b24000b0d0010224100105a10d301105e0b0d0010224100105a10d701105e0be30302057f027e23004190016b2200240010494100105a2000104a2201360214024020011065410146044020011012210120004100360234200020013602302000410036022c2000200041146a3602282000413c6a2102200041f4006a2103200041f8006a21010340200041f0006a200041286a10672000290370500d02200041e0006a200141086a290300220537030020002001290300220637035820002000280234220441016a360234200341086a200537020020032006370200200041406b2001290200370300200041c8006a20004180016a280200360200200020002902703703382004450440200041206a200241086a290200370300200020022902003703180c010b0b102c000b41b3830841221003000b200041086a2201200041206a2903003703002000200029031837030010da0110a701210220012802002002103045044041988a08410d1041000b10d201105c21022000104336021820001043360228200041f0006a22012002103241a783084105103320002802742202200041186a107b2002200041286a107a200041e8006a20004180016a290300370300200041e0006a200041f8006a29030037030020002000290370370358200041386a2202200041d8006a20001084012001200210cd012001107420004190016a24000b8c0101027f230041406a2200240010494100105a10d201105c21012000104336020020001043360204200041086a200110324195830841121033200028020c22012000107b2001200041046a107a200041306a200041186a290300370300200041286a200041106a290300370300200020002903083703202000107d360238200041206a1074200041406b24000bff0102057f017e230041306b22002400102210494101105a2000104f36021010d201105c20001043360214200010433602181032210241ac83084107104d210310432201200041106a10782001200041146a107b2001200041186a107a107d210410162002200420032001104521011017200110122102200041003602242000200136021c200020024102763602202000411c6a107521012000420037032820011012220241094904400240200041086a200041286a200210b0012001410020002802082201200028020c2202108a011a2001200210b10122054280808080105a0d0020051014200041306a24000f0b0b418a8508410b41958508410e104c000b980302057f017e230041e0006b220024001022104941e4db08101336020041e4db08280200410048044041ef830841111003000b2000410036023810432103200041386a22042802002101034041e4db0828020020014a04402004200141016a220236020020032001104b104e200221010c010b0b2003210141e4db0828020020002802384a04404180840841121003000b2000200136021c200410d201105c103241f98208410d103320002001101236025c2000410036025820002000411c6a360254200028023c21010340200041106a200041d4006a10c4012000280210044020012000280214106e0c010b0b200041286a200041406b290300370300200041306a200041c8006a29030037030020002000290338370320200041386a200041206a107e02402000280244220110ce01450440200028024021020c010b1046200028024022024200200110420b2000290338200041086a1035200020002d000c3a003c200020002802083602382002200041386a2202103e200210c60120012002103c200028023820002d003c1037200041e0006a24000b3101017e102210494101105a41001011220042818090bbbad6adf00d5a044041ef8b0841201041000b10d701200010aa010b3101017e102210494101105a41001011220042818090bbbad6adf00d5a044041d28b08411d1041000b10d301200010aa010be30101037f230041306b22002400102210494102105a410010582101200041011051220236020c20002001360208200020011012360218200041003602142000200041086a36021003402000411c6a200041106a10c301200028021c044020002000280224220136022c20002000280220360228200041286a10d601200110b9010c01052000200210123602182000410036021420002000410c6a36021003402000411c6a200041106a10c301200028021c044020002000280224220136022c20002000280220360228200041286a10d501200110b4010c010b0b200041306a24000b0b0baa07020b7f017e230041306b2200240010224100105a10c901105c2209102f1032210141d281084114104d210210432106107d21071016200120072002200610452101101720011012210220004100360210200020013602082000200241027636020c200041086a1075220210122101200041286a41003a0000200041246a2001360200200020023602202000200136021c200041003602180240027f024002402001450d00024002400240200041186a418a8508410b105441ff01710e020201000b418a8508410b41ed8608410d104c000b41012103200041186a418a8508410b105321010b200028021c2000280218470d0320002d0028044041dcdb08410036020041e0db0841003a00000b2003450d00200041186a22042001102f103241e482084115103320002004107c220336020020042001102f103241b28208410b1033200041186a107c42be8a860f102e108e01210620042001102f103241c98208410d1033200041186a107c200310920142be8a860f102e108e01410a102d4112109401108d01210720042001102f103241bd8208410c1033200041186a107c410a102d41121094012003109001108e0142be8a860f102e108e01410a102d4112109401108d01210a20042009102f2202102f103241878108410f10332000200041186a107c220536021420042002102f103241ab820841071033200041186a107c210820042002103241a6810841101033200041186a107c2102200020082005109101200210900136020820042001103241d68208410e1033200028021c2201200041146a10782001200041086a107820002802282102200028021821052000290320107d21081071200220082005200110452101101720002001107336020442808090bbbad6adf00d102e21022000107d360218200041046a200410cf012105107d220120050d021a2001200028020410890141016a41ff017141014d0440200041046a200010cf010d02200028020021030b20002802042003109301200a108e012101410a102d4112109401200028020010900121032006200210920120072002109201108c0120012002108e012003108d01108c010c020b41a08b0841321041000b2000280204200710920121012006200210920120012002108e012000280200108d01108c010b2101200041186a22032009103241968108411010332003107c2102410a102d411210940121032000280204200110920120032002109301108e0120034103109401108d011025200041306a24000f0b418a8508410b41958508410e104c000b0300010b3c01017f230041106b22052400200541086a2001200420022003109d01200528020c21012000200528020836020020002001360204200541106a24000b3b01017f230041106b22052400200541086a2002200320012004102b200528020c21012000200528020836020020002001360204200541106a24000b0bda0d0200418080080bc60d4e6f2073776170206f7065726174696f6e20666f756e6420617420696e64657820756e7772617045676c646765745772617070656445676c64546f6b656e49647772617045676c64726563697069656e742061646472657373206e6f7420736574657869744d61726b6574636c61696d526577617264736765744163636f756e74546f6b656e73676574546f74616c426f72726f777367657452657365727665466163746f72676574546f74616c5265736572766573676574546f6b656e49646d696e74416e64456e7465724d61726b6574676574496e746572657374526174654d6f64656c676574556e6465726c79696e674964746f6b656e73546f556e6465726c79696e67416d6f756e74756e6465726c79696e67416d6f756e74546f546f6b656e7372656465656d6765744361736867657442617365526174656765744c617374536c6f70656765744669727374536c6f70656765745574696c697a6174696f6e6765744f7074696d616c5574696c697a6174696f6e636c61696d4d756c7469706c656765745374616b65546f6b656e4964726562616c616e6365506f7274666f6c696f7374616b65756e7374616b65696e636f7272656374206e756d626572206f662045534454207472616e7366657273617267756d656e74206465636f6465206572726f722028293a20746f6f2066657720617267756d656e7473746f6f206d616e7920617267756d656e747377726f6e67206e756d626572206f6620617267756d656e747363616e6e6f74207375627472616374206265636175736520726573756c7420776f756c64206265206e656761746976654d756c7469455344544e46545472616e73666572455344544e46545472616e73666572455344545472616e7366657273796e6320726573756c74696e70757420746f6f206c6f6e67696e70757420746f6f2073686f72746361737420746f20693634206572726f724d616e6167656456656320696e646578206f7574206f662072616e67654553445420657870656374656445474c4473746f72616765206465636f6465206572726f723a20756e6b6e6f776e20726563656976656420746f6b656e206166746572207377617065786368616e6765626164206172726179206c656e67746877726f6e672072657475726e6564207377617020746f6b656e73776170546f6b656e734669786564496e707574696e76616c69642076616c7565777261707065645f65676c645f636f6e74726163745f61646472657373636f6d706f756e645f617368737761705f7377617073636f6d706f756e645f7865786368616e67655f7377617073706572666f726d616e63655f666565735f70657263656e74636f6d706f756e645f666565735f70657263656e74626f6f737465725f616464726573736d6f6e65795f6d61726b65745f61646472657373636f6e74726f6c6c65725f6164647265737361737365745f746f6b656e5f6964656e7469666965727661756c745f616464726573737061796d656e742073686f756c6420626520616e204553445420746f6b656e54686520617373657420746f6b656e206964656e74696669657220616e6420746865206d6f6e6579206d61726b657420756e6465726c79696e67206964656e74696669657220646f6e2774206d617463685768656e20746172676574696e6720616e2045474c44206d61726b65742074686520617373657420746f6b656e206964656e7469666965722073686f756c64206265205745474c4443616c6c65722073686f756c64206265207661756c7477726f6e67207061796d656e746e6f2072657761726420746f20636f6d706f756e646e6f206c65667420616d6f756e7420746f20636f6d706f756e6477726f6e67207377617070656420746f6b656e6e6f2065786974206d61726b6574207061796d656e742072656365697665646e6f2072656465656d207061796d656e742072656365697665644e6f20696e7465726573742072617465206d6f64656c2070726573656e74206f6e20746865206d6f6e6579206d61726b65746e657720636f6d706f756e6420666565732065786365656420313030256e657720706572666f726d616e636520666565732065786365656420313030256d6f6e65795f6d61726b65745f746f6b656e5f6964656e746966696572777261707065645f65676c645f746f6b656e5f6964656e746966696572626f6f737465725f7374616b65645f746f6b656e5f6964656e7469666965726d6f6e65795f6d61726b65745f756e6465726c79696e675f6964656e746966696572636f6d706f756e64456e64706f696e742063616e206f6e6c792062652063616c6c6564206279206f776e6572000070616e6963206f636375727265640041c88d080b049cffffff@0500@0100@0000000000000000000000000000000000000000000000000000000000000000@5745474c442d613238633539@00000000000000000500a3b666902d5f4bbf0ff93748fb915aeb43124cbf6509@0000000000000000050032de4f40f17a2f41c4e40c21f596e36a846994e36509@00000000000000000500f8836686f7c6c0f13d7275151b78f59f8f2f729a6509@@@@@000000000000000005000b1e5b244325095849f4e37134661d5bfdcd925e7ceb",
+      "signature": "edf0ec99b6f60414fa5e36d40cfb1d0075d01fd7c4ad7ba59bbe62b8b48eb892beb0c18bba203ff32b83827c3953847b190cdc89a4806f4615565dc2b3b5940f",
+      "sourceShard": 1,
+      "destinationShard": 1,
+      "blockNonce": 2127577,
+      "blockHash": "e3aea17b5345b45f61b233834d3b4ba0ac6f2b7d53eb3f1b1cf2bf0534ba567f",
+      "notarizedAtSourceInMetaNonce": 2129029,
+      "NotarizedAtSourceInMetaHash": "73ee8458f55bf5c9ea4a9974c0c838ced51a236c2b13238761f444598f40575e",
+      "notarizedAtDestinationInMetaNonce": 2129029,
+      "notarizedAtDestinationInMetaHash": "73ee8458f55bf5c9ea4a9974c0c838ced51a236c2b13238761f444598f40575e",
+      "miniblockType": "TxBlock",
+      "miniblockHash": "cc7e81e68269c2c633daf997fd2d52fc82d8ba3bb699d7e75250008bd9b7aa29",
+      "hyperblockNonce": 2129029,
+      "hyperblockHash": "73ee8458f55bf5c9ea4a9974c0c838ced51a236c2b13238761f444598f40575e",
+      "timestamp": 1707144290,
+      "status": "success",
+      "operation": "scDeploy",
+      "initiallyPaidFee": "82333950000000000",
+      "chainID": "D",
+      "version": 1,
+      "options": 0
+    }
+  },
+  "error": "",
+  "code": "successful"
+}
+        "#;
+
+    let tx_on_network: TransactionOnNetwork = serde_json::from_str::<TransactionInfo>(data)
+        .unwrap()
+        .data
+        .unwrap()
+        .transaction;
+    let tx_response = TxResponse::from_network_tx(tx_on_network);
+    let opt_address = tx_response.new_deployed_address.map(|e| {
+        multiversx_sdk::data::address::Address::from_bytes(*e.as_array())
+            .to_bech32_string()
+            .unwrap()
+    });
+
+    let expected =
+        Some("erd1qqqqqqqqqqqqqpgqwpdf84ggxzqzmr2zmw959q4nlf9nz562q33sak25ze".to_string());
+
+    assert_eq!(opt_address, expected)
+}
+
+#[test]
+fn test_deployed_address_should_be_none_if_not_a_sc_deployment_tx() {
+    let data = r#"
+        {
+  "data": {
+    "transaction": {
+      "type": "normal",
+      "processingTypeOnSource": "BuiltInFunctionCall",
+      "processingTypeOnDestination": "SCInvoking",
+      "hash": "238ad6dbe75dab1d53caeb9cabd584aabc6fc113c849a983afef5a5e439ce9e5",
+      "nonce": 13,
+      "round": 2192628,
+      "epoch": 888,
+      "value": "0",
+      "receiver": "erd1qqqqqqqqqqqqqpgqydwpdrplefjlwp3sp9xmn3vevdxdelfkwmfsw6e5xw",
+      "sender": "erd179xw6t04ug48m74jzyw9zq028hv66jhqayelzpzvgds0ptnzmckq2jf07f",
+      "gasPrice": 1000000000,
+      "gasLimit": 20000000,
+      "data": "RVNEVFRyYW5zZmVyQDRmNTU1MjRmMmQ2NDM4MzEzNzMxNjZAMDI0NmQyZDBiNmI1ZjBANjI3NTc5QDFiYzE2ZDY3NGVjODAwMDA=",
+      "signature": "ce984b4d785ccc7aca4b1cdea57ddcd568a502209f81e6b5bc678e1dd52b78d764fe46ea3ff77b926eb9f70eb52ae8f3f2afa2e9d0efa82655e361641458b900",
+      "sourceShard": 0,
+      "destinationShard": 1,
+      "blockNonce": 2129490,
+      "blockHash": "0ab10909b27565c5b7b59e8e1ee4a68d7046f49225fcde4c12d4b1ea3f512b8a",
+      "notarizedAtSourceInMetaNonce": 2130938,
+      "NotarizedAtSourceInMetaHash": "0c545160fd37f09f0196505b9cd2e730596bcd99438978a5bb415b9e1be1849d",
+      "notarizedAtDestinationInMetaNonce": 2130942,
+      "notarizedAtDestinationInMetaHash": "1ddd6b7aeeff824b5d11f2936a6284e470fc5abe41e34a8df229b719dc1a537d",
+      "miniblockType": "TxBlock",
+      "miniblockHash": "dc8ae41e1ae321c0fccbeb807194d11ff6e0f4ed71163764d850f1daaa60bd22",
+      "hyperblockNonce": 2130942,
+      "hyperblockHash": "1ddd6b7aeeff824b5d11f2936a6284e470fc5abe41e34a8df229b719dc1a537d",
+      "timestamp": 1707155768,
+      "status": "success",
+      "tokens": [
+        "OURO-d8171f"
+      ],
+      "esdtValues": [
+        "640821212132848"
+      ],
+      "operation": "ESDTTransfer",
+      "function": "buy",
+      "initiallyPaidFee": "359390000000000",
+      "chainID": "D",
+      "version": 1,
+      "options": 0
+    }
+  },
+  "error": "",
+  "code": "successful"
+}
+        "#;
+
+    let tx_on_network: TransactionOnNetwork = serde_json::from_str::<TransactionInfo>(data)
+        .unwrap()
+        .data
+        .unwrap()
+        .transaction;
+    let tx_response = TxResponse::from_network_tx(tx_on_network);
+    let opt_address = tx_response.new_deployed_address;
+
+    let expected: Option<Address> = None;
+
+    assert_eq!(opt_address, expected)
+}
diff --git a/framework/scenario/tests/test_tx_issued_token_identifier.rs b/framework/scenario/tests/test_tx_issued_token_identifier.rs
new file mode 100644
index 0000000000..2d0ccffa84
--- /dev/null
+++ b/framework/scenario/tests/test_tx_issued_token_identifier.rs
@@ -0,0 +1,1422 @@
+use multiversx_sc_scenario::scenario_model::TxResponse;
+use multiversx_sdk::data::transaction::{TransactionInfo, TransactionOnNetwork};
+
+#[test]
+fn test_process_issued_token_identifier_fungible() {
+    let data = r#"
+        {
+  "data": {
+    "transaction": {
+      "type": "normal",
+      "processingTypeOnSource": "SCInvoking",
+      "processingTypeOnDestination": "SCInvoking",
+      "hash": "b78170cc5ca5ba441ea46fe84540db9610ccab243ccd4cd3cd976e170c4864c8",
+      "nonce": 61,
+      "round": 173598,
+      "epoch": 72,
+      "value": "50000000000000000",
+      "receiver": "erd1qqqqqqqqqqqqqpgqa7hv0nahgsl8tz0psat46x0tchm0wuyc0n4s6q28ad",
+      "sender": "erd1x39tc3q3nn72ecjnmcz7x0qp09kp97t080x99dgyhx7zh95j0n4szskhlv",
+      "gasPrice": 1000000000,
+      "gasLimit": 100000000,
+      "gasUsed": 100000000,
+      "data": "aXNzdWVMcFRva2VuQDAwMDAwMDAwMDAwMDAwMDAwNTAwMTM5ZWQ3YWU0YWEwMzc5MmU2YmNiMzMyMzk0YTQwZmU3NDZlZWZhNDdjZWJANDU0NzRjNDQ0ZDQ1NTg0YzUwQDQ1NDc0YzQ0NGQ0NTU4",
+      "signature": "b5049d2906adc1305a6a8d0f42749254ca6259c6996d9a35e7dc7528b3c87b48a421879aff70bc6d81483a7559b75e5dcf9be499dcb7d57aa9f25c79ac2ad40d",
+      "sourceShard": 1,
+      "destinationShard": 1,
+      "blockNonce": 173354,
+      "blockHash": "09d85ac264a54e12e7613395211c53fe0ee5a7d3b7111bf5fec1d02794caaacd",
+      "notarizedAtSourceInMetaNonce": 173321,
+      "NotarizedAtSourceInMetaHash": "64a83759da97fe8305cd4cda4b518f2d41ef0a8f3995d264460821edad45e09e",
+      "notarizedAtDestinationInMetaNonce": 173321,
+      "notarizedAtDestinationInMetaHash": "64a83759da97fe8305cd4cda4b518f2d41ef0a8f3995d264460821edad45e09e",
+      "miniblockType": "TxBlock",
+      "miniblockHash": "7f45eee4e35ffc1fbce66b92e4dd2aeae2acb092416aa5aa775b96493256b81d",
+      "hyperblockNonce": 173321,
+      "hyperblockHash": "64a83759da97fe8305cd4cda4b518f2d41ef0a8f3995d264460821edad45e09e",
+      "timestamp": 1695041588,
+      "smartContractResults": [
+        {
+          "hash": "bce3d0dceb0b3e5c8c5780d7da3755c3f7492d551685d493a73bf66ebd36754b",
+          "nonce": 0,
+          "value": 50000000000000000,
+          "receiver": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
+          "sender": "erd1qqqqqqqqqqqqqpgqa7hv0nahgsl8tz0psat46x0tchm0wuyc0n4s6q28ad",
+          "data": "issue@45474c444d45584c50@45474c444d4558@03e8@12@63616e467265657a65@74727565@63616e57697065@74727565@63616e5061757365@74727565@63616e4d696e74@74727565@63616e4275726e@74727565@63616e4368616e67654f776e6572@74727565@63616e55706772616465@74727565@63616e4164645370656369616c526f6c6573@74727565@65ba30",
+          "prevTxHash": "b78170cc5ca5ba441ea46fe84540db9610ccab243ccd4cd3cd976e170c4864c8",
+          "originalTxHash": "b78170cc5ca5ba441ea46fe84540db9610ccab243ccd4cd3cd976e170c4864c8",
+          "gasLimit": 89624222,
+          "gasPrice": 1000000000,
+          "callType": 1,
+          "originalSender": "erd1x39tc3q3nn72ecjnmcz7x0qp09kp97t080x99dgyhx7zh95j0n4szskhlv",
+          "operation": "transfer",
+          "function": "issue"
+        },
+        {
+          "hash": "2a452ff652791d79be5f6933fb583cc5503e876893e54b3b51381a92aa2e904d",
+          "nonce": 0,
+          "value": 0,
+          "receiver": "erd1llllllllllllllllllllllllllllllllllllllllllllllllluqsl6e366",
+          "sender": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
+          "data": "ESDTSetBurnRoleForAll@45474c444d45582d393563366435",
+          "prevTxHash": "bce3d0dceb0b3e5c8c5780d7da3755c3f7492d551685d493a73bf66ebd36754b",
+          "originalTxHash": "b78170cc5ca5ba441ea46fe84540db9610ccab243ccd4cd3cd976e170c4864c8",
+          "gasLimit": 0,
+          "gasPrice": 1000000000,
+          "callType": 0,
+          "logs": {
+            "address": "erd1llllllllllllllllllllllllllllllllllllllllllllllllluqsl6e366",
+            "events": [
+              {
+                "address": "erd1llllllllllllllllllllllllllllllllllllllllllllllllluqsl6e366",
+                "identifier": "completedTxEvent",
+                "topics": [
+                  "vOPQ3OsLPlyMV4DX2jdVw/dJLVUWhdSTpzv2br02dUs="
+                ],
+                "data": null,
+                "additionalData": null
+              }
+            ]
+          },
+          "operation": "transfer"
+        },
+        {
+          "hash": "2c84740ccb3376ea9fa00dab6c6c93fe7a35ee0a1d6dbfa0a1e61064853b0874",
+          "nonce": 0,
+          "value": 0,
+          "receiver": "erd1qqqqqqqqqqqqqpgqa7hv0nahgsl8tz0psat46x0tchm0wuyc0n4s6q28ad",
+          "sender": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
+          "data": "ESDTTransfer@45474c444d45582d393563366435@03e8@00",
+          "prevTxHash": "bce3d0dceb0b3e5c8c5780d7da3755c3f7492d551685d493a73bf66ebd36754b",
+          "originalTxHash": "b78170cc5ca5ba441ea46fe84540db9610ccab243ccd4cd3cd976e170c4864c8",
+          "gasLimit": 39624222,
+          "gasPrice": 1000000000,
+          "callType": 2,
+          "logs": {
+            "address": "erd1qqqqqqqqqqqqqpgqa7hv0nahgsl8tz0psat46x0tchm0wuyc0n4s6q28ad",
+            "events": [
+              {
+                "address": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
+                "identifier": "ESDTTransfer",
+                "topics": [
+                  "RUdMRE1FWC05NWM2ZDU=",
+                  "",
+                  "A+g=",
+                  "AAAAAAAAAAAFAO+ux8+3RD51ieGHV10Z68X293CYfOs="
+                ],
+                "data": null,
+                "additionalData": null
+              },
+              {
+                "address": "erd1qqqqqqqqqqqqqpgqa7hv0nahgsl8tz0psat46x0tchm0wuyc0n4s6q28ad",
+                "identifier": "completedTxEvent",
+                "topics": [
+                  "vOPQ3OsLPlyMV4DX2jdVw/dJLVUWhdSTpzv2br02dUs="
+                ],
+                "data": null,
+                "additionalData": null
+              }
+            ]
+          },
+          "tokens": [
+            "EGLDMEX-95c6d5"
+          ],
+          "esdtValues": [
+            "1000"
+          ],
+          "operation": "ESDTTransfer",
+          "function": "\u0000"
+        },
+        {
+          "hash": "c9dfc4de3c3cee319123087a4f5dd03cc051e728ec6070707a63ea977b535227",
+          "nonce": 0,
+          "value": 0,
+          "receiver": "erd1qqqqqqqqqqqqqpgqa7hv0nahgsl8tz0psat46x0tchm0wuyc0n4s6q28ad",
+          "sender": "erd1qqqqqqqqqqqqqpgqa7hv0nahgsl8tz0psat46x0tchm0wuyc0n4s6q28ad",
+          "data": "\u0000",
+          "prevTxHash": "2c84740ccb3376ea9fa00dab6c6c93fe7a35ee0a1d6dbfa0a1e61064853b0874",
+          "originalTxHash": "b78170cc5ca5ba441ea46fe84540db9610ccab243ccd4cd3cd976e170c4864c8",
+          "gasLimit": 39424222,
+          "gasPrice": 1000000000,
+          "callType": 2,
+          "operation": "transfer",
+          "function": "\u0000"
+        },
+        {
+          "hash": "609c3a8e1903680fef1f6d9e47527b1b5c1259664b868af600162120ce0b8192",
+          "nonce": 1,
+          "value": 300925400000000,
+          "receiver": "erd1qqqqqqqqqqqqqpgqa7hv0nahgsl8tz0psat46x0tchm0wuyc0n4s6q28ad",
+          "sender": "erd1qqqqqqqqqqqqqpgqa7hv0nahgsl8tz0psat46x0tchm0wuyc0n4s6q28ad",
+          "data": "@6f6b",
+          "prevTxHash": "2c84740ccb3376ea9fa00dab6c6c93fe7a35ee0a1d6dbfa0a1e61064853b0874",
+          "originalTxHash": "b78170cc5ca5ba441ea46fe84540db9610ccab243ccd4cd3cd976e170c4864c8",
+          "gasLimit": 0,
+          "gasPrice": 1000000000,
+          "callType": 0,
+          "operation": "transfer",
+          "isRefund": true
+        }
+      ],
+      "logs": {
+        "address": "erd1qqqqqqqqqqqqqpgqa7hv0nahgsl8tz0psat46x0tchm0wuyc0n4s6q28ad",
+        "events": [
+          {
+            "address": "erd1qqqqqqqqqqqqqpgqa7hv0nahgsl8tz0psat46x0tchm0wuyc0n4s6q28ad",
+            "identifier": "transferValueOnly",
+            "topics": [
+              "AAAAAAAAAAAFAO+ux8+3RD51ieGHV10Z68X293CYfOs=",
+              "AAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAC//8=",
+              "saK8LsUAAA=="
+            ],
+            "data": null,
+            "additionalData": null
+          },
+          {
+            "address": "erd1qqqqqqqqqqqqqpgqa7hv0nahgsl8tz0psat46x0tchm0wuyc0n4s6q28ad",
+            "identifier": "writeLog",
+            "topics": [
+              "NEq8RBGc/KziU94F4zwBeWwS+W87zFK1BLm8K5aSfOs="
+            ],
+            "data": "QDZmNmI=",
+            "additionalData": null
+          }
+        ]
+      },
+      "status": "success",
+      "operation": "transfer",
+      "function": "issueLpToken",
+      "initiallyPaidFee": "1214335000000000",
+      "fee": "1214335000000000",
+      "chainID": "D",
+      "version": 2,
+      "options": 0
+    }
+  },
+  "error": "",
+  "code": "successful"
+}
+      "#;
+
+    let tx_on_network: TransactionOnNetwork = serde_json::from_str::<TransactionInfo>(data)
+        .unwrap()
+        .data
+        .unwrap()
+        .transaction;
+    let tx_response = TxResponse::from_network_tx(tx_on_network);
+
+    let expected: Option<String> = Some("EGLDMEX-95c6d5".to_string());
+
+    assert_eq!(tx_response.new_issued_token_identifier, expected)
+}
+
+#[test]
+fn test_process_issued_token_identifier_semi_fungible() {
+    let data = r#"
+        {
+  "data": {
+    "transaction": {
+      "type": "normal",
+      "processingTypeOnSource": "SCInvoking",
+      "processingTypeOnDestination": "SCInvoking",
+      "hash": "0634b9c1db9fd6bfa065fc937d51cec37958fd5d33d0c934a0da3d27776a33ae",
+      "nonce": 65,
+      "round": 8422527,
+      "epoch": 584,
+      "value": "50000000000000000",
+      "receiver": "erd1qqqqqqqqqqqqqpgq06w7lq7relxyh2h6xzh98q8x24psf3fqssvqn4ptek",
+      "sender": "erd1x3g000ew7zzv6kyqhj9jl2wy5g6cc72qahvvxz29zv76jwq6ssvqt0d998",
+      "gasPrice": 1000000000,
+      "gasLimit": 80000000,
+      "gasUsed": 80000000,
+      "data": "aXNzdWVUb2tlbkA0NDZmNzA2NTU0NjU3Mzc0QDQ0NGY1MDQ1NTQ0NTUzNTQ=",
+      "signature": "0191848976e930996f6c62d4921e732f9b0ada8b41ca3b5b63d6bfd304fd44c2a1e8e6643479618ba4a764a36e87f53882b4f707600d5b7d476f2fdd2bac040e",
+      "sourceShard": 0,
+      "destinationShard": 0,
+      "blockNonce": 8420241,
+      "blockHash": "4d302220f6015876c95e7961b770cc67f8ab63c5f0ab69b4d6c2fb15c8bc23bd",
+      "notarizedAtSourceInMetaNonce": 8403647,
+      "NotarizedAtSourceInMetaHash": "f8b83b6d38fa45dacc167b15c93dd07ee5c40db906de34f26e11e7a24f539e30",
+      "notarizedAtDestinationInMetaNonce": 8403647,
+      "notarizedAtDestinationInMetaHash": "f8b83b6d38fa45dacc167b15c93dd07ee5c40db906de34f26e11e7a24f539e30",
+      "miniblockType": "TxBlock",
+      "miniblockHash": "b7b8fc9f3b81d7daae1113cbf73457e16ee31f3a864ef3729a1a21f3a929e112",
+      "hyperblockNonce": 8403647,
+      "hyperblockHash": "f8b83b6d38fa45dacc167b15c93dd07ee5c40db906de34f26e11e7a24f539e30",
+      "timestamp": 1646652762,
+      "smartContractResults": [
+        {
+          "hash": "9aecf3bd5dd5c706a28d1cc7059ac20db74340f136816f667dbefcc58daa3aba",
+          "nonce": 0,
+          "value": 50000000000000000,
+          "receiver": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
+          "sender": "erd1qqqqqqqqqqqqqpgq06w7lq7relxyh2h6xzh98q8x24psf3fqssvqn4ptek",
+          "data": "issueSemiFungible@446f706554657374@444f504554455354@63616e467265657a65@74727565@63616e57697065@74727565@63616e5061757365@74727565@63616e4368616e67654f776e6572@74727565@63616e55706772616465@74727565@63616e4164645370656369616c526f6c6573@74727565@5ca148",
+          "prevTxHash": "0634b9c1db9fd6bfa065fc937d51cec37958fd5d33d0c934a0da3d27776a33ae",
+          "originalTxHash": "0634b9c1db9fd6bfa065fc937d51cec37958fd5d33d0c934a0da3d27776a33ae",
+          "gasLimit": 75958360,
+          "gasPrice": 1000000000,
+          "callType": 1,
+          "originalSender": "erd1x3g000ew7zzv6kyqhj9jl2wy5g6cc72qahvvxz29zv76jwq6ssvqt0d998",
+          "operation": "transfer",
+          "function": "issueSemiFungible"
+        },
+        {
+          "hash": "aacfe9088bb9d2d5b3fbe9cab2b2f1c6a7e9cbab2f1a41020e2c819fc9b43570",
+          "nonce": 66,
+          "value": 0,
+          "receiver": "erd1x3g000ew7zzv6kyqhj9jl2wy5g6cc72qahvvxz29zv76jwq6ssvqt0d998",
+          "sender": "erd1qqqqqqqqqqqqqpgq06w7lq7relxyh2h6xzh98q8x24psf3fqssvqn4ptek",
+          "data": "@6f6b",
+          "prevTxHash": "0634b9c1db9fd6bfa065fc937d51cec37958fd5d33d0c934a0da3d27776a33ae",
+          "originalTxHash": "0634b9c1db9fd6bfa065fc937d51cec37958fd5d33d0c934a0da3d27776a33ae",
+          "gasLimit": 0,
+          "gasPrice": 1000000000,
+          "callType": 0,
+          "operation": "transfer"
+        },
+        {
+          "hash": "3f6f0f3de9e942884e7e1592823a7db7ce935a3f9d3359d8c1ee98a5645332d8",
+          "nonce": 0,
+          "value": 0,
+          "receiver": "erd1qqqqqqqqqqqqqpgq06w7lq7relxyh2h6xzh98q8x24psf3fqssvqn4ptek",
+          "sender": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
+          "data": "@00@444f5045544553542d373732303063",
+          "prevTxHash": "9aecf3bd5dd5c706a28d1cc7059ac20db74340f136816f667dbefcc58daa3aba",
+          "originalTxHash": "0634b9c1db9fd6bfa065fc937d51cec37958fd5d33d0c934a0da3d27776a33ae",
+          "gasLimit": 25958360,
+          "gasPrice": 1000000000,
+          "callType": 2,
+          "originalSender": "erd1qqqqqqqqqqqqqpgq06w7lq7relxyh2h6xzh98q8x24psf3fqssvqn4ptek",
+          "logs": {
+            "address": "erd1qqqqqqqqqqqqqpgq06w7lq7relxyh2h6xzh98q8x24psf3fqssvqn4ptek",
+            "events": [
+              {
+                "address": "erd1qqqqqqqqqqqqqpgq06w7lq7relxyh2h6xzh98q8x24psf3fqssvqn4ptek",
+                "identifier": "completedTxEvent",
+                "topics": [
+                  "muzzvV3VxwaijRzHBZrCDbdDQPE2gW9mfb78xY2qOro="
+                ],
+                "data": null
+              }
+            ]
+          },
+          "operation": "transfer"
+        },
+        {
+          "hash": "c6e4f7c5da455009fb4f6967ce8a273a97b826aa617fa798ffd0cf17bde6b97a",
+          "nonce": 1,
+          "value": 225516180000000,
+          "receiver": "erd1qqqqqqqqqqqqqpgq06w7lq7relxyh2h6xzh98q8x24psf3fqssvqn4ptek",
+          "sender": "erd1qqqqqqqqqqqqqpgq06w7lq7relxyh2h6xzh98q8x24psf3fqssvqn4ptek",
+          "data": "@6f6b",
+          "prevTxHash": "3f6f0f3de9e942884e7e1592823a7db7ce935a3f9d3359d8c1ee98a5645332d8",
+          "originalTxHash": "0634b9c1db9fd6bfa065fc937d51cec37958fd5d33d0c934a0da3d27776a33ae",
+          "gasLimit": 0,
+          "gasPrice": 1000000000,
+          "callType": 0,
+          "operation": "transfer",
+          "isRefund": true
+        }
+      ],
+      "logs": {
+        "address": "erd1qqqqqqqqqqqqqpgq06w7lq7relxyh2h6xzh98q8x24psf3fqssvqn4ptek",
+        "events": [
+          {
+            "address": "erd1qqqqqqqqqqqqqpgq06w7lq7relxyh2h6xzh98q8x24psf3fqssvqn4ptek",
+            "identifier": "transferValueOnly",
+            "topics": [
+              "AAAAAAAAAAAFAH6d74PDz8xLqvowrlOA5lVDBMUghBg=",
+              "AAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAC//8=",
+              "saK8LsUAAA=="
+            ],
+            "data": null
+          },
+          {
+            "address": "erd1qqqqqqqqqqqqqpgq06w7lq7relxyh2h6xzh98q8x24psf3fqssvqn4ptek",
+            "identifier": "writeLog",
+            "topics": [
+              "NFD3vy7whM1YgLyLL6nEojWMeUDt2MMJRRM9qTgahBg="
+            ],
+            "data": "QDZmNmI="
+          }
+        ]
+      },
+      "status": "success",
+      "operation": "transfer",
+      "function": "issueToken",
+      "initiallyPaidFee": "914840000000000",
+      "fee": "914840000000000",
+      "chainID": "1",
+      "version": 1,
+      "options": 0
+    }
+  },
+  "error": "",
+  "code": "successful"
+}
+        "#;
+
+    let tx_on_network: TransactionOnNetwork = serde_json::from_str::<TransactionInfo>(data)
+        .unwrap()
+        .data
+        .unwrap()
+        .transaction;
+    let tx_response = TxResponse::from_network_tx(tx_on_network);
+
+    let expected: Option<String> = Some("DOPETEST-77200c".to_string());
+
+    assert_eq!(tx_response.new_issued_token_identifier, expected)
+}
+
+#[test]
+fn test_process_issued_token_identifier_non_fungible() {
+    let data = r#"
+        {
+  "data": {
+    "transaction": {
+      "type": "normal",
+      "processingTypeOnSource": "SCInvoking",
+      "processingTypeOnDestination": "SCInvoking",
+      "hash": "d296186b432d7e7937bde37d725cd52b765ef334c00b95adcb079933bc2277bb",
+      "nonce": 16,
+      "round": 820170,
+      "epoch": 341,
+      "value": "50000000000000000",
+      "receiver": "erd1qqqqqqqqqqqqqpgqmegl4z2rcfhxjv6pn7dm0n4hndllfaam4fdqwqxld8",
+      "sender": "erd162knt53z7m0f9jjms9wxphr3q9d7zu4ky85xs2cc0ekrqz7k4fdq85lkuc",
+      "gasPrice": 1000000000,
+      "gasLimit": 200000000,
+      "gasUsed": 200000000,
+      "data": "aXNzdWVUb2tlbkA2NzY1NmU2NTdhNzk3M0A0NzQ1NGU=",
+      "signature": "e80d45f4de419799a2bbff1cae1235521c8eef1853ee45b02f95c2da74ce50d241bf75b6ab0c650245562700862ea9759caad40f3e381ac0c4d82cfe56e67c09",
+      "sourceShard": 2,
+      "destinationShard": 2,
+      "blockNonce": 819313,
+      "blockHash": "a1db4ef13f07b86678000df9cc78f244d83dcc35ae51de545f333bf616930d39",
+      "notarizedAtSourceInMetaNonce": 819396,
+      "NotarizedAtSourceInMetaHash": "6d9e511e46d318aa5b77cbfdfde14d2ce8515ce4e954b286f130a6b518ddf26a",
+      "notarizedAtDestinationInMetaNonce": 819396,
+      "notarizedAtDestinationInMetaHash": "6d9e511e46d318aa5b77cbfdfde14d2ce8515ce4e954b286f130a6b518ddf26a",
+      "miniblockType": "TxBlock",
+      "miniblockHash": "afdb278522181aeb9b12f08840e6c534e398e6af9c7f757548308e300e7ec4e9",
+      "hyperblockNonce": 819396,
+      "hyperblockHash": "6d9e511e46d318aa5b77cbfdfde14d2ce8515ce4e954b286f130a6b518ddf26a",
+      "timestamp": 1698921020,
+      "smartContractResults": [
+        {
+          "hash": "6fe0cc002802af1744f394eee4a69224b5e775961d8386e04e7a5b9242f7ff65",
+          "nonce": 0,
+          "value": 50000000000000000,
+          "receiver": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
+          "sender": "erd1qqqqqqqqqqqqqpgqmegl4z2rcfhxjv6pn7dm0n4hndllfaam4fdqwqxld8",
+          "data": "issueNonFungible@67656e657a7973@47454e@63616e467265657a65@74727565@63616e57697065@74727565@63616e5061757365@74727565@63616e5472616e736665724e4654437265617465526f6c65@74727565@63616e4368616e67654f776e6572@66616c7365@63616e55706772616465@66616c7365@63616e4164645370656369616c526f6c6573@74727565@5e30e4",
+          "prevTxHash": "d296186b432d7e7937bde37d725cd52b765ef334c00b95adcb079933bc2277bb",
+          "originalTxHash": "d296186b432d7e7937bde37d725cd52b765ef334c00b95adcb079933bc2277bb",
+          "gasLimit": 196098365,
+          "gasPrice": 1000000000,
+          "callType": 1,
+          "originalSender": "erd162knt53z7m0f9jjms9wxphr3q9d7zu4ky85xs2cc0ekrqz7k4fdq85lkuc",
+          "operation": "transfer",
+          "function": "issueNonFungible"
+        },
+        {
+          "hash": "98afe82512c79f1caaf171bd5919ee469d11ba0c4f725aefcab834278c0f1e58",
+          "nonce": 0,
+          "value": 0,
+          "receiver": "erd1lllllllllllllllllllllllllllllllllllllllllllllllllupq9x7ny0",
+          "sender": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
+          "data": "ESDTSetBurnRoleForAll@47454e2d383638353933",
+          "prevTxHash": "6fe0cc002802af1744f394eee4a69224b5e775961d8386e04e7a5b9242f7ff65",
+          "originalTxHash": "d296186b432d7e7937bde37d725cd52b765ef334c00b95adcb079933bc2277bb",
+          "gasLimit": 0,
+          "gasPrice": 1000000000,
+          "callType": 0,
+          "logs": {
+            "address": "erd1lllllllllllllllllllllllllllllllllllllllllllllllllupq9x7ny0",
+            "events": [
+              {
+                "address": "erd1lllllllllllllllllllllllllllllllllllllllllllllllllupq9x7ny0",
+                "identifier": "completedTxEvent",
+                "topics": [
+                  "b+DMACgCrxdE85Tu5KaSJLXndZYdg4bgTnpbkkL3/2U="
+                ],
+                "data": null,
+                "additionalData": null
+              }
+            ]
+          },
+          "operation": "transfer"
+        },
+        {
+          "hash": "83494ad9369738b574a7266cbfb12ce63ccf634950cd6b0ec16107b8fb42f8f6",
+          "nonce": 0,
+          "value": 0,
+          "receiver": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
+          "sender": "erd1qqqqqqqqqqqqqpgqmegl4z2rcfhxjv6pn7dm0n4hndllfaam4fdqwqxld8",
+          "data": "setSpecialRole@47454e2d383638353933@00000000000000000500de51fa8943c26e6933419f9bb7ceb79b7ff4f7bbaa5a@45534454526f6c654e4654437265617465@5e30e4",
+          "prevTxHash": "112d18ec0364b4700b1bfb3df517c80dba547a53373ece2a9e71acd5266e7b64",
+          "originalTxHash": "d296186b432d7e7937bde37d725cd52b765ef334c00b95adcb079933bc2277bb",
+          "gasLimit": 142399698,
+          "gasPrice": 1000000000,
+          "callType": 1,
+          "operation": "transfer",
+          "function": "setSpecialRole"
+        },
+        {
+          "hash": "112d18ec0364b4700b1bfb3df517c80dba547a53373ece2a9e71acd5266e7b64",
+          "nonce": 0,
+          "value": 0,
+          "receiver": "erd1qqqqqqqqqqqqqpgqmegl4z2rcfhxjv6pn7dm0n4hndllfaam4fdqwqxld8",
+          "sender": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
+          "data": "@00@47454e2d383638353933",
+          "prevTxHash": "6fe0cc002802af1744f394eee4a69224b5e775961d8386e04e7a5b9242f7ff65",
+          "originalTxHash": "d296186b432d7e7937bde37d725cd52b765ef334c00b95adcb079933bc2277bb",
+          "gasLimit": 146098365,
+          "gasPrice": 1000000000,
+          "callType": 2,
+          "originalSender": "erd1qqqqqqqqqqqqqpgqmegl4z2rcfhxjv6pn7dm0n4hndllfaam4fdqwqxld8",
+          "logs": {
+            "address": "erd1qqqqqqqqqqqqqpgqmegl4z2rcfhxjv6pn7dm0n4hndllfaam4fdqwqxld8",
+            "events": [
+              {
+                "address": "erd1qqqqqqqqqqqqqpgqmegl4z2rcfhxjv6pn7dm0n4hndllfaam4fdqwqxld8",
+                "identifier": "writeLog",
+                "topics": [
+                  "AAAAAAAAAAAFAN5R+olDwm5pM0Gfm7fOt5t/9Pe7qlo="
+                ],
+                "data": "QDZmNmI=",
+                "additionalData": null
+              }
+            ]
+          },
+          "operation": "transfer"
+        },
+        {
+          "hash": "db5d74970374337956fa61fb4fd90057b3f6a82ea3e259b389934b71a1652e5f",
+          "nonce": 0,
+          "value": 0,
+          "receiver": "erd1qqqqqqqqqqqqqpgqmegl4z2rcfhxjv6pn7dm0n4hndllfaam4fdqwqxld8",
+          "sender": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
+          "data": "ESDTSetRole@47454e2d383638353933@45534454526f6c654e4654437265617465",
+          "prevTxHash": "83494ad9369738b574a7266cbfb12ce63ccf634950cd6b0ec16107b8fb42f8f6",
+          "originalTxHash": "d296186b432d7e7937bde37d725cd52b765ef334c00b95adcb079933bc2277bb",
+          "gasLimit": 0,
+          "gasPrice": 1000000000,
+          "callType": 0,
+          "logs": {
+            "address": "erd1qqqqqqqqqqqqqpgqmegl4z2rcfhxjv6pn7dm0n4hndllfaam4fdqwqxld8",
+            "events": [
+              {
+                "address": "erd1qqqqqqqqqqqqqpgqmegl4z2rcfhxjv6pn7dm0n4hndllfaam4fdqwqxld8",
+                "identifier": "ESDTSetRole",
+                "topics": [
+                  "R0VOLTg2ODU5Mw==",
+                  "",
+                  "",
+                  "RVNEVFJvbGVORlRDcmVhdGU="
+                ],
+                "data": null,
+                "additionalData": null
+              },
+              {
+                "address": "erd1qqqqqqqqqqqqqpgqmegl4z2rcfhxjv6pn7dm0n4hndllfaam4fdqwqxld8",
+                "identifier": "completedTxEvent",
+                "topics": [
+                  "g0lK2TaXOLV0pyZsv7Es5jzPY0lQzWsOwWEHuPtC+PY="
+                ],
+                "data": null,
+                "additionalData": null
+              }
+            ]
+          },
+          "operation": "ESDTSetRole",
+          "function": "ESDTSetRole"
+        },
+        {
+          "hash": "a6a665f47977a59c4c2baf460281fc938e04ae0f87ac2e78040a14ae27822701",
+          "nonce": 0,
+          "value": 0,
+          "receiver": "erd1qqqqqqqqqqqqqpgqmegl4z2rcfhxjv6pn7dm0n4hndllfaam4fdqwqxld8",
+          "sender": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
+          "data": "@00",
+          "prevTxHash": "83494ad9369738b574a7266cbfb12ce63ccf634950cd6b0ec16107b8fb42f8f6",
+          "originalTxHash": "d296186b432d7e7937bde37d725cd52b765ef334c00b95adcb079933bc2277bb",
+          "gasLimit": 92399698,
+          "gasPrice": 1000000000,
+          "callType": 2,
+          "originalSender": "erd1qqqqqqqqqqqqqpgqmegl4z2rcfhxjv6pn7dm0n4hndllfaam4fdqwqxld8",
+          "logs": {
+            "address": "erd1qqqqqqqqqqqqqpgqmegl4z2rcfhxjv6pn7dm0n4hndllfaam4fdqwqxld8",
+            "events": [
+              {
+                "address": "erd1qqqqqqqqqqqqqpgqmegl4z2rcfhxjv6pn7dm0n4hndllfaam4fdqwqxld8",
+                "identifier": "writeLog",
+                "topics": [
+                  "AAAAAAAAAAAFAN5R+olDwm5pM0Gfm7fOt5t/9Pe7qlo=",
+                  "QHRvbyBtdWNoIGdhcyBwcm92aWRlZCBmb3IgcHJvY2Vzc2luZzogZ2FzIHByb3ZpZGVkID0gOTIzOTk2OTgsIGdhcyB1c2VkID0gMzE0MTg4MA=="
+                ],
+                "data": "QDZmNmI=",
+                "additionalData": null
+              },
+              {
+                "address": "erd1qqqqqqqqqqqqqpgqmegl4z2rcfhxjv6pn7dm0n4hndllfaam4fdqwqxld8",
+                "identifier": "completedTxEvent",
+                "topics": [
+                  "g0lK2TaXOLV0pyZsv7Es5jzPY0lQzWsOwWEHuPtC+PY="
+                ],
+                "data": null,
+                "additionalData": null
+              }
+            ]
+          },
+          "operation": "transfer"
+        }
+      ],
+      "logs": {
+        "address": "erd1qqqqqqqqqqqqqpgqmegl4z2rcfhxjv6pn7dm0n4hndllfaam4fdqwqxld8",
+        "events": [
+          {
+            "address": "erd1qqqqqqqqqqqqqpgqmegl4z2rcfhxjv6pn7dm0n4hndllfaam4fdqwqxld8",
+            "identifier": "transferValueOnly",
+            "topics": [
+              "AAAAAAAAAAAFAN5R+olDwm5pM0Gfm7fOt5t/9Pe7qlo=",
+              "AAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAC//8=",
+              "saK8LsUAAA=="
+            ],
+            "data": null,
+            "additionalData": null
+          },
+          {
+            "address": "erd1qqqqqqqqqqqqqpgqmegl4z2rcfhxjv6pn7dm0n4hndllfaam4fdqwqxld8",
+            "identifier": "writeLog",
+            "topics": [
+              "0q010iL23pLKW4FcYNxxAVvhcrYh6GgrGH5sMAvWqlo="
+            ],
+            "data": "QDZmNmI=",
+            "additionalData": null
+          }
+        ]
+      },
+      "status": "success",
+      "operation": "transfer",
+      "function": "issueToken",
+      "initiallyPaidFee": "2097020000000000",
+      "fee": "2097020000000000",
+      "chainID": "D",
+      "version": 1,
+      "options": 0
+    }
+  },
+  "error": "",
+  "code": "successful"
+}
+        "#;
+
+    let tx_on_network: TransactionOnNetwork = serde_json::from_str::<TransactionInfo>(data)
+        .unwrap()
+        .data
+        .unwrap()
+        .transaction;
+    let tx_response = TxResponse::from_network_tx(tx_on_network);
+
+    let expected: Option<String> = Some("GEN-868593".to_string());
+
+    assert_eq!(tx_response.new_issued_token_identifier, expected)
+}
+
+#[test]
+fn test_process_issued_token_identifier_meta_esdt() {
+    let data = r#"
+        {
+  "data": {
+    "transaction": {
+      "type": "normal",
+      "processingTypeOnSource": "SCInvoking",
+      "processingTypeOnDestination": "SCInvoking",
+      "hash": "408433c5db749f4666bee6a8b599944071bf493c43ff5f01282a74c22ea2ea43",
+      "nonce": 419,
+      "round": 1787093,
+      "epoch": 744,
+      "value": "50000000000000000",
+      "receiver": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
+      "sender": "erd1j6kua7p67qnaw3y4sudmk25xsuv4k8ws6pwvax8fd2vtmuc3q33s840l87",
+      "gasPrice": 1000000000,
+      "gasLimit": 600000000,
+      "gasUsed": 157220928,
+      "data": "ZGVwbG95QXNoc3dhcExQQUNTdHJhdGVneUA0MTRjNTAyZDYzNjE2NTYxNjMzNUA0MTU0NTMyZDM0NjMzMDM5MzIzMEAwM2U4QDAzZThAQDNiOWFjYTAwQDAwMDAwMDAwMDAwMDAwMDAwNTAwOTU3MzkwYWVkYTQzMmY1MmE0MTFkNTE5NzRmZTkzZDQwZDI3NzMzZTA0NjNAMDAwMDAwMDAwMDAwMDAwMDA1MDBkMTJjYzczY2JkYTZmMjY1OWM5NTllNWQ1NzU4YWY5MmNhMTM4NDg2NTIzM0AwMDAwMDAwMDAwMDAwMDAwMDUwMDUxZGY3MTc1OGNmMmFjYTViNDZkZWQ4MTU1OGI1NTE1ZGMyOWYzZjM1MjMzQEAwMDAwMDAwMDAwMDAwMDAwMDUwMDdlNGExZGZjNDM3Y2VkNDlkYjlmMTYzNzk4NDE2Yjg0YWMyMWQ0Yzk3Y2ViMDAwMDAwMGM1NzQ1NDc0YzQ0MmQ2MTMyMzg2MzM1MzkwMDAwMDAwMDAwMDAwMDAwMDUwMGE4YmE5ZTY4NjI2YmJjOTkzZmQ3OTVlOGJiNmY0Nzk0M2IyZjVmZmE3Y2ViMDAwMDAwMGE1NTU0NGIyZDMxMzQ2NDM1Mzc2NEAwMDAwMDAwMTAwMDAwMDAwMDAwMDAwMDAwNTAwNTFkZjcxNzU4Y2YyYWNhNWI0NmRlZDgxNTU4YjU1MTVkYzI5ZjNmMzUyMzMwMDAwMDAwYjQyNTU1MzQ0MmQ2NDM0NjMzMDMxMzQwMDAwMDAwMDAwQDAxODZhMEAyNzEw",
+      "signature": "4648af0b96eb430e4986b9fb760549742de09c809b46b984e5d995c898d80c25bfc0717c30da34bd89cd3005d98ee895afa39ee588b7b74b4807c63cbeade807",
+      "sourceShard": 1,
+      "destinationShard": 1,
+      "blockNonce": 1785520,
+      "blockHash": "8f926a5d79fa84bc69949a21bfbba17447091a8a074ac172fa0b88e4475a1214",
+      "notarizedAtSourceInMetaNonce": 1785568,
+      "NotarizedAtSourceInMetaHash": "eebd1aa5c3dde083f9c367242c054affedd36bfc95f7bcc1d4e2d90beb5754e9",
+      "notarizedAtDestinationInMetaNonce": 1785568,
+      "notarizedAtDestinationInMetaHash": "eebd1aa5c3dde083f9c367242c054affedd36bfc95f7bcc1d4e2d90beb5754e9",
+      "miniblockType": "TxBlock",
+      "miniblockHash": "b85d82db6d69cbc1911b3455d2837eeb3170b391926efa2eacb4d9c8e3c96ee4",
+      "hyperblockNonce": 1785568,
+      "hyperblockHash": "eebd1aa5c3dde083f9c367242c054affedd36bfc95f7bcc1d4e2d90beb5754e9",
+      "timestamp": 1704722558,
+      "smartContractResults": [
+        {
+          "hash": "ea9a96c079e66249e6b73c0341991dad96ca81f855f2fc4abe0d432be117a882",
+          "nonce": 420,
+          "value": 4427790720000000,
+          "receiver": "erd1j6kua7p67qnaw3y4sudmk25xsuv4k8ws6pwvax8fd2vtmuc3q33s840l87",
+          "sender": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
+          "data": "@6f6b",
+          "prevTxHash": "408433c5db749f4666bee6a8b599944071bf493c43ff5f01282a74c22ea2ea43",
+          "originalTxHash": "408433c5db749f4666bee6a8b599944071bf493c43ff5f01282a74c22ea2ea43",
+          "gasLimit": 0,
+          "gasPrice": 1000000000,
+          "callType": 0,
+          "operation": "transfer",
+          "isRefund": true
+        },
+        {
+          "hash": "6082975132a2c9d8197dfd0f9852b454ad344740eebdbdf93f620b2796ab723b",
+          "nonce": 0,
+          "value": 50000000000000000,
+          "receiver": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
+          "sender": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
+          "data": "registerMetaESDT@415453417368537761704c5041435661756c74@4156415348@12@63616e467265657a65@66616c7365@63616e57697065@66616c7365@63616e5061757365@66616c7365@63616e5472616e736665724e4654437265617465526f6c65@66616c7365@63616e4368616e67654f776e6572@66616c7365@63616e55706772616465@66616c7365@63616e4164645370656369616c526f6c6573@74727565@9eb30a87c92674ab1469700c0b385b3850e86de80f87dec6cf3213c7e379a646@408433c5db749f4666bee6a8b599944071bf493c43ff5f01282a74c22ea2ea43@03eb4a30",
+          "prevTxHash": "408433c5db749f4666bee6a8b599944071bf493c43ff5f01282a74c22ea2ea43",
+          "originalTxHash": "408433c5db749f4666bee6a8b599944071bf493c43ff5f01282a74c22ea2ea43",
+          "gasLimit": 125751600,
+          "gasPrice": 1000000000,
+          "callType": 1,
+          "originalSender": "erd1j6kua7p67qnaw3y4sudmk25xsuv4k8ws6pwvax8fd2vtmuc3q33s840l87",
+          "operation": "transfer",
+          "function": "registerMetaESDT"
+        },
+        {
+          "hash": "290f85d7ec2f7d5797510290358e9e0f76bb880451efaacb0d69280b8d94c67a",
+          "nonce": 0,
+          "value": 0,
+          "receiver": "erd1llllllllllllllllllllllllllllllllllllllllllllllllluqsl6e366",
+          "sender": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
+          "data": "ESDTSetBurnRoleForAll@41564153482d376438623564",
+          "prevTxHash": "6082975132a2c9d8197dfd0f9852b454ad344740eebdbdf93f620b2796ab723b",
+          "originalTxHash": "408433c5db749f4666bee6a8b599944071bf493c43ff5f01282a74c22ea2ea43",
+          "gasLimit": 0,
+          "gasPrice": 1000000000,
+          "callType": 0,
+          "originalSender": "erd1j6kua7p67qnaw3y4sudmk25xsuv4k8ws6pwvax8fd2vtmuc3q33s840l87",
+          "logs": {
+            "address": "erd1llllllllllllllllllllllllllllllllllllllllllllllllluqsl6e366",
+            "events": [
+              {
+                "address": "erd1llllllllllllllllllllllllllllllllllllllllllllllllluqsl6e366",
+                "identifier": "completedTxEvent",
+                "topics": [
+                  "YIKXUTKiydgZff0PmFK0VK00R0Duvb35P2ILJ5arcjs="
+                ],
+                "data": null,
+                "additionalData": null
+              }
+            ]
+          },
+          "operation": "transfer"
+        },
+        {
+          "hash": "1aa62a6251edd216bd4e5ae59f7e676d5d2f88597685e0ec0e25ac4434bfccdb",
+          "nonce": 0,
+          "value": 0,
+          "receiver": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
+          "sender": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
+          "data": "@00@41564153482d376438623564@d0644194444642fd16ee156307f6fda0e8f8baf4c496e1a1dc85e027ecc08a4a@9eb30a87c92674ab1469700c0b385b3850e86de80f87dec6cf3213c7e379a646@408433c5db749f4666bee6a8b599944071bf493c43ff5f01282a74c22ea2ea43@00",
+          "prevTxHash": "6082975132a2c9d8197dfd0f9852b454ad344740eebdbdf93f620b2796ab723b",
+          "originalTxHash": "408433c5db749f4666bee6a8b599944071bf493c43ff5f01282a74c22ea2ea43",
+          "gasLimit": 75751600,
+          "gasPrice": 1000000000,
+          "callType": 2,
+          "originalSender": "erd1j6kua7p67qnaw3y4sudmk25xsuv4k8ws6pwvax8fd2vtmuc3q33s840l87",
+          "logs": {
+            "address": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
+            "events": [
+              {
+                "address": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
+                "identifier": "writeLog",
+                "topics": [
+                  "AAAAAAAAAAAFAH6UefeHERqHcLpMz2gC3xXGhFsJBGM=",
+                  "QHRvbyBtdWNoIGdhcyBwcm92aWRlZCBmb3IgcHJvY2Vzc2luZzogZ2FzIHByb3ZpZGVkID0gNzU3NTE2MDAsIGdhcyB1c2VkID0gNDE3NjA1OQ=="
+                ],
+                "data": "QDZmNmI=",
+                "additionalData": [
+                  "QDZmNmI="
+                ]
+              },
+              {
+                "address": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
+                "identifier": "completedTxEvent",
+                "topics": [
+                  "YIKXUTKiydgZff0PmFK0VK00R0Duvb35P2ILJ5arcjs="
+                ],
+                "data": null,
+                "additionalData": null
+              }
+            ]
+          },
+          "operation": "transfer"
+        }
+      ],
+      "logs": {
+        "address": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
+        "events": [
+          {
+            "address": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
+            "identifier": "transferValueOnly",
+            "topics": [
+              "",
+              "AAAAAAAAAAAFANAMwOY4h/9reS00I0pE56xrV11LBGM="
+            ],
+            "data": "RGVwbG95RnJvbVNvdXJjZQ==",
+            "additionalData": [
+              "RGVwbG95RnJvbVNvdXJjZQ==",
+              "aW5pdA==",
+              "QUxQLWNhZWFjNQ==",
+              "QVRTLTRjMDkyMA==",
+              "A+g=",
+              "A+g=",
+              "",
+              "O5rKAA=="
+            ]
+          },
+          {
+            "address": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
+            "identifier": "transferValueOnly",
+            "topics": [
+              "",
+              "AAAAAAAAAAAFADJ0SE0vUW6bO5SurLeFIMfK/HtBBGM="
+            ],
+            "data": "RGVwbG95RnJvbVNvdXJjZQ==",
+            "additionalData": [
+              "RGVwbG95RnJvbVNvdXJjZQ==",
+              "aW5pdA==",
+              "AAAAAAAAAAAFANAMwOY4h/9reS00I0pE56xrV11LBGM=",
+              "AAAAAAAAAAAFAJVzkK7aQy9SpBHVGXT+k9QNJ3M+BGM=",
+              "AAAAAAAAAAAFANEsxzy9pvJlnJWeXVdYr5LKE4SGUjM=",
+              "AAAAAAAAAAAFAFHfcXWM8qyltG3tgVWLVRXcKfPzUjM=",
+              "",
+              "AAAAAAAAAAAFAH5KHfxDfO1J258WN5hBa4SsIdTJfOsAAAAMV0VHTEQtYTI4YzU5AAAAAAAAAAAFAKi6nmhia7yZP9eV6LtvR5Q7L1/6fOsAAAAKVVRLLTE0ZDU3ZA==",
+              "AAAAAQAAAAAAAAAABQBR33F1jPKspbRt7YFVi1UV3Cnz81IzAAAAC0JVU0QtZDRjMDE0AAAAAAA=",
+              "AYag",
+              "JxA="
+            ]
+          },
+          {
+            "address": "erd1qqqqqqqqqqqqqpgqxf6ysnf029hfkwu546kt0pfqcl90c76pq33s0a320f",
+            "identifier": "transferValueOnly",
+            "topics": [
+              "",
+              "AAAAAAAAAAAFANEsxzy9pvJlnJWeXVdYr5LKE4SGUjM="
+            ],
+            "data": "RXhlY3V0ZU9uRGVzdENvbnRleHQ=",
+            "additionalData": [
+              "RXhlY3V0ZU9uRGVzdENvbnRleHQ=",
+              "Z2V0RmFybWluZ1Rva2VuSWQ="
+            ]
+          },
+          {
+            "address": "erd1qqqqqqqqqqqqqpgqxf6ysnf029hfkwu546kt0pfqcl90c76pq33s0a320f",
+            "identifier": "transferValueOnly",
+            "topics": [
+              "",
+              "AAAAAAAAAAAFANEsxzy9pvJlnJWeXVdYr5LKE4SGUjM="
+            ],
+            "data": "RXhlY3V0ZU9uRGVzdENvbnRleHQ=",
+            "additionalData": [
+              "RXhlY3V0ZU9uRGVzdENvbnRleHQ=",
+              "Z2V0RmFybVRva2VuSWQ="
+            ]
+          },
+          {
+            "address": "erd1qqqqqqqqqqqqqpgqxf6ysnf029hfkwu546kt0pfqcl90c76pq33s0a320f",
+            "identifier": "transferValueOnly",
+            "topics": [
+              "",
+              "AAAAAAAAAAAFANEsxzy9pvJlnJWeXVdYr5LKE4SGUjM="
+            ],
+            "data": "RXhlY3V0ZU9uRGVzdENvbnRleHQ=",
+            "additionalData": [
+              "RXhlY3V0ZU9uRGVzdENvbnRleHQ=",
+              "Z2V0UmV3YXJkVG9rZW5JZA=="
+            ]
+          },
+          {
+            "address": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
+            "identifier": "transferValueOnly",
+            "topics": [
+              "saK8LsUAAA==",
+              "AAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAC//8="
+            ],
+            "data": "QXN5bmNDYWxs",
+            "additionalData": [
+              "QXN5bmNDYWxs",
+              "cmVnaXN0ZXJNZXRhRVNEVA==",
+              "QVRTQXNoU3dhcExQQUNWYXVsdA==",
+              "QVZBU0g=",
+              "Eg==",
+              "Y2FuRnJlZXpl",
+              "ZmFsc2U=",
+              "Y2FuV2lwZQ==",
+              "ZmFsc2U=",
+              "Y2FuUGF1c2U=",
+              "ZmFsc2U=",
+              "Y2FuVHJhbnNmZXJORlRDcmVhdGVSb2xl",
+              "ZmFsc2U=",
+              "Y2FuQ2hhbmdlT3duZXI=",
+              "ZmFsc2U=",
+              "Y2FuVXBncmFkZQ==",
+              "ZmFsc2U=",
+              "Y2FuQWRkU3BlY2lhbFJvbGVz",
+              "dHJ1ZQ=="
+            ]
+          },
+          {
+            "address": "erd1qqqqqqqqqqqqqpgqxf6ysnf029hfkwu546kt0pfqcl90c76pq33s0a320f",
+            "identifier": "SCDeploy",
+            "topics": [
+              "AAAAAAAAAAAFADJ0SE0vUW6bO5SurLeFIMfK/HtBBGM=",
+              "AAAAAAAAAAAFAH6UefeHERqHcLpMz2gC3xXGhFsJBGM=",
+              "fvRqbue54Womde/CN2IkRGkrx8tsU+xkLvi3+uwMkhY="
+            ],
+            "data": null,
+            "additionalData": null
+          },
+          {
+            "address": "erd1qqqqqqqqqqqqqpgq6qxvpe3csllkk7fdxs3553884344wh2tq33sakulat",
+            "identifier": "SCDeploy",
+            "topics": [
+              "AAAAAAAAAAAFANAMwOY4h/9reS00I0pE56xrV11LBGM=",
+              "AAAAAAAAAAAFAH6UefeHERqHcLpMz2gC3xXGhFsJBGM=",
+              "E3blQfRJfCKLWDr06Od703DSZenIzq8KND+xUjmGY/M="
+            ],
+            "data": null,
+            "additionalData": null
+          }
+        ]
+      },
+      "status": "success",
+      "operation": "transfer",
+      "function": "deployAshswapLPACStrategy",
+      "initiallyPaidFee": "6936045000000000",
+      "fee": "2508254280000000",
+      "chainID": "D",
+      "version": 1,
+      "options": 0
+    }
+  },
+  "error": "",
+  "code": "successful"
+}
+        "#;
+
+    let tx_on_network: TransactionOnNetwork = serde_json::from_str::<TransactionInfo>(data)
+        .unwrap()
+        .data
+        .unwrap()
+        .transaction;
+    let tx_response = TxResponse::from_network_tx(tx_on_network);
+
+    let expected: Option<String> = Some("AVASH-7d8b5d".to_string());
+
+    assert_eq!(tx_response.new_issued_token_identifier, expected)
+}
+
+#[test]
+fn test_set_special_roles_should_not_process_issued_token_identifier() {
+    let data = r#"
+        {
+  "data": {
+    "transaction": {
+      "type": "normal",
+      "processingTypeOnSource": "SCInvoking",
+      "processingTypeOnDestination": "SCInvoking",
+      "hash": "cbb1f866da564a04332297dfc4f637be2e50e62bbf4441bf42247ad429747ce0",
+      "nonce": 420,
+      "round": 1787109,
+      "epoch": 744,
+      "value": "0",
+      "receiver": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
+      "sender": "erd1j6kua7p67qnaw3y4sudmk25xsuv4k8ws6pwvax8fd2vtmuc3q33s840l87",
+      "gasPrice": 1000000000,
+      "gasLimit": 600000000,
+      "gasUsed": 129636807,
+      "data": "ZmluaXNoVmF1bHREZXBsb3ltZW50cw==",
+      "signature": "dca943ef1a788bfa6cb0e9aa3900b8340e4908075cbfefaa2a66688f6f0c0fed349edb2eb48eec427cd9098822fba875e4d66072fbdb44cb7f4c1a416736e20c",
+      "sourceShard": 1,
+      "destinationShard": 1,
+      "blockNonce": 1785536,
+      "blockHash": "93ca539e81612768b67a85b7135f7c104e76bec031a758a6b1782910ae49dd8f",
+      "notarizedAtSourceInMetaNonce": 1785584,
+      "NotarizedAtSourceInMetaHash": "71d17afe660282bb42de1ea3eec3e3534a179bd32aa1471c2861ce411bf30552",
+      "notarizedAtDestinationInMetaNonce": 1785584,
+      "notarizedAtDestinationInMetaHash": "71d17afe660282bb42de1ea3eec3e3534a179bd32aa1471c2861ce411bf30552",
+      "miniblockType": "TxBlock",
+      "miniblockHash": "f8c60565af746e92d2c9c09a92734e5eb8da7e42c67a86854c93b349bfe287eb",
+      "hyperblockNonce": 1785584,
+      "hyperblockHash": "71d17afe660282bb42de1ea3eec3e3534a179bd32aa1471c2861ce411bf30552",
+      "timestamp": 1704722654,
+      "smartContractResults": [
+        {
+          "hash": "c3ce9c364de3823ffae250c2bfb40aaf2b18f771ed4bd37bf788ad83a2c651f3",
+          "nonce": 421,
+          "value": 4703631930000000,
+          "receiver": "erd1j6kua7p67qnaw3y4sudmk25xsuv4k8ws6pwvax8fd2vtmuc3q33s840l87",
+          "sender": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
+          "data": "@6f6b",
+          "prevTxHash": "cbb1f866da564a04332297dfc4f637be2e50e62bbf4441bf42247ad429747ce0",
+          "originalTxHash": "cbb1f866da564a04332297dfc4f637be2e50e62bbf4441bf42247ad429747ce0",
+          "gasLimit": 0,
+          "gasPrice": 1000000000,
+          "callType": 0,
+          "operation": "transfer",
+          "isRefund": true
+        },
+        {
+          "hash": "50f9c25a1402ce6d87ae9f890659c8a67462292e471e02c74d64ff7ba1995e60",
+          "nonce": 0,
+          "value": 0,
+          "receiver": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
+          "sender": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
+          "data": "setSpecialRole@41564153482d376438623564@00000000000000000500d00cc0e63887ff6b792d34234a44e7ac6b575d4b0463@45534454526f6c654e4654437265617465@45534454526f6c654e46544164645175616e74697479@45534454526f6c654e46544275726e@0192c6db2c69f50b6968fb22ac558337a851719519cfd1e6bbf79a07bbcf18bc@cbb1f866da564a04332297dfc4f637be2e50e62bbf4441bf42247ad429747ce0@03eb4a30",
+          "prevTxHash": "cbb1f866da564a04332297dfc4f637be2e50e62bbf4441bf42247ad429747ce0",
+          "originalTxHash": "cbb1f866da564a04332297dfc4f637be2e50e62bbf4441bf42247ad429747ce0",
+          "gasLimit": 125751600,
+          "gasPrice": 1000000000,
+          "callType": 1,
+          "originalSender": "erd1j6kua7p67qnaw3y4sudmk25xsuv4k8ws6pwvax8fd2vtmuc3q33s840l87",
+          "operation": "transfer",
+          "function": "setSpecialRole"
+        },
+        {
+          "hash": "d6a5824a60b6c9050462c3f5a02ace00c36e8b4ba1958d132bd394e2ed1e7226",
+          "nonce": 0,
+          "value": 0,
+          "receiver": "erd1qqqqqqqqqqqqqpgq6qxvpe3csllkk7fdxs3553884344wh2tq33sakulat",
+          "sender": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
+          "data": "ESDTSetRole@41564153482d376438623564@45534454526f6c654e4654437265617465@45534454526f6c654e46544164645175616e74697479@45534454526f6c654e46544275726e",
+          "prevTxHash": "50f9c25a1402ce6d87ae9f890659c8a67462292e471e02c74d64ff7ba1995e60",
+          "originalTxHash": "cbb1f866da564a04332297dfc4f637be2e50e62bbf4441bf42247ad429747ce0",
+          "gasLimit": 0,
+          "gasPrice": 1000000000,
+          "callType": 0,
+          "originalSender": "erd1j6kua7p67qnaw3y4sudmk25xsuv4k8ws6pwvax8fd2vtmuc3q33s840l87",
+          "logs": {
+            "address": "erd1qqqqqqqqqqqqqpgq6qxvpe3csllkk7fdxs3553884344wh2tq33sakulat",
+            "events": [
+              {
+                "address": "erd1qqqqqqqqqqqqqpgq6qxvpe3csllkk7fdxs3553884344wh2tq33sakulat",
+                "identifier": "ESDTSetRole",
+                "topics": [
+                  "QVZBU0gtN2Q4YjVk",
+                  "",
+                  "",
+                  "RVNEVFJvbGVORlRDcmVhdGU=",
+                  "RVNEVFJvbGVORlRBZGRRdWFudGl0eQ==",
+                  "RVNEVFJvbGVORlRCdXJu"
+                ],
+                "data": null,
+                "additionalData": null
+              },
+              {
+                "address": "erd1qqqqqqqqqqqqqpgq6qxvpe3csllkk7fdxs3553884344wh2tq33sakulat",
+                "identifier": "completedTxEvent",
+                "topics": [
+                  "UPnCWhQCzm2Hrp+JBlnIpnRiKS5HHgLHTWT/e6GZXmA="
+                ],
+                "data": null,
+                "additionalData": null
+              }
+            ]
+          },
+          "operation": "ESDTSetRole",
+          "function": "ESDTSetRole"
+        },
+        {
+          "hash": "bf1b8b4b301ff548368dfd972896489d5e2a088d5cbdfa1bfe2421cc7f641f7a",
+          "nonce": 0,
+          "value": 0,
+          "receiver": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
+          "sender": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
+          "data": "@00@a68d44c751eba85db0713db8dc9c10c78749189ec0d6f1af5fc67bb656c1254b@0192c6db2c69f50b6968fb22ac558337a851719519cfd1e6bbf79a07bbcf18bc@cbb1f866da564a04332297dfc4f637be2e50e62bbf4441bf42247ad429747ce0@00",
+          "prevTxHash": "50f9c25a1402ce6d87ae9f890659c8a67462292e471e02c74d64ff7ba1995e60",
+          "originalTxHash": "cbb1f866da564a04332297dfc4f637be2e50e62bbf4441bf42247ad429747ce0",
+          "gasLimit": 75751600,
+          "gasPrice": 1000000000,
+          "callType": 2,
+          "originalSender": "erd1j6kua7p67qnaw3y4sudmk25xsuv4k8ws6pwvax8fd2vtmuc3q33s840l87",
+          "logs": {
+            "address": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
+            "events": [
+              {
+                "address": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
+                "identifier": "transferValueOnly",
+                "topics": [
+                  "",
+                  "AAAAAAAAAAAFANAMwOY4h/9reS00I0pE56xrV11LBGM="
+                ],
+                "data": "RXhlY3V0ZU9uRGVzdENvbnRleHQ=",
+                "additionalData": [
+                  "RXhlY3V0ZU9uRGVzdENvbnRleHQ=",
+                  "c2V0U2hhcmVUb2tlbklkZW50aWZpZXI=",
+                  "QVZBU0gtN2Q4YjVk"
+                ]
+              },
+              {
+                "address": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
+                "identifier": "transferValueOnly",
+                "topics": [
+                  "",
+                  "AAAAAAAAAAAFANAMwOY4h/9reS00I0pE56xrV11LBGM="
+                ],
+                "data": "RXhlY3V0ZU9uRGVzdENvbnRleHQ=",
+                "additionalData": [
+                  "RXhlY3V0ZU9uRGVzdENvbnRleHQ=",
+                  "c2V0U3RyYXRlZ3lBZGRyZXNz",
+                  "AAAAAAAAAAAFADJ0SE0vUW6bO5SurLeFIMfK/HtBBGM="
+                ]
+              },
+              {
+                "address": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
+                "identifier": "completedTxEvent",
+                "topics": [
+                  "UPnCWhQCzm2Hrp+JBlnIpnRiKS5HHgLHTWT/e6GZXmA="
+                ],
+                "data": null,
+                "additionalData": null
+              }
+            ]
+          },
+          "operation": "transfer"
+        },
+        {
+          "hash": "9d75a398545f488d4764149245e6ec3101debfce99477c353ac11c3239acd897",
+          "nonce": 1,
+          "value": 648519550000000,
+          "receiver": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
+          "sender": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
+          "data": "@6f6b",
+          "prevTxHash": "bf1b8b4b301ff548368dfd972896489d5e2a088d5cbdfa1bfe2421cc7f641f7a",
+          "originalTxHash": "cbb1f866da564a04332297dfc4f637be2e50e62bbf4441bf42247ad429747ce0",
+          "gasLimit": 0,
+          "gasPrice": 1000000000,
+          "callType": 0,
+          "operation": "transfer",
+          "isRefund": true
+        }
+      ],
+      "logs": {
+        "address": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
+        "events": [
+          {
+            "address": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
+            "identifier": "transferValueOnly",
+            "topics": [
+              "",
+              "AAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAC//8="
+            ],
+            "data": "QXN5bmNDYWxs",
+            "additionalData": [
+              "QXN5bmNDYWxs",
+              "c2V0U3BlY2lhbFJvbGU=",
+              "QVZBU0gtN2Q4YjVk",
+              "AAAAAAAAAAAFANAMwOY4h/9reS00I0pE56xrV11LBGM=",
+              "RVNEVFJvbGVORlRDcmVhdGU=",
+              "RVNEVFJvbGVORlRBZGRRdWFudGl0eQ==",
+              "RVNEVFJvbGVORlRCdXJu"
+            ]
+          }
+        ]
+      },
+      "status": "success",
+      "operation": "transfer",
+      "function": "finishVaultDeployments",
+      "initiallyPaidFee": "6082170000000000",
+      "fee": "1378538070000000",
+      "chainID": "D",
+      "version": 1,
+      "options": 0
+    }
+  },
+  "error": "",
+  "code": "successful"
+}
+        "#;
+
+    let tx_on_network: TransactionOnNetwork = serde_json::from_str::<TransactionInfo>(data)
+        .unwrap()
+        .data
+        .unwrap()
+        .transaction;
+    let tx_response = TxResponse::from_network_tx(tx_on_network);
+
+    let expected: Option<String> = None;
+
+    assert_eq!(tx_response.new_issued_token_identifier, expected)
+}
+
+#[test]
+fn test_multisig_issue_nft_and_set_all_roles() {
+    let data = r#"
+{
+  "data": {
+    "transaction": {
+      "type": "normal",
+      "processingTypeOnSource": "SCInvoking",
+      "processingTypeOnDestination": "SCInvoking",
+      "hash": "08582bc19734ad82d7390be88463c948e5d9f026f4b8f0bfc57620957c3433bd",
+      "nonce": 53,
+      "round": 3050972,
+      "epoch": 1246,
+      "value": "0",
+      "receiver": "erd1qqqqqqqqqqqqqpgqrp3n58vp2dmcaur4whazxngvuhac4xwqa4sq2pjl73",
+      "sender": "erd1uv40ahysflse896x4ktnh6ecx43u7cmy9wnxnvcyp7deg299a4sq6vaywa",
+      "gasPrice": 1000000000,
+      "gasLimit": 80000000,
+      "gasUsed": 80000000,
+      "data": "cGVyZm9ybUFjdGlvbkAwMQ==",
+      "signature": "cb67645595cee5f7967d8d85af05bb7db73e80d9b97611796819249d87cd174b69b4abfc2a3fbe52df1aec965bdea921f7eb34d2b1118aa480699ad1dc85790a",
+      "sourceShard": 0,
+      "destinationShard": 0,
+      "blockNonce": 2984930,
+      "blockHash": "644ae8703b826a23e89429953919ec37f875e34a547ea9f7edd53fb71a99c746",
+      "notarizedAtSourceInMetaNonce": 2988311,
+      "NotarizedAtSourceInMetaHash": "4f608a72e654dd9f466801cd489be8ee1a73fbcd77b128559cd46182d3b9455a",
+      "notarizedAtDestinationInMetaNonce": 2988311,
+      "notarizedAtDestinationInMetaHash": "4f608a72e654dd9f466801cd489be8ee1a73fbcd77b128559cd46182d3b9455a",
+      "miniblockType": "TxBlock",
+      "miniblockHash": "c5a73671bc1d37835ddd15b926157721bc83203ec4e00cd48ae0d46015cb5f0b",
+      "hyperblockNonce": 2988311,
+      "hyperblockHash": "4f608a72e654dd9f466801cd489be8ee1a73fbcd77b128559cd46182d3b9455a",
+      "timestamp": 1712305832,
+      "smartContractResults": [
+        {
+          "hash": "b0b3c8df519c33b314c0ee3d25abae6f17c4432fb3382676ce17a42690811cff",
+          "nonce": 0,
+          "value": 50000000000000000,
+          "receiver": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
+          "sender": "erd1qqqqqqqqqqqqqpgqrp3n58vp2dmcaur4whazxngvuhac4xwqa4sq2pjl73",
+          "data": "registerAndSetAllRoles@54657374436f6c6c656374696f6e31@54455354434f4c4c31@4e4654@@98fa4ff554b9c6990ce577fbb816a271f690dcbd6b148f6583fe7692868ae538@08582bc19734ad82d7390be88463c948e5d9f026f4b8f0bfc57620957c3433bd@5e2338",
+          "prevTxHash": "08582bc19734ad82d7390be88463c948e5d9f026f4b8f0bfc57620957c3433bd",
+          "originalTxHash": "08582bc19734ad82d7390be88463c948e5d9f026f4b8f0bfc57620957c3433bd",
+          "gasLimit": 73052300,
+          "gasPrice": 1000000000,
+          "callType": 1,
+          "originalSender": "erd1uv40ahysflse896x4ktnh6ecx43u7cmy9wnxnvcyp7deg299a4sq6vaywa",
+          "operation": "transfer",
+          "function": "registerAndSetAllRoles"
+        },
+        {
+          "hash": "5ae4f74e134e4fa63c8b92e06ff12b2a4b544233d01d80db6a922af35ee55356",
+          "nonce": 1,
+          "value": 196430610000000,
+          "receiver": "erd1qqqqqqqqqqqqqpgqrp3n58vp2dmcaur4whazxngvuhac4xwqa4sq2pjl73",
+          "sender": "erd1qqqqqqqqqqqqqpgqrp3n58vp2dmcaur4whazxngvuhac4xwqa4sq2pjl73",
+          "data": "@6f6b",
+          "prevTxHash": "c4a24b01b48d32308636310e2d335d6ed1f34dcbdfc1133aed7995e78e831c18",
+          "originalTxHash": "08582bc19734ad82d7390be88463c948e5d9f026f4b8f0bfc57620957c3433bd",
+          "gasLimit": 0,
+          "gasPrice": 1000000000,
+          "callType": 0,
+          "operation": "transfer",
+          "isRefund": true
+        },
+        {
+          "hash": "7589c1ad622d8a9ab2f186731fc82aeeab0aea5a8198cb94b6eba85a966e7962",
+          "nonce": 0,
+          "value": 0,
+          "receiver": "erd1llllllllllllllllllllllllllllllllllllllllllllllllluqq2m3f0f",
+          "sender": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
+          "data": "ESDTSetBurnRoleForAll@54455354434f4c4c312d356161383063",
+          "prevTxHash": "b0b3c8df519c33b314c0ee3d25abae6f17c4432fb3382676ce17a42690811cff",
+          "originalTxHash": "08582bc19734ad82d7390be88463c948e5d9f026f4b8f0bfc57620957c3433bd",
+          "gasLimit": 0,
+          "gasPrice": 1000000000,
+          "callType": 0,
+          "originalSender": "erd1uv40ahysflse896x4ktnh6ecx43u7cmy9wnxnvcyp7deg299a4sq6vaywa",
+          "logs": {
+            "address": "erd1llllllllllllllllllllllllllllllllllllllllllllllllluqq2m3f0f",
+            "events": [
+              {
+                "address": "erd1llllllllllllllllllllllllllllllllllllllllllllllllluqq2m3f0f",
+                "identifier": "completedTxEvent",
+                "topics": [
+                  "sLPI31GcM7MUwO49JauubxfEQy+zOCZ2zhekJpCBHP8="
+                ]
+              }
+            ]
+          },
+          "operation": "transfer"
+        },
+        {
+          "hash": "86d1ec3365ea1311dbde2f2366de4ea8627d7e49c29a974578c0869b66903cbc",
+          "nonce": 0,
+          "value": 0,
+          "receiver": "erd1qqqqqqqqqqqqqpgqrp3n58vp2dmcaur4whazxngvuhac4xwqa4sq2pjl73",
+          "sender": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
+          "data": "ESDTSetRole@54455354434f4c4c312d356161383063@45534454526f6c654e4654437265617465@45534454526f6c654e46544275726e@45534454526f6c654e465455706461746541747472696275746573@45534454526f6c654e4654416464555249",
+          "prevTxHash": "b0b3c8df519c33b314c0ee3d25abae6f17c4432fb3382676ce17a42690811cff",
+          "originalTxHash": "08582bc19734ad82d7390be88463c948e5d9f026f4b8f0bfc57620957c3433bd",
+          "gasLimit": 0,
+          "gasPrice": 1000000000,
+          "callType": 0,
+          "originalSender": "erd1uv40ahysflse896x4ktnh6ecx43u7cmy9wnxnvcyp7deg299a4sq6vaywa",
+          "logs": {
+            "address": "erd1qqqqqqqqqqqqqpgqrp3n58vp2dmcaur4whazxngvuhac4xwqa4sq2pjl73",
+            "events": [
+              {
+                "address": "erd1qqqqqqqqqqqqqpgqrp3n58vp2dmcaur4whazxngvuhac4xwqa4sq2pjl73",
+                "identifier": "ESDTSetRole",
+                "topics": [
+                  "VEVTVENPTEwxLTVhYTgwYw==",
+                  "",
+                  "",
+                  "RVNEVFJvbGVORlRDcmVhdGU=",
+                  "RVNEVFJvbGVORlRCdXJu",
+                  "RVNEVFJvbGVORlRVcGRhdGVBdHRyaWJ1dGVz",
+                  "RVNEVFJvbGVORlRBZGRVUkk="
+                ]
+              },
+              {
+                "address": "erd1qqqqqqqqqqqqqpgqrp3n58vp2dmcaur4whazxngvuhac4xwqa4sq2pjl73",
+                "identifier": "completedTxEvent",
+                "topics": [
+                  "sLPI31GcM7MUwO49JauubxfEQy+zOCZ2zhekJpCBHP8="
+                ]
+              }
+            ]
+          },
+          "operation": "ESDTSetRole",
+          "function": "ESDTSetRole"
+        },
+        {
+          "hash": "c4a24b01b48d32308636310e2d335d6ed1f34dcbdfc1133aed7995e78e831c18",
+          "nonce": 0,
+          "value": 0,
+          "receiver": "erd1qqqqqqqqqqqqqpgqrp3n58vp2dmcaur4whazxngvuhac4xwqa4sq2pjl73",
+          "sender": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
+          "data": "@00@54455354434f4c4c312d356161383063@3ec73c55022548038bbe06c0639156b3db70b7c770955e340f14fcfcd45df06a@98fa4ff554b9c6990ce577fbb816a271f690dcbd6b148f6583fe7692868ae538@08582bc19734ad82d7390be88463c948e5d9f026f4b8f0bfc57620957c3433bd@00",
+          "prevTxHash": "b0b3c8df519c33b314c0ee3d25abae6f17c4432fb3382676ce17a42690811cff",
+          "originalTxHash": "08582bc19734ad82d7390be88463c948e5d9f026f4b8f0bfc57620957c3433bd",
+          "gasLimit": 23052300,
+          "gasPrice": 1000000000,
+          "callType": 2,
+          "originalSender": "erd1uv40ahysflse896x4ktnh6ecx43u7cmy9wnxnvcyp7deg299a4sq6vaywa",
+          "logs": {
+            "address": "erd1qqqqqqqqqqqqqpgqrp3n58vp2dmcaur4whazxngvuhac4xwqa4sq2pjl73",
+            "events": [
+              {
+                "address": "erd1qqqqqqqqqqqqqpgqrp3n58vp2dmcaur4whazxngvuhac4xwqa4sq2pjl73",
+                "identifier": "callBack",
+                "topics": [
+                  "YXN5bmNDYWxsU3VjY2Vzcw==",
+                  "VEVTVENPTEwxLTVhYTgwYw=="
+                ],
+                "additionalData": [
+                  ""
+                ]
+              },
+              {
+                "address": "erd1qqqqqqqqqqqqqpgqrp3n58vp2dmcaur4whazxngvuhac4xwqa4sq2pjl73",
+                "identifier": "completedTxEvent",
+                "topics": [
+                  "sLPI31GcM7MUwO49JauubxfEQy+zOCZ2zhekJpCBHP8="
+                ]
+              }
+            ]
+          },
+          "operation": "transfer"
+        }
+      ],
+      "logs": {
+        "address": "erd1qqqqqqqqqqqqqpgqrp3n58vp2dmcaur4whazxngvuhac4xwqa4sq2pjl73",
+        "events": [
+          {
+            "address": "erd1qqqqqqqqqqqqqpgqrp3n58vp2dmcaur4whazxngvuhac4xwqa4sq2pjl73",
+            "identifier": "performAction",
+            "topics": [
+              "c3RhcnRQZXJmb3JtQWN0aW9u"
+            ],
+            "data": "AAAAAQYAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAL//wAAAAexorwuxQAAAAAAFnJlZ2lzdGVyQW5kU2V0QWxsUm9sZXMAAAAEAAAAD1Rlc3RDb2xsZWN0aW9uMQAAAAlURVNUQ09MTDEAAAADTkZUAAAAAAAAAATjKv7ckE/hk5dGrZc76zg1Y89jZCumabMED5uUKKXtYLE6AXQjw2bK/4zs+3ehJhChMPSIgTQSLHk3/q4NbX0XOvjZyUI7JXfGJSciwdkCEqQRH3ID+XRPdvz6HQoxADOyoRVVzlIeSUTgmrF1SdhbSH3NJshLUBejnjGjZwiJug==",
+            "additionalData": [
+              "AAAAAQYAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAL//wAAAAexorwuxQAAAAAAFnJlZ2lzdGVyQW5kU2V0QWxsUm9sZXMAAAAEAAAAD1Rlc3RDb2xsZWN0aW9uMQAAAAlURVNUQ09MTDEAAAADTkZUAAAAAAAAAATjKv7ckE/hk5dGrZc76zg1Y89jZCumabMED5uUKKXtYLE6AXQjw2bK/4zs+3ehJhChMPSIgTQSLHk3/q4NbX0XOvjZyUI7JXfGJSciwdkCEqQRH3ID+XRPdvz6HQoxADOyoRVVzlIeSUTgmrF1SdhbSH3NJshLUBejnjGjZwiJug=="
+            ]
+          },
+          {
+            "address": "erd1qqqqqqqqqqqqqpgqrp3n58vp2dmcaur4whazxngvuhac4xwqa4sq2pjl73",
+            "identifier": "performAction",
+            "topics": [
+              "cGVyZm9ybUFzeW5jQ2FsbA==",
+              "AQ==",
+              "AAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAC//8=",
+              "saK8LsUAAA==",
+              "BGa4HQ==",
+              "cmVnaXN0ZXJBbmRTZXRBbGxSb2xlcw==",
+              "VGVzdENvbGxlY3Rpb24x",
+              "VEVTVENPTEwx",
+              "TkZU",
+              ""
+            ],
+            "additionalData": [
+              ""
+            ]
+          },
+          {
+            "address": "erd1qqqqqqqqqqqqqpgqrp3n58vp2dmcaur4whazxngvuhac4xwqa4sq2pjl73",
+            "identifier": "transferValueOnly",
+            "topics": [
+              "saK8LsUAAA==",
+              "AAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAC//8="
+            ],
+            "data": "QXN5bmNDYWxs",
+            "additionalData": [
+              "QXN5bmNDYWxs",
+              "cmVnaXN0ZXJBbmRTZXRBbGxSb2xlcw==",
+              "VGVzdENvbGxlY3Rpb24x",
+              "VEVTVENPTEwx",
+              "TkZU",
+              ""
+            ]
+          },
+          {
+            "address": "erd1qqqqqqqqqqqqqpgqrp3n58vp2dmcaur4whazxngvuhac4xwqa4sq2pjl73",
+            "identifier": "writeLog",
+            "topics": [
+              "4yr+3JBP4ZOXRq2XO+s4NWPPY2QrpmmzBA+blCil7WA="
+            ],
+            "data": "QDZmNmI=",
+            "additionalData": [
+              "QDZmNmI="
+            ]
+          }
+        ]
+      },
+      "status": "success",
+      "operation": "transfer",
+      "function": "performAction",
+      "initiallyPaidFee": "873260000000000",
+      "fee": "873260000000000",
+      "chainID": "D",
+      "version": 1,
+      "options": 0
+    }
+  },
+  "code": "successful"
+}
+        "#;
+
+    let tx_on_network: TransactionOnNetwork = serde_json::from_str::<TransactionInfo>(data)
+        .unwrap()
+        .data
+        .unwrap()
+        .transaction;
+    let tx_response = TxResponse::from_network_tx(tx_on_network);
+
+    let expected = Some("TESTCOLL1-5aa80c".to_string());
+
+    assert_eq!(tx_response.new_issued_token_identifier, expected)
+}
diff --git a/framework/scenario/tests/test_tx_multi_contract_sc_result.rs b/framework/scenario/tests/test_tx_multi_contract_sc_result.rs
new file mode 100644
index 0000000000..8d45dfff0c
--- /dev/null
+++ b/framework/scenario/tests/test_tx_multi_contract_sc_result.rs
@@ -0,0 +1,477 @@
+use multiversx_sc_scenario::scenario_model::TxResponse;
+use multiversx_sdk::data::transaction::{TransactionInfo, TransactionOnNetwork};
+
+#[test]
+fn test_with_multi_contract_same_shard_tx_that_has_no_sc_result() {
+    // transaction data from the devnet
+    // context : user -> A --call--> B, B returns a MultiValue2<u64, u64>, A returns the B's returned value
+    let data = r#"
+            {
+              "data": {
+                "transaction": {
+                  "type": "normal",
+                  "processingTypeOnSource": "SCInvoking",
+                  "processingTypeOnDestination": "SCInvoking",
+                  "hash": "e914857f1bfd003ba411bae372266703e5f706fa412c378feb37faa5e18c3d73",
+                  "nonce": 49,
+                  "round": 7646960,
+                  "epoch": 6339,
+                  "value": "0",
+                  "receiver": "erd1qqqqqqqqqqqqqpgqshqmekudxlxwp0d9j368etjamr5dw7k45u7qx40w6h",
+                  "sender": "erd1uh67c2lkhyj4vh73akv7jky9sfgvus8awwcj64uju69mmfne5u7q299t7g",
+                  "gasPrice": 1000000000,
+                  "gasLimit": 600000000,
+                  "gasUsed": 600000000,
+                  "data": "Y2FsbEFub3RoZXJDb250cmFjdFJldHVyblR3b1U2NEAwMDAwMDAwMDAwMDAwMDAwMDUwMEFDRkY2QjdBNEVCODEwMUE4REU3RkY3RjVEMkMwQkYzRTRENjNGNDdBNzND",
+                  "signature": "53cc6496647287d735bd7950f4ec79d7b51f884defda1d6d840d722b7d0d869900ccecc01602da7a7c717955e8d4ed0711b92acd980d64ed6eebd6eaed0c4608",
+                  "sourceShard": 0,
+                  "destinationShard": 0,
+                  "blockNonce": 7600794,
+                  "blockHash": "77eb0904e56d6dd596c0d72821cf33b326fde383e72903ca4df5c2f200b0ea75",
+                  "notarizedAtSourceInMetaNonce": 7609344,
+                  "NotarizedAtSourceInMetaHash": "12df3fe65cacde2c9742b9506ac2261d34f3c72d690301192fd8016430d51913",
+                  "notarizedAtDestinationInMetaNonce": 7609344,
+                  "notarizedAtDestinationInMetaHash": "12df3fe65cacde2c9742b9506ac2261d34f3c72d690301192fd8016430d51913",
+                  "miniblockType": "TxBlock",
+                  "miniblockHash": "03219ac7427f7511687f0768c722c759c1b1428b2664b44a0cbe2072154851ee",
+                  "hyperblockNonce": 7609344,
+                  "hyperblockHash": "12df3fe65cacde2c9742b9506ac2261d34f3c72d690301192fd8016430d51913",
+                  "timestamp": 1694433360,
+                  "logs": {
+                    "address": "erd1qqqqqqqqqqqqqpgqshqmekudxlxwp0d9j368etjamr5dw7k45u7qx40w6h",
+                    "events": [
+                      {
+                        "address": "erd1qqqqqqqqqqqqqpgqshqmekudxlxwp0d9j368etjamr5dw7k45u7qx40w6h",
+                        "identifier": "writeLog",
+                        "topics": [
+                          "5fXsK/a5JVZf0e2Z6ViFglDOQP1zsS1XkuaLvaZ5pzw=",
+                          "QHRvbyBtdWNoIGdhcyBwcm92aWRlZCBmb3IgcHJvY2Vzc2luZzogZ2FzIHByb3ZpZGVkID0gNTk5ODA2MDAwLCBnYXMgdXNlZCA9IDM4NDcyNDA="
+                        ],
+                        "data": "QDZmNmJAMGFAMDIxODcxMWEwMA=="
+                      },
+                      {
+                        "address": "erd1qqqqqqqqqqqqqpgqshqmekudxlxwp0d9j368etjamr5dw7k45u7qx40w6h",
+                        "identifier": "completedTxEvent",
+                        "topics": [
+                          "6RSFfxv9ADukEbrjciZnA+X3BvpBLDeP6zf6peGMPXM="
+                        ],
+                        "data": null
+                      }
+                    ]
+                  },
+                  "status": "success",
+                  "operation": "transfer",
+                  "function": "callAnotherContractReturnTwoU64",
+                  "initiallyPaidFee": "6192060000000000",
+                  "fee": "6192060000000000",
+                  "chainID": "D",
+                  "version": 2,
+                  "options": 0
+                }
+              },
+              "error": "",
+              "code": "successful"
+            }
+        "#;
+
+    let tx_on_network: TransactionOnNetwork = serde_json::from_str::<TransactionInfo>(data)
+        .unwrap()
+        .data
+        .unwrap()
+        .transaction;
+    let tx_response = TxResponse::from_network_tx(tx_on_network);
+
+    let expected: Vec<Vec<u8>> = vec![
+        hex::decode("0a").unwrap(),
+        hex::decode("0218711a00").unwrap(),
+    ];
+
+    assert_eq!(tx_response.out, expected)
+}
+
+#[test]
+fn test_with_multi_contract_cross_shard_tx_that_has_no_callback() {
+    // transaction data from the devnet
+    // context : user -> A --async call--> B, no callback
+    let data = r#"
+            {
+              "data": {
+                "transaction": {
+                  "type": "normal",
+                  "processingTypeOnSource": "SCInvoking",
+                  "processingTypeOnDestination": "SCInvoking",
+                  "hash": "4d50a055663dfee2479851684d7fb83cf00695b6f03f4dbbdf0f9232477cafc4",
+                  "nonce": 51,
+                  "round": 7647523,
+                  "epoch": 6340,
+                  "value": "0",
+                  "receiver": "erd1qqqqqqqqqqqqqpgqllqglpjdrz5kn3m0k9uf9hdqjmg3xdhk6r7se3wvlk",
+                  "sender": "erd1uh67c2lkhyj4vh73akv7jky9sfgvus8awwcj64uju69mmfne5u7q299t7g",
+                  "gasPrice": 1000000000,
+                  "gasLimit": 600000000,
+                  "gasUsed": 600000000,
+                  "data": "YXN5bmNDYWxsQW5vdGhlckNvbnRyYWN0UmV0dXJuVHdvVTY0Tm9DYWxsYmFja0AwMDAwMDAwMDAwMDAwMDAwMDUwMEFDRkY2QjdBNEVCODEwMUE4REU3RkY3RjVEMkMwQkYzRTRENjNGNDdBNzND",
+                  "signature": "0fc30cddaa8e5365662a14344e3434cbccf287f357be99b3ed4add182f64dded774ec0d095ab1589e7c6c07e00de3b7239efc96eb2e0e97b48c1ef87084cec01",
+                  "sourceShard": 0,
+                  "destinationShard": 1,
+                  "blockNonce": 7593758,
+                  "blockHash": "a828c0ca58ef1c8aff60e512ab59f18204f1915d4a6c8285cfceb1c5725b88e8",
+                  "notarizedAtSourceInMetaNonce": 7609903,
+                  "NotarizedAtSourceInMetaHash": "4e90fe45c2fdccd5cf6977c1422e5f4ffa41c4e9f31fb4a50c20455f87df1e99",
+                  "notarizedAtDestinationInMetaNonce": 7609907,
+                  "notarizedAtDestinationInMetaHash": "10b8666a44411c3babbe20af7154fb3d47efcb1cb10d955523ec68fece26e517",
+                  "miniblockType": "TxBlock",
+                  "miniblockHash": "4ff4bb1ac88911d617c9b0342aeb5158db78490c2fe414cad08adcc584a77be7",
+                  "hyperblockNonce": 7609907,
+                  "hyperblockHash": "10b8666a44411c3babbe20af7154fb3d47efcb1cb10d955523ec68fece26e517",
+                  "timestamp": 1694436738,
+                  "smartContractResults": [
+                    {
+                      "hash": "462b56a1530e6070dc7c15f755e51a97a6972c8cd7891f3be4635b93211890c5",
+                      "nonce": 0,
+                      "value": 0,
+                      "receiver": "erd1qqqqqqqqqqqqqpgqllqglpjdrz5kn3m0k9uf9hdqjmg3xdhk6r7se3wvlk",
+                      "sender": "erd1qqqqqqqqqqqqqpgq4nlkk7jwhqgp4r08lal46tqt70jdv0685u7qrr3l2d",
+                      "data": "@00@0a@0218711a00",
+                      "prevTxHash": "41d56fdacf3e14de67e821427c732b62ebfa07c82d2e5db6de75fe3a1c828d9b",
+                      "originalTxHash": "4d50a055663dfee2479851684d7fb83cf00695b6f03f4dbbdf0f9232477cafc4",
+                      "gasLimit": 595637825,
+                      "gasPrice": 1000000000,
+                      "callType": 2,
+                      "logs": {
+                        "address": "erd1qqqqqqqqqqqqqpgqllqglpjdrz5kn3m0k9uf9hdqjmg3xdhk6r7se3wvlk",
+                        "events": [
+                          {
+                            "address": "erd1qqqqqqqqqqqqqpgqllqglpjdrz5kn3m0k9uf9hdqjmg3xdhk6r7se3wvlk",
+                            "identifier": "writeLog",
+                            "topics": [
+                              "AAAAAAAAAAAFAP/Aj4ZNGKlpx2+xeJLdoJbREzb20P0=",
+                              "QHRvbyBtdWNoIGdhcyBwcm92aWRlZCBmb3IgcHJvY2Vzc2luZzogZ2FzIHByb3ZpZGVkID0gNTk1NjM3ODI1LCBnYXMgdXNlZCA9IDIxNjE3NzA="
+                            ],
+                            "data": "QDZmNmI="
+                          },
+                          {
+                            "address": "erd1qqqqqqqqqqqqqpgqllqglpjdrz5kn3m0k9uf9hdqjmg3xdhk6r7se3wvlk",
+                            "identifier": "completedTxEvent",
+                            "topics": [
+                              "QdVv2s8+FN5n6CFCfHMrYuv6B8gtLl223nX+OhyCjZs="
+                            ],
+                            "data": null
+                          }
+                        ]
+                      },
+                      "operation": "transfer"
+                    },
+                    {
+                      "hash": "41d56fdacf3e14de67e821427c732b62ebfa07c82d2e5db6de75fe3a1c828d9b",
+                      "nonce": 0,
+                      "value": 0,
+                      "receiver": "erd1qqqqqqqqqqqqqpgq4nlkk7jwhqgp4r08lal46tqt70jdv0685u7qrr3l2d",
+                      "sender": "erd1qqqqqqqqqqqqqpgqllqglpjdrz5kn3m0k9uf9hdqjmg3xdhk6r7se3wvlk",
+                      "data": "returnTwoU64@4f3c60",
+                      "prevTxHash": "4d50a055663dfee2479851684d7fb83cf00695b6f03f4dbbdf0f9232477cafc4",
+                      "originalTxHash": "4d50a055663dfee2479851684d7fb83cf00695b6f03f4dbbdf0f9232477cafc4",
+                      "gasLimit": 597479490,
+                      "gasPrice": 1000000000,
+                      "callType": 1,
+                      "operation": "transfer",
+                      "function": "returnTwoU64"
+                    }
+                  ],
+                  "logs": {
+                    "address": "erd1qqqqqqqqqqqqqpgqllqglpjdrz5kn3m0k9uf9hdqjmg3xdhk6r7se3wvlk",
+                    "events": [
+                      {
+                        "address": "erd1qqqqqqqqqqqqqpgqllqglpjdrz5kn3m0k9uf9hdqjmg3xdhk6r7se3wvlk",
+                        "identifier": "writeLog",
+                        "topics": [
+                          "5fXsK/a5JVZf0e2Z6ViFglDOQP1zsS1XkuaLvaZ5pzw="
+                        ],
+                        "data": "QDZmNmI="
+                      }
+                    ]
+                  },
+                  "status": "success",
+                  "operation": "transfer",
+                  "function": "asyncCallAnotherContractReturnTwoU64NoCallback",
+                  "initiallyPaidFee": "6214335000000000",
+                  "fee": "6214335000000000",
+                  "chainID": "D",
+                  "version": 2,
+                  "options": 0
+                }
+              },
+              "error": "",
+              "code": "successful"
+            }
+        "#;
+
+    let tx_on_network: TransactionOnNetwork = serde_json::from_str::<TransactionInfo>(data)
+        .unwrap()
+        .data
+        .unwrap()
+        .transaction;
+    let tx_response = TxResponse::from_network_tx(tx_on_network);
+
+    let expected: Vec<Vec<u8>> = vec![];
+
+    assert_eq!(tx_response.out, expected)
+}
+
+#[test]
+fn test_with_multi_contract_cross_shard_tx_that_has_non_returning_callback() {
+    // transaction data from the devnet
+    // context : user -> A --async call--> B --callback--> A, the callback returns ()
+    let data = r#"
+            {
+              "data": {
+                "transaction": {
+                  "type": "normal",
+                  "processingTypeOnSource": "SCInvoking",
+                  "processingTypeOnDestination": "SCInvoking",
+                  "hash": "4f7f19e448176e4d47a0f844cbd6bdb1b6c68035dafe927e8249ed60af1c3b17",
+                  "nonce": 52,
+                  "round": 7647560,
+                  "epoch": 6340,
+                  "value": "0",
+                  "receiver": "erd1qqqqqqqqqqqqqpgqllqglpjdrz5kn3m0k9uf9hdqjmg3xdhk6r7se3wvlk",
+                  "sender": "erd1uh67c2lkhyj4vh73akv7jky9sfgvus8awwcj64uju69mmfne5u7q299t7g",
+                  "gasPrice": 1000000000,
+                  "gasLimit": 600000000,
+                  "gasUsed": 600000000,
+                  "data": "YXN5bmNDYWxsQW5vdGhlckNvbnRyYWN0UmV0dXJuVHdvVTY0V2l0aE5vblJldHVybmluZ0NhbGxiYWNrQDAwMDAwMDAwMDAwMDAwMDAwNTAwQUNGRjZCN0E0RUI4MTAxQThERTdGRjdGNUQyQzBCRjNFNEQ2M0Y0N0E3M0M=",
+                  "signature": "3918fce429b2059b2321b709011079755dbb835e12839278ee510e4741180540e80c6111eea1d3312b2c63446de08b20e01f6040358fa94d1633c355bb65bc0f",
+                  "sourceShard": 0,
+                  "destinationShard": 1,
+                  "blockNonce": 7593795,
+                  "blockHash": "c17e727f90025225670b7852ea9807c67753c9b3f21b6ec7cc40077e3849a8b7",
+                  "notarizedAtSourceInMetaNonce": 7609940,
+                  "NotarizedAtSourceInMetaHash": "c67b5c550986cfd6c94d00f4b90234eb38ee196ff0d79a00d916f3bd24be272c",
+                  "notarizedAtDestinationInMetaNonce": 7609944,
+                  "notarizedAtDestinationInMetaHash": "d59b7398d962ce3119679af59d5d74e10083e62c3ee2b15421cc0d607979ca18",
+                  "miniblockType": "TxBlock",
+                  "miniblockHash": "2977affeffeb6cf41117bed442662021cb713528cdb1d0dce4537b01caeb8e0b",
+                  "hyperblockNonce": 7609944,
+                  "hyperblockHash": "d59b7398d962ce3119679af59d5d74e10083e62c3ee2b15421cc0d607979ca18",
+                  "timestamp": 1694436960,
+                  "smartContractResults": [
+                    {
+                      "hash": "fe7474188d5ca4b84c7577f03fc778d22d53c070dfcb05a9cda840229d30e4d3",
+                      "nonce": 0,
+                      "value": 0,
+                      "receiver": "erd1qqqqqqqqqqqqqpgq4nlkk7jwhqgp4r08lal46tqt70jdv0685u7qrr3l2d",
+                      "sender": "erd1qqqqqqqqqqqqqpgqllqglpjdrz5kn3m0k9uf9hdqjmg3xdhk6r7se3wvlk",
+                      "data": "returnTwoU64@4f3c60",
+                      "prevTxHash": "4f7f19e448176e4d47a0f844cbd6bdb1b6c68035dafe927e8249ed60af1c3b17",
+                      "originalTxHash": "4f7f19e448176e4d47a0f844cbd6bdb1b6c68035dafe927e8249ed60af1c3b17",
+                      "gasLimit": 596979545,
+                      "gasPrice": 1000000000,
+                      "callType": 1,
+                      "operation": "transfer",
+                      "function": "returnTwoU64"
+                    },
+                    {
+                      "hash": "948dc6702b376d1e043db8de2f87ca12907c342f54cfad7dfebadf59145ca3ac",
+                      "nonce": 0,
+                      "value": 0,
+                      "receiver": "erd1qqqqqqqqqqqqqpgqllqglpjdrz5kn3m0k9uf9hdqjmg3xdhk6r7se3wvlk",
+                      "sender": "erd1qqqqqqqqqqqqqpgq4nlkk7jwhqgp4r08lal46tqt70jdv0685u7qrr3l2d",
+                      "data": "@00@0a@0218711a00",
+                      "prevTxHash": "fe7474188d5ca4b84c7577f03fc778d22d53c070dfcb05a9cda840229d30e4d3",
+                      "originalTxHash": "4f7f19e448176e4d47a0f844cbd6bdb1b6c68035dafe927e8249ed60af1c3b17",
+                      "gasLimit": 595137880,
+                      "gasPrice": 1000000000,
+                      "callType": 2,
+                      "logs": {
+                        "address": "erd1qqqqqqqqqqqqqpgqllqglpjdrz5kn3m0k9uf9hdqjmg3xdhk6r7se3wvlk",
+                        "events": [
+                          {
+                            "address": "erd1qqqqqqqqqqqqqpgqllqglpjdrz5kn3m0k9uf9hdqjmg3xdhk6r7se3wvlk",
+                            "identifier": "writeLog",
+                            "topics": [
+                              "AAAAAAAAAAAFAP/Aj4ZNGKlpx2+xeJLdoJbREzb20P0=",
+                              "QHRvbyBtdWNoIGdhcyBwcm92aWRlZCBmb3IgcHJvY2Vzc2luZzogZ2FzIHByb3ZpZGVkID0gNTk1MTM3ODgwLCBnYXMgdXNlZCA9IDIyODg1NTA="
+                            ],
+                            "data": "QDZmNmJAMGFAMDIxODcxMWEwMA=="
+                          },
+                          {
+                            "address": "erd1qqqqqqqqqqqqqpgqllqglpjdrz5kn3m0k9uf9hdqjmg3xdhk6r7se3wvlk",
+                            "identifier": "completedTxEvent",
+                            "topics": [
+                              "/nR0GI1cpLhMdXfwP8d40i1TwHDfywWpzahAIp0w5NM="
+                            ],
+                            "data": null
+                          }
+                        ]
+                      },
+                      "operation": "transfer"
+                    }
+                  ],
+                  "logs": {
+                    "address": "erd1qqqqqqqqqqqqqpgqllqglpjdrz5kn3m0k9uf9hdqjmg3xdhk6r7se3wvlk",
+                    "events": [
+                      {
+                        "address": "erd1qqqqqqqqqqqqqpgqllqglpjdrz5kn3m0k9uf9hdqjmg3xdhk6r7se3wvlk",
+                        "identifier": "writeLog",
+                        "topics": [
+                          "5fXsK/a5JVZf0e2Z6ViFglDOQP1zsS1XkuaLvaZ5pzw="
+                        ],
+                        "data": "QDZmNmI="
+                      }
+                    ]
+                  },
+                  "status": "success",
+                  "operation": "transfer",
+                  "function": "asyncCallAnotherContractReturnTwoU64WithNonReturningCallback",
+                  "initiallyPaidFee": "6235125000000000",
+                  "fee": "6235125000000000",
+                  "chainID": "D",
+                  "version": 2,
+                  "options": 0
+                }
+              },
+              "error": "",
+              "code": "successful"
+            }
+        "#;
+
+    let tx_on_network: TransactionOnNetwork = serde_json::from_str::<TransactionInfo>(data)
+        .unwrap()
+        .data
+        .unwrap()
+        .transaction;
+    let tx_response = TxResponse::from_network_tx(tx_on_network);
+
+    let expected: Vec<Vec<u8>> = vec![];
+
+    assert_eq!(tx_response.out, expected)
+}
+
+#[test]
+fn test_with_multi_contract_cross_shard_tx_that_has_returning_callback() {
+    // transaction data from the devnet
+    // context : user -> A --async call--> B --callback--> A, the callback returns a MultiValue2<u64, u64>
+    let data = r#"
+            {
+              "data": {
+                "transaction": {
+                  "type": "normal",
+                  "processingTypeOnSource": "SCInvoking",
+                  "processingTypeOnDestination": "SCInvoking",
+                  "hash": "f34e136ca81c0e32f6fb532b753612715675073f3718b5db009bb275d246fd7a",
+                  "nonce": 53,
+                  "round": 7647583,
+                  "epoch": 6340,
+                  "value": "0",
+                  "receiver": "erd1qqqqqqqqqqqqqpgqllqglpjdrz5kn3m0k9uf9hdqjmg3xdhk6r7se3wvlk",
+                  "sender": "erd1uh67c2lkhyj4vh73akv7jky9sfgvus8awwcj64uju69mmfne5u7q299t7g",
+                  "gasPrice": 1000000000,
+                  "gasLimit": 600000000,
+                  "gasUsed": 600000000,
+                  "data": "YXN5bmNDYWxsQW5vdGhlckNvbnRyYWN0UmV0dXJuVHdvVTY0V2l0aFJldHVybmluZ0NhbGxiYWNrQDAwMDAwMDAwMDAwMDAwMDAwNTAwQUNGRjZCN0E0RUI4MTAxQThERTdGRjdGNUQyQzBCRjNFNEQ2M0Y0N0E3M0M=",
+                  "signature": "858958d4aaf9cb0220ab2933edad3f65e1cb4c58aa7940cb0f40b489d0bd9fdf5c4736a40d6e813743ee622bb91e9f86eacf01b9a31e0ff53f9c84f13c500304",
+                  "sourceShard": 0,
+                  "destinationShard": 1,
+                  "blockNonce": 7593818,
+                  "blockHash": "b19f97110ca38d3cb15f802a00ab403491b0e5804ebc701527ab50064dc06825",
+                  "notarizedAtSourceInMetaNonce": 7609963,
+                  "NotarizedAtSourceInMetaHash": "4d9db6de610ca778114d44fe91dd036fac7c375c373ae9e77130d3fb9efc8391",
+                  "notarizedAtDestinationInMetaNonce": 7609967,
+                  "notarizedAtDestinationInMetaHash": "a4573d388c31860f9bd6f9507b65d1b3130e445abcada538f10704feba4614e7",
+                  "miniblockType": "TxBlock",
+                  "miniblockHash": "530f5fa3c7af474a187caca8dcea02a7a155017414147871d083bed5c49ec8f5",
+                  "hyperblockNonce": 7609967,
+                  "hyperblockHash": "a4573d388c31860f9bd6f9507b65d1b3130e445abcada538f10704feba4614e7",
+                  "timestamp": 1694437098,
+                  "smartContractResults": [
+                    {
+                      "hash": "065291164a8acd27c26b5a8f09664810081fda18cd54fca635196cf9b200297a",
+                      "nonce": 0,
+                      "value": 0,
+                      "receiver": "erd1qqqqqqqqqqqqqpgq4nlkk7jwhqgp4r08lal46tqt70jdv0685u7qrr3l2d",
+                      "sender": "erd1qqqqqqqqqqqqqpgqllqglpjdrz5kn3m0k9uf9hdqjmg3xdhk6r7se3wvlk",
+                      "data": "returnTwoU64@4f3c60",
+                      "prevTxHash": "f34e136ca81c0e32f6fb532b753612715675073f3718b5db009bb275d246fd7a",
+                      "originalTxHash": "f34e136ca81c0e32f6fb532b753612715675073f3718b5db009bb275d246fd7a",
+                      "gasLimit": 596994205,
+                      "gasPrice": 1000000000,
+                      "callType": 1,
+                      "operation": "transfer",
+                      "function": "returnTwoU64"
+                    },
+                    {
+                      "hash": "bc31cb153ae615204625df84fe9ae3a159aa412b7342f3dca958dd5517a08197",
+                      "nonce": 0,
+                      "value": 0,
+                      "receiver": "erd1qqqqqqqqqqqqqpgqllqglpjdrz5kn3m0k9uf9hdqjmg3xdhk6r7se3wvlk",
+                      "sender": "erd1qqqqqqqqqqqqqpgq4nlkk7jwhqgp4r08lal46tqt70jdv0685u7qrr3l2d",
+                      "data": "@00@0a@0218711a00",
+                      "prevTxHash": "065291164a8acd27c26b5a8f09664810081fda18cd54fca635196cf9b200297a",
+                      "originalTxHash": "f34e136ca81c0e32f6fb532b753612715675073f3718b5db009bb275d246fd7a",
+                      "gasLimit": 595152540,
+                      "gasPrice": 1000000000,
+                      "callType": 2,
+                      "logs": {
+                        "address": "erd1qqqqqqqqqqqqqpgqllqglpjdrz5kn3m0k9uf9hdqjmg3xdhk6r7se3wvlk",
+                        "events": [
+                          {
+                            "address": "erd1qqqqqqqqqqqqqpgqllqglpjdrz5kn3m0k9uf9hdqjmg3xdhk6r7se3wvlk",
+                            "identifier": "writeLog",
+                            "topics": [
+                              "AAAAAAAAAAAFAP/Aj4ZNGKlpx2+xeJLdoJbREzb20P0=",
+                              "QHRvbyBtdWNoIGdhcyBwcm92aWRlZCBmb3IgcHJvY2Vzc2luZzogZ2FzIHByb3ZpZGVkID0gNTk1MTUyNTQwLCBnYXMgdXNlZCA9IDIyODgwMTU="
+                            ],
+                            "data": "QDZmNmJAMGFAMDIxODcxMWEwMA=="
+                          },
+                          {
+                            "address": "erd1qqqqqqqqqqqqqpgqllqglpjdrz5kn3m0k9uf9hdqjmg3xdhk6r7se3wvlk",
+                            "identifier": "completedTxEvent",
+                            "topics": [
+                              "BlKRFkqKzSfCa1qPCWZIEAgf2hjNVPymNRls+bIAKXo="
+                            ],
+                            "data": null
+                          }
+                        ]
+                      },
+                      "operation": "transfer"
+                    }
+                  ],
+                  "logs": {
+                    "address": "erd1qqqqqqqqqqqqqpgqllqglpjdrz5kn3m0k9uf9hdqjmg3xdhk6r7se3wvlk",
+                    "events": [
+                      {
+                        "address": "erd1qqqqqqqqqqqqqpgqllqglpjdrz5kn3m0k9uf9hdqjmg3xdhk6r7se3wvlk",
+                        "identifier": "writeLog",
+                        "topics": [
+                          "5fXsK/a5JVZf0e2Z6ViFglDOQP1zsS1XkuaLvaZ5pzw="
+                        ],
+                        "data": "QDZmNmI="
+                      }
+                    ]
+                  },
+                  "status": "success",
+                  "operation": "transfer",
+                  "function": "asyncCallAnotherContractReturnTwoU64WithReturningCallback",
+                  "initiallyPaidFee": "6230670000000000",
+                  "fee": "6230670000000000",
+                  "chainID": "D",
+                  "version": 2,
+                  "options": 0
+                }
+              },
+              "error": "",
+              "code": "successful"
+            }
+        "#;
+
+    let tx_on_network: TransactionOnNetwork = serde_json::from_str::<TransactionInfo>(data)
+        .unwrap()
+        .data
+        .unwrap()
+        .transaction;
+    let tx_response = TxResponse::from_network_tx(tx_on_network);
+
+    let expected: Vec<Vec<u8>> = vec![];
+
+    assert_eq!(tx_response.out, expected)
+}
diff --git a/framework/scenario/tests/test_tx_multiple_sc_results.rs b/framework/scenario/tests/test_tx_multiple_sc_results.rs
new file mode 100644
index 0000000000..6322b0a7bb
--- /dev/null
+++ b/framework/scenario/tests/test_tx_multiple_sc_results.rs
@@ -0,0 +1,287 @@
+use multiversx_sc_scenario::scenario_model::{is_out_scr, TxResponse};
+use multiversx_sdk::data::transaction::{TransactionInfo, TransactionOnNetwork};
+
+#[test]
+fn test_transaction_multiple_sc_results() {
+    let data = r#"
+        {
+          "data": {
+            "transaction": {
+              "type": "normal",
+              "processingTypeOnSource": "BuiltInFunctionCall",
+              "processingTypeOnDestination": "SCInvoking",
+              "hash": "c6dc718c56c8795156d847f4f9768f2b1976a516d390fdce0f5b8bad1ac3cce5",
+              "nonce": 236,
+              "round": 3353069,
+              "epoch": 1371,
+              "value": "0",
+              "receiver": "erd1qqqqqqqqqqqqqpgq4zafu6rzdw7fj07hjh5tkm68jsaj7hl60n4s8py4ra",
+              "sender": "erd1uv40ahysflse896x4ktnh6ecx43u7cmy9wnxnvcyp7deg299a4sq6vaywa",
+              "gasPrice": 1000000000,
+              "gasLimit": 100000000,
+              "gasUsed": 12767998,
+              "data": "RVNEVFRyYW5zZmVyQDU1NTQ0YjJkMzEzNDY0MzUzNzY0QDhhYzcyMzA0ODllODAwMDBANzM3NzYxNzA1NDZmNmI2NTZlNzM0NjY5Nzg2NTY0NDk2ZTcwNzU3NEA1NzQ1NDc0YzQ0MmQ2MTMyMzg2MzM1MzlAZThkNGE1MTAwMA==",
+              "signature": "caed340339e3ae17a92783f5f08f96ac875885e44c25510cd11251ce23f22994985a6605c4d36f841b7110288a5e928f624f150a66a9de8ade36b68028a9af09",
+              "sourceShard": 0,
+              "destinationShard": 1,
+              "blockNonce": 3288476,
+              "blockHash": "0e70ea5fb26c58b1029c84e24eb9a661272b6253d30c668af91f167bfd67b2b0",
+              "notarizedAtSourceInMetaNonce": 3290316,
+              "NotarizedAtSourceInMetaHash": "8200662ca3ade8fa8e1dd3a4184b0a74d4c43de8f4153170a506f60c94ad3e8b",
+              "notarizedAtDestinationInMetaNonce": 3290320,
+              "notarizedAtDestinationInMetaHash": "e5f332a8f2070fd1c4ff90f5dc1ee691f36e4ecb9cb5c37e8e7c8595036c3792",
+              "miniblockType": "TxBlock",
+              "miniblockHash": "d271ad87c6cf8653cc950272f3ee5e976820ada80468518fa35fe45b6e33dca8",
+              "hyperblockNonce": 3290320,
+              "hyperblockHash": "e5f332a8f2070fd1c4ff90f5dc1ee691f36e4ecb9cb5c37e8e7c8595036c3792",
+              "timestamp": 1714118414,
+              "smartContractResults": [
+                {
+                  "hash": "c0e63f1018ece1036e3e6dc405553e5f6badfe0f5d2a104f4cd4457a872d02f9",
+                  "nonce": 0,
+                  "value": 0,
+                  "receiver": "erd1qqqqqqqqqqqqqpgq4zafu6rzdw7fj07hjh5tkm68jsaj7hl60n4s8py4ra",
+                  "sender": "erd1qqqqqqqqqqqqqpgq4zafu6rzdw7fj07hjh5tkm68jsaj7hl60n4s8py4ra",
+                  "data": "swapTokensFixedInput@5745474c442d613238633539@e8d4a51000",
+                  "prevTxHash": "c6dc718c56c8795156d847f4f9768f2b1976a516d390fdce0f5b8bad1ac3cce5",
+                  "originalTxHash": "c6dc718c56c8795156d847f4f9768f2b1976a516d390fdce0f5b8bad1ac3cce5",
+                  "gasLimit": 99559500,
+                  "gasPrice": 1000000000,
+                  "callType": 0,
+                  "originalSender": "erd1uv40ahysflse896x4ktnh6ecx43u7cmy9wnxnvcyp7deg299a4sq6vaywa",
+                  "operation": "transfer",
+                  "function": "swapTokensFixedInput"
+                },
+                {
+                  "hash": "40078cec63b6e0d0d9522ea5e6d2d0cb6f21ebae981f354de3dc3545ac2928ad",
+                  "nonce": 0,
+                  "value": 0,
+                  "receiver": "erd1uv40ahysflse896x4ktnh6ecx43u7cmy9wnxnvcyp7deg299a4sq6vaywa",
+                  "sender": "erd1qqqqqqqqqqqqqpgq4zafu6rzdw7fj07hjh5tkm68jsaj7hl60n4s8py4ra",
+                  "data": "ESDTTransfer@5745474c442d613238633539@9b35e4dd3902b9",
+                  "prevTxHash": "c6dc718c56c8795156d847f4f9768f2b1976a516d390fdce0f5b8bad1ac3cce5",
+                  "originalTxHash": "c6dc718c56c8795156d847f4f9768f2b1976a516d390fdce0f5b8bad1ac3cce5",
+                  "gasLimit": 0,
+                  "gasPrice": 1000000000,
+                  "callType": 0,
+                  "originalSender": "erd1uv40ahysflse896x4ktnh6ecx43u7cmy9wnxnvcyp7deg299a4sq6vaywa",
+                  "logs": {
+                    "address": "erd1uv40ahysflse896x4ktnh6ecx43u7cmy9wnxnvcyp7deg299a4sq6vaywa",
+                    "events": [
+                      {
+                        "address": "erd1qqqqqqqqqqqqqpgq4zafu6rzdw7fj07hjh5tkm68jsaj7hl60n4s8py4ra",
+                        "identifier": "ESDTTransfer",
+                        "topics": [
+                          "V0VHTEQtYTI4YzU5",
+                          "",
+                          "mzXk3TkCuQ==",
+                          "4yr+3JBP4ZOXRq2XO+s4NWPPY2QrpmmzBA+blCil7WA="
+                        ],
+                        "data": null,
+                        "additionalData": [
+                          "",
+                          "RVNEVFRyYW5zZmVy",
+                          "V0VHTEQtYTI4YzU5",
+                          "mzXk3TkCuQ=="
+                        ]
+                      },
+                      {
+                        "address": "erd1uv40ahysflse896x4ktnh6ecx43u7cmy9wnxnvcyp7deg299a4sq6vaywa",
+                        "identifier": "writeLog",
+                        "topics": [
+                          "AAAAAAAAAAAFAKi6nmhia7yZP9eV6LtvR5Q7L1/6fOs="
+                        ],
+                        "data": "QDZmNmI=",
+                        "additionalData": [
+                          "QDZmNmI="
+                        ]
+                      },
+                      {
+                        "address": "erd1uv40ahysflse896x4ktnh6ecx43u7cmy9wnxnvcyp7deg299a4sq6vaywa",
+                        "identifier": "completedTxEvent",
+                        "topics": [
+                          "xtxxjFbIeVFW2Ef0+XaPKxl2pRbTkP3OD1uLrRrDzOU="
+                        ],
+                        "data": null,
+                        "additionalData": null
+                      }
+                    ]
+                  },
+                  "tokens": [
+                    "WEGLD-a28c59"
+                  ],
+                  "esdtValues": [
+                    "43687878470468281"
+                  ],
+                  "operation": "ESDTTransfer"
+                },
+                {
+                  "hash": "26487a550721b8282ceafe603bb4d53ee93929ffd9ded39b08e7422adb4d8795",
+                  "nonce": 237,
+                  "value": 872320020000000,
+                  "receiver": "erd1uv40ahysflse896x4ktnh6ecx43u7cmy9wnxnvcyp7deg299a4sq6vaywa",
+                  "sender": "erd1qqqqqqqqqqqqqpgq4zafu6rzdw7fj07hjh5tkm68jsaj7hl60n4s8py4ra",
+                  "data": "@6f6b@0000000c5745474c442d6132386335390000000000000000000000079b35e4dd3902b9",
+                  "prevTxHash": "c6dc718c56c8795156d847f4f9768f2b1976a516d390fdce0f5b8bad1ac3cce5",
+                  "originalTxHash": "c6dc718c56c8795156d847f4f9768f2b1976a516d390fdce0f5b8bad1ac3cce5",
+                  "gasLimit": 0,
+                  "gasPrice": 1000000000,
+                  "callType": 0,
+                  "logs": {
+                    "address": "erd1uv40ahysflse896x4ktnh6ecx43u7cmy9wnxnvcyp7deg299a4sq6vaywa",
+                    "events": [
+                      {
+                        "address": "erd1uv40ahysflse896x4ktnh6ecx43u7cmy9wnxnvcyp7deg299a4sq6vaywa",
+                        "identifier": "completedTxEvent",
+                        "topics": [
+                          "xtxxjFbIeVFW2Ef0+XaPKxl2pRbTkP3OD1uLrRrDzOU="
+                        ],
+                        "data": null,
+                        "additionalData": null
+                      }
+                    ]
+                  },
+                  "operation": "transfer",
+                  "isRefund": true
+                },
+                {
+                  "hash": "798ba4333a7cedb62f811d942dedb8c0c09bf9945a0d2ccede2eaed967eba135",
+                  "nonce": 0,
+                  "value": 0,
+                  "receiver": "erd1qqqqqqqqqqqqqpgqw88ux2l44eufvwz2uhvduhq03g8pxc4j0n4s0frzjz",
+                  "sender": "erd1qqqqqqqqqqqqqpgq4zafu6rzdw7fj07hjh5tkm68jsaj7hl60n4s8py4ra",
+                  "data": "ESDTTransfer@55544b2d313464353764@2d79883d2000@6465706f7369745377617046656573",
+                  "prevTxHash": "c6dc718c56c8795156d847f4f9768f2b1976a516d390fdce0f5b8bad1ac3cce5",
+                  "originalTxHash": "c6dc718c56c8795156d847f4f9768f2b1976a516d390fdce0f5b8bad1ac3cce5",
+                  "gasLimit": 0,
+                  "gasPrice": 1000000000,
+                  "callType": 0,
+                  "originalSender": "erd1uv40ahysflse896x4ktnh6ecx43u7cmy9wnxnvcyp7deg299a4sq6vaywa",
+                  "tokens": [
+                    "UTK-14d57d"
+                  ],
+                  "esdtValues": [
+                    "50000000000000"
+                  ],
+                  "operation": "ESDTTransfer",
+                  "function": "depositSwapFees"
+                }
+              ],
+              "logs": {
+                "address": "erd1qqqqqqqqqqqqqpgq4zafu6rzdw7fj07hjh5tkm68jsaj7hl60n4s8py4ra",
+                "events": [
+                  {
+                    "address": "erd1uv40ahysflse896x4ktnh6ecx43u7cmy9wnxnvcyp7deg299a4sq6vaywa",
+                    "identifier": "ESDTTransfer",
+                    "topics": [
+                      "VVRLLTE0ZDU3ZA==",
+                      "",
+                      "iscjBInoAAA=",
+                      "AAAAAAAAAAAFAKi6nmhia7yZP9eV6LtvR5Q7L1/6fOs="
+                    ],
+                    "data": null,
+                    "additionalData": [
+                      "",
+                      "RVNEVFRyYW5zZmVy",
+                      "VVRLLTE0ZDU3ZA==",
+                      "iscjBInoAAA=",
+                      "c3dhcFRva2Vuc0ZpeGVkSW5wdXQ=",
+                      "V0VHTEQtYTI4YzU5",
+                      "6NSlEAA="
+                    ]
+                  },
+                  {
+                    "address": "erd1qqqqqqqqqqqqqpgq4zafu6rzdw7fj07hjh5tkm68jsaj7hl60n4s8py4ra",
+                    "identifier": "ESDTTransfer",
+                    "topics": [
+                      "VVRLLTE0ZDU3ZA==",
+                      "",
+                      "LXmIPSAA",
+                      "AAAAAAAAAAAFAHHPwyv1rniWOErl2N5cD4oOE2KyfOs="
+                    ],
+                    "data": "RXhlY3V0ZU9uRGVzdENvbnRleHQ=",
+                    "additionalData": [
+                      "RXhlY3V0ZU9uRGVzdENvbnRleHQ=",
+                      "RVNEVFRyYW5zZmVy",
+                      "VVRLLTE0ZDU3ZA==",
+                      "LXmIPSAA",
+                      "ZGVwb3NpdFN3YXBGZWVz"
+                    ]
+                  },
+                  {
+                    "address": "erd1qqqqqqqqqqqqqpgqw88ux2l44eufvwz2uhvduhq03g8pxc4j0n4s0frzjz",
+                    "identifier": "depositSwapFees",
+                    "topics": [
+                      "ZGVwb3NpdF9zd2FwX2ZlZXNfZXZlbnQ=",
+                      "AAAAAAAAAAAFAKi6nmhia7yZP9eV6LtvR5Q7L1/6fOs=",
+                      "ug==",
+                      "AAAAClVUSy0xNGQ1N2QAAAAAAAAAAAAAAAYteYg9IAA="
+                    ],
+                    "data": null,
+                    "additionalData": [
+                      ""
+                    ]
+                  },
+                  {
+                    "address": "erd1qqqqqqqqqqqqqpgq4zafu6rzdw7fj07hjh5tkm68jsaj7hl60n4s8py4ra",
+                    "identifier": "ESDTTransfer",
+                    "topics": [
+                      "V0VHTEQtYTI4YzU5",
+                      "",
+                      "mzXk3TkCuQ==",
+                      "4yr+3JBP4ZOXRq2XO+s4NWPPY2QrpmmzBA+blCil7WA="
+                    ],
+                    "data": "RGlyZWN0Q2FsbA==",
+                    "additionalData": [
+                      "RGlyZWN0Q2FsbA==",
+                      "RVNEVFRyYW5zZmVy",
+                      "V0VHTEQtYTI4YzU5",
+                      "mzXk3TkCuQ=="
+                    ]
+                  },
+                  {
+                    "address": "erd1qqqqqqqqqqqqqpgq4zafu6rzdw7fj07hjh5tkm68jsaj7hl60n4s8py4ra",
+                    "identifier": "swapTokensFixedInput",
+                    "topics": [
+                      "c3dhcA==",
+                      "VVRLLTE0ZDU3ZA==",
+                      "V0VHTEQtYTI4YzU5",
+                      "4yr+3JBP4ZOXRq2XO+s4NWPPY2QrpmmzBA+blCil7WA=",
+                      "BVs="
+                    ],
+                    "data": "4yr+3JBP4ZOXRq2XO+s4NWPPY2QrpmmzBA+blCil7WAAAAAKVVRLLTE0ZDU3ZAAAAAiKxyMEiegAAAAAAAxXRUdMRC1hMjhjNTkAAAAHmzXk3TkCuQAAAAcjhvJvwQAAAAAACwGBykedC25GCD5kAAAACgGwxHNBlOj27dQAAAAAADItnAAAAAAAAAVbAAAAAGYrXw4=",
+                    "additionalData": [
+                      "4yr+3JBP4ZOXRq2XO+s4NWPPY2QrpmmzBA+blCil7WAAAAAKVVRLLTE0ZDU3ZAAAAAiKxyMEiegAAAAAAAxXRUdMRC1hMjhjNTkAAAAHmzXk3TkCuQAAAAcjhvJvwQAAAAAACwGBykedC25GCD5kAAAACgGwxHNBlOj27dQAAAAAADItnAAAAAAAAAVbAAAAAGYrXw4="
+                    ]
+                  }
+                ]
+              },
+              "status": "success",
+              "tokens": [
+                "UTK-14d57d"
+              ],
+              "esdtValues": [
+                "10000000000000000000"
+              ],
+              "operation": "ESDTTransfer",
+              "function": "swapTokensFixedInput",
+              "initiallyPaidFee": "1238095000000000",
+              "fee": "365774980000000",
+              "chainID": "D",
+              "version": 1,
+              "options": 0
+            }
+          },
+          "error": "",
+          "code": "successful"
+        }"#;
+
+    let tx_on_network: TransactionOnNetwork = serde_json::from_str::<TransactionInfo>(data)
+        .unwrap()
+        .data
+        .unwrap()
+        .transaction;
+    let tx_response = TxResponse::from_network_tx(tx_on_network);
+    assert_eq!(tx_response.api_scrs.len(), 4usize);
+    assert!(is_out_scr(&tx_response.api_scrs.get(2).unwrap()));
+}
diff --git a/framework/scenario/tests/test_tx_sc_result.rs b/framework/scenario/tests/test_tx_sc_result.rs
new file mode 100644
index 0000000000..561712300c
--- /dev/null
+++ b/framework/scenario/tests/test_tx_sc_result.rs
@@ -0,0 +1,350 @@
+use multiversx_sc_scenario::scenario_model::TxResponse;
+use multiversx_sdk::data::transaction::{TransactionInfo, TransactionOnNetwork};
+
+#[test]
+fn test_with_tx_that_has_sc_result() {
+    // transaction data from the devnet, an artificial "10" result has been appended on the original result
+    let data = r#"
+            {
+              "data": {
+                "transaction": {
+                  "type": "normal",
+                  "processingTypeOnSource": "BuiltInFunctionCall",
+                  "processingTypeOnDestination": "SCInvoking",
+                  "hash": "d4058bd3c13db0b14832c7c58fe163db2f579ff6544380586b8a27d88b4a5070",
+                  "nonce": 30,
+                  "round": 7639115,
+                  "epoch": 6333,
+                  "value": "0",
+                  "receiver": "erd1qqqqqqqqqqqqqpgq5400a82at6ttplyrdhyn8kk9lhxaed5d0n4s9s77kz",
+                  "sender": "erd14r7m6drneg69jyxvxxnrsss6x5gg2cqqwreyhdwanj0fcza0ynnq5jmy4g",
+                  "gasPrice": 1000000000,
+                  "gasLimit": 25500000,
+                  "gasUsed": 15297149,
+                  "data": "RVNEVFRyYW5zZmVyQDQ4NTQ0ZDJkNjY2NTMxNjYzNjM5QDBkZTBiNmIzYTc2NDAwMDBANzM3NzYxNzA1NDZmNmI2NTZlNzM0NjY5Nzg2NTY0NDk2ZTcwNzU3NEA1NzQ1NDc0YzQ0MmQ2NDM3NjMzNjYyNjJAMDM3Yzc3OGZjY2U5YzU1Yg==",
+                  "signature": "e912fae4b7a9e51ddf316a5e82a0f457d453a62e3c17477f5d6175e1b33c5e92ddb187d65f54cf3131a0603321290279a0456c20778039f2ab09b54e33c60f0d",
+                  "sourceShard": 2,
+                  "destinationShard": 1,
+                  "blockNonce": 7585351,
+                  "blockHash": "e456f38f11fec78ed26d5fda068e912739dceedb2e5ce559bf17614b8386c039",
+                  "notarizedAtSourceInMetaNonce": 7601495,
+                  "NotarizedAtSourceInMetaHash": "e28c6011d4b3f73f3945cae70ff251e675dfea331a70077c5ab3310e3101af17",
+                  "notarizedAtDestinationInMetaNonce": 7601499,
+                  "notarizedAtDestinationInMetaHash": "333d4266614e981cc1c5654f85ef496038a8cddac46dfc0ad0b7c44c37ab489d",
+                  "miniblockType": "TxBlock",
+                  "miniblockHash": "13e041f32fde79ebf1abdcfe692e99516f9ec6778dcb917251b440daa7f1210a",
+                  "hyperblockNonce": 7601499,
+                  "hyperblockHash": "333d4266614e981cc1c5654f85ef496038a8cddac46dfc0ad0b7c44c37ab489d",
+                  "timestamp": 1694386290,
+                  "smartContractResults": [
+                    {
+                      "hash": "a23faa3c80bae0b968f007ff0fad3afdec05b4e71d749c3d583dec10c6eb05a2",
+                      "nonce": 0,
+                      "value": 0,
+                      "receiver": "erd14r7m6drneg69jyxvxxnrsss6x5gg2cqqwreyhdwanj0fcza0ynnq5jmy4g",
+                      "sender": "erd1qqqqqqqqqqqqqpgq5400a82at6ttplyrdhyn8kk9lhxaed5d0n4s9s77kz",
+                      "data": "ESDTTransfer@5745474c442d643763366262@03856446ff9a304b",
+                      "prevTxHash": "d4058bd3c13db0b14832c7c58fe163db2f579ff6544380586b8a27d88b4a5070",
+                      "originalTxHash": "d4058bd3c13db0b14832c7c58fe163db2f579ff6544380586b8a27d88b4a5070",
+                      "gasLimit": 0,
+                      "gasPrice": 1000000000,
+                      "callType": 0,
+                      "logs": {
+                        "address": "erd14r7m6drneg69jyxvxxnrsss6x5gg2cqqwreyhdwanj0fcza0ynnq5jmy4g",
+                        "events": [
+                          {
+                            "address": "erd1qqqqqqqqqqqqqpgq5400a82at6ttplyrdhyn8kk9lhxaed5d0n4s9s77kz",
+                            "identifier": "ESDTTransfer",
+                            "topics": [
+                              "V0VHTEQtZDdjNmJi",
+                              "",
+                              "A4VkRv+aMEs=",
+                              "qP29NHPKNFkQzDGmOEIaNRCFYABw8ku13ZyenAuvJOY="
+                            ],
+                            "data": null
+                          },
+                          {
+                            "address": "erd14r7m6drneg69jyxvxxnrsss6x5gg2cqqwreyhdwanj0fcza0ynnq5jmy4g",
+                            "identifier": "writeLog",
+                            "topics": [
+                              "AAAAAAAAAAAFAKVe/p1dXpaw/INtyTPaxf3N3LaNfOs="
+                            ],
+                            "data": "QDZmNmI="
+                          },
+                          {
+                            "address": "erd14r7m6drneg69jyxvxxnrsss6x5gg2cqqwreyhdwanj0fcza0ynnq5jmy4g",
+                            "identifier": "completedTxEvent",
+                            "topics": [
+                              "1AWL08E9sLFIMsfFj+Fj2y9Xn/ZUQ4BYa4on2ItKUHA="
+                            ],
+                            "data": null
+                          }
+                        ]
+                      },
+                      "tokens": [
+                        "WEGLD-d7c6bb"
+                      ],
+                      "esdtValues": [
+                        "253719210115084363"
+                      ],
+                      "operation": "ESDTTransfer"
+                    },
+                    {
+                      "hash": "b7b4d15917fd215399d8e772c3c4e732008baaedc2b8172f71c91708ba7523f0",
+                      "nonce": 31,
+                      "value": 102028510000000,
+                      "receiver": "erd14r7m6drneg69jyxvxxnrsss6x5gg2cqqwreyhdwanj0fcza0ynnq5jmy4g",
+                      "sender": "erd1qqqqqqqqqqqqqpgq5400a82at6ttplyrdhyn8kk9lhxaed5d0n4s9s77kz",
+                      "data": "@6f6b@0000000c5745474c442d64376336626200000000000000000000000803856446ff9a304b@10",
+                      "prevTxHash": "d4058bd3c13db0b14832c7c58fe163db2f579ff6544380586b8a27d88b4a5070",
+                      "originalTxHash": "d4058bd3c13db0b14832c7c58fe163db2f579ff6544380586b8a27d88b4a5070",
+                      "gasLimit": 0,
+                      "gasPrice": 1000000000,
+                      "callType": 0,
+                      "logs": {
+                        "address": "erd14r7m6drneg69jyxvxxnrsss6x5gg2cqqwreyhdwanj0fcza0ynnq5jmy4g",
+                        "events": [
+                          {
+                            "address": "erd14r7m6drneg69jyxvxxnrsss6x5gg2cqqwreyhdwanj0fcza0ynnq5jmy4g",
+                            "identifier": "completedTxEvent",
+                            "topics": [
+                              "1AWL08E9sLFIMsfFj+Fj2y9Xn/ZUQ4BYa4on2ItKUHA="
+                            ],
+                            "data": null
+                          }
+                        ]
+                      },
+                      "operation": "transfer",
+                      "isRefund": true
+                    },
+                    {
+                      "hash": "05a766ca05d2053d1c0fbeb1797116474a06c86402a3bfd6c132c9a24cfa1bb0",
+                      "nonce": 0,
+                      "value": 0,
+                      "receiver": "erd1qqqqqqqqqqqqqpgq5400a82at6ttplyrdhyn8kk9lhxaed5d0n4s9s77kz",
+                      "sender": "erd1qqqqqqqqqqqqqpgq5400a82at6ttplyrdhyn8kk9lhxaed5d0n4s9s77kz",
+                      "data": "swapTokensFixedInput@5745474c442d643763366262@037c778fcce9c55b",
+                      "prevTxHash": "d4058bd3c13db0b14832c7c58fe163db2f579ff6544380586b8a27d88b4a5070",
+                      "originalTxHash": "d4058bd3c13db0b14832c7c58fe163db2f579ff6544380586b8a27d88b4a5070",
+                      "gasLimit": 25050500,
+                      "gasPrice": 1000000000,
+                      "callType": 0,
+                      "operation": "transfer",
+                      "function": "swapTokensFixedInput"
+                    },
+                    {
+                      "hash": "4e639c80822d5d7780c8326d683fa9cd6d59649d14122dfabc5a96dda36da527",
+                      "nonce": 0,
+                      "value": 0,
+                      "receiver": "erd1qqqqqqqqqqqqqpgquu5rsa4ee6l4azz6vdu4hjp8z4p6tt8m0n4suht3dy",
+                      "sender": "erd1qqqqqqqqqqqqqpgq5400a82at6ttplyrdhyn8kk9lhxaed5d0n4s9s77kz",
+                      "data": "ESDTTransfer@5745474c442d643763366262@e7730d1ef1b0@737761704e6f466565416e64466f7277617264@4d45582d646332383963@0000000000000000000000000000000000000000000000000000000000000000",
+                      "prevTxHash": "d4058bd3c13db0b14832c7c58fe163db2f579ff6544380586b8a27d88b4a5070",
+                      "originalTxHash": "d4058bd3c13db0b14832c7c58fe163db2f579ff6544380586b8a27d88b4a5070",
+                      "gasLimit": 0,
+                      "gasPrice": 1000000000,
+                      "callType": 0,
+                      "tokens": [
+                        "WEGLD-d7c6bb"
+                      ],
+                      "esdtValues": [
+                        "254481327387056"
+                      ],
+                      "operation": "ESDTTransfer",
+                      "function": "swapNoFeeAndForward"
+                    }
+                  ],
+                  "logs": {
+                    "address": "erd1qqqqqqqqqqqqqpgq5400a82at6ttplyrdhyn8kk9lhxaed5d0n4s9s77kz",
+                    "events": [
+                      {
+                        "address": "erd14r7m6drneg69jyxvxxnrsss6x5gg2cqqwreyhdwanj0fcza0ynnq5jmy4g",
+                        "identifier": "ESDTTransfer",
+                        "topics": [
+                          "SFRNLWZlMWY2OQ==",
+                          "",
+                          "DeC2s6dkAAA=",
+                          "AAAAAAAAAAAFAKVe/p1dXpaw/INtyTPaxf3N3LaNfOs="
+                        ],
+                        "data": null
+                      },
+                      {
+                        "address": "erd1qqqqqqqqqqqqqpgq5400a82at6ttplyrdhyn8kk9lhxaed5d0n4s9s77kz",
+                        "identifier": "ESDTTransfer",
+                        "topics": [
+                          "V0VHTEQtZDdjNmJi",
+                          "",
+                          "53MNHvGw",
+                          "AAAAAAAAAAAFAOcoOHa5zr9eiFpjeVvIJxVDpaz7fOs="
+                        ],
+                        "data": null
+                      },
+                      {
+                        "address": "erd1qqqqqqqqqqqqqpgquu5rsa4ee6l4azz6vdu4hjp8z4p6tt8m0n4suht3dy",
+                        "identifier": "ESDTLocalBurn",
+                        "topics": [
+                          "TUVYLWRjMjg5Yw==",
+                          "",
+                          "AuMDPq1jy03x"
+                        ],
+                        "data": null
+                      },
+                      {
+                        "address": "erd1qqqqqqqqqqqqqpgquu5rsa4ee6l4azz6vdu4hjp8z4p6tt8m0n4suht3dy",
+                        "identifier": "swapNoFeeAndForward",
+                        "topics": [
+                          "c3dhcF9ub19mZWVfYW5kX2ZvcndhcmQ=",
+                          "TUVYLWRjMjg5Yw==",
+                          "AAAAAAAAAAAFAKVe/p1dXpaw/INtyTPaxf3N3LaNfOs=",
+                          "GL0="
+                        ],
+                        "data": "AAAAAAAAAAAFAKVe/p1dXpaw/INtyTPaxf3N3LaNfOsAAAAMV0VHTEQtZDdjNmJiAAAABudzDR7xsAAAAApNRVgtZGMyODljAAAACQLjAz6tY8tN8QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABzvkcAAAAAAAAYvQAAAABk/khy"
+                      },
+                      {
+                        "address": "erd1qqqqqqqqqqqqqpgq5400a82at6ttplyrdhyn8kk9lhxaed5d0n4s9s77kz",
+                        "identifier": "ESDTTransfer",
+                        "topics": [
+                          "V0VHTEQtZDdjNmJi",
+                          "",
+                          "A4VkRv+aMEs=",
+                          "qP29NHPKNFkQzDGmOEIaNRCFYABw8ku13ZyenAuvJOY="
+                        ],
+                        "data": null
+                      },
+                      {
+                        "address": "erd1qqqqqqqqqqqqqpgq5400a82at6ttplyrdhyn8kk9lhxaed5d0n4s9s77kz",
+                        "identifier": "swapTokensFixedInput",
+                        "topics": [
+                          "c3dhcA==",
+                          "SFRNLWZlMWY2OQ==",
+                          "V0VHTEQtZDdjNmJi",
+                          "qP29NHPKNFkQzDGmOEIaNRCFYABw8ku13ZyenAuvJOY=",
+                          "GL0="
+                        ],
+                        "data": "qP29NHPKNFkQzDGmOEIaNRCFYABw8ku13ZyenAuvJOYAAAAKSFRNLWZlMWY2OQAAAAgN4Lazp2QAAAAAAAxXRUdMRC1kN2M2YmIAAAAIA4VkRv+aMEsAAAAHA41+pMaAAAAAAAoofxtJRPkr8X9kAAAACgpOPCsHUu261HUAAAAAAHO+RwAAAAAAABi9AAAAAGT+SHI="
+                      }
+                    ]
+                  },
+                  "status": "success",
+                  "tokens": [
+                    "HTM-fe1f69"
+                  ],
+                  "esdtValues": [
+                    "1000000000000000000"
+                  ],
+                  "operation": "ESDTTransfer",
+                  "function": "swapTokensFixedInput",
+                  "initiallyPaidFee": "502005000000000",
+                  "fee": "399976490000000",
+                  "chainID": "D",
+                  "version": 1,
+                  "options": 0
+                }
+              },
+              "error": "",
+              "code": "successful"
+            }
+        "#;
+
+    let tx_on_network: TransactionOnNetwork = serde_json::from_str::<TransactionInfo>(data)
+        .unwrap()
+        .data
+        .unwrap()
+        .transaction;
+    let tx_response = TxResponse::from_network_tx(tx_on_network);
+
+    let expected: Vec<Vec<u8>> = vec![
+        hex::decode("0000000c5745474c442d64376336626200000000000000000000000803856446ff9a304b")
+            .unwrap(),
+        hex::decode("10").unwrap(),
+    ];
+
+    assert_eq!(tx_response.out, expected)
+}
+
+#[test]
+fn test_with_tx_that_has_no_sc_result() {
+    // transaction data from the devnet
+    let data = r#"
+            {
+              "data": {
+                "transaction": {
+                  "type": "normal",
+                  "processingTypeOnSource": "SCInvoking",
+                  "processingTypeOnDestination": "SCInvoking",
+                  "hash": "6afac3ec13c89cc56154d06efdb457a24f58361699eee00a48202a8f8adc8c8a",
+                  "nonce": 17,
+                  "round": 7548071,
+                  "epoch": 6257,
+                  "value": "0",
+                  "receiver": "erd1qqqqqqqqqqqqqpgq4nlkk7jwhqgp4r08lal46tqt70jdv0685u7qrr3l2d",
+                  "sender": "erd1uh67c2lkhyj4vh73akv7jky9sfgvus8awwcj64uju69mmfne5u7q299t7g",
+                  "gasPrice": 1000000000,
+                  "gasLimit": 600000000,
+                  "gasUsed": 600000000,
+                  "data": "cmV0dXJuVHdvVTY0",
+                  "signature": "f3a3ca96a78c90c9cf1b08541e1777010f0176a5e1e525e631155b2784932cbfd74c9168d03ba201fd5434d1a1b4789895ddade9883eca2ee9e0bce18468fb00",
+                  "sourceShard": 0,
+                  "destinationShard": 0,
+                  "blockNonce": 7502091,
+                  "blockHash": "5ec66c651cb1514cba200e7e80a4491880f0db678ce7631c397872e3842f0aa2",
+                  "notarizedAtSourceInMetaNonce": 7510505,
+                  "NotarizedAtSourceInMetaHash": "8410309ec5b988af79b4dcfb44fd4729d46874ebd796672c78e417e314409051",
+                  "notarizedAtDestinationInMetaNonce": 7510505,
+                  "notarizedAtDestinationInMetaHash": "8410309ec5b988af79b4dcfb44fd4729d46874ebd796672c78e417e314409051",
+                  "miniblockType": "TxBlock",
+                  "miniblockHash": "fb150e515449c9b658879ed06f256b429239cbe78ec2c2821deb4b283ff21554",
+                  "hyperblockNonce": 7510505,
+                  "hyperblockHash": "8410309ec5b988af79b4dcfb44fd4729d46874ebd796672c78e417e314409051",
+                  "timestamp": 1693840026,
+                  "logs": {
+                    "address": "erd1qqqqqqqqqqqqqpgq4nlkk7jwhqgp4r08lal46tqt70jdv0685u7qrr3l2d",
+                    "events": [
+                      {
+                        "address": "erd1qqqqqqqqqqqqqpgq4nlkk7jwhqgp4r08lal46tqt70jdv0685u7qrr3l2d",
+                        "identifier": "writeLog",
+                        "topics": [
+                          "5fXsK/a5JVZf0e2Z6ViFglDOQP1zsS1XkuaLvaZ5pzw=",
+                          "QHRvbyBtdWNoIGdhcyBwcm92aWRlZCBmb3IgcHJvY2Vzc2luZzogZ2FzIHByb3ZpZGVkID0gNTk5OTMyMDAwLCBnYXMgdXNlZCA9IDE4NDE2NjU="
+                        ],
+                        "data": "QDZmNmJAMGFAMDIxODcxMWEwMA=="
+                      },
+                      {
+                        "address": "erd1qqqqqqqqqqqqqpgq4nlkk7jwhqgp4r08lal46tqt70jdv0685u7qrr3l2d",
+                        "identifier": "completedTxEvent",
+                        "topics": [
+                          "avrD7BPInMVhVNBu/bRXok9YNhaZ7uAKSCAqj4rcjIo="
+                        ],
+                        "data": null
+                      }
+                    ]
+                  },
+                  "status": "success",
+                  "operation": "transfer",
+                  "function": "returnTwoU64",
+                  "initiallyPaidFee": "6067320000000000",
+                  "fee": "6067320000000000",
+                  "chainID": "D",
+                  "version": 1,
+                  "options": 0
+                }
+              },
+              "error": "",
+              "code": "successful"
+            }
+        "#;
+
+    let tx_on_network: TransactionOnNetwork = serde_json::from_str::<TransactionInfo>(data)
+        .unwrap()
+        .data
+        .unwrap()
+        .transaction;
+    let tx_response = TxResponse::from_network_tx(tx_on_network);
+
+    let expected: Vec<Vec<u8>> = vec![
+        hex::decode("0a").unwrap(),
+        hex::decode("0218711a00").unwrap(),
+    ];
+
+    assert_eq!(tx_response.out, expected)
+}
diff --git a/framework/scenario/tests/tx_response_tests.rs b/framework/scenario/tests/tx_response_tests.rs
deleted file mode 100644
index a1d9da5a34..0000000000
--- a/framework/scenario/tests/tx_response_tests.rs
+++ /dev/null
@@ -1,2661 +0,0 @@
-use multiversx_sc::types::Address;
-use multiversx_sc_scenario::scenario_model::{is_out_scr, TxResponse};
-use multiversx_sdk::data::transaction::{TransactionInfo, TransactionOnNetwork};
-
-#[test]
-fn test_transaction_multiple_sc_results() {
-    let data = r#"
-        {
-          "data": {
-            "transaction": {
-              "type": "normal",
-              "processingTypeOnSource": "BuiltInFunctionCall",
-              "processingTypeOnDestination": "SCInvoking",
-              "hash": "c6dc718c56c8795156d847f4f9768f2b1976a516d390fdce0f5b8bad1ac3cce5",
-              "nonce": 236,
-              "round": 3353069,
-              "epoch": 1371,
-              "value": "0",
-              "receiver": "erd1qqqqqqqqqqqqqpgq4zafu6rzdw7fj07hjh5tkm68jsaj7hl60n4s8py4ra",
-              "sender": "erd1uv40ahysflse896x4ktnh6ecx43u7cmy9wnxnvcyp7deg299a4sq6vaywa",
-              "gasPrice": 1000000000,
-              "gasLimit": 100000000,
-              "gasUsed": 12767998,
-              "data": "RVNEVFRyYW5zZmVyQDU1NTQ0YjJkMzEzNDY0MzUzNzY0QDhhYzcyMzA0ODllODAwMDBANzM3NzYxNzA1NDZmNmI2NTZlNzM0NjY5Nzg2NTY0NDk2ZTcwNzU3NEA1NzQ1NDc0YzQ0MmQ2MTMyMzg2MzM1MzlAZThkNGE1MTAwMA==",
-              "signature": "caed340339e3ae17a92783f5f08f96ac875885e44c25510cd11251ce23f22994985a6605c4d36f841b7110288a5e928f624f150a66a9de8ade36b68028a9af09",
-              "sourceShard": 0,
-              "destinationShard": 1,
-              "blockNonce": 3288476,
-              "blockHash": "0e70ea5fb26c58b1029c84e24eb9a661272b6253d30c668af91f167bfd67b2b0",
-              "notarizedAtSourceInMetaNonce": 3290316,
-              "NotarizedAtSourceInMetaHash": "8200662ca3ade8fa8e1dd3a4184b0a74d4c43de8f4153170a506f60c94ad3e8b",
-              "notarizedAtDestinationInMetaNonce": 3290320,
-              "notarizedAtDestinationInMetaHash": "e5f332a8f2070fd1c4ff90f5dc1ee691f36e4ecb9cb5c37e8e7c8595036c3792",
-              "miniblockType": "TxBlock",
-              "miniblockHash": "d271ad87c6cf8653cc950272f3ee5e976820ada80468518fa35fe45b6e33dca8",
-              "hyperblockNonce": 3290320,
-              "hyperblockHash": "e5f332a8f2070fd1c4ff90f5dc1ee691f36e4ecb9cb5c37e8e7c8595036c3792",
-              "timestamp": 1714118414,
-              "smartContractResults": [
-                {
-                  "hash": "c0e63f1018ece1036e3e6dc405553e5f6badfe0f5d2a104f4cd4457a872d02f9",
-                  "nonce": 0,
-                  "value": 0,
-                  "receiver": "erd1qqqqqqqqqqqqqpgq4zafu6rzdw7fj07hjh5tkm68jsaj7hl60n4s8py4ra",
-                  "sender": "erd1qqqqqqqqqqqqqpgq4zafu6rzdw7fj07hjh5tkm68jsaj7hl60n4s8py4ra",
-                  "data": "swapTokensFixedInput@5745474c442d613238633539@e8d4a51000",
-                  "prevTxHash": "c6dc718c56c8795156d847f4f9768f2b1976a516d390fdce0f5b8bad1ac3cce5",
-                  "originalTxHash": "c6dc718c56c8795156d847f4f9768f2b1976a516d390fdce0f5b8bad1ac3cce5",
-                  "gasLimit": 99559500,
-                  "gasPrice": 1000000000,
-                  "callType": 0,
-                  "originalSender": "erd1uv40ahysflse896x4ktnh6ecx43u7cmy9wnxnvcyp7deg299a4sq6vaywa",
-                  "operation": "transfer",
-                  "function": "swapTokensFixedInput"
-                },
-                {
-                  "hash": "40078cec63b6e0d0d9522ea5e6d2d0cb6f21ebae981f354de3dc3545ac2928ad",
-                  "nonce": 0,
-                  "value": 0,
-                  "receiver": "erd1uv40ahysflse896x4ktnh6ecx43u7cmy9wnxnvcyp7deg299a4sq6vaywa",
-                  "sender": "erd1qqqqqqqqqqqqqpgq4zafu6rzdw7fj07hjh5tkm68jsaj7hl60n4s8py4ra",
-                  "data": "ESDTTransfer@5745474c442d613238633539@9b35e4dd3902b9",
-                  "prevTxHash": "c6dc718c56c8795156d847f4f9768f2b1976a516d390fdce0f5b8bad1ac3cce5",
-                  "originalTxHash": "c6dc718c56c8795156d847f4f9768f2b1976a516d390fdce0f5b8bad1ac3cce5",
-                  "gasLimit": 0,
-                  "gasPrice": 1000000000,
-                  "callType": 0,
-                  "originalSender": "erd1uv40ahysflse896x4ktnh6ecx43u7cmy9wnxnvcyp7deg299a4sq6vaywa",
-                  "logs": {
-                    "address": "erd1uv40ahysflse896x4ktnh6ecx43u7cmy9wnxnvcyp7deg299a4sq6vaywa",
-                    "events": [
-                      {
-                        "address": "erd1qqqqqqqqqqqqqpgq4zafu6rzdw7fj07hjh5tkm68jsaj7hl60n4s8py4ra",
-                        "identifier": "ESDTTransfer",
-                        "topics": [
-                          "V0VHTEQtYTI4YzU5",
-                          "",
-                          "mzXk3TkCuQ==",
-                          "4yr+3JBP4ZOXRq2XO+s4NWPPY2QrpmmzBA+blCil7WA="
-                        ],
-                        "data": null,
-                        "additionalData": [
-                          "",
-                          "RVNEVFRyYW5zZmVy",
-                          "V0VHTEQtYTI4YzU5",
-                          "mzXk3TkCuQ=="
-                        ]
-                      },
-                      {
-                        "address": "erd1uv40ahysflse896x4ktnh6ecx43u7cmy9wnxnvcyp7deg299a4sq6vaywa",
-                        "identifier": "writeLog",
-                        "topics": [
-                          "AAAAAAAAAAAFAKi6nmhia7yZP9eV6LtvR5Q7L1/6fOs="
-                        ],
-                        "data": "QDZmNmI=",
-                        "additionalData": [
-                          "QDZmNmI="
-                        ]
-                      },
-                      {
-                        "address": "erd1uv40ahysflse896x4ktnh6ecx43u7cmy9wnxnvcyp7deg299a4sq6vaywa",
-                        "identifier": "completedTxEvent",
-                        "topics": [
-                          "xtxxjFbIeVFW2Ef0+XaPKxl2pRbTkP3OD1uLrRrDzOU="
-                        ],
-                        "data": null,
-                        "additionalData": null
-                      }
-                    ]
-                  },
-                  "tokens": [
-                    "WEGLD-a28c59"
-                  ],
-                  "esdtValues": [
-                    "43687878470468281"
-                  ],
-                  "operation": "ESDTTransfer"
-                },
-                {
-                  "hash": "26487a550721b8282ceafe603bb4d53ee93929ffd9ded39b08e7422adb4d8795",
-                  "nonce": 237,
-                  "value": 872320020000000,
-                  "receiver": "erd1uv40ahysflse896x4ktnh6ecx43u7cmy9wnxnvcyp7deg299a4sq6vaywa",
-                  "sender": "erd1qqqqqqqqqqqqqpgq4zafu6rzdw7fj07hjh5tkm68jsaj7hl60n4s8py4ra",
-                  "data": "@6f6b@0000000c5745474c442d6132386335390000000000000000000000079b35e4dd3902b9",
-                  "prevTxHash": "c6dc718c56c8795156d847f4f9768f2b1976a516d390fdce0f5b8bad1ac3cce5",
-                  "originalTxHash": "c6dc718c56c8795156d847f4f9768f2b1976a516d390fdce0f5b8bad1ac3cce5",
-                  "gasLimit": 0,
-                  "gasPrice": 1000000000,
-                  "callType": 0,
-                  "logs": {
-                    "address": "erd1uv40ahysflse896x4ktnh6ecx43u7cmy9wnxnvcyp7deg299a4sq6vaywa",
-                    "events": [
-                      {
-                        "address": "erd1uv40ahysflse896x4ktnh6ecx43u7cmy9wnxnvcyp7deg299a4sq6vaywa",
-                        "identifier": "completedTxEvent",
-                        "topics": [
-                          "xtxxjFbIeVFW2Ef0+XaPKxl2pRbTkP3OD1uLrRrDzOU="
-                        ],
-                        "data": null,
-                        "additionalData": null
-                      }
-                    ]
-                  },
-                  "operation": "transfer",
-                  "isRefund": true
-                },
-                {
-                  "hash": "798ba4333a7cedb62f811d942dedb8c0c09bf9945a0d2ccede2eaed967eba135",
-                  "nonce": 0,
-                  "value": 0,
-                  "receiver": "erd1qqqqqqqqqqqqqpgqw88ux2l44eufvwz2uhvduhq03g8pxc4j0n4s0frzjz",
-                  "sender": "erd1qqqqqqqqqqqqqpgq4zafu6rzdw7fj07hjh5tkm68jsaj7hl60n4s8py4ra",
-                  "data": "ESDTTransfer@55544b2d313464353764@2d79883d2000@6465706f7369745377617046656573",
-                  "prevTxHash": "c6dc718c56c8795156d847f4f9768f2b1976a516d390fdce0f5b8bad1ac3cce5",
-                  "originalTxHash": "c6dc718c56c8795156d847f4f9768f2b1976a516d390fdce0f5b8bad1ac3cce5",
-                  "gasLimit": 0,
-                  "gasPrice": 1000000000,
-                  "callType": 0,
-                  "originalSender": "erd1uv40ahysflse896x4ktnh6ecx43u7cmy9wnxnvcyp7deg299a4sq6vaywa",
-                  "tokens": [
-                    "UTK-14d57d"
-                  ],
-                  "esdtValues": [
-                    "50000000000000"
-                  ],
-                  "operation": "ESDTTransfer",
-                  "function": "depositSwapFees"
-                }
-              ],
-              "logs": {
-                "address": "erd1qqqqqqqqqqqqqpgq4zafu6rzdw7fj07hjh5tkm68jsaj7hl60n4s8py4ra",
-                "events": [
-                  {
-                    "address": "erd1uv40ahysflse896x4ktnh6ecx43u7cmy9wnxnvcyp7deg299a4sq6vaywa",
-                    "identifier": "ESDTTransfer",
-                    "topics": [
-                      "VVRLLTE0ZDU3ZA==",
-                      "",
-                      "iscjBInoAAA=",
-                      "AAAAAAAAAAAFAKi6nmhia7yZP9eV6LtvR5Q7L1/6fOs="
-                    ],
-                    "data": null,
-                    "additionalData": [
-                      "",
-                      "RVNEVFRyYW5zZmVy",
-                      "VVRLLTE0ZDU3ZA==",
-                      "iscjBInoAAA=",
-                      "c3dhcFRva2Vuc0ZpeGVkSW5wdXQ=",
-                      "V0VHTEQtYTI4YzU5",
-                      "6NSlEAA="
-                    ]
-                  },
-                  {
-                    "address": "erd1qqqqqqqqqqqqqpgq4zafu6rzdw7fj07hjh5tkm68jsaj7hl60n4s8py4ra",
-                    "identifier": "ESDTTransfer",
-                    "topics": [
-                      "VVRLLTE0ZDU3ZA==",
-                      "",
-                      "LXmIPSAA",
-                      "AAAAAAAAAAAFAHHPwyv1rniWOErl2N5cD4oOE2KyfOs="
-                    ],
-                    "data": "RXhlY3V0ZU9uRGVzdENvbnRleHQ=",
-                    "additionalData": [
-                      "RXhlY3V0ZU9uRGVzdENvbnRleHQ=",
-                      "RVNEVFRyYW5zZmVy",
-                      "VVRLLTE0ZDU3ZA==",
-                      "LXmIPSAA",
-                      "ZGVwb3NpdFN3YXBGZWVz"
-                    ]
-                  },
-                  {
-                    "address": "erd1qqqqqqqqqqqqqpgqw88ux2l44eufvwz2uhvduhq03g8pxc4j0n4s0frzjz",
-                    "identifier": "depositSwapFees",
-                    "topics": [
-                      "ZGVwb3NpdF9zd2FwX2ZlZXNfZXZlbnQ=",
-                      "AAAAAAAAAAAFAKi6nmhia7yZP9eV6LtvR5Q7L1/6fOs=",
-                      "ug==",
-                      "AAAAClVUSy0xNGQ1N2QAAAAAAAAAAAAAAAYteYg9IAA="
-                    ],
-                    "data": null,
-                    "additionalData": [
-                      ""
-                    ]
-                  },
-                  {
-                    "address": "erd1qqqqqqqqqqqqqpgq4zafu6rzdw7fj07hjh5tkm68jsaj7hl60n4s8py4ra",
-                    "identifier": "ESDTTransfer",
-                    "topics": [
-                      "V0VHTEQtYTI4YzU5",
-                      "",
-                      "mzXk3TkCuQ==",
-                      "4yr+3JBP4ZOXRq2XO+s4NWPPY2QrpmmzBA+blCil7WA="
-                    ],
-                    "data": "RGlyZWN0Q2FsbA==",
-                    "additionalData": [
-                      "RGlyZWN0Q2FsbA==",
-                      "RVNEVFRyYW5zZmVy",
-                      "V0VHTEQtYTI4YzU5",
-                      "mzXk3TkCuQ=="
-                    ]
-                  },
-                  {
-                    "address": "erd1qqqqqqqqqqqqqpgq4zafu6rzdw7fj07hjh5tkm68jsaj7hl60n4s8py4ra",
-                    "identifier": "swapTokensFixedInput",
-                    "topics": [
-                      "c3dhcA==",
-                      "VVRLLTE0ZDU3ZA==",
-                      "V0VHTEQtYTI4YzU5",
-                      "4yr+3JBP4ZOXRq2XO+s4NWPPY2QrpmmzBA+blCil7WA=",
-                      "BVs="
-                    ],
-                    "data": "4yr+3JBP4ZOXRq2XO+s4NWPPY2QrpmmzBA+blCil7WAAAAAKVVRLLTE0ZDU3ZAAAAAiKxyMEiegAAAAAAAxXRUdMRC1hMjhjNTkAAAAHmzXk3TkCuQAAAAcjhvJvwQAAAAAACwGBykedC25GCD5kAAAACgGwxHNBlOj27dQAAAAAADItnAAAAAAAAAVbAAAAAGYrXw4=",
-                    "additionalData": [
-                      "4yr+3JBP4ZOXRq2XO+s4NWPPY2QrpmmzBA+blCil7WAAAAAKVVRLLTE0ZDU3ZAAAAAiKxyMEiegAAAAAAAxXRUdMRC1hMjhjNTkAAAAHmzXk3TkCuQAAAAcjhvJvwQAAAAAACwGBykedC25GCD5kAAAACgGwxHNBlOj27dQAAAAAADItnAAAAAAAAAVbAAAAAGYrXw4="
-                    ]
-                  }
-                ]
-              },
-              "status": "success",
-              "tokens": [
-                "UTK-14d57d"
-              ],
-              "esdtValues": [
-                "10000000000000000000"
-              ],
-              "operation": "ESDTTransfer",
-              "function": "swapTokensFixedInput",
-              "initiallyPaidFee": "1238095000000000",
-              "fee": "365774980000000",
-              "chainID": "D",
-              "version": 1,
-              "options": 0
-            }
-          },
-          "error": "",
-          "code": "successful"
-        }"#;
-
-    let tx_on_network: TransactionOnNetwork = serde_json::from_str::<TransactionInfo>(data)
-        .unwrap()
-        .data
-        .unwrap()
-        .transaction;
-    let tx_response = TxResponse::from_network_tx(tx_on_network);
-    assert_eq!(tx_response.api_scrs.len(), 4usize);
-    assert!(is_out_scr(&tx_response.api_scrs.get(2).unwrap()));
-}
-
-#[test]
-fn test_deployed_address() {
-    let data = r#"
-        {
-  "data": {
-    "transaction": {
-      "type": "normal",
-      "processingTypeOnSource": "SCDeployment",
-      "processingTypeOnDestination": "SCDeployment",
-      "hash": "07a176d1734d1901d396be344f97e1d80f076269e9559f9b2110f6f11c4f74de",
-      "nonce": 427,
-      "round": 2190715,
-      "epoch": 887,
-      "value": "0",
-      "receiver": "erd1qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqq6gq4hu",
-      "sender": "erd1j6kua7p67qnaw3y4sudmk25xsuv4k8ws6pwvax8fd2vtmuc3q33s840l87",
-      "gasPrice": 1000000000,
-      "gasLimit": 600000000,
-      "data": "0061736d010000000198011960027f7f0060017f017f6000006000017f60027f7f017f60037f7f7f0060017f0060047f7f7f7f0060057f7f7f7f7f0060037f7f7f017f60047f7f7f7f017f60027f7e0060017f017e60027f7f017e60057f7f7e7f7f017f60067e7f7f7f7f7f017f60017e006000017e60017e017f60047f7f7e7f0060057e7f7f7f7f017f60047f7f7f7e0060017e017e60047f7e7f7f0060027e7f0002c1072903656e76126d616e616765645369676e616c4572726f72000603656e760e626967496e74536574496e743634000b03656e7609626967496e74416464000503656e760b7369676e616c4572726f72000003656e760a6d4275666665724e6577000303656e760d6d427566666572417070656e64000403656e76096d4275666665724571000403656e760d6d42756666657246696e697368000103656e76226d616e616765644d756c74695472616e73666572455344544e465445786563757465000e03656e761b6d616e61676564457865637574654f6e44657374436f6e74657874000f03656e760d6d616e6167656443616c6c6572000603656e76106d616e61676564534341646472657373000603656e76136d616e616765644f776e657241646472657373000603656e761c6d616e616765644765744d756c74694553445443616c6c56616c7565000603656e76126d427566666572476574417267756d656e74000403656e76126d427566666572417070656e644279746573000903656e7619626967496e74476574556e7369676e6564417267756d656e74000003656e761b736d616c6c496e74476574556e7369676e6564417267756d656e74000c03656e76106d4275666665724765744c656e677468000103656e760f6765744e756d417267756d656e7473000303656e7616736d616c6c496e7446696e697368556e7369676e6564001003656e7609626967496e74537562000503656e760a6765744761734c656674001103656e760f636c65616e52657475726e44617461000203656e760f6d4275666665725365744279746573000903656e7609626967496e74436d70000403656e760a626967496e7454446976000503656e7609626967496e744d756c000503656e76196d42756666657246726f6d426967496e74556e7369676e6564000403656e76176d427566666572546f426967496e74556e7369676e6564000403656e7609626967496e74506f77000503656e76146d427566666572436f707942797465536c696365000a03656e76126d42756666657253746f726167654c6f6164000403656e76136d42756666657253746f7261676553746f7265000403656e760e636865636b4e6f5061796d656e74000203656e76176d616e616765644765744261636b5472616e7366657273000003656e760f6d616e6167656457726974654c6f67000003656e7614626967496e7446696e697368556e7369676e6564000603656e760666696e697368000003656e760a626967496e745369676e000103656e76136d42756666657247657442797465536c696365000a03d301d1010103080201120104000107060606000401090100010000000013030014030303020301070400030901090909000707010006060106060c0501080500010b00080715070808000a0016010106010000000500000103000601001705050a070400040a00040404000404040404010100040d070707080a000501010505060101000b0b0101010101050d0105000000050500000000000c070707070000081803030300030300010407030303030101030303030202020202020202020202020202020202020202020202020202020202080805030100030616037f01418080080b7f0041e9db080b7f0041f0db080b07c70520066d656d6f7279020004696e697400db01077570677261646500dc01076465706f73697400dd0108776974686472617700de0108636f6d706f756e6400df010e676574546f74616c41737365747300e0010f6765745661756c744164647265737300e101176765744173736574546f6b656e4964656e74696669657200e2011d6765744d6f6e65794d61726b6574546f6b656e4964656e74696669657200e301226765744d6f6e65794d61726b6574556e6465726c79696e674964656e74696669657200e4011f676574426f6f737465725374616b6564546f6b656e4964656e74696669657200e50114676574436f6e74726f6c6c65724164647265737300e601156765744d6f6e65794d61726b65744164647265737300e7011d6765745772617070656445676c64436f6e74726163744164647265737300e8011d6765745772617070656445676c64546f6b656e4964656e74696669657200e90111676574426f6f737465724164647265737300ea0119676574436f6d706f756e645845786368616e6765537761707300eb0117676574436f6d706f756e6441736873776170537761707300ec0116676574436f6d706f756e644665657350657263656e7400ed0119676574506572666f726d616e63654665657350657263656e7400ee010e7374616b65496e426f6f7374657200ef011b726562616c616e6365506f7274666f6c696f496e426f6f7374657200f00112756e7374616b6546726f6d426f6f7374657200f10118636c61696d4d756c7469706c6546726f6d426f6f7374657200f20119736574506572666f726d616e63654665657350657263656e7400f30116736574436f6d706f756e644665657350657263656e7400f40110736574436f6d706f756e64537761707300f5010d6765744e61747572616c41505900f6010863616c6c4261636b00f7010a5f5f646174615f656e6403010b5f5f686561705f6261736503020a9aa901d1011601017f102a220142001001200120012000100220010b1901017f41c88d0841c88d0828020041016b220036020020000b2e000240200120024d0440200220044d0d01102c000b102c000b2000200220016b3602042000200120036a3602000b0b0041b88d08410e1003000b1301017f102a22012000ad42ff0183100120010b2101017f102a21012000420053044041b2850841111003000b20012000100120010b0f01017f10042201200010051a20010b0b0020002001100641004a0b2d01017f230041206b2202240020022000103241c08008410810332002200136021820021034200241206a24000b1900200041feffffff0746044041c8800841191003000b20000b2a0020022003104d2102104321032000427f3703082000200336020420002002360200200020013602100b7d01037f230041106b22012400200029030810712000280210200028021820002802002000280204104521021017410021002002101221032001410036020c200120023602042001200341027622023602080340200020024f450440200141046a10751a20012802082102200128020c21000c010b0b200141106a24000b3601027f230041106b22012400200141086a103620012802082102200020012d000c4101713a000420002002360200200141106a24000b6d01027f230041106b220124002000027f41e0db082d0000220245044041e0db0841013a000041dcdb084100360200200141086a4100109f012001280208200128020c41b88d084100105710430c010b41b88d084100104d0b360200200020024101733a0004200141106a24000b0b0020002001103810071a0b4901017f230041106b22022400200220013a000c20022000360208200241086a10a501200228020820022d000c044041dcdb08410036020041e0db0841003a00000b200241106a24000b0e002000418a8508410b103a103b0b130020002000200120021052200120021085010b0d002000102a2200101d1a20000b0a002000103d2001103e0b0f01017f102a22012000101c1a20010b5101027f230041106b22022400200220001012220341187420034180fe03714108747220034108764180fe03712003411876727236020c20012002410c6a410410a3012001200010bd01200241106a24000b0a002000103d200110400b5101027f230041106b22022400200220001012220341187420034180fe03714108747220034108764180fe03712003411876727236020c20012002410c6a4104100f1a20012000108b01200241106a24000b0900200020011003000b5001047f1043210610432107230041106b22042400104321052001102f210120042003102936020c20042002370300200420013602082005200410442000200542002006200710081a200441106a24000b1301017f102a220041b88d08410010181a20000bd20102027f017e230041106b2203240020032001280208220241187420024180fe03714108747220024108764180fe0371200241187672723602002003200128020c220241187420024180fe03714108747220024108764180fe03712002411876727236020c20032001290300220442388620044280fe0383422886842004428080fc0783421886200442808080f80f834208868484200442088842808080f80f832004421888428080fc07838420044228884280fe03832004423888848484370204200020034110100f1a200341106a24000b150020002001200220032004102a220110091a20010b0c01017f102a2200100a20000b0c01017f102a2200100b20000b0c01017f102a2200100c20000b150010481046103004400f0b41928d0841241003000b2b01017f41e8db082d000022000440416b41ffffffff0720001b0f0b41e8db0841013a0000416b100d416b0b0d002000102a2200100e1a20000b2e01017f41d583084117104d220420002001100f1a200441ec83084103100f1a200420022003100f1a20041000000b1101017f102a22022000200110181a20020b4601017f230041106b220224002002200141187420014180fe03714108747220014108764180fe03712001411876727236020c20002002410c6a4104100f1a200241106a24000b0e01017f4100102a2200101020000b1f002000104b2200101241204704402001200241b086084110104c000b20000bd90301097f230041406a220124002000104b210210432106200210122100200141246a41003a0000200141206a20003602002001200236021c200120003602182001410036021441002102037f2000200246047f20012d0024044041dcdb08410036020041e0db0841003a00000b200141406b2400200605200141146a2200419787084116103a210420004197870841161052210010432103034020000440200141146a2205419787084116105221072005419787084116105321082005419787084116103a2109410021020240024002402005419787084116105441ff01710e020201000b41978708411641ed8608410d104c000b410121020b200120023a0034200120093602302001200836022c200120073602282003200141286a1055200041016b21000c010b0b200142003703282001200441187420044180fe03714108747220044108764180fe03712004411876727236023c200141086a200141286a22004100410410562001280208200128020c2001413c6a2202410410572001200341187420034180fe03714108747220034108764180fe03712003411876727236023c2001200041044108105620012802002001280204200241041057200620004108100f1a20012802142102200128021821000c010b0b0b3702017f017e230041106b220324002003410036020c20002003410c6a220041042001200210c5012000410410b101200341106a2400a70b0d0020004120200120021085010b3001017f230041106b22032400200341003a000f20002003410f6a41012001200210c50120032d000f200341106a24000bf60201057f230041d0006b22022400200242003700352002420037033020022001280200220341187420034180fe03714108747220034108764180fe037120034118767272360240200241286a200241306a220541004104109b012002280228200228022c200241406b220441041057200241c8006a41003a00002002420037034020022001280204220341187420034180fe03714108747220034108764180fe03712003411876727236024c200241206a200441004104109c0120022802202002280224200241cc006a2206410410572002200141086a280200220341187420034180fe03714108747220034108764180fe03712003411876727236024c200241186a200441044108109c012002280218200228021c20064104105720022001410c6a2d00003a004c200241106a200441084109109c0120022802102002280214200641011057200241086a20054104410d109b012002280208200228020c20044109105720002005410d100f1a200241d0006a24000b0f002000200120022003410810f9010bb50201067f200120034604402001220341104f04402000410020006b41037122046a210520040440200221010340200020012d00003a0000200141016a2101200041016a22002005490d000b0b2005200320046b2203417c7122066a21000240200220046a22044103710440200641004c0d012004410374220141187121072004417c71220841046a2102410020016b4118712109200828020021010340200520012007762002280200220120097472360200200241046a2102200541046a22052000490d000b0c010b200641004c0d0020042102034020052002280200360200200241046a2102200541046a22052000490d000b0b20034103712103200420066a21020b20030440200020036a21010340200020022d00003a0000200241016a2102200041016a22002001490d000b0b0f0b102c000ba20301077f230041406a220124002000104b2102104321052002101221002001412c6a41003a0000200141286a200036020020012002360224200120003602202001410036021c41002102037f2000200246047f20012d002c044041dcdb08410036020041e0db0841003a00000b200141406b24002005052001411c6a220041ad87084118103a2103200041ad8708411810522100104321020340200004402001411c6a220441ad8708411810522106200441ad8708411810532107200441ad87084118103a21042001200636023820012004360234200120073602302002200141306a1059200041016b21000c010b0b200142003703302001200341187420034180fe03714108747220034108764180fe03712003411876727236023c200141106a200141306a2200410041041056200128021020012802142001413c6a2203410410572001200241187420024180fe03714108747220024108764180fe03712002411876727236023c200141086a20004104410810562001280208200128020c200341041057200520004108100f1a200128021c2102200128022021000c010b0b0bb80201047f230041406a22022400200241286a41003602002002420037032020022001280208220341187420034180fe03714108747220034108764180fe037120034118767272360230200241186a200241206a220541004104109a012002280218200228021c200241306a2204410410572002420037033020022001280200220341187420034180fe03714108747220034108764180fe03712003411876727236023c200241106a2004410041041056200228021020022802142002413c6a22034104105720022001280204220141187420014180fe03714108747220014108764180fe03712001411876727236023c200241086a20044104410810562002280208200228020c200341041057200220054104410c109a012002280200200228020420044108105720002005410c100f1a200241406b24000b1400101320004604400f0b4192840841191003000b09002000105c10071a0b1d00200010a70122001012412047044041b086084110108801000b20000b0a00200010a70110071a0b08002000105f10140b6102027f017e230041106b2201240020014200370308200010a70122001012220241094f044041958508410e108801000b2001200141086a200210b001200041002001280200220020012802042202108a011a2000200210b101200141106a24000b1f0020002001200210152000106141ff017104400f0b41ab840841301003000b1500410241012000102722001b4100200041004e1b0bf80101047f230041d0006b2205240020052004360228200541206a41db840841141063200528022021072005280224220620031064200410652103104322082003ad106620062008104e200520041012360234200541003602302005200541286a36022c0340200541386a2005412c6a10672005290338500440200520072006200120021068200528020421012000200528020036020020002001360204200541d0006a240005200528024c2103200541186a2007200620052802481069200541106a2005280218200528021c2005290340106a200541086a200528021020052802142003106b200528020c2106200528020821070c010b0b0b180020012002104d210120001043360204200020013602000b100010431a20002001280200102f104e0b0900200010124104760b3801017f230041106b2202240020024200370308200220014100200241086a10820120002002280200200228020410181a200241106a24000ba70102057f017e230041206b2202240020002001280204220441106a220520012802084d047e2001280200200241106a4200370300200242003703082802002004200241086a22034110106f1a2002410036021c20032002411c6a22061098012104200320061099012107200041146a200241086a2002411c6a109801360200200041106a2004360200200020073703082001200536020442010542000b370300200241206a24000b910101037f230041106b22052400024020031012450d0020022003106e200410122106410021030340200341046a220720064b0d012005410036020c200420032005410c6a4104106f1a2002200528020c220341187420034180fe03714108747220034108764180fe037120034118767272106e200721030c000b000b2000200236020420002001360200200541106a24000b160020022003106e20002002360204200020013602000b2001017f104322042003106620022004104e20002002360204200020013602000b160020032002107020002002360204200020013602000ba30101027f230041306b22052400200541286a41ef8408410f1063200541206a2005280228200528022c20042802081069200541186a200528022020052802242004290300106a200541106a2005280218200528021c200428020c106b200528021021042005280214210610431a20062003102f104e200541086a20042006200120021068200528020c21012000200528020836020020002001360204200541306a24000b7101017f230041206b22052400200541186a41fe8408410c1063200541106a2005280218200528021c20031069200541086a200528021020052802142004106b20052005280208200528020c200120021068200528020421012000200528020036020020002001360204200541206a24000b0d0010431a20002001102f104e0b0d002000200120022003108a010b0d0010431a20012000103d104e0b0f002000427f51047e10160520000b0b3001017e20002903082201427f51047e10160520010b20002802102000280218200028020020002802041045101710730b3b01027f230041106b220124002000101221022001410036020c2001200036020420012002410276360208200141046a1075103b200141106a24000b24002000290308107120002802102000280218200028020020002802041045101710121a0b7d01037f230041106b22012400200028020821032001410036020c200028020020034102742001410c6a4104106f450440200128020c21022000200341016a360208200241187420024180fe03714108747220024108764180fe037120024118767272102f200141106a24000f0b418a8508410b41ef83084111104c000b900202027f017e230041d0006b2202240020012903082204427f51047e10160520040b2001280210200128021820012802002001280204104521011017200110122103200241003602142002200136020c200220034102763602102002410c6a10752203101221012002413c6a41003a0000200241386a200136020020022003360234200220013602302002410036022c200241406b2002412c6a10772002280230200228022c460440200241206a2201200241c8006a2903003703002002200229034037031820022d003c044041dcdb08410036020041e0db0841003a00000b20002002290318370300200041086a2001290300370300200241d0006a24000f0b418a8508410b41958508410e104c000b3002017f017e2001418a8508410b103a2102200110be01210320002001103936020c20002002360208200020033703000b100010431a20002001280200103d104e0b0e0020014504402002200010700b0b810101057f230041106b220324001043102f210420012802001012210503402005200241046a22064f04402003410036020c200128020020022003410c6a4104106f1a200328020c220241187420024180fe03714108747220024108764180fe0371200241187672722004103f200621020c010b0b20002004104e200341106a24000b820101057f230041106b220324001043102f210420012802001012210503402005200241046a22064f04402003410036020c200128020020022003410c6a4104106f1a2004200328020c220241187420024180fe03714108747220024108764180fe03712002411876727210051a200621020c010b0b20002004104e200341106a24000b4d01027f230041206b22012400107d2102200141106a200041106a290300370300200141086a200041086a290300370300200120023602182001200029030037030020011072200141206a24000b0e01017f102a22004200100120000b4f01027f230041206b22022400107d2103200241106a200141106a290300370300200241086a200141086a2903003703002002200336021820022001290300370300200020021076200241206a24000b4d01027f230041206b22012400107d2102200141106a200041106a290300370300200141086a200041086a290300370300200120023602182001200029030037030020011034200141206a24000b7602057f017e230041106b22012400107d210220002802102103200028020421042000280200210520002903082206427f51047e10160520060b20032002200520041045210010172000101221022001410036020c2001200036020420012002410276360208200141046a1075102f200141106a24000b4701027f230041106b22022400104321032002420037030820022001ad42ff01834101200241086a10820120032002280200200228020410181a20002003104e200241106a24000b8f0202047f017e2003200142388620014280fe0383422886842001428080fc0783421886200142808080f80f834208868484200142088842808080f80f832001421888428080fc0783842001423888220820014228884280fe03838484843700000240200150044041b88d0821030c010b200204402001427f510440200341076a2103410121040c020b2008a7c022054107752106200541004821050b200641ff0171210603400240024020044108470440200320046a2d000022072006460d02200245200741077620054672450440200441016b220441094f0d020b200320046a2103410820046b21040c040b102c000b102c000b200441016a21040c000b000b20002004360204200020033602000ba30102037f017e230041106b22032400027f2002290300500440200128021021042003200128020020012802042002280208200228020c106d2003280200210520032802040c010b10472104200341086a2001280200200128020420012802102002106c20032802082105200328020c0b2102200129030821062000107d36021820002004360210200020063703082000200236020420002005360200200341106a24000b3f01017f1043210320002001290300370300200041106a200141106a290300370300200041086a200141086a290300370300200320021044200020033602180b5201027f230041106b22042400200441086a200028020820002802002205200110860120042802084101460440200428020c2000200120056a360200200441106a24000f0b2002200341a38508410f104c000b1f0020012002200310042201101f21022000200136020420002002453602000b4f01037f230041106b22022400200241086a200028020820002802002203200110860120022802084101460440200228020c2000200120036a360200200241106a24000f0b41a38508410f108801000b1a01017f41f185084116104d220220002001100f1a20021000000b1500417f200020011019220041004720004100481b0b0f00200020012003200210284100470b09002000200110051a0b0c00200020002001100220000b0c00200020002001101a20000b0c00200020002001101b20000b0a0020002000200110020b0c00200020002001106020000b1001017f102a220220002001100220020b1001017f102a220220002001101b20020b1001017f102a220220002001106020020b1901017f102a210241722001ad1001200220004172101e20020b0e01017f104322012000104420010b4c01027f230041106b22012400104321022001200041187420004180fe03714108747220004108764180fe03712000411876727236020c20022001410c6a4104100f1a200141106a240020020b840102047f017e230041206b22022400200241106a42003703002002420037030820014100200241086a22034110106f2002410036021c20032002411c6a22041098012105200320041099012106200241086a2002411c6a1098012103044041c38508411d1003000b2000200336020c2000200536020820002006370300200241206a24000b7401017f230041106b220224002002410036020c20022000411020012802002200200041046a2200109d012002410c6a410420022802002002280204105720012000360200200228020c2100200241106a2400200041187420004180fe03714108747220004108764180fe0371200041187672720ba80102017e017f230041106b220324002003420037030820032000411020012802002200200041086a2200109d01200341086a41082003280200200328020410572001200036020020032903082102200341106a2400200242388620024280fe0383422886842002428080fc0783421886200242808080f80f834208868484200242088842808080f80f832002421888428080fc07838420024228884280fe038320024238888484840b0f002000200120022003410c10f9010b0f002000200120022003410d10f9010b0f002000200120022003410910f9010b2f000240200320044d044020022004490d012000200420036b3602042000200120036a3602000f0b102c000b102c000bb40101037f230041106b22042400027f024020002d000845044020002802002205101222064190ce004b0d0141e0db082d00000d0141dcdb08200636020041e0db0841013a0000200441086a2006109f01200541002004280208200428020c106f1a200041013a00080b4101200120036a220041dcdb082802004b0d011a20042001200010a0012002200320042802002004280204105741000c010b200041003a00082005200120022003106f0b200441106a24000b3e01017f230041106b22022400200241086a41cc8d084190ce00200110d001200228020c21012000200228020836020020002001360204200241106a24000b32000240200120024d044020024190ce004d0d01102c000b102c000b2000200220016b3602042000200141cc8d086a3602000b1900200041feffffff0746044041e08508410d1003000b20000b4d01017f230041106b220124002000101241044604402001410036020c200041002001410c6a4104108a011a41feffffff072000200128020c41c58eb1a204461b21000b200141106a240020000b800101027f230041106b220324000240024020002d000404404190ce0041dcdb0828020022046b2002490d01200341086a2004200220046a220010a4012003280208200328020c20012002105741dcdb0820003602000c020b200028020020012002100f1a0c010b200010a501200028020020012002100f1a0b200341106a24000b3f01017f230041106b22032400200341086a2001200241cc8d084190ce00102b200328020c21012000200328020836020020002001360204200341106a24000b5801027f230041106b2201240020002d0004200041003a00040440200141086a410041dcdb0828020010a00120002802002001280208200128020c100f1a41dcdb08410036020041e0db0841003a00000b200141106a24000b0d002000416710201a416710120b0d002000102a220010201a20000b1200200010a6014504402000200110211a0b0b1200200010a6014504402000200110aa010b0b3801017f230041106b2202240020024200370308200220014100200241086a10820120002002280200200228020410b801200241106a24000b0a00200010a70110a2010bb90101047f230041206b22012400200010a701210210432104200210122100200141106a41003a00002001410c6a2000360200200120023602082001200036020420014100360200037f2000200346047f20012d0010044041dcdb08410036020041e0db0841003a00000b200141206a2400200405200110ad012100200110ae012102200110af0121032001200036021c20012003360218200120023602142004200141146a105920012802002103200128020421000c010b0b0b3302017f017e230041106b220124002001410036020c20002001410c6a2200410410b3012000410410b101200141106a2400a70b0900200041201087010b0c002000200010ad011087010b3a01017f230041106b22032400200341086a20014108200210d001200328020c21012000200328020836020020002001360204200341106a24000b3401017e02402001450d0003402001450d01200141016b210120003100002002420886842102200041016a21000c000b000b20020bfd0101067f230041306b22012400200010a701210210432104200210122100200141186a41003a0000200141146a2000360200200120023602102001200036020c20014100360208037f2000200346047f20012d0018044041dcdb08410036020041e0db0841003a00000b200141306a2400200405200141086a220210ad012103200210ae012105200210af01210641002100200141003a002f20022001412f6a410110b30102400240024020012d002f0e020201000b41ed8608410d108801000b410121000b200120003a002820012006360224200120053602202001200336021c20042001411c6a105520012802082103200128020c21000c010b0b0b2d00200041086a200028020020012002109e01044041a38508410f108801000b2000200028020020026a3602000b870101017f230041306b220224002002200136020820021035200220022d00043a00102002200228020036020c20022001101236021c200241003602182002200241086a3602140340200241206a200241146a10b50120022d002c410246450440200241206a2002410c6a10b6010c010b0b2000200228020c20022d001010b701200241306a24000bc50301077f230041d0006b22022400024020012802042204410d6a220820012802084d0440200128020020024200370035200242003703302802002004200241306a2203410d106f1a20024100360240200241286a20034100410410bf01200241406b220541042002280228200228022c105720022802402104200241c8006a41003a000020024200370340200241206a20034104410d10bf01200541092002280220200228022410572002410036024c200241186a20054100410410c001200241cc006a220741042002280218200228021c1057200228024c21032002410036024c200241106a20054104410810c00120074104200228021020022802141057200228024c2106200241003a004c200241086a20054108410910c001200741012002280208200228020c1057200020022d004c4100473a000c2000200641187420064180fe03714108747220064108764180fe0371200641187672723602082000200341187420034180fe03714108747220034108764180fe0371200341187672723602042000200441187420044180fe03714108747220044108764180fe037120044118767272360200200120083602040c010b200041023a000c0b200241d0006a24000b4d01017f230041106b220224002000280200200110bc012001200028020410bd01200041086a2802002001103e20022000410c6a2d00003a000f20012002410f6a410110a301200241106a24000b0d00200020012002103810211a0b0d00200020012002104d10211a0b870101017f230041306b220224002002200136020820021035200220022d00043a00102002200228020036020c20022001101236021c200241003602182002200241086a360214200241246a21010340200241206a200241146a10ba012002280220044020012002410c6a10bb010c010b0b2000200228020c20022d001010b701200241306a24000b890301067f230041406a22022400200020012802042203410c6a220620012802084d047f2001280200200241286a4100360200200242003703202802002003200241206a2203410c106f1a20024100360230200241186a20034100410410c101200241306a220541042002280218200228021c10572002280230210420024200370330200241106a20034104410c10c101200541082002280210200228021410572002410036023c200241086a20054100410410c2012002413c6a220741042002280208200228020c1057200228023c21032002410036023c200220054104410810c20120074104200228020020022802041057200228023c21052000410c6a200441187420044180fe03714108747220044108764180fe0371200441187672723602002000200341187420034180fe03714108747220034108764180fe03712003411876727236020420012006360204200041086a200541187420054180fe03714108747220054108764180fe03712005411876727236020041010541000b360200200241406b24000b1f002000280208200110bc012001200028020010bd0120002802042001103e0b4601017f230041106b220224002002200041187420004180fe03714108747220004108764180fe03712000411876727236020c20012002410c6a410410a301200241106a24000b810101037f230041106b220224000240024020002d000404402001101222044190ce0041dcdb0828020022036b4b0d01200241086a2003200320046a220010a401200141002002280208200228020c106f1a41dcdb0820003602000c020b20002802002001108b010c010b200010a50120002802002001108b010b200241106a24000b3802017f017e230041106b22012400200142003703082000200141086a22004108418a8508410b10c5012000410810b101200141106a24000b0f002000200120022003410d10f8010b0f002000200120022003410910f8010b0f002000200120022003410c10f8010b0f002000200120022003410810f8010b800201057f230041206b2202240020002001280204220341086a220520012802084d047f2001280200200242003703102802002003200241106a22034108106f1a2002410036021c200241086a20034100410410c2012002411c6a220641042002280208200228020c1057200228021c21042002410036021c200220034104410810c20120064104200228020020022802041057200228021c21032000200441187420044180fe03714108747220044108764180fe03712004411876727236020420012005360204200041086a200341187420034180fe03714108747220034108764180fe03712003411876727236020041010541000b360200200241206a24000b8a0101047f230041106b220324002001280204220241046a220420012802084b047f41000520012802002003410036020c28020020022003410c6a4104106f1a200328020c210220012004360204200241187420024180fe03714108747220024108764180fe037120024118767272210241010b21012000200236020420002001360200200341106a24000b3000200041086a200028020020012002109e0104402003200441a38508410f104c000b2000200028020020026a3602000b7801017f230041106b220224002002200042388620004280fe0383422886842000428080fc0783421886200042808080f80f834208868484200042088842808080f80f832000421888428080fc07838420004228884280fe038320004238888484843703082001200241086a410810a301200241106a24000bd60101067f230041406a2200240010c801105c2101200010c901105c3602082000104736020c200041286a22022001103241f7800841101033200028022c2201200041086a106420012000410c6a1064200041206a2201200041386a2203290300370300200041186a2204200041306a2205290300370300200020002903283703102000200041106a107c360204200210c901105c103241f5810841181033200028022c200041046a1078200120032903003703002004200529030037030020002000290328370310200041106a107c200041406b24000b0a00419588084112104d0b0a00418188084114104d0ba90302057f017e23004180016b2202240010cb0110ab012103200128020c210420012903002107200128020821010240200341feffffff07460440200141feffffff07460d01200110a101210120022004360214200220073703082002200136021010cc01105c2103200410292104200241e0006a22012003103241a18008410a1033200241406b22032001200241086a1084012001200310cd01200110344200210741feffffff0721010b200241e0006a2000103241c081084112103320022802641a200241286a2200200241f0006a2205290300370300200241206a2203200241e8006a2206290300370300200220022903603703180240200141feffffff074704402005200029030037030020062003290300370300200220022903183703602002107d360278200110a10121002002200436023c2002200737033020022000360238200241406b200241e0006a200241306a1083010c010b200241d0006a2000290300370300200241c8006a200329030037030020022002290318370340200220043602580b200241e0006a200241406b107620024180016a24000f0b41ca8808411f1041000b0a0041e88c084122104d0b0a0041fa8608411d104d0bff0202037f027e230041d0006b22022400200241306a2204200141106a290300370300200241286a2203200141086a290300370300200220012903003703202002107d36023802400240024002402001280218220110650e020102000b10472103200241086a2002280220200228022420042001106220022903082105200229032821062000107d3602182000200336021020002006370308200020053703000c020b20002002290320370300200041186a200241386a290300370300200041106a2004290300370300200041086a20032903003703000c010b200241406b2001109701027f200229034050044020022802302101200241106a200228022020022802242002280248200228024c106d2002280210210320022802140c010b10472101200241186a200228022020022802242002280230200241406b106c20022802182103200228021c0b2104200229032821052000107d360218200020013602102000200537030820002004360204200020033602000b200241d0006a24000b0d002000106141ff017141014b0b17002000280200200128020010890141ff017141ff01460b3b01017f230041106b22042400200441086a4100200320012002102b200428020c21012000200428020836020020002001360204200441106a24000b0a0041bd8808410d104d0b0a0041f28708410f104d0b0a0041dd87084115104d0b0a0041a788084116104d0b1901017f419787084116104d210120002802002001104020010b1901017f41ad87084118104d210120002802002001104020010b0a0041c587084118104d0b0a00418f8c08411d104d0b0a0041ac8c08411d104d0b0a0041c98c08411f104d0ba705020d7f027e230041406a220024001022410a105a410041bd8808410d105021094101104b210241024195880841121050210a410341818808411410502105410441f28708410f1050210641051011210d41061011210e410710582107410810512108410941fa8608411d10502104200020083602102000200736020c2005102f1032210141e68108410f104d21031043210b107d210c10162001200c2003200b10452101101720011012210320004100360230200020013602282000200341027636022c200041286a22031075102f10a201210120032004102f102f103241ab8008411510332003108001210302400240200141feffffff074704402001102f10a101200210300d0141e9880841d1001041000b200220031030450d010b10cc01200410a80110d901200310a801024010cb01220410a6010d00200141feffffff074704402004200110211a0c010b200441ed8508410410b8010b10d101200910a80110d401200210a80110c801200a10a80110c9012005102f10a80110d801200041286a22012005103241b68108410a1033200110800110a80110d2012006102f10a80110da0120012006103241868308410f1033200110800110a80120002007101236021c2000410036021820002000410c6a36021403400240200041286a200041146a10c301200028022845044020002008101236021c200041003602182000200041106a3602140340200041286a200041146a10c3012000280228450d022000200028023022013602242000200028022c360220200041206a10d501220210a6010d002002200110b4010c000b000b2000200028023022013602242000200028022c360220200041206a10d601220210a6010d012002200110b9010c010b0b10d301200d10a90110d701200e10a901200041406b24000f0b41ba890841c8001041000b080010224100105a0bc70101057f230041306b220024004100105a02400240104610d101105c10300440104610d101105c1030450d012000104a220136020810d40110a701210210c901105c2103200020011012360214200041003602102000200041086a36020c200041206a210103400240200041186a2000410c6a10672000290318500d00200028022c200028022820021030450d0410ce01450d042003102f200110ca010c010b0b200041306a24000f0b41828a0841161041000b41828a0841161041000b41988a08410d1041000bc70702097f017e23004180016b2200240010224101105a2000104f36022c10d101105c210102400240024010462207200110300440200010c901105c2201360234200041e0006a22022001102f1032418d82084118103320002802642000412c6a1078200041d8006a2201200041f0006a2206290300370300200041d0006a2203200041e8006a220429030037030020002000290360370348200041c8006a2205107c2108200210c801105c103241e18008410a103320002802642202200041346a10642002410020081079200120062903003703002003200429030037030020002000290360370348200041386a2005107e200028024410ce01450d0120002802341032210141a582084106104d21041043220341012000107910432202200041386a1044200020013602702000427f37036820002003360264200020043602602000107d22053602780240024002400240200210650e020200010b200041c8006a2002109701027f2000290348500440200041186a2004200320002802502000280254106d20002802182104200028021c0c010b1047200041206a200420032001200041c8006a106c20002802202104210120002802240b2103107d21050c010b10472101200041106a20042003200620021062200029036821092000280214210320002802102104107d21052009427f520d010b101621090b2009200120052004200310452101101720011012210220004100360250200020013602482000200241027636024c200041c8006a1075220210122101200041f0006a41003a0000200041ec006a2001360200200020023602682000200136026420004100360260200041e0006a2201418a8508410b103a10a2012102200110be01210920011039210120002802642000280260470d0220002d0070044041dcdb08410036020041e0db0841003a00000b0240200241feffffff07470440200210a10121030c010b10d90110a701210310cc01105c200110291031420021090b200110ce01450d03200720032009200110422000200136026c20002003360268200020093703602000200041e0006a1095012201360230200041086a1035200020002d000c3a003c200020002802083602382000200110123602502000410036024c2000200041306a3602480340200041e0006a200041c8006a106720002903605045044020002802742000280270200041386a2201103e2000290368200110c6012001103c0c010b0b200028023820002d003c103720004180016a24000f0b41828a0841161041000b41e78a08411f1041000b418a8508410b41958508410e104c000b41868b08411a1041000bf31d02167f027e230041a0026b2200240010224100105a10c801105c2101200010c901105c2214102f1096013602f001200010433602a00120004180026a22092001103241eb8008410c10332000280284022201410010810120014101108101200141001081012001200041f0016a2211107b2001200041a0016a2207107b200041e0016a220520004190026a2204290300370300200041d8016a220220004188026a220329030037030020002000290380023703d001200041d0016a2206107f10d201105c210120002014102f1096013602f001200010433602a00120092001103241eb8008410c10332000280284022201410010810120012011107b20012007107b2001410120001079200520042903003703002002200329030037030020002000290380023703d0012006107f102a2203102a22061023200610ce01044010cc01105c20061029103110d90110a70121012000200636028c0220004200370380022000200136028802200320004180026a10440b200020033602900102400240024020031065044010d40110a701210e107d210d2000200028029001101236029c012000410036029801200020004190016a3602940120004190026a210a200041c0016a210f200041a8016a21150340200041a0016a20004194016a106720002903a00150044042808090bbbad6adf00d102e2101200d10d301105f102e1092012001108d012205200d10d701105f102e1092012001108d012206109101200d10890141ff01714102490d05200d200510930120061090012102200e102f210120002002102936028c0220004200370380022000200136028802201420004180026a10ca01200e102f2101200510ce010440104620014200200510420b200610ce0104401048200e4200200610420b104321041043102f2106200141feffffff07460d032001200610400c040b200f201541086a290300370300200020152903003703b801200f10d60110ac012112200f10d50110b2012113200f280200210c20002802c401210420002903b801211620121012210120131012410d6e2001410c6e6a21114100210103400240024020012011470440200141016a2106410021022012101221050240024003402002410c6a220320054b0d0120004188026a2209410036020020004200370380022012200220004180026a2202410c108a011a200041003602d00120004188016a20024100410410c101200041d0016a22074104200028028801200028028c01105720002802d0012108200042003703d00120004180016a20024104410c10c101200741082000280280012000280284011057200041003602f001200041f8006a20074100410410c201200041f0016a220241042000280278200028027c105720002802f001210b200041003602f001200041f0006a20074104410810c2012002410420002802702000280274105720032102200841187420084180fe03714108747220084108764180fe0371200841187672722001470d000b20002802f0012103200b411874200b4180fe037141087472200b4108764180fe0371200b4118767272102f2101200341187420034180fe03714108747220034108764180fe0371200341187672722207102f21054101102d20004180026a22032001103241d986084114103320002802840222012005106e20011070200041e0016a2202200a290300370300200041d8016a2201200929030037030020002000290380023703d001104321052000200436028c022000200c360288022000201637038002200520031044200a200229030037030020092001290300370300200020002903d001370380022000107d360298020240024002400240200510650e020102000b10472101200041e8006a200028028002200028028402200a200510622000290368211720002903880221162000107d3602e801200020013602e001200020163703d801200020173703d0010c020b200041e8016a20004198026a2903003703002002200a2903003703002001200929030037030020002000290380023703d0010c010b200041f0016a22012005109701200041d0016a20004180026a20011083010b20004180026a200041d0016a1076200028028802220c20071030450d01200028028c0221042000290380022116200621010c050b4100210220131012210503402002410d6a220320054b0d03200042003700850220004200370380022013200220004180026a2202410d108a011a200041003602d001200041e0006a20024100410410bf01200041d0016a2208410420002802602000280264105720002802d0012109200041d8016a220b41003a0000200042003703d001200041d8006a20024104410d10bf01200841092000280258200028025c1057200041003602f001200041d0006a20084100410410c001200041f0016a2202410420002802502000280254105720002802f0012110200041003602f001200041c8006a20084104410810c001200241042000280248200028024c105720002802f0012107200041003a00f001200041406b20084108410910c0012002410120002802402000280244105720032102200941187420094180fe03714108747220094108764180fe0371200941187672722001470d000b20002d00f001200741187420074180fe03714108747220074108764180fe0371200741187672722108200c102f2109200410292107201041187420104180fe03714108747220104108764180fe037120104118767272102f21054504404101102d20004180026a22012005103241a88608410810332000280284021070200041e0016a2202200a290300370300200b20004188026a220329030037030020002000290380023703d001104321042000200736028c0220002009360288022000201637038002200420011044200a20022903003703002003200b290300370300200020002903d001370380022000107d360298020240024002400240200410650e020102000b10472101200041106a200028028002200028028402200a200410622000290310211720002903880221162000107d3602e801200020013602e001200020163703d801200020173703d0010c020b200041e8016a20004198026a2903003703002002200a290300370300200b200329030037030020002000290380023703d0010c010b200041f0016a2004109701027f20002903f0015004402000280290022103200041186a20002802800220002802840220002802f80120002802fc01106d200028021c210220002802180c010b10472103200041206a200028028002200028028402200028029002200041f0016a106c2000280224210220002802200b210120002903880221162000107d3602e801200020033602e001200020163703d801200020023602d401200020013602d0010b200041d0016a107221032008102f21012000200336028c022000420037038002200020013602880220004180026a10950121010c040b2008102f21044101102d20051032210341a886084108104d2101104322052004106e20051070104321042000200736028c0220002009360288022000201637038002200420004180026a104420002003360290022000427f37038802200020053602840220002001360280022000107d36029802027f027e024002400240200410650e020102000b10472102200041286a200028028002200028028402200a20041062200028022c2103200028022821012000290388020c020b20002802900221022000290388022116200028028402210320002802800221012000280298020c020b200041d0016a2004109701027f20002903d0015004402000280290022102200041306a20002802800220002802840220002802d80120002802dc01106d2000280234210320002802300c010b10472102200041386a200028028002200028028402200028029002200041d0016a106c200028023c210320002802380b21012000290388020b2116107d0b21042016427f51047e10160520160b200220042001200310452103101741002102200310122101200041003602f801200020033602f001200020014102763602f401200041f0016a1075102f210410432101200410122103200041003a0090022000200336028c0220002004360288022000200336028402200041003602800203402002200346044020002d009002450d0541dcdb08410036020041e0db0841003a00000c0505200041d0016a220320004180026a1077200120031044200028028002210220002802840221030c010b000b000b41c0860841191041000b200c200e10300440200d2004108f010c040b41d48a0841131041000b200041086a1036200020002d000c3a008402200020002802083602800220004180026a220641808008412110a301230041406a220324002003410020036b41037122046a210720040440200321020340200241003a0000200241016a22022007490d000b0b200741c00020046b2205417c7122046a2102200441004a0440034020074100360200200741046a22072002490d000b0b200541037122040440200220046a21040340200241003a0000200241016a22022004490d000b0b20062003027f200104402001ad2116413f2101024003402016500d012001413f4d0440200120036a20162016420a802216420a7e7da74130723a0000200141016b21010c010b0b102c000b200141016a0c010b200341303a003f413f0b22016a41c00020016b10a301200341406b240020002802800220002d00840210381000000b200020013602cc01107d2102107d21042000200110123602d801200041003602d4012000200041cc016a3602d00102400340024020004180026a200041d0016a1067200029038002500d002000280294022105200221032000280290022201200c103045044020042103200120081030450d030b20032005108f010c010b0b2008102f210c42002116200621010c010b0b0b4187860841211041000b41a58a0841151041000b200041808080203602d0012006200041d0016a4104100f1a200641ed85084104100f1a0b200042003703d0012006200041d0016a22034108100f1a20052006103f20042006104e10c70110432201418a8d084108104d104e20021043102f2202103f2002103f200120021024200020043602d00120002004101236028802200041003602840220002003360280020340200020004180026a10c40120002802000440200028020410071a0c010b0b200041a0026a24000f0b41ba8a08411a1041000b0d0010224100105a10c70110250b0d0010224100105a10d101105b0b0d0010224100105a10d401105d0b0d0010224100105a10d801105d0b2a01017f10224100105a10cb0110ab01220041feffffff07470440200010071a0f0b41ed8508410410260b0d0010224100105a10da01105d0b0d0010224100105a10c801105b0b0d0010224100105a10c901105b0b0d0010224100105a10cc01105b0b0d0010224100105a10d901105d0b0d0010224100105a10d201105b0ba10101027f230041406a2200240010224101105a20004100104b3602142000200041146a10d60110ac012201360218200041086a1035200020002d000c3a00202000200028020836021c20002001101236022c200041003602282000200041186a360224200041346a21010340200041306a200041246a10ba012000280230044020012000411c6a10bb010c010b0b200028021c20002d00201037200041406b24000ba00101027f230041406a2200240010224101105a20004100104b3602142000200041146a10d50110b2012201360218200041086a1035200020002d000c3a00202000200028020836021c20002001101236022c200041003602282000200041186a3602240340200041306a200041246a10b50120002d003c4102470440200041306a2000411c6a10b6010c010b0b200028021c20002d00201037200041406b24000b0d0010224100105a10d301105e0b0d0010224100105a10d701105e0be30302057f027e23004190016b2200240010494100105a2000104a2201360214024020011065410146044020011012210120004100360234200020013602302000410036022c2000200041146a3602282000413c6a2102200041f4006a2103200041f8006a21010340200041f0006a200041286a10672000290370500d02200041e0006a200141086a290300220537030020002001290300220637035820002000280234220441016a360234200341086a200537020020032006370200200041406b2001290200370300200041c8006a20004180016a280200360200200020002902703703382004450440200041206a200241086a290200370300200020022902003703180c010b0b102c000b41b3830841221003000b200041086a2201200041206a2903003703002000200029031837030010da0110a701210220012802002002103045044041988a08410d1041000b10d201105c21022000104336021820001043360228200041f0006a22012002103241a783084105103320002802742202200041186a107b2002200041286a107a200041e8006a20004180016a290300370300200041e0006a200041f8006a29030037030020002000290370370358200041386a2202200041d8006a20001084012001200210cd012001107420004190016a24000b8c0101027f230041406a2200240010494100105a10d201105c21012000104336020020001043360204200041086a200110324195830841121033200028020c22012000107b2001200041046a107a200041306a200041186a290300370300200041286a200041106a290300370300200020002903083703202000107d360238200041206a1074200041406b24000bff0102057f017e230041306b22002400102210494101105a2000104f36021010d201105c20001043360214200010433602181032210241ac83084107104d210310432201200041106a10782001200041146a107b2001200041186a107a107d210410162002200420032001104521011017200110122102200041003602242000200136021c200020024102763602202000411c6a107521012000420037032820011012220241094904400240200041086a200041286a200210b0012001410020002802082201200028020c2202108a011a2001200210b10122054280808080105a0d0020051014200041306a24000f0b0b418a8508410b41958508410e104c000b980302057f017e230041e0006b220024001022104941e4db08101336020041e4db08280200410048044041ef830841111003000b2000410036023810432103200041386a22042802002101034041e4db0828020020014a04402004200141016a220236020020032001104b104e200221010c010b0b2003210141e4db0828020020002802384a04404180840841121003000b2000200136021c200410d201105c103241f98208410d103320002001101236025c2000410036025820002000411c6a360254200028023c21010340200041106a200041d4006a10c4012000280210044020012000280214106e0c010b0b200041286a200041406b290300370300200041306a200041c8006a29030037030020002000290338370320200041386a200041206a107e02402000280244220110ce01450440200028024021020c010b1046200028024022024200200110420b2000290338200041086a1035200020002d000c3a003c200020002802083602382002200041386a2202103e200210c60120012002103c200028023820002d003c1037200041e0006a24000b3101017e102210494101105a41001011220042818090bbbad6adf00d5a044041ef8b0841201041000b10d701200010aa010b3101017e102210494101105a41001011220042818090bbbad6adf00d5a044041d28b08411d1041000b10d301200010aa010be30101037f230041306b22002400102210494102105a410010582101200041011051220236020c20002001360208200020011012360218200041003602142000200041086a36021003402000411c6a200041106a10c301200028021c044020002000280224220136022c20002000280220360228200041286a10d601200110b9010c01052000200210123602182000410036021420002000410c6a36021003402000411c6a200041106a10c301200028021c044020002000280224220136022c20002000280220360228200041286a10d501200110b4010c010b0b200041306a24000b0b0baa07020b7f017e230041306b2200240010224100105a10c901105c2209102f1032210141d281084114104d210210432106107d21071016200120072002200610452101101720011012210220004100360210200020013602082000200241027636020c200041086a1075220210122101200041286a41003a0000200041246a2001360200200020023602202000200136021c200041003602180240027f024002402001450d00024002400240200041186a418a8508410b105441ff01710e020201000b418a8508410b41ed8608410d104c000b41012103200041186a418a8508410b105321010b200028021c2000280218470d0320002d0028044041dcdb08410036020041e0db0841003a00000b2003450d00200041186a22042001102f103241e482084115103320002004107c220336020020042001102f103241b28208410b1033200041186a107c42be8a860f102e108e01210620042001102f103241c98208410d1033200041186a107c200310920142be8a860f102e108e01410a102d4112109401108d01210720042001102f103241bd8208410c1033200041186a107c410a102d41121094012003109001108e0142be8a860f102e108e01410a102d4112109401108d01210a20042009102f2202102f103241878108410f10332000200041186a107c220536021420042002102f103241ab820841071033200041186a107c210820042002103241a6810841101033200041186a107c2102200020082005109101200210900136020820042001103241d68208410e1033200028021c2201200041146a10782001200041086a107820002802282102200028021821052000290320107d21081071200220082005200110452101101720002001107336020442808090bbbad6adf00d102e21022000107d360218200041046a200410cf012105107d220120050d021a2001200028020410890141016a41ff017141014d0440200041046a200010cf010d02200028020021030b20002802042003109301200a108e012101410a102d4112109401200028020010900121032006200210920120072002109201108c0120012002108e012003108d01108c010c020b41a08b0841321041000b2000280204200710920121012006200210920120012002108e012000280200108d01108c010b2101200041186a22032009103241968108411010332003107c2102410a102d411210940121032000280204200110920120032002109301108e0120034103109401108d011025200041306a24000f0b418a8508410b41958508410e104c000b0300010b3c01017f230041106b22052400200541086a2001200420022003109d01200528020c21012000200528020836020020002001360204200541106a24000b3b01017f230041106b22052400200541086a2002200320012004102b200528020c21012000200528020836020020002001360204200541106a24000b0bda0d0200418080080bc60d4e6f2073776170206f7065726174696f6e20666f756e6420617420696e64657820756e7772617045676c646765745772617070656445676c64546f6b656e49647772617045676c64726563697069656e742061646472657373206e6f7420736574657869744d61726b6574636c61696d526577617264736765744163636f756e74546f6b656e73676574546f74616c426f72726f777367657452657365727665466163746f72676574546f74616c5265736572766573676574546f6b656e49646d696e74416e64456e7465724d61726b6574676574496e746572657374526174654d6f64656c676574556e6465726c79696e674964746f6b656e73546f556e6465726c79696e67416d6f756e74756e6465726c79696e67416d6f756e74546f546f6b656e7372656465656d6765744361736867657442617365526174656765744c617374536c6f70656765744669727374536c6f70656765745574696c697a6174696f6e6765744f7074696d616c5574696c697a6174696f6e636c61696d4d756c7469706c656765745374616b65546f6b656e4964726562616c616e6365506f7274666f6c696f7374616b65756e7374616b65696e636f7272656374206e756d626572206f662045534454207472616e7366657273617267756d656e74206465636f6465206572726f722028293a20746f6f2066657720617267756d656e7473746f6f206d616e7920617267756d656e747377726f6e67206e756d626572206f6620617267756d656e747363616e6e6f74207375627472616374206265636175736520726573756c7420776f756c64206265206e656761746976654d756c7469455344544e46545472616e73666572455344544e46545472616e73666572455344545472616e7366657273796e6320726573756c74696e70757420746f6f206c6f6e67696e70757420746f6f2073686f72746361737420746f20693634206572726f724d616e6167656456656320696e646578206f7574206f662072616e67654553445420657870656374656445474c4473746f72616765206465636f6465206572726f723a20756e6b6e6f776e20726563656976656420746f6b656e206166746572207377617065786368616e6765626164206172726179206c656e67746877726f6e672072657475726e6564207377617020746f6b656e73776170546f6b656e734669786564496e707574696e76616c69642076616c7565777261707065645f65676c645f636f6e74726163745f61646472657373636f6d706f756e645f617368737761705f7377617073636f6d706f756e645f7865786368616e67655f7377617073706572666f726d616e63655f666565735f70657263656e74636f6d706f756e645f666565735f70657263656e74626f6f737465725f616464726573736d6f6e65795f6d61726b65745f61646472657373636f6e74726f6c6c65725f6164647265737361737365745f746f6b656e5f6964656e7469666965727661756c745f616464726573737061796d656e742073686f756c6420626520616e204553445420746f6b656e54686520617373657420746f6b656e206964656e74696669657220616e6420746865206d6f6e6579206d61726b657420756e6465726c79696e67206964656e74696669657220646f6e2774206d617463685768656e20746172676574696e6720616e2045474c44206d61726b65742074686520617373657420746f6b656e206964656e7469666965722073686f756c64206265205745474c4443616c6c65722073686f756c64206265207661756c7477726f6e67207061796d656e746e6f2072657761726420746f20636f6d706f756e646e6f206c65667420616d6f756e7420746f20636f6d706f756e6477726f6e67207377617070656420746f6b656e6e6f2065786974206d61726b6574207061796d656e742072656365697665646e6f2072656465656d207061796d656e742072656365697665644e6f20696e7465726573742072617465206d6f64656c2070726573656e74206f6e20746865206d6f6e6579206d61726b65746e657720636f6d706f756e6420666565732065786365656420313030256e657720706572666f726d616e636520666565732065786365656420313030256d6f6e65795f6d61726b65745f746f6b656e5f6964656e746966696572777261707065645f65676c645f746f6b656e5f6964656e746966696572626f6f737465725f7374616b65645f746f6b656e5f6964656e7469666965726d6f6e65795f6d61726b65745f756e6465726c79696e675f6964656e746966696572636f6d706f756e64456e64706f696e742063616e206f6e6c792062652063616c6c6564206279206f776e6572000070616e6963206f636375727265640041c88d080b049cffffff@0500@0100@0000000000000000000000000000000000000000000000000000000000000000@5745474c442d613238633539@00000000000000000500a3b666902d5f4bbf0ff93748fb915aeb43124cbf6509@0000000000000000050032de4f40f17a2f41c4e40c21f596e36a846994e36509@00000000000000000500f8836686f7c6c0f13d7275151b78f59f8f2f729a6509@@@@@000000000000000005000b1e5b244325095849f4e37134661d5bfdcd925e7ceb",
-      "signature": "edf0ec99b6f60414fa5e36d40cfb1d0075d01fd7c4ad7ba59bbe62b8b48eb892beb0c18bba203ff32b83827c3953847b190cdc89a4806f4615565dc2b3b5940f",
-      "sourceShard": 1,
-      "destinationShard": 1,
-      "blockNonce": 2127577,
-      "blockHash": "e3aea17b5345b45f61b233834d3b4ba0ac6f2b7d53eb3f1b1cf2bf0534ba567f",
-      "notarizedAtSourceInMetaNonce": 2129029,
-      "NotarizedAtSourceInMetaHash": "73ee8458f55bf5c9ea4a9974c0c838ced51a236c2b13238761f444598f40575e",
-      "notarizedAtDestinationInMetaNonce": 2129029,
-      "notarizedAtDestinationInMetaHash": "73ee8458f55bf5c9ea4a9974c0c838ced51a236c2b13238761f444598f40575e",
-      "miniblockType": "TxBlock",
-      "miniblockHash": "cc7e81e68269c2c633daf997fd2d52fc82d8ba3bb699d7e75250008bd9b7aa29",
-      "hyperblockNonce": 2129029,
-      "hyperblockHash": "73ee8458f55bf5c9ea4a9974c0c838ced51a236c2b13238761f444598f40575e",
-      "timestamp": 1707144290,
-      "status": "success",
-      "operation": "scDeploy",
-      "initiallyPaidFee": "82333950000000000",
-      "chainID": "D",
-      "version": 1,
-      "options": 0
-    }
-  },
-  "error": "",
-  "code": "successful"
-}
-        "#;
-
-    let tx_on_network: TransactionOnNetwork = serde_json::from_str::<TransactionInfo>(data)
-        .unwrap()
-        .data
-        .unwrap()
-        .transaction;
-    let tx_response = TxResponse::from_network_tx(tx_on_network);
-    let opt_address = tx_response.new_deployed_address.map(|e| {
-        multiversx_sdk::data::address::Address::from_bytes(*e.as_array())
-            .to_bech32_string()
-            .unwrap()
-    });
-
-    let expected =
-        Some("erd1qqqqqqqqqqqqqpgqwpdf84ggxzqzmr2zmw959q4nlf9nz562q33sak25ze".to_string());
-
-    assert_eq!(opt_address, expected)
-}
-
-#[test]
-fn test_deployed_address_should_be_none_if_not_a_sc_deployment_tx() {
-    let data = r#"
-        {
-  "data": {
-    "transaction": {
-      "type": "normal",
-      "processingTypeOnSource": "BuiltInFunctionCall",
-      "processingTypeOnDestination": "SCInvoking",
-      "hash": "238ad6dbe75dab1d53caeb9cabd584aabc6fc113c849a983afef5a5e439ce9e5",
-      "nonce": 13,
-      "round": 2192628,
-      "epoch": 888,
-      "value": "0",
-      "receiver": "erd1qqqqqqqqqqqqqpgqydwpdrplefjlwp3sp9xmn3vevdxdelfkwmfsw6e5xw",
-      "sender": "erd179xw6t04ug48m74jzyw9zq028hv66jhqayelzpzvgds0ptnzmckq2jf07f",
-      "gasPrice": 1000000000,
-      "gasLimit": 20000000,
-      "data": "RVNEVFRyYW5zZmVyQDRmNTU1MjRmMmQ2NDM4MzEzNzMxNjZAMDI0NmQyZDBiNmI1ZjBANjI3NTc5QDFiYzE2ZDY3NGVjODAwMDA=",
-      "signature": "ce984b4d785ccc7aca4b1cdea57ddcd568a502209f81e6b5bc678e1dd52b78d764fe46ea3ff77b926eb9f70eb52ae8f3f2afa2e9d0efa82655e361641458b900",
-      "sourceShard": 0,
-      "destinationShard": 1,
-      "blockNonce": 2129490,
-      "blockHash": "0ab10909b27565c5b7b59e8e1ee4a68d7046f49225fcde4c12d4b1ea3f512b8a",
-      "notarizedAtSourceInMetaNonce": 2130938,
-      "NotarizedAtSourceInMetaHash": "0c545160fd37f09f0196505b9cd2e730596bcd99438978a5bb415b9e1be1849d",
-      "notarizedAtDestinationInMetaNonce": 2130942,
-      "notarizedAtDestinationInMetaHash": "1ddd6b7aeeff824b5d11f2936a6284e470fc5abe41e34a8df229b719dc1a537d",
-      "miniblockType": "TxBlock",
-      "miniblockHash": "dc8ae41e1ae321c0fccbeb807194d11ff6e0f4ed71163764d850f1daaa60bd22",
-      "hyperblockNonce": 2130942,
-      "hyperblockHash": "1ddd6b7aeeff824b5d11f2936a6284e470fc5abe41e34a8df229b719dc1a537d",
-      "timestamp": 1707155768,
-      "status": "success",
-      "tokens": [
-        "OURO-d8171f"
-      ],
-      "esdtValues": [
-        "640821212132848"
-      ],
-      "operation": "ESDTTransfer",
-      "function": "buy",
-      "initiallyPaidFee": "359390000000000",
-      "chainID": "D",
-      "version": 1,
-      "options": 0
-    }
-  },
-  "error": "",
-  "code": "successful"
-}
-        "#;
-
-    let tx_on_network: TransactionOnNetwork = serde_json::from_str::<TransactionInfo>(data)
-        .unwrap()
-        .data
-        .unwrap()
-        .transaction;
-    let tx_response = TxResponse::from_network_tx(tx_on_network);
-    let opt_address = tx_response.new_deployed_address;
-
-    let expected: Option<Address> = None;
-
-    assert_eq!(opt_address, expected)
-}
-
-#[test]
-fn test_with_tx_that_has_sc_result() {
-    // transaction data from the devnet, an artificial "10" result has been appended on the original result
-    let data = r#"
-            {
-              "data": {
-                "transaction": {
-                  "type": "normal",
-                  "processingTypeOnSource": "BuiltInFunctionCall",
-                  "processingTypeOnDestination": "SCInvoking",
-                  "hash": "d4058bd3c13db0b14832c7c58fe163db2f579ff6544380586b8a27d88b4a5070",
-                  "nonce": 30,
-                  "round": 7639115,
-                  "epoch": 6333,
-                  "value": "0",
-                  "receiver": "erd1qqqqqqqqqqqqqpgq5400a82at6ttplyrdhyn8kk9lhxaed5d0n4s9s77kz",
-                  "sender": "erd14r7m6drneg69jyxvxxnrsss6x5gg2cqqwreyhdwanj0fcza0ynnq5jmy4g",
-                  "gasPrice": 1000000000,
-                  "gasLimit": 25500000,
-                  "gasUsed": 15297149,
-                  "data": "RVNEVFRyYW5zZmVyQDQ4NTQ0ZDJkNjY2NTMxNjYzNjM5QDBkZTBiNmIzYTc2NDAwMDBANzM3NzYxNzA1NDZmNmI2NTZlNzM0NjY5Nzg2NTY0NDk2ZTcwNzU3NEA1NzQ1NDc0YzQ0MmQ2NDM3NjMzNjYyNjJAMDM3Yzc3OGZjY2U5YzU1Yg==",
-                  "signature": "e912fae4b7a9e51ddf316a5e82a0f457d453a62e3c17477f5d6175e1b33c5e92ddb187d65f54cf3131a0603321290279a0456c20778039f2ab09b54e33c60f0d",
-                  "sourceShard": 2,
-                  "destinationShard": 1,
-                  "blockNonce": 7585351,
-                  "blockHash": "e456f38f11fec78ed26d5fda068e912739dceedb2e5ce559bf17614b8386c039",
-                  "notarizedAtSourceInMetaNonce": 7601495,
-                  "NotarizedAtSourceInMetaHash": "e28c6011d4b3f73f3945cae70ff251e675dfea331a70077c5ab3310e3101af17",
-                  "notarizedAtDestinationInMetaNonce": 7601499,
-                  "notarizedAtDestinationInMetaHash": "333d4266614e981cc1c5654f85ef496038a8cddac46dfc0ad0b7c44c37ab489d",
-                  "miniblockType": "TxBlock",
-                  "miniblockHash": "13e041f32fde79ebf1abdcfe692e99516f9ec6778dcb917251b440daa7f1210a",
-                  "hyperblockNonce": 7601499,
-                  "hyperblockHash": "333d4266614e981cc1c5654f85ef496038a8cddac46dfc0ad0b7c44c37ab489d",
-                  "timestamp": 1694386290,
-                  "smartContractResults": [
-                    {
-                      "hash": "a23faa3c80bae0b968f007ff0fad3afdec05b4e71d749c3d583dec10c6eb05a2",
-                      "nonce": 0,
-                      "value": 0,
-                      "receiver": "erd14r7m6drneg69jyxvxxnrsss6x5gg2cqqwreyhdwanj0fcza0ynnq5jmy4g",
-                      "sender": "erd1qqqqqqqqqqqqqpgq5400a82at6ttplyrdhyn8kk9lhxaed5d0n4s9s77kz",
-                      "data": "ESDTTransfer@5745474c442d643763366262@03856446ff9a304b",
-                      "prevTxHash": "d4058bd3c13db0b14832c7c58fe163db2f579ff6544380586b8a27d88b4a5070",
-                      "originalTxHash": "d4058bd3c13db0b14832c7c58fe163db2f579ff6544380586b8a27d88b4a5070",
-                      "gasLimit": 0,
-                      "gasPrice": 1000000000,
-                      "callType": 0,
-                      "logs": {
-                        "address": "erd14r7m6drneg69jyxvxxnrsss6x5gg2cqqwreyhdwanj0fcza0ynnq5jmy4g",
-                        "events": [
-                          {
-                            "address": "erd1qqqqqqqqqqqqqpgq5400a82at6ttplyrdhyn8kk9lhxaed5d0n4s9s77kz",
-                            "identifier": "ESDTTransfer",
-                            "topics": [
-                              "V0VHTEQtZDdjNmJi",
-                              "",
-                              "A4VkRv+aMEs=",
-                              "qP29NHPKNFkQzDGmOEIaNRCFYABw8ku13ZyenAuvJOY="
-                            ],
-                            "data": null
-                          },
-                          {
-                            "address": "erd14r7m6drneg69jyxvxxnrsss6x5gg2cqqwreyhdwanj0fcza0ynnq5jmy4g",
-                            "identifier": "writeLog",
-                            "topics": [
-                              "AAAAAAAAAAAFAKVe/p1dXpaw/INtyTPaxf3N3LaNfOs="
-                            ],
-                            "data": "QDZmNmI="
-                          },
-                          {
-                            "address": "erd14r7m6drneg69jyxvxxnrsss6x5gg2cqqwreyhdwanj0fcza0ynnq5jmy4g",
-                            "identifier": "completedTxEvent",
-                            "topics": [
-                              "1AWL08E9sLFIMsfFj+Fj2y9Xn/ZUQ4BYa4on2ItKUHA="
-                            ],
-                            "data": null
-                          }
-                        ]
-                      },
-                      "tokens": [
-                        "WEGLD-d7c6bb"
-                      ],
-                      "esdtValues": [
-                        "253719210115084363"
-                      ],
-                      "operation": "ESDTTransfer"
-                    },
-                    {
-                      "hash": "b7b4d15917fd215399d8e772c3c4e732008baaedc2b8172f71c91708ba7523f0",
-                      "nonce": 31,
-                      "value": 102028510000000,
-                      "receiver": "erd14r7m6drneg69jyxvxxnrsss6x5gg2cqqwreyhdwanj0fcza0ynnq5jmy4g",
-                      "sender": "erd1qqqqqqqqqqqqqpgq5400a82at6ttplyrdhyn8kk9lhxaed5d0n4s9s77kz",
-                      "data": "@6f6b@0000000c5745474c442d64376336626200000000000000000000000803856446ff9a304b@10",
-                      "prevTxHash": "d4058bd3c13db0b14832c7c58fe163db2f579ff6544380586b8a27d88b4a5070",
-                      "originalTxHash": "d4058bd3c13db0b14832c7c58fe163db2f579ff6544380586b8a27d88b4a5070",
-                      "gasLimit": 0,
-                      "gasPrice": 1000000000,
-                      "callType": 0,
-                      "logs": {
-                        "address": "erd14r7m6drneg69jyxvxxnrsss6x5gg2cqqwreyhdwanj0fcza0ynnq5jmy4g",
-                        "events": [
-                          {
-                            "address": "erd14r7m6drneg69jyxvxxnrsss6x5gg2cqqwreyhdwanj0fcza0ynnq5jmy4g",
-                            "identifier": "completedTxEvent",
-                            "topics": [
-                              "1AWL08E9sLFIMsfFj+Fj2y9Xn/ZUQ4BYa4on2ItKUHA="
-                            ],
-                            "data": null
-                          }
-                        ]
-                      },
-                      "operation": "transfer",
-                      "isRefund": true
-                    },
-                    {
-                      "hash": "05a766ca05d2053d1c0fbeb1797116474a06c86402a3bfd6c132c9a24cfa1bb0",
-                      "nonce": 0,
-                      "value": 0,
-                      "receiver": "erd1qqqqqqqqqqqqqpgq5400a82at6ttplyrdhyn8kk9lhxaed5d0n4s9s77kz",
-                      "sender": "erd1qqqqqqqqqqqqqpgq5400a82at6ttplyrdhyn8kk9lhxaed5d0n4s9s77kz",
-                      "data": "swapTokensFixedInput@5745474c442d643763366262@037c778fcce9c55b",
-                      "prevTxHash": "d4058bd3c13db0b14832c7c58fe163db2f579ff6544380586b8a27d88b4a5070",
-                      "originalTxHash": "d4058bd3c13db0b14832c7c58fe163db2f579ff6544380586b8a27d88b4a5070",
-                      "gasLimit": 25050500,
-                      "gasPrice": 1000000000,
-                      "callType": 0,
-                      "operation": "transfer",
-                      "function": "swapTokensFixedInput"
-                    },
-                    {
-                      "hash": "4e639c80822d5d7780c8326d683fa9cd6d59649d14122dfabc5a96dda36da527",
-                      "nonce": 0,
-                      "value": 0,
-                      "receiver": "erd1qqqqqqqqqqqqqpgquu5rsa4ee6l4azz6vdu4hjp8z4p6tt8m0n4suht3dy",
-                      "sender": "erd1qqqqqqqqqqqqqpgq5400a82at6ttplyrdhyn8kk9lhxaed5d0n4s9s77kz",
-                      "data": "ESDTTransfer@5745474c442d643763366262@e7730d1ef1b0@737761704e6f466565416e64466f7277617264@4d45582d646332383963@0000000000000000000000000000000000000000000000000000000000000000",
-                      "prevTxHash": "d4058bd3c13db0b14832c7c58fe163db2f579ff6544380586b8a27d88b4a5070",
-                      "originalTxHash": "d4058bd3c13db0b14832c7c58fe163db2f579ff6544380586b8a27d88b4a5070",
-                      "gasLimit": 0,
-                      "gasPrice": 1000000000,
-                      "callType": 0,
-                      "tokens": [
-                        "WEGLD-d7c6bb"
-                      ],
-                      "esdtValues": [
-                        "254481327387056"
-                      ],
-                      "operation": "ESDTTransfer",
-                      "function": "swapNoFeeAndForward"
-                    }
-                  ],
-                  "logs": {
-                    "address": "erd1qqqqqqqqqqqqqpgq5400a82at6ttplyrdhyn8kk9lhxaed5d0n4s9s77kz",
-                    "events": [
-                      {
-                        "address": "erd14r7m6drneg69jyxvxxnrsss6x5gg2cqqwreyhdwanj0fcza0ynnq5jmy4g",
-                        "identifier": "ESDTTransfer",
-                        "topics": [
-                          "SFRNLWZlMWY2OQ==",
-                          "",
-                          "DeC2s6dkAAA=",
-                          "AAAAAAAAAAAFAKVe/p1dXpaw/INtyTPaxf3N3LaNfOs="
-                        ],
-                        "data": null
-                      },
-                      {
-                        "address": "erd1qqqqqqqqqqqqqpgq5400a82at6ttplyrdhyn8kk9lhxaed5d0n4s9s77kz",
-                        "identifier": "ESDTTransfer",
-                        "topics": [
-                          "V0VHTEQtZDdjNmJi",
-                          "",
-                          "53MNHvGw",
-                          "AAAAAAAAAAAFAOcoOHa5zr9eiFpjeVvIJxVDpaz7fOs="
-                        ],
-                        "data": null
-                      },
-                      {
-                        "address": "erd1qqqqqqqqqqqqqpgquu5rsa4ee6l4azz6vdu4hjp8z4p6tt8m0n4suht3dy",
-                        "identifier": "ESDTLocalBurn",
-                        "topics": [
-                          "TUVYLWRjMjg5Yw==",
-                          "",
-                          "AuMDPq1jy03x"
-                        ],
-                        "data": null
-                      },
-                      {
-                        "address": "erd1qqqqqqqqqqqqqpgquu5rsa4ee6l4azz6vdu4hjp8z4p6tt8m0n4suht3dy",
-                        "identifier": "swapNoFeeAndForward",
-                        "topics": [
-                          "c3dhcF9ub19mZWVfYW5kX2ZvcndhcmQ=",
-                          "TUVYLWRjMjg5Yw==",
-                          "AAAAAAAAAAAFAKVe/p1dXpaw/INtyTPaxf3N3LaNfOs=",
-                          "GL0="
-                        ],
-                        "data": "AAAAAAAAAAAFAKVe/p1dXpaw/INtyTPaxf3N3LaNfOsAAAAMV0VHTEQtZDdjNmJiAAAABudzDR7xsAAAAApNRVgtZGMyODljAAAACQLjAz6tY8tN8QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABzvkcAAAAAAAAYvQAAAABk/khy"
-                      },
-                      {
-                        "address": "erd1qqqqqqqqqqqqqpgq5400a82at6ttplyrdhyn8kk9lhxaed5d0n4s9s77kz",
-                        "identifier": "ESDTTransfer",
-                        "topics": [
-                          "V0VHTEQtZDdjNmJi",
-                          "",
-                          "A4VkRv+aMEs=",
-                          "qP29NHPKNFkQzDGmOEIaNRCFYABw8ku13ZyenAuvJOY="
-                        ],
-                        "data": null
-                      },
-                      {
-                        "address": "erd1qqqqqqqqqqqqqpgq5400a82at6ttplyrdhyn8kk9lhxaed5d0n4s9s77kz",
-                        "identifier": "swapTokensFixedInput",
-                        "topics": [
-                          "c3dhcA==",
-                          "SFRNLWZlMWY2OQ==",
-                          "V0VHTEQtZDdjNmJi",
-                          "qP29NHPKNFkQzDGmOEIaNRCFYABw8ku13ZyenAuvJOY=",
-                          "GL0="
-                        ],
-                        "data": "qP29NHPKNFkQzDGmOEIaNRCFYABw8ku13ZyenAuvJOYAAAAKSFRNLWZlMWY2OQAAAAgN4Lazp2QAAAAAAAxXRUdMRC1kN2M2YmIAAAAIA4VkRv+aMEsAAAAHA41+pMaAAAAAAAoofxtJRPkr8X9kAAAACgpOPCsHUu261HUAAAAAAHO+RwAAAAAAABi9AAAAAGT+SHI="
-                      }
-                    ]
-                  },
-                  "status": "success",
-                  "tokens": [
-                    "HTM-fe1f69"
-                  ],
-                  "esdtValues": [
-                    "1000000000000000000"
-                  ],
-                  "operation": "ESDTTransfer",
-                  "function": "swapTokensFixedInput",
-                  "initiallyPaidFee": "502005000000000",
-                  "fee": "399976490000000",
-                  "chainID": "D",
-                  "version": 1,
-                  "options": 0
-                }
-              },
-              "error": "",
-              "code": "successful"
-            }
-        "#;
-
-    let tx_on_network: TransactionOnNetwork = serde_json::from_str::<TransactionInfo>(data)
-        .unwrap()
-        .data
-        .unwrap()
-        .transaction;
-    let tx_response = TxResponse::from_network_tx(tx_on_network);
-
-    let expected: Vec<Vec<u8>> = vec![
-        hex::decode("0000000c5745474c442d64376336626200000000000000000000000803856446ff9a304b")
-            .unwrap(),
-        hex::decode("10").unwrap(),
-    ];
-
-    assert_eq!(tx_response.out, expected)
-}
-
-#[test]
-fn test_with_tx_that_has_no_sc_result() {
-    // transaction data from the devnet
-    let data = r#"
-            {
-              "data": {
-                "transaction": {
-                  "type": "normal",
-                  "processingTypeOnSource": "SCInvoking",
-                  "processingTypeOnDestination": "SCInvoking",
-                  "hash": "6afac3ec13c89cc56154d06efdb457a24f58361699eee00a48202a8f8adc8c8a",
-                  "nonce": 17,
-                  "round": 7548071,
-                  "epoch": 6257,
-                  "value": "0",
-                  "receiver": "erd1qqqqqqqqqqqqqpgq4nlkk7jwhqgp4r08lal46tqt70jdv0685u7qrr3l2d",
-                  "sender": "erd1uh67c2lkhyj4vh73akv7jky9sfgvus8awwcj64uju69mmfne5u7q299t7g",
-                  "gasPrice": 1000000000,
-                  "gasLimit": 600000000,
-                  "gasUsed": 600000000,
-                  "data": "cmV0dXJuVHdvVTY0",
-                  "signature": "f3a3ca96a78c90c9cf1b08541e1777010f0176a5e1e525e631155b2784932cbfd74c9168d03ba201fd5434d1a1b4789895ddade9883eca2ee9e0bce18468fb00",
-                  "sourceShard": 0,
-                  "destinationShard": 0,
-                  "blockNonce": 7502091,
-                  "blockHash": "5ec66c651cb1514cba200e7e80a4491880f0db678ce7631c397872e3842f0aa2",
-                  "notarizedAtSourceInMetaNonce": 7510505,
-                  "NotarizedAtSourceInMetaHash": "8410309ec5b988af79b4dcfb44fd4729d46874ebd796672c78e417e314409051",
-                  "notarizedAtDestinationInMetaNonce": 7510505,
-                  "notarizedAtDestinationInMetaHash": "8410309ec5b988af79b4dcfb44fd4729d46874ebd796672c78e417e314409051",
-                  "miniblockType": "TxBlock",
-                  "miniblockHash": "fb150e515449c9b658879ed06f256b429239cbe78ec2c2821deb4b283ff21554",
-                  "hyperblockNonce": 7510505,
-                  "hyperblockHash": "8410309ec5b988af79b4dcfb44fd4729d46874ebd796672c78e417e314409051",
-                  "timestamp": 1693840026,
-                  "logs": {
-                    "address": "erd1qqqqqqqqqqqqqpgq4nlkk7jwhqgp4r08lal46tqt70jdv0685u7qrr3l2d",
-                    "events": [
-                      {
-                        "address": "erd1qqqqqqqqqqqqqpgq4nlkk7jwhqgp4r08lal46tqt70jdv0685u7qrr3l2d",
-                        "identifier": "writeLog",
-                        "topics": [
-                          "5fXsK/a5JVZf0e2Z6ViFglDOQP1zsS1XkuaLvaZ5pzw=",
-                          "QHRvbyBtdWNoIGdhcyBwcm92aWRlZCBmb3IgcHJvY2Vzc2luZzogZ2FzIHByb3ZpZGVkID0gNTk5OTMyMDAwLCBnYXMgdXNlZCA9IDE4NDE2NjU="
-                        ],
-                        "data": "QDZmNmJAMGFAMDIxODcxMWEwMA=="
-                      },
-                      {
-                        "address": "erd1qqqqqqqqqqqqqpgq4nlkk7jwhqgp4r08lal46tqt70jdv0685u7qrr3l2d",
-                        "identifier": "completedTxEvent",
-                        "topics": [
-                          "avrD7BPInMVhVNBu/bRXok9YNhaZ7uAKSCAqj4rcjIo="
-                        ],
-                        "data": null
-                      }
-                    ]
-                  },
-                  "status": "success",
-                  "operation": "transfer",
-                  "function": "returnTwoU64",
-                  "initiallyPaidFee": "6067320000000000",
-                  "fee": "6067320000000000",
-                  "chainID": "D",
-                  "version": 1,
-                  "options": 0
-                }
-              },
-              "error": "",
-              "code": "successful"
-            }
-        "#;
-
-    let tx_on_network: TransactionOnNetwork = serde_json::from_str::<TransactionInfo>(data)
-        .unwrap()
-        .data
-        .unwrap()
-        .transaction;
-    let tx_response = TxResponse::from_network_tx(tx_on_network);
-
-    let expected: Vec<Vec<u8>> = vec![
-        hex::decode("0a").unwrap(),
-        hex::decode("0218711a00").unwrap(),
-    ];
-
-    assert_eq!(tx_response.out, expected)
-}
-
-#[test]
-fn test_with_multi_contract_same_shard_tx_that_has_no_sc_result() {
-    // transaction data from the devnet
-    // context : user -> A --call--> B, B returns a MultiValue2<u64, u64>, A returns the B's returned value
-    let data = r#"
-            {
-              "data": {
-                "transaction": {
-                  "type": "normal",
-                  "processingTypeOnSource": "SCInvoking",
-                  "processingTypeOnDestination": "SCInvoking",
-                  "hash": "e914857f1bfd003ba411bae372266703e5f706fa412c378feb37faa5e18c3d73",
-                  "nonce": 49,
-                  "round": 7646960,
-                  "epoch": 6339,
-                  "value": "0",
-                  "receiver": "erd1qqqqqqqqqqqqqpgqshqmekudxlxwp0d9j368etjamr5dw7k45u7qx40w6h",
-                  "sender": "erd1uh67c2lkhyj4vh73akv7jky9sfgvus8awwcj64uju69mmfne5u7q299t7g",
-                  "gasPrice": 1000000000,
-                  "gasLimit": 600000000,
-                  "gasUsed": 600000000,
-                  "data": "Y2FsbEFub3RoZXJDb250cmFjdFJldHVyblR3b1U2NEAwMDAwMDAwMDAwMDAwMDAwMDUwMEFDRkY2QjdBNEVCODEwMUE4REU3RkY3RjVEMkMwQkYzRTRENjNGNDdBNzND",
-                  "signature": "53cc6496647287d735bd7950f4ec79d7b51f884defda1d6d840d722b7d0d869900ccecc01602da7a7c717955e8d4ed0711b92acd980d64ed6eebd6eaed0c4608",
-                  "sourceShard": 0,
-                  "destinationShard": 0,
-                  "blockNonce": 7600794,
-                  "blockHash": "77eb0904e56d6dd596c0d72821cf33b326fde383e72903ca4df5c2f200b0ea75",
-                  "notarizedAtSourceInMetaNonce": 7609344,
-                  "NotarizedAtSourceInMetaHash": "12df3fe65cacde2c9742b9506ac2261d34f3c72d690301192fd8016430d51913",
-                  "notarizedAtDestinationInMetaNonce": 7609344,
-                  "notarizedAtDestinationInMetaHash": "12df3fe65cacde2c9742b9506ac2261d34f3c72d690301192fd8016430d51913",
-                  "miniblockType": "TxBlock",
-                  "miniblockHash": "03219ac7427f7511687f0768c722c759c1b1428b2664b44a0cbe2072154851ee",
-                  "hyperblockNonce": 7609344,
-                  "hyperblockHash": "12df3fe65cacde2c9742b9506ac2261d34f3c72d690301192fd8016430d51913",
-                  "timestamp": 1694433360,
-                  "logs": {
-                    "address": "erd1qqqqqqqqqqqqqpgqshqmekudxlxwp0d9j368etjamr5dw7k45u7qx40w6h",
-                    "events": [
-                      {
-                        "address": "erd1qqqqqqqqqqqqqpgqshqmekudxlxwp0d9j368etjamr5dw7k45u7qx40w6h",
-                        "identifier": "writeLog",
-                        "topics": [
-                          "5fXsK/a5JVZf0e2Z6ViFglDOQP1zsS1XkuaLvaZ5pzw=",
-                          "QHRvbyBtdWNoIGdhcyBwcm92aWRlZCBmb3IgcHJvY2Vzc2luZzogZ2FzIHByb3ZpZGVkID0gNTk5ODA2MDAwLCBnYXMgdXNlZCA9IDM4NDcyNDA="
-                        ],
-                        "data": "QDZmNmJAMGFAMDIxODcxMWEwMA=="
-                      },
-                      {
-                        "address": "erd1qqqqqqqqqqqqqpgqshqmekudxlxwp0d9j368etjamr5dw7k45u7qx40w6h",
-                        "identifier": "completedTxEvent",
-                        "topics": [
-                          "6RSFfxv9ADukEbrjciZnA+X3BvpBLDeP6zf6peGMPXM="
-                        ],
-                        "data": null
-                      }
-                    ]
-                  },
-                  "status": "success",
-                  "operation": "transfer",
-                  "function": "callAnotherContractReturnTwoU64",
-                  "initiallyPaidFee": "6192060000000000",
-                  "fee": "6192060000000000",
-                  "chainID": "D",
-                  "version": 2,
-                  "options": 0
-                }
-              },
-              "error": "",
-              "code": "successful"
-            }
-        "#;
-
-    let tx_on_network: TransactionOnNetwork = serde_json::from_str::<TransactionInfo>(data)
-        .unwrap()
-        .data
-        .unwrap()
-        .transaction;
-    let tx_response = TxResponse::from_network_tx(tx_on_network);
-
-    let expected: Vec<Vec<u8>> = vec![
-        hex::decode("0a").unwrap(),
-        hex::decode("0218711a00").unwrap(),
-    ];
-
-    assert_eq!(tx_response.out, expected)
-}
-
-#[test]
-fn test_with_multi_contract_cross_shard_tx_that_has_no_callback() {
-    // transaction data from the devnet
-    // context : user -> A --async call--> B, no callback
-    let data = r#"
-            {
-              "data": {
-                "transaction": {
-                  "type": "normal",
-                  "processingTypeOnSource": "SCInvoking",
-                  "processingTypeOnDestination": "SCInvoking",
-                  "hash": "4d50a055663dfee2479851684d7fb83cf00695b6f03f4dbbdf0f9232477cafc4",
-                  "nonce": 51,
-                  "round": 7647523,
-                  "epoch": 6340,
-                  "value": "0",
-                  "receiver": "erd1qqqqqqqqqqqqqpgqllqglpjdrz5kn3m0k9uf9hdqjmg3xdhk6r7se3wvlk",
-                  "sender": "erd1uh67c2lkhyj4vh73akv7jky9sfgvus8awwcj64uju69mmfne5u7q299t7g",
-                  "gasPrice": 1000000000,
-                  "gasLimit": 600000000,
-                  "gasUsed": 600000000,
-                  "data": "YXN5bmNDYWxsQW5vdGhlckNvbnRyYWN0UmV0dXJuVHdvVTY0Tm9DYWxsYmFja0AwMDAwMDAwMDAwMDAwMDAwMDUwMEFDRkY2QjdBNEVCODEwMUE4REU3RkY3RjVEMkMwQkYzRTRENjNGNDdBNzND",
-                  "signature": "0fc30cddaa8e5365662a14344e3434cbccf287f357be99b3ed4add182f64dded774ec0d095ab1589e7c6c07e00de3b7239efc96eb2e0e97b48c1ef87084cec01",
-                  "sourceShard": 0,
-                  "destinationShard": 1,
-                  "blockNonce": 7593758,
-                  "blockHash": "a828c0ca58ef1c8aff60e512ab59f18204f1915d4a6c8285cfceb1c5725b88e8",
-                  "notarizedAtSourceInMetaNonce": 7609903,
-                  "NotarizedAtSourceInMetaHash": "4e90fe45c2fdccd5cf6977c1422e5f4ffa41c4e9f31fb4a50c20455f87df1e99",
-                  "notarizedAtDestinationInMetaNonce": 7609907,
-                  "notarizedAtDestinationInMetaHash": "10b8666a44411c3babbe20af7154fb3d47efcb1cb10d955523ec68fece26e517",
-                  "miniblockType": "TxBlock",
-                  "miniblockHash": "4ff4bb1ac88911d617c9b0342aeb5158db78490c2fe414cad08adcc584a77be7",
-                  "hyperblockNonce": 7609907,
-                  "hyperblockHash": "10b8666a44411c3babbe20af7154fb3d47efcb1cb10d955523ec68fece26e517",
-                  "timestamp": 1694436738,
-                  "smartContractResults": [
-                    {
-                      "hash": "462b56a1530e6070dc7c15f755e51a97a6972c8cd7891f3be4635b93211890c5",
-                      "nonce": 0,
-                      "value": 0,
-                      "receiver": "erd1qqqqqqqqqqqqqpgqllqglpjdrz5kn3m0k9uf9hdqjmg3xdhk6r7se3wvlk",
-                      "sender": "erd1qqqqqqqqqqqqqpgq4nlkk7jwhqgp4r08lal46tqt70jdv0685u7qrr3l2d",
-                      "data": "@00@0a@0218711a00",
-                      "prevTxHash": "41d56fdacf3e14de67e821427c732b62ebfa07c82d2e5db6de75fe3a1c828d9b",
-                      "originalTxHash": "4d50a055663dfee2479851684d7fb83cf00695b6f03f4dbbdf0f9232477cafc4",
-                      "gasLimit": 595637825,
-                      "gasPrice": 1000000000,
-                      "callType": 2,
-                      "logs": {
-                        "address": "erd1qqqqqqqqqqqqqpgqllqglpjdrz5kn3m0k9uf9hdqjmg3xdhk6r7se3wvlk",
-                        "events": [
-                          {
-                            "address": "erd1qqqqqqqqqqqqqpgqllqglpjdrz5kn3m0k9uf9hdqjmg3xdhk6r7se3wvlk",
-                            "identifier": "writeLog",
-                            "topics": [
-                              "AAAAAAAAAAAFAP/Aj4ZNGKlpx2+xeJLdoJbREzb20P0=",
-                              "QHRvbyBtdWNoIGdhcyBwcm92aWRlZCBmb3IgcHJvY2Vzc2luZzogZ2FzIHByb3ZpZGVkID0gNTk1NjM3ODI1LCBnYXMgdXNlZCA9IDIxNjE3NzA="
-                            ],
-                            "data": "QDZmNmI="
-                          },
-                          {
-                            "address": "erd1qqqqqqqqqqqqqpgqllqglpjdrz5kn3m0k9uf9hdqjmg3xdhk6r7se3wvlk",
-                            "identifier": "completedTxEvent",
-                            "topics": [
-                              "QdVv2s8+FN5n6CFCfHMrYuv6B8gtLl223nX+OhyCjZs="
-                            ],
-                            "data": null
-                          }
-                        ]
-                      },
-                      "operation": "transfer"
-                    },
-                    {
-                      "hash": "41d56fdacf3e14de67e821427c732b62ebfa07c82d2e5db6de75fe3a1c828d9b",
-                      "nonce": 0,
-                      "value": 0,
-                      "receiver": "erd1qqqqqqqqqqqqqpgq4nlkk7jwhqgp4r08lal46tqt70jdv0685u7qrr3l2d",
-                      "sender": "erd1qqqqqqqqqqqqqpgqllqglpjdrz5kn3m0k9uf9hdqjmg3xdhk6r7se3wvlk",
-                      "data": "returnTwoU64@4f3c60",
-                      "prevTxHash": "4d50a055663dfee2479851684d7fb83cf00695b6f03f4dbbdf0f9232477cafc4",
-                      "originalTxHash": "4d50a055663dfee2479851684d7fb83cf00695b6f03f4dbbdf0f9232477cafc4",
-                      "gasLimit": 597479490,
-                      "gasPrice": 1000000000,
-                      "callType": 1,
-                      "operation": "transfer",
-                      "function": "returnTwoU64"
-                    }
-                  ],
-                  "logs": {
-                    "address": "erd1qqqqqqqqqqqqqpgqllqglpjdrz5kn3m0k9uf9hdqjmg3xdhk6r7se3wvlk",
-                    "events": [
-                      {
-                        "address": "erd1qqqqqqqqqqqqqpgqllqglpjdrz5kn3m0k9uf9hdqjmg3xdhk6r7se3wvlk",
-                        "identifier": "writeLog",
-                        "topics": [
-                          "5fXsK/a5JVZf0e2Z6ViFglDOQP1zsS1XkuaLvaZ5pzw="
-                        ],
-                        "data": "QDZmNmI="
-                      }
-                    ]
-                  },
-                  "status": "success",
-                  "operation": "transfer",
-                  "function": "asyncCallAnotherContractReturnTwoU64NoCallback",
-                  "initiallyPaidFee": "6214335000000000",
-                  "fee": "6214335000000000",
-                  "chainID": "D",
-                  "version": 2,
-                  "options": 0
-                }
-              },
-              "error": "",
-              "code": "successful"
-            }
-        "#;
-
-    let tx_on_network: TransactionOnNetwork = serde_json::from_str::<TransactionInfo>(data)
-        .unwrap()
-        .data
-        .unwrap()
-        .transaction;
-    let tx_response = TxResponse::from_network_tx(tx_on_network);
-
-    let expected: Vec<Vec<u8>> = vec![];
-
-    assert_eq!(tx_response.out, expected)
-}
-
-#[test]
-fn test_with_multi_contract_cross_shard_tx_that_has_non_returning_callback() {
-    // transaction data from the devnet
-    // context : user -> A --async call--> B --callback--> A, the callback returns ()
-    let data = r#"
-            {
-              "data": {
-                "transaction": {
-                  "type": "normal",
-                  "processingTypeOnSource": "SCInvoking",
-                  "processingTypeOnDestination": "SCInvoking",
-                  "hash": "4f7f19e448176e4d47a0f844cbd6bdb1b6c68035dafe927e8249ed60af1c3b17",
-                  "nonce": 52,
-                  "round": 7647560,
-                  "epoch": 6340,
-                  "value": "0",
-                  "receiver": "erd1qqqqqqqqqqqqqpgqllqglpjdrz5kn3m0k9uf9hdqjmg3xdhk6r7se3wvlk",
-                  "sender": "erd1uh67c2lkhyj4vh73akv7jky9sfgvus8awwcj64uju69mmfne5u7q299t7g",
-                  "gasPrice": 1000000000,
-                  "gasLimit": 600000000,
-                  "gasUsed": 600000000,
-                  "data": "YXN5bmNDYWxsQW5vdGhlckNvbnRyYWN0UmV0dXJuVHdvVTY0V2l0aE5vblJldHVybmluZ0NhbGxiYWNrQDAwMDAwMDAwMDAwMDAwMDAwNTAwQUNGRjZCN0E0RUI4MTAxQThERTdGRjdGNUQyQzBCRjNFNEQ2M0Y0N0E3M0M=",
-                  "signature": "3918fce429b2059b2321b709011079755dbb835e12839278ee510e4741180540e80c6111eea1d3312b2c63446de08b20e01f6040358fa94d1633c355bb65bc0f",
-                  "sourceShard": 0,
-                  "destinationShard": 1,
-                  "blockNonce": 7593795,
-                  "blockHash": "c17e727f90025225670b7852ea9807c67753c9b3f21b6ec7cc40077e3849a8b7",
-                  "notarizedAtSourceInMetaNonce": 7609940,
-                  "NotarizedAtSourceInMetaHash": "c67b5c550986cfd6c94d00f4b90234eb38ee196ff0d79a00d916f3bd24be272c",
-                  "notarizedAtDestinationInMetaNonce": 7609944,
-                  "notarizedAtDestinationInMetaHash": "d59b7398d962ce3119679af59d5d74e10083e62c3ee2b15421cc0d607979ca18",
-                  "miniblockType": "TxBlock",
-                  "miniblockHash": "2977affeffeb6cf41117bed442662021cb713528cdb1d0dce4537b01caeb8e0b",
-                  "hyperblockNonce": 7609944,
-                  "hyperblockHash": "d59b7398d962ce3119679af59d5d74e10083e62c3ee2b15421cc0d607979ca18",
-                  "timestamp": 1694436960,
-                  "smartContractResults": [
-                    {
-                      "hash": "fe7474188d5ca4b84c7577f03fc778d22d53c070dfcb05a9cda840229d30e4d3",
-                      "nonce": 0,
-                      "value": 0,
-                      "receiver": "erd1qqqqqqqqqqqqqpgq4nlkk7jwhqgp4r08lal46tqt70jdv0685u7qrr3l2d",
-                      "sender": "erd1qqqqqqqqqqqqqpgqllqglpjdrz5kn3m0k9uf9hdqjmg3xdhk6r7se3wvlk",
-                      "data": "returnTwoU64@4f3c60",
-                      "prevTxHash": "4f7f19e448176e4d47a0f844cbd6bdb1b6c68035dafe927e8249ed60af1c3b17",
-                      "originalTxHash": "4f7f19e448176e4d47a0f844cbd6bdb1b6c68035dafe927e8249ed60af1c3b17",
-                      "gasLimit": 596979545,
-                      "gasPrice": 1000000000,
-                      "callType": 1,
-                      "operation": "transfer",
-                      "function": "returnTwoU64"
-                    },
-                    {
-                      "hash": "948dc6702b376d1e043db8de2f87ca12907c342f54cfad7dfebadf59145ca3ac",
-                      "nonce": 0,
-                      "value": 0,
-                      "receiver": "erd1qqqqqqqqqqqqqpgqllqglpjdrz5kn3m0k9uf9hdqjmg3xdhk6r7se3wvlk",
-                      "sender": "erd1qqqqqqqqqqqqqpgq4nlkk7jwhqgp4r08lal46tqt70jdv0685u7qrr3l2d",
-                      "data": "@00@0a@0218711a00",
-                      "prevTxHash": "fe7474188d5ca4b84c7577f03fc778d22d53c070dfcb05a9cda840229d30e4d3",
-                      "originalTxHash": "4f7f19e448176e4d47a0f844cbd6bdb1b6c68035dafe927e8249ed60af1c3b17",
-                      "gasLimit": 595137880,
-                      "gasPrice": 1000000000,
-                      "callType": 2,
-                      "logs": {
-                        "address": "erd1qqqqqqqqqqqqqpgqllqglpjdrz5kn3m0k9uf9hdqjmg3xdhk6r7se3wvlk",
-                        "events": [
-                          {
-                            "address": "erd1qqqqqqqqqqqqqpgqllqglpjdrz5kn3m0k9uf9hdqjmg3xdhk6r7se3wvlk",
-                            "identifier": "writeLog",
-                            "topics": [
-                              "AAAAAAAAAAAFAP/Aj4ZNGKlpx2+xeJLdoJbREzb20P0=",
-                              "QHRvbyBtdWNoIGdhcyBwcm92aWRlZCBmb3IgcHJvY2Vzc2luZzogZ2FzIHByb3ZpZGVkID0gNTk1MTM3ODgwLCBnYXMgdXNlZCA9IDIyODg1NTA="
-                            ],
-                            "data": "QDZmNmJAMGFAMDIxODcxMWEwMA=="
-                          },
-                          {
-                            "address": "erd1qqqqqqqqqqqqqpgqllqglpjdrz5kn3m0k9uf9hdqjmg3xdhk6r7se3wvlk",
-                            "identifier": "completedTxEvent",
-                            "topics": [
-                              "/nR0GI1cpLhMdXfwP8d40i1TwHDfywWpzahAIp0w5NM="
-                            ],
-                            "data": null
-                          }
-                        ]
-                      },
-                      "operation": "transfer"
-                    }
-                  ],
-                  "logs": {
-                    "address": "erd1qqqqqqqqqqqqqpgqllqglpjdrz5kn3m0k9uf9hdqjmg3xdhk6r7se3wvlk",
-                    "events": [
-                      {
-                        "address": "erd1qqqqqqqqqqqqqpgqllqglpjdrz5kn3m0k9uf9hdqjmg3xdhk6r7se3wvlk",
-                        "identifier": "writeLog",
-                        "topics": [
-                          "5fXsK/a5JVZf0e2Z6ViFglDOQP1zsS1XkuaLvaZ5pzw="
-                        ],
-                        "data": "QDZmNmI="
-                      }
-                    ]
-                  },
-                  "status": "success",
-                  "operation": "transfer",
-                  "function": "asyncCallAnotherContractReturnTwoU64WithNonReturningCallback",
-                  "initiallyPaidFee": "6235125000000000",
-                  "fee": "6235125000000000",
-                  "chainID": "D",
-                  "version": 2,
-                  "options": 0
-                }
-              },
-              "error": "",
-              "code": "successful"
-            }
-        "#;
-
-    let tx_on_network: TransactionOnNetwork = serde_json::from_str::<TransactionInfo>(data)
-        .unwrap()
-        .data
-        .unwrap()
-        .transaction;
-    let tx_response = TxResponse::from_network_tx(tx_on_network);
-
-    let expected: Vec<Vec<u8>> = vec![];
-
-    assert_eq!(tx_response.out, expected)
-}
-
-#[test]
-fn test_with_multi_contract_cross_shard_tx_that_has_returning_callback() {
-    // transaction data from the devnet
-    // context : user -> A --async call--> B --callback--> A, the callback returns a MultiValue2<u64, u64>
-    let data = r#"
-            {
-              "data": {
-                "transaction": {
-                  "type": "normal",
-                  "processingTypeOnSource": "SCInvoking",
-                  "processingTypeOnDestination": "SCInvoking",
-                  "hash": "f34e136ca81c0e32f6fb532b753612715675073f3718b5db009bb275d246fd7a",
-                  "nonce": 53,
-                  "round": 7647583,
-                  "epoch": 6340,
-                  "value": "0",
-                  "receiver": "erd1qqqqqqqqqqqqqpgqllqglpjdrz5kn3m0k9uf9hdqjmg3xdhk6r7se3wvlk",
-                  "sender": "erd1uh67c2lkhyj4vh73akv7jky9sfgvus8awwcj64uju69mmfne5u7q299t7g",
-                  "gasPrice": 1000000000,
-                  "gasLimit": 600000000,
-                  "gasUsed": 600000000,
-                  "data": "YXN5bmNDYWxsQW5vdGhlckNvbnRyYWN0UmV0dXJuVHdvVTY0V2l0aFJldHVybmluZ0NhbGxiYWNrQDAwMDAwMDAwMDAwMDAwMDAwNTAwQUNGRjZCN0E0RUI4MTAxQThERTdGRjdGNUQyQzBCRjNFNEQ2M0Y0N0E3M0M=",
-                  "signature": "858958d4aaf9cb0220ab2933edad3f65e1cb4c58aa7940cb0f40b489d0bd9fdf5c4736a40d6e813743ee622bb91e9f86eacf01b9a31e0ff53f9c84f13c500304",
-                  "sourceShard": 0,
-                  "destinationShard": 1,
-                  "blockNonce": 7593818,
-                  "blockHash": "b19f97110ca38d3cb15f802a00ab403491b0e5804ebc701527ab50064dc06825",
-                  "notarizedAtSourceInMetaNonce": 7609963,
-                  "NotarizedAtSourceInMetaHash": "4d9db6de610ca778114d44fe91dd036fac7c375c373ae9e77130d3fb9efc8391",
-                  "notarizedAtDestinationInMetaNonce": 7609967,
-                  "notarizedAtDestinationInMetaHash": "a4573d388c31860f9bd6f9507b65d1b3130e445abcada538f10704feba4614e7",
-                  "miniblockType": "TxBlock",
-                  "miniblockHash": "530f5fa3c7af474a187caca8dcea02a7a155017414147871d083bed5c49ec8f5",
-                  "hyperblockNonce": 7609967,
-                  "hyperblockHash": "a4573d388c31860f9bd6f9507b65d1b3130e445abcada538f10704feba4614e7",
-                  "timestamp": 1694437098,
-                  "smartContractResults": [
-                    {
-                      "hash": "065291164a8acd27c26b5a8f09664810081fda18cd54fca635196cf9b200297a",
-                      "nonce": 0,
-                      "value": 0,
-                      "receiver": "erd1qqqqqqqqqqqqqpgq4nlkk7jwhqgp4r08lal46tqt70jdv0685u7qrr3l2d",
-                      "sender": "erd1qqqqqqqqqqqqqpgqllqglpjdrz5kn3m0k9uf9hdqjmg3xdhk6r7se3wvlk",
-                      "data": "returnTwoU64@4f3c60",
-                      "prevTxHash": "f34e136ca81c0e32f6fb532b753612715675073f3718b5db009bb275d246fd7a",
-                      "originalTxHash": "f34e136ca81c0e32f6fb532b753612715675073f3718b5db009bb275d246fd7a",
-                      "gasLimit": 596994205,
-                      "gasPrice": 1000000000,
-                      "callType": 1,
-                      "operation": "transfer",
-                      "function": "returnTwoU64"
-                    },
-                    {
-                      "hash": "bc31cb153ae615204625df84fe9ae3a159aa412b7342f3dca958dd5517a08197",
-                      "nonce": 0,
-                      "value": 0,
-                      "receiver": "erd1qqqqqqqqqqqqqpgqllqglpjdrz5kn3m0k9uf9hdqjmg3xdhk6r7se3wvlk",
-                      "sender": "erd1qqqqqqqqqqqqqpgq4nlkk7jwhqgp4r08lal46tqt70jdv0685u7qrr3l2d",
-                      "data": "@00@0a@0218711a00",
-                      "prevTxHash": "065291164a8acd27c26b5a8f09664810081fda18cd54fca635196cf9b200297a",
-                      "originalTxHash": "f34e136ca81c0e32f6fb532b753612715675073f3718b5db009bb275d246fd7a",
-                      "gasLimit": 595152540,
-                      "gasPrice": 1000000000,
-                      "callType": 2,
-                      "logs": {
-                        "address": "erd1qqqqqqqqqqqqqpgqllqglpjdrz5kn3m0k9uf9hdqjmg3xdhk6r7se3wvlk",
-                        "events": [
-                          {
-                            "address": "erd1qqqqqqqqqqqqqpgqllqglpjdrz5kn3m0k9uf9hdqjmg3xdhk6r7se3wvlk",
-                            "identifier": "writeLog",
-                            "topics": [
-                              "AAAAAAAAAAAFAP/Aj4ZNGKlpx2+xeJLdoJbREzb20P0=",
-                              "QHRvbyBtdWNoIGdhcyBwcm92aWRlZCBmb3IgcHJvY2Vzc2luZzogZ2FzIHByb3ZpZGVkID0gNTk1MTUyNTQwLCBnYXMgdXNlZCA9IDIyODgwMTU="
-                            ],
-                            "data": "QDZmNmJAMGFAMDIxODcxMWEwMA=="
-                          },
-                          {
-                            "address": "erd1qqqqqqqqqqqqqpgqllqglpjdrz5kn3m0k9uf9hdqjmg3xdhk6r7se3wvlk",
-                            "identifier": "completedTxEvent",
-                            "topics": [
-                              "BlKRFkqKzSfCa1qPCWZIEAgf2hjNVPymNRls+bIAKXo="
-                            ],
-                            "data": null
-                          }
-                        ]
-                      },
-                      "operation": "transfer"
-                    }
-                  ],
-                  "logs": {
-                    "address": "erd1qqqqqqqqqqqqqpgqllqglpjdrz5kn3m0k9uf9hdqjmg3xdhk6r7se3wvlk",
-                    "events": [
-                      {
-                        "address": "erd1qqqqqqqqqqqqqpgqllqglpjdrz5kn3m0k9uf9hdqjmg3xdhk6r7se3wvlk",
-                        "identifier": "writeLog",
-                        "topics": [
-                          "5fXsK/a5JVZf0e2Z6ViFglDOQP1zsS1XkuaLvaZ5pzw="
-                        ],
-                        "data": "QDZmNmI="
-                      }
-                    ]
-                  },
-                  "status": "success",
-                  "operation": "transfer",
-                  "function": "asyncCallAnotherContractReturnTwoU64WithReturningCallback",
-                  "initiallyPaidFee": "6230670000000000",
-                  "fee": "6230670000000000",
-                  "chainID": "D",
-                  "version": 2,
-                  "options": 0
-                }
-              },
-              "error": "",
-              "code": "successful"
-            }
-        "#;
-
-    let tx_on_network: TransactionOnNetwork = serde_json::from_str::<TransactionInfo>(data)
-        .unwrap()
-        .data
-        .unwrap()
-        .transaction;
-    let tx_response = TxResponse::from_network_tx(tx_on_network);
-
-    let expected: Vec<Vec<u8>> = vec![];
-
-    assert_eq!(tx_response.out, expected)
-}
-
-#[test]
-fn test_process_issued_token_identifier_fungible() {
-    let data = r#"
-        {
-  "data": {
-    "transaction": {
-      "type": "normal",
-      "processingTypeOnSource": "SCInvoking",
-      "processingTypeOnDestination": "SCInvoking",
-      "hash": "b78170cc5ca5ba441ea46fe84540db9610ccab243ccd4cd3cd976e170c4864c8",
-      "nonce": 61,
-      "round": 173598,
-      "epoch": 72,
-      "value": "50000000000000000",
-      "receiver": "erd1qqqqqqqqqqqqqpgqa7hv0nahgsl8tz0psat46x0tchm0wuyc0n4s6q28ad",
-      "sender": "erd1x39tc3q3nn72ecjnmcz7x0qp09kp97t080x99dgyhx7zh95j0n4szskhlv",
-      "gasPrice": 1000000000,
-      "gasLimit": 100000000,
-      "gasUsed": 100000000,
-      "data": "aXNzdWVMcFRva2VuQDAwMDAwMDAwMDAwMDAwMDAwNTAwMTM5ZWQ3YWU0YWEwMzc5MmU2YmNiMzMyMzk0YTQwZmU3NDZlZWZhNDdjZWJANDU0NzRjNDQ0ZDQ1NTg0YzUwQDQ1NDc0YzQ0NGQ0NTU4",
-      "signature": "b5049d2906adc1305a6a8d0f42749254ca6259c6996d9a35e7dc7528b3c87b48a421879aff70bc6d81483a7559b75e5dcf9be499dcb7d57aa9f25c79ac2ad40d",
-      "sourceShard": 1,
-      "destinationShard": 1,
-      "blockNonce": 173354,
-      "blockHash": "09d85ac264a54e12e7613395211c53fe0ee5a7d3b7111bf5fec1d02794caaacd",
-      "notarizedAtSourceInMetaNonce": 173321,
-      "NotarizedAtSourceInMetaHash": "64a83759da97fe8305cd4cda4b518f2d41ef0a8f3995d264460821edad45e09e",
-      "notarizedAtDestinationInMetaNonce": 173321,
-      "notarizedAtDestinationInMetaHash": "64a83759da97fe8305cd4cda4b518f2d41ef0a8f3995d264460821edad45e09e",
-      "miniblockType": "TxBlock",
-      "miniblockHash": "7f45eee4e35ffc1fbce66b92e4dd2aeae2acb092416aa5aa775b96493256b81d",
-      "hyperblockNonce": 173321,
-      "hyperblockHash": "64a83759da97fe8305cd4cda4b518f2d41ef0a8f3995d264460821edad45e09e",
-      "timestamp": 1695041588,
-      "smartContractResults": [
-        {
-          "hash": "bce3d0dceb0b3e5c8c5780d7da3755c3f7492d551685d493a73bf66ebd36754b",
-          "nonce": 0,
-          "value": 50000000000000000,
-          "receiver": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
-          "sender": "erd1qqqqqqqqqqqqqpgqa7hv0nahgsl8tz0psat46x0tchm0wuyc0n4s6q28ad",
-          "data": "issue@45474c444d45584c50@45474c444d4558@03e8@12@63616e467265657a65@74727565@63616e57697065@74727565@63616e5061757365@74727565@63616e4d696e74@74727565@63616e4275726e@74727565@63616e4368616e67654f776e6572@74727565@63616e55706772616465@74727565@63616e4164645370656369616c526f6c6573@74727565@65ba30",
-          "prevTxHash": "b78170cc5ca5ba441ea46fe84540db9610ccab243ccd4cd3cd976e170c4864c8",
-          "originalTxHash": "b78170cc5ca5ba441ea46fe84540db9610ccab243ccd4cd3cd976e170c4864c8",
-          "gasLimit": 89624222,
-          "gasPrice": 1000000000,
-          "callType": 1,
-          "originalSender": "erd1x39tc3q3nn72ecjnmcz7x0qp09kp97t080x99dgyhx7zh95j0n4szskhlv",
-          "operation": "transfer",
-          "function": "issue"
-        },
-        {
-          "hash": "2a452ff652791d79be5f6933fb583cc5503e876893e54b3b51381a92aa2e904d",
-          "nonce": 0,
-          "value": 0,
-          "receiver": "erd1llllllllllllllllllllllllllllllllllllllllllllllllluqsl6e366",
-          "sender": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
-          "data": "ESDTSetBurnRoleForAll@45474c444d45582d393563366435",
-          "prevTxHash": "bce3d0dceb0b3e5c8c5780d7da3755c3f7492d551685d493a73bf66ebd36754b",
-          "originalTxHash": "b78170cc5ca5ba441ea46fe84540db9610ccab243ccd4cd3cd976e170c4864c8",
-          "gasLimit": 0,
-          "gasPrice": 1000000000,
-          "callType": 0,
-          "logs": {
-            "address": "erd1llllllllllllllllllllllllllllllllllllllllllllllllluqsl6e366",
-            "events": [
-              {
-                "address": "erd1llllllllllllllllllllllllllllllllllllllllllllllllluqsl6e366",
-                "identifier": "completedTxEvent",
-                "topics": [
-                  "vOPQ3OsLPlyMV4DX2jdVw/dJLVUWhdSTpzv2br02dUs="
-                ],
-                "data": null,
-                "additionalData": null
-              }
-            ]
-          },
-          "operation": "transfer"
-        },
-        {
-          "hash": "2c84740ccb3376ea9fa00dab6c6c93fe7a35ee0a1d6dbfa0a1e61064853b0874",
-          "nonce": 0,
-          "value": 0,
-          "receiver": "erd1qqqqqqqqqqqqqpgqa7hv0nahgsl8tz0psat46x0tchm0wuyc0n4s6q28ad",
-          "sender": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
-          "data": "ESDTTransfer@45474c444d45582d393563366435@03e8@00",
-          "prevTxHash": "bce3d0dceb0b3e5c8c5780d7da3755c3f7492d551685d493a73bf66ebd36754b",
-          "originalTxHash": "b78170cc5ca5ba441ea46fe84540db9610ccab243ccd4cd3cd976e170c4864c8",
-          "gasLimit": 39624222,
-          "gasPrice": 1000000000,
-          "callType": 2,
-          "logs": {
-            "address": "erd1qqqqqqqqqqqqqpgqa7hv0nahgsl8tz0psat46x0tchm0wuyc0n4s6q28ad",
-            "events": [
-              {
-                "address": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
-                "identifier": "ESDTTransfer",
-                "topics": [
-                  "RUdMRE1FWC05NWM2ZDU=",
-                  "",
-                  "A+g=",
-                  "AAAAAAAAAAAFAO+ux8+3RD51ieGHV10Z68X293CYfOs="
-                ],
-                "data": null,
-                "additionalData": null
-              },
-              {
-                "address": "erd1qqqqqqqqqqqqqpgqa7hv0nahgsl8tz0psat46x0tchm0wuyc0n4s6q28ad",
-                "identifier": "completedTxEvent",
-                "topics": [
-                  "vOPQ3OsLPlyMV4DX2jdVw/dJLVUWhdSTpzv2br02dUs="
-                ],
-                "data": null,
-                "additionalData": null
-              }
-            ]
-          },
-          "tokens": [
-            "EGLDMEX-95c6d5"
-          ],
-          "esdtValues": [
-            "1000"
-          ],
-          "operation": "ESDTTransfer",
-          "function": "\u0000"
-        },
-        {
-          "hash": "c9dfc4de3c3cee319123087a4f5dd03cc051e728ec6070707a63ea977b535227",
-          "nonce": 0,
-          "value": 0,
-          "receiver": "erd1qqqqqqqqqqqqqpgqa7hv0nahgsl8tz0psat46x0tchm0wuyc0n4s6q28ad",
-          "sender": "erd1qqqqqqqqqqqqqpgqa7hv0nahgsl8tz0psat46x0tchm0wuyc0n4s6q28ad",
-          "data": "\u0000",
-          "prevTxHash": "2c84740ccb3376ea9fa00dab6c6c93fe7a35ee0a1d6dbfa0a1e61064853b0874",
-          "originalTxHash": "b78170cc5ca5ba441ea46fe84540db9610ccab243ccd4cd3cd976e170c4864c8",
-          "gasLimit": 39424222,
-          "gasPrice": 1000000000,
-          "callType": 2,
-          "operation": "transfer",
-          "function": "\u0000"
-        },
-        {
-          "hash": "609c3a8e1903680fef1f6d9e47527b1b5c1259664b868af600162120ce0b8192",
-          "nonce": 1,
-          "value": 300925400000000,
-          "receiver": "erd1qqqqqqqqqqqqqpgqa7hv0nahgsl8tz0psat46x0tchm0wuyc0n4s6q28ad",
-          "sender": "erd1qqqqqqqqqqqqqpgqa7hv0nahgsl8tz0psat46x0tchm0wuyc0n4s6q28ad",
-          "data": "@6f6b",
-          "prevTxHash": "2c84740ccb3376ea9fa00dab6c6c93fe7a35ee0a1d6dbfa0a1e61064853b0874",
-          "originalTxHash": "b78170cc5ca5ba441ea46fe84540db9610ccab243ccd4cd3cd976e170c4864c8",
-          "gasLimit": 0,
-          "gasPrice": 1000000000,
-          "callType": 0,
-          "operation": "transfer",
-          "isRefund": true
-        }
-      ],
-      "logs": {
-        "address": "erd1qqqqqqqqqqqqqpgqa7hv0nahgsl8tz0psat46x0tchm0wuyc0n4s6q28ad",
-        "events": [
-          {
-            "address": "erd1qqqqqqqqqqqqqpgqa7hv0nahgsl8tz0psat46x0tchm0wuyc0n4s6q28ad",
-            "identifier": "transferValueOnly",
-            "topics": [
-              "AAAAAAAAAAAFAO+ux8+3RD51ieGHV10Z68X293CYfOs=",
-              "AAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAC//8=",
-              "saK8LsUAAA=="
-            ],
-            "data": null,
-            "additionalData": null
-          },
-          {
-            "address": "erd1qqqqqqqqqqqqqpgqa7hv0nahgsl8tz0psat46x0tchm0wuyc0n4s6q28ad",
-            "identifier": "writeLog",
-            "topics": [
-              "NEq8RBGc/KziU94F4zwBeWwS+W87zFK1BLm8K5aSfOs="
-            ],
-            "data": "QDZmNmI=",
-            "additionalData": null
-          }
-        ]
-      },
-      "status": "success",
-      "operation": "transfer",
-      "function": "issueLpToken",
-      "initiallyPaidFee": "1214335000000000",
-      "fee": "1214335000000000",
-      "chainID": "D",
-      "version": 2,
-      "options": 0
-    }
-  },
-  "error": "",
-  "code": "successful"
-}
-      "#;
-
-    let tx_on_network: TransactionOnNetwork = serde_json::from_str::<TransactionInfo>(data)
-        .unwrap()
-        .data
-        .unwrap()
-        .transaction;
-    let tx_response = TxResponse::from_network_tx(tx_on_network);
-
-    let expected: Option<String> = Some("EGLDMEX-95c6d5".to_string());
-
-    assert_eq!(tx_response.new_issued_token_identifier, expected)
-}
-
-#[test]
-fn test_process_issued_token_identifier_semi_fungible() {
-    let data = r#"
-        {
-  "data": {
-    "transaction": {
-      "type": "normal",
-      "processingTypeOnSource": "SCInvoking",
-      "processingTypeOnDestination": "SCInvoking",
-      "hash": "0634b9c1db9fd6bfa065fc937d51cec37958fd5d33d0c934a0da3d27776a33ae",
-      "nonce": 65,
-      "round": 8422527,
-      "epoch": 584,
-      "value": "50000000000000000",
-      "receiver": "erd1qqqqqqqqqqqqqpgq06w7lq7relxyh2h6xzh98q8x24psf3fqssvqn4ptek",
-      "sender": "erd1x3g000ew7zzv6kyqhj9jl2wy5g6cc72qahvvxz29zv76jwq6ssvqt0d998",
-      "gasPrice": 1000000000,
-      "gasLimit": 80000000,
-      "gasUsed": 80000000,
-      "data": "aXNzdWVUb2tlbkA0NDZmNzA2NTU0NjU3Mzc0QDQ0NGY1MDQ1NTQ0NTUzNTQ=",
-      "signature": "0191848976e930996f6c62d4921e732f9b0ada8b41ca3b5b63d6bfd304fd44c2a1e8e6643479618ba4a764a36e87f53882b4f707600d5b7d476f2fdd2bac040e",
-      "sourceShard": 0,
-      "destinationShard": 0,
-      "blockNonce": 8420241,
-      "blockHash": "4d302220f6015876c95e7961b770cc67f8ab63c5f0ab69b4d6c2fb15c8bc23bd",
-      "notarizedAtSourceInMetaNonce": 8403647,
-      "NotarizedAtSourceInMetaHash": "f8b83b6d38fa45dacc167b15c93dd07ee5c40db906de34f26e11e7a24f539e30",
-      "notarizedAtDestinationInMetaNonce": 8403647,
-      "notarizedAtDestinationInMetaHash": "f8b83b6d38fa45dacc167b15c93dd07ee5c40db906de34f26e11e7a24f539e30",
-      "miniblockType": "TxBlock",
-      "miniblockHash": "b7b8fc9f3b81d7daae1113cbf73457e16ee31f3a864ef3729a1a21f3a929e112",
-      "hyperblockNonce": 8403647,
-      "hyperblockHash": "f8b83b6d38fa45dacc167b15c93dd07ee5c40db906de34f26e11e7a24f539e30",
-      "timestamp": 1646652762,
-      "smartContractResults": [
-        {
-          "hash": "9aecf3bd5dd5c706a28d1cc7059ac20db74340f136816f667dbefcc58daa3aba",
-          "nonce": 0,
-          "value": 50000000000000000,
-          "receiver": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
-          "sender": "erd1qqqqqqqqqqqqqpgq06w7lq7relxyh2h6xzh98q8x24psf3fqssvqn4ptek",
-          "data": "issueSemiFungible@446f706554657374@444f504554455354@63616e467265657a65@74727565@63616e57697065@74727565@63616e5061757365@74727565@63616e4368616e67654f776e6572@74727565@63616e55706772616465@74727565@63616e4164645370656369616c526f6c6573@74727565@5ca148",
-          "prevTxHash": "0634b9c1db9fd6bfa065fc937d51cec37958fd5d33d0c934a0da3d27776a33ae",
-          "originalTxHash": "0634b9c1db9fd6bfa065fc937d51cec37958fd5d33d0c934a0da3d27776a33ae",
-          "gasLimit": 75958360,
-          "gasPrice": 1000000000,
-          "callType": 1,
-          "originalSender": "erd1x3g000ew7zzv6kyqhj9jl2wy5g6cc72qahvvxz29zv76jwq6ssvqt0d998",
-          "operation": "transfer",
-          "function": "issueSemiFungible"
-        },
-        {
-          "hash": "aacfe9088bb9d2d5b3fbe9cab2b2f1c6a7e9cbab2f1a41020e2c819fc9b43570",
-          "nonce": 66,
-          "value": 0,
-          "receiver": "erd1x3g000ew7zzv6kyqhj9jl2wy5g6cc72qahvvxz29zv76jwq6ssvqt0d998",
-          "sender": "erd1qqqqqqqqqqqqqpgq06w7lq7relxyh2h6xzh98q8x24psf3fqssvqn4ptek",
-          "data": "@6f6b",
-          "prevTxHash": "0634b9c1db9fd6bfa065fc937d51cec37958fd5d33d0c934a0da3d27776a33ae",
-          "originalTxHash": "0634b9c1db9fd6bfa065fc937d51cec37958fd5d33d0c934a0da3d27776a33ae",
-          "gasLimit": 0,
-          "gasPrice": 1000000000,
-          "callType": 0,
-          "operation": "transfer"
-        },
-        {
-          "hash": "3f6f0f3de9e942884e7e1592823a7db7ce935a3f9d3359d8c1ee98a5645332d8",
-          "nonce": 0,
-          "value": 0,
-          "receiver": "erd1qqqqqqqqqqqqqpgq06w7lq7relxyh2h6xzh98q8x24psf3fqssvqn4ptek",
-          "sender": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
-          "data": "@00@444f5045544553542d373732303063",
-          "prevTxHash": "9aecf3bd5dd5c706a28d1cc7059ac20db74340f136816f667dbefcc58daa3aba",
-          "originalTxHash": "0634b9c1db9fd6bfa065fc937d51cec37958fd5d33d0c934a0da3d27776a33ae",
-          "gasLimit": 25958360,
-          "gasPrice": 1000000000,
-          "callType": 2,
-          "originalSender": "erd1qqqqqqqqqqqqqpgq06w7lq7relxyh2h6xzh98q8x24psf3fqssvqn4ptek",
-          "logs": {
-            "address": "erd1qqqqqqqqqqqqqpgq06w7lq7relxyh2h6xzh98q8x24psf3fqssvqn4ptek",
-            "events": [
-              {
-                "address": "erd1qqqqqqqqqqqqqpgq06w7lq7relxyh2h6xzh98q8x24psf3fqssvqn4ptek",
-                "identifier": "completedTxEvent",
-                "topics": [
-                  "muzzvV3VxwaijRzHBZrCDbdDQPE2gW9mfb78xY2qOro="
-                ],
-                "data": null
-              }
-            ]
-          },
-          "operation": "transfer"
-        },
-        {
-          "hash": "c6e4f7c5da455009fb4f6967ce8a273a97b826aa617fa798ffd0cf17bde6b97a",
-          "nonce": 1,
-          "value": 225516180000000,
-          "receiver": "erd1qqqqqqqqqqqqqpgq06w7lq7relxyh2h6xzh98q8x24psf3fqssvqn4ptek",
-          "sender": "erd1qqqqqqqqqqqqqpgq06w7lq7relxyh2h6xzh98q8x24psf3fqssvqn4ptek",
-          "data": "@6f6b",
-          "prevTxHash": "3f6f0f3de9e942884e7e1592823a7db7ce935a3f9d3359d8c1ee98a5645332d8",
-          "originalTxHash": "0634b9c1db9fd6bfa065fc937d51cec37958fd5d33d0c934a0da3d27776a33ae",
-          "gasLimit": 0,
-          "gasPrice": 1000000000,
-          "callType": 0,
-          "operation": "transfer",
-          "isRefund": true
-        }
-      ],
-      "logs": {
-        "address": "erd1qqqqqqqqqqqqqpgq06w7lq7relxyh2h6xzh98q8x24psf3fqssvqn4ptek",
-        "events": [
-          {
-            "address": "erd1qqqqqqqqqqqqqpgq06w7lq7relxyh2h6xzh98q8x24psf3fqssvqn4ptek",
-            "identifier": "transferValueOnly",
-            "topics": [
-              "AAAAAAAAAAAFAH6d74PDz8xLqvowrlOA5lVDBMUghBg=",
-              "AAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAC//8=",
-              "saK8LsUAAA=="
-            ],
-            "data": null
-          },
-          {
-            "address": "erd1qqqqqqqqqqqqqpgq06w7lq7relxyh2h6xzh98q8x24psf3fqssvqn4ptek",
-            "identifier": "writeLog",
-            "topics": [
-              "NFD3vy7whM1YgLyLL6nEojWMeUDt2MMJRRM9qTgahBg="
-            ],
-            "data": "QDZmNmI="
-          }
-        ]
-      },
-      "status": "success",
-      "operation": "transfer",
-      "function": "issueToken",
-      "initiallyPaidFee": "914840000000000",
-      "fee": "914840000000000",
-      "chainID": "1",
-      "version": 1,
-      "options": 0
-    }
-  },
-  "error": "",
-  "code": "successful"
-}
-        "#;
-
-    let tx_on_network: TransactionOnNetwork = serde_json::from_str::<TransactionInfo>(data)
-        .unwrap()
-        .data
-        .unwrap()
-        .transaction;
-    let tx_response = TxResponse::from_network_tx(tx_on_network);
-
-    let expected: Option<String> = Some("DOPETEST-77200c".to_string());
-
-    assert_eq!(tx_response.new_issued_token_identifier, expected)
-}
-
-#[test]
-fn test_process_issued_token_identifier_non_fungible() {
-    let data = r#"
-        {
-  "data": {
-    "transaction": {
-      "type": "normal",
-      "processingTypeOnSource": "SCInvoking",
-      "processingTypeOnDestination": "SCInvoking",
-      "hash": "d296186b432d7e7937bde37d725cd52b765ef334c00b95adcb079933bc2277bb",
-      "nonce": 16,
-      "round": 820170,
-      "epoch": 341,
-      "value": "50000000000000000",
-      "receiver": "erd1qqqqqqqqqqqqqpgqmegl4z2rcfhxjv6pn7dm0n4hndllfaam4fdqwqxld8",
-      "sender": "erd162knt53z7m0f9jjms9wxphr3q9d7zu4ky85xs2cc0ekrqz7k4fdq85lkuc",
-      "gasPrice": 1000000000,
-      "gasLimit": 200000000,
-      "gasUsed": 200000000,
-      "data": "aXNzdWVUb2tlbkA2NzY1NmU2NTdhNzk3M0A0NzQ1NGU=",
-      "signature": "e80d45f4de419799a2bbff1cae1235521c8eef1853ee45b02f95c2da74ce50d241bf75b6ab0c650245562700862ea9759caad40f3e381ac0c4d82cfe56e67c09",
-      "sourceShard": 2,
-      "destinationShard": 2,
-      "blockNonce": 819313,
-      "blockHash": "a1db4ef13f07b86678000df9cc78f244d83dcc35ae51de545f333bf616930d39",
-      "notarizedAtSourceInMetaNonce": 819396,
-      "NotarizedAtSourceInMetaHash": "6d9e511e46d318aa5b77cbfdfde14d2ce8515ce4e954b286f130a6b518ddf26a",
-      "notarizedAtDestinationInMetaNonce": 819396,
-      "notarizedAtDestinationInMetaHash": "6d9e511e46d318aa5b77cbfdfde14d2ce8515ce4e954b286f130a6b518ddf26a",
-      "miniblockType": "TxBlock",
-      "miniblockHash": "afdb278522181aeb9b12f08840e6c534e398e6af9c7f757548308e300e7ec4e9",
-      "hyperblockNonce": 819396,
-      "hyperblockHash": "6d9e511e46d318aa5b77cbfdfde14d2ce8515ce4e954b286f130a6b518ddf26a",
-      "timestamp": 1698921020,
-      "smartContractResults": [
-        {
-          "hash": "6fe0cc002802af1744f394eee4a69224b5e775961d8386e04e7a5b9242f7ff65",
-          "nonce": 0,
-          "value": 50000000000000000,
-          "receiver": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
-          "sender": "erd1qqqqqqqqqqqqqpgqmegl4z2rcfhxjv6pn7dm0n4hndllfaam4fdqwqxld8",
-          "data": "issueNonFungible@67656e657a7973@47454e@63616e467265657a65@74727565@63616e57697065@74727565@63616e5061757365@74727565@63616e5472616e736665724e4654437265617465526f6c65@74727565@63616e4368616e67654f776e6572@66616c7365@63616e55706772616465@66616c7365@63616e4164645370656369616c526f6c6573@74727565@5e30e4",
-          "prevTxHash": "d296186b432d7e7937bde37d725cd52b765ef334c00b95adcb079933bc2277bb",
-          "originalTxHash": "d296186b432d7e7937bde37d725cd52b765ef334c00b95adcb079933bc2277bb",
-          "gasLimit": 196098365,
-          "gasPrice": 1000000000,
-          "callType": 1,
-          "originalSender": "erd162knt53z7m0f9jjms9wxphr3q9d7zu4ky85xs2cc0ekrqz7k4fdq85lkuc",
-          "operation": "transfer",
-          "function": "issueNonFungible"
-        },
-        {
-          "hash": "98afe82512c79f1caaf171bd5919ee469d11ba0c4f725aefcab834278c0f1e58",
-          "nonce": 0,
-          "value": 0,
-          "receiver": "erd1lllllllllllllllllllllllllllllllllllllllllllllllllupq9x7ny0",
-          "sender": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
-          "data": "ESDTSetBurnRoleForAll@47454e2d383638353933",
-          "prevTxHash": "6fe0cc002802af1744f394eee4a69224b5e775961d8386e04e7a5b9242f7ff65",
-          "originalTxHash": "d296186b432d7e7937bde37d725cd52b765ef334c00b95adcb079933bc2277bb",
-          "gasLimit": 0,
-          "gasPrice": 1000000000,
-          "callType": 0,
-          "logs": {
-            "address": "erd1lllllllllllllllllllllllllllllllllllllllllllllllllupq9x7ny0",
-            "events": [
-              {
-                "address": "erd1lllllllllllllllllllllllllllllllllllllllllllllllllupq9x7ny0",
-                "identifier": "completedTxEvent",
-                "topics": [
-                  "b+DMACgCrxdE85Tu5KaSJLXndZYdg4bgTnpbkkL3/2U="
-                ],
-                "data": null,
-                "additionalData": null
-              }
-            ]
-          },
-          "operation": "transfer"
-        },
-        {
-          "hash": "83494ad9369738b574a7266cbfb12ce63ccf634950cd6b0ec16107b8fb42f8f6",
-          "nonce": 0,
-          "value": 0,
-          "receiver": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
-          "sender": "erd1qqqqqqqqqqqqqpgqmegl4z2rcfhxjv6pn7dm0n4hndllfaam4fdqwqxld8",
-          "data": "setSpecialRole@47454e2d383638353933@00000000000000000500de51fa8943c26e6933419f9bb7ceb79b7ff4f7bbaa5a@45534454526f6c654e4654437265617465@5e30e4",
-          "prevTxHash": "112d18ec0364b4700b1bfb3df517c80dba547a53373ece2a9e71acd5266e7b64",
-          "originalTxHash": "d296186b432d7e7937bde37d725cd52b765ef334c00b95adcb079933bc2277bb",
-          "gasLimit": 142399698,
-          "gasPrice": 1000000000,
-          "callType": 1,
-          "operation": "transfer",
-          "function": "setSpecialRole"
-        },
-        {
-          "hash": "112d18ec0364b4700b1bfb3df517c80dba547a53373ece2a9e71acd5266e7b64",
-          "nonce": 0,
-          "value": 0,
-          "receiver": "erd1qqqqqqqqqqqqqpgqmegl4z2rcfhxjv6pn7dm0n4hndllfaam4fdqwqxld8",
-          "sender": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
-          "data": "@00@47454e2d383638353933",
-          "prevTxHash": "6fe0cc002802af1744f394eee4a69224b5e775961d8386e04e7a5b9242f7ff65",
-          "originalTxHash": "d296186b432d7e7937bde37d725cd52b765ef334c00b95adcb079933bc2277bb",
-          "gasLimit": 146098365,
-          "gasPrice": 1000000000,
-          "callType": 2,
-          "originalSender": "erd1qqqqqqqqqqqqqpgqmegl4z2rcfhxjv6pn7dm0n4hndllfaam4fdqwqxld8",
-          "logs": {
-            "address": "erd1qqqqqqqqqqqqqpgqmegl4z2rcfhxjv6pn7dm0n4hndllfaam4fdqwqxld8",
-            "events": [
-              {
-                "address": "erd1qqqqqqqqqqqqqpgqmegl4z2rcfhxjv6pn7dm0n4hndllfaam4fdqwqxld8",
-                "identifier": "writeLog",
-                "topics": [
-                  "AAAAAAAAAAAFAN5R+olDwm5pM0Gfm7fOt5t/9Pe7qlo="
-                ],
-                "data": "QDZmNmI=",
-                "additionalData": null
-              }
-            ]
-          },
-          "operation": "transfer"
-        },
-        {
-          "hash": "db5d74970374337956fa61fb4fd90057b3f6a82ea3e259b389934b71a1652e5f",
-          "nonce": 0,
-          "value": 0,
-          "receiver": "erd1qqqqqqqqqqqqqpgqmegl4z2rcfhxjv6pn7dm0n4hndllfaam4fdqwqxld8",
-          "sender": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
-          "data": "ESDTSetRole@47454e2d383638353933@45534454526f6c654e4654437265617465",
-          "prevTxHash": "83494ad9369738b574a7266cbfb12ce63ccf634950cd6b0ec16107b8fb42f8f6",
-          "originalTxHash": "d296186b432d7e7937bde37d725cd52b765ef334c00b95adcb079933bc2277bb",
-          "gasLimit": 0,
-          "gasPrice": 1000000000,
-          "callType": 0,
-          "logs": {
-            "address": "erd1qqqqqqqqqqqqqpgqmegl4z2rcfhxjv6pn7dm0n4hndllfaam4fdqwqxld8",
-            "events": [
-              {
-                "address": "erd1qqqqqqqqqqqqqpgqmegl4z2rcfhxjv6pn7dm0n4hndllfaam4fdqwqxld8",
-                "identifier": "ESDTSetRole",
-                "topics": [
-                  "R0VOLTg2ODU5Mw==",
-                  "",
-                  "",
-                  "RVNEVFJvbGVORlRDcmVhdGU="
-                ],
-                "data": null,
-                "additionalData": null
-              },
-              {
-                "address": "erd1qqqqqqqqqqqqqpgqmegl4z2rcfhxjv6pn7dm0n4hndllfaam4fdqwqxld8",
-                "identifier": "completedTxEvent",
-                "topics": [
-                  "g0lK2TaXOLV0pyZsv7Es5jzPY0lQzWsOwWEHuPtC+PY="
-                ],
-                "data": null,
-                "additionalData": null
-              }
-            ]
-          },
-          "operation": "ESDTSetRole",
-          "function": "ESDTSetRole"
-        },
-        {
-          "hash": "a6a665f47977a59c4c2baf460281fc938e04ae0f87ac2e78040a14ae27822701",
-          "nonce": 0,
-          "value": 0,
-          "receiver": "erd1qqqqqqqqqqqqqpgqmegl4z2rcfhxjv6pn7dm0n4hndllfaam4fdqwqxld8",
-          "sender": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
-          "data": "@00",
-          "prevTxHash": "83494ad9369738b574a7266cbfb12ce63ccf634950cd6b0ec16107b8fb42f8f6",
-          "originalTxHash": "d296186b432d7e7937bde37d725cd52b765ef334c00b95adcb079933bc2277bb",
-          "gasLimit": 92399698,
-          "gasPrice": 1000000000,
-          "callType": 2,
-          "originalSender": "erd1qqqqqqqqqqqqqpgqmegl4z2rcfhxjv6pn7dm0n4hndllfaam4fdqwqxld8",
-          "logs": {
-            "address": "erd1qqqqqqqqqqqqqpgqmegl4z2rcfhxjv6pn7dm0n4hndllfaam4fdqwqxld8",
-            "events": [
-              {
-                "address": "erd1qqqqqqqqqqqqqpgqmegl4z2rcfhxjv6pn7dm0n4hndllfaam4fdqwqxld8",
-                "identifier": "writeLog",
-                "topics": [
-                  "AAAAAAAAAAAFAN5R+olDwm5pM0Gfm7fOt5t/9Pe7qlo=",
-                  "QHRvbyBtdWNoIGdhcyBwcm92aWRlZCBmb3IgcHJvY2Vzc2luZzogZ2FzIHByb3ZpZGVkID0gOTIzOTk2OTgsIGdhcyB1c2VkID0gMzE0MTg4MA=="
-                ],
-                "data": "QDZmNmI=",
-                "additionalData": null
-              },
-              {
-                "address": "erd1qqqqqqqqqqqqqpgqmegl4z2rcfhxjv6pn7dm0n4hndllfaam4fdqwqxld8",
-                "identifier": "completedTxEvent",
-                "topics": [
-                  "g0lK2TaXOLV0pyZsv7Es5jzPY0lQzWsOwWEHuPtC+PY="
-                ],
-                "data": null,
-                "additionalData": null
-              }
-            ]
-          },
-          "operation": "transfer"
-        }
-      ],
-      "logs": {
-        "address": "erd1qqqqqqqqqqqqqpgqmegl4z2rcfhxjv6pn7dm0n4hndllfaam4fdqwqxld8",
-        "events": [
-          {
-            "address": "erd1qqqqqqqqqqqqqpgqmegl4z2rcfhxjv6pn7dm0n4hndllfaam4fdqwqxld8",
-            "identifier": "transferValueOnly",
-            "topics": [
-              "AAAAAAAAAAAFAN5R+olDwm5pM0Gfm7fOt5t/9Pe7qlo=",
-              "AAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAC//8=",
-              "saK8LsUAAA=="
-            ],
-            "data": null,
-            "additionalData": null
-          },
-          {
-            "address": "erd1qqqqqqqqqqqqqpgqmegl4z2rcfhxjv6pn7dm0n4hndllfaam4fdqwqxld8",
-            "identifier": "writeLog",
-            "topics": [
-              "0q010iL23pLKW4FcYNxxAVvhcrYh6GgrGH5sMAvWqlo="
-            ],
-            "data": "QDZmNmI=",
-            "additionalData": null
-          }
-        ]
-      },
-      "status": "success",
-      "operation": "transfer",
-      "function": "issueToken",
-      "initiallyPaidFee": "2097020000000000",
-      "fee": "2097020000000000",
-      "chainID": "D",
-      "version": 1,
-      "options": 0
-    }
-  },
-  "error": "",
-  "code": "successful"
-}
-        "#;
-
-    let tx_on_network: TransactionOnNetwork = serde_json::from_str::<TransactionInfo>(data)
-        .unwrap()
-        .data
-        .unwrap()
-        .transaction;
-    let tx_response = TxResponse::from_network_tx(tx_on_network);
-
-    let expected: Option<String> = Some("GEN-868593".to_string());
-
-    assert_eq!(tx_response.new_issued_token_identifier, expected)
-}
-
-#[test]
-fn test_process_issued_token_identifier_meta_esdt() {
-    let data = r#"
-        {
-  "data": {
-    "transaction": {
-      "type": "normal",
-      "processingTypeOnSource": "SCInvoking",
-      "processingTypeOnDestination": "SCInvoking",
-      "hash": "408433c5db749f4666bee6a8b599944071bf493c43ff5f01282a74c22ea2ea43",
-      "nonce": 419,
-      "round": 1787093,
-      "epoch": 744,
-      "value": "50000000000000000",
-      "receiver": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
-      "sender": "erd1j6kua7p67qnaw3y4sudmk25xsuv4k8ws6pwvax8fd2vtmuc3q33s840l87",
-      "gasPrice": 1000000000,
-      "gasLimit": 600000000,
-      "gasUsed": 157220928,
-      "data": "ZGVwbG95QXNoc3dhcExQQUNTdHJhdGVneUA0MTRjNTAyZDYzNjE2NTYxNjMzNUA0MTU0NTMyZDM0NjMzMDM5MzIzMEAwM2U4QDAzZThAQDNiOWFjYTAwQDAwMDAwMDAwMDAwMDAwMDAwNTAwOTU3MzkwYWVkYTQzMmY1MmE0MTFkNTE5NzRmZTkzZDQwZDI3NzMzZTA0NjNAMDAwMDAwMDAwMDAwMDAwMDA1MDBkMTJjYzczY2JkYTZmMjY1OWM5NTllNWQ1NzU4YWY5MmNhMTM4NDg2NTIzM0AwMDAwMDAwMDAwMDAwMDAwMDUwMDUxZGY3MTc1OGNmMmFjYTViNDZkZWQ4MTU1OGI1NTE1ZGMyOWYzZjM1MjMzQEAwMDAwMDAwMDAwMDAwMDAwMDUwMDdlNGExZGZjNDM3Y2VkNDlkYjlmMTYzNzk4NDE2Yjg0YWMyMWQ0Yzk3Y2ViMDAwMDAwMGM1NzQ1NDc0YzQ0MmQ2MTMyMzg2MzM1MzkwMDAwMDAwMDAwMDAwMDAwMDUwMGE4YmE5ZTY4NjI2YmJjOTkzZmQ3OTVlOGJiNmY0Nzk0M2IyZjVmZmE3Y2ViMDAwMDAwMGE1NTU0NGIyZDMxMzQ2NDM1Mzc2NEAwMDAwMDAwMTAwMDAwMDAwMDAwMDAwMDAwNTAwNTFkZjcxNzU4Y2YyYWNhNWI0NmRlZDgxNTU4YjU1MTVkYzI5ZjNmMzUyMzMwMDAwMDAwYjQyNTU1MzQ0MmQ2NDM0NjMzMDMxMzQwMDAwMDAwMDAwQDAxODZhMEAyNzEw",
-      "signature": "4648af0b96eb430e4986b9fb760549742de09c809b46b984e5d995c898d80c25bfc0717c30da34bd89cd3005d98ee895afa39ee588b7b74b4807c63cbeade807",
-      "sourceShard": 1,
-      "destinationShard": 1,
-      "blockNonce": 1785520,
-      "blockHash": "8f926a5d79fa84bc69949a21bfbba17447091a8a074ac172fa0b88e4475a1214",
-      "notarizedAtSourceInMetaNonce": 1785568,
-      "NotarizedAtSourceInMetaHash": "eebd1aa5c3dde083f9c367242c054affedd36bfc95f7bcc1d4e2d90beb5754e9",
-      "notarizedAtDestinationInMetaNonce": 1785568,
-      "notarizedAtDestinationInMetaHash": "eebd1aa5c3dde083f9c367242c054affedd36bfc95f7bcc1d4e2d90beb5754e9",
-      "miniblockType": "TxBlock",
-      "miniblockHash": "b85d82db6d69cbc1911b3455d2837eeb3170b391926efa2eacb4d9c8e3c96ee4",
-      "hyperblockNonce": 1785568,
-      "hyperblockHash": "eebd1aa5c3dde083f9c367242c054affedd36bfc95f7bcc1d4e2d90beb5754e9",
-      "timestamp": 1704722558,
-      "smartContractResults": [
-        {
-          "hash": "ea9a96c079e66249e6b73c0341991dad96ca81f855f2fc4abe0d432be117a882",
-          "nonce": 420,
-          "value": 4427790720000000,
-          "receiver": "erd1j6kua7p67qnaw3y4sudmk25xsuv4k8ws6pwvax8fd2vtmuc3q33s840l87",
-          "sender": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
-          "data": "@6f6b",
-          "prevTxHash": "408433c5db749f4666bee6a8b599944071bf493c43ff5f01282a74c22ea2ea43",
-          "originalTxHash": "408433c5db749f4666bee6a8b599944071bf493c43ff5f01282a74c22ea2ea43",
-          "gasLimit": 0,
-          "gasPrice": 1000000000,
-          "callType": 0,
-          "operation": "transfer",
-          "isRefund": true
-        },
-        {
-          "hash": "6082975132a2c9d8197dfd0f9852b454ad344740eebdbdf93f620b2796ab723b",
-          "nonce": 0,
-          "value": 50000000000000000,
-          "receiver": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
-          "sender": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
-          "data": "registerMetaESDT@415453417368537761704c5041435661756c74@4156415348@12@63616e467265657a65@66616c7365@63616e57697065@66616c7365@63616e5061757365@66616c7365@63616e5472616e736665724e4654437265617465526f6c65@66616c7365@63616e4368616e67654f776e6572@66616c7365@63616e55706772616465@66616c7365@63616e4164645370656369616c526f6c6573@74727565@9eb30a87c92674ab1469700c0b385b3850e86de80f87dec6cf3213c7e379a646@408433c5db749f4666bee6a8b599944071bf493c43ff5f01282a74c22ea2ea43@03eb4a30",
-          "prevTxHash": "408433c5db749f4666bee6a8b599944071bf493c43ff5f01282a74c22ea2ea43",
-          "originalTxHash": "408433c5db749f4666bee6a8b599944071bf493c43ff5f01282a74c22ea2ea43",
-          "gasLimit": 125751600,
-          "gasPrice": 1000000000,
-          "callType": 1,
-          "originalSender": "erd1j6kua7p67qnaw3y4sudmk25xsuv4k8ws6pwvax8fd2vtmuc3q33s840l87",
-          "operation": "transfer",
-          "function": "registerMetaESDT"
-        },
-        {
-          "hash": "290f85d7ec2f7d5797510290358e9e0f76bb880451efaacb0d69280b8d94c67a",
-          "nonce": 0,
-          "value": 0,
-          "receiver": "erd1llllllllllllllllllllllllllllllllllllllllllllllllluqsl6e366",
-          "sender": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
-          "data": "ESDTSetBurnRoleForAll@41564153482d376438623564",
-          "prevTxHash": "6082975132a2c9d8197dfd0f9852b454ad344740eebdbdf93f620b2796ab723b",
-          "originalTxHash": "408433c5db749f4666bee6a8b599944071bf493c43ff5f01282a74c22ea2ea43",
-          "gasLimit": 0,
-          "gasPrice": 1000000000,
-          "callType": 0,
-          "originalSender": "erd1j6kua7p67qnaw3y4sudmk25xsuv4k8ws6pwvax8fd2vtmuc3q33s840l87",
-          "logs": {
-            "address": "erd1llllllllllllllllllllllllllllllllllllllllllllllllluqsl6e366",
-            "events": [
-              {
-                "address": "erd1llllllllllllllllllllllllllllllllllllllllllllllllluqsl6e366",
-                "identifier": "completedTxEvent",
-                "topics": [
-                  "YIKXUTKiydgZff0PmFK0VK00R0Duvb35P2ILJ5arcjs="
-                ],
-                "data": null,
-                "additionalData": null
-              }
-            ]
-          },
-          "operation": "transfer"
-        },
-        {
-          "hash": "1aa62a6251edd216bd4e5ae59f7e676d5d2f88597685e0ec0e25ac4434bfccdb",
-          "nonce": 0,
-          "value": 0,
-          "receiver": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
-          "sender": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
-          "data": "@00@41564153482d376438623564@d0644194444642fd16ee156307f6fda0e8f8baf4c496e1a1dc85e027ecc08a4a@9eb30a87c92674ab1469700c0b385b3850e86de80f87dec6cf3213c7e379a646@408433c5db749f4666bee6a8b599944071bf493c43ff5f01282a74c22ea2ea43@00",
-          "prevTxHash": "6082975132a2c9d8197dfd0f9852b454ad344740eebdbdf93f620b2796ab723b",
-          "originalTxHash": "408433c5db749f4666bee6a8b599944071bf493c43ff5f01282a74c22ea2ea43",
-          "gasLimit": 75751600,
-          "gasPrice": 1000000000,
-          "callType": 2,
-          "originalSender": "erd1j6kua7p67qnaw3y4sudmk25xsuv4k8ws6pwvax8fd2vtmuc3q33s840l87",
-          "logs": {
-            "address": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
-            "events": [
-              {
-                "address": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
-                "identifier": "writeLog",
-                "topics": [
-                  "AAAAAAAAAAAFAH6UefeHERqHcLpMz2gC3xXGhFsJBGM=",
-                  "QHRvbyBtdWNoIGdhcyBwcm92aWRlZCBmb3IgcHJvY2Vzc2luZzogZ2FzIHByb3ZpZGVkID0gNzU3NTE2MDAsIGdhcyB1c2VkID0gNDE3NjA1OQ=="
-                ],
-                "data": "QDZmNmI=",
-                "additionalData": [
-                  "QDZmNmI="
-                ]
-              },
-              {
-                "address": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
-                "identifier": "completedTxEvent",
-                "topics": [
-                  "YIKXUTKiydgZff0PmFK0VK00R0Duvb35P2ILJ5arcjs="
-                ],
-                "data": null,
-                "additionalData": null
-              }
-            ]
-          },
-          "operation": "transfer"
-        }
-      ],
-      "logs": {
-        "address": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
-        "events": [
-          {
-            "address": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
-            "identifier": "transferValueOnly",
-            "topics": [
-              "",
-              "AAAAAAAAAAAFANAMwOY4h/9reS00I0pE56xrV11LBGM="
-            ],
-            "data": "RGVwbG95RnJvbVNvdXJjZQ==",
-            "additionalData": [
-              "RGVwbG95RnJvbVNvdXJjZQ==",
-              "aW5pdA==",
-              "QUxQLWNhZWFjNQ==",
-              "QVRTLTRjMDkyMA==",
-              "A+g=",
-              "A+g=",
-              "",
-              "O5rKAA=="
-            ]
-          },
-          {
-            "address": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
-            "identifier": "transferValueOnly",
-            "topics": [
-              "",
-              "AAAAAAAAAAAFADJ0SE0vUW6bO5SurLeFIMfK/HtBBGM="
-            ],
-            "data": "RGVwbG95RnJvbVNvdXJjZQ==",
-            "additionalData": [
-              "RGVwbG95RnJvbVNvdXJjZQ==",
-              "aW5pdA==",
-              "AAAAAAAAAAAFANAMwOY4h/9reS00I0pE56xrV11LBGM=",
-              "AAAAAAAAAAAFAJVzkK7aQy9SpBHVGXT+k9QNJ3M+BGM=",
-              "AAAAAAAAAAAFANEsxzy9pvJlnJWeXVdYr5LKE4SGUjM=",
-              "AAAAAAAAAAAFAFHfcXWM8qyltG3tgVWLVRXcKfPzUjM=",
-              "",
-              "AAAAAAAAAAAFAH5KHfxDfO1J258WN5hBa4SsIdTJfOsAAAAMV0VHTEQtYTI4YzU5AAAAAAAAAAAFAKi6nmhia7yZP9eV6LtvR5Q7L1/6fOsAAAAKVVRLLTE0ZDU3ZA==",
-              "AAAAAQAAAAAAAAAABQBR33F1jPKspbRt7YFVi1UV3Cnz81IzAAAAC0JVU0QtZDRjMDE0AAAAAAA=",
-              "AYag",
-              "JxA="
-            ]
-          },
-          {
-            "address": "erd1qqqqqqqqqqqqqpgqxf6ysnf029hfkwu546kt0pfqcl90c76pq33s0a320f",
-            "identifier": "transferValueOnly",
-            "topics": [
-              "",
-              "AAAAAAAAAAAFANEsxzy9pvJlnJWeXVdYr5LKE4SGUjM="
-            ],
-            "data": "RXhlY3V0ZU9uRGVzdENvbnRleHQ=",
-            "additionalData": [
-              "RXhlY3V0ZU9uRGVzdENvbnRleHQ=",
-              "Z2V0RmFybWluZ1Rva2VuSWQ="
-            ]
-          },
-          {
-            "address": "erd1qqqqqqqqqqqqqpgqxf6ysnf029hfkwu546kt0pfqcl90c76pq33s0a320f",
-            "identifier": "transferValueOnly",
-            "topics": [
-              "",
-              "AAAAAAAAAAAFANEsxzy9pvJlnJWeXVdYr5LKE4SGUjM="
-            ],
-            "data": "RXhlY3V0ZU9uRGVzdENvbnRleHQ=",
-            "additionalData": [
-              "RXhlY3V0ZU9uRGVzdENvbnRleHQ=",
-              "Z2V0RmFybVRva2VuSWQ="
-            ]
-          },
-          {
-            "address": "erd1qqqqqqqqqqqqqpgqxf6ysnf029hfkwu546kt0pfqcl90c76pq33s0a320f",
-            "identifier": "transferValueOnly",
-            "topics": [
-              "",
-              "AAAAAAAAAAAFANEsxzy9pvJlnJWeXVdYr5LKE4SGUjM="
-            ],
-            "data": "RXhlY3V0ZU9uRGVzdENvbnRleHQ=",
-            "additionalData": [
-              "RXhlY3V0ZU9uRGVzdENvbnRleHQ=",
-              "Z2V0UmV3YXJkVG9rZW5JZA=="
-            ]
-          },
-          {
-            "address": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
-            "identifier": "transferValueOnly",
-            "topics": [
-              "saK8LsUAAA==",
-              "AAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAC//8="
-            ],
-            "data": "QXN5bmNDYWxs",
-            "additionalData": [
-              "QXN5bmNDYWxs",
-              "cmVnaXN0ZXJNZXRhRVNEVA==",
-              "QVRTQXNoU3dhcExQQUNWYXVsdA==",
-              "QVZBU0g=",
-              "Eg==",
-              "Y2FuRnJlZXpl",
-              "ZmFsc2U=",
-              "Y2FuV2lwZQ==",
-              "ZmFsc2U=",
-              "Y2FuUGF1c2U=",
-              "ZmFsc2U=",
-              "Y2FuVHJhbnNmZXJORlRDcmVhdGVSb2xl",
-              "ZmFsc2U=",
-              "Y2FuQ2hhbmdlT3duZXI=",
-              "ZmFsc2U=",
-              "Y2FuVXBncmFkZQ==",
-              "ZmFsc2U=",
-              "Y2FuQWRkU3BlY2lhbFJvbGVz",
-              "dHJ1ZQ=="
-            ]
-          },
-          {
-            "address": "erd1qqqqqqqqqqqqqpgqxf6ysnf029hfkwu546kt0pfqcl90c76pq33s0a320f",
-            "identifier": "SCDeploy",
-            "topics": [
-              "AAAAAAAAAAAFADJ0SE0vUW6bO5SurLeFIMfK/HtBBGM=",
-              "AAAAAAAAAAAFAH6UefeHERqHcLpMz2gC3xXGhFsJBGM=",
-              "fvRqbue54Womde/CN2IkRGkrx8tsU+xkLvi3+uwMkhY="
-            ],
-            "data": null,
-            "additionalData": null
-          },
-          {
-            "address": "erd1qqqqqqqqqqqqqpgq6qxvpe3csllkk7fdxs3553884344wh2tq33sakulat",
-            "identifier": "SCDeploy",
-            "topics": [
-              "AAAAAAAAAAAFANAMwOY4h/9reS00I0pE56xrV11LBGM=",
-              "AAAAAAAAAAAFAH6UefeHERqHcLpMz2gC3xXGhFsJBGM=",
-              "E3blQfRJfCKLWDr06Od703DSZenIzq8KND+xUjmGY/M="
-            ],
-            "data": null,
-            "additionalData": null
-          }
-        ]
-      },
-      "status": "success",
-      "operation": "transfer",
-      "function": "deployAshswapLPACStrategy",
-      "initiallyPaidFee": "6936045000000000",
-      "fee": "2508254280000000",
-      "chainID": "D",
-      "version": 1,
-      "options": 0
-    }
-  },
-  "error": "",
-  "code": "successful"
-}
-        "#;
-
-    let tx_on_network: TransactionOnNetwork = serde_json::from_str::<TransactionInfo>(data)
-        .unwrap()
-        .data
-        .unwrap()
-        .transaction;
-    let tx_response = TxResponse::from_network_tx(tx_on_network);
-
-    let expected: Option<String> = Some("AVASH-7d8b5d".to_string());
-
-    assert_eq!(tx_response.new_issued_token_identifier, expected)
-}
-
-#[test]
-fn test_set_special_roles_should_not_process_issued_token_identifier() {
-    let data = r#"
-        {
-  "data": {
-    "transaction": {
-      "type": "normal",
-      "processingTypeOnSource": "SCInvoking",
-      "processingTypeOnDestination": "SCInvoking",
-      "hash": "cbb1f866da564a04332297dfc4f637be2e50e62bbf4441bf42247ad429747ce0",
-      "nonce": 420,
-      "round": 1787109,
-      "epoch": 744,
-      "value": "0",
-      "receiver": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
-      "sender": "erd1j6kua7p67qnaw3y4sudmk25xsuv4k8ws6pwvax8fd2vtmuc3q33s840l87",
-      "gasPrice": 1000000000,
-      "gasLimit": 600000000,
-      "gasUsed": 129636807,
-      "data": "ZmluaXNoVmF1bHREZXBsb3ltZW50cw==",
-      "signature": "dca943ef1a788bfa6cb0e9aa3900b8340e4908075cbfefaa2a66688f6f0c0fed349edb2eb48eec427cd9098822fba875e4d66072fbdb44cb7f4c1a416736e20c",
-      "sourceShard": 1,
-      "destinationShard": 1,
-      "blockNonce": 1785536,
-      "blockHash": "93ca539e81612768b67a85b7135f7c104e76bec031a758a6b1782910ae49dd8f",
-      "notarizedAtSourceInMetaNonce": 1785584,
-      "NotarizedAtSourceInMetaHash": "71d17afe660282bb42de1ea3eec3e3534a179bd32aa1471c2861ce411bf30552",
-      "notarizedAtDestinationInMetaNonce": 1785584,
-      "notarizedAtDestinationInMetaHash": "71d17afe660282bb42de1ea3eec3e3534a179bd32aa1471c2861ce411bf30552",
-      "miniblockType": "TxBlock",
-      "miniblockHash": "f8c60565af746e92d2c9c09a92734e5eb8da7e42c67a86854c93b349bfe287eb",
-      "hyperblockNonce": 1785584,
-      "hyperblockHash": "71d17afe660282bb42de1ea3eec3e3534a179bd32aa1471c2861ce411bf30552",
-      "timestamp": 1704722654,
-      "smartContractResults": [
-        {
-          "hash": "c3ce9c364de3823ffae250c2bfb40aaf2b18f771ed4bd37bf788ad83a2c651f3",
-          "nonce": 421,
-          "value": 4703631930000000,
-          "receiver": "erd1j6kua7p67qnaw3y4sudmk25xsuv4k8ws6pwvax8fd2vtmuc3q33s840l87",
-          "sender": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
-          "data": "@6f6b",
-          "prevTxHash": "cbb1f866da564a04332297dfc4f637be2e50e62bbf4441bf42247ad429747ce0",
-          "originalTxHash": "cbb1f866da564a04332297dfc4f637be2e50e62bbf4441bf42247ad429747ce0",
-          "gasLimit": 0,
-          "gasPrice": 1000000000,
-          "callType": 0,
-          "operation": "transfer",
-          "isRefund": true
-        },
-        {
-          "hash": "50f9c25a1402ce6d87ae9f890659c8a67462292e471e02c74d64ff7ba1995e60",
-          "nonce": 0,
-          "value": 0,
-          "receiver": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
-          "sender": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
-          "data": "setSpecialRole@41564153482d376438623564@00000000000000000500d00cc0e63887ff6b792d34234a44e7ac6b575d4b0463@45534454526f6c654e4654437265617465@45534454526f6c654e46544164645175616e74697479@45534454526f6c654e46544275726e@0192c6db2c69f50b6968fb22ac558337a851719519cfd1e6bbf79a07bbcf18bc@cbb1f866da564a04332297dfc4f637be2e50e62bbf4441bf42247ad429747ce0@03eb4a30",
-          "prevTxHash": "cbb1f866da564a04332297dfc4f637be2e50e62bbf4441bf42247ad429747ce0",
-          "originalTxHash": "cbb1f866da564a04332297dfc4f637be2e50e62bbf4441bf42247ad429747ce0",
-          "gasLimit": 125751600,
-          "gasPrice": 1000000000,
-          "callType": 1,
-          "originalSender": "erd1j6kua7p67qnaw3y4sudmk25xsuv4k8ws6pwvax8fd2vtmuc3q33s840l87",
-          "operation": "transfer",
-          "function": "setSpecialRole"
-        },
-        {
-          "hash": "d6a5824a60b6c9050462c3f5a02ace00c36e8b4ba1958d132bd394e2ed1e7226",
-          "nonce": 0,
-          "value": 0,
-          "receiver": "erd1qqqqqqqqqqqqqpgq6qxvpe3csllkk7fdxs3553884344wh2tq33sakulat",
-          "sender": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
-          "data": "ESDTSetRole@41564153482d376438623564@45534454526f6c654e4654437265617465@45534454526f6c654e46544164645175616e74697479@45534454526f6c654e46544275726e",
-          "prevTxHash": "50f9c25a1402ce6d87ae9f890659c8a67462292e471e02c74d64ff7ba1995e60",
-          "originalTxHash": "cbb1f866da564a04332297dfc4f637be2e50e62bbf4441bf42247ad429747ce0",
-          "gasLimit": 0,
-          "gasPrice": 1000000000,
-          "callType": 0,
-          "originalSender": "erd1j6kua7p67qnaw3y4sudmk25xsuv4k8ws6pwvax8fd2vtmuc3q33s840l87",
-          "logs": {
-            "address": "erd1qqqqqqqqqqqqqpgq6qxvpe3csllkk7fdxs3553884344wh2tq33sakulat",
-            "events": [
-              {
-                "address": "erd1qqqqqqqqqqqqqpgq6qxvpe3csllkk7fdxs3553884344wh2tq33sakulat",
-                "identifier": "ESDTSetRole",
-                "topics": [
-                  "QVZBU0gtN2Q4YjVk",
-                  "",
-                  "",
-                  "RVNEVFJvbGVORlRDcmVhdGU=",
-                  "RVNEVFJvbGVORlRBZGRRdWFudGl0eQ==",
-                  "RVNEVFJvbGVORlRCdXJu"
-                ],
-                "data": null,
-                "additionalData": null
-              },
-              {
-                "address": "erd1qqqqqqqqqqqqqpgq6qxvpe3csllkk7fdxs3553884344wh2tq33sakulat",
-                "identifier": "completedTxEvent",
-                "topics": [
-                  "UPnCWhQCzm2Hrp+JBlnIpnRiKS5HHgLHTWT/e6GZXmA="
-                ],
-                "data": null,
-                "additionalData": null
-              }
-            ]
-          },
-          "operation": "ESDTSetRole",
-          "function": "ESDTSetRole"
-        },
-        {
-          "hash": "bf1b8b4b301ff548368dfd972896489d5e2a088d5cbdfa1bfe2421cc7f641f7a",
-          "nonce": 0,
-          "value": 0,
-          "receiver": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
-          "sender": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
-          "data": "@00@a68d44c751eba85db0713db8dc9c10c78749189ec0d6f1af5fc67bb656c1254b@0192c6db2c69f50b6968fb22ac558337a851719519cfd1e6bbf79a07bbcf18bc@cbb1f866da564a04332297dfc4f637be2e50e62bbf4441bf42247ad429747ce0@00",
-          "prevTxHash": "50f9c25a1402ce6d87ae9f890659c8a67462292e471e02c74d64ff7ba1995e60",
-          "originalTxHash": "cbb1f866da564a04332297dfc4f637be2e50e62bbf4441bf42247ad429747ce0",
-          "gasLimit": 75751600,
-          "gasPrice": 1000000000,
-          "callType": 2,
-          "originalSender": "erd1j6kua7p67qnaw3y4sudmk25xsuv4k8ws6pwvax8fd2vtmuc3q33s840l87",
-          "logs": {
-            "address": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
-            "events": [
-              {
-                "address": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
-                "identifier": "transferValueOnly",
-                "topics": [
-                  "",
-                  "AAAAAAAAAAAFANAMwOY4h/9reS00I0pE56xrV11LBGM="
-                ],
-                "data": "RXhlY3V0ZU9uRGVzdENvbnRleHQ=",
-                "additionalData": [
-                  "RXhlY3V0ZU9uRGVzdENvbnRleHQ=",
-                  "c2V0U2hhcmVUb2tlbklkZW50aWZpZXI=",
-                  "QVZBU0gtN2Q4YjVk"
-                ]
-              },
-              {
-                "address": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
-                "identifier": "transferValueOnly",
-                "topics": [
-                  "",
-                  "AAAAAAAAAAAFANAMwOY4h/9reS00I0pE56xrV11LBGM="
-                ],
-                "data": "RXhlY3V0ZU9uRGVzdENvbnRleHQ=",
-                "additionalData": [
-                  "RXhlY3V0ZU9uRGVzdENvbnRleHQ=",
-                  "c2V0U3RyYXRlZ3lBZGRyZXNz",
-                  "AAAAAAAAAAAFADJ0SE0vUW6bO5SurLeFIMfK/HtBBGM="
-                ]
-              },
-              {
-                "address": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
-                "identifier": "completedTxEvent",
-                "topics": [
-                  "UPnCWhQCzm2Hrp+JBlnIpnRiKS5HHgLHTWT/e6GZXmA="
-                ],
-                "data": null,
-                "additionalData": null
-              }
-            ]
-          },
-          "operation": "transfer"
-        },
-        {
-          "hash": "9d75a398545f488d4764149245e6ec3101debfce99477c353ac11c3239acd897",
-          "nonce": 1,
-          "value": 648519550000000,
-          "receiver": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
-          "sender": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
-          "data": "@6f6b",
-          "prevTxHash": "bf1b8b4b301ff548368dfd972896489d5e2a088d5cbdfa1bfe2421cc7f641f7a",
-          "originalTxHash": "cbb1f866da564a04332297dfc4f637be2e50e62bbf4441bf42247ad429747ce0",
-          "gasLimit": 0,
-          "gasPrice": 1000000000,
-          "callType": 0,
-          "operation": "transfer",
-          "isRefund": true
-        }
-      ],
-      "logs": {
-        "address": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
-        "events": [
-          {
-            "address": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
-            "identifier": "transferValueOnly",
-            "topics": [
-              "",
-              "AAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAC//8="
-            ],
-            "data": "QXN5bmNDYWxs",
-            "additionalData": [
-              "QXN5bmNDYWxs",
-              "c2V0U3BlY2lhbFJvbGU=",
-              "QVZBU0gtN2Q4YjVk",
-              "AAAAAAAAAAAFANAMwOY4h/9reS00I0pE56xrV11LBGM=",
-              "RVNEVFJvbGVORlRDcmVhdGU=",
-              "RVNEVFJvbGVORlRBZGRRdWFudGl0eQ==",
-              "RVNEVFJvbGVORlRCdXJu"
-            ]
-          }
-        ]
-      },
-      "status": "success",
-      "operation": "transfer",
-      "function": "finishVaultDeployments",
-      "initiallyPaidFee": "6082170000000000",
-      "fee": "1378538070000000",
-      "chainID": "D",
-      "version": 1,
-      "options": 0
-    }
-  },
-  "error": "",
-  "code": "successful"
-}
-        "#;
-
-    let tx_on_network: TransactionOnNetwork = serde_json::from_str::<TransactionInfo>(data)
-        .unwrap()
-        .data
-        .unwrap()
-        .transaction;
-    let tx_response = TxResponse::from_network_tx(tx_on_network);
-
-    let expected: Option<String> = None;
-
-    assert_eq!(tx_response.new_issued_token_identifier, expected)
-}
-
-#[test]
-fn test_multisig_issue_nft_and_set_all_roles() {
-    let data = r#"
-{
-  "data": {
-    "transaction": {
-      "type": "normal",
-      "processingTypeOnSource": "SCInvoking",
-      "processingTypeOnDestination": "SCInvoking",
-      "hash": "08582bc19734ad82d7390be88463c948e5d9f026f4b8f0bfc57620957c3433bd",
-      "nonce": 53,
-      "round": 3050972,
-      "epoch": 1246,
-      "value": "0",
-      "receiver": "erd1qqqqqqqqqqqqqpgqrp3n58vp2dmcaur4whazxngvuhac4xwqa4sq2pjl73",
-      "sender": "erd1uv40ahysflse896x4ktnh6ecx43u7cmy9wnxnvcyp7deg299a4sq6vaywa",
-      "gasPrice": 1000000000,
-      "gasLimit": 80000000,
-      "gasUsed": 80000000,
-      "data": "cGVyZm9ybUFjdGlvbkAwMQ==",
-      "signature": "cb67645595cee5f7967d8d85af05bb7db73e80d9b97611796819249d87cd174b69b4abfc2a3fbe52df1aec965bdea921f7eb34d2b1118aa480699ad1dc85790a",
-      "sourceShard": 0,
-      "destinationShard": 0,
-      "blockNonce": 2984930,
-      "blockHash": "644ae8703b826a23e89429953919ec37f875e34a547ea9f7edd53fb71a99c746",
-      "notarizedAtSourceInMetaNonce": 2988311,
-      "NotarizedAtSourceInMetaHash": "4f608a72e654dd9f466801cd489be8ee1a73fbcd77b128559cd46182d3b9455a",
-      "notarizedAtDestinationInMetaNonce": 2988311,
-      "notarizedAtDestinationInMetaHash": "4f608a72e654dd9f466801cd489be8ee1a73fbcd77b128559cd46182d3b9455a",
-      "miniblockType": "TxBlock",
-      "miniblockHash": "c5a73671bc1d37835ddd15b926157721bc83203ec4e00cd48ae0d46015cb5f0b",
-      "hyperblockNonce": 2988311,
-      "hyperblockHash": "4f608a72e654dd9f466801cd489be8ee1a73fbcd77b128559cd46182d3b9455a",
-      "timestamp": 1712305832,
-      "smartContractResults": [
-        {
-          "hash": "b0b3c8df519c33b314c0ee3d25abae6f17c4432fb3382676ce17a42690811cff",
-          "nonce": 0,
-          "value": 50000000000000000,
-          "receiver": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
-          "sender": "erd1qqqqqqqqqqqqqpgqrp3n58vp2dmcaur4whazxngvuhac4xwqa4sq2pjl73",
-          "data": "registerAndSetAllRoles@54657374436f6c6c656374696f6e31@54455354434f4c4c31@4e4654@@98fa4ff554b9c6990ce577fbb816a271f690dcbd6b148f6583fe7692868ae538@08582bc19734ad82d7390be88463c948e5d9f026f4b8f0bfc57620957c3433bd@5e2338",
-          "prevTxHash": "08582bc19734ad82d7390be88463c948e5d9f026f4b8f0bfc57620957c3433bd",
-          "originalTxHash": "08582bc19734ad82d7390be88463c948e5d9f026f4b8f0bfc57620957c3433bd",
-          "gasLimit": 73052300,
-          "gasPrice": 1000000000,
-          "callType": 1,
-          "originalSender": "erd1uv40ahysflse896x4ktnh6ecx43u7cmy9wnxnvcyp7deg299a4sq6vaywa",
-          "operation": "transfer",
-          "function": "registerAndSetAllRoles"
-        },
-        {
-          "hash": "5ae4f74e134e4fa63c8b92e06ff12b2a4b544233d01d80db6a922af35ee55356",
-          "nonce": 1,
-          "value": 196430610000000,
-          "receiver": "erd1qqqqqqqqqqqqqpgqrp3n58vp2dmcaur4whazxngvuhac4xwqa4sq2pjl73",
-          "sender": "erd1qqqqqqqqqqqqqpgqrp3n58vp2dmcaur4whazxngvuhac4xwqa4sq2pjl73",
-          "data": "@6f6b",
-          "prevTxHash": "c4a24b01b48d32308636310e2d335d6ed1f34dcbdfc1133aed7995e78e831c18",
-          "originalTxHash": "08582bc19734ad82d7390be88463c948e5d9f026f4b8f0bfc57620957c3433bd",
-          "gasLimit": 0,
-          "gasPrice": 1000000000,
-          "callType": 0,
-          "operation": "transfer",
-          "isRefund": true
-        },
-        {
-          "hash": "7589c1ad622d8a9ab2f186731fc82aeeab0aea5a8198cb94b6eba85a966e7962",
-          "nonce": 0,
-          "value": 0,
-          "receiver": "erd1llllllllllllllllllllllllllllllllllllllllllllllllluqq2m3f0f",
-          "sender": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
-          "data": "ESDTSetBurnRoleForAll@54455354434f4c4c312d356161383063",
-          "prevTxHash": "b0b3c8df519c33b314c0ee3d25abae6f17c4432fb3382676ce17a42690811cff",
-          "originalTxHash": "08582bc19734ad82d7390be88463c948e5d9f026f4b8f0bfc57620957c3433bd",
-          "gasLimit": 0,
-          "gasPrice": 1000000000,
-          "callType": 0,
-          "originalSender": "erd1uv40ahysflse896x4ktnh6ecx43u7cmy9wnxnvcyp7deg299a4sq6vaywa",
-          "logs": {
-            "address": "erd1llllllllllllllllllllllllllllllllllllllllllllllllluqq2m3f0f",
-            "events": [
-              {
-                "address": "erd1llllllllllllllllllllllllllllllllllllllllllllllllluqq2m3f0f",
-                "identifier": "completedTxEvent",
-                "topics": [
-                  "sLPI31GcM7MUwO49JauubxfEQy+zOCZ2zhekJpCBHP8="
-                ]
-              }
-            ]
-          },
-          "operation": "transfer"
-        },
-        {
-          "hash": "86d1ec3365ea1311dbde2f2366de4ea8627d7e49c29a974578c0869b66903cbc",
-          "nonce": 0,
-          "value": 0,
-          "receiver": "erd1qqqqqqqqqqqqqpgqrp3n58vp2dmcaur4whazxngvuhac4xwqa4sq2pjl73",
-          "sender": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
-          "data": "ESDTSetRole@54455354434f4c4c312d356161383063@45534454526f6c654e4654437265617465@45534454526f6c654e46544275726e@45534454526f6c654e465455706461746541747472696275746573@45534454526f6c654e4654416464555249",
-          "prevTxHash": "b0b3c8df519c33b314c0ee3d25abae6f17c4432fb3382676ce17a42690811cff",
-          "originalTxHash": "08582bc19734ad82d7390be88463c948e5d9f026f4b8f0bfc57620957c3433bd",
-          "gasLimit": 0,
-          "gasPrice": 1000000000,
-          "callType": 0,
-          "originalSender": "erd1uv40ahysflse896x4ktnh6ecx43u7cmy9wnxnvcyp7deg299a4sq6vaywa",
-          "logs": {
-            "address": "erd1qqqqqqqqqqqqqpgqrp3n58vp2dmcaur4whazxngvuhac4xwqa4sq2pjl73",
-            "events": [
-              {
-                "address": "erd1qqqqqqqqqqqqqpgqrp3n58vp2dmcaur4whazxngvuhac4xwqa4sq2pjl73",
-                "identifier": "ESDTSetRole",
-                "topics": [
-                  "VEVTVENPTEwxLTVhYTgwYw==",
-                  "",
-                  "",
-                  "RVNEVFJvbGVORlRDcmVhdGU=",
-                  "RVNEVFJvbGVORlRCdXJu",
-                  "RVNEVFJvbGVORlRVcGRhdGVBdHRyaWJ1dGVz",
-                  "RVNEVFJvbGVORlRBZGRVUkk="
-                ]
-              },
-              {
-                "address": "erd1qqqqqqqqqqqqqpgqrp3n58vp2dmcaur4whazxngvuhac4xwqa4sq2pjl73",
-                "identifier": "completedTxEvent",
-                "topics": [
-                  "sLPI31GcM7MUwO49JauubxfEQy+zOCZ2zhekJpCBHP8="
-                ]
-              }
-            ]
-          },
-          "operation": "ESDTSetRole",
-          "function": "ESDTSetRole"
-        },
-        {
-          "hash": "c4a24b01b48d32308636310e2d335d6ed1f34dcbdfc1133aed7995e78e831c18",
-          "nonce": 0,
-          "value": 0,
-          "receiver": "erd1qqqqqqqqqqqqqpgqrp3n58vp2dmcaur4whazxngvuhac4xwqa4sq2pjl73",
-          "sender": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
-          "data": "@00@54455354434f4c4c312d356161383063@3ec73c55022548038bbe06c0639156b3db70b7c770955e340f14fcfcd45df06a@98fa4ff554b9c6990ce577fbb816a271f690dcbd6b148f6583fe7692868ae538@08582bc19734ad82d7390be88463c948e5d9f026f4b8f0bfc57620957c3433bd@00",
-          "prevTxHash": "b0b3c8df519c33b314c0ee3d25abae6f17c4432fb3382676ce17a42690811cff",
-          "originalTxHash": "08582bc19734ad82d7390be88463c948e5d9f026f4b8f0bfc57620957c3433bd",
-          "gasLimit": 23052300,
-          "gasPrice": 1000000000,
-          "callType": 2,
-          "originalSender": "erd1uv40ahysflse896x4ktnh6ecx43u7cmy9wnxnvcyp7deg299a4sq6vaywa",
-          "logs": {
-            "address": "erd1qqqqqqqqqqqqqpgqrp3n58vp2dmcaur4whazxngvuhac4xwqa4sq2pjl73",
-            "events": [
-              {
-                "address": "erd1qqqqqqqqqqqqqpgqrp3n58vp2dmcaur4whazxngvuhac4xwqa4sq2pjl73",
-                "identifier": "callBack",
-                "topics": [
-                  "YXN5bmNDYWxsU3VjY2Vzcw==",
-                  "VEVTVENPTEwxLTVhYTgwYw=="
-                ],
-                "additionalData": [
-                  ""
-                ]
-              },
-              {
-                "address": "erd1qqqqqqqqqqqqqpgqrp3n58vp2dmcaur4whazxngvuhac4xwqa4sq2pjl73",
-                "identifier": "completedTxEvent",
-                "topics": [
-                  "sLPI31GcM7MUwO49JauubxfEQy+zOCZ2zhekJpCBHP8="
-                ]
-              }
-            ]
-          },
-          "operation": "transfer"
-        }
-      ],
-      "logs": {
-        "address": "erd1qqqqqqqqqqqqqpgqrp3n58vp2dmcaur4whazxngvuhac4xwqa4sq2pjl73",
-        "events": [
-          {
-            "address": "erd1qqqqqqqqqqqqqpgqrp3n58vp2dmcaur4whazxngvuhac4xwqa4sq2pjl73",
-            "identifier": "performAction",
-            "topics": [
-              "c3RhcnRQZXJmb3JtQWN0aW9u"
-            ],
-            "data": "AAAAAQYAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAL//wAAAAexorwuxQAAAAAAFnJlZ2lzdGVyQW5kU2V0QWxsUm9sZXMAAAAEAAAAD1Rlc3RDb2xsZWN0aW9uMQAAAAlURVNUQ09MTDEAAAADTkZUAAAAAAAAAATjKv7ckE/hk5dGrZc76zg1Y89jZCumabMED5uUKKXtYLE6AXQjw2bK/4zs+3ehJhChMPSIgTQSLHk3/q4NbX0XOvjZyUI7JXfGJSciwdkCEqQRH3ID+XRPdvz6HQoxADOyoRVVzlIeSUTgmrF1SdhbSH3NJshLUBejnjGjZwiJug==",
-            "additionalData": [
-              "AAAAAQYAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAL//wAAAAexorwuxQAAAAAAFnJlZ2lzdGVyQW5kU2V0QWxsUm9sZXMAAAAEAAAAD1Rlc3RDb2xsZWN0aW9uMQAAAAlURVNUQ09MTDEAAAADTkZUAAAAAAAAAATjKv7ckE/hk5dGrZc76zg1Y89jZCumabMED5uUKKXtYLE6AXQjw2bK/4zs+3ehJhChMPSIgTQSLHk3/q4NbX0XOvjZyUI7JXfGJSciwdkCEqQRH3ID+XRPdvz6HQoxADOyoRVVzlIeSUTgmrF1SdhbSH3NJshLUBejnjGjZwiJug=="
-            ]
-          },
-          {
-            "address": "erd1qqqqqqqqqqqqqpgqrp3n58vp2dmcaur4whazxngvuhac4xwqa4sq2pjl73",
-            "identifier": "performAction",
-            "topics": [
-              "cGVyZm9ybUFzeW5jQ2FsbA==",
-              "AQ==",
-              "AAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAC//8=",
-              "saK8LsUAAA==",
-              "BGa4HQ==",
-              "cmVnaXN0ZXJBbmRTZXRBbGxSb2xlcw==",
-              "VGVzdENvbGxlY3Rpb24x",
-              "VEVTVENPTEwx",
-              "TkZU",
-              ""
-            ],
-            "additionalData": [
-              ""
-            ]
-          },
-          {
-            "address": "erd1qqqqqqqqqqqqqpgqrp3n58vp2dmcaur4whazxngvuhac4xwqa4sq2pjl73",
-            "identifier": "transferValueOnly",
-            "topics": [
-              "saK8LsUAAA==",
-              "AAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAC//8="
-            ],
-            "data": "QXN5bmNDYWxs",
-            "additionalData": [
-              "QXN5bmNDYWxs",
-              "cmVnaXN0ZXJBbmRTZXRBbGxSb2xlcw==",
-              "VGVzdENvbGxlY3Rpb24x",
-              "VEVTVENPTEwx",
-              "TkZU",
-              ""
-            ]
-          },
-          {
-            "address": "erd1qqqqqqqqqqqqqpgqrp3n58vp2dmcaur4whazxngvuhac4xwqa4sq2pjl73",
-            "identifier": "writeLog",
-            "topics": [
-              "4yr+3JBP4ZOXRq2XO+s4NWPPY2QrpmmzBA+blCil7WA="
-            ],
-            "data": "QDZmNmI=",
-            "additionalData": [
-              "QDZmNmI="
-            ]
-          }
-        ]
-      },
-      "status": "success",
-      "operation": "transfer",
-      "function": "performAction",
-      "initiallyPaidFee": "873260000000000",
-      "fee": "873260000000000",
-      "chainID": "D",
-      "version": 1,
-      "options": 0
-    }
-  },
-  "code": "successful"
-}
-        "#;
-
-    let tx_on_network: TransactionOnNetwork = serde_json::from_str::<TransactionInfo>(data)
-        .unwrap()
-        .data
-        .unwrap()
-        .transaction;
-    let tx_response = TxResponse::from_network_tx(tx_on_network);
-
-    let expected = Some("TESTCOLL1-5aa80c".to_string());
-
-    assert_eq!(tx_response.new_issued_token_identifier, expected)
-}

From f21b3fc06528cb170afd728447a8c75cdb6bcfa7 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Mon, 29 Apr 2024 18:45:55 +0300
Subject: [PATCH 0796/1254] set state via AnnotatedValue - separate types

---
 .../tests/token_merge_module_whitebox_test.rs    | 12 ++++++------
 .../src/facade/world_tx/scenario_set_state.rs    |  9 ++++++---
 .../scenario_set_state/scenario_set_account.rs   | 16 ++++++++++------
 .../src/scenario/model/account_data/account.rs   |  5 +++--
 .../scenario/model/esdt_data/esdt_instance.rs    |  7 +++++--
 .../src/scenario/model/esdt_data/esdt_object.rs  | 14 +++++++++-----
 .../scenario/src/scenario/run_vm/set_state.rs    |  4 ++--
 .../src/whitebox_legacy/contract_obj_wrapper.rs  |  2 +-
 8 files changed, 42 insertions(+), 27 deletions(-)

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 eb93ff155a..3f723c323a 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
@@ -66,7 +66,7 @@ fn test_token_merge() {
                         NFT_AMOUNT,
                         Some(FIRST_ATTRIBUTES),
                         FIRST_ROYALTIES,
-                        None,
+                        None::<AddressValue>,
                         None,
                         Vec::from(FIRST_URIS),
                     )
@@ -76,7 +76,7 @@ fn test_token_merge() {
                         NFT_AMOUNT,
                         Some(SECOND_ATTRIBUTES),
                         SECOND_ROYALTIES,
-                        None,
+                        None::<AddressValue>,
                         None,
                         Vec::from(SECOND_URIS),
                     ),
@@ -454,7 +454,7 @@ fn test_partial_split() {
                         NFT_AMOUNT,
                         Some(FIRST_ATTRIBUTES),
                         FIRST_ROYALTIES,
-                        None,
+                        None::<AddressValue>,
                         None,
                         Vec::from(FIRST_URIS),
                     )
@@ -464,7 +464,7 @@ fn test_partial_split() {
                         NFT_AMOUNT,
                         Some(SECOND_ATTRIBUTES),
                         SECOND_ROYALTIES,
-                        None,
+                        None::<AddressValue>,
                         None,
                         Vec::from(SECOND_URIS),
                     ),
@@ -672,7 +672,7 @@ fn test_custom_attributes() {
                         NFT_AMOUNT,
                         Some(FIRST_ATTRIBUTES),
                         FIRST_ROYALTIES,
-                        None,
+                        None::<AddressValue>,
                         None,
                         Vec::from(FIRST_URIS),
                     )
@@ -682,7 +682,7 @@ fn test_custom_attributes() {
                         NFT_AMOUNT,
                         Some(SECOND_ATTRIBUTES),
                         SECOND_ROYALTIES,
-                        None,
+                        None::<AddressValue>,
                         None,
                         Vec::from(SECOND_URIS),
                     ),
diff --git a/framework/scenario/src/facade/world_tx/scenario_set_state.rs b/framework/scenario/src/facade/world_tx/scenario_set_state.rs
index 8cee5eaede..fc25f297c2 100644
--- a/framework/scenario/src/facade/world_tx/scenario_set_state.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_set_state.rs
@@ -101,7 +101,7 @@ impl ScenarioWorld {
     }
 
     #[allow(clippy::too_many_arguments)]
-    pub fn set_nft_balance_all_properties<A: Copy, V, NR, T: TopEncode>(
+    pub fn set_nft_balance_all_properties<A, V, NR, T: TopEncode, C>(
         &mut self,
         address: A,
         token_id: &[u8],
@@ -109,7 +109,7 @@ impl ScenarioWorld {
         balance: V,
         attributes: &T,
         royalties: NR,
-        creator: Option<A>,
+        creator: Option<C>,
         name: Option<&[u8]>,
         hash: Option<&[u8]>,
         uris: &[Vec<u8>],
@@ -117,6 +117,7 @@ impl ScenarioWorld {
         A: AnnotatedValue<ScenarioTxEnvData, ManagedAddress<StaticApi>>,
         V: AnnotatedValue<ScenarioTxEnvData, BigUint<StaticApi>>,
         NR: AnnotatedValue<ScenarioTxEnvData, u64>,
+        C: AnnotatedValue<ScenarioTxEnvData, ManagedAddress<StaticApi>>,
     {
         let env = self.new_env_data();
         let address_value = address_annotated(&env, &address);
@@ -134,7 +135,9 @@ impl ScenarioWorld {
                     nonce_value.value,
                     &balance_value.value,
                     EsdtInstanceMetadata {
-                        creator: creator.map(|c| address_annotated(&env, &c).to_vm_address()),
+                        creator: creator
+                            .as_ref()
+                            .map(|c| address_annotated(&env, c).to_vm_address()),
                         attributes: esdt_attributes.clone(),
                         royalties: royalties_value.value,
                         name: name.unwrap_or_default().to_vec(),
diff --git a/framework/scenario/src/facade/world_tx/scenario_set_state/scenario_set_account.rs b/framework/scenario/src/facade/world_tx/scenario_set_state/scenario_set_account.rs
index 0c14dc6b16..65351927ec 100644
--- a/framework/scenario/src/facade/world_tx/scenario_set_state/scenario_set_account.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_set_state/scenario_set_account.rs
@@ -102,22 +102,26 @@ impl<'w> SetStateBuilder<'w, AccountItem> {
     }
 
     #[allow(clippy::too_many_arguments)]
-    pub fn esdt_nft_all_properties<K, N, V, T>(
+    pub fn esdt_nft_all_properties<K, N, V, T, C, R, H, U>(
         mut self,
         token_id: K,
         nonce: N,
         balance: V,
         attributes: T,
-        royalties: N,
-        creator: T,
-        hash: T,
-        uris: Vec<T>,
+        royalties: R,
+        creator: C,
+        hash: H,
+        uris: Vec<U>,
     ) -> Self
     where
         K: AnnotatedValue<ScenarioTxEnvData, TokenIdentifier<StaticApi>>,
         N: AnnotatedValue<ScenarioTxEnvData, u64>,
         V: AnnotatedValue<ScenarioTxEnvData, BigUint<StaticApi>>,
         T: AnnotatedValue<ScenarioTxEnvData, ManagedBuffer<StaticApi>>,
+        C: AnnotatedValue<ScenarioTxEnvData, ManagedAddress<StaticApi>>,
+        R: AnnotatedValue<ScenarioTxEnvData, u64>,
+        H: AnnotatedValue<ScenarioTxEnvData, ManagedBuffer<StaticApi>>,
+        U: AnnotatedValue<ScenarioTxEnvData, ManagedBuffer<StaticApi>>,
     {
         let env = self.new_env_data();
         let token_id_key = token_identifier_annotated(&env, token_id);
@@ -125,7 +129,7 @@ impl<'w> SetStateBuilder<'w, AccountItem> {
         let royalties_value = u64_annotated(&env, &royalties);
         let balance_value = big_uint_annotated(&env, &balance);
         let attributes_value = bytes_annotated(&env, attributes);
-        let creator_value = bytes_annotated(&env, creator);
+        let creator_value = address_annotated(&env, &creator);
         let hash_value = bytes_annotated(&env, hash);
         let mut uris_value = Vec::new();
         for uri in uris {
diff --git a/framework/scenario/src/scenario/model/account_data/account.rs b/framework/scenario/src/scenario/model/account_data/account.rs
index 8488017c4e..9748fdf7dc 100644
--- a/framework/scenario/src/scenario/model/account_data/account.rs
+++ b/framework/scenario/src/scenario/model/account_data/account.rs
@@ -86,14 +86,14 @@ impl Account {
     }
 
     #[allow(clippy::too_many_arguments)]
-    pub fn esdt_nft_all_properties<K, N, V, T>(
+    pub fn esdt_nft_all_properties<K, N, V, T, A>(
         mut self,
         token_id_expr: K,
         nonce_expr: N,
         balance_expr: V,
         opt_attributes_expr: Option<T>,
         royalties_expr: N,
-        creator_expr: Option<T>,
+        creator_expr: Option<A>,
         hash_expr: Option<T>,
         uris_expr: Vec<T>,
     ) -> Self
@@ -102,6 +102,7 @@ impl Account {
         U64Value: From<N>,
         BigUintValue: From<V>,
         BytesValue: From<T>,
+        AddressValue: From<A>,
     {
         let token_id = BytesKey::from(token_id_expr);
 
diff --git a/framework/scenario/src/scenario/model/esdt_data/esdt_instance.rs b/framework/scenario/src/scenario/model/esdt_data/esdt_instance.rs
index 8607937c6c..01e57394d2 100644
--- a/framework/scenario/src/scenario/model/esdt_data/esdt_instance.rs
+++ b/framework/scenario/src/scenario/model/esdt_data/esdt_instance.rs
@@ -4,13 +4,14 @@ use crate::{
         interpret_trait::{InterpretableFrom, InterpreterContext, IntoRaw},
         serde_raw::EsdtInstanceRaw,
     },
+    scenario_model::AddressValue,
 };
 
 #[derive(Debug, Default, Clone)]
 pub struct EsdtInstance {
     pub nonce: Option<U64Value>,
     pub balance: Option<BigUintValue>,
-    pub creator: Option<BytesValue>,
+    pub creator: Option<AddressValue>,
     pub royalties: Option<U64Value>,
     pub hash: Option<BytesValue>,
     pub uri: Vec<BytesValue>,
@@ -41,7 +42,9 @@ impl InterpretableFrom<EsdtInstanceRaw> for EsdtInstance {
             balance: from
                 .balance
                 .map(|b| BigUintValue::interpret_from(b, context)),
-            creator: from.creator.map(|b| BytesValue::interpret_from(b, context)),
+            creator: from
+                .creator
+                .map(|b| AddressValue::interpret_from(b, context)),
             royalties: from.royalties.map(|b| U64Value::interpret_from(b, context)),
             hash: from.hash.map(|b| BytesValue::interpret_from(b, context)),
             uri: from
diff --git a/framework/scenario/src/scenario/model/esdt_data/esdt_object.rs b/framework/scenario/src/scenario/model/esdt_data/esdt_object.rs
index f8298e2b8c..f9d65e4df9 100644
--- a/framework/scenario/src/scenario/model/esdt_data/esdt_object.rs
+++ b/framework/scenario/src/scenario/model/esdt_data/esdt_object.rs
@@ -1,5 +1,8 @@
 use super::EsdtInstance;
-use crate::scenario::model::{BigUintValue, BytesValue, U64Value};
+use crate::{
+    scenario::model::{BigUintValue, BytesValue, U64Value},
+    scenario_model::AddressValue,
+};
 
 #[derive(Debug, Default, Clone)]
 pub struct EsdtObject {
@@ -53,19 +56,20 @@ impl EsdtObject {
     }
 
     #[allow(clippy::too_many_arguments)]
-    pub fn set_token_all_properties<N, V, T>(
+    pub fn set_token_all_properties<N, V, T, A>(
         &mut self,
         nonce_expr: N,
         balance_expr: V,
         opt_attributes_expr: Option<T>,
         royalties_expr: N,
-        creator_expr: Option<T>,
+        creator_expr: Option<A>,
         hash_expr: Option<T>,
         uris_expr: Vec<T>,
     ) where
         U64Value: From<N>,
         BigUintValue: From<V>,
         BytesValue: From<T>,
+        AddressValue: From<A>,
     {
         let inst_for_nonce = self.get_or_insert_instance_for_nonce(nonce_expr);
 
@@ -93,8 +97,8 @@ impl EsdtObject {
         }
 
         if let Some(creator_expr) = creator_expr {
-            let creator = BytesValue::from(creator_expr);
-            if !creator.value.is_empty() {
+            let creator = AddressValue::from(creator_expr);
+            if !creator.value.is_zero() {
                 inst_for_nonce.creator = Some(creator);
             } else {
                 inst_for_nonce.creator = None;
diff --git a/framework/scenario/src/scenario/run_vm/set_state.rs b/framework/scenario/src/scenario/run_vm/set_state.rs
index 187ba21e83..8284d42422 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, VMCodeMetadata},
+    types::VMCodeMetadata,
     world_mock::{
         AccountData, AccountEsdt, BlockInfo as CrateBlockInfo, BlockchainState, EsdtData,
         EsdtInstance, EsdtInstanceMetadata, EsdtInstances, EsdtRoles,
@@ -155,7 +155,7 @@ fn convert_scenario_esdt_instance_to_world_mock(
             creator: scenario_esdt
                 .creator
                 .as_ref()
-                .map(|creator| VMAddress::from_slice(creator.value.as_slice())),
+                .map(|creator| creator.to_vm_address()),
             royalties: scenario_esdt
                 .royalties
                 .as_ref()
diff --git a/framework/scenario/src/whitebox_legacy/contract_obj_wrapper.rs b/framework/scenario/src/whitebox_legacy/contract_obj_wrapper.rs
index 7540d23056..b88377b98d 100644
--- a/framework/scenario/src/whitebox_legacy/contract_obj_wrapper.rs
+++ b/framework/scenario/src/whitebox_legacy/contract_obj_wrapper.rs
@@ -366,7 +366,7 @@ impl BlockchainStateWrapper {
             BigUint::from(balance),
             attributes,
             0,
-            None,
+            None::<Address>,
             None,
             None,
             &[],

From f152723bf7c64e1260c18307ce2346d0083c18a0 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Mon, 29 Apr 2024 19:30:13 +0300
Subject: [PATCH 0797/1254] set state via AnnotatedValue - small fix

---
 .../src/facade/world_tx/scenario_set_state.rs     | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/framework/scenario/src/facade/world_tx/scenario_set_state.rs b/framework/scenario/src/facade/world_tx/scenario_set_state.rs
index fc25f297c2..aa9a4ccd9b 100644
--- a/framework/scenario/src/facade/world_tx/scenario_set_state.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_set_state.rs
@@ -101,22 +101,23 @@ impl ScenarioWorld {
     }
 
     #[allow(clippy::too_many_arguments)]
-    pub fn set_nft_balance_all_properties<A, V, NR, T: TopEncode, C>(
+    pub fn set_nft_balance_all_properties<A, B, N, T: TopEncode, R, C>(
         &mut self,
         address: A,
         token_id: &[u8],
-        nonce: NR,
-        balance: V,
-        attributes: &T,
-        royalties: NR,
+        nonce: N,
+        balance: B,
+        attributes: T,
+        royalties: R,
         creator: Option<C>,
         name: Option<&[u8]>,
         hash: Option<&[u8]>,
         uris: &[Vec<u8>],
     ) where
         A: AnnotatedValue<ScenarioTxEnvData, ManagedAddress<StaticApi>>,
-        V: AnnotatedValue<ScenarioTxEnvData, BigUint<StaticApi>>,
-        NR: AnnotatedValue<ScenarioTxEnvData, u64>,
+        B: AnnotatedValue<ScenarioTxEnvData, BigUint<StaticApi>>,
+        N: AnnotatedValue<ScenarioTxEnvData, u64>,
+        R: AnnotatedValue<ScenarioTxEnvData, u64>,
         C: AnnotatedValue<ScenarioTxEnvData, ManagedAddress<StaticApi>>,
     {
         let env = self.new_env_data();

From 75c2a1127a19ee7b37e9cb2734964c499878e185 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Mon, 29 Apr 2024 21:36:51 +0300
Subject: [PATCH 0798/1254] codec - decode u64 via
 into_max_size_buffer_align_right

---
 .../pair/scenarios/free_orders.scen.json      |  3 +-
 .../scenarios/storage_i64_bad.scen.json       |  2 +-
 .../src/impl_for_types/impl_num_signed.rs     |  6 +-
 data/codec/src/single/top_de_input.rs         | 70 +++++++++++++++++--
 framework/base/src/api/endpoint_arg_api.rs    |  4 +-
 framework/base/src/err_msg.rs                 |  2 +-
 framework/base/src/io/arg_de_input.rs         | 13 ++++
 .../src/storage/mappers/map_storage_mapper.rs |  5 +-
 framework/base/src/storage/storage_get.rs     | 21 ++++++
 .../src/storage/storage_get_from_address.rs   | 21 ++++++
 .../types/io/operation_completion_status.rs   | 10 +--
 .../codec_util/managed_buffer_top_de_input.rs | 47 +++++++++++--
 12 files changed, 181 insertions(+), 23 deletions(-)

diff --git a/contracts/examples/order-book/pair/scenarios/free_orders.scen.json b/contracts/examples/order-book/pair/scenarios/free_orders.scen.json
index 8556d1dee2..0e53547971 100644
--- a/contracts/examples/order-book/pair/scenarios/free_orders.scen.json
+++ b/contracts/examples/order-book/pair/scenarios/free_orders.scen.json
@@ -27,7 +27,8 @@
                 "to": "sc:pair",
                 "function": "freeOrders",
                 "arguments": [
-                    "u64:0|u64:1"
+                    "0",
+                    "1"
                 ],
                 "gasLimit": "100,000,000",
                 "gasPrice": "0"
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 74ae9f7bff..d46e1a783a 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
@@ -33,7 +33,7 @@
             "expect": {
                 "out": [],
                 "status": "*",
-                "message": "str:storage decode error: input too long",
+                "message": "str:storage decode error: argument out of range",
                 "logs": "*",
                 "gas": "*",
                 "refund": "*"
diff --git a/data/codec/src/impl_for_types/impl_num_signed.rs b/data/codec/src/impl_for_types/impl_num_signed.rs
index b32b726523..1f8ea12dcc 100644
--- a/data/codec/src/impl_for_types/impl_num_signed.rs
+++ b/data/codec/src/impl_for_types/impl_num_signed.rs
@@ -1,7 +1,7 @@
 use crate::{
-    dep_encode_num_mimic, DecodeError,
-    DecodeErrorHandler, EncodeErrorHandler, NestedDecode, NestedDecodeInput, NestedEncode,
-    NestedEncodeOutput, TopDecode, TopDecodeInput, TopEncode, TopEncodeOutput,
+    dep_encode_num_mimic, DecodeError, DecodeErrorHandler, EncodeErrorHandler, NestedDecode,
+    NestedDecodeInput, NestedEncode, NestedEncodeOutput, TopDecode, TopDecodeInput, TopEncode,
+    TopEncodeOutput,
 };
 
 macro_rules! top_encode_num_signed {
diff --git a/data/codec/src/single/top_de_input.rs b/data/codec/src/single/top_de_input.rs
index dc74370daf..dd106d26a0 100644
--- a/data/codec/src/single/top_de_input.rs
+++ b/data/codec/src/single/top_de_input.rs
@@ -21,6 +21,12 @@ pub trait TopDecodeInput: Sized {
     /// and returns the populated data slice from this buffer.
     ///
     /// Will return an error if the data exceeds the provided buffer.
+    ///
+    /// Currently only kept for backwards compatibility.
+    #[deprecated(
+        since = "0.48.1",
+        note = "Please use method `into_max_size_buffer_align_right` instead."
+    )]
     fn into_max_size_buffer<H, const MAX_LEN: usize>(
         self,
         buffer: &mut [u8; MAX_LEN],
@@ -29,6 +35,20 @@ pub trait TopDecodeInput: Sized {
     where
         H: DecodeErrorHandler;
 
+    /// Puts the underlying data into a fixed size byte buffer,
+    /// aligned to the right.
+    ///
+    /// This eases big endian decoding.
+    ///
+    /// Returns the length of the original buffer.
+    fn into_max_size_buffer_align_right<H, const MAX_LEN: usize>(
+        self,
+        buffer: &mut [u8; MAX_LEN],
+        h: H,
+    ) -> Result<usize, H::HandledErr>
+    where
+        H: DecodeErrorHandler;
+
     /// Retrieves the underlying data as a pre-parsed u64.
     /// Expected to panic if the conversion is not possible.
     ///
@@ -38,8 +58,8 @@ pub trait TopDecodeInput: Sized {
         H: DecodeErrorHandler,
     {
         let mut buffer = [0u8; 8];
-        let slice = self.into_max_size_buffer(&mut buffer, h)?;
-        Ok(universal_decode_number_unchecked(slice, false))
+        let _ = self.into_max_size_buffer_align_right(&mut buffer, h)?;
+        Ok(u64::from_be_bytes(buffer))
     }
 
     /// Retrieves the underlying data as a pre-parsed i64.
@@ -51,8 +71,8 @@ pub trait TopDecodeInput: Sized {
         H: DecodeErrorHandler,
     {
         let mut buffer = [0u8; 8];
-        let slice = self.into_max_size_buffer(&mut buffer, h)?;
-        Ok(universal_decode_number_unchecked(slice, true) as i64)
+        let len = self.into_max_size_buffer_align_right(&mut buffer, h)?;
+        Ok(universal_decode_number_unchecked(&buffer[8 - len..], true) as i64)
     }
 
     #[inline]
@@ -82,6 +102,7 @@ impl TopDecodeInput for Box<[u8]> {
         self
     }
 
+    #[allow(deprecated)]
     fn into_max_size_buffer<H, const MAX_LEN: usize>(
         self,
         buffer: &mut [u8; MAX_LEN],
@@ -93,6 +114,17 @@ impl TopDecodeInput for Box<[u8]> {
         (&*self).into_max_size_buffer(buffer, h)
     }
 
+    fn into_max_size_buffer_align_right<H, const MAX_LEN: usize>(
+        self,
+        buffer: &mut [u8; MAX_LEN],
+        h: H,
+    ) -> Result<usize, H::HandledErr>
+    where
+        H: DecodeErrorHandler,
+    {
+        (&*self).into_max_size_buffer_align_right(buffer, h)
+    }
+
     fn into_nested_buffer(self) -> Self::NestedBuffer {
         OwnedBytesNestedDecodeInput::new(self)
     }
@@ -109,6 +141,7 @@ impl TopDecodeInput for Vec<u8> {
         vec_into_boxed_slice(self)
     }
 
+    #[allow(deprecated)]
     fn into_max_size_buffer<H, const MAX_LEN: usize>(
         self,
         buffer: &mut [u8; MAX_LEN],
@@ -120,6 +153,17 @@ impl TopDecodeInput for Vec<u8> {
         self.as_slice().into_max_size_buffer(buffer, h)
     }
 
+    fn into_max_size_buffer_align_right<H, const MAX_LEN: usize>(
+        self,
+        buffer: &mut [u8; MAX_LEN],
+        h: H,
+    ) -> Result<usize, H::HandledErr>
+    where
+        H: DecodeErrorHandler,
+    {
+        self.as_slice().into_max_size_buffer_align_right(buffer, h)
+    }
+
     fn into_nested_buffer(self) -> Self::NestedBuffer {
         OwnedBytesNestedDecodeInput::new(self.into_boxed_slice())
     }
@@ -152,6 +196,24 @@ impl<'a> TopDecodeInput for &'a [u8] {
         Ok(&buffer[..l])
     }
 
+    fn into_max_size_buffer_align_right<H, const MAX_LEN: usize>(
+        self,
+        buffer: &mut [u8; MAX_LEN],
+        h: H,
+    ) -> Result<usize, H::HandledErr>
+    where
+        H: DecodeErrorHandler,
+    {
+        let len = self.len();
+        if len > MAX_LEN {
+            return Err(h.handle_error(DecodeError::INPUT_TOO_LONG));
+        }
+        let target_start = MAX_LEN - len;
+        let byte_slice = &mut buffer[target_start..];
+        byte_slice.copy_from_slice(self);
+        Ok(len)
+    }
+
     #[inline]
     fn into_u64<H>(self, _h: H) -> Result<u64, H::HandledErr>
     where
diff --git a/framework/base/src/api/endpoint_arg_api.rs b/framework/base/src/api/endpoint_arg_api.rs
index aa3201a07f..4d80935f52 100644
--- a/framework/base/src/api/endpoint_arg_api.rs
+++ b/framework/base/src/api/endpoint_arg_api.rs
@@ -59,7 +59,7 @@ pub trait EndpointArgumentApiImpl: ErrorApi + ManagedTypeApi {
         if let Some(value) = Self::managed_type_impl().bi_to_i64(big_int_temp_1) {
             value as u64
         } else {
-            Self::error_api_impl().signal_error(err_msg::ARG_OUT_OF_RANGE)
+            Self::error_api_impl().signal_error(err_msg::ARG_OUT_OF_RANGE.as_bytes())
         }
     }
 
@@ -69,7 +69,7 @@ pub trait EndpointArgumentApiImpl: ErrorApi + ManagedTypeApi {
         if let Some(value) = Self::managed_type_impl().bi_to_i64(big_int_temp_1) {
             value
         } else {
-            Self::error_api_impl().signal_error(err_msg::ARG_OUT_OF_RANGE)
+            Self::error_api_impl().signal_error(err_msg::ARG_OUT_OF_RANGE.as_bytes())
         }
     }
 
diff --git a/framework/base/src/err_msg.rs b/framework/base/src/err_msg.rs
index 46f43e3313..2a2ef7ad65 100644
--- a/framework/base/src/err_msg.rs
+++ b/framework/base/src/err_msg.rs
@@ -17,7 +17,7 @@ pub const ARG_ASYNC_RETURN_WRONG_NUMBER: &[u8] =
 pub const ARG_CALLBACK_TOO_FEW: &[u8] = b"too few callback arguments provided";
 pub const ARG_CALLBACK_TOO_MANY: &[u8] = b"too many callback arguments provided";
 
-pub const ARG_OUT_OF_RANGE: &[u8] = b"argument out of range";
+pub const ARG_OUT_OF_RANGE: &str = "argument out of range";
 pub const ARG_BAD_LENGTH: &[u8] = b"argument has wrong length";
 pub const ARG_BAD_LENGTH_32: &[u8] = b"argument has wrong length: 32 bytes expected";
 pub const ARG_DECODE_ERROR_1: &[u8] = b"argument decode error (";
diff --git a/framework/base/src/io/arg_de_input.rs b/framework/base/src/io/arg_de_input.rs
index 42e4fc7f0f..98faef2899 100644
--- a/framework/base/src/io/arg_de_input.rs
+++ b/framework/base/src/io/arg_de_input.rs
@@ -92,6 +92,19 @@ where
         self.to_managed_buffer().into_max_size_buffer(buffer, h)
     }
 
+    #[inline]
+    fn into_max_size_buffer_align_right<H, const MAX_LEN: usize>(
+        self,
+        buffer: &mut [u8; MAX_LEN],
+        h: H,
+    ) -> Result<usize, H::HandledErr>
+    where
+        H: DecodeErrorHandler,
+    {
+        self.to_managed_buffer()
+            .into_max_size_buffer_align_right(buffer, h)
+    }
+
     #[inline]
     fn into_u64<H>(self, _h: H) -> Result<u64, H::HandledErr>
     where
diff --git a/framework/base/src/storage/mappers/map_storage_mapper.rs b/framework/base/src/storage/mappers/map_storage_mapper.rs
index e19f005861..5b101452b8 100644
--- a/framework/base/src/storage/mappers/map_storage_mapper.rs
+++ b/framework/base/src/storage/mappers/map_storage_mapper.rs
@@ -7,6 +7,7 @@ use super::{
 use crate::{
     api::StorageMapperApi,
     codec::{NestedDecode, NestedEncode, TopDecode, TopEncode},
+    contract_base::ErrorHelper,
     storage::{self, StorageKey},
     types::ManagedAddress,
 };
@@ -232,7 +233,9 @@ where
     #[inline]
     fn next(&mut self) -> Option<(K, V)> {
         if let Some(key) = self.key_iter.next() {
-            let value = self.hash_map.get(&key).unwrap();
+            let Some(value) = self.hash_map.get(&key) else {
+                ErrorHelper::<SA>::signal_error_with_message("missing key")
+            };
             return Some((key, value));
         }
         None
diff --git a/framework/base/src/storage/storage_get.rs b/framework/base/src/storage/storage_get.rs
index c4504df70f..7e9016c3a3 100644
--- a/framework/base/src/storage/storage_get.rs
+++ b/framework/base/src/storage/storage_get.rs
@@ -81,6 +81,27 @@ where
         self.to_managed_buffer().into_max_size_buffer(buffer, h)
     }
 
+    #[inline]
+    fn into_max_size_buffer_align_right<H, const MAX_LEN: usize>(
+        self,
+        buffer: &mut [u8; MAX_LEN],
+        h: H,
+    ) -> Result<usize, H::HandledErr>
+    where
+        H: DecodeErrorHandler,
+    {
+        self.to_managed_buffer()
+            .into_max_size_buffer_align_right(buffer, h)
+    }
+
+    #[inline]
+    fn into_i64<H>(self, h: H) -> Result<i64, H::HandledErr>
+    where
+        H: DecodeErrorHandler,
+    {
+        self.to_managed_buffer().into_i64(h)
+    }
+
     #[inline]
     fn supports_specialized_type<T: TryStaticCast>() -> bool {
         T::type_eq::<ManagedBuffer<A>>() || T::type_eq::<BigUint<A>>() || T::type_eq::<BigInt<A>>()
diff --git a/framework/base/src/storage/storage_get_from_address.rs b/framework/base/src/storage/storage_get_from_address.rs
index 8cfeb531f1..2b2ac897f1 100644
--- a/framework/base/src/storage/storage_get_from_address.rs
+++ b/framework/base/src/storage/storage_get_from_address.rs
@@ -91,6 +91,27 @@ where
         self.to_managed_buffer().into_max_size_buffer(buffer, h)
     }
 
+    #[inline]
+    fn into_max_size_buffer_align_right<H, const MAX_LEN: usize>(
+        self,
+        buffer: &mut [u8; MAX_LEN],
+        h: H,
+    ) -> Result<usize, H::HandledErr>
+    where
+        H: DecodeErrorHandler,
+    {
+        self.to_managed_buffer()
+            .into_max_size_buffer_align_right(buffer, h)
+    }
+
+    #[inline]
+    fn into_i64<H>(self, h: H) -> Result<i64, H::HandledErr>
+    where
+        H: DecodeErrorHandler,
+    {
+        self.to_managed_buffer().into_i64(h)
+    }
+
     #[inline]
     fn supports_specialized_type<T: TryStaticCast>() -> bool {
         T::type_eq::<ManagedBuffer<A>>() || T::type_eq::<BigUint<A>>() || T::type_eq::<BigInt<A>>()
diff --git a/framework/base/src/types/io/operation_completion_status.rs b/framework/base/src/types/io/operation_completion_status.rs
index a7e030ab96..7ae9df69f8 100644
--- a/framework/base/src/types/io/operation_completion_status.rs
+++ b/framework/base/src/types/io/operation_completion_status.rs
@@ -58,12 +58,14 @@ impl TopDecode for OperationCompletionStatus {
         I: TopDecodeInput,
         H: DecodeErrorHandler,
     {
-        let mut buffer = [0u8; 16];
-        input.into_max_size_buffer(&mut buffer, h)?;
+        const BUFFER_LEN: usize = 16;
+        let mut buffer = [0u8; BUFFER_LEN];
+        let len = input.into_max_size_buffer_align_right(&mut buffer, h)?;
+        let bytes = &buffer[BUFFER_LEN - len..];
 
-        if buffer.starts_with(COMPLETED_STR.as_bytes()) {
+        if bytes.starts_with(COMPLETED_STR.as_bytes()) {
             Ok(OperationCompletionStatus::Completed)
-        } else if buffer.starts_with(INTERRUPTED_STR.as_bytes()) {
+        } else if bytes.starts_with(INTERRUPTED_STR.as_bytes()) {
             Ok(OperationCompletionStatus::InterruptedBeforeOutOfGas)
         } else {
             Err(h.handle_error(DecodeError::INVALID_VALUE))
diff --git a/framework/base/src/types/managed/codec_util/managed_buffer_top_de_input.rs b/framework/base/src/types/managed/codec_util/managed_buffer_top_de_input.rs
index acc280de1d..fb091781a2 100644
--- a/framework/base/src/types/managed/codec_util/managed_buffer_top_de_input.rs
+++ b/framework/base/src/types/managed/codec_util/managed_buffer_top_de_input.rs
@@ -1,12 +1,15 @@
-use crate::codec::{
-    try_execute_then_cast, DecodeError, DecodeErrorHandler, TopDecodeInput, TryStaticCast,
-};
-use alloc::boxed::Box;
-
 use crate::{
-    api::ManagedTypeApi,
+    api::{
+        const_handles, managed_types::BigIntApiImpl, use_raw_handle, ManagedTypeApi,
+        ManagedTypeApiImpl,
+    },
+    codec::{
+        try_execute_then_cast, DecodeError, DecodeErrorHandler, TopDecodeInput, TryStaticCast,
+    },
+    err_msg,
     types::{BigInt, BigUint, ManagedBuffer},
 };
+use alloc::boxed::Box;
 
 use super::ManagedBufferNestedDecodeInput;
 
@@ -41,6 +44,38 @@ where
         Ok(byte_slice)
     }
 
+    fn into_max_size_buffer_align_right<H, const MAX_LEN: usize>(
+        self,
+        buffer: &mut [u8; MAX_LEN],
+        h: H,
+    ) -> Result<usize, H::HandledErr>
+    where
+        H: DecodeErrorHandler,
+    {
+        let len = self.len();
+        if len > MAX_LEN {
+            return Err(h.handle_error(DecodeError::INPUT_TOO_LONG));
+        }
+        unsafe {
+            let byte_slice = buffer.get_unchecked_mut(MAX_LEN - len..);
+            let _ = self.load_slice(0, byte_slice);
+        }
+        Ok(len)
+    }
+
+    fn into_i64<H>(self, h: H) -> Result<i64, H::HandledErr>
+    where
+        H: DecodeErrorHandler,
+    {
+        let big_int_temp: M::BigIntHandle = use_raw_handle(const_handles::BIG_INT_TEMPORARY_1);
+        M::managed_type_impl().mb_to_big_int_signed(self.handle.clone(), big_int_temp.clone());
+        if let Some(value) = M::managed_type_impl().bi_to_i64(big_int_temp) {
+            Ok(value)
+        } else {
+            Err(h.handle_error(err_msg::ARG_OUT_OF_RANGE.into()))
+        }
+    }
+
     #[inline]
     fn supports_specialized_type<T: TryStaticCast>() -> bool {
         T::type_eq::<ManagedBuffer<M>>() || T::type_eq::<BigUint<M>>() || T::type_eq::<BigInt<M>>()

From 5bf1b8edc643fd55eff3364ea716f5dab344f631 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 30 Apr 2024 13:54:35 +0300
Subject: [PATCH 0799/1254] renamed ReturnsResultAs

---
 .../examples/adder/interact/src/basic_interact.rs      |  2 +-
 .../tests/st_blackbox_legacy_proxy_test.rs             |  2 +-
 .../scenario-tester/tests/st_blackbox_test.rs          |  2 +-
 .../interaction/result_handlers/returns_result_conv.rs | 10 +++++-----
 .../scenario/src/facade/world_tx/scenario_rh_impl.rs   |  6 +++---
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/contracts/examples/adder/interact/src/basic_interact.rs b/contracts/examples/adder/interact/src/basic_interact.rs
index a0fa99f17a..b0c38bb4bb 100644
--- a/contracts/examples/adder/interact/src/basic_interact.rs
+++ b/contracts/examples/adder/interact/src/basic_interact.rs
@@ -152,7 +152,7 @@ impl AdderInteract {
             .to(self.state.current_adder_address())
             .typed(adder_proxy::AdderProxy)
             .sum()
-            .returns(ReturnsResultConv::<RustBigUint>::new())
+            .returns(ReturnsResultAs::<RustBigUint>::new())
             .prepare_async()
             .run()
             .await;
diff --git a/contracts/feature-tests/scenario-tester/tests/st_blackbox_legacy_proxy_test.rs b/contracts/feature-tests/scenario-tester/tests/st_blackbox_legacy_proxy_test.rs
index 7dfd815d55..b20fbff6f3 100644
--- a/contracts/feature-tests/scenario-tester/tests/st_blackbox_legacy_proxy_test.rs
+++ b/contracts/feature-tests/scenario-tester/tests/st_blackbox_legacy_proxy_test.rs
@@ -51,7 +51,7 @@ fn st_blackbox_legacy_proxy() {
     let value = world
         .query()
         .call(st_contract.sum())
-        .returns(ReturnsResultConv::<SingleValue<BigUint>>::new())
+        .returns(ReturnsResultAs::<SingleValue<BigUint>>::new())
         .run();
     assert_eq!(value.into(), BigUint::from(5u32));
 
diff --git a/contracts/feature-tests/scenario-tester/tests/st_blackbox_test.rs b/contracts/feature-tests/scenario-tester/tests/st_blackbox_test.rs
index 9f0b9091d3..75d8448c3b 100644
--- a/contracts/feature-tests/scenario-tester/tests/st_blackbox_test.rs
+++ b/contracts/feature-tests/scenario-tester/tests/st_blackbox_test.rs
@@ -66,7 +66,7 @@ fn st_blackbox() {
         .to(ST_ADDRESS)
         .typed(scenario_tester_proxy::ScenarioTesterProxy)
         .sum()
-        .returns(ReturnsResultConv::<BigUint>::new())
+        .returns(ReturnsResultAs::<BigUint>::new())
         .run();
     assert_eq!(value, BigUint::from(5u32));
 
diff --git a/framework/base/src/types/interaction/result_handlers/returns_result_conv.rs b/framework/base/src/types/interaction/result_handlers/returns_result_conv.rs
index 1583d0ecbe..05f2dfaa3d 100644
--- a/framework/base/src/types/interaction/result_handlers/returns_result_conv.rs
+++ b/framework/base/src/types/interaction/result_handlers/returns_result_conv.rs
@@ -9,11 +9,11 @@ use crate::types::{
 /// Indicates that result will be returned.
 ///
 /// Value will be converted to type `T`, which should be compatible with the original type.
-pub struct ReturnsResultConv<T> {
+pub struct ReturnsResultAs<T> {
     _phantom: PhantomData<T>,
 }
 
-impl<T> Default for ReturnsResultConv<T> {
+impl<T> Default for ReturnsResultAs<T> {
     fn default() -> Self {
         Self {
             _phantom: Default::default(),
@@ -21,13 +21,13 @@ impl<T> Default for ReturnsResultConv<T> {
     }
 }
 
-impl<T> ReturnsResultConv<T> {
+impl<T> ReturnsResultAs<T> {
     pub fn new() -> Self {
         Self::default()
     }
 }
 
-impl<Env, Original, T> RHListItem<Env, Original> for ReturnsResultConv<T>
+impl<Env, Original, T> RHListItem<Env, Original> for ReturnsResultAs<T>
 where
     Env: TxEnv,
     Original: TopEncodeMulti,
@@ -37,7 +37,7 @@ where
 }
 
 impl<Env, Original, T> RHListItemExec<SyncCallRawResult<Env::Api>, Env, Original>
-    for ReturnsResultConv<T>
+    for ReturnsResultAs<T>
 where
     Env: TxEnv,
     Original: TopEncodeMulti,
diff --git a/framework/scenario/src/facade/world_tx/scenario_rh_impl.rs b/framework/scenario/src/facade/world_tx/scenario_rh_impl.rs
index d040f0bc3a..343fdc8382 100644
--- a/framework/scenario/src/facade/world_tx/scenario_rh_impl.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_rh_impl.rs
@@ -2,7 +2,7 @@ use multiversx_sc::{
     codec::{CodecFrom, TopDecodeMulti, TopEncodeMulti},
     types::{
         ManagedAddress, RHListItemExec, ReturnsNewAddress, ReturnsNewManagedAddress, ReturnsResult,
-        ReturnsResultConv, TxEnv, WithNewAddress, WithResultConv,
+        ReturnsResultAs, TxEnv, WithNewAddress, WithResultConv,
     },
 };
 
@@ -21,7 +21,7 @@ where
     }
 }
 
-impl<Env, Original, T> RHListItemExec<TxResponse, Env, Original> for ReturnsResultConv<T>
+impl<Env, Original, T> RHListItemExec<TxResponse, Env, Original> for ReturnsResultAs<T>
 where
     Env: TxEnv,
     Original: TopEncodeMulti,
@@ -31,7 +31,7 @@ where
         let response = TypedResponse::<T>::from_raw(tx_response);
         response
             .result
-            .expect("ReturnsResultConv expects that transaction is successful")
+            .expect("ReturnsResultAs expects that transaction is successful")
     }
 }
 

From 533f31c76286069d8358ba3ec8e4912a283bd2ea Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 30 Apr 2024 15:22:08 +0300
Subject: [PATCH 0800/1254] cleanup

---
 data/codec/src/num_conv.rs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/data/codec/src/num_conv.rs b/data/codec/src/num_conv.rs
index f68671596e..978aab3280 100644
--- a/data/codec/src/num_conv.rs
+++ b/data/codec/src/num_conv.rs
@@ -122,7 +122,6 @@ pub fn universal_decode_number_unchecked(bytes: &[u8], signed: bool) -> u64 {
     unsafe { universal_decode_number_impl(bytes.as_ptr(), bytes.len(), signed) }
 }
 
-#[inline(never)]
 unsafe fn universal_decode_number_impl(bytes: *const u8, len: usize, signed: bool) -> u64 {
     let negative = signed && len > 0 && msbit_is_one(*bytes);
     let skippable_byte = skippable_byte(negative);

From 02751856a8084dfd1d0cf43d2cb39f1f6bc3c016 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Tue, 30 Apr 2024 18:08:52 +0300
Subject: [PATCH 0801/1254] increase code coverage - make optional param in
 esdt_nft_all_properties

---
 .../composability/forwarder/sc-config.toml    |    5 +
 .../forwarder/src/forwarder_main.rs           |    1 +
 .../forwarder/src/forwarder_proxy.rs          | 1126 +++++++++++++++++
 3 files changed, 1132 insertions(+)
 create mode 100644 contracts/feature-tests/composability/forwarder/sc-config.toml
 create mode 100644 contracts/feature-tests/composability/forwarder/src/forwarder_proxy.rs

diff --git a/contracts/feature-tests/composability/forwarder/sc-config.toml b/contracts/feature-tests/composability/forwarder/sc-config.toml
new file mode 100644
index 0000000000..b12e3401e6
--- /dev/null
+++ b/contracts/feature-tests/composability/forwarder/sc-config.toml
@@ -0,0 +1,5 @@
+[[proxy]]
+path = "src/forwarder_proxy.rs"
+[[proxy.path-rename]]
+from = "multiversx_sc::types::flags::esdt_token_type::"
+to = ""
diff --git a/contracts/feature-tests/composability/forwarder/src/forwarder_main.rs b/contracts/feature-tests/composability/forwarder/src/forwarder_main.rs
index 92d3289a21..7ded2d1957 100644
--- a/contracts/feature-tests/composability/forwarder/src/forwarder_main.rs
+++ b/contracts/feature-tests/composability/forwarder/src/forwarder_main.rs
@@ -13,6 +13,7 @@ pub mod roles;
 pub mod sft;
 pub mod storage;
 pub mod vault_proxy;
+pub mod forwarder_proxy;
 
 multiversx_sc::imports!();
 
diff --git a/contracts/feature-tests/composability/forwarder/src/forwarder_proxy.rs b/contracts/feature-tests/composability/forwarder/src/forwarder_proxy.rs
new file mode 100644
index 0000000000..5c859a5169
--- /dev/null
+++ b/contracts/feature-tests/composability/forwarder/src/forwarder_proxy.rs
@@ -0,0 +1,1126 @@
+// Code generated by the multiversx-sc proxy generator. DO NOT EDIT.
+
+////////////////////////////////////////////////////
+////////////////// AUTO-GENERATED //////////////////
+////////////////////////////////////////////////////
+
+#![allow(dead_code)]
+#![allow(clippy::all)]
+
+use multiversx_sc::proxy_imports::*;
+
+pub struct ForwarderProxy;
+
+impl<Env, From, To, Gas> TxProxyTrait<Env, From, To, Gas> for ForwarderProxy
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    type TxProxyMethods = ForwarderProxyMethods<Env, From, To, Gas>;
+
+    fn proxy_methods(self, tx: Tx<Env, From, To, (), Gas, (), ()>) -> Self::TxProxyMethods {
+        ForwarderProxyMethods { wrapped_tx: tx }
+    }
+}
+
+pub struct ForwarderProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    wrapped_tx: Tx<Env, From, To, (), Gas, (), ()>,
+}
+
+#[rustfmt::skip]
+impl<Env, From, Gas> ForwarderProxyMethods<Env, From, (), Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn init(
+        self,
+    ) -> TxProxyDeploy<Env, From, Gas, ()> {
+        self.wrapped_tx
+            .raw_deploy()
+            .original_result()
+    }
+}
+
+#[rustfmt::skip]
+impl<Env, From, To, Gas> ForwarderProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn send_egld<
+        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+        Arg1: CodecInto<BigUint<Env::Api>>,
+    >(
+        self,
+        to: Arg0,
+        amount: Arg1,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call("send_egld")
+            .argument(&to)
+            .argument(&amount)
+            .original_result()
+    }
+
+    pub fn echo_arguments_sync<
+        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+        Arg1: CodecInto<MultiValueEncoded<Env::Api, ManagedBuffer<Env::Api>>>,
+    >(
+        self,
+        to: Arg0,
+        args: Arg1,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call("echo_arguments_sync")
+            .argument(&to)
+            .argument(&args)
+            .original_result()
+    }
+
+    pub fn echo_arguments_sync_twice<
+        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+        Arg1: CodecInto<MultiValueEncoded<Env::Api, ManagedBuffer<Env::Api>>>,
+    >(
+        self,
+        to: Arg0,
+        args: Arg1,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call("echo_arguments_sync_twice")
+            .argument(&to)
+            .argument(&args)
+            .original_result()
+    }
+
+    pub fn forward_sync_accept_funds<
+        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+    >(
+        self,
+        to: Arg0,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call("forward_sync_accept_funds")
+            .argument(&to)
+            .original_result()
+    }
+
+    pub fn forward_sync_accept_funds_with_fees<
+        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+        Arg1: CodecInto<BigUint<Env::Api>>,
+    >(
+        self,
+        to: Arg0,
+        percentage_fees: Arg1,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call("forward_sync_accept_funds_with_fees")
+            .argument(&to)
+            .argument(&percentage_fees)
+            .original_result()
+    }
+
+    pub fn forward_sync_accept_funds_then_read<
+        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+    >(
+        self,
+        to: Arg0,
+    ) -> TxProxyCall<Env, From, To, Gas, usize> {
+        self.wrapped_tx
+            .raw_call("forward_sync_accept_funds_then_read")
+            .argument(&to)
+            .original_result()
+    }
+
+    pub fn forward_sync_retrieve_funds<
+        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+        Arg1: CodecInto<EgldOrEsdtTokenIdentifier<Env::Api>>,
+        Arg2: CodecInto<u64>,
+        Arg3: CodecInto<BigUint<Env::Api>>,
+    >(
+        self,
+        to: Arg0,
+        token: Arg1,
+        token_nonce: Arg2,
+        amount: Arg3,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call("forward_sync_retrieve_funds")
+            .argument(&to)
+            .argument(&token)
+            .argument(&token_nonce)
+            .argument(&amount)
+            .original_result()
+    }
+
+    pub fn forward_sync_retrieve_funds_with_accept_func<
+        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+        Arg1: CodecInto<TokenIdentifier<Env::Api>>,
+        Arg2: CodecInto<BigUint<Env::Api>>,
+    >(
+        self,
+        to: Arg0,
+        token: Arg1,
+        amount: Arg2,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call("forward_sync_retrieve_funds_with_accept_func")
+            .argument(&to)
+            .argument(&token)
+            .argument(&amount)
+            .original_result()
+    }
+
+    pub fn accept_funds_func(
+        self,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call("accept_funds_func")
+            .original_result()
+    }
+
+    pub fn forward_sync_accept_funds_multi_transfer<
+        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+        Arg1: CodecInto<MultiValueEncoded<Env::Api, MultiValue3<TokenIdentifier<Env::Api>, u64, BigUint<Env::Api>>>>,
+    >(
+        self,
+        to: Arg0,
+        token_payments: Arg1,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call("forward_sync_accept_funds_multi_transfer")
+            .argument(&to)
+            .argument(&token_payments)
+            .original_result()
+    }
+
+    pub fn echo_args_async<
+        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+        Arg1: CodecInto<MultiValueEncoded<Env::Api, ManagedBuffer<Env::Api>>>,
+    >(
+        self,
+        to: Arg0,
+        args: Arg1,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call("echo_args_async")
+            .argument(&to)
+            .argument(&args)
+            .original_result()
+    }
+
+    pub fn forward_async_accept_funds<
+        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+    >(
+        self,
+        to: Arg0,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call("forward_async_accept_funds")
+            .argument(&to)
+            .original_result()
+    }
+
+    pub fn forward_async_accept_funds_half_payment<
+        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+    >(
+        self,
+        to: Arg0,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call("forward_async_accept_funds_half_payment")
+            .argument(&to)
+            .original_result()
+    }
+
+    pub fn forward_async_accept_funds_with_fees<
+        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+        Arg1: CodecInto<BigUint<Env::Api>>,
+    >(
+        self,
+        to: Arg0,
+        percentage_fees: Arg1,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call("forward_async_accept_funds_with_fees")
+            .argument(&to)
+            .argument(&percentage_fees)
+            .original_result()
+    }
+
+    pub fn forward_async_retrieve_funds<
+        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+        Arg1: CodecInto<EgldOrEsdtTokenIdentifier<Env::Api>>,
+        Arg2: CodecInto<u64>,
+        Arg3: CodecInto<BigUint<Env::Api>>,
+    >(
+        self,
+        to: Arg0,
+        token: Arg1,
+        token_nonce: Arg2,
+        amount: Arg3,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call("forward_async_retrieve_funds")
+            .argument(&to)
+            .argument(&token)
+            .argument(&token_nonce)
+            .argument(&amount)
+            .original_result()
+    }
+
+    pub fn send_funds_twice<
+        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+        Arg1: CodecInto<EgldOrEsdtTokenIdentifier<Env::Api>>,
+        Arg2: CodecInto<BigUint<Env::Api>>,
+    >(
+        self,
+        to: Arg0,
+        token_identifier: Arg1,
+        amount: Arg2,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call("send_funds_twice")
+            .argument(&to)
+            .argument(&token_identifier)
+            .argument(&amount)
+            .original_result()
+    }
+
+    pub fn send_async_accept_multi_transfer<
+        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+        Arg1: CodecInto<MultiValueEncoded<Env::Api, MultiValue3<TokenIdentifier<Env::Api>, u64, BigUint<Env::Api>>>>,
+    >(
+        self,
+        to: Arg0,
+        token_payments: Arg1,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call("send_async_accept_multi_transfer")
+            .argument(&to)
+            .argument(&token_payments)
+            .original_result()
+    }
+
+    pub fn callback_data(
+        self,
+    ) -> TxProxyCall<Env, From, To, Gas, MultiValueEncoded<Env::Api, CallbackData<Env::Api>>> {
+        self.wrapped_tx
+            .raw_call("callback_data")
+            .original_result()
+    }
+
+    pub fn callback_data_at_index<
+        Arg0: CodecInto<usize>,
+    >(
+        self,
+        index: Arg0,
+    ) -> TxProxyCall<Env, From, To, Gas, MultiValue5<ManagedBuffer<Env::Api>, EgldOrEsdtTokenIdentifier<Env::Api>, u64, BigUint<Env::Api>, MultiValueManagedVec<Env::Api, ManagedBuffer<Env::Api>>>> {
+        self.wrapped_tx
+            .raw_call("callback_data_at_index")
+            .argument(&index)
+            .original_result()
+    }
+
+    pub fn clear_callback_data(
+        self,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call("clear_callback_data")
+            .original_result()
+    }
+
+    pub fn forward_transf_exec_accept_funds<
+        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+    >(
+        self,
+        to: Arg0,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call("forward_transf_exec_accept_funds")
+            .argument(&to)
+            .original_result()
+    }
+
+    pub fn forward_transf_execu_accept_funds_with_fees<
+        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+        Arg1: CodecInto<BigUint<Env::Api>>,
+    >(
+        self,
+        to: Arg0,
+        percentage_fees: Arg1,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call("forward_transf_execu_accept_funds_with_fees")
+            .argument(&to)
+            .argument(&percentage_fees)
+            .original_result()
+    }
+
+    pub fn forward_transf_exec_accept_funds_twice<
+        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+    >(
+        self,
+        to: Arg0,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call("forward_transf_exec_accept_funds_twice")
+            .argument(&to)
+            .original_result()
+    }
+
+    /// Test that the default gas provided to the transfer_execute call 
+    /// leaves enough in the transaction for finish to happen. 
+    pub fn forward_transf_exec_accept_funds_return_values<
+        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+    >(
+        self,
+        to: Arg0,
+    ) -> TxProxyCall<Env, From, To, Gas, MultiValue4<u64, u64, BigUint<Env::Api>, EgldOrEsdtTokenIdentifier<Env::Api>>> {
+        self.wrapped_tx
+            .raw_call("forward_transf_exec_accept_funds_return_values")
+            .argument(&to)
+            .original_result()
+    }
+
+    pub fn transf_exec_multi_accept_funds<
+        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+        Arg1: CodecInto<MultiValueEncoded<Env::Api, MultiValue3<TokenIdentifier<Env::Api>, u64, BigUint<Env::Api>>>>,
+    >(
+        self,
+        to: Arg0,
+        token_payments: Arg1,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call("transf_exec_multi_accept_funds")
+            .argument(&to)
+            .argument(&token_payments)
+            .original_result()
+    }
+
+    pub fn forward_transf_exec_reject_funds_multi_transfer<
+        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+        Arg1: CodecInto<MultiValueEncoded<Env::Api, MultiValue3<TokenIdentifier<Env::Api>, u64, BigUint<Env::Api>>>>,
+    >(
+        self,
+        to: Arg0,
+        token_payments: Arg1,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call("forward_transf_exec_reject_funds_multi_transfer")
+            .argument(&to)
+            .argument(&token_payments)
+            .original_result()
+    }
+
+    pub fn transf_exec_multi_reject_funds<
+        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+        Arg1: CodecInto<MultiValueEncoded<Env::Api, MultiValue3<TokenIdentifier<Env::Api>, u64, BigUint<Env::Api>>>>,
+    >(
+        self,
+        to: Arg0,
+        token_payments: Arg1,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call("transf_exec_multi_reject_funds")
+            .argument(&to)
+            .argument(&token_payments)
+            .original_result()
+    }
+
+    pub fn change_owner<
+        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+        Arg1: CodecInto<ManagedAddress<Env::Api>>,
+    >(
+        self,
+        child_sc_address: Arg0,
+        new_owner: Arg1,
+    ) -> TxProxyCall<Env, From, To, Gas, ManagedAddress<Env::Api>> {
+        self.wrapped_tx
+            .raw_call("changeOwnerAddress")
+            .argument(&child_sc_address)
+            .argument(&new_owner)
+            .original_result()
+    }
+
+    pub fn deploy_contract<
+        Arg0: CodecInto<ManagedBuffer<Env::Api>>,
+        Arg1: CodecInto<OptionalValue<ManagedBuffer<Env::Api>>>,
+    >(
+        self,
+        code: Arg0,
+        opt_arg: Arg1,
+    ) -> TxProxyCall<Env, From, To, Gas, MultiValue2<ManagedAddress<Env::Api>, OptionalValue<ManagedBuffer<Env::Api>>>> {
+        self.wrapped_tx
+            .raw_call("deploy_contract")
+            .argument(&code)
+            .argument(&opt_arg)
+            .original_result()
+    }
+
+    pub fn deploy_two_contracts<
+        Arg0: CodecInto<ManagedBuffer<Env::Api>>,
+    >(
+        self,
+        code: Arg0,
+    ) -> TxProxyCall<Env, From, To, Gas, MultiValue2<ManagedAddress<Env::Api>, ManagedAddress<Env::Api>>> {
+        self.wrapped_tx
+            .raw_call("deploy_two_contracts")
+            .argument(&code)
+            .original_result()
+    }
+
+    pub fn deploy_vault_from_source<
+        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+        Arg1: CodecInto<OptionalValue<ManagedBuffer<Env::Api>>>,
+    >(
+        self,
+        source_address: Arg0,
+        opt_arg: Arg1,
+    ) -> TxProxyCall<Env, From, To, Gas, MultiValue2<ManagedAddress<Env::Api>, OptionalValue<ManagedBuffer<Env::Api>>>> {
+        self.wrapped_tx
+            .raw_call("deploy_vault_from_source")
+            .argument(&source_address)
+            .argument(&opt_arg)
+            .original_result()
+    }
+
+    pub fn upgrade_vault<
+        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+        Arg1: CodecInto<ManagedBuffer<Env::Api>>,
+        Arg2: CodecInto<OptionalValue<ManagedBuffer<Env::Api>>>,
+    >(
+        self,
+        child_sc_address: Arg0,
+        new_code: Arg1,
+        opt_arg: Arg2,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call("upgradeVault")
+            .argument(&child_sc_address)
+            .argument(&new_code)
+            .argument(&opt_arg)
+            .original_result()
+    }
+
+    pub fn upgrade_vault_from_source<
+        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+        Arg1: CodecInto<ManagedAddress<Env::Api>>,
+        Arg2: CodecInto<OptionalValue<ManagedBuffer<Env::Api>>>,
+    >(
+        self,
+        child_sc_address: Arg0,
+        source_address: Arg1,
+        opt_arg: Arg2,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call("upgrade_vault_from_source")
+            .argument(&child_sc_address)
+            .argument(&source_address)
+            .argument(&opt_arg)
+            .original_result()
+    }
+
+    pub fn get_fungible_esdt_balance<
+        Arg0: CodecInto<TokenIdentifier<Env::Api>>,
+    >(
+        self,
+        token_identifier: Arg0,
+    ) -> TxProxyCall<Env, From, To, Gas, BigUint<Env::Api>> {
+        self.wrapped_tx
+            .raw_call("getFungibleEsdtBalance")
+            .argument(&token_identifier)
+            .original_result()
+    }
+
+    pub fn get_current_nft_nonce<
+        Arg0: CodecInto<TokenIdentifier<Env::Api>>,
+    >(
+        self,
+        token_identifier: Arg0,
+    ) -> TxProxyCall<Env, From, To, Gas, u64> {
+        self.wrapped_tx
+            .raw_call("getCurrentNftNonce")
+            .argument(&token_identifier)
+            .original_result()
+    }
+
+    pub fn send_esdt<
+        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+        Arg1: CodecInto<TokenIdentifier<Env::Api>>,
+        Arg2: CodecInto<BigUint<Env::Api>>,
+    >(
+        self,
+        to: Arg0,
+        token_id: Arg1,
+        amount: Arg2,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call("send_esdt")
+            .argument(&to)
+            .argument(&token_id)
+            .argument(&amount)
+            .original_result()
+    }
+
+    pub fn send_esdt_with_fees<
+        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+        Arg1: CodecInto<BigUint<Env::Api>>,
+    >(
+        self,
+        to: Arg0,
+        percentage_fees: Arg1,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call("send_esdt_with_fees")
+            .argument(&to)
+            .argument(&percentage_fees)
+            .original_result()
+    }
+
+    pub fn send_esdt_twice<
+        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+        Arg1: CodecInto<TokenIdentifier<Env::Api>>,
+        Arg2: CodecInto<BigUint<Env::Api>>,
+        Arg3: CodecInto<BigUint<Env::Api>>,
+    >(
+        self,
+        to: Arg0,
+        token_id: Arg1,
+        amount_first_time: Arg2,
+        amount_second_time: Arg3,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call("send_esdt_twice")
+            .argument(&to)
+            .argument(&token_id)
+            .argument(&amount_first_time)
+            .argument(&amount_second_time)
+            .original_result()
+    }
+
+    pub fn send_esdt_direct_multi_transfer<
+        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+        Arg1: CodecInto<MultiValueEncoded<Env::Api, MultiValue3<TokenIdentifier<Env::Api>, u64, BigUint<Env::Api>>>>,
+    >(
+        self,
+        to: Arg0,
+        token_payments: Arg1,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call("send_esdt_direct_multi_transfer")
+            .argument(&to)
+            .argument(&token_payments)
+            .original_result()
+    }
+
+    pub fn issue_fungible_token<
+        Arg0: CodecInto<ManagedBuffer<Env::Api>>,
+        Arg1: CodecInto<ManagedBuffer<Env::Api>>,
+        Arg2: CodecInto<BigUint<Env::Api>>,
+    >(
+        self,
+        token_display_name: Arg0,
+        token_ticker: Arg1,
+        initial_supply: Arg2,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call("issue_fungible_token")
+            .argument(&token_display_name)
+            .argument(&token_ticker)
+            .argument(&initial_supply)
+            .original_result()
+    }
+
+    pub fn local_mint<
+        Arg0: CodecInto<TokenIdentifier<Env::Api>>,
+        Arg1: CodecInto<BigUint<Env::Api>>,
+    >(
+        self,
+        token_identifier: Arg0,
+        amount: Arg1,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call("local_mint")
+            .argument(&token_identifier)
+            .argument(&amount)
+            .original_result()
+    }
+
+    pub fn local_burn<
+        Arg0: CodecInto<TokenIdentifier<Env::Api>>,
+        Arg1: CodecInto<BigUint<Env::Api>>,
+    >(
+        self,
+        token_identifier: Arg0,
+        amount: Arg1,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call("local_burn")
+            .argument(&token_identifier)
+            .argument(&amount)
+            .original_result()
+    }
+
+    pub fn get_esdt_local_roles<
+        Arg0: CodecInto<TokenIdentifier<Env::Api>>,
+    >(
+        self,
+        token_id: Arg0,
+    ) -> TxProxyCall<Env, From, To, Gas, MultiValueEncoded<Env::Api, ManagedBuffer<Env::Api>>> {
+        self.wrapped_tx
+            .raw_call("get_esdt_local_roles")
+            .argument(&token_id)
+            .original_result()
+    }
+
+    pub fn get_esdt_token_data<
+        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+        Arg1: CodecInto<TokenIdentifier<Env::Api>>,
+        Arg2: CodecInto<u64>,
+    >(
+        self,
+        address: Arg0,
+        token_id: Arg1,
+        nonce: Arg2,
+    ) -> TxProxyCall<Env, From, To, Gas, MultiValue9<EsdtTokenType, BigUint<Env::Api>, bool, ManagedBuffer<Env::Api>, ManagedBuffer<Env::Api>, ManagedBuffer<Env::Api>, ManagedAddress<Env::Api>, BigUint<Env::Api>, ManagedVec<Env::Api, ManagedBuffer<Env::Api>>>> {
+        self.wrapped_tx
+            .raw_call("get_esdt_token_data")
+            .argument(&address)
+            .argument(&token_id)
+            .argument(&nonce)
+            .original_result()
+    }
+
+    pub fn is_esdt_frozen<
+        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+        Arg1: CodecInto<TokenIdentifier<Env::Api>>,
+        Arg2: CodecInto<u64>,
+    >(
+        self,
+        address: Arg0,
+        token_id: Arg1,
+        nonce: Arg2,
+    ) -> TxProxyCall<Env, From, To, Gas, bool> {
+        self.wrapped_tx
+            .raw_call("is_esdt_frozen")
+            .argument(&address)
+            .argument(&token_id)
+            .argument(&nonce)
+            .original_result()
+    }
+
+    pub fn is_esdt_paused<
+        Arg0: CodecInto<TokenIdentifier<Env::Api>>,
+    >(
+        self,
+        token_id: Arg0,
+    ) -> TxProxyCall<Env, From, To, Gas, bool> {
+        self.wrapped_tx
+            .raw_call("is_esdt_paused")
+            .argument(&token_id)
+            .original_result()
+    }
+
+    pub fn is_esdt_limited_transfer<
+        Arg0: CodecInto<TokenIdentifier<Env::Api>>,
+    >(
+        self,
+        token_id: Arg0,
+    ) -> TxProxyCall<Env, From, To, Gas, bool> {
+        self.wrapped_tx
+            .raw_call("is_esdt_limited_transfer")
+            .argument(&token_id)
+            .original_result()
+    }
+
+    pub fn validate_token_identifier<
+        Arg0: CodecInto<TokenIdentifier<Env::Api>>,
+    >(
+        self,
+        token_id: Arg0,
+    ) -> TxProxyCall<Env, From, To, Gas, bool> {
+        self.wrapped_tx
+            .raw_call("validate_token_identifier")
+            .argument(&token_id)
+            .original_result()
+    }
+
+    pub fn sft_issue<
+        Arg0: CodecInto<ManagedBuffer<Env::Api>>,
+        Arg1: CodecInto<ManagedBuffer<Env::Api>>,
+    >(
+        self,
+        token_display_name: Arg0,
+        token_ticker: Arg1,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call("sft_issue")
+            .argument(&token_display_name)
+            .argument(&token_ticker)
+            .original_result()
+    }
+
+    pub fn get_nft_balance<
+        Arg0: CodecInto<TokenIdentifier<Env::Api>>,
+        Arg1: CodecInto<u64>,
+    >(
+        self,
+        token_identifier: Arg0,
+        nonce: Arg1,
+    ) -> TxProxyCall<Env, From, To, Gas, BigUint<Env::Api>> {
+        self.wrapped_tx
+            .raw_call("get_nft_balance")
+            .argument(&token_identifier)
+            .argument(&nonce)
+            .original_result()
+    }
+
+    pub fn buy_nft<
+        Arg0: CodecInto<TokenIdentifier<Env::Api>>,
+        Arg1: CodecInto<u64>,
+        Arg2: CodecInto<BigUint<Env::Api>>,
+    >(
+        self,
+        nft_id: Arg0,
+        nft_nonce: Arg1,
+        nft_amount: Arg2,
+    ) -> TxProxyCall<Env, From, To, Gas, BigUint<Env::Api>> {
+        self.wrapped_tx
+            .raw_call("buy_nft")
+            .argument(&nft_id)
+            .argument(&nft_nonce)
+            .argument(&nft_amount)
+            .original_result()
+    }
+
+    pub fn nft_issue<
+        Arg0: CodecInto<ManagedBuffer<Env::Api>>,
+        Arg1: CodecInto<ManagedBuffer<Env::Api>>,
+    >(
+        self,
+        token_display_name: Arg0,
+        token_ticker: Arg1,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call("nft_issue")
+            .argument(&token_display_name)
+            .argument(&token_ticker)
+            .original_result()
+    }
+
+    pub fn nft_create<
+        Arg0: CodecInto<TokenIdentifier<Env::Api>>,
+        Arg1: CodecInto<BigUint<Env::Api>>,
+        Arg2: CodecInto<ManagedBuffer<Env::Api>>,
+        Arg3: CodecInto<BigUint<Env::Api>>,
+        Arg4: CodecInto<ManagedBuffer<Env::Api>>,
+        Arg5: CodecInto<Color>,
+        Arg6: CodecInto<ManagedBuffer<Env::Api>>,
+    >(
+        self,
+        token_identifier: Arg0,
+        amount: Arg1,
+        name: Arg2,
+        royalties: Arg3,
+        hash: Arg4,
+        color: Arg5,
+        uri: Arg6,
+    ) -> TxProxyCall<Env, From, To, Gas, u64> {
+        self.wrapped_tx
+            .raw_call("nft_create")
+            .argument(&token_identifier)
+            .argument(&amount)
+            .argument(&name)
+            .argument(&royalties)
+            .argument(&hash)
+            .argument(&color)
+            .argument(&uri)
+            .original_result()
+    }
+
+    pub fn nft_create_compact<
+        Arg0: CodecInto<TokenIdentifier<Env::Api>>,
+        Arg1: CodecInto<BigUint<Env::Api>>,
+        Arg2: CodecInto<Color>,
+    >(
+        self,
+        token_identifier: Arg0,
+        amount: Arg1,
+        color: Arg2,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call("nft_create_compact")
+            .argument(&token_identifier)
+            .argument(&amount)
+            .argument(&color)
+            .original_result()
+    }
+
+    pub fn nft_add_uris<
+        Arg0: CodecInto<TokenIdentifier<Env::Api>>,
+        Arg1: CodecInto<u64>,
+        Arg2: CodecInto<MultiValueEncoded<Env::Api, ManagedBuffer<Env::Api>>>,
+    >(
+        self,
+        token_identifier: Arg0,
+        nonce: Arg1,
+        uris: Arg2,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call("nft_add_uris")
+            .argument(&token_identifier)
+            .argument(&nonce)
+            .argument(&uris)
+            .original_result()
+    }
+
+    pub fn nft_update_attributes<
+        Arg0: CodecInto<TokenIdentifier<Env::Api>>,
+        Arg1: CodecInto<u64>,
+        Arg2: CodecInto<Color>,
+    >(
+        self,
+        token_identifier: Arg0,
+        nonce: Arg1,
+        new_attributes: Arg2,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call("nft_update_attributes")
+            .argument(&token_identifier)
+            .argument(&nonce)
+            .argument(&new_attributes)
+            .original_result()
+    }
+
+    pub fn nft_decode_complex_attributes<
+        Arg0: CodecInto<TokenIdentifier<Env::Api>>,
+        Arg1: CodecInto<BigUint<Env::Api>>,
+        Arg2: CodecInto<ManagedBuffer<Env::Api>>,
+        Arg3: CodecInto<BigUint<Env::Api>>,
+        Arg4: CodecInto<ManagedBuffer<Env::Api>>,
+        Arg5: CodecInto<ManagedBuffer<Env::Api>>,
+        Arg6: CodecInto<MultiValue5<BigUint<Env::Api>, ManagedBuffer<Env::Api>, TokenIdentifier<Env::Api>, bool, ManagedBuffer<Env::Api>>>,
+    >(
+        self,
+        token_identifier: Arg0,
+        amount: Arg1,
+        name: Arg2,
+        royalties: Arg3,
+        hash: Arg4,
+        uri: Arg5,
+        attrs_arg: Arg6,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call("nft_decode_complex_attributes")
+            .argument(&token_identifier)
+            .argument(&amount)
+            .argument(&name)
+            .argument(&royalties)
+            .argument(&hash)
+            .argument(&uri)
+            .argument(&attrs_arg)
+            .original_result()
+    }
+
+    pub fn nft_add_quantity<
+        Arg0: CodecInto<TokenIdentifier<Env::Api>>,
+        Arg1: CodecInto<u64>,
+        Arg2: CodecInto<BigUint<Env::Api>>,
+    >(
+        self,
+        token_identifier: Arg0,
+        nonce: Arg1,
+        amount: Arg2,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call("nft_add_quantity")
+            .argument(&token_identifier)
+            .argument(&nonce)
+            .argument(&amount)
+            .original_result()
+    }
+
+    pub fn nft_burn<
+        Arg0: CodecInto<TokenIdentifier<Env::Api>>,
+        Arg1: CodecInto<u64>,
+        Arg2: CodecInto<BigUint<Env::Api>>,
+    >(
+        self,
+        token_identifier: Arg0,
+        nonce: Arg1,
+        amount: Arg2,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call("nft_burn")
+            .argument(&token_identifier)
+            .argument(&nonce)
+            .argument(&amount)
+            .original_result()
+    }
+
+    pub fn transfer_nft_via_async_call<
+        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+        Arg1: CodecInto<TokenIdentifier<Env::Api>>,
+        Arg2: CodecInto<u64>,
+        Arg3: CodecInto<BigUint<Env::Api>>,
+    >(
+        self,
+        to: Arg0,
+        token_identifier: Arg1,
+        nonce: Arg2,
+        amount: Arg3,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call("transfer_nft_via_async_call")
+            .argument(&to)
+            .argument(&token_identifier)
+            .argument(&nonce)
+            .argument(&amount)
+            .original_result()
+    }
+
+    pub fn transfer_nft_and_execute<
+        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+        Arg1: CodecInto<TokenIdentifier<Env::Api>>,
+        Arg2: CodecInto<u64>,
+        Arg3: CodecInto<BigUint<Env::Api>>,
+        Arg4: CodecInto<ManagedBuffer<Env::Api>>,
+        Arg5: CodecInto<MultiValueEncoded<Env::Api, ManagedBuffer<Env::Api>>>,
+    >(
+        self,
+        to: Arg0,
+        token_identifier: Arg1,
+        nonce: Arg2,
+        amount: Arg3,
+        function: Arg4,
+        arguments: Arg5,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call("transfer_nft_and_execute")
+            .argument(&to)
+            .argument(&token_identifier)
+            .argument(&nonce)
+            .argument(&amount)
+            .argument(&function)
+            .argument(&arguments)
+            .original_result()
+    }
+
+    pub fn create_and_send<
+        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+        Arg1: CodecInto<TokenIdentifier<Env::Api>>,
+        Arg2: CodecInto<BigUint<Env::Api>>,
+        Arg3: CodecInto<ManagedBuffer<Env::Api>>,
+        Arg4: CodecInto<BigUint<Env::Api>>,
+        Arg5: CodecInto<ManagedBuffer<Env::Api>>,
+        Arg6: CodecInto<Color>,
+        Arg7: CodecInto<ManagedBuffer<Env::Api>>,
+    >(
+        self,
+        to: Arg0,
+        token_identifier: Arg1,
+        amount: Arg2,
+        name: Arg3,
+        royalties: Arg4,
+        hash: Arg5,
+        color: Arg6,
+        uri: Arg7,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call("create_and_send")
+            .argument(&to)
+            .argument(&token_identifier)
+            .argument(&amount)
+            .argument(&name)
+            .argument(&royalties)
+            .argument(&hash)
+            .argument(&color)
+            .argument(&uri)
+            .original_result()
+    }
+
+    pub fn set_local_roles<
+        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+        Arg1: CodecInto<TokenIdentifier<Env::Api>>,
+        Arg2: CodecInto<MultiValueEncoded<Env::Api, EsdtLocalRole>>,
+    >(
+        self,
+        address: Arg0,
+        token_identifier: Arg1,
+        roles: Arg2,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call("setLocalRoles")
+            .argument(&address)
+            .argument(&token_identifier)
+            .argument(&roles)
+            .original_result()
+    }
+
+    pub fn unset_local_roles<
+        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+        Arg1: CodecInto<TokenIdentifier<Env::Api>>,
+        Arg2: CodecInto<MultiValueEncoded<Env::Api, EsdtLocalRole>>,
+    >(
+        self,
+        address: Arg0,
+        token_identifier: Arg1,
+        roles: Arg2,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call("unsetLocalRoles")
+            .argument(&address)
+            .argument(&token_identifier)
+            .argument(&roles)
+            .original_result()
+    }
+
+    pub fn last_issued_token(
+        self,
+    ) -> TxProxyCall<Env, From, To, Gas, TokenIdentifier<Env::Api>> {
+        self.wrapped_tx
+            .raw_call("lastIssuedToken")
+            .original_result()
+    }
+
+    pub fn last_error_message(
+        self,
+    ) -> TxProxyCall<Env, From, To, Gas, ManagedBuffer<Env::Api>> {
+        self.wrapped_tx
+            .raw_call("lastErrorMessage")
+            .original_result()
+    }
+}
+
+#[derive(TopEncode, TopDecode)]
+pub struct CallbackData<Api>
+where
+    Api: ManagedTypeApi,
+{
+    pub callback_name: ManagedBuffer<Api>,
+    pub token_identifier: EgldOrEsdtTokenIdentifier<Api>,
+    pub token_nonce: u64,
+    pub token_amount: BigUint<Api>,
+    pub args: ManagedVec<Api, ManagedBuffer<Api>>,
+}
+
+#[derive(TopEncode, TopDecode)]
+pub struct Color {
+    pub r: u8,
+    pub g: u8,
+    pub b: u8,
+}

From 07847bdf41ad938b5de8d7f7c532c3347e8b2c77 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Tue, 30 Apr 2024 18:11:19 +0300
Subject: [PATCH 0802/1254] increase code coverage - migrate forwarder blackbox
 to unified syntax

---
 .../tests/forwarder_blackbox_test.rs          | 131 ++++++++----------
 .../scenario-tester/tests/st_blackbox_test.rs |  54 +++++++-
 .../scenario_set_account.rs                   |   6 +-
 3 files changed, 109 insertions(+), 82 deletions(-)

diff --git a/contracts/feature-tests/composability/tests/forwarder_blackbox_test.rs b/contracts/feature-tests/composability/tests/forwarder_blackbox_test.rs
index f6812aa0bc..73b1b92488 100644
--- a/contracts/feature-tests/composability/tests/forwarder_blackbox_test.rs
+++ b/contracts/feature-tests/composability/tests/forwarder_blackbox_test.rs
@@ -1,57 +1,42 @@
-use forwarder::nft::{Color, ProxyTrait as _};
+use forwarder::forwarder_proxy;
 
 use multiversx_sc_scenario::imports::*;
 
-const USER_ADDRESS_EXPR: &str = "address:user";
-const FORWARDER_ADDRESS_EXPR: &str = "sc:forwarder";
-const FORWARDER_PATH_EXPR: &str = "mxsc:output/forwarder.mxsc.json";
+const USER_ADDRESS: TestAddress = TestAddress::new("user");
+const FORWARDER_ADDRESS: TestSCAddress = TestSCAddress::new("forwarder");
+const FORWARDER_PATH: MxscPath = MxscPath::new("output/forwarder.mxsc.json");
 
-const NFT_TOKEN_ID_EXPR: &str = "str:COOL-123456";
-const NFT_TOKEN_ID: &[u8] = b"COOL-123456";
-
-type ForwarderContract = ContractInfo<forwarder::Proxy<StaticApi>>;
+const NFT_TOKEN_ID: TestTokenIdentifier = TestTokenIdentifier::new("COOL-123456");
+const NFT_TOKEN: &[u8] = b"COOL-123456";
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
-    blockchain.set_current_dir_from_workspace("contracts/composability/forwarder");
 
-    blockchain.register_contract(FORWARDER_PATH_EXPR, forwarder::ContractBuilder);
+    blockchain.register_contract(FORWARDER_PATH, forwarder::ContractBuilder);
     blockchain
 }
 
 struct ForwarderTestState {
     world: ScenarioWorld,
-    forwarder_contract: ForwarderContract,
 }
 
 impl ForwarderTestState {
     fn new() -> Self {
         let mut world = world();
 
-        let forwarder_code = world.code_expression(FORWARDER_PATH_EXPR);
         let roles = vec![
             "ESDTRoleNFTCreate".to_string(),
             "ESDTRoleNFTUpdateAttributes".to_string(),
         ];
 
-        world.set_state_step(
-            SetStateStep::new()
-                .put_account(USER_ADDRESS_EXPR, Account::new().nonce(1))
-                .put_account(
-                    FORWARDER_ADDRESS_EXPR,
-                    Account::new()
-                        .nonce(1)
-                        .code(forwarder_code)
-                        .esdt_roles(NFT_TOKEN_ID_EXPR, roles),
-                ),
-        );
-
-        let forwarder_contract = ForwarderContract::new(FORWARDER_ADDRESS_EXPR);
+        world.account(USER_ADDRESS).nonce(1);
+        world
+            .account(FORWARDER_ADDRESS)
+            .nonce(1)
+            .code(FORWARDER_PATH)
+            .esdt_roles(NFT_TOKEN_ID, roles);
 
-        Self {
-            world,
-            forwarder_contract,
-        }
+        Self { world }
     }
 }
 
@@ -59,72 +44,72 @@ impl ForwarderTestState {
 fn test_nft_update_attributes_and_send() {
     let mut state = ForwarderTestState::new();
 
-    let original_attributes = Color { r: 0, g: 0, b: 0 };
+    let original_attributes = forwarder_proxy::Color { r: 0, g: 0, b: 0 };
+    let original_attributes_bytes: &[u8] = &[
+        original_attributes.r,
+        original_attributes.g,
+        original_attributes.b,
+    ];
 
-    state.world.sc_call(
-        ScCallStep::new().from(USER_ADDRESS_EXPR).call(
-            state
-                .forwarder_contract
-                .nft_create_compact(NFT_TOKEN_ID, 1u64, original_attributes),
-        ),
-    );
+    state
+        .world
+        .tx()
+        .from(USER_ADDRESS)
+        .to(FORWARDER_ADDRESS)
+        .typed(forwarder_proxy::ForwarderProxy)
+        .nft_create_compact(NFT_TOKEN_ID, 1u64, original_attributes)
+        .run();
 
     state.world.transfer_step(
         TransferStep::new()
-            .from(FORWARDER_ADDRESS_EXPR)
-            .to(USER_ADDRESS_EXPR)
-            .esdt_transfer(NFT_TOKEN_ID, 1, "1"),
+            .from(FORWARDER_ADDRESS.eval_to_expr().as_str())
+            .to(USER_ADDRESS.eval_to_expr().as_str())
+            .esdt_transfer(NFT_TOKEN, 1, "1"),
     );
 
     state
         .world
-        .check_state_step(CheckStateStep::new().put_account(
-            USER_ADDRESS_EXPR,
-            CheckAccount::new().esdt_nft_balance_and_attributes(
-                NFT_TOKEN_ID_EXPR,
-                1,
-                "1",
-                Some(original_attributes),
-            ),
-        ));
-
-    let new_attributes = Color {
+        .check_account(USER_ADDRESS)
+        .esdt_nft_balance_and_attributes(
+            NFT_TOKEN_ID,
+            1,
+            1,
+            managed_buffer!(original_attributes_bytes),
+        );
+
+    let new_attributes = forwarder_proxy::Color {
         r: 255,
         g: 255,
         b: 255,
     };
 
+    let new_attributes_bytes: &[u8] = &[new_attributes.r, new_attributes.g, new_attributes.b];
+
     state.world.transfer_step(
         TransferStep::new()
-            .from(USER_ADDRESS_EXPR)
-            .to(FORWARDER_ADDRESS_EXPR)
-            .esdt_transfer(NFT_TOKEN_ID, 1, "1"),
+            .from(USER_ADDRESS.eval_to_expr().as_str())
+            .to(FORWARDER_ADDRESS.eval_to_expr().as_str())
+            .esdt_transfer(NFT_TOKEN, 1, "1"),
     );
 
-    state.world.sc_call(
-        ScCallStep::new().from(USER_ADDRESS_EXPR).call(
-            state
-                .forwarder_contract
-                .nft_update_attributes(NFT_TOKEN_ID, 1u64, new_attributes),
-        ),
-    );
+    state
+        .world
+        .tx()
+        .from(USER_ADDRESS)
+        .to(FORWARDER_ADDRESS)
+        .typed(forwarder_proxy::ForwarderProxy)
+        .nft_update_attributes(NFT_TOKEN_ID, 1u64, new_attributes)
+        .run();
 
     state.world.transfer_step(
         TransferStep::new()
-            .from(FORWARDER_ADDRESS_EXPR)
-            .to(USER_ADDRESS_EXPR)
-            .esdt_transfer(NFT_TOKEN_ID, 1, "1"),
+            .from(FORWARDER_ADDRESS.eval_to_expr().as_str())
+            .to(USER_ADDRESS.eval_to_expr().as_str())
+            .esdt_transfer(NFT_TOKEN, 1, "1"),
     );
 
     state
         .world
-        .check_state_step(CheckStateStep::new().put_account(
-            USER_ADDRESS_EXPR,
-            CheckAccount::new().esdt_nft_balance_and_attributes(
-                NFT_TOKEN_ID_EXPR,
-                1,
-                "1",
-                Some(new_attributes),
-            ),
-        ));
+        .check_account(USER_ADDRESS)
+        .esdt_nft_balance_and_attributes(NFT_TOKEN_ID, 1, 1, managed_buffer!(new_attributes_bytes));
 }
diff --git a/contracts/feature-tests/scenario-tester/tests/st_blackbox_test.rs b/contracts/feature-tests/scenario-tester/tests/st_blackbox_test.rs
index 9f0b9091d3..fe144c875e 100644
--- a/contracts/feature-tests/scenario-tester/tests/st_blackbox_test.rs
+++ b/contracts/feature-tests/scenario-tester/tests/st_blackbox_test.rs
@@ -4,6 +4,8 @@ use num_bigint::BigUint;
 use scenario_tester::*;
 
 const SC_SCENARIO_TESTER_PATH_EXPR: &str = "mxsc:output/scenario-tester.mxsc.json";
+const FOURTH_ATTRIBUTES: &[u8] = b"FourthhAttributes";
+const FOURTH_URIS: &[&[u8]] = &[b"FirstUri", b"SecondUri"];
 
 const OWNER_ADDRESS: TestAddress = TestAddress::new("owner");
 const OTHER_ADDRESS: TestAddress = TestAddress::new("other");
@@ -106,6 +108,8 @@ fn set_state_test() {
     let fourth = TestAddress::new("fourth");
     let fifth = TestAddress::new("fifth");
     let sixth = TestAddress::new("sixth");
+    let seventh = TestAddress::new("seventh");
+    let eighth = TestAddress::new("eighth");
 
     world.start_trace();
 
@@ -143,33 +147,71 @@ fn set_state_test() {
         .esdt_nft_balance_and_attributes(NFT_ID, 2, 1, ())
         .commit();
 
-    // using no commit should drop the value naturally
+    let fourth_uris = FOURTH_URIS
+        .iter()
+        .map(|first_uri| managed_buffer!(first_uri))
+        .collect();
     world
         .account(fourth)
+        .nonce(3)
+        .balance(50)
+        .esdt_nft_all_properties(
+            NFT_ID,
+            2,
+            1,
+            managed_buffer!(FOURTH_ATTRIBUTES),
+            1000,
+            None::<Address>,
+            (),
+            fourth_uris,
+        )
+        .commit();
+
+    world
+        .check_account(fourth)
+        .nonce(3)
+        .balance(50)
+        .esdt_nft_balance_and_attributes(NFT_ID, 2, 1, managed_buffer!(FOURTH_ATTRIBUTES))
+        .commit();
+
+    world
+        .account(fifth)
+        .nonce(2)
+        .balance(30)
+        .esdt_nft_last_nonce(NFT_ID, 5);
+    world
+        .check_account(fifth)
+        .nonce(2)
+        .balance(30)
+        .esdt_nft_balance_and_attributes(NFT_ID, 5, 0, ());
+
+    // using no commit should drop the value naturally
+    world
+        .account(sixth)
         .nonce(4)
         .balance(400)
-        .account(fifth)
+        .account(seventh)
         .nonce(5)
         .balance(250)
         .esdt_balance(TOKEN_ID, 2);
 
     world
-        .check_account(fourth)
+        .check_account(sixth)
         .nonce(4)
         .balance(400)
-        .check_account(fifth)
+        .check_account(seventh)
         .nonce(5)
         .balance(250)
         .esdt_balance(TOKEN_ID, 2);
 
     world
-        .account(sixth)
+        .account(eighth)
         .nonce(6)
         .balance(600)
         .esdt_balance(TOKEN_ID, 60);
 
     world
-        .check_account(sixth)
+        .check_account(eighth)
         .nonce(6)
         .balance(600)
         .esdt_balance(TOKEN_ID, 60);
diff --git a/framework/scenario/src/facade/world_tx/scenario_set_state/scenario_set_account.rs b/framework/scenario/src/facade/world_tx/scenario_set_state/scenario_set_account.rs
index 65351927ec..f5590894e1 100644
--- a/framework/scenario/src/facade/world_tx/scenario_set_state/scenario_set_account.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_set_state/scenario_set_account.rs
@@ -109,7 +109,7 @@ impl<'w> SetStateBuilder<'w, AccountItem> {
         balance: V,
         attributes: T,
         royalties: R,
-        creator: C,
+        creator: Option<C>,
         hash: H,
         uris: Vec<U>,
     ) -> Self
@@ -129,7 +129,7 @@ impl<'w> SetStateBuilder<'w, AccountItem> {
         let royalties_value = u64_annotated(&env, &royalties);
         let balance_value = big_uint_annotated(&env, &balance);
         let attributes_value = bytes_annotated(&env, attributes);
-        let creator_value = address_annotated(&env, &creator);
+        let creator_value = creator.as_ref().map(|c| address_annotated(&env, c));
         let hash_value = bytes_annotated(&env, hash);
         let mut uris_value = Vec::new();
         for uri in uris {
@@ -146,7 +146,7 @@ impl<'w> SetStateBuilder<'w, AccountItem> {
             balance_value,
             Some(attributes_value),
             royalties_value,
-            Some(creator_value),
+            creator_value,
             Some(hash_value),
             uris_value,
         );

From d7dd5afa22a04274d43fd6d9138bbed41e732752 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 30 Apr 2024 18:50:39 +0300
Subject: [PATCH 0803/1254] sc 0.48.1, codec 0.18.7

---
 CHANGELOG.md                                  |   4 +
 Cargo.lock                                    | 295 +++++++++---------
 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 +-
 .../Cargo.toml                                |   2 +-
 .../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 +-
 .../wasm-alloc-mem-fail/Cargo.toml            |   2 +-
 .../wasm-alloc-mem-leaking/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 +-
 .../exchange-features/Cargo.toml              |   4 +-
 .../exchange-features/meta/Cargo.toml         |   2 +-
 .../exchange-features/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         |   3 +-
 framework/scenario/Cargo.toml                 |   6 +-
 framework/snippets/Cargo.toml                 |   4 +-
 framework/wasm-adapter/Cargo.toml             |   4 +-
 tools/mxpy-snippet-generator/Cargo.toml       |   2 +-
 tools/rust-debugger/format-tests/Cargo.toml   |   4 +-
 269 files changed, 531 insertions(+), 535 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8c22847501..df6d26af07 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,6 +26,10 @@ 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.48.1, codec 0.18.7] - 2024-04-30
+- Simplified decoding of small numbers (i64/u64).
+- Manual reset of the `StaticApi`, in order to free memory for long-running tasks.
+
 ## [sc 0.48.0] - 2024-04-09
 - When serializing to a managed buffer, static buffer caching is disabled by default.
 - `sc-meta:` - installers for wasm32 target and wasm-opt.
diff --git a/Cargo.lock b/Cargo.lock
index c8c6746cad..c7f8875a89 100755
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -136,9 +136,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.81"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247"
+checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519"
 
 [[package]]
 name = "arrayvec"
@@ -148,15 +148,15 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
 
 [[package]]
 name = "backtrace"
-version = "0.3.70"
+version = "0.3.71"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95d8e92cac0961e91dbd517496b00f7e9b92363dbe6d42c3198268323798860c"
+checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d"
 dependencies = [
  "addr2line",
  "cc",
@@ -173,6 +173,12 @@ version = "0.21.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
 
+[[package]]
+name = "base64"
+version = "0.22.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51"
+
 [[package]]
 name = "basic-features"
 version = "0.0.0"
@@ -338,9 +344,9 @@ dependencies = [
 
 [[package]]
 name = "bumpalo"
-version = "3.15.4"
+version = "3.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa"
+checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
 
 [[package]]
 name = "byteorder"
@@ -350,15 +356,15 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "bytes"
-version = "1.5.0"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223"
+checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9"
 
 [[package]]
 name = "cc"
-version = "1.0.90"
+version = "1.0.96"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5"
+checksum = "065a29261d53ba54260972629f9ca6bffa69bac13cd1fed61420f7fa68b9f8bd"
 
 [[package]]
 name = "cfg-if"
@@ -403,9 +409,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.3"
+version = "4.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "949626d00e063efc93b6dca932419ceb5432f99769911c0b995f7e884c778813"
+checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -425,9 +431,9 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.5.3"
+version = "4.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90239a040c80f5e14809ca132ddc4176ab33d5e17e49691793296e3fcb34d72f"
+checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64"
 dependencies = [
  "heck",
  "proc-macro2",
@@ -709,9 +715,9 @@ dependencies = [
 
 [[package]]
 name = "either"
-version = "1.10.0"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a"
+checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2"
 
 [[package]]
 name = "empty"
@@ -732,9 +738,9 @@ dependencies = [
 
 [[package]]
 name = "encoding_rs"
-version = "0.8.33"
+version = "0.8.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1"
+checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59"
 dependencies = [
  "cfg-if",
 ]
@@ -950,9 +956,9 @@ dependencies = [
 
 [[package]]
 name = "fastrand"
-version = "2.0.1"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5"
+checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a"
 
 [[package]]
 name = "first-contract"
@@ -973,9 +979,9 @@ dependencies = [
 
 [[package]]
 name = "flate2"
-version = "1.0.28"
+version = "1.0.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e"
+checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae"
 dependencies = [
  "crc32fast",
  "miniz_oxide",
@@ -1207,9 +1213,9 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.2.12"
+version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5"
+checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -1239,9 +1245,9 @@ dependencies = [
 
 [[package]]
 name = "h2"
-version = "0.3.25"
+version = "0.3.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fbd2820c5e49886948654ab546d0688ff24530286bdcf8fca3cefb16d4618eb"
+checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8"
 dependencies = [
  "bytes",
  "fnv",
@@ -1258,9 +1264,9 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.14.3"
+version = "0.14.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
+checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
 
 [[package]]
 name = "heck"
@@ -1400,9 +1406,9 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.2.5"
+version = "2.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4"
+checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"
 dependencies = [
  "equivalent",
  "hashbrown",
@@ -1439,9 +1445,9 @@ dependencies = [
 
 [[package]]
 name = "itoa"
-version = "1.0.10"
+version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c"
+checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
 
 [[package]]
 name = "js-sys"
@@ -1548,9 +1554,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
 name = "libc"
-version = "0.2.153"
+version = "0.2.154"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
+checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346"
 
 [[package]]
 name = "linked-list-repeat"
@@ -1593,9 +1599,9 @@ dependencies = [
 
 [[package]]
 name = "lock_api"
-version = "0.4.11"
+version = "0.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45"
+checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
 dependencies = [
  "autocfg",
  "scopeguard",
@@ -1676,9 +1682,9 @@ dependencies = [
 
 [[package]]
 name = "memchr"
-version = "2.7.1"
+version = "2.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149"
+checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d"
 
 [[package]]
 name = "mime"
@@ -1798,10 +1804,10 @@ checksum = "b59072fa0624b55ae5ae3fa6bfa91515bbeb4ac440214bc4a509e2c8806d6e9f"
 
 [[package]]
 name = "multiversx-price-aggregator-sc"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "arrayvec",
- "getrandom 0.2.12",
+ "getrandom 0.2.14",
  "multiversx-sc",
  "multiversx-sc-modules",
  "multiversx-sc-scenario",
@@ -1819,7 +1825,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "bitflags 2.4.2",
  "hex-literal",
@@ -1830,7 +1836,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -1839,7 +1845,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -1849,7 +1855,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -1860,7 +1866,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-meta"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "clap",
  "colored",
@@ -1886,16 +1892,16 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-scenario"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
- "base64",
+ "base64 0.21.7",
  "bech32",
  "clap",
  "colored",
@@ -1919,9 +1925,9 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-snippets"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
- "base64",
+ "base64 0.21.7",
  "env_logger",
  "futures",
  "hex",
@@ -1933,7 +1939,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -1943,7 +1949,7 @@ name = "multiversx-sdk"
 version = "0.3.2"
 dependencies = [
  "anyhow",
- "base64",
+ "base64 0.21.7",
  "bech32",
  "bip39",
  "hex",
@@ -1964,7 +1970,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-wegld-swap-sc"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "multiversx-sc",
  "multiversx-sc-modules",
@@ -2161,9 +2167,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.101"
+version = "0.9.102"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dda2b0f344e78efc2facf7d195d098df0dd72151b26ab98da807afc26c198dff"
+checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2"
 dependencies = [
  "cc",
  "libc",
@@ -2231,9 +2237,9 @@ dependencies = [
 
 [[package]]
 name = "parking_lot"
-version = "0.12.1"
+version = "0.12.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
+checksum = "7e4af0ca4f6caed20e900d564c242b8e5d4903fdacf31d3daf527b66fe6f42fb"
 dependencies = [
  "lock_api",
  "parking_lot_core",
@@ -2241,15 +2247,15 @@ dependencies = [
 
 [[package]]
 name = "parking_lot_core"
-version = "0.9.9"
+version = "0.9.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e"
+checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
 dependencies = [
  "cfg-if",
  "libc",
  "redox_syscall",
  "smallvec",
- "windows-targets 0.48.5",
+ "windows-targets 0.52.5",
 ]
 
 [[package]]
@@ -2285,11 +2291,11 @@ dependencies = [
 
 [[package]]
 name = "pem"
-version = "3.0.3"
+version = "3.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b8fcc794035347fb64beda2d3b462595dd2753e3f268d89c5aae77e8cf2c310"
+checksum = "8e459365e590736a54c3fa561947c84837534b8e9af6fc5bf781307e82658fae"
 dependencies = [
- "base64",
+ "base64 0.22.0",
  "serde",
 ]
 
@@ -2301,9 +2307,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.13"
+version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58"
+checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
 
 [[package]]
 name = "pin-utils"
@@ -2509,7 +2515,7 @@ version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
 dependencies = [
- "getrandom 0.2.12",
+ "getrandom 0.2.14",
 ]
 
 [[package]]
@@ -2556,18 +2562,18 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.4.1"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
+checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.4.2",
 ]
 
 [[package]]
 name = "regex"
-version = "1.10.3"
+version = "1.10.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15"
+checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -2588,9 +2594,9 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.2"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
+checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56"
 
 [[package]]
 name = "reqwest"
@@ -2598,7 +2604,7 @@ version = "0.11.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62"
 dependencies = [
- "base64",
+ "base64 0.21.7",
  "bytes",
  "encoding_rs",
  "futures-core",
@@ -2719,9 +2725,9 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.38.32"
+version = "0.38.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89"
+checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
 dependencies = [
  "bitflags 2.4.2",
  "errno",
@@ -2736,7 +2742,7 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c"
 dependencies = [
- "base64",
+ "base64 0.21.7",
 ]
 
 [[package]]
@@ -2788,9 +2794,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework"
-version = "2.9.2"
+version = "2.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de"
+checksum = "770452e37cad93e0a50d5abc3990d2bc351c36d0328f86cefec2f2fb206eaef6"
 dependencies = [
  "bitflags 1.3.2",
  "core-foundation",
@@ -2801,9 +2807,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework-sys"
-version = "2.9.1"
+version = "2.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a"
+checksum = "41f3cc463c0ef97e11c3461a9d3787412d30e8e7eb907c79180c4a57bf7c04ef"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -2850,18 +2856,18 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.197"
+version = "1.0.199"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2"
+checksum = "0c9f6e76df036c77cd94996771fb40db98187f096dd0b9af39c6c6e452ba966a"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.197"
+version = "1.0.199"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b"
+checksum = "11bd257a6541e141e42ca6d24ae26f7714887b47e89aa739099104c7e4d3b7fc"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2870,9 +2876,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.114"
+version = "1.0.116"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0"
+checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813"
 dependencies = [
  "indexmap",
  "itoa",
@@ -2882,9 +2888,9 @@ dependencies = [
 
 [[package]]
 name = "serde_repr"
-version = "0.1.18"
+version = "0.1.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb"
+checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2965,9 +2971,9 @@ dependencies = [
 
 [[package]]
 name = "signal-hook-registry"
-version = "1.4.1"
+version = "1.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1"
+checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1"
 dependencies = [
  "libc",
 ]
@@ -3012,9 +3018,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "socket2"
-version = "0.5.6"
+version = "0.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871"
+checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c"
 dependencies = [
  "libc",
  "windows-sys 0.52.0",
@@ -3038,9 +3044,9 @@ dependencies = [
 
 [[package]]
 name = "strsim"
-version = "0.11.0"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01"
+checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
 
 [[package]]
 name = "subtle"
@@ -3131,9 +3137,9 @@ dependencies = [
 
 [[package]]
 name = "tokio"
-version = "1.36.0"
+version = "1.37.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931"
+checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787"
 dependencies = [
  "backtrace",
  "bytes",
@@ -3207,9 +3213,9 @@ dependencies = [
 
 [[package]]
 name = "toml_edit"
-version = "0.22.9"
+version = "0.22.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e40bb779c5187258fd7aad0eb68cb8706a0a81fa712fbea808ab43c4b8374c4"
+checksum = "d3328d4f68a705b2a4498da1d580585d39a6510f98318a2cec3018a7ec61ddef"
 dependencies = [
  "indexmap",
  "serde",
@@ -3508,37 +3514,15 @@ dependencies = [
  "wasm-bindgen",
 ]
 
-[[package]]
-name = "winapi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
-dependencies = [
- "winapi-i686-pc-windows-gnu",
- "winapi-x86_64-pc-windows-gnu",
-]
-
-[[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-
 [[package]]
 name = "winapi-util"
-version = "0.1.6"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596"
+checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b"
 dependencies = [
- "winapi",
+ "windows-sys 0.52.0",
 ]
 
-[[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-
 [[package]]
 name = "windows-sys"
 version = "0.48.0"
@@ -3554,7 +3538,7 @@ version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
 dependencies = [
- "windows-targets 0.52.4",
+ "windows-targets 0.52.5",
 ]
 
 [[package]]
@@ -3574,17 +3558,18 @@ dependencies = [
 
 [[package]]
 name = "windows-targets"
-version = "0.52.4"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b"
+checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb"
 dependencies = [
- "windows_aarch64_gnullvm 0.52.4",
- "windows_aarch64_msvc 0.52.4",
- "windows_i686_gnu 0.52.4",
- "windows_i686_msvc 0.52.4",
- "windows_x86_64_gnu 0.52.4",
- "windows_x86_64_gnullvm 0.52.4",
- "windows_x86_64_msvc 0.52.4",
+ "windows_aarch64_gnullvm 0.52.5",
+ "windows_aarch64_msvc 0.52.5",
+ "windows_i686_gnu 0.52.5",
+ "windows_i686_gnullvm",
+ "windows_i686_msvc 0.52.5",
+ "windows_x86_64_gnu 0.52.5",
+ "windows_x86_64_gnullvm 0.52.5",
+ "windows_x86_64_msvc 0.52.5",
 ]
 
 [[package]]
@@ -3595,9 +3580,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
 
 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.52.4"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9"
+checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263"
 
 [[package]]
 name = "windows_aarch64_msvc"
@@ -3607,9 +3592,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
 
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.52.4"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675"
+checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6"
 
 [[package]]
 name = "windows_i686_gnu"
@@ -3619,9 +3604,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.52.4"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3"
+checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9"
 
 [[package]]
 name = "windows_i686_msvc"
@@ -3631,9 +3622,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.52.4"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02"
+checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf"
 
 [[package]]
 name = "windows_x86_64_gnu"
@@ -3643,9 +3634,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.52.4"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03"
+checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
@@ -3655,9 +3646,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.52.4"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177"
+checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596"
 
 [[package]]
 name = "windows_x86_64_msvc"
@@ -3667,15 +3658,15 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.52.4"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8"
+checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0"
 
 [[package]]
 name = "winnow"
-version = "0.6.5"
+version = "0.6.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8"
+checksum = "14b9415ee827af173ebb3f15f9083df5a122eb93572ec28741fb153356ea2578"
 dependencies = [
  "memchr",
 ]
diff --git a/contracts/benchmarks/large-storage/Cargo.toml b/contracts/benchmarks/large-storage/Cargo.toml
index 9aae12836b..5b6fa96682 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.48.0"
+version = "0.48.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.48.1"
 path = "../../../framework/scenario"
diff --git a/contracts/benchmarks/large-storage/meta/Cargo.toml b/contracts/benchmarks/large-storage/meta/Cargo.toml
index 0345a383dc..629989c496 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.48.0"
+version = "0.48.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 776e59a0ce..1fea846894 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.48.0"
+version = "0.48.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 4c5fdb3fbc..3e2b4677ac 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.48.0"
+version = "0.48.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.48.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 e2edd8010e..369f30eec7 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.48.0"
+version = "0.48.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.48.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 d09a21b81b..b20ce94c64 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.48.0"
+version = "0.48.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 8289547693..a75a75c4a5 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.48.0"
+version = "0.48.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 8090f309d1..0aea4b42cd 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.48.0"
+version = "0.48.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.48.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 3d4974e6c0..5db6649fca 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.48.0"
+version = "0.48.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 9653a54fc7..796574dd80 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.48.0"
+version = "0.48.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 024846618c..95beb1f2a7 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.48.0"
+version = "0.48.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.48.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 edba3ec0f0..c9f6ae7228 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.48.0"
+version = "0.48.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 77c061d305..47fc1790b6 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.48.0"
+version = "0.48.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 84bcc8722d..888f905fe0 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.48.0"
+version = "0.48.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.48.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 e8f3967a3a..a8b03b8e47 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.48.0"
+version = "0.48.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 31ca740ad8..81af5ada3c 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.48.0"
+version = "0.48.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 2975e1ae49..c94dd28a88 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.48.0"
+version = "0.48.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.48.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 1633ab9cde..c988d432eb 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.48.0"
+version = "0.48.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 19af5c7c51..b562ace439 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.48.0"
+version = "0.48.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 3cd913d909..08bdce3673 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.48.0"
+version = "0.48.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.48.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 200297db20..4cfcc8a955 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.48.0"
+version = "0.48.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 520aa883b1..a7079ec058 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.48.0"
+version = "0.48.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 d0bc9aa646..64db88c52c 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.48.0"
+version = "0.48.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.48.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 d8b911fd5e..2ceb7301ac 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.48.0"
+version = "0.48.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 14a876b56e..17ac4aa9b8 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.48.0"
+version = "0.48.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/str-repeat/Cargo.toml b/contracts/benchmarks/str-repeat/Cargo.toml
index 7d0b90f1ba..d38f7d8513 100644
--- a/contracts/benchmarks/str-repeat/Cargo.toml
+++ b/contracts/benchmarks/str-repeat/Cargo.toml
@@ -12,10 +12,10 @@ path = "src/str_repeat.rs"
 managed-buffer-builder-cached = ["multiversx-sc/managed-buffer-builder-cached"]
 
 [dependencies.multiversx-sc]
-version = "0.48.0"
+version = "0.48.1"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.48.1"
 path = "../../../framework/scenario"
diff --git a/contracts/benchmarks/str-repeat/meta/Cargo.toml b/contracts/benchmarks/str-repeat/meta/Cargo.toml
index d27ba4d2ff..8f451d4a6d 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.48.0"
+version = "0.48.1"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.toml b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.toml
index 07a34e0d0c..193814ec43 100644
--- a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.toml
+++ b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.toml
@@ -25,7 +25,7 @@ overflow-checks = false
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.48.0"
+version = "0.48.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.toml b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.toml
index 69a11ff01e..7f20111eda 100644
--- a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.toml
+++ b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.toml
@@ -26,7 +26,7 @@ path = ".."
 features = ["managed-buffer-builder-cached"]
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.48.0"
+version = "0.48.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/str-repeat/wasm/Cargo.toml b/contracts/benchmarks/str-repeat/wasm/Cargo.toml
index e6f3ddba95..0683f552a1 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.48.0"
+version = "0.48.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/core/price-aggregator/Cargo.toml b/contracts/core/price-aggregator/Cargo.toml
index 6ef93360eb..2e66481485 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.48.0"
+version = "0.48.1"
 authors = [
     "Claudiu-Marcel Bruda <claudiu.bruda@multiversx.com>",
     "MultiversX <contact@multiversx.com>",
@@ -19,15 +19,15 @@ edition = "2021"
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "0.48.0"
+version = "0.48.1"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.48.0"
+version = "0.48.1"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.48.1"
 path = "../../../framework/scenario"
 
 [dependencies]
diff --git a/contracts/core/price-aggregator/meta/Cargo.toml b/contracts/core/price-aggregator/meta/Cargo.toml
index f8cbef8d57..46bfa8d5b9 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.48.0"
+version = "0.48.1"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.48.0"
+version = "0.48.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 dc2c54549f..193aa041fe 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.48.0"
+version = "0.48.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/core/wegld-swap/Cargo.toml b/contracts/core/wegld-swap/Cargo.toml
index f788d5c243..3b5e2404d8 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.48.0"
+version = "0.48.1"
 
 authors = [
     "Dorin Iancu <dorin.iancu@multiversx.com>",
@@ -20,13 +20,13 @@ edition = "2021"
 path = "src/wegld.rs"
 
 [dependencies.multiversx-sc]
-version = "0.48.0"
+version = "0.48.1"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.48.0"
+version = "0.48.1"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.48.1"
 path = "../../../framework/scenario"
diff --git a/contracts/core/wegld-swap/meta/Cargo.toml b/contracts/core/wegld-swap/meta/Cargo.toml
index f9595aea8d..76b79edf66 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.48.0"
+version = "0.48.1"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.48.0"
+version = "0.48.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 68037cc393..898c67e9f5 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.48.0"
+version = "0.48.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/adder/Cargo.toml b/contracts/examples/adder/Cargo.toml
index af28bd0554..fcb4a81614 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.48.0"
+version = "0.48.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.48.1"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/adder/interact/Cargo.toml b/contracts/examples/adder/interact/Cargo.toml
index 3d4ad2fd1a..b257e2f0fb 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.48.0"
+version = "0.48.1"
 path = "../../../../framework/snippets"
diff --git a/contracts/examples/adder/meta/Cargo.toml b/contracts/examples/adder/meta/Cargo.toml
index 88f66d1c86..c5f828ca1a 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.48.0"
+version = "0.48.1"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/examples/adder/wasm/Cargo.toml b/contracts/examples/adder/wasm/Cargo.toml
index d7cff9ee02..39a90d64f8 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.48.0"
+version = "0.48.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 9379cb6240..ae60af5f8e 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.48.0"
+version = "0.48.1"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.48.0"
+version = "0.48.1"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.48.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 42aedeffb2..f5ab553289 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.48.0"
+version = "0.48.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 351e890820..694f0e06e2 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.48.0"
+version = "0.48.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/check-pause/Cargo.toml b/contracts/examples/check-pause/Cargo.toml
index 3de8796660..cda87d9f27 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.48.0"
+version = "0.48.1"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.48.0"
+version = "0.48.1"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.48.1"
 path = "../../../framework/scenario"
 
diff --git a/contracts/examples/check-pause/meta/Cargo.toml b/contracts/examples/check-pause/meta/Cargo.toml
index 6fa4de8996..839f004ce3 100644
--- a/contracts/examples/check-pause/meta/Cargo.toml
+++ b/contracts/examples/check-pause/meta/Cargo.toml
@@ -9,6 +9,6 @@ authors = ["Alin Cruceat <alin.cruceat@multiversx.com>"]
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.48.0"
+version = "0.48.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 16f0ab1ba3..23d31951b1 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.48.0"
+version = "0.48.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/crowdfunding-esdt/Cargo.toml b/contracts/examples/crowdfunding-esdt/Cargo.toml
index b2cdf8c41e..e0a91a86d6 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.48.0"
+version = "0.48.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.48.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 a32bd3567a..d2b9ff88fe 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.48.0"
+version = "0.48.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 51e3aa0862..80d4c8f4ee 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.48.0"
+version = "0.48.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/crypto-bubbles/Cargo.toml b/contracts/examples/crypto-bubbles/Cargo.toml
index 47b0cc1c12..3432fb2fb1 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.48.0"
+version = "0.48.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.48.1"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/crypto-bubbles/meta/Cargo.toml b/contracts/examples/crypto-bubbles/meta/Cargo.toml
index cff3b28c2e..a5a0becbbf 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.48.0"
+version = "0.48.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 3d0f3d9cd6..c3d76936e1 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.48.0"
+version = "0.48.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 97ff64e9ac..22ba077695 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.48.0"
+version = "0.48.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 9b63e6b416..80fc00284b 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.48.0"
+version = "0.48.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 6fdda40603..720f88798f 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.48.0"
+version = "0.48.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.48.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 2c57c9ac05..f26826105f 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.48.0"
+version = "0.48.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 1f19435dce..e3d1dfa4f3 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.48.0"
+version = "0.48.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 171ebb65f8..3b68070b25 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.48.0"
+version = "0.48.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.48.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 a9f0a17cfa..e17aa95b83 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.48.0"
+version = "0.48.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 deb7ae9c6f..503d06dc6d 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.48.0"
+version = "0.48.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 da5800286f..fc0688e842 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.48.0"
+version = "0.48.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.48.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 ccf8cb2ea2..41ecf9d5c1 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.48.0"
+version = "0.48.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 b00ca52a2b..7713372b52 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.48.0"
+version = "0.48.1"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/crypto-zombies/Cargo.toml b/contracts/examples/crypto-zombies/Cargo.toml
index b0e2a4e81e..e269e3ca5b 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.48.0"
+version = "0.48.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.48.1"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/crypto-zombies/meta/Cargo.toml b/contracts/examples/crypto-zombies/meta/Cargo.toml
index fc1eb0073f..7b017c5472 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.48.0"
+version = "0.48.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 51f46ac505..620c7c5590 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.48.0"
+version = "0.48.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/digital-cash/Cargo.toml b/contracts/examples/digital-cash/Cargo.toml
index 6d75b7b98e..74b47bb738 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.48.0"
+version = "0.48.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.48.1"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/digital-cash/meta/Cargo.toml b/contracts/examples/digital-cash/meta/Cargo.toml
index 7cdda9a523..e01aa83bcb 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.48.0"
+version = "0.48.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 14a1a7e95b..64a7cf1dca 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.48.0"
+version = "0.48.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/empty/Cargo.toml b/contracts/examples/empty/Cargo.toml
index d36449cf82..7670b2a2bf 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.48.0"
+version = "0.48.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.48.1"
 path = "../../../framework/scenario"
 
 [dev-dependencies]
diff --git a/contracts/examples/empty/meta/Cargo.toml b/contracts/examples/empty/meta/Cargo.toml
index 7b869c9cdf..d981b28a0d 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.48.0"
+version = "0.48.1"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/examples/empty/wasm/Cargo.toml b/contracts/examples/empty/wasm/Cargo.toml
index 50c6c7519c..3c188abc8b 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.48.0"
+version = "0.48.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 62efe492c6..2aacb48f36 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.48.0"
+version = "0.48.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.48.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 41be9842d9..25339aeff0 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.48.0"
+version = "0.48.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 8e57a857ec..da0a01f1f5 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.48.0"
+version = "0.48.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/factorial/Cargo.toml b/contracts/examples/factorial/Cargo.toml
index f49f2de799..52524195a5 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.48.0"
+version = "0.48.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.48.1"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/factorial/meta/Cargo.toml b/contracts/examples/factorial/meta/Cargo.toml
index 561e5cc8bb..27b6c326e7 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.48.0"
+version = "0.48.1"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/examples/factorial/wasm/Cargo.toml b/contracts/examples/factorial/wasm/Cargo.toml
index 33ef155fb4..df2ac02176 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.48.0"
+version = "0.48.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/fractional-nfts/Cargo.toml b/contracts/examples/fractional-nfts/Cargo.toml
index fda3f92c61..7e056f731a 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.48.0"
+version = "0.48.1"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.48.0"
+version = "0.48.1"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.48.1"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/fractional-nfts/meta/Cargo.toml b/contracts/examples/fractional-nfts/meta/Cargo.toml
index 330433a42f..1abc450067 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.48.0"
+version = "0.48.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 036b0bfd69..8f29fae438 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.48.0"
+version = "0.48.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/lottery-esdt/Cargo.toml b/contracts/examples/lottery-esdt/Cargo.toml
index 47ef0326fd..00bbd9121e 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.48.0"
+version = "0.48.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.48.1"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/lottery-esdt/meta/Cargo.toml b/contracts/examples/lottery-esdt/meta/Cargo.toml
index 5b87c8ade8..67e9e9636a 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.48.0"
+version = "0.48.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 6839c9dec0..3c1b5ca468 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.48.0"
+version = "0.48.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/multisig/Cargo.toml b/contracts/examples/multisig/Cargo.toml
index f7bdb30ed5..618dae4a5e 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.48.0"
+version = "0.48.1"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.48.0"
+version = "0.48.1"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.48.1"
 path = "../../../framework/scenario"
 
 [dev-dependencies.adder]
@@ -27,7 +27,7 @@ path = "../adder"
 path = "../factorial"
 
 [dev-dependencies.multiversx-wegld-swap-sc]
-version = "0.48.0"
+version = "0.48.1"
 path = "../../core/wegld-swap"
 
 [dev-dependencies]
diff --git a/contracts/examples/multisig/interact/Cargo.toml b/contracts/examples/multisig/interact/Cargo.toml
index fef68a6a22..3feae5b638 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.48.0"
+version = "0.48.1"
 path = "../../../../contracts/modules"
 
 [dependencies.multiversx-sc-snippets]
-version = "0.48.0"
+version = "0.48.1"
 path = "../../../../framework/snippets"
 
 [dependencies.multiversx-sc-scenario]
-version = "=0.48.0"
+version = "=0.48.1"
 path = "../../../../framework/scenario"
diff --git a/contracts/examples/multisig/meta/Cargo.toml b/contracts/examples/multisig/meta/Cargo.toml
index 02d4e80d81..b019bfbb43 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.48.0"
+version = "0.48.1"
 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 7660525b67..a36835c83f 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.48.0"
+version = "0.48.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 49be4aa565..02ed495935 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.48.0"
+version = "0.48.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/multisig/wasm/Cargo.toml b/contracts/examples/multisig/wasm/Cargo.toml
index 708980188e..79597e9a70 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.48.0"
+version = "0.48.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/nft-minter/Cargo.toml b/contracts/examples/nft-minter/Cargo.toml
index b845b98fc9..eeaec71e85 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.48.0"
+version = "0.48.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.48.1"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/nft-minter/meta/Cargo.toml b/contracts/examples/nft-minter/meta/Cargo.toml
index 16bc48dabd..d483bb65f4 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.48.0"
+version = "0.48.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 800d0012f8..fd32ff41c5 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.48.0"
+version = "0.48.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 b3fe4779eb..142d549a25 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.48.0"
+version = "0.48.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.48.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 8bd9be5154..7a03515dbe 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.48.0"
+version = "0.48.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 4966016fe3..34df978063 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.48.0"
+version = "0.48.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/nft-subscription/Cargo.toml b/contracts/examples/nft-subscription/Cargo.toml
index fce4b0e4be..748d63535f 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.48.0"
+version = "0.48.1"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.48.0"
+version = "0.48.1"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.48.1"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/nft-subscription/meta/Cargo.toml b/contracts/examples/nft-subscription/meta/Cargo.toml
index 60363c9f03..73b766639d 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.48.0"
+version = "0.48.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 20cfc13365..e47d13f71e 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.48.0"
+version = "0.48.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 1715338ef5..cc3db5aa7b 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.48.0"
+version = "0.48.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.48.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 3b5a3f22e1..b127392c11 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.48.0"
+version = "0.48.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 e198620a70..d4af86c8a5 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.48.0"
+version = "0.48.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 e87e2df5fd..7f2bbabdd4 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.48.0"
+version = "0.48.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.48.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 944ad90283..ceee771510 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.48.0"
+version = "0.48.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 db63ea95cf..30f74dee55 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.48.0"
+version = "0.48.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 7b835c30a9..1d0209ccf2 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.48.0"
+version = "0.48.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.48.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 35e1eb7004..146b367bd5 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.48.0"
+version = "0.48.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 212fc83957..0d14eef644 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.48.0"
+version = "0.48.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/proxy-pause/Cargo.toml b/contracts/examples/proxy-pause/Cargo.toml
index 1cb8060d0c..50f560d16f 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.48.0"
+version = "0.48.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.48.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 654659ac3a..9c9c54c2bd 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.48.0"
+version = "0.48.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 9071e6aad0..cc1649d595 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.48.0"
+version = "0.48.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/rewards-distribution/Cargo.toml b/contracts/examples/rewards-distribution/Cargo.toml
index d17e0cf877..e2cced12b5 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.48.0"
+version = "0.48.1"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.48.0"
+version = "0.48.1"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.48.1"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/rewards-distribution/meta/Cargo.toml b/contracts/examples/rewards-distribution/meta/Cargo.toml
index 6e3700a114..0225532a08 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 <claudiu.bruda@multiversx.com>"]
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.48.0"
+version = "0.48.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 0240cad321..d524872e2f 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.48.0"
+version = "0.48.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 466ef0d0d0..dd732d1613 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.48.0"
+version = "0.48.1"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.48.0"
+version = "0.48.1"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.48.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 2a9164c5d5..4ac054f405 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 <claudiu.bruda@multiversx.com>"]
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.48.0"
+version = "0.48.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 b16c0eb5be..09d0d167e3 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.48.0"
+version = "0.48.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/token-release/Cargo.toml b/contracts/examples/token-release/Cargo.toml
index 1ef042c083..53d5f29a71 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.48.0"
+version = "0.48.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.48.1"
 path = "../../../framework/scenario"
 
diff --git a/contracts/examples/token-release/meta/Cargo.toml b/contracts/examples/token-release/meta/Cargo.toml
index 9f5e40cb3f..92e78d42f9 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.48.0"
+version = "0.48.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 a5e9ad9ebb..356d0a7ce1 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.48.0"
+version = "0.48.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 388a559e3f..7c0e7e80b5 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.48.0"
+version = "0.48.1"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.48.1"
 path = "../../../framework/scenario"
 
 [dev-dependencies.multiversx-sc-meta]
-version = "0.48.0"
+version = "0.48.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 2e2ef38272..2abfdd2a48 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.48.0"
+            "version": "0.48.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 1219d4fe9b..5a22e77ae9 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.48.0"
+            "version": "0.48.1"
         }
     },
     "docs": [
diff --git a/contracts/feature-tests/abi-tester/meta/Cargo.toml b/contracts/feature-tests/abi-tester/meta/Cargo.toml
index f494dd338d..13ea670021 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.48.0"
+version = "0.48.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 05200dcfbb..974a67c2aa 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.48.0"
+version = "0.48.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 6bc368141a..ec7a639034 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.48.0"
+version = "0.48.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 ed5f30b32f..a68c272034 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.48.0"
+version = "0.48.1"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.48.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 95d1615d64..7b89a027f5 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.48.0"
+version = "0.48.1"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml
index e79f7e1f26..1dddab93aa 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml
@@ -25,7 +25,7 @@ overflow-checks = false
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.48.0"
+version = "0.48.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml
index e8ca98b331..6cc627db2c 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml
@@ -25,7 +25,7 @@ overflow-checks = false
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.48.0"
+version = "0.48.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/alloc-features/wasm/Cargo.toml b/contracts/feature-tests/alloc-features/wasm/Cargo.toml
index b5565d0ed2..14b4608740 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.48.0"
+version = "0.48.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 a9d29b944a..9eb9c5c71c 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.48.0"
+version = "0.48.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.48.1"
 path = "../../../framework/scenario"
 
 [dependencies.multiversx-sc-modules]
-version = "0.48.0"
+version = "0.48.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 73201f5eaa..4c2ec62f46 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.48.0"
+version = "0.48.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 8afa191498..064891ac10 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.48.0"
+version = "0.48.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 d138f0ea4b..9d856c470e 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.48.0"
+version = "0.48.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 21bdef1ace..af9e347794 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.48.0"
+version = "0.48.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 720bcbd08e..dcdae6d108 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.48.0"
+version = "0.48.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.48.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 e30a20c1c5..92d80d90a0 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.48.0"
+version = "0.48.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 52dbbfc0b8..0aa0ca142e 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.48.0"
+version = "0.48.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/Cargo.toml b/contracts/feature-tests/composability/Cargo.toml
index abfaefa4b8..6332301262 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.48.0"
+version = "0.48.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.48.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 be47382548..1ef0c0c225 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.48.0"
+version = "0.48.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.48.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 6bc3a0d913..c7e165f394 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.48.0"
+version = "0.48.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 07f233341c..0849b96d5b 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.48.0"
+version = "0.48.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 7a5ca344e2..567a272e2a 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.48.0"
+version = "0.48.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.48.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 46f86e301b..6183b93122 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.48.0"
+version = "0.48.1"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.48.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 08b8dc1856..01fceb451a 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.48.0"
+version = "0.48.1"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.48.0"
+version = "0.48.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 209e8f2846..49863070ff 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.48.0"
+version = "0.48.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 862cbd2b83..38407e5e4e 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.48.0"
+version = "0.48.1"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.48.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 186a1e4e03..8e3b0d819c 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.48.0"
+version = "0.48.1"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.48.0"
+version = "0.48.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 0e23835bda..dc6db87986 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.48.0"
+version = "0.48.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 fd79fe48f9..2ccd253223 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.48.0"
+version = "0.48.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.48.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 3059fd0285..b659cd0d18 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.48.0"
+version = "0.48.1"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.48.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 060df7dcde..18e6fce479 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.48.0"
+version = "0.48.1"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.48.0"
+version = "0.48.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 680b44e189..46ccb26612 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.48.0"
+version = "0.48.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 503d0fc258..a31d643f4c 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.48.0"
+version = "0.48.1"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.48.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 046302572d..23bb1ab2cb 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.48.0"
+version = "0.48.1"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.48.0"
+version = "0.48.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 a6be0ec3ff..6cc2cdff13 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.48.0"
+version = "0.48.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 7f9e36e869..f2cd325c08 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.48.0"
+version = "0.48.1"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.48.0"
+version = "0.48.1"
 path = "../../../../framework/wasm-adapter"
 optional = true
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.48.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 83a6f94e22..32d7cb6aa8 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.48.0"
+version = "0.48.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 3f8605b67d..6fdabaefda 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.48.0"
+version = "0.48.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 522720c797..be9b3a7549 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.48.0"
+version = "0.48.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 898735c43e..134cb94004 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.48.0"
+version = "0.48.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.48.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 5cf1a567e8..d700ea2a51 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.48.0"
+version = "0.48.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 44f7e3b5eb..8ab31ee41b 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.48.0"
+version = "0.48.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 7f865a4e03..b8e486edb7 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.48.0"
+version = "0.48.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 cbc950745d..5b5c0108b2 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.48.0"
+version = "0.48.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 d4cd960015..f8aa438588 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.48.0"
+version = "0.48.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.48.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 677ae9b198..d8911c3f1d 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.48.0"
+version = "0.48.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 87d3ac47c6..9bc90a4fe2 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.48.0"
+version = "0.48.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 f06c1178a1..0f15a7432a 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.48.0"
+version = "0.48.1"
 path = "../../../../contracts/modules"
 
 [dependencies.multiversx-sc-snippets]
-version = "0.48.0"
+version = "0.48.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 8ad9825389..b5dbc4bb26 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.48.0"
+version = "0.48.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.48.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 fea51513bd..0895ea8849 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.48.0"
+version = "0.48.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 73dceaa520..85cf633c9e 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.48.0"
+version = "0.48.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 9efa7a4a11..9fd6433748 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.48.0"
+version = "0.48.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 ca156aaf23..535835eea8 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.48.0"
+version = "0.48.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 324dafa5d4..06de0a0367 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.48.0"
+version = "0.48.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 fe652ba3d0..734caab8e5 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.48.0"
+version = "0.48.1"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.48.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 db20a499dd..382322c6d8 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.48.0"
+version = "0.48.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 c1eebcc5b9..b38bbd9b84 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.48.0"
+version = "0.48.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 1f84784bcc..ec491380e4 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.48.0"
+version = "0.48.1"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.48.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 1838388c4a..61e56848e6 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.48.0"
+version = "0.48.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 3dc55bf167..68b6ff26d7 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.48.0"
+version = "0.48.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 e68bc01059..2c55d5f5fb 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.48.0"
+version = "0.48.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.48.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 631c940ac7..f236bc8cb5 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.48.0"
+version = "0.48.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 d040ee6a0e..077d61f49f 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.48.0"
+version = "0.48.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 ec4dd83adb..6ac8831405 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.48.0"
+version = "0.48.1"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.48.0"
+version = "0.48.1"
 path = "../../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.48.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 1e918a72cc..58b8add8ee 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.48.0"
+version = "0.48.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 dca2b5415f..92ca0cea4d 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.48.0"
+version = "0.48.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 a4a8ecc80c..aece88286e 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.48.0"
+version = "0.48.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.48.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 e99529f668..2a7c63ee3f 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.48.0"
+version = "0.48.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 f598ee7a66..b7c65021e3 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.48.0"
+version = "0.48.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 cb8b2e5076..26b9b015cd 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.48.0"
+version = "0.48.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 7513310bff..d8d3d17aac 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.48.0"
+version = "0.48.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 ff4595fa13..5c18660536 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.48.0"
+version = "0.48.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.48.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 0dc9b2ca7f..f929c7c105 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.48.0"
+version = "0.48.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 0aea0a7c62..0b8c916c0a 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.48.0"
+version = "0.48.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 747b44ed09..0cb5ab615f 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.48.0"
+version = "0.48.1"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.48.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 50152e90f4..2555c62735 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.48.0"
+version = "0.48.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 516a43eb63..04ddab6e25 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.48.0"
+version = "0.48.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 29330a315c..84b4ed1422 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.48.0"
+version = "0.48.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.48.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 5094698b9a..a3005dc7a5 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.48.0"
+version = "0.48.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 ceb1f2e24f..01018d9bba 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.48.0"
+version = "0.48.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 ba949e755a..b2a2908748 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.48.0"
+version = "0.48.1"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.48.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 34f1067c10..41f4a03c09 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.48.0"
+version = "0.48.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 32dc473808..88bd84fd56 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.48.0"
+version = "0.48.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 b4cf18bfad..44a5aa05cc 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.48.0"
+version = "0.48.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.48.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 41e8801b40..e73119bdf0 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.48.0"
+version = "0.48.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 236319abc4..c01efbb7a4 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.48.0"
+version = "0.48.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 4501c0b464..fa723cf47a 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.48.0"
+version = "0.48.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.48.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 a9529971a8..45ea2fcbdf 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.48.0"
+version = "0.48.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 e5db8a5667..aaab30fad6 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.48.0"
+version = "0.48.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 3469c841a7..1511bf2c91 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.48.0"
+version = "0.48.1"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.48.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 02486b2086..7d2f5b3d15 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.48.0"
+version = "0.48.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 42237353f2..f999a60635 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.48.0"
+version = "0.48.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 8740d1fdcb..5b4b511ed6 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.48.0"
+version = "0.48.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.48.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 88dc69e511..93075bf8c3 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.48.0"
+version = "0.48.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 710f03a2f5..1a28c98d4c 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.48.0"
+version = "0.48.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/exchange-features/Cargo.toml b/contracts/feature-tests/exchange-features/Cargo.toml
index adf86f8ae9..6d3a48ad00 100644
--- a/contracts/feature-tests/exchange-features/Cargo.toml
+++ b/contracts/feature-tests/exchange-features/Cargo.toml
@@ -9,9 +9,9 @@ publish = false
 path = "src/exchange_features.rs"
 
 [dependencies.multiversx-sc]
-version = "0.48.0"
+version = "0.48.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.48.1"
 path = "../../../framework/scenario"
diff --git a/contracts/feature-tests/exchange-features/meta/Cargo.toml b/contracts/feature-tests/exchange-features/meta/Cargo.toml
index 589d79efaa..90e47b7c03 100644
--- a/contracts/feature-tests/exchange-features/meta/Cargo.toml
+++ b/contracts/feature-tests/exchange-features/meta/Cargo.toml
@@ -8,6 +8,6 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.48.0"
+version = "0.48.1"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/feature-tests/exchange-features/wasm/Cargo.toml b/contracts/feature-tests/exchange-features/wasm/Cargo.toml
index ab4527595f..b8925ad4a4 100644
--- a/contracts/feature-tests/exchange-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/exchange-features/wasm/Cargo.toml
@@ -25,7 +25,7 @@ overflow-checks = false
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.48.0"
+version = "0.48.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 684fa23b9d..b9953c21ee 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.48.0"
+version = "0.48.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.48.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 3657415363..5a5494af2a 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.48.0"
+version = "0.48.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 4f674abe4b..d0599cc360 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.48.0"
+version = "0.48.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 cb63f04709..13ff3f0628 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.48.0"
+version = "0.48.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.48.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 61694618e8..bf12a6a524 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.48.0"
+version = "0.48.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 17766d61c0..09e977363e 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.48.0"
+version = "0.48.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 3dbd436d23..80fccb51f3 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.48.0"
+version = "0.48.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.48.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 47d91e055b..4a96c5e067 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.48.0"
+version = "0.48.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 d79a234dd7..d6192e9eb3 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.48.0"
+version = "0.48.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 e0860d7f9f..4b733fdda8 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.48.0"
+version = "0.48.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 a54dbf64d6..21f2ef0bee 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.48.0"
+version = "0.48.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 43733a6182..12144e1645 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.48.0"
+version = "0.48.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 91e73a3ee1..656c6e2b13 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.48.0"
+version = "0.48.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.48.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 c456c8c35c..8c67b8ebba 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.48.0"
+version = "0.48.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 06895f2613..93e00552f3 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.48.0"
+version = "0.48.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 713b045b04..6862e0ac62 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.48.0"
+version = "0.48.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.48.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 93e4981ee2..850ef041c7 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.48.0"
+version = "0.48.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 790b323a3a..55210f0e10 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.48.0"
+version = "0.48.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 e90edbe6d6..9a6188feb4 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.48.0"
+version = "0.48.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.48.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 e0912a5305..6064d313a3 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.48.0"
+version = "0.48.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 7395919b55..90111ca338 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.48.0"
+version = "0.48.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 4724df6a59..13fd970d29 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.48.0"
+// version = "0.48.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 60ad1ebb93..251d1b49aa 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.48.0"
+version = "0.48.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 fcdf74843b..015d94cc4f 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.48.0"
+version = "0.48.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.48.0"
+version = "0.48.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 cf03d27bcb..746732fc11 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.48.0"
+version = "0.48.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 2431c1c2b8..267402b339 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.48.0"
+version = "0.48.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 501ea6f461..8671f3c4fc 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.48.0"
+version = "0.48.1"
 path = "../../../contracts/modules"
 
 [dependencies.multiversx-sc]
-version = "0.48.0"
+version = "0.48.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.0"
+version = "0.48.1"
 path = "../../../framework/scenario"
 
 [dev-dependencies.multiversx-sc-meta]
-version = "0.48.0"
+version = "0.48.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 c5f47f1892..94a60a1999 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.48.0"
+version = "0.48.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 6a6a8b029c..81f7c46385 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.48.0"
+version = "0.48.1"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.48.0"
+version = "0.48.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 cd34bba6d9..6d77fe6da0 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.48.0"
+            "version": "0.48.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 e91480ad37..c4d4ea960c 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.48.0"
+            "version": "0.48.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 455a51b925..1d644729aa 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.48.0"
+version = "0.48.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 2a4a269055..18f3e41dca 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.48.0"
+version = "0.48.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/modules/Cargo.toml b/contracts/modules/Cargo.toml
index 14775b4f4d..d3f742c99a 100644
--- a/contracts/modules/Cargo.toml
+++ b/contracts/modules/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-modules"
-version = "0.48.0"
+version = "0.48.1"
 edition = "2021"
 
 authors = ["MultiversX <contact@multiversx.com>"]
@@ -17,5 +17,5 @@ categories = ["no-std", "wasm", "cryptography::cryptocurrencies"]
 alloc = ["multiversx-sc/alloc"]
 
 [dependencies.multiversx-sc]
-version = "0.48.0"
+version = "0.48.1"
 path = "../../framework/base"
diff --git a/data/codec-derive/Cargo.toml b/data/codec-derive/Cargo.toml
index f0911eb9d6..25c6a716b0 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.6"
+version = "0.18.7"
 edition = "2021"
 
 authors = ["dorin.iancu <dorin.iancu@multiversx.com>", "Andrei Marinica <andrei.marinica@multiversx.com>", "MultiversX <contact@multiversx.com>"]
diff --git a/data/codec/Cargo.toml b/data/codec/Cargo.toml
index b42b2051b5..d3d8d14099 100644
--- a/data/codec/Cargo.toml
+++ b/data/codec/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-codec"
-version = "0.18.6"
+version = "0.18.7"
 edition = "2021"
 
 authors = ["Andrei Marinica <andrei.marinica@multiversx.com>", "MultiversX <contact@multiversx.com>"]
@@ -19,7 +19,7 @@ alloc = []
 
 [dependencies.multiversx-sc-codec-derive]
 path = "../codec-derive"
-version = "=0.18.6"
+version = "=0.18.7"
 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.6"
+version = "=0.18.7"
diff --git a/framework/base/Cargo.toml b/framework/base/Cargo.toml
index 646fc2fe56..577b05ee7d 100644
--- a/framework/base/Cargo.toml
+++ b/framework/base/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc"
-version = "0.48.0"
+version = "0.48.1"
 edition = "2021"
 
 authors = ["Andrei Marinica <andrei.marinica@multiversx.com>", "MultiversX <contact@multiversx.com>"]
@@ -28,10 +28,10 @@ bitflags = "=2.4.2"
 num-traits = { version = "=0.2.17", default-features = false }
 
 [dependencies.multiversx-sc-derive]
-version = "=0.48.0"
+version = "=0.48.1"
 path = "../derive"
 
 [dependencies.multiversx-sc-codec]
-version = "=0.18.6"
+version = "=0.18.7"
 path = "../../data/codec"
 features = ["derive"]
diff --git a/framework/derive/Cargo.toml b/framework/derive/Cargo.toml
index 2130f5c384..d0b128dda2 100644
--- a/framework/derive/Cargo.toml
+++ b/framework/derive/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.48.1"
 edition = "2021"
 
 authors = ["Andrei Marinica <andrei.marinica@multiversx.com>", "MultiversX <contact@multiversx.com>"]
diff --git a/framework/meta/Cargo.toml b/framework/meta/Cargo.toml
index 9080bf7e04..65f1f192a3 100644
--- a/framework/meta/Cargo.toml
+++ b/framework/meta/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-meta"
-version = "0.48.0"
+version = "0.48.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.48.0"
+version = "=0.48.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 a6dfb155a3..72a192b0aa 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.48.0"
+version = "0.48.1"
 
 # [workspace]
 
diff --git a/framework/meta/src/cmd/contract/meta_config.rs b/framework/meta/src/cmd/contract/meta_config.rs
index 760e4f6b38..cf5b91aa48 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.48.0\"
+version = \"0.48.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.48.0".to_string(),
+            framework_version: "0.48.1".to_string(),
             framework_path: Option::Some("../../../framework/base".to_string()),
             contract_features: Vec::<String>::new(),
         };
diff --git a/framework/meta/src/version_history.rs b/framework/meta/src/version_history.rs
index 45b66d2e25..5db786b025 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.48.0);
+pub const LAST_VERSION: FrameworkVersion = framework_version!(0.48.1);
 
 /// Indicates where to stop with the upgrades.
 pub const LAST_UPGRADE_VERSION: FrameworkVersion = LAST_VERSION;
@@ -67,6 +67,7 @@ pub const VERSIONS: &[FrameworkVersion] = framework_versions![
     0.47.7,
     0.47.8,
     0.48.0,
+    0.48.1,
 ];
 
 #[rustfmt::skip]
diff --git a/framework/scenario/Cargo.toml b/framework/scenario/Cargo.toml
index 0d487891c3..45359208d8 100644
--- a/framework/scenario/Cargo.toml
+++ b/framework/scenario/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-scenario"
-version = "0.48.0"
+version = "0.48.1"
 edition = "2021"
 
 authors = [
@@ -40,12 +40,12 @@ path = "src/main.rs"
 run-go-tests = []
 
 [dependencies.multiversx-sc]
-version = "=0.48.0"
+version = "=0.48.1"
 features = ["alloc", "num-bigint"]
 path = "../base"
 
 [dependencies.multiversx-sc-meta]
-version = "=0.48.0"
+version = "=0.48.1"
 path = "../meta"
 
 [dependencies.multiversx-chain-scenario-format]
diff --git a/framework/snippets/Cargo.toml b/framework/snippets/Cargo.toml
index 8fd24f67cb..65fbf71a37 100644
--- a/framework/snippets/Cargo.toml
+++ b/framework/snippets/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-snippets"
-version = "0.48.0"
+version = "0.48.1"
 edition = "2021"
 
 authors = ["MultiversX <contact@multiversx.com>"]
@@ -22,7 +22,7 @@ env_logger = "0.11"
 futures = "0.3"
 
 [dependencies.multiversx-sc-scenario]
-version = "=0.48.0"
+version = "=0.48.1"
 path = "../scenario"
 
 [dependencies.multiversx-sdk]
diff --git a/framework/wasm-adapter/Cargo.toml b/framework/wasm-adapter/Cargo.toml
index a73659240a..6a0814f0c7 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.48.0"
+version = "0.48.1"
 edition = "2021"
 
 authors = [
@@ -22,5 +22,5 @@ categories = [
 ]
 
 [dependencies.multiversx-sc]
-version = "=0.48.0"
+version = "=0.48.1"
 path = "../base"
diff --git a/tools/mxpy-snippet-generator/Cargo.toml b/tools/mxpy-snippet-generator/Cargo.toml
index ca71edf2e8..243e1e83ca 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.48.0"
+version = "0.48.1"
 path = "../../framework/base"
 
 [dependencies]
diff --git a/tools/rust-debugger/format-tests/Cargo.toml b/tools/rust-debugger/format-tests/Cargo.toml
index 0e22178945..85d2128bee 100644
--- a/tools/rust-debugger/format-tests/Cargo.toml
+++ b/tools/rust-debugger/format-tests/Cargo.toml
@@ -9,11 +9,11 @@ name = "format-tests"
 path = "src/format_tests.rs"
 
 [dependencies.multiversx-sc]
-version = "=0.48.0"
+version = "=0.48.1"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-scenario]
-version = "=0.48.0"
+version = "=0.48.1"
 path = "../../../framework/scenario"
 
 [dependencies.multiversx-chain-vm]

From 90b5db781fa6ff49bc5cf8c5d525d5909a8bbd37 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 30 Apr 2024 18:53:07 +0300
Subject: [PATCH 0804/1254] Cargo.lock update

---
 .../benchmarks/large-storage/wasm/Cargo.lock   | 10 +++++-----
 .../mappers/linked-list-repeat/wasm/Cargo.lock | 10 +++++-----
 .../mappers/map-repeat/wasm/Cargo.lock         | 10 +++++-----
 .../mappers/queue-repeat/wasm/Cargo.lock       | 10 +++++-----
 .../mappers/set-repeat/wasm/Cargo.lock         | 10 +++++-----
 .../single-value-repeat/wasm/Cargo.lock        | 10 +++++-----
 .../mappers/vec-repeat/wasm/Cargo.lock         | 10 +++++-----
 .../benchmarks/send-tx-repeat/wasm/Cargo.lock  | 10 +++++-----
 .../Cargo.lock                                 | 10 +++++-----
 .../Cargo.lock                                 | 10 +++++-----
 .../benchmarks/str-repeat/wasm/Cargo.lock      | 10 +++++-----
 .../core/price-aggregator/wasm/Cargo.lock      | 18 +++++++++---------
 contracts/examples/adder/wasm/Cargo.lock       | 10 +++++-----
 .../bonding-curve-contract/wasm/Cargo.lock     | 12 ++++++------
 contracts/examples/check-pause/wasm/Cargo.lock | 12 ++++++------
 .../examples/crowdfunding-esdt/wasm/Cargo.lock | 10 +++++-----
 .../examples/crypto-bubbles/wasm/Cargo.lock    | 10 +++++-----
 .../kitty-auction/wasm/Cargo.lock              | 10 +++++-----
 .../kitty-genetic-alg/wasm/Cargo.lock          | 10 +++++-----
 .../kitty-ownership/wasm/Cargo.lock            | 10 +++++-----
 .../examples/crypto-zombies/wasm/Cargo.lock    | 10 +++++-----
 .../examples/digital-cash/wasm/Cargo.lock      | 10 +++++-----
 contracts/examples/empty/wasm/Cargo.lock       | 10 +++++-----
 .../esdt-transfer-with-fee/wasm/Cargo.lock     | 10 +++++-----
 contracts/examples/factorial/wasm/Cargo.lock   | 10 +++++-----
 .../examples/fractional-nfts/wasm/Cargo.lock   | 12 ++++++------
 .../examples/lottery-esdt/wasm/Cargo.lock      | 10 +++++-----
 .../multisig/wasm-multisig-full/Cargo.lock     | 12 ++++++------
 .../multisig/wasm-multisig-view/Cargo.lock     | 12 ++++++------
 contracts/examples/multisig/wasm/Cargo.lock    | 12 ++++++------
 contracts/examples/nft-minter/wasm/Cargo.lock  | 10 +++++-----
 .../nft-storage-prepay/wasm/Cargo.lock         | 10 +++++-----
 .../examples/nft-subscription/wasm/Cargo.lock  | 12 ++++++------
 .../order-book/factory/wasm/Cargo.lock         | 10 +++++-----
 .../examples/order-book/pair/wasm/Cargo.lock   | 10 +++++-----
 .../examples/ping-pong-egld/wasm/Cargo.lock    | 10 +++++-----
 contracts/examples/proxy-pause/wasm/Cargo.lock | 10 +++++-----
 .../rewards-distribution/wasm/Cargo.lock       | 12 ++++++------
 .../examples/seed-nft-minter/wasm/Cargo.lock   | 12 ++++++------
 .../examples/token-release/wasm/Cargo.lock     | 10 +++++-----
 .../abi-tester/wasm-abi-tester-ev/Cargo.lock   | 10 +++++-----
 .../feature-tests/abi-tester/wasm/Cargo.lock   | 10 +++++-----
 .../wasm-alloc-mem-fail/Cargo.lock             | 10 +++++-----
 .../wasm-alloc-mem-leaking/Cargo.lock          | 10 +++++-----
 .../alloc-features/wasm/Cargo.lock             | 10 +++++-----
 .../Cargo.lock                                 | 12 ++++++------
 .../basic-features/wasm/Cargo.lock             | 12 ++++++------
 .../big-float-features/wasm/Cargo.lock         | 10 +++++-----
 .../builtin-func-features/wasm/Cargo.lock      | 10 +++++-----
 .../first-contract/wasm/Cargo.lock             | 10 +++++-----
 .../second-contract/wasm/Cargo.lock            | 10 +++++-----
 .../child/wasm/Cargo.lock                      | 10 +++++-----
 .../parent/wasm/Cargo.lock                     | 10 +++++-----
 .../wasm-forwarder-queue-promises/Cargo.lock   | 10 +++++-----
 .../forwarder-queue/wasm/Cargo.lock            | 10 +++++-----
 .../Cargo.lock                                 | 10 +++++-----
 .../Cargo.lock                                 | 10 +++++-----
 .../forwarder-raw/wasm/Cargo.lock              | 10 +++++-----
 .../composability/forwarder/wasm/Cargo.lock    | 10 +++++-----
 .../local-esdt-and-nft/wasm/Cargo.lock         | 10 +++++-----
 .../promises-features/wasm/Cargo.lock          | 10 +++++-----
 .../proxy-test-first/wasm/Cargo.lock           | 10 +++++-----
 .../proxy-test-second/wasm/Cargo.lock          | 10 +++++-----
 .../recursive-caller/wasm/Cargo.lock           | 10 +++++-----
 .../transfer-role-features/wasm/Cargo.lock     | 12 ++++++------
 .../vault/wasm-vault-promises/Cargo.lock       | 10 +++++-----
 .../vault/wasm-vault-upgrade/Cargo.lock        | 10 +++++-----
 .../composability/vault/wasm/Cargo.lock        | 10 +++++-----
 .../crowdfunding-erc20/wasm/Cargo.lock         | 10 +++++-----
 .../erc1155-marketplace/wasm/Cargo.lock        | 10 +++++-----
 .../erc1155-user-mock/wasm/Cargo.lock          | 10 +++++-----
 .../erc1155/wasm/Cargo.lock                    | 10 +++++-----
 .../erc-style-contracts/erc20/wasm/Cargo.lock  | 10 +++++-----
 .../erc-style-contracts/erc721/wasm/Cargo.lock | 10 +++++-----
 .../lottery-erc20/wasm/Cargo.lock              | 10 +++++-----
 .../esdt-system-sc-mock/wasm/Cargo.lock        | 10 +++++-----
 .../exchange-features/wasm/Cargo.lock          | 10 +++++-----
 .../formatted-message-features/wasm/Cargo.lock | 10 +++++-----
 .../managed-map-features/wasm/Cargo.lock       | 10 +++++-----
 .../wasm-multi-contract-alt-impl/Cargo.lock    | 10 +++++-----
 .../Cargo.lock                                 | 10 +++++-----
 .../Cargo.lock                                 | 10 +++++-----
 .../multi-contract-features/wasm/Cargo.lock    | 10 +++++-----
 .../panic-message-features/wasm/Cargo.lock     | 10 +++++-----
 .../payable-features/wasm/Cargo.lock           | 10 +++++-----
 .../wasm/Cargo.lock                            | 10 +++++-----
 .../wasm/Cargo.lock                            | 10 +++++-----
 .../use-module/wasm-use-module-view/Cargo.lock | 12 ++++++------
 .../feature-tests/use-module/wasm/Cargo.lock   | 12 ++++++------
 89 files changed, 463 insertions(+), 463 deletions(-)

diff --git a/contracts/benchmarks/large-storage/wasm/Cargo.lock b/contracts/benchmarks/large-storage/wasm/Cargo.lock
index cb13777edf..d99eb1d8e8 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.48.0"
+version = "0.48.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.lock
index 78ff5aef10..66f592dee9 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.48.0"
+version = "0.48.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -92,7 +92,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -103,7 +103,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.lock
index 3ee28394b7..a6551181e2 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.48.0"
+version = "0.48.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -92,7 +92,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -103,7 +103,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.lock
index 4df3ab54da..eaf6a5d673 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.48.0"
+version = "0.48.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -58,7 +58,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.lock
index 4f8e72b115..d6813d0757 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.48.0"
+version = "0.48.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -58,7 +58,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.lock
index fdfa32de28..a3d214535d 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.48.0"
+version = "0.48.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -58,7 +58,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.lock
index f51214f9f1..3bd814698b 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.48.0"
+version = "0.48.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -58,7 +58,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/send-tx-repeat/wasm/Cargo.lock b/contracts/benchmarks/send-tx-repeat/wasm/Cargo.lock
index 13533956e8..7127d940de 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.48.0"
+version = "0.48.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -51,7 +51,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -59,7 +59,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.lock b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.lock
index 4683a2b046..f16e8c090b 100644
--- a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.lock
+++ b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.lock
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -51,7 +51,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -59,7 +59,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.lock b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.lock
index f750a8d328..3f0656d631 100644
--- a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.lock
+++ b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.lock
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -51,7 +51,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -59,7 +59,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/str-repeat/wasm/Cargo.lock b/contracts/benchmarks/str-repeat/wasm/Cargo.lock
index e2b54817be..17fc991178 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.48.0"
+version = "0.48.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -51,7 +51,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -59,7 +59,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/core/price-aggregator/wasm/Cargo.lock b/contracts/core/price-aggregator/wasm/Cargo.lock
index 9e64d41b47..e11db402c0 100644
--- a/contracts/core/price-aggregator/wasm/Cargo.lock
+++ b/contracts/core/price-aggregator/wasm/Cargo.lock
@@ -74,9 +74,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.153"
+version = "0.2.154"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
+checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346"
 
 [[package]]
 name = "log"
@@ -86,7 +86,7 @@ checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
 
 [[package]]
 name = "multiversx-price-aggregator-sc"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "arrayvec",
  "getrandom",
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -116,7 +116,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -124,7 +124,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -134,7 +134,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -145,14 +145,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/adder/wasm/Cargo.lock b/contracts/examples/adder/wasm/Cargo.lock
index c7b8a8f917..08d1e86a84 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.48.0"
+version = "0.48.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/bonding-curve-contract/wasm/Cargo.lock b/contracts/examples/bonding-curve-contract/wasm/Cargo.lock
index 0fa9693639..309cf22a03 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.48.0"
+version = "0.48.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -75,7 +75,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,14 +96,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/check-pause/wasm/Cargo.lock b/contracts/examples/check-pause/wasm/Cargo.lock
index 1d886bba04..b21f0ad6d1 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.48.0"
+version = "0.48.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -75,7 +75,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,14 +96,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crowdfunding-esdt/wasm/Cargo.lock b/contracts/examples/crowdfunding-esdt/wasm/Cargo.lock
index 9a14efccc8..d6516b3acf 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.48.0"
+version = "0.48.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crypto-bubbles/wasm/Cargo.lock b/contracts/examples/crypto-bubbles/wasm/Cargo.lock
index 6af31b83b6..3a40a41c01 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.48.0"
+version = "0.48.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.lock b/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.lock
index 82fd08dc78..c2ebcc9167 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.48.0"
+version = "0.48.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -103,7 +103,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -113,7 +113,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -124,7 +124,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "multiversx-sc",
 ]
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 95368370cb..a96ee69891 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.48.0"
+version = "0.48.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.lock b/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.lock
index d497d47054..9e6e06ea1a 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.48.0"
+version = "0.48.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -104,7 +104,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -115,7 +115,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crypto-zombies/wasm/Cargo.lock b/contracts/examples/crypto-zombies/wasm/Cargo.lock
index 53c26db1eb..1bd3e9d974 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.48.0"
+version = "0.48.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/digital-cash/wasm/Cargo.lock b/contracts/examples/digital-cash/wasm/Cargo.lock
index 602c7d856b..1cd77b2d22 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.48.0"
+version = "0.48.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/empty/wasm/Cargo.lock b/contracts/examples/empty/wasm/Cargo.lock
index 5a87b422d2..4399ff23ef 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.48.0"
+version = "0.48.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.lock b/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.lock
index cee7278178..56981cfdf1 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.48.0"
+version = "0.48.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/factorial/wasm/Cargo.lock b/contracts/examples/factorial/wasm/Cargo.lock
index 4dff18babf..b32b28949b 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.48.0"
+version = "0.48.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/fractional-nfts/wasm/Cargo.lock b/contracts/examples/fractional-nfts/wasm/Cargo.lock
index f95919526e..0ed6497ed9 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.48.0"
+version = "0.48.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -75,7 +75,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,14 +96,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/lottery-esdt/wasm/Cargo.lock b/contracts/examples/lottery-esdt/wasm/Cargo.lock
index 6f1cace25d..3e13602042 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.48.0"
+version = "0.48.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/multisig/wasm-multisig-full/Cargo.lock b/contracts/examples/multisig/wasm-multisig-full/Cargo.lock
index 953a8551f3..cf567f898e 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.48.0"
+version = "0.48.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -75,7 +75,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,14 +96,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/multisig/wasm-multisig-view/Cargo.lock b/contracts/examples/multisig/wasm-multisig-view/Cargo.lock
index df77559d67..2ae00e3366 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.48.0"
+version = "0.48.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -75,7 +75,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,14 +96,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/multisig/wasm/Cargo.lock b/contracts/examples/multisig/wasm/Cargo.lock
index d72aa67e30..dc1fc12b7e 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.48.0"
+version = "0.48.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -75,7 +75,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,14 +96,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/nft-minter/wasm/Cargo.lock b/contracts/examples/nft-minter/wasm/Cargo.lock
index ce0b2650f9..1da583baee 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.48.0"
+version = "0.48.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -51,7 +51,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -59,7 +59,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/nft-storage-prepay/wasm/Cargo.lock b/contracts/examples/nft-storage-prepay/wasm/Cargo.lock
index 319176681e..a8cf928989 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.48.0"
+version = "0.48.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -51,7 +51,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -59,7 +59,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/nft-subscription/wasm/Cargo.lock b/contracts/examples/nft-subscription/wasm/Cargo.lock
index 2244415577..726b01fa88 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.48.0"
+version = "0.48.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -51,7 +51,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -59,7 +59,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,14 +80,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/order-book/factory/wasm/Cargo.lock b/contracts/examples/order-book/factory/wasm/Cargo.lock
index 60c0b2cabd..3f252320b3 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.48.0"
+version = "0.48.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -51,7 +51,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -59,7 +59,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/order-book/pair/wasm/Cargo.lock b/contracts/examples/order-book/pair/wasm/Cargo.lock
index 14b8551309..21e89dac31 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.48.0"
+version = "0.48.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -51,7 +51,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -59,7 +59,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/ping-pong-egld/wasm/Cargo.lock b/contracts/examples/ping-pong-egld/wasm/Cargo.lock
index a86f53d6dd..f7ce1b2dd3 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.48.0"
+version = "0.48.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -51,7 +51,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -59,7 +59,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/proxy-pause/wasm/Cargo.lock b/contracts/examples/proxy-pause/wasm/Cargo.lock
index 73d7607641..a1a40ea776 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.48.0"
+version = "0.48.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -51,7 +51,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -59,7 +59,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/rewards-distribution/wasm/Cargo.lock b/contracts/examples/rewards-distribution/wasm/Cargo.lock
index d5303f9494..82e8b6241e 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.48.0"
+version = "0.48.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -51,7 +51,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -59,7 +59,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,14 +80,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/seed-nft-minter/wasm/Cargo.lock b/contracts/examples/seed-nft-minter/wasm/Cargo.lock
index d322f26404..7bd62a16fd 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.48.0"
+version = "0.48.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -51,7 +51,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -59,7 +59,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,14 +80,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/token-release/wasm/Cargo.lock b/contracts/examples/token-release/wasm/Cargo.lock
index 0d4d728f3e..6d39aac883 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.48.0"
+version = "0.48.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -51,7 +51,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -59,7 +59,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "multiversx-sc",
 ]
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 a99ecaccaf..95b5bf4d2b 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.48.0"
+version = "0.48.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/abi-tester/wasm/Cargo.lock b/contracts/feature-tests/abi-tester/wasm/Cargo.lock
index db59638442..cee49ced4a 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.48.0"
+version = "0.48.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock
index 1a3bc7da70..1898fab79b 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.lock b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.lock
index b32efb0d4a..193a32459f 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.lock
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.lock
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/alloc-features/wasm/Cargo.lock b/contracts/feature-tests/alloc-features/wasm/Cargo.lock
index 6a0f3330d7..6f2be1822e 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.48.0"
+version = "0.48.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "multiversx-sc",
 ]
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 f5d8794bb9..b8582c7218 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.48.0"
+version = "0.48.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -75,7 +75,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,14 +96,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/basic-features/wasm/Cargo.lock b/contracts/feature-tests/basic-features/wasm/Cargo.lock
index bfb8c41ea7..1f5af1b98b 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.48.0"
+version = "0.48.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -75,7 +75,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,14 +96,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/big-float-features/wasm/Cargo.lock b/contracts/feature-tests/big-float-features/wasm/Cargo.lock
index 40beaf8d03..5e95524a81 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.48.0"
+version = "0.48.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "multiversx-sc",
 ]
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 bb57eeb64e..8b0361ffb9 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.48.0"
+version = "0.48.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "multiversx-sc",
 ]
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 a2c55964c7..f0e1a09e32 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.48.0"
+version = "0.48.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "multiversx-sc",
 ]
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 99cd973235..41987ecfe9 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.48.0"
+version = "0.48.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -51,7 +51,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -59,7 +59,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "multiversx-sc",
 ]
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 b7b7846eb2..532a78bc80 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.48.0"
+version = "0.48.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "multiversx-sc",
 ]
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 fd4d0794e8..31410f1b90 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.48.0"
+version = "0.48.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -58,7 +58,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "multiversx-sc",
 ]
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 9ce03493b3..f05e7a0cdd 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.48.0"
+version = "0.48.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -75,7 +75,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,7 +96,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock
index dbef7fe1c4..bd11942252 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.48.0"
+version = "0.48.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -75,7 +75,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,7 +96,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "multiversx-sc",
 ]
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 1b3b56c133..3cbb66650a 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.48.0"
+version = "0.48.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "multiversx-sc",
 ]
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 dcb63c28ef..0854d75c17 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.48.0"
+version = "0.48.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.lock
index 4b56a477a5..01e46ccd34 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.48.0"
+version = "0.48.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock
index 14ba905f98..45f9ebb16c 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.48.0"
+version = "0.48.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -75,7 +75,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,7 +96,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "multiversx-sc",
 ]
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 cf8b7eaeb8..4f188cc77a 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.48.0"
+version = "0.48.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/promises-features/wasm/Cargo.lock b/contracts/feature-tests/composability/promises-features/wasm/Cargo.lock
index 1cce0c20ac..edd5f4e52a 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.48.0"
+version = "0.48.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -51,7 +51,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -59,7 +59,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "multiversx-sc",
 ]
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 2616a0e326..eb64ca8f63 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.48.0"
+version = "0.48.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -51,7 +51,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -59,7 +59,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "multiversx-sc",
 ]
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 cb41667a6d..c0694e8a27 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.48.0"
+version = "0.48.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -51,7 +51,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -59,7 +59,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.lock b/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.lock
index d2e41ac725..2a46d970f4 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.48.0"
+version = "0.48.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -51,7 +51,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -59,7 +59,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "multiversx-sc",
 ]
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 bbbb12c9f9..24369519bc 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.48.0"
+version = "0.48.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -51,7 +51,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -59,7 +59,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,14 +80,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "multiversx-sc",
 ]
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 e86afd77c4..8df1fd19a5 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.48.0"
+version = "0.48.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -51,7 +51,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -59,7 +59,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "multiversx-sc",
 ]
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 0b7112be8c..b0b9342959 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.48.0"
+version = "0.48.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -51,7 +51,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -59,7 +59,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/vault/wasm/Cargo.lock b/contracts/feature-tests/composability/vault/wasm/Cargo.lock
index 6d0b58aed6..5d36265ec2 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.48.0"
+version = "0.48.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -51,7 +51,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -59,7 +59,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "multiversx-sc",
 ]
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 ad10f006f4..e4339b3283 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.48.0"
+version = "0.48.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -92,7 +92,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -103,7 +103,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "multiversx-sc",
 ]
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 0a96032377..96edd6a295 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.48.0"
+version = "0.48.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -92,7 +92,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -103,7 +103,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "multiversx-sc",
 ]
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 a6f053b5c8..be9d41b78d 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.48.0"
+version = "0.48.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "multiversx-sc",
 ]
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 90f97cfb61..91409bfda7 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.48.0"
+version = "0.48.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "multiversx-sc",
 ]
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 c7d25eb4e2..492ddf9510 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.48.0"
+version = "0.48.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "multiversx-sc",
 ]
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 b91f78bb52..140f4dfbbc 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.48.0"
+version = "0.48.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "multiversx-sc",
 ]
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 36b9febca3..50d1f38715 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.48.0"
+version = "0.48.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -92,7 +92,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -103,7 +103,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "multiversx-sc",
 ]
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 d52e047711..1316ca215f 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.48.0"
+version = "0.48.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/exchange-features/wasm/Cargo.lock b/contracts/feature-tests/exchange-features/wasm/Cargo.lock
index 09349d87e7..e9c8ff82c2 100644
--- a/contracts/feature-tests/exchange-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/exchange-features/wasm/Cargo.lock
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/formatted-message-features/wasm/Cargo.lock b/contracts/feature-tests/formatted-message-features/wasm/Cargo.lock
index 9dbe2ad726..279238f2e2 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.48.0"
+version = "0.48.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/managed-map-features/wasm/Cargo.lock b/contracts/feature-tests/managed-map-features/wasm/Cargo.lock
index a555da68eb..8de61c1187 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.48.0"
+version = "0.48.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "multiversx-sc",
 ]
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 3997752036..edb911a2f4 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.48.0"
+version = "0.48.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "multiversx-sc",
 ]
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 13230fc27c..92f5d93116 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.48.0"
+version = "0.48.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "multiversx-sc",
 ]
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 b1fa6d8b6b..b05ca10df5 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.48.0"
+version = "0.48.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/multi-contract-features/wasm/Cargo.lock b/contracts/feature-tests/multi-contract-features/wasm/Cargo.lock
index 2815c003c8..d3e3e66eb7 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.48.0"
+version = "0.48.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/panic-message-features/wasm/Cargo.lock b/contracts/feature-tests/panic-message-features/wasm/Cargo.lock
index ddf9332c59..ccde2cee09 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.48.0"
+version = "0.48.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -51,7 +51,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -59,7 +59,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/payable-features/wasm/Cargo.lock b/contracts/feature-tests/payable-features/wasm/Cargo.lock
index 3ffdf49ece..a20d9a05bd 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.48.0"
+version = "0.48.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -51,7 +51,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -59,7 +59,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "multiversx-sc",
 ]
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 b8d98314e7..a35b1f0228 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.48.0"
+version = "0.48.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -51,7 +51,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -59,7 +59,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "multiversx-sc",
 ]
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 f95eb564c3..287a90ba46 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.48.0"
+version = "0.48.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -51,7 +51,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -59,7 +59,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "multiversx-sc",
 ]
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 969d71832f..c0abc2c92c 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.48.0"
+version = "0.48.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -51,7 +51,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -59,7 +59,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,14 +80,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/use-module/wasm/Cargo.lock b/contracts/feature-tests/use-module/wasm/Cargo.lock
index c97622bd31..f48df08dc8 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.48.0"
+version = "0.48.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -51,7 +51,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -59,7 +59,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.6"
+version = "0.18.7"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,14 +80,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.48.0"
+version = "0.48.1"
 dependencies = [
  "multiversx-sc",
 ]

From c78ba3f9dd56517307dd385baac53a961e9bbb1f Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Tue, 30 Apr 2024 22:00:46 +0300
Subject: [PATCH 0805/1254] increase code coverage - fix attributes on
 nft_update_attributes

---
 .../composability/forwarder/src/call_async.rs    |  3 ++-
 .../forwarder/src/forwarder_proxy.rs             |  2 +-
 .../composability/forwarder/src/nft.rs           |  6 ++++--
 .../tests/forwarder_blackbox_test.rs             | 16 ++--------------
 .../src/facade/world_tx/scenario_check_state.rs  |  9 +++++----
 5 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/contracts/feature-tests/composability/forwarder/src/call_async.rs b/contracts/feature-tests/composability/forwarder/src/call_async.rs
index 2de43a6752..51a751b114 100644
--- a/contracts/feature-tests/composability/forwarder/src/call_async.rs
+++ b/contracts/feature-tests/composability/forwarder/src/call_async.rs
@@ -3,7 +3,8 @@ use crate::vault_proxy;
 multiversx_sc::imports!();
 multiversx_sc::derive_imports!();
 
-#[derive(TopEncode, TopDecode, TypeAbi)]
+#[type_abi]
+#[derive(TopEncode, TopDecode)]
 pub struct CallbackData<M: ManagedTypeApi> {
     callback_name: ManagedBuffer<M>,
     token_identifier: EgldOrEsdtTokenIdentifier<M>,
diff --git a/contracts/feature-tests/composability/forwarder/src/forwarder_proxy.rs b/contracts/feature-tests/composability/forwarder/src/forwarder_proxy.rs
index 5c859a5169..4d0f3f7bdd 100644
--- a/contracts/feature-tests/composability/forwarder/src/forwarder_proxy.rs
+++ b/contracts/feature-tests/composability/forwarder/src/forwarder_proxy.rs
@@ -1118,7 +1118,7 @@ where
     pub args: ManagedVec<Api, ManagedBuffer<Api>>,
 }
 
-#[derive(TopEncode, TopDecode)]
+#[derive(TopEncode, TopDecode, Clone, Copy, PartialEq, Debug)]
 pub struct Color {
     pub r: u8,
     pub g: u8,
diff --git a/contracts/feature-tests/composability/forwarder/src/nft.rs b/contracts/feature-tests/composability/forwarder/src/nft.rs
index 8eae1e83c5..3deb7f1493 100644
--- a/contracts/feature-tests/composability/forwarder/src/nft.rs
+++ b/contracts/feature-tests/composability/forwarder/src/nft.rs
@@ -4,14 +4,16 @@ multiversx_sc::derive_imports!();
 use super::storage;
 
 // used as mock attributes for NFTs
-#[derive(TopEncode, TopDecode, TypeAbi, Clone, Copy, PartialEq, Debug)]
+#[type_abi]
+#[derive(TopEncode, TopDecode, Clone, Copy, PartialEq, Debug)]
 pub struct Color {
     pub r: u8,
     pub g: u8,
     pub b: u8,
 }
 
-#[derive(TopEncode, TopDecode, TypeAbi, PartialEq, Eq, Clone)]
+#[type_abi]
+#[derive(TopEncode, TopDecode, PartialEq, Eq, Clone)]
 pub struct ComplexAttributes<M: ManagedTypeApi> {
     pub biguint: BigUint<M>,
     pub vec_u8: ManagedBuffer<M>,
diff --git a/contracts/feature-tests/composability/tests/forwarder_blackbox_test.rs b/contracts/feature-tests/composability/tests/forwarder_blackbox_test.rs
index 73b1b92488..7dd5c1a81b 100644
--- a/contracts/feature-tests/composability/tests/forwarder_blackbox_test.rs
+++ b/contracts/feature-tests/composability/tests/forwarder_blackbox_test.rs
@@ -45,11 +45,6 @@ fn test_nft_update_attributes_and_send() {
     let mut state = ForwarderTestState::new();
 
     let original_attributes = forwarder_proxy::Color { r: 0, g: 0, b: 0 };
-    let original_attributes_bytes: &[u8] = &[
-        original_attributes.r,
-        original_attributes.g,
-        original_attributes.b,
-    ];
 
     state
         .world
@@ -70,12 +65,7 @@ fn test_nft_update_attributes_and_send() {
     state
         .world
         .check_account(USER_ADDRESS)
-        .esdt_nft_balance_and_attributes(
-            NFT_TOKEN_ID,
-            1,
-            1,
-            managed_buffer!(original_attributes_bytes),
-        );
+        .esdt_nft_balance_and_attributes(NFT_TOKEN_ID, 1, 1, original_attributes);
 
     let new_attributes = forwarder_proxy::Color {
         r: 255,
@@ -83,8 +73,6 @@ fn test_nft_update_attributes_and_send() {
         b: 255,
     };
 
-    let new_attributes_bytes: &[u8] = &[new_attributes.r, new_attributes.g, new_attributes.b];
-
     state.world.transfer_step(
         TransferStep::new()
             .from(USER_ADDRESS.eval_to_expr().as_str())
@@ -111,5 +99,5 @@ fn test_nft_update_attributes_and_send() {
     state
         .world
         .check_account(USER_ADDRESS)
-        .esdt_nft_balance_and_attributes(NFT_TOKEN_ID, 1, 1, managed_buffer!(new_attributes_bytes));
+        .esdt_nft_balance_and_attributes(NFT_TOKEN_ID, 1, 1, new_attributes);
 }
diff --git a/framework/scenario/src/facade/world_tx/scenario_check_state.rs b/framework/scenario/src/facade/world_tx/scenario_check_state.rs
index e79756ad1d..3f5423419a 100644
--- a/framework/scenario/src/facade/world_tx/scenario_check_state.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_check_state.rs
@@ -1,8 +1,9 @@
 use std::collections::{btree_map::Entry, BTreeMap};
 
 use multiversx_chain_scenario_format::interpret_trait::{InterpretableFrom, InterpreterContext};
-use multiversx_sc::types::{
-    AnnotatedValue, BigUint, ManagedAddress, ManagedBuffer, TokenIdentifier,
+use multiversx_sc::{
+    codec::{top_encode_to_vec_u8, TopEncode},
+    types::{AnnotatedValue, BigUint, ManagedAddress, ManagedBuffer, TokenIdentifier},
 };
 
 use crate::{
@@ -181,13 +182,13 @@ impl<'w> CheckStateBuilder<'w> {
         K: AnnotatedValue<ScenarioTxEnvData, TokenIdentifier<StaticApi>>,
         N: AnnotatedValue<ScenarioTxEnvData, u64>,
         V: AnnotatedValue<ScenarioTxEnvData, BigUint<StaticApi>>,
-        T: AnnotatedValue<ScenarioTxEnvData, ManagedBuffer<StaticApi>>,
+        T: TopEncode,
     {
         let env = self.new_env_data();
         let token_id_key = token_identifier_annotated(&env, token_id);
         let nonce_value = u64_annotated(&env, &nonce);
         let balance_value = big_uint_annotated(&env, &balance);
-        let attributes_value = bytes_annotated(&env, attributes);
+        let attributes_value = top_encode_to_vec_u8(&attributes).unwrap();
 
         if let CheckEsdtMap::Unspecified = &self.current_account.esdt {
             let mut check_esdt = CheckEsdt::Full(CheckEsdtData::default());

From f50de7d20b9d31fcb2d077323b551ab15fad08ff Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Tue, 30 Apr 2024 22:28:52 +0300
Subject: [PATCH 0806/1254] increase code coverage - fix nft_update_attributes
 with no attributes

---
 .../feature-tests/scenario-tester/tests/st_blackbox_test.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/contracts/feature-tests/scenario-tester/tests/st_blackbox_test.rs b/contracts/feature-tests/scenario-tester/tests/st_blackbox_test.rs
index a8f4944aca..ce153e689c 100644
--- a/contracts/feature-tests/scenario-tester/tests/st_blackbox_test.rs
+++ b/contracts/feature-tests/scenario-tester/tests/st_blackbox_test.rs
@@ -144,7 +144,7 @@ fn set_state_test() {
         .check_account(third)
         .nonce(3)
         .balance(50)
-        .esdt_nft_balance_and_attributes(NFT_ID, 2, 1, ())
+        .esdt_nft_balance_and_attributes(NFT_ID, 2, 1, "")
         .commit();
 
     let fourth_uris = FOURTH_URIS
@@ -171,7 +171,7 @@ fn set_state_test() {
         .check_account(fourth)
         .nonce(3)
         .balance(50)
-        .esdt_nft_balance_and_attributes(NFT_ID, 2, 1, managed_buffer!(FOURTH_ATTRIBUTES))
+        .esdt_nft_balance_and_attributes(NFT_ID, 2, 1, FOURTH_ATTRIBUTES)
         .commit();
 
     world
@@ -183,7 +183,7 @@ fn set_state_test() {
         .check_account(fifth)
         .nonce(2)
         .balance(30)
-        .esdt_nft_balance_and_attributes(NFT_ID, 5, 0, ());
+        .esdt_nft_balance_and_attributes(NFT_ID, 5, 0, "");
 
     // using no commit should drop the value naturally
     world

From b781824b7dc5308d7ddcd5627c7a1a09f2658b90 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 1 May 2024 03:02:07 +0300
Subject: [PATCH 0807/1254] test fix

---
 .../scenarios/use_module_ongoing_operation_example.scen.json    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 3e43e9270a..a8a16623b2 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
@@ -52,7 +52,7 @@
                 "to": "sc:use_module",
                 "function": "countTo100",
                 "arguments": [],
-                "gasLimit": "4,500,000",
+                "gasLimit": "4,700,000",
                 "gasPrice": "0"
             },
             "expect": {

From a482b0679a615bf1c32b53d58aa5c2edeb595b1e Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 1 May 2024 03:02:24 +0300
Subject: [PATCH 0808/1254] cargo fmt

---
 framework/scenario/src/api/impl_vh/static_api.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/framework/scenario/src/api/impl_vh/static_api.rs b/framework/scenario/src/api/impl_vh/static_api.rs
index ca1d8602e5..7e375a0c31 100644
--- a/framework/scenario/src/api/impl_vh/static_api.rs
+++ b/framework/scenario/src/api/impl_vh/static_api.rs
@@ -1,9 +1,9 @@
-use std::sync::Mutex;
 use multiversx_chain_vm::{
     executor::VMHooks,
     vm_hooks::{StaticApiVMHooksHandler, VMHooksDispatcher, VMHooksHandler},
 };
 use multiversx_sc::{api::RawHandle, types::Address};
+use std::sync::Mutex;
 
 use crate::debug_executor::StaticVarData;
 

From 724dd689baafb311b00232d4a06f18f4cf5b7a9e Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 3 May 2024 17:03:52 +0300
Subject: [PATCH 0809/1254] TypeAbiFrom trait

---
 framework/base/src/abi.rs                     |  2 +
 framework/base/src/abi/type_abi.rs            |  9 ++++-
 framework/base/src/abi/type_abi_from.rs       |  4 ++
 framework/base/src/abi/type_abi_impl_basic.rs | 37 +++++++++++++++++++
 .../base/src/abi/type_abi_impl_codec_multi.rs | 19 +++++++++-
 .../base/src/storage/mappers/bi_di_mapper.rs  | 18 +++++++++
 .../src/storage/mappers/linked_list_mapper.rs | 17 ++++++++-
 .../base/src/storage/mappers/map_mapper.rs    | 19 +++++++++-
 .../base/src/storage/mappers/queue_mapper.rs  | 16 +++++++-
 .../base/src/storage/mappers/set_mapper.rs    | 16 +++++++-
 .../storage/mappers/single_value_mapper.rs    | 24 +++++++++++-
 .../mappers/token/fungible_token_mapper.rs    |  9 ++++-
 .../token/non_fungible_token_mapper.rs        |  8 ++++
 .../src/storage/mappers/unique_id_mapper.rs   |  8 ++++
 .../storage/mappers/unordered_set_mapper.rs   | 16 +++++++-
 .../base/src/storage/mappers/user_mapper.rs   | 16 ++++++--
 .../base/src/storage/mappers/vec_mapper.rs    | 16 +++++++-
 .../src/types/crypto/message_hash_type.rs     | 10 +++--
 .../base/src/types/flags/code_metadata.rs     |  4 +-
 .../base/src/types/heap/async_call_result.rs  |  4 +-
 framework/base/src/types/heap/boxed_bytes.rs  |  4 +-
 framework/base/src/types/heap/h256.rs         |  4 +-
 framework/base/src/types/heap/h256_address.rs |  4 +-
 framework/base/src/types/heap/queue.rs        |  4 +-
 .../types/interaction/managed_arg_buffer.rs   |  4 +-
 .../interaction/tx_data/function_call.rs      |  4 +-
 .../types/io/operation_completion_status.rs   |  8 +++-
 framework/base/src/types/io/sc_result.rs      |  7 +++-
 .../base/src/types/managed/basic/big_float.rs |  5 ++-
 .../base/src/types/managed/basic/big_int.rs   |  4 +-
 .../src/types/managed/basic/big_int_sign.rs   |  6 ++-
 .../base/src/types/managed/basic/big_uint.rs  |  4 +-
 .../src/types/managed/basic/elliptic_curve.rs |  4 +-
 .../src/types/managed/basic/managed_buffer.rs |  4 +-
 .../multi_value/async_call_result_managed.rs  |  9 ++++-
 .../esdt_token_payment_multi_value.rs         | 11 ++++--
 .../multi_value/multi_value_encoded.rs        |  9 ++++-
 .../multi_value/multi_value_managed_vec.rs    |  9 ++++-
 .../multi_value_managed_vec_counted.rs        |  9 ++++-
 .../wrapped/egld_or_esdt_token_identifier.rs  |  4 +-
 .../types/managed/wrapped/managed_address.rs  |  4 +-
 .../managed/wrapped/managed_byte_array.rs     |  6 ++-
 .../types/managed/wrapped/managed_option.rs   | 32 ++++++++++++++--
 .../src/types/managed/wrapped/managed_vec.rs  | 25 ++++++++++++-
 .../types/managed/wrapped/token_identifier.rs |  4 +-
 .../src/types/static_buffer/sparse_array.rs   |  4 +-
 framework/derive/src/type_abi_derive.rs       |  2 +
 47 files changed, 416 insertions(+), 50 deletions(-)
 create mode 100644 framework/base/src/abi/type_abi_from.rs

diff --git a/framework/base/src/abi.rs b/framework/base/src/abi.rs
index 2fc4e5af0d..c0002739d7 100644
--- a/framework/base/src/abi.rs
+++ b/framework/base/src/abi.rs
@@ -4,6 +4,7 @@ mod endpoint_abi;
 mod esdt_attribute_abi;
 mod event_abi;
 mod type_abi;
+mod type_abi_from;
 mod type_abi_impl_basic;
 mod type_abi_impl_codec_multi;
 mod type_description;
@@ -15,6 +16,7 @@ pub use endpoint_abi::*;
 pub use esdt_attribute_abi::EsdtAttributeAbi;
 pub use event_abi::*;
 pub use type_abi::*;
+pub use type_abi_from::*;
 pub use type_description::*;
 pub use type_description_container::*;
 
diff --git a/framework/base/src/abi/type_abi.rs b/framework/base/src/abi/type_abi.rs
index 94213e7705..18163eb7e7 100644
--- a/framework/base/src/abi/type_abi.rs
+++ b/framework/base/src/abi/type_abi.rs
@@ -1,7 +1,14 @@
 use super::*;
 use alloc::{format, string::ToString, vec::Vec};
 
-pub trait TypeAbi {
+/// Implemented for all types that can end up in the ABI:
+/// - argument types,
+/// - result types,
+/// - event log arguments
+/// - etc.
+///
+/// Will be automatically implemented for struct ad enum types via the `#[type_abi]` annotation.
+pub trait TypeAbi: TypeAbiFrom<Self> {
     fn type_names() -> TypeNames {
         TypeNames {
             abi: Self::type_name(),
diff --git a/framework/base/src/abi/type_abi_from.rs b/framework/base/src/abi/type_abi_from.rs
new file mode 100644
index 0000000000..81f5345fd5
--- /dev/null
+++ b/framework/base/src/abi/type_abi_from.rs
@@ -0,0 +1,4 @@
+/// Indicates that 2 types have the same encoding, so they can be used interchangeably in proxies.
+///
+/// Only relevant for serializable types.
+pub trait TypeAbiFrom<T: ?Sized> {}
diff --git a/framework/base/src/abi/type_abi_impl_basic.rs b/framework/base/src/abi/type_abi_impl_basic.rs
index 0487e19392..1d0378259e 100644
--- a/framework/base/src/abi/type_abi_impl_basic.rs
+++ b/framework/base/src/abi/type_abi_impl_basic.rs
@@ -7,6 +7,8 @@ use alloc::{
     vec::Vec,
 };
 
+impl TypeAbiFrom<()> for () {}
+
 impl TypeAbi for () {
     /// No another exception from the 1-type-1-output-abi rule:
     /// the unit type produces no output.
@@ -15,6 +17,8 @@ impl TypeAbi for () {
     }
 }
 
+impl<T, U> TypeAbiFrom<&U> for &T where T: TypeAbiFrom<U> {}
+
 impl<T: TypeAbi> TypeAbi for &T {
     fn type_name() -> TypeName {
         T::type_name()
@@ -29,6 +33,8 @@ impl<T: TypeAbi> TypeAbi for &T {
     }
 }
 
+impl<T, U> TypeAbiFrom<Box<T>> for U where T: TypeAbiFrom<U> {}
+
 impl<T: TypeAbi> TypeAbi for Box<T> {
     fn type_name() -> TypeName {
         T::type_name()
@@ -43,6 +49,8 @@ impl<T: TypeAbi> TypeAbi for Box<T> {
     }
 }
 
+impl<T, U> TypeAbiFrom<&[T]> for &[U] where T: TypeAbiFrom<U> {}
+
 impl<T: TypeAbi> TypeAbi for &[T] {
     fn type_name() -> TypeName {
         let t_name = T::type_name();
@@ -65,6 +73,8 @@ impl<T: TypeAbi> TypeAbi for &[T] {
     }
 }
 
+impl<T, U> TypeAbiFrom<Vec<T>> for Vec<U> where T: TypeAbiFrom<U> {}
+
 impl<T: TypeAbi> TypeAbi for Vec<T> {
     fn type_name() -> TypeName {
         <&[T]>::type_name()
@@ -79,6 +89,8 @@ impl<T: TypeAbi> TypeAbi for Vec<T> {
     }
 }
 
+impl<T: TypeAbi, const CAP: usize> TypeAbiFrom<ArrayVec<T, CAP>> for ArrayVec<T, CAP> {}
+
 impl<T: TypeAbi, const CAP: usize> TypeAbi for ArrayVec<T, CAP> {
     fn type_name() -> TypeName {
         <&[T]>::type_name()
@@ -93,6 +105,8 @@ impl<T: TypeAbi, const CAP: usize> TypeAbi for ArrayVec<T, CAP> {
     }
 }
 
+impl<T> TypeAbiFrom<Box<[T]>> for Box<[T]> {}
+
 impl<T: TypeAbi> TypeAbi for Box<[T]> {
     fn type_name() -> TypeName {
         <&[T]>::type_name()
@@ -107,12 +121,18 @@ impl<T: TypeAbi> TypeAbi for Box<[T]> {
     }
 }
 
+impl TypeAbiFrom<String> for String {}
+impl TypeAbiFrom<&str> for String {}
+impl TypeAbiFrom<Box<str>> for String {}
+
 impl TypeAbi for String {
     fn type_name() -> TypeName {
         "utf-8 string".into()
     }
 }
 
+impl TypeAbiFrom<&'static str> for &'static str {}
+
 impl TypeAbi for &'static str {
     fn type_name() -> TypeName {
         String::type_name()
@@ -123,6 +143,10 @@ impl TypeAbi for &'static str {
     }
 }
 
+impl TypeAbiFrom<Box<str>> for Box<str> {}
+impl TypeAbiFrom<&str> for Box<str> {}
+impl TypeAbiFrom<String> for Box<str> {}
+
 impl TypeAbi for Box<str> {
     fn type_name() -> TypeName {
         String::type_name()
@@ -135,6 +159,8 @@ impl TypeAbi for Box<str> {
 
 macro_rules! type_abi_name_only {
     ($ty:ty, $name:expr) => {
+        impl TypeAbiFrom<$ty> for $ty {}
+
         impl TypeAbi for $ty {
             fn type_name() -> TypeName {
                 TypeName::from($name)
@@ -160,6 +186,8 @@ type_abi_name_only!(i64, "i64");
 type_abi_name_only!(core::num::NonZeroUsize, "NonZeroUsize");
 type_abi_name_only!(bool, "bool");
 
+impl<T, U> TypeAbiFrom<Option<T>> for Option<U> where T: TypeAbiFrom<U> {}
+
 impl<T: TypeAbi> TypeAbi for Option<T> {
     fn type_name() -> TypeName {
         format!("Option<{}>", T::type_name())
@@ -174,6 +202,8 @@ impl<T: TypeAbi> TypeAbi for Option<T> {
     }
 }
 
+impl<T, U, E> TypeAbiFrom<Result<T, E>> for Result<U, E> where T: TypeAbiFrom<U> {}
+
 impl<T: TypeAbi, E> TypeAbi for Result<T, E> {
     fn type_name() -> TypeName {
         T::type_name()
@@ -200,6 +230,11 @@ impl<T: TypeAbi, E> TypeAbi for Result<T, E> {
 macro_rules! tuple_impls {
     ($($len:expr => ($($n:tt $name:ident)+))+) => {
         $(
+            impl<$($name),+> TypeAbiFrom<Self> for ($($name,)+)
+            where
+                $($name: TypeAbi,)+
+            {}
+
             impl<$($name),+> TypeAbi for ($($name,)+)
             where
                 $($name: TypeAbi,)+
@@ -257,6 +292,8 @@ tuple_impls! {
     16 => (0 T0 1 T1 2 T2 3 T3 4 T4 5 T5 6 T6 7 T7 8 T8 9 T9 10 T10 11 T11 12 T12 13 T13 14 T14 15 T15)
 }
 
+impl<T, U, const N: usize> TypeAbiFrom<[T; N]> for [U; N] where T: TypeAbiFrom<U> {}
+
 impl<T: TypeAbi, const N: usize> TypeAbi for [T; N] {
     fn type_name() -> TypeName {
         let mut repr = TypeName::from("array");
diff --git a/framework/base/src/abi/type_abi_impl_codec_multi.rs b/framework/base/src/abi/type_abi_impl_codec_multi.rs
index 9d3cce98db..e347388625 100644
--- a/framework/base/src/abi/type_abi_impl_codec_multi.rs
+++ b/framework/base/src/abi/type_abi_impl_codec_multi.rs
@@ -1,10 +1,18 @@
 use alloc::format;
 
 use crate::{
-    abi::{OutputAbis, TypeAbi, TypeDescriptionContainer, TypeName},
+    abi::{OutputAbis, TypeAbi, TypeAbiFrom, TypeDescriptionContainer, TypeName},
     codec::multi_types::{IgnoreValue, OptionalValue},
 };
 
+#[cfg(feature = "alloc")]
+impl<T, U> TypeAbiFrom<crate::codec::multi_types::MultiValueVec<U>>
+    for crate::codec::multi_types::MultiValueVec<T>
+where
+    T: TypeAbiFrom<U>,
+{
+}
+
 #[cfg(feature = "alloc")]
 impl<T: TypeAbi> TypeAbi for crate::codec::multi_types::MultiValueVec<T> {
     fn type_name() -> TypeName {
@@ -24,6 +32,8 @@ impl<T: TypeAbi> TypeAbi for crate::codec::multi_types::MultiValueVec<T> {
     }
 }
 
+impl TypeAbiFrom<IgnoreValue> for IgnoreValue {}
+
 impl TypeAbi for IgnoreValue {
     fn type_name() -> TypeName {
         TypeName::from("ignore")
@@ -38,6 +48,8 @@ impl TypeAbi for IgnoreValue {
     }
 }
 
+impl<T, U> TypeAbiFrom<OptionalValue<T>> for OptionalValue<U> where T: TypeAbiFrom<U> {}
+
 impl<T: TypeAbi> TypeAbi for OptionalValue<T> {
     fn type_name() -> TypeName {
         super::type_name_optional::<T>()
@@ -59,6 +71,11 @@ impl<T: TypeAbi> TypeAbi for OptionalValue<T> {
 macro_rules! multi_arg_impls {
     ($(($mval_struct:ident $($n:tt $name:ident)+) )+) => {
         $(
+            impl<$($name),+ > TypeAbiFrom<Self> for crate::codec::multi_types::$mval_struct<$($name,)+>
+            where
+                $($name: TypeAbi,)+
+            {}
+
             impl<$($name),+ > TypeAbi for crate::codec::multi_types::$mval_struct<$($name,)+>
             where
                 $($name: TypeAbi,)+
diff --git a/framework/base/src/storage/mappers/bi_di_mapper.rs b/framework/base/src/storage/mappers/bi_di_mapper.rs
index 4878e3c3fc..1ac77da0ae 100644
--- a/framework/base/src/storage/mappers/bi_di_mapper.rs
+++ b/framework/base/src/storage/mappers/bi_di_mapper.rs
@@ -1,6 +1,7 @@
 use core::marker::PhantomData;
 
 use crate::{
+    abi::TypeAbiFrom,
     codec::{
         multi_encode_iter_or_handle_err, multi_types::MultiValue2, CodecFrom, EncodeErrorHandler,
         NestedDecode, NestedEncode, TopDecode, TopEncode, TopEncodeMulti, TopEncodeMultiOutput,
@@ -307,6 +308,23 @@ where
 {
 }
 
+impl<SA, K, V> TypeAbiFrom<BiDiMapper<SA, K, V, CurrentStorage>>
+    for MultiValueEncoded<SA, MultiValue2<K, V>>
+where
+    SA: StorageMapperApi,
+    K: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static + Default + PartialEq,
+    V: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static + Default + PartialEq,
+{
+}
+
+impl<SA, K, V> TypeAbiFrom<Self> for BiDiMapper<SA, K, V, CurrentStorage>
+where
+    SA: StorageMapperApi,
+    K: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static + Default + PartialEq,
+    V: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static + Default + PartialEq,
+{
+}
+
 impl<SA, K, V> TypeAbi for BiDiMapper<SA, K, V, CurrentStorage>
 where
     SA: StorageMapperApi,
diff --git a/framework/base/src/storage/mappers/linked_list_mapper.rs b/framework/base/src/storage/mappers/linked_list_mapper.rs
index 7382ae8229..826de864e6 100644
--- a/framework/base/src/storage/mappers/linked_list_mapper.rs
+++ b/framework/base/src/storage/mappers/linked_list_mapper.rs
@@ -5,7 +5,7 @@ use super::{
     StorageClearable, StorageMapper,
 };
 use crate::{
-    abi::{TypeAbi, TypeDescriptionContainer, TypeName},
+    abi::{TypeAbi, TypeAbiFrom, TypeDescriptionContainer, TypeName},
     api::StorageMapperApi,
     codec::{
         self,
@@ -620,6 +620,21 @@ where
 {
 }
 
+impl<SA, T, U> TypeAbiFrom<LinkedListMapper<SA, T>> for MultiValueEncoded<SA, U>
+where
+    SA: StorageMapperApi,
+    T: TopEncode + TopDecode + NestedEncode + NestedDecode + Clone,
+    U: TypeAbiFrom<T>,
+{
+}
+
+impl<SA, T> TypeAbiFrom<Self> for LinkedListMapper<SA, T>
+where
+    SA: StorageMapperApi,
+    T: TopEncode + TopDecode + NestedEncode + NestedDecode + Clone,
+{
+}
+
 impl<SA, T> TypeAbi for LinkedListMapper<SA, T>
 where
     SA: StorageMapperApi,
diff --git a/framework/base/src/storage/mappers/map_mapper.rs b/framework/base/src/storage/mappers/map_mapper.rs
index e8aac7adc1..ab3d0664dc 100644
--- a/framework/base/src/storage/mappers/map_mapper.rs
+++ b/framework/base/src/storage/mappers/map_mapper.rs
@@ -5,7 +5,7 @@ use super::{
     SetMapper, StorageClearable, StorageMapper,
 };
 use crate::{
-    abi::{TypeAbi, TypeDescriptionContainer, TypeName},
+    abi::{TypeAbi, TypeAbiFrom, TypeDescriptionContainer, TypeName},
     api::StorageMapperApi,
     codec::{
         multi_encode_iter_or_handle_err, multi_types::MultiValue2, CodecFrom, EncodeErrorHandler,
@@ -548,6 +548,23 @@ where
 {
 }
 
+impl<SA, K, V> TypeAbiFrom<MapMapper<SA, K, V, CurrentStorage>>
+    for MultiValueEncoded<SA, MultiValue2<K, V>>
+where
+    SA: StorageMapperApi,
+    K: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static,
+    V: TopEncode + TopDecode + 'static,
+{
+}
+
+impl<SA, K, V> TypeAbiFrom<Self> for MapMapper<SA, K, V, CurrentStorage>
+where
+    SA: StorageMapperApi,
+    K: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static,
+    V: TopEncode + TopDecode + 'static,
+{
+}
+
 /// Behaves like a MultiResultVec<MultiValue<K, V>> when an endpoint result.
 impl<SA, K, V> TypeAbi for MapMapper<SA, K, V, CurrentStorage>
 where
diff --git a/framework/base/src/storage/mappers/queue_mapper.rs b/framework/base/src/storage/mappers/queue_mapper.rs
index 93d90de1a3..80269c9366 100644
--- a/framework/base/src/storage/mappers/queue_mapper.rs
+++ b/framework/base/src/storage/mappers/queue_mapper.rs
@@ -5,7 +5,7 @@ use super::{
     StorageClearable, StorageMapper,
 };
 use crate::{
-    abi::{TypeAbi, TypeDescriptionContainer, TypeName},
+    abi::{TypeAbi, TypeAbiFrom, TypeDescriptionContainer, TypeName},
     api::StorageMapperApi,
     codec::{
         self,
@@ -525,6 +525,20 @@ where
 {
 }
 
+impl<SA, T> TypeAbiFrom<QueueMapper<SA, T, CurrentStorage>> for MultiValueEncoded<SA, T>
+where
+    SA: StorageMapperApi,
+    T: TopEncode + TopDecode,
+{
+}
+
+impl<SA, T> TypeAbiFrom<Self> for QueueMapper<SA, T, CurrentStorage>
+where
+    SA: StorageMapperApi,
+    T: TopEncode + TopDecode,
+{
+}
+
 /// Behaves like a MultiResultVec when an endpoint result.
 impl<SA, T> TypeAbi for QueueMapper<SA, T, CurrentStorage>
 where
diff --git a/framework/base/src/storage/mappers/set_mapper.rs b/framework/base/src/storage/mappers/set_mapper.rs
index 79492b9a43..12c83dbd98 100644
--- a/framework/base/src/storage/mappers/set_mapper.rs
+++ b/framework/base/src/storage/mappers/set_mapper.rs
@@ -5,7 +5,7 @@ use storage_get_from_address::storage_get_len_from_address;
 pub use super::queue_mapper::Iter;
 use super::{QueueMapper, StorageClearable, StorageMapper};
 use crate::{
-    abi::{TypeAbi, TypeDescriptionContainer, TypeName},
+    abi::{TypeAbi, TypeAbiFrom, TypeDescriptionContainer, TypeName},
     api::StorageMapperApi,
     codec::{
         self, multi_encode_iter_or_handle_err, CodecFrom, EncodeErrorHandler, NestedDecode,
@@ -301,6 +301,20 @@ where
 {
 }
 
+impl<SA, T> TypeAbiFrom<SetMapper<SA, T, CurrentStorage>> for MultiValueEncoded<SA, T>
+where
+    SA: StorageMapperApi,
+    T: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static,
+{
+}
+
+impl<SA, T> TypeAbiFrom<Self> for SetMapper<SA, T, CurrentStorage>
+where
+    SA: StorageMapperApi,
+    T: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static,
+{
+}
+
 /// Behaves like a MultiResultVec when an endpoint result.
 impl<SA, T> TypeAbi for SetMapper<SA, T, CurrentStorage>
 where
diff --git a/framework/base/src/storage/mappers/single_value_mapper.rs b/framework/base/src/storage/mappers/single_value_mapper.rs
index 5eade9503a..528a988ddf 100644
--- a/framework/base/src/storage/mappers/single_value_mapper.rs
+++ b/framework/base/src/storage/mappers/single_value_mapper.rs
@@ -5,7 +5,7 @@ use super::{
     StorageMapper,
 };
 use crate::{
-    abi::{TypeAbi, TypeDescriptionContainer, TypeName},
+    abi::{TypeAbi, TypeAbiFrom, TypeDescriptionContainer, TypeName},
     api::StorageMapperApi,
     codec::{
         multi_types::PlaceholderOutput, CodecFrom, CodecFromSelf, DecodeErrorHandler,
@@ -210,6 +210,14 @@ where
 {
 }
 
+impl<SA, T, R> TypeAbiFrom<SingleValueMapper<SA, T, CurrentStorage>> for SingleValue<R>
+where
+    SA: StorageMapperApi,
+    T: TopEncode + TopDecode,
+    R: TopDecode + CodecFrom<T>,
+{
+}
+
 impl<SA, T> CodecFrom<SingleValueMapper<SA, T>> for PlaceholderOutput
 where
     SA: StorageMapperApi,
@@ -217,6 +225,20 @@ where
 {
 }
 
+impl<SA, T> TypeAbiFrom<SingleValueMapper<SA, T>> for PlaceholderOutput
+where
+    SA: StorageMapperApi,
+    T: TopEncode + TopDecode,
+{
+}
+
+impl<SA, T> TypeAbiFrom<Self> for SingleValueMapper<SA, T, CurrentStorage>
+where
+    SA: StorageMapperApi,
+    T: TopEncode + TopDecode + TypeAbi,
+{
+}
+
 impl<SA, T> TypeAbi for SingleValueMapper<SA, T, CurrentStorage>
 where
     SA: StorageMapperApi,
diff --git a/framework/base/src/storage/mappers/token/fungible_token_mapper.rs b/framework/base/src/storage/mappers/token/fungible_token_mapper.rs
index efc322c2eb..309902d02f 100644
--- a/framework/base/src/storage/mappers/token/fungible_token_mapper.rs
+++ b/framework/base/src/storage/mappers/token/fungible_token_mapper.rs
@@ -1,5 +1,5 @@
 use crate::{
-    abi::TypeAbi,
+    abi::{TypeAbi, TypeAbiFrom},
     api::ErrorApiImpl,
     codec::{CodecFrom, EncodeErrorHandler, TopEncodeMulti, TopEncodeMultiOutput},
     storage_clear, storage_get, storage_set,
@@ -275,6 +275,13 @@ impl<SA> CodecFrom<FungibleTokenMapper<SA>> for TokenIdentifier<SA> where
 {
 }
 
+impl<SA> TypeAbiFrom<FungibleTokenMapper<SA>> for TokenIdentifier<SA> where
+    SA: StorageMapperApi + CallTypeApi
+{
+}
+
+impl<SA> TypeAbiFrom<Self> for FungibleTokenMapper<SA> where SA: StorageMapperApi + CallTypeApi {}
+
 impl<SA> TypeAbi for FungibleTokenMapper<SA>
 where
     SA: StorageMapperApi + CallTypeApi,
diff --git a/framework/base/src/storage/mappers/token/non_fungible_token_mapper.rs b/framework/base/src/storage/mappers/token/non_fungible_token_mapper.rs
index 3e886f21de..3f3c466fea 100644
--- a/framework/base/src/storage/mappers/token/non_fungible_token_mapper.rs
+++ b/framework/base/src/storage/mappers/token/non_fungible_token_mapper.rs
@@ -1,4 +1,5 @@
 use crate::{
+    abi::TypeAbiFrom,
     codec::{
         CodecFrom, EncodeErrorHandler, TopDecode, TopEncode, TopEncodeMulti, TopEncodeMultiOutput,
     },
@@ -415,6 +416,13 @@ impl<SA> CodecFrom<NonFungibleTokenMapper<SA>> for TokenIdentifier<SA> where
 {
 }
 
+impl<SA> TypeAbiFrom<NonFungibleTokenMapper<SA>> for TokenIdentifier<SA> where
+    SA: StorageMapperApi + CallTypeApi
+{
+}
+
+impl<SA> TypeAbiFrom<Self> for NonFungibleTokenMapper<SA> where SA: StorageMapperApi + CallTypeApi {}
+
 impl<SA> TypeAbi for NonFungibleTokenMapper<SA>
 where
     SA: StorageMapperApi + CallTypeApi,
diff --git a/framework/base/src/storage/mappers/unique_id_mapper.rs b/framework/base/src/storage/mappers/unique_id_mapper.rs
index 550729952f..051bfafd1b 100644
--- a/framework/base/src/storage/mappers/unique_id_mapper.rs
+++ b/framework/base/src/storage/mappers/unique_id_mapper.rs
@@ -1,4 +1,5 @@
 use crate::{
+    abi::TypeAbiFrom,
     codec::{
         multi_encode_iter_or_handle_err, CodecFrom, EncodeErrorHandler, TopEncodeMulti,
         TopEncodeMultiOutput,
@@ -218,6 +219,13 @@ impl<SA> CodecFrom<UniqueIdMapper<SA, CurrentStorage>> for MultiValueEncoded<SA,
 {
 }
 
+impl<SA> TypeAbiFrom<UniqueIdMapper<SA, CurrentStorage>> for MultiValueEncoded<SA, usize> where
+    SA: StorageMapperApi
+{
+}
+
+impl<SA> TypeAbiFrom<Self> for UniqueIdMapper<SA, CurrentStorage> where SA: StorageMapperApi {}
+
 /// Behaves like a MultiResultVec when an endpoint result.
 impl<SA> TypeAbi for UniqueIdMapper<SA, CurrentStorage>
 where
diff --git a/framework/base/src/storage/mappers/unordered_set_mapper.rs b/framework/base/src/storage/mappers/unordered_set_mapper.rs
index ef2a708fad..4817b6776e 100644
--- a/framework/base/src/storage/mappers/unordered_set_mapper.rs
+++ b/framework/base/src/storage/mappers/unordered_set_mapper.rs
@@ -6,7 +6,7 @@ use super::{
     StorageClearable, StorageMapper, VecMapper,
 };
 use crate::{
-    abi::{TypeAbi, TypeDescriptionContainer, TypeName},
+    abi::{TypeAbi, TypeAbiFrom, TypeDescriptionContainer, TypeName},
     api::StorageMapperApi,
     codec::{
         multi_encode_iter_or_handle_err, CodecFrom, EncodeErrorHandler, NestedDecode, NestedEncode,
@@ -232,6 +232,20 @@ where
 {
 }
 
+impl<SA, T> TypeAbiFrom<UnorderedSetMapper<SA, T>> for MultiValueEncoded<SA, T>
+where
+    SA: StorageMapperApi,
+    T: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static,
+{
+}
+
+impl<SA, T> TypeAbiFrom<Self> for UnorderedSetMapper<SA, T>
+where
+    SA: StorageMapperApi,
+    T: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static,
+{
+}
+
 /// Behaves like a MultiResultVec when an endpoint result.
 impl<SA, T> TypeAbi for UnorderedSetMapper<SA, T>
 where
diff --git a/framework/base/src/storage/mappers/user_mapper.rs b/framework/base/src/storage/mappers/user_mapper.rs
index 4fc7a50f74..a2dad255c3 100644
--- a/framework/base/src/storage/mappers/user_mapper.rs
+++ b/framework/base/src/storage/mappers/user_mapper.rs
@@ -1,8 +1,11 @@
 use core::marker::PhantomData;
 
-use crate::codec::{
-    multi_encode_iter_or_handle_err, CodecFrom, EncodeErrorHandler, TopEncodeMulti,
-    TopEncodeMultiOutput,
+use crate::{
+    abi::TypeAbiFrom,
+    codec::{
+        multi_encode_iter_or_handle_err, CodecFrom, EncodeErrorHandler, TopEncodeMulti,
+        TopEncodeMultiOutput,
+    },
 };
 
 use super::{
@@ -224,6 +227,13 @@ impl<SA> CodecFrom<UserMapper<SA, CurrentStorage>> for MultiValueEncoded<SA, Man
 {
 }
 
+impl<SA> TypeAbiFrom<UserMapper<SA, CurrentStorage>> for MultiValueEncoded<SA, ManagedAddress<SA>> where
+    SA: StorageMapperApi
+{
+}
+
+impl<SA> TypeAbiFrom<Self> for UserMapper<SA, CurrentStorage> where SA: StorageMapperApi {}
+
 /// Behaves like a MultiResultVec when an endpoint result.
 impl<SA> TypeAbi for UserMapper<SA, CurrentStorage>
 where
diff --git a/framework/base/src/storage/mappers/vec_mapper.rs b/framework/base/src/storage/mappers/vec_mapper.rs
index b6508a8900..f4468d2957 100644
--- a/framework/base/src/storage/mappers/vec_mapper.rs
+++ b/framework/base/src/storage/mappers/vec_mapper.rs
@@ -3,7 +3,7 @@ use super::{
     StorageClearable, StorageMapper,
 };
 use crate::{
-    abi::{TypeAbi, TypeDescriptionContainer, TypeName},
+    abi::{TypeAbi, TypeAbiFrom, TypeDescriptionContainer, TypeName},
     api::{ErrorApiImpl, StorageMapperApi},
     codec::{
         multi_encode_iter_or_handle_err, CodecFrom, EncodeErrorHandler, TopDecode, TopEncode,
@@ -351,6 +351,20 @@ where
 {
 }
 
+impl<SA, T> TypeAbiFrom<VecMapper<SA, T, CurrentStorage>> for MultiValueEncoded<SA, T>
+where
+    SA: StorageMapperApi,
+    T: TopEncode + TopDecode,
+{
+}
+
+impl<SA, T> TypeAbiFrom<Self> for VecMapper<SA, T, CurrentStorage>
+where
+    SA: StorageMapperApi,
+    T: TopEncode + TopDecode,
+{
+}
+
 /// Behaves like a MultiResultVec when an endpoint result.
 impl<SA, T> TypeAbi for VecMapper<SA, T, CurrentStorage>
 where
diff --git a/framework/base/src/types/crypto/message_hash_type.rs b/framework/base/src/types/crypto/message_hash_type.rs
index 18d3f384fe..c6cd93d181 100644
--- a/framework/base/src/types/crypto/message_hash_type.rs
+++ b/framework/base/src/types/crypto/message_hash_type.rs
@@ -1,7 +1,9 @@
 use crate::{
-    abi::{TypeAbi, TypeName},
-    codec,
-    codec::derive::{NestedDecode, NestedEncode, TopDecode, TopEncode},
+    abi::{TypeAbi, TypeAbiFrom, TypeName},
+    codec::{
+        self,
+        derive::{NestedDecode, NestedEncode, TopDecode, TopEncode},
+    },
 };
 
 /// Message hash type for the `verifyCustomSecp256k1` CryptoApi function
@@ -38,6 +40,8 @@ impl From<u8> for MessageHashType {
     }
 }
 
+impl TypeAbiFrom<Self> for MessageHashType {}
+
 impl TypeAbi for MessageHashType {
     fn type_name() -> TypeName {
         "MessageHashType".into()
diff --git a/framework/base/src/types/flags/code_metadata.rs b/framework/base/src/types/flags/code_metadata.rs
index 6c65859c1a..a360909602 100644
--- a/framework/base/src/types/flags/code_metadata.rs
+++ b/framework/base/src/types/flags/code_metadata.rs
@@ -1,7 +1,7 @@
 #![allow(clippy::bad_bit_mask)]
 
 use crate::{
-    abi::{TypeAbi, TypeName},
+    abi::{TypeAbi, TypeAbiFrom, TypeName},
     codec::*,
     formatter::{hex_util, FormatByteReceiver, SCBinary, SCDisplay, SCLowerHex},
 };
@@ -103,6 +103,8 @@ impl TopDecode for CodeMetadata {
     }
 }
 
+impl TypeAbiFrom<Self> for CodeMetadata {}
+
 impl TypeAbi for CodeMetadata {
     fn type_name() -> TypeName {
         "CodeMetadata".into()
diff --git a/framework/base/src/types/heap/async_call_result.rs b/framework/base/src/types/heap/async_call_result.rs
index 4084c83bc7..e5def9b718 100644
--- a/framework/base/src/types/heap/async_call_result.rs
+++ b/framework/base/src/types/heap/async_call_result.rs
@@ -1,5 +1,5 @@
 use crate::{
-    abi::{TypeAbi, TypeName},
+    abi::{TypeAbi, TypeAbiFrom, TypeName},
     codec::{
         DecodeErrorHandler, EncodeErrorHandler, TopDecodeMulti, TopDecodeMultiInput,
         TopEncodeMulti, TopEncodeMultiOutput,
@@ -82,6 +82,8 @@ where
     }
 }
 
+impl<T: TypeAbi> TypeAbiFrom<Self> for AsyncCallResult<T> {}
+
 impl<T: TypeAbi> TypeAbi for AsyncCallResult<T> {
     fn type_name() -> TypeName {
         let mut repr = TypeName::from("AsyncCallResult<");
diff --git a/framework/base/src/types/heap/boxed_bytes.rs b/framework/base/src/types/heap/boxed_bytes.rs
index 1b7c2b35e7..f29b772a36 100644
--- a/framework/base/src/types/heap/boxed_bytes.rs
+++ b/framework/base/src/types/heap/boxed_bytes.rs
@@ -1,5 +1,5 @@
 use crate::{
-    abi::{TypeAbi, TypeName},
+    abi::{TypeAbi, TypeAbiFrom, TypeName},
     codec::*,
 };
 use alloc::{
@@ -240,6 +240,8 @@ impl TopDecode for BoxedBytes {
     }
 }
 
+impl TypeAbiFrom<Self> for BoxedBytes {}
+
 impl TypeAbi for BoxedBytes {
     fn type_name() -> TypeName {
         "bytes".into()
diff --git a/framework/base/src/types/heap/h256.rs b/framework/base/src/types/heap/h256.rs
index a097b0d08d..c7c20b26c3 100644
--- a/framework/base/src/types/heap/h256.rs
+++ b/framework/base/src/types/heap/h256.rs
@@ -1,5 +1,5 @@
 use crate::{
-    abi::{TypeAbi, TypeName},
+    abi::{TypeAbi, TypeAbiFrom, TypeName},
     types::heap::BoxedBytes,
 };
 use alloc::{boxed::Box, vec::Vec};
@@ -224,6 +224,8 @@ impl TopDecode for H256 {
     }
 }
 
+impl TypeAbiFrom<Self> for H256 {}
+
 impl TypeAbi for H256 {
     fn type_name() -> TypeName {
         "H256".into()
diff --git a/framework/base/src/types/heap/h256_address.rs b/framework/base/src/types/heap/h256_address.rs
index 5e4712df7a..0eed2a0ede 100644
--- a/framework/base/src/types/heap/h256_address.rs
+++ b/framework/base/src/types/heap/h256_address.rs
@@ -1,6 +1,6 @@
 use super::h256::H256;
 use crate::{
-    abi::{TypeAbi, TypeName},
+    abi::{TypeAbi, TypeAbiFrom, TypeName},
     types::heap::BoxedBytes,
 };
 use alloc::{boxed::Box, vec::Vec};
@@ -202,6 +202,8 @@ impl TopDecode for Address {
     }
 }
 
+impl TypeAbiFrom<Self> for Address {}
+
 impl TypeAbi for Address {
     fn type_name() -> TypeName {
         "Address".into()
diff --git a/framework/base/src/types/heap/queue.rs b/framework/base/src/types/heap/queue.rs
index 1c32848acf..8cdb66c8b1 100644
--- a/framework/base/src/types/heap/queue.rs
+++ b/framework/base/src/types/heap/queue.rs
@@ -1,5 +1,5 @@
 use crate::{
-    abi::{TypeAbi, TypeName},
+    abi::{TypeAbi, TypeAbiFrom, TypeName},
     codec::*,
 };
 use alloc::vec::Vec;
@@ -136,6 +136,8 @@ impl<T: NestedDecode> TopDecode for Queue<T> {
     }
 }
 
+impl<T: TypeAbi> TypeAbiFrom<Self> for Queue<T> {}
+
 impl<T: TypeAbi> TypeAbi for Queue<T> {
     fn type_name() -> TypeName {
         let mut repr = TypeName::from("Queue<");
diff --git a/framework/base/src/types/interaction/managed_arg_buffer.rs b/framework/base/src/types/interaction/managed_arg_buffer.rs
index e2d13f3566..ab103040f7 100644
--- a/framework/base/src/types/interaction/managed_arg_buffer.rs
+++ b/framework/base/src/types/interaction/managed_arg_buffer.rs
@@ -1,5 +1,5 @@
 use crate::{
-    abi::{TypeAbi, TypeName},
+    abi::{TypeAbi, TypeAbiFrom, TypeName},
     api::{ErrorApi, ManagedTypeApi},
     codec::{
         DecodeErrorHandler, EncodeErrorHandler, NestedDecode, NestedDecodeInput, NestedEncode,
@@ -299,6 +299,8 @@ where
     }
 }
 
+impl<M> TypeAbiFrom<Self> for ManagedArgBuffer<M> where M: ManagedTypeApi {}
+
 impl<M> TypeAbi for ManagedArgBuffer<M>
 where
     M: ManagedTypeApi,
diff --git a/framework/base/src/types/interaction/tx_data/function_call.rs b/framework/base/src/types/interaction/tx_data/function_call.rs
index 9242e141cf..2f110040fd 100644
--- a/framework/base/src/types/interaction/tx_data/function_call.rs
+++ b/framework/base/src/types/interaction/tx_data/function_call.rs
@@ -4,7 +4,7 @@ use multiversx_sc_codec::{
 };
 
 use crate::{
-    abi::{TypeAbi, TypeName},
+    abi::{TypeAbi, TypeAbiFrom, TypeName},
     api::{
         CallTypeApi, ManagedTypeApi, ESDT_MULTI_TRANSFER_FUNC_NAME, ESDT_NFT_TRANSFER_FUNC_NAME,
         ESDT_TRANSFER_FUNC_NAME,
@@ -136,6 +136,8 @@ where
     }
 }
 
+impl<Api> TypeAbiFrom<Self> for FunctionCall<Api> where Api: ManagedTypeApi {}
+
 impl<Api> TypeAbi for FunctionCall<Api>
 where
     Api: ManagedTypeApi,
diff --git a/framework/base/src/types/io/operation_completion_status.rs b/framework/base/src/types/io/operation_completion_status.rs
index b2c7e5bb0c..125674ec30 100644
--- a/framework/base/src/types/io/operation_completion_status.rs
+++ b/framework/base/src/types/io/operation_completion_status.rs
@@ -4,7 +4,7 @@ use multiversx_sc_codec::{
 
 use crate::{
     abi::{
-        ExplicitEnumVariantDescription, TypeAbi, TypeContents, TypeDescription,
+        ExplicitEnumVariantDescription, TypeAbi, TypeAbiFrom, TypeContents, TypeDescription,
         TypeDescriptionContainer, TypeName,
     },
     api::ManagedTypeApi,
@@ -77,6 +77,12 @@ impl<M: ManagedTypeApi> CodecFrom<OperationCompletionStatus> for ManagedBuffer<M
 impl CodecFrom<OperationCompletionStatus> for crate::types::heap::BoxedBytes {}
 impl CodecFrom<OperationCompletionStatus> for crate::types::heap::Vec<u8> {}
 
+impl<M: ManagedTypeApi> TypeAbiFrom<OperationCompletionStatus> for ManagedBuffer<M> {}
+impl TypeAbiFrom<OperationCompletionStatus> for crate::types::heap::BoxedBytes {}
+impl TypeAbiFrom<OperationCompletionStatus> for crate::types::heap::Vec<u8> {}
+
+impl TypeAbiFrom<Self> for OperationCompletionStatus {}
+
 impl TypeAbi for OperationCompletionStatus {
     fn type_name() -> TypeName {
         TypeName::from("OperationCompletionStatus")
diff --git a/framework/base/src/types/io/sc_result.rs b/framework/base/src/types/io/sc_result.rs
index 78a4d2ec18..fcad33270a 100644
--- a/framework/base/src/types/io/sc_result.rs
+++ b/framework/base/src/types/io/sc_result.rs
@@ -1,6 +1,9 @@
 use alloc::format;
 
-use crate::codec::{EncodeErrorHandler, TopEncodeMulti, TopEncodeMultiOutput};
+use crate::{
+    abi::TypeAbiFrom,
+    codec::{EncodeErrorHandler, TopEncodeMulti, TopEncodeMultiOutput},
+};
 
 use crate::{
     abi::{OutputAbis, TypeAbi, TypeDescriptionContainer, TypeName},
@@ -129,6 +132,8 @@ where
     }
 }
 
+impl<T: TypeAbi, E> TypeAbiFrom<Self> for SCResult<T, E> {}
+
 impl<T: TypeAbi, E> TypeAbi for SCResult<T, E> {
     fn type_name() -> TypeName {
         T::type_name()
diff --git a/framework/base/src/types/managed/basic/big_float.rs b/framework/base/src/types/managed/basic/big_float.rs
index 83ef5613e3..62126efd19 100644
--- a/framework/base/src/types/managed/basic/big_float.rs
+++ b/framework/base/src/types/managed/basic/big_float.rs
@@ -1,6 +1,7 @@
 use super::ManagedBuffer;
 
 use crate::{
+    abi::{TypeAbi, TypeAbiFrom},
     api::{
         use_raw_handle, BigFloatApiImpl, ManagedTypeApi, ManagedTypeApiImpl, Sign, StaticVarApiImpl,
     },
@@ -285,7 +286,9 @@ impl<M: ManagedTypeApi> NestedDecode for BigFloat<M> {
     }
 }
 
-impl<M: ManagedTypeApi> crate::abi::TypeAbi for BigFloat<M> {
+impl<M> TypeAbiFrom<Self> for BigFloat<M> where M: ManagedTypeApi {}
+
+impl<M: ManagedTypeApi> TypeAbi for BigFloat<M> {
     fn type_name() -> String {
         String::from("BigFloat")
     }
diff --git a/framework/base/src/types/managed/basic/big_int.rs b/framework/base/src/types/managed/basic/big_int.rs
index e924a14787..a27611a903 100644
--- a/framework/base/src/types/managed/basic/big_int.rs
+++ b/framework/base/src/types/managed/basic/big_int.rs
@@ -1,7 +1,7 @@
 use core::{convert::TryInto, marker::PhantomData};
 
 use crate::{
-    abi::TypeName,
+    abi::{TypeAbiFrom, TypeName},
     api::{
         const_handles, use_raw_handle, BigIntApiImpl, HandleConstraints, ManagedBufferApiImpl,
         ManagedTypeApi, ManagedTypeApiImpl, RawHandle, StaticVarApiImpl,
@@ -298,6 +298,8 @@ impl<M: ManagedTypeApi> TopDecode for BigInt<M> {
     }
 }
 
+impl<M> TypeAbiFrom<Self> for BigInt<M> where M: ManagedTypeApi {}
+
 impl<M: ManagedTypeApi> crate::abi::TypeAbi for BigInt<M> {
     fn type_name() -> TypeName {
         TypeName::from("BigInt")
diff --git a/framework/base/src/types/managed/basic/big_int_sign.rs b/framework/base/src/types/managed/basic/big_int_sign.rs
index 641e1c9328..0ed8cabbc2 100644
--- a/framework/base/src/types/managed/basic/big_int_sign.rs
+++ b/framework/base/src/types/managed/basic/big_int_sign.rs
@@ -3,7 +3,7 @@ use crate::codec::{
     NestedEncodeOutput, TopDecode, TopDecodeInput, TopEncode, TopEncodeOutput,
 };
 
-use crate::abi::TypeName;
+use crate::abi::{TypeAbi, TypeAbiFrom, TypeName};
 
 // BigInt sign.
 #[allow(clippy::enum_variant_names)]
@@ -79,7 +79,9 @@ impl TopDecode for Sign {
     }
 }
 
-impl crate::abi::TypeAbi for Sign {
+impl TypeAbiFrom<Self> for Sign {}
+
+impl TypeAbi for Sign {
     fn type_name() -> TypeName {
         TypeName::from("Sign")
     }
diff --git a/framework/base/src/types/managed/basic/big_uint.rs b/framework/base/src/types/managed/basic/big_uint.rs
index 5f32388093..9f78792eab 100644
--- a/framework/base/src/types/managed/basic/big_uint.rs
+++ b/framework/base/src/types/managed/basic/big_uint.rs
@@ -1,7 +1,7 @@
 use core::convert::TryInto;
 
 use crate::{
-    abi::TypeName,
+    abi::{TypeAbiFrom, TypeName},
     api::{
         const_handles, use_raw_handle, BigIntApiImpl, HandleConstraints, ManagedBufferApiImpl,
         ManagedTypeApi, ManagedTypeApiImpl, RawHandle, StaticVarApiImpl,
@@ -287,6 +287,8 @@ impl<M: ManagedTypeApi> TopDecode for BigUint<M> {
     }
 }
 
+impl<M> TypeAbiFrom<Self> for BigUint<M> where M: ManagedTypeApi {}
+
 impl<M: ManagedTypeApi> crate::abi::TypeAbi for BigUint<M> {
     fn type_name() -> TypeName {
         TypeName::from("BigUint")
diff --git a/framework/base/src/types/managed/basic/elliptic_curve.rs b/framework/base/src/types/managed/basic/elliptic_curve.rs
index 904a0de67a..9359ecfce3 100644
--- a/framework/base/src/types/managed/basic/elliptic_curve.rs
+++ b/framework/base/src/types/managed/basic/elliptic_curve.rs
@@ -1,5 +1,5 @@
 use crate::{
-    abi::{TypeAbi, TypeName},
+    abi::{TypeAbi, TypeAbiFrom, TypeName},
     api::{use_raw_handle, BigIntApiImpl, EllipticCurveApiImpl, ManagedTypeApi},
     types::{BigUint, ManagedType},
 };
@@ -418,6 +418,8 @@ impl<M: ManagedTypeApi> TopEncode for EllipticCurve<M> {
     }
 }
 
+impl<M> TypeAbiFrom<Self> for EllipticCurve<M> where M: ManagedTypeApi {}
+
 impl<M: ManagedTypeApi> TypeAbi for EllipticCurve<M> {
     fn type_name() -> TypeName {
         TypeName::from("EllipticCurve")
diff --git a/framework/base/src/types/managed/basic/managed_buffer.rs b/framework/base/src/types/managed/basic/managed_buffer.rs
index b39643a27d..a9d7483125 100644
--- a/framework/base/src/types/managed/basic/managed_buffer.rs
+++ b/framework/base/src/types/managed/basic/managed_buffer.rs
@@ -1,5 +1,5 @@
 use crate::{
-    abi::TypeName,
+    abi::{TypeAbiFrom, TypeName},
     api::{
         use_raw_handle, ErrorApiImpl, HandleConstraints, InvalidSliceError, ManagedBufferApiImpl,
         ManagedTypeApi, StaticVarApiImpl,
@@ -461,6 +461,8 @@ impl<M: ManagedTypeApi> TopDecode for ManagedBuffer<M> {
     }
 }
 
+impl<M> TypeAbiFrom<Self> for ManagedBuffer<M> where M: ManagedTypeApi {}
+
 impl<M: ManagedTypeApi> crate::abi::TypeAbi for ManagedBuffer<M> {
     fn type_name() -> TypeName {
         "bytes".into()
diff --git a/framework/base/src/types/managed/multi_value/async_call_result_managed.rs b/framework/base/src/types/managed/multi_value/async_call_result_managed.rs
index 6cdd2d7513..b8b37e20da 100644
--- a/framework/base/src/types/managed/multi_value/async_call_result_managed.rs
+++ b/framework/base/src/types/managed/multi_value/async_call_result_managed.rs
@@ -1,5 +1,5 @@
 use crate::{
-    abi::{TypeAbi, TypeName},
+    abi::{TypeAbi, TypeAbiFrom, TypeName},
     api::ManagedTypeApi,
     codec::{
         DecodeErrorHandler, EncodeErrorHandler, TopDecodeMulti, TopDecodeMultiInput,
@@ -97,6 +97,13 @@ where
     }
 }
 
+impl<M, T> TypeAbiFrom<Self> for ManagedAsyncCallResult<M, T>
+where
+    M: ManagedTypeApi,
+    T: TypeAbi,
+{
+}
+
 impl<M, T> TypeAbi for ManagedAsyncCallResult<M, T>
 where
     M: ManagedTypeApi,
diff --git a/framework/base/src/types/managed/multi_value/esdt_token_payment_multi_value.rs b/framework/base/src/types/managed/multi_value/esdt_token_payment_multi_value.rs
index 9f27f1cd89..11c81faaaa 100644
--- a/framework/base/src/types/managed/multi_value/esdt_token_payment_multi_value.rs
+++ b/framework/base/src/types/managed/multi_value/esdt_token_payment_multi_value.rs
@@ -1,6 +1,9 @@
-use crate::codec::{
-    multi_types::MultiValue3, DecodeErrorHandler, EncodeErrorHandler, TopDecodeMulti,
-    TopDecodeMultiInput, TopDecodeMultiLength, TopEncodeMulti, TopEncodeMultiOutput,
+use crate::{
+    abi::TypeAbiFrom,
+    codec::{
+        multi_types::MultiValue3, DecodeErrorHandler, EncodeErrorHandler, TopDecodeMulti,
+        TopDecodeMultiInput, TopDecodeMultiLength, TopEncodeMulti, TopEncodeMultiOutput,
+    },
 };
 
 use crate::{
@@ -98,6 +101,8 @@ where
     const LEN: usize = 3;
 }
 
+impl<M> TypeAbiFrom<Self> for EsdtTokenPaymentMultiValue<M> where M: ManagedTypeApi {}
+
 impl<M> TypeAbi for EsdtTokenPaymentMultiValue<M>
 where
     M: ManagedTypeApi,
diff --git a/framework/base/src/types/managed/multi_value/multi_value_encoded.rs b/framework/base/src/types/managed/multi_value/multi_value_encoded.rs
index be22e29b10..01e894cf3e 100644
--- a/framework/base/src/types/managed/multi_value/multi_value_encoded.rs
+++ b/framework/base/src/types/managed/multi_value/multi_value_encoded.rs
@@ -1,5 +1,5 @@
 use crate::{
-    abi::{TypeAbi, TypeDescriptionContainer, TypeName},
+    abi::{TypeAbi, TypeAbiFrom, TypeDescriptionContainer, TypeName},
     api::{ErrorApi, ManagedTypeApi},
     codec::{
         try_cast_execute_or_else, CodecFromSelf, DecodeErrorHandler, EncodeErrorHandler, TopDecode,
@@ -222,6 +222,13 @@ where
     }
 }
 
+impl<M, T> TypeAbiFrom<Self> for MultiValueEncoded<M, T>
+where
+    M: ManagedTypeApi,
+    T: TypeAbi,
+{
+}
+
 impl<M, T> TypeAbi for MultiValueEncoded<M, T>
 where
     M: ManagedTypeApi,
diff --git a/framework/base/src/types/managed/multi_value/multi_value_managed_vec.rs b/framework/base/src/types/managed/multi_value/multi_value_managed_vec.rs
index 6779df703b..7bae85617e 100644
--- a/framework/base/src/types/managed/multi_value/multi_value_managed_vec.rs
+++ b/framework/base/src/types/managed/multi_value/multi_value_managed_vec.rs
@@ -1,5 +1,5 @@
 use crate::{
-    abi::{TypeAbi, TypeDescriptionContainer, TypeName},
+    abi::{TypeAbi, TypeAbiFrom, TypeDescriptionContainer, TypeName},
     api::ManagedTypeApi,
     codec::{
         DecodeErrorHandler, EncodeErrorHandler, TopDecodeMulti, TopDecodeMultiInput,
@@ -210,6 +210,13 @@ where
     }
 }
 
+impl<M, T: TypeAbi> TypeAbiFrom<Self> for MultiValueManagedVec<M, T>
+where
+    M: ManagedTypeApi,
+    T: ManagedVecItem,
+{
+}
+
 impl<M, T: TypeAbi> TypeAbi for MultiValueManagedVec<M, T>
 where
     M: ManagedTypeApi,
diff --git a/framework/base/src/types/managed/multi_value/multi_value_managed_vec_counted.rs b/framework/base/src/types/managed/multi_value/multi_value_managed_vec_counted.rs
index eaab79dbed..74e71e7960 100644
--- a/framework/base/src/types/managed/multi_value/multi_value_managed_vec_counted.rs
+++ b/framework/base/src/types/managed/multi_value/multi_value_managed_vec_counted.rs
@@ -1,5 +1,5 @@
 use crate::{
-    abi::{TypeAbi, TypeDescriptionContainer, TypeName},
+    abi::{TypeAbi, TypeAbiFrom, TypeDescriptionContainer, TypeName},
     api::ManagedTypeApi,
     codec::{
         DecodeErrorHandler, EncodeErrorHandler, TopDecodeMulti, TopDecodeMultiInput,
@@ -126,6 +126,13 @@ where
     }
 }
 
+impl<M, T> TypeAbiFrom<Self> for MultiValueManagedVecCounted<M, T>
+where
+    M: ManagedTypeApi,
+    T: ManagedVecItem + TypeAbi,
+{
+}
+
 impl<M, T> TypeAbi for MultiValueManagedVecCounted<M, T>
 where
     M: ManagedTypeApi,
diff --git a/framework/base/src/types/managed/wrapped/egld_or_esdt_token_identifier.rs b/framework/base/src/types/managed/wrapped/egld_or_esdt_token_identifier.rs
index c363853203..16f6714ff0 100644
--- a/framework/base/src/types/managed/wrapped/egld_or_esdt_token_identifier.rs
+++ b/framework/base/src/types/managed/wrapped/egld_or_esdt_token_identifier.rs
@@ -1,5 +1,5 @@
 use crate::{
-    abi::{TypeAbi, TypeName},
+    abi::{TypeAbi, TypeAbiFrom, TypeName},
     api::{HandleConstraints, ManagedTypeApi},
     codec::*,
     derive::ManagedVecItem,
@@ -213,6 +213,8 @@ impl<M> CodecFrom<&TokenIdentifier<M>> for EgldOrEsdtTokenIdentifier<M> where M:
 impl<M> CodecFrom<&[u8]> for EgldOrEsdtTokenIdentifier<M> where M: ManagedTypeApi {}
 impl<M> CodecFrom<&str> for EgldOrEsdtTokenIdentifier<M> where M: ManagedTypeApi {}
 
+impl<M: ManagedTypeApi> TypeAbiFrom<Self> for EgldOrEsdtTokenIdentifier<M> {}
+
 impl<M: ManagedTypeApi> TypeAbi for EgldOrEsdtTokenIdentifier<M> {
     fn type_name() -> TypeName {
         "EgldOrEsdtTokenIdentifier".into()
diff --git a/framework/base/src/types/managed/wrapped/managed_address.rs b/framework/base/src/types/managed/wrapped/managed_address.rs
index d0bf38f9dc..5ab0941f47 100644
--- a/framework/base/src/types/managed/wrapped/managed_address.rs
+++ b/framework/base/src/types/managed/wrapped/managed_address.rs
@@ -1,7 +1,7 @@
 use core::convert::{TryFrom, TryInto};
 
 use crate::{
-    abi::{TypeAbi, TypeName},
+    abi::{TypeAbi, TypeAbiFrom, TypeName},
     api::ManagedTypeApi,
     codec::{
         CodecFrom, CodecFromSelf, DecodeError, DecodeErrorHandler, EncodeErrorHandler,
@@ -234,6 +234,8 @@ where
     }
 }
 
+impl<M> TypeAbiFrom<Self> for ManagedAddress<M> where M: ManagedTypeApi {}
+
 impl<M> TypeAbi for ManagedAddress<M>
 where
     M: ManagedTypeApi,
diff --git a/framework/base/src/types/managed/wrapped/managed_byte_array.rs b/framework/base/src/types/managed/wrapped/managed_byte_array.rs
index 5ff3b37c6f..79bc111792 100644
--- a/framework/base/src/types/managed/wrapped/managed_byte_array.rs
+++ b/framework/base/src/types/managed/wrapped/managed_byte_array.rs
@@ -3,7 +3,7 @@ use core::convert::TryFrom;
 use alloc::format;
 
 use crate::{
-    abi::{TypeAbi, TypeName},
+    abi::{TypeAbi, TypeAbiFrom, TypeName},
     api::ManagedTypeApi,
     codec::{
         DecodeError, DecodeErrorHandler, EncodeErrorHandler, NestedDecode, NestedDecodeInput,
@@ -205,13 +205,15 @@ where
     }
 }
 
+impl<M, const N: usize> TypeAbiFrom<Self> for ManagedByteArray<M, N> where M: ManagedTypeApi {}
+
 impl<M, const N: usize> TypeAbi for ManagedByteArray<M, N>
 where
     M: ManagedTypeApi,
 {
     /// It is semantically equivalent to `[u8; N]`.
     fn type_name() -> TypeName {
-        <&[u8; N] as TypeAbi>::type_name()
+        <[u8; N] as TypeAbi>::type_name()
     }
 
     fn type_name_rust() -> TypeName {
diff --git a/framework/base/src/types/managed/wrapped/managed_option.rs b/framework/base/src/types/managed/wrapped/managed_option.rs
index 7dd8ed2dad..b7bafe4055 100644
--- a/framework/base/src/types/managed/wrapped/managed_option.rs
+++ b/framework/base/src/types/managed/wrapped/managed_option.rs
@@ -1,8 +1,11 @@
 use core::marker::PhantomData;
 
-use crate::codec::{
-    DecodeErrorHandler, EncodeErrorHandler, NestedDecode, NestedDecodeInput, NestedEncode,
-    NestedEncodeOutput, TopDecode, TopDecodeInput, TopEncode, TopEncodeOutput,
+use crate::{
+    abi::TypeAbiFrom,
+    codec::{
+        DecodeErrorHandler, EncodeErrorHandler, NestedDecode, NestedDecodeInput, NestedEncode,
+        NestedEncodeOutput, TopDecode, TopDecodeInput, TopEncode, TopEncodeOutput,
+    },
 };
 
 use crate::{
@@ -269,6 +272,29 @@ where
     }
 }
 
+impl<M, T, U> TypeAbiFrom<ManagedOption<M, U>> for ManagedOption<M, T>
+where
+    M: ManagedTypeApi,
+    U: ManagedType<M>,
+    T: ManagedType<M> + TypeAbiFrom<U>,
+{
+}
+
+impl<M, T, U> TypeAbiFrom<Option<U>> for ManagedOption<M, T>
+where
+    M: ManagedTypeApi,
+    T: ManagedType<M> + TypeAbiFrom<U>,
+{
+}
+
+impl<M, T, U> TypeAbiFrom<ManagedOption<M, U>> for Option<T>
+where
+    M: ManagedTypeApi,
+    U: ManagedType<M>,
+    T: TypeAbiFrom<U>,
+{
+}
+
 impl<M, T> TypeAbi for ManagedOption<M, T>
 where
     M: ManagedTypeApi,
diff --git a/framework/base/src/types/managed/wrapped/managed_vec.rs b/framework/base/src/types/managed/wrapped/managed_vec.rs
index 0b6b4c996a..3897ff2604 100644
--- a/framework/base/src/types/managed/wrapped/managed_vec.rs
+++ b/framework/base/src/types/managed/wrapped/managed_vec.rs
@@ -1,6 +1,6 @@
 use super::EncodedManagedVecItem;
 use crate::{
-    abi::{TypeAbi, TypeDescriptionContainer, TypeName},
+    abi::{TypeAbi, TypeAbiFrom, TypeDescriptionContainer, TypeName},
     api::{ErrorApiImpl, InvalidSliceError, ManagedTypeApi},
     codec::{
         DecodeErrorHandler, EncodeErrorHandler, IntoMultiValue, NestedDecode, NestedDecodeInput,
@@ -678,6 +678,29 @@ where
     }
 }
 
+impl<M, T, U> TypeAbiFrom<ManagedVec<M, U>> for ManagedVec<M, T>
+where
+    M: ManagedTypeApi,
+    U: ManagedVecItem,
+    T: ManagedVecItem + TypeAbiFrom<U>,
+{
+}
+
+impl<M, T, U> TypeAbiFrom<Vec<U>> for ManagedVec<M, T>
+where
+    M: ManagedTypeApi,
+    T: ManagedVecItem + TypeAbiFrom<U>,
+{
+}
+
+impl<M, T, U> TypeAbiFrom<ManagedVec<M, U>> for Vec<T>
+where
+    M: ManagedTypeApi,
+    U: ManagedVecItem,
+    T: TypeAbiFrom<U>,
+{
+}
+
 impl<M, T> TypeAbi for ManagedVec<M, T>
 where
     M: ManagedTypeApi,
diff --git a/framework/base/src/types/managed/wrapped/token_identifier.rs b/framework/base/src/types/managed/wrapped/token_identifier.rs
index 53078e09d7..8eea09f437 100644
--- a/framework/base/src/types/managed/wrapped/token_identifier.rs
+++ b/framework/base/src/types/managed/wrapped/token_identifier.rs
@@ -1,5 +1,5 @@
 use crate::{
-    abi::{TypeAbi, TypeName},
+    abi::{TypeAbi, TypeAbiFrom, TypeName},
     api::{ErrorApi, ErrorApiImpl, HandleConstraints, ManagedTypeApi, ManagedTypeApiImpl},
     codec::*,
     err_msg,
@@ -168,6 +168,8 @@ impl<M> CodecFrom<&[u8]> for TokenIdentifier<M> where M: ManagedTypeApi {}
 
 impl<M> CodecFrom<Vec<u8>> for TokenIdentifier<M> where M: ManagedTypeApi {}
 
+impl<M: ManagedTypeApi> TypeAbiFrom<Self> for TokenIdentifier<M> {}
+
 impl<M: ManagedTypeApi> TypeAbi for TokenIdentifier<M> {
     fn type_name() -> TypeName {
         "TokenIdentifier".into()
diff --git a/framework/base/src/types/static_buffer/sparse_array.rs b/framework/base/src/types/static_buffer/sparse_array.rs
index a0e556f2d8..9d35219466 100644
--- a/framework/base/src/types/static_buffer/sparse_array.rs
+++ b/framework/base/src/types/static_buffer/sparse_array.rs
@@ -1,7 +1,7 @@
 use alloc::format;
 
 use crate::{
-    abi::{TypeAbi, TypeDescriptionContainer, TypeName},
+    abi::{TypeAbi, TypeAbiFrom, TypeDescriptionContainer, TypeName},
     api::{ErrorApi, ErrorApiImpl},
     codec::{self, arrayvec::ArrayVec, NestedDecode, NestedEncode, TopDecode, TopEncode},
 };
@@ -304,6 +304,8 @@ where
     }
 }
 
+impl<E, const CAPACITY: usize> TypeAbiFrom<Self> for SparseArray<E, CAPACITY> where E: ErrorApi {}
+
 impl<E, const CAPACITY: usize> TypeAbi for SparseArray<E, CAPACITY>
 where
     E: ErrorApi,
diff --git a/framework/derive/src/type_abi_derive.rs b/framework/derive/src/type_abi_derive.rs
index 6799aac9d2..3c95ca3dda 100644
--- a/framework/derive/src/type_abi_derive.rs
+++ b/framework/derive/src/type_abi_derive.rs
@@ -123,6 +123,8 @@ pub fn type_abi_derive(input: proc_macro::TokenStream) -> proc_macro2::TokenStre
     let name_str = name.to_string();
     let (impl_generics, ty_generics, where_clause) = &ast.generics.split_for_impl();
     quote! {
+        impl #impl_generics multiversx_sc::abi::TypeAbiFrom<Self> for #name #ty_generics #where_clause {}
+
         impl #impl_generics multiversx_sc::abi::TypeAbi for #name #ty_generics #where_clause {
             fn type_name() -> multiversx_sc::abi::TypeName {
                 #name_str.into()

From a3ee194c657f527daf9344144fcad7b44689a487 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Sat, 4 May 2024 15:44:10 +0300
Subject: [PATCH 0810/1254] TypeAbiFrom in new proxies, impl for more types

---
 .../tests/price_aggregator_proxy.rs           | 62 ++++++++--------
 contracts/examples/adder/src/adder_proxy.rs   |  6 +-
 .../src/crowdfunding_esdt_proxy.rs            |  8 +-
 .../src/kitty_ownership_proxy.rs              | 60 +++++++--------
 .../src/kitty_genetic_alg_proxy.rs            |  4 +-
 .../src/kitty_ownership_proxy.rs              | 60 +++++++--------
 .../src/proxy_crypto_zombies.rs               | 30 ++++----
 .../digital-cash/src/digital_cash_proxy.rs    | 44 +++++------
 .../src/nft_marketplace_proxy.rs              |  6 +-
 .../examples/multisig/src/multisig_proxy.rs   | 74 +++++++++----------
 .../nft-minter/src/nft_marketplace_proxy.rs   |  6 +-
 .../src/rewards_distribution_proxy.rs         | 37 +++++-----
 .../src/seed_nft_minter_proxy.rs              | 28 +++----
 .../tests/mock_seed_nft_minter_proxy.rs       |  4 +-
 .../src/nft_marketplace_proxy.rs              |  6 +-
 .../feature-tests/abi-tester/src/abi_proxy.rs | 36 ++++-----
 .../parent/src/child_proxy.rs                 |  6 +-
 .../forwarder/src/vault_proxy.rs              | 28 +++----
 .../promises-features/src/vault_proxy.rs      | 28 +++----
 .../proxy-test-first/src/message_me_proxy.rs  | 10 +--
 .../proxy-test-first/src/pay_me_proxy.rs      |  4 +-
 .../recursive-caller/src/self_proxy.rs        |  8 +-
 .../recursive-caller/src/vault_proxy.rs       | 28 +++----
 .../crowdfunding-erc20/src/erc20_proxy.rs     | 22 +++---
 .../erc1155-marketplace/src/erc1155_proxy.rs  | 58 +++++++--------
 .../erc1155/src/erc1155_user_proxy.rs         | 20 ++---
 .../lottery-erc20/src/erc20_proxy.rs          | 22 +++---
 .../panic-message-features/tests/pmf_proxy.rs |  2 +-
 .../src/scenario_tester_proxy.rs              |  6 +-
 contracts/modules/src/dns_proxy.rs            |  2 +-
 framework/base/src/abi/type_abi_impl_basic.rs | 36 +++++++++
 .../types/interaction/expr/test_address.rs    |  2 +
 .../types/interaction/expr/test_sc_address.rs |  2 +
 .../interaction/expr/test_token_identifier.rs |  3 +
 .../types/interaction/managed_arg_buffer.rs   |  1 +
 .../markers/esdt_system_sc_address.rs         |  2 +
 .../system_proxy/builtin_func_proxy.rs        |  8 +-
 .../base/src/types/interaction/tx_proxy.rs    | 16 ++++
 .../base/src/types/managed/basic/big_float.rs |  1 +
 .../base/src/types/managed/basic/big_int.rs   |  2 +
 .../base/src/types/managed/basic/big_uint.rs  |  7 ++
 .../src/types/managed/basic/managed_buffer.rs | 10 +++
 .../multi_value/multi_value_encoded.rs        | 18 +++++
 .../wrapped/egld_or_esdt_token_identifier.rs  | 13 ++++
 .../types/managed/wrapped/managed_address.rs  | 14 ++++
 .../managed/wrapped/managed_byte_array.rs     |  1 +
 .../types/managed/wrapped/token_identifier.rs |  1 +
 .../src/types/static_buffer/sparse_array.rs   |  1 +
 framework/derive/src/type_abi_derive.rs       |  1 +
 .../generate_proxy/proxy_generator.rs         |  2 +-
 .../src/facade/expr/bech32_address.rs         |  4 +
 51 files changed, 498 insertions(+), 362 deletions(-)

diff --git a/contracts/core/price-aggregator/tests/price_aggregator_proxy.rs b/contracts/core/price-aggregator/tests/price_aggregator_proxy.rs
index fbdab94593..bc84320d13 100644
--- a/contracts/core/price-aggregator/tests/price_aggregator_proxy.rs
+++ b/contracts/core/price-aggregator/tests/price_aggregator_proxy.rs
@@ -44,12 +44,12 @@ where
     Gas: TxGas<Env>,
 {
     pub fn init<
-        Arg0: CodecInto<EgldOrEsdtTokenIdentifier<Env::Api>>,
-        Arg1: CodecInto<BigUint<Env::Api>>,
-        Arg2: CodecInto<BigUint<Env::Api>>,
-        Arg3: CodecInto<usize>,
-        Arg4: CodecInto<usize>,
-        Arg5: CodecInto<MultiValueEncoded<Env::Api, ManagedAddress<Env::Api>>>,
+        Arg0: ProxyArg<EgldOrEsdtTokenIdentifier<Env::Api>>,
+        Arg1: ProxyArg<BigUint<Env::Api>>,
+        Arg2: ProxyArg<BigUint<Env::Api>>,
+        Arg3: ProxyArg<usize>,
+        Arg4: ProxyArg<usize>,
+        Arg5: ProxyArg<MultiValueEncoded<Env::Api, ManagedAddress<Env::Api>>>,
     >(
         self,
         staking_token: Arg0,
@@ -81,8 +81,8 @@ where
     Gas: TxGas<Env>,
 {
     pub fn change_amounts<
-        Arg0: CodecInto<BigUint<Env::Api>>,
-        Arg1: CodecInto<BigUint<Env::Api>>,
+        Arg0: ProxyArg<BigUint<Env::Api>>,
+        Arg1: ProxyArg<BigUint<Env::Api>>,
     >(
         self,
         staking_amount: Arg0,
@@ -96,7 +96,7 @@ where
     }
 
     pub fn add_oracles<
-        Arg0: CodecInto<MultiValueEncoded<Env::Api, ManagedAddress<Env::Api>>>,
+        Arg0: ProxyArg<MultiValueEncoded<Env::Api, ManagedAddress<Env::Api>>>,
     >(
         self,
         oracles: Arg0,
@@ -110,8 +110,8 @@ where
     /// Also receives submission count, 
     /// so the owner does not have to update it manually with setSubmissionCount before this call 
     pub fn remove_oracles<
-        Arg0: CodecInto<usize>,
-        Arg1: CodecInto<MultiValueEncoded<Env::Api, ManagedAddress<Env::Api>>>,
+        Arg0: ProxyArg<usize>,
+        Arg1: ProxyArg<MultiValueEncoded<Env::Api, ManagedAddress<Env::Api>>>,
     >(
         self,
         submission_count: Arg0,
@@ -125,11 +125,11 @@ where
     }
 
     pub fn submit<
-        Arg0: CodecInto<ManagedBuffer<Env::Api>>,
-        Arg1: CodecInto<ManagedBuffer<Env::Api>>,
-        Arg2: CodecInto<u64>,
-        Arg3: CodecInto<BigUint<Env::Api>>,
-        Arg4: CodecInto<u8>,
+        Arg0: ProxyArg<ManagedBuffer<Env::Api>>,
+        Arg1: ProxyArg<ManagedBuffer<Env::Api>>,
+        Arg2: ProxyArg<u64>,
+        Arg3: ProxyArg<BigUint<Env::Api>>,
+        Arg4: ProxyArg<u8>,
     >(
         self,
         from: Arg0,
@@ -149,7 +149,7 @@ where
     }
 
     pub fn submit_batch<
-        Arg0: CodecInto<MultiValueEncoded<Env::Api, MultiValue5<ManagedBuffer<Env::Api>, ManagedBuffer<Env::Api>, u64, BigUint<Env::Api>, u8>>>,
+        Arg0: ProxyArg<MultiValueEncoded<Env::Api, MultiValue5<ManagedBuffer<Env::Api>, ManagedBuffer<Env::Api>, u64, BigUint<Env::Api>, u8>>>,
     >(
         self,
         submissions: Arg0,
@@ -169,8 +169,8 @@ where
     }
 
     pub fn latest_price_feed<
-        Arg0: CodecInto<ManagedBuffer<Env::Api>>,
-        Arg1: CodecInto<ManagedBuffer<Env::Api>>,
+        Arg0: ProxyArg<ManagedBuffer<Env::Api>>,
+        Arg1: ProxyArg<ManagedBuffer<Env::Api>>,
     >(
         self,
         from: Arg0,
@@ -184,8 +184,8 @@ where
     }
 
     pub fn latest_price_feed_optional<
-        Arg0: CodecInto<ManagedBuffer<Env::Api>>,
-        Arg1: CodecInto<ManagedBuffer<Env::Api>>,
+        Arg0: ProxyArg<ManagedBuffer<Env::Api>>,
+        Arg1: ProxyArg<ManagedBuffer<Env::Api>>,
     >(
         self,
         from: Arg0,
@@ -199,7 +199,7 @@ where
     }
 
     pub fn set_submission_count<
-        Arg0: CodecInto<usize>,
+        Arg0: ProxyArg<usize>,
     >(
         self,
         submission_count: Arg0,
@@ -219,9 +219,9 @@ where
     }
 
     pub fn set_pair_decimals<
-        Arg0: CodecInto<ManagedBuffer<Env::Api>>,
-        Arg1: CodecInto<ManagedBuffer<Env::Api>>,
-        Arg2: CodecInto<u8>,
+        Arg0: ProxyArg<ManagedBuffer<Env::Api>>,
+        Arg1: ProxyArg<ManagedBuffer<Env::Api>>,
+        Arg2: ProxyArg<u8>,
     >(
         self,
         from: Arg0,
@@ -237,8 +237,8 @@ where
     }
 
     pub fn get_pair_decimals<
-        Arg0: CodecInto<ManagedBuffer<Env::Api>>,
-        Arg1: CodecInto<ManagedBuffer<Env::Api>>,
+        Arg0: ProxyArg<ManagedBuffer<Env::Api>>,
+        Arg1: ProxyArg<ManagedBuffer<Env::Api>>,
     >(
         self,
         from: Arg0,
@@ -292,7 +292,7 @@ where
     }
 
     pub fn unstake<
-        Arg0: CodecInto<BigUint<Env::Api>>,
+        Arg0: ProxyArg<BigUint<Env::Api>>,
     >(
         self,
         unstake_amount: Arg0,
@@ -304,7 +304,7 @@ where
     }
 
     pub fn vote_slash_member<
-        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
     >(
         self,
         member_to_slash: Arg0,
@@ -316,7 +316,7 @@ where
     }
 
     pub fn cancel_vote_slash_member<
-        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
     >(
         self,
         member_to_slash: Arg0,
@@ -328,7 +328,7 @@ where
     }
 
     pub fn slash_member<
-        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
     >(
         self,
         member_to_slash: Arg0,
diff --git a/contracts/examples/adder/src/adder_proxy.rs b/contracts/examples/adder/src/adder_proxy.rs
index 0b1b663669..b7a7025709 100644
--- a/contracts/examples/adder/src/adder_proxy.rs
+++ b/contracts/examples/adder/src/adder_proxy.rs
@@ -44,7 +44,7 @@ where
     Gas: TxGas<Env>,
 {
     pub fn init<
-        Arg0: CodecInto<BigUint<Env::Api>>,
+        Arg0: ProxyArg<BigUint<Env::Api>>,
     >(
         self,
         initial_value: Arg0,
@@ -66,7 +66,7 @@ where
     Gas: TxGas<Env>,
 {
     pub fn upgrade<
-        Arg0: CodecInto<BigUint<Env::Api>>,
+        Arg0: ProxyArg<BigUint<Env::Api>>,
     >(
         self,
         initial_value: Arg0,
@@ -97,7 +97,7 @@ where
 
     /// Add desired amount to the storage variable. 
     pub fn add<
-        Arg0: CodecInto<BigUint<Env::Api>>,
+        Arg0: ProxyArg<BigUint<Env::Api>>,
     >(
         self,
         value: Arg0,
diff --git a/contracts/examples/crowdfunding-esdt/src/crowdfunding_esdt_proxy.rs b/contracts/examples/crowdfunding-esdt/src/crowdfunding_esdt_proxy.rs
index 385d77ce82..08c8d0ef14 100644
--- a/contracts/examples/crowdfunding-esdt/src/crowdfunding_esdt_proxy.rs
+++ b/contracts/examples/crowdfunding-esdt/src/crowdfunding_esdt_proxy.rs
@@ -44,9 +44,9 @@ where
     Gas: TxGas<Env>,
 {
     pub fn init<
-        Arg0: CodecInto<BigUint<Env::Api>>,
-        Arg1: CodecInto<u64>,
-        Arg2: CodecInto<EgldOrEsdtTokenIdentifier<Env::Api>>,
+        Arg0: ProxyArg<BigUint<Env::Api>>,
+        Arg1: ProxyArg<u64>,
+        Arg2: ProxyArg<EgldOrEsdtTokenIdentifier<Env::Api>>,
     >(
         self,
         target: Arg0,
@@ -120,7 +120,7 @@ where
     }
 
     pub fn deposit<
-        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
     >(
         self,
         donor: Arg0,
diff --git a/contracts/examples/crypto-kitties/kitty-auction/src/kitty_ownership_proxy.rs b/contracts/examples/crypto-kitties/kitty-auction/src/kitty_ownership_proxy.rs
index e43a200ce2..87f5bdb4a2 100644
--- a/contracts/examples/crypto-kitties/kitty-auction/src/kitty_ownership_proxy.rs
+++ b/contracts/examples/crypto-kitties/kitty-auction/src/kitty_ownership_proxy.rs
@@ -44,9 +44,9 @@ where
     Gas: TxGas<Env>,
 {
     pub fn init<
-        Arg0: CodecInto<BigUint<Env::Api>>,
-        Arg1: CodecInto<OptionalValue<ManagedAddress<Env::Api>>>,
-        Arg2: CodecInto<OptionalValue<ManagedAddress<Env::Api>>>,
+        Arg0: ProxyArg<BigUint<Env::Api>>,
+        Arg1: ProxyArg<OptionalValue<ManagedAddress<Env::Api>>>,
+        Arg2: ProxyArg<OptionalValue<ManagedAddress<Env::Api>>>,
     >(
         self,
         birth_fee: Arg0,
@@ -72,7 +72,7 @@ where
     Gas: TxGas<Env>,
 {
     pub fn set_gene_science_contract_address_endpoint<
-        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
     >(
         self,
         address: Arg0,
@@ -84,7 +84,7 @@ where
     }
 
     pub fn set_kitty_auction_contract_address_endpoint<
-        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
     >(
         self,
         address: Arg0,
@@ -112,7 +112,7 @@ where
     }
 
     pub fn balance_of<
-        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
     >(
         self,
         address: Arg0,
@@ -124,7 +124,7 @@ where
     }
 
     pub fn owner_of<
-        Arg0: CodecInto<u32>,
+        Arg0: ProxyArg<u32>,
     >(
         self,
         kitty_id: Arg0,
@@ -136,8 +136,8 @@ where
     }
 
     pub fn approve<
-        Arg0: CodecInto<ManagedAddress<Env::Api>>,
-        Arg1: CodecInto<u32>,
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg1: ProxyArg<u32>,
     >(
         self,
         to: Arg0,
@@ -151,8 +151,8 @@ where
     }
 
     pub fn transfer<
-        Arg0: CodecInto<ManagedAddress<Env::Api>>,
-        Arg1: CodecInto<u32>,
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg1: ProxyArg<u32>,
     >(
         self,
         to: Arg0,
@@ -166,9 +166,9 @@ where
     }
 
     pub fn transfer_from<
-        Arg0: CodecInto<ManagedAddress<Env::Api>>,
-        Arg1: CodecInto<ManagedAddress<Env::Api>>,
-        Arg2: CodecInto<u32>,
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg1: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg2: ProxyArg<u32>,
     >(
         self,
         from: Arg0,
@@ -184,7 +184,7 @@ where
     }
 
     pub fn tokens_of_owner<
-        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
     >(
         self,
         address: Arg0,
@@ -196,8 +196,8 @@ where
     }
 
     pub fn allow_auctioning<
-        Arg0: CodecInto<ManagedAddress<Env::Api>>,
-        Arg1: CodecInto<u32>,
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg1: ProxyArg<u32>,
     >(
         self,
         by: Arg0,
@@ -211,9 +211,9 @@ where
     }
 
     pub fn approve_siring_and_return_kitty<
-        Arg0: CodecInto<ManagedAddress<Env::Api>>,
-        Arg1: CodecInto<ManagedAddress<Env::Api>>,
-        Arg2: CodecInto<u32>,
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg1: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg2: ProxyArg<u32>,
     >(
         self,
         approved_address: Arg0,
@@ -237,7 +237,7 @@ where
     }
 
     pub fn get_kitty_by_id_endpoint<
-        Arg0: CodecInto<u32>,
+        Arg0: ProxyArg<u32>,
     >(
         self,
         kitty_id: Arg0,
@@ -249,7 +249,7 @@ where
     }
 
     pub fn is_ready_to_breed<
-        Arg0: CodecInto<u32>,
+        Arg0: ProxyArg<u32>,
     >(
         self,
         kitty_id: Arg0,
@@ -261,7 +261,7 @@ where
     }
 
     pub fn is_pregnant<
-        Arg0: CodecInto<u32>,
+        Arg0: ProxyArg<u32>,
     >(
         self,
         kitty_id: Arg0,
@@ -273,8 +273,8 @@ where
     }
 
     pub fn can_breed_with<
-        Arg0: CodecInto<u32>,
-        Arg1: CodecInto<u32>,
+        Arg0: ProxyArg<u32>,
+        Arg1: ProxyArg<u32>,
     >(
         self,
         matron_id: Arg0,
@@ -288,8 +288,8 @@ where
     }
 
     pub fn approve_siring<
-        Arg0: CodecInto<ManagedAddress<Env::Api>>,
-        Arg1: CodecInto<u32>,
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg1: ProxyArg<u32>,
     >(
         self,
         address: Arg0,
@@ -303,8 +303,8 @@ where
     }
 
     pub fn breed_with<
-        Arg0: CodecInto<u32>,
-        Arg1: CodecInto<u32>,
+        Arg0: ProxyArg<u32>,
+        Arg1: ProxyArg<u32>,
     >(
         self,
         matron_id: Arg0,
@@ -318,7 +318,7 @@ where
     }
 
     pub fn give_birth<
-        Arg0: CodecInto<u32>,
+        Arg0: ProxyArg<u32>,
     >(
         self,
         matron_id: Arg0,
diff --git a/contracts/examples/crypto-kitties/kitty-ownership/src/kitty_genetic_alg_proxy.rs b/contracts/examples/crypto-kitties/kitty-ownership/src/kitty_genetic_alg_proxy.rs
index 53f3409e9f..1acee7fe43 100644
--- a/contracts/examples/crypto-kitties/kitty-ownership/src/kitty_genetic_alg_proxy.rs
+++ b/contracts/examples/crypto-kitties/kitty-ownership/src/kitty_genetic_alg_proxy.rs
@@ -62,8 +62,8 @@ where
     Gas: TxGas<Env>,
 {
     pub fn generate_kitty_genes<
-        Arg0: CodecInto<kitty::Kitty>,
-        Arg1: CodecInto<kitty::Kitty>,
+        Arg0: ProxyArg<kitty::Kitty>,
+        Arg1: ProxyArg<kitty::Kitty>,
     >(
         self,
         matron: Arg0,
diff --git a/contracts/examples/crypto-zombies/src/kitty_ownership_proxy.rs b/contracts/examples/crypto-zombies/src/kitty_ownership_proxy.rs
index e43a200ce2..87f5bdb4a2 100644
--- a/contracts/examples/crypto-zombies/src/kitty_ownership_proxy.rs
+++ b/contracts/examples/crypto-zombies/src/kitty_ownership_proxy.rs
@@ -44,9 +44,9 @@ where
     Gas: TxGas<Env>,
 {
     pub fn init<
-        Arg0: CodecInto<BigUint<Env::Api>>,
-        Arg1: CodecInto<OptionalValue<ManagedAddress<Env::Api>>>,
-        Arg2: CodecInto<OptionalValue<ManagedAddress<Env::Api>>>,
+        Arg0: ProxyArg<BigUint<Env::Api>>,
+        Arg1: ProxyArg<OptionalValue<ManagedAddress<Env::Api>>>,
+        Arg2: ProxyArg<OptionalValue<ManagedAddress<Env::Api>>>,
     >(
         self,
         birth_fee: Arg0,
@@ -72,7 +72,7 @@ where
     Gas: TxGas<Env>,
 {
     pub fn set_gene_science_contract_address_endpoint<
-        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
     >(
         self,
         address: Arg0,
@@ -84,7 +84,7 @@ where
     }
 
     pub fn set_kitty_auction_contract_address_endpoint<
-        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
     >(
         self,
         address: Arg0,
@@ -112,7 +112,7 @@ where
     }
 
     pub fn balance_of<
-        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
     >(
         self,
         address: Arg0,
@@ -124,7 +124,7 @@ where
     }
 
     pub fn owner_of<
-        Arg0: CodecInto<u32>,
+        Arg0: ProxyArg<u32>,
     >(
         self,
         kitty_id: Arg0,
@@ -136,8 +136,8 @@ where
     }
 
     pub fn approve<
-        Arg0: CodecInto<ManagedAddress<Env::Api>>,
-        Arg1: CodecInto<u32>,
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg1: ProxyArg<u32>,
     >(
         self,
         to: Arg0,
@@ -151,8 +151,8 @@ where
     }
 
     pub fn transfer<
-        Arg0: CodecInto<ManagedAddress<Env::Api>>,
-        Arg1: CodecInto<u32>,
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg1: ProxyArg<u32>,
     >(
         self,
         to: Arg0,
@@ -166,9 +166,9 @@ where
     }
 
     pub fn transfer_from<
-        Arg0: CodecInto<ManagedAddress<Env::Api>>,
-        Arg1: CodecInto<ManagedAddress<Env::Api>>,
-        Arg2: CodecInto<u32>,
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg1: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg2: ProxyArg<u32>,
     >(
         self,
         from: Arg0,
@@ -184,7 +184,7 @@ where
     }
 
     pub fn tokens_of_owner<
-        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
     >(
         self,
         address: Arg0,
@@ -196,8 +196,8 @@ where
     }
 
     pub fn allow_auctioning<
-        Arg0: CodecInto<ManagedAddress<Env::Api>>,
-        Arg1: CodecInto<u32>,
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg1: ProxyArg<u32>,
     >(
         self,
         by: Arg0,
@@ -211,9 +211,9 @@ where
     }
 
     pub fn approve_siring_and_return_kitty<
-        Arg0: CodecInto<ManagedAddress<Env::Api>>,
-        Arg1: CodecInto<ManagedAddress<Env::Api>>,
-        Arg2: CodecInto<u32>,
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg1: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg2: ProxyArg<u32>,
     >(
         self,
         approved_address: Arg0,
@@ -237,7 +237,7 @@ where
     }
 
     pub fn get_kitty_by_id_endpoint<
-        Arg0: CodecInto<u32>,
+        Arg0: ProxyArg<u32>,
     >(
         self,
         kitty_id: Arg0,
@@ -249,7 +249,7 @@ where
     }
 
     pub fn is_ready_to_breed<
-        Arg0: CodecInto<u32>,
+        Arg0: ProxyArg<u32>,
     >(
         self,
         kitty_id: Arg0,
@@ -261,7 +261,7 @@ where
     }
 
     pub fn is_pregnant<
-        Arg0: CodecInto<u32>,
+        Arg0: ProxyArg<u32>,
     >(
         self,
         kitty_id: Arg0,
@@ -273,8 +273,8 @@ where
     }
 
     pub fn can_breed_with<
-        Arg0: CodecInto<u32>,
-        Arg1: CodecInto<u32>,
+        Arg0: ProxyArg<u32>,
+        Arg1: ProxyArg<u32>,
     >(
         self,
         matron_id: Arg0,
@@ -288,8 +288,8 @@ where
     }
 
     pub fn approve_siring<
-        Arg0: CodecInto<ManagedAddress<Env::Api>>,
-        Arg1: CodecInto<u32>,
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg1: ProxyArg<u32>,
     >(
         self,
         address: Arg0,
@@ -303,8 +303,8 @@ where
     }
 
     pub fn breed_with<
-        Arg0: CodecInto<u32>,
-        Arg1: CodecInto<u32>,
+        Arg0: ProxyArg<u32>,
+        Arg1: ProxyArg<u32>,
     >(
         self,
         matron_id: Arg0,
@@ -318,7 +318,7 @@ where
     }
 
     pub fn give_birth<
-        Arg0: CodecInto<u32>,
+        Arg0: ProxyArg<u32>,
     >(
         self,
         matron_id: Arg0,
diff --git a/contracts/examples/crypto-zombies/src/proxy_crypto_zombies.rs b/contracts/examples/crypto-zombies/src/proxy_crypto_zombies.rs
index 1881df3acc..7f490cccbd 100644
--- a/contracts/examples/crypto-zombies/src/proxy_crypto_zombies.rs
+++ b/contracts/examples/crypto-zombies/src/proxy_crypto_zombies.rs
@@ -80,7 +80,7 @@ where
     Gas: TxGas<Env>,
 {
     pub fn set_crypto_kitties_sc_address<
-        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
     >(
         self,
         address: Arg0,
@@ -100,7 +100,7 @@ where
     }
 
     pub fn create_random_zombie<
-        Arg0: CodecInto<ManagedBuffer<Env::Api>>,
+        Arg0: ProxyArg<ManagedBuffer<Env::Api>>,
     >(
         self,
         name: Arg0,
@@ -112,7 +112,7 @@ where
     }
 
     pub fn is_ready<
-        Arg0: CodecInto<usize>,
+        Arg0: ProxyArg<usize>,
     >(
         self,
         zombie_id: Arg0,
@@ -124,8 +124,8 @@ where
     }
 
     pub fn feed_on_kitty<
-        Arg0: CodecInto<usize>,
-        Arg1: CodecInto<u32>,
+        Arg0: ProxyArg<usize>,
+        Arg1: ProxyArg<u32>,
     >(
         self,
         zombie_id: Arg0,
@@ -155,7 +155,7 @@ where
     }
 
     pub fn zombies<
-        Arg0: CodecInto<usize>,
+        Arg0: ProxyArg<usize>,
     >(
         self,
         id: Arg0,
@@ -167,7 +167,7 @@ where
     }
 
     pub fn zombie_owner<
-        Arg0: CodecInto<usize>,
+        Arg0: ProxyArg<usize>,
     >(
         self,
         id: Arg0,
@@ -195,7 +195,7 @@ where
     }
 
     pub fn owned_zombies<
-        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
     >(
         self,
         owner: Arg0,
@@ -207,7 +207,7 @@ where
     }
 
     pub fn level_up<
-        Arg0: CodecInto<usize>,
+        Arg0: ProxyArg<usize>,
     >(
         self,
         zombie_id: Arg0,
@@ -227,8 +227,8 @@ where
     }
 
     pub fn change_name<
-        Arg0: CodecInto<usize>,
-        Arg1: CodecInto<ManagedBuffer<Env::Api>>,
+        Arg0: ProxyArg<usize>,
+        Arg1: ProxyArg<ManagedBuffer<Env::Api>>,
     >(
         self,
         zombie_id: Arg0,
@@ -242,8 +242,8 @@ where
     }
 
     pub fn change_dna<
-        Arg0: CodecInto<usize>,
-        Arg1: CodecInto<u64>,
+        Arg0: ProxyArg<usize>,
+        Arg1: ProxyArg<u64>,
     >(
         self,
         zombie_id: Arg0,
@@ -257,8 +257,8 @@ where
     }
 
     pub fn attack<
-        Arg0: CodecInto<usize>,
-        Arg1: CodecInto<usize>,
+        Arg0: ProxyArg<usize>,
+        Arg1: ProxyArg<usize>,
     >(
         self,
         zombie_id: Arg0,
diff --git a/contracts/examples/digital-cash/src/digital_cash_proxy.rs b/contracts/examples/digital-cash/src/digital_cash_proxy.rs
index 644e17c671..ad7a29fe7e 100644
--- a/contracts/examples/digital-cash/src/digital_cash_proxy.rs
+++ b/contracts/examples/digital-cash/src/digital_cash_proxy.rs
@@ -44,8 +44,8 @@ where
     Gas: TxGas<Env>,
 {
     pub fn init<
-        Arg0: CodecInto<BigUint<Env::Api>>,
-        Arg1: CodecInto<EgldOrEsdtTokenIdentifier<Env::Api>>,
+        Arg0: ProxyArg<BigUint<Env::Api>>,
+        Arg1: ProxyArg<EgldOrEsdtTokenIdentifier<Env::Api>>,
     >(
         self,
         fee: Arg0,
@@ -69,8 +69,8 @@ where
     Gas: TxGas<Env>,
 {
     pub fn whitelist_fee_token<
-        Arg0: CodecInto<BigUint<Env::Api>>,
-        Arg1: CodecInto<EgldOrEsdtTokenIdentifier<Env::Api>>,
+        Arg0: ProxyArg<BigUint<Env::Api>>,
+        Arg1: ProxyArg<EgldOrEsdtTokenIdentifier<Env::Api>>,
     >(
         self,
         fee: Arg0,
@@ -84,7 +84,7 @@ where
     }
 
     pub fn blacklist_fee_token<
-        Arg0: CodecInto<EgldOrEsdtTokenIdentifier<Env::Api>>,
+        Arg0: ProxyArg<EgldOrEsdtTokenIdentifier<Env::Api>>,
     >(
         self,
         token: Arg0,
@@ -104,9 +104,9 @@ where
     }
 
     pub fn get_amount<
-        Arg0: CodecInto<ManagedAddress<Env::Api>>,
-        Arg1: CodecInto<EgldOrEsdtTokenIdentifier<Env::Api>>,
-        Arg2: CodecInto<u64>,
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg1: ProxyArg<EgldOrEsdtTokenIdentifier<Env::Api>>,
+        Arg2: ProxyArg<u64>,
     >(
         self,
         address: Arg0,
@@ -122,8 +122,8 @@ where
     }
 
     pub fn pay_fee_and_fund_esdt<
-        Arg0: CodecInto<ManagedAddress<Env::Api>>,
-        Arg1: CodecInto<u64>,
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg1: ProxyArg<u64>,
     >(
         self,
         address: Arg0,
@@ -137,8 +137,8 @@ where
     }
 
     pub fn pay_fee_and_fund_egld<
-        Arg0: CodecInto<ManagedAddress<Env::Api>>,
-        Arg1: CodecInto<u64>,
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg1: ProxyArg<u64>,
     >(
         self,
         address: Arg0,
@@ -152,8 +152,8 @@ where
     }
 
     pub fn fund<
-        Arg0: CodecInto<ManagedAddress<Env::Api>>,
-        Arg1: CodecInto<u64>,
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg1: ProxyArg<u64>,
     >(
         self,
         address: Arg0,
@@ -167,7 +167,7 @@ where
     }
 
     pub fn deposit_fees<
-        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
     >(
         self,
         address: Arg0,
@@ -179,7 +179,7 @@ where
     }
 
     pub fn withdraw<
-        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
     >(
         self,
         address: Arg0,
@@ -191,8 +191,8 @@ where
     }
 
     pub fn claim<
-        Arg0: CodecInto<ManagedAddress<Env::Api>>,
-        Arg1: CodecInto<ManagedByteArray<Env::Api, 64usize>>,
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg1: ProxyArg<ManagedByteArray<Env::Api, 64usize>>,
     >(
         self,
         address: Arg0,
@@ -206,9 +206,9 @@ where
     }
 
     pub fn forward<
-        Arg0: CodecInto<ManagedAddress<Env::Api>>,
-        Arg1: CodecInto<ManagedAddress<Env::Api>>,
-        Arg2: CodecInto<ManagedByteArray<Env::Api, 64usize>>,
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg1: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg2: ProxyArg<ManagedByteArray<Env::Api, 64usize>>,
     >(
         self,
         address: Arg0,
@@ -224,7 +224,7 @@ where
     }
 
     pub fn deposit<
-        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
     >(
         self,
         donor: Arg0,
diff --git a/contracts/examples/fractional-nfts/src/nft_marketplace_proxy.rs b/contracts/examples/fractional-nfts/src/nft_marketplace_proxy.rs
index c8d8381ac0..b977042583 100644
--- a/contracts/examples/fractional-nfts/src/nft_marketplace_proxy.rs
+++ b/contracts/examples/fractional-nfts/src/nft_marketplace_proxy.rs
@@ -38,9 +38,9 @@ where
     Gas: TxGas<Env>,
 {
     pub fn claim_tokens<
-        Arg0: CodecInto<ManagedAddress<Env::Api>>,
-        Arg1: CodecInto<EgldOrEsdtTokenIdentifier<Env::Api>>,
-        Arg2: CodecInto<u64>,
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg1: ProxyArg<EgldOrEsdtTokenIdentifier<Env::Api>>,
+        Arg2: ProxyArg<u64>,
     >(
         self,
         claim_destination: Arg0,
diff --git a/contracts/examples/multisig/src/multisig_proxy.rs b/contracts/examples/multisig/src/multisig_proxy.rs
index 616fb88be5..1d39617160 100644
--- a/contracts/examples/multisig/src/multisig_proxy.rs
+++ b/contracts/examples/multisig/src/multisig_proxy.rs
@@ -44,8 +44,8 @@ where
     Gas: TxGas<Env>,
 {
     pub fn init<
-        Arg0: CodecInto<usize>,
-        Arg1: CodecInto<MultiValueEncoded<Env::Api, ManagedAddress<Env::Api>>>,
+        Arg0: ProxyArg<usize>,
+        Arg1: ProxyArg<MultiValueEncoded<Env::Api, ManagedAddress<Env::Api>>>,
     >(
         self,
         quorum: Arg0,
@@ -69,8 +69,8 @@ where
     Gas: TxGas<Env>,
 {
     pub fn upgrade<
-        Arg0: CodecInto<usize>,
-        Arg1: CodecInto<MultiValueEncoded<Env::Api, ManagedAddress<Env::Api>>>,
+        Arg0: ProxyArg<usize>,
+        Arg1: ProxyArg<MultiValueEncoded<Env::Api, ManagedAddress<Env::Api>>>,
     >(
         self,
         quorum: Arg0,
@@ -118,8 +118,8 @@ where
     /// Returns `true` (`1`) if the user has signed the action. 
     /// Does not check whether or not the user is still a board member and the signature valid. 
     pub fn signed<
-        Arg0: CodecInto<ManagedAddress<Env::Api>>,
-        Arg1: CodecInto<usize>,
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg1: ProxyArg<usize>,
     >(
         self,
         user: Arg0,
@@ -137,7 +137,7 @@ where
     /// `1` = can propose, but not sign, 
     /// `2` = can propose and sign. 
     pub fn user_role<
-        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
     >(
         self,
         user: Arg0,
@@ -168,7 +168,7 @@ where
 
     /// Used by board members to sign actions. 
     pub fn sign<
-        Arg0: CodecInto<usize>,
+        Arg0: ProxyArg<usize>,
     >(
         self,
         action_id: Arg0,
@@ -182,7 +182,7 @@ where
     /// Board members can withdraw their signatures if they no longer desire for the action to be executed. 
     /// Actions that are left with no valid signatures can be then deleted to free up storage. 
     pub fn unsign<
-        Arg0: CodecInto<usize>,
+        Arg0: ProxyArg<usize>,
     >(
         self,
         action_id: Arg0,
@@ -197,7 +197,7 @@ where
     /// Any signatures that the action received must first be removed, via `unsign`. 
     /// Otherwise this endpoint would be prone to abuse. 
     pub fn discard_action<
-        Arg0: CodecInto<usize>,
+        Arg0: ProxyArg<usize>,
     >(
         self,
         action_id: Arg0,
@@ -249,7 +249,7 @@ where
 
     /// Serialized action data of an action with index. 
     pub fn get_action_data<
-        Arg0: CodecInto<usize>,
+        Arg0: ProxyArg<usize>,
     >(
         self,
         action_id: Arg0,
@@ -264,7 +264,7 @@ where
     /// Does not check if those users are still board members or not, 
     /// so the result may contain invalid signers. 
     pub fn get_action_signers<
-        Arg0: CodecInto<usize>,
+        Arg0: ProxyArg<usize>,
     >(
         self,
         action_id: Arg0,
@@ -278,7 +278,7 @@ where
     /// Gets addresses of all users who signed an action and are still board members. 
     /// All these signatures are currently valid. 
     pub fn get_action_signer_count<
-        Arg0: CodecInto<usize>,
+        Arg0: ProxyArg<usize>,
     >(
         self,
         action_id: Arg0,
@@ -295,7 +295,7 @@ where
     /// This function is used to validate the signers before performing an action. 
     /// It also makes it easy to check before performing an action. 
     pub fn get_action_valid_signer_count<
-        Arg0: CodecInto<usize>,
+        Arg0: ProxyArg<usize>,
     >(
         self,
         action_id: Arg0,
@@ -309,7 +309,7 @@ where
     /// Initiates board member addition process. 
     /// Can also be used to promote a proposer to board member. 
     pub fn propose_add_board_member<
-        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
     >(
         self,
         board_member_address: Arg0,
@@ -323,7 +323,7 @@ where
     /// Initiates proposer addition process.. 
     /// Can also be used to demote a board member to proposer. 
     pub fn propose_add_proposer<
-        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
     >(
         self,
         proposer_address: Arg0,
@@ -336,7 +336,7 @@ where
 
     /// Removes user regardless of whether it is a board member or proposer. 
     pub fn propose_remove_user<
-        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
     >(
         self,
         user_address: Arg0,
@@ -348,7 +348,7 @@ where
     }
 
     pub fn propose_change_quorum<
-        Arg0: CodecInto<usize>,
+        Arg0: ProxyArg<usize>,
     >(
         self,
         new_quorum: Arg0,
@@ -364,9 +364,9 @@ where
     /// Can call smart contract endpoints directly. 
     /// Doesn't really work with builtin functions. 
     pub fn propose_transfer_execute<
-        Arg0: CodecInto<ManagedAddress<Env::Api>>,
-        Arg1: CodecInto<BigUint<Env::Api>>,
-        Arg2: CodecInto<FunctionCall<Env::Api>>,
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg1: ProxyArg<BigUint<Env::Api>>,
+        Arg2: ProxyArg<FunctionCall<Env::Api>>,
     >(
         self,
         to: Arg0,
@@ -387,9 +387,9 @@ where
     /// Works well with builtin functions. 
     /// Cannot simply send EGLD directly without calling anything. 
     pub fn propose_async_call<
-        Arg0: CodecInto<ManagedAddress<Env::Api>>,
-        Arg1: CodecInto<BigUint<Env::Api>>,
-        Arg2: CodecInto<FunctionCall<Env::Api>>,
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg1: ProxyArg<BigUint<Env::Api>>,
+        Arg2: ProxyArg<FunctionCall<Env::Api>>,
     >(
         self,
         to: Arg0,
@@ -405,10 +405,10 @@ where
     }
 
     pub fn propose_sc_deploy_from_source<
-        Arg0: CodecInto<BigUint<Env::Api>>,
-        Arg1: CodecInto<ManagedAddress<Env::Api>>,
-        Arg2: CodecInto<CodeMetadata>,
-        Arg3: CodecInto<MultiValueEncoded<Env::Api, ManagedBuffer<Env::Api>>>,
+        Arg0: ProxyArg<BigUint<Env::Api>>,
+        Arg1: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg2: ProxyArg<CodeMetadata>,
+        Arg3: ProxyArg<MultiValueEncoded<Env::Api, ManagedBuffer<Env::Api>>>,
     >(
         self,
         amount: Arg0,
@@ -426,11 +426,11 @@ where
     }
 
     pub fn propose_sc_upgrade_from_source<
-        Arg0: CodecInto<ManagedAddress<Env::Api>>,
-        Arg1: CodecInto<BigUint<Env::Api>>,
-        Arg2: CodecInto<ManagedAddress<Env::Api>>,
-        Arg3: CodecInto<CodeMetadata>,
-        Arg4: CodecInto<MultiValueEncoded<Env::Api, ManagedBuffer<Env::Api>>>,
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg1: ProxyArg<BigUint<Env::Api>>,
+        Arg2: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg3: ProxyArg<CodeMetadata>,
+        Arg4: ProxyArg<MultiValueEncoded<Env::Api, ManagedBuffer<Env::Api>>>,
     >(
         self,
         sc_address: Arg0,
@@ -451,7 +451,7 @@ where
 
     /// Returns `true` (`1`) if `getActionValidSignerCount >= getQuorum`. 
     pub fn quorum_reached<
-        Arg0: CodecInto<usize>,
+        Arg0: ProxyArg<usize>,
     >(
         self,
         action_id: Arg0,
@@ -464,7 +464,7 @@ where
 
     /// Proposers and board members use this to launch signed actions. 
     pub fn perform_action_endpoint<
-        Arg0: CodecInto<usize>,
+        Arg0: ProxyArg<usize>,
     >(
         self,
         action_id: Arg0,
@@ -476,8 +476,8 @@ where
     }
 
     pub fn dns_register<
-        Arg0: CodecInto<ManagedAddress<Env::Api>>,
-        Arg1: CodecInto<ManagedBuffer<Env::Api>>,
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg1: ProxyArg<ManagedBuffer<Env::Api>>,
     >(
         self,
         dns_address: Arg0,
diff --git a/contracts/examples/nft-minter/src/nft_marketplace_proxy.rs b/contracts/examples/nft-minter/src/nft_marketplace_proxy.rs
index 7dbe98ed89..7c6028d1fd 100644
--- a/contracts/examples/nft-minter/src/nft_marketplace_proxy.rs
+++ b/contracts/examples/nft-minter/src/nft_marketplace_proxy.rs
@@ -36,9 +36,9 @@ where
     Gas: TxGas<Env>,
 {
     pub fn claim_tokens<
-        Arg0: CodecInto<TokenIdentifier<Env::Api>>,
-        Arg1: CodecInto<u64>,
-        Arg2: CodecInto<ManagedAddress<Env::Api>>,
+        Arg0: ProxyArg<TokenIdentifier<Env::Api>>,
+        Arg1: ProxyArg<u64>,
+        Arg2: ProxyArg<ManagedAddress<Env::Api>>,
     >(
         self,
         token_id: Arg0,
diff --git a/contracts/examples/rewards-distribution/src/rewards_distribution_proxy.rs b/contracts/examples/rewards-distribution/src/rewards_distribution_proxy.rs
index 4a02c6c098..83ec15b473 100644
--- a/contracts/examples/rewards-distribution/src/rewards_distribution_proxy.rs
+++ b/contracts/examples/rewards-distribution/src/rewards_distribution_proxy.rs
@@ -44,8 +44,8 @@ where
     Gas: TxGas<Env>,
 {
     pub fn init<
-        Arg0: CodecInto<ManagedAddress<Env::Api>>,
-        Arg1: CodecInto<ManagedVec<Env::Api, Bracket>>,
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg1: ProxyArg<ManagedVec<Env::Api, Bracket>>,
     >(
         self,
         seed_nft_minter_address: Arg0,
@@ -85,9 +85,9 @@ where
     }
 
     pub fn claim_rewards<
-        Arg0: CodecInto<u64>,
-        Arg1: CodecInto<u64>,
-        Arg2: CodecInto<MultiValueEncoded<Env::Api, MultiValue2<EgldOrEsdtTokenIdentifier<Env::Api>, u64>>>,
+        Arg0: ProxyArg<u64>,
+        Arg1: ProxyArg<u64>,
+        Arg2: ProxyArg<MultiValueEncoded<Env::Api, MultiValue2<EgldOrEsdtTokenIdentifier<Env::Api>, u64>>>,
     >(
         self,
         raffle_id_start: Arg0,
@@ -103,10 +103,10 @@ where
     }
 
     pub fn compute_claimable_amount<
-        Arg0: CodecInto<u64>,
-        Arg1: CodecInto<EgldOrEsdtTokenIdentifier<Env::Api>>,
-        Arg2: CodecInto<u64>,
-        Arg3: CodecInto<u64>,
+        Arg0: ProxyArg<u64>,
+        Arg1: ProxyArg<EgldOrEsdtTokenIdentifier<Env::Api>>,
+        Arg2: ProxyArg<u64>,
+        Arg3: ProxyArg<u64>,
     >(
         self,
         raffle_id: Arg0,
@@ -140,9 +140,9 @@ where
     }
 
     pub fn royalties<
-        Arg0: CodecInto<u64>,
-        Arg1: CodecInto<EgldOrEsdtTokenIdentifier<Env::Api>>,
-        Arg2: CodecInto<u64>,
+        Arg0: ProxyArg<u64>,
+        Arg1: ProxyArg<EgldOrEsdtTokenIdentifier<Env::Api>>,
+        Arg2: ProxyArg<u64>,
     >(
         self,
         raffle_id: Arg0,
@@ -158,8 +158,8 @@ where
     }
 
     pub fn nft_reward_percent<
-        Arg0: CodecInto<u64>,
-        Arg1: CodecInto<u64>,
+        Arg0: ProxyArg<u64>,
+        Arg1: ProxyArg<u64>,
     >(
         self,
         raffle_id: Arg0,
@@ -173,10 +173,10 @@ where
     }
 
     pub fn was_claimed<
-        Arg0: CodecInto<u64>,
-        Arg1: CodecInto<EgldOrEsdtTokenIdentifier<Env::Api>>,
-        Arg2: CodecInto<u64>,
-        Arg3: CodecInto<u64>,
+        Arg0: ProxyArg<u64>,
+        Arg1: ProxyArg<EgldOrEsdtTokenIdentifier<Env::Api>>,
+        Arg2: ProxyArg<u64>,
+        Arg3: ProxyArg<u64>,
     >(
         self,
         raffle_id: Arg0,
@@ -226,6 +226,7 @@ where
     }
 }
 
+#[type_abi]
 #[derive(ManagedVecItem, NestedEncode, NestedDecode)]
 pub struct Bracket {
     pub index_percent: u64,
diff --git a/contracts/examples/rewards-distribution/src/seed_nft_minter_proxy.rs b/contracts/examples/rewards-distribution/src/seed_nft_minter_proxy.rs
index 10047be064..49186da9ce 100644
--- a/contracts/examples/rewards-distribution/src/seed_nft_minter_proxy.rs
+++ b/contracts/examples/rewards-distribution/src/seed_nft_minter_proxy.rs
@@ -44,8 +44,8 @@ where
     Gas: TxGas<Env>,
 {
     pub fn init<
-        Arg0: CodecInto<ManagedVec<Env::Api, ManagedAddress<Env::Api>>>,
-        Arg1: CodecInto<ManagedVec<Env::Api, Distribution<Env::Api>>>,
+        Arg0: ProxyArg<ManagedVec<Env::Api, ManagedAddress<Env::Api>>>,
+        Arg1: ProxyArg<ManagedVec<Env::Api, Distribution<Env::Api>>>,
     >(
         self,
         marketplaces: Arg0,
@@ -69,12 +69,12 @@ where
     Gas: TxGas<Env>,
 {
     pub fn create_nft<
-        Arg0: CodecInto<ManagedBuffer<Env::Api>>,
-        Arg1: CodecInto<BigUint<Env::Api>>,
-        Arg2: CodecInto<ManagedBuffer<Env::Api>>,
-        Arg3: CodecInto<BigUint<Env::Api>>,
-        Arg4: CodecInto<OptionalValue<TokenIdentifier<Env::Api>>>,
-        Arg5: CodecInto<OptionalValue<u64>>,
+        Arg0: ProxyArg<ManagedBuffer<Env::Api>>,
+        Arg1: ProxyArg<BigUint<Env::Api>>,
+        Arg2: ProxyArg<ManagedBuffer<Env::Api>>,
+        Arg3: ProxyArg<BigUint<Env::Api>>,
+        Arg4: ProxyArg<OptionalValue<TokenIdentifier<Env::Api>>>,
+        Arg5: ProxyArg<OptionalValue<u64>>,
     >(
         self,
         name: Arg0,
@@ -96,8 +96,8 @@ where
     }
 
     pub fn claim_and_distribute<
-        Arg0: CodecInto<EgldOrEsdtTokenIdentifier<Env::Api>>,
-        Arg1: CodecInto<u64>,
+        Arg0: ProxyArg<EgldOrEsdtTokenIdentifier<Env::Api>>,
+        Arg1: ProxyArg<u64>,
     >(
         self,
         token_id: Arg0,
@@ -135,8 +135,8 @@ where
     }
 
     pub fn issue_token<
-        Arg0: CodecInto<ManagedBuffer<Env::Api>>,
-        Arg1: CodecInto<ManagedBuffer<Env::Api>>,
+        Arg0: ProxyArg<ManagedBuffer<Env::Api>>,
+        Arg1: ProxyArg<ManagedBuffer<Env::Api>>,
     >(
         self,
         token_display_name: Arg0,
@@ -150,7 +150,7 @@ where
     }
 
     pub fn buy_nft<
-        Arg0: CodecInto<u64>,
+        Arg0: ProxyArg<u64>,
     >(
         self,
         nft_nonce: Arg0,
@@ -162,7 +162,7 @@ where
     }
 
     pub fn get_nft_price<
-        Arg0: CodecInto<u64>,
+        Arg0: ProxyArg<u64>,
     >(
         self,
         nft_nonce: Arg0,
diff --git a/contracts/examples/rewards-distribution/tests/mock_seed_nft_minter_proxy.rs b/contracts/examples/rewards-distribution/tests/mock_seed_nft_minter_proxy.rs
index 22d9e055cd..379b8e0d05 100644
--- a/contracts/examples/rewards-distribution/tests/mock_seed_nft_minter_proxy.rs
+++ b/contracts/examples/rewards-distribution/tests/mock_seed_nft_minter_proxy.rs
@@ -35,7 +35,7 @@ where
     Gas: TxGas<Env>,
 {
     pub fn init<
-        Arg0: CodecInto<TokenIdentifier<Env::Api>>,
+        Arg0: ProxyArg<TokenIdentifier<Env::Api>>,
     >(
         self,
         nft_token_id: Arg0,
@@ -57,7 +57,7 @@ where
     Gas: TxGas<Env>,
 {
     pub fn set_nft_count<
-        Arg0: CodecInto<u64>,
+        Arg0: ProxyArg<u64>,
     >(
         self,
         nft_count: Arg0,
diff --git a/contracts/examples/seed-nft-minter/src/nft_marketplace_proxy.rs b/contracts/examples/seed-nft-minter/src/nft_marketplace_proxy.rs
index 8cbc28e5df..e41b477e03 100644
--- a/contracts/examples/seed-nft-minter/src/nft_marketplace_proxy.rs
+++ b/contracts/examples/seed-nft-minter/src/nft_marketplace_proxy.rs
@@ -55,9 +55,9 @@ where
     Gas: TxGas<Env>,
 {
     pub fn claim_tokens<
-        Arg0: CodecInto<ManagedAddress<Env::Api>>,
-        Arg1: CodecInto<EgldOrEsdtTokenIdentifier<Env::Api>>,
-        Arg2: CodecInto<u64>,
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg1: ProxyArg<EgldOrEsdtTokenIdentifier<Env::Api>>,
+        Arg2: ProxyArg<u64>,
     >(
         self,
         claim_destination: Arg0,
diff --git a/contracts/feature-tests/abi-tester/src/abi_proxy.rs b/contracts/feature-tests/abi-tester/src/abi_proxy.rs
index feea268d49..a91b6d1961 100644
--- a/contracts/feature-tests/abi-tester/src/abi_proxy.rs
+++ b/contracts/feature-tests/abi-tester/src/abi_proxy.rs
@@ -45,8 +45,8 @@ where
 {
     /// Contract constructor. 
     pub fn init<
-        Arg0: CodecInto<i32>,
-        Arg1: CodecInto<OnlyShowsUpInConstructor>,
+        Arg0: ProxyArg<i32>,
+        Arg1: ProxyArg<OnlyShowsUpInConstructor>,
     >(
         self,
         _constructor_arg_1: Arg0,
@@ -71,8 +71,8 @@ where
 {
     /// Upgrade constructor. 
     pub fn upgrade<
-        Arg0: CodecInto<i32>,
-        Arg1: CodecInto<OnlyShowsUpInConstructor>,
+        Arg0: ProxyArg<i32>,
+        Arg1: ProxyArg<OnlyShowsUpInConstructor>,
     >(
         self,
         _constructor_arg_1: Arg0,
@@ -97,7 +97,7 @@ where
 {
     /// Example endpoint docs. 
     pub fn echo_abi_test_type<
-        Arg0: CodecInto<AbiTestType>,
+        Arg0: ProxyArg<AbiTestType>,
     >(
         self,
         att: Arg0,
@@ -109,7 +109,7 @@ where
     }
 
     pub fn echo_enum<
-        Arg0: CodecInto<AbiEnum>,
+        Arg0: ProxyArg<AbiEnum>,
     >(
         self,
         e: Arg0,
@@ -121,7 +121,7 @@ where
     }
 
     pub fn take_managed_type<
-        Arg0: CodecInto<AbiManagedType<Env::Api>>,
+        Arg0: ProxyArg<AbiManagedType<Env::Api>>,
     >(
         self,
         _arg: Arg0,
@@ -149,8 +149,8 @@ where
     }
 
     pub fn var_args<
-        Arg0: CodecInto<u32>,
-        Arg1: CodecInto<MultiValueVec<MultiValue2<OnlyShowsUpAsNested04, i32>>>,
+        Arg0: ProxyArg<u32>,
+        Arg1: ProxyArg<MultiValueVec<MultiValue2<OnlyShowsUpAsNested04, i32>>>,
     >(
         self,
         _simple_arg: Arg0,
@@ -172,8 +172,8 @@ where
     }
 
     pub fn optional_arg<
-        Arg0: CodecInto<u32>,
-        Arg1: CodecInto<OptionalValue<OnlyShowsUpAsNested06>>,
+        Arg0: ProxyArg<u32>,
+        Arg1: ProxyArg<OptionalValue<OnlyShowsUpAsNested06>>,
     >(
         self,
         _simple_arg: Arg0,
@@ -195,8 +195,8 @@ where
     }
 
     pub fn address_vs_h256<
-        Arg0: CodecInto<Address>,
-        Arg1: CodecInto<H256>,
+        Arg0: ProxyArg<Address>,
+        Arg1: ProxyArg<H256>,
     >(
         self,
         address: Arg0,
@@ -210,8 +210,8 @@ where
     }
 
     pub fn managed_address_vs_byte_array<
-        Arg0: CodecInto<ManagedAddress<Env::Api>>,
-        Arg1: CodecInto<ManagedByteArray<Env::Api, 32usize>>,
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg1: ProxyArg<ManagedByteArray<Env::Api, 32usize>>,
     >(
         self,
         address: Arg0,
@@ -281,7 +281,7 @@ where
     }
 
     pub fn item_for_array<
-        Arg0: CodecInto<[OnlyShowsUpAsNestedInArray; 5]>,
+        Arg0: ProxyArg<[OnlyShowsUpAsNestedInArray; 5]>,
     >(
         self,
         _array: Arg0,
@@ -309,7 +309,7 @@ where
     }
 
     pub fn item_for_ref<
-        Arg0: CodecInto<OnlyShowsUpAsNestedInRef>,
+        Arg0: ProxyArg<OnlyShowsUpAsNestedInRef>,
     >(
         self,
         _ref: Arg0,
@@ -321,7 +321,7 @@ where
     }
 
     pub fn item_for_slice<
-        Arg0: CodecInto<Box<[OnlyShowsUpAsNestedInSlice]>>,
+        Arg0: ProxyArg<Box<[OnlyShowsUpAsNestedInSlice]>>,
     >(
         self,
         _ref: Arg0,
diff --git a/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/parent/src/child_proxy.rs b/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/parent/src/child_proxy.rs
index bb3e97cc56..b4808f8eba 100644
--- a/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/parent/src/child_proxy.rs
+++ b/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/parent/src/child_proxy.rs
@@ -62,9 +62,9 @@ where
     Gas: TxGas<Env>,
 {
     pub fn issue_wrapped_egld<
-        Arg0: CodecInto<ManagedBuffer<Env::Api>>,
-        Arg1: CodecInto<ManagedBuffer<Env::Api>>,
-        Arg2: CodecInto<BigUint<Env::Api>>,
+        Arg0: ProxyArg<ManagedBuffer<Env::Api>>,
+        Arg1: ProxyArg<ManagedBuffer<Env::Api>>,
+        Arg2: ProxyArg<BigUint<Env::Api>>,
     >(
         self,
         token_display_name: Arg0,
diff --git a/contracts/feature-tests/composability/forwarder/src/vault_proxy.rs b/contracts/feature-tests/composability/forwarder/src/vault_proxy.rs
index 656db40983..c43f59c36a 100644
--- a/contracts/feature-tests/composability/forwarder/src/vault_proxy.rs
+++ b/contracts/feature-tests/composability/forwarder/src/vault_proxy.rs
@@ -44,7 +44,7 @@ where
     Gas: TxGas<Env>,
 {
     pub fn init<
-        Arg0: CodecInto<OptionalValue<ManagedBuffer<Env::Api>>>,
+        Arg0: ProxyArg<OptionalValue<ManagedBuffer<Env::Api>>>,
     >(
         self,
         opt_arg_to_echo: Arg0,
@@ -66,7 +66,7 @@ where
     Gas: TxGas<Env>,
 {
     pub fn upgrade<
-        Arg0: CodecInto<OptionalValue<ManagedBuffer<Env::Api>>>,
+        Arg0: ProxyArg<OptionalValue<ManagedBuffer<Env::Api>>>,
     >(
         self,
         opt_arg_to_echo: Arg0,
@@ -88,7 +88,7 @@ where
     Gas: TxGas<Env>,
 {
     pub fn echo_arguments<
-        Arg0: CodecInto<MultiValueEncoded<Env::Api, ManagedBuffer<Env::Api>>>,
+        Arg0: ProxyArg<MultiValueEncoded<Env::Api, ManagedBuffer<Env::Api>>>,
     >(
         self,
         args: Arg0,
@@ -100,7 +100,7 @@ where
     }
 
     pub fn echo_arguments_without_storage<
-        Arg0: CodecInto<MultiValueEncoded<Env::Api, ManagedBuffer<Env::Api>>>,
+        Arg0: ProxyArg<MultiValueEncoded<Env::Api, ManagedBuffer<Env::Api>>>,
     >(
         self,
         args: Arg0,
@@ -152,9 +152,9 @@ where
     }
 
     pub fn retrieve_funds_with_transfer_exec<
-        Arg0: CodecInto<TokenIdentifier<Env::Api>>,
-        Arg1: CodecInto<BigUint<Env::Api>>,
-        Arg2: CodecInto<OptionalValue<ManagedBuffer<Env::Api>>>,
+        Arg0: ProxyArg<TokenIdentifier<Env::Api>>,
+        Arg1: ProxyArg<BigUint<Env::Api>>,
+        Arg2: ProxyArg<OptionalValue<ManagedBuffer<Env::Api>>>,
     >(
         self,
         token: Arg0,
@@ -170,8 +170,8 @@ where
     }
 
     pub fn retrieve_funds_promises<
-        Arg0: CodecInto<OptionalValue<u64>>,
-        Arg1: CodecInto<OptionalValue<BigUint<Env::Api>>>,
+        Arg0: ProxyArg<OptionalValue<u64>>,
+        Arg1: ProxyArg<OptionalValue<BigUint<Env::Api>>>,
     >(
         self,
         back_transfers: Arg0,
@@ -185,9 +185,9 @@ where
     }
 
     pub fn retrieve_funds<
-        Arg0: CodecInto<EgldOrEsdtTokenIdentifier<Env::Api>>,
-        Arg1: CodecInto<u64>,
-        Arg2: CodecInto<BigUint<Env::Api>>,
+        Arg0: ProxyArg<EgldOrEsdtTokenIdentifier<Env::Api>>,
+        Arg1: ProxyArg<u64>,
+        Arg2: ProxyArg<BigUint<Env::Api>>,
     >(
         self,
         token: Arg0,
@@ -203,7 +203,7 @@ where
     }
 
     pub fn retrieve_multi_funds_async<
-        Arg0: CodecInto<MultiValueEncoded<Env::Api, MultiValue3<TokenIdentifier<Env::Api>, u64, BigUint<Env::Api>>>>,
+        Arg0: ProxyArg<MultiValueEncoded<Env::Api, MultiValue3<TokenIdentifier<Env::Api>, u64, BigUint<Env::Api>>>>,
     >(
         self,
         token_payments: Arg0,
@@ -233,7 +233,7 @@ where
     /// We already leave a trace of the calls using the event logs; 
     /// this additional counter has the role of showing that storage also gets saved correctly. 
     pub fn call_counts<
-        Arg0: CodecInto<ManagedBuffer<Env::Api>>,
+        Arg0: ProxyArg<ManagedBuffer<Env::Api>>,
     >(
         self,
         endpoint: Arg0,
diff --git a/contracts/feature-tests/composability/promises-features/src/vault_proxy.rs b/contracts/feature-tests/composability/promises-features/src/vault_proxy.rs
index 656db40983..c43f59c36a 100644
--- a/contracts/feature-tests/composability/promises-features/src/vault_proxy.rs
+++ b/contracts/feature-tests/composability/promises-features/src/vault_proxy.rs
@@ -44,7 +44,7 @@ where
     Gas: TxGas<Env>,
 {
     pub fn init<
-        Arg0: CodecInto<OptionalValue<ManagedBuffer<Env::Api>>>,
+        Arg0: ProxyArg<OptionalValue<ManagedBuffer<Env::Api>>>,
     >(
         self,
         opt_arg_to_echo: Arg0,
@@ -66,7 +66,7 @@ where
     Gas: TxGas<Env>,
 {
     pub fn upgrade<
-        Arg0: CodecInto<OptionalValue<ManagedBuffer<Env::Api>>>,
+        Arg0: ProxyArg<OptionalValue<ManagedBuffer<Env::Api>>>,
     >(
         self,
         opt_arg_to_echo: Arg0,
@@ -88,7 +88,7 @@ where
     Gas: TxGas<Env>,
 {
     pub fn echo_arguments<
-        Arg0: CodecInto<MultiValueEncoded<Env::Api, ManagedBuffer<Env::Api>>>,
+        Arg0: ProxyArg<MultiValueEncoded<Env::Api, ManagedBuffer<Env::Api>>>,
     >(
         self,
         args: Arg0,
@@ -100,7 +100,7 @@ where
     }
 
     pub fn echo_arguments_without_storage<
-        Arg0: CodecInto<MultiValueEncoded<Env::Api, ManagedBuffer<Env::Api>>>,
+        Arg0: ProxyArg<MultiValueEncoded<Env::Api, ManagedBuffer<Env::Api>>>,
     >(
         self,
         args: Arg0,
@@ -152,9 +152,9 @@ where
     }
 
     pub fn retrieve_funds_with_transfer_exec<
-        Arg0: CodecInto<TokenIdentifier<Env::Api>>,
-        Arg1: CodecInto<BigUint<Env::Api>>,
-        Arg2: CodecInto<OptionalValue<ManagedBuffer<Env::Api>>>,
+        Arg0: ProxyArg<TokenIdentifier<Env::Api>>,
+        Arg1: ProxyArg<BigUint<Env::Api>>,
+        Arg2: ProxyArg<OptionalValue<ManagedBuffer<Env::Api>>>,
     >(
         self,
         token: Arg0,
@@ -170,8 +170,8 @@ where
     }
 
     pub fn retrieve_funds_promises<
-        Arg0: CodecInto<OptionalValue<u64>>,
-        Arg1: CodecInto<OptionalValue<BigUint<Env::Api>>>,
+        Arg0: ProxyArg<OptionalValue<u64>>,
+        Arg1: ProxyArg<OptionalValue<BigUint<Env::Api>>>,
     >(
         self,
         back_transfers: Arg0,
@@ -185,9 +185,9 @@ where
     }
 
     pub fn retrieve_funds<
-        Arg0: CodecInto<EgldOrEsdtTokenIdentifier<Env::Api>>,
-        Arg1: CodecInto<u64>,
-        Arg2: CodecInto<BigUint<Env::Api>>,
+        Arg0: ProxyArg<EgldOrEsdtTokenIdentifier<Env::Api>>,
+        Arg1: ProxyArg<u64>,
+        Arg2: ProxyArg<BigUint<Env::Api>>,
     >(
         self,
         token: Arg0,
@@ -203,7 +203,7 @@ where
     }
 
     pub fn retrieve_multi_funds_async<
-        Arg0: CodecInto<MultiValueEncoded<Env::Api, MultiValue3<TokenIdentifier<Env::Api>, u64, BigUint<Env::Api>>>>,
+        Arg0: ProxyArg<MultiValueEncoded<Env::Api, MultiValue3<TokenIdentifier<Env::Api>, u64, BigUint<Env::Api>>>>,
     >(
         self,
         token_payments: Arg0,
@@ -233,7 +233,7 @@ where
     /// We already leave a trace of the calls using the event logs; 
     /// this additional counter has the role of showing that storage also gets saved correctly. 
     pub fn call_counts<
-        Arg0: CodecInto<ManagedBuffer<Env::Api>>,
+        Arg0: ProxyArg<ManagedBuffer<Env::Api>>,
     >(
         self,
         endpoint: Arg0,
diff --git a/contracts/feature-tests/composability/proxy-test-first/src/message_me_proxy.rs b/contracts/feature-tests/composability/proxy-test-first/src/message_me_proxy.rs
index 2a4242c2f2..4609a3a0bd 100644
--- a/contracts/feature-tests/composability/proxy-test-first/src/message_me_proxy.rs
+++ b/contracts/feature-tests/composability/proxy-test-first/src/message_me_proxy.rs
@@ -44,7 +44,7 @@ where
     Gas: TxGas<Env>,
 {
     pub fn init<
-        Arg0: CodecInto<i32>,
+        Arg0: ProxyArg<i32>,
     >(
         self,
         init_arg: Arg0,
@@ -84,10 +84,10 @@ where
     Gas: TxGas<Env>,
 {
     pub fn message_me<
-        Arg0: CodecInto<i64>,
-        Arg1: CodecInto<BigUint<Env::Api>>,
-        Arg2: CodecInto<Vec<u8>>,
-        Arg3: CodecInto<ManagedAddress<Env::Api>>,
+        Arg0: ProxyArg<i64>,
+        Arg1: ProxyArg<BigUint<Env::Api>>,
+        Arg2: ProxyArg<Vec<u8>>,
+        Arg3: ProxyArg<ManagedAddress<Env::Api>>,
     >(
         self,
         arg1: Arg0,
diff --git a/contracts/feature-tests/composability/proxy-test-first/src/pay_me_proxy.rs b/contracts/feature-tests/composability/proxy-test-first/src/pay_me_proxy.rs
index ff801b93f9..cfd32f2516 100644
--- a/contracts/feature-tests/composability/proxy-test-first/src/pay_me_proxy.rs
+++ b/contracts/feature-tests/composability/proxy-test-first/src/pay_me_proxy.rs
@@ -80,7 +80,7 @@ where
     Gas: TxGas<Env>,
 {
     pub fn pay_me<
-        Arg0: CodecInto<i64>,
+        Arg0: ProxyArg<i64>,
     >(
         self,
         arg1: Arg0,
@@ -92,7 +92,7 @@ where
     }
 
     pub fn pay_me_with_result<
-        Arg0: CodecInto<i64>,
+        Arg0: ProxyArg<i64>,
     >(
         self,
         arg1: Arg0,
diff --git a/contracts/feature-tests/composability/recursive-caller/src/self_proxy.rs b/contracts/feature-tests/composability/recursive-caller/src/self_proxy.rs
index bda44ef4b3..7fd86a1c8f 100644
--- a/contracts/feature-tests/composability/recursive-caller/src/self_proxy.rs
+++ b/contracts/feature-tests/composability/recursive-caller/src/self_proxy.rs
@@ -62,10 +62,10 @@ where
     Gas: TxGas<Env>,
 {
     pub fn recursive_send_funds<
-        Arg0: CodecInto<ManagedAddress<Env::Api>>,
-        Arg1: CodecInto<EgldOrEsdtTokenIdentifier<Env::Api>>,
-        Arg2: CodecInto<BigUint<Env::Api>>,
-        Arg3: CodecInto<u32>,
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg1: ProxyArg<EgldOrEsdtTokenIdentifier<Env::Api>>,
+        Arg2: ProxyArg<BigUint<Env::Api>>,
+        Arg3: ProxyArg<u32>,
     >(
         self,
         to: Arg0,
diff --git a/contracts/feature-tests/composability/recursive-caller/src/vault_proxy.rs b/contracts/feature-tests/composability/recursive-caller/src/vault_proxy.rs
index 656db40983..c43f59c36a 100644
--- a/contracts/feature-tests/composability/recursive-caller/src/vault_proxy.rs
+++ b/contracts/feature-tests/composability/recursive-caller/src/vault_proxy.rs
@@ -44,7 +44,7 @@ where
     Gas: TxGas<Env>,
 {
     pub fn init<
-        Arg0: CodecInto<OptionalValue<ManagedBuffer<Env::Api>>>,
+        Arg0: ProxyArg<OptionalValue<ManagedBuffer<Env::Api>>>,
     >(
         self,
         opt_arg_to_echo: Arg0,
@@ -66,7 +66,7 @@ where
     Gas: TxGas<Env>,
 {
     pub fn upgrade<
-        Arg0: CodecInto<OptionalValue<ManagedBuffer<Env::Api>>>,
+        Arg0: ProxyArg<OptionalValue<ManagedBuffer<Env::Api>>>,
     >(
         self,
         opt_arg_to_echo: Arg0,
@@ -88,7 +88,7 @@ where
     Gas: TxGas<Env>,
 {
     pub fn echo_arguments<
-        Arg0: CodecInto<MultiValueEncoded<Env::Api, ManagedBuffer<Env::Api>>>,
+        Arg0: ProxyArg<MultiValueEncoded<Env::Api, ManagedBuffer<Env::Api>>>,
     >(
         self,
         args: Arg0,
@@ -100,7 +100,7 @@ where
     }
 
     pub fn echo_arguments_without_storage<
-        Arg0: CodecInto<MultiValueEncoded<Env::Api, ManagedBuffer<Env::Api>>>,
+        Arg0: ProxyArg<MultiValueEncoded<Env::Api, ManagedBuffer<Env::Api>>>,
     >(
         self,
         args: Arg0,
@@ -152,9 +152,9 @@ where
     }
 
     pub fn retrieve_funds_with_transfer_exec<
-        Arg0: CodecInto<TokenIdentifier<Env::Api>>,
-        Arg1: CodecInto<BigUint<Env::Api>>,
-        Arg2: CodecInto<OptionalValue<ManagedBuffer<Env::Api>>>,
+        Arg0: ProxyArg<TokenIdentifier<Env::Api>>,
+        Arg1: ProxyArg<BigUint<Env::Api>>,
+        Arg2: ProxyArg<OptionalValue<ManagedBuffer<Env::Api>>>,
     >(
         self,
         token: Arg0,
@@ -170,8 +170,8 @@ where
     }
 
     pub fn retrieve_funds_promises<
-        Arg0: CodecInto<OptionalValue<u64>>,
-        Arg1: CodecInto<OptionalValue<BigUint<Env::Api>>>,
+        Arg0: ProxyArg<OptionalValue<u64>>,
+        Arg1: ProxyArg<OptionalValue<BigUint<Env::Api>>>,
     >(
         self,
         back_transfers: Arg0,
@@ -185,9 +185,9 @@ where
     }
 
     pub fn retrieve_funds<
-        Arg0: CodecInto<EgldOrEsdtTokenIdentifier<Env::Api>>,
-        Arg1: CodecInto<u64>,
-        Arg2: CodecInto<BigUint<Env::Api>>,
+        Arg0: ProxyArg<EgldOrEsdtTokenIdentifier<Env::Api>>,
+        Arg1: ProxyArg<u64>,
+        Arg2: ProxyArg<BigUint<Env::Api>>,
     >(
         self,
         token: Arg0,
@@ -203,7 +203,7 @@ where
     }
 
     pub fn retrieve_multi_funds_async<
-        Arg0: CodecInto<MultiValueEncoded<Env::Api, MultiValue3<TokenIdentifier<Env::Api>, u64, BigUint<Env::Api>>>>,
+        Arg0: ProxyArg<MultiValueEncoded<Env::Api, MultiValue3<TokenIdentifier<Env::Api>, u64, BigUint<Env::Api>>>>,
     >(
         self,
         token_payments: Arg0,
@@ -233,7 +233,7 @@ where
     /// We already leave a trace of the calls using the event logs; 
     /// this additional counter has the role of showing that storage also gets saved correctly. 
     pub fn call_counts<
-        Arg0: CodecInto<ManagedBuffer<Env::Api>>,
+        Arg0: ProxyArg<ManagedBuffer<Env::Api>>,
     >(
         self,
         endpoint: Arg0,
diff --git a/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/src/erc20_proxy.rs b/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/src/erc20_proxy.rs
index 5d53567a38..eaceb1da73 100644
--- a/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/src/erc20_proxy.rs
+++ b/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/src/erc20_proxy.rs
@@ -46,7 +46,7 @@ where
     /// Constructor, is called immediately after the contract is created 
     /// Will set the fixed global token supply and give all the supply to the creator. 
     pub fn init<
-        Arg0: CodecInto<BigUint<Env::Api>>,
+        Arg0: ProxyArg<BigUint<Env::Api>>,
     >(
         self,
         total_supply: Arg0,
@@ -83,7 +83,7 @@ where
     /// * `address` The address to query the the balance of 
     ///  
     pub fn token_balance<
-        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
     >(
         self,
         address: Arg0,
@@ -102,8 +102,8 @@ where
     /// * `spender` The address that will spend the funds. 
     ///  
     pub fn allowance<
-        Arg0: CodecInto<ManagedAddress<Env::Api>>,
-        Arg1: CodecInto<ManagedAddress<Env::Api>>,
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg1: ProxyArg<ManagedAddress<Env::Api>>,
     >(
         self,
         owner: Arg0,
@@ -123,8 +123,8 @@ where
     /// * `to` The address to transfer to. 
     ///  
     pub fn transfer<
-        Arg0: CodecInto<ManagedAddress<Env::Api>>,
-        Arg1: CodecInto<BigUint<Env::Api>>,
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg1: ProxyArg<BigUint<Env::Api>>,
     >(
         self,
         to: Arg0,
@@ -146,9 +146,9 @@ where
     /// * `amount` the amount of tokens to be transferred. 
     ///  
     pub fn transfer_from<
-        Arg0: CodecInto<ManagedAddress<Env::Api>>,
-        Arg1: CodecInto<ManagedAddress<Env::Api>>,
-        Arg2: CodecInto<BigUint<Env::Api>>,
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg1: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg2: ProxyArg<BigUint<Env::Api>>,
     >(
         self,
         sender: Arg0,
@@ -172,8 +172,8 @@ where
     /// * `amount` The amount of tokens to be spent. 
     ///  
     pub fn approve<
-        Arg0: CodecInto<ManagedAddress<Env::Api>>,
-        Arg1: CodecInto<BigUint<Env::Api>>,
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg1: ProxyArg<BigUint<Env::Api>>,
     >(
         self,
         spender: Arg0,
diff --git a/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/src/erc1155_proxy.rs b/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/src/erc1155_proxy.rs
index 41773ae924..899a036f41 100644
--- a/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/src/erc1155_proxy.rs
+++ b/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/src/erc1155_proxy.rs
@@ -63,11 +63,11 @@ where
 {
     /// `value` is amount for fungible, nft_id for non-fungible 
     pub fn safe_transfer_from<
-        Arg0: CodecInto<ManagedAddress<Env::Api>>,
-        Arg1: CodecInto<ManagedAddress<Env::Api>>,
-        Arg2: CodecInto<BigUint<Env::Api>>,
-        Arg3: CodecInto<BigUint<Env::Api>>,
-        Arg4: CodecInto<ManagedBuffer<Env::Api>>,
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg1: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg2: ProxyArg<BigUint<Env::Api>>,
+        Arg3: ProxyArg<BigUint<Env::Api>>,
+        Arg4: ProxyArg<ManagedBuffer<Env::Api>>,
     >(
         self,
         from: Arg0,
@@ -88,11 +88,11 @@ where
 
     /// `value` is amount for fungible, nft_id for non-fungible 
     pub fn safe_batch_transfer_from<
-        Arg0: CodecInto<ManagedAddress<Env::Api>>,
-        Arg1: CodecInto<ManagedAddress<Env::Api>>,
-        Arg2: CodecInto<Box<[BigUint<Env::Api>]>>,
-        Arg3: CodecInto<Box<[BigUint<Env::Api>]>>,
-        Arg4: CodecInto<ManagedBuffer<Env::Api>>,
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg1: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg2: ProxyArg<Box<[BigUint<Env::Api>]>>,
+        Arg3: ProxyArg<Box<[BigUint<Env::Api>]>>,
+        Arg4: ProxyArg<ManagedBuffer<Env::Api>>,
     >(
         self,
         from: Arg0,
@@ -112,8 +112,8 @@ where
     }
 
     pub fn set_approved_for_all<
-        Arg0: CodecInto<ManagedAddress<Env::Api>>,
-        Arg1: CodecInto<bool>,
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg1: ProxyArg<bool>,
     >(
         self,
         operator: Arg0,
@@ -127,9 +127,9 @@ where
     }
 
     pub fn create_token<
-        Arg0: CodecInto<BoxedBytes>,
-        Arg1: CodecInto<BigUint<Env::Api>>,
-        Arg2: CodecInto<bool>,
+        Arg0: ProxyArg<BoxedBytes>,
+        Arg1: ProxyArg<BigUint<Env::Api>>,
+        Arg2: ProxyArg<bool>,
     >(
         self,
         uri: Arg0,
@@ -145,8 +145,8 @@ where
     }
 
     pub fn mint<
-        Arg0: CodecInto<BigUint<Env::Api>>,
-        Arg1: CodecInto<BigUint<Env::Api>>,
+        Arg0: ProxyArg<BigUint<Env::Api>>,
+        Arg1: ProxyArg<BigUint<Env::Api>>,
     >(
         self,
         type_id: Arg0,
@@ -160,8 +160,8 @@ where
     }
 
     pub fn burn<
-        Arg0: CodecInto<BigUint<Env::Api>>,
-        Arg1: CodecInto<BigUint<Env::Api>>,
+        Arg0: ProxyArg<BigUint<Env::Api>>,
+        Arg1: ProxyArg<BigUint<Env::Api>>,
     >(
         self,
         type_id: Arg0,
@@ -175,8 +175,8 @@ where
     }
 
     pub fn balance_of<
-        Arg0: CodecInto<ManagedAddress<Env::Api>>,
-        Arg1: CodecInto<BigUint<Env::Api>>,
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg1: ProxyArg<BigUint<Env::Api>>,
     >(
         self,
         owner: Arg0,
@@ -190,7 +190,7 @@ where
     }
 
     pub fn balance_of_batch<
-        Arg0: CodecInto<MultiValueEncoded<Env::Api, MultiValue2<ManagedAddress<Env::Api>, BigUint<Env::Api>>>>,
+        Arg0: ProxyArg<MultiValueEncoded<Env::Api, MultiValue2<ManagedAddress<Env::Api>, BigUint<Env::Api>>>>,
     >(
         self,
         owner_type_id_pairs: Arg0,
@@ -202,8 +202,8 @@ where
     }
 
     pub fn token_owner<
-        Arg0: CodecInto<BigUint<Env::Api>>,
-        Arg1: CodecInto<BigUint<Env::Api>>,
+        Arg0: ProxyArg<BigUint<Env::Api>>,
+        Arg1: ProxyArg<BigUint<Env::Api>>,
     >(
         self,
         type_id: Arg0,
@@ -217,7 +217,7 @@ where
     }
 
     pub fn token_type_creator<
-        Arg0: CodecInto<BigUint<Env::Api>>,
+        Arg0: ProxyArg<BigUint<Env::Api>>,
     >(
         self,
         type_id: Arg0,
@@ -229,7 +229,7 @@ where
     }
 
     pub fn token_type_uri<
-        Arg0: CodecInto<BigUint<Env::Api>>,
+        Arg0: ProxyArg<BigUint<Env::Api>>,
     >(
         self,
         type_id: Arg0,
@@ -241,7 +241,7 @@ where
     }
 
     pub fn is_fungible<
-        Arg0: CodecInto<BigUint<Env::Api>>,
+        Arg0: ProxyArg<BigUint<Env::Api>>,
     >(
         self,
         type_id: Arg0,
@@ -253,8 +253,8 @@ where
     }
 
     pub fn is_approved<
-        Arg0: CodecInto<ManagedAddress<Env::Api>>,
-        Arg1: CodecInto<ManagedAddress<Env::Api>>,
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg1: ProxyArg<ManagedAddress<Env::Api>>,
     >(
         self,
         operator: Arg0,
diff --git a/contracts/feature-tests/erc-style-contracts/erc1155/src/erc1155_user_proxy.rs b/contracts/feature-tests/erc-style-contracts/erc1155/src/erc1155_user_proxy.rs
index 8dd67d4061..600c12792f 100644
--- a/contracts/feature-tests/erc-style-contracts/erc1155/src/erc1155_user_proxy.rs
+++ b/contracts/feature-tests/erc-style-contracts/erc1155/src/erc1155_user_proxy.rs
@@ -38,11 +38,11 @@ where
     Gas: TxGas<Env>,
 {
     pub fn on_erc1155_received<
-        Arg0: CodecInto<ManagedAddress<Env::Api>>,
-        Arg1: CodecInto<ManagedAddress<Env::Api>>,
-        Arg2: CodecInto<BigUint<Env::Api>>,
-        Arg3: CodecInto<BigUint<Env::Api>>,
-        Arg4: CodecInto<ManagedBuffer<Env::Api>>,
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg1: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg2: ProxyArg<BigUint<Env::Api>>,
+        Arg3: ProxyArg<BigUint<Env::Api>>,
+        Arg4: ProxyArg<ManagedBuffer<Env::Api>>,
     >(
         self,
         operator: Arg0,
@@ -62,11 +62,11 @@ where
     }
 
     pub fn on_erc1155_batch_received<
-        Arg0: CodecInto<ManagedAddress<Env::Api>>,
-        Arg1: CodecInto<ManagedAddress<Env::Api>>,
-        Arg2: CodecInto<Vec<BigUint<Env::Api>>>,
-        Arg3: CodecInto<Vec<BigUint<Env::Api>>>,
-        Arg4: CodecInto<ManagedBuffer<Env::Api>>,
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg1: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg2: ProxyArg<Vec<BigUint<Env::Api>>>,
+        Arg3: ProxyArg<Vec<BigUint<Env::Api>>>,
+        Arg4: ProxyArg<ManagedBuffer<Env::Api>>,
     >(
         self,
         operator: Arg0,
diff --git a/contracts/feature-tests/erc-style-contracts/lottery-erc20/src/erc20_proxy.rs b/contracts/feature-tests/erc-style-contracts/lottery-erc20/src/erc20_proxy.rs
index 5d53567a38..eaceb1da73 100644
--- a/contracts/feature-tests/erc-style-contracts/lottery-erc20/src/erc20_proxy.rs
+++ b/contracts/feature-tests/erc-style-contracts/lottery-erc20/src/erc20_proxy.rs
@@ -46,7 +46,7 @@ where
     /// Constructor, is called immediately after the contract is created 
     /// Will set the fixed global token supply and give all the supply to the creator. 
     pub fn init<
-        Arg0: CodecInto<BigUint<Env::Api>>,
+        Arg0: ProxyArg<BigUint<Env::Api>>,
     >(
         self,
         total_supply: Arg0,
@@ -83,7 +83,7 @@ where
     /// * `address` The address to query the the balance of 
     ///  
     pub fn token_balance<
-        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
     >(
         self,
         address: Arg0,
@@ -102,8 +102,8 @@ where
     /// * `spender` The address that will spend the funds. 
     ///  
     pub fn allowance<
-        Arg0: CodecInto<ManagedAddress<Env::Api>>,
-        Arg1: CodecInto<ManagedAddress<Env::Api>>,
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg1: ProxyArg<ManagedAddress<Env::Api>>,
     >(
         self,
         owner: Arg0,
@@ -123,8 +123,8 @@ where
     /// * `to` The address to transfer to. 
     ///  
     pub fn transfer<
-        Arg0: CodecInto<ManagedAddress<Env::Api>>,
-        Arg1: CodecInto<BigUint<Env::Api>>,
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg1: ProxyArg<BigUint<Env::Api>>,
     >(
         self,
         to: Arg0,
@@ -146,9 +146,9 @@ where
     /// * `amount` the amount of tokens to be transferred. 
     ///  
     pub fn transfer_from<
-        Arg0: CodecInto<ManagedAddress<Env::Api>>,
-        Arg1: CodecInto<ManagedAddress<Env::Api>>,
-        Arg2: CodecInto<BigUint<Env::Api>>,
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg1: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg2: ProxyArg<BigUint<Env::Api>>,
     >(
         self,
         sender: Arg0,
@@ -172,8 +172,8 @@ where
     /// * `amount` The amount of tokens to be spent. 
     ///  
     pub fn approve<
-        Arg0: CodecInto<ManagedAddress<Env::Api>>,
-        Arg1: CodecInto<BigUint<Env::Api>>,
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg1: ProxyArg<BigUint<Env::Api>>,
     >(
         self,
         spender: Arg0,
diff --git a/contracts/feature-tests/panic-message-features/tests/pmf_proxy.rs b/contracts/feature-tests/panic-message-features/tests/pmf_proxy.rs
index 7413bf0ed9..6e4c6e0cea 100644
--- a/contracts/feature-tests/panic-message-features/tests/pmf_proxy.rs
+++ b/contracts/feature-tests/panic-message-features/tests/pmf_proxy.rs
@@ -62,7 +62,7 @@ where
     Gas: TxGas<Env>,
 {
     pub fn panic_with_message<
-        Arg0: CodecInto<u32>,
+        Arg0: ProxyArg<u32>,
     >(
         self,
         some_value: Arg0,
diff --git a/contracts/feature-tests/scenario-tester/src/scenario_tester_proxy.rs b/contracts/feature-tests/scenario-tester/src/scenario_tester_proxy.rs
index d3abf4b9b7..3358a126e4 100644
--- a/contracts/feature-tests/scenario-tester/src/scenario_tester_proxy.rs
+++ b/contracts/feature-tests/scenario-tester/src/scenario_tester_proxy.rs
@@ -44,7 +44,7 @@ where
     Gas: TxGas<Env>,
 {
     pub fn init<
-        Arg0: CodecInto<BigUint<Env::Api>>,
+        Arg0: ProxyArg<BigUint<Env::Api>>,
     >(
         self,
         initial_value: Arg0,
@@ -66,7 +66,7 @@ where
     Gas: TxGas<Env>,
 {
     pub fn upgrade<
-        Arg0: CodecInto<BigUint<Env::Api>>,
+        Arg0: ProxyArg<BigUint<Env::Api>>,
     >(
         self,
         initial_value: Arg0,
@@ -97,7 +97,7 @@ where
 
     /// Add desired amount to the storage variable. 
     pub fn add<
-        Arg0: CodecInto<BigUint<Env::Api>>,
+        Arg0: ProxyArg<BigUint<Env::Api>>,
     >(
         self,
         value: Arg0,
diff --git a/contracts/modules/src/dns_proxy.rs b/contracts/modules/src/dns_proxy.rs
index bdaf2ed13b..25ac68e4c4 100644
--- a/contracts/modules/src/dns_proxy.rs
+++ b/contracts/modules/src/dns_proxy.rs
@@ -38,7 +38,7 @@ where
     Gas: TxGas<Env>,
 {
     pub fn register<
-        Arg0: CodecInto<ManagedBuffer<Env::Api>>,
+        Arg0: ProxyArg<ManagedBuffer<Env::Api>>,
     >(
         self,
         name: Arg0,
diff --git a/framework/base/src/abi/type_abi_impl_basic.rs b/framework/base/src/abi/type_abi_impl_basic.rs
index 1d0378259e..4e93eda28a 100644
--- a/framework/base/src/abi/type_abi_impl_basic.rs
+++ b/framework/base/src/abi/type_abi_impl_basic.rs
@@ -122,6 +122,7 @@ impl<T: TypeAbi> TypeAbi for Box<[T]> {
 }
 
 impl TypeAbiFrom<String> for String {}
+impl TypeAbiFrom<&String> for String {}
 impl TypeAbiFrom<&str> for String {}
 impl TypeAbiFrom<Box<str>> for String {}
 
@@ -160,6 +161,7 @@ impl TypeAbi for Box<str> {
 macro_rules! type_abi_name_only {
     ($ty:ty, $name:expr) => {
         impl TypeAbiFrom<$ty> for $ty {}
+        impl TypeAbiFrom<&$ty> for $ty {}
 
         impl TypeAbi for $ty {
             fn type_name() -> TypeName {
@@ -186,6 +188,40 @@ type_abi_name_only!(i64, "i64");
 type_abi_name_only!(core::num::NonZeroUsize, "NonZeroUsize");
 type_abi_name_only!(bool, "bool");
 
+// Unsigned integer types: the contract can return a smaller capacity result and and we can interpret it as a larger capacity type.
+
+impl TypeAbiFrom<usize> for u64 {}
+impl TypeAbiFrom<u32> for u64 {}
+impl TypeAbiFrom<u16> for u64 {}
+impl TypeAbiFrom<u8> for u64 {}
+
+impl TypeAbiFrom<usize> for u32 {}
+impl TypeAbiFrom<u16> for u32 {}
+impl TypeAbiFrom<u8> for u32 {}
+
+impl TypeAbiFrom<u32> for usize {}
+impl TypeAbiFrom<u16> for usize {}
+impl TypeAbiFrom<u8> for usize {}
+
+impl TypeAbiFrom<u8> for u16 {}
+
+// Signed, the same.
+
+impl TypeAbiFrom<isize> for i64 {}
+impl TypeAbiFrom<i32> for i64 {}
+impl TypeAbiFrom<i16> for i64 {}
+impl TypeAbiFrom<i8> for i64 {}
+
+impl TypeAbiFrom<isize> for i32 {}
+impl TypeAbiFrom<i16> for i32 {}
+impl TypeAbiFrom<i8> for i32 {}
+
+impl TypeAbiFrom<i32> for isize {}
+impl TypeAbiFrom<i16> for isize {}
+impl TypeAbiFrom<i8> for isize {}
+
+impl TypeAbiFrom<i8> for i16 {}
+
 impl<T, U> TypeAbiFrom<Option<T>> for Option<U> where T: TypeAbiFrom<U> {}
 
 impl<T: TypeAbi> TypeAbi for Option<T> {
diff --git a/framework/base/src/types/interaction/expr/test_address.rs b/framework/base/src/types/interaction/expr/test_address.rs
index b01840ce06..d2824002ba 100644
--- a/framework/base/src/types/interaction/expr/test_address.rs
+++ b/framework/base/src/types/interaction/expr/test_address.rs
@@ -3,6 +3,7 @@ use core::ptr;
 use multiversx_sc_codec::{CodecFrom, EncodeErrorHandler, TopEncode, TopEncodeOutput};
 
 use crate::{
+    abi::TypeAbiFrom,
     api::ManagedTypeApi,
     types::{
         AnnotatedValue, ManagedAddress, ManagedBuffer, TxEnv, TxFrom, TxFromSpecified, TxTo,
@@ -85,6 +86,7 @@ impl<'a> TopEncode for TestAddress<'a> {
 }
 
 impl<'a, Api> CodecFrom<TestAddress<'a>> for ManagedAddress<Api> where Api: ManagedTypeApi {}
+impl<'a, Api> TypeAbiFrom<TestAddress<'a>> for ManagedAddress<Api> where Api: ManagedTypeApi {}
 
 #[cfg(test)]
 pub mod tests {
diff --git a/framework/base/src/types/interaction/expr/test_sc_address.rs b/framework/base/src/types/interaction/expr/test_sc_address.rs
index 973ab80d92..c752777bfa 100644
--- a/framework/base/src/types/interaction/expr/test_sc_address.rs
+++ b/framework/base/src/types/interaction/expr/test_sc_address.rs
@@ -3,6 +3,7 @@ use core::ptr;
 use multiversx_sc_codec::{CodecFrom, EncodeErrorHandler, TopEncode, TopEncodeOutput};
 
 use crate::{
+    abi::TypeAbiFrom,
     api::ManagedTypeApi,
     types::{
         heap::Address, AnnotatedValue, ManagedAddress, ManagedBuffer, TxEnv, TxFrom,
@@ -105,6 +106,7 @@ impl<'a> TopEncode for TestSCAddress<'a> {
 }
 
 impl<'a, Api> CodecFrom<TestSCAddress<'a>> for ManagedAddress<Api> where Api: ManagedTypeApi {}
+impl<'a, Api> TypeAbiFrom<TestSCAddress<'a>> for ManagedAddress<Api> where Api: ManagedTypeApi {}
 
 #[cfg(test)]
 pub mod tests {
diff --git a/framework/base/src/types/interaction/expr/test_token_identifier.rs b/framework/base/src/types/interaction/expr/test_token_identifier.rs
index b22854b507..1230a15664 100644
--- a/framework/base/src/types/interaction/expr/test_token_identifier.rs
+++ b/framework/base/src/types/interaction/expr/test_token_identifier.rs
@@ -1,6 +1,7 @@
 use multiversx_sc_codec::{CodecFrom, EncodeErrorHandler, TopEncode, TopEncodeOutput};
 
 use crate::{
+    abi::TypeAbiFrom,
     api::ManagedTypeApi,
     types::{AnnotatedValue, ManagedBuffer, TokenIdentifier, TxEnv},
 };
@@ -62,3 +63,5 @@ impl<'a> TopEncode for TestTokenIdentifier<'a> {
 }
 
 impl<'a, Api> CodecFrom<TestTokenIdentifier<'a>> for TokenIdentifier<Api> where Api: ManagedTypeApi {}
+impl<'a, Api> TypeAbiFrom<TestTokenIdentifier<'a>> for TokenIdentifier<Api> where Api: ManagedTypeApi
+{}
diff --git a/framework/base/src/types/interaction/managed_arg_buffer.rs b/framework/base/src/types/interaction/managed_arg_buffer.rs
index ab103040f7..e3ca9c67e5 100644
--- a/framework/base/src/types/interaction/managed_arg_buffer.rs
+++ b/framework/base/src/types/interaction/managed_arg_buffer.rs
@@ -300,6 +300,7 @@ where
 }
 
 impl<M> TypeAbiFrom<Self> for ManagedArgBuffer<M> where M: ManagedTypeApi {}
+impl<M> TypeAbiFrom<&Self> for ManagedArgBuffer<M> where M: ManagedTypeApi {}
 
 impl<M> TypeAbi for ManagedArgBuffer<M>
 where
diff --git a/framework/base/src/types/interaction/markers/esdt_system_sc_address.rs b/framework/base/src/types/interaction/markers/esdt_system_sc_address.rs
index 8d59b682be..0cfe2e5588 100644
--- a/framework/base/src/types/interaction/markers/esdt_system_sc_address.rs
+++ b/framework/base/src/types/interaction/markers/esdt_system_sc_address.rs
@@ -2,6 +2,7 @@ use hex_literal::hex;
 use multiversx_sc_codec::{CodecFrom, EncodeErrorHandler, TopEncode, TopEncodeOutput};
 
 use crate::{
+    abi::TypeAbiFrom,
     api::{CallTypeApi, ManagedTypeApi},
     types::{AnnotatedValue, ManagedAddress, ManagedBuffer, TxScEnv, TxTo, TxToSpecified},
 };
@@ -61,6 +62,7 @@ impl TopEncode for ESDTSystemSCAddress {
 }
 
 impl<M> CodecFrom<ESDTSystemSCAddress> for ManagedAddress<M> where M: ManagedTypeApi {}
+impl<M> TypeAbiFrom<ESDTSystemSCAddress> for ManagedAddress<M> where M: ManagedTypeApi {}
 
 impl core::fmt::Display for ESDTSystemSCAddress {
     fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
diff --git a/framework/base/src/types/interaction/system_proxy/builtin_func_proxy.rs b/framework/base/src/types/interaction/system_proxy/builtin_func_proxy.rs
index fe421c5ef7..11972f72e8 100644
--- a/framework/base/src/types/interaction/system_proxy/builtin_func_proxy.rs
+++ b/framework/base/src/types/interaction/system_proxy/builtin_func_proxy.rs
@@ -1,8 +1,8 @@
-use multiversx_sc_codec::{CodecInto, Empty, TopEncode};
+use multiversx_sc_codec::{Empty, TopEncode};
 
 use crate::types::{
-    BigUint, ManagedAddress, ManagedBuffer, ManagedVec, TokenIdentifier, Tx, TxEnv, TxFrom, TxGas,
-    TxProxyCall, TxProxyTrait, TxTo,
+    BigUint, ManagedAddress, ManagedBuffer, ManagedVec, ProxyArg, TokenIdentifier, Tx, TxEnv,
+    TxFrom, TxGas, TxProxyCall, TxProxyTrait, TxTo,
 };
 
 use super::builtin_func_names::{
@@ -46,7 +46,7 @@ where
     To: TxTo<Env>,
     Gas: TxGas<Env>,
 {
-    pub fn set_user_name<Arg0: CodecInto<ManagedBuffer<Env::Api>>>(
+    pub fn set_user_name<Arg0: ProxyArg<ManagedBuffer<Env::Api>>>(
         self,
         name: Arg0,
     ) -> TxProxyCall<Env, From, To, Gas, ()> {
diff --git a/framework/base/src/types/interaction/tx_proxy.rs b/framework/base/src/types/interaction/tx_proxy.rs
index 7bb0c67439..2929a7bc4b 100644
--- a/framework/base/src/types/interaction/tx_proxy.rs
+++ b/framework/base/src/types/interaction/tx_proxy.rs
@@ -1,3 +1,7 @@
+use multiversx_sc_codec::TopEncodeMulti;
+
+use crate::abi::TypeAbiFrom;
+
 use super::{
     DeployCall, FunctionCall, OriginalResultMarker, Tx, TxEnv, TxFrom, TxGas, TxTo, UpgradeCall,
 };
@@ -27,3 +31,15 @@ pub type TxProxyCall<Env, From, To, Gas, Original> =
 /// Alias for a `Tx` generated from a proxy, in `upgrade`.
 pub type TxProxyUpgrade<Env, From, To, Gas, Original> =
     Tx<Env, From, To, (), Gas, UpgradeCall<Env, ()>, OriginalResultMarker<Original>>;
+
+/// Trait that is automatically implemented for all types that are allowed as proxy inputs.
+///
+/// Is automatically implemented for all traits that are `TypeAbiInto<O> + TopEncodeMulti`.
+pub trait ProxyArg<O>: TopEncodeMulti {}
+
+impl<O, T> ProxyArg<O> for T
+where
+    O: TypeAbiFrom<T>,
+    T: TopEncodeMulti,
+{
+}
diff --git a/framework/base/src/types/managed/basic/big_float.rs b/framework/base/src/types/managed/basic/big_float.rs
index 62126efd19..0bc2980e35 100644
--- a/framework/base/src/types/managed/basic/big_float.rs
+++ b/framework/base/src/types/managed/basic/big_float.rs
@@ -287,6 +287,7 @@ impl<M: ManagedTypeApi> NestedDecode for BigFloat<M> {
 }
 
 impl<M> TypeAbiFrom<Self> for BigFloat<M> where M: ManagedTypeApi {}
+impl<M> TypeAbiFrom<&Self> for BigFloat<M> where M: ManagedTypeApi {}
 
 impl<M: ManagedTypeApi> TypeAbi for BigFloat<M> {
     fn type_name() -> String {
diff --git a/framework/base/src/types/managed/basic/big_int.rs b/framework/base/src/types/managed/basic/big_int.rs
index a27611a903..4d9fca8fe2 100644
--- a/framework/base/src/types/managed/basic/big_int.rs
+++ b/framework/base/src/types/managed/basic/big_int.rs
@@ -101,6 +101,7 @@ macro_rules! big_int_conv_num {
         }
 
         impl<M: ManagedTypeApi> CodecFrom<$num_ty> for BigInt<M> {}
+        impl<M: ManagedTypeApi> CodecFrom<&$num_ty> for BigInt<M> {}
     };
 }
 
@@ -299,6 +300,7 @@ impl<M: ManagedTypeApi> TopDecode for BigInt<M> {
 }
 
 impl<M> TypeAbiFrom<Self> for BigInt<M> where M: ManagedTypeApi {}
+impl<M> TypeAbiFrom<&Self> for BigInt<M> where M: ManagedTypeApi {}
 
 impl<M: ManagedTypeApi> crate::abi::TypeAbi for BigInt<M> {
     fn type_name() -> TypeName {
diff --git a/framework/base/src/types/managed/basic/big_uint.rs b/framework/base/src/types/managed/basic/big_uint.rs
index 9f78792eab..2766a42f1d 100644
--- a/framework/base/src/types/managed/basic/big_uint.rs
+++ b/framework/base/src/types/managed/basic/big_uint.rs
@@ -95,6 +95,7 @@ macro_rules! big_uint_conv_num {
         }
 
         impl<M: ManagedTypeApi> CodecFrom<$num_ty> for BigUint<M> {}
+        impl<M: ManagedTypeApi> TypeAbiFrom<$num_ty> for BigUint<M> {}
     };
 }
 
@@ -111,6 +112,11 @@ impl<M: ManagedTypeApi> CodecFrom<crate::codec::num_bigint::BigUint> for BigUint
 #[cfg(feature = "num-bigint")]
 impl<M: ManagedTypeApi> CodecFrom<BigUint<M>> for crate::codec::num_bigint::BigUint {}
 
+#[cfg(feature = "num-bigint")]
+impl<M: ManagedTypeApi> TypeAbiFrom<crate::codec::num_bigint::BigUint> for BigUint<M> {}
+#[cfg(feature = "num-bigint")]
+impl<M: ManagedTypeApi> TypeAbiFrom<BigUint<M>> for crate::codec::num_bigint::BigUint {}
+
 #[cfg(feature = "num-bigint")]
 impl<M: ManagedTypeApi> From<&crate::codec::num_bigint::BigUint> for BigUint<M> {
     fn from(alloc_big_uint: &crate::codec::num_bigint::BigUint) -> Self {
@@ -288,6 +294,7 @@ impl<M: ManagedTypeApi> TopDecode for BigUint<M> {
 }
 
 impl<M> TypeAbiFrom<Self> for BigUint<M> where M: ManagedTypeApi {}
+impl<M> TypeAbiFrom<&Self> for BigUint<M> where M: ManagedTypeApi {}
 
 impl<M: ManagedTypeApi> crate::abi::TypeAbi for BigUint<M> {
     fn type_name() -> TypeName {
diff --git a/framework/base/src/types/managed/basic/managed_buffer.rs b/framework/base/src/types/managed/basic/managed_buffer.rs
index a9d7483125..5d2b975b4a 100644
--- a/framework/base/src/types/managed/basic/managed_buffer.rs
+++ b/framework/base/src/types/managed/basic/managed_buffer.rs
@@ -419,12 +419,21 @@ impl<M> CodecFrom<&[u8]> for ManagedBuffer<M> where M: ManagedTypeApi {}
 impl<M> CodecFrom<&str> for ManagedBuffer<M> where M: ManagedTypeApi {}
 impl<M, const N: usize> CodecFrom<&[u8; N]> for ManagedBuffer<M> where M: ManagedTypeApi {}
 
+impl<M> TypeAbiFrom<&[u8]> for ManagedBuffer<M> where M: ManagedTypeApi {}
+impl<M> TypeAbiFrom<&str> for ManagedBuffer<M> where M: ManagedTypeApi {}
+impl<M, const N: usize> TypeAbiFrom<&[u8; N]> for ManagedBuffer<M> where M: ManagedTypeApi {}
+
 macro_rules! managed_buffer_codec_from_impl_bi_di {
     ($other_ty:ty) => {
         impl<M: ManagedTypeApi> CodecFrom<$other_ty> for ManagedBuffer<M> {}
         impl<M: ManagedTypeApi> CodecFrom<&$other_ty> for ManagedBuffer<M> {}
         impl<M: ManagedTypeApi> CodecFrom<ManagedBuffer<M>> for $other_ty {}
         impl<M: ManagedTypeApi> CodecFrom<&ManagedBuffer<M>> for $other_ty {}
+
+        impl<M: ManagedTypeApi> TypeAbiFrom<$other_ty> for ManagedBuffer<M> {}
+        impl<M: ManagedTypeApi> TypeAbiFrom<&$other_ty> for ManagedBuffer<M> {}
+        impl<M: ManagedTypeApi> TypeAbiFrom<ManagedBuffer<M>> for $other_ty {}
+        impl<M: ManagedTypeApi> TypeAbiFrom<&ManagedBuffer<M>> for $other_ty {}
     };
 }
 
@@ -462,6 +471,7 @@ impl<M: ManagedTypeApi> TopDecode for ManagedBuffer<M> {
 }
 
 impl<M> TypeAbiFrom<Self> for ManagedBuffer<M> where M: ManagedTypeApi {}
+impl<M> TypeAbiFrom<&Self> for ManagedBuffer<M> where M: ManagedTypeApi {}
 
 impl<M: ManagedTypeApi> crate::abi::TypeAbi for ManagedBuffer<M> {
     fn type_name() -> TypeName {
diff --git a/framework/base/src/types/managed/multi_value/multi_value_encoded.rs b/framework/base/src/types/managed/multi_value/multi_value_encoded.rs
index 01e894cf3e..6154942fa6 100644
--- a/framework/base/src/types/managed/multi_value/multi_value_encoded.rs
+++ b/framework/base/src/types/managed/multi_value/multi_value_encoded.rs
@@ -265,6 +265,15 @@ where
 {
 }
 
+#[cfg(feature = "alloc")]
+impl<M, T, U> TypeAbiFrom<MultiValueVec<T>> for MultiValueEncoded<M, U>
+where
+    M: ManagedTypeApi + ErrorApi,
+    T: TopEncodeMulti,
+    U: TypeAbiFrom<T>,
+{
+}
+
 #[cfg(feature = "alloc")]
 impl<M, T, U> CodecFrom<MultiValueEncoded<M, T>> for MultiValueVec<U>
 where
@@ -274,6 +283,15 @@ where
 {
 }
 
+#[cfg(feature = "alloc")]
+impl<M, T, U> TypeAbiFrom<MultiValueEncoded<M, T>> for MultiValueVec<U>
+where
+    M: ManagedTypeApi + ErrorApi,
+    T: TopEncodeMulti,
+    U: TypeAbiFrom<T>,
+{
+}
+
 impl<M, V> FromIterator<V> for MultiValueEncoded<M, V>
 where
     M: ManagedTypeApi,
diff --git a/framework/base/src/types/managed/wrapped/egld_or_esdt_token_identifier.rs b/framework/base/src/types/managed/wrapped/egld_or_esdt_token_identifier.rs
index 16f6714ff0..a31a4d6d02 100644
--- a/framework/base/src/types/managed/wrapped/egld_or_esdt_token_identifier.rs
+++ b/framework/base/src/types/managed/wrapped/egld_or_esdt_token_identifier.rs
@@ -4,6 +4,7 @@ use crate::{
     codec::*,
     derive::ManagedVecItem,
     formatter::{FormatByteReceiver, SCDisplay, SCLowerHex},
+    proxy_imports::TestTokenIdentifier,
     types::{ManagedBuffer, ManagedOption, ManagedRef, ManagedType, TokenIdentifier},
 };
 
@@ -213,7 +214,19 @@ impl<M> CodecFrom<&TokenIdentifier<M>> for EgldOrEsdtTokenIdentifier<M> where M:
 impl<M> CodecFrom<&[u8]> for EgldOrEsdtTokenIdentifier<M> where M: ManagedTypeApi {}
 impl<M> CodecFrom<&str> for EgldOrEsdtTokenIdentifier<M> where M: ManagedTypeApi {}
 
+impl<M> TypeAbiFrom<TokenIdentifier<M>> for EgldOrEsdtTokenIdentifier<M> where M: ManagedTypeApi {}
+impl<M> TypeAbiFrom<&TokenIdentifier<M>> for EgldOrEsdtTokenIdentifier<M> where M: ManagedTypeApi {}
+impl<'a, M> TypeAbiFrom<TestTokenIdentifier<'a>> for EgldOrEsdtTokenIdentifier<M> where
+    M: ManagedTypeApi
+{
+}
+impl<'a, M> TypeAbiFrom<&TestTokenIdentifier<'a>> for EgldOrEsdtTokenIdentifier<M> where
+    M: ManagedTypeApi
+{
+}
+
 impl<M: ManagedTypeApi> TypeAbiFrom<Self> for EgldOrEsdtTokenIdentifier<M> {}
+impl<M: ManagedTypeApi> TypeAbiFrom<&Self> for EgldOrEsdtTokenIdentifier<M> {}
 
 impl<M: ManagedTypeApi> TypeAbi for EgldOrEsdtTokenIdentifier<M> {
     fn type_name() -> TypeName {
diff --git a/framework/base/src/types/managed/wrapped/managed_address.rs b/framework/base/src/types/managed/wrapped/managed_address.rs
index 5ab0941f47..cf5341775d 100644
--- a/framework/base/src/types/managed/wrapped/managed_address.rs
+++ b/framework/base/src/types/managed/wrapped/managed_address.rs
@@ -235,6 +235,7 @@ where
 }
 
 impl<M> TypeAbiFrom<Self> for ManagedAddress<M> where M: ManagedTypeApi {}
+impl<M> TypeAbiFrom<&Self> for ManagedAddress<M> where M: ManagedTypeApi {}
 
 impl<M> TypeAbi for ManagedAddress<M>
 where
@@ -274,6 +275,7 @@ impl<M: ManagedTypeApi> core::fmt::Debug for ManagedAddress<M> {
 impl<M> CodecFromSelf for ManagedAddress<M> where M: ManagedTypeApi {}
 
 impl<M> CodecFrom<[u8; 32]> for ManagedAddress<M> where M: ManagedTypeApi {}
+impl<M> TypeAbiFrom<[u8; 32]> for ManagedAddress<M> where M: ManagedTypeApi {}
 
 #[cfg(feature = "alloc")]
 impl<M> CodecFrom<Address> for ManagedAddress<M> where M: ManagedTypeApi {}
@@ -286,3 +288,15 @@ impl<M> CodecFrom<ManagedAddress<M>> for Address where M: ManagedTypeApi {}
 
 #[cfg(feature = "alloc")]
 impl<M> CodecFrom<&ManagedAddress<M>> for Address where M: ManagedTypeApi {}
+
+#[cfg(feature = "alloc")]
+impl<M> TypeAbiFrom<Address> for ManagedAddress<M> where M: ManagedTypeApi {}
+
+#[cfg(feature = "alloc")]
+impl<M> TypeAbiFrom<&Address> for ManagedAddress<M> where M: ManagedTypeApi {}
+
+#[cfg(feature = "alloc")]
+impl<M> TypeAbiFrom<ManagedAddress<M>> for Address where M: ManagedTypeApi {}
+
+#[cfg(feature = "alloc")]
+impl<M> TypeAbiFrom<&ManagedAddress<M>> for Address where M: ManagedTypeApi {}
diff --git a/framework/base/src/types/managed/wrapped/managed_byte_array.rs b/framework/base/src/types/managed/wrapped/managed_byte_array.rs
index 79bc111792..b63064e7a4 100644
--- a/framework/base/src/types/managed/wrapped/managed_byte_array.rs
+++ b/framework/base/src/types/managed/wrapped/managed_byte_array.rs
@@ -206,6 +206,7 @@ where
 }
 
 impl<M, const N: usize> TypeAbiFrom<Self> for ManagedByteArray<M, N> where M: ManagedTypeApi {}
+impl<M, const N: usize> TypeAbiFrom<&Self> for ManagedByteArray<M, N> where M: ManagedTypeApi {}
 
 impl<M, const N: usize> TypeAbi for ManagedByteArray<M, N>
 where
diff --git a/framework/base/src/types/managed/wrapped/token_identifier.rs b/framework/base/src/types/managed/wrapped/token_identifier.rs
index 8eea09f437..6cb98703cc 100644
--- a/framework/base/src/types/managed/wrapped/token_identifier.rs
+++ b/framework/base/src/types/managed/wrapped/token_identifier.rs
@@ -169,6 +169,7 @@ impl<M> CodecFrom<&[u8]> for TokenIdentifier<M> where M: ManagedTypeApi {}
 impl<M> CodecFrom<Vec<u8>> for TokenIdentifier<M> where M: ManagedTypeApi {}
 
 impl<M: ManagedTypeApi> TypeAbiFrom<Self> for TokenIdentifier<M> {}
+impl<M: ManagedTypeApi> TypeAbiFrom<&Self> for TokenIdentifier<M> {}
 
 impl<M: ManagedTypeApi> TypeAbi for TokenIdentifier<M> {
     fn type_name() -> TypeName {
diff --git a/framework/base/src/types/static_buffer/sparse_array.rs b/framework/base/src/types/static_buffer/sparse_array.rs
index 9d35219466..2c5a0b6900 100644
--- a/framework/base/src/types/static_buffer/sparse_array.rs
+++ b/framework/base/src/types/static_buffer/sparse_array.rs
@@ -305,6 +305,7 @@ where
 }
 
 impl<E, const CAPACITY: usize> TypeAbiFrom<Self> for SparseArray<E, CAPACITY> where E: ErrorApi {}
+impl<E, const CAPACITY: usize> TypeAbiFrom<&Self> for SparseArray<E, CAPACITY> where E: ErrorApi {}
 
 impl<E, const CAPACITY: usize> TypeAbi for SparseArray<E, CAPACITY>
 where
diff --git a/framework/derive/src/type_abi_derive.rs b/framework/derive/src/type_abi_derive.rs
index 3c95ca3dda..e9e9db4008 100644
--- a/framework/derive/src/type_abi_derive.rs
+++ b/framework/derive/src/type_abi_derive.rs
@@ -124,6 +124,7 @@ pub fn type_abi_derive(input: proc_macro::TokenStream) -> proc_macro2::TokenStre
     let (impl_generics, ty_generics, where_clause) = &ast.generics.split_for_impl();
     quote! {
         impl #impl_generics multiversx_sc::abi::TypeAbiFrom<Self> for #name #ty_generics #where_clause {}
+        impl #impl_generics multiversx_sc::abi::TypeAbiFrom<&Self> for #name #ty_generics #where_clause {}
 
         impl #impl_generics multiversx_sc::abi::TypeAbi for #name #ty_generics #where_clause {
             fn type_name() -> multiversx_sc::abi::TypeName {
diff --git a/framework/meta/src/cmd/contract/generate_proxy/proxy_generator.rs b/framework/meta/src/cmd/contract/generate_proxy/proxy_generator.rs
index 82f37cdfba..59f00e22c7 100644
--- a/framework/meta/src/cmd/contract/generate_proxy/proxy_generator.rs
+++ b/framework/meta/src/cmd/contract/generate_proxy/proxy_generator.rs
@@ -372,7 +372,7 @@ where
 
     fn write_argument(&mut self, index: usize, rust_name: &str) {
         let adjusted = self.adjust_type_name_with_env_api(rust_name);
-        self.writeln(format!("        Arg{index}: CodecInto<{adjusted}>,"));
+        self.writeln(format!("        Arg{index}: ProxyArg<{adjusted}>,"));
     }
 
     fn write_parameters(&mut self, inputs: &[InputAbi]) {
diff --git a/framework/scenario/src/facade/expr/bech32_address.rs b/framework/scenario/src/facade/expr/bech32_address.rs
index abc9d00cff..4cfa9b2bf5 100644
--- a/framework/scenario/src/facade/expr/bech32_address.rs
+++ b/framework/scenario/src/facade/expr/bech32_address.rs
@@ -2,6 +2,7 @@ use std::fmt::Display;
 
 use crate::bech32;
 use multiversx_sc::{
+    abi::TypeAbiFrom,
     api::ManagedTypeApi,
     codec::*,
     types::{
@@ -180,6 +181,9 @@ impl TopDecode for Bech32Address {
 impl<M> CodecFrom<Bech32Address> for ManagedAddress<M> where M: ManagedTypeApi {}
 impl<M> CodecFrom<&Bech32Address> for ManagedAddress<M> where M: ManagedTypeApi {}
 
+impl<M> TypeAbiFrom<Bech32Address> for ManagedAddress<M> where M: ManagedTypeApi {}
+impl<M> TypeAbiFrom<&Bech32Address> for ManagedAddress<M> where M: ManagedTypeApi {}
+
 impl Serialize for Bech32Address {
     fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
     where

From a6b72556e131e285c6af01c15edb0c05a3a8d05e Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Sat, 4 May 2024 15:53:59 +0300
Subject: [PATCH 0811/1254] TypeAbiFrom in old proxies

---
 .../types/managed/multi_value/multi_value_encoded.rs   |  7 +++++++
 .../managed/wrapped/egld_or_esdt_token_identifier.rs   |  4 +++-
 .../base/src/types/managed/wrapped/token_identifier.rs |  4 +++-
 framework/derive/src/generate/proxy_gen.rs             |  2 +-
 framework/scenario/src/facade/contract_info.rs         | 10 ++++++++--
 5 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/framework/base/src/types/managed/multi_value/multi_value_encoded.rs b/framework/base/src/types/managed/multi_value/multi_value_encoded.rs
index 6154942fa6..1548f8ebd4 100644
--- a/framework/base/src/types/managed/multi_value/multi_value_encoded.rs
+++ b/framework/base/src/types/managed/multi_value/multi_value_encoded.rs
@@ -229,6 +229,13 @@ where
 {
 }
 
+impl<M, T> TypeAbiFrom<&Self> for MultiValueEncoded<M, T>
+where
+    M: ManagedTypeApi,
+    T: TypeAbi,
+{
+}
+
 impl<M, T> TypeAbi for MultiValueEncoded<M, T>
 where
     M: ManagedTypeApi,
diff --git a/framework/base/src/types/managed/wrapped/egld_or_esdt_token_identifier.rs b/framework/base/src/types/managed/wrapped/egld_or_esdt_token_identifier.rs
index a31a4d6d02..e8bcf44c05 100644
--- a/framework/base/src/types/managed/wrapped/egld_or_esdt_token_identifier.rs
+++ b/framework/base/src/types/managed/wrapped/egld_or_esdt_token_identifier.rs
@@ -210,12 +210,14 @@ impl<M> CodecFromSelf for EgldOrEsdtTokenIdentifier<M> where M: ManagedTypeApi {
 
 impl<M> CodecFrom<TokenIdentifier<M>> for EgldOrEsdtTokenIdentifier<M> where M: ManagedTypeApi {}
 impl<M> CodecFrom<&TokenIdentifier<M>> for EgldOrEsdtTokenIdentifier<M> where M: ManagedTypeApi {}
-
 impl<M> CodecFrom<&[u8]> for EgldOrEsdtTokenIdentifier<M> where M: ManagedTypeApi {}
 impl<M> CodecFrom<&str> for EgldOrEsdtTokenIdentifier<M> where M: ManagedTypeApi {}
 
 impl<M> TypeAbiFrom<TokenIdentifier<M>> for EgldOrEsdtTokenIdentifier<M> where M: ManagedTypeApi {}
 impl<M> TypeAbiFrom<&TokenIdentifier<M>> for EgldOrEsdtTokenIdentifier<M> where M: ManagedTypeApi {}
+impl<M> TypeAbiFrom<&[u8]> for EgldOrEsdtTokenIdentifier<M> where M: ManagedTypeApi {}
+impl<M> TypeAbiFrom<&str> for EgldOrEsdtTokenIdentifier<M> where M: ManagedTypeApi {}
+
 impl<'a, M> TypeAbiFrom<TestTokenIdentifier<'a>> for EgldOrEsdtTokenIdentifier<M> where
     M: ManagedTypeApi
 {
diff --git a/framework/base/src/types/managed/wrapped/token_identifier.rs b/framework/base/src/types/managed/wrapped/token_identifier.rs
index 6cb98703cc..3500fb99eb 100644
--- a/framework/base/src/types/managed/wrapped/token_identifier.rs
+++ b/framework/base/src/types/managed/wrapped/token_identifier.rs
@@ -165,9 +165,11 @@ impl<M: ManagedTypeApi> TopDecode for TokenIdentifier<M> {
 impl<M> CodecFromSelf for TokenIdentifier<M> where M: ManagedTypeApi {}
 
 impl<M> CodecFrom<&[u8]> for TokenIdentifier<M> where M: ManagedTypeApi {}
-
 impl<M> CodecFrom<Vec<u8>> for TokenIdentifier<M> where M: ManagedTypeApi {}
 
+impl<M> TypeAbiFrom<&[u8]> for TokenIdentifier<M> where M: ManagedTypeApi {}
+impl<M> TypeAbiFrom<Vec<u8>> for TokenIdentifier<M> where M: ManagedTypeApi {}
+
 impl<M: ManagedTypeApi> TypeAbiFrom<Self> for TokenIdentifier<M> {}
 impl<M: ManagedTypeApi> TypeAbiFrom<&Self> for TokenIdentifier<M> {}
 
diff --git a/framework/derive/src/generate/proxy_gen.rs b/framework/derive/src/generate/proxy_gen.rs
index b904c69f20..81b416c009 100644
--- a/framework/derive/src/generate/proxy_gen.rs
+++ b/framework/derive/src/generate/proxy_gen.rs
@@ -313,7 +313,7 @@ fn equivalent_encode_path_gen(ty: &syn::Type) -> syn::Path {
     let owned_type = convert_to_owned_type(ty);
     syn::parse_str(
         format!(
-            "multiversx_sc::codec::CodecInto<{}>",
+            "multiversx_sc::types::ProxyArg<{}>",
             owned_type.to_token_stream()
         )
         .as_str(),
diff --git a/framework/scenario/src/facade/contract_info.rs b/framework/scenario/src/facade/contract_info.rs
index 2652732494..d0df35df96 100644
--- a/framework/scenario/src/facade/contract_info.rs
+++ b/framework/scenario/src/facade/contract_info.rs
@@ -1,7 +1,8 @@
 use std::ops::{Deref, DerefMut};
 
-use multiversx_sc::types::{
-    AnnotatedValue, ManagedBuffer, TxEnv, TxFrom, TxFromSpecified, TxTo, TxToSpecified,
+use multiversx_sc::{
+    abi::TypeAbiFrom,
+    types::{AnnotatedValue, ManagedBuffer, TxEnv, TxFrom, TxFromSpecified, TxTo, TxToSpecified},
 };
 
 use crate::multiversx_sc::{
@@ -108,6 +109,11 @@ impl<P: ProxyObjNew> CodecFrom<&ContractInfo<P>> for Address {}
 impl<M: ManagedTypeApi, P: ProxyObjNew> CodecFrom<ContractInfo<P>> for ManagedAddress<M> {}
 impl<M: ManagedTypeApi, P: ProxyObjNew> CodecFrom<&ContractInfo<P>> for ManagedAddress<M> {}
 
+impl<P: ProxyObjNew> TypeAbiFrom<ContractInfo<P>> for Address {}
+impl<P: ProxyObjNew> TypeAbiFrom<&ContractInfo<P>> for Address {}
+impl<M: ManagedTypeApi, P: ProxyObjNew> TypeAbiFrom<ContractInfo<P>> for ManagedAddress<M> {}
+impl<M: ManagedTypeApi, P: ProxyObjNew> TypeAbiFrom<&ContractInfo<P>> for ManagedAddress<M> {}
+
 impl<Env, P> AnnotatedValue<Env, ManagedAddress<Env::Api>> for &ContractInfo<P>
 where
     Env: TxEnv,

From 99294647807dd709eba277f2d87b51a6216d12eb Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Sat, 4 May 2024 17:12:12 +0300
Subject: [PATCH 0812/1254] cleanup

---
 contracts/examples/rewards-distribution/sc-config.toml | 3 ---
 framework/base/src/types/managed/basic/big_int.rs      | 3 +++
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/contracts/examples/rewards-distribution/sc-config.toml b/contracts/examples/rewards-distribution/sc-config.toml
index 888d97a79f..9661ab3dc5 100644
--- a/contracts/examples/rewards-distribution/sc-config.toml
+++ b/contracts/examples/rewards-distribution/sc-config.toml
@@ -1,5 +1,2 @@
 [[proxy]]
 path = "src/rewards_distribution_proxy.rs"
-[[proxy.path-rename]]
-from = "multiversx_sc::types::io::operation_completion_status::"
-to = ""
diff --git a/framework/base/src/types/managed/basic/big_int.rs b/framework/base/src/types/managed/basic/big_int.rs
index 4d9fca8fe2..6026341975 100644
--- a/framework/base/src/types/managed/basic/big_int.rs
+++ b/framework/base/src/types/managed/basic/big_int.rs
@@ -102,6 +102,9 @@ macro_rules! big_int_conv_num {
 
         impl<M: ManagedTypeApi> CodecFrom<$num_ty> for BigInt<M> {}
         impl<M: ManagedTypeApi> CodecFrom<&$num_ty> for BigInt<M> {}
+
+        impl<M: ManagedTypeApi> TypeAbiFrom<$num_ty> for BigInt<M> {}
+        impl<M: ManagedTypeApi> TypeAbiFrom<&$num_ty> for BigInt<M> {}
     };
 }
 

From b4acf882baa3623748c5c64d953f64ad3152709e Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Sat, 4 May 2024 17:13:01 +0300
Subject: [PATCH 0813/1254] proxy gen - type_abi annotation

---
 .../examples/crowdfunding-esdt/src/crowdfunding_esdt_proxy.rs | 1 +
 contracts/examples/crypto-zombies/src/proxy_crypto_zombies.rs | 1 +
 contracts/examples/digital-cash/src/digital_cash_proxy.rs     | 2 ++
 contracts/examples/multisig/src/multisig_proxy.rs             | 4 ++++
 .../rewards-distribution/src/seed_nft_minter_proxy.rs         | 1 +
 .../meta/src/cmd/contract/generate_proxy/proxy_generator.rs   | 1 +
 6 files changed, 10 insertions(+)

diff --git a/contracts/examples/crowdfunding-esdt/src/crowdfunding_esdt_proxy.rs b/contracts/examples/crowdfunding-esdt/src/crowdfunding_esdt_proxy.rs
index 08c8d0ef14..a1fe1dddda 100644
--- a/contracts/examples/crowdfunding-esdt/src/crowdfunding_esdt_proxy.rs
+++ b/contracts/examples/crowdfunding-esdt/src/crowdfunding_esdt_proxy.rs
@@ -140,6 +140,7 @@ where
     }
 }
 
+#[type_abi]
 #[derive(TopEncode, TopDecode, PartialEq, Eq, Clone, Copy, Debug)]
 pub enum Status {
     FundingPeriod,
diff --git a/contracts/examples/crypto-zombies/src/proxy_crypto_zombies.rs b/contracts/examples/crypto-zombies/src/proxy_crypto_zombies.rs
index 7f490cccbd..1e056fee19 100644
--- a/contracts/examples/crypto-zombies/src/proxy_crypto_zombies.rs
+++ b/contracts/examples/crypto-zombies/src/proxy_crypto_zombies.rs
@@ -272,6 +272,7 @@ where
     }
 }
 
+#[type_abi]
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct Zombie<Api>
 where
diff --git a/contracts/examples/digital-cash/src/digital_cash_proxy.rs b/contracts/examples/digital-cash/src/digital_cash_proxy.rs
index ad7a29fe7e..85e7dc06ae 100644
--- a/contracts/examples/digital-cash/src/digital_cash_proxy.rs
+++ b/contracts/examples/digital-cash/src/digital_cash_proxy.rs
@@ -236,6 +236,7 @@ where
     }
 }
 
+#[type_abi]
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct DepositInfo<Api>
 where
@@ -249,6 +250,7 @@ where
     pub fees: Fee<Api>,
 }
 
+#[type_abi]
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct Fee<Api>
 where
diff --git a/contracts/examples/multisig/src/multisig_proxy.rs b/contracts/examples/multisig/src/multisig_proxy.rs
index 1d39617160..6f789f298a 100644
--- a/contracts/examples/multisig/src/multisig_proxy.rs
+++ b/contracts/examples/multisig/src/multisig_proxy.rs
@@ -491,6 +491,7 @@ where
     }
 }
 
+#[type_abi]
 #[derive(TopEncode)]
 pub struct ActionFullInfo<Api>
 where
@@ -502,6 +503,7 @@ where
 }
 
 #[rustfmt::skip]
+#[type_abi]
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, Clone)]
 pub enum Action<Api>
 where
@@ -529,6 +531,7 @@ where
     },
 }
 
+#[type_abi]
 #[derive(NestedEncode, NestedDecode, Clone)]
 pub struct CallActionData<Api>
 where
@@ -540,6 +543,7 @@ where
     pub arguments: ManagedVec<Api, ManagedBuffer<Api>>,
 }
 
+#[type_abi]
 #[derive(TopEncode, TopDecode)]
 pub enum UserRole {
     None,
diff --git a/contracts/examples/rewards-distribution/src/seed_nft_minter_proxy.rs b/contracts/examples/rewards-distribution/src/seed_nft_minter_proxy.rs
index 49186da9ce..84349daae7 100644
--- a/contracts/examples/rewards-distribution/src/seed_nft_minter_proxy.rs
+++ b/contracts/examples/rewards-distribution/src/seed_nft_minter_proxy.rs
@@ -182,6 +182,7 @@ where
     }
 }
 
+#[type_abi]
 #[derive(ManagedVecItem, NestedEncode, NestedDecode)]
 pub struct Distribution<Api>
 where
diff --git a/framework/meta/src/cmd/contract/generate_proxy/proxy_generator.rs b/framework/meta/src/cmd/contract/generate_proxy/proxy_generator.rs
index 59f00e22c7..391f93aaa6 100644
--- a/framework/meta/src/cmd/contract/generate_proxy/proxy_generator.rs
+++ b/framework/meta/src/cmd/contract/generate_proxy/proxy_generator.rs
@@ -530,6 +530,7 @@ where
         name: &str,
     ) {
         self.writeln("");
+        self.writeln("#[type_abi]");
         self.write_macro_attributes(&type_description.macro_attributes);
         self.write(format!(r#"pub {type_type} {name}"#));
 

From 612f55c4bd391a952c739d8a37cb47e68d1baed8 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Sat, 4 May 2024 18:12:46 +0300
Subject: [PATCH 0814/1254] TypeAbiFrom in legacy tests/interactor

---
 framework/base/src/abi/type_abi_impl_basic.rs |  2 +-
 .../base/src/abi/type_abi_impl_codec_multi.rs |  2 +-
 .../contract_call_legacy/contract_deploy.rs   | 10 ++++---
 .../interaction/tx_exec/tx_exec_deploy.rs     |  7 +++--
 .../src/facade/scenario_world_steps.rs        | 28 +++++++++++--------
 .../src/scenario/model/step/sc_call_step.rs   |  9 ++++--
 .../src/scenario/model/step/sc_query_step.rs  | 12 ++++----
 .../src/scenario/model/step/typed_sc_call.rs  | 15 ++++++----
 .../scenario/model/step/typed_sc_deploy.rs    | 14 ++++++----
 .../src/scenario/model/step/typed_sc_query.rs | 10 ++++---
 .../scenario/src/scenario/run_vm/sc_call.rs   |  5 ++--
 .../interactor_sc_extra.rs                    | 17 +++++------
 .../interactor_vm_query.rs                    |  4 +--
 13 files changed, 78 insertions(+), 57 deletions(-)

diff --git a/framework/base/src/abi/type_abi_impl_basic.rs b/framework/base/src/abi/type_abi_impl_basic.rs
index 4e93eda28a..2355f18834 100644
--- a/framework/base/src/abi/type_abi_impl_basic.rs
+++ b/framework/base/src/abi/type_abi_impl_basic.rs
@@ -33,7 +33,7 @@ impl<T: TypeAbi> TypeAbi for &T {
     }
 }
 
-impl<T, U> TypeAbiFrom<Box<T>> for U where T: TypeAbiFrom<U> {}
+impl<T, U> TypeAbiFrom<Box<U>> for Box<T> where T: TypeAbiFrom<U> {}
 
 impl<T: TypeAbi> TypeAbi for Box<T> {
     fn type_name() -> TypeName {
diff --git a/framework/base/src/abi/type_abi_impl_codec_multi.rs b/framework/base/src/abi/type_abi_impl_codec_multi.rs
index e347388625..043ff22a9a 100644
--- a/framework/base/src/abi/type_abi_impl_codec_multi.rs
+++ b/framework/base/src/abi/type_abi_impl_codec_multi.rs
@@ -32,7 +32,7 @@ impl<T: TypeAbi> TypeAbi for crate::codec::multi_types::MultiValueVec<T> {
     }
 }
 
-impl TypeAbiFrom<IgnoreValue> for IgnoreValue {}
+impl<T> TypeAbiFrom<T> for IgnoreValue {}
 
 impl TypeAbi for IgnoreValue {
     fn type_name() -> TypeName {
diff --git a/framework/base/src/types/interaction/contract_call_legacy/contract_deploy.rs b/framework/base/src/types/interaction/contract_call_legacy/contract_deploy.rs
index bdc15e5509..0cb83f408b 100644
--- a/framework/base/src/types/interaction/contract_call_legacy/contract_deploy.rs
+++ b/framework/base/src/types/interaction/contract_call_legacy/contract_deploy.rs
@@ -1,6 +1,8 @@
 use core::marker::PhantomData;
 
-use crate::codec::{CodecFrom, TopEncodeMulti};
+use multiversx_sc_codec::TopDecodeMulti;
+
+use crate::{abi::TypeAbiFrom, codec::TopEncodeMulti};
 
 use crate::{
     api::{BlockchainApiImpl, CallTypeApi},
@@ -101,7 +103,7 @@ where
         raw_result: ManagedVec<SA, ManagedBuffer<SA>>,
     ) -> RequestedResult
     where
-        RequestedResult: CodecFrom<OriginalResult>,
+        RequestedResult: TopDecodeMulti + TypeAbiFrom<OriginalResult>,
     {
         let mut loader = ManagedResultArgLoader::new(raw_result);
         let arg_id = ArgId::from(&b"init result"[..]);
@@ -118,7 +120,7 @@ where
         code_metadata: CodeMetadata,
     ) -> (ManagedAddress<SA>, RequestedResult)
     where
-        RequestedResult: CodecFrom<OriginalResult>,
+        RequestedResult: TopDecodeMulti + TypeAbiFrom<OriginalResult>,
     {
         let (address, raw_result) = SendRawWrapper::<SA>::new().deploy_contract(
             self.resolve_gas_limit(),
@@ -139,7 +141,7 @@ where
         code_metadata: CodeMetadata,
     ) -> (ManagedAddress<SA>, RequestedResult)
     where
-        RequestedResult: CodecFrom<OriginalResult>,
+        RequestedResult: TopDecodeMulti + TypeAbiFrom<OriginalResult>,
     {
         let (address, raw_result) = SendRawWrapper::<SA>::new().deploy_from_source_contract(
             self.resolve_gas_limit(),
diff --git a/framework/base/src/types/interaction/tx_exec/tx_exec_deploy.rs b/framework/base/src/types/interaction/tx_exec/tx_exec_deploy.rs
index 9ccb4bdd2a..ac93f909e8 100644
--- a/framework/base/src/types/interaction/tx_exec/tx_exec_deploy.rs
+++ b/framework/base/src/types/interaction/tx_exec/tx_exec_deploy.rs
@@ -1,6 +1,7 @@
-use multiversx_sc_codec::{CodecFrom, TopEncodeMulti};
+use multiversx_sc_codec::{TopDecodeMulti, TopEncodeMulti};
 
 use crate::{
+    abi::TypeAbiFrom,
     api::CallTypeApi,
     contract_base::SendRawWrapper,
     tuple_util::NestedTupleFlatten,
@@ -168,7 +169,7 @@ where
         code_metadata: CodeMetadata,
     ) -> (ManagedAddress<Api>, RequestedResult)
     where
-        RequestedResult: CodecFrom<OriginalResult>,
+        RequestedResult: TopDecodeMulti + TypeAbiFrom<OriginalResult>,
     {
         let (new_address, raw_results, _) = self
             .code(code.clone())
@@ -191,7 +192,7 @@ where
         code_metadata: CodeMetadata,
     ) -> (ManagedAddress<Api>, RequestedResult)
     where
-        RequestedResult: CodecFrom<OriginalResult>,
+        RequestedResult: TopDecodeMulti + TypeAbiFrom<OriginalResult>,
     {
         let (new_address, raw_results, _) = self
             .from_source(source_address.clone())
diff --git a/framework/scenario/src/facade/scenario_world_steps.rs b/framework/scenario/src/facade/scenario_world_steps.rs
index 37bc5e88c3..389b58ecf6 100644
--- a/framework/scenario/src/facade/scenario_world_steps.rs
+++ b/framework/scenario/src/facade/scenario_world_steps.rs
@@ -1,9 +1,13 @@
-use multiversx_sc::types::{heap::Address, ContractCall};
+use multiversx_sc::{
+    abi::TypeAbiFrom,
+    codec::TopDecodeMulti,
+    types::{heap::Address, ContractCall},
+};
 
 use crate::{
     api::StaticApi,
     facade::ScenarioWorld,
-    multiversx_sc::codec::{CodecFrom, TopEncodeMulti},
+    multiversx_sc::codec::TopEncodeMulti,
     scenario::{model::*, ScenarioRunner},
 };
 
@@ -47,7 +51,7 @@ impl ScenarioWorld {
     ) -> &mut Self
     where
         OriginalResult: TopEncodeMulti,
-        RequestedResult: CodecFrom<OriginalResult>,
+        RequestedResult: TopDecodeMulti + TypeAbiFrom<OriginalResult>,
         F: FnOnce(TypedResponse<RequestedResult>),
     {
         self.sc_call_use_raw_response(step, |response| {
@@ -62,7 +66,7 @@ impl ScenarioWorld {
     ) -> RequestedResult
     where
         OriginalResult: TopEncodeMulti,
-        RequestedResult: CodecFrom<OriginalResult>,
+        RequestedResult: TopDecodeMulti + TypeAbiFrom<OriginalResult>,
     {
         self.run_sc_call_step(&mut step.sc_call_step);
         let response = unwrap_response(&step.sc_call_step.response);
@@ -98,7 +102,7 @@ impl ScenarioWorld {
     ) -> &mut Self
     where
         OriginalResult: TopEncodeMulti,
-        RequestedResult: CodecFrom<OriginalResult>,
+        RequestedResult: TopDecodeMulti + TypeAbiFrom<OriginalResult>,
         F: FnOnce(TypedResponse<RequestedResult>),
     {
         self.sc_query_use_raw_response(step, |response| {
@@ -113,7 +117,7 @@ impl ScenarioWorld {
     ) -> RequestedResult
     where
         OriginalResult: TopEncodeMulti,
-        RequestedResult: CodecFrom<OriginalResult>,
+        RequestedResult: TopDecodeMulti + TypeAbiFrom<OriginalResult>,
     {
         self.run_sc_query_step(&mut step.sc_query_step);
         let response = unwrap_response(&step.sc_query_step.response);
@@ -129,7 +133,7 @@ impl ScenarioWorld {
     pub fn quick_query<CC, RequestedResult>(&mut self, contract_call: CC) -> RequestedResult
     where
         CC: ContractCall<StaticApi>,
-        RequestedResult: CodecFrom<CC::OriginalResult>,
+        RequestedResult: TopDecodeMulti + TypeAbiFrom<CC::OriginalResult>,
     {
         self.sc_query_get_result(ScQueryStep::new().call(contract_call))
     }
@@ -166,7 +170,7 @@ impl ScenarioWorld {
     ) -> &mut Self
     where
         OriginalResult: TopEncodeMulti,
-        RequestedResult: CodecFrom<OriginalResult>,
+        RequestedResult: TopDecodeMulti + TypeAbiFrom<OriginalResult>,
         F: FnOnce(Address, TypedResponse<RequestedResult>),
     {
         self.sc_deploy_use_raw_response(step, |response| {
@@ -182,7 +186,7 @@ impl ScenarioWorld {
     ) -> (Address, RequestedResult)
     where
         OriginalResult: TopEncodeMulti,
-        RequestedResult: CodecFrom<OriginalResult>,
+        RequestedResult: TopDecodeMulti + TypeAbiFrom<OriginalResult>,
     {
         self.run_sc_deploy_step(&mut step.sc_deploy_step);
         let response = unwrap_response(&step.sc_deploy_step.response);
@@ -223,7 +227,7 @@ impl TypedScCallExecutor for ScenarioWorld {
     ) -> RequestedResult
     where
         OriginalResult: TopEncodeMulti,
-        RequestedResult: CodecFrom<OriginalResult>,
+        RequestedResult: TopDecodeMulti + TypeAbiFrom<OriginalResult>,
     {
         self.sc_call_get_result(typed_sc_call)
     }
@@ -236,7 +240,7 @@ impl TypedScDeployExecutor for ScenarioWorld {
     ) -> (Address, RequestedResult)
     where
         OriginalResult: TopEncodeMulti,
-        RequestedResult: CodecFrom<OriginalResult>,
+        RequestedResult: TopDecodeMulti + TypeAbiFrom<OriginalResult>,
     {
         self.sc_deploy_get_result(typed_sc_call)
     }
@@ -254,7 +258,7 @@ impl TypedScQueryExecutor for ScenarioWorld {
     ) -> RequestedResult
     where
         OriginalResult: TopEncodeMulti,
-        RequestedResult: CodecFrom<OriginalResult>,
+        RequestedResult: TopDecodeMulti + TypeAbiFrom<OriginalResult>,
     {
         self.sc_query_get_result(typed_sc_query)
     }
diff --git a/framework/scenario/src/scenario/model/step/sc_call_step.rs b/framework/scenario/src/scenario/model/step/sc_call_step.rs
index e971cbaf23..3bcd3d861e 100644
--- a/framework/scenario/src/scenario/model/step/sc_call_step.rs
+++ b/framework/scenario/src/scenario/model/step/sc_call_step.rs
@@ -1,4 +1,7 @@
-use multiversx_sc::types::{ContractCallBase, H256};
+use multiversx_sc::{
+    abi::TypeAbiFrom,
+    types::{ContractCallBase, H256},
+};
 
 use crate::{
     api::StaticApi,
@@ -7,7 +10,7 @@ use crate::{
 };
 
 use crate::multiversx_sc::{
-    codec::{CodecFrom, PanicErrorHandler, TopEncodeMulti},
+    codec::{PanicErrorHandler, TopEncodeMulti},
     types::{ContractCall, ManagedArgBuffer},
 };
 
@@ -174,7 +177,7 @@ impl ScCallStep {
     ) -> TypedScCall<CC::OriginalResult>
     where
         CC: ContractCall<StaticApi>,
-        ExpectedResult: CodecFrom<CC::OriginalResult> + TopEncodeMulti,
+        ExpectedResult: TypeAbiFrom<CC::OriginalResult> + TopEncodeMulti,
     {
         self.call(contract_call).expect_value(expected_value)
     }
diff --git a/framework/scenario/src/scenario/model/step/sc_query_step.rs b/framework/scenario/src/scenario/model/step/sc_query_step.rs
index 8e62ff5473..7a99fd4163 100644
--- a/framework/scenario/src/scenario/model/step/sc_query_step.rs
+++ b/framework/scenario/src/scenario/model/step/sc_query_step.rs
@@ -1,12 +1,12 @@
-use multiversx_sc::types::{ContractCallBase, H256};
+use multiversx_sc::{
+    abi::TypeAbiFrom,
+    types::{ContractCallBase, H256},
+};
 use num_traits::Zero;
 
 use crate::{
     api::StaticApi,
-    multiversx_sc::{
-        codec::{CodecFrom, TopEncodeMulti},
-        types::ContractCall,
-    },
+    multiversx_sc::{codec::TopEncodeMulti, types::ContractCall},
     scenario::model::{AddressValue, BytesValue, TxExpect, TxQuery},
     scenario_model::TxResponse,
 };
@@ -96,7 +96,7 @@ impl ScQueryStep {
     ) -> TypedScQuery<CC::OriginalResult>
     where
         CC: ContractCall<StaticApi>,
-        ExpectedResult: CodecFrom<CC::OriginalResult> + TopEncodeMulti,
+        ExpectedResult: TypeAbiFrom<CC::OriginalResult> + TopEncodeMulti,
     {
         let typed = self.call(contract_call);
         typed.expect_value(expected_value)
diff --git a/framework/scenario/src/scenario/model/step/typed_sc_call.rs b/framework/scenario/src/scenario/model/step/typed_sc_call.rs
index bf939ee590..084cd3e71f 100644
--- a/framework/scenario/src/scenario/model/step/typed_sc_call.rs
+++ b/framework/scenario/src/scenario/model/step/typed_sc_call.rs
@@ -1,8 +1,11 @@
 use std::marker::PhantomData;
 
-use multiversx_sc::codec::PanicErrorHandler;
+use multiversx_sc::{
+    abi::TypeAbiFrom,
+    codec::{PanicErrorHandler, TopDecodeMulti},
+};
 
-use crate::multiversx_sc::codec::{CodecFrom, TopEncodeMulti};
+use crate::multiversx_sc::codec::TopEncodeMulti;
 
 use crate::{
     scenario::model::{AddressValue, U64Value},
@@ -22,7 +25,7 @@ impl<OriginalResult> TypedScCall<OriginalResult> {
     pub fn result<RequestedResult>(&self) -> Result<RequestedResult, TxResponseStatus>
     where
         OriginalResult: TopEncodeMulti,
-        RequestedResult: CodecFrom<OriginalResult>,
+        RequestedResult: TopDecodeMulti + TypeAbiFrom<OriginalResult>,
     {
         let mut raw_result = self.response().out.clone();
         Ok(
@@ -109,7 +112,7 @@ impl<OriginalResult> TypedScCall<OriginalResult> {
     pub fn expect_value<ExpectedResult>(self, expected_value: ExpectedResult) -> Self
     where
         OriginalResult: TopEncodeMulti,
-        ExpectedResult: CodecFrom<OriginalResult> + TopEncodeMulti,
+        ExpectedResult: TypeAbiFrom<OriginalResult> + TopEncodeMulti,
     {
         self.expect(format_expect(expected_value))
     }
@@ -151,7 +154,7 @@ pub trait TypedScCallExecutor {
     ) -> RequestedResult
     where
         OriginalResult: TopEncodeMulti,
-        RequestedResult: CodecFrom<OriginalResult>;
+        RequestedResult: TopDecodeMulti + TypeAbiFrom<OriginalResult>;
 }
 
 impl<OriginalResult> TypedScCall<OriginalResult>
@@ -164,7 +167,7 @@ where
         executor: &mut E,
     ) -> RequestedResult
     where
-        RequestedResult: CodecFrom<OriginalResult>,
+        RequestedResult: TopDecodeMulti + TypeAbiFrom<OriginalResult>,
     {
         executor.execute_typed_sc_call(self)
     }
diff --git a/framework/scenario/src/scenario/model/step/typed_sc_deploy.rs b/framework/scenario/src/scenario/model/step/typed_sc_deploy.rs
index c440f9bd29..74249e8f97 100644
--- a/framework/scenario/src/scenario/model/step/typed_sc_deploy.rs
+++ b/framework/scenario/src/scenario/model/step/typed_sc_deploy.rs
@@ -1,11 +1,15 @@
 use std::marker::PhantomData;
 
-use multiversx_sc::{codec::PanicErrorHandler, types::ContractDeploy};
+use multiversx_sc::{
+    abi::TypeAbiFrom,
+    codec::{PanicErrorHandler, TopDecodeMulti},
+    types::ContractDeploy,
+};
 
 use crate::{
     api::StaticApi,
     multiversx_sc::{
-        codec::{CodecFrom, TopEncodeMulti},
+        codec::TopEncodeMulti,
         types::{Address, CodeMetadata},
     },
     scenario_format::interpret_trait::InterpreterContext,
@@ -27,7 +31,7 @@ impl<OriginalResult> TypedScDeploy<OriginalResult> {
     pub fn result<RequestedResult>(&self) -> Result<RequestedResult, TxResponseStatus>
     where
         OriginalResult: TopEncodeMulti,
-        RequestedResult: CodecFrom<OriginalResult>,
+        RequestedResult: TopDecodeMulti + TypeAbiFrom<OriginalResult>,
     {
         let mut raw_result = self.response().out.clone();
         Ok(
@@ -145,7 +149,7 @@ pub trait TypedScDeployExecutor {
     ) -> (Address, RequestedResult)
     where
         OriginalResult: TopEncodeMulti,
-        RequestedResult: CodecFrom<OriginalResult>;
+        RequestedResult: TopDecodeMulti + TypeAbiFrom<OriginalResult>;
 }
 
 impl<OriginalResult> TypedScDeploy<OriginalResult>
@@ -158,7 +162,7 @@ where
         executor: &mut E,
     ) -> (Address, RequestedResult)
     where
-        RequestedResult: CodecFrom<OriginalResult>,
+        RequestedResult: TopDecodeMulti + TypeAbiFrom<OriginalResult>,
     {
         executor.execute_typed_sc_deploy(self)
     }
diff --git a/framework/scenario/src/scenario/model/step/typed_sc_query.rs b/framework/scenario/src/scenario/model/step/typed_sc_query.rs
index 60b3b91818..3e7e819c4e 100644
--- a/framework/scenario/src/scenario/model/step/typed_sc_query.rs
+++ b/framework/scenario/src/scenario/model/step/typed_sc_query.rs
@@ -1,6 +1,8 @@
 use std::marker::PhantomData;
 
-use crate::multiversx_sc::codec::{CodecFrom, TopEncodeMulti};
+use multiversx_sc::{abi::TypeAbiFrom, codec::TopDecodeMulti};
+
+use crate::multiversx_sc::codec::TopEncodeMulti;
 
 use crate::{
     scenario::model::{AddressValue, BytesValue, TxExpect},
@@ -72,7 +74,7 @@ impl<OriginalResult> TypedScQuery<OriginalResult> {
     pub fn expect_value<ExpectedResult>(self, expected_value: ExpectedResult) -> Self
     where
         OriginalResult: TopEncodeMulti,
-        ExpectedResult: CodecFrom<OriginalResult> + TopEncodeMulti,
+        ExpectedResult: TypeAbiFrom<OriginalResult> + TopEncodeMulti,
     {
         self.expect(format_expect(expected_value))
     }
@@ -105,7 +107,7 @@ pub trait TypedScQueryExecutor {
     ) -> RequestedResult
     where
         OriginalResult: TopEncodeMulti,
-        RequestedResult: CodecFrom<OriginalResult>;
+        RequestedResult: TopDecodeMulti + TypeAbiFrom<OriginalResult>;
 }
 
 impl<OriginalResult> TypedScQuery<OriginalResult>
@@ -118,7 +120,7 @@ where
         executor: &mut E,
     ) -> RequestedResult
     where
-        RequestedResult: CodecFrom<OriginalResult>,
+        RequestedResult: TopDecodeMulti + TypeAbiFrom<OriginalResult>,
     {
         executor.execute_typed_sc_query(self)
     }
diff --git a/framework/scenario/src/scenario/run_vm/sc_call.rs b/framework/scenario/src/scenario/run_vm/sc_call.rs
index abbe9ee6ff..ceb9863478 100644
--- a/framework/scenario/src/scenario/run_vm/sc_call.rs
+++ b/framework/scenario/src/scenario/run_vm/sc_call.rs
@@ -1,5 +1,5 @@
 use crate::{
-    multiversx_sc::codec::{CodecFrom, PanicErrorHandler, TopEncodeMulti},
+    multiversx_sc::codec::{PanicErrorHandler, TopEncodeMulti},
     scenario::model::{ScCallStep, TxESDT, TypedScCall},
     scenario_model::TxResponse,
 };
@@ -8,6 +8,7 @@ use multiversx_chain_vm::{
     tx_execution::execute_current_tx_context_input,
     tx_mock::{TxInput, TxResult, TxTokenTransfer},
 };
+use multiversx_sc::{abi::TypeAbiFrom, codec::TopDecodeMulti};
 
 use super::{check_tx_output, tx_input_util::generate_tx_hash, ScenarioVMRunner};
 
@@ -34,7 +35,7 @@ impl ScenarioVMRunner {
     ) -> RequestedResult
     where
         OriginalResult: TopEncodeMulti,
-        RequestedResult: CodecFrom<OriginalResult>,
+        RequestedResult: TopDecodeMulti + TypeAbiFrom<OriginalResult>,
     {
         let sc_call_step: ScCallStep = typed_sc_call.into();
         let tx_result =
diff --git a/framework/snippets/src/interactor_scenario/interactor_sc_extra.rs b/framework/snippets/src/interactor_scenario/interactor_sc_extra.rs
index 277adcd6e9..8d25f32e9d 100644
--- a/framework/snippets/src/interactor_scenario/interactor_sc_extra.rs
+++ b/framework/snippets/src/interactor_scenario/interactor_sc_extra.rs
@@ -2,7 +2,8 @@ use crate::Interactor;
 use multiversx_sc_scenario::{
     api::StaticApi,
     multiversx_sc::{
-        codec::{CodecFrom, TopEncodeMulti},
+        abi::TypeAbiFrom,
+        codec::{TopDecodeMulti, TopEncodeMulti},
         types::{Address, ContractCallBase},
     },
     scenario_model::{
@@ -34,7 +35,7 @@ impl Interactor {
     ) -> &mut Self
     where
         OriginalResult: TopEncodeMulti,
-        RequestedResult: CodecFrom<OriginalResult>,
+        RequestedResult: TopDecodeMulti + TypeAbiFrom<OriginalResult>,
         F: FnOnce(TypedResponse<RequestedResult>),
     {
         use_result(self.sc_call_get_result(step).await);
@@ -47,7 +48,7 @@ impl Interactor {
     ) -> TypedResponse<RequestedResult>
     where
         OriginalResult: TopEncodeMulti,
-        RequestedResult: CodecFrom<OriginalResult>,
+        RequestedResult: TopDecodeMulti + TypeAbiFrom<OriginalResult>,
     {
         self.sc_call(step.as_mut()).await;
         let response = unwrap_response(&step.as_mut().response);
@@ -76,7 +77,7 @@ impl Interactor {
     ) -> &mut Self
     where
         OriginalResult: TopEncodeMulti,
-        RequestedResult: CodecFrom<OriginalResult>,
+        RequestedResult: TopDecodeMulti + TypeAbiFrom<OriginalResult>,
         F: FnOnce(TypedResponse<RequestedResult>),
     {
         use_result(self.sc_query_get_result(step).await);
@@ -89,7 +90,7 @@ impl Interactor {
     ) -> TypedResponse<RequestedResult>
     where
         OriginalResult: TopEncodeMulti,
-        RequestedResult: CodecFrom<OriginalResult>,
+        RequestedResult: TopDecodeMulti + TypeAbiFrom<OriginalResult>,
     {
         self.sc_query(step.as_mut()).await;
         let response = unwrap_response(&step.sc_query_step.response);
@@ -99,7 +100,7 @@ impl Interactor {
     pub async fn quick_query<CC, RequestedResult>(&mut self, contract_call: CC) -> RequestedResult
     where
         CC: ContractCallBase<StaticApi>,
-        RequestedResult: CodecFrom<CC::OriginalResult>,
+        RequestedResult: TopDecodeMulti + TypeAbiFrom<CC::OriginalResult>,
     {
         let mut typed_sc_query = ScQueryStep::new().call(contract_call);
         self.sc_query(&mut typed_sc_query).await;
@@ -130,7 +131,7 @@ impl Interactor {
     ) -> &mut Self
     where
         OriginalResult: TopEncodeMulti,
-        RequestedResult: CodecFrom<OriginalResult>,
+        RequestedResult: TopDecodeMulti + TypeAbiFrom<OriginalResult>,
         F: FnOnce(Address, TypedResponse<RequestedResult>),
     {
         let (new_address, response) = self.sc_deploy_get_result(step).await;
@@ -144,7 +145,7 @@ impl Interactor {
     ) -> (Address, TypedResponse<RequestedResult>)
     where
         OriginalResult: TopEncodeMulti,
-        RequestedResult: CodecFrom<OriginalResult>,
+        RequestedResult: TopDecodeMulti + TypeAbiFrom<OriginalResult>,
     {
         self.sc_deploy(step.as_mut()).await;
         let response = unwrap_response(&step.sc_deploy_step.response);
diff --git a/framework/snippets/src/interactor_scenario/interactor_vm_query.rs b/framework/snippets/src/interactor_scenario/interactor_vm_query.rs
index 56a54961d2..d08c114623 100644
--- a/framework/snippets/src/interactor_scenario/interactor_vm_query.rs
+++ b/framework/snippets/src/interactor_scenario/interactor_vm_query.rs
@@ -3,7 +3,7 @@ use log::info;
 use multiversx_sc_scenario::{
     api::StaticApi,
     mandos_system::ScenarioRunner,
-    multiversx_sc::{codec::CodecFrom, types::ContractCall},
+    multiversx_sc::{abi::TypeAbiFrom, codec::TopDecodeMulti, types::ContractCall},
     scenario_model::{ScQueryStep, TxResponse},
 };
 use multiversx_sdk::{data::vm::VmValueRequest, utils::base64_decode};
@@ -50,7 +50,7 @@ impl Interactor {
     pub async fn vm_query<CC, RequestedResult>(&mut self, contract_call: CC) -> RequestedResult
     where
         CC: ContractCall<StaticApi>,
-        RequestedResult: CodecFrom<CC::OriginalResult>,
+        RequestedResult: TopDecodeMulti + TypeAbiFrom<CC::OriginalResult>,
     {
         self.quick_query(contract_call).await
     }

From 81f975c3be455d655aafbd419f58d33c7fd28663 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Sat, 4 May 2024 18:20:00 +0300
Subject: [PATCH 0815/1254] TypeAbiFrom in result handlers

---
 .../result_handlers/returns_result_conv.rs          | 13 ++++++-------
 .../interaction/result_handlers/with_result_conv.rs | 13 ++++++-------
 .../src/facade/result_handlers/expect_value.rs      |  7 ++++---
 .../src/facade/world_tx/scenario_rh_impl.rs         |  9 ++++-----
 4 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/framework/base/src/types/interaction/result_handlers/returns_result_conv.rs b/framework/base/src/types/interaction/result_handlers/returns_result_conv.rs
index 05f2dfaa3d..842ae01eb8 100644
--- a/framework/base/src/types/interaction/result_handlers/returns_result_conv.rs
+++ b/framework/base/src/types/interaction/result_handlers/returns_result_conv.rs
@@ -1,9 +1,10 @@
 use core::marker::PhantomData;
 
-use multiversx_sc_codec::{CodecFrom, TopEncodeMulti};
+use multiversx_sc_codec::TopDecodeMulti;
 
-use crate::types::{
-    interaction::decode_result, RHListItem, RHListItemExec, SyncCallRawResult, TxEnv,
+use crate::{
+    abi::TypeAbiFrom,
+    types::{interaction::decode_result, RHListItem, RHListItemExec, SyncCallRawResult, TxEnv},
 };
 
 /// Indicates that result will be returned.
@@ -30,8 +31,7 @@ impl<T> ReturnsResultAs<T> {
 impl<Env, Original, T> RHListItem<Env, Original> for ReturnsResultAs<T>
 where
     Env: TxEnv,
-    Original: TopEncodeMulti,
-    T: CodecFrom<Original>,
+    T: TopDecodeMulti + TypeAbiFrom<Original>,
 {
     type Returns = T;
 }
@@ -40,8 +40,7 @@ impl<Env, Original, T> RHListItemExec<SyncCallRawResult<Env::Api>, Env, Original
     for ReturnsResultAs<T>
 where
     Env: TxEnv,
-    Original: TopEncodeMulti,
-    T: CodecFrom<Original>,
+    T: TopDecodeMulti + TypeAbiFrom<Original>,
 {
     fn item_process_result(self, raw_result: &SyncCallRawResult<Env::Api>) -> Self::Returns {
         decode_result::<Env::Api, T>(raw_result.0.clone())
diff --git a/framework/base/src/types/interaction/result_handlers/with_result_conv.rs b/framework/base/src/types/interaction/result_handlers/with_result_conv.rs
index 263017fe87..c87bd9f36e 100644
--- a/framework/base/src/types/interaction/result_handlers/with_result_conv.rs
+++ b/framework/base/src/types/interaction/result_handlers/with_result_conv.rs
@@ -1,9 +1,10 @@
 use core::marker::PhantomData;
 
-use multiversx_sc_codec::{CodecFrom, TopEncodeMulti};
+use multiversx_sc_codec::TopDecodeMulti;
 
-use crate::types::{
-    interaction::decode_result, RHListItem, RHListItemExec, SyncCallRawResult, TxEnv,
+use crate::{
+    abi::TypeAbiFrom,
+    types::{interaction::decode_result, RHListItem, RHListItemExec, SyncCallRawResult, TxEnv},
 };
 
 /// Defines a lambda function to be called on the decoded result.
@@ -32,8 +33,7 @@ where
 impl<Env, Original, T, F> RHListItem<Env, Original> for WithResultConv<T, F>
 where
     Env: TxEnv,
-    Original: TopEncodeMulti,
-    T: CodecFrom<Original>,
+    T: TopDecodeMulti + TypeAbiFrom<Original>,
     F: FnOnce(T),
 {
     type Returns = ();
@@ -43,8 +43,7 @@ impl<Env, Original, T, F> RHListItemExec<SyncCallRawResult<Env::Api>, Env, Origi
     for WithResultConv<T, F>
 where
     Env: TxEnv,
-    Original: TopEncodeMulti,
-    T: CodecFrom<Original>,
+    T: TopDecodeMulti + TypeAbiFrom<Original>,
     F: FnOnce(T),
 {
     fn item_process_result(self, raw_result: &SyncCallRawResult<Env::Api>) -> Self::Returns {
diff --git a/framework/scenario/src/facade/result_handlers/expect_value.rs b/framework/scenario/src/facade/result_handlers/expect_value.rs
index 05ebe0f79f..582737cb84 100644
--- a/framework/scenario/src/facade/result_handlers/expect_value.rs
+++ b/framework/scenario/src/facade/result_handlers/expect_value.rs
@@ -1,5 +1,6 @@
 use multiversx_sc::{
-    codec::{CodecFrom, TopEncodeMulti},
+    abi::TypeAbiFrom,
+    codec::TopEncodeMulti,
     types::{RHListItem, RHListItemExec, TxEnv},
 };
 
@@ -14,7 +15,7 @@ impl<Env, Original, T> RHListItem<Env, Original> for ExpectValue<T>
 where
     Env: TxEnv,
     T: TopEncodeMulti,
-    Original: CodecFrom<T>,
+    Original: TypeAbiFrom<T>,
 {
     type Returns = ();
 }
@@ -23,7 +24,7 @@ impl<Env, Original, T> RHListItemExec<TxResponse, Env, Original> for ExpectValue
 where
     Env: TxEnv<RHExpect = TxExpect>,
     T: TopEncodeMulti,
-    Original: CodecFrom<T>,
+    Original: TypeAbiFrom<T>,
 {
     fn item_tx_expect(&self, mut prev: TxExpect) -> TxExpect {
         let mut encoded = Vec::<Vec<u8>>::new();
diff --git a/framework/scenario/src/facade/world_tx/scenario_rh_impl.rs b/framework/scenario/src/facade/world_tx/scenario_rh_impl.rs
index 343fdc8382..3a4e34ec69 100644
--- a/framework/scenario/src/facade/world_tx/scenario_rh_impl.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_rh_impl.rs
@@ -1,5 +1,6 @@
 use multiversx_sc::{
-    codec::{CodecFrom, TopDecodeMulti, TopEncodeMulti},
+    abi::TypeAbiFrom,
+    codec::TopDecodeMulti,
     types::{
         ManagedAddress, RHListItemExec, ReturnsNewAddress, ReturnsNewManagedAddress, ReturnsResult,
         ReturnsResultAs, TxEnv, WithNewAddress, WithResultConv,
@@ -24,8 +25,7 @@ where
 impl<Env, Original, T> RHListItemExec<TxResponse, Env, Original> for ReturnsResultAs<T>
 where
     Env: TxEnv,
-    Original: TopEncodeMulti,
-    T: CodecFrom<Original>,
+    T: TopDecodeMulti + TypeAbiFrom<Original>,
 {
     fn item_process_result(self, tx_response: &TxResponse) -> Self::Returns {
         let response = TypedResponse::<T>::from_raw(tx_response);
@@ -38,8 +38,7 @@ where
 impl<Env, Original, T, F> RHListItemExec<TxResponse, Env, Original> for WithResultConv<T, F>
 where
     Env: TxEnv,
-    Original: TopEncodeMulti,
-    T: CodecFrom<Original>,
+    T: TopDecodeMulti + TypeAbiFrom<Original>,
     F: FnOnce(T),
 {
     fn item_process_result(self, tx_response: &TxResponse) -> Self::Returns {

From e4fff2c2150b39de12cda31c79cf3572f64b3c27 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Sat, 4 May 2024 18:30:55 +0300
Subject: [PATCH 0816/1254] deprecated CodecFrom

---
 data/codec/src/equivalent/codec_from.rs              | 2 ++
 data/codec/src/equivalent/codec_into.rs              | 1 +
 data/codec/src/equivalent/mod.rs                     | 2 ++
 data/codec/src/multi_types/mod.rs                    | 2 ++
 framework/scenario/src/facade/contract_info.rs       | 2 ++
 framework/scenario/src/facade/expr/bech32_address.rs | 2 ++
 6 files changed, 11 insertions(+)

diff --git a/data/codec/src/equivalent/codec_from.rs b/data/codec/src/equivalent/codec_from.rs
index 27695a56a2..47fe8b801c 100644
--- a/data/codec/src/equivalent/codec_from.rs
+++ b/data/codec/src/equivalent/codec_from.rs
@@ -1,12 +1,14 @@
 use crate::{TopDecodeMulti, TopEncodeMulti};
 
 /// Signals that after serializing `T`, we can safely deserialize it as `Self`.
+#[deprecated(since = "0.49.0", note = "Please use method `TypeAbiFrom` instead.")]
 pub trait CodecFrom<T>: TopDecodeMulti
 where
     T: TopEncodeMulti,
 {
 }
 
+#[deprecated(since = "0.49.0", note = "Please use method `TypeAbiFrom` instead.")]
 pub auto trait CodecFromSelf {}
 
 impl<T> CodecFrom<T> for T where T: TopEncodeMulti + TopDecodeMulti + CodecFromSelf {}
diff --git a/data/codec/src/equivalent/codec_into.rs b/data/codec/src/equivalent/codec_into.rs
index 3f4a60cdb2..761b9d35f4 100644
--- a/data/codec/src/equivalent/codec_into.rs
+++ b/data/codec/src/equivalent/codec_into.rs
@@ -1,6 +1,7 @@
 use crate::{CodecFrom, TopDecodeMulti, TopEncodeMulti};
 
 /// Signals that we can safely serialize `Self` in order to obtain a `T` on the other size.
+#[deprecated(since = "0.49.0", note = "Please use method `TypeAbiFrom` instead.")]
 pub trait CodecInto<T>: TopEncodeMulti
 where
     T: TopDecodeMulti,
diff --git a/data/codec/src/equivalent/mod.rs b/data/codec/src/equivalent/mod.rs
index 3715c4a87c..632fef5ae1 100644
--- a/data/codec/src/equivalent/mod.rs
+++ b/data/codec/src/equivalent/mod.rs
@@ -1,3 +1,5 @@
+#![allow(deprecated)]
+
 mod codec_convert;
 mod codec_from;
 mod codec_into;
diff --git a/data/codec/src/multi_types/mod.rs b/data/codec/src/multi_types/mod.rs
index 2bb9948b41..0a7ae541c4 100644
--- a/data/codec/src/multi_types/mod.rs
+++ b/data/codec/src/multi_types/mod.rs
@@ -1,3 +1,5 @@
+#![allow(deprecated)] // TODO: remove after deleting CodecFrom
+
 mod multi_value_ignore;
 mod multi_value_optional;
 mod multi_value_placeholder;
diff --git a/framework/scenario/src/facade/contract_info.rs b/framework/scenario/src/facade/contract_info.rs
index d0df35df96..e7b4dd0190 100644
--- a/framework/scenario/src/facade/contract_info.rs
+++ b/framework/scenario/src/facade/contract_info.rs
@@ -1,3 +1,5 @@
+#![allow(deprecated)] // TODO: remove after deleting CodecFrom
+
 use std::ops::{Deref, DerefMut};
 
 use multiversx_sc::{
diff --git a/framework/scenario/src/facade/expr/bech32_address.rs b/framework/scenario/src/facade/expr/bech32_address.rs
index 4cfa9b2bf5..76fca96c86 100644
--- a/framework/scenario/src/facade/expr/bech32_address.rs
+++ b/framework/scenario/src/facade/expr/bech32_address.rs
@@ -178,7 +178,9 @@ impl TopDecode for Bech32Address {
     }
 }
 
+#[allow(deprecated)]
 impl<M> CodecFrom<Bech32Address> for ManagedAddress<M> where M: ManagedTypeApi {}
+#[allow(deprecated)]
 impl<M> CodecFrom<&Bech32Address> for ManagedAddress<M> where M: ManagedTypeApi {}
 
 impl<M> TypeAbiFrom<Bech32Address> for ManagedAddress<M> where M: ManagedTypeApi {}

From ddcb9b0cd8b91553f9bdeeec53fb2d34f7aec4d2 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Sat, 4 May 2024 19:21:52 +0300
Subject: [PATCH 0817/1254] TypeAbi Unmanaged field

---
 framework/base/src/abi.rs                     |  3 ++
 framework/base/src/abi/type_abi.rs            |  2 ++
 framework/base/src/abi/type_abi_impl_basic.rs | 30 +++++++++++++++++
 .../base/src/abi/type_abi_impl_big_int.rs     | 33 +++++++++++++++++++
 .../base/src/abi/type_abi_impl_codec_multi.rs |  8 +++++
 .../base/src/storage/mappers/bi_di_mapper.rs  |  2 ++
 .../src/storage/mappers/linked_list_mapper.rs |  2 ++
 .../base/src/storage/mappers/map_mapper.rs    |  2 ++
 .../base/src/storage/mappers/queue_mapper.rs  |  2 ++
 .../base/src/storage/mappers/set_mapper.rs    |  2 ++
 .../storage/mappers/single_value_mapper.rs    |  2 ++
 .../mappers/token/fungible_token_mapper.rs    |  2 ++
 .../token/non_fungible_token_mapper.rs        |  2 ++
 .../src/storage/mappers/unique_id_mapper.rs   |  2 ++
 .../storage/mappers/unordered_set_mapper.rs   |  2 ++
 .../base/src/storage/mappers/user_mapper.rs   |  2 ++
 .../base/src/storage/mappers/vec_mapper.rs    |  2 ++
 .../src/types/crypto/message_hash_type.rs     |  2 ++
 .../base/src/types/flags/code_metadata.rs     |  2 ++
 .../base/src/types/heap/async_call_result.rs  |  2 ++
 framework/base/src/types/heap/boxed_bytes.rs  |  2 ++
 framework/base/src/types/heap/h256.rs         |  2 ++
 framework/base/src/types/heap/h256_address.rs |  2 ++
 framework/base/src/types/heap/queue.rs        |  2 ++
 .../types/interaction/managed_arg_buffer.rs   |  4 +++
 .../interaction/tx_data/function_call.rs      |  2 ++
 .../types/io/operation_completion_status.rs   |  2 ++
 framework/base/src/types/io/sc_result.rs      |  2 ++
 .../base/src/types/managed/basic/big_float.rs |  4 +++
 .../base/src/types/managed/basic/big_int.rs   | 11 +++++++
 .../src/types/managed/basic/big_int_sign.rs   |  2 ++
 .../base/src/types/managed/basic/big_uint.rs  | 10 ++++--
 .../src/types/managed/basic/elliptic_curve.rs |  2 ++
 .../src/types/managed/basic/managed_buffer.rs |  6 ++--
 .../multi_value/async_call_result_managed.rs  |  2 ++
 .../esdt_token_payment_multi_value.rs         |  2 ++
 .../multi_value/multi_value_encoded.rs        |  2 ++
 .../multi_value/multi_value_managed_vec.rs    |  2 ++
 .../multi_value_managed_vec_counted.rs        |  2 ++
 .../wrapped/egld_or_esdt_token_identifier.rs  |  2 ++
 .../types/managed/wrapped/managed_address.rs  |  2 ++
 .../managed/wrapped/managed_byte_array.rs     |  4 +++
 .../types/managed/wrapped/managed_option.rs   |  2 ++
 .../src/types/managed/wrapped/managed_vec.rs  |  2 ++
 .../types/managed/wrapped/token_identifier.rs |  2 ++
 .../src/types/static_buffer/sparse_array.rs   |  2 ++
 framework/derive/src/type_abi_derive.rs       |  2 ++
 47 files changed, 183 insertions(+), 4 deletions(-)
 create mode 100644 framework/base/src/abi/type_abi_impl_big_int.rs

diff --git a/framework/base/src/abi.rs b/framework/base/src/abi.rs
index c0002739d7..993518acb2 100644
--- a/framework/base/src/abi.rs
+++ b/framework/base/src/abi.rs
@@ -10,6 +10,9 @@ mod type_abi_impl_codec_multi;
 mod type_description;
 mod type_description_container;
 
+#[cfg(feature = "num-bigint")]
+mod type_abi_impl_big_int;
+
 pub use build_info_abi::*;
 pub use contract_abi::*;
 pub use endpoint_abi::*;
diff --git a/framework/base/src/abi/type_abi.rs b/framework/base/src/abi/type_abi.rs
index 18163eb7e7..25d4e92b46 100644
--- a/framework/base/src/abi/type_abi.rs
+++ b/framework/base/src/abi/type_abi.rs
@@ -9,6 +9,8 @@ use alloc::{format, string::ToString, vec::Vec};
 ///
 /// Will be automatically implemented for struct ad enum types via the `#[type_abi]` annotation.
 pub trait TypeAbi: TypeAbiFrom<Self> {
+    type Unmanaged: TypeAbiFrom<Self>;
+
     fn type_names() -> TypeNames {
         TypeNames {
             abi: Self::type_name(),
diff --git a/framework/base/src/abi/type_abi_impl_basic.rs b/framework/base/src/abi/type_abi_impl_basic.rs
index 2355f18834..f5f5ece466 100644
--- a/framework/base/src/abi/type_abi_impl_basic.rs
+++ b/framework/base/src/abi/type_abi_impl_basic.rs
@@ -10,6 +10,8 @@ use alloc::{
 impl TypeAbiFrom<()> for () {}
 
 impl TypeAbi for () {
+    type Unmanaged = Self;
+
     /// No another exception from the 1-type-1-output-abi rule:
     /// the unit type produces no output.
     fn output_abis(_output_names: &[&'static str]) -> OutputAbis {
@@ -20,6 +22,8 @@ impl TypeAbi for () {
 impl<T, U> TypeAbiFrom<&U> for &T where T: TypeAbiFrom<U> {}
 
 impl<T: TypeAbi> TypeAbi for &T {
+    type Unmanaged = Self;
+
     fn type_name() -> TypeName {
         T::type_name()
     }
@@ -36,6 +40,8 @@ impl<T: TypeAbi> TypeAbi for &T {
 impl<T, U> TypeAbiFrom<Box<U>> for Box<T> where T: TypeAbiFrom<U> {}
 
 impl<T: TypeAbi> TypeAbi for Box<T> {
+    type Unmanaged = Self;
+
     fn type_name() -> TypeName {
         T::type_name()
     }
@@ -52,6 +58,8 @@ impl<T: TypeAbi> TypeAbi for Box<T> {
 impl<T, U> TypeAbiFrom<&[T]> for &[U] where T: TypeAbiFrom<U> {}
 
 impl<T: TypeAbi> TypeAbi for &[T] {
+    type Unmanaged = Self;
+
     fn type_name() -> TypeName {
         let t_name = T::type_name();
         if t_name == "u8" {
@@ -76,6 +84,8 @@ impl<T: TypeAbi> TypeAbi for &[T] {
 impl<T, U> TypeAbiFrom<Vec<T>> for Vec<U> where T: TypeAbiFrom<U> {}
 
 impl<T: TypeAbi> TypeAbi for Vec<T> {
+    type Unmanaged = Self;
+
     fn type_name() -> TypeName {
         <&[T]>::type_name()
     }
@@ -92,6 +102,8 @@ impl<T: TypeAbi> TypeAbi for Vec<T> {
 impl<T: TypeAbi, const CAP: usize> TypeAbiFrom<ArrayVec<T, CAP>> for ArrayVec<T, CAP> {}
 
 impl<T: TypeAbi, const CAP: usize> TypeAbi for ArrayVec<T, CAP> {
+    type Unmanaged = Self;
+
     fn type_name() -> TypeName {
         <&[T]>::type_name()
     }
@@ -108,6 +120,8 @@ impl<T: TypeAbi, const CAP: usize> TypeAbi for ArrayVec<T, CAP> {
 impl<T> TypeAbiFrom<Box<[T]>> for Box<[T]> {}
 
 impl<T: TypeAbi> TypeAbi for Box<[T]> {
+    type Unmanaged = Self;
+
     fn type_name() -> TypeName {
         <&[T]>::type_name()
     }
@@ -127,6 +141,8 @@ impl TypeAbiFrom<&str> for String {}
 impl TypeAbiFrom<Box<str>> for String {}
 
 impl TypeAbi for String {
+    type Unmanaged = Self;
+
     fn type_name() -> TypeName {
         "utf-8 string".into()
     }
@@ -135,6 +151,8 @@ impl TypeAbi for String {
 impl TypeAbiFrom<&'static str> for &'static str {}
 
 impl TypeAbi for &'static str {
+    type Unmanaged = Self;
+
     fn type_name() -> TypeName {
         String::type_name()
     }
@@ -149,6 +167,8 @@ impl TypeAbiFrom<&str> for Box<str> {}
 impl TypeAbiFrom<String> for Box<str> {}
 
 impl TypeAbi for Box<str> {
+    type Unmanaged = Self;
+
     fn type_name() -> TypeName {
         String::type_name()
     }
@@ -164,6 +184,8 @@ macro_rules! type_abi_name_only {
         impl TypeAbiFrom<&$ty> for $ty {}
 
         impl TypeAbi for $ty {
+            type Unmanaged = Self;
+
             fn type_name() -> TypeName {
                 TypeName::from($name)
             }
@@ -225,6 +247,8 @@ impl TypeAbiFrom<i8> for i16 {}
 impl<T, U> TypeAbiFrom<Option<T>> for Option<U> where T: TypeAbiFrom<U> {}
 
 impl<T: TypeAbi> TypeAbi for Option<T> {
+    type Unmanaged = Self;
+
     fn type_name() -> TypeName {
         format!("Option<{}>", T::type_name())
     }
@@ -241,6 +265,8 @@ impl<T: TypeAbi> TypeAbi for Option<T> {
 impl<T, U, E> TypeAbiFrom<Result<T, E>> for Result<U, E> where T: TypeAbiFrom<U> {}
 
 impl<T: TypeAbi, E> TypeAbi for Result<T, E> {
+    type Unmanaged = Self;
+
     fn type_name() -> TypeName {
         T::type_name()
     }
@@ -275,6 +301,8 @@ macro_rules! tuple_impls {
             where
                 $($name: TypeAbi,)+
             {
+                type Unmanaged = Self;
+
 				fn type_name() -> TypeName {
 					let mut repr = TypeName::from("tuple<");
 					$(
@@ -331,6 +359,8 @@ tuple_impls! {
 impl<T, U, const N: usize> TypeAbiFrom<[T; N]> for [U; N] where T: TypeAbiFrom<U> {}
 
 impl<T: TypeAbi, const N: usize> TypeAbi for [T; N] {
+    type Unmanaged = Self;
+
     fn type_name() -> TypeName {
         let mut repr = TypeName::from("array");
         repr.push_str(N.to_string().as_str());
diff --git a/framework/base/src/abi/type_abi_impl_big_int.rs b/framework/base/src/abi/type_abi_impl_big_int.rs
new file mode 100644
index 0000000000..c3b0e6bccf
--- /dev/null
+++ b/framework/base/src/abi/type_abi_impl_big_int.rs
@@ -0,0 +1,33 @@
+use crate::codec::num_bigint::{BigInt, BigUint};
+
+use super::{TypeAbi, TypeAbiFrom, TypeName};
+
+impl TypeAbiFrom<Self> for BigUint {}
+impl TypeAbiFrom<&Self> for BigUint {}
+
+impl TypeAbi for BigUint {
+    type Unmanaged = Self;
+
+    fn type_name() -> TypeName {
+        TypeName::from("BigUint")
+    }
+
+    fn type_name_rust() -> TypeName {
+        TypeName::from("num_bigint::BigUint")
+    }
+}
+
+impl TypeAbiFrom<Self> for BigInt {}
+impl TypeAbiFrom<&Self> for BigInt {}
+
+impl TypeAbi for BigInt {
+    type Unmanaged = Self;
+
+    fn type_name() -> TypeName {
+        TypeName::from("BigInt")
+    }
+
+    fn type_name_rust() -> TypeName {
+        TypeName::from("num_bigint::BigInt")
+    }
+}
diff --git a/framework/base/src/abi/type_abi_impl_codec_multi.rs b/framework/base/src/abi/type_abi_impl_codec_multi.rs
index 043ff22a9a..e86f7c9614 100644
--- a/framework/base/src/abi/type_abi_impl_codec_multi.rs
+++ b/framework/base/src/abi/type_abi_impl_codec_multi.rs
@@ -15,6 +15,8 @@ where
 
 #[cfg(feature = "alloc")]
 impl<T: TypeAbi> TypeAbi for crate::codec::multi_types::MultiValueVec<T> {
+    type Unmanaged = Self;
+
     fn type_name() -> TypeName {
         super::type_name_variadic::<T>()
     }
@@ -35,6 +37,8 @@ impl<T: TypeAbi> TypeAbi for crate::codec::multi_types::MultiValueVec<T> {
 impl<T> TypeAbiFrom<T> for IgnoreValue {}
 
 impl TypeAbi for IgnoreValue {
+    type Unmanaged = Self;
+
     fn type_name() -> TypeName {
         TypeName::from("ignore")
     }
@@ -51,6 +55,8 @@ impl TypeAbi for IgnoreValue {
 impl<T, U> TypeAbiFrom<OptionalValue<T>> for OptionalValue<U> where T: TypeAbiFrom<U> {}
 
 impl<T: TypeAbi> TypeAbi for OptionalValue<T> {
+    type Unmanaged = Self;
+
     fn type_name() -> TypeName {
         super::type_name_optional::<T>()
     }
@@ -80,6 +86,8 @@ macro_rules! multi_arg_impls {
             where
                 $($name: TypeAbi,)+
             {
+                type Unmanaged = Self;
+
                 fn type_name() -> TypeName {
                     let mut repr = TypeName::from("multi");
                     repr.push('<');
diff --git a/framework/base/src/storage/mappers/bi_di_mapper.rs b/framework/base/src/storage/mappers/bi_di_mapper.rs
index 1ac77da0ae..4c59caa0ce 100644
--- a/framework/base/src/storage/mappers/bi_di_mapper.rs
+++ b/framework/base/src/storage/mappers/bi_di_mapper.rs
@@ -345,6 +345,8 @@ where
         + PartialEq
         + TypeAbi,
 {
+    type Unmanaged = Self;
+
     fn type_name() -> TypeName {
         MultiValueEncoded::<SA, MultiValue2<K, V>>::type_name()
     }
diff --git a/framework/base/src/storage/mappers/linked_list_mapper.rs b/framework/base/src/storage/mappers/linked_list_mapper.rs
index 826de864e6..d2d8af3b10 100644
--- a/framework/base/src/storage/mappers/linked_list_mapper.rs
+++ b/framework/base/src/storage/mappers/linked_list_mapper.rs
@@ -640,6 +640,8 @@ where
     SA: StorageMapperApi,
     T: TopEncode + TopDecode + NestedEncode + NestedDecode + Clone + TypeAbi,
 {
+    type Unmanaged = Self;
+
     fn type_name() -> TypeName {
         crate::abi::type_name_variadic::<T>()
     }
diff --git a/framework/base/src/storage/mappers/map_mapper.rs b/framework/base/src/storage/mappers/map_mapper.rs
index ab3d0664dc..eda95d8930 100644
--- a/framework/base/src/storage/mappers/map_mapper.rs
+++ b/framework/base/src/storage/mappers/map_mapper.rs
@@ -572,6 +572,8 @@ where
     K: TopEncode + TopDecode + NestedEncode + NestedDecode + TypeAbi + 'static,
     V: TopEncode + TopDecode + TypeAbi + 'static,
 {
+    type Unmanaged = Self;
+
     fn type_name() -> TypeName {
         MultiValueEncoded::<SA, MultiValue2<K, V>>::type_name()
     }
diff --git a/framework/base/src/storage/mappers/queue_mapper.rs b/framework/base/src/storage/mappers/queue_mapper.rs
index 80269c9366..a1ba11e2a6 100644
--- a/framework/base/src/storage/mappers/queue_mapper.rs
+++ b/framework/base/src/storage/mappers/queue_mapper.rs
@@ -545,6 +545,8 @@ where
     SA: StorageMapperApi,
     T: TopEncode + TopDecode + TypeAbi,
 {
+    type Unmanaged = Self;
+
     fn type_name() -> TypeName {
         crate::abi::type_name_variadic::<T>()
     }
diff --git a/framework/base/src/storage/mappers/set_mapper.rs b/framework/base/src/storage/mappers/set_mapper.rs
index 12c83dbd98..1579f1938e 100644
--- a/framework/base/src/storage/mappers/set_mapper.rs
+++ b/framework/base/src/storage/mappers/set_mapper.rs
@@ -321,6 +321,8 @@ where
     SA: StorageMapperApi,
     T: TopEncode + TopDecode + NestedEncode + NestedDecode + TypeAbi,
 {
+    type Unmanaged = Self;
+
     fn type_name() -> TypeName {
         crate::abi::type_name_variadic::<T>()
     }
diff --git a/framework/base/src/storage/mappers/single_value_mapper.rs b/framework/base/src/storage/mappers/single_value_mapper.rs
index 528a988ddf..dfaa41a393 100644
--- a/framework/base/src/storage/mappers/single_value_mapper.rs
+++ b/framework/base/src/storage/mappers/single_value_mapper.rs
@@ -244,6 +244,8 @@ where
     SA: StorageMapperApi,
     T: TopEncode + TopDecode + TypeAbi,
 {
+    type Unmanaged = Self;
+
     fn type_name() -> TypeName {
         T::type_name()
     }
diff --git a/framework/base/src/storage/mappers/token/fungible_token_mapper.rs b/framework/base/src/storage/mappers/token/fungible_token_mapper.rs
index 309902d02f..6164e919df 100644
--- a/framework/base/src/storage/mappers/token/fungible_token_mapper.rs
+++ b/framework/base/src/storage/mappers/token/fungible_token_mapper.rs
@@ -286,6 +286,8 @@ impl<SA> TypeAbi for FungibleTokenMapper<SA>
 where
     SA: StorageMapperApi + CallTypeApi,
 {
+    type Unmanaged = Self;
+
     fn type_name() -> TypeName {
         TokenIdentifier::<SA>::type_name()
     }
diff --git a/framework/base/src/storage/mappers/token/non_fungible_token_mapper.rs b/framework/base/src/storage/mappers/token/non_fungible_token_mapper.rs
index 3f3c466fea..193c73bc68 100644
--- a/framework/base/src/storage/mappers/token/non_fungible_token_mapper.rs
+++ b/framework/base/src/storage/mappers/token/non_fungible_token_mapper.rs
@@ -427,6 +427,8 @@ impl<SA> TypeAbi for NonFungibleTokenMapper<SA>
 where
     SA: StorageMapperApi + CallTypeApi,
 {
+    type Unmanaged = Self;
+
     fn type_name() -> TypeName {
         TokenIdentifier::<SA>::type_name()
     }
diff --git a/framework/base/src/storage/mappers/unique_id_mapper.rs b/framework/base/src/storage/mappers/unique_id_mapper.rs
index 051bfafd1b..4eb3a7d638 100644
--- a/framework/base/src/storage/mappers/unique_id_mapper.rs
+++ b/framework/base/src/storage/mappers/unique_id_mapper.rs
@@ -231,6 +231,8 @@ impl<SA> TypeAbi for UniqueIdMapper<SA, CurrentStorage>
 where
     SA: StorageMapperApi,
 {
+    type Unmanaged = Self;
+
     fn type_name() -> TypeName {
         crate::abi::type_name_variadic::<usize>()
     }
diff --git a/framework/base/src/storage/mappers/unordered_set_mapper.rs b/framework/base/src/storage/mappers/unordered_set_mapper.rs
index 4817b6776e..2b0cf7cac1 100644
--- a/framework/base/src/storage/mappers/unordered_set_mapper.rs
+++ b/framework/base/src/storage/mappers/unordered_set_mapper.rs
@@ -252,6 +252,8 @@ where
     SA: StorageMapperApi,
     T: TopEncode + TopDecode + NestedEncode + NestedDecode + TypeAbi,
 {
+    type Unmanaged = Self;
+
     fn type_name() -> TypeName {
         crate::abi::type_name_variadic::<T>()
     }
diff --git a/framework/base/src/storage/mappers/user_mapper.rs b/framework/base/src/storage/mappers/user_mapper.rs
index a2dad255c3..6d511fe567 100644
--- a/framework/base/src/storage/mappers/user_mapper.rs
+++ b/framework/base/src/storage/mappers/user_mapper.rs
@@ -239,6 +239,8 @@ impl<SA> TypeAbi for UserMapper<SA, CurrentStorage>
 where
     SA: StorageMapperApi,
 {
+    type Unmanaged = Self;
+
     fn type_name() -> TypeName {
         crate::abi::type_name_variadic::<ManagedAddress<SA>>()
     }
diff --git a/framework/base/src/storage/mappers/vec_mapper.rs b/framework/base/src/storage/mappers/vec_mapper.rs
index f4468d2957..5bde908ee2 100644
--- a/framework/base/src/storage/mappers/vec_mapper.rs
+++ b/framework/base/src/storage/mappers/vec_mapper.rs
@@ -371,6 +371,8 @@ where
     SA: StorageMapperApi,
     T: TopEncode + TopDecode + TypeAbi,
 {
+    type Unmanaged = Self;
+
     fn type_name() -> TypeName {
         crate::abi::type_name_variadic::<T>()
     }
diff --git a/framework/base/src/types/crypto/message_hash_type.rs b/framework/base/src/types/crypto/message_hash_type.rs
index c6cd93d181..209887fdfc 100644
--- a/framework/base/src/types/crypto/message_hash_type.rs
+++ b/framework/base/src/types/crypto/message_hash_type.rs
@@ -43,6 +43,8 @@ impl From<u8> for MessageHashType {
 impl TypeAbiFrom<Self> for MessageHashType {}
 
 impl TypeAbi for MessageHashType {
+    type Unmanaged = Self;
+
     fn type_name() -> TypeName {
         "MessageHashType".into()
     }
diff --git a/framework/base/src/types/flags/code_metadata.rs b/framework/base/src/types/flags/code_metadata.rs
index a360909602..9275e976cf 100644
--- a/framework/base/src/types/flags/code_metadata.rs
+++ b/framework/base/src/types/flags/code_metadata.rs
@@ -106,6 +106,8 @@ impl TopDecode for CodeMetadata {
 impl TypeAbiFrom<Self> for CodeMetadata {}
 
 impl TypeAbi for CodeMetadata {
+    type Unmanaged = Self;
+
     fn type_name() -> TypeName {
         "CodeMetadata".into()
     }
diff --git a/framework/base/src/types/heap/async_call_result.rs b/framework/base/src/types/heap/async_call_result.rs
index e5def9b718..ab738cba71 100644
--- a/framework/base/src/types/heap/async_call_result.rs
+++ b/framework/base/src/types/heap/async_call_result.rs
@@ -85,6 +85,8 @@ where
 impl<T: TypeAbi> TypeAbiFrom<Self> for AsyncCallResult<T> {}
 
 impl<T: TypeAbi> TypeAbi for AsyncCallResult<T> {
+    type Unmanaged = Self;
+
     fn type_name() -> TypeName {
         let mut repr = TypeName::from("AsyncCallResult<");
         repr.push_str(T::type_name().as_str());
diff --git a/framework/base/src/types/heap/boxed_bytes.rs b/framework/base/src/types/heap/boxed_bytes.rs
index f29b772a36..338af818c2 100644
--- a/framework/base/src/types/heap/boxed_bytes.rs
+++ b/framework/base/src/types/heap/boxed_bytes.rs
@@ -243,6 +243,8 @@ impl TopDecode for BoxedBytes {
 impl TypeAbiFrom<Self> for BoxedBytes {}
 
 impl TypeAbi for BoxedBytes {
+    type Unmanaged = Self;
+
     fn type_name() -> TypeName {
         "bytes".into()
     }
diff --git a/framework/base/src/types/heap/h256.rs b/framework/base/src/types/heap/h256.rs
index c7c20b26c3..f440765d00 100644
--- a/framework/base/src/types/heap/h256.rs
+++ b/framework/base/src/types/heap/h256.rs
@@ -227,6 +227,8 @@ impl TopDecode for H256 {
 impl TypeAbiFrom<Self> for H256 {}
 
 impl TypeAbi for H256 {
+    type Unmanaged = Self;
+
     fn type_name() -> TypeName {
         "H256".into()
     }
diff --git a/framework/base/src/types/heap/h256_address.rs b/framework/base/src/types/heap/h256_address.rs
index 0eed2a0ede..a9fa69c2e7 100644
--- a/framework/base/src/types/heap/h256_address.rs
+++ b/framework/base/src/types/heap/h256_address.rs
@@ -205,6 +205,8 @@ impl TopDecode for Address {
 impl TypeAbiFrom<Self> for Address {}
 
 impl TypeAbi for Address {
+    type Unmanaged = Self;
+
     fn type_name() -> TypeName {
         "Address".into()
     }
diff --git a/framework/base/src/types/heap/queue.rs b/framework/base/src/types/heap/queue.rs
index 8cdb66c8b1..cbb0b03d58 100644
--- a/framework/base/src/types/heap/queue.rs
+++ b/framework/base/src/types/heap/queue.rs
@@ -139,6 +139,8 @@ impl<T: NestedDecode> TopDecode for Queue<T> {
 impl<T: TypeAbi> TypeAbiFrom<Self> for Queue<T> {}
 
 impl<T: TypeAbi> TypeAbi for Queue<T> {
+    type Unmanaged = Self;
+
     fn type_name() -> TypeName {
         let mut repr = TypeName::from("Queue<");
         repr.push_str(T::type_name().as_str());
diff --git a/framework/base/src/types/interaction/managed_arg_buffer.rs b/framework/base/src/types/interaction/managed_arg_buffer.rs
index e3ca9c67e5..342f1c0d3d 100644
--- a/framework/base/src/types/interaction/managed_arg_buffer.rs
+++ b/framework/base/src/types/interaction/managed_arg_buffer.rs
@@ -299,6 +299,8 @@ where
     }
 }
 
+impl<M> TypeAbiFrom<ManagedArgBuffer<M>> for ArgBuffer where M: ManagedTypeApi {}
+
 impl<M> TypeAbiFrom<Self> for ManagedArgBuffer<M> where M: ManagedTypeApi {}
 impl<M> TypeAbiFrom<&Self> for ManagedArgBuffer<M> where M: ManagedTypeApi {}
 
@@ -306,6 +308,8 @@ impl<M> TypeAbi for ManagedArgBuffer<M>
 where
     M: ManagedTypeApi,
 {
+    type Unmanaged = ArgBuffer;
+
     /// It is semantically equivalent to any list of `T`.
     fn type_name() -> TypeName {
         <&[ManagedBuffer<M>] as TypeAbi>::type_name()
diff --git a/framework/base/src/types/interaction/tx_data/function_call.rs b/framework/base/src/types/interaction/tx_data/function_call.rs
index 2f110040fd..7ebf20dd1a 100644
--- a/framework/base/src/types/interaction/tx_data/function_call.rs
+++ b/framework/base/src/types/interaction/tx_data/function_call.rs
@@ -142,6 +142,8 @@ impl<Api> TypeAbi for FunctionCall<Api>
 where
     Api: ManagedTypeApi,
 {
+    type Unmanaged = Self;
+
     fn type_name() -> TypeName {
         crate::abi::type_name_variadic::<ManagedBuffer<Api>>()
     }
diff --git a/framework/base/src/types/io/operation_completion_status.rs b/framework/base/src/types/io/operation_completion_status.rs
index 125674ec30..b1da830356 100644
--- a/framework/base/src/types/io/operation_completion_status.rs
+++ b/framework/base/src/types/io/operation_completion_status.rs
@@ -84,6 +84,8 @@ impl TypeAbiFrom<OperationCompletionStatus> for crate::types::heap::Vec<u8> {}
 impl TypeAbiFrom<Self> for OperationCompletionStatus {}
 
 impl TypeAbi for OperationCompletionStatus {
+    type Unmanaged = Self;
+
     fn type_name() -> TypeName {
         TypeName::from("OperationCompletionStatus")
     }
diff --git a/framework/base/src/types/io/sc_result.rs b/framework/base/src/types/io/sc_result.rs
index fcad33270a..0557cd9f94 100644
--- a/framework/base/src/types/io/sc_result.rs
+++ b/framework/base/src/types/io/sc_result.rs
@@ -135,6 +135,8 @@ where
 impl<T: TypeAbi, E> TypeAbiFrom<Self> for SCResult<T, E> {}
 
 impl<T: TypeAbi, E> TypeAbi for SCResult<T, E> {
+    type Unmanaged = Self;
+
     fn type_name() -> TypeName {
         T::type_name()
     }
diff --git a/framework/base/src/types/managed/basic/big_float.rs b/framework/base/src/types/managed/basic/big_float.rs
index 0bc2980e35..dd8a04b080 100644
--- a/framework/base/src/types/managed/basic/big_float.rs
+++ b/framework/base/src/types/managed/basic/big_float.rs
@@ -286,10 +286,14 @@ impl<M: ManagedTypeApi> NestedDecode for BigFloat<M> {
     }
 }
 
+impl<M> TypeAbiFrom<BigFloat<M>> for f64 where M: ManagedTypeApi {}
+
 impl<M> TypeAbiFrom<Self> for BigFloat<M> where M: ManagedTypeApi {}
 impl<M> TypeAbiFrom<&Self> for BigFloat<M> where M: ManagedTypeApi {}
 
 impl<M: ManagedTypeApi> TypeAbi for BigFloat<M> {
+    type Unmanaged = f64;
+
     fn type_name() -> String {
         String::from("BigFloat")
     }
diff --git a/framework/base/src/types/managed/basic/big_int.rs b/framework/base/src/types/managed/basic/big_int.rs
index 6026341975..b73fbab6fa 100644
--- a/framework/base/src/types/managed/basic/big_int.rs
+++ b/framework/base/src/types/managed/basic/big_int.rs
@@ -302,10 +302,21 @@ impl<M: ManagedTypeApi> TopDecode for BigInt<M> {
     }
 }
 
+#[cfg(feature = "num-bigint")]
+impl<M: ManagedTypeApi> TypeAbiFrom<crate::codec::num_bigint::BigInt> for BigInt<M> {}
+#[cfg(feature = "num-bigint")]
+impl<M: ManagedTypeApi> TypeAbiFrom<BigInt<M>> for crate::codec::num_bigint::BigInt {}
+
 impl<M> TypeAbiFrom<Self> for BigInt<M> where M: ManagedTypeApi {}
 impl<M> TypeAbiFrom<&Self> for BigInt<M> where M: ManagedTypeApi {}
 
 impl<M: ManagedTypeApi> crate::abi::TypeAbi for BigInt<M> {
+    #[cfg(feature = "num-bigint")]
+    type Unmanaged = crate::codec::num_bigint::BigInt;
+
+    #[cfg(not(feature = "num-bigint"))]
+    type Unmanaged = Self;
+
     fn type_name() -> TypeName {
         TypeName::from("BigInt")
     }
diff --git a/framework/base/src/types/managed/basic/big_int_sign.rs b/framework/base/src/types/managed/basic/big_int_sign.rs
index 0ed8cabbc2..178e55f981 100644
--- a/framework/base/src/types/managed/basic/big_int_sign.rs
+++ b/framework/base/src/types/managed/basic/big_int_sign.rs
@@ -82,6 +82,8 @@ impl TopDecode for Sign {
 impl TypeAbiFrom<Self> for Sign {}
 
 impl TypeAbi for Sign {
+    type Unmanaged = Self;
+
     fn type_name() -> TypeName {
         TypeName::from("Sign")
     }
diff --git a/framework/base/src/types/managed/basic/big_uint.rs b/framework/base/src/types/managed/basic/big_uint.rs
index 2766a42f1d..34a6c6df23 100644
--- a/framework/base/src/types/managed/basic/big_uint.rs
+++ b/framework/base/src/types/managed/basic/big_uint.rs
@@ -1,7 +1,7 @@
 use core::convert::TryInto;
 
 use crate::{
-    abi::{TypeAbiFrom, TypeName},
+    abi::{TypeAbi, TypeAbiFrom, TypeName},
     api::{
         const_handles, use_raw_handle, BigIntApiImpl, HandleConstraints, ManagedBufferApiImpl,
         ManagedTypeApi, ManagedTypeApiImpl, RawHandle, StaticVarApiImpl,
@@ -296,7 +296,13 @@ impl<M: ManagedTypeApi> TopDecode for BigUint<M> {
 impl<M> TypeAbiFrom<Self> for BigUint<M> where M: ManagedTypeApi {}
 impl<M> TypeAbiFrom<&Self> for BigUint<M> where M: ManagedTypeApi {}
 
-impl<M: ManagedTypeApi> crate::abi::TypeAbi for BigUint<M> {
+impl<M: ManagedTypeApi> TypeAbi for BigUint<M> {
+    #[cfg(feature = "num-bigint")]
+    type Unmanaged = crate::codec::num_bigint::BigUint;
+
+    #[cfg(not(feature = "num-bigint"))]
+    type Unmanaged = Self;
+
     fn type_name() -> TypeName {
         TypeName::from("BigUint")
     }
diff --git a/framework/base/src/types/managed/basic/elliptic_curve.rs b/framework/base/src/types/managed/basic/elliptic_curve.rs
index 9359ecfce3..8c6d66990f 100644
--- a/framework/base/src/types/managed/basic/elliptic_curve.rs
+++ b/framework/base/src/types/managed/basic/elliptic_curve.rs
@@ -421,6 +421,8 @@ impl<M: ManagedTypeApi> TopEncode for EllipticCurve<M> {
 impl<M> TypeAbiFrom<Self> for EllipticCurve<M> where M: ManagedTypeApi {}
 
 impl<M: ManagedTypeApi> TypeAbi for EllipticCurve<M> {
+    type Unmanaged = Self;
+
     fn type_name() -> TypeName {
         TypeName::from("EllipticCurve")
     }
diff --git a/framework/base/src/types/managed/basic/managed_buffer.rs b/framework/base/src/types/managed/basic/managed_buffer.rs
index 5d2b975b4a..358444c445 100644
--- a/framework/base/src/types/managed/basic/managed_buffer.rs
+++ b/framework/base/src/types/managed/basic/managed_buffer.rs
@@ -1,5 +1,5 @@
 use crate::{
-    abi::{TypeAbiFrom, TypeName},
+    abi::{TypeAbi, TypeAbiFrom, TypeName},
     api::{
         use_raw_handle, ErrorApiImpl, HandleConstraints, InvalidSliceError, ManagedBufferApiImpl,
         ManagedTypeApi, StaticVarApiImpl,
@@ -473,7 +473,9 @@ impl<M: ManagedTypeApi> TopDecode for ManagedBuffer<M> {
 impl<M> TypeAbiFrom<Self> for ManagedBuffer<M> where M: ManagedTypeApi {}
 impl<M> TypeAbiFrom<&Self> for ManagedBuffer<M> where M: ManagedTypeApi {}
 
-impl<M: ManagedTypeApi> crate::abi::TypeAbi for ManagedBuffer<M> {
+impl<M: ManagedTypeApi> TypeAbi for ManagedBuffer<M> {
+    type Unmanaged = multiversx_sc_codec::Vec<u8>;
+
     fn type_name() -> TypeName {
         "bytes".into()
     }
diff --git a/framework/base/src/types/managed/multi_value/async_call_result_managed.rs b/framework/base/src/types/managed/multi_value/async_call_result_managed.rs
index b8b37e20da..afa978f429 100644
--- a/framework/base/src/types/managed/multi_value/async_call_result_managed.rs
+++ b/framework/base/src/types/managed/multi_value/async_call_result_managed.rs
@@ -109,6 +109,8 @@ where
     M: ManagedTypeApi,
     T: TypeAbi,
 {
+    type Unmanaged = Self;
+
     fn type_name() -> TypeName {
         let mut repr = TypeName::from("AsyncCallResult<");
         repr.push_str(T::type_name().as_str());
diff --git a/framework/base/src/types/managed/multi_value/esdt_token_payment_multi_value.rs b/framework/base/src/types/managed/multi_value/esdt_token_payment_multi_value.rs
index 11c81faaaa..d9b312f45b 100644
--- a/framework/base/src/types/managed/multi_value/esdt_token_payment_multi_value.rs
+++ b/framework/base/src/types/managed/multi_value/esdt_token_payment_multi_value.rs
@@ -107,6 +107,8 @@ impl<M> TypeAbi for EsdtTokenPaymentMultiValue<M>
 where
     M: ManagedTypeApi,
 {
+    type Unmanaged = Self;
+
     fn type_name() -> TypeName {
         MultiValue3::<TokenIdentifier<M>, u64, BigUint<M>>::type_name()
     }
diff --git a/framework/base/src/types/managed/multi_value/multi_value_encoded.rs b/framework/base/src/types/managed/multi_value/multi_value_encoded.rs
index 1548f8ebd4..42567e7ae3 100644
--- a/framework/base/src/types/managed/multi_value/multi_value_encoded.rs
+++ b/framework/base/src/types/managed/multi_value/multi_value_encoded.rs
@@ -241,6 +241,8 @@ where
     M: ManagedTypeApi,
     T: TypeAbi,
 {
+    type Unmanaged = Self;
+
     fn type_name() -> TypeName {
         crate::abi::type_name_variadic::<T>()
     }
diff --git a/framework/base/src/types/managed/multi_value/multi_value_managed_vec.rs b/framework/base/src/types/managed/multi_value/multi_value_managed_vec.rs
index 7bae85617e..a7f1337080 100644
--- a/framework/base/src/types/managed/multi_value/multi_value_managed_vec.rs
+++ b/framework/base/src/types/managed/multi_value/multi_value_managed_vec.rs
@@ -222,6 +222,8 @@ where
     M: ManagedTypeApi,
     T: ManagedVecItem,
 {
+    type Unmanaged = Self;
+
     fn type_name() -> TypeName {
         crate::abi::type_name_variadic::<T>()
     }
diff --git a/framework/base/src/types/managed/multi_value/multi_value_managed_vec_counted.rs b/framework/base/src/types/managed/multi_value/multi_value_managed_vec_counted.rs
index 74e71e7960..60ffb780ee 100644
--- a/framework/base/src/types/managed/multi_value/multi_value_managed_vec_counted.rs
+++ b/framework/base/src/types/managed/multi_value/multi_value_managed_vec_counted.rs
@@ -138,6 +138,8 @@ where
     M: ManagedTypeApi,
     T: ManagedVecItem + TypeAbi,
 {
+    type Unmanaged = Self;
+
     fn type_name() -> TypeName {
         let mut repr = TypeName::from("counted-variadic<");
         repr.push_str(T::type_name().as_str());
diff --git a/framework/base/src/types/managed/wrapped/egld_or_esdt_token_identifier.rs b/framework/base/src/types/managed/wrapped/egld_or_esdt_token_identifier.rs
index e8bcf44c05..8fa90f8186 100644
--- a/framework/base/src/types/managed/wrapped/egld_or_esdt_token_identifier.rs
+++ b/framework/base/src/types/managed/wrapped/egld_or_esdt_token_identifier.rs
@@ -231,6 +231,8 @@ impl<M: ManagedTypeApi> TypeAbiFrom<Self> for EgldOrEsdtTokenIdentifier<M> {}
 impl<M: ManagedTypeApi> TypeAbiFrom<&Self> for EgldOrEsdtTokenIdentifier<M> {}
 
 impl<M: ManagedTypeApi> TypeAbi for EgldOrEsdtTokenIdentifier<M> {
+    type Unmanaged = Self;
+
     fn type_name() -> TypeName {
         "EgldOrEsdtTokenIdentifier".into()
     }
diff --git a/framework/base/src/types/managed/wrapped/managed_address.rs b/framework/base/src/types/managed/wrapped/managed_address.rs
index cf5341775d..f3136a3bd9 100644
--- a/framework/base/src/types/managed/wrapped/managed_address.rs
+++ b/framework/base/src/types/managed/wrapped/managed_address.rs
@@ -241,6 +241,8 @@ impl<M> TypeAbi for ManagedAddress<M>
 where
     M: ManagedTypeApi,
 {
+    type Unmanaged = Address;
+
     /// `"Address"` instead of `"array32<u8>"`.
     fn type_name() -> TypeName {
         Address::type_name()
diff --git a/framework/base/src/types/managed/wrapped/managed_byte_array.rs b/framework/base/src/types/managed/wrapped/managed_byte_array.rs
index b63064e7a4..83e95d332c 100644
--- a/framework/base/src/types/managed/wrapped/managed_byte_array.rs
+++ b/framework/base/src/types/managed/wrapped/managed_byte_array.rs
@@ -205,6 +205,8 @@ where
     }
 }
 
+impl<M, const N: usize> TypeAbiFrom<ManagedByteArray<M, N>> for [u8; N] where M: ManagedTypeApi {}
+
 impl<M, const N: usize> TypeAbiFrom<Self> for ManagedByteArray<M, N> where M: ManagedTypeApi {}
 impl<M, const N: usize> TypeAbiFrom<&Self> for ManagedByteArray<M, N> where M: ManagedTypeApi {}
 
@@ -212,6 +214,8 @@ impl<M, const N: usize> TypeAbi for ManagedByteArray<M, N>
 where
     M: ManagedTypeApi,
 {
+    type Unmanaged = [u8; N];
+
     /// It is semantically equivalent to `[u8; N]`.
     fn type_name() -> TypeName {
         <[u8; N] as TypeAbi>::type_name()
diff --git a/framework/base/src/types/managed/wrapped/managed_option.rs b/framework/base/src/types/managed/wrapped/managed_option.rs
index b7bafe4055..a34a4f7ab3 100644
--- a/framework/base/src/types/managed/wrapped/managed_option.rs
+++ b/framework/base/src/types/managed/wrapped/managed_option.rs
@@ -300,6 +300,8 @@ where
     M: ManagedTypeApi,
     T: ManagedType<M> + TypeAbi,
 {
+    type Unmanaged = Option<T::Unmanaged>;
+
     /// It is semantically equivalent to any list of `T`.
     fn type_name() -> TypeName {
         Option::<T>::type_name()
diff --git a/framework/base/src/types/managed/wrapped/managed_vec.rs b/framework/base/src/types/managed/wrapped/managed_vec.rs
index 3897ff2604..8ba9b1d355 100644
--- a/framework/base/src/types/managed/wrapped/managed_vec.rs
+++ b/framework/base/src/types/managed/wrapped/managed_vec.rs
@@ -706,6 +706,8 @@ where
     M: ManagedTypeApi,
     T: ManagedVecItem + TypeAbi,
 {
+    type Unmanaged = Vec<T::Unmanaged>;
+
     /// It is semantically equivalent to any list of `T`.
     fn type_name() -> TypeName {
         <&[T] as TypeAbi>::type_name()
diff --git a/framework/base/src/types/managed/wrapped/token_identifier.rs b/framework/base/src/types/managed/wrapped/token_identifier.rs
index 3500fb99eb..f4c978b0d1 100644
--- a/framework/base/src/types/managed/wrapped/token_identifier.rs
+++ b/framework/base/src/types/managed/wrapped/token_identifier.rs
@@ -174,6 +174,8 @@ impl<M: ManagedTypeApi> TypeAbiFrom<Self> for TokenIdentifier<M> {}
 impl<M: ManagedTypeApi> TypeAbiFrom<&Self> for TokenIdentifier<M> {}
 
 impl<M: ManagedTypeApi> TypeAbi for TokenIdentifier<M> {
+    type Unmanaged = Self;
+
     fn type_name() -> TypeName {
         "TokenIdentifier".into()
     }
diff --git a/framework/base/src/types/static_buffer/sparse_array.rs b/framework/base/src/types/static_buffer/sparse_array.rs
index 2c5a0b6900..bb3a083243 100644
--- a/framework/base/src/types/static_buffer/sparse_array.rs
+++ b/framework/base/src/types/static_buffer/sparse_array.rs
@@ -311,6 +311,8 @@ impl<E, const CAPACITY: usize> TypeAbi for SparseArray<E, CAPACITY>
 where
     E: ErrorApi,
 {
+    type Unmanaged = Self;
+
     /// It is semantically equivalent to any list of `usize`.
     fn type_name() -> TypeName {
         <&[usize] as TypeAbi>::type_name()
diff --git a/framework/derive/src/type_abi_derive.rs b/framework/derive/src/type_abi_derive.rs
index e9e9db4008..8c70b56af8 100644
--- a/framework/derive/src/type_abi_derive.rs
+++ b/framework/derive/src/type_abi_derive.rs
@@ -127,6 +127,8 @@ pub fn type_abi_derive(input: proc_macro::TokenStream) -> proc_macro2::TokenStre
         impl #impl_generics multiversx_sc::abi::TypeAbiFrom<&Self> for #name #ty_generics #where_clause {}
 
         impl #impl_generics multiversx_sc::abi::TypeAbi for #name #ty_generics #where_clause {
+            type Unmanaged = Self;
+
             fn type_name() -> multiversx_sc::abi::TypeName {
                 #name_str.into()
             }

From fabc1e99ba51cdbf221e010249b0e54a0fff20d8 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Sat, 4 May 2024 19:48:56 +0300
Subject: [PATCH 0818/1254] ReturnsResultUnmanaged result handler

---
 .../adder/interact/src/basic_interact.rs      |  2 +-
 .../scenario-tester/tests/st_blackbox_test.rs |  5 ++--
 .../src/types/interaction/result_handlers.rs  |  6 ++--
 ...ns_result_conv.rs => returns_result_as.rs} |  0
 .../returns_result_unmanaged.rs               | 30 +++++++++++++++++++
 .../src/facade/world_tx/scenario_rh_impl.rs   | 18 +++++++++--
 6 files changed, 53 insertions(+), 8 deletions(-)
 rename framework/base/src/types/interaction/result_handlers/{returns_result_conv.rs => returns_result_as.rs} (100%)
 create mode 100644 framework/base/src/types/interaction/result_handlers/returns_result_unmanaged.rs

diff --git a/contracts/examples/adder/interact/src/basic_interact.rs b/contracts/examples/adder/interact/src/basic_interact.rs
index b0c38bb4bb..363f7efde2 100644
--- a/contracts/examples/adder/interact/src/basic_interact.rs
+++ b/contracts/examples/adder/interact/src/basic_interact.rs
@@ -152,7 +152,7 @@ impl AdderInteract {
             .to(self.state.current_adder_address())
             .typed(adder_proxy::AdderProxy)
             .sum()
-            .returns(ReturnsResultAs::<RustBigUint>::new())
+            .returns(ReturnsResultUnmanaged)
             .prepare_async()
             .run()
             .await;
diff --git a/contracts/feature-tests/scenario-tester/tests/st_blackbox_test.rs b/contracts/feature-tests/scenario-tester/tests/st_blackbox_test.rs
index 75d8448c3b..72e580081f 100644
--- a/contracts/feature-tests/scenario-tester/tests/st_blackbox_test.rs
+++ b/contracts/feature-tests/scenario-tester/tests/st_blackbox_test.rs
@@ -1,5 +1,4 @@
 use multiversx_sc_scenario::imports::*;
-use num_bigint::BigUint;
 
 use scenario_tester::*;
 
@@ -66,9 +65,9 @@ fn st_blackbox() {
         .to(ST_ADDRESS)
         .typed(scenario_tester_proxy::ScenarioTesterProxy)
         .sum()
-        .returns(ReturnsResultAs::<BigUint>::new())
+        .returns(ReturnsResultUnmanaged)
         .run();
-    assert_eq!(value, BigUint::from(5u32));
+    assert_eq!(value, RustBigUint::from(5u32));
 
     world
         .tx()
diff --git a/framework/base/src/types/interaction/result_handlers.rs b/framework/base/src/types/interaction/result_handlers.rs
index ed43a292df..3f0d2b0cee 100644
--- a/framework/base/src/types/interaction/result_handlers.rs
+++ b/framework/base/src/types/interaction/result_handlers.rs
@@ -3,7 +3,8 @@ mod returns_new_address;
 mod returns_new_managed_address;
 mod returns_raw_result;
 mod returns_result;
-mod returns_result_conv;
+mod returns_result_as;
+mod returns_result_unmanaged;
 mod with_new_address;
 mod with_raw_result;
 mod with_result;
@@ -14,7 +15,8 @@ pub use returns_new_address::*;
 pub use returns_new_managed_address::*;
 pub use returns_raw_result::*;
 pub use returns_result::*;
-pub use returns_result_conv::*;
+pub use returns_result_as::*;
+pub use returns_result_unmanaged::ReturnsResultUnmanaged;
 pub use with_new_address::*;
 pub use with_raw_result::WithRawResult;
 pub use with_result::WithResult;
diff --git a/framework/base/src/types/interaction/result_handlers/returns_result_conv.rs b/framework/base/src/types/interaction/result_handlers/returns_result_as.rs
similarity index 100%
rename from framework/base/src/types/interaction/result_handlers/returns_result_conv.rs
rename to framework/base/src/types/interaction/result_handlers/returns_result_as.rs
diff --git a/framework/base/src/types/interaction/result_handlers/returns_result_unmanaged.rs b/framework/base/src/types/interaction/result_handlers/returns_result_unmanaged.rs
new file mode 100644
index 0000000000..4785aef50a
--- /dev/null
+++ b/framework/base/src/types/interaction/result_handlers/returns_result_unmanaged.rs
@@ -0,0 +1,30 @@
+use multiversx_sc_codec::TopDecodeMulti;
+
+use crate::{
+    abi::TypeAbi,
+    types::{interaction::decode_result, RHListItem, RHListItemExec, SyncCallRawResult, TxEnv},
+};
+
+/// Indicates that the unmanaged version of the result will be returned.
+pub struct ReturnsResultUnmanaged;
+
+impl<Env, Original> RHListItem<Env, Original> for ReturnsResultUnmanaged
+where
+    Env: TxEnv,
+    Original: TypeAbi,
+    Original::Unmanaged: TopDecodeMulti,
+{
+    type Returns = Original::Unmanaged;
+}
+
+impl<Env, Original> RHListItemExec<SyncCallRawResult<Env::Api>, Env, Original>
+    for ReturnsResultUnmanaged
+where
+    Env: TxEnv,
+    Original: TypeAbi,
+    Original::Unmanaged: TopDecodeMulti,
+{
+    fn item_process_result(self, raw_result: &SyncCallRawResult<Env::Api>) -> Self::Returns {
+        decode_result::<Env::Api, Original::Unmanaged>(raw_result.0.clone())
+    }
+}
diff --git a/framework/scenario/src/facade/world_tx/scenario_rh_impl.rs b/framework/scenario/src/facade/world_tx/scenario_rh_impl.rs
index 3a4e34ec69..46cedf3743 100644
--- a/framework/scenario/src/facade/world_tx/scenario_rh_impl.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_rh_impl.rs
@@ -1,9 +1,9 @@
 use multiversx_sc::{
-    abi::TypeAbiFrom,
+    abi::{TypeAbi, TypeAbiFrom},
     codec::TopDecodeMulti,
     types::{
         ManagedAddress, RHListItemExec, ReturnsNewAddress, ReturnsNewManagedAddress, ReturnsResult,
-        ReturnsResultAs, TxEnv, WithNewAddress, WithResultConv,
+        ReturnsResultAs, ReturnsResultUnmanaged, TxEnv, WithNewAddress, WithResultConv,
     },
 };
 
@@ -35,6 +35,20 @@ where
     }
 }
 
+impl<Env, Original> RHListItemExec<TxResponse, Env, Original> for ReturnsResultUnmanaged
+where
+    Env: TxEnv,
+    Original: TypeAbi,
+    Original::Unmanaged: TopDecodeMulti,
+{
+    fn item_process_result(self, tx_response: &TxResponse) -> Self::Returns {
+        let response = TypedResponse::<Original::Unmanaged>::from_raw(tx_response);
+        response
+            .result
+            .expect("ReturnsResultUnmanaged expects that transaction is successful")
+    }
+}
+
 impl<Env, Original, T, F> RHListItemExec<TxResponse, Env, Original> for WithResultConv<T, F>
 where
     Env: TxEnv,

From e3945e08f27a3be2b72e66ee3ea7eebd956ec4dc Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Sat, 4 May 2024 20:00:11 +0300
Subject: [PATCH 0819/1254] build fix

---
 framework/base/src/types/managed/wrapped/managed_address.rs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/framework/base/src/types/managed/wrapped/managed_address.rs b/framework/base/src/types/managed/wrapped/managed_address.rs
index f3136a3bd9..318e5940ce 100644
--- a/framework/base/src/types/managed/wrapped/managed_address.rs
+++ b/framework/base/src/types/managed/wrapped/managed_address.rs
@@ -241,7 +241,11 @@ impl<M> TypeAbi for ManagedAddress<M>
 where
     M: ManagedTypeApi,
 {
-    type Unmanaged = Address;
+    #[cfg(feature = "alloc")]
+    type Unmanaged = crate::types::heap::Address;
+
+    #[cfg(not(feature = "alloc"))]
+    type Unmanaged = Self;
 
     /// `"Address"` instead of `"array32<u8>"`.
     fn type_name() -> TypeName {

From 01c54bcf922fc12f5cab8450d1941bd4506c885f Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 7 May 2024 09:43:42 +0300
Subject: [PATCH 0820/1254] cleanup

---
 data/codec/src/equivalent/codec_from.rs | 4 ++--
 data/codec/src/equivalent/codec_into.rs | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/data/codec/src/equivalent/codec_from.rs b/data/codec/src/equivalent/codec_from.rs
index 47fe8b801c..f6fc1ffda2 100644
--- a/data/codec/src/equivalent/codec_from.rs
+++ b/data/codec/src/equivalent/codec_from.rs
@@ -1,14 +1,14 @@
 use crate::{TopDecodeMulti, TopEncodeMulti};
 
 /// Signals that after serializing `T`, we can safely deserialize it as `Self`.
-#[deprecated(since = "0.49.0", note = "Please use method `TypeAbiFrom` instead.")]
+#[deprecated(since = "0.49.0", note = "Please use trait `TypeAbiFrom` instead.")]
 pub trait CodecFrom<T>: TopDecodeMulti
 where
     T: TopEncodeMulti,
 {
 }
 
-#[deprecated(since = "0.49.0", note = "Please use method `TypeAbiFrom` instead.")]
+#[deprecated(since = "0.49.0", note = "Please use trait `TypeAbiFrom` instead.")]
 pub auto trait CodecFromSelf {}
 
 impl<T> CodecFrom<T> for T where T: TopEncodeMulti + TopDecodeMulti + CodecFromSelf {}
diff --git a/data/codec/src/equivalent/codec_into.rs b/data/codec/src/equivalent/codec_into.rs
index 761b9d35f4..06013c41bb 100644
--- a/data/codec/src/equivalent/codec_into.rs
+++ b/data/codec/src/equivalent/codec_into.rs
@@ -1,7 +1,7 @@
 use crate::{CodecFrom, TopDecodeMulti, TopEncodeMulti};
 
 /// Signals that we can safely serialize `Self` in order to obtain a `T` on the other size.
-#[deprecated(since = "0.49.0", note = "Please use method `TypeAbiFrom` instead.")]
+#[deprecated(since = "0.49.0", note = "Please use trait `TypeAbiFrom` instead.")]
 pub trait CodecInto<T>: TopEncodeMulti
 where
     T: TopDecodeMulti,

From 282c021f97316f95bd3f39e1d068673c2fc157c3 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Tue, 7 May 2024 12:05:14 +0300
Subject: [PATCH 0821/1254] increase code coverage - add rust type for
 EsdtTokenType

---
 .../composability/forwarder/sc-config.toml    |  3 ---
 .../base/src/types/flags/esdt_token_type.rs   | 19 +++++++++++++++----
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/contracts/feature-tests/composability/forwarder/sc-config.toml b/contracts/feature-tests/composability/forwarder/sc-config.toml
index b12e3401e6..b78f0086a5 100644
--- a/contracts/feature-tests/composability/forwarder/sc-config.toml
+++ b/contracts/feature-tests/composability/forwarder/sc-config.toml
@@ -1,5 +1,2 @@
 [[proxy]]
 path = "src/forwarder_proxy.rs"
-[[proxy.path-rename]]
-from = "multiversx_sc::types::flags::esdt_token_type::"
-to = ""
diff --git a/framework/base/src/types/flags/esdt_token_type.rs b/framework/base/src/types/flags/esdt_token_type.rs
index 1993fd1cfa..d644f41333 100644
--- a/framework/base/src/types/flags/esdt_token_type.rs
+++ b/framework/base/src/types/flags/esdt_token_type.rs
@@ -1,8 +1,11 @@
 use multiversx_sc_derive::ManagedVecItem;
 
 use crate::{
-    codec,
-    codec::derive::{NestedDecode, NestedEncode, TopDecode, TopEncode},
+    abi::{TypeAbi, TypeName},
+    codec::{
+        self,
+        derive::{NestedDecode, NestedEncode, TopDecode, TopEncode},
+    },
 };
 
 const ESDT_TYPE_FUNGIBLE: &[u8] = b"FungibleESDT";
@@ -12,11 +15,9 @@ const ESDT_TYPE_META: &[u8] = b"MetaESDT";
 const ESDT_TYPE_INVALID: &[u8] = &[];
 
 use crate as multiversx_sc; // needed by the TypeAbi generated code
-use crate::derive::type_abi;
 
 // Note: In the current implementation, SemiFungible is never returned
 
-#[type_abi]
 #[derive(
     TopDecode, TopEncode, NestedDecode, NestedEncode, Clone, PartialEq, Eq, Debug, ManagedVecItem,
 )]
@@ -87,3 +88,13 @@ impl<'a> From<&'a [u8]> for EsdtTokenType {
         }
     }
 }
+
+impl TypeAbi for EsdtTokenType {
+    fn type_name() -> TypeName {
+        "EsdtTokenType".into()
+    }
+
+    fn type_name_rust() -> TypeName {
+        "EsdtTokenType".into()
+    }
+}

From 1c81db7af7b72d1044502a8f1f42f5ce418bce5b Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Tue, 7 May 2024 12:45:23 +0300
Subject: [PATCH 0822/1254] increase code coverage - fix test

---
 .../base/src/types/flags/esdt_token_type.rs   | 22 +++++--------------
 .../generate_proxy/proxy_generator.rs         |  1 +
 2 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/framework/base/src/types/flags/esdt_token_type.rs b/framework/base/src/types/flags/esdt_token_type.rs
index d644f41333..e80b91590d 100644
--- a/framework/base/src/types/flags/esdt_token_type.rs
+++ b/framework/base/src/types/flags/esdt_token_type.rs
@@ -1,11 +1,8 @@
-use multiversx_sc_derive::ManagedVecItem;
+use multiversx_sc_derive::{type_abi, ManagedVecItem};
 
-use crate::{
-    abi::{TypeAbi, TypeName},
-    codec::{
-        self,
-        derive::{NestedDecode, NestedEncode, TopDecode, TopEncode},
-    },
+use crate::codec::{
+    self,
+    derive::{NestedDecode, NestedEncode, TopDecode, TopEncode},
 };
 
 const ESDT_TYPE_FUNGIBLE: &[u8] = b"FungibleESDT";
@@ -18,6 +15,7 @@ use crate as multiversx_sc; // needed by the TypeAbi generated code
 
 // Note: In the current implementation, SemiFungible is never returned
 
+#[type_abi]
 #[derive(
     TopDecode, TopEncode, NestedDecode, NestedEncode, Clone, PartialEq, Eq, Debug, ManagedVecItem,
 )]
@@ -88,13 +86,3 @@ impl<'a> From<&'a [u8]> for EsdtTokenType {
         }
     }
 }
-
-impl TypeAbi for EsdtTokenType {
-    fn type_name() -> TypeName {
-        "EsdtTokenType".into()
-    }
-
-    fn type_name_rust() -> TypeName {
-        "EsdtTokenType".into()
-    }
-}
diff --git a/framework/meta/src/cmd/contract/generate_proxy/proxy_generator.rs b/framework/meta/src/cmd/contract/generate_proxy/proxy_generator.rs
index 82f37cdfba..e74035371e 100644
--- a/framework/meta/src/cmd/contract/generate_proxy/proxy_generator.rs
+++ b/framework/meta/src/cmd/contract/generate_proxy/proxy_generator.rs
@@ -36,6 +36,7 @@ const TYPES_FROM_FRAMEWORK: &[&str] = &[
     "EgldOrMultiEsdtPayment",
     "EsdtTokenData",
     "EsdtLocalRole",
+    "EsdtTokenType"
 ];
 
 pub struct ProxyGenerator<'a> {

From d00322615bacb3077a9e7150b5fe38dbd81057a0 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Tue, 7 May 2024 13:00:20 +0300
Subject: [PATCH 0823/1254] increase code coverage - remove depricated
 CodecInto from proxy

---
 .../forwarder/src/forwarder_proxy.rs          | 302 +++++++++---------
 1 file changed, 151 insertions(+), 151 deletions(-)

diff --git a/contracts/feature-tests/composability/forwarder/src/forwarder_proxy.rs b/contracts/feature-tests/composability/forwarder/src/forwarder_proxy.rs
index 4d0f3f7bdd..77b959106e 100644
--- a/contracts/feature-tests/composability/forwarder/src/forwarder_proxy.rs
+++ b/contracts/feature-tests/composability/forwarder/src/forwarder_proxy.rs
@@ -62,8 +62,8 @@ where
     Gas: TxGas<Env>,
 {
     pub fn send_egld<
-        Arg0: CodecInto<ManagedAddress<Env::Api>>,
-        Arg1: CodecInto<BigUint<Env::Api>>,
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg1: ProxyArg<BigUint<Env::Api>>,
     >(
         self,
         to: Arg0,
@@ -77,8 +77,8 @@ where
     }
 
     pub fn echo_arguments_sync<
-        Arg0: CodecInto<ManagedAddress<Env::Api>>,
-        Arg1: CodecInto<MultiValueEncoded<Env::Api, ManagedBuffer<Env::Api>>>,
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg1: ProxyArg<MultiValueEncoded<Env::Api, ManagedBuffer<Env::Api>>>,
     >(
         self,
         to: Arg0,
@@ -92,8 +92,8 @@ where
     }
 
     pub fn echo_arguments_sync_twice<
-        Arg0: CodecInto<ManagedAddress<Env::Api>>,
-        Arg1: CodecInto<MultiValueEncoded<Env::Api, ManagedBuffer<Env::Api>>>,
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg1: ProxyArg<MultiValueEncoded<Env::Api, ManagedBuffer<Env::Api>>>,
     >(
         self,
         to: Arg0,
@@ -107,7 +107,7 @@ where
     }
 
     pub fn forward_sync_accept_funds<
-        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
     >(
         self,
         to: Arg0,
@@ -119,8 +119,8 @@ where
     }
 
     pub fn forward_sync_accept_funds_with_fees<
-        Arg0: CodecInto<ManagedAddress<Env::Api>>,
-        Arg1: CodecInto<BigUint<Env::Api>>,
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg1: ProxyArg<BigUint<Env::Api>>,
     >(
         self,
         to: Arg0,
@@ -134,7 +134,7 @@ where
     }
 
     pub fn forward_sync_accept_funds_then_read<
-        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
     >(
         self,
         to: Arg0,
@@ -146,10 +146,10 @@ where
     }
 
     pub fn forward_sync_retrieve_funds<
-        Arg0: CodecInto<ManagedAddress<Env::Api>>,
-        Arg1: CodecInto<EgldOrEsdtTokenIdentifier<Env::Api>>,
-        Arg2: CodecInto<u64>,
-        Arg3: CodecInto<BigUint<Env::Api>>,
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg1: ProxyArg<EgldOrEsdtTokenIdentifier<Env::Api>>,
+        Arg2: ProxyArg<u64>,
+        Arg3: ProxyArg<BigUint<Env::Api>>,
     >(
         self,
         to: Arg0,
@@ -167,9 +167,9 @@ where
     }
 
     pub fn forward_sync_retrieve_funds_with_accept_func<
-        Arg0: CodecInto<ManagedAddress<Env::Api>>,
-        Arg1: CodecInto<TokenIdentifier<Env::Api>>,
-        Arg2: CodecInto<BigUint<Env::Api>>,
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg1: ProxyArg<TokenIdentifier<Env::Api>>,
+        Arg2: ProxyArg<BigUint<Env::Api>>,
     >(
         self,
         to: Arg0,
@@ -193,8 +193,8 @@ where
     }
 
     pub fn forward_sync_accept_funds_multi_transfer<
-        Arg0: CodecInto<ManagedAddress<Env::Api>>,
-        Arg1: CodecInto<MultiValueEncoded<Env::Api, MultiValue3<TokenIdentifier<Env::Api>, u64, BigUint<Env::Api>>>>,
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg1: ProxyArg<MultiValueEncoded<Env::Api, MultiValue3<TokenIdentifier<Env::Api>, u64, BigUint<Env::Api>>>>,
     >(
         self,
         to: Arg0,
@@ -208,8 +208,8 @@ where
     }
 
     pub fn echo_args_async<
-        Arg0: CodecInto<ManagedAddress<Env::Api>>,
-        Arg1: CodecInto<MultiValueEncoded<Env::Api, ManagedBuffer<Env::Api>>>,
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg1: ProxyArg<MultiValueEncoded<Env::Api, ManagedBuffer<Env::Api>>>,
     >(
         self,
         to: Arg0,
@@ -223,7 +223,7 @@ where
     }
 
     pub fn forward_async_accept_funds<
-        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
     >(
         self,
         to: Arg0,
@@ -235,7 +235,7 @@ where
     }
 
     pub fn forward_async_accept_funds_half_payment<
-        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
     >(
         self,
         to: Arg0,
@@ -247,8 +247,8 @@ where
     }
 
     pub fn forward_async_accept_funds_with_fees<
-        Arg0: CodecInto<ManagedAddress<Env::Api>>,
-        Arg1: CodecInto<BigUint<Env::Api>>,
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg1: ProxyArg<BigUint<Env::Api>>,
     >(
         self,
         to: Arg0,
@@ -262,10 +262,10 @@ where
     }
 
     pub fn forward_async_retrieve_funds<
-        Arg0: CodecInto<ManagedAddress<Env::Api>>,
-        Arg1: CodecInto<EgldOrEsdtTokenIdentifier<Env::Api>>,
-        Arg2: CodecInto<u64>,
-        Arg3: CodecInto<BigUint<Env::Api>>,
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg1: ProxyArg<EgldOrEsdtTokenIdentifier<Env::Api>>,
+        Arg2: ProxyArg<u64>,
+        Arg3: ProxyArg<BigUint<Env::Api>>,
     >(
         self,
         to: Arg0,
@@ -283,9 +283,9 @@ where
     }
 
     pub fn send_funds_twice<
-        Arg0: CodecInto<ManagedAddress<Env::Api>>,
-        Arg1: CodecInto<EgldOrEsdtTokenIdentifier<Env::Api>>,
-        Arg2: CodecInto<BigUint<Env::Api>>,
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg1: ProxyArg<EgldOrEsdtTokenIdentifier<Env::Api>>,
+        Arg2: ProxyArg<BigUint<Env::Api>>,
     >(
         self,
         to: Arg0,
@@ -301,8 +301,8 @@ where
     }
 
     pub fn send_async_accept_multi_transfer<
-        Arg0: CodecInto<ManagedAddress<Env::Api>>,
-        Arg1: CodecInto<MultiValueEncoded<Env::Api, MultiValue3<TokenIdentifier<Env::Api>, u64, BigUint<Env::Api>>>>,
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg1: ProxyArg<MultiValueEncoded<Env::Api, MultiValue3<TokenIdentifier<Env::Api>, u64, BigUint<Env::Api>>>>,
     >(
         self,
         to: Arg0,
@@ -324,7 +324,7 @@ where
     }
 
     pub fn callback_data_at_index<
-        Arg0: CodecInto<usize>,
+        Arg0: ProxyArg<usize>,
     >(
         self,
         index: Arg0,
@@ -344,7 +344,7 @@ where
     }
 
     pub fn forward_transf_exec_accept_funds<
-        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
     >(
         self,
         to: Arg0,
@@ -356,8 +356,8 @@ where
     }
 
     pub fn forward_transf_execu_accept_funds_with_fees<
-        Arg0: CodecInto<ManagedAddress<Env::Api>>,
-        Arg1: CodecInto<BigUint<Env::Api>>,
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg1: ProxyArg<BigUint<Env::Api>>,
     >(
         self,
         to: Arg0,
@@ -371,7 +371,7 @@ where
     }
 
     pub fn forward_transf_exec_accept_funds_twice<
-        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
     >(
         self,
         to: Arg0,
@@ -385,7 +385,7 @@ where
     /// Test that the default gas provided to the transfer_execute call 
     /// leaves enough in the transaction for finish to happen. 
     pub fn forward_transf_exec_accept_funds_return_values<
-        Arg0: CodecInto<ManagedAddress<Env::Api>>,
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
     >(
         self,
         to: Arg0,
@@ -397,8 +397,8 @@ where
     }
 
     pub fn transf_exec_multi_accept_funds<
-        Arg0: CodecInto<ManagedAddress<Env::Api>>,
-        Arg1: CodecInto<MultiValueEncoded<Env::Api, MultiValue3<TokenIdentifier<Env::Api>, u64, BigUint<Env::Api>>>>,
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg1: ProxyArg<MultiValueEncoded<Env::Api, MultiValue3<TokenIdentifier<Env::Api>, u64, BigUint<Env::Api>>>>,
     >(
         self,
         to: Arg0,
@@ -412,8 +412,8 @@ where
     }
 
     pub fn forward_transf_exec_reject_funds_multi_transfer<
-        Arg0: CodecInto<ManagedAddress<Env::Api>>,
-        Arg1: CodecInto<MultiValueEncoded<Env::Api, MultiValue3<TokenIdentifier<Env::Api>, u64, BigUint<Env::Api>>>>,
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg1: ProxyArg<MultiValueEncoded<Env::Api, MultiValue3<TokenIdentifier<Env::Api>, u64, BigUint<Env::Api>>>>,
     >(
         self,
         to: Arg0,
@@ -427,8 +427,8 @@ where
     }
 
     pub fn transf_exec_multi_reject_funds<
-        Arg0: CodecInto<ManagedAddress<Env::Api>>,
-        Arg1: CodecInto<MultiValueEncoded<Env::Api, MultiValue3<TokenIdentifier<Env::Api>, u64, BigUint<Env::Api>>>>,
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg1: ProxyArg<MultiValueEncoded<Env::Api, MultiValue3<TokenIdentifier<Env::Api>, u64, BigUint<Env::Api>>>>,
     >(
         self,
         to: Arg0,
@@ -442,8 +442,8 @@ where
     }
 
     pub fn change_owner<
-        Arg0: CodecInto<ManagedAddress<Env::Api>>,
-        Arg1: CodecInto<ManagedAddress<Env::Api>>,
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg1: ProxyArg<ManagedAddress<Env::Api>>,
     >(
         self,
         child_sc_address: Arg0,
@@ -457,8 +457,8 @@ where
     }
 
     pub fn deploy_contract<
-        Arg0: CodecInto<ManagedBuffer<Env::Api>>,
-        Arg1: CodecInto<OptionalValue<ManagedBuffer<Env::Api>>>,
+        Arg0: ProxyArg<ManagedBuffer<Env::Api>>,
+        Arg1: ProxyArg<OptionalValue<ManagedBuffer<Env::Api>>>,
     >(
         self,
         code: Arg0,
@@ -472,7 +472,7 @@ where
     }
 
     pub fn deploy_two_contracts<
-        Arg0: CodecInto<ManagedBuffer<Env::Api>>,
+        Arg0: ProxyArg<ManagedBuffer<Env::Api>>,
     >(
         self,
         code: Arg0,
@@ -484,8 +484,8 @@ where
     }
 
     pub fn deploy_vault_from_source<
-        Arg0: CodecInto<ManagedAddress<Env::Api>>,
-        Arg1: CodecInto<OptionalValue<ManagedBuffer<Env::Api>>>,
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg1: ProxyArg<OptionalValue<ManagedBuffer<Env::Api>>>,
     >(
         self,
         source_address: Arg0,
@@ -499,9 +499,9 @@ where
     }
 
     pub fn upgrade_vault<
-        Arg0: CodecInto<ManagedAddress<Env::Api>>,
-        Arg1: CodecInto<ManagedBuffer<Env::Api>>,
-        Arg2: CodecInto<OptionalValue<ManagedBuffer<Env::Api>>>,
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg1: ProxyArg<ManagedBuffer<Env::Api>>,
+        Arg2: ProxyArg<OptionalValue<ManagedBuffer<Env::Api>>>,
     >(
         self,
         child_sc_address: Arg0,
@@ -517,9 +517,9 @@ where
     }
 
     pub fn upgrade_vault_from_source<
-        Arg0: CodecInto<ManagedAddress<Env::Api>>,
-        Arg1: CodecInto<ManagedAddress<Env::Api>>,
-        Arg2: CodecInto<OptionalValue<ManagedBuffer<Env::Api>>>,
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg1: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg2: ProxyArg<OptionalValue<ManagedBuffer<Env::Api>>>,
     >(
         self,
         child_sc_address: Arg0,
@@ -535,7 +535,7 @@ where
     }
 
     pub fn get_fungible_esdt_balance<
-        Arg0: CodecInto<TokenIdentifier<Env::Api>>,
+        Arg0: ProxyArg<TokenIdentifier<Env::Api>>,
     >(
         self,
         token_identifier: Arg0,
@@ -547,7 +547,7 @@ where
     }
 
     pub fn get_current_nft_nonce<
-        Arg0: CodecInto<TokenIdentifier<Env::Api>>,
+        Arg0: ProxyArg<TokenIdentifier<Env::Api>>,
     >(
         self,
         token_identifier: Arg0,
@@ -559,9 +559,9 @@ where
     }
 
     pub fn send_esdt<
-        Arg0: CodecInto<ManagedAddress<Env::Api>>,
-        Arg1: CodecInto<TokenIdentifier<Env::Api>>,
-        Arg2: CodecInto<BigUint<Env::Api>>,
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg1: ProxyArg<TokenIdentifier<Env::Api>>,
+        Arg2: ProxyArg<BigUint<Env::Api>>,
     >(
         self,
         to: Arg0,
@@ -577,8 +577,8 @@ where
     }
 
     pub fn send_esdt_with_fees<
-        Arg0: CodecInto<ManagedAddress<Env::Api>>,
-        Arg1: CodecInto<BigUint<Env::Api>>,
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg1: ProxyArg<BigUint<Env::Api>>,
     >(
         self,
         to: Arg0,
@@ -592,10 +592,10 @@ where
     }
 
     pub fn send_esdt_twice<
-        Arg0: CodecInto<ManagedAddress<Env::Api>>,
-        Arg1: CodecInto<TokenIdentifier<Env::Api>>,
-        Arg2: CodecInto<BigUint<Env::Api>>,
-        Arg3: CodecInto<BigUint<Env::Api>>,
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg1: ProxyArg<TokenIdentifier<Env::Api>>,
+        Arg2: ProxyArg<BigUint<Env::Api>>,
+        Arg3: ProxyArg<BigUint<Env::Api>>,
     >(
         self,
         to: Arg0,
@@ -613,8 +613,8 @@ where
     }
 
     pub fn send_esdt_direct_multi_transfer<
-        Arg0: CodecInto<ManagedAddress<Env::Api>>,
-        Arg1: CodecInto<MultiValueEncoded<Env::Api, MultiValue3<TokenIdentifier<Env::Api>, u64, BigUint<Env::Api>>>>,
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg1: ProxyArg<MultiValueEncoded<Env::Api, MultiValue3<TokenIdentifier<Env::Api>, u64, BigUint<Env::Api>>>>,
     >(
         self,
         to: Arg0,
@@ -628,9 +628,9 @@ where
     }
 
     pub fn issue_fungible_token<
-        Arg0: CodecInto<ManagedBuffer<Env::Api>>,
-        Arg1: CodecInto<ManagedBuffer<Env::Api>>,
-        Arg2: CodecInto<BigUint<Env::Api>>,
+        Arg0: ProxyArg<ManagedBuffer<Env::Api>>,
+        Arg1: ProxyArg<ManagedBuffer<Env::Api>>,
+        Arg2: ProxyArg<BigUint<Env::Api>>,
     >(
         self,
         token_display_name: Arg0,
@@ -646,8 +646,8 @@ where
     }
 
     pub fn local_mint<
-        Arg0: CodecInto<TokenIdentifier<Env::Api>>,
-        Arg1: CodecInto<BigUint<Env::Api>>,
+        Arg0: ProxyArg<TokenIdentifier<Env::Api>>,
+        Arg1: ProxyArg<BigUint<Env::Api>>,
     >(
         self,
         token_identifier: Arg0,
@@ -661,8 +661,8 @@ where
     }
 
     pub fn local_burn<
-        Arg0: CodecInto<TokenIdentifier<Env::Api>>,
-        Arg1: CodecInto<BigUint<Env::Api>>,
+        Arg0: ProxyArg<TokenIdentifier<Env::Api>>,
+        Arg1: ProxyArg<BigUint<Env::Api>>,
     >(
         self,
         token_identifier: Arg0,
@@ -676,7 +676,7 @@ where
     }
 
     pub fn get_esdt_local_roles<
-        Arg0: CodecInto<TokenIdentifier<Env::Api>>,
+        Arg0: ProxyArg<TokenIdentifier<Env::Api>>,
     >(
         self,
         token_id: Arg0,
@@ -688,9 +688,9 @@ where
     }
 
     pub fn get_esdt_token_data<
-        Arg0: CodecInto<ManagedAddress<Env::Api>>,
-        Arg1: CodecInto<TokenIdentifier<Env::Api>>,
-        Arg2: CodecInto<u64>,
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg1: ProxyArg<TokenIdentifier<Env::Api>>,
+        Arg2: ProxyArg<u64>,
     >(
         self,
         address: Arg0,
@@ -706,9 +706,9 @@ where
     }
 
     pub fn is_esdt_frozen<
-        Arg0: CodecInto<ManagedAddress<Env::Api>>,
-        Arg1: CodecInto<TokenIdentifier<Env::Api>>,
-        Arg2: CodecInto<u64>,
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg1: ProxyArg<TokenIdentifier<Env::Api>>,
+        Arg2: ProxyArg<u64>,
     >(
         self,
         address: Arg0,
@@ -724,7 +724,7 @@ where
     }
 
     pub fn is_esdt_paused<
-        Arg0: CodecInto<TokenIdentifier<Env::Api>>,
+        Arg0: ProxyArg<TokenIdentifier<Env::Api>>,
     >(
         self,
         token_id: Arg0,
@@ -736,7 +736,7 @@ where
     }
 
     pub fn is_esdt_limited_transfer<
-        Arg0: CodecInto<TokenIdentifier<Env::Api>>,
+        Arg0: ProxyArg<TokenIdentifier<Env::Api>>,
     >(
         self,
         token_id: Arg0,
@@ -748,7 +748,7 @@ where
     }
 
     pub fn validate_token_identifier<
-        Arg0: CodecInto<TokenIdentifier<Env::Api>>,
+        Arg0: ProxyArg<TokenIdentifier<Env::Api>>,
     >(
         self,
         token_id: Arg0,
@@ -760,8 +760,8 @@ where
     }
 
     pub fn sft_issue<
-        Arg0: CodecInto<ManagedBuffer<Env::Api>>,
-        Arg1: CodecInto<ManagedBuffer<Env::Api>>,
+        Arg0: ProxyArg<ManagedBuffer<Env::Api>>,
+        Arg1: ProxyArg<ManagedBuffer<Env::Api>>,
     >(
         self,
         token_display_name: Arg0,
@@ -775,8 +775,8 @@ where
     }
 
     pub fn get_nft_balance<
-        Arg0: CodecInto<TokenIdentifier<Env::Api>>,
-        Arg1: CodecInto<u64>,
+        Arg0: ProxyArg<TokenIdentifier<Env::Api>>,
+        Arg1: ProxyArg<u64>,
     >(
         self,
         token_identifier: Arg0,
@@ -790,9 +790,9 @@ where
     }
 
     pub fn buy_nft<
-        Arg0: CodecInto<TokenIdentifier<Env::Api>>,
-        Arg1: CodecInto<u64>,
-        Arg2: CodecInto<BigUint<Env::Api>>,
+        Arg0: ProxyArg<TokenIdentifier<Env::Api>>,
+        Arg1: ProxyArg<u64>,
+        Arg2: ProxyArg<BigUint<Env::Api>>,
     >(
         self,
         nft_id: Arg0,
@@ -808,8 +808,8 @@ where
     }
 
     pub fn nft_issue<
-        Arg0: CodecInto<ManagedBuffer<Env::Api>>,
-        Arg1: CodecInto<ManagedBuffer<Env::Api>>,
+        Arg0: ProxyArg<ManagedBuffer<Env::Api>>,
+        Arg1: ProxyArg<ManagedBuffer<Env::Api>>,
     >(
         self,
         token_display_name: Arg0,
@@ -823,13 +823,13 @@ where
     }
 
     pub fn nft_create<
-        Arg0: CodecInto<TokenIdentifier<Env::Api>>,
-        Arg1: CodecInto<BigUint<Env::Api>>,
-        Arg2: CodecInto<ManagedBuffer<Env::Api>>,
-        Arg3: CodecInto<BigUint<Env::Api>>,
-        Arg4: CodecInto<ManagedBuffer<Env::Api>>,
-        Arg5: CodecInto<Color>,
-        Arg6: CodecInto<ManagedBuffer<Env::Api>>,
+        Arg0: ProxyArg<TokenIdentifier<Env::Api>>,
+        Arg1: ProxyArg<BigUint<Env::Api>>,
+        Arg2: ProxyArg<ManagedBuffer<Env::Api>>,
+        Arg3: ProxyArg<BigUint<Env::Api>>,
+        Arg4: ProxyArg<ManagedBuffer<Env::Api>>,
+        Arg5: ProxyArg<Color>,
+        Arg6: ProxyArg<ManagedBuffer<Env::Api>>,
     >(
         self,
         token_identifier: Arg0,
@@ -853,9 +853,9 @@ where
     }
 
     pub fn nft_create_compact<
-        Arg0: CodecInto<TokenIdentifier<Env::Api>>,
-        Arg1: CodecInto<BigUint<Env::Api>>,
-        Arg2: CodecInto<Color>,
+        Arg0: ProxyArg<TokenIdentifier<Env::Api>>,
+        Arg1: ProxyArg<BigUint<Env::Api>>,
+        Arg2: ProxyArg<Color>,
     >(
         self,
         token_identifier: Arg0,
@@ -871,9 +871,9 @@ where
     }
 
     pub fn nft_add_uris<
-        Arg0: CodecInto<TokenIdentifier<Env::Api>>,
-        Arg1: CodecInto<u64>,
-        Arg2: CodecInto<MultiValueEncoded<Env::Api, ManagedBuffer<Env::Api>>>,
+        Arg0: ProxyArg<TokenIdentifier<Env::Api>>,
+        Arg1: ProxyArg<u64>,
+        Arg2: ProxyArg<MultiValueEncoded<Env::Api, ManagedBuffer<Env::Api>>>,
     >(
         self,
         token_identifier: Arg0,
@@ -889,9 +889,9 @@ where
     }
 
     pub fn nft_update_attributes<
-        Arg0: CodecInto<TokenIdentifier<Env::Api>>,
-        Arg1: CodecInto<u64>,
-        Arg2: CodecInto<Color>,
+        Arg0: ProxyArg<TokenIdentifier<Env::Api>>,
+        Arg1: ProxyArg<u64>,
+        Arg2: ProxyArg<Color>,
     >(
         self,
         token_identifier: Arg0,
@@ -907,13 +907,13 @@ where
     }
 
     pub fn nft_decode_complex_attributes<
-        Arg0: CodecInto<TokenIdentifier<Env::Api>>,
-        Arg1: CodecInto<BigUint<Env::Api>>,
-        Arg2: CodecInto<ManagedBuffer<Env::Api>>,
-        Arg3: CodecInto<BigUint<Env::Api>>,
-        Arg4: CodecInto<ManagedBuffer<Env::Api>>,
-        Arg5: CodecInto<ManagedBuffer<Env::Api>>,
-        Arg6: CodecInto<MultiValue5<BigUint<Env::Api>, ManagedBuffer<Env::Api>, TokenIdentifier<Env::Api>, bool, ManagedBuffer<Env::Api>>>,
+        Arg0: ProxyArg<TokenIdentifier<Env::Api>>,
+        Arg1: ProxyArg<BigUint<Env::Api>>,
+        Arg2: ProxyArg<ManagedBuffer<Env::Api>>,
+        Arg3: ProxyArg<BigUint<Env::Api>>,
+        Arg4: ProxyArg<ManagedBuffer<Env::Api>>,
+        Arg5: ProxyArg<ManagedBuffer<Env::Api>>,
+        Arg6: ProxyArg<MultiValue5<BigUint<Env::Api>, ManagedBuffer<Env::Api>, TokenIdentifier<Env::Api>, bool, ManagedBuffer<Env::Api>>>,
     >(
         self,
         token_identifier: Arg0,
@@ -937,9 +937,9 @@ where
     }
 
     pub fn nft_add_quantity<
-        Arg0: CodecInto<TokenIdentifier<Env::Api>>,
-        Arg1: CodecInto<u64>,
-        Arg2: CodecInto<BigUint<Env::Api>>,
+        Arg0: ProxyArg<TokenIdentifier<Env::Api>>,
+        Arg1: ProxyArg<u64>,
+        Arg2: ProxyArg<BigUint<Env::Api>>,
     >(
         self,
         token_identifier: Arg0,
@@ -955,9 +955,9 @@ where
     }
 
     pub fn nft_burn<
-        Arg0: CodecInto<TokenIdentifier<Env::Api>>,
-        Arg1: CodecInto<u64>,
-        Arg2: CodecInto<BigUint<Env::Api>>,
+        Arg0: ProxyArg<TokenIdentifier<Env::Api>>,
+        Arg1: ProxyArg<u64>,
+        Arg2: ProxyArg<BigUint<Env::Api>>,
     >(
         self,
         token_identifier: Arg0,
@@ -973,10 +973,10 @@ where
     }
 
     pub fn transfer_nft_via_async_call<
-        Arg0: CodecInto<ManagedAddress<Env::Api>>,
-        Arg1: CodecInto<TokenIdentifier<Env::Api>>,
-        Arg2: CodecInto<u64>,
-        Arg3: CodecInto<BigUint<Env::Api>>,
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg1: ProxyArg<TokenIdentifier<Env::Api>>,
+        Arg2: ProxyArg<u64>,
+        Arg3: ProxyArg<BigUint<Env::Api>>,
     >(
         self,
         to: Arg0,
@@ -994,12 +994,12 @@ where
     }
 
     pub fn transfer_nft_and_execute<
-        Arg0: CodecInto<ManagedAddress<Env::Api>>,
-        Arg1: CodecInto<TokenIdentifier<Env::Api>>,
-        Arg2: CodecInto<u64>,
-        Arg3: CodecInto<BigUint<Env::Api>>,
-        Arg4: CodecInto<ManagedBuffer<Env::Api>>,
-        Arg5: CodecInto<MultiValueEncoded<Env::Api, ManagedBuffer<Env::Api>>>,
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg1: ProxyArg<TokenIdentifier<Env::Api>>,
+        Arg2: ProxyArg<u64>,
+        Arg3: ProxyArg<BigUint<Env::Api>>,
+        Arg4: ProxyArg<ManagedBuffer<Env::Api>>,
+        Arg5: ProxyArg<MultiValueEncoded<Env::Api, ManagedBuffer<Env::Api>>>,
     >(
         self,
         to: Arg0,
@@ -1021,14 +1021,14 @@ where
     }
 
     pub fn create_and_send<
-        Arg0: CodecInto<ManagedAddress<Env::Api>>,
-        Arg1: CodecInto<TokenIdentifier<Env::Api>>,
-        Arg2: CodecInto<BigUint<Env::Api>>,
-        Arg3: CodecInto<ManagedBuffer<Env::Api>>,
-        Arg4: CodecInto<BigUint<Env::Api>>,
-        Arg5: CodecInto<ManagedBuffer<Env::Api>>,
-        Arg6: CodecInto<Color>,
-        Arg7: CodecInto<ManagedBuffer<Env::Api>>,
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg1: ProxyArg<TokenIdentifier<Env::Api>>,
+        Arg2: ProxyArg<BigUint<Env::Api>>,
+        Arg3: ProxyArg<ManagedBuffer<Env::Api>>,
+        Arg4: ProxyArg<BigUint<Env::Api>>,
+        Arg5: ProxyArg<ManagedBuffer<Env::Api>>,
+        Arg6: ProxyArg<Color>,
+        Arg7: ProxyArg<ManagedBuffer<Env::Api>>,
     >(
         self,
         to: Arg0,
@@ -1054,9 +1054,9 @@ where
     }
 
     pub fn set_local_roles<
-        Arg0: CodecInto<ManagedAddress<Env::Api>>,
-        Arg1: CodecInto<TokenIdentifier<Env::Api>>,
-        Arg2: CodecInto<MultiValueEncoded<Env::Api, EsdtLocalRole>>,
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg1: ProxyArg<TokenIdentifier<Env::Api>>,
+        Arg2: ProxyArg<MultiValueEncoded<Env::Api, EsdtLocalRole>>,
     >(
         self,
         address: Arg0,
@@ -1072,9 +1072,9 @@ where
     }
 
     pub fn unset_local_roles<
-        Arg0: CodecInto<ManagedAddress<Env::Api>>,
-        Arg1: CodecInto<TokenIdentifier<Env::Api>>,
-        Arg2: CodecInto<MultiValueEncoded<Env::Api, EsdtLocalRole>>,
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg1: ProxyArg<TokenIdentifier<Env::Api>>,
+        Arg2: ProxyArg<MultiValueEncoded<Env::Api, EsdtLocalRole>>,
     >(
         self,
         address: Arg0,

From 58f37e3e9a64e9351ada3e918077676033a93128 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Tue, 7 May 2024 13:16:25 +0300
Subject: [PATCH 0824/1254] increase code coverage - add type abi in forwarder
 proxy

---
 .../composability/forwarder/src/forwarder_proxy.rs              | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/contracts/feature-tests/composability/forwarder/src/forwarder_proxy.rs b/contracts/feature-tests/composability/forwarder/src/forwarder_proxy.rs
index 77b959106e..c5e53db05d 100644
--- a/contracts/feature-tests/composability/forwarder/src/forwarder_proxy.rs
+++ b/contracts/feature-tests/composability/forwarder/src/forwarder_proxy.rs
@@ -1106,6 +1106,7 @@ where
     }
 }
 
+#[type_abi]
 #[derive(TopEncode, TopDecode)]
 pub struct CallbackData<Api>
 where
@@ -1118,6 +1119,7 @@ where
     pub args: ManagedVec<Api, ManagedBuffer<Api>>,
 }
 
+#[type_abi]
 #[derive(TopEncode, TopDecode, Clone, Copy, PartialEq, Debug)]
 pub struct Color {
     pub r: u8,

From 13823a9f3c8b0ee8a5a83b635e916a618118de50 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 7 May 2024 13:39:16 +0300
Subject: [PATCH 0825/1254] deprecated older non-unified syntax

---
 .../tests/linked_list_repeat_blackbox_test.rs |  2 +
 .../interact/src/bf_interact.rs               |  2 +
 .../interact/src/comp_interact_main.rs        |  1 +
 .../tests/forwarder_blackbox_legacy_test.rs   |  2 +
 .../tests/promises_feature_blackbox_test.rs   |  2 +
 .../tests/transfer_role_blackbox_test.rs      |  2 +
 .../tests/tester_blackbox_test.rs             |  2 +
 .../src/facade/scenario_world_steps.rs        | 38 +++++++++++++++++
 framework/scenario/src/imports.rs             |  2 +-
 .../src/scenario/model/step/sc_call_step.rs   | 12 ++++--
 .../src/scenario/model/step/typed_sc_call.rs  | 14 +++++++
 .../scenario/src/scenario/run_vm/sc_call.rs   |  9 +++-
 .../interactor_sc_extra.rs                    | 42 +++++++++++++++++++
 .../interactor_vm_query.rs                    |  2 +
 14 files changed, 125 insertions(+), 7 deletions(-)

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 12fde7ba31..bd5a4198e3 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
@@ -1,3 +1,5 @@
+#![allow(deprecated)] // TODO: unified syntax
+
 use benchmark_common::ExampleStruct;
 use linked_list_repeat::ProxyTrait;
 use multiversx_sc_scenario::imports::*;
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 acc8b90715..e02d281120 100644
--- a/contracts/feature-tests/basic-features/interact/src/bf_interact.rs
+++ b/contracts/feature-tests/basic-features/interact/src/bf_interact.rs
@@ -1,3 +1,5 @@
+#![allow(deprecated)] // TODO: unified syntax
+
 mod bf_interact_cli;
 mod bf_interact_config;
 mod bf_interact_state;
diff --git a/contracts/feature-tests/composability/interact/src/comp_interact_main.rs b/contracts/feature-tests/composability/interact/src/comp_interact_main.rs
index cefa9272f2..9f4a6d6872 100644
--- a/contracts/feature-tests/composability/interact/src/comp_interact_main.rs
+++ b/contracts/feature-tests/composability/interact/src/comp_interact_main.rs
@@ -1,4 +1,5 @@
 #![allow(clippy::too_many_arguments)]
+#![allow(deprecated)] // TODO: switch to unified syntax
 
 mod call_tree;
 mod call_tree_calling_functions;
diff --git a/contracts/feature-tests/composability/tests/forwarder_blackbox_legacy_test.rs b/contracts/feature-tests/composability/tests/forwarder_blackbox_legacy_test.rs
index 9620e12277..cc13982a2d 100644
--- a/contracts/feature-tests/composability/tests/forwarder_blackbox_legacy_test.rs
+++ b/contracts/feature-tests/composability/tests/forwarder_blackbox_legacy_test.rs
@@ -1,3 +1,5 @@
+#![allow(deprecated)]
+
 use forwarder_legacy::nft_legacy::{Color, ProxyTrait as _};
 
 use multiversx_sc_scenario::{
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 e29ff1c7ca..180cb1c508 100644
--- a/contracts/feature-tests/composability/tests/promises_feature_blackbox_test.rs
+++ b/contracts/feature-tests/composability/tests/promises_feature_blackbox_test.rs
@@ -1,3 +1,5 @@
+#![allow(deprecated)] // TODO: unified syntax
+
 use multiversx_sc::types::BigUint;
 use multiversx_sc_scenario::imports::*;
 
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 2428a9a6bc..a1588759d6 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
@@ -1,3 +1,5 @@
+#![allow(deprecated)] // TODO: unified syntax
+
 use multiversx_sc_scenario::imports::*;
 use transfer_role_features::ProxyTrait as _;
 
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 d927b1ba4a..b47c83fcef 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
@@ -16,6 +16,7 @@ fn world() -> ScenarioWorld {
 }
 
 #[test]
+#[allow(deprecated)]
 fn tester_deploy_test() {
     let mut world = world();
     let code = world.code_expression(WASM_PATH_EXPR);
@@ -45,6 +46,7 @@ fn tester_deploy_test() {
 }
 
 #[test]
+#[allow(deprecated)]
 fn tester_deploy_test_spawned_thread() {
     let handler = std::thread::spawn(|| {
         let mut world = world();
diff --git a/framework/scenario/src/facade/scenario_world_steps.rs b/framework/scenario/src/facade/scenario_world_steps.rs
index 389b58ecf6..7f786d9e65 100644
--- a/framework/scenario/src/facade/scenario_world_steps.rs
+++ b/framework/scenario/src/facade/scenario_world_steps.rs
@@ -1,3 +1,5 @@
+#![allow(deprecated)]
+
 use multiversx_sc::{
     abi::TypeAbiFrom,
     codec::TopDecodeMulti,
@@ -33,6 +35,10 @@ impl ScenarioWorld {
         self
     }
 
+    #[deprecated(
+        since = "0.49.0",
+        note = "Please use the unified transaction syntax instead."
+    )]
     pub fn sc_call_use_raw_response<S, F>(&mut self, mut step: S, use_raw_response: F) -> &mut Self
     where
         S: AsMut<ScCallStep>,
@@ -44,6 +50,10 @@ impl ScenarioWorld {
         self
     }
 
+    #[deprecated(
+        since = "0.49.0",
+        note = "Please use the unified transaction syntax instead."
+    )]
     pub fn sc_call_use_result<OriginalResult, RequestedResult, F>(
         &mut self,
         step: TypedScCall<OriginalResult>,
@@ -60,6 +70,10 @@ impl ScenarioWorld {
         })
     }
 
+    #[deprecated(
+        since = "0.49.0",
+        note = "Please use the unified transaction syntax instead."
+    )]
     pub fn sc_call_get_result<OriginalResult, RequestedResult>(
         &mut self,
         mut step: TypedScCall<OriginalResult>,
@@ -83,6 +97,10 @@ impl ScenarioWorld {
         self
     }
 
+    #[deprecated(
+        since = "0.49.0",
+        note = "Please use the unified transaction syntax instead."
+    )]
     pub fn sc_query_use_raw_response<S, F>(&mut self, mut step: S, use_raw_response: F) -> &mut Self
     where
         S: AsMut<ScQueryStep>,
@@ -95,6 +113,10 @@ impl ScenarioWorld {
         self
     }
 
+    #[deprecated(
+        since = "0.49.0",
+        note = "Please use the unified transaction syntax instead."
+    )]
     pub fn sc_query_use_result<OriginalResult, RequestedResult, F>(
         &mut self,
         step: TypedScQuery<OriginalResult>,
@@ -111,6 +133,10 @@ impl ScenarioWorld {
         })
     }
 
+    #[deprecated(
+        since = "0.49.0",
+        note = "Please use the unified transaction syntax instead."
+    )]
     pub fn sc_query_get_result<OriginalResult, RequestedResult>(
         &mut self,
         mut step: TypedScQuery<OriginalResult>,
@@ -147,6 +173,10 @@ impl ScenarioWorld {
         self
     }
 
+    #[deprecated(
+        since = "0.49.0",
+        note = "Please use the unified transaction syntax instead."
+    )]
     pub fn sc_deploy_use_raw_response<S, F>(
         &mut self,
         mut step: S,
@@ -163,6 +193,10 @@ impl ScenarioWorld {
         self
     }
 
+    #[deprecated(
+        since = "0.49.0",
+        note = "Please use the unified transaction syntax instead."
+    )]
     pub fn sc_deploy_use_result<OriginalResult, RequestedResult, F>(
         &mut self,
         step: TypedScDeploy<OriginalResult>,
@@ -180,6 +214,10 @@ impl ScenarioWorld {
         })
     }
 
+    #[deprecated(
+        since = "0.49.0",
+        note = "Please use the unified transaction syntax instead."
+    )]
     pub fn sc_deploy_get_result<OriginalResult, RequestedResult>(
         &mut self,
         mut step: TypedScDeploy<OriginalResult>,
diff --git a/framework/scenario/src/imports.rs b/framework/scenario/src/imports.rs
index aa30283dc3..9eac89fc70 100644
--- a/framework/scenario/src/imports.rs
+++ b/framework/scenario/src/imports.rs
@@ -15,7 +15,7 @@ pub use crate::{
         model::{
             Account, AddressValue, BytesValue, CheckAccount, CheckStateStep, ScCallStep,
             ScDeployStep, ScQueryStep, Scenario, SetStateStep, TransferStep, TxESDT, TxExpect,
-            TypedResponse, TypedScCall, TypedScDeploy,
+            TypedResponse, TypedScDeploy,
         },
         ScenarioRunner,
     },
diff --git a/framework/scenario/src/scenario/model/step/sc_call_step.rs b/framework/scenario/src/scenario/model/step/sc_call_step.rs
index 3bcd3d861e..55de65f4a4 100644
--- a/framework/scenario/src/scenario/model/step/sc_call_step.rs
+++ b/framework/scenario/src/scenario/model/step/sc_call_step.rs
@@ -14,8 +14,6 @@ use crate::multiversx_sc::{
     types::{ContractCall, ManagedArgBuffer},
 };
 
-use super::TypedScCall;
-
 #[derive(Debug, Clone)]
 pub struct ScCallStep {
     pub id: String,
@@ -139,7 +137,12 @@ impl ScCallStep {
     /// - "to"
     /// - "function"
     /// - "arguments"
-    pub fn call<CC>(mut self, contract_call: CC) -> TypedScCall<CC::OriginalResult>
+    #[deprecated(
+        since = "0.49.0",
+        note = "Please use the unified transaction syntax instead."
+    )]
+    #[allow(deprecated)]
+    pub fn call<CC>(mut self, contract_call: CC) -> super::TypedScCall<CC::OriginalResult>
     where
         CC: ContractCallBase<StaticApi>,
     {
@@ -170,11 +173,12 @@ impl ScCallStep {
         since = "0.42.0",
         note = "Please use `call` followed by `expect`, there is no point in having a method that does both."
     )]
+    #[allow(deprecated)]
     pub fn call_expect<CC, ExpectedResult>(
         self,
         contract_call: CC,
         expected_value: ExpectedResult,
-    ) -> TypedScCall<CC::OriginalResult>
+    ) -> super::TypedScCall<CC::OriginalResult>
     where
         CC: ContractCall<StaticApi>,
         ExpectedResult: TypeAbiFrom<CC::OriginalResult> + TopEncodeMulti,
diff --git a/framework/scenario/src/scenario/model/step/typed_sc_call.rs b/framework/scenario/src/scenario/model/step/typed_sc_call.rs
index 084cd3e71f..e70e00aa64 100644
--- a/framework/scenario/src/scenario/model/step/typed_sc_call.rs
+++ b/framework/scenario/src/scenario/model/step/typed_sc_call.rs
@@ -1,3 +1,5 @@
+#![allow(deprecated)]
+
 use std::marker::PhantomData;
 
 use multiversx_sc::{
@@ -15,6 +17,10 @@ use crate::{
 use super::{format_expect, ScCallStep};
 
 /// `SCCallStep` with explicit return type.
+#[deprecated(
+    since = "0.49.0",
+    note = "Please use the unified transaction syntax instead."
+)]
 #[derive(Default, Debug)]
 pub struct TypedScCall<OriginalResult> {
     pub sc_call_step: ScCallStep,
@@ -147,7 +153,15 @@ impl<OriginalResult> From<ScCallStep> for TypedScCall<OriginalResult> {
 /// Helps with syntax. Allows the `TypedScCall` to call the `execute` operation directly.
 ///
 /// The trait defines the connection to the executor.
+#[deprecated(
+    since = "0.49.0",
+    note = "Please use the unified transaction syntax instead."
+)]
 pub trait TypedScCallExecutor {
+    #[deprecated(
+        since = "0.49.0",
+        note = "Please use the unified transaction syntax instead."
+    )]
     fn execute_typed_sc_call<OriginalResult, RequestedResult>(
         &mut self,
         typed_sc_call: TypedScCall<OriginalResult>,
diff --git a/framework/scenario/src/scenario/run_vm/sc_call.rs b/framework/scenario/src/scenario/run_vm/sc_call.rs
index ceb9863478..0a66578eaf 100644
--- a/framework/scenario/src/scenario/run_vm/sc_call.rs
+++ b/framework/scenario/src/scenario/run_vm/sc_call.rs
@@ -1,6 +1,6 @@
 use crate::{
     multiversx_sc::codec::{PanicErrorHandler, TopEncodeMulti},
-    scenario::model::{ScCallStep, TxESDT, TypedScCall},
+    scenario::model::{ScCallStep, TxESDT},
     scenario_model::TxResponse,
 };
 
@@ -29,9 +29,14 @@ impl ScenarioVMRunner {
     ///
     /// It takes the `contract_call` argument separately from the SC call step,
     /// so we can benefit from type inference in the result.
+    #[deprecated(
+        since = "0.49.0",
+        note = "Please use the unified transaction syntax instead."
+    )]
+    #[allow(deprecated)]
     pub fn perform_sc_call_get_result<OriginalResult, RequestedResult>(
         &mut self,
-        typed_sc_call: TypedScCall<OriginalResult>,
+        typed_sc_call: crate::scenario_model::TypedScCall<OriginalResult>,
     ) -> RequestedResult
     where
         OriginalResult: TopEncodeMulti,
diff --git a/framework/snippets/src/interactor_scenario/interactor_sc_extra.rs b/framework/snippets/src/interactor_scenario/interactor_sc_extra.rs
index 8d25f32e9d..44e5efa744 100644
--- a/framework/snippets/src/interactor_scenario/interactor_sc_extra.rs
+++ b/framework/snippets/src/interactor_scenario/interactor_sc_extra.rs
@@ -1,3 +1,5 @@
+#![allow(deprecated)]
+
 use crate::Interactor;
 use multiversx_sc_scenario::{
     api::StaticApi,
@@ -13,6 +15,10 @@ use multiversx_sc_scenario::{
 };
 
 impl Interactor {
+    #[deprecated(
+        since = "0.49.0",
+        note = "Please use the unified transaction syntax instead."
+    )]
     pub async fn sc_call_use_raw_response<S, F>(
         &mut self,
         mut step: S,
@@ -28,6 +34,10 @@ impl Interactor {
         self
     }
 
+    #[deprecated(
+        since = "0.49.0",
+        note = "Please use the unified transaction syntax instead."
+    )]
     pub async fn sc_call_use_result<OriginalResult, RequestedResult, F>(
         &mut self,
         step: TypedScCall<OriginalResult>,
@@ -42,6 +52,10 @@ impl Interactor {
         self
     }
 
+    #[deprecated(
+        since = "0.49.0",
+        note = "Please use the unified transaction syntax instead."
+    )]
     pub async fn sc_call_get_result<OriginalResult, RequestedResult>(
         &mut self,
         mut step: TypedScCall<OriginalResult>,
@@ -55,6 +69,10 @@ impl Interactor {
         TypedResponse::from_raw(response)
     }
 
+    #[deprecated(
+        since = "0.49.0",
+        note = "Please use the unified transaction syntax instead."
+    )]
     pub async fn sc_query_use_raw_response<S, F>(
         &mut self,
         mut step: S,
@@ -70,6 +88,10 @@ impl Interactor {
         self
     }
 
+    #[deprecated(
+        since = "0.49.0",
+        note = "Please use the unified transaction syntax instead."
+    )]
     pub async fn sc_query_use_result<OriginalResult, RequestedResult, F>(
         &mut self,
         step: TypedScQuery<OriginalResult>,
@@ -84,6 +106,10 @@ impl Interactor {
         self
     }
 
+    #[deprecated(
+        since = "0.49.0",
+        note = "Please use the unified transaction syntax instead."
+    )]
     pub async fn sc_query_get_result<OriginalResult, RequestedResult>(
         &mut self,
         mut step: TypedScQuery<OriginalResult>,
@@ -97,6 +123,10 @@ impl Interactor {
         TypedResponse::from_raw(response)
     }
 
+    #[deprecated(
+        since = "0.49.0",
+        note = "Please use the unified transaction syntax instead."
+    )]
     pub async fn quick_query<CC, RequestedResult>(&mut self, contract_call: CC) -> RequestedResult
     where
         CC: ContractCallBase<StaticApi>,
@@ -109,6 +139,10 @@ impl Interactor {
         typed_response.result.unwrap()
     }
 
+    #[deprecated(
+        since = "0.49.0",
+        note = "Please use the unified transaction syntax instead."
+    )]
     pub async fn sc_deploy_use_raw_response<S, F>(
         &mut self,
         mut step: S,
@@ -124,6 +158,10 @@ impl Interactor {
         self
     }
 
+    #[deprecated(
+        since = "0.49.0",
+        note = "Please use the unified transaction syntax instead."
+    )]
     pub async fn sc_deploy_use_result<OriginalResult, RequestedResult, F>(
         &mut self,
         step: TypedScDeploy<OriginalResult>,
@@ -139,6 +177,10 @@ impl Interactor {
         self
     }
 
+    #[deprecated(
+        since = "0.49.0",
+        note = "Please use the unified transaction syntax instead."
+    )]
     pub async fn sc_deploy_get_result<OriginalResult, RequestedResult>(
         &mut self,
         mut step: TypedScDeploy<OriginalResult>,
diff --git a/framework/snippets/src/interactor_scenario/interactor_vm_query.rs b/framework/snippets/src/interactor_scenario/interactor_vm_query.rs
index d08c114623..15de064d95 100644
--- a/framework/snippets/src/interactor_scenario/interactor_vm_query.rs
+++ b/framework/snippets/src/interactor_scenario/interactor_vm_query.rs
@@ -1,3 +1,5 @@
+#![allow(deprecated)]
+
 use crate::{address_h256_to_erdrs, Interactor};
 use log::info;
 use multiversx_sc_scenario::{

From 933f88d10e7651fb87c45dfd8c105147f853127d Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 7 May 2024 13:50:47 +0300
Subject: [PATCH 0826/1254] renamed WithResultConv -> WithResultAs

---
 .../scenario-tester/tests/st_blackbox_chained_test.rs  |  2 +-
 .../base/src/types/interaction/result_handlers.rs      |  4 ++--
 .../{with_result_conv.rs => with_result_as.rs}         | 10 +++++-----
 .../scenario/src/facade/world_tx/scenario_rh_impl.rs   |  4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)
 rename framework/base/src/types/interaction/result_handlers/{with_result_conv.rs => with_result_as.rs} (89%)

diff --git a/contracts/feature-tests/scenario-tester/tests/st_blackbox_chained_test.rs b/contracts/feature-tests/scenario-tester/tests/st_blackbox_chained_test.rs
index 439dc586de..71b8a982c5 100644
--- a/contracts/feature-tests/scenario-tester/tests/st_blackbox_chained_test.rs
+++ b/contracts/feature-tests/scenario-tester/tests/st_blackbox_chained_test.rs
@@ -39,7 +39,7 @@ fn st_blackbox_chained() {
             tx.to(TestSCAddress::new("adder"))
                 .typed(scenario_tester_proxy::ScenarioTesterProxy)
                 .sum()
-                .with_result(WithResultConv::new(|value: BigUint| {
+                .with_result(WithResultAs::new(|value: BigUint| {
                     assert_eq!(value, BigUint::from(5u32));
                 }))
         })
diff --git a/framework/base/src/types/interaction/result_handlers.rs b/framework/base/src/types/interaction/result_handlers.rs
index 3f0d2b0cee..f8faf2fe95 100644
--- a/framework/base/src/types/interaction/result_handlers.rs
+++ b/framework/base/src/types/interaction/result_handlers.rs
@@ -8,7 +8,7 @@ mod returns_result_unmanaged;
 mod with_new_address;
 mod with_raw_result;
 mod with_result;
-mod with_result_conv;
+mod with_result_as;
 
 pub use returns_bt::*;
 pub use returns_new_address::*;
@@ -20,7 +20,7 @@ pub use returns_result_unmanaged::ReturnsResultUnmanaged;
 pub use with_new_address::*;
 pub use with_raw_result::WithRawResult;
 pub use with_result::WithResult;
-pub use with_result_conv::*;
+pub use with_result_as::*;
 
 use super::TxEnv;
 
diff --git a/framework/base/src/types/interaction/result_handlers/with_result_conv.rs b/framework/base/src/types/interaction/result_handlers/with_result_as.rs
similarity index 89%
rename from framework/base/src/types/interaction/result_handlers/with_result_conv.rs
rename to framework/base/src/types/interaction/result_handlers/with_result_as.rs
index c87bd9f36e..4a2aed8f35 100644
--- a/framework/base/src/types/interaction/result_handlers/with_result_conv.rs
+++ b/framework/base/src/types/interaction/result_handlers/with_result_as.rs
@@ -10,7 +10,7 @@ use crate::{
 /// Defines a lambda function to be called on the decoded result.
 ///
 /// Value will be converted to type `T`, which should be compatible with the original type.
-pub struct WithResultConv<T, F>
+pub struct WithResultAs<T, F>
 where
     F: FnOnce(T),
 {
@@ -18,19 +18,19 @@ where
     pub f: F,
 }
 
-impl<T, F> WithResultConv<T, F>
+impl<T, F> WithResultAs<T, F>
 where
     F: FnOnce(T),
 {
     pub fn new(f: F) -> Self {
-        WithResultConv {
+        WithResultAs {
             _phantom: PhantomData,
             f,
         }
     }
 }
 
-impl<Env, Original, T, F> RHListItem<Env, Original> for WithResultConv<T, F>
+impl<Env, Original, T, F> RHListItem<Env, Original> for WithResultAs<T, F>
 where
     Env: TxEnv,
     T: TopDecodeMulti + TypeAbiFrom<Original>,
@@ -40,7 +40,7 @@ where
 }
 
 impl<Env, Original, T, F> RHListItemExec<SyncCallRawResult<Env::Api>, Env, Original>
-    for WithResultConv<T, F>
+    for WithResultAs<T, F>
 where
     Env: TxEnv,
     T: TopDecodeMulti + TypeAbiFrom<Original>,
diff --git a/framework/scenario/src/facade/world_tx/scenario_rh_impl.rs b/framework/scenario/src/facade/world_tx/scenario_rh_impl.rs
index 46cedf3743..1aaaedae9f 100644
--- a/framework/scenario/src/facade/world_tx/scenario_rh_impl.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_rh_impl.rs
@@ -3,7 +3,7 @@ use multiversx_sc::{
     codec::TopDecodeMulti,
     types::{
         ManagedAddress, RHListItemExec, ReturnsNewAddress, ReturnsNewManagedAddress, ReturnsResult,
-        ReturnsResultAs, ReturnsResultUnmanaged, TxEnv, WithNewAddress, WithResultConv,
+        ReturnsResultAs, ReturnsResultUnmanaged, TxEnv, WithNewAddress, WithResultAs,
     },
 };
 
@@ -49,7 +49,7 @@ where
     }
 }
 
-impl<Env, Original, T, F> RHListItemExec<TxResponse, Env, Original> for WithResultConv<T, F>
+impl<Env, Original, T, F> RHListItemExec<TxResponse, Env, Original> for WithResultAs<T, F>
 where
     Env: TxEnv,
     T: TopDecodeMulti + TypeAbiFrom<Original>,

From b98ee2c3390b6b59b4d8592163ffd50c187de3e9 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 7 May 2024 14:03:05 +0300
Subject: [PATCH 0827/1254] deprecated legacy ContractCall

---
 .../forwarder/src/forwarder_main.rs              |  2 +-
 .../contract_call_legacy/async_call.rs           |  5 +++++
 .../contract_call_legacy/async_call_promises.rs  |  4 ++++
 .../contract_call_no_payment.rs                  |  4 ++++
 .../contract_call_with_any_payment.rs            |  4 ++++
 .../contract_call_with_egld.rs                   |  4 ++++
 .../contract_call_with_egld_or_single_esdt.rs    |  4 ++++
 .../contract_call_with_multi_esdt.rs             |  4 ++++
 .../contract_call_legacy/contract_deploy.rs      |  4 ++++
 .../contract/generate_proxy/proxy_generator.rs   |  2 +-
 .../src/scenario/model/step/sc_call_step.rs      |  1 +
 .../src/scenario/model/step/sc_deploy_step.rs    | 16 +++++++++++++---
 .../src/scenario/model/step/typed_sc_deploy.rs   | 15 +++++++++++----
 .../src/scenario/model/transaction/tx_call.rs    | 11 ++++++++---
 framework/scenario/tests/contract_call_test.rs   |  1 +
 .../scenario/tests/contract_without_macros.rs    |  1 +
 .../interactor_scenario/interactor_sc_call.rs    |  7 +++++--
 17 files changed, 75 insertions(+), 14 deletions(-)

diff --git a/contracts/feature-tests/composability/forwarder/src/forwarder_main.rs b/contracts/feature-tests/composability/forwarder/src/forwarder_main.rs
index 7ded2d1957..1344c66be5 100644
--- a/contracts/feature-tests/composability/forwarder/src/forwarder_main.rs
+++ b/contracts/feature-tests/composability/forwarder/src/forwarder_main.rs
@@ -8,12 +8,12 @@ pub mod contract_change_owner;
 pub mod contract_deploy;
 pub mod contract_upgrade;
 pub mod esdt;
+pub mod forwarder_proxy;
 pub mod nft;
 pub mod roles;
 pub mod sft;
 pub mod storage;
 pub mod vault_proxy;
-pub mod forwarder_proxy;
 
 multiversx_sc::imports!();
 
diff --git a/framework/base/src/types/interaction/contract_call_legacy/async_call.rs b/framework/base/src/types/interaction/contract_call_legacy/async_call.rs
index 62396de515..05faf11c2d 100644
--- a/framework/base/src/types/interaction/contract_call_legacy/async_call.rs
+++ b/framework/base/src/types/interaction/contract_call_legacy/async_call.rs
@@ -3,6 +3,11 @@ use crate::{
     types::{CallbackClosure, EgldPayment, FunctionCall, ManagedAddress, Tx, TxScEnv},
 };
 
+/// Kept as alias for backwards compatibility.
+#[deprecated(
+    since = "0.49.0",
+    note = "Please use the unified transaction syntax instead."
+)]
 pub type AsyncCall<Api> = Tx<
     TxScEnv<Api>,
     (),
diff --git a/framework/base/src/types/interaction/contract_call_legacy/async_call_promises.rs b/framework/base/src/types/interaction/contract_call_legacy/async_call_promises.rs
index be22afd129..ee3726c0eb 100644
--- a/framework/base/src/types/interaction/contract_call_legacy/async_call_promises.rs
+++ b/framework/base/src/types/interaction/contract_call_legacy/async_call_promises.rs
@@ -5,6 +5,10 @@ use crate::{
 };
 
 /// Will be renamed to `AsyncCall` and `AsyncCall` to `AsyncCallLegacy` when the promises end up on the mainnet.
+#[deprecated(
+    since = "0.49.0",
+    note = "Please use the unified transaction syntax instead."
+)]
 #[must_use]
 pub struct AsyncCallPromises<SA>
 where
diff --git a/framework/base/src/types/interaction/contract_call_legacy/contract_call_no_payment.rs b/framework/base/src/types/interaction/contract_call_legacy/contract_call_no_payment.rs
index db5d0c8561..0f870d775e 100644
--- a/framework/base/src/types/interaction/contract_call_legacy/contract_call_no_payment.rs
+++ b/framework/base/src/types/interaction/contract_call_legacy/contract_call_no_payment.rs
@@ -23,6 +23,10 @@ use super::{
 /// (unless there are payment arguments in the endpoint - but these are mostly obsolete now).
 ///
 /// It is also the basis for all other contract call types, all of them contain this one.
+#[deprecated(
+    since = "0.49.0",
+    note = "Please use the unified transaction syntax instead."
+)]
 #[must_use]
 pub struct ContractCallNoPayment<SA, OriginalResult>
 where
diff --git a/framework/base/src/types/interaction/contract_call_legacy/contract_call_with_any_payment.rs b/framework/base/src/types/interaction/contract_call_legacy/contract_call_with_any_payment.rs
index d195cb3889..2a8a4262f0 100644
--- a/framework/base/src/types/interaction/contract_call_legacy/contract_call_with_any_payment.rs
+++ b/framework/base/src/types/interaction/contract_call_legacy/contract_call_with_any_payment.rs
@@ -13,6 +13,10 @@ use super::{
 /// Holds data for calling another contract, with any type of payment: none, EGLD, Multi-ESDT.
 ///
 /// Gets created when chaining method `with_any_payment`.
+#[deprecated(
+    since = "0.49.0",
+    note = "Please use the unified transaction syntax instead."
+)]
 #[must_use]
 pub struct ContractCallWithAnyPayment<SA, OriginalResult>
 where
diff --git a/framework/base/src/types/interaction/contract_call_legacy/contract_call_with_egld.rs b/framework/base/src/types/interaction/contract_call_legacy/contract_call_with_egld.rs
index 9d6d749b08..47d1fa0c11 100644
--- a/framework/base/src/types/interaction/contract_call_legacy/contract_call_with_egld.rs
+++ b/framework/base/src/types/interaction/contract_call_legacy/contract_call_with_egld.rs
@@ -18,6 +18,10 @@ use super::{
 ///
 /// It also represents the normalized form of any contract call, since ESDT transfers
 /// (the only payment not available here) get converted to builtin function calls in normalized form.
+#[deprecated(
+    since = "0.49.0",
+    note = "Please use the unified transaction syntax instead."
+)]
 #[must_use]
 pub struct ContractCallWithEgld<SA, OriginalResult>
 where
diff --git a/framework/base/src/types/interaction/contract_call_legacy/contract_call_with_egld_or_single_esdt.rs b/framework/base/src/types/interaction/contract_call_legacy/contract_call_with_egld_or_single_esdt.rs
index 843653a532..a6d9a76845 100644
--- a/framework/base/src/types/interaction/contract_call_legacy/contract_call_with_egld_or_single_esdt.rs
+++ b/framework/base/src/types/interaction/contract_call_legacy/contract_call_with_egld_or_single_esdt.rs
@@ -15,6 +15,10 @@ use super::{
 /// Holds data for calling another contract, with a single payment, either EGLD or a single ESDT token.
 ///
 /// Gets created when chaining method `with_egld_or_single_esdt_transfer`.
+#[deprecated(
+    since = "0.49.0",
+    note = "Please use the unified transaction syntax instead."
+)]
 #[must_use]
 pub struct ContractCallWithEgldOrSingleEsdt<SA, OriginalResult>
 where
diff --git a/framework/base/src/types/interaction/contract_call_legacy/contract_call_with_multi_esdt.rs b/framework/base/src/types/interaction/contract_call_legacy/contract_call_with_multi_esdt.rs
index d93f023db9..9064507dbf 100644
--- a/framework/base/src/types/interaction/contract_call_legacy/contract_call_with_multi_esdt.rs
+++ b/framework/base/src/types/interaction/contract_call_legacy/contract_call_with_multi_esdt.rs
@@ -12,6 +12,10 @@ use super::{
     ContractCall, ContractCallWithEgld,
 };
 
+#[deprecated(
+    since = "0.49.0",
+    note = "Please use the unified transaction syntax instead."
+)]
 #[must_use]
 pub struct ContractCallWithMultiEsdt<SA, OriginalResult>
 where
diff --git a/framework/base/src/types/interaction/contract_call_legacy/contract_deploy.rs b/framework/base/src/types/interaction/contract_call_legacy/contract_deploy.rs
index 0cb83f408b..c04ec0ab4b 100644
--- a/framework/base/src/types/interaction/contract_call_legacy/contract_deploy.rs
+++ b/framework/base/src/types/interaction/contract_call_legacy/contract_deploy.rs
@@ -17,6 +17,10 @@ use crate::{
 
 use super::UNSPECIFIED_GAS_LIMIT;
 
+#[deprecated(
+    since = "0.49.0",
+    note = "Please use the unified transaction syntax instead."
+)]
 #[must_use]
 pub struct ContractDeploy<SA, OriginalResult>
 where
diff --git a/framework/meta/src/cmd/contract/generate_proxy/proxy_generator.rs b/framework/meta/src/cmd/contract/generate_proxy/proxy_generator.rs
index d39222ec07..9c0e2a2479 100644
--- a/framework/meta/src/cmd/contract/generate_proxy/proxy_generator.rs
+++ b/framework/meta/src/cmd/contract/generate_proxy/proxy_generator.rs
@@ -36,7 +36,7 @@ const TYPES_FROM_FRAMEWORK: &[&str] = &[
     "EgldOrMultiEsdtPayment",
     "EsdtTokenData",
     "EsdtLocalRole",
-    "EsdtTokenType"
+    "EsdtTokenType",
 ];
 
 pub struct ProxyGenerator<'a> {
diff --git a/framework/scenario/src/scenario/model/step/sc_call_step.rs b/framework/scenario/src/scenario/model/step/sc_call_step.rs
index 55de65f4a4..475ef6ae9b 100644
--- a/framework/scenario/src/scenario/model/step/sc_call_step.rs
+++ b/framework/scenario/src/scenario/model/step/sc_call_step.rs
@@ -227,6 +227,7 @@ impl AsMut<ScCallStep> for ScCallStep {
 /// - recipient,
 /// - endpoint name,
 /// - the arguments.
+#[allow(deprecated)]
 pub(super) fn process_contract_call<CC>(
     contract_call: CC,
 ) -> (String, String, BigUintValue, Vec<String>)
diff --git a/framework/scenario/src/scenario/model/step/sc_deploy_step.rs b/framework/scenario/src/scenario/model/step/sc_deploy_step.rs
index d062baa15a..7e520e1a17 100644
--- a/framework/scenario/src/scenario/model/step/sc_deploy_step.rs
+++ b/framework/scenario/src/scenario/model/step/sc_deploy_step.rs
@@ -10,7 +10,7 @@ use crate::{
     scenario_model::TxResponse,
 };
 
-use crate::multiversx_sc::types::{CodeMetadata, ContractDeploy};
+use crate::multiversx_sc::types::CodeMetadata;
 
 use super::{convert_call_args, TypedScDeploy};
 
@@ -98,9 +98,14 @@ impl ScDeployStep {
     /// Sets following fields based on the smart contract proxy:
     /// - "function"
     /// - "arguments"
+    #[deprecated(
+        since = "0.49.0",
+        note = "Please use the unified transaction syntax instead."
+    )]
+    #[allow(deprecated)]
     pub fn call<OriginalResult, CD>(mut self, contract_deploy: CD) -> TypedScDeploy<OriginalResult>
     where
-        CD: Into<ContractDeploy<StaticApi, OriginalResult>>,
+        CD: Into<multiversx_sc::types::ContractDeploy<StaticApi, OriginalResult>>,
     {
         let (_, mandos_args) = process_contract_deploy(contract_deploy.into());
         for arg in mandos_args {
@@ -149,8 +154,13 @@ impl AsMut<ScDeployStep> for ScDeployStep {
 /// Extracts
 /// - (optional) recipient (needed for contract upgrade, not yet used);
 /// - the arguments.
+#[deprecated(
+    since = "0.49.0",
+    note = "Please use the unified transaction syntax instead."
+)]
+#[allow(deprecated)]
 pub(crate) fn process_contract_deploy<OriginalResult>(
-    contract_deploy: ContractDeploy<StaticApi, OriginalResult>,
+    contract_deploy: multiversx_sc::types::ContractDeploy<StaticApi, OriginalResult>,
 ) -> (Option<String>, Vec<String>) {
     let to_str = contract_deploy
         .to
diff --git a/framework/scenario/src/scenario/model/step/typed_sc_deploy.rs b/framework/scenario/src/scenario/model/step/typed_sc_deploy.rs
index 74249e8f97..2fa49c188f 100644
--- a/framework/scenario/src/scenario/model/step/typed_sc_deploy.rs
+++ b/framework/scenario/src/scenario/model/step/typed_sc_deploy.rs
@@ -3,7 +3,6 @@ use std::marker::PhantomData;
 use multiversx_sc::{
     abi::TypeAbiFrom,
     codec::{PanicErrorHandler, TopDecodeMulti},
-    types::ContractDeploy,
 };
 
 use crate::{
@@ -18,7 +17,7 @@ use crate::{
 
 use crate::scenario::model::{AddressValue, BigUintValue, TxExpect, U64Value};
 
-use super::{process_contract_deploy, ScDeployStep};
+use super::ScDeployStep;
 
 /// `ScDeployStep` with explicit return type.
 #[derive(Default, Debug)]
@@ -104,8 +103,16 @@ impl<OriginalResult> TypedScDeploy<OriginalResult> {
     /// Sets following fields based on the smart contract proxy:
     /// - "function"
     /// - "arguments"
-    pub fn call(mut self, contract_deploy: ContractDeploy<StaticApi, OriginalResult>) -> Self {
-        let (_, mandos_args) = process_contract_deploy(contract_deploy);
+    #[deprecated(
+        since = "0.49.0",
+        note = "Please use the unified transaction syntax instead."
+    )]
+    #[allow(deprecated)]
+    pub fn call(
+        mut self,
+        contract_deploy: multiversx_sc::types::ContractDeploy<StaticApi, OriginalResult>,
+    ) -> Self {
+        let (_, mandos_args) = super::process_contract_deploy(contract_deploy);
         for arg in mandos_args {
             self.sc_deploy_step.tx.arguments.push(BytesValue::from(arg));
         }
diff --git a/framework/scenario/src/scenario/model/transaction/tx_call.rs b/framework/scenario/src/scenario/model/transaction/tx_call.rs
index 102ef3ef4e..547466032e 100644
--- a/framework/scenario/src/scenario/model/transaction/tx_call.rs
+++ b/framework/scenario/src/scenario/model/transaction/tx_call.rs
@@ -1,6 +1,6 @@
 use crate::{
     api::StaticApi,
-    multiversx_sc::types::{ContractCall, ContractCallWithEgld, EsdtTokenPayment},
+    multiversx_sc::types::{ContractCall, EsdtTokenPayment},
     scenario::model::{AddressValue, BigUintValue, BytesValue, U64Value},
     scenario_format::{
         interpret_trait::{InterpretableFrom, InterpreterContext, IntoRaw},
@@ -87,8 +87,13 @@ impl IntoRaw<TxCallRaw> for TxCall {
 }
 
 impl TxCall {
-    pub fn to_contract_call(&self) -> ContractCallWithEgld<StaticApi, ()> {
-        let mut contract_call = ContractCallWithEgld::new(
+    #[deprecated(
+        since = "0.49.0",
+        note = "Please use the unified transaction syntax instead."
+    )]
+    #[allow(deprecated)]
+    pub fn to_contract_call(&self) -> multiversx_sc::types::ContractCallWithEgld<StaticApi, ()> {
+        let mut contract_call = multiversx_sc::types::ContractCallWithEgld::new(
             (&self.to.value).into(),
             self.function.as_bytes(),
             (&self.egld_value.value).into(),
diff --git a/framework/scenario/tests/contract_call_test.rs b/framework/scenario/tests/contract_call_test.rs
index cacd39fd96..b6ff5ea1fb 100644
--- a/framework/scenario/tests/contract_call_test.rs
+++ b/framework/scenario/tests/contract_call_test.rs
@@ -3,6 +3,7 @@ use multiversx_sc_scenario::scenario_model::ScCallStep;
 use num_traits::Zero;
 
 #[test]
+#[allow(deprecated)]
 fn test_contract_call_multi_esdt() {
     let tx = ScCallStep::new()
         .from("address:sender")
diff --git a/framework/scenario/tests/contract_without_macros.rs b/framework/scenario/tests/contract_without_macros.rs
index 87323d5dbb..cf9033b529 100644
--- a/framework/scenario/tests/contract_without_macros.rs
+++ b/framework/scenario/tests/contract_without_macros.rs
@@ -7,6 +7,7 @@
 // and maintenance.
 
 #![allow(unused)]
+#![allow(deprecated)] // TODO: unified syntax
 
 use multiversx_sc::{
     contract_base::ProxyObjNew,
diff --git a/framework/snippets/src/interactor_scenario/interactor_sc_call.rs b/framework/snippets/src/interactor_scenario/interactor_sc_call.rs
index a0e0498ae9..d01e4af590 100644
--- a/framework/snippets/src/interactor_scenario/interactor_sc_call.rs
+++ b/framework/snippets/src/interactor_scenario/interactor_sc_call.rs
@@ -2,7 +2,6 @@ use crate::{address_h256_to_erdrs, mandos_to_erdrs_address, Interactor};
 use log::info;
 use multiversx_sc_scenario::{
     api::StaticApi,
-    multiversx_sc::types::ContractCallWithEgld,
     scenario::ScenarioRunner,
     scenario_model::{ScCallStep, SetStateStep, TxCall, TxResponse},
 };
@@ -45,6 +44,7 @@ impl Interactor {
         tx_hash
     }
 
+    #[allow(deprecated)] // TODO
     pub(crate) fn tx_call_to_blockchain_tx(&self, tx_call: &TxCall) -> Transaction {
         let contract_call = tx_call.to_contract_call();
         let contract_call_tx_data = contract_call_to_tx_data(&contract_call);
@@ -70,7 +70,10 @@ impl Interactor {
     }
 }
 
-fn contract_call_to_tx_data(contract_call: &ContractCallWithEgld<StaticApi, ()>) -> String {
+#[allow(deprecated)] // TODO
+fn contract_call_to_tx_data(
+    contract_call: &multiversx_sc_scenario::imports::ContractCallWithEgld<StaticApi, ()>,
+) -> String {
     let mut result = String::from_utf8(
         contract_call
             .basic

From 52209c2491ccd3588eaa4982b6ff2d70ee99c95a Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 7 May 2024 14:58:51 +0300
Subject: [PATCH 0828/1254] unified syntax - cleanup, more docs, renames

---
 .../forwarder-queue/src/forwarder_queue.rs    |   2 +-
 .../src/call_promise_direct.rs                |   2 +-
 .../tests/st_blackbox_legacy_proxy_test.rs    |   6 +-
 .../{interaction/mod.rs => interaction.rs}    |   6 +-
 .../base/src/types/interaction/annotated.rs   |   3 +
 .../contract_call_exec.rs                     |   2 +-
 .../contract_call_no_payment.rs               |   2 +-
 .../contract_call_trait.rs                    |   5 +
 .../src/types/interaction/result_handlers.rs  |  27 --
 framework/base/src/types/interaction/tx.rs    | 274 +++++++++---------
 .../base/src/types/interaction/tx_data.rs     |   3 +
 .../types/interaction/tx_exec/tx_env_sc.rs    |   3 +
 .../types/interaction/tx_exec/tx_exec_sync.rs |   9 +
 .../types/interaction/tx_exec/tx_exec_te.rs   |   1 +
 .../base/src/types/interaction/tx_from.rs     |   4 +
 .../types/interaction/tx_result_handler.rs    |  33 +++
 .../interaction/tx_result_handler_list.rs     |   9 +
 .../original_result.rs}                       |   0
 .../tx_result_handler_list_cons.rs}           |   0
 .../tx_result_handler_list_exec.rs}           |   0
 .../tx_result_handler_list_item.rs}           |   0
 .../base/src/types/interaction/tx_rh_list.rs  |   9 -
 framework/base/src/types/interaction/tx_to.rs |   4 +
 .../src/scenario/model/step/sc_call_step.rs   |   9 +-
 .../src/scenario/model/step/sc_query_step.rs  |  17 +-
 25 files changed, 245 insertions(+), 185 deletions(-)
 rename framework/base/src/types/{interaction/mod.rs => interaction.rs} (85%)
 create mode 100644 framework/base/src/types/interaction/tx_result_handler.rs
 create mode 100644 framework/base/src/types/interaction/tx_result_handler_list.rs
 rename framework/base/src/types/interaction/{tx_rh_list/tx_rh_original_result.rs => tx_result_handler_list/original_result.rs} (100%)
 rename framework/base/src/types/interaction/{tx_rh_list/tx_rh_list_cons.rs => tx_result_handler_list/tx_result_handler_list_cons.rs} (100%)
 rename framework/base/src/types/interaction/{tx_rh_list/tx_rh_list_exec.rs => tx_result_handler_list/tx_result_handler_list_exec.rs} (100%)
 rename framework/base/src/types/interaction/{tx_rh_list/tx_rh_list_item.rs => tx_result_handler_list/tx_result_handler_list_item.rs} (100%)
 delete mode 100644 framework/base/src/types/interaction/tx_rh_list.rs

diff --git a/contracts/feature-tests/composability/forwarder-queue/src/forwarder_queue.rs b/contracts/feature-tests/composability/forwarder-queue/src/forwarder_queue.rs
index 7b353e4ab0..376fc61d76 100644
--- a/contracts/feature-tests/composability/forwarder-queue/src/forwarder_queue.rs
+++ b/contracts/feature-tests/composability/forwarder-queue/src/forwarder_queue.rs
@@ -209,7 +209,7 @@ pub trait ForwarderQueue {
             .tx()
             .to(&ManagedAddress::default())
             .payment(payments)
-            .function_call(FunctionCall::empty())
+            .raw_call("")
             .to_call_data_string();
 
         self.callback_payments().set(payments_data_string);
diff --git a/contracts/feature-tests/composability/promises-features/src/call_promise_direct.rs b/contracts/feature-tests/composability/promises-features/src/call_promise_direct.rs
index 55093fc8d6..b722ad4f5d 100644
--- a/contracts/feature-tests/composability/promises-features/src/call_promise_direct.rs
+++ b/contracts/feature-tests/composability/promises-features/src/call_promise_direct.rs
@@ -44,7 +44,7 @@ pub trait CallPromisesDirectModule {
         self.tx()
             .to(&to)
             .raw_call(endpoint_name)
-            .egld_or_multi_esdt(EgldOrMultiEsdtPayment::MultiEsdt(token_payments_vec))
+            .payment(EgldOrMultiEsdtPayment::MultiEsdt(token_payments_vec))
             .gas(gas_limit)
             .async_call_promise()
             .callback(self.callbacks().the_one_callback(2001, 2002u32.into()))
diff --git a/contracts/feature-tests/scenario-tester/tests/st_blackbox_legacy_proxy_test.rs b/contracts/feature-tests/scenario-tester/tests/st_blackbox_legacy_proxy_test.rs
index b20fbff6f3..f62672bb36 100644
--- a/contracts/feature-tests/scenario-tester/tests/st_blackbox_legacy_proxy_test.rs
+++ b/contracts/feature-tests/scenario-tester/tests/st_blackbox_legacy_proxy_test.rs
@@ -1,3 +1,5 @@
+#![allow(deprecated)]
+
 use multiversx_sc_scenario::imports::*;
 use num_bigint::BigUint;
 
@@ -50,7 +52,7 @@ fn st_blackbox_legacy_proxy() {
 
     let value = world
         .query()
-        .call(st_contract.sum())
+        .legacy_proxy_call(st_contract.sum())
         .returns(ReturnsResultAs::<SingleValue<BigUint>>::new())
         .run();
     assert_eq!(value.into(), BigUint::from(5u32));
@@ -58,7 +60,7 @@ fn st_blackbox_legacy_proxy() {
     world
         .tx()
         .from(OWNER)
-        .call(st_contract.add(3u32))
+        .legacy_proxy_call(st_contract.add(3u32))
         .with_result(WithRawTxResponse(|response| {
             assert!(response.tx_error.is_success());
         }))
diff --git a/framework/base/src/types/interaction/mod.rs b/framework/base/src/types/interaction.rs
similarity index 85%
rename from framework/base/src/types/interaction/mod.rs
rename to framework/base/src/types/interaction.rs
index e73cf9491b..710b482b8c 100644
--- a/framework/base/src/types/interaction/mod.rs
+++ b/framework/base/src/types/interaction.rs
@@ -16,7 +16,8 @@ mod tx_from;
 mod tx_gas;
 mod tx_payment;
 mod tx_proxy;
-mod tx_rh_list;
+mod tx_result_handler;
+mod tx_result_handler_list;
 mod tx_to;
 
 pub use annotated::*;
@@ -38,7 +39,8 @@ pub use tx_from::*;
 pub use tx_gas::*;
 pub use tx_payment::*;
 pub use tx_proxy::*;
-pub use tx_rh_list::*;
+pub use tx_result_handler::{TxEmptyResultHandler, TxResultHandler};
+pub use tx_result_handler_list::*;
 pub use tx_to::*;
 
 pub type TxScBase<Api> = TxBaseWithEnv<TxScEnv<Api>>;
diff --git a/framework/base/src/types/interaction/annotated.rs b/framework/base/src/types/interaction/annotated.rs
index 015aa4e648..315994e66e 100644
--- a/framework/base/src/types/interaction/annotated.rs
+++ b/framework/base/src/types/interaction/annotated.rs
@@ -12,6 +12,9 @@ use crate::{
 
 use super::TxEnv;
 
+/// Describes a value can also have a custom representation in a mandos scenario.
+///
+/// It is based on managed types in order to be embedded into parametric tests too.
 pub trait AnnotatedValue<Env, T>: Sized
 where
     Env: TxEnv,
diff --git a/framework/base/src/types/interaction/contract_call_legacy/contract_call_exec.rs b/framework/base/src/types/interaction/contract_call_legacy/contract_call_exec.rs
index 6928ee862b..427218f1c8 100644
--- a/framework/base/src/types/interaction/contract_call_legacy/contract_call_exec.rs
+++ b/framework/base/src/types/interaction/contract_call_legacy/contract_call_exec.rs
@@ -61,7 +61,7 @@ where
         Tx::new_tx_from_sc()
             .to(self.basic.to)
             .egld(self.egld_payment)
-            .function_call(self.basic.function_call)
+            .raw_data(self.basic.function_call)
             .callback(None)
     }
 }
diff --git a/framework/base/src/types/interaction/contract_call_legacy/contract_call_no_payment.rs b/framework/base/src/types/interaction/contract_call_legacy/contract_call_no_payment.rs
index 0f870d775e..2a067c761b 100644
--- a/framework/base/src/types/interaction/contract_call_legacy/contract_call_no_payment.rs
+++ b/framework/base/src/types/interaction/contract_call_legacy/contract_call_no_payment.rs
@@ -179,6 +179,6 @@ where
     }
 
     pub fn tx(self) -> Tx<TxScEnv<SA>, (), (), (), (), FunctionCall<SA>, ()> {
-        Tx::new_tx_from_sc().function_call(self.function_call)
+        Tx::new_tx_from_sc().raw_data(self.function_call)
     }
 }
diff --git a/framework/base/src/types/interaction/contract_call_legacy/contract_call_trait.rs b/framework/base/src/types/interaction/contract_call_legacy/contract_call_trait.rs
index 07b5b86868..70c5faaac3 100644
--- a/framework/base/src/types/interaction/contract_call_legacy/contract_call_trait.rs
+++ b/framework/base/src/types/interaction/contract_call_legacy/contract_call_trait.rs
@@ -6,6 +6,11 @@ use crate::{
 
 use super::{ContractCallNoPayment, ContractCallWithEgld};
 
+/// Converts into a legacy contract call.
+#[deprecated(
+    since = "0.49.0",
+    note = "Please use the unified transaction syntax instead."
+)]
 pub trait ContractCallBase<SA>
 where
     SA: CallTypeApi + 'static,
diff --git a/framework/base/src/types/interaction/result_handlers.rs b/framework/base/src/types/interaction/result_handlers.rs
index f8faf2fe95..dd3a334e2c 100644
--- a/framework/base/src/types/interaction/result_handlers.rs
+++ b/framework/base/src/types/interaction/result_handlers.rs
@@ -21,30 +21,3 @@ pub use with_new_address::*;
 pub use with_raw_result::WithRawResult;
 pub use with_result::WithResult;
 pub use with_result_as::*;
-
-use super::TxEnv;
-
-pub trait TxResultHandler<Env>
-where
-    Env: TxEnv,
-{
-    type OriginalResult;
-}
-
-impl<Env> TxResultHandler<Env> for ()
-where
-    Env: TxEnv,
-{
-    type OriginalResult = ();
-}
-
-/// Indicates that given result handler is empty, i.e. doesn't cause any side effects and returns nothing.
-///
-/// Implemented for `()` and `OriginalResultMarker`.
-pub trait TxEmptyResultHandler<Env>: TxResultHandler<Env>
-where
-    Env: TxEnv,
-{
-}
-
-impl<Env> TxEmptyResultHandler<Env> for () where Env: TxEnv {}
diff --git a/framework/base/src/types/interaction/tx.rs b/framework/base/src/types/interaction/tx.rs
index 7fc12c896b..b1e6de8a10 100644
--- a/framework/base/src/types/interaction/tx.rs
+++ b/framework/base/src/types/interaction/tx.rs
@@ -20,6 +20,13 @@ use super::{
     TxToSpecified, UpgradeCall, UNSPECIFIED_GAS_LIMIT,
 };
 
+/// Universal representation of a blockchain transaction.
+///
+/// Uses 7 generic type arguments to encode all aspects of the transaction.
+///
+/// It is future-like, does nothing by itself, it needs a specialized method call to actually run or send it.
+///
+/// Rationale: https://twitter.com/andreimmarinica/status/1777157322155966601
 #[must_use]
 pub struct Tx<Env, From, To, Payment, Gas, Data, RH>
 where
@@ -40,31 +47,6 @@ where
     pub result_handler: RH,
 }
 
-impl<Env, From, To, Payment, Gas, Data, RH> Tx<Env, From, To, Payment, Gas, Data, RH>
-where
-    Env: TxEnv,
-    From: TxFrom<Env>,
-    To: TxTo<Env>,
-    Payment: TxPayment<Env>,
-    Gas: TxGas<Env>,
-    Data: TxData<Env>,
-    RH: TxResultHandler<Env>,
-{
-    /// TODO: does nothing, delete, added for easier copy-paste.
-    #[inline]
-    pub fn nothing(self) -> Tx<Env, From, To, Payment, Gas, Data, RH> {
-        Tx {
-            env: self.env,
-            from: self.from,
-            to: self.to,
-            payment: self.payment,
-            gas: self.gas,
-            data: self.data,
-            result_handler: self.result_handler,
-        }
-    }
-}
-
 impl<Env, From, To, Payment, Gas, Data, RH> Tx<Env, From, To, Payment, Gas, Data, RH>
 where
     Env: TxEnv,
@@ -75,6 +57,7 @@ where
     Data: TxDataFunctionCall<Env>,
     RH: TxResultHandler<Env>,
 {
+    /// Converts object to a MultiversX transaction data field string.
     pub fn to_call_data_string(&self) -> ManagedBuffer<Env::Api> {
         self.data.to_call_data_string()
     }
@@ -86,6 +69,7 @@ impl<Env> TxBaseWithEnv<Env>
 where
     Env: TxEnv,
 {
+    /// Constructor, needs to take an environment object.
     #[inline]
     pub fn new_with_env(env: Env) -> Self {
         Tx {
@@ -109,6 +93,7 @@ where
     Data: TxData<Env>,
     RH: TxResultHandler<Env>,
 {
+    /// Specifies transaction sender.
     pub fn from<From>(self, from: From) -> Tx<Env, From, To, Payment, Gas, Data, RH>
     where
         From: TxFrom<Env>,
@@ -281,6 +266,9 @@ where
         self.payment(payment.into())
     }
 
+    /// Converts argument to `EgldOrMultiEsdtPayment`, then sets it as payment.
+    ///
+    /// In most cases, `payment` should be used instead.
     pub fn egld_or_multi_esdt<P: Into<EgldOrMultiEsdtPayment<Env::Api>>>(
         self,
         payment: P,
@@ -419,36 +407,33 @@ where
     Gas: TxGas<Env>,
     RH: TxResultHandler<Env>,
 {
+    /// Sets the data field. Do not use directly.
     #[inline]
-    pub fn raw_call<N: Into<ManagedBuffer<Env::Api>>>(
-        self,
-        function_name: N,
-    ) -> Tx<Env, From, To, Payment, Gas, FunctionCall<Env::Api>, RH> {
+    #[doc(hidden)]
+    pub fn raw_data<Data>(self, data: Data) -> Tx<Env, From, To, Payment, Gas, Data, RH>
+    where
+        Data: TxData<Env>,
+    {
         Tx {
             env: self.env,
             from: self.from,
             to: self.to,
             payment: self.payment,
             gas: self.gas,
-            data: FunctionCall::new(function_name),
+            data,
             result_handler: self.result_handler,
         }
     }
 
+    /// Starts a contract call, serialized by hand.
+    ///
+    /// Whenever possible, should use proxies instead, since manual serialization is not type-safe.
     #[inline]
-    pub fn function_call(
+    pub fn raw_call<N: Into<ManagedBuffer<Env::Api>>>(
         self,
-        call: FunctionCall<Env::Api>,
+        function_name: N,
     ) -> Tx<Env, From, To, Payment, Gas, FunctionCall<Env::Api>, RH> {
-        Tx {
-            env: self.env,
-            from: self.from,
-            to: self.to,
-            payment: self.payment,
-            gas: self.gas,
-            data: call,
-            result_handler: self.result_handler,
-        }
+        self.raw_data(FunctionCall::new(function_name))
     }
 }
 
@@ -461,6 +446,7 @@ where
     Gas: TxGas<Env>,
     RH: TxResultHandler<Env>,
 {
+    /// Converts tx to a simple FunctionCall, to be used as argument or data in contracts.
     pub fn into_function_call(self) -> FunctionCall<Env::Api> {
         self.data
     }
@@ -474,12 +460,12 @@ where
     Gas: TxGas<Env>,
 {
     /// Merges the argument data into the current tx.
-    /// Used for function calls originating in proxies.
+    /// Used for function calls originating in legacy proxies.
     ///
     /// Different environment in the argument allowed because of compatibility with old proxies.
     ///
     /// Method still subject to considerable change.
-    pub fn call<Env2, To, O>(
+    pub fn legacy_proxy_call<Env2, To, O>(
         self,
         call: Tx<Env2, (), To, (), (), FunctionCall<Env::Api>, OriginalResultMarker<O>>,
     ) -> Tx<Env, From, To, Payment, Gas, FunctionCall<Env::Api>, OriginalResultMarker<O>>
@@ -508,18 +494,22 @@ where
     Gas: TxGas<Env>,
     RH: TxResultHandler<Env>,
 {
-    #[inline]
-    pub fn function_name<N: Into<ManagedBuffer<Env::Api>>>(mut self, function_name: N) -> Self {
-        self.data.function_name = function_name.into();
-        self
-    }
-
+    /// Adds argument to function call.
+    ///
+    /// Whenever possible, use proxies instead.
+    ///
+    /// It serializes the value, but does not enforce type safety.
     #[inline]
     pub fn argument<T: TopEncodeMulti>(mut self, arg: &T) -> Self {
         self.data = self.data.argument(arg);
         self
     }
 
+    /// Adds serialized argument to function call.
+    ///
+    /// Whenever possible, use proxies instead.
+    ///
+    /// Doesa not serialize, does not enforce type safety.
     #[inline]
     pub fn arguments_raw(mut self, raw: ManagedArgBuffer<Env::Api>) -> Self {
         self.data.arg_buffer = raw;
@@ -536,6 +526,9 @@ where
     Gas: TxGas<Env>,
     Data: TxData<Env>,
 {
+    /// Type marker to set the original contract or VM function return type.
+    ///
+    /// Only the compile-time type annotation is given.
     #[inline]
     pub fn original_result<OriginalResult>(
         self,
@@ -559,6 +552,9 @@ where
     To: TxTo<Env>,
     Gas: TxGas<Env>,
 {
+    /// Starts a proxy call, deploy, or upgrade.
+    ///
+    /// The proxy object will be given, the subsequent call will be from a proxy context, containing all the contract endpoint names.
     pub fn typed<Proxy>(self, proxy: Proxy) -> Proxy::TxProxyMethods
     where
         Proxy: TxProxyTrait<Env, From, To, Gas>,
@@ -578,6 +574,7 @@ where
     Data: TxData<Env>,
     ResultList: RHList<Env>,
 {
+    /// Adds a result handler that doesn't return anything.
     #[inline]
     pub fn with_result<ResultHandler>(
         self,
@@ -598,6 +595,7 @@ where
         }
     }
 
+    /// Adds a result handler that can also return processed data.
     #[inline]
     pub fn returns<RH>(
         self,
@@ -619,44 +617,6 @@ where
     }
 }
 
-impl<Api, To, Payment, OriginalResult> ContractCallBase<Api>
-    for Tx<
-        TxScEnv<Api>,
-        (),
-        To,
-        Payment,
-        (),
-        FunctionCall<Api>,
-        OriginalResultMarker<OriginalResult>,
-    >
-where
-    Api: CallTypeApi + 'static,
-    To: TxToSpecified<TxScEnv<Api>>,
-    Payment: TxPayment<TxScEnv<Api>>,
-    OriginalResult: TopEncodeMulti,
-{
-    type OriginalResult = OriginalResult;
-
-    fn into_normalized(self) -> ContractCallWithEgld<Api, OriginalResult> {
-        self.payment.with_normalized(
-            &self.env,
-            &self.from,
-            self.to,
-            self.data,
-            |norm_to, norm_egld, norm_fc| ContractCallWithEgld {
-                basic: ContractCallNoPayment {
-                    _phantom: core::marker::PhantomData,
-                    to: norm_to.clone(),
-                    function_call: norm_fc.clone(),
-                    explicit_gas_limit: UNSPECIFIED_GAS_LIMIT,
-                    _return_type: core::marker::PhantomData,
-                },
-                egld_payment: norm_egld.clone(),
-            },
-        )
-    }
-}
-
 impl<Env, From, To, Payment, Gas, RH> Tx<Env, From, To, Payment, Gas, (), RH>
 where
     Env: TxEnv,
@@ -666,38 +626,11 @@ where
     Gas: TxGas<Env>,
     RH: TxResultHandler<Env>,
 {
+    /// Starts a contract deploy call, serialized by hand.
+    ///
+    /// Whenever possible, should use proxies instead, since manual serialization is not type-safe.
     pub fn raw_deploy(self) -> Tx<Env, From, To, Payment, Gas, DeployCall<Env, ()>, RH> {
-        Tx {
-            env: self.env,
-            from: self.from,
-            to: self.to,
-            payment: self.payment,
-            gas: self.gas,
-            data: DeployCall::default(),
-            result_handler: self.result_handler,
-        }
-    }
-}
-
-impl<Env, From, To, Payment, Gas, RH> Tx<Env, From, To, Payment, Gas, (), RH>
-where
-    Env: TxEnv,
-    From: TxFrom<Env>,
-    To: TxTo<Env>,
-    Payment: TxPaymentEgldOnly<Env>,
-    Gas: TxGas<Env>,
-    RH: TxResultHandler<Env>,
-{
-    pub fn raw_upgrade(self) -> Tx<Env, From, To, Payment, Gas, UpgradeCall<Env, ()>, RH> {
-        Tx {
-            env: self.env,
-            from: self.from,
-            to: self.to,
-            payment: self.payment,
-            gas: self.gas,
-            data: UpgradeCall::default(),
-            result_handler: self.result_handler,
-        }
+        self.raw_data(DeployCall::default())
     }
 }
 
@@ -710,6 +643,7 @@ where
     Gas: TxGas<Env>,
     RH: TxResultHandler<Env>,
 {
+    /// Sets upgrade code source as explicit code bytes.
     pub fn code<CodeValue>(
         self,
         code: CodeValue,
@@ -728,6 +662,7 @@ where
         }
     }
 
+    /// Sets upgrade code source as another deployed contract code.
     pub fn from_source<FromSourceValue>(
         self,
         source_address: FromSourceValue,
@@ -756,6 +691,7 @@ where
     Gas: TxGas<Env>,
     RH: TxResultHandler<Env>,
 {
+    /// Sets deploy code source as explicit code bytes.
     pub fn code<CodeValue>(
         self,
         code: CodeValue,
@@ -774,6 +710,7 @@ where
         }
     }
 
+    /// Sets deploy code source as another deployed contract code.
     pub fn from_source<FromSourceValue>(
         self,
         source_address: FromSourceValue,
@@ -804,17 +741,28 @@ where
     CodeSource: TxCodeSource<Env>,
     RH: TxResultHandler<Env>,
 {
+    /// Sets code metadata to deploy.
     pub fn code_metadata(mut self, code_metadata: CodeMetadata) -> Self {
         self.data = self.data.code_metadata(code_metadata);
         self
     }
 
+    /// Adds argument to a contract deploy.
+    ///
+    /// Whenever possible, use proxies instead.
+    ///
+    /// It serializes the value, but does not enforce type safety.
     #[inline]
     pub fn argument<T: TopEncodeMulti>(mut self, arg: &T) -> Self {
         self.data = self.data.argument(arg);
         self
     }
 
+    /// Adds serialized argument to a contract deploy.
+    ///
+    /// Whenever possible, use proxies instead.
+    ///
+    /// Doesa not serialize, does not enforce type safety.
     #[inline]
     pub fn arguments_raw(mut self, raw: ManagedArgBuffer<Env::Api>) -> Self {
         self.data.arg_buffer = raw;
@@ -845,25 +793,20 @@ where
     }
 }
 
-impl<Env, From, To, Payment, Gas, Data, RH> Tx<Env, From, To, Payment, Gas, Data, RH>
+impl<Env, From, To, Payment, Gas, RH> Tx<Env, From, To, Payment, Gas, (), RH>
 where
-    Env: TxEnvWithTxHash,
-    From: TxFromSpecified<Env>,
+    Env: TxEnv,
+    From: TxFrom<Env>,
     To: TxTo<Env>,
     Payment: TxPaymentEgldOnly<Env>,
     Gas: TxGas<Env>,
-    Data: TxDataFunctionCall<Env>,
     RH: TxResultHandler<Env>,
 {
-    /// Sets the mock transaction hash to be used in a test.
+    /// Starts a contract deploy upgrade, serialized by hand.
     ///
-    /// Only allowed in tests.
-    pub fn tx_hash<H>(mut self, tx_hash: H) -> Self
-    where
-        H256: core::convert::From<H>,
-    {
-        self.env.set_tx_hash(H256::from(tx_hash));
-        self
+    /// Whenever possible, should use proxies instead, since manual serialization is not type-safe.
+    pub fn raw_upgrade(self) -> Tx<Env, From, To, Payment, Gas, UpgradeCall<Env, ()>, RH> {
+        self.raw_data(UpgradeCall::default())
     }
 }
 
@@ -883,12 +826,22 @@ where
         self
     }
 
+    /// Adds argument to upgrade call.
+    ///
+    /// Whenever possible, use proxies instead.
+    ///
+    /// It serializes the value, but does not enforce type safety.
     #[inline]
     pub fn argument<T: TopEncodeMulti>(mut self, arg: &T) -> Self {
         self.data = self.data.argument(arg);
         self
     }
 
+    /// Adds serialized argument to an upgrade call.
+    ///
+    /// Whenever possible, use proxies instead.
+    ///
+    /// Doesa not serialize, does not enforce type safety.
     #[inline]
     pub fn arguments_raw(mut self, raw: ManagedArgBuffer<Env::Api>) -> Self {
         self.data.arg_buffer = raw;
@@ -896,6 +849,28 @@ where
     }
 }
 
+impl<Env, From, To, Payment, Gas, Data, RH> Tx<Env, From, To, Payment, Gas, Data, RH>
+where
+    Env: TxEnvWithTxHash,
+    From: TxFromSpecified<Env>,
+    To: TxTo<Env>,
+    Payment: TxPaymentEgldOnly<Env>,
+    Gas: TxGas<Env>,
+    Data: TxDataFunctionCall<Env>,
+    RH: TxResultHandler<Env>,
+{
+    /// Sets the mock transaction hash to be used in a test.
+    ///
+    /// Only allowed in tests.
+    pub fn tx_hash<H>(mut self, tx_hash: H) -> Self
+    where
+        H256: core::convert::From<H>,
+    {
+        self.env.set_tx_hash(H256::from(tx_hash));
+        self
+    }
+}
+
 impl<Api, To, Payment, OriginalResult>
     From<
         Tx<
@@ -935,3 +910,42 @@ where
         }
     }
 }
+
+// Conversion from new syntax to old syntax.
+impl<Api, To, Payment, OriginalResult> ContractCallBase<Api>
+    for Tx<
+        TxScEnv<Api>,
+        (),
+        To,
+        Payment,
+        (),
+        FunctionCall<Api>,
+        OriginalResultMarker<OriginalResult>,
+    >
+where
+    Api: CallTypeApi + 'static,
+    To: TxToSpecified<TxScEnv<Api>>,
+    Payment: TxPayment<TxScEnv<Api>>,
+    OriginalResult: TopEncodeMulti,
+{
+    type OriginalResult = OriginalResult;
+
+    fn into_normalized(self) -> ContractCallWithEgld<Api, OriginalResult> {
+        self.payment.with_normalized(
+            &self.env,
+            &self.from,
+            self.to,
+            self.data,
+            |norm_to, norm_egld, norm_fc| ContractCallWithEgld {
+                basic: ContractCallNoPayment {
+                    _phantom: core::marker::PhantomData,
+                    to: norm_to.clone(),
+                    function_call: norm_fc.clone(),
+                    explicit_gas_limit: UNSPECIFIED_GAS_LIMIT,
+                    _return_type: core::marker::PhantomData,
+                },
+                egld_payment: norm_egld.clone(),
+            },
+        )
+    }
+}
diff --git a/framework/base/src/types/interaction/tx_data.rs b/framework/base/src/types/interaction/tx_data.rs
index dc6db88135..ddab631b1a 100644
--- a/framework/base/src/types/interaction/tx_data.rs
+++ b/framework/base/src/types/interaction/tx_data.rs
@@ -15,6 +15,9 @@ use crate::{
 
 use super::TxEnv;
 
+/// Marks the data field of a transaction in `Tx`.
+///
+/// Can be nothing, deploy data, call data, etc.
 pub trait TxData<Env>
 where
     Env: TxEnv,
diff --git a/framework/base/src/types/interaction/tx_exec/tx_env_sc.rs b/framework/base/src/types/interaction/tx_exec/tx_env_sc.rs
index 48cf21b0bb..249d74c2bc 100644
--- a/framework/base/src/types/interaction/tx_exec/tx_env_sc.rs
+++ b/framework/base/src/types/interaction/tx_exec/tx_env_sc.rs
@@ -9,6 +9,9 @@ use crate::{
     },
 };
 
+/// The transaction environment used in calls launched from a SC.
+///
+/// Contains no data, just a generic type for the (also zero-sized) API.
 pub struct TxScEnv<Api>
 where
     Api: CallTypeApi,
diff --git a/framework/base/src/types/interaction/tx_exec/tx_exec_sync.rs b/framework/base/src/types/interaction/tx_exec/tx_exec_sync.rs
index e66e76cf26..4ab9c29759 100644
--- a/framework/base/src/types/interaction/tx_exec/tx_exec_sync.rs
+++ b/framework/base/src/types/interaction/tx_exec/tx_exec_sync.rs
@@ -48,6 +48,9 @@ where
         (raw_result, self.result_handler)
     }
 
+    /// Executes transaction synchronously.
+    ///
+    /// Only works with contracts from the same shard.
     pub fn sync_call(self) -> <RH::ListReturns as NestedTupleFlatten>::Unpacked {
         let (raw_result, result_handler) = self.execute_sync_call_raw();
         let sync_raw_result = SyncCallRawResult(raw_result);
@@ -79,6 +82,9 @@ where
         (raw_result, self.result_handler)
     }
 
+    /// Executes transaction synchronously, in the same context (performed in the name of the caller).
+    ///
+    /// Only works with contracts from the same shard.
     pub fn sync_call_same_context(self) -> <RH::ListReturns as NestedTupleFlatten>::Unpacked {
         let (raw_result, result_handler) = self.execute_sync_call_same_context_raw();
         let sync_raw_result = SyncCallRawResult(raw_result);
@@ -114,6 +120,9 @@ where
         (raw_result, self.result_handler)
     }
 
+    /// Executes transaction synchronously, in readonly mode (target contract cannot have its state altered).
+    ///
+    /// Only works with contracts from the same shard.
     pub fn sync_call_readonly(self) -> <RH::ListReturns as NestedTupleFlatten>::Unpacked {
         let (raw_result, result_handler) = self.execute_sync_call_readonly_raw();
         let sync_raw_result = SyncCallRawResult(raw_result);
diff --git a/framework/base/src/types/interaction/tx_exec/tx_exec_te.rs b/framework/base/src/types/interaction/tx_exec/tx_exec_te.rs
index a484dd2fdb..b9db7539b9 100644
--- a/framework/base/src/types/interaction/tx_exec/tx_exec_te.rs
+++ b/framework/base/src/types/interaction/tx_exec/tx_exec_te.rs
@@ -22,6 +22,7 @@ where
         });
     }
 
+    /// Sends transaction asynchronously, and doesn't wait for callback ("fire and forget".)
     pub fn transfer_execute(self) {
         let gas_limit: u64;
         if self.data.is_no_call() {
diff --git a/framework/base/src/types/interaction/tx_from.rs b/framework/base/src/types/interaction/tx_from.rs
index 039cb2c34c..ff5dd73b88 100644
--- a/framework/base/src/types/interaction/tx_from.rs
+++ b/framework/base/src/types/interaction/tx_from.rs
@@ -2,6 +2,7 @@ use crate::types::{heap::Address, ManagedAddress};
 
 use super::{AnnotatedValue, TxEnv};
 
+/// Marks the sender of any transaction.
 pub trait TxFrom<Env>
 where
     Env: TxEnv,
@@ -9,6 +10,9 @@ where
     fn resolve_address(&self, env: &Env) -> ManagedAddress<Env::Api>;
 }
 
+/// Marks the non-empty sender of a transaction.
+///
+/// Enforces the reciipent to be explicitly specified.
 pub trait TxFromSpecified<Env>:
     TxFrom<Env> + AnnotatedValue<Env, ManagedAddress<Env::Api>>
 where
diff --git a/framework/base/src/types/interaction/tx_result_handler.rs b/framework/base/src/types/interaction/tx_result_handler.rs
new file mode 100644
index 0000000000..099d060c44
--- /dev/null
+++ b/framework/base/src/types/interaction/tx_result_handler.rs
@@ -0,0 +1,33 @@
+use super::TxEnv;
+
+/// Marks a general result handler, to be used in the transaction unified syntax.
+///
+/// Rationale described here: https://twitter.com/andreimmarinica/status/1781371938750841288
+///
+/// Used for:
+/// - async callbacks
+/// - processing of results in sync calls, tests and interactors.
+pub trait TxResultHandler<Env>
+where
+    Env: TxEnv,
+{
+    type OriginalResult;
+}
+
+impl<Env> TxResultHandler<Env> for ()
+where
+    Env: TxEnv,
+{
+    type OriginalResult = ();
+}
+
+/// Indicates that given result handler is empty, i.e. doesn't cause any side effects and returns nothing.
+///
+/// Implemented for `()` and `OriginalResultMarker`.
+pub trait TxEmptyResultHandler<Env>: TxResultHandler<Env>
+where
+    Env: TxEnv,
+{
+}
+
+impl<Env> TxEmptyResultHandler<Env> for () where Env: TxEnv {}
diff --git a/framework/base/src/types/interaction/tx_result_handler_list.rs b/framework/base/src/types/interaction/tx_result_handler_list.rs
new file mode 100644
index 0000000000..b66a4ba52e
--- /dev/null
+++ b/framework/base/src/types/interaction/tx_result_handler_list.rs
@@ -0,0 +1,9 @@
+mod original_result;
+mod tx_result_handler_list_cons;
+mod tx_result_handler_list_exec;
+mod tx_result_handler_list_item;
+
+pub use original_result::OriginalResultMarker;
+pub use tx_result_handler_list_cons::*;
+pub use tx_result_handler_list_exec::*;
+pub use tx_result_handler_list_item::*;
diff --git a/framework/base/src/types/interaction/tx_rh_list/tx_rh_original_result.rs b/framework/base/src/types/interaction/tx_result_handler_list/original_result.rs
similarity index 100%
rename from framework/base/src/types/interaction/tx_rh_list/tx_rh_original_result.rs
rename to framework/base/src/types/interaction/tx_result_handler_list/original_result.rs
diff --git a/framework/base/src/types/interaction/tx_rh_list/tx_rh_list_cons.rs b/framework/base/src/types/interaction/tx_result_handler_list/tx_result_handler_list_cons.rs
similarity index 100%
rename from framework/base/src/types/interaction/tx_rh_list/tx_rh_list_cons.rs
rename to framework/base/src/types/interaction/tx_result_handler_list/tx_result_handler_list_cons.rs
diff --git a/framework/base/src/types/interaction/tx_rh_list/tx_rh_list_exec.rs b/framework/base/src/types/interaction/tx_result_handler_list/tx_result_handler_list_exec.rs
similarity index 100%
rename from framework/base/src/types/interaction/tx_rh_list/tx_rh_list_exec.rs
rename to framework/base/src/types/interaction/tx_result_handler_list/tx_result_handler_list_exec.rs
diff --git a/framework/base/src/types/interaction/tx_rh_list/tx_rh_list_item.rs b/framework/base/src/types/interaction/tx_result_handler_list/tx_result_handler_list_item.rs
similarity index 100%
rename from framework/base/src/types/interaction/tx_rh_list/tx_rh_list_item.rs
rename to framework/base/src/types/interaction/tx_result_handler_list/tx_result_handler_list_item.rs
diff --git a/framework/base/src/types/interaction/tx_rh_list.rs b/framework/base/src/types/interaction/tx_rh_list.rs
deleted file mode 100644
index 7c4ccf74bd..0000000000
--- a/framework/base/src/types/interaction/tx_rh_list.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-mod tx_rh_list_cons;
-mod tx_rh_list_exec;
-mod tx_rh_list_item;
-mod tx_rh_original_result;
-
-pub use tx_rh_list_cons::*;
-pub use tx_rh_list_exec::*;
-pub use tx_rh_list_item::*;
-pub use tx_rh_original_result::OriginalResultMarker;
diff --git a/framework/base/src/types/interaction/tx_to.rs b/framework/base/src/types/interaction/tx_to.rs
index 6ba0f6eec8..ad165a488f 100644
--- a/framework/base/src/types/interaction/tx_to.rs
+++ b/framework/base/src/types/interaction/tx_to.rs
@@ -2,6 +2,7 @@ use crate::types::{heap::Address, ManagedAddress};
 
 use super::{AnnotatedValue, TxEnv};
 
+/// Marks the recipient of any transaction.
 pub trait TxTo<Env>
 where
     Env: TxEnv,
@@ -10,6 +11,9 @@ where
 
 impl<Env> TxTo<Env> for () where Env: TxEnv {}
 
+/// Marks the non-empty recipient of a transaction.
+///
+/// Enforces the reciipent to be explicitly specified.
 pub trait TxToSpecified<Env>: TxTo<Env> + AnnotatedValue<Env, ManagedAddress<Env::Api>>
 where
     Env: TxEnv,
diff --git a/framework/scenario/src/scenario/model/step/sc_call_step.rs b/framework/scenario/src/scenario/model/step/sc_call_step.rs
index 475ef6ae9b..07bc120fea 100644
--- a/framework/scenario/src/scenario/model/step/sc_call_step.rs
+++ b/framework/scenario/src/scenario/model/step/sc_call_step.rs
@@ -1,7 +1,4 @@
-use multiversx_sc::{
-    abi::TypeAbiFrom,
-    types::{ContractCallBase, H256},
-};
+use multiversx_sc::{abi::TypeAbiFrom, types::H256};
 
 use crate::{
     api::StaticApi,
@@ -144,7 +141,7 @@ impl ScCallStep {
     #[allow(deprecated)]
     pub fn call<CC>(mut self, contract_call: CC) -> super::TypedScCall<CC::OriginalResult>
     where
-        CC: ContractCallBase<StaticApi>,
+        CC: multiversx_sc::types::ContractCallBase<StaticApi>,
     {
         let (to_str, function, egld_value_expr, scenario_args) =
             process_contract_call(contract_call);
@@ -232,7 +229,7 @@ pub(super) fn process_contract_call<CC>(
     contract_call: CC,
 ) -> (String, String, BigUintValue, Vec<String>)
 where
-    CC: ContractCallBase<StaticApi>,
+    CC: multiversx_sc::types::ContractCallBase<StaticApi>,
 {
     let normalized_cc = contract_call.into_normalized();
     let to_str = format!(
diff --git a/framework/scenario/src/scenario/model/step/sc_query_step.rs b/framework/scenario/src/scenario/model/step/sc_query_step.rs
index 7a99fd4163..8183dcd579 100644
--- a/framework/scenario/src/scenario/model/step/sc_query_step.rs
+++ b/framework/scenario/src/scenario/model/step/sc_query_step.rs
@@ -1,7 +1,4 @@
-use multiversx_sc::{
-    abi::TypeAbiFrom,
-    types::{ContractCallBase, H256},
-};
+use multiversx_sc::{abi::TypeAbiFrom, types::H256};
 use num_traits::Zero;
 
 use crate::{
@@ -65,9 +62,14 @@ impl ScQueryStep {
     /// - "to"
     /// - "function"
     /// - "arguments"
+    #[deprecated(
+        since = "0.49.0",
+        note = "Please use the unified transaction syntax instead."
+    )]
+    #[allow(deprecated)]
     pub fn call<CC>(mut self, contract_call: CC) -> TypedScQuery<CC::OriginalResult>
     where
-        CC: ContractCallBase<StaticApi>,
+        CC: multiversx_sc::types::ContractCallBase<StaticApi>,
     {
         let (to_str, function, egld_value_expr, mandos_args) = process_contract_call(contract_call);
         assert!(
@@ -89,6 +91,11 @@ impl ScQueryStep {
     /// - "expect"
     ///     - "out"
     ///     - "status" set to 0
+    #[deprecated(
+        since = "0.49.0",
+        note = "Please use the unified transaction syntax instead."
+    )]
+    #[allow(deprecated)]
     pub fn call_expect<CC, ExpectedResult>(
         self,
         contract_call: CC,

From 473e7892860fd6c08b5ccbd772aea9c83347da23 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 7 May 2024 15:04:30 +0300
Subject: [PATCH 0829/1254] comment

---
 contracts/examples/adder/interact/src/basic_interact.rs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/contracts/examples/adder/interact/src/basic_interact.rs b/contracts/examples/adder/interact/src/basic_interact.rs
index 363f7efde2..ee11ac5844 100644
--- a/contracts/examples/adder/interact/src/basic_interact.rs
+++ b/contracts/examples/adder/interact/src/basic_interact.rs
@@ -73,6 +73,9 @@ impl AdderInteract {
     }
 
     async fn deploy(&mut self) {
+        // warning: multi deploy not yet fully supported
+        // only works with last deployed address
+
         self.set_state().await;
 
         let new_address = self
@@ -113,6 +116,10 @@ impl AdderInteract {
         }
 
         let results = buffer.run().await;
+
+        // warning: multi deploy not yet fully supported
+        // only works with last deployed address
+
         for new_address in results {
             println!("new address: {new_address}");
 

From 8d1dae152f347117f8670b1c278dc3baccaa138e Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 7 May 2024 15:08:26 +0300
Subject: [PATCH 0830/1254] re-generated proxies

---
 .../tests/price_aggregator_proxy.rs           |  2 ++
 .../feature-tests/abi-tester/src/abi_proxy.rs | 27 +++++++++++++++++++
 .../scenario-tester/sc-config.toml            |  2 +-
 3 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/contracts/core/price-aggregator/tests/price_aggregator_proxy.rs b/contracts/core/price-aggregator/tests/price_aggregator_proxy.rs
index bc84320d13..ae5e00c94a 100644
--- a/contracts/core/price-aggregator/tests/price_aggregator_proxy.rs
+++ b/contracts/core/price-aggregator/tests/price_aggregator_proxy.rs
@@ -340,6 +340,7 @@ where
     }
 }
 
+#[type_abi]
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct PriceFeed<Api>
 where
@@ -353,6 +354,7 @@ where
     pub decimals: u8,
 }
 
+#[type_abi]
 #[derive(TopEncode)]
 pub struct NewRoundEvent<Api>
 where
diff --git a/contracts/feature-tests/abi-tester/src/abi_proxy.rs b/contracts/feature-tests/abi-tester/src/abi_proxy.rs
index a91b6d1961..f02412c39d 100644
--- a/contracts/feature-tests/abi-tester/src/abi_proxy.rs
+++ b/contracts/feature-tests/abi-tester/src/abi_proxy.rs
@@ -397,11 +397,13 @@ where
     }
 }
 
+#[type_abi]
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct OnlyShowsUpInConstructor {
     pub something: (),
 }
 
+#[type_abi]
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct AbiTestType {
     pub nested: OnlyShowsUpAsNested01,
@@ -409,15 +411,18 @@ pub struct AbiTestType {
     pub tuple_madness: (OnlyShowsUpAsNested02, Option<Box<AbiTestType>>),
 }
 
+#[type_abi]
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct OnlyShowsUpAsNested01 {}
 
+#[type_abi]
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct OnlyShowsUpAsNested02 {
     pub something: [u8; 0],
 }
 
 #[rustfmt::skip]
+#[type_abi]
 #[derive(TopEncode, TopDecode)]
 pub enum AbiEnum {
     Nothing,
@@ -429,12 +434,15 @@ pub enum AbiEnum {
     },
 }
 
+#[type_abi]
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct OnlyShowsUpAsNested08 {}
 
+#[type_abi]
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct OnlyShowsUpAsNested09 {}
 
+#[type_abi]
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct AbiManagedType<Api>
 where
@@ -445,62 +453,80 @@ where
     pub managed_buffer: ManagedBuffer<Api>,
 }
 
+#[type_abi]
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct OnlyShowsUpAsNested03 {}
 
+#[type_abi]
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct OnlyShowsUpAsNested04 {}
 
+#[type_abi]
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct OnlyShowsUpAsNested05 {}
 
+#[type_abi]
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct OnlyShowsUpAsNested06 {}
 
+#[type_abi]
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct OnlyShowsUpAsNested07 {}
 
+#[type_abi]
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct OnlyShowsUpAsNestedInSingleValueMapper {}
 
+#[type_abi]
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct OnlyShowsUpAsNestedInVec {}
 
+#[type_abi]
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct OnlyShowsUpAsNestedInArrayVec {}
 
+#[type_abi]
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, ManagedVecItem)]
 pub struct AbiManagedVecItem {
     pub value1: u32,
     pub value2: u32,
 }
 
+#[type_abi]
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct OnlyShowsUpAsNestedInArray {}
 
+#[type_abi]
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct OnlyShowsUpAsNestedInBox {}
 
+#[type_abi]
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct OnlyShowsUpAsNestedInBoxedSlice {}
 
+#[type_abi]
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct OnlyShowsUpAsNestedInRef {}
 
+#[type_abi]
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct OnlyShowsUpAsNestedInSlice {}
 
+#[type_abi]
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct OnlyShowsUpAsNestedInOption {}
 
+#[type_abi]
 #[derive(TopEncode, TopDecode)]
 pub struct OnlyShowsUpInEsdtAttr {
     pub field: OnlyShowsUpAsNested10,
 }
 
+#[type_abi]
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct OnlyShowsUpAsNested10 {}
 
+#[type_abi]
 #[derive(TopEncode, TopDecode)]
 pub enum ExplicitDiscriminant {
     Zero,
@@ -511,6 +537,7 @@ pub enum ExplicitDiscriminant {
 }
 
 #[rustfmt::skip]
+#[type_abi]
 #[derive(TopEncode, TopDecode)]
 pub enum ExplicitDiscriminantMixed {
     Zero,
diff --git a/contracts/feature-tests/scenario-tester/sc-config.toml b/contracts/feature-tests/scenario-tester/sc-config.toml
index 0a83428cbd..4b16ba7311 100644
--- a/contracts/feature-tests/scenario-tester/sc-config.toml
+++ b/contracts/feature-tests/scenario-tester/sc-config.toml
@@ -1,4 +1,4 @@
 [settings]
 
 [[proxy]]
-path = "src/st_proxy.rs"
+path = "src/scenario_tester_proxy.rs"

From b4e85ea1306f8ed9a499f05feeb3cb7ef75f749b Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 7 May 2024 15:17:20 +0300
Subject: [PATCH 0831/1254] replaced tabs with spaces

---
 data/codec-derive/src/nested_de_derive.rs     | 24 +++++-----
 data/codec/src/impl_for_types/impl_tuple.rs   | 20 ++++----
 .../tests/derive_enum_or_default_test.rs      | 18 ++++----
 data/codec/tests/derive_enum_test.rs          | 40 ++++++++--------
 .../derive_struct_or_default_generic_test.rs  | 16 +++----
 .../tests/derive_struct_or_default_test.rs    | 16 +++----
 data/codec/tests/derive_struct_test.rs        | 16 +++----
 data/codec/tests/derive_tuple_struct_test.rs  | 10 ++--
 framework/base/src/abi/type_abi_impl_basic.rs | 46 +++++++++----------
 .../base/src/abi/type_abi_impl_codec_multi.rs |  4 +-
 framework/derive/src/generate/abi_gen.rs      | 18 ++++----
 framework/derive/src/generate/callback_gen.rs |  2 +-
 framework/derive/src/parse/auto_impl_parse.rs | 22 ++++-----
 framework/derive/src/parse/endpoint_parse.rs  |  4 +-
 framework/derive/src/parse/payable_parse.rs   | 16 +++----
 .../derive_managed_vec_item_struct_1_test.rs  | 14 +++---
 .../derive_managed_vec_item_struct_2_test.rs  | 28 +++++------
 vm/src/world_mock/account_data.rs             | 14 +++---
 18 files changed, 164 insertions(+), 164 deletions(-)

diff --git a/data/codec-derive/src/nested_de_derive.rs b/data/codec-derive/src/nested_de_derive.rs
index 2eb9d18f41..f24ab1a256 100644
--- a/data/codec-derive/src/nested_de_derive.rs
+++ b/data/codec-derive/src/nested_de_derive.rs
@@ -27,20 +27,20 @@ pub fn variant_dep_decode_snippets(
 ) -> Vec<proc_macro2::TokenStream> {
     let mut previous_disc: Vec<ExplicitDiscriminant> = Vec::new();
     data_enum
-		.variants
-		.iter()
-		.enumerate()
-		.map(|(variant_index, variant)| {
+        .variants
+        .iter()
+        .enumerate()
+        .map(|(variant_index, variant)| {
             let variant_discriminant = get_discriminant(variant_index, variant, &mut previous_disc);
-			let variant_ident = &variant.ident;
-			let variant_field_snippets = fields_decl_syntax(&variant.fields, |index, field| {
-				dep_decode_snippet(index, field, input_value)
-			});
-			quote! {
+            let variant_ident = &variant.ident;
+            let variant_field_snippets = fields_decl_syntax(&variant.fields, |index, field| {
+                dep_decode_snippet(index, field, input_value)
+            });
+            quote! {
                 #variant_discriminant => core::result::Result::Ok( #name::#variant_ident #variant_field_snippets ),
-			}
-		})
-		.collect()
+            }
+        })
+        .collect()
 }
 
 pub fn nested_decode_impl(ast: &syn::DeriveInput) -> TokenStream {
diff --git a/data/codec/src/impl_for_types/impl_tuple.rs b/data/codec/src/impl_for_types/impl_tuple.rs
index c59ead5126..b5278a92b5 100644
--- a/data/codec/src/impl_for_types/impl_tuple.rs
+++ b/data/codec/src/impl_for_types/impl_tuple.rs
@@ -11,18 +11,18 @@ macro_rules! tuple_impls {
             where
                 $($name: NestedEncode,)+
             {
-				fn top_encode_or_handle_err<O, H>(&self, output: O, h: H) -> Result<(), H::HandledErr>
+                fn top_encode_or_handle_err<O, H>(&self, output: O, h: H) -> Result<(), H::HandledErr>
                 where
                     O: TopEncodeOutput,
                     H: EncodeErrorHandler,
                 {
-					let mut buffer = output.start_nested_encode();
-					$(
+                    let mut buffer = output.start_nested_encode();
+                    $(
                         self.$n.dep_encode_or_handle_err(&mut buffer, h)?;
                     )+
-					output.finalize_nested_encode(buffer);
-					Ok(())
-				}
+                    output.finalize_nested_encode(buffer);
+                    Ok(())
+                }
             }
 
             impl<$($name),+> TopDecode for ($($name,)+)
@@ -42,16 +42,16 @@ macro_rules! tuple_impls {
             where
                 $($name: NestedEncode,)+
             {
-				fn dep_encode_or_handle_err<O, H>(&self, dest: &mut O, h: H) -> Result<(), H::HandledErr>
+                fn dep_encode_or_handle_err<O, H>(&self, dest: &mut O, h: H) -> Result<(), H::HandledErr>
                 where
                     O: NestedEncodeOutput,
                     H: EncodeErrorHandler,
                 {
-					$(
+                    $(
                         self.$n.dep_encode_or_handle_err(dest, h)?;
                     )+
-					Ok(())
-				}
+                    Ok(())
+                }
             }
 
             impl<$($name),+> NestedDecode for ($($name,)+)
diff --git a/data/codec/tests/derive_enum_or_default_test.rs b/data/codec/tests/derive_enum_or_default_test.rs
index 24d1017654..7d9b57c755 100644
--- a/data/codec/tests/derive_enum_or_default_test.rs
+++ b/data/codec/tests/derive_enum_or_default_test.rs
@@ -53,15 +53,15 @@ fn enum_not_defaults() {
     };
 
     #[rustfmt::skip]
-	let enum_struct_bytes = &[
-		/* discriminant */ 2,
-		/* int */ 0, 0x42,
-		/* seq length */ 0, 0, 0, 5,
-		/* seq contents */ 1, 2, 3, 4, 5,
-		/* another_byte */ 6,
-		/* uint_32 */ 0x00, 0x01, 0x23, 0x45,
-		/* uint_64 */ 0x00, 0x00, 0x00, 0x01, 0x23, 0x45, 0x67, 0x89,
-	];
+    let enum_struct_bytes = &[
+        /* discriminant */ 2,
+        /* int */ 0, 0x42,
+        /* seq length */ 0, 0, 0, 5,
+        /* seq contents */ 1, 2, 3, 4, 5,
+        /* another_byte */ 6,
+        /* uint_32 */ 0x00, 0x01, 0x23, 0x45,
+        /* uint_64 */ 0x00, 0x00, 0x00, 0x01, 0x23, 0x45, 0x67, 0x89,
+    ];
 
     check_top_encode_decode(enum_struct, enum_struct_bytes);
 }
diff --git a/data/codec/tests/derive_enum_test.rs b/data/codec/tests/derive_enum_test.rs
index b4626400ac..bd798b33ee 100644
--- a/data/codec/tests/derive_enum_test.rs
+++ b/data/codec/tests/derive_enum_test.rs
@@ -68,11 +68,11 @@ fn field_enum_variant_with_value() {
 
     let enum_tuple_0 = EnumWithEverything::Write(Vec::new(), 0);
     #[rustfmt::skip]
-	let enum_tuple_0_bytes = &[
-		/* discriminant */ 2,
-		/* vec length */ 0, 0, 0, 0,
-		/* u16 */ 0, 0,
-	];
+    let enum_tuple_0_bytes = &[
+        /* discriminant */ 2,
+        /* vec length */ 0, 0, 0, 0,
+        /* u16 */ 0, 0,
+    ];
     check_top_encode_decode(enum_tuple_0.clone(), enum_tuple_0_bytes);
     check_dep_encode_decode(enum_tuple_0, enum_tuple_0_bytes);
 }
@@ -81,12 +81,12 @@ fn field_enum_variant_with_value() {
 fn field_enum_variant_with_tuple() {
     let enum_tuple_1 = EnumWithEverything::Write([1, 2, 3].to_vec(), 4);
     #[rustfmt::skip]
-	let enum_tuple_1_bytes = &[
-		/* discriminant */ 2, 
-		/* vec length */ 0, 0, 0, 3,
-		/* vec contents */ 1, 2, 3,
-		/* an extra 16 */ 0, 4,
-	];
+    let enum_tuple_1_bytes = &[
+        /* discriminant */ 2, 
+        /* vec length */ 0, 0, 0, 3,
+        /* vec contents */ 1, 2, 3,
+        /* an extra 16 */ 0, 4,
+    ];
 
     check_top_encode_decode(enum_tuple_1.clone(), enum_tuple_1_bytes);
     check_dep_encode_decode(enum_tuple_1, enum_tuple_1_bytes);
@@ -103,15 +103,15 @@ fn field_enum_struct_variant() {
     };
 
     #[rustfmt::skip]
-	let enum_struct_bytes = &[
-		/* discriminant */ 3,
-		/* int */ 0, 0x42,
-		/* seq length */ 0, 0, 0, 5,
-		/* seq contents */ 1, 2, 3, 4, 5,
-		/* another_byte */ 6,
-		/* uint_32 */ 0x00, 0x01, 0x23, 0x45,
-		/* uint_64 */ 0x00, 0x00, 0x00, 0x01, 0x23, 0x45, 0x67, 0x89,
-	];
+    let enum_struct_bytes = &[
+        /* discriminant */ 3,
+        /* int */ 0, 0x42,
+        /* seq length */ 0, 0, 0, 5,
+        /* seq contents */ 1, 2, 3, 4, 5,
+        /* another_byte */ 6,
+        /* uint_32 */ 0x00, 0x01, 0x23, 0x45,
+        /* uint_64 */ 0x00, 0x00, 0x00, 0x01, 0x23, 0x45, 0x67, 0x89,
+    ];
 
     check_top_encode_decode(enum_struct.clone(), enum_struct_bytes);
     check_dep_encode_decode(enum_struct, enum_struct_bytes);
diff --git a/data/codec/tests/derive_struct_or_default_generic_test.rs b/data/codec/tests/derive_struct_or_default_generic_test.rs
index e8ab6bbe20..d7631b0ae2 100644
--- a/data/codec/tests/derive_struct_or_default_generic_test.rs
+++ b/data/codec/tests/derive_struct_or_default_generic_test.rs
@@ -63,14 +63,14 @@ fn struct_or_default_not_default() {
     };
 
     #[rustfmt::skip]
-	let bytes_1 = &[
-		/* int */ 0, 0x42, 
-		/* seq length */ 0, 0, 0, 5, 
-		/* seq contents */ 1, 2, 3, 4, 5,
-		/* another_byte */ 6,
-		/* uint_32 */ 0x00, 0x01, 0x23, 0x45,
-		/* uint_64 */ 0x00, 0x00, 0x00, 0x01, 0x23, 0x45, 0x67, 0x89,
-	];
+    let bytes_1 = &[
+        /* int */ 0, 0x42, 
+        /* seq length */ 0, 0, 0, 5, 
+        /* seq contents */ 1, 2, 3, 4, 5,
+        /* another_byte */ 6,
+        /* uint_32 */ 0x00, 0x01, 0x23, 0x45,
+        /* uint_64 */ 0x00, 0x00, 0x00, 0x01, 0x23, 0x45, 0x67, 0x89,
+    ];
 
     check_top_encode_decode(s, bytes_1);
 }
diff --git a/data/codec/tests/derive_struct_or_default_test.rs b/data/codec/tests/derive_struct_or_default_test.rs
index 1b75d5962c..8953b94dc6 100644
--- a/data/codec/tests/derive_struct_or_default_test.rs
+++ b/data/codec/tests/derive_struct_or_default_test.rs
@@ -54,14 +54,14 @@ fn struct_or_default_not_default() {
     };
 
     #[rustfmt::skip]
-	let bytes_1 = &[
-		/* int */ 0, 0x42, 
-		/* seq length */ 0, 0, 0, 5, 
-		/* seq contents */ 1, 2, 3, 4, 5,
-		/* another_byte */ 6,
-		/* uint_32 */ 0x00, 0x01, 0x23, 0x45,
-		/* uint_64 */ 0x00, 0x00, 0x00, 0x01, 0x23, 0x45, 0x67, 0x89,
-	];
+    let bytes_1 = &[
+        /* int */ 0, 0x42, 
+        /* seq length */ 0, 0, 0, 5, 
+        /* seq contents */ 1, 2, 3, 4, 5,
+        /* another_byte */ 6,
+        /* uint_32 */ 0x00, 0x01, 0x23, 0x45,
+        /* uint_64 */ 0x00, 0x00, 0x00, 0x01, 0x23, 0x45, 0x67, 0x89,
+    ];
 
     check_top_encode_decode(s, bytes_1);
 }
diff --git a/data/codec/tests/derive_struct_test.rs b/data/codec/tests/derive_struct_test.rs
index b7967dd9ae..fbe293b7e1 100644
--- a/data/codec/tests/derive_struct_test.rs
+++ b/data/codec/tests/derive_struct_test.rs
@@ -26,14 +26,14 @@ fn struct_named_fields_test() {
     };
 
     #[rustfmt::skip]
-	let bytes_1 = &[
-		/* int */ 0, 0x42, 
-		/* seq length */ 0, 0, 0, 5, 
-		/* seq contents */ 1, 2, 3, 4, 5,
-		/* another_byte */ 6,
-		/* uint_32 */ 0x00, 0x01, 0x23, 0x45,
-		/* uint_64 */ 0x00, 0x00, 0x00, 0x01, 0x23, 0x45, 0x67, 0x89,
-	];
+    let bytes_1 = &[
+        /* int */ 0, 0x42, 
+        /* seq length */ 0, 0, 0, 5, 
+        /* seq contents */ 1, 2, 3, 4, 5,
+        /* another_byte */ 6,
+        /* uint_32 */ 0x00, 0x01, 0x23, 0x45,
+        /* uint_64 */ 0x00, 0x00, 0x00, 0x01, 0x23, 0x45, 0x67, 0x89,
+    ];
 
     check_top_encode_decode(s.clone(), bytes_1);
     check_dep_encode_decode(s, bytes_1);
diff --git a/data/codec/tests/derive_tuple_struct_test.rs b/data/codec/tests/derive_tuple_struct_test.rs
index 53e17ff529..4d6b3c9559 100644
--- a/data/codec/tests/derive_tuple_struct_test.rs
+++ b/data/codec/tests/derive_tuple_struct_test.rs
@@ -14,11 +14,11 @@ fn tuple_struct_derive_test() {
     let s = TupleStruct(8, 16, 32);
 
     #[rustfmt::skip]
-	let bytes = &[
-		/* 0: u8 */ 8,
-		/* 1: u32 */ 0, 16, 
-		/* 2: u64 */ 0, 0, 0, 32,
-	];
+    let bytes = &[
+        /* 0: u8 */ 8,
+        /* 1: u32 */ 0, 16, 
+        /* 2: u64 */ 0, 0, 0, 32,
+    ];
 
     check_top_encode_decode(s.clone(), bytes);
     check_dep_encode_decode(s, bytes);
diff --git a/framework/base/src/abi/type_abi_impl_basic.rs b/framework/base/src/abi/type_abi_impl_basic.rs
index f5f5ece466..878a09bc87 100644
--- a/framework/base/src/abi/type_abi_impl_basic.rs
+++ b/framework/base/src/abi/type_abi_impl_basic.rs
@@ -303,35 +303,35 @@ macro_rules! tuple_impls {
             {
                 type Unmanaged = Self;
 
-				fn type_name() -> TypeName {
-					let mut repr = TypeName::from("tuple<");
-					$(
-						if $n > 0 {
-							repr.push(',');
-						}
-						repr.push_str($name::type_name().as_str());
+                fn type_name() -> TypeName {
+                    let mut repr = TypeName::from("tuple<");
+                    $(
+                        if $n > 0 {
+                            repr.push(',');
+                        }
+                        repr.push_str($name::type_name().as_str());
                     )+
-					repr.push('>');
-					repr
-				}
+                    repr.push('>');
+                    repr
+                }
 
                 fn type_name_rust() -> TypeName {
-					let mut repr = TypeName::from("(");
-					$(
-						if $n > 0 {
-							repr.push_str(", ");
-						}
-						repr.push_str($name::type_name_rust().as_str());
+                    let mut repr = TypeName::from("(");
+                    $(
+                        if $n > 0 {
+                            repr.push_str(", ");
+                        }
+                        repr.push_str($name::type_name_rust().as_str());
                     )+
-					repr.push(')');
-					repr
-				}
+                    repr.push(')');
+                    repr
+                }
 
-				fn provide_type_descriptions<TDC: TypeDescriptionContainer>(accumulator: &mut TDC) {
-					$(
-						$name::provide_type_descriptions(accumulator);
+                fn provide_type_descriptions<TDC: TypeDescriptionContainer>(accumulator: &mut TDC) {
+                    $(
+                        $name::provide_type_descriptions(accumulator);
                     )+
-				}
+                }
             }
         )+
     }
diff --git a/framework/base/src/abi/type_abi_impl_codec_multi.rs b/framework/base/src/abi/type_abi_impl_codec_multi.rs
index e86f7c9614..4fc42f37a6 100644
--- a/framework/base/src/abi/type_abi_impl_codec_multi.rs
+++ b/framework/base/src/abi/type_abi_impl_codec_multi.rs
@@ -115,8 +115,8 @@ macro_rules! multi_arg_impls {
                 }
 
                 fn provide_type_descriptions<TDC: TypeDescriptionContainer>(accumulator: &mut TDC) {
-					$(
-						$name::provide_type_descriptions(accumulator);
+                    $(
+                        $name::provide_type_descriptions(accumulator);
                     )+
                 }
 
diff --git a/framework/derive/src/generate/abi_gen.rs b/framework/derive/src/generate/abi_gen.rs
index f9a5e8360b..5d5a73934c 100644
--- a/framework/derive/src/generate/abi_gen.rs
+++ b/framework/derive/src/generate/abi_gen.rs
@@ -197,15 +197,15 @@ fn has_callback(contract: &ContractTrait) -> bool {
 
 fn generate_supertrait_snippets(contract: &ContractTrait) -> Vec<proc_macro2::TokenStream> {
     contract
-			.supertraits
-			.iter()
-			.map(|supertrait| {
-				let module_path = &supertrait.module_path;
-				quote! {
-					contract_abi.coalesce(<#module_path AbiProvider as multiversx_sc::contract_base::ContractAbiProvider>::abi());
-				}
-			})
-			.collect()
+            .supertraits
+            .iter()
+            .map(|supertrait| {
+                let module_path = &supertrait.module_path;
+                quote! {
+                    contract_abi.coalesce(<#module_path AbiProvider as multiversx_sc::contract_base::ContractAbiProvider>::abi());
+                }
+            })
+            .collect()
 }
 
 fn generate_esdt_attribute_snippets(contract: &ContractTrait) -> Vec<proc_macro2::TokenStream> {
diff --git a/framework/derive/src/generate/callback_gen.rs b/framework/derive/src/generate/callback_gen.rs
index 5d1cda744f..d5ed94bc7b 100644
--- a/framework/derive/src/generate/callback_gen.rs
+++ b/framework/derive/src/generate/callback_gen.rs
@@ -48,7 +48,7 @@ pub fn generate_callback_selector_and_main(
             let cb_main_body = quote! {
                 if let Some(___cb_closure___) = multiversx_sc::types::CallbackClosureForDeser::storage_load_and_clear::<Self::Api>() {
                     if let multiversx_sc::types::CallbackSelectorResult::NotProcessed(_) =
-                        self::EndpointWrappers::callback_selector(self, ___cb_closure___)	{
+                        self::EndpointWrappers::callback_selector(self, ___cb_closure___) {
                         multiversx_sc::api::ErrorApiImpl::signal_error(
                             &<Self::Api as multiversx_sc::api::ErrorApi>::error_api_impl(),
                             err_msg::CALLBACK_BAD_FUNC,
diff --git a/framework/derive/src/parse/auto_impl_parse.rs b/framework/derive/src/parse/auto_impl_parse.rs
index 11553794cd..24002e2139 100644
--- a/framework/derive/src/parse/auto_impl_parse.rs
+++ b/framework/derive/src/parse/auto_impl_parse.rs
@@ -4,17 +4,17 @@ use super::attributes::*;
 
 fn assert_no_other_auto_impl(method: &Method) {
     assert!(
-		method.implementation.is_no_implementation(),
-		"Only one auto-implementation can be specified at one time. Auto-implementations are: {}{}{}{}{}{}{}{}",
-		"`#[storage_get]`, ",
-		"`#[storage_set]`, ",
-		"`#[storage_mapper]`, ",
-		"`#[storage_is_empty]`, ",
-		"`#[storage_clear]`, ",
-		"`#[proxy]`, ",
-		"`#[module]`, ",
-		"`#[event]`."
-	)
+        method.implementation.is_no_implementation(),
+        "Only one auto-implementation can be specified at one time. Auto-implementations are: {}{}{}{}{}{}{}{}",
+        "`#[storage_get]`, ",
+        "`#[storage_set]`, ",
+        "`#[storage_mapper]`, ",
+        "`#[storage_is_empty]`, ",
+        "`#[storage_clear]`, ",
+        "`#[proxy]`, ",
+        "`#[module]`, ",
+        "`#[event]`."
+    )
 }
 
 pub fn process_event_attribute(attr: &syn::Attribute, method: &mut Method) -> bool {
diff --git a/framework/derive/src/parse/endpoint_parse.rs b/framework/derive/src/parse/endpoint_parse.rs
index fc68c25c59..5edc30ad08 100644
--- a/framework/derive/src/parse/endpoint_parse.rs
+++ b/framework/derive/src/parse/endpoint_parse.rs
@@ -15,8 +15,8 @@ use super::{
 
 fn check_single_role(method: &Method) {
     assert!(matches!(method.public_role, PublicRole::Private),
-		"Can only annotate with one of the following arguments: `#[init]`, `#[endpoint]`, `#[view]`, `#[callback]`, `#[callback_raw]`, `#[upgrade]`."
-	);
+        "Can only annotate with one of the following arguments: `#[init]`, `#[endpoint]`, `#[view]`, `#[callback]`, `#[callback_raw]`, `#[upgrade]`."
+    );
 }
 
 pub fn process_init_attribute(
diff --git a/framework/derive/src/parse/payable_parse.rs b/framework/derive/src/parse/payable_parse.rs
index 8d199b94a8..91deba4509 100644
--- a/framework/derive/src/parse/payable_parse.rs
+++ b/framework/derive/src/parse/payable_parse.rs
@@ -6,14 +6,14 @@ pub fn process_payable_attribute(
     pass_1_data: &mut MethodAttributesPass1,
 ) -> bool {
     PayableAttribute::parse(attr).map(|payable_attr| {
-		if let Some(identifier) = payable_attr.identifier {
-			pass_1_data.payable = parse_payable_identifier(identifier.as_str());
-		} else {
-			panic!(
-				"Endpoint `payable` attribute requires one argument. Replace with `#[payable(\"*\")]` or `#[payable(\"EGLD\")]`. Method name: {}",
-				&pass_1_data.method_name);
-		}
-	}).is_some()
+        if let Some(identifier) = payable_attr.identifier {
+            pass_1_data.payable = parse_payable_identifier(identifier.as_str());
+        } else {
+            panic!(
+                "Endpoint `payable` attribute requires one argument. Replace with `#[payable(\"*\")]` or `#[payable(\"EGLD\")]`. Method name: {}",
+                &pass_1_data.method_name);
+        }
+    }).is_some()
 }
 
 fn parse_payable_identifier(identifier: &str) -> MethodPayableMetadata {
diff --git a/framework/scenario/tests/derive_managed_vec_item_struct_1_test.rs b/framework/scenario/tests/derive_managed_vec_item_struct_1_test.rs
index f69056f5d6..1673008017 100644
--- a/framework/scenario/tests/derive_managed_vec_item_struct_1_test.rs
+++ b/framework/scenario/tests/derive_managed_vec_item_struct_1_test.rs
@@ -39,13 +39,13 @@ fn struct_1_encode_decode_skips_reserialization() {
     };
 
     #[rustfmt::skip]
-	let bytes_1 = &[
-		/* u_8 */  0x01,
-		/* u_16 */ 0x00, 0x02,
-		/* u_32 */ 0x00, 0x00, 0x00, 0x03,
-		/* u_64 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04,
-		/* bool */ 0x01,
-	];
+    let bytes_1 = &[
+        /* u_8 */  0x01,
+        /* u_16 */ 0x00, 0x02,
+        /* u_32 */ 0x00, 0x00, 0x00, 0x03,
+        /* u_64 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04,
+        /* bool */ 0x01,
+    ];
 
     check_top_encode_decode(s.clone(), bytes_1);
     check_dep_encode_decode(s, bytes_1);
diff --git a/framework/scenario/tests/derive_managed_vec_item_struct_2_test.rs b/framework/scenario/tests/derive_managed_vec_item_struct_2_test.rs
index 3adfbb34bd..90db2ddddc 100644
--- a/framework/scenario/tests/derive_managed_vec_item_struct_2_test.rs
+++ b/framework/scenario/tests/derive_managed_vec_item_struct_2_test.rs
@@ -39,15 +39,15 @@ fn struct_to_bytes_writer() {
     };
 
     #[rustfmt::skip]
-	let expected_payload = &[
-		/* u_8  */ 0x01,
-		/* u_16 */ 0x00, 0x02,
-		/* u_32 */ 0x00, 0x00, 0x00, 0x03,
-		/* u_64 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04,
-		/* bool */ 0x01,
+    let expected_payload = &[
+        /* u_8  */ 0x01,
+        /* u_16 */ 0x00, 0x02,
+        /* u_32 */ 0x00, 0x00, 0x00, 0x03,
+        /* u_64 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04,
+        /* bool */ 0x01,
         /* opt  */ 0x01, 0x05,
         /* arr  */ 0x61, 0x11, 0x62, 0x22,
-	];
+    ];
 
     <Struct2 as multiversx_sc::types::ManagedVecItem>::to_byte_writer(&s, |bytes| {
         assert_eq!(bytes, &expected_payload[..]);
@@ -67,15 +67,15 @@ fn struct_2_from_bytes_reader() {
     };
 
     #[rustfmt::skip]
-	let payload = &[
-		/* u_8  */ 0x01,
-		/* u_16 */ 0x00, 0x02,
-		/* u_32 */ 0x00, 0x00, 0x00, 0x03,
-		/* u_64 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04,
-		/* bool */ 0x00,
+    let payload = &[
+        /* u_8  */ 0x01,
+        /* u_16 */ 0x00, 0x02,
+        /* u_32 */ 0x00, 0x00, 0x00, 0x03,
+        /* u_64 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04,
+        /* bool */ 0x00,
         /* opt  */ 0x01, 0x05,
         /* arr  */ 0x61, 0x11, 0x62, 0x22,
-	];
+    ];
 
     let struct_from_bytes =
         <Struct2 as multiversx_sc::types::ManagedVecItem>::from_byte_reader(|bytes| {
diff --git a/vm/src/world_mock/account_data.rs b/vm/src/world_mock/account_data.rs
index 343c49bb8d..9268c4535c 100644
--- a/vm/src/world_mock/account_data.rs
+++ b/vm/src/world_mock/account_data.rs
@@ -61,13 +61,13 @@ impl fmt::Display for AccountData {
         write!(
             f,
             "AccountData {{
-		nonce: {},
-		balance: {},
-		esdt: [{} ],
-		username: {},
-		storage: [{} ],
-		developerRewards: {},
-	}}",
+        nonce: {},
+        balance: {},
+        esdt: [{} ],
+        username: {},
+        storage: [{} ],
+        developerRewards: {},
+    }}",
             self.nonce,
             self.egld_balance,
             self.esdt,

From 72751008df70c32cb2a43cf2bb73e3df7f1fa068 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 7 May 2024 15:29:06 +0300
Subject: [PATCH 0832/1254] cleanup

---
 framework/base/src/macros.rs | 25 -------------------------
 1 file changed, 25 deletions(-)

diff --git a/framework/base/src/macros.rs b/framework/base/src/macros.rs
index 55d023ad79..86c963a057 100644
--- a/framework/base/src/macros.rs
+++ b/framework/base/src/macros.rs
@@ -185,28 +185,3 @@ macro_rules! non_zero_usize {
         NonZeroUsize::new($input).unwrap_or_else(|| sc_panic!($error_msg))
     };
 }
-
-#[macro_export]
-macro_rules! constructors_proxy {
-    ($opt_address:ident) => {
-        multiversx_sc::types::new_contract_deploy($opt_address);
-    };
-}
-
-#[macro_export]
-macro_rules! extract_opt_address {
-    ($address:expr) => {{
-        core::mem::replace(
-            &mut $address.address,
-            multiversx_sc::types::ManagedOption::none(),
-        )
-    }};
-}
-
-#[macro_export]
-macro_rules! extract_address {
-    ($address:expr) => {{
-        multiversx_sc::extract_opt_address!($address)
-            .unwrap_or_sc_panic(multiversx_sc::err_msg::RECIPIENT_ADDRESS_NOT_SET)
-    }};
-}

From ce5740130d9d70770114d59c15db389f234b3089 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 7 May 2024 17:03:07 +0300
Subject: [PATCH 0833/1254] release action fix

---
 .github/workflows/release-upload.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/release-upload.yml b/.github/workflows/release-upload.yml
index 6031a5d427..6ecb73df9b 100644
--- a/.github/workflows/release-upload.yml
+++ b/.github/workflows/release-upload.yml
@@ -54,4 +54,3 @@ jobs:
           file: ./examples-wasm.zip
           asset_name: examples-wasm.zip
           overwrite: true
-          body: "This is my release text"

From 1b5839ada22bd517a1634ee5a5e62048d22a959e Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 7 May 2024 17:18:45 +0300
Subject: [PATCH 0834/1254] sc 0.49.0, codec 0.18.8, sdk 0.4.0

---
 CHANGELOG.md                                  |  8 +++++++
 Cargo.lock                                    | 24 +++++++++----------
 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 +-
 .../Cargo.toml                                |  2 +-
 .../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 +-
 .../wasm-alloc-mem-fail/Cargo.toml            |  2 +-
 .../wasm-alloc-mem-leaking/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-legacy/Cargo.toml |  4 ++--
 .../forwarder-legacy/meta/Cargo.toml          |  2 +-
 .../forwarder-legacy/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 +-
 .../exchange-features/Cargo.toml              |  4 ++--
 .../exchange-features/meta/Cargo.toml         |  2 +-
 .../exchange-features/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 +-
 .../feature-tests/scenario-tester/Cargo.toml  |  4 ++--
 .../scenario-tester/meta/Cargo.toml           |  2 +-
 .../scenario-tester/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         |  3 ++-
 framework/scenario/Cargo.toml                 |  8 +++----
 framework/snippets/Cargo.toml                 |  6 ++---
 framework/wasm-adapter/Cargo.toml             |  4 ++--
 sdk/core/Cargo.toml                           |  2 +-
 tools/mxpy-snippet-generator/Cargo.toml       |  2 +-
 tools/rust-debugger/format-tests/Cargo.toml   |  4 ++--
 276 files changed, 415 insertions(+), 406 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 382ea1f2f5..030ef99324 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,6 +26,14 @@ 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.49.0, codec 0.18.8, sdk 0.4.0] - 2024-05-07
+- Unified transaction syntax
+	- new syntax for sending transactions from contracts
+	- new syntax for integration tests: tx, set state, check state, etc.
+	- new syntax for interactors
+	- new proxies, generated from sc-meta
+	- support for upgrade in new proxies
+- Improved interactor tx result polling performance.
 
 ## [sc 0.48.1, codec 0.18.7] - 2024-04-30
 - Simplified decoding of small numbers (i64/u64).
diff --git a/Cargo.lock b/Cargo.lock
index 4c2fff583b..d3eae4e638 100755
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1821,7 +1821,7 @@ checksum = "b59072fa0624b55ae5ae3fa6bfa91515bbeb4ac440214bc4a509e2c8806d6e9f"
 
 [[package]]
 name = "multiversx-price-aggregator-sc"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "arrayvec",
  "getrandom 0.2.14",
@@ -1842,7 +1842,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "bitflags 2.4.2",
  "hex-literal",
@@ -1853,7 +1853,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -1862,7 +1862,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -1872,7 +1872,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -1883,7 +1883,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-meta"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "clap",
  "colored",
@@ -1909,14 +1909,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-scenario"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "base64 0.21.7",
  "bech32",
@@ -1942,7 +1942,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-snippets"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "base64 0.21.7",
  "env_logger",
@@ -1957,14 +1957,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sdk"
-version = "0.4.0-alpha.4"
+version = "0.4.0"
 dependencies = [
  "anyhow",
  "base64 0.21.7",
@@ -1988,7 +1988,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-wegld-swap-sc"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
  "multiversx-sc-modules",
diff --git a/contracts/benchmarks/large-storage/Cargo.toml b/contracts/benchmarks/large-storage/Cargo.toml
index 238cfc0286..dcc5cdf376 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.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../framework/scenario"
diff --git a/contracts/benchmarks/large-storage/meta/Cargo.toml b/contracts/benchmarks/large-storage/meta/Cargo.toml
index 5ab3b3f4ea..7bcc6749aa 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.49.0-alpha.4"
+version = "0.49.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 ee513468bf..fde48c533f 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.49.0-alpha.4"
+version = "0.49.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 3143c4c059..e040a59306 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.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.4"
+version = "0.49.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 390e9c729a..f7ed9b60c4 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.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.4"
+version = "0.49.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 f719432fba..7686ad097b 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.49.0-alpha.4"
+version = "0.49.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 5218df0664..cf4d28c279 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.49.0-alpha.4"
+version = "0.49.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 53a9c8cb30..19dd700f43 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.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.4"
+version = "0.49.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 b8d61cf474..e2f453869c 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.49.0-alpha.4"
+version = "0.49.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 6153f35d8f..e0cbbf5bb3 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.49.0-alpha.4"
+version = "0.49.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 7eae0e8177..0ef6135592 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.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.4"
+version = "0.49.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 ef5d420e27..ac96744a95 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.49.0-alpha.4"
+version = "0.49.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 2ebeda1f2e..c878a5a4f1 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.49.0-alpha.4"
+version = "0.49.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 ebf2958e90..20121d24af 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.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.4"
+version = "0.49.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 269df5be03..1be790193f 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.49.0-alpha.4"
+version = "0.49.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 aa37b34c3e..ea33bd0bf5 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.49.0-alpha.4"
+version = "0.49.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 34e3426254..075eb30b8e 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.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.4"
+version = "0.49.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 8487ef015b..e693e7e883 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.49.0-alpha.4"
+version = "0.49.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 3ac2ae3b96..e74af019ff 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.49.0-alpha.4"
+version = "0.49.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 8c7b4a9d8e..97b51e3a6f 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.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.4"
+version = "0.49.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 fc6c8ebd33..8a7d769dc1 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.49.0-alpha.4"
+version = "0.49.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 8779eaa521..540da31865 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.49.0-alpha.4"
+version = "0.49.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 440bfa0946..326bafd16e 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.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.4"
+version = "0.49.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 fb2c8f50cf..78a283168b 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.49.0-alpha.4"
+version = "0.49.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 f42955ebbd..d25bec0cbf 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.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/str-repeat/Cargo.toml b/contracts/benchmarks/str-repeat/Cargo.toml
index 0d46d631dd..6fe33bc9df 100644
--- a/contracts/benchmarks/str-repeat/Cargo.toml
+++ b/contracts/benchmarks/str-repeat/Cargo.toml
@@ -12,10 +12,10 @@ path = "src/str_repeat.rs"
 managed-buffer-builder-cached = ["multiversx-sc/managed-buffer-builder-cached"]
 
 [dependencies.multiversx-sc]
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../framework/scenario"
diff --git a/contracts/benchmarks/str-repeat/meta/Cargo.toml b/contracts/benchmarks/str-repeat/meta/Cargo.toml
index dbf074583d..160503d84f 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.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.toml b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.toml
index b840dd0a3b..760ea14af5 100644
--- a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.toml
+++ b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.toml
@@ -25,7 +25,7 @@ overflow-checks = false
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.toml b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.toml
index 53db7f0b4a..f91e231e9b 100644
--- a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.toml
+++ b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.toml
@@ -26,7 +26,7 @@ path = ".."
 features = ["managed-buffer-builder-cached"]
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/str-repeat/wasm/Cargo.toml b/contracts/benchmarks/str-repeat/wasm/Cargo.toml
index fa54772480..c6b036ae15 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.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/core/price-aggregator/Cargo.toml b/contracts/core/price-aggregator/Cargo.toml
index aad9c4ce9c..290806c1f2 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.49.0-alpha.4"
+version = "0.49.0"
 authors = [
     "Claudiu-Marcel Bruda <claudiu.bruda@multiversx.com>",
     "MultiversX <contact@multiversx.com>",
@@ -19,15 +19,15 @@ edition = "2021"
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../framework/scenario"
 
 [dependencies]
diff --git a/contracts/core/price-aggregator/meta/Cargo.toml b/contracts/core/price-aggregator/meta/Cargo.toml
index 5b01eac017..b3ee5b7f88 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.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.49.0-alpha.4"
+version = "0.49.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 c4d502a4ca..11dc27513d 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.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/core/wegld-swap/Cargo.toml b/contracts/core/wegld-swap/Cargo.toml
index d61623cc64..cb7582ec0a 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.49.0-alpha.4"
+version = "0.49.0"
 
 authors = [
     "Dorin Iancu <dorin.iancu@multiversx.com>",
@@ -20,13 +20,13 @@ edition = "2021"
 path = "src/wegld.rs"
 
 [dependencies.multiversx-sc]
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../framework/scenario"
diff --git a/contracts/core/wegld-swap/meta/Cargo.toml b/contracts/core/wegld-swap/meta/Cargo.toml
index 2956444fc8..d6d2b99c18 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.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.49.0-alpha.4"
+version = "0.49.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 f21e9e13cb..bd89039edf 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.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/adder/Cargo.toml b/contracts/examples/adder/Cargo.toml
index 489904d6d6..370ddbcc94 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.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/adder/interact/Cargo.toml b/contracts/examples/adder/interact/Cargo.toml
index 3cd72a5e2b..ead28c7bb3 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.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../../framework/snippets"
diff --git a/contracts/examples/adder/meta/Cargo.toml b/contracts/examples/adder/meta/Cargo.toml
index 3e56ed66d7..c4a84b1d55 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.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/examples/adder/wasm/Cargo.toml b/contracts/examples/adder/wasm/Cargo.toml
index a759e0edf8..aafd60afd7 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.49.0-alpha.4"
+version = "0.49.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 4a9d90bddc..87585ce189 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.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.4"
+version = "0.49.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 dbcdbc57e0..a8d9d6f565 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.49.0-alpha.4"
+version = "0.49.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 bf4f7f2d5b..0490cd4242 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.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/check-pause/Cargo.toml b/contracts/examples/check-pause/Cargo.toml
index 355224e160..8eae83200f 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.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../framework/scenario"
 
diff --git a/contracts/examples/check-pause/meta/Cargo.toml b/contracts/examples/check-pause/meta/Cargo.toml
index 21465dc7ed..444b267995 100644
--- a/contracts/examples/check-pause/meta/Cargo.toml
+++ b/contracts/examples/check-pause/meta/Cargo.toml
@@ -9,6 +9,6 @@ authors = ["Alin Cruceat <alin.cruceat@multiversx.com>"]
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.49.0-alpha.4"
+version = "0.49.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 0602c3b653..1fbff49573 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.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/crowdfunding-esdt/Cargo.toml b/contracts/examples/crowdfunding-esdt/Cargo.toml
index 498b1999b6..ddacb5ea88 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.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.4"
+version = "0.49.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 191c2d0a28..fd8c223775 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.49.0-alpha.4"
+version = "0.49.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 93c39e692f..0a40e452fc 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.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/crypto-bubbles/Cargo.toml b/contracts/examples/crypto-bubbles/Cargo.toml
index 6e841be6b9..06d8e5bf0e 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.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/crypto-bubbles/meta/Cargo.toml b/contracts/examples/crypto-bubbles/meta/Cargo.toml
index 60b167f206..6b38860ee5 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.49.0-alpha.4"
+version = "0.49.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 cbfe399baf..67549b7a21 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.49.0-alpha.4"
+version = "0.49.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 d83a9fdd5d..4eb640e54d 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.49.0-alpha.4"
+version = "0.49.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 bfab4a12d7..4bae32ba87 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.49.0-alpha.4"
+version = "0.49.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 ce7971579f..261d16405e 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.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.4"
+version = "0.49.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 938f83ffd6..f9f7905ded 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.49.0-alpha.4"
+version = "0.49.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 5234956e51..85a3695084 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.49.0-alpha.4"
+version = "0.49.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 3027dad875..927d5dddb8 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.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.4"
+version = "0.49.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 c0e781f92f..e2a77bc1b2 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.49.0-alpha.4"
+version = "0.49.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 f4a92c4b71..16081ba43d 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.49.0-alpha.4"
+version = "0.49.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 642afa1862..051e4a41fe 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.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.4"
+version = "0.49.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 8937e968d2..9352e5ca50 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.49.0-alpha.4"
+version = "0.49.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 def5af05df..c8ec0db96b 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.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/crypto-zombies/Cargo.toml b/contracts/examples/crypto-zombies/Cargo.toml
index 3888d9ecb7..f0df60381e 100644
--- a/contracts/examples/crypto-zombies/Cargo.toml
+++ b/contracts/examples/crypto-zombies/Cargo.toml
@@ -9,11 +9,11 @@ publish = false
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../framework/scenario"
 
 [dependencies.kitty]
diff --git a/contracts/examples/crypto-zombies/meta/Cargo.toml b/contracts/examples/crypto-zombies/meta/Cargo.toml
index 2d94d2d074..4cda0e49a2 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.49.0-alpha.4"
+version = "0.49.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 d99df32433..e434220b42 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.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/digital-cash/Cargo.toml b/contracts/examples/digital-cash/Cargo.toml
index 05df36f381..5acc43a29e 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.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/digital-cash/meta/Cargo.toml b/contracts/examples/digital-cash/meta/Cargo.toml
index a54b5f1ea3..2109e5f03f 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.49.0-alpha.4"
+version = "0.49.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 fd23cf19e3..260968204c 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.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/empty/Cargo.toml b/contracts/examples/empty/Cargo.toml
index ff22118a94..bc4fd42421 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.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../framework/scenario"
 
 [dev-dependencies]
diff --git a/contracts/examples/empty/meta/Cargo.toml b/contracts/examples/empty/meta/Cargo.toml
index 80e2c84bdf..e41ae94b75 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.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/examples/empty/wasm/Cargo.toml b/contracts/examples/empty/wasm/Cargo.toml
index 61cf8db541..fe28578b11 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.49.0-alpha.4"
+version = "0.49.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 10ef50f36c..cb6f14b852 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.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.4"
+version = "0.49.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 a40832325b..4cbd3d2966 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.49.0-alpha.4"
+version = "0.49.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 07cb085e0f..b69e4d3701 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.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/factorial/Cargo.toml b/contracts/examples/factorial/Cargo.toml
index 49724f1760..deeb24230a 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.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/factorial/meta/Cargo.toml b/contracts/examples/factorial/meta/Cargo.toml
index 2a5a7f7a8f..d3030adfea 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.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/examples/factorial/wasm/Cargo.toml b/contracts/examples/factorial/wasm/Cargo.toml
index 4625a90cc9..80d3ca57a9 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.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/fractional-nfts/Cargo.toml b/contracts/examples/fractional-nfts/Cargo.toml
index ec60d9d32a..85f79c2d3a 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.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/fractional-nfts/meta/Cargo.toml b/contracts/examples/fractional-nfts/meta/Cargo.toml
index d7a32ed9b1..36b7ab580a 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.49.0-alpha.4"
+version = "0.49.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 47c9c4a88c..892c0af17c 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.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/lottery-esdt/Cargo.toml b/contracts/examples/lottery-esdt/Cargo.toml
index c4d7d29cd3..0efa27bad0 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.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/lottery-esdt/meta/Cargo.toml b/contracts/examples/lottery-esdt/meta/Cargo.toml
index b2cd28df5c..c27259bfc9 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.49.0-alpha.4"
+version = "0.49.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 5da7483f04..aa99f1ba8b 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.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/multisig/Cargo.toml b/contracts/examples/multisig/Cargo.toml
index 035057ec58..0965cf8e44 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.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../framework/scenario"
 
 [dev-dependencies.adder]
@@ -27,7 +27,7 @@ path = "../adder"
 path = "../factorial"
 
 [dev-dependencies.multiversx-wegld-swap-sc]
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 path = "../../core/wegld-swap"
 
 [dev-dependencies]
diff --git a/contracts/examples/multisig/interact/Cargo.toml b/contracts/examples/multisig/interact/Cargo.toml
index 32869be20c..8e332e4b35 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.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../../contracts/modules"
 
 [dependencies.multiversx-sc-snippets]
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../../framework/snippets"
 
 [dependencies.multiversx-sc-scenario]
-version = "=0.49.0-alpha.4"
+version = "=0.49.0"
 path = "../../../../framework/scenario"
diff --git a/contracts/examples/multisig/meta/Cargo.toml b/contracts/examples/multisig/meta/Cargo.toml
index 0e29c29265..b5a20507cb 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.49.0-alpha.4"
+version = "0.49.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 a2d98375aa..3496533206 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.49.0-alpha.4"
+version = "0.49.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 2c6a48b470..6bca11ea28 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.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/multisig/wasm/Cargo.toml b/contracts/examples/multisig/wasm/Cargo.toml
index f2202ffdb1..605ab510d2 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.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/nft-minter/Cargo.toml b/contracts/examples/nft-minter/Cargo.toml
index eb2ec96156..338861c1c6 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.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/nft-minter/meta/Cargo.toml b/contracts/examples/nft-minter/meta/Cargo.toml
index cee7821359..1f9e5c3426 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.49.0-alpha.4"
+version = "0.49.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 241a4215e2..0027925f16 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.49.0-alpha.4"
+version = "0.49.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 136281df96..1f84d968f1 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.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.4"
+version = "0.49.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 c1ddf2adc1..d5bc2477af 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.49.0-alpha.4"
+version = "0.49.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 99a5c3c1a6..4bb9934697 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.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/nft-subscription/Cargo.toml b/contracts/examples/nft-subscription/Cargo.toml
index be7a39917e..68d04d57a0 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.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/nft-subscription/meta/Cargo.toml b/contracts/examples/nft-subscription/meta/Cargo.toml
index d122df52df..b338b27089 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.49.0-alpha.4"
+version = "0.49.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 532cc400e4..564dd5b645 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.49.0-alpha.4"
+version = "0.49.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 9a4978df8a..9d2461e39a 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.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.4"
+version = "0.49.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 3518de30d2..c218e0d100 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.49.0-alpha.4"
+version = "0.49.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 1ee94f9d8e..bfc68cb87e 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.49.0-alpha.4"
+version = "0.49.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 a93917179a..c888a2b68b 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.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.4"
+version = "0.49.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 6f4ba52f4e..916eeb5b35 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.49.0-alpha.4"
+version = "0.49.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 dd343a9dfc..dbb8cf2ffa 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.49.0-alpha.4"
+version = "0.49.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 fc86298452..9b932eeb32 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.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.4"
+version = "0.49.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 a8bc467391..0d90a922fa 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.49.0-alpha.4"
+version = "0.49.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 8438778f1b..3fc4f94d78 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.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/proxy-pause/Cargo.toml b/contracts/examples/proxy-pause/Cargo.toml
index 382dfd9f27..ebb7a49d11 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.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.4"
+version = "0.49.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 4be34a41ba..8e8fc44c7f 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.49.0-alpha.4"
+version = "0.49.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 939f828e70..6cfffd232a 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.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/rewards-distribution/Cargo.toml b/contracts/examples/rewards-distribution/Cargo.toml
index d518ea5586..dad96385d1 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.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/rewards-distribution/meta/Cargo.toml b/contracts/examples/rewards-distribution/meta/Cargo.toml
index bfddb43d6f..254c15933f 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 <claudiu.bruda@multiversx.com>"]
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.49.0-alpha.4"
+version = "0.49.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 a62cac8525..9f562d7cac 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.49.0-alpha.4"
+version = "0.49.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 a57db6b6dc..2d7df44815 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.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.4"
+version = "0.49.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 af481426af..a25a40890d 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 <claudiu.bruda@multiversx.com>"]
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.49.0-alpha.4"
+version = "0.49.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 e6a61820c9..7b224ce48c 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.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/token-release/Cargo.toml b/contracts/examples/token-release/Cargo.toml
index 7c7c810787..1433b850db 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.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../framework/scenario"
 
diff --git a/contracts/examples/token-release/meta/Cargo.toml b/contracts/examples/token-release/meta/Cargo.toml
index 68be5330b2..990c33fa6f 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.49.0-alpha.4"
+version = "0.49.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 bce00fce24..3a3f04c9df 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.49.0-alpha.4"
+version = "0.49.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 714c488750..a2f0a34982 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.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../framework/scenario"
 
 [dev-dependencies.multiversx-sc-meta]
-version = "0.49.0-alpha.4"
+version = "0.49.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 77d8423bfb..c45d388a93 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.49.0-alpha.4"
+            "version": "0.49.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 f678f60c87..10926621d5 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.49.0-alpha.4"
+            "version": "0.49.0"
         }
     },
     "docs": [
diff --git a/contracts/feature-tests/abi-tester/meta/Cargo.toml b/contracts/feature-tests/abi-tester/meta/Cargo.toml
index 7edae725e5..2d1614552c 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.49.0-alpha.4"
+version = "0.49.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 963ef8f870..d8896c6b95 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.49.0-alpha.4"
+version = "0.49.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 f5700ad92e..953b746080 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.49.0-alpha.4"
+version = "0.49.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 3dd34d56a7..a6b7570493 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.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.4"
+version = "0.49.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 3ed3b16104..39e2e2bbb5 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.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml
index 130a20cf6e..731b271739 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml
@@ -25,7 +25,7 @@ overflow-checks = false
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml
index aa66bcb1cb..48125b5285 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml
@@ -25,7 +25,7 @@ overflow-checks = false
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/alloc-features/wasm/Cargo.toml b/contracts/feature-tests/alloc-features/wasm/Cargo.toml
index 0a8f7e641a..cc94610a76 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.49.0-alpha.4"
+version = "0.49.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 f3633e8bd1..d38410d6b9 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.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../framework/scenario"
 
 [dependencies.multiversx-sc-modules]
-version = "0.49.0-alpha.4"
+version = "0.49.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 ef0209cab4..b419907f30 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.49.0-alpha.4"
+version = "0.49.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 670da00dbd..e3ef8d92db 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.49.0-alpha.4"
+version = "0.49.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 7d1cc921f4..484bbd9eab 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.49.0-alpha.4"
+version = "0.49.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 cf42ff107a..e8f2e89165 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.49.0-alpha.4"
+version = "0.49.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 ae27c92b74..9df1290f46 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.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.4"
+version = "0.49.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 603f584ece..86e89a8b3e 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.49.0-alpha.4"
+version = "0.49.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 13c3fb8bdc..011e22c44a 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.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/Cargo.toml b/contracts/feature-tests/composability/Cargo.toml
index 5d372b4128..a046d2fc04 100644
--- a/contracts/feature-tests/composability/Cargo.toml
+++ b/contracts/feature-tests/composability/Cargo.toml
@@ -36,9 +36,9 @@ path = "recursive-caller"
 path = "vault"
 
 [dependencies.multiversx-sc]
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.4"
+version = "0.49.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 58c9d24215..b3b2c9f699 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.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.4"
+version = "0.49.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 3c33b8d81d..064dbaccaf 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.49.0-alpha.4"
+version = "0.49.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 63dbe95fcb..5cf4535ffd 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.49.0-alpha.4"
+version = "0.49.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 63b7e46395..721c6184f3 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.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.4"
+version = "0.49.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 49c6e25659..7af866cd4e 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
@@ -9,10 +9,10 @@ publish = false
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.4"
+version = "0.49.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 ccf10c89ad..4abad84c18 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.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.49.0-alpha.4"
+version = "0.49.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 57c15b6fe2..70121cf1c4 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.49.0-alpha.4"
+version = "0.49.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 89fe5071b8..57e6ed92c9 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.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.4"
+version = "0.49.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 8788acf4ac..c09425c97d 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.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.49.0-alpha.4"
+version = "0.49.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 aa93fcf9d7..676da35aa5 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.49.0-alpha.4"
+version = "0.49.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 c90b451b29..c5e600ae68 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.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.4"
+version = "0.49.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 a084afe56c..6fc29bfa35 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.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.4"
+version = "0.49.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 a1b68d9807..0d2a3c28e2 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.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.49.0-alpha.4"
+version = "0.49.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 b9678d7c3e..55541c2438 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.49.0-alpha.4"
+version = "0.49.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 7fbc51b49a..e590beb2ce 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
@@ -9,10 +9,10 @@ publish = false
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.4"
+version = "0.49.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 8e9105a3ad..eaaffc0f52 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.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.49.0-alpha.4"
+version = "0.49.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 62fb2dc77c..708e761902 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.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/forwarder-legacy/Cargo.toml b/contracts/feature-tests/composability/forwarder-legacy/Cargo.toml
index 8d985f30c1..ab4e3ef6fc 100644
--- a/contracts/feature-tests/composability/forwarder-legacy/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-legacy/Cargo.toml
@@ -12,10 +12,10 @@ path = "src/forwarder_legacy_main.rs"
 path = "../vault"
 
 [dependencies.multiversx-sc]
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../../framework/scenario"
 
diff --git a/contracts/feature-tests/composability/forwarder-legacy/meta/Cargo.toml b/contracts/feature-tests/composability/forwarder-legacy/meta/Cargo.toml
index de74469420..c10276be04 100644
--- a/contracts/feature-tests/composability/forwarder-legacy/meta/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-legacy/meta/Cargo.toml
@@ -8,6 +8,6 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../../../framework/meta"
 default-features = false
diff --git a/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.toml b/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.toml
index 3ce5ef1de3..6a3b6a7db6 100644
--- a/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.toml
@@ -25,7 +25,7 @@ overflow-checks = false
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0-alpha.4"
+version = "0.49.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 accf0696e9..aff16f1726 100644
--- a/contracts/feature-tests/composability/forwarder-queue/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-queue/Cargo.toml
@@ -9,14 +9,14 @@ publish = false
 path = "src/forwarder_queue.rs"
 
 [dependencies.multiversx-sc]
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../../framework/wasm-adapter"
 optional = true
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.4"
+version = "0.49.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 6347cdc858..87460aa1f3 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.49.0-alpha.4"
+version = "0.49.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 ea15c56706..738ff2254d 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.49.0-alpha.4"
+version = "0.49.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 ae6dab9b35..6e68841010 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.49.0-alpha.4"
+version = "0.49.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 98838bf0e4..f7713252f0 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.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.4"
+version = "0.49.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 221d44e4eb..cdba5af76c 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.49.0-alpha.4"
+version = "0.49.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 208dcd4d05..628a019ba9 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.49.0-alpha.4"
+version = "0.49.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 5b4c266c48..4df2025d6e 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.49.0-alpha.4"
+version = "0.49.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 63cfbfed3b..2ada534753 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.49.0-alpha.4"
+version = "0.49.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 6790cc028c..c7c2f34df3 100644
--- a/contracts/feature-tests/composability/forwarder/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder/Cargo.toml
@@ -9,10 +9,10 @@ publish = false
 path = "src/forwarder_main.rs"
 
 [dependencies.multiversx-sc]
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.4"
+version = "0.49.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 a6b2ad50fa..28d02e3a90 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.49.0-alpha.4"
+version = "0.49.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 2395849caf..f4afdbd6bc 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.49.0-alpha.4"
+version = "0.49.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 97cd3f93f5..cacf68eb1d 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.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../../contracts/modules"
 
 [dependencies.multiversx-sc-snippets]
-version = "0.49.0-alpha.4"
+version = "0.49.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 b969ae9c8b..e5022c4f59 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.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.4"
+version = "0.49.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 d9aa379fde..e30d729827 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.49.0-alpha.4"
+version = "0.49.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 89dfb08625..5aebe2081a 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.49.0-alpha.4"
+version = "0.49.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 d8f4c2ed7e..77cc9ef833 100644
--- a/contracts/feature-tests/composability/promises-features/Cargo.toml
+++ b/contracts/feature-tests/composability/promises-features/Cargo.toml
@@ -9,6 +9,6 @@ publish = false
 path = "src/promises_main.rs"
 
 [dependencies.multiversx-sc]
-version = "0.49.0-alpha.4"
+version = "0.49.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 16159a0190..28c3c0b2c9 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.49.0-alpha.4"
+version = "0.49.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 cdb0aa0d3e..ed1a31a561 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.49.0-alpha.4"
+version = "0.49.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 6a9fcceaaf..bc21b32a39 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.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.4"
+version = "0.49.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 02488e11e3..b38a0f5474 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.49.0-alpha.4"
+version = "0.49.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 88a44946b0..9ae8feb646 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.49.0-alpha.4"
+version = "0.49.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 d3d878969d..c9ae4da5f8 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.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.4"
+version = "0.49.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 dcfd56990b..2ca6853d31 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.49.0-alpha.4"
+version = "0.49.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 b93eb8a20f..f5f1de43bf 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.49.0-alpha.4"
+version = "0.49.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 bd7b5fa4af..a85f718ce4 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.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.4"
+version = "0.49.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 4b2f4f93b8..0c59d660b1 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.49.0-alpha.4"
+version = "0.49.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 d12fc3c8c6..7f026d2bf6 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.49.0-alpha.4"
+version = "0.49.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 9f1da71c0b..8d379cdaed 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.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.4"
+version = "0.49.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 3100fcd04c..f6823d80da 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.49.0-alpha.4"
+version = "0.49.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 6a49bd9d5c..9c071c6f48 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.49.0-alpha.4"
+version = "0.49.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 58201feda6..b2e54fbf1a 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.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.4"
+version = "0.49.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 e7d99c51cc..3cb6d85611 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.49.0-alpha.4"
+version = "0.49.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 9d3799aedb..ce209e8861 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.49.0-alpha.4"
+version = "0.49.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 d0e8dd308b..c09b60d9bd 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.49.0-alpha.4"
+version = "0.49.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 7b8ee74e2c..5556a14d7c 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.49.0-alpha.4"
+version = "0.49.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 f3e9127598..58f8eb9a66 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.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.4"
+version = "0.49.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 fdee90fda9..c964676fcc 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.49.0-alpha.4"
+version = "0.49.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 20285a8b66..846a20893b 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.49.0-alpha.4"
+version = "0.49.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 630c24b5f2..3c1fd04452 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.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.4"
+version = "0.49.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 64f519f9a3..3f010b8d56 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.49.0-alpha.4"
+version = "0.49.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 b4b0a71b4c..cc9804afef 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.49.0-alpha.4"
+version = "0.49.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 27c5f2d2a6..5a35bd1ac8 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.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.4"
+version = "0.49.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 d662e3f8e9..c95b91c9c8 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.49.0-alpha.4"
+version = "0.49.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 0af2d54c37..e993861b13 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.49.0-alpha.4"
+version = "0.49.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 1566019c49..6e245b8603 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.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.4"
+version = "0.49.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 8cad0e03b2..917bcfdf75 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.49.0-alpha.4"
+version = "0.49.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 6299d90bcb..1f64f8f90b 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.49.0-alpha.4"
+version = "0.49.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 8d12e823b9..e622226f95 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.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.4"
+version = "0.49.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 0db234389f..13356ab1e2 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.49.0-alpha.4"
+version = "0.49.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 060cf6a1a1..baf2d29699 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.49.0-alpha.4"
+version = "0.49.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 b0aff72a5c..54d2d63fcc 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.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.4"
+version = "0.49.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 05ee5b504e..df452bd789 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.49.0-alpha.4"
+version = "0.49.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 c18d25cd9b..c248eadc43 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.49.0-alpha.4"
+version = "0.49.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 3995505b5a..abea523dd1 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.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.4"
+version = "0.49.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 81e598d14e..1edc440467 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.49.0-alpha.4"
+version = "0.49.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 0bcd0316c2..5538ad6642 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.49.0-alpha.4"
+version = "0.49.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 8e8b693ebe..6414a39d8c 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.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.4"
+version = "0.49.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 425d3ee8eb..f53e18476b 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.49.0-alpha.4"
+version = "0.49.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 690f09686b..9ab183ed3f 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.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/exchange-features/Cargo.toml b/contracts/feature-tests/exchange-features/Cargo.toml
index 2963251bb9..8d21d6320b 100644
--- a/contracts/feature-tests/exchange-features/Cargo.toml
+++ b/contracts/feature-tests/exchange-features/Cargo.toml
@@ -9,9 +9,9 @@ publish = false
 path = "src/exchange_features.rs"
 
 [dependencies.multiversx-sc]
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../framework/scenario"
diff --git a/contracts/feature-tests/exchange-features/meta/Cargo.toml b/contracts/feature-tests/exchange-features/meta/Cargo.toml
index a5bb2c339e..539f20a16a 100644
--- a/contracts/feature-tests/exchange-features/meta/Cargo.toml
+++ b/contracts/feature-tests/exchange-features/meta/Cargo.toml
@@ -8,6 +8,6 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/feature-tests/exchange-features/wasm/Cargo.toml b/contracts/feature-tests/exchange-features/wasm/Cargo.toml
index 9aed886551..415f4440cb 100644
--- a/contracts/feature-tests/exchange-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/exchange-features/wasm/Cargo.toml
@@ -25,7 +25,7 @@ overflow-checks = false
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0-alpha.4"
+version = "0.49.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 3ae3030b5d..6511a95524 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.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.4"
+version = "0.49.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 1dbe41b175..03b89e8914 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.49.0-alpha.4"
+version = "0.49.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 8230ed884b..3b59f56fac 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.49.0-alpha.4"
+version = "0.49.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 552cbb84b0..f52eefc261 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.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.4"
+version = "0.49.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 91c7eb646a..ddd71f8b4e 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.49.0-alpha.4"
+version = "0.49.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 5762a40856..2124503c5e 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.49.0-alpha.4"
+version = "0.49.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 213f19e779..2d36eb9bc2 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.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.4"
+version = "0.49.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 866bfa5da1..e3cf62d271 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.49.0-alpha.4"
+version = "0.49.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 1f77f836ed..bb41653159 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.49.0-alpha.4"
+version = "0.49.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 f6ebe4edb9..458be4822b 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.49.0-alpha.4"
+version = "0.49.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 28a8f95c7c..43e72ed5d9 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.49.0-alpha.4"
+version = "0.49.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 ba28d1f0d1..5839b62616 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.49.0-alpha.4"
+version = "0.49.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 11eb995356..608aa93444 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.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.4"
+version = "0.49.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 7e1007837d..c5ffba6f1a 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.49.0-alpha.4"
+version = "0.49.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 3b0455e096..92951f91d9 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.49.0-alpha.4"
+version = "0.49.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 7973c85f03..d310d91154 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.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.4"
+version = "0.49.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 bc934da0cf..88c95cb422 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.49.0-alpha.4"
+version = "0.49.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 8cd5e49030..0ef022a269 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.49.0-alpha.4"
+version = "0.49.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 4f4fb8ba56..3519576de9 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.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.4"
+version = "0.49.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 c84332da38..893542fe1d 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.49.0-alpha.4"
+version = "0.49.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 5260217e43..3ca3dc298c 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.49.0-alpha.4"
+version = "0.49.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 13fd970d29..160a3556f0 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.48.1"
+// version = "0.49.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 38946bc17a..200d74fe46 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.49.0-alpha.4"
+version = "0.49.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 aa9942a6d7..41ba45dadf 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.49.0-alpha.4"
+version = "0.49.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.49.0-alpha.4"
+version = "0.49.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 7e63f066fa..02bfe884d6 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.49.0-alpha.4"
+version = "0.49.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 26a2d8d271..e9abe077df 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.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/scenario-tester/Cargo.toml b/contracts/feature-tests/scenario-tester/Cargo.toml
index 33c6f5cdcc..6e6fe3b9ba 100644
--- a/contracts/feature-tests/scenario-tester/Cargo.toml
+++ b/contracts/feature-tests/scenario-tester/Cargo.toml
@@ -9,9 +9,9 @@ publish = false
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../framework/scenario"
diff --git a/contracts/feature-tests/scenario-tester/meta/Cargo.toml b/contracts/feature-tests/scenario-tester/meta/Cargo.toml
index 2d689e8a13..4737585715 100644
--- a/contracts/feature-tests/scenario-tester/meta/Cargo.toml
+++ b/contracts/feature-tests/scenario-tester/meta/Cargo.toml
@@ -8,6 +8,6 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/feature-tests/scenario-tester/wasm/Cargo.toml b/contracts/feature-tests/scenario-tester/wasm/Cargo.toml
index fc67b3c6dc..672a7c796c 100644
--- a/contracts/feature-tests/scenario-tester/wasm/Cargo.toml
+++ b/contracts/feature-tests/scenario-tester/wasm/Cargo.toml
@@ -25,7 +25,7 @@ overflow-checks = false
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0-alpha.4"
+version = "0.49.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 24efcdf34c..a98424a2cf 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.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../contracts/modules"
 
 [dependencies.multiversx-sc]
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../framework/scenario"
 
 [dev-dependencies.multiversx-sc-meta]
-version = "0.49.0-alpha.4"
+version = "0.49.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 bd6cec3fee..f98bb6d842 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.49.0-alpha.4"
+version = "0.49.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 7d3415622f..1e5c98bd8f 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.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.49.0-alpha.4"
+version = "0.49.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 372d1ca170..d12b746e0e 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.49.0-alpha.4"
+            "version": "0.49.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 7b0ae08a4f..4ea01b94a8 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.49.0-alpha.4"
+            "version": "0.49.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 62a866a3e3..eea6ec7dc1 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.49.0-alpha.4"
+version = "0.49.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 f514309260..50a3d5bf82 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.49.0-alpha.4"
+version = "0.49.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/modules/Cargo.toml b/contracts/modules/Cargo.toml
index 924bbab515..a9f513191b 100644
--- a/contracts/modules/Cargo.toml
+++ b/contracts/modules/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-modules"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 edition = "2021"
 
 authors = ["MultiversX <contact@multiversx.com>"]
@@ -17,5 +17,5 @@ categories = ["no-std", "wasm", "cryptography::cryptocurrencies"]
 alloc = ["multiversx-sc/alloc"]
 
 [dependencies.multiversx-sc]
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 path = "../../framework/base"
diff --git a/data/codec-derive/Cargo.toml b/data/codec-derive/Cargo.toml
index 25c6a716b0..e1cd5d43ad 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.7"
+version = "0.18.8"
 edition = "2021"
 
 authors = ["dorin.iancu <dorin.iancu@multiversx.com>", "Andrei Marinica <andrei.marinica@multiversx.com>", "MultiversX <contact@multiversx.com>"]
diff --git a/data/codec/Cargo.toml b/data/codec/Cargo.toml
index d3d8d14099..126e22e54f 100644
--- a/data/codec/Cargo.toml
+++ b/data/codec/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-codec"
-version = "0.18.7"
+version = "0.18.8"
 edition = "2021"
 
 authors = ["Andrei Marinica <andrei.marinica@multiversx.com>", "MultiversX <contact@multiversx.com>"]
@@ -19,7 +19,7 @@ alloc = []
 
 [dependencies.multiversx-sc-codec-derive]
 path = "../codec-derive"
-version = "=0.18.7"
+version = "=0.18.8"
 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.7"
+version = "=0.18.8"
diff --git a/framework/base/Cargo.toml b/framework/base/Cargo.toml
index de706261d1..50e7274de5 100644
--- a/framework/base/Cargo.toml
+++ b/framework/base/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 edition = "2021"
 
 authors = ["Andrei Marinica <andrei.marinica@multiversx.com>", "MultiversX <contact@multiversx.com>"]
@@ -28,10 +28,10 @@ bitflags = "=2.4.2"
 num-traits = { version = "=0.2.17", default-features = false }
 
 [dependencies.multiversx-sc-derive]
-version = "=0.49.0-alpha.4"
+version = "=0.49.0"
 path = "../derive"
 
 [dependencies.multiversx-sc-codec]
-version = "=0.18.7"
+version = "=0.18.8"
 path = "../../data/codec"
 features = ["derive"]
diff --git a/framework/derive/Cargo.toml b/framework/derive/Cargo.toml
index c9c1c4635c..65ccd606ec 100644
--- a/framework/derive/Cargo.toml
+++ b/framework/derive/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-derive"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 edition = "2021"
 
 authors = ["Andrei Marinica <andrei.marinica@multiversx.com>", "MultiversX <contact@multiversx.com>"]
diff --git a/framework/meta/Cargo.toml b/framework/meta/Cargo.toml
index 805f3e7942..ef881a2f8c 100644
--- a/framework/meta/Cargo.toml
+++ b/framework/meta/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-meta"
-version = "0.49.0-alpha.4"
+version = "0.49.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.49.0-alpha.4"
+version = "=0.49.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 72a192b0aa..09a2efeca1 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.48.1"
+version = "0.49.0"
 
 # [workspace]
 
diff --git a/framework/meta/src/cmd/contract/meta_config.rs b/framework/meta/src/cmd/contract/meta_config.rs
index cf5b91aa48..1e75900261 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.48.1\"
+version = \"0.49.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.48.1".to_string(),
+            framework_version: "0.49.0".to_string(),
             framework_path: Option::Some("../../../framework/base".to_string()),
             contract_features: Vec::<String>::new(),
         };
diff --git a/framework/meta/src/version_history.rs b/framework/meta/src/version_history.rs
index 5db786b025..146ebc4d57 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.48.1);
+pub const LAST_VERSION: FrameworkVersion = framework_version!(0.49.0);
 
 /// Indicates where to stop with the upgrades.
 pub const LAST_UPGRADE_VERSION: FrameworkVersion = LAST_VERSION;
@@ -68,6 +68,7 @@ pub const VERSIONS: &[FrameworkVersion] = framework_versions![
     0.47.8,
     0.48.0,
     0.48.1,
+    0.49.0,
 ];
 
 #[rustfmt::skip]
diff --git a/framework/scenario/Cargo.toml b/framework/scenario/Cargo.toml
index d946575a3c..5ad46c5c1a 100644
--- a/framework/scenario/Cargo.toml
+++ b/framework/scenario/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-scenario"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 edition = "2021"
 
 authors = [
@@ -40,12 +40,12 @@ path = "src/main.rs"
 run-go-tests = []
 
 [dependencies.multiversx-sc]
-version = "=0.49.0-alpha.4"
+version = "=0.49.0"
 features = ["alloc", "num-bigint"]
 path = "../base"
 
 [dependencies.multiversx-sc-meta]
-version = "=0.49.0-alpha.4"
+version = "=0.49.0"
 path = "../meta"
 
 [dependencies.multiversx-chain-scenario-format]
@@ -60,5 +60,5 @@ version = "=0.8.3"
 path = "../../vm"
 
 [dependencies.multiversx-sdk]
-version = "=0.4.0-alpha.4"
+version = "=0.4.0"
 path = "../../sdk/core"
diff --git a/framework/snippets/Cargo.toml b/framework/snippets/Cargo.toml
index 954ebb2ea9..8ce800326f 100644
--- a/framework/snippets/Cargo.toml
+++ b/framework/snippets/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-snippets"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 edition = "2021"
 
 authors = ["MultiversX <contact@multiversx.com>"]
@@ -23,9 +23,9 @@ futures = "0.3"
 rand = "0.8.5"
 
 [dependencies.multiversx-sc-scenario]
-version = "=0.49.0-alpha.4"
+version = "=0.49.0"
 path = "../scenario"
 
 [dependencies.multiversx-sdk]
-version = "=0.4.0-alpha.4"
+version = "=0.4.0"
 path = "../../sdk/core"
diff --git a/framework/wasm-adapter/Cargo.toml b/framework/wasm-adapter/Cargo.toml
index 8db81d396e..89aabf537c 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.49.0-alpha.4"
+version = "0.49.0"
 edition = "2021"
 
 authors = [
@@ -22,5 +22,5 @@ categories = [
 ]
 
 [dependencies.multiversx-sc]
-version = "=0.49.0-alpha.4"
+version = "=0.49.0"
 path = "../base"
diff --git a/sdk/core/Cargo.toml b/sdk/core/Cargo.toml
index 88b496cd3d..d8039324ba 100644
--- a/sdk/core/Cargo.toml
+++ b/sdk/core/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sdk"
-version = "0.4.0-alpha.4"
+version = "0.4.0"
 edition = "2021"
 
 authors = [
diff --git a/tools/mxpy-snippet-generator/Cargo.toml b/tools/mxpy-snippet-generator/Cargo.toml
index 8390f16c01..44f616b0f3 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.49.0-alpha.4"
+version = "0.49.0"
 path = "../../framework/base"
 
 [dependencies]
diff --git a/tools/rust-debugger/format-tests/Cargo.toml b/tools/rust-debugger/format-tests/Cargo.toml
index b44925e9d1..1e44ac884f 100644
--- a/tools/rust-debugger/format-tests/Cargo.toml
+++ b/tools/rust-debugger/format-tests/Cargo.toml
@@ -9,11 +9,11 @@ name = "format-tests"
 path = "src/format_tests.rs"
 
 [dependencies.multiversx-sc]
-version = "=0.49.0-alpha.4"
+version = "=0.49.0"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-scenario]
-version = "=0.49.0-alpha.4"
+version = "=0.49.0"
 path = "../../../framework/scenario"
 
 [dependencies.multiversx-chain-vm]

From ebd08263ee80c4a44b574a5ba1c5b67ab9e88e1e Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 7 May 2024 17:32:46 +0300
Subject: [PATCH 0835/1254] 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 ++++++------
 .../Cargo.lock                                | 14 ++++++------
 .../Cargo.lock                                | 14 ++++++------
 .../benchmarks/str-repeat/wasm/Cargo.lock     | 14 ++++++------
 .../core/price-aggregator/wasm/Cargo.lock     | 22 +++++++++----------
 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 ++++++------
 .../wasm-alloc-mem-fail/Cargo.lock            | 14 ++++++------
 .../wasm-alloc-mem-leaking/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 ++++++------
 .../forwarder-legacy/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 ++++++------
 .../exchange-features/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 ++++++------
 .../scenario-tester/wasm/Cargo.lock           | 14 ++++++------
 .../wasm-use-module-view/Cargo.lock           | 16 +++++++-------
 .../feature-tests/use-module/wasm/Cargo.lock  | 16 +++++++-------
 91 files changed, 655 insertions(+), 655 deletions(-)

diff --git a/contracts/benchmarks/large-storage/wasm/Cargo.lock b/contracts/benchmarks/large-storage/wasm/Cargo.lock
index b662f443d9..3b11d697fe 100755
--- a/contracts/benchmarks/large-storage/wasm/Cargo.lock
+++ b/contracts/benchmarks/large-storage/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
@@ -55,7 +55,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.lock
index 7e08a995d1..449c08ea0f 100644
--- a/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.lock
+++ b/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "benchmark-common"
@@ -63,7 +63,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -92,7 +92,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -103,7 +103,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.lock
index 1c21676a00..19bbfef34c 100644
--- a/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.lock
+++ b/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "benchmark-common"
@@ -63,7 +63,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -92,7 +92,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -103,7 +103,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.lock
index ad70d21672..3142322933 100644
--- a/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.lock
+++ b/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "benchmark-common"
@@ -47,7 +47,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -58,7 +58,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.lock
index 1cee879d4d..5f6c1735e6 100644
--- a/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.lock
+++ b/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "benchmark-common"
@@ -47,7 +47,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -58,7 +58,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.lock
index dbb15cc548..8b63d51212 100644
--- a/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.lock
+++ b/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "benchmark-common"
@@ -47,7 +47,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -58,7 +58,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.lock
index b212e81e0d..66f60c60c1 100644
--- a/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.lock
+++ b/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "benchmark-common"
@@ -47,7 +47,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -58,7 +58,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/send-tx-repeat/wasm/Cargo.lock b/contracts/benchmarks/send-tx-repeat/wasm/Cargo.lock
index 5dca9592c8..cf7a8f3585 100755
--- a/contracts/benchmarks/send-tx-repeat/wasm/Cargo.lock
+++ b/contracts/benchmarks/send-tx-repeat/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -51,7 +51,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -59,7 +59,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.lock b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.lock
index e33366ed86..f855655dcc 100644
--- a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.lock
+++ b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -51,7 +51,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -59,7 +59,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.lock b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.lock
index 6ccbcbaadd..938e18a3af 100644
--- a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.lock
+++ b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -51,7 +51,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -59,7 +59,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/str-repeat/wasm/Cargo.lock b/contracts/benchmarks/str-repeat/wasm/Cargo.lock
index 39020dc5b8..e7ac6d7c34 100755
--- a/contracts/benchmarks/str-repeat/wasm/Cargo.lock
+++ b/contracts/benchmarks/str-repeat/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -51,7 +51,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -59,7 +59,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/core/price-aggregator/wasm/Cargo.lock b/contracts/core/price-aggregator/wasm/Cargo.lock
index e67c9cc32c..22f75ad2dc 100644
--- a/contracts/core/price-aggregator/wasm/Cargo.lock
+++ b/contracts/core/price-aggregator/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
@@ -40,9 +40,9 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "getrandom"
-version = "0.2.14"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c"
+checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -86,7 +86,7 @@ checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
 
 [[package]]
 name = "multiversx-price-aggregator-sc"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "arrayvec",
  "getrandom",
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -116,7 +116,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -124,7 +124,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -134,7 +134,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -145,14 +145,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/adder/wasm/Cargo.lock b/contracts/examples/adder/wasm/Cargo.lock
index 2773eb0d37..32d924124d 100755
--- a/contracts/examples/adder/wasm/Cargo.lock
+++ b/contracts/examples/adder/wasm/Cargo.lock
@@ -25,9 +25,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/bonding-curve-contract/wasm/Cargo.lock b/contracts/examples/bonding-curve-contract/wasm/Cargo.lock
index 698514f67d..1651cd25a5 100644
--- a/contracts/examples/bonding-curve-contract/wasm/Cargo.lock
+++ b/contracts/examples/bonding-curve-contract/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
@@ -56,7 +56,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -75,7 +75,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,14 +96,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/check-pause/wasm/Cargo.lock b/contracts/examples/check-pause/wasm/Cargo.lock
index 814b67a5c7..08d28dc3c1 100644
--- a/contracts/examples/check-pause/wasm/Cargo.lock
+++ b/contracts/examples/check-pause/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
@@ -56,7 +56,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -75,7 +75,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,14 +96,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crowdfunding-esdt/wasm/Cargo.lock b/contracts/examples/crowdfunding-esdt/wasm/Cargo.lock
index 346820f735..bd090a21c2 100644
--- a/contracts/examples/crowdfunding-esdt/wasm/Cargo.lock
+++ b/contracts/examples/crowdfunding-esdt/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crypto-bubbles/wasm/Cargo.lock b/contracts/examples/crypto-bubbles/wasm/Cargo.lock
index a3381f8c16..02af9ea52a 100755
--- a/contracts/examples/crypto-bubbles/wasm/Cargo.lock
+++ b/contracts/examples/crypto-bubbles/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.lock b/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.lock
index a5bb4027f4..c4ed9a8d55 100755
--- a/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.lock
+++ b/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -103,7 +103,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -113,7 +113,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -124,7 +124,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]
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 264017dfc5..1cfdbcd549 100755
--- a/contracts/examples/crypto-kitties/kitty-genetic-alg/wasm/Cargo.lock
+++ b/contracts/examples/crypto-kitties/kitty-genetic-alg/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
@@ -65,7 +65,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.lock b/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.lock
index 69e81a180a..51f1a57e2c 100755
--- a/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.lock
+++ b/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
@@ -75,7 +75,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -104,7 +104,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -115,7 +115,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crypto-zombies/wasm/Cargo.lock b/contracts/examples/crypto-zombies/wasm/Cargo.lock
index 01b50384d8..fd15242089 100755
--- a/contracts/examples/crypto-zombies/wasm/Cargo.lock
+++ b/contracts/examples/crypto-zombies/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
@@ -64,7 +64,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -75,7 +75,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -83,7 +83,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -93,7 +93,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -104,7 +104,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/digital-cash/wasm/Cargo.lock b/contracts/examples/digital-cash/wasm/Cargo.lock
index db281885ba..b219c11d18 100644
--- a/contracts/examples/digital-cash/wasm/Cargo.lock
+++ b/contracts/examples/digital-cash/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/empty/wasm/Cargo.lock b/contracts/examples/empty/wasm/Cargo.lock
index 791a8a78d4..0e20a220f6 100755
--- a/contracts/examples/empty/wasm/Cargo.lock
+++ b/contracts/examples/empty/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.lock b/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.lock
index b18d50c99d..cbd337a9a1 100644
--- a/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.lock
+++ b/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/factorial/wasm/Cargo.lock b/contracts/examples/factorial/wasm/Cargo.lock
index f11e7fea1f..b6292af287 100755
--- a/contracts/examples/factorial/wasm/Cargo.lock
+++ b/contracts/examples/factorial/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/fractional-nfts/wasm/Cargo.lock b/contracts/examples/fractional-nfts/wasm/Cargo.lock
index 5c51eaa65f..ac836d1710 100644
--- a/contracts/examples/fractional-nfts/wasm/Cargo.lock
+++ b/contracts/examples/fractional-nfts/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
@@ -56,7 +56,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -75,7 +75,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,14 +96,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/lottery-esdt/wasm/Cargo.lock b/contracts/examples/lottery-esdt/wasm/Cargo.lock
index 3618971bb7..f2208fefe8 100755
--- a/contracts/examples/lottery-esdt/wasm/Cargo.lock
+++ b/contracts/examples/lottery-esdt/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
@@ -55,7 +55,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/multisig/wasm-multisig-full/Cargo.lock b/contracts/examples/multisig/wasm-multisig-full/Cargo.lock
index 657d9df054..c70b17ae5c 100644
--- a/contracts/examples/multisig/wasm-multisig-full/Cargo.lock
+++ b/contracts/examples/multisig/wasm-multisig-full/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
@@ -56,7 +56,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -75,7 +75,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,14 +96,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/multisig/wasm-multisig-view/Cargo.lock b/contracts/examples/multisig/wasm-multisig-view/Cargo.lock
index 8ad4962469..557912beb6 100644
--- a/contracts/examples/multisig/wasm-multisig-view/Cargo.lock
+++ b/contracts/examples/multisig/wasm-multisig-view/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
@@ -56,7 +56,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -75,7 +75,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,14 +96,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/multisig/wasm/Cargo.lock b/contracts/examples/multisig/wasm/Cargo.lock
index 4ca5fcc903..e1bc7eb308 100755
--- a/contracts/examples/multisig/wasm/Cargo.lock
+++ b/contracts/examples/multisig/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
@@ -56,7 +56,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -75,7 +75,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,14 +96,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/nft-minter/wasm/Cargo.lock b/contracts/examples/nft-minter/wasm/Cargo.lock
index aac2ace620..bf942dd476 100644
--- a/contracts/examples/nft-minter/wasm/Cargo.lock
+++ b/contracts/examples/nft-minter/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -51,7 +51,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -59,7 +59,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/nft-storage-prepay/wasm/Cargo.lock b/contracts/examples/nft-storage-prepay/wasm/Cargo.lock
index f877f05711..7905f9c5f5 100755
--- a/contracts/examples/nft-storage-prepay/wasm/Cargo.lock
+++ b/contracts/examples/nft-storage-prepay/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -51,7 +51,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -59,7 +59,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/nft-subscription/wasm/Cargo.lock b/contracts/examples/nft-subscription/wasm/Cargo.lock
index e8b62546de..63c6100a8e 100644
--- a/contracts/examples/nft-subscription/wasm/Cargo.lock
+++ b/contracts/examples/nft-subscription/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -51,7 +51,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -59,7 +59,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,14 +80,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/order-book/factory/wasm/Cargo.lock b/contracts/examples/order-book/factory/wasm/Cargo.lock
index 7d38576ac4..755a1b87a7 100644
--- a/contracts/examples/order-book/factory/wasm/Cargo.lock
+++ b/contracts/examples/order-book/factory/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -51,7 +51,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -59,7 +59,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/order-book/pair/wasm/Cargo.lock b/contracts/examples/order-book/pair/wasm/Cargo.lock
index 38fbac9a8f..65336f77d0 100644
--- a/contracts/examples/order-book/pair/wasm/Cargo.lock
+++ b/contracts/examples/order-book/pair/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -51,7 +51,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -59,7 +59,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/ping-pong-egld/wasm/Cargo.lock b/contracts/examples/ping-pong-egld/wasm/Cargo.lock
index a2d0636590..2ec97eef16 100755
--- a/contracts/examples/ping-pong-egld/wasm/Cargo.lock
+++ b/contracts/examples/ping-pong-egld/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -51,7 +51,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -59,7 +59,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/proxy-pause/wasm/Cargo.lock b/contracts/examples/proxy-pause/wasm/Cargo.lock
index 5edbcad6e8..bab5be1cc9 100644
--- a/contracts/examples/proxy-pause/wasm/Cargo.lock
+++ b/contracts/examples/proxy-pause/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -51,7 +51,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -59,7 +59,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/rewards-distribution/wasm/Cargo.lock b/contracts/examples/rewards-distribution/wasm/Cargo.lock
index 018b42f4dc..ac36f04261 100644
--- a/contracts/examples/rewards-distribution/wasm/Cargo.lock
+++ b/contracts/examples/rewards-distribution/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -51,7 +51,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -59,7 +59,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,14 +80,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/seed-nft-minter/wasm/Cargo.lock b/contracts/examples/seed-nft-minter/wasm/Cargo.lock
index 70729a49cd..c88d3f49ab 100644
--- a/contracts/examples/seed-nft-minter/wasm/Cargo.lock
+++ b/contracts/examples/seed-nft-minter/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -51,7 +51,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -59,7 +59,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,14 +80,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/token-release/wasm/Cargo.lock b/contracts/examples/token-release/wasm/Cargo.lock
index 5ec1dea342..082c8ec2a8 100644
--- a/contracts/examples/token-release/wasm/Cargo.lock
+++ b/contracts/examples/token-release/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -51,7 +51,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -59,7 +59,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]
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 fee4cf1dbc..dbd1ba809d 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
@@ -25,9 +25,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/abi-tester/wasm/Cargo.lock b/contracts/feature-tests/abi-tester/wasm/Cargo.lock
index e5e8466144..09d6167d6f 100755
--- a/contracts/feature-tests/abi-tester/wasm/Cargo.lock
+++ b/contracts/feature-tests/abi-tester/wasm/Cargo.lock
@@ -25,9 +25,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock
index 8b16c89d1b..2e1236933d 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock
@@ -25,9 +25,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.lock b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.lock
index a9d74ed0f6..72aef64716 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.lock
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.lock
@@ -25,9 +25,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/alloc-features/wasm/Cargo.lock b/contracts/feature-tests/alloc-features/wasm/Cargo.lock
index df6ddbb5b6..52ee29d13c 100644
--- a/contracts/feature-tests/alloc-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/alloc-features/wasm/Cargo.lock
@@ -25,9 +25,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]
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 58a94ca113..24e1340805 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
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "basic-features"
@@ -56,7 +56,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -75,7 +75,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,14 +96,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/basic-features/wasm/Cargo.lock b/contracts/feature-tests/basic-features/wasm/Cargo.lock
index c44431afb1..d047f9419c 100755
--- a/contracts/feature-tests/basic-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/basic-features/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "basic-features"
@@ -56,7 +56,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -75,7 +75,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,14 +96,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/big-float-features/wasm/Cargo.lock b/contracts/feature-tests/big-float-features/wasm/Cargo.lock
index 8e2d6618a0..5c8dfe26aa 100644
--- a/contracts/feature-tests/big-float-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/big-float-features/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "big-float-features"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]
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 a1e69001c6..cdbde8f3c9 100644
--- a/contracts/feature-tests/composability/builtin-func-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/builtin-func-features/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]
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 5a7020c0cc..17abe8ee97 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
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]
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 c4c31a8fb6..324de28ec0 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
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -51,7 +51,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -59,7 +59,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]
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 77bbdd0fb0..9586e596a4 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
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]
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 375b37c6d9..42635f16d6 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
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -51,7 +51,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -59,7 +59,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.lock
index 6f2efbb4a7..33eb4d9098 100644
--- a/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
@@ -56,7 +56,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.6"
+version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -75,7 +75,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.6"
+version = "0.18.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -85,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,7 +96,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]
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 345df6ab7c..e25422de65 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
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock
index 618aeb9569..568fd2b429 100644
--- a/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]
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 4efcd69b75..21a05a9eb7 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
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]
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 5eebcf9076..e6fc2f76dc 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
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.lock
index 25b4034e97..0ff5143f0a 100755
--- a/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock
index 9ac4d71496..574f224fed 100755
--- a/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]
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 a8525f910a..3b8b768bbb 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
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
@@ -55,7 +55,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/promises-features/wasm/Cargo.lock b/contracts/feature-tests/composability/promises-features/wasm/Cargo.lock
index 1b366a0da0..bb3a4eb0f1 100644
--- a/contracts/feature-tests/composability/promises-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/promises-features/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -51,7 +51,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -59,7 +59,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]
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 582b043d05..dc198f5877 100755
--- a/contracts/feature-tests/composability/proxy-test-first/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/proxy-test-first/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -51,7 +51,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -59,7 +59,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]
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 bc6cb03e36..3061dd4018 100755
--- a/contracts/feature-tests/composability/proxy-test-second/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/proxy-test-second/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -51,7 +51,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -59,7 +59,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.lock b/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.lock
index 612de9c53d..a72449da83 100755
--- a/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -51,7 +51,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -59,7 +59,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]
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 62d98f1411..6af6ebb20e 100644
--- a/contracts/feature-tests/composability/transfer-role-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/transfer-role-features/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -51,7 +51,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -59,7 +59,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,14 +80,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]
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 ec577ac90a..cbff398e5d 100644
--- a/contracts/feature-tests/composability/vault/wasm-vault-promises/Cargo.lock
+++ b/contracts/feature-tests/composability/vault/wasm-vault-promises/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -51,7 +51,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -59,7 +59,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]
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 6d9e7ffafe..1a01ab9815 100644
--- a/contracts/feature-tests/composability/vault/wasm-vault-upgrade/Cargo.lock
+++ b/contracts/feature-tests/composability/vault/wasm-vault-upgrade/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -51,7 +51,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -59,7 +59,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/vault/wasm/Cargo.lock b/contracts/feature-tests/composability/vault/wasm/Cargo.lock
index 64462a7d14..07c100c584 100755
--- a/contracts/feature-tests/composability/vault/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/vault/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -51,7 +51,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -59,7 +59,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]
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 9848b01662..892b386530 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
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
@@ -63,7 +63,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -92,7 +92,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -103,7 +103,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]
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 df492c51db..8207501bb8 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
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
@@ -63,7 +63,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -92,7 +92,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -103,7 +103,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]
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 dc29477e1d..238894c1be 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
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]
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 f34cb19087..9c0eff36ac 100644
--- a/contracts/feature-tests/erc-style-contracts/erc1155/wasm/Cargo.lock
+++ b/contracts/feature-tests/erc-style-contracts/erc1155/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]
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 b0ba8e546c..96b0e0dd78 100644
--- a/contracts/feature-tests/erc-style-contracts/erc20/wasm/Cargo.lock
+++ b/contracts/feature-tests/erc-style-contracts/erc20/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]
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 9b4caaf7b6..3f6cc428c2 100644
--- a/contracts/feature-tests/erc-style-contracts/erc721/wasm/Cargo.lock
+++ b/contracts/feature-tests/erc-style-contracts/erc721/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]
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 64019726c1..4beaf5a751 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
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
@@ -63,7 +63,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -92,7 +92,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -103,7 +103,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]
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 b66a768ae1..8ab3a45af6 100644
--- a/contracts/feature-tests/esdt-system-sc-mock/wasm/Cargo.lock
+++ b/contracts/feature-tests/esdt-system-sc-mock/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/exchange-features/wasm/Cargo.lock b/contracts/feature-tests/exchange-features/wasm/Cargo.lock
index adf5bb4ee3..4580ca7fa2 100644
--- a/contracts/feature-tests/exchange-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/exchange-features/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/formatted-message-features/wasm/Cargo.lock b/contracts/feature-tests/formatted-message-features/wasm/Cargo.lock
index 9f3eabdcfc..5539245761 100644
--- a/contracts/feature-tests/formatted-message-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/formatted-message-features/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/managed-map-features/wasm/Cargo.lock b/contracts/feature-tests/managed-map-features/wasm/Cargo.lock
index 59d4875222..a4d915beb4 100644
--- a/contracts/feature-tests/managed-map-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/managed-map-features/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
@@ -55,7 +55,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]
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 bd6f9e8daf..ef7b7dd9e6 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
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
@@ -55,7 +55,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]
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 a234b10710..009eb5a826 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
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
@@ -55,7 +55,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]
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 b74f0b96b8..b32b3af13d 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
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
@@ -55,7 +55,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/multi-contract-features/wasm/Cargo.lock b/contracts/feature-tests/multi-contract-features/wasm/Cargo.lock
index 7b7b14b240..55f0d7e4de 100755
--- a/contracts/feature-tests/multi-contract-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/multi-contract-features/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
@@ -55,7 +55,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/panic-message-features/wasm/Cargo.lock b/contracts/feature-tests/panic-message-features/wasm/Cargo.lock
index f05b039ab2..4b9d2dd045 100755
--- a/contracts/feature-tests/panic-message-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/panic-message-features/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -51,7 +51,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -59,7 +59,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/payable-features/wasm/Cargo.lock b/contracts/feature-tests/payable-features/wasm/Cargo.lock
index 46f3efdb23..bb15e9082b 100755
--- a/contracts/feature-tests/payable-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/payable-features/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -51,7 +51,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -59,7 +59,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]
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 c5a3c14f3b..f13fb3b27a 100644
--- a/contracts/feature-tests/rust-snippets-generator-test/wasm/Cargo.lock
+++ b/contracts/feature-tests/rust-snippets-generator-test/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -51,7 +51,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -59,7 +59,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]
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 b9637d20a1..0b3ae5f87c 100644
--- a/contracts/feature-tests/rust-testing-framework-tester/wasm/Cargo.lock
+++ b/contracts/feature-tests/rust-testing-framework-tester/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -51,7 +51,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -59,7 +59,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/scenario-tester/wasm/Cargo.lock b/contracts/feature-tests/scenario-tester/wasm/Cargo.lock
index c92359d81b..66eca188da 100755
--- a/contracts/feature-tests/scenario-tester/wasm/Cargo.lock
+++ b/contracts/feature-tests/scenario-tester/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -51,7 +51,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.6"
+version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -59,7 +59,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.6"
+version = "0.18.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]
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 f5320776c8..6d3a67850c 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
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -51,7 +51,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -59,7 +59,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,14 +80,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/use-module/wasm/Cargo.lock b/contracts/feature-tests/use-module/wasm/Cargo.lock
index 29c091ca70..7bd3915e63 100644
--- a/contracts/feature-tests/use-module/wasm/Cargo.lock
+++ b/contracts/feature-tests/use-module/wasm/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -51,7 +51,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -59,7 +59,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.7"
+version = "0.18.8"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -69,7 +69,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,14 +80,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0-alpha.4"
+version = "0.49.0"
 dependencies = [
  "multiversx-sc",
 ]

From df58c72a935efa5192f4e1705d30297fb62cd9ee Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 7 May 2024 18:00:14 +0300
Subject: [PATCH 0836/1254] removed crypto-kitties dependency from
 crypto-zombies

---
 Cargo.lock                                    |  1 -
 .../kitty-ownership/sc-config.toml            |  2 +-
 contracts/examples/crypto-zombies/Cargo.toml  |  4 --
 .../examples/crypto-zombies/src/kitty_obj.rs  | 40 +++++++++++++++++++
 .../src/kitty_ownership_proxy.rs              |  2 +-
 contracts/examples/crypto-zombies/src/lib.rs  |  1 +
 .../crypto-zombies/src/zombie_feeding.rs      |  2 +-
 7 files changed, 44 insertions(+), 8 deletions(-)
 create mode 100644 contracts/examples/crypto-zombies/src/kitty_obj.rs

diff --git a/Cargo.lock b/Cargo.lock
index d3eae4e638..f6ce6930f2 100755
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -630,7 +630,6 @@ dependencies = [
 name = "crypto-zombies"
 version = "0.0.0"
 dependencies = [
- "kitty",
  "multiversx-sc",
  "multiversx-sc-scenario",
 ]
diff --git a/contracts/examples/crypto-kitties/kitty-ownership/sc-config.toml b/contracts/examples/crypto-kitties/kitty-ownership/sc-config.toml
index 202f19e321..8af6863e4b 100644
--- a/contracts/examples/crypto-kitties/kitty-ownership/sc-config.toml
+++ b/contracts/examples/crypto-kitties/kitty-ownership/sc-config.toml
@@ -8,4 +8,4 @@ to = "kitty"
 path = "../../crypto-zombies/src/kitty_ownership_proxy.rs"
 [[proxy.path-rename]]
 from = "kitty::kitty"
-to = "kitty"
+to = "crate::kitty_obj"
diff --git a/contracts/examples/crypto-zombies/Cargo.toml b/contracts/examples/crypto-zombies/Cargo.toml
index f0df60381e..19c94cebbb 100644
--- a/contracts/examples/crypto-zombies/Cargo.toml
+++ b/contracts/examples/crypto-zombies/Cargo.toml
@@ -15,7 +15,3 @@ path = "../../../framework/base"
 [dev-dependencies.multiversx-sc-scenario]
 version = "0.49.0"
 path = "../../../framework/scenario"
-
-[dependencies.kitty]
-version = "0.0.0"
-path = "../../../contracts/examples/crypto-kitties/common/kitty"
diff --git a/contracts/examples/crypto-zombies/src/kitty_obj.rs b/contracts/examples/crypto-zombies/src/kitty_obj.rs
new file mode 100644
index 0000000000..acdc23cfca
--- /dev/null
+++ b/contracts/examples/crypto-zombies/src/kitty_obj.rs
@@ -0,0 +1,40 @@
+use multiversx_sc::derive_imports::*;
+
+#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, TypeAbi)]
+pub struct Kitty {
+    pub genes: KittyGenes,
+    pub birth_time: u64,   // timestamp
+    pub cooldown_end: u64, // timestamp, used for pregnancy timer and siring cooldown
+    pub matron_id: u32,
+    pub sire_id: u32,
+    pub siring_with_id: u32, // for pregnant cats, 0 otherwise
+    pub nr_children: u16,    // cooldown period increases exponentially with every breeding/siring
+    pub generation: u16,     // max(sire_gen, matron_gen) + 1. Generation also influences cooldown.
+}
+
+#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, TypeAbi)]
+pub struct KittyGenes {
+    pub fur_color: Color,
+    pub eye_color: Color,
+    pub meow_power: u8, // the higher the value, the louder the cat
+}
+
+#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, TypeAbi)]
+pub struct Color {
+    pub r: u8,
+    pub g: u8,
+    pub b: u8,
+}
+
+impl KittyGenes {
+    pub fn get_as_u64(&self) -> u64 {
+        (self.fur_color.as_u64() << 12 | self.eye_color.as_u64()) << 4
+            | self.meow_power.to_be() as u64
+    }
+}
+
+impl Color {
+    pub fn as_u64(&self) -> u64 {
+        ((self.r.to_be() as u64) << 4 | self.r.to_be() as u64) << 4 | self.r.to_be() as u64
+    }
+}
diff --git a/contracts/examples/crypto-zombies/src/kitty_ownership_proxy.rs b/contracts/examples/crypto-zombies/src/kitty_ownership_proxy.rs
index 87f5bdb4a2..595c1612c7 100644
--- a/contracts/examples/crypto-zombies/src/kitty_ownership_proxy.rs
+++ b/contracts/examples/crypto-zombies/src/kitty_ownership_proxy.rs
@@ -241,7 +241,7 @@ where
     >(
         self,
         kitty_id: Arg0,
-    ) -> TxProxyCall<Env, From, To, Gas, kitty::Kitty> {
+    ) -> TxProxyCall<Env, From, To, Gas, crate::kitty_obj::Kitty> {
         self.wrapped_tx
             .raw_call("getKittyById")
             .argument(&kitty_id)
diff --git a/contracts/examples/crypto-zombies/src/lib.rs b/contracts/examples/crypto-zombies/src/lib.rs
index 9fea3b3099..a79de4fcb0 100644
--- a/contracts/examples/crypto-zombies/src/lib.rs
+++ b/contracts/examples/crypto-zombies/src/lib.rs
@@ -2,6 +2,7 @@
 
 use multiversx_sc::imports::*;
 
+pub mod kitty_obj;
 pub mod kitty_ownership_proxy;
 pub mod proxy_crypto_zombies;
 mod storage;
diff --git a/contracts/examples/crypto-zombies/src/zombie_feeding.rs b/contracts/examples/crypto-zombies/src/zombie_feeding.rs
index 56ef89cb7c..f98e48452b 100644
--- a/contracts/examples/crypto-zombies/src/zombie_feeding.rs
+++ b/contracts/examples/crypto-zombies/src/zombie_feeding.rs
@@ -38,7 +38,7 @@ pub trait ZombieFeeding:
     #[callback]
     fn get_kitty_callback(
         &self,
-        #[call_result] result: ManagedAsyncCallResult<kitty::Kitty>,
+        #[call_result] result: ManagedAsyncCallResult<crate::kitty_obj::Kitty>,
         zombie_id: usize,
     ) {
         match result {

From 9c3b4ccce4471034691a2a917cf431c1351e0687 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 7 May 2024 19:23:05 +0300
Subject: [PATCH 0837/1254] removed CodecFrom

---
 .../src/{equivalent => }/codec_convert.rs     | 11 ++--
 data/codec/src/equivalent/codec_from.rs       | 55 ------------------
 data/codec/src/equivalent/codec_into.rs       | 16 ------
 data/codec/src/equivalent/mod.rs              |  9 ---
 data/codec/src/lib.rs                         |  5 +-
 data/codec/src/multi_types/mod.rs             |  2 -
 .../src/multi_types/multi_value_ignore.rs     |  7 +--
 .../src/multi_types/multi_value_optional.rs   | 21 +------
 .../multi_types/multi_value_placeholder.rs    | 10 +---
 framework/base/src/imports.rs                 |  4 +-
 framework/base/src/lib.rs                     |  1 -
 .../base/src/storage/mappers/bi_di_mapper.rs  | 11 +---
 .../src/storage/mappers/linked_list_mapper.rs | 12 +---
 .../base/src/storage/mappers/map_mapper.rs    | 11 +---
 .../base/src/storage/mappers/queue_mapper.rs  | 11 +---
 .../base/src/storage/mappers/set_mapper.rs    | 11 +---
 .../storage/mappers/single_value_mapper.rs    | 32 ++---------
 .../mappers/token/fungible_token_mapper.rs    |  7 +--
 .../token/non_fungible_token_mapper.rs        |  9 +--
 .../src/storage/mappers/unique_id_mapper.rs   |  8 +--
 .../storage/mappers/unordered_set_mapper.rs   | 11 +---
 .../base/src/storage/mappers/user_mapper.rs   |  8 +--
 .../base/src/storage/mappers/vec_mapper.rs    | 11 +---
 .../types/interaction/expr/test_address.rs    |  3 +-
 .../types/interaction/expr/test_sc_address.rs |  3 +-
 .../interaction/expr/test_token_identifier.rs |  3 +-
 .../markers/esdt_system_sc_address.rs         |  3 +-
 .../types/io/operation_completion_status.rs   |  6 +-
 .../base/src/types/managed/basic/big_float.rs |  7 +--
 .../base/src/types/managed/basic/big_int.rs   | 57 ++++++++-----------
 .../base/src/types/managed/basic/big_uint.rs  | 51 +++++++----------
 .../src/types/managed/basic/managed_buffer.rs | 17 +-----
 .../multi_value/multi_value_encoded.rs        | 24 +-------
 .../wrapped/egld_or_esdt_token_identifier.rs  |  7 ---
 .../wrapped/egld_or_esdt_token_payment.rs     |  6 +-
 .../wrapped/egld_or_multi_esdt_payment.rs     |  3 -
 .../types/managed/wrapped/managed_address.rs  | 21 +------
 .../types/managed/wrapped/token_identifier.rs |  5 --
 .../scenario/src/facade/contract_info.rs      |  9 +--
 .../src/facade/expr/bech32_address.rs         |  5 --
 40 files changed, 97 insertions(+), 416 deletions(-)
 rename data/codec/src/{equivalent => }/codec_convert.rs (85%)
 delete mode 100644 data/codec/src/equivalent/codec_from.rs
 delete mode 100644 data/codec/src/equivalent/codec_into.rs
 delete mode 100644 data/codec/src/equivalent/mod.rs

diff --git a/data/codec/src/equivalent/codec_convert.rs b/data/codec/src/codec_convert.rs
similarity index 85%
rename from data/codec/src/equivalent/codec_convert.rs
rename to data/codec/src/codec_convert.rs
index 34b5f28879..566035dfc3 100644
--- a/data/codec/src/equivalent/codec_convert.rs
+++ b/data/codec/src/codec_convert.rs
@@ -1,13 +1,16 @@
 use unwrap_infallible::UnwrapInfallible;
 
 use crate::{
-    CodecFrom, PanicErrorHandler, TopDecodeMultiInput, TopEncodeMulti, TopEncodeMultiOutput,
+    PanicErrorHandler, TopDecodeMulti, TopDecodeMultiInput, TopEncodeMulti, TopEncodeMultiOutput,
 };
 
+/// Little experiment: conversion using the codec.
+///
+/// Not used anywhere.
 pub fn codec_convert_or_panic<From, To, Medium>(from: From) -> To
 where
     From: TopEncodeMulti,
-    To: CodecFrom<From>,
+    To: TopDecodeMulti,
     Medium: Default + TopDecodeMultiInput + TopEncodeMultiOutput,
 {
     let mut medium: Medium = Default::default();
@@ -34,9 +37,7 @@ mod test {
     where
         T1: TopEncodeMulti,
         T2: TopEncodeMulti,
-        u32: CodecFrom<T1>,
-        u32: CodecFrom<T2>,
-        R: CodecFrom<u32>,
+        R: TopDecodeMulti,
     {
         let conv_x = codec_convert_or_panic::<T1, u32, Vec<Vec<u8>>>(x);
         let conv_y = codec_convert_or_panic::<T2, u32, Vec<Vec<u8>>>(y);
diff --git a/data/codec/src/equivalent/codec_from.rs b/data/codec/src/equivalent/codec_from.rs
deleted file mode 100644
index f6fc1ffda2..0000000000
--- a/data/codec/src/equivalent/codec_from.rs
+++ /dev/null
@@ -1,55 +0,0 @@
-use crate::{TopDecodeMulti, TopEncodeMulti};
-
-/// Signals that after serializing `T`, we can safely deserialize it as `Self`.
-#[deprecated(since = "0.49.0", note = "Please use trait `TypeAbiFrom` instead.")]
-pub trait CodecFrom<T>: TopDecodeMulti
-where
-    T: TopEncodeMulti,
-{
-}
-
-#[deprecated(since = "0.49.0", note = "Please use trait `TypeAbiFrom` instead.")]
-pub auto trait CodecFromSelf {}
-
-impl<T> CodecFrom<T> for T where T: TopEncodeMulti + TopDecodeMulti + CodecFromSelf {}
-
-impl<'a, T> CodecFrom<&'a T> for T
-where
-    &'a T: TopEncodeMulti,
-    T: TopDecodeMulti,
-{
-}
-
-// Unsigned integer types: the contract can return a smaller capacity result and and we can interpret it as a larger capacity type.
-
-impl CodecFrom<usize> for u64 {}
-impl CodecFrom<u32> for u64 {}
-impl CodecFrom<u16> for u64 {}
-impl CodecFrom<u8> for u64 {}
-
-impl CodecFrom<usize> for u32 {}
-impl CodecFrom<u16> for u32 {}
-impl CodecFrom<u8> for u32 {}
-
-impl CodecFrom<u32> for usize {}
-impl CodecFrom<u16> for usize {}
-impl CodecFrom<u8> for usize {}
-
-impl CodecFrom<u8> for u16 {}
-
-// Signed, the same.
-
-impl CodecFrom<isize> for i64 {}
-impl CodecFrom<i32> for i64 {}
-impl CodecFrom<i16> for i64 {}
-impl CodecFrom<i8> for i64 {}
-
-impl CodecFrom<isize> for i32 {}
-impl CodecFrom<i16> for i32 {}
-impl CodecFrom<i8> for i32 {}
-
-impl CodecFrom<i32> for isize {}
-impl CodecFrom<i16> for isize {}
-impl CodecFrom<i8> for isize {}
-
-impl CodecFrom<i8> for i16 {}
diff --git a/data/codec/src/equivalent/codec_into.rs b/data/codec/src/equivalent/codec_into.rs
deleted file mode 100644
index 06013c41bb..0000000000
--- a/data/codec/src/equivalent/codec_into.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-use crate::{CodecFrom, TopDecodeMulti, TopEncodeMulti};
-
-/// Signals that we can safely serialize `Self` in order to obtain a `T` on the other size.
-#[deprecated(since = "0.49.0", note = "Please use trait `TypeAbiFrom` instead.")]
-pub trait CodecInto<T>: TopEncodeMulti
-where
-    T: TopDecodeMulti,
-{
-}
-
-impl<F, I> CodecInto<F> for I
-where
-    I: TopEncodeMulti,
-    F: CodecFrom<I>,
-{
-}
diff --git a/data/codec/src/equivalent/mod.rs b/data/codec/src/equivalent/mod.rs
deleted file mode 100644
index 632fef5ae1..0000000000
--- a/data/codec/src/equivalent/mod.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-#![allow(deprecated)]
-
-mod codec_convert;
-mod codec_from;
-mod codec_into;
-
-pub use codec_convert::*;
-pub use codec_from::{CodecFrom, CodecFromSelf};
-pub use codec_into::CodecInto;
diff --git a/data/codec/src/lib.rs b/data/codec/src/lib.rs
index 6ee069e3d0..2833dd4ed4 100644
--- a/data/codec/src/lib.rs
+++ b/data/codec/src/lib.rs
@@ -1,7 +1,5 @@
 #![no_std]
 #![feature(try_trait_v2)]
-#![feature(auto_traits)]
-#![feature(negative_impls)]
 
 extern crate alloc;
 
@@ -20,10 +18,10 @@ pub use num_bigint;
 
 // TODO: group into smaller sub-modules
 
+pub mod codec_convert;
 mod codec_err;
 mod codec_err_handler;
 mod default_traits;
-mod equivalent;
 mod impl_for_types;
 mod multi;
 pub mod multi_types;
@@ -42,7 +40,6 @@ pub use crate::{
 pub use codec_err::{DecodeError, EncodeError};
 pub use codec_err_handler::*;
 pub use default_traits::{DecodeDefault, EncodeDefault};
-pub use equivalent::*;
 pub use impl_for_types::impl_empty::Empty;
 pub use multi::*;
 pub use single::*;
diff --git a/data/codec/src/multi_types/mod.rs b/data/codec/src/multi_types/mod.rs
index 0a7ae541c4..2bb9948b41 100644
--- a/data/codec/src/multi_types/mod.rs
+++ b/data/codec/src/multi_types/mod.rs
@@ -1,5 +1,3 @@
-#![allow(deprecated)] // TODO: remove after deleting CodecFrom
-
 mod multi_value_ignore;
 mod multi_value_optional;
 mod multi_value_placeholder;
diff --git a/data/codec/src/multi_types/multi_value_ignore.rs b/data/codec/src/multi_types/multi_value_ignore.rs
index 3522315a86..a621c76d22 100644
--- a/data/codec/src/multi_types/multi_value_ignore.rs
+++ b/data/codec/src/multi_types/multi_value_ignore.rs
@@ -1,6 +1,6 @@
 use crate::{
-    CodecFrom, CodecFromSelf, DecodeErrorHandler, EncodeErrorHandler, TopDecodeMulti,
-    TopDecodeMultiInput, TopEncodeMulti, TopEncodeMultiOutput,
+    DecodeErrorHandler, EncodeErrorHandler, TopDecodeMulti, TopDecodeMultiInput, TopEncodeMulti,
+    TopEncodeMultiOutput,
 };
 
 /// Structure that allows taking a variable number of arguments,
@@ -28,6 +28,3 @@ impl TopDecodeMulti for IgnoreValue {
         Ok(IgnoreValue)
     }
 }
-
-impl !CodecFromSelf for IgnoreValue {}
-impl<T> CodecFrom<T> for IgnoreValue where T: TopEncodeMulti {}
diff --git a/data/codec/src/multi_types/multi_value_optional.rs b/data/codec/src/multi_types/multi_value_optional.rs
index d634d2a7e5..bcdf2a6460 100644
--- a/data/codec/src/multi_types/multi_value_optional.rs
+++ b/data/codec/src/multi_types/multi_value_optional.rs
@@ -1,8 +1,8 @@
 use core::fmt::Debug;
 
 use crate::{
-    CodecFrom, CodecFromSelf, DecodeErrorHandler, EncodeErrorHandler, TopDecodeMulti,
-    TopDecodeMultiInput, TopEncodeMulti, TopEncodeMultiOutput,
+    DecodeErrorHandler, EncodeErrorHandler, TopDecodeMulti, TopDecodeMultiInput, TopEncodeMulti,
+    TopEncodeMultiOutput,
 };
 
 /// A smart contract argument or result that can be missing.
@@ -80,23 +80,6 @@ where
     }
 }
 
-impl<T> !CodecFromSelf for OptionalValue<T> {}
-
-impl<T, U> CodecFrom<OptionalValue<U>> for OptionalValue<T>
-where
-    T: TopEncodeMulti + TopDecodeMulti,
-    U: CodecFrom<T>,
-    OptionalValue<U>: TopEncodeMulti,
-{
-}
-
-impl<T, U> CodecFrom<U> for OptionalValue<T>
-where
-    T: TopEncodeMulti + TopDecodeMulti,
-    U: CodecFrom<T> + CodecFromSelf + TopEncodeMulti + TopDecodeMulti,
-{
-}
-
 impl<T> Debug for OptionalValue<T>
 where
     T: Debug,
diff --git a/data/codec/src/multi_types/multi_value_placeholder.rs b/data/codec/src/multi_types/multi_value_placeholder.rs
index 1265342f9f..34b4af73a3 100644
--- a/data/codec/src/multi_types/multi_value_placeholder.rs
+++ b/data/codec/src/multi_types/multi_value_placeholder.rs
@@ -1,6 +1,6 @@
 use crate::{
-    CodecFrom, CodecFromSelf, DecodeError, DecodeErrorHandler, EncodeError, EncodeErrorHandler,
-    TopDecodeMulti, TopDecodeMultiInput, TopEncodeMulti, TopEncodeMultiOutput,
+    DecodeError, DecodeErrorHandler, EncodeError, EncodeErrorHandler, TopDecodeMulti,
+    TopDecodeMultiInput, TopEncodeMulti, TopEncodeMultiOutput,
 };
 
 /// Temporary value used for any kind of templates.
@@ -19,9 +19,6 @@ impl TopEncodeMulti for PlaceholderInput {
     }
 }
 
-impl !CodecFromSelf for PlaceholderInput {}
-impl<T> CodecFrom<PlaceholderInput> for T where T: TopDecodeMulti + CodecFromSelf {}
-
 /// Temporary value used for any kind of templates.
 ///
 /// Can be used for compiling example code, in which it decodes from anything, but will always fail at runtime.
@@ -37,6 +34,3 @@ impl TopDecodeMulti for PlaceholderOutput {
         Err(h.handle_error(DecodeError::from("placeholder only, cannot decode")))
     }
 }
-
-impl !CodecFromSelf for PlaceholderOutput {}
-impl<T> CodecFrom<T> for PlaceholderOutput where T: TopEncodeMulti + CodecFromSelf {}
diff --git a/framework/base/src/imports.rs b/framework/base/src/imports.rs
index 016aa7bb4e..f8fa5cd6cf 100644
--- a/framework/base/src/imports.rs
+++ b/framework/base/src/imports.rs
@@ -3,8 +3,8 @@ pub use crate::{
     api::{ErrorApiImpl, ManagedTypeApi, VMApi},
     arrayvec::ArrayVec,
     codec::{
-        multi_types::*, CodecFrom, CodecFromSelf, CodecInto, DecodeError, Empty, IntoMultiValue,
-        NestedDecode, NestedEncode, TopDecode, TopEncode,
+        multi_types::*, DecodeError, Empty, IntoMultiValue, NestedDecode, NestedEncode, TopDecode,
+        TopEncode,
     },
     contract_base::{ContractBase, ProxyObjBase, ProxyObjNew},
     err_msg,
diff --git a/framework/base/src/lib.rs b/framework/base/src/lib.rs
index 1827dc2727..0a39af959f 100644
--- a/framework/base/src/lib.rs
+++ b/framework/base/src/lib.rs
@@ -1,7 +1,6 @@
 #![no_std]
 #![feature(try_trait_v2)]
 #![feature(control_flow_enum)]
-#![feature(negative_impls)]
 #![feature(generic_const_exprs)]
 #![allow(incomplete_features)]
 #![allow(deprecated)]
diff --git a/framework/base/src/storage/mappers/bi_di_mapper.rs b/framework/base/src/storage/mappers/bi_di_mapper.rs
index 4c59caa0ce..c47f38474c 100644
--- a/framework/base/src/storage/mappers/bi_di_mapper.rs
+++ b/framework/base/src/storage/mappers/bi_di_mapper.rs
@@ -3,7 +3,7 @@ use core::marker::PhantomData;
 use crate::{
     abi::TypeAbiFrom,
     codec::{
-        multi_encode_iter_or_handle_err, multi_types::MultiValue2, CodecFrom, EncodeErrorHandler,
+        multi_encode_iter_or_handle_err, multi_types::MultiValue2, EncodeErrorHandler,
         NestedDecode, NestedEncode, TopDecode, TopEncode, TopEncodeMulti, TopEncodeMultiOutput,
     },
     types::ManagedAddress,
@@ -299,15 +299,6 @@ where
     }
 }
 
-impl<SA, K, V> CodecFrom<BiDiMapper<SA, K, V, CurrentStorage>>
-    for MultiValueEncoded<SA, MultiValue2<K, V>>
-where
-    SA: StorageMapperApi,
-    K: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static + Default + PartialEq,
-    V: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static + Default + PartialEq,
-{
-}
-
 impl<SA, K, V> TypeAbiFrom<BiDiMapper<SA, K, V, CurrentStorage>>
     for MultiValueEncoded<SA, MultiValue2<K, V>>
 where
diff --git a/framework/base/src/storage/mappers/linked_list_mapper.rs b/framework/base/src/storage/mappers/linked_list_mapper.rs
index d2d8af3b10..fd65fdec91 100644
--- a/framework/base/src/storage/mappers/linked_list_mapper.rs
+++ b/framework/base/src/storage/mappers/linked_list_mapper.rs
@@ -13,8 +13,8 @@ use crate::{
             NestedDecode, NestedEncode, TopDecode, TopDecodeOrDefault, TopEncode,
             TopEncodeOrDefault,
         },
-        CodecFrom, DecodeDefault, EncodeDefault, EncodeErrorHandler, NestedDecode, NestedEncode,
-        TopDecode, TopEncode, TopEncodeMulti, TopEncodeMultiOutput,
+        DecodeDefault, EncodeDefault, EncodeErrorHandler, NestedDecode, NestedEncode, TopDecode,
+        TopEncode, TopEncodeMulti, TopEncodeMultiOutput,
     },
     storage::{storage_set, StorageKey},
     types::{heap::BoxedBytes, ManagedAddress, ManagedType, MultiValueEncoded},
@@ -612,14 +612,6 @@ where
     }
 }
 
-impl<SA, T, U> CodecFrom<LinkedListMapper<SA, T>> for MultiValueEncoded<SA, U>
-where
-    SA: StorageMapperApi,
-    T: TopEncode + TopDecode + NestedEncode + NestedDecode + Clone,
-    U: CodecFrom<T>,
-{
-}
-
 impl<SA, T, U> TypeAbiFrom<LinkedListMapper<SA, T>> for MultiValueEncoded<SA, U>
 where
     SA: StorageMapperApi,
diff --git a/framework/base/src/storage/mappers/map_mapper.rs b/framework/base/src/storage/mappers/map_mapper.rs
index eda95d8930..aa5d105b9e 100644
--- a/framework/base/src/storage/mappers/map_mapper.rs
+++ b/framework/base/src/storage/mappers/map_mapper.rs
@@ -8,7 +8,7 @@ use crate::{
     abi::{TypeAbi, TypeAbiFrom, TypeDescriptionContainer, TypeName},
     api::StorageMapperApi,
     codec::{
-        multi_encode_iter_or_handle_err, multi_types::MultiValue2, CodecFrom, EncodeErrorHandler,
+        multi_encode_iter_or_handle_err, multi_types::MultiValue2, EncodeErrorHandler,
         NestedDecode, NestedEncode, TopDecode, TopEncode, TopEncodeMulti, TopEncodeMultiOutput,
     },
     storage::{storage_clear, storage_set, StorageKey},
@@ -539,15 +539,6 @@ where
     }
 }
 
-impl<SA, K, V> CodecFrom<MapMapper<SA, K, V, CurrentStorage>>
-    for MultiValueEncoded<SA, MultiValue2<K, V>>
-where
-    SA: StorageMapperApi,
-    K: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static,
-    V: TopEncode + TopDecode + 'static,
-{
-}
-
 impl<SA, K, V> TypeAbiFrom<MapMapper<SA, K, V, CurrentStorage>>
     for MultiValueEncoded<SA, MultiValue2<K, V>>
 where
diff --git a/framework/base/src/storage/mappers/queue_mapper.rs b/framework/base/src/storage/mappers/queue_mapper.rs
index a1ba11e2a6..ac65764c36 100644
--- a/framework/base/src/storage/mappers/queue_mapper.rs
+++ b/framework/base/src/storage/mappers/queue_mapper.rs
@@ -10,8 +10,8 @@ use crate::{
     codec::{
         self,
         derive::{TopDecode, TopDecodeOrDefault, TopEncode, TopEncodeOrDefault},
-        multi_encode_iter_or_handle_err, CodecFrom, DecodeDefault, EncodeDefault,
-        EncodeErrorHandler, TopDecode, TopEncode, TopEncodeMulti, TopEncodeMultiOutput,
+        multi_encode_iter_or_handle_err, DecodeDefault, EncodeDefault, EncodeErrorHandler,
+        TopDecode, TopEncode, TopEncodeMulti, TopEncodeMultiOutput,
     },
     storage::{storage_set, StorageKey},
     types::{ManagedAddress, ManagedType, MultiValueEncoded},
@@ -518,13 +518,6 @@ where
     }
 }
 
-impl<SA, T> CodecFrom<QueueMapper<SA, T, CurrentStorage>> for MultiValueEncoded<SA, T>
-where
-    SA: StorageMapperApi,
-    T: TopEncode + TopDecode,
-{
-}
-
 impl<SA, T> TypeAbiFrom<QueueMapper<SA, T, CurrentStorage>> for MultiValueEncoded<SA, T>
 where
     SA: StorageMapperApi,
diff --git a/framework/base/src/storage/mappers/set_mapper.rs b/framework/base/src/storage/mappers/set_mapper.rs
index 1579f1938e..2ab1deb4f2 100644
--- a/framework/base/src/storage/mappers/set_mapper.rs
+++ b/framework/base/src/storage/mappers/set_mapper.rs
@@ -8,8 +8,8 @@ use crate::{
     abi::{TypeAbi, TypeAbiFrom, TypeDescriptionContainer, TypeName},
     api::StorageMapperApi,
     codec::{
-        self, multi_encode_iter_or_handle_err, CodecFrom, EncodeErrorHandler, NestedDecode,
-        NestedEncode, TopDecode, TopEncode, TopEncodeMulti, TopEncodeMultiOutput,
+        self, multi_encode_iter_or_handle_err, EncodeErrorHandler, NestedDecode, NestedEncode,
+        TopDecode, TopEncode, TopEncodeMulti, TopEncodeMultiOutput,
     },
     storage::{storage_get_from_address, storage_set, StorageKey},
     storage_get, storage_get_len,
@@ -294,13 +294,6 @@ where
     }
 }
 
-impl<SA, T> CodecFrom<SetMapper<SA, T, CurrentStorage>> for MultiValueEncoded<SA, T>
-where
-    SA: StorageMapperApi,
-    T: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static,
-{
-}
-
 impl<SA, T> TypeAbiFrom<SetMapper<SA, T, CurrentStorage>> for MultiValueEncoded<SA, T>
 where
     SA: StorageMapperApi,
diff --git a/framework/base/src/storage/mappers/single_value_mapper.rs b/framework/base/src/storage/mappers/single_value_mapper.rs
index dfaa41a393..8d7694c070 100644
--- a/framework/base/src/storage/mappers/single_value_mapper.rs
+++ b/framework/base/src/storage/mappers/single_value_mapper.rs
@@ -8,9 +8,8 @@ use crate::{
     abi::{TypeAbi, TypeAbiFrom, TypeDescriptionContainer, TypeName},
     api::StorageMapperApi,
     codec::{
-        multi_types::PlaceholderOutput, CodecFrom, CodecFromSelf, DecodeErrorHandler,
-        EncodeErrorHandler, TopDecode, TopDecodeInput, TopEncode, TopEncodeMulti,
-        TopEncodeMultiOutput, TopEncodeOutput,
+        multi_types::PlaceholderOutput, DecodeErrorHandler, EncodeErrorHandler, TopDecode,
+        TopDecodeInput, TopEncode, TopEncodeMulti, TopEncodeMultiOutput, TopEncodeOutput,
     },
     storage::{storage_clear, storage_set, StorageKey},
     types::{ManagedAddress, ManagedType},
@@ -158,7 +157,7 @@ where
 
 /// Intermediary type for deserializing the result of an endpoint that returns a `SingleValueMapper`.
 ///
-/// Necessary because we cannot implement `CodecFrom` directly on `T`.
+/// Necessary because we cannot implement `TypeAbiFrom` directly on `T`.
 pub struct SingleValue<T: TopDecode>(T);
 
 impl<T: TopEncode + TopDecode> TopEncode for SingleValue<T> {
@@ -194,34 +193,11 @@ impl<T: TopDecode> SingleValue<T> {
     }
 }
 
-impl<SA, T, A> !CodecFromSelf for SingleValueMapper<SA, T, A>
-where
-    SA: StorageMapperApi,
-    A: StorageAddress<SA>,
-    T: TopEncode + TopDecode,
-{
-}
-
-impl<SA, T, R> CodecFrom<SingleValueMapper<SA, T, CurrentStorage>> for SingleValue<R>
-where
-    SA: StorageMapperApi,
-    T: TopEncode + TopDecode,
-    R: TopDecode + CodecFrom<T>,
-{
-}
-
 impl<SA, T, R> TypeAbiFrom<SingleValueMapper<SA, T, CurrentStorage>> for SingleValue<R>
 where
     SA: StorageMapperApi,
     T: TopEncode + TopDecode,
-    R: TopDecode + CodecFrom<T>,
-{
-}
-
-impl<SA, T> CodecFrom<SingleValueMapper<SA, T>> for PlaceholderOutput
-where
-    SA: StorageMapperApi,
-    T: TopEncode + TopDecode,
+    R: TopDecode + TypeAbiFrom<T>,
 {
 }
 
diff --git a/framework/base/src/storage/mappers/token/fungible_token_mapper.rs b/framework/base/src/storage/mappers/token/fungible_token_mapper.rs
index 6164e919df..384e0d6096 100644
--- a/framework/base/src/storage/mappers/token/fungible_token_mapper.rs
+++ b/framework/base/src/storage/mappers/token/fungible_token_mapper.rs
@@ -1,7 +1,7 @@
 use crate::{
     abi::{TypeAbi, TypeAbiFrom},
     api::ErrorApiImpl,
-    codec::{CodecFrom, EncodeErrorHandler, TopEncodeMulti, TopEncodeMultiOutput},
+    codec::{EncodeErrorHandler, TopEncodeMulti, TopEncodeMultiOutput},
     storage_clear, storage_get, storage_set,
     types::{
         system_proxy::{ESDTSystemSCProxy, FungibleTokenProperties},
@@ -270,11 +270,6 @@ where
     }
 }
 
-impl<SA> CodecFrom<FungibleTokenMapper<SA>> for TokenIdentifier<SA> where
-    SA: StorageMapperApi + CallTypeApi
-{
-}
-
 impl<SA> TypeAbiFrom<FungibleTokenMapper<SA>> for TokenIdentifier<SA> where
     SA: StorageMapperApi + CallTypeApi
 {
diff --git a/framework/base/src/storage/mappers/token/non_fungible_token_mapper.rs b/framework/base/src/storage/mappers/token/non_fungible_token_mapper.rs
index 193c73bc68..cb0e645bc4 100644
--- a/framework/base/src/storage/mappers/token/non_fungible_token_mapper.rs
+++ b/framework/base/src/storage/mappers/token/non_fungible_token_mapper.rs
@@ -1,8 +1,6 @@
 use crate::{
     abi::TypeAbiFrom,
-    codec::{
-        CodecFrom, EncodeErrorHandler, TopDecode, TopEncode, TopEncodeMulti, TopEncodeMultiOutput,
-    },
+    codec::{EncodeErrorHandler, TopDecode, TopEncode, TopEncodeMulti, TopEncodeMultiOutput},
     storage_clear, storage_get, storage_set,
     types::{
         system_proxy::ESDTSystemSCProxy, ESDTSystemSCAddress, EgldPayment, FunctionCall,
@@ -411,11 +409,6 @@ where
     }
 }
 
-impl<SA> CodecFrom<NonFungibleTokenMapper<SA>> for TokenIdentifier<SA> where
-    SA: StorageMapperApi + CallTypeApi
-{
-}
-
 impl<SA> TypeAbiFrom<NonFungibleTokenMapper<SA>> for TokenIdentifier<SA> where
     SA: StorageMapperApi + CallTypeApi
 {
diff --git a/framework/base/src/storage/mappers/unique_id_mapper.rs b/framework/base/src/storage/mappers/unique_id_mapper.rs
index 4eb3a7d638..4ee1faa624 100644
--- a/framework/base/src/storage/mappers/unique_id_mapper.rs
+++ b/framework/base/src/storage/mappers/unique_id_mapper.rs
@@ -1,8 +1,7 @@
 use crate::{
     abi::TypeAbiFrom,
     codec::{
-        multi_encode_iter_or_handle_err, CodecFrom, EncodeErrorHandler, TopEncodeMulti,
-        TopEncodeMultiOutput,
+        multi_encode_iter_or_handle_err, EncodeErrorHandler, TopEncodeMulti, TopEncodeMultiOutput,
     },
     types::ManagedAddress,
 };
@@ -214,11 +213,6 @@ where
     }
 }
 
-impl<SA> CodecFrom<UniqueIdMapper<SA, CurrentStorage>> for MultiValueEncoded<SA, usize> where
-    SA: StorageMapperApi
-{
-}
-
 impl<SA> TypeAbiFrom<UniqueIdMapper<SA, CurrentStorage>> for MultiValueEncoded<SA, usize> where
     SA: StorageMapperApi
 {
diff --git a/framework/base/src/storage/mappers/unordered_set_mapper.rs b/framework/base/src/storage/mappers/unordered_set_mapper.rs
index 2b0cf7cac1..254e56c6b5 100644
--- a/framework/base/src/storage/mappers/unordered_set_mapper.rs
+++ b/framework/base/src/storage/mappers/unordered_set_mapper.rs
@@ -9,8 +9,8 @@ use crate::{
     abi::{TypeAbi, TypeAbiFrom, TypeDescriptionContainer, TypeName},
     api::StorageMapperApi,
     codec::{
-        multi_encode_iter_or_handle_err, CodecFrom, EncodeErrorHandler, NestedDecode, NestedEncode,
-        TopDecode, TopEncode, TopEncodeMulti, TopEncodeMultiOutput,
+        multi_encode_iter_or_handle_err, EncodeErrorHandler, NestedDecode, NestedEncode, TopDecode,
+        TopEncode, TopEncodeMulti, TopEncodeMultiOutput,
     },
     storage::StorageKey,
     storage_clear, storage_set,
@@ -225,13 +225,6 @@ where
     }
 }
 
-impl<SA, T> CodecFrom<UnorderedSetMapper<SA, T>> for MultiValueEncoded<SA, T>
-where
-    SA: StorageMapperApi,
-    T: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static,
-{
-}
-
 impl<SA, T> TypeAbiFrom<UnorderedSetMapper<SA, T>> for MultiValueEncoded<SA, T>
 where
     SA: StorageMapperApi,
diff --git a/framework/base/src/storage/mappers/user_mapper.rs b/framework/base/src/storage/mappers/user_mapper.rs
index 6d511fe567..52039da9d5 100644
--- a/framework/base/src/storage/mappers/user_mapper.rs
+++ b/framework/base/src/storage/mappers/user_mapper.rs
@@ -3,8 +3,7 @@ use core::marker::PhantomData;
 use crate::{
     abi::TypeAbiFrom,
     codec::{
-        multi_encode_iter_or_handle_err, CodecFrom, EncodeErrorHandler, TopEncodeMulti,
-        TopEncodeMultiOutput,
+        multi_encode_iter_or_handle_err, EncodeErrorHandler, TopEncodeMulti, TopEncodeMultiOutput,
     },
 };
 
@@ -222,11 +221,6 @@ where
     }
 }
 
-impl<SA> CodecFrom<UserMapper<SA, CurrentStorage>> for MultiValueEncoded<SA, ManagedAddress<SA>> where
-    SA: StorageMapperApi
-{
-}
-
 impl<SA> TypeAbiFrom<UserMapper<SA, CurrentStorage>> for MultiValueEncoded<SA, ManagedAddress<SA>> where
     SA: StorageMapperApi
 {
diff --git a/framework/base/src/storage/mappers/vec_mapper.rs b/framework/base/src/storage/mappers/vec_mapper.rs
index 5bde908ee2..de2eb55d82 100644
--- a/framework/base/src/storage/mappers/vec_mapper.rs
+++ b/framework/base/src/storage/mappers/vec_mapper.rs
@@ -6,8 +6,8 @@ use crate::{
     abi::{TypeAbi, TypeAbiFrom, TypeDescriptionContainer, TypeName},
     api::{ErrorApiImpl, StorageMapperApi},
     codec::{
-        multi_encode_iter_or_handle_err, CodecFrom, EncodeErrorHandler, TopDecode, TopEncode,
-        TopEncodeMulti, TopEncodeMultiOutput,
+        multi_encode_iter_or_handle_err, EncodeErrorHandler, TopDecode, TopEncode, TopEncodeMulti,
+        TopEncodeMultiOutput,
     },
     storage::{storage_clear, storage_set, StorageKey},
     types::{ManagedAddress, ManagedType, MultiValueEncoded},
@@ -344,13 +344,6 @@ where
     }
 }
 
-impl<SA, T> CodecFrom<VecMapper<SA, T, CurrentStorage>> for MultiValueEncoded<SA, T>
-where
-    SA: StorageMapperApi,
-    T: TopEncode + TopDecode,
-{
-}
-
 impl<SA, T> TypeAbiFrom<VecMapper<SA, T, CurrentStorage>> for MultiValueEncoded<SA, T>
 where
     SA: StorageMapperApi,
diff --git a/framework/base/src/types/interaction/expr/test_address.rs b/framework/base/src/types/interaction/expr/test_address.rs
index d2824002ba..6cd8a54753 100644
--- a/framework/base/src/types/interaction/expr/test_address.rs
+++ b/framework/base/src/types/interaction/expr/test_address.rs
@@ -1,6 +1,6 @@
 use core::ptr;
 
-use multiversx_sc_codec::{CodecFrom, EncodeErrorHandler, TopEncode, TopEncodeOutput};
+use multiversx_sc_codec::{EncodeErrorHandler, TopEncode, TopEncodeOutput};
 
 use crate::{
     abi::TypeAbiFrom,
@@ -85,7 +85,6 @@ impl<'a> TopEncode for TestAddress<'a> {
     }
 }
 
-impl<'a, Api> CodecFrom<TestAddress<'a>> for ManagedAddress<Api> where Api: ManagedTypeApi {}
 impl<'a, Api> TypeAbiFrom<TestAddress<'a>> for ManagedAddress<Api> where Api: ManagedTypeApi {}
 
 #[cfg(test)]
diff --git a/framework/base/src/types/interaction/expr/test_sc_address.rs b/framework/base/src/types/interaction/expr/test_sc_address.rs
index c752777bfa..9059df1b88 100644
--- a/framework/base/src/types/interaction/expr/test_sc_address.rs
+++ b/framework/base/src/types/interaction/expr/test_sc_address.rs
@@ -1,6 +1,6 @@
 use core::ptr;
 
-use multiversx_sc_codec::{CodecFrom, EncodeErrorHandler, TopEncode, TopEncodeOutput};
+use multiversx_sc_codec::{EncodeErrorHandler, TopEncode, TopEncodeOutput};
 
 use crate::{
     abi::TypeAbiFrom,
@@ -105,7 +105,6 @@ impl<'a> TopEncode for TestSCAddress<'a> {
     }
 }
 
-impl<'a, Api> CodecFrom<TestSCAddress<'a>> for ManagedAddress<Api> where Api: ManagedTypeApi {}
 impl<'a, Api> TypeAbiFrom<TestSCAddress<'a>> for ManagedAddress<Api> where Api: ManagedTypeApi {}
 
 #[cfg(test)]
diff --git a/framework/base/src/types/interaction/expr/test_token_identifier.rs b/framework/base/src/types/interaction/expr/test_token_identifier.rs
index 1230a15664..47568b37ba 100644
--- a/framework/base/src/types/interaction/expr/test_token_identifier.rs
+++ b/framework/base/src/types/interaction/expr/test_token_identifier.rs
@@ -1,4 +1,4 @@
-use multiversx_sc_codec::{CodecFrom, EncodeErrorHandler, TopEncode, TopEncodeOutput};
+use multiversx_sc_codec::{EncodeErrorHandler, TopEncode, TopEncodeOutput};
 
 use crate::{
     abi::TypeAbiFrom,
@@ -62,6 +62,5 @@ impl<'a> TopEncode for TestTokenIdentifier<'a> {
     }
 }
 
-impl<'a, Api> CodecFrom<TestTokenIdentifier<'a>> for TokenIdentifier<Api> where Api: ManagedTypeApi {}
 impl<'a, Api> TypeAbiFrom<TestTokenIdentifier<'a>> for TokenIdentifier<Api> where Api: ManagedTypeApi
 {}
diff --git a/framework/base/src/types/interaction/markers/esdt_system_sc_address.rs b/framework/base/src/types/interaction/markers/esdt_system_sc_address.rs
index 0cfe2e5588..b7b646ae16 100644
--- a/framework/base/src/types/interaction/markers/esdt_system_sc_address.rs
+++ b/framework/base/src/types/interaction/markers/esdt_system_sc_address.rs
@@ -1,5 +1,5 @@
 use hex_literal::hex;
-use multiversx_sc_codec::{CodecFrom, EncodeErrorHandler, TopEncode, TopEncodeOutput};
+use multiversx_sc_codec::{EncodeErrorHandler, TopEncode, TopEncodeOutput};
 
 use crate::{
     abi::TypeAbiFrom,
@@ -61,7 +61,6 @@ impl TopEncode for ESDTSystemSCAddress {
     }
 }
 
-impl<M> CodecFrom<ESDTSystemSCAddress> for ManagedAddress<M> where M: ManagedTypeApi {}
 impl<M> TypeAbiFrom<ESDTSystemSCAddress> for ManagedAddress<M> where M: ManagedTypeApi {}
 
 impl core::fmt::Display for ESDTSystemSCAddress {
diff --git a/framework/base/src/types/io/operation_completion_status.rs b/framework/base/src/types/io/operation_completion_status.rs
index b1da830356..95fc52f2ed 100644
--- a/framework/base/src/types/io/operation_completion_status.rs
+++ b/framework/base/src/types/io/operation_completion_status.rs
@@ -8,7 +8,7 @@ use crate::{
         TypeDescriptionContainer, TypeName,
     },
     api::ManagedTypeApi,
-    codec::{CodecFrom, EncodeErrorHandler},
+    codec::EncodeErrorHandler,
     types::ManagedBuffer,
 };
 
@@ -73,10 +73,6 @@ impl TopDecode for OperationCompletionStatus {
     }
 }
 
-impl<M: ManagedTypeApi> CodecFrom<OperationCompletionStatus> for ManagedBuffer<M> {}
-impl CodecFrom<OperationCompletionStatus> for crate::types::heap::BoxedBytes {}
-impl CodecFrom<OperationCompletionStatus> for crate::types::heap::Vec<u8> {}
-
 impl<M: ManagedTypeApi> TypeAbiFrom<OperationCompletionStatus> for ManagedBuffer<M> {}
 impl TypeAbiFrom<OperationCompletionStatus> for crate::types::heap::BoxedBytes {}
 impl TypeAbiFrom<OperationCompletionStatus> for crate::types::heap::Vec<u8> {}
diff --git a/framework/base/src/types/managed/basic/big_float.rs b/framework/base/src/types/managed/basic/big_float.rs
index dd8a04b080..9723b96eac 100644
--- a/framework/base/src/types/managed/basic/big_float.rs
+++ b/framework/base/src/types/managed/basic/big_float.rs
@@ -10,9 +10,8 @@ use crate::{
 use alloc::string::String;
 
 use crate::codec::{
-    CodecFromSelf, DecodeErrorHandler, EncodeErrorHandler, NestedDecode, NestedDecodeInput,
-    NestedEncode, NestedEncodeOutput, TopDecode, TopDecodeInput, TopEncode, TopEncodeOutput,
-    TryStaticCast,
+    DecodeErrorHandler, EncodeErrorHandler, NestedDecode, NestedDecodeInput, NestedEncode,
+    NestedEncodeOutput, TopDecode, TopDecodeInput, TopEncode, TopEncodeOutput, TryStaticCast,
 };
 
 #[derive(Debug)]
@@ -93,8 +92,6 @@ big_float_conv_num! {isize}
 big_float_conv_num! {i16}
 big_float_conv_num! {i8}
 
-impl<M> CodecFromSelf for BigFloat<M> where M: ManagedTypeApi {}
-
 impl<M: ManagedTypeApi> BigFloat<M> {
     #[inline]
     pub fn neg(&self) -> Self {
diff --git a/framework/base/src/types/managed/basic/big_int.rs b/framework/base/src/types/managed/basic/big_int.rs
index b73fbab6fa..7f84593f2b 100644
--- a/framework/base/src/types/managed/basic/big_int.rs
+++ b/framework/base/src/types/managed/basic/big_int.rs
@@ -7,9 +7,8 @@ use crate::{
         ManagedTypeApi, ManagedTypeApiImpl, RawHandle, StaticVarApiImpl,
     },
     codec::{
-        CodecFrom, CodecFromSelf, DecodeErrorHandler, EncodeErrorHandler, NestedDecode,
-        NestedDecodeInput, NestedEncode, NestedEncodeOutput, TopDecode, TopDecodeInput, TopEncode,
-        TopEncodeOutput, TryStaticCast,
+        DecodeErrorHandler, EncodeErrorHandler, NestedDecode, NestedDecodeInput, NestedEncode,
+        NestedEncodeOutput, TopDecode, TopDecodeInput, TopEncode, TopEncodeOutput, TryStaticCast,
     },
     formatter::{hex_util::encode_bytes_as_hex, FormatByteReceiver, SCDisplay},
     types::{heap::BoxedBytes, BigUint, ManagedBuffer, ManagedOption, ManagedType, Sign},
@@ -100,9 +99,6 @@ macro_rules! big_int_conv_num {
             }
         }
 
-        impl<M: ManagedTypeApi> CodecFrom<$num_ty> for BigInt<M> {}
-        impl<M: ManagedTypeApi> CodecFrom<&$num_ty> for BigInt<M> {}
-
         impl<M: ManagedTypeApi> TypeAbiFrom<$num_ty> for BigInt<M> {}
         impl<M: ManagedTypeApi> TypeAbiFrom<&$num_ty> for BigInt<M> {}
     };
@@ -115,12 +111,29 @@ big_int_conv_num! {isize}
 big_int_conv_num! {i16}
 big_int_conv_num! {i8}
 
-impl<M> CodecFromSelf for BigInt<M> where M: ManagedTypeApi {}
-
 #[cfg(feature = "num-bigint")]
-impl<M: ManagedTypeApi> CodecFrom<crate::codec::num_bigint::BigInt> for BigInt<M> {}
+impl<M: ManagedTypeApi> TypeAbiFrom<crate::codec::num_bigint::BigInt> for BigInt<M> {}
 #[cfg(feature = "num-bigint")]
-impl<M: ManagedTypeApi> CodecFrom<BigInt<M>> for crate::codec::num_bigint::BigInt {}
+impl<M: ManagedTypeApi> TypeAbiFrom<BigInt<M>> for crate::codec::num_bigint::BigInt {}
+
+impl<M> TypeAbiFrom<Self> for BigInt<M> where M: ManagedTypeApi {}
+impl<M> TypeAbiFrom<&Self> for BigInt<M> where M: ManagedTypeApi {}
+
+impl<M: ManagedTypeApi> crate::abi::TypeAbi for BigInt<M> {
+    #[cfg(feature = "num-bigint")]
+    type Unmanaged = crate::codec::num_bigint::BigInt;
+
+    #[cfg(not(feature = "num-bigint"))]
+    type Unmanaged = Self;
+
+    fn type_name() -> TypeName {
+        TypeName::from("BigInt")
+    }
+
+    fn type_name_rust() -> TypeName {
+        TypeName::from("BigInt<$API>")
+    }
+}
 
 #[cfg(feature = "num-bigint")]
 impl<M: ManagedTypeApi> From<&crate::codec::num_bigint::BigInt> for BigInt<M> {
@@ -302,30 +315,6 @@ impl<M: ManagedTypeApi> TopDecode for BigInt<M> {
     }
 }
 
-#[cfg(feature = "num-bigint")]
-impl<M: ManagedTypeApi> TypeAbiFrom<crate::codec::num_bigint::BigInt> for BigInt<M> {}
-#[cfg(feature = "num-bigint")]
-impl<M: ManagedTypeApi> TypeAbiFrom<BigInt<M>> for crate::codec::num_bigint::BigInt {}
-
-impl<M> TypeAbiFrom<Self> for BigInt<M> where M: ManagedTypeApi {}
-impl<M> TypeAbiFrom<&Self> for BigInt<M> where M: ManagedTypeApi {}
-
-impl<M: ManagedTypeApi> crate::abi::TypeAbi for BigInt<M> {
-    #[cfg(feature = "num-bigint")]
-    type Unmanaged = crate::codec::num_bigint::BigInt;
-
-    #[cfg(not(feature = "num-bigint"))]
-    type Unmanaged = Self;
-
-    fn type_name() -> TypeName {
-        TypeName::from("BigInt")
-    }
-
-    fn type_name_rust() -> TypeName {
-        TypeName::from("BigInt<$API>")
-    }
-}
-
 impl<M: ManagedTypeApi> BigInt<M> {
     #[must_use]
     pub fn pow(&self, exp: u32) -> Self {
diff --git a/framework/base/src/types/managed/basic/big_uint.rs b/framework/base/src/types/managed/basic/big_uint.rs
index 34a6c6df23..9575e37fd6 100644
--- a/framework/base/src/types/managed/basic/big_uint.rs
+++ b/framework/base/src/types/managed/basic/big_uint.rs
@@ -7,9 +7,8 @@ use crate::{
         ManagedTypeApi, ManagedTypeApiImpl, RawHandle, StaticVarApiImpl,
     },
     codec::{
-        CodecFrom, CodecFromSelf, DecodeErrorHandler, EncodeErrorHandler, NestedDecode,
-        NestedDecodeInput, NestedEncode, NestedEncodeOutput, TopDecode, TopDecodeInput, TopEncode,
-        TopEncodeOutput, TryStaticCast,
+        DecodeErrorHandler, EncodeErrorHandler, NestedDecode, NestedDecodeInput, NestedEncode,
+        NestedEncodeOutput, TopDecode, TopDecodeInput, TopEncode, TopEncodeOutput, TryStaticCast,
     },
     formatter::{hex_util::encode_bytes_as_hex, FormatBuffer, FormatByteReceiver, SCDisplay},
     types::{heap::BoxedBytes, ManagedBuffer, ManagedBufferCachedBuilder, ManagedType},
@@ -94,7 +93,6 @@ macro_rules! big_uint_conv_num {
             }
         }
 
-        impl<M: ManagedTypeApi> CodecFrom<$num_ty> for BigUint<M> {}
         impl<M: ManagedTypeApi> TypeAbiFrom<$num_ty> for BigUint<M> {}
     };
 }
@@ -105,18 +103,30 @@ big_uint_conv_num! {usize}
 big_uint_conv_num! {u16}
 big_uint_conv_num! {u8}
 
-impl<M> CodecFromSelf for BigUint<M> where M: ManagedTypeApi {}
-
-#[cfg(feature = "num-bigint")]
-impl<M: ManagedTypeApi> CodecFrom<crate::codec::num_bigint::BigUint> for BigUint<M> {}
-#[cfg(feature = "num-bigint")]
-impl<M: ManagedTypeApi> CodecFrom<BigUint<M>> for crate::codec::num_bigint::BigUint {}
-
 #[cfg(feature = "num-bigint")]
 impl<M: ManagedTypeApi> TypeAbiFrom<crate::codec::num_bigint::BigUint> for BigUint<M> {}
 #[cfg(feature = "num-bigint")]
 impl<M: ManagedTypeApi> TypeAbiFrom<BigUint<M>> for crate::codec::num_bigint::BigUint {}
 
+impl<M> TypeAbiFrom<Self> for BigUint<M> where M: ManagedTypeApi {}
+impl<M> TypeAbiFrom<&Self> for BigUint<M> where M: ManagedTypeApi {}
+
+impl<M: ManagedTypeApi> TypeAbi for BigUint<M> {
+    #[cfg(feature = "num-bigint")]
+    type Unmanaged = crate::codec::num_bigint::BigUint;
+
+    #[cfg(not(feature = "num-bigint"))]
+    type Unmanaged = Self;
+
+    fn type_name() -> TypeName {
+        TypeName::from("BigUint")
+    }
+
+    fn type_name_rust() -> TypeName {
+        TypeName::from("BigUint<$API>")
+    }
+}
+
 #[cfg(feature = "num-bigint")]
 impl<M: ManagedTypeApi> From<&crate::codec::num_bigint::BigUint> for BigUint<M> {
     fn from(alloc_big_uint: &crate::codec::num_bigint::BigUint) -> Self {
@@ -293,25 +303,6 @@ impl<M: ManagedTypeApi> TopDecode for BigUint<M> {
     }
 }
 
-impl<M> TypeAbiFrom<Self> for BigUint<M> where M: ManagedTypeApi {}
-impl<M> TypeAbiFrom<&Self> for BigUint<M> where M: ManagedTypeApi {}
-
-impl<M: ManagedTypeApi> TypeAbi for BigUint<M> {
-    #[cfg(feature = "num-bigint")]
-    type Unmanaged = crate::codec::num_bigint::BigUint;
-
-    #[cfg(not(feature = "num-bigint"))]
-    type Unmanaged = Self;
-
-    fn type_name() -> TypeName {
-        TypeName::from("BigUint")
-    }
-
-    fn type_name_rust() -> TypeName {
-        TypeName::from("BigUint<$API>")
-    }
-}
-
 impl<M: ManagedTypeApi> SCDisplay for BigUint<M> {
     fn fmt<F: FormatByteReceiver>(&self, f: &mut F) {
         let str_handle: M::ManagedBufferHandle = use_raw_handle(const_handles::MBUF_TEMPORARY_1);
diff --git a/framework/base/src/types/managed/basic/managed_buffer.rs b/framework/base/src/types/managed/basic/managed_buffer.rs
index 358444c445..d232776b2e 100644
--- a/framework/base/src/types/managed/basic/managed_buffer.rs
+++ b/framework/base/src/types/managed/basic/managed_buffer.rs
@@ -5,9 +5,9 @@ use crate::{
         ManagedTypeApi, StaticVarApiImpl,
     },
     codec::{
-        CodecFrom, CodecFromSelf, DecodeErrorHandler, Empty, EncodeErrorHandler, NestedDecode,
-        NestedDecodeInput, NestedEncode, NestedEncodeOutput, TopDecode, TopDecodeInput, TopEncode,
-        TopEncodeOutput, TryStaticCast,
+        DecodeErrorHandler, Empty, EncodeErrorHandler, NestedDecode, NestedDecodeInput,
+        NestedEncode, NestedEncodeOutput, TopDecode, TopDecodeInput, TopEncode, TopEncodeOutput,
+        TryStaticCast,
     },
     formatter::{
         hex_util::encode_bytes_as_hex, FormatBuffer, FormatByteReceiver, SCBinary, SCDisplay,
@@ -413,23 +413,12 @@ impl<M: ManagedTypeApi> TopEncode for ManagedBuffer<M> {
     }
 }
 
-impl<M> CodecFromSelf for ManagedBuffer<M> where M: ManagedTypeApi {}
-
-impl<M> CodecFrom<&[u8]> for ManagedBuffer<M> where M: ManagedTypeApi {}
-impl<M> CodecFrom<&str> for ManagedBuffer<M> where M: ManagedTypeApi {}
-impl<M, const N: usize> CodecFrom<&[u8; N]> for ManagedBuffer<M> where M: ManagedTypeApi {}
-
 impl<M> TypeAbiFrom<&[u8]> for ManagedBuffer<M> where M: ManagedTypeApi {}
 impl<M> TypeAbiFrom<&str> for ManagedBuffer<M> where M: ManagedTypeApi {}
 impl<M, const N: usize> TypeAbiFrom<&[u8; N]> for ManagedBuffer<M> where M: ManagedTypeApi {}
 
 macro_rules! managed_buffer_codec_from_impl_bi_di {
     ($other_ty:ty) => {
-        impl<M: ManagedTypeApi> CodecFrom<$other_ty> for ManagedBuffer<M> {}
-        impl<M: ManagedTypeApi> CodecFrom<&$other_ty> for ManagedBuffer<M> {}
-        impl<M: ManagedTypeApi> CodecFrom<ManagedBuffer<M>> for $other_ty {}
-        impl<M: ManagedTypeApi> CodecFrom<&ManagedBuffer<M>> for $other_ty {}
-
         impl<M: ManagedTypeApi> TypeAbiFrom<$other_ty> for ManagedBuffer<M> {}
         impl<M: ManagedTypeApi> TypeAbiFrom<&$other_ty> for ManagedBuffer<M> {}
         impl<M: ManagedTypeApi> TypeAbiFrom<ManagedBuffer<M>> for $other_ty {}
diff --git a/framework/base/src/types/managed/multi_value/multi_value_encoded.rs b/framework/base/src/types/managed/multi_value/multi_value_encoded.rs
index 86b9d5334f..18a9498da4 100644
--- a/framework/base/src/types/managed/multi_value/multi_value_encoded.rs
+++ b/framework/base/src/types/managed/multi_value/multi_value_encoded.rs
@@ -4,7 +4,7 @@ use crate::{
     abi::{TypeAbi, TypeAbiFrom, TypeDescriptionContainer, TypeName},
     api::{ErrorApi, ManagedTypeApi},
     codec::{
-        try_cast_execute_or_else, CodecFromSelf, DecodeErrorHandler, EncodeErrorHandler, TopDecode,
+        try_cast_execute_or_else, DecodeErrorHandler, EncodeErrorHandler, TopDecode,
         TopDecodeMulti, TopDecodeMultiInput, TopDecodeMultiLength, TopEncode, TopEncodeMulti,
         TopEncodeMultiOutput,
     },
@@ -263,19 +263,8 @@ where
     }
 }
 
-impl<M, T> CodecFromSelf for MultiValueEncoded<M, T> where M: ManagedTypeApi {}
-
-#[cfg(feature = "alloc")]
-use crate::codec::{multi_types::MultiValueVec, CodecFrom};
-
 #[cfg(feature = "alloc")]
-impl<M, T, U> CodecFrom<MultiValueVec<T>> for MultiValueEncoded<M, U>
-where
-    M: ManagedTypeApi + ErrorApi,
-    T: TopEncodeMulti,
-    U: CodecFrom<T>,
-{
-}
+use crate::codec::multi_types::MultiValueVec;
 
 #[cfg(feature = "alloc")]
 impl<M, T, U> TypeAbiFrom<MultiValueVec<T>> for MultiValueEncoded<M, U>
@@ -286,15 +275,6 @@ where
 {
 }
 
-#[cfg(feature = "alloc")]
-impl<M, T, U> CodecFrom<MultiValueEncoded<M, T>> for MultiValueVec<U>
-where
-    M: ManagedTypeApi + ErrorApi,
-    T: TopEncodeMulti,
-    U: CodecFrom<T>,
-{
-}
-
 #[cfg(feature = "alloc")]
 impl<M, T, U> TypeAbiFrom<MultiValueEncoded<M, T>> for MultiValueVec<U>
 where
diff --git a/framework/base/src/types/managed/wrapped/egld_or_esdt_token_identifier.rs b/framework/base/src/types/managed/wrapped/egld_or_esdt_token_identifier.rs
index 8fa90f8186..557e4ce84a 100644
--- a/framework/base/src/types/managed/wrapped/egld_or_esdt_token_identifier.rs
+++ b/framework/base/src/types/managed/wrapped/egld_or_esdt_token_identifier.rs
@@ -206,13 +206,6 @@ impl<M: ManagedTypeApi> TopDecode for EgldOrEsdtTokenIdentifier<M> {
     }
 }
 
-impl<M> CodecFromSelf for EgldOrEsdtTokenIdentifier<M> where M: ManagedTypeApi {}
-
-impl<M> CodecFrom<TokenIdentifier<M>> for EgldOrEsdtTokenIdentifier<M> where M: ManagedTypeApi {}
-impl<M> CodecFrom<&TokenIdentifier<M>> for EgldOrEsdtTokenIdentifier<M> where M: ManagedTypeApi {}
-impl<M> CodecFrom<&[u8]> for EgldOrEsdtTokenIdentifier<M> where M: ManagedTypeApi {}
-impl<M> CodecFrom<&str> for EgldOrEsdtTokenIdentifier<M> where M: ManagedTypeApi {}
-
 impl<M> TypeAbiFrom<TokenIdentifier<M>> for EgldOrEsdtTokenIdentifier<M> where M: ManagedTypeApi {}
 impl<M> TypeAbiFrom<&TokenIdentifier<M>> for EgldOrEsdtTokenIdentifier<M> where M: ManagedTypeApi {}
 impl<M> TypeAbiFrom<&[u8]> for EgldOrEsdtTokenIdentifier<M> where M: ManagedTypeApi {}
diff --git a/framework/base/src/types/managed/wrapped/egld_or_esdt_token_payment.rs b/framework/base/src/types/managed/wrapped/egld_or_esdt_token_payment.rs
index ffce0c44e7..d896fa3058 100644
--- a/framework/base/src/types/managed/wrapped/egld_or_esdt_token_payment.rs
+++ b/framework/base/src/types/managed/wrapped/egld_or_esdt_token_payment.rs
@@ -1,4 +1,5 @@
 use crate::{
+    abi::TypeAbiFrom,
     api::ManagedTypeApi,
     types::{BigUint, EgldOrEsdtTokenIdentifier},
 };
@@ -6,7 +7,6 @@ use crate::{
 use crate::codec::{
     self,
     derive::{NestedDecode, NestedEncode, TopDecode, TopEncode},
-    CodecFrom, CodecFromSelf,
 };
 
 use crate as multiversx_sc; // needed by the TypeAbi generated code
@@ -126,9 +126,7 @@ impl<M: ManagedTypeApi> From<EsdtTokenPayment<M>> for EgldOrEsdtTokenPayment<M>
     }
 }
 
-impl<M> CodecFromSelf for EgldOrEsdtTokenPayment<M> where M: ManagedTypeApi {}
-
-impl<M> CodecFrom<&[u8]> for EgldOrEsdtTokenPayment<M> where M: ManagedTypeApi {}
+impl<M> TypeAbiFrom<&[u8]> for EgldOrEsdtTokenPayment<M> where M: ManagedTypeApi {}
 
 impl<M: ManagedTypeApi> EgldOrEsdtTokenPayment<M> {
     pub fn as_refs(&self) -> EgldOrEsdtTokenPaymentRefs<'_, M> {
diff --git a/framework/base/src/types/managed/wrapped/egld_or_multi_esdt_payment.rs b/framework/base/src/types/managed/wrapped/egld_or_multi_esdt_payment.rs
index 838fc278a4..4c3187e3c9 100644
--- a/framework/base/src/types/managed/wrapped/egld_or_multi_esdt_payment.rs
+++ b/framework/base/src/types/managed/wrapped/egld_or_multi_esdt_payment.rs
@@ -4,7 +4,6 @@ use crate::{
     codec::{
         self,
         derive::{NestedDecode, NestedEncode, TopDecode, TopEncode},
-        CodecFromSelf,
     },
     types::BigUint,
 };
@@ -23,8 +22,6 @@ pub enum EgldOrMultiEsdtPayment<M: ManagedTypeApi> {
     MultiEsdt(ManagedVec<M, EsdtTokenPayment<M>>),
 }
 
-impl<M> CodecFromSelf for EgldOrMultiEsdtPayment<M> where M: ManagedTypeApi {}
-
 impl<M: ManagedTypeApi> EgldOrMultiEsdtPayment<M> {
     pub fn is_empty(&self) -> bool {
         match self {
diff --git a/framework/base/src/types/managed/wrapped/managed_address.rs b/framework/base/src/types/managed/wrapped/managed_address.rs
index 318e5940ce..bb5db20bc6 100644
--- a/framework/base/src/types/managed/wrapped/managed_address.rs
+++ b/framework/base/src/types/managed/wrapped/managed_address.rs
@@ -4,9 +4,9 @@ use crate::{
     abi::{TypeAbi, TypeAbiFrom, TypeName},
     api::ManagedTypeApi,
     codec::{
-        CodecFrom, CodecFromSelf, DecodeError, DecodeErrorHandler, EncodeErrorHandler,
-        NestedDecode, NestedDecodeInput, NestedEncode, NestedEncodeOutput, TopDecode,
-        TopDecodeInput, TopEncode, TopEncodeOutput, TryStaticCast,
+        DecodeError, DecodeErrorHandler, EncodeErrorHandler, NestedDecode, NestedDecodeInput,
+        NestedEncode, NestedEncodeOutput, TopDecode, TopDecodeInput, TopEncode, TopEncodeOutput,
+        TryStaticCast,
     },
     formatter::{hex_util::encode_bytes_as_hex, FormatByteReceiver, SCLowerHex},
     types::{heap::Address, ManagedBuffer, ManagedByteArray, ManagedType},
@@ -278,23 +278,8 @@ impl<M: ManagedTypeApi> core::fmt::Debug for ManagedAddress<M> {
     }
 }
 
-impl<M> CodecFromSelf for ManagedAddress<M> where M: ManagedTypeApi {}
-
-impl<M> CodecFrom<[u8; 32]> for ManagedAddress<M> where M: ManagedTypeApi {}
 impl<M> TypeAbiFrom<[u8; 32]> for ManagedAddress<M> where M: ManagedTypeApi {}
 
-#[cfg(feature = "alloc")]
-impl<M> CodecFrom<Address> for ManagedAddress<M> where M: ManagedTypeApi {}
-
-#[cfg(feature = "alloc")]
-impl<M> CodecFrom<&Address> for ManagedAddress<M> where M: ManagedTypeApi {}
-
-#[cfg(feature = "alloc")]
-impl<M> CodecFrom<ManagedAddress<M>> for Address where M: ManagedTypeApi {}
-
-#[cfg(feature = "alloc")]
-impl<M> CodecFrom<&ManagedAddress<M>> for Address where M: ManagedTypeApi {}
-
 #[cfg(feature = "alloc")]
 impl<M> TypeAbiFrom<Address> for ManagedAddress<M> where M: ManagedTypeApi {}
 
diff --git a/framework/base/src/types/managed/wrapped/token_identifier.rs b/framework/base/src/types/managed/wrapped/token_identifier.rs
index f4c978b0d1..f8ae1a6984 100644
--- a/framework/base/src/types/managed/wrapped/token_identifier.rs
+++ b/framework/base/src/types/managed/wrapped/token_identifier.rs
@@ -162,11 +162,6 @@ impl<M: ManagedTypeApi> TopDecode for TokenIdentifier<M> {
     }
 }
 
-impl<M> CodecFromSelf for TokenIdentifier<M> where M: ManagedTypeApi {}
-
-impl<M> CodecFrom<&[u8]> for TokenIdentifier<M> where M: ManagedTypeApi {}
-impl<M> CodecFrom<Vec<u8>> for TokenIdentifier<M> where M: ManagedTypeApi {}
-
 impl<M> TypeAbiFrom<&[u8]> for TokenIdentifier<M> where M: ManagedTypeApi {}
 impl<M> TypeAbiFrom<Vec<u8>> for TokenIdentifier<M> where M: ManagedTypeApi {}
 
diff --git a/framework/scenario/src/facade/contract_info.rs b/framework/scenario/src/facade/contract_info.rs
index e7b4dd0190..73b0f4935c 100644
--- a/framework/scenario/src/facade/contract_info.rs
+++ b/framework/scenario/src/facade/contract_info.rs
@@ -1,5 +1,3 @@
-#![allow(deprecated)] // TODO: remove after deleting CodecFrom
-
 use std::ops::{Deref, DerefMut};
 
 use multiversx_sc::{
@@ -9,7 +7,7 @@ use multiversx_sc::{
 
 use crate::multiversx_sc::{
     api::ManagedTypeApi,
-    codec::{CodecFrom, EncodeErrorHandler, TopEncode, TopEncodeOutput},
+    codec::{EncodeErrorHandler, TopEncode, TopEncodeOutput},
     contract_base::ProxyObjNew,
     types::{Address, ManagedAddress},
 };
@@ -106,11 +104,6 @@ impl<P: ProxyObjNew> TopEncode for ContractInfo<P> {
     }
 }
 
-impl<P: ProxyObjNew> CodecFrom<ContractInfo<P>> for Address {}
-impl<P: ProxyObjNew> CodecFrom<&ContractInfo<P>> for Address {}
-impl<M: ManagedTypeApi, P: ProxyObjNew> CodecFrom<ContractInfo<P>> for ManagedAddress<M> {}
-impl<M: ManagedTypeApi, P: ProxyObjNew> CodecFrom<&ContractInfo<P>> for ManagedAddress<M> {}
-
 impl<P: ProxyObjNew> TypeAbiFrom<ContractInfo<P>> for Address {}
 impl<P: ProxyObjNew> TypeAbiFrom<&ContractInfo<P>> for Address {}
 impl<M: ManagedTypeApi, P: ProxyObjNew> TypeAbiFrom<ContractInfo<P>> for ManagedAddress<M> {}
diff --git a/framework/scenario/src/facade/expr/bech32_address.rs b/framework/scenario/src/facade/expr/bech32_address.rs
index 76fca96c86..d07cf207e0 100644
--- a/framework/scenario/src/facade/expr/bech32_address.rs
+++ b/framework/scenario/src/facade/expr/bech32_address.rs
@@ -178,11 +178,6 @@ impl TopDecode for Bech32Address {
     }
 }
 
-#[allow(deprecated)]
-impl<M> CodecFrom<Bech32Address> for ManagedAddress<M> where M: ManagedTypeApi {}
-#[allow(deprecated)]
-impl<M> CodecFrom<&Bech32Address> for ManagedAddress<M> where M: ManagedTypeApi {}
-
 impl<M> TypeAbiFrom<Bech32Address> for ManagedAddress<M> where M: ManagedTypeApi {}
 impl<M> TypeAbiFrom<&Bech32Address> for ManagedAddress<M> where M: ManagedTypeApi {}
 

From 0ab784e81b20f4ba95ce6ad18bcd155d2a2dfcdc Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Tue, 7 May 2024 21:33:39 +0300
Subject: [PATCH 0838/1254] remove lang_items - add abort panic in profile dev
 in .toml wasm

---
 contracts/examples/adder/wasm/Cargo.lock      |  8 +++++++
 contracts/examples/adder/wasm/Cargo.toml      |  3 +++
 contracts/examples/adder/wasm/src/lib.rs      |  2 --
 .../bonding-curve-contract/wasm/Cargo.lock    |  8 +++++++
 .../bonding-curve-contract/wasm/Cargo.toml    |  3 +++
 .../bonding-curve-contract/wasm/src/lib.rs    |  2 --
 .../examples/check-pause/wasm/Cargo.lock      |  8 +++++++
 .../examples/check-pause/wasm/Cargo.toml      |  3 +++
 .../examples/check-pause/wasm/src/lib.rs      |  2 --
 .../crowdfunding-esdt/wasm/Cargo.lock         |  8 +++++++
 .../crowdfunding-esdt/wasm/Cargo.toml         |  3 +++
 .../crowdfunding-esdt/wasm/src/lib.rs         |  2 --
 .../examples/crypto-bubbles/wasm/Cargo.lock   |  8 +++++++
 .../examples/crypto-bubbles/wasm/Cargo.toml   |  3 +++
 .../examples/crypto-bubbles/wasm/src/lib.rs   |  2 --
 .../kitty-auction/wasm/Cargo.lock             |  8 +++++++
 .../kitty-auction/wasm/Cargo.toml             |  3 +++
 .../kitty-auction/wasm/src/lib.rs             |  2 --
 .../kitty-genetic-alg/wasm/Cargo.lock         |  8 +++++++
 .../kitty-genetic-alg/wasm/Cargo.toml         |  3 +++
 .../kitty-genetic-alg/wasm/src/lib.rs         |  2 --
 .../kitty-ownership/wasm/Cargo.lock           |  8 +++++++
 .../kitty-ownership/wasm/Cargo.toml           |  3 +++
 .../kitty-ownership/wasm/src/lib.rs           |  2 --
 .../examples/crypto-zombies/wasm/Cargo.lock   | 24 +++++++------------
 .../examples/crypto-zombies/wasm/Cargo.toml   |  3 +++
 .../examples/crypto-zombies/wasm/src/lib.rs   |  2 --
 .../examples/digital-cash/wasm/Cargo.lock     |  8 +++++++
 .../examples/digital-cash/wasm/Cargo.toml     |  3 +++
 .../examples/digital-cash/wasm/src/lib.rs     |  2 --
 contracts/examples/empty/wasm/Cargo.lock      |  8 +++++++
 contracts/examples/empty/wasm/Cargo.toml      |  3 +++
 contracts/examples/empty/wasm/src/lib.rs      |  2 --
 .../esdt-transfer-with-fee/wasm/Cargo.lock    |  8 +++++++
 .../esdt-transfer-with-fee/wasm/Cargo.toml    |  3 +++
 .../esdt-transfer-with-fee/wasm/src/lib.rs    |  2 --
 contracts/examples/factorial/wasm/Cargo.lock  |  8 +++++++
 contracts/examples/factorial/wasm/Cargo.toml  |  3 +++
 contracts/examples/factorial/wasm/src/lib.rs  |  2 --
 .../examples/fractional-nfts/wasm/Cargo.lock  |  8 +++++++
 .../examples/fractional-nfts/wasm/Cargo.toml  |  3 +++
 .../examples/fractional-nfts/wasm/src/lib.rs  |  2 --
 .../examples/lottery-esdt/wasm/Cargo.lock     |  8 +++++++
 .../examples/lottery-esdt/wasm/Cargo.toml     |  3 +++
 .../examples/lottery-esdt/wasm/src/lib.rs     |  2 --
 .../multisig/wasm-multisig-full/Cargo.lock    |  8 +++++++
 .../multisig/wasm-multisig-full/Cargo.toml    |  3 +++
 .../multisig/wasm-multisig-full/src/lib.rs    |  2 --
 .../multisig/wasm-multisig-view/Cargo.lock    |  8 +++++++
 .../multisig/wasm-multisig-view/Cargo.toml    |  3 +++
 .../multisig/wasm-multisig-view/src/lib.rs    |  2 --
 contracts/examples/multisig/wasm/Cargo.lock   |  8 +++++++
 contracts/examples/multisig/wasm/Cargo.toml   |  3 +++
 contracts/examples/multisig/wasm/src/lib.rs   |  2 --
 contracts/examples/nft-minter/wasm/Cargo.lock |  8 +++++++
 contracts/examples/nft-minter/wasm/Cargo.toml |  3 +++
 contracts/examples/nft-minter/wasm/src/lib.rs |  2 --
 .../nft-storage-prepay/wasm/Cargo.lock        |  8 +++++++
 .../nft-storage-prepay/wasm/Cargo.toml        |  3 +++
 .../nft-storage-prepay/wasm/src/lib.rs        |  2 --
 .../examples/nft-subscription/wasm/Cargo.lock |  8 +++++++
 .../examples/nft-subscription/wasm/Cargo.toml |  3 +++
 .../examples/nft-subscription/wasm/src/lib.rs |  2 --
 .../order-book/factory/wasm/Cargo.lock        |  8 +++++++
 .../order-book/factory/wasm/Cargo.toml        |  3 +++
 .../order-book/factory/wasm/src/lib.rs        |  2 --
 .../examples/order-book/pair/wasm/Cargo.lock  |  8 +++++++
 .../examples/order-book/pair/wasm/Cargo.toml  |  3 +++
 .../examples/order-book/pair/wasm/src/lib.rs  |  2 --
 .../examples/ping-pong-egld/wasm/Cargo.lock   |  8 +++++++
 .../examples/ping-pong-egld/wasm/Cargo.toml   |  3 +++
 .../examples/ping-pong-egld/wasm/src/lib.rs   |  2 --
 .../examples/proxy-pause/wasm/Cargo.lock      |  8 +++++++
 .../examples/proxy-pause/wasm/Cargo.toml      |  3 +++
 .../examples/proxy-pause/wasm/src/lib.rs      |  2 --
 .../rewards-distribution/wasm/Cargo.lock      |  8 +++++++
 .../rewards-distribution/wasm/Cargo.toml      |  3 +++
 .../rewards-distribution/wasm/src/lib.rs      |  2 --
 .../examples/seed-nft-minter/wasm/Cargo.lock  |  8 +++++++
 .../examples/seed-nft-minter/wasm/Cargo.toml  |  3 +++
 .../examples/seed-nft-minter/wasm/src/lib.rs  |  2 --
 .../examples/token-release/wasm/Cargo.lock    |  8 +++++++
 .../examples/token-release/wasm/Cargo.toml    |  3 +++
 .../examples/token-release/wasm/src/lib.rs    |  2 --
 .../abi-tester/wasm-abi-tester-ev/Cargo.lock  |  8 +++++++
 .../abi-tester/wasm-abi-tester-ev/Cargo.toml  |  3 +++
 .../abi-tester/wasm-abi-tester-ev/src/lib.rs  |  2 --
 .../feature-tests/abi-tester/wasm/Cargo.lock  |  8 +++++++
 .../feature-tests/abi-tester/wasm/Cargo.toml  |  3 +++
 .../feature-tests/abi-tester/wasm/src/lib.rs  |  2 --
 .../wasm-alloc-mem-fail/Cargo.lock            |  8 +++++++
 .../wasm-alloc-mem-fail/Cargo.toml            |  3 +++
 .../wasm-alloc-mem-fail/src/lib.rs            |  2 --
 .../wasm-alloc-mem-leaking/Cargo.lock         |  8 +++++++
 .../wasm-alloc-mem-leaking/Cargo.toml         |  3 +++
 .../wasm-alloc-mem-leaking/src/lib.rs         |  2 --
 .../alloc-features/wasm/Cargo.lock            |  8 +++++++
 .../alloc-features/wasm/Cargo.toml            |  3 +++
 .../alloc-features/wasm/src/lib.rs            |  2 --
 .../Cargo.lock                                |  8 +++++++
 .../Cargo.toml                                |  3 +++
 .../src/lib.rs                                |  2 --
 .../basic-features/wasm/Cargo.lock            |  8 +++++++
 .../basic-features/wasm/Cargo.toml            |  3 +++
 .../basic-features/wasm/src/lib.rs            |  2 --
 .../big-float-features/wasm/Cargo.lock        |  8 +++++++
 .../big-float-features/wasm/Cargo.toml        |  3 +++
 .../big-float-features/wasm/src/lib.rs        |  2 --
 .../builtin-func-features/wasm/Cargo.lock     |  8 +++++++
 .../builtin-func-features/wasm/Cargo.toml     |  3 +++
 .../builtin-func-features/wasm/src/lib.rs     |  2 --
 .../first-contract/wasm/Cargo.lock            |  8 +++++++
 .../first-contract/wasm/Cargo.toml            |  3 +++
 .../first-contract/wasm/src/lib.rs            |  2 --
 .../second-contract/wasm/Cargo.lock           |  8 +++++++
 .../second-contract/wasm/Cargo.toml           |  3 +++
 .../second-contract/wasm/src/lib.rs           |  2 --
 .../child/wasm/Cargo.lock                     |  8 +++++++
 .../child/wasm/Cargo.toml                     |  3 +++
 .../child/wasm/src/lib.rs                     |  2 --
 .../parent/wasm/Cargo.lock                    |  8 +++++++
 .../parent/wasm/Cargo.toml                    |  3 +++
 .../parent/wasm/src/lib.rs                    |  2 --
 .../forwarder-legacy/wasm/Cargo.lock          |  8 +++++++
 .../forwarder-legacy/wasm/Cargo.toml          |  3 +++
 .../forwarder-legacy/wasm/src/lib.rs          |  2 --
 .../wasm-forwarder-queue-promises/Cargo.lock  |  8 +++++++
 .../wasm-forwarder-queue-promises/Cargo.toml  |  3 +++
 .../wasm-forwarder-queue-promises/src/lib.rs  |  2 --
 .../forwarder-queue/wasm/Cargo.lock           |  8 +++++++
 .../forwarder-queue/wasm/Cargo.toml           |  3 +++
 .../forwarder-queue/wasm/src/lib.rs           |  2 --
 .../Cargo.lock                                |  8 +++++++
 .../Cargo.toml                                |  3 +++
 .../src/lib.rs                                |  2 --
 .../Cargo.lock                                |  8 +++++++
 .../Cargo.toml                                |  3 +++
 .../src/lib.rs                                |  2 --
 .../forwarder-raw/wasm/Cargo.lock             |  8 +++++++
 .../forwarder-raw/wasm/Cargo.toml             |  3 +++
 .../forwarder-raw/wasm/src/lib.rs             |  2 --
 .../composability/forwarder/wasm/Cargo.lock   |  8 +++++++
 .../composability/forwarder/wasm/Cargo.toml   |  3 +++
 .../composability/forwarder/wasm/src/lib.rs   |  2 --
 .../local-esdt-and-nft/wasm/Cargo.lock        |  8 +++++++
 .../local-esdt-and-nft/wasm/Cargo.toml        |  3 +++
 .../local-esdt-and-nft/wasm/src/lib.rs        |  2 --
 .../promises-features/wasm/Cargo.lock         |  8 +++++++
 .../promises-features/wasm/Cargo.toml         |  3 +++
 .../promises-features/wasm/src/lib.rs         |  2 --
 .../proxy-test-first/wasm/Cargo.lock          |  8 +++++++
 .../proxy-test-first/wasm/Cargo.toml          |  3 +++
 .../proxy-test-first/wasm/src/lib.rs          |  2 --
 .../proxy-test-second/wasm/Cargo.lock         |  8 +++++++
 .../proxy-test-second/wasm/Cargo.toml         |  3 +++
 .../proxy-test-second/wasm/src/lib.rs         |  2 --
 .../recursive-caller/wasm/Cargo.lock          |  8 +++++++
 .../recursive-caller/wasm/Cargo.toml          |  3 +++
 .../recursive-caller/wasm/src/lib.rs          |  2 --
 .../transfer-role-features/wasm/Cargo.lock    |  8 +++++++
 .../transfer-role-features/wasm/Cargo.toml    |  3 +++
 .../transfer-role-features/wasm/src/lib.rs    |  2 --
 .../vault/wasm-vault-promises/Cargo.lock      |  8 +++++++
 .../vault/wasm-vault-promises/Cargo.toml      |  3 +++
 .../vault/wasm-vault-promises/src/lib.rs      |  2 --
 .../vault/wasm-vault-upgrade/Cargo.lock       |  8 +++++++
 .../vault/wasm-vault-upgrade/Cargo.toml       |  3 +++
 .../vault/wasm-vault-upgrade/src/lib.rs       |  2 --
 .../composability/vault/wasm/Cargo.lock       |  8 +++++++
 .../composability/vault/wasm/Cargo.toml       |  3 +++
 .../composability/vault/wasm/src/lib.rs       |  2 --
 .../crowdfunding-erc20/wasm/Cargo.lock        |  8 +++++++
 .../crowdfunding-erc20/wasm/Cargo.toml        |  3 +++
 .../crowdfunding-erc20/wasm/src/lib.rs        |  2 --
 .../erc1155-marketplace/wasm/Cargo.lock       |  8 +++++++
 .../erc1155-marketplace/wasm/Cargo.toml       |  3 +++
 .../erc1155-marketplace/wasm/src/lib.rs       |  2 --
 .../erc1155-user-mock/wasm/Cargo.lock         |  8 +++++++
 .../erc1155-user-mock/wasm/Cargo.toml         |  3 +++
 .../erc1155-user-mock/wasm/src/lib.rs         |  2 --
 .../erc1155/wasm/Cargo.lock                   |  8 +++++++
 .../erc1155/wasm/Cargo.toml                   |  3 +++
 .../erc1155/wasm/src/lib.rs                   |  2 --
 .../erc-style-contracts/erc20/wasm/Cargo.lock |  8 +++++++
 .../erc-style-contracts/erc20/wasm/Cargo.toml |  3 +++
 .../erc-style-contracts/erc20/wasm/src/lib.rs |  2 --
 .../erc721/wasm/Cargo.lock                    |  8 +++++++
 .../erc721/wasm/Cargo.toml                    |  3 +++
 .../erc721/wasm/src/lib.rs                    |  2 --
 .../lottery-erc20/wasm/Cargo.lock             |  8 +++++++
 .../lottery-erc20/wasm/Cargo.toml             |  3 +++
 .../lottery-erc20/wasm/src/lib.rs             |  2 --
 .../esdt-system-sc-mock/wasm/Cargo.lock       |  8 +++++++
 .../esdt-system-sc-mock/wasm/Cargo.toml       |  3 +++
 .../esdt-system-sc-mock/wasm/src/lib.rs       |  2 --
 .../exchange-features/wasm/Cargo.lock         |  8 +++++++
 .../exchange-features/wasm/Cargo.toml         |  3 +++
 .../exchange-features/wasm/src/lib.rs         |  2 --
 .../wasm/Cargo.lock                           |  8 +++++++
 .../wasm/Cargo.toml                           |  3 +++
 .../wasm/src/lib.rs                           |  2 --
 .../managed-map-features/wasm/Cargo.lock      |  8 +++++++
 .../managed-map-features/wasm/Cargo.toml      |  3 +++
 .../managed-map-features/wasm/src/lib.rs      |  2 --
 .../wasm-multi-contract-alt-impl/Cargo.lock   |  8 +++++++
 .../wasm-multi-contract-alt-impl/Cargo.toml   |  3 +++
 .../wasm-multi-contract-alt-impl/src/lib.rs   |  2 --
 .../Cargo.lock                                |  8 +++++++
 .../Cargo.toml                                |  3 +++
 .../src/lib.rs                                |  2 --
 .../Cargo.lock                                |  8 +++++++
 .../Cargo.toml                                |  3 +++
 .../src/lib.rs                                |  2 --
 .../multi-contract-features/wasm/Cargo.lock   |  8 +++++++
 .../multi-contract-features/wasm/Cargo.toml   |  3 +++
 .../multi-contract-features/wasm/src/lib.rs   |  2 --
 .../panic-message-features/wasm/Cargo.lock    |  8 +++++++
 .../panic-message-features/wasm/Cargo.toml    |  3 +++
 .../panic-message-features/wasm/src/lib.rs    |  2 --
 .../payable-features/wasm/Cargo.lock          |  8 +++++++
 .../payable-features/wasm/Cargo.toml          |  3 +++
 .../payable-features/wasm/src/lib.rs          |  2 --
 .../wasm/Cargo.lock                           |  8 +++++++
 .../wasm/Cargo.toml                           |  3 +++
 .../wasm/src/lib.rs                           |  2 --
 .../wasm/Cargo.lock                           |  8 +++++++
 .../wasm/Cargo.toml                           |  3 +++
 .../wasm/src/lib.rs                           |  2 --
 .../scenario-tester/wasm/Cargo.lock           |  8 +++++++
 .../scenario-tester/wasm/Cargo.toml           |  3 +++
 .../scenario-tester/wasm/src/lib.rs           |  2 --
 .../wasm-use-module-view/Cargo.lock           |  8 +++++++
 .../wasm-use-module-view/Cargo.toml           |  3 +++
 .../wasm-use-module-view/src/lib.rs           |  2 --
 .../feature-tests/use-module/wasm/Cargo.lock  |  8 +++++++
 .../feature-tests/use-module/wasm/Cargo.toml  |  3 +++
 .../feature-tests/use-module/wasm/src/lib.rs  |  2 --
 framework/meta/src/cargo_toml_contents.rs     | 19 +++++++++++++++
 .../meta/src/cmd/contract/meta_config.rs      |  3 +++
 .../cmd/contract/sc_config/wasm_crate_gen.rs  |  5 +---
 framework/wasm-adapter/src/wasm_macros.rs     |  6 -----
 241 files changed, 892 insertions(+), 184 deletions(-)

diff --git a/contracts/examples/adder/wasm/Cargo.lock b/contracts/examples/adder/wasm/Cargo.lock
index 32d924124d..23067b448c 100755
--- a/contracts/examples/adder/wasm/Cargo.lock
+++ b/contracts/examples/adder/wasm/Cargo.lock
@@ -62,6 +62,7 @@ dependencies = [
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -70,6 +71,7 @@ version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -168,3 +170,9 @@ name = "unicode-ident"
 version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unwrap-infallible"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "151ac09978d3c2862c4e39b557f4eceee2cc72150bc4cb4f16abf061b6e381fb"
diff --git a/contracts/examples/adder/wasm/Cargo.toml b/contracts/examples/adder/wasm/Cargo.toml
index aafd60afd7..71a97ec561 100644
--- a/contracts/examples/adder/wasm/Cargo.toml
+++ b/contracts/examples/adder/wasm/Cargo.toml
@@ -21,6 +21,9 @@ debug = false
 panic = "abort"
 overflow-checks = false
 
+[profile.dev]
+panic = "abort"
+
 [dependencies.adder]
 path = ".."
 
diff --git a/contracts/examples/adder/wasm/src/lib.rs b/contracts/examples/adder/wasm/src/lib.rs
index f5f1d356c2..19ea33c7e1 100644
--- a/contracts/examples/adder/wasm/src/lib.rs
+++ b/contracts/examples/adder/wasm/src/lib.rs
@@ -11,8 +11,6 @@
 // Total number of exported functions:   5
 
 #![no_std]
-#![allow(internal_features)]
-#![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
 multiversx_sc_wasm_adapter::panic_handler!();
diff --git a/contracts/examples/bonding-curve-contract/wasm/Cargo.lock b/contracts/examples/bonding-curve-contract/wasm/Cargo.lock
index 1651cd25a5..97fff17f19 100644
--- a/contracts/examples/bonding-curve-contract/wasm/Cargo.lock
+++ b/contracts/examples/bonding-curve-contract/wasm/Cargo.lock
@@ -63,6 +63,7 @@ dependencies = [
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -71,6 +72,7 @@ version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -176,3 +178,9 @@ name = "unicode-ident"
 version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unwrap-infallible"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "151ac09978d3c2862c4e39b557f4eceee2cc72150bc4cb4f16abf061b6e381fb"
diff --git a/contracts/examples/bonding-curve-contract/wasm/Cargo.toml b/contracts/examples/bonding-curve-contract/wasm/Cargo.toml
index 0490cd4242..9b0f4d51d2 100644
--- a/contracts/examples/bonding-curve-contract/wasm/Cargo.toml
+++ b/contracts/examples/bonding-curve-contract/wasm/Cargo.toml
@@ -21,6 +21,9 @@ debug = false
 panic = "abort"
 overflow-checks = false
 
+[profile.dev]
+panic = "abort"
+
 [dependencies.bonding-curve-contract]
 path = ".."
 
diff --git a/contracts/examples/bonding-curve-contract/wasm/src/lib.rs b/contracts/examples/bonding-curve-contract/wasm/src/lib.rs
index ca35cf266b..9c9061f01f 100644
--- a/contracts/examples/bonding-curve-contract/wasm/src/lib.rs
+++ b/contracts/examples/bonding-curve-contract/wasm/src/lib.rs
@@ -10,8 +10,6 @@
 // Total number of exported functions:  12
 
 #![no_std]
-#![allow(internal_features)]
-#![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
 multiversx_sc_wasm_adapter::panic_handler!();
diff --git a/contracts/examples/check-pause/wasm/Cargo.lock b/contracts/examples/check-pause/wasm/Cargo.lock
index 08d28dc3c1..8c1752ba37 100644
--- a/contracts/examples/check-pause/wasm/Cargo.lock
+++ b/contracts/examples/check-pause/wasm/Cargo.lock
@@ -63,6 +63,7 @@ dependencies = [
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -71,6 +72,7 @@ version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -176,3 +178,9 @@ name = "unicode-ident"
 version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unwrap-infallible"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "151ac09978d3c2862c4e39b557f4eceee2cc72150bc4cb4f16abf061b6e381fb"
diff --git a/contracts/examples/check-pause/wasm/Cargo.toml b/contracts/examples/check-pause/wasm/Cargo.toml
index 1fbff49573..7cde896cec 100644
--- a/contracts/examples/check-pause/wasm/Cargo.toml
+++ b/contracts/examples/check-pause/wasm/Cargo.toml
@@ -21,6 +21,9 @@ debug = false
 panic = "abort"
 overflow-checks = false
 
+[profile.dev]
+panic = "abort"
+
 [dependencies.check-pause]
 path = ".."
 
diff --git a/contracts/examples/check-pause/wasm/src/lib.rs b/contracts/examples/check-pause/wasm/src/lib.rs
index 550768b6ee..5bf4ed5b95 100644
--- a/contracts/examples/check-pause/wasm/src/lib.rs
+++ b/contracts/examples/check-pause/wasm/src/lib.rs
@@ -10,8 +10,6 @@
 // Total number of exported functions:   6
 
 #![no_std]
-#![allow(internal_features)]
-#![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
 multiversx_sc_wasm_adapter::panic_handler!();
diff --git a/contracts/examples/crowdfunding-esdt/wasm/Cargo.lock b/contracts/examples/crowdfunding-esdt/wasm/Cargo.lock
index bd090a21c2..82975c4c9e 100644
--- a/contracts/examples/crowdfunding-esdt/wasm/Cargo.lock
+++ b/contracts/examples/crowdfunding-esdt/wasm/Cargo.lock
@@ -62,6 +62,7 @@ dependencies = [
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -70,6 +71,7 @@ version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -168,3 +170,9 @@ name = "unicode-ident"
 version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unwrap-infallible"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "151ac09978d3c2862c4e39b557f4eceee2cc72150bc4cb4f16abf061b6e381fb"
diff --git a/contracts/examples/crowdfunding-esdt/wasm/Cargo.toml b/contracts/examples/crowdfunding-esdt/wasm/Cargo.toml
index 0a40e452fc..f8e5f35db8 100644
--- a/contracts/examples/crowdfunding-esdt/wasm/Cargo.toml
+++ b/contracts/examples/crowdfunding-esdt/wasm/Cargo.toml
@@ -21,6 +21,9 @@ debug = false
 panic = "abort"
 overflow-checks = false
 
+[profile.dev]
+panic = "abort"
+
 [dependencies.crowdfunding-esdt]
 path = ".."
 
diff --git a/contracts/examples/crowdfunding-esdt/wasm/src/lib.rs b/contracts/examples/crowdfunding-esdt/wasm/src/lib.rs
index 6a27253313..eb3d65740b 100644
--- a/contracts/examples/crowdfunding-esdt/wasm/src/lib.rs
+++ b/contracts/examples/crowdfunding-esdt/wasm/src/lib.rs
@@ -10,8 +10,6 @@
 // Total number of exported functions:  10
 
 #![no_std]
-#![allow(internal_features)]
-#![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
 multiversx_sc_wasm_adapter::panic_handler!();
diff --git a/contracts/examples/crypto-bubbles/wasm/Cargo.lock b/contracts/examples/crypto-bubbles/wasm/Cargo.lock
index 02af9ea52a..461663fb08 100755
--- a/contracts/examples/crypto-bubbles/wasm/Cargo.lock
+++ b/contracts/examples/crypto-bubbles/wasm/Cargo.lock
@@ -62,6 +62,7 @@ dependencies = [
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -70,6 +71,7 @@ version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -168,3 +170,9 @@ name = "unicode-ident"
 version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unwrap-infallible"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "151ac09978d3c2862c4e39b557f4eceee2cc72150bc4cb4f16abf061b6e381fb"
diff --git a/contracts/examples/crypto-bubbles/wasm/Cargo.toml b/contracts/examples/crypto-bubbles/wasm/Cargo.toml
index 67549b7a21..db047fad7e 100644
--- a/contracts/examples/crypto-bubbles/wasm/Cargo.toml
+++ b/contracts/examples/crypto-bubbles/wasm/Cargo.toml
@@ -21,6 +21,9 @@ debug = false
 panic = "abort"
 overflow-checks = false
 
+[profile.dev]
+panic = "abort"
+
 [dependencies.crypto-bubbles]
 path = ".."
 
diff --git a/contracts/examples/crypto-bubbles/wasm/src/lib.rs b/contracts/examples/crypto-bubbles/wasm/src/lib.rs
index 97bc42e80e..925de32570 100644
--- a/contracts/examples/crypto-bubbles/wasm/src/lib.rs
+++ b/contracts/examples/crypto-bubbles/wasm/src/lib.rs
@@ -10,8 +10,6 @@
 // Total number of exported functions:   8
 
 #![no_std]
-#![allow(internal_features)]
-#![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
 multiversx_sc_wasm_adapter::panic_handler!();
diff --git a/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.lock b/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.lock
index c4ed9a8d55..3429cfc2aa 100755
--- a/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.lock
+++ b/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.lock
@@ -91,6 +91,7 @@ dependencies = [
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -99,6 +100,7 @@ version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -204,3 +206,9 @@ name = "unicode-ident"
 version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unwrap-infallible"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "151ac09978d3c2862c4e39b557f4eceee2cc72150bc4cb4f16abf061b6e381fb"
diff --git a/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.toml b/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.toml
index 85a3695084..860539a5f0 100644
--- a/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.toml
+++ b/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.toml
@@ -21,6 +21,9 @@ debug = false
 panic = "abort"
 overflow-checks = false
 
+[profile.dev]
+panic = "abort"
+
 [dependencies.kitty-auction]
 path = ".."
 
diff --git a/contracts/examples/crypto-kitties/kitty-auction/wasm/src/lib.rs b/contracts/examples/crypto-kitties/kitty-auction/wasm/src/lib.rs
index 7101d00f12..6d115b6c92 100644
--- a/contracts/examples/crypto-kitties/kitty-auction/wasm/src/lib.rs
+++ b/contracts/examples/crypto-kitties/kitty-auction/wasm/src/lib.rs
@@ -10,8 +10,6 @@
 // Total number of exported functions:  11
 
 #![no_std]
-#![allow(internal_features)]
-#![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
 multiversx_sc_wasm_adapter::panic_handler!();
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 1cfdbcd549..34b214a29f 100755
--- a/contracts/examples/crypto-kitties/kitty-genetic-alg/wasm/Cargo.lock
+++ b/contracts/examples/crypto-kitties/kitty-genetic-alg/wasm/Cargo.lock
@@ -72,6 +72,7 @@ dependencies = [
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -80,6 +81,7 @@ version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -185,3 +187,9 @@ name = "unicode-ident"
 version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unwrap-infallible"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "151ac09978d3c2862c4e39b557f4eceee2cc72150bc4cb4f16abf061b6e381fb"
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 16081ba43d..81e5ce96cd 100644
--- a/contracts/examples/crypto-kitties/kitty-genetic-alg/wasm/Cargo.toml
+++ b/contracts/examples/crypto-kitties/kitty-genetic-alg/wasm/Cargo.toml
@@ -21,6 +21,9 @@ debug = false
 panic = "abort"
 overflow-checks = false
 
+[profile.dev]
+panic = "abort"
+
 [dependencies.kitty-genetic-alg]
 path = ".."
 
diff --git a/contracts/examples/crypto-kitties/kitty-genetic-alg/wasm/src/lib.rs b/contracts/examples/crypto-kitties/kitty-genetic-alg/wasm/src/lib.rs
index 3bee7743a1..822a3104af 100644
--- a/contracts/examples/crypto-kitties/kitty-genetic-alg/wasm/src/lib.rs
+++ b/contracts/examples/crypto-kitties/kitty-genetic-alg/wasm/src/lib.rs
@@ -10,8 +10,6 @@
 // Total number of exported functions:   3
 
 #![no_std]
-#![allow(internal_features)]
-#![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
 multiversx_sc_wasm_adapter::panic_handler!();
diff --git a/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.lock b/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.lock
index 51f1a57e2c..c2ff73c1a1 100755
--- a/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.lock
+++ b/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.lock
@@ -82,6 +82,7 @@ dependencies = [
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -90,6 +91,7 @@ version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -195,3 +197,9 @@ name = "unicode-ident"
 version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unwrap-infallible"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "151ac09978d3c2862c4e39b557f4eceee2cc72150bc4cb4f16abf061b6e381fb"
diff --git a/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.toml b/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.toml
index c8ec0db96b..c6526438af 100644
--- a/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.toml
+++ b/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.toml
@@ -21,6 +21,9 @@ debug = false
 panic = "abort"
 overflow-checks = false
 
+[profile.dev]
+panic = "abort"
+
 [dependencies.kitty-ownership]
 path = ".."
 
diff --git a/contracts/examples/crypto-kitties/kitty-ownership/wasm/src/lib.rs b/contracts/examples/crypto-kitties/kitty-ownership/wasm/src/lib.rs
index 9154e40f13..9a5ffdaba8 100644
--- a/contracts/examples/crypto-kitties/kitty-ownership/wasm/src/lib.rs
+++ b/contracts/examples/crypto-kitties/kitty-ownership/wasm/src/lib.rs
@@ -10,8 +10,6 @@
 // Total number of exported functions:  23
 
 #![no_std]
-#![allow(internal_features)]
-#![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
 multiversx_sc_wasm_adapter::panic_handler!();
diff --git a/contracts/examples/crypto-zombies/wasm/Cargo.lock b/contracts/examples/crypto-zombies/wasm/Cargo.lock
index fd15242089..daaa6008dd 100755
--- a/contracts/examples/crypto-zombies/wasm/Cargo.lock
+++ b/contracts/examples/crypto-zombies/wasm/Cargo.lock
@@ -24,7 +24,6 @@ checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
 name = "crypto-zombies"
 version = "0.0.0"
 dependencies = [
- "kitty",
  "multiversx-sc",
 ]
 
@@ -54,14 +53,6 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
-[[package]]
-name = "kitty"
-version = "0.0.0"
-dependencies = [
- "multiversx-sc",
- "random",
-]
-
 [[package]]
 name = "multiversx-sc"
 version = "0.49.0"
@@ -71,6 +62,7 @@ dependencies = [
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -79,6 +71,7 @@ version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -155,13 +148,6 @@ dependencies = [
  "nibble_vec",
 ]
 
-[[package]]
-name = "random"
-version = "0.0.0"
-dependencies = [
- "multiversx-sc",
-]
-
 [[package]]
 name = "smallvec"
 version = "1.13.2"
@@ -184,3 +170,9 @@ name = "unicode-ident"
 version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unwrap-infallible"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "151ac09978d3c2862c4e39b557f4eceee2cc72150bc4cb4f16abf061b6e381fb"
diff --git a/contracts/examples/crypto-zombies/wasm/Cargo.toml b/contracts/examples/crypto-zombies/wasm/Cargo.toml
index e434220b42..3529d541a7 100644
--- a/contracts/examples/crypto-zombies/wasm/Cargo.toml
+++ b/contracts/examples/crypto-zombies/wasm/Cargo.toml
@@ -21,6 +21,9 @@ debug = false
 panic = "abort"
 overflow-checks = false
 
+[profile.dev]
+panic = "abort"
+
 [dependencies.crypto-zombies]
 path = ".."
 
diff --git a/contracts/examples/crypto-zombies/wasm/src/lib.rs b/contracts/examples/crypto-zombies/wasm/src/lib.rs
index 13e3db684c..9cfc27bbd9 100644
--- a/contracts/examples/crypto-zombies/wasm/src/lib.rs
+++ b/contracts/examples/crypto-zombies/wasm/src/lib.rs
@@ -11,8 +11,6 @@
 // Total number of exported functions:  20
 
 #![no_std]
-#![allow(internal_features)]
-#![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
 multiversx_sc_wasm_adapter::panic_handler!();
diff --git a/contracts/examples/digital-cash/wasm/Cargo.lock b/contracts/examples/digital-cash/wasm/Cargo.lock
index b219c11d18..b1af97d669 100644
--- a/contracts/examples/digital-cash/wasm/Cargo.lock
+++ b/contracts/examples/digital-cash/wasm/Cargo.lock
@@ -62,6 +62,7 @@ dependencies = [
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -70,6 +71,7 @@ version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -168,3 +170,9 @@ name = "unicode-ident"
 version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unwrap-infallible"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "151ac09978d3c2862c4e39b557f4eceee2cc72150bc4cb4f16abf061b6e381fb"
diff --git a/contracts/examples/digital-cash/wasm/Cargo.toml b/contracts/examples/digital-cash/wasm/Cargo.toml
index 260968204c..7a5e5d2c38 100644
--- a/contracts/examples/digital-cash/wasm/Cargo.toml
+++ b/contracts/examples/digital-cash/wasm/Cargo.toml
@@ -21,6 +21,9 @@ debug = false
 panic = "abort"
 overflow-checks = false
 
+[profile.dev]
+panic = "abort"
+
 [dependencies.digital-cash]
 path = ".."
 
diff --git a/contracts/examples/digital-cash/wasm/src/lib.rs b/contracts/examples/digital-cash/wasm/src/lib.rs
index 728d658a67..b010630ba6 100644
--- a/contracts/examples/digital-cash/wasm/src/lib.rs
+++ b/contracts/examples/digital-cash/wasm/src/lib.rs
@@ -10,8 +10,6 @@
 // Total number of exported functions:  14
 
 #![no_std]
-#![allow(internal_features)]
-#![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
 multiversx_sc_wasm_adapter::panic_handler!();
diff --git a/contracts/examples/empty/wasm/Cargo.lock b/contracts/examples/empty/wasm/Cargo.lock
index 0e20a220f6..dbc333b9ad 100755
--- a/contracts/examples/empty/wasm/Cargo.lock
+++ b/contracts/examples/empty/wasm/Cargo.lock
@@ -62,6 +62,7 @@ dependencies = [
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -70,6 +71,7 @@ version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -168,3 +170,9 @@ name = "unicode-ident"
 version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unwrap-infallible"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "151ac09978d3c2862c4e39b557f4eceee2cc72150bc4cb4f16abf061b6e381fb"
diff --git a/contracts/examples/empty/wasm/Cargo.toml b/contracts/examples/empty/wasm/Cargo.toml
index fe28578b11..46be2fc8d9 100644
--- a/contracts/examples/empty/wasm/Cargo.toml
+++ b/contracts/examples/empty/wasm/Cargo.toml
@@ -21,6 +21,9 @@ debug = false
 panic = "abort"
 overflow-checks = false
 
+[profile.dev]
+panic = "abort"
+
 [dependencies.empty]
 path = ".."
 
diff --git a/contracts/examples/empty/wasm/src/lib.rs b/contracts/examples/empty/wasm/src/lib.rs
index 53a9c2f2f1..2d1910c9bd 100644
--- a/contracts/examples/empty/wasm/src/lib.rs
+++ b/contracts/examples/empty/wasm/src/lib.rs
@@ -11,8 +11,6 @@
 // Total number of exported functions:   3
 
 #![no_std]
-#![allow(internal_features)]
-#![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
 multiversx_sc_wasm_adapter::panic_handler!();
diff --git a/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.lock b/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.lock
index cbd337a9a1..2ef8eb993d 100644
--- a/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.lock
+++ b/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.lock
@@ -62,6 +62,7 @@ dependencies = [
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -70,6 +71,7 @@ version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -168,3 +170,9 @@ name = "unicode-ident"
 version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unwrap-infallible"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "151ac09978d3c2862c4e39b557f4eceee2cc72150bc4cb4f16abf061b6e381fb"
diff --git a/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.toml b/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.toml
index b69e4d3701..52bde7e951 100644
--- a/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.toml
+++ b/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.toml
@@ -21,6 +21,9 @@ debug = false
 panic = "abort"
 overflow-checks = false
 
+[profile.dev]
+panic = "abort"
+
 [dependencies.esdt-transfer-with-fee]
 path = ".."
 
diff --git a/contracts/examples/esdt-transfer-with-fee/wasm/src/lib.rs b/contracts/examples/esdt-transfer-with-fee/wasm/src/lib.rs
index 879ee2a1af..cd2ccdbd51 100644
--- a/contracts/examples/esdt-transfer-with-fee/wasm/src/lib.rs
+++ b/contracts/examples/esdt-transfer-with-fee/wasm/src/lib.rs
@@ -10,8 +10,6 @@
 // Total number of exported functions:   8
 
 #![no_std]
-#![allow(internal_features)]
-#![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
 multiversx_sc_wasm_adapter::panic_handler!();
diff --git a/contracts/examples/factorial/wasm/Cargo.lock b/contracts/examples/factorial/wasm/Cargo.lock
index b6292af287..c735d1dc1e 100755
--- a/contracts/examples/factorial/wasm/Cargo.lock
+++ b/contracts/examples/factorial/wasm/Cargo.lock
@@ -62,6 +62,7 @@ dependencies = [
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -70,6 +71,7 @@ version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -168,3 +170,9 @@ name = "unicode-ident"
 version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unwrap-infallible"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "151ac09978d3c2862c4e39b557f4eceee2cc72150bc4cb4f16abf061b6e381fb"
diff --git a/contracts/examples/factorial/wasm/Cargo.toml b/contracts/examples/factorial/wasm/Cargo.toml
index 80d3ca57a9..59a8684d25 100644
--- a/contracts/examples/factorial/wasm/Cargo.toml
+++ b/contracts/examples/factorial/wasm/Cargo.toml
@@ -21,6 +21,9 @@ debug = false
 panic = "abort"
 overflow-checks = false
 
+[profile.dev]
+panic = "abort"
+
 [dependencies.factorial]
 path = ".."
 
diff --git a/contracts/examples/factorial/wasm/src/lib.rs b/contracts/examples/factorial/wasm/src/lib.rs
index 969872f107..5bf5db395c 100644
--- a/contracts/examples/factorial/wasm/src/lib.rs
+++ b/contracts/examples/factorial/wasm/src/lib.rs
@@ -11,8 +11,6 @@
 // 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!();
diff --git a/contracts/examples/fractional-nfts/wasm/Cargo.lock b/contracts/examples/fractional-nfts/wasm/Cargo.lock
index ac836d1710..40e63cd58f 100644
--- a/contracts/examples/fractional-nfts/wasm/Cargo.lock
+++ b/contracts/examples/fractional-nfts/wasm/Cargo.lock
@@ -63,6 +63,7 @@ dependencies = [
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -71,6 +72,7 @@ version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -176,3 +178,9 @@ name = "unicode-ident"
 version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unwrap-infallible"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "151ac09978d3c2862c4e39b557f4eceee2cc72150bc4cb4f16abf061b6e381fb"
diff --git a/contracts/examples/fractional-nfts/wasm/Cargo.toml b/contracts/examples/fractional-nfts/wasm/Cargo.toml
index 892c0af17c..40e0e872f9 100644
--- a/contracts/examples/fractional-nfts/wasm/Cargo.toml
+++ b/contracts/examples/fractional-nfts/wasm/Cargo.toml
@@ -21,6 +21,9 @@ debug = false
 panic = "abort"
 overflow-checks = false
 
+[profile.dev]
+panic = "abort"
+
 [dependencies.fractional-nfts]
 path = ".."
 
diff --git a/contracts/examples/fractional-nfts/wasm/src/lib.rs b/contracts/examples/fractional-nfts/wasm/src/lib.rs
index 2af55430fa..567d172c78 100644
--- a/contracts/examples/fractional-nfts/wasm/src/lib.rs
+++ b/contracts/examples/fractional-nfts/wasm/src/lib.rs
@@ -10,8 +10,6 @@
 // Total number of exported functions:   6
 
 #![no_std]
-#![allow(internal_features)]
-#![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
 multiversx_sc_wasm_adapter::panic_handler!();
diff --git a/contracts/examples/lottery-esdt/wasm/Cargo.lock b/contracts/examples/lottery-esdt/wasm/Cargo.lock
index f2208fefe8..2f8a7a39c2 100755
--- a/contracts/examples/lottery-esdt/wasm/Cargo.lock
+++ b/contracts/examples/lottery-esdt/wasm/Cargo.lock
@@ -62,6 +62,7 @@ dependencies = [
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -70,6 +71,7 @@ version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -168,3 +170,9 @@ name = "unicode-ident"
 version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unwrap-infallible"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "151ac09978d3c2862c4e39b557f4eceee2cc72150bc4cb4f16abf061b6e381fb"
diff --git a/contracts/examples/lottery-esdt/wasm/Cargo.toml b/contracts/examples/lottery-esdt/wasm/Cargo.toml
index aa99f1ba8b..43f02beaa6 100644
--- a/contracts/examples/lottery-esdt/wasm/Cargo.toml
+++ b/contracts/examples/lottery-esdt/wasm/Cargo.toml
@@ -21,6 +21,9 @@ debug = false
 panic = "abort"
 overflow-checks = false
 
+[profile.dev]
+panic = "abort"
+
 [dependencies.lottery-esdt]
 path = ".."
 
diff --git a/contracts/examples/lottery-esdt/wasm/src/lib.rs b/contracts/examples/lottery-esdt/wasm/src/lib.rs
index 71be1abb68..a1184cee72 100644
--- a/contracts/examples/lottery-esdt/wasm/src/lib.rs
+++ b/contracts/examples/lottery-esdt/wasm/src/lib.rs
@@ -10,8 +10,6 @@
 // Total number of exported functions:   9
 
 #![no_std]
-#![allow(internal_features)]
-#![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
 multiversx_sc_wasm_adapter::panic_handler!();
diff --git a/contracts/examples/multisig/wasm-multisig-full/Cargo.lock b/contracts/examples/multisig/wasm-multisig-full/Cargo.lock
index c70b17ae5c..f8b39788d9 100644
--- a/contracts/examples/multisig/wasm-multisig-full/Cargo.lock
+++ b/contracts/examples/multisig/wasm-multisig-full/Cargo.lock
@@ -63,6 +63,7 @@ dependencies = [
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -71,6 +72,7 @@ version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -176,3 +178,9 @@ name = "unicode-ident"
 version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unwrap-infallible"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "151ac09978d3c2862c4e39b557f4eceee2cc72150bc4cb4f16abf061b6e381fb"
diff --git a/contracts/examples/multisig/wasm-multisig-full/Cargo.toml b/contracts/examples/multisig/wasm-multisig-full/Cargo.toml
index 3496533206..56574d7e99 100644
--- a/contracts/examples/multisig/wasm-multisig-full/Cargo.toml
+++ b/contracts/examples/multisig/wasm-multisig-full/Cargo.toml
@@ -21,6 +21,9 @@ debug = false
 panic = "abort"
 overflow-checks = false
 
+[profile.dev]
+panic = "abort"
+
 [dependencies.multisig]
 path = ".."
 
diff --git a/contracts/examples/multisig/wasm-multisig-full/src/lib.rs b/contracts/examples/multisig/wasm-multisig-full/src/lib.rs
index 254c27444a..c62c8ef62b 100644
--- a/contracts/examples/multisig/wasm-multisig-full/src/lib.rs
+++ b/contracts/examples/multisig/wasm-multisig-full/src/lib.rs
@@ -11,8 +11,6 @@
 // Total number of exported functions:  31
 
 #![no_std]
-#![allow(internal_features)]
-#![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
 multiversx_sc_wasm_adapter::panic_handler!();
diff --git a/contracts/examples/multisig/wasm-multisig-view/Cargo.lock b/contracts/examples/multisig/wasm-multisig-view/Cargo.lock
index 557912beb6..6695e773fd 100644
--- a/contracts/examples/multisig/wasm-multisig-view/Cargo.lock
+++ b/contracts/examples/multisig/wasm-multisig-view/Cargo.lock
@@ -63,6 +63,7 @@ dependencies = [
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -71,6 +72,7 @@ version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -176,3 +178,9 @@ name = "unicode-ident"
 version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unwrap-infallible"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "151ac09978d3c2862c4e39b557f4eceee2cc72150bc4cb4f16abf061b6e381fb"
diff --git a/contracts/examples/multisig/wasm-multisig-view/Cargo.toml b/contracts/examples/multisig/wasm-multisig-view/Cargo.toml
index 6bca11ea28..a268fc278e 100644
--- a/contracts/examples/multisig/wasm-multisig-view/Cargo.toml
+++ b/contracts/examples/multisig/wasm-multisig-view/Cargo.toml
@@ -21,6 +21,9 @@ debug = false
 panic = "abort"
 overflow-checks = false
 
+[profile.dev]
+panic = "abort"
+
 [dependencies.multisig]
 path = ".."
 
diff --git a/contracts/examples/multisig/wasm-multisig-view/src/lib.rs b/contracts/examples/multisig/wasm-multisig-view/src/lib.rs
index c01d319c88..de4e6479d6 100644
--- a/contracts/examples/multisig/wasm-multisig-view/src/lib.rs
+++ b/contracts/examples/multisig/wasm-multisig-view/src/lib.rs
@@ -10,8 +10,6 @@
 // Total number of exported functions:  10
 
 #![no_std]
-#![allow(internal_features)]
-#![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
 multiversx_sc_wasm_adapter::panic_handler!();
diff --git a/contracts/examples/multisig/wasm/Cargo.lock b/contracts/examples/multisig/wasm/Cargo.lock
index e1bc7eb308..c909fdc3cb 100755
--- a/contracts/examples/multisig/wasm/Cargo.lock
+++ b/contracts/examples/multisig/wasm/Cargo.lock
@@ -63,6 +63,7 @@ dependencies = [
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -71,6 +72,7 @@ version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -176,3 +178,9 @@ name = "unicode-ident"
 version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unwrap-infallible"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "151ac09978d3c2862c4e39b557f4eceee2cc72150bc4cb4f16abf061b6e381fb"
diff --git a/contracts/examples/multisig/wasm/Cargo.toml b/contracts/examples/multisig/wasm/Cargo.toml
index 605ab510d2..25e029859c 100644
--- a/contracts/examples/multisig/wasm/Cargo.toml
+++ b/contracts/examples/multisig/wasm/Cargo.toml
@@ -21,6 +21,9 @@ debug = false
 panic = "abort"
 overflow-checks = false
 
+[profile.dev]
+panic = "abort"
+
 [dependencies.multisig]
 path = ".."
 
diff --git a/contracts/examples/multisig/wasm/src/lib.rs b/contracts/examples/multisig/wasm/src/lib.rs
index ab19ce2ad3..2d7e536d14 100644
--- a/contracts/examples/multisig/wasm/src/lib.rs
+++ b/contracts/examples/multisig/wasm/src/lib.rs
@@ -11,8 +11,6 @@
 // Total number of exported functions:  23
 
 #![no_std]
-#![allow(internal_features)]
-#![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
 multiversx_sc_wasm_adapter::panic_handler!();
diff --git a/contracts/examples/nft-minter/wasm/Cargo.lock b/contracts/examples/nft-minter/wasm/Cargo.lock
index bf942dd476..49df94c669 100644
--- a/contracts/examples/nft-minter/wasm/Cargo.lock
+++ b/contracts/examples/nft-minter/wasm/Cargo.lock
@@ -47,6 +47,7 @@ dependencies = [
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -55,6 +56,7 @@ version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -168,3 +170,9 @@ name = "unicode-ident"
 version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unwrap-infallible"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "151ac09978d3c2862c4e39b557f4eceee2cc72150bc4cb4f16abf061b6e381fb"
diff --git a/contracts/examples/nft-minter/wasm/Cargo.toml b/contracts/examples/nft-minter/wasm/Cargo.toml
index 0027925f16..c7d2ff1569 100644
--- a/contracts/examples/nft-minter/wasm/Cargo.toml
+++ b/contracts/examples/nft-minter/wasm/Cargo.toml
@@ -21,6 +21,9 @@ debug = false
 panic = "abort"
 overflow-checks = false
 
+[profile.dev]
+panic = "abort"
+
 [dependencies.nft-minter]
 path = ".."
 
diff --git a/contracts/examples/nft-minter/wasm/src/lib.rs b/contracts/examples/nft-minter/wasm/src/lib.rs
index aab639db54..daef60b06e 100644
--- a/contracts/examples/nft-minter/wasm/src/lib.rs
+++ b/contracts/examples/nft-minter/wasm/src/lib.rs
@@ -10,8 +10,6 @@
 // Total number of exported functions:   8
 
 #![no_std]
-#![allow(internal_features)]
-#![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
 multiversx_sc_wasm_adapter::panic_handler!();
diff --git a/contracts/examples/nft-storage-prepay/wasm/Cargo.lock b/contracts/examples/nft-storage-prepay/wasm/Cargo.lock
index 7905f9c5f5..7768750592 100755
--- a/contracts/examples/nft-storage-prepay/wasm/Cargo.lock
+++ b/contracts/examples/nft-storage-prepay/wasm/Cargo.lock
@@ -47,6 +47,7 @@ dependencies = [
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -55,6 +56,7 @@ version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -168,3 +170,9 @@ name = "unicode-ident"
 version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unwrap-infallible"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "151ac09978d3c2862c4e39b557f4eceee2cc72150bc4cb4f16abf061b6e381fb"
diff --git a/contracts/examples/nft-storage-prepay/wasm/Cargo.toml b/contracts/examples/nft-storage-prepay/wasm/Cargo.toml
index 4bb9934697..8755b0181f 100644
--- a/contracts/examples/nft-storage-prepay/wasm/Cargo.toml
+++ b/contracts/examples/nft-storage-prepay/wasm/Cargo.toml
@@ -21,6 +21,9 @@ debug = false
 panic = "abort"
 overflow-checks = false
 
+[profile.dev]
+panic = "abort"
+
 [dependencies.nft-storage-prepay]
 path = ".."
 
diff --git a/contracts/examples/nft-storage-prepay/wasm/src/lib.rs b/contracts/examples/nft-storage-prepay/wasm/src/lib.rs
index 4f9e57e282..cbcfccb60f 100644
--- a/contracts/examples/nft-storage-prepay/wasm/src/lib.rs
+++ b/contracts/examples/nft-storage-prepay/wasm/src/lib.rs
@@ -10,8 +10,6 @@
 // Total number of exported functions:  10
 
 #![no_std]
-#![allow(internal_features)]
-#![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
 multiversx_sc_wasm_adapter::panic_handler!();
diff --git a/contracts/examples/nft-subscription/wasm/Cargo.lock b/contracts/examples/nft-subscription/wasm/Cargo.lock
index 63c6100a8e..b3c296aff1 100644
--- a/contracts/examples/nft-subscription/wasm/Cargo.lock
+++ b/contracts/examples/nft-subscription/wasm/Cargo.lock
@@ -47,6 +47,7 @@ dependencies = [
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -55,6 +56,7 @@ version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -176,3 +178,9 @@ name = "unicode-ident"
 version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unwrap-infallible"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "151ac09978d3c2862c4e39b557f4eceee2cc72150bc4cb4f16abf061b6e381fb"
diff --git a/contracts/examples/nft-subscription/wasm/Cargo.toml b/contracts/examples/nft-subscription/wasm/Cargo.toml
index 564dd5b645..4f4defe1d1 100644
--- a/contracts/examples/nft-subscription/wasm/Cargo.toml
+++ b/contracts/examples/nft-subscription/wasm/Cargo.toml
@@ -21,6 +21,9 @@ debug = false
 panic = "abort"
 overflow-checks = false
 
+[profile.dev]
+panic = "abort"
+
 [dependencies.nft-subscription]
 path = ".."
 
diff --git a/contracts/examples/nft-subscription/wasm/src/lib.rs b/contracts/examples/nft-subscription/wasm/src/lib.rs
index 2c95afe219..07b9b6e288 100644
--- a/contracts/examples/nft-subscription/wasm/src/lib.rs
+++ b/contracts/examples/nft-subscription/wasm/src/lib.rs
@@ -10,8 +10,6 @@
 // Total number of exported functions:   7
 
 #![no_std]
-#![allow(internal_features)]
-#![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
 multiversx_sc_wasm_adapter::panic_handler!();
diff --git a/contracts/examples/order-book/factory/wasm/Cargo.lock b/contracts/examples/order-book/factory/wasm/Cargo.lock
index 755a1b87a7..362ce65cc0 100644
--- a/contracts/examples/order-book/factory/wasm/Cargo.lock
+++ b/contracts/examples/order-book/factory/wasm/Cargo.lock
@@ -47,6 +47,7 @@ dependencies = [
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -55,6 +56,7 @@ version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -168,3 +170,9 @@ name = "unicode-ident"
 version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unwrap-infallible"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "151ac09978d3c2862c4e39b557f4eceee2cc72150bc4cb4f16abf061b6e381fb"
diff --git a/contracts/examples/order-book/factory/wasm/Cargo.toml b/contracts/examples/order-book/factory/wasm/Cargo.toml
index bfc68cb87e..447881dd39 100644
--- a/contracts/examples/order-book/factory/wasm/Cargo.toml
+++ b/contracts/examples/order-book/factory/wasm/Cargo.toml
@@ -21,6 +21,9 @@ debug = false
 panic = "abort"
 overflow-checks = false
 
+[profile.dev]
+panic = "abort"
+
 [dependencies.order-book-factory]
 path = ".."
 
diff --git a/contracts/examples/order-book/factory/wasm/src/lib.rs b/contracts/examples/order-book/factory/wasm/src/lib.rs
index 97a9ff166d..be215e6f41 100644
--- a/contracts/examples/order-book/factory/wasm/src/lib.rs
+++ b/contracts/examples/order-book/factory/wasm/src/lib.rs
@@ -10,8 +10,6 @@
 // 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!();
diff --git a/contracts/examples/order-book/pair/wasm/Cargo.lock b/contracts/examples/order-book/pair/wasm/Cargo.lock
index 65336f77d0..3d9462d6d6 100644
--- a/contracts/examples/order-book/pair/wasm/Cargo.lock
+++ b/contracts/examples/order-book/pair/wasm/Cargo.lock
@@ -47,6 +47,7 @@ dependencies = [
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -55,6 +56,7 @@ version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -168,3 +170,9 @@ name = "unicode-ident"
 version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unwrap-infallible"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "151ac09978d3c2862c4e39b557f4eceee2cc72150bc4cb4f16abf061b6e381fb"
diff --git a/contracts/examples/order-book/pair/wasm/Cargo.toml b/contracts/examples/order-book/pair/wasm/Cargo.toml
index dbb8cf2ffa..b2ccac9166 100644
--- a/contracts/examples/order-book/pair/wasm/Cargo.toml
+++ b/contracts/examples/order-book/pair/wasm/Cargo.toml
@@ -21,6 +21,9 @@ debug = false
 panic = "abort"
 overflow-checks = false
 
+[profile.dev]
+panic = "abort"
+
 [dependencies.order-book-pair]
 path = ".."
 
diff --git a/contracts/examples/order-book/pair/wasm/src/lib.rs b/contracts/examples/order-book/pair/wasm/src/lib.rs
index ba30c0e8e9..2a4b058a13 100644
--- a/contracts/examples/order-book/pair/wasm/src/lib.rs
+++ b/contracts/examples/order-book/pair/wasm/src/lib.rs
@@ -10,8 +10,6 @@
 // Total number of exported functions:  15
 
 #![no_std]
-#![allow(internal_features)]
-#![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
 multiversx_sc_wasm_adapter::panic_handler!();
diff --git a/contracts/examples/ping-pong-egld/wasm/Cargo.lock b/contracts/examples/ping-pong-egld/wasm/Cargo.lock
index 2ec97eef16..6867ae9bf6 100755
--- a/contracts/examples/ping-pong-egld/wasm/Cargo.lock
+++ b/contracts/examples/ping-pong-egld/wasm/Cargo.lock
@@ -47,6 +47,7 @@ dependencies = [
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -55,6 +56,7 @@ version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -168,3 +170,9 @@ name = "unicode-ident"
 version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unwrap-infallible"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "151ac09978d3c2862c4e39b557f4eceee2cc72150bc4cb4f16abf061b6e381fb"
diff --git a/contracts/examples/ping-pong-egld/wasm/Cargo.toml b/contracts/examples/ping-pong-egld/wasm/Cargo.toml
index 3fc4f94d78..3da28b8cd9 100644
--- a/contracts/examples/ping-pong-egld/wasm/Cargo.toml
+++ b/contracts/examples/ping-pong-egld/wasm/Cargo.toml
@@ -21,6 +21,9 @@ debug = false
 panic = "abort"
 overflow-checks = false
 
+[profile.dev]
+panic = "abort"
+
 [dependencies.ping-pong-egld]
 path = ".."
 
diff --git a/contracts/examples/ping-pong-egld/wasm/src/lib.rs b/contracts/examples/ping-pong-egld/wasm/src/lib.rs
index b3fb0e62cb..35bade6af2 100644
--- a/contracts/examples/ping-pong-egld/wasm/src/lib.rs
+++ b/contracts/examples/ping-pong-egld/wasm/src/lib.rs
@@ -11,8 +11,6 @@
 // Total number of exported functions:  13
 
 #![no_std]
-#![allow(internal_features)]
-#![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
 multiversx_sc_wasm_adapter::panic_handler!();
diff --git a/contracts/examples/proxy-pause/wasm/Cargo.lock b/contracts/examples/proxy-pause/wasm/Cargo.lock
index bab5be1cc9..45f61ca9b2 100644
--- a/contracts/examples/proxy-pause/wasm/Cargo.lock
+++ b/contracts/examples/proxy-pause/wasm/Cargo.lock
@@ -47,6 +47,7 @@ dependencies = [
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -55,6 +56,7 @@ version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -168,3 +170,9 @@ name = "unicode-ident"
 version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unwrap-infallible"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "151ac09978d3c2862c4e39b557f4eceee2cc72150bc4cb4f16abf061b6e381fb"
diff --git a/contracts/examples/proxy-pause/wasm/Cargo.toml b/contracts/examples/proxy-pause/wasm/Cargo.toml
index 6cfffd232a..038b546376 100644
--- a/contracts/examples/proxy-pause/wasm/Cargo.toml
+++ b/contracts/examples/proxy-pause/wasm/Cargo.toml
@@ -21,6 +21,9 @@ debug = false
 panic = "abort"
 overflow-checks = false
 
+[profile.dev]
+panic = "abort"
+
 [dependencies.proxy-pause]
 path = ".."
 
diff --git a/contracts/examples/proxy-pause/wasm/src/lib.rs b/contracts/examples/proxy-pause/wasm/src/lib.rs
index 62e1c633ca..e2a1a07417 100644
--- a/contracts/examples/proxy-pause/wasm/src/lib.rs
+++ b/contracts/examples/proxy-pause/wasm/src/lib.rs
@@ -10,8 +10,6 @@
 // Total number of exported functions:  10
 
 #![no_std]
-#![allow(internal_features)]
-#![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
 multiversx_sc_wasm_adapter::panic_handler!();
diff --git a/contracts/examples/rewards-distribution/wasm/Cargo.lock b/contracts/examples/rewards-distribution/wasm/Cargo.lock
index ac36f04261..67cddf29a5 100644
--- a/contracts/examples/rewards-distribution/wasm/Cargo.lock
+++ b/contracts/examples/rewards-distribution/wasm/Cargo.lock
@@ -47,6 +47,7 @@ dependencies = [
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -55,6 +56,7 @@ version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -176,3 +178,9 @@ name = "unicode-ident"
 version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unwrap-infallible"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "151ac09978d3c2862c4e39b557f4eceee2cc72150bc4cb4f16abf061b6e381fb"
diff --git a/contracts/examples/rewards-distribution/wasm/Cargo.toml b/contracts/examples/rewards-distribution/wasm/Cargo.toml
index 9f562d7cac..c2c9f1f27b 100644
--- a/contracts/examples/rewards-distribution/wasm/Cargo.toml
+++ b/contracts/examples/rewards-distribution/wasm/Cargo.toml
@@ -21,6 +21,9 @@ debug = false
 panic = "abort"
 overflow-checks = false
 
+[profile.dev]
+panic = "abort"
+
 [dependencies.rewards-distribution]
 path = ".."
 
diff --git a/contracts/examples/rewards-distribution/wasm/src/lib.rs b/contracts/examples/rewards-distribution/wasm/src/lib.rs
index b41b365c4e..34397de228 100644
--- a/contracts/examples/rewards-distribution/wasm/src/lib.rs
+++ b/contracts/examples/rewards-distribution/wasm/src/lib.rs
@@ -10,8 +10,6 @@
 // Total number of exported functions:  15
 
 #![no_std]
-#![allow(internal_features)]
-#![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
 multiversx_sc_wasm_adapter::panic_handler!();
diff --git a/contracts/examples/seed-nft-minter/wasm/Cargo.lock b/contracts/examples/seed-nft-minter/wasm/Cargo.lock
index c88d3f49ab..41afdbaf4c 100644
--- a/contracts/examples/seed-nft-minter/wasm/Cargo.lock
+++ b/contracts/examples/seed-nft-minter/wasm/Cargo.lock
@@ -47,6 +47,7 @@ dependencies = [
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -55,6 +56,7 @@ version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -176,3 +178,9 @@ name = "unicode-ident"
 version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unwrap-infallible"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "151ac09978d3c2862c4e39b557f4eceee2cc72150bc4cb4f16abf061b6e381fb"
diff --git a/contracts/examples/seed-nft-minter/wasm/Cargo.toml b/contracts/examples/seed-nft-minter/wasm/Cargo.toml
index 7b224ce48c..e908400d3f 100644
--- a/contracts/examples/seed-nft-minter/wasm/Cargo.toml
+++ b/contracts/examples/seed-nft-minter/wasm/Cargo.toml
@@ -21,6 +21,9 @@ debug = false
 panic = "abort"
 overflow-checks = false
 
+[profile.dev]
+panic = "abort"
+
 [dependencies.seed-nft-minter]
 path = ".."
 
diff --git a/contracts/examples/seed-nft-minter/wasm/src/lib.rs b/contracts/examples/seed-nft-minter/wasm/src/lib.rs
index e4aec1825d..5f0e0090d6 100644
--- a/contracts/examples/seed-nft-minter/wasm/src/lib.rs
+++ b/contracts/examples/seed-nft-minter/wasm/src/lib.rs
@@ -10,8 +10,6 @@
 // Total number of exported functions:  11
 
 #![no_std]
-#![allow(internal_features)]
-#![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
 multiversx_sc_wasm_adapter::panic_handler!();
diff --git a/contracts/examples/token-release/wasm/Cargo.lock b/contracts/examples/token-release/wasm/Cargo.lock
index 082c8ec2a8..2dc67fca16 100644
--- a/contracts/examples/token-release/wasm/Cargo.lock
+++ b/contracts/examples/token-release/wasm/Cargo.lock
@@ -47,6 +47,7 @@ dependencies = [
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -55,6 +56,7 @@ version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -168,3 +170,9 @@ name = "unicode-ident"
 version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unwrap-infallible"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "151ac09978d3c2862c4e39b557f4eceee2cc72150bc4cb4f16abf061b6e381fb"
diff --git a/contracts/examples/token-release/wasm/Cargo.toml b/contracts/examples/token-release/wasm/Cargo.toml
index 3a3f04c9df..f1d2ab14d8 100644
--- a/contracts/examples/token-release/wasm/Cargo.toml
+++ b/contracts/examples/token-release/wasm/Cargo.toml
@@ -21,6 +21,9 @@ debug = false
 panic = "abort"
 overflow-checks = false
 
+[profile.dev]
+panic = "abort"
+
 [dependencies.token-release]
 path = ".."
 
diff --git a/contracts/examples/token-release/wasm/src/lib.rs b/contracts/examples/token-release/wasm/src/lib.rs
index be580b5ccd..4dd7699632 100644
--- a/contracts/examples/token-release/wasm/src/lib.rs
+++ b/contracts/examples/token-release/wasm/src/lib.rs
@@ -10,8 +10,6 @@
 // Total number of exported functions:  15
 
 #![no_std]
-#![allow(internal_features)]
-#![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
 multiversx_sc_wasm_adapter::panic_handler!();
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 dbd1ba809d..b15de5154a 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
@@ -62,6 +62,7 @@ dependencies = [
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -70,6 +71,7 @@ version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -168,3 +170,9 @@ name = "unicode-ident"
 version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unwrap-infallible"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "151ac09978d3c2862c4e39b557f4eceee2cc72150bc4cb4f16abf061b6e381fb"
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 d8896c6b95..0842c1c928 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
@@ -21,6 +21,9 @@ debug = false
 panic = "abort"
 overflow-checks = false
 
+[profile.dev]
+panic = "abort"
+
 [dependencies.abi-tester]
 path = ".."
 
diff --git a/contracts/feature-tests/abi-tester/wasm-abi-tester-ev/src/lib.rs b/contracts/feature-tests/abi-tester/wasm-abi-tester-ev/src/lib.rs
index 5fe18202f2..8569b396ce 100644
--- a/contracts/feature-tests/abi-tester/wasm-abi-tester-ev/src/lib.rs
+++ b/contracts/feature-tests/abi-tester/wasm-abi-tester-ev/src/lib.rs
@@ -10,8 +10,6 @@
 // Total number of exported functions:   5
 
 #![no_std]
-#![allow(internal_features)]
-#![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
 multiversx_sc_wasm_adapter::panic_handler!();
diff --git a/contracts/feature-tests/abi-tester/wasm/Cargo.lock b/contracts/feature-tests/abi-tester/wasm/Cargo.lock
index 09d6167d6f..97c4e422b9 100755
--- a/contracts/feature-tests/abi-tester/wasm/Cargo.lock
+++ b/contracts/feature-tests/abi-tester/wasm/Cargo.lock
@@ -62,6 +62,7 @@ dependencies = [
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -70,6 +71,7 @@ version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -168,3 +170,9 @@ name = "unicode-ident"
 version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unwrap-infallible"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "151ac09978d3c2862c4e39b557f4eceee2cc72150bc4cb4f16abf061b6e381fb"
diff --git a/contracts/feature-tests/abi-tester/wasm/Cargo.toml b/contracts/feature-tests/abi-tester/wasm/Cargo.toml
index 953b746080..191ee3e3a0 100644
--- a/contracts/feature-tests/abi-tester/wasm/Cargo.toml
+++ b/contracts/feature-tests/abi-tester/wasm/Cargo.toml
@@ -21,6 +21,9 @@ debug = false
 panic = "abort"
 overflow-checks = false
 
+[profile.dev]
+panic = "abort"
+
 [dependencies.abi-tester]
 path = ".."
 
diff --git a/contracts/feature-tests/abi-tester/wasm/src/lib.rs b/contracts/feature-tests/abi-tester/wasm/src/lib.rs
index cf9aa68978..dcfd861dd0 100644
--- a/contracts/feature-tests/abi-tester/wasm/src/lib.rs
+++ b/contracts/feature-tests/abi-tester/wasm/src/lib.rs
@@ -11,8 +11,6 @@
 // Total number of exported functions:  31
 
 #![no_std]
-#![allow(internal_features)]
-#![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
 multiversx_sc_wasm_adapter::panic_handler!();
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock
index 2e1236933d..8ef8bda743 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock
@@ -62,6 +62,7 @@ dependencies = [
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -70,6 +71,7 @@ version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -168,3 +170,9 @@ name = "unicode-ident"
 version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unwrap-infallible"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "151ac09978d3c2862c4e39b557f4eceee2cc72150bc4cb4f16abf061b6e381fb"
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml
index 731b271739..ce413d1f36 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml
@@ -21,6 +21,9 @@ debug = false
 panic = "abort"
 overflow-checks = false
 
+[profile.dev]
+panic = "abort"
+
 [dependencies.alloc-features]
 path = ".."
 
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/src/lib.rs b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/src/lib.rs
index 675bddb53d..f903442a51 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/src/lib.rs
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/src/lib.rs
@@ -10,8 +10,6 @@
 // Total number of exported functions:  67
 
 #![no_std]
-#![allow(internal_features)]
-#![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
 multiversx_sc_wasm_adapter::panic_handler!();
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.lock b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.lock
index 72aef64716..94d26f6126 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.lock
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.lock
@@ -62,6 +62,7 @@ dependencies = [
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -70,6 +71,7 @@ version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -168,3 +170,9 @@ name = "unicode-ident"
 version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unwrap-infallible"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "151ac09978d3c2862c4e39b557f4eceee2cc72150bc4cb4f16abf061b6e381fb"
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml
index 48125b5285..682f6897d8 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml
@@ -21,6 +21,9 @@ debug = false
 panic = "abort"
 overflow-checks = false
 
+[profile.dev]
+panic = "abort"
+
 [dependencies.alloc-features]
 path = ".."
 
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/src/lib.rs b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/src/lib.rs
index 55d2f88725..9d069ce40f 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/src/lib.rs
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/src/lib.rs
@@ -10,8 +10,6 @@
 // Total number of exported functions:  67
 
 #![no_std]
-#![allow(internal_features)]
-#![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!(leaking);
 multiversx_sc_wasm_adapter::panic_handler!();
diff --git a/contracts/feature-tests/alloc-features/wasm/Cargo.lock b/contracts/feature-tests/alloc-features/wasm/Cargo.lock
index 52ee29d13c..62bc5036eb 100644
--- a/contracts/feature-tests/alloc-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/alloc-features/wasm/Cargo.lock
@@ -62,6 +62,7 @@ dependencies = [
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -70,6 +71,7 @@ version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -168,3 +170,9 @@ name = "unicode-ident"
 version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unwrap-infallible"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "151ac09978d3c2862c4e39b557f4eceee2cc72150bc4cb4f16abf061b6e381fb"
diff --git a/contracts/feature-tests/alloc-features/wasm/Cargo.toml b/contracts/feature-tests/alloc-features/wasm/Cargo.toml
index cc94610a76..2fcade81d3 100644
--- a/contracts/feature-tests/alloc-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/alloc-features/wasm/Cargo.toml
@@ -21,6 +21,9 @@ debug = false
 panic = "abort"
 overflow-checks = false
 
+[profile.dev]
+panic = "abort"
+
 [dependencies.alloc-features]
 path = ".."
 
diff --git a/contracts/feature-tests/alloc-features/wasm/src/lib.rs b/contracts/feature-tests/alloc-features/wasm/src/lib.rs
index f01cc37f8b..d56e4d69ba 100644
--- a/contracts/feature-tests/alloc-features/wasm/src/lib.rs
+++ b/contracts/feature-tests/alloc-features/wasm/src/lib.rs
@@ -10,8 +10,6 @@
 // Total number of exported functions:  66
 
 #![no_std]
-#![allow(internal_features)]
-#![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!(static64k);
 multiversx_sc_wasm_adapter::panic_handler!();
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 24e1340805..20a75d222d 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
@@ -63,6 +63,7 @@ dependencies = [
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -71,6 +72,7 @@ version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -176,3 +178,9 @@ name = "unicode-ident"
 version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unwrap-infallible"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "151ac09978d3c2862c4e39b557f4eceee2cc72150bc4cb4f16abf061b6e381fb"
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 484bbd9eab..a701d5f906 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
@@ -21,6 +21,9 @@ debug = false
 panic = "abort"
 overflow-checks = false
 
+[profile.dev]
+panic = "abort"
+
 [dependencies.basic-features]
 path = ".."
 
diff --git a/contracts/feature-tests/basic-features/wasm-basic-features-storage-bytes/src/lib.rs b/contracts/feature-tests/basic-features/wasm-basic-features-storage-bytes/src/lib.rs
index af26877c00..94dd839f14 100644
--- a/contracts/feature-tests/basic-features/wasm-basic-features-storage-bytes/src/lib.rs
+++ b/contracts/feature-tests/basic-features/wasm-basic-features-storage-bytes/src/lib.rs
@@ -10,8 +10,6 @@
 // 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!();
diff --git a/contracts/feature-tests/basic-features/wasm/Cargo.lock b/contracts/feature-tests/basic-features/wasm/Cargo.lock
index d047f9419c..3d14641d4b 100755
--- a/contracts/feature-tests/basic-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/basic-features/wasm/Cargo.lock
@@ -63,6 +63,7 @@ dependencies = [
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -71,6 +72,7 @@ version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -176,3 +178,9 @@ name = "unicode-ident"
 version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unwrap-infallible"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "151ac09978d3c2862c4e39b557f4eceee2cc72150bc4cb4f16abf061b6e381fb"
diff --git a/contracts/feature-tests/basic-features/wasm/Cargo.toml b/contracts/feature-tests/basic-features/wasm/Cargo.toml
index e8f2e89165..8c72470601 100644
--- a/contracts/feature-tests/basic-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/basic-features/wasm/Cargo.toml
@@ -21,6 +21,9 @@ debug = false
 panic = "abort"
 overflow-checks = true
 
+[profile.dev]
+panic = "abort"
+
 [dependencies.basic-features]
 path = ".."
 
diff --git a/contracts/feature-tests/basic-features/wasm/src/lib.rs b/contracts/feature-tests/basic-features/wasm/src/lib.rs
index dba8d815a6..d2948e2da4 100644
--- a/contracts/feature-tests/basic-features/wasm/src/lib.rs
+++ b/contracts/feature-tests/basic-features/wasm/src/lib.rs
@@ -10,8 +10,6 @@
 // Total number of exported functions: 389
 
 #![no_std]
-#![allow(internal_features)]
-#![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
 multiversx_sc_wasm_adapter::panic_handler!();
diff --git a/contracts/feature-tests/big-float-features/wasm/Cargo.lock b/contracts/feature-tests/big-float-features/wasm/Cargo.lock
index 5c8dfe26aa..4601a0ccbc 100644
--- a/contracts/feature-tests/big-float-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/big-float-features/wasm/Cargo.lock
@@ -62,6 +62,7 @@ dependencies = [
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -70,6 +71,7 @@ version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -168,3 +170,9 @@ name = "unicode-ident"
 version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unwrap-infallible"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "151ac09978d3c2862c4e39b557f4eceee2cc72150bc4cb4f16abf061b6e381fb"
diff --git a/contracts/feature-tests/big-float-features/wasm/Cargo.toml b/contracts/feature-tests/big-float-features/wasm/Cargo.toml
index 011e22c44a..4b6f46e94f 100644
--- a/contracts/feature-tests/big-float-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/big-float-features/wasm/Cargo.toml
@@ -21,6 +21,9 @@ debug = false
 panic = "abort"
 overflow-checks = false
 
+[profile.dev]
+panic = "abort"
+
 [dependencies.big-float-features]
 path = ".."
 
diff --git a/contracts/feature-tests/big-float-features/wasm/src/lib.rs b/contracts/feature-tests/big-float-features/wasm/src/lib.rs
index 1219ed8ad0..6ec41ff9e9 100644
--- a/contracts/feature-tests/big-float-features/wasm/src/lib.rs
+++ b/contracts/feature-tests/big-float-features/wasm/src/lib.rs
@@ -10,8 +10,6 @@
 // Total number of exported functions:  72
 
 #![no_std]
-#![allow(internal_features)]
-#![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
 multiversx_sc_wasm_adapter::panic_handler!();
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 cdbde8f3c9..76bebbeaf8 100644
--- a/contracts/feature-tests/composability/builtin-func-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/builtin-func-features/wasm/Cargo.lock
@@ -62,6 +62,7 @@ dependencies = [
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -70,6 +71,7 @@ version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -168,3 +170,9 @@ name = "unicode-ident"
 version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unwrap-infallible"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "151ac09978d3c2862c4e39b557f4eceee2cc72150bc4cb4f16abf061b6e381fb"
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 5cf4535ffd..f40186154b 100644
--- a/contracts/feature-tests/composability/builtin-func-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/builtin-func-features/wasm/Cargo.toml
@@ -21,6 +21,9 @@ debug = false
 panic = "abort"
 overflow-checks = false
 
+[profile.dev]
+panic = "abort"
+
 [dependencies.builtin-func-features]
 path = ".."
 
diff --git a/contracts/feature-tests/composability/builtin-func-features/wasm/src/lib.rs b/contracts/feature-tests/composability/builtin-func-features/wasm/src/lib.rs
index b6175c29b0..832df1781b 100644
--- a/contracts/feature-tests/composability/builtin-func-features/wasm/src/lib.rs
+++ b/contracts/feature-tests/composability/builtin-func-features/wasm/src/lib.rs
@@ -10,8 +10,6 @@
 // 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!();
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 17abe8ee97..48cd0bd939 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
@@ -62,6 +62,7 @@ dependencies = [
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -70,6 +71,7 @@ version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -168,3 +170,9 @@ name = "unicode-ident"
 version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unwrap-infallible"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "151ac09978d3c2862c4e39b557f4eceee2cc72150bc4cb4f16abf061b6e381fb"
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 70121cf1c4..9c42dd837a 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
@@ -21,6 +21,9 @@ debug = false
 panic = "abort"
 overflow-checks = false
 
+[profile.dev]
+panic = "abort"
+
 [dependencies.first-contract]
 path = ".."
 
diff --git a/contracts/feature-tests/composability/esdt-contract-pair/first-contract/wasm/src/lib.rs b/contracts/feature-tests/composability/esdt-contract-pair/first-contract/wasm/src/lib.rs
index 163070bd0a..d9f268f9e4 100644
--- a/contracts/feature-tests/composability/esdt-contract-pair/first-contract/wasm/src/lib.rs
+++ b/contracts/feature-tests/composability/esdt-contract-pair/first-contract/wasm/src/lib.rs
@@ -10,8 +10,6 @@
 // Total number of exported functions:   9
 
 #![no_std]
-#![allow(internal_features)]
-#![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
 multiversx_sc_wasm_adapter::panic_handler!();
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 324de28ec0..7c4cd2db7d 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
@@ -47,6 +47,7 @@ dependencies = [
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -55,6 +56,7 @@ version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -168,3 +170,9 @@ name = "unicode-ident"
 version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unwrap-infallible"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "151ac09978d3c2862c4e39b557f4eceee2cc72150bc4cb4f16abf061b6e381fb"
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 676da35aa5..30e743e020 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
@@ -21,6 +21,9 @@ debug = false
 panic = "abort"
 overflow-checks = false
 
+[profile.dev]
+panic = "abort"
+
 [dependencies.second-contract]
 path = ".."
 
diff --git a/contracts/feature-tests/composability/esdt-contract-pair/second-contract/wasm/src/lib.rs b/contracts/feature-tests/composability/esdt-contract-pair/second-contract/wasm/src/lib.rs
index 574e5e91d2..98c500b82d 100644
--- a/contracts/feature-tests/composability/esdt-contract-pair/second-contract/wasm/src/lib.rs
+++ b/contracts/feature-tests/composability/esdt-contract-pair/second-contract/wasm/src/lib.rs
@@ -10,8 +10,6 @@
 // Total number of exported functions:   5
 
 #![no_std]
-#![allow(internal_features)]
-#![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
 multiversx_sc_wasm_adapter::panic_handler!();
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 9586e596a4..899af3402e 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
@@ -62,6 +62,7 @@ dependencies = [
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -70,6 +71,7 @@ version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -168,3 +170,9 @@ name = "unicode-ident"
 version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unwrap-infallible"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "151ac09978d3c2862c4e39b557f4eceee2cc72150bc4cb4f16abf061b6e381fb"
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 55541c2438..88e099d8f2 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
@@ -21,6 +21,9 @@ debug = false
 panic = "abort"
 overflow-checks = false
 
+[profile.dev]
+panic = "abort"
+
 [dependencies.child]
 path = ".."
 
diff --git a/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/child/wasm/src/lib.rs b/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/child/wasm/src/lib.rs
index 0610352c5f..53bbaadccd 100644
--- a/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/child/wasm/src/lib.rs
+++ b/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/child/wasm/src/lib.rs
@@ -10,8 +10,6 @@
 // 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!();
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 42635f16d6..5bb0b14391 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,6 +47,7 @@ dependencies = [
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -55,6 +56,7 @@ version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -168,3 +170,9 @@ name = "unicode-ident"
 version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unwrap-infallible"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "151ac09978d3c2862c4e39b557f4eceee2cc72150bc4cb4f16abf061b6e381fb"
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 708e761902..d199c61242 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
@@ -21,6 +21,9 @@ debug = false
 panic = "abort"
 overflow-checks = false
 
+[profile.dev]
+panic = "abort"
+
 [dependencies.parent]
 path = ".."
 
diff --git a/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/parent/wasm/src/lib.rs b/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/parent/wasm/src/lib.rs
index 6af21719dc..2f027b22cd 100644
--- a/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/parent/wasm/src/lib.rs
+++ b/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/parent/wasm/src/lib.rs
@@ -10,8 +10,6 @@
 // Total number of exported functions:   6
 
 #![no_std]
-#![allow(internal_features)]
-#![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
 multiversx_sc_wasm_adapter::panic_handler!();
diff --git a/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.lock
index 33eb4d9098..45311016f2 100644
--- a/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.lock
@@ -63,6 +63,7 @@ dependencies = [
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -71,6 +72,7 @@ version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -170,6 +172,12 @@ version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
 
+[[package]]
+name = "unwrap-infallible"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "151ac09978d3c2862c4e39b557f4eceee2cc72150bc4cb4f16abf061b6e381fb"
+
 [[package]]
 name = "vault"
 version = "0.0.0"
diff --git a/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.toml b/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.toml
index 6a3b6a7db6..b8a9a65275 100644
--- a/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.toml
@@ -21,6 +21,9 @@ debug = false
 panic = "abort"
 overflow-checks = false
 
+[profile.dev]
+panic = "abort"
+
 [dependencies.forwarder-legacy]
 path = ".."
 
diff --git a/contracts/feature-tests/composability/forwarder-legacy/wasm/src/lib.rs b/contracts/feature-tests/composability/forwarder-legacy/wasm/src/lib.rs
index 180b626b66..120b11b7cf 100644
--- a/contracts/feature-tests/composability/forwarder-legacy/wasm/src/lib.rs
+++ b/contracts/feature-tests/composability/forwarder-legacy/wasm/src/lib.rs
@@ -10,8 +10,6 @@
 // Total number of exported functions:  70
 
 #![no_std]
-#![allow(internal_features)]
-#![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
 multiversx_sc_wasm_adapter::panic_handler!();
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 e25422de65..7504443ae8 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
@@ -62,6 +62,7 @@ dependencies = [
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -70,6 +71,7 @@ version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -168,3 +170,9 @@ name = "unicode-ident"
 version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unwrap-infallible"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "151ac09978d3c2862c4e39b557f4eceee2cc72150bc4cb4f16abf061b6e381fb"
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 738ff2254d..cad1551134 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
@@ -21,6 +21,9 @@ debug = false
 panic = "abort"
 overflow-checks = false
 
+[profile.dev]
+panic = "abort"
+
 [dependencies.forwarder-queue]
 path = ".."
 
diff --git a/contracts/feature-tests/composability/forwarder-queue/wasm-forwarder-queue-promises/src/lib.rs b/contracts/feature-tests/composability/forwarder-queue/wasm-forwarder-queue-promises/src/lib.rs
index 639d22d1e1..1d83661126 100644
--- a/contracts/feature-tests/composability/forwarder-queue/wasm-forwarder-queue-promises/src/lib.rs
+++ b/contracts/feature-tests/composability/forwarder-queue/wasm-forwarder-queue-promises/src/lib.rs
@@ -11,8 +11,6 @@
 // Total number of exported functions:  13
 
 #![no_std]
-#![allow(internal_features)]
-#![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
 multiversx_sc_wasm_adapter::panic_handler!();
diff --git a/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock
index 568fd2b429..8a2ef8c020 100644
--- a/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock
@@ -62,6 +62,7 @@ dependencies = [
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -70,6 +71,7 @@ version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -168,3 +170,9 @@ name = "unicode-ident"
 version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unwrap-infallible"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "151ac09978d3c2862c4e39b557f4eceee2cc72150bc4cb4f16abf061b6e381fb"
diff --git a/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.toml b/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.toml
index 6e68841010..fbac1eb7ec 100644
--- a/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.toml
@@ -21,6 +21,9 @@ debug = false
 panic = "abort"
 overflow-checks = false
 
+[profile.dev]
+panic = "abort"
+
 [dependencies.forwarder-queue]
 path = ".."
 
diff --git a/contracts/feature-tests/composability/forwarder-queue/wasm/src/lib.rs b/contracts/feature-tests/composability/forwarder-queue/wasm/src/lib.rs
index 45c5b3c92f..7613a7ad95 100644
--- a/contracts/feature-tests/composability/forwarder-queue/wasm/src/lib.rs
+++ b/contracts/feature-tests/composability/forwarder-queue/wasm/src/lib.rs
@@ -10,8 +10,6 @@
 // Total number of exported functions:  12
 
 #![no_std]
-#![allow(internal_features)]
-#![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
 multiversx_sc_wasm_adapter::panic_handler!();
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 21a05a9eb7..70c4bf7dd1 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
@@ -62,6 +62,7 @@ dependencies = [
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -70,6 +71,7 @@ version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -168,3 +170,9 @@ name = "unicode-ident"
 version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unwrap-infallible"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "151ac09978d3c2862c4e39b557f4eceee2cc72150bc4cb4f16abf061b6e381fb"
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 628a019ba9..e030257845 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
@@ -21,6 +21,9 @@ debug = false
 panic = "abort"
 overflow-checks = false
 
+[profile.dev]
+panic = "abort"
+
 [dependencies.forwarder-raw]
 path = ".."
 
diff --git a/contracts/feature-tests/composability/forwarder-raw/wasm-forwarder-raw-init-async-call/src/lib.rs b/contracts/feature-tests/composability/forwarder-raw/wasm-forwarder-raw-init-async-call/src/lib.rs
index cd1297b69f..590e75b609 100644
--- a/contracts/feature-tests/composability/forwarder-raw/wasm-forwarder-raw-init-async-call/src/lib.rs
+++ b/contracts/feature-tests/composability/forwarder-raw/wasm-forwarder-raw-init-async-call/src/lib.rs
@@ -11,8 +11,6 @@
 // Total number of exported functions:   3
 
 #![no_std]
-#![allow(internal_features)]
-#![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
 multiversx_sc_wasm_adapter::panic_handler!();
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 e6fc2f76dc..c7a59d3589 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
@@ -62,6 +62,7 @@ dependencies = [
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -70,6 +71,7 @@ version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -168,3 +170,9 @@ name = "unicode-ident"
 version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unwrap-infallible"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "151ac09978d3c2862c4e39b557f4eceee2cc72150bc4cb4f16abf061b6e381fb"
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 4df2025d6e..c593100248 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
@@ -21,6 +21,9 @@ debug = false
 panic = "abort"
 overflow-checks = false
 
+[profile.dev]
+panic = "abort"
+
 [dependencies.forwarder-raw]
 path = ".."
 
diff --git a/contracts/feature-tests/composability/forwarder-raw/wasm-forwarder-raw-init-sync-call/src/lib.rs b/contracts/feature-tests/composability/forwarder-raw/wasm-forwarder-raw-init-sync-call/src/lib.rs
index dd5b4bb3b1..39a1ffb566 100644
--- a/contracts/feature-tests/composability/forwarder-raw/wasm-forwarder-raw-init-sync-call/src/lib.rs
+++ b/contracts/feature-tests/composability/forwarder-raw/wasm-forwarder-raw-init-sync-call/src/lib.rs
@@ -10,8 +10,6 @@
 // Total number of exported functions:   2
 
 #![no_std]
-#![allow(internal_features)]
-#![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
 multiversx_sc_wasm_adapter::panic_handler!();
diff --git a/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.lock
index 0ff5143f0a..f6256fab59 100755
--- a/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.lock
@@ -62,6 +62,7 @@ dependencies = [
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -70,6 +71,7 @@ version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -168,3 +170,9 @@ name = "unicode-ident"
 version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unwrap-infallible"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "151ac09978d3c2862c4e39b557f4eceee2cc72150bc4cb4f16abf061b6e381fb"
diff --git a/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.toml b/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.toml
index 2ada534753..8f81ce9f86 100644
--- a/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.toml
@@ -21,6 +21,9 @@ debug = false
 panic = "abort"
 overflow-checks = false
 
+[profile.dev]
+panic = "abort"
+
 [dependencies.forwarder-raw]
 path = ".."
 
diff --git a/contracts/feature-tests/composability/forwarder-raw/wasm/src/lib.rs b/contracts/feature-tests/composability/forwarder-raw/wasm/src/lib.rs
index 980ea6ce70..16ff76235c 100644
--- a/contracts/feature-tests/composability/forwarder-raw/wasm/src/lib.rs
+++ b/contracts/feature-tests/composability/forwarder-raw/wasm/src/lib.rs
@@ -10,8 +10,6 @@
 // Total number of exported functions:  27
 
 #![no_std]
-#![allow(internal_features)]
-#![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
 multiversx_sc_wasm_adapter::panic_handler!();
diff --git a/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock
index 574f224fed..e32f2d4cc8 100755
--- a/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock
@@ -62,6 +62,7 @@ dependencies = [
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -70,6 +71,7 @@ version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -168,3 +170,9 @@ name = "unicode-ident"
 version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unwrap-infallible"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "151ac09978d3c2862c4e39b557f4eceee2cc72150bc4cb4f16abf061b6e381fb"
diff --git a/contracts/feature-tests/composability/forwarder/wasm/Cargo.toml b/contracts/feature-tests/composability/forwarder/wasm/Cargo.toml
index f4afdbd6bc..a5298af2e0 100644
--- a/contracts/feature-tests/composability/forwarder/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder/wasm/Cargo.toml
@@ -21,6 +21,9 @@ debug = false
 panic = "abort"
 overflow-checks = false
 
+[profile.dev]
+panic = "abort"
+
 [dependencies.forwarder]
 path = ".."
 
diff --git a/contracts/feature-tests/composability/forwarder/wasm/src/lib.rs b/contracts/feature-tests/composability/forwarder/wasm/src/lib.rs
index 2fe9d2486c..fd2567f244 100644
--- a/contracts/feature-tests/composability/forwarder/wasm/src/lib.rs
+++ b/contracts/feature-tests/composability/forwarder/wasm/src/lib.rs
@@ -10,8 +10,6 @@
 // Total number of exported functions:  68
 
 #![no_std]
-#![allow(internal_features)]
-#![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
 multiversx_sc_wasm_adapter::panic_handler!();
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 3b8b768bbb..827e0c2700 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
@@ -62,6 +62,7 @@ dependencies = [
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -70,6 +71,7 @@ version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -168,3 +170,9 @@ name = "unicode-ident"
 version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unwrap-infallible"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "151ac09978d3c2862c4e39b557f4eceee2cc72150bc4cb4f16abf061b6e381fb"
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 5aebe2081a..5130c19326 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
@@ -21,6 +21,9 @@ debug = false
 panic = "abort"
 overflow-checks = false
 
+[profile.dev]
+panic = "abort"
+
 [dependencies.local-esdt-and-nft]
 path = ".."
 
diff --git a/contracts/feature-tests/composability/local-esdt-and-nft/wasm/src/lib.rs b/contracts/feature-tests/composability/local-esdt-and-nft/wasm/src/lib.rs
index 5bd9fa54c0..7fc777de65 100644
--- a/contracts/feature-tests/composability/local-esdt-and-nft/wasm/src/lib.rs
+++ b/contracts/feature-tests/composability/local-esdt-and-nft/wasm/src/lib.rs
@@ -10,8 +10,6 @@
 // Total number of exported functions:  20
 
 #![no_std]
-#![allow(internal_features)]
-#![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
 multiversx_sc_wasm_adapter::panic_handler!();
diff --git a/contracts/feature-tests/composability/promises-features/wasm/Cargo.lock b/contracts/feature-tests/composability/promises-features/wasm/Cargo.lock
index bb3a4eb0f1..798fb2efc5 100644
--- a/contracts/feature-tests/composability/promises-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/promises-features/wasm/Cargo.lock
@@ -47,6 +47,7 @@ dependencies = [
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -55,6 +56,7 @@ version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -168,3 +170,9 @@ name = "unicode-ident"
 version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unwrap-infallible"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "151ac09978d3c2862c4e39b557f4eceee2cc72150bc4cb4f16abf061b6e381fb"
diff --git a/contracts/feature-tests/composability/promises-features/wasm/Cargo.toml b/contracts/feature-tests/composability/promises-features/wasm/Cargo.toml
index ed1a31a561..528f5ad3ef 100644
--- a/contracts/feature-tests/composability/promises-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/promises-features/wasm/Cargo.toml
@@ -21,6 +21,9 @@ debug = false
 panic = "abort"
 overflow-checks = false
 
+[profile.dev]
+panic = "abort"
+
 [dependencies.promises-features]
 path = ".."
 
diff --git a/contracts/feature-tests/composability/promises-features/wasm/src/lib.rs b/contracts/feature-tests/composability/promises-features/wasm/src/lib.rs
index e9b079caf6..1dc649df0d 100644
--- a/contracts/feature-tests/composability/promises-features/wasm/src/lib.rs
+++ b/contracts/feature-tests/composability/promises-features/wasm/src/lib.rs
@@ -11,8 +11,6 @@
 // Total number of exported functions:  15
 
 #![no_std]
-#![allow(internal_features)]
-#![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
 multiversx_sc_wasm_adapter::panic_handler!();
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 dc198f5877..a7fb1045c9 100755
--- a/contracts/feature-tests/composability/proxy-test-first/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/proxy-test-first/wasm/Cargo.lock
@@ -47,6 +47,7 @@ dependencies = [
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -55,6 +56,7 @@ version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -169,3 +171,9 @@ name = "unicode-ident"
 version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unwrap-infallible"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "151ac09978d3c2862c4e39b557f4eceee2cc72150bc4cb4f16abf061b6e381fb"
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 9ae8feb646..db6e8bb399 100644
--- a/contracts/feature-tests/composability/proxy-test-first/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/proxy-test-first/wasm/Cargo.toml
@@ -21,6 +21,9 @@ debug = false
 panic = "abort"
 overflow-checks = false
 
+[profile.dev]
+panic = "abort"
+
 [dependencies.proxy-test-first]
 path = ".."
 
diff --git a/contracts/feature-tests/composability/proxy-test-first/wasm/src/lib.rs b/contracts/feature-tests/composability/proxy-test-first/wasm/src/lib.rs
index f9ce7c6833..9f5f0bb847 100644
--- a/contracts/feature-tests/composability/proxy-test-first/wasm/src/lib.rs
+++ b/contracts/feature-tests/composability/proxy-test-first/wasm/src/lib.rs
@@ -10,8 +10,6 @@
 // Total number of exported functions:   8
 
 #![no_std]
-#![allow(internal_features)]
-#![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!(static64k);
 multiversx_sc_wasm_adapter::panic_handler!();
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 3061dd4018..a2c21a5277 100755
--- a/contracts/feature-tests/composability/proxy-test-second/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/proxy-test-second/wasm/Cargo.lock
@@ -47,6 +47,7 @@ dependencies = [
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -55,6 +56,7 @@ version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -168,3 +170,9 @@ name = "unicode-ident"
 version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unwrap-infallible"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "151ac09978d3c2862c4e39b557f4eceee2cc72150bc4cb4f16abf061b6e381fb"
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 f5f1de43bf..1d1aa84adc 100644
--- a/contracts/feature-tests/composability/proxy-test-second/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/proxy-test-second/wasm/Cargo.toml
@@ -21,6 +21,9 @@ debug = false
 panic = "abort"
 overflow-checks = false
 
+[profile.dev]
+panic = "abort"
+
 [dependencies.proxy-test-second]
 path = ".."
 
diff --git a/contracts/feature-tests/composability/proxy-test-second/wasm/src/lib.rs b/contracts/feature-tests/composability/proxy-test-second/wasm/src/lib.rs
index d920e6b80c..b2e0cd610d 100644
--- a/contracts/feature-tests/composability/proxy-test-second/wasm/src/lib.rs
+++ b/contracts/feature-tests/composability/proxy-test-second/wasm/src/lib.rs
@@ -11,8 +11,6 @@
 // Total number of exported functions:   6
 
 #![no_std]
-#![allow(internal_features)]
-#![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!(static64k);
 multiversx_sc_wasm_adapter::panic_handler!();
diff --git a/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.lock b/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.lock
index a72449da83..1a9593a100 100755
--- a/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.lock
@@ -47,6 +47,7 @@ dependencies = [
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -55,6 +56,7 @@ version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -170,6 +172,12 @@ version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
 
+[[package]]
+name = "unwrap-infallible"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "151ac09978d3c2862c4e39b557f4eceee2cc72150bc4cb4f16abf061b6e381fb"
+
 [[package]]
 name = "vault"
 version = "0.0.0"
diff --git a/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.toml b/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.toml
index 7f026d2bf6..c41db08c8d 100644
--- a/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.toml
@@ -21,6 +21,9 @@ debug = false
 panic = "abort"
 overflow-checks = false
 
+[profile.dev]
+panic = "abort"
+
 [dependencies.recursive-caller]
 path = ".."
 
diff --git a/contracts/feature-tests/composability/recursive-caller/wasm/src/lib.rs b/contracts/feature-tests/composability/recursive-caller/wasm/src/lib.rs
index 3e2da1f9b6..a129056010 100644
--- a/contracts/feature-tests/composability/recursive-caller/wasm/src/lib.rs
+++ b/contracts/feature-tests/composability/recursive-caller/wasm/src/lib.rs
@@ -10,8 +10,6 @@
 // Total number of exported functions:   3
 
 #![no_std]
-#![allow(internal_features)]
-#![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
 multiversx_sc_wasm_adapter::panic_handler!();
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 6af6ebb20e..03f068e55d 100644
--- a/contracts/feature-tests/composability/transfer-role-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/transfer-role-features/wasm/Cargo.lock
@@ -47,6 +47,7 @@ dependencies = [
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -55,6 +56,7 @@ version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -176,3 +178,9 @@ name = "unicode-ident"
 version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unwrap-infallible"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "151ac09978d3c2862c4e39b557f4eceee2cc72150bc4cb4f16abf061b6e381fb"
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 9c071c6f48..7611455289 100644
--- a/contracts/feature-tests/composability/transfer-role-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/transfer-role-features/wasm/Cargo.toml
@@ -21,6 +21,9 @@ debug = false
 panic = "abort"
 overflow-checks = false
 
+[profile.dev]
+panic = "abort"
+
 [dependencies.transfer-role-features]
 path = ".."
 
diff --git a/contracts/feature-tests/composability/transfer-role-features/wasm/src/lib.rs b/contracts/feature-tests/composability/transfer-role-features/wasm/src/lib.rs
index 317595fcea..9f507871cd 100644
--- a/contracts/feature-tests/composability/transfer-role-features/wasm/src/lib.rs
+++ b/contracts/feature-tests/composability/transfer-role-features/wasm/src/lib.rs
@@ -10,8 +10,6 @@
 // Total number of exported functions:   3
 
 #![no_std]
-#![allow(internal_features)]
-#![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
 multiversx_sc_wasm_adapter::panic_handler!();
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 cbff398e5d..e7814de3fe 100644
--- a/contracts/feature-tests/composability/vault/wasm-vault-promises/Cargo.lock
+++ b/contracts/feature-tests/composability/vault/wasm-vault-promises/Cargo.lock
@@ -47,6 +47,7 @@ dependencies = [
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -55,6 +56,7 @@ version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -154,6 +156,12 @@ version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
 
+[[package]]
+name = "unwrap-infallible"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "151ac09978d3c2862c4e39b557f4eceee2cc72150bc4cb4f16abf061b6e381fb"
+
 [[package]]
 name = "vault"
 version = "0.0.0"
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 ce209e8861..c15f4e3fcb 100644
--- a/contracts/feature-tests/composability/vault/wasm-vault-promises/Cargo.toml
+++ b/contracts/feature-tests/composability/vault/wasm-vault-promises/Cargo.toml
@@ -21,6 +21,9 @@ debug = false
 panic = "abort"
 overflow-checks = false
 
+[profile.dev]
+panic = "abort"
+
 [dependencies.vault]
 path = ".."
 
diff --git a/contracts/feature-tests/composability/vault/wasm-vault-promises/src/lib.rs b/contracts/feature-tests/composability/vault/wasm-vault-promises/src/lib.rs
index 6a814f3b57..014291f680 100644
--- a/contracts/feature-tests/composability/vault/wasm-vault-promises/src/lib.rs
+++ b/contracts/feature-tests/composability/vault/wasm-vault-promises/src/lib.rs
@@ -10,8 +10,6 @@
 // Total number of exported functions:  18
 
 #![no_std]
-#![allow(internal_features)]
-#![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
 multiversx_sc_wasm_adapter::panic_handler!();
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 1a01ab9815..a6af059da3 100644
--- a/contracts/feature-tests/composability/vault/wasm-vault-upgrade/Cargo.lock
+++ b/contracts/feature-tests/composability/vault/wasm-vault-upgrade/Cargo.lock
@@ -47,6 +47,7 @@ dependencies = [
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -55,6 +56,7 @@ version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -154,6 +156,12 @@ version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
 
+[[package]]
+name = "unwrap-infallible"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "151ac09978d3c2862c4e39b557f4eceee2cc72150bc4cb4f16abf061b6e381fb"
+
 [[package]]
 name = "vault"
 version = "0.0.0"
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 c09b60d9bd..8b00dd7f79 100644
--- a/contracts/feature-tests/composability/vault/wasm-vault-upgrade/Cargo.toml
+++ b/contracts/feature-tests/composability/vault/wasm-vault-upgrade/Cargo.toml
@@ -21,6 +21,9 @@ debug = false
 panic = "abort"
 overflow-checks = false
 
+[profile.dev]
+panic = "abort"
+
 [dependencies.vault]
 path = ".."
 
diff --git a/contracts/feature-tests/composability/vault/wasm-vault-upgrade/src/lib.rs b/contracts/feature-tests/composability/vault/wasm-vault-upgrade/src/lib.rs
index 1592f8eec6..15f7408f1f 100644
--- a/contracts/feature-tests/composability/vault/wasm-vault-upgrade/src/lib.rs
+++ b/contracts/feature-tests/composability/vault/wasm-vault-upgrade/src/lib.rs
@@ -10,8 +10,6 @@
 // Total number of exported functions:   2
 
 #![no_std]
-#![allow(internal_features)]
-#![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
 multiversx_sc_wasm_adapter::panic_handler!();
diff --git a/contracts/feature-tests/composability/vault/wasm/Cargo.lock b/contracts/feature-tests/composability/vault/wasm/Cargo.lock
index 07c100c584..535771da90 100755
--- a/contracts/feature-tests/composability/vault/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/vault/wasm/Cargo.lock
@@ -47,6 +47,7 @@ dependencies = [
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -55,6 +56,7 @@ version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -154,6 +156,12 @@ version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
 
+[[package]]
+name = "unwrap-infallible"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "151ac09978d3c2862c4e39b557f4eceee2cc72150bc4cb4f16abf061b6e381fb"
+
 [[package]]
 name = "vault"
 version = "0.0.0"
diff --git a/contracts/feature-tests/composability/vault/wasm/Cargo.toml b/contracts/feature-tests/composability/vault/wasm/Cargo.toml
index 5556a14d7c..b2c689042d 100644
--- a/contracts/feature-tests/composability/vault/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/vault/wasm/Cargo.toml
@@ -21,6 +21,9 @@ debug = false
 panic = "abort"
 overflow-checks = false
 
+[profile.dev]
+panic = "abort"
+
 [dependencies.vault]
 path = ".."
 
diff --git a/contracts/feature-tests/composability/vault/wasm/src/lib.rs b/contracts/feature-tests/composability/vault/wasm/src/lib.rs
index 30a7fadf8b..9849ddf8ae 100644
--- a/contracts/feature-tests/composability/vault/wasm/src/lib.rs
+++ b/contracts/feature-tests/composability/vault/wasm/src/lib.rs
@@ -11,8 +11,6 @@
 // Total number of exported functions:  18
 
 #![no_std]
-#![allow(internal_features)]
-#![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
 multiversx_sc_wasm_adapter::panic_handler!();
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 892b386530..70f19c039e 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
@@ -70,6 +70,7 @@ dependencies = [
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -78,6 +79,7 @@ version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -176,3 +178,9 @@ name = "unicode-ident"
 version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unwrap-infallible"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "151ac09978d3c2862c4e39b557f4eceee2cc72150bc4cb4f16abf061b6e381fb"
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 846a20893b..353260c769 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
@@ -21,6 +21,9 @@ debug = false
 panic = "abort"
 overflow-checks = false
 
+[profile.dev]
+panic = "abort"
+
 [dependencies.crowdfunding-erc20]
 path = ".."
 
diff --git a/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/wasm/src/lib.rs b/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/wasm/src/lib.rs
index d71ab01834..2493301277 100644
--- a/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/wasm/src/lib.rs
+++ b/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/wasm/src/lib.rs
@@ -10,8 +10,6 @@
 // Total number of exported functions:  10
 
 #![no_std]
-#![allow(internal_features)]
-#![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
 multiversx_sc_wasm_adapter::panic_handler!();
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 8207501bb8..61db6090c6 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
@@ -70,6 +70,7 @@ dependencies = [
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -78,6 +79,7 @@ version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -176,3 +178,9 @@ name = "unicode-ident"
 version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unwrap-infallible"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "151ac09978d3c2862c4e39b557f4eceee2cc72150bc4cb4f16abf061b6e381fb"
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 cc9804afef..4ab22904d3 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
@@ -21,6 +21,9 @@ debug = false
 panic = "abort"
 overflow-checks = false
 
+[profile.dev]
+panic = "abort"
+
 [dependencies.erc1155-marketplace]
 path = ".."
 
diff --git a/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/wasm/src/lib.rs b/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/wasm/src/lib.rs
index 442a245237..4cb87cbdfd 100644
--- a/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/wasm/src/lib.rs
+++ b/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/wasm/src/lib.rs
@@ -10,8 +10,6 @@
 // Total number of exported functions:  14
 
 #![no_std]
-#![allow(internal_features)]
-#![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!(static64k);
 multiversx_sc_wasm_adapter::panic_handler!();
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 238894c1be..b5bd1e2e54 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
@@ -62,6 +62,7 @@ dependencies = [
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -70,6 +71,7 @@ version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -168,3 +170,9 @@ name = "unicode-ident"
 version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unwrap-infallible"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "151ac09978d3c2862c4e39b557f4eceee2cc72150bc4cb4f16abf061b6e381fb"
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 e993861b13..a643999ba9 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
@@ -21,6 +21,9 @@ debug = false
 panic = "abort"
 overflow-checks = false
 
+[profile.dev]
+panic = "abort"
+
 [dependencies.erc1155-user-mock]
 path = ".."
 
diff --git a/contracts/feature-tests/erc-style-contracts/erc1155-user-mock/wasm/src/lib.rs b/contracts/feature-tests/erc-style-contracts/erc1155-user-mock/wasm/src/lib.rs
index f3281811d5..a0c2470012 100644
--- a/contracts/feature-tests/erc-style-contracts/erc1155-user-mock/wasm/src/lib.rs
+++ b/contracts/feature-tests/erc-style-contracts/erc1155-user-mock/wasm/src/lib.rs
@@ -10,8 +10,6 @@
 // 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!();
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 9c0eff36ac..0ed0c6f26c 100644
--- a/contracts/feature-tests/erc-style-contracts/erc1155/wasm/Cargo.lock
+++ b/contracts/feature-tests/erc-style-contracts/erc1155/wasm/Cargo.lock
@@ -62,6 +62,7 @@ dependencies = [
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -70,6 +71,7 @@ version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -168,3 +170,9 @@ name = "unicode-ident"
 version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unwrap-infallible"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "151ac09978d3c2862c4e39b557f4eceee2cc72150bc4cb4f16abf061b6e381fb"
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 1f64f8f90b..edae4b9512 100644
--- a/contracts/feature-tests/erc-style-contracts/erc1155/wasm/Cargo.toml
+++ b/contracts/feature-tests/erc-style-contracts/erc1155/wasm/Cargo.toml
@@ -21,6 +21,9 @@ debug = false
 panic = "abort"
 overflow-checks = false
 
+[profile.dev]
+panic = "abort"
+
 [dependencies.erc1155]
 path = ".."
 
diff --git a/contracts/feature-tests/erc-style-contracts/erc1155/wasm/src/lib.rs b/contracts/feature-tests/erc-style-contracts/erc1155/wasm/src/lib.rs
index 051c2d54fa..f3fcf7cd71 100644
--- a/contracts/feature-tests/erc-style-contracts/erc1155/wasm/src/lib.rs
+++ b/contracts/feature-tests/erc-style-contracts/erc1155/wasm/src/lib.rs
@@ -10,8 +10,6 @@
 // Total number of exported functions:  15
 
 #![no_std]
-#![allow(internal_features)]
-#![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!(static64k);
 multiversx_sc_wasm_adapter::panic_handler!();
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 96b0e0dd78..b88c35d4cf 100644
--- a/contracts/feature-tests/erc-style-contracts/erc20/wasm/Cargo.lock
+++ b/contracts/feature-tests/erc-style-contracts/erc20/wasm/Cargo.lock
@@ -62,6 +62,7 @@ dependencies = [
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -70,6 +71,7 @@ version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -168,3 +170,9 @@ name = "unicode-ident"
 version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unwrap-infallible"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "151ac09978d3c2862c4e39b557f4eceee2cc72150bc4cb4f16abf061b6e381fb"
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 baf2d29699..737591bb25 100644
--- a/contracts/feature-tests/erc-style-contracts/erc20/wasm/Cargo.toml
+++ b/contracts/feature-tests/erc-style-contracts/erc20/wasm/Cargo.toml
@@ -21,6 +21,9 @@ debug = false
 panic = "abort"
 overflow-checks = false
 
+[profile.dev]
+panic = "abort"
+
 [dependencies.erc20]
 path = ".."
 
diff --git a/contracts/feature-tests/erc-style-contracts/erc20/wasm/src/lib.rs b/contracts/feature-tests/erc-style-contracts/erc20/wasm/src/lib.rs
index 22fe14729a..0a3607ddc0 100644
--- a/contracts/feature-tests/erc-style-contracts/erc20/wasm/src/lib.rs
+++ b/contracts/feature-tests/erc-style-contracts/erc20/wasm/src/lib.rs
@@ -10,8 +10,6 @@
 // Total number of exported functions:   8
 
 #![no_std]
-#![allow(internal_features)]
-#![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
 multiversx_sc_wasm_adapter::panic_handler!();
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 3f6cc428c2..beda86f834 100644
--- a/contracts/feature-tests/erc-style-contracts/erc721/wasm/Cargo.lock
+++ b/contracts/feature-tests/erc-style-contracts/erc721/wasm/Cargo.lock
@@ -62,6 +62,7 @@ dependencies = [
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -70,6 +71,7 @@ version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -168,3 +170,9 @@ name = "unicode-ident"
 version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unwrap-infallible"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "151ac09978d3c2862c4e39b557f4eceee2cc72150bc4cb4f16abf061b6e381fb"
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 c248eadc43..883748a64d 100644
--- a/contracts/feature-tests/erc-style-contracts/erc721/wasm/Cargo.toml
+++ b/contracts/feature-tests/erc-style-contracts/erc721/wasm/Cargo.toml
@@ -21,6 +21,9 @@ debug = false
 panic = "abort"
 overflow-checks = false
 
+[profile.dev]
+panic = "abort"
+
 [dependencies.erc721]
 path = ".."
 
diff --git a/contracts/feature-tests/erc-style-contracts/erc721/wasm/src/lib.rs b/contracts/feature-tests/erc-style-contracts/erc721/wasm/src/lib.rs
index 1f97c9968b..4adcd25ca0 100644
--- a/contracts/feature-tests/erc-style-contracts/erc721/wasm/src/lib.rs
+++ b/contracts/feature-tests/erc-style-contracts/erc721/wasm/src/lib.rs
@@ -10,8 +10,6 @@
 // Total number of exported functions:  10
 
 #![no_std]
-#![allow(internal_features)]
-#![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
 multiversx_sc_wasm_adapter::panic_handler!();
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 4beaf5a751..25805516fc 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
@@ -70,6 +70,7 @@ dependencies = [
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -78,6 +79,7 @@ version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -176,3 +178,9 @@ name = "unicode-ident"
 version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unwrap-infallible"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "151ac09978d3c2862c4e39b557f4eceee2cc72150bc4cb4f16abf061b6e381fb"
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 5538ad6642..a60943441f 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
@@ -21,6 +21,9 @@ debug = false
 panic = "abort"
 overflow-checks = false
 
+[profile.dev]
+panic = "abort"
+
 [dependencies.lottery-erc20]
 path = ".."
 
diff --git a/contracts/feature-tests/erc-style-contracts/lottery-erc20/wasm/src/lib.rs b/contracts/feature-tests/erc-style-contracts/lottery-erc20/wasm/src/lib.rs
index ff416cf4b9..b247fc3493 100644
--- a/contracts/feature-tests/erc-style-contracts/lottery-erc20/wasm/src/lib.rs
+++ b/contracts/feature-tests/erc-style-contracts/lottery-erc20/wasm/src/lib.rs
@@ -10,8 +10,6 @@
 // Total number of exported functions:   9
 
 #![no_std]
-#![allow(internal_features)]
-#![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!(static64k);
 multiversx_sc_wasm_adapter::panic_handler!();
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 8ab3a45af6..bd9b34096b 100644
--- a/contracts/feature-tests/esdt-system-sc-mock/wasm/Cargo.lock
+++ b/contracts/feature-tests/esdt-system-sc-mock/wasm/Cargo.lock
@@ -62,6 +62,7 @@ dependencies = [
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -70,6 +71,7 @@ version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -168,3 +170,9 @@ name = "unicode-ident"
 version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unwrap-infallible"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "151ac09978d3c2862c4e39b557f4eceee2cc72150bc4cb4f16abf061b6e381fb"
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 9ab183ed3f..2a12a6d9ab 100644
--- a/contracts/feature-tests/esdt-system-sc-mock/wasm/Cargo.toml
+++ b/contracts/feature-tests/esdt-system-sc-mock/wasm/Cargo.toml
@@ -21,6 +21,9 @@ debug = false
 panic = "abort"
 overflow-checks = false
 
+[profile.dev]
+panic = "abort"
+
 [dependencies.esdt-system-sc-mock]
 path = ".."
 
diff --git a/contracts/feature-tests/esdt-system-sc-mock/wasm/src/lib.rs b/contracts/feature-tests/esdt-system-sc-mock/wasm/src/lib.rs
index 24e6d08cd1..8301d8cf9c 100644
--- a/contracts/feature-tests/esdt-system-sc-mock/wasm/src/lib.rs
+++ b/contracts/feature-tests/esdt-system-sc-mock/wasm/src/lib.rs
@@ -10,8 +10,6 @@
 // Total number of exported functions:   8
 
 #![no_std]
-#![allow(internal_features)]
-#![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
 multiversx_sc_wasm_adapter::panic_handler!();
diff --git a/contracts/feature-tests/exchange-features/wasm/Cargo.lock b/contracts/feature-tests/exchange-features/wasm/Cargo.lock
index 4580ca7fa2..69c406fcf8 100644
--- a/contracts/feature-tests/exchange-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/exchange-features/wasm/Cargo.lock
@@ -62,6 +62,7 @@ dependencies = [
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -70,6 +71,7 @@ version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -168,3 +170,9 @@ name = "unicode-ident"
 version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unwrap-infallible"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "151ac09978d3c2862c4e39b557f4eceee2cc72150bc4cb4f16abf061b6e381fb"
diff --git a/contracts/feature-tests/exchange-features/wasm/Cargo.toml b/contracts/feature-tests/exchange-features/wasm/Cargo.toml
index 415f4440cb..a4f0852da8 100644
--- a/contracts/feature-tests/exchange-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/exchange-features/wasm/Cargo.toml
@@ -21,6 +21,9 @@ debug = false
 panic = "abort"
 overflow-checks = false
 
+[profile.dev]
+panic = "abort"
+
 [dependencies.exchange-features]
 path = ".."
 
diff --git a/contracts/feature-tests/exchange-features/wasm/src/lib.rs b/contracts/feature-tests/exchange-features/wasm/src/lib.rs
index 944349b256..b420653525 100644
--- a/contracts/feature-tests/exchange-features/wasm/src/lib.rs
+++ b/contracts/feature-tests/exchange-features/wasm/src/lib.rs
@@ -11,8 +11,6 @@
 // Total number of exported functions:   5
 
 #![no_std]
-#![allow(internal_features)]
-#![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
 multiversx_sc_wasm_adapter::panic_handler!();
diff --git a/contracts/feature-tests/formatted-message-features/wasm/Cargo.lock b/contracts/feature-tests/formatted-message-features/wasm/Cargo.lock
index 5539245761..f1ab6b2c73 100644
--- a/contracts/feature-tests/formatted-message-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/formatted-message-features/wasm/Cargo.lock
@@ -62,6 +62,7 @@ dependencies = [
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -70,6 +71,7 @@ version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -168,3 +170,9 @@ name = "unicode-ident"
 version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unwrap-infallible"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "151ac09978d3c2862c4e39b557f4eceee2cc72150bc4cb4f16abf061b6e381fb"
diff --git a/contracts/feature-tests/formatted-message-features/wasm/Cargo.toml b/contracts/feature-tests/formatted-message-features/wasm/Cargo.toml
index 3b59f56fac..dc6fa80f06 100644
--- a/contracts/feature-tests/formatted-message-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/formatted-message-features/wasm/Cargo.toml
@@ -21,6 +21,9 @@ debug = false
 panic = "abort"
 overflow-checks = false
 
+[profile.dev]
+panic = "abort"
+
 [dependencies.formatted-message-features]
 path = ".."
 
diff --git a/contracts/feature-tests/formatted-message-features/wasm/src/lib.rs b/contracts/feature-tests/formatted-message-features/wasm/src/lib.rs
index 7a07a6ec82..34c6f81e59 100644
--- a/contracts/feature-tests/formatted-message-features/wasm/src/lib.rs
+++ b/contracts/feature-tests/formatted-message-features/wasm/src/lib.rs
@@ -10,8 +10,6 @@
 // Total number of exported functions:  18
 
 #![no_std]
-#![allow(internal_features)]
-#![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
 multiversx_sc_wasm_adapter::panic_handler!();
diff --git a/contracts/feature-tests/managed-map-features/wasm/Cargo.lock b/contracts/feature-tests/managed-map-features/wasm/Cargo.lock
index a4d915beb4..3a15719b4c 100644
--- a/contracts/feature-tests/managed-map-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/managed-map-features/wasm/Cargo.lock
@@ -62,6 +62,7 @@ dependencies = [
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -70,6 +71,7 @@ version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -168,3 +170,9 @@ name = "unicode-ident"
 version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unwrap-infallible"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "151ac09978d3c2862c4e39b557f4eceee2cc72150bc4cb4f16abf061b6e381fb"
diff --git a/contracts/feature-tests/managed-map-features/wasm/Cargo.toml b/contracts/feature-tests/managed-map-features/wasm/Cargo.toml
index 2124503c5e..7451a29f06 100644
--- a/contracts/feature-tests/managed-map-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/managed-map-features/wasm/Cargo.toml
@@ -21,6 +21,9 @@ debug = false
 panic = "abort"
 overflow-checks = false
 
+[profile.dev]
+panic = "abort"
+
 [dependencies.managed-map-features]
 path = ".."
 
diff --git a/contracts/feature-tests/managed-map-features/wasm/src/lib.rs b/contracts/feature-tests/managed-map-features/wasm/src/lib.rs
index 2f32f8bf49..943fc9cb9a 100644
--- a/contracts/feature-tests/managed-map-features/wasm/src/lib.rs
+++ b/contracts/feature-tests/managed-map-features/wasm/src/lib.rs
@@ -10,8 +10,6 @@
 // Total number of exported functions:   5
 
 #![no_std]
-#![allow(internal_features)]
-#![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
 multiversx_sc_wasm_adapter::panic_handler!();
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 ef7b7dd9e6..2b979d5734 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
@@ -62,6 +62,7 @@ dependencies = [
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -70,6 +71,7 @@ version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -168,3 +170,9 @@ name = "unicode-ident"
 version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unwrap-infallible"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "151ac09978d3c2862c4e39b557f4eceee2cc72150bc4cb4f16abf061b6e381fb"
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 bb41653159..1ad18e13e1 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
@@ -21,6 +21,9 @@ debug = false
 panic = "abort"
 overflow-checks = false
 
+[profile.dev]
+panic = "abort"
+
 [dependencies.multi-contract-features]
 path = ".."
 
diff --git a/contracts/feature-tests/multi-contract-features/wasm-multi-contract-alt-impl/src/lib.rs b/contracts/feature-tests/multi-contract-features/wasm-multi-contract-alt-impl/src/lib.rs
index ba8838b6e4..3a496abdbe 100644
--- a/contracts/feature-tests/multi-contract-features/wasm-multi-contract-alt-impl/src/lib.rs
+++ b/contracts/feature-tests/multi-contract-features/wasm-multi-contract-alt-impl/src/lib.rs
@@ -10,8 +10,6 @@
 // Total number of exported functions:   3
 
 #![no_std]
-#![allow(internal_features)]
-#![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
 multiversx_sc_wasm_adapter::panic_handler!();
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 009eb5a826..31641794f0 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
@@ -62,6 +62,7 @@ dependencies = [
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -70,6 +71,7 @@ version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -168,3 +170,9 @@ name = "unicode-ident"
 version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unwrap-infallible"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "151ac09978d3c2862c4e39b557f4eceee2cc72150bc4cb4f16abf061b6e381fb"
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 458be4822b..5f56a568a8 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
@@ -21,6 +21,9 @@ debug = false
 panic = "abort"
 overflow-checks = false
 
+[profile.dev]
+panic = "abort"
+
 [dependencies.multi-contract-features]
 path = ".."
 features = ["example_feature"]
diff --git a/contracts/feature-tests/multi-contract-features/wasm-multi-contract-example-feature/src/lib.rs b/contracts/feature-tests/multi-contract-features/wasm-multi-contract-example-feature/src/lib.rs
index 655e83240c..9602c289bf 100644
--- a/contracts/feature-tests/multi-contract-features/wasm-multi-contract-example-feature/src/lib.rs
+++ b/contracts/feature-tests/multi-contract-features/wasm-multi-contract-example-feature/src/lib.rs
@@ -10,8 +10,6 @@
 // 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!();
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 b32b3af13d..8393f20a47 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
@@ -62,6 +62,7 @@ dependencies = [
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -70,6 +71,7 @@ version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -168,3 +170,9 @@ name = "unicode-ident"
 version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unwrap-infallible"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "151ac09978d3c2862c4e39b557f4eceee2cc72150bc4cb4f16abf061b6e381fb"
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 43e72ed5d9..7ff6790e03 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
@@ -21,6 +21,9 @@ debug = false
 panic = "abort"
 overflow-checks = false
 
+[profile.dev]
+panic = "abort"
+
 [dependencies.multi-contract-features]
 path = ".."
 
diff --git a/contracts/feature-tests/multi-contract-features/wasm-multi-contract-features-view/src/lib.rs b/contracts/feature-tests/multi-contract-features/wasm-multi-contract-features-view/src/lib.rs
index 871bfb5bca..85b69baf08 100644
--- a/contracts/feature-tests/multi-contract-features/wasm-multi-contract-features-view/src/lib.rs
+++ b/contracts/feature-tests/multi-contract-features/wasm-multi-contract-features-view/src/lib.rs
@@ -10,8 +10,6 @@
 // Total number of exported functions:   5
 
 #![no_std]
-#![allow(internal_features)]
-#![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
 multiversx_sc_wasm_adapter::panic_handler!();
diff --git a/contracts/feature-tests/multi-contract-features/wasm/Cargo.lock b/contracts/feature-tests/multi-contract-features/wasm/Cargo.lock
index 55f0d7e4de..ecb432decb 100755
--- a/contracts/feature-tests/multi-contract-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/multi-contract-features/wasm/Cargo.lock
@@ -62,6 +62,7 @@ dependencies = [
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -70,6 +71,7 @@ version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -168,3 +170,9 @@ name = "unicode-ident"
 version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unwrap-infallible"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "151ac09978d3c2862c4e39b557f4eceee2cc72150bc4cb4f16abf061b6e381fb"
diff --git a/contracts/feature-tests/multi-contract-features/wasm/Cargo.toml b/contracts/feature-tests/multi-contract-features/wasm/Cargo.toml
index 5839b62616..1a86cf9c8d 100644
--- a/contracts/feature-tests/multi-contract-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/multi-contract-features/wasm/Cargo.toml
@@ -21,6 +21,9 @@ debug = false
 panic = "abort"
 overflow-checks = false
 
+[profile.dev]
+panic = "abort"
+
 [dependencies.multi-contract-features]
 path = ".."
 
diff --git a/contracts/feature-tests/multi-contract-features/wasm/src/lib.rs b/contracts/feature-tests/multi-contract-features/wasm/src/lib.rs
index 655e83240c..9602c289bf 100644
--- a/contracts/feature-tests/multi-contract-features/wasm/src/lib.rs
+++ b/contracts/feature-tests/multi-contract-features/wasm/src/lib.rs
@@ -10,8 +10,6 @@
 // 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!();
diff --git a/contracts/feature-tests/panic-message-features/wasm/Cargo.lock b/contracts/feature-tests/panic-message-features/wasm/Cargo.lock
index 4b9d2dd045..669be54be6 100755
--- a/contracts/feature-tests/panic-message-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/panic-message-features/wasm/Cargo.lock
@@ -47,6 +47,7 @@ dependencies = [
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -55,6 +56,7 @@ version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -168,3 +170,9 @@ name = "unicode-ident"
 version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unwrap-infallible"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "151ac09978d3c2862c4e39b557f4eceee2cc72150bc4cb4f16abf061b6e381fb"
diff --git a/contracts/feature-tests/panic-message-features/wasm/Cargo.toml b/contracts/feature-tests/panic-message-features/wasm/Cargo.toml
index 92951f91d9..49e1111e0a 100644
--- a/contracts/feature-tests/panic-message-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/panic-message-features/wasm/Cargo.toml
@@ -21,6 +21,9 @@ debug = false
 panic = "abort"
 overflow-checks = false
 
+[profile.dev]
+panic = "abort"
+
 [dependencies.panic-message-features]
 path = ".."
 
diff --git a/contracts/feature-tests/panic-message-features/wasm/src/lib.rs b/contracts/feature-tests/panic-message-features/wasm/src/lib.rs
index a347a1aaa3..b42857cfc0 100644
--- a/contracts/feature-tests/panic-message-features/wasm/src/lib.rs
+++ b/contracts/feature-tests/panic-message-features/wasm/src/lib.rs
@@ -10,8 +10,6 @@
 // Total number of exported functions:   5
 
 #![no_std]
-#![allow(internal_features)]
-#![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
 multiversx_sc_wasm_adapter::panic_handler_with_message!();
diff --git a/contracts/feature-tests/payable-features/wasm/Cargo.lock b/contracts/feature-tests/payable-features/wasm/Cargo.lock
index bb15e9082b..95c693e19b 100755
--- a/contracts/feature-tests/payable-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/payable-features/wasm/Cargo.lock
@@ -47,6 +47,7 @@ dependencies = [
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -55,6 +56,7 @@ version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -168,3 +170,9 @@ name = "unicode-ident"
 version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unwrap-infallible"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "151ac09978d3c2862c4e39b557f4eceee2cc72150bc4cb4f16abf061b6e381fb"
diff --git a/contracts/feature-tests/payable-features/wasm/Cargo.toml b/contracts/feature-tests/payable-features/wasm/Cargo.toml
index 0ef022a269..20041a83c9 100644
--- a/contracts/feature-tests/payable-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/payable-features/wasm/Cargo.toml
@@ -21,6 +21,9 @@ debug = false
 panic = "abort"
 overflow-checks = false
 
+[profile.dev]
+panic = "abort"
+
 [dependencies.payable-features]
 path = ".."
 
diff --git a/contracts/feature-tests/payable-features/wasm/src/lib.rs b/contracts/feature-tests/payable-features/wasm/src/lib.rs
index 9614f000c0..41f085e638 100644
--- a/contracts/feature-tests/payable-features/wasm/src/lib.rs
+++ b/contracts/feature-tests/payable-features/wasm/src/lib.rs
@@ -10,8 +10,6 @@
 // Total number of exported functions:  17
 
 #![no_std]
-#![allow(internal_features)]
-#![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
 multiversx_sc_wasm_adapter::panic_handler!();
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 f13fb3b27a..8883d18727 100644
--- a/contracts/feature-tests/rust-snippets-generator-test/wasm/Cargo.lock
+++ b/contracts/feature-tests/rust-snippets-generator-test/wasm/Cargo.lock
@@ -47,6 +47,7 @@ dependencies = [
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -55,6 +56,7 @@ version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -168,3 +170,9 @@ name = "unicode-ident"
 version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unwrap-infallible"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "151ac09978d3c2862c4e39b557f4eceee2cc72150bc4cb4f16abf061b6e381fb"
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 200d74fe46..ea261b7c3a 100644
--- a/contracts/feature-tests/rust-snippets-generator-test/wasm/Cargo.toml
+++ b/contracts/feature-tests/rust-snippets-generator-test/wasm/Cargo.toml
@@ -21,6 +21,9 @@ debug = false
 panic = "abort"
 overflow-checks = false
 
+[profile.dev]
+panic = "abort"
+
 [dependencies.rust-snippets-generator-test]
 path = ".."
 
diff --git a/contracts/feature-tests/rust-snippets-generator-test/wasm/src/lib.rs b/contracts/feature-tests/rust-snippets-generator-test/wasm/src/lib.rs
index d4405d49e8..c0432d8a8f 100644
--- a/contracts/feature-tests/rust-snippets-generator-test/wasm/src/lib.rs
+++ b/contracts/feature-tests/rust-snippets-generator-test/wasm/src/lib.rs
@@ -10,8 +10,6 @@
 // Total number of exported functions:  18
 
 #![no_std]
-#![allow(internal_features)]
-#![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
 multiversx_sc_wasm_adapter::panic_handler!();
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 0b3ae5f87c..7e56191556 100644
--- a/contracts/feature-tests/rust-testing-framework-tester/wasm/Cargo.lock
+++ b/contracts/feature-tests/rust-testing-framework-tester/wasm/Cargo.lock
@@ -47,6 +47,7 @@ dependencies = [
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -55,6 +56,7 @@ version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -168,3 +170,9 @@ name = "unicode-ident"
 version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unwrap-infallible"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "151ac09978d3c2862c4e39b557f4eceee2cc72150bc4cb4f16abf061b6e381fb"
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 e9abe077df..12847d64bc 100644
--- a/contracts/feature-tests/rust-testing-framework-tester/wasm/Cargo.toml
+++ b/contracts/feature-tests/rust-testing-framework-tester/wasm/Cargo.toml
@@ -21,6 +21,9 @@ debug = false
 panic = "abort"
 overflow-checks = false
 
+[profile.dev]
+panic = "abort"
+
 [dependencies.rust-testing-framework-tester]
 path = ".."
 
diff --git a/contracts/feature-tests/rust-testing-framework-tester/wasm/src/lib.rs b/contracts/feature-tests/rust-testing-framework-tester/wasm/src/lib.rs
index e8aaa36184..3943837d34 100644
--- a/contracts/feature-tests/rust-testing-framework-tester/wasm/src/lib.rs
+++ b/contracts/feature-tests/rust-testing-framework-tester/wasm/src/lib.rs
@@ -10,8 +10,6 @@
 // Total number of exported functions:  28
 
 #![no_std]
-#![allow(internal_features)]
-#![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!(static64k);
 multiversx_sc_wasm_adapter::panic_handler!();
diff --git a/contracts/feature-tests/scenario-tester/wasm/Cargo.lock b/contracts/feature-tests/scenario-tester/wasm/Cargo.lock
index 66eca188da..5d8bd88449 100755
--- a/contracts/feature-tests/scenario-tester/wasm/Cargo.lock
+++ b/contracts/feature-tests/scenario-tester/wasm/Cargo.lock
@@ -47,6 +47,7 @@ dependencies = [
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -55,6 +56,7 @@ version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -168,3 +170,9 @@ name = "unicode-ident"
 version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unwrap-infallible"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "151ac09978d3c2862c4e39b557f4eceee2cc72150bc4cb4f16abf061b6e381fb"
diff --git a/contracts/feature-tests/scenario-tester/wasm/Cargo.toml b/contracts/feature-tests/scenario-tester/wasm/Cargo.toml
index 672a7c796c..603e662f9d 100644
--- a/contracts/feature-tests/scenario-tester/wasm/Cargo.toml
+++ b/contracts/feature-tests/scenario-tester/wasm/Cargo.toml
@@ -21,6 +21,9 @@ debug = false
 panic = "abort"
 overflow-checks = false
 
+[profile.dev]
+panic = "abort"
+
 [dependencies.scenario-tester]
 path = ".."
 
diff --git a/contracts/feature-tests/scenario-tester/wasm/src/lib.rs b/contracts/feature-tests/scenario-tester/wasm/src/lib.rs
index ae1ba48ffd..28922bb61e 100644
--- a/contracts/feature-tests/scenario-tester/wasm/src/lib.rs
+++ b/contracts/feature-tests/scenario-tester/wasm/src/lib.rs
@@ -11,8 +11,6 @@
 // Total number of exported functions:   5
 
 #![no_std]
-#![allow(internal_features)]
-#![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
 multiversx_sc_wasm_adapter::panic_handler!();
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 6d3a67850c..dbfa03678b 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
@@ -47,6 +47,7 @@ dependencies = [
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -55,6 +56,7 @@ version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -161,6 +163,12 @@ version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
 
+[[package]]
+name = "unwrap-infallible"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "151ac09978d3c2862c4e39b557f4eceee2cc72150bc4cb4f16abf061b6e381fb"
+
 [[package]]
 name = "use-module"
 version = "0.0.0"
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 eea6ec7dc1..ceeef70516 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
@@ -21,6 +21,9 @@ debug = false
 panic = "abort"
 overflow-checks = false
 
+[profile.dev]
+panic = "abort"
+
 [dependencies.use-module]
 path = ".."
 
diff --git a/contracts/feature-tests/use-module/wasm-use-module-view/src/lib.rs b/contracts/feature-tests/use-module/wasm-use-module-view/src/lib.rs
index b1ea58a65a..4a5b43d1de 100644
--- a/contracts/feature-tests/use-module/wasm-use-module-view/src/lib.rs
+++ b/contracts/feature-tests/use-module/wasm-use-module-view/src/lib.rs
@@ -10,8 +10,6 @@
 // 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!();
diff --git a/contracts/feature-tests/use-module/wasm/Cargo.lock b/contracts/feature-tests/use-module/wasm/Cargo.lock
index 7bd3915e63..0ae23a9263 100644
--- a/contracts/feature-tests/use-module/wasm/Cargo.lock
+++ b/contracts/feature-tests/use-module/wasm/Cargo.lock
@@ -47,6 +47,7 @@ dependencies = [
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -55,6 +56,7 @@ version = "0.18.8"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
+ "unwrap-infallible",
 ]
 
 [[package]]
@@ -161,6 +163,12 @@ version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
 
+[[package]]
+name = "unwrap-infallible"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "151ac09978d3c2862c4e39b557f4eceee2cc72150bc4cb4f16abf061b6e381fb"
+
 [[package]]
 name = "use-module"
 version = "0.0.0"
diff --git a/contracts/feature-tests/use-module/wasm/Cargo.toml b/contracts/feature-tests/use-module/wasm/Cargo.toml
index 50a3d5bf82..a69dc56cf6 100644
--- a/contracts/feature-tests/use-module/wasm/Cargo.toml
+++ b/contracts/feature-tests/use-module/wasm/Cargo.toml
@@ -21,6 +21,9 @@ debug = false
 panic = "abort"
 overflow-checks = false
 
+[profile.dev]
+panic = "abort"
+
 [dependencies.use-module]
 path = ".."
 
diff --git a/contracts/feature-tests/use-module/wasm/src/lib.rs b/contracts/feature-tests/use-module/wasm/src/lib.rs
index 88422e3c83..7171b56ecd 100644
--- a/contracts/feature-tests/use-module/wasm/src/lib.rs
+++ b/contracts/feature-tests/use-module/wasm/src/lib.rs
@@ -10,8 +10,6 @@
 // Total number of exported functions:  65
 
 #![no_std]
-#![allow(internal_features)]
-#![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
 multiversx_sc_wasm_adapter::panic_handler!();
diff --git a/framework/meta/src/cargo_toml_contents.rs b/framework/meta/src/cargo_toml_contents.rs
index 1a6596a68d..3ad86c648f 100644
--- a/framework/meta/src/cargo_toml_contents.rs
+++ b/framework/meta/src/cargo_toml_contents.rs
@@ -218,15 +218,34 @@ impl CargoTomlContents {
             Value::Boolean(contract_profile.overflow_checks),
         );
 
+        // add contract variant profile
         let mut toml_table = toml::map::Map::new();
         toml_table.insert("release".to_string(), toml::Value::Table(profile_props));
 
+        // add profile dev
+        let mut dev_value = toml::map::Map::new();
+        dev_value.insert("panic".to_string(), Value::String("abort".to_string()));
+        toml_table.insert("dev".to_string(), toml::Value::Table(dev_value));
+
         self.toml_value
             .as_table_mut()
             .expect("malformed package in Cargo.toml")
             .insert("profile".to_string(), toml::Value::Table(toml_table));
     }
 
+    pub fn add_dev_profile(&mut self) {
+        let mut value = toml::map::Map::new();
+        value.insert("panic".to_string(), Value::String("abort".to_string()));
+
+        let mut toml_table = toml::map::Map::new();
+        toml_table.insert("dev".to_string(), toml::Value::Table(value));
+
+        self.toml_value
+            .as_table_mut()
+            .expect("malformed profile dev in Cargo.toml ")
+            .insert("profile".to_string(), toml::Value::Table(toml_table));
+    }
+
     pub fn add_workspace(&mut self, members: &[&str]) {
         let array: Vec<toml::Value> = members
             .iter()
diff --git a/framework/meta/src/cmd/contract/meta_config.rs b/framework/meta/src/cmd/contract/meta_config.rs
index 1e75900261..7543327d06 100644
--- a/framework/meta/src/cmd/contract/meta_config.rs
+++ b/framework/meta/src/cmd/contract/meta_config.rs
@@ -201,6 +201,9 @@ debug = false
 panic = \"abort\"
 overflow-checks = false
 
+[profile.dev]
+panic = \"abort\"
+
 [dependencies.test-crate-name]
 path = \"..\"
 
diff --git a/framework/meta/src/cmd/contract/sc_config/wasm_crate_gen.rs b/framework/meta/src/cmd/contract/sc_config/wasm_crate_gen.rs
index 4117cc24f8..3b0a82c717 100644
--- a/framework/meta/src/cmd/contract/sc_config/wasm_crate_gen.rs
+++ b/framework/meta/src/cmd/contract/sc_config/wasm_crate_gen.rs
@@ -27,7 +27,7 @@ const FEATURES_PRE_RUSTC_1_71: &str = "
 
 // Configuration that works with rustc < 1.71.0.
 // TODO: Recommended rustc version: 1.73.0 or newer.
-#![feature(alloc_error_handler, lang_items)]
+#![feature(alloc_error_handler)]
 ";
 
 const VER_1_73: &str = "1.73.0-nightly";
@@ -36,13 +36,10 @@ const FEATURES_PRE_RUSTC_1_73: &str = "
 
 // Configuration that works with rustc < 1.73.0.
 // TODO: Recommended rustc version: 1.73.0 or newer.
-#![feature(lang_items)]
 ";
 
 const FEATURES_DEFAULT: &str = "
 #![no_std]
-#![allow(internal_features)]
-#![feature(lang_items)]
 ";
 
 impl ContractVariant {
diff --git a/framework/wasm-adapter/src/wasm_macros.rs b/framework/wasm-adapter/src/wasm_macros.rs
index 206070a91c..0d2ae296a3 100644
--- a/framework/wasm-adapter/src/wasm_macros.rs
+++ b/framework/wasm-adapter/src/wasm_macros.rs
@@ -28,9 +28,6 @@ macro_rules! panic_handler {
         fn panic_fmt(panic_info: &multiversx_sc_wasm_adapter::panic::PanicInfo) -> ! {
             multiversx_sc_wasm_adapter::panic::panic_fmt(panic_info)
         }
-
-        #[lang = "eh_personality"]
-        fn eh_personality() {}
     };
 }
 
@@ -41,9 +38,6 @@ macro_rules! panic_handler_with_message {
         fn panic_fmt(panic_info: &multiversx_sc_wasm_adapter::panic::PanicInfo) -> ! {
             multiversx_sc_wasm_adapter::panic::panic_fmt_with_message(panic_info)
         }
-
-        #[lang = "eh_personality"]
-        fn eh_personality() {}
     };
 }
 

From 693e0aa119a49847a5a021690fcbdf9ecfcc0290 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 7 May 2024 19:35:09 +0300
Subject: [PATCH 0839/1254] removed try trait v2

---
 .../scenarios/sc_result.scen.json             |  6 +--
 .../src/macro_features_legacy.rs              | 21 ++--------
 .../wasm-alloc-mem-fail/src/lib.rs            |  8 ++--
 .../wasm-alloc-mem-leaking/src/lib.rs         |  8 ++--
 .../alloc-features/wasm/src/lib.rs            |  8 ++--
 data/codec/src/lib.rs                         |  1 -
 framework/base/src/lib.rs                     |  2 -
 framework/base/src/types/io/sc_result.rs      | 41 -------------------
 8 files changed, 16 insertions(+), 79 deletions(-)

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 a3f22fd47f..b4fac3e261 100644
--- a/contracts/feature-tests/alloc-features/scenarios/sc_result.scen.json
+++ b/contracts/feature-tests/alloc-features/scenarios/sc_result.scen.json
@@ -60,7 +60,7 @@
             "tx": {
                 "from": "address:an_account",
                 "to": "sc:alloc-features",
-                "function": "result_err_from_bytes_1",
+                "function": "result_err_from_bytes",
                 "arguments": [
                     "str:test error message"
                 ],
@@ -82,7 +82,7 @@
             "tx": {
                 "from": "address:an_account",
                 "to": "sc:alloc-features",
-                "function": "result_err_from_bytes_2",
+                "function": "result_err_from_bytes",
                 "arguments": [
                     "str:test error message"
                 ],
@@ -104,7 +104,7 @@
             "tx": {
                 "from": "address:an_account",
                 "to": "sc:alloc-features",
-                "function": "result_err_from_bytes_3",
+                "function": "result_err_from_bytes",
                 "arguments": [
                     "str:test error message"
                 ],
diff --git a/contracts/feature-tests/alloc-features/src/macro_features_legacy.rs b/contracts/feature-tests/alloc-features/src/macro_features_legacy.rs
index 1efc5ff38e..0a33d06c05 100644
--- a/contracts/feature-tests/alloc-features/src/macro_features_legacy.rs
+++ b/contracts/feature-tests/alloc-features/src/macro_features_legacy.rs
@@ -27,18 +27,7 @@ pub trait MacroFeaturesLegacy {
     }
 
     #[view]
-    fn result_err_from_bytes_1(&self, e: BoxedBytes) -> SCResult<(), ManagedSCError> {
-        SCResult::Err(e.into())?;
-        unreachable!()
-    }
-
-    #[view]
-    fn result_err_from_bytes_2<'a>(&self, e: &'a [u8]) -> SCResult<(), ManagedSCError> {
-        SCResult::Err(e.into())
-    }
-
-    #[view]
-    fn result_err_from_bytes_3(&self, e: Vec<u8>) -> SCResult<(), ManagedSCError> {
+    fn result_err_from_bytes(&self, e: BoxedBytes) -> SCResult<(), ManagedSCError> {
         SCResult::Err(e.into())
     }
 
@@ -55,15 +44,13 @@ pub trait MacroFeaturesLegacy {
     #[endpoint]
     fn result_echo(&self, arg: Option<String>, test: bool) -> SCResult<String> {
         require!(test, "test argument is false");
-        let unwrapped =
-            SCResult::<String, StaticSCError>::from_result(arg.ok_or("option argument is none"))?;
-        SCResult::Ok(unwrapped)
+
+        SCResult::<String, StaticSCError>::from_result(arg.ok_or("option argument is none"))
     }
 
     #[endpoint]
     fn result_echo_2(&self, arg: Option<String>) -> SCResult<String> {
-        let unwrapped = arg.ok_or("option argument is none")?;
-        SCResult::Ok(unwrapped)
+        arg.ok_or("option argument is none").into()
     }
 
     #[endpoint]
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/src/lib.rs b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/src/lib.rs
index f903442a51..f6acd5959c 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/src/lib.rs
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/src/lib.rs
@@ -5,9 +5,9 @@
 ////////////////////////////////////////////////////
 
 // Init:                                 1
-// Endpoints:                           65
+// Endpoints:                           63
 // Async Callback (empty):               1
-// Total number of exported functions:  67
+// Total number of exported functions:  65
 
 #![no_std]
 
@@ -52,9 +52,7 @@ multiversx_sc_wasm_adapter::endpoints! {
         only_owner_legacy => only_owner_legacy
         return_sc_error => return_sc_error
         result_ok => result_ok
-        result_err_from_bytes_1 => result_err_from_bytes_1
-        result_err_from_bytes_2 => result_err_from_bytes_2
-        result_err_from_bytes_3 => result_err_from_bytes_3
+        result_err_from_bytes => result_err_from_bytes
         result_err_from_string => result_err_from_string
         result_err_from_str => result_err_from_str
         result_echo => result_echo
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/src/lib.rs b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/src/lib.rs
index 9d069ce40f..9056a19d65 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/src/lib.rs
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/src/lib.rs
@@ -5,9 +5,9 @@
 ////////////////////////////////////////////////////
 
 // Init:                                 1
-// Endpoints:                           65
+// Endpoints:                           63
 // Async Callback (empty):               1
-// Total number of exported functions:  67
+// Total number of exported functions:  65
 
 #![no_std]
 
@@ -52,9 +52,7 @@ multiversx_sc_wasm_adapter::endpoints! {
         only_owner_legacy => only_owner_legacy
         return_sc_error => return_sc_error
         result_ok => result_ok
-        result_err_from_bytes_1 => result_err_from_bytes_1
-        result_err_from_bytes_2 => result_err_from_bytes_2
-        result_err_from_bytes_3 => result_err_from_bytes_3
+        result_err_from_bytes => result_err_from_bytes
         result_err_from_string => result_err_from_string
         result_err_from_str => result_err_from_str
         result_echo => result_echo
diff --git a/contracts/feature-tests/alloc-features/wasm/src/lib.rs b/contracts/feature-tests/alloc-features/wasm/src/lib.rs
index d56e4d69ba..3b8d0b84e3 100644
--- a/contracts/feature-tests/alloc-features/wasm/src/lib.rs
+++ b/contracts/feature-tests/alloc-features/wasm/src/lib.rs
@@ -5,9 +5,9 @@
 ////////////////////////////////////////////////////
 
 // Init:                                 1
-// Endpoints:                           64
+// Endpoints:                           62
 // Async Callback (empty):               1
-// Total number of exported functions:  66
+// Total number of exported functions:  64
 
 #![no_std]
 
@@ -52,9 +52,7 @@ multiversx_sc_wasm_adapter::endpoints! {
         only_owner_legacy => only_owner_legacy
         return_sc_error => return_sc_error
         result_ok => result_ok
-        result_err_from_bytes_1 => result_err_from_bytes_1
-        result_err_from_bytes_2 => result_err_from_bytes_2
-        result_err_from_bytes_3 => result_err_from_bytes_3
+        result_err_from_bytes => result_err_from_bytes
         result_err_from_string => result_err_from_string
         result_err_from_str => result_err_from_str
         result_echo => result_echo
diff --git a/data/codec/src/lib.rs b/data/codec/src/lib.rs
index 2833dd4ed4..dac8727604 100644
--- a/data/codec/src/lib.rs
+++ b/data/codec/src/lib.rs
@@ -1,5 +1,4 @@
 #![no_std]
-#![feature(try_trait_v2)]
 
 extern crate alloc;
 
diff --git a/framework/base/src/lib.rs b/framework/base/src/lib.rs
index 0a39af959f..2b9f8669f7 100644
--- a/framework/base/src/lib.rs
+++ b/framework/base/src/lib.rs
@@ -1,6 +1,4 @@
 #![no_std]
-#![feature(try_trait_v2)]
-#![feature(control_flow_enum)]
 #![feature(generic_const_exprs)]
 #![allow(incomplete_features)]
 #![allow(deprecated)]
diff --git a/framework/base/src/types/io/sc_result.rs b/framework/base/src/types/io/sc_result.rs
index 183ade9f4b..de000fa1e1 100644
--- a/framework/base/src/types/io/sc_result.rs
+++ b/framework/base/src/types/io/sc_result.rs
@@ -9,10 +9,6 @@ use crate::{
     abi::{OutputAbis, TypeAbi, TypeDescriptionContainer, TypeName},
     api::EndpointFinishApi,
 };
-use core::{
-    convert,
-    ops::{ControlFlow, FromResidual, Try},
-};
 
 use super::{SCError, StaticSCError};
 
@@ -81,43 +77,6 @@ impl<T, E> SCResult<T, E> {
     }
 }
 
-/// Implementing the `Try` trait overloads the `?` operator.
-/// Documentation on the new version of the trait:
-/// <https://github.com/scottmcm/rfcs/blob/do-or-do-not/text/0000-try-trait-v2.md#the-try-trait>
-impl<T, E> Try for SCResult<T, E> {
-    type Output = T;
-    type Residual = E;
-
-    fn branch(self) -> ControlFlow<Self::Residual, T> {
-        match self {
-            SCResult::Ok(t) => ControlFlow::Continue(t),
-            SCResult::Err(e) => ControlFlow::Break(e),
-        }
-    }
-    fn from_output(v: T) -> Self {
-        SCResult::Ok(v)
-    }
-}
-
-impl<T, E> FromResidual for SCResult<T, E> {
-    fn from_residual(r: E) -> Self {
-        SCResult::Err(r)
-    }
-}
-
-impl<T, FromErr> FromResidual<Result<convert::Infallible, FromErr>> for SCResult<T>
-where
-    FromErr: Into<StaticSCError>,
-{
-    fn from_residual(residual: Result<convert::Infallible, FromErr>) -> Self {
-        let e = match residual {
-            Ok(_) => unreachable!(),
-            Err(err) => err,
-        };
-        SCResult::Err(e.into())
-    }
-}
-
 impl<T, E> TopEncodeMulti for SCResult<T, E>
 where
     T: TopEncodeMulti,

From 18872ac11825075b40a5dc8e6168ca3872ae9990 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 8 May 2024 09:14:41 +0300
Subject: [PATCH 0840/1254] panic message simplified, test fix

---
 .../scenarios/error-message-after-log.txt                      | 3 ++-
 .../panic-message-features/scenarios/error-message.txt         | 3 ++-
 .../panic-message-features/tests/pmf_scenario_rs_test.rs       | 1 +
 framework/wasm-adapter/src/panic.rs                            | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/contracts/feature-tests/panic-message-features/scenarios/error-message-after-log.txt b/contracts/feature-tests/panic-message-features/scenarios/error-message-after-log.txt
index 09fa24df8b..0902894d05 100644
--- a/contracts/feature-tests/panic-message-features/scenarios/error-message-after-log.txt
+++ b/contracts/feature-tests/panic-message-features/scenarios/error-message-after-log.txt
@@ -1 +1,2 @@
-panic occured: PanicInfo { payload: Any { .. }, message: Some(panic after log), location: Location { file: "panic_features.rs", line: 22, col: 9 }, can_unwind: true, force_no_backtrace: false }
\ No newline at end of file
+panic occurred: panicked at panic_features.rs:22:9:
+panic after log
\ No newline at end of file
diff --git a/contracts/feature-tests/panic-message-features/scenarios/error-message.txt b/contracts/feature-tests/panic-message-features/scenarios/error-message.txt
index 0c49fcc44d..b161bad102 100644
--- a/contracts/feature-tests/panic-message-features/scenarios/error-message.txt
+++ b/contracts/feature-tests/panic-message-features/scenarios/error-message.txt
@@ -1 +1,2 @@
-panic occured: PanicInfo { payload: Any { .. }, message: Some(example panic message 123), location: Location { file: "panic_features.rs", line: 22, col: 9 }, can_unwind: true, force_no_backtrace: false }
\ No newline at end of file
+panic occurred: panicked at panic_features.rs:15:9:
+example panic message 123
\ No newline at end of file
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 2f9355f0d1..93db854e46 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
@@ -19,6 +19,7 @@ fn panic_after_log_rs() {
     world().run("scenarios/panic-after-log.scen.json");
 }
 
+#[ignore = "PanicInfo currently not available, TODO: use std::panic::set_hook"]
 #[test]
 fn panic_message_rs() {
     world().run("scenarios/panic-message.scen.json");
diff --git a/framework/wasm-adapter/src/panic.rs b/framework/wasm-adapter/src/panic.rs
index 59a9545835..bd7cb707f1 100644
--- a/framework/wasm-adapter/src/panic.rs
+++ b/framework/wasm-adapter/src/panic.rs
@@ -20,7 +20,7 @@ pub fn panic_fmt_with_message(panic_info: &PanicInfo) -> ! {
     let mut panic_msg = ManagedPanicMessage::default();
     panic_msg.append_str("panic occurred: ");
 
-    core::fmt::write(&mut panic_msg, format_args!("{:?}", panic_info))
+    core::fmt::write(&mut panic_msg, format_args!("{panic_info}"))
         .unwrap_or_else(|_| panic_msg.append_str("unable to write panic"));
 
     VmApiImpl::error_api_impl().signal_error_from_buffer(panic_msg.buffer.get_handle())

From e035b044f84c20f4223919a945219918f823cde8 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 8 May 2024 09:21:03 +0300
Subject: [PATCH 0841/1254] cleanup

---
 framework/wasm-adapter/src/panic.rs | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/framework/wasm-adapter/src/panic.rs b/framework/wasm-adapter/src/panic.rs
index bd7cb707f1..00dc658a7a 100644
--- a/framework/wasm-adapter/src/panic.rs
+++ b/framework/wasm-adapter/src/panic.rs
@@ -35,10 +35,6 @@ impl ManagedPanicMessage {
     fn append_str(&mut self, s: &str) {
         self.buffer.append_bytes(s.as_bytes());
     }
-
-    fn _overwrite(&mut self, s: &str) {
-        self.buffer.overwrite(s.as_bytes());
-    }
 }
 
 impl core::fmt::Write for ManagedPanicMessage {

From 6de666ec38280f2200dfa83dfa9844505dfacc91 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 8 May 2024 07:45:15 +0300
Subject: [PATCH 0842/1254] wasm crate cleanup

---
 contracts/benchmarks/large-storage/wasm/Cargo.toml             | 3 +++
 contracts/benchmarks/large-storage/wasm/src/lib.rs             | 2 --
 .../benchmarks/mappers/linked-list-repeat/wasm/Cargo.toml      | 3 +++
 .../benchmarks/mappers/linked-list-repeat/wasm/src/lib.rs      | 2 --
 contracts/benchmarks/mappers/map-repeat/wasm/Cargo.toml        | 3 +++
 contracts/benchmarks/mappers/map-repeat/wasm/src/lib.rs        | 2 --
 contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.toml      | 3 +++
 contracts/benchmarks/mappers/queue-repeat/wasm/src/lib.rs      | 2 --
 contracts/benchmarks/mappers/set-repeat/wasm/Cargo.toml        | 3 +++
 contracts/benchmarks/mappers/set-repeat/wasm/src/lib.rs        | 2 --
 .../benchmarks/mappers/single-value-repeat/wasm/Cargo.toml     | 3 +++
 .../benchmarks/mappers/single-value-repeat/wasm/src/lib.rs     | 2 --
 contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.toml        | 3 +++
 contracts/benchmarks/mappers/vec-repeat/wasm/src/lib.rs        | 2 --
 contracts/benchmarks/send-tx-repeat/wasm/Cargo.toml            | 3 +++
 contracts/benchmarks/send-tx-repeat/wasm/src/lib.rs            | 2 --
 .../str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.toml     | 3 +++
 .../str-repeat/wasm-str-repeat-mb-builder-basic/src/lib.rs     | 2 --
 .../str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.toml    | 3 +++
 .../str-repeat/wasm-str-repeat-mb-builder-cached/src/lib.rs    | 2 --
 contracts/benchmarks/str-repeat/wasm/Cargo.toml                | 3 +++
 contracts/benchmarks/str-repeat/wasm/src/lib.rs                | 2 --
 contracts/core/price-aggregator/wasm/Cargo.toml                | 3 +++
 contracts/core/price-aggregator/wasm/src/lib.rs                | 2 --
 contracts/core/wegld-swap/wasm/Cargo.toml                      | 3 +++
 contracts/core/wegld-swap/wasm/src/lib.rs                      | 2 --
 26 files changed, 39 insertions(+), 26 deletions(-)

diff --git a/contracts/benchmarks/large-storage/wasm/Cargo.toml b/contracts/benchmarks/large-storage/wasm/Cargo.toml
index fde48c533f..27442eadd5 100644
--- a/contracts/benchmarks/large-storage/wasm/Cargo.toml
+++ b/contracts/benchmarks/large-storage/wasm/Cargo.toml
@@ -21,6 +21,9 @@ debug = false
 panic = "abort"
 overflow-checks = false
 
+[profile.dev]
+panic = "abort"
+
 [dependencies.large-storage]
 path = ".."
 
diff --git a/contracts/benchmarks/large-storage/wasm/src/lib.rs b/contracts/benchmarks/large-storage/wasm/src/lib.rs
index 7637992615..fcaf9afbee 100644
--- a/contracts/benchmarks/large-storage/wasm/src/lib.rs
+++ b/contracts/benchmarks/large-storage/wasm/src/lib.rs
@@ -10,8 +10,6 @@
 // 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!();
diff --git a/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.toml b/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.toml
index cf4d28c279..f901bcd893 100644
--- a/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.toml
@@ -21,6 +21,9 @@ debug = false
 panic = "abort"
 overflow-checks = false
 
+[profile.dev]
+panic = "abort"
+
 [dependencies.linked-list-repeat]
 path = ".."
 
diff --git a/contracts/benchmarks/mappers/linked-list-repeat/wasm/src/lib.rs b/contracts/benchmarks/mappers/linked-list-repeat/wasm/src/lib.rs
index 626c63d138..1e79aa533a 100644
--- a/contracts/benchmarks/mappers/linked-list-repeat/wasm/src/lib.rs
+++ b/contracts/benchmarks/mappers/linked-list-repeat/wasm/src/lib.rs
@@ -10,8 +10,6 @@
 // Total number of exported functions:  10
 
 #![no_std]
-#![allow(internal_features)]
-#![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
 multiversx_sc_wasm_adapter::panic_handler!();
diff --git a/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.toml b/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.toml
index e0cbbf5bb3..a37c36a723 100644
--- a/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.toml
@@ -21,6 +21,9 @@ debug = false
 panic = "abort"
 overflow-checks = false
 
+[profile.dev]
+panic = "abort"
+
 [dependencies.map-repeat]
 path = ".."
 
diff --git a/contracts/benchmarks/mappers/map-repeat/wasm/src/lib.rs b/contracts/benchmarks/mappers/map-repeat/wasm/src/lib.rs
index cd006d5384..3d670243ff 100644
--- a/contracts/benchmarks/mappers/map-repeat/wasm/src/lib.rs
+++ b/contracts/benchmarks/mappers/map-repeat/wasm/src/lib.rs
@@ -10,8 +10,6 @@
 // Total number of exported functions:   8
 
 #![no_std]
-#![allow(internal_features)]
-#![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
 multiversx_sc_wasm_adapter::panic_handler!();
diff --git a/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.toml b/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.toml
index c878a5a4f1..86baf16ed1 100644
--- a/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.toml
@@ -21,6 +21,9 @@ debug = false
 panic = "abort"
 overflow-checks = false
 
+[profile.dev]
+panic = "abort"
+
 [dependencies.queue-repeat]
 path = ".."
 
diff --git a/contracts/benchmarks/mappers/queue-repeat/wasm/src/lib.rs b/contracts/benchmarks/mappers/queue-repeat/wasm/src/lib.rs
index 9eb5f3ac5b..887fb0c6e6 100644
--- a/contracts/benchmarks/mappers/queue-repeat/wasm/src/lib.rs
+++ b/contracts/benchmarks/mappers/queue-repeat/wasm/src/lib.rs
@@ -10,8 +10,6 @@
 // Total number of exported functions:  10
 
 #![no_std]
-#![allow(internal_features)]
-#![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
 multiversx_sc_wasm_adapter::panic_handler!();
diff --git a/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.toml b/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.toml
index ea33bd0bf5..32140cb3c9 100644
--- a/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.toml
@@ -21,6 +21,9 @@ debug = false
 panic = "abort"
 overflow-checks = false
 
+[profile.dev]
+panic = "abort"
+
 [dependencies.set-repeat]
 path = ".."
 
diff --git a/contracts/benchmarks/mappers/set-repeat/wasm/src/lib.rs b/contracts/benchmarks/mappers/set-repeat/wasm/src/lib.rs
index 26158eb9da..7a1a61db74 100644
--- a/contracts/benchmarks/mappers/set-repeat/wasm/src/lib.rs
+++ b/contracts/benchmarks/mappers/set-repeat/wasm/src/lib.rs
@@ -10,8 +10,6 @@
 // Total number of exported functions:  10
 
 #![no_std]
-#![allow(internal_features)]
-#![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
 multiversx_sc_wasm_adapter::panic_handler!();
diff --git a/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.toml b/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.toml
index e74af019ff..fb2acc6ebc 100644
--- a/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.toml
@@ -21,6 +21,9 @@ debug = false
 panic = "abort"
 overflow-checks = false
 
+[profile.dev]
+panic = "abort"
+
 [dependencies.single-value-repeat]
 path = ".."
 
diff --git a/contracts/benchmarks/mappers/single-value-repeat/wasm/src/lib.rs b/contracts/benchmarks/mappers/single-value-repeat/wasm/src/lib.rs
index ced8d7e061..0c377e4821 100644
--- a/contracts/benchmarks/mappers/single-value-repeat/wasm/src/lib.rs
+++ b/contracts/benchmarks/mappers/single-value-repeat/wasm/src/lib.rs
@@ -10,8 +10,6 @@
 // Total number of exported functions:   8
 
 #![no_std]
-#![allow(internal_features)]
-#![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
 multiversx_sc_wasm_adapter::panic_handler!();
diff --git a/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.toml b/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.toml
index 540da31865..e66c6adebe 100644
--- a/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.toml
@@ -21,6 +21,9 @@ debug = false
 panic = "abort"
 overflow-checks = false
 
+[profile.dev]
+panic = "abort"
+
 [dependencies.vec-repeat]
 path = ".."
 
diff --git a/contracts/benchmarks/mappers/vec-repeat/wasm/src/lib.rs b/contracts/benchmarks/mappers/vec-repeat/wasm/src/lib.rs
index 353338d425..6f915470d8 100644
--- a/contracts/benchmarks/mappers/vec-repeat/wasm/src/lib.rs
+++ b/contracts/benchmarks/mappers/vec-repeat/wasm/src/lib.rs
@@ -10,8 +10,6 @@
 // Total number of exported functions:  10
 
 #![no_std]
-#![allow(internal_features)]
-#![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
 multiversx_sc_wasm_adapter::panic_handler!();
diff --git a/contracts/benchmarks/send-tx-repeat/wasm/Cargo.toml b/contracts/benchmarks/send-tx-repeat/wasm/Cargo.toml
index d25bec0cbf..647b00bce5 100644
--- a/contracts/benchmarks/send-tx-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/send-tx-repeat/wasm/Cargo.toml
@@ -21,6 +21,9 @@ debug = false
 panic = "abort"
 overflow-checks = false
 
+[profile.dev]
+panic = "abort"
+
 [dependencies.send-tx-repeat]
 path = ".."
 
diff --git a/contracts/benchmarks/send-tx-repeat/wasm/src/lib.rs b/contracts/benchmarks/send-tx-repeat/wasm/src/lib.rs
index 756fb62d43..acc9b4d8da 100644
--- a/contracts/benchmarks/send-tx-repeat/wasm/src/lib.rs
+++ b/contracts/benchmarks/send-tx-repeat/wasm/src/lib.rs
@@ -10,8 +10,6 @@
 // Total number of exported functions:   3
 
 #![no_std]
-#![allow(internal_features)]
-#![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
 multiversx_sc_wasm_adapter::panic_handler!();
diff --git a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.toml b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.toml
index 760ea14af5..a4eeb33b9a 100644
--- a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.toml
+++ b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.toml
@@ -21,6 +21,9 @@ debug = false
 panic = "abort"
 overflow-checks = false
 
+[profile.dev]
+panic = "abort"
+
 [dependencies.str-repeat]
 path = ".."
 
diff --git a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/src/lib.rs b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/src/lib.rs
index 868b673634..68be3133c5 100644
--- a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/src/lib.rs
+++ b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/src/lib.rs
@@ -10,8 +10,6 @@
 // Total number of exported functions:   3
 
 #![no_std]
-#![allow(internal_features)]
-#![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
 multiversx_sc_wasm_adapter::panic_handler!();
diff --git a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.toml b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.toml
index f91e231e9b..d0ad7a5766 100644
--- a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.toml
+++ b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.toml
@@ -21,6 +21,9 @@ debug = false
 panic = "abort"
 overflow-checks = false
 
+[profile.dev]
+panic = "abort"
+
 [dependencies.str-repeat]
 path = ".."
 features = ["managed-buffer-builder-cached"]
diff --git a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/src/lib.rs b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/src/lib.rs
index 868b673634..68be3133c5 100644
--- a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/src/lib.rs
+++ b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/src/lib.rs
@@ -10,8 +10,6 @@
 // Total number of exported functions:   3
 
 #![no_std]
-#![allow(internal_features)]
-#![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
 multiversx_sc_wasm_adapter::panic_handler!();
diff --git a/contracts/benchmarks/str-repeat/wasm/Cargo.toml b/contracts/benchmarks/str-repeat/wasm/Cargo.toml
index c6b036ae15..6416f35226 100644
--- a/contracts/benchmarks/str-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/str-repeat/wasm/Cargo.toml
@@ -21,6 +21,9 @@ debug = false
 panic = "abort"
 overflow-checks = false
 
+[profile.dev]
+panic = "abort"
+
 [dependencies.str-repeat]
 path = ".."
 
diff --git a/contracts/benchmarks/str-repeat/wasm/src/lib.rs b/contracts/benchmarks/str-repeat/wasm/src/lib.rs
index 45af6112da..1d059d343c 100644
--- a/contracts/benchmarks/str-repeat/wasm/src/lib.rs
+++ b/contracts/benchmarks/str-repeat/wasm/src/lib.rs
@@ -10,8 +10,6 @@
 // Total number of exported functions:   5
 
 #![no_std]
-#![allow(internal_features)]
-#![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!(leaking);
 multiversx_sc_wasm_adapter::panic_handler!();
diff --git a/contracts/core/price-aggregator/wasm/Cargo.toml b/contracts/core/price-aggregator/wasm/Cargo.toml
index 11dc27513d..cef8117a00 100644
--- a/contracts/core/price-aggregator/wasm/Cargo.toml
+++ b/contracts/core/price-aggregator/wasm/Cargo.toml
@@ -21,6 +21,9 @@ debug = false
 panic = "abort"
 overflow-checks = false
 
+[profile.dev]
+panic = "abort"
+
 [dependencies.multiversx-price-aggregator-sc]
 path = ".."
 
diff --git a/contracts/core/price-aggregator/wasm/src/lib.rs b/contracts/core/price-aggregator/wasm/src/lib.rs
index 54fe29d855..667c425afd 100644
--- a/contracts/core/price-aggregator/wasm/src/lib.rs
+++ b/contracts/core/price-aggregator/wasm/src/lib.rs
@@ -10,8 +10,6 @@
 // Total number of exported functions:  23
 
 #![no_std]
-#![allow(internal_features)]
-#![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
 multiversx_sc_wasm_adapter::panic_handler!();
diff --git a/contracts/core/wegld-swap/wasm/Cargo.toml b/contracts/core/wegld-swap/wasm/Cargo.toml
index bd89039edf..f2cd3330e8 100644
--- a/contracts/core/wegld-swap/wasm/Cargo.toml
+++ b/contracts/core/wegld-swap/wasm/Cargo.toml
@@ -21,6 +21,9 @@ debug = false
 panic = "abort"
 overflow-checks = false
 
+[profile.dev]
+panic = "abort"
+
 [dependencies.multiversx-wegld-swap-sc]
 path = ".."
 
diff --git a/contracts/core/wegld-swap/wasm/src/lib.rs b/contracts/core/wegld-swap/wasm/src/lib.rs
index 40848a69a7..efb2e9bd60 100644
--- a/contracts/core/wegld-swap/wasm/src/lib.rs
+++ b/contracts/core/wegld-swap/wasm/src/lib.rs
@@ -10,8 +10,6 @@
 // Total number of exported functions:   9
 
 #![no_std]
-#![allow(internal_features)]
-#![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
 multiversx_sc_wasm_adapter::panic_handler!();

From 0d18789dc42278842d6f3ed83222b471d2791c80 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 8 May 2024 08:01:38 +0300
Subject: [PATCH 0843/1254] removed feature exit_status_error

---
 .../format-tests/tests/run_format_tests.rs             | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/tools/rust-debugger/format-tests/tests/run_format_tests.rs b/tools/rust-debugger/format-tests/tests/run_format_tests.rs
index 489d765ef3..6d61931f39 100644
--- a/tools/rust-debugger/format-tests/tests/run_format_tests.rs
+++ b/tools/rust-debugger/format-tests/tests/run_format_tests.rs
@@ -1,5 +1,3 @@
-#![feature(exit_status_error)]
-
 #[cfg(test)]
 use std::{io::BufRead, path::Path, process::Command};
 
@@ -60,10 +58,10 @@ fn run_format_tests() {
         .output()
         .expect("Failed to run debugger");
 
-    debugger_output
-        .status
-        .exit_ok()
-        .expect("Debugger returned a non-zero status");
+    assert!(
+        debugger_output.status.success(),
+        "Debugger returned a non-zero status"
+    );
 
     let stdout_lines: Vec<String> = debugger_output
         .stdout

From fdcb2cbfadf553dfe10570243b5497d5821b89db Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 8 May 2024 18:07:01 +0300
Subject: [PATCH 0844/1254] mn vec item refactor, initial payload impl, removed
 for arrays

---
 .../managed_vec_array_push.scen.json          |   52 -
 .../src/managed_vec_features.rs               |   10 -
 .../tests/basic_features_scenario_go_test.rs  |    5 -
 .../tests/basic_features_scenario_rs_test.rs  |    5 -
 .../base/src/types/flags/esdt_local_role.rs   |   15 +-
 .../esdt_token_payment_multi_value.rs         |    1 +
 .../managed/wrapped/esdt_token_payment.rs     |    3 +-
 .../types/managed/wrapped/managed_option.rs   |    3 +-
 .../types/managed/wrapped/managed_vec_item.rs |   58 +-
 .../wrapped/managed_vec_item_payload.rs       | 1083 +++++++++++++++++
 .../base/src/types/managed/wrapped/mod.rs     |    2 +
 .../derive/src/managed_vec_item_derive.rs     |    2 +
 .../src/api/impl_vh/debug_handle_vh.rs        |    2 +
 .../derive_managed_vec_item_struct_2_test.rs  |    6 +-
 14 files changed, 1119 insertions(+), 128 deletions(-)
 delete mode 100644 contracts/feature-tests/basic-features/scenarios/managed_vec_array_push.scen.json
 create mode 100644 framework/base/src/types/managed/wrapped/managed_vec_item_payload.rs

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
deleted file mode 100644
index 1412fd5e31..0000000000
--- a/contracts/feature-tests/basic-features/scenarios/managed_vec_array_push.scen.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-    "steps": [
-        {
-            "step": "setState",
-            "accounts": {
-                "sc:basic-features": {
-                    "nonce": "0",
-                    "balance": "0",
-                    "code": "mxsc:../output/basic-features.mxsc.json"
-                },
-                "address:an_account": {
-                    "nonce": "0",
-                    "balance": "0"
-                }
-            }
-        },
-        {
-            "step": "scQuery",
-            "id": "1",
-            "tx": {
-                "to": "sc:basic-features",
-                "function": "managed_vec_array_push",
-                "arguments": [
-                    "",
-                    "str:12345"
-                ]
-            },
-            "expect": {
-                "out": [
-                    "str:12345"
-                ]
-            }
-        },
-        {
-            "step": "scQuery",
-            "id": "1",
-            "tx": {
-                "to": "sc:basic-features",
-                "function": "managed_vec_array_push",
-                "arguments": [
-                    "str:12345",
-                    "str:67890"
-                ]
-            },
-            "expect": {
-                "out": [
-                    "str:1234567890"
-                ]
-            }
-        }
-    ]
-}
diff --git a/contracts/feature-tests/basic-features/src/managed_vec_features.rs b/contracts/feature-tests/basic-features/src/managed_vec_features.rs
index 63aaab5811..6f42d104be 100644
--- a/contracts/feature-tests/basic-features/src/managed_vec_features.rs
+++ b/contracts/feature-tests/basic-features/src/managed_vec_features.rs
@@ -67,16 +67,6 @@ pub trait ManagedVecFeatures {
         mv.contains(&item)
     }
 
-    #[endpoint]
-    fn managed_vec_array_push(
-        &self,
-        mut mv: ManagedVec<[u8; 5]>,
-        item: [u8; 5],
-    ) -> ManagedVec<[u8; 5]> {
-        mv.push(item);
-        mv
-    }
-
     #[endpoint]
     fn managed_ref_explicit(&self, mv: ManagedVec<BigUint>, index: usize) -> BigUint {
         let value: ManagedRef<BigUint> = mv.get(index);
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 3c75401525..6ef518cf9f 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
@@ -255,11 +255,6 @@ fn managed_vec_address_push_go() {
     world().run("scenarios/managed_vec_address_push.scen.json");
 }
 
-#[test]
-fn managed_vec_array_push_go() {
-    world().run("scenarios/managed_vec_array_push.scen.json");
-}
-
 #[test]
 fn managed_vec_biguint_push_go() {
     world().run("scenarios/managed_vec_biguint_push.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 0129da845e..a799f9218a 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
@@ -271,11 +271,6 @@ fn managed_vec_address_push_rs() {
     world().run("scenarios/managed_vec_address_push.scen.json");
 }
 
-#[test]
-fn managed_vec_array_push_rs() {
-    world().run("scenarios/managed_vec_array_push.scen.json");
-}
-
 #[test]
 fn managed_vec_biguint_push_rs() {
     world().run("scenarios/managed_vec_biguint_push.scen.json");
diff --git a/framework/base/src/types/flags/esdt_local_role.rs b/framework/base/src/types/flags/esdt_local_role.rs
index 9bc5edfc68..196d1c3f8a 100644
--- a/framework/base/src/types/flags/esdt_local_role.rs
+++ b/framework/base/src/types/flags/esdt_local_role.rs
@@ -1,11 +1,13 @@
-use crate::{
-    codec,
-    codec::derive::{NestedDecode, NestedEncode, TopDecode, TopEncode},
-};
-
 use super::EsdtLocalRoleFlags;
 use crate as multiversx_sc;
-use crate::{derive::type_abi, types::ManagedVecItem};
+use crate::{
+    codec::{
+        self,
+        derive::{NestedDecode, NestedEncode, TopDecode, TopEncode},
+    },
+    derive::type_abi,
+    types::{ManagedVecItem, ManagedVecItemPayloadBuffer},
+};
 
 static ESDT_ROLE_NONE: &[u8] = &[];
 static ESDT_ROLE_LOCAL_MINT: &[u8] = b"ESDTRoleLocalMint";
@@ -137,6 +139,7 @@ impl<'a> From<&'a [u8]> for EsdtLocalRole {
 }
 
 impl ManagedVecItem for EsdtLocalRole {
+    type PAYLOAD = ManagedVecItemPayloadBuffer<1>;
     const PAYLOAD_SIZE: usize = 1;
     const SKIPS_RESERIALIZATION: bool = false; // TODO: might be ok to be true, but needs testing
     type Ref<'a> = Self;
diff --git a/framework/base/src/types/managed/multi_value/esdt_token_payment_multi_value.rs b/framework/base/src/types/managed/multi_value/esdt_token_payment_multi_value.rs
index d9b312f45b..ff4d0f70e7 100644
--- a/framework/base/src/types/managed/multi_value/esdt_token_payment_multi_value.rs
+++ b/framework/base/src/types/managed/multi_value/esdt_token_payment_multi_value.rs
@@ -40,6 +40,7 @@ impl<M: ManagedTypeApi> EsdtTokenPaymentMultiValue<M> {
 }
 
 impl<M: ManagedTypeApi> ManagedVecItem for EsdtTokenPaymentMultiValue<M> {
+    type PAYLOAD = <EsdtTokenPayment<M> as ManagedVecItem>::PAYLOAD;
     const PAYLOAD_SIZE: usize = EsdtTokenPayment::<M>::PAYLOAD_SIZE;
     const SKIPS_RESERIALIZATION: bool = EsdtTokenPayment::<M>::SKIPS_RESERIALIZATION;
     type Ref<'a> = Self;
diff --git a/framework/base/src/types/managed/wrapped/esdt_token_payment.rs b/framework/base/src/types/managed/wrapped/esdt_token_payment.rs
index ac7a54c442..85e33e6d8e 100644
--- a/framework/base/src/types/managed/wrapped/esdt_token_payment.rs
+++ b/framework/base/src/types/managed/wrapped/esdt_token_payment.rs
@@ -13,7 +13,7 @@ use crate::{
     derive::type_abi,
 };
 
-use super::ManagedVec;
+use super::{ManagedVec, ManagedVecItemPayloadBuffer};
 
 #[type_abi]
 #[derive(TopEncode, NestedEncode, Clone, PartialEq, Eq, Debug)]
@@ -185,6 +185,7 @@ impl<M: ManagedTypeApi> IntoMultiValue for EsdtTokenPayment<M> {
 }
 
 impl<M: ManagedTypeApi> ManagedVecItem for EsdtTokenPayment<M> {
+    type PAYLOAD = ManagedVecItemPayloadBuffer<4>;
     const PAYLOAD_SIZE: usize = 16;
     const SKIPS_RESERIALIZATION: bool = false;
     type Ref<'a> = Self;
diff --git a/framework/base/src/types/managed/wrapped/managed_option.rs b/framework/base/src/types/managed/wrapped/managed_option.rs
index a34a4f7ab3..f29158f9fa 100644
--- a/framework/base/src/types/managed/wrapped/managed_option.rs
+++ b/framework/base/src/types/managed/wrapped/managed_option.rs
@@ -14,7 +14,7 @@ use crate::{
     types::{ManagedRef, ManagedType},
 };
 
-use super::ManagedVecItem;
+use super::{ManagedVecItem, ManagedVecItemPayloadBuffer};
 
 /// A very efficient optional managed type.
 ///
@@ -195,6 +195,7 @@ where
     M: ManagedTypeApi,
     T: ManagedType<M> + 'static,
 {
+    type PAYLOAD = ManagedVecItemPayloadBuffer<4>;
     const PAYLOAD_SIZE: usize = 4;
     const SKIPS_RESERIALIZATION: bool = false;
     type Ref<'a> = Self;
diff --git a/framework/base/src/types/managed/wrapped/managed_vec_item.rs b/framework/base/src/types/managed/wrapped/managed_vec_item.rs
index 100a85ec14..0242663d32 100644
--- a/framework/base/src/types/managed/wrapped/managed_vec_item.rs
+++ b/framework/base/src/types/managed/wrapped/managed_vec_item.rs
@@ -1,4 +1,4 @@
-use core::{borrow::Borrow, mem::MaybeUninit};
+use core::borrow::Borrow;
 
 use crate::{
     api::ManagedTypeApi,
@@ -8,12 +8,16 @@ use crate::{
     },
 };
 
+use super::{ManagedVecItemPayload, ManagedVecItemPayloadAdd, ManagedVecItemPayloadBuffer};
+
 /// Types that implement this trait can be items inside a `ManagedVec`.
 /// All these types need a payload, i.e a representation that gets stored
 /// in the underlying managed buffer.
 /// Not all data needs to be stored as payload, for instance for most managed types
 /// the payload is just the handle, whereas the mai ndata is kept by the VM.
 pub trait ManagedVecItem: 'static {
+    type PAYLOAD: ManagedVecItemPayload;
+
     /// Size of the data stored in the underlying `ManagedBuffer`.
     const PAYLOAD_SIZE: usize;
 
@@ -50,6 +54,7 @@ pub trait ManagedVecItem: 'static {
 macro_rules! impl_int {
     ($ty:ident, $payload_size:expr) => {
         impl ManagedVecItem for $ty {
+            type PAYLOAD = ManagedVecItemPayloadBuffer<$payload_size>;
             const PAYLOAD_SIZE: usize = $payload_size;
             const SKIPS_RESERIALIZATION: bool = true;
             type Ref<'a> = Self;
@@ -79,6 +84,7 @@ impl_int! {i32, 4}
 impl_int! {i64, 8}
 
 impl ManagedVecItem for usize {
+    type PAYLOAD = ManagedVecItemPayloadBuffer<4>;
     const PAYLOAD_SIZE: usize = 4;
     const SKIPS_RESERIALIZATION: bool = true;
     type Ref<'a> = Self;
@@ -102,6 +108,7 @@ impl ManagedVecItem for usize {
 }
 
 impl ManagedVecItem for bool {
+    type PAYLOAD = ManagedVecItemPayloadBuffer<1>;
     const PAYLOAD_SIZE: usize = 1;
     const SKIPS_RESERIALIZATION: bool = true;
     type Ref<'a> = Self;
@@ -126,9 +133,11 @@ impl ManagedVecItem for bool {
 
 impl<T> ManagedVecItem for Option<T>
 where
+    ManagedVecItemPayloadBuffer<1>: ManagedVecItemPayloadAdd<T::PAYLOAD>,
     [(); 1 + T::PAYLOAD_SIZE]:,
     T: ManagedVecItem,
 {
+    type PAYLOAD = <ManagedVecItemPayloadBuffer<1> as ManagedVecItemPayloadAdd<T::PAYLOAD>>::Output;
     const PAYLOAD_SIZE: usize = 1 + T::PAYLOAD_SIZE;
     const SKIPS_RESERIALIZATION: bool = false;
     type Ref<'a> = Self;
@@ -166,6 +175,7 @@ where
 macro_rules! impl_managed_type {
     ($ty:ident) => {
         impl<M: ManagedTypeApi> ManagedVecItem for $ty<M> {
+            type PAYLOAD = ManagedVecItemPayloadBuffer<4>;
             const PAYLOAD_SIZE: usize = 4;
             const SKIPS_RESERIALIZATION: bool = false;
             type Ref<'a> = ManagedRef<'a, M, Self>;
@@ -200,6 +210,7 @@ impl<M, const N: usize> ManagedVecItem for ManagedByteArray<M, N>
 where
     M: ManagedTypeApi,
 {
+    type PAYLOAD = ManagedVecItemPayloadBuffer<4>;
     const PAYLOAD_SIZE: usize = 4;
     const SKIPS_RESERIALIZATION: bool = false;
     type Ref<'a> = ManagedRef<'a, M, Self>;
@@ -224,55 +235,12 @@ where
     }
 }
 
-impl<T, const N: usize> ManagedVecItem for [T; N]
-where
-    [(); T::PAYLOAD_SIZE * N]:,
-    T: ManagedVecItem,
-{
-    const PAYLOAD_SIZE: usize = T::PAYLOAD_SIZE * N;
-    const SKIPS_RESERIALIZATION: bool = T::SKIPS_RESERIALIZATION;
-    type Ref<'a> = Self;
-
-    fn from_byte_reader<Reader: FnMut(&mut [u8])>(mut reader: Reader) -> Self {
-        let mut byte_arr: [u8; T::PAYLOAD_SIZE * N] = [0; T::PAYLOAD_SIZE * N];
-        reader(&mut byte_arr[..]);
-        let mut result: [T; N] = unsafe { MaybeUninit::zeroed().assume_init() };
-        let mut from_index = 0;
-        for item in result.iter_mut() {
-            let to_index = from_index + T::PAYLOAD_SIZE;
-            *item = T::from_byte_reader(|bytes| {
-                bytes.copy_from_slice(&byte_arr[from_index..to_index]);
-            });
-            from_index = to_index;
-        }
-        result
-    }
-
-    unsafe fn from_byte_reader_as_borrow<'a, Reader: FnMut(&mut [u8])>(
-        reader: Reader,
-    ) -> Self::Ref<'a> {
-        Self::from_byte_reader(reader)
-    }
-
-    fn to_byte_writer<R, Writer: FnMut(&[u8]) -> R>(&self, mut writer: Writer) -> R {
-        let mut byte_arr: [u8; T::PAYLOAD_SIZE * N] = [0; T::PAYLOAD_SIZE * N];
-        let mut from_index = 0;
-        for item in self {
-            let to_index = from_index + T::PAYLOAD_SIZE;
-            item.to_byte_writer(|bytes| {
-                byte_arr[from_index..to_index].copy_from_slice(bytes);
-            });
-            from_index = to_index;
-        }
-        writer(&byte_arr[..])
-    }
-}
-
 impl<M, T> ManagedVecItem for ManagedVec<M, T>
 where
     M: ManagedTypeApi,
     T: ManagedVecItem,
 {
+    type PAYLOAD = ManagedVecItemPayloadBuffer<4>;
     const PAYLOAD_SIZE: usize = 4;
     const SKIPS_RESERIALIZATION: bool = false;
     type Ref<'a> = ManagedRef<'a, M, Self>;
diff --git a/framework/base/src/types/managed/wrapped/managed_vec_item_payload.rs b/framework/base/src/types/managed/wrapped/managed_vec_item_payload.rs
new file mode 100644
index 0000000000..cfe1ed4389
--- /dev/null
+++ b/framework/base/src/types/managed/wrapped/managed_vec_item_payload.rs
@@ -0,0 +1,1083 @@
+pub trait ManagedVecItemPayload {
+    fn new_buffer() -> Self;
+
+    fn payload_size() -> usize;
+
+    fn payload_slice(&mut self) -> &mut [u8];
+}
+
+pub struct TempPayload;
+
+impl ManagedVecItemPayload for TempPayload {
+    fn new_buffer() -> Self {
+        panic!("nope!")
+    }
+
+    fn payload_size() -> usize {
+        panic!("nope!")
+    }
+
+    fn payload_slice(&mut self) -> &mut [u8] {
+        panic!("nope!")
+    }
+}
+
+pub struct ManagedVecItemPayloadBuffer<const N: usize> {
+    buffer: [u8; N],
+}
+
+impl<const N: usize> ManagedVecItemPayload for ManagedVecItemPayloadBuffer<N> {
+    fn new_buffer() -> Self {
+        ManagedVecItemPayloadBuffer { buffer: [0u8; N] }
+    }
+
+    fn payload_size() -> usize {
+        N
+    }
+
+    fn payload_slice(&mut self) -> &mut [u8] {
+        &mut self.buffer[..]
+    }
+}
+
+pub trait ManagedVecItemPayloadAdd<Rhs>: ManagedVecItemPayload
+where
+    Rhs: ManagedVecItemPayload,
+{
+    type Output: ManagedVecItemPayload;
+}
+
+macro_rules! payload_add {
+    ($dec1:expr, $dec2:expr, $result_add:expr) => {
+        impl ManagedVecItemPayloadAdd<ManagedVecItemPayloadBuffer<$dec2>>
+            for ManagedVecItemPayloadBuffer<$dec1>
+        {
+            type Output = ManagedVecItemPayloadBuffer<$result_add>;
+        }
+    };
+}
+
+payload_add!(1usize, 1usize, 2usize);
+payload_add!(1usize, 2usize, 3usize);
+payload_add!(1usize, 3usize, 4usize);
+payload_add!(1usize, 4usize, 5usize);
+payload_add!(1usize, 5usize, 6usize);
+payload_add!(1usize, 6usize, 7usize);
+payload_add!(1usize, 7usize, 8usize);
+payload_add!(1usize, 8usize, 9usize);
+payload_add!(1usize, 9usize, 10usize);
+payload_add!(1usize, 10usize, 11usize);
+payload_add!(1usize, 11usize, 12usize);
+payload_add!(1usize, 12usize, 13usize);
+payload_add!(1usize, 13usize, 14usize);
+payload_add!(1usize, 14usize, 15usize);
+payload_add!(1usize, 15usize, 16usize);
+payload_add!(1usize, 16usize, 17usize);
+payload_add!(1usize, 17usize, 18usize);
+payload_add!(1usize, 18usize, 19usize);
+payload_add!(1usize, 19usize, 20usize);
+payload_add!(1usize, 20usize, 21usize);
+payload_add!(1usize, 21usize, 22usize);
+payload_add!(1usize, 22usize, 23usize);
+payload_add!(1usize, 23usize, 24usize);
+payload_add!(1usize, 24usize, 25usize);
+payload_add!(1usize, 25usize, 26usize);
+payload_add!(1usize, 26usize, 27usize);
+payload_add!(1usize, 27usize, 28usize);
+payload_add!(1usize, 28usize, 29usize);
+payload_add!(1usize, 29usize, 30usize);
+payload_add!(1usize, 30usize, 31usize);
+payload_add!(1usize, 31usize, 32usize);
+payload_add!(1usize, 32usize, 33usize);
+payload_add!(2usize, 1usize, 3usize);
+payload_add!(2usize, 2usize, 4usize);
+payload_add!(2usize, 3usize, 5usize);
+payload_add!(2usize, 4usize, 6usize);
+payload_add!(2usize, 5usize, 7usize);
+payload_add!(2usize, 6usize, 8usize);
+payload_add!(2usize, 7usize, 9usize);
+payload_add!(2usize, 8usize, 10usize);
+payload_add!(2usize, 9usize, 11usize);
+payload_add!(2usize, 10usize, 12usize);
+payload_add!(2usize, 11usize, 13usize);
+payload_add!(2usize, 12usize, 14usize);
+payload_add!(2usize, 13usize, 15usize);
+payload_add!(2usize, 14usize, 16usize);
+payload_add!(2usize, 15usize, 17usize);
+payload_add!(2usize, 16usize, 18usize);
+payload_add!(2usize, 17usize, 19usize);
+payload_add!(2usize, 18usize, 20usize);
+payload_add!(2usize, 19usize, 21usize);
+payload_add!(2usize, 20usize, 22usize);
+payload_add!(2usize, 21usize, 23usize);
+payload_add!(2usize, 22usize, 24usize);
+payload_add!(2usize, 23usize, 25usize);
+payload_add!(2usize, 24usize, 26usize);
+payload_add!(2usize, 25usize, 27usize);
+payload_add!(2usize, 26usize, 28usize);
+payload_add!(2usize, 27usize, 29usize);
+payload_add!(2usize, 28usize, 30usize);
+payload_add!(2usize, 29usize, 31usize);
+payload_add!(2usize, 30usize, 32usize);
+payload_add!(2usize, 31usize, 33usize);
+payload_add!(2usize, 32usize, 34usize);
+payload_add!(3usize, 1usize, 4usize);
+payload_add!(3usize, 2usize, 5usize);
+payload_add!(3usize, 3usize, 6usize);
+payload_add!(3usize, 4usize, 7usize);
+payload_add!(3usize, 5usize, 8usize);
+payload_add!(3usize, 6usize, 9usize);
+payload_add!(3usize, 7usize, 10usize);
+payload_add!(3usize, 8usize, 11usize);
+payload_add!(3usize, 9usize, 12usize);
+payload_add!(3usize, 10usize, 13usize);
+payload_add!(3usize, 11usize, 14usize);
+payload_add!(3usize, 12usize, 15usize);
+payload_add!(3usize, 13usize, 16usize);
+payload_add!(3usize, 14usize, 17usize);
+payload_add!(3usize, 15usize, 18usize);
+payload_add!(3usize, 16usize, 19usize);
+payload_add!(3usize, 17usize, 20usize);
+payload_add!(3usize, 18usize, 21usize);
+payload_add!(3usize, 19usize, 22usize);
+payload_add!(3usize, 20usize, 23usize);
+payload_add!(3usize, 21usize, 24usize);
+payload_add!(3usize, 22usize, 25usize);
+payload_add!(3usize, 23usize, 26usize);
+payload_add!(3usize, 24usize, 27usize);
+payload_add!(3usize, 25usize, 28usize);
+payload_add!(3usize, 26usize, 29usize);
+payload_add!(3usize, 27usize, 30usize);
+payload_add!(3usize, 28usize, 31usize);
+payload_add!(3usize, 29usize, 32usize);
+payload_add!(3usize, 30usize, 33usize);
+payload_add!(3usize, 31usize, 34usize);
+payload_add!(3usize, 32usize, 35usize);
+payload_add!(4usize, 1usize, 5usize);
+payload_add!(4usize, 2usize, 6usize);
+payload_add!(4usize, 3usize, 7usize);
+payload_add!(4usize, 4usize, 8usize);
+payload_add!(4usize, 5usize, 9usize);
+payload_add!(4usize, 6usize, 10usize);
+payload_add!(4usize, 7usize, 11usize);
+payload_add!(4usize, 8usize, 12usize);
+payload_add!(4usize, 9usize, 13usize);
+payload_add!(4usize, 10usize, 14usize);
+payload_add!(4usize, 11usize, 15usize);
+payload_add!(4usize, 12usize, 16usize);
+payload_add!(4usize, 13usize, 17usize);
+payload_add!(4usize, 14usize, 18usize);
+payload_add!(4usize, 15usize, 19usize);
+payload_add!(4usize, 16usize, 20usize);
+payload_add!(4usize, 17usize, 21usize);
+payload_add!(4usize, 18usize, 22usize);
+payload_add!(4usize, 19usize, 23usize);
+payload_add!(4usize, 20usize, 24usize);
+payload_add!(4usize, 21usize, 25usize);
+payload_add!(4usize, 22usize, 26usize);
+payload_add!(4usize, 23usize, 27usize);
+payload_add!(4usize, 24usize, 28usize);
+payload_add!(4usize, 25usize, 29usize);
+payload_add!(4usize, 26usize, 30usize);
+payload_add!(4usize, 27usize, 31usize);
+payload_add!(4usize, 28usize, 32usize);
+payload_add!(4usize, 29usize, 33usize);
+payload_add!(4usize, 30usize, 34usize);
+payload_add!(4usize, 31usize, 35usize);
+payload_add!(4usize, 32usize, 36usize);
+payload_add!(5usize, 1usize, 6usize);
+payload_add!(5usize, 2usize, 7usize);
+payload_add!(5usize, 3usize, 8usize);
+payload_add!(5usize, 4usize, 9usize);
+payload_add!(5usize, 5usize, 10usize);
+payload_add!(5usize, 6usize, 11usize);
+payload_add!(5usize, 7usize, 12usize);
+payload_add!(5usize, 8usize, 13usize);
+payload_add!(5usize, 9usize, 14usize);
+payload_add!(5usize, 10usize, 15usize);
+payload_add!(5usize, 11usize, 16usize);
+payload_add!(5usize, 12usize, 17usize);
+payload_add!(5usize, 13usize, 18usize);
+payload_add!(5usize, 14usize, 19usize);
+payload_add!(5usize, 15usize, 20usize);
+payload_add!(5usize, 16usize, 21usize);
+payload_add!(5usize, 17usize, 22usize);
+payload_add!(5usize, 18usize, 23usize);
+payload_add!(5usize, 19usize, 24usize);
+payload_add!(5usize, 20usize, 25usize);
+payload_add!(5usize, 21usize, 26usize);
+payload_add!(5usize, 22usize, 27usize);
+payload_add!(5usize, 23usize, 28usize);
+payload_add!(5usize, 24usize, 29usize);
+payload_add!(5usize, 25usize, 30usize);
+payload_add!(5usize, 26usize, 31usize);
+payload_add!(5usize, 27usize, 32usize);
+payload_add!(5usize, 28usize, 33usize);
+payload_add!(5usize, 29usize, 34usize);
+payload_add!(5usize, 30usize, 35usize);
+payload_add!(5usize, 31usize, 36usize);
+payload_add!(5usize, 32usize, 37usize);
+payload_add!(6usize, 1usize, 7usize);
+payload_add!(6usize, 2usize, 8usize);
+payload_add!(6usize, 3usize, 9usize);
+payload_add!(6usize, 4usize, 10usize);
+payload_add!(6usize, 5usize, 11usize);
+payload_add!(6usize, 6usize, 12usize);
+payload_add!(6usize, 7usize, 13usize);
+payload_add!(6usize, 8usize, 14usize);
+payload_add!(6usize, 9usize, 15usize);
+payload_add!(6usize, 10usize, 16usize);
+payload_add!(6usize, 11usize, 17usize);
+payload_add!(6usize, 12usize, 18usize);
+payload_add!(6usize, 13usize, 19usize);
+payload_add!(6usize, 14usize, 20usize);
+payload_add!(6usize, 15usize, 21usize);
+payload_add!(6usize, 16usize, 22usize);
+payload_add!(6usize, 17usize, 23usize);
+payload_add!(6usize, 18usize, 24usize);
+payload_add!(6usize, 19usize, 25usize);
+payload_add!(6usize, 20usize, 26usize);
+payload_add!(6usize, 21usize, 27usize);
+payload_add!(6usize, 22usize, 28usize);
+payload_add!(6usize, 23usize, 29usize);
+payload_add!(6usize, 24usize, 30usize);
+payload_add!(6usize, 25usize, 31usize);
+payload_add!(6usize, 26usize, 32usize);
+payload_add!(6usize, 27usize, 33usize);
+payload_add!(6usize, 28usize, 34usize);
+payload_add!(6usize, 29usize, 35usize);
+payload_add!(6usize, 30usize, 36usize);
+payload_add!(6usize, 31usize, 37usize);
+payload_add!(6usize, 32usize, 38usize);
+payload_add!(7usize, 1usize, 8usize);
+payload_add!(7usize, 2usize, 9usize);
+payload_add!(7usize, 3usize, 10usize);
+payload_add!(7usize, 4usize, 11usize);
+payload_add!(7usize, 5usize, 12usize);
+payload_add!(7usize, 6usize, 13usize);
+payload_add!(7usize, 7usize, 14usize);
+payload_add!(7usize, 8usize, 15usize);
+payload_add!(7usize, 9usize, 16usize);
+payload_add!(7usize, 10usize, 17usize);
+payload_add!(7usize, 11usize, 18usize);
+payload_add!(7usize, 12usize, 19usize);
+payload_add!(7usize, 13usize, 20usize);
+payload_add!(7usize, 14usize, 21usize);
+payload_add!(7usize, 15usize, 22usize);
+payload_add!(7usize, 16usize, 23usize);
+payload_add!(7usize, 17usize, 24usize);
+payload_add!(7usize, 18usize, 25usize);
+payload_add!(7usize, 19usize, 26usize);
+payload_add!(7usize, 20usize, 27usize);
+payload_add!(7usize, 21usize, 28usize);
+payload_add!(7usize, 22usize, 29usize);
+payload_add!(7usize, 23usize, 30usize);
+payload_add!(7usize, 24usize, 31usize);
+payload_add!(7usize, 25usize, 32usize);
+payload_add!(7usize, 26usize, 33usize);
+payload_add!(7usize, 27usize, 34usize);
+payload_add!(7usize, 28usize, 35usize);
+payload_add!(7usize, 29usize, 36usize);
+payload_add!(7usize, 30usize, 37usize);
+payload_add!(7usize, 31usize, 38usize);
+payload_add!(7usize, 32usize, 39usize);
+payload_add!(8usize, 1usize, 9usize);
+payload_add!(8usize, 2usize, 10usize);
+payload_add!(8usize, 3usize, 11usize);
+payload_add!(8usize, 4usize, 12usize);
+payload_add!(8usize, 5usize, 13usize);
+payload_add!(8usize, 6usize, 14usize);
+payload_add!(8usize, 7usize, 15usize);
+payload_add!(8usize, 8usize, 16usize);
+payload_add!(8usize, 9usize, 17usize);
+payload_add!(8usize, 10usize, 18usize);
+payload_add!(8usize, 11usize, 19usize);
+payload_add!(8usize, 12usize, 20usize);
+payload_add!(8usize, 13usize, 21usize);
+payload_add!(8usize, 14usize, 22usize);
+payload_add!(8usize, 15usize, 23usize);
+payload_add!(8usize, 16usize, 24usize);
+payload_add!(8usize, 17usize, 25usize);
+payload_add!(8usize, 18usize, 26usize);
+payload_add!(8usize, 19usize, 27usize);
+payload_add!(8usize, 20usize, 28usize);
+payload_add!(8usize, 21usize, 29usize);
+payload_add!(8usize, 22usize, 30usize);
+payload_add!(8usize, 23usize, 31usize);
+payload_add!(8usize, 24usize, 32usize);
+payload_add!(8usize, 25usize, 33usize);
+payload_add!(8usize, 26usize, 34usize);
+payload_add!(8usize, 27usize, 35usize);
+payload_add!(8usize, 28usize, 36usize);
+payload_add!(8usize, 29usize, 37usize);
+payload_add!(8usize, 30usize, 38usize);
+payload_add!(8usize, 31usize, 39usize);
+payload_add!(8usize, 32usize, 40usize);
+payload_add!(9usize, 1usize, 10usize);
+payload_add!(9usize, 2usize, 11usize);
+payload_add!(9usize, 3usize, 12usize);
+payload_add!(9usize, 4usize, 13usize);
+payload_add!(9usize, 5usize, 14usize);
+payload_add!(9usize, 6usize, 15usize);
+payload_add!(9usize, 7usize, 16usize);
+payload_add!(9usize, 8usize, 17usize);
+payload_add!(9usize, 9usize, 18usize);
+payload_add!(9usize, 10usize, 19usize);
+payload_add!(9usize, 11usize, 20usize);
+payload_add!(9usize, 12usize, 21usize);
+payload_add!(9usize, 13usize, 22usize);
+payload_add!(9usize, 14usize, 23usize);
+payload_add!(9usize, 15usize, 24usize);
+payload_add!(9usize, 16usize, 25usize);
+payload_add!(9usize, 17usize, 26usize);
+payload_add!(9usize, 18usize, 27usize);
+payload_add!(9usize, 19usize, 28usize);
+payload_add!(9usize, 20usize, 29usize);
+payload_add!(9usize, 21usize, 30usize);
+payload_add!(9usize, 22usize, 31usize);
+payload_add!(9usize, 23usize, 32usize);
+payload_add!(9usize, 24usize, 33usize);
+payload_add!(9usize, 25usize, 34usize);
+payload_add!(9usize, 26usize, 35usize);
+payload_add!(9usize, 27usize, 36usize);
+payload_add!(9usize, 28usize, 37usize);
+payload_add!(9usize, 29usize, 38usize);
+payload_add!(9usize, 30usize, 39usize);
+payload_add!(9usize, 31usize, 40usize);
+payload_add!(9usize, 32usize, 41usize);
+payload_add!(10usize, 1usize, 11usize);
+payload_add!(10usize, 2usize, 12usize);
+payload_add!(10usize, 3usize, 13usize);
+payload_add!(10usize, 4usize, 14usize);
+payload_add!(10usize, 5usize, 15usize);
+payload_add!(10usize, 6usize, 16usize);
+payload_add!(10usize, 7usize, 17usize);
+payload_add!(10usize, 8usize, 18usize);
+payload_add!(10usize, 9usize, 19usize);
+payload_add!(10usize, 10usize, 20usize);
+payload_add!(10usize, 11usize, 21usize);
+payload_add!(10usize, 12usize, 22usize);
+payload_add!(10usize, 13usize, 23usize);
+payload_add!(10usize, 14usize, 24usize);
+payload_add!(10usize, 15usize, 25usize);
+payload_add!(10usize, 16usize, 26usize);
+payload_add!(10usize, 17usize, 27usize);
+payload_add!(10usize, 18usize, 28usize);
+payload_add!(10usize, 19usize, 29usize);
+payload_add!(10usize, 20usize, 30usize);
+payload_add!(10usize, 21usize, 31usize);
+payload_add!(10usize, 22usize, 32usize);
+payload_add!(10usize, 23usize, 33usize);
+payload_add!(10usize, 24usize, 34usize);
+payload_add!(10usize, 25usize, 35usize);
+payload_add!(10usize, 26usize, 36usize);
+payload_add!(10usize, 27usize, 37usize);
+payload_add!(10usize, 28usize, 38usize);
+payload_add!(10usize, 29usize, 39usize);
+payload_add!(10usize, 30usize, 40usize);
+payload_add!(10usize, 31usize, 41usize);
+payload_add!(10usize, 32usize, 42usize);
+payload_add!(11usize, 1usize, 12usize);
+payload_add!(11usize, 2usize, 13usize);
+payload_add!(11usize, 3usize, 14usize);
+payload_add!(11usize, 4usize, 15usize);
+payload_add!(11usize, 5usize, 16usize);
+payload_add!(11usize, 6usize, 17usize);
+payload_add!(11usize, 7usize, 18usize);
+payload_add!(11usize, 8usize, 19usize);
+payload_add!(11usize, 9usize, 20usize);
+payload_add!(11usize, 10usize, 21usize);
+payload_add!(11usize, 11usize, 22usize);
+payload_add!(11usize, 12usize, 23usize);
+payload_add!(11usize, 13usize, 24usize);
+payload_add!(11usize, 14usize, 25usize);
+payload_add!(11usize, 15usize, 26usize);
+payload_add!(11usize, 16usize, 27usize);
+payload_add!(11usize, 17usize, 28usize);
+payload_add!(11usize, 18usize, 29usize);
+payload_add!(11usize, 19usize, 30usize);
+payload_add!(11usize, 20usize, 31usize);
+payload_add!(11usize, 21usize, 32usize);
+payload_add!(11usize, 22usize, 33usize);
+payload_add!(11usize, 23usize, 34usize);
+payload_add!(11usize, 24usize, 35usize);
+payload_add!(11usize, 25usize, 36usize);
+payload_add!(11usize, 26usize, 37usize);
+payload_add!(11usize, 27usize, 38usize);
+payload_add!(11usize, 28usize, 39usize);
+payload_add!(11usize, 29usize, 40usize);
+payload_add!(11usize, 30usize, 41usize);
+payload_add!(11usize, 31usize, 42usize);
+payload_add!(11usize, 32usize, 43usize);
+payload_add!(12usize, 1usize, 13usize);
+payload_add!(12usize, 2usize, 14usize);
+payload_add!(12usize, 3usize, 15usize);
+payload_add!(12usize, 4usize, 16usize);
+payload_add!(12usize, 5usize, 17usize);
+payload_add!(12usize, 6usize, 18usize);
+payload_add!(12usize, 7usize, 19usize);
+payload_add!(12usize, 8usize, 20usize);
+payload_add!(12usize, 9usize, 21usize);
+payload_add!(12usize, 10usize, 22usize);
+payload_add!(12usize, 11usize, 23usize);
+payload_add!(12usize, 12usize, 24usize);
+payload_add!(12usize, 13usize, 25usize);
+payload_add!(12usize, 14usize, 26usize);
+payload_add!(12usize, 15usize, 27usize);
+payload_add!(12usize, 16usize, 28usize);
+payload_add!(12usize, 17usize, 29usize);
+payload_add!(12usize, 18usize, 30usize);
+payload_add!(12usize, 19usize, 31usize);
+payload_add!(12usize, 20usize, 32usize);
+payload_add!(12usize, 21usize, 33usize);
+payload_add!(12usize, 22usize, 34usize);
+payload_add!(12usize, 23usize, 35usize);
+payload_add!(12usize, 24usize, 36usize);
+payload_add!(12usize, 25usize, 37usize);
+payload_add!(12usize, 26usize, 38usize);
+payload_add!(12usize, 27usize, 39usize);
+payload_add!(12usize, 28usize, 40usize);
+payload_add!(12usize, 29usize, 41usize);
+payload_add!(12usize, 30usize, 42usize);
+payload_add!(12usize, 31usize, 43usize);
+payload_add!(12usize, 32usize, 44usize);
+payload_add!(13usize, 1usize, 14usize);
+payload_add!(13usize, 2usize, 15usize);
+payload_add!(13usize, 3usize, 16usize);
+payload_add!(13usize, 4usize, 17usize);
+payload_add!(13usize, 5usize, 18usize);
+payload_add!(13usize, 6usize, 19usize);
+payload_add!(13usize, 7usize, 20usize);
+payload_add!(13usize, 8usize, 21usize);
+payload_add!(13usize, 9usize, 22usize);
+payload_add!(13usize, 10usize, 23usize);
+payload_add!(13usize, 11usize, 24usize);
+payload_add!(13usize, 12usize, 25usize);
+payload_add!(13usize, 13usize, 26usize);
+payload_add!(13usize, 14usize, 27usize);
+payload_add!(13usize, 15usize, 28usize);
+payload_add!(13usize, 16usize, 29usize);
+payload_add!(13usize, 17usize, 30usize);
+payload_add!(13usize, 18usize, 31usize);
+payload_add!(13usize, 19usize, 32usize);
+payload_add!(13usize, 20usize, 33usize);
+payload_add!(13usize, 21usize, 34usize);
+payload_add!(13usize, 22usize, 35usize);
+payload_add!(13usize, 23usize, 36usize);
+payload_add!(13usize, 24usize, 37usize);
+payload_add!(13usize, 25usize, 38usize);
+payload_add!(13usize, 26usize, 39usize);
+payload_add!(13usize, 27usize, 40usize);
+payload_add!(13usize, 28usize, 41usize);
+payload_add!(13usize, 29usize, 42usize);
+payload_add!(13usize, 30usize, 43usize);
+payload_add!(13usize, 31usize, 44usize);
+payload_add!(13usize, 32usize, 45usize);
+payload_add!(14usize, 1usize, 15usize);
+payload_add!(14usize, 2usize, 16usize);
+payload_add!(14usize, 3usize, 17usize);
+payload_add!(14usize, 4usize, 18usize);
+payload_add!(14usize, 5usize, 19usize);
+payload_add!(14usize, 6usize, 20usize);
+payload_add!(14usize, 7usize, 21usize);
+payload_add!(14usize, 8usize, 22usize);
+payload_add!(14usize, 9usize, 23usize);
+payload_add!(14usize, 10usize, 24usize);
+payload_add!(14usize, 11usize, 25usize);
+payload_add!(14usize, 12usize, 26usize);
+payload_add!(14usize, 13usize, 27usize);
+payload_add!(14usize, 14usize, 28usize);
+payload_add!(14usize, 15usize, 29usize);
+payload_add!(14usize, 16usize, 30usize);
+payload_add!(14usize, 17usize, 31usize);
+payload_add!(14usize, 18usize, 32usize);
+payload_add!(14usize, 19usize, 33usize);
+payload_add!(14usize, 20usize, 34usize);
+payload_add!(14usize, 21usize, 35usize);
+payload_add!(14usize, 22usize, 36usize);
+payload_add!(14usize, 23usize, 37usize);
+payload_add!(14usize, 24usize, 38usize);
+payload_add!(14usize, 25usize, 39usize);
+payload_add!(14usize, 26usize, 40usize);
+payload_add!(14usize, 27usize, 41usize);
+payload_add!(14usize, 28usize, 42usize);
+payload_add!(14usize, 29usize, 43usize);
+payload_add!(14usize, 30usize, 44usize);
+payload_add!(14usize, 31usize, 45usize);
+payload_add!(14usize, 32usize, 46usize);
+payload_add!(15usize, 1usize, 16usize);
+payload_add!(15usize, 2usize, 17usize);
+payload_add!(15usize, 3usize, 18usize);
+payload_add!(15usize, 4usize, 19usize);
+payload_add!(15usize, 5usize, 20usize);
+payload_add!(15usize, 6usize, 21usize);
+payload_add!(15usize, 7usize, 22usize);
+payload_add!(15usize, 8usize, 23usize);
+payload_add!(15usize, 9usize, 24usize);
+payload_add!(15usize, 10usize, 25usize);
+payload_add!(15usize, 11usize, 26usize);
+payload_add!(15usize, 12usize, 27usize);
+payload_add!(15usize, 13usize, 28usize);
+payload_add!(15usize, 14usize, 29usize);
+payload_add!(15usize, 15usize, 30usize);
+payload_add!(15usize, 16usize, 31usize);
+payload_add!(15usize, 17usize, 32usize);
+payload_add!(15usize, 18usize, 33usize);
+payload_add!(15usize, 19usize, 34usize);
+payload_add!(15usize, 20usize, 35usize);
+payload_add!(15usize, 21usize, 36usize);
+payload_add!(15usize, 22usize, 37usize);
+payload_add!(15usize, 23usize, 38usize);
+payload_add!(15usize, 24usize, 39usize);
+payload_add!(15usize, 25usize, 40usize);
+payload_add!(15usize, 26usize, 41usize);
+payload_add!(15usize, 27usize, 42usize);
+payload_add!(15usize, 28usize, 43usize);
+payload_add!(15usize, 29usize, 44usize);
+payload_add!(15usize, 30usize, 45usize);
+payload_add!(15usize, 31usize, 46usize);
+payload_add!(15usize, 32usize, 47usize);
+payload_add!(16usize, 1usize, 17usize);
+payload_add!(16usize, 2usize, 18usize);
+payload_add!(16usize, 3usize, 19usize);
+payload_add!(16usize, 4usize, 20usize);
+payload_add!(16usize, 5usize, 21usize);
+payload_add!(16usize, 6usize, 22usize);
+payload_add!(16usize, 7usize, 23usize);
+payload_add!(16usize, 8usize, 24usize);
+payload_add!(16usize, 9usize, 25usize);
+payload_add!(16usize, 10usize, 26usize);
+payload_add!(16usize, 11usize, 27usize);
+payload_add!(16usize, 12usize, 28usize);
+payload_add!(16usize, 13usize, 29usize);
+payload_add!(16usize, 14usize, 30usize);
+payload_add!(16usize, 15usize, 31usize);
+payload_add!(16usize, 16usize, 32usize);
+payload_add!(16usize, 17usize, 33usize);
+payload_add!(16usize, 18usize, 34usize);
+payload_add!(16usize, 19usize, 35usize);
+payload_add!(16usize, 20usize, 36usize);
+payload_add!(16usize, 21usize, 37usize);
+payload_add!(16usize, 22usize, 38usize);
+payload_add!(16usize, 23usize, 39usize);
+payload_add!(16usize, 24usize, 40usize);
+payload_add!(16usize, 25usize, 41usize);
+payload_add!(16usize, 26usize, 42usize);
+payload_add!(16usize, 27usize, 43usize);
+payload_add!(16usize, 28usize, 44usize);
+payload_add!(16usize, 29usize, 45usize);
+payload_add!(16usize, 30usize, 46usize);
+payload_add!(16usize, 31usize, 47usize);
+payload_add!(16usize, 32usize, 48usize);
+payload_add!(17usize, 1usize, 18usize);
+payload_add!(17usize, 2usize, 19usize);
+payload_add!(17usize, 3usize, 20usize);
+payload_add!(17usize, 4usize, 21usize);
+payload_add!(17usize, 5usize, 22usize);
+payload_add!(17usize, 6usize, 23usize);
+payload_add!(17usize, 7usize, 24usize);
+payload_add!(17usize, 8usize, 25usize);
+payload_add!(17usize, 9usize, 26usize);
+payload_add!(17usize, 10usize, 27usize);
+payload_add!(17usize, 11usize, 28usize);
+payload_add!(17usize, 12usize, 29usize);
+payload_add!(17usize, 13usize, 30usize);
+payload_add!(17usize, 14usize, 31usize);
+payload_add!(17usize, 15usize, 32usize);
+payload_add!(17usize, 16usize, 33usize);
+payload_add!(17usize, 17usize, 34usize);
+payload_add!(17usize, 18usize, 35usize);
+payload_add!(17usize, 19usize, 36usize);
+payload_add!(17usize, 20usize, 37usize);
+payload_add!(17usize, 21usize, 38usize);
+payload_add!(17usize, 22usize, 39usize);
+payload_add!(17usize, 23usize, 40usize);
+payload_add!(17usize, 24usize, 41usize);
+payload_add!(17usize, 25usize, 42usize);
+payload_add!(17usize, 26usize, 43usize);
+payload_add!(17usize, 27usize, 44usize);
+payload_add!(17usize, 28usize, 45usize);
+payload_add!(17usize, 29usize, 46usize);
+payload_add!(17usize, 30usize, 47usize);
+payload_add!(17usize, 31usize, 48usize);
+payload_add!(17usize, 32usize, 49usize);
+payload_add!(18usize, 1usize, 19usize);
+payload_add!(18usize, 2usize, 20usize);
+payload_add!(18usize, 3usize, 21usize);
+payload_add!(18usize, 4usize, 22usize);
+payload_add!(18usize, 5usize, 23usize);
+payload_add!(18usize, 6usize, 24usize);
+payload_add!(18usize, 7usize, 25usize);
+payload_add!(18usize, 8usize, 26usize);
+payload_add!(18usize, 9usize, 27usize);
+payload_add!(18usize, 10usize, 28usize);
+payload_add!(18usize, 11usize, 29usize);
+payload_add!(18usize, 12usize, 30usize);
+payload_add!(18usize, 13usize, 31usize);
+payload_add!(18usize, 14usize, 32usize);
+payload_add!(18usize, 15usize, 33usize);
+payload_add!(18usize, 16usize, 34usize);
+payload_add!(18usize, 17usize, 35usize);
+payload_add!(18usize, 18usize, 36usize);
+payload_add!(18usize, 19usize, 37usize);
+payload_add!(18usize, 20usize, 38usize);
+payload_add!(18usize, 21usize, 39usize);
+payload_add!(18usize, 22usize, 40usize);
+payload_add!(18usize, 23usize, 41usize);
+payload_add!(18usize, 24usize, 42usize);
+payload_add!(18usize, 25usize, 43usize);
+payload_add!(18usize, 26usize, 44usize);
+payload_add!(18usize, 27usize, 45usize);
+payload_add!(18usize, 28usize, 46usize);
+payload_add!(18usize, 29usize, 47usize);
+payload_add!(18usize, 30usize, 48usize);
+payload_add!(18usize, 31usize, 49usize);
+payload_add!(18usize, 32usize, 50usize);
+payload_add!(19usize, 1usize, 20usize);
+payload_add!(19usize, 2usize, 21usize);
+payload_add!(19usize, 3usize, 22usize);
+payload_add!(19usize, 4usize, 23usize);
+payload_add!(19usize, 5usize, 24usize);
+payload_add!(19usize, 6usize, 25usize);
+payload_add!(19usize, 7usize, 26usize);
+payload_add!(19usize, 8usize, 27usize);
+payload_add!(19usize, 9usize, 28usize);
+payload_add!(19usize, 10usize, 29usize);
+payload_add!(19usize, 11usize, 30usize);
+payload_add!(19usize, 12usize, 31usize);
+payload_add!(19usize, 13usize, 32usize);
+payload_add!(19usize, 14usize, 33usize);
+payload_add!(19usize, 15usize, 34usize);
+payload_add!(19usize, 16usize, 35usize);
+payload_add!(19usize, 17usize, 36usize);
+payload_add!(19usize, 18usize, 37usize);
+payload_add!(19usize, 19usize, 38usize);
+payload_add!(19usize, 20usize, 39usize);
+payload_add!(19usize, 21usize, 40usize);
+payload_add!(19usize, 22usize, 41usize);
+payload_add!(19usize, 23usize, 42usize);
+payload_add!(19usize, 24usize, 43usize);
+payload_add!(19usize, 25usize, 44usize);
+payload_add!(19usize, 26usize, 45usize);
+payload_add!(19usize, 27usize, 46usize);
+payload_add!(19usize, 28usize, 47usize);
+payload_add!(19usize, 29usize, 48usize);
+payload_add!(19usize, 30usize, 49usize);
+payload_add!(19usize, 31usize, 50usize);
+payload_add!(19usize, 32usize, 51usize);
+payload_add!(20usize, 1usize, 21usize);
+payload_add!(20usize, 2usize, 22usize);
+payload_add!(20usize, 3usize, 23usize);
+payload_add!(20usize, 4usize, 24usize);
+payload_add!(20usize, 5usize, 25usize);
+payload_add!(20usize, 6usize, 26usize);
+payload_add!(20usize, 7usize, 27usize);
+payload_add!(20usize, 8usize, 28usize);
+payload_add!(20usize, 9usize, 29usize);
+payload_add!(20usize, 10usize, 30usize);
+payload_add!(20usize, 11usize, 31usize);
+payload_add!(20usize, 12usize, 32usize);
+payload_add!(20usize, 13usize, 33usize);
+payload_add!(20usize, 14usize, 34usize);
+payload_add!(20usize, 15usize, 35usize);
+payload_add!(20usize, 16usize, 36usize);
+payload_add!(20usize, 17usize, 37usize);
+payload_add!(20usize, 18usize, 38usize);
+payload_add!(20usize, 19usize, 39usize);
+payload_add!(20usize, 20usize, 40usize);
+payload_add!(20usize, 21usize, 41usize);
+payload_add!(20usize, 22usize, 42usize);
+payload_add!(20usize, 23usize, 43usize);
+payload_add!(20usize, 24usize, 44usize);
+payload_add!(20usize, 25usize, 45usize);
+payload_add!(20usize, 26usize, 46usize);
+payload_add!(20usize, 27usize, 47usize);
+payload_add!(20usize, 28usize, 48usize);
+payload_add!(20usize, 29usize, 49usize);
+payload_add!(20usize, 30usize, 50usize);
+payload_add!(20usize, 31usize, 51usize);
+payload_add!(20usize, 32usize, 52usize);
+payload_add!(21usize, 1usize, 22usize);
+payload_add!(21usize, 2usize, 23usize);
+payload_add!(21usize, 3usize, 24usize);
+payload_add!(21usize, 4usize, 25usize);
+payload_add!(21usize, 5usize, 26usize);
+payload_add!(21usize, 6usize, 27usize);
+payload_add!(21usize, 7usize, 28usize);
+payload_add!(21usize, 8usize, 29usize);
+payload_add!(21usize, 9usize, 30usize);
+payload_add!(21usize, 10usize, 31usize);
+payload_add!(21usize, 11usize, 32usize);
+payload_add!(21usize, 12usize, 33usize);
+payload_add!(21usize, 13usize, 34usize);
+payload_add!(21usize, 14usize, 35usize);
+payload_add!(21usize, 15usize, 36usize);
+payload_add!(21usize, 16usize, 37usize);
+payload_add!(21usize, 17usize, 38usize);
+payload_add!(21usize, 18usize, 39usize);
+payload_add!(21usize, 19usize, 40usize);
+payload_add!(21usize, 20usize, 41usize);
+payload_add!(21usize, 21usize, 42usize);
+payload_add!(21usize, 22usize, 43usize);
+payload_add!(21usize, 23usize, 44usize);
+payload_add!(21usize, 24usize, 45usize);
+payload_add!(21usize, 25usize, 46usize);
+payload_add!(21usize, 26usize, 47usize);
+payload_add!(21usize, 27usize, 48usize);
+payload_add!(21usize, 28usize, 49usize);
+payload_add!(21usize, 29usize, 50usize);
+payload_add!(21usize, 30usize, 51usize);
+payload_add!(21usize, 31usize, 52usize);
+payload_add!(21usize, 32usize, 53usize);
+payload_add!(22usize, 1usize, 23usize);
+payload_add!(22usize, 2usize, 24usize);
+payload_add!(22usize, 3usize, 25usize);
+payload_add!(22usize, 4usize, 26usize);
+payload_add!(22usize, 5usize, 27usize);
+payload_add!(22usize, 6usize, 28usize);
+payload_add!(22usize, 7usize, 29usize);
+payload_add!(22usize, 8usize, 30usize);
+payload_add!(22usize, 9usize, 31usize);
+payload_add!(22usize, 10usize, 32usize);
+payload_add!(22usize, 11usize, 33usize);
+payload_add!(22usize, 12usize, 34usize);
+payload_add!(22usize, 13usize, 35usize);
+payload_add!(22usize, 14usize, 36usize);
+payload_add!(22usize, 15usize, 37usize);
+payload_add!(22usize, 16usize, 38usize);
+payload_add!(22usize, 17usize, 39usize);
+payload_add!(22usize, 18usize, 40usize);
+payload_add!(22usize, 19usize, 41usize);
+payload_add!(22usize, 20usize, 42usize);
+payload_add!(22usize, 21usize, 43usize);
+payload_add!(22usize, 22usize, 44usize);
+payload_add!(22usize, 23usize, 45usize);
+payload_add!(22usize, 24usize, 46usize);
+payload_add!(22usize, 25usize, 47usize);
+payload_add!(22usize, 26usize, 48usize);
+payload_add!(22usize, 27usize, 49usize);
+payload_add!(22usize, 28usize, 50usize);
+payload_add!(22usize, 29usize, 51usize);
+payload_add!(22usize, 30usize, 52usize);
+payload_add!(22usize, 31usize, 53usize);
+payload_add!(22usize, 32usize, 54usize);
+payload_add!(23usize, 1usize, 24usize);
+payload_add!(23usize, 2usize, 25usize);
+payload_add!(23usize, 3usize, 26usize);
+payload_add!(23usize, 4usize, 27usize);
+payload_add!(23usize, 5usize, 28usize);
+payload_add!(23usize, 6usize, 29usize);
+payload_add!(23usize, 7usize, 30usize);
+payload_add!(23usize, 8usize, 31usize);
+payload_add!(23usize, 9usize, 32usize);
+payload_add!(23usize, 10usize, 33usize);
+payload_add!(23usize, 11usize, 34usize);
+payload_add!(23usize, 12usize, 35usize);
+payload_add!(23usize, 13usize, 36usize);
+payload_add!(23usize, 14usize, 37usize);
+payload_add!(23usize, 15usize, 38usize);
+payload_add!(23usize, 16usize, 39usize);
+payload_add!(23usize, 17usize, 40usize);
+payload_add!(23usize, 18usize, 41usize);
+payload_add!(23usize, 19usize, 42usize);
+payload_add!(23usize, 20usize, 43usize);
+payload_add!(23usize, 21usize, 44usize);
+payload_add!(23usize, 22usize, 45usize);
+payload_add!(23usize, 23usize, 46usize);
+payload_add!(23usize, 24usize, 47usize);
+payload_add!(23usize, 25usize, 48usize);
+payload_add!(23usize, 26usize, 49usize);
+payload_add!(23usize, 27usize, 50usize);
+payload_add!(23usize, 28usize, 51usize);
+payload_add!(23usize, 29usize, 52usize);
+payload_add!(23usize, 30usize, 53usize);
+payload_add!(23usize, 31usize, 54usize);
+payload_add!(23usize, 32usize, 55usize);
+payload_add!(24usize, 1usize, 25usize);
+payload_add!(24usize, 2usize, 26usize);
+payload_add!(24usize, 3usize, 27usize);
+payload_add!(24usize, 4usize, 28usize);
+payload_add!(24usize, 5usize, 29usize);
+payload_add!(24usize, 6usize, 30usize);
+payload_add!(24usize, 7usize, 31usize);
+payload_add!(24usize, 8usize, 32usize);
+payload_add!(24usize, 9usize, 33usize);
+payload_add!(24usize, 10usize, 34usize);
+payload_add!(24usize, 11usize, 35usize);
+payload_add!(24usize, 12usize, 36usize);
+payload_add!(24usize, 13usize, 37usize);
+payload_add!(24usize, 14usize, 38usize);
+payload_add!(24usize, 15usize, 39usize);
+payload_add!(24usize, 16usize, 40usize);
+payload_add!(24usize, 17usize, 41usize);
+payload_add!(24usize, 18usize, 42usize);
+payload_add!(24usize, 19usize, 43usize);
+payload_add!(24usize, 20usize, 44usize);
+payload_add!(24usize, 21usize, 45usize);
+payload_add!(24usize, 22usize, 46usize);
+payload_add!(24usize, 23usize, 47usize);
+payload_add!(24usize, 24usize, 48usize);
+payload_add!(24usize, 25usize, 49usize);
+payload_add!(24usize, 26usize, 50usize);
+payload_add!(24usize, 27usize, 51usize);
+payload_add!(24usize, 28usize, 52usize);
+payload_add!(24usize, 29usize, 53usize);
+payload_add!(24usize, 30usize, 54usize);
+payload_add!(24usize, 31usize, 55usize);
+payload_add!(24usize, 32usize, 56usize);
+payload_add!(25usize, 1usize, 26usize);
+payload_add!(25usize, 2usize, 27usize);
+payload_add!(25usize, 3usize, 28usize);
+payload_add!(25usize, 4usize, 29usize);
+payload_add!(25usize, 5usize, 30usize);
+payload_add!(25usize, 6usize, 31usize);
+payload_add!(25usize, 7usize, 32usize);
+payload_add!(25usize, 8usize, 33usize);
+payload_add!(25usize, 9usize, 34usize);
+payload_add!(25usize, 10usize, 35usize);
+payload_add!(25usize, 11usize, 36usize);
+payload_add!(25usize, 12usize, 37usize);
+payload_add!(25usize, 13usize, 38usize);
+payload_add!(25usize, 14usize, 39usize);
+payload_add!(25usize, 15usize, 40usize);
+payload_add!(25usize, 16usize, 41usize);
+payload_add!(25usize, 17usize, 42usize);
+payload_add!(25usize, 18usize, 43usize);
+payload_add!(25usize, 19usize, 44usize);
+payload_add!(25usize, 20usize, 45usize);
+payload_add!(25usize, 21usize, 46usize);
+payload_add!(25usize, 22usize, 47usize);
+payload_add!(25usize, 23usize, 48usize);
+payload_add!(25usize, 24usize, 49usize);
+payload_add!(25usize, 25usize, 50usize);
+payload_add!(25usize, 26usize, 51usize);
+payload_add!(25usize, 27usize, 52usize);
+payload_add!(25usize, 28usize, 53usize);
+payload_add!(25usize, 29usize, 54usize);
+payload_add!(25usize, 30usize, 55usize);
+payload_add!(25usize, 31usize, 56usize);
+payload_add!(25usize, 32usize, 57usize);
+payload_add!(26usize, 1usize, 27usize);
+payload_add!(26usize, 2usize, 28usize);
+payload_add!(26usize, 3usize, 29usize);
+payload_add!(26usize, 4usize, 30usize);
+payload_add!(26usize, 5usize, 31usize);
+payload_add!(26usize, 6usize, 32usize);
+payload_add!(26usize, 7usize, 33usize);
+payload_add!(26usize, 8usize, 34usize);
+payload_add!(26usize, 9usize, 35usize);
+payload_add!(26usize, 10usize, 36usize);
+payload_add!(26usize, 11usize, 37usize);
+payload_add!(26usize, 12usize, 38usize);
+payload_add!(26usize, 13usize, 39usize);
+payload_add!(26usize, 14usize, 40usize);
+payload_add!(26usize, 15usize, 41usize);
+payload_add!(26usize, 16usize, 42usize);
+payload_add!(26usize, 17usize, 43usize);
+payload_add!(26usize, 18usize, 44usize);
+payload_add!(26usize, 19usize, 45usize);
+payload_add!(26usize, 20usize, 46usize);
+payload_add!(26usize, 21usize, 47usize);
+payload_add!(26usize, 22usize, 48usize);
+payload_add!(26usize, 23usize, 49usize);
+payload_add!(26usize, 24usize, 50usize);
+payload_add!(26usize, 25usize, 51usize);
+payload_add!(26usize, 26usize, 52usize);
+payload_add!(26usize, 27usize, 53usize);
+payload_add!(26usize, 28usize, 54usize);
+payload_add!(26usize, 29usize, 55usize);
+payload_add!(26usize, 30usize, 56usize);
+payload_add!(26usize, 31usize, 57usize);
+payload_add!(26usize, 32usize, 58usize);
+payload_add!(27usize, 1usize, 28usize);
+payload_add!(27usize, 2usize, 29usize);
+payload_add!(27usize, 3usize, 30usize);
+payload_add!(27usize, 4usize, 31usize);
+payload_add!(27usize, 5usize, 32usize);
+payload_add!(27usize, 6usize, 33usize);
+payload_add!(27usize, 7usize, 34usize);
+payload_add!(27usize, 8usize, 35usize);
+payload_add!(27usize, 9usize, 36usize);
+payload_add!(27usize, 10usize, 37usize);
+payload_add!(27usize, 11usize, 38usize);
+payload_add!(27usize, 12usize, 39usize);
+payload_add!(27usize, 13usize, 40usize);
+payload_add!(27usize, 14usize, 41usize);
+payload_add!(27usize, 15usize, 42usize);
+payload_add!(27usize, 16usize, 43usize);
+payload_add!(27usize, 17usize, 44usize);
+payload_add!(27usize, 18usize, 45usize);
+payload_add!(27usize, 19usize, 46usize);
+payload_add!(27usize, 20usize, 47usize);
+payload_add!(27usize, 21usize, 48usize);
+payload_add!(27usize, 22usize, 49usize);
+payload_add!(27usize, 23usize, 50usize);
+payload_add!(27usize, 24usize, 51usize);
+payload_add!(27usize, 25usize, 52usize);
+payload_add!(27usize, 26usize, 53usize);
+payload_add!(27usize, 27usize, 54usize);
+payload_add!(27usize, 28usize, 55usize);
+payload_add!(27usize, 29usize, 56usize);
+payload_add!(27usize, 30usize, 57usize);
+payload_add!(27usize, 31usize, 58usize);
+payload_add!(27usize, 32usize, 59usize);
+payload_add!(28usize, 1usize, 29usize);
+payload_add!(28usize, 2usize, 30usize);
+payload_add!(28usize, 3usize, 31usize);
+payload_add!(28usize, 4usize, 32usize);
+payload_add!(28usize, 5usize, 33usize);
+payload_add!(28usize, 6usize, 34usize);
+payload_add!(28usize, 7usize, 35usize);
+payload_add!(28usize, 8usize, 36usize);
+payload_add!(28usize, 9usize, 37usize);
+payload_add!(28usize, 10usize, 38usize);
+payload_add!(28usize, 11usize, 39usize);
+payload_add!(28usize, 12usize, 40usize);
+payload_add!(28usize, 13usize, 41usize);
+payload_add!(28usize, 14usize, 42usize);
+payload_add!(28usize, 15usize, 43usize);
+payload_add!(28usize, 16usize, 44usize);
+payload_add!(28usize, 17usize, 45usize);
+payload_add!(28usize, 18usize, 46usize);
+payload_add!(28usize, 19usize, 47usize);
+payload_add!(28usize, 20usize, 48usize);
+payload_add!(28usize, 21usize, 49usize);
+payload_add!(28usize, 22usize, 50usize);
+payload_add!(28usize, 23usize, 51usize);
+payload_add!(28usize, 24usize, 52usize);
+payload_add!(28usize, 25usize, 53usize);
+payload_add!(28usize, 26usize, 54usize);
+payload_add!(28usize, 27usize, 55usize);
+payload_add!(28usize, 28usize, 56usize);
+payload_add!(28usize, 29usize, 57usize);
+payload_add!(28usize, 30usize, 58usize);
+payload_add!(28usize, 31usize, 59usize);
+payload_add!(28usize, 32usize, 60usize);
+payload_add!(29usize, 1usize, 30usize);
+payload_add!(29usize, 2usize, 31usize);
+payload_add!(29usize, 3usize, 32usize);
+payload_add!(29usize, 4usize, 33usize);
+payload_add!(29usize, 5usize, 34usize);
+payload_add!(29usize, 6usize, 35usize);
+payload_add!(29usize, 7usize, 36usize);
+payload_add!(29usize, 8usize, 37usize);
+payload_add!(29usize, 9usize, 38usize);
+payload_add!(29usize, 10usize, 39usize);
+payload_add!(29usize, 11usize, 40usize);
+payload_add!(29usize, 12usize, 41usize);
+payload_add!(29usize, 13usize, 42usize);
+payload_add!(29usize, 14usize, 43usize);
+payload_add!(29usize, 15usize, 44usize);
+payload_add!(29usize, 16usize, 45usize);
+payload_add!(29usize, 17usize, 46usize);
+payload_add!(29usize, 18usize, 47usize);
+payload_add!(29usize, 19usize, 48usize);
+payload_add!(29usize, 20usize, 49usize);
+payload_add!(29usize, 21usize, 50usize);
+payload_add!(29usize, 22usize, 51usize);
+payload_add!(29usize, 23usize, 52usize);
+payload_add!(29usize, 24usize, 53usize);
+payload_add!(29usize, 25usize, 54usize);
+payload_add!(29usize, 26usize, 55usize);
+payload_add!(29usize, 27usize, 56usize);
+payload_add!(29usize, 28usize, 57usize);
+payload_add!(29usize, 29usize, 58usize);
+payload_add!(29usize, 30usize, 59usize);
+payload_add!(29usize, 31usize, 60usize);
+payload_add!(29usize, 32usize, 61usize);
+payload_add!(30usize, 1usize, 31usize);
+payload_add!(30usize, 2usize, 32usize);
+payload_add!(30usize, 3usize, 33usize);
+payload_add!(30usize, 4usize, 34usize);
+payload_add!(30usize, 5usize, 35usize);
+payload_add!(30usize, 6usize, 36usize);
+payload_add!(30usize, 7usize, 37usize);
+payload_add!(30usize, 8usize, 38usize);
+payload_add!(30usize, 9usize, 39usize);
+payload_add!(30usize, 10usize, 40usize);
+payload_add!(30usize, 11usize, 41usize);
+payload_add!(30usize, 12usize, 42usize);
+payload_add!(30usize, 13usize, 43usize);
+payload_add!(30usize, 14usize, 44usize);
+payload_add!(30usize, 15usize, 45usize);
+payload_add!(30usize, 16usize, 46usize);
+payload_add!(30usize, 17usize, 47usize);
+payload_add!(30usize, 18usize, 48usize);
+payload_add!(30usize, 19usize, 49usize);
+payload_add!(30usize, 20usize, 50usize);
+payload_add!(30usize, 21usize, 51usize);
+payload_add!(30usize, 22usize, 52usize);
+payload_add!(30usize, 23usize, 53usize);
+payload_add!(30usize, 24usize, 54usize);
+payload_add!(30usize, 25usize, 55usize);
+payload_add!(30usize, 26usize, 56usize);
+payload_add!(30usize, 27usize, 57usize);
+payload_add!(30usize, 28usize, 58usize);
+payload_add!(30usize, 29usize, 59usize);
+payload_add!(30usize, 30usize, 60usize);
+payload_add!(30usize, 31usize, 61usize);
+payload_add!(30usize, 32usize, 62usize);
+payload_add!(31usize, 1usize, 32usize);
+payload_add!(31usize, 2usize, 33usize);
+payload_add!(31usize, 3usize, 34usize);
+payload_add!(31usize, 4usize, 35usize);
+payload_add!(31usize, 5usize, 36usize);
+payload_add!(31usize, 6usize, 37usize);
+payload_add!(31usize, 7usize, 38usize);
+payload_add!(31usize, 8usize, 39usize);
+payload_add!(31usize, 9usize, 40usize);
+payload_add!(31usize, 10usize, 41usize);
+payload_add!(31usize, 11usize, 42usize);
+payload_add!(31usize, 12usize, 43usize);
+payload_add!(31usize, 13usize, 44usize);
+payload_add!(31usize, 14usize, 45usize);
+payload_add!(31usize, 15usize, 46usize);
+payload_add!(31usize, 16usize, 47usize);
+payload_add!(31usize, 17usize, 48usize);
+payload_add!(31usize, 18usize, 49usize);
+payload_add!(31usize, 19usize, 50usize);
+payload_add!(31usize, 20usize, 51usize);
+payload_add!(31usize, 21usize, 52usize);
+payload_add!(31usize, 22usize, 53usize);
+payload_add!(31usize, 23usize, 54usize);
+payload_add!(31usize, 24usize, 55usize);
+payload_add!(31usize, 25usize, 56usize);
+payload_add!(31usize, 26usize, 57usize);
+payload_add!(31usize, 27usize, 58usize);
+payload_add!(31usize, 28usize, 59usize);
+payload_add!(31usize, 29usize, 60usize);
+payload_add!(31usize, 30usize, 61usize);
+payload_add!(31usize, 31usize, 62usize);
+payload_add!(31usize, 32usize, 63usize);
+payload_add!(32usize, 1usize, 33usize);
+payload_add!(32usize, 2usize, 34usize);
+payload_add!(32usize, 3usize, 35usize);
+payload_add!(32usize, 4usize, 36usize);
+payload_add!(32usize, 5usize, 37usize);
+payload_add!(32usize, 6usize, 38usize);
+payload_add!(32usize, 7usize, 39usize);
+payload_add!(32usize, 8usize, 40usize);
+payload_add!(32usize, 9usize, 41usize);
+payload_add!(32usize, 10usize, 42usize);
+payload_add!(32usize, 11usize, 43usize);
+payload_add!(32usize, 12usize, 44usize);
+payload_add!(32usize, 13usize, 45usize);
+payload_add!(32usize, 14usize, 46usize);
+payload_add!(32usize, 15usize, 47usize);
+payload_add!(32usize, 16usize, 48usize);
+payload_add!(32usize, 17usize, 49usize);
+payload_add!(32usize, 18usize, 50usize);
+payload_add!(32usize, 19usize, 51usize);
+payload_add!(32usize, 20usize, 52usize);
+payload_add!(32usize, 21usize, 53usize);
+payload_add!(32usize, 22usize, 54usize);
+payload_add!(32usize, 23usize, 55usize);
+payload_add!(32usize, 24usize, 56usize);
+payload_add!(32usize, 25usize, 57usize);
+payload_add!(32usize, 26usize, 58usize);
+payload_add!(32usize, 27usize, 59usize);
+payload_add!(32usize, 28usize, 60usize);
+payload_add!(32usize, 29usize, 61usize);
+payload_add!(32usize, 30usize, 62usize);
+payload_add!(32usize, 31usize, 63usize);
+payload_add!(32usize, 32usize, 64usize);
diff --git a/framework/base/src/types/managed/wrapped/mod.rs b/framework/base/src/types/managed/wrapped/mod.rs
index c5d8d03391..fc6485c802 100644
--- a/framework/base/src/types/managed/wrapped/mod.rs
+++ b/framework/base/src/types/managed/wrapped/mod.rs
@@ -11,6 +11,7 @@ mod managed_option;
 mod managed_ref;
 mod managed_vec;
 mod managed_vec_item;
+mod managed_vec_item_payload;
 mod managed_vec_owned_iter;
 mod managed_vec_ref;
 mod managed_vec_ref_iter;
@@ -33,6 +34,7 @@ pub use managed_option::ManagedOption;
 pub use managed_ref::ManagedRef;
 pub use managed_vec::ManagedVec;
 pub use managed_vec_item::ManagedVecItem;
+pub use managed_vec_item_payload::*;
 pub use managed_vec_owned_iter::ManagedVecOwnedIterator;
 pub use managed_vec_ref::ManagedVecRef;
 pub use managed_vec_ref_iter::ManagedVecRefIterator;
diff --git a/framework/derive/src/managed_vec_item_derive.rs b/framework/derive/src/managed_vec_item_derive.rs
index a65f62a37c..5ade7c5232 100644
--- a/framework/derive/src/managed_vec_item_derive.rs
+++ b/framework/derive/src/managed_vec_item_derive.rs
@@ -130,6 +130,7 @@ fn enum_derive(data_enum: &syn::DataEnum, ast: &syn::DeriveInput) -> TokenStream
 
     let gen = quote! {
         impl #impl_generics multiversx_sc::types::ManagedVecItem for #name #ty_generics #where_clause {
+            type PAYLOAD = multiversx_sc::types::ManagedVecItemPayloadBuffer<1>;
             const PAYLOAD_SIZE: usize = 1;
             const SKIPS_RESERIALIZATION: bool = true;
             type Ref<'a> = Self;
@@ -171,6 +172,7 @@ fn struct_derive(data_struct: &syn::DataStruct, ast: &syn::DeriveInput) -> Token
 
     let gen = quote! {
         impl #impl_generics multiversx_sc::types::ManagedVecItem for #name #ty_generics #where_clause {
+            type PAYLOAD = multiversx_sc::types::TempPayload;
             const PAYLOAD_SIZE: usize = #(#payload_snippets)+*;
             const SKIPS_RESERIALIZATION: bool = #(#skips_reserialization_snippets)&&*;
             type Ref<'a> = Self;
diff --git a/framework/scenario/src/api/impl_vh/debug_handle_vh.rs b/framework/scenario/src/api/impl_vh/debug_handle_vh.rs
index 6174bc06b7..2f350946ba 100644
--- a/framework/scenario/src/api/impl_vh/debug_handle_vh.rs
+++ b/framework/scenario/src/api/impl_vh/debug_handle_vh.rs
@@ -77,6 +77,8 @@ impl From<i32> for DebugHandle {
 }
 
 impl ManagedVecItem for DebugHandle {
+    type PAYLOAD = <RawHandle as ManagedVecItem>::PAYLOAD;
+
     const PAYLOAD_SIZE: usize = <RawHandle as ManagedVecItem>::PAYLOAD_SIZE;
 
     const SKIPS_RESERIALIZATION: bool = <RawHandle as ManagedVecItem>::SKIPS_RESERIALIZATION;
diff --git a/framework/scenario/tests/derive_managed_vec_item_struct_2_test.rs b/framework/scenario/tests/derive_managed_vec_item_struct_2_test.rs
index 90db2ddddc..672476af1f 100644
--- a/framework/scenario/tests/derive_managed_vec_item_struct_2_test.rs
+++ b/framework/scenario/tests/derive_managed_vec_item_struct_2_test.rs
@@ -13,7 +13,7 @@ pub struct Struct2 {
     pub u_64: u64,
     pub bool_field: bool,
     pub opt_field: Option<u8>,
-    pub arr: [u16; 2],
+    pub arr: u32,
 }
 
 #[test]
@@ -35,7 +35,7 @@ fn struct_to_bytes_writer() {
         u_64: 4u64,
         bool_field: true,
         opt_field: Some(5),
-        arr: [0x6111, 0x6222],
+        arr: 0x61116222,
     };
 
     #[rustfmt::skip]
@@ -63,7 +63,7 @@ fn struct_2_from_bytes_reader() {
         u_64: 4u64,
         bool_field: false,
         opt_field: Some(5),
-        arr: [0x6111, 0x6222],
+        arr: 0x61116222,
     };
 
     #[rustfmt::skip]

From 95db7a291025fe313886eb67cea79e6ad64aedd2 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Wed, 8 May 2024 19:31:19 +0300
Subject: [PATCH 0845/1254] migration of sc-meta all snippets to unified

---
 framework/meta/src/cmd/contract.rs            |   3 +-
 .../generate_snippets/snippet_crate_gen.rs    |  32 +++++
 .../generate_snippets/snippet_gen_main.rs     |  27 ++--
 .../snippet_sc_functions_gen.rs               | 135 +++++++-----------
 .../generate_snippets/snippet_template_gen.rs |  99 +++++++++----
 .../generate_snippets/snippet_type_map.rs     |   4 -
 .../src/facade/world_tx/scenario_rh_impl.rs   |  14 +-
 7 files changed, 184 insertions(+), 130 deletions(-)

diff --git a/framework/meta/src/cmd/contract.rs b/framework/meta/src/cmd/contract.rs
index 8011d3f2e3..3e1008a3a3 100644
--- a/framework/meta/src/cmd/contract.rs
+++ b/framework/meta/src/cmd/contract.rs
@@ -30,7 +30,8 @@ pub fn cli_main<AbiObj: ContractAbiProvider>() {
         ContractCliAction::Clean => meta_config_opt.clean(),
         ContractCliAction::Update => meta_config_opt.update(),
         ContractCliAction::GenerateSnippets(gs_arg) => {
-            meta_config_opt.generate_rust_snippets(&gs_arg)
+            meta_config_opt.generate_rust_snippets(&gs_arg);
+            meta_config_opt.generate_proxy()
         },
         ContractCliAction::GenerateProxies => meta_config_opt.generate_proxy(),
     }
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 09a2efeca1..412e10c7bd 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
@@ -71,6 +71,14 @@ path = ".."
 [dependencies.multiversx-sc-snippets]
 version = "0.49.0"
 
+[dependencies.multiversx-sc]
+version = "0.49.0"
+
+[dependencies]
+clap = {{ version = "4.4.7", features = ["derive"] }}
+serde = {{ version = "1.0", features = ["derive"] }}
+toml = "0.8.6"
+
 # [workspace]
 
 "#
@@ -96,3 +104,27 @@ pub(crate) fn create_and_get_lib_file(snippets_folder_path: &str, overwrite: boo
         }
     }
 }
+
+pub(crate) fn create_sc_config_file(overwrite: bool) {
+    let sc_config_path = "../sc-config.toml";
+    let mut file = if overwrite {
+        File::create(sc_config_path).unwrap()
+    } else {
+        match File::options()
+            .create_new(true)
+            .write(true)
+            .open(sc_config_path)
+        {
+            Ok(f) => f,
+            Err(_) => return,
+        }
+    };
+
+    writeln!(
+        &mut file,
+        r#"[[proxy]]
+path = "interact-rs/src/proxy.rs"
+ "#
+    )
+    .unwrap();
+}
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 b158bcd0ce..7b24ebcd33 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
@@ -7,13 +7,13 @@ use crate::cli_args::GenerateSnippetsArgs;
 use super::{
     super::meta_config::MetaConfig,
     snippet_crate_gen::{
-        create_and_get_lib_file, create_snippets_cargo_toml, create_snippets_folder,
-        create_snippets_gitignore, create_src_folder,
+        create_and_get_lib_file, create_sc_config_file, create_snippets_cargo_toml,
+        create_snippets_folder, create_snippets_gitignore, create_src_folder,
     },
-    snippet_sc_functions_gen::write_state_struct_impl,
+    snippet_sc_functions_gen::write_interact_struct_impl,
     snippet_template_gen::{
-        write_contract_type_alias, write_snippet_constants, write_snippet_imports,
-        write_snippet_main_function, write_state_struct_declaration,
+        write_interact_struct_declaration, write_snippet_constants, write_snippet_imports,
+        write_snippet_main_function, write_snippet_state_impl, write_state_struct_declaration,
     },
 };
 
@@ -21,14 +21,12 @@ impl MetaConfig {
     pub fn generate_rust_snippets(&self, args: &GenerateSnippetsArgs) {
         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!("\"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(
             file,
             &self.original_contract_abi,
-            snake_case_name,
             &wasm_output_file_path_expr,
         );
     }
@@ -44,19 +42,16 @@ fn create_snippets_crate_and_get_lib_file(
     create_snippets_gitignore(snippets_folder_path, overwrite);
     create_snippets_cargo_toml(snippets_folder_path, contract_crate_name, overwrite);
     create_src_folder(snippets_folder_path);
+    create_sc_config_file(overwrite);
     create_and_get_lib_file(snippets_folder_path, overwrite)
 }
 
-fn write_snippets_to_file(
-    mut file: File,
-    abi: &ContractAbi,
-    snake_case_name: &str,
-    wasm_output_file_path_expr: &str,
-) {
-    write_snippet_imports(&mut file, snake_case_name);
+fn write_snippets_to_file(mut file: File, abi: &ContractAbi, wasm_output_file_path_expr: &str) {
+    write_snippet_imports(&mut file);
     write_snippet_constants(&mut file);
-    write_contract_type_alias(&mut file, snake_case_name);
     write_snippet_main_function(&mut file, abi);
     write_state_struct_declaration(&mut file);
-    write_state_struct_impl(&mut file, abi, wasm_output_file_path_expr);
+    write_snippet_state_impl(&mut file);
+    write_interact_struct_declaration(&mut file);
+    write_interact_struct_impl(&mut file, abi, wasm_output_file_path_expr);
 }
diff --git a/framework/meta/src/cmd/contract/generate_snippets/snippet_sc_functions_gen.rs b/framework/meta/src/cmd/contract/generate_snippets/snippet_sc_functions_gen.rs
index ade7591547..93c3132adf 100644
--- a/framework/meta/src/cmd/contract/generate_snippets/snippet_sc_functions_gen.rs
+++ b/framework/meta/src/cmd/contract/generate_snippets/snippet_sc_functions_gen.rs
@@ -1,36 +1,31 @@
 use std::{fs::File, io::Write};
 
-use multiversx_sc::abi::{ContractAbi, EndpointAbi, EndpointMutabilityAbi, InputAbi, OutputAbi};
+use multiversx_sc::abi::{ContractAbi, EndpointAbi, EndpointMutabilityAbi, InputAbi};
 
 use super::{snippet_gen_common::write_newline, snippet_type_map::map_abi_type_to_rust_type};
 
-pub(crate) fn write_state_struct_impl(
+pub(crate) fn write_interact_struct_impl(
     file: &mut File,
     abi: &ContractAbi,
     wasm_output_file_path_expr: &str,
 ) {
     writeln!(
         file,
-        r#"impl State {{
+        r#"impl ContractInteract {{
     async fn new() -> Self {{
         let mut interactor = Interactor::new(GATEWAY).await;
-        let wallet_address = interactor.register_wallet(Wallet::from_pem_file(PEM).unwrap());
-        let sc_addr_expr = if SC_ADDRESS == "" {{
-            DEFAULT_ADDRESS_EXPR.to_string()
-        }} else {{
-            "bech32:".to_string() + SC_ADDRESS
-        }};
+        let wallet_address = interactor.register_wallet(test_wallets::alice());
+        
         let contract_code = BytesValue::interpret_from(
             {},
             &InterpreterContext::default(),
         );
-        let contract = ContractType::new(sc_addr_expr);
 
-        State {{
+        ContractInteract {{
             interactor,
             wallet_address,
             contract_code,
-            contract,
+            state: State::load_state()
         }}
     }}
 "#,
@@ -38,38 +33,40 @@ pub(crate) fn write_state_struct_impl(
     )
     .unwrap();
 
-    write_deploy_method_impl(file, &abi.constructors[0]);
+    write_deploy_method_impl(file, &abi.constructors[0], &abi.name);
 
     for endpoint_abi in &abi.endpoints {
-        write_endpoint_impl(file, endpoint_abi);
+        write_endpoint_impl(file, endpoint_abi, &abi.name);
     }
 
     // close impl block brackets
     writeln!(file, "}}").unwrap();
 }
 
-fn write_deploy_method_impl(file: &mut File, init_abi: &EndpointAbi) {
+fn write_deploy_method_impl(file: &mut File, init_abi: &EndpointAbi, name: &String) {
     write_method_declaration(file, "deploy");
     write_endpoint_args_declaration(file, &init_abi.inputs);
+    let proxy_name = format!("{}Proxy", name);
 
-    let output_type = map_output_types_to_rust_types(&init_abi.outputs);
     writeln!(
         file,
-        r#"        let (new_address, _) = self
+        r#"        let new_address = self
             .interactor
-            .sc_deploy_get_result::<_, {}>(
-                ScDeployStep::new()
-                    .call(self.contract.{}({}))
-                    .from(&self.wallet_address)
-                    .code(&self.contract_code)
-                    .expect(TxExpect::ok().additional_error_message("deploy failed: ")),
-            )
+            .tx()
+            .from(&self.wallet_address)
+            .typed(proxy::{})
+            .init({})
+            .code(&self.contract_code)
+            .returns(ReturnsNewAddress)
+            .prepare_async()
+            .run()
             .await;
-s
         let new_address_bech32 = bech32::encode(&new_address);
+        self.state
+            .set_address(Bech32Address::from_bech32_string(new_address_bech32.clone()));
+
         println!("new address: {{new_address_bech32}}");"#,
-        output_type,
-        init_abi.rust_method_name,
+        proxy_name,
         endpoint_args_when_called(init_abi.inputs.as_slice()),
     )
     .unwrap();
@@ -79,14 +76,14 @@ s
     write_newline(file);
 }
 
-fn write_endpoint_impl(file: &mut File, endpoint_abi: &EndpointAbi) {
+fn write_endpoint_impl(file: &mut File, endpoint_abi: &EndpointAbi, name: &String) {
     write_method_declaration(file, &endpoint_abi.rust_method_name);
     write_payments_declaration(file, &endpoint_abi.payable_in_tokens);
     write_endpoint_args_declaration(file, &endpoint_abi.inputs);
     if matches!(endpoint_abi.mutability, EndpointMutabilityAbi::Readonly) {
-        write_contract_query(file, endpoint_abi);
+        write_contract_query(file, endpoint_abi, name);
     } else {
-        write_contract_call(file, endpoint_abi);
+        write_contract_call(file, endpoint_abi, name);
     }
 
     // close method block brackets
@@ -116,7 +113,7 @@ fn write_payments_declaration(file: &mut File, accepted_tokens: &[String]) {
     } else {
         writeln!(
             file,
-            "        let token_id = b\"\";
+            "        let token_id = String::new();
         let token_nonce = 0u64;
         let token_amount = {};",
             biguint_default.get_default_value_expr()
@@ -157,31 +154,31 @@ fn endpoint_args_when_called(inputs: &[InputAbi]) -> String {
     result
 }
 
-fn write_contract_call(file: &mut File, endpoint_abi: &EndpointAbi) {
+fn write_contract_call(file: &mut File, endpoint_abi: &EndpointAbi, name: &String) {
     let payment_snippet = if endpoint_abi.payable_in_tokens.is_empty() {
         ""
     } else if endpoint_abi.payable_in_tokens[0] == "EGLD" {
-        "\n                    .egld_value(egld_amount)"
+        "\n            .egld(egld_amount)"
     } else {
-        "\n                    .esdt_transfer(token_id.to_vec(), token_nonce, token_amount)"
+        "\n            .payment((TokenIdentifier::from(token_id.as_str()), token_nonce, token_amount))"
     };
 
-    let output_type = map_output_types_to_rust_types(&endpoint_abi.outputs);
     writeln!(
         file,
-        r#"        let response: TypedResponse<{}> = self
+        r#"        let response = self
             .interactor
-            .sc_call_use_result(
-                ScCallStep::new()
-                    .call(self.contract.{}({}))
-                    .from(&self.wallet_address){}
-                    .expect(TxExpect::ok().additional_error_message("SC call failed: ")),
-            )
+            .tx()
+            .from(&self.wallet_address)
+            .to(self.state.current_address())
+            .typed(proxy::{}Proxy)
+            .{}({}){}
+            .returns(ReturnsRawResult)
+            .prepare_async()
+            .run()
             .await;
 
-        let result = response.result.unwrap();
-        println!("Result: {{result:?}}");"#,
-        output_type,
+        println!("Result: {{response:?}}");"#,
+        name,
         endpoint_abi.rust_method_name,
         endpoint_args_when_called(endpoint_abi.inputs.as_slice()),
         payment_snippet,
@@ -189,48 +186,24 @@ fn write_contract_call(file: &mut File, endpoint_abi: &EndpointAbi) {
     .unwrap();
 }
 
-fn write_contract_query(file: &mut File, endpoint_abi: &EndpointAbi) {
-    let output_type = map_output_types_to_rust_types(&endpoint_abi.outputs);
+fn write_contract_query(file: &mut File, endpoint_abi: &EndpointAbi, name: &String) {
     writeln!(
         file,
-        r#"        let result_value: {} = self
+        r#"        let result_value = self
             .interactor
-            .vm_query(self.contract.{}({}))
+            .query()
+            .to(self.state.current_address())
+            .typed(proxy::{}Proxy)
+            .{}({})
+            .returns(ReturnsResult)
+            .prepare_async()
+            .run()
             .await;
-"#,
-        output_type,
+
+        println!("Result: {{result_value:?}}");"#,
+        name,
         endpoint_abi.rust_method_name,
         endpoint_args_when_called(endpoint_abi.inputs.as_slice()),
     )
     .unwrap();
 }
-
-pub fn map_output_types_to_rust_types(outputs: &[OutputAbi]) -> String {
-    let results_len = outputs.len();
-    if results_len == 0 {
-        return "()".to_string();
-    }
-
-    // format to be the same as when multi-value is an argument
-    // for results, each type is a different array entry
-    let mut input_str = String::new();
-    if results_len > 1 {
-        input_str += "multi";
-        input_str += "<";
-    }
-
-    for (i, output) in outputs.iter().enumerate() {
-        input_str += &output.type_names.abi;
-
-        if i < results_len - 1 {
-            input_str += ",";
-        }
-    }
-
-    if results_len > 1 {
-        input_str += ">";
-    }
-
-    let output_rust_type = map_abi_type_to_rust_type(input_str);
-    output_rust_type.get_type_name().to_string()
-}
diff --git a/framework/meta/src/cmd/contract/generate_snippets/snippet_template_gen.rs b/framework/meta/src/cmd/contract/generate_snippets/snippet_template_gen.rs
index 093afa908c..7223f1d6c4 100644
--- a/framework/meta/src/cmd/contract/generate_snippets/snippet_template_gen.rs
+++ b/framework/meta/src/cmd/contract/generate_snippets/snippet_template_gen.rs
@@ -4,15 +4,20 @@ use multiversx_sc::abi::ContractAbi;
 
 use super::snippet_gen_common::write_newline;
 
-pub(crate) fn write_snippet_imports(file: &mut File, contract_crate_name: &str) {
+pub(crate) fn write_snippet_imports(file: &mut File) {
     writeln!(
         file,
         "#![allow(non_snake_case)]
 
-use {contract_crate_name}::ProxyTrait as _;
-use {contract_crate_name}::*;
+mod proxy;
 
 use multiversx_sc_snippets::imports::*;
+use multiversx_sc_snippets::sdk;
+use serde::{{Deserialize, Serialize}};
+use std::{{
+    io::{{Read, Write}},
+    path::Path,
+}};
 "
     )
     .unwrap();
@@ -24,23 +29,8 @@ pub(crate) fn write_snippet_constants(file: &mut File) {
     writeln!(
         file,
         "const GATEWAY: &str = sdk::blockchain::DEVNET_GATEWAY;
-const PEM: &str = \"alice.pem\";
-const SC_ADDRESS: &str = \"\";
-
-const SYSTEM_SC_BECH32: &str = \"erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u\";
-const DEFAULT_ADDRESS_EXPR: &str =
-    \"0x0000000000000000000000000000000000000000000000000000000000000000\";
-const TOKEN_ISSUE_COST: u64 = 50_000_000_000_000_000;"
-    )
-    .unwrap();
-
-    write_newline(file);
-}
-
-pub(crate) fn write_contract_type_alias(file: &mut File, contract_crate_name: &str) {
-    writeln!(
-        file,
-        "type ContractType = ContractInfo<{contract_crate_name}::Proxy<StaticApi>>;"
+const STATE_FILE: &str = \"state.toml\";
+"
     )
     .unwrap();
 
@@ -57,18 +47,18 @@ async fn main() {{
     let mut args = std::env::args();
     let _ = args.next();
     let cmd = args.next().expect(\"at least one argument required\");
-    let mut state = State::new().await;
+    let mut interact = ContractInteract::new().await;
     match cmd.as_str() {{"
     )
     .unwrap();
 
     // all contracts have a deploy snippet
-    writeln!(file, r#"        "deploy" => state.deploy().await,"#).unwrap();
+    writeln!(file, r#"        "deploy" => interact.deploy().await,"#).unwrap();
 
     for endpoint in &abi.endpoints {
         writeln!(
             file,
-            r#"        "{}" => state.{}().await,"#,
+            r#"        "{}" => interact.{}().await,"#,
             endpoint.name, endpoint.rust_method_name
         )
         .unwrap();
@@ -86,17 +76,74 @@ async fn main() {{
     write_newline(file);
 }
 
-pub(crate) fn write_state_struct_declaration(file: &mut File) {
+pub(crate) fn write_interact_struct_declaration(file: &mut File) {
     writeln!(
         file,
-        "struct State {{
+        "struct ContractInteract {{
     interactor: Interactor,
     wallet_address: Address,
     contract_code: BytesValue,
-    contract: ContractType,
+    state: State
+}}"
+    )
+    .unwrap();
+
+    write_newline(file);
+}
+
+pub(crate) fn write_state_struct_declaration(file: &mut File) {
+    writeln!(
+        file,
+        "
+#[derive(Debug, Default, Serialize, Deserialize)]
+struct State {{
+    contract_address: Option<Bech32Address>
 }}"
     )
     .unwrap();
 
     write_newline(file);
 }
+
+pub(crate) fn write_snippet_state_impl(file: &mut File) {
+    writeln!(
+        file,
+        r#"impl State {{
+        // Deserializes state from file
+        pub fn load_state() -> Self {{
+            if Path::new(STATE_FILE).exists() {{
+                let mut file = std::fs::File::open(STATE_FILE).unwrap();
+                let mut content = String::new();
+                file.read_to_string(&mut content).unwrap();
+                toml::from_str(&content).unwrap()
+            }} else {{
+                Self::default()
+            }}
+        }}
+    
+        /// Sets the contract address
+        pub fn set_address(&mut self, address: Bech32Address) {{
+            self.contract_address = Some(address);
+        }}
+    
+        /// Returns the contract address
+        pub fn current_address(&self) -> &Bech32Address {{
+            self.contract_address
+                .as_ref()
+                .expect("no known contract, deploy first")
+        }}
+    }}
+    
+    impl Drop for State {{
+        // Serializes state to file
+        fn drop(&mut self) {{
+            let mut file = std::fs::File::create(STATE_FILE).unwrap();
+            file.write_all(toml::to_string(self).unwrap().as_bytes())
+                .unwrap();
+        }}
+    }}"#
+    )
+    .unwrap();
+
+    write_newline(file);
+}
diff --git a/framework/meta/src/cmd/contract/generate_snippets/snippet_type_map.rs b/framework/meta/src/cmd/contract/generate_snippets/snippet_type_map.rs
index 5e6e28423b..1a0adb3423 100644
--- a/framework/meta/src/cmd/contract/generate_snippets/snippet_type_map.rs
+++ b/framework/meta/src/cmd/contract/generate_snippets/snippet_type_map.rs
@@ -13,10 +13,6 @@ pub struct RustTypeString {
 }
 
 impl RustTypeString {
-    pub fn get_type_name(&self) -> &str {
-        &self.type_name
-    }
-
     pub fn get_default_value_expr(&self) -> &str {
         if !self.contains_custom_types {
             &self.default_value_expr
diff --git a/framework/scenario/src/facade/world_tx/scenario_rh_impl.rs b/framework/scenario/src/facade/world_tx/scenario_rh_impl.rs
index 1aaaedae9f..9d16b1b709 100644
--- a/framework/scenario/src/facade/world_tx/scenario_rh_impl.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_rh_impl.rs
@@ -2,8 +2,9 @@ use multiversx_sc::{
     abi::{TypeAbi, TypeAbiFrom},
     codec::TopDecodeMulti,
     types::{
-        ManagedAddress, RHListItemExec, ReturnsNewAddress, ReturnsNewManagedAddress, ReturnsResult,
-        ReturnsResultAs, ReturnsResultUnmanaged, TxEnv, WithNewAddress, WithResultAs,
+        ManagedAddress, RHListItemExec, ReturnsNewAddress, ReturnsNewManagedAddress,
+        ReturnsRawResult, ReturnsResult, ReturnsResultAs, ReturnsResultUnmanaged, TxEnv,
+        WithNewAddress, WithResultAs,
     },
 };
 
@@ -76,6 +77,15 @@ where
     }
 }
 
+impl<Env, Original> RHListItemExec<TxResponse, Env, Original> for ReturnsRawResult
+where
+    Env: TxEnv,
+{
+    fn item_process_result(self, tx_response: &TxResponse) -> Self::Returns {
+        tx_response.out.clone().into()
+    }
+}
+
 impl<Env, Original> RHListItemExec<TxResponse, Env, Original> for ReturnsNewManagedAddress
 where
     Env: TxEnv,

From 319c25a3b9b291784a035a1121e020cbabb80856 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 8 May 2024 19:46:21 +0300
Subject: [PATCH 0846/1254] mn vec item refactor: replaced usage of
 PAYLOAD_SIZE

---
 .../managed/wrapped/esdt_token_payment.rs     |    2 +-
 .../types/managed/wrapped/managed_vec_item.rs |   28 +-
 .../wrapped/managed_vec_item_nested_tuple.rs  |   38 +
 .../wrapped/managed_vec_item_payload.rs       | 1296 ++++++++++++++++-
 .../managed/wrapped/managed_vec_owned_iter.rs |    8 +-
 .../managed/wrapped/managed_vec_ref_iter.rs   |   10 +-
 .../base/src/types/managed/wrapped/mod.rs     |    2 +
 .../derive/src/managed_vec_item_derive.rs     |   49 +-
 .../derive_managed_vec_item_biguint_test.rs   |   16 +-
 ...anaged_vec_item_esdt_token_payment_test.rs |   20 +-
 .../derive_managed_vec_item_simple_enum.rs    |    2 +-
 .../derive_managed_vec_item_struct_1_test.rs  |   14 +-
 .../derive_managed_vec_item_struct_2_test.rs  |    2 +-
 vm/src/tx_mock/tx_managed_types/handle_map.rs |    4 +-
 14 files changed, 1420 insertions(+), 71 deletions(-)
 create mode 100644 framework/base/src/types/managed/wrapped/managed_vec_item_nested_tuple.rs

diff --git a/framework/base/src/types/managed/wrapped/esdt_token_payment.rs b/framework/base/src/types/managed/wrapped/esdt_token_payment.rs
index 85e33e6d8e..4d22d0ebe6 100644
--- a/framework/base/src/types/managed/wrapped/esdt_token_payment.rs
+++ b/framework/base/src/types/managed/wrapped/esdt_token_payment.rs
@@ -185,7 +185,7 @@ impl<M: ManagedTypeApi> IntoMultiValue for EsdtTokenPayment<M> {
 }
 
 impl<M: ManagedTypeApi> ManagedVecItem for EsdtTokenPayment<M> {
-    type PAYLOAD = ManagedVecItemPayloadBuffer<4>;
+    type PAYLOAD = ManagedVecItemPayloadBuffer<16>;
     const PAYLOAD_SIZE: usize = 16;
     const SKIPS_RESERIALIZATION: bool = false;
     type Ref<'a> = Self;
diff --git a/framework/base/src/types/managed/wrapped/managed_vec_item.rs b/framework/base/src/types/managed/wrapped/managed_vec_item.rs
index 0242663d32..0a507aae25 100644
--- a/framework/base/src/types/managed/wrapped/managed_vec_item.rs
+++ b/framework/base/src/types/managed/wrapped/managed_vec_item.rs
@@ -8,7 +8,7 @@ use crate::{
     },
 };
 
-use super::{ManagedVecItemPayload, ManagedVecItemPayloadAdd, ManagedVecItemPayloadBuffer};
+use super::{ManagedVecItemNestedTuple, ManagedVecItemPayload, ManagedVecItemPayloadBuffer};
 
 /// Types that implement this trait can be items inside a `ManagedVec`.
 /// All these types need a payload, i.e a representation that gets stored
@@ -36,6 +36,10 @@ pub trait ManagedVecItem: 'static {
     /// TODO: wrap other types in readonly wrapper.
     type Ref<'a>: Borrow<Self>;
 
+    fn payload_size() -> usize {
+        Self::PAYLOAD::payload_size()
+    }
+
     /// Parses given bytes as a an owned object.
     fn from_byte_reader<Reader: FnMut(&mut [u8])>(reader: Reader) -> Self;
 
@@ -133,23 +137,24 @@ impl ManagedVecItem for bool {
 
 impl<T> ManagedVecItem for Option<T>
 where
-    ManagedVecItemPayloadBuffer<1>: ManagedVecItemPayloadAdd<T::PAYLOAD>,
+    (u8, (T, ())): ManagedVecItemNestedTuple,
     [(); 1 + T::PAYLOAD_SIZE]:,
     T: ManagedVecItem,
 {
-    type PAYLOAD = <ManagedVecItemPayloadBuffer<1> as ManagedVecItemPayloadAdd<T::PAYLOAD>>::Output;
+    type PAYLOAD = <(u8, (T, ())) as ManagedVecItemNestedTuple>::PAYLOAD;
     const PAYLOAD_SIZE: usize = 1 + T::PAYLOAD_SIZE;
     const SKIPS_RESERIALIZATION: bool = false;
     type Ref<'a> = Self;
 
     fn from_byte_reader<Reader: FnMut(&mut [u8])>(mut reader: Reader) -> Self {
-        let mut byte_arr: [u8; 1 + T::PAYLOAD_SIZE] = [0u8; 1 + T::PAYLOAD_SIZE];
-        reader(&mut byte_arr[..]);
-        if byte_arr[0] == 0 {
+        let mut payload = Self::PAYLOAD::new_buffer();
+        let payload_slice = payload.payload_slice();
+        reader(payload_slice);
+        if payload_slice[0] == 0 {
             None
         } else {
             Some(T::from_byte_reader(|bytes| {
-                bytes.copy_from_slice(&byte_arr[1..]);
+                bytes.copy_from_slice(&payload_slice[1..]);
             }))
         }
     }
@@ -161,14 +166,15 @@ where
     }
 
     fn to_byte_writer<R, Writer: FnMut(&[u8]) -> R>(&self, mut writer: Writer) -> R {
-        let mut byte_arr: [u8; 1 + T::PAYLOAD_SIZE] = [0u8; 1 + T::PAYLOAD_SIZE];
+        let mut payload = Self::PAYLOAD::new_buffer();
+        let slice = payload.payload_slice();
         if let Some(t) = self {
-            byte_arr[0] = 1;
+            slice[0] = 1;
             T::to_byte_writer(t, |bytes| {
-                byte_arr[1..].copy_from_slice(bytes);
+                slice[1..].copy_from_slice(bytes);
             });
         }
-        writer(&byte_arr[..])
+        writer(slice)
     }
 }
 
diff --git a/framework/base/src/types/managed/wrapped/managed_vec_item_nested_tuple.rs b/framework/base/src/types/managed/wrapped/managed_vec_item_nested_tuple.rs
new file mode 100644
index 0000000000..2d4826272a
--- /dev/null
+++ b/framework/base/src/types/managed/wrapped/managed_vec_item_nested_tuple.rs
@@ -0,0 +1,38 @@
+use super::{
+    ManagedVecItem, ManagedVecItemEmptyPayload, ManagedVecItemPayload, ManagedVecItemPayloadAdd,
+};
+
+pub trait ManagedVecItemNestedTuple {
+    type PAYLOAD: ManagedVecItemPayload;
+}
+
+impl ManagedVecItemNestedTuple for () {
+    type PAYLOAD = ManagedVecItemEmptyPayload;
+}
+
+impl<Head, Tail> ManagedVecItemNestedTuple for (Head, Tail)
+where
+    Head: ManagedVecItem,
+    Tail: ManagedVecItemNestedTuple,
+    Head::PAYLOAD: ManagedVecItemPayloadAdd<Tail::PAYLOAD>,
+{
+    type PAYLOAD = <Head::PAYLOAD as ManagedVecItemPayloadAdd<Tail::PAYLOAD>>::Output;
+}
+
+#[cfg(test)]
+pub mod tests {
+    use super::*;
+
+    #[test]
+    fn managed_vec_item_nesteds_tuple_test() {
+        assert_payload_size::<()>(0);
+        assert_payload_size::<(u8, ())>(1);
+        assert_payload_size::<(usize, ())>(4);
+        assert_payload_size::<(usize, (usize, ()))>(8);
+        assert_payload_size::<(Option<usize>, ())>(5);
+    }
+
+    fn assert_payload_size<N: ManagedVecItemNestedTuple>(expected_size: usize) {
+        assert_eq!(N::PAYLOAD::payload_size(), expected_size);
+    }
+}
diff --git a/framework/base/src/types/managed/wrapped/managed_vec_item_payload.rs b/framework/base/src/types/managed/wrapped/managed_vec_item_payload.rs
index cfe1ed4389..253ac1fba9 100644
--- a/framework/base/src/types/managed/wrapped/managed_vec_item_payload.rs
+++ b/framework/base/src/types/managed/wrapped/managed_vec_item_payload.rs
@@ -6,19 +6,19 @@ pub trait ManagedVecItemPayload {
     fn payload_slice(&mut self) -> &mut [u8];
 }
 
-pub struct TempPayload;
+pub struct ManagedVecItemEmptyPayload;
 
-impl ManagedVecItemPayload for TempPayload {
+impl ManagedVecItemPayload for ManagedVecItemEmptyPayload {
     fn new_buffer() -> Self {
-        panic!("nope!")
+        ManagedVecItemEmptyPayload
     }
 
     fn payload_size() -> usize {
-        panic!("nope!")
+        0
     }
 
     fn payload_slice(&mut self) -> &mut [u8] {
-        panic!("nope!")
+        &mut []
     }
 }
 
@@ -47,6 +47,12 @@ where
     type Output: ManagedVecItemPayload;
 }
 
+impl<const N: usize> ManagedVecItemPayloadAdd<ManagedVecItemEmptyPayload>
+    for ManagedVecItemPayloadBuffer<N>
+{
+    type Output = Self;
+}
+
 macro_rules! payload_add {
     ($dec1:expr, $dec2:expr, $result_add:expr) => {
         impl ManagedVecItemPayloadAdd<ManagedVecItemPayloadBuffer<$dec2>>
@@ -89,6 +95,22 @@ payload_add!(1usize, 29usize, 30usize);
 payload_add!(1usize, 30usize, 31usize);
 payload_add!(1usize, 31usize, 32usize);
 payload_add!(1usize, 32usize, 33usize);
+payload_add!(1usize, 33usize, 34usize);
+payload_add!(1usize, 34usize, 35usize);
+payload_add!(1usize, 35usize, 36usize);
+payload_add!(1usize, 36usize, 37usize);
+payload_add!(1usize, 37usize, 38usize);
+payload_add!(1usize, 38usize, 39usize);
+payload_add!(1usize, 39usize, 40usize);
+payload_add!(1usize, 40usize, 41usize);
+payload_add!(1usize, 41usize, 42usize);
+payload_add!(1usize, 42usize, 43usize);
+payload_add!(1usize, 43usize, 44usize);
+payload_add!(1usize, 44usize, 45usize);
+payload_add!(1usize, 45usize, 46usize);
+payload_add!(1usize, 46usize, 47usize);
+payload_add!(1usize, 47usize, 48usize);
+payload_add!(1usize, 48usize, 49usize);
 payload_add!(2usize, 1usize, 3usize);
 payload_add!(2usize, 2usize, 4usize);
 payload_add!(2usize, 3usize, 5usize);
@@ -121,6 +143,22 @@ payload_add!(2usize, 29usize, 31usize);
 payload_add!(2usize, 30usize, 32usize);
 payload_add!(2usize, 31usize, 33usize);
 payload_add!(2usize, 32usize, 34usize);
+payload_add!(2usize, 33usize, 35usize);
+payload_add!(2usize, 34usize, 36usize);
+payload_add!(2usize, 35usize, 37usize);
+payload_add!(2usize, 36usize, 38usize);
+payload_add!(2usize, 37usize, 39usize);
+payload_add!(2usize, 38usize, 40usize);
+payload_add!(2usize, 39usize, 41usize);
+payload_add!(2usize, 40usize, 42usize);
+payload_add!(2usize, 41usize, 43usize);
+payload_add!(2usize, 42usize, 44usize);
+payload_add!(2usize, 43usize, 45usize);
+payload_add!(2usize, 44usize, 46usize);
+payload_add!(2usize, 45usize, 47usize);
+payload_add!(2usize, 46usize, 48usize);
+payload_add!(2usize, 47usize, 49usize);
+payload_add!(2usize, 48usize, 50usize);
 payload_add!(3usize, 1usize, 4usize);
 payload_add!(3usize, 2usize, 5usize);
 payload_add!(3usize, 3usize, 6usize);
@@ -153,6 +191,22 @@ payload_add!(3usize, 29usize, 32usize);
 payload_add!(3usize, 30usize, 33usize);
 payload_add!(3usize, 31usize, 34usize);
 payload_add!(3usize, 32usize, 35usize);
+payload_add!(3usize, 33usize, 36usize);
+payload_add!(3usize, 34usize, 37usize);
+payload_add!(3usize, 35usize, 38usize);
+payload_add!(3usize, 36usize, 39usize);
+payload_add!(3usize, 37usize, 40usize);
+payload_add!(3usize, 38usize, 41usize);
+payload_add!(3usize, 39usize, 42usize);
+payload_add!(3usize, 40usize, 43usize);
+payload_add!(3usize, 41usize, 44usize);
+payload_add!(3usize, 42usize, 45usize);
+payload_add!(3usize, 43usize, 46usize);
+payload_add!(3usize, 44usize, 47usize);
+payload_add!(3usize, 45usize, 48usize);
+payload_add!(3usize, 46usize, 49usize);
+payload_add!(3usize, 47usize, 50usize);
+payload_add!(3usize, 48usize, 51usize);
 payload_add!(4usize, 1usize, 5usize);
 payload_add!(4usize, 2usize, 6usize);
 payload_add!(4usize, 3usize, 7usize);
@@ -185,6 +239,22 @@ payload_add!(4usize, 29usize, 33usize);
 payload_add!(4usize, 30usize, 34usize);
 payload_add!(4usize, 31usize, 35usize);
 payload_add!(4usize, 32usize, 36usize);
+payload_add!(4usize, 33usize, 37usize);
+payload_add!(4usize, 34usize, 38usize);
+payload_add!(4usize, 35usize, 39usize);
+payload_add!(4usize, 36usize, 40usize);
+payload_add!(4usize, 37usize, 41usize);
+payload_add!(4usize, 38usize, 42usize);
+payload_add!(4usize, 39usize, 43usize);
+payload_add!(4usize, 40usize, 44usize);
+payload_add!(4usize, 41usize, 45usize);
+payload_add!(4usize, 42usize, 46usize);
+payload_add!(4usize, 43usize, 47usize);
+payload_add!(4usize, 44usize, 48usize);
+payload_add!(4usize, 45usize, 49usize);
+payload_add!(4usize, 46usize, 50usize);
+payload_add!(4usize, 47usize, 51usize);
+payload_add!(4usize, 48usize, 52usize);
 payload_add!(5usize, 1usize, 6usize);
 payload_add!(5usize, 2usize, 7usize);
 payload_add!(5usize, 3usize, 8usize);
@@ -217,6 +287,22 @@ payload_add!(5usize, 29usize, 34usize);
 payload_add!(5usize, 30usize, 35usize);
 payload_add!(5usize, 31usize, 36usize);
 payload_add!(5usize, 32usize, 37usize);
+payload_add!(5usize, 33usize, 38usize);
+payload_add!(5usize, 34usize, 39usize);
+payload_add!(5usize, 35usize, 40usize);
+payload_add!(5usize, 36usize, 41usize);
+payload_add!(5usize, 37usize, 42usize);
+payload_add!(5usize, 38usize, 43usize);
+payload_add!(5usize, 39usize, 44usize);
+payload_add!(5usize, 40usize, 45usize);
+payload_add!(5usize, 41usize, 46usize);
+payload_add!(5usize, 42usize, 47usize);
+payload_add!(5usize, 43usize, 48usize);
+payload_add!(5usize, 44usize, 49usize);
+payload_add!(5usize, 45usize, 50usize);
+payload_add!(5usize, 46usize, 51usize);
+payload_add!(5usize, 47usize, 52usize);
+payload_add!(5usize, 48usize, 53usize);
 payload_add!(6usize, 1usize, 7usize);
 payload_add!(6usize, 2usize, 8usize);
 payload_add!(6usize, 3usize, 9usize);
@@ -249,6 +335,22 @@ payload_add!(6usize, 29usize, 35usize);
 payload_add!(6usize, 30usize, 36usize);
 payload_add!(6usize, 31usize, 37usize);
 payload_add!(6usize, 32usize, 38usize);
+payload_add!(6usize, 33usize, 39usize);
+payload_add!(6usize, 34usize, 40usize);
+payload_add!(6usize, 35usize, 41usize);
+payload_add!(6usize, 36usize, 42usize);
+payload_add!(6usize, 37usize, 43usize);
+payload_add!(6usize, 38usize, 44usize);
+payload_add!(6usize, 39usize, 45usize);
+payload_add!(6usize, 40usize, 46usize);
+payload_add!(6usize, 41usize, 47usize);
+payload_add!(6usize, 42usize, 48usize);
+payload_add!(6usize, 43usize, 49usize);
+payload_add!(6usize, 44usize, 50usize);
+payload_add!(6usize, 45usize, 51usize);
+payload_add!(6usize, 46usize, 52usize);
+payload_add!(6usize, 47usize, 53usize);
+payload_add!(6usize, 48usize, 54usize);
 payload_add!(7usize, 1usize, 8usize);
 payload_add!(7usize, 2usize, 9usize);
 payload_add!(7usize, 3usize, 10usize);
@@ -281,6 +383,22 @@ payload_add!(7usize, 29usize, 36usize);
 payload_add!(7usize, 30usize, 37usize);
 payload_add!(7usize, 31usize, 38usize);
 payload_add!(7usize, 32usize, 39usize);
+payload_add!(7usize, 33usize, 40usize);
+payload_add!(7usize, 34usize, 41usize);
+payload_add!(7usize, 35usize, 42usize);
+payload_add!(7usize, 36usize, 43usize);
+payload_add!(7usize, 37usize, 44usize);
+payload_add!(7usize, 38usize, 45usize);
+payload_add!(7usize, 39usize, 46usize);
+payload_add!(7usize, 40usize, 47usize);
+payload_add!(7usize, 41usize, 48usize);
+payload_add!(7usize, 42usize, 49usize);
+payload_add!(7usize, 43usize, 50usize);
+payload_add!(7usize, 44usize, 51usize);
+payload_add!(7usize, 45usize, 52usize);
+payload_add!(7usize, 46usize, 53usize);
+payload_add!(7usize, 47usize, 54usize);
+payload_add!(7usize, 48usize, 55usize);
 payload_add!(8usize, 1usize, 9usize);
 payload_add!(8usize, 2usize, 10usize);
 payload_add!(8usize, 3usize, 11usize);
@@ -313,6 +431,22 @@ payload_add!(8usize, 29usize, 37usize);
 payload_add!(8usize, 30usize, 38usize);
 payload_add!(8usize, 31usize, 39usize);
 payload_add!(8usize, 32usize, 40usize);
+payload_add!(8usize, 33usize, 41usize);
+payload_add!(8usize, 34usize, 42usize);
+payload_add!(8usize, 35usize, 43usize);
+payload_add!(8usize, 36usize, 44usize);
+payload_add!(8usize, 37usize, 45usize);
+payload_add!(8usize, 38usize, 46usize);
+payload_add!(8usize, 39usize, 47usize);
+payload_add!(8usize, 40usize, 48usize);
+payload_add!(8usize, 41usize, 49usize);
+payload_add!(8usize, 42usize, 50usize);
+payload_add!(8usize, 43usize, 51usize);
+payload_add!(8usize, 44usize, 52usize);
+payload_add!(8usize, 45usize, 53usize);
+payload_add!(8usize, 46usize, 54usize);
+payload_add!(8usize, 47usize, 55usize);
+payload_add!(8usize, 48usize, 56usize);
 payload_add!(9usize, 1usize, 10usize);
 payload_add!(9usize, 2usize, 11usize);
 payload_add!(9usize, 3usize, 12usize);
@@ -345,6 +479,22 @@ payload_add!(9usize, 29usize, 38usize);
 payload_add!(9usize, 30usize, 39usize);
 payload_add!(9usize, 31usize, 40usize);
 payload_add!(9usize, 32usize, 41usize);
+payload_add!(9usize, 33usize, 42usize);
+payload_add!(9usize, 34usize, 43usize);
+payload_add!(9usize, 35usize, 44usize);
+payload_add!(9usize, 36usize, 45usize);
+payload_add!(9usize, 37usize, 46usize);
+payload_add!(9usize, 38usize, 47usize);
+payload_add!(9usize, 39usize, 48usize);
+payload_add!(9usize, 40usize, 49usize);
+payload_add!(9usize, 41usize, 50usize);
+payload_add!(9usize, 42usize, 51usize);
+payload_add!(9usize, 43usize, 52usize);
+payload_add!(9usize, 44usize, 53usize);
+payload_add!(9usize, 45usize, 54usize);
+payload_add!(9usize, 46usize, 55usize);
+payload_add!(9usize, 47usize, 56usize);
+payload_add!(9usize, 48usize, 57usize);
 payload_add!(10usize, 1usize, 11usize);
 payload_add!(10usize, 2usize, 12usize);
 payload_add!(10usize, 3usize, 13usize);
@@ -377,6 +527,22 @@ payload_add!(10usize, 29usize, 39usize);
 payload_add!(10usize, 30usize, 40usize);
 payload_add!(10usize, 31usize, 41usize);
 payload_add!(10usize, 32usize, 42usize);
+payload_add!(10usize, 33usize, 43usize);
+payload_add!(10usize, 34usize, 44usize);
+payload_add!(10usize, 35usize, 45usize);
+payload_add!(10usize, 36usize, 46usize);
+payload_add!(10usize, 37usize, 47usize);
+payload_add!(10usize, 38usize, 48usize);
+payload_add!(10usize, 39usize, 49usize);
+payload_add!(10usize, 40usize, 50usize);
+payload_add!(10usize, 41usize, 51usize);
+payload_add!(10usize, 42usize, 52usize);
+payload_add!(10usize, 43usize, 53usize);
+payload_add!(10usize, 44usize, 54usize);
+payload_add!(10usize, 45usize, 55usize);
+payload_add!(10usize, 46usize, 56usize);
+payload_add!(10usize, 47usize, 57usize);
+payload_add!(10usize, 48usize, 58usize);
 payload_add!(11usize, 1usize, 12usize);
 payload_add!(11usize, 2usize, 13usize);
 payload_add!(11usize, 3usize, 14usize);
@@ -409,6 +575,22 @@ payload_add!(11usize, 29usize, 40usize);
 payload_add!(11usize, 30usize, 41usize);
 payload_add!(11usize, 31usize, 42usize);
 payload_add!(11usize, 32usize, 43usize);
+payload_add!(11usize, 33usize, 44usize);
+payload_add!(11usize, 34usize, 45usize);
+payload_add!(11usize, 35usize, 46usize);
+payload_add!(11usize, 36usize, 47usize);
+payload_add!(11usize, 37usize, 48usize);
+payload_add!(11usize, 38usize, 49usize);
+payload_add!(11usize, 39usize, 50usize);
+payload_add!(11usize, 40usize, 51usize);
+payload_add!(11usize, 41usize, 52usize);
+payload_add!(11usize, 42usize, 53usize);
+payload_add!(11usize, 43usize, 54usize);
+payload_add!(11usize, 44usize, 55usize);
+payload_add!(11usize, 45usize, 56usize);
+payload_add!(11usize, 46usize, 57usize);
+payload_add!(11usize, 47usize, 58usize);
+payload_add!(11usize, 48usize, 59usize);
 payload_add!(12usize, 1usize, 13usize);
 payload_add!(12usize, 2usize, 14usize);
 payload_add!(12usize, 3usize, 15usize);
@@ -441,6 +623,22 @@ payload_add!(12usize, 29usize, 41usize);
 payload_add!(12usize, 30usize, 42usize);
 payload_add!(12usize, 31usize, 43usize);
 payload_add!(12usize, 32usize, 44usize);
+payload_add!(12usize, 33usize, 45usize);
+payload_add!(12usize, 34usize, 46usize);
+payload_add!(12usize, 35usize, 47usize);
+payload_add!(12usize, 36usize, 48usize);
+payload_add!(12usize, 37usize, 49usize);
+payload_add!(12usize, 38usize, 50usize);
+payload_add!(12usize, 39usize, 51usize);
+payload_add!(12usize, 40usize, 52usize);
+payload_add!(12usize, 41usize, 53usize);
+payload_add!(12usize, 42usize, 54usize);
+payload_add!(12usize, 43usize, 55usize);
+payload_add!(12usize, 44usize, 56usize);
+payload_add!(12usize, 45usize, 57usize);
+payload_add!(12usize, 46usize, 58usize);
+payload_add!(12usize, 47usize, 59usize);
+payload_add!(12usize, 48usize, 60usize);
 payload_add!(13usize, 1usize, 14usize);
 payload_add!(13usize, 2usize, 15usize);
 payload_add!(13usize, 3usize, 16usize);
@@ -473,6 +671,22 @@ payload_add!(13usize, 29usize, 42usize);
 payload_add!(13usize, 30usize, 43usize);
 payload_add!(13usize, 31usize, 44usize);
 payload_add!(13usize, 32usize, 45usize);
+payload_add!(13usize, 33usize, 46usize);
+payload_add!(13usize, 34usize, 47usize);
+payload_add!(13usize, 35usize, 48usize);
+payload_add!(13usize, 36usize, 49usize);
+payload_add!(13usize, 37usize, 50usize);
+payload_add!(13usize, 38usize, 51usize);
+payload_add!(13usize, 39usize, 52usize);
+payload_add!(13usize, 40usize, 53usize);
+payload_add!(13usize, 41usize, 54usize);
+payload_add!(13usize, 42usize, 55usize);
+payload_add!(13usize, 43usize, 56usize);
+payload_add!(13usize, 44usize, 57usize);
+payload_add!(13usize, 45usize, 58usize);
+payload_add!(13usize, 46usize, 59usize);
+payload_add!(13usize, 47usize, 60usize);
+payload_add!(13usize, 48usize, 61usize);
 payload_add!(14usize, 1usize, 15usize);
 payload_add!(14usize, 2usize, 16usize);
 payload_add!(14usize, 3usize, 17usize);
@@ -505,6 +719,22 @@ payload_add!(14usize, 29usize, 43usize);
 payload_add!(14usize, 30usize, 44usize);
 payload_add!(14usize, 31usize, 45usize);
 payload_add!(14usize, 32usize, 46usize);
+payload_add!(14usize, 33usize, 47usize);
+payload_add!(14usize, 34usize, 48usize);
+payload_add!(14usize, 35usize, 49usize);
+payload_add!(14usize, 36usize, 50usize);
+payload_add!(14usize, 37usize, 51usize);
+payload_add!(14usize, 38usize, 52usize);
+payload_add!(14usize, 39usize, 53usize);
+payload_add!(14usize, 40usize, 54usize);
+payload_add!(14usize, 41usize, 55usize);
+payload_add!(14usize, 42usize, 56usize);
+payload_add!(14usize, 43usize, 57usize);
+payload_add!(14usize, 44usize, 58usize);
+payload_add!(14usize, 45usize, 59usize);
+payload_add!(14usize, 46usize, 60usize);
+payload_add!(14usize, 47usize, 61usize);
+payload_add!(14usize, 48usize, 62usize);
 payload_add!(15usize, 1usize, 16usize);
 payload_add!(15usize, 2usize, 17usize);
 payload_add!(15usize, 3usize, 18usize);
@@ -537,6 +767,22 @@ payload_add!(15usize, 29usize, 44usize);
 payload_add!(15usize, 30usize, 45usize);
 payload_add!(15usize, 31usize, 46usize);
 payload_add!(15usize, 32usize, 47usize);
+payload_add!(15usize, 33usize, 48usize);
+payload_add!(15usize, 34usize, 49usize);
+payload_add!(15usize, 35usize, 50usize);
+payload_add!(15usize, 36usize, 51usize);
+payload_add!(15usize, 37usize, 52usize);
+payload_add!(15usize, 38usize, 53usize);
+payload_add!(15usize, 39usize, 54usize);
+payload_add!(15usize, 40usize, 55usize);
+payload_add!(15usize, 41usize, 56usize);
+payload_add!(15usize, 42usize, 57usize);
+payload_add!(15usize, 43usize, 58usize);
+payload_add!(15usize, 44usize, 59usize);
+payload_add!(15usize, 45usize, 60usize);
+payload_add!(15usize, 46usize, 61usize);
+payload_add!(15usize, 47usize, 62usize);
+payload_add!(15usize, 48usize, 63usize);
 payload_add!(16usize, 1usize, 17usize);
 payload_add!(16usize, 2usize, 18usize);
 payload_add!(16usize, 3usize, 19usize);
@@ -569,6 +815,22 @@ payload_add!(16usize, 29usize, 45usize);
 payload_add!(16usize, 30usize, 46usize);
 payload_add!(16usize, 31usize, 47usize);
 payload_add!(16usize, 32usize, 48usize);
+payload_add!(16usize, 33usize, 49usize);
+payload_add!(16usize, 34usize, 50usize);
+payload_add!(16usize, 35usize, 51usize);
+payload_add!(16usize, 36usize, 52usize);
+payload_add!(16usize, 37usize, 53usize);
+payload_add!(16usize, 38usize, 54usize);
+payload_add!(16usize, 39usize, 55usize);
+payload_add!(16usize, 40usize, 56usize);
+payload_add!(16usize, 41usize, 57usize);
+payload_add!(16usize, 42usize, 58usize);
+payload_add!(16usize, 43usize, 59usize);
+payload_add!(16usize, 44usize, 60usize);
+payload_add!(16usize, 45usize, 61usize);
+payload_add!(16usize, 46usize, 62usize);
+payload_add!(16usize, 47usize, 63usize);
+payload_add!(16usize, 48usize, 64usize);
 payload_add!(17usize, 1usize, 18usize);
 payload_add!(17usize, 2usize, 19usize);
 payload_add!(17usize, 3usize, 20usize);
@@ -601,6 +863,22 @@ payload_add!(17usize, 29usize, 46usize);
 payload_add!(17usize, 30usize, 47usize);
 payload_add!(17usize, 31usize, 48usize);
 payload_add!(17usize, 32usize, 49usize);
+payload_add!(17usize, 33usize, 50usize);
+payload_add!(17usize, 34usize, 51usize);
+payload_add!(17usize, 35usize, 52usize);
+payload_add!(17usize, 36usize, 53usize);
+payload_add!(17usize, 37usize, 54usize);
+payload_add!(17usize, 38usize, 55usize);
+payload_add!(17usize, 39usize, 56usize);
+payload_add!(17usize, 40usize, 57usize);
+payload_add!(17usize, 41usize, 58usize);
+payload_add!(17usize, 42usize, 59usize);
+payload_add!(17usize, 43usize, 60usize);
+payload_add!(17usize, 44usize, 61usize);
+payload_add!(17usize, 45usize, 62usize);
+payload_add!(17usize, 46usize, 63usize);
+payload_add!(17usize, 47usize, 64usize);
+payload_add!(17usize, 48usize, 65usize);
 payload_add!(18usize, 1usize, 19usize);
 payload_add!(18usize, 2usize, 20usize);
 payload_add!(18usize, 3usize, 21usize);
@@ -633,6 +911,22 @@ payload_add!(18usize, 29usize, 47usize);
 payload_add!(18usize, 30usize, 48usize);
 payload_add!(18usize, 31usize, 49usize);
 payload_add!(18usize, 32usize, 50usize);
+payload_add!(18usize, 33usize, 51usize);
+payload_add!(18usize, 34usize, 52usize);
+payload_add!(18usize, 35usize, 53usize);
+payload_add!(18usize, 36usize, 54usize);
+payload_add!(18usize, 37usize, 55usize);
+payload_add!(18usize, 38usize, 56usize);
+payload_add!(18usize, 39usize, 57usize);
+payload_add!(18usize, 40usize, 58usize);
+payload_add!(18usize, 41usize, 59usize);
+payload_add!(18usize, 42usize, 60usize);
+payload_add!(18usize, 43usize, 61usize);
+payload_add!(18usize, 44usize, 62usize);
+payload_add!(18usize, 45usize, 63usize);
+payload_add!(18usize, 46usize, 64usize);
+payload_add!(18usize, 47usize, 65usize);
+payload_add!(18usize, 48usize, 66usize);
 payload_add!(19usize, 1usize, 20usize);
 payload_add!(19usize, 2usize, 21usize);
 payload_add!(19usize, 3usize, 22usize);
@@ -665,6 +959,22 @@ payload_add!(19usize, 29usize, 48usize);
 payload_add!(19usize, 30usize, 49usize);
 payload_add!(19usize, 31usize, 50usize);
 payload_add!(19usize, 32usize, 51usize);
+payload_add!(19usize, 33usize, 52usize);
+payload_add!(19usize, 34usize, 53usize);
+payload_add!(19usize, 35usize, 54usize);
+payload_add!(19usize, 36usize, 55usize);
+payload_add!(19usize, 37usize, 56usize);
+payload_add!(19usize, 38usize, 57usize);
+payload_add!(19usize, 39usize, 58usize);
+payload_add!(19usize, 40usize, 59usize);
+payload_add!(19usize, 41usize, 60usize);
+payload_add!(19usize, 42usize, 61usize);
+payload_add!(19usize, 43usize, 62usize);
+payload_add!(19usize, 44usize, 63usize);
+payload_add!(19usize, 45usize, 64usize);
+payload_add!(19usize, 46usize, 65usize);
+payload_add!(19usize, 47usize, 66usize);
+payload_add!(19usize, 48usize, 67usize);
 payload_add!(20usize, 1usize, 21usize);
 payload_add!(20usize, 2usize, 22usize);
 payload_add!(20usize, 3usize, 23usize);
@@ -697,6 +1007,22 @@ payload_add!(20usize, 29usize, 49usize);
 payload_add!(20usize, 30usize, 50usize);
 payload_add!(20usize, 31usize, 51usize);
 payload_add!(20usize, 32usize, 52usize);
+payload_add!(20usize, 33usize, 53usize);
+payload_add!(20usize, 34usize, 54usize);
+payload_add!(20usize, 35usize, 55usize);
+payload_add!(20usize, 36usize, 56usize);
+payload_add!(20usize, 37usize, 57usize);
+payload_add!(20usize, 38usize, 58usize);
+payload_add!(20usize, 39usize, 59usize);
+payload_add!(20usize, 40usize, 60usize);
+payload_add!(20usize, 41usize, 61usize);
+payload_add!(20usize, 42usize, 62usize);
+payload_add!(20usize, 43usize, 63usize);
+payload_add!(20usize, 44usize, 64usize);
+payload_add!(20usize, 45usize, 65usize);
+payload_add!(20usize, 46usize, 66usize);
+payload_add!(20usize, 47usize, 67usize);
+payload_add!(20usize, 48usize, 68usize);
 payload_add!(21usize, 1usize, 22usize);
 payload_add!(21usize, 2usize, 23usize);
 payload_add!(21usize, 3usize, 24usize);
@@ -729,6 +1055,22 @@ payload_add!(21usize, 29usize, 50usize);
 payload_add!(21usize, 30usize, 51usize);
 payload_add!(21usize, 31usize, 52usize);
 payload_add!(21usize, 32usize, 53usize);
+payload_add!(21usize, 33usize, 54usize);
+payload_add!(21usize, 34usize, 55usize);
+payload_add!(21usize, 35usize, 56usize);
+payload_add!(21usize, 36usize, 57usize);
+payload_add!(21usize, 37usize, 58usize);
+payload_add!(21usize, 38usize, 59usize);
+payload_add!(21usize, 39usize, 60usize);
+payload_add!(21usize, 40usize, 61usize);
+payload_add!(21usize, 41usize, 62usize);
+payload_add!(21usize, 42usize, 63usize);
+payload_add!(21usize, 43usize, 64usize);
+payload_add!(21usize, 44usize, 65usize);
+payload_add!(21usize, 45usize, 66usize);
+payload_add!(21usize, 46usize, 67usize);
+payload_add!(21usize, 47usize, 68usize);
+payload_add!(21usize, 48usize, 69usize);
 payload_add!(22usize, 1usize, 23usize);
 payload_add!(22usize, 2usize, 24usize);
 payload_add!(22usize, 3usize, 25usize);
@@ -761,6 +1103,22 @@ payload_add!(22usize, 29usize, 51usize);
 payload_add!(22usize, 30usize, 52usize);
 payload_add!(22usize, 31usize, 53usize);
 payload_add!(22usize, 32usize, 54usize);
+payload_add!(22usize, 33usize, 55usize);
+payload_add!(22usize, 34usize, 56usize);
+payload_add!(22usize, 35usize, 57usize);
+payload_add!(22usize, 36usize, 58usize);
+payload_add!(22usize, 37usize, 59usize);
+payload_add!(22usize, 38usize, 60usize);
+payload_add!(22usize, 39usize, 61usize);
+payload_add!(22usize, 40usize, 62usize);
+payload_add!(22usize, 41usize, 63usize);
+payload_add!(22usize, 42usize, 64usize);
+payload_add!(22usize, 43usize, 65usize);
+payload_add!(22usize, 44usize, 66usize);
+payload_add!(22usize, 45usize, 67usize);
+payload_add!(22usize, 46usize, 68usize);
+payload_add!(22usize, 47usize, 69usize);
+payload_add!(22usize, 48usize, 70usize);
 payload_add!(23usize, 1usize, 24usize);
 payload_add!(23usize, 2usize, 25usize);
 payload_add!(23usize, 3usize, 26usize);
@@ -793,6 +1151,22 @@ payload_add!(23usize, 29usize, 52usize);
 payload_add!(23usize, 30usize, 53usize);
 payload_add!(23usize, 31usize, 54usize);
 payload_add!(23usize, 32usize, 55usize);
+payload_add!(23usize, 33usize, 56usize);
+payload_add!(23usize, 34usize, 57usize);
+payload_add!(23usize, 35usize, 58usize);
+payload_add!(23usize, 36usize, 59usize);
+payload_add!(23usize, 37usize, 60usize);
+payload_add!(23usize, 38usize, 61usize);
+payload_add!(23usize, 39usize, 62usize);
+payload_add!(23usize, 40usize, 63usize);
+payload_add!(23usize, 41usize, 64usize);
+payload_add!(23usize, 42usize, 65usize);
+payload_add!(23usize, 43usize, 66usize);
+payload_add!(23usize, 44usize, 67usize);
+payload_add!(23usize, 45usize, 68usize);
+payload_add!(23usize, 46usize, 69usize);
+payload_add!(23usize, 47usize, 70usize);
+payload_add!(23usize, 48usize, 71usize);
 payload_add!(24usize, 1usize, 25usize);
 payload_add!(24usize, 2usize, 26usize);
 payload_add!(24usize, 3usize, 27usize);
@@ -825,6 +1199,22 @@ payload_add!(24usize, 29usize, 53usize);
 payload_add!(24usize, 30usize, 54usize);
 payload_add!(24usize, 31usize, 55usize);
 payload_add!(24usize, 32usize, 56usize);
+payload_add!(24usize, 33usize, 57usize);
+payload_add!(24usize, 34usize, 58usize);
+payload_add!(24usize, 35usize, 59usize);
+payload_add!(24usize, 36usize, 60usize);
+payload_add!(24usize, 37usize, 61usize);
+payload_add!(24usize, 38usize, 62usize);
+payload_add!(24usize, 39usize, 63usize);
+payload_add!(24usize, 40usize, 64usize);
+payload_add!(24usize, 41usize, 65usize);
+payload_add!(24usize, 42usize, 66usize);
+payload_add!(24usize, 43usize, 67usize);
+payload_add!(24usize, 44usize, 68usize);
+payload_add!(24usize, 45usize, 69usize);
+payload_add!(24usize, 46usize, 70usize);
+payload_add!(24usize, 47usize, 71usize);
+payload_add!(24usize, 48usize, 72usize);
 payload_add!(25usize, 1usize, 26usize);
 payload_add!(25usize, 2usize, 27usize);
 payload_add!(25usize, 3usize, 28usize);
@@ -857,6 +1247,22 @@ payload_add!(25usize, 29usize, 54usize);
 payload_add!(25usize, 30usize, 55usize);
 payload_add!(25usize, 31usize, 56usize);
 payload_add!(25usize, 32usize, 57usize);
+payload_add!(25usize, 33usize, 58usize);
+payload_add!(25usize, 34usize, 59usize);
+payload_add!(25usize, 35usize, 60usize);
+payload_add!(25usize, 36usize, 61usize);
+payload_add!(25usize, 37usize, 62usize);
+payload_add!(25usize, 38usize, 63usize);
+payload_add!(25usize, 39usize, 64usize);
+payload_add!(25usize, 40usize, 65usize);
+payload_add!(25usize, 41usize, 66usize);
+payload_add!(25usize, 42usize, 67usize);
+payload_add!(25usize, 43usize, 68usize);
+payload_add!(25usize, 44usize, 69usize);
+payload_add!(25usize, 45usize, 70usize);
+payload_add!(25usize, 46usize, 71usize);
+payload_add!(25usize, 47usize, 72usize);
+payload_add!(25usize, 48usize, 73usize);
 payload_add!(26usize, 1usize, 27usize);
 payload_add!(26usize, 2usize, 28usize);
 payload_add!(26usize, 3usize, 29usize);
@@ -889,6 +1295,22 @@ payload_add!(26usize, 29usize, 55usize);
 payload_add!(26usize, 30usize, 56usize);
 payload_add!(26usize, 31usize, 57usize);
 payload_add!(26usize, 32usize, 58usize);
+payload_add!(26usize, 33usize, 59usize);
+payload_add!(26usize, 34usize, 60usize);
+payload_add!(26usize, 35usize, 61usize);
+payload_add!(26usize, 36usize, 62usize);
+payload_add!(26usize, 37usize, 63usize);
+payload_add!(26usize, 38usize, 64usize);
+payload_add!(26usize, 39usize, 65usize);
+payload_add!(26usize, 40usize, 66usize);
+payload_add!(26usize, 41usize, 67usize);
+payload_add!(26usize, 42usize, 68usize);
+payload_add!(26usize, 43usize, 69usize);
+payload_add!(26usize, 44usize, 70usize);
+payload_add!(26usize, 45usize, 71usize);
+payload_add!(26usize, 46usize, 72usize);
+payload_add!(26usize, 47usize, 73usize);
+payload_add!(26usize, 48usize, 74usize);
 payload_add!(27usize, 1usize, 28usize);
 payload_add!(27usize, 2usize, 29usize);
 payload_add!(27usize, 3usize, 30usize);
@@ -921,6 +1343,22 @@ payload_add!(27usize, 29usize, 56usize);
 payload_add!(27usize, 30usize, 57usize);
 payload_add!(27usize, 31usize, 58usize);
 payload_add!(27usize, 32usize, 59usize);
+payload_add!(27usize, 33usize, 60usize);
+payload_add!(27usize, 34usize, 61usize);
+payload_add!(27usize, 35usize, 62usize);
+payload_add!(27usize, 36usize, 63usize);
+payload_add!(27usize, 37usize, 64usize);
+payload_add!(27usize, 38usize, 65usize);
+payload_add!(27usize, 39usize, 66usize);
+payload_add!(27usize, 40usize, 67usize);
+payload_add!(27usize, 41usize, 68usize);
+payload_add!(27usize, 42usize, 69usize);
+payload_add!(27usize, 43usize, 70usize);
+payload_add!(27usize, 44usize, 71usize);
+payload_add!(27usize, 45usize, 72usize);
+payload_add!(27usize, 46usize, 73usize);
+payload_add!(27usize, 47usize, 74usize);
+payload_add!(27usize, 48usize, 75usize);
 payload_add!(28usize, 1usize, 29usize);
 payload_add!(28usize, 2usize, 30usize);
 payload_add!(28usize, 3usize, 31usize);
@@ -953,6 +1391,22 @@ payload_add!(28usize, 29usize, 57usize);
 payload_add!(28usize, 30usize, 58usize);
 payload_add!(28usize, 31usize, 59usize);
 payload_add!(28usize, 32usize, 60usize);
+payload_add!(28usize, 33usize, 61usize);
+payload_add!(28usize, 34usize, 62usize);
+payload_add!(28usize, 35usize, 63usize);
+payload_add!(28usize, 36usize, 64usize);
+payload_add!(28usize, 37usize, 65usize);
+payload_add!(28usize, 38usize, 66usize);
+payload_add!(28usize, 39usize, 67usize);
+payload_add!(28usize, 40usize, 68usize);
+payload_add!(28usize, 41usize, 69usize);
+payload_add!(28usize, 42usize, 70usize);
+payload_add!(28usize, 43usize, 71usize);
+payload_add!(28usize, 44usize, 72usize);
+payload_add!(28usize, 45usize, 73usize);
+payload_add!(28usize, 46usize, 74usize);
+payload_add!(28usize, 47usize, 75usize);
+payload_add!(28usize, 48usize, 76usize);
 payload_add!(29usize, 1usize, 30usize);
 payload_add!(29usize, 2usize, 31usize);
 payload_add!(29usize, 3usize, 32usize);
@@ -985,6 +1439,22 @@ payload_add!(29usize, 29usize, 58usize);
 payload_add!(29usize, 30usize, 59usize);
 payload_add!(29usize, 31usize, 60usize);
 payload_add!(29usize, 32usize, 61usize);
+payload_add!(29usize, 33usize, 62usize);
+payload_add!(29usize, 34usize, 63usize);
+payload_add!(29usize, 35usize, 64usize);
+payload_add!(29usize, 36usize, 65usize);
+payload_add!(29usize, 37usize, 66usize);
+payload_add!(29usize, 38usize, 67usize);
+payload_add!(29usize, 39usize, 68usize);
+payload_add!(29usize, 40usize, 69usize);
+payload_add!(29usize, 41usize, 70usize);
+payload_add!(29usize, 42usize, 71usize);
+payload_add!(29usize, 43usize, 72usize);
+payload_add!(29usize, 44usize, 73usize);
+payload_add!(29usize, 45usize, 74usize);
+payload_add!(29usize, 46usize, 75usize);
+payload_add!(29usize, 47usize, 76usize);
+payload_add!(29usize, 48usize, 77usize);
 payload_add!(30usize, 1usize, 31usize);
 payload_add!(30usize, 2usize, 32usize);
 payload_add!(30usize, 3usize, 33usize);
@@ -1017,6 +1487,22 @@ payload_add!(30usize, 29usize, 59usize);
 payload_add!(30usize, 30usize, 60usize);
 payload_add!(30usize, 31usize, 61usize);
 payload_add!(30usize, 32usize, 62usize);
+payload_add!(30usize, 33usize, 63usize);
+payload_add!(30usize, 34usize, 64usize);
+payload_add!(30usize, 35usize, 65usize);
+payload_add!(30usize, 36usize, 66usize);
+payload_add!(30usize, 37usize, 67usize);
+payload_add!(30usize, 38usize, 68usize);
+payload_add!(30usize, 39usize, 69usize);
+payload_add!(30usize, 40usize, 70usize);
+payload_add!(30usize, 41usize, 71usize);
+payload_add!(30usize, 42usize, 72usize);
+payload_add!(30usize, 43usize, 73usize);
+payload_add!(30usize, 44usize, 74usize);
+payload_add!(30usize, 45usize, 75usize);
+payload_add!(30usize, 46usize, 76usize);
+payload_add!(30usize, 47usize, 77usize);
+payload_add!(30usize, 48usize, 78usize);
 payload_add!(31usize, 1usize, 32usize);
 payload_add!(31usize, 2usize, 33usize);
 payload_add!(31usize, 3usize, 34usize);
@@ -1049,6 +1535,22 @@ payload_add!(31usize, 29usize, 60usize);
 payload_add!(31usize, 30usize, 61usize);
 payload_add!(31usize, 31usize, 62usize);
 payload_add!(31usize, 32usize, 63usize);
+payload_add!(31usize, 33usize, 64usize);
+payload_add!(31usize, 34usize, 65usize);
+payload_add!(31usize, 35usize, 66usize);
+payload_add!(31usize, 36usize, 67usize);
+payload_add!(31usize, 37usize, 68usize);
+payload_add!(31usize, 38usize, 69usize);
+payload_add!(31usize, 39usize, 70usize);
+payload_add!(31usize, 40usize, 71usize);
+payload_add!(31usize, 41usize, 72usize);
+payload_add!(31usize, 42usize, 73usize);
+payload_add!(31usize, 43usize, 74usize);
+payload_add!(31usize, 44usize, 75usize);
+payload_add!(31usize, 45usize, 76usize);
+payload_add!(31usize, 46usize, 77usize);
+payload_add!(31usize, 47usize, 78usize);
+payload_add!(31usize, 48usize, 79usize);
 payload_add!(32usize, 1usize, 33usize);
 payload_add!(32usize, 2usize, 34usize);
 payload_add!(32usize, 3usize, 35usize);
@@ -1081,3 +1583,787 @@ payload_add!(32usize, 29usize, 61usize);
 payload_add!(32usize, 30usize, 62usize);
 payload_add!(32usize, 31usize, 63usize);
 payload_add!(32usize, 32usize, 64usize);
+payload_add!(32usize, 33usize, 65usize);
+payload_add!(32usize, 34usize, 66usize);
+payload_add!(32usize, 35usize, 67usize);
+payload_add!(32usize, 36usize, 68usize);
+payload_add!(32usize, 37usize, 69usize);
+payload_add!(32usize, 38usize, 70usize);
+payload_add!(32usize, 39usize, 71usize);
+payload_add!(32usize, 40usize, 72usize);
+payload_add!(32usize, 41usize, 73usize);
+payload_add!(32usize, 42usize, 74usize);
+payload_add!(32usize, 43usize, 75usize);
+payload_add!(32usize, 44usize, 76usize);
+payload_add!(32usize, 45usize, 77usize);
+payload_add!(32usize, 46usize, 78usize);
+payload_add!(32usize, 47usize, 79usize);
+payload_add!(32usize, 48usize, 80usize);
+payload_add!(33usize, 1usize, 34usize);
+payload_add!(33usize, 2usize, 35usize);
+payload_add!(33usize, 3usize, 36usize);
+payload_add!(33usize, 4usize, 37usize);
+payload_add!(33usize, 5usize, 38usize);
+payload_add!(33usize, 6usize, 39usize);
+payload_add!(33usize, 7usize, 40usize);
+payload_add!(33usize, 8usize, 41usize);
+payload_add!(33usize, 9usize, 42usize);
+payload_add!(33usize, 10usize, 43usize);
+payload_add!(33usize, 11usize, 44usize);
+payload_add!(33usize, 12usize, 45usize);
+payload_add!(33usize, 13usize, 46usize);
+payload_add!(33usize, 14usize, 47usize);
+payload_add!(33usize, 15usize, 48usize);
+payload_add!(33usize, 16usize, 49usize);
+payload_add!(33usize, 17usize, 50usize);
+payload_add!(33usize, 18usize, 51usize);
+payload_add!(33usize, 19usize, 52usize);
+payload_add!(33usize, 20usize, 53usize);
+payload_add!(33usize, 21usize, 54usize);
+payload_add!(33usize, 22usize, 55usize);
+payload_add!(33usize, 23usize, 56usize);
+payload_add!(33usize, 24usize, 57usize);
+payload_add!(33usize, 25usize, 58usize);
+payload_add!(33usize, 26usize, 59usize);
+payload_add!(33usize, 27usize, 60usize);
+payload_add!(33usize, 28usize, 61usize);
+payload_add!(33usize, 29usize, 62usize);
+payload_add!(33usize, 30usize, 63usize);
+payload_add!(33usize, 31usize, 64usize);
+payload_add!(33usize, 32usize, 65usize);
+payload_add!(33usize, 33usize, 66usize);
+payload_add!(33usize, 34usize, 67usize);
+payload_add!(33usize, 35usize, 68usize);
+payload_add!(33usize, 36usize, 69usize);
+payload_add!(33usize, 37usize, 70usize);
+payload_add!(33usize, 38usize, 71usize);
+payload_add!(33usize, 39usize, 72usize);
+payload_add!(33usize, 40usize, 73usize);
+payload_add!(33usize, 41usize, 74usize);
+payload_add!(33usize, 42usize, 75usize);
+payload_add!(33usize, 43usize, 76usize);
+payload_add!(33usize, 44usize, 77usize);
+payload_add!(33usize, 45usize, 78usize);
+payload_add!(33usize, 46usize, 79usize);
+payload_add!(33usize, 47usize, 80usize);
+payload_add!(33usize, 48usize, 81usize);
+payload_add!(34usize, 1usize, 35usize);
+payload_add!(34usize, 2usize, 36usize);
+payload_add!(34usize, 3usize, 37usize);
+payload_add!(34usize, 4usize, 38usize);
+payload_add!(34usize, 5usize, 39usize);
+payload_add!(34usize, 6usize, 40usize);
+payload_add!(34usize, 7usize, 41usize);
+payload_add!(34usize, 8usize, 42usize);
+payload_add!(34usize, 9usize, 43usize);
+payload_add!(34usize, 10usize, 44usize);
+payload_add!(34usize, 11usize, 45usize);
+payload_add!(34usize, 12usize, 46usize);
+payload_add!(34usize, 13usize, 47usize);
+payload_add!(34usize, 14usize, 48usize);
+payload_add!(34usize, 15usize, 49usize);
+payload_add!(34usize, 16usize, 50usize);
+payload_add!(34usize, 17usize, 51usize);
+payload_add!(34usize, 18usize, 52usize);
+payload_add!(34usize, 19usize, 53usize);
+payload_add!(34usize, 20usize, 54usize);
+payload_add!(34usize, 21usize, 55usize);
+payload_add!(34usize, 22usize, 56usize);
+payload_add!(34usize, 23usize, 57usize);
+payload_add!(34usize, 24usize, 58usize);
+payload_add!(34usize, 25usize, 59usize);
+payload_add!(34usize, 26usize, 60usize);
+payload_add!(34usize, 27usize, 61usize);
+payload_add!(34usize, 28usize, 62usize);
+payload_add!(34usize, 29usize, 63usize);
+payload_add!(34usize, 30usize, 64usize);
+payload_add!(34usize, 31usize, 65usize);
+payload_add!(34usize, 32usize, 66usize);
+payload_add!(34usize, 33usize, 67usize);
+payload_add!(34usize, 34usize, 68usize);
+payload_add!(34usize, 35usize, 69usize);
+payload_add!(34usize, 36usize, 70usize);
+payload_add!(34usize, 37usize, 71usize);
+payload_add!(34usize, 38usize, 72usize);
+payload_add!(34usize, 39usize, 73usize);
+payload_add!(34usize, 40usize, 74usize);
+payload_add!(34usize, 41usize, 75usize);
+payload_add!(34usize, 42usize, 76usize);
+payload_add!(34usize, 43usize, 77usize);
+payload_add!(34usize, 44usize, 78usize);
+payload_add!(34usize, 45usize, 79usize);
+payload_add!(34usize, 46usize, 80usize);
+payload_add!(34usize, 47usize, 81usize);
+payload_add!(34usize, 48usize, 82usize);
+payload_add!(35usize, 1usize, 36usize);
+payload_add!(35usize, 2usize, 37usize);
+payload_add!(35usize, 3usize, 38usize);
+payload_add!(35usize, 4usize, 39usize);
+payload_add!(35usize, 5usize, 40usize);
+payload_add!(35usize, 6usize, 41usize);
+payload_add!(35usize, 7usize, 42usize);
+payload_add!(35usize, 8usize, 43usize);
+payload_add!(35usize, 9usize, 44usize);
+payload_add!(35usize, 10usize, 45usize);
+payload_add!(35usize, 11usize, 46usize);
+payload_add!(35usize, 12usize, 47usize);
+payload_add!(35usize, 13usize, 48usize);
+payload_add!(35usize, 14usize, 49usize);
+payload_add!(35usize, 15usize, 50usize);
+payload_add!(35usize, 16usize, 51usize);
+payload_add!(35usize, 17usize, 52usize);
+payload_add!(35usize, 18usize, 53usize);
+payload_add!(35usize, 19usize, 54usize);
+payload_add!(35usize, 20usize, 55usize);
+payload_add!(35usize, 21usize, 56usize);
+payload_add!(35usize, 22usize, 57usize);
+payload_add!(35usize, 23usize, 58usize);
+payload_add!(35usize, 24usize, 59usize);
+payload_add!(35usize, 25usize, 60usize);
+payload_add!(35usize, 26usize, 61usize);
+payload_add!(35usize, 27usize, 62usize);
+payload_add!(35usize, 28usize, 63usize);
+payload_add!(35usize, 29usize, 64usize);
+payload_add!(35usize, 30usize, 65usize);
+payload_add!(35usize, 31usize, 66usize);
+payload_add!(35usize, 32usize, 67usize);
+payload_add!(35usize, 33usize, 68usize);
+payload_add!(35usize, 34usize, 69usize);
+payload_add!(35usize, 35usize, 70usize);
+payload_add!(35usize, 36usize, 71usize);
+payload_add!(35usize, 37usize, 72usize);
+payload_add!(35usize, 38usize, 73usize);
+payload_add!(35usize, 39usize, 74usize);
+payload_add!(35usize, 40usize, 75usize);
+payload_add!(35usize, 41usize, 76usize);
+payload_add!(35usize, 42usize, 77usize);
+payload_add!(35usize, 43usize, 78usize);
+payload_add!(35usize, 44usize, 79usize);
+payload_add!(35usize, 45usize, 80usize);
+payload_add!(35usize, 46usize, 81usize);
+payload_add!(35usize, 47usize, 82usize);
+payload_add!(35usize, 48usize, 83usize);
+payload_add!(36usize, 1usize, 37usize);
+payload_add!(36usize, 2usize, 38usize);
+payload_add!(36usize, 3usize, 39usize);
+payload_add!(36usize, 4usize, 40usize);
+payload_add!(36usize, 5usize, 41usize);
+payload_add!(36usize, 6usize, 42usize);
+payload_add!(36usize, 7usize, 43usize);
+payload_add!(36usize, 8usize, 44usize);
+payload_add!(36usize, 9usize, 45usize);
+payload_add!(36usize, 10usize, 46usize);
+payload_add!(36usize, 11usize, 47usize);
+payload_add!(36usize, 12usize, 48usize);
+payload_add!(36usize, 13usize, 49usize);
+payload_add!(36usize, 14usize, 50usize);
+payload_add!(36usize, 15usize, 51usize);
+payload_add!(36usize, 16usize, 52usize);
+payload_add!(36usize, 17usize, 53usize);
+payload_add!(36usize, 18usize, 54usize);
+payload_add!(36usize, 19usize, 55usize);
+payload_add!(36usize, 20usize, 56usize);
+payload_add!(36usize, 21usize, 57usize);
+payload_add!(36usize, 22usize, 58usize);
+payload_add!(36usize, 23usize, 59usize);
+payload_add!(36usize, 24usize, 60usize);
+payload_add!(36usize, 25usize, 61usize);
+payload_add!(36usize, 26usize, 62usize);
+payload_add!(36usize, 27usize, 63usize);
+payload_add!(36usize, 28usize, 64usize);
+payload_add!(36usize, 29usize, 65usize);
+payload_add!(36usize, 30usize, 66usize);
+payload_add!(36usize, 31usize, 67usize);
+payload_add!(36usize, 32usize, 68usize);
+payload_add!(36usize, 33usize, 69usize);
+payload_add!(36usize, 34usize, 70usize);
+payload_add!(36usize, 35usize, 71usize);
+payload_add!(36usize, 36usize, 72usize);
+payload_add!(36usize, 37usize, 73usize);
+payload_add!(36usize, 38usize, 74usize);
+payload_add!(36usize, 39usize, 75usize);
+payload_add!(36usize, 40usize, 76usize);
+payload_add!(36usize, 41usize, 77usize);
+payload_add!(36usize, 42usize, 78usize);
+payload_add!(36usize, 43usize, 79usize);
+payload_add!(36usize, 44usize, 80usize);
+payload_add!(36usize, 45usize, 81usize);
+payload_add!(36usize, 46usize, 82usize);
+payload_add!(36usize, 47usize, 83usize);
+payload_add!(36usize, 48usize, 84usize);
+payload_add!(37usize, 1usize, 38usize);
+payload_add!(37usize, 2usize, 39usize);
+payload_add!(37usize, 3usize, 40usize);
+payload_add!(37usize, 4usize, 41usize);
+payload_add!(37usize, 5usize, 42usize);
+payload_add!(37usize, 6usize, 43usize);
+payload_add!(37usize, 7usize, 44usize);
+payload_add!(37usize, 8usize, 45usize);
+payload_add!(37usize, 9usize, 46usize);
+payload_add!(37usize, 10usize, 47usize);
+payload_add!(37usize, 11usize, 48usize);
+payload_add!(37usize, 12usize, 49usize);
+payload_add!(37usize, 13usize, 50usize);
+payload_add!(37usize, 14usize, 51usize);
+payload_add!(37usize, 15usize, 52usize);
+payload_add!(37usize, 16usize, 53usize);
+payload_add!(37usize, 17usize, 54usize);
+payload_add!(37usize, 18usize, 55usize);
+payload_add!(37usize, 19usize, 56usize);
+payload_add!(37usize, 20usize, 57usize);
+payload_add!(37usize, 21usize, 58usize);
+payload_add!(37usize, 22usize, 59usize);
+payload_add!(37usize, 23usize, 60usize);
+payload_add!(37usize, 24usize, 61usize);
+payload_add!(37usize, 25usize, 62usize);
+payload_add!(37usize, 26usize, 63usize);
+payload_add!(37usize, 27usize, 64usize);
+payload_add!(37usize, 28usize, 65usize);
+payload_add!(37usize, 29usize, 66usize);
+payload_add!(37usize, 30usize, 67usize);
+payload_add!(37usize, 31usize, 68usize);
+payload_add!(37usize, 32usize, 69usize);
+payload_add!(37usize, 33usize, 70usize);
+payload_add!(37usize, 34usize, 71usize);
+payload_add!(37usize, 35usize, 72usize);
+payload_add!(37usize, 36usize, 73usize);
+payload_add!(37usize, 37usize, 74usize);
+payload_add!(37usize, 38usize, 75usize);
+payload_add!(37usize, 39usize, 76usize);
+payload_add!(37usize, 40usize, 77usize);
+payload_add!(37usize, 41usize, 78usize);
+payload_add!(37usize, 42usize, 79usize);
+payload_add!(37usize, 43usize, 80usize);
+payload_add!(37usize, 44usize, 81usize);
+payload_add!(37usize, 45usize, 82usize);
+payload_add!(37usize, 46usize, 83usize);
+payload_add!(37usize, 47usize, 84usize);
+payload_add!(37usize, 48usize, 85usize);
+payload_add!(38usize, 1usize, 39usize);
+payload_add!(38usize, 2usize, 40usize);
+payload_add!(38usize, 3usize, 41usize);
+payload_add!(38usize, 4usize, 42usize);
+payload_add!(38usize, 5usize, 43usize);
+payload_add!(38usize, 6usize, 44usize);
+payload_add!(38usize, 7usize, 45usize);
+payload_add!(38usize, 8usize, 46usize);
+payload_add!(38usize, 9usize, 47usize);
+payload_add!(38usize, 10usize, 48usize);
+payload_add!(38usize, 11usize, 49usize);
+payload_add!(38usize, 12usize, 50usize);
+payload_add!(38usize, 13usize, 51usize);
+payload_add!(38usize, 14usize, 52usize);
+payload_add!(38usize, 15usize, 53usize);
+payload_add!(38usize, 16usize, 54usize);
+payload_add!(38usize, 17usize, 55usize);
+payload_add!(38usize, 18usize, 56usize);
+payload_add!(38usize, 19usize, 57usize);
+payload_add!(38usize, 20usize, 58usize);
+payload_add!(38usize, 21usize, 59usize);
+payload_add!(38usize, 22usize, 60usize);
+payload_add!(38usize, 23usize, 61usize);
+payload_add!(38usize, 24usize, 62usize);
+payload_add!(38usize, 25usize, 63usize);
+payload_add!(38usize, 26usize, 64usize);
+payload_add!(38usize, 27usize, 65usize);
+payload_add!(38usize, 28usize, 66usize);
+payload_add!(38usize, 29usize, 67usize);
+payload_add!(38usize, 30usize, 68usize);
+payload_add!(38usize, 31usize, 69usize);
+payload_add!(38usize, 32usize, 70usize);
+payload_add!(38usize, 33usize, 71usize);
+payload_add!(38usize, 34usize, 72usize);
+payload_add!(38usize, 35usize, 73usize);
+payload_add!(38usize, 36usize, 74usize);
+payload_add!(38usize, 37usize, 75usize);
+payload_add!(38usize, 38usize, 76usize);
+payload_add!(38usize, 39usize, 77usize);
+payload_add!(38usize, 40usize, 78usize);
+payload_add!(38usize, 41usize, 79usize);
+payload_add!(38usize, 42usize, 80usize);
+payload_add!(38usize, 43usize, 81usize);
+payload_add!(38usize, 44usize, 82usize);
+payload_add!(38usize, 45usize, 83usize);
+payload_add!(38usize, 46usize, 84usize);
+payload_add!(38usize, 47usize, 85usize);
+payload_add!(38usize, 48usize, 86usize);
+payload_add!(39usize, 1usize, 40usize);
+payload_add!(39usize, 2usize, 41usize);
+payload_add!(39usize, 3usize, 42usize);
+payload_add!(39usize, 4usize, 43usize);
+payload_add!(39usize, 5usize, 44usize);
+payload_add!(39usize, 6usize, 45usize);
+payload_add!(39usize, 7usize, 46usize);
+payload_add!(39usize, 8usize, 47usize);
+payload_add!(39usize, 9usize, 48usize);
+payload_add!(39usize, 10usize, 49usize);
+payload_add!(39usize, 11usize, 50usize);
+payload_add!(39usize, 12usize, 51usize);
+payload_add!(39usize, 13usize, 52usize);
+payload_add!(39usize, 14usize, 53usize);
+payload_add!(39usize, 15usize, 54usize);
+payload_add!(39usize, 16usize, 55usize);
+payload_add!(39usize, 17usize, 56usize);
+payload_add!(39usize, 18usize, 57usize);
+payload_add!(39usize, 19usize, 58usize);
+payload_add!(39usize, 20usize, 59usize);
+payload_add!(39usize, 21usize, 60usize);
+payload_add!(39usize, 22usize, 61usize);
+payload_add!(39usize, 23usize, 62usize);
+payload_add!(39usize, 24usize, 63usize);
+payload_add!(39usize, 25usize, 64usize);
+payload_add!(39usize, 26usize, 65usize);
+payload_add!(39usize, 27usize, 66usize);
+payload_add!(39usize, 28usize, 67usize);
+payload_add!(39usize, 29usize, 68usize);
+payload_add!(39usize, 30usize, 69usize);
+payload_add!(39usize, 31usize, 70usize);
+payload_add!(39usize, 32usize, 71usize);
+payload_add!(39usize, 33usize, 72usize);
+payload_add!(39usize, 34usize, 73usize);
+payload_add!(39usize, 35usize, 74usize);
+payload_add!(39usize, 36usize, 75usize);
+payload_add!(39usize, 37usize, 76usize);
+payload_add!(39usize, 38usize, 77usize);
+payload_add!(39usize, 39usize, 78usize);
+payload_add!(39usize, 40usize, 79usize);
+payload_add!(39usize, 41usize, 80usize);
+payload_add!(39usize, 42usize, 81usize);
+payload_add!(39usize, 43usize, 82usize);
+payload_add!(39usize, 44usize, 83usize);
+payload_add!(39usize, 45usize, 84usize);
+payload_add!(39usize, 46usize, 85usize);
+payload_add!(39usize, 47usize, 86usize);
+payload_add!(39usize, 48usize, 87usize);
+payload_add!(40usize, 1usize, 41usize);
+payload_add!(40usize, 2usize, 42usize);
+payload_add!(40usize, 3usize, 43usize);
+payload_add!(40usize, 4usize, 44usize);
+payload_add!(40usize, 5usize, 45usize);
+payload_add!(40usize, 6usize, 46usize);
+payload_add!(40usize, 7usize, 47usize);
+payload_add!(40usize, 8usize, 48usize);
+payload_add!(40usize, 9usize, 49usize);
+payload_add!(40usize, 10usize, 50usize);
+payload_add!(40usize, 11usize, 51usize);
+payload_add!(40usize, 12usize, 52usize);
+payload_add!(40usize, 13usize, 53usize);
+payload_add!(40usize, 14usize, 54usize);
+payload_add!(40usize, 15usize, 55usize);
+payload_add!(40usize, 16usize, 56usize);
+payload_add!(40usize, 17usize, 57usize);
+payload_add!(40usize, 18usize, 58usize);
+payload_add!(40usize, 19usize, 59usize);
+payload_add!(40usize, 20usize, 60usize);
+payload_add!(40usize, 21usize, 61usize);
+payload_add!(40usize, 22usize, 62usize);
+payload_add!(40usize, 23usize, 63usize);
+payload_add!(40usize, 24usize, 64usize);
+payload_add!(40usize, 25usize, 65usize);
+payload_add!(40usize, 26usize, 66usize);
+payload_add!(40usize, 27usize, 67usize);
+payload_add!(40usize, 28usize, 68usize);
+payload_add!(40usize, 29usize, 69usize);
+payload_add!(40usize, 30usize, 70usize);
+payload_add!(40usize, 31usize, 71usize);
+payload_add!(40usize, 32usize, 72usize);
+payload_add!(40usize, 33usize, 73usize);
+payload_add!(40usize, 34usize, 74usize);
+payload_add!(40usize, 35usize, 75usize);
+payload_add!(40usize, 36usize, 76usize);
+payload_add!(40usize, 37usize, 77usize);
+payload_add!(40usize, 38usize, 78usize);
+payload_add!(40usize, 39usize, 79usize);
+payload_add!(40usize, 40usize, 80usize);
+payload_add!(40usize, 41usize, 81usize);
+payload_add!(40usize, 42usize, 82usize);
+payload_add!(40usize, 43usize, 83usize);
+payload_add!(40usize, 44usize, 84usize);
+payload_add!(40usize, 45usize, 85usize);
+payload_add!(40usize, 46usize, 86usize);
+payload_add!(40usize, 47usize, 87usize);
+payload_add!(40usize, 48usize, 88usize);
+payload_add!(41usize, 1usize, 42usize);
+payload_add!(41usize, 2usize, 43usize);
+payload_add!(41usize, 3usize, 44usize);
+payload_add!(41usize, 4usize, 45usize);
+payload_add!(41usize, 5usize, 46usize);
+payload_add!(41usize, 6usize, 47usize);
+payload_add!(41usize, 7usize, 48usize);
+payload_add!(41usize, 8usize, 49usize);
+payload_add!(41usize, 9usize, 50usize);
+payload_add!(41usize, 10usize, 51usize);
+payload_add!(41usize, 11usize, 52usize);
+payload_add!(41usize, 12usize, 53usize);
+payload_add!(41usize, 13usize, 54usize);
+payload_add!(41usize, 14usize, 55usize);
+payload_add!(41usize, 15usize, 56usize);
+payload_add!(41usize, 16usize, 57usize);
+payload_add!(41usize, 17usize, 58usize);
+payload_add!(41usize, 18usize, 59usize);
+payload_add!(41usize, 19usize, 60usize);
+payload_add!(41usize, 20usize, 61usize);
+payload_add!(41usize, 21usize, 62usize);
+payload_add!(41usize, 22usize, 63usize);
+payload_add!(41usize, 23usize, 64usize);
+payload_add!(41usize, 24usize, 65usize);
+payload_add!(41usize, 25usize, 66usize);
+payload_add!(41usize, 26usize, 67usize);
+payload_add!(41usize, 27usize, 68usize);
+payload_add!(41usize, 28usize, 69usize);
+payload_add!(41usize, 29usize, 70usize);
+payload_add!(41usize, 30usize, 71usize);
+payload_add!(41usize, 31usize, 72usize);
+payload_add!(41usize, 32usize, 73usize);
+payload_add!(41usize, 33usize, 74usize);
+payload_add!(41usize, 34usize, 75usize);
+payload_add!(41usize, 35usize, 76usize);
+payload_add!(41usize, 36usize, 77usize);
+payload_add!(41usize, 37usize, 78usize);
+payload_add!(41usize, 38usize, 79usize);
+payload_add!(41usize, 39usize, 80usize);
+payload_add!(41usize, 40usize, 81usize);
+payload_add!(41usize, 41usize, 82usize);
+payload_add!(41usize, 42usize, 83usize);
+payload_add!(41usize, 43usize, 84usize);
+payload_add!(41usize, 44usize, 85usize);
+payload_add!(41usize, 45usize, 86usize);
+payload_add!(41usize, 46usize, 87usize);
+payload_add!(41usize, 47usize, 88usize);
+payload_add!(41usize, 48usize, 89usize);
+payload_add!(42usize, 1usize, 43usize);
+payload_add!(42usize, 2usize, 44usize);
+payload_add!(42usize, 3usize, 45usize);
+payload_add!(42usize, 4usize, 46usize);
+payload_add!(42usize, 5usize, 47usize);
+payload_add!(42usize, 6usize, 48usize);
+payload_add!(42usize, 7usize, 49usize);
+payload_add!(42usize, 8usize, 50usize);
+payload_add!(42usize, 9usize, 51usize);
+payload_add!(42usize, 10usize, 52usize);
+payload_add!(42usize, 11usize, 53usize);
+payload_add!(42usize, 12usize, 54usize);
+payload_add!(42usize, 13usize, 55usize);
+payload_add!(42usize, 14usize, 56usize);
+payload_add!(42usize, 15usize, 57usize);
+payload_add!(42usize, 16usize, 58usize);
+payload_add!(42usize, 17usize, 59usize);
+payload_add!(42usize, 18usize, 60usize);
+payload_add!(42usize, 19usize, 61usize);
+payload_add!(42usize, 20usize, 62usize);
+payload_add!(42usize, 21usize, 63usize);
+payload_add!(42usize, 22usize, 64usize);
+payload_add!(42usize, 23usize, 65usize);
+payload_add!(42usize, 24usize, 66usize);
+payload_add!(42usize, 25usize, 67usize);
+payload_add!(42usize, 26usize, 68usize);
+payload_add!(42usize, 27usize, 69usize);
+payload_add!(42usize, 28usize, 70usize);
+payload_add!(42usize, 29usize, 71usize);
+payload_add!(42usize, 30usize, 72usize);
+payload_add!(42usize, 31usize, 73usize);
+payload_add!(42usize, 32usize, 74usize);
+payload_add!(42usize, 33usize, 75usize);
+payload_add!(42usize, 34usize, 76usize);
+payload_add!(42usize, 35usize, 77usize);
+payload_add!(42usize, 36usize, 78usize);
+payload_add!(42usize, 37usize, 79usize);
+payload_add!(42usize, 38usize, 80usize);
+payload_add!(42usize, 39usize, 81usize);
+payload_add!(42usize, 40usize, 82usize);
+payload_add!(42usize, 41usize, 83usize);
+payload_add!(42usize, 42usize, 84usize);
+payload_add!(42usize, 43usize, 85usize);
+payload_add!(42usize, 44usize, 86usize);
+payload_add!(42usize, 45usize, 87usize);
+payload_add!(42usize, 46usize, 88usize);
+payload_add!(42usize, 47usize, 89usize);
+payload_add!(42usize, 48usize, 90usize);
+payload_add!(43usize, 1usize, 44usize);
+payload_add!(43usize, 2usize, 45usize);
+payload_add!(43usize, 3usize, 46usize);
+payload_add!(43usize, 4usize, 47usize);
+payload_add!(43usize, 5usize, 48usize);
+payload_add!(43usize, 6usize, 49usize);
+payload_add!(43usize, 7usize, 50usize);
+payload_add!(43usize, 8usize, 51usize);
+payload_add!(43usize, 9usize, 52usize);
+payload_add!(43usize, 10usize, 53usize);
+payload_add!(43usize, 11usize, 54usize);
+payload_add!(43usize, 12usize, 55usize);
+payload_add!(43usize, 13usize, 56usize);
+payload_add!(43usize, 14usize, 57usize);
+payload_add!(43usize, 15usize, 58usize);
+payload_add!(43usize, 16usize, 59usize);
+payload_add!(43usize, 17usize, 60usize);
+payload_add!(43usize, 18usize, 61usize);
+payload_add!(43usize, 19usize, 62usize);
+payload_add!(43usize, 20usize, 63usize);
+payload_add!(43usize, 21usize, 64usize);
+payload_add!(43usize, 22usize, 65usize);
+payload_add!(43usize, 23usize, 66usize);
+payload_add!(43usize, 24usize, 67usize);
+payload_add!(43usize, 25usize, 68usize);
+payload_add!(43usize, 26usize, 69usize);
+payload_add!(43usize, 27usize, 70usize);
+payload_add!(43usize, 28usize, 71usize);
+payload_add!(43usize, 29usize, 72usize);
+payload_add!(43usize, 30usize, 73usize);
+payload_add!(43usize, 31usize, 74usize);
+payload_add!(43usize, 32usize, 75usize);
+payload_add!(43usize, 33usize, 76usize);
+payload_add!(43usize, 34usize, 77usize);
+payload_add!(43usize, 35usize, 78usize);
+payload_add!(43usize, 36usize, 79usize);
+payload_add!(43usize, 37usize, 80usize);
+payload_add!(43usize, 38usize, 81usize);
+payload_add!(43usize, 39usize, 82usize);
+payload_add!(43usize, 40usize, 83usize);
+payload_add!(43usize, 41usize, 84usize);
+payload_add!(43usize, 42usize, 85usize);
+payload_add!(43usize, 43usize, 86usize);
+payload_add!(43usize, 44usize, 87usize);
+payload_add!(43usize, 45usize, 88usize);
+payload_add!(43usize, 46usize, 89usize);
+payload_add!(43usize, 47usize, 90usize);
+payload_add!(43usize, 48usize, 91usize);
+payload_add!(44usize, 1usize, 45usize);
+payload_add!(44usize, 2usize, 46usize);
+payload_add!(44usize, 3usize, 47usize);
+payload_add!(44usize, 4usize, 48usize);
+payload_add!(44usize, 5usize, 49usize);
+payload_add!(44usize, 6usize, 50usize);
+payload_add!(44usize, 7usize, 51usize);
+payload_add!(44usize, 8usize, 52usize);
+payload_add!(44usize, 9usize, 53usize);
+payload_add!(44usize, 10usize, 54usize);
+payload_add!(44usize, 11usize, 55usize);
+payload_add!(44usize, 12usize, 56usize);
+payload_add!(44usize, 13usize, 57usize);
+payload_add!(44usize, 14usize, 58usize);
+payload_add!(44usize, 15usize, 59usize);
+payload_add!(44usize, 16usize, 60usize);
+payload_add!(44usize, 17usize, 61usize);
+payload_add!(44usize, 18usize, 62usize);
+payload_add!(44usize, 19usize, 63usize);
+payload_add!(44usize, 20usize, 64usize);
+payload_add!(44usize, 21usize, 65usize);
+payload_add!(44usize, 22usize, 66usize);
+payload_add!(44usize, 23usize, 67usize);
+payload_add!(44usize, 24usize, 68usize);
+payload_add!(44usize, 25usize, 69usize);
+payload_add!(44usize, 26usize, 70usize);
+payload_add!(44usize, 27usize, 71usize);
+payload_add!(44usize, 28usize, 72usize);
+payload_add!(44usize, 29usize, 73usize);
+payload_add!(44usize, 30usize, 74usize);
+payload_add!(44usize, 31usize, 75usize);
+payload_add!(44usize, 32usize, 76usize);
+payload_add!(44usize, 33usize, 77usize);
+payload_add!(44usize, 34usize, 78usize);
+payload_add!(44usize, 35usize, 79usize);
+payload_add!(44usize, 36usize, 80usize);
+payload_add!(44usize, 37usize, 81usize);
+payload_add!(44usize, 38usize, 82usize);
+payload_add!(44usize, 39usize, 83usize);
+payload_add!(44usize, 40usize, 84usize);
+payload_add!(44usize, 41usize, 85usize);
+payload_add!(44usize, 42usize, 86usize);
+payload_add!(44usize, 43usize, 87usize);
+payload_add!(44usize, 44usize, 88usize);
+payload_add!(44usize, 45usize, 89usize);
+payload_add!(44usize, 46usize, 90usize);
+payload_add!(44usize, 47usize, 91usize);
+payload_add!(44usize, 48usize, 92usize);
+payload_add!(45usize, 1usize, 46usize);
+payload_add!(45usize, 2usize, 47usize);
+payload_add!(45usize, 3usize, 48usize);
+payload_add!(45usize, 4usize, 49usize);
+payload_add!(45usize, 5usize, 50usize);
+payload_add!(45usize, 6usize, 51usize);
+payload_add!(45usize, 7usize, 52usize);
+payload_add!(45usize, 8usize, 53usize);
+payload_add!(45usize, 9usize, 54usize);
+payload_add!(45usize, 10usize, 55usize);
+payload_add!(45usize, 11usize, 56usize);
+payload_add!(45usize, 12usize, 57usize);
+payload_add!(45usize, 13usize, 58usize);
+payload_add!(45usize, 14usize, 59usize);
+payload_add!(45usize, 15usize, 60usize);
+payload_add!(45usize, 16usize, 61usize);
+payload_add!(45usize, 17usize, 62usize);
+payload_add!(45usize, 18usize, 63usize);
+payload_add!(45usize, 19usize, 64usize);
+payload_add!(45usize, 20usize, 65usize);
+payload_add!(45usize, 21usize, 66usize);
+payload_add!(45usize, 22usize, 67usize);
+payload_add!(45usize, 23usize, 68usize);
+payload_add!(45usize, 24usize, 69usize);
+payload_add!(45usize, 25usize, 70usize);
+payload_add!(45usize, 26usize, 71usize);
+payload_add!(45usize, 27usize, 72usize);
+payload_add!(45usize, 28usize, 73usize);
+payload_add!(45usize, 29usize, 74usize);
+payload_add!(45usize, 30usize, 75usize);
+payload_add!(45usize, 31usize, 76usize);
+payload_add!(45usize, 32usize, 77usize);
+payload_add!(45usize, 33usize, 78usize);
+payload_add!(45usize, 34usize, 79usize);
+payload_add!(45usize, 35usize, 80usize);
+payload_add!(45usize, 36usize, 81usize);
+payload_add!(45usize, 37usize, 82usize);
+payload_add!(45usize, 38usize, 83usize);
+payload_add!(45usize, 39usize, 84usize);
+payload_add!(45usize, 40usize, 85usize);
+payload_add!(45usize, 41usize, 86usize);
+payload_add!(45usize, 42usize, 87usize);
+payload_add!(45usize, 43usize, 88usize);
+payload_add!(45usize, 44usize, 89usize);
+payload_add!(45usize, 45usize, 90usize);
+payload_add!(45usize, 46usize, 91usize);
+payload_add!(45usize, 47usize, 92usize);
+payload_add!(45usize, 48usize, 93usize);
+payload_add!(46usize, 1usize, 47usize);
+payload_add!(46usize, 2usize, 48usize);
+payload_add!(46usize, 3usize, 49usize);
+payload_add!(46usize, 4usize, 50usize);
+payload_add!(46usize, 5usize, 51usize);
+payload_add!(46usize, 6usize, 52usize);
+payload_add!(46usize, 7usize, 53usize);
+payload_add!(46usize, 8usize, 54usize);
+payload_add!(46usize, 9usize, 55usize);
+payload_add!(46usize, 10usize, 56usize);
+payload_add!(46usize, 11usize, 57usize);
+payload_add!(46usize, 12usize, 58usize);
+payload_add!(46usize, 13usize, 59usize);
+payload_add!(46usize, 14usize, 60usize);
+payload_add!(46usize, 15usize, 61usize);
+payload_add!(46usize, 16usize, 62usize);
+payload_add!(46usize, 17usize, 63usize);
+payload_add!(46usize, 18usize, 64usize);
+payload_add!(46usize, 19usize, 65usize);
+payload_add!(46usize, 20usize, 66usize);
+payload_add!(46usize, 21usize, 67usize);
+payload_add!(46usize, 22usize, 68usize);
+payload_add!(46usize, 23usize, 69usize);
+payload_add!(46usize, 24usize, 70usize);
+payload_add!(46usize, 25usize, 71usize);
+payload_add!(46usize, 26usize, 72usize);
+payload_add!(46usize, 27usize, 73usize);
+payload_add!(46usize, 28usize, 74usize);
+payload_add!(46usize, 29usize, 75usize);
+payload_add!(46usize, 30usize, 76usize);
+payload_add!(46usize, 31usize, 77usize);
+payload_add!(46usize, 32usize, 78usize);
+payload_add!(46usize, 33usize, 79usize);
+payload_add!(46usize, 34usize, 80usize);
+payload_add!(46usize, 35usize, 81usize);
+payload_add!(46usize, 36usize, 82usize);
+payload_add!(46usize, 37usize, 83usize);
+payload_add!(46usize, 38usize, 84usize);
+payload_add!(46usize, 39usize, 85usize);
+payload_add!(46usize, 40usize, 86usize);
+payload_add!(46usize, 41usize, 87usize);
+payload_add!(46usize, 42usize, 88usize);
+payload_add!(46usize, 43usize, 89usize);
+payload_add!(46usize, 44usize, 90usize);
+payload_add!(46usize, 45usize, 91usize);
+payload_add!(46usize, 46usize, 92usize);
+payload_add!(46usize, 47usize, 93usize);
+payload_add!(46usize, 48usize, 94usize);
+payload_add!(47usize, 1usize, 48usize);
+payload_add!(47usize, 2usize, 49usize);
+payload_add!(47usize, 3usize, 50usize);
+payload_add!(47usize, 4usize, 51usize);
+payload_add!(47usize, 5usize, 52usize);
+payload_add!(47usize, 6usize, 53usize);
+payload_add!(47usize, 7usize, 54usize);
+payload_add!(47usize, 8usize, 55usize);
+payload_add!(47usize, 9usize, 56usize);
+payload_add!(47usize, 10usize, 57usize);
+payload_add!(47usize, 11usize, 58usize);
+payload_add!(47usize, 12usize, 59usize);
+payload_add!(47usize, 13usize, 60usize);
+payload_add!(47usize, 14usize, 61usize);
+payload_add!(47usize, 15usize, 62usize);
+payload_add!(47usize, 16usize, 63usize);
+payload_add!(47usize, 17usize, 64usize);
+payload_add!(47usize, 18usize, 65usize);
+payload_add!(47usize, 19usize, 66usize);
+payload_add!(47usize, 20usize, 67usize);
+payload_add!(47usize, 21usize, 68usize);
+payload_add!(47usize, 22usize, 69usize);
+payload_add!(47usize, 23usize, 70usize);
+payload_add!(47usize, 24usize, 71usize);
+payload_add!(47usize, 25usize, 72usize);
+payload_add!(47usize, 26usize, 73usize);
+payload_add!(47usize, 27usize, 74usize);
+payload_add!(47usize, 28usize, 75usize);
+payload_add!(47usize, 29usize, 76usize);
+payload_add!(47usize, 30usize, 77usize);
+payload_add!(47usize, 31usize, 78usize);
+payload_add!(47usize, 32usize, 79usize);
+payload_add!(47usize, 33usize, 80usize);
+payload_add!(47usize, 34usize, 81usize);
+payload_add!(47usize, 35usize, 82usize);
+payload_add!(47usize, 36usize, 83usize);
+payload_add!(47usize, 37usize, 84usize);
+payload_add!(47usize, 38usize, 85usize);
+payload_add!(47usize, 39usize, 86usize);
+payload_add!(47usize, 40usize, 87usize);
+payload_add!(47usize, 41usize, 88usize);
+payload_add!(47usize, 42usize, 89usize);
+payload_add!(47usize, 43usize, 90usize);
+payload_add!(47usize, 44usize, 91usize);
+payload_add!(47usize, 45usize, 92usize);
+payload_add!(47usize, 46usize, 93usize);
+payload_add!(47usize, 47usize, 94usize);
+payload_add!(47usize, 48usize, 95usize);
+payload_add!(48usize, 1usize, 49usize);
+payload_add!(48usize, 2usize, 50usize);
+payload_add!(48usize, 3usize, 51usize);
+payload_add!(48usize, 4usize, 52usize);
+payload_add!(48usize, 5usize, 53usize);
+payload_add!(48usize, 6usize, 54usize);
+payload_add!(48usize, 7usize, 55usize);
+payload_add!(48usize, 8usize, 56usize);
+payload_add!(48usize, 9usize, 57usize);
+payload_add!(48usize, 10usize, 58usize);
+payload_add!(48usize, 11usize, 59usize);
+payload_add!(48usize, 12usize, 60usize);
+payload_add!(48usize, 13usize, 61usize);
+payload_add!(48usize, 14usize, 62usize);
+payload_add!(48usize, 15usize, 63usize);
+payload_add!(48usize, 16usize, 64usize);
+payload_add!(48usize, 17usize, 65usize);
+payload_add!(48usize, 18usize, 66usize);
+payload_add!(48usize, 19usize, 67usize);
+payload_add!(48usize, 20usize, 68usize);
+payload_add!(48usize, 21usize, 69usize);
+payload_add!(48usize, 22usize, 70usize);
+payload_add!(48usize, 23usize, 71usize);
+payload_add!(48usize, 24usize, 72usize);
+payload_add!(48usize, 25usize, 73usize);
+payload_add!(48usize, 26usize, 74usize);
+payload_add!(48usize, 27usize, 75usize);
+payload_add!(48usize, 28usize, 76usize);
+payload_add!(48usize, 29usize, 77usize);
+payload_add!(48usize, 30usize, 78usize);
+payload_add!(48usize, 31usize, 79usize);
+payload_add!(48usize, 32usize, 80usize);
+payload_add!(48usize, 33usize, 81usize);
+payload_add!(48usize, 34usize, 82usize);
+payload_add!(48usize, 35usize, 83usize);
+payload_add!(48usize, 36usize, 84usize);
+payload_add!(48usize, 37usize, 85usize);
+payload_add!(48usize, 38usize, 86usize);
+payload_add!(48usize, 39usize, 87usize);
+payload_add!(48usize, 40usize, 88usize);
+payload_add!(48usize, 41usize, 89usize);
+payload_add!(48usize, 42usize, 90usize);
+payload_add!(48usize, 43usize, 91usize);
+payload_add!(48usize, 44usize, 92usize);
+payload_add!(48usize, 45usize, 93usize);
+payload_add!(48usize, 46usize, 94usize);
+payload_add!(48usize, 47usize, 95usize);
+payload_add!(48usize, 48usize, 96usize);
diff --git a/framework/base/src/types/managed/wrapped/managed_vec_owned_iter.rs b/framework/base/src/types/managed/wrapped/managed_vec_owned_iter.rs
index a40c8c798f..f6a3ac4e44 100644
--- a/framework/base/src/types/managed/wrapped/managed_vec_owned_iter.rs
+++ b/framework/base/src/types/managed/wrapped/managed_vec_owned_iter.rs
@@ -1,4 +1,4 @@
-use crate::api::ManagedTypeApi;
+use crate::{api::ManagedTypeApi, types::ManagedVecItemPayload};
 
 use super::{ManagedVec, ManagedVecItem};
 
@@ -48,7 +48,7 @@ where
 
     fn next(&mut self) -> Option<T> {
         // managedrev<t>  / reference type
-        let next_byte_start = self.byte_start + T::PAYLOAD_SIZE;
+        let next_byte_start = self.byte_start + T::PAYLOAD::payload_size();
         if next_byte_start > self.byte_end {
             return None;
         }
@@ -82,10 +82,10 @@ where
     T: ManagedVecItem,
 {
     fn next_back(&mut self) -> Option<Self::Item> {
-        if self.byte_start + T::PAYLOAD_SIZE > self.byte_end {
+        if self.byte_start + T::PAYLOAD::payload_size() > self.byte_end {
             return None;
         }
-        self.byte_end -= T::PAYLOAD_SIZE;
+        self.byte_end -= T::PAYLOAD::payload_size();
 
         let result = T::from_byte_reader(|dest_slice| {
             let _ = self
diff --git a/framework/base/src/types/managed/wrapped/managed_vec_ref_iter.rs b/framework/base/src/types/managed/wrapped/managed_vec_ref_iter.rs
index 13d837510f..0a2a243ac0 100644
--- a/framework/base/src/types/managed/wrapped/managed_vec_ref_iter.rs
+++ b/framework/base/src/types/managed/wrapped/managed_vec_ref_iter.rs
@@ -1,6 +1,6 @@
 use crate::api::ManagedTypeApi;
 
-use super::{ManagedVec, ManagedVecItem};
+use super::{ManagedVec, ManagedVecItem, ManagedVecItemPayload};
 
 pub struct ManagedVecRefIterator<'a, M, T>
 where
@@ -34,7 +34,7 @@ where
     type Item = T::Ref<'a>;
 
     fn next(&mut self) -> Option<Self::Item> {
-        let next_byte_start = self.byte_start + T::PAYLOAD_SIZE;
+        let next_byte_start = self.byte_start + T::PAYLOAD::payload_size();
         if next_byte_start > self.byte_end {
             return None;
         }
@@ -52,7 +52,7 @@ where
     }
 
     fn size_hint(&self) -> (usize, Option<usize>) {
-        let remaining = (self.byte_end - self.byte_start) / T::PAYLOAD_SIZE;
+        let remaining = (self.byte_end - self.byte_start) / T::PAYLOAD::payload_size();
         (remaining, Some(remaining))
     }
 }
@@ -70,10 +70,10 @@ where
     T: ManagedVecItem,
 {
     fn next_back(&mut self) -> Option<Self::Item> {
-        if self.byte_start + T::PAYLOAD_SIZE > self.byte_end {
+        if self.byte_start + T::PAYLOAD::payload_size() > self.byte_end {
             return None;
         }
-        self.byte_end -= T::PAYLOAD_SIZE;
+        self.byte_end -= T::PAYLOAD::payload_size();
 
         let result = unsafe {
             T::from_byte_reader_as_borrow(|dest_slice| {
diff --git a/framework/base/src/types/managed/wrapped/mod.rs b/framework/base/src/types/managed/wrapped/mod.rs
index fc6485c802..aef9ed6e87 100644
--- a/framework/base/src/types/managed/wrapped/mod.rs
+++ b/framework/base/src/types/managed/wrapped/mod.rs
@@ -11,6 +11,7 @@ mod managed_option;
 mod managed_ref;
 mod managed_vec;
 mod managed_vec_item;
+mod managed_vec_item_nested_tuple;
 mod managed_vec_item_payload;
 mod managed_vec_owned_iter;
 mod managed_vec_ref;
@@ -34,6 +35,7 @@ pub use managed_option::ManagedOption;
 pub use managed_ref::ManagedRef;
 pub use managed_vec::ManagedVec;
 pub use managed_vec_item::ManagedVecItem;
+pub use managed_vec_item_nested_tuple::ManagedVecItemNestedTuple;
 pub use managed_vec_item_payload::*;
 pub use managed_vec_owned_iter::ManagedVecOwnedIterator;
 pub use managed_vec_ref::ManagedVecRef;
diff --git a/framework/derive/src/managed_vec_item_derive.rs b/framework/derive/src/managed_vec_item_derive.rs
index 5ade7c5232..c78f54d455 100644
--- a/framework/derive/src/managed_vec_item_derive.rs
+++ b/framework/derive/src/managed_vec_item_derive.rs
@@ -28,6 +28,22 @@ fn generate_payload_snippets(fields: &syn::Fields) -> Vec<proc_macro2::TokenStre
     }
 }
 
+fn generate_payload_nested_tuple(fields: &syn::Fields) -> proc_macro2::TokenStream {
+    match fields {
+        syn::Fields::Named(fields_named) => {
+            let types: Vec<_> = fields_named.named.iter().map(|field| &field.ty).collect();
+            let mut result = quote! { () };
+            for ty in types.iter().rev() {
+                result = quote! { (#ty, #result) };
+            }
+            result
+        },
+        _ => {
+            panic!("ManagedVecItem only supports named fields")
+        },
+    }
+}
+
 fn generate_skips_reserialization_snippets(fields: &syn::Fields) -> Vec<proc_macro2::TokenStream> {
     match fields {
         syn::Fields::Named(fields_named) => fields_named
@@ -56,8 +72,8 @@ fn generate_from_byte_reader_snippets(fields: &syn::Fields) -> Vec<proc_macro2::
                 let type_name = &field.ty;
                 quote! {
                     #field_ident: multiversx_sc::types::ManagedVecItem::from_byte_reader(|bytes| {
-                        let next_index = index + <#type_name as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
-                        bytes.copy_from_slice(&arr[index .. next_index]);
+                        let next_index = index + <#type_name as multiversx_sc::types::ManagedVecItem>::payload_size();
+                        bytes.copy_from_slice(&payload_slice[index .. next_index]);
                         index = next_index;
                     }),
                 }
@@ -79,8 +95,8 @@ fn generate_to_byte_writer_snippets(fields: &syn::Fields) -> Vec<proc_macro2::To
                 let type_name = &field.ty;
                 quote! {
                     multiversx_sc::types::ManagedVecItem::to_byte_writer(&self.#field_ident, |bytes| {
-                        let next_index = index + <#type_name as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
-                        arr[index .. next_index].copy_from_slice(bytes);
+                        let next_index = index + <#type_name as multiversx_sc::types::ManagedVecItem>::payload_size();
+                        payload_slice[index .. next_index].copy_from_slice(bytes);
                         index = next_index;
                     });
                 }
@@ -92,16 +108,10 @@ fn generate_to_byte_writer_snippets(fields: &syn::Fields) -> Vec<proc_macro2::To
     }
 }
 
-fn generate_array_init_snippet(ast: &syn::DeriveInput) -> proc_macro2::TokenStream {
-    let name = &ast.ident;
-    let self_expr = if ast.generics.params.is_empty() {
-        quote! { #name }
-    } else {
-        quote! { #name <multiversx_sc::api::uncallable::UncallableApi> }
-    };
+fn generate_payload_buffer_snippet() -> proc_macro2::TokenStream {
     quote! {
-        const SELF_PAYLOAD_SIZE: usize = <#self_expr as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE;
-        let mut arr: [u8; SELF_PAYLOAD_SIZE] = [0u8; SELF_PAYLOAD_SIZE];
+        let mut payload = <Self::PAYLOAD as multiversx_sc::types::ManagedVecItemPayload>::new_buffer();
+        let payload_slice = multiversx_sc::types::ManagedVecItemPayload::payload_slice(&mut payload);
     }
 }
 
@@ -162,24 +172,25 @@ fn enum_derive(data_enum: &syn::DataEnum, ast: &syn::DeriveInput) -> TokenStream
 fn struct_derive(data_struct: &syn::DataStruct, ast: &syn::DeriveInput) -> TokenStream {
     let name = &ast.ident;
     let (impl_generics, ty_generics, where_clause) = &ast.generics.split_for_impl();
+    let payload_nested_tuple = generate_payload_nested_tuple(&data_struct.fields);
     let payload_snippets = generate_payload_snippets(&data_struct.fields);
     let skips_reserialization_snippets =
         generate_skips_reserialization_snippets(&data_struct.fields);
     let from_byte_reader_snippets = generate_from_byte_reader_snippets(&data_struct.fields);
     let to_byte_writer_snippets = generate_to_byte_writer_snippets(&data_struct.fields);
 
-    let array_init_snippet = generate_array_init_snippet(ast);
+    let payload_buffer_snippet = generate_payload_buffer_snippet();
 
     let gen = quote! {
         impl #impl_generics multiversx_sc::types::ManagedVecItem for #name #ty_generics #where_clause {
-            type PAYLOAD = multiversx_sc::types::TempPayload;
+            type PAYLOAD = <#payload_nested_tuple as multiversx_sc::types::ManagedVecItemNestedTuple>::PAYLOAD;
             const PAYLOAD_SIZE: usize = #(#payload_snippets)+*;
             const SKIPS_RESERIALIZATION: bool = #(#skips_reserialization_snippets)&&*;
             type Ref<'a> = Self;
 
             fn from_byte_reader<Reader: FnMut(&mut [u8])>(mut reader: Reader) -> Self {
-                #array_init_snippet
-                reader(&mut arr[..]);
+                #payload_buffer_snippet
+                reader(payload_slice);
                 let mut index = 0;
 
                 #name {
@@ -192,12 +203,12 @@ fn struct_derive(data_struct: &syn::DataStruct, ast: &syn::DeriveInput) -> Token
             }
 
             fn to_byte_writer<R, Writer: FnMut(&[u8]) -> R>(&self, mut writer: Writer) -> R {
-                #array_init_snippet
+                #payload_buffer_snippet
                 let mut index = 0;
 
                 #(#to_byte_writer_snippets)*
 
-                writer(&arr[..])
+                writer(&payload_slice[..])
             }
         }
     };
diff --git a/framework/scenario/tests/derive_managed_vec_item_biguint_test.rs b/framework/scenario/tests/derive_managed_vec_item_biguint_test.rs
index 66bafe5278..cdf518016c 100644
--- a/framework/scenario/tests/derive_managed_vec_item_biguint_test.rs
+++ b/framework/scenario/tests/derive_managed_vec_item_biguint_test.rs
@@ -3,7 +3,7 @@ use multiversx_sc::{
     codec,
     codec::derive::{NestedDecode, NestedEncode, TopDecode, TopEncode},
     derive::ManagedVecItem,
-    types::{BigUint, ManagedType},
+    types::{BigUint, ManagedType, ManagedVecItemPayload},
 };
 use multiversx_sc_scenario::api::StaticApi;
 
@@ -22,7 +22,8 @@ pub struct ManagedStructWithBigUint<M: ManagedTypeApi> {
 #[allow(clippy::assertions_on_constants)]
 fn struct_with_numbers_static() {
     assert_eq!(
-        <ManagedStructWithBigUint<StaticApi> as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE,
+        <ManagedStructWithBigUint<StaticApi> as multiversx_sc::types::ManagedVecItem>::payload_size(
+        ),
         8
     );
     assert!(
@@ -37,8 +38,9 @@ fn managed_struct_to_bytes_writer() {
         big_uint: BigUint::from(fortytwo),
         num: 0x12345,
     };
-    let mut arr: [u8; 8] = [0u8;
-        <ManagedStructWithBigUint<StaticApi> as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE];
+    
+    let mut payload = <ManagedStructWithBigUint<StaticApi> as multiversx_sc::types::ManagedVecItem>::PAYLOAD::new_buffer();
+    let payload_slice = payload.payload_slice();
 
     let handle_bytes = s.big_uint.get_handle().to_be_bytes();
     let expected = [0xff, 0xff, 0xff, handle_bytes[3], 0x00, 0x01, 0x23, 0x45];
@@ -46,9 +48,9 @@ fn managed_struct_to_bytes_writer() {
     <ManagedStructWithBigUint<StaticApi> as multiversx_sc::types::ManagedVecItem>::to_byte_writer(
         &s,
         |bytes| {
-            arr[0..<ManagedStructWithBigUint::<StaticApi> as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE].copy_from_slice(bytes);
+            payload_slice.copy_from_slice(bytes);
 
-            assert_eq!(arr, expected);
+            assert_eq!(payload_slice, expected);
         },
     );
 }
@@ -68,7 +70,7 @@ fn managed_struct_from_bytes_reader() {
                 bytes.copy_from_slice(
                     &arr
                         [0
-                            ..<ManagedStructWithBigUint::<StaticApi> as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE],
+                            ..<ManagedStructWithBigUint::<StaticApi> as multiversx_sc::types::ManagedVecItem>::payload_size()],
                 );
             },
         );
diff --git a/framework/scenario/tests/derive_managed_vec_item_esdt_token_payment_test.rs b/framework/scenario/tests/derive_managed_vec_item_esdt_token_payment_test.rs
index 1e0889c27c..b9ec6a3173 100644
--- a/framework/scenario/tests/derive_managed_vec_item_esdt_token_payment_test.rs
+++ b/framework/scenario/tests/derive_managed_vec_item_esdt_token_payment_test.rs
@@ -3,7 +3,10 @@ use multiversx_sc::{
     codec,
     codec::derive::{NestedDecode, NestedEncode, TopDecode, TopEncode},
     derive::ManagedVecItem,
-    types::{BigUint, EsdtTokenPayment, ManagedByteArray, ManagedType, TokenIdentifier},
+    types::{
+        BigUint, EsdtTokenPayment, ManagedByteArray, ManagedType, ManagedVecItemPayload,
+        TokenIdentifier,
+    },
 };
 use multiversx_sc_scenario::api::StaticApi;
 
@@ -26,7 +29,7 @@ pub struct ManagedStructWithToken<M: ManagedTypeApi> {
 #[allow(clippy::assertions_on_constants)]
 fn struct_with_numbers_static() {
     assert_eq!(
-        <ManagedStructWithToken<StaticApi> as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE,
+        <ManagedStructWithToken<StaticApi> as multiversx_sc::types::ManagedVecItem>::payload_size(),
         28
     );
     assert!(
@@ -46,8 +49,9 @@ fn struct_to_bytes_writer() {
         eth_address_1: ManagedByteArray::new_from_bytes(&[1u8; 20]),
         eth_address_2: ManagedByteArray::new_from_bytes(&[2u8; 20]),
     };
-    let mut arr: [u8; 28] = [0u8;
-        <ManagedStructWithToken<StaticApi> as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE];
+
+    let mut payload = <ManagedStructWithToken<StaticApi> as multiversx_sc::types::ManagedVecItem>::PAYLOAD::new_buffer();
+    let payload_slice = payload.payload_slice();
 
     let handle1 = s.token.token_identifier.get_handle().to_be_bytes();
     let handle2 = s.token.amount.get_handle().to_be_bytes();
@@ -62,11 +66,9 @@ fn struct_to_bytes_writer() {
     <ManagedStructWithToken<StaticApi> as multiversx_sc::types::ManagedVecItem>::to_byte_writer(
         &s,
         |bytes| {
-            arr[0
-                ..<ManagedStructWithToken<StaticApi> as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE]
-                .copy_from_slice(bytes);
+            payload_slice.copy_from_slice(bytes);
 
-            assert_eq!(arr, expected);
+            assert_eq!(payload_slice, expected);
         },
     );
 }
@@ -96,7 +98,7 @@ fn struct_from_bytes_reader() {
                 bytes.copy_from_slice(
                     &arr
                         [0
-                            ..<ManagedStructWithToken::<StaticApi> as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE],
+                            ..<ManagedStructWithToken::<StaticApi> as multiversx_sc::types::ManagedVecItem>::payload_size()],
                 );
             },
         );
diff --git a/framework/scenario/tests/derive_managed_vec_item_simple_enum.rs b/framework/scenario/tests/derive_managed_vec_item_simple_enum.rs
index 23e7caca77..1c139f5b84 100644
--- a/framework/scenario/tests/derive_managed_vec_item_simple_enum.rs
+++ b/framework/scenario/tests/derive_managed_vec_item_simple_enum.rs
@@ -19,7 +19,7 @@ enum SimpleEnum {
 #[allow(clippy::assertions_on_constants)]
 fn enum_static() {
     assert_eq!(
-        <SimpleEnum as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE,
+        <SimpleEnum as multiversx_sc::types::ManagedVecItem>::payload_size(),
         1
     );
     assert!(<SimpleEnum as multiversx_sc::types::ManagedVecItem>::SKIPS_RESERIALIZATION);
diff --git a/framework/scenario/tests/derive_managed_vec_item_struct_1_test.rs b/framework/scenario/tests/derive_managed_vec_item_struct_1_test.rs
index 1673008017..a1b2b056ef 100644
--- a/framework/scenario/tests/derive_managed_vec_item_struct_1_test.rs
+++ b/framework/scenario/tests/derive_managed_vec_item_struct_1_test.rs
@@ -1,4 +1,5 @@
 use multiversx_sc::codec::test_util::{check_dep_encode_decode, check_top_encode_decode};
+use multiversx_sc::types::ManagedVecItemPayload;
 
 multiversx_sc::derive_imports!();
 
@@ -20,7 +21,7 @@ pub struct Struct1 {
 #[allow(clippy::assertions_on_constants)]
 fn struct_1_static() {
     assert_eq!(
-        <Struct1 as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE,
+        <Struct1 as multiversx_sc::types::ManagedVecItem>::payload_size(),
         16
     );
     assert!(<Struct1 as multiversx_sc::types::ManagedVecItem>::SKIPS_RESERIALIZATION);
@@ -60,13 +61,14 @@ fn struct_1_to_bytes_writer() {
         u_64: 4u64,
         bool_field: true,
     };
-    let mut arr: [u8; 16] = [0u8; <Struct1 as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE];
+    
+    let mut payload = <Struct1 as multiversx_sc::types::ManagedVecItem>::PAYLOAD::new_buffer();
+    let payload_slice = payload.payload_slice();
 
     <Struct1 as multiversx_sc::types::ManagedVecItem>::to_byte_writer(&s, |bytes| {
-        arr[0..<Struct1 as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE]
-            .copy_from_slice(bytes);
+        payload_slice.copy_from_slice(bytes);
         assert_eq!(
-            arr,
+            payload_slice,
             [
                 0x01, 0x00, 0x02, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                 0x04, 0x01,
@@ -92,7 +94,7 @@ fn struct_1_from_bytes_reader() {
     let struct_from_bytes =
         <Struct1 as multiversx_sc::types::ManagedVecItem>::from_byte_reader(|bytes| {
             bytes.copy_from_slice(
-                &arr[0..<Struct1 as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE],
+                &arr[0..<Struct1 as multiversx_sc::types::ManagedVecItem>::payload_size()],
             );
         });
     assert_eq!(s, struct_from_bytes);
diff --git a/framework/scenario/tests/derive_managed_vec_item_struct_2_test.rs b/framework/scenario/tests/derive_managed_vec_item_struct_2_test.rs
index 672476af1f..87fee5ed62 100644
--- a/framework/scenario/tests/derive_managed_vec_item_struct_2_test.rs
+++ b/framework/scenario/tests/derive_managed_vec_item_struct_2_test.rs
@@ -20,7 +20,7 @@ pub struct Struct2 {
 #[allow(clippy::assertions_on_constants)]
 fn struct_2_static() {
     assert_eq!(
-        <Struct2 as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE,
+        <Struct2 as multiversx_sc::types::ManagedVecItem>::payload_size(),
         22
     );
     assert!(!<Struct2 as multiversx_sc::types::ManagedVecItem>::SKIPS_RESERIALIZATION);
diff --git a/vm/src/tx_mock/tx_managed_types/handle_map.rs b/vm/src/tx_mock/tx_managed_types/handle_map.rs
index 62f9c04659..4473e9104b 100644
--- a/vm/src/tx_mock/tx_managed_types/handle_map.rs
+++ b/vm/src/tx_mock/tx_managed_types/handle_map.rs
@@ -34,14 +34,14 @@ impl<V> HandleMap<V> {
         // TODO: consider simulating the actual error from the VM
         self.map
             .get(&handle)
-            .unwrap_or_else(|| panic!("handle not found"))
+            .unwrap_or_else(|| panic!("handle not found: {handle}"))
     }
 
     pub fn get_mut(&mut self, handle: RawHandle) -> &mut V {
         // TODO: consider simulating the actual error from the VM
         self.map
             .get_mut(&handle)
-            .unwrap_or_else(|| panic!("handle not found"))
+            .unwrap_or_else(|| panic!("handle not found: {handle}"))
     }
 
     pub fn insert(&mut self, handle: RawHandle, value: V) {

From 0d950c277b88d5b4bfea8b1fc39d507fddbb51d7 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 8 May 2024 20:00:31 +0300
Subject: [PATCH 0847/1254] mn vec item refactor: removed PAYLOAD_SIZE

---
 .../base/src/types/flags/esdt_local_role.rs   |  1 -
 .../esdt_token_payment_multi_value.rs         |  1 -
 .../wrapped/encoded_managed_vec_item.rs       | 18 +++-------
 .../managed/wrapped/esdt_token_payment.rs     |  5 ++-
 .../types/managed/wrapped/managed_option.rs   |  1 -
 .../src/types/managed/wrapped/managed_vec.rs  | 35 +++++++------------
 .../types/managed/wrapped/managed_vec_item.rs | 16 ++-------
 .../wrapped/managed_vec_item_payload.rs       | 16 +++++++--
 .../managed/wrapped/managed_vec_owned_iter.rs | 11 +++---
 .../managed/wrapped/managed_vec_ref_iter.rs   | 10 +++---
 .../derive/src/managed_vec_item_derive.rs     | 24 +------------
 .../src/api/impl_vh/debug_handle_vh.rs        |  2 --
 .../derive_managed_vec_item_biguint_test.rs   |  4 +--
 ...anaged_vec_item_esdt_token_payment_test.rs |  2 +-
 .../derive_managed_vec_item_struct_1_test.rs  | 10 +++---
 15 files changed, 55 insertions(+), 101 deletions(-)

diff --git a/framework/base/src/types/flags/esdt_local_role.rs b/framework/base/src/types/flags/esdt_local_role.rs
index 196d1c3f8a..b66ac612f5 100644
--- a/framework/base/src/types/flags/esdt_local_role.rs
+++ b/framework/base/src/types/flags/esdt_local_role.rs
@@ -140,7 +140,6 @@ impl<'a> From<&'a [u8]> for EsdtLocalRole {
 
 impl ManagedVecItem for EsdtLocalRole {
     type PAYLOAD = ManagedVecItemPayloadBuffer<1>;
-    const PAYLOAD_SIZE: usize = 1;
     const SKIPS_RESERIALIZATION: bool = false; // TODO: might be ok to be true, but needs testing
     type Ref<'a> = Self;
 
diff --git a/framework/base/src/types/managed/multi_value/esdt_token_payment_multi_value.rs b/framework/base/src/types/managed/multi_value/esdt_token_payment_multi_value.rs
index ff4d0f70e7..7e7cd934a3 100644
--- a/framework/base/src/types/managed/multi_value/esdt_token_payment_multi_value.rs
+++ b/framework/base/src/types/managed/multi_value/esdt_token_payment_multi_value.rs
@@ -41,7 +41,6 @@ impl<M: ManagedTypeApi> EsdtTokenPaymentMultiValue<M> {
 
 impl<M: ManagedTypeApi> ManagedVecItem for EsdtTokenPaymentMultiValue<M> {
     type PAYLOAD = <EsdtTokenPayment<M> as ManagedVecItem>::PAYLOAD;
-    const PAYLOAD_SIZE: usize = EsdtTokenPayment::<M>::PAYLOAD_SIZE;
     const SKIPS_RESERIALIZATION: bool = EsdtTokenPayment::<M>::SKIPS_RESERIALIZATION;
     type Ref<'a> = Self;
 
diff --git a/framework/base/src/types/managed/wrapped/encoded_managed_vec_item.rs b/framework/base/src/types/managed/wrapped/encoded_managed_vec_item.rs
index 12a0e3defc..fd7af7c51f 100644
--- a/framework/base/src/types/managed/wrapped/encoded_managed_vec_item.rs
+++ b/framework/base/src/types/managed/wrapped/encoded_managed_vec_item.rs
@@ -1,23 +1,21 @@
-use super::ManagedVecItem;
+use super::{ManagedVecItem, ManagedVecItemPayload};
 use core::{cmp::Ordering, marker::PhantomData};
 
 pub struct EncodedManagedVecItem<T: ManagedVecItem>
 where
     T: ManagedVecItem,
-    [(); <T as ManagedVecItem>::PAYLOAD_SIZE]:,
 {
-    pub encoded: [u8; <T as ManagedVecItem>::PAYLOAD_SIZE],
+    pub encoded: T::PAYLOAD,
     _phantom: PhantomData<T>,
 }
 
 impl<T> EncodedManagedVecItem<T>
 where
     T: ManagedVecItem,
-    [(); <T as ManagedVecItem>::PAYLOAD_SIZE]:,
 {
     pub(crate) fn decode(&self) -> T {
         T::from_byte_reader(|item_bytes| {
-            item_bytes.copy_from_slice(&self.encoded);
+            item_bytes.copy_from_slice(self.encoded.payload_slice());
         })
     }
 }
@@ -25,7 +23,6 @@ where
 impl<T> PartialEq for EncodedManagedVecItem<T>
 where
     T: PartialEq + ManagedVecItem,
-    [(); <T as ManagedVecItem>::PAYLOAD_SIZE]:,
 {
     #[inline]
     fn eq(&self, other: &Self) -> bool {
@@ -33,17 +30,11 @@ where
     }
 }
 
-impl<T> Eq for EncodedManagedVecItem<T>
-where
-    T: Eq + ManagedVecItem,
-    [(); <T as ManagedVecItem>::PAYLOAD_SIZE]:,
-{
-}
+impl<T> Eq for EncodedManagedVecItem<T> where T: Eq + ManagedVecItem {}
 
 impl<T> PartialOrd for EncodedManagedVecItem<T>
 where
     T: PartialOrd + ManagedVecItem,
-    [(); <T as ManagedVecItem>::PAYLOAD_SIZE]:,
 {
     #[inline]
     fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
@@ -54,7 +45,6 @@ where
 impl<T> Ord for EncodedManagedVecItem<T>
 where
     T: Ord + ManagedVecItem,
-    [(); <T as ManagedVecItem>::PAYLOAD_SIZE]:,
 {
     fn cmp(&self, other: &Self) -> Ordering {
         self.decode().cmp(&other.decode())
diff --git a/framework/base/src/types/managed/wrapped/esdt_token_payment.rs b/framework/base/src/types/managed/wrapped/esdt_token_payment.rs
index 4d22d0ebe6..32862726ed 100644
--- a/framework/base/src/types/managed/wrapped/esdt_token_payment.rs
+++ b/framework/base/src/types/managed/wrapped/esdt_token_payment.rs
@@ -158,7 +158,7 @@ where
     T: ManagedVecItem,
 {
     ManagedVecItem::from_byte_reader(|bytes| {
-        let size = T::PAYLOAD_SIZE;
+        let size = T::payload_size();
         bytes.copy_from_slice(&arr[*index..*index + size]);
         *index += size;
     })
@@ -169,7 +169,7 @@ where
     T: ManagedVecItem,
 {
     ManagedVecItem::to_byte_writer(item, |bytes| {
-        let size = T::PAYLOAD_SIZE;
+        let size = T::payload_size();
         arr[*index..*index + size].copy_from_slice(bytes);
         *index += size;
     });
@@ -186,7 +186,6 @@ impl<M: ManagedTypeApi> IntoMultiValue for EsdtTokenPayment<M> {
 
 impl<M: ManagedTypeApi> ManagedVecItem for EsdtTokenPayment<M> {
     type PAYLOAD = ManagedVecItemPayloadBuffer<16>;
-    const PAYLOAD_SIZE: usize = 16;
     const SKIPS_RESERIALIZATION: bool = false;
     type Ref<'a> = Self;
 
diff --git a/framework/base/src/types/managed/wrapped/managed_option.rs b/framework/base/src/types/managed/wrapped/managed_option.rs
index f29158f9fa..ddedbbdb8d 100644
--- a/framework/base/src/types/managed/wrapped/managed_option.rs
+++ b/framework/base/src/types/managed/wrapped/managed_option.rs
@@ -196,7 +196,6 @@ where
     T: ManagedType<M> + 'static,
 {
     type PAYLOAD = ManagedVecItemPayloadBuffer<4>;
-    const PAYLOAD_SIZE: usize = 4;
     const SKIPS_RESERIALIZATION: bool = false;
     type Ref<'a> = Self;
 
diff --git a/framework/base/src/types/managed/wrapped/managed_vec.rs b/framework/base/src/types/managed/wrapped/managed_vec.rs
index 8ba9b1d355..e37dd872d5 100644
--- a/framework/base/src/types/managed/wrapped/managed_vec.rs
+++ b/framework/base/src/types/managed/wrapped/managed_vec.rs
@@ -123,7 +123,7 @@ where
     /// Number of items.
     #[inline]
     pub fn len(&self) -> usize {
-        self.byte_len() / T::PAYLOAD_SIZE
+        self.byte_len() / T::payload_size()
     }
 
     #[inline]
@@ -132,7 +132,7 @@ where
     }
 
     pub fn try_get(&self, index: usize) -> Option<T::Ref<'_>> {
-        let byte_index = index * T::PAYLOAD_SIZE;
+        let byte_index = index * T::payload_size();
         let mut load_result = Ok(());
         let result = unsafe {
             T::from_byte_reader_as_borrow(|dest_slice| {
@@ -178,7 +178,7 @@ where
     }
 
     pub(super) unsafe fn get_unsafe(&self, index: usize) -> T {
-        let byte_index = index * T::PAYLOAD_SIZE;
+        let byte_index = index * T::payload_size();
         let mut load_result = Ok(());
         let result = T::from_byte_reader(|dest_slice| {
             load_result = self.buffer.load_slice(byte_index, dest_slice);
@@ -191,15 +191,15 @@ where
     }
 
     pub fn set(&mut self, index: usize, item: &T) -> Result<(), InvalidSliceError> {
-        let byte_index = index * T::PAYLOAD_SIZE;
+        let byte_index = index * T::payload_size();
         item.to_byte_writer(|slice| self.buffer.set_slice(byte_index, slice))
     }
 
     /// Returns a new `ManagedVec`, containing the [start_index, end_index) range of elements.
     /// Returns `None` if any index is out of range
     pub fn slice(&self, start_index: usize, end_index: usize) -> Option<Self> {
-        let byte_start = start_index * T::PAYLOAD_SIZE;
-        let byte_end = end_index * T::PAYLOAD_SIZE;
+        let byte_start = start_index * T::payload_size();
+        let byte_end = end_index * T::payload_size();
         let opt_buffer = self.buffer.copy_slice(byte_start, byte_end - byte_start);
         opt_buffer.map(ManagedVec::new_from_raw_buffer)
     }
@@ -314,10 +314,9 @@ where
     fn with_self_as_slice<R, F>(&self, f: F) -> R
     where
         F: FnOnce(&[EncodedManagedVecItem<T>]) -> R,
-        [(); T::PAYLOAD_SIZE]:,
     {
         self.buffer.with_buffer_contents(|bytes| {
-            let item_len = bytes.len() / T::PAYLOAD_SIZE;
+            let item_len = bytes.len() / T::payload_size();
             let values = Self::transmute_slice(bytes, item_len);
             f(values)
         })
@@ -326,14 +325,13 @@ where
     fn with_self_as_slice_mut<F>(&mut self, f: F)
     where
         F: FnOnce(&mut [EncodedManagedVecItem<T>]) -> &[EncodedManagedVecItem<T>],
-        [(); T::PAYLOAD_SIZE]:,
     {
         self.buffer.with_buffer_contents_mut(|bytes| {
-            let item_len = bytes.len() / T::PAYLOAD_SIZE;
+            let item_len = bytes.len() / T::payload_size();
             let values = Self::transmute_slice_mut(bytes, item_len);
 
             let result = f(values);
-            let result_len = result.len() * T::PAYLOAD_SIZE;
+            let result_len = result.len() * T::payload_size();
             Self::transmute_slice(result, result_len)
         });
     }
@@ -357,7 +355,6 @@ impl<M, T> ManagedVec<M, T>
 where
     M: ManagedTypeApi,
     T: ManagedVecItem + Ord + Debug,
-    [(); T::PAYLOAD_SIZE]:,
 {
     pub fn sort(&mut self) {
         self.with_self_as_slice_mut(|slice| {
@@ -398,10 +395,7 @@ where
         });
     }
 
-    pub fn sort_unstable(&mut self)
-    where
-        [(); T::PAYLOAD_SIZE]:,
-    {
+    pub fn sort_unstable(&mut self) {
         self.with_self_as_slice_mut(|slice| {
             slice.sort_unstable();
             slice
@@ -411,7 +405,6 @@ where
     pub fn sort_unstable_by<F>(&mut self, mut compare: F)
     where
         F: FnMut(&T, &T) -> Ordering,
-        [(); T::PAYLOAD_SIZE]:,
     {
         self.with_self_as_slice_mut(|slice| {
             slice.sort_unstable_by(|a, b| compare(&a.decode(), &b.decode()));
@@ -423,7 +416,6 @@ where
     where
         F: FnMut(&T) -> K,
         K: Ord,
-        [(); T::PAYLOAD_SIZE]:,
     {
         self.with_self_as_slice_mut(|slice| {
             slice.sort_unstable_by_key(|a| f(&a.decode()));
@@ -463,10 +455,7 @@ where
     M: ManagedTypeApi,
     T: ManagedVecItem + PartialEq + Debug,
 {
-    pub fn dedup(&mut self)
-    where
-        [(); T::PAYLOAD_SIZE]:,
-    {
+    pub fn dedup(&mut self) {
         self.with_self_as_slice_mut(|slice| {
             let same_bucket = |a, b| a == b;
             let len = slice.len();
@@ -539,7 +528,7 @@ where
             if self_item != other_item {
                 return false;
             }
-            byte_index += T::PAYLOAD_SIZE;
+            byte_index += T::payload_size();
         }
         true
     }
diff --git a/framework/base/src/types/managed/wrapped/managed_vec_item.rs b/framework/base/src/types/managed/wrapped/managed_vec_item.rs
index 0a507aae25..648635e143 100644
--- a/framework/base/src/types/managed/wrapped/managed_vec_item.rs
+++ b/framework/base/src/types/managed/wrapped/managed_vec_item.rs
@@ -16,11 +16,9 @@ use super::{ManagedVecItemNestedTuple, ManagedVecItemPayload, ManagedVecItemPayl
 /// Not all data needs to be stored as payload, for instance for most managed types
 /// the payload is just the handle, whereas the mai ndata is kept by the VM.
 pub trait ManagedVecItem: 'static {
+    /// Type managing the underlying binary representation in a ManagedVec..
     type PAYLOAD: ManagedVecItemPayload;
 
-    /// Size of the data stored in the underlying `ManagedBuffer`.
-    const PAYLOAD_SIZE: usize;
-
     /// If true, then the encoding of the item is identical to the payload,
     /// and no further conversion is necessary
     /// (the underlying buffer can be used as-is during serialization).
@@ -59,7 +57,6 @@ macro_rules! impl_int {
     ($ty:ident, $payload_size:expr) => {
         impl ManagedVecItem for $ty {
             type PAYLOAD = ManagedVecItemPayloadBuffer<$payload_size>;
-            const PAYLOAD_SIZE: usize = $payload_size;
             const SKIPS_RESERIALIZATION: bool = true;
             type Ref<'a> = Self;
             fn from_byte_reader<Reader: FnMut(&mut [u8])>(mut reader: Reader) -> Self {
@@ -89,7 +86,6 @@ impl_int! {i64, 8}
 
 impl ManagedVecItem for usize {
     type PAYLOAD = ManagedVecItemPayloadBuffer<4>;
-    const PAYLOAD_SIZE: usize = 4;
     const SKIPS_RESERIALIZATION: bool = true;
     type Ref<'a> = Self;
 
@@ -113,7 +109,6 @@ impl ManagedVecItem for usize {
 
 impl ManagedVecItem for bool {
     type PAYLOAD = ManagedVecItemPayloadBuffer<1>;
-    const PAYLOAD_SIZE: usize = 1;
     const SKIPS_RESERIALIZATION: bool = true;
     type Ref<'a> = Self;
 
@@ -138,17 +133,15 @@ impl ManagedVecItem for bool {
 impl<T> ManagedVecItem for Option<T>
 where
     (u8, (T, ())): ManagedVecItemNestedTuple,
-    [(); 1 + T::PAYLOAD_SIZE]:,
     T: ManagedVecItem,
 {
     type PAYLOAD = <(u8, (T, ())) as ManagedVecItemNestedTuple>::PAYLOAD;
-    const PAYLOAD_SIZE: usize = 1 + T::PAYLOAD_SIZE;
     const SKIPS_RESERIALIZATION: bool = false;
     type Ref<'a> = Self;
 
     fn from_byte_reader<Reader: FnMut(&mut [u8])>(mut reader: Reader) -> Self {
         let mut payload = Self::PAYLOAD::new_buffer();
-        let payload_slice = payload.payload_slice();
+        let payload_slice = payload.payload_slice_mut();
         reader(payload_slice);
         if payload_slice[0] == 0 {
             None
@@ -167,7 +160,7 @@ where
 
     fn to_byte_writer<R, Writer: FnMut(&[u8]) -> R>(&self, mut writer: Writer) -> R {
         let mut payload = Self::PAYLOAD::new_buffer();
-        let slice = payload.payload_slice();
+        let slice = payload.payload_slice_mut();
         if let Some(t) = self {
             slice[0] = 1;
             T::to_byte_writer(t, |bytes| {
@@ -182,7 +175,6 @@ macro_rules! impl_managed_type {
     ($ty:ident) => {
         impl<M: ManagedTypeApi> ManagedVecItem for $ty<M> {
             type PAYLOAD = ManagedVecItemPayloadBuffer<4>;
-            const PAYLOAD_SIZE: usize = 4;
             const SKIPS_RESERIALIZATION: bool = false;
             type Ref<'a> = ManagedRef<'a, M, Self>;
 
@@ -217,7 +209,6 @@ where
     M: ManagedTypeApi,
 {
     type PAYLOAD = ManagedVecItemPayloadBuffer<4>;
-    const PAYLOAD_SIZE: usize = 4;
     const SKIPS_RESERIALIZATION: bool = false;
     type Ref<'a> = ManagedRef<'a, M, Self>;
 
@@ -247,7 +238,6 @@ where
     T: ManagedVecItem,
 {
     type PAYLOAD = ManagedVecItemPayloadBuffer<4>;
-    const PAYLOAD_SIZE: usize = 4;
     const SKIPS_RESERIALIZATION: bool = false;
     type Ref<'a> = ManagedRef<'a, M, Self>;
 
diff --git a/framework/base/src/types/managed/wrapped/managed_vec_item_payload.rs b/framework/base/src/types/managed/wrapped/managed_vec_item_payload.rs
index 253ac1fba9..860725d71d 100644
--- a/framework/base/src/types/managed/wrapped/managed_vec_item_payload.rs
+++ b/framework/base/src/types/managed/wrapped/managed_vec_item_payload.rs
@@ -3,7 +3,9 @@ pub trait ManagedVecItemPayload {
 
     fn payload_size() -> usize;
 
-    fn payload_slice(&mut self) -> &mut [u8];
+    fn payload_slice(&self) -> &[u8];
+
+    fn payload_slice_mut(&mut self) -> &mut [u8];
 }
 
 pub struct ManagedVecItemEmptyPayload;
@@ -17,7 +19,11 @@ impl ManagedVecItemPayload for ManagedVecItemEmptyPayload {
         0
     }
 
-    fn payload_slice(&mut self) -> &mut [u8] {
+    fn payload_slice(&self) -> &[u8] {
+        &[]
+    }
+
+    fn payload_slice_mut(&mut self) -> &mut [u8] {
         &mut []
     }
 }
@@ -35,7 +41,11 @@ impl<const N: usize> ManagedVecItemPayload for ManagedVecItemPayloadBuffer<N> {
         N
     }
 
-    fn payload_slice(&mut self) -> &mut [u8] {
+    fn payload_slice(&self) -> &[u8] {
+        &self.buffer[..]
+    }
+
+    fn payload_slice_mut(&mut self) -> &mut [u8] {
         &mut self.buffer[..]
     }
 }
diff --git a/framework/base/src/types/managed/wrapped/managed_vec_owned_iter.rs b/framework/base/src/types/managed/wrapped/managed_vec_owned_iter.rs
index f6a3ac4e44..20942e70d4 100644
--- a/framework/base/src/types/managed/wrapped/managed_vec_owned_iter.rs
+++ b/framework/base/src/types/managed/wrapped/managed_vec_owned_iter.rs
@@ -1,4 +1,4 @@
-use crate::{api::ManagedTypeApi, types::ManagedVecItemPayload};
+use crate::api::ManagedTypeApi;
 
 use super::{ManagedVec, ManagedVecItem};
 
@@ -48,7 +48,7 @@ where
 
     fn next(&mut self) -> Option<T> {
         // managedrev<t>  / reference type
-        let next_byte_start = self.byte_start + T::PAYLOAD::payload_size();
+        let next_byte_start = self.byte_start + T::payload_size();
         if next_byte_start > self.byte_end {
             return None;
         }
@@ -64,7 +64,8 @@ where
     }
 
     fn size_hint(&self) -> (usize, Option<usize>) {
-        let remaining = (self.byte_end - self.byte_start) / T::PAYLOAD_SIZE;
+        let size = T::payload_size();
+        let remaining = (self.byte_end - self.byte_start) / size;
         (remaining, Some(remaining))
     }
 }
@@ -82,10 +83,10 @@ where
     T: ManagedVecItem,
 {
     fn next_back(&mut self) -> Option<Self::Item> {
-        if self.byte_start + T::PAYLOAD::payload_size() > self.byte_end {
+        if self.byte_start + T::payload_size() > self.byte_end {
             return None;
         }
-        self.byte_end -= T::PAYLOAD::payload_size();
+        self.byte_end -= T::payload_size();
 
         let result = T::from_byte_reader(|dest_slice| {
             let _ = self
diff --git a/framework/base/src/types/managed/wrapped/managed_vec_ref_iter.rs b/framework/base/src/types/managed/wrapped/managed_vec_ref_iter.rs
index 0a2a243ac0..ad04b5eaf4 100644
--- a/framework/base/src/types/managed/wrapped/managed_vec_ref_iter.rs
+++ b/framework/base/src/types/managed/wrapped/managed_vec_ref_iter.rs
@@ -1,6 +1,6 @@
 use crate::api::ManagedTypeApi;
 
-use super::{ManagedVec, ManagedVecItem, ManagedVecItemPayload};
+use super::{ManagedVec, ManagedVecItem};
 
 pub struct ManagedVecRefIterator<'a, M, T>
 where
@@ -34,7 +34,7 @@ where
     type Item = T::Ref<'a>;
 
     fn next(&mut self) -> Option<Self::Item> {
-        let next_byte_start = self.byte_start + T::PAYLOAD::payload_size();
+        let next_byte_start = self.byte_start + T::payload_size();
         if next_byte_start > self.byte_end {
             return None;
         }
@@ -52,7 +52,7 @@ where
     }
 
     fn size_hint(&self) -> (usize, Option<usize>) {
-        let remaining = (self.byte_end - self.byte_start) / T::PAYLOAD::payload_size();
+        let remaining = (self.byte_end - self.byte_start) / T::payload_size();
         (remaining, Some(remaining))
     }
 }
@@ -70,10 +70,10 @@ where
     T: ManagedVecItem,
 {
     fn next_back(&mut self) -> Option<Self::Item> {
-        if self.byte_start + T::PAYLOAD::payload_size() > self.byte_end {
+        if self.byte_start + T::payload_size() > self.byte_end {
             return None;
         }
-        self.byte_end -= T::PAYLOAD::payload_size();
+        self.byte_end -= T::payload_size();
 
         let result = unsafe {
             T::from_byte_reader_as_borrow(|dest_slice| {
diff --git a/framework/derive/src/managed_vec_item_derive.rs b/framework/derive/src/managed_vec_item_derive.rs
index c78f54d455..1755182f34 100644
--- a/framework/derive/src/managed_vec_item_derive.rs
+++ b/framework/derive/src/managed_vec_item_derive.rs
@@ -9,25 +9,6 @@ pub fn managed_vec_item_derive(ast: &syn::DeriveInput) -> TokenStream {
     }
 }
 
-fn type_payload_size(type_name: &syn::Type) -> proc_macro2::TokenStream {
-    quote! {
-        <#type_name as multiversx_sc::types::ManagedVecItem>::PAYLOAD_SIZE
-    }
-}
-
-fn generate_payload_snippets(fields: &syn::Fields) -> Vec<proc_macro2::TokenStream> {
-    match fields {
-        syn::Fields::Named(fields_named) => fields_named
-            .named
-            .iter()
-            .map(|field| type_payload_size(&field.ty))
-            .collect(),
-        _ => {
-            panic!("ManagedVecItem only supports named fields")
-        },
-    }
-}
-
 fn generate_payload_nested_tuple(fields: &syn::Fields) -> proc_macro2::TokenStream {
     match fields {
         syn::Fields::Named(fields_named) => {
@@ -111,7 +92,7 @@ fn generate_to_byte_writer_snippets(fields: &syn::Fields) -> Vec<proc_macro2::To
 fn generate_payload_buffer_snippet() -> proc_macro2::TokenStream {
     quote! {
         let mut payload = <Self::PAYLOAD as multiversx_sc::types::ManagedVecItemPayload>::new_buffer();
-        let payload_slice = multiversx_sc::types::ManagedVecItemPayload::payload_slice(&mut payload);
+        let payload_slice = multiversx_sc::types::ManagedVecItemPayload::payload_slice_mut(&mut payload);
     }
 }
 
@@ -141,7 +122,6 @@ fn enum_derive(data_enum: &syn::DataEnum, ast: &syn::DeriveInput) -> TokenStream
     let gen = quote! {
         impl #impl_generics multiversx_sc::types::ManagedVecItem for #name #ty_generics #where_clause {
             type PAYLOAD = multiversx_sc::types::ManagedVecItemPayloadBuffer<1>;
-            const PAYLOAD_SIZE: usize = 1;
             const SKIPS_RESERIALIZATION: bool = true;
             type Ref<'a> = Self;
 
@@ -173,7 +153,6 @@ fn struct_derive(data_struct: &syn::DataStruct, ast: &syn::DeriveInput) -> Token
     let name = &ast.ident;
     let (impl_generics, ty_generics, where_clause) = &ast.generics.split_for_impl();
     let payload_nested_tuple = generate_payload_nested_tuple(&data_struct.fields);
-    let payload_snippets = generate_payload_snippets(&data_struct.fields);
     let skips_reserialization_snippets =
         generate_skips_reserialization_snippets(&data_struct.fields);
     let from_byte_reader_snippets = generate_from_byte_reader_snippets(&data_struct.fields);
@@ -184,7 +163,6 @@ fn struct_derive(data_struct: &syn::DataStruct, ast: &syn::DeriveInput) -> Token
     let gen = quote! {
         impl #impl_generics multiversx_sc::types::ManagedVecItem for #name #ty_generics #where_clause {
             type PAYLOAD = <#payload_nested_tuple as multiversx_sc::types::ManagedVecItemNestedTuple>::PAYLOAD;
-            const PAYLOAD_SIZE: usize = #(#payload_snippets)+*;
             const SKIPS_RESERIALIZATION: bool = #(#skips_reserialization_snippets)&&*;
             type Ref<'a> = Self;
 
diff --git a/framework/scenario/src/api/impl_vh/debug_handle_vh.rs b/framework/scenario/src/api/impl_vh/debug_handle_vh.rs
index 2f350946ba..0623270758 100644
--- a/framework/scenario/src/api/impl_vh/debug_handle_vh.rs
+++ b/framework/scenario/src/api/impl_vh/debug_handle_vh.rs
@@ -79,8 +79,6 @@ impl From<i32> for DebugHandle {
 impl ManagedVecItem for DebugHandle {
     type PAYLOAD = <RawHandle as ManagedVecItem>::PAYLOAD;
 
-    const PAYLOAD_SIZE: usize = <RawHandle as ManagedVecItem>::PAYLOAD_SIZE;
-
     const SKIPS_RESERIALIZATION: bool = <RawHandle as ManagedVecItem>::SKIPS_RESERIALIZATION;
 
     type Ref<'a> = Self;
diff --git a/framework/scenario/tests/derive_managed_vec_item_biguint_test.rs b/framework/scenario/tests/derive_managed_vec_item_biguint_test.rs
index cdf518016c..9e0cfa8c74 100644
--- a/framework/scenario/tests/derive_managed_vec_item_biguint_test.rs
+++ b/framework/scenario/tests/derive_managed_vec_item_biguint_test.rs
@@ -38,9 +38,9 @@ fn managed_struct_to_bytes_writer() {
         big_uint: BigUint::from(fortytwo),
         num: 0x12345,
     };
-    
+
     let mut payload = <ManagedStructWithBigUint<StaticApi> as multiversx_sc::types::ManagedVecItem>::PAYLOAD::new_buffer();
-    let payload_slice = payload.payload_slice();
+    let payload_slice = payload.payload_slice_mut();
 
     let handle_bytes = s.big_uint.get_handle().to_be_bytes();
     let expected = [0xff, 0xff, 0xff, handle_bytes[3], 0x00, 0x01, 0x23, 0x45];
diff --git a/framework/scenario/tests/derive_managed_vec_item_esdt_token_payment_test.rs b/framework/scenario/tests/derive_managed_vec_item_esdt_token_payment_test.rs
index b9ec6a3173..fc7d95343e 100644
--- a/framework/scenario/tests/derive_managed_vec_item_esdt_token_payment_test.rs
+++ b/framework/scenario/tests/derive_managed_vec_item_esdt_token_payment_test.rs
@@ -51,7 +51,7 @@ fn struct_to_bytes_writer() {
     };
 
     let mut payload = <ManagedStructWithToken<StaticApi> as multiversx_sc::types::ManagedVecItem>::PAYLOAD::new_buffer();
-    let payload_slice = payload.payload_slice();
+    let payload_slice = payload.payload_slice_mut();
 
     let handle1 = s.token.token_identifier.get_handle().to_be_bytes();
     let handle2 = s.token.amount.get_handle().to_be_bytes();
diff --git a/framework/scenario/tests/derive_managed_vec_item_struct_1_test.rs b/framework/scenario/tests/derive_managed_vec_item_struct_1_test.rs
index a1b2b056ef..e5ee344e3c 100644
--- a/framework/scenario/tests/derive_managed_vec_item_struct_1_test.rs
+++ b/framework/scenario/tests/derive_managed_vec_item_struct_1_test.rs
@@ -1,5 +1,7 @@
-use multiversx_sc::codec::test_util::{check_dep_encode_decode, check_top_encode_decode};
-use multiversx_sc::types::ManagedVecItemPayload;
+use multiversx_sc::{
+    codec::test_util::{check_dep_encode_decode, check_top_encode_decode},
+    types::ManagedVecItemPayload,
+};
 
 multiversx_sc::derive_imports!();
 
@@ -61,9 +63,9 @@ fn struct_1_to_bytes_writer() {
         u_64: 4u64,
         bool_field: true,
     };
-    
+
     let mut payload = <Struct1 as multiversx_sc::types::ManagedVecItem>::PAYLOAD::new_buffer();
-    let payload_slice = payload.payload_slice();
+    let payload_slice = payload.payload_slice_mut();
 
     <Struct1 as multiversx_sc::types::ManagedVecItem>::to_byte_writer(&s, |bytes| {
         payload_slice.copy_from_slice(bytes);

From d729831e74743cb56f142e616fbab6a4efd7e1ba Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 8 May 2024 20:02:51 +0300
Subject: [PATCH 0848/1254] removed generic_const_exprs feature

---
 framework/base/src/lib.rs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/framework/base/src/lib.rs b/framework/base/src/lib.rs
index 2b9f8669f7..8214ecb4bd 100644
--- a/framework/base/src/lib.rs
+++ b/framework/base/src/lib.rs
@@ -1,6 +1,5 @@
 #![no_std]
-#![feature(generic_const_exprs)]
-#![allow(incomplete_features)]
+
 #![allow(deprecated)]
 
 pub use multiversx_sc_derive::{self as derive, contract, module, proxy};

From 777600c41f42809dab271fe400e0ffd03a975593 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 8 May 2024 20:07:53 +0300
Subject: [PATCH 0849/1254] docs

---
 .../managed/wrapped/managed_vec_item_nested_tuple.rs |  2 ++
 .../managed/wrapped/managed_vec_item_payload.rs      | 12 ++++++++++++
 2 files changed, 14 insertions(+)

diff --git a/framework/base/src/types/managed/wrapped/managed_vec_item_nested_tuple.rs b/framework/base/src/types/managed/wrapped/managed_vec_item_nested_tuple.rs
index 2d4826272a..3a25bf4993 100644
--- a/framework/base/src/types/managed/wrapped/managed_vec_item_nested_tuple.rs
+++ b/framework/base/src/types/managed/wrapped/managed_vec_item_nested_tuple.rs
@@ -2,10 +2,12 @@ use super::{
     ManagedVecItem, ManagedVecItemEmptyPayload, ManagedVecItemPayload, ManagedVecItemPayloadAdd,
 };
 
+/// Syntactic sugar, that allows us to more easily represent composite payloads as nested tuples.
 pub trait ManagedVecItemNestedTuple {
     type PAYLOAD: ManagedVecItemPayload;
 }
 
+/// End of the list.
 impl ManagedVecItemNestedTuple for () {
     type PAYLOAD = ManagedVecItemEmptyPayload;
 }
diff --git a/framework/base/src/types/managed/wrapped/managed_vec_item_payload.rs b/framework/base/src/types/managed/wrapped/managed_vec_item_payload.rs
index 860725d71d..f5bf96e4a4 100644
--- a/framework/base/src/types/managed/wrapped/managed_vec_item_payload.rs
+++ b/framework/base/src/types/managed/wrapped/managed_vec_item_payload.rs
@@ -1,3 +1,6 @@
+/// Describes the binary represetnation of a ManagedVecItem.
+/// 
+/// It is always an array that can be allocated directly on stack.
 pub trait ManagedVecItemPayload {
     fn new_buffer() -> Self;
 
@@ -8,6 +11,9 @@ pub trait ManagedVecItemPayload {
     fn payload_slice_mut(&mut self) -> &mut [u8];
 }
 
+/// Empty ManagedVecItem.
+/// 
+/// Only used as type, never as implementation, since all ManagedVecItem have some data in them.
 pub struct ManagedVecItemEmptyPayload;
 
 impl ManagedVecItemPayload for ManagedVecItemEmptyPayload {
@@ -28,6 +34,7 @@ impl ManagedVecItemPayload for ManagedVecItemEmptyPayload {
     }
 }
 
+/// The main ManagedVecItemPayload implementation. Uses an array in its implementation.
 pub struct ManagedVecItemPayloadBuffer<const N: usize> {
     buffer: [u8; N],
 }
@@ -50,6 +57,11 @@ impl<const N: usize> ManagedVecItemPayload for ManagedVecItemPayloadBuffer<N> {
     }
 }
 
+/// Describes concatantion of smaller payloads into a larger one.
+/// 
+/// There is no runtime implementation, just a type-level addition.
+/// 
+/// Implemented via macros, because generic const expressions are currently unstable.
 pub trait ManagedVecItemPayloadAdd<Rhs>: ManagedVecItemPayload
 where
     Rhs: ManagedVecItemPayload,

From 9c72ecb6695ff2630d69461d1c835d27ca036555 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 9 May 2024 12:00:45 +0300
Subject: [PATCH 0850/1254] replace quote! - semver

---
 framework/derive/src/format/semver_tuple.rs | 54 +++++++++++----------
 1 file changed, 28 insertions(+), 26 deletions(-)

diff --git a/framework/derive/src/format/semver_tuple.rs b/framework/derive/src/format/semver_tuple.rs
index e4c3c33fcc..665bf90db9 100644
--- a/framework/derive/src/format/semver_tuple.rs
+++ b/framework/derive/src/format/semver_tuple.rs
@@ -1,37 +1,39 @@
-use proc_macro::{quote, Literal};
+use quote::quote;
 
 use crate::format::format_tokenize;
 
 pub fn semver_tuple(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
     let tokens: Vec<proc_macro::TokenTree> = format_tokenize::tokenize(input);
 
-    tokens
-        .iter()
-        .map(|token| match token {
-            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]);
-
-                quote!(
-                    ($major, $minor, $patch)
-                )
-            },
-            _ => panic!("Tokentree does not match with the requirements"),
-        })
-        .collect()
+    tokens.iter().map(convert_token_tree).collect()
 }
 
-fn u64_literal_from_str(s: &str) -> proc_macro::TokenTree {
-    proc_macro::TokenTree::Literal(Literal::u64_suffixed(
+fn convert_token_tree(token: &proc_macro::TokenTree) -> proc_macro::TokenStream {
+    match token {
+        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]);
+
+            quote! {
+                (#major, #minor, #patch)
+            }
+            .into()
+        },
+        _ => panic!("Tokentree does not match with the requirements"),
+    }
+}
+
+fn u64_literal_from_str(s: &str) -> proc_macro2::TokenTree {
+    proc_macro2::TokenTree::Literal(proc_macro2::Literal::u64_suffixed(
         s.parse().expect("failed to parse token as u64"),
     ))
 }

From 246dbf75bacea652ba08a400611a08a2413b863f Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 9 May 2024 12:01:03 +0300
Subject: [PATCH 0851/1254] cargo fmt

---
 framework/base/src/lib.rs                                 | 1 -
 .../src/types/managed/wrapped/managed_vec_item_payload.rs | 8 ++++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/framework/base/src/lib.rs b/framework/base/src/lib.rs
index 8214ecb4bd..3b8fc6c0f5 100644
--- a/framework/base/src/lib.rs
+++ b/framework/base/src/lib.rs
@@ -1,5 +1,4 @@
 #![no_std]
-
 #![allow(deprecated)]
 
 pub use multiversx_sc_derive::{self as derive, contract, module, proxy};
diff --git a/framework/base/src/types/managed/wrapped/managed_vec_item_payload.rs b/framework/base/src/types/managed/wrapped/managed_vec_item_payload.rs
index f5bf96e4a4..0d0a8d7e99 100644
--- a/framework/base/src/types/managed/wrapped/managed_vec_item_payload.rs
+++ b/framework/base/src/types/managed/wrapped/managed_vec_item_payload.rs
@@ -1,5 +1,5 @@
 /// Describes the binary represetnation of a ManagedVecItem.
-/// 
+///
 /// It is always an array that can be allocated directly on stack.
 pub trait ManagedVecItemPayload {
     fn new_buffer() -> Self;
@@ -12,7 +12,7 @@ pub trait ManagedVecItemPayload {
 }
 
 /// Empty ManagedVecItem.
-/// 
+///
 /// Only used as type, never as implementation, since all ManagedVecItem have some data in them.
 pub struct ManagedVecItemEmptyPayload;
 
@@ -58,9 +58,9 @@ impl<const N: usize> ManagedVecItemPayload for ManagedVecItemPayloadBuffer<N> {
 }
 
 /// Describes concatantion of smaller payloads into a larger one.
-/// 
+///
 /// There is no runtime implementation, just a type-level addition.
-/// 
+///
 /// Implemented via macros, because generic const expressions are currently unstable.
 pub trait ManagedVecItemPayloadAdd<Rhs>: ManagedVecItemPayload
 where

From 9b74eaca658c71afdc46e838b7752701cebd9228 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 9 May 2024 12:25:02 +0300
Subject: [PATCH 0852/1254] replace quote! - format_receiver_args, cleanup

---
 .../derive/src/format/format_args_macro.rs    | 46 +++++++++++--------
 .../derive/src/format/format_tokenize.rs      | 16 +++----
 framework/derive/src/format/semver_tuple.rs   |  9 ++--
 framework/derive/src/lib.rs                   |  4 +-
 4 files changed, 41 insertions(+), 34 deletions(-)

diff --git a/framework/derive/src/format/format_args_macro.rs b/framework/derive/src/format/format_args_macro.rs
index 5e0ea07b63..080edf5bab 100644
--- a/framework/derive/src/format/format_args_macro.rs
+++ b/framework/derive/src/format/format_args_macro.rs
@@ -1,21 +1,21 @@
-use proc_macro::quote;
+use quote::quote;
 
 use crate::{format::format_tokenize, generate::util::byte_str_literal};
 
 use super::{count_args, parse_format_string, FormatPartType};
 
-pub fn format_receiver_args_macro(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
+pub fn format_receiver_args_macro(input: proc_macro2::TokenStream) -> proc_macro2::TokenStream {
     let tokens = format_tokenize::tokenize(input);
     assert!(
         tokens.len() > 2,
         "format_receiver_args macro requires at least 2 arguments"
     );
     let num_arguments = tokens.len() - 2;
-    let mut tokens_iter = tokens.into_iter();
+    let mut tokens_iter: std::vec::IntoIter<proc_macro2::TokenTree> = tokens.into_iter();
 
     let accumulator_expr = tokens_iter.next().unwrap();
     let format_string_token = tokens_iter.next().unwrap();
-    let format_string = if let proc_macro::TokenTree::Literal(lit) = format_string_token {
+    let format_string = if let proc_macro2::TokenTree::Literal(lit) = format_string_token {
         lit.to_string()
     } else {
         panic!(
@@ -30,37 +30,45 @@ pub fn format_receiver_args_macro(input: proc_macro::TokenStream) -> proc_macro:
         "Number of placeholders ({num_placeholders}) does not match number of arguments ({num_arguments})."
     );
 
+    format_tokens(format_str_parts, accumulator_expr, tokens_iter)
+}
+
+fn format_tokens(
+    format_str_parts: Vec<FormatPartType>,
+    accumulator_expr: proc_macro2::TokenTree,
+    mut tokens_iter: std::vec::IntoIter<proc_macro2::TokenTree>,
+) -> proc_macro2::TokenStream {
     format_str_parts.into_iter().map(|part| {
         match part {
             FormatPartType::StaticAscii(ascii_string) => {
                 let str_as_bytes = byte_str_literal(ascii_string.as_bytes());
-                quote! (
-                    multiversx_sc::formatter::FormatBuffer::append_ascii(&mut $accumulator_expr, $str_as_bytes);
-                )
+                quote! {
+                    multiversx_sc::formatter::FormatBuffer::append_ascii(&mut #accumulator_expr, #str_as_bytes);
+                }
             },
             FormatPartType::Display => {
                 let arg_expr = tokens_iter.next().unwrap();
-                quote! (
-                    multiversx_sc::formatter::FormatBuffer::append_display(&mut $accumulator_expr, &$arg_expr);
-                )
+                quote! {
+                    multiversx_sc::formatter::FormatBuffer::append_display(&mut #accumulator_expr, &#arg_expr);
+                }
             },
             FormatPartType::LowerHex => {
                 let arg_expr = tokens_iter.next().unwrap();
-                quote! (
-                    multiversx_sc::formatter::FormatBuffer::append_lower_hex(&mut $accumulator_expr, &$arg_expr);
-                )
+                quote! {
+                    multiversx_sc::formatter::FormatBuffer::append_lower_hex(&mut #accumulator_expr, &#arg_expr);
+                }
             },
             FormatPartType::Codec => {
                 let arg_expr = tokens_iter.next().unwrap();
-                quote! (
-                    multiversx_sc::formatter::FormatBuffer::append_codec(&mut $accumulator_expr, &$arg_expr);
-                )
+                quote! {
+                    multiversx_sc::formatter::FormatBuffer::append_codec(&mut #accumulator_expr, &#arg_expr);
+                }
             },
             FormatPartType::Bytes => {
                 let arg_expr = tokens_iter.next().unwrap();
-                quote! (
-                    multiversx_sc::formatter::FormatBuffer::append_binary(&mut $accumulator_expr, &$arg_expr);
-                )
+                quote! {
+                    multiversx_sc::formatter::FormatBuffer::append_binary(&mut #accumulator_expr, &#arg_expr);
+                }
             },
         }
     }).collect()
diff --git a/framework/derive/src/format/format_tokenize.rs b/framework/derive/src/format/format_tokenize.rs
index 1e8dfe0bfb..2e9beb4294 100644
--- a/framework/derive/src/format/format_tokenize.rs
+++ b/framework/derive/src/format/format_tokenize.rs
@@ -1,7 +1,7 @@
-use proc_macro::Group;
+use proc_macro2::Group;
 
-fn token_tree_is_comma(tt: &proc_macro::TokenTree) -> bool {
-    if let proc_macro::TokenTree::Punct(punct) = &tt {
+fn token_tree_is_comma(tt: &proc_macro2::TokenTree) -> bool {
+    if let proc_macro2::TokenTree::Punct(punct) = &tt {
         punct.as_char() == ','
     } else {
         false
@@ -9,20 +9,20 @@ fn token_tree_is_comma(tt: &proc_macro::TokenTree) -> bool {
 }
 
 fn flush_token_buffer(
-    output: &mut Vec<proc_macro::TokenTree>,
-    mut buffer: Vec<proc_macro::TokenTree>,
+    output: &mut Vec<proc_macro2::TokenTree>,
+    mut buffer: Vec<proc_macro2::TokenTree>,
 ) {
     match buffer.len() {
         0 => panic!("empty tokens not allowed in push_format macro"),
         1 => output.append(&mut buffer),
-        _ => output.push(proc_macro::TokenTree::Group(Group::new(
-            proc_macro::Delimiter::Parenthesis,
+        _ => output.push(proc_macro2::TokenTree::Group(Group::new(
+            proc_macro2::Delimiter::Parenthesis,
             buffer.into_iter().collect(),
         ))),
     }
 }
 
-pub fn tokenize(input: proc_macro::TokenStream) -> Vec<proc_macro::TokenTree> {
+pub fn tokenize(input: proc_macro2::TokenStream) -> Vec<proc_macro2::TokenTree> {
     let mut buffer = Vec::new();
     let mut output = Vec::new();
     for tt in input.into_iter() {
diff --git a/framework/derive/src/format/semver_tuple.rs b/framework/derive/src/format/semver_tuple.rs
index 665bf90db9..f10036a973 100644
--- a/framework/derive/src/format/semver_tuple.rs
+++ b/framework/derive/src/format/semver_tuple.rs
@@ -2,15 +2,15 @@ use quote::quote;
 
 use crate::format::format_tokenize;
 
-pub fn semver_tuple(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
-    let tokens: Vec<proc_macro::TokenTree> = format_tokenize::tokenize(input);
+pub fn semver_tuple(input: proc_macro2::TokenStream) -> proc_macro2::TokenStream {
+    let tokens = format_tokenize::tokenize(input);
 
     tokens.iter().map(convert_token_tree).collect()
 }
 
-fn convert_token_tree(token: &proc_macro::TokenTree) -> proc_macro::TokenStream {
+fn convert_token_tree(token: &proc_macro2::TokenTree) -> proc_macro2::TokenStream {
     match token {
-        proc_macro::TokenTree::Group(lit) => {
+        proc_macro2::TokenTree::Group(lit) => {
             let format_string = lit.stream().to_string();
 
             let version_tokens: Vec<&str> = format_string.split('.').collect();
@@ -26,7 +26,6 @@ fn convert_token_tree(token: &proc_macro::TokenTree) -> proc_macro::TokenStream
             quote! {
                 (#major, #minor, #patch)
             }
-            .into()
         },
         _ => panic!("Tokentree does not match with the requirements"),
     }
diff --git a/framework/derive/src/lib.rs b/framework/derive/src/lib.rs
index 917ecb2159..e30c08298e 100644
--- a/framework/derive/src/lib.rs
+++ b/framework/derive/src/lib.rs
@@ -68,10 +68,10 @@ pub fn managed_vec_item_derive(input: proc_macro::TokenStream) -> proc_macro::To
 
 #[proc_macro]
 pub fn format_receiver_args(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
-    format::format_receiver_args_macro(input)
+    format::format_receiver_args_macro(input.into()).into()
 }
 
 #[proc_macro]
 pub fn semver_tuple(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
-    format::semver_tuple(input)
+    format::semver_tuple(input.into()).into()
 }

From 3f80b73c74f72de3e692e85cd3a3b8af453aa199 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 9 May 2024 12:32:47 +0300
Subject: [PATCH 0853/1254] removed feature proc_macro_quote

---
 framework/derive/src/lib.rs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/framework/derive/src/lib.rs b/framework/derive/src/lib.rs
index e30c08298e..7f32bb2133 100644
--- a/framework/derive/src/lib.rs
+++ b/framework/derive/src/lib.rs
@@ -1,7 +1,5 @@
-#![allow(stable_features)]
 // ensure we don't run out of macro stack
 #![recursion_limit = "1024"]
-#![feature(proc_macro_quote)]
 
 #[macro_use]
 extern crate syn;

From 713ed43052be3874127eccc720ef8eea8fb7140c Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 9 May 2024 12:35:59 +0300
Subject: [PATCH 0854/1254] removed feature trait_alias

---
 contracts/modules/src/lib.rs                       |  1 -
 .../token_merge/custom_merged_token_attributes.rs  | 14 ++++++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/contracts/modules/src/lib.rs b/contracts/modules/src/lib.rs
index 58b5da9c73..d3b6c29f85 100644
--- a/contracts/modules/src/lib.rs
+++ b/contracts/modules/src/lib.rs
@@ -1,5 +1,4 @@
 #![no_std]
-#![feature(trait_alias)]
 
 pub mod bonding_curve;
 pub mod claim_developer_rewards;
diff --git a/contracts/modules/src/token_merge/custom_merged_token_attributes.rs b/contracts/modules/src/token_merge/custom_merged_token_attributes.rs
index 0585685fd8..8d06d3530d 100644
--- a/contracts/modules/src/token_merge/custom_merged_token_attributes.rs
+++ b/contracts/modules/src/token_merge/custom_merged_token_attributes.rs
@@ -6,9 +6,19 @@ use multiversx_sc::codec::Empty;
 
 use super::merged_token_instances::MergedTokenInstances;
 
-pub trait AllMergeScTraits = super::merged_token_setup::MergedTokenSetupModule
+pub trait AllMergeScTraits:
+    super::merged_token_setup::MergedTokenSetupModule
     + crate::default_issue_callbacks::DefaultIssueCallbacksModule
-    + crate::pause::PauseModule;
+    + crate::pause::PauseModule
+{
+}
+
+impl<T> AllMergeScTraits for T where
+    T: super::merged_token_setup::MergedTokenSetupModule
+        + crate::default_issue_callbacks::DefaultIssueCallbacksModule
+        + crate::pause::PauseModule
+{
+}
 
 pub trait MergedTokenAttributesCreator {
     type ScType: AllMergeScTraits;

From ca4afe3c3c781f6eed9f9e66c12dd574d7360ff0 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 9 May 2024 12:41:19 +0300
Subject: [PATCH 0855/1254] eval_to_array removed const (const
 ptr::copy_nonoverlapping not stable)

---
 framework/base/src/types/interaction/expr/test_address.rs    | 2 +-
 framework/base/src/types/interaction/expr/test_sc_address.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/framework/base/src/types/interaction/expr/test_address.rs b/framework/base/src/types/interaction/expr/test_address.rs
index 6cd8a54753..88799c06d2 100644
--- a/framework/base/src/types/interaction/expr/test_address.rs
+++ b/framework/base/src/types/interaction/expr/test_address.rs
@@ -27,7 +27,7 @@ impl<'a> TestAddress<'a> {
         TestAddress { name }
     }
 
-    pub const fn eval_to_array(&self) -> [u8; 32] {
+    pub fn eval_to_array(&self) -> [u8; 32] {
         let result = [b'_'; 32];
         let expr_bytes = self.name.as_bytes();
         let mut len = expr_bytes.len();
diff --git a/framework/base/src/types/interaction/expr/test_sc_address.rs b/framework/base/src/types/interaction/expr/test_sc_address.rs
index 9059df1b88..bf01de38bf 100644
--- a/framework/base/src/types/interaction/expr/test_sc_address.rs
+++ b/framework/base/src/types/interaction/expr/test_sc_address.rs
@@ -67,7 +67,7 @@ impl<'a, Env> TxTo<Env> for TestSCAddress<'a> where Env: TxEnv {}
 impl<'a, Env> TxToSpecified<Env> for TestSCAddress<'a> where Env: TxEnv {}
 
 impl<'a> TestSCAddress<'a> {
-    pub const fn eval_to_array(&self) -> [u8; 32] {
+    pub fn eval_to_array(&self) -> [u8; 32] {
         let result = *b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00______________________";
         let expr_bytes = self.name.as_bytes();
         let mut len = expr_bytes.len();

From 29b6f2887a21bb022ef1df8cf165fc7681149cb8 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Thu, 9 May 2024 14:05:12 +0300
Subject: [PATCH 0856/1254] removed unused function

---
 framework/meta/src/cargo_toml_contents.rs | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/framework/meta/src/cargo_toml_contents.rs b/framework/meta/src/cargo_toml_contents.rs
index 3ad86c648f..efe0148c76 100644
--- a/framework/meta/src/cargo_toml_contents.rs
+++ b/framework/meta/src/cargo_toml_contents.rs
@@ -233,19 +233,6 @@ impl CargoTomlContents {
             .insert("profile".to_string(), toml::Value::Table(toml_table));
     }
 
-    pub fn add_dev_profile(&mut self) {
-        let mut value = toml::map::Map::new();
-        value.insert("panic".to_string(), Value::String("abort".to_string()));
-
-        let mut toml_table = toml::map::Map::new();
-        toml_table.insert("dev".to_string(), toml::Value::Table(value));
-
-        self.toml_value
-            .as_table_mut()
-            .expect("malformed profile dev in Cargo.toml ")
-            .insert("profile".to_string(), toml::Value::Table(toml_table));
-    }
-
     pub fn add_workspace(&mut self, members: &[&str]) {
         let array: Vec<toml::Value> = members
             .iter()

From dc0998e595269c9cf8d6c654d0b0aaf96cc95b4a Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Thu, 9 May 2024 15:56:08 +0300
Subject: [PATCH 0857/1254] non payable flag - detect non-payable endpoints

---
 contracts/examples/adder/src/adder_proxy.rs           |  4 ++++
 .../cmd/contract/generate_proxy/proxy_generator.rs    | 11 +++++++++++
 2 files changed, 15 insertions(+)

diff --git a/contracts/examples/adder/src/adder_proxy.rs b/contracts/examples/adder/src/adder_proxy.rs
index b7a7025709..0e9d77d692 100644
--- a/contracts/examples/adder/src/adder_proxy.rs
+++ b/contracts/examples/adder/src/adder_proxy.rs
@@ -53,6 +53,7 @@ where
             .raw_deploy()
             .argument(&initial_value)
             .original_result()
+        // non_payable
     }
 }
 
@@ -75,6 +76,7 @@ where
             .raw_upgrade()
             .argument(&initial_value)
             .original_result()
+        // non_payable
     }
 }
 
@@ -93,6 +95,7 @@ where
         self.wrapped_tx
             .raw_call("getSum")
             .original_result()
+        // non_payable
     }
 
     /// Add desired amount to the storage variable. 
@@ -106,5 +109,6 @@ where
             .raw_call("add")
             .argument(&value)
             .original_result()
+        // non_payable
     }
 }
diff --git a/framework/meta/src/cmd/contract/generate_proxy/proxy_generator.rs b/framework/meta/src/cmd/contract/generate_proxy/proxy_generator.rs
index 9c0e2a2479..676b145627 100644
--- a/framework/meta/src/cmd/contract/generate_proxy/proxy_generator.rs
+++ b/framework/meta/src/cmd/contract/generate_proxy/proxy_generator.rs
@@ -196,6 +196,7 @@ where
             }
             self.write_constructor_header(&constructor_abi);
             self.write_constructor_content(constructor_abi.inputs);
+            self.payable_mark(constructor_abi.payable_in_tokens);
             self.write_end_of_function();
         }
 
@@ -217,6 +218,7 @@ where
             }
             self.write_upgrade_header(&upgrade);
             self.write_upgrade_content(upgrade.inputs);
+            self.payable_mark(upgrade.payable_in_tokens);
             self.write_end_of_function();
         }
 
@@ -233,6 +235,7 @@ where
             }
             self.write_endpoint_header(&endpoint_abi);
             self.write_endpoint_content(&endpoint_abi);
+            self.payable_mark(endpoint_abi.payable_in_tokens);
             self.write_end_of_function();
         }
 
@@ -432,6 +435,14 @@ where
         }
     }
 
+    fn payable_mark(&mut self, payable_in_tokens: Vec<String>) {
+        if payable_in_tokens.is_empty() {
+            self.writeln("        // non_payable");
+        } else {
+            self.writeln("        // payable");
+        }
+    }
+
     fn write_enum(
         &mut self,
         enum_variants: &Vec<EnumVariantDescription>,

From f22567667f9d8fe8b46677253c19e059d3d3d9e8 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 9 May 2024 20:11:09 +0300
Subject: [PATCH 0858/1254] upgraded dependencies

---
 Cargo.lock                    | 347 +++++++++++++++++++++++++++-------
 data/codec-derive/Cargo.toml  |   6 +-
 data/codec/Cargo.toml         |   2 +-
 framework/base/Cargo.toml     |   4 +-
 framework/derive/Cargo.toml   |   6 +-
 framework/meta/Cargo.toml     |   8 +-
 framework/scenario/Cargo.toml |   2 +-
 framework/snippets/Cargo.toml |   2 +-
 sdk/core/Cargo.toml           |   4 +-
 vm/Cargo.toml                 |   2 +-
 10 files changed, 298 insertions(+), 85 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 41871e3141..9e833243ba 100755
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -60,6 +60,18 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
 
+[[package]]
+name = "ahash"
+version = "0.8.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+ "version_check",
+ "zerocopy",
+]
+
 [[package]]
 name = "aho-corasick"
 version = "1.1.3"
@@ -140,6 +152,15 @@ version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519"
 
+[[package]]
+name = "arbitrary"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110"
+dependencies = [
+ "derive_arbitrary",
+]
+
 [[package]]
 name = "arrayvec"
 version = "0.7.4"
@@ -167,12 +188,6 @@ dependencies = [
  "rustc-demangle",
 ]
 
-[[package]]
-name = "base64"
-version = "0.21.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
-
 [[package]]
 name = "base64"
 version = "0.22.0"
@@ -277,9 +292,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.4.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 
 [[package]]
 name = "block-buffer"
@@ -655,6 +670,17 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "derive_arbitrary"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "digest"
 version = "0.9.0"
@@ -691,6 +717,17 @@ dependencies = [
  "multiversx-sc-meta",
 ]
 
+[[package]]
+name = "displaydoc"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "ed25519"
 version = "1.5.3"
@@ -1261,9 +1298,9 @@ dependencies = [
 
 [[package]]
 name = "h2"
-version = "0.3.26"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8"
+checksum = "816ec7294445779408f36fe57bc5b7fc1cf59664059096c65f905c1c61f58069"
 dependencies = [
  "bytes",
  "fnv",
@@ -1283,6 +1320,9 @@ name = "hashbrown"
 version = "0.14.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
+dependencies = [
+ "ahash",
+]
 
 [[package]]
 name = "heck"
@@ -1319,9 +1359,9 @@ dependencies = [
 
 [[package]]
 name = "http"
-version = "0.2.12"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1"
+checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258"
 dependencies = [
  "bytes",
  "fnv",
@@ -1330,12 +1370,24 @@ dependencies = [
 
 [[package]]
 name = "http-body"
-version = "0.4.6"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2"
+checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643"
 dependencies = [
  "bytes",
  "http",
+]
+
+[[package]]
+name = "http-body-util"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d"
+dependencies = [
+ "bytes",
+ "futures-core",
+ "http",
+ "http-body",
  "pin-project-lite",
 ]
 
@@ -1345,12 +1397,6 @@ version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904"
 
-[[package]]
-name = "httpdate"
-version = "1.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
-
 [[package]]
 name = "humantime"
 version = "2.1.0"
@@ -1359,39 +1405,58 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
 
 [[package]]
 name = "hyper"
-version = "0.14.28"
+version = "1.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80"
+checksum = "fe575dd17d0862a9a33781c8c4696a55c320909004a67a00fb286ba8b1bc496d"
 dependencies = [
  "bytes",
  "futures-channel",
- "futures-core",
  "futures-util",
  "h2",
  "http",
  "http-body",
  "httparse",
- "httpdate",
  "itoa",
  "pin-project-lite",
- "socket2",
+ "smallvec",
  "tokio",
- "tower-service",
- "tracing",
  "want",
 ]
 
 [[package]]
 name = "hyper-tls"
-version = "0.5.0"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
+checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0"
 dependencies = [
  "bytes",
+ "http-body-util",
  "hyper",
+ "hyper-util",
  "native-tls",
  "tokio",
  "tokio-native-tls",
+ "tower-service",
+]
+
+[[package]]
+name = "hyper-util"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa"
+dependencies = [
+ "bytes",
+ "futures-channel",
+ "futures-util",
+ "http",
+ "http-body",
+ "hyper",
+ "pin-project-lite",
+ "socket2",
+ "tokio",
+ "tower",
+ "tower-service",
+ "tracing",
 ]
 
 [[package]]
@@ -1797,7 +1862,7 @@ dependencies = [
 name = "multiversx-chain-vm"
 version = "0.8.3"
 dependencies = [
- "bitflags 2.4.2",
+ "bitflags 2.5.0",
  "colored",
  "ed25519-dalek",
  "hex",
@@ -1843,7 +1908,7 @@ dependencies = [
 name = "multiversx-sc"
 version = "0.49.0"
 dependencies = [
- "bitflags 2.4.2",
+ "bitflags 2.5.0",
  "hex-literal",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
@@ -1919,7 +1984,7 @@ dependencies = [
 name = "multiversx-sc-scenario"
 version = "0.49.0"
 dependencies = [
- "base64 0.21.7",
+ "base64",
  "bech32",
  "clap",
  "colored",
@@ -1946,7 +2011,7 @@ dependencies = [
 name = "multiversx-sc-snippets"
 version = "0.49.0"
 dependencies = [
- "base64 0.21.7",
+ "base64",
  "env_logger",
  "futures",
  "hex",
@@ -1969,7 +2034,7 @@ name = "multiversx-sdk"
 version = "0.4.0"
 dependencies = [
  "anyhow",
- "base64 0.21.7",
+ "base64",
  "bech32",
  "bip39",
  "hex",
@@ -2095,11 +2160,10 @@ dependencies = [
 
 [[package]]
 name = "num-bigint"
-version = "0.4.4"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0"
+checksum = "c165a9ab64cf766f73521c0dd2cfdff64f488b8f0b3e621face3462d3db536d7"
 dependencies = [
- "autocfg",
  "num-integer",
  "num-traits",
 ]
@@ -2115,9 +2179,9 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
 ]
@@ -2132,6 +2196,27 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "num_enum"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845"
+dependencies = [
+ "num_enum_derive",
+]
+
+[[package]]
+name = "num_enum_derive"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b"
+dependencies = [
+ "proc-macro-crate",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "object"
 version = "0.32.2"
@@ -2159,7 +2244,7 @@ version = "0.10.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f"
 dependencies = [
- "bitflags 2.4.2",
+ "bitflags 2.5.0",
  "cfg-if",
  "foreign-types",
  "libc",
@@ -2314,7 +2399,7 @@ version = "3.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8e459365e590736a54c3fa561947c84837534b8e9af6fc5bf781307e82658fae"
 dependencies = [
- "base64 0.22.0",
+ "base64",
  "serde",
 ]
 
@@ -2324,6 +2409,26 @@ version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
 
+[[package]]
+name = "pin-project"
+version = "1.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3"
+dependencies = [
+ "pin-project-internal",
+]
+
+[[package]]
+name = "pin-project-internal"
+version = "1.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "pin-project-lite"
 version = "0.2.14"
@@ -2364,11 +2469,20 @@ version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
 
+[[package]]
+name = "proc-macro-crate"
+version = "3.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284"
+dependencies = [
+ "toml_edit 0.21.1",
+]
+
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
 dependencies = [
  "unicode-ident",
 ]
@@ -2457,9 +2571,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
@@ -2584,7 +2698,7 @@ version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e"
 dependencies = [
- "bitflags 2.4.2",
+ "bitflags 2.5.0",
 ]
 
 [[package]]
@@ -2618,20 +2732,23 @@ checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56"
 
 [[package]]
 name = "reqwest"
-version = "0.11.27"
+version = "0.12.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62"
+checksum = "566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10"
 dependencies = [
- "base64 0.21.7",
+ "base64",
  "bytes",
  "encoding_rs",
+ "futures-channel",
  "futures-core",
  "futures-util",
  "h2",
  "http",
  "http-body",
+ "http-body-util",
  "hyper",
  "hyper-tls",
+ "hyper-util",
  "ipnet",
  "js-sys",
  "log",
@@ -2747,7 +2864,7 @@ version = "0.38.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
 dependencies = [
- "bitflags 2.4.2",
+ "bitflags 2.5.0",
  "errno",
  "libc",
  "linux-raw-sys",
@@ -2756,13 +2873,20 @@ dependencies = [
 
 [[package]]
 name = "rustls-pemfile"
-version = "1.0.4"
+version = "2.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c"
+checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d"
 dependencies = [
- "base64 0.21.7",
+ "base64",
+ "rustls-pki-types",
 ]
 
+[[package]]
+name = "rustls-pki-types"
+version = "1.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d"
+
 [[package]]
 name = "ryu"
 version = "1.0.17"
@@ -3090,9 +3214,9 @@ checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc"
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3138,6 +3262,26 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
+[[package]]
+name = "thiserror"
+version = "1.0.60"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "579e9083ca58dd9dcf91a9923bb9054071b9ebbd800b342194c9feb0ee89fc18"
+dependencies = [
+ "thiserror-impl",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.60"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2470041c06ec3ac1ab38d0356a6119054dedaea53e12fbefc0de730a1c08524"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "tinyvec"
 version = "1.6.0"
@@ -3233,7 +3377,7 @@ dependencies = [
  "serde",
  "serde_spanned",
  "toml_datetime",
- "toml_edit",
+ "toml_edit 0.22.12",
 ]
 
 [[package]]
@@ -3245,6 +3389,17 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "toml_edit"
+version = "0.21.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1"
+dependencies = [
+ "indexmap",
+ "toml_datetime",
+ "winnow 0.5.40",
+]
+
 [[package]]
 name = "toml_edit"
 version = "0.22.12"
@@ -3255,9 +3410,31 @@ dependencies = [
  "serde",
  "serde_spanned",
  "toml_datetime",
- "winnow",
+ "winnow 0.6.7",
 ]
 
+[[package]]
+name = "tower"
+version = "0.4.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c"
+dependencies = [
+ "futures-core",
+ "futures-util",
+ "pin-project",
+ "pin-project-lite",
+ "tokio",
+ "tower-layer",
+ "tower-service",
+ "tracing",
+]
+
+[[package]]
+name = "tower-layer"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0"
+
 [[package]]
 name = "tower-service"
 version = "0.3.2"
@@ -3270,6 +3447,7 @@ version = "0.1.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
 dependencies = [
+ "log",
  "pin-project-lite",
  "tracing-core",
 ]
@@ -3525,20 +3703,22 @@ checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
 
 [[package]]
 name = "wasmparser"
-version = "0.121.2"
+version = "0.207.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9dbe55c8f9d0dbd25d9447a5a889ff90c0cc3feaa7395310d3d826b2c703eaab"
+checksum = "e19bb9f8ab07616da582ef8adb24c54f1424c7ec876720b7da9db8ec0626c92c"
 dependencies = [
- "bitflags 2.4.2",
+ "ahash",
+ "bitflags 2.5.0",
+ "hashbrown",
  "indexmap",
  "semver",
 ]
 
 [[package]]
 name = "wasmprinter"
-version = "0.2.80"
+version = "0.207.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60e73986a6b7fdfedb7c5bf9e7eb71135486507c8fbc4c0c42cffcb6532988b7"
+checksum = "9c2d8a7b4dabb460208e6b4334d9db5766e84505038b2529e69c3d07ac619115"
 dependencies = [
  "anyhow",
  "wasmparser",
@@ -3702,6 +3882,15 @@ version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0"
 
+[[package]]
+name = "winnow"
+version = "0.5.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "winnow"
 version = "0.6.7"
@@ -3713,14 +3902,34 @@ dependencies = [
 
 [[package]]
 name = "winreg"
-version = "0.50.0"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1"
+checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5"
 dependencies = [
  "cfg-if",
  "windows-sys 0.48.0",
 ]
 
+[[package]]
+name = "zerocopy"
+version = "0.7.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087"
+dependencies = [
+ "zerocopy-derive",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.7.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "zeroize"
 version = "1.7.0"
@@ -3743,12 +3952,16 @@ dependencies = [
 
 [[package]]
 name = "zip"
-version = "0.6.6"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261"
+checksum = "006d078b7b6fc587bb25e022ad39e7086f44e5c4fef6076964ea601533241beb"
 dependencies = [
- "byteorder",
+ "arbitrary",
  "crc32fast",
  "crossbeam-utils",
+ "displaydoc",
  "flate2",
+ "indexmap",
+ "num_enum",
+ "thiserror",
 ]
diff --git a/data/codec-derive/Cargo.toml b/data/codec-derive/Cargo.toml
index e1cd5d43ad..9bc69bdc55 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.78"
-quote = "=1.0.35"
-syn = "=2.0.48"
+proc-macro2 = "=1.0.82"
+quote = "=1.0.36"
+syn = "=2.0.61"
 hex = "=0.4.3"
diff --git a/data/codec/Cargo.toml b/data/codec/Cargo.toml
index 5016492cec..1b45cf90ae 100644
--- a/data/codec/Cargo.toml
+++ b/data/codec/Cargo.toml
@@ -24,7 +24,7 @@ optional = true
 
 [dependencies]
 arrayvec = { version = "=0.7.4", default-features = false }
-num-bigint = { version = "=0.4.4", optional = true } # can only be used in std contexts
+num-bigint = { version = "=0.4.5", optional = true } # can only be used in std contexts
 unwrap-infallible = "0.1.5"
 
 [dev-dependencies.multiversx-sc-codec-derive]
diff --git a/framework/base/Cargo.toml b/framework/base/Cargo.toml
index de4538c928..b16a3a7357 100644
--- a/framework/base/Cargo.toml
+++ b/framework/base/Cargo.toml
@@ -24,8 +24,8 @@ esdt-token-payment-legacy-decode = []
 
 [dependencies]
 hex-literal = "=0.4.1"
-bitflags = "=2.4.2"
-num-traits = { version = "=0.2.17", default-features = false }
+bitflags = "=2.5.0"
+num-traits = { version = "=0.2.19", default-features = false }
 unwrap-infallible = "0.1.5"
 
 [dependencies.multiversx-sc-derive]
diff --git a/framework/derive/Cargo.toml b/framework/derive/Cargo.toml
index 65ccd606ec..c8f5f2b337 100644
--- a/framework/derive/Cargo.toml
+++ b/framework/derive/Cargo.toml
@@ -14,9 +14,9 @@ keywords = ["multiversx", "blockchain", "contract"]
 categories = ["cryptography::cryptocurrencies", "development-tools::procedural-macro-helpers"]
 
 [dependencies]
-proc-macro2 = "=1.0.78"
-quote = "=1.0.35"
-syn = "=2.0.48"
+proc-macro2 = "=1.0.82"
+quote = "=1.0.36"
+syn = "=2.0.61"
 hex = "=0.4.3"
 radix_trie = "=0.2.1"
 
diff --git a/framework/meta/Cargo.toml b/framework/meta/Cargo.toml
index ef881a2f8c..9c6f2b49c7 100644
--- a/framework/meta/Cargo.toml
+++ b/framework/meta/Cargo.toml
@@ -40,13 +40,13 @@ colored = "2.0"
 lazy_static = "1.4.0"
 convert_case = "0.6.0"
 hex = "0.4"
-wasmparser = "0.121.0"
-wasmprinter = "0.2.71"
+wasmparser = "0.207"
+wasmprinter = "0.207"
 semver = "1.0.20"
 
 ruplacer = { version = "0.8.1", default-features = false, optional = true }
-reqwest = { version = "0.11.4", features = ["blocking", "json"], optional = true }
-zip = { version = "0.6.4", features = ["deflate"], default-features = false, optional = true }
+reqwest = { version = "0.12", features = ["blocking", "json"], optional = true }
+zip = { version = "1.2", features = ["deflate"], default-features = false, optional = true }
 copy_dir = { version = "0.1.2", optional = true }
 pathdiff = { version = "0.2.1", optional = true }
 common-path = { version = "1.0.0", optional = true }
diff --git a/framework/scenario/Cargo.toml b/framework/scenario/Cargo.toml
index 2dd61e602a..4f8e2de5cd 100644
--- a/framework/scenario/Cargo.toml
+++ b/framework/scenario/Cargo.toml
@@ -17,7 +17,7 @@ keywords = ["multiversx", "blockchain", "contract", "debug"]
 categories = ["cryptography::cryptocurrencies", "development-tools::debugging"]
 
 [dependencies]
-base64 = "0.21.5"
+base64 = "0.22"
 num-bigint = "0.4"
 num-traits = "0.2"
 hex = "0.4"
diff --git a/framework/snippets/Cargo.toml b/framework/snippets/Cargo.toml
index 8ce800326f..eca0ac6dc1 100644
--- a/framework/snippets/Cargo.toml
+++ b/framework/snippets/Cargo.toml
@@ -16,7 +16,7 @@ categories = ["cryptography::cryptocurrencies"]
 [dependencies]
 tokio = { version = "1.24", features = ["full"] }
 hex = "0.4"
-base64 = "0.21.5"
+base64 = "0.22"
 log = "0.4.17"
 env_logger = "0.11"
 futures = "0.3"
diff --git a/sdk/core/Cargo.toml b/sdk/core/Cargo.toml
index d8039324ba..2ca965fc83 100644
--- a/sdk/core/Cargo.toml
+++ b/sdk/core/Cargo.toml
@@ -17,7 +17,7 @@ keywords = ["multiversx", "blockchain", "sdk", "api"]
 
 [dependencies]
 tokio = { version = "1.24", features = ["full"] }
-reqwest = { version = "0.11.4", features = ["blocking", "json"] }
+reqwest = { version = "0.12", features = ["blocking", "json"] }
 serde = { version = "1.0.130", features = ["derive"] }
 serde_json = { version = "1.0.68", features = ["preserve_order"] }
 serde_repr = "0.1.8"
@@ -28,7 +28,7 @@ sha2 = "0.10.8"
 sha3 = "0.10.8"
 hmac = { version = "0.12.1", features = ["std"] }
 hex = "0.4.3"
-base64 = "0.21.5"
+base64 = "0.22"
 pbkdf2 = { version = "0.12.2", default-features = false }
 zeroize = "1.4.2"
 bech32 = "0.9"
diff --git a/vm/Cargo.toml b/vm/Cargo.toml
index 2246fc453a..eddc7cb8e1 100644
--- a/vm/Cargo.toml
+++ b/vm/Cargo.toml
@@ -27,7 +27,7 @@ rand_seeder = "0.2.2"
 ed25519-dalek = "1.0.1"
 itertools = "0.12.0"
 hex-literal = "=0.4.1"
-bitflags = "=2.4.2"
+bitflags = "=2.5.0"
 colored = "2.1.0"
 
 [dependencies.multiversx-chain-vm-executor]

From a5d4b84bf6ff24518234163344ede51592bc2a60 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 9 May 2024 21:59:01 +0300
Subject: [PATCH 0859/1254] non payable flag - in proxy generator

---
 .../annotated/annotated_impl_big_uint.rs      | 15 ++-
 .../base/src/types/interaction/tx_payment.rs  | 11 +++
 .../interaction/tx_payment/tx_payment_none.rs |  6 +-
 .../tx_payment/tx_payment_not_payable.rs      | 57 +++++++++++
 .../base/src/types/interaction/tx_proxy.rs    | 25 +++++
 .../generate_proxy/proxy_generator.rs         | 96 ++++++++++---------
 .../facade/world_tx/scenario_query_call.rs    | 13 ++-
 .../scenario/tx_to_step/tx_to_step_query.rs   |  5 +-
 .../interactor_tx/interactor_query_call.rs    | 13 ++-
 9 files changed, 180 insertions(+), 61 deletions(-)
 create mode 100644 framework/base/src/types/interaction/tx_payment/tx_payment_not_payable.rs

diff --git a/framework/base/src/types/interaction/annotated/annotated_impl_big_uint.rs b/framework/base/src/types/interaction/annotated/annotated_impl_big_uint.rs
index 685af7fdb3..5bf0b55007 100644
--- a/framework/base/src/types/interaction/annotated/annotated_impl_big_uint.rs
+++ b/framework/base/src/types/interaction/annotated/annotated_impl_big_uint.rs
@@ -1,4 +1,4 @@
-use crate::types::{BigUint, ManagedBuffer, ManagedRef};
+use crate::types::{BigUint, ManagedBuffer, ManagedRef, NotPayable};
 
 use super::{AnnotatedValue, TxEnv};
 
@@ -112,3 +112,16 @@ where
         BigUint::zero()
     }
 }
+
+impl<Env> AnnotatedValue<Env, BigUint<Env::Api>> for NotPayable
+where
+    Env: TxEnv,
+{
+    fn annotation(&self, _env: &Env) -> ManagedBuffer<Env::Api> {
+        ManagedBuffer::from("0")
+    }
+
+    fn to_value(&self, _env: &Env) -> BigUint<Env::Api> {
+        BigUint::zero()
+    }
+}
diff --git a/framework/base/src/types/interaction/tx_payment.rs b/framework/base/src/types/interaction/tx_payment.rs
index e72a5b9fa6..7821797812 100644
--- a/framework/base/src/types/interaction/tx_payment.rs
+++ b/framework/base/src/types/interaction/tx_payment.rs
@@ -6,6 +6,7 @@ mod tx_payment_egld_or_multi_esdt_ref;
 mod tx_payment_egld_value;
 mod tx_payment_multi_esdt;
 mod tx_payment_none;
+mod tx_payment_not_payable;
 mod tx_payment_single_esdt;
 mod tx_payment_single_esdt_ref;
 mod tx_payment_single_esdt_triple;
@@ -13,6 +14,7 @@ mod tx_payment_single_esdt_triple;
 pub use tx_payment_egld::{Egld, EgldPayment};
 pub use tx_payment_egld_value::TxEgldValue;
 pub use tx_payment_multi_esdt::TxPaymentMultiEsdt;
+pub use tx_payment_not_payable::NotPayable;
 
 use crate::{
     api::ManagedTypeApi,
@@ -57,6 +59,15 @@ where
     fn into_full_payment_data(self, env: &Env) -> FullPaymentData<Env::Api>;
 }
 
+/// Marker trait that indicates that payment field contains no payment.
+/// 
+/// Implemented by `()` and `NotPayable`.
+pub trait TxNoPayment<Env>: TxPayment<Env>
+where
+    Env: TxEnv,
+{
+}
+
 /// Marks a payment object that only contains EGLD or nothing at all.
 pub trait TxPaymentEgldOnly<Env>: TxPayment<Env> + AnnotatedValue<Env, BigUint<Env::Api>>
 where
diff --git a/framework/base/src/types/interaction/tx_payment/tx_payment_none.rs b/framework/base/src/types/interaction/tx_payment/tx_payment_none.rs
index fe6016e43b..01965c8edc 100644
--- a/framework/base/src/types/interaction/tx_payment/tx_payment_none.rs
+++ b/framework/base/src/types/interaction/tx_payment/tx_payment_none.rs
@@ -1,6 +1,8 @@
 use crate::types::{BigUint, ManagedAddress, TxFrom, TxToSpecified};
 
-use super::{Egld, FullPaymentData, FunctionCall, TxEnv, TxPayment, TxPaymentEgldOnly};
+use super::{
+    Egld, FullPaymentData, FunctionCall, TxEnv, TxNoPayment, TxPayment, TxPaymentEgldOnly,
+};
 
 impl<Env> TxPayment<Env> for ()
 where
@@ -41,4 +43,6 @@ where
     }
 }
 
+impl<Env> TxNoPayment<Env> for () where Env: TxEnv {}
+
 impl<Env> TxPaymentEgldOnly<Env> for () where Env: TxEnv {}
diff --git a/framework/base/src/types/interaction/tx_payment/tx_payment_not_payable.rs b/framework/base/src/types/interaction/tx_payment/tx_payment_not_payable.rs
new file mode 100644
index 0000000000..bf43ba1cfd
--- /dev/null
+++ b/framework/base/src/types/interaction/tx_payment/tx_payment_not_payable.rs
@@ -0,0 +1,57 @@
+use crate::types::{BigUint, ManagedAddress, TxFrom, TxToSpecified};
+
+use super::{FullPaymentData, FunctionCall, TxEnv, TxNoPayment, TxPayment, TxPaymentEgldOnly};
+
+/// Transaction marker, which indicates that a transaction should never have any payment added to it.
+///
+/// The implementation is completely identical to the empty payment `()`,
+/// the only difference is that the payment methods in `Tx` can only be called on top of `()` payment, not `NotPayable`.
+///
+/// So basically, `NotPayable` acts as a seal, preventing further payments to be added.
+pub struct NotPayable;
+
+impl<Env> TxPayment<Env> for NotPayable
+where
+    Env: TxEnv,
+{
+    #[inline]
+    fn is_no_payment(&self, _env: &Env) -> bool {
+        true
+    }
+
+    #[inline]
+    fn perform_transfer_execute(
+        self,
+        env: &Env,
+        to: &ManagedAddress<Env::Api>,
+        gas_limit: u64,
+        fc: FunctionCall<Env::Api>,
+    ) {
+        ().perform_transfer_execute(env, to, gas_limit, fc);
+    }
+
+    #[inline]
+    fn with_normalized<From, To, F, R>(
+        self,
+        env: &Env,
+        from: &From,
+        to: To,
+        fc: FunctionCall<Env::Api>,
+        f: F,
+    ) -> R
+    where
+        From: TxFrom<Env>,
+        To: TxToSpecified<Env>,
+        F: FnOnce(&ManagedAddress<Env::Api>, &BigUint<Env::Api>, &FunctionCall<Env::Api>) -> R,
+    {
+        ().with_normalized(env, from, to, fc, f)
+    }
+
+    fn into_full_payment_data(self, _env: &Env) -> FullPaymentData<Env::Api> {
+        FullPaymentData::default()
+    }
+}
+
+impl<Env> TxNoPayment<Env> for NotPayable where Env: TxEnv {}
+
+impl<Env> TxPaymentEgldOnly<Env> for NotPayable where Env: TxEnv {}
diff --git a/framework/base/src/types/interaction/tx_proxy.rs b/framework/base/src/types/interaction/tx_proxy.rs
index 2929a7bc4b..e0b62e006a 100644
--- a/framework/base/src/types/interaction/tx_proxy.rs
+++ b/framework/base/src/types/interaction/tx_proxy.rs
@@ -21,17 +21,42 @@ where
 }
 
 /// Alias for a `Tx` generated from a proxy, in `init`.
+///
+/// Replaced by `TxTypedDeploy`.
 pub type TxProxyDeploy<Env, From, Gas, Original> =
     Tx<Env, From, (), (), Gas, DeployCall<Env, ()>, OriginalResultMarker<Original>>;
 
+/// Alias for a `Tx` generated from a proxy, in `init`.
+pub type TxTypedDeploy<Env, From, Payment, Gas, Original> =
+    Tx<Env, From, (), Payment, Gas, DeployCall<Env, ()>, OriginalResultMarker<Original>>;
+
 /// Alias for a `Tx` generated from a proxy, in an endpoint.
+///
+/// Replaced by `TxTypedCall`.
 pub type TxProxyCall<Env, From, To, Gas, Original> =
     Tx<Env, From, To, (), Gas, FunctionCall<<Env as TxEnv>::Api>, OriginalResultMarker<Original>>;
 
+/// Alias for a `Tx` generated from a proxy, in an endpoint.
+pub type TxTypedCall<Env, From, To, Payment, Gas, Original> = Tx<
+    Env,
+    From,
+    To,
+    Payment,
+    Gas,
+    FunctionCall<<Env as TxEnv>::Api>,
+    OriginalResultMarker<Original>,
+>;
+
 /// Alias for a `Tx` generated from a proxy, in `upgrade`.
+///
+/// Replaced by `TxTypedUpgrade`.
 pub type TxProxyUpgrade<Env, From, To, Gas, Original> =
     Tx<Env, From, To, (), Gas, UpgradeCall<Env, ()>, OriginalResultMarker<Original>>;
 
+/// Alias for a `Tx` generated from a proxy, in `upgrade`.
+pub type TxTypedUpgrade<Env, From, To, Payment, Gas, Original> =
+    Tx<Env, From, To, Payment, Gas, UpgradeCall<Env, ()>, OriginalResultMarker<Original>>;
+
 /// Trait that is automatically implemented for all types that are allowed as proxy inputs.
 ///
 /// Is automatically implemented for all traits that are `TypeAbiInto<O> + TopEncodeMulti`.
diff --git a/framework/meta/src/cmd/contract/generate_proxy/proxy_generator.rs b/framework/meta/src/cmd/contract/generate_proxy/proxy_generator.rs
index 676b145627..0bc7a73447 100644
--- a/framework/meta/src/cmd/contract/generate_proxy/proxy_generator.rs
+++ b/framework/meta/src/cmd/contract/generate_proxy/proxy_generator.rs
@@ -195,8 +195,7 @@ where
                 self.writeln("");
             }
             self.write_constructor_header(&constructor_abi);
-            self.write_constructor_content(constructor_abi.inputs);
-            self.payable_mark(constructor_abi.payable_in_tokens);
+            self.write_constructor_content(&constructor_abi);
             self.write_end_of_function();
         }
 
@@ -217,8 +216,7 @@ where
                 self.writeln("");
             }
             self.write_upgrade_header(&upgrade);
-            self.write_upgrade_content(upgrade.inputs);
-            self.payable_mark(upgrade.payable_in_tokens);
+            self.write_upgrade_content(&upgrade);
             self.write_end_of_function();
         }
 
@@ -235,7 +233,6 @@ where
             }
             self.write_endpoint_header(&endpoint_abi);
             self.write_endpoint_content(&endpoint_abi);
-            self.payable_mark(endpoint_abi.payable_in_tokens);
             self.write_end_of_function();
         }
 
@@ -294,47 +291,51 @@ where
 
     fn write_constructor_header(&mut self, constructor_abi: &EndpointAbi) {
         self.write_fn_signature(constructor_abi);
-        self.write_constructor_output(&constructor_abi.outputs);
+        self.write_constructor_output(constructor_abi);
     }
 
     fn write_upgrade_header(&mut self, constructor_abi: &EndpointAbi) {
         self.write_fn_signature(constructor_abi);
-        self.write_upgrade_output(&constructor_abi.outputs);
+        self.write_upgrade_output(constructor_abi);
     }
 
     fn write_endpoint_header(&mut self, constructor_abi: &EndpointAbi) {
         self.write_fn_signature(constructor_abi);
-        self.write_endpoint_output(&constructor_abi.outputs);
+        self.write_endpoint_output(constructor_abi);
     }
 
-    fn write_constructor_content(&mut self, inputs: Vec<InputAbi>) {
-        self.writeln(
-            "        self.wrapped_tx
-            .raw_deploy()",
-        );
-        for input in inputs.iter() {
+    fn write_constructor_content(&mut self, constructor_abi: &EndpointAbi) {
+        self.writeln("        self.wrapped_tx");
+        if constructor_abi.payable_in_tokens.is_empty() {
+            self.writeln("            .payment(NotPayable)");
+        }
+        self.writeln("            .raw_deploy()");
+        for input in constructor_abi.inputs.iter() {
             self.writeln(format!("            .argument(&{})", input.arg_name));
         }
         self.writeln("            .original_result()");
     }
 
-    fn write_upgrade_content(&mut self, inputs: Vec<InputAbi>) {
-        self.writeln(
-            "        self.wrapped_tx
-            .raw_upgrade()",
-        );
-        for input in inputs.iter() {
+    fn write_upgrade_content(&mut self, constructor_abi: &EndpointAbi) {
+        self.writeln("        self.wrapped_tx");
+        if constructor_abi.payable_in_tokens.is_empty() {
+            self.writeln("            .payment(NotPayable)");
+        }
+        self.writeln("            .raw_upgrade()");
+        for input in constructor_abi.inputs.iter() {
             self.writeln(format!("            .argument(&{})", input.arg_name));
         }
         self.writeln("            .original_result()");
     }
 
     fn write_endpoint_content(&mut self, endpoint: &EndpointAbi) {
-        self.writeln(format!(
-            "        self.wrapped_tx
-            .raw_call(\"{}\")",
-            endpoint.name
-        ));
+        self.writeln("        self.wrapped_tx");
+
+        if endpoint.payable_in_tokens.is_empty() {
+            self.writeln("            .payment(NotPayable)");
+        }
+
+        self.writeln(format!("            .raw_call(\"{}\")", endpoint.name));
 
         for input in endpoint.inputs.iter() {
             self.writeln(format!("            .argument(&{})", input.arg_name));
@@ -388,30 +389,39 @@ where
         self.write("    ) ");
     }
 
-    fn write_constructor_output(&mut self, outputs: &[OutputAbi]) {
-        self.write("-> TxProxyDeploy<Env, From, Gas, ");
-
-        self.parse_and_write_outputs(outputs);
-
+    fn write_constructor_output(&mut self, abi: &EndpointAbi) {
+        self.write("-> TxTypedDeploy<Env, From, ");
+        self.write_payment_type(abi);
+        self.write("Gas, ");
+        self.parse_and_write_outputs(&abi.outputs);
         self.writeln("> {");
     }
 
-    fn write_upgrade_output(&mut self, outputs: &[OutputAbi]) {
-        self.write("-> TxProxyUpgrade<Env, From, To, Gas, ");
-
-        self.parse_and_write_outputs(outputs);
-
+    fn write_upgrade_output(&mut self, abi: &EndpointAbi) {
+        self.write("-> TxTypedUpgrade<Env, From, To, ");
+        self.write_payment_type(abi);
+        self.write("Gas, ");
+        self.parse_and_write_outputs(&abi.outputs);
         self.writeln("> {");
     }
 
-    fn write_endpoint_output(&mut self, outputs: &[OutputAbi]) {
-        self.write("-> TxProxyCall<Env, From, To, Gas, ");
-
-        self.parse_and_write_outputs(outputs);
+    fn write_endpoint_output(&mut self, abi: &EndpointAbi) {
+        self.write("-> TxTypedCall<Env, From, To, ");
+        self.write_payment_type(abi);
+        self.write("Gas, ");
+        self.parse_and_write_outputs(&abi.outputs);
 
         self.writeln("> {");
     }
 
+    fn write_payment_type(&mut self, abi: &EndpointAbi) {
+        if abi.payable_in_tokens.is_empty() {
+            self.write("NotPayable, ");
+        } else {
+            self.write("(), ");
+        }
+    }
+
     fn parse_and_write_outputs(&mut self, outputs: &[OutputAbi]) {
         match outputs.len() {
             0 => {
@@ -435,14 +445,6 @@ where
         }
     }
 
-    fn payable_mark(&mut self, payable_in_tokens: Vec<String>) {
-        if payable_in_tokens.is_empty() {
-            self.writeln("        // non_payable");
-        } else {
-            self.writeln("        // payable");
-        }
-    }
-
     fn write_enum(
         &mut self,
         enum_variants: &Vec<EnumVariantDescription>,
diff --git a/framework/scenario/src/facade/world_tx/scenario_query_call.rs b/framework/scenario/src/facade/world_tx/scenario_query_call.rs
index dbcf3130f5..dc416439b4 100644
--- a/framework/scenario/src/facade/world_tx/scenario_query_call.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_query_call.rs
@@ -2,7 +2,7 @@ use multiversx_sc::{
     tuple_util::NestedTupleFlatten,
     types::{
         FunctionCall, ManagedAddress, ManagedBuffer, RHListExec, Tx, TxBaseWithEnv, TxEnv,
-        TxToSpecified,
+        TxNoPayment, TxToSpecified,
     },
 };
 
@@ -42,10 +42,11 @@ impl<'w> ScenarioTxEnv for ScenarioEnvQuery<'w> {
     }
 }
 
-impl<'w, To, RH> ScenarioTxRun
-    for Tx<ScenarioEnvQuery<'w>, (), To, (), (), FunctionCall<StaticApi>, RH>
+impl<'w, To, Payment, RH> ScenarioTxRun
+    for Tx<ScenarioEnvQuery<'w>, (), To, Payment, (), FunctionCall<StaticApi>, RH>
 where
     To: TxToSpecified<ScenarioEnvQuery<'w>>,
+    Payment: TxNoPayment<ScenarioEnvQuery<'w>>,
     RH: RHListExec<TxResponse, ScenarioEnvQuery<'w>>,
     RH::ListReturns: NestedTupleFlatten,
 {
@@ -65,13 +66,15 @@ impl ScenarioWorld {
         Tx::new_with_env(env)
     }
 
-    pub fn chain_query<To, RH, F>(&mut self, f: F) -> &mut Self
+    pub fn chain_query<To, Payment, RH, F>(&mut self, f: F) -> &mut Self
     where
         To: TxToSpecified<ScenarioTxEnvData>,
+        Payment: TxNoPayment<ScenarioTxEnvData>,
         RH: RHListExec<TxResponse, ScenarioTxEnvData, ListReturns = ()>,
         F: FnOnce(
             TxBaseWithEnv<ScenarioTxEnvData>,
-        ) -> Tx<ScenarioTxEnvData, (), To, (), (), FunctionCall<StaticApi>, RH>,
+        )
+            -> Tx<ScenarioTxEnvData, (), To, Payment, (), FunctionCall<StaticApi>, RH>,
     {
         let env = self.new_env_data();
         let tx_base = TxBaseWithEnv::new_with_env(env);
diff --git a/framework/scenario/src/scenario/tx_to_step/tx_to_step_query.rs b/framework/scenario/src/scenario/tx_to_step/tx_to_step_query.rs
index aaeb3b70c3..3a94a1887d 100644
--- a/framework/scenario/src/scenario/tx_to_step/tx_to_step_query.rs
+++ b/framework/scenario/src/scenario/tx_to_step/tx_to_step_query.rs
@@ -1,13 +1,14 @@
-use multiversx_sc::types::{FunctionCall, RHListExec, Tx, TxEnv, TxToSpecified};
+use multiversx_sc::types::{FunctionCall, RHListExec, Tx, TxEnv, TxNoPayment, TxToSpecified};
 
 use crate::scenario_model::{ScQueryStep, TxExpect, TxResponse};
 
 use super::{address_annotated, StepWrapper, TxToQueryStep};
 
-impl<Env, To, RH> TxToQueryStep<Env, RH> for Tx<Env, (), To, (), (), FunctionCall<Env::Api>, RH>
+impl<Env, To, Payment, RH> TxToQueryStep<Env, RH> for Tx<Env, (), To, Payment, (), FunctionCall<Env::Api>, RH>
 where
     Env: TxEnv<RHExpect = TxExpect>,
     To: TxToSpecified<Env>,
+    Payment: TxNoPayment<Env>,
     RH: RHListExec<TxResponse, Env>,
 {
     type Step = ScQueryStep;
diff --git a/framework/snippets/src/interactor_tx/interactor_query_call.rs b/framework/snippets/src/interactor_tx/interactor_query_call.rs
index 55421743c5..9068b906e5 100644
--- a/framework/snippets/src/interactor_tx/interactor_query_call.rs
+++ b/framework/snippets/src/interactor_tx/interactor_query_call.rs
@@ -2,7 +2,7 @@ use multiversx_sc_scenario::{
     api::StaticApi,
     multiversx_sc::{
         tuple_util::NestedTupleFlatten,
-        types::{FunctionCall, RHListExec, Tx, TxBaseWithEnv, TxToSpecified},
+        types::{FunctionCall, RHListExec, Tx, TxBaseWithEnv, TxNoPayment, TxToSpecified},
     },
     scenario::tx_to_step::TxToQueryStep,
     scenario_model::TxResponse,
@@ -13,10 +13,11 @@ use crate::Interactor;
 
 use super::{InteractorPrepareAsync, InteractorQueryEnv, InteractorQueryStep};
 
-impl<'w, To, RH> InteractorPrepareAsync
-    for Tx<InteractorQueryEnv<'w>, (), To, (), (), FunctionCall<StaticApi>, RH>
+impl<'w, To, Payment, RH> InteractorPrepareAsync
+    for Tx<InteractorQueryEnv<'w>, (), To, Payment, (), FunctionCall<StaticApi>, RH>
 where
     To: TxToSpecified<InteractorQueryEnv<'w>>,
+    Payment: TxNoPayment<InteractorQueryEnv<'w>>,
     RH: RHListExec<TxResponse, InteractorQueryEnv<'w>>,
     RH::ListReturns: NestedTupleFlatten,
 {
@@ -45,13 +46,15 @@ where
 }
 
 impl Interactor {
-    pub async fn chain_query<To, RH, F>(&mut self, f: F) -> &mut Self
+    pub async fn chain_query<To, Payment, RH, F>(&mut self, f: F) -> &mut Self
     where
         To: TxToSpecified<ScenarioTxEnvData>,
+        Payment: TxNoPayment<ScenarioTxEnvData>,
         RH: RHListExec<TxResponse, ScenarioTxEnvData, ListReturns = ()>,
         F: FnOnce(
             TxBaseWithEnv<ScenarioTxEnvData>,
-        ) -> Tx<ScenarioTxEnvData, (), To, (), (), FunctionCall<StaticApi>, RH>,
+        )
+            -> Tx<ScenarioTxEnvData, (), To, Payment, (), FunctionCall<StaticApi>, RH>,
     {
         let env = self.new_env_data();
         let tx_base = TxBaseWithEnv::new_with_env(env);

From 5550346b0a4fca9c744c71fdf809c552702843b2 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 9 May 2024 23:11:29 +0300
Subject: [PATCH 0860/1254] re-generated proxies

---
 .../tests/price_aggregator_proxy.rs           |  65 ++++---
 contracts/examples/adder/src/adder_proxy.rs   |  16 +-
 .../src/crowdfunding_esdt_proxy.rs            |  26 ++-
 .../src/kitty_ownership_proxy.rs              |  65 ++++---
 .../src/kitty_genetic_alg_proxy.rs            |   6 +-
 .../src/kitty_ownership_proxy.rs              |  65 ++++---
 .../src/proxy_crypto_zombies.rs               |  56 ++++--
 .../digital-cash/src/digital_cash_proxy.rs    |  34 ++--
 .../examples/multisig/src/multisig_proxy.rs   |  88 ++++++---
 .../src/rewards_distribution_proxy.rs         |  40 ++--
 .../src/seed_nft_minter_proxy.rs              |  28 ++-
 .../feature-tests/abi-tester/src/abi_proxy.rs |  95 +++++----
 .../parent/src/child_proxy.rs                 |   8 +-
 .../forwarder/src/forwarder_proxy.rs          | 182 +++++++++++-------
 .../forwarder/src/vault_proxy.rs              |  47 +++--
 .../promises-features/src/vault_proxy.rs      |  47 +++--
 .../recursive-caller/src/self_proxy.rs        |   6 +-
 .../recursive-caller/src/vault_proxy.rs       |  47 +++--
 .../crowdfunding-erc20/src/erc20_proxy.rs     |  21 +-
 .../erc1155-marketplace/src/erc1155_proxy.rs  |  42 ++--
 .../lottery-erc20/src/erc20_proxy.rs          |  21 +-
 .../panic-message-features/tests/pmf_proxy.rs |  12 +-
 .../src/scenario_tester_proxy.rs              |  12 +-
 23 files changed, 663 insertions(+), 366 deletions(-)

diff --git a/contracts/core/price-aggregator/tests/price_aggregator_proxy.rs b/contracts/core/price-aggregator/tests/price_aggregator_proxy.rs
index ae5e00c94a..e96244d668 100644
--- a/contracts/core/price-aggregator/tests/price_aggregator_proxy.rs
+++ b/contracts/core/price-aggregator/tests/price_aggregator_proxy.rs
@@ -58,8 +58,9 @@ where
         slash_quorum: Arg3,
         submission_count: Arg4,
         oracles: Arg5,
-    ) -> TxProxyDeploy<Env, From, Gas, ()> {
+    ) -> TxTypedDeploy<Env, From, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_deploy()
             .argument(&staking_token)
             .argument(&staking_amount)
@@ -87,8 +88,9 @@ where
         self,
         staking_amount: Arg0,
         slash_amount: Arg1,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("changeAmounts")
             .argument(&staking_amount)
             .argument(&slash_amount)
@@ -100,8 +102,9 @@ where
     >(
         self,
         oracles: Arg0,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("addOracles")
             .argument(&oracles)
             .original_result()
@@ -116,8 +119,9 @@ where
         self,
         submission_count: Arg0,
         oracles: Arg1,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("removeOracles")
             .argument(&submission_count)
             .argument(&oracles)
@@ -137,8 +141,9 @@ where
         submission_timestamp: Arg2,
         price: Arg3,
         decimals: Arg4,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("submit")
             .argument(&from)
             .argument(&to)
@@ -153,8 +158,9 @@ where
     >(
         self,
         submissions: Arg0,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("submitBatch")
             .argument(&submissions)
             .original_result()
@@ -162,8 +168,9 @@ where
 
     pub fn latest_round_data(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, MultiValueEncoded<Env::Api, PriceFeed<Env::Api>>> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, MultiValueEncoded<Env::Api, PriceFeed<Env::Api>>> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("latestRoundData")
             .original_result()
     }
@@ -175,8 +182,9 @@ where
         self,
         from: Arg0,
         to: Arg1,
-    ) -> TxProxyCall<Env, From, To, Gas, MultiValue6<u32, ManagedBuffer<Env::Api>, ManagedBuffer<Env::Api>, u64, BigUint<Env::Api>, u8>> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, MultiValue6<u32, ManagedBuffer<Env::Api>, ManagedBuffer<Env::Api>, u64, BigUint<Env::Api>, u8>> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("latestPriceFeed")
             .argument(&from)
             .argument(&to)
@@ -190,8 +198,9 @@ where
         self,
         from: Arg0,
         to: Arg1,
-    ) -> TxProxyCall<Env, From, To, Gas, OptionalValue<MultiValue6<u32, ManagedBuffer<Env::Api>, ManagedBuffer<Env::Api>, u64, BigUint<Env::Api>, u8>>> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, OptionalValue<MultiValue6<u32, ManagedBuffer<Env::Api>, ManagedBuffer<Env::Api>, u64, BigUint<Env::Api>, u8>>> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("latestPriceFeedOptional")
             .argument(&from)
             .argument(&to)
@@ -203,8 +212,9 @@ where
     >(
         self,
         submission_count: Arg0,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("setSubmissionCount")
             .argument(&submission_count)
             .original_result()
@@ -212,8 +222,9 @@ where
 
     pub fn get_oracles(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, MultiValueEncoded<Env::Api, ManagedAddress<Env::Api>>> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, MultiValueEncoded<Env::Api, ManagedAddress<Env::Api>>> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("getOracles")
             .original_result()
     }
@@ -227,8 +238,9 @@ where
         from: Arg0,
         to: Arg1,
         decimals: Arg2,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("setPairDecimals")
             .argument(&from)
             .argument(&to)
@@ -243,8 +255,9 @@ where
         self,
         from: Arg0,
         to: Arg1,
-    ) -> TxProxyCall<Env, From, To, Gas, u8> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, u8> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("getPairDecimals")
             .argument(&from)
             .argument(&to)
@@ -253,39 +266,43 @@ where
 
     pub fn submission_count(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, usize> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, usize> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("submission_count")
             .original_result()
     }
 
     pub fn pause_endpoint(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("pause")
             .original_result()
     }
 
     pub fn unpause_endpoint(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("unpause")
             .original_result()
     }
 
     pub fn paused_status(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, bool> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, bool> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("isPaused")
             .original_result()
     }
 
     pub fn stake(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
         self.wrapped_tx
             .raw_call("stake")
             .original_result()
@@ -296,8 +313,9 @@ where
     >(
         self,
         unstake_amount: Arg0,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("unstake")
             .argument(&unstake_amount)
             .original_result()
@@ -308,8 +326,9 @@ where
     >(
         self,
         member_to_slash: Arg0,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("voteSlashMember")
             .argument(&member_to_slash)
             .original_result()
@@ -320,8 +339,9 @@ where
     >(
         self,
         member_to_slash: Arg0,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("cancelVoteSlashMember")
             .argument(&member_to_slash)
             .original_result()
@@ -332,8 +352,9 @@ where
     >(
         self,
         member_to_slash: Arg0,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("slashMember")
             .argument(&member_to_slash)
             .original_result()
diff --git a/contracts/examples/adder/src/adder_proxy.rs b/contracts/examples/adder/src/adder_proxy.rs
index 0e9d77d692..fd79b14ac8 100644
--- a/contracts/examples/adder/src/adder_proxy.rs
+++ b/contracts/examples/adder/src/adder_proxy.rs
@@ -48,12 +48,12 @@ where
     >(
         self,
         initial_value: Arg0,
-    ) -> TxProxyDeploy<Env, From, Gas, ()> {
+    ) -> TxTypedDeploy<Env, From, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_deploy()
             .argument(&initial_value)
             .original_result()
-        // non_payable
     }
 }
 
@@ -71,12 +71,12 @@ where
     >(
         self,
         initial_value: Arg0,
-    ) -> TxProxyUpgrade<Env, From, To, Gas, ()> {
+    ) -> TxTypedUpgrade<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_upgrade()
             .argument(&initial_value)
             .original_result()
-        // non_payable
     }
 }
 
@@ -91,11 +91,11 @@ where
 {
     pub fn sum(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, BigUint<Env::Api>> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, BigUint<Env::Api>> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("getSum")
             .original_result()
-        // non_payable
     }
 
     /// Add desired amount to the storage variable. 
@@ -104,11 +104,11 @@ where
     >(
         self,
         value: Arg0,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("add")
             .argument(&value)
             .original_result()
-        // non_payable
     }
 }
diff --git a/contracts/examples/crowdfunding-esdt/src/crowdfunding_esdt_proxy.rs b/contracts/examples/crowdfunding-esdt/src/crowdfunding_esdt_proxy.rs
index a1fe1dddda..aabd42cc08 100644
--- a/contracts/examples/crowdfunding-esdt/src/crowdfunding_esdt_proxy.rs
+++ b/contracts/examples/crowdfunding-esdt/src/crowdfunding_esdt_proxy.rs
@@ -52,8 +52,9 @@ where
         target: Arg0,
         deadline: Arg1,
         token_identifier: Arg2,
-    ) -> TxProxyDeploy<Env, From, Gas, ()> {
+    ) -> TxTypedDeploy<Env, From, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_deploy()
             .argument(&target)
             .argument(&deadline)
@@ -73,7 +74,7 @@ where
 {
     pub fn fund(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
         self.wrapped_tx
             .raw_call("fund")
             .original_result()
@@ -81,40 +82,45 @@ where
 
     pub fn status(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, Status> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, Status> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("status")
             .original_result()
     }
 
     pub fn get_current_funds(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, BigUint<Env::Api>> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, BigUint<Env::Api>> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("getCurrentFunds")
             .original_result()
     }
 
     pub fn claim(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("claim")
             .original_result()
     }
 
     pub fn target(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, BigUint<Env::Api>> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, BigUint<Env::Api>> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("getTarget")
             .original_result()
     }
 
     pub fn deadline(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, u64> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, u64> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("getDeadline")
             .original_result()
     }
@@ -124,8 +130,9 @@ where
     >(
         self,
         donor: Arg0,
-    ) -> TxProxyCall<Env, From, To, Gas, BigUint<Env::Api>> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, BigUint<Env::Api>> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("getDeposit")
             .argument(&donor)
             .original_result()
@@ -133,8 +140,9 @@ where
 
     pub fn cf_token_identifier(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, EgldOrEsdtTokenIdentifier<Env::Api>> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, EgldOrEsdtTokenIdentifier<Env::Api>> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("getCrowdfundingTokenIdentifier")
             .original_result()
     }
diff --git a/contracts/examples/crypto-kitties/kitty-auction/src/kitty_ownership_proxy.rs b/contracts/examples/crypto-kitties/kitty-auction/src/kitty_ownership_proxy.rs
index 87f5bdb4a2..bc9c123f8e 100644
--- a/contracts/examples/crypto-kitties/kitty-auction/src/kitty_ownership_proxy.rs
+++ b/contracts/examples/crypto-kitties/kitty-auction/src/kitty_ownership_proxy.rs
@@ -52,8 +52,9 @@ where
         birth_fee: Arg0,
         opt_gene_science_contract_address: Arg1,
         opt_kitty_auction_contract_address: Arg2,
-    ) -> TxProxyDeploy<Env, From, Gas, ()> {
+    ) -> TxTypedDeploy<Env, From, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_deploy()
             .argument(&birth_fee)
             .argument(&opt_gene_science_contract_address)
@@ -76,8 +77,9 @@ where
     >(
         self,
         address: Arg0,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("setGeneScienceContractAddress")
             .argument(&address)
             .original_result()
@@ -88,8 +90,9 @@ where
     >(
         self,
         address: Arg0,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("setKittyAuctionContractAddress")
             .argument(&address)
             .original_result()
@@ -97,16 +100,18 @@ where
 
     pub fn claim(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("claim")
             .original_result()
     }
 
     pub fn total_supply(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, u32> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, u32> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("totalSupply")
             .original_result()
     }
@@ -116,8 +121,9 @@ where
     >(
         self,
         address: Arg0,
-    ) -> TxProxyCall<Env, From, To, Gas, u32> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, u32> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("balanceOf")
             .argument(&address)
             .original_result()
@@ -128,8 +134,9 @@ where
     >(
         self,
         kitty_id: Arg0,
-    ) -> TxProxyCall<Env, From, To, Gas, ManagedAddress<Env::Api>> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ManagedAddress<Env::Api>> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("ownerOf")
             .argument(&kitty_id)
             .original_result()
@@ -142,8 +149,9 @@ where
         self,
         to: Arg0,
         kitty_id: Arg1,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("approve")
             .argument(&to)
             .argument(&kitty_id)
@@ -157,8 +165,9 @@ where
         self,
         to: Arg0,
         kitty_id: Arg1,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("transfer")
             .argument(&to)
             .argument(&kitty_id)
@@ -174,8 +183,9 @@ where
         from: Arg0,
         to: Arg1,
         kitty_id: Arg2,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("transfer_from")
             .argument(&from)
             .argument(&to)
@@ -188,8 +198,9 @@ where
     >(
         self,
         address: Arg0,
-    ) -> TxProxyCall<Env, From, To, Gas, MultiValueEncoded<Env::Api, u32>> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, MultiValueEncoded<Env::Api, u32>> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("tokensOfOwner")
             .argument(&address)
             .original_result()
@@ -202,8 +213,9 @@ where
         self,
         by: Arg0,
         kitty_id: Arg1,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("allowAuctioning")
             .argument(&by)
             .argument(&kitty_id)
@@ -219,8 +231,9 @@ where
         approved_address: Arg0,
         kitty_owner: Arg1,
         kitty_id: Arg2,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("approveSiringAndReturnKitty")
             .argument(&approved_address)
             .argument(&kitty_owner)
@@ -230,8 +243,9 @@ where
 
     pub fn create_gen_zero_kitty(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, u32> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, u32> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("createGenZeroKitty")
             .original_result()
     }
@@ -241,8 +255,9 @@ where
     >(
         self,
         kitty_id: Arg0,
-    ) -> TxProxyCall<Env, From, To, Gas, kitty::Kitty> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, kitty::Kitty> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("getKittyById")
             .argument(&kitty_id)
             .original_result()
@@ -253,8 +268,9 @@ where
     >(
         self,
         kitty_id: Arg0,
-    ) -> TxProxyCall<Env, From, To, Gas, bool> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, bool> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("isReadyToBreed")
             .argument(&kitty_id)
             .original_result()
@@ -265,8 +281,9 @@ where
     >(
         self,
         kitty_id: Arg0,
-    ) -> TxProxyCall<Env, From, To, Gas, bool> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, bool> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("isPregnant")
             .argument(&kitty_id)
             .original_result()
@@ -279,8 +296,9 @@ where
         self,
         matron_id: Arg0,
         sire_id: Arg1,
-    ) -> TxProxyCall<Env, From, To, Gas, bool> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, bool> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("canBreedWith")
             .argument(&matron_id)
             .argument(&sire_id)
@@ -294,8 +312,9 @@ where
         self,
         address: Arg0,
         kitty_id: Arg1,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("approveSiring")
             .argument(&address)
             .argument(&kitty_id)
@@ -309,7 +328,7 @@ where
         self,
         matron_id: Arg0,
         sire_id: Arg1,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
         self.wrapped_tx
             .raw_call("breedWith")
             .argument(&matron_id)
@@ -322,8 +341,9 @@ where
     >(
         self,
         matron_id: Arg0,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("giveBirth")
             .argument(&matron_id)
             .original_result()
@@ -331,8 +351,9 @@ where
 
     pub fn birth_fee(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, BigUint<Env::Api>> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, BigUint<Env::Api>> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("birthFee")
             .original_result()
     }
diff --git a/contracts/examples/crypto-kitties/kitty-ownership/src/kitty_genetic_alg_proxy.rs b/contracts/examples/crypto-kitties/kitty-ownership/src/kitty_genetic_alg_proxy.rs
index 1acee7fe43..2388d92f1b 100644
--- a/contracts/examples/crypto-kitties/kitty-ownership/src/kitty_genetic_alg_proxy.rs
+++ b/contracts/examples/crypto-kitties/kitty-ownership/src/kitty_genetic_alg_proxy.rs
@@ -45,8 +45,9 @@ where
 {
     pub fn init(
         self,
-    ) -> TxProxyDeploy<Env, From, Gas, ()> {
+    ) -> TxTypedDeploy<Env, From, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_deploy()
             .original_result()
     }
@@ -68,8 +69,9 @@ where
         self,
         matron: Arg0,
         sire: Arg1,
-    ) -> TxProxyCall<Env, From, To, Gas, kitty::KittyGenes> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, kitty::KittyGenes> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("generateKittyGenes")
             .argument(&matron)
             .argument(&sire)
diff --git a/contracts/examples/crypto-zombies/src/kitty_ownership_proxy.rs b/contracts/examples/crypto-zombies/src/kitty_ownership_proxy.rs
index 595c1612c7..3673b97ea5 100644
--- a/contracts/examples/crypto-zombies/src/kitty_ownership_proxy.rs
+++ b/contracts/examples/crypto-zombies/src/kitty_ownership_proxy.rs
@@ -52,8 +52,9 @@ where
         birth_fee: Arg0,
         opt_gene_science_contract_address: Arg1,
         opt_kitty_auction_contract_address: Arg2,
-    ) -> TxProxyDeploy<Env, From, Gas, ()> {
+    ) -> TxTypedDeploy<Env, From, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_deploy()
             .argument(&birth_fee)
             .argument(&opt_gene_science_contract_address)
@@ -76,8 +77,9 @@ where
     >(
         self,
         address: Arg0,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("setGeneScienceContractAddress")
             .argument(&address)
             .original_result()
@@ -88,8 +90,9 @@ where
     >(
         self,
         address: Arg0,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("setKittyAuctionContractAddress")
             .argument(&address)
             .original_result()
@@ -97,16 +100,18 @@ where
 
     pub fn claim(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("claim")
             .original_result()
     }
 
     pub fn total_supply(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, u32> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, u32> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("totalSupply")
             .original_result()
     }
@@ -116,8 +121,9 @@ where
     >(
         self,
         address: Arg0,
-    ) -> TxProxyCall<Env, From, To, Gas, u32> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, u32> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("balanceOf")
             .argument(&address)
             .original_result()
@@ -128,8 +134,9 @@ where
     >(
         self,
         kitty_id: Arg0,
-    ) -> TxProxyCall<Env, From, To, Gas, ManagedAddress<Env::Api>> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ManagedAddress<Env::Api>> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("ownerOf")
             .argument(&kitty_id)
             .original_result()
@@ -142,8 +149,9 @@ where
         self,
         to: Arg0,
         kitty_id: Arg1,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("approve")
             .argument(&to)
             .argument(&kitty_id)
@@ -157,8 +165,9 @@ where
         self,
         to: Arg0,
         kitty_id: Arg1,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("transfer")
             .argument(&to)
             .argument(&kitty_id)
@@ -174,8 +183,9 @@ where
         from: Arg0,
         to: Arg1,
         kitty_id: Arg2,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("transfer_from")
             .argument(&from)
             .argument(&to)
@@ -188,8 +198,9 @@ where
     >(
         self,
         address: Arg0,
-    ) -> TxProxyCall<Env, From, To, Gas, MultiValueEncoded<Env::Api, u32>> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, MultiValueEncoded<Env::Api, u32>> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("tokensOfOwner")
             .argument(&address)
             .original_result()
@@ -202,8 +213,9 @@ where
         self,
         by: Arg0,
         kitty_id: Arg1,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("allowAuctioning")
             .argument(&by)
             .argument(&kitty_id)
@@ -219,8 +231,9 @@ where
         approved_address: Arg0,
         kitty_owner: Arg1,
         kitty_id: Arg2,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("approveSiringAndReturnKitty")
             .argument(&approved_address)
             .argument(&kitty_owner)
@@ -230,8 +243,9 @@ where
 
     pub fn create_gen_zero_kitty(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, u32> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, u32> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("createGenZeroKitty")
             .original_result()
     }
@@ -241,8 +255,9 @@ where
     >(
         self,
         kitty_id: Arg0,
-    ) -> TxProxyCall<Env, From, To, Gas, crate::kitty_obj::Kitty> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, crate::kitty_obj::Kitty> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("getKittyById")
             .argument(&kitty_id)
             .original_result()
@@ -253,8 +268,9 @@ where
     >(
         self,
         kitty_id: Arg0,
-    ) -> TxProxyCall<Env, From, To, Gas, bool> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, bool> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("isReadyToBreed")
             .argument(&kitty_id)
             .original_result()
@@ -265,8 +281,9 @@ where
     >(
         self,
         kitty_id: Arg0,
-    ) -> TxProxyCall<Env, From, To, Gas, bool> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, bool> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("isPregnant")
             .argument(&kitty_id)
             .original_result()
@@ -279,8 +296,9 @@ where
         self,
         matron_id: Arg0,
         sire_id: Arg1,
-    ) -> TxProxyCall<Env, From, To, Gas, bool> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, bool> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("canBreedWith")
             .argument(&matron_id)
             .argument(&sire_id)
@@ -294,8 +312,9 @@ where
         self,
         address: Arg0,
         kitty_id: Arg1,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("approveSiring")
             .argument(&address)
             .argument(&kitty_id)
@@ -309,7 +328,7 @@ where
         self,
         matron_id: Arg0,
         sire_id: Arg1,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
         self.wrapped_tx
             .raw_call("breedWith")
             .argument(&matron_id)
@@ -322,8 +341,9 @@ where
     >(
         self,
         matron_id: Arg0,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("giveBirth")
             .argument(&matron_id)
             .original_result()
@@ -331,8 +351,9 @@ where
 
     pub fn birth_fee(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, BigUint<Env::Api>> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, BigUint<Env::Api>> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("birthFee")
             .original_result()
     }
diff --git a/contracts/examples/crypto-zombies/src/proxy_crypto_zombies.rs b/contracts/examples/crypto-zombies/src/proxy_crypto_zombies.rs
index 1e056fee19..561563132c 100644
--- a/contracts/examples/crypto-zombies/src/proxy_crypto_zombies.rs
+++ b/contracts/examples/crypto-zombies/src/proxy_crypto_zombies.rs
@@ -45,8 +45,9 @@ where
 {
     pub fn init(
         self,
-    ) -> TxProxyDeploy<Env, From, Gas, ()> {
+    ) -> TxTypedDeploy<Env, From, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_deploy()
             .original_result()
     }
@@ -63,8 +64,9 @@ where
 {
     pub fn upgrade(
         self,
-    ) -> TxProxyUpgrade<Env, From, To, Gas, ()> {
+    ) -> TxTypedUpgrade<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_upgrade()
             .original_result()
     }
@@ -84,8 +86,9 @@ where
     >(
         self,
         address: Arg0,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("set_crypto_kitties_sc_address")
             .argument(&address)
             .original_result()
@@ -93,8 +96,9 @@ where
 
     pub fn generate_random_dna(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, u64> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, u64> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("generate_random_dna")
             .original_result()
     }
@@ -104,8 +108,9 @@ where
     >(
         self,
         name: Arg0,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("create_random_zombie")
             .argument(&name)
             .original_result()
@@ -116,8 +121,9 @@ where
     >(
         self,
         zombie_id: Arg0,
-    ) -> TxProxyCall<Env, From, To, Gas, bool> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, bool> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("is_ready")
             .argument(&zombie_id)
             .original_result()
@@ -130,8 +136,9 @@ where
         self,
         zombie_id: Arg0,
         kitty_id: Arg1,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("feed_on_kitty")
             .argument(&zombie_id)
             .argument(&kitty_id)
@@ -140,16 +147,18 @@ where
 
     pub fn dna_digits(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, u8> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, u8> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("dna_digits")
             .original_result()
     }
 
     pub fn zombies_count(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, usize> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, usize> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("zombies_count")
             .original_result()
     }
@@ -159,8 +168,9 @@ where
     >(
         self,
         id: Arg0,
-    ) -> TxProxyCall<Env, From, To, Gas, Zombie<Env::Api>> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, Zombie<Env::Api>> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("zombies")
             .argument(&id)
             .original_result()
@@ -171,8 +181,9 @@ where
     >(
         self,
         id: Arg0,
-    ) -> TxProxyCall<Env, From, To, Gas, ManagedAddress<Env::Api>> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ManagedAddress<Env::Api>> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("zombie_owner")
             .argument(&id)
             .original_result()
@@ -180,16 +191,18 @@ where
 
     pub fn crypto_kitties_sc_address(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, ManagedAddress<Env::Api>> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ManagedAddress<Env::Api>> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("crypto_kitties_sc_address")
             .original_result()
     }
 
     pub fn cooldown_time(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, u64> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, u64> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("cooldown_time")
             .original_result()
     }
@@ -199,8 +212,9 @@ where
     >(
         self,
         owner: Arg0,
-    ) -> TxProxyCall<Env, From, To, Gas, MultiValueEncoded<Env::Api, usize>> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, MultiValueEncoded<Env::Api, usize>> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("owned_zombies")
             .argument(&owner)
             .original_result()
@@ -211,7 +225,7 @@ where
     >(
         self,
         zombie_id: Arg0,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
         self.wrapped_tx
             .raw_call("level_up")
             .argument(&zombie_id)
@@ -220,8 +234,9 @@ where
 
     pub fn withdraw(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("withdraw")
             .original_result()
     }
@@ -233,8 +248,9 @@ where
         self,
         zombie_id: Arg0,
         name: Arg1,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("change_name")
             .argument(&zombie_id)
             .argument(&name)
@@ -248,8 +264,9 @@ where
         self,
         zombie_id: Arg0,
         dna: Arg1,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("change_dna")
             .argument(&zombie_id)
             .argument(&dna)
@@ -263,8 +280,9 @@ where
         self,
         zombie_id: Arg0,
         target_id: Arg1,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("attack")
             .argument(&zombie_id)
             .argument(&target_id)
diff --git a/contracts/examples/digital-cash/src/digital_cash_proxy.rs b/contracts/examples/digital-cash/src/digital_cash_proxy.rs
index 85e7dc06ae..e2893794b9 100644
--- a/contracts/examples/digital-cash/src/digital_cash_proxy.rs
+++ b/contracts/examples/digital-cash/src/digital_cash_proxy.rs
@@ -50,8 +50,9 @@ where
         self,
         fee: Arg0,
         token: Arg1,
-    ) -> TxProxyDeploy<Env, From, Gas, ()> {
+    ) -> TxTypedDeploy<Env, From, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_deploy()
             .argument(&fee)
             .argument(&token)
@@ -75,8 +76,9 @@ where
         self,
         fee: Arg0,
         token: Arg1,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("whitelistFeeToken")
             .argument(&fee)
             .argument(&token)
@@ -88,8 +90,9 @@ where
     >(
         self,
         token: Arg0,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("blacklistFeeToken")
             .argument(&token)
             .original_result()
@@ -97,8 +100,9 @@ where
 
     pub fn claim_fees(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("claimFees")
             .original_result()
     }
@@ -112,8 +116,9 @@ where
         address: Arg0,
         token: Arg1,
         nonce: Arg2,
-    ) -> TxProxyCall<Env, From, To, Gas, BigUint<Env::Api>> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, BigUint<Env::Api>> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("getAmount")
             .argument(&address)
             .argument(&token)
@@ -128,7 +133,7 @@ where
         self,
         address: Arg0,
         valability: Arg1,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
         self.wrapped_tx
             .raw_call("payFeeAndFundESDT")
             .argument(&address)
@@ -143,7 +148,7 @@ where
         self,
         address: Arg0,
         valability: Arg1,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
         self.wrapped_tx
             .raw_call("payFeeAndFundEGLD")
             .argument(&address)
@@ -158,7 +163,7 @@ where
         self,
         address: Arg0,
         valability: Arg1,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
         self.wrapped_tx
             .raw_call("fund")
             .argument(&address)
@@ -171,7 +176,7 @@ where
     >(
         self,
         address: Arg0,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
         self.wrapped_tx
             .raw_call("depositFees")
             .argument(&address)
@@ -183,8 +188,9 @@ where
     >(
         self,
         address: Arg0,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("withdraw")
             .argument(&address)
             .original_result()
@@ -197,8 +203,9 @@ where
         self,
         address: Arg0,
         signature: Arg1,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("claim")
             .argument(&address)
             .argument(&signature)
@@ -214,7 +221,7 @@ where
         address: Arg0,
         forward_address: Arg1,
         signature: Arg2,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
         self.wrapped_tx
             .raw_call("forward")
             .argument(&address)
@@ -228,8 +235,9 @@ where
     >(
         self,
         donor: Arg0,
-    ) -> TxProxyCall<Env, From, To, Gas, DepositInfo<Env::Api>> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, DepositInfo<Env::Api>> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("deposit")
             .argument(&donor)
             .original_result()
diff --git a/contracts/examples/multisig/src/multisig_proxy.rs b/contracts/examples/multisig/src/multisig_proxy.rs
index 6f789f298a..d3a3e32e0e 100644
--- a/contracts/examples/multisig/src/multisig_proxy.rs
+++ b/contracts/examples/multisig/src/multisig_proxy.rs
@@ -50,8 +50,9 @@ where
         self,
         quorum: Arg0,
         board: Arg1,
-    ) -> TxProxyDeploy<Env, From, Gas, ()> {
+    ) -> TxTypedDeploy<Env, From, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_deploy()
             .argument(&quorum)
             .argument(&board)
@@ -75,8 +76,9 @@ where
         self,
         quorum: Arg0,
         board: Arg1,
-    ) -> TxProxyUpgrade<Env, From, To, Gas, ()> {
+    ) -> TxTypedUpgrade<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_upgrade()
             .argument(&quorum)
             .argument(&board)
@@ -96,7 +98,7 @@ where
     /// Allows the contract to receive funds even if it is marked as unpayable in the protocol. 
     pub fn deposit(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
         self.wrapped_tx
             .raw_call("deposit")
             .original_result()
@@ -109,8 +111,9 @@ where
     /// - (number of signers followed by) list of signer addresses. 
     pub fn get_pending_action_full_info(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, MultiValueEncoded<Env::Api, ActionFullInfo<Env::Api>>> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, MultiValueEncoded<Env::Api, ActionFullInfo<Env::Api>>> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("getPendingActionFullInfo")
             .original_result()
     }
@@ -124,8 +127,9 @@ where
         self,
         user: Arg0,
         action_id: Arg1,
-    ) -> TxProxyCall<Env, From, To, Gas, bool> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, bool> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("signed")
             .argument(&user)
             .argument(&action_id)
@@ -141,8 +145,9 @@ where
     >(
         self,
         user: Arg0,
-    ) -> TxProxyCall<Env, From, To, Gas, UserRole> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, UserRole> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("userRole")
             .argument(&user)
             .original_result()
@@ -151,8 +156,9 @@ where
     /// Lists all users that can sign actions. 
     pub fn get_all_board_members(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, MultiValueEncoded<Env::Api, ManagedAddress<Env::Api>>> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, MultiValueEncoded<Env::Api, ManagedAddress<Env::Api>>> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("getAllBoardMembers")
             .original_result()
     }
@@ -160,8 +166,9 @@ where
     /// Lists all proposers that are not board members. 
     pub fn get_all_proposers(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, MultiValueEncoded<Env::Api, ManagedAddress<Env::Api>>> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, MultiValueEncoded<Env::Api, ManagedAddress<Env::Api>>> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("getAllProposers")
             .original_result()
     }
@@ -172,8 +179,9 @@ where
     >(
         self,
         action_id: Arg0,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("sign")
             .argument(&action_id)
             .original_result()
@@ -186,8 +194,9 @@ where
     >(
         self,
         action_id: Arg0,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("unsign")
             .argument(&action_id)
             .original_result()
@@ -201,8 +210,9 @@ where
     >(
         self,
         action_id: Arg0,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("discardAction")
             .argument(&action_id)
             .original_result()
@@ -211,8 +221,9 @@ where
     /// Minimum number of signatures needed to perform any action. 
     pub fn quorum(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, usize> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, usize> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("getQuorum")
             .original_result()
     }
@@ -221,8 +232,9 @@ where
     /// It is kept in sync with the user list by the contract. 
     pub fn num_board_members(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, usize> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, usize> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("getNumBoardMembers")
             .original_result()
     }
@@ -231,8 +243,9 @@ where
     /// It is kept in sync with the user list by the contract. 
     pub fn num_proposers(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, usize> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, usize> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("getNumProposers")
             .original_result()
     }
@@ -241,8 +254,9 @@ where
     /// 0 means that no action was ever proposed yet. 
     pub fn get_action_last_index(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, usize> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, usize> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("getActionLastIndex")
             .original_result()
     }
@@ -253,8 +267,9 @@ where
     >(
         self,
         action_id: Arg0,
-    ) -> TxProxyCall<Env, From, To, Gas, Action<Env::Api>> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, Action<Env::Api>> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("getActionData")
             .argument(&action_id)
             .original_result()
@@ -268,8 +283,9 @@ where
     >(
         self,
         action_id: Arg0,
-    ) -> TxProxyCall<Env, From, To, Gas, ManagedVec<Env::Api, ManagedAddress<Env::Api>>> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ManagedVec<Env::Api, ManagedAddress<Env::Api>>> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("getActionSigners")
             .argument(&action_id)
             .original_result()
@@ -282,8 +298,9 @@ where
     >(
         self,
         action_id: Arg0,
-    ) -> TxProxyCall<Env, From, To, Gas, usize> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, usize> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("getActionSignerCount")
             .argument(&action_id)
             .original_result()
@@ -299,8 +316,9 @@ where
     >(
         self,
         action_id: Arg0,
-    ) -> TxProxyCall<Env, From, To, Gas, usize> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, usize> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("getActionValidSignerCount")
             .argument(&action_id)
             .original_result()
@@ -313,8 +331,9 @@ where
     >(
         self,
         board_member_address: Arg0,
-    ) -> TxProxyCall<Env, From, To, Gas, usize> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, usize> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("proposeAddBoardMember")
             .argument(&board_member_address)
             .original_result()
@@ -327,8 +346,9 @@ where
     >(
         self,
         proposer_address: Arg0,
-    ) -> TxProxyCall<Env, From, To, Gas, usize> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, usize> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("proposeAddProposer")
             .argument(&proposer_address)
             .original_result()
@@ -340,8 +360,9 @@ where
     >(
         self,
         user_address: Arg0,
-    ) -> TxProxyCall<Env, From, To, Gas, usize> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, usize> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("proposeRemoveUser")
             .argument(&user_address)
             .original_result()
@@ -352,8 +373,9 @@ where
     >(
         self,
         new_quorum: Arg0,
-    ) -> TxProxyCall<Env, From, To, Gas, usize> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, usize> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("proposeChangeQuorum")
             .argument(&new_quorum)
             .original_result()
@@ -372,8 +394,9 @@ where
         to: Arg0,
         egld_amount: Arg1,
         function_call: Arg2,
-    ) -> TxProxyCall<Env, From, To, Gas, usize> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, usize> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("proposeTransferExecute")
             .argument(&to)
             .argument(&egld_amount)
@@ -395,8 +418,9 @@ where
         to: Arg0,
         egld_amount: Arg1,
         function_call: Arg2,
-    ) -> TxProxyCall<Env, From, To, Gas, usize> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, usize> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("proposeAsyncCall")
             .argument(&to)
             .argument(&egld_amount)
@@ -415,8 +439,9 @@ where
         source: Arg1,
         code_metadata: Arg2,
         arguments: Arg3,
-    ) -> TxProxyCall<Env, From, To, Gas, usize> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, usize> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("proposeSCDeployFromSource")
             .argument(&amount)
             .argument(&source)
@@ -438,8 +463,9 @@ where
         source: Arg2,
         code_metadata: Arg3,
         arguments: Arg4,
-    ) -> TxProxyCall<Env, From, To, Gas, usize> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, usize> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("proposeSCUpgradeFromSource")
             .argument(&sc_address)
             .argument(&amount)
@@ -455,8 +481,9 @@ where
     >(
         self,
         action_id: Arg0,
-    ) -> TxProxyCall<Env, From, To, Gas, bool> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, bool> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("quorumReached")
             .argument(&action_id)
             .original_result()
@@ -468,8 +495,9 @@ where
     >(
         self,
         action_id: Arg0,
-    ) -> TxProxyCall<Env, From, To, Gas, OptionalValue<ManagedAddress<Env::Api>>> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, OptionalValue<ManagedAddress<Env::Api>>> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("performAction")
             .argument(&action_id)
             .original_result()
@@ -482,7 +510,7 @@ where
         self,
         dns_address: Arg0,
         name: Arg1,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
         self.wrapped_tx
             .raw_call("dnsRegister")
             .argument(&dns_address)
diff --git a/contracts/examples/rewards-distribution/src/rewards_distribution_proxy.rs b/contracts/examples/rewards-distribution/src/rewards_distribution_proxy.rs
index 83ec15b473..68ddd7800f 100644
--- a/contracts/examples/rewards-distribution/src/rewards_distribution_proxy.rs
+++ b/contracts/examples/rewards-distribution/src/rewards_distribution_proxy.rs
@@ -50,8 +50,9 @@ where
         self,
         seed_nft_minter_address: Arg0,
         brackets: Arg1,
-    ) -> TxProxyDeploy<Env, From, Gas, ()> {
+    ) -> TxTypedDeploy<Env, From, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_deploy()
             .argument(&seed_nft_minter_address)
             .argument(&brackets)
@@ -70,7 +71,7 @@ where
 {
     pub fn deposit_royalties(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
         self.wrapped_tx
             .raw_call("depositRoyalties")
             .original_result()
@@ -78,8 +79,9 @@ where
 
     pub fn raffle(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, OperationCompletionStatus> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, OperationCompletionStatus> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("raffle")
             .original_result()
     }
@@ -93,7 +95,7 @@ where
         raffle_id_start: Arg0,
         raffle_id_end: Arg1,
         reward_tokens: Arg2,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
         self.wrapped_tx
             .raw_call("claimRewards")
             .argument(&raffle_id_start)
@@ -113,8 +115,9 @@ where
         reward_token_id: Arg1,
         reward_token_nonce: Arg2,
         nft_nonce: Arg3,
-    ) -> TxProxyCall<Env, From, To, Gas, BigUint<Env::Api>> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, BigUint<Env::Api>> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("computeClaimableAmount")
             .argument(&raffle_id)
             .argument(&reward_token_id)
@@ -125,16 +128,18 @@ where
 
     pub fn raffle_id(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, u64> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, u64> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("getRaffleId")
             .original_result()
     }
 
     pub fn completed_raffle_id_count(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, u64> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, u64> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("getCompletedRaffleIdCount")
             .original_result()
     }
@@ -148,8 +153,9 @@ where
         raffle_id: Arg0,
         reward_token_id: Arg1,
         reward_token_nonce: Arg2,
-    ) -> TxProxyCall<Env, From, To, Gas, BigUint<Env::Api>> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, BigUint<Env::Api>> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("getRoyalties")
             .argument(&raffle_id)
             .argument(&reward_token_id)
@@ -164,8 +170,9 @@ where
         self,
         raffle_id: Arg0,
         nft_nonce: Arg1,
-    ) -> TxProxyCall<Env, From, To, Gas, BigUint<Env::Api>> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, BigUint<Env::Api>> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("getNftRewardPercent")
             .argument(&raffle_id)
             .argument(&nft_nonce)
@@ -183,8 +190,9 @@ where
         reward_token_id: Arg1,
         reward_token_nonce: Arg2,
         nft_nonce: Arg3,
-    ) -> TxProxyCall<Env, From, To, Gas, bool> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, bool> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("getWasClaimed")
             .argument(&raffle_id)
             .argument(&reward_token_id)
@@ -195,32 +203,36 @@ where
 
     pub fn seed_nft_minter_address(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, ManagedAddress<Env::Api>> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ManagedAddress<Env::Api>> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("getSeedNftMinterAddress")
             .original_result()
     }
 
     pub fn brackets(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, ManagedVec<Env::Api, Bracket>> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ManagedVec<Env::Api, Bracket>> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("getBrackets")
             .original_result()
     }
 
     pub fn last_raffle_epoch(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, u64> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, u64> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("getLastRaffleEpoch")
             .original_result()
     }
 
     pub fn nft_token_id(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, TokenIdentifier<Env::Api>> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, TokenIdentifier<Env::Api>> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("getNftTokenId")
             .original_result()
     }
diff --git a/contracts/examples/rewards-distribution/src/seed_nft_minter_proxy.rs b/contracts/examples/rewards-distribution/src/seed_nft_minter_proxy.rs
index 84349daae7..e25ef3fa44 100644
--- a/contracts/examples/rewards-distribution/src/seed_nft_minter_proxy.rs
+++ b/contracts/examples/rewards-distribution/src/seed_nft_minter_proxy.rs
@@ -50,8 +50,9 @@ where
         self,
         marketplaces: Arg0,
         distribution: Arg1,
-    ) -> TxProxyDeploy<Env, From, Gas, ()> {
+    ) -> TxTypedDeploy<Env, From, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_deploy()
             .argument(&marketplaces)
             .argument(&distribution)
@@ -83,8 +84,9 @@ where
         selling_price: Arg3,
         opt_token_used_as_payment: Arg4,
         opt_token_used_as_payment_nonce: Arg5,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("createNft")
             .argument(&name)
             .argument(&royalties)
@@ -102,8 +104,9 @@ where
         self,
         token_id: Arg0,
         token_nonce: Arg1,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("claimAndDistribute")
             .argument(&token_id)
             .argument(&token_nonce)
@@ -112,24 +115,27 @@ where
 
     pub fn marketplaces(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, MultiValueEncoded<Env::Api, ManagedAddress<Env::Api>>> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, MultiValueEncoded<Env::Api, ManagedAddress<Env::Api>>> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("getMarketplaces")
             .original_result()
     }
 
     pub fn nft_count(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, u64> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, u64> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("getNftCount")
             .original_result()
     }
 
     pub fn distribution_rules(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, ManagedVec<Env::Api, Distribution<Env::Api>>> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ManagedVec<Env::Api, Distribution<Env::Api>>> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("getDistributionRules")
             .original_result()
     }
@@ -141,7 +147,7 @@ where
         self,
         token_display_name: Arg0,
         token_ticker: Arg1,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
         self.wrapped_tx
             .raw_call("issueToken")
             .argument(&token_display_name)
@@ -154,7 +160,7 @@ where
     >(
         self,
         nft_nonce: Arg0,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
         self.wrapped_tx
             .raw_call("buyNft")
             .argument(&nft_nonce)
@@ -166,8 +172,9 @@ where
     >(
         self,
         nft_nonce: Arg0,
-    ) -> TxProxyCall<Env, From, To, Gas, OptionalValue<MultiValue3<EgldOrEsdtTokenIdentifier<Env::Api>, u64, BigUint<Env::Api>>>> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, OptionalValue<MultiValue3<EgldOrEsdtTokenIdentifier<Env::Api>, u64, BigUint<Env::Api>>>> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("getNftPrice")
             .argument(&nft_nonce)
             .original_result()
@@ -175,8 +182,9 @@ where
 
     pub fn nft_token_id(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, TokenIdentifier<Env::Api>> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, TokenIdentifier<Env::Api>> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("getNftTokenId")
             .original_result()
     }
diff --git a/contracts/feature-tests/abi-tester/src/abi_proxy.rs b/contracts/feature-tests/abi-tester/src/abi_proxy.rs
index f02412c39d..55f3a6e6ef 100644
--- a/contracts/feature-tests/abi-tester/src/abi_proxy.rs
+++ b/contracts/feature-tests/abi-tester/src/abi_proxy.rs
@@ -51,7 +51,7 @@ where
         self,
         _constructor_arg_1: Arg0,
         _constructor_arg_2: Arg1,
-    ) -> TxProxyDeploy<Env, From, Gas, ()> {
+    ) -> TxTypedDeploy<Env, From, (), Gas, ()> {
         self.wrapped_tx
             .raw_deploy()
             .argument(&_constructor_arg_1)
@@ -77,8 +77,9 @@ where
         self,
         _constructor_arg_1: Arg0,
         _constructor_arg_2: Arg1,
-    ) -> TxProxyUpgrade<Env, From, To, Gas, ()> {
+    ) -> TxTypedUpgrade<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_upgrade()
             .argument(&_constructor_arg_1)
             .argument(&_constructor_arg_2)
@@ -101,8 +102,9 @@ where
     >(
         self,
         att: Arg0,
-    ) -> TxProxyCall<Env, From, To, Gas, AbiTestType> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, AbiTestType> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("echo_abi_test_type")
             .argument(&att)
             .original_result()
@@ -113,8 +115,9 @@ where
     >(
         self,
         e: Arg0,
-    ) -> TxProxyCall<Env, From, To, Gas, AbiEnum> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, AbiEnum> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("echo_enum")
             .argument(&e)
             .original_result()
@@ -125,8 +128,9 @@ where
     >(
         self,
         _arg: Arg0,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("take_managed_type")
             .argument(&_arg)
             .original_result()
@@ -134,16 +138,18 @@ where
 
     pub fn multi_result_3(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, MultiValue3<i32, [u8; 3], BoxedBytes>> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, MultiValue3<i32, [u8; 3], BoxedBytes>> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("multi_result_3")
             .original_result()
     }
 
     pub fn multi_result_4(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, MultiValue4<i32, [u8; 3], BoxedBytes, OnlyShowsUpAsNested03>> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, MultiValue4<i32, [u8; 3], BoxedBytes, OnlyShowsUpAsNested03>> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("multi_result_4")
             .original_result()
     }
@@ -155,8 +161,9 @@ where
         self,
         _simple_arg: Arg0,
         _var_args: Arg1,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("var_args")
             .argument(&_simple_arg)
             .argument(&_var_args)
@@ -165,8 +172,9 @@ where
 
     pub fn multi_result_vec(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, MultiValueVec<MultiValue3<OnlyShowsUpAsNested05, bool, ()>>> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, MultiValueVec<MultiValue3<OnlyShowsUpAsNested05, bool, ()>>> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("multi_result_vec")
             .original_result()
     }
@@ -178,8 +186,9 @@ where
         self,
         _simple_arg: Arg0,
         _opt_args: Arg1,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("optional_arg")
             .argument(&_simple_arg)
             .argument(&_opt_args)
@@ -188,8 +197,9 @@ where
 
     pub fn optional_result(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, OptionalValue<OnlyShowsUpAsNested07>> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, OptionalValue<OnlyShowsUpAsNested07>> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("optional_result")
             .original_result()
     }
@@ -201,8 +211,9 @@ where
         self,
         address: Arg0,
         h256: Arg1,
-    ) -> TxProxyCall<Env, From, To, Gas, MultiValue2<Address, H256>> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, MultiValue2<Address, H256>> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("address_vs_h256")
             .argument(&address)
             .argument(&h256)
@@ -216,8 +227,9 @@ where
         self,
         address: Arg0,
         byte_array: Arg1,
-    ) -> TxProxyCall<Env, From, To, Gas, MultiValue2<ManagedAddress<Env::Api>, ManagedByteArray<Env::Api, 32usize>>> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, MultiValue2<ManagedAddress<Env::Api>, ManagedByteArray<Env::Api, 32usize>>> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("managed_address_vs_byte_array")
             .argument(&address)
             .argument(&byte_array)
@@ -226,56 +238,63 @@ where
 
     pub fn esdt_local_role(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, EsdtLocalRole> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, EsdtLocalRole> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("esdt_local_role")
             .original_result()
     }
 
     pub fn esdt_token_payment(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, EsdtTokenPayment<Env::Api>> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, EsdtTokenPayment<Env::Api>> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("esdt_token_payment")
             .original_result()
     }
 
     pub fn esdt_token_data(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, EsdtTokenData<Env::Api>> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, EsdtTokenData<Env::Api>> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("esdt_token_data")
             .original_result()
     }
 
     pub fn sample_storage_mapper(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, OnlyShowsUpAsNestedInSingleValueMapper> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, OnlyShowsUpAsNestedInSingleValueMapper> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("sample_storage_mapper")
             .original_result()
     }
 
     pub fn item_for_vec(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, Vec<OnlyShowsUpAsNestedInVec>> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, Vec<OnlyShowsUpAsNestedInVec>> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("item_for_vec")
             .original_result()
     }
 
     pub fn item_for_array_vec(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, ArrayVec<OnlyShowsUpAsNestedInArrayVec, 3usize>> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ArrayVec<OnlyShowsUpAsNestedInArrayVec, 3usize>> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("item_for_array_vec")
             .original_result()
     }
 
     pub fn item_for_managed_vec(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, ManagedVec<Env::Api, AbiManagedVecItem>> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ManagedVec<Env::Api, AbiManagedVecItem>> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("item_for_managed_vec")
             .original_result()
     }
@@ -285,8 +304,9 @@ where
     >(
         self,
         _array: Arg0,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("item_for_array")
             .argument(&_array)
             .original_result()
@@ -294,16 +314,18 @@ where
 
     pub fn item_for_box(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, Box<OnlyShowsUpAsNestedInBox>> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, Box<OnlyShowsUpAsNestedInBox>> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("item_for_box")
             .original_result()
     }
 
     pub fn item_for_boxed_slice(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, Box<[OnlyShowsUpAsNestedInBoxedSlice]>> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, Box<[OnlyShowsUpAsNestedInBoxedSlice]>> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("item_for_boxed_slice")
             .original_result()
     }
@@ -313,8 +335,9 @@ where
     >(
         self,
         _ref: Arg0,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("item_for_ref")
             .argument(&_ref)
             .original_result()
@@ -325,8 +348,9 @@ where
     >(
         self,
         _ref: Arg0,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("item_for_slice")
             .argument(&_ref)
             .original_result()
@@ -334,23 +358,25 @@ where
 
     pub fn item_for_option(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, Option<OnlyShowsUpAsNestedInOption>> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, Option<OnlyShowsUpAsNestedInOption>> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("item_for_option")
             .original_result()
     }
 
     pub fn operation_completion_status(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, OperationCompletionStatus> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, OperationCompletionStatus> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("operation_completion_status")
             .original_result()
     }
 
     pub fn payable_egld(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
         self.wrapped_tx
             .raw_call("payable_egld")
             .original_result()
@@ -358,7 +384,7 @@ where
 
     pub fn payable_some_token(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
         self.wrapped_tx
             .raw_call("payable_some_token")
             .original_result()
@@ -366,7 +392,7 @@ where
 
     pub fn payable_any_token(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
         self.wrapped_tx
             .raw_call("payable_any_token")
             .original_result()
@@ -374,24 +400,27 @@ where
 
     pub fn external_view(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("external_view")
             .original_result()
     }
 
     pub fn label_a(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("label_a")
             .original_result()
     }
 
     pub fn label_b(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("label_b")
             .original_result()
     }
diff --git a/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/parent/src/child_proxy.rs b/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/parent/src/child_proxy.rs
index b4808f8eba..3f60b0cc2e 100644
--- a/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/parent/src/child_proxy.rs
+++ b/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/parent/src/child_proxy.rs
@@ -45,8 +45,9 @@ where
 {
     pub fn init(
         self,
-    ) -> TxProxyDeploy<Env, From, Gas, ()> {
+    ) -> TxTypedDeploy<Env, From, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_deploy()
             .original_result()
     }
@@ -70,7 +71,7 @@ where
         token_display_name: Arg0,
         token_ticker: Arg1,
         initial_supply: Arg2,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
         self.wrapped_tx
             .raw_call("issueWrappedEgld")
             .argument(&token_display_name)
@@ -81,8 +82,9 @@ where
 
     pub fn wrapped_egld_token_identifier(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, TokenIdentifier<Env::Api>> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, TokenIdentifier<Env::Api>> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("getWrappedEgldTokenIdentifier")
             .original_result()
     }
diff --git a/contracts/feature-tests/composability/forwarder/src/forwarder_proxy.rs b/contracts/feature-tests/composability/forwarder/src/forwarder_proxy.rs
index c5e53db05d..156241596d 100644
--- a/contracts/feature-tests/composability/forwarder/src/forwarder_proxy.rs
+++ b/contracts/feature-tests/composability/forwarder/src/forwarder_proxy.rs
@@ -45,8 +45,9 @@ where
 {
     pub fn init(
         self,
-    ) -> TxProxyDeploy<Env, From, Gas, ()> {
+    ) -> TxTypedDeploy<Env, From, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_deploy()
             .original_result()
     }
@@ -68,8 +69,9 @@ where
         self,
         to: Arg0,
         amount: Arg1,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("send_egld")
             .argument(&to)
             .argument(&amount)
@@ -83,7 +85,7 @@ where
         self,
         to: Arg0,
         args: Arg1,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
         self.wrapped_tx
             .raw_call("echo_arguments_sync")
             .argument(&to)
@@ -98,7 +100,7 @@ where
         self,
         to: Arg0,
         args: Arg1,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
         self.wrapped_tx
             .raw_call("echo_arguments_sync_twice")
             .argument(&to)
@@ -111,7 +113,7 @@ where
     >(
         self,
         to: Arg0,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
         self.wrapped_tx
             .raw_call("forward_sync_accept_funds")
             .argument(&to)
@@ -125,7 +127,7 @@ where
         self,
         to: Arg0,
         percentage_fees: Arg1,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
         self.wrapped_tx
             .raw_call("forward_sync_accept_funds_with_fees")
             .argument(&to)
@@ -138,7 +140,7 @@ where
     >(
         self,
         to: Arg0,
-    ) -> TxProxyCall<Env, From, To, Gas, usize> {
+    ) -> TxTypedCall<Env, From, To, (), Gas, usize> {
         self.wrapped_tx
             .raw_call("forward_sync_accept_funds_then_read")
             .argument(&to)
@@ -156,8 +158,9 @@ where
         token: Arg1,
         token_nonce: Arg2,
         amount: Arg3,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("forward_sync_retrieve_funds")
             .argument(&to)
             .argument(&token)
@@ -175,7 +178,7 @@ where
         to: Arg0,
         token: Arg1,
         amount: Arg2,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
         self.wrapped_tx
             .raw_call("forward_sync_retrieve_funds_with_accept_func")
             .argument(&to)
@@ -186,7 +189,7 @@ where
 
     pub fn accept_funds_func(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
         self.wrapped_tx
             .raw_call("accept_funds_func")
             .original_result()
@@ -199,8 +202,9 @@ where
         self,
         to: Arg0,
         token_payments: Arg1,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("forward_sync_accept_funds_multi_transfer")
             .argument(&to)
             .argument(&token_payments)
@@ -214,8 +218,9 @@ where
         self,
         to: Arg0,
         args: Arg1,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("echo_args_async")
             .argument(&to)
             .argument(&args)
@@ -227,7 +232,7 @@ where
     >(
         self,
         to: Arg0,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
         self.wrapped_tx
             .raw_call("forward_async_accept_funds")
             .argument(&to)
@@ -239,7 +244,7 @@ where
     >(
         self,
         to: Arg0,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
         self.wrapped_tx
             .raw_call("forward_async_accept_funds_half_payment")
             .argument(&to)
@@ -253,7 +258,7 @@ where
         self,
         to: Arg0,
         percentage_fees: Arg1,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
         self.wrapped_tx
             .raw_call("forward_async_accept_funds_with_fees")
             .argument(&to)
@@ -272,8 +277,9 @@ where
         token: Arg1,
         token_nonce: Arg2,
         amount: Arg3,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("forward_async_retrieve_funds")
             .argument(&to)
             .argument(&token)
@@ -291,8 +297,9 @@ where
         to: Arg0,
         token_identifier: Arg1,
         amount: Arg2,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("send_funds_twice")
             .argument(&to)
             .argument(&token_identifier)
@@ -307,8 +314,9 @@ where
         self,
         to: Arg0,
         token_payments: Arg1,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("send_async_accept_multi_transfer")
             .argument(&to)
             .argument(&token_payments)
@@ -317,8 +325,9 @@ where
 
     pub fn callback_data(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, MultiValueEncoded<Env::Api, CallbackData<Env::Api>>> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, MultiValueEncoded<Env::Api, CallbackData<Env::Api>>> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("callback_data")
             .original_result()
     }
@@ -328,8 +337,9 @@ where
     >(
         self,
         index: Arg0,
-    ) -> TxProxyCall<Env, From, To, Gas, MultiValue5<ManagedBuffer<Env::Api>, EgldOrEsdtTokenIdentifier<Env::Api>, u64, BigUint<Env::Api>, MultiValueManagedVec<Env::Api, ManagedBuffer<Env::Api>>>> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, MultiValue5<ManagedBuffer<Env::Api>, EgldOrEsdtTokenIdentifier<Env::Api>, u64, BigUint<Env::Api>, MultiValueManagedVec<Env::Api, ManagedBuffer<Env::Api>>>> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("callback_data_at_index")
             .argument(&index)
             .original_result()
@@ -337,8 +347,9 @@ where
 
     pub fn clear_callback_data(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("clear_callback_data")
             .original_result()
     }
@@ -348,7 +359,7 @@ where
     >(
         self,
         to: Arg0,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
         self.wrapped_tx
             .raw_call("forward_transf_exec_accept_funds")
             .argument(&to)
@@ -362,7 +373,7 @@ where
         self,
         to: Arg0,
         percentage_fees: Arg1,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
         self.wrapped_tx
             .raw_call("forward_transf_execu_accept_funds_with_fees")
             .argument(&to)
@@ -375,7 +386,7 @@ where
     >(
         self,
         to: Arg0,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
         self.wrapped_tx
             .raw_call("forward_transf_exec_accept_funds_twice")
             .argument(&to)
@@ -389,7 +400,7 @@ where
     >(
         self,
         to: Arg0,
-    ) -> TxProxyCall<Env, From, To, Gas, MultiValue4<u64, u64, BigUint<Env::Api>, EgldOrEsdtTokenIdentifier<Env::Api>>> {
+    ) -> TxTypedCall<Env, From, To, (), Gas, MultiValue4<u64, u64, BigUint<Env::Api>, EgldOrEsdtTokenIdentifier<Env::Api>>> {
         self.wrapped_tx
             .raw_call("forward_transf_exec_accept_funds_return_values")
             .argument(&to)
@@ -403,8 +414,9 @@ where
         self,
         to: Arg0,
         token_payments: Arg1,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("transf_exec_multi_accept_funds")
             .argument(&to)
             .argument(&token_payments)
@@ -418,8 +430,9 @@ where
         self,
         to: Arg0,
         token_payments: Arg1,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("forward_transf_exec_reject_funds_multi_transfer")
             .argument(&to)
             .argument(&token_payments)
@@ -433,8 +446,9 @@ where
         self,
         to: Arg0,
         token_payments: Arg1,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("transf_exec_multi_reject_funds")
             .argument(&to)
             .argument(&token_payments)
@@ -448,8 +462,9 @@ where
         self,
         child_sc_address: Arg0,
         new_owner: Arg1,
-    ) -> TxProxyCall<Env, From, To, Gas, ManagedAddress<Env::Api>> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ManagedAddress<Env::Api>> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("changeOwnerAddress")
             .argument(&child_sc_address)
             .argument(&new_owner)
@@ -463,8 +478,9 @@ where
         self,
         code: Arg0,
         opt_arg: Arg1,
-    ) -> TxProxyCall<Env, From, To, Gas, MultiValue2<ManagedAddress<Env::Api>, OptionalValue<ManagedBuffer<Env::Api>>>> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, MultiValue2<ManagedAddress<Env::Api>, OptionalValue<ManagedBuffer<Env::Api>>>> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("deploy_contract")
             .argument(&code)
             .argument(&opt_arg)
@@ -476,8 +492,9 @@ where
     >(
         self,
         code: Arg0,
-    ) -> TxProxyCall<Env, From, To, Gas, MultiValue2<ManagedAddress<Env::Api>, ManagedAddress<Env::Api>>> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, MultiValue2<ManagedAddress<Env::Api>, ManagedAddress<Env::Api>>> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("deploy_two_contracts")
             .argument(&code)
             .original_result()
@@ -490,8 +507,9 @@ where
         self,
         source_address: Arg0,
         opt_arg: Arg1,
-    ) -> TxProxyCall<Env, From, To, Gas, MultiValue2<ManagedAddress<Env::Api>, OptionalValue<ManagedBuffer<Env::Api>>>> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, MultiValue2<ManagedAddress<Env::Api>, OptionalValue<ManagedBuffer<Env::Api>>>> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("deploy_vault_from_source")
             .argument(&source_address)
             .argument(&opt_arg)
@@ -507,8 +525,9 @@ where
         child_sc_address: Arg0,
         new_code: Arg1,
         opt_arg: Arg2,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("upgradeVault")
             .argument(&child_sc_address)
             .argument(&new_code)
@@ -525,8 +544,9 @@ where
         child_sc_address: Arg0,
         source_address: Arg1,
         opt_arg: Arg2,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("upgrade_vault_from_source")
             .argument(&child_sc_address)
             .argument(&source_address)
@@ -539,8 +559,9 @@ where
     >(
         self,
         token_identifier: Arg0,
-    ) -> TxProxyCall<Env, From, To, Gas, BigUint<Env::Api>> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, BigUint<Env::Api>> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("getFungibleEsdtBalance")
             .argument(&token_identifier)
             .original_result()
@@ -551,8 +572,9 @@ where
     >(
         self,
         token_identifier: Arg0,
-    ) -> TxProxyCall<Env, From, To, Gas, u64> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, u64> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("getCurrentNftNonce")
             .argument(&token_identifier)
             .original_result()
@@ -567,8 +589,9 @@ where
         to: Arg0,
         token_id: Arg1,
         amount: Arg2,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("send_esdt")
             .argument(&to)
             .argument(&token_id)
@@ -583,7 +606,7 @@ where
         self,
         to: Arg0,
         percentage_fees: Arg1,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
         self.wrapped_tx
             .raw_call("send_esdt_with_fees")
             .argument(&to)
@@ -602,8 +625,9 @@ where
         token_id: Arg1,
         amount_first_time: Arg2,
         amount_second_time: Arg3,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("send_esdt_twice")
             .argument(&to)
             .argument(&token_id)
@@ -619,8 +643,9 @@ where
         self,
         to: Arg0,
         token_payments: Arg1,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("send_esdt_direct_multi_transfer")
             .argument(&to)
             .argument(&token_payments)
@@ -636,7 +661,7 @@ where
         token_display_name: Arg0,
         token_ticker: Arg1,
         initial_supply: Arg2,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
         self.wrapped_tx
             .raw_call("issue_fungible_token")
             .argument(&token_display_name)
@@ -652,8 +677,9 @@ where
         self,
         token_identifier: Arg0,
         amount: Arg1,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("local_mint")
             .argument(&token_identifier)
             .argument(&amount)
@@ -667,8 +693,9 @@ where
         self,
         token_identifier: Arg0,
         amount: Arg1,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("local_burn")
             .argument(&token_identifier)
             .argument(&amount)
@@ -680,8 +707,9 @@ where
     >(
         self,
         token_id: Arg0,
-    ) -> TxProxyCall<Env, From, To, Gas, MultiValueEncoded<Env::Api, ManagedBuffer<Env::Api>>> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, MultiValueEncoded<Env::Api, ManagedBuffer<Env::Api>>> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("get_esdt_local_roles")
             .argument(&token_id)
             .original_result()
@@ -696,8 +724,9 @@ where
         address: Arg0,
         token_id: Arg1,
         nonce: Arg2,
-    ) -> TxProxyCall<Env, From, To, Gas, MultiValue9<EsdtTokenType, BigUint<Env::Api>, bool, ManagedBuffer<Env::Api>, ManagedBuffer<Env::Api>, ManagedBuffer<Env::Api>, ManagedAddress<Env::Api>, BigUint<Env::Api>, ManagedVec<Env::Api, ManagedBuffer<Env::Api>>>> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, MultiValue9<EsdtTokenType, BigUint<Env::Api>, bool, ManagedBuffer<Env::Api>, ManagedBuffer<Env::Api>, ManagedBuffer<Env::Api>, ManagedAddress<Env::Api>, BigUint<Env::Api>, ManagedVec<Env::Api, ManagedBuffer<Env::Api>>>> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("get_esdt_token_data")
             .argument(&address)
             .argument(&token_id)
@@ -714,8 +743,9 @@ where
         address: Arg0,
         token_id: Arg1,
         nonce: Arg2,
-    ) -> TxProxyCall<Env, From, To, Gas, bool> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, bool> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("is_esdt_frozen")
             .argument(&address)
             .argument(&token_id)
@@ -728,8 +758,9 @@ where
     >(
         self,
         token_id: Arg0,
-    ) -> TxProxyCall<Env, From, To, Gas, bool> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, bool> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("is_esdt_paused")
             .argument(&token_id)
             .original_result()
@@ -740,8 +771,9 @@ where
     >(
         self,
         token_id: Arg0,
-    ) -> TxProxyCall<Env, From, To, Gas, bool> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, bool> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("is_esdt_limited_transfer")
             .argument(&token_id)
             .original_result()
@@ -752,8 +784,9 @@ where
     >(
         self,
         token_id: Arg0,
-    ) -> TxProxyCall<Env, From, To, Gas, bool> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, bool> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("validate_token_identifier")
             .argument(&token_id)
             .original_result()
@@ -766,7 +799,7 @@ where
         self,
         token_display_name: Arg0,
         token_ticker: Arg1,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
         self.wrapped_tx
             .raw_call("sft_issue")
             .argument(&token_display_name)
@@ -781,8 +814,9 @@ where
         self,
         token_identifier: Arg0,
         nonce: Arg1,
-    ) -> TxProxyCall<Env, From, To, Gas, BigUint<Env::Api>> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, BigUint<Env::Api>> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("get_nft_balance")
             .argument(&token_identifier)
             .argument(&nonce)
@@ -798,7 +832,7 @@ where
         nft_id: Arg0,
         nft_nonce: Arg1,
         nft_amount: Arg2,
-    ) -> TxProxyCall<Env, From, To, Gas, BigUint<Env::Api>> {
+    ) -> TxTypedCall<Env, From, To, (), Gas, BigUint<Env::Api>> {
         self.wrapped_tx
             .raw_call("buy_nft")
             .argument(&nft_id)
@@ -814,7 +848,7 @@ where
         self,
         token_display_name: Arg0,
         token_ticker: Arg1,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
         self.wrapped_tx
             .raw_call("nft_issue")
             .argument(&token_display_name)
@@ -839,8 +873,9 @@ where
         hash: Arg4,
         color: Arg5,
         uri: Arg6,
-    ) -> TxProxyCall<Env, From, To, Gas, u64> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, u64> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("nft_create")
             .argument(&token_identifier)
             .argument(&amount)
@@ -861,8 +896,9 @@ where
         token_identifier: Arg0,
         amount: Arg1,
         color: Arg2,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("nft_create_compact")
             .argument(&token_identifier)
             .argument(&amount)
@@ -879,8 +915,9 @@ where
         token_identifier: Arg0,
         nonce: Arg1,
         uris: Arg2,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("nft_add_uris")
             .argument(&token_identifier)
             .argument(&nonce)
@@ -897,8 +934,9 @@ where
         token_identifier: Arg0,
         nonce: Arg1,
         new_attributes: Arg2,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("nft_update_attributes")
             .argument(&token_identifier)
             .argument(&nonce)
@@ -923,8 +961,9 @@ where
         hash: Arg4,
         uri: Arg5,
         attrs_arg: Arg6,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("nft_decode_complex_attributes")
             .argument(&token_identifier)
             .argument(&amount)
@@ -945,8 +984,9 @@ where
         token_identifier: Arg0,
         nonce: Arg1,
         amount: Arg2,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("nft_add_quantity")
             .argument(&token_identifier)
             .argument(&nonce)
@@ -963,8 +1003,9 @@ where
         token_identifier: Arg0,
         nonce: Arg1,
         amount: Arg2,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("nft_burn")
             .argument(&token_identifier)
             .argument(&nonce)
@@ -983,8 +1024,9 @@ where
         token_identifier: Arg1,
         nonce: Arg2,
         amount: Arg3,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("transfer_nft_via_async_call")
             .argument(&to)
             .argument(&token_identifier)
@@ -1008,8 +1050,9 @@ where
         amount: Arg3,
         function: Arg4,
         arguments: Arg5,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("transfer_nft_and_execute")
             .argument(&to)
             .argument(&token_identifier)
@@ -1039,8 +1082,9 @@ where
         hash: Arg5,
         color: Arg6,
         uri: Arg7,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("create_and_send")
             .argument(&to)
             .argument(&token_identifier)
@@ -1062,8 +1106,9 @@ where
         address: Arg0,
         token_identifier: Arg1,
         roles: Arg2,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("setLocalRoles")
             .argument(&address)
             .argument(&token_identifier)
@@ -1080,8 +1125,9 @@ where
         address: Arg0,
         token_identifier: Arg1,
         roles: Arg2,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("unsetLocalRoles")
             .argument(&address)
             .argument(&token_identifier)
@@ -1091,16 +1137,18 @@ where
 
     pub fn last_issued_token(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, TokenIdentifier<Env::Api>> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, TokenIdentifier<Env::Api>> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("lastIssuedToken")
             .original_result()
     }
 
     pub fn last_error_message(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, ManagedBuffer<Env::Api>> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ManagedBuffer<Env::Api>> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("lastErrorMessage")
             .original_result()
     }
diff --git a/contracts/feature-tests/composability/forwarder/src/vault_proxy.rs b/contracts/feature-tests/composability/forwarder/src/vault_proxy.rs
index c43f59c36a..24e6f12e69 100644
--- a/contracts/feature-tests/composability/forwarder/src/vault_proxy.rs
+++ b/contracts/feature-tests/composability/forwarder/src/vault_proxy.rs
@@ -48,8 +48,9 @@ where
     >(
         self,
         opt_arg_to_echo: Arg0,
-    ) -> TxProxyDeploy<Env, From, Gas, OptionalValue<ManagedBuffer<Env::Api>>> {
+    ) -> TxTypedDeploy<Env, From, NotPayable, Gas, OptionalValue<ManagedBuffer<Env::Api>>> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_deploy()
             .argument(&opt_arg_to_echo)
             .original_result()
@@ -70,8 +71,9 @@ where
     >(
         self,
         opt_arg_to_echo: Arg0,
-    ) -> TxProxyUpgrade<Env, From, To, Gas, MultiValue2<&'static str, OptionalValue<ManagedBuffer<Env::Api>>>> {
+    ) -> TxTypedUpgrade<Env, From, To, NotPayable, Gas, MultiValue2<&'static str, OptionalValue<ManagedBuffer<Env::Api>>>> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_upgrade()
             .argument(&opt_arg_to_echo)
             .original_result()
@@ -92,8 +94,9 @@ where
     >(
         self,
         args: Arg0,
-    ) -> TxProxyCall<Env, From, To, Gas, MultiValueEncoded<Env::Api, ManagedBuffer<Env::Api>>> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, MultiValueEncoded<Env::Api, ManagedBuffer<Env::Api>>> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("echo_arguments")
             .argument(&args)
             .original_result()
@@ -104,8 +107,9 @@ where
     >(
         self,
         args: Arg0,
-    ) -> TxProxyCall<Env, From, To, Gas, MultiValueEncoded<Env::Api, ManagedBuffer<Env::Api>>> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, MultiValueEncoded<Env::Api, ManagedBuffer<Env::Api>>> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("echo_arguments_without_storage")
             .argument(&args)
             .original_result()
@@ -113,15 +117,16 @@ where
 
     pub fn echo_caller(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, ManagedAddress<Env::Api>> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ManagedAddress<Env::Api>> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("echo_caller")
             .original_result()
     }
 
     pub fn accept_funds(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
         self.wrapped_tx
             .raw_call("accept_funds")
             .original_result()
@@ -129,7 +134,7 @@ where
 
     pub fn accept_funds_echo_payment(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, MultiValue2<BigUint<Env::Api>, MultiValueEncoded<Env::Api, EsdtTokenPaymentMultiValue<Env::Api>>>> {
+    ) -> TxTypedCall<Env, From, To, (), Gas, MultiValue2<BigUint<Env::Api>, MultiValueEncoded<Env::Api, EsdtTokenPaymentMultiValue<Env::Api>>>> {
         self.wrapped_tx
             .raw_call("accept_funds_echo_payment")
             .original_result()
@@ -137,7 +142,7 @@ where
 
     pub fn accept_funds_single_esdt_transfer(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
         self.wrapped_tx
             .raw_call("accept_funds_single_esdt_transfer")
             .original_result()
@@ -145,7 +150,7 @@ where
 
     pub fn reject_funds(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
         self.wrapped_tx
             .raw_call("reject_funds")
             .original_result()
@@ -160,7 +165,7 @@ where
         token: Arg0,
         amount: Arg1,
         opt_receive_func: Arg2,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
         self.wrapped_tx
             .raw_call("retrieve_funds_with_transfer_exec")
             .argument(&token)
@@ -176,7 +181,7 @@ where
         self,
         back_transfers: Arg0,
         back_transfer_value: Arg1,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
         self.wrapped_tx
             .raw_call("retrieve_funds_promises")
             .argument(&back_transfers)
@@ -193,8 +198,9 @@ where
         token: Arg0,
         nonce: Arg1,
         amount: Arg2,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("retrieve_funds")
             .argument(&token)
             .argument(&nonce)
@@ -207,8 +213,9 @@ where
     >(
         self,
         token_payments: Arg0,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("retrieve_multi_funds_async")
             .argument(&token_payments)
             .original_result()
@@ -216,7 +223,7 @@ where
 
     pub fn burn_and_create_retrieve_async(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
         self.wrapped_tx
             .raw_call("burn_and_create_retrieve_async")
             .original_result()
@@ -224,8 +231,9 @@ where
 
     pub fn get_owner_address(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, ManagedAddress<Env::Api>> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ManagedAddress<Env::Api>> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("get_owner_address")
             .original_result()
     }
@@ -237,8 +245,9 @@ where
     >(
         self,
         endpoint: Arg0,
-    ) -> TxProxyCall<Env, From, To, Gas, usize> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, usize> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("call_counts")
             .argument(&endpoint)
             .original_result()
@@ -246,16 +255,18 @@ where
 
     pub fn num_called_retrieve_funds_promises(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, usize> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, usize> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("num_called_retrieve_funds_promises")
             .original_result()
     }
 
     pub fn num_async_calls_sent_from_child(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, usize> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, usize> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("num_async_calls_sent_from_child")
             .original_result()
     }
diff --git a/contracts/feature-tests/composability/promises-features/src/vault_proxy.rs b/contracts/feature-tests/composability/promises-features/src/vault_proxy.rs
index c43f59c36a..24e6f12e69 100644
--- a/contracts/feature-tests/composability/promises-features/src/vault_proxy.rs
+++ b/contracts/feature-tests/composability/promises-features/src/vault_proxy.rs
@@ -48,8 +48,9 @@ where
     >(
         self,
         opt_arg_to_echo: Arg0,
-    ) -> TxProxyDeploy<Env, From, Gas, OptionalValue<ManagedBuffer<Env::Api>>> {
+    ) -> TxTypedDeploy<Env, From, NotPayable, Gas, OptionalValue<ManagedBuffer<Env::Api>>> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_deploy()
             .argument(&opt_arg_to_echo)
             .original_result()
@@ -70,8 +71,9 @@ where
     >(
         self,
         opt_arg_to_echo: Arg0,
-    ) -> TxProxyUpgrade<Env, From, To, Gas, MultiValue2<&'static str, OptionalValue<ManagedBuffer<Env::Api>>>> {
+    ) -> TxTypedUpgrade<Env, From, To, NotPayable, Gas, MultiValue2<&'static str, OptionalValue<ManagedBuffer<Env::Api>>>> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_upgrade()
             .argument(&opt_arg_to_echo)
             .original_result()
@@ -92,8 +94,9 @@ where
     >(
         self,
         args: Arg0,
-    ) -> TxProxyCall<Env, From, To, Gas, MultiValueEncoded<Env::Api, ManagedBuffer<Env::Api>>> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, MultiValueEncoded<Env::Api, ManagedBuffer<Env::Api>>> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("echo_arguments")
             .argument(&args)
             .original_result()
@@ -104,8 +107,9 @@ where
     >(
         self,
         args: Arg0,
-    ) -> TxProxyCall<Env, From, To, Gas, MultiValueEncoded<Env::Api, ManagedBuffer<Env::Api>>> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, MultiValueEncoded<Env::Api, ManagedBuffer<Env::Api>>> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("echo_arguments_without_storage")
             .argument(&args)
             .original_result()
@@ -113,15 +117,16 @@ where
 
     pub fn echo_caller(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, ManagedAddress<Env::Api>> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ManagedAddress<Env::Api>> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("echo_caller")
             .original_result()
     }
 
     pub fn accept_funds(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
         self.wrapped_tx
             .raw_call("accept_funds")
             .original_result()
@@ -129,7 +134,7 @@ where
 
     pub fn accept_funds_echo_payment(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, MultiValue2<BigUint<Env::Api>, MultiValueEncoded<Env::Api, EsdtTokenPaymentMultiValue<Env::Api>>>> {
+    ) -> TxTypedCall<Env, From, To, (), Gas, MultiValue2<BigUint<Env::Api>, MultiValueEncoded<Env::Api, EsdtTokenPaymentMultiValue<Env::Api>>>> {
         self.wrapped_tx
             .raw_call("accept_funds_echo_payment")
             .original_result()
@@ -137,7 +142,7 @@ where
 
     pub fn accept_funds_single_esdt_transfer(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
         self.wrapped_tx
             .raw_call("accept_funds_single_esdt_transfer")
             .original_result()
@@ -145,7 +150,7 @@ where
 
     pub fn reject_funds(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
         self.wrapped_tx
             .raw_call("reject_funds")
             .original_result()
@@ -160,7 +165,7 @@ where
         token: Arg0,
         amount: Arg1,
         opt_receive_func: Arg2,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
         self.wrapped_tx
             .raw_call("retrieve_funds_with_transfer_exec")
             .argument(&token)
@@ -176,7 +181,7 @@ where
         self,
         back_transfers: Arg0,
         back_transfer_value: Arg1,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
         self.wrapped_tx
             .raw_call("retrieve_funds_promises")
             .argument(&back_transfers)
@@ -193,8 +198,9 @@ where
         token: Arg0,
         nonce: Arg1,
         amount: Arg2,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("retrieve_funds")
             .argument(&token)
             .argument(&nonce)
@@ -207,8 +213,9 @@ where
     >(
         self,
         token_payments: Arg0,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("retrieve_multi_funds_async")
             .argument(&token_payments)
             .original_result()
@@ -216,7 +223,7 @@ where
 
     pub fn burn_and_create_retrieve_async(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
         self.wrapped_tx
             .raw_call("burn_and_create_retrieve_async")
             .original_result()
@@ -224,8 +231,9 @@ where
 
     pub fn get_owner_address(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, ManagedAddress<Env::Api>> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ManagedAddress<Env::Api>> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("get_owner_address")
             .original_result()
     }
@@ -237,8 +245,9 @@ where
     >(
         self,
         endpoint: Arg0,
-    ) -> TxProxyCall<Env, From, To, Gas, usize> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, usize> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("call_counts")
             .argument(&endpoint)
             .original_result()
@@ -246,16 +255,18 @@ where
 
     pub fn num_called_retrieve_funds_promises(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, usize> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, usize> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("num_called_retrieve_funds_promises")
             .original_result()
     }
 
     pub fn num_async_calls_sent_from_child(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, usize> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, usize> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("num_async_calls_sent_from_child")
             .original_result()
     }
diff --git a/contracts/feature-tests/composability/recursive-caller/src/self_proxy.rs b/contracts/feature-tests/composability/recursive-caller/src/self_proxy.rs
index 7fd86a1c8f..6e55b345df 100644
--- a/contracts/feature-tests/composability/recursive-caller/src/self_proxy.rs
+++ b/contracts/feature-tests/composability/recursive-caller/src/self_proxy.rs
@@ -45,8 +45,9 @@ where
 {
     pub fn init(
         self,
-    ) -> TxProxyDeploy<Env, From, Gas, ()> {
+    ) -> TxTypedDeploy<Env, From, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_deploy()
             .original_result()
     }
@@ -72,8 +73,9 @@ where
         token_identifier: Arg1,
         amount: Arg2,
         counter: Arg3,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("recursive_send_funds")
             .argument(&to)
             .argument(&token_identifier)
diff --git a/contracts/feature-tests/composability/recursive-caller/src/vault_proxy.rs b/contracts/feature-tests/composability/recursive-caller/src/vault_proxy.rs
index c43f59c36a..24e6f12e69 100644
--- a/contracts/feature-tests/composability/recursive-caller/src/vault_proxy.rs
+++ b/contracts/feature-tests/composability/recursive-caller/src/vault_proxy.rs
@@ -48,8 +48,9 @@ where
     >(
         self,
         opt_arg_to_echo: Arg0,
-    ) -> TxProxyDeploy<Env, From, Gas, OptionalValue<ManagedBuffer<Env::Api>>> {
+    ) -> TxTypedDeploy<Env, From, NotPayable, Gas, OptionalValue<ManagedBuffer<Env::Api>>> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_deploy()
             .argument(&opt_arg_to_echo)
             .original_result()
@@ -70,8 +71,9 @@ where
     >(
         self,
         opt_arg_to_echo: Arg0,
-    ) -> TxProxyUpgrade<Env, From, To, Gas, MultiValue2<&'static str, OptionalValue<ManagedBuffer<Env::Api>>>> {
+    ) -> TxTypedUpgrade<Env, From, To, NotPayable, Gas, MultiValue2<&'static str, OptionalValue<ManagedBuffer<Env::Api>>>> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_upgrade()
             .argument(&opt_arg_to_echo)
             .original_result()
@@ -92,8 +94,9 @@ where
     >(
         self,
         args: Arg0,
-    ) -> TxProxyCall<Env, From, To, Gas, MultiValueEncoded<Env::Api, ManagedBuffer<Env::Api>>> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, MultiValueEncoded<Env::Api, ManagedBuffer<Env::Api>>> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("echo_arguments")
             .argument(&args)
             .original_result()
@@ -104,8 +107,9 @@ where
     >(
         self,
         args: Arg0,
-    ) -> TxProxyCall<Env, From, To, Gas, MultiValueEncoded<Env::Api, ManagedBuffer<Env::Api>>> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, MultiValueEncoded<Env::Api, ManagedBuffer<Env::Api>>> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("echo_arguments_without_storage")
             .argument(&args)
             .original_result()
@@ -113,15 +117,16 @@ where
 
     pub fn echo_caller(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, ManagedAddress<Env::Api>> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ManagedAddress<Env::Api>> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("echo_caller")
             .original_result()
     }
 
     pub fn accept_funds(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
         self.wrapped_tx
             .raw_call("accept_funds")
             .original_result()
@@ -129,7 +134,7 @@ where
 
     pub fn accept_funds_echo_payment(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, MultiValue2<BigUint<Env::Api>, MultiValueEncoded<Env::Api, EsdtTokenPaymentMultiValue<Env::Api>>>> {
+    ) -> TxTypedCall<Env, From, To, (), Gas, MultiValue2<BigUint<Env::Api>, MultiValueEncoded<Env::Api, EsdtTokenPaymentMultiValue<Env::Api>>>> {
         self.wrapped_tx
             .raw_call("accept_funds_echo_payment")
             .original_result()
@@ -137,7 +142,7 @@ where
 
     pub fn accept_funds_single_esdt_transfer(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
         self.wrapped_tx
             .raw_call("accept_funds_single_esdt_transfer")
             .original_result()
@@ -145,7 +150,7 @@ where
 
     pub fn reject_funds(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
         self.wrapped_tx
             .raw_call("reject_funds")
             .original_result()
@@ -160,7 +165,7 @@ where
         token: Arg0,
         amount: Arg1,
         opt_receive_func: Arg2,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
         self.wrapped_tx
             .raw_call("retrieve_funds_with_transfer_exec")
             .argument(&token)
@@ -176,7 +181,7 @@ where
         self,
         back_transfers: Arg0,
         back_transfer_value: Arg1,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
         self.wrapped_tx
             .raw_call("retrieve_funds_promises")
             .argument(&back_transfers)
@@ -193,8 +198,9 @@ where
         token: Arg0,
         nonce: Arg1,
         amount: Arg2,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("retrieve_funds")
             .argument(&token)
             .argument(&nonce)
@@ -207,8 +213,9 @@ where
     >(
         self,
         token_payments: Arg0,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("retrieve_multi_funds_async")
             .argument(&token_payments)
             .original_result()
@@ -216,7 +223,7 @@ where
 
     pub fn burn_and_create_retrieve_async(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
         self.wrapped_tx
             .raw_call("burn_and_create_retrieve_async")
             .original_result()
@@ -224,8 +231,9 @@ where
 
     pub fn get_owner_address(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, ManagedAddress<Env::Api>> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ManagedAddress<Env::Api>> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("get_owner_address")
             .original_result()
     }
@@ -237,8 +245,9 @@ where
     >(
         self,
         endpoint: Arg0,
-    ) -> TxProxyCall<Env, From, To, Gas, usize> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, usize> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("call_counts")
             .argument(&endpoint)
             .original_result()
@@ -246,16 +255,18 @@ where
 
     pub fn num_called_retrieve_funds_promises(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, usize> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, usize> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("num_called_retrieve_funds_promises")
             .original_result()
     }
 
     pub fn num_async_calls_sent_from_child(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, usize> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, usize> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("num_async_calls_sent_from_child")
             .original_result()
     }
diff --git a/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/src/erc20_proxy.rs b/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/src/erc20_proxy.rs
index eaceb1da73..cda5046b56 100644
--- a/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/src/erc20_proxy.rs
+++ b/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/src/erc20_proxy.rs
@@ -50,8 +50,9 @@ where
     >(
         self,
         total_supply: Arg0,
-    ) -> TxProxyDeploy<Env, From, Gas, ()> {
+    ) -> TxTypedDeploy<Env, From, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_deploy()
             .argument(&total_supply)
             .original_result()
@@ -70,8 +71,9 @@ where
     /// Total number of tokens in existence. 
     pub fn total_supply(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, BigUint<Env::Api>> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, BigUint<Env::Api>> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("totalSupply")
             .original_result()
     }
@@ -87,8 +89,9 @@ where
     >(
         self,
         address: Arg0,
-    ) -> TxProxyCall<Env, From, To, Gas, BigUint<Env::Api>> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, BigUint<Env::Api>> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("balanceOf")
             .argument(&address)
             .original_result()
@@ -108,8 +111,9 @@ where
         self,
         owner: Arg0,
         spender: Arg1,
-    ) -> TxProxyCall<Env, From, To, Gas, BigUint<Env::Api>> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, BigUint<Env::Api>> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("allowance")
             .argument(&owner)
             .argument(&spender)
@@ -129,8 +133,9 @@ where
         self,
         to: Arg0,
         amount: Arg1,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("transfer")
             .argument(&to)
             .argument(&amount)
@@ -154,8 +159,9 @@ where
         sender: Arg0,
         recipient: Arg1,
         amount: Arg2,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("transferFrom")
             .argument(&sender)
             .argument(&recipient)
@@ -178,8 +184,9 @@ where
         self,
         spender: Arg0,
         amount: Arg1,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("approve")
             .argument(&spender)
             .argument(&amount)
diff --git a/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/src/erc1155_proxy.rs b/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/src/erc1155_proxy.rs
index 899a036f41..f3fdd90854 100644
--- a/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/src/erc1155_proxy.rs
+++ b/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/src/erc1155_proxy.rs
@@ -45,8 +45,9 @@ where
 {
     pub fn init(
         self,
-    ) -> TxProxyDeploy<Env, From, Gas, ()> {
+    ) -> TxTypedDeploy<Env, From, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_deploy()
             .original_result()
     }
@@ -75,8 +76,9 @@ where
         type_id: Arg2,
         value: Arg3,
         data: Arg4,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("safeTransferFrom")
             .argument(&from)
             .argument(&to)
@@ -100,8 +102,9 @@ where
         type_ids: Arg2,
         values: Arg3,
         data: Arg4,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("safeBatchTransferFrom")
             .argument(&from)
             .argument(&to)
@@ -118,8 +121,9 @@ where
         self,
         operator: Arg0,
         approved: Arg1,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("setApprovalForAll")
             .argument(&operator)
             .argument(&approved)
@@ -135,8 +139,9 @@ where
         uri: Arg0,
         initial_supply: Arg1,
         is_fungible: Arg2,
-    ) -> TxProxyCall<Env, From, To, Gas, BigUint<Env::Api>> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, BigUint<Env::Api>> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("createToken")
             .argument(&uri)
             .argument(&initial_supply)
@@ -151,8 +156,9 @@ where
         self,
         type_id: Arg0,
         amount: Arg1,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("mint")
             .argument(&type_id)
             .argument(&amount)
@@ -166,8 +172,9 @@ where
         self,
         type_id: Arg0,
         amount: Arg1,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("burn")
             .argument(&type_id)
             .argument(&amount)
@@ -181,8 +188,9 @@ where
         self,
         owner: Arg0,
         type_id: Arg1,
-    ) -> TxProxyCall<Env, From, To, Gas, BigUint<Env::Api>> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, BigUint<Env::Api>> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("balanceOf")
             .argument(&owner)
             .argument(&type_id)
@@ -194,8 +202,9 @@ where
     >(
         self,
         owner_type_id_pairs: Arg0,
-    ) -> TxProxyCall<Env, From, To, Gas, MultiValueEncoded<Env::Api, BigUint<Env::Api>>> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, MultiValueEncoded<Env::Api, BigUint<Env::Api>>> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("balanceOfBatch")
             .argument(&owner_type_id_pairs)
             .original_result()
@@ -208,8 +217,9 @@ where
         self,
         type_id: Arg0,
         nft_id: Arg1,
-    ) -> TxProxyCall<Env, From, To, Gas, ManagedAddress<Env::Api>> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ManagedAddress<Env::Api>> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("getTokenOwner")
             .argument(&type_id)
             .argument(&nft_id)
@@ -221,8 +231,9 @@ where
     >(
         self,
         type_id: Arg0,
-    ) -> TxProxyCall<Env, From, To, Gas, ManagedAddress<Env::Api>> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ManagedAddress<Env::Api>> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("getTokenTypeCreator")
             .argument(&type_id)
             .original_result()
@@ -233,8 +244,9 @@ where
     >(
         self,
         type_id: Arg0,
-    ) -> TxProxyCall<Env, From, To, Gas, BoxedBytes> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, BoxedBytes> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("getTokenTypeUri")
             .argument(&type_id)
             .original_result()
@@ -245,8 +257,9 @@ where
     >(
         self,
         type_id: Arg0,
-    ) -> TxProxyCall<Env, From, To, Gas, bool> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, bool> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("isFungible")
             .argument(&type_id)
             .original_result()
@@ -259,8 +272,9 @@ where
         self,
         operator: Arg0,
         owner: Arg1,
-    ) -> TxProxyCall<Env, From, To, Gas, bool> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, bool> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("isApprovedForAll")
             .argument(&operator)
             .argument(&owner)
diff --git a/contracts/feature-tests/erc-style-contracts/lottery-erc20/src/erc20_proxy.rs b/contracts/feature-tests/erc-style-contracts/lottery-erc20/src/erc20_proxy.rs
index eaceb1da73..cda5046b56 100644
--- a/contracts/feature-tests/erc-style-contracts/lottery-erc20/src/erc20_proxy.rs
+++ b/contracts/feature-tests/erc-style-contracts/lottery-erc20/src/erc20_proxy.rs
@@ -50,8 +50,9 @@ where
     >(
         self,
         total_supply: Arg0,
-    ) -> TxProxyDeploy<Env, From, Gas, ()> {
+    ) -> TxTypedDeploy<Env, From, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_deploy()
             .argument(&total_supply)
             .original_result()
@@ -70,8 +71,9 @@ where
     /// Total number of tokens in existence. 
     pub fn total_supply(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, BigUint<Env::Api>> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, BigUint<Env::Api>> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("totalSupply")
             .original_result()
     }
@@ -87,8 +89,9 @@ where
     >(
         self,
         address: Arg0,
-    ) -> TxProxyCall<Env, From, To, Gas, BigUint<Env::Api>> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, BigUint<Env::Api>> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("balanceOf")
             .argument(&address)
             .original_result()
@@ -108,8 +111,9 @@ where
         self,
         owner: Arg0,
         spender: Arg1,
-    ) -> TxProxyCall<Env, From, To, Gas, BigUint<Env::Api>> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, BigUint<Env::Api>> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("allowance")
             .argument(&owner)
             .argument(&spender)
@@ -129,8 +133,9 @@ where
         self,
         to: Arg0,
         amount: Arg1,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("transfer")
             .argument(&to)
             .argument(&amount)
@@ -154,8 +159,9 @@ where
         sender: Arg0,
         recipient: Arg1,
         amount: Arg2,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("transferFrom")
             .argument(&sender)
             .argument(&recipient)
@@ -178,8 +184,9 @@ where
         self,
         spender: Arg0,
         amount: Arg1,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("approve")
             .argument(&spender)
             .argument(&amount)
diff --git a/contracts/feature-tests/panic-message-features/tests/pmf_proxy.rs b/contracts/feature-tests/panic-message-features/tests/pmf_proxy.rs
index 6e4c6e0cea..c8864f2d4b 100644
--- a/contracts/feature-tests/panic-message-features/tests/pmf_proxy.rs
+++ b/contracts/feature-tests/panic-message-features/tests/pmf_proxy.rs
@@ -45,8 +45,9 @@ where
 {
     pub fn init(
         self,
-    ) -> TxProxyDeploy<Env, From, Gas, ()> {
+    ) -> TxTypedDeploy<Env, From, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_deploy()
             .original_result()
     }
@@ -66,8 +67,9 @@ where
     >(
         self,
         some_value: Arg0,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("panicWithMessage")
             .argument(&some_value)
             .original_result()
@@ -76,16 +78,18 @@ where
     /// Logs do not get recorded in case of panic. 
     pub fn panic_after_log(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("panicAfterLog")
             .original_result()
     }
 
     pub fn sc_panic(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("sc_panic")
             .original_result()
     }
diff --git a/contracts/feature-tests/scenario-tester/src/scenario_tester_proxy.rs b/contracts/feature-tests/scenario-tester/src/scenario_tester_proxy.rs
index 3358a126e4..3de83d499d 100644
--- a/contracts/feature-tests/scenario-tester/src/scenario_tester_proxy.rs
+++ b/contracts/feature-tests/scenario-tester/src/scenario_tester_proxy.rs
@@ -48,8 +48,9 @@ where
     >(
         self,
         initial_value: Arg0,
-    ) -> TxProxyDeploy<Env, From, Gas, ()> {
+    ) -> TxTypedDeploy<Env, From, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_deploy()
             .argument(&initial_value)
             .original_result()
@@ -70,8 +71,9 @@ where
     >(
         self,
         initial_value: Arg0,
-    ) -> TxProxyUpgrade<Env, From, To, Gas, ()> {
+    ) -> TxTypedUpgrade<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_upgrade()
             .argument(&initial_value)
             .original_result()
@@ -89,8 +91,9 @@ where
 {
     pub fn sum(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, BigUint<Env::Api>> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, BigUint<Env::Api>> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("getSum")
             .original_result()
     }
@@ -101,8 +104,9 @@ where
     >(
         self,
         value: Arg0,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("add")
             .argument(&value)
             .original_result()

From c0bc121ecc6e66f65ba594c469df87ed5ca3917f Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 10 May 2024 00:23:35 +0300
Subject: [PATCH 0861/1254] unified syntax - with_normalized produces owned
 FunctionCall

---
 framework/base/src/types/interaction/tx_payment.rs        | 2 +-
 .../src/types/interaction/tx_payment/tx_payment_egld.rs   | 4 ++--
 .../interaction/tx_payment/tx_payment_egld_or_esdt.rs     | 4 ++--
 .../tx_payment/tx_payment_egld_or_esdt_refs.rs            | 2 +-
 .../tx_payment/tx_payment_egld_or_multi_esdt.rs           | 4 ++--
 .../tx_payment/tx_payment_egld_or_multi_esdt_ref.rs       | 2 +-
 .../types/interaction/tx_payment/tx_payment_multi_esdt.rs | 8 ++++----
 .../src/types/interaction/tx_payment/tx_payment_none.rs   | 4 ++--
 .../interaction/tx_payment/tx_payment_single_esdt.rs      | 4 ++--
 .../interaction/tx_payment/tx_payment_single_esdt_ref.rs  | 6 +++---
 .../tx_payment/tx_payment_single_esdt_triple.rs           | 2 +-
 11 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/framework/base/src/types/interaction/tx_payment.rs b/framework/base/src/types/interaction/tx_payment.rs
index e72a5b9fa6..ea8400dab5 100644
--- a/framework/base/src/types/interaction/tx_payment.rs
+++ b/framework/base/src/types/interaction/tx_payment.rs
@@ -51,7 +51,7 @@ where
     where
         From: TxFrom<Env>,
         To: TxToSpecified<Env>,
-        F: FnOnce(&ManagedAddress<Env::Api>, &BigUint<Env::Api>, &FunctionCall<Env::Api>) -> R;
+        F: FnOnce(&ManagedAddress<Env::Api>, &BigUint<Env::Api>, FunctionCall<Env::Api>) -> R;
 
     /// Payment data to be used by the testing framework. Will be refactored.
     fn into_full_payment_data(self, env: &Env) -> FullPaymentData<Env::Api>;
diff --git a/framework/base/src/types/interaction/tx_payment/tx_payment_egld.rs b/framework/base/src/types/interaction/tx_payment/tx_payment_egld.rs
index ad0969aca1..25c84c3339 100644
--- a/framework/base/src/types/interaction/tx_payment/tx_payment_egld.rs
+++ b/framework/base/src/types/interaction/tx_payment/tx_payment_egld.rs
@@ -53,11 +53,11 @@ where
     where
         From: TxFrom<Env>,
         To: TxToSpecified<Env>,
-        F: FnOnce(&ManagedAddress<Env::Api>, &BigUint<Env::Api>, &FunctionCall<Env::Api>) -> R,
+        F: FnOnce(&ManagedAddress<Env::Api>, &BigUint<Env::Api>, FunctionCall<Env::Api>) -> R,
     {
         to.with_address_ref(env, |to_addr| {
             self.0
-                .with_value_ref(env, |egld_value| f(to_addr, egld_value, &fc))
+                .with_value_ref(env, |egld_value| f(to_addr, egld_value, fc))
         })
     }
 
diff --git a/framework/base/src/types/interaction/tx_payment/tx_payment_egld_or_esdt.rs b/framework/base/src/types/interaction/tx_payment/tx_payment_egld_or_esdt.rs
index a4ac0577ff..b4a95f54ac 100644
--- a/framework/base/src/types/interaction/tx_payment/tx_payment_egld_or_esdt.rs
+++ b/framework/base/src/types/interaction/tx_payment/tx_payment_egld_or_esdt.rs
@@ -35,7 +35,7 @@ where
     where
         From: TxFrom<Env>,
         To: TxToSpecified<Env>,
-        F: FnOnce(&ManagedAddress<Env::Api>, &BigUint<Env::Api>, &FunctionCall<Env::Api>) -> R,
+        F: FnOnce(&ManagedAddress<Env::Api>, &BigUint<Env::Api>, FunctionCall<Env::Api>) -> R,
     {
         self.map_ref_egld_or_esdt(
             (to, fc, f),
@@ -82,7 +82,7 @@ where
     where
         From: TxFrom<Env>,
         To: TxToSpecified<Env>,
-        F: FnOnce(&ManagedAddress<Env::Api>, &BigUint<Env::Api>, &FunctionCall<Env::Api>) -> R,
+        F: FnOnce(&ManagedAddress<Env::Api>, &BigUint<Env::Api>, FunctionCall<Env::Api>) -> R,
     {
         self.map_egld_or_esdt(
             (to, fc, f),
diff --git a/framework/base/src/types/interaction/tx_payment/tx_payment_egld_or_esdt_refs.rs b/framework/base/src/types/interaction/tx_payment/tx_payment_egld_or_esdt_refs.rs
index fe0bc1352d..14f9058b55 100644
--- a/framework/base/src/types/interaction/tx_payment/tx_payment_egld_or_esdt_refs.rs
+++ b/framework/base/src/types/interaction/tx_payment/tx_payment_egld_or_esdt_refs.rs
@@ -35,7 +35,7 @@ where
     where
         From: TxFrom<Env>,
         To: TxToSpecified<Env>,
-        F: FnOnce(&ManagedAddress<Env::Api>, &BigUint<Env::Api>, &FunctionCall<Env::Api>) -> R,
+        F: FnOnce(&ManagedAddress<Env::Api>, &BigUint<Env::Api>, FunctionCall<Env::Api>) -> R,
     {
         self.map_egld_or_esdt(
             (to, fc, f),
diff --git a/framework/base/src/types/interaction/tx_payment/tx_payment_egld_or_multi_esdt.rs b/framework/base/src/types/interaction/tx_payment/tx_payment_egld_or_multi_esdt.rs
index 2538383494..79cd7f9f72 100644
--- a/framework/base/src/types/interaction/tx_payment/tx_payment_egld_or_multi_esdt.rs
+++ b/framework/base/src/types/interaction/tx_payment/tx_payment_egld_or_multi_esdt.rs
@@ -38,7 +38,7 @@ where
     where
         From: TxFrom<Env>,
         To: TxToSpecified<Env>,
-        F: FnOnce(&ManagedAddress<Env::Api>, &BigUint<Env::Api>, &FunctionCall<Env::Api>) -> R,
+        F: FnOnce(&ManagedAddress<Env::Api>, &BigUint<Env::Api>, FunctionCall<Env::Api>) -> R,
     {
         match self {
             EgldOrMultiEsdtPayment::Egld(egld_amount) => {
@@ -98,7 +98,7 @@ where
     where
         From: TxFrom<Env>,
         To: TxToSpecified<Env>,
-        F: FnOnce(&ManagedAddress<Env::Api>, &BigUint<Env::Api>, &FunctionCall<Env::Api>) -> R,
+        F: FnOnce(&ManagedAddress<Env::Api>, &BigUint<Env::Api>, FunctionCall<Env::Api>) -> R,
     {
         match self {
             EgldOrMultiEsdtPayment::Egld(egld_amount) => {
diff --git a/framework/base/src/types/interaction/tx_payment/tx_payment_egld_or_multi_esdt_ref.rs b/framework/base/src/types/interaction/tx_payment/tx_payment_egld_or_multi_esdt_ref.rs
index 2bce84e1ff..9d4eb6c20a 100644
--- a/framework/base/src/types/interaction/tx_payment/tx_payment_egld_or_multi_esdt_ref.rs
+++ b/framework/base/src/types/interaction/tx_payment/tx_payment_egld_or_multi_esdt_ref.rs
@@ -38,7 +38,7 @@ where
     where
         From: TxFrom<Env>,
         To: TxToSpecified<Env>,
-        F: FnOnce(&ManagedAddress<Env::Api>, &BigUint<Env::Api>, &FunctionCall<Env::Api>) -> R,
+        F: FnOnce(&ManagedAddress<Env::Api>, &BigUint<Env::Api>, FunctionCall<Env::Api>) -> R,
     {
         match self {
             EgldOrMultiEsdtPaymentRefs::Egld(egld_amount) => {
diff --git a/framework/base/src/types/interaction/tx_payment/tx_payment_multi_esdt.rs b/framework/base/src/types/interaction/tx_payment/tx_payment_multi_esdt.rs
index 892fd2c114..c19dd98d4f 100644
--- a/framework/base/src/types/interaction/tx_payment/tx_payment_multi_esdt.rs
+++ b/framework/base/src/types/interaction/tx_payment/tx_payment_multi_esdt.rs
@@ -56,14 +56,14 @@ where
     where
         From: TxFrom<Env>,
         To: TxToSpecified<Env>,
-        F: FnOnce(&ManagedAddress<Env::Api>, &BigUint<Env::Api>, &FunctionCall<Env::Api>) -> R,
+        F: FnOnce(&ManagedAddress<Env::Api>, &BigUint<Env::Api>, FunctionCall<Env::Api>) -> R,
     {
         match self.len() {
             0 => ().with_normalized(env, from, to, fc, f),
             1 => self.get(0).as_refs().with_normalized(env, from, to, fc, f),
             _ => to.with_address_ref(env, |to_addr| {
                 let fc_conv = fc.convert_to_multi_transfer_esdt_call(to_addr, self);
-                f(&from.resolve_address(env), &BigUint::zero(), &fc_conv)
+                f(&from.resolve_address(env), &BigUint::zero(), fc_conv)
             }),
         }
     }
@@ -106,7 +106,7 @@ where
     where
         From: TxFrom<Env>,
         To: TxToSpecified<Env>,
-        F: FnOnce(&ManagedAddress<Env::Api>, &BigUint<Env::Api>, &FunctionCall<Env::Api>) -> R,
+        F: FnOnce(&ManagedAddress<Env::Api>, &BigUint<Env::Api>, FunctionCall<Env::Api>) -> R,
     {
         self.deref().with_normalized(env, from, to, fc, f)
     }
@@ -145,7 +145,7 @@ where
     where
         From: TxFrom<Env>,
         To: TxToSpecified<Env>,
-        F: FnOnce(&ManagedAddress<Env::Api>, &BigUint<Env::Api>, &FunctionCall<Env::Api>) -> R,
+        F: FnOnce(&ManagedAddress<Env::Api>, &BigUint<Env::Api>, FunctionCall<Env::Api>) -> R,
     {
         (&self).with_normalized(env, from, to, fc, f)
     }
diff --git a/framework/base/src/types/interaction/tx_payment/tx_payment_none.rs b/framework/base/src/types/interaction/tx_payment/tx_payment_none.rs
index fe6016e43b..a7ad7c57dc 100644
--- a/framework/base/src/types/interaction/tx_payment/tx_payment_none.rs
+++ b/framework/base/src/types/interaction/tx_payment/tx_payment_none.rs
@@ -31,9 +31,9 @@ where
     where
         From: TxFrom<Env>,
         To: TxToSpecified<Env>,
-        F: FnOnce(&ManagedAddress<Env::Api>, &BigUint<Env::Api>, &FunctionCall<Env::Api>) -> R,
+        F: FnOnce(&ManagedAddress<Env::Api>, &BigUint<Env::Api>, FunctionCall<Env::Api>) -> R,
     {
-        to.with_address_ref(env, |to_addr| f(to_addr, &BigUint::zero(), &fc))
+        to.with_address_ref(env, |to_addr| f(to_addr, &BigUint::zero(), fc))
     }
 
     fn into_full_payment_data(self, _env: &Env) -> FullPaymentData<Env::Api> {
diff --git a/framework/base/src/types/interaction/tx_payment/tx_payment_single_esdt.rs b/framework/base/src/types/interaction/tx_payment/tx_payment_single_esdt.rs
index 975a5d0d78..4d329cbcf6 100644
--- a/framework/base/src/types/interaction/tx_payment/tx_payment_single_esdt.rs
+++ b/framework/base/src/types/interaction/tx_payment/tx_payment_single_esdt.rs
@@ -34,7 +34,7 @@ where
     where
         From: TxFrom<Env>,
         To: TxToSpecified<Env>,
-        F: FnOnce(&ManagedAddress<Env::Api>, &BigUint<Env::Api>, &FunctionCall<Env::Api>) -> R,
+        F: FnOnce(&ManagedAddress<Env::Api>, &BigUint<Env::Api>, FunctionCall<Env::Api>) -> R,
     {
         self.as_refs().with_normalized(env, from, to, fc, f)
     }
@@ -80,7 +80,7 @@ where
     where
         From: TxFrom<Env>,
         To: TxToSpecified<Env>,
-        F: FnOnce(&ManagedAddress<Env::Api>, &BigUint<Env::Api>, &FunctionCall<Env::Api>) -> R,
+        F: FnOnce(&ManagedAddress<Env::Api>, &BigUint<Env::Api>, FunctionCall<Env::Api>) -> R,
     {
         self.as_refs().with_normalized(env, from, to, fc, f)
     }
diff --git a/framework/base/src/types/interaction/tx_payment/tx_payment_single_esdt_ref.rs b/framework/base/src/types/interaction/tx_payment/tx_payment_single_esdt_ref.rs
index bc5e2532a8..0ccc4b869a 100644
--- a/framework/base/src/types/interaction/tx_payment/tx_payment_single_esdt_ref.rs
+++ b/framework/base/src/types/interaction/tx_payment/tx_payment_single_esdt_ref.rs
@@ -57,15 +57,15 @@ where
     where
         From: TxFrom<Env>,
         To: TxToSpecified<Env>,
-        F: FnOnce(&ManagedAddress<Env::Api>, &BigUint<Env::Api>, &FunctionCall<Env::Api>) -> R,
+        F: FnOnce(&ManagedAddress<Env::Api>, &BigUint<Env::Api>, FunctionCall<Env::Api>) -> R,
     {
         to.with_address_ref(env, |to_addr| {
             if self.token_nonce == 0 {
                 let fc_conv = fc.convert_to_single_transfer_fungible_call(self);
-                f(to_addr, &BigUint::zero(), &fc_conv)
+                f(to_addr, &BigUint::zero(), fc_conv)
             } else {
                 let fc_conv = fc.convert_to_single_transfer_nft_call(to_addr, self);
-                f(&from.resolve_address(env), &BigUint::zero(), &fc_conv)
+                f(&from.resolve_address(env), &BigUint::zero(), fc_conv)
             }
         })
     }
diff --git a/framework/base/src/types/interaction/tx_payment/tx_payment_single_esdt_triple.rs b/framework/base/src/types/interaction/tx_payment/tx_payment_single_esdt_triple.rs
index c49062eb27..0ef85acd7f 100644
--- a/framework/base/src/types/interaction/tx_payment/tx_payment_single_esdt_triple.rs
+++ b/framework/base/src/types/interaction/tx_payment/tx_payment_single_esdt_triple.rs
@@ -33,7 +33,7 @@ where
     where
         From: TxFrom<Env>,
         To: TxToSpecified<Env>,
-        F: FnOnce(&ManagedAddress<Env::Api>, &BigUint<Env::Api>, &FunctionCall<Env::Api>) -> R,
+        F: FnOnce(&ManagedAddress<Env::Api>, &BigUint<Env::Api>, FunctionCall<Env::Api>) -> R,
     {
         EsdtTokenPayment::from(self).with_normalized(env, from, to, fc, f)
     }

From 504f70740d791cf0333dde4204c7b243c9c59287 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 10 May 2024 00:52:52 +0300
Subject: [PATCH 0862/1254] multisig interactor - fixed wegld scenario

---
 Cargo.lock                                    |   1 +
 contracts/core/wegld-swap/sc-config.toml      |   2 +
 .../examples/multisig/interact/Cargo.toml     |   4 +
 .../examples/multisig/interact/config.toml    |   2 +
 .../interact/src/multisig_interact.rs         |   9 +-
 .../interact/src/multisig_interact_config.rs  |  25 ++--
 .../interact/src/multisig_interact_wegld.rs   |  45 +++---
 .../multisig/interact/src/wegld_proxy.rs      | 129 ++++++++++++++++++
 contracts/examples/multisig/wegld_proxy.rs    | 129 ++++++++++++++++++
 framework/base/src/types/interaction/tx.rs    |  34 +++++
 .../base/src/types/interaction/tx_payment.rs  |   2 +-
 .../tx_payment/tx_payment_not_payable.rs      |   2 +-
 .../types/managed/wrapped/token_identifier.rs |   6 +
 .../scenario/tx_to_step/tx_to_step_query.rs   |   3 +-
 .../scenario/src/standalone/account_tool.rs   |  10 +-
 15 files changed, 364 insertions(+), 39 deletions(-)
 create mode 100644 contracts/core/wegld-swap/sc-config.toml
 create mode 100644 contracts/examples/multisig/interact/src/wegld_proxy.rs
 create mode 100644 contracts/examples/multisig/wegld_proxy.rs

diff --git a/Cargo.lock b/Cargo.lock
index 9e833243ba..fe83047020 100755
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1830,6 +1830,7 @@ version = "0.0.0"
 dependencies = [
  "clap",
  "multisig",
+ "multiversx-sc",
  "multiversx-sc-modules",
  "multiversx-sc-scenario",
  "multiversx-sc-snippets",
diff --git a/contracts/core/wegld-swap/sc-config.toml b/contracts/core/wegld-swap/sc-config.toml
new file mode 100644
index 0000000000..27465ed64a
--- /dev/null
+++ b/contracts/core/wegld-swap/sc-config.toml
@@ -0,0 +1,2 @@
+[[proxy]]
+path = "../../examples/multisig/interact/src/wegld_proxy.rs"
diff --git a/contracts/examples/multisig/interact/Cargo.toml b/contracts/examples/multisig/interact/Cargo.toml
index 8e332e4b35..ee40893001 100644
--- a/contracts/examples/multisig/interact/Cargo.toml
+++ b/contracts/examples/multisig/interact/Cargo.toml
@@ -28,3 +28,7 @@ path = "../../../../framework/snippets"
 [dependencies.multiversx-sc-scenario]
 version = "=0.49.0"
 path = "../../../../framework/scenario"
+
+[dependencies.multiversx-sc]
+version = "=0.49.0"
+path = "../../../../framework/base"
diff --git a/contracts/examples/multisig/interact/config.toml b/contracts/examples/multisig/interact/config.toml
index a3b733f73d..cff3e1a76c 100644
--- a/contracts/examples/multisig/interact/config.toml
+++ b/contracts/examples/multisig/interact/config.toml
@@ -1,2 +1,4 @@
 gateway = 'https://devnet-gateway.multiversx.com'
 quorum = 2
+wegld_address = "erd1qqqqqqqqqqqqqpgqqkwzsxkjc83vlfex9dmznwm7tjvxlqqkpauqx0n782"
+wegld_token_identifier = "WEGLD-a28c59"
diff --git a/contracts/examples/multisig/interact/src/multisig_interact.rs b/contracts/examples/multisig/interact/src/multisig_interact.rs
index eaef5d8448..497b6636dd 100644
--- a/contracts/examples/multisig/interact/src/multisig_interact.rs
+++ b/contracts/examples/multisig/interact/src/multisig_interact.rs
@@ -3,6 +3,7 @@ mod multisig_interact_config;
 mod multisig_interact_nfts;
 mod multisig_interact_state;
 mod multisig_interact_wegld;
+mod wegld_proxy;
 
 use clap::Parser;
 use multisig::multisig_proxy;
@@ -78,13 +79,14 @@ struct MultisigInteract {
     wallet_address: Bech32Address,
     collection_token_identifier: String,
     multisig_code: BytesValue,
+    config: Config,
     state: State,
 }
 
 impl MultisigInteract {
     async fn init() -> Self {
         let config = Config::load_config();
-        let mut interactor = Interactor::new(config.gateway())
+        let mut interactor = Interactor::new(&config.gateway)
             .await
             .with_tracer(INTERACTOR_SCENARIO_TRACE_PATH)
             .await;
@@ -99,6 +101,7 @@ impl MultisigInteract {
             wallet_address: wallet_address.into(),
             collection_token_identifier: String::new(),
             multisig_code,
+            config,
             state: State::load_state(),
         }
     }
@@ -132,7 +135,7 @@ impl MultisigInteract {
 
         let board = self.board();
 
-        let quorum = Config::load_config().quorum();
+        let quorum = self.config.quorum;
         let new_address = self
             .interactor
             .tx()
@@ -160,7 +163,7 @@ impl MultisigInteract {
         println!("deploying {count} contracts...");
 
         let board = self.board();
-        let quorum = Config::load_config().quorum();
+        let quorum = Config::load_config().quorum;
         let mut buffer = self.interactor.homogenous_call_buffer();
         for _ in 0..*count {
             buffer.push_tx(|tx| {
diff --git a/contracts/examples/multisig/interact/src/multisig_interact_config.rs b/contracts/examples/multisig/interact/src/multisig_interact_config.rs
index 2a7ea60f3a..501deab9d3 100644
--- a/contracts/examples/multisig/interact/src/multisig_interact_config.rs
+++ b/contracts/examples/multisig/interact/src/multisig_interact_config.rs
@@ -1,3 +1,4 @@
+use multiversx_sc_scenario::imports::Bech32Address;
 use serde::Deserialize;
 use std::io::Read;
 
@@ -7,8 +8,10 @@ const CONFIG_FILE: &str = "config.toml";
 /// Multisig Interact configuration
 #[derive(Debug, Deserialize)]
 pub struct Config {
-    gateway: String,
-    quorum: usize,
+    pub gateway: String,
+    pub quorum: usize,
+    pub wegld_address: Bech32Address,
+    pub wegld_token_identifier: String,
 }
 
 impl Config {
@@ -20,13 +23,17 @@ impl Config {
         toml::from_str(&content).unwrap()
     }
 
-    // Returns the gateway
-    pub fn gateway(&self) -> &str {
-        &self.gateway
-    }
+    // // Returns the gateway
+    // pub fn gateway(&self) -> &str {
+    //     &self.gateway
+    // }
 
     // Returns the quorum
-    pub fn quorum(&self) -> usize {
-        self.quorum
-    }
+    // pub fn quorum(&self) -> usize {
+    //     self.quorum
+    // }
+
+    // pub fn wegld_address(&self) -> Bech32Address {
+    //     Bech32Address::from_bech32_string(bech32)
+    // }
 }
diff --git a/contracts/examples/multisig/interact/src/multisig_interact_wegld.rs b/contracts/examples/multisig/interact/src/multisig_interact_wegld.rs
index a59e686e2a..00722b8c6b 100644
--- a/contracts/examples/multisig/interact/src/multisig_interact_wegld.rs
+++ b/contracts/examples/multisig/interact/src/multisig_interact_wegld.rs
@@ -4,8 +4,8 @@ use multiversx_sc_snippets::imports::*;
 
 use super::*;
 
-const WEGLD_SWAP_SC_BECH32: &str = "erd1qqqqqqqqqqqqqpgqcy2wua5cq59y6sxqj2ka3scayh5e5ms7cthqht8xtp";
-const WEGLD_TOKEN_IDENTIFIER: &str = "WEGLD-6cf38e";
+// const WEGLD_SWAP_SC_BECH32: &str = "erd1qqqqqqqqqqqqqpgqqkwzsxkjc83vlfex9dmznwm7tjvxlqqkpauqx0n782"; // shard 0
+// const WEGLD_TOKEN_IDENTIFIER: TestTokenIdentifier = TestTokenIdentifier::new("WEGLD-a28c59");
 const WRAP_AMOUNT: u64 = 50000000000000000; // 0.05 EGLD
 const UNWRAP_AMOUNT: u64 = 25000000000000000; // 0.025 WEGLD
 
@@ -36,13 +36,20 @@ impl MultisigInteract {
 
     pub async fn wegld_swap_set_state(&mut self) {
         self.interactor
-            .retrieve_account(&Bech32Address::from_bech32_string(
-                WEGLD_SWAP_SC_BECH32.to_owned(),
-            ))
+            .retrieve_account(&self.config.wegld_address)
             .await;
     }
 
     async fn propose_wrap_egld(&mut self) -> usize {
+        let (action_to, action_egld, action_fc) = self
+            .interactor
+            .tx()
+            .to(&self.config.wegld_address)
+            .typed(wegld_proxy::EgldEsdtSwapProxy)
+            .wrap_egld()
+            .egld(WRAP_AMOUNT)
+            .into_normalized();
+
         let action_id = self
             .interactor
             .tx()
@@ -50,11 +57,7 @@ impl MultisigInteract {
             .to(self.state.current_multisig_address())
             .gas(NumExpr("10,000,000"))
             .typed(multisig_proxy::MultisigProxy)
-            .propose_async_call(
-                bech32::decode(WEGLD_SWAP_SC_BECH32),
-                WRAP_AMOUNT,
-                FunctionCall::new("wrapEgld"),
-            )
+            .propose_async_call(action_to, action_egld, action_fc)
             .returns(ReturnsResult)
             .prepare_async()
             .run()
@@ -65,13 +68,18 @@ impl MultisigInteract {
     }
 
     async fn propose_unwrap_egld(&mut self) -> usize {
-        let to = ManagedAddress::<StaticApi>::from(bech32::decode(WEGLD_SWAP_SC_BECH32));
-        let payment = EsdtTokenPayment::new(
-            TokenIdentifier::from(WEGLD_TOKEN_IDENTIFIER),
-            0u64,
-            UNWRAP_AMOUNT.into(),
-        );
-        let function_call = FunctionCall::new("unwrapEgld");
+        let (action_to, action_egld, action_fc) = self
+            .interactor
+            .tx()
+            .to(&self.config.wegld_address)
+            .typed(wegld_proxy::EgldEsdtSwapProxy)
+            .unwrap_egld()
+            .single_esdt(
+                &TokenIdentifier::from(&self.config.wegld_token_identifier),
+                0u64,
+                &UNWRAP_AMOUNT.into(),
+            )
+            .into_normalized();
 
         let action_id = self
             .interactor
@@ -80,8 +88,7 @@ impl MultisigInteract {
             .to(self.state.current_multisig_address())
             .gas(NumExpr("10,000,000"))
             .typed(multisig_proxy::MultisigProxy)
-            .propose_async_call(to, 0u64, function_call)
-            .esdt(payment)
+            .propose_async_call(action_to, action_egld, action_fc)
             .returns(ReturnsResult)
             .prepare_async()
             .run()
diff --git a/contracts/examples/multisig/interact/src/wegld_proxy.rs b/contracts/examples/multisig/interact/src/wegld_proxy.rs
new file mode 100644
index 0000000000..404831a1bd
--- /dev/null
+++ b/contracts/examples/multisig/interact/src/wegld_proxy.rs
@@ -0,0 +1,129 @@
+// Code generated by the multiversx-sc proxy generator. DO NOT EDIT.
+
+////////////////////////////////////////////////////
+////////////////// AUTO-GENERATED //////////////////
+////////////////////////////////////////////////////
+
+#![allow(dead_code)]
+#![allow(clippy::all)]
+
+use multiversx_sc::proxy_imports::*;
+
+pub struct EgldEsdtSwapProxy;
+
+impl<Env, From, To, Gas> TxProxyTrait<Env, From, To, Gas> for EgldEsdtSwapProxy
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    type TxProxyMethods = EgldEsdtSwapProxyMethods<Env, From, To, Gas>;
+
+    fn proxy_methods(self, tx: Tx<Env, From, To, (), Gas, (), ()>) -> Self::TxProxyMethods {
+        EgldEsdtSwapProxyMethods { wrapped_tx: tx }
+    }
+}
+
+pub struct EgldEsdtSwapProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    wrapped_tx: Tx<Env, From, To, (), Gas, (), ()>,
+}
+
+#[rustfmt::skip]
+impl<Env, From, Gas> EgldEsdtSwapProxyMethods<Env, From, (), Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn init<
+        Arg0: ProxyArg<TokenIdentifier<Env::Api>>,
+    >(
+        self,
+        wrapped_egld_token_id: Arg0,
+    ) -> TxTypedDeploy<Env, From, NotPayable, Gas, ()> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_deploy()
+            .argument(&wrapped_egld_token_id)
+            .original_result()
+    }
+}
+
+#[rustfmt::skip]
+impl<Env, From, To, Gas> EgldEsdtSwapProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn wrap_egld(
+        self,
+    ) -> TxTypedCall<Env, From, To, (), Gas, EsdtTokenPayment<Env::Api>> {
+        self.wrapped_tx
+            .raw_call("wrapEgld")
+            .original_result()
+    }
+
+    pub fn unwrap_egld(
+        self,
+    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
+        self.wrapped_tx
+            .raw_call("unwrapEgld")
+            .original_result()
+    }
+
+    pub fn get_locked_egld_balance(
+        self,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, BigUint<Env::Api>> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("getLockedEgldBalance")
+            .original_result()
+    }
+
+    pub fn wrapped_egld_token_id(
+        self,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, TokenIdentifier<Env::Api>> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("getWrappedEgldTokenId")
+            .original_result()
+    }
+
+    pub fn pause_endpoint(
+        self,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("pause")
+            .original_result()
+    }
+
+    pub fn unpause_endpoint(
+        self,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("unpause")
+            .original_result()
+    }
+
+    pub fn paused_status(
+        self,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, bool> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("isPaused")
+            .original_result()
+    }
+}
diff --git a/contracts/examples/multisig/wegld_proxy.rs b/contracts/examples/multisig/wegld_proxy.rs
new file mode 100644
index 0000000000..404831a1bd
--- /dev/null
+++ b/contracts/examples/multisig/wegld_proxy.rs
@@ -0,0 +1,129 @@
+// Code generated by the multiversx-sc proxy generator. DO NOT EDIT.
+
+////////////////////////////////////////////////////
+////////////////// AUTO-GENERATED //////////////////
+////////////////////////////////////////////////////
+
+#![allow(dead_code)]
+#![allow(clippy::all)]
+
+use multiversx_sc::proxy_imports::*;
+
+pub struct EgldEsdtSwapProxy;
+
+impl<Env, From, To, Gas> TxProxyTrait<Env, From, To, Gas> for EgldEsdtSwapProxy
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    type TxProxyMethods = EgldEsdtSwapProxyMethods<Env, From, To, Gas>;
+
+    fn proxy_methods(self, tx: Tx<Env, From, To, (), Gas, (), ()>) -> Self::TxProxyMethods {
+        EgldEsdtSwapProxyMethods { wrapped_tx: tx }
+    }
+}
+
+pub struct EgldEsdtSwapProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    wrapped_tx: Tx<Env, From, To, (), Gas, (), ()>,
+}
+
+#[rustfmt::skip]
+impl<Env, From, Gas> EgldEsdtSwapProxyMethods<Env, From, (), Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn init<
+        Arg0: ProxyArg<TokenIdentifier<Env::Api>>,
+    >(
+        self,
+        wrapped_egld_token_id: Arg0,
+    ) -> TxTypedDeploy<Env, From, NotPayable, Gas, ()> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_deploy()
+            .argument(&wrapped_egld_token_id)
+            .original_result()
+    }
+}
+
+#[rustfmt::skip]
+impl<Env, From, To, Gas> EgldEsdtSwapProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn wrap_egld(
+        self,
+    ) -> TxTypedCall<Env, From, To, (), Gas, EsdtTokenPayment<Env::Api>> {
+        self.wrapped_tx
+            .raw_call("wrapEgld")
+            .original_result()
+    }
+
+    pub fn unwrap_egld(
+        self,
+    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
+        self.wrapped_tx
+            .raw_call("unwrapEgld")
+            .original_result()
+    }
+
+    pub fn get_locked_egld_balance(
+        self,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, BigUint<Env::Api>> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("getLockedEgldBalance")
+            .original_result()
+    }
+
+    pub fn wrapped_egld_token_id(
+        self,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, TokenIdentifier<Env::Api>> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("getWrappedEgldTokenId")
+            .original_result()
+    }
+
+    pub fn pause_endpoint(
+        self,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("pause")
+            .original_result()
+    }
+
+    pub fn unpause_endpoint(
+        self,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("unpause")
+            .original_result()
+    }
+
+    pub fn paused_status(
+        self,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, bool> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("isPaused")
+            .original_result()
+    }
+}
diff --git a/framework/base/src/types/interaction/tx.rs b/framework/base/src/types/interaction/tx.rs
index b1e6de8a10..9b9f9a99f4 100644
--- a/framework/base/src/types/interaction/tx.rs
+++ b/framework/base/src/types/interaction/tx.rs
@@ -452,6 +452,40 @@ where
     }
 }
 
+impl<Env, From, To, Payment, Gas, RH> Tx<Env, From, To, Payment, Gas, FunctionCall<Env::Api>, RH>
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxToSpecified<Env>,
+    Payment: TxPayment<Env>,
+    Gas: TxGas<Env>,
+    RH: TxResultHandler<Env>,
+{
+    /// Producs the normalized function call, i.e. with builtin function calls for ESDT transfers.
+    ///
+    /// The output is a triple, made up of
+    /// - the recipient (some builtin functions are called with recipient = sender),
+    /// - EGLD value,
+    /// - the normalized function call.
+    ///
+    /// Warning: some clones are performed, it is not optimized for contracts, but can be used nonetheless.
+    pub fn into_normalized(
+        self,
+    ) -> (
+        ManagedAddress<Env::Api>,
+        BigUint<Env::Api>,
+        FunctionCall<Env::Api>,
+    ) {
+        self.payment.with_normalized(
+            &self.env,
+            &self.from,
+            self.to,
+            self.data,
+            |norm_to, norm_egld, norm_fc| (norm_to.clone(), norm_egld.clone(), norm_fc),
+        )
+    }
+}
+
 impl<Env, From, Payment, Gas> Tx<Env, From, (), Payment, Gas, (), ()>
 where
     Env: TxEnv,
diff --git a/framework/base/src/types/interaction/tx_payment.rs b/framework/base/src/types/interaction/tx_payment.rs
index 3a4db68478..13cbb6c06b 100644
--- a/framework/base/src/types/interaction/tx_payment.rs
+++ b/framework/base/src/types/interaction/tx_payment.rs
@@ -60,7 +60,7 @@ where
 }
 
 /// Marker trait that indicates that payment field contains no payment.
-/// 
+///
 /// Implemented by `()` and `NotPayable`.
 pub trait TxNoPayment<Env>: TxPayment<Env>
 where
diff --git a/framework/base/src/types/interaction/tx_payment/tx_payment_not_payable.rs b/framework/base/src/types/interaction/tx_payment/tx_payment_not_payable.rs
index bf43ba1cfd..a198a50c98 100644
--- a/framework/base/src/types/interaction/tx_payment/tx_payment_not_payable.rs
+++ b/framework/base/src/types/interaction/tx_payment/tx_payment_not_payable.rs
@@ -42,7 +42,7 @@ where
     where
         From: TxFrom<Env>,
         To: TxToSpecified<Env>,
-        F: FnOnce(&ManagedAddress<Env::Api>, &BigUint<Env::Api>, &FunctionCall<Env::Api>) -> R,
+        F: FnOnce(&ManagedAddress<Env::Api>, &BigUint<Env::Api>, FunctionCall<Env::Api>) -> R,
     {
         ().with_normalized(env, from, to, fc, f)
     }
diff --git a/framework/base/src/types/managed/wrapped/token_identifier.rs b/framework/base/src/types/managed/wrapped/token_identifier.rs
index f8ae1a6984..861e964e8a 100644
--- a/framework/base/src/types/managed/wrapped/token_identifier.rs
+++ b/framework/base/src/types/managed/wrapped/token_identifier.rs
@@ -96,6 +96,12 @@ impl<M: ManagedTypeApi> From<&str> for TokenIdentifier<M> {
     }
 }
 
+impl<M: ManagedTypeApi> From<&crate::types::heap::String> for TokenIdentifier<M> {
+    fn from(s: &crate::types::heap::String) -> Self {
+        TokenIdentifier::from(s.as_bytes())
+    }
+}
+
 impl<M: ManagedTypeApi> PartialEq for TokenIdentifier<M> {
     #[inline]
     fn eq(&self, other: &Self) -> bool {
diff --git a/framework/scenario/src/scenario/tx_to_step/tx_to_step_query.rs b/framework/scenario/src/scenario/tx_to_step/tx_to_step_query.rs
index 3a94a1887d..b9e25a707d 100644
--- a/framework/scenario/src/scenario/tx_to_step/tx_to_step_query.rs
+++ b/framework/scenario/src/scenario/tx_to_step/tx_to_step_query.rs
@@ -4,7 +4,8 @@ use crate::scenario_model::{ScQueryStep, TxExpect, TxResponse};
 
 use super::{address_annotated, StepWrapper, TxToQueryStep};
 
-impl<Env, To, Payment, RH> TxToQueryStep<Env, RH> for Tx<Env, (), To, Payment, (), FunctionCall<Env::Api>, RH>
+impl<Env, To, Payment, RH> TxToQueryStep<Env, RH>
+    for Tx<Env, (), To, Payment, (), FunctionCall<Env::Api>, RH>
 where
     Env: TxEnv<RHExpect = TxExpect>,
     To: TxToSpecified<Env>,
diff --git a/framework/scenario/src/standalone/account_tool.rs b/framework/scenario/src/standalone/account_tool.rs
index 1ea1e2f6b4..b6db384b91 100644
--- a/framework/scenario/src/standalone/account_tool.rs
+++ b/framework/scenario/src/standalone/account_tool.rs
@@ -75,14 +75,14 @@ pub fn set_account(
     account_state.storage = convert_storage(account_storage);
 
     for (_, esdt_balance) in account_esdt.iter() {
-        account_state = account_state.esdt_balance(
-            format!("str:{}", esdt_balance.token_identifier).as_str(),
-            esdt_balance.balance.as_str(),
-        );
+        let token_id_expr = format!("str:{}", esdt_balance.token_identifier);
+        account_state =
+            account_state.esdt_balance(token_id_expr.as_str(), esdt_balance.balance.as_str());
     }
 
     for (token_id, esdt_roles) in account_esdt_roles {
-        account_state = account_state.esdt_roles(token_id.as_str(), esdt_roles);
+        let token_id_expr = format!("str:{token_id}");
+        account_state = account_state.esdt_roles(token_id_expr.as_str(), esdt_roles);
     }
 
     account_state

From c5c310ea9214232a923843088f38bfb30e18f628 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 10 May 2024 01:00:32 +0300
Subject: [PATCH 0863/1254] multisig interactor - query WEGLD token id

---
 .../examples/multisig/interact/config.toml    |  1 -
 .../interact/src/multisig_interact_config.rs  | 15 -----------
 .../interact/src/multisig_interact_wegld.rs   | 25 +++++++++++++++----
 3 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/contracts/examples/multisig/interact/config.toml b/contracts/examples/multisig/interact/config.toml
index cff3e1a76c..029fab5ac7 100644
--- a/contracts/examples/multisig/interact/config.toml
+++ b/contracts/examples/multisig/interact/config.toml
@@ -1,4 +1,3 @@
 gateway = 'https://devnet-gateway.multiversx.com'
 quorum = 2
 wegld_address = "erd1qqqqqqqqqqqqqpgqqkwzsxkjc83vlfex9dmznwm7tjvxlqqkpauqx0n782"
-wegld_token_identifier = "WEGLD-a28c59"
diff --git a/contracts/examples/multisig/interact/src/multisig_interact_config.rs b/contracts/examples/multisig/interact/src/multisig_interact_config.rs
index 501deab9d3..4aa9903cc0 100644
--- a/contracts/examples/multisig/interact/src/multisig_interact_config.rs
+++ b/contracts/examples/multisig/interact/src/multisig_interact_config.rs
@@ -11,7 +11,6 @@ pub struct Config {
     pub gateway: String,
     pub quorum: usize,
     pub wegld_address: Bech32Address,
-    pub wegld_token_identifier: String,
 }
 
 impl Config {
@@ -22,18 +21,4 @@ impl Config {
         file.read_to_string(&mut content).unwrap();
         toml::from_str(&content).unwrap()
     }
-
-    // // Returns the gateway
-    // pub fn gateway(&self) -> &str {
-    //     &self.gateway
-    // }
-
-    // Returns the quorum
-    // pub fn quorum(&self) -> usize {
-    //     self.quorum
-    // }
-
-    // pub fn wegld_address(&self) -> Bech32Address {
-    //     Bech32Address::from_bech32_string(bech32)
-    // }
 }
diff --git a/contracts/examples/multisig/interact/src/multisig_interact_wegld.rs b/contracts/examples/multisig/interact/src/multisig_interact_wegld.rs
index 00722b8c6b..9cf5ad9e6e 100644
--- a/contracts/examples/multisig/interact/src/multisig_interact_wegld.rs
+++ b/contracts/examples/multisig/interact/src/multisig_interact_wegld.rs
@@ -67,18 +67,33 @@ impl MultisigInteract {
         action_id
     }
 
+    pub async fn query_wegld_token_identifier(&mut self) -> TokenIdentifier<StaticApi> {
+        let wegld_token_id = self
+            .interactor
+            .query()
+            .to(&self.config.wegld_address)
+            .typed(wegld_proxy::EgldEsdtSwapProxy)
+            .wrapped_egld_token_id()
+            .returns(ReturnsResult)
+            .prepare_async()
+            .run()
+            .await;
+
+        println!("WEGLD token identifier: {wegld_token_id}");
+
+        wegld_token_id
+    }
+
     async fn propose_unwrap_egld(&mut self) -> usize {
+        let wegld_token_id = self.query_wegld_token_identifier().await;
+
         let (action_to, action_egld, action_fc) = self
             .interactor
             .tx()
             .to(&self.config.wegld_address)
             .typed(wegld_proxy::EgldEsdtSwapProxy)
             .unwrap_egld()
-            .single_esdt(
-                &TokenIdentifier::from(&self.config.wegld_token_identifier),
-                0u64,
-                &UNWRAP_AMOUNT.into(),
-            )
+            .single_esdt(&wegld_token_id, 0u64, &UNWRAP_AMOUNT.into())
             .into_normalized();
 
         let action_id = self

From 05dfc01e3fc7314ec0b6459e879f88f00a84c307 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 10 May 2024 01:27:47 +0300
Subject: [PATCH 0864/1254] unified syntax - normalize method refactor

---
 .../interact/src/multisig_interact_wegld.rs   | 15 +++---
 framework/base/src/types/interaction/tx.rs    | 46 ++++++++++++++-----
 2 files changed, 42 insertions(+), 19 deletions(-)

diff --git a/contracts/examples/multisig/interact/src/multisig_interact_wegld.rs b/contracts/examples/multisig/interact/src/multisig_interact_wegld.rs
index 9cf5ad9e6e..97344d8603 100644
--- a/contracts/examples/multisig/interact/src/multisig_interact_wegld.rs
+++ b/contracts/examples/multisig/interact/src/multisig_interact_wegld.rs
@@ -41,14 +41,13 @@ impl MultisigInteract {
     }
 
     async fn propose_wrap_egld(&mut self) -> usize {
-        let (action_to, action_egld, action_fc) = self
+        let function_call = self
             .interactor
             .tx()
             .to(&self.config.wegld_address)
             .typed(wegld_proxy::EgldEsdtSwapProxy)
             .wrap_egld()
-            .egld(WRAP_AMOUNT)
-            .into_normalized();
+            .into_function_call();
 
         let action_id = self
             .interactor
@@ -57,7 +56,7 @@ impl MultisigInteract {
             .to(self.state.current_multisig_address())
             .gas(NumExpr("10,000,000"))
             .typed(multisig_proxy::MultisigProxy)
-            .propose_async_call(action_to, action_egld, action_fc)
+            .propose_async_call(&self.config.wegld_address, WRAP_AMOUNT, function_call)
             .returns(ReturnsResult)
             .prepare_async()
             .run()
@@ -87,14 +86,16 @@ impl MultisigInteract {
     async fn propose_unwrap_egld(&mut self) -> usize {
         let wegld_token_id = self.query_wegld_token_identifier().await;
 
-        let (action_to, action_egld, action_fc) = self
+        let normalized_tx = self
             .interactor
             .tx()
             .to(&self.config.wegld_address)
             .typed(wegld_proxy::EgldEsdtSwapProxy)
             .unwrap_egld()
             .single_esdt(&wegld_token_id, 0u64, &UNWRAP_AMOUNT.into())
-            .into_normalized();
+            .normalize();
+        let normalized_to = normalized_tx.to;
+        let normalized_data = normalized_tx.data;
 
         let action_id = self
             .interactor
@@ -103,7 +104,7 @@ impl MultisigInteract {
             .to(self.state.current_multisig_address())
             .gas(NumExpr("10,000,000"))
             .typed(multisig_proxy::MultisigProxy)
-            .propose_async_call(action_to, action_egld, action_fc)
+            .propose_async_call(normalized_to, 0u64, normalized_data)
             .returns(ReturnsResult)
             .prepare_async()
             .run()
diff --git a/framework/base/src/types/interaction/tx.rs b/framework/base/src/types/interaction/tx.rs
index 9b9f9a99f4..4ed8603734 100644
--- a/framework/base/src/types/interaction/tx.rs
+++ b/framework/base/src/types/interaction/tx.rs
@@ -461,28 +461,50 @@ where
     Gas: TxGas<Env>,
     RH: TxResultHandler<Env>,
 {
-    /// Producs the normalized function call, i.e. with builtin function calls for ESDT transfers.
+    /// Produces the normalized function call, i.e. with builtin function calls for ESDT transfers.
     ///
-    /// The output is a triple, made up of
-    /// - the recipient (some builtin functions are called with recipient = sender),
-    /// - EGLD value,
-    /// - the normalized function call.
+    /// The resulting transaction can differ from the input in several ways:
+    /// - the recipient is changed (some builtin functions are called with recipient = sender),
+    /// - the function call becomes a builtin function call.
     ///
-    /// Warning: some clones are performed, it is not optimized for contracts, but can be used nonetheless.
-    pub fn into_normalized(
+    /// ## Important
+    ///
+    /// Do not call this before sending transactions! Normalization is don automatically whenever necessary.
+    /// Only use when you need the normalized data, e.g. for a multisig.
+    ///
+    /// ## Warning
+    ///
+    /// To produce owned values, some clones are performed.
+    /// It is not optimized for contracts, but can be used nonetheless.
+    #[allow(clippy::type_complexity)]
+    pub fn normalize(
         self,
-    ) -> (
+    ) -> Tx<
+        Env,
+        From,
         ManagedAddress<Env::Api>,
-        BigUint<Env::Api>,
+        EgldPayment<Env::Api>,
+        Gas,
         FunctionCall<Env::Api>,
-    ) {
-        self.payment.with_normalized(
+        RH,
+    > {
+        let (norm_to, norm_egld, norm_fc) = self.payment.with_normalized(
             &self.env,
             &self.from,
             self.to,
             self.data,
             |norm_to, norm_egld, norm_fc| (norm_to.clone(), norm_egld.clone(), norm_fc),
-        )
+        );
+
+        Tx {
+            env: self.env,
+            from: self.from,
+            to: norm_to,
+            payment: Egld(norm_egld),
+            gas: self.gas,
+            data: norm_fc,
+            result_handler: self.result_handler,
+        }
     }
 }
 

From 58ac9536b037c304b6377b23174742b1d629e58d Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 10 May 2024 02:08:23 +0300
Subject: [PATCH 0865/1254] non payable flag - in system proxies & other
 proxies

---
 .../src/nft_marketplace_proxy.rs              |  2 +-
 .../nft-minter/src/nft_marketplace_proxy.rs   |  2 +-
 .../proxy-pause/src/pause_sc_proxy.rs         |  4 +-
 .../tests/mock_seed_nft_minter_proxy.rs       |  4 +-
 .../src/nft_marketplace_proxy.rs              |  4 +-
 .../proxy-test-first/src/message_me_proxy.rs  |  6 +--
 .../proxy-test-first/src/pay_me_proxy.rs      |  8 +--
 .../erc1155/src/erc1155_user_proxy.rs         |  4 +-
 contracts/modules/src/dns_proxy.rs            |  2 +-
 .../contract_base/wrappers/send_wrapper.rs    | 24 +++++++--
 .../system_proxy/builtin_func_proxy.rs        | 33 ++++++++----
 .../system_proxy/esdt_system_sc_proxy.rs      | 52 ++++++++++++-------
 12 files changed, 93 insertions(+), 52 deletions(-)

diff --git a/contracts/examples/fractional-nfts/src/nft_marketplace_proxy.rs b/contracts/examples/fractional-nfts/src/nft_marketplace_proxy.rs
index b977042583..7b45fa08e2 100644
--- a/contracts/examples/fractional-nfts/src/nft_marketplace_proxy.rs
+++ b/contracts/examples/fractional-nfts/src/nft_marketplace_proxy.rs
@@ -46,7 +46,7 @@ where
         claim_destination: Arg0,
         token_id: Arg1,
         token_nonce: Arg2,
-    ) -> TxProxyCall<Env, From, To, Gas, MultiValue2<BigUint<Env::Api>, ManagedVec<Env::Api, EsdtTokenPayment<Env::Api>>>> {
+    ) -> TxTypedCall<Env, From, To, (), Gas, MultiValue2<BigUint<Env::Api>, ManagedVec<Env::Api, EsdtTokenPayment<Env::Api>>>> {
         self.wrapped_tx
             .raw_call("claimTokens")
             .argument(&claim_destination)
diff --git a/contracts/examples/nft-minter/src/nft_marketplace_proxy.rs b/contracts/examples/nft-minter/src/nft_marketplace_proxy.rs
index 7c6028d1fd..84a291bbe4 100644
--- a/contracts/examples/nft-minter/src/nft_marketplace_proxy.rs
+++ b/contracts/examples/nft-minter/src/nft_marketplace_proxy.rs
@@ -44,7 +44,7 @@ where
         token_id: Arg0,
         token_nonce: Arg1,
         claim_destination: Arg2,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
         self.wrapped_tx
             .raw_call("claimTokens")
             .argument(&token_id)
diff --git a/contracts/examples/proxy-pause/src/pause_sc_proxy.rs b/contracts/examples/proxy-pause/src/pause_sc_proxy.rs
index 6f5fc834b9..a547030978 100644
--- a/contracts/examples/proxy-pause/src/pause_sc_proxy.rs
+++ b/contracts/examples/proxy-pause/src/pause_sc_proxy.rs
@@ -37,7 +37,7 @@ where
 {
     pub fn pause(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
         self.wrapped_tx
             .raw_call("pause")
             .original_result()
@@ -45,7 +45,7 @@ where
 
     pub fn unpause(
         self,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
         self.wrapped_tx
             .raw_call("unpause")
             .original_result()
diff --git a/contracts/examples/rewards-distribution/tests/mock_seed_nft_minter_proxy.rs b/contracts/examples/rewards-distribution/tests/mock_seed_nft_minter_proxy.rs
index 379b8e0d05..00cc59adb5 100644
--- a/contracts/examples/rewards-distribution/tests/mock_seed_nft_minter_proxy.rs
+++ b/contracts/examples/rewards-distribution/tests/mock_seed_nft_minter_proxy.rs
@@ -39,7 +39,7 @@ where
     >(
         self,
         nft_token_id: Arg0,
-    ) -> TxProxyDeploy<Env, From, Gas, ()> {
+    ) -> TxTypedDeploy<Env, From, (), Gas, ()> {
         self.wrapped_tx
             .raw_deploy()
             .argument(&nft_token_id)
@@ -61,7 +61,7 @@ where
     >(
         self,
         nft_count: Arg0,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
         self.wrapped_tx
             .raw_call("setNftCount")
             .argument(&nft_count)
diff --git a/contracts/examples/seed-nft-minter/src/nft_marketplace_proxy.rs b/contracts/examples/seed-nft-minter/src/nft_marketplace_proxy.rs
index e41b477e03..dc41de1948 100644
--- a/contracts/examples/seed-nft-minter/src/nft_marketplace_proxy.rs
+++ b/contracts/examples/seed-nft-minter/src/nft_marketplace_proxy.rs
@@ -38,7 +38,7 @@ where
 {
     pub fn init(
         self,
-    ) -> TxProxyDeploy<Env, From, Gas, ()> {
+    ) -> TxTypedDeploy<Env, From, (), Gas, ()> {
         self.wrapped_tx
             .raw_deploy()
             .original_result()
@@ -63,7 +63,7 @@ where
         claim_destination: Arg0,
         token_id: Arg1,
         token_nonce: Arg2,
-    ) -> TxProxyCall<Env, From, To, Gas, MultiValue2<BigUint<Env::Api>, ManagedVec<Env::Api, EsdtTokenPayment<Env::Api>>>> {
+    ) -> TxTypedCall<Env, From, To, (), Gas, MultiValue2<BigUint<Env::Api>, ManagedVec<Env::Api, EsdtTokenPayment<Env::Api>>>> {
         self.wrapped_tx
             .raw_call("claimTokens")
             .argument(&claim_destination)
diff --git a/contracts/feature-tests/composability/proxy-test-first/src/message_me_proxy.rs b/contracts/feature-tests/composability/proxy-test-first/src/message_me_proxy.rs
index 4609a3a0bd..fbe4ebf1a8 100644
--- a/contracts/feature-tests/composability/proxy-test-first/src/message_me_proxy.rs
+++ b/contracts/feature-tests/composability/proxy-test-first/src/message_me_proxy.rs
@@ -48,7 +48,7 @@ where
     >(
         self,
         init_arg: Arg0,
-    ) -> TxProxyDeploy<Env, From, Gas, i32> {
+    ) -> TxTypedDeploy<Env, From, (), Gas, i32> {
         self.wrapped_tx
             .raw_deploy()
             .argument(&init_arg)
@@ -67,7 +67,7 @@ where
 {
     pub fn upgrade(
         self,
-    ) -> TxProxyUpgrade<Env, From, To, Gas, ()> {
+    ) -> TxTypedUpgrade<Env, From, To, (), Gas, ()> {
         self.wrapped_tx
             .raw_upgrade()
             .original_result()
@@ -94,7 +94,7 @@ where
         arg2: Arg1,
         arg3: Arg2,
         arg4: Arg3,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
         self.wrapped_tx
             .raw_call("messageMe")
             .argument(&arg1)
diff --git a/contracts/feature-tests/composability/proxy-test-first/src/pay_me_proxy.rs b/contracts/feature-tests/composability/proxy-test-first/src/pay_me_proxy.rs
index cfd32f2516..38f620a84c 100644
--- a/contracts/feature-tests/composability/proxy-test-first/src/pay_me_proxy.rs
+++ b/contracts/feature-tests/composability/proxy-test-first/src/pay_me_proxy.rs
@@ -45,7 +45,7 @@ where
 {
     pub fn init(
         self,
-    ) -> TxProxyDeploy<Env, From, Gas, ()> {
+    ) -> TxTypedDeploy<Env, From, (), Gas, ()> {
         self.wrapped_tx
             .raw_deploy()
             .original_result()
@@ -63,7 +63,7 @@ where
 {
     pub fn upgrade(
         self,
-    ) -> TxProxyUpgrade<Env, From, To, Gas, ()> {
+    ) -> TxTypedUpgrade<Env, From, To, (), Gas, ()> {
         self.wrapped_tx
             .raw_upgrade()
             .original_result()
@@ -84,7 +84,7 @@ where
     >(
         self,
         arg1: Arg0,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
         self.wrapped_tx
             .raw_call("payMe")
             .argument(&arg1)
@@ -96,7 +96,7 @@ where
     >(
         self,
         arg1: Arg0,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
         self.wrapped_tx
             .raw_call("payMeWithResult")
             .argument(&arg1)
diff --git a/contracts/feature-tests/erc-style-contracts/erc1155/src/erc1155_user_proxy.rs b/contracts/feature-tests/erc-style-contracts/erc1155/src/erc1155_user_proxy.rs
index 600c12792f..13c0fce3b6 100644
--- a/contracts/feature-tests/erc-style-contracts/erc1155/src/erc1155_user_proxy.rs
+++ b/contracts/feature-tests/erc-style-contracts/erc1155/src/erc1155_user_proxy.rs
@@ -50,7 +50,7 @@ where
         type_id: Arg2,
         value: Arg3,
         data: Arg4,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
         self.wrapped_tx
             .raw_call("onERC1155Received")
             .argument(&operator)
@@ -74,7 +74,7 @@ where
         type_ids: Arg2,
         values: Arg3,
         data: Arg4,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
         self.wrapped_tx
             .raw_call("onERC1155BatchReceived")
             .argument(&operator)
diff --git a/contracts/modules/src/dns_proxy.rs b/contracts/modules/src/dns_proxy.rs
index 25ac68e4c4..8ef8a82b94 100644
--- a/contracts/modules/src/dns_proxy.rs
+++ b/contracts/modules/src/dns_proxy.rs
@@ -42,7 +42,7 @@ where
     >(
         self,
         name: Arg0,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
         self.wrapped_tx
             .raw_call("register")
             .argument(&name)
diff --git a/framework/base/src/contract_base/wrappers/send_wrapper.rs b/framework/base/src/contract_base/wrappers/send_wrapper.rs
index 11a8f748fc..3a11bde247 100644
--- a/framework/base/src/contract_base/wrappers/send_wrapper.rs
+++ b/framework/base/src/contract_base/wrappers/send_wrapper.rs
@@ -8,7 +8,7 @@ use crate::{
     types::{
         system_proxy, BigUint, ContractCallNoPayment, ESDTSystemSCAddress,
         EgldOrEsdtTokenIdentifier, EsdtTokenPayment, FunctionCall, GasLeft, ManagedAddress,
-        ManagedArgBuffer, ManagedBuffer, ManagedType, ManagedVec, OriginalResultMarker,
+        ManagedArgBuffer, ManagedBuffer, ManagedType, ManagedVec, NotPayable, OriginalResultMarker,
         ReturnsRawResult, ReturnsResult, ToSelf, TokenIdentifier, Tx, TxScEnv,
     },
 };
@@ -357,8 +357,15 @@ where
     pub fn claim_developer_rewards(
         &self,
         child_sc_address: ManagedAddress<A>,
-    ) -> Tx<TxScEnv<A>, (), ManagedAddress<A>, (), (), FunctionCall<A>, OriginalResultMarker<()>>
-    {
+    ) -> Tx<
+        TxScEnv<A>,
+        (),
+        ManagedAddress<A>,
+        NotPayable,
+        (),
+        FunctionCall<A>,
+        OriginalResultMarker<()>,
+    > {
         Tx::new_tx_from_sc()
             .to(child_sc_address)
             .typed(system_proxy::UserBuiltinProxy)
@@ -371,8 +378,15 @@ where
         &self,
         child_sc_address: ManagedAddress<A>,
         new_owner: &ManagedAddress<A>,
-    ) -> Tx<TxScEnv<A>, (), ManagedAddress<A>, (), (), FunctionCall<A>, OriginalResultMarker<()>>
-    {
+    ) -> Tx<
+        TxScEnv<A>,
+        (),
+        ManagedAddress<A>,
+        NotPayable,
+        (),
+        FunctionCall<A>,
+        OriginalResultMarker<()>,
+    > {
         Tx::new_tx_from_sc()
             .to(child_sc_address)
             .typed(system_proxy::UserBuiltinProxy)
diff --git a/framework/base/src/types/interaction/system_proxy/builtin_func_proxy.rs b/framework/base/src/types/interaction/system_proxy/builtin_func_proxy.rs
index 11972f72e8..7b5e2fefb2 100644
--- a/framework/base/src/types/interaction/system_proxy/builtin_func_proxy.rs
+++ b/framework/base/src/types/interaction/system_proxy/builtin_func_proxy.rs
@@ -1,8 +1,8 @@
 use multiversx_sc_codec::{Empty, TopEncode};
 
 use crate::types::{
-    BigUint, ManagedAddress, ManagedBuffer, ManagedVec, ProxyArg, TokenIdentifier, Tx, TxEnv,
-    TxFrom, TxGas, TxProxyCall, TxProxyTrait, TxTo,
+    BigUint, ManagedAddress, ManagedBuffer, ManagedVec, NotPayable, ProxyArg, TokenIdentifier, Tx,
+    TxEnv, TxFrom, TxGas, TxProxyTrait, TxTo, TxTypedCall,
 };
 
 use super::builtin_func_names::{
@@ -49,21 +49,24 @@ where
     pub fn set_user_name<Arg0: ProxyArg<ManagedBuffer<Env::Api>>>(
         self,
         name: Arg0,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call(SET_USERNAME_FUNC_NAME)
             .argument(&name)
             .original_result()
     }
 
-    pub fn delete_user_name(self) -> TxProxyCall<Env, From, To, Gas, ()> {
+    pub fn delete_user_name(self) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call(DELETE_USERNAME_FUNC_NAME)
             .original_result()
     }
 
-    pub fn claim_developer_rewards(self) -> TxProxyCall<Env, From, To, Gas, ()> {
+    pub fn claim_developer_rewards(self) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call(CLAIM_DEVELOPER_REWARDS_FUNC_NAME)
             .original_result()
     }
@@ -71,8 +74,9 @@ where
     pub fn change_owner_address(
         self,
         new_owner: &ManagedAddress<Env::Api>,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call(CHANGE_OWNER_BUILTIN_FUNC_NAME)
             .argument(new_owner)
             .original_result()
@@ -83,10 +87,11 @@ where
         token: &TokenIdentifier<Env::Api>,
         nonce: u64,
         amount: &BigUint<Env::Api>,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         if nonce == 0 {
             return self
                 .wrapped_tx
+                .payment(NotPayable)
                 .raw_call(ESDT_LOCAL_BURN_FUNC_NAME)
                 .argument(token)
                 .argument(amount)
@@ -94,6 +99,7 @@ where
         }
 
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call(ESDT_NFT_BURN_FUNC_NAME)
             .argument(token)
             .argument(&nonce)
@@ -106,16 +112,18 @@ where
         token: &TokenIdentifier<Env::Api>,
         nonce: u64,
         amount: &BigUint<Env::Api>,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         if nonce == 0 {
             return self
                 .wrapped_tx
+                .payment(NotPayable)
                 .raw_call(ESDT_LOCAL_MINT_FUNC_NAME)
                 .argument(token)
                 .argument(amount)
                 .original_result();
         }
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call(ESDT_NFT_ADD_QUANTITY_FUNC_NAME)
             .argument(token)
             .argument(&nonce)
@@ -128,9 +136,10 @@ where
         token_id: &TokenIdentifier<Env::Api>,
         nft_nonce: u64,
         new_uris: &ManagedVec<Env::Api, ManagedBuffer<Env::Api>>,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         let mut tx = self
             .wrapped_tx
+            .payment(NotPayable)
             .raw_call(ESDT_NFT_ADD_URI_FUNC_NAME)
             .argument(token_id)
             .argument(&nft_nonce);
@@ -147,8 +156,9 @@ where
         token_id: &TokenIdentifier<Env::Api>,
         nft_nonce: u64,
         new_attributes: &T,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call(ESDT_NFT_UPDATE_ATTRIBUTES_FUNC_NAME)
             .argument(token_id)
             .argument(&nft_nonce)
@@ -166,9 +176,10 @@ where
         hash: &ManagedBuffer<Env::Api>,
         attributes: &T,
         uris: &ManagedVec<Env::Api, ManagedBuffer<Env::Api>>,
-    ) -> TxProxyCall<Env, From, To, Gas, u64> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, u64> {
         let mut tx = self
             .wrapped_tx
+            .payment(NotPayable)
             .raw_call(ESDT_NFT_CREATE_FUNC_NAME)
             .argument(token)
             .argument(amount)
diff --git a/framework/base/src/types/interaction/system_proxy/esdt_system_sc_proxy.rs b/framework/base/src/types/interaction/system_proxy/esdt_system_sc_proxy.rs
index 3589f4ce28..2717b793d2 100644
--- a/framework/base/src/types/interaction/system_proxy/esdt_system_sc_proxy.rs
+++ b/framework/base/src/types/interaction/system_proxy/esdt_system_sc_proxy.rs
@@ -4,8 +4,8 @@ use crate::{
     api::CallTypeApi,
     types::{
         BigUint, EgldPayment, EsdtLocalRole, EsdtTokenType, FunctionCall, ManagedAddress,
-        ManagedBuffer, OriginalResultMarker, TokenIdentifier, Tx, TxEnv, TxFrom, TxGas,
-        TxProxyCall, TxProxyTrait, TxTo,
+        ManagedBuffer, NotPayable, OriginalResultMarker, TokenIdentifier, Tx, TxEnv, TxFrom, TxGas,
+        TxProxyTrait, TxTo, TxTypedCall,
     },
 };
 
@@ -272,8 +272,9 @@ where
         self,
         token_identifier: &TokenIdentifier<Env::Api>,
         amount: &BigUint<Env::Api>,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("mint")
             .argument(token_identifier)
             .argument(amount)
@@ -286,8 +287,9 @@ where
         self,
         token_identifier: &TokenIdentifier<Env::Api>,
         amount: &BigUint<Env::Api>,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("ESDTBurn")
             .argument(token_identifier)
             .argument(amount)
@@ -299,8 +301,9 @@ where
     pub fn pause(
         self,
         token_identifier: &TokenIdentifier<Env::Api>,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("pause")
             .argument(token_identifier)
             .original_result()
@@ -310,8 +313,9 @@ where
     pub fn unpause(
         self,
         token_identifier: &TokenIdentifier<Env::Api>,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("unPause")
             .argument(token_identifier)
             .original_result()
@@ -324,8 +328,9 @@ where
         self,
         token_identifier: &TokenIdentifier<Env::Api>,
         address: &ManagedAddress<Env::Api>,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("freeze")
             .argument(token_identifier)
             .argument(address)
@@ -337,8 +342,9 @@ where
         self,
         token_identifier: &TokenIdentifier<Env::Api>,
         address: &ManagedAddress<Env::Api>,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("unFreeze")
             .argument(token_identifier)
             .argument(address)
@@ -353,8 +359,9 @@ where
         self,
         token_identifier: &TokenIdentifier<Env::Api>,
         address: &ManagedAddress<Env::Api>,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("wipe")
             .argument(token_identifier)
             .argument(address)
@@ -369,8 +376,9 @@ where
         token_identifier: &TokenIdentifier<Env::Api>,
         nft_nonce: u64,
         address: &ManagedAddress<Env::Api>,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("freezeSingleNFT")
             .argument(token_identifier)
             .argument(&nft_nonce)
@@ -384,8 +392,9 @@ where
         token_identifier: &TokenIdentifier<Env::Api>,
         nft_nonce: u64,
         address: &ManagedAddress<Env::Api>,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("unFreezeSingleNFT")
             .argument(token_identifier)
             .argument(&nft_nonce)
@@ -402,8 +411,9 @@ where
         token_identifier: &TokenIdentifier<Env::Api>,
         nft_nonce: u64,
         address: &ManagedAddress<Env::Api>,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("wipeSingleNFT")
             .argument(token_identifier)
             .argument(&nft_nonce)
@@ -417,8 +427,9 @@ where
         self,
         token_identifier: &TokenIdentifier<Env::Api>,
         num_decimals: usize,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("changeSFTToMetaESDT")
             .argument(&token_identifier)
             .argument(&num_decimals)
@@ -434,9 +445,10 @@ where
         address: &ManagedAddress<Env::Api>,
         token_identifier: &TokenIdentifier<Env::Api>,
         roles_iter: RoleIter,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         let mut tx = self
             .wrapped_tx
+            .payment(NotPayable)
             .raw_call("setSpecialRole")
             .argument(token_identifier)
             .argument(address);
@@ -458,9 +470,10 @@ where
         address: &ManagedAddress<Env::Api>,
         token_identifier: &TokenIdentifier<Env::Api>,
         roles_iter: RoleIter,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         let mut tx = self
             .wrapped_tx
+            .payment(NotPayable)
             .raw_call("unSetSpecialRole")
             .argument(token_identifier)
             .argument(address);
@@ -477,8 +490,9 @@ where
         self,
         token_identifier: &TokenIdentifier<Env::Api>,
         new_owner: &ManagedAddress<Env::Api>,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("transferOwnership")
             .argument(token_identifier)
             .argument(new_owner)
@@ -490,8 +504,9 @@ where
         token_identifier: &TokenIdentifier<Env::Api>,
         old_creator: &ManagedAddress<Env::Api>,
         new_creator: &ManagedAddress<Env::Api>,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("transferNFTCreateRole")
             .argument(token_identifier)
             .argument(old_creator)
@@ -503,9 +518,10 @@ where
         self,
         token_identifier: &TokenIdentifier<Env::Api>,
         property_arguments: &TokenPropertyArguments,
-    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         let mut tx = self
             .wrapped_tx
+            .payment(NotPayable)
             .raw_call("controlChanges")
             .argument(token_identifier);
         append_token_property_arguments(&mut tx.data, property_arguments);

From 86c650097e46029f1c87b0776aaca12b4f9e407e Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 10 May 2024 10:12:15 +0300
Subject: [PATCH 0866/1254] cleanup

---
 .../examples/multisig/interact/src/multisig_interact_wegld.rs   | 2 --
 1 file changed, 2 deletions(-)

diff --git a/contracts/examples/multisig/interact/src/multisig_interact_wegld.rs b/contracts/examples/multisig/interact/src/multisig_interact_wegld.rs
index 97344d8603..7774bc02d4 100644
--- a/contracts/examples/multisig/interact/src/multisig_interact_wegld.rs
+++ b/contracts/examples/multisig/interact/src/multisig_interact_wegld.rs
@@ -4,8 +4,6 @@ use multiversx_sc_snippets::imports::*;
 
 use super::*;
 
-// const WEGLD_SWAP_SC_BECH32: &str = "erd1qqqqqqqqqqqqqpgqqkwzsxkjc83vlfex9dmznwm7tjvxlqqkpauqx0n782"; // shard 0
-// const WEGLD_TOKEN_IDENTIFIER: TestTokenIdentifier = TestTokenIdentifier::new("WEGLD-a28c59");
 const WRAP_AMOUNT: u64 = 50000000000000000; // 0.05 EGLD
 const UNWRAP_AMOUNT: u64 = 25000000000000000; // 0.025 WEGLD
 

From 6a99b98c424cacd49edeceb476f489a6966a338d Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 10 May 2024 11:13:37 +0300
Subject: [PATCH 0867/1254] test cleanup

---
 framework/meta/src/cmd/contract/meta_config.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/framework/meta/src/cmd/contract/meta_config.rs b/framework/meta/src/cmd/contract/meta_config.rs
index 7543327d06..a33fb98c5d 100644
--- a/framework/meta/src/cmd/contract/meta_config.rs
+++ b/framework/meta/src/cmd/contract/meta_config.rs
@@ -208,7 +208,7 @@ panic = \"abort\"
 path = \"..\"
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = \"0.49.0\"
+version = \"x.y.z\"
 path = \"../../../../framework/wasm-adapter\"
 
 [workspace]
@@ -221,7 +221,7 @@ members = [\".\"]
             name: "test".to_string(),
             edition: "2021".to_string(),
             profile: ContractVariantProfile::default(),
-            framework_version: "0.49.0".to_string(),
+            framework_version: "x.y.z".to_string(),
             framework_path: Option::Some("../../../framework/base".to_string()),
             contract_features: Vec::<String>::new(),
         };

From a3e554eaa9edd39c0d530006852addface2df58b Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 10 May 2024 11:16:02 +0300
Subject: [PATCH 0868/1254] sc 0.50.0, codec 0.19.0, vm 0.8.4, sdk 0.4.1

---
 CHANGELOG.md                                  |  8 ++++++
 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 +-
 .../Cargo.toml                                |  2 +-
 .../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     |  8 +++---
 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 +-
 .../wasm-alloc-mem-fail/Cargo.toml            |  2 +-
 .../wasm-alloc-mem-leaking/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-legacy/Cargo.toml |  4 +--
 .../forwarder-legacy/meta/Cargo.toml          |  2 +-
 .../forwarder-legacy/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 +-
 .../exchange-features/Cargo.toml              |  4 +--
 .../exchange-features/meta/Cargo.toml         |  2 +-
 .../exchange-features/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 +-
 .../feature-tests/scenario-tester/Cargo.toml  |  4 +--
 .../scenario-tester/meta/Cargo.toml           |  2 +-
 .../scenario-tester/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 +-
 framework/meta/src/version_history.rs         |  3 ++-
 framework/scenario/Cargo.toml                 | 10 +++----
 framework/snippets/Cargo.toml                 |  6 ++---
 framework/wasm-adapter/Cargo.toml             |  4 +--
 sdk/core/Cargo.toml                           |  2 +-
 tools/mxpy-snippet-generator/Cargo.toml       |  2 +-
 tools/rust-debugger/format-tests/Cargo.toml   |  6 ++---
 vm/Cargo.toml                                 |  2 +-
 276 files changed, 418 insertions(+), 409 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 030ef99324..5c2352ff1e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,6 +26,14 @@ 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.50.0, codec 0.19.0, vm 0.8.4, sdk 0.4.1] - 2024-05-10
+- Framework now runs on **stable** Rust. All unstable features were removed. The most important changes enabling this:
+	- `CodecFrom` completely removed, `TypeAbiFrom` was used instead since 0.49.0.
+	- `ManagedVecItem` payload redesigned.
+	- Contract panic message mechanism improved.
+- Unified syntax:
+	- `NotPayable` marker type in proxies, which prevents callers to add payment to a non-payable endpoint.
+
 ## [sc 0.49.0, codec 0.18.8, sdk 0.4.0] - 2024-05-07
 - Unified transaction syntax
 	- new syntax for sending transactions from contracts
diff --git a/Cargo.lock b/Cargo.lock
index fe83047020..8dba3c1854 100755
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1861,7 +1861,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-chain-vm"
-version = "0.8.3"
+version = "0.8.4"
 dependencies = [
  "bitflags 2.5.0",
  "colored",
@@ -1886,7 +1886,7 @@ checksum = "b59072fa0624b55ae5ae3fa6bfa91515bbeb4ac440214bc4a509e2c8806d6e9f"
 
 [[package]]
 name = "multiversx-price-aggregator-sc"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "arrayvec",
  "getrandom 0.2.14",
@@ -1907,7 +1907,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "bitflags 2.5.0",
  "hex-literal",
@@ -1919,7 +1919,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -1929,7 +1929,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -1939,7 +1939,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -1950,7 +1950,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-meta"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "clap",
  "colored",
@@ -1976,14 +1976,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-scenario"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "base64",
  "bech32",
@@ -2010,7 +2010,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-snippets"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "base64",
  "env_logger",
@@ -2025,14 +2025,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sdk"
-version = "0.4.0"
+version = "0.4.1"
 dependencies = [
  "anyhow",
  "base64",
@@ -2056,7 +2056,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-wegld-swap-sc"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
  "multiversx-sc-modules",
diff --git a/contracts/benchmarks/large-storage/Cargo.toml b/contracts/benchmarks/large-storage/Cargo.toml
index dcc5cdf376..ad60a82f74 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.49.0"
+version = "0.50.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0"
+version = "0.50.0"
 path = "../../../framework/scenario"
diff --git a/contracts/benchmarks/large-storage/meta/Cargo.toml b/contracts/benchmarks/large-storage/meta/Cargo.toml
index 7bcc6749aa..43caaeea37 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.49.0"
+version = "0.50.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 27442eadd5..37792b12f1 100644
--- a/contracts/benchmarks/large-storage/wasm/Cargo.toml
+++ b/contracts/benchmarks/large-storage/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0"
+version = "0.50.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 e040a59306..95d8d11ca4 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.49.0"
+version = "0.50.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0"
+version = "0.50.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 f7ed9b60c4..693d4816b1 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.49.0"
+version = "0.50.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0"
+version = "0.50.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 7686ad097b..f87d3e08ac 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.49.0"
+version = "0.50.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 f901bcd893..f99021343c 100644
--- a/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0"
+version = "0.50.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 19dd700f43..93ce0cf9fb 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.49.0"
+version = "0.50.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0"
+version = "0.50.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 e2f453869c..37ca3cb2a6 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.49.0"
+version = "0.50.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 a37c36a723..3a425203e2 100644
--- a/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0"
+version = "0.50.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 0ef6135592..527ff13d73 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.49.0"
+version = "0.50.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0"
+version = "0.50.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 ac96744a95..d3edc93457 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.49.0"
+version = "0.50.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 86baf16ed1..6a874745ac 100644
--- a/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0"
+version = "0.50.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 20121d24af..dca506d44f 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.49.0"
+version = "0.50.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0"
+version = "0.50.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 1be790193f..5e6c8268b1 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.49.0"
+version = "0.50.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 32140cb3c9..f7173dc593 100644
--- a/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0"
+version = "0.50.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 075eb30b8e..2d5cdaf3a9 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.49.0"
+version = "0.50.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0"
+version = "0.50.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 e693e7e883..38641c9dc7 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.49.0"
+version = "0.50.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 fb2acc6ebc..c8cd8d7c58 100644
--- a/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0"
+version = "0.50.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 97b51e3a6f..318cb5fa3c 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.49.0"
+version = "0.50.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0"
+version = "0.50.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 8a7d769dc1..c2d42c1e53 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.49.0"
+version = "0.50.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 e66c6adebe..1f2160a463 100644
--- a/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0"
+version = "0.50.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 326bafd16e..0cb5a4595e 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.49.0"
+version = "0.50.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0"
+version = "0.50.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 78a283168b..a0ee585630 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.49.0"
+version = "0.50.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 647b00bce5..5141d7db8b 100644
--- a/contracts/benchmarks/send-tx-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/send-tx-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0"
+version = "0.50.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/str-repeat/Cargo.toml b/contracts/benchmarks/str-repeat/Cargo.toml
index 6fe33bc9df..0afdad980c 100644
--- a/contracts/benchmarks/str-repeat/Cargo.toml
+++ b/contracts/benchmarks/str-repeat/Cargo.toml
@@ -12,10 +12,10 @@ path = "src/str_repeat.rs"
 managed-buffer-builder-cached = ["multiversx-sc/managed-buffer-builder-cached"]
 
 [dependencies.multiversx-sc]
-version = "0.49.0"
+version = "0.50.0"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0"
+version = "0.50.0"
 path = "../../../framework/scenario"
diff --git a/contracts/benchmarks/str-repeat/meta/Cargo.toml b/contracts/benchmarks/str-repeat/meta/Cargo.toml
index 160503d84f..2a053f362a 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.49.0"
+version = "0.50.0"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.toml b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.toml
index a4eeb33b9a..37f8484af3 100644
--- a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.toml
+++ b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0"
+version = "0.50.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.toml b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.toml
index d0ad7a5766..16d624e31a 100644
--- a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.toml
+++ b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.toml
@@ -29,7 +29,7 @@ path = ".."
 features = ["managed-buffer-builder-cached"]
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0"
+version = "0.50.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/str-repeat/wasm/Cargo.toml b/contracts/benchmarks/str-repeat/wasm/Cargo.toml
index 6416f35226..94a9cee235 100644
--- a/contracts/benchmarks/str-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/str-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0"
+version = "0.50.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/core/price-aggregator/Cargo.toml b/contracts/core/price-aggregator/Cargo.toml
index 290806c1f2..93a8b91d51 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.49.0"
+version = "0.50.0"
 authors = [
     "Claudiu-Marcel Bruda <claudiu.bruda@multiversx.com>",
     "MultiversX <contact@multiversx.com>",
@@ -19,15 +19,15 @@ edition = "2021"
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "0.49.0"
+version = "0.50.0"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.49.0"
+version = "0.50.0"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0"
+version = "0.50.0"
 path = "../../../framework/scenario"
 
 [dependencies]
diff --git a/contracts/core/price-aggregator/meta/Cargo.toml b/contracts/core/price-aggregator/meta/Cargo.toml
index b3ee5b7f88..e39ae566e3 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.49.0"
+version = "0.50.0"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.49.0"
+version = "0.50.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 cef8117a00..fbbdfb7394 100644
--- a/contracts/core/price-aggregator/wasm/Cargo.toml
+++ b/contracts/core/price-aggregator/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0"
+version = "0.50.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/core/wegld-swap/Cargo.toml b/contracts/core/wegld-swap/Cargo.toml
index cb7582ec0a..f7b430a05f 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.49.0"
+version = "0.50.0"
 
 authors = [
     "Dorin Iancu <dorin.iancu@multiversx.com>",
@@ -20,13 +20,13 @@ edition = "2021"
 path = "src/wegld.rs"
 
 [dependencies.multiversx-sc]
-version = "0.49.0"
+version = "0.50.0"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.49.0"
+version = "0.50.0"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0"
+version = "0.50.0"
 path = "../../../framework/scenario"
diff --git a/contracts/core/wegld-swap/meta/Cargo.toml b/contracts/core/wegld-swap/meta/Cargo.toml
index d6d2b99c18..141e7af488 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.49.0"
+version = "0.50.0"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.49.0"
+version = "0.50.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 f2cd3330e8..1ba58a7626 100644
--- a/contracts/core/wegld-swap/wasm/Cargo.toml
+++ b/contracts/core/wegld-swap/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0"
+version = "0.50.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/adder/Cargo.toml b/contracts/examples/adder/Cargo.toml
index 370ddbcc94..01d7d11103 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.49.0"
+version = "0.50.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0"
+version = "0.50.0"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/adder/interact/Cargo.toml b/contracts/examples/adder/interact/Cargo.toml
index ead28c7bb3..3df4b6b103 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.49.0"
+version = "0.50.0"
 path = "../../../../framework/snippets"
diff --git a/contracts/examples/adder/meta/Cargo.toml b/contracts/examples/adder/meta/Cargo.toml
index c4a84b1d55..8a6f226a36 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.49.0"
+version = "0.50.0"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/examples/adder/wasm/Cargo.toml b/contracts/examples/adder/wasm/Cargo.toml
index 71a97ec561..3b0e9c91af 100644
--- a/contracts/examples/adder/wasm/Cargo.toml
+++ b/contracts/examples/adder/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0"
+version = "0.50.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 87585ce189..fce63da78e 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.49.0"
+version = "0.50.0"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.49.0"
+version = "0.50.0"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0"
+version = "0.50.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 a8d9d6f565..e723215167 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.49.0"
+version = "0.50.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 9b0f4d51d2..b982e3bdf1 100644
--- a/contracts/examples/bonding-curve-contract/wasm/Cargo.toml
+++ b/contracts/examples/bonding-curve-contract/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0"
+version = "0.50.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/check-pause/Cargo.toml b/contracts/examples/check-pause/Cargo.toml
index 8eae83200f..599627d6fa 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.49.0"
+version = "0.50.0"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.49.0"
+version = "0.50.0"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0"
+version = "0.50.0"
 path = "../../../framework/scenario"
 
diff --git a/contracts/examples/check-pause/meta/Cargo.toml b/contracts/examples/check-pause/meta/Cargo.toml
index 444b267995..0725414e65 100644
--- a/contracts/examples/check-pause/meta/Cargo.toml
+++ b/contracts/examples/check-pause/meta/Cargo.toml
@@ -9,6 +9,6 @@ authors = ["Alin Cruceat <alin.cruceat@multiversx.com>"]
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.49.0"
+version = "0.50.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 7cde896cec..29e92731fb 100644
--- a/contracts/examples/check-pause/wasm/Cargo.toml
+++ b/contracts/examples/check-pause/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0"
+version = "0.50.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/crowdfunding-esdt/Cargo.toml b/contracts/examples/crowdfunding-esdt/Cargo.toml
index ddacb5ea88..4f423292e1 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.49.0"
+version = "0.50.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0"
+version = "0.50.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 fd8c223775..b15a3ac041 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.49.0"
+version = "0.50.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 f8e5f35db8..bd584a528d 100644
--- a/contracts/examples/crowdfunding-esdt/wasm/Cargo.toml
+++ b/contracts/examples/crowdfunding-esdt/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0"
+version = "0.50.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/crypto-bubbles/Cargo.toml b/contracts/examples/crypto-bubbles/Cargo.toml
index 06d8e5bf0e..4b3d2fa178 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.49.0"
+version = "0.50.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0"
+version = "0.50.0"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/crypto-bubbles/meta/Cargo.toml b/contracts/examples/crypto-bubbles/meta/Cargo.toml
index 6b38860ee5..519eacd8e6 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.49.0"
+version = "0.50.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 db047fad7e..422c67a898 100644
--- a/contracts/examples/crypto-bubbles/wasm/Cargo.toml
+++ b/contracts/examples/crypto-bubbles/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0"
+version = "0.50.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 4eb640e54d..7168dbee64 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.49.0"
+version = "0.50.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 4bae32ba87..cb4dabd43a 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.49.0"
+version = "0.50.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 261d16405e..0d2443aac3 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.49.0"
+version = "0.50.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0"
+version = "0.50.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 f9f7905ded..4cc88d99bb 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.49.0"
+version = "0.50.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 860539a5f0..ba25624426 100644
--- a/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.toml
+++ b/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0"
+version = "0.50.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 927d5dddb8..4eafac5572 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.49.0"
+version = "0.50.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0"
+version = "0.50.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 e2a77bc1b2..4fc99625d7 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.49.0"
+version = "0.50.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 81e5ce96cd..fd704cc077 100644
--- a/contracts/examples/crypto-kitties/kitty-genetic-alg/wasm/Cargo.toml
+++ b/contracts/examples/crypto-kitties/kitty-genetic-alg/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0"
+version = "0.50.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 051e4a41fe..5b1f9edb3d 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.49.0"
+version = "0.50.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0"
+version = "0.50.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 9352e5ca50..88740f3eaf 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.49.0"
+version = "0.50.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 c6526438af..acc9e65db5 100644
--- a/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.toml
+++ b/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0"
+version = "0.50.0"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/crypto-zombies/Cargo.toml b/contracts/examples/crypto-zombies/Cargo.toml
index 19c94cebbb..08c3e904f5 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.49.0"
+version = "0.50.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0"
+version = "0.50.0"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/crypto-zombies/meta/Cargo.toml b/contracts/examples/crypto-zombies/meta/Cargo.toml
index 4cda0e49a2..e71bcdf1aa 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.49.0"
+version = "0.50.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 3529d541a7..07e1f9f79b 100644
--- a/contracts/examples/crypto-zombies/wasm/Cargo.toml
+++ b/contracts/examples/crypto-zombies/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0"
+version = "0.50.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/digital-cash/Cargo.toml b/contracts/examples/digital-cash/Cargo.toml
index 5acc43a29e..8a81d21842 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.49.0"
+version = "0.50.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0"
+version = "0.50.0"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/digital-cash/meta/Cargo.toml b/contracts/examples/digital-cash/meta/Cargo.toml
index 2109e5f03f..9684210470 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.49.0"
+version = "0.50.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 7a5e5d2c38..c3e7ab8992 100644
--- a/contracts/examples/digital-cash/wasm/Cargo.toml
+++ b/contracts/examples/digital-cash/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0"
+version = "0.50.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/empty/Cargo.toml b/contracts/examples/empty/Cargo.toml
index bc4fd42421..f7567c795c 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.49.0"
+version = "0.50.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0"
+version = "0.50.0"
 path = "../../../framework/scenario"
 
 [dev-dependencies]
diff --git a/contracts/examples/empty/meta/Cargo.toml b/contracts/examples/empty/meta/Cargo.toml
index e41ae94b75..18045a22fe 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.49.0"
+version = "0.50.0"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/examples/empty/wasm/Cargo.toml b/contracts/examples/empty/wasm/Cargo.toml
index 46be2fc8d9..986b5d4b40 100644
--- a/contracts/examples/empty/wasm/Cargo.toml
+++ b/contracts/examples/empty/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0"
+version = "0.50.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 cb6f14b852..18913a6a88 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.49.0"
+version = "0.50.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0"
+version = "0.50.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 4cbd3d2966..e16702134c 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.49.0"
+version = "0.50.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 52bde7e951..908bf4efc1 100644
--- a/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.toml
+++ b/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0"
+version = "0.50.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/factorial/Cargo.toml b/contracts/examples/factorial/Cargo.toml
index deeb24230a..c2dd6c42d8 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.49.0"
+version = "0.50.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0"
+version = "0.50.0"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/factorial/meta/Cargo.toml b/contracts/examples/factorial/meta/Cargo.toml
index d3030adfea..74f7c6dbe9 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.49.0"
+version = "0.50.0"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/examples/factorial/wasm/Cargo.toml b/contracts/examples/factorial/wasm/Cargo.toml
index 59a8684d25..f4d306ec6d 100644
--- a/contracts/examples/factorial/wasm/Cargo.toml
+++ b/contracts/examples/factorial/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0"
+version = "0.50.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/fractional-nfts/Cargo.toml b/contracts/examples/fractional-nfts/Cargo.toml
index 85f79c2d3a..e3b4dd4721 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.49.0"
+version = "0.50.0"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.49.0"
+version = "0.50.0"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0"
+version = "0.50.0"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/fractional-nfts/meta/Cargo.toml b/contracts/examples/fractional-nfts/meta/Cargo.toml
index 36b7ab580a..07ab765495 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.49.0"
+version = "0.50.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 40e0e872f9..e912cbed4b 100644
--- a/contracts/examples/fractional-nfts/wasm/Cargo.toml
+++ b/contracts/examples/fractional-nfts/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0"
+version = "0.50.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/lottery-esdt/Cargo.toml b/contracts/examples/lottery-esdt/Cargo.toml
index 0efa27bad0..f6d4acb67e 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.49.0"
+version = "0.50.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0"
+version = "0.50.0"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/lottery-esdt/meta/Cargo.toml b/contracts/examples/lottery-esdt/meta/Cargo.toml
index c27259bfc9..2f737d5182 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.49.0"
+version = "0.50.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 43f02beaa6..060058ceb5 100644
--- a/contracts/examples/lottery-esdt/wasm/Cargo.toml
+++ b/contracts/examples/lottery-esdt/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0"
+version = "0.50.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/multisig/Cargo.toml b/contracts/examples/multisig/Cargo.toml
index 0965cf8e44..102e7fff83 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.49.0"
+version = "0.50.0"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.49.0"
+version = "0.50.0"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0"
+version = "0.50.0"
 path = "../../../framework/scenario"
 
 [dev-dependencies.adder]
@@ -27,7 +27,7 @@ path = "../adder"
 path = "../factorial"
 
 [dev-dependencies.multiversx-wegld-swap-sc]
-version = "0.49.0"
+version = "0.50.0"
 path = "../../core/wegld-swap"
 
 [dev-dependencies]
diff --git a/contracts/examples/multisig/interact/Cargo.toml b/contracts/examples/multisig/interact/Cargo.toml
index ee40893001..6d0980b08a 100644
--- a/contracts/examples/multisig/interact/Cargo.toml
+++ b/contracts/examples/multisig/interact/Cargo.toml
@@ -18,17 +18,17 @@ toml = "0.8.6"
 path = ".."
 
 [dependencies.multiversx-sc-modules]
-version = "0.49.0"
+version = "0.50.0"
 path = "../../../../contracts/modules"
 
 [dependencies.multiversx-sc-snippets]
-version = "0.49.0"
+version = "0.50.0"
 path = "../../../../framework/snippets"
 
 [dependencies.multiversx-sc-scenario]
-version = "=0.49.0"
+version = "=0.50.0"
 path = "../../../../framework/scenario"
 
 [dependencies.multiversx-sc]
-version = "=0.49.0"
+version = "=0.50.0"
 path = "../../../../framework/base"
diff --git a/contracts/examples/multisig/meta/Cargo.toml b/contracts/examples/multisig/meta/Cargo.toml
index b5a20507cb..18643a8af8 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.49.0"
+version = "0.50.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 56574d7e99..9339183ea0 100644
--- a/contracts/examples/multisig/wasm-multisig-full/Cargo.toml
+++ b/contracts/examples/multisig/wasm-multisig-full/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0"
+version = "0.50.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 a268fc278e..9a1691b304 100644
--- a/contracts/examples/multisig/wasm-multisig-view/Cargo.toml
+++ b/contracts/examples/multisig/wasm-multisig-view/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0"
+version = "0.50.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/multisig/wasm/Cargo.toml b/contracts/examples/multisig/wasm/Cargo.toml
index 25e029859c..15c6fcdda4 100644
--- a/contracts/examples/multisig/wasm/Cargo.toml
+++ b/contracts/examples/multisig/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0"
+version = "0.50.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/nft-minter/Cargo.toml b/contracts/examples/nft-minter/Cargo.toml
index 338861c1c6..6a6dc93818 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.49.0"
+version = "0.50.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0"
+version = "0.50.0"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/nft-minter/meta/Cargo.toml b/contracts/examples/nft-minter/meta/Cargo.toml
index 1f9e5c3426..64c911d3eb 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.49.0"
+version = "0.50.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 c7d2ff1569..d641e48f53 100644
--- a/contracts/examples/nft-minter/wasm/Cargo.toml
+++ b/contracts/examples/nft-minter/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0"
+version = "0.50.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 1f84d968f1..85ce98347a 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.49.0"
+version = "0.50.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0"
+version = "0.50.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 d5bc2477af..f84e4d7e0b 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.49.0"
+version = "0.50.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 8755b0181f..7b9b0b7b5a 100644
--- a/contracts/examples/nft-storage-prepay/wasm/Cargo.toml
+++ b/contracts/examples/nft-storage-prepay/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0"
+version = "0.50.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/nft-subscription/Cargo.toml b/contracts/examples/nft-subscription/Cargo.toml
index 68d04d57a0..e9b428722c 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.49.0"
+version = "0.50.0"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.49.0"
+version = "0.50.0"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0"
+version = "0.50.0"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/nft-subscription/meta/Cargo.toml b/contracts/examples/nft-subscription/meta/Cargo.toml
index b338b27089..a7149fa9dd 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.49.0"
+version = "0.50.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 4f4defe1d1..3eb795ed69 100644
--- a/contracts/examples/nft-subscription/wasm/Cargo.toml
+++ b/contracts/examples/nft-subscription/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0"
+version = "0.50.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 9d2461e39a..0565667f2b 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.49.0"
+version = "0.50.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0"
+version = "0.50.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 c218e0d100..4bf0679153 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.49.0"
+version = "0.50.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 447881dd39..b9bc987077 100644
--- a/contracts/examples/order-book/factory/wasm/Cargo.toml
+++ b/contracts/examples/order-book/factory/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0"
+version = "0.50.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 c888a2b68b..506621642f 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.49.0"
+version = "0.50.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0"
+version = "0.50.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 916eeb5b35..434e1a0753 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.49.0"
+version = "0.50.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 b2ccac9166..1e51e9c3fb 100644
--- a/contracts/examples/order-book/pair/wasm/Cargo.toml
+++ b/contracts/examples/order-book/pair/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0"
+version = "0.50.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 9b932eeb32..0cf328ce40 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.49.0"
+version = "0.50.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0"
+version = "0.50.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 0d90a922fa..948d484e68 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.49.0"
+version = "0.50.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 3da28b8cd9..6d50aca185 100644
--- a/contracts/examples/ping-pong-egld/wasm/Cargo.toml
+++ b/contracts/examples/ping-pong-egld/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0"
+version = "0.50.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/proxy-pause/Cargo.toml b/contracts/examples/proxy-pause/Cargo.toml
index ebb7a49d11..9a406d26e3 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.49.0"
+version = "0.50.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0"
+version = "0.50.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 8e8fc44c7f..9aa661cca5 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.49.0"
+version = "0.50.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 038b546376..94aa50c199 100644
--- a/contracts/examples/proxy-pause/wasm/Cargo.toml
+++ b/contracts/examples/proxy-pause/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0"
+version = "0.50.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/rewards-distribution/Cargo.toml b/contracts/examples/rewards-distribution/Cargo.toml
index dad96385d1..06a8a138e0 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.49.0"
+version = "0.50.0"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.49.0"
+version = "0.50.0"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0"
+version = "0.50.0"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/rewards-distribution/meta/Cargo.toml b/contracts/examples/rewards-distribution/meta/Cargo.toml
index 254c15933f..4ee4f2feb1 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 <claudiu.bruda@multiversx.com>"]
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.49.0"
+version = "0.50.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 c2c9f1f27b..9f260e035e 100644
--- a/contracts/examples/rewards-distribution/wasm/Cargo.toml
+++ b/contracts/examples/rewards-distribution/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0"
+version = "0.50.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 2d7df44815..b69d9c9a1b 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.49.0"
+version = "0.50.0"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.49.0"
+version = "0.50.0"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0"
+version = "0.50.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 a25a40890d..8c9b014b15 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 <claudiu.bruda@multiversx.com>"]
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.49.0"
+version = "0.50.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 e908400d3f..7ff1aa3167 100644
--- a/contracts/examples/seed-nft-minter/wasm/Cargo.toml
+++ b/contracts/examples/seed-nft-minter/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0"
+version = "0.50.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/token-release/Cargo.toml b/contracts/examples/token-release/Cargo.toml
index 1433b850db..a9dd91049c 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.49.0"
+version = "0.50.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0"
+version = "0.50.0"
 path = "../../../framework/scenario"
 
diff --git a/contracts/examples/token-release/meta/Cargo.toml b/contracts/examples/token-release/meta/Cargo.toml
index 990c33fa6f..6472c62dbe 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.49.0"
+version = "0.50.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 f1d2ab14d8..7ba8ba53de 100644
--- a/contracts/examples/token-release/wasm/Cargo.toml
+++ b/contracts/examples/token-release/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0"
+version = "0.50.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 a2f0a34982..b91a4658f8 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.49.0"
+version = "0.50.0"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0"
+version = "0.50.0"
 path = "../../../framework/scenario"
 
 [dev-dependencies.multiversx-sc-meta]
-version = "0.49.0"
+version = "0.50.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 c45d388a93..83cee8e243 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.49.0"
+            "version": "0.50.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 10926621d5..616cb2c407 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.49.0"
+            "version": "0.50.0"
         }
     },
     "docs": [
diff --git a/contracts/feature-tests/abi-tester/meta/Cargo.toml b/contracts/feature-tests/abi-tester/meta/Cargo.toml
index 2d1614552c..484740f799 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.49.0"
+version = "0.50.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 0842c1c928..c987cc1014 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0"
+version = "0.50.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 191ee3e3a0..a4c112d54a 100644
--- a/contracts/feature-tests/abi-tester/wasm/Cargo.toml
+++ b/contracts/feature-tests/abi-tester/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0"
+version = "0.50.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 a6b7570493..deba8cc77f 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.49.0"
+version = "0.50.0"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0"
+version = "0.50.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 39e2e2bbb5..2476a7d590 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.49.0"
+version = "0.50.0"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml
index ce413d1f36..15c2824e8e 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0"
+version = "0.50.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml
index 682f6897d8..b53825c649 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0"
+version = "0.50.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/alloc-features/wasm/Cargo.toml b/contracts/feature-tests/alloc-features/wasm/Cargo.toml
index 2fcade81d3..5483e7d87d 100644
--- a/contracts/feature-tests/alloc-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/alloc-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0"
+version = "0.50.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 d38410d6b9..8b738d1002 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.49.0"
+version = "0.50.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0"
+version = "0.50.0"
 path = "../../../framework/scenario"
 
 [dependencies.multiversx-sc-modules]
-version = "0.49.0"
+version = "0.50.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 b419907f30..60de45ea57 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.49.0"
+version = "0.50.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 e3ef8d92db..f19e1049ea 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.49.0"
+version = "0.50.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 a701d5f906..c6aa9bf34d 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0"
+version = "0.50.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 8c72470601..f74de0e5bf 100644
--- a/contracts/feature-tests/basic-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/basic-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0"
+version = "0.50.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 9df1290f46..b6f5d8a268 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.49.0"
+version = "0.50.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0"
+version = "0.50.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 86e89a8b3e..2190f2d33a 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.49.0"
+version = "0.50.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 4b6f46e94f..3e42661142 100644
--- a/contracts/feature-tests/big-float-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/big-float-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0"
+version = "0.50.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/Cargo.toml b/contracts/feature-tests/composability/Cargo.toml
index a046d2fc04..6b8aece3a1 100644
--- a/contracts/feature-tests/composability/Cargo.toml
+++ b/contracts/feature-tests/composability/Cargo.toml
@@ -36,9 +36,9 @@ path = "recursive-caller"
 path = "vault"
 
 [dependencies.multiversx-sc]
-version = "0.49.0"
+version = "0.50.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0"
+version = "0.50.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 b3b2c9f699..e681d83de5 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.49.0"
+version = "0.50.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0"
+version = "0.50.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 064dbaccaf..c21206f6b7 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.49.0"
+version = "0.50.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 f40186154b..fb41856a7b 100644
--- a/contracts/feature-tests/composability/builtin-func-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/builtin-func-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0"
+version = "0.50.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 721c6184f3..c8590eddc0 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.49.0"
+version = "0.50.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0"
+version = "0.50.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 7af866cd4e..5df5441b60 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
@@ -9,10 +9,10 @@ publish = false
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "0.49.0"
+version = "0.50.0"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0"
+version = "0.50.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 4abad84c18..7cb1c1954f 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.49.0"
+version = "0.50.0"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.49.0"
+version = "0.50.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 9c42dd837a..5f227a3bbd 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0"
+version = "0.50.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 57e6ed92c9..4876471d56 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.49.0"
+version = "0.50.0"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0"
+version = "0.50.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 c09425c97d..ec4dd76d45 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.49.0"
+version = "0.50.0"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.49.0"
+version = "0.50.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 30e743e020..c112f28171 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0"
+version = "0.50.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 c5e600ae68..4d454c45bd 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.49.0"
+version = "0.50.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0"
+version = "0.50.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 6fc29bfa35..58cf6fb6c1 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.49.0"
+version = "0.50.0"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0"
+version = "0.50.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 0d2a3c28e2..2c3435f72f 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.49.0"
+version = "0.50.0"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.49.0"
+version = "0.50.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 88e099d8f2..08b87de82c 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0"
+version = "0.50.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 e590beb2ce..40809b2ff8 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
@@ -9,10 +9,10 @@ publish = false
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "0.49.0"
+version = "0.50.0"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0"
+version = "0.50.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 eaaffc0f52..1900e42ce5 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.49.0"
+version = "0.50.0"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.49.0"
+version = "0.50.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 d199c61242..8ae671f12c 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0"
+version = "0.50.0"
 path = "../../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/forwarder-legacy/Cargo.toml b/contracts/feature-tests/composability/forwarder-legacy/Cargo.toml
index ab4e3ef6fc..c296870251 100644
--- a/contracts/feature-tests/composability/forwarder-legacy/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-legacy/Cargo.toml
@@ -12,10 +12,10 @@ path = "src/forwarder_legacy_main.rs"
 path = "../vault"
 
 [dependencies.multiversx-sc]
-version = "0.49.0"
+version = "0.50.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0"
+version = "0.50.0"
 path = "../../../../framework/scenario"
 
diff --git a/contracts/feature-tests/composability/forwarder-legacy/meta/Cargo.toml b/contracts/feature-tests/composability/forwarder-legacy/meta/Cargo.toml
index c10276be04..698488368f 100644
--- a/contracts/feature-tests/composability/forwarder-legacy/meta/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-legacy/meta/Cargo.toml
@@ -8,6 +8,6 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.49.0"
+version = "0.50.0"
 path = "../../../../../framework/meta"
 default-features = false
diff --git a/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.toml b/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.toml
index b8a9a65275..d05dbe3ef7 100644
--- a/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0"
+version = "0.50.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 aff16f1726..48077eca8b 100644
--- a/contracts/feature-tests/composability/forwarder-queue/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-queue/Cargo.toml
@@ -9,14 +9,14 @@ publish = false
 path = "src/forwarder_queue.rs"
 
 [dependencies.multiversx-sc]
-version = "0.49.0"
+version = "0.50.0"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0"
+version = "0.50.0"
 path = "../../../../framework/wasm-adapter"
 optional = true
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0"
+version = "0.50.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 87460aa1f3..4870962372 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.49.0"
+version = "0.50.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 cad1551134..2486716bd7 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0"
+version = "0.50.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 fbac1eb7ec..c961e16432 100644
--- a/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0"
+version = "0.50.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 f7713252f0..bc898280c5 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.49.0"
+version = "0.50.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0"
+version = "0.50.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 cdba5af76c..c09653539c 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.49.0"
+version = "0.50.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 e030257845..e1564c014d 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0"
+version = "0.50.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 c593100248..5aab141abf 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0"
+version = "0.50.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 8f81ce9f86..34acac241a 100644
--- a/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0"
+version = "0.50.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 c7c2f34df3..e8bac116cc 100644
--- a/contracts/feature-tests/composability/forwarder/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder/Cargo.toml
@@ -9,10 +9,10 @@ publish = false
 path = "src/forwarder_main.rs"
 
 [dependencies.multiversx-sc]
-version = "0.49.0"
+version = "0.50.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0"
+version = "0.50.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 28d02e3a90..5423d48966 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.49.0"
+version = "0.50.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 a5298af2e0..b7e6d9fc22 100644
--- a/contracts/feature-tests/composability/forwarder/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0"
+version = "0.50.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 cacf68eb1d..0b0fc143e0 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.49.0"
+version = "0.50.0"
 path = "../../../../contracts/modules"
 
 [dependencies.multiversx-sc-snippets]
-version = "0.49.0"
+version = "0.50.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 e5022c4f59..6abdbbd6ad 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.49.0"
+version = "0.50.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0"
+version = "0.50.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 e30d729827..8be9e00cca 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.49.0"
+version = "0.50.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 5130c19326..0bef6ec952 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0"
+version = "0.50.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 77cc9ef833..d859fa9184 100644
--- a/contracts/feature-tests/composability/promises-features/Cargo.toml
+++ b/contracts/feature-tests/composability/promises-features/Cargo.toml
@@ -9,6 +9,6 @@ publish = false
 path = "src/promises_main.rs"
 
 [dependencies.multiversx-sc]
-version = "0.49.0"
+version = "0.50.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 28c3c0b2c9..51b36cf55b 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.49.0"
+version = "0.50.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 528f5ad3ef..2a50527d00 100644
--- a/contracts/feature-tests/composability/promises-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/promises-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0"
+version = "0.50.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 bc21b32a39..5089ae8e5e 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.49.0"
+version = "0.50.0"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0"
+version = "0.50.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 b38a0f5474..a959e10a20 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.49.0"
+version = "0.50.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 db6e8bb399..fb2967736b 100644
--- a/contracts/feature-tests/composability/proxy-test-first/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/proxy-test-first/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0"
+version = "0.50.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 c9ae4da5f8..c37c88fa75 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.49.0"
+version = "0.50.0"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0"
+version = "0.50.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 2ca6853d31..e4859fb220 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.49.0"
+version = "0.50.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 1d1aa84adc..fd2120ffa2 100644
--- a/contracts/feature-tests/composability/proxy-test-second/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/proxy-test-second/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0"
+version = "0.50.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 a85f718ce4..ecdcf89509 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.49.0"
+version = "0.50.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0"
+version = "0.50.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 0c59d660b1..dc3784bfab 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.49.0"
+version = "0.50.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 c41db08c8d..b52712716e 100644
--- a/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0"
+version = "0.50.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 8d379cdaed..f1a1fc9d62 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.49.0"
+version = "0.50.0"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.49.0"
+version = "0.50.0"
 path = "../../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0"
+version = "0.50.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 f6823d80da..8d0fcbb68b 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.49.0"
+version = "0.50.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 7611455289..e613b90c3e 100644
--- a/contracts/feature-tests/composability/transfer-role-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/transfer-role-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0"
+version = "0.50.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 b2e54fbf1a..4da10eadf2 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.49.0"
+version = "0.50.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0"
+version = "0.50.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 3cb6d85611..bba19b1692 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.49.0"
+version = "0.50.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 c15f4e3fcb..7ae312d234 100644
--- a/contracts/feature-tests/composability/vault/wasm-vault-promises/Cargo.toml
+++ b/contracts/feature-tests/composability/vault/wasm-vault-promises/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0"
+version = "0.50.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 8b00dd7f79..1ac9d7a3eb 100644
--- a/contracts/feature-tests/composability/vault/wasm-vault-upgrade/Cargo.toml
+++ b/contracts/feature-tests/composability/vault/wasm-vault-upgrade/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0"
+version = "0.50.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 b2c689042d..dcad7dd470 100644
--- a/contracts/feature-tests/composability/vault/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/vault/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0"
+version = "0.50.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 58f8eb9a66..af59c252e1 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.49.0"
+version = "0.50.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0"
+version = "0.50.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 c964676fcc..109640cbff 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.49.0"
+version = "0.50.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 353260c769..a12ad76ba5 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0"
+version = "0.50.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 3c1fd04452..1ed1db494f 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.49.0"
+version = "0.50.0"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0"
+version = "0.50.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 3f010b8d56..d0c6a8f89a 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.49.0"
+version = "0.50.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 4ab22904d3..920cdb6d18 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0"
+version = "0.50.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 5a35bd1ac8..20e6accec6 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.49.0"
+version = "0.50.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0"
+version = "0.50.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 c95b91c9c8..ff51534af6 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.49.0"
+version = "0.50.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 a643999ba9..99ab569a9b 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0"
+version = "0.50.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 6e245b8603..cd026019d1 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.49.0"
+version = "0.50.0"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0"
+version = "0.50.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 917bcfdf75..8920ff26ca 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.49.0"
+version = "0.50.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 edae4b9512..226a4e656d 100644
--- a/contracts/feature-tests/erc-style-contracts/erc1155/wasm/Cargo.toml
+++ b/contracts/feature-tests/erc-style-contracts/erc1155/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0"
+version = "0.50.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 e622226f95..4e79b41a48 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.49.0"
+version = "0.50.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0"
+version = "0.50.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 13356ab1e2..7ecffa7baf 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.49.0"
+version = "0.50.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 737591bb25..f7d2303648 100644
--- a/contracts/feature-tests/erc-style-contracts/erc20/wasm/Cargo.toml
+++ b/contracts/feature-tests/erc-style-contracts/erc20/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0"
+version = "0.50.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 54d2d63fcc..36b342c5fb 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.49.0"
+version = "0.50.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0"
+version = "0.50.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 df452bd789..7109f4e70a 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.49.0"
+version = "0.50.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 883748a64d..8bda1c73ec 100644
--- a/contracts/feature-tests/erc-style-contracts/erc721/wasm/Cargo.toml
+++ b/contracts/feature-tests/erc-style-contracts/erc721/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0"
+version = "0.50.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 abea523dd1..f439cf41d4 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.49.0"
+version = "0.50.0"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0"
+version = "0.50.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 1edc440467..4d09e600fe 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.49.0"
+version = "0.50.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 a60943441f..fc81c88fd1 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0"
+version = "0.50.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 6414a39d8c..c6b14eadc7 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.49.0"
+version = "0.50.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0"
+version = "0.50.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 f53e18476b..18eb3960d2 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.49.0"
+version = "0.50.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 2a12a6d9ab..7697d25efc 100644
--- a/contracts/feature-tests/esdt-system-sc-mock/wasm/Cargo.toml
+++ b/contracts/feature-tests/esdt-system-sc-mock/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0"
+version = "0.50.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/exchange-features/Cargo.toml b/contracts/feature-tests/exchange-features/Cargo.toml
index 8d21d6320b..5ab2bdea18 100644
--- a/contracts/feature-tests/exchange-features/Cargo.toml
+++ b/contracts/feature-tests/exchange-features/Cargo.toml
@@ -9,9 +9,9 @@ publish = false
 path = "src/exchange_features.rs"
 
 [dependencies.multiversx-sc]
-version = "0.49.0"
+version = "0.50.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0"
+version = "0.50.0"
 path = "../../../framework/scenario"
diff --git a/contracts/feature-tests/exchange-features/meta/Cargo.toml b/contracts/feature-tests/exchange-features/meta/Cargo.toml
index 539f20a16a..0b7383402f 100644
--- a/contracts/feature-tests/exchange-features/meta/Cargo.toml
+++ b/contracts/feature-tests/exchange-features/meta/Cargo.toml
@@ -8,6 +8,6 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.49.0"
+version = "0.50.0"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/feature-tests/exchange-features/wasm/Cargo.toml b/contracts/feature-tests/exchange-features/wasm/Cargo.toml
index a4f0852da8..0141df21ea 100644
--- a/contracts/feature-tests/exchange-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/exchange-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0"
+version = "0.50.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 6511a95524..cd344b485b 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.49.0"
+version = "0.50.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0"
+version = "0.50.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 03b89e8914..38d0e6a75b 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.49.0"
+version = "0.50.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 dc6fa80f06..15bb2c28c0 100644
--- a/contracts/feature-tests/formatted-message-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/formatted-message-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0"
+version = "0.50.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 f52eefc261..5142134a89 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.49.0"
+version = "0.50.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0"
+version = "0.50.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 ddd71f8b4e..710215d3ea 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.49.0"
+version = "0.50.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 7451a29f06..19b7f4231d 100644
--- a/contracts/feature-tests/managed-map-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/managed-map-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0"
+version = "0.50.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 2d36eb9bc2..9716c53dfc 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.49.0"
+version = "0.50.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0"
+version = "0.50.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 e3cf62d271..749f427f52 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.49.0"
+version = "0.50.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 1ad18e13e1..2bc184ff09 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0"
+version = "0.50.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 5f56a568a8..ac7e6331ce 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
@@ -29,7 +29,7 @@ path = ".."
 features = ["example_feature"]
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0"
+version = "0.50.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 7ff6790e03..bc869f15fe 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0"
+version = "0.50.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 1a86cf9c8d..654a0bb859 100644
--- a/contracts/feature-tests/multi-contract-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/multi-contract-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0"
+version = "0.50.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 608aa93444..36e475bb60 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.49.0"
+version = "0.50.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0"
+version = "0.50.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 c5ffba6f1a..98832309a9 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.49.0"
+version = "0.50.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 49e1111e0a..9e7e11f1ef 100644
--- a/contracts/feature-tests/panic-message-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/panic-message-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0"
+version = "0.50.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 d310d91154..b1a8eada8b 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.49.0"
+version = "0.50.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0"
+version = "0.50.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 88c95cb422..4c8a0c1e82 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.49.0"
+version = "0.50.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 20041a83c9..7077b92045 100644
--- a/contracts/feature-tests/payable-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/payable-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0"
+version = "0.50.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 3519576de9..28b21758f1 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.49.0"
+version = "0.50.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0"
+version = "0.50.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 893542fe1d..dee69733d5 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.49.0"
+version = "0.50.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 3ca3dc298c..449c0c22c6 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.49.0"
+version = "0.50.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 160a3556f0..39e3d6f0ec 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.49.0"
+// version = "0.50.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 ea261b7c3a..cfda3e917b 100644
--- a/contracts/feature-tests/rust-snippets-generator-test/wasm/Cargo.toml
+++ b/contracts/feature-tests/rust-snippets-generator-test/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0"
+version = "0.50.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 41ba45dadf..8a972dee28 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.49.0"
+version = "0.50.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.49.0"
+version = "0.50.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 02bfe884d6..2ab1f50f29 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.49.0"
+version = "0.50.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 12847d64bc..55fe7b60eb 100644
--- a/contracts/feature-tests/rust-testing-framework-tester/wasm/Cargo.toml
+++ b/contracts/feature-tests/rust-testing-framework-tester/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0"
+version = "0.50.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/scenario-tester/Cargo.toml b/contracts/feature-tests/scenario-tester/Cargo.toml
index 6e6fe3b9ba..7730957bf3 100644
--- a/contracts/feature-tests/scenario-tester/Cargo.toml
+++ b/contracts/feature-tests/scenario-tester/Cargo.toml
@@ -9,9 +9,9 @@ publish = false
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "0.49.0"
+version = "0.50.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0"
+version = "0.50.0"
 path = "../../../framework/scenario"
diff --git a/contracts/feature-tests/scenario-tester/meta/Cargo.toml b/contracts/feature-tests/scenario-tester/meta/Cargo.toml
index 4737585715..5e098c989a 100644
--- a/contracts/feature-tests/scenario-tester/meta/Cargo.toml
+++ b/contracts/feature-tests/scenario-tester/meta/Cargo.toml
@@ -8,6 +8,6 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.49.0"
+version = "0.50.0"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/feature-tests/scenario-tester/wasm/Cargo.toml b/contracts/feature-tests/scenario-tester/wasm/Cargo.toml
index 603e662f9d..0119b76a59 100644
--- a/contracts/feature-tests/scenario-tester/wasm/Cargo.toml
+++ b/contracts/feature-tests/scenario-tester/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0"
+version = "0.50.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 a98424a2cf..96a755fa3e 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.49.0"
+version = "0.50.0"
 path = "../../../contracts/modules"
 
 [dependencies.multiversx-sc]
-version = "0.49.0"
+version = "0.50.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.49.0"
+version = "0.50.0"
 path = "../../../framework/scenario"
 
 [dev-dependencies.multiversx-sc-meta]
-version = "0.49.0"
+version = "0.50.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 f98bb6d842..e236f28a16 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.49.0"
+version = "0.50.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 1e5c98bd8f..2e3972993d 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.49.0"
+version = "0.50.0"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.49.0"
+version = "0.50.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 d12b746e0e..4bb1d59883 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.49.0"
+            "version": "0.50.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 4ea01b94a8..921701e29f 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.49.0"
+            "version": "0.50.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 ceeef70516..0578f1a8dc 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0"
+version = "0.50.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 a69dc56cf6..fb19580638 100644
--- a/contracts/feature-tests/use-module/wasm/Cargo.toml
+++ b/contracts/feature-tests/use-module/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.49.0"
+version = "0.50.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/modules/Cargo.toml b/contracts/modules/Cargo.toml
index a9f513191b..88e24c875d 100644
--- a/contracts/modules/Cargo.toml
+++ b/contracts/modules/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-modules"
-version = "0.49.0"
+version = "0.50.0"
 edition = "2021"
 
 authors = ["MultiversX <contact@multiversx.com>"]
@@ -17,5 +17,5 @@ categories = ["no-std", "wasm", "cryptography::cryptocurrencies"]
 alloc = ["multiversx-sc/alloc"]
 
 [dependencies.multiversx-sc]
-version = "0.49.0"
+version = "0.50.0"
 path = "../../framework/base"
diff --git a/data/codec-derive/Cargo.toml b/data/codec-derive/Cargo.toml
index 9bc69bdc55..574b7dcb2c 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.8"
+version = "0.19.0"
 edition = "2021"
 
 authors = ["dorin.iancu <dorin.iancu@multiversx.com>", "Andrei Marinica <andrei.marinica@multiversx.com>", "MultiversX <contact@multiversx.com>"]
diff --git a/data/codec/Cargo.toml b/data/codec/Cargo.toml
index 1b45cf90ae..d1acc107bf 100644
--- a/data/codec/Cargo.toml
+++ b/data/codec/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-codec"
-version = "0.18.8"
+version = "0.19.0"
 edition = "2021"
 
 authors = ["Andrei Marinica <andrei.marinica@multiversx.com>", "MultiversX <contact@multiversx.com>"]
@@ -19,7 +19,7 @@ alloc = []
 
 [dependencies.multiversx-sc-codec-derive]
 path = "../codec-derive"
-version = "=0.18.8"
+version = "=0.19.0"
 optional = true
 
 [dependencies]
@@ -29,4 +29,4 @@ unwrap-infallible = "0.1.5"
 
 [dev-dependencies.multiversx-sc-codec-derive]
 path = "../codec-derive"
-version = "=0.18.8"
+version = "=0.19.0"
diff --git a/framework/base/Cargo.toml b/framework/base/Cargo.toml
index b16a3a7357..c112d5ae7f 100644
--- a/framework/base/Cargo.toml
+++ b/framework/base/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc"
-version = "0.49.0"
+version = "0.50.0"
 edition = "2021"
 
 authors = ["Andrei Marinica <andrei.marinica@multiversx.com>", "MultiversX <contact@multiversx.com>"]
@@ -29,10 +29,10 @@ num-traits = { version = "=0.2.19", default-features = false }
 unwrap-infallible = "0.1.5"
 
 [dependencies.multiversx-sc-derive]
-version = "=0.49.0"
+version = "=0.50.0"
 path = "../derive"
 
 [dependencies.multiversx-sc-codec]
-version = "=0.18.8"
+version = "=0.19.0"
 path = "../../data/codec"
 features = ["derive"]
diff --git a/framework/derive/Cargo.toml b/framework/derive/Cargo.toml
index c8f5f2b337..dfbd737e90 100644
--- a/framework/derive/Cargo.toml
+++ b/framework/derive/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-derive"
-version = "0.49.0"
+version = "0.50.0"
 edition = "2021"
 
 authors = ["Andrei Marinica <andrei.marinica@multiversx.com>", "MultiversX <contact@multiversx.com>"]
diff --git a/framework/meta/Cargo.toml b/framework/meta/Cargo.toml
index 9c6f2b49c7..104675190b 100644
--- a/framework/meta/Cargo.toml
+++ b/framework/meta/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-meta"
-version = "0.49.0"
+version = "0.50.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.49.0"
+version = "=0.50.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 09a2efeca1..d5f0ef31b0 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.49.0"
+version = "0.50.0"
 
 # [workspace]
 
diff --git a/framework/meta/src/version_history.rs b/framework/meta/src/version_history.rs
index 146ebc4d57..e79db2e046 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.49.0);
+pub const LAST_VERSION: FrameworkVersion = framework_version!(0.50.0);
 
 /// Indicates where to stop with the upgrades.
 pub const LAST_UPGRADE_VERSION: FrameworkVersion = LAST_VERSION;
@@ -69,6 +69,7 @@ pub const VERSIONS: &[FrameworkVersion] = framework_versions![
     0.48.0,
     0.48.1,
     0.49.0,
+    0.50.0,
 ];
 
 #[rustfmt::skip]
diff --git a/framework/scenario/Cargo.toml b/framework/scenario/Cargo.toml
index 4f8e2de5cd..2495f292f5 100644
--- a/framework/scenario/Cargo.toml
+++ b/framework/scenario/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-scenario"
-version = "0.49.0"
+version = "0.50.0"
 edition = "2021"
 
 authors = [
@@ -41,12 +41,12 @@ path = "src/main.rs"
 run-go-tests = []
 
 [dependencies.multiversx-sc]
-version = "=0.49.0"
+version = "=0.50.0"
 features = ["alloc", "num-bigint"]
 path = "../base"
 
 [dependencies.multiversx-sc-meta]
-version = "=0.49.0"
+version = "=0.50.0"
 path = "../meta"
 
 [dependencies.multiversx-chain-scenario-format]
@@ -57,9 +57,9 @@ path = "../../sdk/scenario-format"
 version = "0.2.0"
 
 [dependencies.multiversx-chain-vm]
-version = "=0.8.3"
+version = "=0.8.4"
 path = "../../vm"
 
 [dependencies.multiversx-sdk]
-version = "=0.4.0"
+version = "=0.4.1"
 path = "../../sdk/core"
diff --git a/framework/snippets/Cargo.toml b/framework/snippets/Cargo.toml
index eca0ac6dc1..8b0cdc9e20 100644
--- a/framework/snippets/Cargo.toml
+++ b/framework/snippets/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-snippets"
-version = "0.49.0"
+version = "0.50.0"
 edition = "2021"
 
 authors = ["MultiversX <contact@multiversx.com>"]
@@ -23,9 +23,9 @@ futures = "0.3"
 rand = "0.8.5"
 
 [dependencies.multiversx-sc-scenario]
-version = "=0.49.0"
+version = "=0.50.0"
 path = "../scenario"
 
 [dependencies.multiversx-sdk]
-version = "=0.4.0"
+version = "=0.4.1"
 path = "../../sdk/core"
diff --git a/framework/wasm-adapter/Cargo.toml b/framework/wasm-adapter/Cargo.toml
index 89aabf537c..4391acb65c 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.49.0"
+version = "0.50.0"
 edition = "2021"
 
 authors = [
@@ -22,5 +22,5 @@ categories = [
 ]
 
 [dependencies.multiversx-sc]
-version = "=0.49.0"
+version = "=0.50.0"
 path = "../base"
diff --git a/sdk/core/Cargo.toml b/sdk/core/Cargo.toml
index 2ca965fc83..319c81b137 100644
--- a/sdk/core/Cargo.toml
+++ b/sdk/core/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sdk"
-version = "0.4.0"
+version = "0.4.1"
 edition = "2021"
 
 authors = [
diff --git a/tools/mxpy-snippet-generator/Cargo.toml b/tools/mxpy-snippet-generator/Cargo.toml
index 44f616b0f3..56b9e733c1 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.49.0"
+version = "0.50.0"
 path = "../../framework/base"
 
 [dependencies]
diff --git a/tools/rust-debugger/format-tests/Cargo.toml b/tools/rust-debugger/format-tests/Cargo.toml
index 1e44ac884f..33f3e4f4da 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.49.0"
+version = "=0.50.0"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-scenario]
-version = "=0.49.0"
+version = "=0.50.0"
 path = "../../../framework/scenario"
 
 [dependencies.multiversx-chain-vm]
-version = "=0.8.3"
+version = "=0.8.4"
 path = "../../../vm"
 
 [dev-dependencies]
diff --git a/vm/Cargo.toml b/vm/Cargo.toml
index eddc7cb8e1..907308f94f 100644
--- a/vm/Cargo.toml
+++ b/vm/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-chain-vm"
-version = "0.8.3"
+version = "0.8.4"
 edition = "2021"
 
 authors = [

From c3818e9ec2050f7f7a4da203b29ae7e571943f36 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 10 May 2024 11:40:11 +0300
Subject: [PATCH 0869/1254] Cargo.lock update

---
 .../benchmarks/large-storage/wasm/Cargo.lock  | 38 ++++++++++-------
 .../linked-list-repeat/wasm/Cargo.lock        | 38 ++++++++++-------
 .../mappers/map-repeat/wasm/Cargo.lock        | 38 ++++++++++-------
 .../mappers/queue-repeat/wasm/Cargo.lock      | 38 ++++++++++-------
 .../mappers/set-repeat/wasm/Cargo.lock        | 38 ++++++++++-------
 .../single-value-repeat/wasm/Cargo.lock       | 38 ++++++++++-------
 .../mappers/vec-repeat/wasm/Cargo.lock        | 38 ++++++++++-------
 .../benchmarks/send-tx-repeat/wasm/Cargo.lock | 38 ++++++++++-------
 .../Cargo.lock                                | 38 ++++++++++-------
 .../Cargo.lock                                | 38 ++++++++++-------
 .../benchmarks/str-repeat/wasm/Cargo.lock     | 38 ++++++++++-------
 .../core/price-aggregator/wasm/Cargo.lock     | 42 +++++++++++--------
 contracts/examples/adder/wasm/Cargo.lock      | 30 ++++++-------
 .../bonding-curve-contract/wasm/Cargo.lock    | 32 +++++++-------
 .../examples/check-pause/wasm/Cargo.lock      | 32 +++++++-------
 .../crowdfunding-esdt/wasm/Cargo.lock         | 30 ++++++-------
 .../examples/crypto-bubbles/wasm/Cargo.lock   | 30 ++++++-------
 .../kitty-auction/wasm/Cargo.lock             | 30 ++++++-------
 .../kitty-genetic-alg/wasm/Cargo.lock         | 30 ++++++-------
 .../kitty-ownership/wasm/Cargo.lock           | 30 ++++++-------
 .../examples/crypto-zombies/wasm/Cargo.lock   | 30 ++++++-------
 .../examples/digital-cash/wasm/Cargo.lock     | 30 ++++++-------
 contracts/examples/empty/wasm/Cargo.lock      | 30 ++++++-------
 .../esdt-transfer-with-fee/wasm/Cargo.lock    | 30 ++++++-------
 contracts/examples/factorial/wasm/Cargo.lock  | 30 ++++++-------
 .../examples/fractional-nfts/wasm/Cargo.lock  | 32 +++++++-------
 .../examples/lottery-esdt/wasm/Cargo.lock     | 30 ++++++-------
 .../multisig/wasm-multisig-full/Cargo.lock    | 32 +++++++-------
 .../multisig/wasm-multisig-view/Cargo.lock    | 32 +++++++-------
 contracts/examples/multisig/wasm/Cargo.lock   | 32 +++++++-------
 contracts/examples/nft-minter/wasm/Cargo.lock | 30 ++++++-------
 .../nft-storage-prepay/wasm/Cargo.lock        | 30 ++++++-------
 .../examples/nft-subscription/wasm/Cargo.lock | 32 +++++++-------
 .../order-book/factory/wasm/Cargo.lock        | 30 ++++++-------
 .../examples/order-book/pair/wasm/Cargo.lock  | 30 ++++++-------
 .../examples/ping-pong-egld/wasm/Cargo.lock   | 30 ++++++-------
 .../examples/proxy-pause/wasm/Cargo.lock      | 30 ++++++-------
 .../rewards-distribution/wasm/Cargo.lock      | 32 +++++++-------
 .../examples/seed-nft-minter/wasm/Cargo.lock  | 32 +++++++-------
 .../examples/token-release/wasm/Cargo.lock    | 30 ++++++-------
 .../abi-tester/wasm-abi-tester-ev/Cargo.lock  | 30 ++++++-------
 .../feature-tests/abi-tester/wasm/Cargo.lock  | 30 ++++++-------
 .../wasm-alloc-mem-fail/Cargo.lock            | 30 ++++++-------
 .../wasm-alloc-mem-leaking/Cargo.lock         | 30 ++++++-------
 .../alloc-features/wasm/Cargo.lock            | 30 ++++++-------
 .../Cargo.lock                                | 32 +++++++-------
 .../basic-features/wasm/Cargo.lock            | 32 +++++++-------
 .../basic-features/wasm/src/lib.rs            |  5 +--
 .../big-float-features/wasm/Cargo.lock        | 30 ++++++-------
 .../builtin-func-features/wasm/Cargo.lock     | 30 ++++++-------
 .../first-contract/wasm/Cargo.lock            | 30 ++++++-------
 .../second-contract/wasm/Cargo.lock           | 30 ++++++-------
 .../child/wasm/Cargo.lock                     | 30 ++++++-------
 .../parent/wasm/Cargo.lock                    | 30 ++++++-------
 .../forwarder-legacy/wasm/Cargo.lock          | 30 ++++++-------
 .../wasm-forwarder-queue-promises/Cargo.lock  | 30 ++++++-------
 .../forwarder-queue/wasm/Cargo.lock           | 30 ++++++-------
 .../Cargo.lock                                | 30 ++++++-------
 .../Cargo.lock                                | 30 ++++++-------
 .../forwarder-raw/wasm/Cargo.lock             | 30 ++++++-------
 .../composability/forwarder/wasm/Cargo.lock   | 30 ++++++-------
 .../local-esdt-and-nft/wasm/Cargo.lock        | 30 ++++++-------
 .../promises-features/wasm/Cargo.lock         | 30 ++++++-------
 .../proxy-test-first/wasm/Cargo.lock          | 30 ++++++-------
 .../proxy-test-second/wasm/Cargo.lock         | 30 ++++++-------
 .../recursive-caller/wasm/Cargo.lock          | 30 ++++++-------
 .../transfer-role-features/wasm/Cargo.lock    | 32 +++++++-------
 .../vault/wasm-vault-promises/Cargo.lock      | 30 ++++++-------
 .../vault/wasm-vault-upgrade/Cargo.lock       | 30 ++++++-------
 .../composability/vault/wasm/Cargo.lock       | 30 ++++++-------
 .../crowdfunding-erc20/wasm/Cargo.lock        | 30 ++++++-------
 .../erc1155-marketplace/wasm/Cargo.lock       | 30 ++++++-------
 .../erc1155-user-mock/wasm/Cargo.lock         | 30 ++++++-------
 .../erc1155/wasm/Cargo.lock                   | 30 ++++++-------
 .../erc-style-contracts/erc20/wasm/Cargo.lock | 30 ++++++-------
 .../erc721/wasm/Cargo.lock                    | 30 ++++++-------
 .../lottery-erc20/wasm/Cargo.lock             | 30 ++++++-------
 .../esdt-system-sc-mock/wasm/Cargo.lock       | 30 ++++++-------
 .../exchange-features/wasm/Cargo.lock         | 30 ++++++-------
 .../wasm/Cargo.lock                           | 30 ++++++-------
 .../managed-map-features/wasm/Cargo.lock      | 30 ++++++-------
 .../wasm-multi-contract-alt-impl/Cargo.lock   | 30 ++++++-------
 .../Cargo.lock                                | 30 ++++++-------
 .../Cargo.lock                                | 30 ++++++-------
 .../multi-contract-features/wasm/Cargo.lock   | 30 ++++++-------
 .../panic-message-features/wasm/Cargo.lock    | 30 ++++++-------
 .../payable-features/wasm/Cargo.lock          | 30 ++++++-------
 .../wasm/Cargo.lock                           | 30 ++++++-------
 .../wasm/Cargo.lock                           | 30 ++++++-------
 .../scenario-tester/wasm/Cargo.lock           | 30 ++++++-------
 .../wasm-use-module-view/Cargo.lock           | 32 +++++++-------
 .../feature-tests/use-module/wasm/Cargo.lock  | 32 +++++++-------
 92 files changed, 1479 insertions(+), 1384 deletions(-)

diff --git a/contracts/benchmarks/large-storage/wasm/Cargo.lock b/contracts/benchmarks/large-storage/wasm/Cargo.lock
index 3b11d697fe..dba248ea1e 100755
--- a/contracts/benchmarks/large-storage/wasm/Cargo.lock
+++ b/contracts/benchmarks/large-storage/wasm/Cargo.lock
@@ -16,9 +16,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.4.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 
 [[package]]
 name = "endian-type"
@@ -55,26 +55,28 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "bitflags",
  "hex-literal",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
+ "unwrap-infallible",
 ]
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
+ "unwrap-infallible",
 ]
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -84,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -95,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -111,27 +113,27 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
@@ -154,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -168,3 +170,9 @@ name = "unicode-ident"
 version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unwrap-infallible"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "151ac09978d3c2862c4e39b557f4eceee2cc72150bc4cb4f16abf061b6e381fb"
diff --git a/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.lock
index 449c08ea0f..abf67723b1 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.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 
 [[package]]
 name = "endian-type"
@@ -63,26 +63,28 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "bitflags",
  "hex-literal",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
+ "unwrap-infallible",
 ]
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
+ "unwrap-infallible",
 ]
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -92,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -103,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -119,27 +121,27 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
@@ -162,9 +164,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -176,3 +178,9 @@ name = "unicode-ident"
 version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unwrap-infallible"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "151ac09978d3c2862c4e39b557f4eceee2cc72150bc4cb4f16abf061b6e381fb"
diff --git a/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.lock
index 19bbfef34c..f01af1f56f 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.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 
 [[package]]
 name = "endian-type"
@@ -63,26 +63,28 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "bitflags",
  "hex-literal",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
+ "unwrap-infallible",
 ]
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
+ "unwrap-infallible",
 ]
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -92,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -103,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -119,27 +121,27 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
@@ -162,9 +164,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -176,3 +178,9 @@ name = "unicode-ident"
 version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unwrap-infallible"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "151ac09978d3c2862c4e39b557f4eceee2cc72150bc4cb4f16abf061b6e381fb"
diff --git a/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.lock
index 3142322933..6906ca7296 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.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 
 [[package]]
 name = "endian-type"
@@ -47,26 +47,28 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "bitflags",
  "hex-literal",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
+ "unwrap-infallible",
 ]
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
+ "unwrap-infallible",
 ]
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -76,7 +78,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +89,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -103,18 +105,18 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
 dependencies = [
  "unicode-ident",
 ]
@@ -137,9 +139,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
@@ -162,9 +164,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -176,3 +178,9 @@ name = "unicode-ident"
 version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unwrap-infallible"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "151ac09978d3c2862c4e39b557f4eceee2cc72150bc4cb4f16abf061b6e381fb"
diff --git a/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.lock
index 5f6c1735e6..f5de0ccba1 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.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 
 [[package]]
 name = "endian-type"
@@ -47,26 +47,28 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "bitflags",
  "hex-literal",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
+ "unwrap-infallible",
 ]
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
+ "unwrap-infallible",
 ]
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -76,7 +78,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +89,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -103,27 +105,27 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
@@ -162,9 +164,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -176,3 +178,9 @@ name = "unicode-ident"
 version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unwrap-infallible"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "151ac09978d3c2862c4e39b557f4eceee2cc72150bc4cb4f16abf061b6e381fb"
diff --git a/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.lock
index 8b63d51212..c9cfc96106 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.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 
 [[package]]
 name = "endian-type"
@@ -47,26 +47,28 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "bitflags",
  "hex-literal",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
+ "unwrap-infallible",
 ]
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
+ "unwrap-infallible",
 ]
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -76,7 +78,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +89,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -103,27 +105,27 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
@@ -162,9 +164,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -176,3 +178,9 @@ name = "unicode-ident"
 version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unwrap-infallible"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "151ac09978d3c2862c4e39b557f4eceee2cc72150bc4cb4f16abf061b6e381fb"
diff --git a/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.lock
index 66f60c60c1..8fd083636f 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.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 
 [[package]]
 name = "endian-type"
@@ -47,26 +47,28 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "bitflags",
  "hex-literal",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
+ "unwrap-infallible",
 ]
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
+ "unwrap-infallible",
 ]
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -76,7 +78,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +89,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -103,27 +105,27 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
@@ -146,9 +148,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -161,6 +163,12 @@ version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
 
+[[package]]
+name = "unwrap-infallible"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "151ac09978d3c2862c4e39b557f4eceee2cc72150bc4cb4f16abf061b6e381fb"
+
 [[package]]
 name = "vec-repeat"
 version = "0.0.0"
diff --git a/contracts/benchmarks/send-tx-repeat/wasm/Cargo.lock b/contracts/benchmarks/send-tx-repeat/wasm/Cargo.lock
index cf7a8f3585..7c7075cab8 100755
--- a/contracts/benchmarks/send-tx-repeat/wasm/Cargo.lock
+++ b/contracts/benchmarks/send-tx-repeat/wasm/Cargo.lock
@@ -16,9 +16,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.4.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 
 [[package]]
 name = "endian-type"
@@ -40,26 +40,28 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "bitflags",
  "hex-literal",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
+ "unwrap-infallible",
 ]
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
+ "unwrap-infallible",
 ]
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -69,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -96,27 +98,27 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
@@ -154,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -168,3 +170,9 @@ name = "unicode-ident"
 version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unwrap-infallible"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "151ac09978d3c2862c4e39b557f4eceee2cc72150bc4cb4f16abf061b6e381fb"
diff --git a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.lock b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.lock
index f855655dcc..5944a194d0 100644
--- a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.lock
+++ b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.lock
@@ -16,9 +16,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.4.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 
 [[package]]
 name = "endian-type"
@@ -40,26 +40,28 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "bitflags",
  "hex-literal",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
+ "unwrap-infallible",
 ]
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
+ "unwrap-infallible",
 ]
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -69,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -96,27 +98,27 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
@@ -154,9 +156,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -168,3 +170,9 @@ name = "unicode-ident"
 version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unwrap-infallible"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "151ac09978d3c2862c4e39b557f4eceee2cc72150bc4cb4f16abf061b6e381fb"
diff --git a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.lock b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.lock
index 938e18a3af..7a929b52ce 100644
--- a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.lock
+++ b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.lock
@@ -16,9 +16,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.4.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 
 [[package]]
 name = "endian-type"
@@ -40,26 +40,28 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "bitflags",
  "hex-literal",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
+ "unwrap-infallible",
 ]
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
+ "unwrap-infallible",
 ]
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -69,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -96,27 +98,27 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
@@ -154,9 +156,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -168,3 +170,9 @@ name = "unicode-ident"
 version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unwrap-infallible"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "151ac09978d3c2862c4e39b557f4eceee2cc72150bc4cb4f16abf061b6e381fb"
diff --git a/contracts/benchmarks/str-repeat/wasm/Cargo.lock b/contracts/benchmarks/str-repeat/wasm/Cargo.lock
index e7ac6d7c34..db58ccefaa 100755
--- a/contracts/benchmarks/str-repeat/wasm/Cargo.lock
+++ b/contracts/benchmarks/str-repeat/wasm/Cargo.lock
@@ -16,9 +16,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.4.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 
 [[package]]
 name = "endian-type"
@@ -40,26 +40,28 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "bitflags",
  "hex-literal",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
+ "unwrap-infallible",
 ]
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
+ "unwrap-infallible",
 ]
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -69,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -80,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -96,27 +98,27 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
@@ -154,9 +156,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -168,3 +170,9 @@ name = "unicode-ident"
 version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unwrap-infallible"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "151ac09978d3c2862c4e39b557f4eceee2cc72150bc4cb4f16abf061b6e381fb"
diff --git a/contracts/core/price-aggregator/wasm/Cargo.lock b/contracts/core/price-aggregator/wasm/Cargo.lock
index 22f75ad2dc..3d174ea714 100644
--- a/contracts/core/price-aggregator/wasm/Cargo.lock
+++ b/contracts/core/price-aggregator/wasm/Cargo.lock
@@ -16,9 +16,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.4.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 
 [[package]]
 name = "bumpalo"
@@ -86,7 +86,7 @@ checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
 
 [[package]]
 name = "multiversx-price-aggregator-sc"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "arrayvec",
  "getrandom",
@@ -105,26 +105,28 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "bitflags",
  "hex-literal",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
+ "unwrap-infallible",
 ]
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
+ "unwrap-infallible",
 ]
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -134,7 +136,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -145,14 +147,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -168,9 +170,9 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
 ]
@@ -189,18 +191,18 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
@@ -253,9 +255,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -268,6 +270,12 @@ version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
 
+[[package]]
+name = "unwrap-infallible"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "151ac09978d3c2862c4e39b557f4eceee2cc72150bc4cb4f16abf061b6e381fb"
+
 [[package]]
 name = "wasi"
 version = "0.11.0+wasi-snapshot-preview1"
diff --git a/contracts/examples/adder/wasm/Cargo.lock b/contracts/examples/adder/wasm/Cargo.lock
index 23067b448c..c994e313a0 100755
--- a/contracts/examples/adder/wasm/Cargo.lock
+++ b/contracts/examples/adder/wasm/Cargo.lock
@@ -31,9 +31,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.4.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 
 [[package]]
 name = "endian-type"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -113,27 +113,27 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/bonding-curve-contract/wasm/Cargo.lock b/contracts/examples/bonding-curve-contract/wasm/Cargo.lock
index 97fff17f19..b49f1e8035 100644
--- a/contracts/examples/bonding-curve-contract/wasm/Cargo.lock
+++ b/contracts/examples/bonding-curve-contract/wasm/Cargo.lock
@@ -16,9 +16,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.4.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 
 [[package]]
 name = "bonding-curve-contract"
@@ -56,7 +56,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -68,7 +68,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -77,7 +77,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -121,27 +121,27 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
@@ -164,9 +164,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/check-pause/wasm/Cargo.lock b/contracts/examples/check-pause/wasm/Cargo.lock
index 8c1752ba37..02663fa3ba 100644
--- a/contracts/examples/check-pause/wasm/Cargo.lock
+++ b/contracts/examples/check-pause/wasm/Cargo.lock
@@ -16,9 +16,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.4.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 
 [[package]]
 name = "check-pause"
@@ -56,7 +56,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -68,7 +68,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -77,7 +77,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -121,27 +121,27 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
@@ -164,9 +164,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/crowdfunding-esdt/wasm/Cargo.lock b/contracts/examples/crowdfunding-esdt/wasm/Cargo.lock
index 82975c4c9e..742d20da66 100644
--- a/contracts/examples/crowdfunding-esdt/wasm/Cargo.lock
+++ b/contracts/examples/crowdfunding-esdt/wasm/Cargo.lock
@@ -16,9 +16,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.4.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 
 [[package]]
 name = "crowdfunding-esdt"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -113,27 +113,27 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/crypto-bubbles/wasm/Cargo.lock b/contracts/examples/crypto-bubbles/wasm/Cargo.lock
index 461663fb08..99a6cfd4a4 100755
--- a/contracts/examples/crypto-bubbles/wasm/Cargo.lock
+++ b/contracts/examples/crypto-bubbles/wasm/Cargo.lock
@@ -16,9 +16,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.4.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 
 [[package]]
 name = "crypto-bubbles"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -113,27 +113,27 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.lock b/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.lock
index 3429cfc2aa..b9eba6f8b8 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 = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.4.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 
 [[package]]
 name = "endian-type"
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -96,7 +96,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -115,7 +115,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -126,7 +126,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -142,27 +142,27 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
@@ -192,9 +192,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
 dependencies = [
  "proc-macro2",
  "quote",
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 34b214a29f..9bd41c51e5 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 = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.4.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 
 [[package]]
 name = "endian-type"
@@ -65,7 +65,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -77,7 +77,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,7 +96,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -107,7 +107,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -123,27 +123,27 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
@@ -173,9 +173,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.lock b/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.lock
index c2ff73c1a1..fdc162f861 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 = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.4.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 
 [[package]]
 name = "endian-type"
@@ -75,7 +75,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -96,7 +96,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -106,7 +106,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -117,7 +117,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -133,27 +133,27 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
@@ -183,9 +183,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/crypto-zombies/wasm/Cargo.lock b/contracts/examples/crypto-zombies/wasm/Cargo.lock
index daaa6008dd..950cdb9357 100755
--- a/contracts/examples/crypto-zombies/wasm/Cargo.lock
+++ b/contracts/examples/crypto-zombies/wasm/Cargo.lock
@@ -16,9 +16,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.4.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 
 [[package]]
 name = "crypto-zombies"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -113,27 +113,27 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/digital-cash/wasm/Cargo.lock b/contracts/examples/digital-cash/wasm/Cargo.lock
index b1af97d669..2e8e5cce1b 100644
--- a/contracts/examples/digital-cash/wasm/Cargo.lock
+++ b/contracts/examples/digital-cash/wasm/Cargo.lock
@@ -16,9 +16,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.4.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 
 [[package]]
 name = "digital-cash"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -113,27 +113,27 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/empty/wasm/Cargo.lock b/contracts/examples/empty/wasm/Cargo.lock
index dbc333b9ad..ba7c3877e7 100755
--- a/contracts/examples/empty/wasm/Cargo.lock
+++ b/contracts/examples/empty/wasm/Cargo.lock
@@ -16,9 +16,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.4.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 
 [[package]]
 name = "empty"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -113,27 +113,27 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.lock b/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.lock
index 2ef8eb993d..afe6c093a1 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 = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.4.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 
 [[package]]
 name = "endian-type"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -113,27 +113,27 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/factorial/wasm/Cargo.lock b/contracts/examples/factorial/wasm/Cargo.lock
index c735d1dc1e..3ba746104c 100755
--- a/contracts/examples/factorial/wasm/Cargo.lock
+++ b/contracts/examples/factorial/wasm/Cargo.lock
@@ -16,9 +16,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.4.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 
 [[package]]
 name = "endian-type"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -113,27 +113,27 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/fractional-nfts/wasm/Cargo.lock b/contracts/examples/fractional-nfts/wasm/Cargo.lock
index 40e63cd58f..f0edb04b88 100644
--- a/contracts/examples/fractional-nfts/wasm/Cargo.lock
+++ b/contracts/examples/fractional-nfts/wasm/Cargo.lock
@@ -16,9 +16,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.4.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 
 [[package]]
 name = "endian-type"
@@ -56,7 +56,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -68,7 +68,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -77,7 +77,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -121,27 +121,27 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
@@ -164,9 +164,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/lottery-esdt/wasm/Cargo.lock b/contracts/examples/lottery-esdt/wasm/Cargo.lock
index 2f8a7a39c2..663e91c194 100755
--- a/contracts/examples/lottery-esdt/wasm/Cargo.lock
+++ b/contracts/examples/lottery-esdt/wasm/Cargo.lock
@@ -16,9 +16,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.4.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 
 [[package]]
 name = "endian-type"
@@ -55,7 +55,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -113,27 +113,27 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/multisig/wasm-multisig-full/Cargo.lock b/contracts/examples/multisig/wasm-multisig-full/Cargo.lock
index f8b39788d9..46e9d7a771 100644
--- a/contracts/examples/multisig/wasm-multisig-full/Cargo.lock
+++ b/contracts/examples/multisig/wasm-multisig-full/Cargo.lock
@@ -16,9 +16,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.4.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 
 [[package]]
 name = "endian-type"
@@ -56,7 +56,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -68,7 +68,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -77,7 +77,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -121,27 +121,27 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
@@ -164,9 +164,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/multisig/wasm-multisig-view/Cargo.lock b/contracts/examples/multisig/wasm-multisig-view/Cargo.lock
index 6695e773fd..8983c03f09 100644
--- a/contracts/examples/multisig/wasm-multisig-view/Cargo.lock
+++ b/contracts/examples/multisig/wasm-multisig-view/Cargo.lock
@@ -16,9 +16,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.4.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 
 [[package]]
 name = "endian-type"
@@ -56,7 +56,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -68,7 +68,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -77,7 +77,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -121,27 +121,27 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
@@ -164,9 +164,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/multisig/wasm/Cargo.lock b/contracts/examples/multisig/wasm/Cargo.lock
index c909fdc3cb..f17285f0dd 100755
--- a/contracts/examples/multisig/wasm/Cargo.lock
+++ b/contracts/examples/multisig/wasm/Cargo.lock
@@ -16,9 +16,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.4.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 
 [[package]]
 name = "endian-type"
@@ -56,7 +56,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -68,7 +68,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -77,7 +77,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -121,27 +121,27 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
@@ -164,9 +164,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/nft-minter/wasm/Cargo.lock b/contracts/examples/nft-minter/wasm/Cargo.lock
index 49df94c669..d2834d4c77 100644
--- a/contracts/examples/nft-minter/wasm/Cargo.lock
+++ b/contracts/examples/nft-minter/wasm/Cargo.lock
@@ -16,9 +16,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.4.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 
 [[package]]
 name = "endian-type"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -113,27 +113,27 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/nft-storage-prepay/wasm/Cargo.lock b/contracts/examples/nft-storage-prepay/wasm/Cargo.lock
index 7768750592..d74010ae43 100755
--- a/contracts/examples/nft-storage-prepay/wasm/Cargo.lock
+++ b/contracts/examples/nft-storage-prepay/wasm/Cargo.lock
@@ -16,9 +16,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.4.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 
 [[package]]
 name = "endian-type"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -113,27 +113,27 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/nft-subscription/wasm/Cargo.lock b/contracts/examples/nft-subscription/wasm/Cargo.lock
index b3c296aff1..e3c54a2497 100644
--- a/contracts/examples/nft-subscription/wasm/Cargo.lock
+++ b/contracts/examples/nft-subscription/wasm/Cargo.lock
@@ -16,9 +16,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.4.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 
 [[package]]
 name = "endian-type"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,14 +82,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -121,27 +121,27 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
@@ -164,9 +164,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/order-book/factory/wasm/Cargo.lock b/contracts/examples/order-book/factory/wasm/Cargo.lock
index 362ce65cc0..8ffc6240e7 100644
--- a/contracts/examples/order-book/factory/wasm/Cargo.lock
+++ b/contracts/examples/order-book/factory/wasm/Cargo.lock
@@ -16,9 +16,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.4.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 
 [[package]]
 name = "endian-type"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -98,9 +98,9 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
 ]
@@ -122,18 +122,18 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/order-book/pair/wasm/Cargo.lock b/contracts/examples/order-book/pair/wasm/Cargo.lock
index 3d9462d6d6..1bd8cbe37a 100644
--- a/contracts/examples/order-book/pair/wasm/Cargo.lock
+++ b/contracts/examples/order-book/pair/wasm/Cargo.lock
@@ -16,9 +16,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.4.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 
 [[package]]
 name = "endian-type"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -98,9 +98,9 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
 ]
@@ -122,18 +122,18 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/ping-pong-egld/wasm/Cargo.lock b/contracts/examples/ping-pong-egld/wasm/Cargo.lock
index 6867ae9bf6..d3023cb2e3 100755
--- a/contracts/examples/ping-pong-egld/wasm/Cargo.lock
+++ b/contracts/examples/ping-pong-egld/wasm/Cargo.lock
@@ -16,9 +16,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.4.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 
 [[package]]
 name = "endian-type"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -98,9 +98,9 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
 ]
@@ -122,18 +122,18 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/proxy-pause/wasm/Cargo.lock b/contracts/examples/proxy-pause/wasm/Cargo.lock
index 45f61ca9b2..847c806b19 100644
--- a/contracts/examples/proxy-pause/wasm/Cargo.lock
+++ b/contracts/examples/proxy-pause/wasm/Cargo.lock
@@ -16,9 +16,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.4.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 
 [[package]]
 name = "endian-type"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -98,18 +98,18 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
 dependencies = [
  "unicode-ident",
 ]
@@ -131,9 +131,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/rewards-distribution/wasm/Cargo.lock b/contracts/examples/rewards-distribution/wasm/Cargo.lock
index 67cddf29a5..97dace01a5 100644
--- a/contracts/examples/rewards-distribution/wasm/Cargo.lock
+++ b/contracts/examples/rewards-distribution/wasm/Cargo.lock
@@ -16,9 +16,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.4.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 
 [[package]]
 name = "endian-type"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,14 +82,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -105,27 +105,27 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
@@ -164,9 +164,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/seed-nft-minter/wasm/Cargo.lock b/contracts/examples/seed-nft-minter/wasm/Cargo.lock
index 41afdbaf4c..d53e946cb8 100644
--- a/contracts/examples/seed-nft-minter/wasm/Cargo.lock
+++ b/contracts/examples/seed-nft-minter/wasm/Cargo.lock
@@ -16,9 +16,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.4.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 
 [[package]]
 name = "endian-type"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,14 +82,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -105,27 +105,27 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
@@ -164,9 +164,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/token-release/wasm/Cargo.lock b/contracts/examples/token-release/wasm/Cargo.lock
index 2dc67fca16..2619711a03 100644
--- a/contracts/examples/token-release/wasm/Cargo.lock
+++ b/contracts/examples/token-release/wasm/Cargo.lock
@@ -16,9 +16,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.4.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 
 [[package]]
 name = "endian-type"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -98,27 +98,27 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
@@ -141,9 +141,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
 dependencies = [
  "proc-macro2",
  "quote",
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 b15de5154a..0fe6289884 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 = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.4.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 
 [[package]]
 name = "endian-type"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -113,27 +113,27 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/feature-tests/abi-tester/wasm/Cargo.lock b/contracts/feature-tests/abi-tester/wasm/Cargo.lock
index 97c4e422b9..3e2b76af84 100755
--- a/contracts/feature-tests/abi-tester/wasm/Cargo.lock
+++ b/contracts/feature-tests/abi-tester/wasm/Cargo.lock
@@ -31,9 +31,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.4.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 
 [[package]]
 name = "endian-type"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -113,27 +113,27 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock
index 8ef8bda743..895f73e9ea 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock
@@ -31,9 +31,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.4.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 
 [[package]]
 name = "endian-type"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -113,27 +113,27 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.lock b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.lock
index 94d26f6126..569d223c0a 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.lock
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.lock
@@ -31,9 +31,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.4.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 
 [[package]]
 name = "endian-type"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -113,27 +113,27 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/feature-tests/alloc-features/wasm/Cargo.lock b/contracts/feature-tests/alloc-features/wasm/Cargo.lock
index 62bc5036eb..5b65d38617 100644
--- a/contracts/feature-tests/alloc-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/alloc-features/wasm/Cargo.lock
@@ -31,9 +31,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.4.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 
 [[package]]
 name = "endian-type"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -113,27 +113,27 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
 dependencies = [
  "proc-macro2",
  "quote",
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 20a75d222d..09b815e212 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.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 
 [[package]]
 name = "endian-type"
@@ -56,7 +56,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -68,7 +68,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -77,7 +77,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -121,27 +121,27 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
@@ -164,9 +164,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/feature-tests/basic-features/wasm/Cargo.lock b/contracts/feature-tests/basic-features/wasm/Cargo.lock
index 3d14641d4b..c78556dc4b 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.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 
 [[package]]
 name = "endian-type"
@@ -56,7 +56,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -68,7 +68,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -77,7 +77,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -121,27 +121,27 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
@@ -164,9 +164,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/feature-tests/basic-features/wasm/src/lib.rs b/contracts/feature-tests/basic-features/wasm/src/lib.rs
index d2948e2da4..de77a1fc25 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:                          387
+// Endpoints:                          386
 // Async Callback:                       1
-// Total number of exported functions: 389
+// Total number of exported functions: 388
 
 #![no_std]
 
@@ -216,7 +216,6 @@ multiversx_sc_wasm_adapter::endpoints! {
         managed_vec_remove => managed_vec_remove
         managed_vec_find => managed_vec_find
         managed_vec_contains => managed_vec_contains
-        managed_vec_array_push => managed_vec_array_push
         managed_ref_explicit => managed_ref_explicit
         storage_read_raw => storage_read_raw
         storage_write_raw => storage_write_raw
diff --git a/contracts/feature-tests/big-float-features/wasm/Cargo.lock b/contracts/feature-tests/big-float-features/wasm/Cargo.lock
index 4601a0ccbc..ed078497ec 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.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 
 [[package]]
 name = "endian-type"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -113,27 +113,27 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
 dependencies = [
  "proc-macro2",
  "quote",
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 76bebbeaf8..d76bfcb071 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 = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.4.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 
 [[package]]
 name = "builtin-func-features"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -113,27 +113,27 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
 dependencies = [
  "proc-macro2",
  "quote",
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 48cd0bd939..147d33461a 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 = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.4.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 
 [[package]]
 name = "endian-type"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -113,27 +113,27 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
 dependencies = [
  "proc-macro2",
  "quote",
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 7c4cd2db7d..0ba488c7f0 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 = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.4.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 
 [[package]]
 name = "endian-type"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -98,27 +98,27 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
 dependencies = [
  "proc-macro2",
  "quote",
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 899af3402e..5e1f7962e5 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 = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.4.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 
 [[package]]
 name = "child"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -113,27 +113,27 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
 dependencies = [
  "proc-macro2",
  "quote",
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 5bb0b14391..9b4494f52d 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 = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.4.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 
 [[package]]
 name = "endian-type"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -98,9 +98,9 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
 ]
@@ -122,18 +122,18 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.lock
index 45311016f2..10b0b8bb6b 100644
--- a/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.lock
@@ -16,9 +16,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.4.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 
 [[package]]
 name = "endian-type"
@@ -56,7 +56,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -68,7 +68,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -77,7 +77,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,7 +98,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -114,27 +114,27 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
@@ -157,9 +157,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
 dependencies = [
  "proc-macro2",
  "quote",
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 7504443ae8..53f727c8bb 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 = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.4.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 
 [[package]]
 name = "endian-type"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -113,27 +113,27 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock
index 8a2ef8c020..2d19b02273 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 = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.4.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 
 [[package]]
 name = "endian-type"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -113,27 +113,27 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
 dependencies = [
  "proc-macro2",
  "quote",
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 70c4bf7dd1..d68fadc22b 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 = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.4.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 
 [[package]]
 name = "endian-type"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -113,27 +113,27 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
 dependencies = [
  "proc-macro2",
  "quote",
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 c7a59d3589..d0ceea329c 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 = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.4.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 
 [[package]]
 name = "endian-type"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -113,27 +113,27 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.lock
index f6256fab59..1198a98032 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 = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.4.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 
 [[package]]
 name = "endian-type"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -113,27 +113,27 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock
index e32f2d4cc8..82868ca831 100755
--- a/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock
@@ -16,9 +16,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.4.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 
 [[package]]
 name = "endian-type"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -113,27 +113,27 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
 dependencies = [
  "proc-macro2",
  "quote",
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 827e0c2700..675b646869 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 = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.4.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 
 [[package]]
 name = "endian-type"
@@ -55,7 +55,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -113,27 +113,27 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/feature-tests/composability/promises-features/wasm/Cargo.lock b/contracts/feature-tests/composability/promises-features/wasm/Cargo.lock
index 798fb2efc5..aca77da79a 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 = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.4.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 
 [[package]]
 name = "endian-type"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -98,18 +98,18 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
 dependencies = [
  "unicode-ident",
 ]
@@ -131,9 +131,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
 dependencies = [
  "proc-macro2",
  "quote",
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 a7fb1045c9..7a57ca96e9 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 = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.4.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 
 [[package]]
 name = "endian-type"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -98,18 +98,18 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
 dependencies = [
  "unicode-ident",
 ]
@@ -132,9 +132,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
@@ -157,9 +157,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
 dependencies = [
  "proc-macro2",
  "quote",
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 a2c21a5277..a6efc4baf2 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 = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.4.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 
 [[package]]
 name = "endian-type"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -98,18 +98,18 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
 dependencies = [
  "unicode-ident",
 ]
@@ -131,9 +131,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.lock b/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.lock
index 1a9593a100..a90e94b50b 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 = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.4.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 
 [[package]]
 name = "endian-type"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -98,27 +98,27 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
@@ -157,9 +157,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
 dependencies = [
  "proc-macro2",
  "quote",
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 03f068e55d..903256d62d 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 = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.4.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 
 [[package]]
 name = "endian-type"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,14 +82,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -105,27 +105,27 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
@@ -148,9 +148,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
 dependencies = [
  "proc-macro2",
  "quote",
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 e7814de3fe..defff5603f 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 = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.4.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 
 [[package]]
 name = "endian-type"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -98,27 +98,27 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
@@ -141,9 +141,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
 dependencies = [
  "proc-macro2",
  "quote",
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 a6af059da3..8e49a1b12a 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 = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.4.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 
 [[package]]
 name = "endian-type"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -98,27 +98,27 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
@@ -141,9 +141,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/feature-tests/composability/vault/wasm/Cargo.lock b/contracts/feature-tests/composability/vault/wasm/Cargo.lock
index 535771da90..8e92e97d0b 100755
--- a/contracts/feature-tests/composability/vault/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/vault/wasm/Cargo.lock
@@ -16,9 +16,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.4.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 
 [[package]]
 name = "endian-type"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -98,27 +98,27 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
@@ -141,9 +141,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
 dependencies = [
  "proc-macro2",
  "quote",
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 70f19c039e..2448257cd8 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 = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.4.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 
 [[package]]
 name = "crowdfunding-erc20"
@@ -63,7 +63,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -75,7 +75,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -121,27 +121,27 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
@@ -164,9 +164,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
 dependencies = [
  "proc-macro2",
  "quote",
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 61db6090c6..582dc8915a 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 = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.4.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 
 [[package]]
 name = "endian-type"
@@ -63,7 +63,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -75,7 +75,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -121,27 +121,27 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
@@ -164,9 +164,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
 dependencies = [
  "proc-macro2",
  "quote",
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 b5bd1e2e54..a192c28d8c 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 = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.4.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 
 [[package]]
 name = "endian-type"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -113,27 +113,27 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
 dependencies = [
  "proc-macro2",
  "quote",
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 0ed0c6f26c..9daeb0cf09 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 = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.4.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 
 [[package]]
 name = "endian-type"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -113,27 +113,27 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
 dependencies = [
  "proc-macro2",
  "quote",
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 b88c35d4cf..f1cf13367b 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 = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.4.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 
 [[package]]
 name = "endian-type"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -113,27 +113,27 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
 dependencies = [
  "proc-macro2",
  "quote",
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 beda86f834..c4e0d566e7 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 = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.4.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 
 [[package]]
 name = "endian-type"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -113,27 +113,27 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
 dependencies = [
  "proc-macro2",
  "quote",
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 25805516fc..96f07c2c88 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 = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.4.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 
 [[package]]
 name = "endian-type"
@@ -63,7 +63,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -75,7 +75,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -121,27 +121,27 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
@@ -164,9 +164,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
 dependencies = [
  "proc-macro2",
  "quote",
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 bd9b34096b..ae4e178cc2 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 = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.4.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 
 [[package]]
 name = "endian-type"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -113,27 +113,27 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/feature-tests/exchange-features/wasm/Cargo.lock b/contracts/feature-tests/exchange-features/wasm/Cargo.lock
index 69c406fcf8..8075f5308f 100644
--- a/contracts/feature-tests/exchange-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/exchange-features/wasm/Cargo.lock
@@ -16,9 +16,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.4.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 
 [[package]]
 name = "endian-type"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -113,27 +113,27 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/feature-tests/formatted-message-features/wasm/Cargo.lock b/contracts/feature-tests/formatted-message-features/wasm/Cargo.lock
index f1ab6b2c73..309ac697f0 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 = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.4.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 
 [[package]]
 name = "endian-type"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -113,27 +113,27 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/feature-tests/managed-map-features/wasm/Cargo.lock b/contracts/feature-tests/managed-map-features/wasm/Cargo.lock
index 3a15719b4c..8f4f06d835 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 = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.4.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 
 [[package]]
 name = "endian-type"
@@ -55,7 +55,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -113,27 +113,27 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
 dependencies = [
  "proc-macro2",
  "quote",
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 2b979d5734..c14b804e1d 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 = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.4.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 
 [[package]]
 name = "endian-type"
@@ -55,7 +55,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -113,27 +113,27 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
 dependencies = [
  "proc-macro2",
  "quote",
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 31641794f0..ebd96f0db1 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 = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.4.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 
 [[package]]
 name = "endian-type"
@@ -55,7 +55,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -113,27 +113,27 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
 dependencies = [
  "proc-macro2",
  "quote",
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 8393f20a47..31453833e4 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 = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.4.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 
 [[package]]
 name = "endian-type"
@@ -55,7 +55,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -113,27 +113,27 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/feature-tests/multi-contract-features/wasm/Cargo.lock b/contracts/feature-tests/multi-contract-features/wasm/Cargo.lock
index ecb432decb..7e144359de 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 = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.4.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 
 [[package]]
 name = "endian-type"
@@ -55,7 +55,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -113,27 +113,27 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/feature-tests/panic-message-features/wasm/Cargo.lock b/contracts/feature-tests/panic-message-features/wasm/Cargo.lock
index 669be54be6..7bac41daab 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 = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.4.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 
 [[package]]
 name = "endian-type"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -98,9 +98,9 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
 ]
@@ -122,18 +122,18 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/feature-tests/payable-features/wasm/Cargo.lock b/contracts/feature-tests/payable-features/wasm/Cargo.lock
index 95c693e19b..2ed0cebf41 100755
--- a/contracts/feature-tests/payable-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/payable-features/wasm/Cargo.lock
@@ -16,9 +16,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.4.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 
 [[package]]
 name = "endian-type"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -98,9 +98,9 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
 ]
@@ -122,18 +122,18 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
 dependencies = [
  "proc-macro2",
  "quote",
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 8883d18727..af4771b552 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 = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.4.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 
 [[package]]
 name = "endian-type"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -98,27 +98,27 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
 dependencies = [
  "proc-macro2",
  "quote",
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 7e56191556..38d62aa581 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 = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.4.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 
 [[package]]
 name = "endian-type"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -98,27 +98,27 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/feature-tests/scenario-tester/wasm/Cargo.lock b/contracts/feature-tests/scenario-tester/wasm/Cargo.lock
index 5d8bd88449..690945d5c6 100755
--- a/contracts/feature-tests/scenario-tester/wasm/Cargo.lock
+++ b/contracts/feature-tests/scenario-tester/wasm/Cargo.lock
@@ -16,9 +16,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.4.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 
 [[package]]
 name = "endian-type"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -98,27 +98,27 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
 dependencies = [
  "proc-macro2",
  "quote",
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 dbfa03678b..8d520677dd 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 = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.4.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 
 [[package]]
 name = "endian-type"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,14 +82,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -105,27 +105,27 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
@@ -148,9 +148,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/feature-tests/use-module/wasm/Cargo.lock b/contracts/feature-tests/use-module/wasm/Cargo.lock
index 0ae23a9263..ffcc630369 100644
--- a/contracts/feature-tests/use-module/wasm/Cargo.lock
+++ b/contracts/feature-tests/use-module/wasm/Cargo.lock
@@ -16,9 +16,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.4.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 
 [[package]]
 name = "endian-type"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.18.8"
+version = "0.19.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,14 +82,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -105,27 +105,27 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
@@ -148,9 +148,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
 dependencies = [
  "proc-macro2",
  "quote",

From b9c36b1ef2bd3177c525e744c51fe0cd79119bc8 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 9 May 2024 12:47:40 +0300
Subject: [PATCH 0870/1254] fixed new lints

---
 data/codec/tests/derive_struct_with_generic_test.rs         | 1 +
 framework/base/src/types/managed/wrapped/managed_address.rs | 6 ------
 .../src/api/managed_types/static_var_api_node.rs            | 1 +
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/data/codec/tests/derive_struct_with_generic_test.rs b/data/codec/tests/derive_struct_with_generic_test.rs
index 80739b01b1..bde74b0a9d 100644
--- a/data/codec/tests/derive_struct_with_generic_test.rs
+++ b/data/codec/tests/derive_struct_with_generic_test.rs
@@ -9,6 +9,7 @@ use codec::{
 // to test, run the following command in the crate folder:
 // cargo expand --test struct_with_generic_derive_test > expanded.rs
 
+#[allow(dead_code)]
 trait SimpleTrait {
     fn simple_function(&self);
 }
diff --git a/framework/base/src/types/managed/wrapped/managed_address.rs b/framework/base/src/types/managed/wrapped/managed_address.rs
index bb5db20bc6..ca871a718b 100644
--- a/framework/base/src/types/managed/wrapped/managed_address.rs
+++ b/framework/base/src/types/managed/wrapped/managed_address.rs
@@ -6,7 +6,6 @@ use crate::{
     codec::{
         DecodeError, DecodeErrorHandler, EncodeErrorHandler, NestedDecode, NestedDecodeInput,
         NestedEncode, NestedEncodeOutput, TopDecode, TopDecodeInput, TopEncode, TopEncodeOutput,
-        TryStaticCast,
     },
     formatter::{hex_util::encode_bytes_as_hex, FormatByteReceiver, SCLowerHex},
     types::{heap::Address, ManagedBuffer, ManagedByteArray, ManagedType},
@@ -200,11 +199,6 @@ where
     }
 }
 
-#[derive(Clone)]
-pub(crate) struct ManagedBufferSizeContext(pub usize);
-
-impl TryStaticCast for ManagedBufferSizeContext {}
-
 impl<M> NestedEncode for ManagedAddress<M>
 where
     M: ManagedTypeApi,
diff --git a/framework/wasm-adapter/src/api/managed_types/static_var_api_node.rs b/framework/wasm-adapter/src/api/managed_types/static_var_api_node.rs
index 272bbba578..51284fcb34 100644
--- a/framework/wasm-adapter/src/api/managed_types/static_var_api_node.rs
+++ b/framework/wasm-adapter/src/api/managed_types/static_var_api_node.rs
@@ -31,6 +31,7 @@ impl StaticVarApi for VmApiImpl {
 }
 
 impl StaticVarApiImpl for VmApiImpl {
+    #[allow(static_mut_refs)]
     fn with_lockable_static_buffer<R, F: FnOnce(&mut LockableStaticBuffer) -> R>(&self, f: F) -> R {
         unsafe { f(&mut STATIC_BUFFER) }
     }

From 071715234f68173eee8bd33e8fb95abc7d70f9c6 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 9 May 2024 13:19:41 +0300
Subject: [PATCH 0871/1254] Stable Rust: GitHub Actions & toolchain

---
 .github/workflows/actions-nightly.yml        | 24 ++++++++++++++++++++
 .github/workflows/actions.yml                |  2 +-
 .github/workflows/lldb-formatter-tests.yml   |  2 +-
 .github/workflows/release-upload.yml         |  2 +-
 .github/workflows/template-test-current.yml  |  2 +-
 .github/workflows/template-test-released.yml |  2 +-
 rust-toolchain.toml                          |  2 +-
 7 files changed, 30 insertions(+), 6 deletions(-)
 create mode 100644 .github/workflows/actions-nightly.yml

diff --git a/.github/workflows/actions-nightly.yml b/.github/workflows/actions-nightly.yml
new file mode 100644
index 0000000000..4589f2e60b
--- /dev/null
+++ b/.github/workflows/actions-nightly.yml
@@ -0,0 +1,24 @@
+name: CI
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+  workflow_dispatch:
+
+permissions:
+  checks: write
+  pull-requests: write
+
+jobs:
+  contracts:
+    name: Contracts (nightly)
+    uses: multiversx/mx-sc-actions/.github/workflows/contracts.yml@v3.1.0
+    with:
+      rust-toolchain: nightly-2023-12-11
+      path-to-sc-meta: framework/meta
+      mx-scenario-go-version: v2.1.0-alpha
+      coverage-args: --ignore-filename-regex='meta/src' --ignore-filename-regex='wasm-adapter' --ignore-filename-regex='benchmarks/' --ignore-filename-regex='tests/' --output ./coverage.md
+    secrets:
+      token: ${{ secrets.GITHUB_TOKEN }}
\ No newline at end of file
diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
index d9d598ab33..dc0bcc8596 100644
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -16,7 +16,7 @@ jobs:
     name: Contracts
     uses: multiversx/mx-sc-actions/.github/workflows/contracts.yml@v3.1.0
     with:
-      rust-toolchain: nightly-2023-12-11
+      rust-toolchain: stable
       path-to-sc-meta: framework/meta
       mx-scenario-go-version: v2.1.0-alpha
       coverage-args: --ignore-filename-regex='meta/src' --ignore-filename-regex='wasm-adapter' --ignore-filename-regex='benchmarks/' --ignore-filename-regex='tests/' --output ./coverage.md
diff --git a/.github/workflows/lldb-formatter-tests.yml b/.github/workflows/lldb-formatter-tests.yml
index 36f2d29f08..9aaba9eadd 100644
--- a/.github/workflows/lldb-formatter-tests.yml
+++ b/.github/workflows/lldb-formatter-tests.yml
@@ -16,7 +16,7 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           default: true
-          toolchain: nightly-2023-12-11
+          toolchain: stable
 
       - name: Download vscode-lldb
         uses: robinraju/release-downloader@v1.5
diff --git a/.github/workflows/release-upload.yml b/.github/workflows/release-upload.yml
index 6ecb73df9b..1309c97e5f 100644
--- a/.github/workflows/release-upload.yml
+++ b/.github/workflows/release-upload.yml
@@ -20,7 +20,7 @@ jobs:
         uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
           default: true
-          toolchain: nightly-2023-12-11
+          toolchain: stable
           target: wasm32-unknown-unknown
 
       - name: Setup the PATH variable
diff --git a/.github/workflows/template-test-current.yml b/.github/workflows/template-test-current.yml
index 457a91435a..56382850fe 100644
--- a/.github/workflows/template-test-current.yml
+++ b/.github/workflows/template-test-current.yml
@@ -22,7 +22,7 @@ jobs:
         uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
           default: true
-          toolchain: nightly-2023-12-11
+          toolchain: stable
           target: wasm32-unknown-unknown
 
       - name: Install prerequisites
diff --git a/.github/workflows/template-test-released.yml b/.github/workflows/template-test-released.yml
index 8d60860f08..e6227765db 100644
--- a/.github/workflows/template-test-released.yml
+++ b/.github/workflows/template-test-released.yml
@@ -22,7 +22,7 @@ jobs:
         uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
           default: true
-          toolchain: nightly-2023-12-11
+          toolchain: stable
           target: wasm32-unknown-unknown
 
       - name: Install prerequisites
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index 9a2458c117..292fe499e3 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,2 +1,2 @@
 [toolchain]
-channel = "nightly-2023-12-11"
+channel = "stable"

From 294261d203bda9b8366b81047417129cd4361c8b Mon Sep 17 00:00:00 2001
From: Laurentiu Ciobanu <laurentiu.ciobanu@multiversx.com>
Date: Fri, 10 May 2024 20:50:30 +0300
Subject: [PATCH 0872/1254] disable contract size report on nightly actions

---
 .github/workflows/actions-nightly.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/actions-nightly.yml b/.github/workflows/actions-nightly.yml
index 4589f2e60b..7b1199a237 100644
--- a/.github/workflows/actions-nightly.yml
+++ b/.github/workflows/actions-nightly.yml
@@ -14,10 +14,11 @@ permissions:
 jobs:
   contracts:
     name: Contracts (nightly)
-    uses: multiversx/mx-sc-actions/.github/workflows/contracts.yml@v3.1.0
+    uses: multiversx/mx-sc-actions/.github/workflows/contracts.yml@c721fa99bea9d34624fa7ee58729301116518eea
     with:
       rust-toolchain: nightly-2023-12-11
       path-to-sc-meta: framework/meta
+      enable-contracts-size-report: 'false'
       mx-scenario-go-version: v2.1.0-alpha
       coverage-args: --ignore-filename-regex='meta/src' --ignore-filename-regex='wasm-adapter' --ignore-filename-regex='benchmarks/' --ignore-filename-regex='tests/' --output ./coverage.md
     secrets:

From b3ebe61d9b96a1b39fbea706dc3b0e1c84476492 Mon Sep 17 00:00:00 2001
From: Laurentiu Ciobanu <laurentiu.ciobanu@multiversx.com>
Date: Fri, 10 May 2024 20:52:53 +0300
Subject: [PATCH 0873/1254] disable contract size report on nightly actions

---
 .github/workflows/actions-nightly.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/actions-nightly.yml b/.github/workflows/actions-nightly.yml
index 7b1199a237..27122568d3 100644
--- a/.github/workflows/actions-nightly.yml
+++ b/.github/workflows/actions-nightly.yml
@@ -14,7 +14,7 @@ permissions:
 jobs:
   contracts:
     name: Contracts (nightly)
-    uses: multiversx/mx-sc-actions/.github/workflows/contracts.yml@c721fa99bea9d34624fa7ee58729301116518eea
+    uses: multiversx/mx-sc-actions/.github/workflows/contracts.yml@11821017a15f590ba3308f5721e92ec78797c4c8
     with:
       rust-toolchain: nightly-2023-12-11
       path-to-sc-meta: framework/meta

From 8d8abb1e1ac6043a4901fa0932dbd243b4c2c224 Mon Sep 17 00:00:00 2001
From: Laurentiu Ciobanu <laurentiu.ciobanu@multiversx.com>
Date: Fri, 10 May 2024 20:53:55 +0300
Subject: [PATCH 0874/1254] disable contract size report on nightly actions

---
 .github/workflows/actions-nightly.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/actions-nightly.yml b/.github/workflows/actions-nightly.yml
index 27122568d3..1a7b47624d 100644
--- a/.github/workflows/actions-nightly.yml
+++ b/.github/workflows/actions-nightly.yml
@@ -18,7 +18,7 @@ jobs:
     with:
       rust-toolchain: nightly-2023-12-11
       path-to-sc-meta: framework/meta
-      enable-contracts-size-report: 'false'
+      enable-contracts-size-report: false
       mx-scenario-go-version: v2.1.0-alpha
       coverage-args: --ignore-filename-regex='meta/src' --ignore-filename-regex='wasm-adapter' --ignore-filename-regex='benchmarks/' --ignore-filename-regex='tests/' --output ./coverage.md
     secrets:

From 1e6a8e6f41523e4b095132894269692af4673887 Mon Sep 17 00:00:00 2001
From: Laurentiu Ciobanu <laurentiu.ciobanu@multiversx.com>
Date: Fri, 10 May 2024 20:55:47 +0300
Subject: [PATCH 0875/1254] disable contract size report on nightly actions

---
 .github/workflows/actions-nightly.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/actions-nightly.yml b/.github/workflows/actions-nightly.yml
index 1a7b47624d..d4412df7af 100644
--- a/.github/workflows/actions-nightly.yml
+++ b/.github/workflows/actions-nightly.yml
@@ -14,7 +14,7 @@ permissions:
 jobs:
   contracts:
     name: Contracts (nightly)
-    uses: multiversx/mx-sc-actions/.github/workflows/contracts.yml@11821017a15f590ba3308f5721e92ec78797c4c8
+    uses: multiversx/mx-sc-actions/.github/workflows/contracts.yml@a6f57c43a0ae9c6d3bafffa01b5aa46dea0c3d3e
     with:
       rust-toolchain: nightly-2023-12-11
       path-to-sc-meta: framework/meta

From 2fbe6ba6295b03bf30606164bff860536f6bd36b Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Sun, 12 May 2024 22:29:17 +0200
Subject: [PATCH 0876/1254] ReturnsResultUnmanaged for query and call functions

---
 .../contract/generate_snippets/snippet_sc_functions_gen.rs    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/framework/meta/src/cmd/contract/generate_snippets/snippet_sc_functions_gen.rs b/framework/meta/src/cmd/contract/generate_snippets/snippet_sc_functions_gen.rs
index 93c3132adf..09d6aa7660 100644
--- a/framework/meta/src/cmd/contract/generate_snippets/snippet_sc_functions_gen.rs
+++ b/framework/meta/src/cmd/contract/generate_snippets/snippet_sc_functions_gen.rs
@@ -172,7 +172,7 @@ fn write_contract_call(file: &mut File, endpoint_abi: &EndpointAbi, name: &Strin
             .to(self.state.current_address())
             .typed(proxy::{}Proxy)
             .{}({}){}
-            .returns(ReturnsRawResult)
+            .returns(ReturnsResultUnmanaged)
             .prepare_async()
             .run()
             .await;
@@ -195,7 +195,7 @@ fn write_contract_query(file: &mut File, endpoint_abi: &EndpointAbi, name: &Stri
             .to(self.state.current_address())
             .typed(proxy::{}Proxy)
             .{}({})
-            .returns(ReturnsResult)
+            .returns(ReturnsResultUnmanaged)
             .prepare_async()
             .run()
             .await;

From 747afd51ec1cb6bd2b2559ab75e21c78abc58a12 Mon Sep 17 00:00:00 2001
From: Laurentiu Ciobanu <laurentiu.ciobanu@multiversx.com>
Date: Mon, 13 May 2024 11:43:17 +0300
Subject: [PATCH 0877/1254] use stable version of sc-actions

---
 .github/workflows/actions-nightly.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/actions-nightly.yml b/.github/workflows/actions-nightly.yml
index d4412df7af..a94745de41 100644
--- a/.github/workflows/actions-nightly.yml
+++ b/.github/workflows/actions-nightly.yml
@@ -14,7 +14,7 @@ permissions:
 jobs:
   contracts:
     name: Contracts (nightly)
-    uses: multiversx/mx-sc-actions/.github/workflows/contracts.yml@a6f57c43a0ae9c6d3bafffa01b5aa46dea0c3d3e
+    uses: multiversx/mx-sc-actions/.github/workflows/contracts.yml@v3.2.0
     with:
       rust-toolchain: nightly-2023-12-11
       path-to-sc-meta: framework/meta

From 8d0715a6c090e0fd08d6d65274608e674bfb5b2c Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Mon, 13 May 2024 12:36:11 +0300
Subject: [PATCH 0878/1254] implement from conversion for MultiValueN

---
 .../feature-tests/scenario-tester/src/lib.rs  | 11 ++++
 .../src/scenario_tester_proxy.rs              | 28 +++++++++++
 .../scenario-tester/tests/st_blackbox_test.rs | 17 +++++++
 .../scenario-tester/wasm/src/lib.rs           |  6 ++-
 .../base/src/abi/type_abi_impl_codec_multi.rs | 50 +++++++++----------
 5 files changed, 85 insertions(+), 27 deletions(-)

diff --git a/contracts/feature-tests/scenario-tester/src/lib.rs b/contracts/feature-tests/scenario-tester/src/lib.rs
index 015b3e82c2..5b2365a741 100644
--- a/contracts/feature-tests/scenario-tester/src/lib.rs
+++ b/contracts/feature-tests/scenario-tester/src/lib.rs
@@ -27,4 +27,15 @@ pub trait ScenarioTester {
     fn add(&self, value: BigUint) {
         self.sum().update(|sum| *sum += value);
     }
+
+    /// Tests "from" conversion for MultiValueN parameters
+    #[endpoint]
+    fn multi_param(&self, _value: MultiValue2<BigUint, BigUint>) {}
+
+    /// Tests "from" conversion for MultiValueN return function
+    #[endpoint]
+    fn multi_return(&self, value: BigUint) -> MultiValue2<BigUint, BigUint> {
+        let value1 = value.clone().add(1u32);
+        (value, value1).into()
+    }
 }
diff --git a/contracts/feature-tests/scenario-tester/src/scenario_tester_proxy.rs b/contracts/feature-tests/scenario-tester/src/scenario_tester_proxy.rs
index 3de83d499d..66976893c2 100644
--- a/contracts/feature-tests/scenario-tester/src/scenario_tester_proxy.rs
+++ b/contracts/feature-tests/scenario-tester/src/scenario_tester_proxy.rs
@@ -111,4 +111,32 @@ where
             .argument(&value)
             .original_result()
     }
+
+    /// Tests "from" conversion for MultiValueN parameters 
+    pub fn multi_param<
+        Arg0: ProxyArg<MultiValue2<BigUint<Env::Api>, BigUint<Env::Api>>>,
+    >(
+        self,
+        _value: Arg0,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("multi_param")
+            .argument(&_value)
+            .original_result()
+    }
+
+    /// Tests "from" conversion for MultiValueN return function 
+    pub fn multi_return<
+        Arg0: ProxyArg<BigUint<Env::Api>>,
+    >(
+        self,
+        value: Arg0,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, MultiValue2<BigUint<Env::Api>, BigUint<Env::Api>>> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("multi_return")
+            .argument(&value)
+            .original_result()
+    }
 }
diff --git a/contracts/feature-tests/scenario-tester/tests/st_blackbox_test.rs b/contracts/feature-tests/scenario-tester/tests/st_blackbox_test.rs
index 20ff801864..90721fbd0d 100644
--- a/contracts/feature-tests/scenario-tester/tests/st_blackbox_test.rs
+++ b/contracts/feature-tests/scenario-tester/tests/st_blackbox_test.rs
@@ -95,6 +95,23 @@ fn st_blackbox() {
         .add(1u32)
         .run();
 
+    world
+        .tx()
+        .from(OTHER_ADDRESS)
+        .to(ST_ADDRESS)
+        .typed(scenario_tester_proxy::ScenarioTesterProxy)
+        .multi_param(MultiValue2((1u32, 1u16)))
+        .run();
+
+    world
+        .tx()
+        .from(OTHER_ADDRESS)
+        .to(ST_ADDRESS)
+        .typed(scenario_tester_proxy::ScenarioTesterProxy)
+        .multi_return(1u32)
+        .returns(ExpectValue(MultiValue2((1u32, 2u32))))
+        .run();
+
     world.write_scenario_trace("trace1.scen.json");
 }
 
diff --git a/contracts/feature-tests/scenario-tester/wasm/src/lib.rs b/contracts/feature-tests/scenario-tester/wasm/src/lib.rs
index 28922bb61e..7976698233 100644
--- a/contracts/feature-tests/scenario-tester/wasm/src/lib.rs
+++ b/contracts/feature-tests/scenario-tester/wasm/src/lib.rs
@@ -6,9 +6,9 @@
 
 // Init:                                 1
 // Upgrade:                              1
-// Endpoints:                            2
+// Endpoints:                            4
 // Async Callback (empty):               1
-// Total number of exported functions:   5
+// Total number of exported functions:   7
 
 #![no_std]
 
@@ -22,6 +22,8 @@ multiversx_sc_wasm_adapter::endpoints! {
         upgrade => upgrade
         getSum => sum
         add => add
+        multi_param => multi_param
+        multi_return => multi_return
     )
 }
 
diff --git a/framework/base/src/abi/type_abi_impl_codec_multi.rs b/framework/base/src/abi/type_abi_impl_codec_multi.rs
index 4fc42f37a6..fa27b98670 100644
--- a/framework/base/src/abi/type_abi_impl_codec_multi.rs
+++ b/framework/base/src/abi/type_abi_impl_codec_multi.rs
@@ -75,16 +75,16 @@ impl<T: TypeAbi> TypeAbi for OptionalValue<T> {
 }
 
 macro_rules! multi_arg_impls {
-    ($(($mval_struct:ident $($n:tt $name:ident)+) )+) => {
+    ($(($mval_struct:ident $($n:tt $t:ident $u:ident)+) )+) => {
         $(
-            impl<$($name),+ > TypeAbiFrom<Self> for crate::codec::multi_types::$mval_struct<$($name,)+>
+            impl<$($t, $u),+ > TypeAbiFrom<crate::codec::multi_types::$mval_struct<$($u,)+>> for crate::codec::multi_types::$mval_struct<$($t,)+>
             where
-                $($name: TypeAbi,)+
+                $($t: TypeAbiFrom<$u>,)+
             {}
 
-            impl<$($name),+ > TypeAbi for crate::codec::multi_types::$mval_struct<$($name,)+>
+            impl<$($t),+ > TypeAbi for crate::codec::multi_types::$mval_struct<$($t,)+>
             where
-                $($name: TypeAbi,)+
+                $($t: TypeAbi,)+
             {
                 type Unmanaged = Self;
 
@@ -95,7 +95,7 @@ macro_rules! multi_arg_impls {
                         if $n > 0 {
                             repr.push(',');
                         }
-                        repr.push_str($name::type_name().as_str());
+                        repr.push_str($t::type_name().as_str());
                     )+
                     repr.push('>');
                     repr
@@ -108,7 +108,7 @@ macro_rules! multi_arg_impls {
                         if $n > 0 {
                             repr.push_str(", ");
                         }
-                        repr.push_str($name::type_name_rust().as_str());
+                        repr.push_str($t::type_name_rust().as_str());
                     )+
                     repr.push('>');
                     repr
@@ -116,7 +116,7 @@ macro_rules! multi_arg_impls {
 
                 fn provide_type_descriptions<TDC: TypeDescriptionContainer>(accumulator: &mut TDC) {
                     $(
-                        $name::provide_type_descriptions(accumulator);
+                        $t::provide_type_descriptions(accumulator);
                     )+
                 }
 
@@ -128,10 +128,10 @@ macro_rules! multi_arg_impls {
                     let mut result = OutputAbis::new();
                     $(
                         if output_names.len() > $n {
-                            result.append(&mut $name::output_abis(&[output_names[$n]]));
+                            result.append(&mut $t::output_abis(&[output_names[$n]]));
 
                         } else {
-                            result.append(&mut $name::output_abis(&[]));
+                            result.append(&mut $t::output_abis(&[]));
                         }
 
                     )+
@@ -143,19 +143,19 @@ macro_rules! multi_arg_impls {
 }
 
 multi_arg_impls! {
-    (MultiValue2  0 T0 1 T1)
-    (MultiValue3  0 T0 1 T1 2 T2)
-    (MultiValue4  0 T0 1 T1 2 T2 3 T3)
-    (MultiValue5  0 T0 1 T1 2 T2 3 T3 4 T4)
-    (MultiValue6  0 T0 1 T1 2 T2 3 T3 4 T4 5 T5)
-    (MultiValue7  0 T0 1 T1 2 T2 3 T3 4 T4 5 T5 6 T6)
-    (MultiValue8  0 T0 1 T1 2 T2 3 T3 4 T4 5 T5 6 T6 7 T7)
-    (MultiValue9  0 T0 1 T1 2 T2 3 T3 4 T4 5 T5 6 T6 7 T7 8 T8)
-    (MultiValue10 0 T0 1 T1 2 T2 3 T3 4 T4 5 T5 6 T6 7 T7 8 T8 9 T9)
-    (MultiValue11 0 T0 1 T1 2 T2 3 T3 4 T4 5 T5 6 T6 7 T7 8 T8 9 T9 10 T10)
-    (MultiValue12 0 T0 1 T1 2 T2 3 T3 4 T4 5 T5 6 T6 7 T7 8 T8 9 T9 10 T10 11 T11)
-    (MultiValue13 0 T0 1 T1 2 T2 3 T3 4 T4 5 T5 6 T6 7 T7 8 T8 9 T9 10 T10 11 T11 12 T12)
-    (MultiValue14 0 T0 1 T1 2 T2 3 T3 4 T4 5 T5 6 T6 7 T7 8 T8 9 T9 10 T10 11 T11 12 T12 13 T13)
-    (MultiValue15 0 T0 1 T1 2 T2 3 T3 4 T4 5 T5 6 T6 7 T7 8 T8 9 T9 10 T10 11 T11 12 T12 13 T13 14 T14)
-    (MultiValue16 0 T0 1 T1 2 T2 3 T3 4 T4 5 T5 6 T6 7 T7 8 T8 9 T9 10 T10 11 T11 12 T12 13 T13 14 T14 15 T15)
+    (MultiValue2 0 T0 U0 1 T1 U1)
+    (MultiValue3 0 T0 U0 1 T1 U1 2 T2 U2)
+    (MultiValue4 0 T0 U0 1 T1 U1 2 T2 U2 3 T3 U3)
+    (MultiValue5 0 T0 U0 1 T1 U1 2 T2 U2 3 T3 U3 4 T4 U4)
+    (MultiValue6 0 T0 U0 1 T1 U1 2 T2 U2 3 T3 U3 4 T4 U4 5 T5 U5)
+    (MultiValue7 0 T0 U0 1 T1 U1 2 T2 U2 3 T3 U3 4 T4 U4 5 T5 U5 6 T6 U6)
+    (MultiValue8 0 T0 U0 1 T1 U1 2 T2 U2 3 T3 U3 4 T4 U4 5 T5 U5 6 T6 U6 7 T7 U7)
+    (MultiValue9 0 T0 U0 1 T1 U1 2 T2 U2 3 T3 U3 4 T4 U4 5 T5 U5 6 T6 U6 7 T7 U7 8 T8 U8)
+    (MultiValue10 0 T0 U0 1 T1 U1 2 T2 U2 3 T3 U3 4 T4 U4 5 T5 U5 6 T6 U6 7 T7 U7 8 T8 U8 9 T9 U9)
+    (MultiValue11 0 T0 U0 1 T1 U1 2 T2 U2 3 T3 U3 4 T4 U4 5 T5 U5 6 T6 U6 7 T7 U7 8 T8 U8 9 T9 U9 10 T10 U10)
+    (MultiValue12 0 T0 U0 1 T1 U1 2 T2 U2 3 T3 U3 4 T4 U4 5 T5 U5 6 T6 U6 7 T7 U7 8 T8 U8 9 T9 U9 10 T10 U10 11 T11 U11)
+    (MultiValue13 0 T0 U0 1 T1 U1 2 T2 U2 3 T3 U3 4 T4 U4 5 T5 U5 6 T6 U6 7 T7 U7 8 T8 U8 9 T9 U9 10 T10 U10 11 T11 U11 12 T12 U12)
+    (MultiValue14 0 T0 U0 1 T1 U1 2 T2 U2 3 T3 U3 4 T4 U4 5 T5 U5 6 T6 U6 7 T7 U7 8 T8 U8 9 T9 U9 10 T10 U10 11 T11 U11 12 T12 U12 13 T13 U13)
+    (MultiValue15 0 T0 U0 1 T1 U1 2 T2 U2 3 T3 U3 4 T4 U4 5 T5 U5 6 T6 U6 7 T7 U7 8 T8 U8 9 T9 U9 10 T10 U10 11 T11 U11 12 T12 U12 13 T13 U13 14 T14 U14)
+    (MultiValue16 0 T0 U0 1 T1 U1 2 T2 U2 3 T3 U3 4 T4 U4 5 T5 U5 6 T6 U6 7 T7 U7 8 T8 U8 9 T9 U9 10 T10 U10 11 T11 U11 12 T12 U12 13 T13 U13 14 T14 U14 15 T15 U15)
 }

From 8bbca64fa081d773512a987d2d83d8b10b9a9473 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Mon, 13 May 2024 13:56:09 +0300
Subject: [PATCH 0879/1254] clippy fix - unknown_lints

---
 framework/wasm-adapter/src/lib.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/framework/wasm-adapter/src/lib.rs b/framework/wasm-adapter/src/lib.rs
index 4fb63ea0f0..9bd84315c5 100644
--- a/framework/wasm-adapter/src/lib.rs
+++ b/framework/wasm-adapter/src/lib.rs
@@ -1,4 +1,5 @@
 #![no_std]
+#![allow(unknown_lints)]
 
 // Allows us to use alloc::vec::Vec;
 // TODO: get rid of the legacy API and also of this.

From 6da405b581f3a6e14b3bf80461c7752d33429658 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Mon, 13 May 2024 14:42:27 +0300
Subject: [PATCH 0880/1254] clipply fix

---
 framework/base/src/abi.rs                                 | 2 +-
 .../src/storage/mappers/ordered_binary_tree_mapper.rs     | 2 +-
 .../cmd/contract/sc_config/contract_variant_settings.rs   | 4 ++--
 framework/scenario/src/api/local_api_vh/print_api_vh.rs   | 2 +-
 framework/scenario/src/facade/expr/bech32_address.rs      | 2 +-
 .../scenario/src/facade/world_tx/scenario_set_state.rs    | 6 ++++--
 framework/scenario/src/whitebox_legacy/tx_mandos.rs       | 4 ++--
 .../wasm-adapter/src/wasm_alloc/leaking_allocator.rs      | 1 +
 framework/wasm-adapter/src/wasm_alloc/static_allocator.rs | 1 +
 sdk/core/src/crypto/private_key.rs                        | 8 +++++---
 sdk/core/src/crypto/public_key.rs                         | 8 +++++---
 sdk/core/src/data/address.rs                              | 8 ++++----
 .../src/value_interpreter/reconstructor.rs                | 2 +-
 .../mxpy-snippet-generator/src/mxpy_snippet_generator.rs  | 2 +-
 .../general/claim_developer_rewards_mock.rs               | 2 +-
 vm/src/tx_mock/tx_async_call_data.rs                      | 4 +++-
 vm/src/tx_mock/tx_cache_source.rs                         | 2 +-
 vm/src/world_mock/esdt_instances.rs                       | 4 ++--
 18 files changed, 37 insertions(+), 27 deletions(-)

diff --git a/framework/base/src/abi.rs b/framework/base/src/abi.rs
index 993518acb2..c031a62166 100644
--- a/framework/base/src/abi.rs
+++ b/framework/base/src/abi.rs
@@ -25,7 +25,7 @@ pub use type_description_container::*;
 
 pub type TypeName = alloc::string::String;
 
-#[derive(Clone, Debug, PartialEq, Eq)]
+#[derive(Clone, Default, Debug, PartialEq, Eq)]
 pub struct TypeNames {
     pub abi: alloc::string::String,
     pub rust: alloc::string::String,
diff --git a/framework/base/src/storage/mappers/ordered_binary_tree_mapper.rs b/framework/base/src/storage/mappers/ordered_binary_tree_mapper.rs
index fbc3de782f..064e90551c 100644
--- a/framework/base/src/storage/mappers/ordered_binary_tree_mapper.rs
+++ b/framework/base/src/storage/mappers/ordered_binary_tree_mapper.rs
@@ -239,7 +239,7 @@ where
         let mut opt_new_node_parent = None;
         let mut opt_current_node = self.get_root();
         while opt_current_node.is_some() {
-            opt_new_node_parent = opt_current_node.clone();
+            opt_new_node_parent.clone_from(&opt_current_node);
 
             let current_node = unsafe { opt_current_node.unwrap_unchecked() };
             if new_node.data == current_node.data {
diff --git a/framework/meta/src/cmd/contract/sc_config/contract_variant_settings.rs b/framework/meta/src/cmd/contract/sc_config/contract_variant_settings.rs
index a6a40a4142..b0af57deef 100644
--- a/framework/meta/src/cmd/contract/sc_config/contract_variant_settings.rs
+++ b/framework/meta/src/cmd/contract/sc_config/contract_variant_settings.rs
@@ -81,7 +81,7 @@ impl ContractVariantProfile {
                 result.codegen_units = codegen_units;
             }
             if let Some(opt_level) = &serde_profile.opt_level {
-                result.opt_level = opt_level.clone();
+                result.opt_level.clone_from(opt_level);
             }
             if let Some(lto) = serde_profile.lto {
                 result.lto = lto;
@@ -90,7 +90,7 @@ impl ContractVariantProfile {
                 result.debug = debug;
             }
             if let Some(panic) = &serde_profile.panic {
-                result.panic = panic.clone();
+                result.panic.clone_from(panic);
             }
             if let Some(overflow_checks) = serde_profile.overflow_checks {
                 result.overflow_checks = overflow_checks;
diff --git a/framework/scenario/src/api/local_api_vh/print_api_vh.rs b/framework/scenario/src/api/local_api_vh/print_api_vh.rs
index 58cdb7fd16..6d3f9b3dbe 100644
--- a/framework/scenario/src/api/local_api_vh/print_api_vh.rs
+++ b/framework/scenario/src/api/local_api_vh/print_api_vh.rs
@@ -8,7 +8,7 @@ use multiversx_sc::{
 use crate::api::{VMHooksApi, VMHooksApiBackend};
 
 thread_local!(
-    static PRINTED_MESSAGES: RefCell<Vec<String>> = RefCell::new(Vec::new())
+    static PRINTED_MESSAGES: RefCell<Vec<String>> = const { RefCell::new(Vec::new()) }
 );
 
 impl<VHB: VMHooksApiBackend> VMHooksApi<VHB> {
diff --git a/framework/scenario/src/facade/expr/bech32_address.rs b/framework/scenario/src/facade/expr/bech32_address.rs
index d07cf207e0..c404d17e27 100644
--- a/framework/scenario/src/facade/expr/bech32_address.rs
+++ b/framework/scenario/src/facade/expr/bech32_address.rs
@@ -198,7 +198,7 @@ impl<'de> Deserialize<'de> for Bech32Address {
         // some old interactors have it serialized like this
         let mut bech32 = String::deserialize(deserializer)?;
         if let Some(stripped) = bech32.strip_prefix("bech32:") {
-            bech32 = stripped.to_owned();
+            bech32 = stripped.to_string();
         }
         Ok(Bech32Address::from_bech32_string(bech32))
     }
diff --git a/framework/scenario/src/facade/world_tx/scenario_set_state.rs b/framework/scenario/src/facade/world_tx/scenario_set_state.rs
index aa9a4ccd9b..d036d647cd 100644
--- a/framework/scenario/src/facade/world_tx/scenario_set_state.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_set_state.rs
@@ -74,7 +74,7 @@ impl ScenarioWorld {
         let accounts = &mut self.get_mut_state().accounts;
         for (vm_address_key, account) in accounts.iter_mut() {
             if vm_address_key == &address_value.to_vm_address() {
-                account.egld_balance = balance_value.value.clone();
+                account.egld_balance.clone_from(&balance_value.value);
             }
         }
     }
@@ -158,7 +158,9 @@ impl ScenarioWorld {
         let accounts = &mut self.get_mut_state().accounts;
         for (vm_address, account) in accounts.iter_mut() {
             if vm_address == &AddressKey::from(address).to_vm_address() {
-                account.developer_rewards = BigUintValue::from(developer_rewards).value.clone();
+                account
+                    .developer_rewards
+                    .clone_from(&BigUintValue::from(developer_rewards).value);
             }
         }
     }
diff --git a/framework/scenario/src/whitebox_legacy/tx_mandos.rs b/framework/scenario/src/whitebox_legacy/tx_mandos.rs
index 6d7babb5ba..505591bc68 100644
--- a/framework/scenario/src/whitebox_legacy/tx_mandos.rs
+++ b/framework/scenario/src/whitebox_legacy/tx_mandos.rs
@@ -31,7 +31,7 @@ impl ScCallMandos {
     }
 
     pub fn add_egld_value(&mut self, egld_value: &num_bigint::BigUint) {
-        self.egld_value = egld_value.clone();
+        self.egld_value.clone_from(egld_value);
     }
 
     pub fn add_esdt_transfer(
@@ -101,6 +101,6 @@ impl TxExpectMandos {
     }
 
     pub fn set_message(&mut self, msg: &str) {
-        self.message = msg.to_owned();
+        self.message = msg.to_string();
     }
 }
diff --git a/framework/wasm-adapter/src/wasm_alloc/leaking_allocator.rs b/framework/wasm-adapter/src/wasm_alloc/leaking_allocator.rs
index 59bfa218ab..8a40b0ac68 100644
--- a/framework/wasm-adapter/src/wasm_alloc/leaking_allocator.rs
+++ b/framework/wasm-adapter/src/wasm_alloc/leaking_allocator.rs
@@ -19,6 +19,7 @@ pub struct LeakingAllocator {
 unsafe impl Sync for LeakingAllocator {}
 
 impl LeakingAllocator {
+    #[allow(clippy::new_without_default)]
     pub const fn new() -> Self {
         LeakingAllocator {
             used: UnsafeCell::new(0),
diff --git a/framework/wasm-adapter/src/wasm_alloc/static_allocator.rs b/framework/wasm-adapter/src/wasm_alloc/static_allocator.rs
index 0b0ae4d87e..00b7088d61 100644
--- a/framework/wasm-adapter/src/wasm_alloc/static_allocator.rs
+++ b/framework/wasm-adapter/src/wasm_alloc/static_allocator.rs
@@ -25,6 +25,7 @@ pub struct StaticAllocator<const SIZE: usize> {
 }
 
 impl<const SIZE: usize> StaticAllocator<SIZE> {
+    #[allow(clippy::new_without_default)]
     pub const fn new() -> Self {
         StaticAllocator {
             arena: UnsafeCell::new([0; SIZE]),
diff --git a/sdk/core/src/crypto/private_key.rs b/sdk/core/src/crypto/private_key.rs
index 16870e7230..58ef821974 100644
--- a/sdk/core/src/crypto/private_key.rs
+++ b/sdk/core/src/crypto/private_key.rs
@@ -1,3 +1,5 @@
+use std::fmt::Display;
+
 use super::edwards25519::{sc_mul_add, sc_reduce};
 use crate::crypto::edwards25519::extended_group_element::ExtendedGroupElement;
 use anyhow::{anyhow, Result};
@@ -126,9 +128,9 @@ impl PrivateKey {
     }
 }
 
-impl ToString for PrivateKey {
-    fn to_string(&self) -> String {
-        hex::encode(&self.0[..32])
+impl Display for PrivateKey {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        hex::encode(&self.0[..32]).fmt(f)
     }
 }
 
diff --git a/sdk/core/src/crypto/public_key.rs b/sdk/core/src/crypto/public_key.rs
index 3013123dbd..89b5211262 100644
--- a/sdk/core/src/crypto/public_key.rs
+++ b/sdk/core/src/crypto/public_key.rs
@@ -1,3 +1,5 @@
+use std::fmt::Display;
+
 use super::private_key::PrivateKey;
 use anyhow::Result;
 use bech32::{self, ToBase32, Variant};
@@ -44,9 +46,9 @@ impl<'a> From<&'a PrivateKey> for PublicKey {
     }
 }
 
-impl ToString for PublicKey {
-    fn to_string(&self) -> String {
-        hex::encode(self.0)
+impl Display for PublicKey {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        hex::encode(self.0).fmt(f)
     }
 }
 
diff --git a/sdk/core/src/data/address.rs b/sdk/core/src/data/address.rs
index 8c4af1fb37..f8ac4212c3 100644
--- a/sdk/core/src/data/address.rs
+++ b/sdk/core/src/data/address.rs
@@ -1,4 +1,4 @@
-use std::fmt::Debug;
+use std::fmt::{Debug, Display};
 
 use crate::crypto::public_key::PublicKey;
 use anyhow::Result;
@@ -51,9 +51,9 @@ impl<'a> From<&'a PublicKey> for Address {
     }
 }
 
-impl ToString for Address {
-    fn to_string(&self) -> String {
-        self.to_bech32_string().unwrap()
+impl Display for Address {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.write_str(self.to_bech32_string().unwrap().as_str())
     }
 }
 
diff --git a/sdk/scenario-format/src/value_interpreter/reconstructor.rs b/sdk/scenario-format/src/value_interpreter/reconstructor.rs
index 8ff0b47bf8..6efacefba4 100644
--- a/sdk/scenario-format/src/value_interpreter/reconstructor.rs
+++ b/sdk/scenario-format/src/value_interpreter/reconstructor.rs
@@ -133,7 +133,7 @@ fn address_pretty(value: &[u8]) -> String {
         format!("address:{}", address_str.trim_end_matches('_').to_owned())
     } else {
         let mut address_str = String::from_utf8_lossy(&value[..SC_ADDRESS_LENGTH - 1]).to_string();
-        address_str = address_str.trim_end_matches('_').to_owned();
+        address_str = address_str.trim_end_matches('_').to_string();
         let shard_id = value[SC_ADDRESS_LENGTH - 1];
         let address_expr = format!("address:{address_str}#{shard_id:02x}");
         if !can_interpret_as_string(&[value[SC_ADDRESS_LENGTH - 1]]) {
diff --git a/tools/mxpy-snippet-generator/src/mxpy_snippet_generator.rs b/tools/mxpy-snippet-generator/src/mxpy_snippet_generator.rs
index 02521cbfad..4a4f397b98 100644
--- a/tools/mxpy-snippet-generator/src/mxpy_snippet_generator.rs
+++ b/tools/mxpy-snippet-generator/src/mxpy_snippet_generator.rs
@@ -133,7 +133,7 @@ impl MxpySnippetGenerator {
     }
 
     pub fn set_egld_value(&mut self, egld_value: &num_bigint::BigUint) {
-        self.egld_value = egld_value.clone();
+        self.egld_value.clone_from(egld_value);
     }
 
     pub fn add_esdt_transfer(
diff --git a/vm/src/tx_execution/builtin_function_mocks/general/claim_developer_rewards_mock.rs b/vm/src/tx_execution/builtin_function_mocks/general/claim_developer_rewards_mock.rs
index 82bda4fa7d..0b7e9c694f 100644
--- a/vm/src/tx_execution/builtin_function_mocks/general/claim_developer_rewards_mock.rs
+++ b/vm/src/tx_execution/builtin_function_mocks/general/claim_developer_rewards_mock.rs
@@ -37,7 +37,7 @@ impl BuiltinFunction for ClaimDeveloperRewards {
 
         tx_cache.with_account_mut(&tx_input.to, |account| {
             if account.contract_owner == Some(tx_input.from.clone()) {
-                developer_rewards = account.developer_rewards.clone();
+                developer_rewards.clone_from(&account.developer_rewards);
                 account.developer_rewards = BigUint::zero();
                 caller_is_owner = true;
             }
diff --git a/vm/src/tx_mock/tx_async_call_data.rs b/vm/src/tx_mock/tx_async_call_data.rs
index f30cd9a3c2..45cbce639c 100644
--- a/vm/src/tx_mock/tx_async_call_data.rs
+++ b/vm/src/tx_mock/tx_async_call_data.rs
@@ -93,7 +93,9 @@ fn extract_callback_payments(
             if !token_transfers.is_empty() {
                 callback_payments.esdt_values = token_transfers.transfers;
             } else {
-                callback_payments.egld_value = async_call.call_value.clone();
+                callback_payments
+                    .egld_value
+                    .clone_from(&async_call.call_value);
             }
             break;
         }
diff --git a/vm/src/tx_mock/tx_cache_source.rs b/vm/src/tx_mock/tx_cache_source.rs
index aee7ff96c5..55540137a9 100644
--- a/vm/src/tx_mock/tx_cache_source.rs
+++ b/vm/src/tx_mock/tx_cache_source.rs
@@ -23,7 +23,7 @@ impl TxCacheSource for TxCache {
 
 impl TxCacheSource for BlockchainState {
     fn load_account(&self, address: &VMAddress) -> Option<AccountData> {
-        self.accounts.get(address).map(AccountData::clone)
+        self.accounts.get(address).cloned()
     }
 
     fn blockchain_ref(&self) -> &BlockchainState {
diff --git a/vm/src/world_mock/esdt_instances.rs b/vm/src/world_mock/esdt_instances.rs
index 7fd574fac5..74c2432281 100644
--- a/vm/src/world_mock/esdt_instances.rs
+++ b/vm/src/world_mock/esdt_instances.rs
@@ -57,9 +57,9 @@ impl EsdtInstances {
             .0
             .entry(nonce)
             .and_modify(|instance| {
-                instance.balance = value.clone();
+                instance.balance.clone_from(value);
                 instance.nonce = nonce;
-                instance.metadata = metadata.clone();
+                instance.metadata.clone_from(&metadata);
             })
             .or_insert_with(|| EsdtInstance {
                 nonce,

From 93f53adeb0626a6a5c1235103be6ae60e4f1aa4e Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Mon, 13 May 2024 14:42:38 +0300
Subject: [PATCH 0881/1254] rustfmt.toml fix

---
 rustfmt.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rustfmt.toml b/rustfmt.toml
index 8484a95cce..29b99b9ba4 100644
--- a/rustfmt.toml
+++ b/rustfmt.toml
@@ -12,7 +12,7 @@
 # This should actually automatically be shipped with cargo fmt or rustfmt itself!
 # ----------------------------------------------------------------------------------
 
-imports_granularity="Crate"
+# imports_granularity="Crate"
 
 # Use verbose output.
 # Default: false

From 1b6ab0d2ca5420b6f07de5db5b55884e0684ac0e Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Mon, 13 May 2024 16:04:31 +0300
Subject: [PATCH 0882/1254] cargo update

---
 Cargo.lock | 161 +++++++++++++++++++----------------------------------
 1 file changed, 58 insertions(+), 103 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 8dba3c1854..17d5b64293 100755
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -100,47 +100,48 @@ dependencies = [
 
 [[package]]
 name = "anstream"
-version = "0.6.13"
+version = "0.6.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb"
+checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b"
 dependencies = [
  "anstyle",
  "anstyle-parse",
  "anstyle-query",
  "anstyle-wincon",
  "colorchoice",
+ "is_terminal_polyfill",
  "utf8parse",
 ]
 
 [[package]]
 name = "anstyle"
-version = "1.0.6"
+version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc"
+checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b"
 
 [[package]]
 name = "anstyle-parse"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c"
+checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4"
 dependencies = [
  "utf8parse",
 ]
 
 [[package]]
 name = "anstyle-query"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648"
+checksum = "a64c907d4e79225ac72e2a354c9ce84d50ebb4586dee56c82b3ee73004f537f5"
 dependencies = [
  "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "anstyle-wincon"
-version = "3.0.2"
+version = "3.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7"
+checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19"
 dependencies = [
  "anstyle",
  "windows-sys 0.52.0",
@@ -148,9 +149,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.82"
+version = "1.0.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519"
+checksum = "25bdb32cbbdce2b519a9cd7df3a678443100e265d5e25ca763b7572a5104f5f3"
 
 [[package]]
 name = "arbitrary"
@@ -169,9 +170,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "backtrace"
@@ -190,9 +191,9 @@ dependencies = [
 
 [[package]]
 name = "base64"
-version = "0.22.0"
+version = "0.22.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51"
+checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
 
 [[package]]
 name = "basic-features"
@@ -377,9 +378,9 @@ checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9"
 
 [[package]]
 name = "cc"
-version = "1.0.96"
+version = "1.0.97"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "065a29261d53ba54260972629f9ca6bffa69bac13cd1fed61420f7fa68b9f8bd"
+checksum = "099a5357d84c4c61eb35fc8eafa9a79a902c2f76911e5747ced4e032edd8d9b4"
 
 [[package]]
 name = "cfg-if"
@@ -464,9 +465,9 @@ checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce"
 
 [[package]]
 name = "colorchoice"
-version = "1.0.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
+checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422"
 
 [[package]]
 name = "colored"
@@ -902,9 +903,9 @@ dependencies = [
 
 [[package]]
 name = "errno"
-version = "0.3.8"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245"
+checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
 dependencies = [
  "libc",
  "windows-sys 0.52.0",
@@ -1266,9 +1267,9 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.2.14"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c"
+checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -1515,6 +1516,12 @@ version = "2.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3"
 
+[[package]]
+name = "is_terminal_polyfill"
+version = "1.70.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800"
+
 [[package]]
 name = "itertools"
 version = "0.12.1"
@@ -1889,7 +1896,7 @@ name = "multiversx-price-aggregator-sc"
 version = "0.50.0"
 dependencies = [
  "arrayvec",
- "getrandom 0.2.14",
+ "getrandom 0.2.15",
  "multiversx-sc",
  "multiversx-sc-modules",
  "multiversx-sc-scenario",
@@ -2197,27 +2204,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "num_enum"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845"
-dependencies = [
- "num_enum_derive",
-]
-
-[[package]]
-name = "num_enum_derive"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b"
-dependencies = [
- "proc-macro-crate",
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "object"
 version = "0.32.2"
@@ -2470,15 +2456,6 @@ version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
 
-[[package]]
-name = "proc-macro-crate"
-version = "3.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284"
-dependencies = [
- "toml_edit 0.21.1",
-]
-
 [[package]]
 name = "proc-macro2"
 version = "1.0.82"
@@ -2648,7 +2625,7 @@ version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
 dependencies = [
- "getrandom 0.2.14",
+ "getrandom 0.2.15",
 ]
 
 [[package]]
@@ -2846,9 +2823,9 @@ dependencies = [
 
 [[package]]
 name = "rustc-demangle"
-version = "0.1.23"
+version = "0.1.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
+checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
 
 [[package]]
 name = "rustc_version"
@@ -2890,9 +2867,9 @@ checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d"
 
 [[package]]
 name = "ryu"
-version = "1.0.17"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1"
+checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
 
 [[package]]
 name = "same-file"
@@ -2953,11 +2930,11 @@ dependencies = [
 
 [[package]]
 name = "security-framework"
-version = "2.10.0"
+version = "2.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "770452e37cad93e0a50d5abc3990d2bc351c36d0328f86cefec2f2fb206eaef6"
+checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.5.0",
  "core-foundation",
  "core-foundation-sys",
  "libc",
@@ -2966,9 +2943,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework-sys"
-version = "2.10.0"
+version = "2.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41f3cc463c0ef97e11c3461a9d3787412d30e8e7eb907c79180c4a57bf7c04ef"
+checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -2993,9 +2970,9 @@ dependencies = [
 
 [[package]]
 name = "semver"
-version = "1.0.22"
+version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca"
+checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
 
 [[package]]
 name = "send-tx-repeat"
@@ -3015,18 +2992,18 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.199"
+version = "1.0.201"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c9f6e76df036c77cd94996771fb40db98187f096dd0b9af39c6c6e452ba966a"
+checksum = "780f1cebed1629e4753a1a38a3c72d30b97ec044f0aef68cb26650a3c5cf363c"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.199"
+version = "1.0.201"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11bd257a6541e141e42ca6d24ae26f7714887b47e89aa739099104c7e4d3b7fc"
+checksum = "c5e405930b9796f1c00bee880d03fc7e0bb4b9a11afc776885ffe84320da2865"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3035,9 +3012,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.116"
+version = "1.0.117"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813"
+checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3"
 dependencies = [
  "indexmap",
  "itoa",
@@ -3356,16 +3333,15 @@ dependencies = [
 
 [[package]]
 name = "tokio-util"
-version = "0.7.10"
+version = "0.7.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15"
+checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1"
 dependencies = [
  "bytes",
  "futures-core",
  "futures-sink",
  "pin-project-lite",
  "tokio",
- "tracing",
 ]
 
 [[package]]
@@ -3378,7 +3354,7 @@ dependencies = [
  "serde",
  "serde_spanned",
  "toml_datetime",
- "toml_edit 0.22.12",
+ "toml_edit",
 ]
 
 [[package]]
@@ -3390,17 +3366,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "toml_edit"
-version = "0.21.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1"
-dependencies = [
- "indexmap",
- "toml_datetime",
- "winnow 0.5.40",
-]
-
 [[package]]
 name = "toml_edit"
 version = "0.22.12"
@@ -3411,7 +3376,7 @@ dependencies = [
  "serde",
  "serde_spanned",
  "toml_datetime",
- "winnow 0.6.7",
+ "winnow",
 ]
 
 [[package]]
@@ -3885,18 +3850,9 @@ checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0"
 
 [[package]]
 name = "winnow"
-version = "0.5.40"
+version = "0.6.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "winnow"
-version = "0.6.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14b9415ee827af173ebb3f15f9083df5a122eb93572ec28741fb153356ea2578"
+checksum = "c3c52e9c97a68071b23e836c9380edae937f17b9c4667bd021973efc689f618d"
 dependencies = [
  "memchr",
 ]
@@ -3953,9 +3909,9 @@ dependencies = [
 
 [[package]]
 name = "zip"
-version = "1.2.1"
+version = "1.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "006d078b7b6fc587bb25e022ad39e7086f44e5c4fef6076964ea601533241beb"
+checksum = "c700ea425e148de30c29c580c1f9508b93ca57ad31c9f4e96b83c194c37a7a8f"
 dependencies = [
  "arbitrary",
  "crc32fast",
@@ -3963,6 +3919,5 @@ dependencies = [
  "displaydoc",
  "flate2",
  "indexmap",
- "num_enum",
  "thiserror",
 ]

From c8b5323849635b1480ace5e969e46399e0694064 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Mon, 13 May 2024 17:07:48 +0300
Subject: [PATCH 0883/1254] typo in type_name_rust

---
 framework/base/src/types/interaction/managed_arg_buffer.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/framework/base/src/types/interaction/managed_arg_buffer.rs b/framework/base/src/types/interaction/managed_arg_buffer.rs
index a2159bbd11..c6dae76afd 100644
--- a/framework/base/src/types/interaction/managed_arg_buffer.rs
+++ b/framework/base/src/types/interaction/managed_arg_buffer.rs
@@ -319,6 +319,6 @@ where
     }
 
     fn type_name_rust() -> TypeName {
-        "ManagedArgBufer<$API>".into()
+        "ManagedArgBuffer<$API>".into()
     }
 }

From 17553e09b2717736876212c19656c3fba35363ed Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Mon, 13 May 2024 16:53:49 +0200
Subject: [PATCH 0884/1254] composability interact migration

---
 Cargo.lock                                    |   5 +-
 .../forwarder-queue/sc-config.toml            |   3 +
 .../forwarder-queue/src/forwarder_queue.rs    |   6 +-
 .../composability/interact/Cargo.toml         |  13 +-
 .../src/call_tree_calling_functions.rs        | 133 ++++-----
 .../interact/src/call_tree_deploy.rs          | 113 +++-----
 .../interact/src/comp_interact_config.rs      |   3 +-
 .../interact/src/comp_interact_main.rs        |   6 +-
 .../interact/src/comp_interact_state.rs       |  23 --
 .../interact/src/forwarder_queue_proxy.rs     | 251 ++++++++++++++++
 .../composability/interact/src/vault_proxy.rs | 273 ++++++++++++++++++
 .../composability/vault/sc-config.toml        |   3 +
 12 files changed, 638 insertions(+), 194 deletions(-)
 create mode 100644 contracts/feature-tests/composability/interact/src/forwarder_queue_proxy.rs
 create mode 100644 contracts/feature-tests/composability/interact/src/vault_proxy.rs

diff --git a/Cargo.lock b/Cargo.lock
index 8dba3c1854..365e768c75 100755
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1500,13 +1500,10 @@ name = "interact"
 version = "0.0.0"
 dependencies = [
  "clap",
- "forwarder-queue",
- "multiversx-sc-modules",
+ "multiversx-sc",
  "multiversx-sc-snippets",
- "promises-features",
  "serde",
  "toml",
- "vault",
 ]
 
 [[package]]
diff --git a/contracts/feature-tests/composability/forwarder-queue/sc-config.toml b/contracts/feature-tests/composability/forwarder-queue/sc-config.toml
index 7ace04ba7c..161c5f7ce3 100644
--- a/contracts/feature-tests/composability/forwarder-queue/sc-config.toml
+++ b/contracts/feature-tests/composability/forwarder-queue/sc-config.toml
@@ -8,3 +8,6 @@ name = "forwarder-queue"
 name = "forwarder-queue-promises"
 add-labels = ["promises-callback"]
 ei = "1.3"
+
+[[proxy]]
+path = "../interact/src/forwarder_queue_proxy.rs"
diff --git a/contracts/feature-tests/composability/forwarder-queue/src/forwarder_queue.rs b/contracts/feature-tests/composability/forwarder-queue/src/forwarder_queue.rs
index 376fc61d76..1d97b48fc3 100644
--- a/contracts/feature-tests/composability/forwarder-queue/src/forwarder_queue.rs
+++ b/contracts/feature-tests/composability/forwarder-queue/src/forwarder_queue.rs
@@ -4,7 +4,8 @@
 multiversx_sc::imports!();
 multiversx_sc::derive_imports!();
 
-#[derive(TopEncode, TopDecode, NestedEncode, NestedDecode, TypeAbi, Clone)]
+#[type_abi]
+#[derive(TopEncode, TopDecode, NestedEncode, NestedDecode, Clone)]
 pub enum QueuedCallType {
     Sync,
     LegacyAsync,
@@ -12,7 +13,8 @@ pub enum QueuedCallType {
     Promise,
 }
 
-#[derive(TopEncode, TopDecode, NestedEncode, NestedDecode, TypeAbi, Clone)]
+#[type_abi]
+#[derive(TopEncode, TopDecode, NestedEncode, NestedDecode, Clone)]
 pub struct QueuedCall<M: ManagedTypeApi> {
     pub call_type: QueuedCallType,
     pub to: ManagedAddress<M>,
diff --git a/contracts/feature-tests/composability/interact/Cargo.toml b/contracts/feature-tests/composability/interact/Cargo.toml
index 0b0fc143e0..e49fdf4e56 100644
--- a/contracts/feature-tests/composability/interact/Cargo.toml
+++ b/contracts/feature-tests/composability/interact/Cargo.toml
@@ -14,18 +14,9 @@ clap = { version = "4.4.7", features = ["derive"] }
 serde = { version = "1.0", features = ["derive"] }
 toml = "0.8.6"
 
-[dependencies.vault]
-path = "../vault"
-
-[dependencies.forwarder-queue]
-path = "../forwarder-queue"
-
-[dependencies.promises-features]
-path = "../promises-features"
-
-[dependencies.multiversx-sc-modules]
+[dependencies.multiversx-sc]
 version = "0.50.0"
-path = "../../../../contracts/modules"
+path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-snippets]
 version = "0.50.0"
diff --git a/contracts/feature-tests/composability/interact/src/call_tree_calling_functions.rs b/contracts/feature-tests/composability/interact/src/call_tree_calling_functions.rs
index 9305aca3be..969e2e0827 100644
--- a/contracts/feature-tests/composability/interact/src/call_tree_calling_functions.rs
+++ b/contracts/feature-tests/composability/interact/src/call_tree_calling_functions.rs
@@ -1,15 +1,12 @@
 use std::{cell::RefCell, rc::Rc};
 
-use forwarder_queue::QueuedCallType;
-
 use multiversx_sc_snippets::imports::*;
 use num_bigint::BigUint;
 
 use crate::{
     call_tree::{CallNode, CallState, ForwarderQueueTarget},
-    comp_interact_controller::ComposabilityInteract,
+    comp_interact_controller::ComposabilityInteract, forwarder_queue_proxy::{self, QueuedCallType},
 };
-use forwarder_queue::ProxyTrait;
 
 const FORWARD_QUEUED_CALLS_ENDPOINT: &str = "forward_queued_calls";
 const DEFAULT_GAS_LIMIT: u64 = 10_000_000;
@@ -24,7 +21,7 @@ impl ComposabilityInteract {
         payment_nonce: u64,
         payment_amount: BigUint,
     ) {
-        let mut steps = Vec::new();
+        let mut buffer = self.interactor.homogenous_call_buffer();
 
         for fwd_rc in forwarders {
             let (fwd_name, fwd_children) = {
@@ -35,8 +32,6 @@ impl ComposabilityInteract {
                 let fwd = fwd_rc.borrow();
                 fwd.address.clone().unwrap()
             };
-            let fwd_addr_bech32 = bech32::encode(&fwd_addr);
-            let fwd_addr_expr = format!("bech32:{fwd_addr_bech32}");
 
             for child in &fwd_children {
                 match child {
@@ -48,29 +43,26 @@ impl ComposabilityInteract {
                             child_fwd.address.clone().unwrap()
                         };
 
-                        let typed_sc_call = ScCallStep::new()
-                            .call(
-                                self.state
-                                    .forwarder_queue_from_addr(&fwd_addr_expr)
-                                    .add_queued_call(
-                                        call_type.clone(),
-                                        child_fwd_addr,
-                                        DEFAULT_GAS_LIMIT,
-                                        FORWARD_QUEUED_CALLS_ENDPOINT,
-                                        MultiValueEncoded::<StaticApi, _>::new(),
-                                    )
-                                    .with_egld_or_single_esdt_transfer(
-                                        EgldOrEsdtTokenPayment::new(
-                                            payment_token.clone(),
-                                            payment_nonce,
-                                            payment_amount.clone().into(),
-                                        ),
-                                    ),
-                            )
-                            .from(&self.wallet_address)
-                            .gas_limit("70,000,000");
-
-                        steps.push(typed_sc_call);
+                        buffer.push_tx(|tx| {
+                            tx.from(&self.wallet_address)
+                                .to(&fwd_addr)
+                                .gas(70_000_000u64)
+                                .typed(forwarder_queue_proxy::ForwarderQueueProxy)
+                                .add_queued_call(
+                                    call_type.clone(),
+                                    child_fwd_addr,
+                                    DEFAULT_GAS_LIMIT,
+                                    FORWARD_QUEUED_CALLS_ENDPOINT,
+                                    MultiValueEncoded::<StaticApi, _>::new(),
+                                )
+                                .payment(EgldOrEsdtTokenPayment::new(
+                                    payment_token.clone(),
+                                    payment_nonce,
+                                    payment_amount.clone().into(),
+                                ))
+                                .returns(ReturnsStatus)
+                                .returns(ReturnsResult)
+                        });
                     },
                     CallNode::Vault(vault_rc) => {
                         // Call Vault
@@ -80,46 +72,41 @@ impl ComposabilityInteract {
                             vault.address.clone().unwrap()
                         };
 
-                        let typed_sc_call = ScCallStep::new()
-                            .call(
-                                self.state
-                                    .forwarder_queue_from_addr(&fwd_addr_expr)
-                                    .add_queued_call(
-                                        call_type.clone(),
-                                        vault_addr,
-                                        DEFAULT_GAS_LIMIT,
-                                        endpoint_name,
-                                        MultiValueEncoded::<StaticApi, _>::new(),
-                                    )
-                                    .with_egld_or_single_esdt_transfer(
-                                        EgldOrEsdtTokenPayment::new(
-                                            payment_token.clone(),
-                                            payment_nonce,
-                                            payment_amount.clone().into(),
-                                        ),
-                                    ),
-                            )
-                            .from(&self.wallet_address)
-                            .gas_limit("70,000,000");
-
-                        steps.push(typed_sc_call);
+                        buffer.push_tx(|tx| {
+                            tx.from(&self.wallet_address)
+                                .to(&fwd_addr)
+                                .gas(70_000_000u64)
+                                .typed(forwarder_queue_proxy::ForwarderQueueProxy)
+                                .add_queued_call(
+                                    call_type.clone(),
+                                    vault_addr,
+                                    DEFAULT_GAS_LIMIT,
+                                    endpoint_name,
+                                    MultiValueEncoded::<StaticApi, _>::new(),
+                                )
+                                .payment(EgldOrEsdtTokenPayment::new(
+                                    payment_token.clone(),
+                                    payment_nonce,
+                                    payment_amount.clone().into(),
+                                ))
+                                .returns(ReturnsStatus)
+                                .returns(ReturnsResult)
+                        });
                     },
                 }
             }
         }
-        self.interactor
-            .multi_sc_exec(StepBuffer::from_sc_call_vec(&mut steps))
-            .await;
 
-        for step in steps.iter() {
-            if !step.response().is_success() {
-                println!(
-                    "perform 'add_queued_call' failed with: {}",
-                    step.response().tx_error
-                );
+        let results = buffer.run().await;
+
+        for (index, (status, result)) in results.iter().enumerate() {
+            if !status == 0u64 {
+                println!("perform 'add_queued_call' failed with error code {status}");
                 continue;
             }
-            println!("successfully performed action 'add_queued_call'");
+            println!(
+                "successfully performed action {index} 'add_queued_call' with result {result:?}"
+            );
         }
     }
 
@@ -128,21 +115,15 @@ impl ComposabilityInteract {
             let root_addr_ref = call_state.root.borrow();
             root_addr_ref.address.clone().unwrap()
         };
-        let root_addr_bech32 = bech32::encode(&root_addr);
-        let root_addr_expr = format!("bech32:{root_addr_bech32}");
 
         self.interactor
-            .sc_call(
-                ScCallStep::new()
-                    .call(
-                        self.state
-                            .forwarder_queue_from_addr(&root_addr_expr)
-                            .forward_queued_calls(),
-                    )
-                    .from(&self.wallet_address)
-                    .gas_limit("70,000,000")
-                    .expect(TxExpect::ok().additional_error_message("calling root failed with: ")),
-            )
+            .tx()
+            .from(&self.wallet_address)
+            .to(&root_addr)
+            .typed(forwarder_queue_proxy::ForwarderQueueProxy)
+            .forward_queued_calls()
+            .prepare_async()
+            .run()
             .await;
 
         println!("successfully called root");
diff --git a/contracts/feature-tests/composability/interact/src/call_tree_deploy.rs b/contracts/feature-tests/composability/interact/src/call_tree_deploy.rs
index 46e5c4804d..09d859008c 100644
--- a/contracts/feature-tests/composability/interact/src/call_tree_deploy.rs
+++ b/contracts/feature-tests/composability/interact/src/call_tree_deploy.rs
@@ -1,100 +1,65 @@
-use crate::{call_tree::CallState, comp_interact_controller::ComposabilityInteract};
-
-use forwarder_queue::ProxyTrait as _;
-use vault::ProxyTrait as _;
+use crate::{
+    call_tree::CallState, comp_interact_controller::ComposabilityInteract, forwarder_queue_proxy, vault_proxy
+};
 
 use multiversx_sc_snippets::imports::*;
 
 impl ComposabilityInteract {
     pub async fn deploy_call_tree_contracts(&mut self, call_state: &CallState) {
-        let mut typed_vault_deploys = self.typed_sc_deploy_vault(call_state).await;
-        let mut typed_forwarder_deploys = self.typed_sc_deploy_forwarder_queue(call_state).await;
-
-        let mut steps = Vec::new();
-        for typed_sc_deploy in &mut typed_vault_deploys {
-            steps.push(typed_sc_deploy.as_mut());
-        }
-        for typed_sc_deploy in &mut typed_forwarder_deploys {
-            steps.push(typed_sc_deploy.as_mut());
-        }
-
-        self.interactor
-            .multi_sc_exec(StepBuffer::from_sc_deploy_vec(&mut steps))
-            .await;
+        let vault_deploy_addresses = self.typed_sc_deploy_vault(call_state).await;
+        let forwarder_deploy_addresses = self.typed_sc_deploy_forwarder_queue(call_state).await;
 
         let mut vault_iter = call_state.vaults.iter();
-        for step in typed_vault_deploys.iter() {
-            if let Some(new_address) = step.response().new_deployed_address.clone() {
-                let new_address_bech32 = bech32::encode(&new_address);
-                let rc_vault = vault_iter.next().unwrap();
-                let mut vault = rc_vault.borrow_mut();
-                println!(
-                    "New vault {0} deployed address: {1}",
-                    vault.name, new_address_bech32
-                );
+        for address in vault_deploy_addresses.iter() {
+            let rc_vault = vault_iter.next().unwrap();
+            let mut vault = rc_vault.borrow_mut();
+            println!("New vault {0} deployed address: {1}", vault.name, address);
 
-                vault.address = Some(new_address);
-            } else {
-                println!("deploy failed");
-                return;
-            }
+            vault.address = Some(address.to_address());
         }
 
         let mut fwd_iter = call_state.forwarders.iter();
-        for step in typed_forwarder_deploys.iter() {
-            if let Some(new_address) = step.response().new_deployed_address.clone() {
-                let new_address_bech32 = bech32::encode(&new_address);
-                let rc_fwd = fwd_iter.next().unwrap();
-                let mut fwd = rc_fwd.borrow_mut();
-                println!(
-                    "New forwarder {0} deployed address: {1}",
-                    fwd.name, new_address_bech32
-                );
+        for address in forwarder_deploy_addresses.iter() {
+            let rc_fwd = fwd_iter.next().unwrap();
+            let mut fwd = rc_fwd.borrow_mut();
+            println!("New forwarder {0} deployed address: {1}", fwd.name, address);
 
-                fwd.address = Some(new_address);
-            } else {
-                println!("deploy failed");
-                return;
-            }
+            fwd.address = Some(address.to_address());
         }
     }
 
-    pub async fn typed_sc_deploy_vault(
-        &mut self,
-        call_state: &CallState,
-    ) -> Vec<TypedScDeploy<OptionalValue<ManagedBuffer<StaticApi>>>> {
-        let mut typed_vault_deploys = Vec::new();
+    pub async fn typed_sc_deploy_vault(&mut self, call_state: &CallState) -> Vec<Bech32Address> {
+        let mut buffer = self.interactor.homogenous_call_buffer();
         for _ in call_state.vaults.iter() {
-            let typed_sc_deploy = ScDeployStep::new()
-                .call(
-                    self.state
-                        .default_vault_address()
-                        .init(OptionalValue::<BoxedBytes>::None),
-                )
-                .from(&self.wallet_address)
-                .code(&self.vault_code)
-                .gas_limit("70,000,000");
-
-            typed_vault_deploys.push(typed_sc_deploy);
+            buffer.push_tx(|tx| {
+                tx.from(&self.wallet_address)
+                    .typed(vault_proxy::VaultProxy)
+                    .init(OptionalValue::<BoxedBytes>::None)
+                    .code(&self.vault_code)
+                    .gas(NumExpr("70,000,000"))
+                    .returns(ReturnsNewBech32Address)
+            });
         }
-        typed_vault_deploys
+
+        buffer.run().await
     }
 
     pub async fn typed_sc_deploy_forwarder_queue(
         &mut self,
         call_state: &CallState,
-    ) -> Vec<TypedScDeploy<()>> {
-        let mut typed_forwarder_deploys = Vec::new();
-
+    ) -> Vec<Bech32Address> {
+        let mut buffer = self.interactor.homogenous_call_buffer();
         for _ in call_state.forwarders.iter() {
-            let typed_sc_deploy = ScDeployStep::new()
-                .call(self.state.default_forwarder_queue_address().init())
-                .from(&self.wallet_address)
-                .code(&self.forw_queue_code)
-                .gas_limit("70,000,000");
-
-            typed_forwarder_deploys.push(typed_sc_deploy);
+            buffer.push_tx(|tx| {
+                tx.from(&self.wallet_address)
+                    .typed(forwarder_queue_proxy::ForwarderQueueProxy)
+                    .init()
+                    .code(&self.forw_queue_code)
+                    .gas(NumExpr("70,000,000"))
+                    .returns(ReturnsNewBech32Address)
+            });
         }
-        typed_forwarder_deploys
+
+        buffer.run().await
     }
 }
diff --git a/contracts/feature-tests/composability/interact/src/comp_interact_config.rs b/contracts/feature-tests/composability/interact/src/comp_interact_config.rs
index cbe6d6498f..d09c2323f7 100644
--- a/contracts/feature-tests/composability/interact/src/comp_interact_config.rs
+++ b/contracts/feature-tests/composability/interact/src/comp_interact_config.rs
@@ -1,9 +1,10 @@
-use forwarder_queue::QueuedCallType;
 use multiversx_sc_snippets::imports::*;
 use num_bigint::BigUint;
 use serde::Deserialize;
 use std::{fmt::Debug, io::Read, str::FromStr};
 
+use crate::forwarder_queue_proxy::QueuedCallType;
+
 /// Config file
 const CONFIG_FILE: &str = "config.toml";
 
diff --git a/contracts/feature-tests/composability/interact/src/comp_interact_main.rs b/contracts/feature-tests/composability/interact/src/comp_interact_main.rs
index 9f4a6d6872..9f5fb1f296 100644
--- a/contracts/feature-tests/composability/interact/src/comp_interact_main.rs
+++ b/contracts/feature-tests/composability/interact/src/comp_interact_main.rs
@@ -1,5 +1,4 @@
 #![allow(clippy::too_many_arguments)]
-#![allow(deprecated)] // TODO: switch to unified syntax
 
 mod call_tree;
 mod call_tree_calling_functions;
@@ -9,10 +8,11 @@ mod comp_interact_config;
 mod comp_interact_controller;
 mod comp_interact_state;
 
-use clap::Parser;
+mod vault_proxy;
+mod forwarder_queue_proxy;
 
+use clap::Parser;
 use comp_interact_controller::ComposabilityInteract;
-
 use multiversx_sc_snippets::imports::*;
 
 #[tokio::main]
diff --git a/contracts/feature-tests/composability/interact/src/comp_interact_state.rs b/contracts/feature-tests/composability/interact/src/comp_interact_state.rs
index f9f676636c..fc2b7be1ad 100644
--- a/contracts/feature-tests/composability/interact/src/comp_interact_state.rs
+++ b/contracts/feature-tests/composability/interact/src/comp_interact_state.rs
@@ -1,20 +1,12 @@
-use crate::{ContractInfo, StaticApi};
 use serde::{Deserialize, Serialize};
 use std::{
     io::{Read, Write},
     path::Path,
 };
 
-/// Default contract address
-const DEFAULT_CONTRACT_ADDRESS: &str =
-    "0x0000000000000000000000000000000000000000000000000000000000000000";
-
 /// State file
 const STATE_FILE: &str = "state.toml";
 
-pub type VaultContract = ContractInfo<vault::Proxy<StaticApi>>;
-pub type ForwarderQueueContract = ContractInfo<forwarder_queue::Proxy<StaticApi>>;
-
 /// Composability Interact state
 #[derive(Debug, Default, Serialize, Deserialize)]
 pub struct State {
@@ -35,21 +27,6 @@ impl State {
             Self::default()
         }
     }
-
-    /// Returns the forwarder-queue contract
-    pub fn forwarder_queue_from_addr(&self, address: &str) -> ForwarderQueueContract {
-        ForwarderQueueContract::new(address)
-    }
-
-    /// Returns the vault contract with default address
-    pub fn default_vault_address(&self) -> VaultContract {
-        VaultContract::new(DEFAULT_CONTRACT_ADDRESS)
-    }
-
-    /// Returns the forwarder-queue contract with default address
-    pub fn default_forwarder_queue_address(&self) -> ForwarderQueueContract {
-        ForwarderQueueContract::new(DEFAULT_CONTRACT_ADDRESS)
-    }
 }
 
 impl Drop for State {
diff --git a/contracts/feature-tests/composability/interact/src/forwarder_queue_proxy.rs b/contracts/feature-tests/composability/interact/src/forwarder_queue_proxy.rs
new file mode 100644
index 0000000000..da3775365f
--- /dev/null
+++ b/contracts/feature-tests/composability/interact/src/forwarder_queue_proxy.rs
@@ -0,0 +1,251 @@
+// Code generated by the multiversx-sc proxy generator. DO NOT EDIT.
+
+////////////////////////////////////////////////////
+////////////////// AUTO-GENERATED //////////////////
+////////////////////////////////////////////////////
+
+#![allow(dead_code)]
+#![allow(clippy::all)]
+
+use multiversx_sc::proxy_imports::*;
+
+pub struct ForwarderQueueProxy;
+
+impl<Env, From, To, Gas> TxProxyTrait<Env, From, To, Gas> for ForwarderQueueProxy
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    type TxProxyMethods = ForwarderQueueProxyMethods<Env, From, To, Gas>;
+
+    fn proxy_methods(self, tx: Tx<Env, From, To, (), Gas, (), ()>) -> Self::TxProxyMethods {
+        ForwarderQueueProxyMethods { wrapped_tx: tx }
+    }
+}
+
+pub struct ForwarderQueueProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    wrapped_tx: Tx<Env, From, To, (), Gas, (), ()>,
+}
+
+#[rustfmt::skip]
+impl<Env, From, Gas> ForwarderQueueProxyMethods<Env, From, (), Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn init(
+        self,
+    ) -> TxTypedDeploy<Env, From, NotPayable, Gas, ()> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_deploy()
+            .original_result()
+    }
+}
+
+#[rustfmt::skip]
+impl<Env, From, To, Gas> ForwarderQueueProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn queued_calls(
+        self,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, MultiValueEncoded<Env::Api, QueuedCall<Env::Api>>> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("queued_calls")
+            .original_result()
+    }
+
+    pub fn add_queued_call_sync<
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg1: ProxyArg<ManagedBuffer<Env::Api>>,
+        Arg2: ProxyArg<MultiValueEncoded<Env::Api, ManagedBuffer<Env::Api>>>,
+    >(
+        self,
+        to: Arg0,
+        endpoint_name: Arg1,
+        args: Arg2,
+    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
+        self.wrapped_tx
+            .raw_call("add_queued_call_sync")
+            .argument(&to)
+            .argument(&endpoint_name)
+            .argument(&args)
+            .original_result()
+    }
+
+    pub fn add_queued_call_legacy_async<
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg1: ProxyArg<ManagedBuffer<Env::Api>>,
+        Arg2: ProxyArg<MultiValueEncoded<Env::Api, ManagedBuffer<Env::Api>>>,
+    >(
+        self,
+        to: Arg0,
+        endpoint_name: Arg1,
+        args: Arg2,
+    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
+        self.wrapped_tx
+            .raw_call("add_queued_call_legacy_async")
+            .argument(&to)
+            .argument(&endpoint_name)
+            .argument(&args)
+            .original_result()
+    }
+
+    pub fn add_queued_call_transfer_execute<
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg1: ProxyArg<u64>,
+        Arg2: ProxyArg<ManagedBuffer<Env::Api>>,
+        Arg3: ProxyArg<MultiValueEncoded<Env::Api, ManagedBuffer<Env::Api>>>,
+    >(
+        self,
+        to: Arg0,
+        gas_limit: Arg1,
+        endpoint_name: Arg2,
+        args: Arg3,
+    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
+        self.wrapped_tx
+            .raw_call("add_queued_call_transfer_execute")
+            .argument(&to)
+            .argument(&gas_limit)
+            .argument(&endpoint_name)
+            .argument(&args)
+            .original_result()
+    }
+
+    pub fn add_queued_call_transfer_esdt<
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg1: ProxyArg<u64>,
+        Arg2: ProxyArg<ManagedBuffer<Env::Api>>,
+        Arg3: ProxyArg<TokenIdentifier<Env::Api>>,
+        Arg4: ProxyArg<BigUint<Env::Api>>,
+        Arg5: ProxyArg<MultiValueEncoded<Env::Api, ManagedBuffer<Env::Api>>>,
+    >(
+        self,
+        to: Arg0,
+        gas_limit: Arg1,
+        endpoint_name: Arg2,
+        token: Arg3,
+        amount: Arg4,
+        args: Arg5,
+    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
+        self.wrapped_tx
+            .raw_call("add_queued_call_transfer_esdt")
+            .argument(&to)
+            .argument(&gas_limit)
+            .argument(&endpoint_name)
+            .argument(&token)
+            .argument(&amount)
+            .argument(&args)
+            .original_result()
+    }
+
+    pub fn add_queued_call_promise<
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg1: ProxyArg<u64>,
+        Arg2: ProxyArg<ManagedBuffer<Env::Api>>,
+        Arg3: ProxyArg<MultiValueEncoded<Env::Api, ManagedBuffer<Env::Api>>>,
+    >(
+        self,
+        to: Arg0,
+        gas_limit: Arg1,
+        endpoint_name: Arg2,
+        args: Arg3,
+    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
+        self.wrapped_tx
+            .raw_call("add_queued_call_promise")
+            .argument(&to)
+            .argument(&gas_limit)
+            .argument(&endpoint_name)
+            .argument(&args)
+            .original_result()
+    }
+
+    pub fn add_queued_call<
+        Arg0: ProxyArg<QueuedCallType>,
+        Arg1: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg2: ProxyArg<u64>,
+        Arg3: ProxyArg<ManagedBuffer<Env::Api>>,
+        Arg4: ProxyArg<MultiValueEncoded<Env::Api, ManagedBuffer<Env::Api>>>,
+    >(
+        self,
+        call_type: Arg0,
+        to: Arg1,
+        gas_limit: Arg2,
+        endpoint_name: Arg3,
+        args: Arg4,
+    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
+        self.wrapped_tx
+            .raw_call("add_queued_call")
+            .argument(&call_type)
+            .argument(&to)
+            .argument(&gas_limit)
+            .argument(&endpoint_name)
+            .argument(&args)
+            .original_result()
+    }
+
+    pub fn forward_queued_calls(
+        self,
+    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
+        self.wrapped_tx
+            .raw_call("forward_queued_calls")
+            .original_result()
+    }
+
+    pub fn callback_count(
+        self,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, usize> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("callback_count")
+            .original_result()
+    }
+
+    pub fn callback_payments(
+        self,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ManagedBuffer<Env::Api>> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("callback_payments")
+            .original_result()
+    }
+}
+
+#[type_abi]
+#[derive(TopEncode, TopDecode, NestedEncode, NestedDecode, Clone)]
+pub struct QueuedCall<Api>
+where
+    Api: ManagedTypeApi,
+{
+    pub call_type: QueuedCallType,
+    pub to: ManagedAddress<Api>,
+    pub gas_limit: u64,
+    pub endpoint_name: ManagedBuffer<Api>,
+    pub args: ManagedArgBuffer<Api>,
+    pub payments: EgldOrMultiEsdtPayment<Api>,
+}
+
+#[type_abi]
+#[derive(TopEncode, TopDecode, NestedEncode, NestedDecode, Clone)]
+pub enum QueuedCallType {
+    Sync,
+    LegacyAsync,
+    TransferExecute,
+    Promise,
+}
diff --git a/contracts/feature-tests/composability/interact/src/vault_proxy.rs b/contracts/feature-tests/composability/interact/src/vault_proxy.rs
new file mode 100644
index 0000000000..24e6f12e69
--- /dev/null
+++ b/contracts/feature-tests/composability/interact/src/vault_proxy.rs
@@ -0,0 +1,273 @@
+// Code generated by the multiversx-sc proxy generator. DO NOT EDIT.
+
+////////////////////////////////////////////////////
+////////////////// AUTO-GENERATED //////////////////
+////////////////////////////////////////////////////
+
+#![allow(dead_code)]
+#![allow(clippy::all)]
+
+use multiversx_sc::proxy_imports::*;
+
+pub struct VaultProxy;
+
+impl<Env, From, To, Gas> TxProxyTrait<Env, From, To, Gas> for VaultProxy
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    type TxProxyMethods = VaultProxyMethods<Env, From, To, Gas>;
+
+    fn proxy_methods(self, tx: Tx<Env, From, To, (), Gas, (), ()>) -> Self::TxProxyMethods {
+        VaultProxyMethods { wrapped_tx: tx }
+    }
+}
+
+pub struct VaultProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    wrapped_tx: Tx<Env, From, To, (), Gas, (), ()>,
+}
+
+#[rustfmt::skip]
+impl<Env, From, Gas> VaultProxyMethods<Env, From, (), Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn init<
+        Arg0: ProxyArg<OptionalValue<ManagedBuffer<Env::Api>>>,
+    >(
+        self,
+        opt_arg_to_echo: Arg0,
+    ) -> TxTypedDeploy<Env, From, NotPayable, Gas, OptionalValue<ManagedBuffer<Env::Api>>> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_deploy()
+            .argument(&opt_arg_to_echo)
+            .original_result()
+    }
+}
+
+#[rustfmt::skip]
+impl<Env, From, To, Gas> VaultProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn upgrade<
+        Arg0: ProxyArg<OptionalValue<ManagedBuffer<Env::Api>>>,
+    >(
+        self,
+        opt_arg_to_echo: Arg0,
+    ) -> TxTypedUpgrade<Env, From, To, NotPayable, Gas, MultiValue2<&'static str, OptionalValue<ManagedBuffer<Env::Api>>>> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_upgrade()
+            .argument(&opt_arg_to_echo)
+            .original_result()
+    }
+}
+
+#[rustfmt::skip]
+impl<Env, From, To, Gas> VaultProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn echo_arguments<
+        Arg0: ProxyArg<MultiValueEncoded<Env::Api, ManagedBuffer<Env::Api>>>,
+    >(
+        self,
+        args: Arg0,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, MultiValueEncoded<Env::Api, ManagedBuffer<Env::Api>>> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("echo_arguments")
+            .argument(&args)
+            .original_result()
+    }
+
+    pub fn echo_arguments_without_storage<
+        Arg0: ProxyArg<MultiValueEncoded<Env::Api, ManagedBuffer<Env::Api>>>,
+    >(
+        self,
+        args: Arg0,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, MultiValueEncoded<Env::Api, ManagedBuffer<Env::Api>>> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("echo_arguments_without_storage")
+            .argument(&args)
+            .original_result()
+    }
+
+    pub fn echo_caller(
+        self,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ManagedAddress<Env::Api>> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("echo_caller")
+            .original_result()
+    }
+
+    pub fn accept_funds(
+        self,
+    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
+        self.wrapped_tx
+            .raw_call("accept_funds")
+            .original_result()
+    }
+
+    pub fn accept_funds_echo_payment(
+        self,
+    ) -> TxTypedCall<Env, From, To, (), Gas, MultiValue2<BigUint<Env::Api>, MultiValueEncoded<Env::Api, EsdtTokenPaymentMultiValue<Env::Api>>>> {
+        self.wrapped_tx
+            .raw_call("accept_funds_echo_payment")
+            .original_result()
+    }
+
+    pub fn accept_funds_single_esdt_transfer(
+        self,
+    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
+        self.wrapped_tx
+            .raw_call("accept_funds_single_esdt_transfer")
+            .original_result()
+    }
+
+    pub fn reject_funds(
+        self,
+    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
+        self.wrapped_tx
+            .raw_call("reject_funds")
+            .original_result()
+    }
+
+    pub fn retrieve_funds_with_transfer_exec<
+        Arg0: ProxyArg<TokenIdentifier<Env::Api>>,
+        Arg1: ProxyArg<BigUint<Env::Api>>,
+        Arg2: ProxyArg<OptionalValue<ManagedBuffer<Env::Api>>>,
+    >(
+        self,
+        token: Arg0,
+        amount: Arg1,
+        opt_receive_func: Arg2,
+    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
+        self.wrapped_tx
+            .raw_call("retrieve_funds_with_transfer_exec")
+            .argument(&token)
+            .argument(&amount)
+            .argument(&opt_receive_func)
+            .original_result()
+    }
+
+    pub fn retrieve_funds_promises<
+        Arg0: ProxyArg<OptionalValue<u64>>,
+        Arg1: ProxyArg<OptionalValue<BigUint<Env::Api>>>,
+    >(
+        self,
+        back_transfers: Arg0,
+        back_transfer_value: Arg1,
+    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
+        self.wrapped_tx
+            .raw_call("retrieve_funds_promises")
+            .argument(&back_transfers)
+            .argument(&back_transfer_value)
+            .original_result()
+    }
+
+    pub fn retrieve_funds<
+        Arg0: ProxyArg<EgldOrEsdtTokenIdentifier<Env::Api>>,
+        Arg1: ProxyArg<u64>,
+        Arg2: ProxyArg<BigUint<Env::Api>>,
+    >(
+        self,
+        token: Arg0,
+        nonce: Arg1,
+        amount: Arg2,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("retrieve_funds")
+            .argument(&token)
+            .argument(&nonce)
+            .argument(&amount)
+            .original_result()
+    }
+
+    pub fn retrieve_multi_funds_async<
+        Arg0: ProxyArg<MultiValueEncoded<Env::Api, MultiValue3<TokenIdentifier<Env::Api>, u64, BigUint<Env::Api>>>>,
+    >(
+        self,
+        token_payments: Arg0,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("retrieve_multi_funds_async")
+            .argument(&token_payments)
+            .original_result()
+    }
+
+    pub fn burn_and_create_retrieve_async(
+        self,
+    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
+        self.wrapped_tx
+            .raw_call("burn_and_create_retrieve_async")
+            .original_result()
+    }
+
+    pub fn get_owner_address(
+        self,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ManagedAddress<Env::Api>> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("get_owner_address")
+            .original_result()
+    }
+
+    /// We already leave a trace of the calls using the event logs; 
+    /// this additional counter has the role of showing that storage also gets saved correctly. 
+    pub fn call_counts<
+        Arg0: ProxyArg<ManagedBuffer<Env::Api>>,
+    >(
+        self,
+        endpoint: Arg0,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, usize> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("call_counts")
+            .argument(&endpoint)
+            .original_result()
+    }
+
+    pub fn num_called_retrieve_funds_promises(
+        self,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, usize> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("num_called_retrieve_funds_promises")
+            .original_result()
+    }
+
+    pub fn num_async_calls_sent_from_child(
+        self,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, usize> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("num_async_calls_sent_from_child")
+            .original_result()
+    }
+}
diff --git a/contracts/feature-tests/composability/vault/sc-config.toml b/contracts/feature-tests/composability/vault/sc-config.toml
index 130812eff2..5a76bc3096 100644
--- a/contracts/feature-tests/composability/vault/sc-config.toml
+++ b/contracts/feature-tests/composability/vault/sc-config.toml
@@ -24,3 +24,6 @@ path = "../promises-features/src/vault_proxy.rs"
 
 [[proxy]]
 path = "../recursive-caller/src/vault_proxy.rs"
+
+[[proxy]]
+path = "../interact/src/vault_proxy.rs"

From c1299d0f7ab1d1892ae96a3fcf0748660d3bbb67 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Mon, 13 May 2024 20:27:13 +0300
Subject: [PATCH 0885/1254] add changes from review - unmanaged type

---
 contracts/feature-tests/scenario-tester/src/lib.rs  |  4 ++--
 .../scenario-tester/tests/st_blackbox_test.rs       | 13 +++++++++++++
 framework/base/src/abi/type_abi_impl_codec_multi.rs |  6 +++---
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/contracts/feature-tests/scenario-tester/src/lib.rs b/contracts/feature-tests/scenario-tester/src/lib.rs
index 5b2365a741..97c352adeb 100644
--- a/contracts/feature-tests/scenario-tester/src/lib.rs
+++ b/contracts/feature-tests/scenario-tester/src/lib.rs
@@ -35,7 +35,7 @@ pub trait ScenarioTester {
     /// Tests "from" conversion for MultiValueN return function
     #[endpoint]
     fn multi_return(&self, value: BigUint) -> MultiValue2<BigUint, BigUint> {
-        let value1 = value.clone().add(1u32);
-        (value, value1).into()
+        let value_plus_one = &value + 1u32;
+        (value, value_plus_one).into()
     }
 }
diff --git a/contracts/feature-tests/scenario-tester/tests/st_blackbox_test.rs b/contracts/feature-tests/scenario-tester/tests/st_blackbox_test.rs
index 90721fbd0d..e4ab2b4b4d 100644
--- a/contracts/feature-tests/scenario-tester/tests/st_blackbox_test.rs
+++ b/contracts/feature-tests/scenario-tester/tests/st_blackbox_test.rs
@@ -112,6 +112,19 @@ fn st_blackbox() {
         .returns(ExpectValue(MultiValue2((1u32, 2u32))))
         .run();
 
+    let value = world
+        .tx()
+        .from(OTHER_ADDRESS)
+        .to(ST_ADDRESS)
+        .typed(scenario_tester_proxy::ScenarioTesterProxy)
+        .multi_return(1u32)
+        .returns(ReturnsResultUnmanaged)
+        .run();
+    assert_eq!(
+        value,
+        MultiValue2((RustBigUint::from(1u32), RustBigUint::from(2u32)))
+    );
+
     world.write_scenario_trace("trace1.scen.json");
 }
 
diff --git a/framework/base/src/abi/type_abi_impl_codec_multi.rs b/framework/base/src/abi/type_abi_impl_codec_multi.rs
index fa27b98670..6b1cf9ab72 100644
--- a/framework/base/src/abi/type_abi_impl_codec_multi.rs
+++ b/framework/base/src/abi/type_abi_impl_codec_multi.rs
@@ -77,16 +77,16 @@ impl<T: TypeAbi> TypeAbi for OptionalValue<T> {
 macro_rules! multi_arg_impls {
     ($(($mval_struct:ident $($n:tt $t:ident $u:ident)+) )+) => {
         $(
-            impl<$($t, $u),+ > TypeAbiFrom<crate::codec::multi_types::$mval_struct<$($u,)+>> for crate::codec::multi_types::$mval_struct<$($t,)+>
+            impl<$($t, $u),+> TypeAbiFrom<crate::codec::multi_types::$mval_struct<$($u,)+>> for crate::codec::multi_types::$mval_struct<$($t,)+>
             where
                 $($t: TypeAbiFrom<$u>,)+
             {}
 
-            impl<$($t),+ > TypeAbi for crate::codec::multi_types::$mval_struct<$($t,)+>
+            impl<$($t),+> TypeAbi for crate::codec::multi_types::$mval_struct<$($t,)+>
             where
                 $($t: TypeAbi,)+
             {
-                type Unmanaged = Self;
+                type Unmanaged = crate::codec::multi_types::$mval_struct<$($t::Unmanaged,)+>;
 
                 fn type_name() -> TypeName {
                     let mut repr = TypeName::from("multi");

From bdefe3611c659f28a4886c5a7169e30e9e9a3f9b Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Tue, 14 May 2024 22:54:27 +0300
Subject: [PATCH 0886/1254] sc-config proxy - add variant

---
 .../generate_proxy/proxy_generator.rs         | 74 +++++++++----------
 .../cmd/contract/sc_config/sc_config_proxy.rs |  4 +
 2 files changed, 37 insertions(+), 41 deletions(-)

diff --git a/framework/meta/src/cmd/contract/generate_proxy/proxy_generator.rs b/framework/meta/src/cmd/contract/generate_proxy/proxy_generator.rs
index 0bc7a73447..7d3a1197ef 100644
--- a/framework/meta/src/cmd/contract/generate_proxy/proxy_generator.rs
+++ b/framework/meta/src/cmd/contract/generate_proxy/proxy_generator.rs
@@ -1,8 +1,8 @@
 use std::{fmt::Display, fs::File, io::Write};
 
 use multiversx_sc::abi::{
-    EndpointAbi, EnumVariantDescription, InputAbi, OutputAbi, StructFieldDescription, TypeContents,
-    TypeDescription,
+    ContractAbi, EndpointAbi, EnumVariantDescription, InputAbi, OutputAbi, StructFieldDescription,
+    TypeContents, TypeDescription,
 };
 
 use crate::cmd::contract::{meta_config::MetaConfig, sc_config::ProxyConfigSerde};
@@ -43,6 +43,7 @@ pub struct ProxyGenerator<'a> {
     pub meta_config: &'a MetaConfig,
     pub file: Option<&'a mut File>,
     pub proxy_config: &'a ProxyConfigSerde,
+    pub contract_abi: &'a ContractAbi,
 }
 
 impl<'a> ProxyGenerator<'a> {
@@ -55,6 +56,7 @@ impl<'a> ProxyGenerator<'a> {
             meta_config,
             file: Some(file),
             proxy_config,
+            contract_abi: &meta_config.original_contract_abi,
         }
     }
 
@@ -69,6 +71,7 @@ impl<'a> ProxyGenerator<'a> {
     }
 
     pub fn write_proxy_to_file(&mut self) {
+        self.extract_contract_abi();
         self.write_header();
         self.write_tx_proxy_type_def();
         self.write_impl_for_tx_proxy();
@@ -77,6 +80,16 @@ impl<'a> ProxyGenerator<'a> {
         self.write_types();
     }
 
+    fn extract_contract_abi(&mut self) {
+        if self.proxy_config.variant.is_some() {
+            for contract_variant in &self.meta_config.sc_config.contracts {
+                if self.proxy_config.variant.clone().unwrap() == contract_variant.abi.name {
+                    self.contract_abi = &contract_variant.abi;
+                }
+            }
+        }
+    }
+
     fn write_header(&mut self) {
         self.writeln(PRELUDE);
         match &self.proxy_config.override_import {
@@ -86,7 +99,7 @@ impl<'a> ProxyGenerator<'a> {
     }
 
     fn write_tx_proxy_type_def(&mut self) {
-        let proxy_type_name = proxy_type_name(&self.meta_config.original_contract_abi.name);
+        let proxy_type_name = proxy_type_name(&self.contract_abi.name);
         self.writeln(format!(
             r#"
 pub struct {proxy_type_name};"#
@@ -94,9 +107,8 @@ pub struct {proxy_type_name};"#
     }
 
     fn write_impl_for_tx_proxy(&mut self) {
-        let proxy_type_name = proxy_type_name(&self.meta_config.original_contract_abi.name);
-        let proxy_methods_type_name =
-            proxy_methods_type_name(&self.meta_config.original_contract_abi.name);
+        let proxy_type_name = proxy_type_name(&self.contract_abi.name);
+        let proxy_methods_type_name = proxy_methods_type_name(&self.contract_abi.name);
         self.writeln(format!(
             r#"
 impl<Env, From, To, Gas> TxProxyTrait<Env, From, To, Gas> for {proxy_type_name}
@@ -116,8 +128,7 @@ where
     }
 
     fn write_struct_tx_proxy_methods(&mut self) {
-        let proxy_methods_type_name =
-            proxy_methods_type_name(&self.meta_config.original_contract_abi.name);
+        let proxy_methods_type_name = proxy_methods_type_name(&self.contract_abi.name);
         self.writeln(format!(
             r#"
 pub struct {proxy_methods_type_name}<Env, From, To, Gas>
@@ -133,35 +144,22 @@ where
     }
 
     fn write_content(&mut self) {
-        if !self
-            .meta_config
-            .original_contract_abi
-            .constructors
-            .is_empty()
-        {
+        if !self.contract_abi.constructors.is_empty() {
             self.write_constructors();
         }
 
-        if !self
-            .meta_config
-            .original_contract_abi
-            .upgrade_constructors
-            .is_empty()
-        {
+        if !self.contract_abi.upgrade_constructors.is_empty() {
             self.write_upgrades();
         }
 
-        if !self.meta_config.original_contract_abi.endpoints.is_empty() {
+        if !self.contract_abi.endpoints.is_empty() {
             self.write_endpoints();
         }
     }
 
     fn write_types(&mut self) {
-        for (_, type_description) in &self.meta_config.original_contract_abi.type_descriptions.0 {
-            if self
-                .meta_config
-                .original_contract_abi
-                .get_crate_name_for_code()
+        for (_, type_description) in &self.contract_abi.type_descriptions.0 {
+            if self.contract_abi.get_crate_name_for_code()
                 != extract_struct_crate(type_description.names.rust.as_str())
             {
                 continue;
@@ -186,8 +184,7 @@ where
     }
 
     fn write_constructors(&mut self) {
-        let constructors: Vec<EndpointAbi> =
-            self.meta_config.original_contract_abi.constructors.clone();
+        let constructors: Vec<EndpointAbi> = self.contract_abi.constructors.clone();
 
         self.write_header_impl_constructor();
         for (i, constructor_abi) in constructors.into_iter().enumerate() {
@@ -205,8 +202,7 @@ where
     fn write_upgrades(&mut self) {
         self.write_header_impl_upgrade();
         for (i, upgrade) in self
-            .meta_config
-            .original_contract_abi
+            .contract_abi
             .upgrade_constructors
             .clone()
             .into_iter()
@@ -224,7 +220,7 @@ where
     }
 
     fn write_endpoints(&mut self) {
-        let endpoints: Vec<EndpointAbi> = self.meta_config.original_contract_abi.endpoints.clone();
+        let endpoints: Vec<EndpointAbi> = self.contract_abi.endpoints.clone();
 
         self.write_header_impl_endpoints();
         for (i, endpoint_abi) in endpoints.into_iter().enumerate() {
@@ -240,8 +236,7 @@ where
     }
 
     fn write_header_impl_constructor(&mut self) {
-        let proxy_methods_type_name =
-            proxy_methods_type_name(&self.meta_config.original_contract_abi.name);
+        let proxy_methods_type_name = proxy_methods_type_name(&self.contract_abi.name);
         self.writeln(format!(
             r#"
 #[rustfmt::skip]
@@ -256,8 +251,7 @@ where
     }
 
     fn write_header_impl_upgrade(&mut self) {
-        let proxy_methods_type_name =
-            proxy_methods_type_name(&self.meta_config.original_contract_abi.name);
+        let proxy_methods_type_name = proxy_methods_type_name(&self.contract_abi.name);
         self.writeln(format!(
             r#"
 #[rustfmt::skip]
@@ -273,8 +267,7 @@ where
     }
 
     fn write_header_impl_endpoints(&mut self) {
-        let proxy_methods_type_name =
-            proxy_methods_type_name(&self.meta_config.original_contract_abi.name);
+        let proxy_methods_type_name = proxy_methods_type_name(&self.contract_abi.name);
         self.writeln(format!(
             r#"
 #[rustfmt::skip]
@@ -606,10 +599,7 @@ where
 
     fn process_paths(&self, paths: &Vec<String>) -> Vec<String> {
         let mut processed_paths: Vec<String> = Vec::new();
-        let crate_name = self
-            .meta_config
-            .original_contract_abi
-            .get_crate_name_for_code();
+        let crate_name = self.contract_abi.get_crate_name_for_code();
 
         for path in paths {
             let type_rust_name = path.split("::").last().unwrap();
@@ -665,6 +655,7 @@ pub mod tests {
             meta_config: &meta_config,
             file: None,
             proxy_config: &ProxyConfigSerde::new(),
+            contract_abi: &meta_config.original_contract_abi,
         };
 
         let cleaned_path_unsanitized = proxy_generator.clean_paths(
@@ -696,6 +687,7 @@ pub mod tests {
             meta_config: &meta_config,
             file: None,
             proxy_config: &ProxyConfigSerde::new(),
+            contract_abi: &meta_config.original_contract_abi,
         };
 
         let cleaned_path_sanitized = proxy_generator.clean_paths(
diff --git a/framework/meta/src/cmd/contract/sc_config/sc_config_proxy.rs b/framework/meta/src/cmd/contract/sc_config/sc_config_proxy.rs
index 56c9a5257a..88721fe6e7 100644
--- a/framework/meta/src/cmd/contract/sc_config/sc_config_proxy.rs
+++ b/framework/meta/src/cmd/contract/sc_config/sc_config_proxy.rs
@@ -15,6 +15,9 @@ pub struct ProxyConfigSerde {
     #[serde(default)]
     #[serde(rename = "path-rename")]
     pub path_rename: Option<Vec<PathRename>>,
+
+    #[serde(default)]
+    pub variant: Option<String>,
 }
 
 impl ProxyConfigSerde {
@@ -23,6 +26,7 @@ impl ProxyConfigSerde {
             path: DEFAULT_PATH.to_string(),
             override_import: None,
             path_rename: None,
+            variant: None,
         }
     }
 }

From 99d7d4eba1235c5805ea7b0b0aef7e38c8956a8d Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Wed, 15 May 2024 15:44:45 +0300
Subject: [PATCH 0887/1254] sc-config proxy - add contract_abi in proxy
 generator structure and add examples

---
 .../multicontract.toml                        | 13 ++-
 .../src/multi_contract_alt_impl_proxy.rs      | 73 ++++++++++++++++
 .../multi_contract_example_feature_proxy.rs   | 86 +++++++++++++++++++
 .../contract/generate_proxy/proxy_gen_main.rs | 26 +++++-
 .../generate_proxy/proxy_generator.rs         | 14 +--
 5 files changed, 196 insertions(+), 16 deletions(-)
 create mode 100644 contracts/feature-tests/multi-contract-features/src/multi_contract_alt_impl_proxy.rs
 create mode 100644 contracts/feature-tests/multi-contract-features/src/multi_contract_example_feature_proxy.rs

diff --git a/contracts/feature-tests/multi-contract-features/multicontract.toml b/contracts/feature-tests/multi-contract-features/multicontract.toml
index b6c3c8efb1..dd9eaa5add 100644
--- a/contracts/feature-tests/multi-contract-features/multicontract.toml
+++ b/contracts/feature-tests/multi-contract-features/multicontract.toml
@@ -17,7 +17,7 @@ features = []
 
 [contracts.multi-contract-main.profile]
 # these are just the defaults, checking that parsing works fine
-codegen-units = 1  
+codegen-units = 1
 opt-level = "z"
 lto = true
 debug = false
@@ -31,9 +31,18 @@ add-unlabelled = false
 add-labels = ["mcs-external-view"]
 
 [contracts.multi-contract-example-feature]
-add-unlabelled = true # optional here, since the default is true
+add-unlabelled = true          # optional here, since the default is true
 features = ["example_feature"]
 
 [contracts.multi-contract-alt-impl]
 add-unlabelled = false
 add-labels = ["alt-impl"]
+
+[[proxy]]
+variant = "multi_contract_example_feature"
+path = "src/multi_contract_example_feature_proxy.rs"
+
+
+[[proxy]]
+variant = "multi_contract_alt_impl"
+path = "src/multi_contract_alt_impl_proxy.rs"
diff --git a/contracts/feature-tests/multi-contract-features/src/multi_contract_alt_impl_proxy.rs b/contracts/feature-tests/multi-contract-features/src/multi_contract_alt_impl_proxy.rs
new file mode 100644
index 0000000000..8a7b345766
--- /dev/null
+++ b/contracts/feature-tests/multi-contract-features/src/multi_contract_alt_impl_proxy.rs
@@ -0,0 +1,73 @@
+// Code generated by the multiversx-sc proxy generator. DO NOT EDIT.
+
+////////////////////////////////////////////////////
+////////////////// AUTO-GENERATED //////////////////
+////////////////////////////////////////////////////
+
+#![allow(dead_code)]
+#![allow(clippy::all)]
+
+use multiversx_sc::proxy_imports::*;
+
+pub struct MultiContractFeaturesProxy;
+
+impl<Env, From, To, Gas> TxProxyTrait<Env, From, To, Gas> for MultiContractFeaturesProxy
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    type TxProxyMethods = MultiContractFeaturesProxyMethods<Env, From, To, Gas>;
+
+    fn proxy_methods(self, tx: Tx<Env, From, To, (), Gas, (), ()>) -> Self::TxProxyMethods {
+        MultiContractFeaturesProxyMethods { wrapped_tx: tx }
+    }
+}
+
+pub struct MultiContractFeaturesProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    wrapped_tx: Tx<Env, From, To, (), Gas, (), ()>,
+}
+
+#[rustfmt::skip]
+impl<Env, From, Gas> MultiContractFeaturesProxyMethods<Env, From, (), Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn alternative_init(
+        self,
+    ) -> TxTypedDeploy<Env, From, NotPayable, Gas, &'static str> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_deploy()
+            .original_result()
+    }
+}
+
+#[rustfmt::skip]
+impl<Env, From, To, Gas> MultiContractFeaturesProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn alternative_sample_value(
+        self,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, &'static str> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("sample_value")
+            .original_result()
+    }
+}
diff --git a/contracts/feature-tests/multi-contract-features/src/multi_contract_example_feature_proxy.rs b/contracts/feature-tests/multi-contract-features/src/multi_contract_example_feature_proxy.rs
new file mode 100644
index 0000000000..0f1dbdd125
--- /dev/null
+++ b/contracts/feature-tests/multi-contract-features/src/multi_contract_example_feature_proxy.rs
@@ -0,0 +1,86 @@
+// Code generated by the multiversx-sc proxy generator. DO NOT EDIT.
+
+////////////////////////////////////////////////////
+////////////////// AUTO-GENERATED //////////////////
+////////////////////////////////////////////////////
+
+#![allow(dead_code)]
+#![allow(clippy::all)]
+
+use multiversx_sc::proxy_imports::*;
+
+pub struct MultiContractFeaturesProxy;
+
+impl<Env, From, To, Gas> TxProxyTrait<Env, From, To, Gas> for MultiContractFeaturesProxy
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    type TxProxyMethods = MultiContractFeaturesProxyMethods<Env, From, To, Gas>;
+
+    fn proxy_methods(self, tx: Tx<Env, From, To, (), Gas, (), ()>) -> Self::TxProxyMethods {
+        MultiContractFeaturesProxyMethods { wrapped_tx: tx }
+    }
+}
+
+pub struct MultiContractFeaturesProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    wrapped_tx: Tx<Env, From, To, (), Gas, (), ()>,
+}
+
+#[rustfmt::skip]
+impl<Env, From, Gas> MultiContractFeaturesProxyMethods<Env, From, (), Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn default_init<
+        Arg0: ProxyArg<BigUint<Env::Api>>,
+    >(
+        self,
+        sample_value: Arg0,
+    ) -> TxTypedDeploy<Env, From, NotPayable, Gas, ()> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_deploy()
+            .argument(&sample_value)
+            .original_result()
+    }
+}
+
+#[rustfmt::skip]
+impl<Env, From, To, Gas> MultiContractFeaturesProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn sample_value(
+        self,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, BigUint<Env::Api>> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("sample_value")
+            .original_result()
+    }
+
+    pub fn example_feature_message(
+        self,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, &'static str> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("example_feature_message")
+            .original_result()
+    }
+}
diff --git a/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_main.rs b/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_main.rs
index 4ef8582bcb..0619a65cb5 100644
--- a/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_main.rs
+++ b/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_main.rs
@@ -1,3 +1,5 @@
+use multiversx_sc::abi::ContractAbi;
+
 use crate::cmd::contract::sc_config::ProxyConfigSerde;
 
 use super::{
@@ -14,8 +16,28 @@ impl MetaConfig {
     }
 }
 
-fn write_proxy_with_explicit_path(proxy_config: &ProxyConfigSerde, meta_config: &mut MetaConfig) {
+fn write_proxy_with_explicit_path(proxy_config: &ProxyConfigSerde, meta_config: &MetaConfig) {
+    let contract_abi = extract_contract_abi(proxy_config, meta_config);
     let mut file = create_file(&proxy_config.path);
-    let mut proxy_generator = ProxyGenerator::new(meta_config, &mut file, proxy_config);
+    let mut proxy_generator =
+        ProxyGenerator::new(meta_config, &mut file, proxy_config, contract_abi);
     proxy_generator.write_proxy_to_file();
 }
+
+fn extract_contract_abi<'a>(
+    proxy_config: &'a ProxyConfigSerde,
+    meta_config: &'a MetaConfig,
+) -> &'a ContractAbi {
+    if proxy_config.variant.is_some() {
+        let variant = proxy_config.variant.as_ref().unwrap();
+        for contract_variant in &meta_config.sc_config.contracts {
+            if variant == &contract_variant.public_name_snake_case() {
+                return &contract_variant.abi;
+            }
+        }
+
+        panic!("No variant with name \"{}\" in multicontract", variant);
+    }
+
+    &meta_config.original_contract_abi
+}
diff --git a/framework/meta/src/cmd/contract/generate_proxy/proxy_generator.rs b/framework/meta/src/cmd/contract/generate_proxy/proxy_generator.rs
index 7d3a1197ef..015d7afc90 100644
--- a/framework/meta/src/cmd/contract/generate_proxy/proxy_generator.rs
+++ b/framework/meta/src/cmd/contract/generate_proxy/proxy_generator.rs
@@ -51,12 +51,13 @@ impl<'a> ProxyGenerator<'a> {
         meta_config: &'a MetaConfig,
         file: &'a mut File,
         proxy_config: &'a ProxyConfigSerde,
+        contract_abi: &'a ContractAbi,
     ) -> Self {
         Self {
             meta_config,
             file: Some(file),
             proxy_config,
-            contract_abi: &meta_config.original_contract_abi,
+            contract_abi,
         }
     }
 
@@ -71,7 +72,6 @@ impl<'a> ProxyGenerator<'a> {
     }
 
     pub fn write_proxy_to_file(&mut self) {
-        self.extract_contract_abi();
         self.write_header();
         self.write_tx_proxy_type_def();
         self.write_impl_for_tx_proxy();
@@ -80,16 +80,6 @@ impl<'a> ProxyGenerator<'a> {
         self.write_types();
     }
 
-    fn extract_contract_abi(&mut self) {
-        if self.proxy_config.variant.is_some() {
-            for contract_variant in &self.meta_config.sc_config.contracts {
-                if self.proxy_config.variant.clone().unwrap() == contract_variant.abi.name {
-                    self.contract_abi = &contract_variant.abi;
-                }
-            }
-        }
-    }
-
     fn write_header(&mut self) {
         self.writeln(PRELUDE);
         match &self.proxy_config.override_import {

From 29304aae89304968335056aee440193fa4f3d96f Mon Sep 17 00:00:00 2001
From: Fusee <quentus123@orange.fr>
Date: Wed, 15 May 2024 15:02:24 +0200
Subject: [PATCH 0888/1254] fixed memory leak on boxed bytes

---
 framework/base/src/types/heap/boxed_bytes.rs  | 33 ++++---------------
 .../managed_buffer_api_vh.rs                  | 16 ++++-----
 .../src/api/endpoint_arg_api_node.rs          |  2 +-
 .../managed_types/elliptic_curve_api_node.rs  |  6 ++--
 .../managed_types/managed_buffer_api_node.rs  |  2 +-
 5 files changed, 18 insertions(+), 41 deletions(-)

diff --git a/framework/base/src/types/heap/boxed_bytes.rs b/framework/base/src/types/heap/boxed_bytes.rs
index 338af818c2..3bc0d690c6 100644
--- a/framework/base/src/types/heap/boxed_bytes.rs
+++ b/framework/base/src/types/heap/boxed_bytes.rs
@@ -1,12 +1,9 @@
+use alloc::{alloc::{alloc, Layout, realloc}, boxed::Box, vec, vec::Vec};
+
 use crate::{
     abi::{TypeAbi, TypeAbiFrom, TypeName},
     codec::*,
 };
-use alloc::{
-    alloc::{alloc, alloc_zeroed, realloc, Layout},
-    boxed::Box,
-    vec::Vec,
-};
 
 /// Simple wrapper around a boxed byte slice,
 /// but with a lot of optimized methods for manipulating it.
@@ -20,23 +17,7 @@ impl BoxedBytes {
     }
 
     pub fn zeros(len: usize) -> Self {
-        unsafe {
-            let layout = Layout::from_size_align(len, core::mem::align_of::<u8>()).unwrap();
-            let bytes_ptr = alloc_zeroed(layout);
-            let bytes_box = Box::from_raw(core::slice::from_raw_parts_mut(bytes_ptr, len));
-            BoxedBytes(bytes_box)
-        }
-    }
-
-    /// Allocates an uninitialized BoxedBytes to heap.
-    ///
-    /// # Safety
-    ///
-    /// Should only be called if the contents are initialized immediately afterwards, e.g. via a FFI call.
-    pub unsafe fn allocate(len: usize) -> Self {
-        let layout = Layout::from_size_align(len, core::mem::align_of::<u8>()).unwrap();
-        let bytes_ptr = alloc(layout);
-        let bytes_box = Box::from_raw(core::slice::from_raw_parts_mut(bytes_ptr, len));
+        let bytes_box = Box::from(vec![0u8; len]);
         BoxedBytes(bytes_box)
     }
 
@@ -222,11 +203,9 @@ impl NestedDecode for BoxedBytes {
         H: DecodeErrorHandler,
     {
         let size = usize::dep_decode_or_handle_err(input, h)?;
-        unsafe {
-            let mut result = BoxedBytes::allocate(size);
-            input.read_into(result.as_mut_slice(), h)?;
-            Ok(result)
-        }
+        let mut result = BoxedBytes::zeros(size);
+        input.read_into(result.as_mut_slice(), h)?;
+        Ok(result)
     }
 }
 
diff --git a/framework/scenario/src/api/managed_type_api_vh/managed_buffer_api_vh.rs b/framework/scenario/src/api/managed_type_api_vh/managed_buffer_api_vh.rs
index 09e7d9137f..22a0c152cc 100644
--- a/framework/scenario/src/api/managed_type_api_vh/managed_buffer_api_vh.rs
+++ b/framework/scenario/src/api/managed_type_api_vh/managed_buffer_api_vh.rs
@@ -29,16 +29,14 @@ impl<VHB: VMHooksApiBackend> ManagedBufferApiImpl for VMHooksApi<VHB> {
     fn mb_to_boxed_bytes(&self, handle: Self::ManagedBufferHandle) -> BoxedBytes {
         self.with_vm_hooks_ctx_1(&handle, |vh| {
             let len = vh.mbuffer_get_length(handle.get_raw_handle_unchecked()) as usize;
-            unsafe {
-                let mut res = BoxedBytes::allocate(len);
-                if len > 0 {
-                    let _ = vh.mbuffer_get_bytes(
-                        handle.get_raw_handle_unchecked(),
-                        res.as_mut_ptr() as MemPtr,
-                    );
-                }
-                res
+            let mut res = BoxedBytes::zeros(len);
+            if len > 0 {
+                let _ = vh.mbuffer_get_bytes(
+                    handle.get_raw_handle_unchecked(),
+                    res.as_mut_ptr() as MemPtr,
+                );
             }
+            res
         })
     }
 
diff --git a/framework/wasm-adapter/src/api/endpoint_arg_api_node.rs b/framework/wasm-adapter/src/api/endpoint_arg_api_node.rs
index 48135f65ae..6c4627fa60 100644
--- a/framework/wasm-adapter/src/api/endpoint_arg_api_node.rs
+++ b/framework/wasm-adapter/src/api/endpoint_arg_api_node.rs
@@ -56,7 +56,7 @@ impl EndpointArgumentApiImpl for VmApiImpl {
     fn get_argument_boxed_bytes(&self, arg_index: i32) -> BoxedBytes {
         let len = self.get_argument_len(arg_index);
         unsafe {
-            let mut res = BoxedBytes::allocate(len);
+            let mut res = BoxedBytes::zeros(len);
             if len > 0 {
                 getArgument(arg_index, res.as_mut_ptr());
             }
diff --git a/framework/wasm-adapter/src/api/managed_types/elliptic_curve_api_node.rs b/framework/wasm-adapter/src/api/managed_types/elliptic_curve_api_node.rs
index fe35a339f9..3fb800e85f 100644
--- a/framework/wasm-adapter/src/api/managed_types/elliptic_curve_api_node.rs
+++ b/framework/wasm-adapter/src/api/managed_types/elliptic_curve_api_node.rs
@@ -314,7 +314,7 @@ impl EllipticCurveApiImpl for crate::api::VmApiImpl {
     ) -> BoxedBytes {
         unsafe {
             let byte_length = (getCurveLengthEC(ec_handle) + 7) / 8;
-            let mut result = BoxedBytes::allocate(1 + 2 * byte_length as usize);
+            let mut result = BoxedBytes::zeros(1 + 2 * byte_length as usize);
             marshalEC(x_pair_handle, y_pair_handle, ec_handle, result.as_mut_ptr());
             result
         }
@@ -340,7 +340,7 @@ impl EllipticCurveApiImpl for crate::api::VmApiImpl {
     ) -> BoxedBytes {
         unsafe {
             let byte_length = (getCurveLengthEC(ec_handle) + 7) / 8;
-            let mut result = BoxedBytes::allocate(1 + byte_length as usize);
+            let mut result = BoxedBytes::zeros(1 + byte_length as usize);
             marshalCompressedEC(x_pair_handle, y_pair_handle, ec_handle, result.as_mut_ptr());
             result
         }
@@ -426,7 +426,7 @@ impl EllipticCurveApiImpl for crate::api::VmApiImpl {
     ) -> BoxedBytes {
         unsafe {
             let priv_key_length = getPrivKeyByteLengthEC(ec_handle);
-            let mut private_key = BoxedBytes::allocate(priv_key_length as usize);
+            let mut private_key = BoxedBytes::zeros(priv_key_length as usize);
             generateKeyEC(
                 x_pub_key_handle,
                 y_pub_key_handle,
diff --git a/framework/wasm-adapter/src/api/managed_types/managed_buffer_api_node.rs b/framework/wasm-adapter/src/api/managed_types/managed_buffer_api_node.rs
index 120d06e734..ee0390ffb0 100644
--- a/framework/wasm-adapter/src/api/managed_types/managed_buffer_api_node.rs
+++ b/framework/wasm-adapter/src/api/managed_types/managed_buffer_api_node.rs
@@ -58,7 +58,7 @@ impl ManagedBufferApiImpl for crate::api::VmApiImpl {
     fn mb_to_boxed_bytes(&self, handle: Self::ManagedBufferHandle) -> BoxedBytes {
         unsafe {
             let len = mBufferGetLength(handle);
-            let mut res = BoxedBytes::allocate(len as usize);
+            let mut res = BoxedBytes::zeros(len as usize);
             if len > 0 {
                 let _ = mBufferGetBytes(handle, res.as_mut_ptr());
             }

From ad178ceeed5a48e55ae4cc2503fe9929c2802224 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 15 May 2024 17:49:13 +0300
Subject: [PATCH 0889/1254] ManagedVecItem - larger payloads

---
 .../wrapped/managed_vec_item_payload.rs       | 3840 +++++++++++++++++
 .../tests/derive_managed_vec_item_struct_3.rs |   49 +
 2 files changed, 3889 insertions(+)
 create mode 100644 framework/scenario/tests/derive_managed_vec_item_struct_3.rs

diff --git a/framework/base/src/types/managed/wrapped/managed_vec_item_payload.rs b/framework/base/src/types/managed/wrapped/managed_vec_item_payload.rs
index 0d0a8d7e99..defa671549 100644
--- a/framework/base/src/types/managed/wrapped/managed_vec_item_payload.rs
+++ b/framework/base/src/types/managed/wrapped/managed_vec_item_payload.rs
@@ -133,6 +133,86 @@ payload_add!(1usize, 45usize, 46usize);
 payload_add!(1usize, 46usize, 47usize);
 payload_add!(1usize, 47usize, 48usize);
 payload_add!(1usize, 48usize, 49usize);
+payload_add!(1usize, 49usize, 50usize);
+payload_add!(1usize, 50usize, 51usize);
+payload_add!(1usize, 51usize, 52usize);
+payload_add!(1usize, 52usize, 53usize);
+payload_add!(1usize, 53usize, 54usize);
+payload_add!(1usize, 54usize, 55usize);
+payload_add!(1usize, 55usize, 56usize);
+payload_add!(1usize, 56usize, 57usize);
+payload_add!(1usize, 57usize, 58usize);
+payload_add!(1usize, 58usize, 59usize);
+payload_add!(1usize, 59usize, 60usize);
+payload_add!(1usize, 60usize, 61usize);
+payload_add!(1usize, 61usize, 62usize);
+payload_add!(1usize, 62usize, 63usize);
+payload_add!(1usize, 63usize, 64usize);
+payload_add!(1usize, 64usize, 65usize);
+payload_add!(1usize, 65usize, 66usize);
+payload_add!(1usize, 66usize, 67usize);
+payload_add!(1usize, 67usize, 68usize);
+payload_add!(1usize, 68usize, 69usize);
+payload_add!(1usize, 69usize, 70usize);
+payload_add!(1usize, 70usize, 71usize);
+payload_add!(1usize, 71usize, 72usize);
+payload_add!(1usize, 72usize, 73usize);
+payload_add!(1usize, 73usize, 74usize);
+payload_add!(1usize, 74usize, 75usize);
+payload_add!(1usize, 75usize, 76usize);
+payload_add!(1usize, 76usize, 77usize);
+payload_add!(1usize, 77usize, 78usize);
+payload_add!(1usize, 78usize, 79usize);
+payload_add!(1usize, 79usize, 80usize);
+payload_add!(1usize, 80usize, 81usize);
+payload_add!(1usize, 81usize, 82usize);
+payload_add!(1usize, 82usize, 83usize);
+payload_add!(1usize, 83usize, 84usize);
+payload_add!(1usize, 84usize, 85usize);
+payload_add!(1usize, 85usize, 86usize);
+payload_add!(1usize, 86usize, 87usize);
+payload_add!(1usize, 87usize, 88usize);
+payload_add!(1usize, 88usize, 89usize);
+payload_add!(1usize, 89usize, 90usize);
+payload_add!(1usize, 90usize, 91usize);
+payload_add!(1usize, 91usize, 92usize);
+payload_add!(1usize, 92usize, 93usize);
+payload_add!(1usize, 93usize, 94usize);
+payload_add!(1usize, 94usize, 95usize);
+payload_add!(1usize, 95usize, 96usize);
+payload_add!(1usize, 96usize, 97usize);
+payload_add!(1usize, 97usize, 98usize);
+payload_add!(1usize, 98usize, 99usize);
+payload_add!(1usize, 99usize, 100usize);
+payload_add!(1usize, 100usize, 101usize);
+payload_add!(1usize, 101usize, 102usize);
+payload_add!(1usize, 102usize, 103usize);
+payload_add!(1usize, 103usize, 104usize);
+payload_add!(1usize, 104usize, 105usize);
+payload_add!(1usize, 105usize, 106usize);
+payload_add!(1usize, 106usize, 107usize);
+payload_add!(1usize, 107usize, 108usize);
+payload_add!(1usize, 108usize, 109usize);
+payload_add!(1usize, 109usize, 110usize);
+payload_add!(1usize, 110usize, 111usize);
+payload_add!(1usize, 111usize, 112usize);
+payload_add!(1usize, 112usize, 113usize);
+payload_add!(1usize, 113usize, 114usize);
+payload_add!(1usize, 114usize, 115usize);
+payload_add!(1usize, 115usize, 116usize);
+payload_add!(1usize, 116usize, 117usize);
+payload_add!(1usize, 117usize, 118usize);
+payload_add!(1usize, 118usize, 119usize);
+payload_add!(1usize, 119usize, 120usize);
+payload_add!(1usize, 120usize, 121usize);
+payload_add!(1usize, 121usize, 122usize);
+payload_add!(1usize, 122usize, 123usize);
+payload_add!(1usize, 123usize, 124usize);
+payload_add!(1usize, 124usize, 125usize);
+payload_add!(1usize, 125usize, 126usize);
+payload_add!(1usize, 126usize, 127usize);
+payload_add!(1usize, 127usize, 128usize);
+payload_add!(1usize, 128usize, 129usize);
 payload_add!(2usize, 1usize, 3usize);
 payload_add!(2usize, 2usize, 4usize);
 payload_add!(2usize, 3usize, 5usize);
@@ -181,6 +261,86 @@ payload_add!(2usize, 45usize, 47usize);
 payload_add!(2usize, 46usize, 48usize);
 payload_add!(2usize, 47usize, 49usize);
 payload_add!(2usize, 48usize, 50usize);
+payload_add!(2usize, 49usize, 51usize);
+payload_add!(2usize, 50usize, 52usize);
+payload_add!(2usize, 51usize, 53usize);
+payload_add!(2usize, 52usize, 54usize);
+payload_add!(2usize, 53usize, 55usize);
+payload_add!(2usize, 54usize, 56usize);
+payload_add!(2usize, 55usize, 57usize);
+payload_add!(2usize, 56usize, 58usize);
+payload_add!(2usize, 57usize, 59usize);
+payload_add!(2usize, 58usize, 60usize);
+payload_add!(2usize, 59usize, 61usize);
+payload_add!(2usize, 60usize, 62usize);
+payload_add!(2usize, 61usize, 63usize);
+payload_add!(2usize, 62usize, 64usize);
+payload_add!(2usize, 63usize, 65usize);
+payload_add!(2usize, 64usize, 66usize);
+payload_add!(2usize, 65usize, 67usize);
+payload_add!(2usize, 66usize, 68usize);
+payload_add!(2usize, 67usize, 69usize);
+payload_add!(2usize, 68usize, 70usize);
+payload_add!(2usize, 69usize, 71usize);
+payload_add!(2usize, 70usize, 72usize);
+payload_add!(2usize, 71usize, 73usize);
+payload_add!(2usize, 72usize, 74usize);
+payload_add!(2usize, 73usize, 75usize);
+payload_add!(2usize, 74usize, 76usize);
+payload_add!(2usize, 75usize, 77usize);
+payload_add!(2usize, 76usize, 78usize);
+payload_add!(2usize, 77usize, 79usize);
+payload_add!(2usize, 78usize, 80usize);
+payload_add!(2usize, 79usize, 81usize);
+payload_add!(2usize, 80usize, 82usize);
+payload_add!(2usize, 81usize, 83usize);
+payload_add!(2usize, 82usize, 84usize);
+payload_add!(2usize, 83usize, 85usize);
+payload_add!(2usize, 84usize, 86usize);
+payload_add!(2usize, 85usize, 87usize);
+payload_add!(2usize, 86usize, 88usize);
+payload_add!(2usize, 87usize, 89usize);
+payload_add!(2usize, 88usize, 90usize);
+payload_add!(2usize, 89usize, 91usize);
+payload_add!(2usize, 90usize, 92usize);
+payload_add!(2usize, 91usize, 93usize);
+payload_add!(2usize, 92usize, 94usize);
+payload_add!(2usize, 93usize, 95usize);
+payload_add!(2usize, 94usize, 96usize);
+payload_add!(2usize, 95usize, 97usize);
+payload_add!(2usize, 96usize, 98usize);
+payload_add!(2usize, 97usize, 99usize);
+payload_add!(2usize, 98usize, 100usize);
+payload_add!(2usize, 99usize, 101usize);
+payload_add!(2usize, 100usize, 102usize);
+payload_add!(2usize, 101usize, 103usize);
+payload_add!(2usize, 102usize, 104usize);
+payload_add!(2usize, 103usize, 105usize);
+payload_add!(2usize, 104usize, 106usize);
+payload_add!(2usize, 105usize, 107usize);
+payload_add!(2usize, 106usize, 108usize);
+payload_add!(2usize, 107usize, 109usize);
+payload_add!(2usize, 108usize, 110usize);
+payload_add!(2usize, 109usize, 111usize);
+payload_add!(2usize, 110usize, 112usize);
+payload_add!(2usize, 111usize, 113usize);
+payload_add!(2usize, 112usize, 114usize);
+payload_add!(2usize, 113usize, 115usize);
+payload_add!(2usize, 114usize, 116usize);
+payload_add!(2usize, 115usize, 117usize);
+payload_add!(2usize, 116usize, 118usize);
+payload_add!(2usize, 117usize, 119usize);
+payload_add!(2usize, 118usize, 120usize);
+payload_add!(2usize, 119usize, 121usize);
+payload_add!(2usize, 120usize, 122usize);
+payload_add!(2usize, 121usize, 123usize);
+payload_add!(2usize, 122usize, 124usize);
+payload_add!(2usize, 123usize, 125usize);
+payload_add!(2usize, 124usize, 126usize);
+payload_add!(2usize, 125usize, 127usize);
+payload_add!(2usize, 126usize, 128usize);
+payload_add!(2usize, 127usize, 129usize);
+payload_add!(2usize, 128usize, 130usize);
 payload_add!(3usize, 1usize, 4usize);
 payload_add!(3usize, 2usize, 5usize);
 payload_add!(3usize, 3usize, 6usize);
@@ -229,6 +389,86 @@ payload_add!(3usize, 45usize, 48usize);
 payload_add!(3usize, 46usize, 49usize);
 payload_add!(3usize, 47usize, 50usize);
 payload_add!(3usize, 48usize, 51usize);
+payload_add!(3usize, 49usize, 52usize);
+payload_add!(3usize, 50usize, 53usize);
+payload_add!(3usize, 51usize, 54usize);
+payload_add!(3usize, 52usize, 55usize);
+payload_add!(3usize, 53usize, 56usize);
+payload_add!(3usize, 54usize, 57usize);
+payload_add!(3usize, 55usize, 58usize);
+payload_add!(3usize, 56usize, 59usize);
+payload_add!(3usize, 57usize, 60usize);
+payload_add!(3usize, 58usize, 61usize);
+payload_add!(3usize, 59usize, 62usize);
+payload_add!(3usize, 60usize, 63usize);
+payload_add!(3usize, 61usize, 64usize);
+payload_add!(3usize, 62usize, 65usize);
+payload_add!(3usize, 63usize, 66usize);
+payload_add!(3usize, 64usize, 67usize);
+payload_add!(3usize, 65usize, 68usize);
+payload_add!(3usize, 66usize, 69usize);
+payload_add!(3usize, 67usize, 70usize);
+payload_add!(3usize, 68usize, 71usize);
+payload_add!(3usize, 69usize, 72usize);
+payload_add!(3usize, 70usize, 73usize);
+payload_add!(3usize, 71usize, 74usize);
+payload_add!(3usize, 72usize, 75usize);
+payload_add!(3usize, 73usize, 76usize);
+payload_add!(3usize, 74usize, 77usize);
+payload_add!(3usize, 75usize, 78usize);
+payload_add!(3usize, 76usize, 79usize);
+payload_add!(3usize, 77usize, 80usize);
+payload_add!(3usize, 78usize, 81usize);
+payload_add!(3usize, 79usize, 82usize);
+payload_add!(3usize, 80usize, 83usize);
+payload_add!(3usize, 81usize, 84usize);
+payload_add!(3usize, 82usize, 85usize);
+payload_add!(3usize, 83usize, 86usize);
+payload_add!(3usize, 84usize, 87usize);
+payload_add!(3usize, 85usize, 88usize);
+payload_add!(3usize, 86usize, 89usize);
+payload_add!(3usize, 87usize, 90usize);
+payload_add!(3usize, 88usize, 91usize);
+payload_add!(3usize, 89usize, 92usize);
+payload_add!(3usize, 90usize, 93usize);
+payload_add!(3usize, 91usize, 94usize);
+payload_add!(3usize, 92usize, 95usize);
+payload_add!(3usize, 93usize, 96usize);
+payload_add!(3usize, 94usize, 97usize);
+payload_add!(3usize, 95usize, 98usize);
+payload_add!(3usize, 96usize, 99usize);
+payload_add!(3usize, 97usize, 100usize);
+payload_add!(3usize, 98usize, 101usize);
+payload_add!(3usize, 99usize, 102usize);
+payload_add!(3usize, 100usize, 103usize);
+payload_add!(3usize, 101usize, 104usize);
+payload_add!(3usize, 102usize, 105usize);
+payload_add!(3usize, 103usize, 106usize);
+payload_add!(3usize, 104usize, 107usize);
+payload_add!(3usize, 105usize, 108usize);
+payload_add!(3usize, 106usize, 109usize);
+payload_add!(3usize, 107usize, 110usize);
+payload_add!(3usize, 108usize, 111usize);
+payload_add!(3usize, 109usize, 112usize);
+payload_add!(3usize, 110usize, 113usize);
+payload_add!(3usize, 111usize, 114usize);
+payload_add!(3usize, 112usize, 115usize);
+payload_add!(3usize, 113usize, 116usize);
+payload_add!(3usize, 114usize, 117usize);
+payload_add!(3usize, 115usize, 118usize);
+payload_add!(3usize, 116usize, 119usize);
+payload_add!(3usize, 117usize, 120usize);
+payload_add!(3usize, 118usize, 121usize);
+payload_add!(3usize, 119usize, 122usize);
+payload_add!(3usize, 120usize, 123usize);
+payload_add!(3usize, 121usize, 124usize);
+payload_add!(3usize, 122usize, 125usize);
+payload_add!(3usize, 123usize, 126usize);
+payload_add!(3usize, 124usize, 127usize);
+payload_add!(3usize, 125usize, 128usize);
+payload_add!(3usize, 126usize, 129usize);
+payload_add!(3usize, 127usize, 130usize);
+payload_add!(3usize, 128usize, 131usize);
 payload_add!(4usize, 1usize, 5usize);
 payload_add!(4usize, 2usize, 6usize);
 payload_add!(4usize, 3usize, 7usize);
@@ -277,6 +517,86 @@ payload_add!(4usize, 45usize, 49usize);
 payload_add!(4usize, 46usize, 50usize);
 payload_add!(4usize, 47usize, 51usize);
 payload_add!(4usize, 48usize, 52usize);
+payload_add!(4usize, 49usize, 53usize);
+payload_add!(4usize, 50usize, 54usize);
+payload_add!(4usize, 51usize, 55usize);
+payload_add!(4usize, 52usize, 56usize);
+payload_add!(4usize, 53usize, 57usize);
+payload_add!(4usize, 54usize, 58usize);
+payload_add!(4usize, 55usize, 59usize);
+payload_add!(4usize, 56usize, 60usize);
+payload_add!(4usize, 57usize, 61usize);
+payload_add!(4usize, 58usize, 62usize);
+payload_add!(4usize, 59usize, 63usize);
+payload_add!(4usize, 60usize, 64usize);
+payload_add!(4usize, 61usize, 65usize);
+payload_add!(4usize, 62usize, 66usize);
+payload_add!(4usize, 63usize, 67usize);
+payload_add!(4usize, 64usize, 68usize);
+payload_add!(4usize, 65usize, 69usize);
+payload_add!(4usize, 66usize, 70usize);
+payload_add!(4usize, 67usize, 71usize);
+payload_add!(4usize, 68usize, 72usize);
+payload_add!(4usize, 69usize, 73usize);
+payload_add!(4usize, 70usize, 74usize);
+payload_add!(4usize, 71usize, 75usize);
+payload_add!(4usize, 72usize, 76usize);
+payload_add!(4usize, 73usize, 77usize);
+payload_add!(4usize, 74usize, 78usize);
+payload_add!(4usize, 75usize, 79usize);
+payload_add!(4usize, 76usize, 80usize);
+payload_add!(4usize, 77usize, 81usize);
+payload_add!(4usize, 78usize, 82usize);
+payload_add!(4usize, 79usize, 83usize);
+payload_add!(4usize, 80usize, 84usize);
+payload_add!(4usize, 81usize, 85usize);
+payload_add!(4usize, 82usize, 86usize);
+payload_add!(4usize, 83usize, 87usize);
+payload_add!(4usize, 84usize, 88usize);
+payload_add!(4usize, 85usize, 89usize);
+payload_add!(4usize, 86usize, 90usize);
+payload_add!(4usize, 87usize, 91usize);
+payload_add!(4usize, 88usize, 92usize);
+payload_add!(4usize, 89usize, 93usize);
+payload_add!(4usize, 90usize, 94usize);
+payload_add!(4usize, 91usize, 95usize);
+payload_add!(4usize, 92usize, 96usize);
+payload_add!(4usize, 93usize, 97usize);
+payload_add!(4usize, 94usize, 98usize);
+payload_add!(4usize, 95usize, 99usize);
+payload_add!(4usize, 96usize, 100usize);
+payload_add!(4usize, 97usize, 101usize);
+payload_add!(4usize, 98usize, 102usize);
+payload_add!(4usize, 99usize, 103usize);
+payload_add!(4usize, 100usize, 104usize);
+payload_add!(4usize, 101usize, 105usize);
+payload_add!(4usize, 102usize, 106usize);
+payload_add!(4usize, 103usize, 107usize);
+payload_add!(4usize, 104usize, 108usize);
+payload_add!(4usize, 105usize, 109usize);
+payload_add!(4usize, 106usize, 110usize);
+payload_add!(4usize, 107usize, 111usize);
+payload_add!(4usize, 108usize, 112usize);
+payload_add!(4usize, 109usize, 113usize);
+payload_add!(4usize, 110usize, 114usize);
+payload_add!(4usize, 111usize, 115usize);
+payload_add!(4usize, 112usize, 116usize);
+payload_add!(4usize, 113usize, 117usize);
+payload_add!(4usize, 114usize, 118usize);
+payload_add!(4usize, 115usize, 119usize);
+payload_add!(4usize, 116usize, 120usize);
+payload_add!(4usize, 117usize, 121usize);
+payload_add!(4usize, 118usize, 122usize);
+payload_add!(4usize, 119usize, 123usize);
+payload_add!(4usize, 120usize, 124usize);
+payload_add!(4usize, 121usize, 125usize);
+payload_add!(4usize, 122usize, 126usize);
+payload_add!(4usize, 123usize, 127usize);
+payload_add!(4usize, 124usize, 128usize);
+payload_add!(4usize, 125usize, 129usize);
+payload_add!(4usize, 126usize, 130usize);
+payload_add!(4usize, 127usize, 131usize);
+payload_add!(4usize, 128usize, 132usize);
 payload_add!(5usize, 1usize, 6usize);
 payload_add!(5usize, 2usize, 7usize);
 payload_add!(5usize, 3usize, 8usize);
@@ -325,6 +645,86 @@ payload_add!(5usize, 45usize, 50usize);
 payload_add!(5usize, 46usize, 51usize);
 payload_add!(5usize, 47usize, 52usize);
 payload_add!(5usize, 48usize, 53usize);
+payload_add!(5usize, 49usize, 54usize);
+payload_add!(5usize, 50usize, 55usize);
+payload_add!(5usize, 51usize, 56usize);
+payload_add!(5usize, 52usize, 57usize);
+payload_add!(5usize, 53usize, 58usize);
+payload_add!(5usize, 54usize, 59usize);
+payload_add!(5usize, 55usize, 60usize);
+payload_add!(5usize, 56usize, 61usize);
+payload_add!(5usize, 57usize, 62usize);
+payload_add!(5usize, 58usize, 63usize);
+payload_add!(5usize, 59usize, 64usize);
+payload_add!(5usize, 60usize, 65usize);
+payload_add!(5usize, 61usize, 66usize);
+payload_add!(5usize, 62usize, 67usize);
+payload_add!(5usize, 63usize, 68usize);
+payload_add!(5usize, 64usize, 69usize);
+payload_add!(5usize, 65usize, 70usize);
+payload_add!(5usize, 66usize, 71usize);
+payload_add!(5usize, 67usize, 72usize);
+payload_add!(5usize, 68usize, 73usize);
+payload_add!(5usize, 69usize, 74usize);
+payload_add!(5usize, 70usize, 75usize);
+payload_add!(5usize, 71usize, 76usize);
+payload_add!(5usize, 72usize, 77usize);
+payload_add!(5usize, 73usize, 78usize);
+payload_add!(5usize, 74usize, 79usize);
+payload_add!(5usize, 75usize, 80usize);
+payload_add!(5usize, 76usize, 81usize);
+payload_add!(5usize, 77usize, 82usize);
+payload_add!(5usize, 78usize, 83usize);
+payload_add!(5usize, 79usize, 84usize);
+payload_add!(5usize, 80usize, 85usize);
+payload_add!(5usize, 81usize, 86usize);
+payload_add!(5usize, 82usize, 87usize);
+payload_add!(5usize, 83usize, 88usize);
+payload_add!(5usize, 84usize, 89usize);
+payload_add!(5usize, 85usize, 90usize);
+payload_add!(5usize, 86usize, 91usize);
+payload_add!(5usize, 87usize, 92usize);
+payload_add!(5usize, 88usize, 93usize);
+payload_add!(5usize, 89usize, 94usize);
+payload_add!(5usize, 90usize, 95usize);
+payload_add!(5usize, 91usize, 96usize);
+payload_add!(5usize, 92usize, 97usize);
+payload_add!(5usize, 93usize, 98usize);
+payload_add!(5usize, 94usize, 99usize);
+payload_add!(5usize, 95usize, 100usize);
+payload_add!(5usize, 96usize, 101usize);
+payload_add!(5usize, 97usize, 102usize);
+payload_add!(5usize, 98usize, 103usize);
+payload_add!(5usize, 99usize, 104usize);
+payload_add!(5usize, 100usize, 105usize);
+payload_add!(5usize, 101usize, 106usize);
+payload_add!(5usize, 102usize, 107usize);
+payload_add!(5usize, 103usize, 108usize);
+payload_add!(5usize, 104usize, 109usize);
+payload_add!(5usize, 105usize, 110usize);
+payload_add!(5usize, 106usize, 111usize);
+payload_add!(5usize, 107usize, 112usize);
+payload_add!(5usize, 108usize, 113usize);
+payload_add!(5usize, 109usize, 114usize);
+payload_add!(5usize, 110usize, 115usize);
+payload_add!(5usize, 111usize, 116usize);
+payload_add!(5usize, 112usize, 117usize);
+payload_add!(5usize, 113usize, 118usize);
+payload_add!(5usize, 114usize, 119usize);
+payload_add!(5usize, 115usize, 120usize);
+payload_add!(5usize, 116usize, 121usize);
+payload_add!(5usize, 117usize, 122usize);
+payload_add!(5usize, 118usize, 123usize);
+payload_add!(5usize, 119usize, 124usize);
+payload_add!(5usize, 120usize, 125usize);
+payload_add!(5usize, 121usize, 126usize);
+payload_add!(5usize, 122usize, 127usize);
+payload_add!(5usize, 123usize, 128usize);
+payload_add!(5usize, 124usize, 129usize);
+payload_add!(5usize, 125usize, 130usize);
+payload_add!(5usize, 126usize, 131usize);
+payload_add!(5usize, 127usize, 132usize);
+payload_add!(5usize, 128usize, 133usize);
 payload_add!(6usize, 1usize, 7usize);
 payload_add!(6usize, 2usize, 8usize);
 payload_add!(6usize, 3usize, 9usize);
@@ -373,6 +773,86 @@ payload_add!(6usize, 45usize, 51usize);
 payload_add!(6usize, 46usize, 52usize);
 payload_add!(6usize, 47usize, 53usize);
 payload_add!(6usize, 48usize, 54usize);
+payload_add!(6usize, 49usize, 55usize);
+payload_add!(6usize, 50usize, 56usize);
+payload_add!(6usize, 51usize, 57usize);
+payload_add!(6usize, 52usize, 58usize);
+payload_add!(6usize, 53usize, 59usize);
+payload_add!(6usize, 54usize, 60usize);
+payload_add!(6usize, 55usize, 61usize);
+payload_add!(6usize, 56usize, 62usize);
+payload_add!(6usize, 57usize, 63usize);
+payload_add!(6usize, 58usize, 64usize);
+payload_add!(6usize, 59usize, 65usize);
+payload_add!(6usize, 60usize, 66usize);
+payload_add!(6usize, 61usize, 67usize);
+payload_add!(6usize, 62usize, 68usize);
+payload_add!(6usize, 63usize, 69usize);
+payload_add!(6usize, 64usize, 70usize);
+payload_add!(6usize, 65usize, 71usize);
+payload_add!(6usize, 66usize, 72usize);
+payload_add!(6usize, 67usize, 73usize);
+payload_add!(6usize, 68usize, 74usize);
+payload_add!(6usize, 69usize, 75usize);
+payload_add!(6usize, 70usize, 76usize);
+payload_add!(6usize, 71usize, 77usize);
+payload_add!(6usize, 72usize, 78usize);
+payload_add!(6usize, 73usize, 79usize);
+payload_add!(6usize, 74usize, 80usize);
+payload_add!(6usize, 75usize, 81usize);
+payload_add!(6usize, 76usize, 82usize);
+payload_add!(6usize, 77usize, 83usize);
+payload_add!(6usize, 78usize, 84usize);
+payload_add!(6usize, 79usize, 85usize);
+payload_add!(6usize, 80usize, 86usize);
+payload_add!(6usize, 81usize, 87usize);
+payload_add!(6usize, 82usize, 88usize);
+payload_add!(6usize, 83usize, 89usize);
+payload_add!(6usize, 84usize, 90usize);
+payload_add!(6usize, 85usize, 91usize);
+payload_add!(6usize, 86usize, 92usize);
+payload_add!(6usize, 87usize, 93usize);
+payload_add!(6usize, 88usize, 94usize);
+payload_add!(6usize, 89usize, 95usize);
+payload_add!(6usize, 90usize, 96usize);
+payload_add!(6usize, 91usize, 97usize);
+payload_add!(6usize, 92usize, 98usize);
+payload_add!(6usize, 93usize, 99usize);
+payload_add!(6usize, 94usize, 100usize);
+payload_add!(6usize, 95usize, 101usize);
+payload_add!(6usize, 96usize, 102usize);
+payload_add!(6usize, 97usize, 103usize);
+payload_add!(6usize, 98usize, 104usize);
+payload_add!(6usize, 99usize, 105usize);
+payload_add!(6usize, 100usize, 106usize);
+payload_add!(6usize, 101usize, 107usize);
+payload_add!(6usize, 102usize, 108usize);
+payload_add!(6usize, 103usize, 109usize);
+payload_add!(6usize, 104usize, 110usize);
+payload_add!(6usize, 105usize, 111usize);
+payload_add!(6usize, 106usize, 112usize);
+payload_add!(6usize, 107usize, 113usize);
+payload_add!(6usize, 108usize, 114usize);
+payload_add!(6usize, 109usize, 115usize);
+payload_add!(6usize, 110usize, 116usize);
+payload_add!(6usize, 111usize, 117usize);
+payload_add!(6usize, 112usize, 118usize);
+payload_add!(6usize, 113usize, 119usize);
+payload_add!(6usize, 114usize, 120usize);
+payload_add!(6usize, 115usize, 121usize);
+payload_add!(6usize, 116usize, 122usize);
+payload_add!(6usize, 117usize, 123usize);
+payload_add!(6usize, 118usize, 124usize);
+payload_add!(6usize, 119usize, 125usize);
+payload_add!(6usize, 120usize, 126usize);
+payload_add!(6usize, 121usize, 127usize);
+payload_add!(6usize, 122usize, 128usize);
+payload_add!(6usize, 123usize, 129usize);
+payload_add!(6usize, 124usize, 130usize);
+payload_add!(6usize, 125usize, 131usize);
+payload_add!(6usize, 126usize, 132usize);
+payload_add!(6usize, 127usize, 133usize);
+payload_add!(6usize, 128usize, 134usize);
 payload_add!(7usize, 1usize, 8usize);
 payload_add!(7usize, 2usize, 9usize);
 payload_add!(7usize, 3usize, 10usize);
@@ -421,6 +901,86 @@ payload_add!(7usize, 45usize, 52usize);
 payload_add!(7usize, 46usize, 53usize);
 payload_add!(7usize, 47usize, 54usize);
 payload_add!(7usize, 48usize, 55usize);
+payload_add!(7usize, 49usize, 56usize);
+payload_add!(7usize, 50usize, 57usize);
+payload_add!(7usize, 51usize, 58usize);
+payload_add!(7usize, 52usize, 59usize);
+payload_add!(7usize, 53usize, 60usize);
+payload_add!(7usize, 54usize, 61usize);
+payload_add!(7usize, 55usize, 62usize);
+payload_add!(7usize, 56usize, 63usize);
+payload_add!(7usize, 57usize, 64usize);
+payload_add!(7usize, 58usize, 65usize);
+payload_add!(7usize, 59usize, 66usize);
+payload_add!(7usize, 60usize, 67usize);
+payload_add!(7usize, 61usize, 68usize);
+payload_add!(7usize, 62usize, 69usize);
+payload_add!(7usize, 63usize, 70usize);
+payload_add!(7usize, 64usize, 71usize);
+payload_add!(7usize, 65usize, 72usize);
+payload_add!(7usize, 66usize, 73usize);
+payload_add!(7usize, 67usize, 74usize);
+payload_add!(7usize, 68usize, 75usize);
+payload_add!(7usize, 69usize, 76usize);
+payload_add!(7usize, 70usize, 77usize);
+payload_add!(7usize, 71usize, 78usize);
+payload_add!(7usize, 72usize, 79usize);
+payload_add!(7usize, 73usize, 80usize);
+payload_add!(7usize, 74usize, 81usize);
+payload_add!(7usize, 75usize, 82usize);
+payload_add!(7usize, 76usize, 83usize);
+payload_add!(7usize, 77usize, 84usize);
+payload_add!(7usize, 78usize, 85usize);
+payload_add!(7usize, 79usize, 86usize);
+payload_add!(7usize, 80usize, 87usize);
+payload_add!(7usize, 81usize, 88usize);
+payload_add!(7usize, 82usize, 89usize);
+payload_add!(7usize, 83usize, 90usize);
+payload_add!(7usize, 84usize, 91usize);
+payload_add!(7usize, 85usize, 92usize);
+payload_add!(7usize, 86usize, 93usize);
+payload_add!(7usize, 87usize, 94usize);
+payload_add!(7usize, 88usize, 95usize);
+payload_add!(7usize, 89usize, 96usize);
+payload_add!(7usize, 90usize, 97usize);
+payload_add!(7usize, 91usize, 98usize);
+payload_add!(7usize, 92usize, 99usize);
+payload_add!(7usize, 93usize, 100usize);
+payload_add!(7usize, 94usize, 101usize);
+payload_add!(7usize, 95usize, 102usize);
+payload_add!(7usize, 96usize, 103usize);
+payload_add!(7usize, 97usize, 104usize);
+payload_add!(7usize, 98usize, 105usize);
+payload_add!(7usize, 99usize, 106usize);
+payload_add!(7usize, 100usize, 107usize);
+payload_add!(7usize, 101usize, 108usize);
+payload_add!(7usize, 102usize, 109usize);
+payload_add!(7usize, 103usize, 110usize);
+payload_add!(7usize, 104usize, 111usize);
+payload_add!(7usize, 105usize, 112usize);
+payload_add!(7usize, 106usize, 113usize);
+payload_add!(7usize, 107usize, 114usize);
+payload_add!(7usize, 108usize, 115usize);
+payload_add!(7usize, 109usize, 116usize);
+payload_add!(7usize, 110usize, 117usize);
+payload_add!(7usize, 111usize, 118usize);
+payload_add!(7usize, 112usize, 119usize);
+payload_add!(7usize, 113usize, 120usize);
+payload_add!(7usize, 114usize, 121usize);
+payload_add!(7usize, 115usize, 122usize);
+payload_add!(7usize, 116usize, 123usize);
+payload_add!(7usize, 117usize, 124usize);
+payload_add!(7usize, 118usize, 125usize);
+payload_add!(7usize, 119usize, 126usize);
+payload_add!(7usize, 120usize, 127usize);
+payload_add!(7usize, 121usize, 128usize);
+payload_add!(7usize, 122usize, 129usize);
+payload_add!(7usize, 123usize, 130usize);
+payload_add!(7usize, 124usize, 131usize);
+payload_add!(7usize, 125usize, 132usize);
+payload_add!(7usize, 126usize, 133usize);
+payload_add!(7usize, 127usize, 134usize);
+payload_add!(7usize, 128usize, 135usize);
 payload_add!(8usize, 1usize, 9usize);
 payload_add!(8usize, 2usize, 10usize);
 payload_add!(8usize, 3usize, 11usize);
@@ -469,6 +1029,86 @@ payload_add!(8usize, 45usize, 53usize);
 payload_add!(8usize, 46usize, 54usize);
 payload_add!(8usize, 47usize, 55usize);
 payload_add!(8usize, 48usize, 56usize);
+payload_add!(8usize, 49usize, 57usize);
+payload_add!(8usize, 50usize, 58usize);
+payload_add!(8usize, 51usize, 59usize);
+payload_add!(8usize, 52usize, 60usize);
+payload_add!(8usize, 53usize, 61usize);
+payload_add!(8usize, 54usize, 62usize);
+payload_add!(8usize, 55usize, 63usize);
+payload_add!(8usize, 56usize, 64usize);
+payload_add!(8usize, 57usize, 65usize);
+payload_add!(8usize, 58usize, 66usize);
+payload_add!(8usize, 59usize, 67usize);
+payload_add!(8usize, 60usize, 68usize);
+payload_add!(8usize, 61usize, 69usize);
+payload_add!(8usize, 62usize, 70usize);
+payload_add!(8usize, 63usize, 71usize);
+payload_add!(8usize, 64usize, 72usize);
+payload_add!(8usize, 65usize, 73usize);
+payload_add!(8usize, 66usize, 74usize);
+payload_add!(8usize, 67usize, 75usize);
+payload_add!(8usize, 68usize, 76usize);
+payload_add!(8usize, 69usize, 77usize);
+payload_add!(8usize, 70usize, 78usize);
+payload_add!(8usize, 71usize, 79usize);
+payload_add!(8usize, 72usize, 80usize);
+payload_add!(8usize, 73usize, 81usize);
+payload_add!(8usize, 74usize, 82usize);
+payload_add!(8usize, 75usize, 83usize);
+payload_add!(8usize, 76usize, 84usize);
+payload_add!(8usize, 77usize, 85usize);
+payload_add!(8usize, 78usize, 86usize);
+payload_add!(8usize, 79usize, 87usize);
+payload_add!(8usize, 80usize, 88usize);
+payload_add!(8usize, 81usize, 89usize);
+payload_add!(8usize, 82usize, 90usize);
+payload_add!(8usize, 83usize, 91usize);
+payload_add!(8usize, 84usize, 92usize);
+payload_add!(8usize, 85usize, 93usize);
+payload_add!(8usize, 86usize, 94usize);
+payload_add!(8usize, 87usize, 95usize);
+payload_add!(8usize, 88usize, 96usize);
+payload_add!(8usize, 89usize, 97usize);
+payload_add!(8usize, 90usize, 98usize);
+payload_add!(8usize, 91usize, 99usize);
+payload_add!(8usize, 92usize, 100usize);
+payload_add!(8usize, 93usize, 101usize);
+payload_add!(8usize, 94usize, 102usize);
+payload_add!(8usize, 95usize, 103usize);
+payload_add!(8usize, 96usize, 104usize);
+payload_add!(8usize, 97usize, 105usize);
+payload_add!(8usize, 98usize, 106usize);
+payload_add!(8usize, 99usize, 107usize);
+payload_add!(8usize, 100usize, 108usize);
+payload_add!(8usize, 101usize, 109usize);
+payload_add!(8usize, 102usize, 110usize);
+payload_add!(8usize, 103usize, 111usize);
+payload_add!(8usize, 104usize, 112usize);
+payload_add!(8usize, 105usize, 113usize);
+payload_add!(8usize, 106usize, 114usize);
+payload_add!(8usize, 107usize, 115usize);
+payload_add!(8usize, 108usize, 116usize);
+payload_add!(8usize, 109usize, 117usize);
+payload_add!(8usize, 110usize, 118usize);
+payload_add!(8usize, 111usize, 119usize);
+payload_add!(8usize, 112usize, 120usize);
+payload_add!(8usize, 113usize, 121usize);
+payload_add!(8usize, 114usize, 122usize);
+payload_add!(8usize, 115usize, 123usize);
+payload_add!(8usize, 116usize, 124usize);
+payload_add!(8usize, 117usize, 125usize);
+payload_add!(8usize, 118usize, 126usize);
+payload_add!(8usize, 119usize, 127usize);
+payload_add!(8usize, 120usize, 128usize);
+payload_add!(8usize, 121usize, 129usize);
+payload_add!(8usize, 122usize, 130usize);
+payload_add!(8usize, 123usize, 131usize);
+payload_add!(8usize, 124usize, 132usize);
+payload_add!(8usize, 125usize, 133usize);
+payload_add!(8usize, 126usize, 134usize);
+payload_add!(8usize, 127usize, 135usize);
+payload_add!(8usize, 128usize, 136usize);
 payload_add!(9usize, 1usize, 10usize);
 payload_add!(9usize, 2usize, 11usize);
 payload_add!(9usize, 3usize, 12usize);
@@ -517,6 +1157,86 @@ payload_add!(9usize, 45usize, 54usize);
 payload_add!(9usize, 46usize, 55usize);
 payload_add!(9usize, 47usize, 56usize);
 payload_add!(9usize, 48usize, 57usize);
+payload_add!(9usize, 49usize, 58usize);
+payload_add!(9usize, 50usize, 59usize);
+payload_add!(9usize, 51usize, 60usize);
+payload_add!(9usize, 52usize, 61usize);
+payload_add!(9usize, 53usize, 62usize);
+payload_add!(9usize, 54usize, 63usize);
+payload_add!(9usize, 55usize, 64usize);
+payload_add!(9usize, 56usize, 65usize);
+payload_add!(9usize, 57usize, 66usize);
+payload_add!(9usize, 58usize, 67usize);
+payload_add!(9usize, 59usize, 68usize);
+payload_add!(9usize, 60usize, 69usize);
+payload_add!(9usize, 61usize, 70usize);
+payload_add!(9usize, 62usize, 71usize);
+payload_add!(9usize, 63usize, 72usize);
+payload_add!(9usize, 64usize, 73usize);
+payload_add!(9usize, 65usize, 74usize);
+payload_add!(9usize, 66usize, 75usize);
+payload_add!(9usize, 67usize, 76usize);
+payload_add!(9usize, 68usize, 77usize);
+payload_add!(9usize, 69usize, 78usize);
+payload_add!(9usize, 70usize, 79usize);
+payload_add!(9usize, 71usize, 80usize);
+payload_add!(9usize, 72usize, 81usize);
+payload_add!(9usize, 73usize, 82usize);
+payload_add!(9usize, 74usize, 83usize);
+payload_add!(9usize, 75usize, 84usize);
+payload_add!(9usize, 76usize, 85usize);
+payload_add!(9usize, 77usize, 86usize);
+payload_add!(9usize, 78usize, 87usize);
+payload_add!(9usize, 79usize, 88usize);
+payload_add!(9usize, 80usize, 89usize);
+payload_add!(9usize, 81usize, 90usize);
+payload_add!(9usize, 82usize, 91usize);
+payload_add!(9usize, 83usize, 92usize);
+payload_add!(9usize, 84usize, 93usize);
+payload_add!(9usize, 85usize, 94usize);
+payload_add!(9usize, 86usize, 95usize);
+payload_add!(9usize, 87usize, 96usize);
+payload_add!(9usize, 88usize, 97usize);
+payload_add!(9usize, 89usize, 98usize);
+payload_add!(9usize, 90usize, 99usize);
+payload_add!(9usize, 91usize, 100usize);
+payload_add!(9usize, 92usize, 101usize);
+payload_add!(9usize, 93usize, 102usize);
+payload_add!(9usize, 94usize, 103usize);
+payload_add!(9usize, 95usize, 104usize);
+payload_add!(9usize, 96usize, 105usize);
+payload_add!(9usize, 97usize, 106usize);
+payload_add!(9usize, 98usize, 107usize);
+payload_add!(9usize, 99usize, 108usize);
+payload_add!(9usize, 100usize, 109usize);
+payload_add!(9usize, 101usize, 110usize);
+payload_add!(9usize, 102usize, 111usize);
+payload_add!(9usize, 103usize, 112usize);
+payload_add!(9usize, 104usize, 113usize);
+payload_add!(9usize, 105usize, 114usize);
+payload_add!(9usize, 106usize, 115usize);
+payload_add!(9usize, 107usize, 116usize);
+payload_add!(9usize, 108usize, 117usize);
+payload_add!(9usize, 109usize, 118usize);
+payload_add!(9usize, 110usize, 119usize);
+payload_add!(9usize, 111usize, 120usize);
+payload_add!(9usize, 112usize, 121usize);
+payload_add!(9usize, 113usize, 122usize);
+payload_add!(9usize, 114usize, 123usize);
+payload_add!(9usize, 115usize, 124usize);
+payload_add!(9usize, 116usize, 125usize);
+payload_add!(9usize, 117usize, 126usize);
+payload_add!(9usize, 118usize, 127usize);
+payload_add!(9usize, 119usize, 128usize);
+payload_add!(9usize, 120usize, 129usize);
+payload_add!(9usize, 121usize, 130usize);
+payload_add!(9usize, 122usize, 131usize);
+payload_add!(9usize, 123usize, 132usize);
+payload_add!(9usize, 124usize, 133usize);
+payload_add!(9usize, 125usize, 134usize);
+payload_add!(9usize, 126usize, 135usize);
+payload_add!(9usize, 127usize, 136usize);
+payload_add!(9usize, 128usize, 137usize);
 payload_add!(10usize, 1usize, 11usize);
 payload_add!(10usize, 2usize, 12usize);
 payload_add!(10usize, 3usize, 13usize);
@@ -565,6 +1285,86 @@ payload_add!(10usize, 45usize, 55usize);
 payload_add!(10usize, 46usize, 56usize);
 payload_add!(10usize, 47usize, 57usize);
 payload_add!(10usize, 48usize, 58usize);
+payload_add!(10usize, 49usize, 59usize);
+payload_add!(10usize, 50usize, 60usize);
+payload_add!(10usize, 51usize, 61usize);
+payload_add!(10usize, 52usize, 62usize);
+payload_add!(10usize, 53usize, 63usize);
+payload_add!(10usize, 54usize, 64usize);
+payload_add!(10usize, 55usize, 65usize);
+payload_add!(10usize, 56usize, 66usize);
+payload_add!(10usize, 57usize, 67usize);
+payload_add!(10usize, 58usize, 68usize);
+payload_add!(10usize, 59usize, 69usize);
+payload_add!(10usize, 60usize, 70usize);
+payload_add!(10usize, 61usize, 71usize);
+payload_add!(10usize, 62usize, 72usize);
+payload_add!(10usize, 63usize, 73usize);
+payload_add!(10usize, 64usize, 74usize);
+payload_add!(10usize, 65usize, 75usize);
+payload_add!(10usize, 66usize, 76usize);
+payload_add!(10usize, 67usize, 77usize);
+payload_add!(10usize, 68usize, 78usize);
+payload_add!(10usize, 69usize, 79usize);
+payload_add!(10usize, 70usize, 80usize);
+payload_add!(10usize, 71usize, 81usize);
+payload_add!(10usize, 72usize, 82usize);
+payload_add!(10usize, 73usize, 83usize);
+payload_add!(10usize, 74usize, 84usize);
+payload_add!(10usize, 75usize, 85usize);
+payload_add!(10usize, 76usize, 86usize);
+payload_add!(10usize, 77usize, 87usize);
+payload_add!(10usize, 78usize, 88usize);
+payload_add!(10usize, 79usize, 89usize);
+payload_add!(10usize, 80usize, 90usize);
+payload_add!(10usize, 81usize, 91usize);
+payload_add!(10usize, 82usize, 92usize);
+payload_add!(10usize, 83usize, 93usize);
+payload_add!(10usize, 84usize, 94usize);
+payload_add!(10usize, 85usize, 95usize);
+payload_add!(10usize, 86usize, 96usize);
+payload_add!(10usize, 87usize, 97usize);
+payload_add!(10usize, 88usize, 98usize);
+payload_add!(10usize, 89usize, 99usize);
+payload_add!(10usize, 90usize, 100usize);
+payload_add!(10usize, 91usize, 101usize);
+payload_add!(10usize, 92usize, 102usize);
+payload_add!(10usize, 93usize, 103usize);
+payload_add!(10usize, 94usize, 104usize);
+payload_add!(10usize, 95usize, 105usize);
+payload_add!(10usize, 96usize, 106usize);
+payload_add!(10usize, 97usize, 107usize);
+payload_add!(10usize, 98usize, 108usize);
+payload_add!(10usize, 99usize, 109usize);
+payload_add!(10usize, 100usize, 110usize);
+payload_add!(10usize, 101usize, 111usize);
+payload_add!(10usize, 102usize, 112usize);
+payload_add!(10usize, 103usize, 113usize);
+payload_add!(10usize, 104usize, 114usize);
+payload_add!(10usize, 105usize, 115usize);
+payload_add!(10usize, 106usize, 116usize);
+payload_add!(10usize, 107usize, 117usize);
+payload_add!(10usize, 108usize, 118usize);
+payload_add!(10usize, 109usize, 119usize);
+payload_add!(10usize, 110usize, 120usize);
+payload_add!(10usize, 111usize, 121usize);
+payload_add!(10usize, 112usize, 122usize);
+payload_add!(10usize, 113usize, 123usize);
+payload_add!(10usize, 114usize, 124usize);
+payload_add!(10usize, 115usize, 125usize);
+payload_add!(10usize, 116usize, 126usize);
+payload_add!(10usize, 117usize, 127usize);
+payload_add!(10usize, 118usize, 128usize);
+payload_add!(10usize, 119usize, 129usize);
+payload_add!(10usize, 120usize, 130usize);
+payload_add!(10usize, 121usize, 131usize);
+payload_add!(10usize, 122usize, 132usize);
+payload_add!(10usize, 123usize, 133usize);
+payload_add!(10usize, 124usize, 134usize);
+payload_add!(10usize, 125usize, 135usize);
+payload_add!(10usize, 126usize, 136usize);
+payload_add!(10usize, 127usize, 137usize);
+payload_add!(10usize, 128usize, 138usize);
 payload_add!(11usize, 1usize, 12usize);
 payload_add!(11usize, 2usize, 13usize);
 payload_add!(11usize, 3usize, 14usize);
@@ -613,6 +1413,86 @@ payload_add!(11usize, 45usize, 56usize);
 payload_add!(11usize, 46usize, 57usize);
 payload_add!(11usize, 47usize, 58usize);
 payload_add!(11usize, 48usize, 59usize);
+payload_add!(11usize, 49usize, 60usize);
+payload_add!(11usize, 50usize, 61usize);
+payload_add!(11usize, 51usize, 62usize);
+payload_add!(11usize, 52usize, 63usize);
+payload_add!(11usize, 53usize, 64usize);
+payload_add!(11usize, 54usize, 65usize);
+payload_add!(11usize, 55usize, 66usize);
+payload_add!(11usize, 56usize, 67usize);
+payload_add!(11usize, 57usize, 68usize);
+payload_add!(11usize, 58usize, 69usize);
+payload_add!(11usize, 59usize, 70usize);
+payload_add!(11usize, 60usize, 71usize);
+payload_add!(11usize, 61usize, 72usize);
+payload_add!(11usize, 62usize, 73usize);
+payload_add!(11usize, 63usize, 74usize);
+payload_add!(11usize, 64usize, 75usize);
+payload_add!(11usize, 65usize, 76usize);
+payload_add!(11usize, 66usize, 77usize);
+payload_add!(11usize, 67usize, 78usize);
+payload_add!(11usize, 68usize, 79usize);
+payload_add!(11usize, 69usize, 80usize);
+payload_add!(11usize, 70usize, 81usize);
+payload_add!(11usize, 71usize, 82usize);
+payload_add!(11usize, 72usize, 83usize);
+payload_add!(11usize, 73usize, 84usize);
+payload_add!(11usize, 74usize, 85usize);
+payload_add!(11usize, 75usize, 86usize);
+payload_add!(11usize, 76usize, 87usize);
+payload_add!(11usize, 77usize, 88usize);
+payload_add!(11usize, 78usize, 89usize);
+payload_add!(11usize, 79usize, 90usize);
+payload_add!(11usize, 80usize, 91usize);
+payload_add!(11usize, 81usize, 92usize);
+payload_add!(11usize, 82usize, 93usize);
+payload_add!(11usize, 83usize, 94usize);
+payload_add!(11usize, 84usize, 95usize);
+payload_add!(11usize, 85usize, 96usize);
+payload_add!(11usize, 86usize, 97usize);
+payload_add!(11usize, 87usize, 98usize);
+payload_add!(11usize, 88usize, 99usize);
+payload_add!(11usize, 89usize, 100usize);
+payload_add!(11usize, 90usize, 101usize);
+payload_add!(11usize, 91usize, 102usize);
+payload_add!(11usize, 92usize, 103usize);
+payload_add!(11usize, 93usize, 104usize);
+payload_add!(11usize, 94usize, 105usize);
+payload_add!(11usize, 95usize, 106usize);
+payload_add!(11usize, 96usize, 107usize);
+payload_add!(11usize, 97usize, 108usize);
+payload_add!(11usize, 98usize, 109usize);
+payload_add!(11usize, 99usize, 110usize);
+payload_add!(11usize, 100usize, 111usize);
+payload_add!(11usize, 101usize, 112usize);
+payload_add!(11usize, 102usize, 113usize);
+payload_add!(11usize, 103usize, 114usize);
+payload_add!(11usize, 104usize, 115usize);
+payload_add!(11usize, 105usize, 116usize);
+payload_add!(11usize, 106usize, 117usize);
+payload_add!(11usize, 107usize, 118usize);
+payload_add!(11usize, 108usize, 119usize);
+payload_add!(11usize, 109usize, 120usize);
+payload_add!(11usize, 110usize, 121usize);
+payload_add!(11usize, 111usize, 122usize);
+payload_add!(11usize, 112usize, 123usize);
+payload_add!(11usize, 113usize, 124usize);
+payload_add!(11usize, 114usize, 125usize);
+payload_add!(11usize, 115usize, 126usize);
+payload_add!(11usize, 116usize, 127usize);
+payload_add!(11usize, 117usize, 128usize);
+payload_add!(11usize, 118usize, 129usize);
+payload_add!(11usize, 119usize, 130usize);
+payload_add!(11usize, 120usize, 131usize);
+payload_add!(11usize, 121usize, 132usize);
+payload_add!(11usize, 122usize, 133usize);
+payload_add!(11usize, 123usize, 134usize);
+payload_add!(11usize, 124usize, 135usize);
+payload_add!(11usize, 125usize, 136usize);
+payload_add!(11usize, 126usize, 137usize);
+payload_add!(11usize, 127usize, 138usize);
+payload_add!(11usize, 128usize, 139usize);
 payload_add!(12usize, 1usize, 13usize);
 payload_add!(12usize, 2usize, 14usize);
 payload_add!(12usize, 3usize, 15usize);
@@ -661,6 +1541,86 @@ payload_add!(12usize, 45usize, 57usize);
 payload_add!(12usize, 46usize, 58usize);
 payload_add!(12usize, 47usize, 59usize);
 payload_add!(12usize, 48usize, 60usize);
+payload_add!(12usize, 49usize, 61usize);
+payload_add!(12usize, 50usize, 62usize);
+payload_add!(12usize, 51usize, 63usize);
+payload_add!(12usize, 52usize, 64usize);
+payload_add!(12usize, 53usize, 65usize);
+payload_add!(12usize, 54usize, 66usize);
+payload_add!(12usize, 55usize, 67usize);
+payload_add!(12usize, 56usize, 68usize);
+payload_add!(12usize, 57usize, 69usize);
+payload_add!(12usize, 58usize, 70usize);
+payload_add!(12usize, 59usize, 71usize);
+payload_add!(12usize, 60usize, 72usize);
+payload_add!(12usize, 61usize, 73usize);
+payload_add!(12usize, 62usize, 74usize);
+payload_add!(12usize, 63usize, 75usize);
+payload_add!(12usize, 64usize, 76usize);
+payload_add!(12usize, 65usize, 77usize);
+payload_add!(12usize, 66usize, 78usize);
+payload_add!(12usize, 67usize, 79usize);
+payload_add!(12usize, 68usize, 80usize);
+payload_add!(12usize, 69usize, 81usize);
+payload_add!(12usize, 70usize, 82usize);
+payload_add!(12usize, 71usize, 83usize);
+payload_add!(12usize, 72usize, 84usize);
+payload_add!(12usize, 73usize, 85usize);
+payload_add!(12usize, 74usize, 86usize);
+payload_add!(12usize, 75usize, 87usize);
+payload_add!(12usize, 76usize, 88usize);
+payload_add!(12usize, 77usize, 89usize);
+payload_add!(12usize, 78usize, 90usize);
+payload_add!(12usize, 79usize, 91usize);
+payload_add!(12usize, 80usize, 92usize);
+payload_add!(12usize, 81usize, 93usize);
+payload_add!(12usize, 82usize, 94usize);
+payload_add!(12usize, 83usize, 95usize);
+payload_add!(12usize, 84usize, 96usize);
+payload_add!(12usize, 85usize, 97usize);
+payload_add!(12usize, 86usize, 98usize);
+payload_add!(12usize, 87usize, 99usize);
+payload_add!(12usize, 88usize, 100usize);
+payload_add!(12usize, 89usize, 101usize);
+payload_add!(12usize, 90usize, 102usize);
+payload_add!(12usize, 91usize, 103usize);
+payload_add!(12usize, 92usize, 104usize);
+payload_add!(12usize, 93usize, 105usize);
+payload_add!(12usize, 94usize, 106usize);
+payload_add!(12usize, 95usize, 107usize);
+payload_add!(12usize, 96usize, 108usize);
+payload_add!(12usize, 97usize, 109usize);
+payload_add!(12usize, 98usize, 110usize);
+payload_add!(12usize, 99usize, 111usize);
+payload_add!(12usize, 100usize, 112usize);
+payload_add!(12usize, 101usize, 113usize);
+payload_add!(12usize, 102usize, 114usize);
+payload_add!(12usize, 103usize, 115usize);
+payload_add!(12usize, 104usize, 116usize);
+payload_add!(12usize, 105usize, 117usize);
+payload_add!(12usize, 106usize, 118usize);
+payload_add!(12usize, 107usize, 119usize);
+payload_add!(12usize, 108usize, 120usize);
+payload_add!(12usize, 109usize, 121usize);
+payload_add!(12usize, 110usize, 122usize);
+payload_add!(12usize, 111usize, 123usize);
+payload_add!(12usize, 112usize, 124usize);
+payload_add!(12usize, 113usize, 125usize);
+payload_add!(12usize, 114usize, 126usize);
+payload_add!(12usize, 115usize, 127usize);
+payload_add!(12usize, 116usize, 128usize);
+payload_add!(12usize, 117usize, 129usize);
+payload_add!(12usize, 118usize, 130usize);
+payload_add!(12usize, 119usize, 131usize);
+payload_add!(12usize, 120usize, 132usize);
+payload_add!(12usize, 121usize, 133usize);
+payload_add!(12usize, 122usize, 134usize);
+payload_add!(12usize, 123usize, 135usize);
+payload_add!(12usize, 124usize, 136usize);
+payload_add!(12usize, 125usize, 137usize);
+payload_add!(12usize, 126usize, 138usize);
+payload_add!(12usize, 127usize, 139usize);
+payload_add!(12usize, 128usize, 140usize);
 payload_add!(13usize, 1usize, 14usize);
 payload_add!(13usize, 2usize, 15usize);
 payload_add!(13usize, 3usize, 16usize);
@@ -709,6 +1669,86 @@ payload_add!(13usize, 45usize, 58usize);
 payload_add!(13usize, 46usize, 59usize);
 payload_add!(13usize, 47usize, 60usize);
 payload_add!(13usize, 48usize, 61usize);
+payload_add!(13usize, 49usize, 62usize);
+payload_add!(13usize, 50usize, 63usize);
+payload_add!(13usize, 51usize, 64usize);
+payload_add!(13usize, 52usize, 65usize);
+payload_add!(13usize, 53usize, 66usize);
+payload_add!(13usize, 54usize, 67usize);
+payload_add!(13usize, 55usize, 68usize);
+payload_add!(13usize, 56usize, 69usize);
+payload_add!(13usize, 57usize, 70usize);
+payload_add!(13usize, 58usize, 71usize);
+payload_add!(13usize, 59usize, 72usize);
+payload_add!(13usize, 60usize, 73usize);
+payload_add!(13usize, 61usize, 74usize);
+payload_add!(13usize, 62usize, 75usize);
+payload_add!(13usize, 63usize, 76usize);
+payload_add!(13usize, 64usize, 77usize);
+payload_add!(13usize, 65usize, 78usize);
+payload_add!(13usize, 66usize, 79usize);
+payload_add!(13usize, 67usize, 80usize);
+payload_add!(13usize, 68usize, 81usize);
+payload_add!(13usize, 69usize, 82usize);
+payload_add!(13usize, 70usize, 83usize);
+payload_add!(13usize, 71usize, 84usize);
+payload_add!(13usize, 72usize, 85usize);
+payload_add!(13usize, 73usize, 86usize);
+payload_add!(13usize, 74usize, 87usize);
+payload_add!(13usize, 75usize, 88usize);
+payload_add!(13usize, 76usize, 89usize);
+payload_add!(13usize, 77usize, 90usize);
+payload_add!(13usize, 78usize, 91usize);
+payload_add!(13usize, 79usize, 92usize);
+payload_add!(13usize, 80usize, 93usize);
+payload_add!(13usize, 81usize, 94usize);
+payload_add!(13usize, 82usize, 95usize);
+payload_add!(13usize, 83usize, 96usize);
+payload_add!(13usize, 84usize, 97usize);
+payload_add!(13usize, 85usize, 98usize);
+payload_add!(13usize, 86usize, 99usize);
+payload_add!(13usize, 87usize, 100usize);
+payload_add!(13usize, 88usize, 101usize);
+payload_add!(13usize, 89usize, 102usize);
+payload_add!(13usize, 90usize, 103usize);
+payload_add!(13usize, 91usize, 104usize);
+payload_add!(13usize, 92usize, 105usize);
+payload_add!(13usize, 93usize, 106usize);
+payload_add!(13usize, 94usize, 107usize);
+payload_add!(13usize, 95usize, 108usize);
+payload_add!(13usize, 96usize, 109usize);
+payload_add!(13usize, 97usize, 110usize);
+payload_add!(13usize, 98usize, 111usize);
+payload_add!(13usize, 99usize, 112usize);
+payload_add!(13usize, 100usize, 113usize);
+payload_add!(13usize, 101usize, 114usize);
+payload_add!(13usize, 102usize, 115usize);
+payload_add!(13usize, 103usize, 116usize);
+payload_add!(13usize, 104usize, 117usize);
+payload_add!(13usize, 105usize, 118usize);
+payload_add!(13usize, 106usize, 119usize);
+payload_add!(13usize, 107usize, 120usize);
+payload_add!(13usize, 108usize, 121usize);
+payload_add!(13usize, 109usize, 122usize);
+payload_add!(13usize, 110usize, 123usize);
+payload_add!(13usize, 111usize, 124usize);
+payload_add!(13usize, 112usize, 125usize);
+payload_add!(13usize, 113usize, 126usize);
+payload_add!(13usize, 114usize, 127usize);
+payload_add!(13usize, 115usize, 128usize);
+payload_add!(13usize, 116usize, 129usize);
+payload_add!(13usize, 117usize, 130usize);
+payload_add!(13usize, 118usize, 131usize);
+payload_add!(13usize, 119usize, 132usize);
+payload_add!(13usize, 120usize, 133usize);
+payload_add!(13usize, 121usize, 134usize);
+payload_add!(13usize, 122usize, 135usize);
+payload_add!(13usize, 123usize, 136usize);
+payload_add!(13usize, 124usize, 137usize);
+payload_add!(13usize, 125usize, 138usize);
+payload_add!(13usize, 126usize, 139usize);
+payload_add!(13usize, 127usize, 140usize);
+payload_add!(13usize, 128usize, 141usize);
 payload_add!(14usize, 1usize, 15usize);
 payload_add!(14usize, 2usize, 16usize);
 payload_add!(14usize, 3usize, 17usize);
@@ -757,6 +1797,86 @@ payload_add!(14usize, 45usize, 59usize);
 payload_add!(14usize, 46usize, 60usize);
 payload_add!(14usize, 47usize, 61usize);
 payload_add!(14usize, 48usize, 62usize);
+payload_add!(14usize, 49usize, 63usize);
+payload_add!(14usize, 50usize, 64usize);
+payload_add!(14usize, 51usize, 65usize);
+payload_add!(14usize, 52usize, 66usize);
+payload_add!(14usize, 53usize, 67usize);
+payload_add!(14usize, 54usize, 68usize);
+payload_add!(14usize, 55usize, 69usize);
+payload_add!(14usize, 56usize, 70usize);
+payload_add!(14usize, 57usize, 71usize);
+payload_add!(14usize, 58usize, 72usize);
+payload_add!(14usize, 59usize, 73usize);
+payload_add!(14usize, 60usize, 74usize);
+payload_add!(14usize, 61usize, 75usize);
+payload_add!(14usize, 62usize, 76usize);
+payload_add!(14usize, 63usize, 77usize);
+payload_add!(14usize, 64usize, 78usize);
+payload_add!(14usize, 65usize, 79usize);
+payload_add!(14usize, 66usize, 80usize);
+payload_add!(14usize, 67usize, 81usize);
+payload_add!(14usize, 68usize, 82usize);
+payload_add!(14usize, 69usize, 83usize);
+payload_add!(14usize, 70usize, 84usize);
+payload_add!(14usize, 71usize, 85usize);
+payload_add!(14usize, 72usize, 86usize);
+payload_add!(14usize, 73usize, 87usize);
+payload_add!(14usize, 74usize, 88usize);
+payload_add!(14usize, 75usize, 89usize);
+payload_add!(14usize, 76usize, 90usize);
+payload_add!(14usize, 77usize, 91usize);
+payload_add!(14usize, 78usize, 92usize);
+payload_add!(14usize, 79usize, 93usize);
+payload_add!(14usize, 80usize, 94usize);
+payload_add!(14usize, 81usize, 95usize);
+payload_add!(14usize, 82usize, 96usize);
+payload_add!(14usize, 83usize, 97usize);
+payload_add!(14usize, 84usize, 98usize);
+payload_add!(14usize, 85usize, 99usize);
+payload_add!(14usize, 86usize, 100usize);
+payload_add!(14usize, 87usize, 101usize);
+payload_add!(14usize, 88usize, 102usize);
+payload_add!(14usize, 89usize, 103usize);
+payload_add!(14usize, 90usize, 104usize);
+payload_add!(14usize, 91usize, 105usize);
+payload_add!(14usize, 92usize, 106usize);
+payload_add!(14usize, 93usize, 107usize);
+payload_add!(14usize, 94usize, 108usize);
+payload_add!(14usize, 95usize, 109usize);
+payload_add!(14usize, 96usize, 110usize);
+payload_add!(14usize, 97usize, 111usize);
+payload_add!(14usize, 98usize, 112usize);
+payload_add!(14usize, 99usize, 113usize);
+payload_add!(14usize, 100usize, 114usize);
+payload_add!(14usize, 101usize, 115usize);
+payload_add!(14usize, 102usize, 116usize);
+payload_add!(14usize, 103usize, 117usize);
+payload_add!(14usize, 104usize, 118usize);
+payload_add!(14usize, 105usize, 119usize);
+payload_add!(14usize, 106usize, 120usize);
+payload_add!(14usize, 107usize, 121usize);
+payload_add!(14usize, 108usize, 122usize);
+payload_add!(14usize, 109usize, 123usize);
+payload_add!(14usize, 110usize, 124usize);
+payload_add!(14usize, 111usize, 125usize);
+payload_add!(14usize, 112usize, 126usize);
+payload_add!(14usize, 113usize, 127usize);
+payload_add!(14usize, 114usize, 128usize);
+payload_add!(14usize, 115usize, 129usize);
+payload_add!(14usize, 116usize, 130usize);
+payload_add!(14usize, 117usize, 131usize);
+payload_add!(14usize, 118usize, 132usize);
+payload_add!(14usize, 119usize, 133usize);
+payload_add!(14usize, 120usize, 134usize);
+payload_add!(14usize, 121usize, 135usize);
+payload_add!(14usize, 122usize, 136usize);
+payload_add!(14usize, 123usize, 137usize);
+payload_add!(14usize, 124usize, 138usize);
+payload_add!(14usize, 125usize, 139usize);
+payload_add!(14usize, 126usize, 140usize);
+payload_add!(14usize, 127usize, 141usize);
+payload_add!(14usize, 128usize, 142usize);
 payload_add!(15usize, 1usize, 16usize);
 payload_add!(15usize, 2usize, 17usize);
 payload_add!(15usize, 3usize, 18usize);
@@ -805,6 +1925,86 @@ payload_add!(15usize, 45usize, 60usize);
 payload_add!(15usize, 46usize, 61usize);
 payload_add!(15usize, 47usize, 62usize);
 payload_add!(15usize, 48usize, 63usize);
+payload_add!(15usize, 49usize, 64usize);
+payload_add!(15usize, 50usize, 65usize);
+payload_add!(15usize, 51usize, 66usize);
+payload_add!(15usize, 52usize, 67usize);
+payload_add!(15usize, 53usize, 68usize);
+payload_add!(15usize, 54usize, 69usize);
+payload_add!(15usize, 55usize, 70usize);
+payload_add!(15usize, 56usize, 71usize);
+payload_add!(15usize, 57usize, 72usize);
+payload_add!(15usize, 58usize, 73usize);
+payload_add!(15usize, 59usize, 74usize);
+payload_add!(15usize, 60usize, 75usize);
+payload_add!(15usize, 61usize, 76usize);
+payload_add!(15usize, 62usize, 77usize);
+payload_add!(15usize, 63usize, 78usize);
+payload_add!(15usize, 64usize, 79usize);
+payload_add!(15usize, 65usize, 80usize);
+payload_add!(15usize, 66usize, 81usize);
+payload_add!(15usize, 67usize, 82usize);
+payload_add!(15usize, 68usize, 83usize);
+payload_add!(15usize, 69usize, 84usize);
+payload_add!(15usize, 70usize, 85usize);
+payload_add!(15usize, 71usize, 86usize);
+payload_add!(15usize, 72usize, 87usize);
+payload_add!(15usize, 73usize, 88usize);
+payload_add!(15usize, 74usize, 89usize);
+payload_add!(15usize, 75usize, 90usize);
+payload_add!(15usize, 76usize, 91usize);
+payload_add!(15usize, 77usize, 92usize);
+payload_add!(15usize, 78usize, 93usize);
+payload_add!(15usize, 79usize, 94usize);
+payload_add!(15usize, 80usize, 95usize);
+payload_add!(15usize, 81usize, 96usize);
+payload_add!(15usize, 82usize, 97usize);
+payload_add!(15usize, 83usize, 98usize);
+payload_add!(15usize, 84usize, 99usize);
+payload_add!(15usize, 85usize, 100usize);
+payload_add!(15usize, 86usize, 101usize);
+payload_add!(15usize, 87usize, 102usize);
+payload_add!(15usize, 88usize, 103usize);
+payload_add!(15usize, 89usize, 104usize);
+payload_add!(15usize, 90usize, 105usize);
+payload_add!(15usize, 91usize, 106usize);
+payload_add!(15usize, 92usize, 107usize);
+payload_add!(15usize, 93usize, 108usize);
+payload_add!(15usize, 94usize, 109usize);
+payload_add!(15usize, 95usize, 110usize);
+payload_add!(15usize, 96usize, 111usize);
+payload_add!(15usize, 97usize, 112usize);
+payload_add!(15usize, 98usize, 113usize);
+payload_add!(15usize, 99usize, 114usize);
+payload_add!(15usize, 100usize, 115usize);
+payload_add!(15usize, 101usize, 116usize);
+payload_add!(15usize, 102usize, 117usize);
+payload_add!(15usize, 103usize, 118usize);
+payload_add!(15usize, 104usize, 119usize);
+payload_add!(15usize, 105usize, 120usize);
+payload_add!(15usize, 106usize, 121usize);
+payload_add!(15usize, 107usize, 122usize);
+payload_add!(15usize, 108usize, 123usize);
+payload_add!(15usize, 109usize, 124usize);
+payload_add!(15usize, 110usize, 125usize);
+payload_add!(15usize, 111usize, 126usize);
+payload_add!(15usize, 112usize, 127usize);
+payload_add!(15usize, 113usize, 128usize);
+payload_add!(15usize, 114usize, 129usize);
+payload_add!(15usize, 115usize, 130usize);
+payload_add!(15usize, 116usize, 131usize);
+payload_add!(15usize, 117usize, 132usize);
+payload_add!(15usize, 118usize, 133usize);
+payload_add!(15usize, 119usize, 134usize);
+payload_add!(15usize, 120usize, 135usize);
+payload_add!(15usize, 121usize, 136usize);
+payload_add!(15usize, 122usize, 137usize);
+payload_add!(15usize, 123usize, 138usize);
+payload_add!(15usize, 124usize, 139usize);
+payload_add!(15usize, 125usize, 140usize);
+payload_add!(15usize, 126usize, 141usize);
+payload_add!(15usize, 127usize, 142usize);
+payload_add!(15usize, 128usize, 143usize);
 payload_add!(16usize, 1usize, 17usize);
 payload_add!(16usize, 2usize, 18usize);
 payload_add!(16usize, 3usize, 19usize);
@@ -853,6 +2053,86 @@ payload_add!(16usize, 45usize, 61usize);
 payload_add!(16usize, 46usize, 62usize);
 payload_add!(16usize, 47usize, 63usize);
 payload_add!(16usize, 48usize, 64usize);
+payload_add!(16usize, 49usize, 65usize);
+payload_add!(16usize, 50usize, 66usize);
+payload_add!(16usize, 51usize, 67usize);
+payload_add!(16usize, 52usize, 68usize);
+payload_add!(16usize, 53usize, 69usize);
+payload_add!(16usize, 54usize, 70usize);
+payload_add!(16usize, 55usize, 71usize);
+payload_add!(16usize, 56usize, 72usize);
+payload_add!(16usize, 57usize, 73usize);
+payload_add!(16usize, 58usize, 74usize);
+payload_add!(16usize, 59usize, 75usize);
+payload_add!(16usize, 60usize, 76usize);
+payload_add!(16usize, 61usize, 77usize);
+payload_add!(16usize, 62usize, 78usize);
+payload_add!(16usize, 63usize, 79usize);
+payload_add!(16usize, 64usize, 80usize);
+payload_add!(16usize, 65usize, 81usize);
+payload_add!(16usize, 66usize, 82usize);
+payload_add!(16usize, 67usize, 83usize);
+payload_add!(16usize, 68usize, 84usize);
+payload_add!(16usize, 69usize, 85usize);
+payload_add!(16usize, 70usize, 86usize);
+payload_add!(16usize, 71usize, 87usize);
+payload_add!(16usize, 72usize, 88usize);
+payload_add!(16usize, 73usize, 89usize);
+payload_add!(16usize, 74usize, 90usize);
+payload_add!(16usize, 75usize, 91usize);
+payload_add!(16usize, 76usize, 92usize);
+payload_add!(16usize, 77usize, 93usize);
+payload_add!(16usize, 78usize, 94usize);
+payload_add!(16usize, 79usize, 95usize);
+payload_add!(16usize, 80usize, 96usize);
+payload_add!(16usize, 81usize, 97usize);
+payload_add!(16usize, 82usize, 98usize);
+payload_add!(16usize, 83usize, 99usize);
+payload_add!(16usize, 84usize, 100usize);
+payload_add!(16usize, 85usize, 101usize);
+payload_add!(16usize, 86usize, 102usize);
+payload_add!(16usize, 87usize, 103usize);
+payload_add!(16usize, 88usize, 104usize);
+payload_add!(16usize, 89usize, 105usize);
+payload_add!(16usize, 90usize, 106usize);
+payload_add!(16usize, 91usize, 107usize);
+payload_add!(16usize, 92usize, 108usize);
+payload_add!(16usize, 93usize, 109usize);
+payload_add!(16usize, 94usize, 110usize);
+payload_add!(16usize, 95usize, 111usize);
+payload_add!(16usize, 96usize, 112usize);
+payload_add!(16usize, 97usize, 113usize);
+payload_add!(16usize, 98usize, 114usize);
+payload_add!(16usize, 99usize, 115usize);
+payload_add!(16usize, 100usize, 116usize);
+payload_add!(16usize, 101usize, 117usize);
+payload_add!(16usize, 102usize, 118usize);
+payload_add!(16usize, 103usize, 119usize);
+payload_add!(16usize, 104usize, 120usize);
+payload_add!(16usize, 105usize, 121usize);
+payload_add!(16usize, 106usize, 122usize);
+payload_add!(16usize, 107usize, 123usize);
+payload_add!(16usize, 108usize, 124usize);
+payload_add!(16usize, 109usize, 125usize);
+payload_add!(16usize, 110usize, 126usize);
+payload_add!(16usize, 111usize, 127usize);
+payload_add!(16usize, 112usize, 128usize);
+payload_add!(16usize, 113usize, 129usize);
+payload_add!(16usize, 114usize, 130usize);
+payload_add!(16usize, 115usize, 131usize);
+payload_add!(16usize, 116usize, 132usize);
+payload_add!(16usize, 117usize, 133usize);
+payload_add!(16usize, 118usize, 134usize);
+payload_add!(16usize, 119usize, 135usize);
+payload_add!(16usize, 120usize, 136usize);
+payload_add!(16usize, 121usize, 137usize);
+payload_add!(16usize, 122usize, 138usize);
+payload_add!(16usize, 123usize, 139usize);
+payload_add!(16usize, 124usize, 140usize);
+payload_add!(16usize, 125usize, 141usize);
+payload_add!(16usize, 126usize, 142usize);
+payload_add!(16usize, 127usize, 143usize);
+payload_add!(16usize, 128usize, 144usize);
 payload_add!(17usize, 1usize, 18usize);
 payload_add!(17usize, 2usize, 19usize);
 payload_add!(17usize, 3usize, 20usize);
@@ -901,6 +2181,86 @@ payload_add!(17usize, 45usize, 62usize);
 payload_add!(17usize, 46usize, 63usize);
 payload_add!(17usize, 47usize, 64usize);
 payload_add!(17usize, 48usize, 65usize);
+payload_add!(17usize, 49usize, 66usize);
+payload_add!(17usize, 50usize, 67usize);
+payload_add!(17usize, 51usize, 68usize);
+payload_add!(17usize, 52usize, 69usize);
+payload_add!(17usize, 53usize, 70usize);
+payload_add!(17usize, 54usize, 71usize);
+payload_add!(17usize, 55usize, 72usize);
+payload_add!(17usize, 56usize, 73usize);
+payload_add!(17usize, 57usize, 74usize);
+payload_add!(17usize, 58usize, 75usize);
+payload_add!(17usize, 59usize, 76usize);
+payload_add!(17usize, 60usize, 77usize);
+payload_add!(17usize, 61usize, 78usize);
+payload_add!(17usize, 62usize, 79usize);
+payload_add!(17usize, 63usize, 80usize);
+payload_add!(17usize, 64usize, 81usize);
+payload_add!(17usize, 65usize, 82usize);
+payload_add!(17usize, 66usize, 83usize);
+payload_add!(17usize, 67usize, 84usize);
+payload_add!(17usize, 68usize, 85usize);
+payload_add!(17usize, 69usize, 86usize);
+payload_add!(17usize, 70usize, 87usize);
+payload_add!(17usize, 71usize, 88usize);
+payload_add!(17usize, 72usize, 89usize);
+payload_add!(17usize, 73usize, 90usize);
+payload_add!(17usize, 74usize, 91usize);
+payload_add!(17usize, 75usize, 92usize);
+payload_add!(17usize, 76usize, 93usize);
+payload_add!(17usize, 77usize, 94usize);
+payload_add!(17usize, 78usize, 95usize);
+payload_add!(17usize, 79usize, 96usize);
+payload_add!(17usize, 80usize, 97usize);
+payload_add!(17usize, 81usize, 98usize);
+payload_add!(17usize, 82usize, 99usize);
+payload_add!(17usize, 83usize, 100usize);
+payload_add!(17usize, 84usize, 101usize);
+payload_add!(17usize, 85usize, 102usize);
+payload_add!(17usize, 86usize, 103usize);
+payload_add!(17usize, 87usize, 104usize);
+payload_add!(17usize, 88usize, 105usize);
+payload_add!(17usize, 89usize, 106usize);
+payload_add!(17usize, 90usize, 107usize);
+payload_add!(17usize, 91usize, 108usize);
+payload_add!(17usize, 92usize, 109usize);
+payload_add!(17usize, 93usize, 110usize);
+payload_add!(17usize, 94usize, 111usize);
+payload_add!(17usize, 95usize, 112usize);
+payload_add!(17usize, 96usize, 113usize);
+payload_add!(17usize, 97usize, 114usize);
+payload_add!(17usize, 98usize, 115usize);
+payload_add!(17usize, 99usize, 116usize);
+payload_add!(17usize, 100usize, 117usize);
+payload_add!(17usize, 101usize, 118usize);
+payload_add!(17usize, 102usize, 119usize);
+payload_add!(17usize, 103usize, 120usize);
+payload_add!(17usize, 104usize, 121usize);
+payload_add!(17usize, 105usize, 122usize);
+payload_add!(17usize, 106usize, 123usize);
+payload_add!(17usize, 107usize, 124usize);
+payload_add!(17usize, 108usize, 125usize);
+payload_add!(17usize, 109usize, 126usize);
+payload_add!(17usize, 110usize, 127usize);
+payload_add!(17usize, 111usize, 128usize);
+payload_add!(17usize, 112usize, 129usize);
+payload_add!(17usize, 113usize, 130usize);
+payload_add!(17usize, 114usize, 131usize);
+payload_add!(17usize, 115usize, 132usize);
+payload_add!(17usize, 116usize, 133usize);
+payload_add!(17usize, 117usize, 134usize);
+payload_add!(17usize, 118usize, 135usize);
+payload_add!(17usize, 119usize, 136usize);
+payload_add!(17usize, 120usize, 137usize);
+payload_add!(17usize, 121usize, 138usize);
+payload_add!(17usize, 122usize, 139usize);
+payload_add!(17usize, 123usize, 140usize);
+payload_add!(17usize, 124usize, 141usize);
+payload_add!(17usize, 125usize, 142usize);
+payload_add!(17usize, 126usize, 143usize);
+payload_add!(17usize, 127usize, 144usize);
+payload_add!(17usize, 128usize, 145usize);
 payload_add!(18usize, 1usize, 19usize);
 payload_add!(18usize, 2usize, 20usize);
 payload_add!(18usize, 3usize, 21usize);
@@ -949,6 +2309,86 @@ payload_add!(18usize, 45usize, 63usize);
 payload_add!(18usize, 46usize, 64usize);
 payload_add!(18usize, 47usize, 65usize);
 payload_add!(18usize, 48usize, 66usize);
+payload_add!(18usize, 49usize, 67usize);
+payload_add!(18usize, 50usize, 68usize);
+payload_add!(18usize, 51usize, 69usize);
+payload_add!(18usize, 52usize, 70usize);
+payload_add!(18usize, 53usize, 71usize);
+payload_add!(18usize, 54usize, 72usize);
+payload_add!(18usize, 55usize, 73usize);
+payload_add!(18usize, 56usize, 74usize);
+payload_add!(18usize, 57usize, 75usize);
+payload_add!(18usize, 58usize, 76usize);
+payload_add!(18usize, 59usize, 77usize);
+payload_add!(18usize, 60usize, 78usize);
+payload_add!(18usize, 61usize, 79usize);
+payload_add!(18usize, 62usize, 80usize);
+payload_add!(18usize, 63usize, 81usize);
+payload_add!(18usize, 64usize, 82usize);
+payload_add!(18usize, 65usize, 83usize);
+payload_add!(18usize, 66usize, 84usize);
+payload_add!(18usize, 67usize, 85usize);
+payload_add!(18usize, 68usize, 86usize);
+payload_add!(18usize, 69usize, 87usize);
+payload_add!(18usize, 70usize, 88usize);
+payload_add!(18usize, 71usize, 89usize);
+payload_add!(18usize, 72usize, 90usize);
+payload_add!(18usize, 73usize, 91usize);
+payload_add!(18usize, 74usize, 92usize);
+payload_add!(18usize, 75usize, 93usize);
+payload_add!(18usize, 76usize, 94usize);
+payload_add!(18usize, 77usize, 95usize);
+payload_add!(18usize, 78usize, 96usize);
+payload_add!(18usize, 79usize, 97usize);
+payload_add!(18usize, 80usize, 98usize);
+payload_add!(18usize, 81usize, 99usize);
+payload_add!(18usize, 82usize, 100usize);
+payload_add!(18usize, 83usize, 101usize);
+payload_add!(18usize, 84usize, 102usize);
+payload_add!(18usize, 85usize, 103usize);
+payload_add!(18usize, 86usize, 104usize);
+payload_add!(18usize, 87usize, 105usize);
+payload_add!(18usize, 88usize, 106usize);
+payload_add!(18usize, 89usize, 107usize);
+payload_add!(18usize, 90usize, 108usize);
+payload_add!(18usize, 91usize, 109usize);
+payload_add!(18usize, 92usize, 110usize);
+payload_add!(18usize, 93usize, 111usize);
+payload_add!(18usize, 94usize, 112usize);
+payload_add!(18usize, 95usize, 113usize);
+payload_add!(18usize, 96usize, 114usize);
+payload_add!(18usize, 97usize, 115usize);
+payload_add!(18usize, 98usize, 116usize);
+payload_add!(18usize, 99usize, 117usize);
+payload_add!(18usize, 100usize, 118usize);
+payload_add!(18usize, 101usize, 119usize);
+payload_add!(18usize, 102usize, 120usize);
+payload_add!(18usize, 103usize, 121usize);
+payload_add!(18usize, 104usize, 122usize);
+payload_add!(18usize, 105usize, 123usize);
+payload_add!(18usize, 106usize, 124usize);
+payload_add!(18usize, 107usize, 125usize);
+payload_add!(18usize, 108usize, 126usize);
+payload_add!(18usize, 109usize, 127usize);
+payload_add!(18usize, 110usize, 128usize);
+payload_add!(18usize, 111usize, 129usize);
+payload_add!(18usize, 112usize, 130usize);
+payload_add!(18usize, 113usize, 131usize);
+payload_add!(18usize, 114usize, 132usize);
+payload_add!(18usize, 115usize, 133usize);
+payload_add!(18usize, 116usize, 134usize);
+payload_add!(18usize, 117usize, 135usize);
+payload_add!(18usize, 118usize, 136usize);
+payload_add!(18usize, 119usize, 137usize);
+payload_add!(18usize, 120usize, 138usize);
+payload_add!(18usize, 121usize, 139usize);
+payload_add!(18usize, 122usize, 140usize);
+payload_add!(18usize, 123usize, 141usize);
+payload_add!(18usize, 124usize, 142usize);
+payload_add!(18usize, 125usize, 143usize);
+payload_add!(18usize, 126usize, 144usize);
+payload_add!(18usize, 127usize, 145usize);
+payload_add!(18usize, 128usize, 146usize);
 payload_add!(19usize, 1usize, 20usize);
 payload_add!(19usize, 2usize, 21usize);
 payload_add!(19usize, 3usize, 22usize);
@@ -997,6 +2437,86 @@ payload_add!(19usize, 45usize, 64usize);
 payload_add!(19usize, 46usize, 65usize);
 payload_add!(19usize, 47usize, 66usize);
 payload_add!(19usize, 48usize, 67usize);
+payload_add!(19usize, 49usize, 68usize);
+payload_add!(19usize, 50usize, 69usize);
+payload_add!(19usize, 51usize, 70usize);
+payload_add!(19usize, 52usize, 71usize);
+payload_add!(19usize, 53usize, 72usize);
+payload_add!(19usize, 54usize, 73usize);
+payload_add!(19usize, 55usize, 74usize);
+payload_add!(19usize, 56usize, 75usize);
+payload_add!(19usize, 57usize, 76usize);
+payload_add!(19usize, 58usize, 77usize);
+payload_add!(19usize, 59usize, 78usize);
+payload_add!(19usize, 60usize, 79usize);
+payload_add!(19usize, 61usize, 80usize);
+payload_add!(19usize, 62usize, 81usize);
+payload_add!(19usize, 63usize, 82usize);
+payload_add!(19usize, 64usize, 83usize);
+payload_add!(19usize, 65usize, 84usize);
+payload_add!(19usize, 66usize, 85usize);
+payload_add!(19usize, 67usize, 86usize);
+payload_add!(19usize, 68usize, 87usize);
+payload_add!(19usize, 69usize, 88usize);
+payload_add!(19usize, 70usize, 89usize);
+payload_add!(19usize, 71usize, 90usize);
+payload_add!(19usize, 72usize, 91usize);
+payload_add!(19usize, 73usize, 92usize);
+payload_add!(19usize, 74usize, 93usize);
+payload_add!(19usize, 75usize, 94usize);
+payload_add!(19usize, 76usize, 95usize);
+payload_add!(19usize, 77usize, 96usize);
+payload_add!(19usize, 78usize, 97usize);
+payload_add!(19usize, 79usize, 98usize);
+payload_add!(19usize, 80usize, 99usize);
+payload_add!(19usize, 81usize, 100usize);
+payload_add!(19usize, 82usize, 101usize);
+payload_add!(19usize, 83usize, 102usize);
+payload_add!(19usize, 84usize, 103usize);
+payload_add!(19usize, 85usize, 104usize);
+payload_add!(19usize, 86usize, 105usize);
+payload_add!(19usize, 87usize, 106usize);
+payload_add!(19usize, 88usize, 107usize);
+payload_add!(19usize, 89usize, 108usize);
+payload_add!(19usize, 90usize, 109usize);
+payload_add!(19usize, 91usize, 110usize);
+payload_add!(19usize, 92usize, 111usize);
+payload_add!(19usize, 93usize, 112usize);
+payload_add!(19usize, 94usize, 113usize);
+payload_add!(19usize, 95usize, 114usize);
+payload_add!(19usize, 96usize, 115usize);
+payload_add!(19usize, 97usize, 116usize);
+payload_add!(19usize, 98usize, 117usize);
+payload_add!(19usize, 99usize, 118usize);
+payload_add!(19usize, 100usize, 119usize);
+payload_add!(19usize, 101usize, 120usize);
+payload_add!(19usize, 102usize, 121usize);
+payload_add!(19usize, 103usize, 122usize);
+payload_add!(19usize, 104usize, 123usize);
+payload_add!(19usize, 105usize, 124usize);
+payload_add!(19usize, 106usize, 125usize);
+payload_add!(19usize, 107usize, 126usize);
+payload_add!(19usize, 108usize, 127usize);
+payload_add!(19usize, 109usize, 128usize);
+payload_add!(19usize, 110usize, 129usize);
+payload_add!(19usize, 111usize, 130usize);
+payload_add!(19usize, 112usize, 131usize);
+payload_add!(19usize, 113usize, 132usize);
+payload_add!(19usize, 114usize, 133usize);
+payload_add!(19usize, 115usize, 134usize);
+payload_add!(19usize, 116usize, 135usize);
+payload_add!(19usize, 117usize, 136usize);
+payload_add!(19usize, 118usize, 137usize);
+payload_add!(19usize, 119usize, 138usize);
+payload_add!(19usize, 120usize, 139usize);
+payload_add!(19usize, 121usize, 140usize);
+payload_add!(19usize, 122usize, 141usize);
+payload_add!(19usize, 123usize, 142usize);
+payload_add!(19usize, 124usize, 143usize);
+payload_add!(19usize, 125usize, 144usize);
+payload_add!(19usize, 126usize, 145usize);
+payload_add!(19usize, 127usize, 146usize);
+payload_add!(19usize, 128usize, 147usize);
 payload_add!(20usize, 1usize, 21usize);
 payload_add!(20usize, 2usize, 22usize);
 payload_add!(20usize, 3usize, 23usize);
@@ -1045,6 +2565,86 @@ payload_add!(20usize, 45usize, 65usize);
 payload_add!(20usize, 46usize, 66usize);
 payload_add!(20usize, 47usize, 67usize);
 payload_add!(20usize, 48usize, 68usize);
+payload_add!(20usize, 49usize, 69usize);
+payload_add!(20usize, 50usize, 70usize);
+payload_add!(20usize, 51usize, 71usize);
+payload_add!(20usize, 52usize, 72usize);
+payload_add!(20usize, 53usize, 73usize);
+payload_add!(20usize, 54usize, 74usize);
+payload_add!(20usize, 55usize, 75usize);
+payload_add!(20usize, 56usize, 76usize);
+payload_add!(20usize, 57usize, 77usize);
+payload_add!(20usize, 58usize, 78usize);
+payload_add!(20usize, 59usize, 79usize);
+payload_add!(20usize, 60usize, 80usize);
+payload_add!(20usize, 61usize, 81usize);
+payload_add!(20usize, 62usize, 82usize);
+payload_add!(20usize, 63usize, 83usize);
+payload_add!(20usize, 64usize, 84usize);
+payload_add!(20usize, 65usize, 85usize);
+payload_add!(20usize, 66usize, 86usize);
+payload_add!(20usize, 67usize, 87usize);
+payload_add!(20usize, 68usize, 88usize);
+payload_add!(20usize, 69usize, 89usize);
+payload_add!(20usize, 70usize, 90usize);
+payload_add!(20usize, 71usize, 91usize);
+payload_add!(20usize, 72usize, 92usize);
+payload_add!(20usize, 73usize, 93usize);
+payload_add!(20usize, 74usize, 94usize);
+payload_add!(20usize, 75usize, 95usize);
+payload_add!(20usize, 76usize, 96usize);
+payload_add!(20usize, 77usize, 97usize);
+payload_add!(20usize, 78usize, 98usize);
+payload_add!(20usize, 79usize, 99usize);
+payload_add!(20usize, 80usize, 100usize);
+payload_add!(20usize, 81usize, 101usize);
+payload_add!(20usize, 82usize, 102usize);
+payload_add!(20usize, 83usize, 103usize);
+payload_add!(20usize, 84usize, 104usize);
+payload_add!(20usize, 85usize, 105usize);
+payload_add!(20usize, 86usize, 106usize);
+payload_add!(20usize, 87usize, 107usize);
+payload_add!(20usize, 88usize, 108usize);
+payload_add!(20usize, 89usize, 109usize);
+payload_add!(20usize, 90usize, 110usize);
+payload_add!(20usize, 91usize, 111usize);
+payload_add!(20usize, 92usize, 112usize);
+payload_add!(20usize, 93usize, 113usize);
+payload_add!(20usize, 94usize, 114usize);
+payload_add!(20usize, 95usize, 115usize);
+payload_add!(20usize, 96usize, 116usize);
+payload_add!(20usize, 97usize, 117usize);
+payload_add!(20usize, 98usize, 118usize);
+payload_add!(20usize, 99usize, 119usize);
+payload_add!(20usize, 100usize, 120usize);
+payload_add!(20usize, 101usize, 121usize);
+payload_add!(20usize, 102usize, 122usize);
+payload_add!(20usize, 103usize, 123usize);
+payload_add!(20usize, 104usize, 124usize);
+payload_add!(20usize, 105usize, 125usize);
+payload_add!(20usize, 106usize, 126usize);
+payload_add!(20usize, 107usize, 127usize);
+payload_add!(20usize, 108usize, 128usize);
+payload_add!(20usize, 109usize, 129usize);
+payload_add!(20usize, 110usize, 130usize);
+payload_add!(20usize, 111usize, 131usize);
+payload_add!(20usize, 112usize, 132usize);
+payload_add!(20usize, 113usize, 133usize);
+payload_add!(20usize, 114usize, 134usize);
+payload_add!(20usize, 115usize, 135usize);
+payload_add!(20usize, 116usize, 136usize);
+payload_add!(20usize, 117usize, 137usize);
+payload_add!(20usize, 118usize, 138usize);
+payload_add!(20usize, 119usize, 139usize);
+payload_add!(20usize, 120usize, 140usize);
+payload_add!(20usize, 121usize, 141usize);
+payload_add!(20usize, 122usize, 142usize);
+payload_add!(20usize, 123usize, 143usize);
+payload_add!(20usize, 124usize, 144usize);
+payload_add!(20usize, 125usize, 145usize);
+payload_add!(20usize, 126usize, 146usize);
+payload_add!(20usize, 127usize, 147usize);
+payload_add!(20usize, 128usize, 148usize);
 payload_add!(21usize, 1usize, 22usize);
 payload_add!(21usize, 2usize, 23usize);
 payload_add!(21usize, 3usize, 24usize);
@@ -1093,6 +2693,86 @@ payload_add!(21usize, 45usize, 66usize);
 payload_add!(21usize, 46usize, 67usize);
 payload_add!(21usize, 47usize, 68usize);
 payload_add!(21usize, 48usize, 69usize);
+payload_add!(21usize, 49usize, 70usize);
+payload_add!(21usize, 50usize, 71usize);
+payload_add!(21usize, 51usize, 72usize);
+payload_add!(21usize, 52usize, 73usize);
+payload_add!(21usize, 53usize, 74usize);
+payload_add!(21usize, 54usize, 75usize);
+payload_add!(21usize, 55usize, 76usize);
+payload_add!(21usize, 56usize, 77usize);
+payload_add!(21usize, 57usize, 78usize);
+payload_add!(21usize, 58usize, 79usize);
+payload_add!(21usize, 59usize, 80usize);
+payload_add!(21usize, 60usize, 81usize);
+payload_add!(21usize, 61usize, 82usize);
+payload_add!(21usize, 62usize, 83usize);
+payload_add!(21usize, 63usize, 84usize);
+payload_add!(21usize, 64usize, 85usize);
+payload_add!(21usize, 65usize, 86usize);
+payload_add!(21usize, 66usize, 87usize);
+payload_add!(21usize, 67usize, 88usize);
+payload_add!(21usize, 68usize, 89usize);
+payload_add!(21usize, 69usize, 90usize);
+payload_add!(21usize, 70usize, 91usize);
+payload_add!(21usize, 71usize, 92usize);
+payload_add!(21usize, 72usize, 93usize);
+payload_add!(21usize, 73usize, 94usize);
+payload_add!(21usize, 74usize, 95usize);
+payload_add!(21usize, 75usize, 96usize);
+payload_add!(21usize, 76usize, 97usize);
+payload_add!(21usize, 77usize, 98usize);
+payload_add!(21usize, 78usize, 99usize);
+payload_add!(21usize, 79usize, 100usize);
+payload_add!(21usize, 80usize, 101usize);
+payload_add!(21usize, 81usize, 102usize);
+payload_add!(21usize, 82usize, 103usize);
+payload_add!(21usize, 83usize, 104usize);
+payload_add!(21usize, 84usize, 105usize);
+payload_add!(21usize, 85usize, 106usize);
+payload_add!(21usize, 86usize, 107usize);
+payload_add!(21usize, 87usize, 108usize);
+payload_add!(21usize, 88usize, 109usize);
+payload_add!(21usize, 89usize, 110usize);
+payload_add!(21usize, 90usize, 111usize);
+payload_add!(21usize, 91usize, 112usize);
+payload_add!(21usize, 92usize, 113usize);
+payload_add!(21usize, 93usize, 114usize);
+payload_add!(21usize, 94usize, 115usize);
+payload_add!(21usize, 95usize, 116usize);
+payload_add!(21usize, 96usize, 117usize);
+payload_add!(21usize, 97usize, 118usize);
+payload_add!(21usize, 98usize, 119usize);
+payload_add!(21usize, 99usize, 120usize);
+payload_add!(21usize, 100usize, 121usize);
+payload_add!(21usize, 101usize, 122usize);
+payload_add!(21usize, 102usize, 123usize);
+payload_add!(21usize, 103usize, 124usize);
+payload_add!(21usize, 104usize, 125usize);
+payload_add!(21usize, 105usize, 126usize);
+payload_add!(21usize, 106usize, 127usize);
+payload_add!(21usize, 107usize, 128usize);
+payload_add!(21usize, 108usize, 129usize);
+payload_add!(21usize, 109usize, 130usize);
+payload_add!(21usize, 110usize, 131usize);
+payload_add!(21usize, 111usize, 132usize);
+payload_add!(21usize, 112usize, 133usize);
+payload_add!(21usize, 113usize, 134usize);
+payload_add!(21usize, 114usize, 135usize);
+payload_add!(21usize, 115usize, 136usize);
+payload_add!(21usize, 116usize, 137usize);
+payload_add!(21usize, 117usize, 138usize);
+payload_add!(21usize, 118usize, 139usize);
+payload_add!(21usize, 119usize, 140usize);
+payload_add!(21usize, 120usize, 141usize);
+payload_add!(21usize, 121usize, 142usize);
+payload_add!(21usize, 122usize, 143usize);
+payload_add!(21usize, 123usize, 144usize);
+payload_add!(21usize, 124usize, 145usize);
+payload_add!(21usize, 125usize, 146usize);
+payload_add!(21usize, 126usize, 147usize);
+payload_add!(21usize, 127usize, 148usize);
+payload_add!(21usize, 128usize, 149usize);
 payload_add!(22usize, 1usize, 23usize);
 payload_add!(22usize, 2usize, 24usize);
 payload_add!(22usize, 3usize, 25usize);
@@ -1141,6 +2821,86 @@ payload_add!(22usize, 45usize, 67usize);
 payload_add!(22usize, 46usize, 68usize);
 payload_add!(22usize, 47usize, 69usize);
 payload_add!(22usize, 48usize, 70usize);
+payload_add!(22usize, 49usize, 71usize);
+payload_add!(22usize, 50usize, 72usize);
+payload_add!(22usize, 51usize, 73usize);
+payload_add!(22usize, 52usize, 74usize);
+payload_add!(22usize, 53usize, 75usize);
+payload_add!(22usize, 54usize, 76usize);
+payload_add!(22usize, 55usize, 77usize);
+payload_add!(22usize, 56usize, 78usize);
+payload_add!(22usize, 57usize, 79usize);
+payload_add!(22usize, 58usize, 80usize);
+payload_add!(22usize, 59usize, 81usize);
+payload_add!(22usize, 60usize, 82usize);
+payload_add!(22usize, 61usize, 83usize);
+payload_add!(22usize, 62usize, 84usize);
+payload_add!(22usize, 63usize, 85usize);
+payload_add!(22usize, 64usize, 86usize);
+payload_add!(22usize, 65usize, 87usize);
+payload_add!(22usize, 66usize, 88usize);
+payload_add!(22usize, 67usize, 89usize);
+payload_add!(22usize, 68usize, 90usize);
+payload_add!(22usize, 69usize, 91usize);
+payload_add!(22usize, 70usize, 92usize);
+payload_add!(22usize, 71usize, 93usize);
+payload_add!(22usize, 72usize, 94usize);
+payload_add!(22usize, 73usize, 95usize);
+payload_add!(22usize, 74usize, 96usize);
+payload_add!(22usize, 75usize, 97usize);
+payload_add!(22usize, 76usize, 98usize);
+payload_add!(22usize, 77usize, 99usize);
+payload_add!(22usize, 78usize, 100usize);
+payload_add!(22usize, 79usize, 101usize);
+payload_add!(22usize, 80usize, 102usize);
+payload_add!(22usize, 81usize, 103usize);
+payload_add!(22usize, 82usize, 104usize);
+payload_add!(22usize, 83usize, 105usize);
+payload_add!(22usize, 84usize, 106usize);
+payload_add!(22usize, 85usize, 107usize);
+payload_add!(22usize, 86usize, 108usize);
+payload_add!(22usize, 87usize, 109usize);
+payload_add!(22usize, 88usize, 110usize);
+payload_add!(22usize, 89usize, 111usize);
+payload_add!(22usize, 90usize, 112usize);
+payload_add!(22usize, 91usize, 113usize);
+payload_add!(22usize, 92usize, 114usize);
+payload_add!(22usize, 93usize, 115usize);
+payload_add!(22usize, 94usize, 116usize);
+payload_add!(22usize, 95usize, 117usize);
+payload_add!(22usize, 96usize, 118usize);
+payload_add!(22usize, 97usize, 119usize);
+payload_add!(22usize, 98usize, 120usize);
+payload_add!(22usize, 99usize, 121usize);
+payload_add!(22usize, 100usize, 122usize);
+payload_add!(22usize, 101usize, 123usize);
+payload_add!(22usize, 102usize, 124usize);
+payload_add!(22usize, 103usize, 125usize);
+payload_add!(22usize, 104usize, 126usize);
+payload_add!(22usize, 105usize, 127usize);
+payload_add!(22usize, 106usize, 128usize);
+payload_add!(22usize, 107usize, 129usize);
+payload_add!(22usize, 108usize, 130usize);
+payload_add!(22usize, 109usize, 131usize);
+payload_add!(22usize, 110usize, 132usize);
+payload_add!(22usize, 111usize, 133usize);
+payload_add!(22usize, 112usize, 134usize);
+payload_add!(22usize, 113usize, 135usize);
+payload_add!(22usize, 114usize, 136usize);
+payload_add!(22usize, 115usize, 137usize);
+payload_add!(22usize, 116usize, 138usize);
+payload_add!(22usize, 117usize, 139usize);
+payload_add!(22usize, 118usize, 140usize);
+payload_add!(22usize, 119usize, 141usize);
+payload_add!(22usize, 120usize, 142usize);
+payload_add!(22usize, 121usize, 143usize);
+payload_add!(22usize, 122usize, 144usize);
+payload_add!(22usize, 123usize, 145usize);
+payload_add!(22usize, 124usize, 146usize);
+payload_add!(22usize, 125usize, 147usize);
+payload_add!(22usize, 126usize, 148usize);
+payload_add!(22usize, 127usize, 149usize);
+payload_add!(22usize, 128usize, 150usize);
 payload_add!(23usize, 1usize, 24usize);
 payload_add!(23usize, 2usize, 25usize);
 payload_add!(23usize, 3usize, 26usize);
@@ -1189,6 +2949,86 @@ payload_add!(23usize, 45usize, 68usize);
 payload_add!(23usize, 46usize, 69usize);
 payload_add!(23usize, 47usize, 70usize);
 payload_add!(23usize, 48usize, 71usize);
+payload_add!(23usize, 49usize, 72usize);
+payload_add!(23usize, 50usize, 73usize);
+payload_add!(23usize, 51usize, 74usize);
+payload_add!(23usize, 52usize, 75usize);
+payload_add!(23usize, 53usize, 76usize);
+payload_add!(23usize, 54usize, 77usize);
+payload_add!(23usize, 55usize, 78usize);
+payload_add!(23usize, 56usize, 79usize);
+payload_add!(23usize, 57usize, 80usize);
+payload_add!(23usize, 58usize, 81usize);
+payload_add!(23usize, 59usize, 82usize);
+payload_add!(23usize, 60usize, 83usize);
+payload_add!(23usize, 61usize, 84usize);
+payload_add!(23usize, 62usize, 85usize);
+payload_add!(23usize, 63usize, 86usize);
+payload_add!(23usize, 64usize, 87usize);
+payload_add!(23usize, 65usize, 88usize);
+payload_add!(23usize, 66usize, 89usize);
+payload_add!(23usize, 67usize, 90usize);
+payload_add!(23usize, 68usize, 91usize);
+payload_add!(23usize, 69usize, 92usize);
+payload_add!(23usize, 70usize, 93usize);
+payload_add!(23usize, 71usize, 94usize);
+payload_add!(23usize, 72usize, 95usize);
+payload_add!(23usize, 73usize, 96usize);
+payload_add!(23usize, 74usize, 97usize);
+payload_add!(23usize, 75usize, 98usize);
+payload_add!(23usize, 76usize, 99usize);
+payload_add!(23usize, 77usize, 100usize);
+payload_add!(23usize, 78usize, 101usize);
+payload_add!(23usize, 79usize, 102usize);
+payload_add!(23usize, 80usize, 103usize);
+payload_add!(23usize, 81usize, 104usize);
+payload_add!(23usize, 82usize, 105usize);
+payload_add!(23usize, 83usize, 106usize);
+payload_add!(23usize, 84usize, 107usize);
+payload_add!(23usize, 85usize, 108usize);
+payload_add!(23usize, 86usize, 109usize);
+payload_add!(23usize, 87usize, 110usize);
+payload_add!(23usize, 88usize, 111usize);
+payload_add!(23usize, 89usize, 112usize);
+payload_add!(23usize, 90usize, 113usize);
+payload_add!(23usize, 91usize, 114usize);
+payload_add!(23usize, 92usize, 115usize);
+payload_add!(23usize, 93usize, 116usize);
+payload_add!(23usize, 94usize, 117usize);
+payload_add!(23usize, 95usize, 118usize);
+payload_add!(23usize, 96usize, 119usize);
+payload_add!(23usize, 97usize, 120usize);
+payload_add!(23usize, 98usize, 121usize);
+payload_add!(23usize, 99usize, 122usize);
+payload_add!(23usize, 100usize, 123usize);
+payload_add!(23usize, 101usize, 124usize);
+payload_add!(23usize, 102usize, 125usize);
+payload_add!(23usize, 103usize, 126usize);
+payload_add!(23usize, 104usize, 127usize);
+payload_add!(23usize, 105usize, 128usize);
+payload_add!(23usize, 106usize, 129usize);
+payload_add!(23usize, 107usize, 130usize);
+payload_add!(23usize, 108usize, 131usize);
+payload_add!(23usize, 109usize, 132usize);
+payload_add!(23usize, 110usize, 133usize);
+payload_add!(23usize, 111usize, 134usize);
+payload_add!(23usize, 112usize, 135usize);
+payload_add!(23usize, 113usize, 136usize);
+payload_add!(23usize, 114usize, 137usize);
+payload_add!(23usize, 115usize, 138usize);
+payload_add!(23usize, 116usize, 139usize);
+payload_add!(23usize, 117usize, 140usize);
+payload_add!(23usize, 118usize, 141usize);
+payload_add!(23usize, 119usize, 142usize);
+payload_add!(23usize, 120usize, 143usize);
+payload_add!(23usize, 121usize, 144usize);
+payload_add!(23usize, 122usize, 145usize);
+payload_add!(23usize, 123usize, 146usize);
+payload_add!(23usize, 124usize, 147usize);
+payload_add!(23usize, 125usize, 148usize);
+payload_add!(23usize, 126usize, 149usize);
+payload_add!(23usize, 127usize, 150usize);
+payload_add!(23usize, 128usize, 151usize);
 payload_add!(24usize, 1usize, 25usize);
 payload_add!(24usize, 2usize, 26usize);
 payload_add!(24usize, 3usize, 27usize);
@@ -1237,6 +3077,86 @@ payload_add!(24usize, 45usize, 69usize);
 payload_add!(24usize, 46usize, 70usize);
 payload_add!(24usize, 47usize, 71usize);
 payload_add!(24usize, 48usize, 72usize);
+payload_add!(24usize, 49usize, 73usize);
+payload_add!(24usize, 50usize, 74usize);
+payload_add!(24usize, 51usize, 75usize);
+payload_add!(24usize, 52usize, 76usize);
+payload_add!(24usize, 53usize, 77usize);
+payload_add!(24usize, 54usize, 78usize);
+payload_add!(24usize, 55usize, 79usize);
+payload_add!(24usize, 56usize, 80usize);
+payload_add!(24usize, 57usize, 81usize);
+payload_add!(24usize, 58usize, 82usize);
+payload_add!(24usize, 59usize, 83usize);
+payload_add!(24usize, 60usize, 84usize);
+payload_add!(24usize, 61usize, 85usize);
+payload_add!(24usize, 62usize, 86usize);
+payload_add!(24usize, 63usize, 87usize);
+payload_add!(24usize, 64usize, 88usize);
+payload_add!(24usize, 65usize, 89usize);
+payload_add!(24usize, 66usize, 90usize);
+payload_add!(24usize, 67usize, 91usize);
+payload_add!(24usize, 68usize, 92usize);
+payload_add!(24usize, 69usize, 93usize);
+payload_add!(24usize, 70usize, 94usize);
+payload_add!(24usize, 71usize, 95usize);
+payload_add!(24usize, 72usize, 96usize);
+payload_add!(24usize, 73usize, 97usize);
+payload_add!(24usize, 74usize, 98usize);
+payload_add!(24usize, 75usize, 99usize);
+payload_add!(24usize, 76usize, 100usize);
+payload_add!(24usize, 77usize, 101usize);
+payload_add!(24usize, 78usize, 102usize);
+payload_add!(24usize, 79usize, 103usize);
+payload_add!(24usize, 80usize, 104usize);
+payload_add!(24usize, 81usize, 105usize);
+payload_add!(24usize, 82usize, 106usize);
+payload_add!(24usize, 83usize, 107usize);
+payload_add!(24usize, 84usize, 108usize);
+payload_add!(24usize, 85usize, 109usize);
+payload_add!(24usize, 86usize, 110usize);
+payload_add!(24usize, 87usize, 111usize);
+payload_add!(24usize, 88usize, 112usize);
+payload_add!(24usize, 89usize, 113usize);
+payload_add!(24usize, 90usize, 114usize);
+payload_add!(24usize, 91usize, 115usize);
+payload_add!(24usize, 92usize, 116usize);
+payload_add!(24usize, 93usize, 117usize);
+payload_add!(24usize, 94usize, 118usize);
+payload_add!(24usize, 95usize, 119usize);
+payload_add!(24usize, 96usize, 120usize);
+payload_add!(24usize, 97usize, 121usize);
+payload_add!(24usize, 98usize, 122usize);
+payload_add!(24usize, 99usize, 123usize);
+payload_add!(24usize, 100usize, 124usize);
+payload_add!(24usize, 101usize, 125usize);
+payload_add!(24usize, 102usize, 126usize);
+payload_add!(24usize, 103usize, 127usize);
+payload_add!(24usize, 104usize, 128usize);
+payload_add!(24usize, 105usize, 129usize);
+payload_add!(24usize, 106usize, 130usize);
+payload_add!(24usize, 107usize, 131usize);
+payload_add!(24usize, 108usize, 132usize);
+payload_add!(24usize, 109usize, 133usize);
+payload_add!(24usize, 110usize, 134usize);
+payload_add!(24usize, 111usize, 135usize);
+payload_add!(24usize, 112usize, 136usize);
+payload_add!(24usize, 113usize, 137usize);
+payload_add!(24usize, 114usize, 138usize);
+payload_add!(24usize, 115usize, 139usize);
+payload_add!(24usize, 116usize, 140usize);
+payload_add!(24usize, 117usize, 141usize);
+payload_add!(24usize, 118usize, 142usize);
+payload_add!(24usize, 119usize, 143usize);
+payload_add!(24usize, 120usize, 144usize);
+payload_add!(24usize, 121usize, 145usize);
+payload_add!(24usize, 122usize, 146usize);
+payload_add!(24usize, 123usize, 147usize);
+payload_add!(24usize, 124usize, 148usize);
+payload_add!(24usize, 125usize, 149usize);
+payload_add!(24usize, 126usize, 150usize);
+payload_add!(24usize, 127usize, 151usize);
+payload_add!(24usize, 128usize, 152usize);
 payload_add!(25usize, 1usize, 26usize);
 payload_add!(25usize, 2usize, 27usize);
 payload_add!(25usize, 3usize, 28usize);
@@ -1285,6 +3205,86 @@ payload_add!(25usize, 45usize, 70usize);
 payload_add!(25usize, 46usize, 71usize);
 payload_add!(25usize, 47usize, 72usize);
 payload_add!(25usize, 48usize, 73usize);
+payload_add!(25usize, 49usize, 74usize);
+payload_add!(25usize, 50usize, 75usize);
+payload_add!(25usize, 51usize, 76usize);
+payload_add!(25usize, 52usize, 77usize);
+payload_add!(25usize, 53usize, 78usize);
+payload_add!(25usize, 54usize, 79usize);
+payload_add!(25usize, 55usize, 80usize);
+payload_add!(25usize, 56usize, 81usize);
+payload_add!(25usize, 57usize, 82usize);
+payload_add!(25usize, 58usize, 83usize);
+payload_add!(25usize, 59usize, 84usize);
+payload_add!(25usize, 60usize, 85usize);
+payload_add!(25usize, 61usize, 86usize);
+payload_add!(25usize, 62usize, 87usize);
+payload_add!(25usize, 63usize, 88usize);
+payload_add!(25usize, 64usize, 89usize);
+payload_add!(25usize, 65usize, 90usize);
+payload_add!(25usize, 66usize, 91usize);
+payload_add!(25usize, 67usize, 92usize);
+payload_add!(25usize, 68usize, 93usize);
+payload_add!(25usize, 69usize, 94usize);
+payload_add!(25usize, 70usize, 95usize);
+payload_add!(25usize, 71usize, 96usize);
+payload_add!(25usize, 72usize, 97usize);
+payload_add!(25usize, 73usize, 98usize);
+payload_add!(25usize, 74usize, 99usize);
+payload_add!(25usize, 75usize, 100usize);
+payload_add!(25usize, 76usize, 101usize);
+payload_add!(25usize, 77usize, 102usize);
+payload_add!(25usize, 78usize, 103usize);
+payload_add!(25usize, 79usize, 104usize);
+payload_add!(25usize, 80usize, 105usize);
+payload_add!(25usize, 81usize, 106usize);
+payload_add!(25usize, 82usize, 107usize);
+payload_add!(25usize, 83usize, 108usize);
+payload_add!(25usize, 84usize, 109usize);
+payload_add!(25usize, 85usize, 110usize);
+payload_add!(25usize, 86usize, 111usize);
+payload_add!(25usize, 87usize, 112usize);
+payload_add!(25usize, 88usize, 113usize);
+payload_add!(25usize, 89usize, 114usize);
+payload_add!(25usize, 90usize, 115usize);
+payload_add!(25usize, 91usize, 116usize);
+payload_add!(25usize, 92usize, 117usize);
+payload_add!(25usize, 93usize, 118usize);
+payload_add!(25usize, 94usize, 119usize);
+payload_add!(25usize, 95usize, 120usize);
+payload_add!(25usize, 96usize, 121usize);
+payload_add!(25usize, 97usize, 122usize);
+payload_add!(25usize, 98usize, 123usize);
+payload_add!(25usize, 99usize, 124usize);
+payload_add!(25usize, 100usize, 125usize);
+payload_add!(25usize, 101usize, 126usize);
+payload_add!(25usize, 102usize, 127usize);
+payload_add!(25usize, 103usize, 128usize);
+payload_add!(25usize, 104usize, 129usize);
+payload_add!(25usize, 105usize, 130usize);
+payload_add!(25usize, 106usize, 131usize);
+payload_add!(25usize, 107usize, 132usize);
+payload_add!(25usize, 108usize, 133usize);
+payload_add!(25usize, 109usize, 134usize);
+payload_add!(25usize, 110usize, 135usize);
+payload_add!(25usize, 111usize, 136usize);
+payload_add!(25usize, 112usize, 137usize);
+payload_add!(25usize, 113usize, 138usize);
+payload_add!(25usize, 114usize, 139usize);
+payload_add!(25usize, 115usize, 140usize);
+payload_add!(25usize, 116usize, 141usize);
+payload_add!(25usize, 117usize, 142usize);
+payload_add!(25usize, 118usize, 143usize);
+payload_add!(25usize, 119usize, 144usize);
+payload_add!(25usize, 120usize, 145usize);
+payload_add!(25usize, 121usize, 146usize);
+payload_add!(25usize, 122usize, 147usize);
+payload_add!(25usize, 123usize, 148usize);
+payload_add!(25usize, 124usize, 149usize);
+payload_add!(25usize, 125usize, 150usize);
+payload_add!(25usize, 126usize, 151usize);
+payload_add!(25usize, 127usize, 152usize);
+payload_add!(25usize, 128usize, 153usize);
 payload_add!(26usize, 1usize, 27usize);
 payload_add!(26usize, 2usize, 28usize);
 payload_add!(26usize, 3usize, 29usize);
@@ -1333,6 +3333,86 @@ payload_add!(26usize, 45usize, 71usize);
 payload_add!(26usize, 46usize, 72usize);
 payload_add!(26usize, 47usize, 73usize);
 payload_add!(26usize, 48usize, 74usize);
+payload_add!(26usize, 49usize, 75usize);
+payload_add!(26usize, 50usize, 76usize);
+payload_add!(26usize, 51usize, 77usize);
+payload_add!(26usize, 52usize, 78usize);
+payload_add!(26usize, 53usize, 79usize);
+payload_add!(26usize, 54usize, 80usize);
+payload_add!(26usize, 55usize, 81usize);
+payload_add!(26usize, 56usize, 82usize);
+payload_add!(26usize, 57usize, 83usize);
+payload_add!(26usize, 58usize, 84usize);
+payload_add!(26usize, 59usize, 85usize);
+payload_add!(26usize, 60usize, 86usize);
+payload_add!(26usize, 61usize, 87usize);
+payload_add!(26usize, 62usize, 88usize);
+payload_add!(26usize, 63usize, 89usize);
+payload_add!(26usize, 64usize, 90usize);
+payload_add!(26usize, 65usize, 91usize);
+payload_add!(26usize, 66usize, 92usize);
+payload_add!(26usize, 67usize, 93usize);
+payload_add!(26usize, 68usize, 94usize);
+payload_add!(26usize, 69usize, 95usize);
+payload_add!(26usize, 70usize, 96usize);
+payload_add!(26usize, 71usize, 97usize);
+payload_add!(26usize, 72usize, 98usize);
+payload_add!(26usize, 73usize, 99usize);
+payload_add!(26usize, 74usize, 100usize);
+payload_add!(26usize, 75usize, 101usize);
+payload_add!(26usize, 76usize, 102usize);
+payload_add!(26usize, 77usize, 103usize);
+payload_add!(26usize, 78usize, 104usize);
+payload_add!(26usize, 79usize, 105usize);
+payload_add!(26usize, 80usize, 106usize);
+payload_add!(26usize, 81usize, 107usize);
+payload_add!(26usize, 82usize, 108usize);
+payload_add!(26usize, 83usize, 109usize);
+payload_add!(26usize, 84usize, 110usize);
+payload_add!(26usize, 85usize, 111usize);
+payload_add!(26usize, 86usize, 112usize);
+payload_add!(26usize, 87usize, 113usize);
+payload_add!(26usize, 88usize, 114usize);
+payload_add!(26usize, 89usize, 115usize);
+payload_add!(26usize, 90usize, 116usize);
+payload_add!(26usize, 91usize, 117usize);
+payload_add!(26usize, 92usize, 118usize);
+payload_add!(26usize, 93usize, 119usize);
+payload_add!(26usize, 94usize, 120usize);
+payload_add!(26usize, 95usize, 121usize);
+payload_add!(26usize, 96usize, 122usize);
+payload_add!(26usize, 97usize, 123usize);
+payload_add!(26usize, 98usize, 124usize);
+payload_add!(26usize, 99usize, 125usize);
+payload_add!(26usize, 100usize, 126usize);
+payload_add!(26usize, 101usize, 127usize);
+payload_add!(26usize, 102usize, 128usize);
+payload_add!(26usize, 103usize, 129usize);
+payload_add!(26usize, 104usize, 130usize);
+payload_add!(26usize, 105usize, 131usize);
+payload_add!(26usize, 106usize, 132usize);
+payload_add!(26usize, 107usize, 133usize);
+payload_add!(26usize, 108usize, 134usize);
+payload_add!(26usize, 109usize, 135usize);
+payload_add!(26usize, 110usize, 136usize);
+payload_add!(26usize, 111usize, 137usize);
+payload_add!(26usize, 112usize, 138usize);
+payload_add!(26usize, 113usize, 139usize);
+payload_add!(26usize, 114usize, 140usize);
+payload_add!(26usize, 115usize, 141usize);
+payload_add!(26usize, 116usize, 142usize);
+payload_add!(26usize, 117usize, 143usize);
+payload_add!(26usize, 118usize, 144usize);
+payload_add!(26usize, 119usize, 145usize);
+payload_add!(26usize, 120usize, 146usize);
+payload_add!(26usize, 121usize, 147usize);
+payload_add!(26usize, 122usize, 148usize);
+payload_add!(26usize, 123usize, 149usize);
+payload_add!(26usize, 124usize, 150usize);
+payload_add!(26usize, 125usize, 151usize);
+payload_add!(26usize, 126usize, 152usize);
+payload_add!(26usize, 127usize, 153usize);
+payload_add!(26usize, 128usize, 154usize);
 payload_add!(27usize, 1usize, 28usize);
 payload_add!(27usize, 2usize, 29usize);
 payload_add!(27usize, 3usize, 30usize);
@@ -1381,6 +3461,86 @@ payload_add!(27usize, 45usize, 72usize);
 payload_add!(27usize, 46usize, 73usize);
 payload_add!(27usize, 47usize, 74usize);
 payload_add!(27usize, 48usize, 75usize);
+payload_add!(27usize, 49usize, 76usize);
+payload_add!(27usize, 50usize, 77usize);
+payload_add!(27usize, 51usize, 78usize);
+payload_add!(27usize, 52usize, 79usize);
+payload_add!(27usize, 53usize, 80usize);
+payload_add!(27usize, 54usize, 81usize);
+payload_add!(27usize, 55usize, 82usize);
+payload_add!(27usize, 56usize, 83usize);
+payload_add!(27usize, 57usize, 84usize);
+payload_add!(27usize, 58usize, 85usize);
+payload_add!(27usize, 59usize, 86usize);
+payload_add!(27usize, 60usize, 87usize);
+payload_add!(27usize, 61usize, 88usize);
+payload_add!(27usize, 62usize, 89usize);
+payload_add!(27usize, 63usize, 90usize);
+payload_add!(27usize, 64usize, 91usize);
+payload_add!(27usize, 65usize, 92usize);
+payload_add!(27usize, 66usize, 93usize);
+payload_add!(27usize, 67usize, 94usize);
+payload_add!(27usize, 68usize, 95usize);
+payload_add!(27usize, 69usize, 96usize);
+payload_add!(27usize, 70usize, 97usize);
+payload_add!(27usize, 71usize, 98usize);
+payload_add!(27usize, 72usize, 99usize);
+payload_add!(27usize, 73usize, 100usize);
+payload_add!(27usize, 74usize, 101usize);
+payload_add!(27usize, 75usize, 102usize);
+payload_add!(27usize, 76usize, 103usize);
+payload_add!(27usize, 77usize, 104usize);
+payload_add!(27usize, 78usize, 105usize);
+payload_add!(27usize, 79usize, 106usize);
+payload_add!(27usize, 80usize, 107usize);
+payload_add!(27usize, 81usize, 108usize);
+payload_add!(27usize, 82usize, 109usize);
+payload_add!(27usize, 83usize, 110usize);
+payload_add!(27usize, 84usize, 111usize);
+payload_add!(27usize, 85usize, 112usize);
+payload_add!(27usize, 86usize, 113usize);
+payload_add!(27usize, 87usize, 114usize);
+payload_add!(27usize, 88usize, 115usize);
+payload_add!(27usize, 89usize, 116usize);
+payload_add!(27usize, 90usize, 117usize);
+payload_add!(27usize, 91usize, 118usize);
+payload_add!(27usize, 92usize, 119usize);
+payload_add!(27usize, 93usize, 120usize);
+payload_add!(27usize, 94usize, 121usize);
+payload_add!(27usize, 95usize, 122usize);
+payload_add!(27usize, 96usize, 123usize);
+payload_add!(27usize, 97usize, 124usize);
+payload_add!(27usize, 98usize, 125usize);
+payload_add!(27usize, 99usize, 126usize);
+payload_add!(27usize, 100usize, 127usize);
+payload_add!(27usize, 101usize, 128usize);
+payload_add!(27usize, 102usize, 129usize);
+payload_add!(27usize, 103usize, 130usize);
+payload_add!(27usize, 104usize, 131usize);
+payload_add!(27usize, 105usize, 132usize);
+payload_add!(27usize, 106usize, 133usize);
+payload_add!(27usize, 107usize, 134usize);
+payload_add!(27usize, 108usize, 135usize);
+payload_add!(27usize, 109usize, 136usize);
+payload_add!(27usize, 110usize, 137usize);
+payload_add!(27usize, 111usize, 138usize);
+payload_add!(27usize, 112usize, 139usize);
+payload_add!(27usize, 113usize, 140usize);
+payload_add!(27usize, 114usize, 141usize);
+payload_add!(27usize, 115usize, 142usize);
+payload_add!(27usize, 116usize, 143usize);
+payload_add!(27usize, 117usize, 144usize);
+payload_add!(27usize, 118usize, 145usize);
+payload_add!(27usize, 119usize, 146usize);
+payload_add!(27usize, 120usize, 147usize);
+payload_add!(27usize, 121usize, 148usize);
+payload_add!(27usize, 122usize, 149usize);
+payload_add!(27usize, 123usize, 150usize);
+payload_add!(27usize, 124usize, 151usize);
+payload_add!(27usize, 125usize, 152usize);
+payload_add!(27usize, 126usize, 153usize);
+payload_add!(27usize, 127usize, 154usize);
+payload_add!(27usize, 128usize, 155usize);
 payload_add!(28usize, 1usize, 29usize);
 payload_add!(28usize, 2usize, 30usize);
 payload_add!(28usize, 3usize, 31usize);
@@ -1429,6 +3589,86 @@ payload_add!(28usize, 45usize, 73usize);
 payload_add!(28usize, 46usize, 74usize);
 payload_add!(28usize, 47usize, 75usize);
 payload_add!(28usize, 48usize, 76usize);
+payload_add!(28usize, 49usize, 77usize);
+payload_add!(28usize, 50usize, 78usize);
+payload_add!(28usize, 51usize, 79usize);
+payload_add!(28usize, 52usize, 80usize);
+payload_add!(28usize, 53usize, 81usize);
+payload_add!(28usize, 54usize, 82usize);
+payload_add!(28usize, 55usize, 83usize);
+payload_add!(28usize, 56usize, 84usize);
+payload_add!(28usize, 57usize, 85usize);
+payload_add!(28usize, 58usize, 86usize);
+payload_add!(28usize, 59usize, 87usize);
+payload_add!(28usize, 60usize, 88usize);
+payload_add!(28usize, 61usize, 89usize);
+payload_add!(28usize, 62usize, 90usize);
+payload_add!(28usize, 63usize, 91usize);
+payload_add!(28usize, 64usize, 92usize);
+payload_add!(28usize, 65usize, 93usize);
+payload_add!(28usize, 66usize, 94usize);
+payload_add!(28usize, 67usize, 95usize);
+payload_add!(28usize, 68usize, 96usize);
+payload_add!(28usize, 69usize, 97usize);
+payload_add!(28usize, 70usize, 98usize);
+payload_add!(28usize, 71usize, 99usize);
+payload_add!(28usize, 72usize, 100usize);
+payload_add!(28usize, 73usize, 101usize);
+payload_add!(28usize, 74usize, 102usize);
+payload_add!(28usize, 75usize, 103usize);
+payload_add!(28usize, 76usize, 104usize);
+payload_add!(28usize, 77usize, 105usize);
+payload_add!(28usize, 78usize, 106usize);
+payload_add!(28usize, 79usize, 107usize);
+payload_add!(28usize, 80usize, 108usize);
+payload_add!(28usize, 81usize, 109usize);
+payload_add!(28usize, 82usize, 110usize);
+payload_add!(28usize, 83usize, 111usize);
+payload_add!(28usize, 84usize, 112usize);
+payload_add!(28usize, 85usize, 113usize);
+payload_add!(28usize, 86usize, 114usize);
+payload_add!(28usize, 87usize, 115usize);
+payload_add!(28usize, 88usize, 116usize);
+payload_add!(28usize, 89usize, 117usize);
+payload_add!(28usize, 90usize, 118usize);
+payload_add!(28usize, 91usize, 119usize);
+payload_add!(28usize, 92usize, 120usize);
+payload_add!(28usize, 93usize, 121usize);
+payload_add!(28usize, 94usize, 122usize);
+payload_add!(28usize, 95usize, 123usize);
+payload_add!(28usize, 96usize, 124usize);
+payload_add!(28usize, 97usize, 125usize);
+payload_add!(28usize, 98usize, 126usize);
+payload_add!(28usize, 99usize, 127usize);
+payload_add!(28usize, 100usize, 128usize);
+payload_add!(28usize, 101usize, 129usize);
+payload_add!(28usize, 102usize, 130usize);
+payload_add!(28usize, 103usize, 131usize);
+payload_add!(28usize, 104usize, 132usize);
+payload_add!(28usize, 105usize, 133usize);
+payload_add!(28usize, 106usize, 134usize);
+payload_add!(28usize, 107usize, 135usize);
+payload_add!(28usize, 108usize, 136usize);
+payload_add!(28usize, 109usize, 137usize);
+payload_add!(28usize, 110usize, 138usize);
+payload_add!(28usize, 111usize, 139usize);
+payload_add!(28usize, 112usize, 140usize);
+payload_add!(28usize, 113usize, 141usize);
+payload_add!(28usize, 114usize, 142usize);
+payload_add!(28usize, 115usize, 143usize);
+payload_add!(28usize, 116usize, 144usize);
+payload_add!(28usize, 117usize, 145usize);
+payload_add!(28usize, 118usize, 146usize);
+payload_add!(28usize, 119usize, 147usize);
+payload_add!(28usize, 120usize, 148usize);
+payload_add!(28usize, 121usize, 149usize);
+payload_add!(28usize, 122usize, 150usize);
+payload_add!(28usize, 123usize, 151usize);
+payload_add!(28usize, 124usize, 152usize);
+payload_add!(28usize, 125usize, 153usize);
+payload_add!(28usize, 126usize, 154usize);
+payload_add!(28usize, 127usize, 155usize);
+payload_add!(28usize, 128usize, 156usize);
 payload_add!(29usize, 1usize, 30usize);
 payload_add!(29usize, 2usize, 31usize);
 payload_add!(29usize, 3usize, 32usize);
@@ -1477,6 +3717,86 @@ payload_add!(29usize, 45usize, 74usize);
 payload_add!(29usize, 46usize, 75usize);
 payload_add!(29usize, 47usize, 76usize);
 payload_add!(29usize, 48usize, 77usize);
+payload_add!(29usize, 49usize, 78usize);
+payload_add!(29usize, 50usize, 79usize);
+payload_add!(29usize, 51usize, 80usize);
+payload_add!(29usize, 52usize, 81usize);
+payload_add!(29usize, 53usize, 82usize);
+payload_add!(29usize, 54usize, 83usize);
+payload_add!(29usize, 55usize, 84usize);
+payload_add!(29usize, 56usize, 85usize);
+payload_add!(29usize, 57usize, 86usize);
+payload_add!(29usize, 58usize, 87usize);
+payload_add!(29usize, 59usize, 88usize);
+payload_add!(29usize, 60usize, 89usize);
+payload_add!(29usize, 61usize, 90usize);
+payload_add!(29usize, 62usize, 91usize);
+payload_add!(29usize, 63usize, 92usize);
+payload_add!(29usize, 64usize, 93usize);
+payload_add!(29usize, 65usize, 94usize);
+payload_add!(29usize, 66usize, 95usize);
+payload_add!(29usize, 67usize, 96usize);
+payload_add!(29usize, 68usize, 97usize);
+payload_add!(29usize, 69usize, 98usize);
+payload_add!(29usize, 70usize, 99usize);
+payload_add!(29usize, 71usize, 100usize);
+payload_add!(29usize, 72usize, 101usize);
+payload_add!(29usize, 73usize, 102usize);
+payload_add!(29usize, 74usize, 103usize);
+payload_add!(29usize, 75usize, 104usize);
+payload_add!(29usize, 76usize, 105usize);
+payload_add!(29usize, 77usize, 106usize);
+payload_add!(29usize, 78usize, 107usize);
+payload_add!(29usize, 79usize, 108usize);
+payload_add!(29usize, 80usize, 109usize);
+payload_add!(29usize, 81usize, 110usize);
+payload_add!(29usize, 82usize, 111usize);
+payload_add!(29usize, 83usize, 112usize);
+payload_add!(29usize, 84usize, 113usize);
+payload_add!(29usize, 85usize, 114usize);
+payload_add!(29usize, 86usize, 115usize);
+payload_add!(29usize, 87usize, 116usize);
+payload_add!(29usize, 88usize, 117usize);
+payload_add!(29usize, 89usize, 118usize);
+payload_add!(29usize, 90usize, 119usize);
+payload_add!(29usize, 91usize, 120usize);
+payload_add!(29usize, 92usize, 121usize);
+payload_add!(29usize, 93usize, 122usize);
+payload_add!(29usize, 94usize, 123usize);
+payload_add!(29usize, 95usize, 124usize);
+payload_add!(29usize, 96usize, 125usize);
+payload_add!(29usize, 97usize, 126usize);
+payload_add!(29usize, 98usize, 127usize);
+payload_add!(29usize, 99usize, 128usize);
+payload_add!(29usize, 100usize, 129usize);
+payload_add!(29usize, 101usize, 130usize);
+payload_add!(29usize, 102usize, 131usize);
+payload_add!(29usize, 103usize, 132usize);
+payload_add!(29usize, 104usize, 133usize);
+payload_add!(29usize, 105usize, 134usize);
+payload_add!(29usize, 106usize, 135usize);
+payload_add!(29usize, 107usize, 136usize);
+payload_add!(29usize, 108usize, 137usize);
+payload_add!(29usize, 109usize, 138usize);
+payload_add!(29usize, 110usize, 139usize);
+payload_add!(29usize, 111usize, 140usize);
+payload_add!(29usize, 112usize, 141usize);
+payload_add!(29usize, 113usize, 142usize);
+payload_add!(29usize, 114usize, 143usize);
+payload_add!(29usize, 115usize, 144usize);
+payload_add!(29usize, 116usize, 145usize);
+payload_add!(29usize, 117usize, 146usize);
+payload_add!(29usize, 118usize, 147usize);
+payload_add!(29usize, 119usize, 148usize);
+payload_add!(29usize, 120usize, 149usize);
+payload_add!(29usize, 121usize, 150usize);
+payload_add!(29usize, 122usize, 151usize);
+payload_add!(29usize, 123usize, 152usize);
+payload_add!(29usize, 124usize, 153usize);
+payload_add!(29usize, 125usize, 154usize);
+payload_add!(29usize, 126usize, 155usize);
+payload_add!(29usize, 127usize, 156usize);
+payload_add!(29usize, 128usize, 157usize);
 payload_add!(30usize, 1usize, 31usize);
 payload_add!(30usize, 2usize, 32usize);
 payload_add!(30usize, 3usize, 33usize);
@@ -1525,6 +3845,86 @@ payload_add!(30usize, 45usize, 75usize);
 payload_add!(30usize, 46usize, 76usize);
 payload_add!(30usize, 47usize, 77usize);
 payload_add!(30usize, 48usize, 78usize);
+payload_add!(30usize, 49usize, 79usize);
+payload_add!(30usize, 50usize, 80usize);
+payload_add!(30usize, 51usize, 81usize);
+payload_add!(30usize, 52usize, 82usize);
+payload_add!(30usize, 53usize, 83usize);
+payload_add!(30usize, 54usize, 84usize);
+payload_add!(30usize, 55usize, 85usize);
+payload_add!(30usize, 56usize, 86usize);
+payload_add!(30usize, 57usize, 87usize);
+payload_add!(30usize, 58usize, 88usize);
+payload_add!(30usize, 59usize, 89usize);
+payload_add!(30usize, 60usize, 90usize);
+payload_add!(30usize, 61usize, 91usize);
+payload_add!(30usize, 62usize, 92usize);
+payload_add!(30usize, 63usize, 93usize);
+payload_add!(30usize, 64usize, 94usize);
+payload_add!(30usize, 65usize, 95usize);
+payload_add!(30usize, 66usize, 96usize);
+payload_add!(30usize, 67usize, 97usize);
+payload_add!(30usize, 68usize, 98usize);
+payload_add!(30usize, 69usize, 99usize);
+payload_add!(30usize, 70usize, 100usize);
+payload_add!(30usize, 71usize, 101usize);
+payload_add!(30usize, 72usize, 102usize);
+payload_add!(30usize, 73usize, 103usize);
+payload_add!(30usize, 74usize, 104usize);
+payload_add!(30usize, 75usize, 105usize);
+payload_add!(30usize, 76usize, 106usize);
+payload_add!(30usize, 77usize, 107usize);
+payload_add!(30usize, 78usize, 108usize);
+payload_add!(30usize, 79usize, 109usize);
+payload_add!(30usize, 80usize, 110usize);
+payload_add!(30usize, 81usize, 111usize);
+payload_add!(30usize, 82usize, 112usize);
+payload_add!(30usize, 83usize, 113usize);
+payload_add!(30usize, 84usize, 114usize);
+payload_add!(30usize, 85usize, 115usize);
+payload_add!(30usize, 86usize, 116usize);
+payload_add!(30usize, 87usize, 117usize);
+payload_add!(30usize, 88usize, 118usize);
+payload_add!(30usize, 89usize, 119usize);
+payload_add!(30usize, 90usize, 120usize);
+payload_add!(30usize, 91usize, 121usize);
+payload_add!(30usize, 92usize, 122usize);
+payload_add!(30usize, 93usize, 123usize);
+payload_add!(30usize, 94usize, 124usize);
+payload_add!(30usize, 95usize, 125usize);
+payload_add!(30usize, 96usize, 126usize);
+payload_add!(30usize, 97usize, 127usize);
+payload_add!(30usize, 98usize, 128usize);
+payload_add!(30usize, 99usize, 129usize);
+payload_add!(30usize, 100usize, 130usize);
+payload_add!(30usize, 101usize, 131usize);
+payload_add!(30usize, 102usize, 132usize);
+payload_add!(30usize, 103usize, 133usize);
+payload_add!(30usize, 104usize, 134usize);
+payload_add!(30usize, 105usize, 135usize);
+payload_add!(30usize, 106usize, 136usize);
+payload_add!(30usize, 107usize, 137usize);
+payload_add!(30usize, 108usize, 138usize);
+payload_add!(30usize, 109usize, 139usize);
+payload_add!(30usize, 110usize, 140usize);
+payload_add!(30usize, 111usize, 141usize);
+payload_add!(30usize, 112usize, 142usize);
+payload_add!(30usize, 113usize, 143usize);
+payload_add!(30usize, 114usize, 144usize);
+payload_add!(30usize, 115usize, 145usize);
+payload_add!(30usize, 116usize, 146usize);
+payload_add!(30usize, 117usize, 147usize);
+payload_add!(30usize, 118usize, 148usize);
+payload_add!(30usize, 119usize, 149usize);
+payload_add!(30usize, 120usize, 150usize);
+payload_add!(30usize, 121usize, 151usize);
+payload_add!(30usize, 122usize, 152usize);
+payload_add!(30usize, 123usize, 153usize);
+payload_add!(30usize, 124usize, 154usize);
+payload_add!(30usize, 125usize, 155usize);
+payload_add!(30usize, 126usize, 156usize);
+payload_add!(30usize, 127usize, 157usize);
+payload_add!(30usize, 128usize, 158usize);
 payload_add!(31usize, 1usize, 32usize);
 payload_add!(31usize, 2usize, 33usize);
 payload_add!(31usize, 3usize, 34usize);
@@ -1573,6 +3973,86 @@ payload_add!(31usize, 45usize, 76usize);
 payload_add!(31usize, 46usize, 77usize);
 payload_add!(31usize, 47usize, 78usize);
 payload_add!(31usize, 48usize, 79usize);
+payload_add!(31usize, 49usize, 80usize);
+payload_add!(31usize, 50usize, 81usize);
+payload_add!(31usize, 51usize, 82usize);
+payload_add!(31usize, 52usize, 83usize);
+payload_add!(31usize, 53usize, 84usize);
+payload_add!(31usize, 54usize, 85usize);
+payload_add!(31usize, 55usize, 86usize);
+payload_add!(31usize, 56usize, 87usize);
+payload_add!(31usize, 57usize, 88usize);
+payload_add!(31usize, 58usize, 89usize);
+payload_add!(31usize, 59usize, 90usize);
+payload_add!(31usize, 60usize, 91usize);
+payload_add!(31usize, 61usize, 92usize);
+payload_add!(31usize, 62usize, 93usize);
+payload_add!(31usize, 63usize, 94usize);
+payload_add!(31usize, 64usize, 95usize);
+payload_add!(31usize, 65usize, 96usize);
+payload_add!(31usize, 66usize, 97usize);
+payload_add!(31usize, 67usize, 98usize);
+payload_add!(31usize, 68usize, 99usize);
+payload_add!(31usize, 69usize, 100usize);
+payload_add!(31usize, 70usize, 101usize);
+payload_add!(31usize, 71usize, 102usize);
+payload_add!(31usize, 72usize, 103usize);
+payload_add!(31usize, 73usize, 104usize);
+payload_add!(31usize, 74usize, 105usize);
+payload_add!(31usize, 75usize, 106usize);
+payload_add!(31usize, 76usize, 107usize);
+payload_add!(31usize, 77usize, 108usize);
+payload_add!(31usize, 78usize, 109usize);
+payload_add!(31usize, 79usize, 110usize);
+payload_add!(31usize, 80usize, 111usize);
+payload_add!(31usize, 81usize, 112usize);
+payload_add!(31usize, 82usize, 113usize);
+payload_add!(31usize, 83usize, 114usize);
+payload_add!(31usize, 84usize, 115usize);
+payload_add!(31usize, 85usize, 116usize);
+payload_add!(31usize, 86usize, 117usize);
+payload_add!(31usize, 87usize, 118usize);
+payload_add!(31usize, 88usize, 119usize);
+payload_add!(31usize, 89usize, 120usize);
+payload_add!(31usize, 90usize, 121usize);
+payload_add!(31usize, 91usize, 122usize);
+payload_add!(31usize, 92usize, 123usize);
+payload_add!(31usize, 93usize, 124usize);
+payload_add!(31usize, 94usize, 125usize);
+payload_add!(31usize, 95usize, 126usize);
+payload_add!(31usize, 96usize, 127usize);
+payload_add!(31usize, 97usize, 128usize);
+payload_add!(31usize, 98usize, 129usize);
+payload_add!(31usize, 99usize, 130usize);
+payload_add!(31usize, 100usize, 131usize);
+payload_add!(31usize, 101usize, 132usize);
+payload_add!(31usize, 102usize, 133usize);
+payload_add!(31usize, 103usize, 134usize);
+payload_add!(31usize, 104usize, 135usize);
+payload_add!(31usize, 105usize, 136usize);
+payload_add!(31usize, 106usize, 137usize);
+payload_add!(31usize, 107usize, 138usize);
+payload_add!(31usize, 108usize, 139usize);
+payload_add!(31usize, 109usize, 140usize);
+payload_add!(31usize, 110usize, 141usize);
+payload_add!(31usize, 111usize, 142usize);
+payload_add!(31usize, 112usize, 143usize);
+payload_add!(31usize, 113usize, 144usize);
+payload_add!(31usize, 114usize, 145usize);
+payload_add!(31usize, 115usize, 146usize);
+payload_add!(31usize, 116usize, 147usize);
+payload_add!(31usize, 117usize, 148usize);
+payload_add!(31usize, 118usize, 149usize);
+payload_add!(31usize, 119usize, 150usize);
+payload_add!(31usize, 120usize, 151usize);
+payload_add!(31usize, 121usize, 152usize);
+payload_add!(31usize, 122usize, 153usize);
+payload_add!(31usize, 123usize, 154usize);
+payload_add!(31usize, 124usize, 155usize);
+payload_add!(31usize, 125usize, 156usize);
+payload_add!(31usize, 126usize, 157usize);
+payload_add!(31usize, 127usize, 158usize);
+payload_add!(31usize, 128usize, 159usize);
 payload_add!(32usize, 1usize, 33usize);
 payload_add!(32usize, 2usize, 34usize);
 payload_add!(32usize, 3usize, 35usize);
@@ -1621,6 +4101,86 @@ payload_add!(32usize, 45usize, 77usize);
 payload_add!(32usize, 46usize, 78usize);
 payload_add!(32usize, 47usize, 79usize);
 payload_add!(32usize, 48usize, 80usize);
+payload_add!(32usize, 49usize, 81usize);
+payload_add!(32usize, 50usize, 82usize);
+payload_add!(32usize, 51usize, 83usize);
+payload_add!(32usize, 52usize, 84usize);
+payload_add!(32usize, 53usize, 85usize);
+payload_add!(32usize, 54usize, 86usize);
+payload_add!(32usize, 55usize, 87usize);
+payload_add!(32usize, 56usize, 88usize);
+payload_add!(32usize, 57usize, 89usize);
+payload_add!(32usize, 58usize, 90usize);
+payload_add!(32usize, 59usize, 91usize);
+payload_add!(32usize, 60usize, 92usize);
+payload_add!(32usize, 61usize, 93usize);
+payload_add!(32usize, 62usize, 94usize);
+payload_add!(32usize, 63usize, 95usize);
+payload_add!(32usize, 64usize, 96usize);
+payload_add!(32usize, 65usize, 97usize);
+payload_add!(32usize, 66usize, 98usize);
+payload_add!(32usize, 67usize, 99usize);
+payload_add!(32usize, 68usize, 100usize);
+payload_add!(32usize, 69usize, 101usize);
+payload_add!(32usize, 70usize, 102usize);
+payload_add!(32usize, 71usize, 103usize);
+payload_add!(32usize, 72usize, 104usize);
+payload_add!(32usize, 73usize, 105usize);
+payload_add!(32usize, 74usize, 106usize);
+payload_add!(32usize, 75usize, 107usize);
+payload_add!(32usize, 76usize, 108usize);
+payload_add!(32usize, 77usize, 109usize);
+payload_add!(32usize, 78usize, 110usize);
+payload_add!(32usize, 79usize, 111usize);
+payload_add!(32usize, 80usize, 112usize);
+payload_add!(32usize, 81usize, 113usize);
+payload_add!(32usize, 82usize, 114usize);
+payload_add!(32usize, 83usize, 115usize);
+payload_add!(32usize, 84usize, 116usize);
+payload_add!(32usize, 85usize, 117usize);
+payload_add!(32usize, 86usize, 118usize);
+payload_add!(32usize, 87usize, 119usize);
+payload_add!(32usize, 88usize, 120usize);
+payload_add!(32usize, 89usize, 121usize);
+payload_add!(32usize, 90usize, 122usize);
+payload_add!(32usize, 91usize, 123usize);
+payload_add!(32usize, 92usize, 124usize);
+payload_add!(32usize, 93usize, 125usize);
+payload_add!(32usize, 94usize, 126usize);
+payload_add!(32usize, 95usize, 127usize);
+payload_add!(32usize, 96usize, 128usize);
+payload_add!(32usize, 97usize, 129usize);
+payload_add!(32usize, 98usize, 130usize);
+payload_add!(32usize, 99usize, 131usize);
+payload_add!(32usize, 100usize, 132usize);
+payload_add!(32usize, 101usize, 133usize);
+payload_add!(32usize, 102usize, 134usize);
+payload_add!(32usize, 103usize, 135usize);
+payload_add!(32usize, 104usize, 136usize);
+payload_add!(32usize, 105usize, 137usize);
+payload_add!(32usize, 106usize, 138usize);
+payload_add!(32usize, 107usize, 139usize);
+payload_add!(32usize, 108usize, 140usize);
+payload_add!(32usize, 109usize, 141usize);
+payload_add!(32usize, 110usize, 142usize);
+payload_add!(32usize, 111usize, 143usize);
+payload_add!(32usize, 112usize, 144usize);
+payload_add!(32usize, 113usize, 145usize);
+payload_add!(32usize, 114usize, 146usize);
+payload_add!(32usize, 115usize, 147usize);
+payload_add!(32usize, 116usize, 148usize);
+payload_add!(32usize, 117usize, 149usize);
+payload_add!(32usize, 118usize, 150usize);
+payload_add!(32usize, 119usize, 151usize);
+payload_add!(32usize, 120usize, 152usize);
+payload_add!(32usize, 121usize, 153usize);
+payload_add!(32usize, 122usize, 154usize);
+payload_add!(32usize, 123usize, 155usize);
+payload_add!(32usize, 124usize, 156usize);
+payload_add!(32usize, 125usize, 157usize);
+payload_add!(32usize, 126usize, 158usize);
+payload_add!(32usize, 127usize, 159usize);
+payload_add!(32usize, 128usize, 160usize);
 payload_add!(33usize, 1usize, 34usize);
 payload_add!(33usize, 2usize, 35usize);
 payload_add!(33usize, 3usize, 36usize);
@@ -1669,6 +4229,86 @@ payload_add!(33usize, 45usize, 78usize);
 payload_add!(33usize, 46usize, 79usize);
 payload_add!(33usize, 47usize, 80usize);
 payload_add!(33usize, 48usize, 81usize);
+payload_add!(33usize, 49usize, 82usize);
+payload_add!(33usize, 50usize, 83usize);
+payload_add!(33usize, 51usize, 84usize);
+payload_add!(33usize, 52usize, 85usize);
+payload_add!(33usize, 53usize, 86usize);
+payload_add!(33usize, 54usize, 87usize);
+payload_add!(33usize, 55usize, 88usize);
+payload_add!(33usize, 56usize, 89usize);
+payload_add!(33usize, 57usize, 90usize);
+payload_add!(33usize, 58usize, 91usize);
+payload_add!(33usize, 59usize, 92usize);
+payload_add!(33usize, 60usize, 93usize);
+payload_add!(33usize, 61usize, 94usize);
+payload_add!(33usize, 62usize, 95usize);
+payload_add!(33usize, 63usize, 96usize);
+payload_add!(33usize, 64usize, 97usize);
+payload_add!(33usize, 65usize, 98usize);
+payload_add!(33usize, 66usize, 99usize);
+payload_add!(33usize, 67usize, 100usize);
+payload_add!(33usize, 68usize, 101usize);
+payload_add!(33usize, 69usize, 102usize);
+payload_add!(33usize, 70usize, 103usize);
+payload_add!(33usize, 71usize, 104usize);
+payload_add!(33usize, 72usize, 105usize);
+payload_add!(33usize, 73usize, 106usize);
+payload_add!(33usize, 74usize, 107usize);
+payload_add!(33usize, 75usize, 108usize);
+payload_add!(33usize, 76usize, 109usize);
+payload_add!(33usize, 77usize, 110usize);
+payload_add!(33usize, 78usize, 111usize);
+payload_add!(33usize, 79usize, 112usize);
+payload_add!(33usize, 80usize, 113usize);
+payload_add!(33usize, 81usize, 114usize);
+payload_add!(33usize, 82usize, 115usize);
+payload_add!(33usize, 83usize, 116usize);
+payload_add!(33usize, 84usize, 117usize);
+payload_add!(33usize, 85usize, 118usize);
+payload_add!(33usize, 86usize, 119usize);
+payload_add!(33usize, 87usize, 120usize);
+payload_add!(33usize, 88usize, 121usize);
+payload_add!(33usize, 89usize, 122usize);
+payload_add!(33usize, 90usize, 123usize);
+payload_add!(33usize, 91usize, 124usize);
+payload_add!(33usize, 92usize, 125usize);
+payload_add!(33usize, 93usize, 126usize);
+payload_add!(33usize, 94usize, 127usize);
+payload_add!(33usize, 95usize, 128usize);
+payload_add!(33usize, 96usize, 129usize);
+payload_add!(33usize, 97usize, 130usize);
+payload_add!(33usize, 98usize, 131usize);
+payload_add!(33usize, 99usize, 132usize);
+payload_add!(33usize, 100usize, 133usize);
+payload_add!(33usize, 101usize, 134usize);
+payload_add!(33usize, 102usize, 135usize);
+payload_add!(33usize, 103usize, 136usize);
+payload_add!(33usize, 104usize, 137usize);
+payload_add!(33usize, 105usize, 138usize);
+payload_add!(33usize, 106usize, 139usize);
+payload_add!(33usize, 107usize, 140usize);
+payload_add!(33usize, 108usize, 141usize);
+payload_add!(33usize, 109usize, 142usize);
+payload_add!(33usize, 110usize, 143usize);
+payload_add!(33usize, 111usize, 144usize);
+payload_add!(33usize, 112usize, 145usize);
+payload_add!(33usize, 113usize, 146usize);
+payload_add!(33usize, 114usize, 147usize);
+payload_add!(33usize, 115usize, 148usize);
+payload_add!(33usize, 116usize, 149usize);
+payload_add!(33usize, 117usize, 150usize);
+payload_add!(33usize, 118usize, 151usize);
+payload_add!(33usize, 119usize, 152usize);
+payload_add!(33usize, 120usize, 153usize);
+payload_add!(33usize, 121usize, 154usize);
+payload_add!(33usize, 122usize, 155usize);
+payload_add!(33usize, 123usize, 156usize);
+payload_add!(33usize, 124usize, 157usize);
+payload_add!(33usize, 125usize, 158usize);
+payload_add!(33usize, 126usize, 159usize);
+payload_add!(33usize, 127usize, 160usize);
+payload_add!(33usize, 128usize, 161usize);
 payload_add!(34usize, 1usize, 35usize);
 payload_add!(34usize, 2usize, 36usize);
 payload_add!(34usize, 3usize, 37usize);
@@ -1717,6 +4357,86 @@ payload_add!(34usize, 45usize, 79usize);
 payload_add!(34usize, 46usize, 80usize);
 payload_add!(34usize, 47usize, 81usize);
 payload_add!(34usize, 48usize, 82usize);
+payload_add!(34usize, 49usize, 83usize);
+payload_add!(34usize, 50usize, 84usize);
+payload_add!(34usize, 51usize, 85usize);
+payload_add!(34usize, 52usize, 86usize);
+payload_add!(34usize, 53usize, 87usize);
+payload_add!(34usize, 54usize, 88usize);
+payload_add!(34usize, 55usize, 89usize);
+payload_add!(34usize, 56usize, 90usize);
+payload_add!(34usize, 57usize, 91usize);
+payload_add!(34usize, 58usize, 92usize);
+payload_add!(34usize, 59usize, 93usize);
+payload_add!(34usize, 60usize, 94usize);
+payload_add!(34usize, 61usize, 95usize);
+payload_add!(34usize, 62usize, 96usize);
+payload_add!(34usize, 63usize, 97usize);
+payload_add!(34usize, 64usize, 98usize);
+payload_add!(34usize, 65usize, 99usize);
+payload_add!(34usize, 66usize, 100usize);
+payload_add!(34usize, 67usize, 101usize);
+payload_add!(34usize, 68usize, 102usize);
+payload_add!(34usize, 69usize, 103usize);
+payload_add!(34usize, 70usize, 104usize);
+payload_add!(34usize, 71usize, 105usize);
+payload_add!(34usize, 72usize, 106usize);
+payload_add!(34usize, 73usize, 107usize);
+payload_add!(34usize, 74usize, 108usize);
+payload_add!(34usize, 75usize, 109usize);
+payload_add!(34usize, 76usize, 110usize);
+payload_add!(34usize, 77usize, 111usize);
+payload_add!(34usize, 78usize, 112usize);
+payload_add!(34usize, 79usize, 113usize);
+payload_add!(34usize, 80usize, 114usize);
+payload_add!(34usize, 81usize, 115usize);
+payload_add!(34usize, 82usize, 116usize);
+payload_add!(34usize, 83usize, 117usize);
+payload_add!(34usize, 84usize, 118usize);
+payload_add!(34usize, 85usize, 119usize);
+payload_add!(34usize, 86usize, 120usize);
+payload_add!(34usize, 87usize, 121usize);
+payload_add!(34usize, 88usize, 122usize);
+payload_add!(34usize, 89usize, 123usize);
+payload_add!(34usize, 90usize, 124usize);
+payload_add!(34usize, 91usize, 125usize);
+payload_add!(34usize, 92usize, 126usize);
+payload_add!(34usize, 93usize, 127usize);
+payload_add!(34usize, 94usize, 128usize);
+payload_add!(34usize, 95usize, 129usize);
+payload_add!(34usize, 96usize, 130usize);
+payload_add!(34usize, 97usize, 131usize);
+payload_add!(34usize, 98usize, 132usize);
+payload_add!(34usize, 99usize, 133usize);
+payload_add!(34usize, 100usize, 134usize);
+payload_add!(34usize, 101usize, 135usize);
+payload_add!(34usize, 102usize, 136usize);
+payload_add!(34usize, 103usize, 137usize);
+payload_add!(34usize, 104usize, 138usize);
+payload_add!(34usize, 105usize, 139usize);
+payload_add!(34usize, 106usize, 140usize);
+payload_add!(34usize, 107usize, 141usize);
+payload_add!(34usize, 108usize, 142usize);
+payload_add!(34usize, 109usize, 143usize);
+payload_add!(34usize, 110usize, 144usize);
+payload_add!(34usize, 111usize, 145usize);
+payload_add!(34usize, 112usize, 146usize);
+payload_add!(34usize, 113usize, 147usize);
+payload_add!(34usize, 114usize, 148usize);
+payload_add!(34usize, 115usize, 149usize);
+payload_add!(34usize, 116usize, 150usize);
+payload_add!(34usize, 117usize, 151usize);
+payload_add!(34usize, 118usize, 152usize);
+payload_add!(34usize, 119usize, 153usize);
+payload_add!(34usize, 120usize, 154usize);
+payload_add!(34usize, 121usize, 155usize);
+payload_add!(34usize, 122usize, 156usize);
+payload_add!(34usize, 123usize, 157usize);
+payload_add!(34usize, 124usize, 158usize);
+payload_add!(34usize, 125usize, 159usize);
+payload_add!(34usize, 126usize, 160usize);
+payload_add!(34usize, 127usize, 161usize);
+payload_add!(34usize, 128usize, 162usize);
 payload_add!(35usize, 1usize, 36usize);
 payload_add!(35usize, 2usize, 37usize);
 payload_add!(35usize, 3usize, 38usize);
@@ -1765,6 +4485,86 @@ payload_add!(35usize, 45usize, 80usize);
 payload_add!(35usize, 46usize, 81usize);
 payload_add!(35usize, 47usize, 82usize);
 payload_add!(35usize, 48usize, 83usize);
+payload_add!(35usize, 49usize, 84usize);
+payload_add!(35usize, 50usize, 85usize);
+payload_add!(35usize, 51usize, 86usize);
+payload_add!(35usize, 52usize, 87usize);
+payload_add!(35usize, 53usize, 88usize);
+payload_add!(35usize, 54usize, 89usize);
+payload_add!(35usize, 55usize, 90usize);
+payload_add!(35usize, 56usize, 91usize);
+payload_add!(35usize, 57usize, 92usize);
+payload_add!(35usize, 58usize, 93usize);
+payload_add!(35usize, 59usize, 94usize);
+payload_add!(35usize, 60usize, 95usize);
+payload_add!(35usize, 61usize, 96usize);
+payload_add!(35usize, 62usize, 97usize);
+payload_add!(35usize, 63usize, 98usize);
+payload_add!(35usize, 64usize, 99usize);
+payload_add!(35usize, 65usize, 100usize);
+payload_add!(35usize, 66usize, 101usize);
+payload_add!(35usize, 67usize, 102usize);
+payload_add!(35usize, 68usize, 103usize);
+payload_add!(35usize, 69usize, 104usize);
+payload_add!(35usize, 70usize, 105usize);
+payload_add!(35usize, 71usize, 106usize);
+payload_add!(35usize, 72usize, 107usize);
+payload_add!(35usize, 73usize, 108usize);
+payload_add!(35usize, 74usize, 109usize);
+payload_add!(35usize, 75usize, 110usize);
+payload_add!(35usize, 76usize, 111usize);
+payload_add!(35usize, 77usize, 112usize);
+payload_add!(35usize, 78usize, 113usize);
+payload_add!(35usize, 79usize, 114usize);
+payload_add!(35usize, 80usize, 115usize);
+payload_add!(35usize, 81usize, 116usize);
+payload_add!(35usize, 82usize, 117usize);
+payload_add!(35usize, 83usize, 118usize);
+payload_add!(35usize, 84usize, 119usize);
+payload_add!(35usize, 85usize, 120usize);
+payload_add!(35usize, 86usize, 121usize);
+payload_add!(35usize, 87usize, 122usize);
+payload_add!(35usize, 88usize, 123usize);
+payload_add!(35usize, 89usize, 124usize);
+payload_add!(35usize, 90usize, 125usize);
+payload_add!(35usize, 91usize, 126usize);
+payload_add!(35usize, 92usize, 127usize);
+payload_add!(35usize, 93usize, 128usize);
+payload_add!(35usize, 94usize, 129usize);
+payload_add!(35usize, 95usize, 130usize);
+payload_add!(35usize, 96usize, 131usize);
+payload_add!(35usize, 97usize, 132usize);
+payload_add!(35usize, 98usize, 133usize);
+payload_add!(35usize, 99usize, 134usize);
+payload_add!(35usize, 100usize, 135usize);
+payload_add!(35usize, 101usize, 136usize);
+payload_add!(35usize, 102usize, 137usize);
+payload_add!(35usize, 103usize, 138usize);
+payload_add!(35usize, 104usize, 139usize);
+payload_add!(35usize, 105usize, 140usize);
+payload_add!(35usize, 106usize, 141usize);
+payload_add!(35usize, 107usize, 142usize);
+payload_add!(35usize, 108usize, 143usize);
+payload_add!(35usize, 109usize, 144usize);
+payload_add!(35usize, 110usize, 145usize);
+payload_add!(35usize, 111usize, 146usize);
+payload_add!(35usize, 112usize, 147usize);
+payload_add!(35usize, 113usize, 148usize);
+payload_add!(35usize, 114usize, 149usize);
+payload_add!(35usize, 115usize, 150usize);
+payload_add!(35usize, 116usize, 151usize);
+payload_add!(35usize, 117usize, 152usize);
+payload_add!(35usize, 118usize, 153usize);
+payload_add!(35usize, 119usize, 154usize);
+payload_add!(35usize, 120usize, 155usize);
+payload_add!(35usize, 121usize, 156usize);
+payload_add!(35usize, 122usize, 157usize);
+payload_add!(35usize, 123usize, 158usize);
+payload_add!(35usize, 124usize, 159usize);
+payload_add!(35usize, 125usize, 160usize);
+payload_add!(35usize, 126usize, 161usize);
+payload_add!(35usize, 127usize, 162usize);
+payload_add!(35usize, 128usize, 163usize);
 payload_add!(36usize, 1usize, 37usize);
 payload_add!(36usize, 2usize, 38usize);
 payload_add!(36usize, 3usize, 39usize);
@@ -1813,6 +4613,86 @@ payload_add!(36usize, 45usize, 81usize);
 payload_add!(36usize, 46usize, 82usize);
 payload_add!(36usize, 47usize, 83usize);
 payload_add!(36usize, 48usize, 84usize);
+payload_add!(36usize, 49usize, 85usize);
+payload_add!(36usize, 50usize, 86usize);
+payload_add!(36usize, 51usize, 87usize);
+payload_add!(36usize, 52usize, 88usize);
+payload_add!(36usize, 53usize, 89usize);
+payload_add!(36usize, 54usize, 90usize);
+payload_add!(36usize, 55usize, 91usize);
+payload_add!(36usize, 56usize, 92usize);
+payload_add!(36usize, 57usize, 93usize);
+payload_add!(36usize, 58usize, 94usize);
+payload_add!(36usize, 59usize, 95usize);
+payload_add!(36usize, 60usize, 96usize);
+payload_add!(36usize, 61usize, 97usize);
+payload_add!(36usize, 62usize, 98usize);
+payload_add!(36usize, 63usize, 99usize);
+payload_add!(36usize, 64usize, 100usize);
+payload_add!(36usize, 65usize, 101usize);
+payload_add!(36usize, 66usize, 102usize);
+payload_add!(36usize, 67usize, 103usize);
+payload_add!(36usize, 68usize, 104usize);
+payload_add!(36usize, 69usize, 105usize);
+payload_add!(36usize, 70usize, 106usize);
+payload_add!(36usize, 71usize, 107usize);
+payload_add!(36usize, 72usize, 108usize);
+payload_add!(36usize, 73usize, 109usize);
+payload_add!(36usize, 74usize, 110usize);
+payload_add!(36usize, 75usize, 111usize);
+payload_add!(36usize, 76usize, 112usize);
+payload_add!(36usize, 77usize, 113usize);
+payload_add!(36usize, 78usize, 114usize);
+payload_add!(36usize, 79usize, 115usize);
+payload_add!(36usize, 80usize, 116usize);
+payload_add!(36usize, 81usize, 117usize);
+payload_add!(36usize, 82usize, 118usize);
+payload_add!(36usize, 83usize, 119usize);
+payload_add!(36usize, 84usize, 120usize);
+payload_add!(36usize, 85usize, 121usize);
+payload_add!(36usize, 86usize, 122usize);
+payload_add!(36usize, 87usize, 123usize);
+payload_add!(36usize, 88usize, 124usize);
+payload_add!(36usize, 89usize, 125usize);
+payload_add!(36usize, 90usize, 126usize);
+payload_add!(36usize, 91usize, 127usize);
+payload_add!(36usize, 92usize, 128usize);
+payload_add!(36usize, 93usize, 129usize);
+payload_add!(36usize, 94usize, 130usize);
+payload_add!(36usize, 95usize, 131usize);
+payload_add!(36usize, 96usize, 132usize);
+payload_add!(36usize, 97usize, 133usize);
+payload_add!(36usize, 98usize, 134usize);
+payload_add!(36usize, 99usize, 135usize);
+payload_add!(36usize, 100usize, 136usize);
+payload_add!(36usize, 101usize, 137usize);
+payload_add!(36usize, 102usize, 138usize);
+payload_add!(36usize, 103usize, 139usize);
+payload_add!(36usize, 104usize, 140usize);
+payload_add!(36usize, 105usize, 141usize);
+payload_add!(36usize, 106usize, 142usize);
+payload_add!(36usize, 107usize, 143usize);
+payload_add!(36usize, 108usize, 144usize);
+payload_add!(36usize, 109usize, 145usize);
+payload_add!(36usize, 110usize, 146usize);
+payload_add!(36usize, 111usize, 147usize);
+payload_add!(36usize, 112usize, 148usize);
+payload_add!(36usize, 113usize, 149usize);
+payload_add!(36usize, 114usize, 150usize);
+payload_add!(36usize, 115usize, 151usize);
+payload_add!(36usize, 116usize, 152usize);
+payload_add!(36usize, 117usize, 153usize);
+payload_add!(36usize, 118usize, 154usize);
+payload_add!(36usize, 119usize, 155usize);
+payload_add!(36usize, 120usize, 156usize);
+payload_add!(36usize, 121usize, 157usize);
+payload_add!(36usize, 122usize, 158usize);
+payload_add!(36usize, 123usize, 159usize);
+payload_add!(36usize, 124usize, 160usize);
+payload_add!(36usize, 125usize, 161usize);
+payload_add!(36usize, 126usize, 162usize);
+payload_add!(36usize, 127usize, 163usize);
+payload_add!(36usize, 128usize, 164usize);
 payload_add!(37usize, 1usize, 38usize);
 payload_add!(37usize, 2usize, 39usize);
 payload_add!(37usize, 3usize, 40usize);
@@ -1861,6 +4741,86 @@ payload_add!(37usize, 45usize, 82usize);
 payload_add!(37usize, 46usize, 83usize);
 payload_add!(37usize, 47usize, 84usize);
 payload_add!(37usize, 48usize, 85usize);
+payload_add!(37usize, 49usize, 86usize);
+payload_add!(37usize, 50usize, 87usize);
+payload_add!(37usize, 51usize, 88usize);
+payload_add!(37usize, 52usize, 89usize);
+payload_add!(37usize, 53usize, 90usize);
+payload_add!(37usize, 54usize, 91usize);
+payload_add!(37usize, 55usize, 92usize);
+payload_add!(37usize, 56usize, 93usize);
+payload_add!(37usize, 57usize, 94usize);
+payload_add!(37usize, 58usize, 95usize);
+payload_add!(37usize, 59usize, 96usize);
+payload_add!(37usize, 60usize, 97usize);
+payload_add!(37usize, 61usize, 98usize);
+payload_add!(37usize, 62usize, 99usize);
+payload_add!(37usize, 63usize, 100usize);
+payload_add!(37usize, 64usize, 101usize);
+payload_add!(37usize, 65usize, 102usize);
+payload_add!(37usize, 66usize, 103usize);
+payload_add!(37usize, 67usize, 104usize);
+payload_add!(37usize, 68usize, 105usize);
+payload_add!(37usize, 69usize, 106usize);
+payload_add!(37usize, 70usize, 107usize);
+payload_add!(37usize, 71usize, 108usize);
+payload_add!(37usize, 72usize, 109usize);
+payload_add!(37usize, 73usize, 110usize);
+payload_add!(37usize, 74usize, 111usize);
+payload_add!(37usize, 75usize, 112usize);
+payload_add!(37usize, 76usize, 113usize);
+payload_add!(37usize, 77usize, 114usize);
+payload_add!(37usize, 78usize, 115usize);
+payload_add!(37usize, 79usize, 116usize);
+payload_add!(37usize, 80usize, 117usize);
+payload_add!(37usize, 81usize, 118usize);
+payload_add!(37usize, 82usize, 119usize);
+payload_add!(37usize, 83usize, 120usize);
+payload_add!(37usize, 84usize, 121usize);
+payload_add!(37usize, 85usize, 122usize);
+payload_add!(37usize, 86usize, 123usize);
+payload_add!(37usize, 87usize, 124usize);
+payload_add!(37usize, 88usize, 125usize);
+payload_add!(37usize, 89usize, 126usize);
+payload_add!(37usize, 90usize, 127usize);
+payload_add!(37usize, 91usize, 128usize);
+payload_add!(37usize, 92usize, 129usize);
+payload_add!(37usize, 93usize, 130usize);
+payload_add!(37usize, 94usize, 131usize);
+payload_add!(37usize, 95usize, 132usize);
+payload_add!(37usize, 96usize, 133usize);
+payload_add!(37usize, 97usize, 134usize);
+payload_add!(37usize, 98usize, 135usize);
+payload_add!(37usize, 99usize, 136usize);
+payload_add!(37usize, 100usize, 137usize);
+payload_add!(37usize, 101usize, 138usize);
+payload_add!(37usize, 102usize, 139usize);
+payload_add!(37usize, 103usize, 140usize);
+payload_add!(37usize, 104usize, 141usize);
+payload_add!(37usize, 105usize, 142usize);
+payload_add!(37usize, 106usize, 143usize);
+payload_add!(37usize, 107usize, 144usize);
+payload_add!(37usize, 108usize, 145usize);
+payload_add!(37usize, 109usize, 146usize);
+payload_add!(37usize, 110usize, 147usize);
+payload_add!(37usize, 111usize, 148usize);
+payload_add!(37usize, 112usize, 149usize);
+payload_add!(37usize, 113usize, 150usize);
+payload_add!(37usize, 114usize, 151usize);
+payload_add!(37usize, 115usize, 152usize);
+payload_add!(37usize, 116usize, 153usize);
+payload_add!(37usize, 117usize, 154usize);
+payload_add!(37usize, 118usize, 155usize);
+payload_add!(37usize, 119usize, 156usize);
+payload_add!(37usize, 120usize, 157usize);
+payload_add!(37usize, 121usize, 158usize);
+payload_add!(37usize, 122usize, 159usize);
+payload_add!(37usize, 123usize, 160usize);
+payload_add!(37usize, 124usize, 161usize);
+payload_add!(37usize, 125usize, 162usize);
+payload_add!(37usize, 126usize, 163usize);
+payload_add!(37usize, 127usize, 164usize);
+payload_add!(37usize, 128usize, 165usize);
 payload_add!(38usize, 1usize, 39usize);
 payload_add!(38usize, 2usize, 40usize);
 payload_add!(38usize, 3usize, 41usize);
@@ -1909,6 +4869,86 @@ payload_add!(38usize, 45usize, 83usize);
 payload_add!(38usize, 46usize, 84usize);
 payload_add!(38usize, 47usize, 85usize);
 payload_add!(38usize, 48usize, 86usize);
+payload_add!(38usize, 49usize, 87usize);
+payload_add!(38usize, 50usize, 88usize);
+payload_add!(38usize, 51usize, 89usize);
+payload_add!(38usize, 52usize, 90usize);
+payload_add!(38usize, 53usize, 91usize);
+payload_add!(38usize, 54usize, 92usize);
+payload_add!(38usize, 55usize, 93usize);
+payload_add!(38usize, 56usize, 94usize);
+payload_add!(38usize, 57usize, 95usize);
+payload_add!(38usize, 58usize, 96usize);
+payload_add!(38usize, 59usize, 97usize);
+payload_add!(38usize, 60usize, 98usize);
+payload_add!(38usize, 61usize, 99usize);
+payload_add!(38usize, 62usize, 100usize);
+payload_add!(38usize, 63usize, 101usize);
+payload_add!(38usize, 64usize, 102usize);
+payload_add!(38usize, 65usize, 103usize);
+payload_add!(38usize, 66usize, 104usize);
+payload_add!(38usize, 67usize, 105usize);
+payload_add!(38usize, 68usize, 106usize);
+payload_add!(38usize, 69usize, 107usize);
+payload_add!(38usize, 70usize, 108usize);
+payload_add!(38usize, 71usize, 109usize);
+payload_add!(38usize, 72usize, 110usize);
+payload_add!(38usize, 73usize, 111usize);
+payload_add!(38usize, 74usize, 112usize);
+payload_add!(38usize, 75usize, 113usize);
+payload_add!(38usize, 76usize, 114usize);
+payload_add!(38usize, 77usize, 115usize);
+payload_add!(38usize, 78usize, 116usize);
+payload_add!(38usize, 79usize, 117usize);
+payload_add!(38usize, 80usize, 118usize);
+payload_add!(38usize, 81usize, 119usize);
+payload_add!(38usize, 82usize, 120usize);
+payload_add!(38usize, 83usize, 121usize);
+payload_add!(38usize, 84usize, 122usize);
+payload_add!(38usize, 85usize, 123usize);
+payload_add!(38usize, 86usize, 124usize);
+payload_add!(38usize, 87usize, 125usize);
+payload_add!(38usize, 88usize, 126usize);
+payload_add!(38usize, 89usize, 127usize);
+payload_add!(38usize, 90usize, 128usize);
+payload_add!(38usize, 91usize, 129usize);
+payload_add!(38usize, 92usize, 130usize);
+payload_add!(38usize, 93usize, 131usize);
+payload_add!(38usize, 94usize, 132usize);
+payload_add!(38usize, 95usize, 133usize);
+payload_add!(38usize, 96usize, 134usize);
+payload_add!(38usize, 97usize, 135usize);
+payload_add!(38usize, 98usize, 136usize);
+payload_add!(38usize, 99usize, 137usize);
+payload_add!(38usize, 100usize, 138usize);
+payload_add!(38usize, 101usize, 139usize);
+payload_add!(38usize, 102usize, 140usize);
+payload_add!(38usize, 103usize, 141usize);
+payload_add!(38usize, 104usize, 142usize);
+payload_add!(38usize, 105usize, 143usize);
+payload_add!(38usize, 106usize, 144usize);
+payload_add!(38usize, 107usize, 145usize);
+payload_add!(38usize, 108usize, 146usize);
+payload_add!(38usize, 109usize, 147usize);
+payload_add!(38usize, 110usize, 148usize);
+payload_add!(38usize, 111usize, 149usize);
+payload_add!(38usize, 112usize, 150usize);
+payload_add!(38usize, 113usize, 151usize);
+payload_add!(38usize, 114usize, 152usize);
+payload_add!(38usize, 115usize, 153usize);
+payload_add!(38usize, 116usize, 154usize);
+payload_add!(38usize, 117usize, 155usize);
+payload_add!(38usize, 118usize, 156usize);
+payload_add!(38usize, 119usize, 157usize);
+payload_add!(38usize, 120usize, 158usize);
+payload_add!(38usize, 121usize, 159usize);
+payload_add!(38usize, 122usize, 160usize);
+payload_add!(38usize, 123usize, 161usize);
+payload_add!(38usize, 124usize, 162usize);
+payload_add!(38usize, 125usize, 163usize);
+payload_add!(38usize, 126usize, 164usize);
+payload_add!(38usize, 127usize, 165usize);
+payload_add!(38usize, 128usize, 166usize);
 payload_add!(39usize, 1usize, 40usize);
 payload_add!(39usize, 2usize, 41usize);
 payload_add!(39usize, 3usize, 42usize);
@@ -1957,6 +4997,86 @@ payload_add!(39usize, 45usize, 84usize);
 payload_add!(39usize, 46usize, 85usize);
 payload_add!(39usize, 47usize, 86usize);
 payload_add!(39usize, 48usize, 87usize);
+payload_add!(39usize, 49usize, 88usize);
+payload_add!(39usize, 50usize, 89usize);
+payload_add!(39usize, 51usize, 90usize);
+payload_add!(39usize, 52usize, 91usize);
+payload_add!(39usize, 53usize, 92usize);
+payload_add!(39usize, 54usize, 93usize);
+payload_add!(39usize, 55usize, 94usize);
+payload_add!(39usize, 56usize, 95usize);
+payload_add!(39usize, 57usize, 96usize);
+payload_add!(39usize, 58usize, 97usize);
+payload_add!(39usize, 59usize, 98usize);
+payload_add!(39usize, 60usize, 99usize);
+payload_add!(39usize, 61usize, 100usize);
+payload_add!(39usize, 62usize, 101usize);
+payload_add!(39usize, 63usize, 102usize);
+payload_add!(39usize, 64usize, 103usize);
+payload_add!(39usize, 65usize, 104usize);
+payload_add!(39usize, 66usize, 105usize);
+payload_add!(39usize, 67usize, 106usize);
+payload_add!(39usize, 68usize, 107usize);
+payload_add!(39usize, 69usize, 108usize);
+payload_add!(39usize, 70usize, 109usize);
+payload_add!(39usize, 71usize, 110usize);
+payload_add!(39usize, 72usize, 111usize);
+payload_add!(39usize, 73usize, 112usize);
+payload_add!(39usize, 74usize, 113usize);
+payload_add!(39usize, 75usize, 114usize);
+payload_add!(39usize, 76usize, 115usize);
+payload_add!(39usize, 77usize, 116usize);
+payload_add!(39usize, 78usize, 117usize);
+payload_add!(39usize, 79usize, 118usize);
+payload_add!(39usize, 80usize, 119usize);
+payload_add!(39usize, 81usize, 120usize);
+payload_add!(39usize, 82usize, 121usize);
+payload_add!(39usize, 83usize, 122usize);
+payload_add!(39usize, 84usize, 123usize);
+payload_add!(39usize, 85usize, 124usize);
+payload_add!(39usize, 86usize, 125usize);
+payload_add!(39usize, 87usize, 126usize);
+payload_add!(39usize, 88usize, 127usize);
+payload_add!(39usize, 89usize, 128usize);
+payload_add!(39usize, 90usize, 129usize);
+payload_add!(39usize, 91usize, 130usize);
+payload_add!(39usize, 92usize, 131usize);
+payload_add!(39usize, 93usize, 132usize);
+payload_add!(39usize, 94usize, 133usize);
+payload_add!(39usize, 95usize, 134usize);
+payload_add!(39usize, 96usize, 135usize);
+payload_add!(39usize, 97usize, 136usize);
+payload_add!(39usize, 98usize, 137usize);
+payload_add!(39usize, 99usize, 138usize);
+payload_add!(39usize, 100usize, 139usize);
+payload_add!(39usize, 101usize, 140usize);
+payload_add!(39usize, 102usize, 141usize);
+payload_add!(39usize, 103usize, 142usize);
+payload_add!(39usize, 104usize, 143usize);
+payload_add!(39usize, 105usize, 144usize);
+payload_add!(39usize, 106usize, 145usize);
+payload_add!(39usize, 107usize, 146usize);
+payload_add!(39usize, 108usize, 147usize);
+payload_add!(39usize, 109usize, 148usize);
+payload_add!(39usize, 110usize, 149usize);
+payload_add!(39usize, 111usize, 150usize);
+payload_add!(39usize, 112usize, 151usize);
+payload_add!(39usize, 113usize, 152usize);
+payload_add!(39usize, 114usize, 153usize);
+payload_add!(39usize, 115usize, 154usize);
+payload_add!(39usize, 116usize, 155usize);
+payload_add!(39usize, 117usize, 156usize);
+payload_add!(39usize, 118usize, 157usize);
+payload_add!(39usize, 119usize, 158usize);
+payload_add!(39usize, 120usize, 159usize);
+payload_add!(39usize, 121usize, 160usize);
+payload_add!(39usize, 122usize, 161usize);
+payload_add!(39usize, 123usize, 162usize);
+payload_add!(39usize, 124usize, 163usize);
+payload_add!(39usize, 125usize, 164usize);
+payload_add!(39usize, 126usize, 165usize);
+payload_add!(39usize, 127usize, 166usize);
+payload_add!(39usize, 128usize, 167usize);
 payload_add!(40usize, 1usize, 41usize);
 payload_add!(40usize, 2usize, 42usize);
 payload_add!(40usize, 3usize, 43usize);
@@ -2005,6 +5125,86 @@ payload_add!(40usize, 45usize, 85usize);
 payload_add!(40usize, 46usize, 86usize);
 payload_add!(40usize, 47usize, 87usize);
 payload_add!(40usize, 48usize, 88usize);
+payload_add!(40usize, 49usize, 89usize);
+payload_add!(40usize, 50usize, 90usize);
+payload_add!(40usize, 51usize, 91usize);
+payload_add!(40usize, 52usize, 92usize);
+payload_add!(40usize, 53usize, 93usize);
+payload_add!(40usize, 54usize, 94usize);
+payload_add!(40usize, 55usize, 95usize);
+payload_add!(40usize, 56usize, 96usize);
+payload_add!(40usize, 57usize, 97usize);
+payload_add!(40usize, 58usize, 98usize);
+payload_add!(40usize, 59usize, 99usize);
+payload_add!(40usize, 60usize, 100usize);
+payload_add!(40usize, 61usize, 101usize);
+payload_add!(40usize, 62usize, 102usize);
+payload_add!(40usize, 63usize, 103usize);
+payload_add!(40usize, 64usize, 104usize);
+payload_add!(40usize, 65usize, 105usize);
+payload_add!(40usize, 66usize, 106usize);
+payload_add!(40usize, 67usize, 107usize);
+payload_add!(40usize, 68usize, 108usize);
+payload_add!(40usize, 69usize, 109usize);
+payload_add!(40usize, 70usize, 110usize);
+payload_add!(40usize, 71usize, 111usize);
+payload_add!(40usize, 72usize, 112usize);
+payload_add!(40usize, 73usize, 113usize);
+payload_add!(40usize, 74usize, 114usize);
+payload_add!(40usize, 75usize, 115usize);
+payload_add!(40usize, 76usize, 116usize);
+payload_add!(40usize, 77usize, 117usize);
+payload_add!(40usize, 78usize, 118usize);
+payload_add!(40usize, 79usize, 119usize);
+payload_add!(40usize, 80usize, 120usize);
+payload_add!(40usize, 81usize, 121usize);
+payload_add!(40usize, 82usize, 122usize);
+payload_add!(40usize, 83usize, 123usize);
+payload_add!(40usize, 84usize, 124usize);
+payload_add!(40usize, 85usize, 125usize);
+payload_add!(40usize, 86usize, 126usize);
+payload_add!(40usize, 87usize, 127usize);
+payload_add!(40usize, 88usize, 128usize);
+payload_add!(40usize, 89usize, 129usize);
+payload_add!(40usize, 90usize, 130usize);
+payload_add!(40usize, 91usize, 131usize);
+payload_add!(40usize, 92usize, 132usize);
+payload_add!(40usize, 93usize, 133usize);
+payload_add!(40usize, 94usize, 134usize);
+payload_add!(40usize, 95usize, 135usize);
+payload_add!(40usize, 96usize, 136usize);
+payload_add!(40usize, 97usize, 137usize);
+payload_add!(40usize, 98usize, 138usize);
+payload_add!(40usize, 99usize, 139usize);
+payload_add!(40usize, 100usize, 140usize);
+payload_add!(40usize, 101usize, 141usize);
+payload_add!(40usize, 102usize, 142usize);
+payload_add!(40usize, 103usize, 143usize);
+payload_add!(40usize, 104usize, 144usize);
+payload_add!(40usize, 105usize, 145usize);
+payload_add!(40usize, 106usize, 146usize);
+payload_add!(40usize, 107usize, 147usize);
+payload_add!(40usize, 108usize, 148usize);
+payload_add!(40usize, 109usize, 149usize);
+payload_add!(40usize, 110usize, 150usize);
+payload_add!(40usize, 111usize, 151usize);
+payload_add!(40usize, 112usize, 152usize);
+payload_add!(40usize, 113usize, 153usize);
+payload_add!(40usize, 114usize, 154usize);
+payload_add!(40usize, 115usize, 155usize);
+payload_add!(40usize, 116usize, 156usize);
+payload_add!(40usize, 117usize, 157usize);
+payload_add!(40usize, 118usize, 158usize);
+payload_add!(40usize, 119usize, 159usize);
+payload_add!(40usize, 120usize, 160usize);
+payload_add!(40usize, 121usize, 161usize);
+payload_add!(40usize, 122usize, 162usize);
+payload_add!(40usize, 123usize, 163usize);
+payload_add!(40usize, 124usize, 164usize);
+payload_add!(40usize, 125usize, 165usize);
+payload_add!(40usize, 126usize, 166usize);
+payload_add!(40usize, 127usize, 167usize);
+payload_add!(40usize, 128usize, 168usize);
 payload_add!(41usize, 1usize, 42usize);
 payload_add!(41usize, 2usize, 43usize);
 payload_add!(41usize, 3usize, 44usize);
@@ -2053,6 +5253,86 @@ payload_add!(41usize, 45usize, 86usize);
 payload_add!(41usize, 46usize, 87usize);
 payload_add!(41usize, 47usize, 88usize);
 payload_add!(41usize, 48usize, 89usize);
+payload_add!(41usize, 49usize, 90usize);
+payload_add!(41usize, 50usize, 91usize);
+payload_add!(41usize, 51usize, 92usize);
+payload_add!(41usize, 52usize, 93usize);
+payload_add!(41usize, 53usize, 94usize);
+payload_add!(41usize, 54usize, 95usize);
+payload_add!(41usize, 55usize, 96usize);
+payload_add!(41usize, 56usize, 97usize);
+payload_add!(41usize, 57usize, 98usize);
+payload_add!(41usize, 58usize, 99usize);
+payload_add!(41usize, 59usize, 100usize);
+payload_add!(41usize, 60usize, 101usize);
+payload_add!(41usize, 61usize, 102usize);
+payload_add!(41usize, 62usize, 103usize);
+payload_add!(41usize, 63usize, 104usize);
+payload_add!(41usize, 64usize, 105usize);
+payload_add!(41usize, 65usize, 106usize);
+payload_add!(41usize, 66usize, 107usize);
+payload_add!(41usize, 67usize, 108usize);
+payload_add!(41usize, 68usize, 109usize);
+payload_add!(41usize, 69usize, 110usize);
+payload_add!(41usize, 70usize, 111usize);
+payload_add!(41usize, 71usize, 112usize);
+payload_add!(41usize, 72usize, 113usize);
+payload_add!(41usize, 73usize, 114usize);
+payload_add!(41usize, 74usize, 115usize);
+payload_add!(41usize, 75usize, 116usize);
+payload_add!(41usize, 76usize, 117usize);
+payload_add!(41usize, 77usize, 118usize);
+payload_add!(41usize, 78usize, 119usize);
+payload_add!(41usize, 79usize, 120usize);
+payload_add!(41usize, 80usize, 121usize);
+payload_add!(41usize, 81usize, 122usize);
+payload_add!(41usize, 82usize, 123usize);
+payload_add!(41usize, 83usize, 124usize);
+payload_add!(41usize, 84usize, 125usize);
+payload_add!(41usize, 85usize, 126usize);
+payload_add!(41usize, 86usize, 127usize);
+payload_add!(41usize, 87usize, 128usize);
+payload_add!(41usize, 88usize, 129usize);
+payload_add!(41usize, 89usize, 130usize);
+payload_add!(41usize, 90usize, 131usize);
+payload_add!(41usize, 91usize, 132usize);
+payload_add!(41usize, 92usize, 133usize);
+payload_add!(41usize, 93usize, 134usize);
+payload_add!(41usize, 94usize, 135usize);
+payload_add!(41usize, 95usize, 136usize);
+payload_add!(41usize, 96usize, 137usize);
+payload_add!(41usize, 97usize, 138usize);
+payload_add!(41usize, 98usize, 139usize);
+payload_add!(41usize, 99usize, 140usize);
+payload_add!(41usize, 100usize, 141usize);
+payload_add!(41usize, 101usize, 142usize);
+payload_add!(41usize, 102usize, 143usize);
+payload_add!(41usize, 103usize, 144usize);
+payload_add!(41usize, 104usize, 145usize);
+payload_add!(41usize, 105usize, 146usize);
+payload_add!(41usize, 106usize, 147usize);
+payload_add!(41usize, 107usize, 148usize);
+payload_add!(41usize, 108usize, 149usize);
+payload_add!(41usize, 109usize, 150usize);
+payload_add!(41usize, 110usize, 151usize);
+payload_add!(41usize, 111usize, 152usize);
+payload_add!(41usize, 112usize, 153usize);
+payload_add!(41usize, 113usize, 154usize);
+payload_add!(41usize, 114usize, 155usize);
+payload_add!(41usize, 115usize, 156usize);
+payload_add!(41usize, 116usize, 157usize);
+payload_add!(41usize, 117usize, 158usize);
+payload_add!(41usize, 118usize, 159usize);
+payload_add!(41usize, 119usize, 160usize);
+payload_add!(41usize, 120usize, 161usize);
+payload_add!(41usize, 121usize, 162usize);
+payload_add!(41usize, 122usize, 163usize);
+payload_add!(41usize, 123usize, 164usize);
+payload_add!(41usize, 124usize, 165usize);
+payload_add!(41usize, 125usize, 166usize);
+payload_add!(41usize, 126usize, 167usize);
+payload_add!(41usize, 127usize, 168usize);
+payload_add!(41usize, 128usize, 169usize);
 payload_add!(42usize, 1usize, 43usize);
 payload_add!(42usize, 2usize, 44usize);
 payload_add!(42usize, 3usize, 45usize);
@@ -2101,6 +5381,86 @@ payload_add!(42usize, 45usize, 87usize);
 payload_add!(42usize, 46usize, 88usize);
 payload_add!(42usize, 47usize, 89usize);
 payload_add!(42usize, 48usize, 90usize);
+payload_add!(42usize, 49usize, 91usize);
+payload_add!(42usize, 50usize, 92usize);
+payload_add!(42usize, 51usize, 93usize);
+payload_add!(42usize, 52usize, 94usize);
+payload_add!(42usize, 53usize, 95usize);
+payload_add!(42usize, 54usize, 96usize);
+payload_add!(42usize, 55usize, 97usize);
+payload_add!(42usize, 56usize, 98usize);
+payload_add!(42usize, 57usize, 99usize);
+payload_add!(42usize, 58usize, 100usize);
+payload_add!(42usize, 59usize, 101usize);
+payload_add!(42usize, 60usize, 102usize);
+payload_add!(42usize, 61usize, 103usize);
+payload_add!(42usize, 62usize, 104usize);
+payload_add!(42usize, 63usize, 105usize);
+payload_add!(42usize, 64usize, 106usize);
+payload_add!(42usize, 65usize, 107usize);
+payload_add!(42usize, 66usize, 108usize);
+payload_add!(42usize, 67usize, 109usize);
+payload_add!(42usize, 68usize, 110usize);
+payload_add!(42usize, 69usize, 111usize);
+payload_add!(42usize, 70usize, 112usize);
+payload_add!(42usize, 71usize, 113usize);
+payload_add!(42usize, 72usize, 114usize);
+payload_add!(42usize, 73usize, 115usize);
+payload_add!(42usize, 74usize, 116usize);
+payload_add!(42usize, 75usize, 117usize);
+payload_add!(42usize, 76usize, 118usize);
+payload_add!(42usize, 77usize, 119usize);
+payload_add!(42usize, 78usize, 120usize);
+payload_add!(42usize, 79usize, 121usize);
+payload_add!(42usize, 80usize, 122usize);
+payload_add!(42usize, 81usize, 123usize);
+payload_add!(42usize, 82usize, 124usize);
+payload_add!(42usize, 83usize, 125usize);
+payload_add!(42usize, 84usize, 126usize);
+payload_add!(42usize, 85usize, 127usize);
+payload_add!(42usize, 86usize, 128usize);
+payload_add!(42usize, 87usize, 129usize);
+payload_add!(42usize, 88usize, 130usize);
+payload_add!(42usize, 89usize, 131usize);
+payload_add!(42usize, 90usize, 132usize);
+payload_add!(42usize, 91usize, 133usize);
+payload_add!(42usize, 92usize, 134usize);
+payload_add!(42usize, 93usize, 135usize);
+payload_add!(42usize, 94usize, 136usize);
+payload_add!(42usize, 95usize, 137usize);
+payload_add!(42usize, 96usize, 138usize);
+payload_add!(42usize, 97usize, 139usize);
+payload_add!(42usize, 98usize, 140usize);
+payload_add!(42usize, 99usize, 141usize);
+payload_add!(42usize, 100usize, 142usize);
+payload_add!(42usize, 101usize, 143usize);
+payload_add!(42usize, 102usize, 144usize);
+payload_add!(42usize, 103usize, 145usize);
+payload_add!(42usize, 104usize, 146usize);
+payload_add!(42usize, 105usize, 147usize);
+payload_add!(42usize, 106usize, 148usize);
+payload_add!(42usize, 107usize, 149usize);
+payload_add!(42usize, 108usize, 150usize);
+payload_add!(42usize, 109usize, 151usize);
+payload_add!(42usize, 110usize, 152usize);
+payload_add!(42usize, 111usize, 153usize);
+payload_add!(42usize, 112usize, 154usize);
+payload_add!(42usize, 113usize, 155usize);
+payload_add!(42usize, 114usize, 156usize);
+payload_add!(42usize, 115usize, 157usize);
+payload_add!(42usize, 116usize, 158usize);
+payload_add!(42usize, 117usize, 159usize);
+payload_add!(42usize, 118usize, 160usize);
+payload_add!(42usize, 119usize, 161usize);
+payload_add!(42usize, 120usize, 162usize);
+payload_add!(42usize, 121usize, 163usize);
+payload_add!(42usize, 122usize, 164usize);
+payload_add!(42usize, 123usize, 165usize);
+payload_add!(42usize, 124usize, 166usize);
+payload_add!(42usize, 125usize, 167usize);
+payload_add!(42usize, 126usize, 168usize);
+payload_add!(42usize, 127usize, 169usize);
+payload_add!(42usize, 128usize, 170usize);
 payload_add!(43usize, 1usize, 44usize);
 payload_add!(43usize, 2usize, 45usize);
 payload_add!(43usize, 3usize, 46usize);
@@ -2149,6 +5509,86 @@ payload_add!(43usize, 45usize, 88usize);
 payload_add!(43usize, 46usize, 89usize);
 payload_add!(43usize, 47usize, 90usize);
 payload_add!(43usize, 48usize, 91usize);
+payload_add!(43usize, 49usize, 92usize);
+payload_add!(43usize, 50usize, 93usize);
+payload_add!(43usize, 51usize, 94usize);
+payload_add!(43usize, 52usize, 95usize);
+payload_add!(43usize, 53usize, 96usize);
+payload_add!(43usize, 54usize, 97usize);
+payload_add!(43usize, 55usize, 98usize);
+payload_add!(43usize, 56usize, 99usize);
+payload_add!(43usize, 57usize, 100usize);
+payload_add!(43usize, 58usize, 101usize);
+payload_add!(43usize, 59usize, 102usize);
+payload_add!(43usize, 60usize, 103usize);
+payload_add!(43usize, 61usize, 104usize);
+payload_add!(43usize, 62usize, 105usize);
+payload_add!(43usize, 63usize, 106usize);
+payload_add!(43usize, 64usize, 107usize);
+payload_add!(43usize, 65usize, 108usize);
+payload_add!(43usize, 66usize, 109usize);
+payload_add!(43usize, 67usize, 110usize);
+payload_add!(43usize, 68usize, 111usize);
+payload_add!(43usize, 69usize, 112usize);
+payload_add!(43usize, 70usize, 113usize);
+payload_add!(43usize, 71usize, 114usize);
+payload_add!(43usize, 72usize, 115usize);
+payload_add!(43usize, 73usize, 116usize);
+payload_add!(43usize, 74usize, 117usize);
+payload_add!(43usize, 75usize, 118usize);
+payload_add!(43usize, 76usize, 119usize);
+payload_add!(43usize, 77usize, 120usize);
+payload_add!(43usize, 78usize, 121usize);
+payload_add!(43usize, 79usize, 122usize);
+payload_add!(43usize, 80usize, 123usize);
+payload_add!(43usize, 81usize, 124usize);
+payload_add!(43usize, 82usize, 125usize);
+payload_add!(43usize, 83usize, 126usize);
+payload_add!(43usize, 84usize, 127usize);
+payload_add!(43usize, 85usize, 128usize);
+payload_add!(43usize, 86usize, 129usize);
+payload_add!(43usize, 87usize, 130usize);
+payload_add!(43usize, 88usize, 131usize);
+payload_add!(43usize, 89usize, 132usize);
+payload_add!(43usize, 90usize, 133usize);
+payload_add!(43usize, 91usize, 134usize);
+payload_add!(43usize, 92usize, 135usize);
+payload_add!(43usize, 93usize, 136usize);
+payload_add!(43usize, 94usize, 137usize);
+payload_add!(43usize, 95usize, 138usize);
+payload_add!(43usize, 96usize, 139usize);
+payload_add!(43usize, 97usize, 140usize);
+payload_add!(43usize, 98usize, 141usize);
+payload_add!(43usize, 99usize, 142usize);
+payload_add!(43usize, 100usize, 143usize);
+payload_add!(43usize, 101usize, 144usize);
+payload_add!(43usize, 102usize, 145usize);
+payload_add!(43usize, 103usize, 146usize);
+payload_add!(43usize, 104usize, 147usize);
+payload_add!(43usize, 105usize, 148usize);
+payload_add!(43usize, 106usize, 149usize);
+payload_add!(43usize, 107usize, 150usize);
+payload_add!(43usize, 108usize, 151usize);
+payload_add!(43usize, 109usize, 152usize);
+payload_add!(43usize, 110usize, 153usize);
+payload_add!(43usize, 111usize, 154usize);
+payload_add!(43usize, 112usize, 155usize);
+payload_add!(43usize, 113usize, 156usize);
+payload_add!(43usize, 114usize, 157usize);
+payload_add!(43usize, 115usize, 158usize);
+payload_add!(43usize, 116usize, 159usize);
+payload_add!(43usize, 117usize, 160usize);
+payload_add!(43usize, 118usize, 161usize);
+payload_add!(43usize, 119usize, 162usize);
+payload_add!(43usize, 120usize, 163usize);
+payload_add!(43usize, 121usize, 164usize);
+payload_add!(43usize, 122usize, 165usize);
+payload_add!(43usize, 123usize, 166usize);
+payload_add!(43usize, 124usize, 167usize);
+payload_add!(43usize, 125usize, 168usize);
+payload_add!(43usize, 126usize, 169usize);
+payload_add!(43usize, 127usize, 170usize);
+payload_add!(43usize, 128usize, 171usize);
 payload_add!(44usize, 1usize, 45usize);
 payload_add!(44usize, 2usize, 46usize);
 payload_add!(44usize, 3usize, 47usize);
@@ -2197,6 +5637,86 @@ payload_add!(44usize, 45usize, 89usize);
 payload_add!(44usize, 46usize, 90usize);
 payload_add!(44usize, 47usize, 91usize);
 payload_add!(44usize, 48usize, 92usize);
+payload_add!(44usize, 49usize, 93usize);
+payload_add!(44usize, 50usize, 94usize);
+payload_add!(44usize, 51usize, 95usize);
+payload_add!(44usize, 52usize, 96usize);
+payload_add!(44usize, 53usize, 97usize);
+payload_add!(44usize, 54usize, 98usize);
+payload_add!(44usize, 55usize, 99usize);
+payload_add!(44usize, 56usize, 100usize);
+payload_add!(44usize, 57usize, 101usize);
+payload_add!(44usize, 58usize, 102usize);
+payload_add!(44usize, 59usize, 103usize);
+payload_add!(44usize, 60usize, 104usize);
+payload_add!(44usize, 61usize, 105usize);
+payload_add!(44usize, 62usize, 106usize);
+payload_add!(44usize, 63usize, 107usize);
+payload_add!(44usize, 64usize, 108usize);
+payload_add!(44usize, 65usize, 109usize);
+payload_add!(44usize, 66usize, 110usize);
+payload_add!(44usize, 67usize, 111usize);
+payload_add!(44usize, 68usize, 112usize);
+payload_add!(44usize, 69usize, 113usize);
+payload_add!(44usize, 70usize, 114usize);
+payload_add!(44usize, 71usize, 115usize);
+payload_add!(44usize, 72usize, 116usize);
+payload_add!(44usize, 73usize, 117usize);
+payload_add!(44usize, 74usize, 118usize);
+payload_add!(44usize, 75usize, 119usize);
+payload_add!(44usize, 76usize, 120usize);
+payload_add!(44usize, 77usize, 121usize);
+payload_add!(44usize, 78usize, 122usize);
+payload_add!(44usize, 79usize, 123usize);
+payload_add!(44usize, 80usize, 124usize);
+payload_add!(44usize, 81usize, 125usize);
+payload_add!(44usize, 82usize, 126usize);
+payload_add!(44usize, 83usize, 127usize);
+payload_add!(44usize, 84usize, 128usize);
+payload_add!(44usize, 85usize, 129usize);
+payload_add!(44usize, 86usize, 130usize);
+payload_add!(44usize, 87usize, 131usize);
+payload_add!(44usize, 88usize, 132usize);
+payload_add!(44usize, 89usize, 133usize);
+payload_add!(44usize, 90usize, 134usize);
+payload_add!(44usize, 91usize, 135usize);
+payload_add!(44usize, 92usize, 136usize);
+payload_add!(44usize, 93usize, 137usize);
+payload_add!(44usize, 94usize, 138usize);
+payload_add!(44usize, 95usize, 139usize);
+payload_add!(44usize, 96usize, 140usize);
+payload_add!(44usize, 97usize, 141usize);
+payload_add!(44usize, 98usize, 142usize);
+payload_add!(44usize, 99usize, 143usize);
+payload_add!(44usize, 100usize, 144usize);
+payload_add!(44usize, 101usize, 145usize);
+payload_add!(44usize, 102usize, 146usize);
+payload_add!(44usize, 103usize, 147usize);
+payload_add!(44usize, 104usize, 148usize);
+payload_add!(44usize, 105usize, 149usize);
+payload_add!(44usize, 106usize, 150usize);
+payload_add!(44usize, 107usize, 151usize);
+payload_add!(44usize, 108usize, 152usize);
+payload_add!(44usize, 109usize, 153usize);
+payload_add!(44usize, 110usize, 154usize);
+payload_add!(44usize, 111usize, 155usize);
+payload_add!(44usize, 112usize, 156usize);
+payload_add!(44usize, 113usize, 157usize);
+payload_add!(44usize, 114usize, 158usize);
+payload_add!(44usize, 115usize, 159usize);
+payload_add!(44usize, 116usize, 160usize);
+payload_add!(44usize, 117usize, 161usize);
+payload_add!(44usize, 118usize, 162usize);
+payload_add!(44usize, 119usize, 163usize);
+payload_add!(44usize, 120usize, 164usize);
+payload_add!(44usize, 121usize, 165usize);
+payload_add!(44usize, 122usize, 166usize);
+payload_add!(44usize, 123usize, 167usize);
+payload_add!(44usize, 124usize, 168usize);
+payload_add!(44usize, 125usize, 169usize);
+payload_add!(44usize, 126usize, 170usize);
+payload_add!(44usize, 127usize, 171usize);
+payload_add!(44usize, 128usize, 172usize);
 payload_add!(45usize, 1usize, 46usize);
 payload_add!(45usize, 2usize, 47usize);
 payload_add!(45usize, 3usize, 48usize);
@@ -2245,6 +5765,86 @@ payload_add!(45usize, 45usize, 90usize);
 payload_add!(45usize, 46usize, 91usize);
 payload_add!(45usize, 47usize, 92usize);
 payload_add!(45usize, 48usize, 93usize);
+payload_add!(45usize, 49usize, 94usize);
+payload_add!(45usize, 50usize, 95usize);
+payload_add!(45usize, 51usize, 96usize);
+payload_add!(45usize, 52usize, 97usize);
+payload_add!(45usize, 53usize, 98usize);
+payload_add!(45usize, 54usize, 99usize);
+payload_add!(45usize, 55usize, 100usize);
+payload_add!(45usize, 56usize, 101usize);
+payload_add!(45usize, 57usize, 102usize);
+payload_add!(45usize, 58usize, 103usize);
+payload_add!(45usize, 59usize, 104usize);
+payload_add!(45usize, 60usize, 105usize);
+payload_add!(45usize, 61usize, 106usize);
+payload_add!(45usize, 62usize, 107usize);
+payload_add!(45usize, 63usize, 108usize);
+payload_add!(45usize, 64usize, 109usize);
+payload_add!(45usize, 65usize, 110usize);
+payload_add!(45usize, 66usize, 111usize);
+payload_add!(45usize, 67usize, 112usize);
+payload_add!(45usize, 68usize, 113usize);
+payload_add!(45usize, 69usize, 114usize);
+payload_add!(45usize, 70usize, 115usize);
+payload_add!(45usize, 71usize, 116usize);
+payload_add!(45usize, 72usize, 117usize);
+payload_add!(45usize, 73usize, 118usize);
+payload_add!(45usize, 74usize, 119usize);
+payload_add!(45usize, 75usize, 120usize);
+payload_add!(45usize, 76usize, 121usize);
+payload_add!(45usize, 77usize, 122usize);
+payload_add!(45usize, 78usize, 123usize);
+payload_add!(45usize, 79usize, 124usize);
+payload_add!(45usize, 80usize, 125usize);
+payload_add!(45usize, 81usize, 126usize);
+payload_add!(45usize, 82usize, 127usize);
+payload_add!(45usize, 83usize, 128usize);
+payload_add!(45usize, 84usize, 129usize);
+payload_add!(45usize, 85usize, 130usize);
+payload_add!(45usize, 86usize, 131usize);
+payload_add!(45usize, 87usize, 132usize);
+payload_add!(45usize, 88usize, 133usize);
+payload_add!(45usize, 89usize, 134usize);
+payload_add!(45usize, 90usize, 135usize);
+payload_add!(45usize, 91usize, 136usize);
+payload_add!(45usize, 92usize, 137usize);
+payload_add!(45usize, 93usize, 138usize);
+payload_add!(45usize, 94usize, 139usize);
+payload_add!(45usize, 95usize, 140usize);
+payload_add!(45usize, 96usize, 141usize);
+payload_add!(45usize, 97usize, 142usize);
+payload_add!(45usize, 98usize, 143usize);
+payload_add!(45usize, 99usize, 144usize);
+payload_add!(45usize, 100usize, 145usize);
+payload_add!(45usize, 101usize, 146usize);
+payload_add!(45usize, 102usize, 147usize);
+payload_add!(45usize, 103usize, 148usize);
+payload_add!(45usize, 104usize, 149usize);
+payload_add!(45usize, 105usize, 150usize);
+payload_add!(45usize, 106usize, 151usize);
+payload_add!(45usize, 107usize, 152usize);
+payload_add!(45usize, 108usize, 153usize);
+payload_add!(45usize, 109usize, 154usize);
+payload_add!(45usize, 110usize, 155usize);
+payload_add!(45usize, 111usize, 156usize);
+payload_add!(45usize, 112usize, 157usize);
+payload_add!(45usize, 113usize, 158usize);
+payload_add!(45usize, 114usize, 159usize);
+payload_add!(45usize, 115usize, 160usize);
+payload_add!(45usize, 116usize, 161usize);
+payload_add!(45usize, 117usize, 162usize);
+payload_add!(45usize, 118usize, 163usize);
+payload_add!(45usize, 119usize, 164usize);
+payload_add!(45usize, 120usize, 165usize);
+payload_add!(45usize, 121usize, 166usize);
+payload_add!(45usize, 122usize, 167usize);
+payload_add!(45usize, 123usize, 168usize);
+payload_add!(45usize, 124usize, 169usize);
+payload_add!(45usize, 125usize, 170usize);
+payload_add!(45usize, 126usize, 171usize);
+payload_add!(45usize, 127usize, 172usize);
+payload_add!(45usize, 128usize, 173usize);
 payload_add!(46usize, 1usize, 47usize);
 payload_add!(46usize, 2usize, 48usize);
 payload_add!(46usize, 3usize, 49usize);
@@ -2293,6 +5893,86 @@ payload_add!(46usize, 45usize, 91usize);
 payload_add!(46usize, 46usize, 92usize);
 payload_add!(46usize, 47usize, 93usize);
 payload_add!(46usize, 48usize, 94usize);
+payload_add!(46usize, 49usize, 95usize);
+payload_add!(46usize, 50usize, 96usize);
+payload_add!(46usize, 51usize, 97usize);
+payload_add!(46usize, 52usize, 98usize);
+payload_add!(46usize, 53usize, 99usize);
+payload_add!(46usize, 54usize, 100usize);
+payload_add!(46usize, 55usize, 101usize);
+payload_add!(46usize, 56usize, 102usize);
+payload_add!(46usize, 57usize, 103usize);
+payload_add!(46usize, 58usize, 104usize);
+payload_add!(46usize, 59usize, 105usize);
+payload_add!(46usize, 60usize, 106usize);
+payload_add!(46usize, 61usize, 107usize);
+payload_add!(46usize, 62usize, 108usize);
+payload_add!(46usize, 63usize, 109usize);
+payload_add!(46usize, 64usize, 110usize);
+payload_add!(46usize, 65usize, 111usize);
+payload_add!(46usize, 66usize, 112usize);
+payload_add!(46usize, 67usize, 113usize);
+payload_add!(46usize, 68usize, 114usize);
+payload_add!(46usize, 69usize, 115usize);
+payload_add!(46usize, 70usize, 116usize);
+payload_add!(46usize, 71usize, 117usize);
+payload_add!(46usize, 72usize, 118usize);
+payload_add!(46usize, 73usize, 119usize);
+payload_add!(46usize, 74usize, 120usize);
+payload_add!(46usize, 75usize, 121usize);
+payload_add!(46usize, 76usize, 122usize);
+payload_add!(46usize, 77usize, 123usize);
+payload_add!(46usize, 78usize, 124usize);
+payload_add!(46usize, 79usize, 125usize);
+payload_add!(46usize, 80usize, 126usize);
+payload_add!(46usize, 81usize, 127usize);
+payload_add!(46usize, 82usize, 128usize);
+payload_add!(46usize, 83usize, 129usize);
+payload_add!(46usize, 84usize, 130usize);
+payload_add!(46usize, 85usize, 131usize);
+payload_add!(46usize, 86usize, 132usize);
+payload_add!(46usize, 87usize, 133usize);
+payload_add!(46usize, 88usize, 134usize);
+payload_add!(46usize, 89usize, 135usize);
+payload_add!(46usize, 90usize, 136usize);
+payload_add!(46usize, 91usize, 137usize);
+payload_add!(46usize, 92usize, 138usize);
+payload_add!(46usize, 93usize, 139usize);
+payload_add!(46usize, 94usize, 140usize);
+payload_add!(46usize, 95usize, 141usize);
+payload_add!(46usize, 96usize, 142usize);
+payload_add!(46usize, 97usize, 143usize);
+payload_add!(46usize, 98usize, 144usize);
+payload_add!(46usize, 99usize, 145usize);
+payload_add!(46usize, 100usize, 146usize);
+payload_add!(46usize, 101usize, 147usize);
+payload_add!(46usize, 102usize, 148usize);
+payload_add!(46usize, 103usize, 149usize);
+payload_add!(46usize, 104usize, 150usize);
+payload_add!(46usize, 105usize, 151usize);
+payload_add!(46usize, 106usize, 152usize);
+payload_add!(46usize, 107usize, 153usize);
+payload_add!(46usize, 108usize, 154usize);
+payload_add!(46usize, 109usize, 155usize);
+payload_add!(46usize, 110usize, 156usize);
+payload_add!(46usize, 111usize, 157usize);
+payload_add!(46usize, 112usize, 158usize);
+payload_add!(46usize, 113usize, 159usize);
+payload_add!(46usize, 114usize, 160usize);
+payload_add!(46usize, 115usize, 161usize);
+payload_add!(46usize, 116usize, 162usize);
+payload_add!(46usize, 117usize, 163usize);
+payload_add!(46usize, 118usize, 164usize);
+payload_add!(46usize, 119usize, 165usize);
+payload_add!(46usize, 120usize, 166usize);
+payload_add!(46usize, 121usize, 167usize);
+payload_add!(46usize, 122usize, 168usize);
+payload_add!(46usize, 123usize, 169usize);
+payload_add!(46usize, 124usize, 170usize);
+payload_add!(46usize, 125usize, 171usize);
+payload_add!(46usize, 126usize, 172usize);
+payload_add!(46usize, 127usize, 173usize);
+payload_add!(46usize, 128usize, 174usize);
 payload_add!(47usize, 1usize, 48usize);
 payload_add!(47usize, 2usize, 49usize);
 payload_add!(47usize, 3usize, 50usize);
@@ -2341,6 +6021,86 @@ payload_add!(47usize, 45usize, 92usize);
 payload_add!(47usize, 46usize, 93usize);
 payload_add!(47usize, 47usize, 94usize);
 payload_add!(47usize, 48usize, 95usize);
+payload_add!(47usize, 49usize, 96usize);
+payload_add!(47usize, 50usize, 97usize);
+payload_add!(47usize, 51usize, 98usize);
+payload_add!(47usize, 52usize, 99usize);
+payload_add!(47usize, 53usize, 100usize);
+payload_add!(47usize, 54usize, 101usize);
+payload_add!(47usize, 55usize, 102usize);
+payload_add!(47usize, 56usize, 103usize);
+payload_add!(47usize, 57usize, 104usize);
+payload_add!(47usize, 58usize, 105usize);
+payload_add!(47usize, 59usize, 106usize);
+payload_add!(47usize, 60usize, 107usize);
+payload_add!(47usize, 61usize, 108usize);
+payload_add!(47usize, 62usize, 109usize);
+payload_add!(47usize, 63usize, 110usize);
+payload_add!(47usize, 64usize, 111usize);
+payload_add!(47usize, 65usize, 112usize);
+payload_add!(47usize, 66usize, 113usize);
+payload_add!(47usize, 67usize, 114usize);
+payload_add!(47usize, 68usize, 115usize);
+payload_add!(47usize, 69usize, 116usize);
+payload_add!(47usize, 70usize, 117usize);
+payload_add!(47usize, 71usize, 118usize);
+payload_add!(47usize, 72usize, 119usize);
+payload_add!(47usize, 73usize, 120usize);
+payload_add!(47usize, 74usize, 121usize);
+payload_add!(47usize, 75usize, 122usize);
+payload_add!(47usize, 76usize, 123usize);
+payload_add!(47usize, 77usize, 124usize);
+payload_add!(47usize, 78usize, 125usize);
+payload_add!(47usize, 79usize, 126usize);
+payload_add!(47usize, 80usize, 127usize);
+payload_add!(47usize, 81usize, 128usize);
+payload_add!(47usize, 82usize, 129usize);
+payload_add!(47usize, 83usize, 130usize);
+payload_add!(47usize, 84usize, 131usize);
+payload_add!(47usize, 85usize, 132usize);
+payload_add!(47usize, 86usize, 133usize);
+payload_add!(47usize, 87usize, 134usize);
+payload_add!(47usize, 88usize, 135usize);
+payload_add!(47usize, 89usize, 136usize);
+payload_add!(47usize, 90usize, 137usize);
+payload_add!(47usize, 91usize, 138usize);
+payload_add!(47usize, 92usize, 139usize);
+payload_add!(47usize, 93usize, 140usize);
+payload_add!(47usize, 94usize, 141usize);
+payload_add!(47usize, 95usize, 142usize);
+payload_add!(47usize, 96usize, 143usize);
+payload_add!(47usize, 97usize, 144usize);
+payload_add!(47usize, 98usize, 145usize);
+payload_add!(47usize, 99usize, 146usize);
+payload_add!(47usize, 100usize, 147usize);
+payload_add!(47usize, 101usize, 148usize);
+payload_add!(47usize, 102usize, 149usize);
+payload_add!(47usize, 103usize, 150usize);
+payload_add!(47usize, 104usize, 151usize);
+payload_add!(47usize, 105usize, 152usize);
+payload_add!(47usize, 106usize, 153usize);
+payload_add!(47usize, 107usize, 154usize);
+payload_add!(47usize, 108usize, 155usize);
+payload_add!(47usize, 109usize, 156usize);
+payload_add!(47usize, 110usize, 157usize);
+payload_add!(47usize, 111usize, 158usize);
+payload_add!(47usize, 112usize, 159usize);
+payload_add!(47usize, 113usize, 160usize);
+payload_add!(47usize, 114usize, 161usize);
+payload_add!(47usize, 115usize, 162usize);
+payload_add!(47usize, 116usize, 163usize);
+payload_add!(47usize, 117usize, 164usize);
+payload_add!(47usize, 118usize, 165usize);
+payload_add!(47usize, 119usize, 166usize);
+payload_add!(47usize, 120usize, 167usize);
+payload_add!(47usize, 121usize, 168usize);
+payload_add!(47usize, 122usize, 169usize);
+payload_add!(47usize, 123usize, 170usize);
+payload_add!(47usize, 124usize, 171usize);
+payload_add!(47usize, 125usize, 172usize);
+payload_add!(47usize, 126usize, 173usize);
+payload_add!(47usize, 127usize, 174usize);
+payload_add!(47usize, 128usize, 175usize);
 payload_add!(48usize, 1usize, 49usize);
 payload_add!(48usize, 2usize, 50usize);
 payload_add!(48usize, 3usize, 51usize);
@@ -2389,3 +6149,83 @@ payload_add!(48usize, 45usize, 93usize);
 payload_add!(48usize, 46usize, 94usize);
 payload_add!(48usize, 47usize, 95usize);
 payload_add!(48usize, 48usize, 96usize);
+payload_add!(48usize, 49usize, 97usize);
+payload_add!(48usize, 50usize, 98usize);
+payload_add!(48usize, 51usize, 99usize);
+payload_add!(48usize, 52usize, 100usize);
+payload_add!(48usize, 53usize, 101usize);
+payload_add!(48usize, 54usize, 102usize);
+payload_add!(48usize, 55usize, 103usize);
+payload_add!(48usize, 56usize, 104usize);
+payload_add!(48usize, 57usize, 105usize);
+payload_add!(48usize, 58usize, 106usize);
+payload_add!(48usize, 59usize, 107usize);
+payload_add!(48usize, 60usize, 108usize);
+payload_add!(48usize, 61usize, 109usize);
+payload_add!(48usize, 62usize, 110usize);
+payload_add!(48usize, 63usize, 111usize);
+payload_add!(48usize, 64usize, 112usize);
+payload_add!(48usize, 65usize, 113usize);
+payload_add!(48usize, 66usize, 114usize);
+payload_add!(48usize, 67usize, 115usize);
+payload_add!(48usize, 68usize, 116usize);
+payload_add!(48usize, 69usize, 117usize);
+payload_add!(48usize, 70usize, 118usize);
+payload_add!(48usize, 71usize, 119usize);
+payload_add!(48usize, 72usize, 120usize);
+payload_add!(48usize, 73usize, 121usize);
+payload_add!(48usize, 74usize, 122usize);
+payload_add!(48usize, 75usize, 123usize);
+payload_add!(48usize, 76usize, 124usize);
+payload_add!(48usize, 77usize, 125usize);
+payload_add!(48usize, 78usize, 126usize);
+payload_add!(48usize, 79usize, 127usize);
+payload_add!(48usize, 80usize, 128usize);
+payload_add!(48usize, 81usize, 129usize);
+payload_add!(48usize, 82usize, 130usize);
+payload_add!(48usize, 83usize, 131usize);
+payload_add!(48usize, 84usize, 132usize);
+payload_add!(48usize, 85usize, 133usize);
+payload_add!(48usize, 86usize, 134usize);
+payload_add!(48usize, 87usize, 135usize);
+payload_add!(48usize, 88usize, 136usize);
+payload_add!(48usize, 89usize, 137usize);
+payload_add!(48usize, 90usize, 138usize);
+payload_add!(48usize, 91usize, 139usize);
+payload_add!(48usize, 92usize, 140usize);
+payload_add!(48usize, 93usize, 141usize);
+payload_add!(48usize, 94usize, 142usize);
+payload_add!(48usize, 95usize, 143usize);
+payload_add!(48usize, 96usize, 144usize);
+payload_add!(48usize, 97usize, 145usize);
+payload_add!(48usize, 98usize, 146usize);
+payload_add!(48usize, 99usize, 147usize);
+payload_add!(48usize, 100usize, 148usize);
+payload_add!(48usize, 101usize, 149usize);
+payload_add!(48usize, 102usize, 150usize);
+payload_add!(48usize, 103usize, 151usize);
+payload_add!(48usize, 104usize, 152usize);
+payload_add!(48usize, 105usize, 153usize);
+payload_add!(48usize, 106usize, 154usize);
+payload_add!(48usize, 107usize, 155usize);
+payload_add!(48usize, 108usize, 156usize);
+payload_add!(48usize, 109usize, 157usize);
+payload_add!(48usize, 110usize, 158usize);
+payload_add!(48usize, 111usize, 159usize);
+payload_add!(48usize, 112usize, 160usize);
+payload_add!(48usize, 113usize, 161usize);
+payload_add!(48usize, 114usize, 162usize);
+payload_add!(48usize, 115usize, 163usize);
+payload_add!(48usize, 116usize, 164usize);
+payload_add!(48usize, 117usize, 165usize);
+payload_add!(48usize, 118usize, 166usize);
+payload_add!(48usize, 119usize, 167usize);
+payload_add!(48usize, 120usize, 168usize);
+payload_add!(48usize, 121usize, 169usize);
+payload_add!(48usize, 122usize, 170usize);
+payload_add!(48usize, 123usize, 171usize);
+payload_add!(48usize, 124usize, 172usize);
+payload_add!(48usize, 125usize, 173usize);
+payload_add!(48usize, 126usize, 174usize);
+payload_add!(48usize, 127usize, 175usize);
+payload_add!(48usize, 128usize, 176usize);
diff --git a/framework/scenario/tests/derive_managed_vec_item_struct_3.rs b/framework/scenario/tests/derive_managed_vec_item_struct_3.rs
new file mode 100644
index 0000000000..a849617d60
--- /dev/null
+++ b/framework/scenario/tests/derive_managed_vec_item_struct_3.rs
@@ -0,0 +1,49 @@
+use multiversx_sc_scenario::api::StaticApi;
+
+multiversx_sc::derive_imports!();
+multiversx_sc::imports!();
+
+// to test, run the following command in the crate folder:
+// cargo expand --test derive_managed_vec_item_struct_2_test > expanded.rs
+
+/// Obtained from a contract from the community.
+///
+/// Unusually large, payload size is 74.
+#[derive(ManagedVecItem)]
+pub struct Auction<M: ManagedTypeApi> {
+    pub auctioned_token_type: TokenIdentifier<M>,
+    pub auctioned_token_nonce: u64,
+    pub nr_auctioned_tokens: BigUint<M>,
+    pub auction_type: AuctionType,
+    pub payment_token_type: EgldOrEsdtTokenIdentifier<M>,
+    pub payment_token_nonce: u64,
+    pub min_bid: BigUint<M>,
+    pub max_bid: Option<BigUint<M>>,
+    pub start_time: u64,
+    pub deadline: u64,
+
+    pub original_owner: ManagedAddress<M>,
+    pub current_bid: BigUint<M>,
+    pub current_winner: ManagedAddress<M>,
+    pub marketplace_cut_percentage: BigUint<M>,
+    pub creator_royalties_percentage: BigUint<M>,
+}
+
+#[derive(ManagedVecItem)]
+pub enum AuctionType {
+    None,
+    NftBid,
+    Nft,
+    SftAll,
+    SftOnePerPayment,
+}
+
+#[test]
+#[allow(clippy::assertions_on_constants)]
+fn struct_3_static() {
+    assert_eq!(
+        <Auction<StaticApi> as multiversx_sc::types::ManagedVecItem>::payload_size(),
+        74
+    );
+    assert!(!<Auction<StaticApi> as multiversx_sc::types::ManagedVecItem>::SKIPS_RESERIALIZATION);
+}

From eb291bea2c6758fbd7b8035a3d3f24a5ea677968 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 15 May 2024 18:08:21 +0300
Subject: [PATCH 0890/1254] ManagedVecItem - payload macro generator tool

---
 Cargo.lock                                    |  4 +++
 Cargo.toml                                    |  1 +
 .../wrapped/managed_vec_item_payload.rs       |  3 ++
 tools/payload-macro-generator/.gitignore      |  2 ++
 tools/payload-macro-generator/Cargo.toml      |  6 ++++
 tools/payload-macro-generator/src/main.rs     | 29 +++++++++++++++++++
 6 files changed, 45 insertions(+)
 create mode 100644 tools/payload-macro-generator/.gitignore
 create mode 100644 tools/payload-macro-generator/Cargo.toml
 create mode 100644 tools/payload-macro-generator/src/main.rs

diff --git a/Cargo.lock b/Cargo.lock
index 17d5b64293..95a0db229b 100755
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2371,6 +2371,10 @@ dependencies = [
  "payable-features",
 ]
 
+[[package]]
+name = "payload-macro-generator"
+version = "0.1.0"
+
 [[package]]
 name = "pbkdf2"
 version = "0.12.2"
diff --git a/Cargo.toml b/Cargo.toml
index 8554af9b00..abeac2b710 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -16,6 +16,7 @@ members = [
   "sdk/scenario-format",
 
   "tools/mxpy-snippet-generator",
+  "tools/payload-macro-generator",
 
   "vm",
 
diff --git a/framework/base/src/types/managed/wrapped/managed_vec_item_payload.rs b/framework/base/src/types/managed/wrapped/managed_vec_item_payload.rs
index defa671549..4d544e8d75 100644
--- a/framework/base/src/types/managed/wrapped/managed_vec_item_payload.rs
+++ b/framework/base/src/types/managed/wrapped/managed_vec_item_payload.rs
@@ -75,6 +75,9 @@ impl<const N: usize> ManagedVecItemPayloadAdd<ManagedVecItemEmptyPayload>
     type Output = Self;
 }
 
+/// Replaces a const generic expression.
+/// 
+/// Remove once const generic expressions are stabilized in Rust.
 macro_rules! payload_add {
     ($dec1:expr, $dec2:expr, $result_add:expr) => {
         impl ManagedVecItemPayloadAdd<ManagedVecItemPayloadBuffer<$dec2>>
diff --git a/tools/payload-macro-generator/.gitignore b/tools/payload-macro-generator/.gitignore
new file mode 100644
index 0000000000..4ddcf592f7
--- /dev/null
+++ b/tools/payload-macro-generator/.gitignore
@@ -0,0 +1,2 @@
+/target
+output.rs
\ No newline at end of file
diff --git a/tools/payload-macro-generator/Cargo.toml b/tools/payload-macro-generator/Cargo.toml
new file mode 100644
index 0000000000..8a9206efdf
--- /dev/null
+++ b/tools/payload-macro-generator/Cargo.toml
@@ -0,0 +1,6 @@
+[package]
+name = "payload-macro-generator"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
diff --git a/tools/payload-macro-generator/src/main.rs b/tools/payload-macro-generator/src/main.rs
new file mode 100644
index 0000000000..6991a6816e
--- /dev/null
+++ b/tools/payload-macro-generator/src/main.rs
@@ -0,0 +1,29 @@
+use std::{
+    fs::File,
+    io::{self, Write},
+};
+
+const MIN: usize = 1;
+const MAX_X: usize = 48;
+const MAX_Y: usize = 128;
+
+/// Generates the payload_add! macros in the ManagedVecItem implem,entation.
+/// 
+/// TODO: remove once generic const expressions are stabilized in Rust.
+fn main() -> io::Result<()> {
+    let mut file = File::create("output.rs")?;
+
+    // Generate add_sub_const_decimals! macro combinations
+    for x in MIN..=MAX_X {
+        for y in MIN..=MAX_Y {
+            let sum = x + y;
+            writeln!(
+                file,
+                "payload_add!({}usize, {}usize, {}usize);",
+                x, y, sum
+            )?;
+        }
+    }
+
+    Ok(())
+}

From 1c955a8df4ca34e50937ff6d254bc7aa1704a433 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 16 May 2024 10:19:34 +0300
Subject: [PATCH 0891/1254] sc 0.50.1

---
 CHANGELOG.md                                   |  7 +++++++
 Cargo.lock                                     | 18 +++++++++---------
 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 ++--
 .../mappers/linked-list-repeat/meta/Cargo.toml |  2 +-
 .../mappers/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 +-
 .../benchmarks/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 +-
 contracts/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 +-
 .../Cargo.toml                                 |  2 +-
 .../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 +-
 .../examples/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 +++---
 contracts/examples/check-pause/meta/Cargo.toml |  2 +-
 contracts/examples/check-pause/wasm/Cargo.toml |  2 +-
 .../examples/crowdfunding-esdt/Cargo.toml      |  4 ++--
 .../examples/crowdfunding-esdt/meta/Cargo.toml |  2 +-
 .../examples/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 +-
 .../examples/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      |  8 ++++----
 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 +-
 contracts/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 ++--
 contracts/examples/proxy-pause/meta/Cargo.toml |  2 +-
 contracts/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 +-
 .../wasm-alloc-mem-fail/Cargo.toml             |  2 +-
 .../wasm-alloc-mem-leaking/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-legacy/Cargo.toml  |  4 ++--
 .../forwarder-legacy/meta/Cargo.toml           |  2 +-
 .../forwarder-legacy/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 +-
 .../composability/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 +-
 .../composability/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 ++--
 .../erc-style-contracts/erc721/meta/Cargo.toml |  2 +-
 .../erc-style-contracts/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 +-
 .../feature-tests/exchange-features/Cargo.toml |  4 ++--
 .../exchange-features/meta/Cargo.toml          |  2 +-
 .../exchange-features/wasm/Cargo.toml          |  2 +-
 .../formatted-message-features/Cargo.toml      |  4 ++--
 .../formatted-message-features/meta/Cargo.toml |  2 +-
 .../formatted-message-features/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 +-
 .../feature-tests/scenario-tester/Cargo.toml   |  4 ++--
 .../scenario-tester/meta/Cargo.toml            |  2 +-
 .../scenario-tester/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 +-
 .../use-module/wasm-use-module-view/Cargo.toml |  2 +-
 .../feature-tests/use-module/wasm/Cargo.toml   |  2 +-
 contracts/modules/Cargo.toml                   |  4 ++--
 framework/base/Cargo.toml                      |  4 ++--
 framework/derive/Cargo.toml                    |  2 +-
 framework/meta/Cargo.toml                      |  4 ++--
 .../generate_snippets/snippet_crate_gen.rs     |  2 +-
 framework/meta/src/version_history.rs          |  3 ++-
 framework/scenario/Cargo.toml                  |  6 +++---
 framework/snippets/Cargo.toml                  |  4 ++--
 framework/wasm-adapter/Cargo.toml              |  4 ++--
 tools/mxpy-snippet-generator/Cargo.toml        |  2 +-
 tools/rust-debugger/format-tests/Cargo.toml    |  4 ++--
 272 files changed, 402 insertions(+), 394 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5c2352ff1e..d412990d36 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,6 +26,13 @@ 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.50.1] - 2024-05-16
+- `sc-meta all snippets` generates unified syntax.
+- Proxy generator can reference multi-contract variant.
+- Fixes:
+	- `BoxedBytes` - fixed memory leak.
+	- `ManagedVecItem` - allowing larger payloads (up to 128 bytes).
+
 ## [sc 0.50.0, codec 0.19.0, vm 0.8.4, sdk 0.4.1] - 2024-05-10
 - Framework now runs on **stable** Rust. All unstable features were removed. The most important changes enabling this:
 	- `CodecFrom` completely removed, `TypeAbiFrom` was used instead since 0.49.0.
diff --git a/Cargo.lock b/Cargo.lock
index 95a0db229b..669575cd44 100755
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1893,7 +1893,7 @@ checksum = "b59072fa0624b55ae5ae3fa6bfa91515bbeb4ac440214bc4a509e2c8806d6e9f"
 
 [[package]]
 name = "multiversx-price-aggregator-sc"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "arrayvec",
  "getrandom 0.2.15",
@@ -1914,7 +1914,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "bitflags 2.5.0",
  "hex-literal",
@@ -1946,7 +1946,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -1957,7 +1957,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-meta"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "clap",
  "colored",
@@ -1983,14 +1983,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-scenario"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "base64",
  "bech32",
@@ -2017,7 +2017,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-snippets"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "base64",
  "env_logger",
@@ -2032,7 +2032,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -2063,7 +2063,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-wegld-swap-sc"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
  "multiversx-sc-modules",
diff --git a/contracts/benchmarks/large-storage/Cargo.toml b/contracts/benchmarks/large-storage/Cargo.toml
index ad60a82f74..138a09e851 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.50.0"
+version = "0.50.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.0"
+version = "0.50.1"
 path = "../../../framework/scenario"
diff --git a/contracts/benchmarks/large-storage/meta/Cargo.toml b/contracts/benchmarks/large-storage/meta/Cargo.toml
index 43caaeea37..472e2b616f 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.50.0"
+version = "0.50.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 37792b12f1..f3f97e406a 100644
--- a/contracts/benchmarks/large-storage/wasm/Cargo.toml
+++ b/contracts/benchmarks/large-storage/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.0"
+version = "0.50.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 95d8d11ca4..45310eb044 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.50.0"
+version = "0.50.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.0"
+version = "0.50.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 693d4816b1..a99aaed522 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.50.0"
+version = "0.50.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.0"
+version = "0.50.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 f87d3e08ac..158b09a734 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.50.0"
+version = "0.50.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 f99021343c..21d623d7be 100644
--- a/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.0"
+version = "0.50.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 93ce0cf9fb..675b56e1c2 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.50.0"
+version = "0.50.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.0"
+version = "0.50.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 37ca3cb2a6..7a5424fa1a 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.50.0"
+version = "0.50.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 3a425203e2..a525b02f79 100644
--- a/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.0"
+version = "0.50.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 527ff13d73..4d884954c0 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.50.0"
+version = "0.50.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.0"
+version = "0.50.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 d3edc93457..d063dba3c1 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.50.0"
+version = "0.50.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 6a874745ac..ec60e48a03 100644
--- a/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.0"
+version = "0.50.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 dca506d44f..ec51e7fde8 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.50.0"
+version = "0.50.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.0"
+version = "0.50.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 5e6c8268b1..981872b36f 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.50.0"
+version = "0.50.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 f7173dc593..1154eaba4a 100644
--- a/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.0"
+version = "0.50.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 2d5cdaf3a9..683b716015 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.50.0"
+version = "0.50.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.0"
+version = "0.50.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 38641c9dc7..0a2a2219fd 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.50.0"
+version = "0.50.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 c8cd8d7c58..456d379155 100644
--- a/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.0"
+version = "0.50.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 318cb5fa3c..7c72eaf04d 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.50.0"
+version = "0.50.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.0"
+version = "0.50.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 c2d42c1e53..7555f13c48 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.50.0"
+version = "0.50.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 1f2160a463..cfd4d5c540 100644
--- a/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.0"
+version = "0.50.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 0cb5a4595e..90c0a64553 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.50.0"
+version = "0.50.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.0"
+version = "0.50.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 a0ee585630..17554ab4c4 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.50.0"
+version = "0.50.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 5141d7db8b..10d0093eb7 100644
--- a/contracts/benchmarks/send-tx-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/send-tx-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.0"
+version = "0.50.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/str-repeat/Cargo.toml b/contracts/benchmarks/str-repeat/Cargo.toml
index 0afdad980c..4adfa00e76 100644
--- a/contracts/benchmarks/str-repeat/Cargo.toml
+++ b/contracts/benchmarks/str-repeat/Cargo.toml
@@ -12,10 +12,10 @@ path = "src/str_repeat.rs"
 managed-buffer-builder-cached = ["multiversx-sc/managed-buffer-builder-cached"]
 
 [dependencies.multiversx-sc]
-version = "0.50.0"
+version = "0.50.1"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.0"
+version = "0.50.1"
 path = "../../../framework/scenario"
diff --git a/contracts/benchmarks/str-repeat/meta/Cargo.toml b/contracts/benchmarks/str-repeat/meta/Cargo.toml
index 2a053f362a..772906e453 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.50.0"
+version = "0.50.1"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.toml b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.toml
index 37f8484af3..5b30b06c37 100644
--- a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.toml
+++ b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.0"
+version = "0.50.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.toml b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.toml
index 16d624e31a..0a1b7a6c85 100644
--- a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.toml
+++ b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.toml
@@ -29,7 +29,7 @@ path = ".."
 features = ["managed-buffer-builder-cached"]
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.0"
+version = "0.50.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/str-repeat/wasm/Cargo.toml b/contracts/benchmarks/str-repeat/wasm/Cargo.toml
index 94a9cee235..bcf0787432 100644
--- a/contracts/benchmarks/str-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/str-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.0"
+version = "0.50.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/core/price-aggregator/Cargo.toml b/contracts/core/price-aggregator/Cargo.toml
index 93a8b91d51..98c6565aa7 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.50.0"
+version = "0.50.1"
 authors = [
     "Claudiu-Marcel Bruda <claudiu.bruda@multiversx.com>",
     "MultiversX <contact@multiversx.com>",
@@ -19,15 +19,15 @@ edition = "2021"
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "0.50.0"
+version = "0.50.1"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.50.0"
+version = "0.50.1"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.0"
+version = "0.50.1"
 path = "../../../framework/scenario"
 
 [dependencies]
diff --git a/contracts/core/price-aggregator/meta/Cargo.toml b/contracts/core/price-aggregator/meta/Cargo.toml
index e39ae566e3..e1814d1cba 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.50.0"
+version = "0.50.1"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.50.0"
+version = "0.50.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 fbbdfb7394..f98a12e4e5 100644
--- a/contracts/core/price-aggregator/wasm/Cargo.toml
+++ b/contracts/core/price-aggregator/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.0"
+version = "0.50.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/core/wegld-swap/Cargo.toml b/contracts/core/wegld-swap/Cargo.toml
index f7b430a05f..016a09db45 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.50.0"
+version = "0.50.1"
 
 authors = [
     "Dorin Iancu <dorin.iancu@multiversx.com>",
@@ -20,13 +20,13 @@ edition = "2021"
 path = "src/wegld.rs"
 
 [dependencies.multiversx-sc]
-version = "0.50.0"
+version = "0.50.1"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.50.0"
+version = "0.50.1"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.0"
+version = "0.50.1"
 path = "../../../framework/scenario"
diff --git a/contracts/core/wegld-swap/meta/Cargo.toml b/contracts/core/wegld-swap/meta/Cargo.toml
index 141e7af488..d728cc1385 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.50.0"
+version = "0.50.1"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.50.0"
+version = "0.50.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 1ba58a7626..097811caf9 100644
--- a/contracts/core/wegld-swap/wasm/Cargo.toml
+++ b/contracts/core/wegld-swap/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.0"
+version = "0.50.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/adder/Cargo.toml b/contracts/examples/adder/Cargo.toml
index 01d7d11103..58f704e35e 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.50.0"
+version = "0.50.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.0"
+version = "0.50.1"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/adder/interact/Cargo.toml b/contracts/examples/adder/interact/Cargo.toml
index 3df4b6b103..8c37a2b820 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.50.0"
+version = "0.50.1"
 path = "../../../../framework/snippets"
diff --git a/contracts/examples/adder/meta/Cargo.toml b/contracts/examples/adder/meta/Cargo.toml
index 8a6f226a36..cacdec590b 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.50.0"
+version = "0.50.1"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/examples/adder/wasm/Cargo.toml b/contracts/examples/adder/wasm/Cargo.toml
index 3b0e9c91af..a1b353be8d 100644
--- a/contracts/examples/adder/wasm/Cargo.toml
+++ b/contracts/examples/adder/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.0"
+version = "0.50.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 fce63da78e..b224b700f3 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.50.0"
+version = "0.50.1"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.50.0"
+version = "0.50.1"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.0"
+version = "0.50.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 e723215167..7e0659a813 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.50.0"
+version = "0.50.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 b982e3bdf1..d9d6f45ab6 100644
--- a/contracts/examples/bonding-curve-contract/wasm/Cargo.toml
+++ b/contracts/examples/bonding-curve-contract/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.0"
+version = "0.50.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/check-pause/Cargo.toml b/contracts/examples/check-pause/Cargo.toml
index 599627d6fa..06b6762672 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.50.0"
+version = "0.50.1"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.50.0"
+version = "0.50.1"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.0"
+version = "0.50.1"
 path = "../../../framework/scenario"
 
diff --git a/contracts/examples/check-pause/meta/Cargo.toml b/contracts/examples/check-pause/meta/Cargo.toml
index 0725414e65..eff5be4d68 100644
--- a/contracts/examples/check-pause/meta/Cargo.toml
+++ b/contracts/examples/check-pause/meta/Cargo.toml
@@ -9,6 +9,6 @@ authors = ["Alin Cruceat <alin.cruceat@multiversx.com>"]
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.50.0"
+version = "0.50.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 29e92731fb..b2f886722e 100644
--- a/contracts/examples/check-pause/wasm/Cargo.toml
+++ b/contracts/examples/check-pause/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.0"
+version = "0.50.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/crowdfunding-esdt/Cargo.toml b/contracts/examples/crowdfunding-esdt/Cargo.toml
index 4f423292e1..de3edda2c7 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.50.0"
+version = "0.50.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.0"
+version = "0.50.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 b15a3ac041..38f50eaef7 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.50.0"
+version = "0.50.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 bd584a528d..d916d9b70e 100644
--- a/contracts/examples/crowdfunding-esdt/wasm/Cargo.toml
+++ b/contracts/examples/crowdfunding-esdt/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.0"
+version = "0.50.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/crypto-bubbles/Cargo.toml b/contracts/examples/crypto-bubbles/Cargo.toml
index 4b3d2fa178..713794b94c 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.50.0"
+version = "0.50.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.0"
+version = "0.50.1"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/crypto-bubbles/meta/Cargo.toml b/contracts/examples/crypto-bubbles/meta/Cargo.toml
index 519eacd8e6..8d6b4c8999 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.50.0"
+version = "0.50.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 422c67a898..683b6b820f 100644
--- a/contracts/examples/crypto-bubbles/wasm/Cargo.toml
+++ b/contracts/examples/crypto-bubbles/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.0"
+version = "0.50.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 7168dbee64..3b051fe071 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.50.0"
+version = "0.50.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 cb4dabd43a..53a0e86625 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.50.0"
+version = "0.50.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 0d2443aac3..05e2dae958 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.50.0"
+version = "0.50.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.0"
+version = "0.50.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 4cc88d99bb..61092e4f43 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.50.0"
+version = "0.50.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 ba25624426..a469a46d21 100644
--- a/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.toml
+++ b/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.0"
+version = "0.50.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 4eafac5572..9ee2ff5572 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.50.0"
+version = "0.50.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.0"
+version = "0.50.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 4fc99625d7..eb47f6dbaf 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.50.0"
+version = "0.50.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 fd704cc077..c830f58ce1 100644
--- a/contracts/examples/crypto-kitties/kitty-genetic-alg/wasm/Cargo.toml
+++ b/contracts/examples/crypto-kitties/kitty-genetic-alg/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.0"
+version = "0.50.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 5b1f9edb3d..2a089c2baf 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.50.0"
+version = "0.50.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.0"
+version = "0.50.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 88740f3eaf..2870c2a53b 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.50.0"
+version = "0.50.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 acc9e65db5..80da1c3165 100644
--- a/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.toml
+++ b/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.0"
+version = "0.50.1"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/crypto-zombies/Cargo.toml b/contracts/examples/crypto-zombies/Cargo.toml
index 08c3e904f5..bb2df3bf84 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.50.0"
+version = "0.50.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.0"
+version = "0.50.1"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/crypto-zombies/meta/Cargo.toml b/contracts/examples/crypto-zombies/meta/Cargo.toml
index e71bcdf1aa..ac6971585c 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.50.0"
+version = "0.50.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 07e1f9f79b..94f62bb240 100644
--- a/contracts/examples/crypto-zombies/wasm/Cargo.toml
+++ b/contracts/examples/crypto-zombies/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.0"
+version = "0.50.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/digital-cash/Cargo.toml b/contracts/examples/digital-cash/Cargo.toml
index 8a81d21842..47a8895f89 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.50.0"
+version = "0.50.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.0"
+version = "0.50.1"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/digital-cash/meta/Cargo.toml b/contracts/examples/digital-cash/meta/Cargo.toml
index 9684210470..23c6e92813 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.50.0"
+version = "0.50.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 c3e7ab8992..f6299159b7 100644
--- a/contracts/examples/digital-cash/wasm/Cargo.toml
+++ b/contracts/examples/digital-cash/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.0"
+version = "0.50.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/empty/Cargo.toml b/contracts/examples/empty/Cargo.toml
index f7567c795c..d86af47d4e 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.50.0"
+version = "0.50.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.0"
+version = "0.50.1"
 path = "../../../framework/scenario"
 
 [dev-dependencies]
diff --git a/contracts/examples/empty/meta/Cargo.toml b/contracts/examples/empty/meta/Cargo.toml
index 18045a22fe..b0921a72e0 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.50.0"
+version = "0.50.1"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/examples/empty/wasm/Cargo.toml b/contracts/examples/empty/wasm/Cargo.toml
index 986b5d4b40..bfc29befd8 100644
--- a/contracts/examples/empty/wasm/Cargo.toml
+++ b/contracts/examples/empty/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.0"
+version = "0.50.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 18913a6a88..4fa249d387 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.50.0"
+version = "0.50.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.0"
+version = "0.50.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 e16702134c..4b1625c5d0 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.50.0"
+version = "0.50.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 908bf4efc1..ca0205d2df 100644
--- a/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.toml
+++ b/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.0"
+version = "0.50.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/factorial/Cargo.toml b/contracts/examples/factorial/Cargo.toml
index c2dd6c42d8..dc27e25d1c 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.50.0"
+version = "0.50.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.0"
+version = "0.50.1"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/factorial/meta/Cargo.toml b/contracts/examples/factorial/meta/Cargo.toml
index 74f7c6dbe9..c25ba718c2 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.50.0"
+version = "0.50.1"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/examples/factorial/wasm/Cargo.toml b/contracts/examples/factorial/wasm/Cargo.toml
index f4d306ec6d..83a2e0d421 100644
--- a/contracts/examples/factorial/wasm/Cargo.toml
+++ b/contracts/examples/factorial/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.0"
+version = "0.50.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/fractional-nfts/Cargo.toml b/contracts/examples/fractional-nfts/Cargo.toml
index e3b4dd4721..24149e5c5a 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.50.0"
+version = "0.50.1"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.50.0"
+version = "0.50.1"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.0"
+version = "0.50.1"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/fractional-nfts/meta/Cargo.toml b/contracts/examples/fractional-nfts/meta/Cargo.toml
index 07ab765495..0a5cea1450 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.50.0"
+version = "0.50.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 e912cbed4b..3e0e20a9b8 100644
--- a/contracts/examples/fractional-nfts/wasm/Cargo.toml
+++ b/contracts/examples/fractional-nfts/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.0"
+version = "0.50.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/lottery-esdt/Cargo.toml b/contracts/examples/lottery-esdt/Cargo.toml
index f6d4acb67e..2fa674fed7 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.50.0"
+version = "0.50.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.0"
+version = "0.50.1"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/lottery-esdt/meta/Cargo.toml b/contracts/examples/lottery-esdt/meta/Cargo.toml
index 2f737d5182..0f88b6c62e 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.50.0"
+version = "0.50.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 060058ceb5..682b887dd3 100644
--- a/contracts/examples/lottery-esdt/wasm/Cargo.toml
+++ b/contracts/examples/lottery-esdt/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.0"
+version = "0.50.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/multisig/Cargo.toml b/contracts/examples/multisig/Cargo.toml
index 102e7fff83..6e5690103e 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.50.0"
+version = "0.50.1"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.50.0"
+version = "0.50.1"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.0"
+version = "0.50.1"
 path = "../../../framework/scenario"
 
 [dev-dependencies.adder]
@@ -27,7 +27,7 @@ path = "../adder"
 path = "../factorial"
 
 [dev-dependencies.multiversx-wegld-swap-sc]
-version = "0.50.0"
+version = "0.50.1"
 path = "../../core/wegld-swap"
 
 [dev-dependencies]
diff --git a/contracts/examples/multisig/interact/Cargo.toml b/contracts/examples/multisig/interact/Cargo.toml
index 6d0980b08a..ab946d05a9 100644
--- a/contracts/examples/multisig/interact/Cargo.toml
+++ b/contracts/examples/multisig/interact/Cargo.toml
@@ -18,17 +18,17 @@ toml = "0.8.6"
 path = ".."
 
 [dependencies.multiversx-sc-modules]
-version = "0.50.0"
+version = "0.50.1"
 path = "../../../../contracts/modules"
 
 [dependencies.multiversx-sc-snippets]
-version = "0.50.0"
+version = "0.50.1"
 path = "../../../../framework/snippets"
 
 [dependencies.multiversx-sc-scenario]
-version = "=0.50.0"
+version = "=0.50.1"
 path = "../../../../framework/scenario"
 
 [dependencies.multiversx-sc]
-version = "=0.50.0"
+version = "=0.50.1"
 path = "../../../../framework/base"
diff --git a/contracts/examples/multisig/meta/Cargo.toml b/contracts/examples/multisig/meta/Cargo.toml
index 18643a8af8..228087eebf 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.50.0"
+version = "0.50.1"
 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 9339183ea0..f97f320937 100644
--- a/contracts/examples/multisig/wasm-multisig-full/Cargo.toml
+++ b/contracts/examples/multisig/wasm-multisig-full/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.0"
+version = "0.50.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 9a1691b304..b09c6148df 100644
--- a/contracts/examples/multisig/wasm-multisig-view/Cargo.toml
+++ b/contracts/examples/multisig/wasm-multisig-view/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.0"
+version = "0.50.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/multisig/wasm/Cargo.toml b/contracts/examples/multisig/wasm/Cargo.toml
index 15c6fcdda4..f3ffba8979 100644
--- a/contracts/examples/multisig/wasm/Cargo.toml
+++ b/contracts/examples/multisig/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.0"
+version = "0.50.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/nft-minter/Cargo.toml b/contracts/examples/nft-minter/Cargo.toml
index 6a6dc93818..2eb3c915b5 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.50.0"
+version = "0.50.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.0"
+version = "0.50.1"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/nft-minter/meta/Cargo.toml b/contracts/examples/nft-minter/meta/Cargo.toml
index 64c911d3eb..fbf04e0e70 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.50.0"
+version = "0.50.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 d641e48f53..3910e59ad4 100644
--- a/contracts/examples/nft-minter/wasm/Cargo.toml
+++ b/contracts/examples/nft-minter/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.0"
+version = "0.50.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 85ce98347a..0a38b9601a 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.50.0"
+version = "0.50.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.0"
+version = "0.50.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 f84e4d7e0b..8f63fdf9bb 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.50.0"
+version = "0.50.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 7b9b0b7b5a..0688e1e2f8 100644
--- a/contracts/examples/nft-storage-prepay/wasm/Cargo.toml
+++ b/contracts/examples/nft-storage-prepay/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.0"
+version = "0.50.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/nft-subscription/Cargo.toml b/contracts/examples/nft-subscription/Cargo.toml
index e9b428722c..1ed733f7e8 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.50.0"
+version = "0.50.1"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.50.0"
+version = "0.50.1"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.0"
+version = "0.50.1"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/nft-subscription/meta/Cargo.toml b/contracts/examples/nft-subscription/meta/Cargo.toml
index a7149fa9dd..40ebfe2200 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.50.0"
+version = "0.50.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 3eb795ed69..d571edb793 100644
--- a/contracts/examples/nft-subscription/wasm/Cargo.toml
+++ b/contracts/examples/nft-subscription/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.0"
+version = "0.50.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 0565667f2b..96e8d7a9c3 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.50.0"
+version = "0.50.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.0"
+version = "0.50.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 4bf0679153..6eb84b176d 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.50.0"
+version = "0.50.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 b9bc987077..a4e8d15158 100644
--- a/contracts/examples/order-book/factory/wasm/Cargo.toml
+++ b/contracts/examples/order-book/factory/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.0"
+version = "0.50.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 506621642f..afb148fb1d 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.50.0"
+version = "0.50.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.0"
+version = "0.50.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 434e1a0753..9d0fe953c3 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.50.0"
+version = "0.50.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 1e51e9c3fb..fe727e8839 100644
--- a/contracts/examples/order-book/pair/wasm/Cargo.toml
+++ b/contracts/examples/order-book/pair/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.0"
+version = "0.50.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 0cf328ce40..b7e9be8c11 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.50.0"
+version = "0.50.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.0"
+version = "0.50.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 948d484e68..d7aca8ceef 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.50.0"
+version = "0.50.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 6d50aca185..c1b822e3a2 100644
--- a/contracts/examples/ping-pong-egld/wasm/Cargo.toml
+++ b/contracts/examples/ping-pong-egld/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.0"
+version = "0.50.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/proxy-pause/Cargo.toml b/contracts/examples/proxy-pause/Cargo.toml
index 9a406d26e3..7f0b5626d4 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.50.0"
+version = "0.50.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.0"
+version = "0.50.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 9aa661cca5..9305353045 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.50.0"
+version = "0.50.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 94aa50c199..3ef2cd3769 100644
--- a/contracts/examples/proxy-pause/wasm/Cargo.toml
+++ b/contracts/examples/proxy-pause/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.0"
+version = "0.50.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/rewards-distribution/Cargo.toml b/contracts/examples/rewards-distribution/Cargo.toml
index 06a8a138e0..9d79308662 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.50.0"
+version = "0.50.1"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.50.0"
+version = "0.50.1"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.0"
+version = "0.50.1"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/rewards-distribution/meta/Cargo.toml b/contracts/examples/rewards-distribution/meta/Cargo.toml
index 4ee4f2feb1..8e74f644d1 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 <claudiu.bruda@multiversx.com>"]
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.50.0"
+version = "0.50.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 9f260e035e..1cbf54d7aa 100644
--- a/contracts/examples/rewards-distribution/wasm/Cargo.toml
+++ b/contracts/examples/rewards-distribution/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.0"
+version = "0.50.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 b69d9c9a1b..1139b0ba20 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.50.0"
+version = "0.50.1"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.50.0"
+version = "0.50.1"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.0"
+version = "0.50.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 8c9b014b15..db7beb331a 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 <claudiu.bruda@multiversx.com>"]
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.50.0"
+version = "0.50.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 7ff1aa3167..0c82bd70a2 100644
--- a/contracts/examples/seed-nft-minter/wasm/Cargo.toml
+++ b/contracts/examples/seed-nft-minter/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.0"
+version = "0.50.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/token-release/Cargo.toml b/contracts/examples/token-release/Cargo.toml
index a9dd91049c..b5f588d0b0 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.50.0"
+version = "0.50.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.0"
+version = "0.50.1"
 path = "../../../framework/scenario"
 
diff --git a/contracts/examples/token-release/meta/Cargo.toml b/contracts/examples/token-release/meta/Cargo.toml
index 6472c62dbe..45084d38dd 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.50.0"
+version = "0.50.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 7ba8ba53de..b1098af606 100644
--- a/contracts/examples/token-release/wasm/Cargo.toml
+++ b/contracts/examples/token-release/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.0"
+version = "0.50.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 b91a4658f8..c7913e1be2 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.50.0"
+version = "0.50.1"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.0"
+version = "0.50.1"
 path = "../../../framework/scenario"
 
 [dev-dependencies.multiversx-sc-meta]
-version = "0.50.0"
+version = "0.50.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 83cee8e243..658c272483 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.50.0"
+            "version": "0.50.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 616cb2c407..c75a19fff9 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.50.0"
+            "version": "0.50.1"
         }
     },
     "docs": [
diff --git a/contracts/feature-tests/abi-tester/meta/Cargo.toml b/contracts/feature-tests/abi-tester/meta/Cargo.toml
index 484740f799..c2af2a7964 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.50.0"
+version = "0.50.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 c987cc1014..18862cf3ff 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.0"
+version = "0.50.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 a4c112d54a..3d4c21b5d6 100644
--- a/contracts/feature-tests/abi-tester/wasm/Cargo.toml
+++ b/contracts/feature-tests/abi-tester/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.0"
+version = "0.50.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 deba8cc77f..36c6a81c5f 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.50.0"
+version = "0.50.1"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.0"
+version = "0.50.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 2476a7d590..ab892f44fc 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.50.0"
+version = "0.50.1"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml
index 15c2824e8e..8f9dc59eef 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.0"
+version = "0.50.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml
index b53825c649..f7a1c986a7 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.0"
+version = "0.50.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/alloc-features/wasm/Cargo.toml b/contracts/feature-tests/alloc-features/wasm/Cargo.toml
index 5483e7d87d..604d014fe7 100644
--- a/contracts/feature-tests/alloc-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/alloc-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.0"
+version = "0.50.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 8b738d1002..ccfc3a21d0 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.50.0"
+version = "0.50.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.0"
+version = "0.50.1"
 path = "../../../framework/scenario"
 
 [dependencies.multiversx-sc-modules]
-version = "0.50.0"
+version = "0.50.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 60de45ea57..f2a15b0384 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.50.0"
+version = "0.50.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 f19e1049ea..dedbdbd5e8 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.50.0"
+version = "0.50.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 c6aa9bf34d..7e3b053bfe 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.0"
+version = "0.50.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 f74de0e5bf..6c1ca521c4 100644
--- a/contracts/feature-tests/basic-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/basic-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.0"
+version = "0.50.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 b6f5d8a268..270c6e48ee 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.50.0"
+version = "0.50.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.0"
+version = "0.50.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 2190f2d33a..e0263aa923 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.50.0"
+version = "0.50.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 3e42661142..4b4c47398e 100644
--- a/contracts/feature-tests/big-float-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/big-float-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.0"
+version = "0.50.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/Cargo.toml b/contracts/feature-tests/composability/Cargo.toml
index 6b8aece3a1..6d7e5a1a14 100644
--- a/contracts/feature-tests/composability/Cargo.toml
+++ b/contracts/feature-tests/composability/Cargo.toml
@@ -36,9 +36,9 @@ path = "recursive-caller"
 path = "vault"
 
 [dependencies.multiversx-sc]
-version = "0.50.0"
+version = "0.50.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.0"
+version = "0.50.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 e681d83de5..40dd7806c9 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.50.0"
+version = "0.50.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.0"
+version = "0.50.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 c21206f6b7..78fecb685a 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.50.0"
+version = "0.50.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 fb41856a7b..71c249f42d 100644
--- a/contracts/feature-tests/composability/builtin-func-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/builtin-func-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.0"
+version = "0.50.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 c8590eddc0..22dbfcf60f 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.50.0"
+version = "0.50.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.0"
+version = "0.50.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 5df5441b60..5dc5a8c70c 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
@@ -9,10 +9,10 @@ publish = false
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "0.50.0"
+version = "0.50.1"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.0"
+version = "0.50.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 7cb1c1954f..e6bf521eb3 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.50.0"
+version = "0.50.1"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.50.0"
+version = "0.50.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 5f227a3bbd..75bf650c13 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.0"
+version = "0.50.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 4876471d56..c58bf7eeba 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.50.0"
+version = "0.50.1"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.0"
+version = "0.50.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 ec4dd76d45..cd435c65b1 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.50.0"
+version = "0.50.1"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.50.0"
+version = "0.50.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 c112f28171..57fdd2a32d 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.0"
+version = "0.50.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 4d454c45bd..f232ba1fc2 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.50.0"
+version = "0.50.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.0"
+version = "0.50.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 58cf6fb6c1..239c176cd6 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.50.0"
+version = "0.50.1"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.0"
+version = "0.50.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 2c3435f72f..1623016c58 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.50.0"
+version = "0.50.1"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.50.0"
+version = "0.50.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 08b87de82c..9d948ed1a8 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.0"
+version = "0.50.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 40809b2ff8..4134271eee 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
@@ -9,10 +9,10 @@ publish = false
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "0.50.0"
+version = "0.50.1"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.0"
+version = "0.50.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 1900e42ce5..30423fa072 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.50.0"
+version = "0.50.1"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.50.0"
+version = "0.50.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 8ae671f12c..bd92a51740 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.0"
+version = "0.50.1"
 path = "../../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/forwarder-legacy/Cargo.toml b/contracts/feature-tests/composability/forwarder-legacy/Cargo.toml
index c296870251..018aafdd8f 100644
--- a/contracts/feature-tests/composability/forwarder-legacy/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-legacy/Cargo.toml
@@ -12,10 +12,10 @@ path = "src/forwarder_legacy_main.rs"
 path = "../vault"
 
 [dependencies.multiversx-sc]
-version = "0.50.0"
+version = "0.50.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.0"
+version = "0.50.1"
 path = "../../../../framework/scenario"
 
diff --git a/contracts/feature-tests/composability/forwarder-legacy/meta/Cargo.toml b/contracts/feature-tests/composability/forwarder-legacy/meta/Cargo.toml
index 698488368f..7031720601 100644
--- a/contracts/feature-tests/composability/forwarder-legacy/meta/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-legacy/meta/Cargo.toml
@@ -8,6 +8,6 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.50.0"
+version = "0.50.1"
 path = "../../../../../framework/meta"
 default-features = false
diff --git a/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.toml b/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.toml
index d05dbe3ef7..aa9c8d2cd1 100644
--- a/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.0"
+version = "0.50.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 48077eca8b..5b874c3212 100644
--- a/contracts/feature-tests/composability/forwarder-queue/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-queue/Cargo.toml
@@ -9,14 +9,14 @@ publish = false
 path = "src/forwarder_queue.rs"
 
 [dependencies.multiversx-sc]
-version = "0.50.0"
+version = "0.50.1"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.0"
+version = "0.50.1"
 path = "../../../../framework/wasm-adapter"
 optional = true
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.0"
+version = "0.50.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 4870962372..2044404279 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.50.0"
+version = "0.50.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 2486716bd7..37d301cb4f 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.0"
+version = "0.50.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 c961e16432..9f95037b69 100644
--- a/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.0"
+version = "0.50.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 bc898280c5..4059317f1f 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.50.0"
+version = "0.50.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.0"
+version = "0.50.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 c09653539c..abad11606a 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.50.0"
+version = "0.50.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 e1564c014d..8fb817d32f 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.0"
+version = "0.50.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 5aab141abf..a344f1b8f0 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.0"
+version = "0.50.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 34acac241a..805e5bcc3f 100644
--- a/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.0"
+version = "0.50.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 e8bac116cc..01b55029fa 100644
--- a/contracts/feature-tests/composability/forwarder/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder/Cargo.toml
@@ -9,10 +9,10 @@ publish = false
 path = "src/forwarder_main.rs"
 
 [dependencies.multiversx-sc]
-version = "0.50.0"
+version = "0.50.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.0"
+version = "0.50.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 5423d48966..9adb95c2a1 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.50.0"
+version = "0.50.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 b7e6d9fc22..d84c2f897c 100644
--- a/contracts/feature-tests/composability/forwarder/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.0"
+version = "0.50.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 0b0fc143e0..b58dc2c5a7 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.50.0"
+version = "0.50.1"
 path = "../../../../contracts/modules"
 
 [dependencies.multiversx-sc-snippets]
-version = "0.50.0"
+version = "0.50.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 6abdbbd6ad..69a627f332 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.50.0"
+version = "0.50.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.0"
+version = "0.50.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 8be9e00cca..c3751aee68 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.50.0"
+version = "0.50.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 0bef6ec952..3ab1f371d3 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.0"
+version = "0.50.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 d859fa9184..1957628882 100644
--- a/contracts/feature-tests/composability/promises-features/Cargo.toml
+++ b/contracts/feature-tests/composability/promises-features/Cargo.toml
@@ -9,6 +9,6 @@ publish = false
 path = "src/promises_main.rs"
 
 [dependencies.multiversx-sc]
-version = "0.50.0"
+version = "0.50.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 51b36cf55b..e9da47adf6 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.50.0"
+version = "0.50.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 2a50527d00..ecfb439d11 100644
--- a/contracts/feature-tests/composability/promises-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/promises-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.0"
+version = "0.50.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 5089ae8e5e..e1c64de7a3 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.50.0"
+version = "0.50.1"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.0"
+version = "0.50.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 a959e10a20..caa8b48cfc 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.50.0"
+version = "0.50.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 fb2967736b..9b7a74f40d 100644
--- a/contracts/feature-tests/composability/proxy-test-first/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/proxy-test-first/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.0"
+version = "0.50.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 c37c88fa75..6b851b730c 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.50.0"
+version = "0.50.1"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.0"
+version = "0.50.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 e4859fb220..3d48f515e1 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.50.0"
+version = "0.50.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 fd2120ffa2..19049f294b 100644
--- a/contracts/feature-tests/composability/proxy-test-second/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/proxy-test-second/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.0"
+version = "0.50.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 ecdcf89509..657db9ff6a 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.50.0"
+version = "0.50.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.0"
+version = "0.50.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 dc3784bfab..e3bbc2ab4f 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.50.0"
+version = "0.50.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 b52712716e..4fefcb2201 100644
--- a/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.0"
+version = "0.50.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 f1a1fc9d62..18c033d87c 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.50.0"
+version = "0.50.1"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.50.0"
+version = "0.50.1"
 path = "../../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.0"
+version = "0.50.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 8d0fcbb68b..6a48904ac1 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.50.0"
+version = "0.50.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 e613b90c3e..e308115d74 100644
--- a/contracts/feature-tests/composability/transfer-role-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/transfer-role-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.0"
+version = "0.50.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 4da10eadf2..81140f8b4d 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.50.0"
+version = "0.50.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.0"
+version = "0.50.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 bba19b1692..659bdd4a50 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.50.0"
+version = "0.50.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 7ae312d234..c31e954ac5 100644
--- a/contracts/feature-tests/composability/vault/wasm-vault-promises/Cargo.toml
+++ b/contracts/feature-tests/composability/vault/wasm-vault-promises/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.0"
+version = "0.50.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 1ac9d7a3eb..b36434739a 100644
--- a/contracts/feature-tests/composability/vault/wasm-vault-upgrade/Cargo.toml
+++ b/contracts/feature-tests/composability/vault/wasm-vault-upgrade/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.0"
+version = "0.50.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 dcad7dd470..86b21b5a5a 100644
--- a/contracts/feature-tests/composability/vault/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/vault/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.0"
+version = "0.50.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 af59c252e1..6451c0441d 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.50.0"
+version = "0.50.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.0"
+version = "0.50.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 109640cbff..e736530831 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.50.0"
+version = "0.50.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 a12ad76ba5..0633d87ccc 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.0"
+version = "0.50.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 1ed1db494f..807f95adc6 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.50.0"
+version = "0.50.1"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.0"
+version = "0.50.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 d0c6a8f89a..b42302f8e5 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.50.0"
+version = "0.50.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 920cdb6d18..0f6651dfb8 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.0"
+version = "0.50.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 20e6accec6..bc22058201 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.50.0"
+version = "0.50.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.0"
+version = "0.50.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 ff51534af6..ffc26f129a 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.50.0"
+version = "0.50.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 99ab569a9b..c3b8a0889d 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.0"
+version = "0.50.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 cd026019d1..c121ca828b 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.50.0"
+version = "0.50.1"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.0"
+version = "0.50.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 8920ff26ca..d29ac71de7 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.50.0"
+version = "0.50.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 226a4e656d..b3a72d9f86 100644
--- a/contracts/feature-tests/erc-style-contracts/erc1155/wasm/Cargo.toml
+++ b/contracts/feature-tests/erc-style-contracts/erc1155/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.0"
+version = "0.50.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 4e79b41a48..6036d0c34e 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.50.0"
+version = "0.50.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.0"
+version = "0.50.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 7ecffa7baf..7693bb48e3 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.50.0"
+version = "0.50.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 f7d2303648..a93aad0954 100644
--- a/contracts/feature-tests/erc-style-contracts/erc20/wasm/Cargo.toml
+++ b/contracts/feature-tests/erc-style-contracts/erc20/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.0"
+version = "0.50.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 36b342c5fb..142cf1c42c 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.50.0"
+version = "0.50.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.0"
+version = "0.50.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 7109f4e70a..e408e153ab 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.50.0"
+version = "0.50.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 8bda1c73ec..4886b668bc 100644
--- a/contracts/feature-tests/erc-style-contracts/erc721/wasm/Cargo.toml
+++ b/contracts/feature-tests/erc-style-contracts/erc721/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.0"
+version = "0.50.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 f439cf41d4..5752b59be0 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.50.0"
+version = "0.50.1"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.0"
+version = "0.50.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 4d09e600fe..325e6e61b2 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.50.0"
+version = "0.50.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 fc81c88fd1..c48f778202 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.0"
+version = "0.50.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 c6b14eadc7..6937de32bb 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.50.0"
+version = "0.50.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.0"
+version = "0.50.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 18eb3960d2..ea3ee87423 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.50.0"
+version = "0.50.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 7697d25efc..12b5fce711 100644
--- a/contracts/feature-tests/esdt-system-sc-mock/wasm/Cargo.toml
+++ b/contracts/feature-tests/esdt-system-sc-mock/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.0"
+version = "0.50.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/exchange-features/Cargo.toml b/contracts/feature-tests/exchange-features/Cargo.toml
index 5ab2bdea18..3ecd59b340 100644
--- a/contracts/feature-tests/exchange-features/Cargo.toml
+++ b/contracts/feature-tests/exchange-features/Cargo.toml
@@ -9,9 +9,9 @@ publish = false
 path = "src/exchange_features.rs"
 
 [dependencies.multiversx-sc]
-version = "0.50.0"
+version = "0.50.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.0"
+version = "0.50.1"
 path = "../../../framework/scenario"
diff --git a/contracts/feature-tests/exchange-features/meta/Cargo.toml b/contracts/feature-tests/exchange-features/meta/Cargo.toml
index 0b7383402f..c58de5bd9e 100644
--- a/contracts/feature-tests/exchange-features/meta/Cargo.toml
+++ b/contracts/feature-tests/exchange-features/meta/Cargo.toml
@@ -8,6 +8,6 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.50.0"
+version = "0.50.1"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/feature-tests/exchange-features/wasm/Cargo.toml b/contracts/feature-tests/exchange-features/wasm/Cargo.toml
index 0141df21ea..d39e3d226a 100644
--- a/contracts/feature-tests/exchange-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/exchange-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.0"
+version = "0.50.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 cd344b485b..48af06e141 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.50.0"
+version = "0.50.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.0"
+version = "0.50.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 38d0e6a75b..925ef3f2e4 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.50.0"
+version = "0.50.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 15bb2c28c0..2afee872bf 100644
--- a/contracts/feature-tests/formatted-message-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/formatted-message-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.0"
+version = "0.50.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 5142134a89..69eaacdd1e 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.50.0"
+version = "0.50.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.0"
+version = "0.50.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 710215d3ea..b57398d162 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.50.0"
+version = "0.50.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 19b7f4231d..b7ce8dec6d 100644
--- a/contracts/feature-tests/managed-map-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/managed-map-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.0"
+version = "0.50.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 9716c53dfc..a548293fe5 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.50.0"
+version = "0.50.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.0"
+version = "0.50.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 749f427f52..9bd9d2503b 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.50.0"
+version = "0.50.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 2bc184ff09..d18f4d8c59 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.0"
+version = "0.50.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 ac7e6331ce..308fe5594c 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
@@ -29,7 +29,7 @@ path = ".."
 features = ["example_feature"]
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.0"
+version = "0.50.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 bc869f15fe..ce8564d6e3 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.0"
+version = "0.50.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 654a0bb859..488124f208 100644
--- a/contracts/feature-tests/multi-contract-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/multi-contract-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.0"
+version = "0.50.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 36e475bb60..b3c853f36d 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.50.0"
+version = "0.50.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.0"
+version = "0.50.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 98832309a9..7ecc5c0f06 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.50.0"
+version = "0.50.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 9e7e11f1ef..b982ef6d44 100644
--- a/contracts/feature-tests/panic-message-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/panic-message-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.0"
+version = "0.50.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 b1a8eada8b..e2f3a9eb7e 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.50.0"
+version = "0.50.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.0"
+version = "0.50.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 4c8a0c1e82..c990e2b3f7 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.50.0"
+version = "0.50.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 7077b92045..236ad71f17 100644
--- a/contracts/feature-tests/payable-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/payable-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.0"
+version = "0.50.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 28b21758f1..c7b2c13a8d 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.50.0"
+version = "0.50.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.0"
+version = "0.50.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 dee69733d5..459ea4ed3d 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.50.0"
+version = "0.50.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 449c0c22c6..3145478e01 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.50.0"
+version = "0.50.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 39e3d6f0ec..bdc003a53a 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.50.0"
+// version = "0.50.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 cfda3e917b..7106170016 100644
--- a/contracts/feature-tests/rust-snippets-generator-test/wasm/Cargo.toml
+++ b/contracts/feature-tests/rust-snippets-generator-test/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.0"
+version = "0.50.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 8a972dee28..5e4e9c3658 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.50.0"
+version = "0.50.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.50.0"
+version = "0.50.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 2ab1f50f29..57017161e8 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.50.0"
+version = "0.50.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 55fe7b60eb..1f804a8b00 100644
--- a/contracts/feature-tests/rust-testing-framework-tester/wasm/Cargo.toml
+++ b/contracts/feature-tests/rust-testing-framework-tester/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.0"
+version = "0.50.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/scenario-tester/Cargo.toml b/contracts/feature-tests/scenario-tester/Cargo.toml
index 7730957bf3..6b8a851a73 100644
--- a/contracts/feature-tests/scenario-tester/Cargo.toml
+++ b/contracts/feature-tests/scenario-tester/Cargo.toml
@@ -9,9 +9,9 @@ publish = false
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "0.50.0"
+version = "0.50.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.0"
+version = "0.50.1"
 path = "../../../framework/scenario"
diff --git a/contracts/feature-tests/scenario-tester/meta/Cargo.toml b/contracts/feature-tests/scenario-tester/meta/Cargo.toml
index 5e098c989a..9ef6388239 100644
--- a/contracts/feature-tests/scenario-tester/meta/Cargo.toml
+++ b/contracts/feature-tests/scenario-tester/meta/Cargo.toml
@@ -8,6 +8,6 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.50.0"
+version = "0.50.1"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/feature-tests/scenario-tester/wasm/Cargo.toml b/contracts/feature-tests/scenario-tester/wasm/Cargo.toml
index 0119b76a59..db973f8887 100644
--- a/contracts/feature-tests/scenario-tester/wasm/Cargo.toml
+++ b/contracts/feature-tests/scenario-tester/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.0"
+version = "0.50.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 96a755fa3e..2af9a18a90 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.50.0"
+version = "0.50.1"
 path = "../../../contracts/modules"
 
 [dependencies.multiversx-sc]
-version = "0.50.0"
+version = "0.50.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.0"
+version = "0.50.1"
 path = "../../../framework/scenario"
 
 [dev-dependencies.multiversx-sc-meta]
-version = "0.50.0"
+version = "0.50.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 e236f28a16..7959e308e6 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.50.0"
+version = "0.50.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 2e3972993d..b5d1825853 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.50.0"
+version = "0.50.1"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.50.0"
+version = "0.50.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 4bb1d59883..c64a1e3bf8 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.50.0"
+            "version": "0.50.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 921701e29f..9be47a4ba3 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.50.0"
+            "version": "0.50.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 0578f1a8dc..6f90f19ed4 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.0"
+version = "0.50.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 fb19580638..2a36644a09 100644
--- a/contracts/feature-tests/use-module/wasm/Cargo.toml
+++ b/contracts/feature-tests/use-module/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.0"
+version = "0.50.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/modules/Cargo.toml b/contracts/modules/Cargo.toml
index 88e24c875d..76b6bb88c2 100644
--- a/contracts/modules/Cargo.toml
+++ b/contracts/modules/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-modules"
-version = "0.50.0"
+version = "0.50.1"
 edition = "2021"
 
 authors = ["MultiversX <contact@multiversx.com>"]
@@ -17,5 +17,5 @@ categories = ["no-std", "wasm", "cryptography::cryptocurrencies"]
 alloc = ["multiversx-sc/alloc"]
 
 [dependencies.multiversx-sc]
-version = "0.50.0"
+version = "0.50.1"
 path = "../../framework/base"
diff --git a/framework/base/Cargo.toml b/framework/base/Cargo.toml
index c112d5ae7f..2e07c40cef 100644
--- a/framework/base/Cargo.toml
+++ b/framework/base/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc"
-version = "0.50.0"
+version = "0.50.1"
 edition = "2021"
 
 authors = ["Andrei Marinica <andrei.marinica@multiversx.com>", "MultiversX <contact@multiversx.com>"]
@@ -29,7 +29,7 @@ num-traits = { version = "=0.2.19", default-features = false }
 unwrap-infallible = "0.1.5"
 
 [dependencies.multiversx-sc-derive]
-version = "=0.50.0"
+version = "=0.50.1"
 path = "../derive"
 
 [dependencies.multiversx-sc-codec]
diff --git a/framework/derive/Cargo.toml b/framework/derive/Cargo.toml
index dfbd737e90..51c4fbb757 100644
--- a/framework/derive/Cargo.toml
+++ b/framework/derive/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-derive"
-version = "0.50.0"
+version = "0.50.1"
 edition = "2021"
 
 authors = ["Andrei Marinica <andrei.marinica@multiversx.com>", "MultiversX <contact@multiversx.com>"]
diff --git a/framework/meta/Cargo.toml b/framework/meta/Cargo.toml
index 104675190b..21eae22f88 100644
--- a/framework/meta/Cargo.toml
+++ b/framework/meta/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-meta"
-version = "0.50.0"
+version = "0.50.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.50.0"
+version = "=0.50.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 3545b2c303..7bf8ab8d5c 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.50.0"
+version = "0.50.1"
 
 [dependencies.multiversx-sc]
 version = "0.49.0"
diff --git a/framework/meta/src/version_history.rs b/framework/meta/src/version_history.rs
index e79db2e046..281f9c496b 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.50.0);
+pub const LAST_VERSION: FrameworkVersion = framework_version!(0.50.1);
 
 /// Indicates where to stop with the upgrades.
 pub const LAST_UPGRADE_VERSION: FrameworkVersion = LAST_VERSION;
@@ -70,6 +70,7 @@ pub const VERSIONS: &[FrameworkVersion] = framework_versions![
     0.48.1,
     0.49.0,
     0.50.0,
+    0.50.1,
 ];
 
 #[rustfmt::skip]
diff --git a/framework/scenario/Cargo.toml b/framework/scenario/Cargo.toml
index 2495f292f5..0262a9defa 100644
--- a/framework/scenario/Cargo.toml
+++ b/framework/scenario/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-scenario"
-version = "0.50.0"
+version = "0.50.1"
 edition = "2021"
 
 authors = [
@@ -41,12 +41,12 @@ path = "src/main.rs"
 run-go-tests = []
 
 [dependencies.multiversx-sc]
-version = "=0.50.0"
+version = "=0.50.1"
 features = ["alloc", "num-bigint"]
 path = "../base"
 
 [dependencies.multiversx-sc-meta]
-version = "=0.50.0"
+version = "=0.50.1"
 path = "../meta"
 
 [dependencies.multiversx-chain-scenario-format]
diff --git a/framework/snippets/Cargo.toml b/framework/snippets/Cargo.toml
index 8b0cdc9e20..5f9635a58b 100644
--- a/framework/snippets/Cargo.toml
+++ b/framework/snippets/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-snippets"
-version = "0.50.0"
+version = "0.50.1"
 edition = "2021"
 
 authors = ["MultiversX <contact@multiversx.com>"]
@@ -23,7 +23,7 @@ futures = "0.3"
 rand = "0.8.5"
 
 [dependencies.multiversx-sc-scenario]
-version = "=0.50.0"
+version = "=0.50.1"
 path = "../scenario"
 
 [dependencies.multiversx-sdk]
diff --git a/framework/wasm-adapter/Cargo.toml b/framework/wasm-adapter/Cargo.toml
index 4391acb65c..3661cbf570 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.50.0"
+version = "0.50.1"
 edition = "2021"
 
 authors = [
@@ -22,5 +22,5 @@ categories = [
 ]
 
 [dependencies.multiversx-sc]
-version = "=0.50.0"
+version = "=0.50.1"
 path = "../base"
diff --git a/tools/mxpy-snippet-generator/Cargo.toml b/tools/mxpy-snippet-generator/Cargo.toml
index 56b9e733c1..19411d33fd 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.50.0"
+version = "0.50.1"
 path = "../../framework/base"
 
 [dependencies]
diff --git a/tools/rust-debugger/format-tests/Cargo.toml b/tools/rust-debugger/format-tests/Cargo.toml
index 33f3e4f4da..fb02fdcd72 100644
--- a/tools/rust-debugger/format-tests/Cargo.toml
+++ b/tools/rust-debugger/format-tests/Cargo.toml
@@ -9,11 +9,11 @@ name = "format-tests"
 path = "src/format_tests.rs"
 
 [dependencies.multiversx-sc]
-version = "=0.50.0"
+version = "=0.50.1"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-scenario]
-version = "=0.50.0"
+version = "=0.50.1"
 path = "../../../framework/scenario"
 
 [dependencies.multiversx-chain-vm]

From 2ea77b9bb84c2c00b805023ef1544cbbd67f1283 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 16 May 2024 11:03:11 +0300
Subject: [PATCH 0892/1254] Cargo.lock upgrade

---
 contracts/benchmarks/large-storage/wasm/Cargo.lock     |  6 +++---
 .../mappers/linked-list-repeat/wasm/Cargo.lock         |  6 +++---
 .../benchmarks/mappers/map-repeat/wasm/Cargo.lock      |  6 +++---
 .../benchmarks/mappers/queue-repeat/wasm/Cargo.lock    |  6 +++---
 .../benchmarks/mappers/set-repeat/wasm/Cargo.lock      |  6 +++---
 .../mappers/single-value-repeat/wasm/Cargo.lock        |  6 +++---
 .../benchmarks/mappers/vec-repeat/wasm/Cargo.lock      |  6 +++---
 contracts/benchmarks/send-tx-repeat/wasm/Cargo.lock    |  6 +++---
 .../wasm-str-repeat-mb-builder-basic/Cargo.lock        |  6 +++---
 .../wasm-str-repeat-mb-builder-cached/Cargo.lock       |  6 +++---
 contracts/benchmarks/str-repeat/wasm/Cargo.lock        |  6 +++---
 contracts/core/price-aggregator/wasm/Cargo.lock        | 10 +++++-----
 contracts/examples/adder/wasm/Cargo.lock               |  6 +++---
 .../examples/bonding-curve-contract/wasm/Cargo.lock    |  8 ++++----
 contracts/examples/check-pause/wasm/Cargo.lock         |  8 ++++----
 contracts/examples/crowdfunding-esdt/wasm/Cargo.lock   |  6 +++---
 contracts/examples/crypto-bubbles/wasm/Cargo.lock      |  6 +++---
 .../crypto-kitties/kitty-auction/wasm/Cargo.lock       |  6 +++---
 .../crypto-kitties/kitty-genetic-alg/wasm/Cargo.lock   |  6 +++---
 .../crypto-kitties/kitty-ownership/wasm/Cargo.lock     |  6 +++---
 contracts/examples/crypto-zombies/wasm/Cargo.lock      |  6 +++---
 contracts/examples/digital-cash/wasm/Cargo.lock        |  6 +++---
 contracts/examples/empty/wasm/Cargo.lock               |  6 +++---
 .../examples/esdt-transfer-with-fee/wasm/Cargo.lock    |  6 +++---
 contracts/examples/factorial/wasm/Cargo.lock           |  6 +++---
 contracts/examples/fractional-nfts/wasm/Cargo.lock     |  8 ++++----
 contracts/examples/lottery-esdt/wasm/Cargo.lock        |  6 +++---
 .../examples/multisig/wasm-multisig-full/Cargo.lock    |  8 ++++----
 .../examples/multisig/wasm-multisig-view/Cargo.lock    |  8 ++++----
 contracts/examples/multisig/wasm/Cargo.lock            |  8 ++++----
 contracts/examples/nft-minter/wasm/Cargo.lock          |  6 +++---
 contracts/examples/nft-storage-prepay/wasm/Cargo.lock  |  6 +++---
 contracts/examples/nft-subscription/wasm/Cargo.lock    |  8 ++++----
 contracts/examples/order-book/factory/wasm/Cargo.lock  |  6 +++---
 contracts/examples/order-book/pair/wasm/Cargo.lock     |  6 +++---
 contracts/examples/ping-pong-egld/wasm/Cargo.lock      |  6 +++---
 contracts/examples/proxy-pause/wasm/Cargo.lock         |  6 +++---
 .../examples/rewards-distribution/wasm/Cargo.lock      |  8 ++++----
 contracts/examples/seed-nft-minter/wasm/Cargo.lock     |  8 ++++----
 contracts/examples/token-release/wasm/Cargo.lock       |  6 +++---
 .../abi-tester/wasm-abi-tester-ev/Cargo.lock           |  6 +++---
 contracts/feature-tests/abi-tester/wasm/Cargo.lock     |  6 +++---
 .../alloc-features/wasm-alloc-mem-fail/Cargo.lock      |  6 +++---
 .../alloc-features/wasm-alloc-mem-leaking/Cargo.lock   |  6 +++---
 contracts/feature-tests/alloc-features/wasm/Cargo.lock |  6 +++---
 .../wasm-basic-features-storage-bytes/Cargo.lock       |  8 ++++----
 contracts/feature-tests/basic-features/wasm/Cargo.lock |  8 ++++----
 .../feature-tests/big-float-features/wasm/Cargo.lock   |  6 +++---
 .../builtin-func-features/wasm/Cargo.lock              |  6 +++---
 .../esdt-contract-pair/first-contract/wasm/Cargo.lock  |  6 +++---
 .../esdt-contract-pair/second-contract/wasm/Cargo.lock |  6 +++---
 .../child/wasm/Cargo.lock                              |  6 +++---
 .../parent/wasm/Cargo.lock                             |  6 +++---
 .../composability/forwarder-legacy/wasm/Cargo.lock     |  6 +++---
 .../wasm-forwarder-queue-promises/Cargo.lock           |  6 +++---
 .../composability/forwarder-queue/wasm/Cargo.lock      |  6 +++---
 .../wasm-forwarder-raw-init-async-call/Cargo.lock      |  6 +++---
 .../wasm-forwarder-raw-init-sync-call/Cargo.lock       |  6 +++---
 .../composability/forwarder-raw/wasm/Cargo.lock        |  6 +++---
 .../composability/forwarder/wasm/Cargo.lock            |  6 +++---
 .../composability/local-esdt-and-nft/wasm/Cargo.lock   |  6 +++---
 .../composability/promises-features/wasm/Cargo.lock    |  6 +++---
 .../composability/proxy-test-first/wasm/Cargo.lock     |  6 +++---
 .../composability/proxy-test-second/wasm/Cargo.lock    |  6 +++---
 .../composability/recursive-caller/wasm/Cargo.lock     |  6 +++---
 .../transfer-role-features/wasm/Cargo.lock             |  8 ++++----
 .../composability/vault/wasm-vault-promises/Cargo.lock |  6 +++---
 .../composability/vault/wasm-vault-upgrade/Cargo.lock  |  6 +++---
 .../feature-tests/composability/vault/wasm/Cargo.lock  |  6 +++---
 .../crowdfunding-erc20/wasm/Cargo.lock                 |  6 +++---
 .../erc1155-marketplace/wasm/Cargo.lock                |  6 +++---
 .../erc1155-user-mock/wasm/Cargo.lock                  |  6 +++---
 .../erc-style-contracts/erc1155/wasm/Cargo.lock        |  6 +++---
 .../erc-style-contracts/erc20/wasm/Cargo.lock          |  6 +++---
 .../erc-style-contracts/erc721/wasm/Cargo.lock         |  6 +++---
 .../erc-style-contracts/lottery-erc20/wasm/Cargo.lock  |  6 +++---
 .../feature-tests/esdt-system-sc-mock/wasm/Cargo.lock  |  6 +++---
 .../feature-tests/exchange-features/wasm/Cargo.lock    |  6 +++---
 .../formatted-message-features/wasm/Cargo.lock         |  6 +++---
 .../feature-tests/managed-map-features/wasm/Cargo.lock |  6 +++---
 .../wasm-multi-contract-alt-impl/Cargo.lock            |  6 +++---
 .../wasm-multi-contract-example-feature/Cargo.lock     |  6 +++---
 .../wasm-multi-contract-features-view/Cargo.lock       |  6 +++---
 .../multi-contract-features/wasm/Cargo.lock            |  6 +++---
 .../panic-message-features/wasm/Cargo.lock             |  6 +++---
 .../feature-tests/payable-features/wasm/Cargo.lock     |  6 +++---
 .../rust-snippets-generator-test/wasm/Cargo.lock       |  6 +++---
 .../rust-testing-framework-tester/wasm/Cargo.lock      |  6 +++---
 .../feature-tests/scenario-tester/wasm/Cargo.lock      |  6 +++---
 .../use-module/wasm-use-module-view/Cargo.lock         |  8 ++++----
 contracts/feature-tests/use-module/wasm/Cargo.lock     |  8 ++++----
 91 files changed, 289 insertions(+), 289 deletions(-)

diff --git a/contracts/benchmarks/large-storage/wasm/Cargo.lock b/contracts/benchmarks/large-storage/wasm/Cargo.lock
index dba248ea1e..6c3138159c 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.50.0"
+version = "0.50.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.lock
index abf67723b1..7d4336903b 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.50.0"
+version = "0.50.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.lock
index f01af1f56f..738ff36847 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.50.0"
+version = "0.50.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.lock
index 6906ca7296..0041f126e6 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.50.0"
+version = "0.50.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -78,7 +78,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -89,7 +89,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.lock
index f5de0ccba1..0bc82074e9 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.50.0"
+version = "0.50.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -78,7 +78,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -89,7 +89,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.lock
index c9cfc96106..f2e5f6584e 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.50.0"
+version = "0.50.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -78,7 +78,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -89,7 +89,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.lock
index 8fd083636f..067106a9b8 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.50.0"
+version = "0.50.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -78,7 +78,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -89,7 +89,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/send-tx-repeat/wasm/Cargo.lock b/contracts/benchmarks/send-tx-repeat/wasm/Cargo.lock
index 7c7075cab8..b47f70d1f1 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.50.0"
+version = "0.50.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.lock b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.lock
index 5944a194d0..72a0309324 100644
--- a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.lock
+++ b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.lock
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.lock b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.lock
index 7a929b52ce..4333c2a196 100644
--- a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.lock
+++ b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.lock
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/str-repeat/wasm/Cargo.lock b/contracts/benchmarks/str-repeat/wasm/Cargo.lock
index db58ccefaa..2635057539 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.50.0"
+version = "0.50.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/core/price-aggregator/wasm/Cargo.lock b/contracts/core/price-aggregator/wasm/Cargo.lock
index 3d174ea714..3dc8ab55a8 100644
--- a/contracts/core/price-aggregator/wasm/Cargo.lock
+++ b/contracts/core/price-aggregator/wasm/Cargo.lock
@@ -86,7 +86,7 @@ checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
 
 [[package]]
 name = "multiversx-price-aggregator-sc"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "arrayvec",
  "getrandom",
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -136,7 +136,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -147,14 +147,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/adder/wasm/Cargo.lock b/contracts/examples/adder/wasm/Cargo.lock
index c994e313a0..4f7ffc739c 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.50.0"
+version = "0.50.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/bonding-curve-contract/wasm/Cargo.lock b/contracts/examples/bonding-curve-contract/wasm/Cargo.lock
index b49f1e8035..c85adf404a 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.50.0"
+version = "0.50.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/check-pause/wasm/Cargo.lock b/contracts/examples/check-pause/wasm/Cargo.lock
index 02663fa3ba..e1d6635cc2 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.50.0"
+version = "0.50.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crowdfunding-esdt/wasm/Cargo.lock b/contracts/examples/crowdfunding-esdt/wasm/Cargo.lock
index 742d20da66..ed7e977086 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.50.0"
+version = "0.50.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crypto-bubbles/wasm/Cargo.lock b/contracts/examples/crypto-bubbles/wasm/Cargo.lock
index 99a6cfd4a4..efbe0fd923 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.50.0"
+version = "0.50.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.lock b/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.lock
index b9eba6f8b8..8bd2d96c1a 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.50.0"
+version = "0.50.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -115,7 +115,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -126,7 +126,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]
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 9bd41c51e5..a198b8f2d6 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.50.0"
+version = "0.50.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -96,7 +96,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -107,7 +107,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.lock b/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.lock
index fdc162f861..713c3a2217 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.50.0"
+version = "0.50.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -106,7 +106,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -117,7 +117,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crypto-zombies/wasm/Cargo.lock b/contracts/examples/crypto-zombies/wasm/Cargo.lock
index 950cdb9357..b10338cf84 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.50.0"
+version = "0.50.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/digital-cash/wasm/Cargo.lock b/contracts/examples/digital-cash/wasm/Cargo.lock
index 2e8e5cce1b..ac46f897c1 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.50.0"
+version = "0.50.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/empty/wasm/Cargo.lock b/contracts/examples/empty/wasm/Cargo.lock
index ba7c3877e7..acb71e6d3c 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.50.0"
+version = "0.50.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.lock b/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.lock
index afe6c093a1..17bd817cf3 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.50.0"
+version = "0.50.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/factorial/wasm/Cargo.lock b/contracts/examples/factorial/wasm/Cargo.lock
index 3ba746104c..5fe3c77436 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.50.0"
+version = "0.50.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/fractional-nfts/wasm/Cargo.lock b/contracts/examples/fractional-nfts/wasm/Cargo.lock
index f0edb04b88..a62f12c1c9 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.50.0"
+version = "0.50.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/lottery-esdt/wasm/Cargo.lock b/contracts/examples/lottery-esdt/wasm/Cargo.lock
index 663e91c194..fdb68843c2 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.50.0"
+version = "0.50.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/multisig/wasm-multisig-full/Cargo.lock b/contracts/examples/multisig/wasm-multisig-full/Cargo.lock
index 46e9d7a771..67cfca0743 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.50.0"
+version = "0.50.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/multisig/wasm-multisig-view/Cargo.lock b/contracts/examples/multisig/wasm-multisig-view/Cargo.lock
index 8983c03f09..7995d61e7d 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.50.0"
+version = "0.50.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/multisig/wasm/Cargo.lock b/contracts/examples/multisig/wasm/Cargo.lock
index f17285f0dd..18239aa3ae 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.50.0"
+version = "0.50.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/nft-minter/wasm/Cargo.lock b/contracts/examples/nft-minter/wasm/Cargo.lock
index d2834d4c77..82f13d8566 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.50.0"
+version = "0.50.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/nft-storage-prepay/wasm/Cargo.lock b/contracts/examples/nft-storage-prepay/wasm/Cargo.lock
index d74010ae43..773b19b7e0 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.50.0"
+version = "0.50.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/nft-subscription/wasm/Cargo.lock b/contracts/examples/nft-subscription/wasm/Cargo.lock
index e3c54a2497..916506adc6 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.50.0"
+version = "0.50.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,14 +82,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/order-book/factory/wasm/Cargo.lock b/contracts/examples/order-book/factory/wasm/Cargo.lock
index 8ffc6240e7..5279b161b2 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.50.0"
+version = "0.50.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/order-book/pair/wasm/Cargo.lock b/contracts/examples/order-book/pair/wasm/Cargo.lock
index 1bd8cbe37a..7b2118b6aa 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.50.0"
+version = "0.50.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/ping-pong-egld/wasm/Cargo.lock b/contracts/examples/ping-pong-egld/wasm/Cargo.lock
index d3023cb2e3..80fc708812 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.50.0"
+version = "0.50.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/proxy-pause/wasm/Cargo.lock b/contracts/examples/proxy-pause/wasm/Cargo.lock
index 847c806b19..ee1fe326c9 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.50.0"
+version = "0.50.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/rewards-distribution/wasm/Cargo.lock b/contracts/examples/rewards-distribution/wasm/Cargo.lock
index 97dace01a5..51eef79ea6 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.50.0"
+version = "0.50.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,14 +82,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/seed-nft-minter/wasm/Cargo.lock b/contracts/examples/seed-nft-minter/wasm/Cargo.lock
index d53e946cb8..3063ad4870 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.50.0"
+version = "0.50.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,14 +82,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/token-release/wasm/Cargo.lock b/contracts/examples/token-release/wasm/Cargo.lock
index 2619711a03..4bb98af847 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.50.0"
+version = "0.50.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]
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 0fe6289884..54881a0361 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.50.0"
+version = "0.50.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/abi-tester/wasm/Cargo.lock b/contracts/feature-tests/abi-tester/wasm/Cargo.lock
index 3e2b76af84..ccee260ef4 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.50.0"
+version = "0.50.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock
index 895f73e9ea..45ce36814a 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.lock b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.lock
index 569d223c0a..e54f7bf3f5 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.lock
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.lock
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/alloc-features/wasm/Cargo.lock b/contracts/feature-tests/alloc-features/wasm/Cargo.lock
index 5b65d38617..dbc92852f5 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.50.0"
+version = "0.50.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]
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 09b815e212..061149b5e5 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.50.0"
+version = "0.50.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/basic-features/wasm/Cargo.lock b/contracts/feature-tests/basic-features/wasm/Cargo.lock
index c78556dc4b..445a0d32be 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.50.0"
+version = "0.50.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/big-float-features/wasm/Cargo.lock b/contracts/feature-tests/big-float-features/wasm/Cargo.lock
index ed078497ec..6fbad4b8ff 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.50.0"
+version = "0.50.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]
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 d76bfcb071..047b7599da 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.50.0"
+version = "0.50.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]
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 147d33461a..8b1b1604de 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.50.0"
+version = "0.50.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]
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 0ba488c7f0..dadc9101a6 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.50.0"
+version = "0.50.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]
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 5e1f7962e5..880b9b2ee1 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.50.0"
+version = "0.50.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]
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 9b4494f52d..ac44aab7f8 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
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.lock
index 10b0b8bb6b..6fe7c018b4 100644
--- a/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.lock
@@ -56,7 +56,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,7 +98,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]
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 53f727c8bb..c8c72a3358 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
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock
index 2d19b02273..b7418257c2 100644
--- a/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]
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 d68fadc22b..a6b131248c 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.50.0"
+version = "0.50.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]
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 d0ceea329c..ecd07cd776 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.50.0"
+version = "0.50.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.lock
index 1198a98032..70c0abf558 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.50.0"
+version = "0.50.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock
index 82868ca831..4e709f91dc 100755
--- a/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]
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 675b646869..6aa61a8fc0 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.50.0"
+version = "0.50.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/promises-features/wasm/Cargo.lock b/contracts/feature-tests/composability/promises-features/wasm/Cargo.lock
index aca77da79a..45ec7da627 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.50.0"
+version = "0.50.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]
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 7a57ca96e9..db1bf7e86c 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.50.0"
+version = "0.50.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]
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 a6efc4baf2..4ff9265841 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.50.0"
+version = "0.50.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.lock b/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.lock
index a90e94b50b..99e6baaf7f 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.50.0"
+version = "0.50.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]
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 903256d62d..6bf83d9e6c 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.50.0"
+version = "0.50.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,14 +82,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]
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 defff5603f..153fee28eb 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.50.0"
+version = "0.50.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]
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 8e49a1b12a..d1f84b055d 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.50.0"
+version = "0.50.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/vault/wasm/Cargo.lock b/contracts/feature-tests/composability/vault/wasm/Cargo.lock
index 8e92e97d0b..4da9af45ea 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.50.0"
+version = "0.50.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]
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 2448257cd8..ced864c2ef 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.50.0"
+version = "0.50.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]
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 582dc8915a..76830c8098 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.50.0"
+version = "0.50.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]
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 a192c28d8c..51d9668083 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.50.0"
+version = "0.50.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]
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 9daeb0cf09..9e46c3ca5f 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.50.0"
+version = "0.50.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]
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 f1cf13367b..6faea90ea9 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.50.0"
+version = "0.50.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]
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 c4e0d566e7..7960e2e728 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.50.0"
+version = "0.50.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]
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 96f07c2c88..95175f9170 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.50.0"
+version = "0.50.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]
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 ae4e178cc2..d71840c7a8 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.50.0"
+version = "0.50.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/exchange-features/wasm/Cargo.lock b/contracts/feature-tests/exchange-features/wasm/Cargo.lock
index 8075f5308f..ad987faa50 100644
--- a/contracts/feature-tests/exchange-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/exchange-features/wasm/Cargo.lock
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/formatted-message-features/wasm/Cargo.lock b/contracts/feature-tests/formatted-message-features/wasm/Cargo.lock
index 309ac697f0..4a3f7b5088 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.50.0"
+version = "0.50.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/managed-map-features/wasm/Cargo.lock b/contracts/feature-tests/managed-map-features/wasm/Cargo.lock
index 8f4f06d835..553e3d4263 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.50.0"
+version = "0.50.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]
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 c14b804e1d..fd5c3fe996 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.50.0"
+version = "0.50.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]
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 ebd96f0db1..c74c8de5e4 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.50.0"
+version = "0.50.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]
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 31453833e4..3f60a31d06 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.50.0"
+version = "0.50.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/multi-contract-features/wasm/Cargo.lock b/contracts/feature-tests/multi-contract-features/wasm/Cargo.lock
index 7e144359de..c073b93b49 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.50.0"
+version = "0.50.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/panic-message-features/wasm/Cargo.lock b/contracts/feature-tests/panic-message-features/wasm/Cargo.lock
index 7bac41daab..44feb7bf17 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.50.0"
+version = "0.50.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/payable-features/wasm/Cargo.lock b/contracts/feature-tests/payable-features/wasm/Cargo.lock
index 2ed0cebf41..2b72558d54 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.50.0"
+version = "0.50.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]
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 af4771b552..2c5b6e505f 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.50.0"
+version = "0.50.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]
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 38d62aa581..52f4c93fdc 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.50.0"
+version = "0.50.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/scenario-tester/wasm/Cargo.lock b/contracts/feature-tests/scenario-tester/wasm/Cargo.lock
index 690945d5c6..e88cabd7a3 100755
--- a/contracts/feature-tests/scenario-tester/wasm/Cargo.lock
+++ b/contracts/feature-tests/scenario-tester/wasm/Cargo.lock
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]
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 8d520677dd..5170ca4f0c 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.50.0"
+version = "0.50.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,14 +82,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/use-module/wasm/Cargo.lock b/contracts/feature-tests/use-module/wasm/Cargo.lock
index ffcc630369..88111d4915 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.50.0"
+version = "0.50.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,14 +82,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.0"
+version = "0.50.1"
 dependencies = [
  "multiversx-sc",
 ]

From 122e383668d3173cdb2830c67193b3ab24a38d2a Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Thu, 16 May 2024 14:28:30 +0200
Subject: [PATCH 0893/1254] removed jitter from interact transaction fetch

---
 Cargo.lock                                    | 1 -
 framework/snippets/Cargo.toml                 | 1 -
 framework/snippets/src/interactor_retrieve.rs | 6 +-----
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 669575cd44..03b513f21e 100755
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2026,7 +2026,6 @@ dependencies = [
  "log",
  "multiversx-sc-scenario",
  "multiversx-sdk",
- "rand 0.8.5",
  "tokio",
 ]
 
diff --git a/framework/snippets/Cargo.toml b/framework/snippets/Cargo.toml
index 5f9635a58b..6d04472ecf 100644
--- a/framework/snippets/Cargo.toml
+++ b/framework/snippets/Cargo.toml
@@ -20,7 +20,6 @@ base64 = "0.22"
 log = "0.4.17"
 env_logger = "0.11"
 futures = "0.3"
-rand = "0.8.5"
 
 [dependencies.multiversx-sc-scenario]
 version = "=0.50.1"
diff --git a/framework/snippets/src/interactor_retrieve.rs b/framework/snippets/src/interactor_retrieve.rs
index 8b9e0031ab..cd9291ba33 100644
--- a/framework/snippets/src/interactor_retrieve.rs
+++ b/framework/snippets/src/interactor_retrieve.rs
@@ -1,7 +1,6 @@
 use crate::Interactor;
 use log::info;
 use multiversx_sdk::data::transaction::TransactionOnNetwork;
-use rand::Rng;
 use std::time::{Duration, Instant};
 
 const INITIAL_BACKOFF_DELAY: f32 = 1.4;
@@ -11,7 +10,6 @@ const MAX_BACKOFF_DELAY: Duration = Duration::from_secs(6);
 impl Interactor {
     /// Retrieves a transaction from the network.
     pub(crate) async fn retrieve_tx_on_network(&self, tx_hash: String) -> TransactionOnNetwork {
-        let mut rng = rand::thread_rng();
         let mut retries = 0;
         let mut backoff_delay = Duration::from_secs_f32(INITIAL_BACKOFF_DELAY);
         let start_time = Instant::now();
@@ -47,9 +45,7 @@ impl Interactor {
                         break;
                     }
 
-                    let backoff_time = backoff_delay
-                        .mul_f32(rng.gen_range(0.8..1.2))
-                        .min(MAX_BACKOFF_DELAY);
+                    let backoff_time = backoff_delay.min(MAX_BACKOFF_DELAY);
                     tokio::time::sleep(backoff_time).await;
                     backoff_delay *= 2; // exponential backoff
                 },

From 0165a32e1204a56efaa336ad0ead399eda2e759d Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Fri, 17 May 2024 02:20:09 +0200
Subject: [PATCH 0894/1254] fixed sc config auto overwrite issue, fixed proxy
 gen not happening issue, made panic into a warning for already existing lib
 file

---
 framework/meta/src/cmd/contract.rs            |  1 +
 .../generate_snippets/snippet_crate_gen.rs    | 64 +++++++++++++------
 .../meta/src/cmd/contract/meta_config.rs      |  4 ++
 3 files changed, 48 insertions(+), 21 deletions(-)

diff --git a/framework/meta/src/cmd/contract.rs b/framework/meta/src/cmd/contract.rs
index 3e1008a3a3..7a65b1bd8e 100644
--- a/framework/meta/src/cmd/contract.rs
+++ b/framework/meta/src/cmd/contract.rs
@@ -31,6 +31,7 @@ pub fn cli_main<AbiObj: ContractAbiProvider>() {
         ContractCliAction::Update => meta_config_opt.update(),
         ContractCliAction::GenerateSnippets(gs_arg) => {
             meta_config_opt.generate_rust_snippets(&gs_arg);
+            meta_config_opt.reload_sc_config();
             meta_config_opt.generate_proxy()
         },
         ContractCliAction::GenerateProxies => meta_config_opt.generate_proxy(),
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 7bf8ab8d5c..bbfbb637a3 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
@@ -1,9 +1,15 @@
+use colored::Colorize;
 use std::{
-    fs::{self, File},
+    fs::{self, File, OpenOptions},
     io::Write,
 };
 
 static SNIPPETS_SOURCE_FILE_NAME: &str = "interactor_main.rs";
+static SC_CONFIG_PATH: &str = "../sc-config.toml";
+static FULL_PROXY_ENTRY: &str = r#"[[proxy]]
+path = "interact-rs/src/proxy.rs"
+ "#;
+static PROXY_PATH: &str = "interact-rs/src/proxy.rs";
 
 pub(crate) fn create_snippets_folder(snippets_folder_path: &str) {
     // returns error if folder already exists, so we ignore the result
@@ -72,7 +78,7 @@ path = ".."
 version = "0.50.1"
 
 [dependencies.multiversx-sc]
-version = "0.49.0"
+version = "0.50.1"
 
 [dependencies]
 clap = {{ version = "4.4.7", features = ["derive"] }}
@@ -80,7 +86,6 @@ serde = {{ version = "1.0", features = ["derive"] }}
 toml = "0.8.6"
 
 # [workspace]
-
 "#
     )
     .unwrap();
@@ -100,31 +105,48 @@ pub(crate) fn create_and_get_lib_file(snippets_folder_path: &str, overwrite: boo
     } else {
         match File::options().create_new(true).write(true).open(&lib_path) {
             Ok(f) => f,
-            Err(_) => panic!("{lib_path} file already exists, --overwrite option was not provided"),
+            Err(_) => {
+                println!(
+                    "{}",
+                    format!("{lib_path} file already exists, --overwrite option was not provided",)
+                        .yellow()
+                );
+                File::options().write(true).open(&lib_path).unwrap()
+            },
         }
     }
 }
 
 pub(crate) fn create_sc_config_file(overwrite: bool) {
-    let sc_config_path = "../sc-config.toml";
-    let mut file = if overwrite {
-        File::create(sc_config_path).unwrap()
+    // check if the file should be overwritten or if it already exists
+    let mut file = if overwrite || !file_exists(SC_CONFIG_PATH) {
+        File::create(SC_CONFIG_PATH).unwrap()
     } else {
-        match File::options()
-            .create_new(true)
-            .write(true)
-            .open(sc_config_path)
-        {
-            Ok(f) => f,
-            Err(_) => return,
+        // file already exists
+        let file = OpenOptions::new()
+            .read(true)
+            .append(true)
+            .open(SC_CONFIG_PATH)
+            .unwrap();
+
+        if file_contains_proxy_path(SC_CONFIG_PATH).unwrap_or(false) {
+            return;
         }
+
+        file
     };
 
-    writeln!(
-        &mut file,
-        r#"[[proxy]]
-path = "interact-rs/src/proxy.rs"
- "#
-    )
-    .unwrap();
+    // write full proxy toml entry to the file
+    writeln!(&mut file, "\n{FULL_PROXY_ENTRY}").unwrap();
+}
+
+fn file_exists(path: &str) -> bool {
+    fs::metadata(path).is_ok()
+}
+
+fn file_contains_proxy_path(file_path: &str) -> std::io::Result<bool> {
+    let file_content = fs::read_to_string(file_path)?;
+    let proxy_entry = format!("path = \"{}\"", PROXY_PATH);
+
+    Ok(file_content.contains(&proxy_entry))
 }
diff --git a/framework/meta/src/cmd/contract/meta_config.rs b/framework/meta/src/cmd/contract/meta_config.rs
index a33fb98c5d..c273548d5a 100644
--- a/framework/meta/src/cmd/contract/meta_config.rs
+++ b/framework/meta/src/cmd/contract/meta_config.rs
@@ -40,6 +40,10 @@ impl MetaConfig {
         }
     }
 
+    pub fn reload_sc_config(&mut self) {
+        self.sc_config = ScConfig::load_from_crate_or_default("..", &self.original_contract_abi);
+    }
+
     /// Generates all code for the wasm crate(s).
     pub fn generate_wasm_crates(&mut self) {
         self.remove_unexpected_wasm_crates();

From 40fceec6cbe02edeb0cea5862e7c12e3ed25c840 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Fri, 17 May 2024 18:10:16 +0300
Subject: [PATCH 0895/1254] upgrade to unified syntax

---
 .../tests/price_aggregator_blackbox_test.rs   |   6 +-
 .../tests/crowdfunding_esdt_blackbox_test.rs  |   3 +-
 .../transfer-role-features/sc-config.toml     |   2 +
 .../transfer-role-features/src/lib.rs         |   1 +
 .../src/transfer_role_proxy.rs                |  86 +++++++++
 .../tests/transfer_role_blackbox_test.rs      | 169 ++++++++----------
 6 files changed, 162 insertions(+), 105 deletions(-)
 create mode 100644 contracts/feature-tests/composability/transfer-role-features/sc-config.toml
 create mode 100644 contracts/feature-tests/composability/transfer-role-features/src/transfer_role_proxy.rs

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 05c9b161f7..438eb574aa 100644
--- a/contracts/core/price-aggregator/tests/price_aggregator_blackbox_test.rs
+++ b/contracts/core/price-aggregator/tests/price_aggregator_blackbox_test.rs
@@ -46,11 +46,7 @@ impl PriceAggregatorTestState {
         world.account(OWNER_ADDRESS).nonce(1);
         world.current_block().block_timestamp(100);
 
-        world.set_state_step(SetStateStep::new()).new_address(
-            OWNER_ADDRESS,
-            1,
-            PRICE_AGGREGATOR_ADDRESS,
-        );
+        world.new_address(OWNER_ADDRESS, 1, PRICE_AGGREGATOR_ADDRESS);
 
         let mut oracles = Vec::new();
         for i in 1..=NR_ORACLES {
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 1a07b42101..d19501b1da 100644
--- a/contracts/examples/crowdfunding-esdt/tests/crowdfunding_esdt_blackbox_test.rs
+++ b/contracts/examples/crowdfunding-esdt/tests/crowdfunding_esdt_blackbox_test.rs
@@ -108,8 +108,7 @@ impl CrowdfundingESDTTestState {
     }
 
     fn set_block_timestamp(&mut self, block_timestamp_expr: u64) {
-        self.world
-            .set_state_step(SetStateStep::new().block_timestamp(block_timestamp_expr));
+        self.world.current_block().block_timestamp(block_timestamp_expr);
     }
 }
 
diff --git a/contracts/feature-tests/composability/transfer-role-features/sc-config.toml b/contracts/feature-tests/composability/transfer-role-features/sc-config.toml
new file mode 100644
index 0000000000..5bceb5fda7
--- /dev/null
+++ b/contracts/feature-tests/composability/transfer-role-features/sc-config.toml
@@ -0,0 +1,2 @@
+[[proxy]]
+path = "src/transfer_role_proxy.rs"
\ No newline at end of file
diff --git a/contracts/feature-tests/composability/transfer-role-features/src/lib.rs b/contracts/feature-tests/composability/transfer-role-features/src/lib.rs
index 125cd4fb23..97c71a3577 100644
--- a/contracts/feature-tests/composability/transfer-role-features/src/lib.rs
+++ b/contracts/feature-tests/composability/transfer-role-features/src/lib.rs
@@ -2,6 +2,7 @@
 #![allow(clippy::type_complexity)]
 
 multiversx_sc::imports!();
+pub mod transfer_role_proxy;
 
 #[multiversx_sc::contract]
 pub trait TransferRoleFeatures:
diff --git a/contracts/feature-tests/composability/transfer-role-features/src/transfer_role_proxy.rs b/contracts/feature-tests/composability/transfer-role-features/src/transfer_role_proxy.rs
new file mode 100644
index 0000000000..1447af2d70
--- /dev/null
+++ b/contracts/feature-tests/composability/transfer-role-features/src/transfer_role_proxy.rs
@@ -0,0 +1,86 @@
+// Code generated by the multiversx-sc proxy generator. DO NOT EDIT.
+
+////////////////////////////////////////////////////
+////////////////// AUTO-GENERATED //////////////////
+////////////////////////////////////////////////////
+
+#![allow(dead_code)]
+#![allow(clippy::all)]
+
+use multiversx_sc::proxy_imports::*;
+
+pub struct TransferRoleFeaturesProxy;
+
+impl<Env, From, To, Gas> TxProxyTrait<Env, From, To, Gas> for TransferRoleFeaturesProxy
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    type TxProxyMethods = TransferRoleFeaturesProxyMethods<Env, From, To, Gas>;
+
+    fn proxy_methods(self, tx: Tx<Env, From, To, (), Gas, (), ()>) -> Self::TxProxyMethods {
+        TransferRoleFeaturesProxyMethods { wrapped_tx: tx }
+    }
+}
+
+pub struct TransferRoleFeaturesProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    wrapped_tx: Tx<Env, From, To, (), Gas, (), ()>,
+}
+
+#[rustfmt::skip]
+impl<Env, From, Gas> TransferRoleFeaturesProxyMethods<Env, From, (), Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn init<
+        Arg0: ProxyArg<MultiValueEncoded<Env::Api, ManagedAddress<Env::Api>>>,
+    >(
+        self,
+        whitelist: Arg0,
+    ) -> TxTypedDeploy<Env, From, NotPayable, Gas, ()> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_deploy()
+            .argument(&whitelist)
+            .original_result()
+    }
+}
+
+#[rustfmt::skip]
+impl<Env, From, To, Gas> TransferRoleFeaturesProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn forward_payments<
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg1: ProxyArg<ManagedBuffer<Env::Api>>,
+        Arg2: ProxyArg<MultiValueEncoded<Env::Api, ManagedBuffer<Env::Api>>>,
+    >(
+        self,
+        dest: Arg0,
+        endpoint_name: Arg1,
+        args: Arg2,
+    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
+        self.wrapped_tx
+            .raw_call("forwardPayments")
+            .argument(&dest)
+            .argument(&endpoint_name)
+            .argument(&args)
+            .original_result()
+    }
+}
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 a1588759d6..080facb377 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
@@ -1,116 +1,91 @@
-#![allow(deprecated)] // TODO: unified syntax
-
 use multiversx_sc_scenario::imports::*;
-use transfer_role_features::ProxyTrait as _;
+use transfer_role_features::transfer_role_proxy;
 
 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 = "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 = "mxsc:../vault/output/vault.mxsc.json";
-
-type TransferRoleFeaturesContract = ContractInfo<transfer_role_features::Proxy<StaticApi>>;
+const OWNER_ADDRESS: TestAddress = TestAddress::new("owner");
+const TRANSFER_ROLE_FEATURES_ADDRESS: TestSCAddress = TestSCAddress::new("transfer-role-features");
+const TRANSFER_ROLE_FEATURES_PATH: MxscPath =
+    MxscPath::new("output/transfer-role-features.mxsc.json");
+const TRANSFER_TOKEN: TestTokenIdentifier = TestTokenIdentifier::new("TRANSFER-123456");
+const USER_ADDRESS: TestAddress = TestAddress::new("user");
+const VAULT_ADDRESS: TestSCAddress = TestSCAddress::new("vault");
+const VAULT_PATH: MxscPath = MxscPath::new("../vault/output/vault.mxsc.json");
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
-    blockchain.set_current_dir_from_workspace(
-        "contracts/feature-tests/composability/transfer-role-features",
-    );
 
     blockchain.register_contract(
-        TRANSFER_ROLE_FEATURES_PATH_EXPR,
+        TRANSFER_ROLE_FEATURES_PATH,
         transfer_role_features::ContractBuilder,
     );
-    blockchain.register_contract(VAULT_PATH_EXPR, vault::ContractBuilder);
+    blockchain.register_contract(VAULT_PATH, vault::ContractBuilder);
     blockchain
 }
 
 struct TransferRoleTestState {
     world: ScenarioWorld,
-    owner_address: Address,
-    vault_address: Address,
-    transfer_role_features_contract: TransferRoleFeaturesContract,
 }
 
 impl TransferRoleTestState {
     fn new() -> Self {
         let mut world = world();
-        let vault_code = world.code_expression(VAULT_PATH_EXPR);
-
-        world.set_state_step(
-            SetStateStep::new()
-                .put_account(OWNER_ADDRESS_EXPR, Account::new().nonce(1))
-                .new_address(OWNER_ADDRESS_EXPR, 1, TRANSFER_ROLE_FEATURES_ADDRESS_EXPR)
-                .put_account(VAULT_ADDRESS_EXPR, Account::new().nonce(1).code(vault_code))
-                .put_account(
-                    USER_ADDRESS_EXPR,
-                    Account::new()
-                        .nonce(1)
-                        .esdt_balance(TRANSFER_TOKEN_ID_EXPR, 1_000u64),
-                ),
+
+        world.account(OWNER_ADDRESS).nonce(1).new_address(
+            OWNER_ADDRESS,
+            1,
+            TRANSFER_ROLE_FEATURES_ADDRESS,
         );
 
-        let owner_address = AddressValue::from(OWNER_ADDRESS_EXPR).to_address();
-        let vault_address = AddressValue::from(VAULT_ADDRESS_EXPR).to_address();
-        let transfer_role_features_contract =
-            TransferRoleFeaturesContract::new(TRANSFER_ROLE_FEATURES_ADDRESS_EXPR);
-
-        Self {
-            world,
-            owner_address,
-            vault_address,
-            transfer_role_features_contract,
-        }
+        world.account(VAULT_ADDRESS).nonce(1).code(VAULT_PATH);
+        world
+            .account(USER_ADDRESS)
+            .nonce(1)
+            .esdt_balance(TRANSFER_TOKEN, 1000);
+
+        Self { world }
     }
 
     fn deploy(&mut self) -> &mut Self {
-        let transfer_role_features_code =
-            self.world.code_expression(TRANSFER_ROLE_FEATURES_PATH_EXPR);
-
         let whitelist = MultiValueVec::from(vec![
-            AddressValue::from(OWNER_ADDRESS_EXPR).to_address(),
-            AddressValue::from(VAULT_ADDRESS_EXPR).to_address(),
+            AddressValue::from(OWNER_ADDRESS).to_address(),
+            AddressValue::from(VAULT_ADDRESS).to_address(),
         ]);
 
-        self.world.sc_deploy(
-            ScDeployStep::new()
-                .from(OWNER_ADDRESS_EXPR)
-                .code(transfer_role_features_code)
-                .call(self.transfer_role_features_contract.init(whitelist)),
-        );
+        self.world
+            .tx()
+            .from(OWNER_ADDRESS)
+            .typed(transfer_role_proxy::TransferRoleFeaturesProxy)
+            .init(whitelist)
+            .code(TRANSFER_ROLE_FEATURES_PATH)
+            .new_address(TRANSFER_ROLE_FEATURES_ADDRESS)
+            .run();
 
         self
     }
 
     fn forward_payments(&mut self, dest: Address, endpoint_name: &[u8]) {
-        self.world.sc_call(
-            ScCallStep::new()
-                .from(USER_ADDRESS_EXPR)
-                .esdt_transfer(TRANSFER_TOKEN_ID, 0, 100u64)
-                .call(self.transfer_role_features_contract.forward_payments(
-                    dest,
-                    endpoint_name,
-                    MultiValueVec::<Vec<u8>>::new(),
-                )),
-        );
+        self.world
+            .tx()
+            .from(USER_ADDRESS)
+            .to(TRANSFER_ROLE_FEATURES_ADDRESS)
+            .typed(transfer_role_proxy::TransferRoleFeaturesProxy)
+            .forward_payments(dest, endpoint_name, MultiValueVec::<Vec<u8>>::new())
+            .egld_or_single_esdt(
+                &EgldOrEsdtTokenIdentifier::esdt(TRANSFER_TOKEN),
+                0u64,
+                &multiversx_sc::proxy_imports::BigUint::from(100u64),
+            )
+            .run();
     }
 
     fn check_user_and_vault_balance(&mut self) {
         self.world
-            .check_state_step(CheckStateStep::new().put_account(
-                USER_ADDRESS_EXPR,
-                CheckAccount::new().esdt_balance(TRANSFER_TOKEN_ID_EXPR, "800"),
-            ));
+            .check_account(USER_ADDRESS)
+            .esdt_balance(TRANSFER_TOKEN, 800);
         self.world
-            .check_state_step(CheckStateStep::new().put_account(
-                VAULT_ADDRESS_EXPR,
-                CheckAccount::new().esdt_balance(TRANSFER_TOKEN_ID_EXPR, "100"),
-            ));
+            .check_account(VAULT_ADDRESS)
+            .esdt_balance(TRANSFER_TOKEN, 100);
     }
 }
 
@@ -120,40 +95,38 @@ fn test_transfer_role() {
     state.deploy();
 
     // transfer to user - ok
-    state.forward_payments(state.owner_address.clone(), b"");
+    state.forward_payments(Address::from(OWNER_ADDRESS.eval_to_array()), b"");
     state
         .world
-        .check_state_step(CheckStateStep::new().put_account(
-            USER_ADDRESS_EXPR,
-            CheckAccount::new().esdt_balance(TRANSFER_TOKEN_ID_EXPR, "900"),
-        ));
+        .check_account(USER_ADDRESS)
+        .esdt_balance(TRANSFER_TOKEN, 900);
+
     state
         .world
-        .check_state_step(CheckStateStep::new().put_account(
-            OWNER_ADDRESS_EXPR,
-            CheckAccount::new().esdt_balance(TRANSFER_TOKEN_ID_EXPR, "100"),
-        ));
+        .check_account(OWNER_ADDRESS)
+        .esdt_balance(TRANSFER_TOKEN, 100);
 
     // transfer to user - err, not whitelisted
-    state.world.sc_call(
-        ScCallStep::new()
-            .from(USER_ADDRESS_EXPR)
-            .esdt_transfer(TRANSFER_TOKEN_ID, 0, 100u64)
-            .call(state.transfer_role_features_contract.forward_payments(
-                Address::zero(),
-                "",
-                MultiValueVec::<Vec<u8>>::new(),
-            ))
-            .expect(TxExpect::user_error(
-                "str:Destination address not whitelisted",
-            )),
-    );
+    state
+        .world
+        .tx()
+        .from(USER_ADDRESS)
+        .to(TRANSFER_ROLE_FEATURES_ADDRESS)
+        .typed(transfer_role_proxy::TransferRoleFeaturesProxy)
+        .forward_payments(Address::zero(), "", MultiValueVec::<Vec<u8>>::new())
+        .egld_or_single_esdt(
+            &EgldOrEsdtTokenIdentifier::esdt(TRANSFER_TOKEN),
+            0u64,
+            &multiversx_sc::proxy_imports::BigUint::from(100u64),
+        )
+        .with_result(ExpectMessage("Destination address not whitelisted"))
+        .run();
 
     // transfer to sc - ok
-    state.forward_payments(state.vault_address.clone(), ACCEPT_FUNDS_FUNC_NAME);
+    state.forward_payments(VAULT_ADDRESS.to_address(), ACCEPT_FUNDS_FUNC_NAME);
     state.check_user_and_vault_balance();
 
     // transfer to sc - reject
-    state.forward_payments(state.vault_address.clone(), REJECT_FUNDS_FUNC_NAME);
+    state.forward_payments(VAULT_ADDRESS.to_address(), REJECT_FUNDS_FUNC_NAME);
     state.check_user_and_vault_balance();
 }

From 0a024a9190ff9853c1c436fae96c4dde3e21fcfc Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Mon, 20 May 2024 11:16:17 +0300
Subject: [PATCH 0896/1254] add missing explicit gas limit

---
 .../composability/interact/src/call_tree_calling_functions.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/contracts/feature-tests/composability/interact/src/call_tree_calling_functions.rs b/contracts/feature-tests/composability/interact/src/call_tree_calling_functions.rs
index 969e2e0827..0cb35bdbec 100644
--- a/contracts/feature-tests/composability/interact/src/call_tree_calling_functions.rs
+++ b/contracts/feature-tests/composability/interact/src/call_tree_calling_functions.rs
@@ -5,7 +5,8 @@ use num_bigint::BigUint;
 
 use crate::{
     call_tree::{CallNode, CallState, ForwarderQueueTarget},
-    comp_interact_controller::ComposabilityInteract, forwarder_queue_proxy::{self, QueuedCallType},
+    comp_interact_controller::ComposabilityInteract,
+    forwarder_queue_proxy::{self, QueuedCallType},
 };
 
 const FORWARD_QUEUED_CALLS_ENDPOINT: &str = "forward_queued_calls";
@@ -119,6 +120,7 @@ impl ComposabilityInteract {
         self.interactor
             .tx()
             .from(&self.wallet_address)
+            .gas(70_000_000u64)
             .to(&root_addr)
             .typed(forwarder_queue_proxy::ForwarderQueueProxy)
             .forward_queued_calls()

From ed42bb38d95a3f616de8100ae1762bd475090cb4 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Mon, 20 May 2024 11:19:07 +0300
Subject: [PATCH 0897/1254] update forgotten dependency

---
 contracts/feature-tests/composability/interact/Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contracts/feature-tests/composability/interact/Cargo.toml b/contracts/feature-tests/composability/interact/Cargo.toml
index 06bfebc521..366f82213f 100644
--- a/contracts/feature-tests/composability/interact/Cargo.toml
+++ b/contracts/feature-tests/composability/interact/Cargo.toml
@@ -15,7 +15,7 @@ serde = { version = "1.0", features = ["derive"] }
 toml = "0.8.6"
 
 [dependencies.multiversx-sc]
-version = "0.50.0"
+version = "0.50.1"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-snippets]

From bbbf77ef877006e8aea66c85218526601671e6d0 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Mon, 20 May 2024 09:48:38 +0300
Subject: [PATCH 0898/1254] TypeAbi Unmanaged, removed trait bound, more impls

---
 framework/base/src/abi/type_abi.rs            |  2 +-
 framework/base/src/abi/type_abi_impl_basic.rs | 26 +++++++++++--------
 .../base/src/abi/type_abi_impl_codec_multi.rs |  6 ++---
 .../storage/mappers/single_value_mapper.rs    |  2 +-
 framework/base/src/types/heap/arg_buffer.rs   | 17 ++++++++++++
 .../multi_value/multi_value_encoded.rs        |  2 +-
 .../multi_value/multi_value_managed_vec.rs    |  4 ++-
 7 files changed, 41 insertions(+), 18 deletions(-)

diff --git a/framework/base/src/abi/type_abi.rs b/framework/base/src/abi/type_abi.rs
index 25d4e92b46..3e4c451b48 100644
--- a/framework/base/src/abi/type_abi.rs
+++ b/framework/base/src/abi/type_abi.rs
@@ -9,7 +9,7 @@ use alloc::{format, string::ToString, vec::Vec};
 ///
 /// Will be automatically implemented for struct ad enum types via the `#[type_abi]` annotation.
 pub trait TypeAbi: TypeAbiFrom<Self> {
-    type Unmanaged: TypeAbiFrom<Self>;
+    type Unmanaged;
 
     fn type_names() -> TypeNames {
         TypeNames {
diff --git a/framework/base/src/abi/type_abi_impl_basic.rs b/framework/base/src/abi/type_abi_impl_basic.rs
index 878a09bc87..2961604bb9 100644
--- a/framework/base/src/abi/type_abi_impl_basic.rs
+++ b/framework/base/src/abi/type_abi_impl_basic.rs
@@ -22,7 +22,7 @@ impl TypeAbi for () {
 impl<T, U> TypeAbiFrom<&U> for &T where T: TypeAbiFrom<U> {}
 
 impl<T: TypeAbi> TypeAbi for &T {
-    type Unmanaged = Self;
+    type Unmanaged = T::Unmanaged;
 
     fn type_name() -> TypeName {
         T::type_name()
@@ -58,7 +58,7 @@ impl<T: TypeAbi> TypeAbi for Box<T> {
 impl<T, U> TypeAbiFrom<&[T]> for &[U] where T: TypeAbiFrom<U> {}
 
 impl<T: TypeAbi> TypeAbi for &[T] {
-    type Unmanaged = Self;
+    type Unmanaged = Vec<T::Unmanaged>;
 
     fn type_name() -> TypeName {
         let t_name = T::type_name();
@@ -84,7 +84,7 @@ impl<T: TypeAbi> TypeAbi for &[T] {
 impl<T, U> TypeAbiFrom<Vec<T>> for Vec<U> where T: TypeAbiFrom<U> {}
 
 impl<T: TypeAbi> TypeAbi for Vec<T> {
-    type Unmanaged = Self;
+    type Unmanaged = Vec<T::Unmanaged>;
 
     fn type_name() -> TypeName {
         <&[T]>::type_name()
@@ -209,6 +209,7 @@ type_abi_name_only!(i64, "i64");
 
 type_abi_name_only!(core::num::NonZeroUsize, "NonZeroUsize");
 type_abi_name_only!(bool, "bool");
+type_abi_name_only!(f64, "f64");
 
 // Unsigned integer types: the contract can return a smaller capacity result and and we can interpret it as a larger capacity type.
 
@@ -244,10 +245,13 @@ impl TypeAbiFrom<i8> for isize {}
 
 impl TypeAbiFrom<i8> for i16 {}
 
-impl<T, U> TypeAbiFrom<Option<T>> for Option<U> where T: TypeAbiFrom<U> {}
+impl<T, U> TypeAbiFrom<Option<U>> for Option<T> where T: TypeAbiFrom<U> {}
 
-impl<T: TypeAbi> TypeAbi for Option<T> {
-    type Unmanaged = Self;
+impl<T> TypeAbi for Option<T>
+where
+    T: TypeAbi,
+{
+    type Unmanaged = Option<T::Unmanaged>;
 
     fn type_name() -> TypeName {
         format!("Option<{}>", T::type_name())
@@ -262,10 +266,10 @@ impl<T: TypeAbi> TypeAbi for Option<T> {
     }
 }
 
-impl<T, U, E> TypeAbiFrom<Result<T, E>> for Result<U, E> where T: TypeAbiFrom<U> {}
+impl<T: TypeAbi, E> TypeAbiFrom<Self> for Result<T, E> {}
 
 impl<T: TypeAbi, E> TypeAbi for Result<T, E> {
-    type Unmanaged = Self;
+    type Unmanaged = Result<T::Unmanaged, E>;
 
     fn type_name() -> TypeName {
         T::type_name()
@@ -301,7 +305,7 @@ macro_rules! tuple_impls {
             where
                 $($name: TypeAbi,)+
             {
-                type Unmanaged = Self;
+                type Unmanaged = ($($name::Unmanaged,)+);
 
                 fn type_name() -> TypeName {
                     let mut repr = TypeName::from("tuple<");
@@ -356,10 +360,10 @@ tuple_impls! {
     16 => (0 T0 1 T1 2 T2 3 T3 4 T4 5 T5 6 T6 7 T7 8 T8 9 T9 10 T10 11 T11 12 T12 13 T13 14 T14 15 T15)
 }
 
-impl<T, U, const N: usize> TypeAbiFrom<[T; N]> for [U; N] where T: TypeAbiFrom<U> {}
+impl<T, U, const N: usize> TypeAbiFrom<[U; N]> for [T; N] where T: TypeAbiFrom<U> {}
 
 impl<T: TypeAbi, const N: usize> TypeAbi for [T; N] {
-    type Unmanaged = Self;
+    type Unmanaged = [T::Unmanaged; N];
 
     fn type_name() -> TypeName {
         let mut repr = TypeName::from("array");
diff --git a/framework/base/src/abi/type_abi_impl_codec_multi.rs b/framework/base/src/abi/type_abi_impl_codec_multi.rs
index 6b1cf9ab72..7fcfa89ae5 100644
--- a/framework/base/src/abi/type_abi_impl_codec_multi.rs
+++ b/framework/base/src/abi/type_abi_impl_codec_multi.rs
@@ -15,7 +15,7 @@ where
 
 #[cfg(feature = "alloc")]
 impl<T: TypeAbi> TypeAbi for crate::codec::multi_types::MultiValueVec<T> {
-    type Unmanaged = Self;
+    type Unmanaged = crate::codec::multi_types::MultiValueVec<T::Unmanaged>;
 
     fn type_name() -> TypeName {
         super::type_name_variadic::<T>()
@@ -52,10 +52,10 @@ impl TypeAbi for IgnoreValue {
     }
 }
 
-impl<T, U> TypeAbiFrom<OptionalValue<T>> for OptionalValue<U> where T: TypeAbiFrom<U> {}
+impl<T, U> TypeAbiFrom<OptionalValue<U>> for OptionalValue<T> where T: TypeAbiFrom<U> {}
 
 impl<T: TypeAbi> TypeAbi for OptionalValue<T> {
-    type Unmanaged = Self;
+    type Unmanaged = OptionalValue<T::Unmanaged>;
 
     fn type_name() -> TypeName {
         super::type_name_optional::<T>()
diff --git a/framework/base/src/storage/mappers/single_value_mapper.rs b/framework/base/src/storage/mappers/single_value_mapper.rs
index 8d7694c070..1f121250ff 100644
--- a/framework/base/src/storage/mappers/single_value_mapper.rs
+++ b/framework/base/src/storage/mappers/single_value_mapper.rs
@@ -220,7 +220,7 @@ where
     SA: StorageMapperApi,
     T: TopEncode + TopDecode + TypeAbi,
 {
-    type Unmanaged = Self;
+    type Unmanaged = T::Unmanaged;
 
     fn type_name() -> TypeName {
         T::type_name()
diff --git a/framework/base/src/types/heap/arg_buffer.rs b/framework/base/src/types/heap/arg_buffer.rs
index 9313157c77..c27be12f2c 100644
--- a/framework/base/src/types/heap/arg_buffer.rs
+++ b/framework/base/src/types/heap/arg_buffer.rs
@@ -1,6 +1,8 @@
 use crate::{
+    abi::{TypeAbiFrom, TypeName},
     api::ManagedTypeApi,
     codec::TopEncodeOutput,
+    proxy_imports::TypeAbi,
     types::{heap::BoxedBytes, ManagedArgBuffer},
 };
 use alloc::vec::Vec;
@@ -111,6 +113,21 @@ impl Clone for ArgBuffer {
     }
 }
 
+impl TypeAbiFrom<Self> for ArgBuffer {}
+
+impl TypeAbi for ArgBuffer {
+    type Unmanaged = Self;
+
+    /// It is semantically equivalent to any list of `T`.
+    fn type_name() -> TypeName {
+        <&[Vec<u8>] as TypeAbi>::type_name()
+    }
+
+    fn type_name_rust() -> TypeName {
+        "ArgBuffer".into()
+    }
+}
+
 impl TopEncodeOutput for &mut ArgBuffer {
     type NestedBuffer = Vec<u8>;
 
diff --git a/framework/base/src/types/managed/multi_value/multi_value_encoded.rs b/framework/base/src/types/managed/multi_value/multi_value_encoded.rs
index 18a9498da4..159fc148f7 100644
--- a/framework/base/src/types/managed/multi_value/multi_value_encoded.rs
+++ b/framework/base/src/types/managed/multi_value/multi_value_encoded.rs
@@ -244,7 +244,7 @@ where
     M: ManagedTypeApi,
     T: TypeAbi,
 {
-    type Unmanaged = Self;
+    type Unmanaged = MultiValueVec<T::Unmanaged>;
 
     fn type_name() -> TypeName {
         crate::abi::type_name_variadic::<T>()
diff --git a/framework/base/src/types/managed/multi_value/multi_value_managed_vec.rs b/framework/base/src/types/managed/multi_value/multi_value_managed_vec.rs
index a7f1337080..a168711af1 100644
--- a/framework/base/src/types/managed/multi_value/multi_value_managed_vec.rs
+++ b/framework/base/src/types/managed/multi_value/multi_value_managed_vec.rs
@@ -1,3 +1,5 @@
+use multiversx_sc_codec::multi_types::MultiValueVec;
+
 use crate::{
     abi::{TypeAbi, TypeAbiFrom, TypeDescriptionContainer, TypeName},
     api::ManagedTypeApi,
@@ -222,7 +224,7 @@ where
     M: ManagedTypeApi,
     T: ManagedVecItem,
 {
-    type Unmanaged = Self;
+    type Unmanaged = MultiValueVec<T::Unmanaged>;
 
     fn type_name() -> TypeName {
         crate::abi::type_name_variadic::<T>()

From c2c05f3ec44bc0e95c9a79975d21dbbc522bc049 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Mon, 20 May 2024 09:48:58 +0300
Subject: [PATCH 0899/1254] cargo fmt

---
 framework/base/src/types/heap/boxed_bytes.rs              | 7 ++++++-
 .../src/types/managed/wrapped/managed_vec_item_payload.rs | 2 +-
 tools/payload-macro-generator/src/main.rs                 | 8 ++------
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/framework/base/src/types/heap/boxed_bytes.rs b/framework/base/src/types/heap/boxed_bytes.rs
index 3bc0d690c6..336b0874a8 100644
--- a/framework/base/src/types/heap/boxed_bytes.rs
+++ b/framework/base/src/types/heap/boxed_bytes.rs
@@ -1,4 +1,9 @@
-use alloc::{alloc::{alloc, Layout, realloc}, boxed::Box, vec, vec::Vec};
+use alloc::{
+    alloc::{alloc, realloc, Layout},
+    boxed::Box,
+    vec,
+    vec::Vec,
+};
 
 use crate::{
     abi::{TypeAbi, TypeAbiFrom, TypeName},
diff --git a/framework/base/src/types/managed/wrapped/managed_vec_item_payload.rs b/framework/base/src/types/managed/wrapped/managed_vec_item_payload.rs
index 4d544e8d75..07adc31a08 100644
--- a/framework/base/src/types/managed/wrapped/managed_vec_item_payload.rs
+++ b/framework/base/src/types/managed/wrapped/managed_vec_item_payload.rs
@@ -76,7 +76,7 @@ impl<const N: usize> ManagedVecItemPayloadAdd<ManagedVecItemEmptyPayload>
 }
 
 /// Replaces a const generic expression.
-/// 
+///
 /// Remove once const generic expressions are stabilized in Rust.
 macro_rules! payload_add {
     ($dec1:expr, $dec2:expr, $result_add:expr) => {
diff --git a/tools/payload-macro-generator/src/main.rs b/tools/payload-macro-generator/src/main.rs
index 6991a6816e..12a0d4c581 100644
--- a/tools/payload-macro-generator/src/main.rs
+++ b/tools/payload-macro-generator/src/main.rs
@@ -8,7 +8,7 @@ const MAX_X: usize = 48;
 const MAX_Y: usize = 128;
 
 /// Generates the payload_add! macros in the ManagedVecItem implem,entation.
-/// 
+///
 /// TODO: remove once generic const expressions are stabilized in Rust.
 fn main() -> io::Result<()> {
     let mut file = File::create("output.rs")?;
@@ -17,11 +17,7 @@ fn main() -> io::Result<()> {
     for x in MIN..=MAX_X {
         for y in MIN..=MAX_Y {
             let sum = x + y;
-            writeln!(
-                file,
-                "payload_add!({}usize, {}usize, {}usize);",
-                x, y, sum
-            )?;
+            writeln!(file, "payload_add!({}usize, {}usize, {}usize);", x, y, sum)?;
         }
     }
 

From cc413807bdfcce9b9dcef105246ea440c538b726 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Mon, 20 May 2024 17:46:07 +0300
Subject: [PATCH 0900/1254] build fix

---
 .../src/types/managed/multi_value/multi_value_encoded.rs  | 4 ++++
 .../types/managed/multi_value/multi_value_managed_vec.rs  | 8 +++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/framework/base/src/types/managed/multi_value/multi_value_encoded.rs b/framework/base/src/types/managed/multi_value/multi_value_encoded.rs
index 159fc148f7..f06a6fcbdc 100644
--- a/framework/base/src/types/managed/multi_value/multi_value_encoded.rs
+++ b/framework/base/src/types/managed/multi_value/multi_value_encoded.rs
@@ -244,8 +244,12 @@ where
     M: ManagedTypeApi,
     T: TypeAbi,
 {
+    #[cfg(feature = "alloc")]
     type Unmanaged = MultiValueVec<T::Unmanaged>;
 
+    #[cfg(not(feature = "alloc"))]
+    type Unmanaged = Self;
+
     fn type_name() -> TypeName {
         crate::abi::type_name_variadic::<T>()
     }
diff --git a/framework/base/src/types/managed/multi_value/multi_value_managed_vec.rs b/framework/base/src/types/managed/multi_value/multi_value_managed_vec.rs
index a168711af1..0c1f094cb6 100644
--- a/framework/base/src/types/managed/multi_value/multi_value_managed_vec.rs
+++ b/framework/base/src/types/managed/multi_value/multi_value_managed_vec.rs
@@ -1,5 +1,3 @@
-use multiversx_sc_codec::multi_types::MultiValueVec;
-
 use crate::{
     abi::{TypeAbi, TypeAbiFrom, TypeDescriptionContainer, TypeName},
     api::ManagedTypeApi,
@@ -224,7 +222,11 @@ where
     M: ManagedTypeApi,
     T: ManagedVecItem,
 {
-    type Unmanaged = MultiValueVec<T::Unmanaged>;
+    #[cfg(feature = "alloc")]
+    type Unmanaged = multiversx_sc_codec::multi_types::MultiValueVec<T::Unmanaged>;
+
+    #[cfg(not(feature = "alloc"))]
+    type Unmanaged = Self;
 
     fn type_name() -> TypeName {
         crate::abi::type_name_variadic::<T>()

From 1e30e7d626278e833a57737503c01e9656eb2477 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Mon, 20 May 2024 17:55:30 +0300
Subject: [PATCH 0901/1254] unified syntax - interactor env rename

---
 framework/snippets/src/interactor_tx.rs        | 10 ++++++++--
 .../src/interactor_tx/interactor_exec_call.rs  | 16 ++++++++--------
 .../interactor_tx/interactor_exec_deploy.rs    | 18 +++++++++---------
 .../src/interactor_tx/interactor_exec_env.rs   | 10 +++++-----
 .../src/interactor_tx/interactor_exec_step.rs  |  6 +++---
 .../interactor_tx/interactor_exec_transf.rs    | 12 ++++++------
 .../src/interactor_tx/interactor_query_call.rs | 12 ++++++------
 .../src/interactor_tx/interactor_query_env.rs  | 10 +++++-----
 .../src/interactor_tx/interactor_query_step.rs |  6 +++---
 .../snippets/src/multi/homogenous_tx_buffer.rs |  6 +++---
 10 files changed, 56 insertions(+), 50 deletions(-)

diff --git a/framework/snippets/src/interactor_tx.rs b/framework/snippets/src/interactor_tx.rs
index 2c8bed0fda..df84381dd8 100644
--- a/framework/snippets/src/interactor_tx.rs
+++ b/framework/snippets/src/interactor_tx.rs
@@ -10,8 +10,14 @@ mod interactor_query_call;
 mod interactor_query_env;
 mod interactor_query_step;
 
-pub use interactor_exec_env::InteractorExecEnv;
+pub use interactor_exec_env::InteractorEnvExec;
 pub use interactor_exec_step::InteractorExecStep;
 pub use interactor_prepare_async::InteractorPrepareAsync;
-pub use interactor_query_env::InteractorQueryEnv;
+pub use interactor_query_env::InteractorEnvQuery;
 pub use interactor_query_step::InteractorQueryStep;
+
+#[deprecated(since = "0.50.2", note = "Renamed to InteractorExecEnv")]
+pub type InteractorExecEnv<'a> = InteractorEnvExec<'a>;
+
+#[deprecated(since = "0.50.2", note = "Renamed to InteractorEnvQuery")]
+pub type InteractorQueryEnv<'a> = InteractorEnvQuery<'a>;
diff --git a/framework/snippets/src/interactor_tx/interactor_exec_call.rs b/framework/snippets/src/interactor_tx/interactor_exec_call.rs
index 71ff47c043..261ce44989 100644
--- a/framework/snippets/src/interactor_tx/interactor_exec_call.rs
+++ b/framework/snippets/src/interactor_tx/interactor_exec_call.rs
@@ -14,16 +14,16 @@ use multiversx_sc_scenario::{
 
 use crate::Interactor;
 
-use super::{InteractorExecEnv, InteractorExecStep, InteractorPrepareAsync};
+use super::{InteractorEnvExec, InteractorExecStep, InteractorPrepareAsync};
 
 impl<'w, From, To, Payment, Gas, RH> InteractorPrepareAsync
-    for Tx<InteractorExecEnv<'w>, From, To, Payment, Gas, FunctionCall<StaticApi>, RH>
+    for Tx<InteractorEnvExec<'w>, From, To, Payment, Gas, FunctionCall<StaticApi>, RH>
 where
-    From: TxFromSpecified<InteractorExecEnv<'w>>,
-    To: TxToSpecified<InteractorExecEnv<'w>>,
-    Payment: TxPayment<InteractorExecEnv<'w>>,
-    Gas: TxGas<InteractorExecEnv<'w>>,
-    RH: RHListExec<TxResponse, InteractorExecEnv<'w>>,
+    From: TxFromSpecified<InteractorEnvExec<'w>>,
+    To: TxToSpecified<InteractorEnvExec<'w>>,
+    Payment: TxPayment<InteractorEnvExec<'w>>,
+    Gas: TxGas<InteractorEnvExec<'w>>,
+    RH: RHListExec<TxResponse, InteractorEnvExec<'w>>,
     RH::ListReturns: NestedTupleFlatten,
 {
     type Exec = InteractorExecStep<'w, ScCallStep, RH>;
@@ -37,7 +37,7 @@ where
 
 impl<'w, RH> InteractorExecStep<'w, ScCallStep, RH>
 where
-    RH: RHListExec<TxResponse, InteractorExecEnv<'w>>,
+    RH: RHListExec<TxResponse, InteractorEnvExec<'w>>,
     RH::ListReturns: NestedTupleFlatten,
 {
     pub async fn run(mut self) -> <RH::ListReturns as NestedTupleFlatten>::Unpacked {
diff --git a/framework/snippets/src/interactor_tx/interactor_exec_deploy.rs b/framework/snippets/src/interactor_tx/interactor_exec_deploy.rs
index 30e30a34ab..6070158258 100644
--- a/framework/snippets/src/interactor_tx/interactor_exec_deploy.rs
+++ b/framework/snippets/src/interactor_tx/interactor_exec_deploy.rs
@@ -13,24 +13,24 @@ use multiversx_sc_scenario::{
 
 use crate::Interactor;
 
-use super::{InteractorExecEnv, InteractorExecStep, InteractorPrepareAsync};
+use super::{InteractorEnvExec, InteractorExecStep, InteractorPrepareAsync};
 
 impl<'w, From, Payment, Gas, CodeValue, RH> InteractorPrepareAsync
     for Tx<
-        InteractorExecEnv<'w>,
+        InteractorEnvExec<'w>,
         From,
         (),
         Payment,
         Gas,
-        DeployCall<InteractorExecEnv<'w>, Code<CodeValue>>,
+        DeployCall<InteractorEnvExec<'w>, Code<CodeValue>>,
         RH,
     >
 where
-    From: TxFromSpecified<InteractorExecEnv<'w>>,
-    Payment: TxPayment<InteractorExecEnv<'w>>,
-    Gas: TxGas<InteractorExecEnv<'w>>,
-    CodeValue: TxCodeValue<InteractorExecEnv<'w>>,
-    RH: RHListExec<TxResponse, InteractorExecEnv<'w>>,
+    From: TxFromSpecified<InteractorEnvExec<'w>>,
+    Payment: TxPayment<InteractorEnvExec<'w>>,
+    Gas: TxGas<InteractorEnvExec<'w>>,
+    CodeValue: TxCodeValue<InteractorEnvExec<'w>>,
+    RH: RHListExec<TxResponse, InteractorEnvExec<'w>>,
     RH::ListReturns: NestedTupleFlatten,
 {
     type Exec = InteractorExecStep<'w, ScDeployStep, RH>;
@@ -44,7 +44,7 @@ where
 
 impl<'w, RH> InteractorExecStep<'w, ScDeployStep, RH>
 where
-    RH: RHListExec<TxResponse, InteractorExecEnv<'w>>,
+    RH: RHListExec<TxResponse, InteractorEnvExec<'w>>,
     RH::ListReturns: NestedTupleFlatten,
 {
     pub async fn run(mut self) -> <RH::ListReturns as NestedTupleFlatten>::Unpacked {
diff --git a/framework/snippets/src/interactor_tx/interactor_exec_env.rs b/framework/snippets/src/interactor_tx/interactor_exec_env.rs
index 935164f7eb..6473c50a91 100644
--- a/framework/snippets/src/interactor_tx/interactor_exec_env.rs
+++ b/framework/snippets/src/interactor_tx/interactor_exec_env.rs
@@ -8,20 +8,20 @@ use multiversx_sc_scenario::{
 use crate::Interactor;
 
 impl Interactor {
-    pub fn tx(&mut self) -> TxBaseWithEnv<InteractorExecEnv<'_>> {
+    pub fn tx(&mut self) -> TxBaseWithEnv<InteractorEnvExec<'_>> {
         let data = self.new_env_data();
-        let env = InteractorExecEnv { world: self, data };
+        let env = InteractorEnvExec { world: self, data };
         Tx::new_with_env(env)
     }
 }
 
 /// Environment for executing transactions.
-pub struct InteractorExecEnv<'w> {
+pub struct InteractorEnvExec<'w> {
     pub world: &'w mut Interactor,
     pub data: ScenarioTxEnvData,
 }
 
-impl<'w> TxEnv for InteractorExecEnv<'w> {
+impl<'w> TxEnv for InteractorEnvExec<'w> {
     type Api = StaticApi;
 
     type RHExpect = TxExpect;
@@ -39,7 +39,7 @@ impl<'w> TxEnv for InteractorExecEnv<'w> {
     }
 }
 
-impl<'w> ScenarioTxEnv for InteractorExecEnv<'w> {
+impl<'w> ScenarioTxEnv for InteractorEnvExec<'w> {
     fn env_data(&self) -> &ScenarioTxEnvData {
         &self.data
     }
diff --git a/framework/snippets/src/interactor_tx/interactor_exec_step.rs b/framework/snippets/src/interactor_tx/interactor_exec_step.rs
index 3becfe81d9..1d4eabf54d 100644
--- a/framework/snippets/src/interactor_tx/interactor_exec_step.rs
+++ b/framework/snippets/src/interactor_tx/interactor_exec_step.rs
@@ -4,12 +4,12 @@ use multiversx_sc_scenario::{
     scenario_model::TxResponse,
 };
 
-use super::InteractorExecEnv;
+use super::InteractorEnvExec;
 
 pub struct InteractorExecStep<'w, Step, RH>
 where
-    RH: RHListExec<TxResponse, InteractorExecEnv<'w>>,
+    RH: RHListExec<TxResponse, InteractorEnvExec<'w>>,
     RH::ListReturns: NestedTupleFlatten,
 {
-    pub(crate) step_wrapper: StepWrapper<InteractorExecEnv<'w>, Step, RH>,
+    pub(crate) step_wrapper: StepWrapper<InteractorEnvExec<'w>, Step, RH>,
 }
diff --git a/framework/snippets/src/interactor_tx/interactor_exec_transf.rs b/framework/snippets/src/interactor_tx/interactor_exec_transf.rs
index a19d54548d..3ec04c0b05 100644
--- a/framework/snippets/src/interactor_tx/interactor_exec_transf.rs
+++ b/framework/snippets/src/interactor_tx/interactor_exec_transf.rs
@@ -4,15 +4,15 @@ use multiversx_sc_scenario::{
     scenario_model::TransferStep,
 };
 
-use super::{InteractorExecEnv, InteractorExecStep, InteractorPrepareAsync};
+use super::{InteractorEnvExec, InteractorExecStep, InteractorPrepareAsync};
 
 impl<'w, From, To, Payment, Gas> InteractorPrepareAsync
-    for Tx<InteractorExecEnv<'w>, From, To, Payment, Gas, (), ()>
+    for Tx<InteractorEnvExec<'w>, From, To, Payment, Gas, (), ()>
 where
-    From: TxFromSpecified<InteractorExecEnv<'w>>,
-    To: TxToSpecified<InteractorExecEnv<'w>>,
-    Payment: TxPayment<InteractorExecEnv<'w>>,
-    Gas: TxGas<InteractorExecEnv<'w>>,
+    From: TxFromSpecified<InteractorEnvExec<'w>>,
+    To: TxToSpecified<InteractorEnvExec<'w>>,
+    Payment: TxPayment<InteractorEnvExec<'w>>,
+    Gas: TxGas<InteractorEnvExec<'w>>,
 {
     type Exec = InteractorExecStep<'w, TransferStep, ()>;
 
diff --git a/framework/snippets/src/interactor_tx/interactor_query_call.rs b/framework/snippets/src/interactor_tx/interactor_query_call.rs
index 9068b906e5..5e35b5409b 100644
--- a/framework/snippets/src/interactor_tx/interactor_query_call.rs
+++ b/framework/snippets/src/interactor_tx/interactor_query_call.rs
@@ -11,14 +11,14 @@ use multiversx_sc_scenario::{
 
 use crate::Interactor;
 
-use super::{InteractorPrepareAsync, InteractorQueryEnv, InteractorQueryStep};
+use super::{InteractorEnvQuery, InteractorPrepareAsync, InteractorQueryStep};
 
 impl<'w, To, Payment, RH> InteractorPrepareAsync
-    for Tx<InteractorQueryEnv<'w>, (), To, Payment, (), FunctionCall<StaticApi>, RH>
+    for Tx<InteractorEnvQuery<'w>, (), To, Payment, (), FunctionCall<StaticApi>, RH>
 where
-    To: TxToSpecified<InteractorQueryEnv<'w>>,
-    Payment: TxNoPayment<InteractorQueryEnv<'w>>,
-    RH: RHListExec<TxResponse, InteractorQueryEnv<'w>>,
+    To: TxToSpecified<InteractorEnvQuery<'w>>,
+    Payment: TxNoPayment<InteractorEnvQuery<'w>>,
+    RH: RHListExec<TxResponse, InteractorEnvQuery<'w>>,
     RH::ListReturns: NestedTupleFlatten,
 {
     type Exec = InteractorQueryStep<'w, RH>;
@@ -32,7 +32,7 @@ where
 
 impl<'w, RH> InteractorQueryStep<'w, RH>
 where
-    RH: RHListExec<TxResponse, InteractorQueryEnv<'w>>,
+    RH: RHListExec<TxResponse, InteractorEnvQuery<'w>>,
     RH::ListReturns: NestedTupleFlatten,
 {
     pub async fn run(mut self) -> <RH::ListReturns as NestedTupleFlatten>::Unpacked {
diff --git a/framework/snippets/src/interactor_tx/interactor_query_env.rs b/framework/snippets/src/interactor_tx/interactor_query_env.rs
index 1fa1142111..71dcd2f3b4 100644
--- a/framework/snippets/src/interactor_tx/interactor_query_env.rs
+++ b/framework/snippets/src/interactor_tx/interactor_query_env.rs
@@ -8,19 +8,19 @@ use multiversx_sc_scenario::{
 use crate::Interactor;
 
 impl Interactor {
-    pub fn query(&mut self) -> TxBaseWithEnv<InteractorQueryEnv<'_>> {
+    pub fn query(&mut self) -> TxBaseWithEnv<InteractorEnvQuery<'_>> {
         let data = self.new_env_data();
-        let env = InteractorQueryEnv { world: self, data };
+        let env = InteractorEnvQuery { world: self, data };
         Tx::new_with_env(env)
     }
 }
 
-pub struct InteractorQueryEnv<'w> {
+pub struct InteractorEnvQuery<'w> {
     pub world: &'w mut Interactor,
     pub data: ScenarioTxEnvData,
 }
 
-impl<'w> TxEnv for InteractorQueryEnv<'w> {
+impl<'w> TxEnv for InteractorEnvQuery<'w> {
     type Api = StaticApi;
 
     type RHExpect = TxExpect;
@@ -38,7 +38,7 @@ impl<'w> TxEnv for InteractorQueryEnv<'w> {
     }
 }
 
-impl<'w> ScenarioTxEnv for InteractorQueryEnv<'w> {
+impl<'w> ScenarioTxEnv for InteractorEnvQuery<'w> {
     fn env_data(&self) -> &ScenarioTxEnvData {
         &self.data
     }
diff --git a/framework/snippets/src/interactor_tx/interactor_query_step.rs b/framework/snippets/src/interactor_tx/interactor_query_step.rs
index 81c7542add..bbb7a0996b 100644
--- a/framework/snippets/src/interactor_tx/interactor_query_step.rs
+++ b/framework/snippets/src/interactor_tx/interactor_query_step.rs
@@ -4,12 +4,12 @@ use multiversx_sc_scenario::{
     scenario_model::{ScQueryStep, TxResponse},
 };
 
-use super::InteractorQueryEnv;
+use super::InteractorEnvQuery;
 
 pub struct InteractorQueryStep<'w, RH>
 where
-    RH: RHListExec<TxResponse, InteractorQueryEnv<'w>>,
+    RH: RHListExec<TxResponse, InteractorEnvQuery<'w>>,
     RH::ListReturns: NestedTupleFlatten,
 {
-    pub(crate) step_wrapper: StepWrapper<InteractorQueryEnv<'w>, ScQueryStep, RH>,
+    pub(crate) step_wrapper: StepWrapper<InteractorEnvQuery<'w>, ScQueryStep, RH>,
 }
diff --git a/framework/snippets/src/multi/homogenous_tx_buffer.rs b/framework/snippets/src/multi/homogenous_tx_buffer.rs
index da177d1658..66f5dec79f 100644
--- a/framework/snippets/src/multi/homogenous_tx_buffer.rs
+++ b/framework/snippets/src/multi/homogenous_tx_buffer.rs
@@ -8,10 +8,10 @@ use multiversx_sc_scenario::{
     ScenarioTxEnvData,
 };
 
-use crate::{Interactor, InteractorExecEnv, InteractorStep, StepBuffer};
+use crate::{Interactor, InteractorEnvExec, InteractorStep, StepBuffer};
 
 pub struct HomogenousTxBuffer<'w, Step, RH> {
-    env: InteractorExecEnv<'w>,
+    env: InteractorEnvExec<'w>,
     steps: Vec<StepWrapper<ScenarioTxEnvData, Step, RH>>,
 }
 
@@ -22,7 +22,7 @@ impl Interactor {
     /// Therefore, after execution, all results will have the same type.
     pub fn homogenous_call_buffer<Step, RH>(&mut self) -> HomogenousTxBuffer<'_, Step, RH> {
         let data = self.new_env_data();
-        let env = InteractorExecEnv { world: self, data };
+        let env = InteractorEnvExec { world: self, data };
         HomogenousTxBuffer {
             env,
             steps: Vec::new(),

From f1dc57e3e2edc26e1d443e75bd1e896ade7c3807 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Mon, 20 May 2024 18:48:44 +0300
Subject: [PATCH 0902/1254] cargo fmt

---
 .../tests/crowdfunding_esdt_blackbox_test.rs                  | 4 +++-
 .../composability/interact/src/call_tree_deploy.rs            | 3 ++-
 .../composability/interact/src/comp_interact_main.rs          | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

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 d19501b1da..d00e263607 100644
--- a/contracts/examples/crowdfunding-esdt/tests/crowdfunding_esdt_blackbox_test.rs
+++ b/contracts/examples/crowdfunding-esdt/tests/crowdfunding_esdt_blackbox_test.rs
@@ -108,7 +108,9 @@ impl CrowdfundingESDTTestState {
     }
 
     fn set_block_timestamp(&mut self, block_timestamp_expr: u64) {
-        self.world.current_block().block_timestamp(block_timestamp_expr);
+        self.world
+            .current_block()
+            .block_timestamp(block_timestamp_expr);
     }
 }
 
diff --git a/contracts/feature-tests/composability/interact/src/call_tree_deploy.rs b/contracts/feature-tests/composability/interact/src/call_tree_deploy.rs
index 09d859008c..89d4000c7f 100644
--- a/contracts/feature-tests/composability/interact/src/call_tree_deploy.rs
+++ b/contracts/feature-tests/composability/interact/src/call_tree_deploy.rs
@@ -1,5 +1,6 @@
 use crate::{
-    call_tree::CallState, comp_interact_controller::ComposabilityInteract, forwarder_queue_proxy, vault_proxy
+    call_tree::CallState, comp_interact_controller::ComposabilityInteract, forwarder_queue_proxy,
+    vault_proxy,
 };
 
 use multiversx_sc_snippets::imports::*;
diff --git a/contracts/feature-tests/composability/interact/src/comp_interact_main.rs b/contracts/feature-tests/composability/interact/src/comp_interact_main.rs
index 9f5fb1f296..1652d66b76 100644
--- a/contracts/feature-tests/composability/interact/src/comp_interact_main.rs
+++ b/contracts/feature-tests/composability/interact/src/comp_interact_main.rs
@@ -8,8 +8,8 @@ mod comp_interact_config;
 mod comp_interact_controller;
 mod comp_interact_state;
 
-mod vault_proxy;
 mod forwarder_queue_proxy;
+mod vault_proxy;
 
 use clap::Parser;
 use comp_interact_controller::ComposabilityInteract;

From edc446f9b52835cfd2ad8da3827804d396f32a55 Mon Sep 17 00:00:00 2001
From: Fusee <quentus123@orange.fr>
Date: Tue, 21 May 2024 00:32:52 +0200
Subject: [PATCH 0903/1254] implemented Clone for Egld when possible

---
 .../src/types/interaction/tx_payment/tx_payment_egld.rs     | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/framework/base/src/types/interaction/tx_payment/tx_payment_egld.rs b/framework/base/src/types/interaction/tx_payment/tx_payment_egld.rs
index d63635e53e..28ebea24ac 100644
--- a/framework/base/src/types/interaction/tx_payment/tx_payment_egld.rs
+++ b/framework/base/src/types/interaction/tx_payment/tx_payment_egld.rs
@@ -15,6 +15,12 @@ pub struct Egld<EgldValue>(pub EgldValue);
 
 pub type EgldPayment<Api> = Egld<BigUint<Api>>;
 
+impl<EgldValue: Clone> Clone for Egld<EgldValue> {
+    fn clone(&self) -> Self {
+        Egld(self.0.clone())
+    }
+}
+
 impl<Env, EgldValue> TxPayment<Env> for Egld<EgldValue>
 where
     Env: TxEnv,

From 30857740585cbc74fc9516f7ce198172af47be74 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 22 May 2024 14:22:12 +0300
Subject: [PATCH 0904/1254] Removed set_current_dir_from_workspace from tests

---
 .../large-storage/tests/large_storage_scenario_rs_test.rs   | 1 -
 .../tests/linked_list_repeat_blackbox_test.rs               | 1 -
 .../mappers/linked-list-repeat/tests/scenario_rs_test.rs    | 1 -
 .../benchmarks/mappers/map-repeat/tests/scenario_rs_test.rs | 1 -
 .../mappers/queue-repeat/tests/scenario_rs_test.rs          | 1 -
 .../benchmarks/mappers/set-repeat/tests/scenario_rs_test.rs | 1 -
 .../mappers/single-value-repeat/tests/scenario_rs_test.rs   | 1 -
 .../benchmarks/mappers/vec-repeat/tests/scenario_rs_test.rs | 1 -
 .../tests/price_aggregator_blackbox_test.rs                 | 1 -
 .../tests/price_aggregator_whitebox_test.rs                 | 1 -
 .../core/wegld-swap/tests/wegld_swap_scenario_rs_test.rs    | 1 -
 contracts/examples/adder/tests/adder_blackbox_test.rs       | 1 -
 contracts/examples/adder/tests/adder_scenario_rs_test.rs    | 1 -
 contracts/examples/adder/tests/adder_whitebox_test.rs       | 1 -
 .../tests/crowdfunding_esdt_scenario_rs_test.rs             | 1 -
 .../crypto-bubbles/tests/crypto_bubbles_scenario_rs_test.rs | 1 -
 .../digital-cash/tests/digital_cash_scenario_rs_test.rs     | 1 -
 contracts/examples/empty/tests/empty_scenario_rs_test.rs    | 1 -
 .../tests/esdt_transfer_with_fee_scenario_rs_test.rs        | 1 -
 .../examples/factorial/tests/factorial_scenario_rs_test.rs  | 1 -
 .../lottery-esdt/tests/lottery_esdt_scenario_rs_test.rs     | 1 -
 contracts/examples/multisig/tests/multisig_blackbox_test.rs | 1 -
 .../examples/multisig/tests/multisig_scenario_rs_test.rs    | 1 -
 contracts/examples/multisig/tests/multisig_whitebox_test.rs | 1 -
 .../nft-minter/tests/nft_minter_scenario_rs_test.rs         | 1 -
 .../tests/nft_subscription_scenario_rs_test.rs              | 1 -
 .../examples/order-book/pair/tests/pair_scenario_rs_test.rs | 1 -
 .../ping-pong-egld/tests/ping_pong_egld_scenario_rs_test.rs | 1 -
 .../proxy-pause/tests/proxy_pause_scenario_rs_test.rs       | 1 -
 .../token-release/tests/token_release_scenario_rs_test.rs   | 1 -
 .../feature-tests/abi-tester/tests/abi_tester_abi_test.rs   | 4 +---
 .../alloc-features/tests/alloc_features_scenario_rs_test.rs | 1 -
 .../tests/basic_features_is_builtin_function_rs_test.rs     | 1 -
 .../basic-features/tests/basic_features_scenario_rs_test.rs | 1 -
 .../big-float-features/tests/big_float_scenario_rs_test.rs  | 1 -
 .../composability/tests/composability_scenario_rs_test.rs   | 1 -
 .../composability/tests/forwarder_blackbox_legacy_test.rs   | 1 -
 .../composability/tests/forwarder_whitebox_legacy_test.rs   | 1 -
 .../composability/tests/forwarder_whitebox_test.rs          | 1 -
 .../composability/tests/promises_feature_blackbox_test.rs   | 1 -
 .../tests/transfer_role_whitebox_test.rs                    | 4 ----
 .../tests/crowdfunding_erc20_scenario_rs_test.rs            | 6 ------
 .../erc20/tests/erc20_scenario_rs_test.rs                   | 1 -
 .../lottery-erc20/tests/lottery_erc20_scenario_rs_test.rs   | 4 ----
 .../tests/esdt_system_sc_mock_scenario_rs_test.rs           | 1 -
 .../tests/exchange_features_blackbox_test.rs                | 1 -
 .../tests/msg_scenario_rs_test.rs                           | 1 -
 .../tests/managed_map_scenario_rs_test.rs                   | 1 -
 .../tests/multi_contract_scenario_rs_test.rs                | 1 -
 .../panic-message-features/tests/pmf_blackbox_test.rs       | 1 -
 .../panic-message-features/tests/pmf_scenario_rs_test.rs    | 1 -
 .../payable-features/tests/payable_blackbox_test.rs         | 1 -
 .../payable-features/tests/payable_scenario_rs_test.rs      | 1 -
 .../tests/rust_testing_framework_tester_scenario_rs_test.rs | 3 ---
 .../tests/tester_blackbox_test.rs                           | 3 ---
 .../scenario-tester/tests/st_blackbox_chained_test.rs       | 1 -
 .../scenario-tester/tests/st_blackbox_legacy_proxy_test.rs  | 1 -
 .../scenario-tester/tests/st_blackbox_raw_steps_test.rs     | 1 -
 .../feature-tests/scenario-tester/tests/st_blackbox_test.rs | 1 -
 .../scenario-tester/tests/st_blackbox_upgrade_test.rs       | 1 -
 .../scenario-tester/tests/st_scenario_rs_test.rs            | 1 -
 .../feature-tests/scenario-tester/tests/st_whitebox_test.rs | 1 -
 .../use-module/tests/gov_module_whitebox_test.rs            | 1 -
 .../use-module/tests/staking_module_whitebox_test.rs        | 1 -
 .../use-module/tests/token_merge_module_whitebox_test.rs    | 2 --
 .../feature-tests/use-module/tests/use_module_abi_test.rs   | 3 +--
 framework/scenario/tests/scenarios_self_test.rs             | 1 -
 67 files changed, 2 insertions(+), 86 deletions(-)

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 38297fd2f2..4a74775c67 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
@@ -2,7 +2,6 @@ use multiversx_sc_scenario::*;
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
-    blockchain.set_current_dir_from_workspace("contracts/benchmarks/large-storage");
     blockchain.register_contract(
         "mxsc:output/large-storage.mxsc.json",
         large_storage::ContractBuilder,
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 bd5a4198e3..15465791d4 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
@@ -8,7 +8,6 @@ const WASM_PATH_EXPR: &str = "mxsc:output/linked-list-repeat.mxsc.json";
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
-    blockchain.set_current_dir_from_workspace("contracts/benchmarks/mappers/linked-list-repeat");
 
     blockchain.register_contract(WASM_PATH_EXPR, linked_list_repeat::ContractBuilder);
     blockchain
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 c7b91be79e..442754a06b 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
@@ -2,7 +2,6 @@ use multiversx_sc_scenario::*;
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
-    blockchain.set_current_dir_from_workspace("contracts/benchmarks/mappers/linked-list-repeat");
 
     blockchain.register_contract(
         "mxsc:output/linked-list-repeat.mxsc.json",
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 8ae30eaf45..ce7eabb8eb 100644
--- a/contracts/benchmarks/mappers/map-repeat/tests/scenario_rs_test.rs
+++ b/contracts/benchmarks/mappers/map-repeat/tests/scenario_rs_test.rs
@@ -2,7 +2,6 @@ use multiversx_sc_scenario::*;
 
 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",
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 4e7ac9ba66..9f4596ae21 100644
--- a/contracts/benchmarks/mappers/queue-repeat/tests/scenario_rs_test.rs
+++ b/contracts/benchmarks/mappers/queue-repeat/tests/scenario_rs_test.rs
@@ -2,7 +2,6 @@ use multiversx_sc_scenario::*;
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
-    blockchain.set_current_dir_from_workspace("contracts/benchmarks/mappers/queue-repeat");
 
     blockchain.register_contract(
         "mxsc:output/queue-repeat.mxsc.json",
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 ba9fda4f46..ec2352ec65 100644
--- a/contracts/benchmarks/mappers/set-repeat/tests/scenario_rs_test.rs
+++ b/contracts/benchmarks/mappers/set-repeat/tests/scenario_rs_test.rs
@@ -2,7 +2,6 @@ use multiversx_sc_scenario::*;
 
 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",
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 cf43c6d95f..d235f08b2e 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
@@ -2,7 +2,6 @@ use multiversx_sc_scenario::*;
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
-    blockchain.set_current_dir_from_workspace("contracts/benchmarks/mappers/single-value-repeat");
 
     blockchain.register_contract(
         "mxsc:output/single-value-repeat.mxsc.json",
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 49407163df..d47d38ec79 100644
--- a/contracts/benchmarks/mappers/vec-repeat/tests/scenario_rs_test.rs
+++ b/contracts/benchmarks/mappers/vec-repeat/tests/scenario_rs_test.rs
@@ -2,7 +2,6 @@ use multiversx_sc_scenario::*;
 
 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",
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 438eb574aa..b0e1f54455 100644
--- a/contracts/core/price-aggregator/tests/price_aggregator_blackbox_test.rs
+++ b/contracts/core/price-aggregator/tests/price_aggregator_blackbox_test.rs
@@ -24,7 +24,6 @@ const PRICE_AGGREGATOR_PATH: MxscPath =
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
 
-    blockchain.set_current_dir_from_workspace("contracts/core/price-aggregator");
     blockchain.register_contract(
         PRICE_AGGREGATOR_PATH,
         multiversx_price_aggregator_sc::ContractBuilder,
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 50b05a6a41..180301b610 100644
--- a/contracts/core/price-aggregator/tests/price_aggregator_whitebox_test.rs
+++ b/contracts/core/price-aggregator/tests/price_aggregator_whitebox_test.rs
@@ -24,7 +24,6 @@ const PRICE_AGGREGATOR_PATH_EXPR: &str = "mxsc:output/multiversx-price-aggregato
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
 
-    blockchain.set_current_dir_from_workspace("contracts/core/price-aggregator");
     blockchain.register_contract(
         PRICE_AGGREGATOR_PATH_EXPR,
         multiversx_price_aggregator_sc::ContractBuilder,
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 01770e4b2e..a93bedb10f 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
@@ -2,7 +2,6 @@ use multiversx_sc_scenario::*;
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
-    blockchain.set_current_dir_from_workspace("contracts/core/wegld-swap");
 
     blockchain.register_contract(
         "mxsc:output/multiversx-wegld-swap-sc.mxsc.json",
diff --git a/contracts/examples/adder/tests/adder_blackbox_test.rs b/contracts/examples/adder/tests/adder_blackbox_test.rs
index a0064a65d0..73d6fecd5f 100644
--- a/contracts/examples/adder/tests/adder_blackbox_test.rs
+++ b/contracts/examples/adder/tests/adder_blackbox_test.rs
@@ -8,7 +8,6 @@ const CODE_PATH: MxscPath = MxscPath::new("output/adder.mxsc.json");
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
-    blockchain.set_current_dir_from_workspace("contracts/examples/adder");
 
     blockchain.register_contract(CODE_PATH, 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 c467100633..f9ee7a3a1c 100644
--- a/contracts/examples/adder/tests/adder_scenario_rs_test.rs
+++ b/contracts/examples/adder/tests/adder_scenario_rs_test.rs
@@ -2,7 +2,6 @@ use multiversx_sc_scenario::*;
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
-    blockchain.set_current_dir_from_workspace("contracts/examples/adder");
 
     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 50ad95faa6..9e7abe4a51 100644
--- a/contracts/examples/adder/tests/adder_whitebox_test.rs
+++ b/contracts/examples/adder/tests/adder_whitebox_test.rs
@@ -5,7 +5,6 @@ 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("mxsc:output/adder.mxsc.json", adder::ContractBuilder);
     blockchain
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 b26e2488e8..64a88906b2 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
@@ -2,7 +2,6 @@ use multiversx_sc_scenario::*;
 
 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",
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 7beee20ecb..134133a68b 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
@@ -2,7 +2,6 @@ use multiversx_sc_scenario::*;
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
-    blockchain.set_current_dir_from_workspace("contracts/examples/crypto-bubbles");
 
     blockchain.register_contract(
         "mxsc:output/crypto-bubbles.mxsc.json",
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 8dcff32a11..b210c4952a 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
@@ -2,7 +2,6 @@ use multiversx_sc_scenario::*;
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
-    blockchain.set_current_dir_from_workspace("contracts/examples/digital-cash");
 
     blockchain.register_contract(
         "mxsc:output/digital-cash.mxsc.json",
diff --git a/contracts/examples/empty/tests/empty_scenario_rs_test.rs b/contracts/examples/empty/tests/empty_scenario_rs_test.rs
index d4f9a9b3ab..7f84325dbe 100644
--- a/contracts/examples/empty/tests/empty_scenario_rs_test.rs
+++ b/contracts/examples/empty/tests/empty_scenario_rs_test.rs
@@ -2,7 +2,6 @@ use multiversx_sc_scenario::*;
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
-    blockchain.set_current_dir_from_workspace("contracts/examples/empty");
 
     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 2dd7248b2a..48bc41cff0 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
@@ -2,7 +2,6 @@ use multiversx_sc_scenario::*;
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
-    blockchain.set_current_dir_from_workspace("contracts/examples/esdt-transfer-with-fee");
 
     blockchain.register_contract(
         "mxsc:output/esdt-transfer-with-fee.mxsc.json",
diff --git a/contracts/examples/factorial/tests/factorial_scenario_rs_test.rs b/contracts/examples/factorial/tests/factorial_scenario_rs_test.rs
index 5f55080950..679c1a2d92 100644
--- a/contracts/examples/factorial/tests/factorial_scenario_rs_test.rs
+++ b/contracts/examples/factorial/tests/factorial_scenario_rs_test.rs
@@ -2,7 +2,6 @@ use multiversx_sc_scenario::*;
 
 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",
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 5fc5e76eba..4d6cf07266 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
@@ -2,7 +2,6 @@ use multiversx_sc_scenario::*;
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
-    blockchain.set_current_dir_from_workspace("contracts/examples/lottery-esdt");
 
     blockchain.register_contract(
         "mxsc:output/lottery-esdt.mxsc.json",
diff --git a/contracts/examples/multisig/tests/multisig_blackbox_test.rs b/contracts/examples/multisig/tests/multisig_blackbox_test.rs
index 322abd9348..083a6c6be6 100644
--- a/contracts/examples/multisig/tests/multisig_blackbox_test.rs
+++ b/contracts/examples/multisig/tests/multisig_blackbox_test.rs
@@ -18,7 +18,6 @@ const QUORUM_SIZE: usize = 1;
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
-    blockchain.set_current_dir_from_workspace("contracts/examples/multisig");
 
     blockchain.register_contract(MULTISIG_CODE_PATH, multisig::ContractBuilder);
     blockchain.register_contract(ADDER_CODE_PATH, adder::ContractBuilder);
diff --git a/contracts/examples/multisig/tests/multisig_scenario_rs_test.rs b/contracts/examples/multisig/tests/multisig_scenario_rs_test.rs
index 8a606bffd8..67baad4ca2 100644
--- a/contracts/examples/multisig/tests/multisig_scenario_rs_test.rs
+++ b/contracts/examples/multisig/tests/multisig_scenario_rs_test.rs
@@ -4,7 +4,6 @@ const WEGLD_SWAP_EXPR: &str = "0x0061736d0100000001661160000060017f0060027f7f017
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
-    blockchain.set_current_dir_from_workspace("contracts/examples/multisig");
 
     blockchain.register_partial_contract::<multisig::AbiProvider, _>(
         "mxsc:output/multisig.mxsc.json",
diff --git a/contracts/examples/multisig/tests/multisig_whitebox_test.rs b/contracts/examples/multisig/tests/multisig_whitebox_test.rs
index 456fc9f96f..904a03c7e0 100644
--- a/contracts/examples/multisig/tests/multisig_whitebox_test.rs
+++ b/contracts/examples/multisig/tests/multisig_whitebox_test.rs
@@ -51,7 +51,6 @@ pub struct CallActionDataRaw {
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
-    blockchain.set_current_dir_from_workspace("contracts/examples/multisig");
 
     blockchain.register_contract(MULTISIG_PATH_EXPR, multisig::ContractBuilder);
     blockchain
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 db79559f43..1e8c9a3f43 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
@@ -2,7 +2,6 @@ use multiversx_sc_scenario::*;
 
 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",
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 4340f468a7..c36191ef22 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
@@ -2,7 +2,6 @@ use multiversx_sc_scenario::*;
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
-    blockchain.set_current_dir_from_workspace("contracts/examples/nft-subscription");
 
     blockchain.register_contract(
         "mxsc:output/nft-subscription.mxsc.json",
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 c17ebaea2b..cc5df5d805 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
@@ -2,7 +2,6 @@ use multiversx_sc_scenario::*;
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
-    blockchain.set_current_dir_from_workspace("contracts/examples/order-book/pair");
 
     blockchain.register_contract(
         "mxsc:output/order-book-pair.mxsc.json",
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 ccec7f5ca9..55a8e591eb 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
@@ -2,7 +2,6 @@ use multiversx_sc_scenario::*;
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
-    blockchain.set_current_dir_from_workspace("contracts/examples/ping-pong-egld");
 
     blockchain.register_contract(
         "mxsc:output/ping-pong-egld.mxsc.json",
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 41c563d7c7..08a9f92276 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
@@ -2,7 +2,6 @@ use multiversx_sc_scenario::*;
 
 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",
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 57f8c4a142..eefa11be57 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
@@ -2,7 +2,6 @@ use multiversx_sc_scenario::*;
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
-    blockchain.set_current_dir_from_workspace("contracts/examples/token-release");
 
     blockchain.register_contract(
         "mxsc:output/token-release.mxsc.json",
diff --git a/contracts/feature-tests/abi-tester/tests/abi_tester_abi_test.rs b/contracts/feature-tests/abi-tester/tests/abi_tester_abi_test.rs
index e5a31ef9e4..756eb70ea4 100644
--- a/contracts/feature-tests/abi-tester/tests/abi_tester_abi_test.rs
+++ b/contracts/feature-tests/abi-tester/tests/abi_tester_abi_test.rs
@@ -12,8 +12,7 @@ use multiversx_sc_scenario::ScenarioWorld;
 
 #[test]
 fn abi_tester_abi_generated_ok() {
-    let mut blockchain = ScenarioWorld::new();
-    blockchain.set_current_dir_from_workspace("contracts/feature-tests/abi-tester");
+    let blockchain = ScenarioWorld::new();
 
     // generate ABI
     let multi_contract_config = multiversx_sc_meta::multi_contract_config::<abi_tester::AbiProvider>(
@@ -72,7 +71,6 @@ fn abi_tester_esdt_attr_abi_generated_ok() {
 #[test]
 fn check_multi_contract_config() {
     let mut blockchain = ScenarioWorld::new();
-    blockchain.set_current_dir_from_workspace("contracts/feature-tests/abi-tester");
 
     let multi_contract_config = multiversx_sc_meta::multi_contract_config::<abi_tester::AbiProvider>(
         blockchain.current_dir().as_path(),
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 1d1cee1936..3d3c798e44 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
@@ -2,7 +2,6 @@ use multiversx_sc_scenario::*;
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
-    blockchain.set_current_dir_from_workspace("contracts/feature-tests/alloc-features");
 
     blockchain.register_partial_contract::<alloc_features::AbiProvider, _>(
         "mxsc:output/alloc-features.mxsc.json",
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
index 836cdd5a9c..d2cc2d269b 100644
--- 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
@@ -2,7 +2,6 @@ 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",
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 a799f9218a..48762ce617 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
@@ -2,7 +2,6 @@ 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",
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 0c5d6383fa..60a9d0ed35 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
@@ -2,7 +2,6 @@ use multiversx_sc_scenario::*;
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
-    blockchain.set_current_dir_from_workspace("contracts/feature-tests/big-float-features");
 
     blockchain.register_contract(
         "mxsc:output/big-float-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 fae64b1ab1..33db8b4b49 100644
--- a/contracts/feature-tests/composability/tests/composability_scenario_rs_test.rs
+++ b/contracts/feature-tests/composability/tests/composability_scenario_rs_test.rs
@@ -2,7 +2,6 @@ use multiversx_sc_scenario::*;
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
-    blockchain.set_current_dir_from_workspace("contracts/feature-tests/composability");
 
     blockchain.register_contract(
         "mxsc:builtin-func-features/output/builtin-func-features.mxsc.json",
diff --git a/contracts/feature-tests/composability/tests/forwarder_blackbox_legacy_test.rs b/contracts/feature-tests/composability/tests/forwarder_blackbox_legacy_test.rs
index cc13982a2d..44a1ac4b5f 100644
--- a/contracts/feature-tests/composability/tests/forwarder_blackbox_legacy_test.rs
+++ b/contracts/feature-tests/composability/tests/forwarder_blackbox_legacy_test.rs
@@ -21,7 +21,6 @@ type ForwarderContract = ContractInfo<forwarder_legacy::Proxy<StaticApi>>;
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
-    blockchain.set_current_dir_from_workspace("contracts/composability/");
 
     blockchain.register_contract(FORWARDER_PATH_EXPR, forwarder_legacy::ContractBuilder);
     blockchain
diff --git a/contracts/feature-tests/composability/tests/forwarder_whitebox_legacy_test.rs b/contracts/feature-tests/composability/tests/forwarder_whitebox_legacy_test.rs
index d829016176..170fb68147 100644
--- a/contracts/feature-tests/composability/tests/forwarder_whitebox_legacy_test.rs
+++ b/contracts/feature-tests/composability/tests/forwarder_whitebox_legacy_test.rs
@@ -17,7 +17,6 @@ const NFT_TOKEN_ID: &[u8] = b"COOL-123456";
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
-    blockchain.set_current_dir_from_workspace("contracts/composability/forwarder_legacy");
 
     blockchain.register_contract(FORWARDER_PATH_EXPR, forwarder_legacy::ContractBuilder);
     blockchain
diff --git a/contracts/feature-tests/composability/tests/forwarder_whitebox_test.rs b/contracts/feature-tests/composability/tests/forwarder_whitebox_test.rs
index 0adb09b286..6298e2018d 100644
--- a/contracts/feature-tests/composability/tests/forwarder_whitebox_test.rs
+++ b/contracts/feature-tests/composability/tests/forwarder_whitebox_test.rs
@@ -10,7 +10,6 @@ const NFT_TOKEN_ID: &[u8] = b"COOL-123456";
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
-    blockchain.set_current_dir_from_workspace("contracts/composability/forwarder");
 
     blockchain.register_contract(FORWARDER_PATH_EXPR, forwarder::ContractBuilder);
     blockchain
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 180cb1c508..3ecce2d8fb 100644
--- a/contracts/feature-tests/composability/tests/promises_feature_blackbox_test.rs
+++ b/contracts/feature-tests/composability/tests/promises_feature_blackbox_test.rs
@@ -20,7 +20,6 @@ type VaultContract = ContractInfo<vault::Proxy<StaticApi>>;
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
-    blockchain.set_current_dir_from_workspace("contracts/feature-tests/composability");
 
     blockchain.register_contract(
         PROMISES_FEATURES_PATH_EXPR,
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 dc733dede9..adf9582982 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
@@ -16,10 +16,6 @@ const REJECT_FUNDS_FUNC_NAME: &[u8] = b"reject_funds";
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
-    blockchain.set_current_dir_from_workspace(
-        "contracts/composability/feature-tests/transfer-role-features",
-    );
-
     blockchain.register_contract(
         TRANSFER_ROLE_FEATURES_PATH_EXPR,
         transfer_role_features::ContractBuilder,
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 e14767b48f..a75f0a6dd3 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
@@ -2,20 +2,14 @@ use multiversx_sc_scenario::*;
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
-    blockchain.set_current_dir_from_workspace(
-        "contracts/feature-tests/erc-style-contracts/crowdfunding-erc20",
-    );
-
     blockchain.register_contract(
         "mxsc:output/crowdfunding-erc20.mxsc.json",
         crowdfunding_erc20::ContractBuilder,
     );
-
     blockchain.register_contract(
         "mxsc:../erc20/output/erc20.mxsc.json",
         erc20::ContractBuilder,
     );
-
     blockchain
 }
 
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 eb68d00d2e..bf8da38747 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
@@ -2,7 +2,6 @@ use multiversx_sc_scenario::*;
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
-    blockchain.set_current_dir_from_workspace("contracts/feature-tests/erc-style-contracts/erc20");
 
     blockchain.register_contract("mxsc: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 ed82fb71bb..fa03693cce 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
@@ -2,10 +2,6 @@ use multiversx_sc_scenario::*;
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
-    blockchain.set_current_dir_from_workspace(
-        "contracts/feature-tests/erc-style-contracts/lottery-erc20",
-    );
-
     blockchain.register_contract(
         "mxsc:output/lottery-erc20.mxsc.json",
         lottery_erc20::ContractBuilder,
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 c0809e7b40..eca4daa6cb 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
@@ -2,7 +2,6 @@ use multiversx_sc_scenario::*;
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
-    blockchain.set_current_dir_from_workspace("contracts/feature-tests/esdt-system-sc-mock");
 
     blockchain.register_contract(
         "mxsc:output/esdt-system-sc-mock.mxsc.json",
diff --git a/contracts/feature-tests/exchange-features/tests/exchange_features_blackbox_test.rs b/contracts/feature-tests/exchange-features/tests/exchange_features_blackbox_test.rs
index 88c87e3931..ebf5b99b63 100644
--- a/contracts/feature-tests/exchange-features/tests/exchange_features_blackbox_test.rs
+++ b/contracts/feature-tests/exchange-features/tests/exchange_features_blackbox_test.rs
@@ -4,7 +4,6 @@ const EXCHANGE_FEATURES_PATH_EXPR: &str = "mxsc:output/exchange-features.mxsc.js
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
-    blockchain.set_current_dir_from_workspace("contracts/feature-tests/exchange-features");
 
     blockchain.register_contract(
         EXCHANGE_FEATURES_PATH_EXPR,
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 929ddd5c7c..0844d716d7 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
@@ -2,7 +2,6 @@ use multiversx_sc_scenario::*;
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
-    blockchain.set_current_dir_from_workspace("contracts/feature-tests/formatted-message-features");
 
     blockchain.register_contract(
         "mxsc:output/formatted-message-features.mxsc.json",
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 78defc0fcf..9981c49f93 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
@@ -2,7 +2,6 @@ use multiversx_sc_scenario::*;
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
-    blockchain.set_current_dir_from_workspace("contracts/feature-tests/managed-map-features");
     blockchain.register_contract(
         "mxsc:output/managed-map-features.mxsc.json",
         managed_map_features::ContractBuilder,
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 5c56c275d5..4c6b64db26 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
@@ -2,7 +2,6 @@ use multiversx_sc_scenario::*;
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
-    blockchain.set_current_dir_from_workspace("contracts/feature-tests/multi-contract-features");
 
     blockchain.register_partial_contract::<multi_contract_features::AbiProvider, _>(
         "mxsc:output/multi-contract-features.mxsc.json",
diff --git a/contracts/feature-tests/panic-message-features/tests/pmf_blackbox_test.rs b/contracts/feature-tests/panic-message-features/tests/pmf_blackbox_test.rs
index e8ad3c2a33..d0588455ba 100644
--- a/contracts/feature-tests/panic-message-features/tests/pmf_blackbox_test.rs
+++ b/contracts/feature-tests/panic-message-features/tests/pmf_blackbox_test.rs
@@ -8,7 +8,6 @@ const CODE_EXPR: &str = "mxsc:output/panic-message-features.mxsc.json";
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
-    blockchain.set_current_dir_from_workspace("contracts/examples/adder");
 
     blockchain.register_contract(CODE_EXPR, panic_message_features::ContractBuilder);
     blockchain
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 93db854e46..3921b15f91 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
@@ -2,7 +2,6 @@ use multiversx_sc_scenario::*;
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
-    blockchain.set_current_dir_from_workspace("contracts/feature-tests/panic-message-features");
 
     blockchain.register_partial_contract::<panic_message_features::AbiProvider, _>(
         "mxsc:output/panic-message-features.mxsc.json",
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 82581c8170..6096bbe339 100644
--- a/contracts/feature-tests/payable-features/tests/payable_blackbox_test.rs
+++ b/contracts/feature-tests/payable-features/tests/payable_blackbox_test.rs
@@ -4,7 +4,6 @@ const PF_PATH_EXPR: &str = "mxsc:output/payable-features.mxsc.json";
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
-    blockchain.set_current_dir_from_workspace("contracts/feature-tests/payable-features");
 
     blockchain.register_contract(PF_PATH_EXPR, payable_features::ContractBuilder);
     blockchain
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 4e88c1cd75..bd2f75753b 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
@@ -2,7 +2,6 @@ use multiversx_sc_scenario::*;
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
-    blockchain.set_current_dir_from_workspace("contracts/feature-tests/payable-features");
     blockchain.register_contract(
         "mxsc:output/payable-features.mxsc.json",
         payable_features::ContractBuilder,
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..40aaa7f4fe 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
@@ -2,9 +2,6 @@ use multiversx_sc_scenario::*;
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
-    blockchain
-        .set_current_dir_from_workspace("contracts/feature-tests/rust-testing-framework-tester");
-
     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 b47c83fcef..afdabb5199 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
@@ -5,9 +5,6 @@ const WASM_PATH_EXPR: &str = "mxsc:output/rust-testing-framework-tester.mxsc.jso
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
-    blockchain
-        .set_current_dir_from_workspace("contracts/feature_tests/rust-testing-framework-tester");
-
     blockchain.register_contract(
         WASM_PATH_EXPR,
         rust_testing_framework_tester::ContractBuilder,
diff --git a/contracts/feature-tests/scenario-tester/tests/st_blackbox_chained_test.rs b/contracts/feature-tests/scenario-tester/tests/st_blackbox_chained_test.rs
index 71b8a982c5..755647bb7b 100644
--- a/contracts/feature-tests/scenario-tester/tests/st_blackbox_chained_test.rs
+++ b/contracts/feature-tests/scenario-tester/tests/st_blackbox_chained_test.rs
@@ -7,7 +7,6 @@ const ADDER_PATH_EXPR: &str = "mxsc:output/scenario-tester.mxsc.json";
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
-    blockchain.set_current_dir_from_workspace("contracts/feature-tests/scenario-tester");
 
     blockchain.register_contract(ADDER_PATH_EXPR, scenario_tester::ContractBuilder);
     blockchain
diff --git a/contracts/feature-tests/scenario-tester/tests/st_blackbox_legacy_proxy_test.rs b/contracts/feature-tests/scenario-tester/tests/st_blackbox_legacy_proxy_test.rs
index f62672bb36..cdc7f071ff 100644
--- a/contracts/feature-tests/scenario-tester/tests/st_blackbox_legacy_proxy_test.rs
+++ b/contracts/feature-tests/scenario-tester/tests/st_blackbox_legacy_proxy_test.rs
@@ -12,7 +12,6 @@ const CODE_EXPR: MxscPath = MxscPath::new("output/adder.mxsc.json");
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
-    blockchain.set_current_dir_from_workspace("contracts/examples/adder");
 
     blockchain.register_contract(ADDER_PATH_EXPR, scenario_tester::ContractBuilder);
     blockchain
diff --git a/contracts/feature-tests/scenario-tester/tests/st_blackbox_raw_steps_test.rs b/contracts/feature-tests/scenario-tester/tests/st_blackbox_raw_steps_test.rs
index fc6b5d02a0..68ac9b8d39 100644
--- a/contracts/feature-tests/scenario-tester/tests/st_blackbox_raw_steps_test.rs
+++ b/contracts/feature-tests/scenario-tester/tests/st_blackbox_raw_steps_test.rs
@@ -4,7 +4,6 @@ const SCENARIO_TESTER_PATH_EXPR: &str = "mxsc:output/scenario-tester.mxsc.json";
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
-    blockchain.set_current_dir_from_workspace("contracts/feature-tests/scenario-tester");
 
     blockchain.register_contract(SCENARIO_TESTER_PATH_EXPR, scenario_tester::ContractBuilder);
     blockchain
diff --git a/contracts/feature-tests/scenario-tester/tests/st_blackbox_test.rs b/contracts/feature-tests/scenario-tester/tests/st_blackbox_test.rs
index e4ab2b4b4d..cdcf610b25 100644
--- a/contracts/feature-tests/scenario-tester/tests/st_blackbox_test.rs
+++ b/contracts/feature-tests/scenario-tester/tests/st_blackbox_test.rs
@@ -15,7 +15,6 @@ const NFT_ID: TestTokenIdentifier = TestTokenIdentifier::new("NFT-123456");
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
-    blockchain.set_current_dir_from_workspace("contracts/examples/scenario-tester");
 
     blockchain.register_contract(
         SC_SCENARIO_TESTER_PATH_EXPR,
diff --git a/contracts/feature-tests/scenario-tester/tests/st_blackbox_upgrade_test.rs b/contracts/feature-tests/scenario-tester/tests/st_blackbox_upgrade_test.rs
index 786fea9725..3242739239 100644
--- a/contracts/feature-tests/scenario-tester/tests/st_blackbox_upgrade_test.rs
+++ b/contracts/feature-tests/scenario-tester/tests/st_blackbox_upgrade_test.rs
@@ -4,7 +4,6 @@ const ADDER_PATH_EXPR: &str = "mxsc:output/scenario-tester.mxsc.json";
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
-    blockchain.set_current_dir_from_workspace("contracts/feature-tests/scenario-tester");
 
     blockchain.register_contract(
         "mxsc:output/scenario-tester.mxsc.json",
diff --git a/contracts/feature-tests/scenario-tester/tests/st_scenario_rs_test.rs b/contracts/feature-tests/scenario-tester/tests/st_scenario_rs_test.rs
index 32f289733d..6695bcb89c 100644
--- a/contracts/feature-tests/scenario-tester/tests/st_scenario_rs_test.rs
+++ b/contracts/feature-tests/scenario-tester/tests/st_scenario_rs_test.rs
@@ -2,7 +2,6 @@ use multiversx_sc_scenario::*;
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
-    blockchain.set_current_dir_from_workspace("contracts/feature-tests/scenario-tester");
 
     blockchain.register_contract(
         "mxsc:output/scenario-tester.mxsc.json",
diff --git a/contracts/feature-tests/scenario-tester/tests/st_whitebox_test.rs b/contracts/feature-tests/scenario-tester/tests/st_whitebox_test.rs
index 072292ed91..a6318b1f7f 100644
--- a/contracts/feature-tests/scenario-tester/tests/st_whitebox_test.rs
+++ b/contracts/feature-tests/scenario-tester/tests/st_whitebox_test.rs
@@ -5,7 +5,6 @@ const ADDER_PATH_EXPR: &str = "mxsc:output/scenario-tester.mxsc.json";
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
-    blockchain.set_current_dir_from_workspace("contracts/feature-tests/scenario-tester");
 
     blockchain.register_contract(
         "mxsc:output/scenario-tester.mxsc.json",
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 267639fd6f..72b15aac66 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
@@ -31,7 +31,6 @@ pub struct Payment {
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
-    blockchain.set_current_dir_from_workspace("contracts/features-tests/use-module");
 
     blockchain.register_contract(USE_MODULE_PATH_EXPR, use_module::ContractBuilder);
     blockchain
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 049936bb44..612fa725df 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
@@ -21,7 +21,6 @@ const USE_MODULE_PATH_EXPR: &str = "mxsc:output/use-module.mxsc.json";
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
-    blockchain.set_current_dir_from_workspace("contracts/features-tests/use-module");
 
     blockchain.register_contract(USE_MODULE_PATH_EXPR, use_module::ContractBuilder);
     blockchain
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 3f723c323a..803992d49b 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
@@ -33,8 +33,6 @@ const SECOND_URIS: &[&[u8]] = &[b"cool.com/safe_file.exe"];
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
-    blockchain.set_current_dir_from_workspace("contracts/features-tests/use-module");
-
     blockchain.register_contract(USE_MODULE_PATH_EXPR, use_module::ContractBuilder);
     blockchain
 }
diff --git a/contracts/feature-tests/use-module/tests/use_module_abi_test.rs b/contracts/feature-tests/use-module/tests/use_module_abi_test.rs
index 1091e76aa4..b482115e5f 100644
--- a/contracts/feature-tests/use-module/tests/use_module_abi_test.rs
+++ b/contracts/feature-tests/use-module/tests/use_module_abi_test.rs
@@ -5,8 +5,7 @@ use std::{fs, fs::File, io::Write};
 
 #[test]
 fn use_module_abi_generated_ok() {
-    let mut blockchain = ScenarioWorld::new();
-    blockchain.set_current_dir_from_workspace("contracts/feature-tests/use-module");
+    let blockchain = ScenarioWorld::new();
 
     // generate ABI
     let multi_contract_config = multiversx_sc_meta::multi_contract_config::<use_module::AbiProvider>(
diff --git a/framework/scenario/tests/scenarios_self_test.rs b/framework/scenario/tests/scenarios_self_test.rs
index df3c6e310e..e45c7ab01e 100644
--- a/framework/scenario/tests/scenarios_self_test.rs
+++ b/framework/scenario/tests/scenarios_self_test.rs
@@ -4,7 +4,6 @@ use multiversx_sc_scenario::*;
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
-    blockchain.set_current_dir_from_workspace("framework/scenario");
     blockchain
 }
 

From 34a3f2a302ca93c34fe679454b4664e179bcef60 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Wed, 22 May 2024 16:12:43 +0300
Subject: [PATCH 0905/1254] added tests for unordered set mapper read from
 address

---
 .../storage_mapper_get_at_address.scen.json   | 67 ++++++++++++++++++-
 .../src/storage_mapper_get_at_address.rs      | 26 +++++++
 .../basic-features/wasm/src/lib.rs            |  7 +-
 3 files changed, 97 insertions(+), 3 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 ffa1bbb620..3076c1e82b 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
@@ -303,6 +303,71 @@
                 "gas": "*",
                 "refund": "*"
             }
+        },
+        {
+            "step": "scCall",
+            "id": "fill unordered set mapper",
+            "tx": {
+                "from": "address:an_account",
+                "to": "sc:to-be-called",
+                "function": "fill_unordered_set_mapper",
+                "arguments": [
+                    "10"
+                ],
+                "gasLimit": "50,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": [],
+                "status": "",
+                "logs": "*",
+                "gas": "*",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "contains unordered at address",
+            "tx": {
+                "from": "address:an_account",
+                "to": "sc:caller",
+                "function": "contains_unordered_at_address",
+                "arguments": ["5"],
+                "gasLimit": "50,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": [
+                    "0x01"
+                ],
+                "status": "",
+                "logs": "*",
+                "gas": "*",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "get by index at address",
+            "tx": {
+                "from": "address:an_account",
+                "to": "sc:caller",
+                "function": "get_by_index",
+                "arguments": [
+                    "5"
+                ],
+                "gasLimit": "50,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": [
+                    "5"
+                ],
+                "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 7970619957..35ef02b905 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
@@ -86,6 +86,22 @@ pub trait StorageMapperGetAtAddress {
         mapper.values().collect()
     }
 
+    #[endpoint]
+    fn contains_unordered_at_address(&self, item: u32) -> bool {
+        let address = self.contract_address().get();
+        let mapper: UnorderedSetMapper<u32, _> =
+            UnorderedSetMapper::new_from_address(address, StorageKey::from("unordered_set_mapper"));
+        mapper.contains(&item)
+    }
+
+    #[endpoint]
+    fn get_by_index(&self, index: usize) -> u32 {
+        let address = self.contract_address().get();
+        let mapper: UnorderedSetMapper<u32, _> =
+            UnorderedSetMapper::new_from_address(address, StorageKey::from("unordered_set_mapper"));
+        mapper.get_by_index(index)
+    }
+
     /// Storage to be called. For testing, this contract is deployed twice,
     /// and this module acts both as caller and receiver
     #[storage_mapper("set_mapper")]
@@ -94,6 +110,9 @@ pub trait StorageMapperGetAtAddress {
     #[storage_mapper("map_mapper")]
     fn map_mapper(&self) -> MapMapper<u32, u32>;
 
+    #[storage_mapper("unordered_set_mapper")]
+    fn unordered_set_mapper(&self) -> UnorderedSetMapper<u32>;
+
     #[endpoint]
     fn fill_set_mapper(&self, value: u32) {
         for item in 1u32..=value {
@@ -108,4 +127,11 @@ pub trait StorageMapperGetAtAddress {
             self.map_mapper().insert(key, item);
         }
     }
+
+    #[endpoint]
+    fn fill_unordered_set_mapper(&self, value: u32) {
+        for item in 1u32..=value {
+            self.unordered_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 de77a1fc25..6dcb5c59be 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:                          386
+// Endpoints:                          389
 // Async Callback:                       1
-// Total number of exported functions: 388
+// Total number of exported functions: 391
 
 #![no_std]
 
@@ -402,8 +402,11 @@ multiversx_sc_wasm_adapter::endpoints! {
         back_at_address => back_at_address
         keys_at_address => keys_at_address
         values_at_address => values_at_address
+        contains_unordered_at_address => contains_unordered_at_address
+        get_by_index => get_by_index
         fill_set_mapper => fill_set_mapper
         fill_map_mapper => fill_map_mapper
+        fill_unordered_set_mapper => fill_unordered_set_mapper
     )
 }
 

From 1ec2ff452e20fb13eef17f7eaec122e72923ef0f Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 22 May 2024 16:12:49 +0300
Subject: [PATCH 0906/1254] Deprecated set_current_dir_from_workspace

---
 framework/scenario/src/facade/scenario_world.rs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/framework/scenario/src/facade/scenario_world.rs b/framework/scenario/src/facade/scenario_world.rs
index f5b05024bd..5dc97b66ab 100644
--- a/framework/scenario/src/facade/scenario_world.rs
+++ b/framework/scenario/src/facade/scenario_world.rs
@@ -103,8 +103,11 @@ impl ScenarioWorld {
         self
     }
 
-    /// Tells the tests where the crate lies relative to the workspace.
-    /// This ensures that the paths are set correctly, including in debug mode.
+    /// Older versions of the Rust compiler were setting a wrong path in the environment when debugging.
+    /// This method was made as a workaround to avoid this problem.
+    ///
+    /// Fortunately, the issue was fixed in Rust, and so this function is no longer necessary.
+    #[deprecated(since = "0.50.2", note = "No longer needed, simply delete.")]
     pub fn set_current_dir_from_workspace(&mut self, relative_path: &str) -> &mut Self {
         let mut path = find_current_workspace().unwrap();
         path.push(relative_path);

From 0f9e252e3ec2505ade16c54ddb9f140072d9808f Mon Sep 17 00:00:00 2001
From: Alin Cruceat <alyn_509@yahoo.com>
Date: Thu, 23 May 2024 14:10:51 +0300
Subject: [PATCH 0907/1254] Crypto Zombies renames & small fixes

---
 .../examples/crypto-zombies/src/kitty_obj.rs  | 14 +++++++------
 .../examples/crypto-zombies/src/storage.rs    | 20 +++++++++----------
 .../crypto-zombies/src/zombie_factory.rs      |  4 ++--
 .../crypto-zombies/src/zombie_feeding.rs      |  4 ++--
 .../examples/crypto-zombies/wasm/src/lib.rs   |  2 +-
 5 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/contracts/examples/crypto-zombies/src/kitty_obj.rs b/contracts/examples/crypto-zombies/src/kitty_obj.rs
index acdc23cfca..5ba10f51e5 100644
--- a/contracts/examples/crypto-zombies/src/kitty_obj.rs
+++ b/contracts/examples/crypto-zombies/src/kitty_obj.rs
@@ -1,6 +1,6 @@
 use multiversx_sc::derive_imports::*;
-
-#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, TypeAbi)]
+#[type_abi]
+#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct Kitty {
     pub genes: KittyGenes,
     pub birth_time: u64,   // timestamp
@@ -12,14 +12,16 @@ pub struct Kitty {
     pub generation: u16,     // max(sire_gen, matron_gen) + 1. Generation also influences cooldown.
 }
 
-#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, TypeAbi)]
+#[type_abi]
+#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct KittyGenes {
     pub fur_color: Color,
     pub eye_color: Color,
     pub meow_power: u8, // the higher the value, the louder the cat
 }
 
-#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, TypeAbi)]
+#[type_abi]
+#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct Color {
     pub r: u8,
     pub g: u8,
@@ -28,13 +30,13 @@ pub struct Color {
 
 impl KittyGenes {
     pub fn get_as_u64(&self) -> u64 {
-        (self.fur_color.as_u64() << 12 | self.eye_color.as_u64()) << 4
+        (self.fur_color.as_u64() << 24 | self.eye_color.as_u64()) << 8
             | self.meow_power.to_be() as u64
     }
 }
 
 impl Color {
     pub fn as_u64(&self) -> u64 {
-        ((self.r.to_be() as u64) << 4 | self.r.to_be() as u64) << 4 | self.r.to_be() as u64
+        ((self.r.to_be() as u64) << 8 | self.r.to_be() as u64) << 8 | self.r.to_be() as u64
     }
 }
diff --git a/contracts/examples/crypto-zombies/src/storage.rs b/contracts/examples/crypto-zombies/src/storage.rs
index 608456b688..6670547064 100644
--- a/contracts/examples/crypto-zombies/src/storage.rs
+++ b/contracts/examples/crypto-zombies/src/storage.rs
@@ -5,39 +5,39 @@ use crate::zombie::Zombie;
 #[multiversx_sc::module]
 pub trait Storage {
     #[view]
-    #[storage_mapper("dna_digits")]
+    #[storage_mapper("dnaDigits")]
     fn dna_digits(&self) -> SingleValueMapper<u8>;
 
     #[view]
-    #[storage_mapper("zombies_count")]
-    fn zombies_count(&self) -> SingleValueMapper<usize>;
+    #[storage_mapper("zombieLastIndex")]
+    fn zombie_last_index(&self) -> SingleValueMapper<usize>;
 
     #[view]
     #[storage_mapper("zombies")]
     fn zombies(&self, id: &usize) -> SingleValueMapper<Zombie<Self::Api>>;
 
     #[view]
-    #[storage_mapper("zombie_owner")]
+    #[storage_mapper("zombieOwner")]
     fn zombie_owner(&self, id: &usize) -> SingleValueMapper<ManagedAddress>;
 
     #[view]
-    #[storage_mapper("crypto_kitties_sc_address")]
+    #[storage_mapper("cryptoKittiesScAddress")]
     fn crypto_kitties_sc_address(&self) -> SingleValueMapper<ManagedAddress>;
 
     #[view]
-    #[storage_mapper("cooldown_time")]
+    #[storage_mapper("cooldownTime")]
     fn cooldown_time(&self) -> SingleValueMapper<u64>;
 
     #[view]
-    #[storage_mapper("owned_zombies")]
+    #[storage_mapper("ownedZombies")]
     fn owned_zombies(&self, owner: &ManagedAddress) -> UnorderedSetMapper<usize>;
 
-    #[storage_mapper("attack_victory_probability")]
+    #[storage_mapper("attackVictoryProbability")]
     fn attack_victory_probability(&self) -> SingleValueMapper<u8>;
 
-    #[storage_mapper("level_up_fee")]
+    #[storage_mapper("levelUpFee")]
     fn level_up_fee(&self) -> SingleValueMapper<BigUint>;
 
-    #[storage_mapper("collected_fees")]
+    #[storage_mapper("collectedFees")]
     fn collected_fees(&self) -> SingleValueMapper<BigUint>;
 }
diff --git a/contracts/examples/crypto-zombies/src/zombie_factory.rs b/contracts/examples/crypto-zombies/src/zombie_factory.rs
index 3ee8339b9c..996c339e82 100644
--- a/contracts/examples/crypto-zombies/src/zombie_factory.rs
+++ b/contracts/examples/crypto-zombies/src/zombie_factory.rs
@@ -5,7 +5,7 @@ use crate::{storage, zombie::Zombie};
 #[multiversx_sc::module]
 pub trait ZombieFactory: storage::Storage {
     fn create_zombie(&self, owner: ManagedAddress, name: ManagedBuffer, dna: u64) {
-        self.zombies_count().update(|id| {
+        self.zombie_last_index().update(|id| {
             self.new_zombie_event(*id, &name, dna);
             self.zombies(id).set(Zombie {
                 name,
@@ -40,7 +40,7 @@ pub trait ZombieFactory: storage::Storage {
         self.create_zombie(caller, name, rand_dna);
     }
 
-    #[event("new_zombie_event")]
+    #[event("newZombieEvent")]
     fn new_zombie_event(
         &self,
         #[indexed] zombie_id: usize,
diff --git a/contracts/examples/crypto-zombies/src/zombie_feeding.rs b/contracts/examples/crypto-zombies/src/zombie_feeding.rs
index f98e48452b..8061e5f7f6 100644
--- a/contracts/examples/crypto-zombies/src/zombie_feeding.rs
+++ b/contracts/examples/crypto-zombies/src/zombie_feeding.rs
@@ -1,6 +1,6 @@
 use multiversx_sc::imports::*;
 
-use crate::{kitty_ownership_proxy, storage, zombie_factory, zombie_helper};
+use crate::{kitty_obj::Kitty, kitty_ownership_proxy, storage, zombie_factory, zombie_helper};
 
 #[multiversx_sc::module]
 pub trait ZombieFeeding:
@@ -38,7 +38,7 @@ pub trait ZombieFeeding:
     #[callback]
     fn get_kitty_callback(
         &self,
-        #[call_result] result: ManagedAsyncCallResult<crate::kitty_obj::Kitty>,
+        #[call_result] result: ManagedAsyncCallResult<Kitty>,
         zombie_id: usize,
     ) {
         match result {
diff --git a/contracts/examples/crypto-zombies/wasm/src/lib.rs b/contracts/examples/crypto-zombies/wasm/src/lib.rs
index 9cfc27bbd9..932b3865a6 100644
--- a/contracts/examples/crypto-zombies/wasm/src/lib.rs
+++ b/contracts/examples/crypto-zombies/wasm/src/lib.rs
@@ -26,7 +26,7 @@ multiversx_sc_wasm_adapter::endpoints! {
         is_ready => is_ready
         feed_on_kitty => feed_on_kitty
         dna_digits => dna_digits
-        zombies_count => zombies_count
+        zombie_last_index => zombie_last_index
         zombies => zombies
         zombie_owner => zombie_owner
         crypto_kitties_sc_address => crypto_kitties_sc_address

From 804e72dd8be8498cdbc9cfe7a3eb985b9ded3f1b Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Thu, 23 May 2024 16:54:54 +0300
Subject: [PATCH 0908/1254] impl upgrade in scenario env

---
 .../adder/tests/adder_blackbox_test.rs        | 13 ++++
 .../src/facade/world_tx/scenario_exec_call.rs | 33 ++++++++++-
 .../scenario/tx_to_step/tx_to_step_call.rs    | 59 ++++++++++++++++++-
 3 files changed, 100 insertions(+), 5 deletions(-)

diff --git a/contracts/examples/adder/tests/adder_blackbox_test.rs b/contracts/examples/adder/tests/adder_blackbox_test.rs
index 73d6fecd5f..9f155c4e3a 100644
--- a/contracts/examples/adder/tests/adder_blackbox_test.rs
+++ b/contracts/examples/adder/tests/adder_blackbox_test.rs
@@ -63,5 +63,18 @@ fn adder_blackbox() {
         .check_account(ADDER_ADDRESS)
         .check_storage("str:sum", "6");
 
+    world
+        .tx()
+        .from(OWNER_ADDRESS)
+        .to(ADDER_ADDRESS)
+        .typed(adder_proxy::AdderProxy)
+        .upgrade(100u64)
+        .code(CODE_PATH)
+        .run();
+
+    world
+        .check_account(ADDER_ADDRESS)
+        .check_storage("str:sum", "100");
+
     world.write_scenario_trace("trace1.scen.json");
 }
diff --git a/framework/scenario/src/facade/world_tx/scenario_exec_call.rs b/framework/scenario/src/facade/world_tx/scenario_exec_call.rs
index 42a29ef378..8905c7d14d 100644
--- a/framework/scenario/src/facade/world_tx/scenario_exec_call.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_exec_call.rs
@@ -1,14 +1,15 @@
 use multiversx_sc::{
     tuple_util::NestedTupleFlatten,
     types::{
-        heap::H256, FunctionCall, ManagedAddress, ManagedBuffer, RHListExec, Tx, TxBaseWithEnv,
-        TxEnv, TxEnvMockDeployAddress, TxEnvWithTxHash, TxFromSpecified, TxGas, TxPayment,
-        TxToSpecified,
+        heap::H256, Code, FunctionCall, ManagedAddress, ManagedBuffer, NotPayable, RHListExec, Tx,
+        TxBaseWithEnv, TxEnv, TxEnvMockDeployAddress, TxEnvWithTxHash, TxFromSpecified, TxGas,
+        TxPayment, TxToSpecified, UpgradeCall,
     },
 };
 
 use crate::{
     api::StaticApi,
+    imports::MxscPath,
     scenario::tx_to_step::{address_annotated, TxToStep},
     scenario_model::{SetStateStep, TxExpect, TxResponse},
     ScenarioTxEnv, ScenarioTxRun, ScenarioWorld,
@@ -90,6 +91,32 @@ where
     }
 }
 
+impl<'w, From, To, RH> ScenarioTxRun
+    for Tx<
+        ScenarioEnvExec<'w>,
+        From,
+        To,
+        NotPayable,
+        (),
+        UpgradeCall<ScenarioEnvExec<'w>, Code<MxscPath<'w>>>,
+        RH,
+    >
+where
+    From: TxFromSpecified<ScenarioEnvExec<'w>>,
+    To: TxToSpecified<ScenarioEnvExec<'w>>,
+    RH: RHListExec<TxResponse, ScenarioEnvExec<'w>>,
+    RH::ListReturns: NestedTupleFlatten,
+{
+    type Returns = <RH::ListReturns as NestedTupleFlatten>::Unpacked;
+
+    fn run(self) -> Self::Returns {
+        let mut step_wrapper = self.tx_to_step();
+        step_wrapper.step.explicit_tx_hash = core::mem::take(&mut step_wrapper.env.data.tx_hash);
+        step_wrapper.env.world.sc_call(&mut step_wrapper.step);
+        step_wrapper.process_result()
+    }
+}
+
 impl<'w> TxEnvWithTxHash for ScenarioEnvExec<'w> {
     fn set_tx_hash(&mut self, tx_hash: H256) {
         assert!(self.data.tx_hash.is_none(), "tx hash set twice");
diff --git a/framework/scenario/src/scenario/tx_to_step/tx_to_step_call.rs b/framework/scenario/src/scenario/tx_to_step/tx_to_step_call.rs
index 7daa8ac810..475326eac7 100644
--- a/framework/scenario/src/scenario/tx_to_step/tx_to_step_call.rs
+++ b/framework/scenario/src/scenario/tx_to_step/tx_to_step_call.rs
@@ -1,8 +1,13 @@
 use multiversx_sc::types::{
-    FunctionCall, RHListExec, Tx, TxEnv, TxFromSpecified, TxGas, TxPayment, TxToSpecified,
+    Code, FunctionCall, NotPayable, RHListExec, Tx, TxEnv, TxFromSpecified, TxGas, TxPayment,
+    TxToSpecified, UpgradeCall,
 };
 
-use crate::scenario_model::{ScCallStep, TxESDT, TxExpect, TxResponse};
+use crate::{
+    imports::MxscPath,
+    scenario_model::{ScCallStep, TxESDT, TxExpect, TxResponse},
+    ScenarioEnvExec,
+};
 
 use super::{address_annotated, gas_annotated, StepWrapper, TxToStep};
 
@@ -75,3 +80,53 @@ where
 
     step
 }
+
+impl<'w, From, To, RH> TxToStep<ScenarioEnvExec<'w>, RH>
+    for Tx<
+        ScenarioEnvExec<'w>,
+        From,
+        To,
+        NotPayable,
+        (),
+        UpgradeCall<ScenarioEnvExec<'w>, Code<MxscPath<'w>>>,
+        RH,
+    >
+where
+    From: TxFromSpecified<ScenarioEnvExec<'w>>,
+    To: TxToSpecified<ScenarioEnvExec<'w>>,
+    RH: RHListExec<TxResponse, ScenarioEnvExec<'w>>,
+{
+    type Step = ScCallStep;
+
+    fn tx_to_step(self) -> StepWrapper<ScenarioEnvExec<'w>, Self::Step, RH> {
+        let mut step = tx_to_sc_call_upgrade_step(&self.env, self.from, self.to, self.data);
+        step.expect = Some(self.result_handler.list_tx_expect());
+
+        StepWrapper {
+            env: self.env,
+            step,
+            result_handler: self.result_handler,
+        }
+    }
+}
+
+pub fn tx_to_sc_call_upgrade_step<'a, 'w: 'a, From, To>(
+    env: &'a ScenarioEnvExec<'w>,
+    from: From,
+    to: To,
+    data: UpgradeCall<ScenarioEnvExec<'w>, Code<MxscPath>>,
+) -> ScCallStep
+where
+    From: TxFromSpecified<ScenarioEnvExec<'w>>,
+    To: TxToSpecified<ScenarioEnvExec<'w>>,
+{
+    let mut step = ScCallStep::new()
+        .from(address_annotated(env, &from))
+        .to(address_annotated(env, &to))
+        .function("upgrade");
+    for arg in data.arg_buffer.iter_buffers() {
+        step.tx.arguments.push(arg.to_vec().into());
+    }
+
+    step
+}

From 6ed982689bafc2fc6bcedb84008de2f2b928326a Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Thu, 23 May 2024 17:05:11 +0300
Subject: [PATCH 0909/1254] sc-meta all proxy --compare impl

---
 .github/workflows/proxy-compare.yml           | 31 +++++++++++++++++++
 .../meta/src/cli_args/cli_args_contract.rs    | 22 +++++++++++--
 framework/meta/src/cmd/contract.rs            |  8 ++++-
 .../contract/generate_proxy/proxy_gen_main.rs | 27 ++++++++++++++++
 .../generate_proxy/proxy_generator.rs         | 10 +++---
 5 files changed, 90 insertions(+), 8 deletions(-)
 create mode 100644 .github/workflows/proxy-compare.yml

diff --git a/.github/workflows/proxy-compare.yml b/.github/workflows/proxy-compare.yml
new file mode 100644
index 0000000000..3eef6460d6
--- /dev/null
+++ b/.github/workflows/proxy-compare.yml
@@ -0,0 +1,31 @@
+name: CI
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+
+jobs:
+  proxy_compare:
+    name: Proxy compare - newly generated vs present in file tree
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Install rust
+        uses: actions-rust-lang/setup-rust-toolchain@v1
+        with:
+          default: true
+          toolchain: stable
+          target: wasm32-unknown-unknown
+
+      - name: Install prerequisites
+        run: |
+          cargo install --path framework/meta
+
+      - name: Run proxy compare
+        run: |
+          cd contracts
+          sc-meta all proxy --compare
diff --git a/framework/meta/src/cli_args/cli_args_contract.rs b/framework/meta/src/cli_args/cli_args_contract.rs
index e05146a9bc..4a7f0ee4c7 100644
--- a/framework/meta/src/cli_args/cli_args_contract.rs
+++ b/framework/meta/src/cli_args/cli_args_contract.rs
@@ -71,7 +71,7 @@ pub enum ContractCliAction {
         name = "proxy",
         about = "Generates a proxy, based on the contract ABI."
     )]
-    GenerateProxies,
+    GenerateProxies(GenerateProxyArgs),
 }
 
 impl CliArgsToRaw for ContractCliAction {
@@ -103,8 +103,9 @@ impl CliArgsToRaw for ContractCliAction {
                 raw.push("snippets".to_string());
                 raw.append(&mut args.to_raw());
             },
-            ContractCliAction::GenerateProxies => {
+            ContractCliAction::GenerateProxies(args) => {
                 raw.push("proxy".to_string());
+                raw.append(&mut args.to_raw());
             },
         }
         raw
@@ -127,3 +128,20 @@ impl CliArgsToRaw for GenerateSnippetsArgs {
         raw
     }
 }
+
+#[derive(Default, Clone, PartialEq, Eq, Debug, Args)]
+pub struct GenerateProxyArgs {
+    /// Runs proxy comparison (newly generated vs already present on disk).
+    #[arg(long, verbatim_doc_comment)]
+    pub compare: bool,
+}
+
+impl CliArgsToRaw for GenerateProxyArgs {
+    fn to_raw(&self) -> Vec<String> {
+        let mut raw = Vec::new();
+        if self.compare {
+            raw.push("--compare".to_string());
+        }
+        raw
+    }
+}
diff --git a/framework/meta/src/cmd/contract.rs b/framework/meta/src/cmd/contract.rs
index 3e1008a3a3..4076f8393d 100644
--- a/framework/meta/src/cmd/contract.rs
+++ b/framework/meta/src/cmd/contract.rs
@@ -33,7 +33,13 @@ pub fn cli_main<AbiObj: ContractAbiProvider>() {
             meta_config_opt.generate_rust_snippets(&gs_arg);
             meta_config_opt.generate_proxy()
         },
-        ContractCliAction::GenerateProxies => meta_config_opt.generate_proxy(),
+        ContractCliAction::GenerateProxies(proxy_args) => {
+            if proxy_args.compare {
+                meta_config_opt.compare_proxy()
+            } else {
+                meta_config_opt.generate_proxy()
+            }
+        },
     }
 }
 
diff --git a/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_main.rs b/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_main.rs
index 0619a65cb5..3529e736b4 100644
--- a/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_main.rs
+++ b/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_main.rs
@@ -1,3 +1,6 @@
+use colored::Colorize;
+use std::fs;
+
 use multiversx_sc::abi::ContractAbi;
 
 use crate::cmd::contract::sc_config::ProxyConfigSerde;
@@ -6,6 +9,8 @@ use super::{
     super::meta_config::MetaConfig, proxy_crate_gen::create_file, proxy_generator::ProxyGenerator,
 };
 
+const PROXY_COMPARE_ERR_MSG: &str = "Contract has been modified and proxies have not been updated. Regenerate proxies to avoid inconsistencies.";
+
 impl MetaConfig {
     pub fn generate_proxy(&mut self) {
         let default_proxy = ProxyConfigSerde::new();
@@ -14,6 +19,28 @@ impl MetaConfig {
             write_proxy_with_explicit_path(&proxy_config, self);
         }
     }
+
+    pub fn compare_proxy(&mut self) {
+        for proxy_config in self.sc_config.proxy_configs.clone() {
+            compare_proxy_explicit_path(&proxy_config, self);
+        }
+    }
+}
+
+fn compare_proxy_explicit_path(proxy_config: &ProxyConfigSerde, meta_config: &MetaConfig) {
+    let contract_abi = extract_contract_abi(proxy_config, meta_config);
+    let mut temp = Vec::<u8>::new();
+    let mut proxy_generator =
+        ProxyGenerator::new(meta_config, &mut temp, proxy_config, contract_abi);
+    proxy_generator.write_proxy_to_file();
+
+    let existent_proxy_path = format!("../{}", proxy_config.path);
+    let existent_proxy = fs::read_to_string(existent_proxy_path).unwrap();
+    let newly_gen_proxy = String::from_utf8(temp).unwrap();
+
+    if existent_proxy != newly_gen_proxy {
+        panic!("{}", PROXY_COMPARE_ERR_MSG.to_string().red());
+    }
 }
 
 fn write_proxy_with_explicit_path(proxy_config: &ProxyConfigSerde, meta_config: &MetaConfig) {
diff --git a/framework/meta/src/cmd/contract/generate_proxy/proxy_generator.rs b/framework/meta/src/cmd/contract/generate_proxy/proxy_generator.rs
index 015d7afc90..79a25ad838 100644
--- a/framework/meta/src/cmd/contract/generate_proxy/proxy_generator.rs
+++ b/framework/meta/src/cmd/contract/generate_proxy/proxy_generator.rs
@@ -1,4 +1,4 @@
-use std::{fmt::Display, fs::File, io::Write};
+use std::fmt::Display;
 
 use multiversx_sc::abi::{
     ContractAbi, EndpointAbi, EnumVariantDescription, InputAbi, OutputAbi, StructFieldDescription,
@@ -41,7 +41,7 @@ const TYPES_FROM_FRAMEWORK: &[&str] = &[
 
 pub struct ProxyGenerator<'a> {
     pub meta_config: &'a MetaConfig,
-    pub file: Option<&'a mut File>,
+    pub file: Option<&'a mut dyn std::io::Write>,
     pub proxy_config: &'a ProxyConfigSerde,
     pub contract_abi: &'a ContractAbi,
 }
@@ -49,7 +49,7 @@ pub struct ProxyGenerator<'a> {
 impl<'a> ProxyGenerator<'a> {
     pub fn new(
         meta_config: &'a MetaConfig,
-        file: &'a mut File,
+        file: &'a mut dyn std::io::Write,
         proxy_config: &'a ProxyConfigSerde,
         contract_abi: &'a ContractAbi,
     ) -> Self {
@@ -62,8 +62,8 @@ impl<'a> ProxyGenerator<'a> {
     }
 
     fn write(&mut self, s: impl Display) {
-        let file = self.file.as_mut().expect("output not configured");
-        write!(*file, "{s}").unwrap();
+        let file = self.file.as_mut().unwrap();
+        file.write_all(s.to_string().as_bytes()).unwrap();
     }
 
     fn writeln(&mut self, s: impl Display) {

From fa76fc9bb21e1e6861e474ad314a8adfce410bbd Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 23 May 2024 20:56:52 +0300
Subject: [PATCH 0910/1254] proxy update

---
 contracts/examples/crypto-zombies/src/proxy_crypto_zombies.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/contracts/examples/crypto-zombies/src/proxy_crypto_zombies.rs b/contracts/examples/crypto-zombies/src/proxy_crypto_zombies.rs
index 561563132c..2a35082180 100644
--- a/contracts/examples/crypto-zombies/src/proxy_crypto_zombies.rs
+++ b/contracts/examples/crypto-zombies/src/proxy_crypto_zombies.rs
@@ -154,12 +154,12 @@ where
             .original_result()
     }
 
-    pub fn zombies_count(
+    pub fn zombie_last_index(
         self,
     ) -> TxTypedCall<Env, From, To, NotPayable, Gas, usize> {
         self.wrapped_tx
             .payment(NotPayable)
-            .raw_call("zombies_count")
+            .raw_call("zombie_last_index")
             .original_result()
     }
 

From 759b41f4aa03c6d329fa25f351ab60b61049055e Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 23 May 2024 22:22:44 +0300
Subject: [PATCH 0911/1254] renamed files in forwarder & forwarder-legacy

---
 .../src/forwarder_legacy_main.rs              | 44 +++++++++----------
 ...ync_legacy.rs => fwd_call_async_legacy.rs} |  0
 ...sync_legacy.rs => fwd_call_sync_legacy.rs} |  0
 ...gacy.rs => fwd_call_transf_exec_legacy.rs} |  0
 ...r_legacy.rs => fwd_change_owner_legacy.rs} |  0
 ..._deploy_legacy.rs => fwd_deploy_legacy.rs} |  0
 .../{esdt_legacy.rs => fwd_esdt_legacy.rs}    |  4 +-
 .../src/{nft_legacy.rs => fwd_nft_legacy.rs}  |  4 +-
 .../{roles_legacy.rs => fwd_roles_legacy.rs}  |  4 +-
 .../src/{sft_legacy.rs => fwd_sft_legacy.rs}  |  4 +-
 ...torage_legacy.rs => fwd_storage_legacy.rs} |  0
 ...pgrade_legacy.rs => fwd_upgrade_legacy.rs} |  0
 .../forwarder/src/forwarder_main.rs           | 44 +++++++++----------
 .../src/{call_async.rs => fwd_call_async.rs}  |  0
 .../src/{call_sync.rs => fwd_call_sync.rs}    |  0
 ...transf_exec.rs => fwd_call_transf_exec.rs} |  0
 ...ct_change_owner.rs => fwd_change_owner.rs} |  0
 .../src/{contract_deploy.rs => fwd_deploy.rs} |  0
 .../forwarder/src/{esdt.rs => fwd_esdt.rs}    |  4 +-
 .../forwarder/src/{nft.rs => fwd_nft.rs}      |  4 +-
 .../forwarder/src/{roles.rs => fwd_roles.rs}  |  4 +-
 .../forwarder/src/{sft.rs => fwd_sft.rs}      |  4 +-
 .../src/{storage.rs => fwd_storage.rs}        |  0
 .../{contract_upgrade.rs => fwd_upgrade.rs}   |  0
 .../tests/forwarder_blackbox_legacy_test.rs   |  2 +-
 .../tests/forwarder_whitebox_legacy_test.rs   |  2 +-
 .../tests/forwarder_whitebox_test.rs          |  2 +-
 .../tests/tester_whitebox_legacy_test.rs      |  2 +-
 28 files changed, 64 insertions(+), 64 deletions(-)
 rename contracts/feature-tests/composability/forwarder-legacy/src/{call_async_legacy.rs => fwd_call_async_legacy.rs} (100%)
 rename contracts/feature-tests/composability/forwarder-legacy/src/{call_sync_legacy.rs => fwd_call_sync_legacy.rs} (100%)
 rename contracts/feature-tests/composability/forwarder-legacy/src/{call_transf_exec_legacy.rs => fwd_call_transf_exec_legacy.rs} (100%)
 rename contracts/feature-tests/composability/forwarder-legacy/src/{contract_change_owner_legacy.rs => fwd_change_owner_legacy.rs} (100%)
 rename contracts/feature-tests/composability/forwarder-legacy/src/{contract_deploy_legacy.rs => fwd_deploy_legacy.rs} (100%)
 rename contracts/feature-tests/composability/forwarder-legacy/src/{esdt_legacy.rs => fwd_esdt_legacy.rs} (98%)
 rename contracts/feature-tests/composability/forwarder-legacy/src/{nft_legacy.rs => fwd_nft_legacy.rs} (98%)
 rename contracts/feature-tests/composability/forwarder-legacy/src/{roles_legacy.rs => fwd_roles_legacy.rs} (92%)
 rename contracts/feature-tests/composability/forwarder-legacy/src/{sft_legacy.rs => fwd_sft_legacy.rs} (94%)
 rename contracts/feature-tests/composability/forwarder-legacy/src/{storage_legacy.rs => fwd_storage_legacy.rs} (100%)
 rename contracts/feature-tests/composability/forwarder-legacy/src/{contract_upgrade_legacy.rs => fwd_upgrade_legacy.rs} (100%)
 rename contracts/feature-tests/composability/forwarder/src/{call_async.rs => fwd_call_async.rs} (100%)
 rename contracts/feature-tests/composability/forwarder/src/{call_sync.rs => fwd_call_sync.rs} (100%)
 rename contracts/feature-tests/composability/forwarder/src/{call_transf_exec.rs => fwd_call_transf_exec.rs} (100%)
 rename contracts/feature-tests/composability/forwarder/src/{contract_change_owner.rs => fwd_change_owner.rs} (100%)
 rename contracts/feature-tests/composability/forwarder/src/{contract_deploy.rs => fwd_deploy.rs} (100%)
 rename contracts/feature-tests/composability/forwarder/src/{esdt.rs => fwd_esdt.rs} (98%)
 rename contracts/feature-tests/composability/forwarder/src/{nft.rs => fwd_nft.rs} (98%)
 rename contracts/feature-tests/composability/forwarder/src/{roles.rs => fwd_roles.rs} (93%)
 rename contracts/feature-tests/composability/forwarder/src/{sft.rs => fwd_sft.rs} (95%)
 rename contracts/feature-tests/composability/forwarder/src/{storage.rs => fwd_storage.rs} (100%)
 rename contracts/feature-tests/composability/forwarder/src/{contract_upgrade.rs => fwd_upgrade.rs} (100%)

diff --git a/contracts/feature-tests/composability/forwarder-legacy/src/forwarder_legacy_main.rs b/contracts/feature-tests/composability/forwarder-legacy/src/forwarder_legacy_main.rs
index feae6a9965..e07c0a39c4 100644
--- a/contracts/feature-tests/composability/forwarder-legacy/src/forwarder_legacy_main.rs
+++ b/contracts/feature-tests/composability/forwarder-legacy/src/forwarder_legacy_main.rs
@@ -2,34 +2,34 @@
 #![allow(clippy::type_complexity)]
 #![allow(clippy::let_unit_value)]
 
-pub mod call_async_legacy;
-pub mod call_sync_legacy;
-pub mod call_transf_exec_legacy;
-pub mod contract_change_owner_legacy;
-pub mod contract_deploy_legacy;
-pub mod contract_upgrade_legacy;
-pub mod esdt_legacy;
-pub mod nft_legacy;
-pub mod roles_legacy;
-pub mod sft_legacy;
-pub mod storage_legacy;
+pub mod fwd_call_async_legacy;
+pub mod fwd_call_sync_legacy;
+pub mod fwd_call_transf_exec_legacy;
+pub mod fwd_change_owner_legacy;
+pub mod fwd_deploy_legacy;
+pub mod fwd_upgrade_legacy;
+pub mod fwd_esdt_legacy;
+pub mod fwd_nft_legacy;
+pub mod fwd_roles_legacy;
+pub mod fwd_sft_legacy;
+pub mod fwd_storage_legacy;
 
 multiversx_sc::imports!();
 
 /// Test contract for investigating backwards compatibility in smart contract calls.
 #[multiversx_sc::contract]
 pub trait ForwarderLegacy:
-    call_sync_legacy::ForwarderSyncCallModule
-    + call_async_legacy::ForwarderAsyncCallModule
-    + call_transf_exec_legacy::ForwarderTransferExecuteModule
-    + contract_change_owner_legacy::ChangeOwnerModule
-    + contract_deploy_legacy::DeployContractModule
-    + contract_upgrade_legacy::UpgradeContractModule
-    + esdt_legacy::ForwarderEsdtModule
-    + sft_legacy::ForwarderSftModule
-    + nft_legacy::ForwarderNftModule
-    + roles_legacy::ForwarderRolesModule
-    + storage_legacy::ForwarderStorageModule
+    fwd_call_sync_legacy::ForwarderSyncCallModule
+    + fwd_call_async_legacy::ForwarderAsyncCallModule
+    + fwd_call_transf_exec_legacy::ForwarderTransferExecuteModule
+    + fwd_change_owner_legacy::ChangeOwnerModule
+    + fwd_deploy_legacy::DeployContractModule
+    + fwd_upgrade_legacy::UpgradeContractModule
+    + fwd_esdt_legacy::ForwarderEsdtModule
+    + fwd_sft_legacy::ForwarderSftModule
+    + fwd_nft_legacy::ForwarderNftModule
+    + fwd_roles_legacy::ForwarderRolesModule
+    + fwd_storage_legacy::ForwarderStorageModule
 {
     #[init]
     fn init(&self) {}
diff --git a/contracts/feature-tests/composability/forwarder-legacy/src/call_async_legacy.rs b/contracts/feature-tests/composability/forwarder-legacy/src/fwd_call_async_legacy.rs
similarity index 100%
rename from contracts/feature-tests/composability/forwarder-legacy/src/call_async_legacy.rs
rename to contracts/feature-tests/composability/forwarder-legacy/src/fwd_call_async_legacy.rs
diff --git a/contracts/feature-tests/composability/forwarder-legacy/src/call_sync_legacy.rs b/contracts/feature-tests/composability/forwarder-legacy/src/fwd_call_sync_legacy.rs
similarity index 100%
rename from contracts/feature-tests/composability/forwarder-legacy/src/call_sync_legacy.rs
rename to contracts/feature-tests/composability/forwarder-legacy/src/fwd_call_sync_legacy.rs
diff --git a/contracts/feature-tests/composability/forwarder-legacy/src/call_transf_exec_legacy.rs b/contracts/feature-tests/composability/forwarder-legacy/src/fwd_call_transf_exec_legacy.rs
similarity index 100%
rename from contracts/feature-tests/composability/forwarder-legacy/src/call_transf_exec_legacy.rs
rename to contracts/feature-tests/composability/forwarder-legacy/src/fwd_call_transf_exec_legacy.rs
diff --git a/contracts/feature-tests/composability/forwarder-legacy/src/contract_change_owner_legacy.rs b/contracts/feature-tests/composability/forwarder-legacy/src/fwd_change_owner_legacy.rs
similarity index 100%
rename from contracts/feature-tests/composability/forwarder-legacy/src/contract_change_owner_legacy.rs
rename to contracts/feature-tests/composability/forwarder-legacy/src/fwd_change_owner_legacy.rs
diff --git a/contracts/feature-tests/composability/forwarder-legacy/src/contract_deploy_legacy.rs b/contracts/feature-tests/composability/forwarder-legacy/src/fwd_deploy_legacy.rs
similarity index 100%
rename from contracts/feature-tests/composability/forwarder-legacy/src/contract_deploy_legacy.rs
rename to contracts/feature-tests/composability/forwarder-legacy/src/fwd_deploy_legacy.rs
diff --git a/contracts/feature-tests/composability/forwarder-legacy/src/esdt_legacy.rs b/contracts/feature-tests/composability/forwarder-legacy/src/fwd_esdt_legacy.rs
similarity index 98%
rename from contracts/feature-tests/composability/forwarder-legacy/src/esdt_legacy.rs
rename to contracts/feature-tests/composability/forwarder-legacy/src/fwd_esdt_legacy.rs
index 900620c0c1..b56db69bb8 100644
--- a/contracts/feature-tests/composability/forwarder-legacy/src/esdt_legacy.rs
+++ b/contracts/feature-tests/composability/forwarder-legacy/src/fwd_esdt_legacy.rs
@@ -1,6 +1,6 @@
 multiversx_sc::imports!();
 
-use super::storage_legacy;
+use super::fwd_storage_legacy;
 
 const PERCENTAGE_TOTAL: u64 = 10_000; // 100%
 
@@ -17,7 +17,7 @@ pub type EsdtTokenDataMultiValue<M> = MultiValue9<
 >;
 
 #[multiversx_sc::module]
-pub trait ForwarderEsdtModule: storage_legacy::ForwarderStorageModule {
+pub trait ForwarderEsdtModule: fwd_storage_legacy::ForwarderStorageModule {
     #[view(getFungibleEsdtBalance)]
     fn get_fungible_esdt_balance(&self, token_identifier: &TokenIdentifier) -> BigUint {
         self.blockchain()
diff --git a/contracts/feature-tests/composability/forwarder-legacy/src/nft_legacy.rs b/contracts/feature-tests/composability/forwarder-legacy/src/fwd_nft_legacy.rs
similarity index 98%
rename from contracts/feature-tests/composability/forwarder-legacy/src/nft_legacy.rs
rename to contracts/feature-tests/composability/forwarder-legacy/src/fwd_nft_legacy.rs
index 91fc37d85f..0cd0b57f4e 100644
--- a/contracts/feature-tests/composability/forwarder-legacy/src/nft_legacy.rs
+++ b/contracts/feature-tests/composability/forwarder-legacy/src/fwd_nft_legacy.rs
@@ -1,7 +1,7 @@
 multiversx_sc::imports!();
 multiversx_sc::derive_imports!();
 
-use super::storage_legacy;
+use super::fwd_storage_legacy;
 
 // used as mock attributes for NFTs
 #[derive(TopEncode, TopDecode, TypeAbi, Clone, Copy, PartialEq, Debug)]
@@ -21,7 +21,7 @@ pub struct ComplexAttributes<M: ManagedTypeApi> {
 }
 
 #[multiversx_sc::module]
-pub trait ForwarderNftModule: storage_legacy::ForwarderStorageModule {
+pub trait ForwarderNftModule: fwd_storage_legacy::ForwarderStorageModule {
     #[view]
     fn get_nft_balance(&self, token_identifier: &TokenIdentifier, nonce: u64) -> BigUint {
         self.blockchain().get_esdt_balance(
diff --git a/contracts/feature-tests/composability/forwarder-legacy/src/roles_legacy.rs b/contracts/feature-tests/composability/forwarder-legacy/src/fwd_roles_legacy.rs
similarity index 92%
rename from contracts/feature-tests/composability/forwarder-legacy/src/roles_legacy.rs
rename to contracts/feature-tests/composability/forwarder-legacy/src/fwd_roles_legacy.rs
index 9c795bfa7b..792de8911a 100644
--- a/contracts/feature-tests/composability/forwarder-legacy/src/roles_legacy.rs
+++ b/contracts/feature-tests/composability/forwarder-legacy/src/fwd_roles_legacy.rs
@@ -1,9 +1,9 @@
 multiversx_sc::imports!();
 
-use super::storage_legacy;
+use super::fwd_storage_legacy;
 
 #[multiversx_sc::module]
-pub trait ForwarderRolesModule: storage_legacy::ForwarderStorageModule {
+pub trait ForwarderRolesModule: fwd_storage_legacy::ForwarderStorageModule {
     #[endpoint(setLocalRoles)]
     fn set_local_roles(
         &self,
diff --git a/contracts/feature-tests/composability/forwarder-legacy/src/sft_legacy.rs b/contracts/feature-tests/composability/forwarder-legacy/src/fwd_sft_legacy.rs
similarity index 94%
rename from contracts/feature-tests/composability/forwarder-legacy/src/sft_legacy.rs
rename to contracts/feature-tests/composability/forwarder-legacy/src/fwd_sft_legacy.rs
index 4b0a5c2f3c..41d01c6f7a 100644
--- a/contracts/feature-tests/composability/forwarder-legacy/src/sft_legacy.rs
+++ b/contracts/feature-tests/composability/forwarder-legacy/src/fwd_sft_legacy.rs
@@ -1,9 +1,9 @@
 multiversx_sc::imports!();
 
-use super::storage_legacy;
+use super::fwd_storage_legacy;
 
 #[multiversx_sc::module]
-pub trait ForwarderSftModule: storage_legacy::ForwarderStorageModule {
+pub trait ForwarderSftModule: fwd_storage_legacy::ForwarderStorageModule {
     #[payable("EGLD")]
     #[endpoint]
     fn sft_issue(&self, token_display_name: ManagedBuffer, token_ticker: ManagedBuffer) {
diff --git a/contracts/feature-tests/composability/forwarder-legacy/src/storage_legacy.rs b/contracts/feature-tests/composability/forwarder-legacy/src/fwd_storage_legacy.rs
similarity index 100%
rename from contracts/feature-tests/composability/forwarder-legacy/src/storage_legacy.rs
rename to contracts/feature-tests/composability/forwarder-legacy/src/fwd_storage_legacy.rs
diff --git a/contracts/feature-tests/composability/forwarder-legacy/src/contract_upgrade_legacy.rs b/contracts/feature-tests/composability/forwarder-legacy/src/fwd_upgrade_legacy.rs
similarity index 100%
rename from contracts/feature-tests/composability/forwarder-legacy/src/contract_upgrade_legacy.rs
rename to contracts/feature-tests/composability/forwarder-legacy/src/fwd_upgrade_legacy.rs
diff --git a/contracts/feature-tests/composability/forwarder/src/forwarder_main.rs b/contracts/feature-tests/composability/forwarder/src/forwarder_main.rs
index 1344c66be5..cb62e12570 100644
--- a/contracts/feature-tests/composability/forwarder/src/forwarder_main.rs
+++ b/contracts/feature-tests/composability/forwarder/src/forwarder_main.rs
@@ -1,18 +1,18 @@
 #![no_std]
 #![allow(clippy::type_complexity)]
 
-pub mod call_async;
-pub mod call_sync;
-pub mod call_transf_exec;
-pub mod contract_change_owner;
-pub mod contract_deploy;
-pub mod contract_upgrade;
-pub mod esdt;
+pub mod fwd_call_async;
+pub mod fwd_call_sync;
+pub mod fwd_call_transf_exec;
+pub mod fwd_change_owner;
+pub mod fwd_deploy;
+pub mod fwd_upgrade;
+pub mod fwd_esdt;
 pub mod forwarder_proxy;
-pub mod nft;
-pub mod roles;
-pub mod sft;
-pub mod storage;
+pub mod fwd_nft;
+pub mod fwd_roles;
+pub mod fwd_sft;
+pub mod fwd_storage;
 pub mod vault_proxy;
 
 multiversx_sc::imports!();
@@ -20,17 +20,17 @@ multiversx_sc::imports!();
 /// Test contract for investigating contract calls.
 #[multiversx_sc::contract]
 pub trait Forwarder:
-    call_sync::ForwarderSyncCallModule
-    + call_async::ForwarderAsyncCallModule
-    + call_transf_exec::ForwarderTransferExecuteModule
-    + contract_change_owner::ChangeOwnerModule
-    + contract_deploy::DeployContractModule
-    + contract_upgrade::UpgradeContractModule
-    + esdt::ForwarderEsdtModule
-    + sft::ForwarderSftModule
-    + nft::ForwarderNftModule
-    + roles::ForwarderRolesModule
-    + storage::ForwarderStorageModule
+    fwd_call_sync::ForwarderSyncCallModule
+    + fwd_call_async::ForwarderAsyncCallModule
+    + fwd_call_transf_exec::ForwarderTransferExecuteModule
+    + fwd_change_owner::ChangeOwnerModule
+    + fwd_deploy::DeployContractModule
+    + fwd_upgrade::UpgradeContractModule
+    + fwd_esdt::ForwarderEsdtModule
+    + fwd_sft::ForwarderSftModule
+    + fwd_nft::ForwarderNftModule
+    + fwd_roles::ForwarderRolesModule
+    + fwd_storage::ForwarderStorageModule
 {
     #[init]
     fn init(&self) {}
diff --git a/contracts/feature-tests/composability/forwarder/src/call_async.rs b/contracts/feature-tests/composability/forwarder/src/fwd_call_async.rs
similarity index 100%
rename from contracts/feature-tests/composability/forwarder/src/call_async.rs
rename to contracts/feature-tests/composability/forwarder/src/fwd_call_async.rs
diff --git a/contracts/feature-tests/composability/forwarder/src/call_sync.rs b/contracts/feature-tests/composability/forwarder/src/fwd_call_sync.rs
similarity index 100%
rename from contracts/feature-tests/composability/forwarder/src/call_sync.rs
rename to contracts/feature-tests/composability/forwarder/src/fwd_call_sync.rs
diff --git a/contracts/feature-tests/composability/forwarder/src/call_transf_exec.rs b/contracts/feature-tests/composability/forwarder/src/fwd_call_transf_exec.rs
similarity index 100%
rename from contracts/feature-tests/composability/forwarder/src/call_transf_exec.rs
rename to contracts/feature-tests/composability/forwarder/src/fwd_call_transf_exec.rs
diff --git a/contracts/feature-tests/composability/forwarder/src/contract_change_owner.rs b/contracts/feature-tests/composability/forwarder/src/fwd_change_owner.rs
similarity index 100%
rename from contracts/feature-tests/composability/forwarder/src/contract_change_owner.rs
rename to contracts/feature-tests/composability/forwarder/src/fwd_change_owner.rs
diff --git a/contracts/feature-tests/composability/forwarder/src/contract_deploy.rs b/contracts/feature-tests/composability/forwarder/src/fwd_deploy.rs
similarity index 100%
rename from contracts/feature-tests/composability/forwarder/src/contract_deploy.rs
rename to contracts/feature-tests/composability/forwarder/src/fwd_deploy.rs
diff --git a/contracts/feature-tests/composability/forwarder/src/esdt.rs b/contracts/feature-tests/composability/forwarder/src/fwd_esdt.rs
similarity index 98%
rename from contracts/feature-tests/composability/forwarder/src/esdt.rs
rename to contracts/feature-tests/composability/forwarder/src/fwd_esdt.rs
index 7a3e938c06..528c5f9211 100644
--- a/contracts/feature-tests/composability/forwarder/src/esdt.rs
+++ b/contracts/feature-tests/composability/forwarder/src/fwd_esdt.rs
@@ -1,6 +1,6 @@
 multiversx_sc::imports!();
 
-use super::storage;
+use super::fwd_storage;
 
 const PERCENTAGE_TOTAL: u64 = 10_000; // 100%
 
@@ -17,7 +17,7 @@ pub type EsdtTokenDataMultiValue<M> = MultiValue9<
 >;
 
 #[multiversx_sc::module]
-pub trait ForwarderEsdtModule: storage::ForwarderStorageModule {
+pub trait ForwarderEsdtModule: fwd_storage::ForwarderStorageModule {
     #[view(getFungibleEsdtBalance)]
     fn get_fungible_esdt_balance(&self, token_identifier: &TokenIdentifier) -> BigUint {
         self.blockchain()
diff --git a/contracts/feature-tests/composability/forwarder/src/nft.rs b/contracts/feature-tests/composability/forwarder/src/fwd_nft.rs
similarity index 98%
rename from contracts/feature-tests/composability/forwarder/src/nft.rs
rename to contracts/feature-tests/composability/forwarder/src/fwd_nft.rs
index 3deb7f1493..56fe050844 100644
--- a/contracts/feature-tests/composability/forwarder/src/nft.rs
+++ b/contracts/feature-tests/composability/forwarder/src/fwd_nft.rs
@@ -1,7 +1,7 @@
 multiversx_sc::imports!();
 multiversx_sc::derive_imports!();
 
-use super::storage;
+use super::fwd_storage;
 
 // used as mock attributes for NFTs
 #[type_abi]
@@ -23,7 +23,7 @@ pub struct ComplexAttributes<M: ManagedTypeApi> {
 }
 
 #[multiversx_sc::module]
-pub trait ForwarderNftModule: storage::ForwarderStorageModule {
+pub trait ForwarderNftModule: fwd_storage::ForwarderStorageModule {
     #[view]
     fn get_nft_balance(&self, token_identifier: &TokenIdentifier, nonce: u64) -> BigUint {
         self.blockchain().get_esdt_balance(
diff --git a/contracts/feature-tests/composability/forwarder/src/roles.rs b/contracts/feature-tests/composability/forwarder/src/fwd_roles.rs
similarity index 93%
rename from contracts/feature-tests/composability/forwarder/src/roles.rs
rename to contracts/feature-tests/composability/forwarder/src/fwd_roles.rs
index ec90a2e2bd..3d8afc7fd1 100644
--- a/contracts/feature-tests/composability/forwarder/src/roles.rs
+++ b/contracts/feature-tests/composability/forwarder/src/fwd_roles.rs
@@ -1,9 +1,9 @@
 multiversx_sc::imports!();
 
-use super::storage;
+use super::fwd_storage;
 
 #[multiversx_sc::module]
-pub trait ForwarderRolesModule: storage::ForwarderStorageModule {
+pub trait ForwarderRolesModule: fwd_storage::ForwarderStorageModule {
     #[endpoint(setLocalRoles)]
     fn set_local_roles(
         &self,
diff --git a/contracts/feature-tests/composability/forwarder/src/sft.rs b/contracts/feature-tests/composability/forwarder/src/fwd_sft.rs
similarity index 95%
rename from contracts/feature-tests/composability/forwarder/src/sft.rs
rename to contracts/feature-tests/composability/forwarder/src/fwd_sft.rs
index 77b8d8b37c..1dcb5324f9 100644
--- a/contracts/feature-tests/composability/forwarder/src/sft.rs
+++ b/contracts/feature-tests/composability/forwarder/src/fwd_sft.rs
@@ -1,9 +1,9 @@
 multiversx_sc::imports!();
 
-use super::storage;
+use super::fwd_storage;
 
 #[multiversx_sc::module]
-pub trait ForwarderSftModule: storage::ForwarderStorageModule {
+pub trait ForwarderSftModule: fwd_storage::ForwarderStorageModule {
     #[payable("EGLD")]
     #[endpoint]
     fn sft_issue(&self, token_display_name: ManagedBuffer, token_ticker: ManagedBuffer) {
diff --git a/contracts/feature-tests/composability/forwarder/src/storage.rs b/contracts/feature-tests/composability/forwarder/src/fwd_storage.rs
similarity index 100%
rename from contracts/feature-tests/composability/forwarder/src/storage.rs
rename to contracts/feature-tests/composability/forwarder/src/fwd_storage.rs
diff --git a/contracts/feature-tests/composability/forwarder/src/contract_upgrade.rs b/contracts/feature-tests/composability/forwarder/src/fwd_upgrade.rs
similarity index 100%
rename from contracts/feature-tests/composability/forwarder/src/contract_upgrade.rs
rename to contracts/feature-tests/composability/forwarder/src/fwd_upgrade.rs
diff --git a/contracts/feature-tests/composability/tests/forwarder_blackbox_legacy_test.rs b/contracts/feature-tests/composability/tests/forwarder_blackbox_legacy_test.rs
index 44a1ac4b5f..086dd9e11d 100644
--- a/contracts/feature-tests/composability/tests/forwarder_blackbox_legacy_test.rs
+++ b/contracts/feature-tests/composability/tests/forwarder_blackbox_legacy_test.rs
@@ -1,6 +1,6 @@
 #![allow(deprecated)]
 
-use forwarder_legacy::nft_legacy::{Color, ProxyTrait as _};
+use forwarder_legacy::fwd_nft_legacy::{Color, ProxyTrait as _};
 
 use multiversx_sc_scenario::{
     api::StaticApi,
diff --git a/contracts/feature-tests/composability/tests/forwarder_whitebox_legacy_test.rs b/contracts/feature-tests/composability/tests/forwarder_whitebox_legacy_test.rs
index 170fb68147..8766bfa174 100644
--- a/contracts/feature-tests/composability/tests/forwarder_whitebox_legacy_test.rs
+++ b/contracts/feature-tests/composability/tests/forwarder_whitebox_legacy_test.rs
@@ -1,4 +1,4 @@
-use forwarder_legacy::nft_legacy::{Color, ForwarderNftModule};
+use forwarder_legacy::fwd_nft_legacy::{Color, ForwarderNftModule};
 use multiversx_sc::{contract_base::ContractBase, types::Address};
 use multiversx_sc_scenario::{
     managed_address, managed_biguint, managed_token_id,
diff --git a/contracts/feature-tests/composability/tests/forwarder_whitebox_test.rs b/contracts/feature-tests/composability/tests/forwarder_whitebox_test.rs
index 6298e2018d..1dbf3952f2 100644
--- a/contracts/feature-tests/composability/tests/forwarder_whitebox_test.rs
+++ b/contracts/feature-tests/composability/tests/forwarder_whitebox_test.rs
@@ -1,4 +1,4 @@
-use forwarder::nft::{Color, ForwarderNftModule};
+use forwarder::fwd_nft::{Color, ForwarderNftModule};
 use multiversx_sc_scenario::imports::*;
 
 const USER_ADDRESS_EXPR: &str = "address:user";
diff --git a/contracts/feature-tests/rust-testing-framework-tester/tests/tester_whitebox_legacy_test.rs b/contracts/feature-tests/rust-testing-framework-tester/tests/tester_whitebox_legacy_test.rs
index 0acd222cc9..3ca8162259 100644
--- a/contracts/feature-tests/rust-testing-framework-tester/tests/tester_whitebox_legacy_test.rs
+++ b/contracts/feature-tests/rust-testing-framework-tester/tests/tester_whitebox_legacy_test.rs
@@ -3,7 +3,7 @@ use num_traits::ToPrimitive;
 
 use adder::*;
 use basic_features::BasicFeatures;
-use forwarder::call_sync::*;
+use forwarder::fwd_call_sync::*;
 use rust_testing_framework_tester::{dummy_module::DummyModule, *};
 
 const TEST_OUTPUT_PATH: &str = "test.scen.json";

From b57b45c47805181f16e87a5313231c9f6ee47be9 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 23 May 2024 22:27:20 +0300
Subject: [PATCH 0912/1254] renamed filed in promises-features

---
 ...mise_direct.rs => fwd_call_promise_direct.rs} |  0
 .../{call_promises.rs => fwd_call_promises.rs}   |  0
 ...ll_promises_bt.rs => fwd_call_promises_bt.rs} |  0
 .../src/{call_sync_bt.rs => fwd_call_sync_bt.rs} |  0
 .../promises-features/src/promises_main.rs       | 16 ++++++++--------
 .../tests/promises_feature_blackbox_test.rs      |  2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)
 rename contracts/feature-tests/composability/promises-features/src/{call_promise_direct.rs => fwd_call_promise_direct.rs} (100%)
 rename contracts/feature-tests/composability/promises-features/src/{call_promises.rs => fwd_call_promises.rs} (100%)
 rename contracts/feature-tests/composability/promises-features/src/{call_promises_bt.rs => fwd_call_promises_bt.rs} (100%)
 rename contracts/feature-tests/composability/promises-features/src/{call_sync_bt.rs => fwd_call_sync_bt.rs} (100%)

diff --git a/contracts/feature-tests/composability/promises-features/src/call_promise_direct.rs b/contracts/feature-tests/composability/promises-features/src/fwd_call_promise_direct.rs
similarity index 100%
rename from contracts/feature-tests/composability/promises-features/src/call_promise_direct.rs
rename to contracts/feature-tests/composability/promises-features/src/fwd_call_promise_direct.rs
diff --git a/contracts/feature-tests/composability/promises-features/src/call_promises.rs b/contracts/feature-tests/composability/promises-features/src/fwd_call_promises.rs
similarity index 100%
rename from contracts/feature-tests/composability/promises-features/src/call_promises.rs
rename to contracts/feature-tests/composability/promises-features/src/fwd_call_promises.rs
diff --git a/contracts/feature-tests/composability/promises-features/src/call_promises_bt.rs b/contracts/feature-tests/composability/promises-features/src/fwd_call_promises_bt.rs
similarity index 100%
rename from contracts/feature-tests/composability/promises-features/src/call_promises_bt.rs
rename to contracts/feature-tests/composability/promises-features/src/fwd_call_promises_bt.rs
diff --git a/contracts/feature-tests/composability/promises-features/src/call_sync_bt.rs b/contracts/feature-tests/composability/promises-features/src/fwd_call_sync_bt.rs
similarity index 100%
rename from contracts/feature-tests/composability/promises-features/src/call_sync_bt.rs
rename to contracts/feature-tests/composability/promises-features/src/fwd_call_sync_bt.rs
diff --git a/contracts/feature-tests/composability/promises-features/src/promises_main.rs b/contracts/feature-tests/composability/promises-features/src/promises_main.rs
index ddcc00d965..af4ae53ac3 100644
--- a/contracts/feature-tests/composability/promises-features/src/promises_main.rs
+++ b/contracts/feature-tests/composability/promises-features/src/promises_main.rs
@@ -1,10 +1,10 @@
 #![no_std]
 #![allow(clippy::type_complexity)]
 
-mod call_promise_direct;
-mod call_promises;
-mod call_promises_bt;
-pub mod call_sync_bt;
+mod fwd_call_promise_direct;
+mod fwd_call_promises;
+mod fwd_call_promises_bt;
+pub mod fwd_call_sync_bt;
 mod common;
 pub mod vault_proxy;
 
@@ -14,10 +14,10 @@ multiversx_sc::imports!();
 #[multiversx_sc::contract]
 pub trait PromisesFeatures:
     common::CommonModule
-    + call_promises::CallPromisesModule
-    + call_promise_direct::CallPromisesDirectModule
-    + call_sync_bt::BackTransfersFeatureModule
-    + call_promises_bt::CallPromisesBackTransfersModule
+    + fwd_call_promises::CallPromisesModule
+    + fwd_call_promise_direct::CallPromisesDirectModule
+    + fwd_call_sync_bt::BackTransfersFeatureModule
+    + fwd_call_promises_bt::CallPromisesBackTransfersModule
 {
     #[init]
     fn init(&self) {}
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 3ecce2d8fb..c7fa6600d2 100644
--- a/contracts/feature-tests/composability/tests/promises_feature_blackbox_test.rs
+++ b/contracts/feature-tests/composability/tests/promises_feature_blackbox_test.rs
@@ -3,7 +3,7 @@
 use multiversx_sc::types::BigUint;
 use multiversx_sc_scenario::imports::*;
 
-use promises_features::call_sync_bt::ProxyTrait;
+use promises_features::fwd_call_sync_bt::ProxyTrait;
 
 const USER_ADDRESS_EXPR: &str = "address:user";
 const PROMISES_FEATURE_ADDRESS_EXPR: &str = "sc:promises-feature";

From 23f41293bad43aadaffd5d1a7de452d78f3a59c5 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 23 May 2024 22:27:56 +0300
Subject: [PATCH 0913/1254] fmt

---
 .../forwarder-legacy/src/forwarder_legacy_main.rs             | 2 +-
 .../composability/forwarder/src/forwarder_main.rs             | 4 ++--
 .../composability/promises-features/src/promises_main.rs      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/contracts/feature-tests/composability/forwarder-legacy/src/forwarder_legacy_main.rs b/contracts/feature-tests/composability/forwarder-legacy/src/forwarder_legacy_main.rs
index e07c0a39c4..c4bcde1b96 100644
--- a/contracts/feature-tests/composability/forwarder-legacy/src/forwarder_legacy_main.rs
+++ b/contracts/feature-tests/composability/forwarder-legacy/src/forwarder_legacy_main.rs
@@ -7,12 +7,12 @@ pub mod fwd_call_sync_legacy;
 pub mod fwd_call_transf_exec_legacy;
 pub mod fwd_change_owner_legacy;
 pub mod fwd_deploy_legacy;
-pub mod fwd_upgrade_legacy;
 pub mod fwd_esdt_legacy;
 pub mod fwd_nft_legacy;
 pub mod fwd_roles_legacy;
 pub mod fwd_sft_legacy;
 pub mod fwd_storage_legacy;
+pub mod fwd_upgrade_legacy;
 
 multiversx_sc::imports!();
 
diff --git a/contracts/feature-tests/composability/forwarder/src/forwarder_main.rs b/contracts/feature-tests/composability/forwarder/src/forwarder_main.rs
index cb62e12570..cd2254587c 100644
--- a/contracts/feature-tests/composability/forwarder/src/forwarder_main.rs
+++ b/contracts/feature-tests/composability/forwarder/src/forwarder_main.rs
@@ -1,18 +1,18 @@
 #![no_std]
 #![allow(clippy::type_complexity)]
 
+pub mod forwarder_proxy;
 pub mod fwd_call_async;
 pub mod fwd_call_sync;
 pub mod fwd_call_transf_exec;
 pub mod fwd_change_owner;
 pub mod fwd_deploy;
-pub mod fwd_upgrade;
 pub mod fwd_esdt;
-pub mod forwarder_proxy;
 pub mod fwd_nft;
 pub mod fwd_roles;
 pub mod fwd_sft;
 pub mod fwd_storage;
+pub mod fwd_upgrade;
 pub mod vault_proxy;
 
 multiversx_sc::imports!();
diff --git a/contracts/feature-tests/composability/promises-features/src/promises_main.rs b/contracts/feature-tests/composability/promises-features/src/promises_main.rs
index af4ae53ac3..511b0d76d8 100644
--- a/contracts/feature-tests/composability/promises-features/src/promises_main.rs
+++ b/contracts/feature-tests/composability/promises-features/src/promises_main.rs
@@ -1,11 +1,11 @@
 #![no_std]
 #![allow(clippy::type_complexity)]
 
+mod common;
 mod fwd_call_promise_direct;
 mod fwd_call_promises;
 mod fwd_call_promises_bt;
 pub mod fwd_call_sync_bt;
-mod common;
 pub mod vault_proxy;
 
 multiversx_sc::imports!();

From c6095a162df0e847d416e804a132140346cc434d Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 22 May 2024 16:13:48 +0300
Subject: [PATCH 0914/1254] cleanup

---
 .../feature-tests/abi-tester/tests/abi_tester_abi_test.rs    | 2 +-
 framework/scenario/tests/scenarios_self_test.rs              | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/contracts/feature-tests/abi-tester/tests/abi_tester_abi_test.rs b/contracts/feature-tests/abi-tester/tests/abi_tester_abi_test.rs
index 756eb70ea4..4ef78f351b 100644
--- a/contracts/feature-tests/abi-tester/tests/abi_tester_abi_test.rs
+++ b/contracts/feature-tests/abi-tester/tests/abi_tester_abi_test.rs
@@ -70,7 +70,7 @@ fn abi_tester_esdt_attr_abi_generated_ok() {
 
 #[test]
 fn check_multi_contract_config() {
-    let mut blockchain = ScenarioWorld::new();
+    let blockchain = ScenarioWorld::new();
 
     let multi_contract_config = multiversx_sc_meta::multi_contract_config::<abi_tester::AbiProvider>(
         blockchain.current_dir().as_path(),
diff --git a/framework/scenario/tests/scenarios_self_test.rs b/framework/scenario/tests/scenarios_self_test.rs
index e45c7ab01e..b6bf9c1883 100644
--- a/framework/scenario/tests/scenarios_self_test.rs
+++ b/framework/scenario/tests/scenarios_self_test.rs
@@ -1,10 +1,9 @@
 use multiversx_sc_scenario::*;
 
-// These tests don't really test any contract, but the testing framework itslef.
+// These tests don't really test any contract, but the testing framework itself.
 
 fn world() -> ScenarioWorld {
-    let mut blockchain = ScenarioWorld::new();
-    blockchain
+    ScenarioWorld::new()
 }
 
 /// Checks that externalSteps work fine.

From 9ea13d521cd704e610503e81c89f303e8b35392c Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 23 May 2024 18:52:48 +0300
Subject: [PATCH 0915/1254] unified syntax - diagnostic::on_unimplemented

---
 .../src/types/interaction/tx_data/tx_code_source.rs    | 10 ++++++++++
 framework/base/src/types/interaction/tx_from.rs        |  5 +++++
 framework/base/src/types/interaction/tx_gas.rs         |  6 ++++++
 framework/base/src/types/interaction/tx_payment.rs     |  5 +++++
 .../tx_result_handler_list_item.rs                     |  5 +++++
 framework/base/src/types/interaction/tx_to.rs          |  7 ++++++-
 6 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/framework/base/src/types/interaction/tx_data/tx_code_source.rs b/framework/base/src/types/interaction/tx_data/tx_code_source.rs
index e7bb0817ea..0d3c180e16 100644
--- a/framework/base/src/types/interaction/tx_data/tx_code_source.rs
+++ b/framework/base/src/types/interaction/tx_data/tx_code_source.rs
@@ -14,6 +14,11 @@ where
 {
 }
 
+#[diagnostic::on_unimplemented(
+    message = "Type `{Self}` cannot be used as code (does not implement `TxCodeValue<{Env}>`)",
+    label = "not a valid smart contract byte code",
+    note = "there are multiple ways to specify SC byte code, but `{Self}` is not one of them"
+)]
 pub trait TxCodeValue<Env>: AnnotatedValue<Env, ManagedBuffer<Env::Api>>
 where
     Env: TxEnv,
@@ -39,6 +44,11 @@ where
 {
 }
 
+#[diagnostic::on_unimplemented(
+    message = "Type `{Self}` cannot be used as code source value (does not implement `TxFromSourceValue<{Env}>`)",
+    label = "not an address from where to copy the code",
+    note = "there are multiple ways to specify a code source address, but `{Self}` is not one of them"
+)]
 pub trait TxFromSourceValue<Env>: AnnotatedValue<Env, ManagedAddress<Env::Api>>
 where
     Env: TxEnv,
diff --git a/framework/base/src/types/interaction/tx_from.rs b/framework/base/src/types/interaction/tx_from.rs
index ff5dd73b88..674796e64f 100644
--- a/framework/base/src/types/interaction/tx_from.rs
+++ b/framework/base/src/types/interaction/tx_from.rs
@@ -13,6 +13,11 @@ where
 /// Marks the non-empty sender of a transaction.
 ///
 /// Enforces the reciipent to be explicitly specified.
+#[diagnostic::on_unimplemented(
+    message = "Type `{Self}` cannot be used as a sender value (does not implement `TxFromSpecified<{Env}>`)",
+    label = "sender needs to be explicit",
+    note = "there are multiple ways to specify the sender value for a transaction, but `{Self}` is not one of them"
+)]
 pub trait TxFromSpecified<Env>:
     TxFrom<Env> + AnnotatedValue<Env, ManagedAddress<Env::Api>>
 where
diff --git a/framework/base/src/types/interaction/tx_gas.rs b/framework/base/src/types/interaction/tx_gas.rs
index 986361e473..2e03cc1470 100644
--- a/framework/base/src/types/interaction/tx_gas.rs
+++ b/framework/base/src/types/interaction/tx_gas.rs
@@ -4,6 +4,7 @@ use crate::{
     types::ManagedBuffer,
 };
 
+/// All typed that populate the gas field of a transaction need to implement this trait.
 pub trait TxGas<Env>
 where
     Env: TxEnv,
@@ -32,6 +33,11 @@ where
     }
 }
 
+#[diagnostic::on_unimplemented(
+    message = "Type `{Self}` cannot be used as gas value (does not implement `TxGasValue<{Env}>`)",
+    label = "not a valid value for gas",
+    note = "there are multiple ways to specify the gas value for a transaction, but `{Self}` is not one of them"
+)]
 pub trait TxGasValue<Env>: AnnotatedValue<Env, u64>
 where
     Env: TxEnv,
diff --git a/framework/base/src/types/interaction/tx_payment.rs b/framework/base/src/types/interaction/tx_payment.rs
index 5abb38c6ee..c5bcc10637 100644
--- a/framework/base/src/types/interaction/tx_payment.rs
+++ b/framework/base/src/types/interaction/tx_payment.rs
@@ -24,6 +24,11 @@ use crate::{
 use super::{AnnotatedValue, FunctionCall, TxEnv, TxFrom, TxToSpecified};
 
 /// Describes a payment that is part of a transaction.
+#[diagnostic::on_unimplemented(
+    message = "Type `{Self}` cannot be used as payment (does not implement `TxPayment<{Env}>`)",
+    label = "not a valid payment type",
+    note = "there are multiple ways to specify the transaction payment, but `{Self}` is not one of them"
+)]
 pub trait TxPayment<Env>
 where
     Env: TxEnv,
diff --git a/framework/base/src/types/interaction/tx_result_handler_list/tx_result_handler_list_item.rs b/framework/base/src/types/interaction/tx_result_handler_list/tx_result_handler_list_item.rs
index 54e1d0cfa3..9ca98bac65 100644
--- a/framework/base/src/types/interaction/tx_result_handler_list/tx_result_handler_list_item.rs
+++ b/framework/base/src/types/interaction/tx_result_handler_list/tx_result_handler_list_item.rs
@@ -3,6 +3,11 @@ use crate::types::TxEnv;
 /// Result handler list item.
 ///
 /// It acts as a result handler that produces a single result.
+#[diagnostic::on_unimplemented(
+    message = "Type `{Self}` cannot be used as a decoder result handler (does not implement `RHListItem<{Env}>`)",
+    label = "not a valid decoder result handler",
+    note = "there are multiple ways to specify the result handling, but `{Self}` is not one of them"
+)]
 pub trait RHListItem<Env, Original>
 where
     Env: TxEnv,
diff --git a/framework/base/src/types/interaction/tx_to.rs b/framework/base/src/types/interaction/tx_to.rs
index 55c77247df..41d5d4ce39 100644
--- a/framework/base/src/types/interaction/tx_to.rs
+++ b/framework/base/src/types/interaction/tx_to.rs
@@ -13,7 +13,12 @@ impl<Env> TxTo<Env> for () where Env: TxEnv {}
 
 /// Marks the non-empty recipient of a transaction.
 ///
-/// Enforces the reciipent to be explicitly specified.
+/// Enforces the recipient to be explicitly specified.
+#[diagnostic::on_unimplemented(
+    message = "Type `{Self}` cannot be used as recipient value (does not implement `TxToSpecified<{Env}>`)",
+    label = "recipient needs to be explicit",
+    note = "there are multiple ways to specify the recipient value for a transaction, but `{Self}` is not one of them"
+)]
 pub trait TxToSpecified<Env>: TxTo<Env> + AnnotatedValue<Env, ManagedAddress<Env::Api>>
 where
     Env: TxEnv,

From 734c797c6a92473ab3d981cc99378ff48c0945e2 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 23 May 2024 20:36:43 +0300
Subject: [PATCH 0916/1254] github action - update nightly

---
 .github/workflows/actions-nightly.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/actions-nightly.yml b/.github/workflows/actions-nightly.yml
index a94745de41..355a53883c 100644
--- a/.github/workflows/actions-nightly.yml
+++ b/.github/workflows/actions-nightly.yml
@@ -16,7 +16,7 @@ jobs:
     name: Contracts (nightly)
     uses: multiversx/mx-sc-actions/.github/workflows/contracts.yml@v3.2.0
     with:
-      rust-toolchain: nightly-2023-12-11
+      rust-toolchain: nightly-2024-05-22
       path-to-sc-meta: framework/meta
       enable-contracts-size-report: false
       mx-scenario-go-version: v2.1.0-alpha

From 75b312b349b3af6b3a4f0c0a71d4eba378e491d4 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 23 May 2024 20:38:23 +0300
Subject: [PATCH 0917/1254] warn fix

---
 contracts/feature-tests/abi-tester/src/abi_test_type.rs          | 1 +
 .../composability/interact/src/comp_interact_controller.rs       | 1 +
 framework/derive/src/model/contract_trait.rs                     | 1 +
 framework/derive/src/model/supertrait.rs                         | 1 +
 .../meta/src/cmd/contract/generate_proxy/proxy_generator.rs      | 1 +
 framework/meta/src/cmd/standalone/install/install_scenario_go.rs | 1 +
 6 files changed, 6 insertions(+)

diff --git a/contracts/feature-tests/abi-tester/src/abi_test_type.rs b/contracts/feature-tests/abi-tester/src/abi_test_type.rs
index ff4f76b744..d37832f20d 100644
--- a/contracts/feature-tests/abi-tester/src/abi_test_type.rs
+++ b/contracts/feature-tests/abi-tester/src/abi_test_type.rs
@@ -39,5 +39,6 @@ pub struct AbiManagedVecItem {
 
 #[type_abi]
 pub struct OnlyShowsUpInEsdtAttr {
+    #[allow(dead_code)]
     pub field: OnlyShowsUpAsNested10,
 }
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 409ce234a7..1c2457494b 100644
--- a/contracts/feature-tests/composability/interact/src/comp_interact_controller.rs
+++ b/contracts/feature-tests/composability/interact/src/comp_interact_controller.rs
@@ -9,6 +9,7 @@ pub struct ComposabilityInteract {
     pub wallet_address: Address,
     pub forw_queue_code: BytesValue,
     pub vault_code: BytesValue,
+    #[allow(dead_code)]
     pub state: State,
 }
 
diff --git a/framework/derive/src/model/contract_trait.rs b/framework/derive/src/model/contract_trait.rs
index a3e5594a5a..3d3f838c7c 100644
--- a/framework/derive/src/model/contract_trait.rs
+++ b/framework/derive/src/model/contract_trait.rs
@@ -10,6 +10,7 @@ pub struct ContractTrait {
     /// It is possible to automatically implement a contract module for all contracts that use it indirectly.
     /// The drawback is that the developer make sure multiple inheritance does not happen.
     /// This feature is currently disabled.
+    #[allow(dead_code)]
     pub auto_inheritance_modules: Vec<Supertrait>,
 
     pub methods: Vec<Method>,
diff --git a/framework/derive/src/model/supertrait.rs b/framework/derive/src/model/supertrait.rs
index 428bb5ea9c..e5aad040c4 100644
--- a/framework/derive/src/model/supertrait.rs
+++ b/framework/derive/src/model/supertrait.rs
@@ -6,6 +6,7 @@ pub type ModulePath = Punctuated<syn::PathSegment, PathSep>;
 #[derive(Clone, Debug)]
 pub struct Supertrait {
     pub full_path: syn::Path,
+    #[allow(dead_code)]
     pub trait_name: syn::PathSegment,
     pub module_path: ModulePath,
 }
diff --git a/framework/meta/src/cmd/contract/generate_proxy/proxy_generator.rs b/framework/meta/src/cmd/contract/generate_proxy/proxy_generator.rs
index 79a25ad838..5567f4b1ee 100644
--- a/framework/meta/src/cmd/contract/generate_proxy/proxy_generator.rs
+++ b/framework/meta/src/cmd/contract/generate_proxy/proxy_generator.rs
@@ -40,6 +40,7 @@ const TYPES_FROM_FRAMEWORK: &[&str] = &[
 ];
 
 pub struct ProxyGenerator<'a> {
+    #[allow(dead_code)]
     pub meta_config: &'a MetaConfig,
     pub file: Option<&'a mut dyn std::io::Write>,
     pub proxy_config: &'a ProxyConfigSerde,
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 0a5798f792..9e874fb674 100644
--- a/framework/meta/src/cmd/standalone/install/install_scenario_go.rs
+++ b/framework/meta/src/cmd/standalone/install/install_scenario_go.rs
@@ -16,6 +16,7 @@ const CARGO_HOME: &str = env!("CARGO_HOME");
 
 #[derive(Clone, Debug)]
 pub struct ScenarioGoRelease {
+    #[allow(dead_code)]
     pub tag_name: String,
     pub download_url: String,
 }

From 099e888e08f96ff050c86aee2e14f9493c65283d Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 23 May 2024 22:34:07 +0300
Subject: [PATCH 0918/1254] unified syntax - register_promise unsafe warning
 trick

---
 .../tx_exec/tx_exec_async_promises.rs         | 75 ++++++++++++++++++-
 1 file changed, 74 insertions(+), 1 deletion(-)

diff --git a/framework/base/src/types/interaction/tx_exec/tx_exec_async_promises.rs b/framework/base/src/types/interaction/tx_exec/tx_exec_async_promises.rs
index ad8d8d4145..1e1dee40a4 100644
--- a/framework/base/src/types/interaction/tx_exec/tx_exec_async_promises.rs
+++ b/framework/base/src/types/interaction/tx_exec/tx_exec_async_promises.rs
@@ -1,6 +1,6 @@
 use crate::{
     api::{const_handles, CallTypeApi},
-    contract_base::SendRawWrapper,
+    contract_base::{ErrorHelper, SendRawWrapper},
     types::{
         interaction::callback_closure::CallbackClosureWithGas, CallbackClosure, ExplicitGas,
         FunctionCall, ManagedBuffer, ManagedType, OriginalResultMarker, Tx, TxGas, TxGasValue,
@@ -143,6 +143,20 @@ where
     GasValue: TxGasValue<TxScEnv<Api>>,
     Callback: TxPromisesCallback<Api>,
 {
+    /// Launches a transaction as an asynchronous promise (async v2 mechanism).
+    ///
+    /// Several such transactions can be launched from a single transaction.
+    ///
+    /// Must set:
+    /// - to
+    /// - gas
+    /// - a function call, ideally via a proxy.
+    ///
+    /// Value-only promises are not supported.
+    ///
+    /// Optionally, can add:
+    /// - any payment
+    /// - a promise callback, which also needs explicit gas for callback.
     pub fn register_promise(self) {
         let callback_name = self.result_handler.callback_name();
         let mut cb_closure_args_serialized =
@@ -174,6 +188,65 @@ where
     }
 }
 
+impl<Api, To, Payment, Callback> Tx<TxScEnv<Api>, (), To, Payment, (), FunctionCall<Api>, Callback>
+where
+    Api: CallTypeApi,
+    To: TxToSpecified<TxScEnv<Api>>,
+    Payment: TxPayment<TxScEnv<Api>>,
+    Callback: TxPromisesCallback<Api>,
+{
+    /// ## Incorrect call
+    ///
+    /// Must set **gas** in order to call `register_promise`.
+    ///
+    /// ## Safety
+    ///
+    /// This version of the method must never be called. It is only here to provide a more readable error.
+    pub unsafe fn register_promise(self) {
+        ErrorHelper::<Api>::signal_error_with_message("register_promise requires explicit gas");
+    }
+}
+
+impl<Api, To, Payment, Callback> Tx<TxScEnv<Api>, (), To, Payment, (), (), Callback>
+where
+    Api: CallTypeApi,
+    To: TxToSpecified<TxScEnv<Api>>,
+    Payment: TxPayment<TxScEnv<Api>>,
+    Callback: TxPromisesCallback<Api>,
+{
+    /// ## Incorrect call
+    ///
+    /// Must set **gas** and **function call** in order to call `register_promise`.
+    ///
+    /// ## Safety
+    ///
+    /// This version of the method must never be called. It is only here to provide a more readable error.
+    pub unsafe fn register_promise(self) {
+        ErrorHelper::<Api>::signal_error_with_message("register_promise requires explicit gas and function call");
+    }
+}
+
+impl<Api, To, Payment, GasValue, Callback>
+    Tx<TxScEnv<Api>, (), To, Payment, ExplicitGas<GasValue>, (), Callback>
+where
+    Api: CallTypeApi,
+    To: TxToSpecified<TxScEnv<Api>>,
+    Payment: TxPayment<TxScEnv<Api>>,
+    GasValue: TxGasValue<TxScEnv<Api>>,
+    Callback: TxPromisesCallback<Api>,
+{
+    /// ## Incorrect call
+    ///
+    /// Must set **function call** in order to call `register_promise`.
+    ///
+    /// ## Safety
+    ///
+    /// This version of the method must never be called. It is only here to provide a more readable error.
+    pub unsafe fn register_promise(self) {
+        ErrorHelper::<Api>::signal_error_with_message("register_promise requires function call");
+    }
+}
+
 impl<Api, To, Payment, Gas, Callback>
     Tx<TxScEnv<Api>, (), To, Payment, Gas, FunctionCall<Api>, Callback>
 where

From d487d627ece5b2437e7e8e4e366de362ab9302c5 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 23 May 2024 22:07:27 +0300
Subject: [PATCH 0919/1254] deprecated legacy methods async_call and
 async_call_promise

---
 .../examples/nft-minter/src/nft_module.rs      |  6 ++----
 .../child/src/lib.rs                           |  3 +--
 .../src/forwarder_legacy_main.rs               |  1 +
 .../forwarder-raw/src/forwarder_raw_async.rs   |  6 ++----
 .../forwarder/src/fwd_call_async.rs            | 12 ++++--------
 .../composability/forwarder/src/fwd_esdt.rs    |  3 +--
 .../composability/forwarder/src/fwd_nft.rs     |  3 +--
 .../composability/forwarder/src/fwd_roles.rs   |  6 ++----
 .../composability/forwarder/src/fwd_sft.rs     |  3 +--
 .../local-esdt-and-nft/src/lib.rs              | 18 ++++++------------
 .../src/fwd_call_promise_direct.rs             |  2 --
 .../src/fwd_call_promises_bt.rs                |  1 -
 .../proxy-test-first/src/proxy-test-first.rs   |  6 ++----
 .../recursive-caller/src/recursive_caller.rs   |  3 +--
 .../src/bonding_curve/utils/owner_endpoints.rs |  6 ++----
 contracts/modules/src/esdt.rs                  |  3 +--
 .../mappers/token/non_fungible_token_mapper.rs |  6 ++----
 .../src/storage/mappers/token/token_mapper.rs  |  2 +-
 .../types/interaction/tx_exec/tx_exec_async.rs |  4 ++++
 .../tx_exec/tx_exec_async_promises.rs          |  6 +++++-
 20 files changed, 39 insertions(+), 61 deletions(-)

diff --git a/contracts/examples/nft-minter/src/nft_module.rs b/contracts/examples/nft-minter/src/nft_module.rs
index 6b324fefee..da97c0d171 100644
--- a/contracts/examples/nft-minter/src/nft_module.rs
+++ b/contracts/examples/nft-minter/src/nft_module.rs
@@ -37,9 +37,8 @@ pub trait NftModule {
                     can_add_special_roles: true,
                 },
             )
-            .async_call()
             .with_callback(self.callbacks().issue_callback())
-            .call_and_exit()
+            .async_call_and_exit()
     }
 
     #[only_owner]
@@ -54,8 +53,7 @@ pub trait NftModule {
                 &self.nft_token_id().get(),
                 [EsdtLocalRole::NftCreate][..].iter().cloned(),
             )
-            .async_call()
-            .call_and_exit()
+            .async_call_and_exit()
     }
 
     // endpoints
diff --git a/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/child/src/lib.rs b/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/child/src/lib.rs
index 3126cdbfd8..e763a222af 100644
--- a/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/child/src/lib.rs
+++ b/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/child/src/lib.rs
@@ -37,9 +37,8 @@ pub trait Child {
                     can_add_special_roles: true,
                 },
             )
-            .async_call()
             .with_callback(self.callbacks().esdt_issue_callback())
-            .call_and_exit()
+            .async_call_and_exit()
     }
 
     // callbacks
diff --git a/contracts/feature-tests/composability/forwarder-legacy/src/forwarder_legacy_main.rs b/contracts/feature-tests/composability/forwarder-legacy/src/forwarder_legacy_main.rs
index c4bcde1b96..39683249b2 100644
--- a/contracts/feature-tests/composability/forwarder-legacy/src/forwarder_legacy_main.rs
+++ b/contracts/feature-tests/composability/forwarder-legacy/src/forwarder_legacy_main.rs
@@ -1,6 +1,7 @@
 #![no_std]
 #![allow(clippy::type_complexity)]
 #![allow(clippy::let_unit_value)]
+#![allow(deprecated)]
 
 pub mod fwd_call_async_legacy;
 pub mod fwd_call_sync_legacy;
diff --git a/contracts/feature-tests/composability/forwarder-raw/src/forwarder_raw_async.rs b/contracts/feature-tests/composability/forwarder-raw/src/forwarder_raw_async.rs
index e43ef13603..47240f3c52 100644
--- a/contracts/feature-tests/composability/forwarder-raw/src/forwarder_raw_async.rs
+++ b/contracts/feature-tests/composability/forwarder-raw/src/forwarder_raw_async.rs
@@ -66,8 +66,7 @@ pub trait ForwarderRawAsync: super::forwarder_raw_common::ForwarderRawCommon {
     ) {
         let (token, payment) = self.call_value().egld_or_single_fungible_esdt();
         self.forward_contract_call(to, token, payment, endpoint_name, args)
-            .async_call()
-            .call_and_exit()
+            .async_call_and_exit()
     }
 
     #[endpoint]
@@ -81,8 +80,7 @@ pub trait ForwarderRawAsync: super::forwarder_raw_common::ForwarderRawCommon {
         let (token, payment) = self.call_value().egld_or_single_fungible_esdt();
         let half_payment = payment / 2u32;
         self.forward_contract_call(to, token, half_payment, endpoint_name, args)
-            .async_call()
-            .call_and_exit()
+            .async_call_and_exit()
     }
 
     #[endpoint]
diff --git a/contracts/feature-tests/composability/forwarder/src/fwd_call_async.rs b/contracts/feature-tests/composability/forwarder/src/fwd_call_async.rs
index 51a751b114..5492a45a10 100644
--- a/contracts/feature-tests/composability/forwarder/src/fwd_call_async.rs
+++ b/contracts/feature-tests/composability/forwarder/src/fwd_call_async.rs
@@ -62,8 +62,7 @@ pub trait ForwarderAsyncCallModule {
             .typed(vault_proxy::VaultProxy)
             .accept_funds()
             .payment(payment)
-            .async_call()
-            .call_and_exit()
+            .async_call_and_exit()
     }
 
     #[endpoint]
@@ -80,8 +79,7 @@ pub trait ForwarderAsyncCallModule {
                 payment.token_nonce,
                 &half_payment,
             )
-            .async_call()
-            .call_and_exit()
+            .async_call_and_exit()
     }
 
     #[payable("*")]
@@ -115,9 +113,8 @@ pub trait ForwarderAsyncCallModule {
             .to(&to)
             .typed(vault_proxy::VaultProxy)
             .retrieve_funds(token, token_nonce, amount)
-            .async_call()
             .callback(self.callbacks().retrieve_funds_callback())
-            .call_and_exit()
+            .async_call_and_exit()
     }
 
     #[callback]
@@ -196,8 +193,7 @@ pub trait ForwarderAsyncCallModule {
             .typed(vault_proxy::VaultProxy)
             .accept_funds()
             .payment(all_token_payments)
-            .async_call()
-            .call_and_exit();
+            .async_call_and_exit();
     }
 
     #[view]
diff --git a/contracts/feature-tests/composability/forwarder/src/fwd_esdt.rs b/contracts/feature-tests/composability/forwarder/src/fwd_esdt.rs
index 528c5f9211..fcc3912ecc 100644
--- a/contracts/feature-tests/composability/forwarder/src/fwd_esdt.rs
+++ b/contracts/feature-tests/composability/forwarder/src/fwd_esdt.rs
@@ -117,9 +117,8 @@ pub trait ForwarderEsdtModule: fwd_storage::ForwarderStorageModule {
                     can_add_special_roles: true,
                 },
             )
-            .async_call()
             .with_callback(self.callbacks().esdt_issue_callback(&caller))
-            .call_and_exit()
+            .async_call_and_exit()
     }
 
     #[callback]
diff --git a/contracts/feature-tests/composability/forwarder/src/fwd_nft.rs b/contracts/feature-tests/composability/forwarder/src/fwd_nft.rs
index 56fe050844..5358397df9 100644
--- a/contracts/feature-tests/composability/forwarder/src/fwd_nft.rs
+++ b/contracts/feature-tests/composability/forwarder/src/fwd_nft.rs
@@ -71,9 +71,8 @@ pub trait ForwarderNftModule: fwd_storage::ForwarderStorageModule {
                     can_add_special_roles: true,
                 },
             )
-            .async_call()
             .with_callback(self.callbacks().nft_issue_callback(&caller))
-            .call_and_exit()
+            .async_call_and_exit()
     }
 
     #[callback]
diff --git a/contracts/feature-tests/composability/forwarder/src/fwd_roles.rs b/contracts/feature-tests/composability/forwarder/src/fwd_roles.rs
index 3d8afc7fd1..e176b78991 100644
--- a/contracts/feature-tests/composability/forwarder/src/fwd_roles.rs
+++ b/contracts/feature-tests/composability/forwarder/src/fwd_roles.rs
@@ -14,9 +14,8 @@ pub trait ForwarderRolesModule: fwd_storage::ForwarderStorageModule {
         self.send()
             .esdt_system_sc_proxy()
             .set_special_roles(&address, &token_identifier, roles.into_iter())
-            .async_call()
             .with_callback(self.callbacks().change_roles_callback())
-            .call_and_exit()
+            .async_call_and_exit()
     }
 
     #[endpoint(unsetLocalRoles)]
@@ -29,9 +28,8 @@ pub trait ForwarderRolesModule: fwd_storage::ForwarderStorageModule {
         self.send()
             .esdt_system_sc_proxy()
             .unset_special_roles(&address, &token_identifier, roles.into_iter())
-            .async_call()
             .with_callback(self.callbacks().change_roles_callback())
-            .call_and_exit()
+            .async_call_and_exit()
     }
 
     #[callback]
diff --git a/contracts/feature-tests/composability/forwarder/src/fwd_sft.rs b/contracts/feature-tests/composability/forwarder/src/fwd_sft.rs
index 1dcb5324f9..13d0b3a5ad 100644
--- a/contracts/feature-tests/composability/forwarder/src/fwd_sft.rs
+++ b/contracts/feature-tests/composability/forwarder/src/fwd_sft.rs
@@ -26,9 +26,8 @@ pub trait ForwarderSftModule: fwd_storage::ForwarderStorageModule {
                     can_add_special_roles: true,
                 },
             )
-            .async_call()
             .with_callback(self.callbacks().sft_issue_callback(&caller))
-            .call_and_exit()
+            .async_call_and_exit()
     }
 
     #[callback]
diff --git a/contracts/feature-tests/composability/local-esdt-and-nft/src/lib.rs b/contracts/feature-tests/composability/local-esdt-and-nft/src/lib.rs
index 9923ef89e5..55f0577795 100644
--- a/contracts/feature-tests/composability/local-esdt-and-nft/src/lib.rs
+++ b/contracts/feature-tests/composability/local-esdt-and-nft/src/lib.rs
@@ -48,9 +48,8 @@ pub trait LocalEsdtAndEsdtNft {
                     can_add_special_roles: true,
                 },
             )
-            .async_call()
             .with_callback(self.callbacks().esdt_issue_callback(&caller))
-            .call_and_exit()
+            .async_call_and_exit()
     }
 
     #[endpoint(localMint)]
@@ -87,9 +86,8 @@ pub trait LocalEsdtAndEsdtNft {
                     can_add_special_roles: true,
                 },
             )
-            .async_call()
             .with_callback(self.callbacks().nft_issue_callback(&caller))
-            .call_and_exit()
+            .async_call_and_exit()
     }
 
     #[endpoint(nftCreate)]
@@ -194,9 +192,8 @@ pub trait LocalEsdtAndEsdtNft {
                     can_add_special_roles: true,
                 },
             )
-            .async_call()
             .with_callback(self.callbacks().nft_issue_callback(&caller))
-            .call_and_exit()
+            .async_call_and_exit()
     }
 
     // common
@@ -211,9 +208,8 @@ pub trait LocalEsdtAndEsdtNft {
         self.send()
             .esdt_system_sc_proxy()
             .set_special_roles(&address, &token_identifier, roles.into_iter())
-            .async_call()
             .with_callback(self.callbacks().change_roles_callback())
-            .call_and_exit()
+            .async_call_and_exit()
     }
 
     #[endpoint(unsetLocalRoles)]
@@ -226,9 +222,8 @@ pub trait LocalEsdtAndEsdtNft {
         self.send()
             .esdt_system_sc_proxy()
             .unset_special_roles(&address, &token_identifier, roles.into_iter())
-            .async_call()
             .with_callback(self.callbacks().change_roles_callback())
-            .call_and_exit()
+            .async_call_and_exit()
     }
 
     #[endpoint(controlChanges)]
@@ -242,8 +237,7 @@ pub trait LocalEsdtAndEsdtNft {
         self.send()
             .esdt_system_sc_proxy()
             .control_changes(&token, &property_arguments)
-            .async_call()
-            .call_and_exit();
+            .async_call_and_exit();
     }
 
     // views
diff --git a/contracts/feature-tests/composability/promises-features/src/fwd_call_promise_direct.rs b/contracts/feature-tests/composability/promises-features/src/fwd_call_promise_direct.rs
index b722ad4f5d..78635d26b6 100644
--- a/contracts/feature-tests/composability/promises-features/src/fwd_call_promise_direct.rs
+++ b/contracts/feature-tests/composability/promises-features/src/fwd_call_promise_direct.rs
@@ -20,7 +20,6 @@ pub trait CallPromisesDirectModule {
             .payment(payment)
             .arguments_raw(args.to_arg_buffer())
             .gas(gas_limit)
-            .async_call_promise()
             .callback(self.callbacks().the_one_callback(1001, 1002u32.into()))
             .gas_for_callback(extra_gas_for_callback)
             .register_promise();
@@ -46,7 +45,6 @@ pub trait CallPromisesDirectModule {
             .raw_call(endpoint_name)
             .payment(EgldOrMultiEsdtPayment::MultiEsdt(token_payments_vec))
             .gas(gas_limit)
-            .async_call_promise()
             .callback(self.callbacks().the_one_callback(2001, 2002u32.into()))
             .gas_for_callback(extra_gas_for_callback)
             .register_promise();
diff --git a/contracts/feature-tests/composability/promises-features/src/fwd_call_promises_bt.rs b/contracts/feature-tests/composability/promises-features/src/fwd_call_promises_bt.rs
index f6cbbfa188..2634e2c5ac 100644
--- a/contracts/feature-tests/composability/promises-features/src/fwd_call_promises_bt.rs
+++ b/contracts/feature-tests/composability/promises-features/src/fwd_call_promises_bt.rs
@@ -21,7 +21,6 @@ pub trait CallPromisesBackTransfersModule: common::CommonModule {
             .typed(vault_proxy::VaultProxy)
             .retrieve_funds(token, token_nonce, amount)
             .gas(gas_limit)
-            .async_call()
             .callback(self.callbacks().retrieve_funds_back_transfers_callback())
             .gas_for_callback(10_000_000)
             .register_promise();
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 5cad76733c..eacc3064d0 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
@@ -73,8 +73,7 @@ pub trait ProxyTestFirst {
             .typed(pay_me_proxy::PayMeProxy)
             .pay_me(0x56)
             .egld(payment)
-            .async_call()
-            .call_and_exit();
+            .async_call_and_exit();
     }
 
     #[payable("EGLD")]
@@ -103,8 +102,7 @@ pub trait ProxyTestFirst {
                 [3u8; 3].to_vec(),
                 &ManagedAddress::from(&HARDCODED_ADDRESS),
             )
-            .async_call()
-            .call_and_exit()
+            .async_call_and_exit()
     }
 
     #[endpoint(messageOtherContractWithCallback)]
diff --git a/contracts/feature-tests/composability/recursive-caller/src/recursive_caller.rs b/contracts/feature-tests/composability/recursive-caller/src/recursive_caller.rs
index 339a9c7304..d75b516926 100644
--- a/contracts/feature-tests/composability/recursive-caller/src/recursive_caller.rs
+++ b/contracts/feature-tests/composability/recursive-caller/src/recursive_caller.rs
@@ -51,8 +51,7 @@ pub trait RecursiveCaller {
                 .to(&self_address)
                 .typed(self_proxy::RecursiveCallerProxy)
                 .recursive_send_funds(to, token_identifier, amount, counter - 1)
-                .async_call()
-                .call_and_exit()
+                .async_call_and_exit()
         }
     }
 
diff --git a/contracts/modules/src/bonding_curve/utils/owner_endpoints.rs b/contracts/modules/src/bonding_curve/utils/owner_endpoints.rs
index 820ba41446..382e1fbc28 100644
--- a/contracts/modules/src/bonding_curve/utils/owner_endpoints.rs
+++ b/contracts/modules/src/bonding_curve/utils/owner_endpoints.rs
@@ -25,8 +25,7 @@ pub trait OwnerEndpointsModule: storage::StorageModule + events::EventsModule {
         self.send()
             .esdt_system_sc_proxy()
             .set_special_roles(&address, &token_identifier, roles.into_iter())
-            .async_call()
-            .call_and_exit()
+            .async_call_and_exit()
     }
 
     #[endpoint(unsetLocalRoles)]
@@ -39,8 +38,7 @@ pub trait OwnerEndpointsModule: storage::StorageModule + events::EventsModule {
         self.send()
             .esdt_system_sc_proxy()
             .unset_special_roles(&address, &token_identifier, roles.into_iter())
-            .async_call()
-            .call_and_exit()
+            .async_call_and_exit()
     }
 
     fn set_bonding_curve<T>(
diff --git a/contracts/modules/src/esdt.rs b/contracts/modules/src/esdt.rs
index f39e5fe650..ea977f53be 100644
--- a/contracts/modules/src/esdt.rs
+++ b/contracts/modules/src/esdt.rs
@@ -49,9 +49,8 @@ pub trait EsdtModule {
                 token_type,
                 num_decimals,
             )
-            .async_call()
             .with_callback(self.callbacks().issue_callback())
-            .call_and_exit()
+            .async_call_and_exit()
     }
 
     #[callback]
diff --git a/framework/base/src/storage/mappers/token/non_fungible_token_mapper.rs b/framework/base/src/storage/mappers/token/non_fungible_token_mapper.rs
index cb0e645bc4..3f03ee9f6d 100644
--- a/framework/base/src/storage/mappers/token/non_fungible_token_mapper.rs
+++ b/framework/base/src/storage/mappers/token/non_fungible_token_mapper.rs
@@ -146,9 +146,8 @@ where
 
         storage_set(self.get_storage_key(), &TokenMapperState::<SA>::Pending);
         contract_call
-            .async_call()
             .with_callback(callback)
-            .call_and_exit();
+            .async_call_and_exit();
     }
 
     /// Important: If you use custom callback, remember to save the token ID in the callback and clear the mapper in case of error! Clear is unusable outside this specific case.
@@ -200,9 +199,8 @@ where
                 token_type,
                 num_decimals,
             )
-            .async_call()
             .callback(callback)
-            .call_and_exit()
+            .async_call_and_exit()
     }
 
     pub fn clear(&mut self) {
diff --git a/framework/base/src/storage/mappers/token/token_mapper.rs b/framework/base/src/storage/mappers/token/token_mapper.rs
index d9d923c2f8..77f435a546 100644
--- a/framework/base/src/storage/mappers/token/token_mapper.rs
+++ b/framework/base/src/storage/mappers/token/token_mapper.rs
@@ -86,7 +86,7 @@ where
             .typed(ESDTSystemSCProxy)
             .set_special_roles(address, token_id, roles[..].iter().cloned())
             .callback(opt_callback)
-            .call_and_exit()
+            .async_call_and_exit()
     }
 
     fn get_sc_address() -> ManagedAddress<SA> {
diff --git a/framework/base/src/types/interaction/tx_exec/tx_exec_async.rs b/framework/base/src/types/interaction/tx_exec/tx_exec_async.rs
index 238b978139..fbe098e559 100644
--- a/framework/base/src/types/interaction/tx_exec/tx_exec_async.rs
+++ b/framework/base/src/types/interaction/tx_exec/tx_exec_async.rs
@@ -157,6 +157,10 @@ where
     RH: TxResultHandler<Env>,
 {
     /// Backwards compatibility only.
+    #[deprecated(
+        since = "0.50.2",
+        note = "Backwards compatibility only, does nothing. Just delete. Use `async_call_and_exit` to launch asynchronous calls."
+    )]
     #[inline]
     pub fn async_call(self) -> Tx<Env, From, To, Payment, Gas, Data, RH> {
         Tx {
diff --git a/framework/base/src/types/interaction/tx_exec/tx_exec_async_promises.rs b/framework/base/src/types/interaction/tx_exec/tx_exec_async_promises.rs
index 1e1dee40a4..66ee5ec0ee 100644
--- a/framework/base/src/types/interaction/tx_exec/tx_exec_async_promises.rs
+++ b/framework/base/src/types/interaction/tx_exec/tx_exec_async_promises.rs
@@ -257,7 +257,11 @@ where
     Payment: TxPayment<TxScEnv<Api>>,
     Callback: TxPromisesCallback<Api>,
 {
-    /// Backwards compatibility only.
+    /// Backwards compatibility only.   
+    #[deprecated(
+        since = "0.50.2",
+        note = "Backwards compatibility only, does nothing. Just delete. Use `register_promise` to launch asynchronous calls."
+    )]
     #[inline]
     pub fn async_call_promise(self) -> Self {
         self

From 4570ca28b3aefd0b6ed488e4cc1f9d7a1deb7fee Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 24 May 2024 11:31:16 +0300
Subject: [PATCH 0920/1254] fmt

---
 .../src/storage/mappers/token/non_fungible_token_mapper.rs    | 4 +---
 .../src/types/interaction/tx_exec/tx_exec_async_promises.rs   | 4 +++-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/framework/base/src/storage/mappers/token/non_fungible_token_mapper.rs b/framework/base/src/storage/mappers/token/non_fungible_token_mapper.rs
index 3f03ee9f6d..70fc3be81f 100644
--- a/framework/base/src/storage/mappers/token/non_fungible_token_mapper.rs
+++ b/framework/base/src/storage/mappers/token/non_fungible_token_mapper.rs
@@ -145,9 +145,7 @@ where
         };
 
         storage_set(self.get_storage_key(), &TokenMapperState::<SA>::Pending);
-        contract_call
-            .with_callback(callback)
-            .async_call_and_exit();
+        contract_call.with_callback(callback).async_call_and_exit();
     }
 
     /// Important: If you use custom callback, remember to save the token ID in the callback and clear the mapper in case of error! Clear is unusable outside this specific case.
diff --git a/framework/base/src/types/interaction/tx_exec/tx_exec_async_promises.rs b/framework/base/src/types/interaction/tx_exec/tx_exec_async_promises.rs
index 66ee5ec0ee..38e38fcbcd 100644
--- a/framework/base/src/types/interaction/tx_exec/tx_exec_async_promises.rs
+++ b/framework/base/src/types/interaction/tx_exec/tx_exec_async_promises.rs
@@ -222,7 +222,9 @@ where
     ///
     /// This version of the method must never be called. It is only here to provide a more readable error.
     pub unsafe fn register_promise(self) {
-        ErrorHelper::<Api>::signal_error_with_message("register_promise requires explicit gas and function call");
+        ErrorHelper::<Api>::signal_error_with_message(
+            "register_promise requires explicit gas and function call",
+        );
     }
 }
 

From 4cc7be8cbe0ff81b082ce08092010407bad14991 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 24 May 2024 15:08:19 +0300
Subject: [PATCH 0921/1254] sc 0.50.2

---
 CHANGELOG.md                                   | 11 +++++++++++
 Cargo.lock                                     | 18 +++++++++---------
 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 ++--
 .../mappers/linked-list-repeat/meta/Cargo.toml |  2 +-
 .../mappers/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 +-
 .../benchmarks/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 +-
 contracts/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 +-
 .../Cargo.toml                                 |  2 +-
 .../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 +-
 .../examples/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 +++---
 contracts/examples/check-pause/meta/Cargo.toml |  2 +-
 contracts/examples/check-pause/wasm/Cargo.toml |  2 +-
 .../examples/crowdfunding-esdt/Cargo.toml      |  4 ++--
 .../examples/crowdfunding-esdt/meta/Cargo.toml |  2 +-
 .../examples/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 +-
 .../examples/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      |  8 ++++----
 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 +-
 contracts/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 ++--
 contracts/examples/proxy-pause/meta/Cargo.toml |  2 +-
 contracts/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 +-
 .../wasm-alloc-mem-fail/Cargo.toml             |  2 +-
 .../wasm-alloc-mem-leaking/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-legacy/Cargo.toml  |  4 ++--
 .../forwarder-legacy/meta/Cargo.toml           |  2 +-
 .../forwarder-legacy/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 +-
 .../composability/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 +-
 .../composability/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 ++--
 .../erc-style-contracts/erc721/meta/Cargo.toml |  2 +-
 .../erc-style-contracts/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 +-
 .../feature-tests/exchange-features/Cargo.toml |  4 ++--
 .../exchange-features/meta/Cargo.toml          |  2 +-
 .../exchange-features/wasm/Cargo.toml          |  2 +-
 .../formatted-message-features/Cargo.toml      |  4 ++--
 .../formatted-message-features/meta/Cargo.toml |  2 +-
 .../formatted-message-features/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 +-
 .../feature-tests/scenario-tester/Cargo.toml   |  4 ++--
 .../scenario-tester/meta/Cargo.toml            |  2 +-
 .../scenario-tester/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 +-
 .../use-module/wasm-use-module-view/Cargo.toml |  2 +-
 .../feature-tests/use-module/wasm/Cargo.toml   |  2 +-
 contracts/modules/Cargo.toml                   |  4 ++--
 framework/base/Cargo.toml                      |  4 ++--
 framework/derive/Cargo.toml                    |  2 +-
 framework/meta/Cargo.toml                      |  4 ++--
 .../generate_snippets/snippet_crate_gen.rs     |  4 ++--
 framework/meta/src/version_history.rs          |  3 ++-
 framework/scenario/Cargo.toml                  |  6 +++---
 framework/snippets/Cargo.toml                  |  4 ++--
 framework/wasm-adapter/Cargo.toml              |  4 ++--
 tools/mxpy-snippet-generator/Cargo.toml        |  2 +-
 tools/rust-debugger/format-tests/Cargo.toml    |  4 ++--
 272 files changed, 407 insertions(+), 395 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d412990d36..d997fb8e10 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,6 +26,17 @@ 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.50.2] - 2024-05-24
+- Unified transaction syntax:
+	- Better compilation error messages for malformed transactions;
+	- Deprecated methods `async_call` and `async_call_promises`, which are kept for backwards compatibility, but causing confusion among developers;
+	- Contract upgrade available in tests.
+- `sc-meta` proxy compare option, which checks that proxies are up to date. Useful for CI.
+- `TypeAbi` - removed `Unmanaged` associated type trait bounds, and implemented it for more types.
+- Removed jitter from interactor transaction fetch.
+- Fixed an issue in the snippets generator.
+
 ## [sc 0.50.1] - 2024-05-16
 - `sc-meta all snippets` generates unified syntax.
 - Proxy generator can reference multi-contract variant.
diff --git a/Cargo.lock b/Cargo.lock
index 454c2c033d..391dd0874a 100755
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1890,7 +1890,7 @@ checksum = "b59072fa0624b55ae5ae3fa6bfa91515bbeb4ac440214bc4a509e2c8806d6e9f"
 
 [[package]]
 name = "multiversx-price-aggregator-sc"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "arrayvec",
  "getrandom 0.2.15",
@@ -1911,7 +1911,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "bitflags 2.5.0",
  "hex-literal",
@@ -1943,7 +1943,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -1954,7 +1954,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-meta"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "clap",
  "colored",
@@ -1980,14 +1980,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-scenario"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "base64",
  "bech32",
@@ -2014,7 +2014,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-snippets"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "base64",
  "env_logger",
@@ -2028,7 +2028,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]
@@ -2059,7 +2059,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-wegld-swap-sc"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
  "multiversx-sc-modules",
diff --git a/contracts/benchmarks/large-storage/Cargo.toml b/contracts/benchmarks/large-storage/Cargo.toml
index 138a09e851..a871323ea8 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.50.1"
+version = "0.50.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../framework/scenario"
diff --git a/contracts/benchmarks/large-storage/meta/Cargo.toml b/contracts/benchmarks/large-storage/meta/Cargo.toml
index 472e2b616f..7b7d6434b2 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.50.1"
+version = "0.50.2"
 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 f3f97e406a..201116d231 100644
--- a/contracts/benchmarks/large-storage/wasm/Cargo.toml
+++ b/contracts/benchmarks/large-storage/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/mappers/benchmark-common/Cargo.toml b/contracts/benchmarks/mappers/benchmark-common/Cargo.toml
index 45310eb044..6d0e59e219 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.50.1"
+version = "0.50.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../../framework/scenario"
diff --git a/contracts/benchmarks/mappers/linked-list-repeat/Cargo.toml b/contracts/benchmarks/mappers/linked-list-repeat/Cargo.toml
index a99aaed522..7189016168 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.50.1"
+version = "0.50.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.1"
+version = "0.50.2"
 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 158b09a734..91ad5d6a0d 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.50.1"
+version = "0.50.2"
 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 21d623d7be..55d6767463 100644
--- a/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/mappers/map-repeat/Cargo.toml b/contracts/benchmarks/mappers/map-repeat/Cargo.toml
index 675b56e1c2..4bd096e126 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.50.1"
+version = "0.50.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../../framework/scenario"
diff --git a/contracts/benchmarks/mappers/map-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/map-repeat/meta/Cargo.toml
index 7a5424fa1a..8849ae32c6 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.50.1"
+version = "0.50.2"
 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 a525b02f79..f147ed5eb5 100644
--- a/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/mappers/queue-repeat/Cargo.toml b/contracts/benchmarks/mappers/queue-repeat/Cargo.toml
index 4d884954c0..2a20ef63db 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.50.1"
+version = "0.50.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../../framework/scenario"
diff --git a/contracts/benchmarks/mappers/queue-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/queue-repeat/meta/Cargo.toml
index d063dba3c1..4cb5492359 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.50.1"
+version = "0.50.2"
 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 ec60e48a03..aff2a1bfd1 100644
--- a/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/mappers/set-repeat/Cargo.toml b/contracts/benchmarks/mappers/set-repeat/Cargo.toml
index ec51e7fde8..5da7bef443 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.50.1"
+version = "0.50.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../../framework/scenario"
diff --git a/contracts/benchmarks/mappers/set-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/set-repeat/meta/Cargo.toml
index 981872b36f..fc5fcd572a 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.50.1"
+version = "0.50.2"
 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 1154eaba4a..2ca364b011 100644
--- a/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.1"
+version = "0.50.2"
 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 683b716015..e074ee3ab2 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.50.1"
+version = "0.50.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.1"
+version = "0.50.2"
 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 0a2a2219fd..fdf2a1f601 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.50.1"
+version = "0.50.2"
 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 456d379155..23074413f9 100644
--- a/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/mappers/vec-repeat/Cargo.toml b/contracts/benchmarks/mappers/vec-repeat/Cargo.toml
index 7c72eaf04d..d26dc4edaa 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.50.1"
+version = "0.50.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../../framework/scenario"
diff --git a/contracts/benchmarks/mappers/vec-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/vec-repeat/meta/Cargo.toml
index 7555f13c48..b6c3615731 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.50.1"
+version = "0.50.2"
 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 cfd4d5c540..d2a492a11b 100644
--- a/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/send-tx-repeat/Cargo.toml b/contracts/benchmarks/send-tx-repeat/Cargo.toml
index 90c0a64553..0dea5d128f 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.50.1"
+version = "0.50.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../framework/scenario"
diff --git a/contracts/benchmarks/send-tx-repeat/meta/Cargo.toml b/contracts/benchmarks/send-tx-repeat/meta/Cargo.toml
index 17554ab4c4..255d1e0159 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.50.1"
+version = "0.50.2"
 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 10d0093eb7..380231895b 100644
--- a/contracts/benchmarks/send-tx-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/send-tx-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/str-repeat/Cargo.toml b/contracts/benchmarks/str-repeat/Cargo.toml
index 4adfa00e76..e69129709b 100644
--- a/contracts/benchmarks/str-repeat/Cargo.toml
+++ b/contracts/benchmarks/str-repeat/Cargo.toml
@@ -12,10 +12,10 @@ path = "src/str_repeat.rs"
 managed-buffer-builder-cached = ["multiversx-sc/managed-buffer-builder-cached"]
 
 [dependencies.multiversx-sc]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../framework/scenario"
diff --git a/contracts/benchmarks/str-repeat/meta/Cargo.toml b/contracts/benchmarks/str-repeat/meta/Cargo.toml
index 772906e453..ced6e8835b 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.50.1"
+version = "0.50.2"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.toml b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.toml
index 5b30b06c37..3911218a2c 100644
--- a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.toml
+++ b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.toml b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.toml
index 0a1b7a6c85..51a8622a2a 100644
--- a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.toml
+++ b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.toml
@@ -29,7 +29,7 @@ path = ".."
 features = ["managed-buffer-builder-cached"]
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/str-repeat/wasm/Cargo.toml b/contracts/benchmarks/str-repeat/wasm/Cargo.toml
index bcf0787432..cd9f64bc2c 100644
--- a/contracts/benchmarks/str-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/str-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/core/price-aggregator/Cargo.toml b/contracts/core/price-aggregator/Cargo.toml
index 98c6565aa7..3ed7a01c40 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.50.1"
+version = "0.50.2"
 authors = [
     "Claudiu-Marcel Bruda <claudiu.bruda@multiversx.com>",
     "MultiversX <contact@multiversx.com>",
@@ -19,15 +19,15 @@ edition = "2021"
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../framework/scenario"
 
 [dependencies]
diff --git a/contracts/core/price-aggregator/meta/Cargo.toml b/contracts/core/price-aggregator/meta/Cargo.toml
index e1814d1cba..1b2e87862c 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.50.1"
+version = "0.50.2"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.50.1"
+version = "0.50.2"
 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 f98a12e4e5..2ab14a672b 100644
--- a/contracts/core/price-aggregator/wasm/Cargo.toml
+++ b/contracts/core/price-aggregator/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/core/wegld-swap/Cargo.toml b/contracts/core/wegld-swap/Cargo.toml
index 016a09db45..559e62d1f5 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.50.1"
+version = "0.50.2"
 
 authors = [
     "Dorin Iancu <dorin.iancu@multiversx.com>",
@@ -20,13 +20,13 @@ edition = "2021"
 path = "src/wegld.rs"
 
 [dependencies.multiversx-sc]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../framework/scenario"
diff --git a/contracts/core/wegld-swap/meta/Cargo.toml b/contracts/core/wegld-swap/meta/Cargo.toml
index d728cc1385..e8e744932d 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.50.1"
+version = "0.50.2"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.50.1"
+version = "0.50.2"
 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 097811caf9..b7b59a916d 100644
--- a/contracts/core/wegld-swap/wasm/Cargo.toml
+++ b/contracts/core/wegld-swap/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/adder/Cargo.toml b/contracts/examples/adder/Cargo.toml
index 58f704e35e..e2844c094b 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.50.1"
+version = "0.50.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/adder/interact/Cargo.toml b/contracts/examples/adder/interact/Cargo.toml
index 8c37a2b820..0ac38b4421 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.50.1"
+version = "0.50.2"
 path = "../../../../framework/snippets"
diff --git a/contracts/examples/adder/meta/Cargo.toml b/contracts/examples/adder/meta/Cargo.toml
index cacdec590b..06b56a359a 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.50.1"
+version = "0.50.2"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/examples/adder/wasm/Cargo.toml b/contracts/examples/adder/wasm/Cargo.toml
index a1b353be8d..aaabd53b90 100644
--- a/contracts/examples/adder/wasm/Cargo.toml
+++ b/contracts/examples/adder/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/bonding-curve-contract/Cargo.toml b/contracts/examples/bonding-curve-contract/Cargo.toml
index b224b700f3..ced45ebf9f 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.50.1"
+version = "0.50.2"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../framework/scenario"
 
diff --git a/contracts/examples/bonding-curve-contract/meta/Cargo.toml b/contracts/examples/bonding-curve-contract/meta/Cargo.toml
index 7e0659a813..95e77c79c7 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.50.1"
+version = "0.50.2"
 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 d9d6f45ab6..ab190b27a8 100644
--- a/contracts/examples/bonding-curve-contract/wasm/Cargo.toml
+++ b/contracts/examples/bonding-curve-contract/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/check-pause/Cargo.toml b/contracts/examples/check-pause/Cargo.toml
index 06b6762672..4bd63c8381 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.50.1"
+version = "0.50.2"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../framework/scenario"
 
diff --git a/contracts/examples/check-pause/meta/Cargo.toml b/contracts/examples/check-pause/meta/Cargo.toml
index eff5be4d68..b7f9c85915 100644
--- a/contracts/examples/check-pause/meta/Cargo.toml
+++ b/contracts/examples/check-pause/meta/Cargo.toml
@@ -9,6 +9,6 @@ authors = ["Alin Cruceat <alin.cruceat@multiversx.com>"]
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.50.1"
+version = "0.50.2"
 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 b2f886722e..9c38481868 100644
--- a/contracts/examples/check-pause/wasm/Cargo.toml
+++ b/contracts/examples/check-pause/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/crowdfunding-esdt/Cargo.toml b/contracts/examples/crowdfunding-esdt/Cargo.toml
index de3edda2c7..3d3edfced8 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.50.1"
+version = "0.50.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../framework/scenario"
 
 [dev-dependencies]
diff --git a/contracts/examples/crowdfunding-esdt/meta/Cargo.toml b/contracts/examples/crowdfunding-esdt/meta/Cargo.toml
index 38f50eaef7..79f4df47cc 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.50.1"
+version = "0.50.2"
 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 d916d9b70e..6d15ac8fbc 100644
--- a/contracts/examples/crowdfunding-esdt/wasm/Cargo.toml
+++ b/contracts/examples/crowdfunding-esdt/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/crypto-bubbles/Cargo.toml b/contracts/examples/crypto-bubbles/Cargo.toml
index 713794b94c..e4dc311d2e 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.50.1"
+version = "0.50.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/crypto-bubbles/meta/Cargo.toml b/contracts/examples/crypto-bubbles/meta/Cargo.toml
index 8d6b4c8999..73f33a4b14 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.50.1"
+version = "0.50.2"
 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 683b6b820f..f5c4528a2e 100644
--- a/contracts/examples/crypto-bubbles/wasm/Cargo.toml
+++ b/contracts/examples/crypto-bubbles/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.1"
+version = "0.50.2"
 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 3b051fe071..94179c554c 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.50.1"
+version = "0.50.2"
 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 53a0e86625..e8fd9c6e6e 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.50.1"
+version = "0.50.2"
 path = "../../../../../framework/base"
diff --git a/contracts/examples/crypto-kitties/kitty-auction/Cargo.toml b/contracts/examples/crypto-kitties/kitty-auction/Cargo.toml
index 05e2dae958..67eb27cf68 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.50.1"
+version = "0.50.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.1"
+version = "0.50.2"
 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 61092e4f43..38f8e36f86 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.50.1"
+version = "0.50.2"
 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 a469a46d21..808da081c2 100644
--- a/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.toml
+++ b/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.1"
+version = "0.50.2"
 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 9ee2ff5572..fca668f801 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.50.1"
+version = "0.50.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.1"
+version = "0.50.2"
 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 eb47f6dbaf..bb7a9b3569 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.50.1"
+version = "0.50.2"
 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 c830f58ce1..709ba6a261 100644
--- a/contracts/examples/crypto-kitties/kitty-genetic-alg/wasm/Cargo.toml
+++ b/contracts/examples/crypto-kitties/kitty-genetic-alg/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.1"
+version = "0.50.2"
 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 2a089c2baf..c9aac3863c 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.50.1"
+version = "0.50.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.1"
+version = "0.50.2"
 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 2870c2a53b..32327493ec 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.50.1"
+version = "0.50.2"
 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 80da1c3165..7f1bee0e21 100644
--- a/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.toml
+++ b/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/crypto-zombies/Cargo.toml b/contracts/examples/crypto-zombies/Cargo.toml
index bb2df3bf84..fb2f72487b 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.50.1"
+version = "0.50.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/crypto-zombies/meta/Cargo.toml b/contracts/examples/crypto-zombies/meta/Cargo.toml
index ac6971585c..75bf9f3916 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.50.1"
+version = "0.50.2"
 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 94f62bb240..2cb8a0ceb8 100644
--- a/contracts/examples/crypto-zombies/wasm/Cargo.toml
+++ b/contracts/examples/crypto-zombies/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/digital-cash/Cargo.toml b/contracts/examples/digital-cash/Cargo.toml
index 47a8895f89..2a7922c2e6 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.50.1"
+version = "0.50.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/digital-cash/meta/Cargo.toml b/contracts/examples/digital-cash/meta/Cargo.toml
index 23c6e92813..f34c8c2469 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.50.1"
+version = "0.50.2"
 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 f6299159b7..e7d6ec8364 100644
--- a/contracts/examples/digital-cash/wasm/Cargo.toml
+++ b/contracts/examples/digital-cash/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/empty/Cargo.toml b/contracts/examples/empty/Cargo.toml
index d86af47d4e..cbcf4ad3ce 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.50.1"
+version = "0.50.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../framework/scenario"
 
 [dev-dependencies]
diff --git a/contracts/examples/empty/meta/Cargo.toml b/contracts/examples/empty/meta/Cargo.toml
index b0921a72e0..8be1d53f76 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.50.1"
+version = "0.50.2"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/examples/empty/wasm/Cargo.toml b/contracts/examples/empty/wasm/Cargo.toml
index bfc29befd8..b6c5c3516f 100644
--- a/contracts/examples/empty/wasm/Cargo.toml
+++ b/contracts/examples/empty/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.1"
+version = "0.50.2"
 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 4fa249d387..4f02d0205f 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.50.1"
+version = "0.50.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.1"
+version = "0.50.2"
 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 4b1625c5d0..d796af7793 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.50.1"
+version = "0.50.2"
 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 ca0205d2df..929461a46b 100644
--- a/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.toml
+++ b/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/factorial/Cargo.toml b/contracts/examples/factorial/Cargo.toml
index dc27e25d1c..efce484b68 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.50.1"
+version = "0.50.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/factorial/meta/Cargo.toml b/contracts/examples/factorial/meta/Cargo.toml
index c25ba718c2..5682144b75 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.50.1"
+version = "0.50.2"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/examples/factorial/wasm/Cargo.toml b/contracts/examples/factorial/wasm/Cargo.toml
index 83a2e0d421..2c799f7bf8 100644
--- a/contracts/examples/factorial/wasm/Cargo.toml
+++ b/contracts/examples/factorial/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/fractional-nfts/Cargo.toml b/contracts/examples/fractional-nfts/Cargo.toml
index 24149e5c5a..953187e3f7 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.50.1"
+version = "0.50.2"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/fractional-nfts/meta/Cargo.toml b/contracts/examples/fractional-nfts/meta/Cargo.toml
index 0a5cea1450..737b34a290 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.50.1"
+version = "0.50.2"
 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 3e0e20a9b8..3829671280 100644
--- a/contracts/examples/fractional-nfts/wasm/Cargo.toml
+++ b/contracts/examples/fractional-nfts/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/lottery-esdt/Cargo.toml b/contracts/examples/lottery-esdt/Cargo.toml
index 2fa674fed7..1087c9fe42 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.50.1"
+version = "0.50.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/lottery-esdt/meta/Cargo.toml b/contracts/examples/lottery-esdt/meta/Cargo.toml
index 0f88b6c62e..80ddfc6019 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.50.1"
+version = "0.50.2"
 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 682b887dd3..a1c396b11b 100644
--- a/contracts/examples/lottery-esdt/wasm/Cargo.toml
+++ b/contracts/examples/lottery-esdt/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/multisig/Cargo.toml b/contracts/examples/multisig/Cargo.toml
index 6e5690103e..164091d43e 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.50.1"
+version = "0.50.2"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../framework/scenario"
 
 [dev-dependencies.adder]
@@ -27,7 +27,7 @@ path = "../adder"
 path = "../factorial"
 
 [dev-dependencies.multiversx-wegld-swap-sc]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../core/wegld-swap"
 
 [dev-dependencies]
diff --git a/contracts/examples/multisig/interact/Cargo.toml b/contracts/examples/multisig/interact/Cargo.toml
index ab946d05a9..458c1d21a0 100644
--- a/contracts/examples/multisig/interact/Cargo.toml
+++ b/contracts/examples/multisig/interact/Cargo.toml
@@ -18,17 +18,17 @@ toml = "0.8.6"
 path = ".."
 
 [dependencies.multiversx-sc-modules]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../../contracts/modules"
 
 [dependencies.multiversx-sc-snippets]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../../framework/snippets"
 
 [dependencies.multiversx-sc-scenario]
-version = "=0.50.1"
+version = "=0.50.2"
 path = "../../../../framework/scenario"
 
 [dependencies.multiversx-sc]
-version = "=0.50.1"
+version = "=0.50.2"
 path = "../../../../framework/base"
diff --git a/contracts/examples/multisig/meta/Cargo.toml b/contracts/examples/multisig/meta/Cargo.toml
index 228087eebf..4a79057621 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.50.1"
+version = "0.50.2"
 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 f97f320937..46c42fdf99 100644
--- a/contracts/examples/multisig/wasm-multisig-full/Cargo.toml
+++ b/contracts/examples/multisig/wasm-multisig-full/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.1"
+version = "0.50.2"
 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 b09c6148df..a48b794351 100644
--- a/contracts/examples/multisig/wasm-multisig-view/Cargo.toml
+++ b/contracts/examples/multisig/wasm-multisig-view/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/multisig/wasm/Cargo.toml b/contracts/examples/multisig/wasm/Cargo.toml
index f3ffba8979..fa8766e948 100644
--- a/contracts/examples/multisig/wasm/Cargo.toml
+++ b/contracts/examples/multisig/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/nft-minter/Cargo.toml b/contracts/examples/nft-minter/Cargo.toml
index 2eb3c915b5..596eda9ca4 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.50.1"
+version = "0.50.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/nft-minter/meta/Cargo.toml b/contracts/examples/nft-minter/meta/Cargo.toml
index fbf04e0e70..58ea1ab23f 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.50.1"
+version = "0.50.2"
 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 3910e59ad4..1dacee022e 100644
--- a/contracts/examples/nft-minter/wasm/Cargo.toml
+++ b/contracts/examples/nft-minter/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/nft-storage-prepay/Cargo.toml b/contracts/examples/nft-storage-prepay/Cargo.toml
index 0a38b9601a..1375d7c7e9 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.50.1"
+version = "0.50.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/nft-storage-prepay/meta/Cargo.toml b/contracts/examples/nft-storage-prepay/meta/Cargo.toml
index 8f63fdf9bb..a026628942 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.50.1"
+version = "0.50.2"
 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 0688e1e2f8..da89f646c1 100644
--- a/contracts/examples/nft-storage-prepay/wasm/Cargo.toml
+++ b/contracts/examples/nft-storage-prepay/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/nft-subscription/Cargo.toml b/contracts/examples/nft-subscription/Cargo.toml
index 1ed733f7e8..bf014cc67d 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.50.1"
+version = "0.50.2"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/nft-subscription/meta/Cargo.toml b/contracts/examples/nft-subscription/meta/Cargo.toml
index 40ebfe2200..0a366995ca 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.50.1"
+version = "0.50.2"
 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 d571edb793..18e8903d5b 100644
--- a/contracts/examples/nft-subscription/wasm/Cargo.toml
+++ b/contracts/examples/nft-subscription/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/order-book/factory/Cargo.toml b/contracts/examples/order-book/factory/Cargo.toml
index 96e8d7a9c3..5d371c0bd2 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.50.1"
+version = "0.50.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../../framework/scenario"
 
diff --git a/contracts/examples/order-book/factory/meta/Cargo.toml b/contracts/examples/order-book/factory/meta/Cargo.toml
index 6eb84b176d..b4fa226be6 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.50.1"
+version = "0.50.2"
 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 a4e8d15158..455c1537f2 100644
--- a/contracts/examples/order-book/factory/wasm/Cargo.toml
+++ b/contracts/examples/order-book/factory/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/order-book/pair/Cargo.toml b/contracts/examples/order-book/pair/Cargo.toml
index afb148fb1d..1f4b53b669 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.50.1"
+version = "0.50.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../../framework/scenario"
diff --git a/contracts/examples/order-book/pair/meta/Cargo.toml b/contracts/examples/order-book/pair/meta/Cargo.toml
index 9d0fe953c3..53dbc216ef 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.50.1"
+version = "0.50.2"
 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 fe727e8839..a5bc1a5d5d 100644
--- a/contracts/examples/order-book/pair/wasm/Cargo.toml
+++ b/contracts/examples/order-book/pair/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/ping-pong-egld/Cargo.toml b/contracts/examples/ping-pong-egld/Cargo.toml
index b7e9be8c11..3807471fa5 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.50.1"
+version = "0.50.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../framework/scenario"
 
diff --git a/contracts/examples/ping-pong-egld/meta/Cargo.toml b/contracts/examples/ping-pong-egld/meta/Cargo.toml
index d7aca8ceef..2c4d52c532 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.50.1"
+version = "0.50.2"
 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 c1b822e3a2..60304e4246 100644
--- a/contracts/examples/ping-pong-egld/wasm/Cargo.toml
+++ b/contracts/examples/ping-pong-egld/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/proxy-pause/Cargo.toml b/contracts/examples/proxy-pause/Cargo.toml
index 7f0b5626d4..e68c0898f3 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.50.1"
+version = "0.50.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.1"
+version = "0.50.2"
 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 9305353045..6dc206ddab 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.50.1"
+version = "0.50.2"
 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 3ef2cd3769..784dd313d7 100644
--- a/contracts/examples/proxy-pause/wasm/Cargo.toml
+++ b/contracts/examples/proxy-pause/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/rewards-distribution/Cargo.toml b/contracts/examples/rewards-distribution/Cargo.toml
index 9d79308662..fd57cdc09c 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.50.1"
+version = "0.50.2"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/rewards-distribution/meta/Cargo.toml b/contracts/examples/rewards-distribution/meta/Cargo.toml
index 8e74f644d1..1bf2ad7aec 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 <claudiu.bruda@multiversx.com>"]
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.50.1"
+version = "0.50.2"
 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 1cbf54d7aa..168b269b5c 100644
--- a/contracts/examples/rewards-distribution/wasm/Cargo.toml
+++ b/contracts/examples/rewards-distribution/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/seed-nft-minter/Cargo.toml b/contracts/examples/seed-nft-minter/Cargo.toml
index 1139b0ba20..642d20dd71 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.50.1"
+version = "0.50.2"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/seed-nft-minter/meta/Cargo.toml b/contracts/examples/seed-nft-minter/meta/Cargo.toml
index db7beb331a..2cdb799ac3 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 <claudiu.bruda@multiversx.com>"]
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.50.1"
+version = "0.50.2"
 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 0c82bd70a2..8842cd1ba4 100644
--- a/contracts/examples/seed-nft-minter/wasm/Cargo.toml
+++ b/contracts/examples/seed-nft-minter/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/token-release/Cargo.toml b/contracts/examples/token-release/Cargo.toml
index b5f588d0b0..ccce6904e8 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.50.1"
+version = "0.50.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../framework/scenario"
 
diff --git a/contracts/examples/token-release/meta/Cargo.toml b/contracts/examples/token-release/meta/Cargo.toml
index 45084d38dd..ccb13085e2 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.50.1"
+version = "0.50.2"
 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 b1098af606..447830c672 100644
--- a/contracts/examples/token-release/wasm/Cargo.toml
+++ b/contracts/examples/token-release/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/abi-tester/Cargo.toml b/contracts/feature-tests/abi-tester/Cargo.toml
index c7913e1be2..7f7242245e 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.50.1"
+version = "0.50.2"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../framework/scenario"
 
 [dev-dependencies.multiversx-sc-meta]
-version = "0.50.1"
+version = "0.50.2"
 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 658c272483..8073e8f6c7 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.50.1"
+            "version": "0.50.2"
         }
     },
     "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 c75a19fff9..33433ab28e 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.50.1"
+            "version": "0.50.2"
         }
     },
     "docs": [
diff --git a/contracts/feature-tests/abi-tester/meta/Cargo.toml b/contracts/feature-tests/abi-tester/meta/Cargo.toml
index c2af2a7964..e6171f9843 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.50.1"
+version = "0.50.2"
 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 18862cf3ff..ab1099ea02 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.1"
+version = "0.50.2"
 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 3d4c21b5d6..3da5f876a1 100644
--- a/contracts/feature-tests/abi-tester/wasm/Cargo.toml
+++ b/contracts/feature-tests/abi-tester/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/alloc-features/Cargo.toml b/contracts/feature-tests/alloc-features/Cargo.toml
index 36c6a81c5f..cf96bfd4bb 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.50.1"
+version = "0.50.2"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.1"
+version = "0.50.2"
 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 ab892f44fc..885dfa114c 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.50.1"
+version = "0.50.2"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml
index 8f9dc59eef..a38e648e13 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml
index f7a1c986a7..0537926850 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/alloc-features/wasm/Cargo.toml b/contracts/feature-tests/alloc-features/wasm/Cargo.toml
index 604d014fe7..4868d23d42 100644
--- a/contracts/feature-tests/alloc-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/alloc-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/basic-features/Cargo.toml b/contracts/feature-tests/basic-features/Cargo.toml
index ccfc3a21d0..e8ea571a13 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.50.1"
+version = "0.50.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../framework/scenario"
 
 [dependencies.multiversx-sc-modules]
-version = "0.50.1"
+version = "0.50.2"
 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 f2a15b0384..7bb99bfe84 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.50.1"
+version = "0.50.2"
 path = "../../../../framework/snippets"
diff --git a/contracts/feature-tests/basic-features/meta/Cargo.toml b/contracts/feature-tests/basic-features/meta/Cargo.toml
index dedbdbd5e8..1e9348e75c 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.50.1"
+version = "0.50.2"
 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 7e3b053bfe..99e2e9d5c6 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.1"
+version = "0.50.2"
 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 6c1ca521c4..0279a974b9 100644
--- a/contracts/feature-tests/basic-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/basic-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.1"
+version = "0.50.2"
 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 270c6e48ee..21027d1211 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.50.1"
+version = "0.50.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.1"
+version = "0.50.2"
 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 e0263aa923..a1d32efe6d 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.50.1"
+version = "0.50.2"
 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 4b4c47398e..efb04c52d0 100644
--- a/contracts/feature-tests/big-float-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/big-float-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/Cargo.toml b/contracts/feature-tests/composability/Cargo.toml
index 6d7e5a1a14..91c1da2653 100644
--- a/contracts/feature-tests/composability/Cargo.toml
+++ b/contracts/feature-tests/composability/Cargo.toml
@@ -36,9 +36,9 @@ path = "recursive-caller"
 path = "vault"
 
 [dependencies.multiversx-sc]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.1"
+version = "0.50.2"
 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 40dd7806c9..6114a2f8b4 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.50.1"
+version = "0.50.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.1"
+version = "0.50.2"
 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 78fecb685a..2f465de6a2 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.50.1"
+version = "0.50.2"
 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 71c249f42d..dda5daf882 100644
--- a/contracts/feature-tests/composability/builtin-func-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/builtin-func-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.1"
+version = "0.50.2"
 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 22dbfcf60f..f0785ce123 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.50.1"
+version = "0.50.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.1"
+version = "0.50.2"
 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 5dc5a8c70c..ef6a85fa3b 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
@@ -9,10 +9,10 @@ publish = false
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.1"
+version = "0.50.2"
 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 e6bf521eb3..5aeb82dd75 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.50.1"
+version = "0.50.2"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.50.1"
+version = "0.50.2"
 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 75bf650c13..b891bd5bed 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.1"
+version = "0.50.2"
 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 c58bf7eeba..5155115bb0 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.50.1"
+version = "0.50.2"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.1"
+version = "0.50.2"
 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 cd435c65b1..7b8094af55 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.50.1"
+version = "0.50.2"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.50.1"
+version = "0.50.2"
 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 57fdd2a32d..6c7c139532 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.1"
+version = "0.50.2"
 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 f232ba1fc2..a76a45818c 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.50.1"
+version = "0.50.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.1"
+version = "0.50.2"
 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 239c176cd6..9537044891 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.50.1"
+version = "0.50.2"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.1"
+version = "0.50.2"
 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 1623016c58..7cdf43adda 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.50.1"
+version = "0.50.2"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.50.1"
+version = "0.50.2"
 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 9d948ed1a8..09de3c1015 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.1"
+version = "0.50.2"
 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 4134271eee..4f909f3aad 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
@@ -9,10 +9,10 @@ publish = false
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.1"
+version = "0.50.2"
 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 30423fa072..00ca2de2c7 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.50.1"
+version = "0.50.2"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.50.1"
+version = "0.50.2"
 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 bd92a51740..a640e0b8f7 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/forwarder-legacy/Cargo.toml b/contracts/feature-tests/composability/forwarder-legacy/Cargo.toml
index 018aafdd8f..4a037a62e9 100644
--- a/contracts/feature-tests/composability/forwarder-legacy/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-legacy/Cargo.toml
@@ -12,10 +12,10 @@ path = "src/forwarder_legacy_main.rs"
 path = "../vault"
 
 [dependencies.multiversx-sc]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../../framework/scenario"
 
diff --git a/contracts/feature-tests/composability/forwarder-legacy/meta/Cargo.toml b/contracts/feature-tests/composability/forwarder-legacy/meta/Cargo.toml
index 7031720601..dcec47e4ce 100644
--- a/contracts/feature-tests/composability/forwarder-legacy/meta/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-legacy/meta/Cargo.toml
@@ -8,6 +8,6 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../../../framework/meta"
 default-features = false
diff --git a/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.toml b/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.toml
index aa9c8d2cd1..804df32de4 100644
--- a/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.1"
+version = "0.50.2"
 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 5b874c3212..599c672f52 100644
--- a/contracts/feature-tests/composability/forwarder-queue/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-queue/Cargo.toml
@@ -9,14 +9,14 @@ publish = false
 path = "src/forwarder_queue.rs"
 
 [dependencies.multiversx-sc]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../../framework/wasm-adapter"
 optional = true
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.1"
+version = "0.50.2"
 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 2044404279..4f6a89d5eb 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.50.1"
+version = "0.50.2"
 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 37d301cb4f..4120330f0c 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.1"
+version = "0.50.2"
 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 9f95037b69..642a6d59f9 100644
--- a/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.1"
+version = "0.50.2"
 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 4059317f1f..7a6002beec 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.50.1"
+version = "0.50.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.1"
+version = "0.50.2"
 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 abad11606a..36eed72979 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.50.1"
+version = "0.50.2"
 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 8fb817d32f..7f3695a14d 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.1"
+version = "0.50.2"
 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 a344f1b8f0..0953d307e0 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.1"
+version = "0.50.2"
 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 805e5bcc3f..0e786a35be 100644
--- a/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/forwarder/Cargo.toml b/contracts/feature-tests/composability/forwarder/Cargo.toml
index 01b55029fa..b49df0fa82 100644
--- a/contracts/feature-tests/composability/forwarder/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder/Cargo.toml
@@ -9,10 +9,10 @@ publish = false
 path = "src/forwarder_main.rs"
 
 [dependencies.multiversx-sc]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../../framework/scenario"
 
diff --git a/contracts/feature-tests/composability/forwarder/meta/Cargo.toml b/contracts/feature-tests/composability/forwarder/meta/Cargo.toml
index 9adb95c2a1..73ce018f3f 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.50.1"
+version = "0.50.2"
 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 d84c2f897c..5d1011af13 100644
--- a/contracts/feature-tests/composability/forwarder/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/interact/Cargo.toml b/contracts/feature-tests/composability/interact/Cargo.toml
index 366f82213f..743416441f 100644
--- a/contracts/feature-tests/composability/interact/Cargo.toml
+++ b/contracts/feature-tests/composability/interact/Cargo.toml
@@ -15,9 +15,9 @@ serde = { version = "1.0", features = ["derive"] }
 toml = "0.8.6"
 
 [dependencies.multiversx-sc]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-snippets]
-version = "0.50.1"
+version = "0.50.2"
 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 69a627f332..abb9e6d870 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.50.1"
+version = "0.50.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.1"
+version = "0.50.2"
 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 c3751aee68..3ba448368b 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.50.1"
+version = "0.50.2"
 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 3ab1f371d3..56b0e6bb4d 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.1"
+version = "0.50.2"
 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 1957628882..bb67b51dda 100644
--- a/contracts/feature-tests/composability/promises-features/Cargo.toml
+++ b/contracts/feature-tests/composability/promises-features/Cargo.toml
@@ -9,6 +9,6 @@ publish = false
 path = "src/promises_main.rs"
 
 [dependencies.multiversx-sc]
-version = "0.50.1"
+version = "0.50.2"
 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 e9da47adf6..b60d2f0ecd 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.50.1"
+version = "0.50.2"
 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 ecfb439d11..c0825ad5eb 100644
--- a/contracts/feature-tests/composability/promises-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/promises-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.1"
+version = "0.50.2"
 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 e1c64de7a3..27dbeafb01 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.50.1"
+version = "0.50.2"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.1"
+version = "0.50.2"
 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 caa8b48cfc..b07b833343 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.50.1"
+version = "0.50.2"
 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 9b7a74f40d..493a515c05 100644
--- a/contracts/feature-tests/composability/proxy-test-first/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/proxy-test-first/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.1"
+version = "0.50.2"
 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 6b851b730c..ab9768b6c7 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.50.1"
+version = "0.50.2"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.1"
+version = "0.50.2"
 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 3d48f515e1..56dcd263bf 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.50.1"
+version = "0.50.2"
 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 19049f294b..b1f2387b8f 100644
--- a/contracts/feature-tests/composability/proxy-test-second/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/proxy-test-second/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.1"
+version = "0.50.2"
 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 657db9ff6a..5a3f79327d 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.50.1"
+version = "0.50.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.1"
+version = "0.50.2"
 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 e3bbc2ab4f..9bc0fce89b 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.50.1"
+version = "0.50.2"
 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 4fefcb2201..5eb5a69d31 100644
--- a/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.1"
+version = "0.50.2"
 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 18c033d87c..119058fffa 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.50.1"
+version = "0.50.2"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.1"
+version = "0.50.2"
 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 6a48904ac1..eb6b401033 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.50.1"
+version = "0.50.2"
 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 e308115d74..1c2401b202 100644
--- a/contracts/feature-tests/composability/transfer-role-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/transfer-role-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/vault/Cargo.toml b/contracts/feature-tests/composability/vault/Cargo.toml
index 81140f8b4d..24b2c34f4e 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.50.1"
+version = "0.50.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../../framework/scenario"
diff --git a/contracts/feature-tests/composability/vault/meta/Cargo.toml b/contracts/feature-tests/composability/vault/meta/Cargo.toml
index 659bdd4a50..08eb0bd267 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.50.1"
+version = "0.50.2"
 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 c31e954ac5..789f13460d 100644
--- a/contracts/feature-tests/composability/vault/wasm-vault-promises/Cargo.toml
+++ b/contracts/feature-tests/composability/vault/wasm-vault-promises/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.1"
+version = "0.50.2"
 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 b36434739a..427ea7a408 100644
--- a/contracts/feature-tests/composability/vault/wasm-vault-upgrade/Cargo.toml
+++ b/contracts/feature-tests/composability/vault/wasm-vault-upgrade/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.1"
+version = "0.50.2"
 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 86b21b5a5a..c82cbcced7 100644
--- a/contracts/feature-tests/composability/vault/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/vault/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.1"
+version = "0.50.2"
 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 6451c0441d..a5854218fc 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.50.1"
+version = "0.50.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.1"
+version = "0.50.2"
 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 e736530831..81143f9bc1 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.50.1"
+version = "0.50.2"
 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 0633d87ccc..1213ae403c 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.1"
+version = "0.50.2"
 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 807f95adc6..a630345f50 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.50.1"
+version = "0.50.2"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.1"
+version = "0.50.2"
 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 b42302f8e5..b2687c29c0 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.50.1"
+version = "0.50.2"
 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 0f6651dfb8..b45c7437a9 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.1"
+version = "0.50.2"
 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 bc22058201..dde5f3ff77 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.50.1"
+version = "0.50.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.1"
+version = "0.50.2"
 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 ffc26f129a..9fd49525c9 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.50.1"
+version = "0.50.2"
 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 c3b8a0889d..e694030313 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.1"
+version = "0.50.2"
 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 c121ca828b..20ad72c3db 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.50.1"
+version = "0.50.2"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.1"
+version = "0.50.2"
 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 d29ac71de7..8f99f0a3ed 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.50.1"
+version = "0.50.2"
 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 b3a72d9f86..c3b9513a5c 100644
--- a/contracts/feature-tests/erc-style-contracts/erc1155/wasm/Cargo.toml
+++ b/contracts/feature-tests/erc-style-contracts/erc1155/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.1"
+version = "0.50.2"
 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 6036d0c34e..174608fa33 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.50.1"
+version = "0.50.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.1"
+version = "0.50.2"
 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 7693bb48e3..239c28da37 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.50.1"
+version = "0.50.2"
 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 a93aad0954..42971d74de 100644
--- a/contracts/feature-tests/erc-style-contracts/erc20/wasm/Cargo.toml
+++ b/contracts/feature-tests/erc-style-contracts/erc20/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.1"
+version = "0.50.2"
 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 142cf1c42c..6542540c70 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.50.1"
+version = "0.50.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.1"
+version = "0.50.2"
 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 e408e153ab..30baf33bd5 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.50.1"
+version = "0.50.2"
 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 4886b668bc..a5c5765e1e 100644
--- a/contracts/feature-tests/erc-style-contracts/erc721/wasm/Cargo.toml
+++ b/contracts/feature-tests/erc-style-contracts/erc721/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.1"
+version = "0.50.2"
 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 5752b59be0..fbbcae82e6 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.50.1"
+version = "0.50.2"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.1"
+version = "0.50.2"
 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 325e6e61b2..0fc8f82cd9 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.50.1"
+version = "0.50.2"
 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 c48f778202..0625680ae6 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.1"
+version = "0.50.2"
 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 6937de32bb..a5a4670a95 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.50.1"
+version = "0.50.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.1"
+version = "0.50.2"
 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 ea3ee87423..08b53f9c08 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.50.1"
+version = "0.50.2"
 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 12b5fce711..8cc53b0a15 100644
--- a/contracts/feature-tests/esdt-system-sc-mock/wasm/Cargo.toml
+++ b/contracts/feature-tests/esdt-system-sc-mock/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/exchange-features/Cargo.toml b/contracts/feature-tests/exchange-features/Cargo.toml
index 3ecd59b340..6c931fa94f 100644
--- a/contracts/feature-tests/exchange-features/Cargo.toml
+++ b/contracts/feature-tests/exchange-features/Cargo.toml
@@ -9,9 +9,9 @@ publish = false
 path = "src/exchange_features.rs"
 
 [dependencies.multiversx-sc]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../framework/scenario"
diff --git a/contracts/feature-tests/exchange-features/meta/Cargo.toml b/contracts/feature-tests/exchange-features/meta/Cargo.toml
index c58de5bd9e..897e04471b 100644
--- a/contracts/feature-tests/exchange-features/meta/Cargo.toml
+++ b/contracts/feature-tests/exchange-features/meta/Cargo.toml
@@ -8,6 +8,6 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/feature-tests/exchange-features/wasm/Cargo.toml b/contracts/feature-tests/exchange-features/wasm/Cargo.toml
index d39e3d226a..637ba98293 100644
--- a/contracts/feature-tests/exchange-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/exchange-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.1"
+version = "0.50.2"
 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 48af06e141..0437e961bf 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.50.1"
+version = "0.50.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.1"
+version = "0.50.2"
 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 925ef3f2e4..44e6c0d1e3 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.50.1"
+version = "0.50.2"
 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 2afee872bf..875d438dd0 100644
--- a/contracts/feature-tests/formatted-message-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/formatted-message-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.1"
+version = "0.50.2"
 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 69eaacdd1e..99cd9f8d33 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.50.1"
+version = "0.50.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.1"
+version = "0.50.2"
 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 b57398d162..1a307e3000 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.50.1"
+version = "0.50.2"
 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 b7ce8dec6d..5112f7b43d 100644
--- a/contracts/feature-tests/managed-map-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/managed-map-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.1"
+version = "0.50.2"
 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 a548293fe5..46ef193145 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.50.1"
+version = "0.50.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.1"
+version = "0.50.2"
 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 9bd9d2503b..53f22000c2 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.50.1"
+version = "0.50.2"
 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 d18f4d8c59..a78bd20b73 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.1"
+version = "0.50.2"
 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 308fe5594c..514bb760d2 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
@@ -29,7 +29,7 @@ path = ".."
 features = ["example_feature"]
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.1"
+version = "0.50.2"
 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 ce8564d6e3..e9fb18e566 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.1"
+version = "0.50.2"
 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 488124f208..a743c6f29e 100644
--- a/contracts/feature-tests/multi-contract-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/multi-contract-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.1"
+version = "0.50.2"
 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 b3c853f36d..3b3e93c6da 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.50.1"
+version = "0.50.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.1"
+version = "0.50.2"
 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 7ecc5c0f06..e163907acb 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.50.1"
+version = "0.50.2"
 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 b982ef6d44..4ac10cfb9a 100644
--- a/contracts/feature-tests/panic-message-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/panic-message-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/payable-features/Cargo.toml b/contracts/feature-tests/payable-features/Cargo.toml
index e2f3a9eb7e..72c3a3c792 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.50.1"
+version = "0.50.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../framework/scenario"
diff --git a/contracts/feature-tests/payable-features/meta/Cargo.toml b/contracts/feature-tests/payable-features/meta/Cargo.toml
index c990e2b3f7..2777b86b88 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.50.1"
+version = "0.50.2"
 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 236ad71f17..48d050441a 100644
--- a/contracts/feature-tests/payable-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/payable-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.1"
+version = "0.50.2"
 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 c7b2c13a8d..c5f0cf482e 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.50.1"
+version = "0.50.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.1"
+version = "0.50.2"
 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 459ea4ed3d..4d83a319b3 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.50.1"
+version = "0.50.2"
 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 3145478e01..46cc2f507e 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.50.1"
+version = "0.50.2"
 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 bdc003a53a..65c5fe6cfd 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.50.1"
+// version = "0.50.2"
 // 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 7106170016..5d0df5dea1 100644
--- a/contracts/feature-tests/rust-snippets-generator-test/wasm/Cargo.toml
+++ b/contracts/feature-tests/rust-snippets-generator-test/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.1"
+version = "0.50.2"
 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 5e4e9c3658..aa14f96315 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.50.1"
+version = "0.50.2"
 path = "../../../framework/base"
 features = [ "alloc" ]
 
@@ -17,7 +17,7 @@ path = "../../examples/adder"
 path = "../../feature-tests/basic-features"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.1"
+version = "0.50.2"
 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 57017161e8..36ec302bd6 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.50.1"
+version = "0.50.2"
 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 1f804a8b00..14c563d0b6 100644
--- a/contracts/feature-tests/rust-testing-framework-tester/wasm/Cargo.toml
+++ b/contracts/feature-tests/rust-testing-framework-tester/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/scenario-tester/Cargo.toml b/contracts/feature-tests/scenario-tester/Cargo.toml
index 6b8a851a73..00680030c5 100644
--- a/contracts/feature-tests/scenario-tester/Cargo.toml
+++ b/contracts/feature-tests/scenario-tester/Cargo.toml
@@ -9,9 +9,9 @@ publish = false
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../framework/scenario"
diff --git a/contracts/feature-tests/scenario-tester/meta/Cargo.toml b/contracts/feature-tests/scenario-tester/meta/Cargo.toml
index 9ef6388239..cf831d2e75 100644
--- a/contracts/feature-tests/scenario-tester/meta/Cargo.toml
+++ b/contracts/feature-tests/scenario-tester/meta/Cargo.toml
@@ -8,6 +8,6 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/feature-tests/scenario-tester/wasm/Cargo.toml b/contracts/feature-tests/scenario-tester/wasm/Cargo.toml
index db973f8887..50041d3db4 100644
--- a/contracts/feature-tests/scenario-tester/wasm/Cargo.toml
+++ b/contracts/feature-tests/scenario-tester/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/use-module/Cargo.toml b/contracts/feature-tests/use-module/Cargo.toml
index 2af9a18a90..e458d9f2ca 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.50.1"
+version = "0.50.2"
 path = "../../../contracts/modules"
 
 [dependencies.multiversx-sc]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../framework/scenario"
 
 [dev-dependencies.multiversx-sc-meta]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../framework/meta"
diff --git a/contracts/feature-tests/use-module/meta/Cargo.toml b/contracts/feature-tests/use-module/meta/Cargo.toml
index 7959e308e6..f80dc60415 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.50.1"
+version = "0.50.2"
 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 b5d1825853..950b4522d2 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.50.1"
+version = "0.50.2"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.50.1"
+version = "0.50.2"
 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 c64a1e3bf8..b8b1c76070 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.50.1"
+            "version": "0.50.2"
         }
     },
     "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 9be47a4ba3..bd09d65eb2 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.50.1"
+            "version": "0.50.2"
         }
     },
     "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 6f90f19ed4..2d2f159fca 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.1"
+version = "0.50.2"
 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 2a36644a09..6a09664a03 100644
--- a/contracts/feature-tests/use-module/wasm/Cargo.toml
+++ b/contracts/feature-tests/use-module/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/modules/Cargo.toml b/contracts/modules/Cargo.toml
index 76b6bb88c2..c5d5c5c811 100644
--- a/contracts/modules/Cargo.toml
+++ b/contracts/modules/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-modules"
-version = "0.50.1"
+version = "0.50.2"
 edition = "2021"
 
 authors = ["MultiversX <contact@multiversx.com>"]
@@ -17,5 +17,5 @@ categories = ["no-std", "wasm", "cryptography::cryptocurrencies"]
 alloc = ["multiversx-sc/alloc"]
 
 [dependencies.multiversx-sc]
-version = "0.50.1"
+version = "0.50.2"
 path = "../../framework/base"
diff --git a/framework/base/Cargo.toml b/framework/base/Cargo.toml
index 2e07c40cef..9d28abbf43 100644
--- a/framework/base/Cargo.toml
+++ b/framework/base/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc"
-version = "0.50.1"
+version = "0.50.2"
 edition = "2021"
 
 authors = ["Andrei Marinica <andrei.marinica@multiversx.com>", "MultiversX <contact@multiversx.com>"]
@@ -29,7 +29,7 @@ num-traits = { version = "=0.2.19", default-features = false }
 unwrap-infallible = "0.1.5"
 
 [dependencies.multiversx-sc-derive]
-version = "=0.50.1"
+version = "=0.50.2"
 path = "../derive"
 
 [dependencies.multiversx-sc-codec]
diff --git a/framework/derive/Cargo.toml b/framework/derive/Cargo.toml
index 51c4fbb757..5ce6412456 100644
--- a/framework/derive/Cargo.toml
+++ b/framework/derive/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-derive"
-version = "0.50.1"
+version = "0.50.2"
 edition = "2021"
 
 authors = ["Andrei Marinica <andrei.marinica@multiversx.com>", "MultiversX <contact@multiversx.com>"]
diff --git a/framework/meta/Cargo.toml b/framework/meta/Cargo.toml
index 21eae22f88..d85ef5976a 100644
--- a/framework/meta/Cargo.toml
+++ b/framework/meta/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-meta"
-version = "0.50.1"
+version = "0.50.2"
 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.50.1"
+version = "=0.50.2"
 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 bbfbb637a3..6b2b71129f 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
@@ -75,10 +75,10 @@ path = "src/{SNIPPETS_SOURCE_FILE_NAME}"
 path = ".."
 
 [dependencies.multiversx-sc-snippets]
-version = "0.50.1"
+version = "0.50.2"
 
 [dependencies.multiversx-sc]
-version = "0.50.1"
+version = "0.50.2"
 
 [dependencies]
 clap = {{ version = "4.4.7", features = ["derive"] }}
diff --git a/framework/meta/src/version_history.rs b/framework/meta/src/version_history.rs
index 281f9c496b..bebbc9e4d0 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.50.1);
+pub const LAST_VERSION: FrameworkVersion = framework_version!(0.50.2);
 
 /// Indicates where to stop with the upgrades.
 pub const LAST_UPGRADE_VERSION: FrameworkVersion = LAST_VERSION;
@@ -71,6 +71,7 @@ pub const VERSIONS: &[FrameworkVersion] = framework_versions![
     0.49.0,
     0.50.0,
     0.50.1,
+    0.50.2,
 ];
 
 #[rustfmt::skip]
diff --git a/framework/scenario/Cargo.toml b/framework/scenario/Cargo.toml
index 0262a9defa..f4eadf8a7b 100644
--- a/framework/scenario/Cargo.toml
+++ b/framework/scenario/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-scenario"
-version = "0.50.1"
+version = "0.50.2"
 edition = "2021"
 
 authors = [
@@ -41,12 +41,12 @@ path = "src/main.rs"
 run-go-tests = []
 
 [dependencies.multiversx-sc]
-version = "=0.50.1"
+version = "=0.50.2"
 features = ["alloc", "num-bigint"]
 path = "../base"
 
 [dependencies.multiversx-sc-meta]
-version = "=0.50.1"
+version = "=0.50.2"
 path = "../meta"
 
 [dependencies.multiversx-chain-scenario-format]
diff --git a/framework/snippets/Cargo.toml b/framework/snippets/Cargo.toml
index 6d04472ecf..1d2f1d4235 100644
--- a/framework/snippets/Cargo.toml
+++ b/framework/snippets/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-snippets"
-version = "0.50.1"
+version = "0.50.2"
 edition = "2021"
 
 authors = ["MultiversX <contact@multiversx.com>"]
@@ -22,7 +22,7 @@ env_logger = "0.11"
 futures = "0.3"
 
 [dependencies.multiversx-sc-scenario]
-version = "=0.50.1"
+version = "=0.50.2"
 path = "../scenario"
 
 [dependencies.multiversx-sdk]
diff --git a/framework/wasm-adapter/Cargo.toml b/framework/wasm-adapter/Cargo.toml
index 3661cbf570..30dd14cb4d 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.50.1"
+version = "0.50.2"
 edition = "2021"
 
 authors = [
@@ -22,5 +22,5 @@ categories = [
 ]
 
 [dependencies.multiversx-sc]
-version = "=0.50.1"
+version = "=0.50.2"
 path = "../base"
diff --git a/tools/mxpy-snippet-generator/Cargo.toml b/tools/mxpy-snippet-generator/Cargo.toml
index 19411d33fd..7237cd25fb 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.50.1"
+version = "0.50.2"
 path = "../../framework/base"
 
 [dependencies]
diff --git a/tools/rust-debugger/format-tests/Cargo.toml b/tools/rust-debugger/format-tests/Cargo.toml
index fb02fdcd72..c74b08961f 100644
--- a/tools/rust-debugger/format-tests/Cargo.toml
+++ b/tools/rust-debugger/format-tests/Cargo.toml
@@ -9,11 +9,11 @@ name = "format-tests"
 path = "src/format_tests.rs"
 
 [dependencies.multiversx-sc]
-version = "=0.50.1"
+version = "=0.50.2"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-scenario]
-version = "=0.50.1"
+version = "=0.50.2"
 path = "../../../framework/scenario"
 
 [dependencies.multiversx-chain-vm]

From f26c8541f3e3af7bfcc60513aa2ebbfd38af49f1 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 24 May 2024 15:14:51 +0300
Subject: [PATCH 0922/1254] Cargo.lock update

---
 contracts/benchmarks/large-storage/wasm/Cargo.lock |  6 +++---
 .../mappers/linked-list-repeat/wasm/Cargo.lock     |  6 +++---
 .../benchmarks/mappers/map-repeat/wasm/Cargo.lock  |  6 +++---
 .../mappers/queue-repeat/wasm/Cargo.lock           |  6 +++---
 .../benchmarks/mappers/set-repeat/wasm/Cargo.lock  |  6 +++---
 .../mappers/single-value-repeat/wasm/Cargo.lock    |  6 +++---
 .../benchmarks/mappers/vec-repeat/wasm/Cargo.lock  |  6 +++---
 .../benchmarks/send-tx-repeat/wasm/Cargo.lock      |  6 +++---
 .../wasm-str-repeat-mb-builder-basic/Cargo.lock    |  6 +++---
 .../wasm-str-repeat-mb-builder-cached/Cargo.lock   |  6 +++---
 contracts/benchmarks/str-repeat/wasm/Cargo.lock    |  6 +++---
 contracts/core/price-aggregator/wasm/Cargo.lock    | 14 +++++++-------
 contracts/examples/adder/wasm/Cargo.lock           |  6 +++---
 .../bonding-curve-contract/wasm/Cargo.lock         |  8 ++++----
 contracts/examples/check-pause/wasm/Cargo.lock     |  8 ++++----
 .../examples/crowdfunding-esdt/wasm/Cargo.lock     |  6 +++---
 contracts/examples/crypto-bubbles/wasm/Cargo.lock  |  6 +++---
 .../crypto-kitties/kitty-auction/wasm/Cargo.lock   |  6 +++---
 .../kitty-genetic-alg/wasm/Cargo.lock              |  6 +++---
 .../crypto-kitties/kitty-ownership/wasm/Cargo.lock |  6 +++---
 contracts/examples/crypto-zombies/wasm/Cargo.lock  |  6 +++---
 contracts/examples/digital-cash/wasm/Cargo.lock    |  6 +++---
 contracts/examples/empty/wasm/Cargo.lock           |  6 +++---
 .../esdt-transfer-with-fee/wasm/Cargo.lock         |  6 +++---
 contracts/examples/factorial/wasm/Cargo.lock       |  6 +++---
 contracts/examples/fractional-nfts/wasm/Cargo.lock |  8 ++++----
 contracts/examples/lottery-esdt/wasm/Cargo.lock    |  6 +++---
 .../multisig/wasm-multisig-full/Cargo.lock         |  8 ++++----
 .../multisig/wasm-multisig-view/Cargo.lock         |  8 ++++----
 contracts/examples/multisig/wasm/Cargo.lock        |  8 ++++----
 contracts/examples/nft-minter/wasm/Cargo.lock      |  6 +++---
 .../examples/nft-storage-prepay/wasm/Cargo.lock    |  6 +++---
 .../examples/nft-subscription/wasm/Cargo.lock      |  8 ++++----
 .../examples/order-book/factory/wasm/Cargo.lock    |  6 +++---
 contracts/examples/order-book/pair/wasm/Cargo.lock |  6 +++---
 contracts/examples/ping-pong-egld/wasm/Cargo.lock  |  6 +++---
 contracts/examples/proxy-pause/wasm/Cargo.lock     |  6 +++---
 .../examples/rewards-distribution/wasm/Cargo.lock  |  8 ++++----
 contracts/examples/seed-nft-minter/wasm/Cargo.lock |  8 ++++----
 contracts/examples/token-release/wasm/Cargo.lock   |  6 +++---
 .../abi-tester/wasm-abi-tester-ev/Cargo.lock       |  6 +++---
 contracts/feature-tests/abi-tester/wasm/Cargo.lock |  6 +++---
 .../alloc-features/wasm-alloc-mem-fail/Cargo.lock  |  6 +++---
 .../wasm-alloc-mem-leaking/Cargo.lock              |  6 +++---
 .../feature-tests/alloc-features/wasm/Cargo.lock   |  6 +++---
 .../wasm-basic-features-storage-bytes/Cargo.lock   |  8 ++++----
 .../feature-tests/basic-features/wasm/Cargo.lock   |  8 ++++----
 .../big-float-features/wasm/Cargo.lock             |  6 +++---
 .../builtin-func-features/wasm/Cargo.lock          |  6 +++---
 .../first-contract/wasm/Cargo.lock                 |  6 +++---
 .../second-contract/wasm/Cargo.lock                |  6 +++---
 .../child/wasm/Cargo.lock                          |  6 +++---
 .../parent/wasm/Cargo.lock                         |  6 +++---
 .../composability/forwarder-legacy/wasm/Cargo.lock |  6 +++---
 .../wasm-forwarder-queue-promises/Cargo.lock       |  6 +++---
 .../composability/forwarder-queue/wasm/Cargo.lock  |  6 +++---
 .../wasm-forwarder-raw-init-async-call/Cargo.lock  |  6 +++---
 .../wasm-forwarder-raw-init-sync-call/Cargo.lock   |  6 +++---
 .../composability/forwarder-raw/wasm/Cargo.lock    |  6 +++---
 .../composability/forwarder/wasm/Cargo.lock        |  6 +++---
 .../local-esdt-and-nft/wasm/Cargo.lock             |  6 +++---
 .../promises-features/wasm/Cargo.lock              |  6 +++---
 .../composability/proxy-test-first/wasm/Cargo.lock |  6 +++---
 .../proxy-test-second/wasm/Cargo.lock              |  6 +++---
 .../composability/recursive-caller/wasm/Cargo.lock |  6 +++---
 .../transfer-role-features/wasm/Cargo.lock         |  8 ++++----
 .../vault/wasm-vault-promises/Cargo.lock           |  6 +++---
 .../vault/wasm-vault-upgrade/Cargo.lock            |  6 +++---
 .../composability/vault/wasm/Cargo.lock            |  6 +++---
 .../crowdfunding-erc20/wasm/Cargo.lock             |  6 +++---
 .../erc1155-marketplace/wasm/Cargo.lock            |  6 +++---
 .../erc1155-user-mock/wasm/Cargo.lock              |  6 +++---
 .../erc-style-contracts/erc1155/wasm/Cargo.lock    |  6 +++---
 .../erc-style-contracts/erc20/wasm/Cargo.lock      |  6 +++---
 .../erc-style-contracts/erc721/wasm/Cargo.lock     |  6 +++---
 .../lottery-erc20/wasm/Cargo.lock                  |  6 +++---
 .../esdt-system-sc-mock/wasm/Cargo.lock            |  6 +++---
 .../exchange-features/wasm/Cargo.lock              |  6 +++---
 .../formatted-message-features/wasm/Cargo.lock     |  6 +++---
 .../managed-map-features/wasm/Cargo.lock           |  6 +++---
 .../wasm-multi-contract-alt-impl/Cargo.lock        |  6 +++---
 .../wasm-multi-contract-example-feature/Cargo.lock |  6 +++---
 .../wasm-multi-contract-features-view/Cargo.lock   |  6 +++---
 .../multi-contract-features/wasm/Cargo.lock        |  6 +++---
 .../panic-message-features/wasm/Cargo.lock         |  6 +++---
 .../feature-tests/payable-features/wasm/Cargo.lock |  6 +++---
 .../rust-snippets-generator-test/wasm/Cargo.lock   |  6 +++---
 .../rust-testing-framework-tester/wasm/Cargo.lock  |  6 +++---
 .../feature-tests/scenario-tester/wasm/Cargo.lock  |  6 +++---
 .../use-module/wasm-use-module-view/Cargo.lock     |  8 ++++----
 contracts/feature-tests/use-module/wasm/Cargo.lock |  8 ++++----
 91 files changed, 291 insertions(+), 291 deletions(-)

diff --git a/contracts/benchmarks/large-storage/wasm/Cargo.lock b/contracts/benchmarks/large-storage/wasm/Cargo.lock
index 6c3138159c..c67989402e 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.50.1"
+version = "0.50.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.lock
index 7d4336903b..edc6e52181 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.50.1"
+version = "0.50.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.lock
index 738ff36847..30d336c349 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.50.1"
+version = "0.50.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.lock
index 0041f126e6..5abbf4c401 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.50.1"
+version = "0.50.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -78,7 +78,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -89,7 +89,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.lock
index 0bc82074e9..f1c90af28e 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.50.1"
+version = "0.50.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -78,7 +78,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -89,7 +89,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.lock
index f2e5f6584e..0fffaea416 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.50.1"
+version = "0.50.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -78,7 +78,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -89,7 +89,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.lock
index 067106a9b8..41f6cb18bc 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.50.1"
+version = "0.50.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -78,7 +78,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -89,7 +89,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/send-tx-repeat/wasm/Cargo.lock b/contracts/benchmarks/send-tx-repeat/wasm/Cargo.lock
index b47f70d1f1..9fdc45b1e8 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.50.1"
+version = "0.50.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.lock b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.lock
index 72a0309324..3e7e042a34 100644
--- a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.lock
+++ b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.lock
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.lock b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.lock
index 4333c2a196..9909b9bff2 100644
--- a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.lock
+++ b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.lock
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/str-repeat/wasm/Cargo.lock b/contracts/benchmarks/str-repeat/wasm/Cargo.lock
index 2635057539..77855726d0 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.50.1"
+version = "0.50.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/core/price-aggregator/wasm/Cargo.lock b/contracts/core/price-aggregator/wasm/Cargo.lock
index 3dc8ab55a8..92e909aaf8 100644
--- a/contracts/core/price-aggregator/wasm/Cargo.lock
+++ b/contracts/core/price-aggregator/wasm/Cargo.lock
@@ -74,9 +74,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.154"
+version = "0.2.155"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346"
+checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
 
 [[package]]
 name = "log"
@@ -86,7 +86,7 @@ checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
 
 [[package]]
 name = "multiversx-price-aggregator-sc"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "arrayvec",
  "getrandom",
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -136,7 +136,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -147,14 +147,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/adder/wasm/Cargo.lock b/contracts/examples/adder/wasm/Cargo.lock
index 4f7ffc739c..97e0051bfa 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.50.1"
+version = "0.50.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/bonding-curve-contract/wasm/Cargo.lock b/contracts/examples/bonding-curve-contract/wasm/Cargo.lock
index c85adf404a..7a560ca3e8 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.50.1"
+version = "0.50.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/check-pause/wasm/Cargo.lock b/contracts/examples/check-pause/wasm/Cargo.lock
index e1d6635cc2..5bfbf16ce0 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.50.1"
+version = "0.50.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crowdfunding-esdt/wasm/Cargo.lock b/contracts/examples/crowdfunding-esdt/wasm/Cargo.lock
index ed7e977086..ea046ff602 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.50.1"
+version = "0.50.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crypto-bubbles/wasm/Cargo.lock b/contracts/examples/crypto-bubbles/wasm/Cargo.lock
index efbe0fd923..d0dee467e9 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.50.1"
+version = "0.50.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.lock b/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.lock
index 8bd2d96c1a..4bba12fcd4 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.50.1"
+version = "0.50.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -115,7 +115,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -126,7 +126,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]
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 a198b8f2d6..cd5cdccd9b 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.50.1"
+version = "0.50.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -96,7 +96,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -107,7 +107,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.lock b/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.lock
index 713c3a2217..a83f028879 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.50.1"
+version = "0.50.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -106,7 +106,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -117,7 +117,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crypto-zombies/wasm/Cargo.lock b/contracts/examples/crypto-zombies/wasm/Cargo.lock
index b10338cf84..c74e4889c2 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.50.1"
+version = "0.50.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/digital-cash/wasm/Cargo.lock b/contracts/examples/digital-cash/wasm/Cargo.lock
index ac46f897c1..8c5ac9e548 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.50.1"
+version = "0.50.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/empty/wasm/Cargo.lock b/contracts/examples/empty/wasm/Cargo.lock
index acb71e6d3c..f34ec7c0b4 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.50.1"
+version = "0.50.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.lock b/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.lock
index 17bd817cf3..3a2a91c0c6 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.50.1"
+version = "0.50.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/factorial/wasm/Cargo.lock b/contracts/examples/factorial/wasm/Cargo.lock
index 5fe3c77436..e15341093b 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.50.1"
+version = "0.50.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/fractional-nfts/wasm/Cargo.lock b/contracts/examples/fractional-nfts/wasm/Cargo.lock
index a62f12c1c9..a6b66fb14a 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.50.1"
+version = "0.50.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/lottery-esdt/wasm/Cargo.lock b/contracts/examples/lottery-esdt/wasm/Cargo.lock
index fdb68843c2..e0da8484cd 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.50.1"
+version = "0.50.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/multisig/wasm-multisig-full/Cargo.lock b/contracts/examples/multisig/wasm-multisig-full/Cargo.lock
index 67cfca0743..00913e5bc8 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.50.1"
+version = "0.50.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/multisig/wasm-multisig-view/Cargo.lock b/contracts/examples/multisig/wasm-multisig-view/Cargo.lock
index 7995d61e7d..bd9ab8b5ec 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.50.1"
+version = "0.50.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/multisig/wasm/Cargo.lock b/contracts/examples/multisig/wasm/Cargo.lock
index 18239aa3ae..673fa33e75 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.50.1"
+version = "0.50.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/nft-minter/wasm/Cargo.lock b/contracts/examples/nft-minter/wasm/Cargo.lock
index 82f13d8566..fa1dc23826 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.50.1"
+version = "0.50.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/nft-storage-prepay/wasm/Cargo.lock b/contracts/examples/nft-storage-prepay/wasm/Cargo.lock
index 773b19b7e0..54f03f78aa 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.50.1"
+version = "0.50.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/nft-subscription/wasm/Cargo.lock b/contracts/examples/nft-subscription/wasm/Cargo.lock
index 916506adc6..86821b64b6 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.50.1"
+version = "0.50.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,14 +82,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/order-book/factory/wasm/Cargo.lock b/contracts/examples/order-book/factory/wasm/Cargo.lock
index 5279b161b2..d7ba4176e8 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.50.1"
+version = "0.50.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/order-book/pair/wasm/Cargo.lock b/contracts/examples/order-book/pair/wasm/Cargo.lock
index 7b2118b6aa..08be0f43aa 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.50.1"
+version = "0.50.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/ping-pong-egld/wasm/Cargo.lock b/contracts/examples/ping-pong-egld/wasm/Cargo.lock
index 80fc708812..4f575e46e4 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.50.1"
+version = "0.50.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/proxy-pause/wasm/Cargo.lock b/contracts/examples/proxy-pause/wasm/Cargo.lock
index ee1fe326c9..7d66a9015f 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.50.1"
+version = "0.50.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/rewards-distribution/wasm/Cargo.lock b/contracts/examples/rewards-distribution/wasm/Cargo.lock
index 51eef79ea6..473084629c 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.50.1"
+version = "0.50.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,14 +82,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/seed-nft-minter/wasm/Cargo.lock b/contracts/examples/seed-nft-minter/wasm/Cargo.lock
index 3063ad4870..2feb6f588a 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.50.1"
+version = "0.50.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,14 +82,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/token-release/wasm/Cargo.lock b/contracts/examples/token-release/wasm/Cargo.lock
index 4bb98af847..31f9d46e16 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.50.1"
+version = "0.50.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]
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 54881a0361..884847d716 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.50.1"
+version = "0.50.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/abi-tester/wasm/Cargo.lock b/contracts/feature-tests/abi-tester/wasm/Cargo.lock
index ccee260ef4..7f8a27a8e4 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.50.1"
+version = "0.50.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock
index 45ce36814a..78acaf1b89 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.lock b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.lock
index e54f7bf3f5..c6c6f45479 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.lock
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.lock
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/alloc-features/wasm/Cargo.lock b/contracts/feature-tests/alloc-features/wasm/Cargo.lock
index dbc92852f5..4e2acd30ca 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.50.1"
+version = "0.50.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]
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 061149b5e5..4630bb8400 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.50.1"
+version = "0.50.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/basic-features/wasm/Cargo.lock b/contracts/feature-tests/basic-features/wasm/Cargo.lock
index 445a0d32be..7dab17a58d 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.50.1"
+version = "0.50.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/big-float-features/wasm/Cargo.lock b/contracts/feature-tests/big-float-features/wasm/Cargo.lock
index 6fbad4b8ff..9aa83cc074 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.50.1"
+version = "0.50.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]
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 047b7599da..60734695f7 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.50.1"
+version = "0.50.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]
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 8b1b1604de..f94ab78084 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.50.1"
+version = "0.50.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]
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 dadc9101a6..975bd017d7 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.50.1"
+version = "0.50.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]
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 880b9b2ee1..baac26c348 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.50.1"
+version = "0.50.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]
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 ac44aab7f8..d9499e4e80 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
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.lock
index 6fe7c018b4..4a20e7b616 100644
--- a/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.lock
@@ -56,7 +56,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,7 +98,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]
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 c8c72a3358..49625f687a 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
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock
index b7418257c2..d8d9bfb8c8 100644
--- a/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]
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 a6b131248c..ae85ec0eee 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.50.1"
+version = "0.50.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]
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 ecd07cd776..484e4d9653 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.50.1"
+version = "0.50.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.lock
index 70c0abf558..f4f75e147f 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.50.1"
+version = "0.50.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock
index 4e709f91dc..8163df9d57 100755
--- a/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]
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 6aa61a8fc0..90b514d9ce 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.50.1"
+version = "0.50.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/promises-features/wasm/Cargo.lock b/contracts/feature-tests/composability/promises-features/wasm/Cargo.lock
index 45ec7da627..18cbfe0921 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.50.1"
+version = "0.50.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]
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 db1bf7e86c..7872127d38 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.50.1"
+version = "0.50.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]
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 4ff9265841..8443841af6 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.50.1"
+version = "0.50.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.lock b/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.lock
index 99e6baaf7f..8e14094060 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.50.1"
+version = "0.50.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]
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 6bf83d9e6c..4c868f42b2 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.50.1"
+version = "0.50.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,14 +82,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]
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 153fee28eb..758767fdfa 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.50.1"
+version = "0.50.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]
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 d1f84b055d..0893fec490 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.50.1"
+version = "0.50.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/vault/wasm/Cargo.lock b/contracts/feature-tests/composability/vault/wasm/Cargo.lock
index 4da9af45ea..298fd39d23 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.50.1"
+version = "0.50.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]
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 ced864c2ef..28d168f622 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.50.1"
+version = "0.50.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]
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 76830c8098..862982b1d1 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.50.1"
+version = "0.50.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]
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 51d9668083..7164b2b42c 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.50.1"
+version = "0.50.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]
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 9e46c3ca5f..45cb9a8029 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.50.1"
+version = "0.50.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]
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 6faea90ea9..f6d4495057 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.50.1"
+version = "0.50.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]
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 7960e2e728..5e76f98d16 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.50.1"
+version = "0.50.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]
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 95175f9170..2757cbb53b 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.50.1"
+version = "0.50.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]
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 d71840c7a8..73b31bf536 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.50.1"
+version = "0.50.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/exchange-features/wasm/Cargo.lock b/contracts/feature-tests/exchange-features/wasm/Cargo.lock
index ad987faa50..286ebaee06 100644
--- a/contracts/feature-tests/exchange-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/exchange-features/wasm/Cargo.lock
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/formatted-message-features/wasm/Cargo.lock b/contracts/feature-tests/formatted-message-features/wasm/Cargo.lock
index 4a3f7b5088..42efe8d831 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.50.1"
+version = "0.50.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/managed-map-features/wasm/Cargo.lock b/contracts/feature-tests/managed-map-features/wasm/Cargo.lock
index 553e3d4263..8084fb93b9 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.50.1"
+version = "0.50.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]
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 fd5c3fe996..47b92edcb7 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.50.1"
+version = "0.50.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]
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 c74c8de5e4..b5cb4d6ad0 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.50.1"
+version = "0.50.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]
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 3f60a31d06..de2e51f1ed 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.50.1"
+version = "0.50.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/multi-contract-features/wasm/Cargo.lock b/contracts/feature-tests/multi-contract-features/wasm/Cargo.lock
index c073b93b49..751c5422f4 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.50.1"
+version = "0.50.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/panic-message-features/wasm/Cargo.lock b/contracts/feature-tests/panic-message-features/wasm/Cargo.lock
index 44feb7bf17..dfc856d146 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.50.1"
+version = "0.50.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/payable-features/wasm/Cargo.lock b/contracts/feature-tests/payable-features/wasm/Cargo.lock
index 2b72558d54..fa2b91bebd 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.50.1"
+version = "0.50.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]
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 2c5b6e505f..c3c840dd9b 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.50.1"
+version = "0.50.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]
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 52f4c93fdc..b874ffab0c 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.50.1"
+version = "0.50.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/scenario-tester/wasm/Cargo.lock b/contracts/feature-tests/scenario-tester/wasm/Cargo.lock
index e88cabd7a3..53858af72c 100755
--- a/contracts/feature-tests/scenario-tester/wasm/Cargo.lock
+++ b/contracts/feature-tests/scenario-tester/wasm/Cargo.lock
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]
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 5170ca4f0c..0da98e30bd 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.50.1"
+version = "0.50.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,14 +82,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/use-module/wasm/Cargo.lock b/contracts/feature-tests/use-module/wasm/Cargo.lock
index 88111d4915..2f7c0a99e9 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.50.1"
+version = "0.50.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,14 +82,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.1"
+version = "0.50.2"
 dependencies = [
  "multiversx-sc",
 ]

From fa3705500c7a582aa2edc7ec8cda5c031a4b7aa1 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Fri, 24 May 2024 15:16:44 +0300
Subject: [PATCH 0923/1254] removed hardcoded version in snippets

---
 .../cmd/contract/generate_snippets/snippet_crate_gen.rs   | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

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 7bf8ab8d5c..265f22b9c1 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
@@ -3,6 +3,8 @@ use std::{
     io::Write,
 };
 
+use crate::version_history;
+
 static SNIPPETS_SOURCE_FILE_NAME: &str = "interactor_main.rs";
 
 pub(crate) fn create_snippets_folder(snippets_folder_path: &str) {
@@ -52,6 +54,8 @@ pub(crate) fn create_snippets_cargo_toml(
         }
     };
 
+    let last_release_version = &version_history::VERSIONS.last().unwrap().version;
+
     writeln!(
         &mut file,
         r#"[package]
@@ -69,10 +73,10 @@ path = "src/{SNIPPETS_SOURCE_FILE_NAME}"
 path = ".."
 
 [dependencies.multiversx-sc-snippets]
-version = "0.50.1"
+version = "{last_release_version}"
 
 [dependencies.multiversx-sc]
-version = "0.49.0"
+version = "{last_release_version}"
 
 [dependencies]
 clap = {{ version = "4.4.7", features = ["derive"] }}

From 33c97486c63329d93ae0ee69bab29984dba50e54 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Fri, 24 May 2024 16:32:38 +0300
Subject: [PATCH 0924/1254] unified llr

---
 .../mappers/linked-list-repeat/sc-config.toml |   5 +
 .../src/linked_list_repeat.rs                 |   1 +
 .../src/linked_list_repeat_proxy.rs           | 166 ++++++++++++++++++
 .../tests/linked_list_repeat_blackbox_test.rs | 120 ++++++-------
 framework/base/src/types/interaction/tx.rs    |   2 +-
 5 files changed, 233 insertions(+), 61 deletions(-)
 create mode 100644 contracts/benchmarks/mappers/linked-list-repeat/sc-config.toml
 create mode 100644 contracts/benchmarks/mappers/linked-list-repeat/src/linked_list_repeat_proxy.rs

diff --git a/contracts/benchmarks/mappers/linked-list-repeat/sc-config.toml b/contracts/benchmarks/mappers/linked-list-repeat/sc-config.toml
new file mode 100644
index 0000000000..b26db4379a
--- /dev/null
+++ b/contracts/benchmarks/mappers/linked-list-repeat/sc-config.toml
@@ -0,0 +1,5 @@
+[[proxy]]
+path = "src/linked_list_repeat_proxy.rs"
+[[proxy.path-rename]]
+from = "benchmark_common::example_struct"
+to = "benchmark_common"
diff --git a/contracts/benchmarks/mappers/linked-list-repeat/src/linked_list_repeat.rs b/contracts/benchmarks/mappers/linked-list-repeat/src/linked_list_repeat.rs
index 640fcb3968..40dfcba638 100644
--- a/contracts/benchmarks/mappers/linked-list-repeat/src/linked_list_repeat.rs
+++ b/contracts/benchmarks/mappers/linked-list-repeat/src/linked_list_repeat.rs
@@ -3,6 +3,7 @@
 multiversx_sc::imports!();
 
 use benchmark_common::ExampleStruct;
+pub mod linked_list_repeat_proxy;
 
 #[multiversx_sc::contract]
 pub trait LinkedListRepeat: benchmark_common::BenchmarkCommon {
diff --git a/contracts/benchmarks/mappers/linked-list-repeat/src/linked_list_repeat_proxy.rs b/contracts/benchmarks/mappers/linked-list-repeat/src/linked_list_repeat_proxy.rs
new file mode 100644
index 0000000000..100ff19071
--- /dev/null
+++ b/contracts/benchmarks/mappers/linked-list-repeat/src/linked_list_repeat_proxy.rs
@@ -0,0 +1,166 @@
+// Code generated by the multiversx-sc proxy generator. DO NOT EDIT.
+
+////////////////////////////////////////////////////
+////////////////// AUTO-GENERATED //////////////////
+////////////////////////////////////////////////////
+
+#![allow(dead_code)]
+#![allow(clippy::all)]
+
+use multiversx_sc::proxy_imports::*;
+
+pub struct LinkedListRepeatProxy;
+
+impl<Env, From, To, Gas> TxProxyTrait<Env, From, To, Gas> for LinkedListRepeatProxy
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    type TxProxyMethods = LinkedListRepeatProxyMethods<Env, From, To, Gas>;
+
+    fn proxy_methods(self, tx: Tx<Env, From, To, (), Gas, (), ()>) -> Self::TxProxyMethods {
+        LinkedListRepeatProxyMethods { wrapped_tx: tx }
+    }
+}
+
+pub struct LinkedListRepeatProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    wrapped_tx: Tx<Env, From, To, (), Gas, (), ()>,
+}
+
+#[rustfmt::skip]
+impl<Env, From, Gas> LinkedListRepeatProxyMethods<Env, From, (), Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn init(
+        self,
+    ) -> TxTypedDeploy<Env, From, NotPayable, Gas, ()> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_deploy()
+            .original_result()
+    }
+}
+
+#[rustfmt::skip]
+impl<Env, From, To, Gas> LinkedListRepeatProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn add<
+        Arg0: ProxyArg<usize>,
+        Arg1: ProxyArg<ManagedBuffer<Env::Api>>,
+    >(
+        self,
+        num_repeats: Arg0,
+        value: Arg1,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("add")
+            .argument(&num_repeats)
+            .argument(&value)
+            .original_result()
+    }
+
+    pub fn count<
+        Arg0: ProxyArg<ManagedBuffer<Env::Api>>,
+    >(
+        self,
+        value: Arg0,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, usize> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("count")
+            .argument(&value)
+            .original_result()
+    }
+
+    pub fn remove<
+        Arg0: ProxyArg<usize>,
+    >(
+        self,
+        num_repeats: Arg0,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("remove")
+            .argument(&num_repeats)
+            .original_result()
+    }
+
+    pub fn bench(
+        self,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, MultiValueEncoded<Env::Api, ManagedBuffer<Env::Api>>> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("bench")
+            .original_result()
+    }
+
+    pub fn add_struct<
+        Arg0: ProxyArg<usize>,
+        Arg1: ProxyArg<benchmark_common::ExampleStruct<Env::Api>>,
+    >(
+        self,
+        num_repeats: Arg0,
+        value: Arg1,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("add_struct")
+            .argument(&num_repeats)
+            .argument(&value)
+            .original_result()
+    }
+
+    pub fn count_struct<
+        Arg0: ProxyArg<benchmark_common::ExampleStruct<Env::Api>>,
+    >(
+        self,
+        value: Arg0,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, usize> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("count_struct")
+            .argument(&value)
+            .original_result()
+    }
+
+    pub fn remove_struct<
+        Arg0: ProxyArg<usize>,
+    >(
+        self,
+        num_repeats: Arg0,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("remove_struct")
+            .argument(&num_repeats)
+            .original_result()
+    }
+
+    pub fn bench_struct(
+        self,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, MultiValueEncoded<Env::Api, benchmark_common::ExampleStruct<Env::Api>>> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("bench_struct")
+            .original_result()
+    }
+}
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 15465791d4..aa2edf237f 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
@@ -1,78 +1,76 @@
-#![allow(deprecated)] // TODO: unified syntax
-
 use benchmark_common::ExampleStruct;
-use linked_list_repeat::ProxyTrait;
+use linked_list_repeat::linked_list_repeat_proxy;
 use multiversx_sc_scenario::imports::*;
 
-const WASM_PATH_EXPR: &str = "mxsc:output/linked-list-repeat.mxsc.json";
+const WASM_PATH: MxscPath = MxscPath::new("output/linked-list-repeat.mxsc.json");
+const LLR_ADDRESS: TestSCAddress = TestSCAddress::new("llr");
+const OWNER_ADDRESS: TestAddress = TestAddress::new("owner");
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
 
-    blockchain.register_contract(WASM_PATH_EXPR, linked_list_repeat::ContractBuilder);
+    blockchain.register_contract(WASM_PATH, linked_list_repeat::ContractBuilder);
     blockchain
 }
 
 fn setup() -> ScenarioWorld {
     let mut world = world();
-    let llr_code = world.code_expression(WASM_PATH_EXPR);
+    world
+        .account(OWNER_ADDRESS)
+        .nonce(1)
+        .new_address(OWNER_ADDRESS, 1, LLR_ADDRESS);
 
     world
-        .set_state_step(
-            SetStateStep::new()
-                .put_account("address:owner", Account::new().nonce(1))
-                .new_address("address:owner", 1, "sc:llr"),
-        )
-        .sc_deploy(
-            ScDeployStep::new()
-                .from("address:owner")
-                .code(llr_code)
-                .expect(TxExpect::ok().no_result()),
-        );
+        .tx()
+        .from(OWNER_ADDRESS)
+        .typed(linked_list_repeat_proxy::LinkedListRepeatProxy)
+        .init()
+        .code(WASM_PATH)
+        .run();
     world
 }
 
 #[test]
 fn linked_list_repeat_blackbox_raw() {
     let mut world = setup();
-    let mut contract = ContractInfo::<linked_list_repeat::Proxy<StaticApi>>::new("sc:llr");
 
     let num_repeats = 5usize;
 
     world
-        .sc_call(
-            ScCallStep::new()
-                .from("address:owner")
-                .to("sc:llr")
-                .call(contract.add(num_repeats, "test--"))
-                .expect(TxExpect::ok().no_result()),
-        )
-        .sc_call(
-            ScCallStep::new()
-                .from("address:owner")
-                .to("sc:llr")
-                .call(contract.count("test--\x00\x00\x00\x04"))
-                .expect(TxExpect::ok().result("1")),
-        )
-        .sc_query_use_result(
-            ScQueryStep::new().to("sc:llr").call(contract.bench()),
-            |tr: TypedResponse<MultiValueEncoded<StaticApi, String>>| {
-                let result = tr.result.unwrap().into_iter().collect::<Vec<String>>();
-                assert_eq!(result.len(), num_repeats);
-                for (index, item) in result.iter().enumerate() {
-                    let index_str =
-                        String::from_utf8((index as u32).to_be_bytes().to_vec()).unwrap();
-                    let expected = format!("test--{}", index_str);
-                    assert_eq!(item, &expected);
-                }
-            },
-        );
+        .tx()
+        .from(OWNER_ADDRESS)
+        .to(LLR_ADDRESS)
+        .typed(linked_list_repeat_proxy::LinkedListRepeatProxy)
+        .add(num_repeats, "test--")
+        .run();
+
+    world
+        .tx()
+        .from(OWNER_ADDRESS)
+        .to(LLR_ADDRESS)
+        .typed(linked_list_repeat_proxy::LinkedListRepeatProxy)
+        .count("test--\x00\x00\x00\x04")
+        .returns(ExpectValue(1u32))
+        .run();
+
+    let items = world
+        .query()
+        .to(LLR_ADDRESS)
+        .typed(linked_list_repeat_proxy::LinkedListRepeatProxy)
+        .bench()
+        .returns(ReturnsResult)
+        .run();
+
+    for (index, item) in items.into_iter().enumerate() {
+        let index_str = String::from_utf8((index as u32).to_be_bytes().to_vec()).unwrap();
+        let expected = format!("test--{}", index_str);
+        assert_eq!(item.to_string(), expected);
+    }
 }
 
 #[test]
 fn linked_list_repeat_struct_blackbox_raw() {
     let mut world = setup();
-    let mut contract = ContractInfo::<linked_list_repeat::Proxy<StaticApi>>::new("sc:llr");
 
     let mut example = ExampleStruct {
         first_token_id: TokenIdentifier::from_esdt_bytes(b"str:TESTTOK-1234"),
@@ -82,20 +80,22 @@ fn linked_list_repeat_struct_blackbox_raw() {
         second_token_nonce: 0,
         second_token_amount: multiversx_sc::types::BigUint::from(1_000_000_000_000_000_000u64),
     };
-    world.sc_call(
-        ScCallStep::new()
-            .from("address:owner")
-            .to("sc:llr")
-            .call(contract.add_struct(5u32, example.clone()))
-            .expect(TxExpect::ok().no_result()),
-    );
+
+    world
+        .tx()
+        .from(OWNER_ADDRESS)
+        .to(LLR_ADDRESS)
+        .typed(linked_list_repeat_proxy::LinkedListRepeatProxy)
+        .add_struct(5u32, example.clone())
+        .run();
     example.first_token_nonce = 3;
     example.second_token_nonce = 3;
-    world.sc_call(
-        ScCallStep::new()
-            .from("address:owner")
-            .to("sc:llr")
-            .call(contract.count_struct(example))
-            .expect(TxExpect::ok().result("1")),
-    );
+    world
+        .tx()
+        .from(OWNER_ADDRESS)
+        .to(LLR_ADDRESS)
+        .typed(linked_list_repeat_proxy::LinkedListRepeatProxy)
+        .count_struct(example)
+        .returns(ExpectValue(1u32))
+        .run();
 }
diff --git a/framework/base/src/types/interaction/tx.rs b/framework/base/src/types/interaction/tx.rs
index 4ed8603734..905b9af8fc 100644
--- a/framework/base/src/types/interaction/tx.rs
+++ b/framework/base/src/types/interaction/tx.rs
@@ -818,7 +818,7 @@ where
     ///
     /// Whenever possible, use proxies instead.
     ///
-    /// Doesa not serialize, does not enforce type safety.
+    /// Does not serialize, does not enforce type safety.
     #[inline]
     pub fn arguments_raw(mut self, raw: ManagedArgBuffer<Env::Api>) -> Self {
         self.data.arg_buffer = raw;

From dff1218a32c3f977403daf9f46691c1780835437 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Sat, 25 May 2024 19:57:42 +0300
Subject: [PATCH 0925/1254] dependency fix/update

---
 Cargo.lock                | 129 ++++++++++++++++++++++++--------------
 framework/meta/Cargo.toml |   6 +-
 2 files changed, 85 insertions(+), 50 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 391dd0874a..8831bc99fe 100755
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -149,9 +149,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.83"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25bdb32cbbdce2b519a9cd7df3a678443100e265d5e25ca763b7572a5104f5f3"
+checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"
 
 [[package]]
 name = "arbitrary"
@@ -168,6 +168,12 @@ version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
+[[package]]
+name = "atomic-waker"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
+
 [[package]]
 name = "autocfg"
 version = "1.3.0"
@@ -378,9 +384,9 @@ checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9"
 
 [[package]]
 name = "cc"
-version = "1.0.97"
+version = "1.0.98"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "099a5357d84c4c61eb35fc8eafa9a79a902c2f76911e5747ced4e032edd8d9b4"
+checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f"
 
 [[package]]
 name = "cfg-if"
@@ -548,9 +554,9 @@ dependencies = [
 
 [[package]]
 name = "crc32fast"
-version = "1.4.0"
+version = "1.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa"
+checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
 dependencies = [
  "cfg-if",
 ]
@@ -576,9 +582,9 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.8.19"
+version = "0.8.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345"
+checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
 
 [[package]]
 name = "crowdfunding-erc20"
@@ -754,9 +760,9 @@ dependencies = [
 
 [[package]]
 name = "either"
-version = "1.11.0"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2"
+checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b"
 
 [[package]]
 name = "empty"
@@ -1299,15 +1305,15 @@ dependencies = [
 
 [[package]]
 name = "h2"
-version = "0.4.4"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "816ec7294445779408f36fe57bc5b7fc1cf59664059096c65f905c1c61f58069"
+checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab"
 dependencies = [
+ "atomic-waker",
  "bytes",
  "fnv",
  "futures-core",
  "futures-sink",
- "futures-util",
  "http",
  "indexmap",
  "slab",
@@ -1323,6 +1329,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
 dependencies = [
  "ahash",
+ "serde",
 ]
 
 [[package]]
@@ -1442,9 +1449,9 @@ dependencies = [
 
 [[package]]
 name = "hyper-util"
-version = "0.1.3"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa"
+checksum = "3d8d52be92d09acc2e01dddb7fde3ad983fc6489c7db4837e605bc3fca4cb63e"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -1494,6 +1501,7 @@ checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"
 dependencies = [
  "equivalent",
  "hashbrown",
+ "serde",
 ]
 
 [[package]]
@@ -1639,9 +1647,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
 name = "libc"
-version = "0.2.154"
+version = "0.2.155"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346"
+checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
 
 [[package]]
 name = "linked-list-repeat"
@@ -1662,9 +1670,9 @@ dependencies = [
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.4.13"
+version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c"
+checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
 
 [[package]]
 name = "local-esdt-and-nft"
@@ -1692,6 +1700,12 @@ dependencies = [
  "scopeguard",
 ]
 
+[[package]]
+name = "lockfree-object-pool"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9374ef4228402d4b7e403e5838cb880d9ee663314b0a900d5a6aabf0c213552e"
+
 [[package]]
 name = "log"
 version = "0.4.21"
@@ -1779,9 +1793,9 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
 
 [[package]]
 name = "miniz_oxide"
-version = "0.7.2"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7"
+checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae"
 dependencies = [
  "adler",
 ]
@@ -2324,9 +2338,9 @@ dependencies = [
 
 [[package]]
 name = "parking_lot"
-version = "0.12.2"
+version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e4af0ca4f6caed20e900d564c242b8e5d4903fdacf31d3daf527b66fe6f42fb"
+checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
 dependencies = [
  "lock_api",
  "parking_lot_core",
@@ -2992,18 +3006,18 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.201"
+version = "1.0.202"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "780f1cebed1629e4753a1a38a3c72d30b97ec044f0aef68cb26650a3c5cf363c"
+checksum = "226b61a0d411b2ba5ff6d7f73a476ac4f8bb900373459cd00fab8512828ba395"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.201"
+version = "1.0.202"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5e405930b9796f1c00bee880d03fc7e0bb4b9a11afc776885ffe84320da2865"
+checksum = "6048858004bcff69094cd972ed40a32500f153bd3be9f716b2eed2e8217c4838"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3035,9 +3049,9 @@ dependencies = [
 
 [[package]]
 name = "serde_spanned"
-version = "0.6.5"
+version = "0.6.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1"
+checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0"
 dependencies = [
  "serde",
 ]
@@ -3120,6 +3134,12 @@ version = "1.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c"
 
+[[package]]
+name = "simd-adler32"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
+
 [[package]]
 name = "single-value-repeat"
 version = "0.0.0"
@@ -3242,18 +3262,18 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.60"
+version = "1.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "579e9083ca58dd9dcf91a9923bb9054071b9ebbd800b342194c9feb0ee89fc18"
+checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.60"
+version = "1.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2470041c06ec3ac1ab38d0356a6119054dedaea53e12fbefc0de730a1c08524"
+checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3346,9 +3366,9 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.8.12"
+version = "0.8.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3"
+checksum = "a4e43f8cc456c9704c851ae29c67e17ef65d2c30017c17a9765b89c382dc8bba"
 dependencies = [
  "indexmap",
  "serde",
@@ -3359,18 +3379,18 @@ dependencies = [
 
 [[package]]
 name = "toml_datetime"
-version = "0.6.5"
+version = "0.6.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1"
+checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "toml_edit"
-version = "0.22.12"
+version = "0.22.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3328d4f68a705b2a4498da1d580585d39a6510f98318a2cec3018a7ec61ddef"
+checksum = "c127785850e8c20836d49732ae6abfa47616e60bf9d9f57c43c250361a9db96c"
 dependencies = [
  "indexmap",
  "serde",
@@ -3392,7 +3412,6 @@ dependencies = [
  "tokio",
  "tower-layer",
  "tower-service",
- "tracing",
 ]
 
 [[package]]
@@ -3413,7 +3432,6 @@ version = "0.1.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
 dependencies = [
- "log",
  "pin-project-lite",
  "tracing-core",
 ]
@@ -3669,22 +3687,23 @@ checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
 
 [[package]]
 name = "wasmparser"
-version = "0.207.0"
+version = "0.208.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e19bb9f8ab07616da582ef8adb24c54f1424c7ec876720b7da9db8ec0626c92c"
+checksum = "dd921789c9dcc495f589cb37d200155dee65b4a4beeb853323b5e24e0a5f9c58"
 dependencies = [
  "ahash",
  "bitflags 2.5.0",
  "hashbrown",
  "indexmap",
  "semver",
+ "serde",
 ]
 
 [[package]]
 name = "wasmprinter"
-version = "0.207.0"
+version = "0.208.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c2d8a7b4dabb460208e6b4334d9db5766e84505038b2529e69c3d07ac619115"
+checksum = "0700bdace4821e6c694617938500ae9999946df464bb13219c16570f8b6f202f"
 dependencies = [
  "anyhow",
  "wasmparser",
@@ -3909,9 +3928,9 @@ dependencies = [
 
 [[package]]
 name = "zip"
-version = "1.2.3"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c700ea425e148de30c29c580c1f9508b93ca57ad31c9f4e96b83c194c37a7a8f"
+checksum = "e2568cd0f20e86cd9a7349fe05178f7bd22f22724678448ae5a9bac266df2689"
 dependencies = [
  "arbitrary",
  "crc32fast",
@@ -3919,5 +3938,21 @@ dependencies = [
  "displaydoc",
  "flate2",
  "indexmap",
+ "memchr",
  "thiserror",
+ "zopfli",
+]
+
+[[package]]
+name = "zopfli"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5019f391bac5cf252e93bbcc53d039ffd62c7bfb7c150414d61369afe57e946"
+dependencies = [
+ "bumpalo",
+ "crc32fast",
+ "lockfree-object-pool",
+ "log",
+ "once_cell",
+ "simd-adler32",
 ]
diff --git a/framework/meta/Cargo.toml b/framework/meta/Cargo.toml
index d85ef5976a..295e3b5598 100644
--- a/framework/meta/Cargo.toml
+++ b/framework/meta/Cargo.toml
@@ -40,13 +40,13 @@ colored = "2.0"
 lazy_static = "1.4.0"
 convert_case = "0.6.0"
 hex = "0.4"
-wasmparser = "0.207"
-wasmprinter = "0.207"
+wasmparser = "0.208"
+wasmprinter = "0.208"
 semver = "1.0.20"
 
 ruplacer = { version = "0.8.1", default-features = false, optional = true }
 reqwest = { version = "0.12", features = ["blocking", "json"], optional = true }
-zip = { version = "1.2", features = ["deflate"], default-features = false, optional = true }
+zip = { version = "2.1", features = ["deflate"], default-features = false, optional = true }
 copy_dir = { version = "0.1.2", optional = true }
 pathdiff = { version = "0.2.1", optional = true }
 common-path = { version = "1.0.0", optional = true }

From 8fab5c11e18b7bb35398f4657417e91183d39863 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Sat, 25 May 2024 20:03:00 +0300
Subject: [PATCH 0926/1254] sc 0.50.3

---
 CHANGELOG.md                                   |  3 +++
 Cargo.lock                                     | 18 +++++++++---------
 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 ++--
 .../mappers/linked-list-repeat/meta/Cargo.toml |  2 +-
 .../mappers/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 +-
 .../benchmarks/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 +-
 contracts/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 +-
 .../Cargo.toml                                 |  2 +-
 .../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 +-
 .../examples/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 +++---
 contracts/examples/check-pause/meta/Cargo.toml |  2 +-
 contracts/examples/check-pause/wasm/Cargo.toml |  2 +-
 .../examples/crowdfunding-esdt/Cargo.toml      |  4 ++--
 .../examples/crowdfunding-esdt/meta/Cargo.toml |  2 +-
 .../examples/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 +-
 .../examples/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      |  8 ++++----
 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 +-
 contracts/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 ++--
 contracts/examples/proxy-pause/meta/Cargo.toml |  2 +-
 contracts/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 +-
 .../wasm-alloc-mem-fail/Cargo.toml             |  2 +-
 .../wasm-alloc-mem-leaking/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-legacy/Cargo.toml  |  4 ++--
 .../forwarder-legacy/meta/Cargo.toml           |  2 +-
 .../forwarder-legacy/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 +-
 .../composability/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 +-
 .../composability/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 ++--
 .../erc-style-contracts/erc721/meta/Cargo.toml |  2 +-
 .../erc-style-contracts/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 +-
 .../feature-tests/exchange-features/Cargo.toml |  4 ++--
 .../exchange-features/meta/Cargo.toml          |  2 +-
 .../exchange-features/wasm/Cargo.toml          |  2 +-
 .../formatted-message-features/Cargo.toml      |  4 ++--
 .../formatted-message-features/meta/Cargo.toml |  2 +-
 .../formatted-message-features/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 +-
 .../feature-tests/scenario-tester/Cargo.toml   |  4 ++--
 .../scenario-tester/meta/Cargo.toml            |  2 +-
 .../scenario-tester/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 +-
 .../use-module/wasm-use-module-view/Cargo.toml |  2 +-
 .../feature-tests/use-module/wasm/Cargo.toml   |  2 +-
 contracts/modules/Cargo.toml                   |  4 ++--
 framework/base/Cargo.toml                      |  4 ++--
 framework/derive/Cargo.toml                    |  2 +-
 framework/meta/Cargo.toml                      |  4 ++--
 .../generate_snippets/snippet_crate_gen.rs     |  4 ++--
 framework/meta/src/version_history.rs          |  3 ++-
 framework/scenario/Cargo.toml                  |  6 +++---
 framework/snippets/Cargo.toml                  |  4 ++--
 framework/wasm-adapter/Cargo.toml              |  4 ++--
 tools/mxpy-snippet-generator/Cargo.toml        |  2 +-
 tools/rust-debugger/format-tests/Cargo.toml    |  4 ++--
 272 files changed, 399 insertions(+), 395 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d997fb8e10..fca5916f11 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,6 +27,9 @@ They are:
 - `multiversx-sdk`, in short `sdk`, allows communication with the chain(s), 1 crate.
 
 
+## [sc 0.50.3] - 2024-05-25
+- Dependency update and fix. There was an issue with the `zip` dependency in sc-meta.
+
 ## [sc 0.50.2] - 2024-05-24
 - Unified transaction syntax:
 	- Better compilation error messages for malformed transactions;
diff --git a/Cargo.lock b/Cargo.lock
index 8831bc99fe..23fb4402a9 100755
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1904,7 +1904,7 @@ checksum = "b59072fa0624b55ae5ae3fa6bfa91515bbeb4ac440214bc4a509e2c8806d6e9f"
 
 [[package]]
 name = "multiversx-price-aggregator-sc"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "arrayvec",
  "getrandom 0.2.15",
@@ -1925,7 +1925,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "bitflags 2.5.0",
  "hex-literal",
@@ -1957,7 +1957,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -1968,7 +1968,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-meta"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "clap",
  "colored",
@@ -1994,14 +1994,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-scenario"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "base64",
  "bech32",
@@ -2028,7 +2028,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-snippets"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "base64",
  "env_logger",
@@ -2042,7 +2042,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]
@@ -2073,7 +2073,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-wegld-swap-sc"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
  "multiversx-sc-modules",
diff --git a/contracts/benchmarks/large-storage/Cargo.toml b/contracts/benchmarks/large-storage/Cargo.toml
index a871323ea8..cf214259d5 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.50.2"
+version = "0.50.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../framework/scenario"
diff --git a/contracts/benchmarks/large-storage/meta/Cargo.toml b/contracts/benchmarks/large-storage/meta/Cargo.toml
index 7b7d6434b2..cb6927c664 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.50.2"
+version = "0.50.3"
 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 201116d231..be44a1813e 100644
--- a/contracts/benchmarks/large-storage/wasm/Cargo.toml
+++ b/contracts/benchmarks/large-storage/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/mappers/benchmark-common/Cargo.toml b/contracts/benchmarks/mappers/benchmark-common/Cargo.toml
index 6d0e59e219..b912617531 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.50.2"
+version = "0.50.3"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../../framework/scenario"
diff --git a/contracts/benchmarks/mappers/linked-list-repeat/Cargo.toml b/contracts/benchmarks/mappers/linked-list-repeat/Cargo.toml
index 7189016168..087afd185e 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.50.2"
+version = "0.50.3"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.2"
+version = "0.50.3"
 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 91ad5d6a0d..d79fe04af4 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.50.2"
+version = "0.50.3"
 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 55d6767463..57ac205ace 100644
--- a/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/mappers/map-repeat/Cargo.toml b/contracts/benchmarks/mappers/map-repeat/Cargo.toml
index 4bd096e126..ecad093dd8 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.50.2"
+version = "0.50.3"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../../framework/scenario"
diff --git a/contracts/benchmarks/mappers/map-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/map-repeat/meta/Cargo.toml
index 8849ae32c6..e229b431a8 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.50.2"
+version = "0.50.3"
 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 f147ed5eb5..377de005ec 100644
--- a/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/mappers/queue-repeat/Cargo.toml b/contracts/benchmarks/mappers/queue-repeat/Cargo.toml
index 2a20ef63db..a1b4a04418 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.50.2"
+version = "0.50.3"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../../framework/scenario"
diff --git a/contracts/benchmarks/mappers/queue-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/queue-repeat/meta/Cargo.toml
index 4cb5492359..aa48694147 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.50.2"
+version = "0.50.3"
 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 aff2a1bfd1..9bea063fa5 100644
--- a/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/mappers/set-repeat/Cargo.toml b/contracts/benchmarks/mappers/set-repeat/Cargo.toml
index 5da7bef443..e605ddc5be 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.50.2"
+version = "0.50.3"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../../framework/scenario"
diff --git a/contracts/benchmarks/mappers/set-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/set-repeat/meta/Cargo.toml
index fc5fcd572a..64dec3d8e3 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.50.2"
+version = "0.50.3"
 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 2ca364b011..4bd27ae74a 100644
--- a/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.2"
+version = "0.50.3"
 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 e074ee3ab2..f61040bdf7 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.50.2"
+version = "0.50.3"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.2"
+version = "0.50.3"
 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 fdf2a1f601..8e8cc8c0d3 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.50.2"
+version = "0.50.3"
 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 23074413f9..9f42c4a6b8 100644
--- a/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/mappers/vec-repeat/Cargo.toml b/contracts/benchmarks/mappers/vec-repeat/Cargo.toml
index d26dc4edaa..37818e8a22 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.50.2"
+version = "0.50.3"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../../framework/scenario"
diff --git a/contracts/benchmarks/mappers/vec-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/vec-repeat/meta/Cargo.toml
index b6c3615731..dfb197667d 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.50.2"
+version = "0.50.3"
 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 d2a492a11b..5b21c4fb5c 100644
--- a/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/send-tx-repeat/Cargo.toml b/contracts/benchmarks/send-tx-repeat/Cargo.toml
index 0dea5d128f..b32e5ba27a 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.50.2"
+version = "0.50.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../framework/scenario"
diff --git a/contracts/benchmarks/send-tx-repeat/meta/Cargo.toml b/contracts/benchmarks/send-tx-repeat/meta/Cargo.toml
index 255d1e0159..b2994c7fa3 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.50.2"
+version = "0.50.3"
 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 380231895b..f02b983c3d 100644
--- a/contracts/benchmarks/send-tx-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/send-tx-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/str-repeat/Cargo.toml b/contracts/benchmarks/str-repeat/Cargo.toml
index e69129709b..52f8e11c18 100644
--- a/contracts/benchmarks/str-repeat/Cargo.toml
+++ b/contracts/benchmarks/str-repeat/Cargo.toml
@@ -12,10 +12,10 @@ path = "src/str_repeat.rs"
 managed-buffer-builder-cached = ["multiversx-sc/managed-buffer-builder-cached"]
 
 [dependencies.multiversx-sc]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../framework/scenario"
diff --git a/contracts/benchmarks/str-repeat/meta/Cargo.toml b/contracts/benchmarks/str-repeat/meta/Cargo.toml
index ced6e8835b..a542954366 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.50.2"
+version = "0.50.3"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.toml b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.toml
index 3911218a2c..042b268ad4 100644
--- a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.toml
+++ b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.toml b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.toml
index 51a8622a2a..9fdf4a5630 100644
--- a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.toml
+++ b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.toml
@@ -29,7 +29,7 @@ path = ".."
 features = ["managed-buffer-builder-cached"]
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/str-repeat/wasm/Cargo.toml b/contracts/benchmarks/str-repeat/wasm/Cargo.toml
index cd9f64bc2c..892c42065e 100644
--- a/contracts/benchmarks/str-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/str-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/core/price-aggregator/Cargo.toml b/contracts/core/price-aggregator/Cargo.toml
index 3ed7a01c40..e90571b170 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.50.2"
+version = "0.50.3"
 authors = [
     "Claudiu-Marcel Bruda <claudiu.bruda@multiversx.com>",
     "MultiversX <contact@multiversx.com>",
@@ -19,15 +19,15 @@ edition = "2021"
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../framework/scenario"
 
 [dependencies]
diff --git a/contracts/core/price-aggregator/meta/Cargo.toml b/contracts/core/price-aggregator/meta/Cargo.toml
index 1b2e87862c..3a7b67ebd7 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.50.2"
+version = "0.50.3"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.50.2"
+version = "0.50.3"
 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 2ab14a672b..115fc66661 100644
--- a/contracts/core/price-aggregator/wasm/Cargo.toml
+++ b/contracts/core/price-aggregator/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/core/wegld-swap/Cargo.toml b/contracts/core/wegld-swap/Cargo.toml
index 559e62d1f5..458f7b19e2 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.50.2"
+version = "0.50.3"
 
 authors = [
     "Dorin Iancu <dorin.iancu@multiversx.com>",
@@ -20,13 +20,13 @@ edition = "2021"
 path = "src/wegld.rs"
 
 [dependencies.multiversx-sc]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../framework/scenario"
diff --git a/contracts/core/wegld-swap/meta/Cargo.toml b/contracts/core/wegld-swap/meta/Cargo.toml
index e8e744932d..25c19fb675 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.50.2"
+version = "0.50.3"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.50.2"
+version = "0.50.3"
 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 b7b59a916d..edc984e5ea 100644
--- a/contracts/core/wegld-swap/wasm/Cargo.toml
+++ b/contracts/core/wegld-swap/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/adder/Cargo.toml b/contracts/examples/adder/Cargo.toml
index e2844c094b..f95bfef533 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.50.2"
+version = "0.50.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/adder/interact/Cargo.toml b/contracts/examples/adder/interact/Cargo.toml
index 0ac38b4421..a8ba1a8577 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.50.2"
+version = "0.50.3"
 path = "../../../../framework/snippets"
diff --git a/contracts/examples/adder/meta/Cargo.toml b/contracts/examples/adder/meta/Cargo.toml
index 06b56a359a..7ccbfc2235 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.50.2"
+version = "0.50.3"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/examples/adder/wasm/Cargo.toml b/contracts/examples/adder/wasm/Cargo.toml
index aaabd53b90..2ca9584c8b 100644
--- a/contracts/examples/adder/wasm/Cargo.toml
+++ b/contracts/examples/adder/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/bonding-curve-contract/Cargo.toml b/contracts/examples/bonding-curve-contract/Cargo.toml
index ced45ebf9f..52578184f5 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.50.2"
+version = "0.50.3"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../framework/scenario"
 
diff --git a/contracts/examples/bonding-curve-contract/meta/Cargo.toml b/contracts/examples/bonding-curve-contract/meta/Cargo.toml
index 95e77c79c7..5eeb79e4f4 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.50.2"
+version = "0.50.3"
 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 ab190b27a8..b0da11ce01 100644
--- a/contracts/examples/bonding-curve-contract/wasm/Cargo.toml
+++ b/contracts/examples/bonding-curve-contract/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/check-pause/Cargo.toml b/contracts/examples/check-pause/Cargo.toml
index 4bd63c8381..1a2334ea09 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.50.2"
+version = "0.50.3"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../framework/scenario"
 
diff --git a/contracts/examples/check-pause/meta/Cargo.toml b/contracts/examples/check-pause/meta/Cargo.toml
index b7f9c85915..84f5718962 100644
--- a/contracts/examples/check-pause/meta/Cargo.toml
+++ b/contracts/examples/check-pause/meta/Cargo.toml
@@ -9,6 +9,6 @@ authors = ["Alin Cruceat <alin.cruceat@multiversx.com>"]
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.50.2"
+version = "0.50.3"
 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 9c38481868..941fc29f67 100644
--- a/contracts/examples/check-pause/wasm/Cargo.toml
+++ b/contracts/examples/check-pause/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/crowdfunding-esdt/Cargo.toml b/contracts/examples/crowdfunding-esdt/Cargo.toml
index 3d3edfced8..51ab699206 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.50.2"
+version = "0.50.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../framework/scenario"
 
 [dev-dependencies]
diff --git a/contracts/examples/crowdfunding-esdt/meta/Cargo.toml b/contracts/examples/crowdfunding-esdt/meta/Cargo.toml
index 79f4df47cc..d169b02e56 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.50.2"
+version = "0.50.3"
 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 6d15ac8fbc..fc9eedb465 100644
--- a/contracts/examples/crowdfunding-esdt/wasm/Cargo.toml
+++ b/contracts/examples/crowdfunding-esdt/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/crypto-bubbles/Cargo.toml b/contracts/examples/crypto-bubbles/Cargo.toml
index e4dc311d2e..5fbe867d85 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.50.2"
+version = "0.50.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/crypto-bubbles/meta/Cargo.toml b/contracts/examples/crypto-bubbles/meta/Cargo.toml
index 73f33a4b14..0c89065fab 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.50.2"
+version = "0.50.3"
 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 f5c4528a2e..451f424304 100644
--- a/contracts/examples/crypto-bubbles/wasm/Cargo.toml
+++ b/contracts/examples/crypto-bubbles/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.2"
+version = "0.50.3"
 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 94179c554c..5508f1bedc 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.50.2"
+version = "0.50.3"
 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 e8fd9c6e6e..1ae1c308f7 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.50.2"
+version = "0.50.3"
 path = "../../../../../framework/base"
diff --git a/contracts/examples/crypto-kitties/kitty-auction/Cargo.toml b/contracts/examples/crypto-kitties/kitty-auction/Cargo.toml
index 67eb27cf68..f71784afd8 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.50.2"
+version = "0.50.3"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.2"
+version = "0.50.3"
 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 38f8e36f86..907017a8c6 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.50.2"
+version = "0.50.3"
 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 808da081c2..d177d0dd77 100644
--- a/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.toml
+++ b/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.2"
+version = "0.50.3"
 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 fca668f801..ffdbd89068 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.50.2"
+version = "0.50.3"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.2"
+version = "0.50.3"
 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 bb7a9b3569..ffc0ed059d 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.50.2"
+version = "0.50.3"
 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 709ba6a261..0579218716 100644
--- a/contracts/examples/crypto-kitties/kitty-genetic-alg/wasm/Cargo.toml
+++ b/contracts/examples/crypto-kitties/kitty-genetic-alg/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.2"
+version = "0.50.3"
 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 c9aac3863c..99c37e0334 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.50.2"
+version = "0.50.3"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.2"
+version = "0.50.3"
 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 32327493ec..d4a9dafff3 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.50.2"
+version = "0.50.3"
 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 7f1bee0e21..c84fc452ff 100644
--- a/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.toml
+++ b/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/crypto-zombies/Cargo.toml b/contracts/examples/crypto-zombies/Cargo.toml
index fb2f72487b..9914391892 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.50.2"
+version = "0.50.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/crypto-zombies/meta/Cargo.toml b/contracts/examples/crypto-zombies/meta/Cargo.toml
index 75bf9f3916..5aafb98042 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.50.2"
+version = "0.50.3"
 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 2cb8a0ceb8..5afd6abf09 100644
--- a/contracts/examples/crypto-zombies/wasm/Cargo.toml
+++ b/contracts/examples/crypto-zombies/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/digital-cash/Cargo.toml b/contracts/examples/digital-cash/Cargo.toml
index 2a7922c2e6..aa8c6a03c6 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.50.2"
+version = "0.50.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/digital-cash/meta/Cargo.toml b/contracts/examples/digital-cash/meta/Cargo.toml
index f34c8c2469..19f8f49b4c 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.50.2"
+version = "0.50.3"
 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 e7d6ec8364..2d51de2b43 100644
--- a/contracts/examples/digital-cash/wasm/Cargo.toml
+++ b/contracts/examples/digital-cash/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/empty/Cargo.toml b/contracts/examples/empty/Cargo.toml
index cbcf4ad3ce..03eeadd1d2 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.50.2"
+version = "0.50.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../framework/scenario"
 
 [dev-dependencies]
diff --git a/contracts/examples/empty/meta/Cargo.toml b/contracts/examples/empty/meta/Cargo.toml
index 8be1d53f76..cd3af23194 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.50.2"
+version = "0.50.3"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/examples/empty/wasm/Cargo.toml b/contracts/examples/empty/wasm/Cargo.toml
index b6c5c3516f..5f50f9dbf8 100644
--- a/contracts/examples/empty/wasm/Cargo.toml
+++ b/contracts/examples/empty/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.2"
+version = "0.50.3"
 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 4f02d0205f..f15ee18079 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.50.2"
+version = "0.50.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.2"
+version = "0.50.3"
 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 d796af7793..0d33614504 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.50.2"
+version = "0.50.3"
 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 929461a46b..7c44a7328f 100644
--- a/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.toml
+++ b/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/factorial/Cargo.toml b/contracts/examples/factorial/Cargo.toml
index efce484b68..9ebbe153e3 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.50.2"
+version = "0.50.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/factorial/meta/Cargo.toml b/contracts/examples/factorial/meta/Cargo.toml
index 5682144b75..d99b96bfde 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.50.2"
+version = "0.50.3"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/examples/factorial/wasm/Cargo.toml b/contracts/examples/factorial/wasm/Cargo.toml
index 2c799f7bf8..497fe648d4 100644
--- a/contracts/examples/factorial/wasm/Cargo.toml
+++ b/contracts/examples/factorial/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/fractional-nfts/Cargo.toml b/contracts/examples/fractional-nfts/Cargo.toml
index 953187e3f7..4950e5405c 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.50.2"
+version = "0.50.3"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/fractional-nfts/meta/Cargo.toml b/contracts/examples/fractional-nfts/meta/Cargo.toml
index 737b34a290..d99acbe31d 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.50.2"
+version = "0.50.3"
 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 3829671280..387fcc7ee4 100644
--- a/contracts/examples/fractional-nfts/wasm/Cargo.toml
+++ b/contracts/examples/fractional-nfts/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/lottery-esdt/Cargo.toml b/contracts/examples/lottery-esdt/Cargo.toml
index 1087c9fe42..a54808e6ca 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.50.2"
+version = "0.50.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/lottery-esdt/meta/Cargo.toml b/contracts/examples/lottery-esdt/meta/Cargo.toml
index 80ddfc6019..49563e9eff 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.50.2"
+version = "0.50.3"
 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 a1c396b11b..543adef193 100644
--- a/contracts/examples/lottery-esdt/wasm/Cargo.toml
+++ b/contracts/examples/lottery-esdt/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/multisig/Cargo.toml b/contracts/examples/multisig/Cargo.toml
index 164091d43e..f3b84f9529 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.50.2"
+version = "0.50.3"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../framework/scenario"
 
 [dev-dependencies.adder]
@@ -27,7 +27,7 @@ path = "../adder"
 path = "../factorial"
 
 [dev-dependencies.multiversx-wegld-swap-sc]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../core/wegld-swap"
 
 [dev-dependencies]
diff --git a/contracts/examples/multisig/interact/Cargo.toml b/contracts/examples/multisig/interact/Cargo.toml
index 458c1d21a0..44c63436bc 100644
--- a/contracts/examples/multisig/interact/Cargo.toml
+++ b/contracts/examples/multisig/interact/Cargo.toml
@@ -18,17 +18,17 @@ toml = "0.8.6"
 path = ".."
 
 [dependencies.multiversx-sc-modules]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../../contracts/modules"
 
 [dependencies.multiversx-sc-snippets]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../../framework/snippets"
 
 [dependencies.multiversx-sc-scenario]
-version = "=0.50.2"
+version = "=0.50.3"
 path = "../../../../framework/scenario"
 
 [dependencies.multiversx-sc]
-version = "=0.50.2"
+version = "=0.50.3"
 path = "../../../../framework/base"
diff --git a/contracts/examples/multisig/meta/Cargo.toml b/contracts/examples/multisig/meta/Cargo.toml
index 4a79057621..802117ccb1 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.50.2"
+version = "0.50.3"
 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 46c42fdf99..eaa6458c9a 100644
--- a/contracts/examples/multisig/wasm-multisig-full/Cargo.toml
+++ b/contracts/examples/multisig/wasm-multisig-full/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.2"
+version = "0.50.3"
 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 a48b794351..5adc37f1d0 100644
--- a/contracts/examples/multisig/wasm-multisig-view/Cargo.toml
+++ b/contracts/examples/multisig/wasm-multisig-view/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/multisig/wasm/Cargo.toml b/contracts/examples/multisig/wasm/Cargo.toml
index fa8766e948..0b48d9b3a0 100644
--- a/contracts/examples/multisig/wasm/Cargo.toml
+++ b/contracts/examples/multisig/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/nft-minter/Cargo.toml b/contracts/examples/nft-minter/Cargo.toml
index 596eda9ca4..e7d4b14ceb 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.50.2"
+version = "0.50.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/nft-minter/meta/Cargo.toml b/contracts/examples/nft-minter/meta/Cargo.toml
index 58ea1ab23f..b415b035e7 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.50.2"
+version = "0.50.3"
 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 1dacee022e..d6e60df991 100644
--- a/contracts/examples/nft-minter/wasm/Cargo.toml
+++ b/contracts/examples/nft-minter/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/nft-storage-prepay/Cargo.toml b/contracts/examples/nft-storage-prepay/Cargo.toml
index 1375d7c7e9..4777f46e2a 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.50.2"
+version = "0.50.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/nft-storage-prepay/meta/Cargo.toml b/contracts/examples/nft-storage-prepay/meta/Cargo.toml
index a026628942..7bf64b93db 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.50.2"
+version = "0.50.3"
 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 da89f646c1..11c08b1fa7 100644
--- a/contracts/examples/nft-storage-prepay/wasm/Cargo.toml
+++ b/contracts/examples/nft-storage-prepay/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/nft-subscription/Cargo.toml b/contracts/examples/nft-subscription/Cargo.toml
index bf014cc67d..797f618a9f 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.50.2"
+version = "0.50.3"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/nft-subscription/meta/Cargo.toml b/contracts/examples/nft-subscription/meta/Cargo.toml
index 0a366995ca..0f505d5751 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.50.2"
+version = "0.50.3"
 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 18e8903d5b..f5fe109489 100644
--- a/contracts/examples/nft-subscription/wasm/Cargo.toml
+++ b/contracts/examples/nft-subscription/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/order-book/factory/Cargo.toml b/contracts/examples/order-book/factory/Cargo.toml
index 5d371c0bd2..e77701abd6 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.50.2"
+version = "0.50.3"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../../framework/scenario"
 
diff --git a/contracts/examples/order-book/factory/meta/Cargo.toml b/contracts/examples/order-book/factory/meta/Cargo.toml
index b4fa226be6..8644069281 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.50.2"
+version = "0.50.3"
 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 455c1537f2..78f1e1d508 100644
--- a/contracts/examples/order-book/factory/wasm/Cargo.toml
+++ b/contracts/examples/order-book/factory/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/order-book/pair/Cargo.toml b/contracts/examples/order-book/pair/Cargo.toml
index 1f4b53b669..f416341dc0 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.50.2"
+version = "0.50.3"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../../framework/scenario"
diff --git a/contracts/examples/order-book/pair/meta/Cargo.toml b/contracts/examples/order-book/pair/meta/Cargo.toml
index 53dbc216ef..e5478f1371 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.50.2"
+version = "0.50.3"
 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 a5bc1a5d5d..3d4b6ded0e 100644
--- a/contracts/examples/order-book/pair/wasm/Cargo.toml
+++ b/contracts/examples/order-book/pair/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/ping-pong-egld/Cargo.toml b/contracts/examples/ping-pong-egld/Cargo.toml
index 3807471fa5..31417a1261 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.50.2"
+version = "0.50.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../framework/scenario"
 
diff --git a/contracts/examples/ping-pong-egld/meta/Cargo.toml b/contracts/examples/ping-pong-egld/meta/Cargo.toml
index 2c4d52c532..17bdc63bf0 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.50.2"
+version = "0.50.3"
 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 60304e4246..dcd7f18362 100644
--- a/contracts/examples/ping-pong-egld/wasm/Cargo.toml
+++ b/contracts/examples/ping-pong-egld/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/proxy-pause/Cargo.toml b/contracts/examples/proxy-pause/Cargo.toml
index e68c0898f3..68c8785786 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.50.2"
+version = "0.50.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.2"
+version = "0.50.3"
 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 6dc206ddab..cf63a07410 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.50.2"
+version = "0.50.3"
 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 784dd313d7..2642fa32a2 100644
--- a/contracts/examples/proxy-pause/wasm/Cargo.toml
+++ b/contracts/examples/proxy-pause/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/rewards-distribution/Cargo.toml b/contracts/examples/rewards-distribution/Cargo.toml
index fd57cdc09c..3eb643c711 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.50.2"
+version = "0.50.3"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/rewards-distribution/meta/Cargo.toml b/contracts/examples/rewards-distribution/meta/Cargo.toml
index 1bf2ad7aec..7f37104231 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 <claudiu.bruda@multiversx.com>"]
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.50.2"
+version = "0.50.3"
 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 168b269b5c..33b39a2c69 100644
--- a/contracts/examples/rewards-distribution/wasm/Cargo.toml
+++ b/contracts/examples/rewards-distribution/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/seed-nft-minter/Cargo.toml b/contracts/examples/seed-nft-minter/Cargo.toml
index 642d20dd71..68a01761c4 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.50.2"
+version = "0.50.3"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/seed-nft-minter/meta/Cargo.toml b/contracts/examples/seed-nft-minter/meta/Cargo.toml
index 2cdb799ac3..070b77053a 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 <claudiu.bruda@multiversx.com>"]
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.50.2"
+version = "0.50.3"
 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 8842cd1ba4..3b76bf97e4 100644
--- a/contracts/examples/seed-nft-minter/wasm/Cargo.toml
+++ b/contracts/examples/seed-nft-minter/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/token-release/Cargo.toml b/contracts/examples/token-release/Cargo.toml
index ccce6904e8..1cf88eb1e3 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.50.2"
+version = "0.50.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../framework/scenario"
 
diff --git a/contracts/examples/token-release/meta/Cargo.toml b/contracts/examples/token-release/meta/Cargo.toml
index ccb13085e2..d0ae6ad19c 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.50.2"
+version = "0.50.3"
 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 447830c672..2a6ee31f04 100644
--- a/contracts/examples/token-release/wasm/Cargo.toml
+++ b/contracts/examples/token-release/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/abi-tester/Cargo.toml b/contracts/feature-tests/abi-tester/Cargo.toml
index 7f7242245e..29c5e03690 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.50.2"
+version = "0.50.3"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../framework/scenario"
 
 [dev-dependencies.multiversx-sc-meta]
-version = "0.50.2"
+version = "0.50.3"
 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 8073e8f6c7..bfa2e266fb 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.50.2"
+            "version": "0.50.3"
         }
     },
     "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 33433ab28e..db14610738 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.50.2"
+            "version": "0.50.3"
         }
     },
     "docs": [
diff --git a/contracts/feature-tests/abi-tester/meta/Cargo.toml b/contracts/feature-tests/abi-tester/meta/Cargo.toml
index e6171f9843..c5268926ac 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.50.2"
+version = "0.50.3"
 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 ab1099ea02..d7ac6245da 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.2"
+version = "0.50.3"
 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 3da5f876a1..074956883f 100644
--- a/contracts/feature-tests/abi-tester/wasm/Cargo.toml
+++ b/contracts/feature-tests/abi-tester/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/alloc-features/Cargo.toml b/contracts/feature-tests/alloc-features/Cargo.toml
index cf96bfd4bb..0a892d5458 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.50.2"
+version = "0.50.3"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.2"
+version = "0.50.3"
 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 885dfa114c..35b6fd942c 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.50.2"
+version = "0.50.3"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml
index a38e648e13..29e5037e2e 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml
index 0537926850..90d20b5f2b 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/alloc-features/wasm/Cargo.toml b/contracts/feature-tests/alloc-features/wasm/Cargo.toml
index 4868d23d42..b1f92d6082 100644
--- a/contracts/feature-tests/alloc-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/alloc-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/basic-features/Cargo.toml b/contracts/feature-tests/basic-features/Cargo.toml
index e8ea571a13..5ce96ac53b 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.50.2"
+version = "0.50.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../framework/scenario"
 
 [dependencies.multiversx-sc-modules]
-version = "0.50.2"
+version = "0.50.3"
 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 7bb99bfe84..ca15ae386e 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.50.2"
+version = "0.50.3"
 path = "../../../../framework/snippets"
diff --git a/contracts/feature-tests/basic-features/meta/Cargo.toml b/contracts/feature-tests/basic-features/meta/Cargo.toml
index 1e9348e75c..69069e1feb 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.50.2"
+version = "0.50.3"
 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 99e2e9d5c6..9b97339220 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.2"
+version = "0.50.3"
 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 0279a974b9..e216d4cd5f 100644
--- a/contracts/feature-tests/basic-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/basic-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.2"
+version = "0.50.3"
 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 21027d1211..4f745603da 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.50.2"
+version = "0.50.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.2"
+version = "0.50.3"
 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 a1d32efe6d..066ce2ac49 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.50.2"
+version = "0.50.3"
 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 efb04c52d0..37b666405d 100644
--- a/contracts/feature-tests/big-float-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/big-float-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/Cargo.toml b/contracts/feature-tests/composability/Cargo.toml
index 91c1da2653..33f3dfe9c4 100644
--- a/contracts/feature-tests/composability/Cargo.toml
+++ b/contracts/feature-tests/composability/Cargo.toml
@@ -36,9 +36,9 @@ path = "recursive-caller"
 path = "vault"
 
 [dependencies.multiversx-sc]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.2"
+version = "0.50.3"
 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 6114a2f8b4..1e74ef58f9 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.50.2"
+version = "0.50.3"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.2"
+version = "0.50.3"
 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 2f465de6a2..2b7cd159be 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.50.2"
+version = "0.50.3"
 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 dda5daf882..2ee4f9c664 100644
--- a/contracts/feature-tests/composability/builtin-func-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/builtin-func-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.2"
+version = "0.50.3"
 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 f0785ce123..64af863597 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.50.2"
+version = "0.50.3"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.2"
+version = "0.50.3"
 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 ef6a85fa3b..8b0d3678a2 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
@@ -9,10 +9,10 @@ publish = false
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.2"
+version = "0.50.3"
 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 5aeb82dd75..8137ae6bc0 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.50.2"
+version = "0.50.3"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.50.2"
+version = "0.50.3"
 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 b891bd5bed..f045ce6899 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.2"
+version = "0.50.3"
 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 5155115bb0..5456487df0 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.50.2"
+version = "0.50.3"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.2"
+version = "0.50.3"
 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 7b8094af55..31a3fc7226 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.50.2"
+version = "0.50.3"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.50.2"
+version = "0.50.3"
 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 6c7c139532..950c3a44fc 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.2"
+version = "0.50.3"
 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 a76a45818c..c374d4135d 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.50.2"
+version = "0.50.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.2"
+version = "0.50.3"
 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 9537044891..0f60e6e736 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.50.2"
+version = "0.50.3"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.2"
+version = "0.50.3"
 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 7cdf43adda..d6707df771 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.50.2"
+version = "0.50.3"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.50.2"
+version = "0.50.3"
 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 09de3c1015..601687a269 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.2"
+version = "0.50.3"
 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 4f909f3aad..311bb0c805 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
@@ -9,10 +9,10 @@ publish = false
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.2"
+version = "0.50.3"
 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 00ca2de2c7..ba9d5a9793 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.50.2"
+version = "0.50.3"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.50.2"
+version = "0.50.3"
 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 a640e0b8f7..b06bd997cc 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/forwarder-legacy/Cargo.toml b/contracts/feature-tests/composability/forwarder-legacy/Cargo.toml
index 4a037a62e9..b4b6c5a6e7 100644
--- a/contracts/feature-tests/composability/forwarder-legacy/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-legacy/Cargo.toml
@@ -12,10 +12,10 @@ path = "src/forwarder_legacy_main.rs"
 path = "../vault"
 
 [dependencies.multiversx-sc]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../../framework/scenario"
 
diff --git a/contracts/feature-tests/composability/forwarder-legacy/meta/Cargo.toml b/contracts/feature-tests/composability/forwarder-legacy/meta/Cargo.toml
index dcec47e4ce..5b497ee37e 100644
--- a/contracts/feature-tests/composability/forwarder-legacy/meta/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-legacy/meta/Cargo.toml
@@ -8,6 +8,6 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../../../framework/meta"
 default-features = false
diff --git a/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.toml b/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.toml
index 804df32de4..8102196a6c 100644
--- a/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.2"
+version = "0.50.3"
 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 599c672f52..130bba0ff3 100644
--- a/contracts/feature-tests/composability/forwarder-queue/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-queue/Cargo.toml
@@ -9,14 +9,14 @@ publish = false
 path = "src/forwarder_queue.rs"
 
 [dependencies.multiversx-sc]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../../framework/wasm-adapter"
 optional = true
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.2"
+version = "0.50.3"
 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 4f6a89d5eb..e69a6aa677 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.50.2"
+version = "0.50.3"
 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 4120330f0c..4b1dbfe684 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.2"
+version = "0.50.3"
 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 642a6d59f9..f8eec572f9 100644
--- a/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.2"
+version = "0.50.3"
 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 7a6002beec..1f7fa6175f 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.50.2"
+version = "0.50.3"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.2"
+version = "0.50.3"
 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 36eed72979..f9f45148b9 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.50.2"
+version = "0.50.3"
 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 7f3695a14d..64009abbe1 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.2"
+version = "0.50.3"
 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 0953d307e0..84da48195a 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.2"
+version = "0.50.3"
 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 0e786a35be..410780a85a 100644
--- a/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/forwarder/Cargo.toml b/contracts/feature-tests/composability/forwarder/Cargo.toml
index b49df0fa82..9eb304af96 100644
--- a/contracts/feature-tests/composability/forwarder/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder/Cargo.toml
@@ -9,10 +9,10 @@ publish = false
 path = "src/forwarder_main.rs"
 
 [dependencies.multiversx-sc]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../../framework/scenario"
 
diff --git a/contracts/feature-tests/composability/forwarder/meta/Cargo.toml b/contracts/feature-tests/composability/forwarder/meta/Cargo.toml
index 73ce018f3f..5a5595041d 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.50.2"
+version = "0.50.3"
 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 5d1011af13..07085abea6 100644
--- a/contracts/feature-tests/composability/forwarder/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/interact/Cargo.toml b/contracts/feature-tests/composability/interact/Cargo.toml
index 743416441f..a041e0518f 100644
--- a/contracts/feature-tests/composability/interact/Cargo.toml
+++ b/contracts/feature-tests/composability/interact/Cargo.toml
@@ -15,9 +15,9 @@ serde = { version = "1.0", features = ["derive"] }
 toml = "0.8.6"
 
 [dependencies.multiversx-sc]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-snippets]
-version = "0.50.2"
+version = "0.50.3"
 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 abb9e6d870..807849bb25 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.50.2"
+version = "0.50.3"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.2"
+version = "0.50.3"
 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 3ba448368b..b02222f23e 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.50.2"
+version = "0.50.3"
 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 56b0e6bb4d..581b5e7680 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.2"
+version = "0.50.3"
 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 bb67b51dda..f0685ebcf5 100644
--- a/contracts/feature-tests/composability/promises-features/Cargo.toml
+++ b/contracts/feature-tests/composability/promises-features/Cargo.toml
@@ -9,6 +9,6 @@ publish = false
 path = "src/promises_main.rs"
 
 [dependencies.multiversx-sc]
-version = "0.50.2"
+version = "0.50.3"
 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 b60d2f0ecd..aa797c1d3c 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.50.2"
+version = "0.50.3"
 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 c0825ad5eb..39c93eb948 100644
--- a/contracts/feature-tests/composability/promises-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/promises-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.2"
+version = "0.50.3"
 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 27dbeafb01..7668df8c3a 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.50.2"
+version = "0.50.3"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.2"
+version = "0.50.3"
 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 b07b833343..1062f90211 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.50.2"
+version = "0.50.3"
 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 493a515c05..fe0ad4ff4b 100644
--- a/contracts/feature-tests/composability/proxy-test-first/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/proxy-test-first/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.2"
+version = "0.50.3"
 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 ab9768b6c7..1170efad40 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.50.2"
+version = "0.50.3"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.2"
+version = "0.50.3"
 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 56dcd263bf..171b710fdb 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.50.2"
+version = "0.50.3"
 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 b1f2387b8f..e5ca8d1b5e 100644
--- a/contracts/feature-tests/composability/proxy-test-second/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/proxy-test-second/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.2"
+version = "0.50.3"
 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 5a3f79327d..08adf23128 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.50.2"
+version = "0.50.3"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.2"
+version = "0.50.3"
 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 9bc0fce89b..6e2f89277d 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.50.2"
+version = "0.50.3"
 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 5eb5a69d31..ca36ea3c03 100644
--- a/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.2"
+version = "0.50.3"
 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 119058fffa..76b5d3b38d 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.50.2"
+version = "0.50.3"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.2"
+version = "0.50.3"
 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 eb6b401033..f5c57b2cdb 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.50.2"
+version = "0.50.3"
 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 1c2401b202..b29ca05253 100644
--- a/contracts/feature-tests/composability/transfer-role-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/transfer-role-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/vault/Cargo.toml b/contracts/feature-tests/composability/vault/Cargo.toml
index 24b2c34f4e..f014b6234a 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.50.2"
+version = "0.50.3"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../../framework/scenario"
diff --git a/contracts/feature-tests/composability/vault/meta/Cargo.toml b/contracts/feature-tests/composability/vault/meta/Cargo.toml
index 08eb0bd267..b73741d773 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.50.2"
+version = "0.50.3"
 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 789f13460d..bb85ed8ea8 100644
--- a/contracts/feature-tests/composability/vault/wasm-vault-promises/Cargo.toml
+++ b/contracts/feature-tests/composability/vault/wasm-vault-promises/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.2"
+version = "0.50.3"
 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 427ea7a408..f82dbd235a 100644
--- a/contracts/feature-tests/composability/vault/wasm-vault-upgrade/Cargo.toml
+++ b/contracts/feature-tests/composability/vault/wasm-vault-upgrade/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.2"
+version = "0.50.3"
 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 c82cbcced7..2b5f929dee 100644
--- a/contracts/feature-tests/composability/vault/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/vault/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.2"
+version = "0.50.3"
 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 a5854218fc..95a77618de 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.50.2"
+version = "0.50.3"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.2"
+version = "0.50.3"
 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 81143f9bc1..59c8411b91 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.50.2"
+version = "0.50.3"
 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 1213ae403c..0a8e753e0e 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.2"
+version = "0.50.3"
 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 a630345f50..f27a097e68 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.50.2"
+version = "0.50.3"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.2"
+version = "0.50.3"
 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 b2687c29c0..0d24dbe880 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.50.2"
+version = "0.50.3"
 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 b45c7437a9..f2b91359bc 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.2"
+version = "0.50.3"
 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 dde5f3ff77..314a2f79dc 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.50.2"
+version = "0.50.3"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.2"
+version = "0.50.3"
 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 9fd49525c9..584fdff0ff 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.50.2"
+version = "0.50.3"
 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 e694030313..b1b50c674d 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.2"
+version = "0.50.3"
 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 20ad72c3db..59c8698391 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.50.2"
+version = "0.50.3"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.2"
+version = "0.50.3"
 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 8f99f0a3ed..dd43493c09 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.50.2"
+version = "0.50.3"
 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 c3b9513a5c..e2e1a7b1d9 100644
--- a/contracts/feature-tests/erc-style-contracts/erc1155/wasm/Cargo.toml
+++ b/contracts/feature-tests/erc-style-contracts/erc1155/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.2"
+version = "0.50.3"
 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 174608fa33..c41b75b3e8 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.50.2"
+version = "0.50.3"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.2"
+version = "0.50.3"
 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 239c28da37..82b34f245a 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.50.2"
+version = "0.50.3"
 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 42971d74de..de00855ee5 100644
--- a/contracts/feature-tests/erc-style-contracts/erc20/wasm/Cargo.toml
+++ b/contracts/feature-tests/erc-style-contracts/erc20/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.2"
+version = "0.50.3"
 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 6542540c70..62e8bf18f1 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.50.2"
+version = "0.50.3"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.2"
+version = "0.50.3"
 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 30baf33bd5..06b516c887 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.50.2"
+version = "0.50.3"
 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 a5c5765e1e..4ee3302598 100644
--- a/contracts/feature-tests/erc-style-contracts/erc721/wasm/Cargo.toml
+++ b/contracts/feature-tests/erc-style-contracts/erc721/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.2"
+version = "0.50.3"
 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 fbbcae82e6..eb84590bb5 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.50.2"
+version = "0.50.3"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.2"
+version = "0.50.3"
 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 0fc8f82cd9..ee286f9601 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.50.2"
+version = "0.50.3"
 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 0625680ae6..3e7112f299 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.2"
+version = "0.50.3"
 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 a5a4670a95..ca7c0ab46f 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.50.2"
+version = "0.50.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.2"
+version = "0.50.3"
 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 08b53f9c08..e2dc447421 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.50.2"
+version = "0.50.3"
 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 8cc53b0a15..8a315ab804 100644
--- a/contracts/feature-tests/esdt-system-sc-mock/wasm/Cargo.toml
+++ b/contracts/feature-tests/esdt-system-sc-mock/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/exchange-features/Cargo.toml b/contracts/feature-tests/exchange-features/Cargo.toml
index 6c931fa94f..0bf9de1dfd 100644
--- a/contracts/feature-tests/exchange-features/Cargo.toml
+++ b/contracts/feature-tests/exchange-features/Cargo.toml
@@ -9,9 +9,9 @@ publish = false
 path = "src/exchange_features.rs"
 
 [dependencies.multiversx-sc]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../framework/scenario"
diff --git a/contracts/feature-tests/exchange-features/meta/Cargo.toml b/contracts/feature-tests/exchange-features/meta/Cargo.toml
index 897e04471b..898650a4fa 100644
--- a/contracts/feature-tests/exchange-features/meta/Cargo.toml
+++ b/contracts/feature-tests/exchange-features/meta/Cargo.toml
@@ -8,6 +8,6 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/feature-tests/exchange-features/wasm/Cargo.toml b/contracts/feature-tests/exchange-features/wasm/Cargo.toml
index 637ba98293..7b49749410 100644
--- a/contracts/feature-tests/exchange-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/exchange-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.2"
+version = "0.50.3"
 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 0437e961bf..0f8546be61 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.50.2"
+version = "0.50.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.2"
+version = "0.50.3"
 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 44e6c0d1e3..829c46b31d 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.50.2"
+version = "0.50.3"
 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 875d438dd0..b79ce4c245 100644
--- a/contracts/feature-tests/formatted-message-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/formatted-message-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.2"
+version = "0.50.3"
 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 99cd9f8d33..f2fe3a1764 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.50.2"
+version = "0.50.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.2"
+version = "0.50.3"
 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 1a307e3000..5ef8defae3 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.50.2"
+version = "0.50.3"
 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 5112f7b43d..1af7c7cfad 100644
--- a/contracts/feature-tests/managed-map-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/managed-map-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.2"
+version = "0.50.3"
 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 46ef193145..0e4d48e950 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.50.2"
+version = "0.50.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.2"
+version = "0.50.3"
 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 53f22000c2..e7af5102d7 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.50.2"
+version = "0.50.3"
 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 a78bd20b73..9903659f00 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.2"
+version = "0.50.3"
 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 514bb760d2..e49c0fedb8 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
@@ -29,7 +29,7 @@ path = ".."
 features = ["example_feature"]
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.2"
+version = "0.50.3"
 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 e9fb18e566..44eba572c2 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.2"
+version = "0.50.3"
 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 a743c6f29e..707671421d 100644
--- a/contracts/feature-tests/multi-contract-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/multi-contract-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.2"
+version = "0.50.3"
 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 3b3e93c6da..57a56fc096 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.50.2"
+version = "0.50.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.2"
+version = "0.50.3"
 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 e163907acb..04aaf3d8e9 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.50.2"
+version = "0.50.3"
 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 4ac10cfb9a..c0637702a2 100644
--- a/contracts/feature-tests/panic-message-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/panic-message-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/payable-features/Cargo.toml b/contracts/feature-tests/payable-features/Cargo.toml
index 72c3a3c792..4ff90d96c7 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.50.2"
+version = "0.50.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../framework/scenario"
diff --git a/contracts/feature-tests/payable-features/meta/Cargo.toml b/contracts/feature-tests/payable-features/meta/Cargo.toml
index 2777b86b88..716e89d80e 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.50.2"
+version = "0.50.3"
 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 48d050441a..4a0ab8c226 100644
--- a/contracts/feature-tests/payable-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/payable-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.2"
+version = "0.50.3"
 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 c5f0cf482e..ab4a00e191 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.50.2"
+version = "0.50.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.2"
+version = "0.50.3"
 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 4d83a319b3..342e1f9cf9 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.50.2"
+version = "0.50.3"
 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 46cc2f507e..8866c4ff38 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.50.2"
+version = "0.50.3"
 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 65c5fe6cfd..bc52826ecd 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.50.2"
+// version = "0.50.3"
 // 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 5d0df5dea1..20df548937 100644
--- a/contracts/feature-tests/rust-snippets-generator-test/wasm/Cargo.toml
+++ b/contracts/feature-tests/rust-snippets-generator-test/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.2"
+version = "0.50.3"
 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 aa14f96315..c5ccf87a73 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.50.2"
+version = "0.50.3"
 path = "../../../framework/base"
 features = [ "alloc" ]
 
@@ -17,7 +17,7 @@ path = "../../examples/adder"
 path = "../../feature-tests/basic-features"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.2"
+version = "0.50.3"
 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 36ec302bd6..e257a89a34 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.50.2"
+version = "0.50.3"
 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 14c563d0b6..0c4593999f 100644
--- a/contracts/feature-tests/rust-testing-framework-tester/wasm/Cargo.toml
+++ b/contracts/feature-tests/rust-testing-framework-tester/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/scenario-tester/Cargo.toml b/contracts/feature-tests/scenario-tester/Cargo.toml
index 00680030c5..90be88892c 100644
--- a/contracts/feature-tests/scenario-tester/Cargo.toml
+++ b/contracts/feature-tests/scenario-tester/Cargo.toml
@@ -9,9 +9,9 @@ publish = false
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../framework/scenario"
diff --git a/contracts/feature-tests/scenario-tester/meta/Cargo.toml b/contracts/feature-tests/scenario-tester/meta/Cargo.toml
index cf831d2e75..d1bec14b1b 100644
--- a/contracts/feature-tests/scenario-tester/meta/Cargo.toml
+++ b/contracts/feature-tests/scenario-tester/meta/Cargo.toml
@@ -8,6 +8,6 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/feature-tests/scenario-tester/wasm/Cargo.toml b/contracts/feature-tests/scenario-tester/wasm/Cargo.toml
index 50041d3db4..3076ca5055 100644
--- a/contracts/feature-tests/scenario-tester/wasm/Cargo.toml
+++ b/contracts/feature-tests/scenario-tester/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/use-module/Cargo.toml b/contracts/feature-tests/use-module/Cargo.toml
index e458d9f2ca..dde118d42f 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.50.2"
+version = "0.50.3"
 path = "../../../contracts/modules"
 
 [dependencies.multiversx-sc]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../framework/scenario"
 
 [dev-dependencies.multiversx-sc-meta]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../framework/meta"
diff --git a/contracts/feature-tests/use-module/meta/Cargo.toml b/contracts/feature-tests/use-module/meta/Cargo.toml
index f80dc60415..334b6a0311 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.50.2"
+version = "0.50.3"
 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 950b4522d2..4d51a10d68 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.50.2"
+version = "0.50.3"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.50.2"
+version = "0.50.3"
 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 b8b1c76070..24dba15f2a 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.50.2"
+            "version": "0.50.3"
         }
     },
     "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 bd09d65eb2..e2da01d9a4 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.50.2"
+            "version": "0.50.3"
         }
     },
     "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 2d2f159fca..92190bcc04 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.2"
+version = "0.50.3"
 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 6a09664a03..576a6fe2e9 100644
--- a/contracts/feature-tests/use-module/wasm/Cargo.toml
+++ b/contracts/feature-tests/use-module/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/modules/Cargo.toml b/contracts/modules/Cargo.toml
index c5d5c5c811..4eea34320e 100644
--- a/contracts/modules/Cargo.toml
+++ b/contracts/modules/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-modules"
-version = "0.50.2"
+version = "0.50.3"
 edition = "2021"
 
 authors = ["MultiversX <contact@multiversx.com>"]
@@ -17,5 +17,5 @@ categories = ["no-std", "wasm", "cryptography::cryptocurrencies"]
 alloc = ["multiversx-sc/alloc"]
 
 [dependencies.multiversx-sc]
-version = "0.50.2"
+version = "0.50.3"
 path = "../../framework/base"
diff --git a/framework/base/Cargo.toml b/framework/base/Cargo.toml
index 9d28abbf43..3e348fd6d0 100644
--- a/framework/base/Cargo.toml
+++ b/framework/base/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc"
-version = "0.50.2"
+version = "0.50.3"
 edition = "2021"
 
 authors = ["Andrei Marinica <andrei.marinica@multiversx.com>", "MultiversX <contact@multiversx.com>"]
@@ -29,7 +29,7 @@ num-traits = { version = "=0.2.19", default-features = false }
 unwrap-infallible = "0.1.5"
 
 [dependencies.multiversx-sc-derive]
-version = "=0.50.2"
+version = "=0.50.3"
 path = "../derive"
 
 [dependencies.multiversx-sc-codec]
diff --git a/framework/derive/Cargo.toml b/framework/derive/Cargo.toml
index 5ce6412456..ef10f1f2fa 100644
--- a/framework/derive/Cargo.toml
+++ b/framework/derive/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-derive"
-version = "0.50.2"
+version = "0.50.3"
 edition = "2021"
 
 authors = ["Andrei Marinica <andrei.marinica@multiversx.com>", "MultiversX <contact@multiversx.com>"]
diff --git a/framework/meta/Cargo.toml b/framework/meta/Cargo.toml
index 295e3b5598..65ce0c9295 100644
--- a/framework/meta/Cargo.toml
+++ b/framework/meta/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-meta"
-version = "0.50.2"
+version = "0.50.3"
 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.50.2"
+version = "=0.50.3"
 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 6b2b71129f..aea4c45083 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
@@ -75,10 +75,10 @@ path = "src/{SNIPPETS_SOURCE_FILE_NAME}"
 path = ".."
 
 [dependencies.multiversx-sc-snippets]
-version = "0.50.2"
+version = "0.50.3"
 
 [dependencies.multiversx-sc]
-version = "0.50.2"
+version = "0.50.3"
 
 [dependencies]
 clap = {{ version = "4.4.7", features = ["derive"] }}
diff --git a/framework/meta/src/version_history.rs b/framework/meta/src/version_history.rs
index bebbc9e4d0..5734d10a0d 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.50.2);
+pub const LAST_VERSION: FrameworkVersion = framework_version!(0.50.3);
 
 /// Indicates where to stop with the upgrades.
 pub const LAST_UPGRADE_VERSION: FrameworkVersion = LAST_VERSION;
@@ -72,6 +72,7 @@ pub const VERSIONS: &[FrameworkVersion] = framework_versions![
     0.50.0,
     0.50.1,
     0.50.2,
+    0.50.3,
 ];
 
 #[rustfmt::skip]
diff --git a/framework/scenario/Cargo.toml b/framework/scenario/Cargo.toml
index f4eadf8a7b..21ce6f5a20 100644
--- a/framework/scenario/Cargo.toml
+++ b/framework/scenario/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-scenario"
-version = "0.50.2"
+version = "0.50.3"
 edition = "2021"
 
 authors = [
@@ -41,12 +41,12 @@ path = "src/main.rs"
 run-go-tests = []
 
 [dependencies.multiversx-sc]
-version = "=0.50.2"
+version = "=0.50.3"
 features = ["alloc", "num-bigint"]
 path = "../base"
 
 [dependencies.multiversx-sc-meta]
-version = "=0.50.2"
+version = "=0.50.3"
 path = "../meta"
 
 [dependencies.multiversx-chain-scenario-format]
diff --git a/framework/snippets/Cargo.toml b/framework/snippets/Cargo.toml
index 1d2f1d4235..49961c84de 100644
--- a/framework/snippets/Cargo.toml
+++ b/framework/snippets/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-snippets"
-version = "0.50.2"
+version = "0.50.3"
 edition = "2021"
 
 authors = ["MultiversX <contact@multiversx.com>"]
@@ -22,7 +22,7 @@ env_logger = "0.11"
 futures = "0.3"
 
 [dependencies.multiversx-sc-scenario]
-version = "=0.50.2"
+version = "=0.50.3"
 path = "../scenario"
 
 [dependencies.multiversx-sdk]
diff --git a/framework/wasm-adapter/Cargo.toml b/framework/wasm-adapter/Cargo.toml
index 30dd14cb4d..e988da7a8a 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.50.2"
+version = "0.50.3"
 edition = "2021"
 
 authors = [
@@ -22,5 +22,5 @@ categories = [
 ]
 
 [dependencies.multiversx-sc]
-version = "=0.50.2"
+version = "=0.50.3"
 path = "../base"
diff --git a/tools/mxpy-snippet-generator/Cargo.toml b/tools/mxpy-snippet-generator/Cargo.toml
index 7237cd25fb..42979fd0b1 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.50.2"
+version = "0.50.3"
 path = "../../framework/base"
 
 [dependencies]
diff --git a/tools/rust-debugger/format-tests/Cargo.toml b/tools/rust-debugger/format-tests/Cargo.toml
index c74b08961f..611b892909 100644
--- a/tools/rust-debugger/format-tests/Cargo.toml
+++ b/tools/rust-debugger/format-tests/Cargo.toml
@@ -9,11 +9,11 @@ name = "format-tests"
 path = "src/format_tests.rs"
 
 [dependencies.multiversx-sc]
-version = "=0.50.2"
+version = "=0.50.3"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-scenario]
-version = "=0.50.2"
+version = "=0.50.3"
 path = "../../../framework/scenario"
 
 [dependencies.multiversx-chain-vm]

From 5db5e258189dd80bb09ef39a72b50aad223ad4d1 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Sat, 25 May 2024 20:06:46 +0300
Subject: [PATCH 0927/1254] Cargo.lock update

---
 contracts/benchmarks/large-storage/wasm/Cargo.lock     |  6 +++---
 .../mappers/linked-list-repeat/wasm/Cargo.lock         |  6 +++---
 .../benchmarks/mappers/map-repeat/wasm/Cargo.lock      |  6 +++---
 .../benchmarks/mappers/queue-repeat/wasm/Cargo.lock    |  6 +++---
 .../benchmarks/mappers/set-repeat/wasm/Cargo.lock      |  6 +++---
 .../mappers/single-value-repeat/wasm/Cargo.lock        |  6 +++---
 .../benchmarks/mappers/vec-repeat/wasm/Cargo.lock      |  6 +++---
 contracts/benchmarks/send-tx-repeat/wasm/Cargo.lock    |  6 +++---
 .../wasm-str-repeat-mb-builder-basic/Cargo.lock        |  6 +++---
 .../wasm-str-repeat-mb-builder-cached/Cargo.lock       |  6 +++---
 contracts/benchmarks/str-repeat/wasm/Cargo.lock        |  6 +++---
 contracts/core/price-aggregator/wasm/Cargo.lock        | 10 +++++-----
 contracts/examples/adder/wasm/Cargo.lock               |  6 +++---
 .../examples/bonding-curve-contract/wasm/Cargo.lock    |  8 ++++----
 contracts/examples/check-pause/wasm/Cargo.lock         |  8 ++++----
 contracts/examples/crowdfunding-esdt/wasm/Cargo.lock   |  6 +++---
 contracts/examples/crypto-bubbles/wasm/Cargo.lock      |  6 +++---
 .../crypto-kitties/kitty-auction/wasm/Cargo.lock       |  6 +++---
 .../crypto-kitties/kitty-genetic-alg/wasm/Cargo.lock   |  6 +++---
 .../crypto-kitties/kitty-ownership/wasm/Cargo.lock     |  6 +++---
 contracts/examples/crypto-zombies/wasm/Cargo.lock      |  6 +++---
 contracts/examples/digital-cash/wasm/Cargo.lock        |  6 +++---
 contracts/examples/empty/wasm/Cargo.lock               |  6 +++---
 .../examples/esdt-transfer-with-fee/wasm/Cargo.lock    |  6 +++---
 contracts/examples/factorial/wasm/Cargo.lock           |  6 +++---
 contracts/examples/fractional-nfts/wasm/Cargo.lock     |  8 ++++----
 contracts/examples/lottery-esdt/wasm/Cargo.lock        |  6 +++---
 .../examples/multisig/wasm-multisig-full/Cargo.lock    |  8 ++++----
 .../examples/multisig/wasm-multisig-view/Cargo.lock    |  8 ++++----
 contracts/examples/multisig/wasm/Cargo.lock            |  8 ++++----
 contracts/examples/nft-minter/wasm/Cargo.lock          |  6 +++---
 contracts/examples/nft-storage-prepay/wasm/Cargo.lock  |  6 +++---
 contracts/examples/nft-subscription/wasm/Cargo.lock    |  8 ++++----
 contracts/examples/order-book/factory/wasm/Cargo.lock  |  6 +++---
 contracts/examples/order-book/pair/wasm/Cargo.lock     |  6 +++---
 contracts/examples/ping-pong-egld/wasm/Cargo.lock      |  6 +++---
 contracts/examples/proxy-pause/wasm/Cargo.lock         |  6 +++---
 .../examples/rewards-distribution/wasm/Cargo.lock      |  8 ++++----
 contracts/examples/seed-nft-minter/wasm/Cargo.lock     |  8 ++++----
 contracts/examples/token-release/wasm/Cargo.lock       |  6 +++---
 .../abi-tester/wasm-abi-tester-ev/Cargo.lock           |  6 +++---
 contracts/feature-tests/abi-tester/wasm/Cargo.lock     |  6 +++---
 .../alloc-features/wasm-alloc-mem-fail/Cargo.lock      |  6 +++---
 .../alloc-features/wasm-alloc-mem-leaking/Cargo.lock   |  6 +++---
 contracts/feature-tests/alloc-features/wasm/Cargo.lock |  6 +++---
 .../wasm-basic-features-storage-bytes/Cargo.lock       |  8 ++++----
 contracts/feature-tests/basic-features/wasm/Cargo.lock |  8 ++++----
 .../feature-tests/big-float-features/wasm/Cargo.lock   |  6 +++---
 .../builtin-func-features/wasm/Cargo.lock              |  6 +++---
 .../esdt-contract-pair/first-contract/wasm/Cargo.lock  |  6 +++---
 .../esdt-contract-pair/second-contract/wasm/Cargo.lock |  6 +++---
 .../child/wasm/Cargo.lock                              |  6 +++---
 .../parent/wasm/Cargo.lock                             |  6 +++---
 .../composability/forwarder-legacy/wasm/Cargo.lock     |  6 +++---
 .../wasm-forwarder-queue-promises/Cargo.lock           |  6 +++---
 .../composability/forwarder-queue/wasm/Cargo.lock      |  6 +++---
 .../wasm-forwarder-raw-init-async-call/Cargo.lock      |  6 +++---
 .../wasm-forwarder-raw-init-sync-call/Cargo.lock       |  6 +++---
 .../composability/forwarder-raw/wasm/Cargo.lock        |  6 +++---
 .../composability/forwarder/wasm/Cargo.lock            |  6 +++---
 .../composability/local-esdt-and-nft/wasm/Cargo.lock   |  6 +++---
 .../composability/promises-features/wasm/Cargo.lock    |  6 +++---
 .../composability/proxy-test-first/wasm/Cargo.lock     |  6 +++---
 .../composability/proxy-test-second/wasm/Cargo.lock    |  6 +++---
 .../composability/recursive-caller/wasm/Cargo.lock     |  6 +++---
 .../transfer-role-features/wasm/Cargo.lock             |  8 ++++----
 .../composability/vault/wasm-vault-promises/Cargo.lock |  6 +++---
 .../composability/vault/wasm-vault-upgrade/Cargo.lock  |  6 +++---
 .../feature-tests/composability/vault/wasm/Cargo.lock  |  6 +++---
 .../crowdfunding-erc20/wasm/Cargo.lock                 |  6 +++---
 .../erc1155-marketplace/wasm/Cargo.lock                |  6 +++---
 .../erc1155-user-mock/wasm/Cargo.lock                  |  6 +++---
 .../erc-style-contracts/erc1155/wasm/Cargo.lock        |  6 +++---
 .../erc-style-contracts/erc20/wasm/Cargo.lock          |  6 +++---
 .../erc-style-contracts/erc721/wasm/Cargo.lock         |  6 +++---
 .../erc-style-contracts/lottery-erc20/wasm/Cargo.lock  |  6 +++---
 .../feature-tests/esdt-system-sc-mock/wasm/Cargo.lock  |  6 +++---
 .../feature-tests/exchange-features/wasm/Cargo.lock    |  6 +++---
 .../formatted-message-features/wasm/Cargo.lock         |  6 +++---
 .../feature-tests/managed-map-features/wasm/Cargo.lock |  6 +++---
 .../wasm-multi-contract-alt-impl/Cargo.lock            |  6 +++---
 .../wasm-multi-contract-example-feature/Cargo.lock     |  6 +++---
 .../wasm-multi-contract-features-view/Cargo.lock       |  6 +++---
 .../multi-contract-features/wasm/Cargo.lock            |  6 +++---
 .../panic-message-features/wasm/Cargo.lock             |  6 +++---
 .../feature-tests/payable-features/wasm/Cargo.lock     |  6 +++---
 .../rust-snippets-generator-test/wasm/Cargo.lock       |  6 +++---
 .../rust-testing-framework-tester/wasm/Cargo.lock      |  6 +++---
 .../feature-tests/scenario-tester/wasm/Cargo.lock      |  6 +++---
 .../use-module/wasm-use-module-view/Cargo.lock         |  8 ++++----
 contracts/feature-tests/use-module/wasm/Cargo.lock     |  8 ++++----
 91 files changed, 289 insertions(+), 289 deletions(-)

diff --git a/contracts/benchmarks/large-storage/wasm/Cargo.lock b/contracts/benchmarks/large-storage/wasm/Cargo.lock
index c67989402e..cbc4f52165 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.50.2"
+version = "0.50.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.lock
index edc6e52181..a7c0ef294b 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.50.2"
+version = "0.50.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.lock
index 30d336c349..b4efda6121 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.50.2"
+version = "0.50.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.lock
index 5abbf4c401..0cea6bf94d 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.50.2"
+version = "0.50.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -78,7 +78,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -89,7 +89,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.lock
index f1c90af28e..e1fa1f01cd 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.50.2"
+version = "0.50.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -78,7 +78,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -89,7 +89,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.lock
index 0fffaea416..5a39b2d833 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.50.2"
+version = "0.50.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -78,7 +78,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -89,7 +89,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.lock
index 41f6cb18bc..6addb7a28e 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.50.2"
+version = "0.50.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -78,7 +78,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -89,7 +89,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/send-tx-repeat/wasm/Cargo.lock b/contracts/benchmarks/send-tx-repeat/wasm/Cargo.lock
index 9fdc45b1e8..362f56acd6 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.50.2"
+version = "0.50.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.lock b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.lock
index 3e7e042a34..98f71f267e 100644
--- a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.lock
+++ b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.lock
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.lock b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.lock
index 9909b9bff2..37dd369183 100644
--- a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.lock
+++ b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.lock
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/str-repeat/wasm/Cargo.lock b/contracts/benchmarks/str-repeat/wasm/Cargo.lock
index 77855726d0..5825dd6f10 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.50.2"
+version = "0.50.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/core/price-aggregator/wasm/Cargo.lock b/contracts/core/price-aggregator/wasm/Cargo.lock
index 92e909aaf8..f05dbe8ca8 100644
--- a/contracts/core/price-aggregator/wasm/Cargo.lock
+++ b/contracts/core/price-aggregator/wasm/Cargo.lock
@@ -86,7 +86,7 @@ checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
 
 [[package]]
 name = "multiversx-price-aggregator-sc"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "arrayvec",
  "getrandom",
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -136,7 +136,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -147,14 +147,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/adder/wasm/Cargo.lock b/contracts/examples/adder/wasm/Cargo.lock
index 97e0051bfa..2eaa0f5a3e 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.50.2"
+version = "0.50.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/bonding-curve-contract/wasm/Cargo.lock b/contracts/examples/bonding-curve-contract/wasm/Cargo.lock
index 7a560ca3e8..68ea29d2b0 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.50.2"
+version = "0.50.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/check-pause/wasm/Cargo.lock b/contracts/examples/check-pause/wasm/Cargo.lock
index 5bfbf16ce0..264fedbbf0 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.50.2"
+version = "0.50.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crowdfunding-esdt/wasm/Cargo.lock b/contracts/examples/crowdfunding-esdt/wasm/Cargo.lock
index ea046ff602..2f4c595365 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.50.2"
+version = "0.50.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crypto-bubbles/wasm/Cargo.lock b/contracts/examples/crypto-bubbles/wasm/Cargo.lock
index d0dee467e9..ac6ca1b14b 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.50.2"
+version = "0.50.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.lock b/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.lock
index 4bba12fcd4..568debe608 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.50.2"
+version = "0.50.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -115,7 +115,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -126,7 +126,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]
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 cd5cdccd9b..f1106a069c 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.50.2"
+version = "0.50.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -96,7 +96,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -107,7 +107,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.lock b/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.lock
index a83f028879..2109c57392 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.50.2"
+version = "0.50.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -106,7 +106,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -117,7 +117,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crypto-zombies/wasm/Cargo.lock b/contracts/examples/crypto-zombies/wasm/Cargo.lock
index c74e4889c2..f6e58e8520 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.50.2"
+version = "0.50.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/digital-cash/wasm/Cargo.lock b/contracts/examples/digital-cash/wasm/Cargo.lock
index 8c5ac9e548..704a0b832f 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.50.2"
+version = "0.50.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/empty/wasm/Cargo.lock b/contracts/examples/empty/wasm/Cargo.lock
index f34ec7c0b4..e25d3d7e82 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.50.2"
+version = "0.50.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.lock b/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.lock
index 3a2a91c0c6..c6c6875688 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.50.2"
+version = "0.50.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/factorial/wasm/Cargo.lock b/contracts/examples/factorial/wasm/Cargo.lock
index e15341093b..068bc65f8d 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.50.2"
+version = "0.50.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/fractional-nfts/wasm/Cargo.lock b/contracts/examples/fractional-nfts/wasm/Cargo.lock
index a6b66fb14a..68f96fa8e0 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.50.2"
+version = "0.50.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/lottery-esdt/wasm/Cargo.lock b/contracts/examples/lottery-esdt/wasm/Cargo.lock
index e0da8484cd..071b76839d 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.50.2"
+version = "0.50.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/multisig/wasm-multisig-full/Cargo.lock b/contracts/examples/multisig/wasm-multisig-full/Cargo.lock
index 00913e5bc8..ddb406c3f0 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.50.2"
+version = "0.50.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/multisig/wasm-multisig-view/Cargo.lock b/contracts/examples/multisig/wasm-multisig-view/Cargo.lock
index bd9ab8b5ec..719bace565 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.50.2"
+version = "0.50.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/multisig/wasm/Cargo.lock b/contracts/examples/multisig/wasm/Cargo.lock
index 673fa33e75..c06110a7ae 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.50.2"
+version = "0.50.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/nft-minter/wasm/Cargo.lock b/contracts/examples/nft-minter/wasm/Cargo.lock
index fa1dc23826..7c29b164a0 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.50.2"
+version = "0.50.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/nft-storage-prepay/wasm/Cargo.lock b/contracts/examples/nft-storage-prepay/wasm/Cargo.lock
index 54f03f78aa..e70d37fe32 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.50.2"
+version = "0.50.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/nft-subscription/wasm/Cargo.lock b/contracts/examples/nft-subscription/wasm/Cargo.lock
index 86821b64b6..f2144f6237 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.50.2"
+version = "0.50.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,14 +82,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/order-book/factory/wasm/Cargo.lock b/contracts/examples/order-book/factory/wasm/Cargo.lock
index d7ba4176e8..3e773acdf3 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.50.2"
+version = "0.50.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/order-book/pair/wasm/Cargo.lock b/contracts/examples/order-book/pair/wasm/Cargo.lock
index 08be0f43aa..c2f75cfc9b 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.50.2"
+version = "0.50.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/ping-pong-egld/wasm/Cargo.lock b/contracts/examples/ping-pong-egld/wasm/Cargo.lock
index 4f575e46e4..4f18b598d6 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.50.2"
+version = "0.50.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/proxy-pause/wasm/Cargo.lock b/contracts/examples/proxy-pause/wasm/Cargo.lock
index 7d66a9015f..aa6b65e308 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.50.2"
+version = "0.50.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/rewards-distribution/wasm/Cargo.lock b/contracts/examples/rewards-distribution/wasm/Cargo.lock
index 473084629c..72eb898ad0 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.50.2"
+version = "0.50.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,14 +82,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/seed-nft-minter/wasm/Cargo.lock b/contracts/examples/seed-nft-minter/wasm/Cargo.lock
index 2feb6f588a..91ebc13608 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.50.2"
+version = "0.50.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,14 +82,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/token-release/wasm/Cargo.lock b/contracts/examples/token-release/wasm/Cargo.lock
index 31f9d46e16..382cdc8414 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.50.2"
+version = "0.50.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]
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 884847d716..bac560f281 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.50.2"
+version = "0.50.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/abi-tester/wasm/Cargo.lock b/contracts/feature-tests/abi-tester/wasm/Cargo.lock
index 7f8a27a8e4..d69bdd5bbd 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.50.2"
+version = "0.50.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock
index 78acaf1b89..acc0c96da5 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.lock b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.lock
index c6c6f45479..1d03996070 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.lock
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.lock
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/alloc-features/wasm/Cargo.lock b/contracts/feature-tests/alloc-features/wasm/Cargo.lock
index 4e2acd30ca..9b6a2ac16a 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.50.2"
+version = "0.50.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]
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 4630bb8400..8a3c056b0d 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.50.2"
+version = "0.50.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/basic-features/wasm/Cargo.lock b/contracts/feature-tests/basic-features/wasm/Cargo.lock
index 7dab17a58d..e2f26179b1 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.50.2"
+version = "0.50.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/big-float-features/wasm/Cargo.lock b/contracts/feature-tests/big-float-features/wasm/Cargo.lock
index 9aa83cc074..d694885d17 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.50.2"
+version = "0.50.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]
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 60734695f7..c7c6efa6c9 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.50.2"
+version = "0.50.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]
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 f94ab78084..334d6e5acc 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.50.2"
+version = "0.50.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]
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 975bd017d7..98cb1a7ec8 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.50.2"
+version = "0.50.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]
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 baac26c348..e5e29b685b 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.50.2"
+version = "0.50.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]
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 d9499e4e80..5df8629850 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
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.lock
index 4a20e7b616..f0b4c69df9 100644
--- a/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.lock
@@ -56,7 +56,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,7 +98,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]
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 49625f687a..b8ab6256c2 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
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock
index d8d9bfb8c8..fe79f9145e 100644
--- a/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]
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 ae85ec0eee..8935e69d01 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.50.2"
+version = "0.50.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]
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 484e4d9653..d0888c7ae9 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.50.2"
+version = "0.50.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.lock
index f4f75e147f..e889b2e95b 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.50.2"
+version = "0.50.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock
index 8163df9d57..b7dd35fde6 100755
--- a/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]
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 90b514d9ce..50003012b7 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.50.2"
+version = "0.50.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/promises-features/wasm/Cargo.lock b/contracts/feature-tests/composability/promises-features/wasm/Cargo.lock
index 18cbfe0921..091176489b 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.50.2"
+version = "0.50.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]
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 7872127d38..ccfd61e72c 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.50.2"
+version = "0.50.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]
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 8443841af6..02a4ae8865 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.50.2"
+version = "0.50.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.lock b/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.lock
index 8e14094060..a363608b01 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.50.2"
+version = "0.50.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]
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 4c868f42b2..8999fc8883 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.50.2"
+version = "0.50.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,14 +82,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]
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 758767fdfa..57ea0b6085 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.50.2"
+version = "0.50.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]
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 0893fec490..33ce46111e 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.50.2"
+version = "0.50.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/vault/wasm/Cargo.lock b/contracts/feature-tests/composability/vault/wasm/Cargo.lock
index 298fd39d23..f4b152850b 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.50.2"
+version = "0.50.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]
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 28d168f622..37ea735e09 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.50.2"
+version = "0.50.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]
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 862982b1d1..b20203f2dd 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.50.2"
+version = "0.50.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]
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 7164b2b42c..238df48aea 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.50.2"
+version = "0.50.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]
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 45cb9a8029..fb6988c95a 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.50.2"
+version = "0.50.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]
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 f6d4495057..93df2a8f3b 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.50.2"
+version = "0.50.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]
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 5e76f98d16..42158fbfd7 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.50.2"
+version = "0.50.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]
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 2757cbb53b..93af02f7fe 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.50.2"
+version = "0.50.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]
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 73b31bf536..c5ffbccbff 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.50.2"
+version = "0.50.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/exchange-features/wasm/Cargo.lock b/contracts/feature-tests/exchange-features/wasm/Cargo.lock
index 286ebaee06..6e84158ba7 100644
--- a/contracts/feature-tests/exchange-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/exchange-features/wasm/Cargo.lock
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/formatted-message-features/wasm/Cargo.lock b/contracts/feature-tests/formatted-message-features/wasm/Cargo.lock
index 42efe8d831..4f02ecead6 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.50.2"
+version = "0.50.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/managed-map-features/wasm/Cargo.lock b/contracts/feature-tests/managed-map-features/wasm/Cargo.lock
index 8084fb93b9..f7f3456541 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.50.2"
+version = "0.50.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]
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 47b92edcb7..677ad0bc84 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.50.2"
+version = "0.50.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]
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 b5cb4d6ad0..b9b3b9e611 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.50.2"
+version = "0.50.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]
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 de2e51f1ed..ed037e3548 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.50.2"
+version = "0.50.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/multi-contract-features/wasm/Cargo.lock b/contracts/feature-tests/multi-contract-features/wasm/Cargo.lock
index 751c5422f4..f16535f78e 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.50.2"
+version = "0.50.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/panic-message-features/wasm/Cargo.lock b/contracts/feature-tests/panic-message-features/wasm/Cargo.lock
index dfc856d146..6175f04a80 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.50.2"
+version = "0.50.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/payable-features/wasm/Cargo.lock b/contracts/feature-tests/payable-features/wasm/Cargo.lock
index fa2b91bebd..2d9af2cf8b 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.50.2"
+version = "0.50.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]
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 c3c840dd9b..98d93dea6f 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.50.2"
+version = "0.50.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]
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 b874ffab0c..a03542b6d8 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.50.2"
+version = "0.50.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/scenario-tester/wasm/Cargo.lock b/contracts/feature-tests/scenario-tester/wasm/Cargo.lock
index 53858af72c..7369ef2a5d 100755
--- a/contracts/feature-tests/scenario-tester/wasm/Cargo.lock
+++ b/contracts/feature-tests/scenario-tester/wasm/Cargo.lock
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]
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 0da98e30bd..f89966ed3a 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.50.2"
+version = "0.50.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,14 +82,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/use-module/wasm/Cargo.lock b/contracts/feature-tests/use-module/wasm/Cargo.lock
index 2f7c0a99e9..d2ea103db8 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.50.2"
+version = "0.50.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,14 +82,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.2"
+version = "0.50.3"
 dependencies = [
  "multiversx-sc",
 ]

From 866428a57ee143d0eea1221faac243c513ab1e14 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Mon, 27 May 2024 11:01:09 +0300
Subject: [PATCH 0928/1254] snippet gen version fix

---
 .../src/cmd/contract/generate_snippets/snippet_crate_gen.rs     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 17776df54e..fc02e3f648 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
@@ -60,7 +60,7 @@ pub(crate) fn create_snippets_cargo_toml(
         }
     };
 
-    let last_release_version = &version_history::VERSIONS.last().unwrap().version;
+    let last_release_version = &version_history::LAST_VERSION;
 
     writeln!(
         &mut file,

From b0c1d68c2287d9abdc7df1f18bf07aa8c003e621 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Mon, 27 May 2024 21:21:34 +0300
Subject: [PATCH 0929/1254] meta-lib split from meta

---
 Cargo.lock                                    | 25 +++++++++++--
 Cargo.toml                                    |  1 +
 contracts/feature-tests/abi-tester/Cargo.toml |  4 +--
 .../abi-tester/tests/abi_tester_abi_test.rs   | 16 ++++-----
 framework/meta-lib/Cargo.toml                 | 36 +++++++++++++++++++
 framework/meta-lib/README.md                  |  9 +++++
 framework/{meta => meta-lib}/src/abi_json.rs  |  0
 .../src/abi_json/build_info_abi_json.rs       |  0
 .../src/abi_json/contract_abi_json.rs         |  0
 .../src/abi_json/endpoint_abi_json.rs         |  0
 .../src/abi_json/esdt_attribute_abi_json.rs   |  0
 .../src/abi_json/esdt_attribute_json.rs       |  0
 .../src/abi_json/event_abi_json.rs            |  0
 .../src/abi_json/type_abi_json.rs             |  0
 .../src/cargo_toml_contents.rs                |  2 +-
 .../src/cli_args.rs => meta-lib/src/cli.rs}   |  4 +--
 .../src/cli}/cli_args_build.rs                |  0
 .../src/cli}/cli_args_contract.rs             |  0
 .../src/cli/cli_contract_main.rs}             | 15 +++-----
 framework/meta-lib/src/contract.rs            |  7 ++++
 .../src}/contract/generate_proxy.rs           |  0
 .../generate_proxy/proxy_crate_gen.rs         |  0
 .../contract/generate_proxy/proxy_gen_main.rs |  2 +-
 .../generate_proxy/proxy_generator.rs         |  4 +--
 .../generate_proxy/proxy_process_type_name.rs |  0
 .../src}/contract/generate_snippets.rs        |  0
 .../generate_snippets/snippet_crate_gen.rs    |  0
 .../generate_snippets/snippet_gen_common.rs   |  0
 .../generate_snippets/snippet_gen_main.rs     |  2 +-
 .../snippet_sc_functions_gen.rs               |  0
 .../generate_snippets/snippet_template_gen.rs |  0
 .../generate_snippets/snippet_type_map.rs     |  0
 .../cmd => meta-lib/src}/contract/meta_abi.rs |  0
 .../src}/contract/meta_config.rs              |  6 ++--
 .../src}/contract/sc_config.rs                |  0
 .../contract/sc_config/contract_variant.rs    |  2 +-
 .../sc_config/contract_variant_builder.rs     |  0
 .../sc_config/contract_variant_settings.rs    |  0
 .../contract_allocator.rs                     |  0
 .../contract_variant_settings/stack_size.rs   |  0
 .../sc_config/contract_variant_validate.rs    |  0
 .../contract/sc_config/sc_config_model.rs     |  0
 .../contract/sc_config/sc_config_proxy.rs     |  0
 .../contract/sc_config/sc_config_serde.rs     |  0
 .../src}/contract/sc_config/wasm_build.rs     |  2 +-
 .../src}/contract/sc_config/wasm_clean.rs     |  0
 .../src}/contract/sc_config/wasm_crate_gen.rs |  0
 .../src}/contract/sc_config/wasm_update.rs    |  0
 .../src}/contract/wasm_cargo_toml_data.rs     |  0
 .../src}/contract/wasm_cargo_toml_generate.rs |  4 ++-
 framework/{meta => meta-lib}/src/ei.rs        |  0
 framework/{meta => meta-lib}/src/ei/ei_1_0.rs |  0
 framework/{meta => meta-lib}/src/ei/ei_1_1.rs |  0
 framework/{meta => meta-lib}/src/ei/ei_1_2.rs |  0
 framework/{meta => meta-lib}/src/ei/ei_1_3.rs |  0
 .../{meta => meta-lib}/src/ei/ei_version.rs   |  0
 .../{meta => meta-lib}/src/ei_check_json.rs   |  0
 .../src/esdt_attr_file_json.rs                |  0
 framework/meta-lib/src/lib.rs                 | 18 ++++++++++
 .../{meta => meta-lib}/src/mxsc_file_json.rs  |  0
 .../{meta => meta-lib}/src/print_util.rs      |  0
 .../src/report_info_json.rs                   |  0
 framework/{meta => meta-lib}/src/tools.rs     |  5 +--
 .../src/tools/find_workspace.rs               |  0
 .../src/tools/git_describe.rs                 |  0
 .../{meta => meta-lib}/src/tools/twiggy.rs    |  0
 .../src/tools/wasm_extractor.rs               |  0
 .../{meta => meta-lib}/src/tools/wasm_opt.rs  |  0
 .../src/tools/wasm_to_wat.rs                  |  0
 framework/{meta => meta-lib}/src/version.rs   |  0
 .../{meta => meta-lib}/src/version_history.rs |  0
 framework/{meta => meta-lib}/tests/ei_test.rs |  2 +-
 .../tests/multi_contract_test.rs              |  2 +-
 framework/meta/Cargo.toml                     | 27 +++++++-------
 framework/meta/src/cli.rs                     |  5 +++
 .../{cli_args => cli}/cli_args_standalone.rs  |  5 ++-
 .../cli_standalone_main.rs}                   | 34 ++++++------------
 framework/meta/src/cmd.rs                     | 14 +++++---
 .../meta/src/cmd/{standalone => }/all.rs      |  2 +-
 .../meta/src/cmd/{standalone => }/info.rs     |  2 +-
 .../meta/src/cmd/{standalone => }/install.rs  |  2 +-
 .../install/install_scenario_go.rs            |  2 +-
 .../install/install_wasm_tools.rs             |  0
 .../{standalone => }/install/system_info.rs   |  0
 .../src/cmd/{standalone => }/local_deps.rs    |  4 +--
 .../src/cmd/{standalone => }/print_util.rs    |  0
 .../src/cmd/{standalone => }/scen_test_gen.rs |  2 +-
 .../scen_test_gen/stg_main.rs                 |  0
 .../scen_test_gen/stg_parse.rs                |  0
 .../scen_test_gen/stg_print.rs                |  0
 .../scen_test_gen/stg_process_code.rs         |  0
 .../scen_test_gen/stg_section.rs              |  0
 .../scen_test_gen/stg_write.rs                |  0
 .../meta/src/cmd/{standalone => }/template.rs |  0
 .../template/contract_creator.rs              |  2 +-
 .../template/contract_creator_target.rs       |  0
 .../{standalone => }/template/copy_util.rs    |  0
 .../{standalone => }/template/repo_source.rs  |  0
 .../template/repo_temp_download.rs            |  0
 .../{standalone => }/template/repo_version.rs |  0
 .../template/template_adjuster.rs             |  4 +--
 .../template/template_list.rs                 |  2 +-
 .../template/template_metadata.rs             |  0
 .../template/template_source.rs               |  0
 .../meta/src/cmd/{standalone => }/test.rs     |  2 +-
 .../src/cmd/{standalone => }/test_coverage.rs |  4 +--
 .../{standalone => }/test_coverage/cargo.rs   |  2 +-
 .../{standalone => }/test_coverage/error.rs   |  0
 .../test_coverage/llvm_cov.rs                 |  0
 .../{standalone => }/test_coverage/render.rs  |  0
 .../cmd/{standalone => }/test_coverage/run.rs |  4 +--
 .../{standalone => }/test_coverage/util.rs    |  2 +-
 .../meta/src/cmd/{standalone => }/upgrade.rs  |  0
 .../{standalone => }/upgrade/upgrade_0_31.rs  |  0
 .../{standalone => }/upgrade/upgrade_0_32.rs  |  0
 .../{standalone => }/upgrade/upgrade_0_39.rs  |  6 ++--
 .../{standalone => }/upgrade/upgrade_0_45.rs  |  6 ++--
 .../upgrade/upgrade_common.rs                 | 23 ++++++------
 .../{standalone => }/upgrade/upgrade_print.rs |  0
 .../upgrade/upgrade_selector.rs               |  6 ++--
 .../upgrade/upgrade_settings.rs               |  0
 .../folder_structure/relevant_directory.rs    |  3 +-
 framework/meta/src/lib.rs                     | 34 +++++++++---------
 framework/meta/src/main.rs                    |  2 +-
 framework/meta/tests/stg_process_code_test.rs |  4 +--
 framework/meta/tests/template_test.rs         |  4 +--
 framework/scenario/Cargo.toml                 |  4 +--
 .../scenario/src/facade/scenario_world.rs     |  2 +-
 .../src/facade/scenario_world_register.rs     |  4 +--
 framework/scenario/src/lib.rs                 |  2 +-
 .../scenario/tests/contract_without_macros.rs |  2 +-
 131 files changed, 233 insertions(+), 158 deletions(-)
 create mode 100644 framework/meta-lib/Cargo.toml
 create mode 100644 framework/meta-lib/README.md
 rename framework/{meta => meta-lib}/src/abi_json.rs (100%)
 rename framework/{meta => meta-lib}/src/abi_json/build_info_abi_json.rs (100%)
 rename framework/{meta => meta-lib}/src/abi_json/contract_abi_json.rs (100%)
 rename framework/{meta => meta-lib}/src/abi_json/endpoint_abi_json.rs (100%)
 rename framework/{meta => meta-lib}/src/abi_json/esdt_attribute_abi_json.rs (100%)
 rename framework/{meta => meta-lib}/src/abi_json/esdt_attribute_json.rs (100%)
 rename framework/{meta => meta-lib}/src/abi_json/event_abi_json.rs (100%)
 rename framework/{meta => meta-lib}/src/abi_json/type_abi_json.rs (100%)
 rename framework/{meta => meta-lib}/src/cargo_toml_contents.rs (99%)
 rename framework/{meta/src/cli_args.rs => meta-lib/src/cli.rs} (81%)
 rename framework/{meta/src/cli_args => meta-lib/src/cli}/cli_args_build.rs (100%)
 rename framework/{meta/src/cli_args => meta-lib/src/cli}/cli_args_contract.rs (100%)
 rename framework/{meta/src/cmd/contract.rs => meta-lib/src/cli/cli_contract_main.rs} (88%)
 create mode 100644 framework/meta-lib/src/contract.rs
 rename framework/{meta/src/cmd => meta-lib/src}/contract/generate_proxy.rs (100%)
 rename framework/{meta/src/cmd => meta-lib/src}/contract/generate_proxy/proxy_crate_gen.rs (100%)
 rename framework/{meta/src/cmd => meta-lib/src}/contract/generate_proxy/proxy_gen_main.rs (97%)
 rename framework/{meta/src/cmd => meta-lib/src}/contract/generate_proxy/proxy_generator.rs (99%)
 rename framework/{meta/src/cmd => meta-lib/src}/contract/generate_proxy/proxy_process_type_name.rs (100%)
 rename framework/{meta/src/cmd => meta-lib/src}/contract/generate_snippets.rs (100%)
 rename framework/{meta/src/cmd => meta-lib/src}/contract/generate_snippets/snippet_crate_gen.rs (100%)
 rename framework/{meta/src/cmd => meta-lib/src}/contract/generate_snippets/snippet_gen_common.rs (100%)
 rename framework/{meta/src/cmd => meta-lib/src}/contract/generate_snippets/snippet_gen_main.rs (97%)
 rename framework/{meta/src/cmd => meta-lib/src}/contract/generate_snippets/snippet_sc_functions_gen.rs (100%)
 rename framework/{meta/src/cmd => meta-lib/src}/contract/generate_snippets/snippet_template_gen.rs (100%)
 rename framework/{meta/src/cmd => meta-lib/src}/contract/generate_snippets/snippet_type_map.rs (100%)
 rename framework/{meta/src/cmd => meta-lib/src}/contract/meta_abi.rs (100%)
 rename framework/{meta/src/cmd => meta-lib/src}/contract/meta_config.rs (97%)
 rename framework/{meta/src/cmd => meta-lib/src}/contract/sc_config.rs (100%)
 rename framework/{meta/src/cmd => meta-lib/src}/contract/sc_config/contract_variant.rs (99%)
 rename framework/{meta/src/cmd => meta-lib/src}/contract/sc_config/contract_variant_builder.rs (100%)
 rename framework/{meta/src/cmd => meta-lib/src}/contract/sc_config/contract_variant_settings.rs (100%)
 rename framework/{meta/src/cmd => meta-lib/src}/contract/sc_config/contract_variant_settings/contract_allocator.rs (100%)
 rename framework/{meta/src/cmd => meta-lib/src}/contract/sc_config/contract_variant_settings/stack_size.rs (100%)
 rename framework/{meta/src/cmd => meta-lib/src}/contract/sc_config/contract_variant_validate.rs (100%)
 rename framework/{meta/src/cmd => meta-lib/src}/contract/sc_config/sc_config_model.rs (100%)
 rename framework/{meta/src/cmd => meta-lib/src}/contract/sc_config/sc_config_proxy.rs (100%)
 rename framework/{meta/src/cmd => meta-lib/src}/contract/sc_config/sc_config_serde.rs (100%)
 rename framework/{meta/src/cmd => meta-lib/src}/contract/sc_config/wasm_build.rs (99%)
 rename framework/{meta/src/cmd => meta-lib/src}/contract/sc_config/wasm_clean.rs (100%)
 rename framework/{meta/src/cmd => meta-lib/src}/contract/sc_config/wasm_crate_gen.rs (100%)
 rename framework/{meta/src/cmd => meta-lib/src}/contract/sc_config/wasm_update.rs (100%)
 rename framework/{meta/src/cmd => meta-lib/src}/contract/wasm_cargo_toml_data.rs (100%)
 rename framework/{meta/src/cmd => meta-lib/src}/contract/wasm_cargo_toml_generate.rs (95%)
 rename framework/{meta => meta-lib}/src/ei.rs (100%)
 rename framework/{meta => meta-lib}/src/ei/ei_1_0.rs (100%)
 rename framework/{meta => meta-lib}/src/ei/ei_1_1.rs (100%)
 rename framework/{meta => meta-lib}/src/ei/ei_1_2.rs (100%)
 rename framework/{meta => meta-lib}/src/ei/ei_1_3.rs (100%)
 rename framework/{meta => meta-lib}/src/ei/ei_version.rs (100%)
 rename framework/{meta => meta-lib}/src/ei_check_json.rs (100%)
 rename framework/{meta => meta-lib}/src/esdt_attr_file_json.rs (100%)
 create mode 100644 framework/meta-lib/src/lib.rs
 rename framework/{meta => meta-lib}/src/mxsc_file_json.rs (100%)
 rename framework/{meta => meta-lib}/src/print_util.rs (100%)
 rename framework/{meta => meta-lib}/src/report_info_json.rs (100%)
 rename framework/{meta => meta-lib}/src/tools.rs (87%)
 rename framework/{meta => meta-lib}/src/tools/find_workspace.rs (100%)
 rename framework/{meta => meta-lib}/src/tools/git_describe.rs (100%)
 rename framework/{meta => meta-lib}/src/tools/twiggy.rs (100%)
 rename framework/{meta => meta-lib}/src/tools/wasm_extractor.rs (100%)
 rename framework/{meta => meta-lib}/src/tools/wasm_opt.rs (100%)
 rename framework/{meta => meta-lib}/src/tools/wasm_to_wat.rs (100%)
 rename framework/{meta => meta-lib}/src/version.rs (100%)
 rename framework/{meta => meta-lib}/src/version_history.rs (100%)
 rename framework/{meta => meta-lib}/tests/ei_test.rs (98%)
 rename framework/{meta => meta-lib}/tests/multi_contract_test.rs (97%)
 create mode 100644 framework/meta/src/cli.rs
 rename framework/meta/src/{cli_args => cli}/cli_args_standalone.rs (99%)
 rename framework/meta/src/{cmd/standalone.rs => cli/cli_standalone_main.rs} (68%)
 rename framework/meta/src/cmd/{standalone => }/all.rs (98%)
 rename framework/meta/src/cmd/{standalone => }/info.rs (95%)
 rename framework/meta/src/cmd/{standalone => }/install.rs (98%)
 rename framework/meta/src/cmd/{standalone => }/install/install_scenario_go.rs (98%)
 rename framework/meta/src/cmd/{standalone => }/install/install_wasm_tools.rs (100%)
 rename framework/meta/src/cmd/{standalone => }/install/system_info.rs (100%)
 rename framework/meta/src/cmd/{standalone => }/local_deps.rs (97%)
 rename framework/meta/src/cmd/{standalone => }/print_util.rs (100%)
 rename framework/meta/src/cmd/{standalone => }/scen_test_gen.rs (93%)
 rename framework/meta/src/cmd/{standalone => }/scen_test_gen/stg_main.rs (100%)
 rename framework/meta/src/cmd/{standalone => }/scen_test_gen/stg_parse.rs (100%)
 rename framework/meta/src/cmd/{standalone => }/scen_test_gen/stg_print.rs (100%)
 rename framework/meta/src/cmd/{standalone => }/scen_test_gen/stg_process_code.rs (100%)
 rename framework/meta/src/cmd/{standalone => }/scen_test_gen/stg_section.rs (100%)
 rename framework/meta/src/cmd/{standalone => }/scen_test_gen/stg_write.rs (100%)
 rename framework/meta/src/cmd/{standalone => }/template.rs (100%)
 rename framework/meta/src/cmd/{standalone => }/template/contract_creator.rs (99%)
 rename framework/meta/src/cmd/{standalone => }/template/contract_creator_target.rs (100%)
 rename framework/meta/src/cmd/{standalone => }/template/copy_util.rs (100%)
 rename framework/meta/src/cmd/{standalone => }/template/repo_source.rs (100%)
 rename framework/meta/src/cmd/{standalone => }/template/repo_temp_download.rs (100%)
 rename framework/meta/src/cmd/{standalone => }/template/repo_version.rs (100%)
 rename framework/meta/src/cmd/{standalone => }/template/template_adjuster.rs (98%)
 rename framework/meta/src/cmd/{standalone => }/template/template_list.rs (94%)
 rename framework/meta/src/cmd/{standalone => }/template/template_metadata.rs (100%)
 rename framework/meta/src/cmd/{standalone => }/template/template_source.rs (100%)
 rename framework/meta/src/cmd/{standalone => }/test.rs (97%)
 rename framework/meta/src/cmd/{standalone => }/test_coverage.rs (76%)
 rename framework/meta/src/cmd/{standalone => }/test_coverage/cargo.rs (97%)
 rename framework/meta/src/cmd/{standalone => }/test_coverage/error.rs (100%)
 rename framework/meta/src/cmd/{standalone => }/test_coverage/llvm_cov.rs (100%)
 rename framework/meta/src/cmd/{standalone => }/test_coverage/render.rs (100%)
 rename framework/meta/src/cmd/{standalone => }/test_coverage/run.rs (95%)
 rename framework/meta/src/cmd/{standalone => }/test_coverage/util.rs (96%)
 rename framework/meta/src/cmd/{standalone => }/upgrade.rs (100%)
 rename framework/meta/src/cmd/{standalone => }/upgrade/upgrade_0_31.rs (100%)
 rename framework/meta/src/cmd/{standalone => }/upgrade/upgrade_0_32.rs (100%)
 rename framework/meta/src/cmd/{standalone => }/upgrade/upgrade_0_39.rs (96%)
 rename framework/meta/src/cmd/{standalone => }/upgrade/upgrade_0_45.rs (90%)
 rename framework/meta/src/cmd/{standalone => }/upgrade/upgrade_common.rs (97%)
 rename framework/meta/src/cmd/{standalone => }/upgrade/upgrade_print.rs (100%)
 rename framework/meta/src/cmd/{standalone => }/upgrade/upgrade_selector.rs (96%)
 rename framework/meta/src/cmd/{standalone => }/upgrade/upgrade_settings.rs (100%)

diff --git a/Cargo.lock b/Cargo.lock
index 23fb4402a9..c481c052b7 100755
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -17,7 +17,7 @@ name = "abi-tester"
 version = "0.0.0"
 dependencies = [
  "multiversx-sc",
- "multiversx-sc-meta",
+ "multiversx-sc-meta-lib",
  "multiversx-sc-scenario",
 ]
 
@@ -1978,7 +1978,7 @@ dependencies = [
  "hex",
  "lazy_static",
  "multiversx-sc",
- "multiversx-sc-meta",
+ "multiversx-sc-meta-lib",
  "pathdiff",
  "reqwest",
  "ruplacer",
@@ -1992,6 +1992,25 @@ dependencies = [
  "zip",
 ]
 
+[[package]]
+name = "multiversx-sc-meta-lib"
+version = "0.50.3"
+dependencies = [
+ "clap",
+ "colored",
+ "convert_case",
+ "hex",
+ "lazy_static",
+ "multiversx-sc",
+ "rustc_version",
+ "semver",
+ "serde",
+ "serde_json",
+ "toml",
+ "wasmparser",
+ "wasmprinter",
+]
+
 [[package]]
 name = "multiversx-sc-modules"
 version = "0.50.3"
@@ -2014,7 +2033,7 @@ dependencies = [
  "multiversx-chain-vm",
  "multiversx-chain-vm-executor",
  "multiversx-sc",
- "multiversx-sc-meta",
+ "multiversx-sc-meta-lib",
  "multiversx-sdk",
  "num-bigint",
  "num-traits",
diff --git a/Cargo.toml b/Cargo.toml
index abeac2b710..345b8670a5 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -8,6 +8,7 @@ members = [
   "framework/base",
   "framework/derive",
   "framework/meta",
+  "framework/meta-lib",
   "framework/scenario",
   "framework/snippets",
   "framework/wasm-adapter",
diff --git a/contracts/feature-tests/abi-tester/Cargo.toml b/contracts/feature-tests/abi-tester/Cargo.toml
index 29c5e03690..6962ad0618 100644
--- a/contracts/feature-tests/abi-tester/Cargo.toml
+++ b/contracts/feature-tests/abi-tester/Cargo.toml
@@ -17,6 +17,6 @@ features = ["alloc"]
 version = "0.50.3"
 path = "../../../framework/scenario"
 
-[dev-dependencies.multiversx-sc-meta]
+[dev-dependencies.multiversx-sc-meta-lib]
 version = "0.50.3"
-path = "../../../framework/meta"
+path = "../../../framework/meta-lib"
diff --git a/contracts/feature-tests/abi-tester/tests/abi_tester_abi_test.rs b/contracts/feature-tests/abi-tester/tests/abi_tester_abi_test.rs
index 4ef78f351b..d4114d316a 100644
--- a/contracts/feature-tests/abi-tester/tests/abi_tester_abi_test.rs
+++ b/contracts/feature-tests/abi-tester/tests/abi_tester_abi_test.rs
@@ -4,7 +4,7 @@ use multiversx_sc::{
     abi::{EnumVariantDescription, TypeContents, TypeNames},
     contract_base::ContractAbiProvider,
 };
-use multiversx_sc_meta::{
+use multiversx_sc_meta_lib::{
     abi_json::{self, EsdtAttributeAbiJson},
     esdt_attr_file_json::serialize_esdt_attribute_json,
 };
@@ -15,9 +15,9 @@ fn abi_tester_abi_generated_ok() {
     let blockchain = ScenarioWorld::new();
 
     // generate ABI
-    let multi_contract_config = multiversx_sc_meta::multi_contract_config::<abi_tester::AbiProvider>(
-        blockchain.current_dir().as_path(),
-    );
+    let multi_contract_config = multiversx_sc_meta_lib::multi_contract_config::<
+        abi_tester::AbiProvider,
+    >(blockchain.current_dir().as_path());
 
     let main_contract = multi_contract_config.find_contract("abi-tester");
     assert!(!main_contract.settings.external_view);
@@ -72,9 +72,9 @@ fn abi_tester_esdt_attr_abi_generated_ok() {
 fn check_multi_contract_config() {
     let blockchain = ScenarioWorld::new();
 
-    let multi_contract_config = multiversx_sc_meta::multi_contract_config::<abi_tester::AbiProvider>(
-        blockchain.current_dir().as_path(),
-    );
+    let multi_contract_config = multiversx_sc_meta_lib::multi_contract_config::<
+        abi_tester::AbiProvider,
+    >(blockchain.current_dir().as_path());
 
     let ev_contract = multi_contract_config.find_contract("abi-tester-ev");
     assert!(ev_contract.settings.external_view);
@@ -87,7 +87,7 @@ fn check_multi_contract_config() {
 #[test]
 fn abi_deserialization_check() {
     let main_json = fs::read_to_string("./abi_tester_expected_main.abi.json").unwrap();
-    let main_abi = multiversx_sc_meta::abi_json::deserialize_abi_from_json(&main_json).unwrap();
+    let main_abi = multiversx_sc_meta_lib::abi_json::deserialize_abi_from_json(&main_json).unwrap();
     let abi_enum_type = main_abi
         .types
         .get("AbiEnum")
diff --git a/framework/meta-lib/Cargo.toml b/framework/meta-lib/Cargo.toml
new file mode 100644
index 0000000000..bb963552f2
--- /dev/null
+++ b/framework/meta-lib/Cargo.toml
@@ -0,0 +1,36 @@
+[package]
+name = "multiversx-sc-meta-lib"
+version = "0.50.3"
+edition = "2021"
+
+authors = [
+    "Andrei Marinica <andrei.marinica@multiversx.com>",
+    "MultiversX <contact@multiversx.com>",
+]
+license = "GPL-3.0-only"
+readme = "README.md"
+repository = "https://github.com/multiversx/mx-sdk-rs"
+homepage = "https://multiversx.com/"
+documentation = "https://docs.multiversx.com/"
+description = "MultiversX smart contract meta-programming tools and build system"
+keywords = ["multiversx", "blockchain", "contract", "debug"]
+categories = ["cryptography::cryptocurrencies", "development-tools::debugging"]
+
+[dependencies]
+clap = { version = "4.4.7", features = ["derive"] }
+serde = { version = "1.0", features = ["derive"] }
+serde_json = "1.0"
+rustc_version = "0.4"
+toml = { version = "0.8.6", features = ["preserve_order"] }
+colored = "2.0"
+lazy_static = "1.4.0"
+convert_case = "0.6.0"
+hex = "0.4"
+wasmparser = "0.208"
+wasmprinter = "0.208"
+semver = "1.0.20"
+
+[dependencies.multiversx-sc]
+version = "=0.50.3"
+path = "../base"
+features = ["alloc", "num-bigint"]
diff --git a/framework/meta-lib/README.md b/framework/meta-lib/README.md
new file mode 100644
index 0000000000..e9bc7f3e34
--- /dev/null
+++ b/framework/meta-lib/README.md
@@ -0,0 +1,9 @@
+# Smart contract meta-programming
+
+[![crates.io](https://img.shields.io/crates/v/multiversx-sc-meta.svg)](https://crates.io/crates/multiversx-sc-meta)
+
+A meta-programming utility that works with smart contract code metadata.
+
+It is responsible with creating the smart contract ABIs, generating the wasm crates, and, ultimately, building the contract binaries
+
+For more about the build process, see https://docs.multiversx.com/developers/developer-reference/sc-build-reference/
diff --git a/framework/meta/src/abi_json.rs b/framework/meta-lib/src/abi_json.rs
similarity index 100%
rename from framework/meta/src/abi_json.rs
rename to framework/meta-lib/src/abi_json.rs
diff --git a/framework/meta/src/abi_json/build_info_abi_json.rs b/framework/meta-lib/src/abi_json/build_info_abi_json.rs
similarity index 100%
rename from framework/meta/src/abi_json/build_info_abi_json.rs
rename to framework/meta-lib/src/abi_json/build_info_abi_json.rs
diff --git a/framework/meta/src/abi_json/contract_abi_json.rs b/framework/meta-lib/src/abi_json/contract_abi_json.rs
similarity index 100%
rename from framework/meta/src/abi_json/contract_abi_json.rs
rename to framework/meta-lib/src/abi_json/contract_abi_json.rs
diff --git a/framework/meta/src/abi_json/endpoint_abi_json.rs b/framework/meta-lib/src/abi_json/endpoint_abi_json.rs
similarity index 100%
rename from framework/meta/src/abi_json/endpoint_abi_json.rs
rename to framework/meta-lib/src/abi_json/endpoint_abi_json.rs
diff --git a/framework/meta/src/abi_json/esdt_attribute_abi_json.rs b/framework/meta-lib/src/abi_json/esdt_attribute_abi_json.rs
similarity index 100%
rename from framework/meta/src/abi_json/esdt_attribute_abi_json.rs
rename to framework/meta-lib/src/abi_json/esdt_attribute_abi_json.rs
diff --git a/framework/meta/src/abi_json/esdt_attribute_json.rs b/framework/meta-lib/src/abi_json/esdt_attribute_json.rs
similarity index 100%
rename from framework/meta/src/abi_json/esdt_attribute_json.rs
rename to framework/meta-lib/src/abi_json/esdt_attribute_json.rs
diff --git a/framework/meta/src/abi_json/event_abi_json.rs b/framework/meta-lib/src/abi_json/event_abi_json.rs
similarity index 100%
rename from framework/meta/src/abi_json/event_abi_json.rs
rename to framework/meta-lib/src/abi_json/event_abi_json.rs
diff --git a/framework/meta/src/abi_json/type_abi_json.rs b/framework/meta-lib/src/abi_json/type_abi_json.rs
similarity index 100%
rename from framework/meta/src/abi_json/type_abi_json.rs
rename to framework/meta-lib/src/abi_json/type_abi_json.rs
diff --git a/framework/meta/src/cargo_toml_contents.rs b/framework/meta-lib/src/cargo_toml_contents.rs
similarity index 99%
rename from framework/meta/src/cargo_toml_contents.rs
rename to framework/meta-lib/src/cargo_toml_contents.rs
index efe0148c76..49721f5cec 100644
--- a/framework/meta/src/cargo_toml_contents.rs
+++ b/framework/meta-lib/src/cargo_toml_contents.rs
@@ -6,7 +6,7 @@ use std::{
 
 use toml::{value::Table, Value};
 
-use crate::cmd::contract::sc_config::ContractVariantProfile;
+use crate::contract::sc_config::ContractVariantProfile;
 
 pub const CARGO_TOML_DEPENDENCIES: &str = "dependencies";
 pub const CARGO_TOML_DEV_DEPENDENCIES: &str = "dev-dependencies";
diff --git a/framework/meta/src/cli_args.rs b/framework/meta-lib/src/cli.rs
similarity index 81%
rename from framework/meta/src/cli_args.rs
rename to framework/meta-lib/src/cli.rs
index d3ff8af23d..ff5d4a8111 100644
--- a/framework/meta/src/cli_args.rs
+++ b/framework/meta-lib/src/cli.rs
@@ -1,10 +1,10 @@
 mod cli_args_build;
 mod cli_args_contract;
-mod cli_args_standalone;
+mod cli_contract_main;
 
 pub use cli_args_build::*;
 pub use cli_args_contract::*;
-pub use cli_args_standalone::*;
+pub use cli_contract_main::*;
 
 pub trait CliArgsToRaw {
     /// Converts to a list of raw arguments, as they would be called in a command.
diff --git a/framework/meta/src/cli_args/cli_args_build.rs b/framework/meta-lib/src/cli/cli_args_build.rs
similarity index 100%
rename from framework/meta/src/cli_args/cli_args_build.rs
rename to framework/meta-lib/src/cli/cli_args_build.rs
diff --git a/framework/meta/src/cli_args/cli_args_contract.rs b/framework/meta-lib/src/cli/cli_args_contract.rs
similarity index 100%
rename from framework/meta/src/cli_args/cli_args_contract.rs
rename to framework/meta-lib/src/cli/cli_args_contract.rs
diff --git a/framework/meta/src/cmd/contract.rs b/framework/meta-lib/src/cli/cli_contract_main.rs
similarity index 88%
rename from framework/meta/src/cmd/contract.rs
rename to framework/meta-lib/src/cli/cli_contract_main.rs
index a16c60376a..7ce6dcbd74 100644
--- a/framework/meta/src/cmd/contract.rs
+++ b/framework/meta-lib/src/cli/cli_contract_main.rs
@@ -1,18 +1,11 @@
-mod generate_proxy;
-mod generate_snippets;
-mod meta_abi;
-mod meta_config;
-pub mod sc_config;
-pub mod wasm_cargo_toml_data;
-pub mod wasm_cargo_toml_generate;
-
 use std::path::Path;
 
-use crate::cli_args::{ContractCliAction, ContractCliArgs};
+use crate::{
+    cli::{ContractCliAction, ContractCliArgs},
+    contract::{meta_config::MetaConfig, sc_config::ScConfig},
+};
 use clap::Parser;
-use meta_config::MetaConfig;
 use multiversx_sc::contract_base::ContractAbiProvider;
-use sc_config::ScConfig;
 
 /// Entry point in the program from the contract meta crates.
 pub fn cli_main<AbiObj: ContractAbiProvider>() {
diff --git a/framework/meta-lib/src/contract.rs b/framework/meta-lib/src/contract.rs
new file mode 100644
index 0000000000..7df5486e73
--- /dev/null
+++ b/framework/meta-lib/src/contract.rs
@@ -0,0 +1,7 @@
+pub mod generate_proxy;
+pub mod generate_snippets;
+pub mod meta_abi;
+pub mod meta_config;
+pub mod sc_config;
+pub mod wasm_cargo_toml_data;
+pub mod wasm_cargo_toml_generate;
diff --git a/framework/meta/src/cmd/contract/generate_proxy.rs b/framework/meta-lib/src/contract/generate_proxy.rs
similarity index 100%
rename from framework/meta/src/cmd/contract/generate_proxy.rs
rename to framework/meta-lib/src/contract/generate_proxy.rs
diff --git a/framework/meta/src/cmd/contract/generate_proxy/proxy_crate_gen.rs b/framework/meta-lib/src/contract/generate_proxy/proxy_crate_gen.rs
similarity index 100%
rename from framework/meta/src/cmd/contract/generate_proxy/proxy_crate_gen.rs
rename to framework/meta-lib/src/contract/generate_proxy/proxy_crate_gen.rs
diff --git a/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_main.rs b/framework/meta-lib/src/contract/generate_proxy/proxy_gen_main.rs
similarity index 97%
rename from framework/meta/src/cmd/contract/generate_proxy/proxy_gen_main.rs
rename to framework/meta-lib/src/contract/generate_proxy/proxy_gen_main.rs
index 3529e736b4..d6c913a0e4 100644
--- a/framework/meta/src/cmd/contract/generate_proxy/proxy_gen_main.rs
+++ b/framework/meta-lib/src/contract/generate_proxy/proxy_gen_main.rs
@@ -3,7 +3,7 @@ use std::fs;
 
 use multiversx_sc::abi::ContractAbi;
 
-use crate::cmd::contract::sc_config::ProxyConfigSerde;
+use crate::contract::sc_config::ProxyConfigSerde;
 
 use super::{
     super::meta_config::MetaConfig, proxy_crate_gen::create_file, proxy_generator::ProxyGenerator,
diff --git a/framework/meta/src/cmd/contract/generate_proxy/proxy_generator.rs b/framework/meta-lib/src/contract/generate_proxy/proxy_generator.rs
similarity index 99%
rename from framework/meta/src/cmd/contract/generate_proxy/proxy_generator.rs
rename to framework/meta-lib/src/contract/generate_proxy/proxy_generator.rs
index 5567f4b1ee..d2e0b22036 100644
--- a/framework/meta/src/cmd/contract/generate_proxy/proxy_generator.rs
+++ b/framework/meta-lib/src/contract/generate_proxy/proxy_generator.rs
@@ -5,7 +5,7 @@ use multiversx_sc::abi::{
     TypeContents, TypeDescription,
 };
 
-use crate::cmd::contract::{meta_config::MetaConfig, sc_config::ProxyConfigSerde};
+use crate::contract::{meta_config::MetaConfig, sc_config::ProxyConfigSerde};
 
 use super::proxy_process_type_name::{
     extract_paths, extract_struct_crate, process_rust_type, proxy_methods_type_name,
@@ -625,7 +625,7 @@ where
 pub mod tests {
     use multiversx_sc::abi::{BuildInfoAbi, ContractAbi, ContractCrateBuildAbi, FrameworkBuildAbi};
 
-    use crate::cmd::contract::{meta_config::MetaConfig, sc_config::ProxyConfigSerde};
+    use crate::contract::{meta_config::MetaConfig, sc_config::ProxyConfigSerde};
 
     use super::ProxyGenerator;
 
diff --git a/framework/meta/src/cmd/contract/generate_proxy/proxy_process_type_name.rs b/framework/meta-lib/src/contract/generate_proxy/proxy_process_type_name.rs
similarity index 100%
rename from framework/meta/src/cmd/contract/generate_proxy/proxy_process_type_name.rs
rename to framework/meta-lib/src/contract/generate_proxy/proxy_process_type_name.rs
diff --git a/framework/meta/src/cmd/contract/generate_snippets.rs b/framework/meta-lib/src/contract/generate_snippets.rs
similarity index 100%
rename from framework/meta/src/cmd/contract/generate_snippets.rs
rename to framework/meta-lib/src/contract/generate_snippets.rs
diff --git a/framework/meta/src/cmd/contract/generate_snippets/snippet_crate_gen.rs b/framework/meta-lib/src/contract/generate_snippets/snippet_crate_gen.rs
similarity index 100%
rename from framework/meta/src/cmd/contract/generate_snippets/snippet_crate_gen.rs
rename to framework/meta-lib/src/contract/generate_snippets/snippet_crate_gen.rs
diff --git a/framework/meta/src/cmd/contract/generate_snippets/snippet_gen_common.rs b/framework/meta-lib/src/contract/generate_snippets/snippet_gen_common.rs
similarity index 100%
rename from framework/meta/src/cmd/contract/generate_snippets/snippet_gen_common.rs
rename to framework/meta-lib/src/contract/generate_snippets/snippet_gen_common.rs
diff --git a/framework/meta/src/cmd/contract/generate_snippets/snippet_gen_main.rs b/framework/meta-lib/src/contract/generate_snippets/snippet_gen_main.rs
similarity index 97%
rename from framework/meta/src/cmd/contract/generate_snippets/snippet_gen_main.rs
rename to framework/meta-lib/src/contract/generate_snippets/snippet_gen_main.rs
index 7b24ebcd33..919420f485 100644
--- a/framework/meta/src/cmd/contract/generate_snippets/snippet_gen_main.rs
+++ b/framework/meta-lib/src/contract/generate_snippets/snippet_gen_main.rs
@@ -2,7 +2,7 @@ use std::fs::File;
 
 use multiversx_sc::abi::ContractAbi;
 
-use crate::cli_args::GenerateSnippetsArgs;
+use crate::cli::GenerateSnippetsArgs;
 
 use super::{
     super::meta_config::MetaConfig,
diff --git a/framework/meta/src/cmd/contract/generate_snippets/snippet_sc_functions_gen.rs b/framework/meta-lib/src/contract/generate_snippets/snippet_sc_functions_gen.rs
similarity index 100%
rename from framework/meta/src/cmd/contract/generate_snippets/snippet_sc_functions_gen.rs
rename to framework/meta-lib/src/contract/generate_snippets/snippet_sc_functions_gen.rs
diff --git a/framework/meta/src/cmd/contract/generate_snippets/snippet_template_gen.rs b/framework/meta-lib/src/contract/generate_snippets/snippet_template_gen.rs
similarity index 100%
rename from framework/meta/src/cmd/contract/generate_snippets/snippet_template_gen.rs
rename to framework/meta-lib/src/contract/generate_snippets/snippet_template_gen.rs
diff --git a/framework/meta/src/cmd/contract/generate_snippets/snippet_type_map.rs b/framework/meta-lib/src/contract/generate_snippets/snippet_type_map.rs
similarity index 100%
rename from framework/meta/src/cmd/contract/generate_snippets/snippet_type_map.rs
rename to framework/meta-lib/src/contract/generate_snippets/snippet_type_map.rs
diff --git a/framework/meta/src/cmd/contract/meta_abi.rs b/framework/meta-lib/src/contract/meta_abi.rs
similarity index 100%
rename from framework/meta/src/cmd/contract/meta_abi.rs
rename to framework/meta-lib/src/contract/meta_abi.rs
diff --git a/framework/meta/src/cmd/contract/meta_config.rs b/framework/meta-lib/src/contract/meta_config.rs
similarity index 97%
rename from framework/meta/src/cmd/contract/meta_config.rs
rename to framework/meta-lib/src/contract/meta_config.rs
index c273548d5a..e26a4f4e16 100644
--- a/framework/meta/src/cmd/contract/meta_config.rs
+++ b/framework/meta-lib/src/contract/meta_config.rs
@@ -3,8 +3,8 @@ use std::fs;
 use multiversx_sc::abi::ContractAbi;
 
 use crate::{
-    cli_args::BuildArgs, find_workspace::find_current_workspace,
-    print_util::print_workspace_target_dir, tools::check_tools_installed, CargoTomlContents,
+    cargo_toml_contents::CargoTomlContents, cli::BuildArgs, print_util::print_workspace_target_dir,
+    tools::check_tools_installed, tools::find_current_workspace,
 };
 
 use super::{
@@ -179,7 +179,7 @@ fn copy_to_wasm_unmanaged_ei() {
 
 #[cfg(test)]
 mod tests {
-    use crate::cmd::contract::sc_config::ContractVariantProfile;
+    use crate::contract::sc_config::ContractVariantProfile;
 
     const EXPECTED_CARGO_TOML_CONTENTS: &str =
         "# Code generated by the multiversx-sc build system. DO NOT EDIT.
diff --git a/framework/meta/src/cmd/contract/sc_config.rs b/framework/meta-lib/src/contract/sc_config.rs
similarity index 100%
rename from framework/meta/src/cmd/contract/sc_config.rs
rename to framework/meta-lib/src/contract/sc_config.rs
diff --git a/framework/meta/src/cmd/contract/sc_config/contract_variant.rs b/framework/meta-lib/src/contract/sc_config/contract_variant.rs
similarity index 99%
rename from framework/meta/src/cmd/contract/sc_config/contract_variant.rs
rename to framework/meta-lib/src/contract/sc_config/contract_variant.rs
index feab3976cf..4f027e066e 100644
--- a/framework/meta/src/cmd/contract/sc_config/contract_variant.rs
+++ b/framework/meta-lib/src/contract/sc_config/contract_variant.rs
@@ -1,7 +1,7 @@
 use std::path::PathBuf;
 
 use super::{contract_variant_builder::default_wasm_crate_name, ContractVariantSettings};
-use crate::cli_args::BuildArgs;
+use crate::cli::BuildArgs;
 use multiversx_sc::abi::ContractAbi;
 
 /// Represents a contract created by the framework when building.
diff --git a/framework/meta/src/cmd/contract/sc_config/contract_variant_builder.rs b/framework/meta-lib/src/contract/sc_config/contract_variant_builder.rs
similarity index 100%
rename from framework/meta/src/cmd/contract/sc_config/contract_variant_builder.rs
rename to framework/meta-lib/src/contract/sc_config/contract_variant_builder.rs
diff --git a/framework/meta/src/cmd/contract/sc_config/contract_variant_settings.rs b/framework/meta-lib/src/contract/sc_config/contract_variant_settings.rs
similarity index 100%
rename from framework/meta/src/cmd/contract/sc_config/contract_variant_settings.rs
rename to framework/meta-lib/src/contract/sc_config/contract_variant_settings.rs
diff --git a/framework/meta/src/cmd/contract/sc_config/contract_variant_settings/contract_allocator.rs b/framework/meta-lib/src/contract/sc_config/contract_variant_settings/contract_allocator.rs
similarity index 100%
rename from framework/meta/src/cmd/contract/sc_config/contract_variant_settings/contract_allocator.rs
rename to framework/meta-lib/src/contract/sc_config/contract_variant_settings/contract_allocator.rs
diff --git a/framework/meta/src/cmd/contract/sc_config/contract_variant_settings/stack_size.rs b/framework/meta-lib/src/contract/sc_config/contract_variant_settings/stack_size.rs
similarity index 100%
rename from framework/meta/src/cmd/contract/sc_config/contract_variant_settings/stack_size.rs
rename to framework/meta-lib/src/contract/sc_config/contract_variant_settings/stack_size.rs
diff --git a/framework/meta/src/cmd/contract/sc_config/contract_variant_validate.rs b/framework/meta-lib/src/contract/sc_config/contract_variant_validate.rs
similarity index 100%
rename from framework/meta/src/cmd/contract/sc_config/contract_variant_validate.rs
rename to framework/meta-lib/src/contract/sc_config/contract_variant_validate.rs
diff --git a/framework/meta/src/cmd/contract/sc_config/sc_config_model.rs b/framework/meta-lib/src/contract/sc_config/sc_config_model.rs
similarity index 100%
rename from framework/meta/src/cmd/contract/sc_config/sc_config_model.rs
rename to framework/meta-lib/src/contract/sc_config/sc_config_model.rs
diff --git a/framework/meta/src/cmd/contract/sc_config/sc_config_proxy.rs b/framework/meta-lib/src/contract/sc_config/sc_config_proxy.rs
similarity index 100%
rename from framework/meta/src/cmd/contract/sc_config/sc_config_proxy.rs
rename to framework/meta-lib/src/contract/sc_config/sc_config_proxy.rs
diff --git a/framework/meta/src/cmd/contract/sc_config/sc_config_serde.rs b/framework/meta-lib/src/contract/sc_config/sc_config_serde.rs
similarity index 100%
rename from framework/meta/src/cmd/contract/sc_config/sc_config_serde.rs
rename to framework/meta-lib/src/contract/sc_config/sc_config_serde.rs
diff --git a/framework/meta/src/cmd/contract/sc_config/wasm_build.rs b/framework/meta-lib/src/contract/sc_config/wasm_build.rs
similarity index 99%
rename from framework/meta/src/cmd/contract/sc_config/wasm_build.rs
rename to framework/meta-lib/src/contract/sc_config/wasm_build.rs
index bfe0539738..d4b5f9d1de 100644
--- a/framework/meta/src/cmd/contract/sc_config/wasm_build.rs
+++ b/framework/meta-lib/src/contract/sc_config/wasm_build.rs
@@ -3,7 +3,7 @@ use std::{ffi::OsStr, fs, process::Command};
 use super::ContractVariant;
 use crate::{
     abi_json::ContractAbiJson,
-    cli_args::BuildArgs,
+    cli::BuildArgs,
     ei::EIVersion,
     ei_check_json::EiCheckJson,
     mxsc_file_json::{save_mxsc_file_json, MxscFileJson},
diff --git a/framework/meta/src/cmd/contract/sc_config/wasm_clean.rs b/framework/meta-lib/src/contract/sc_config/wasm_clean.rs
similarity index 100%
rename from framework/meta/src/cmd/contract/sc_config/wasm_clean.rs
rename to framework/meta-lib/src/contract/sc_config/wasm_clean.rs
diff --git a/framework/meta/src/cmd/contract/sc_config/wasm_crate_gen.rs b/framework/meta-lib/src/contract/sc_config/wasm_crate_gen.rs
similarity index 100%
rename from framework/meta/src/cmd/contract/sc_config/wasm_crate_gen.rs
rename to framework/meta-lib/src/contract/sc_config/wasm_crate_gen.rs
diff --git a/framework/meta/src/cmd/contract/sc_config/wasm_update.rs b/framework/meta-lib/src/contract/sc_config/wasm_update.rs
similarity index 100%
rename from framework/meta/src/cmd/contract/sc_config/wasm_update.rs
rename to framework/meta-lib/src/contract/sc_config/wasm_update.rs
diff --git a/framework/meta/src/cmd/contract/wasm_cargo_toml_data.rs b/framework/meta-lib/src/contract/wasm_cargo_toml_data.rs
similarity index 100%
rename from framework/meta/src/cmd/contract/wasm_cargo_toml_data.rs
rename to framework/meta-lib/src/contract/wasm_cargo_toml_data.rs
diff --git a/framework/meta/src/cmd/contract/wasm_cargo_toml_generate.rs b/framework/meta-lib/src/contract/wasm_cargo_toml_generate.rs
similarity index 95%
rename from framework/meta/src/cmd/contract/wasm_cargo_toml_generate.rs
rename to framework/meta-lib/src/contract/wasm_cargo_toml_generate.rs
index 06b99cfc92..90b33229be 100644
--- a/framework/meta/src/cmd/contract/wasm_cargo_toml_generate.rs
+++ b/framework/meta-lib/src/contract/wasm_cargo_toml_generate.rs
@@ -1,5 +1,7 @@
 use super::wasm_cargo_toml_data::WasmCargoTomlData;
-use crate::{cargo_toml_contents::change_from_base_to_adapter_path, CargoTomlContents};
+use crate::{
+    cargo_toml_contents::change_from_base_to_adapter_path, cargo_toml_contents::CargoTomlContents,
+};
 
 const WASM_ADAPTER: &str = "multiversx-sc-wasm-adapter";
 const CDYLIB_CRATE_TYPE: &str = "cdylib";
diff --git a/framework/meta/src/ei.rs b/framework/meta-lib/src/ei.rs
similarity index 100%
rename from framework/meta/src/ei.rs
rename to framework/meta-lib/src/ei.rs
diff --git a/framework/meta/src/ei/ei_1_0.rs b/framework/meta-lib/src/ei/ei_1_0.rs
similarity index 100%
rename from framework/meta/src/ei/ei_1_0.rs
rename to framework/meta-lib/src/ei/ei_1_0.rs
diff --git a/framework/meta/src/ei/ei_1_1.rs b/framework/meta-lib/src/ei/ei_1_1.rs
similarity index 100%
rename from framework/meta/src/ei/ei_1_1.rs
rename to framework/meta-lib/src/ei/ei_1_1.rs
diff --git a/framework/meta/src/ei/ei_1_2.rs b/framework/meta-lib/src/ei/ei_1_2.rs
similarity index 100%
rename from framework/meta/src/ei/ei_1_2.rs
rename to framework/meta-lib/src/ei/ei_1_2.rs
diff --git a/framework/meta/src/ei/ei_1_3.rs b/framework/meta-lib/src/ei/ei_1_3.rs
similarity index 100%
rename from framework/meta/src/ei/ei_1_3.rs
rename to framework/meta-lib/src/ei/ei_1_3.rs
diff --git a/framework/meta/src/ei/ei_version.rs b/framework/meta-lib/src/ei/ei_version.rs
similarity index 100%
rename from framework/meta/src/ei/ei_version.rs
rename to framework/meta-lib/src/ei/ei_version.rs
diff --git a/framework/meta/src/ei_check_json.rs b/framework/meta-lib/src/ei_check_json.rs
similarity index 100%
rename from framework/meta/src/ei_check_json.rs
rename to framework/meta-lib/src/ei_check_json.rs
diff --git a/framework/meta/src/esdt_attr_file_json.rs b/framework/meta-lib/src/esdt_attr_file_json.rs
similarity index 100%
rename from framework/meta/src/esdt_attr_file_json.rs
rename to framework/meta-lib/src/esdt_attr_file_json.rs
diff --git a/framework/meta-lib/src/lib.rs b/framework/meta-lib/src/lib.rs
new file mode 100644
index 0000000000..ab24acae54
--- /dev/null
+++ b/framework/meta-lib/src/lib.rs
@@ -0,0 +1,18 @@
+pub mod abi_json;
+pub mod cargo_toml_contents;
+pub mod cli;
+pub mod contract;
+pub mod ei;
+pub mod ei_check_json;
+pub mod esdt_attr_file_json;
+mod mxsc_file_json;
+pub mod print_util;
+mod report_info_json;
+pub mod tools;
+pub mod version;
+pub mod version_history;
+
+#[macro_use]
+extern crate lazy_static;
+
+pub use cli::{cli_main, multi_contract_config};
diff --git a/framework/meta/src/mxsc_file_json.rs b/framework/meta-lib/src/mxsc_file_json.rs
similarity index 100%
rename from framework/meta/src/mxsc_file_json.rs
rename to framework/meta-lib/src/mxsc_file_json.rs
diff --git a/framework/meta/src/print_util.rs b/framework/meta-lib/src/print_util.rs
similarity index 100%
rename from framework/meta/src/print_util.rs
rename to framework/meta-lib/src/print_util.rs
diff --git a/framework/meta/src/report_info_json.rs b/framework/meta-lib/src/report_info_json.rs
similarity index 100%
rename from framework/meta/src/report_info_json.rs
rename to framework/meta-lib/src/report_info_json.rs
diff --git a/framework/meta/src/tools.rs b/framework/meta-lib/src/tools.rs
similarity index 87%
rename from framework/meta/src/tools.rs
rename to framework/meta-lib/src/tools.rs
index 5bf45930ce..5be426c21e 100644
--- a/framework/meta/src/tools.rs
+++ b/framework/meta-lib/src/tools.rs
@@ -1,16 +1,17 @@
-pub mod find_workspace;
+mod find_workspace;
 mod git_describe;
 pub mod twiggy;
 mod wasm_extractor;
 mod wasm_opt;
 mod wasm_to_wat;
 
+pub use find_workspace::{find_current_workspace, find_workspace};
 pub use git_describe::git_describe;
 pub use wasm_extractor::WasmInfo;
 pub use wasm_opt::run_wasm_opt;
 pub use wasm_to_wat::wasm_to_wat;
 
-use crate::cli_args::BuildArgs;
+use crate::cli::BuildArgs;
 
 pub fn check_tools_installed(build_args: &mut BuildArgs) {
     if build_args.wasm_opt && !wasm_opt::is_wasm_opt_installed() {
diff --git a/framework/meta/src/tools/find_workspace.rs b/framework/meta-lib/src/tools/find_workspace.rs
similarity index 100%
rename from framework/meta/src/tools/find_workspace.rs
rename to framework/meta-lib/src/tools/find_workspace.rs
diff --git a/framework/meta/src/tools/git_describe.rs b/framework/meta-lib/src/tools/git_describe.rs
similarity index 100%
rename from framework/meta/src/tools/git_describe.rs
rename to framework/meta-lib/src/tools/git_describe.rs
diff --git a/framework/meta/src/tools/twiggy.rs b/framework/meta-lib/src/tools/twiggy.rs
similarity index 100%
rename from framework/meta/src/tools/twiggy.rs
rename to framework/meta-lib/src/tools/twiggy.rs
diff --git a/framework/meta/src/tools/wasm_extractor.rs b/framework/meta-lib/src/tools/wasm_extractor.rs
similarity index 100%
rename from framework/meta/src/tools/wasm_extractor.rs
rename to framework/meta-lib/src/tools/wasm_extractor.rs
diff --git a/framework/meta/src/tools/wasm_opt.rs b/framework/meta-lib/src/tools/wasm_opt.rs
similarity index 100%
rename from framework/meta/src/tools/wasm_opt.rs
rename to framework/meta-lib/src/tools/wasm_opt.rs
diff --git a/framework/meta/src/tools/wasm_to_wat.rs b/framework/meta-lib/src/tools/wasm_to_wat.rs
similarity index 100%
rename from framework/meta/src/tools/wasm_to_wat.rs
rename to framework/meta-lib/src/tools/wasm_to_wat.rs
diff --git a/framework/meta/src/version.rs b/framework/meta-lib/src/version.rs
similarity index 100%
rename from framework/meta/src/version.rs
rename to framework/meta-lib/src/version.rs
diff --git a/framework/meta/src/version_history.rs b/framework/meta-lib/src/version_history.rs
similarity index 100%
rename from framework/meta/src/version_history.rs
rename to framework/meta-lib/src/version_history.rs
diff --git a/framework/meta/tests/ei_test.rs b/framework/meta-lib/tests/ei_test.rs
similarity index 98%
rename from framework/meta/tests/ei_test.rs
rename to framework/meta-lib/tests/ei_test.rs
index 8ea4442b43..2a1bdb06bb 100644
--- a/framework/meta/tests/ei_test.rs
+++ b/framework/meta-lib/tests/ei_test.rs
@@ -1,4 +1,4 @@
-use multiversx_sc_meta::ei;
+use multiversx_sc_meta_lib::ei;
 
 use std::collections::HashSet;
 
diff --git a/framework/meta/tests/multi_contract_test.rs b/framework/meta-lib/tests/multi_contract_test.rs
similarity index 97%
rename from framework/meta/tests/multi_contract_test.rs
rename to framework/meta-lib/tests/multi_contract_test.rs
index a9896eb72c..4f2f20bdee 100644
--- a/framework/meta/tests/multi_contract_test.rs
+++ b/framework/meta-lib/tests/multi_contract_test.rs
@@ -1,5 +1,5 @@
 use multiversx_sc::abi::{ContractAbi, EndpointAbi};
-use multiversx_sc_meta::cmd::contract::sc_config::{ScConfig, ScConfigSerde};
+use multiversx_sc_meta_lib::contract::sc_config::{ScConfig, ScConfigSerde};
 
 fn get_serialized_toml() -> ScConfigSerde {
     toml::from_str(
diff --git a/framework/meta/Cargo.toml b/framework/meta/Cargo.toml
index 65ce0c9295..5e9e7ba740 100644
--- a/framework/meta/Cargo.toml
+++ b/framework/meta/Cargo.toml
@@ -12,24 +12,18 @@ readme = "README.md"
 repository = "https://github.com/multiversx/mx-sdk-rs"
 homepage = "https://multiversx.com/"
 documentation = "https://docs.multiversx.com/"
-description = "MultiversX smart contract meta-programming tools and build system"
+description = "MultiversX smart contract crate management standalone tool"
 keywords = ["multiversx", "blockchain", "contract", "debug"]
 categories = ["cryptography::cryptocurrencies", "development-tools::debugging"]
 
 [[bin]]
 name = "sc-meta"
 path = "src/main.rs"
-required-features = ["standalone"]
 
 [features]
-standalone = ["ruplacer", "reqwest", "zip", "copy_dir", "pathdiff", "common-path"]
 template-test-current = []
 template-test-released = []
 
-# no other way to have a default feature in bin at the moment
-# contract meta crates should add `default-features = false`
-default = ["standalone"]
-
 [dependencies]
 clap = { version = "4.4.7", features = ["derive"] }
 serde = { version = "1.0", features = ["derive"] }
@@ -44,17 +38,20 @@ wasmparser = "0.208"
 wasmprinter = "0.208"
 semver = "1.0.20"
 
-ruplacer = { version = "0.8.1", default-features = false, optional = true }
-reqwest = { version = "0.12", features = ["blocking", "json"], optional = true }
-zip = { version = "2.1", features = ["deflate"], default-features = false, optional = true }
-copy_dir = { version = "0.1.2", optional = true }
-pathdiff = { version = "0.2.1", optional = true }
-common-path = { version = "1.0.0", optional = true }
+ruplacer = { version = "0.8.1", default-features = false }
+reqwest = { version = "0.12", features = ["blocking", "json"] }
+zip = { version = "2.1", features = ["deflate"], default-features = false }
+copy_dir = { version = "0.1.2" }
+pathdiff = { version = "0.2.1" }
+common-path = { version = "1.0.0" }
 
 [dependencies.multiversx-sc]
 version = "=0.50.3"
 path = "../base"
 features = ["alloc", "num-bigint"]
 
-[dev-dependencies]
-multiversx-sc-meta = { path = ".", features = ["standalone"] }
+
+[dependencies.multiversx-sc-meta-lib]
+version = "=0.50.3"
+path = "../meta-lib"
+
diff --git a/framework/meta/src/cli.rs b/framework/meta/src/cli.rs
new file mode 100644
index 0000000000..a29d017b81
--- /dev/null
+++ b/framework/meta/src/cli.rs
@@ -0,0 +1,5 @@
+mod cli_args_standalone;
+mod cli_standalone_main;
+
+pub use cli_args_standalone::*;
+pub use cli_standalone_main::*;
diff --git a/framework/meta/src/cli_args/cli_args_standalone.rs b/framework/meta/src/cli/cli_args_standalone.rs
similarity index 99%
rename from framework/meta/src/cli_args/cli_args_standalone.rs
rename to framework/meta/src/cli/cli_args_standalone.rs
index 00cf305e8d..de6d46fac4 100644
--- a/framework/meta/src/cli_args/cli_args_standalone.rs
+++ b/framework/meta/src/cli/cli_args_standalone.rs
@@ -1,8 +1,7 @@
-use std::path::PathBuf;
-
 use clap::{ArgAction, Args, Parser, Subcommand, ValueEnum};
+use std::path::PathBuf;
 
-use super::{CliArgsToRaw, ContractCliAction};
+use multiversx_sc_meta_lib::cli::{CliArgsToRaw, ContractCliAction};
 
 /// Parsed arguments of the meta crate CLI.
 #[derive(Default, PartialEq, Eq, Debug, Parser)]
diff --git a/framework/meta/src/cmd/standalone.rs b/framework/meta/src/cli/cli_standalone_main.rs
similarity index 68%
rename from framework/meta/src/cmd/standalone.rs
rename to framework/meta/src/cli/cli_standalone_main.rs
index 62dd910836..f9d8b3d6b8 100644
--- a/framework/meta/src/cmd/standalone.rs
+++ b/framework/meta/src/cli/cli_standalone_main.rs
@@ -1,27 +1,15 @@
-mod all;
-mod info;
-pub mod install;
-mod local_deps;
-mod print_util;
-pub mod scen_test_gen;
-pub mod template;
-pub mod test;
-mod test_coverage;
-pub(crate) mod upgrade;
-
-use crate::{
-    cli_args::{StandaloneCliAction, StandaloneCliArgs},
-    cmd::standalone::test_coverage::test_coverage,
-};
-use all::call_all_meta;
+use crate::cli::{StandaloneCliAction, StandaloneCliArgs};
 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};
-use test::test;
-use upgrade::upgrade_sc;
+
+use crate::cmd::all::call_all_meta;
+use crate::cmd::info::call_info;
+use crate::cmd::install::install;
+use crate::cmd::local_deps::local_deps;
+use crate::cmd::scen_test_gen::test_gen_tool;
+use crate::cmd::template::{create_contract, print_template_names};
+use crate::cmd::test::test;
+use crate::cmd::test_coverage::test_coverage;
+use crate::cmd::upgrade::upgrade_sc;
 
 /// Entry point in the program when calling it as a standalone tool.
 pub fn cli_main_standalone() {
diff --git a/framework/meta/src/cmd.rs b/framework/meta/src/cmd.rs
index 7ec72dd6f2..698f10c924 100644
--- a/framework/meta/src/cmd.rs
+++ b/framework/meta/src/cmd.rs
@@ -1,4 +1,10 @@
-pub mod contract;
-
-#[cfg(feature = "standalone")]
-pub mod standalone;
+pub mod all;
+pub mod info;
+pub mod install;
+pub mod local_deps;
+pub mod print_util;
+pub mod scen_test_gen;
+pub mod template;
+pub mod test;
+pub mod test_coverage;
+pub mod upgrade;
diff --git a/framework/meta/src/cmd/standalone/all.rs b/framework/meta/src/cmd/all.rs
similarity index 98%
rename from framework/meta/src/cmd/standalone/all.rs
rename to framework/meta/src/cmd/all.rs
index 91af64ea56..8483981a04 100644
--- a/framework/meta/src/cmd/standalone/all.rs
+++ b/framework/meta/src/cmd/all.rs
@@ -1,6 +1,6 @@
 use super::print_util::{print_all_command, print_all_count, print_all_index};
 use crate::{
-    cli_args::AllArgs,
+    cli::AllArgs,
     folder_structure::{dir_pretty_print, RelevantDirectories},
 };
 use std::{path::Path, process::Command};
diff --git a/framework/meta/src/cmd/standalone/info.rs b/framework/meta/src/cmd/info.rs
similarity index 95%
rename from framework/meta/src/cmd/standalone/info.rs
rename to framework/meta/src/cmd/info.rs
index 07df89b2d0..2d36399474 100644
--- a/framework/meta/src/cmd/standalone/info.rs
+++ b/framework/meta/src/cmd/info.rs
@@ -1,6 +1,6 @@
 use super::upgrade::print_tree_dir_metadata;
 use crate::{
-    cli_args::InfoArgs,
+    cli::InfoArgs,
     folder_structure::{dir_pretty_print, RelevantDirectories},
     version_history::LAST_UPGRADE_VERSION,
 };
diff --git a/framework/meta/src/cmd/standalone/install.rs b/framework/meta/src/cmd/install.rs
similarity index 98%
rename from framework/meta/src/cmd/standalone/install.rs
rename to framework/meta/src/cmd/install.rs
index 2a3fc387c0..256f7640e7 100644
--- a/framework/meta/src/cmd/standalone/install.rs
+++ b/framework/meta/src/cmd/install.rs
@@ -2,7 +2,7 @@ mod install_scenario_go;
 mod install_wasm_tools;
 mod system_info;
 
-use crate::cli_args::{
+use crate::cli::{
     InstallArgs, InstallCommand, InstallMxScenarioGoArgs, InstallWasm32Args, InstallWasmOptArgs,
 };
 
diff --git a/framework/meta/src/cmd/standalone/install/install_scenario_go.rs b/framework/meta/src/cmd/install/install_scenario_go.rs
similarity index 98%
rename from framework/meta/src/cmd/standalone/install/install_scenario_go.rs
rename to framework/meta/src/cmd/install/install_scenario_go.rs
index 9e874fb674..2351ab2621 100644
--- a/framework/meta/src/cmd/standalone/install/install_scenario_go.rs
+++ b/framework/meta/src/cmd/install/install_scenario_go.rs
@@ -5,7 +5,7 @@ use std::{
     path::{Path, PathBuf},
 };
 
-use crate::print_util::println_green;
+use multiversx_sc_meta_lib::print_util::println_green;
 
 use super::system_info::{get_system_info, SystemInfo};
 
diff --git a/framework/meta/src/cmd/standalone/install/install_wasm_tools.rs b/framework/meta/src/cmd/install/install_wasm_tools.rs
similarity index 100%
rename from framework/meta/src/cmd/standalone/install/install_wasm_tools.rs
rename to framework/meta/src/cmd/install/install_wasm_tools.rs
diff --git a/framework/meta/src/cmd/standalone/install/system_info.rs b/framework/meta/src/cmd/install/system_info.rs
similarity index 100%
rename from framework/meta/src/cmd/standalone/install/system_info.rs
rename to framework/meta/src/cmd/install/system_info.rs
diff --git a/framework/meta/src/cmd/standalone/local_deps.rs b/framework/meta/src/cmd/local_deps.rs
similarity index 97%
rename from framework/meta/src/cmd/standalone/local_deps.rs
rename to framework/meta/src/cmd/local_deps.rs
index 72f8bacdc8..7aed31a6d3 100644
--- a/framework/meta/src/cmd/standalone/local_deps.rs
+++ b/framework/meta/src/cmd/local_deps.rs
@@ -1,11 +1,11 @@
 use crate::{
-    cli_args::LocalDepsArgs,
+    cli::LocalDepsArgs,
     folder_structure::{
         dir_pretty_print, RelevantDirectories, CARGO_TOML_FILE_NAME, FRAMEWORK_CRATE_NAMES,
     },
-    CargoTomlContents,
 };
 use common_path::common_path_all;
+use multiversx_sc_meta_lib::cargo_toml_contents::CargoTomlContents;
 use serde::{Deserialize, Serialize};
 use std::{
     collections::{BTreeMap, LinkedList},
diff --git a/framework/meta/src/cmd/standalone/print_util.rs b/framework/meta/src/cmd/print_util.rs
similarity index 100%
rename from framework/meta/src/cmd/standalone/print_util.rs
rename to framework/meta/src/cmd/print_util.rs
diff --git a/framework/meta/src/cmd/standalone/scen_test_gen.rs b/framework/meta/src/cmd/scen_test_gen.rs
similarity index 93%
rename from framework/meta/src/cmd/standalone/scen_test_gen.rs
rename to framework/meta/src/cmd/scen_test_gen.rs
index a8e8aa7af8..5a7b6ef55a 100644
--- a/framework/meta/src/cmd/standalone/scen_test_gen.rs
+++ b/framework/meta/src/cmd/scen_test_gen.rs
@@ -5,7 +5,7 @@ mod stg_process_code;
 mod stg_section;
 mod stg_write;
 
-use crate::cli_args::TestGenArgs;
+use crate::cli::TestGenArgs;
 
 pub fn test_gen_tool(args: &TestGenArgs) {
     let path = if let Some(some_path) = &args.path {
diff --git a/framework/meta/src/cmd/standalone/scen_test_gen/stg_main.rs b/framework/meta/src/cmd/scen_test_gen/stg_main.rs
similarity index 100%
rename from framework/meta/src/cmd/standalone/scen_test_gen/stg_main.rs
rename to framework/meta/src/cmd/scen_test_gen/stg_main.rs
diff --git a/framework/meta/src/cmd/standalone/scen_test_gen/stg_parse.rs b/framework/meta/src/cmd/scen_test_gen/stg_parse.rs
similarity index 100%
rename from framework/meta/src/cmd/standalone/scen_test_gen/stg_parse.rs
rename to framework/meta/src/cmd/scen_test_gen/stg_parse.rs
diff --git a/framework/meta/src/cmd/standalone/scen_test_gen/stg_print.rs b/framework/meta/src/cmd/scen_test_gen/stg_print.rs
similarity index 100%
rename from framework/meta/src/cmd/standalone/scen_test_gen/stg_print.rs
rename to framework/meta/src/cmd/scen_test_gen/stg_print.rs
diff --git a/framework/meta/src/cmd/standalone/scen_test_gen/stg_process_code.rs b/framework/meta/src/cmd/scen_test_gen/stg_process_code.rs
similarity index 100%
rename from framework/meta/src/cmd/standalone/scen_test_gen/stg_process_code.rs
rename to framework/meta/src/cmd/scen_test_gen/stg_process_code.rs
diff --git a/framework/meta/src/cmd/standalone/scen_test_gen/stg_section.rs b/framework/meta/src/cmd/scen_test_gen/stg_section.rs
similarity index 100%
rename from framework/meta/src/cmd/standalone/scen_test_gen/stg_section.rs
rename to framework/meta/src/cmd/scen_test_gen/stg_section.rs
diff --git a/framework/meta/src/cmd/standalone/scen_test_gen/stg_write.rs b/framework/meta/src/cmd/scen_test_gen/stg_write.rs
similarity index 100%
rename from framework/meta/src/cmd/standalone/scen_test_gen/stg_write.rs
rename to framework/meta/src/cmd/scen_test_gen/stg_write.rs
diff --git a/framework/meta/src/cmd/standalone/template.rs b/framework/meta/src/cmd/template.rs
similarity index 100%
rename from framework/meta/src/cmd/standalone/template.rs
rename to framework/meta/src/cmd/template.rs
diff --git a/framework/meta/src/cmd/standalone/template/contract_creator.rs b/framework/meta/src/cmd/template/contract_creator.rs
similarity index 99%
rename from framework/meta/src/cmd/standalone/template/contract_creator.rs
rename to framework/meta/src/cmd/template/contract_creator.rs
index ae55c79b39..65e45f4d47 100644
--- a/framework/meta/src/cmd/standalone/template/contract_creator.rs
+++ b/framework/meta/src/cmd/template/contract_creator.rs
@@ -1,7 +1,7 @@
 use convert_case::{Case, Casing};
 
 use crate::{
-    cli_args::TemplateArgs,
+    cli::TemplateArgs,
     version::FrameworkVersion,
     version_history::{validate_template_tag, LAST_TEMPLATE_VERSION},
 };
diff --git a/framework/meta/src/cmd/standalone/template/contract_creator_target.rs b/framework/meta/src/cmd/template/contract_creator_target.rs
similarity index 100%
rename from framework/meta/src/cmd/standalone/template/contract_creator_target.rs
rename to framework/meta/src/cmd/template/contract_creator_target.rs
diff --git a/framework/meta/src/cmd/standalone/template/copy_util.rs b/framework/meta/src/cmd/template/copy_util.rs
similarity index 100%
rename from framework/meta/src/cmd/standalone/template/copy_util.rs
rename to framework/meta/src/cmd/template/copy_util.rs
diff --git a/framework/meta/src/cmd/standalone/template/repo_source.rs b/framework/meta/src/cmd/template/repo_source.rs
similarity index 100%
rename from framework/meta/src/cmd/standalone/template/repo_source.rs
rename to framework/meta/src/cmd/template/repo_source.rs
diff --git a/framework/meta/src/cmd/standalone/template/repo_temp_download.rs b/framework/meta/src/cmd/template/repo_temp_download.rs
similarity index 100%
rename from framework/meta/src/cmd/standalone/template/repo_temp_download.rs
rename to framework/meta/src/cmd/template/repo_temp_download.rs
diff --git a/framework/meta/src/cmd/standalone/template/repo_version.rs b/framework/meta/src/cmd/template/repo_version.rs
similarity index 100%
rename from framework/meta/src/cmd/standalone/template/repo_version.rs
rename to framework/meta/src/cmd/template/repo_version.rs
diff --git a/framework/meta/src/cmd/standalone/template/template_adjuster.rs b/framework/meta/src/cmd/template/template_adjuster.rs
similarity index 98%
rename from framework/meta/src/cmd/standalone/template/template_adjuster.rs
rename to framework/meta/src/cmd/template/template_adjuster.rs
index c841c5d1f7..e1ac5ad827 100644
--- a/framework/meta/src/cmd/standalone/template/template_adjuster.rs
+++ b/framework/meta/src/cmd/template/template_adjuster.rs
@@ -1,11 +1,11 @@
 use super::{template_metadata::TemplateMetadata, ContractCreatorTarget};
 use crate::{
-    cmd::standalone::upgrade::upgrade_common::{rename_files, replace_in_files},
+    cmd::upgrade::upgrade_common::{rename_files, replace_in_files},
     version::FrameworkVersion,
     version_history::is_template_with_autogenerated_wasm,
-    CargoTomlContents,
 };
 use convert_case::{Case, Casing};
+use multiversx_sc_meta_lib::cargo_toml_contents::CargoTomlContents;
 use ruplacer::Query;
 use toml::value::Table;
 
diff --git a/framework/meta/src/cmd/standalone/template/template_list.rs b/framework/meta/src/cmd/template/template_list.rs
similarity index 94%
rename from framework/meta/src/cmd/standalone/template/template_list.rs
rename to framework/meta/src/cmd/template/template_list.rs
index dfe74d1efe..1d297179b7 100644
--- a/framework/meta/src/cmd/standalone/template/template_list.rs
+++ b/framework/meta/src/cmd/template/template_list.rs
@@ -1,4 +1,4 @@
-use crate::cli_args::TemplateListArgs;
+use crate::cli::TemplateListArgs;
 
 use super::{contract_creator::get_repo_version, template_source::template_sources, RepoSource};
 
diff --git a/framework/meta/src/cmd/standalone/template/template_metadata.rs b/framework/meta/src/cmd/template/template_metadata.rs
similarity index 100%
rename from framework/meta/src/cmd/standalone/template/template_metadata.rs
rename to framework/meta/src/cmd/template/template_metadata.rs
diff --git a/framework/meta/src/cmd/standalone/template/template_source.rs b/framework/meta/src/cmd/template/template_source.rs
similarity index 100%
rename from framework/meta/src/cmd/standalone/template/template_source.rs
rename to framework/meta/src/cmd/template/template_source.rs
diff --git a/framework/meta/src/cmd/standalone/test.rs b/framework/meta/src/cmd/test.rs
similarity index 97%
rename from framework/meta/src/cmd/standalone/test.rs
rename to framework/meta/src/cmd/test.rs
index 66964b3d60..828d9c9859 100644
--- a/framework/meta/src/cmd/standalone/test.rs
+++ b/framework/meta/src/cmd/test.rs
@@ -2,7 +2,7 @@ use std::process::Command;
 
 use colored::Colorize;
 
-use crate::cli_args::TestArgs;
+use crate::cli::TestArgs;
 
 pub fn test(test_args: &TestArgs) {
     let path = test_args.path.as_deref().unwrap_or("./");
diff --git a/framework/meta/src/cmd/standalone/test_coverage.rs b/framework/meta/src/cmd/test_coverage.rs
similarity index 76%
rename from framework/meta/src/cmd/standalone/test_coverage.rs
rename to framework/meta/src/cmd/test_coverage.rs
index 029f7b551a..363fcc9372 100644
--- a/framework/meta/src/cmd/standalone/test_coverage.rs
+++ b/framework/meta/src/cmd/test_coverage.rs
@@ -6,8 +6,8 @@ mod run;
 mod util;
 
 use crate::{
-    cli_args::{TestCoverageArgs, TestCoverageOutputFormat},
-    cmd::standalone::test_coverage::{cargo::get_workspace_root, run::run_test_coverage},
+    cli::{TestCoverageArgs, TestCoverageOutputFormat},
+    cmd::test_coverage::{cargo::get_workspace_root, run::run_test_coverage},
 };
 use std::process;
 
diff --git a/framework/meta/src/cmd/standalone/test_coverage/cargo.rs b/framework/meta/src/cmd/test_coverage/cargo.rs
similarity index 97%
rename from framework/meta/src/cmd/standalone/test_coverage/cargo.rs
rename to framework/meta/src/cmd/test_coverage/cargo.rs
index 2a4f3b45c0..10023290c9 100644
--- a/framework/meta/src/cmd/standalone/test_coverage/cargo.rs
+++ b/framework/meta/src/cmd/test_coverage/cargo.rs
@@ -1,4 +1,4 @@
-use crate::cmd::standalone::test_coverage::error::TestCoverageError;
+use crate::cmd::test_coverage::error::TestCoverageError;
 use serde::Deserialize;
 use std::process::Command;
 
diff --git a/framework/meta/src/cmd/standalone/test_coverage/error.rs b/framework/meta/src/cmd/test_coverage/error.rs
similarity index 100%
rename from framework/meta/src/cmd/standalone/test_coverage/error.rs
rename to framework/meta/src/cmd/test_coverage/error.rs
diff --git a/framework/meta/src/cmd/standalone/test_coverage/llvm_cov.rs b/framework/meta/src/cmd/test_coverage/llvm_cov.rs
similarity index 100%
rename from framework/meta/src/cmd/standalone/test_coverage/llvm_cov.rs
rename to framework/meta/src/cmd/test_coverage/llvm_cov.rs
diff --git a/framework/meta/src/cmd/standalone/test_coverage/render.rs b/framework/meta/src/cmd/test_coverage/render.rs
similarity index 100%
rename from framework/meta/src/cmd/standalone/test_coverage/render.rs
rename to framework/meta/src/cmd/test_coverage/render.rs
diff --git a/framework/meta/src/cmd/standalone/test_coverage/run.rs b/framework/meta/src/cmd/test_coverage/run.rs
similarity index 95%
rename from framework/meta/src/cmd/standalone/test_coverage/run.rs
rename to framework/meta/src/cmd/test_coverage/run.rs
index bdb810700b..edb165824b 100644
--- a/framework/meta/src/cmd/standalone/test_coverage/run.rs
+++ b/framework/meta/src/cmd/test_coverage/run.rs
@@ -1,8 +1,8 @@
 use std::fs;
 
 use crate::{
-    cli_args::TestCoverageOutputFormat,
-    cmd::standalone::test_coverage::{
+    cli::TestCoverageOutputFormat,
+    cmd::test_coverage::{
         cargo::{get_instrumented_test_binaries_paths, run_instrumented_tests},
         error::TestCoverageError,
         llvm_cov::{combine_instrumentation_results, export_coverage_summary},
diff --git a/framework/meta/src/cmd/standalone/test_coverage/util.rs b/framework/meta/src/cmd/test_coverage/util.rs
similarity index 96%
rename from framework/meta/src/cmd/standalone/test_coverage/util.rs
rename to framework/meta/src/cmd/test_coverage/util.rs
index 94cbe42352..39c47fc2fb 100644
--- a/framework/meta/src/cmd/standalone/test_coverage/util.rs
+++ b/framework/meta/src/cmd/test_coverage/util.rs
@@ -1,4 +1,4 @@
-use crate::cmd::standalone::test_coverage::error::TestCoverageError;
+use crate::cmd::test_coverage::error::TestCoverageError;
 use std::{fs, process::Command};
 
 const DEPENDENCIES: [&str; 2] = ["llvm-cov", "llvm-profdata"];
diff --git a/framework/meta/src/cmd/standalone/upgrade.rs b/framework/meta/src/cmd/upgrade.rs
similarity index 100%
rename from framework/meta/src/cmd/standalone/upgrade.rs
rename to framework/meta/src/cmd/upgrade.rs
diff --git a/framework/meta/src/cmd/standalone/upgrade/upgrade_0_31.rs b/framework/meta/src/cmd/upgrade/upgrade_0_31.rs
similarity index 100%
rename from framework/meta/src/cmd/standalone/upgrade/upgrade_0_31.rs
rename to framework/meta/src/cmd/upgrade/upgrade_0_31.rs
diff --git a/framework/meta/src/cmd/standalone/upgrade/upgrade_0_32.rs b/framework/meta/src/cmd/upgrade/upgrade_0_32.rs
similarity index 100%
rename from framework/meta/src/cmd/standalone/upgrade/upgrade_0_32.rs
rename to framework/meta/src/cmd/upgrade/upgrade_0_32.rs
diff --git a/framework/meta/src/cmd/standalone/upgrade/upgrade_0_39.rs b/framework/meta/src/cmd/upgrade/upgrade_0_39.rs
similarity index 96%
rename from framework/meta/src/cmd/standalone/upgrade/upgrade_0_39.rs
rename to framework/meta/src/cmd/upgrade/upgrade_0_39.rs
index 0ccd8dbf81..2f04a01610 100644
--- a/framework/meta/src/cmd/standalone/upgrade/upgrade_0_39.rs
+++ b/framework/meta/src/cmd/upgrade/upgrade_0_39.rs
@@ -6,10 +6,8 @@ use super::{
     },
     upgrade_print::*,
 };
-use crate::{
-    folder_structure::{DirectoryType, RelevantDirectory},
-    CargoTomlContents,
-};
+use crate::folder_structure::{DirectoryType, RelevantDirectory};
+use multiversx_sc_meta_lib::cargo_toml_contents::CargoTomlContents;
 use ruplacer::Query;
 use toml::{value::Table, Value};
 
diff --git a/framework/meta/src/cmd/standalone/upgrade/upgrade_0_45.rs b/framework/meta/src/cmd/upgrade/upgrade_0_45.rs
similarity index 90%
rename from framework/meta/src/cmd/standalone/upgrade/upgrade_0_45.rs
rename to framework/meta/src/cmd/upgrade/upgrade_0_45.rs
index 21aa59ca1c..7082f92f97 100644
--- a/framework/meta/src/cmd/standalone/upgrade/upgrade_0_45.rs
+++ b/framework/meta/src/cmd/upgrade/upgrade_0_45.rs
@@ -1,10 +1,8 @@
 use std::path::Path;
 
 use super::upgrade_common::version_bump_in_cargo_toml;
-use crate::{
-    folder_structure::{DirectoryType, RelevantDirectory},
-    CargoTomlContents,
-};
+use crate::folder_structure::{DirectoryType, RelevantDirectory};
+use multiversx_sc_meta_lib::cargo_toml_contents::CargoTomlContents;
 use toml::Value;
 
 /// Migrate `0.44.0` to `0.45.0`, including the version bump.
diff --git a/framework/meta/src/cmd/standalone/upgrade/upgrade_common.rs b/framework/meta/src/cmd/upgrade/upgrade_common.rs
similarity index 97%
rename from framework/meta/src/cmd/standalone/upgrade/upgrade_common.rs
rename to framework/meta/src/cmd/upgrade/upgrade_common.rs
index b4ed18d07c..5d97cbafe6 100644
--- a/framework/meta/src/cmd/standalone/upgrade/upgrade_common.rs
+++ b/framework/meta/src/cmd/upgrade/upgrade_common.rs
@@ -1,3 +1,14 @@
+use super::{upgrade_print::*, upgrade_settings::UpgradeSettings};
+use crate::{
+    cmd::all::call_contract_meta,
+    folder_structure::{
+        DirectoryType, RelevantDirectory, VersionReq, CARGO_TOML_FILE_NAME, FRAMEWORK_CRATE_NAMES,
+    },
+    version::FrameworkVersion,
+};
+use multiversx_sc_meta_lib::cargo_toml_contents::{
+    CargoTomlContents, CARGO_TOML_DEPENDENCIES, CARGO_TOML_DEV_DEPENDENCIES,
+};
 use ruplacer::{Console, DirectoryPatcher, Query, Settings};
 use std::{
     fs,
@@ -6,18 +17,6 @@ use std::{
 };
 use toml::Value;
 
-use crate::{
-    cargo_toml_contents::{CARGO_TOML_DEPENDENCIES, CARGO_TOML_DEV_DEPENDENCIES},
-    cmd::standalone::all::call_contract_meta,
-    folder_structure::{
-        DirectoryType, RelevantDirectory, VersionReq, CARGO_TOML_FILE_NAME, FRAMEWORK_CRATE_NAMES,
-    },
-    version::FrameworkVersion,
-    CargoTomlContents,
-};
-
-use super::{upgrade_print::*, upgrade_settings::UpgradeSettings};
-
 /// Uses ruplacer.
 pub(crate) fn replace_in_files(sc_crate_path: &Path, file_type: &str, queries: &[Query]) {
     if !sc_crate_path.exists() {
diff --git a/framework/meta/src/cmd/standalone/upgrade/upgrade_print.rs b/framework/meta/src/cmd/upgrade/upgrade_print.rs
similarity index 100%
rename from framework/meta/src/cmd/standalone/upgrade/upgrade_print.rs
rename to framework/meta/src/cmd/upgrade/upgrade_print.rs
diff --git a/framework/meta/src/cmd/standalone/upgrade/upgrade_selector.rs b/framework/meta/src/cmd/upgrade/upgrade_selector.rs
similarity index 96%
rename from framework/meta/src/cmd/standalone/upgrade/upgrade_selector.rs
rename to framework/meta/src/cmd/upgrade/upgrade_selector.rs
index e2d0ef4d86..aeb2924a76 100644
--- a/framework/meta/src/cmd/standalone/upgrade/upgrade_selector.rs
+++ b/framework/meta/src/cmd/upgrade/upgrade_selector.rs
@@ -1,11 +1,11 @@
 use crate::{
-    cli_args::UpgradeArgs,
-    cmd::standalone::upgrade::upgrade_settings::UpgradeSettings,
+    cli::UpgradeArgs,
+    cmd::upgrade::upgrade_settings::UpgradeSettings,
     folder_structure::{dir_pretty_print, RelevantDirectories, RelevantDirectory},
-    framework_version,
     version::FrameworkVersion,
     version_history::{versions_iter, CHECK_AFTER_UPGRADE_TO, LAST_UPGRADE_VERSION, VERSIONS},
 };
+use multiversx_sc_meta_lib::framework_version;
 
 use super::{
     upgrade_0_31::upgrade_to_31_0,
diff --git a/framework/meta/src/cmd/standalone/upgrade/upgrade_settings.rs b/framework/meta/src/cmd/upgrade/upgrade_settings.rs
similarity index 100%
rename from framework/meta/src/cmd/standalone/upgrade/upgrade_settings.rs
rename to framework/meta/src/cmd/upgrade/upgrade_settings.rs
diff --git a/framework/meta/src/folder_structure/relevant_directory.rs b/framework/meta/src/folder_structure/relevant_directory.rs
index f49b1d07ca..95a7a3610b 100644
--- a/framework/meta/src/folder_structure/relevant_directory.rs
+++ b/framework/meta/src/folder_structure/relevant_directory.rs
@@ -1,4 +1,5 @@
-use crate::{version::FrameworkVersion, CargoTomlContents};
+use crate::version::FrameworkVersion;
+use multiversx_sc_meta_lib::cargo_toml_contents::CargoTomlContents;
 use std::{
     fs::{self, DirEntry},
     path::{Path, PathBuf},
diff --git a/framework/meta/src/lib.rs b/framework/meta/src/lib.rs
index 718ad4eea9..5daae7e4e0 100644
--- a/framework/meta/src/lib.rs
+++ b/framework/meta/src/lib.rs
@@ -1,21 +1,21 @@
-pub mod abi_json;
-mod cargo_toml_contents;
-pub mod cli_args;
+pub mod cli;
 pub mod cmd;
-pub mod ei;
-mod ei_check_json;
-pub mod esdt_attr_file_json;
 pub mod folder_structure;
-mod mxsc_file_json;
-mod print_util;
-mod report_info_json;
-mod tools;
-pub use tools::find_workspace;
-pub mod version;
-pub mod version_history;
 
-#[macro_use]
-extern crate lazy_static;
+pub use multiversx_sc_meta_lib::abi_json;
+pub use multiversx_sc_meta_lib::ei;
+pub use multiversx_sc_meta_lib::ei_check_json;
+pub use multiversx_sc_meta_lib::version;
+pub use multiversx_sc_meta_lib::version_history;
 
-pub use cargo_toml_contents::CargoTomlContents;
-pub use cmd::contract::{cli_main, multi_contract_config};
+/// Backwards compatibility, please use `multiversx_sc_meta_lib::cli_main::<AbiObj>()`.
+pub fn cli_main<AbiObj: multiversx_sc::contract_base::ContractAbiProvider>() {
+    multiversx_sc_meta_lib::cli_main::<AbiObj>()
+}
+
+/// Backwards compatibility, please use `multiversx_sc_meta_lib::multi_contract_config::<AbiObj>(contract_crate_path)`.
+pub fn multi_contract_config<AbiObj: multiversx_sc::contract_base::ContractAbiProvider>(
+    contract_crate_path: &std::path::Path,
+) -> multiversx_sc_meta_lib::contract::sc_config::ScConfig {
+    multiversx_sc_meta_lib::multi_contract_config::<AbiObj>(contract_crate_path)
+}
diff --git a/framework/meta/src/main.rs b/framework/meta/src/main.rs
index 72b1eaef2c..b3ecec7201 100644
--- a/framework/meta/src/main.rs
+++ b/framework/meta/src/main.rs
@@ -1,3 +1,3 @@
 fn main() {
-    multiversx_sc_meta::cmd::standalone::cli_main_standalone();
+    multiversx_sc_meta::cli::cli_main_standalone();
 }
diff --git a/framework/meta/tests/stg_process_code_test.rs b/framework/meta/tests/stg_process_code_test.rs
index 827151aa99..e544935dbb 100644
--- a/framework/meta/tests/stg_process_code_test.rs
+++ b/framework/meta/tests/stg_process_code_test.rs
@@ -1,6 +1,4 @@
-use multiversx_sc_meta::cmd::standalone::scen_test_gen::{
-    format_test_fn_go, process_code, DEFAULT_SETUP_GO,
-};
+use multiversx_sc_meta::cmd::scen_test_gen::{format_test_fn_go, process_code, DEFAULT_SETUP_GO};
 
 const GO_TEST_1: &str = r#"use multiversx_sc_scenario::*;
 
diff --git a/framework/meta/tests/template_test.rs b/framework/meta/tests/template_test.rs
index 335fcb240b..4b0fc0bc23 100644
--- a/framework/meta/tests/template_test.rs
+++ b/framework/meta/tests/template_test.rs
@@ -2,12 +2,12 @@ use std::{fs, process::Command};
 
 use convert_case::{Case, Casing};
 use multiversx_sc_meta::{
-    cmd::standalone::template::{
+    cmd::template::{
         template_names_from_repo, ContractCreator, ContractCreatorTarget, RepoSource, RepoVersion,
     },
-    find_workspace::find_current_workspace,
     version_history::{self, LAST_TEMPLATE_VERSION},
 };
+use multiversx_sc_meta_lib::tools::find_current_workspace;
 
 const TEMPLATE_TEMP_DIR_NAME: &str = "template-test";
 const BUILD_CONTRACTS: bool = true;
diff --git a/framework/scenario/Cargo.toml b/framework/scenario/Cargo.toml
index 21ce6f5a20..d6671523d0 100644
--- a/framework/scenario/Cargo.toml
+++ b/framework/scenario/Cargo.toml
@@ -45,9 +45,9 @@ version = "=0.50.3"
 features = ["alloc", "num-bigint"]
 path = "../base"
 
-[dependencies.multiversx-sc-meta]
+[dependencies.multiversx-sc-meta-lib]
 version = "=0.50.3"
-path = "../meta"
+path = "../meta-lib"
 
 [dependencies.multiversx-chain-scenario-format]
 version = "0.22.2"
diff --git a/framework/scenario/src/facade/scenario_world.rs b/framework/scenario/src/facade/scenario_world.rs
index 5dc97b66ab..056cbbe7f7 100644
--- a/framework/scenario/src/facade/scenario_world.rs
+++ b/framework/scenario/src/facade/scenario_world.rs
@@ -4,7 +4,7 @@ use crate::{
     scenario::{run_trace::ScenarioTrace, run_vm::ScenarioVMRunner},
     vm_go_tool::run_mx_scenario_go,
 };
-use multiversx_sc_meta::find_workspace::find_current_workspace;
+use multiversx_sc_meta_lib::tools::find_current_workspace;
 use std::path::{Path, PathBuf};
 
 use super::debugger_backend::DebuggerBackend;
diff --git a/framework/scenario/src/facade/scenario_world_register.rs b/framework/scenario/src/facade/scenario_world_register.rs
index 4fccdec3e6..1faf45d040 100644
--- a/framework/scenario/src/facade/scenario_world_register.rs
+++ b/framework/scenario/src/facade/scenario_world_register.rs
@@ -11,7 +11,7 @@ use crate::{
 };
 use multiversx_chain_scenario_format::interpret_trait::InterpretableFrom;
 
-use multiversx_sc_meta::cmd::contract::sc_config::ContractVariant;
+use multiversx_sc_meta_lib::contract::sc_config::ContractVariant;
 
 use super::expr::RegisterCodeSource;
 
@@ -78,7 +78,7 @@ impl ScenarioWorld {
         B: CallableContractBuilder,
     {
         let multi_contract_config =
-            multiversx_sc_meta::multi_contract_config::<Abi>(self.current_dir.as_path());
+            multiversx_sc_meta_lib::multi_contract_config::<Abi>(self.current_dir.as_path());
         let contract_variant = multi_contract_config.find_contract(sub_contract_name);
         self.register_contract_variant(expression, contract_builder, contract_variant);
     }
diff --git a/framework/scenario/src/lib.rs b/framework/scenario/src/lib.rs
index e92cec1871..e79d159f1e 100644
--- a/framework/scenario/src/lib.rs
+++ b/framework/scenario/src/lib.rs
@@ -26,7 +26,7 @@ pub use num_bigint;
 
 pub use multiversx_sc;
 
-pub use multiversx_sc_meta as meta;
+pub use multiversx_sc_meta_lib as meta;
 
 /// Exposing the scenario model. Might be moved in the future,
 /// but the export will hopefully remain the same.
diff --git a/framework/scenario/tests/contract_without_macros.rs b/framework/scenario/tests/contract_without_macros.rs
index cf9033b529..91ca8b2eba 100644
--- a/framework/scenario/tests/contract_without_macros.rs
+++ b/framework/scenario/tests/contract_without_macros.rs
@@ -487,7 +487,7 @@ fn contract_without_macros_basic() {
         sample_adder::Proxy::<StaticApi>::new_proxy_obj().contract(ManagedAddress::zero());
     let _ = own_proxy.get_sum();
 
-    let _ = multiversx_sc_meta::abi_json::contract_abi::<sample_adder::AbiProvider>();
+    let _ = multiversx_sc_meta_lib::abi_json::contract_abi::<sample_adder::AbiProvider>();
 }
 
 fn world() -> multiversx_sc_scenario::ScenarioWorld {

From ddf40863dd42a0124626662804538c3aa3599ad7 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 28 May 2024 10:17:31 +0300
Subject: [PATCH 0930/1254] cargo deps cleanup

---
 Cargo.lock                | 22 ++++++++--------------
 framework/meta/Cargo.toml | 12 +++---------
 2 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index c481c052b7..c4dba9954a 100755
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1975,20 +1975,15 @@ dependencies = [
  "common-path",
  "convert_case",
  "copy_dir",
- "hex",
- "lazy_static",
  "multiversx-sc",
  "multiversx-sc-meta-lib",
  "pathdiff",
  "reqwest",
  "ruplacer",
- "rustc_version",
  "semver",
  "serde",
  "serde_json",
  "toml",
- "wasmparser",
- "wasmprinter",
  "zip",
 ]
 
@@ -2121,11 +2116,10 @@ dependencies = [
 
 [[package]]
 name = "native-tls"
-version = "0.2.11"
+version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e"
+checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466"
 dependencies = [
- "lazy_static",
  "libc",
  "log",
  "openssl",
@@ -3025,18 +3019,18 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.202"
+version = "1.0.203"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "226b61a0d411b2ba5ff6d7f73a476ac4f8bb900373459cd00fab8512828ba395"
+checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.202"
+version = "1.0.203"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6048858004bcff69094cd972ed40a32500f153bd3be9f716b2eed2e8217c4838"
+checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3927,9 +3921,9 @@ dependencies = [
 
 [[package]]
 name = "zeroize"
-version = "1.7.0"
+version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d"
+checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
 dependencies = [
  "zeroize_derive",
 ]
diff --git a/framework/meta/Cargo.toml b/framework/meta/Cargo.toml
index 5e9e7ba740..4f1aa79634 100644
--- a/framework/meta/Cargo.toml
+++ b/framework/meta/Cargo.toml
@@ -28,22 +28,16 @@ template-test-released = []
 clap = { version = "4.4.7", features = ["derive"] }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
-rustc_version = "0.4"
 toml = { version = "0.8.6", features = ["preserve_order"] }
 colored = "2.0"
-lazy_static = "1.4.0"
 convert_case = "0.6.0"
-hex = "0.4"
-wasmparser = "0.208"
-wasmprinter = "0.208"
 semver = "1.0.20"
-
 ruplacer = { version = "0.8.1", default-features = false }
 reqwest = { version = "0.12", features = ["blocking", "json"] }
 zip = { version = "2.1", features = ["deflate"], default-features = false }
-copy_dir = { version = "0.1.2" }
-pathdiff = { version = "0.2.1" }
-common-path = { version = "1.0.0" }
+copy_dir =  "0.1.2" 
+pathdiff = "0.2.1" 
+common-path = "1.0.0" 
 
 [dependencies.multiversx-sc]
 version = "=0.50.3"

From 255a39c609a101e54694bbae6006f771bbbb3a66 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 28 May 2024 12:26:31 +0300
Subject: [PATCH 0931/1254] meta RADME fix

---
 framework/meta-lib/README.md | 11 ++++++++---
 framework/meta/README.md     | 19 +++++++++++++++----
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/framework/meta-lib/README.md b/framework/meta-lib/README.md
index e9bc7f3e34..57a7ac2d3a 100644
--- a/framework/meta-lib/README.md
+++ b/framework/meta-lib/README.md
@@ -1,9 +1,14 @@
-# Smart contract meta-programming
+# Smart contract `meta` crate support
 
 [![crates.io](https://img.shields.io/crates/v/multiversx-sc-meta.svg)](https://crates.io/crates/multiversx-sc-meta)
 
-A meta-programming utility that works with smart contract code metadata.
+The library that provides all the functionality of the individual contracts `meta` crates.
 
-It is responsible with creating the smart contract ABIs, generating the wasm crates, and, ultimately, building the contract binaries
+The purpose of the contract `meta` crates is to produce the contract ABI. Because of their access to the ABI, they have other ABI-based responsibilities, such as:
+- generatinc the `wasm` crates,
+- building the contracts,
+- performing validations not possible otherwise,
+- generating snippets,
+- etc.
 
 For more about the build process, see https://docs.multiversx.com/developers/developer-reference/sc-build-reference/
diff --git a/framework/meta/README.md b/framework/meta/README.md
index e9bc7f3e34..7f40ff3f38 100644
--- a/framework/meta/README.md
+++ b/framework/meta/README.md
@@ -1,9 +1,20 @@
-# Smart contract meta-programming
+# Smart contract meta-programming tool
 
 [![crates.io](https://img.shields.io/crates/v/multiversx-sc-meta.svg)](https://crates.io/crates/multiversx-sc-meta)
 
-A meta-programming utility that works with smart contract code metadata.
+This is the standalone tool for creating and managing MultiversX smart contract crates.
 
-It is responsible with creating the smart contract ABIs, generating the wasm crates, and, ultimately, building the contract binaries
+## Install
+
+All you need to do to install is:
+
+```
+cargo install multiversx-sc-meta
+```
+
+It works on both stable and nightly Rust, requires rustc 1.78 or greater.
+
+## Documentation
+
+Please see the explanations and CLI specifiations here: https://docs.multiversx.com/developers/meta/sc-meta
 
-For more about the build process, see https://docs.multiversx.com/developers/developer-reference/sc-build-reference/

From f0068a148affd261f114a850e31b36e0a4187090 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 28 May 2024 13:20:28 +0300
Subject: [PATCH 0932/1254] typo

---
 framework/meta-lib/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/framework/meta-lib/README.md b/framework/meta-lib/README.md
index 57a7ac2d3a..93814bc3d0 100644
--- a/framework/meta-lib/README.md
+++ b/framework/meta-lib/README.md
@@ -5,7 +5,7 @@
 The library that provides all the functionality of the individual contracts `meta` crates.
 
 The purpose of the contract `meta` crates is to produce the contract ABI. Because of their access to the ABI, they have other ABI-based responsibilities, such as:
-- generatinc the `wasm` crates,
+- generating the `wasm` crates,
 - building the contracts,
 - performing validations not possible otherwise,
 - generating snippets,

From cc059599eb6c8d30d6d4b2a07fb7300598171655 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 28 May 2024 13:39:29 +0300
Subject: [PATCH 0933/1254] deprecated meta cli_main and multi_contract_config

---
 framework/meta/src/lib.rs | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/framework/meta/src/lib.rs b/framework/meta/src/lib.rs
index 5daae7e4e0..b74df97748 100644
--- a/framework/meta/src/lib.rs
+++ b/framework/meta/src/lib.rs
@@ -9,11 +9,21 @@ pub use multiversx_sc_meta_lib::version;
 pub use multiversx_sc_meta_lib::version_history;
 
 /// Backwards compatibility, please use `multiversx_sc_meta_lib::cli_main::<AbiObj>()`.
+///
+/// Failure to do so will result in slower build time.
+#[deprecated(
+    since = "0.41.0",
+    note = "Backwards compatibility only, please use `cli_main` from crate `multiversx-sc-meta-lib` instead."
+)]
 pub fn cli_main<AbiObj: multiversx_sc::contract_base::ContractAbiProvider>() {
     multiversx_sc_meta_lib::cli_main::<AbiObj>()
 }
 
 /// Backwards compatibility, please use `multiversx_sc_meta_lib::multi_contract_config::<AbiObj>(contract_crate_path)`.
+#[deprecated(
+    since = "0.41.0",
+    note = "Backwards compatibility only, please use `multi_contract_config` from crate `multiversx-sc-meta-lib` instead."
+)]
 pub fn multi_contract_config<AbiObj: multiversx_sc::contract_base::ContractAbiProvider>(
     contract_crate_path: &std::path::Path,
 ) -> multiversx_sc_meta_lib::contract::sc_config::ScConfig {

From f9036cd5d1902c02419ab65cb6ebb4f507a8372d Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 28 May 2024 14:39:14 +0300
Subject: [PATCH 0934/1254] meta-lib upgrade logic

---
 framework/meta-lib/src/version_history.rs     |  4 ++
 framework/meta/src/cmd/upgrade.rs             |  1 +
 .../meta/src/cmd/upgrade/upgrade_0_51.rs      | 56 +++++++++++++++++++
 .../meta/src/cmd/upgrade/upgrade_selector.rs  |  3 +
 4 files changed, 64 insertions(+)
 create mode 100644 framework/meta/src/cmd/upgrade/upgrade_0_51.rs

diff --git a/framework/meta-lib/src/version_history.rs b/framework/meta-lib/src/version_history.rs
index 5734d10a0d..d377a09e16 100644
--- a/framework/meta-lib/src/version_history.rs
+++ b/framework/meta-lib/src/version_history.rs
@@ -73,6 +73,7 @@ pub const VERSIONS: &[FrameworkVersion] = framework_versions![
     0.50.1,
     0.50.2,
     0.50.3,
+    0.51.0,
 ];
 
 #[rustfmt::skip]
@@ -95,6 +96,9 @@ pub const CHECK_AFTER_UPGRADE_TO: &[FrameworkVersion] = framework_versions![
     0.45.2,
     0.46.0,
     0.47.0,
+    0.49.0,
+    0.50.3,
+    0.51.0,
 ];
 
 pub const LOWER_VERSION_WITH_TEMPLATE_TAG: FrameworkVersion = framework_version!(0.43.0);
diff --git a/framework/meta/src/cmd/upgrade.rs b/framework/meta/src/cmd/upgrade.rs
index d7ced05dba..ab14b75075 100644
--- a/framework/meta/src/cmd/upgrade.rs
+++ b/framework/meta/src/cmd/upgrade.rs
@@ -2,6 +2,7 @@ mod upgrade_0_31;
 mod upgrade_0_32;
 mod upgrade_0_39;
 mod upgrade_0_45;
+mod upgrade_0_51;
 pub(crate) mod upgrade_common;
 mod upgrade_print;
 mod upgrade_selector;
diff --git a/framework/meta/src/cmd/upgrade/upgrade_0_51.rs b/framework/meta/src/cmd/upgrade/upgrade_0_51.rs
new file mode 100644
index 0000000000..7b965ddf07
--- /dev/null
+++ b/framework/meta/src/cmd/upgrade/upgrade_0_51.rs
@@ -0,0 +1,56 @@
+use super::upgrade_common::{replace_in_files, version_bump_in_cargo_toml};
+use super::upgrade_print::*;
+use crate::folder_structure::{DirectoryType, RelevantDirectory};
+use multiversx_sc_meta_lib::cargo_toml_contents::CargoTomlContents;
+use ruplacer::Query;
+use std::path::Path;
+use toml::Value;
+
+/// Migrate `0.50` to `0.51.0`, including the version bump.
+pub fn upgrade_to_51_0(dir: &RelevantDirectory) {
+    if dir.dir_type == DirectoryType::Contract {
+        v_0_51_prepare_meta(dir.path.as_ref());
+    }
+    v_0_51_replace_in_files(dir.path.as_ref());
+
+    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_51_replace_in_files(sc_crate_path: &Path) {
+    replace_in_files(
+        sc_crate_path,
+        "*rs",
+        &[Query::substring(
+            "multiversx_sc_meta",
+            "multiversx_sc_meta_lib",
+        )][..],
+    );
+}
+
+fn v_0_51_prepare_meta(sc_crate_path: &Path) {
+    let cargo_toml_path = sc_crate_path.join("meta/Cargo.toml");
+    assert!(
+        cargo_toml_path.exists(),
+        "SC crate Cargo.toml not found: {}",
+        cargo_toml_path.display()
+    );
+    let mut meta_cargo_toml = CargoTomlContents::load_from_file(&cargo_toml_path);
+    let deps = meta_cargo_toml.dependencies_mut();
+
+    print_cargo_dep_remove(cargo_toml_path.as_path(), "multiversx-sc-meta");
+    let mut meta_value = deps
+        .remove("multiversx-sc-meta")
+        .expect("multiversx-sc-meta dependency not found in meta crate");
+
+    if let Some(path) = meta_value.get_mut("path") {
+        if let Value::String(s) = path {
+            s.push_str("-lib");
+        }
+    }
+
+    print_cargo_dep_add(cargo_toml_path.as_path(), "multiversx-sc-meta");
+    deps.insert("multiversx-sc-meta-lib".to_string(), meta_value);
+
+    meta_cargo_toml.save_to_file(&cargo_toml_path);
+}
diff --git a/framework/meta/src/cmd/upgrade/upgrade_selector.rs b/framework/meta/src/cmd/upgrade/upgrade_selector.rs
index aeb2924a76..0f958b176e 100644
--- a/framework/meta/src/cmd/upgrade/upgrade_selector.rs
+++ b/framework/meta/src/cmd/upgrade/upgrade_selector.rs
@@ -12,6 +12,7 @@ use super::{
     upgrade_0_32::upgrade_to_32_0,
     upgrade_0_39::{postprocessing_after_39_0, upgrade_to_39_0},
     upgrade_0_45::upgrade_to_45_0,
+    upgrade_0_51::upgrade_to_51_0,
     upgrade_common::{cargo_check, version_bump_in_cargo_toml},
     upgrade_print::*,
 };
@@ -86,6 +87,8 @@ fn upgrade_function_selector(dir: &RelevantDirectory) {
             upgrade_to_39_0(dir)
         } else if framework_version!(0.45.0) == *to_version {
             upgrade_to_45_0(dir)
+        } else if framework_version!(0.51.0) == *to_version {
+            upgrade_to_51_0(dir)
         } else {
             version_bump_in_cargo_toml(&dir.path, from_version, to_version)
         }

From b7a145071b2493114b07557930a23360bc70319f Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 28 May 2024 14:52:45 +0300
Subject: [PATCH 0935/1254] cleanup

---
 .../use-module/meta/abi/Cargo.toml             | 18 ------------------
 .../use-module/meta/abi/src/main.rs            |  3 ---
 2 files changed, 21 deletions(-)
 delete mode 100644 contracts/feature-tests/use-module/meta/abi/Cargo.toml
 delete mode 100644 contracts/feature-tests/use-module/meta/abi/src/main.rs

diff --git a/contracts/feature-tests/use-module/meta/abi/Cargo.toml b/contracts/feature-tests/use-module/meta/abi/Cargo.toml
deleted file mode 100644
index 4d51a10d68..0000000000
--- a/contracts/feature-tests/use-module/meta/abi/Cargo.toml
+++ /dev/null
@@ -1,18 +0,0 @@
-[package]
-name = "use-module-meta"
-version = "0.0.0"
-authors = ["Andrei Marinica <andrei.marinica@multiversx.com>"]
-edition = "2021"
-publish = false
-
-[dependencies.use-module]
-path = ".."
-
-[dependencies.multiversx-sc]
-version = "0.50.3"
-path = "../../../../framework/base"
-
-[dependencies.multiversx-sc-meta]
-version = "0.50.3"
-path = "../../../../framework/meta"
-default-features = false
diff --git a/contracts/feature-tests/use-module/meta/abi/src/main.rs b/contracts/feature-tests/use-module/meta/abi/src/main.rs
deleted file mode 100644
index afafea6eda..0000000000
--- a/contracts/feature-tests/use-module/meta/abi/src/main.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-fn main() {
-    multiversx_sc_meta::cli_main::<use_module::AbiProvider>();
-}

From e1e0dcd3896c5d9eea5df782dc5bc3f43389438e Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 28 May 2024 14:56:39 +0300
Subject: [PATCH 0936/1254] contract upgrade (meta-lib), mostly automatic

---
 Cargo.lock                                    | 152 +++++++++---------
 .../benchmarks/large-storage/meta/Cargo.toml  |   4 +-
 .../benchmarks/large-storage/meta/src/main.rs |   2 +-
 .../linked-list-repeat/meta/Cargo.toml        |   4 +-
 .../linked-list-repeat/meta/src/main.rs       |   2 +-
 .../mappers/map-repeat/meta/Cargo.toml        |   4 +-
 .../mappers/map-repeat/meta/src/main.rs       |   2 +-
 .../mappers/queue-repeat/meta/Cargo.toml      |   4 +-
 .../mappers/queue-repeat/meta/src/main.rs     |   2 +-
 .../mappers/set-repeat/meta/Cargo.toml        |   4 +-
 .../mappers/set-repeat/meta/src/main.rs       |   2 +-
 .../single-value-repeat/meta/Cargo.toml       |   4 +-
 .../single-value-repeat/meta/src/main.rs      |   2 +-
 .../mappers/vec-repeat/meta/Cargo.toml        |   4 +-
 .../mappers/vec-repeat/meta/src/main.rs       |   2 +-
 .../benchmarks/send-tx-repeat/meta/Cargo.toml |   4 +-
 .../send-tx-repeat/meta/src/main.rs           |   2 +-
 .../benchmarks/str-repeat/meta/Cargo.toml     |   4 +-
 .../benchmarks/str-repeat/meta/src/main.rs    |   2 +-
 .../core/price-aggregator/meta/Cargo.toml     |   4 +-
 .../core/price-aggregator/meta/src/main.rs    |   2 +-
 contracts/core/wegld-swap/meta/Cargo.toml     |   6 +-
 contracts/core/wegld-swap/meta/src/main.rs    |   2 +-
 contracts/examples/adder/meta/Cargo.toml      |   4 +-
 contracts/examples/adder/meta/src/main.rs     |   2 +-
 .../bonding-curve-contract/meta/Cargo.toml    |   4 +-
 .../bonding-curve-contract/meta/src/main.rs   |   2 +-
 .../examples/check-pause/meta/Cargo.toml      |   4 +-
 .../examples/check-pause/meta/src/main.rs     |   2 +-
 .../crowdfunding-esdt/meta/Cargo.toml         |   4 +-
 .../crowdfunding-esdt/meta/src/main.rs        |   2 +-
 .../examples/crypto-bubbles/meta/Cargo.toml   |   4 +-
 .../examples/crypto-bubbles/meta/src/main.rs  |   2 +-
 .../kitty-auction/meta/Cargo.toml             |   4 +-
 .../kitty-auction/meta/src/main.rs            |   2 +-
 .../kitty-genetic-alg/meta/Cargo.toml         |   4 +-
 .../kitty-genetic-alg/meta/src/main.rs        |   2 +-
 .../kitty-ownership/meta/Cargo.toml           |   4 +-
 .../kitty-ownership/meta/src/main.rs          |   2 +-
 .../examples/crypto-zombies/meta/Cargo.toml   |   4 +-
 .../examples/crypto-zombies/meta/src/main.rs  |   2 +-
 .../examples/digital-cash/meta/Cargo.toml     |   4 +-
 .../examples/digital-cash/meta/src/main.rs    |   2 +-
 contracts/examples/empty/meta/Cargo.toml      |   4 +-
 contracts/examples/empty/meta/src/main.rs     |   2 +-
 .../esdt-transfer-with-fee/meta/Cargo.toml    |   4 +-
 .../esdt-transfer-with-fee/meta/src/main.rs   |   2 +-
 contracts/examples/factorial/meta/Cargo.toml  |   4 +-
 contracts/examples/factorial/meta/src/main.rs |   2 +-
 .../examples/fractional-nfts/meta/Cargo.toml  |   4 +-
 .../examples/fractional-nfts/meta/src/main.rs |   2 +-
 .../examples/lottery-esdt/meta/Cargo.toml     |   4 +-
 .../examples/lottery-esdt/meta/src/main.rs    |   2 +-
 contracts/examples/multisig/meta/Cargo.toml   |   4 +-
 contracts/examples/multisig/meta/src/main.rs  |   2 +-
 contracts/examples/nft-minter/meta/Cargo.toml |   4 +-
 .../examples/nft-minter/meta/src/main.rs      |   2 +-
 .../nft-storage-prepay/meta/Cargo.toml        |   6 +-
 .../nft-storage-prepay/meta/src/main.rs       |   2 +-
 .../examples/nft-subscription/meta/Cargo.toml |   4 +-
 .../nft-subscription/meta/src/main.rs         |   2 +-
 .../order-book/factory/meta/Cargo.toml        |   4 +-
 .../order-book/factory/meta/src/main.rs       |   2 +-
 .../examples/order-book/pair/meta/Cargo.toml  |   4 +-
 .../examples/order-book/pair/meta/src/main.rs |   2 +-
 .../examples/ping-pong-egld/meta/Cargo.toml   |   6 +-
 .../examples/ping-pong-egld/meta/src/main.rs  |   2 +-
 .../examples/proxy-pause/meta/Cargo.toml      |   6 +-
 .../examples/proxy-pause/meta/src/main.rs     |   2 +-
 .../rewards-distribution/meta/Cargo.toml      |   4 +-
 .../rewards-distribution/meta/src/main.rs     |   2 +-
 .../examples/seed-nft-minter/meta/Cargo.toml  |   4 +-
 .../examples/seed-nft-minter/meta/src/main.rs |   2 +-
 .../examples/token-release/meta/Cargo.toml    |   5 +-
 .../examples/token-release/meta/src/main.rs   |   2 +-
 .../feature-tests/abi-tester/meta/Cargo.toml  |   4 +-
 .../feature-tests/abi-tester/meta/src/main.rs |   2 +-
 .../alloc-features/meta/Cargo.toml            |   4 +-
 .../alloc-features/meta/src/main.rs           |   2 +-
 .../basic-features/meta/Cargo.toml            |   4 +-
 .../basic-features/meta/src/main.rs           |   2 +-
 .../big-float-features/meta/Cargo.toml        |   4 +-
 .../big-float-features/meta/src/main.rs       |   2 +-
 .../builtin-func-features/meta/Cargo.toml     |   4 +-
 .../builtin-func-features/meta/src/main.rs    |   2 +-
 .../first-contract/meta/Cargo.toml            |   4 +-
 .../first-contract/meta/src/main.rs           |   2 +-
 .../second-contract/meta/Cargo.toml           |   4 +-
 .../second-contract/meta/src/main.rs          |   2 +-
 .../child/meta/Cargo.toml                     |   4 +-
 .../child/meta/src/main.rs                    |   2 +-
 .../parent/meta/Cargo.toml                    |   4 +-
 .../parent/meta/src/main.rs                   |   2 +-
 .../forwarder-legacy/meta/Cargo.toml          |   4 +-
 .../forwarder-legacy/meta/src/main.rs         |   2 +-
 .../forwarder-queue/meta/Cargo.toml           |   4 +-
 .../forwarder-queue/meta/src/main.rs          |   2 +-
 .../forwarder-raw/meta/Cargo.toml             |   4 +-
 .../forwarder-raw/meta/src/main.rs            |   2 +-
 .../composability/forwarder/meta/Cargo.toml   |   4 +-
 .../composability/forwarder/meta/src/main.rs  |   2 +-
 .../local-esdt-and-nft/meta/Cargo.toml        |   4 +-
 .../local-esdt-and-nft/meta/src/main.rs       |   2 +-
 .../promises-features/meta/Cargo.toml         |   4 +-
 .../promises-features/meta/src/main.rs        |   2 +-
 .../proxy-test-first/meta/Cargo.toml          |   4 +-
 .../proxy-test-first/meta/src/main.rs         |   2 +-
 .../proxy-test-second/meta/Cargo.toml         |   4 +-
 .../proxy-test-second/meta/src/main.rs        |   2 +-
 .../recursive-caller/meta/Cargo.toml          |   4 +-
 .../recursive-caller/meta/src/main.rs         |   2 +-
 .../transfer-role-features/meta/Cargo.toml    |   4 +-
 .../transfer-role-features/meta/src/main.rs   |   2 +-
 .../composability/vault/meta/Cargo.toml       |   4 +-
 .../composability/vault/meta/src/main.rs      |   2 +-
 .../crowdfunding-erc20/meta/Cargo.toml        |   4 +-
 .../crowdfunding-erc20/meta/src/main.rs       |   2 +-
 .../erc1155-marketplace/meta/Cargo.toml       |   4 +-
 .../erc1155-marketplace/meta/src/main.rs      |   2 +-
 .../erc1155-user-mock/meta/Cargo.toml         |   4 +-
 .../erc1155-user-mock/meta/src/main.rs        |   2 +-
 .../erc1155/meta/Cargo.toml                   |   4 +-
 .../erc1155/meta/src/main.rs                  |   2 +-
 .../erc-style-contracts/erc20/meta/Cargo.toml |   4 +-
 .../erc20/meta/src/main.rs                    |   2 +-
 .../erc721/meta/Cargo.toml                    |   4 +-
 .../erc721/meta/src/main.rs                   |   2 +-
 .../lottery-erc20/meta/Cargo.toml             |   4 +-
 .../lottery-erc20/meta/src/main.rs            |   2 +-
 .../esdt-system-sc-mock/meta/Cargo.toml       |   4 +-
 .../esdt-system-sc-mock/meta/src/main.rs      |   2 +-
 .../exchange-features/meta/Cargo.toml         |   4 +-
 .../exchange-features/meta/src/main.rs        |   2 +-
 .../meta/Cargo.toml                           |   6 +-
 .../meta/src/main.rs                          |   2 +-
 .../managed-map-features/meta/Cargo.toml      |   5 +-
 .../managed-map-features/meta/src/main.rs     |   2 +-
 .../multi-contract-features/meta/Cargo.toml   |   4 +-
 .../multi-contract-features/meta/src/main.rs  |   2 +-
 .../panic-message-features/meta/Cargo.toml    |   4 +-
 .../panic-message-features/meta/src/main.rs   |   2 +-
 .../payable-features/meta/Cargo.toml          |   4 +-
 .../payable-features/meta/src/main.rs         |   2 +-
 .../meta/Cargo.toml                           |   4 +-
 .../meta/src/main.rs                          |   2 +-
 .../meta/Cargo.toml                           |   4 +-
 .../meta/src/main.rs                          |   2 +-
 .../scenario-tester/meta/Cargo.toml           |   4 +-
 .../scenario-tester/meta/src/main.rs          |   2 +-
 contracts/feature-tests/use-module/Cargo.toml |   4 +-
 .../feature-tests/use-module/meta/Cargo.toml  |   4 +-
 .../feature-tests/use-module/meta/src/main.rs |   2 +-
 .../use-module/tests/use_module_abi_test.rs   |   8 +-
 153 files changed, 313 insertions(+), 313 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index c4dba9954a..8210b20eb5 100755
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -26,7 +26,7 @@ name = "abi-tester-meta"
 version = "0.0.0"
 dependencies = [
  "abi-tester",
- "multiversx-sc-meta",
+ "multiversx-sc-meta-lib",
 ]
 
 [[package]]
@@ -42,7 +42,7 @@ name = "adder-meta"
 version = "0.0.0"
 dependencies = [
  "adder",
- "multiversx-sc-meta",
+ "multiversx-sc-meta-lib",
 ]
 
 [[package]]
@@ -95,7 +95,7 @@ name = "alloc-features-meta"
 version = "0.0.0"
 dependencies = [
  "alloc-features",
- "multiversx-sc-meta",
+ "multiversx-sc-meta-lib",
 ]
 
 [[package]]
@@ -227,7 +227,7 @@ name = "basic-features-meta"
 version = "0.0.0"
 dependencies = [
  "basic-features",
- "multiversx-sc-meta",
+ "multiversx-sc-meta-lib",
 ]
 
 [[package]]
@@ -269,7 +269,7 @@ name = "big-float-features-meta"
 version = "0.0.0"
 dependencies = [
  "big-float-features",
- "multiversx-sc-meta",
+ "multiversx-sc-meta-lib",
 ]
 
 [[package]]
@@ -335,7 +335,7 @@ name = "bonding-curve-contract-meta"
 version = "0.0.0"
 dependencies = [
  "bonding-curve-contract",
- "multiversx-sc-meta",
+ "multiversx-sc-meta-lib",
 ]
 
 [[package]]
@@ -361,7 +361,7 @@ name = "builtin-func-features-meta"
 version = "0.0.0"
 dependencies = [
  "builtin-func-features",
- "multiversx-sc-meta",
+ "multiversx-sc-meta-lib",
 ]
 
 [[package]]
@@ -409,7 +409,7 @@ name = "check-pause-meta"
 version = "0.0.0"
 dependencies = [
  "check-pause",
- "multiversx-sc-meta",
+ "multiversx-sc-meta-lib",
 ]
 
 [[package]]
@@ -426,7 +426,7 @@ version = "0.0.0"
 dependencies = [
  "child",
  "multiversx-sc",
- "multiversx-sc-meta",
+ "multiversx-sc-meta-lib",
 ]
 
 [[package]]
@@ -600,7 +600,7 @@ name = "crowdfunding-erc20-meta"
 version = "0.0.0"
 dependencies = [
  "crowdfunding-erc20",
- "multiversx-sc-meta",
+ "multiversx-sc-meta-lib",
 ]
 
 [[package]]
@@ -619,7 +619,7 @@ name = "crowdfunding-esdt-meta"
 version = "0.0.0"
 dependencies = [
  "crowdfunding-esdt",
- "multiversx-sc-meta",
+ "multiversx-sc-meta-lib",
 ]
 
 [[package]]
@@ -635,7 +635,7 @@ name = "crypto-bubbles-meta"
 version = "0.0.0"
 dependencies = [
  "crypto-bubbles",
- "multiversx-sc-meta",
+ "multiversx-sc-meta-lib",
 ]
 
 [[package]]
@@ -661,7 +661,7 @@ name = "crypto-zombies-meta"
 version = "0.0.0"
 dependencies = [
  "crypto-zombies",
- "multiversx-sc-meta",
+ "multiversx-sc-meta-lib",
 ]
 
 [[package]]
@@ -721,7 +721,7 @@ name = "digital-cash-meta"
 version = "0.0.0"
 dependencies = [
  "digital-cash",
- "multiversx-sc-meta",
+ "multiversx-sc-meta-lib",
 ]
 
 [[package]]
@@ -778,7 +778,7 @@ name = "empty-meta"
 version = "0.0.0"
 dependencies = [
  "empty",
- "multiversx-sc-meta",
+ "multiversx-sc-meta-lib",
 ]
 
 [[package]]
@@ -848,7 +848,7 @@ name = "erc1155-marketplace-meta"
 version = "0.0.0"
 dependencies = [
  "erc1155-marketplace",
- "multiversx-sc-meta",
+ "multiversx-sc-meta-lib",
 ]
 
 [[package]]
@@ -856,7 +856,7 @@ name = "erc1155-meta"
 version = "0.0.0"
 dependencies = [
  "erc1155",
- "multiversx-sc-meta",
+ "multiversx-sc-meta-lib",
 ]
 
 [[package]]
@@ -872,7 +872,7 @@ name = "erc1155-user-mock-meta"
 version = "0.0.0"
 dependencies = [
  "erc1155-user-mock",
- "multiversx-sc-meta",
+ "multiversx-sc-meta-lib",
 ]
 
 [[package]]
@@ -888,7 +888,7 @@ name = "erc20-meta"
 version = "0.0.0"
 dependencies = [
  "erc20",
- "multiversx-sc-meta",
+ "multiversx-sc-meta-lib",
 ]
 
 [[package]]
@@ -904,7 +904,7 @@ name = "erc721-meta"
 version = "0.0.0"
 dependencies = [
  "erc721",
- "multiversx-sc-meta",
+ "multiversx-sc-meta-lib",
 ]
 
 [[package]]
@@ -940,7 +940,7 @@ name = "esdt-system-sc-mock-meta"
 version = "0.0.0"
 dependencies = [
  "esdt-system-sc-mock",
- "multiversx-sc-meta",
+ "multiversx-sc-meta-lib",
 ]
 
 [[package]]
@@ -956,7 +956,7 @@ name = "esdt-transfer-with-fee-meta"
 version = "0.0.0"
 dependencies = [
  "esdt-transfer-with-fee",
- "multiversx-sc-meta",
+ "multiversx-sc-meta-lib",
 ]
 
 [[package]]
@@ -972,7 +972,7 @@ name = "exchange-features-meta"
 version = "0.0.0"
 dependencies = [
  "exchange-features",
- "multiversx-sc-meta",
+ "multiversx-sc-meta-lib",
 ]
 
 [[package]]
@@ -988,14 +988,14 @@ name = "factorial-meta"
 version = "0.0.0"
 dependencies = [
  "factorial",
- "multiversx-sc-meta",
+ "multiversx-sc-meta-lib",
 ]
 
 [[package]]
 name = "factory-meta"
 version = "0.0.0"
 dependencies = [
- "multiversx-sc-meta",
+ "multiversx-sc-meta-lib",
  "order-book-factory",
 ]
 
@@ -1019,7 +1019,7 @@ version = "0.0.0"
 dependencies = [
  "first-contract",
  "multiversx-sc",
- "multiversx-sc-meta",
+ "multiversx-sc-meta-lib",
 ]
 
 [[package]]
@@ -1075,7 +1075,7 @@ name = "formatted-message-features-meta"
 version = "0.0.0"
 dependencies = [
  "formatted-message-features",
- "multiversx-sc-meta",
+ "multiversx-sc-meta-lib",
 ]
 
 [[package]]
@@ -1100,7 +1100,7 @@ name = "forwarder-legacy-meta"
 version = "0.0.0"
 dependencies = [
  "forwarder-legacy",
- "multiversx-sc-meta",
+ "multiversx-sc-meta-lib",
 ]
 
 [[package]]
@@ -1108,7 +1108,7 @@ name = "forwarder-meta"
 version = "0.0.0"
 dependencies = [
  "forwarder",
- "multiversx-sc-meta",
+ "multiversx-sc-meta-lib",
 ]
 
 [[package]]
@@ -1125,7 +1125,7 @@ name = "forwarder-queue-meta"
 version = "0.0.0"
 dependencies = [
  "forwarder-queue",
- "multiversx-sc-meta",
+ "multiversx-sc-meta-lib",
 ]
 
 [[package]]
@@ -1141,7 +1141,7 @@ name = "forwarder-raw-meta"
 version = "0.0.0"
 dependencies = [
  "forwarder-raw",
- "multiversx-sc-meta",
+ "multiversx-sc-meta-lib",
 ]
 
 [[package]]
@@ -1158,7 +1158,7 @@ name = "fractional-nfts-meta"
 version = "0.0.0"
 dependencies = [
  "fractional-nfts",
- "multiversx-sc-meta",
+ "multiversx-sc-meta-lib",
 ]
 
 [[package]]
@@ -1583,7 +1583,7 @@ name = "kitty-auction-meta"
 version = "0.0.0"
 dependencies = [
  "kitty-auction",
- "multiversx-sc-meta",
+ "multiversx-sc-meta-lib",
 ]
 
 [[package]]
@@ -1601,7 +1601,7 @@ name = "kitty-genetic-alg-meta"
 version = "0.0.0"
 dependencies = [
  "kitty-genetic-alg",
- "multiversx-sc-meta",
+ "multiversx-sc-meta-lib",
 ]
 
 [[package]]
@@ -1620,7 +1620,7 @@ name = "kitty-ownership-meta"
 version = "0.0.0"
 dependencies = [
  "kitty-ownership",
- "multiversx-sc-meta",
+ "multiversx-sc-meta-lib",
 ]
 
 [[package]]
@@ -1636,7 +1636,7 @@ name = "large-storage-meta"
 version = "0.0.0"
 dependencies = [
  "large-storage",
- "multiversx-sc-meta",
+ "multiversx-sc-meta-lib",
 ]
 
 [[package]]
@@ -1665,7 +1665,7 @@ name = "linked-list-repeat-meta"
 version = "0.0.0"
 dependencies = [
  "linked-list-repeat",
- "multiversx-sc-meta",
+ "multiversx-sc-meta-lib",
 ]
 
 [[package]]
@@ -1687,7 +1687,7 @@ name = "local-esdt-and-nft-meta"
 version = "0.0.0"
 dependencies = [
  "local-esdt-and-nft",
- "multiversx-sc-meta",
+ "multiversx-sc-meta-lib",
 ]
 
 [[package]]
@@ -1726,7 +1726,7 @@ name = "lottery-erc20-meta"
 version = "0.0.0"
 dependencies = [
  "lottery-erc20",
- "multiversx-sc-meta",
+ "multiversx-sc-meta-lib",
 ]
 
 [[package]]
@@ -1742,7 +1742,7 @@ name = "lottery-esdt-meta"
 version = "0.0.0"
 dependencies = [
  "lottery-esdt",
- "multiversx-sc-meta",
+ "multiversx-sc-meta-lib",
 ]
 
 [[package]]
@@ -1759,7 +1759,7 @@ name = "managed-map-features-meta"
 version = "0.0.0"
 dependencies = [
  "managed-map-features",
- "multiversx-sc-meta",
+ "multiversx-sc-meta-lib",
 ]
 
 [[package]]
@@ -1776,7 +1776,7 @@ name = "map-repeat-meta"
 version = "0.0.0"
 dependencies = [
  "map-repeat",
- "multiversx-sc-meta",
+ "multiversx-sc-meta-lib",
 ]
 
 [[package]]
@@ -1824,7 +1824,7 @@ name = "multi-contract-features-meta"
 version = "0.0.0"
 dependencies = [
  "multi-contract-features",
- "multiversx-sc-meta",
+ "multiversx-sc-meta-lib",
 ]
 
 [[package]]
@@ -1861,7 +1861,7 @@ name = "multisig-meta"
 version = "0.0.0"
 dependencies = [
  "multisig",
- "multiversx-sc-meta",
+ "multiversx-sc-meta-lib",
 ]
 
 [[package]]
@@ -1920,7 +1920,7 @@ version = "0.0.0"
 dependencies = [
  "multiversx-price-aggregator-sc",
  "multiversx-sc",
- "multiversx-sc-meta",
+ "multiversx-sc-meta-lib",
 ]
 
 [[package]]
@@ -2099,7 +2099,7 @@ name = "multiversx-wegld-swap-sc-meta"
 version = "0.0.0"
 dependencies = [
  "multiversx-sc",
- "multiversx-sc-meta",
+ "multiversx-sc-meta-lib",
  "multiversx-wegld-swap-sc",
 ]
 
@@ -2143,7 +2143,7 @@ dependencies = [
 name = "nft-minter-meta"
 version = "0.0.0"
 dependencies = [
- "multiversx-sc-meta",
+ "multiversx-sc-meta-lib",
  "nft-minter",
 ]
 
@@ -2159,7 +2159,7 @@ dependencies = [
 name = "nft-storage-prepay-meta"
 version = "0.0.0"
 dependencies = [
- "multiversx-sc-meta",
+ "multiversx-sc-meta-lib",
  "nft-storage-prepay",
 ]
 
@@ -2176,7 +2176,7 @@ dependencies = [
 name = "nft-subscription-meta"
 version = "0.0.0"
 dependencies = [
- "multiversx-sc-meta",
+ "multiversx-sc-meta-lib",
  "nft-subscription",
 ]
 
@@ -2312,7 +2312,7 @@ dependencies = [
 name = "pair-meta"
 version = "0.0.0"
 dependencies = [
- "multiversx-sc-meta",
+ "multiversx-sc-meta-lib",
  "order-book-pair",
 ]
 
@@ -2328,7 +2328,7 @@ dependencies = [
 name = "panic-message-features-meta"
 version = "0.0.0"
 dependencies = [
- "multiversx-sc-meta",
+ "multiversx-sc-meta-lib",
  "panic-message-features",
 ]
 
@@ -2345,7 +2345,7 @@ name = "parent-meta"
 version = "0.0.0"
 dependencies = [
  "multiversx-sc",
- "multiversx-sc-meta",
+ "multiversx-sc-meta-lib",
  "parent",
 ]
 
@@ -2390,7 +2390,7 @@ dependencies = [
 name = "payable-features-meta"
 version = "0.0.0"
 dependencies = [
- "multiversx-sc-meta",
+ "multiversx-sc-meta-lib",
  "payable-features",
 ]
 
@@ -2467,7 +2467,7 @@ dependencies = [
 name = "ping-pong-egld-meta"
 version = "0.0.0"
 dependencies = [
- "multiversx-sc-meta",
+ "multiversx-sc-meta-lib",
  "ping-pong-egld",
 ]
 
@@ -2503,7 +2503,7 @@ dependencies = [
 name = "promises-features-meta"
 version = "0.0.0"
 dependencies = [
- "multiversx-sc-meta",
+ "multiversx-sc-meta-lib",
  "promises-features",
 ]
 
@@ -2520,7 +2520,7 @@ dependencies = [
 name = "proxy-pause-meta"
 version = "0.0.0"
 dependencies = [
- "multiversx-sc-meta",
+ "multiversx-sc-meta-lib",
  "proxy-pause",
 ]
 
@@ -2537,7 +2537,7 @@ dependencies = [
 name = "proxy-test-first-meta"
 version = "0.0.0"
 dependencies = [
- "multiversx-sc-meta",
+ "multiversx-sc-meta-lib",
  "proxy-test-first",
 ]
 
@@ -2553,7 +2553,7 @@ dependencies = [
 name = "proxy-test-second-meta"
 version = "0.0.0"
 dependencies = [
- "multiversx-sc-meta",
+ "multiversx-sc-meta-lib",
  "proxy-test-second",
 ]
 
@@ -2570,7 +2570,7 @@ dependencies = [
 name = "queue-repeat-meta"
 version = "0.0.0"
 dependencies = [
- "multiversx-sc-meta",
+ "multiversx-sc-meta-lib",
  "queue-repeat",
 ]
 
@@ -2693,7 +2693,7 @@ dependencies = [
 name = "recursive-caller-meta"
 version = "0.0.0"
 dependencies = [
- "multiversx-sc-meta",
+ "multiversx-sc-meta-lib",
  "recursive-caller",
 ]
 
@@ -2791,7 +2791,7 @@ dependencies = [
 name = "rewards-distribution-meta"
 version = "0.0.0"
 dependencies = [
- "multiversx-sc-meta",
+ "multiversx-sc-meta-lib",
  "rewards-distribution",
 ]
 
@@ -2821,7 +2821,7 @@ dependencies = [
 name = "rust-snippets-generator-test-meta"
 version = "0.0.0"
 dependencies = [
- "multiversx-sc-meta",
+ "multiversx-sc-meta-lib",
  "rust-snippets-generator-test",
 ]
 
@@ -2844,7 +2844,7 @@ dependencies = [
 name = "rust-testing-framework-tester-meta"
 version = "0.0.0"
 dependencies = [
- "multiversx-sc-meta",
+ "multiversx-sc-meta-lib",
  "rust-testing-framework-tester",
 ]
 
@@ -2919,7 +2919,7 @@ dependencies = [
 name = "scenario-tester-meta"
 version = "0.0.0"
 dependencies = [
- "multiversx-sc-meta",
+ "multiversx-sc-meta-lib",
  "scenario-tester",
 ]
 
@@ -2951,7 +2951,7 @@ name = "second-contract-meta"
 version = "0.0.0"
 dependencies = [
  "multiversx-sc",
- "multiversx-sc-meta",
+ "multiversx-sc-meta-lib",
  "second-contract",
 ]
 
@@ -2991,7 +2991,7 @@ dependencies = [
 name = "seed-nft-minter-meta"
 version = "0.0.0"
 dependencies = [
- "multiversx-sc-meta",
+ "multiversx-sc-meta-lib",
  "seed-nft-minter",
 ]
 
@@ -3013,7 +3013,7 @@ dependencies = [
 name = "send-tx-repeat-meta"
 version = "0.0.0"
 dependencies = [
- "multiversx-sc-meta",
+ "multiversx-sc-meta-lib",
  "send-tx-repeat",
 ]
 
@@ -3094,7 +3094,7 @@ dependencies = [
 name = "set-repeat-meta"
 version = "0.0.0"
 dependencies = [
- "multiversx-sc-meta",
+ "multiversx-sc-meta-lib",
  "set-repeat",
 ]
 
@@ -3166,7 +3166,7 @@ dependencies = [
 name = "single-value-repeat-meta"
 version = "0.0.0"
 dependencies = [
- "multiversx-sc-meta",
+ "multiversx-sc-meta-lib",
  "single-value-repeat",
 ]
 
@@ -3207,7 +3207,7 @@ dependencies = [
 name = "str-repeat-meta"
 version = "0.0.0"
 dependencies = [
- "multiversx-sc-meta",
+ "multiversx-sc-meta-lib",
  "str-repeat",
 ]
 
@@ -3320,7 +3320,7 @@ dependencies = [
 name = "token-release-meta"
 version = "0.0.0"
 dependencies = [
- "multiversx-sc-meta",
+ "multiversx-sc-meta-lib",
  "token-release",
 ]
 
@@ -3472,7 +3472,7 @@ dependencies = [
 name = "transfer-role-features-meta"
 version = "0.0.0"
 dependencies = [
- "multiversx-sc-meta",
+ "multiversx-sc-meta-lib",
  "transfer-role-features",
 ]
 
@@ -3537,7 +3537,7 @@ name = "use-module"
 version = "0.0.0"
 dependencies = [
  "multiversx-sc",
- "multiversx-sc-meta",
+ "multiversx-sc-meta-lib",
  "multiversx-sc-modules",
  "multiversx-sc-scenario",
 ]
@@ -3546,7 +3546,7 @@ dependencies = [
 name = "use-module-meta"
 version = "0.0.0"
 dependencies = [
- "multiversx-sc-meta",
+ "multiversx-sc-meta-lib",
  "use-module",
 ]
 
@@ -3568,7 +3568,7 @@ dependencies = [
 name = "vault-meta"
 version = "0.0.0"
 dependencies = [
- "multiversx-sc-meta",
+ "multiversx-sc-meta-lib",
  "vault",
 ]
 
@@ -3591,7 +3591,7 @@ dependencies = [
 name = "vec-repeat-meta"
 version = "0.0.0"
 dependencies = [
- "multiversx-sc-meta",
+ "multiversx-sc-meta-lib",
  "vec-repeat",
 ]
 
diff --git a/contracts/benchmarks/large-storage/meta/Cargo.toml b/contracts/benchmarks/large-storage/meta/Cargo.toml
index cb6927c664..d1a53cc5bf 100644
--- a/contracts/benchmarks/large-storage/meta/Cargo.toml
+++ b/contracts/benchmarks/large-storage/meta/Cargo.toml
@@ -7,7 +7,7 @@ publish = false
 [dependencies.large-storage]
 path = ".."
 
-[dependencies.multiversx-sc-meta]
+[dependencies.multiversx-sc-meta-lib]
 version = "0.50.3"
-path = "../../../../framework/meta"
+path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/benchmarks/large-storage/meta/src/main.rs b/contracts/benchmarks/large-storage/meta/src/main.rs
index fc0906971a..37d0f0ad71 100644
--- a/contracts/benchmarks/large-storage/meta/src/main.rs
+++ b/contracts/benchmarks/large-storage/meta/src/main.rs
@@ -1,3 +1,3 @@
 fn main() {
-    multiversx_sc_meta::cli_main::<large_storage::AbiProvider>();
+    multiversx_sc_meta_lib::cli_main::<large_storage::AbiProvider>();
 }
diff --git a/contracts/benchmarks/mappers/linked-list-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/linked-list-repeat/meta/Cargo.toml
index d79fe04af4..a55bf6ff24 100644
--- a/contracts/benchmarks/mappers/linked-list-repeat/meta/Cargo.toml
+++ b/contracts/benchmarks/mappers/linked-list-repeat/meta/Cargo.toml
@@ -8,7 +8,7 @@ publish = false
 [dependencies.linked-list-repeat]
 path = ".."
 
-[dependencies.multiversx-sc-meta]
+[dependencies.multiversx-sc-meta-lib]
 version = "0.50.3"
-path = "../../../../../framework/meta"
+path = "../../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/benchmarks/mappers/linked-list-repeat/meta/src/main.rs b/contracts/benchmarks/mappers/linked-list-repeat/meta/src/main.rs
index 1c807b9ca5..2daa700b93 100644
--- a/contracts/benchmarks/mappers/linked-list-repeat/meta/src/main.rs
+++ b/contracts/benchmarks/mappers/linked-list-repeat/meta/src/main.rs
@@ -1,3 +1,3 @@
 fn main() {
-    multiversx_sc_meta::cli_main::<linked_list_repeat::AbiProvider>();
+    multiversx_sc_meta_lib::cli_main::<linked_list_repeat::AbiProvider>();
 }
diff --git a/contracts/benchmarks/mappers/map-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/map-repeat/meta/Cargo.toml
index e229b431a8..51ac2a8289 100644
--- a/contracts/benchmarks/mappers/map-repeat/meta/Cargo.toml
+++ b/contracts/benchmarks/mappers/map-repeat/meta/Cargo.toml
@@ -8,7 +8,7 @@ publish = false
 [dependencies.map-repeat]
 path = ".."
 
-[dependencies.multiversx-sc-meta]
+[dependencies.multiversx-sc-meta-lib]
 version = "0.50.3"
-path = "../../../../../framework/meta"
+path = "../../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/benchmarks/mappers/map-repeat/meta/src/main.rs b/contracts/benchmarks/mappers/map-repeat/meta/src/main.rs
index 0ff660f2a3..5f7e77ee71 100644
--- a/contracts/benchmarks/mappers/map-repeat/meta/src/main.rs
+++ b/contracts/benchmarks/mappers/map-repeat/meta/src/main.rs
@@ -1,3 +1,3 @@
 fn main() {
-    multiversx_sc_meta::cli_main::<map_repeat::AbiProvider>();
+    multiversx_sc_meta_lib::cli_main::<map_repeat::AbiProvider>();
 }
diff --git a/contracts/benchmarks/mappers/queue-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/queue-repeat/meta/Cargo.toml
index aa48694147..88e57259b9 100644
--- a/contracts/benchmarks/mappers/queue-repeat/meta/Cargo.toml
+++ b/contracts/benchmarks/mappers/queue-repeat/meta/Cargo.toml
@@ -8,7 +8,7 @@ publish = false
 [dependencies.queue-repeat]
 path = ".."
 
-[dependencies.multiversx-sc-meta]
+[dependencies.multiversx-sc-meta-lib]
 version = "0.50.3"
-path = "../../../../../framework/meta"
+path = "../../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/benchmarks/mappers/queue-repeat/meta/src/main.rs b/contracts/benchmarks/mappers/queue-repeat/meta/src/main.rs
index ea11f70b22..d80481790a 100644
--- a/contracts/benchmarks/mappers/queue-repeat/meta/src/main.rs
+++ b/contracts/benchmarks/mappers/queue-repeat/meta/src/main.rs
@@ -1,3 +1,3 @@
 fn main() {
-    multiversx_sc_meta::cli_main::<queue_repeat::AbiProvider>();
+    multiversx_sc_meta_lib::cli_main::<queue_repeat::AbiProvider>();
 }
diff --git a/contracts/benchmarks/mappers/set-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/set-repeat/meta/Cargo.toml
index 64dec3d8e3..5d1766c590 100644
--- a/contracts/benchmarks/mappers/set-repeat/meta/Cargo.toml
+++ b/contracts/benchmarks/mappers/set-repeat/meta/Cargo.toml
@@ -8,7 +8,7 @@ publish = false
 [dependencies.set-repeat]
 path = ".."
 
-[dependencies.multiversx-sc-meta]
+[dependencies.multiversx-sc-meta-lib]
 version = "0.50.3"
-path = "../../../../../framework/meta"
+path = "../../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/benchmarks/mappers/set-repeat/meta/src/main.rs b/contracts/benchmarks/mappers/set-repeat/meta/src/main.rs
index a74da46b49..a93edece6c 100644
--- a/contracts/benchmarks/mappers/set-repeat/meta/src/main.rs
+++ b/contracts/benchmarks/mappers/set-repeat/meta/src/main.rs
@@ -1,3 +1,3 @@
 fn main() {
-    multiversx_sc_meta::cli_main::<set_repeat::AbiProvider>();
+    multiversx_sc_meta_lib::cli_main::<set_repeat::AbiProvider>();
 }
diff --git a/contracts/benchmarks/mappers/single-value-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/single-value-repeat/meta/Cargo.toml
index 8e8cc8c0d3..f715ca18b6 100644
--- a/contracts/benchmarks/mappers/single-value-repeat/meta/Cargo.toml
+++ b/contracts/benchmarks/mappers/single-value-repeat/meta/Cargo.toml
@@ -8,7 +8,7 @@ publish = false
 [dependencies.single-value-repeat]
 path = ".."
 
-[dependencies.multiversx-sc-meta]
+[dependencies.multiversx-sc-meta-lib]
 version = "0.50.3"
-path = "../../../../../framework/meta"
+path = "../../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/benchmarks/mappers/single-value-repeat/meta/src/main.rs b/contracts/benchmarks/mappers/single-value-repeat/meta/src/main.rs
index 2ac95acafb..6caf8e460b 100644
--- a/contracts/benchmarks/mappers/single-value-repeat/meta/src/main.rs
+++ b/contracts/benchmarks/mappers/single-value-repeat/meta/src/main.rs
@@ -1,3 +1,3 @@
 fn main() {
-    multiversx_sc_meta::cli_main::<single_value_repeat::AbiProvider>();
+    multiversx_sc_meta_lib::cli_main::<single_value_repeat::AbiProvider>();
 }
diff --git a/contracts/benchmarks/mappers/vec-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/vec-repeat/meta/Cargo.toml
index dfb197667d..a8cd88703e 100644
--- a/contracts/benchmarks/mappers/vec-repeat/meta/Cargo.toml
+++ b/contracts/benchmarks/mappers/vec-repeat/meta/Cargo.toml
@@ -7,7 +7,7 @@ publish = false
 [dependencies.vec-repeat]
 path = ".."
 
-[dependencies.multiversx-sc-meta]
+[dependencies.multiversx-sc-meta-lib]
 version = "0.50.3"
-path = "../../../../../framework/meta"
+path = "../../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/benchmarks/mappers/vec-repeat/meta/src/main.rs b/contracts/benchmarks/mappers/vec-repeat/meta/src/main.rs
index 6beb56de58..2eb69e96fa 100644
--- a/contracts/benchmarks/mappers/vec-repeat/meta/src/main.rs
+++ b/contracts/benchmarks/mappers/vec-repeat/meta/src/main.rs
@@ -1,3 +1,3 @@
 fn main() {
-    multiversx_sc_meta::cli_main::<vec_repeat::AbiProvider>();
+    multiversx_sc_meta_lib::cli_main::<vec_repeat::AbiProvider>();
 }
diff --git a/contracts/benchmarks/send-tx-repeat/meta/Cargo.toml b/contracts/benchmarks/send-tx-repeat/meta/Cargo.toml
index b2994c7fa3..133eb29cd4 100644
--- a/contracts/benchmarks/send-tx-repeat/meta/Cargo.toml
+++ b/contracts/benchmarks/send-tx-repeat/meta/Cargo.toml
@@ -7,7 +7,7 @@ publish = false
 [dependencies.send-tx-repeat]
 path = ".."
 
-[dependencies.multiversx-sc-meta]
+[dependencies.multiversx-sc-meta-lib]
 version = "0.50.3"
-path = "../../../../framework/meta"
+path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/benchmarks/send-tx-repeat/meta/src/main.rs b/contracts/benchmarks/send-tx-repeat/meta/src/main.rs
index 4243a30329..37a1002695 100644
--- a/contracts/benchmarks/send-tx-repeat/meta/src/main.rs
+++ b/contracts/benchmarks/send-tx-repeat/meta/src/main.rs
@@ -1,3 +1,3 @@
 fn main() {
-    multiversx_sc_meta::cli_main::<send_tx_repeat::AbiProvider>();
+    multiversx_sc_meta_lib::cli_main::<send_tx_repeat::AbiProvider>();
 }
diff --git a/contracts/benchmarks/str-repeat/meta/Cargo.toml b/contracts/benchmarks/str-repeat/meta/Cargo.toml
index a542954366..a4ef451bd6 100644
--- a/contracts/benchmarks/str-repeat/meta/Cargo.toml
+++ b/contracts/benchmarks/str-repeat/meta/Cargo.toml
@@ -7,7 +7,7 @@ publish = false
 [dependencies.str-repeat]
 path = ".."
 
-[dependencies.multiversx-sc-meta]
+[dependencies.multiversx-sc-meta-lib]
 version = "0.50.3"
-path = "../../../../framework/meta"
+path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/benchmarks/str-repeat/meta/src/main.rs b/contracts/benchmarks/str-repeat/meta/src/main.rs
index c2a54d0039..327abc92ad 100644
--- a/contracts/benchmarks/str-repeat/meta/src/main.rs
+++ b/contracts/benchmarks/str-repeat/meta/src/main.rs
@@ -1,3 +1,3 @@
 fn main() {
-    multiversx_sc_meta::cli_main::<str_repeat::AbiProvider>();
+    multiversx_sc_meta_lib::cli_main::<str_repeat::AbiProvider>();
 }
diff --git a/contracts/core/price-aggregator/meta/Cargo.toml b/contracts/core/price-aggregator/meta/Cargo.toml
index 3a7b67ebd7..b2dcd6beaa 100644
--- a/contracts/core/price-aggregator/meta/Cargo.toml
+++ b/contracts/core/price-aggregator/meta/Cargo.toml
@@ -11,7 +11,7 @@ path = ".."
 version = "0.50.3"
 path = "../../../../framework/base"
 
-[dependencies.multiversx-sc-meta]
+[dependencies.multiversx-sc-meta-lib]
 version = "0.50.3"
-path = "../../../../framework/meta"
+path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/core/price-aggregator/meta/src/main.rs b/contracts/core/price-aggregator/meta/src/main.rs
index 85ac9819bf..9601681127 100644
--- a/contracts/core/price-aggregator/meta/src/main.rs
+++ b/contracts/core/price-aggregator/meta/src/main.rs
@@ -1,3 +1,3 @@
 fn main() {
-    multiversx_sc_meta::cli_main::<multiversx_price_aggregator_sc::AbiProvider>();
+    multiversx_sc_meta_lib::cli_main::<multiversx_price_aggregator_sc::AbiProvider>();
 }
diff --git a/contracts/core/wegld-swap/meta/Cargo.toml b/contracts/core/wegld-swap/meta/Cargo.toml
index 25c19fb675..35cce5da6e 100644
--- a/contracts/core/wegld-swap/meta/Cargo.toml
+++ b/contracts/core/wegld-swap/meta/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "multiversx-wegld-swap-sc-meta"
 version = "0.0.0"
-authors = [ "Dorin Iancu <dorin.iancu@multiversx.com>",]
+authors = ["Dorin Iancu <dorin.iancu@multiversx.com>"]
 edition = "2021"
 publish = false
 
@@ -14,7 +14,7 @@ path = ".."
 version = "0.50.3"
 path = "../../../../framework/base"
 
-[dependencies.multiversx-sc-meta]
+[dependencies.multiversx-sc-meta-lib]
 version = "0.50.3"
-path = "../../../../framework/meta"
+path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/core/wegld-swap/meta/src/main.rs b/contracts/core/wegld-swap/meta/src/main.rs
index c3eb0f142e..9f4ea3ba2a 100644
--- a/contracts/core/wegld-swap/meta/src/main.rs
+++ b/contracts/core/wegld-swap/meta/src/main.rs
@@ -1,3 +1,3 @@
 fn main() {
-    multiversx_sc_meta::cli_main::<multiversx_wegld_swap_sc::AbiProvider>();
+    multiversx_sc_meta_lib::cli_main::<multiversx_wegld_swap_sc::AbiProvider>();
 }
diff --git a/contracts/examples/adder/meta/Cargo.toml b/contracts/examples/adder/meta/Cargo.toml
index 7ccbfc2235..964ddb176f 100644
--- a/contracts/examples/adder/meta/Cargo.toml
+++ b/contracts/examples/adder/meta/Cargo.toml
@@ -7,7 +7,7 @@ publish = false
 [dependencies.adder]
 path = ".."
 
-[dependencies.multiversx-sc-meta]
+[dependencies.multiversx-sc-meta-lib]
 version = "0.50.3"
-path = "../../../../framework/meta"
+path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/adder/meta/src/main.rs b/contracts/examples/adder/meta/src/main.rs
index a6cf7d2836..f37dd97362 100644
--- a/contracts/examples/adder/meta/src/main.rs
+++ b/contracts/examples/adder/meta/src/main.rs
@@ -1,3 +1,3 @@
 fn main() {
-    multiversx_sc_meta::cli_main::<adder::AbiProvider>();
+    multiversx_sc_meta_lib::cli_main::<adder::AbiProvider>();
 }
diff --git a/contracts/examples/bonding-curve-contract/meta/Cargo.toml b/contracts/examples/bonding-curve-contract/meta/Cargo.toml
index 5eeb79e4f4..e9b82637a6 100644
--- a/contracts/examples/bonding-curve-contract/meta/Cargo.toml
+++ b/contracts/examples/bonding-curve-contract/meta/Cargo.toml
@@ -8,7 +8,7 @@ publish = false
 [dependencies.bonding-curve-contract]
 path = ".."
 
-[dependencies.multiversx-sc-meta]
+[dependencies.multiversx-sc-meta-lib]
 version = "0.50.3"
-path = "../../../../framework/meta"
+path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/bonding-curve-contract/meta/src/main.rs b/contracts/examples/bonding-curve-contract/meta/src/main.rs
index 3dbf1a6723..18eedf0a32 100644
--- a/contracts/examples/bonding-curve-contract/meta/src/main.rs
+++ b/contracts/examples/bonding-curve-contract/meta/src/main.rs
@@ -1,3 +1,3 @@
 fn main() {
-    multiversx_sc_meta::cli_main::<bonding_curve_contract::AbiProvider>();
+    multiversx_sc_meta_lib::cli_main::<bonding_curve_contract::AbiProvider>();
 }
diff --git a/contracts/examples/check-pause/meta/Cargo.toml b/contracts/examples/check-pause/meta/Cargo.toml
index 84f5718962..2601f0bd94 100644
--- a/contracts/examples/check-pause/meta/Cargo.toml
+++ b/contracts/examples/check-pause/meta/Cargo.toml
@@ -8,7 +8,7 @@ authors = ["Alin Cruceat <alin.cruceat@multiversx.com>"]
 [dependencies.check-pause]
 path = ".."
 
-[dependencies.multiversx-sc-meta]
+[dependencies.multiversx-sc-meta-lib]
 version = "0.50.3"
-path = "../../../../framework/meta"
+path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/check-pause/meta/src/main.rs b/contracts/examples/check-pause/meta/src/main.rs
index 50f10f59cb..d37ef9c9b0 100644
--- a/contracts/examples/check-pause/meta/src/main.rs
+++ b/contracts/examples/check-pause/meta/src/main.rs
@@ -1,3 +1,3 @@
 fn main() {
-    multiversx_sc_meta::cli_main::<check_pause::AbiProvider>();
+    multiversx_sc_meta_lib::cli_main::<check_pause::AbiProvider>();
 }
diff --git a/contracts/examples/crowdfunding-esdt/meta/Cargo.toml b/contracts/examples/crowdfunding-esdt/meta/Cargo.toml
index d169b02e56..fb5196e7e8 100644
--- a/contracts/examples/crowdfunding-esdt/meta/Cargo.toml
+++ b/contracts/examples/crowdfunding-esdt/meta/Cargo.toml
@@ -8,7 +8,7 @@ publish = false
 [dependencies.crowdfunding-esdt]
 path = ".."
 
-[dependencies.multiversx-sc-meta]
+[dependencies.multiversx-sc-meta-lib]
 version = "0.50.3"
-path = "../../../../framework/meta"
+path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/crowdfunding-esdt/meta/src/main.rs b/contracts/examples/crowdfunding-esdt/meta/src/main.rs
index 7635e097f5..cd0281368b 100644
--- a/contracts/examples/crowdfunding-esdt/meta/src/main.rs
+++ b/contracts/examples/crowdfunding-esdt/meta/src/main.rs
@@ -1,3 +1,3 @@
 fn main() {
-    multiversx_sc_meta::cli_main::<crowdfunding_esdt::AbiProvider>();
+    multiversx_sc_meta_lib::cli_main::<crowdfunding_esdt::AbiProvider>();
 }
diff --git a/contracts/examples/crypto-bubbles/meta/Cargo.toml b/contracts/examples/crypto-bubbles/meta/Cargo.toml
index 0c89065fab..50438e8b93 100644
--- a/contracts/examples/crypto-bubbles/meta/Cargo.toml
+++ b/contracts/examples/crypto-bubbles/meta/Cargo.toml
@@ -8,7 +8,7 @@ publish = false
 [dependencies.crypto-bubbles]
 path = ".."
 
-[dependencies.multiversx-sc-meta]
+[dependencies.multiversx-sc-meta-lib]
 version = "0.50.3"
-path = "../../../../framework/meta"
+path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/crypto-bubbles/meta/src/main.rs b/contracts/examples/crypto-bubbles/meta/src/main.rs
index 7f34c36f5e..c268a4df82 100644
--- a/contracts/examples/crypto-bubbles/meta/src/main.rs
+++ b/contracts/examples/crypto-bubbles/meta/src/main.rs
@@ -1,3 +1,3 @@
 fn main() {
-    multiversx_sc_meta::cli_main::<crypto_bubbles::AbiProvider>();
+    multiversx_sc_meta_lib::cli_main::<crypto_bubbles::AbiProvider>();
 }
diff --git a/contracts/examples/crypto-kitties/kitty-auction/meta/Cargo.toml b/contracts/examples/crypto-kitties/kitty-auction/meta/Cargo.toml
index 907017a8c6..020d0c7b69 100644
--- a/contracts/examples/crypto-kitties/kitty-auction/meta/Cargo.toml
+++ b/contracts/examples/crypto-kitties/kitty-auction/meta/Cargo.toml
@@ -7,7 +7,7 @@ publish = false
 [dependencies.kitty-auction]
 path = ".."
 
-[dependencies.multiversx-sc-meta]
+[dependencies.multiversx-sc-meta-lib]
 version = "0.50.3"
-path = "../../../../../framework/meta"
+path = "../../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/crypto-kitties/kitty-auction/meta/src/main.rs b/contracts/examples/crypto-kitties/kitty-auction/meta/src/main.rs
index 805ea84af4..70f1f93905 100644
--- a/contracts/examples/crypto-kitties/kitty-auction/meta/src/main.rs
+++ b/contracts/examples/crypto-kitties/kitty-auction/meta/src/main.rs
@@ -1,3 +1,3 @@
 fn main() {
-    multiversx_sc_meta::cli_main::<kitty_auction::AbiProvider>();
+    multiversx_sc_meta_lib::cli_main::<kitty_auction::AbiProvider>();
 }
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 ffc0ed059d..9b058ec764 100644
--- a/contracts/examples/crypto-kitties/kitty-genetic-alg/meta/Cargo.toml
+++ b/contracts/examples/crypto-kitties/kitty-genetic-alg/meta/Cargo.toml
@@ -7,7 +7,7 @@ publish = false
 [dependencies.kitty-genetic-alg]
 path = ".."
 
-[dependencies.multiversx-sc-meta]
+[dependencies.multiversx-sc-meta-lib]
 version = "0.50.3"
-path = "../../../../../framework/meta"
+path = "../../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/crypto-kitties/kitty-genetic-alg/meta/src/main.rs b/contracts/examples/crypto-kitties/kitty-genetic-alg/meta/src/main.rs
index f76b8cd276..fe50a0adc3 100644
--- a/contracts/examples/crypto-kitties/kitty-genetic-alg/meta/src/main.rs
+++ b/contracts/examples/crypto-kitties/kitty-genetic-alg/meta/src/main.rs
@@ -1,3 +1,3 @@
 fn main() {
-    multiversx_sc_meta::cli_main::<kitty_genetic_alg::AbiProvider>();
+    multiversx_sc_meta_lib::cli_main::<kitty_genetic_alg::AbiProvider>();
 }
diff --git a/contracts/examples/crypto-kitties/kitty-ownership/meta/Cargo.toml b/contracts/examples/crypto-kitties/kitty-ownership/meta/Cargo.toml
index d4a9dafff3..25b9c6249f 100644
--- a/contracts/examples/crypto-kitties/kitty-ownership/meta/Cargo.toml
+++ b/contracts/examples/crypto-kitties/kitty-ownership/meta/Cargo.toml
@@ -7,7 +7,7 @@ publish = false
 [dependencies.kitty-ownership]
 path = ".."
 
-[dependencies.multiversx-sc-meta]
+[dependencies.multiversx-sc-meta-lib]
 version = "0.50.3"
-path = "../../../../../framework/meta"
+path = "../../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/crypto-kitties/kitty-ownership/meta/src/main.rs b/contracts/examples/crypto-kitties/kitty-ownership/meta/src/main.rs
index c359ae2aa3..5eb09861d7 100644
--- a/contracts/examples/crypto-kitties/kitty-ownership/meta/src/main.rs
+++ b/contracts/examples/crypto-kitties/kitty-ownership/meta/src/main.rs
@@ -1,3 +1,3 @@
 fn main() {
-    multiversx_sc_meta::cli_main::<kitty_ownership::AbiProvider>();
+    multiversx_sc_meta_lib::cli_main::<kitty_ownership::AbiProvider>();
 }
diff --git a/contracts/examples/crypto-zombies/meta/Cargo.toml b/contracts/examples/crypto-zombies/meta/Cargo.toml
index 5aafb98042..4217bec978 100644
--- a/contracts/examples/crypto-zombies/meta/Cargo.toml
+++ b/contracts/examples/crypto-zombies/meta/Cargo.toml
@@ -7,7 +7,7 @@ publish = false
 [dependencies.crypto-zombies]
 path = ".."
 
-[dependencies.multiversx-sc-meta]
+[dependencies.multiversx-sc-meta-lib]
 version = "0.50.3"
-path = "../../../../framework/meta"
+path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/crypto-zombies/meta/src/main.rs b/contracts/examples/crypto-zombies/meta/src/main.rs
index 0956e125b8..641824afd5 100644
--- a/contracts/examples/crypto-zombies/meta/src/main.rs
+++ b/contracts/examples/crypto-zombies/meta/src/main.rs
@@ -1,3 +1,3 @@
 fn main() {
-    multiversx_sc_meta::cli_main::<crypto_zombies::AbiProvider>();
+    multiversx_sc_meta_lib::cli_main::<crypto_zombies::AbiProvider>();
 }
diff --git a/contracts/examples/digital-cash/meta/Cargo.toml b/contracts/examples/digital-cash/meta/Cargo.toml
index 19f8f49b4c..fb6598dae8 100644
--- a/contracts/examples/digital-cash/meta/Cargo.toml
+++ b/contracts/examples/digital-cash/meta/Cargo.toml
@@ -7,7 +7,7 @@ publish = false
 [dependencies.digital-cash]
 path = ".."
 
-[dependencies.multiversx-sc-meta]
+[dependencies.multiversx-sc-meta-lib]
 version = "0.50.3"
-path = "../../../../framework/meta"
+path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/digital-cash/meta/src/main.rs b/contracts/examples/digital-cash/meta/src/main.rs
index 9f6b55a146..80034d4166 100644
--- a/contracts/examples/digital-cash/meta/src/main.rs
+++ b/contracts/examples/digital-cash/meta/src/main.rs
@@ -1,3 +1,3 @@
 fn main() {
-    multiversx_sc_meta::cli_main::<digital_cash::AbiProvider>();
+    multiversx_sc_meta_lib::cli_main::<digital_cash::AbiProvider>();
 }
diff --git a/contracts/examples/empty/meta/Cargo.toml b/contracts/examples/empty/meta/Cargo.toml
index cd3af23194..f2feb5a778 100644
--- a/contracts/examples/empty/meta/Cargo.toml
+++ b/contracts/examples/empty/meta/Cargo.toml
@@ -7,7 +7,7 @@ publish = false
 [dependencies.empty]
 path = ".."
 
-[dependencies.multiversx-sc-meta]
+[dependencies.multiversx-sc-meta-lib]
 version = "0.50.3"
-path = "../../../../framework/meta"
+path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/empty/meta/src/main.rs b/contracts/examples/empty/meta/src/main.rs
index a3d16d95b7..a55dac23e4 100644
--- a/contracts/examples/empty/meta/src/main.rs
+++ b/contracts/examples/empty/meta/src/main.rs
@@ -1,3 +1,3 @@
 fn main() {
-    multiversx_sc_meta::cli_main::<empty::AbiProvider>();
+    multiversx_sc_meta_lib::cli_main::<empty::AbiProvider>();
 }
diff --git a/contracts/examples/esdt-transfer-with-fee/meta/Cargo.toml b/contracts/examples/esdt-transfer-with-fee/meta/Cargo.toml
index 0d33614504..30269c91cc 100644
--- a/contracts/examples/esdt-transfer-with-fee/meta/Cargo.toml
+++ b/contracts/examples/esdt-transfer-with-fee/meta/Cargo.toml
@@ -7,7 +7,7 @@ publish = false
 [dependencies.esdt-transfer-with-fee]
 path = ".."
 
-[dependencies.multiversx-sc-meta]
+[dependencies.multiversx-sc-meta-lib]
 version = "0.50.3"
-path = "../../../../framework/meta"
+path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/esdt-transfer-with-fee/meta/src/main.rs b/contracts/examples/esdt-transfer-with-fee/meta/src/main.rs
index da77d93289..b700a37abf 100644
--- a/contracts/examples/esdt-transfer-with-fee/meta/src/main.rs
+++ b/contracts/examples/esdt-transfer-with-fee/meta/src/main.rs
@@ -1,3 +1,3 @@
 fn main() {
-    multiversx_sc_meta::cli_main::<esdt_transfer_with_fee::AbiProvider>();
+    multiversx_sc_meta_lib::cli_main::<esdt_transfer_with_fee::AbiProvider>();
 }
diff --git a/contracts/examples/factorial/meta/Cargo.toml b/contracts/examples/factorial/meta/Cargo.toml
index d99b96bfde..9112d4c849 100644
--- a/contracts/examples/factorial/meta/Cargo.toml
+++ b/contracts/examples/factorial/meta/Cargo.toml
@@ -8,7 +8,7 @@ publish = false
 [dependencies.factorial]
 path = ".."
 
-[dependencies.multiversx-sc-meta]
+[dependencies.multiversx-sc-meta-lib]
 version = "0.50.3"
-path = "../../../../framework/meta"
+path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/factorial/meta/src/main.rs b/contracts/examples/factorial/meta/src/main.rs
index b7e3589c2e..9e424513d7 100644
--- a/contracts/examples/factorial/meta/src/main.rs
+++ b/contracts/examples/factorial/meta/src/main.rs
@@ -1,3 +1,3 @@
 fn main() {
-    multiversx_sc_meta::cli_main::<factorial::AbiProvider>();
+    multiversx_sc_meta_lib::cli_main::<factorial::AbiProvider>();
 }
diff --git a/contracts/examples/fractional-nfts/meta/Cargo.toml b/contracts/examples/fractional-nfts/meta/Cargo.toml
index d99acbe31d..2ec515bbc0 100644
--- a/contracts/examples/fractional-nfts/meta/Cargo.toml
+++ b/contracts/examples/fractional-nfts/meta/Cargo.toml
@@ -8,7 +8,7 @@ publish = false
 [dependencies.fractional-nfts]
 path = ".."
 
-[dependencies.multiversx-sc-meta]
+[dependencies.multiversx-sc-meta-lib]
 version = "0.50.3"
-path = "../../../../framework/meta"
+path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/fractional-nfts/meta/src/main.rs b/contracts/examples/fractional-nfts/meta/src/main.rs
index 52ba34ff9b..02ab671c13 100644
--- a/contracts/examples/fractional-nfts/meta/src/main.rs
+++ b/contracts/examples/fractional-nfts/meta/src/main.rs
@@ -1,3 +1,3 @@
 fn main() {
-    multiversx_sc_meta::cli_main::<fractional_nfts::AbiProvider>();
+    multiversx_sc_meta_lib::cli_main::<fractional_nfts::AbiProvider>();
 }
diff --git a/contracts/examples/lottery-esdt/meta/Cargo.toml b/contracts/examples/lottery-esdt/meta/Cargo.toml
index 49563e9eff..7e9ec5ec69 100644
--- a/contracts/examples/lottery-esdt/meta/Cargo.toml
+++ b/contracts/examples/lottery-esdt/meta/Cargo.toml
@@ -8,7 +8,7 @@ publish = false
 [dependencies.lottery-esdt]
 path = ".."
 
-[dependencies.multiversx-sc-meta]
+[dependencies.multiversx-sc-meta-lib]
 version = "0.50.3"
-path = "../../../../framework/meta"
+path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/lottery-esdt/meta/src/main.rs b/contracts/examples/lottery-esdt/meta/src/main.rs
index 65c466719d..e1da5acd0b 100644
--- a/contracts/examples/lottery-esdt/meta/src/main.rs
+++ b/contracts/examples/lottery-esdt/meta/src/main.rs
@@ -1,3 +1,3 @@
 fn main() {
-    multiversx_sc_meta::cli_main::<lottery_esdt::AbiProvider>();
+    multiversx_sc_meta_lib::cli_main::<lottery_esdt::AbiProvider>();
 }
diff --git a/contracts/examples/multisig/meta/Cargo.toml b/contracts/examples/multisig/meta/Cargo.toml
index 802117ccb1..491eb95b25 100644
--- a/contracts/examples/multisig/meta/Cargo.toml
+++ b/contracts/examples/multisig/meta/Cargo.toml
@@ -8,7 +8,7 @@ publish = false
 [dependencies.multisig]
 path = ".."
 
-[dependencies.multiversx-sc-meta]
+[dependencies.multiversx-sc-meta-lib]
 version = "0.50.3"
-path = "../../../../framework/meta"
+path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/multisig/meta/src/main.rs b/contracts/examples/multisig/meta/src/main.rs
index 69a0a648b1..8719674b92 100644
--- a/contracts/examples/multisig/meta/src/main.rs
+++ b/contracts/examples/multisig/meta/src/main.rs
@@ -1,3 +1,3 @@
 fn main() {
-    multiversx_sc_meta::cli_main::<multisig::AbiProvider>();
+    multiversx_sc_meta_lib::cli_main::<multisig::AbiProvider>();
 }
diff --git a/contracts/examples/nft-minter/meta/Cargo.toml b/contracts/examples/nft-minter/meta/Cargo.toml
index b415b035e7..2c48a69050 100644
--- a/contracts/examples/nft-minter/meta/Cargo.toml
+++ b/contracts/examples/nft-minter/meta/Cargo.toml
@@ -8,7 +8,7 @@ publish = false
 [dependencies.nft-minter]
 path = ".."
 
-[dependencies.multiversx-sc-meta]
+[dependencies.multiversx-sc-meta-lib]
 version = "0.50.3"
-path = "../../../../framework/meta"
+path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/nft-minter/meta/src/main.rs b/contracts/examples/nft-minter/meta/src/main.rs
index 188f37dfb7..db7c559131 100644
--- a/contracts/examples/nft-minter/meta/src/main.rs
+++ b/contracts/examples/nft-minter/meta/src/main.rs
@@ -1,3 +1,3 @@
 fn main() {
-    multiversx_sc_meta::cli_main::<nft_minter::AbiProvider>();
+    multiversx_sc_meta_lib::cli_main::<nft_minter::AbiProvider>();
 }
diff --git a/contracts/examples/nft-storage-prepay/meta/Cargo.toml b/contracts/examples/nft-storage-prepay/meta/Cargo.toml
index 7bf64b93db..e158c72588 100644
--- a/contracts/examples/nft-storage-prepay/meta/Cargo.toml
+++ b/contracts/examples/nft-storage-prepay/meta/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "nft-storage-prepay-meta"
 version = "0.0.0"
-authors = [ "Dorin Iancu <dorin.iancu@multiversx.com>",]
+authors = ["Dorin Iancu <dorin.iancu@multiversx.com>"]
 edition = "2021"
 publish = false
 
@@ -10,7 +10,7 @@ publish = false
 [dependencies.nft-storage-prepay]
 path = ".."
 
-[dependencies.multiversx-sc-meta]
+[dependencies.multiversx-sc-meta-lib]
 version = "0.50.3"
-path = "../../../../framework/meta"
+path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/nft-storage-prepay/meta/src/main.rs b/contracts/examples/nft-storage-prepay/meta/src/main.rs
index 4624ae5199..76e9d39bcf 100644
--- a/contracts/examples/nft-storage-prepay/meta/src/main.rs
+++ b/contracts/examples/nft-storage-prepay/meta/src/main.rs
@@ -1,3 +1,3 @@
 fn main() {
-    multiversx_sc_meta::cli_main::<nft_storage_prepay::AbiProvider>();
+    multiversx_sc_meta_lib::cli_main::<nft_storage_prepay::AbiProvider>();
 }
diff --git a/contracts/examples/nft-subscription/meta/Cargo.toml b/contracts/examples/nft-subscription/meta/Cargo.toml
index 0f505d5751..c8df6df7d8 100644
--- a/contracts/examples/nft-subscription/meta/Cargo.toml
+++ b/contracts/examples/nft-subscription/meta/Cargo.toml
@@ -8,7 +8,7 @@ publish = false
 [dependencies.nft-subscription]
 path = ".."
 
-[dependencies.multiversx-sc-meta]
+[dependencies.multiversx-sc-meta-lib]
 version = "0.50.3"
-path = "../../../../framework/meta"
+path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/nft-subscription/meta/src/main.rs b/contracts/examples/nft-subscription/meta/src/main.rs
index 27c3b0f0ad..0efbdfc0de 100644
--- a/contracts/examples/nft-subscription/meta/src/main.rs
+++ b/contracts/examples/nft-subscription/meta/src/main.rs
@@ -1,3 +1,3 @@
 fn main() {
-    multiversx_sc_meta::cli_main::<nft_subscription::AbiProvider>();
+    multiversx_sc_meta_lib::cli_main::<nft_subscription::AbiProvider>();
 }
diff --git a/contracts/examples/order-book/factory/meta/Cargo.toml b/contracts/examples/order-book/factory/meta/Cargo.toml
index 8644069281..269cf88d2d 100644
--- a/contracts/examples/order-book/factory/meta/Cargo.toml
+++ b/contracts/examples/order-book/factory/meta/Cargo.toml
@@ -8,7 +8,7 @@ publish = false
 [dependencies.order-book-factory]
 path = ".."
 
-[dependencies.multiversx-sc-meta]
+[dependencies.multiversx-sc-meta-lib]
 version = "0.50.3"
-path = "../../../../../framework/meta"
+path = "../../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/order-book/factory/meta/src/main.rs b/contracts/examples/order-book/factory/meta/src/main.rs
index c085aa4118..d0e77f9c9e 100644
--- a/contracts/examples/order-book/factory/meta/src/main.rs
+++ b/contracts/examples/order-book/factory/meta/src/main.rs
@@ -1,3 +1,3 @@
 fn main() {
-    multiversx_sc_meta::cli_main::<order_book_factory::AbiProvider>();
+    multiversx_sc_meta_lib::cli_main::<order_book_factory::AbiProvider>();
 }
diff --git a/contracts/examples/order-book/pair/meta/Cargo.toml b/contracts/examples/order-book/pair/meta/Cargo.toml
index e5478f1371..e1d7d8abd6 100644
--- a/contracts/examples/order-book/pair/meta/Cargo.toml
+++ b/contracts/examples/order-book/pair/meta/Cargo.toml
@@ -8,7 +8,7 @@ publish = false
 [dependencies.order-book-pair]
 path = ".."
 
-[dependencies.multiversx-sc-meta]
+[dependencies.multiversx-sc-meta-lib]
 version = "0.50.3"
-path = "../../../../../framework/meta"
+path = "../../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/order-book/pair/meta/src/main.rs b/contracts/examples/order-book/pair/meta/src/main.rs
index 7d149c79e1..79d63c3360 100644
--- a/contracts/examples/order-book/pair/meta/src/main.rs
+++ b/contracts/examples/order-book/pair/meta/src/main.rs
@@ -1,3 +1,3 @@
 fn main() {
-    multiversx_sc_meta::cli_main::<order_book_pair::AbiProvider>();
+    multiversx_sc_meta_lib::cli_main::<order_book_pair::AbiProvider>();
 }
diff --git a/contracts/examples/ping-pong-egld/meta/Cargo.toml b/contracts/examples/ping-pong-egld/meta/Cargo.toml
index 17bdc63bf0..f754237755 100644
--- a/contracts/examples/ping-pong-egld/meta/Cargo.toml
+++ b/contracts/examples/ping-pong-egld/meta/Cargo.toml
@@ -1,14 +1,14 @@
 [package]
 name = "ping-pong-egld-meta"
 version = "0.0.0"
-authors = [ "Bruda Claudiu-Marcel <claudiu725@yahoo.com>",]
+authors = ["Bruda Claudiu-Marcel <claudiu725@yahoo.com>"]
 edition = "2021"
 publish = false
 
 [dependencies.ping-pong-egld]
 path = ".."
 
-[dependencies.multiversx-sc-meta]
+[dependencies.multiversx-sc-meta-lib]
 version = "0.50.3"
-path = "../../../../framework/meta"
+path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/ping-pong-egld/meta/src/main.rs b/contracts/examples/ping-pong-egld/meta/src/main.rs
index e3f5dae33e..677f71931c 100644
--- a/contracts/examples/ping-pong-egld/meta/src/main.rs
+++ b/contracts/examples/ping-pong-egld/meta/src/main.rs
@@ -1,3 +1,3 @@
 fn main() {
-    multiversx_sc_meta::cli_main::<ping_pong_egld::AbiProvider>();
+    multiversx_sc_meta_lib::cli_main::<ping_pong_egld::AbiProvider>();
 }
diff --git a/contracts/examples/proxy-pause/meta/Cargo.toml b/contracts/examples/proxy-pause/meta/Cargo.toml
index cf63a07410..f601641135 100644
--- a/contracts/examples/proxy-pause/meta/Cargo.toml
+++ b/contracts/examples/proxy-pause/meta/Cargo.toml
@@ -3,14 +3,14 @@ name = "proxy-pause-meta"
 version = "0.0.0"
 edition = "2021"
 publish = false
-authors = [ "you",]
+authors = ["you"]
 
 [dev-dependencies]
 
 [dependencies.proxy-pause]
 path = ".."
 
-[dependencies.multiversx-sc-meta]
+[dependencies.multiversx-sc-meta-lib]
 version = "0.50.3"
-path = "../../../../framework/meta"
+path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/proxy-pause/meta/src/main.rs b/contracts/examples/proxy-pause/meta/src/main.rs
index 979554a4d6..35592a5361 100644
--- a/contracts/examples/proxy-pause/meta/src/main.rs
+++ b/contracts/examples/proxy-pause/meta/src/main.rs
@@ -1,3 +1,3 @@
 fn main() {
-    multiversx_sc_meta::cli_main::<proxy_pause::AbiProvider>();
+    multiversx_sc_meta_lib::cli_main::<proxy_pause::AbiProvider>();
 }
diff --git a/contracts/examples/rewards-distribution/meta/Cargo.toml b/contracts/examples/rewards-distribution/meta/Cargo.toml
index 7f37104231..09009356f9 100644
--- a/contracts/examples/rewards-distribution/meta/Cargo.toml
+++ b/contracts/examples/rewards-distribution/meta/Cargo.toml
@@ -10,7 +10,7 @@ authors = ["Claudiu-Marcel Bruda <claudiu.bruda@multiversx.com>"]
 [dependencies.rewards-distribution]
 path = ".."
 
-[dependencies.multiversx-sc-meta]
+[dependencies.multiversx-sc-meta-lib]
 version = "0.50.3"
-path = "../../../../framework/meta"
+path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/rewards-distribution/meta/src/main.rs b/contracts/examples/rewards-distribution/meta/src/main.rs
index a0d8c4d099..91955a1efd 100644
--- a/contracts/examples/rewards-distribution/meta/src/main.rs
+++ b/contracts/examples/rewards-distribution/meta/src/main.rs
@@ -1,3 +1,3 @@
 fn main() {
-    multiversx_sc_meta::cli_main::<rewards_distribution::AbiProvider>();
+    multiversx_sc_meta_lib::cli_main::<rewards_distribution::AbiProvider>();
 }
diff --git a/contracts/examples/seed-nft-minter/meta/Cargo.toml b/contracts/examples/seed-nft-minter/meta/Cargo.toml
index 070b77053a..69787cc915 100644
--- a/contracts/examples/seed-nft-minter/meta/Cargo.toml
+++ b/contracts/examples/seed-nft-minter/meta/Cargo.toml
@@ -10,7 +10,7 @@ authors = ["Claudiu-Marcel Bruda <claudiu.bruda@multiversx.com>"]
 [dependencies.seed-nft-minter]
 path = ".."
 
-[dependencies.multiversx-sc-meta]
+[dependencies.multiversx-sc-meta-lib]
 version = "0.50.3"
-path = "../../../../framework/meta"
+path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/seed-nft-minter/meta/src/main.rs b/contracts/examples/seed-nft-minter/meta/src/main.rs
index 8d7ab4b957..b8cc68fd11 100644
--- a/contracts/examples/seed-nft-minter/meta/src/main.rs
+++ b/contracts/examples/seed-nft-minter/meta/src/main.rs
@@ -1,3 +1,3 @@
 fn main() {
-    multiversx_sc_meta::cli_main::<seed_nft_minter::AbiProvider>();
+    multiversx_sc_meta_lib::cli_main::<seed_nft_minter::AbiProvider>();
 }
diff --git a/contracts/examples/token-release/meta/Cargo.toml b/contracts/examples/token-release/meta/Cargo.toml
index d0ae6ad19c..5b814916b4 100644
--- a/contracts/examples/token-release/meta/Cargo.toml
+++ b/contracts/examples/token-release/meta/Cargo.toml
@@ -9,8 +9,7 @@ publish = false
 [dependencies.token-release]
 path = ".."
 
-[dependencies.multiversx-sc-meta]
+[dependencies.multiversx-sc-meta-lib]
 version = "0.50.3"
-path = "../../../../framework/meta"
+path = "../../../../framework/meta-lib"
 default-features = false
-
diff --git a/contracts/examples/token-release/meta/src/main.rs b/contracts/examples/token-release/meta/src/main.rs
index 5d201501f4..1cbd2f7583 100644
--- a/contracts/examples/token-release/meta/src/main.rs
+++ b/contracts/examples/token-release/meta/src/main.rs
@@ -1,3 +1,3 @@
 fn main() {
-    multiversx_sc_meta::cli_main::<token_release::AbiProvider>();
+    multiversx_sc_meta_lib::cli_main::<token_release::AbiProvider>();
 }
diff --git a/contracts/feature-tests/abi-tester/meta/Cargo.toml b/contracts/feature-tests/abi-tester/meta/Cargo.toml
index c5268926ac..643984beaf 100644
--- a/contracts/feature-tests/abi-tester/meta/Cargo.toml
+++ b/contracts/feature-tests/abi-tester/meta/Cargo.toml
@@ -8,7 +8,7 @@ publish = false
 [dependencies.abi-tester]
 path = ".."
 
-[dependencies.multiversx-sc-meta]
+[dependencies.multiversx-sc-meta-lib]
 version = "0.50.3"
-path = "../../../../framework/meta"
+path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/feature-tests/abi-tester/meta/src/main.rs b/contracts/feature-tests/abi-tester/meta/src/main.rs
index 94f485814b..f1525e90f9 100644
--- a/contracts/feature-tests/abi-tester/meta/src/main.rs
+++ b/contracts/feature-tests/abi-tester/meta/src/main.rs
@@ -1,3 +1,3 @@
 fn main() {
-    multiversx_sc_meta::cli_main::<abi_tester::AbiProvider>();
+    multiversx_sc_meta_lib::cli_main::<abi_tester::AbiProvider>();
 }
diff --git a/contracts/feature-tests/alloc-features/meta/Cargo.toml b/contracts/feature-tests/alloc-features/meta/Cargo.toml
index 35b6fd942c..5d9fbe2bb6 100644
--- a/contracts/feature-tests/alloc-features/meta/Cargo.toml
+++ b/contracts/feature-tests/alloc-features/meta/Cargo.toml
@@ -8,7 +8,7 @@ publish = false
 [dependencies.alloc-features]
 path = ".."
 
-[dependencies.multiversx-sc-meta]
+[dependencies.multiversx-sc-meta-lib]
 version = "0.50.3"
-path = "../../../../framework/meta"
+path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/feature-tests/alloc-features/meta/src/main.rs b/contracts/feature-tests/alloc-features/meta/src/main.rs
index 564416ad32..9f02362e27 100644
--- a/contracts/feature-tests/alloc-features/meta/src/main.rs
+++ b/contracts/feature-tests/alloc-features/meta/src/main.rs
@@ -1,3 +1,3 @@
 fn main() {
-    multiversx_sc_meta::cli_main::<alloc_features::AbiProvider>();
+    multiversx_sc_meta_lib::cli_main::<alloc_features::AbiProvider>();
 }
diff --git a/contracts/feature-tests/basic-features/meta/Cargo.toml b/contracts/feature-tests/basic-features/meta/Cargo.toml
index 69069e1feb..6cf2669d8c 100644
--- a/contracts/feature-tests/basic-features/meta/Cargo.toml
+++ b/contracts/feature-tests/basic-features/meta/Cargo.toml
@@ -8,7 +8,7 @@ publish = false
 [dependencies.basic-features]
 path = ".."
 
-[dependencies.multiversx-sc-meta]
+[dependencies.multiversx-sc-meta-lib]
 version = "0.50.3"
-path = "../../../../framework/meta"
+path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/feature-tests/basic-features/meta/src/main.rs b/contracts/feature-tests/basic-features/meta/src/main.rs
index 883e824ce4..482a5fadcf 100644
--- a/contracts/feature-tests/basic-features/meta/src/main.rs
+++ b/contracts/feature-tests/basic-features/meta/src/main.rs
@@ -1,3 +1,3 @@
 fn main() {
-    multiversx_sc_meta::cli_main::<basic_features::AbiProvider>();
+    multiversx_sc_meta_lib::cli_main::<basic_features::AbiProvider>();
 }
diff --git a/contracts/feature-tests/big-float-features/meta/Cargo.toml b/contracts/feature-tests/big-float-features/meta/Cargo.toml
index 066ce2ac49..13aaa4c639 100644
--- a/contracts/feature-tests/big-float-features/meta/Cargo.toml
+++ b/contracts/feature-tests/big-float-features/meta/Cargo.toml
@@ -8,7 +8,7 @@ publish = false
 [dependencies.big-float-features]
 path = ".."
 
-[dependencies.multiversx-sc-meta]
+[dependencies.multiversx-sc-meta-lib]
 version = "0.50.3"
-path = "../../../../framework/meta"
+path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/feature-tests/big-float-features/meta/src/main.rs b/contracts/feature-tests/big-float-features/meta/src/main.rs
index 5f01181a29..5e5895e70c 100644
--- a/contracts/feature-tests/big-float-features/meta/src/main.rs
+++ b/contracts/feature-tests/big-float-features/meta/src/main.rs
@@ -1,3 +1,3 @@
 fn main() {
-    multiversx_sc_meta::cli_main::<big_float_features::AbiProvider>();
+    multiversx_sc_meta_lib::cli_main::<big_float_features::AbiProvider>();
 }
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 2b7cd159be..272016644a 100644
--- a/contracts/feature-tests/composability/builtin-func-features/meta/Cargo.toml
+++ b/contracts/feature-tests/composability/builtin-func-features/meta/Cargo.toml
@@ -7,7 +7,7 @@ publish = false
 [dependencies.builtin-func-features]
 path = ".."
 
-[dependencies.multiversx-sc-meta]
+[dependencies.multiversx-sc-meta-lib]
 version = "0.50.3"
-path = "../../../../../framework/meta"
+path = "../../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/feature-tests/composability/builtin-func-features/meta/src/main.rs b/contracts/feature-tests/composability/builtin-func-features/meta/src/main.rs
index 2f9740634f..2b091f5799 100644
--- a/contracts/feature-tests/composability/builtin-func-features/meta/src/main.rs
+++ b/contracts/feature-tests/composability/builtin-func-features/meta/src/main.rs
@@ -1,3 +1,3 @@
 fn main() {
-    multiversx_sc_meta::cli_main::<builtin_func_features::AbiProvider>();
+    multiversx_sc_meta_lib::cli_main::<builtin_func_features::AbiProvider>();
 }
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 8137ae6bc0..4a5d2ad11e 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
@@ -11,7 +11,7 @@ path = ".."
 version = "0.50.3"
 path = "../../../../../../framework/base"
 
-[dependencies.multiversx-sc-meta]
+[dependencies.multiversx-sc-meta-lib]
 version = "0.50.3"
-path = "../../../../../../framework/meta"
+path = "../../../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/feature-tests/composability/esdt-contract-pair/first-contract/meta/src/main.rs b/contracts/feature-tests/composability/esdt-contract-pair/first-contract/meta/src/main.rs
index d40ed0c2cc..103f097eea 100644
--- a/contracts/feature-tests/composability/esdt-contract-pair/first-contract/meta/src/main.rs
+++ b/contracts/feature-tests/composability/esdt-contract-pair/first-contract/meta/src/main.rs
@@ -1,3 +1,3 @@
 fn main() {
-    multiversx_sc_meta::cli_main::<first_contract::AbiProvider>();
+    multiversx_sc_meta_lib::cli_main::<first_contract::AbiProvider>();
 }
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 31a3fc7226..2ea12ab49f 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
@@ -11,7 +11,7 @@ path = ".."
 version = "0.50.3"
 path = "../../../../../../framework/base"
 
-[dependencies.multiversx-sc-meta]
+[dependencies.multiversx-sc-meta-lib]
 version = "0.50.3"
-path = "../../../../../../framework/meta"
+path = "../../../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/feature-tests/composability/esdt-contract-pair/second-contract/meta/src/main.rs b/contracts/feature-tests/composability/esdt-contract-pair/second-contract/meta/src/main.rs
index 270dd07b1a..690311c6df 100644
--- a/contracts/feature-tests/composability/esdt-contract-pair/second-contract/meta/src/main.rs
+++ b/contracts/feature-tests/composability/esdt-contract-pair/second-contract/meta/src/main.rs
@@ -1,3 +1,3 @@
 fn main() {
-    multiversx_sc_meta::cli_main::<second_contract::AbiProvider>();
+    multiversx_sc_meta_lib::cli_main::<second_contract::AbiProvider>();
 }
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 d6707df771..dd4352ccf2 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
@@ -11,7 +11,7 @@ path = ".."
 version = "0.50.3"
 path = "../../../../../../framework/base"
 
-[dependencies.multiversx-sc-meta]
+[dependencies.multiversx-sc-meta-lib]
 version = "0.50.3"
-path = "../../../../../../framework/meta"
+path = "../../../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/child/meta/src/main.rs b/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/child/meta/src/main.rs
index 84abd4cae4..765eadcb7d 100644
--- a/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/child/meta/src/main.rs
+++ b/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/child/meta/src/main.rs
@@ -1,3 +1,3 @@
 fn main() {
-    multiversx_sc_meta::cli_main::<child::AbiProvider>();
+    multiversx_sc_meta_lib::cli_main::<child::AbiProvider>();
 }
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 ba9d5a9793..27c42d4b62 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
@@ -11,7 +11,7 @@ path = ".."
 version = "0.50.3"
 path = "../../../../../../framework/base"
 
-[dependencies.multiversx-sc-meta]
+[dependencies.multiversx-sc-meta-lib]
 version = "0.50.3"
-path = "../../../../../../framework/meta"
+path = "../../../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/parent/meta/src/main.rs b/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/parent/meta/src/main.rs
index c62ef2dbe0..99ed37ffd7 100644
--- a/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/parent/meta/src/main.rs
+++ b/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/parent/meta/src/main.rs
@@ -1,3 +1,3 @@
 fn main() {
-    multiversx_sc_meta::cli_main::<parent::AbiProvider>();
+    multiversx_sc_meta_lib::cli_main::<parent::AbiProvider>();
 }
diff --git a/contracts/feature-tests/composability/forwarder-legacy/meta/Cargo.toml b/contracts/feature-tests/composability/forwarder-legacy/meta/Cargo.toml
index 5b497ee37e..3576da56da 100644
--- a/contracts/feature-tests/composability/forwarder-legacy/meta/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-legacy/meta/Cargo.toml
@@ -7,7 +7,7 @@ publish = false
 [dependencies.forwarder-legacy]
 path = ".."
 
-[dependencies.multiversx-sc-meta]
+[dependencies.multiversx-sc-meta-lib]
 version = "0.50.3"
-path = "../../../../../framework/meta"
+path = "../../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/feature-tests/composability/forwarder-legacy/meta/src/main.rs b/contracts/feature-tests/composability/forwarder-legacy/meta/src/main.rs
index a6e424dff6..693a01816f 100644
--- a/contracts/feature-tests/composability/forwarder-legacy/meta/src/main.rs
+++ b/contracts/feature-tests/composability/forwarder-legacy/meta/src/main.rs
@@ -1,3 +1,3 @@
 fn main() {
-    multiversx_sc_meta::cli_main::<forwarder_legacy::AbiProvider>();
+    multiversx_sc_meta_lib::cli_main::<forwarder_legacy::AbiProvider>();
 }
diff --git a/contracts/feature-tests/composability/forwarder-queue/meta/Cargo.toml b/contracts/feature-tests/composability/forwarder-queue/meta/Cargo.toml
index e69a6aa677..52ffaa1369 100644
--- a/contracts/feature-tests/composability/forwarder-queue/meta/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-queue/meta/Cargo.toml
@@ -7,7 +7,7 @@ publish = false
 [dependencies.forwarder-queue]
 path = ".."
 
-[dependencies.multiversx-sc-meta]
+[dependencies.multiversx-sc-meta-lib]
 version = "0.50.3"
-path = "../../../../../framework/meta"
+path = "../../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/feature-tests/composability/forwarder-queue/meta/src/main.rs b/contracts/feature-tests/composability/forwarder-queue/meta/src/main.rs
index 7b268b4926..7dcfb10214 100644
--- a/contracts/feature-tests/composability/forwarder-queue/meta/src/main.rs
+++ b/contracts/feature-tests/composability/forwarder-queue/meta/src/main.rs
@@ -1,3 +1,3 @@
 fn main() {
-    multiversx_sc_meta::cli_main::<forwarder_queue::AbiProvider>();
+    multiversx_sc_meta_lib::cli_main::<forwarder_queue::AbiProvider>();
 }
diff --git a/contracts/feature-tests/composability/forwarder-raw/meta/Cargo.toml b/contracts/feature-tests/composability/forwarder-raw/meta/Cargo.toml
index f9f45148b9..6ffc1c01d3 100644
--- a/contracts/feature-tests/composability/forwarder-raw/meta/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-raw/meta/Cargo.toml
@@ -7,7 +7,7 @@ publish = false
 [dependencies.forwarder-raw]
 path = ".."
 
-[dependencies.multiversx-sc-meta]
+[dependencies.multiversx-sc-meta-lib]
 version = "0.50.3"
-path = "../../../../../framework/meta"
+path = "../../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/feature-tests/composability/forwarder-raw/meta/src/main.rs b/contracts/feature-tests/composability/forwarder-raw/meta/src/main.rs
index fde34fe5c9..e35f2df91c 100644
--- a/contracts/feature-tests/composability/forwarder-raw/meta/src/main.rs
+++ b/contracts/feature-tests/composability/forwarder-raw/meta/src/main.rs
@@ -1,3 +1,3 @@
 fn main() {
-    multiversx_sc_meta::cli_main::<forwarder_raw::AbiProvider>();
+    multiversx_sc_meta_lib::cli_main::<forwarder_raw::AbiProvider>();
 }
diff --git a/contracts/feature-tests/composability/forwarder/meta/Cargo.toml b/contracts/feature-tests/composability/forwarder/meta/Cargo.toml
index 5a5595041d..67d9b898c1 100644
--- a/contracts/feature-tests/composability/forwarder/meta/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder/meta/Cargo.toml
@@ -7,7 +7,7 @@ publish = false
 [dependencies.forwarder]
 path = ".."
 
-[dependencies.multiversx-sc-meta]
+[dependencies.multiversx-sc-meta-lib]
 version = "0.50.3"
-path = "../../../../../framework/meta"
+path = "../../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/feature-tests/composability/forwarder/meta/src/main.rs b/contracts/feature-tests/composability/forwarder/meta/src/main.rs
index ae1d190397..6be9c6c962 100644
--- a/contracts/feature-tests/composability/forwarder/meta/src/main.rs
+++ b/contracts/feature-tests/composability/forwarder/meta/src/main.rs
@@ -1,3 +1,3 @@
 fn main() {
-    multiversx_sc_meta::cli_main::<forwarder::AbiProvider>();
+    multiversx_sc_meta_lib::cli_main::<forwarder::AbiProvider>();
 }
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 b02222f23e..ec95b9a5b5 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
@@ -7,7 +7,7 @@ publish = false
 [dependencies.local-esdt-and-nft]
 path = ".."
 
-[dependencies.multiversx-sc-meta]
+[dependencies.multiversx-sc-meta-lib]
 version = "0.50.3"
-path = "../../../../../framework/meta"
+path = "../../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/feature-tests/composability/local-esdt-and-nft/meta/src/main.rs b/contracts/feature-tests/composability/local-esdt-and-nft/meta/src/main.rs
index 17c70f7f41..3e0f8441dc 100644
--- a/contracts/feature-tests/composability/local-esdt-and-nft/meta/src/main.rs
+++ b/contracts/feature-tests/composability/local-esdt-and-nft/meta/src/main.rs
@@ -1,3 +1,3 @@
 fn main() {
-    multiversx_sc_meta::cli_main::<local_esdt_and_nft::AbiProvider>();
+    multiversx_sc_meta_lib::cli_main::<local_esdt_and_nft::AbiProvider>();
 }
diff --git a/contracts/feature-tests/composability/promises-features/meta/Cargo.toml b/contracts/feature-tests/composability/promises-features/meta/Cargo.toml
index aa797c1d3c..9b10023a5e 100644
--- a/contracts/feature-tests/composability/promises-features/meta/Cargo.toml
+++ b/contracts/feature-tests/composability/promises-features/meta/Cargo.toml
@@ -7,7 +7,7 @@ publish = false
 [dependencies.promises-features]
 path = ".."
 
-[dependencies.multiversx-sc-meta]
+[dependencies.multiversx-sc-meta-lib]
 version = "0.50.3"
-path = "../../../../../framework/meta"
+path = "../../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/feature-tests/composability/promises-features/meta/src/main.rs b/contracts/feature-tests/composability/promises-features/meta/src/main.rs
index 9ea31adb68..7327395421 100644
--- a/contracts/feature-tests/composability/promises-features/meta/src/main.rs
+++ b/contracts/feature-tests/composability/promises-features/meta/src/main.rs
@@ -1,3 +1,3 @@
 fn main() {
-    multiversx_sc_meta::cli_main::<promises_features::AbiProvider>();
+    multiversx_sc_meta_lib::cli_main::<promises_features::AbiProvider>();
 }
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 1062f90211..c857d94013 100644
--- a/contracts/feature-tests/composability/proxy-test-first/meta/Cargo.toml
+++ b/contracts/feature-tests/composability/proxy-test-first/meta/Cargo.toml
@@ -7,7 +7,7 @@ publish = false
 [dependencies.proxy-test-first]
 path = ".."
 
-[dependencies.multiversx-sc-meta]
+[dependencies.multiversx-sc-meta-lib]
 version = "0.50.3"
-path = "../../../../../framework/meta"
+path = "../../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/feature-tests/composability/proxy-test-first/meta/src/main.rs b/contracts/feature-tests/composability/proxy-test-first/meta/src/main.rs
index c3a70f306e..cdf00375c2 100644
--- a/contracts/feature-tests/composability/proxy-test-first/meta/src/main.rs
+++ b/contracts/feature-tests/composability/proxy-test-first/meta/src/main.rs
@@ -1,3 +1,3 @@
 fn main() {
-    multiversx_sc_meta::cli_main::<proxy_test_first::AbiProvider>();
+    multiversx_sc_meta_lib::cli_main::<proxy_test_first::AbiProvider>();
 }
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 171b710fdb..7e67512271 100644
--- a/contracts/feature-tests/composability/proxy-test-second/meta/Cargo.toml
+++ b/contracts/feature-tests/composability/proxy-test-second/meta/Cargo.toml
@@ -7,7 +7,7 @@ publish = false
 [dependencies.proxy-test-second]
 path = ".."
 
-[dependencies.multiversx-sc-meta]
+[dependencies.multiversx-sc-meta-lib]
 version = "0.50.3"
-path = "../../../../../framework/meta"
+path = "../../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/feature-tests/composability/proxy-test-second/meta/src/main.rs b/contracts/feature-tests/composability/proxy-test-second/meta/src/main.rs
index 6496c9a364..7b514c9bca 100644
--- a/contracts/feature-tests/composability/proxy-test-second/meta/src/main.rs
+++ b/contracts/feature-tests/composability/proxy-test-second/meta/src/main.rs
@@ -1,3 +1,3 @@
 fn main() {
-    multiversx_sc_meta::cli_main::<proxy_test_second::AbiProvider>();
+    multiversx_sc_meta_lib::cli_main::<proxy_test_second::AbiProvider>();
 }
diff --git a/contracts/feature-tests/composability/recursive-caller/meta/Cargo.toml b/contracts/feature-tests/composability/recursive-caller/meta/Cargo.toml
index 6e2f89277d..d1923f071c 100644
--- a/contracts/feature-tests/composability/recursive-caller/meta/Cargo.toml
+++ b/contracts/feature-tests/composability/recursive-caller/meta/Cargo.toml
@@ -7,7 +7,7 @@ publish = false
 [dependencies.recursive-caller]
 path = ".."
 
-[dependencies.multiversx-sc-meta]
+[dependencies.multiversx-sc-meta-lib]
 version = "0.50.3"
-path = "../../../../../framework/meta"
+path = "../../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/feature-tests/composability/recursive-caller/meta/src/main.rs b/contracts/feature-tests/composability/recursive-caller/meta/src/main.rs
index f5814c6ec7..5161513ec6 100644
--- a/contracts/feature-tests/composability/recursive-caller/meta/src/main.rs
+++ b/contracts/feature-tests/composability/recursive-caller/meta/src/main.rs
@@ -1,3 +1,3 @@
 fn main() {
-    multiversx_sc_meta::cli_main::<recursive_caller::AbiProvider>();
+    multiversx_sc_meta_lib::cli_main::<recursive_caller::AbiProvider>();
 }
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 f5c57b2cdb..a1bc8f5bba 100644
--- a/contracts/feature-tests/composability/transfer-role-features/meta/Cargo.toml
+++ b/contracts/feature-tests/composability/transfer-role-features/meta/Cargo.toml
@@ -7,7 +7,7 @@ publish = false
 [dependencies.transfer-role-features]
 path = ".."
 
-[dependencies.multiversx-sc-meta]
+[dependencies.multiversx-sc-meta-lib]
 version = "0.50.3"
-path = "../../../../../framework/meta"
+path = "../../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/feature-tests/composability/transfer-role-features/meta/src/main.rs b/contracts/feature-tests/composability/transfer-role-features/meta/src/main.rs
index a8eb09e9c1..2b1d3aa6b3 100644
--- a/contracts/feature-tests/composability/transfer-role-features/meta/src/main.rs
+++ b/contracts/feature-tests/composability/transfer-role-features/meta/src/main.rs
@@ -1,3 +1,3 @@
 fn main() {
-    multiversx_sc_meta::cli_main::<transfer_role_features::AbiProvider>();
+    multiversx_sc_meta_lib::cli_main::<transfer_role_features::AbiProvider>();
 }
diff --git a/contracts/feature-tests/composability/vault/meta/Cargo.toml b/contracts/feature-tests/composability/vault/meta/Cargo.toml
index b73741d773..8110c00500 100644
--- a/contracts/feature-tests/composability/vault/meta/Cargo.toml
+++ b/contracts/feature-tests/composability/vault/meta/Cargo.toml
@@ -7,7 +7,7 @@ publish = false
 [dependencies.vault]
 path = ".."
 
-[dependencies.multiversx-sc-meta]
+[dependencies.multiversx-sc-meta-lib]
 version = "0.50.3"
-path = "../../../../../framework/meta"
+path = "../../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/feature-tests/composability/vault/meta/src/main.rs b/contracts/feature-tests/composability/vault/meta/src/main.rs
index 355942918a..a95e69d1a3 100644
--- a/contracts/feature-tests/composability/vault/meta/src/main.rs
+++ b/contracts/feature-tests/composability/vault/meta/src/main.rs
@@ -1,3 +1,3 @@
 fn main() {
-    multiversx_sc_meta::cli_main::<vault::AbiProvider>();
+    multiversx_sc_meta_lib::cli_main::<vault::AbiProvider>();
 }
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 59c8411b91..d5c4572abe 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
@@ -8,7 +8,7 @@ publish = false
 [dependencies.crowdfunding-erc20]
 path = ".."
 
-[dependencies.multiversx-sc-meta]
+[dependencies.multiversx-sc-meta-lib]
 version = "0.50.3"
-path = "../../../../../framework/meta"
+path = "../../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/meta/src/main.rs b/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/meta/src/main.rs
index 090be7d23b..ca48e63847 100644
--- a/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/meta/src/main.rs
+++ b/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/meta/src/main.rs
@@ -1,3 +1,3 @@
 fn main() {
-    multiversx_sc_meta::cli_main::<crowdfunding_erc20::AbiProvider>();
+    multiversx_sc_meta_lib::cli_main::<crowdfunding_erc20::AbiProvider>();
 }
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 0d24dbe880..0702e6a50c 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
@@ -8,7 +8,7 @@ publish = false
 [dependencies.erc1155-marketplace]
 path = ".."
 
-[dependencies.multiversx-sc-meta]
+[dependencies.multiversx-sc-meta-lib]
 version = "0.50.3"
-path = "../../../../../framework/meta"
+path = "../../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/meta/src/main.rs b/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/meta/src/main.rs
index f36c298d55..20153e760c 100644
--- a/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/meta/src/main.rs
+++ b/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/meta/src/main.rs
@@ -1,3 +1,3 @@
 fn main() {
-    multiversx_sc_meta::cli_main::<erc1155_marketplace::AbiProvider>();
+    multiversx_sc_meta_lib::cli_main::<erc1155_marketplace::AbiProvider>();
 }
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 584fdff0ff..e8345c1a8e 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
@@ -8,7 +8,7 @@ publish = false
 [dependencies.erc1155-user-mock]
 path = ".."
 
-[dependencies.multiversx-sc-meta]
+[dependencies.multiversx-sc-meta-lib]
 version = "0.50.3"
-path = "../../../../../framework/meta"
+path = "../../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/feature-tests/erc-style-contracts/erc1155-user-mock/meta/src/main.rs b/contracts/feature-tests/erc-style-contracts/erc1155-user-mock/meta/src/main.rs
index f9c3fdd3e9..6a3462a756 100644
--- a/contracts/feature-tests/erc-style-contracts/erc1155-user-mock/meta/src/main.rs
+++ b/contracts/feature-tests/erc-style-contracts/erc1155-user-mock/meta/src/main.rs
@@ -1,3 +1,3 @@
 fn main() {
-    multiversx_sc_meta::cli_main::<erc1155_user_mock::AbiProvider>();
+    multiversx_sc_meta_lib::cli_main::<erc1155_user_mock::AbiProvider>();
 }
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 dd43493c09..f92997ff1b 100644
--- a/contracts/feature-tests/erc-style-contracts/erc1155/meta/Cargo.toml
+++ b/contracts/feature-tests/erc-style-contracts/erc1155/meta/Cargo.toml
@@ -8,7 +8,7 @@ publish = false
 [dependencies.erc1155]
 path = ".."
 
-[dependencies.multiversx-sc-meta]
+[dependencies.multiversx-sc-meta-lib]
 version = "0.50.3"
-path = "../../../../../framework/meta"
+path = "../../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/feature-tests/erc-style-contracts/erc1155/meta/src/main.rs b/contracts/feature-tests/erc-style-contracts/erc1155/meta/src/main.rs
index 9a4730217a..4aef7a714c 100644
--- a/contracts/feature-tests/erc-style-contracts/erc1155/meta/src/main.rs
+++ b/contracts/feature-tests/erc-style-contracts/erc1155/meta/src/main.rs
@@ -1,3 +1,3 @@
 fn main() {
-    multiversx_sc_meta::cli_main::<erc1155::AbiProvider>();
+    multiversx_sc_meta_lib::cli_main::<erc1155::AbiProvider>();
 }
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 82b34f245a..4ad2d78743 100644
--- a/contracts/feature-tests/erc-style-contracts/erc20/meta/Cargo.toml
+++ b/contracts/feature-tests/erc-style-contracts/erc20/meta/Cargo.toml
@@ -8,7 +8,7 @@ publish = false
 [dependencies.erc20]
 path = ".."
 
-[dependencies.multiversx-sc-meta]
+[dependencies.multiversx-sc-meta-lib]
 version = "0.50.3"
-path = "../../../../../framework/meta"
+path = "../../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/feature-tests/erc-style-contracts/erc20/meta/src/main.rs b/contracts/feature-tests/erc-style-contracts/erc20/meta/src/main.rs
index b4ccd80712..ffb251ea2f 100644
--- a/contracts/feature-tests/erc-style-contracts/erc20/meta/src/main.rs
+++ b/contracts/feature-tests/erc-style-contracts/erc20/meta/src/main.rs
@@ -1,3 +1,3 @@
 fn main() {
-    multiversx_sc_meta::cli_main::<erc20::AbiProvider>();
+    multiversx_sc_meta_lib::cli_main::<erc20::AbiProvider>();
 }
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 06b516c887..9b0c62afd2 100644
--- a/contracts/feature-tests/erc-style-contracts/erc721/meta/Cargo.toml
+++ b/contracts/feature-tests/erc-style-contracts/erc721/meta/Cargo.toml
@@ -8,7 +8,7 @@ publish = false
 [dependencies.erc721]
 path = ".."
 
-[dependencies.multiversx-sc-meta]
+[dependencies.multiversx-sc-meta-lib]
 version = "0.50.3"
-path = "../../../../../framework/meta"
+path = "../../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/feature-tests/erc-style-contracts/erc721/meta/src/main.rs b/contracts/feature-tests/erc-style-contracts/erc721/meta/src/main.rs
index c505661fd6..f1df8f2beb 100644
--- a/contracts/feature-tests/erc-style-contracts/erc721/meta/src/main.rs
+++ b/contracts/feature-tests/erc-style-contracts/erc721/meta/src/main.rs
@@ -1,3 +1,3 @@
 fn main() {
-    multiversx_sc_meta::cli_main::<erc721::AbiProvider>();
+    multiversx_sc_meta_lib::cli_main::<erc721::AbiProvider>();
 }
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 ee286f9601..7a481725a7 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
@@ -8,7 +8,7 @@ publish = false
 [dependencies.lottery-erc20]
 path = ".."
 
-[dependencies.multiversx-sc-meta]
+[dependencies.multiversx-sc-meta-lib]
 version = "0.50.3"
-path = "../../../../../framework/meta"
+path = "../../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/feature-tests/erc-style-contracts/lottery-erc20/meta/src/main.rs b/contracts/feature-tests/erc-style-contracts/lottery-erc20/meta/src/main.rs
index 1fc258fb1f..601d8539ba 100644
--- a/contracts/feature-tests/erc-style-contracts/lottery-erc20/meta/src/main.rs
+++ b/contracts/feature-tests/erc-style-contracts/lottery-erc20/meta/src/main.rs
@@ -1,3 +1,3 @@
 fn main() {
-    multiversx_sc_meta::cli_main::<lottery_erc20::AbiProvider>();
+    multiversx_sc_meta_lib::cli_main::<lottery_erc20::AbiProvider>();
 }
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 e2dc447421..3b87777102 100644
--- a/contracts/feature-tests/esdt-system-sc-mock/meta/Cargo.toml
+++ b/contracts/feature-tests/esdt-system-sc-mock/meta/Cargo.toml
@@ -8,7 +8,7 @@ publish = false
 [dependencies.esdt-system-sc-mock]
 path = ".."
 
-[dependencies.multiversx-sc-meta]
+[dependencies.multiversx-sc-meta-lib]
 version = "0.50.3"
-path = "../../../../framework/meta"
+path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/feature-tests/esdt-system-sc-mock/meta/src/main.rs b/contracts/feature-tests/esdt-system-sc-mock/meta/src/main.rs
index b0eb252a66..d2101a5771 100644
--- a/contracts/feature-tests/esdt-system-sc-mock/meta/src/main.rs
+++ b/contracts/feature-tests/esdt-system-sc-mock/meta/src/main.rs
@@ -1,3 +1,3 @@
 fn main() {
-    multiversx_sc_meta::cli_main::<esdt_system_sc_mock::AbiProvider>();
+    multiversx_sc_meta_lib::cli_main::<esdt_system_sc_mock::AbiProvider>();
 }
diff --git a/contracts/feature-tests/exchange-features/meta/Cargo.toml b/contracts/feature-tests/exchange-features/meta/Cargo.toml
index 898650a4fa..5030eb66dd 100644
--- a/contracts/feature-tests/exchange-features/meta/Cargo.toml
+++ b/contracts/feature-tests/exchange-features/meta/Cargo.toml
@@ -7,7 +7,7 @@ publish = false
 [dependencies.exchange-features]
 path = ".."
 
-[dependencies.multiversx-sc-meta]
+[dependencies.multiversx-sc-meta-lib]
 version = "0.50.3"
-path = "../../../../framework/meta"
+path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/feature-tests/exchange-features/meta/src/main.rs b/contracts/feature-tests/exchange-features/meta/src/main.rs
index f9a8d31e06..219a7e34af 100644
--- a/contracts/feature-tests/exchange-features/meta/src/main.rs
+++ b/contracts/feature-tests/exchange-features/meta/src/main.rs
@@ -1,3 +1,3 @@
 fn main() {
-    multiversx_sc_meta::cli_main::<exchange_features::AbiProvider>();
+    multiversx_sc_meta_lib::cli_main::<exchange_features::AbiProvider>();
 }
diff --git a/contracts/feature-tests/formatted-message-features/meta/Cargo.toml b/contracts/feature-tests/formatted-message-features/meta/Cargo.toml
index 829c46b31d..2b0ad62a0a 100644
--- a/contracts/feature-tests/formatted-message-features/meta/Cargo.toml
+++ b/contracts/feature-tests/formatted-message-features/meta/Cargo.toml
@@ -3,14 +3,14 @@ name = "formatted-message-features-meta"
 version = "0.0.0"
 edition = "2021"
 publish = false
-authors = [ "you",]
+authors = ["you"]
 
 [dev-dependencies]
 
 [dependencies.formatted-message-features]
 path = ".."
 
-[dependencies.multiversx-sc-meta]
+[dependencies.multiversx-sc-meta-lib]
 version = "0.50.3"
-path = "../../../../framework/meta"
+path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/feature-tests/formatted-message-features/meta/src/main.rs b/contracts/feature-tests/formatted-message-features/meta/src/main.rs
index 57df6a016b..6d1a57c9a5 100644
--- a/contracts/feature-tests/formatted-message-features/meta/src/main.rs
+++ b/contracts/feature-tests/formatted-message-features/meta/src/main.rs
@@ -1,3 +1,3 @@
 fn main() {
-    multiversx_sc_meta::cli_main::<formatted_message_features::AbiProvider>();
+    multiversx_sc_meta_lib::cli_main::<formatted_message_features::AbiProvider>();
 }
diff --git a/contracts/feature-tests/managed-map-features/meta/Cargo.toml b/contracts/feature-tests/managed-map-features/meta/Cargo.toml
index 5ef8defae3..1588553538 100644
--- a/contracts/feature-tests/managed-map-features/meta/Cargo.toml
+++ b/contracts/feature-tests/managed-map-features/meta/Cargo.toml
@@ -4,10 +4,11 @@ version = "0.0.0"
 authors = ["Andrei Marinica <andrei.marinica@multiversx.com>"]
 edition = "2021"
 publish = false
+
 [dependencies.managed-map-features]
 path = ".."
 
-[dependencies.multiversx-sc-meta]
+[dependencies.multiversx-sc-meta-lib]
 version = "0.50.3"
-path = "../../../../framework/meta"
+path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/feature-tests/managed-map-features/meta/src/main.rs b/contracts/feature-tests/managed-map-features/meta/src/main.rs
index 834c30e0d3..74b4c4ad85 100644
--- a/contracts/feature-tests/managed-map-features/meta/src/main.rs
+++ b/contracts/feature-tests/managed-map-features/meta/src/main.rs
@@ -1,3 +1,3 @@
 fn main() {
-    multiversx_sc_meta::cli_main::<managed_map_features::AbiProvider>();
+    multiversx_sc_meta_lib::cli_main::<managed_map_features::AbiProvider>();
 }
diff --git a/contracts/feature-tests/multi-contract-features/meta/Cargo.toml b/contracts/feature-tests/multi-contract-features/meta/Cargo.toml
index e7af5102d7..f07fcbd5ab 100644
--- a/contracts/feature-tests/multi-contract-features/meta/Cargo.toml
+++ b/contracts/feature-tests/multi-contract-features/meta/Cargo.toml
@@ -8,7 +8,7 @@ publish = false
 [dependencies.multi-contract-features]
 path = ".."
 
-[dependencies.multiversx-sc-meta]
+[dependencies.multiversx-sc-meta-lib]
 version = "0.50.3"
-path = "../../../../framework/meta"
+path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/feature-tests/multi-contract-features/meta/src/main.rs b/contracts/feature-tests/multi-contract-features/meta/src/main.rs
index 9099598c92..bab60b6eac 100644
--- a/contracts/feature-tests/multi-contract-features/meta/src/main.rs
+++ b/contracts/feature-tests/multi-contract-features/meta/src/main.rs
@@ -1,3 +1,3 @@
 fn main() {
-    multiversx_sc_meta::cli_main::<multi_contract_features::AbiProvider>();
+    multiversx_sc_meta_lib::cli_main::<multi_contract_features::AbiProvider>();
 }
diff --git a/contracts/feature-tests/panic-message-features/meta/Cargo.toml b/contracts/feature-tests/panic-message-features/meta/Cargo.toml
index 04aaf3d8e9..078df57fdd 100644
--- a/contracts/feature-tests/panic-message-features/meta/Cargo.toml
+++ b/contracts/feature-tests/panic-message-features/meta/Cargo.toml
@@ -7,7 +7,7 @@ publish = false
 [dependencies.panic-message-features]
 path = ".."
 
-[dependencies.multiversx-sc-meta]
+[dependencies.multiversx-sc-meta-lib]
 version = "0.50.3"
-path = "../../../../framework/meta"
+path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/feature-tests/panic-message-features/meta/src/main.rs b/contracts/feature-tests/panic-message-features/meta/src/main.rs
index d33e82f537..d2c236c216 100644
--- a/contracts/feature-tests/panic-message-features/meta/src/main.rs
+++ b/contracts/feature-tests/panic-message-features/meta/src/main.rs
@@ -1,3 +1,3 @@
 fn main() {
-    multiversx_sc_meta::cli_main::<panic_message_features::AbiProvider>();
+    multiversx_sc_meta_lib::cli_main::<panic_message_features::AbiProvider>();
 }
diff --git a/contracts/feature-tests/payable-features/meta/Cargo.toml b/contracts/feature-tests/payable-features/meta/Cargo.toml
index 716e89d80e..f217ac70ca 100644
--- a/contracts/feature-tests/payable-features/meta/Cargo.toml
+++ b/contracts/feature-tests/payable-features/meta/Cargo.toml
@@ -8,7 +8,7 @@ publish = false
 [dependencies.payable-features]
 path = ".."
 
-[dependencies.multiversx-sc-meta]
+[dependencies.multiversx-sc-meta-lib]
 version = "0.50.3"
-path = "../../../../framework/meta"
+path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/feature-tests/payable-features/meta/src/main.rs b/contracts/feature-tests/payable-features/meta/src/main.rs
index 8578cb4649..90d2949d9c 100644
--- a/contracts/feature-tests/payable-features/meta/src/main.rs
+++ b/contracts/feature-tests/payable-features/meta/src/main.rs
@@ -1,3 +1,3 @@
 fn main() {
-    multiversx_sc_meta::cli_main::<payable_features::AbiProvider>();
+    multiversx_sc_meta_lib::cli_main::<payable_features::AbiProvider>();
 }
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 8866c4ff38..75924880e2 100644
--- a/contracts/feature-tests/rust-snippets-generator-test/meta/Cargo.toml
+++ b/contracts/feature-tests/rust-snippets-generator-test/meta/Cargo.toml
@@ -8,7 +8,7 @@ publish = false
 [dependencies.rust-snippets-generator-test]
 path = ".."
 
-[dependencies.multiversx-sc-meta]
+[dependencies.multiversx-sc-meta-lib]
 version = "0.50.3"
-path = "../../../../framework/meta"
+path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/feature-tests/rust-snippets-generator-test/meta/src/main.rs b/contracts/feature-tests/rust-snippets-generator-test/meta/src/main.rs
index b88a881acd..72d75ec315 100644
--- a/contracts/feature-tests/rust-snippets-generator-test/meta/src/main.rs
+++ b/contracts/feature-tests/rust-snippets-generator-test/meta/src/main.rs
@@ -1,3 +1,3 @@
 fn main() {
-    multiversx_sc_meta::cli_main::<rust_snippets_generator_test::AbiProvider>();
+    multiversx_sc_meta_lib::cli_main::<rust_snippets_generator_test::AbiProvider>();
 }
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 e257a89a34..dde0f6c158 100644
--- a/contracts/feature-tests/rust-testing-framework-tester/meta/Cargo.toml
+++ b/contracts/feature-tests/rust-testing-framework-tester/meta/Cargo.toml
@@ -7,7 +7,7 @@ publish = false
 [dependencies.rust-testing-framework-tester]
 path = ".."
 
-[dependencies.multiversx-sc-meta]
+[dependencies.multiversx-sc-meta-lib]
 version = "0.50.3"
-path = "../../../../framework/meta"
+path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/feature-tests/rust-testing-framework-tester/meta/src/main.rs b/contracts/feature-tests/rust-testing-framework-tester/meta/src/main.rs
index b8ac69bf18..57ced27087 100644
--- a/contracts/feature-tests/rust-testing-framework-tester/meta/src/main.rs
+++ b/contracts/feature-tests/rust-testing-framework-tester/meta/src/main.rs
@@ -1,3 +1,3 @@
 fn main() {
-    multiversx_sc_meta::cli_main::<rust_testing_framework_tester::AbiProvider>();
+    multiversx_sc_meta_lib::cli_main::<rust_testing_framework_tester::AbiProvider>();
 }
diff --git a/contracts/feature-tests/scenario-tester/meta/Cargo.toml b/contracts/feature-tests/scenario-tester/meta/Cargo.toml
index d1bec14b1b..6063c061b6 100644
--- a/contracts/feature-tests/scenario-tester/meta/Cargo.toml
+++ b/contracts/feature-tests/scenario-tester/meta/Cargo.toml
@@ -7,7 +7,7 @@ publish = false
 [dependencies.scenario-tester]
 path = ".."
 
-[dependencies.multiversx-sc-meta]
+[dependencies.multiversx-sc-meta-lib]
 version = "0.50.3"
-path = "../../../../framework/meta"
+path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/feature-tests/scenario-tester/meta/src/main.rs b/contracts/feature-tests/scenario-tester/meta/src/main.rs
index d88f5e7545..17b67ed1c1 100644
--- a/contracts/feature-tests/scenario-tester/meta/src/main.rs
+++ b/contracts/feature-tests/scenario-tester/meta/src/main.rs
@@ -1,3 +1,3 @@
 fn main() {
-    multiversx_sc_meta::cli_main::<scenario_tester::AbiProvider>();
+    multiversx_sc_meta_lib::cli_main::<scenario_tester::AbiProvider>();
 }
diff --git a/contracts/feature-tests/use-module/Cargo.toml b/contracts/feature-tests/use-module/Cargo.toml
index dde118d42f..31be1bacf8 100644
--- a/contracts/feature-tests/use-module/Cargo.toml
+++ b/contracts/feature-tests/use-module/Cargo.toml
@@ -20,6 +20,6 @@ path = "../../../framework/base"
 version = "0.50.3"
 path = "../../../framework/scenario"
 
-[dev-dependencies.multiversx-sc-meta]
+[dev-dependencies.multiversx-sc-meta-lib]
 version = "0.50.3"
-path = "../../../framework/meta"
+path = "../../../framework/meta-lib"
diff --git a/contracts/feature-tests/use-module/meta/Cargo.toml b/contracts/feature-tests/use-module/meta/Cargo.toml
index 334b6a0311..ce37ad8bdf 100644
--- a/contracts/feature-tests/use-module/meta/Cargo.toml
+++ b/contracts/feature-tests/use-module/meta/Cargo.toml
@@ -8,7 +8,7 @@ publish = false
 [dependencies.use-module]
 path = ".."
 
-[dependencies.multiversx-sc-meta]
+[dependencies.multiversx-sc-meta-lib]
 version = "0.50.3"
-path = "../../../../framework/meta"
+path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/feature-tests/use-module/meta/src/main.rs b/contracts/feature-tests/use-module/meta/src/main.rs
index afafea6eda..fd7c09a442 100644
--- a/contracts/feature-tests/use-module/meta/src/main.rs
+++ b/contracts/feature-tests/use-module/meta/src/main.rs
@@ -1,3 +1,3 @@
 fn main() {
-    multiversx_sc_meta::cli_main::<use_module::AbiProvider>();
+    multiversx_sc_meta_lib::cli_main::<use_module::AbiProvider>();
 }
diff --git a/contracts/feature-tests/use-module/tests/use_module_abi_test.rs b/contracts/feature-tests/use-module/tests/use_module_abi_test.rs
index b482115e5f..9600b19bcb 100644
--- a/contracts/feature-tests/use-module/tests/use_module_abi_test.rs
+++ b/contracts/feature-tests/use-module/tests/use_module_abi_test.rs
@@ -1,4 +1,4 @@
-use multiversx_sc_meta::abi_json;
+use multiversx_sc_meta_lib::abi_json;
 use multiversx_sc_scenario::*;
 
 use std::{fs, fs::File, io::Write};
@@ -8,9 +8,9 @@ fn use_module_abi_generated_ok() {
     let blockchain = ScenarioWorld::new();
 
     // generate ABI
-    let multi_contract_config = multiversx_sc_meta::multi_contract_config::<use_module::AbiProvider>(
-        blockchain.current_dir().as_path(),
-    );
+    let multi_contract_config = multiversx_sc_meta_lib::multi_contract_config::<
+        use_module::AbiProvider,
+    >(blockchain.current_dir().as_path());
 
     let main_contract = multi_contract_config.find_contract("use-module");
     assert!(!main_contract.settings.external_view);

From d4e5f932c15257cf823f75bfe9cf08ddbbcefd63 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 28 May 2024 14:57:24 +0300
Subject: [PATCH 0937/1254] clippy fix

---
 framework/meta/src/cmd/upgrade/upgrade_0_51.rs | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/framework/meta/src/cmd/upgrade/upgrade_0_51.rs b/framework/meta/src/cmd/upgrade/upgrade_0_51.rs
index 7b965ddf07..d5f4cdb03a 100644
--- a/framework/meta/src/cmd/upgrade/upgrade_0_51.rs
+++ b/framework/meta/src/cmd/upgrade/upgrade_0_51.rs
@@ -43,10 +43,8 @@ fn v_0_51_prepare_meta(sc_crate_path: &Path) {
         .remove("multiversx-sc-meta")
         .expect("multiversx-sc-meta dependency not found in meta crate");
 
-    if let Some(path) = meta_value.get_mut("path") {
-        if let Value::String(s) = path {
-            s.push_str("-lib");
-        }
+    if let Some(Value::String(path)) = meta_value.get_mut("path") {
+        path.push_str("-lib");
     }
 
     print_cargo_dep_add(cargo_toml_path.as_path(), "multiversx-sc-meta");

From 35b6fb392486fcfe8aeefd9866bd740bec4329c9 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 30 Apr 2024 12:24:29 +0300
Subject: [PATCH 0938/1254] err_msg - messages made str

---
 .../src/fractional_uri_info.rs                |  2 +-
 .../base/src/api/managed_types/big_int_api.rs |  2 +-
 .../wrappers/blockchain_wrapper.rs            |  4 +-
 .../src/contract_base/wrappers/serializer.rs  | 12 ++--
 framework/base/src/err_msg.rs                 | 61 +++++++++----------
 framework/base/src/io/signal_error.rs         |  5 +-
 framework/base/src/storage/storage_get.rs     |  3 +-
 .../src/types/managed/basic/cast_to_i64.rs    |  2 +-
 .../types/managed/wrapped/esdt_token_data.rs  |  2 +-
 .../types/managed/wrapped/token_identifier.rs |  6 +-
 framework/derive/src/generate/callback_gen.rs |  2 +-
 11 files changed, 51 insertions(+), 50 deletions(-)

diff --git a/contracts/examples/fractional-nfts/src/fractional_uri_info.rs b/contracts/examples/fractional-nfts/src/fractional_uri_info.rs
index 4b41271a72..e6ebdba4f2 100644
--- a/contracts/examples/fractional-nfts/src/fractional_uri_info.rs
+++ b/contracts/examples/fractional-nfts/src/fractional_uri_info.rs
@@ -26,7 +26,7 @@ impl<M: ManagedTypeApi> FractionalUriInfo<M> {
         let serializer = ManagedSerializer::new();
         serializer.top_decode_from_managed_buffer_custom_message(
             &first_uri,
-            b"Invalid Fractional URI info",
+            "Invalid Fractional URI info",
         )
     }
 
diff --git a/framework/base/src/api/managed_types/big_int_api.rs b/framework/base/src/api/managed_types/big_int_api.rs
index 295ca6b73e..13ce620d78 100644
--- a/framework/base/src/api/managed_types/big_int_api.rs
+++ b/framework/base/src/api/managed_types/big_int_api.rs
@@ -37,7 +37,7 @@ pub trait BigIntApiImpl: HandleTypeInfo + ErrorApi {
     ) {
         self.bi_sub(dest.clone(), x, y);
         if self.bi_sign(dest) == Sign::Minus {
-            Self::error_api_impl().signal_error(err_msg::BIG_UINT_SUB_NEGATIVE);
+            Self::error_api_impl().signal_error(err_msg::BIG_UINT_SUB_NEGATIVE.as_bytes());
         }
     }
 
diff --git a/framework/base/src/contract_base/wrappers/blockchain_wrapper.rs b/framework/base/src/contract_base/wrappers/blockchain_wrapper.rs
index 5a7f36a722..c499c9f663 100644
--- a/framework/base/src/contract_base/wrappers/blockchain_wrapper.rs
+++ b/framework/base/src/contract_base/wrappers/blockchain_wrapper.rs
@@ -77,7 +77,7 @@ where
 
     pub fn check_caller_is_owner(&self) {
         if self.get_owner_address() != self.get_caller() {
-            A::error_api_impl().signal_error(ONLY_OWNER_CALLER);
+            A::error_api_impl().signal_error(ONLY_OWNER_CALLER.as_bytes());
         }
     }
 
@@ -85,7 +85,7 @@ where
         let mbuf_temp_1: A::ManagedBufferHandle = use_raw_handle(const_handles::MBUF_TEMPORARY_1);
         A::blockchain_api_impl().load_caller_managed(mbuf_temp_1.clone());
         if A::blockchain_api_impl().is_smart_contract(mbuf_temp_1) {
-            A::error_api_impl().signal_error(ONLY_USER_ACCOUNT_CALLER);
+            A::error_api_impl().signal_error(ONLY_USER_ACCOUNT_CALLER.as_bytes());
         }
     }
 
diff --git a/framework/base/src/contract_base/wrappers/serializer.rs b/framework/base/src/contract_base/wrappers/serializer.rs
index ee2dace3ca..07fa41dbb5 100644
--- a/framework/base/src/contract_base/wrappers/serializer.rs
+++ b/framework/base/src/contract_base/wrappers/serializer.rs
@@ -59,7 +59,7 @@ where
     pub fn top_decode_from_managed_buffer_custom_message<T: TopDecode>(
         &self,
         buffer: &ManagedBuffer<M>,
-        error_message: &'static [u8],
+        error_message: &'static str,
     ) -> T {
         T::top_decode_or_handle_err(
             buffer.clone(), // TODO: remove clone
@@ -83,16 +83,16 @@ where
     M: ManagedTypeApi + ErrorApi,
 {
     _phantom: PhantomData<M>,
-    pub base_message: &'static [u8],
+    pub base_message: &'static str,
 }
 
 impl<M> Copy for ExitCodecErrorHandler<M> where M: ManagedTypeApi + ErrorApi {}
 
-impl<M> From<&'static [u8]> for ExitCodecErrorHandler<M>
+impl<M> From<&'static str> for ExitCodecErrorHandler<M>
 where
     M: ManagedTypeApi + ErrorApi,
 {
-    fn from(base_message: &'static [u8]) -> Self {
+    fn from(base_message: &'static str) -> Self {
         ExitCodecErrorHandler {
             _phantom: PhantomData,
             base_message,
@@ -107,7 +107,7 @@ where
     type HandledErr = Infallible;
 
     fn handle_error(&self, err: EncodeError) -> Self::HandledErr {
-        let mut message_buffer = ManagedBuffer::<M>::new_from_bytes(self.base_message);
+        let mut message_buffer = ManagedBuffer::<M>::new_from_bytes(self.base_message.as_bytes());
         message_buffer.append_bytes(err.message_bytes());
         M::error_api_impl().signal_error_from_buffer(message_buffer.get_handle())
     }
@@ -120,7 +120,7 @@ where
     type HandledErr = Infallible;
 
     fn handle_error(&self, err: DecodeError) -> Self::HandledErr {
-        let mut message_buffer = ManagedBuffer::<M>::new_from_bytes(self.base_message);
+        let mut message_buffer = ManagedBuffer::<M>::new_from_bytes(self.base_message.as_bytes());
         message_buffer.append_bytes(err.message_bytes());
         M::error_api_impl().signal_error_from_buffer(message_buffer.get_handle())
     }
diff --git a/framework/base/src/err_msg.rs b/framework/base/src/err_msg.rs
index 2a2ef7ad65..f24878517b 100644
--- a/framework/base/src/err_msg.rs
+++ b/framework/base/src/err_msg.rs
@@ -3,7 +3,7 @@ pub const MEM_ALLOC_ERROR: &str = "memory allocation error";
 
 pub const NON_PAYABLE_FUNC_ESDT: &str = "function does not accept ESDT payment";
 pub const BAD_TOKEN_PROVIDED: &str = "bad call value token provided";
-pub const BAD_TOKEN_TICKER_FORMAT: &[u8] = b"bad token ticker format";
+pub const BAD_TOKEN_TICKER_FORMAT: &str = "bad token ticker format";
 pub const SINGLE_ESDT_EXPECTED: &str = "function expects single ESDT payment";
 pub const TOO_MANY_ESDT_TRANSFERS: &str = "too many ESDT transfers";
 pub const ESDT_INVALID_TOKEN_INDEX: &str = "invalid token index";
@@ -11,34 +11,33 @@ pub const INCORRECT_NUM_ESDT_TRANSFERS: &str = "incorrect number of ESDT transfe
 pub static FUNGIBLE_TOKEN_EXPECTED_ERR_MSG: &str = "fungible ESDT token expected";
 
 pub const ARG_WRONG_NUMBER: &str = "wrong number of arguments";
-pub const ARG_ASYNC_WRONG_NUMBER: &[u8] = b"wrong number of arguments provided to async call";
-pub const ARG_ASYNC_RETURN_WRONG_NUMBER: &[u8] =
-    b"wrong number of arguments returned by async call";
-pub const ARG_CALLBACK_TOO_FEW: &[u8] = b"too few callback arguments provided";
-pub const ARG_CALLBACK_TOO_MANY: &[u8] = b"too many callback arguments provided";
+pub const ARG_ASYNC_WRONG_NUMBER: &str = "wrong number of arguments provided to async call";
+pub const ARG_ASYNC_RETURN_WRONG_NUMBER: &str = "wrong number of arguments returned by async call";
+pub const ARG_CALLBACK_TOO_FEW: &str = "too few callback arguments provided";
+pub const ARG_CALLBACK_TOO_MANY: &str = "too many callback arguments provided";
 
 pub const ARG_OUT_OF_RANGE: &str = "argument out of range";
-pub const ARG_BAD_LENGTH: &[u8] = b"argument has wrong length";
-pub const ARG_BAD_LENGTH_32: &[u8] = b"argument has wrong length: 32 bytes expected";
-pub const ARG_DECODE_ERROR_1: &[u8] = b"argument decode error (";
-pub const ARG_DECODE_ERROR_2: &[u8] = b"): ";
-pub const STORAGE_VALUE_OUT_OF_RANGE: &[u8] = b"storage value out of range";
-pub const STORAGE_DECODE_ERROR: &[u8] = b"storage decode error: ";
-pub const STORAGE_ENCODE_ERROR: &[u8] = b"storage encode error: ";
-pub const STORAGE_KEY_ENCODE_ERROR: &[u8] = b"storage key encode error: ";
-pub const STORAGE_VALUE_EXCEEDS_BUFFER: &[u8] = b"storage value exceeds buffer";
-pub const FINISH_ENCODE_ERROR: &[u8] = b"endpoint result encode error: ";
-pub const SERIALIZER_DECODE_ERROR: &[u8] = b"serializer decode error: ";
-pub const SERIALIZER_ENCODE_ERROR: &[u8] = b"serializer encode error: ";
-pub const FORMATTER_ENCODE_ERROR: &[u8] = b"formatter encode error: ";
-pub const LOG_TOPIC_ENCODE_ERROR: &[u8] = b"log topic encode error: ";
-pub const LOG_DATA_ENCODE_ERROR: &[u8] = b"log data encode error: ";
-pub const CONTRACT_CALL_ENCODE_ERROR: &[u8] = b"contract call encode error: ";
+pub const ARG_BAD_LENGTH: &str = "argument has wrong length";
+pub const ARG_BAD_LENGTH_32: &str = "argument has wrong length: 32 bytes expected";
+pub const ARG_DECODE_ERROR_1: &str = "argument decode error (";
+pub const ARG_DECODE_ERROR_2: &str = "): ";
+pub const STORAGE_VALUE_OUT_OF_RANGE: &str = "storage value out of range";
+pub const STORAGE_DECODE_ERROR: &str = "storage decode error: ";
+pub const STORAGE_ENCODE_ERROR: &str = "storage encode error: ";
+pub const STORAGE_KEY_ENCODE_ERROR: &str = "storage key encode error: ";
+pub const STORAGE_VALUE_EXCEEDS_BUFFER: &str = "storage value exceeds buffer";
+pub const FINISH_ENCODE_ERROR: &str = "endpoint result encode error: ";
+pub const SERIALIZER_DECODE_ERROR: &str = "serializer decode error: ";
+pub const SERIALIZER_ENCODE_ERROR: &str = "serializer encode error: ";
+pub const FORMATTER_ENCODE_ERROR: &str = "formatter encode error: ";
+pub const LOG_TOPIC_ENCODE_ERROR: &str = "log topic encode error: ";
+pub const LOG_DATA_ENCODE_ERROR: &str = "log data encode error: ";
+pub const CONTRACT_CALL_ENCODE_ERROR: &str = "contract call encode error: ";
 
-pub const VALUE_EXCEEDS_SLICE: &[u8] = b"value exceeds target slice";
-pub const CAST_TO_I64_ERROR: &[u8] = b"cast to i64 error";
-pub const BIG_UINT_EXCEEDS_SLICE: &[u8] = b"big uint as_bytes exceed target slice";
-pub const BIG_UINT_SUB_NEGATIVE: &[u8] = b"cannot subtract because result would be negative";
+pub const VALUE_EXCEEDS_SLICE: &str = "value exceeds target slice";
+pub const CAST_TO_I64_ERROR: &str = "cast to i64 error";
+pub const BIG_UINT_EXCEEDS_SLICE: &str = "big uint as_bytes exceed target slice";
+pub const BIG_UINT_SUB_NEGATIVE: &str = "cannot subtract because result would be negative";
 
 pub const DESERIALIZATION_INVALID_BYTE: &str = "call data deserialization error: not a valid byte";
 pub const DESERIALIZATION_NOT_32_BYTES: &str =
@@ -48,14 +47,14 @@ pub const DESERIALIZATION_ODD_DIGITS: &str =
 pub const DESERIALIZATION_ARG_OUT_OF_RANGE: &str =
     "call data deserialization error: argument out of range";
 
-pub const CALLBACK_BAD_FUNC: &[u8] = b"no callback function with that name exists in contract";
+pub const CALLBACK_BAD_FUNC: &str = "no callback function with that name exists in contract";
 
 pub const RECIPIENT_ADDRESS_NOT_SET: &str = "recipient address not set";
-pub static ONLY_OWNER_CALLER: &[u8] = b"Endpoint can only be called by owner";
-pub static ONLY_USER_ACCOUNT_CALLER: &[u8] = b"Endpoint can only be called by user accounts";
+pub static ONLY_OWNER_CALLER: &str = "Endpoint can only be called by owner";
+pub static ONLY_USER_ACCOUNT_CALLER: &str = "Endpoint can only be called by user accounts";
 
-pub const STORAGE_NOT_I64: &[u8] = b"storage not i64";
-pub const STORAGE_NOT_32_BYTES: &[u8] = b"32 bytes of data expected in storage at key";
+pub const STORAGE_NOT_I64: &str = "storage not i64";
+pub const STORAGE_NOT_32_BYTES: &str = "32 bytes of data expected in storage at key";
 
 /// An additional non-VM status, meant just to signal an error in the debugger infrastructure of in the tests.
 pub const DEBUG_API_ERR_STATUS: u64 = 100;
diff --git a/framework/base/src/io/signal_error.rs b/framework/base/src/io/signal_error.rs
index c84c1273fb..5a78918fba 100644
--- a/framework/base/src/io/signal_error.rs
+++ b/framework/base/src/io/signal_error.rs
@@ -10,9 +10,10 @@ pub fn signal_arg_de_error<EA>(arg_id: ArgId, decode_err: DecodeError) -> !
 where
     EA: ManagedTypeApi + ErrorApi,
 {
-    let mut message_buffer = ManagedBuffer::<EA>::new_from_bytes(err_msg::ARG_DECODE_ERROR_1);
+    let mut message_buffer =
+        ManagedBuffer::<EA>::new_from_bytes(err_msg::ARG_DECODE_ERROR_1.as_bytes());
     message_buffer.append_bytes(arg_id.as_bytes());
-    message_buffer.append_bytes(err_msg::ARG_DECODE_ERROR_2);
+    message_buffer.append_bytes(err_msg::ARG_DECODE_ERROR_2.as_bytes());
     message_buffer.append_bytes(decode_err.message_bytes());
     EA::error_api_impl().signal_error_from_buffer(message_buffer.get_handle())
 }
diff --git a/framework/base/src/storage/storage_get.rs b/framework/base/src/storage/storage_get.rs
index e8d07ea9ac..4fc8ee9259 100644
--- a/framework/base/src/storage/storage_get.rs
+++ b/framework/base/src/storage/storage_get.rs
@@ -183,7 +183,8 @@ where
     type HandledErr = Infallible;
 
     fn handle_error(&self, err: DecodeError) -> Self::HandledErr {
-        let mut message_buffer = ManagedBuffer::<M>::new_from_bytes(err_msg::STORAGE_DECODE_ERROR);
+        let mut message_buffer =
+            ManagedBuffer::<M>::new_from_bytes(err_msg::STORAGE_DECODE_ERROR.as_bytes());
         message_buffer.append_bytes(err.message_bytes());
         M::error_api_impl().signal_error_from_buffer(message_buffer.get_handle())
     }
diff --git a/framework/base/src/types/managed/basic/cast_to_i64.rs b/framework/base/src/types/managed/basic/cast_to_i64.rs
index b41ffed95e..a9de298223 100644
--- a/framework/base/src/types/managed/basic/cast_to_i64.rs
+++ b/framework/base/src/types/managed/basic/cast_to_i64.rs
@@ -12,5 +12,5 @@ where
 {
     value
         .try_into()
-        .unwrap_or_else(|_| M::error_api_impl().signal_error(err_msg::CAST_TO_I64_ERROR))
+        .unwrap_or_else(|_| M::error_api_impl().signal_error(err_msg::CAST_TO_I64_ERROR.as_bytes()))
 }
diff --git a/framework/base/src/types/managed/wrapped/esdt_token_data.rs b/framework/base/src/types/managed/wrapped/esdt_token_data.rs
index cef6247dd6..060a66b942 100644
--- a/framework/base/src/types/managed/wrapped/esdt_token_data.rs
+++ b/framework/base/src/types/managed/wrapped/esdt_token_data.rs
@@ -15,7 +15,7 @@ use crate::{
 use crate as multiversx_sc; // needed by the TypeAbi generated code
 use crate::derive::type_abi;
 
-const DECODE_ATTRIBUTE_ERROR_PREFIX: &[u8] = b"error decoding ESDT attributes: ";
+const DECODE_ATTRIBUTE_ERROR_PREFIX: &str = "error decoding ESDT attributes: ";
 
 #[type_abi]
 #[derive(Clone, TopDecode, TopEncode, NestedDecode, NestedEncode, Debug, ManagedVecItem)]
diff --git a/framework/base/src/types/managed/wrapped/token_identifier.rs b/framework/base/src/types/managed/wrapped/token_identifier.rs
index 861e964e8a..961ef28b5c 100644
--- a/framework/base/src/types/managed/wrapped/token_identifier.rs
+++ b/framework/base/src/types/managed/wrapped/token_identifier.rs
@@ -69,9 +69,9 @@ impl<M: ManagedTypeApi> TokenIdentifier<M> {
     pub fn ticker(&self) -> ManagedBuffer<M> {
         let token_id_len = self.buffer.len();
         let ticker_len = M::managed_type_impl().get_token_ticker_len(token_id_len);
-        self.buffer
-            .copy_slice(0, ticker_len)
-            .unwrap_or_else(|| M::error_api_impl().signal_error(err_msg::BAD_TOKEN_TICKER_FORMAT))
+        self.buffer.copy_slice(0, ticker_len).unwrap_or_else(|| {
+            M::error_api_impl().signal_error(err_msg::BAD_TOKEN_TICKER_FORMAT.as_bytes())
+        })
     }
 }
 
diff --git a/framework/derive/src/generate/callback_gen.rs b/framework/derive/src/generate/callback_gen.rs
index d5ed94bc7b..23a3a56713 100644
--- a/framework/derive/src/generate/callback_gen.rs
+++ b/framework/derive/src/generate/callback_gen.rs
@@ -51,7 +51,7 @@ pub fn generate_callback_selector_and_main(
                         self::EndpointWrappers::callback_selector(self, ___cb_closure___) {
                         multiversx_sc::api::ErrorApiImpl::signal_error(
                             &<Self::Api as multiversx_sc::api::ErrorApi>::error_api_impl(),
-                            err_msg::CALLBACK_BAD_FUNC,
+                            err_msg::CALLBACK_BAD_FUNC.as_bytes(),
                         );
                     }
                 }

From eff664a9843fad9acb5e6fca0c147a67ef2fe75e Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 30 Apr 2024 12:38:15 +0300
Subject: [PATCH 0939/1254] removed codec error from bytes

---
 data/codec/src/codec_err.rs | 49 -------------------------------------
 1 file changed, 49 deletions(-)

diff --git a/data/codec/src/codec_err.rs b/data/codec/src/codec_err.rs
index 34ae889e3f..fd78929764 100644
--- a/data/codec/src/codec_err.rs
+++ b/data/codec/src/codec_err.rs
@@ -8,15 +8,6 @@ impl From<&'static str> for EncodeError {
     }
 }
 
-// TODO: convert to "from_bytes" deprecated method in next minor release.
-// Please avoid: it bloats the contract with an unnecessary utf8 validation.
-impl From<&'static [u8]> for EncodeError {
-    #[inline]
-    fn from(message_bytes: &'static [u8]) -> Self {
-        EncodeError(core::str::from_utf8(message_bytes).unwrap())
-    }
-}
-
 impl EncodeError {
     #[inline]
     pub fn message_bytes(&self) -> &'static [u8] {
@@ -41,15 +32,6 @@ impl From<&'static str> for DecodeError {
     }
 }
 
-// TODO: convert to "from_bytes" deprecated method in next minor release.
-// Please avoid: it bloats the contract with an unnecessary utf8 validation.
-impl From<&'static [u8]> for DecodeError {
-    #[inline]
-    fn from(message_bytes: &'static [u8]) -> Self {
-        DecodeError(core::str::from_utf8(message_bytes).unwrap())
-    }
-}
-
 impl DecodeError {
     #[inline]
     pub fn message_bytes(&self) -> &'static [u8] {
@@ -73,34 +55,3 @@ impl DecodeError {
     pub const MULTI_TOO_FEW_ARGS: DecodeError = DecodeError("too few arguments");
     pub const MULTI_TOO_MANY_ARGS: DecodeError = DecodeError("too many arguments");
 }
-
-#[cfg(test)]
-mod test {
-    use super::*;
-
-    #[test]
-    fn decode_error_from_bytes() {
-        let from_bytes = DecodeError::from(&b"error as bytes"[..]);
-        assert_eq!(from_bytes.message_bytes(), b"error as bytes");
-        assert_eq!(from_bytes.message_str(), "error as bytes");
-    }
-
-    #[test]
-    #[should_panic]
-    fn decode_error_from_bad_bytes() {
-        let _ = DecodeError::from(&[0, 159, 146, 150][..]);
-    }
-
-    #[test]
-    fn encode_error_from_bytes() {
-        let from_bytes = EncodeError::from(&b"error as bytes"[..]);
-        assert_eq!(from_bytes.message_bytes(), b"error as bytes");
-        assert_eq!(from_bytes.message_str(), "error as bytes");
-    }
-
-    #[test]
-    #[should_panic]
-    fn encode_error_from_bad_bytes() {
-        let _ = EncodeError::from(&[0, 159, 146, 150][..]);
-    }
-}

From bc3b3935fe64038b23474161c150af22fb174fc0 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 29 May 2024 17:17:11 +0300
Subject: [PATCH 0940/1254] moved scenario-cli to meta crate

---
 Cargo.lock                                    |  3 ++
 framework/meta/Cargo.toml                     | 14 +++--
 framework/meta/src/cli/cli_args_standalone.rs | 33 +++++++++---
 framework/meta/src/cli/cli_standalone_main.rs | 14 +++--
 framework/meta/src/cmd.rs                     |  1 +
 framework/meta/src/cmd/retrieve_address.rs    | 14 +++++
 framework/meta/src/main.rs                    |  5 +-
 framework/scenario/Cargo.toml                 |  4 --
 framework/scenario/src/main.rs                |  4 --
 .../scenario/src/standalone/account_tool.rs   |  2 +-
 framework/scenario/src/standalone/mod.rs      |  4 +-
 .../scenario/src/standalone/scenario_cli.rs   | 51 -------------------
 12 files changed, 68 insertions(+), 81 deletions(-)
 create mode 100644 framework/meta/src/cmd/retrieve_address.rs
 delete mode 100644 framework/scenario/src/main.rs
 delete mode 100644 framework/scenario/src/standalone/scenario_cli.rs

diff --git a/Cargo.lock b/Cargo.lock
index 8210b20eb5..c6c4694bce 100755
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1977,12 +1977,15 @@ dependencies = [
  "copy_dir",
  "multiversx-sc",
  "multiversx-sc-meta-lib",
+ "multiversx-sc-scenario",
+ "multiversx-sdk",
  "pathdiff",
  "reqwest",
  "ruplacer",
  "semver",
  "serde",
  "serde_json",
+ "tokio",
  "toml",
  "zip",
 ]
diff --git a/framework/meta/Cargo.toml b/framework/meta/Cargo.toml
index 4f1aa79634..01eeea95fe 100644
--- a/framework/meta/Cargo.toml
+++ b/framework/meta/Cargo.toml
@@ -26,6 +26,7 @@ template-test-released = []
 
 [dependencies]
 clap = { version = "4.4.7", features = ["derive"] }
+tokio = { version = "1.24", features = ["full"] }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 toml = { version = "0.8.6", features = ["preserve_order"] }
@@ -39,13 +40,20 @@ copy_dir =  "0.1.2"
 pathdiff = "0.2.1" 
 common-path = "1.0.0" 
 
+[dependencies.multiversx-sc-meta-lib]
+version = "=0.50.3"
+path = "../meta-lib"
+
 [dependencies.multiversx-sc]
 version = "=0.50.3"
 path = "../base"
 features = ["alloc", "num-bigint"]
 
-
-[dependencies.multiversx-sc-meta-lib]
+[dependencies.multiversx-sc-scenario]
 version = "=0.50.3"
-path = "../meta-lib"
+path = "../scenario"
+
+[dependencies.multiversx-sdk]
+version = "=0.4.1"
+path = "../../sdk/core"
 
diff --git a/framework/meta/src/cli/cli_args_standalone.rs b/framework/meta/src/cli/cli_args_standalone.rs
index de6d46fac4..e66c83deb4 100644
--- a/framework/meta/src/cli/cli_args_standalone.rs
+++ b/framework/meta/src/cli/cli_args_standalone.rs
@@ -29,6 +29,9 @@ pub struct StandaloneCliArgs {
 
 #[derive(Clone, PartialEq, Eq, Debug, Subcommand)]
 pub enum StandaloneCliAction {
+    #[command(name = "install", about = "Installs framework dependencies")]
+    Install(InstallArgs),
+
     #[command(
         about = "General info about the contract an libraries residing in the targetted directory.."
     )]
@@ -44,12 +47,6 @@ pub enum StandaloneCliAction {
     )]
     Upgrade(UpgradeArgs),
 
-    #[command(
-        name = "local-deps",
-        about = "Generates a report on the local depedencies of contract crates. Will explore indirect depdencies too."
-    )]
-    LocalDeps(LocalDepsArgs),
-
     #[command(name = "new", about = "Creates a contract by a pre-existing template")]
     Template(TemplateArgs),
 
@@ -68,8 +65,16 @@ pub enum StandaloneCliAction {
     #[command(name = "test-coverage", about = "Run test coverage and output report")]
     TestCoverage(TestCoverageArgs),
 
-    #[command(name = "install", about = "Installs framework dependencies")]
-    Install(InstallArgs),
+    #[command(
+        about = "Generates a scenario test initialized with real data fetched from the blockchain."
+    )]
+    Account(AccountArgs),
+
+    #[command(
+        name = "local-deps",
+        about = "Generates a report on the local depedencies of contract crates. Will explore indirect depdencies too."
+    )]
+    LocalDeps(LocalDepsArgs),
 }
 
 #[derive(Default, Clone, PartialEq, Eq, Debug, Args)]
@@ -326,3 +331,15 @@ pub struct InstallWasm32Args {}
 
 #[derive(Default, Clone, PartialEq, Eq, Debug, Args)]
 pub struct InstallWasmOptArgs {}
+
+#[derive(Default, Clone, PartialEq, Eq, Debug, Args)]
+pub struct AccountArgs {
+    /// Provide the target API you want the real data to come from
+    #[arg(long = "api")]
+    #[clap(global = true)]
+    pub api: Option<String>,
+
+    /// Provide the address you want to retrieve data from
+    #[arg(long = "address", verbatim_doc_comment)]
+    pub address: String,
+}
diff --git a/framework/meta/src/cli/cli_standalone_main.rs b/framework/meta/src/cli/cli_standalone_main.rs
index f9d8b3d6b8..6c8c6a67b0 100644
--- a/framework/meta/src/cli/cli_standalone_main.rs
+++ b/framework/meta/src/cli/cli_standalone_main.rs
@@ -1,4 +1,5 @@
 use crate::cli::{StandaloneCliAction, StandaloneCliArgs};
+use crate::cmd::retrieve_address::retrieve_address;
 use clap::Parser;
 
 use crate::cmd::all::call_all_meta;
@@ -12,17 +13,15 @@ use crate::cmd::test_coverage::test_coverage;
 use crate::cmd::upgrade::upgrade_sc;
 
 /// Entry point in the program when calling it as a standalone tool.
-pub fn cli_main_standalone() {
+pub async fn cli_main_standalone() {
     let cli_args = StandaloneCliArgs::parse();
     match &cli_args.command {
         Some(StandaloneCliAction::Info(args)) => call_info(args),
+        Some(StandaloneCliAction::Install(args)) => install(args),
         Some(StandaloneCliAction::All(args)) => call_all_meta(args),
         Some(StandaloneCliAction::Upgrade(args)) => {
             upgrade_sc(args);
         },
-        Some(StandaloneCliAction::LocalDeps(args)) => {
-            local_deps(args);
-        },
         Some(StandaloneCliAction::Template(args)) => {
             create_contract(args);
         },
@@ -36,7 +35,12 @@ pub fn cli_main_standalone() {
         Some(StandaloneCliAction::TestCoverage(args)) => {
             test_coverage(args);
         },
-        Some(StandaloneCliAction::Install(args)) => install(args),
+        Some(StandaloneCliAction::Account(args)) => {
+            retrieve_address(args).await;
+        },
+        Some(StandaloneCliAction::LocalDeps(args)) => {
+            local_deps(args);
+        },
         None => {},
     }
 }
diff --git a/framework/meta/src/cmd.rs b/framework/meta/src/cmd.rs
index 698f10c924..a588f90162 100644
--- a/framework/meta/src/cmd.rs
+++ b/framework/meta/src/cmd.rs
@@ -3,6 +3,7 @@ pub mod info;
 pub mod install;
 pub mod local_deps;
 pub mod print_util;
+pub mod retrieve_address;
 pub mod scen_test_gen;
 pub mod template;
 pub mod test;
diff --git a/framework/meta/src/cmd/retrieve_address.rs b/framework/meta/src/cmd/retrieve_address.rs
new file mode 100644
index 0000000000..bee3dd90b7
--- /dev/null
+++ b/framework/meta/src/cmd/retrieve_address.rs
@@ -0,0 +1,14 @@
+use multiversx_sc_scenario::{imports::Bech32Address, standalone::account_tool};
+use multiversx_sdk::blockchain::CommunicationProxy;
+
+use crate::cli::AccountArgs;
+
+pub async fn retrieve_address(args: &AccountArgs) {
+    let api_string = args.api.clone().expect("API needs to be specified");
+    let api = CommunicationProxy::new(api_string);
+    account_tool::print_account_as_scenario_set_state(
+        &api,
+        &Bech32Address::from_bech32_string(args.address.to_string()),
+    )
+    .await;
+}
diff --git a/framework/meta/src/main.rs b/framework/meta/src/main.rs
index b3ecec7201..bf9813b1d0 100644
--- a/framework/meta/src/main.rs
+++ b/framework/meta/src/main.rs
@@ -1,3 +1,4 @@
-fn main() {
-    multiversx_sc_meta::cli::cli_main_standalone();
+#[tokio::main]
+async fn main() {
+    multiversx_sc_meta::cli::cli_main_standalone().await;
 }
diff --git a/framework/scenario/Cargo.toml b/framework/scenario/Cargo.toml
index d6671523d0..b41d274621 100644
--- a/framework/scenario/Cargo.toml
+++ b/framework/scenario/Cargo.toml
@@ -33,10 +33,6 @@ clap = { version = "4.4.7", features = ["derive"] }
 tokio = { version = "1.24", features = ["full"] }
 unwrap-infallible = "0.1.5"
 
-[[bin]]
-name = "sc-scenario"
-path = "src/main.rs"
-
 [features]
 run-go-tests = []
 
diff --git a/framework/scenario/src/main.rs b/framework/scenario/src/main.rs
deleted file mode 100644
index 7de76cd7cf..0000000000
--- a/framework/scenario/src/main.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-#[tokio::main]
-async fn main() {
-    multiversx_sc_scenario::standalone::cli_main().await;
-}
diff --git a/framework/scenario/src/standalone/account_tool.rs b/framework/scenario/src/standalone/account_tool.rs
index b6db384b91..a729edd6a1 100644
--- a/framework/scenario/src/standalone/account_tool.rs
+++ b/framework/scenario/src/standalone/account_tool.rs
@@ -61,7 +61,7 @@ pub async fn retrieve_account_as_scenario_set_state(
     set_state_step.put_account(address, account_state)
 }
 
-pub fn set_account(
+fn set_account(
     account: multiversx_sdk::data::account::Account,
     account_storage: HashMap<String, String>,
     account_esdt: HashMap<String, EsdtBalance>,
diff --git a/framework/scenario/src/standalone/mod.rs b/framework/scenario/src/standalone/mod.rs
index 84ecea3916..d7b8f4e539 100644
--- a/framework/scenario/src/standalone/mod.rs
+++ b/framework/scenario/src/standalone/mod.rs
@@ -1,5 +1,3 @@
-mod account_tool;
-mod scenario_cli;
+pub mod account_tool;
 
 pub use account_tool::retrieve_account_as_scenario_set_state;
-pub use scenario_cli::cli_main;
diff --git a/framework/scenario/src/standalone/scenario_cli.rs b/framework/scenario/src/standalone/scenario_cli.rs
deleted file mode 100644
index 624b316ef0..0000000000
--- a/framework/scenario/src/standalone/scenario_cli.rs
+++ /dev/null
@@ -1,51 +0,0 @@
-use clap::{Args, Parser, Subcommand};
-use multiversx_sdk::blockchain::CommunicationProxy;
-
-use crate::imports::Bech32Address;
-
-use super::account_tool;
-
-/// Parsed arguments of the meta crate CLI.
-#[derive(Default, PartialEq, Eq, Debug, Parser)]
-#[command(version, about)]
-#[command(propagate_version = true)]
-pub struct ScenarioCliArgs {
-    /// Provide the target API you want the real data to come from
-    #[arg(long = "api")]
-    #[clap(global = true)]
-    pub api: Option<String>,
-
-    #[command(subcommand)]
-    pub command: Option<ScenarioCliAction>,
-}
-
-#[derive(Clone, PartialEq, Eq, Debug, Subcommand)]
-pub enum ScenarioCliAction {
-    #[command(
-        about = "Generates a scenario test initialized with real data fetched from the blockchain."
-    )]
-    Account(AccountArgs),
-}
-
-#[derive(Default, Clone, PartialEq, Eq, Debug, Args)]
-pub struct AccountArgs {
-    /// Provide the address you want to retrieve data from
-    #[arg(long = "address", verbatim_doc_comment)]
-    pub address: String,
-}
-
-/// Entry point in the program when calling it as a standalone tool.
-pub async fn cli_main() {
-    let cli_args = ScenarioCliArgs::parse();
-    let api = CommunicationProxy::new(cli_args.api.expect("API needs tp be specified"));
-    match &cli_args.command {
-        Some(ScenarioCliAction::Account(args)) => {
-            account_tool::print_account_as_scenario_set_state(
-                &api,
-                &Bech32Address::from_bech32_string(args.address.to_string()),
-            )
-            .await;
-        },
-        None => {},
-    }
-}

From a1bc377e3c9da4222fc6b78a8c11cb8d900bef17 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 29 May 2024 17:23:13 +0300
Subject: [PATCH 0941/1254] account tool - username fix

---
 framework/scenario/src/standalone/account_tool.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/framework/scenario/src/standalone/account_tool.rs b/framework/scenario/src/standalone/account_tool.rs
index a729edd6a1..845998effe 100644
--- a/framework/scenario/src/standalone/account_tool.rs
+++ b/framework/scenario/src/standalone/account_tool.rs
@@ -71,7 +71,7 @@ fn set_account(
         .nonce(account.nonce)
         .balance(account.balance.as_str())
         .code(account.code);
-    account_state.username = Some(account.username.as_str().into());
+    account_state.username = Some(format!("str:{}", account.username.as_str()).into());
     account_state.storage = convert_storage(account_storage);
 
     for (_, esdt_balance) in account_esdt.iter() {

From f83bbc09061cf52147fbb2069c14cfdf7adc0f3c Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 29 May 2024 17:37:15 +0300
Subject: [PATCH 0942/1254] account tool moved to multiversx-sc-snippets

---
 Cargo.lock                                               | 2 ++
 framework/meta/Cargo.toml                                | 4 ++++
 framework/meta/src/cmd/retrieve_address.rs               | 3 ++-
 framework/scenario/src/imports.rs                        | 1 -
 framework/scenario/src/lib.rs                            | 1 -
 framework/scenario/src/standalone/mod.rs                 | 3 ---
 framework/snippets/Cargo.toml                            | 4 ++++
 .../src/standalone => snippets/src}/account_tool.rs      | 9 ++++-----
 framework/snippets/src/interactor.rs                     | 4 ++--
 framework/snippets/src/lib.rs                            | 1 +
 10 files changed, 19 insertions(+), 13 deletions(-)
 delete mode 100644 framework/scenario/src/standalone/mod.rs
 rename framework/{scenario/src/standalone => snippets/src}/account_tool.rs (97%)

diff --git a/Cargo.lock b/Cargo.lock
index c6c4694bce..601696bd3b 100755
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1978,6 +1978,7 @@ dependencies = [
  "multiversx-sc",
  "multiversx-sc-meta-lib",
  "multiversx-sc-scenario",
+ "multiversx-sc-snippets",
  "multiversx-sdk",
  "pathdiff",
  "reqwest",
@@ -2052,6 +2053,7 @@ dependencies = [
  "futures",
  "hex",
  "log",
+ "multiversx-chain-scenario-format",
  "multiversx-sc-scenario",
  "multiversx-sdk",
  "tokio",
diff --git a/framework/meta/Cargo.toml b/framework/meta/Cargo.toml
index 01eeea95fe..4afd663857 100644
--- a/framework/meta/Cargo.toml
+++ b/framework/meta/Cargo.toml
@@ -49,6 +49,10 @@ version = "=0.50.3"
 path = "../base"
 features = ["alloc", "num-bigint"]
 
+[dependencies.multiversx-sc-snippets]
+version = "=0.50.3"
+path = "../snippets"
+
 [dependencies.multiversx-sc-scenario]
 version = "=0.50.3"
 path = "../scenario"
diff --git a/framework/meta/src/cmd/retrieve_address.rs b/framework/meta/src/cmd/retrieve_address.rs
index bee3dd90b7..62e07297cf 100644
--- a/framework/meta/src/cmd/retrieve_address.rs
+++ b/framework/meta/src/cmd/retrieve_address.rs
@@ -1,4 +1,5 @@
-use multiversx_sc_scenario::{imports::Bech32Address, standalone::account_tool};
+use multiversx_sc_scenario::imports::Bech32Address;
+use multiversx_sc_snippets::account_tool;
 use multiversx_sdk::blockchain::CommunicationProxy;
 
 use crate::cli::AccountArgs;
diff --git a/framework/scenario/src/imports.rs b/framework/scenario/src/imports.rs
index 9eac89fc70..0b8aa71266 100644
--- a/framework/scenario/src/imports.rs
+++ b/framework/scenario/src/imports.rs
@@ -20,7 +20,6 @@ pub use crate::{
         ScenarioRunner,
     },
     scenario_format::interpret_trait::{InterpretableFrom, InterpreterContext},
-    standalone::retrieve_account_as_scenario_set_state,
     test_wallets,
     whitebox_legacy::*,
     ScenarioTxRun,
diff --git a/framework/scenario/src/lib.rs b/framework/scenario/src/lib.rs
index e79d159f1e..418c8e330c 100644
--- a/framework/scenario/src/lib.rs
+++ b/framework/scenario/src/lib.rs
@@ -8,7 +8,6 @@ mod facade;
 pub mod managed_test_util;
 pub mod scenario;
 pub mod scenario_macros;
-pub mod standalone;
 pub mod test_wallets;
 mod vm_go_tool;
 
diff --git a/framework/scenario/src/standalone/mod.rs b/framework/scenario/src/standalone/mod.rs
deleted file mode 100644
index d7b8f4e539..0000000000
--- a/framework/scenario/src/standalone/mod.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-pub mod account_tool;
-
-pub use account_tool::retrieve_account_as_scenario_set_state;
diff --git a/framework/snippets/Cargo.toml b/framework/snippets/Cargo.toml
index 49961c84de..495e98425e 100644
--- a/framework/snippets/Cargo.toml
+++ b/framework/snippets/Cargo.toml
@@ -25,6 +25,10 @@ futures = "0.3"
 version = "=0.50.3"
 path = "../scenario"
 
+[dependencies.multiversx-chain-scenario-format]
+version = "0.22.2"
+path = "../../sdk/scenario-format"
+
 [dependencies.multiversx-sdk]
 version = "=0.4.1"
 path = "../../sdk/core"
diff --git a/framework/scenario/src/standalone/account_tool.rs b/framework/snippets/src/account_tool.rs
similarity index 97%
rename from framework/scenario/src/standalone/account_tool.rs
rename to framework/snippets/src/account_tool.rs
index 845998effe..b7e52ef7bb 100644
--- a/framework/scenario/src/standalone/account_tool.rs
+++ b/framework/snippets/src/account_tool.rs
@@ -1,9 +1,8 @@
-use crate::{
+use multiversx_chain_scenario_format::interpret_trait::IntoRaw;
+use multiversx_sc_scenario::{
     imports::Bech32Address,
-    scenario_model::{Account, BytesKey, BytesValue, Scenario, SetStateStep},
+    scenario_model::{Account, BytesKey, BytesValue, Scenario, SetStateStep, Step},
 };
-
-use multiversx_chain_scenario_format::interpret_trait::IntoRaw;
 use multiversx_sdk::{
     blockchain::CommunicationProxy,
     data::{address::Address, esdt::EsdtBalance},
@@ -24,7 +23,7 @@ fn build_scenario(set_state: SetStateStep) -> Scenario {
         name: None,
         comment: None,
         check_gas: None,
-        steps: vec![crate::scenario_model::Step::SetState(set_state)],
+        steps: vec![Step::SetState(set_state)],
     }
 }
 
diff --git a/framework/snippets/src/interactor.rs b/framework/snippets/src/interactor.rs
index 35d53a4a86..82c59752f6 100644
--- a/framework/snippets/src/interactor.rs
+++ b/framework/snippets/src/interactor.rs
@@ -1,5 +1,5 @@
 use multiversx_sc_scenario::{
-    imports::{retrieve_account_as_scenario_set_state, Bech32Address, ScenarioRunner},
+    imports::{Bech32Address, ScenarioRunner},
     mandos_system::{run_list::ScenarioRunnerList, run_trace::ScenarioTraceFile},
     multiversx_sc::types::Address,
     scenario_model::AddressValue,
@@ -15,7 +15,7 @@ use std::{
     time::Duration,
 };
 
-use crate::Sender;
+use crate::{account_tool::retrieve_account_as_scenario_set_state, Sender};
 
 pub const INTERACTOR_SCENARIO_TRACE_PATH: &str = "interactor_trace.scen.json";
 
diff --git a/framework/snippets/src/lib.rs b/framework/snippets/src/lib.rs
index b94a6517d9..d54bf2846f 100644
--- a/framework/snippets/src/lib.rs
+++ b/framework/snippets/src/lib.rs
@@ -1,3 +1,4 @@
+pub mod account_tool;
 mod interactor;
 mod interactor_dns;
 mod interactor_retrieve;

From 2335ac5809131c5260571f71f69eefad76df2ac2 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 29 May 2024 17:45:22 +0300
Subject: [PATCH 0943/1254] cleanup, removed meta deps to scenario and sdk

---
 Cargo.lock                                 |  2 --
 framework/meta/Cargo.toml                  |  9 ---------
 framework/meta/src/cmd/retrieve_address.rs | 10 ++--------
 framework/snippets/src/account_tool.rs     | 12 +++++++++---
 4 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 601696bd3b..a7bc64efd5 100755
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1977,9 +1977,7 @@ dependencies = [
  "copy_dir",
  "multiversx-sc",
  "multiversx-sc-meta-lib",
- "multiversx-sc-scenario",
  "multiversx-sc-snippets",
- "multiversx-sdk",
  "pathdiff",
  "reqwest",
  "ruplacer",
diff --git a/framework/meta/Cargo.toml b/framework/meta/Cargo.toml
index 4afd663857..029bbfdb6e 100644
--- a/framework/meta/Cargo.toml
+++ b/framework/meta/Cargo.toml
@@ -52,12 +52,3 @@ features = ["alloc", "num-bigint"]
 [dependencies.multiversx-sc-snippets]
 version = "=0.50.3"
 path = "../snippets"
-
-[dependencies.multiversx-sc-scenario]
-version = "=0.50.3"
-path = "../scenario"
-
-[dependencies.multiversx-sdk]
-version = "=0.4.1"
-path = "../../sdk/core"
-
diff --git a/framework/meta/src/cmd/retrieve_address.rs b/framework/meta/src/cmd/retrieve_address.rs
index 62e07297cf..f20b5b8e05 100644
--- a/framework/meta/src/cmd/retrieve_address.rs
+++ b/framework/meta/src/cmd/retrieve_address.rs
@@ -1,15 +1,9 @@
-use multiversx_sc_scenario::imports::Bech32Address;
 use multiversx_sc_snippets::account_tool;
-use multiversx_sdk::blockchain::CommunicationProxy;
 
 use crate::cli::AccountArgs;
 
+/// Interprets arguments and call the account tool from `multiversx_sc_snippets`.
 pub async fn retrieve_address(args: &AccountArgs) {
     let api_string = args.api.clone().expect("API needs to be specified");
-    let api = CommunicationProxy::new(api_string);
-    account_tool::print_account_as_scenario_set_state(
-        &api,
-        &Bech32Address::from_bech32_string(args.address.to_string()),
-    )
-    .await;
+    account_tool::print_account_as_scenario_set_state(api_string, args.address.to_string()).await;
 }
diff --git a/framework/snippets/src/account_tool.rs b/framework/snippets/src/account_tool.rs
index b7e52ef7bb..db1f14b4af 100644
--- a/framework/snippets/src/account_tool.rs
+++ b/framework/snippets/src/account_tool.rs
@@ -9,11 +9,17 @@ use multiversx_sdk::{
 };
 use std::collections::{BTreeMap, HashMap};
 
+/// Called directly from CLI, from `sc-meta`.
+/// 
+/// Retrieves an account data via the API,
+/// then formats it as a scenario set state step.
 pub async fn print_account_as_scenario_set_state(
-    api: &CommunicationProxy,
-    address: &Bech32Address,
+    api_string: String,
+    address_bech32_string: String,
 ) {
-    let set_state = retrieve_account_as_scenario_set_state(api, address).await;
+    let api = CommunicationProxy::new(api_string);
+    let address = Bech32Address::from_bech32_string(address_bech32_string);
+    let set_state = retrieve_account_as_scenario_set_state(&api, &address).await;
     let scenario = build_scenario(set_state);
     println!("{}", scenario.into_raw().to_json_string());
 }

From 51b404eeba108d4d9df2e074b269375258a09970 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 29 May 2024 17:50:30 +0300
Subject: [PATCH 0944/1254] moved test_wallets to snippets

---
 framework/scenario/src/imports.rs                             | 1 -
 framework/scenario/src/lib.rs                                 | 1 -
 framework/snippets/src/imports.rs                             | 4 +++-
 framework/snippets/src/lib.rs                                 | 1 +
 framework/{scenario => snippets}/src/test_wallets/alice.pem   | 0
 framework/{scenario => snippets}/src/test_wallets/bob.pem     | 0
 framework/{scenario => snippets}/src/test_wallets/carol.pem   | 0
 framework/{scenario => snippets}/src/test_wallets/dan.pem     | 0
 framework/{scenario => snippets}/src/test_wallets/eve.pem     | 0
 framework/{scenario => snippets}/src/test_wallets/frank.pem   | 0
 framework/{scenario => snippets}/src/test_wallets/grace.pem   | 0
 framework/{scenario => snippets}/src/test_wallets/heidi.pem   | 0
 framework/{scenario => snippets}/src/test_wallets/ivan.pem    | 0
 framework/{scenario => snippets}/src/test_wallets/judy.pem    | 0
 framework/{scenario => snippets}/src/test_wallets/mallory.pem | 0
 framework/{scenario => snippets}/src/test_wallets/mike.pem    | 0
 framework/{scenario => snippets}/src/test_wallets/mod.rs      | 0
 17 files changed, 4 insertions(+), 3 deletions(-)
 rename framework/{scenario => snippets}/src/test_wallets/alice.pem (100%)
 rename framework/{scenario => snippets}/src/test_wallets/bob.pem (100%)
 rename framework/{scenario => snippets}/src/test_wallets/carol.pem (100%)
 rename framework/{scenario => snippets}/src/test_wallets/dan.pem (100%)
 rename framework/{scenario => snippets}/src/test_wallets/eve.pem (100%)
 rename framework/{scenario => snippets}/src/test_wallets/frank.pem (100%)
 rename framework/{scenario => snippets}/src/test_wallets/grace.pem (100%)
 rename framework/{scenario => snippets}/src/test_wallets/heidi.pem (100%)
 rename framework/{scenario => snippets}/src/test_wallets/ivan.pem (100%)
 rename framework/{scenario => snippets}/src/test_wallets/judy.pem (100%)
 rename framework/{scenario => snippets}/src/test_wallets/mallory.pem (100%)
 rename framework/{scenario => snippets}/src/test_wallets/mike.pem (100%)
 rename framework/{scenario => snippets}/src/test_wallets/mod.rs (100%)

diff --git a/framework/scenario/src/imports.rs b/framework/scenario/src/imports.rs
index 0b8aa71266..0da1a2d072 100644
--- a/framework/scenario/src/imports.rs
+++ b/framework/scenario/src/imports.rs
@@ -20,7 +20,6 @@ pub use crate::{
         ScenarioRunner,
     },
     scenario_format::interpret_trait::{InterpretableFrom, InterpreterContext},
-    test_wallets,
     whitebox_legacy::*,
     ScenarioTxRun,
 };
diff --git a/framework/scenario/src/lib.rs b/framework/scenario/src/lib.rs
index 418c8e330c..cfac7eaa50 100644
--- a/framework/scenario/src/lib.rs
+++ b/framework/scenario/src/lib.rs
@@ -8,7 +8,6 @@ mod facade;
 pub mod managed_test_util;
 pub mod scenario;
 pub mod scenario_macros;
-pub mod test_wallets;
 mod vm_go_tool;
 
 pub mod whitebox_legacy;
diff --git a/framework/snippets/src/imports.rs b/framework/snippets/src/imports.rs
index b031e0769c..f2b0e6a5f9 100644
--- a/framework/snippets/src/imports.rs
+++ b/framework/snippets/src/imports.rs
@@ -1,6 +1,8 @@
 pub use crate::multiversx_sc_scenario::imports::*;
 
-pub use crate::{dns_address_for_name, Interactor, InteractorPrepareAsync, StepBuffer};
+pub use crate::{
+    dns_address_for_name, test_wallets, Interactor, InteractorPrepareAsync, StepBuffer,
+};
 
 pub use env_logger;
 pub use tokio;
diff --git a/framework/snippets/src/lib.rs b/framework/snippets/src/lib.rs
index d54bf2846f..07c5789d8c 100644
--- a/framework/snippets/src/lib.rs
+++ b/framework/snippets/src/lib.rs
@@ -6,6 +6,7 @@ mod interactor_scenario;
 mod interactor_sender;
 mod interactor_tx;
 mod multi;
+pub mod test_wallets;
 
 pub use env_logger;
 pub use hex;
diff --git a/framework/scenario/src/test_wallets/alice.pem b/framework/snippets/src/test_wallets/alice.pem
similarity index 100%
rename from framework/scenario/src/test_wallets/alice.pem
rename to framework/snippets/src/test_wallets/alice.pem
diff --git a/framework/scenario/src/test_wallets/bob.pem b/framework/snippets/src/test_wallets/bob.pem
similarity index 100%
rename from framework/scenario/src/test_wallets/bob.pem
rename to framework/snippets/src/test_wallets/bob.pem
diff --git a/framework/scenario/src/test_wallets/carol.pem b/framework/snippets/src/test_wallets/carol.pem
similarity index 100%
rename from framework/scenario/src/test_wallets/carol.pem
rename to framework/snippets/src/test_wallets/carol.pem
diff --git a/framework/scenario/src/test_wallets/dan.pem b/framework/snippets/src/test_wallets/dan.pem
similarity index 100%
rename from framework/scenario/src/test_wallets/dan.pem
rename to framework/snippets/src/test_wallets/dan.pem
diff --git a/framework/scenario/src/test_wallets/eve.pem b/framework/snippets/src/test_wallets/eve.pem
similarity index 100%
rename from framework/scenario/src/test_wallets/eve.pem
rename to framework/snippets/src/test_wallets/eve.pem
diff --git a/framework/scenario/src/test_wallets/frank.pem b/framework/snippets/src/test_wallets/frank.pem
similarity index 100%
rename from framework/scenario/src/test_wallets/frank.pem
rename to framework/snippets/src/test_wallets/frank.pem
diff --git a/framework/scenario/src/test_wallets/grace.pem b/framework/snippets/src/test_wallets/grace.pem
similarity index 100%
rename from framework/scenario/src/test_wallets/grace.pem
rename to framework/snippets/src/test_wallets/grace.pem
diff --git a/framework/scenario/src/test_wallets/heidi.pem b/framework/snippets/src/test_wallets/heidi.pem
similarity index 100%
rename from framework/scenario/src/test_wallets/heidi.pem
rename to framework/snippets/src/test_wallets/heidi.pem
diff --git a/framework/scenario/src/test_wallets/ivan.pem b/framework/snippets/src/test_wallets/ivan.pem
similarity index 100%
rename from framework/scenario/src/test_wallets/ivan.pem
rename to framework/snippets/src/test_wallets/ivan.pem
diff --git a/framework/scenario/src/test_wallets/judy.pem b/framework/snippets/src/test_wallets/judy.pem
similarity index 100%
rename from framework/scenario/src/test_wallets/judy.pem
rename to framework/snippets/src/test_wallets/judy.pem
diff --git a/framework/scenario/src/test_wallets/mallory.pem b/framework/snippets/src/test_wallets/mallory.pem
similarity index 100%
rename from framework/scenario/src/test_wallets/mallory.pem
rename to framework/snippets/src/test_wallets/mallory.pem
diff --git a/framework/scenario/src/test_wallets/mike.pem b/framework/snippets/src/test_wallets/mike.pem
similarity index 100%
rename from framework/scenario/src/test_wallets/mike.pem
rename to framework/snippets/src/test_wallets/mike.pem
diff --git a/framework/scenario/src/test_wallets/mod.rs b/framework/snippets/src/test_wallets/mod.rs
similarity index 100%
rename from framework/scenario/src/test_wallets/mod.rs
rename to framework/snippets/src/test_wallets/mod.rs

From 915df0b847f266a1f677607425d5261f20b8b047 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 29 May 2024 17:50:44 +0300
Subject: [PATCH 0945/1254] moved test_wallets mod.rs

---
 .../{test_wallets/mod.rs => test_wallets.rs}  | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)
 rename framework/snippets/src/{test_wallets/mod.rs => test_wallets.rs} (60%)

diff --git a/framework/snippets/src/test_wallets/mod.rs b/framework/snippets/src/test_wallets.rs
similarity index 60%
rename from framework/snippets/src/test_wallets/mod.rs
rename to framework/snippets/src/test_wallets.rs
index 437f5c829f..341f93ef29 100644
--- a/framework/snippets/src/test_wallets/mod.rs
+++ b/framework/snippets/src/test_wallets.rs
@@ -6,60 +6,60 @@ fn test_wallet(pem_file_contents: &str) -> Wallet {
 
 /// Test wallet. Do not use on mainnet.
 pub fn alice() -> Wallet {
-    test_wallet(include_str!("alice.pem"))
+    test_wallet(include_str!("test_wallets/alice.pem"))
 }
 
 /// Test wallet. Do not use on mainnet.
 pub fn bob() -> Wallet {
-    test_wallet(include_str!("bob.pem"))
+    test_wallet(include_str!("test_wallets/bob.pem"))
 }
 
 /// Test wallet. Do not use on mainnet.
 pub fn carol() -> Wallet {
-    test_wallet(include_str!("carol.pem"))
+    test_wallet(include_str!("test_wallets/carol.pem"))
 }
 
 /// Test wallet. Do not use on mainnet.
 pub fn dan() -> Wallet {
-    test_wallet(include_str!("dan.pem"))
+    test_wallet(include_str!("test_wallets/dan.pem"))
 }
 
 /// Test wallet. Do not use on mainnet.
 pub fn eve() -> Wallet {
-    test_wallet(include_str!("eve.pem"))
+    test_wallet(include_str!("test_wallets/eve.pem"))
 }
 
 /// Test wallet. Do not use on mainnet.
 pub fn frank() -> Wallet {
-    test_wallet(include_str!("frank.pem"))
+    test_wallet(include_str!("test_wallets/frank.pem"))
 }
 
 /// Test wallet. Do not use on mainnet.
 pub fn grace() -> Wallet {
-    test_wallet(include_str!("grace.pem"))
+    test_wallet(include_str!("test_wallets/grace.pem"))
 }
 
 /// Test wallet. Do not use on mainnet.
 pub fn heidi() -> Wallet {
-    test_wallet(include_str!("heidi.pem"))
+    test_wallet(include_str!("test_wallets/heidi.pem"))
 }
 
 /// Test wallet. Do not use on mainnet.
 pub fn ivan() -> Wallet {
-    test_wallet(include_str!("ivan.pem"))
+    test_wallet(include_str!("test_wallets/ivan.pem"))
 }
 
 /// Test wallet. Do not use on mainnet.
 pub fn judy() -> Wallet {
-    test_wallet(include_str!("judy.pem"))
+    test_wallet(include_str!("test_wallets/judy.pem"))
 }
 
 /// Test wallet. Do not use on mainnet.
 pub fn mallory() -> Wallet {
-    test_wallet(include_str!("mallory.pem"))
+    test_wallet(include_str!("test_wallets/mallory.pem"))
 }
 
 /// Test wallet. Do not use on mainnet.
 pub fn mike() -> Wallet {
-    test_wallet(include_str!("mike.pem"))
+    test_wallet(include_str!("test_wallets/mike.pem"))
 }

From 28de5b53652fc1972347f38a14dabe94aa58b1de Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 29 May 2024 21:39:05 +0300
Subject: [PATCH 0946/1254] moved tx response parser to multiversx-sc-snippets

---
 Cargo.lock                                    |  29 +--
 .../src/scenario/model/transaction.rs         |   2 -
 .../scenario/model/transaction/tx_response.rs | 186 +-------------
 .../model/transaction/tx_response_status.rs   |   4 +-
 .../model/transaction/tx_response_utils.rs    |  35 ---
 framework/snippets/Cargo.toml                 |   3 +
 framework/snippets/src/account_tool.rs        |   2 +-
 .../interactor_scenario/interactor_sc_call.rs |   6 +-
 .../interactor_sc_deploy.rs                   |   6 +-
 framework/snippets/src/lib.rs                 |   1 +
 .../src/multi/interactor_multi_sc_exec.rs     |   7 +-
 .../snippets/src/tx_response_from_network.rs  | 228 ++++++++++++++++++
 .../tests/test_tx_deployed_address.rs         |   8 +-
 .../tests/test_tx_issued_token_identifier.rs  |  14 +-
 .../tests/test_tx_multi_contract_sc_result.rs |  10 +-
 .../tests/test_tx_multiple_sc_results.rs      |   4 +-
 .../tests/test_tx_sc_result.rs                |   6 +-
 17 files changed, 285 insertions(+), 266 deletions(-)
 delete mode 100644 framework/scenario/src/scenario/model/transaction/tx_response_utils.rs
 create mode 100644 framework/snippets/src/tx_response_from_network.rs
 rename framework/{scenario => snippets}/tests/test_tx_deployed_address.rs (99%)
 rename framework/{scenario => snippets}/tests/test_tx_issued_token_identifier.rs (99%)
 rename framework/{scenario => snippets}/tests/test_tx_multi_contract_sc_result.rs (98%)
 rename framework/{scenario => snippets}/tests/test_tx_multiple_sc_results.rs (98%)
 rename framework/{scenario => snippets}/tests/test_tx_sc_result.rs (98%)

diff --git a/Cargo.lock b/Cargo.lock
index a7bc64efd5..fb08c18c3e 100755
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -47,9 +47,9 @@ dependencies = [
 
 [[package]]
 name = "addr2line"
-version = "0.21.0"
+version = "0.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
+checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678"
 dependencies = [
  "gimli",
 ]
@@ -182,9 +182,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "backtrace"
-version = "0.3.71"
+version = "0.3.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d"
+checksum = "17c6a35df3749d2e8bb1b7b21a976d82b15548788d2735b9d82f329268f71a11"
 dependencies = [
  "addr2line",
  "cc",
@@ -1286,9 +1286,9 @@ dependencies = [
 
 [[package]]
 name = "gimli"
-version = "0.28.1"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
+checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd"
 
 [[package]]
 name = "globset"
@@ -1449,9 +1449,9 @@ dependencies = [
 
 [[package]]
 name = "hyper-util"
-version = "0.1.4"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d8d52be92d09acc2e01dddb7fde3ad983fc6489c7db4837e605bc3fca4cb63e"
+checksum = "7b875924a60b96e5d7b9ae7b066540b1dd1cbd90d1828f54c92e02a283351c56"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -2054,6 +2054,7 @@ dependencies = [
  "multiversx-chain-scenario-format",
  "multiversx-sc-scenario",
  "multiversx-sdk",
+ "serde_json",
  "tokio",
 ]
 
@@ -2232,9 +2233,9 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.32.2"
+version = "0.35.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441"
+checksum = "b8ec7ab813848ba4522158d5517a6093db1ded27575b070f4177b8d12b41db5e"
 dependencies = [
  "memchr",
 ]
@@ -3885,9 +3886,9 @@ checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0"
 
 [[package]]
 name = "winnow"
-version = "0.6.8"
+version = "0.6.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3c52e9c97a68071b23e836c9380edae937f17b9c4667bd021973efc689f618d"
+checksum = "86c949fede1d13936a99f14fafd3e76fd642b556dd2ce96287fbe2e0151bfac6"
 dependencies = [
  "memchr",
 ]
@@ -3944,9 +3945,9 @@ dependencies = [
 
 [[package]]
 name = "zip"
-version = "2.1.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2568cd0f20e86cd9a7349fe05178f7bd22f22724678448ae5a9bac266df2689"
+checksum = "1dd56a4d5921bc2f99947ac5b3abe5f510b1be7376fdc5e9fce4a23c6a93e87c"
 dependencies = [
  "arbitrary",
  "crc32fast",
diff --git a/framework/scenario/src/scenario/model/transaction.rs b/framework/scenario/src/scenario/model/transaction.rs
index c1a6d6a271..3ffa8a542d 100644
--- a/framework/scenario/src/scenario/model/transaction.rs
+++ b/framework/scenario/src/scenario/model/transaction.rs
@@ -9,7 +9,6 @@ mod tx_interpret_util;
 mod tx_query;
 mod tx_response;
 mod tx_response_status;
-mod tx_response_utils;
 mod tx_transfer;
 mod tx_validator_reward;
 mod typed_response;
@@ -24,7 +23,6 @@ pub use tx_expect::*;
 pub use tx_query::*;
 pub use tx_response::TxResponse;
 pub use tx_response_status::TxResponseStatus;
-pub use tx_response_utils::*;
 pub use tx_transfer::*;
 pub use tx_validator_reward::*;
 pub use typed_response::TypedResponse;
diff --git a/framework/scenario/src/scenario/model/transaction/tx_response.rs b/framework/scenario/src/scenario/model/transaction/tx_response.rs
index 1465885476..46806b1183 100644
--- a/framework/scenario/src/scenario/model/transaction/tx_response.rs
+++ b/framework/scenario/src/scenario/model/transaction/tx_response.rs
@@ -1,16 +1,8 @@
-use multiversx_chain_vm::{crypto_functions::keccak256, tx_mock::TxResult};
-use multiversx_sc::types::{Address, ESDTSystemSCAddress};
-use multiversx_sdk::{
-    data::transaction::{ApiLogs, ApiSmartContractResult, Events, TransactionOnNetwork},
-    utils::base64_decode,
-};
+use multiversx_chain_vm::tx_mock::TxResult;
+use multiversx_sc::types::Address;
+use multiversx_sdk::data::transaction::{ApiLogs, ApiSmartContractResult};
 
-use super::{
-    decode_scr_data_or_panic, is_out_scr, process_topics_error, Log, TxExpect, TxResponseStatus,
-};
-
-const SC_DEPLOY_PROCESSING_TYPE: &str = "SCDeployment";
-const LOG_IDENTIFIER_SIGNAL_ERROR: &str = "signalError";
+use super::{Log, TxExpect, TxResponseStatus};
 
 #[derive(Debug, Default, Clone)]
 /// The response of a transaction.
@@ -48,26 +40,6 @@ impl TxResponse {
         }
     }
 
-    /// Creates a [`TxResponse`] from a [`TransactionOnNetwork`].
-    pub fn from_network_tx(tx: TransactionOnNetwork) -> Self {
-        let mut response = Self {
-            api_scrs: tx.smart_contract_results.unwrap_or_default(),
-            api_logs: tx.logs,
-            ..Default::default()
-        };
-
-        response.tx_error = response.process_signal_error();
-        if !response.tx_error.is_success() {
-            return response;
-        }
-
-        response.process(
-            tx.sender.to_bytes(),
-            tx.nonce,
-            tx.processing_type_on_destination,
-        )
-    }
-
     /// Creates a [`TxResponse`] from raw results.
     pub fn from_raw_results(raw_results: Vec<Vec<u8>>) -> Self {
         TxResponse {
@@ -103,154 +75,4 @@ impl TxResponse {
     pub fn is_success(&self) -> bool {
         self.tx_error.is_success()
     }
-
-    fn process_signal_error(&self) -> TxResponseStatus {
-        if let Some(event) = self.find_log(LOG_IDENTIFIER_SIGNAL_ERROR) {
-            let topics = event.topics.as_ref();
-            if let Some(error) = process_topics_error(topics) {
-                return TxResponseStatus::signal_error(&error);
-            }
-
-            let error_raw = base64_decode(topics.unwrap().get(1).unwrap());
-            let error = String::from_utf8(error_raw).unwrap();
-            return TxResponseStatus::signal_error(&error);
-        }
-
-        TxResponseStatus::default()
-    }
-
-    fn process(
-        self,
-        sender_address: [u8; 32],
-        nonce: u64,
-        processing_type_on_destination: String,
-    ) -> Self {
-        self.process_out()
-            .process_new_deployed_address(sender_address, nonce, processing_type_on_destination)
-            .process_new_issued_token_identifier()
-    }
-
-    fn process_out(mut self) -> Self {
-        let out_scr = self.api_scrs.iter().find(is_out_scr);
-
-        if let Some(out_scr) = out_scr {
-            self.out = decode_scr_data_or_panic(&out_scr.data);
-        } else if let Some(data) = self.process_out_from_log() {
-            self.out = data
-        }
-
-        self
-    }
-
-    fn process_out_from_log(&self) -> Option<Vec<Vec<u8>>> {
-        if let Some(logs) = &self.api_logs {
-            logs.events.iter().rev().find_map(|event| {
-                if event.identifier == "writeLog" {
-                    if let Some(data) = &event.data {
-                        let decoded_data = String::from_utf8(base64_decode(data)).unwrap();
-
-                        if decoded_data.starts_with('@') {
-                            let out = decode_scr_data_or_panic(decoded_data.as_str());
-                            return Some(out);
-                        }
-                    }
-                }
-
-                None
-            })
-        } else {
-            None
-        }
-    }
-
-    fn process_new_deployed_address(
-        mut self,
-        sender_address_bytes: [u8; 32],
-        nonce: u64,
-        processing_type_on_destination: String,
-    ) -> Self {
-        if processing_type_on_destination != SC_DEPLOY_PROCESSING_TYPE {
-            return self;
-        }
-
-        let sender_nonce_bytes = nonce.to_le_bytes();
-        let mut bytes_to_hash: Vec<u8> = Vec::new();
-        bytes_to_hash.extend_from_slice(&sender_address_bytes);
-        bytes_to_hash.extend_from_slice(&sender_nonce_bytes);
-
-        let address_keccak = keccak256(&bytes_to_hash);
-
-        let mut address = [0u8; 32];
-
-        address[0..8].copy_from_slice(&[0u8; 8]);
-        address[8..10].copy_from_slice(&[5, 0]);
-        address[10..30].copy_from_slice(&address_keccak[10..30]);
-        address[30..32].copy_from_slice(&sender_address_bytes[30..32]);
-
-        self.new_deployed_address = Some(Address::from(address));
-
-        self
-    }
-
-    fn process_new_issued_token_identifier(mut self) -> Self {
-        for scr in self.api_scrs.iter() {
-            if scr.sender.to_bech32_string().unwrap() != ESDTSystemSCAddress.to_bech32_string() {
-                continue;
-            }
-
-            let Some(prev_tx) = self.api_scrs.iter().find(|e| e.hash == scr.prev_tx_hash) else {
-                continue;
-            };
-
-            let is_issue_fungible = prev_tx.data.starts_with("issue@");
-            let is_issue_semi_fungible = prev_tx.data.starts_with("issueSemiFungible@");
-            let is_issue_non_fungible = prev_tx.data.starts_with("issueNonFungible@");
-            let is_register_meta_esdt = prev_tx.data.starts_with("registerMetaESDT@");
-            let is_register_and_set_all_roles_esdt =
-                prev_tx.data.starts_with("registerAndSetAllRoles@");
-
-            if !is_issue_fungible
-                && !is_issue_semi_fungible
-                && !is_issue_non_fungible
-                && !is_register_meta_esdt
-                && !is_register_and_set_all_roles_esdt
-            {
-                continue;
-            }
-
-            if scr.data.starts_with("ESDTTransfer@") {
-                let encoded_tid = scr.data.split('@').nth(1);
-                if encoded_tid.is_none() {
-                    return self;
-                }
-
-                self.new_issued_token_identifier =
-                    Some(String::from_utf8(hex::decode(encoded_tid.unwrap()).unwrap()).unwrap());
-
-                break;
-            } else if scr.data.starts_with("@00@") {
-                let encoded_tid = scr.data.split('@').nth(2);
-                if encoded_tid.is_none() {
-                    return self;
-                }
-
-                self.new_issued_token_identifier =
-                    Some(String::from_utf8(hex::decode(encoded_tid.unwrap()).unwrap()).unwrap());
-
-                break;
-            }
-        }
-
-        self
-    }
-
-    fn find_log(&self, log_identifier: &str) -> Option<&Events> {
-        if let Some(logs) = &self.api_logs {
-            logs.events
-                .iter()
-                .find(|event| event.identifier == log_identifier)
-        } else {
-            None
-        }
-    }
 }
diff --git a/framework/scenario/src/scenario/model/transaction/tx_response_status.rs b/framework/scenario/src/scenario/model/transaction/tx_response_status.rs
index 5c9d057615..e7902047c6 100644
--- a/framework/scenario/src/scenario/model/transaction/tx_response_status.rs
+++ b/framework/scenario/src/scenario/model/transaction/tx_response_status.rs
@@ -9,7 +9,7 @@ pub struct TxResponseStatus {
 
 impl TxResponseStatus {
     /// Creates a [`TxResponseStatus`]
-    pub(crate) fn new(status: u64, message: &str) -> Self {
+    pub fn new(status: u64, message: &str) -> Self {
         Self {
             status,
             message: message.to_string(),
@@ -17,7 +17,7 @@ impl TxResponseStatus {
     }
 
     /// Creates a [`TxResponseStatus`] that signals an error.
-    pub(crate) fn signal_error(message: &str) -> Self {
+    pub fn signal_error(message: &str) -> Self {
         Self::new(4, message)
     }
 
diff --git a/framework/scenario/src/scenario/model/transaction/tx_response_utils.rs b/framework/scenario/src/scenario/model/transaction/tx_response_utils.rs
deleted file mode 100644
index 36c86e920a..0000000000
--- a/framework/scenario/src/scenario/model/transaction/tx_response_utils.rs
+++ /dev/null
@@ -1,35 +0,0 @@
-use multiversx_sdk::data::transaction::ApiSmartContractResult;
-
-/// Checks for invalid topics.
-pub fn process_topics_error(topics: Option<&Vec<String>>) -> Option<String> {
-    if topics.is_none() {
-        return Some("missing topics".to_string());
-    }
-
-    let topics = topics.unwrap();
-    if topics.len() != 2 {
-        Some(format!(
-            "expected to have 2 topics, found {} instead",
-            topics.len()
-        ))
-    } else {
-        None
-    }
-}
-
-/// Decodes the data of a smart contract result.
-pub fn decode_scr_data_or_panic(data: &str) -> Vec<Vec<u8>> {
-    let mut split = data.split('@');
-    let _ = split.next().expect("SCR data should start with '@'");
-    let result_code = split.next().expect("missing result code");
-    assert_eq!(result_code, "6f6b", "result code is not 'ok'");
-
-    split
-        .map(|encoded_arg| hex::decode(encoded_arg).expect("error hex-decoding result"))
-        .collect()
-}
-
-/// Checks if the given smart contract result is an out smart contract result.
-pub fn is_out_scr(scr: &&ApiSmartContractResult) -> bool {
-    scr.nonce != 0 && scr.data.starts_with('@')
-}
diff --git a/framework/snippets/Cargo.toml b/framework/snippets/Cargo.toml
index 495e98425e..4d4b3d4917 100644
--- a/framework/snippets/Cargo.toml
+++ b/framework/snippets/Cargo.toml
@@ -32,3 +32,6 @@ path = "../../sdk/scenario-format"
 [dependencies.multiversx-sdk]
 version = "=0.4.1"
 path = "../../sdk/core"
+
+[dev-dependencies]
+serde_json = "1.0"
diff --git a/framework/snippets/src/account_tool.rs b/framework/snippets/src/account_tool.rs
index db1f14b4af..70eaafdace 100644
--- a/framework/snippets/src/account_tool.rs
+++ b/framework/snippets/src/account_tool.rs
@@ -10,7 +10,7 @@ use multiversx_sdk::{
 use std::collections::{BTreeMap, HashMap};
 
 /// Called directly from CLI, from `sc-meta`.
-/// 
+///
 /// Retrieves an account data via the API,
 /// then formats it as a scenario set state step.
 pub async fn print_account_as_scenario_set_state(
diff --git a/framework/snippets/src/interactor_scenario/interactor_sc_call.rs b/framework/snippets/src/interactor_scenario/interactor_sc_call.rs
index d01e4af590..0e2a800596 100644
--- a/framework/snippets/src/interactor_scenario/interactor_sc_call.rs
+++ b/framework/snippets/src/interactor_scenario/interactor_sc_call.rs
@@ -1,9 +1,9 @@
-use crate::{address_h256_to_erdrs, mandos_to_erdrs_address, Interactor};
+use crate::{address_h256_to_erdrs, mandos_to_erdrs_address, tx_response_from_network, Interactor};
 use log::info;
 use multiversx_sc_scenario::{
     api::StaticApi,
     scenario::ScenarioRunner,
-    scenario_model::{ScCallStep, SetStateStep, TxCall, TxResponse},
+    scenario_model::{ScCallStep, SetStateStep, TxCall},
 };
 use multiversx_sdk::{data::transaction::Transaction, utils::base64_encode};
 
@@ -16,7 +16,7 @@ impl Interactor {
         let tx_hash = self.launch_sc_call(sc_call_step).await;
         let tx = self.retrieve_tx_on_network(tx_hash.clone()).await;
 
-        sc_call_step.save_response(TxResponse::from_network_tx(tx));
+        sc_call_step.save_response(tx_response_from_network::from_network_tx(tx));
 
         if let Some(token_identifier) = sc_call_step.response().new_issued_token_identifier.clone()
         {
diff --git a/framework/snippets/src/interactor_scenario/interactor_sc_deploy.rs b/framework/snippets/src/interactor_scenario/interactor_sc_deploy.rs
index 87d17dff7f..f92da9c070 100644
--- a/framework/snippets/src/interactor_scenario/interactor_sc_deploy.rs
+++ b/framework/snippets/src/interactor_scenario/interactor_sc_deploy.rs
@@ -1,9 +1,9 @@
-use crate::{mandos_to_erdrs_address, Interactor};
+use crate::{mandos_to_erdrs_address, tx_response_from_network, Interactor};
 use log::info;
 use multiversx_sc_scenario::{
     imports::Bech32Address,
     mandos_system::ScenarioRunner,
-    scenario_model::{ScDeployStep, SetStateStep, TxResponse},
+    scenario_model::{ScDeployStep, SetStateStep},
 };
 use multiversx_sdk::{
     data::{address::Address as ErdrsAddress, transaction::Transaction},
@@ -57,7 +57,7 @@ impl Interactor {
 
         let addr = sc_deploy_step.tx.from.clone();
         let nonce = tx.nonce;
-        sc_deploy_step.save_response(TxResponse::from_network_tx(tx));
+        sc_deploy_step.save_response(tx_response_from_network::from_network_tx(tx));
 
         let deploy_address = sc_deploy_step
             .response()
diff --git a/framework/snippets/src/lib.rs b/framework/snippets/src/lib.rs
index 07c5789d8c..ae20ca432a 100644
--- a/framework/snippets/src/lib.rs
+++ b/framework/snippets/src/lib.rs
@@ -7,6 +7,7 @@ mod interactor_sender;
 mod interactor_tx;
 mod multi;
 pub mod test_wallets;
+pub mod tx_response_from_network;
 
 pub use env_logger;
 pub use hex;
diff --git a/framework/snippets/src/multi/interactor_multi_sc_exec.rs b/framework/snippets/src/multi/interactor_multi_sc_exec.rs
index d99df9c807..d827f09ddd 100644
--- a/framework/snippets/src/multi/interactor_multi_sc_exec.rs
+++ b/framework/snippets/src/multi/interactor_multi_sc_exec.rs
@@ -1,6 +1,5 @@
 use super::interactor_multi_sc_process::{update_nonces_and_sign_tx, SenderSet, Txs};
-use crate::{Interactor, InteractorStep, StepBuffer};
-use multiversx_sc_scenario::scenario_model::TxResponse;
+use crate::{tx_response_from_network, Interactor, InteractorStep, StepBuffer};
 use multiversx_sdk::data::transaction::Transaction;
 
 impl Interactor {
@@ -16,7 +15,9 @@ impl Interactor {
         let results = self.process_txs(txs).await;
 
         for (i, sc_call_step) in buffer.refs.iter_mut().enumerate() {
-            sc_call_step.set_response(TxResponse::from_network_tx(results.get(i).unwrap().clone()));
+            sc_call_step.set_response(tx_response_from_network::from_network_tx(
+                results.get(i).unwrap().clone(),
+            ));
         }
 
         for step in buffer.refs.iter_mut() {
diff --git a/framework/snippets/src/tx_response_from_network.rs b/framework/snippets/src/tx_response_from_network.rs
new file mode 100644
index 0000000000..93a7a40ae5
--- /dev/null
+++ b/framework/snippets/src/tx_response_from_network.rs
@@ -0,0 +1,228 @@
+use multiversx_sc_scenario::{
+    imports::{Address, ESDTSystemSCAddress},
+    multiversx_chain_vm::crypto_functions::keccak256,
+    scenario_model::{TxResponse, TxResponseStatus},
+};
+use multiversx_sdk::{
+    data::transaction::{ApiSmartContractResult, Events, TransactionOnNetwork},
+    utils::base64_decode,
+};
+
+const SC_DEPLOY_PROCESSING_TYPE: &str = "SCDeployment";
+const LOG_IDENTIFIER_SIGNAL_ERROR: &str = "signalError";
+
+/// Creates a [`TxResponse`] from a [`TransactionOnNetwork`].
+pub fn from_network_tx(tx: TransactionOnNetwork) -> TxResponse {
+    let mut response = TxResponse {
+        api_scrs: tx.smart_contract_results.unwrap_or_default(),
+        api_logs: tx.logs,
+        ..Default::default()
+    };
+
+    response.tx_error = process_signal_error(&response);
+    if !response.tx_error.is_success() {
+        return response;
+    }
+
+    process(
+        response,
+        tx.sender.to_bytes(),
+        tx.nonce,
+        tx.processing_type_on_destination,
+    )
+}
+
+fn process_signal_error(tx_response: &TxResponse) -> TxResponseStatus {
+    if let Some(event) = find_log(tx_response, LOG_IDENTIFIER_SIGNAL_ERROR) {
+        let topics = event.topics.as_ref();
+        if let Some(error) = process_topics_error(topics) {
+            return TxResponseStatus::signal_error(&error);
+        }
+
+        let error_raw = base64_decode(topics.unwrap().get(1).unwrap());
+        let error = String::from_utf8(error_raw).unwrap();
+        return TxResponseStatus::signal_error(&error);
+    }
+
+    TxResponseStatus::default()
+}
+
+fn process(
+    mut tx_response: TxResponse,
+    sender_address: [u8; 32],
+    nonce: u64,
+    processing_type_on_destination: String,
+) -> TxResponse {
+    tx_response = process_out(tx_response);
+
+    tx_response = process_new_deployed_address(
+        tx_response,
+        sender_address,
+        nonce,
+        processing_type_on_destination,
+    );
+    tx_response = process_new_issued_token_identifier(tx_response);
+    tx_response
+}
+
+fn process_out(mut tx_response: TxResponse) -> TxResponse {
+    let out_scr = tx_response.api_scrs.iter().find(is_out_scr);
+
+    if let Some(out_scr) = out_scr {
+        tx_response.out = decode_scr_data_or_panic(&out_scr.data);
+    } else if let Some(data) = process_out_from_log(&tx_response) {
+        tx_response.out = data
+    }
+
+    tx_response
+}
+
+fn process_out_from_log(tx_response: &TxResponse) -> Option<Vec<Vec<u8>>> {
+    if let Some(logs) = &tx_response.api_logs {
+        logs.events.iter().rev().find_map(|event| {
+            if event.identifier == "writeLog" {
+                if let Some(data) = &event.data {
+                    let decoded_data = String::from_utf8(base64_decode(data)).unwrap();
+
+                    if decoded_data.starts_with('@') {
+                        let out = decode_scr_data_or_panic(decoded_data.as_str());
+                        return Some(out);
+                    }
+                }
+            }
+
+            None
+        })
+    } else {
+        None
+    }
+}
+
+fn process_new_deployed_address(
+    mut tx_response: TxResponse,
+    sender_address_bytes: [u8; 32],
+    nonce: u64,
+    processing_type_on_destination: String,
+) -> TxResponse {
+    if processing_type_on_destination != SC_DEPLOY_PROCESSING_TYPE {
+        return tx_response;
+    }
+
+    let sender_nonce_bytes = nonce.to_le_bytes();
+    let mut bytes_to_hash: Vec<u8> = Vec::new();
+    bytes_to_hash.extend_from_slice(&sender_address_bytes);
+    bytes_to_hash.extend_from_slice(&sender_nonce_bytes);
+
+    let address_keccak = keccak256(&bytes_to_hash);
+
+    let mut address = [0u8; 32];
+
+    address[0..8].copy_from_slice(&[0u8; 8]);
+    address[8..10].copy_from_slice(&[5, 0]);
+    address[10..30].copy_from_slice(&address_keccak[10..30]);
+    address[30..32].copy_from_slice(&sender_address_bytes[30..32]);
+
+    tx_response.new_deployed_address = Some(Address::from(address));
+
+    tx_response
+}
+
+fn process_new_issued_token_identifier(mut tx_response: TxResponse) -> TxResponse {
+    for scr in tx_response.api_scrs.iter() {
+        if scr.sender.to_bech32_string().unwrap() != ESDTSystemSCAddress.to_bech32_string() {
+            continue;
+        }
+
+        let Some(prev_tx) = tx_response
+            .api_scrs
+            .iter()
+            .find(|e| e.hash == scr.prev_tx_hash)
+        else {
+            continue;
+        };
+
+        let is_issue_fungible = prev_tx.data.starts_with("issue@");
+        let is_issue_semi_fungible = prev_tx.data.starts_with("issueSemiFungible@");
+        let is_issue_non_fungible = prev_tx.data.starts_with("issueNonFungible@");
+        let is_register_meta_esdt = prev_tx.data.starts_with("registerMetaESDT@");
+        let is_register_and_set_all_roles_esdt =
+            prev_tx.data.starts_with("registerAndSetAllRoles@");
+
+        if !is_issue_fungible
+            && !is_issue_semi_fungible
+            && !is_issue_non_fungible
+            && !is_register_meta_esdt
+            && !is_register_and_set_all_roles_esdt
+        {
+            continue;
+        }
+
+        if scr.data.starts_with("ESDTTransfer@") {
+            let encoded_tid = scr.data.split('@').nth(1);
+            if encoded_tid.is_none() {
+                return tx_response;
+            }
+
+            tx_response.new_issued_token_identifier =
+                Some(String::from_utf8(hex::decode(encoded_tid.unwrap()).unwrap()).unwrap());
+
+            break;
+        } else if scr.data.starts_with("@00@") {
+            let encoded_tid = scr.data.split('@').nth(2);
+            if encoded_tid.is_none() {
+                return tx_response;
+            }
+
+            tx_response.new_issued_token_identifier =
+                Some(String::from_utf8(hex::decode(encoded_tid.unwrap()).unwrap()).unwrap());
+
+            break;
+        }
+    }
+
+    tx_response
+}
+
+fn find_log<'a>(tx_response: &'a TxResponse, log_identifier: &str) -> Option<&'a Events> {
+    if let Some(logs) = &tx_response.api_logs {
+        logs.events
+            .iter()
+            .find(|event| event.identifier == log_identifier)
+    } else {
+        None
+    }
+}
+
+/// Checks for invalid topics.
+pub fn process_topics_error(topics: Option<&Vec<String>>) -> Option<String> {
+    if topics.is_none() {
+        return Some("missing topics".to_string());
+    }
+
+    let topics = topics.unwrap();
+    if topics.len() != 2 {
+        Some(format!(
+            "expected to have 2 topics, found {} instead",
+            topics.len()
+        ))
+    } else {
+        None
+    }
+}
+
+/// Decodes the data of a smart contract result.
+pub fn decode_scr_data_or_panic(data: &str) -> Vec<Vec<u8>> {
+    let mut split = data.split('@');
+    let _ = split.next().expect("SCR data should start with '@'");
+    let result_code = split.next().expect("missing result code");
+    assert_eq!(result_code, "6f6b", "result code is not 'ok'");
+
+    split
+        .map(|encoded_arg| hex::decode(encoded_arg).expect("error hex-decoding result"))
+        .collect()
+}
+
+/// Checks if the given smart contract result is an out smart contract result.
+pub fn is_out_scr(scr: &&ApiSmartContractResult) -> bool {
+    scr.nonce != 0 && scr.data.starts_with('@')
+}
diff --git a/framework/scenario/tests/test_tx_deployed_address.rs b/framework/snippets/tests/test_tx_deployed_address.rs
similarity index 99%
rename from framework/scenario/tests/test_tx_deployed_address.rs
rename to framework/snippets/tests/test_tx_deployed_address.rs
index b040ace618..f7a4b8e25e 100644
--- a/framework/scenario/tests/test_tx_deployed_address.rs
+++ b/framework/snippets/tests/test_tx_deployed_address.rs
@@ -1,5 +1,5 @@
-use multiversx_sc::types::Address;
-use multiversx_sc_scenario::scenario_model::TxResponse;
+use multiversx_sc_scenario::imports::Address;
+use multiversx_sc_snippets::tx_response_from_network;
 use multiversx_sdk::data::transaction::{TransactionInfo, TransactionOnNetwork};
 
 #[test]
@@ -53,7 +53,7 @@ fn test_deployed_address() {
         .data
         .unwrap()
         .transaction;
-    let tx_response = TxResponse::from_network_tx(tx_on_network);
+    let tx_response = tx_response_from_network::from_network_tx(tx_on_network);
     let opt_address = tx_response.new_deployed_address.map(|e| {
         multiversx_sdk::data::address::Address::from_bytes(*e.as_array())
             .to_bech32_string()
@@ -124,7 +124,7 @@ fn test_deployed_address_should_be_none_if_not_a_sc_deployment_tx() {
         .data
         .unwrap()
         .transaction;
-    let tx_response = TxResponse::from_network_tx(tx_on_network);
+    let tx_response = tx_response_from_network::from_network_tx(tx_on_network);
     let opt_address = tx_response.new_deployed_address;
 
     let expected: Option<Address> = None;
diff --git a/framework/scenario/tests/test_tx_issued_token_identifier.rs b/framework/snippets/tests/test_tx_issued_token_identifier.rs
similarity index 99%
rename from framework/scenario/tests/test_tx_issued_token_identifier.rs
rename to framework/snippets/tests/test_tx_issued_token_identifier.rs
index 2d0ccffa84..71859fddf0 100644
--- a/framework/scenario/tests/test_tx_issued_token_identifier.rs
+++ b/framework/snippets/tests/test_tx_issued_token_identifier.rs
@@ -1,4 +1,4 @@
-use multiversx_sc_scenario::scenario_model::TxResponse;
+use multiversx_sc_snippets::tx_response_from_network;
 use multiversx_sdk::data::transaction::{TransactionInfo, TransactionOnNetwork};
 
 #[test]
@@ -203,7 +203,7 @@ fn test_process_issued_token_identifier_fungible() {
         .data
         .unwrap()
         .transaction;
-    let tx_response = TxResponse::from_network_tx(tx_on_network);
+    let tx_response = tx_response_from_network::from_network_tx(tx_on_network);
 
     let expected: Option<String> = Some("EGLDMEX-95c6d5".to_string());
 
@@ -362,7 +362,7 @@ fn test_process_issued_token_identifier_semi_fungible() {
         .data
         .unwrap()
         .transaction;
-    let tx_response = TxResponse::from_network_tx(tx_on_network);
+    let tx_response = tx_response_from_network::from_network_tx(tx_on_network);
 
     let expected: Option<String> = Some("DOPETEST-77200c".to_string());
 
@@ -618,7 +618,7 @@ fn test_process_issued_token_identifier_non_fungible() {
         .data
         .unwrap()
         .transaction;
-    let tx_response = TxResponse::from_network_tx(tx_on_network);
+    let tx_response = tx_response_from_network::from_network_tx(tx_on_network);
 
     let expected: Option<String> = Some("GEN-868593".to_string());
 
@@ -919,7 +919,7 @@ fn test_process_issued_token_identifier_meta_esdt() {
         .data
         .unwrap()
         .transaction;
-    let tx_response = TxResponse::from_network_tx(tx_on_network);
+    let tx_response = tx_response_from_network::from_network_tx(tx_on_network);
 
     let expected: Option<String> = Some("AVASH-7d8b5d".to_string());
 
@@ -1152,7 +1152,7 @@ fn test_set_special_roles_should_not_process_issued_token_identifier() {
         .data
         .unwrap()
         .transaction;
-    let tx_response = TxResponse::from_network_tx(tx_on_network);
+    let tx_response = tx_response_from_network::from_network_tx(tx_on_network);
 
     let expected: Option<String> = None;
 
@@ -1414,7 +1414,7 @@ fn test_multisig_issue_nft_and_set_all_roles() {
         .data
         .unwrap()
         .transaction;
-    let tx_response = TxResponse::from_network_tx(tx_on_network);
+    let tx_response = tx_response_from_network::from_network_tx(tx_on_network);
 
     let expected = Some("TESTCOLL1-5aa80c".to_string());
 
diff --git a/framework/scenario/tests/test_tx_multi_contract_sc_result.rs b/framework/snippets/tests/test_tx_multi_contract_sc_result.rs
similarity index 98%
rename from framework/scenario/tests/test_tx_multi_contract_sc_result.rs
rename to framework/snippets/tests/test_tx_multi_contract_sc_result.rs
index 8d45dfff0c..43cd750ba3 100644
--- a/framework/scenario/tests/test_tx_multi_contract_sc_result.rs
+++ b/framework/snippets/tests/test_tx_multi_contract_sc_result.rs
@@ -1,4 +1,4 @@
-use multiversx_sc_scenario::scenario_model::TxResponse;
+use multiversx_sc_snippets::tx_response_from_network;
 use multiversx_sdk::data::transaction::{TransactionInfo, TransactionOnNetwork};
 
 #[test]
@@ -79,7 +79,7 @@ fn test_with_multi_contract_same_shard_tx_that_has_no_sc_result() {
         .data
         .unwrap()
         .transaction;
-    let tx_response = TxResponse::from_network_tx(tx_on_network);
+    let tx_response = tx_response_from_network::from_network_tx(tx_on_network);
 
     let expected: Vec<Vec<u8>> = vec![
         hex::decode("0a").unwrap(),
@@ -211,7 +211,7 @@ fn test_with_multi_contract_cross_shard_tx_that_has_no_callback() {
         .data
         .unwrap()
         .transaction;
-    let tx_response = TxResponse::from_network_tx(tx_on_network);
+    let tx_response = tx_response_from_network::from_network_tx(tx_on_network);
 
     let expected: Vec<Vec<u8>> = vec![];
 
@@ -340,7 +340,7 @@ fn test_with_multi_contract_cross_shard_tx_that_has_non_returning_callback() {
         .data
         .unwrap()
         .transaction;
-    let tx_response = TxResponse::from_network_tx(tx_on_network);
+    let tx_response = tx_response_from_network::from_network_tx(tx_on_network);
 
     let expected: Vec<Vec<u8>> = vec![];
 
@@ -469,7 +469,7 @@ fn test_with_multi_contract_cross_shard_tx_that_has_returning_callback() {
         .data
         .unwrap()
         .transaction;
-    let tx_response = TxResponse::from_network_tx(tx_on_network);
+    let tx_response = tx_response_from_network::from_network_tx(tx_on_network);
 
     let expected: Vec<Vec<u8>> = vec![];
 
diff --git a/framework/scenario/tests/test_tx_multiple_sc_results.rs b/framework/snippets/tests/test_tx_multiple_sc_results.rs
similarity index 98%
rename from framework/scenario/tests/test_tx_multiple_sc_results.rs
rename to framework/snippets/tests/test_tx_multiple_sc_results.rs
index 6322b0a7bb..b56e85b06c 100644
--- a/framework/scenario/tests/test_tx_multiple_sc_results.rs
+++ b/framework/snippets/tests/test_tx_multiple_sc_results.rs
@@ -1,4 +1,4 @@
-use multiversx_sc_scenario::scenario_model::{is_out_scr, TxResponse};
+use multiversx_sc_snippets::tx_response_from_network::{self, is_out_scr};
 use multiversx_sdk::data::transaction::{TransactionInfo, TransactionOnNetwork};
 
 #[test]
@@ -281,7 +281,7 @@ fn test_transaction_multiple_sc_results() {
         .data
         .unwrap()
         .transaction;
-    let tx_response = TxResponse::from_network_tx(tx_on_network);
+    let tx_response = tx_response_from_network::from_network_tx(tx_on_network);
     assert_eq!(tx_response.api_scrs.len(), 4usize);
     assert!(is_out_scr(&tx_response.api_scrs.get(2).unwrap()));
 }
diff --git a/framework/scenario/tests/test_tx_sc_result.rs b/framework/snippets/tests/test_tx_sc_result.rs
similarity index 98%
rename from framework/scenario/tests/test_tx_sc_result.rs
rename to framework/snippets/tests/test_tx_sc_result.rs
index 561712300c..a86371aad0 100644
--- a/framework/scenario/tests/test_tx_sc_result.rs
+++ b/framework/snippets/tests/test_tx_sc_result.rs
@@ -1,4 +1,4 @@
-use multiversx_sc_scenario::scenario_model::TxResponse;
+use multiversx_sc_snippets::tx_response_from_network;
 use multiversx_sdk::data::transaction::{TransactionInfo, TransactionOnNetwork};
 
 #[test]
@@ -251,7 +251,7 @@ fn test_with_tx_that_has_sc_result() {
         .data
         .unwrap()
         .transaction;
-    let tx_response = TxResponse::from_network_tx(tx_on_network);
+    let tx_response = tx_response_from_network::from_network_tx(tx_on_network);
 
     let expected: Vec<Vec<u8>> = vec![
         hex::decode("0000000c5745474c442d64376336626200000000000000000000000803856446ff9a304b")
@@ -339,7 +339,7 @@ fn test_with_tx_that_has_no_sc_result() {
         .data
         .unwrap()
         .transaction;
-    let tx_response = TxResponse::from_network_tx(tx_on_network);
+    let tx_response = tx_response_from_network::from_network_tx(tx_on_network);
 
     let expected: Vec<Vec<u8>> = vec![
         hex::decode("0a").unwrap(),

From 9dc06b6adb2d01dbbcd336887a3a7aec0e9d1d76 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 29 May 2024 21:42:49 +0300
Subject: [PATCH 0947/1254] tx response parser refactor

---
 .../interactor_scenario/interactor_sc_call.rs |  2 +-
 .../interactor_sc_deploy.rs                   |  2 +-
 .../src/multi/interactor_multi_sc_exec.rs     |  2 +-
 .../snippets/src/tx_response_from_network.rs  | 42 ++++++++-----------
 .../tests/test_tx_deployed_address.rs         |  4 +-
 .../tests/test_tx_issued_token_identifier.rs  | 12 +++---
 .../tests/test_tx_multi_contract_sc_result.rs |  8 ++--
 .../tests/test_tx_multiple_sc_results.rs      |  2 +-
 framework/snippets/tests/test_tx_sc_result.rs |  4 +-
 9 files changed, 36 insertions(+), 42 deletions(-)

diff --git a/framework/snippets/src/interactor_scenario/interactor_sc_call.rs b/framework/snippets/src/interactor_scenario/interactor_sc_call.rs
index 0e2a800596..930ff054fc 100644
--- a/framework/snippets/src/interactor_scenario/interactor_sc_call.rs
+++ b/framework/snippets/src/interactor_scenario/interactor_sc_call.rs
@@ -16,7 +16,7 @@ impl Interactor {
         let tx_hash = self.launch_sc_call(sc_call_step).await;
         let tx = self.retrieve_tx_on_network(tx_hash.clone()).await;
 
-        sc_call_step.save_response(tx_response_from_network::from_network_tx(tx));
+        sc_call_step.save_response(tx_response_from_network::parse_tx_response(tx));
 
         if let Some(token_identifier) = sc_call_step.response().new_issued_token_identifier.clone()
         {
diff --git a/framework/snippets/src/interactor_scenario/interactor_sc_deploy.rs b/framework/snippets/src/interactor_scenario/interactor_sc_deploy.rs
index f92da9c070..e7d391a190 100644
--- a/framework/snippets/src/interactor_scenario/interactor_sc_deploy.rs
+++ b/framework/snippets/src/interactor_scenario/interactor_sc_deploy.rs
@@ -57,7 +57,7 @@ impl Interactor {
 
         let addr = sc_deploy_step.tx.from.clone();
         let nonce = tx.nonce;
-        sc_deploy_step.save_response(tx_response_from_network::from_network_tx(tx));
+        sc_deploy_step.save_response(tx_response_from_network::parse_tx_response(tx));
 
         let deploy_address = sc_deploy_step
             .response()
diff --git a/framework/snippets/src/multi/interactor_multi_sc_exec.rs b/framework/snippets/src/multi/interactor_multi_sc_exec.rs
index d827f09ddd..c592fd21d8 100644
--- a/framework/snippets/src/multi/interactor_multi_sc_exec.rs
+++ b/framework/snippets/src/multi/interactor_multi_sc_exec.rs
@@ -15,7 +15,7 @@ impl Interactor {
         let results = self.process_txs(txs).await;
 
         for (i, sc_call_step) in buffer.refs.iter_mut().enumerate() {
-            sc_call_step.set_response(tx_response_from_network::from_network_tx(
+            sc_call_step.set_response(tx_response_from_network::parse_tx_response(
                 results.get(i).unwrap().clone(),
             ));
         }
diff --git a/framework/snippets/src/tx_response_from_network.rs b/framework/snippets/src/tx_response_from_network.rs
index 93a7a40ae5..f7f0b962df 100644
--- a/framework/snippets/src/tx_response_from_network.rs
+++ b/framework/snippets/src/tx_response_from_network.rs
@@ -12,7 +12,7 @@ const SC_DEPLOY_PROCESSING_TYPE: &str = "SCDeployment";
 const LOG_IDENTIFIER_SIGNAL_ERROR: &str = "signalError";
 
 /// Creates a [`TxResponse`] from a [`TransactionOnNetwork`].
-pub fn from_network_tx(tx: TransactionOnNetwork) -> TxResponse {
+pub fn parse_tx_response(tx: TransactionOnNetwork) -> TxResponse {
     let mut response = TxResponse {
         api_scrs: tx.smart_contract_results.unwrap_or_default(),
         api_logs: tx.logs,
@@ -25,11 +25,13 @@ pub fn from_network_tx(tx: TransactionOnNetwork) -> TxResponse {
     }
 
     process(
-        response,
+        &mut response,
         tx.sender.to_bytes(),
         tx.nonce,
         tx.processing_type_on_destination,
-    )
+    );
+
+    response
 }
 
 fn process_signal_error(tx_response: &TxResponse) -> TxResponseStatus {
@@ -48,33 +50,29 @@ fn process_signal_error(tx_response: &TxResponse) -> TxResponseStatus {
 }
 
 fn process(
-    mut tx_response: TxResponse,
+    tx_response: &mut TxResponse,
     sender_address: [u8; 32],
     nonce: u64,
     processing_type_on_destination: String,
-) -> TxResponse {
-    tx_response = process_out(tx_response);
-
-    tx_response = process_new_deployed_address(
+) {
+    process_out(tx_response);
+    process_new_deployed_address(
         tx_response,
         sender_address,
         nonce,
         processing_type_on_destination,
     );
-    tx_response = process_new_issued_token_identifier(tx_response);
-    tx_response
+    process_new_issued_token_identifier(tx_response);
 }
 
-fn process_out(mut tx_response: TxResponse) -> TxResponse {
+fn process_out(tx_response: &mut TxResponse) {
     let out_scr = tx_response.api_scrs.iter().find(is_out_scr);
 
     if let Some(out_scr) = out_scr {
         tx_response.out = decode_scr_data_or_panic(&out_scr.data);
-    } else if let Some(data) = process_out_from_log(&tx_response) {
+    } else if let Some(data) = process_out_from_log(tx_response) {
         tx_response.out = data
     }
-
-    tx_response
 }
 
 fn process_out_from_log(tx_response: &TxResponse) -> Option<Vec<Vec<u8>>> {
@@ -99,13 +97,13 @@ fn process_out_from_log(tx_response: &TxResponse) -> Option<Vec<Vec<u8>>> {
 }
 
 fn process_new_deployed_address(
-    mut tx_response: TxResponse,
+    tx_response: &mut TxResponse,
     sender_address_bytes: [u8; 32],
     nonce: u64,
     processing_type_on_destination: String,
-) -> TxResponse {
+) {
     if processing_type_on_destination != SC_DEPLOY_PROCESSING_TYPE {
-        return tx_response;
+        return;
     }
 
     let sender_nonce_bytes = nonce.to_le_bytes();
@@ -123,11 +121,9 @@ fn process_new_deployed_address(
     address[30..32].copy_from_slice(&sender_address_bytes[30..32]);
 
     tx_response.new_deployed_address = Some(Address::from(address));
-
-    tx_response
 }
 
-fn process_new_issued_token_identifier(mut tx_response: TxResponse) -> TxResponse {
+fn process_new_issued_token_identifier(tx_response: &mut TxResponse) {
     for scr in tx_response.api_scrs.iter() {
         if scr.sender.to_bech32_string().unwrap() != ESDTSystemSCAddress.to_bech32_string() {
             continue;
@@ -160,7 +156,7 @@ fn process_new_issued_token_identifier(mut tx_response: TxResponse) -> TxRespons
         if scr.data.starts_with("ESDTTransfer@") {
             let encoded_tid = scr.data.split('@').nth(1);
             if encoded_tid.is_none() {
-                return tx_response;
+                return;
             }
 
             tx_response.new_issued_token_identifier =
@@ -170,7 +166,7 @@ fn process_new_issued_token_identifier(mut tx_response: TxResponse) -> TxRespons
         } else if scr.data.starts_with("@00@") {
             let encoded_tid = scr.data.split('@').nth(2);
             if encoded_tid.is_none() {
-                return tx_response;
+                return;
             }
 
             tx_response.new_issued_token_identifier =
@@ -179,8 +175,6 @@ fn process_new_issued_token_identifier(mut tx_response: TxResponse) -> TxRespons
             break;
         }
     }
-
-    tx_response
 }
 
 fn find_log<'a>(tx_response: &'a TxResponse, log_identifier: &str) -> Option<&'a Events> {
diff --git a/framework/snippets/tests/test_tx_deployed_address.rs b/framework/snippets/tests/test_tx_deployed_address.rs
index f7a4b8e25e..905da88568 100644
--- a/framework/snippets/tests/test_tx_deployed_address.rs
+++ b/framework/snippets/tests/test_tx_deployed_address.rs
@@ -53,7 +53,7 @@ fn test_deployed_address() {
         .data
         .unwrap()
         .transaction;
-    let tx_response = tx_response_from_network::from_network_tx(tx_on_network);
+    let tx_response = tx_response_from_network::parse_tx_response(tx_on_network);
     let opt_address = tx_response.new_deployed_address.map(|e| {
         multiversx_sdk::data::address::Address::from_bytes(*e.as_array())
             .to_bech32_string()
@@ -124,7 +124,7 @@ fn test_deployed_address_should_be_none_if_not_a_sc_deployment_tx() {
         .data
         .unwrap()
         .transaction;
-    let tx_response = tx_response_from_network::from_network_tx(tx_on_network);
+    let tx_response = tx_response_from_network::parse_tx_response(tx_on_network);
     let opt_address = tx_response.new_deployed_address;
 
     let expected: Option<Address> = None;
diff --git a/framework/snippets/tests/test_tx_issued_token_identifier.rs b/framework/snippets/tests/test_tx_issued_token_identifier.rs
index 71859fddf0..a1a235c06f 100644
--- a/framework/snippets/tests/test_tx_issued_token_identifier.rs
+++ b/framework/snippets/tests/test_tx_issued_token_identifier.rs
@@ -203,7 +203,7 @@ fn test_process_issued_token_identifier_fungible() {
         .data
         .unwrap()
         .transaction;
-    let tx_response = tx_response_from_network::from_network_tx(tx_on_network);
+    let tx_response = tx_response_from_network::parse_tx_response(tx_on_network);
 
     let expected: Option<String> = Some("EGLDMEX-95c6d5".to_string());
 
@@ -362,7 +362,7 @@ fn test_process_issued_token_identifier_semi_fungible() {
         .data
         .unwrap()
         .transaction;
-    let tx_response = tx_response_from_network::from_network_tx(tx_on_network);
+    let tx_response = tx_response_from_network::parse_tx_response(tx_on_network);
 
     let expected: Option<String> = Some("DOPETEST-77200c".to_string());
 
@@ -618,7 +618,7 @@ fn test_process_issued_token_identifier_non_fungible() {
         .data
         .unwrap()
         .transaction;
-    let tx_response = tx_response_from_network::from_network_tx(tx_on_network);
+    let tx_response = tx_response_from_network::parse_tx_response(tx_on_network);
 
     let expected: Option<String> = Some("GEN-868593".to_string());
 
@@ -919,7 +919,7 @@ fn test_process_issued_token_identifier_meta_esdt() {
         .data
         .unwrap()
         .transaction;
-    let tx_response = tx_response_from_network::from_network_tx(tx_on_network);
+    let tx_response = tx_response_from_network::parse_tx_response(tx_on_network);
 
     let expected: Option<String> = Some("AVASH-7d8b5d".to_string());
 
@@ -1152,7 +1152,7 @@ fn test_set_special_roles_should_not_process_issued_token_identifier() {
         .data
         .unwrap()
         .transaction;
-    let tx_response = tx_response_from_network::from_network_tx(tx_on_network);
+    let tx_response = tx_response_from_network::parse_tx_response(tx_on_network);
 
     let expected: Option<String> = None;
 
@@ -1414,7 +1414,7 @@ fn test_multisig_issue_nft_and_set_all_roles() {
         .data
         .unwrap()
         .transaction;
-    let tx_response = tx_response_from_network::from_network_tx(tx_on_network);
+    let tx_response = tx_response_from_network::parse_tx_response(tx_on_network);
 
     let expected = Some("TESTCOLL1-5aa80c".to_string());
 
diff --git a/framework/snippets/tests/test_tx_multi_contract_sc_result.rs b/framework/snippets/tests/test_tx_multi_contract_sc_result.rs
index 43cd750ba3..2812d50844 100644
--- a/framework/snippets/tests/test_tx_multi_contract_sc_result.rs
+++ b/framework/snippets/tests/test_tx_multi_contract_sc_result.rs
@@ -79,7 +79,7 @@ fn test_with_multi_contract_same_shard_tx_that_has_no_sc_result() {
         .data
         .unwrap()
         .transaction;
-    let tx_response = tx_response_from_network::from_network_tx(tx_on_network);
+    let tx_response = tx_response_from_network::parse_tx_response(tx_on_network);
 
     let expected: Vec<Vec<u8>> = vec![
         hex::decode("0a").unwrap(),
@@ -211,7 +211,7 @@ fn test_with_multi_contract_cross_shard_tx_that_has_no_callback() {
         .data
         .unwrap()
         .transaction;
-    let tx_response = tx_response_from_network::from_network_tx(tx_on_network);
+    let tx_response = tx_response_from_network::parse_tx_response(tx_on_network);
 
     let expected: Vec<Vec<u8>> = vec![];
 
@@ -340,7 +340,7 @@ fn test_with_multi_contract_cross_shard_tx_that_has_non_returning_callback() {
         .data
         .unwrap()
         .transaction;
-    let tx_response = tx_response_from_network::from_network_tx(tx_on_network);
+    let tx_response = tx_response_from_network::parse_tx_response(tx_on_network);
 
     let expected: Vec<Vec<u8>> = vec![];
 
@@ -469,7 +469,7 @@ fn test_with_multi_contract_cross_shard_tx_that_has_returning_callback() {
         .data
         .unwrap()
         .transaction;
-    let tx_response = tx_response_from_network::from_network_tx(tx_on_network);
+    let tx_response = tx_response_from_network::parse_tx_response(tx_on_network);
 
     let expected: Vec<Vec<u8>> = vec![];
 
diff --git a/framework/snippets/tests/test_tx_multiple_sc_results.rs b/framework/snippets/tests/test_tx_multiple_sc_results.rs
index b56e85b06c..b3107db82c 100644
--- a/framework/snippets/tests/test_tx_multiple_sc_results.rs
+++ b/framework/snippets/tests/test_tx_multiple_sc_results.rs
@@ -281,7 +281,7 @@ fn test_transaction_multiple_sc_results() {
         .data
         .unwrap()
         .transaction;
-    let tx_response = tx_response_from_network::from_network_tx(tx_on_network);
+    let tx_response = tx_response_from_network::parse_tx_response(tx_on_network);
     assert_eq!(tx_response.api_scrs.len(), 4usize);
     assert!(is_out_scr(&tx_response.api_scrs.get(2).unwrap()));
 }
diff --git a/framework/snippets/tests/test_tx_sc_result.rs b/framework/snippets/tests/test_tx_sc_result.rs
index a86371aad0..69513b7ba5 100644
--- a/framework/snippets/tests/test_tx_sc_result.rs
+++ b/framework/snippets/tests/test_tx_sc_result.rs
@@ -251,7 +251,7 @@ fn test_with_tx_that_has_sc_result() {
         .data
         .unwrap()
         .transaction;
-    let tx_response = tx_response_from_network::from_network_tx(tx_on_network);
+    let tx_response = tx_response_from_network::parse_tx_response(tx_on_network);
 
     let expected: Vec<Vec<u8>> = vec![
         hex::decode("0000000c5745474c442d64376336626200000000000000000000000803856446ff9a304b")
@@ -339,7 +339,7 @@ fn test_with_tx_that_has_no_sc_result() {
         .data
         .unwrap()
         .transaction;
-    let tx_response = tx_response_from_network::from_network_tx(tx_on_network);
+    let tx_response = tx_response_from_network::parse_tx_response(tx_on_network);
 
     let expected: Vec<Vec<u8>> = vec![
         hex::decode("0a").unwrap(),

From 113346d2f5b781b7bbccf8526e2eacf6c0210284 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 29 May 2024 21:49:22 +0300
Subject: [PATCH 0948/1254] tx response parser refactor

---
 .../src/interactor_scenario/interactor_sc_call.rs  |  4 ++--
 .../interactor_scenario/interactor_sc_deploy.rs    |  4 ++--
 framework/snippets/src/lib.rs                      |  2 +-
 .../snippets/src/multi/interactor_multi_sc_exec.rs |  4 ++--
 ...esponse_from_network.rs => network_response.rs} |  0
 .../snippets/tests/test_tx_deployed_address.rs     |  6 +++---
 .../tests/test_tx_issued_token_identifier.rs       | 14 +++++++-------
 .../tests/test_tx_multi_contract_sc_result.rs      | 10 +++++-----
 .../snippets/tests/test_tx_multiple_sc_results.rs  |  4 ++--
 framework/snippets/tests/test_tx_sc_result.rs      |  6 +++---
 10 files changed, 27 insertions(+), 27 deletions(-)
 rename framework/snippets/src/{tx_response_from_network.rs => network_response.rs} (100%)

diff --git a/framework/snippets/src/interactor_scenario/interactor_sc_call.rs b/framework/snippets/src/interactor_scenario/interactor_sc_call.rs
index 930ff054fc..061005ea13 100644
--- a/framework/snippets/src/interactor_scenario/interactor_sc_call.rs
+++ b/framework/snippets/src/interactor_scenario/interactor_sc_call.rs
@@ -1,4 +1,4 @@
-use crate::{address_h256_to_erdrs, mandos_to_erdrs_address, tx_response_from_network, Interactor};
+use crate::{address_h256_to_erdrs, mandos_to_erdrs_address, network_response, Interactor};
 use log::info;
 use multiversx_sc_scenario::{
     api::StaticApi,
@@ -16,7 +16,7 @@ impl Interactor {
         let tx_hash = self.launch_sc_call(sc_call_step).await;
         let tx = self.retrieve_tx_on_network(tx_hash.clone()).await;
 
-        sc_call_step.save_response(tx_response_from_network::parse_tx_response(tx));
+        sc_call_step.save_response(network_response::parse_tx_response(tx));
 
         if let Some(token_identifier) = sc_call_step.response().new_issued_token_identifier.clone()
         {
diff --git a/framework/snippets/src/interactor_scenario/interactor_sc_deploy.rs b/framework/snippets/src/interactor_scenario/interactor_sc_deploy.rs
index e7d391a190..529efc38bb 100644
--- a/framework/snippets/src/interactor_scenario/interactor_sc_deploy.rs
+++ b/framework/snippets/src/interactor_scenario/interactor_sc_deploy.rs
@@ -1,4 +1,4 @@
-use crate::{mandos_to_erdrs_address, tx_response_from_network, Interactor};
+use crate::{mandos_to_erdrs_address, network_response, Interactor};
 use log::info;
 use multiversx_sc_scenario::{
     imports::Bech32Address,
@@ -57,7 +57,7 @@ impl Interactor {
 
         let addr = sc_deploy_step.tx.from.clone();
         let nonce = tx.nonce;
-        sc_deploy_step.save_response(tx_response_from_network::parse_tx_response(tx));
+        sc_deploy_step.save_response(network_response::parse_tx_response(tx));
 
         let deploy_address = sc_deploy_step
             .response()
diff --git a/framework/snippets/src/lib.rs b/framework/snippets/src/lib.rs
index ae20ca432a..6240a9f152 100644
--- a/framework/snippets/src/lib.rs
+++ b/framework/snippets/src/lib.rs
@@ -6,8 +6,8 @@ mod interactor_scenario;
 mod interactor_sender;
 mod interactor_tx;
 mod multi;
+pub mod network_response;
 pub mod test_wallets;
-pub mod tx_response_from_network;
 
 pub use env_logger;
 pub use hex;
diff --git a/framework/snippets/src/multi/interactor_multi_sc_exec.rs b/framework/snippets/src/multi/interactor_multi_sc_exec.rs
index c592fd21d8..8ac6a4eba9 100644
--- a/framework/snippets/src/multi/interactor_multi_sc_exec.rs
+++ b/framework/snippets/src/multi/interactor_multi_sc_exec.rs
@@ -1,5 +1,5 @@
 use super::interactor_multi_sc_process::{update_nonces_and_sign_tx, SenderSet, Txs};
-use crate::{tx_response_from_network, Interactor, InteractorStep, StepBuffer};
+use crate::{network_response, Interactor, InteractorStep, StepBuffer};
 use multiversx_sdk::data::transaction::Transaction;
 
 impl Interactor {
@@ -15,7 +15,7 @@ impl Interactor {
         let results = self.process_txs(txs).await;
 
         for (i, sc_call_step) in buffer.refs.iter_mut().enumerate() {
-            sc_call_step.set_response(tx_response_from_network::parse_tx_response(
+            sc_call_step.set_response(network_response::parse_tx_response(
                 results.get(i).unwrap().clone(),
             ));
         }
diff --git a/framework/snippets/src/tx_response_from_network.rs b/framework/snippets/src/network_response.rs
similarity index 100%
rename from framework/snippets/src/tx_response_from_network.rs
rename to framework/snippets/src/network_response.rs
diff --git a/framework/snippets/tests/test_tx_deployed_address.rs b/framework/snippets/tests/test_tx_deployed_address.rs
index 905da88568..377a0e779f 100644
--- a/framework/snippets/tests/test_tx_deployed_address.rs
+++ b/framework/snippets/tests/test_tx_deployed_address.rs
@@ -1,5 +1,5 @@
 use multiversx_sc_scenario::imports::Address;
-use multiversx_sc_snippets::tx_response_from_network;
+use multiversx_sc_snippets::network_response;
 use multiversx_sdk::data::transaction::{TransactionInfo, TransactionOnNetwork};
 
 #[test]
@@ -53,7 +53,7 @@ fn test_deployed_address() {
         .data
         .unwrap()
         .transaction;
-    let tx_response = tx_response_from_network::parse_tx_response(tx_on_network);
+    let tx_response = network_response::parse_tx_response(tx_on_network);
     let opt_address = tx_response.new_deployed_address.map(|e| {
         multiversx_sdk::data::address::Address::from_bytes(*e.as_array())
             .to_bech32_string()
@@ -124,7 +124,7 @@ fn test_deployed_address_should_be_none_if_not_a_sc_deployment_tx() {
         .data
         .unwrap()
         .transaction;
-    let tx_response = tx_response_from_network::parse_tx_response(tx_on_network);
+    let tx_response = network_response::parse_tx_response(tx_on_network);
     let opt_address = tx_response.new_deployed_address;
 
     let expected: Option<Address> = None;
diff --git a/framework/snippets/tests/test_tx_issued_token_identifier.rs b/framework/snippets/tests/test_tx_issued_token_identifier.rs
index a1a235c06f..3539c4e757 100644
--- a/framework/snippets/tests/test_tx_issued_token_identifier.rs
+++ b/framework/snippets/tests/test_tx_issued_token_identifier.rs
@@ -1,4 +1,4 @@
-use multiversx_sc_snippets::tx_response_from_network;
+use multiversx_sc_snippets::network_response;
 use multiversx_sdk::data::transaction::{TransactionInfo, TransactionOnNetwork};
 
 #[test]
@@ -203,7 +203,7 @@ fn test_process_issued_token_identifier_fungible() {
         .data
         .unwrap()
         .transaction;
-    let tx_response = tx_response_from_network::parse_tx_response(tx_on_network);
+    let tx_response = network_response::parse_tx_response(tx_on_network);
 
     let expected: Option<String> = Some("EGLDMEX-95c6d5".to_string());
 
@@ -362,7 +362,7 @@ fn test_process_issued_token_identifier_semi_fungible() {
         .data
         .unwrap()
         .transaction;
-    let tx_response = tx_response_from_network::parse_tx_response(tx_on_network);
+    let tx_response = network_response::parse_tx_response(tx_on_network);
 
     let expected: Option<String> = Some("DOPETEST-77200c".to_string());
 
@@ -618,7 +618,7 @@ fn test_process_issued_token_identifier_non_fungible() {
         .data
         .unwrap()
         .transaction;
-    let tx_response = tx_response_from_network::parse_tx_response(tx_on_network);
+    let tx_response = network_response::parse_tx_response(tx_on_network);
 
     let expected: Option<String> = Some("GEN-868593".to_string());
 
@@ -919,7 +919,7 @@ fn test_process_issued_token_identifier_meta_esdt() {
         .data
         .unwrap()
         .transaction;
-    let tx_response = tx_response_from_network::parse_tx_response(tx_on_network);
+    let tx_response = network_response::parse_tx_response(tx_on_network);
 
     let expected: Option<String> = Some("AVASH-7d8b5d".to_string());
 
@@ -1152,7 +1152,7 @@ fn test_set_special_roles_should_not_process_issued_token_identifier() {
         .data
         .unwrap()
         .transaction;
-    let tx_response = tx_response_from_network::parse_tx_response(tx_on_network);
+    let tx_response = network_response::parse_tx_response(tx_on_network);
 
     let expected: Option<String> = None;
 
@@ -1414,7 +1414,7 @@ fn test_multisig_issue_nft_and_set_all_roles() {
         .data
         .unwrap()
         .transaction;
-    let tx_response = tx_response_from_network::parse_tx_response(tx_on_network);
+    let tx_response = network_response::parse_tx_response(tx_on_network);
 
     let expected = Some("TESTCOLL1-5aa80c".to_string());
 
diff --git a/framework/snippets/tests/test_tx_multi_contract_sc_result.rs b/framework/snippets/tests/test_tx_multi_contract_sc_result.rs
index 2812d50844..a9b64d8941 100644
--- a/framework/snippets/tests/test_tx_multi_contract_sc_result.rs
+++ b/framework/snippets/tests/test_tx_multi_contract_sc_result.rs
@@ -1,4 +1,4 @@
-use multiversx_sc_snippets::tx_response_from_network;
+use multiversx_sc_snippets::network_response;
 use multiversx_sdk::data::transaction::{TransactionInfo, TransactionOnNetwork};
 
 #[test]
@@ -79,7 +79,7 @@ fn test_with_multi_contract_same_shard_tx_that_has_no_sc_result() {
         .data
         .unwrap()
         .transaction;
-    let tx_response = tx_response_from_network::parse_tx_response(tx_on_network);
+    let tx_response = network_response::parse_tx_response(tx_on_network);
 
     let expected: Vec<Vec<u8>> = vec![
         hex::decode("0a").unwrap(),
@@ -211,7 +211,7 @@ fn test_with_multi_contract_cross_shard_tx_that_has_no_callback() {
         .data
         .unwrap()
         .transaction;
-    let tx_response = tx_response_from_network::parse_tx_response(tx_on_network);
+    let tx_response = network_response::parse_tx_response(tx_on_network);
 
     let expected: Vec<Vec<u8>> = vec![];
 
@@ -340,7 +340,7 @@ fn test_with_multi_contract_cross_shard_tx_that_has_non_returning_callback() {
         .data
         .unwrap()
         .transaction;
-    let tx_response = tx_response_from_network::parse_tx_response(tx_on_network);
+    let tx_response = network_response::parse_tx_response(tx_on_network);
 
     let expected: Vec<Vec<u8>> = vec![];
 
@@ -469,7 +469,7 @@ fn test_with_multi_contract_cross_shard_tx_that_has_returning_callback() {
         .data
         .unwrap()
         .transaction;
-    let tx_response = tx_response_from_network::parse_tx_response(tx_on_network);
+    let tx_response = network_response::parse_tx_response(tx_on_network);
 
     let expected: Vec<Vec<u8>> = vec![];
 
diff --git a/framework/snippets/tests/test_tx_multiple_sc_results.rs b/framework/snippets/tests/test_tx_multiple_sc_results.rs
index b3107db82c..25e6fc477a 100644
--- a/framework/snippets/tests/test_tx_multiple_sc_results.rs
+++ b/framework/snippets/tests/test_tx_multiple_sc_results.rs
@@ -1,4 +1,4 @@
-use multiversx_sc_snippets::tx_response_from_network::{self, is_out_scr};
+use multiversx_sc_snippets::network_response::{self, is_out_scr};
 use multiversx_sdk::data::transaction::{TransactionInfo, TransactionOnNetwork};
 
 #[test]
@@ -281,7 +281,7 @@ fn test_transaction_multiple_sc_results() {
         .data
         .unwrap()
         .transaction;
-    let tx_response = tx_response_from_network::parse_tx_response(tx_on_network);
+    let tx_response = network_response::parse_tx_response(tx_on_network);
     assert_eq!(tx_response.api_scrs.len(), 4usize);
     assert!(is_out_scr(&tx_response.api_scrs.get(2).unwrap()));
 }
diff --git a/framework/snippets/tests/test_tx_sc_result.rs b/framework/snippets/tests/test_tx_sc_result.rs
index 69513b7ba5..b3809eb2f8 100644
--- a/framework/snippets/tests/test_tx_sc_result.rs
+++ b/framework/snippets/tests/test_tx_sc_result.rs
@@ -1,4 +1,4 @@
-use multiversx_sc_snippets::tx_response_from_network;
+use multiversx_sc_snippets::network_response;
 use multiversx_sdk::data::transaction::{TransactionInfo, TransactionOnNetwork};
 
 #[test]
@@ -251,7 +251,7 @@ fn test_with_tx_that_has_sc_result() {
         .data
         .unwrap()
         .transaction;
-    let tx_response = tx_response_from_network::parse_tx_response(tx_on_network);
+    let tx_response = network_response::parse_tx_response(tx_on_network);
 
     let expected: Vec<Vec<u8>> = vec![
         hex::decode("0000000c5745474c442d64376336626200000000000000000000000803856446ff9a304b")
@@ -339,7 +339,7 @@ fn test_with_tx_that_has_no_sc_result() {
         .data
         .unwrap()
         .transaction;
-    let tx_response = tx_response_from_network::parse_tx_response(tx_on_network);
+    let tx_response = network_response::parse_tx_response(tx_on_network);
 
     let expected: Vec<Vec<u8>> = vec![
         hex::decode("0a").unwrap(),

From c96a12fe83efd7bc9b8db8bb5e54fbf2624955d1 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Thu, 30 May 2024 10:03:32 +0300
Subject: [PATCH 0949/1254] unified - blackbox promises_feature

---
 .../promises-features/sc-config.toml          |   3 +
 .../src/promises_feature_proxy.rs             | 254 ++++++++++++++++++
 .../promises-features/src/promises_main.rs    |   1 +
 .../tests/promises_feature_blackbox_test.rs   | 125 +++------
 4 files changed, 301 insertions(+), 82 deletions(-)
 create mode 100644 contracts/feature-tests/composability/promises-features/src/promises_feature_proxy.rs

diff --git a/contracts/feature-tests/composability/promises-features/sc-config.toml b/contracts/feature-tests/composability/promises-features/sc-config.toml
index 79ef7a04a8..d3be3200f4 100644
--- a/contracts/feature-tests/composability/promises-features/sc-config.toml
+++ b/contracts/feature-tests/composability/promises-features/sc-config.toml
@@ -5,3 +5,6 @@ main = "promises-features"
 name = "promises-features"
 add-unlabelled = true
 ei = "1.3" # the whole point of this config is to explicitly specify that this contract needs EI 1.3/VM 1.5
+
+[[proxy]]
+path = "src/promises_feature_proxy.rs"
diff --git a/contracts/feature-tests/composability/promises-features/src/promises_feature_proxy.rs b/contracts/feature-tests/composability/promises-features/src/promises_feature_proxy.rs
new file mode 100644
index 0000000000..d5fb14bf19
--- /dev/null
+++ b/contracts/feature-tests/composability/promises-features/src/promises_feature_proxy.rs
@@ -0,0 +1,254 @@
+// Code generated by the multiversx-sc proxy generator. DO NOT EDIT.
+
+////////////////////////////////////////////////////
+////////////////// AUTO-GENERATED //////////////////
+////////////////////////////////////////////////////
+
+#![allow(dead_code)]
+#![allow(clippy::all)]
+
+use multiversx_sc::proxy_imports::*;
+
+pub struct PromisesFeaturesProxy;
+
+impl<Env, From, To, Gas> TxProxyTrait<Env, From, To, Gas> for PromisesFeaturesProxy
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    type TxProxyMethods = PromisesFeaturesProxyMethods<Env, From, To, Gas>;
+
+    fn proxy_methods(self, tx: Tx<Env, From, To, (), Gas, (), ()>) -> Self::TxProxyMethods {
+        PromisesFeaturesProxyMethods { wrapped_tx: tx }
+    }
+}
+
+pub struct PromisesFeaturesProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    wrapped_tx: Tx<Env, From, To, (), Gas, (), ()>,
+}
+
+#[rustfmt::skip]
+impl<Env, From, Gas> PromisesFeaturesProxyMethods<Env, From, (), Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn init(
+        self,
+    ) -> TxTypedDeploy<Env, From, NotPayable, Gas, ()> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_deploy()
+            .original_result()
+    }
+}
+
+#[rustfmt::skip]
+impl<Env, From, To, Gas> PromisesFeaturesProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn callback_data(
+        self,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, MultiValueEncoded<Env::Api, CallbackData<Env::Api>>> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("callback_data")
+            .original_result()
+    }
+
+    pub fn callback_data_at_index<
+        Arg0: ProxyArg<usize>,
+    >(
+        self,
+        index: Arg0,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, MultiValue5<ManagedBuffer<Env::Api>, EgldOrEsdtTokenIdentifier<Env::Api>, u64, BigUint<Env::Api>, MultiValueManagedVec<Env::Api, ManagedBuffer<Env::Api>>>> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("callback_data_at_index")
+            .argument(&index)
+            .original_result()
+    }
+
+    pub fn clear_callback_data(
+        self,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("clear_callback_data")
+            .original_result()
+    }
+
+    pub fn forward_promise_accept_funds<
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
+    >(
+        self,
+        to: Arg0,
+    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
+        self.wrapped_tx
+            .raw_call("forward_promise_accept_funds")
+            .argument(&to)
+            .original_result()
+    }
+
+    pub fn forward_promise_retrieve_funds<
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg1: ProxyArg<EgldOrEsdtTokenIdentifier<Env::Api>>,
+        Arg2: ProxyArg<u64>,
+        Arg3: ProxyArg<BigUint<Env::Api>>,
+    >(
+        self,
+        to: Arg0,
+        token: Arg1,
+        token_nonce: Arg2,
+        amount: Arg3,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("forward_promise_retrieve_funds")
+            .argument(&to)
+            .argument(&token)
+            .argument(&token_nonce)
+            .argument(&amount)
+            .original_result()
+    }
+
+    pub fn promise_raw_single_token<
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg1: ProxyArg<ManagedBuffer<Env::Api>>,
+        Arg2: ProxyArg<u64>,
+        Arg3: ProxyArg<u64>,
+        Arg4: ProxyArg<MultiValueEncoded<Env::Api, ManagedBuffer<Env::Api>>>,
+    >(
+        self,
+        to: Arg0,
+        endpoint_name: Arg1,
+        gas_limit: Arg2,
+        extra_gas_for_callback: Arg3,
+        args: Arg4,
+    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
+        self.wrapped_tx
+            .raw_call("promise_raw_single_token")
+            .argument(&to)
+            .argument(&endpoint_name)
+            .argument(&gas_limit)
+            .argument(&extra_gas_for_callback)
+            .argument(&args)
+            .original_result()
+    }
+
+    pub fn promise_raw_multi_transfer<
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg1: ProxyArg<ManagedBuffer<Env::Api>>,
+        Arg2: ProxyArg<u64>,
+        Arg3: ProxyArg<MultiValueEncoded<Env::Api, EsdtTokenPaymentMultiValue<Env::Api>>>,
+    >(
+        self,
+        to: Arg0,
+        endpoint_name: Arg1,
+        extra_gas_for_callback: Arg2,
+        token_payment_args: Arg3,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("promise_raw_multi_transfer")
+            .argument(&to)
+            .argument(&endpoint_name)
+            .argument(&extra_gas_for_callback)
+            .argument(&token_payment_args)
+            .original_result()
+    }
+
+    pub fn forward_sync_retrieve_funds_bt<
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg1: ProxyArg<EgldOrEsdtTokenIdentifier<Env::Api>>,
+        Arg2: ProxyArg<u64>,
+        Arg3: ProxyArg<BigUint<Env::Api>>,
+    >(
+        self,
+        to: Arg0,
+        token: Arg1,
+        token_nonce: Arg2,
+        amount: Arg3,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("forward_sync_retrieve_funds_bt")
+            .argument(&to)
+            .argument(&token)
+            .argument(&token_nonce)
+            .argument(&amount)
+            .original_result()
+    }
+
+    pub fn forward_sync_retrieve_funds_bt_twice<
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg1: ProxyArg<EgldOrEsdtTokenIdentifier<Env::Api>>,
+        Arg2: ProxyArg<u64>,
+        Arg3: ProxyArg<BigUint<Env::Api>>,
+    >(
+        self,
+        to: Arg0,
+        token: Arg1,
+        token_nonce: Arg2,
+        amount: Arg3,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("forward_sync_retrieve_funds_bt_twice")
+            .argument(&to)
+            .argument(&token)
+            .argument(&token_nonce)
+            .argument(&amount)
+            .original_result()
+    }
+
+    pub fn forward_promise_retrieve_funds_back_transfers<
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg1: ProxyArg<EgldOrEsdtTokenIdentifier<Env::Api>>,
+        Arg2: ProxyArg<u64>,
+        Arg3: ProxyArg<BigUint<Env::Api>>,
+    >(
+        self,
+        to: Arg0,
+        token: Arg1,
+        token_nonce: Arg2,
+        amount: Arg3,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("forward_promise_retrieve_funds_back_transfers")
+            .argument(&to)
+            .argument(&token)
+            .argument(&token_nonce)
+            .argument(&amount)
+            .original_result()
+    }
+}
+
+#[type_abi]
+#[derive(TopEncode, TopDecode)]
+pub struct CallbackData<Api>
+where
+    Api: ManagedTypeApi,
+{
+    pub callback_name: ManagedBuffer<Api>,
+    pub token_identifier: EgldOrEsdtTokenIdentifier<Api>,
+    pub token_nonce: u64,
+    pub token_amount: BigUint<Api>,
+    pub args: ManagedVec<Api, ManagedBuffer<Api>>,
+}
diff --git a/contracts/feature-tests/composability/promises-features/src/promises_main.rs b/contracts/feature-tests/composability/promises-features/src/promises_main.rs
index 511b0d76d8..2387879943 100644
--- a/contracts/feature-tests/composability/promises-features/src/promises_main.rs
+++ b/contracts/feature-tests/composability/promises-features/src/promises_main.rs
@@ -6,6 +6,7 @@ mod fwd_call_promise_direct;
 mod fwd_call_promises;
 mod fwd_call_promises_bt;
 pub mod fwd_call_sync_bt;
+pub mod promises_feature_proxy;
 pub mod vault_proxy;
 
 multiversx_sc::imports!();
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 c7fa6600d2..4fd4f4d1cc 100644
--- a/contracts/feature-tests/composability/tests/promises_feature_blackbox_test.rs
+++ b/contracts/feature-tests/composability/tests/promises_feature_blackbox_test.rs
@@ -1,73 +1,47 @@
-#![allow(deprecated)] // TODO: unified syntax
-
 use multiversx_sc::types::BigUint;
 use multiversx_sc_scenario::imports::*;
 
-use promises_features::fwd_call_sync_bt::ProxyTrait;
+use promises_features::promises_feature_proxy;
 
-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 VAULT_ADDRESS_EXPR: &str = "sc:vault";
-const VAULT_PATH_EXPR: &str = "mxsc:../vault/output/vault.mxsc.json";
+const USER_ADDRESS: TestAddress = TestAddress::new("user");
+const PROMISES_FEATURE_ADDRESS: TestSCAddress = TestSCAddress::new("promises-feature");
+const PROMISES_FEATURES_PATH: MxscPath =
+    MxscPath::new("promises-features/output/promises-feature.mxsc.json");
+const VAULT_ADDRESS: TestSCAddress = TestSCAddress::new("vault");
+const VAULT_PATH: MxscPath = MxscPath::new("../vault/output/vault.mxsc.json");
 
-const TOKEN_ID_EXPR: &str = "str:TOKEN-123456";
+const TOKEN_ID_EXPR: TestTokenIdentifier = TestTokenIdentifier::new("TOKEN-123456");
 const TOKEN_ID: &[u8] = b"TOKEN-123456";
 
-type PromisesFeaturesContract = ContractInfo<promises_features::Proxy<StaticApi>>;
-type VaultContract = ContractInfo<vault::Proxy<StaticApi>>;
-
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
 
-    blockchain.register_contract(
-        PROMISES_FEATURES_PATH_EXPR,
-        promises_features::ContractBuilder,
-    );
-    blockchain.register_contract(VAULT_PATH_EXPR, vault::ContractBuilder);
+    blockchain.register_contract(PROMISES_FEATURES_PATH, promises_features::ContractBuilder);
+    blockchain.register_contract(VAULT_PATH, vault::ContractBuilder);
 
     blockchain
 }
 
 struct PromisesFeaturesTestState {
     world: ScenarioWorld,
-    promises_features_contract: PromisesFeaturesContract,
-    vault_contract: VaultContract,
 }
 
 impl PromisesFeaturesTestState {
     fn new() -> Self {
         let mut world = world();
 
-        let promises_feature_code = world.code_expression(PROMISES_FEATURES_PATH_EXPR);
-        let vault_code = world.code_expression(VAULT_PATH_EXPR);
-
-        world.set_state_step(
-            SetStateStep::new()
-                .put_account(USER_ADDRESS_EXPR, Account::new().nonce(1))
-                .put_account(
-                    PROMISES_FEATURE_ADDRESS_EXPR,
-                    Account::new().nonce(1).code(promises_feature_code),
-                )
-                .put_account(
-                    VAULT_ADDRESS_EXPR,
-                    Account::new()
-                        .nonce(1)
-                        .code(vault_code)
-                        .esdt_balance(TOKEN_ID_EXPR, "1000"),
-                ),
-        );
-
-        let promises_features_contract =
-            PromisesFeaturesContract::new(PROMISES_FEATURE_ADDRESS_EXPR);
-        let vault_contract = VaultContract::new(VAULT_ADDRESS_EXPR);
-
-        Self {
-            world,
-            promises_features_contract,
-            vault_contract,
-        }
+        world.account(USER_ADDRESS).nonce(1);
+        world
+            .account(PROMISES_FEATURE_ADDRESS)
+            .nonce(1)
+            .code(PROMISES_FEATURES_PATH);
+        world
+            .account(VAULT_ADDRESS)
+            .nonce(1)
+            .code(VAULT_PATH)
+            .esdt_balance(TOKEN_ID_EXPR, 1000);
+
+        Self { world }
     }
 }
 
@@ -76,25 +50,19 @@ fn test_back_transfers() {
     let mut state = PromisesFeaturesTestState::new();
     let token_amount = BigUint::from(1000u64);
 
-    state.world.sc_call(
-        ScCallStep::new().from(USER_ADDRESS_EXPR).call(
-            state
-                .promises_features_contract
-                .forward_sync_retrieve_funds_bt(
-                    state.vault_contract,
-                    TOKEN_ID,
-                    0u64,
-                    &token_amount,
-                ),
-        ),
-    );
+    state
+        .world
+        .tx()
+        .from(USER_ADDRESS)
+        .to(PROMISES_FEATURE_ADDRESS)
+        .typed(promises_feature_proxy::PromisesFeaturesProxy)
+        .forward_sync_retrieve_funds_bt(VAULT_ADDRESS, TOKEN_ID, 0u64, &token_amount)
+        .run();
 
     state
         .world
-        .check_state_step(CheckStateStep::new().put_account(
-            state.promises_features_contract,
-            CheckAccount::new().esdt_balance(TOKEN_ID_EXPR, token_amount),
-        ));
+        .check_account(PROMISES_FEATURE_ADDRESS)
+        .esdt_balance(TOKEN_ID_EXPR, token_amount);
 }
 
 #[test]
@@ -102,25 +70,18 @@ fn test_multi_call_back_transfers() {
     let mut state = PromisesFeaturesTestState::new();
     let token_amount = BigUint::from(1000u64);
     let half_token_amount = token_amount.clone() / 2u64;
-    let vault_address = state.vault_contract.to_address();
-
-    state.world.sc_call(
-        ScCallStep::new().from(USER_ADDRESS_EXPR).call(
-            state
-                .promises_features_contract
-                .forward_sync_retrieve_funds_bt_twice(
-                    vault_address.clone(),
-                    TOKEN_ID,
-                    0u64,
-                    &half_token_amount,
-                ),
-        ),
-    );
 
     state
         .world
-        .check_state_step(CheckStateStep::new().put_account(
-            state.promises_features_contract,
-            CheckAccount::new().esdt_balance(TOKEN_ID_EXPR, token_amount),
-        ));
+        .tx()
+        .from(USER_ADDRESS)
+        .to(PROMISES_FEATURE_ADDRESS)
+        .typed(promises_feature_proxy::PromisesFeaturesProxy)
+        .forward_sync_retrieve_funds_bt_twice(VAULT_ADDRESS, TOKEN_ID, 0u64, &half_token_amount)
+        .run();
+
+    state
+        .world
+        .check_account(PROMISES_FEATURE_ADDRESS)
+        .esdt_balance(TOKEN_ID_EXPR, token_amount);
 }

From 155b62190fac2a484dd1737795ae9b882434980d Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Thu, 30 May 2024 10:29:55 +0300
Subject: [PATCH 0950/1254] unified - bf_interact

---
 .../basic-features/interact/config.toml       |   2 +-
 .../interact/src/bf_interact.rs               |  72 +++++-----
 .../interact/src/bf_interact_state.rs         |  28 ++--
 .../basic-features/src/basic_features_main.rs |   1 +
 .../src/basic_features_proxy.rs               | 131 ++++++++++++++++++
 .../src/storage_mapper_non_fungible_token.rs  |   3 +-
 .../src/storage_mapper_token_attributes.rs    |   3 +-
 .../src/types/example_enum_simple.rs          |   3 +-
 .../src/types/example_enum_with_fields.rs     |   3 +-
 .../src/types/example_struct_managed.rs       |   5 +-
 10 files changed, 187 insertions(+), 64 deletions(-)
 create mode 100644 contracts/feature-tests/basic-features/src/basic_features_proxy.rs

diff --git a/contracts/feature-tests/basic-features/interact/config.toml b/contracts/feature-tests/basic-features/interact/config.toml
index b7fe10a560..61ac8dbf87 100644
--- a/contracts/feature-tests/basic-features/interact/config.toml
+++ b/contracts/feature-tests/basic-features/interact/config.toml
@@ -1 +1 @@
-gateway = 'https://testnet-gateway.multiversx.com'
+gateway = 'https://devnet-gateway.multiversx.com'
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 e02d281120..e8f269cb71 100644
--- a/contracts/feature-tests/basic-features/interact/src/bf_interact.rs
+++ b/contracts/feature-tests/basic-features/interact/src/bf_interact.rs
@@ -1,12 +1,8 @@
-#![allow(deprecated)] // TODO: unified syntax
-
 mod bf_interact_cli;
 mod bf_interact_config;
 mod bf_interact_state;
 
-use basic_features::{
-    storage_direct_load::ProxyTrait as _, storage_direct_store::ProxyTrait as _, ProxyTrait,
-};
+use basic_features::basic_features_proxy;
 use bf_interact_config::Config;
 use bf_interact_state::State;
 use clap::Parser;
@@ -36,7 +32,7 @@ async fn main() {
 #[allow(unused)]
 struct BasicFeaturesInteract {
     interactor: Interactor,
-    wallet_address: Address,
+    wallet_address: Bech32Address,
     code_expr: BytesValue,
     state: State,
     large_storage_payload: Vec<u8>,
@@ -57,7 +53,7 @@ impl BasicFeaturesInteract {
 
         Self {
             interactor,
-            wallet_address,
+            wallet_address: wallet_address.into(),
             code_expr,
             state: State::load_state(),
             large_storage_payload: Vec::new(),
@@ -74,56 +70,60 @@ impl BasicFeaturesInteract {
     }
 
     async fn set_state(&mut self) {
-        println!("wallet address: {}", bech32::encode(&self.wallet_address));
-        self.interactor
-            .retrieve_account(&Bech32Address::from(&self.wallet_address))
-            .await;
+        println!("wallet address: {}", self.wallet_address);
+        self.interactor.retrieve_account(&self.wallet_address).await;
     }
 
     async fn deploy(&mut self) {
         self.set_state().await;
 
-        let (new_address, _) = self
+        let new_address = self
             .interactor
-            .sc_deploy_get_result::<_, IgnoreValue>(
-                ScDeployStep::new()
-                    .call(self.state.default_contract().init())
-                    .from(&self.wallet_address)
-                    .code(&self.code_expr)
-                    .gas_limit("4,000,000")
-                    .expect(TxExpect::ok().additional_error_message("deploy failed: ")),
-            )
+            .tx()
+            .from(&self.wallet_address)
+            .typed(basic_features_proxy::BasicFeaturesProxy)
+            .init()
+            .code(&self.code_expr)
+            .gas(NumExpr("4,000,000"))
+            .returns(ReturnsNewBech32Address)
+            .prepare_async()
+            .run()
             .await;
 
-        let new_address_bech32 = bech32::encode(&new_address);
-        println!("new address: {new_address_bech32}");
+        println!("new address: {new_address}");
 
-        let new_address_expr = format!("bech32:{new_address_bech32}");
-        self.state.set_bf_address(&new_address_expr);
+        self.state.set_bf_address(new_address);
     }
 
     async fn set_large_storage(&mut self, value: &[u8]) {
         self.interactor
-            .sc_call(
-                ScCallStep::new()
-                    .call(self.state.bf_contract().store_bytes(value))
-                    .from(&self.wallet_address)
-                    .gas_limit("600,000,000")
-                    .expect(
-                        TxExpect::ok()
-                            .additional_error_message("performing store_bytes failed with: "),
-                    ),
-            )
+            .tx()
+            .from(&self.wallet_address)
+            .to(self.state.bf_contract())
+            .gas(NumExpr("600,000,000"))
+            .typed(basic_features_proxy::BasicFeaturesProxy)
+            .store_bytes(value)
+            .prepare_async()
+            .run()
             .await;
 
         println!("successfully performed store_bytes");
     }
 
     async fn print_length(&mut self) {
-        let data: Vec<u8> = self
+        let data_raw = self
             .interactor
-            .quick_query(self.state.bf_contract().load_bytes())
+            .query()
+            .to(self.state.bf_contract())
+            .typed(basic_features_proxy::BasicFeaturesProxy)
+            .load_bytes()
+            .returns(ReturnsResult)
+            .prepare_async()
+            .run()
             .await;
+
+        let data = data_raw.to_vec();
+
         println!("retrieved data length: {}", data.len());
         if data != self.large_storage_payload {
             println!("WARNING! Payload mismatch!");
diff --git a/contracts/feature-tests/basic-features/interact/src/bf_interact_state.rs b/contracts/feature-tests/basic-features/interact/src/bf_interact_state.rs
index 6e904dd53c..9df12fa02b 100644
--- a/contracts/feature-tests/basic-features/interact/src/bf_interact_state.rs
+++ b/contracts/feature-tests/basic-features/interact/src/bf_interact_state.rs
@@ -1,22 +1,17 @@
-use crate::{ContractInfo, StaticApi};
+use multiversx_sc_snippets::imports::Bech32Address;
 use serde::{Deserialize, Serialize};
 use std::{
     io::{Read, Write},
     path::Path,
 };
 
-const DEFAULT_CONTRACT_ADDRESS: &str =
-    "0x0000000000000000000000000000000000000000000000000000000000000000";
-
 /// State file
 const STATE_FILE: &str = "state.toml";
 
-pub type BasicFeaturesContract = ContractInfo<basic_features::Proxy<StaticApi>>;
-
 /// Multisig Interact state
 #[derive(Debug, Default, Serialize, Deserialize)]
 pub struct State {
-    bf_address: Option<String>,
+    bf_address: Option<Bech32Address>,
 }
 
 impl State {
@@ -33,22 +28,15 @@ impl State {
     }
 
     /// Sets the contract address
-    pub fn set_bf_address(&mut self, address: &str) {
-        self.bf_address = Some(String::from(address));
+    pub fn set_bf_address(&mut self, address: Bech32Address) {
+        self.bf_address = Some(address);
     }
 
     /// Returns the contract
-    pub fn bf_contract(&self) -> BasicFeaturesContract {
-        BasicFeaturesContract::new(
-            self.bf_address
-                .clone()
-                .expect("basic-features contract not yet deployed"),
-        )
-    }
-
-    /// Returns the adder contract with default address
-    pub fn default_contract(&self) -> BasicFeaturesContract {
-        BasicFeaturesContract::new(DEFAULT_CONTRACT_ADDRESS)
+    pub fn bf_contract(&self) -> &Bech32Address {
+        self.bf_address
+            .as_ref()
+            .expect("basic-features contract not yet deployed")
     }
 }
 
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 2f0cb9a830..af82ff1201 100644
--- a/contracts/feature-tests/basic-features/src/basic_features_main.rs
+++ b/contracts/feature-tests/basic-features/src/basic_features_main.rs
@@ -2,6 +2,7 @@
 
 multiversx_sc::imports!();
 
+pub mod basic_features_proxy;
 pub mod big_num_methods;
 pub mod big_num_operators;
 pub mod block_info_features;
diff --git a/contracts/feature-tests/basic-features/src/basic_features_proxy.rs b/contracts/feature-tests/basic-features/src/basic_features_proxy.rs
new file mode 100644
index 0000000000..5fce393783
--- /dev/null
+++ b/contracts/feature-tests/basic-features/src/basic_features_proxy.rs
@@ -0,0 +1,131 @@
+use multiversx_sc::proxy_imports::*;
+
+pub struct BasicFeaturesProxy;
+
+impl<Env, From, To, Gas> TxProxyTrait<Env, From, To, Gas> for BasicFeaturesProxy
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    type TxProxyMethods = BasicFeaturesProxyMethods<Env, From, To, Gas>;
+
+    fn proxy_methods(self, tx: Tx<Env, From, To, (), Gas, (), ()>) -> Self::TxProxyMethods {
+        BasicFeaturesProxyMethods { wrapped_tx: tx }
+    }
+}
+
+pub struct BasicFeaturesProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    wrapped_tx: Tx<Env, From, To, (), Gas, (), ()>,
+}
+
+#[rustfmt::skip]
+impl<Env, From, Gas> BasicFeaturesProxyMethods<Env, From, (), Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn init(
+        self,
+    ) -> TxTypedDeploy<Env, From, NotPayable, Gas, ()> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_deploy()
+            .original_result()
+    }
+}
+
+#[rustfmt::skip]
+impl<Env, From, To, Gas> BasicFeaturesProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn load_bytes(
+        self,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ManagedBuffer<Env::Api>> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("load_bytes")
+            .original_result()
+    }
+
+    pub fn store_bytes<
+        Arg0: ProxyArg<ManagedBuffer<Env::Api>>,
+    >(
+        self,
+        bi: Arg0,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("store_bytes")
+            .argument(&bi)
+            .original_result()
+    }
+}
+
+#[type_abi]
+#[derive(TopEncode, TopDecode)]
+pub struct CodecErrorTestType {}
+
+#[rustfmt::skip]
+#[type_abi]
+#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
+pub enum ExampleEnumWithFields {
+    Unit,
+    Newtype(u32),
+    Tuple(u32, u32),
+    Struct {
+        a: u32,
+    },
+}
+
+#[type_abi]
+#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
+pub enum ExampleEnumSimple {
+    Variant0,
+    Variant1,
+    Variant2,
+}
+
+#[type_abi]
+#[derive(TopEncode, TopDecode, NestedEncode, NestedDecode)]
+pub struct TokenAttributesStruct<Api>
+where
+    Api: ManagedTypeApi,
+{
+    pub field_biguint: BigUint<Api>,
+    pub field_u64: u64,
+    pub field_vec_u32: ManagedVec<Api, u32>,
+}
+
+#[type_abi]
+#[derive(TopEncode, TopDecode)]
+pub struct RgbColor {
+    pub r: u8,
+    pub g: u8,
+    pub b: u8,
+}
+
+#[type_abi]
+#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, PartialEq, Eq, Debug, Clone)]
+pub struct ExampleStructManaged<Api>
+where
+    Api: ManagedTypeApi,
+{
+    pub big_uint: BigUint<Api>,
+    pub int: u32,
+    pub bytes: ManagedBuffer<Api>,
+}
diff --git a/contracts/feature-tests/basic-features/src/storage_mapper_non_fungible_token.rs b/contracts/feature-tests/basic-features/src/storage_mapper_non_fungible_token.rs
index 92963e5c11..4e341f04bd 100644
--- a/contracts/feature-tests/basic-features/src/storage_mapper_non_fungible_token.rs
+++ b/contracts/feature-tests/basic-features/src/storage_mapper_non_fungible_token.rs
@@ -1,7 +1,8 @@
 multiversx_sc::imports!();
 multiversx_sc::derive_imports!();
 
-#[derive(TypeAbi, TopEncode, TopDecode)]
+#[type_abi]
+#[derive(TopEncode, TopDecode)]
 pub struct RgbColor {
     r: u8,
     g: u8,
diff --git a/contracts/feature-tests/basic-features/src/storage_mapper_token_attributes.rs b/contracts/feature-tests/basic-features/src/storage_mapper_token_attributes.rs
index 366c6727c9..3a9101055c 100644
--- a/contracts/feature-tests/basic-features/src/storage_mapper_token_attributes.rs
+++ b/contracts/feature-tests/basic-features/src/storage_mapper_token_attributes.rs
@@ -1,7 +1,8 @@
 multiversx_sc::imports!();
 multiversx_sc::derive_imports!();
 
-#[derive(TopEncode, TopDecode, NestedEncode, NestedDecode, TypeAbi)]
+#[type_abi]
+#[derive(TopEncode, TopDecode, NestedEncode, NestedDecode)]
 pub struct TokenAttributesStruct<M: ManagedTypeApi> {
     field_biguint: BigUint<M>,
     field_u64: u64,
diff --git a/contracts/feature-tests/basic-features/src/types/example_enum_simple.rs b/contracts/feature-tests/basic-features/src/types/example_enum_simple.rs
index b752f712c6..d75a5309cc 100644
--- a/contracts/feature-tests/basic-features/src/types/example_enum_simple.rs
+++ b/contracts/feature-tests/basic-features/src/types/example_enum_simple.rs
@@ -1,7 +1,8 @@
 multiversx_sc::derive_imports!();
 
 /// Copied from multiversx-sc serialization tests.
-#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, TypeAbi)]
+#[type_abi]
+#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub enum ExampleEnumSimple {
     /// Variant 0 doc comment.
     /// This will show up in the ABI.
diff --git a/contracts/feature-tests/basic-features/src/types/example_enum_with_fields.rs b/contracts/feature-tests/basic-features/src/types/example_enum_with_fields.rs
index 246a9ca658..4b5acd7661 100644
--- a/contracts/feature-tests/basic-features/src/types/example_enum_with_fields.rs
+++ b/contracts/feature-tests/basic-features/src/types/example_enum_with_fields.rs
@@ -1,7 +1,8 @@
 multiversx_sc::derive_imports!();
 
 /// Copied from multiversx-sc serialization tests.
-#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, TypeAbi)]
+#[type_abi]
+#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub enum ExampleEnumWithFields {
     Unit,
     Newtype(u32),
diff --git a/contracts/feature-tests/basic-features/src/types/example_struct_managed.rs b/contracts/feature-tests/basic-features/src/types/example_struct_managed.rs
index cf23b5767c..b68060e80b 100644
--- a/contracts/feature-tests/basic-features/src/types/example_struct_managed.rs
+++ b/contracts/feature-tests/basic-features/src/types/example_struct_managed.rs
@@ -5,9 +5,8 @@ use multiversx_sc::{
 
 multiversx_sc::derive_imports!();
 
-#[derive(
-    NestedEncode, NestedDecode, TopEncode, TopDecode, TypeAbi, PartialEq, Eq, Debug, Clone,
-)]
+#[type_abi]
+#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, PartialEq, Eq, Debug, Clone)]
 pub struct ExampleStructManaged<M: ManagedTypeApi> {
     pub big_uint: BigUint<M>,
     pub int: u32,

From 391cce6b80d4ecc5ad4a39c7711c0f046916766d Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 30 May 2024 10:31:43 +0300
Subject: [PATCH 0951/1254] fix after merge

---
 .../tests/basic_features_managed_decimal_test.rs    |  3 ---
 .../src/types/managed/wrapped/managed_decimal.rs    | 13 ++++++++++++-
 framework/scenario/tests/managed_decimal_test.rs    |  3 ---
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/contracts/feature-tests/basic-features/tests/basic_features_managed_decimal_test.rs b/contracts/feature-tests/basic-features/tests/basic_features_managed_decimal_test.rs
index 42473aec9b..d4257fe078 100644
--- a/contracts/feature-tests/basic-features/tests/basic_features_managed_decimal_test.rs
+++ b/contracts/feature-tests/basic-features/tests/basic_features_managed_decimal_test.rs
@@ -2,13 +2,10 @@ 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
 }
 
diff --git a/framework/base/src/types/managed/wrapped/managed_decimal.rs b/framework/base/src/types/managed/wrapped/managed_decimal.rs
index 39a8263396..bc9b282a55 100644
--- a/framework/base/src/types/managed/wrapped/managed_decimal.rs
+++ b/framework/base/src/types/managed/wrapped/managed_decimal.rs
@@ -1,5 +1,5 @@
 use crate::{
-    abi::{TypeAbi, TypeName},
+    abi::{TypeAbi, TypeAbiFrom, TypeName},
     api::{
         const_handles, use_raw_handle, BigFloatApiImpl, BigIntApiImpl, ManagedTypeApi,
         StaticVarApiImpl,
@@ -363,7 +363,11 @@ impl<M: ManagedTypeApi, D1: Decimals, D2: Decimals> PartialEq<ManagedDecimal<M,
     }
 }
 
+impl<M: ManagedTypeApi> TypeAbiFrom<Self> for ManagedDecimal<M, NumDecimals> {}
+
 impl<M: ManagedTypeApi> TypeAbi for ManagedDecimal<M, NumDecimals> {
+    type Unmanaged = Self;
+
     fn type_name() -> TypeName {
         TypeName::from("ManagedDecimal<usize>")
     }
@@ -373,9 +377,16 @@ impl<M: ManagedTypeApi> TypeAbi for ManagedDecimal<M, NumDecimals> {
     }
 }
 
+impl<M: ManagedTypeApi, const DECIMALS: NumDecimals> TypeAbiFrom<Self>
+    for ManagedDecimal<M, ConstDecimals<DECIMALS>>
+{
+}
+
 impl<M: ManagedTypeApi, const DECIMALS: NumDecimals> TypeAbi
     for ManagedDecimal<M, ConstDecimals<DECIMALS>>
 {
+    type Unmanaged = Self;
+
     fn type_name() -> TypeName {
         TypeName::from(alloc::format!("ManagedDecimal<{}>", DECIMALS))
     }
diff --git a/framework/scenario/tests/managed_decimal_test.rs b/framework/scenario/tests/managed_decimal_test.rs
index 3b185a8a56..cbe701c9cf 100644
--- a/framework/scenario/tests/managed_decimal_test.rs
+++ b/framework/scenario/tests/managed_decimal_test.rs
@@ -1,6 +1,3 @@
-#![feature(generic_const_exprs)]
-#![allow(incomplete_features)]
-
 use multiversx_sc::{
     codec::test_util::{check_dep_encode_decode, check_top_encode_decode},
     types::{BigFloat, BigUint, ConstDecimals, ManagedDecimal, NumDecimals},

From 910077470f1b89696846117742b202f0819b0c2a Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 30 May 2024 11:02:17 +0300
Subject: [PATCH 0952/1254] managed decimal test fix after merge

---
 .../src/basic_features_proxy.rs               |  8 +++
 .../tests/basic_features_egld_decimal_test.rs | 65 +++++++------------
 .../basic-features/wasm/src/lib.rs            |  8 +--
 3 files changed, 37 insertions(+), 44 deletions(-)

diff --git a/contracts/feature-tests/basic-features/src/basic_features_proxy.rs b/contracts/feature-tests/basic-features/src/basic_features_proxy.rs
index 5fce393783..7131607d8c 100644
--- a/contracts/feature-tests/basic-features/src/basic_features_proxy.rs
+++ b/contracts/feature-tests/basic-features/src/basic_features_proxy.rs
@@ -74,6 +74,14 @@ where
             .argument(&bi)
             .original_result()
     }
+
+    pub fn returns_egld_decimal(
+        self,
+    ) -> TxTypedCall<Env, From, To, (), Gas, ManagedDecimal<Env::Api, ConstDecimals<18>>> {
+        self.wrapped_tx
+            .raw_call("returns_egld_decimal")
+            .original_result()
+    }
 }
 
 #[type_abi]
diff --git a/contracts/feature-tests/basic-features/tests/basic_features_egld_decimal_test.rs b/contracts/feature-tests/basic-features/tests/basic_features_egld_decimal_test.rs
index 96a01cfc00..3f9589e01f 100644
--- a/contracts/feature-tests/basic-features/tests/basic_features_egld_decimal_test.rs
+++ b/contracts/feature-tests/basic-features/tests/basic_features_egld_decimal_test.rs
@@ -1,49 +1,34 @@
-use multiversx_sc::types::{
-    BigUint, ConstDecimals, ContractCallWithEgld, ManagedAddress, ManagedDecimal,
-};
-use multiversx_sc_scenario::{api::StaticApi, scenario_model::*, *};
+use imports::{MxscPath, ReturnsResult, TestAddress, TestSCAddress};
+use multiversx_sc::types::{BigUint, ConstDecimals, ManagedDecimal};
+use multiversx_sc_scenario::{api::StaticApi, imports, ScenarioTxRun, ScenarioWorld};
 
-const BASIC_FEATURES_PATH_EXPR: &str = "file:../output/basic-features.wasm";
-const OWNER_ADDRESS_EXPR: &str = "address:owner";
-const BASIC_FEATURES_ADDRESS_EXPR: &str = "sc:basic-features";
-
-type BasicFeatures = ContractInfo<basic_features::Proxy<StaticApi>>;
+const OWNER_ADDRESS: TestAddress = TestAddress::new("owner");
+const BASIC_FEATURES_ADDRESS: TestSCAddress = TestSCAddress::new("basic-features");
+const BASIC_FEATURES_PATH: MxscPath = MxscPath::new("output/basic-features.mxsc.json");
 
 struct BasicFeaturesState {
     world: ScenarioWorld,
-    basic_features: BasicFeatures,
 }
 
 impl BasicFeaturesState {
     fn new() -> Self {
         let mut world = world();
-        let basic_features_code = world.code_expression(BASIC_FEATURES_PATH_EXPR);
-
-        world.set_state_step(
-            SetStateStep::new()
-                .put_account(
-                    OWNER_ADDRESS_EXPR,
-                    Account::new().nonce(1).balance(BigUintValue::from(100u64)),
-                )
-                .put_account(
-                    BASIC_FEATURES_ADDRESS_EXPR,
-                    Account::new().nonce(1).code(basic_features_code),
-                ),
-        );
+        let basic_features_code =
+            world.code_expression(BASIC_FEATURES_PATH.eval_to_expr().as_str());
 
-        let basic_features = BasicFeatures::new(BASIC_FEATURES_ADDRESS_EXPR);
+        world.account(OWNER_ADDRESS).nonce(1).balance(100);
+        world
+            .account(BASIC_FEATURES_ADDRESS)
+            .nonce(1)
+            .code(basic_features_code);
 
-        Self {
-            world,
-            basic_features,
-        }
+        Self { world }
     }
 }
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
-    blockchain.set_current_dir_from_workspace("contracts/feature-tests/basic-features");
 
-    blockchain.register_contract(BASIC_FEATURES_PATH_EXPR, basic_features::ContractBuilder);
+    blockchain.register_contract(BASIC_FEATURES_PATH, basic_features::ContractBuilder);
     blockchain
 }
 
@@ -51,19 +36,19 @@ fn world() -> ScenarioWorld {
 fn egld_decimal_blackbox_test() {
     let mut state = BasicFeaturesState::new();
 
-    let sc_call =
-        ContractCallWithEgld::<StaticApi, ManagedDecimal<StaticApi, ConstDecimals<18>>>::new(
-            ManagedAddress::from(state.basic_features.to_address()),
-            "returns_egld_decimal",
-            BigUint::from(5u64),
-        );
-
-    let egld_decimal: ManagedDecimal<StaticApi, ConstDecimals<18>> = state
+    let egld_decimal_result = state
         .world
-        .sc_call_get_result(ScCallStep::new().call(sc_call).from("address:owner"));
+        .tx()
+        .from(OWNER_ADDRESS)
+        .to(BASIC_FEATURES_ADDRESS)
+        .typed(basic_features::basic_features_proxy::BasicFeaturesProxy)
+        .returns_egld_decimal()
+        .egld(5)
+        .returns(ReturnsResult)
+        .run();
 
     assert_eq!(
-        egld_decimal,
+        egld_decimal_result,
         ManagedDecimal::<StaticApi, ConstDecimals<18>>::const_decimals_from_raw(BigUint::from(
             5u64
         ))
diff --git a/contracts/feature-tests/basic-features/wasm/src/lib.rs b/contracts/feature-tests/basic-features/wasm/src/lib.rs
index b746a95e81..07b590d9f6 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:                          389
+// Endpoints:                          395
 // Async Callback:                       1
-// Total number of exported functions: 391
+// Total number of exported functions: 397
 
 #![no_std]
 
@@ -406,13 +406,13 @@ multiversx_sc_wasm_adapter::endpoints! {
         contains_unordered_at_address => contains_unordered_at_address
         get_by_index => get_by_index
         fill_set_mapper => fill_set_mapper
+        fill_map_mapper => fill_map_mapper
+        fill_unordered_set_mapper => fill_unordered_set_mapper
         managed_decimal_addition => managed_decimal_addition
         managed_decimal_subtraction => managed_decimal_subtraction
         managed_decimal_eq => managed_decimal_eq
         managed_decimal_trunc => managed_decimal_trunc
         managed_decimal_into_raw_units => managed_decimal_into_raw_units
-        fill_map_mapper => fill_map_mapper
-        fill_unordered_set_mapper => fill_unordered_set_mapper
     )
 }
 

From 0ffc965216698386b649bdc7e76f31bb57f6e2e7 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 30 May 2024 11:31:37 +0300
Subject: [PATCH 0953/1254] ManagedDecimal type abi fix, proxy update

---
 contracts/feature-tests/abi-tester/src/abi_proxy.rs      | 9 +++++++++
 .../base/src/types/managed/wrapped/managed_decimal.rs    | 7 +++++++
 2 files changed, 16 insertions(+)

diff --git a/contracts/feature-tests/abi-tester/src/abi_proxy.rs b/contracts/feature-tests/abi-tester/src/abi_proxy.rs
index 55f3a6e6ef..2011970429 100644
--- a/contracts/feature-tests/abi-tester/src/abi_proxy.rs
+++ b/contracts/feature-tests/abi-tester/src/abi_proxy.rs
@@ -578,3 +578,12 @@ pub enum ExplicitDiscriminantMixed {
         b: u16,
     },
 }
+
+#[type_abi]
+#[derive(TopEncode, TopDecode)]
+pub struct ManagedDecimalWrapper<Api>
+where
+    Api: ManagedTypeApi,
+{
+    pub field: ManagedDecimal<Api, ConstDecimals<2>>,
+}
diff --git a/framework/base/src/types/managed/wrapped/managed_decimal.rs b/framework/base/src/types/managed/wrapped/managed_decimal.rs
index bc9b282a55..89a7c47ca9 100644
--- a/framework/base/src/types/managed/wrapped/managed_decimal.rs
+++ b/framework/base/src/types/managed/wrapped/managed_decimal.rs
@@ -391,6 +391,13 @@ impl<M: ManagedTypeApi, const DECIMALS: NumDecimals> TypeAbi
         TypeName::from(alloc::format!("ManagedDecimal<{}>", DECIMALS))
     }
 
+    fn type_name_rust() -> TypeName {
+        TypeName::from(alloc::format!(
+            "ManagedDecimal<$API, ConstDecimals<{}>>",
+            DECIMALS
+        ))
+    }
+
     fn is_variadic() -> bool {
         false
     }

From 09a6c8be3a77d8a15c72dcc7bf2b42edd5877f66 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 29 May 2024 22:57:55 +0300
Subject: [PATCH 0954/1254] retrieve_tx_on_network moved to gateway proxy

---
 Cargo.lock                                           |  1 +
 .../src/interactor_scenario/interactor_sc_call.rs    |  2 +-
 .../src/interactor_scenario/interactor_sc_deploy.rs  |  2 +-
 .../src/interactor_scenario/interactor_transfer.rs   |  2 +-
 framework/snippets/src/lib.rs                        |  1 -
 .../src/multi/interactor_multi_sc_process.rs         |  2 +-
 sdk/core/Cargo.toml                                  |  1 +
 sdk/core/src/blockchain.rs                           |  2 ++
 .../core/src/blockchain/gateway_tx_retrieve.rs       | 12 ++++++------
 9 files changed, 14 insertions(+), 11 deletions(-)
 rename framework/snippets/src/interactor_retrieve.rs => sdk/core/src/blockchain/gateway_tx_retrieve.rs (87%)

diff --git a/Cargo.lock b/Cargo.lock
index fb08c18c3e..ec245b66b9 100755
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2076,6 +2076,7 @@ dependencies = [
  "hex",
  "hmac",
  "itertools",
+ "log",
  "pbkdf2",
  "pem",
  "rand 0.8.5",
diff --git a/framework/snippets/src/interactor_scenario/interactor_sc_call.rs b/framework/snippets/src/interactor_scenario/interactor_sc_call.rs
index 061005ea13..6802304ae9 100644
--- a/framework/snippets/src/interactor_scenario/interactor_sc_call.rs
+++ b/framework/snippets/src/interactor_scenario/interactor_sc_call.rs
@@ -14,7 +14,7 @@ impl Interactor {
     {
         let sc_call_step = sc_call_step.as_mut();
         let tx_hash = self.launch_sc_call(sc_call_step).await;
-        let tx = self.retrieve_tx_on_network(tx_hash.clone()).await;
+        let tx = self.proxy.retrieve_tx_on_network(tx_hash.clone()).await;
 
         sc_call_step.save_response(network_response::parse_tx_response(tx));
 
diff --git a/framework/snippets/src/interactor_scenario/interactor_sc_deploy.rs b/framework/snippets/src/interactor_scenario/interactor_sc_deploy.rs
index 529efc38bb..59de249e83 100644
--- a/framework/snippets/src/interactor_scenario/interactor_sc_deploy.rs
+++ b/framework/snippets/src/interactor_scenario/interactor_sc_deploy.rs
@@ -53,7 +53,7 @@ impl Interactor {
     {
         let sc_deploy_step = sc_deploy_step.as_mut();
         let tx_hash = self.launch_sc_deploy(sc_deploy_step).await;
-        let tx = self.retrieve_tx_on_network(tx_hash.clone()).await;
+        let tx = self.proxy.retrieve_tx_on_network(tx_hash.clone()).await;
 
         let addr = sc_deploy_step.tx.from.clone();
         let nonce = tx.nonce;
diff --git a/framework/snippets/src/interactor_scenario/interactor_transfer.rs b/framework/snippets/src/interactor_scenario/interactor_transfer.rs
index 2e99372b0f..6557e4119f 100644
--- a/framework/snippets/src/interactor_scenario/interactor_transfer.rs
+++ b/framework/snippets/src/interactor_scenario/interactor_transfer.rs
@@ -14,7 +14,7 @@ impl Interactor {
         println!("transfer tx hash: {tx_hash}");
         info!("transfer tx hash: {}", tx_hash);
 
-        self.retrieve_tx_on_network(tx_hash.clone()).await;
+        self.proxy.retrieve_tx_on_network(tx_hash.clone()).await;
 
         self.post_runners.run_transfer_step(&transfer_step);
 
diff --git a/framework/snippets/src/lib.rs b/framework/snippets/src/lib.rs
index 6240a9f152..7d3b52c696 100644
--- a/framework/snippets/src/lib.rs
+++ b/framework/snippets/src/lib.rs
@@ -1,7 +1,6 @@
 pub mod account_tool;
 mod interactor;
 mod interactor_dns;
-mod interactor_retrieve;
 mod interactor_scenario;
 mod interactor_sender;
 mod interactor_tx;
diff --git a/framework/snippets/src/multi/interactor_multi_sc_process.rs b/framework/snippets/src/multi/interactor_multi_sc_process.rs
index f19dcfb171..3364a4d5ee 100644
--- a/framework/snippets/src/multi/interactor_multi_sc_process.rs
+++ b/framework/snippets/src/multi/interactor_multi_sc_process.rs
@@ -31,7 +31,7 @@ impl Interactor {
                 .expect("failed to send transaction");
 
             println!("process tx hash: {tx_hash} with nonce: {}", tx.nonce);
-            futures.push(self.retrieve_tx_on_network(tx_hash.clone()));
+            futures.push(self.proxy.retrieve_tx_on_network(tx_hash.clone()));
         }
 
         join_all(futures).await
diff --git a/sdk/core/Cargo.toml b/sdk/core/Cargo.toml
index 319c81b137..c8bf3c75fb 100644
--- a/sdk/core/Cargo.toml
+++ b/sdk/core/Cargo.toml
@@ -34,3 +34,4 @@ zeroize = "1.4.2"
 bech32 = "0.9"
 itertools = "0.12.0"
 pem = "3.0.2"
+log = "0.4.17"
diff --git a/sdk/core/src/blockchain.rs b/sdk/core/src/blockchain.rs
index 73d97ef0ea..be80103195 100644
--- a/sdk/core/src/blockchain.rs
+++ b/sdk/core/src/blockchain.rs
@@ -1,3 +1,5 @@
+mod gateway_tx_retrieve;
+
 use std::collections::HashMap;
 
 use crate::data::{
diff --git a/framework/snippets/src/interactor_retrieve.rs b/sdk/core/src/blockchain/gateway_tx_retrieve.rs
similarity index 87%
rename from framework/snippets/src/interactor_retrieve.rs
rename to sdk/core/src/blockchain/gateway_tx_retrieve.rs
index cd9291ba33..44a0357432 100644
--- a/framework/snippets/src/interactor_retrieve.rs
+++ b/sdk/core/src/blockchain/gateway_tx_retrieve.rs
@@ -1,28 +1,28 @@
-use crate::Interactor;
+use crate::data::transaction::TransactionOnNetwork;
 use log::info;
-use multiversx_sdk::data::transaction::TransactionOnNetwork;
 use std::time::{Duration, Instant};
 
+use super::CommunicationProxy;
+
 const INITIAL_BACKOFF_DELAY: f32 = 1.4;
 const MAX_RETRIES: usize = 8;
 const MAX_BACKOFF_DELAY: Duration = Duration::from_secs(6);
 
-impl Interactor {
+impl CommunicationProxy {
     /// Retrieves a transaction from the network.
-    pub(crate) async fn retrieve_tx_on_network(&self, tx_hash: String) -> TransactionOnNetwork {
+    pub async fn retrieve_tx_on_network(&self, tx_hash: String) -> TransactionOnNetwork {
         let mut retries = 0;
         let mut backoff_delay = Duration::from_secs_f32(INITIAL_BACKOFF_DELAY);
         let start_time = Instant::now();
 
         loop {
-            match self.proxy.get_transaction_status(&tx_hash).await {
+            match self.get_transaction_status(&tx_hash).await {
                 Ok(status) => {
                     // checks if transaction status is final
                     match status.as_str() {
                         "success" | "fail" => {
                             // retrieve transaction info with results
                             let transaction_info_with_results = self
-                                .proxy
                                 .get_transaction_info_with_results(&tx_hash)
                                 .await
                                 .unwrap();

From 89524dbfada6cc6a975c58b5d53d7356872752c0 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 29 May 2024 23:15:19 +0300
Subject: [PATCH 0955/1254] gateway proxy split into files

---
 sdk/core/src/blockchain.rs                 | 404 +--------------------
 sdk/core/src/blockchain/gateway_account.rs | 112 ++++++
 sdk/core/src/blockchain/gateway_block.rs   |  66 ++++
 sdk/core/src/blockchain/gateway_network.rs |  46 +++
 sdk/core/src/blockchain/gateway_proxy.rs   |  20 +
 sdk/core/src/blockchain/gateway_tx.rs      | 184 ++++++++++
 6 files changed, 434 insertions(+), 398 deletions(-)
 create mode 100644 sdk/core/src/blockchain/gateway_account.rs
 create mode 100644 sdk/core/src/blockchain/gateway_block.rs
 create mode 100644 sdk/core/src/blockchain/gateway_network.rs
 create mode 100644 sdk/core/src/blockchain/gateway_proxy.rs
 create mode 100644 sdk/core/src/blockchain/gateway_tx.rs

diff --git a/sdk/core/src/blockchain.rs b/sdk/core/src/blockchain.rs
index be80103195..05bad7198a 100644
--- a/sdk/core/src/blockchain.rs
+++ b/sdk/core/src/blockchain.rs
@@ -1,25 +1,11 @@
+mod gateway_account;
+mod gateway_block;
+mod gateway_network;
+mod gateway_proxy;
+mod gateway_tx;
 mod gateway_tx_retrieve;
 
-use std::collections::HashMap;
-
-use crate::data::{
-    account::{Account, AccountResponse},
-    account_storage::AccountStorageResponse,
-    address::Address,
-    esdt::{EsdtBalance, EsdtBalanceResponse, EsdtRolesResponse},
-    hyperblock::{HyperBlock, HyperBlockResponse},
-    network_config::{NetworkConfig, NetworkConfigResponse},
-    network_economics::{NetworkEconomics, NetworkEconomicsResponse},
-    network_status::NetworkStatusResponse,
-    transaction::{
-        ArgCreateTransaction, ResponseTxCost, SendTransactionResponse, SendTransactionsResponse,
-        Transaction, TransactionInfo, TransactionOnNetwork, TransactionStatus, TxCostResponseData,
-    },
-    vm::{ResponseVmValue, VmValueRequest, VmValuesResponseData},
-};
-use anyhow::{anyhow, Result};
-use itertools::Itertools;
-use reqwest::Client;
+pub use gateway_proxy::CommunicationProxy;
 
 pub const MAINNET_GATEWAY: &str = "https://gateway.multiversx.com";
 pub const TESTNET_GATEWAY: &str = "https://testnet-gateway.multiversx.com";
@@ -27,381 +13,3 @@ pub const DEVNET_GATEWAY: &str = "https://devnet-gateway.multiversx.com";
 
 // MetachainShardId will be used to identify a shard ID as metachain
 pub const METACHAIN_SHARD_ID: u32 = 0xFFFFFFFF;
-
-const NETWORK_CONFIG_ENDPOINT: &str = "network/config";
-const NETWORK_ECONOMICS_ENDPOINT: &str = "network/economics";
-const ACCOUNT_ENDPOINT: &str = "address/";
-const KEYS_ENDPOINT: &str = "/keys/";
-const COST_TRANSACTION_ENDPOINT: &str = "transaction/cost";
-const SEND_TRANSACTION_ENDPOINT: &str = "transaction/send";
-const SEND_MULTIPLE_TRANSACTIONS_ENDPOINT: &str = "transaction/send-multiple";
-const GET_TRANSACTION_INFO_ENDPOINT: &str = "transaction/";
-const GET_HYPER_BLOCK_BY_NONCE_ENDPOINT: &str = "hyperblock/by-nonce/";
-const GET_HYPER_BLOCK_BY_HASH_ENDPOINT: &str = "hyperblock/by-hash/";
-const GET_NETWORK_STATUS_ENDPOINT: &str = "network/status";
-const WITH_RESULTS_QUERY_PARAM: &str = "?withResults=true";
-const VM_VALUES_ENDPOINT: &str = "vm-values/query";
-
-#[derive(Clone, Debug)]
-pub struct CommunicationProxy {
-    proxy_url: String,
-    client: Client,
-}
-
-impl CommunicationProxy {
-    pub fn new(proxy_url: String) -> Self {
-        Self {
-            proxy_url,
-            client: Client::new(),
-        }
-    }
-
-    fn get_endpoint(&self, endpoint: &str) -> String {
-        format!("{}/{}", self.proxy_url, endpoint)
-    }
-
-    // get_network_config retrieves the network configuration from the proxy
-    pub async fn get_network_config(&self) -> Result<NetworkConfig> {
-        let endpoint = self.get_endpoint(NETWORK_CONFIG_ENDPOINT);
-        let resp = self
-            .client
-            .get(endpoint)
-            .send()
-            .await?
-            .json::<NetworkConfigResponse>()
-            .await?;
-
-        match resp.data {
-            None => Err(anyhow!("{}", resp.error)),
-            Some(b) => Ok(b.config),
-        }
-    }
-
-    // get_network_economics retrieves the network economics from the proxy
-    pub async fn get_network_economics(&self) -> Result<NetworkEconomics> {
-        let endpoint = self.get_endpoint(NETWORK_ECONOMICS_ENDPOINT);
-        let resp = self
-            .client
-            .get(endpoint)
-            .send()
-            .await?
-            .json::<NetworkEconomicsResponse>()
-            .await?;
-
-        match resp.data {
-            None => Err(anyhow!("{}", resp.error)),
-            Some(b) => Ok(b.metrics),
-        }
-    }
-
-    async fn get_hyper_block(&self, endpoint: &str) -> Result<HyperBlock> {
-        let endpoint = self.get_endpoint(endpoint);
-        let resp = self
-            .client
-            .get(endpoint)
-            .send()
-            .await?
-            .json::<HyperBlockResponse>()
-            .await?;
-
-        match resp.data {
-            None => Err(anyhow!("{}", resp.error)),
-            Some(b) => Ok(b.hyperblock),
-        }
-    }
-
-    // get_hyper_block_by_hash retrieves a hyper block's info by hash from the network
-    pub async fn get_hyper_block_by_hash(&self, hash: &str) -> Result<HyperBlock> {
-        let endpoint = GET_HYPER_BLOCK_BY_HASH_ENDPOINT.to_string() + hash;
-        self.get_hyper_block(endpoint.as_str()).await
-    }
-
-    // get_hyper_block_by_nonce retrieves a hyper block's info by nonce from the network
-    pub async fn get_hyper_block_by_nonce(&self, nonce: u64) -> Result<HyperBlock> {
-        let endpoint = GET_HYPER_BLOCK_BY_NONCE_ENDPOINT.to_string() + nonce.to_string().as_str();
-        self.get_hyper_block(endpoint.as_str()).await
-    }
-
-    // get_latest_hyper_block_nonce retrieves the latest hyper block (metachain) nonce from the network
-    pub async fn get_latest_hyper_block_nonce(&self, with_metachain: bool) -> Result<u64> {
-        let mut endpoint = GET_NETWORK_STATUS_ENDPOINT.to_string();
-
-        if with_metachain {
-            endpoint = format!("{GET_NETWORK_STATUS_ENDPOINT}/{METACHAIN_SHARD_ID}");
-        }
-
-        let endpoint = self.get_endpoint(endpoint.as_str());
-
-        let resp = self
-            .client
-            .get(endpoint)
-            .send()
-            .await?
-            .json::<NetworkStatusResponse>()
-            .await?;
-
-        match resp.data {
-            None => Err(anyhow!("{}", resp.error)),
-            Some(b) => Ok(b.status.nonce),
-        }
-    }
-
-    // request_transaction_cost retrieves how many gas a transaction will consume
-    pub async fn request_transaction_cost(&self, tx: &Transaction) -> Result<TxCostResponseData> {
-        let endpoint = self.get_endpoint(COST_TRANSACTION_ENDPOINT);
-        let resp = self
-            .client
-            .post(endpoint)
-            .json(tx)
-            .send()
-            .await?
-            .json::<ResponseTxCost>()
-            .await?;
-
-        match resp.data {
-            None => Err(anyhow!("{}", resp.error)),
-            Some(b) => Ok(b),
-        }
-    }
-
-    // get_account retrieves an account info from the network (nonce, balance)
-    pub async fn get_account(&self, address: &Address) -> Result<Account> {
-        if !address.is_valid() {
-            return Err(anyhow!("invalid address"));
-        }
-
-        let endpoint = ACCOUNT_ENDPOINT.to_string() + address.to_string().as_str();
-        let endpoint = self.get_endpoint(endpoint.as_str());
-        let resp = self
-            .client
-            .get(endpoint)
-            .send()
-            .await?
-            .json::<AccountResponse>()
-            .await?;
-
-        match resp.data {
-            None => Err(anyhow!("{}", resp.error)),
-            Some(b) => Ok(b.account),
-        }
-    }
-
-    // get_account_esdt_roles retrieves an all esdt roles of an account from the network
-    pub async fn get_account_esdt_roles(
-        &self,
-        address: &Address,
-    ) -> Result<HashMap<String, Vec<String>>> {
-        if !address.is_valid() {
-            return Err(anyhow!("invalid address"));
-        }
-
-        let endpoint = ACCOUNT_ENDPOINT.to_string() + address.to_string().as_str() + "/esdts/roles";
-        let endpoint = self.get_endpoint(endpoint.as_str());
-        let resp = self
-            .client
-            .get(endpoint)
-            .send()
-            .await?
-            .json::<EsdtRolesResponse>()
-            .await?;
-
-        match resp.data {
-            None => Err(anyhow!("{}", resp.error)),
-            Some(b) => Ok(b.roles),
-        }
-    }
-
-    // get_account_esdt_tokens retrieves an all esdt token of an account from the network
-    pub async fn get_account_esdt_tokens(
-        &self,
-        address: &Address,
-    ) -> Result<HashMap<String, EsdtBalance>> {
-        if !address.is_valid() {
-            return Err(anyhow!("invalid address"));
-        }
-
-        let endpoint = ACCOUNT_ENDPOINT.to_string() + address.to_string().as_str() + "/esdt";
-        let endpoint = self.get_endpoint(endpoint.as_str());
-        let resp = self
-            .client
-            .get(endpoint)
-            .send()
-            .await?
-            .json::<EsdtBalanceResponse>()
-            .await?;
-
-        match resp.data {
-            None => Err(anyhow!("{}", resp.error)),
-            Some(b) => Ok(b.esdts),
-        }
-    }
-
-    // get_account_esdt_tokens retrieves an all esdt token of an account from the network
-    pub async fn get_account_storage_keys(
-        &self,
-        address: &Address,
-    ) -> Result<HashMap<String, String>> {
-        if !address.is_valid() {
-            return Err(anyhow!("invalid address"));
-        }
-
-        let endpoint = ACCOUNT_ENDPOINT.to_string() + address.to_string().as_str() + KEYS_ENDPOINT;
-        let endpoint = self.get_endpoint(endpoint.as_str());
-        let resp = self
-            .client
-            .get(endpoint)
-            .send()
-            .await?
-            .json::<AccountStorageResponse>()
-            .await?;
-
-        match resp.data {
-            None => Err(anyhow!("{}", resp.error)),
-            Some(b) => Ok(b.pairs),
-        }
-    }
-
-    async fn get_transaction_info_internal(
-        &self,
-        hash: &str,
-        with_results: bool,
-    ) -> Result<TransactionOnNetwork> {
-        let mut endpoint = GET_TRANSACTION_INFO_ENDPOINT.to_string() + hash;
-
-        if with_results {
-            endpoint += WITH_RESULTS_QUERY_PARAM
-        }
-
-        let endpoint = self.get_endpoint(endpoint.as_str());
-        let resp = self
-            .client
-            .get(endpoint)
-            .send()
-            .await?
-            .json::<TransactionInfo>()
-            .await?;
-
-        match resp.data {
-            None => Err(anyhow!("{}", resp.error)),
-            Some(b) => Ok(b.transaction),
-        }
-    }
-
-    // get_transaction_info retrieves a transaction's details from the network
-    pub async fn get_transaction_info(&self, hash: &str) -> Result<TransactionOnNetwork> {
-        self.get_transaction_info_internal(hash, false).await
-    }
-
-    // get_transaction_info_with_results retrieves a transaction's details from the network with events
-    pub async fn get_transaction_info_with_results(
-        &self,
-        hash: &str,
-    ) -> Result<TransactionOnNetwork> {
-        self.get_transaction_info_internal(hash, true).await
-    }
-
-    // get_transaction_status retrieves a transaction's status from the network
-    pub async fn get_transaction_status(&self, hash: &str) -> Result<String> {
-        let endpoint = format!("transaction/{hash}/status");
-        let endpoint = self.get_endpoint(endpoint.as_str());
-
-        let resp = self
-            .client
-            .get(endpoint)
-            .send()
-            .await?
-            .json::<TransactionStatus>()
-            .await?;
-
-        match resp.data {
-            None => Err(anyhow!("{}", resp.error)),
-            Some(b) => Ok(b.status),
-        }
-    }
-
-    // get_default_transaction_arguments will prepare the transaction creation argument by querying the account's info
-    pub async fn get_default_transaction_arguments(
-        &self,
-        address: &Address,
-        network_configs: &NetworkConfig,
-    ) -> Result<ArgCreateTransaction> {
-        let account = self.get_account(address).await?;
-
-        Ok(ArgCreateTransaction {
-            nonce: account.nonce,
-            value: "".to_string(),
-            rcv_addr: address.clone(),
-            snd_addr: address.clone(),
-            gas_price: network_configs.min_gas_price,
-            gas_limit: network_configs.min_gas_limit,
-            data: None,
-            signature: "".to_string(),
-            chain_id: network_configs.chain_id.clone(),
-            version: network_configs.min_transaction_version,
-            options: 0,
-            available_balance: account.balance,
-        })
-    }
-
-    pub async fn send_transaction(&self, tx: &Transaction) -> Result<String> {
-        let endpoint = self.get_endpoint(SEND_TRANSACTION_ENDPOINT);
-        let resp = self
-            .client
-            .post(endpoint)
-            .json(tx)
-            .send()
-            .await?
-            .json::<SendTransactionResponse>()
-            .await?;
-
-        match resp.data {
-            None => Err(anyhow!("{}", resp.error)),
-            Some(b) => Ok(b.tx_hash),
-        }
-    }
-
-    pub async fn send_transactions(&self, txs: &Vec<Transaction>) -> Result<Vec<String>> {
-        let endpoint = self.get_endpoint(SEND_MULTIPLE_TRANSACTIONS_ENDPOINT);
-        let resp = self
-            .client
-            .post(endpoint)
-            .json(txs)
-            .send()
-            .await?
-            .json::<SendTransactionsResponse>()
-            .await?;
-
-        match resp.data {
-            None => Err(anyhow!("{}", resp.error)),
-            Some(b) => {
-                let mut tx_hashs: Vec<String> = vec![];
-                for key in b.txs_hashes.keys().sorted() {
-                    tx_hashs.push(b.txs_hashes[key].clone());
-                }
-
-                Ok(tx_hashs)
-            },
-        }
-    }
-
-    // execute_vmquery retrieves data from existing SC trie through the use of a VM
-    pub async fn execute_vmquery(
-        &self,
-        vm_request: &VmValueRequest,
-    ) -> Result<VmValuesResponseData> {
-        let endpoint = self.get_endpoint(VM_VALUES_ENDPOINT);
-        let resp = self
-            .client
-            .post(endpoint)
-            .json(vm_request)
-            .send()
-            .await?
-            .json::<ResponseVmValue>()
-            .await?;
-
-        match resp.data {
-            None => Err(anyhow!("{}", resp.error)),
-            Some(b) => Ok(b),
-        }
-    }
-}
diff --git a/sdk/core/src/blockchain/gateway_account.rs b/sdk/core/src/blockchain/gateway_account.rs
new file mode 100644
index 0000000000..f28cf6f562
--- /dev/null
+++ b/sdk/core/src/blockchain/gateway_account.rs
@@ -0,0 +1,112 @@
+use crate::data::{
+    account::{Account, AccountResponse},
+    account_storage::AccountStorageResponse,
+    address::Address,
+    esdt::{EsdtBalance, EsdtBalanceResponse, EsdtRolesResponse},
+};
+use anyhow::{anyhow, Result};
+use std::collections::HashMap;
+
+use super::CommunicationProxy;
+
+const ACCOUNT_ENDPOINT: &str = "address/";
+const KEYS_ENDPOINT: &str = "/keys/";
+
+impl CommunicationProxy {
+    // get_account retrieves an account info from the network (nonce, balance)
+    pub async fn get_account(&self, address: &Address) -> Result<Account> {
+        if !address.is_valid() {
+            return Err(anyhow!("invalid address"));
+        }
+
+        let endpoint = ACCOUNT_ENDPOINT.to_string() + address.to_string().as_str();
+        let endpoint = self.get_endpoint(endpoint.as_str());
+        let resp = self
+            .client
+            .get(endpoint)
+            .send()
+            .await?
+            .json::<AccountResponse>()
+            .await?;
+
+        match resp.data {
+            None => Err(anyhow!("{}", resp.error)),
+            Some(b) => Ok(b.account),
+        }
+    }
+
+    // get_account_esdt_roles retrieves an all esdt roles of an account from the network
+    pub async fn get_account_esdt_roles(
+        &self,
+        address: &Address,
+    ) -> Result<HashMap<String, Vec<String>>> {
+        if !address.is_valid() {
+            return Err(anyhow!("invalid address"));
+        }
+
+        let endpoint = ACCOUNT_ENDPOINT.to_string() + address.to_string().as_str() + "/esdts/roles";
+        let endpoint = self.get_endpoint(endpoint.as_str());
+        let resp = self
+            .client
+            .get(endpoint)
+            .send()
+            .await?
+            .json::<EsdtRolesResponse>()
+            .await?;
+
+        match resp.data {
+            None => Err(anyhow!("{}", resp.error)),
+            Some(b) => Ok(b.roles),
+        }
+    }
+
+    // get_account_esdt_tokens retrieves an all esdt token of an account from the network
+    pub async fn get_account_esdt_tokens(
+        &self,
+        address: &Address,
+    ) -> Result<HashMap<String, EsdtBalance>> {
+        if !address.is_valid() {
+            return Err(anyhow!("invalid address"));
+        }
+
+        let endpoint = ACCOUNT_ENDPOINT.to_string() + address.to_string().as_str() + "/esdt";
+        let endpoint = self.get_endpoint(endpoint.as_str());
+        let resp = self
+            .client
+            .get(endpoint)
+            .send()
+            .await?
+            .json::<EsdtBalanceResponse>()
+            .await?;
+
+        match resp.data {
+            None => Err(anyhow!("{}", resp.error)),
+            Some(b) => Ok(b.esdts),
+        }
+    }
+
+    // get_account_esdt_tokens retrieves an all esdt token of an account from the network
+    pub async fn get_account_storage_keys(
+        &self,
+        address: &Address,
+    ) -> Result<HashMap<String, String>> {
+        if !address.is_valid() {
+            return Err(anyhow!("invalid address"));
+        }
+
+        let endpoint = ACCOUNT_ENDPOINT.to_string() + address.to_string().as_str() + KEYS_ENDPOINT;
+        let endpoint = self.get_endpoint(endpoint.as_str());
+        let resp = self
+            .client
+            .get(endpoint)
+            .send()
+            .await?
+            .json::<AccountStorageResponse>()
+            .await?;
+
+        match resp.data {
+            None => Err(anyhow!("{}", resp.error)),
+            Some(b) => Ok(b.pairs),
+        }
+    }
+}
diff --git a/sdk/core/src/blockchain/gateway_block.rs b/sdk/core/src/blockchain/gateway_block.rs
new file mode 100644
index 0000000000..38827ea6db
--- /dev/null
+++ b/sdk/core/src/blockchain/gateway_block.rs
@@ -0,0 +1,66 @@
+use crate::data::{
+    hyperblock::{HyperBlock, HyperBlockResponse},
+    network_status::NetworkStatusResponse,
+};
+use anyhow::{anyhow, Result};
+
+use super::CommunicationProxy;
+use super::METACHAIN_SHARD_ID;
+
+const GET_HYPER_BLOCK_BY_NONCE_ENDPOINT: &str = "hyperblock/by-nonce/";
+const GET_HYPER_BLOCK_BY_HASH_ENDPOINT: &str = "hyperblock/by-hash/";
+const GET_NETWORK_STATUS_ENDPOINT: &str = "network/status";
+
+impl CommunicationProxy {
+    async fn get_hyper_block(&self, endpoint: &str) -> Result<HyperBlock> {
+        let endpoint = self.get_endpoint(endpoint);
+        let resp = self
+            .client
+            .get(endpoint)
+            .send()
+            .await?
+            .json::<HyperBlockResponse>()
+            .await?;
+
+        match resp.data {
+            None => Err(anyhow!("{}", resp.error)),
+            Some(b) => Ok(b.hyperblock),
+        }
+    }
+
+    // get_hyper_block_by_hash retrieves a hyper block's info by hash from the network
+    pub async fn get_hyper_block_by_hash(&self, hash: &str) -> Result<HyperBlock> {
+        let endpoint = GET_HYPER_BLOCK_BY_HASH_ENDPOINT.to_string() + hash;
+        self.get_hyper_block(endpoint.as_str()).await
+    }
+
+    // get_hyper_block_by_nonce retrieves a hyper block's info by nonce from the network
+    pub async fn get_hyper_block_by_nonce(&self, nonce: u64) -> Result<HyperBlock> {
+        let endpoint = GET_HYPER_BLOCK_BY_NONCE_ENDPOINT.to_string() + nonce.to_string().as_str();
+        self.get_hyper_block(endpoint.as_str()).await
+    }
+
+    // get_latest_hyper_block_nonce retrieves the latest hyper block (metachain) nonce from the network
+    pub async fn get_latest_hyper_block_nonce(&self, with_metachain: bool) -> Result<u64> {
+        let mut endpoint = GET_NETWORK_STATUS_ENDPOINT.to_string();
+
+        if with_metachain {
+            endpoint = format!("{GET_NETWORK_STATUS_ENDPOINT}/{METACHAIN_SHARD_ID}");
+        }
+
+        let endpoint = self.get_endpoint(endpoint.as_str());
+
+        let resp = self
+            .client
+            .get(endpoint)
+            .send()
+            .await?
+            .json::<NetworkStatusResponse>()
+            .await?;
+
+        match resp.data {
+            None => Err(anyhow!("{}", resp.error)),
+            Some(b) => Ok(b.status.nonce),
+        }
+    }
+}
diff --git a/sdk/core/src/blockchain/gateway_network.rs b/sdk/core/src/blockchain/gateway_network.rs
new file mode 100644
index 0000000000..2d425d461e
--- /dev/null
+++ b/sdk/core/src/blockchain/gateway_network.rs
@@ -0,0 +1,46 @@
+use crate::data::{
+    network_config::{NetworkConfig, NetworkConfigResponse},
+    network_economics::{NetworkEconomics, NetworkEconomicsResponse},
+};
+use anyhow::{anyhow, Result};
+
+use super::CommunicationProxy;
+
+const NETWORK_CONFIG_ENDPOINT: &str = "network/config";
+const NETWORK_ECONOMICS_ENDPOINT: &str = "network/economics";
+
+impl CommunicationProxy {
+    // get_network_config retrieves the network configuration from the proxy
+    pub async fn get_network_config(&self) -> Result<NetworkConfig> {
+        let endpoint = self.get_endpoint(NETWORK_CONFIG_ENDPOINT);
+        let resp = self
+            .client
+            .get(endpoint)
+            .send()
+            .await?
+            .json::<NetworkConfigResponse>()
+            .await?;
+
+        match resp.data {
+            None => Err(anyhow!("{}", resp.error)),
+            Some(b) => Ok(b.config),
+        }
+    }
+
+    // get_network_economics retrieves the network economics from the proxy
+    pub async fn get_network_economics(&self) -> Result<NetworkEconomics> {
+        let endpoint = self.get_endpoint(NETWORK_ECONOMICS_ENDPOINT);
+        let resp = self
+            .client
+            .get(endpoint)
+            .send()
+            .await?
+            .json::<NetworkEconomicsResponse>()
+            .await?;
+
+        match resp.data {
+            None => Err(anyhow!("{}", resp.error)),
+            Some(b) => Ok(b.metrics),
+        }
+    }
+}
diff --git a/sdk/core/src/blockchain/gateway_proxy.rs b/sdk/core/src/blockchain/gateway_proxy.rs
new file mode 100644
index 0000000000..9643abd5ca
--- /dev/null
+++ b/sdk/core/src/blockchain/gateway_proxy.rs
@@ -0,0 +1,20 @@
+use reqwest::Client;
+
+#[derive(Clone, Debug)]
+pub struct CommunicationProxy {
+    pub(crate) proxy_url: String,
+    pub(crate) client: Client,
+}
+
+impl CommunicationProxy {
+    pub fn new(proxy_url: String) -> Self {
+        Self {
+            proxy_url,
+            client: Client::new(),
+        }
+    }
+
+    pub(crate) fn get_endpoint(&self, endpoint: &str) -> String {
+        format!("{}/{}", self.proxy_url, endpoint)
+    }
+}
diff --git a/sdk/core/src/blockchain/gateway_tx.rs b/sdk/core/src/blockchain/gateway_tx.rs
new file mode 100644
index 0000000000..641e1ae511
--- /dev/null
+++ b/sdk/core/src/blockchain/gateway_tx.rs
@@ -0,0 +1,184 @@
+use crate::data::{
+    address::Address,
+    network_config::NetworkConfig,
+    transaction::{
+        ArgCreateTransaction, ResponseTxCost, SendTransactionResponse, SendTransactionsResponse,
+        Transaction, TransactionInfo, TransactionOnNetwork, TransactionStatus, TxCostResponseData,
+    },
+    vm::{ResponseVmValue, VmValueRequest, VmValuesResponseData},
+};
+use anyhow::{anyhow, Result};
+use itertools::Itertools;
+
+use super::CommunicationProxy;
+
+const COST_TRANSACTION_ENDPOINT: &str = "transaction/cost";
+const SEND_TRANSACTION_ENDPOINT: &str = "transaction/send";
+const SEND_MULTIPLE_TRANSACTIONS_ENDPOINT: &str = "transaction/send-multiple";
+const GET_TRANSACTION_INFO_ENDPOINT: &str = "transaction/";
+const WITH_RESULTS_QUERY_PARAM: &str = "?withResults=true";
+const VM_VALUES_ENDPOINT: &str = "vm-values/query";
+
+impl CommunicationProxy {
+    // request_transaction_cost retrieves how many gas a transaction will consume
+    pub async fn request_transaction_cost(&self, tx: &Transaction) -> Result<TxCostResponseData> {
+        let endpoint = self.get_endpoint(COST_TRANSACTION_ENDPOINT);
+        let resp = self
+            .client
+            .post(endpoint)
+            .json(tx)
+            .send()
+            .await?
+            .json::<ResponseTxCost>()
+            .await?;
+
+        match resp.data {
+            None => Err(anyhow!("{}", resp.error)),
+            Some(b) => Ok(b),
+        }
+    }
+
+    async fn get_transaction_info_internal(
+        &self,
+        hash: &str,
+        with_results: bool,
+    ) -> Result<TransactionOnNetwork> {
+        let mut endpoint = GET_TRANSACTION_INFO_ENDPOINT.to_string() + hash;
+
+        if with_results {
+            endpoint += WITH_RESULTS_QUERY_PARAM
+        }
+
+        let endpoint = self.get_endpoint(endpoint.as_str());
+        let resp = self
+            .client
+            .get(endpoint)
+            .send()
+            .await?
+            .json::<TransactionInfo>()
+            .await?;
+
+        match resp.data {
+            None => Err(anyhow!("{}", resp.error)),
+            Some(b) => Ok(b.transaction),
+        }
+    }
+
+    // get_transaction_info retrieves a transaction's details from the network
+    pub async fn get_transaction_info(&self, hash: &str) -> Result<TransactionOnNetwork> {
+        self.get_transaction_info_internal(hash, false).await
+    }
+
+    // get_transaction_info_with_results retrieves a transaction's details from the network with events
+    pub async fn get_transaction_info_with_results(
+        &self,
+        hash: &str,
+    ) -> Result<TransactionOnNetwork> {
+        self.get_transaction_info_internal(hash, true).await
+    }
+
+    // get_transaction_status retrieves a transaction's status from the network
+    pub async fn get_transaction_status(&self, hash: &str) -> Result<String> {
+        let endpoint = format!("transaction/{hash}/status");
+        let endpoint = self.get_endpoint(endpoint.as_str());
+
+        let resp = self
+            .client
+            .get(endpoint)
+            .send()
+            .await?
+            .json::<TransactionStatus>()
+            .await?;
+
+        match resp.data {
+            None => Err(anyhow!("{}", resp.error)),
+            Some(b) => Ok(b.status),
+        }
+    }
+
+    // get_default_transaction_arguments will prepare the transaction creation argument by querying the account's info
+    pub async fn get_default_transaction_arguments(
+        &self,
+        address: &Address,
+        network_configs: &NetworkConfig,
+    ) -> Result<ArgCreateTransaction> {
+        let account = self.get_account(address).await?;
+
+        Ok(ArgCreateTransaction {
+            nonce: account.nonce,
+            value: "".to_string(),
+            rcv_addr: address.clone(),
+            snd_addr: address.clone(),
+            gas_price: network_configs.min_gas_price,
+            gas_limit: network_configs.min_gas_limit,
+            data: None,
+            signature: "".to_string(),
+            chain_id: network_configs.chain_id.clone(),
+            version: network_configs.min_transaction_version,
+            options: 0,
+            available_balance: account.balance,
+        })
+    }
+
+    pub async fn send_transaction(&self, tx: &Transaction) -> Result<String> {
+        let endpoint = self.get_endpoint(SEND_TRANSACTION_ENDPOINT);
+        let resp = self
+            .client
+            .post(endpoint)
+            .json(tx)
+            .send()
+            .await?
+            .json::<SendTransactionResponse>()
+            .await?;
+
+        match resp.data {
+            None => Err(anyhow!("{}", resp.error)),
+            Some(b) => Ok(b.tx_hash),
+        }
+    }
+
+    pub async fn send_transactions(&self, txs: &Vec<Transaction>) -> Result<Vec<String>> {
+        let endpoint = self.get_endpoint(SEND_MULTIPLE_TRANSACTIONS_ENDPOINT);
+        let resp = self
+            .client
+            .post(endpoint)
+            .json(txs)
+            .send()
+            .await?
+            .json::<SendTransactionsResponse>()
+            .await?;
+
+        match resp.data {
+            None => Err(anyhow!("{}", resp.error)),
+            Some(b) => {
+                let mut tx_hashs: Vec<String> = vec![];
+                for key in b.txs_hashes.keys().sorted() {
+                    tx_hashs.push(b.txs_hashes[key].clone());
+                }
+
+                Ok(tx_hashs)
+            },
+        }
+    }
+
+    // execute_vmquery retrieves data from existing SC trie through the use of a VM
+    pub async fn execute_vmquery(
+        &self,
+        vm_request: &VmValueRequest,
+    ) -> Result<VmValuesResponseData> {
+        let endpoint = self.get_endpoint(VM_VALUES_ENDPOINT);
+        let resp = self
+            .client
+            .post(endpoint)
+            .json(vm_request)
+            .send()
+            .await?
+            .json::<ResponseVmValue>()
+            .await?;
+
+        match resp.data {
+            None => Err(anyhow!("{}", resp.error)),
+            Some(b) => Ok(b),
+        }
+    }
+}

From ca237ea30d4b40a96324c59d9a0ae5bb7f1f9d90 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 29 May 2024 23:17:09 +0300
Subject: [PATCH 0956/1254] gateway proxy rename

---
 framework/snippets/src/account_tool.rs         | 6 +++---
 framework/snippets/src/interactor.rs           | 6 +++---
 sdk/core/examples/account.rs                   | 4 ++--
 sdk/core/examples/account_storage.rs           | 4 ++--
 sdk/core/examples/get_esdt_tokens.rs           | 4 ++--
 sdk/core/examples/get_hyper_block_by_hash.rs   | 4 ++--
 sdk/core/examples/get_hyper_block_by_nonce.rs  | 4 ++--
 sdk/core/examples/get_hyper_block_latest.rs    | 4 ++--
 sdk/core/examples/get_network_config.rs        | 4 ++--
 sdk/core/examples/get_network_economics.rs     | 4 ++--
 sdk/core/examples/sign_tx.rs                   | 4 ++--
 sdk/core/examples/sign_txs.rs                  | 4 ++--
 sdk/core/examples/tx_cost.rs                   | 4 ++--
 sdk/core/examples/tx_default_args.rs           | 4 ++--
 sdk/core/examples/tx_info.rs                   | 4 ++--
 sdk/core/examples/vm_query.rs                  | 4 ++--
 sdk/core/src/blockchain.rs                     | 2 +-
 sdk/core/src/blockchain/gateway_account.rs     | 4 ++--
 sdk/core/src/blockchain/gateway_block.rs       | 4 ++--
 sdk/core/src/blockchain/gateway_network.rs     | 4 ++--
 sdk/core/src/blockchain/gateway_proxy.rs       | 5 +++--
 sdk/core/src/blockchain/gateway_tx.rs          | 4 ++--
 sdk/core/src/blockchain/gateway_tx_retrieve.rs | 4 ++--
 23 files changed, 48 insertions(+), 47 deletions(-)

diff --git a/framework/snippets/src/account_tool.rs b/framework/snippets/src/account_tool.rs
index 70eaafdace..401e68fd9c 100644
--- a/framework/snippets/src/account_tool.rs
+++ b/framework/snippets/src/account_tool.rs
@@ -4,7 +4,7 @@ use multiversx_sc_scenario::{
     scenario_model::{Account, BytesKey, BytesValue, Scenario, SetStateStep, Step},
 };
 use multiversx_sdk::{
-    blockchain::CommunicationProxy,
+    blockchain::GatewayProxy,
     data::{address::Address, esdt::EsdtBalance},
 };
 use std::collections::{BTreeMap, HashMap};
@@ -17,7 +17,7 @@ pub async fn print_account_as_scenario_set_state(
     api_string: String,
     address_bech32_string: String,
 ) {
-    let api = CommunicationProxy::new(api_string);
+    let api = GatewayProxy::new(api_string);
     let address = Bech32Address::from_bech32_string(address_bech32_string);
     let set_state = retrieve_account_as_scenario_set_state(&api, &address).await;
     let scenario = build_scenario(set_state);
@@ -34,7 +34,7 @@ fn build_scenario(set_state: SetStateStep) -> Scenario {
 }
 
 pub async fn retrieve_account_as_scenario_set_state(
-    api: &CommunicationProxy,
+    api: &GatewayProxy,
     address: &Bech32Address,
 ) -> SetStateStep {
     let sdk_address = Address::from_bech32_string(address.to_bech32_str()).unwrap();
diff --git a/framework/snippets/src/interactor.rs b/framework/snippets/src/interactor.rs
index 82c59752f6..6daa44b6c8 100644
--- a/framework/snippets/src/interactor.rs
+++ b/framework/snippets/src/interactor.rs
@@ -5,7 +5,7 @@ use multiversx_sc_scenario::{
     scenario_model::AddressValue,
 };
 use multiversx_sdk::{
-    blockchain::CommunicationProxy,
+    blockchain::GatewayProxy,
     data::{address::Address as ErdrsAddress, network_config::NetworkConfig},
     wallet::Wallet,
 };
@@ -20,7 +20,7 @@ use crate::{account_tool::retrieve_account_as_scenario_set_state, Sender};
 pub const INTERACTOR_SCENARIO_TRACE_PATH: &str = "interactor_trace.scen.json";
 
 pub struct Interactor {
-    pub proxy: CommunicationProxy,
+    pub proxy: GatewayProxy,
     pub network_config: NetworkConfig,
     pub sender_map: HashMap<Address, Sender>,
 
@@ -33,7 +33,7 @@ pub struct Interactor {
 
 impl Interactor {
     pub async fn new(gateway_url: &str) -> Self {
-        let proxy = CommunicationProxy::new(gateway_url.to_string());
+        let proxy = GatewayProxy::new(gateway_url.to_string());
         let network_config = proxy.get_network_config().await.unwrap();
         Self {
             proxy,
diff --git a/sdk/core/examples/account.rs b/sdk/core/examples/account.rs
index 2ad1d6c4cc..16a9e2d8a9 100644
--- a/sdk/core/examples/account.rs
+++ b/sdk/core/examples/account.rs
@@ -1,5 +1,5 @@
 use multiversx_sdk::{
-    blockchain::{CommunicationProxy, DEVNET_GATEWAY},
+    blockchain::{GatewayProxy, DEVNET_GATEWAY},
     data::address::Address,
 };
 
@@ -10,7 +10,7 @@ async fn main() {
     )
     .unwrap();
 
-    let blockchain = CommunicationProxy::new(DEVNET_GATEWAY.to_string());
+    let blockchain = GatewayProxy::new(DEVNET_GATEWAY.to_string());
     let account = blockchain.get_account(&addr).await.unwrap();
 
     println!("account: {account:#?}");
diff --git a/sdk/core/examples/account_storage.rs b/sdk/core/examples/account_storage.rs
index 31adc7d0f9..c081e67e58 100644
--- a/sdk/core/examples/account_storage.rs
+++ b/sdk/core/examples/account_storage.rs
@@ -1,5 +1,5 @@
 use multiversx_sdk::{
-    blockchain::{CommunicationProxy, DEVNET_GATEWAY},
+    blockchain::{GatewayProxy, DEVNET_GATEWAY},
     data::address::Address,
 };
 
@@ -10,7 +10,7 @@ async fn main() {
     )
     .unwrap();
 
-    let blockchain = CommunicationProxy::new(DEVNET_GATEWAY.to_string());
+    let blockchain = GatewayProxy::new(DEVNET_GATEWAY.to_string());
     let account_storage = blockchain.get_account_storage_keys(&addr).await.unwrap();
 
     println!("Account Storage: {account_storage:#?}");
diff --git a/sdk/core/examples/get_esdt_tokens.rs b/sdk/core/examples/get_esdt_tokens.rs
index faa4debfba..5dc62b5098 100644
--- a/sdk/core/examples/get_esdt_tokens.rs
+++ b/sdk/core/examples/get_esdt_tokens.rs
@@ -1,5 +1,5 @@
 use multiversx_sdk::{
-    blockchain::{CommunicationProxy, DEVNET_GATEWAY},
+    blockchain::{GatewayProxy, DEVNET_GATEWAY},
     data::address::Address,
 };
 
@@ -10,7 +10,7 @@ async fn main() {
     )
     .unwrap();
 
-    let blockchain = CommunicationProxy::new(DEVNET_GATEWAY.to_string());
+    let blockchain = GatewayProxy::new(DEVNET_GATEWAY.to_string());
     let balances = blockchain.get_account_esdt_tokens(&addr).await.unwrap();
 
     println!("{balances:#?}");
diff --git a/sdk/core/examples/get_hyper_block_by_hash.rs b/sdk/core/examples/get_hyper_block_by_hash.rs
index c67b479767..b0f0d34a2d 100644
--- a/sdk/core/examples/get_hyper_block_by_hash.rs
+++ b/sdk/core/examples/get_hyper_block_by_hash.rs
@@ -1,8 +1,8 @@
-use multiversx_sdk::blockchain::{CommunicationProxy, DEVNET_GATEWAY};
+use multiversx_sdk::blockchain::{GatewayProxy, DEVNET_GATEWAY};
 
 #[tokio::main]
 async fn main() {
-    let blockchain = CommunicationProxy::new(DEVNET_GATEWAY.to_string());
+    let blockchain = GatewayProxy::new(DEVNET_GATEWAY.to_string());
     let result = blockchain
         .get_hyper_block_by_hash("20b14ba0e68c465810c5ded091f220e51dad41629d7ccd87dab572206185e419")
         .await;
diff --git a/sdk/core/examples/get_hyper_block_by_nonce.rs b/sdk/core/examples/get_hyper_block_by_nonce.rs
index c3d270d2bc..e033b57156 100644
--- a/sdk/core/examples/get_hyper_block_by_nonce.rs
+++ b/sdk/core/examples/get_hyper_block_by_nonce.rs
@@ -1,8 +1,8 @@
-use multiversx_sdk::blockchain::{CommunicationProxy, DEVNET_GATEWAY};
+use multiversx_sdk::blockchain::{GatewayProxy, DEVNET_GATEWAY};
 
 #[tokio::main]
 async fn main() {
-    let blockchain = CommunicationProxy::new(DEVNET_GATEWAY.to_string());
+    let blockchain = GatewayProxy::new(DEVNET_GATEWAY.to_string());
     let result = blockchain.get_hyper_block_by_nonce(7468).await;
 
     println!("block by nonce result: {result:?}")
diff --git a/sdk/core/examples/get_hyper_block_latest.rs b/sdk/core/examples/get_hyper_block_latest.rs
index b9ad946829..1ab8d51350 100644
--- a/sdk/core/examples/get_hyper_block_latest.rs
+++ b/sdk/core/examples/get_hyper_block_latest.rs
@@ -1,8 +1,8 @@
-use multiversx_sdk::blockchain::{CommunicationProxy, DEVNET_GATEWAY};
+use multiversx_sdk::blockchain::{GatewayProxy, DEVNET_GATEWAY};
 
 #[tokio::main]
 async fn main() {
-    let blockchain = CommunicationProxy::new(DEVNET_GATEWAY.to_string());
+    let blockchain = GatewayProxy::new(DEVNET_GATEWAY.to_string());
     let result = blockchain.get_latest_hyper_block_nonce(false).await;
 
     println!("latest block result: {result:?}")
diff --git a/sdk/core/examples/get_network_config.rs b/sdk/core/examples/get_network_config.rs
index 7ca699b3c8..1c9ada08c6 100644
--- a/sdk/core/examples/get_network_config.rs
+++ b/sdk/core/examples/get_network_config.rs
@@ -1,8 +1,8 @@
-use multiversx_sdk::blockchain::{CommunicationProxy, DEVNET_GATEWAY};
+use multiversx_sdk::blockchain::{GatewayProxy, DEVNET_GATEWAY};
 
 #[tokio::main]
 async fn main() {
-    let blockchain = CommunicationProxy::new(DEVNET_GATEWAY.to_string());
+    let blockchain = GatewayProxy::new(DEVNET_GATEWAY.to_string());
     let network_config = blockchain.get_network_config().await.unwrap();
 
     println!("network_config: {network_config:#?}")
diff --git a/sdk/core/examples/get_network_economics.rs b/sdk/core/examples/get_network_economics.rs
index e562f3db46..568c3b8378 100644
--- a/sdk/core/examples/get_network_economics.rs
+++ b/sdk/core/examples/get_network_economics.rs
@@ -1,8 +1,8 @@
-use multiversx_sdk::blockchain::{CommunicationProxy, DEVNET_GATEWAY};
+use multiversx_sdk::blockchain::{GatewayProxy, DEVNET_GATEWAY};
 
 #[tokio::main]
 async fn main() {
-    let blockchain = CommunicationProxy::new(DEVNET_GATEWAY.to_string());
+    let blockchain = GatewayProxy::new(DEVNET_GATEWAY.to_string());
     let network_economics = blockchain.get_network_economics().await.unwrap();
 
     println!("network_economics: {network_economics:#?}")
diff --git a/sdk/core/examples/sign_tx.rs b/sdk/core/examples/sign_tx.rs
index 1455061830..e9e7da0225 100644
--- a/sdk/core/examples/sign_tx.rs
+++ b/sdk/core/examples/sign_tx.rs
@@ -1,5 +1,5 @@
 use multiversx_sdk::{
-    blockchain::{CommunicationProxy, DEVNET_GATEWAY},
+    blockchain::{GatewayProxy, DEVNET_GATEWAY},
     data::transaction::Transaction,
     wallet::Wallet,
 };
@@ -11,7 +11,7 @@ async fn main() {
     )
     .unwrap();
     let addr = wl.address();
-    let blockchain = CommunicationProxy::new(DEVNET_GATEWAY.to_string());
+    let blockchain = GatewayProxy::new(DEVNET_GATEWAY.to_string());
     let network_config = blockchain.get_network_config().await.unwrap();
 
     let arg = blockchain
diff --git a/sdk/core/examples/sign_txs.rs b/sdk/core/examples/sign_txs.rs
index 6a4a12a231..672cf9f08f 100644
--- a/sdk/core/examples/sign_txs.rs
+++ b/sdk/core/examples/sign_txs.rs
@@ -1,5 +1,5 @@
 use multiversx_sdk::{
-    blockchain::{CommunicationProxy, DEVNET_GATEWAY},
+    blockchain::{GatewayProxy, DEVNET_GATEWAY},
     data::transaction::Transaction,
     wallet::Wallet,
 };
@@ -11,7 +11,7 @@ async fn main() {
     )
     .unwrap();
     let addr = wl.address();
-    let blockchain = CommunicationProxy::new(DEVNET_GATEWAY.to_string());
+    let blockchain = GatewayProxy::new(DEVNET_GATEWAY.to_string());
     let network_config = blockchain.get_network_config().await.unwrap();
 
     let arg = blockchain
diff --git a/sdk/core/examples/tx_cost.rs b/sdk/core/examples/tx_cost.rs
index b98cbd2e4b..0e05be8420 100644
--- a/sdk/core/examples/tx_cost.rs
+++ b/sdk/core/examples/tx_cost.rs
@@ -1,5 +1,5 @@
 use multiversx_sdk::{
-    blockchain::{CommunicationProxy, DEVNET_GATEWAY},
+    blockchain::{GatewayProxy, DEVNET_GATEWAY},
     data::{address::Address, transaction::Transaction},
     utils::base64_encode,
 };
@@ -26,7 +26,7 @@ async fn main() {
         signature: None,
     };
 
-    let blockchain = CommunicationProxy::new(DEVNET_GATEWAY.to_string());
+    let blockchain = GatewayProxy::new(DEVNET_GATEWAY.to_string());
     let cost = blockchain.request_transaction_cost(&tx).await.unwrap();
 
     println!("tx cost: {cost:#?}");
diff --git a/sdk/core/examples/tx_default_args.rs b/sdk/core/examples/tx_default_args.rs
index dad593eaf8..45dd3b9473 100644
--- a/sdk/core/examples/tx_default_args.rs
+++ b/sdk/core/examples/tx_default_args.rs
@@ -1,11 +1,11 @@
 use multiversx_sdk::{
-    blockchain::{CommunicationProxy, DEVNET_GATEWAY},
+    blockchain::{GatewayProxy, DEVNET_GATEWAY},
     data::address::Address,
 };
 
 #[tokio::main]
 async fn main() {
-    let blockchain = CommunicationProxy::new(DEVNET_GATEWAY.to_string());
+    let blockchain = GatewayProxy::new(DEVNET_GATEWAY.to_string());
     let network_config = blockchain.get_network_config().await.unwrap();
     let addr = Address::from_bech32_string(
         "erd1qqqqqqqqqqqqqpgqfzydqmdw7m2vazsp6u5p95yxz76t2p9rd8ss0zp9ts",
diff --git a/sdk/core/examples/tx_info.rs b/sdk/core/examples/tx_info.rs
index 33c929be50..bfad3fb1ca 100644
--- a/sdk/core/examples/tx_info.rs
+++ b/sdk/core/examples/tx_info.rs
@@ -1,9 +1,9 @@
-use multiversx_sdk::blockchain::{CommunicationProxy, DEVNET_GATEWAY};
+use multiversx_sdk::blockchain::{GatewayProxy, DEVNET_GATEWAY};
 
 #[tokio::main]
 async fn main() {
     let tx_hash = "49edb289892a655a0e988b360c19326c21107f9696c6197b435667c6e8c6e1a3";
-    let blockchain = CommunicationProxy::new(DEVNET_GATEWAY.to_string());
+    let blockchain = GatewayProxy::new(DEVNET_GATEWAY.to_string());
 
     let status = blockchain.get_transaction_status(tx_hash).await;
     println!("tx status: {status:?}");
diff --git a/sdk/core/examples/vm_query.rs b/sdk/core/examples/vm_query.rs
index 41cdfd5dbf..df7d3b43ee 100644
--- a/sdk/core/examples/vm_query.rs
+++ b/sdk/core/examples/vm_query.rs
@@ -1,5 +1,5 @@
 use multiversx_sdk::{
-    blockchain::{CommunicationProxy, DEVNET_GATEWAY},
+    blockchain::{GatewayProxy, DEVNET_GATEWAY},
     data::{address::Address, vm::VmValueRequest},
     wallet::Wallet,
 };
@@ -11,7 +11,7 @@ async fn main() {
     )
     .unwrap();
     let addr = wl.address();
-    let blockchain = CommunicationProxy::new(DEVNET_GATEWAY.to_string());
+    let blockchain = GatewayProxy::new(DEVNET_GATEWAY.to_string());
     let req = VmValueRequest {
         sc_address: Address::from_bech32_string(
             "erd1qqqqqqqqqqqqqpgqhn3ae8dpc957t7jadn7kywtg503dy7pnj9ts3umqxx",
diff --git a/sdk/core/src/blockchain.rs b/sdk/core/src/blockchain.rs
index 05bad7198a..35e2668b50 100644
--- a/sdk/core/src/blockchain.rs
+++ b/sdk/core/src/blockchain.rs
@@ -5,7 +5,7 @@ mod gateway_proxy;
 mod gateway_tx;
 mod gateway_tx_retrieve;
 
-pub use gateway_proxy::CommunicationProxy;
+pub use gateway_proxy::GatewayProxy;
 
 pub const MAINNET_GATEWAY: &str = "https://gateway.multiversx.com";
 pub const TESTNET_GATEWAY: &str = "https://testnet-gateway.multiversx.com";
diff --git a/sdk/core/src/blockchain/gateway_account.rs b/sdk/core/src/blockchain/gateway_account.rs
index f28cf6f562..7d72258544 100644
--- a/sdk/core/src/blockchain/gateway_account.rs
+++ b/sdk/core/src/blockchain/gateway_account.rs
@@ -7,12 +7,12 @@ use crate::data::{
 use anyhow::{anyhow, Result};
 use std::collections::HashMap;
 
-use super::CommunicationProxy;
+use super::GatewayProxy;
 
 const ACCOUNT_ENDPOINT: &str = "address/";
 const KEYS_ENDPOINT: &str = "/keys/";
 
-impl CommunicationProxy {
+impl GatewayProxy {
     // get_account retrieves an account info from the network (nonce, balance)
     pub async fn get_account(&self, address: &Address) -> Result<Account> {
         if !address.is_valid() {
diff --git a/sdk/core/src/blockchain/gateway_block.rs b/sdk/core/src/blockchain/gateway_block.rs
index 38827ea6db..b6daf57abb 100644
--- a/sdk/core/src/blockchain/gateway_block.rs
+++ b/sdk/core/src/blockchain/gateway_block.rs
@@ -4,14 +4,14 @@ use crate::data::{
 };
 use anyhow::{anyhow, Result};
 
-use super::CommunicationProxy;
+use super::GatewayProxy;
 use super::METACHAIN_SHARD_ID;
 
 const GET_HYPER_BLOCK_BY_NONCE_ENDPOINT: &str = "hyperblock/by-nonce/";
 const GET_HYPER_BLOCK_BY_HASH_ENDPOINT: &str = "hyperblock/by-hash/";
 const GET_NETWORK_STATUS_ENDPOINT: &str = "network/status";
 
-impl CommunicationProxy {
+impl GatewayProxy {
     async fn get_hyper_block(&self, endpoint: &str) -> Result<HyperBlock> {
         let endpoint = self.get_endpoint(endpoint);
         let resp = self
diff --git a/sdk/core/src/blockchain/gateway_network.rs b/sdk/core/src/blockchain/gateway_network.rs
index 2d425d461e..8b02a57d0d 100644
--- a/sdk/core/src/blockchain/gateway_network.rs
+++ b/sdk/core/src/blockchain/gateway_network.rs
@@ -4,12 +4,12 @@ use crate::data::{
 };
 use anyhow::{anyhow, Result};
 
-use super::CommunicationProxy;
+use super::GatewayProxy;
 
 const NETWORK_CONFIG_ENDPOINT: &str = "network/config";
 const NETWORK_ECONOMICS_ENDPOINT: &str = "network/economics";
 
-impl CommunicationProxy {
+impl GatewayProxy {
     // get_network_config retrieves the network configuration from the proxy
     pub async fn get_network_config(&self) -> Result<NetworkConfig> {
         let endpoint = self.get_endpoint(NETWORK_CONFIG_ENDPOINT);
diff --git a/sdk/core/src/blockchain/gateway_proxy.rs b/sdk/core/src/blockchain/gateway_proxy.rs
index 9643abd5ca..47925cd79f 100644
--- a/sdk/core/src/blockchain/gateway_proxy.rs
+++ b/sdk/core/src/blockchain/gateway_proxy.rs
@@ -1,12 +1,13 @@
 use reqwest::Client;
 
+/// Allows communication with the MultiversX gateway API.
 #[derive(Clone, Debug)]
-pub struct CommunicationProxy {
+pub struct GatewayProxy {
     pub(crate) proxy_url: String,
     pub(crate) client: Client,
 }
 
-impl CommunicationProxy {
+impl GatewayProxy {
     pub fn new(proxy_url: String) -> Self {
         Self {
             proxy_url,
diff --git a/sdk/core/src/blockchain/gateway_tx.rs b/sdk/core/src/blockchain/gateway_tx.rs
index 641e1ae511..47aa8b5a83 100644
--- a/sdk/core/src/blockchain/gateway_tx.rs
+++ b/sdk/core/src/blockchain/gateway_tx.rs
@@ -10,7 +10,7 @@ use crate::data::{
 use anyhow::{anyhow, Result};
 use itertools::Itertools;
 
-use super::CommunicationProxy;
+use super::GatewayProxy;
 
 const COST_TRANSACTION_ENDPOINT: &str = "transaction/cost";
 const SEND_TRANSACTION_ENDPOINT: &str = "transaction/send";
@@ -19,7 +19,7 @@ const GET_TRANSACTION_INFO_ENDPOINT: &str = "transaction/";
 const WITH_RESULTS_QUERY_PARAM: &str = "?withResults=true";
 const VM_VALUES_ENDPOINT: &str = "vm-values/query";
 
-impl CommunicationProxy {
+impl GatewayProxy {
     // request_transaction_cost retrieves how many gas a transaction will consume
     pub async fn request_transaction_cost(&self, tx: &Transaction) -> Result<TxCostResponseData> {
         let endpoint = self.get_endpoint(COST_TRANSACTION_ENDPOINT);
diff --git a/sdk/core/src/blockchain/gateway_tx_retrieve.rs b/sdk/core/src/blockchain/gateway_tx_retrieve.rs
index 44a0357432..821713f972 100644
--- a/sdk/core/src/blockchain/gateway_tx_retrieve.rs
+++ b/sdk/core/src/blockchain/gateway_tx_retrieve.rs
@@ -2,13 +2,13 @@ use crate::data::transaction::TransactionOnNetwork;
 use log::info;
 use std::time::{Duration, Instant};
 
-use super::CommunicationProxy;
+use super::GatewayProxy;
 
 const INITIAL_BACKOFF_DELAY: f32 = 1.4;
 const MAX_RETRIES: usize = 8;
 const MAX_BACKOFF_DELAY: Duration = Duration::from_secs(6);
 
-impl CommunicationProxy {
+impl GatewayProxy {
     /// Retrieves a transaction from the network.
     pub async fn retrieve_tx_on_network(&self, tx_hash: String) -> TransactionOnNetwork {
         let mut retries = 0;

From a31a3b25baba6cc4a2ef0a416a86b7137e1f6793 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 29 May 2024 23:22:37 +0300
Subject: [PATCH 0957/1254] gateway proxy mod rename

---
 framework/snippets/src/account_tool.rs                      | 2 +-
 framework/snippets/src/interactor.rs                        | 2 +-
 sdk/core/examples/account.rs                                | 2 +-
 sdk/core/examples/account_storage.rs                        | 2 +-
 sdk/core/examples/get_esdt_tokens.rs                        | 2 +-
 sdk/core/examples/get_hyper_block_by_hash.rs                | 2 +-
 sdk/core/examples/get_hyper_block_by_nonce.rs               | 2 +-
 sdk/core/examples/get_hyper_block_latest.rs                 | 2 +-
 sdk/core/examples/get_network_config.rs                     | 2 +-
 sdk/core/examples/get_network_economics.rs                  | 2 +-
 sdk/core/examples/sign_tx.rs                                | 2 +-
 sdk/core/examples/sign_txs.rs                               | 2 +-
 sdk/core/examples/tx_cost.rs                                | 2 +-
 sdk/core/examples/tx_default_args.rs                        | 2 +-
 sdk/core/examples/tx_info.rs                                | 2 +-
 sdk/core/examples/vm_query.rs                               | 2 +-
 sdk/core/src/{blockchain.rs => gateway.rs}                  | 0
 sdk/core/src/{blockchain => gateway}/gateway_account.rs     | 0
 sdk/core/src/{blockchain => gateway}/gateway_block.rs       | 0
 sdk/core/src/{blockchain => gateway}/gateway_network.rs     | 0
 sdk/core/src/{blockchain => gateway}/gateway_proxy.rs       | 0
 sdk/core/src/{blockchain => gateway}/gateway_tx.rs          | 0
 sdk/core/src/{blockchain => gateway}/gateway_tx_retrieve.rs | 0
 sdk/core/src/lib.rs                                         | 2 +-
 24 files changed, 17 insertions(+), 17 deletions(-)
 rename sdk/core/src/{blockchain.rs => gateway.rs} (100%)
 rename sdk/core/src/{blockchain => gateway}/gateway_account.rs (100%)
 rename sdk/core/src/{blockchain => gateway}/gateway_block.rs (100%)
 rename sdk/core/src/{blockchain => gateway}/gateway_network.rs (100%)
 rename sdk/core/src/{blockchain => gateway}/gateway_proxy.rs (100%)
 rename sdk/core/src/{blockchain => gateway}/gateway_tx.rs (100%)
 rename sdk/core/src/{blockchain => gateway}/gateway_tx_retrieve.rs (100%)

diff --git a/framework/snippets/src/account_tool.rs b/framework/snippets/src/account_tool.rs
index 401e68fd9c..b10baf4a80 100644
--- a/framework/snippets/src/account_tool.rs
+++ b/framework/snippets/src/account_tool.rs
@@ -4,8 +4,8 @@ use multiversx_sc_scenario::{
     scenario_model::{Account, BytesKey, BytesValue, Scenario, SetStateStep, Step},
 };
 use multiversx_sdk::{
-    blockchain::GatewayProxy,
     data::{address::Address, esdt::EsdtBalance},
+    gateway::GatewayProxy,
 };
 use std::collections::{BTreeMap, HashMap};
 
diff --git a/framework/snippets/src/interactor.rs b/framework/snippets/src/interactor.rs
index 6daa44b6c8..bb38873afe 100644
--- a/framework/snippets/src/interactor.rs
+++ b/framework/snippets/src/interactor.rs
@@ -5,8 +5,8 @@ use multiversx_sc_scenario::{
     scenario_model::AddressValue,
 };
 use multiversx_sdk::{
-    blockchain::GatewayProxy,
     data::{address::Address as ErdrsAddress, network_config::NetworkConfig},
+    gateway::GatewayProxy,
     wallet::Wallet,
 };
 use std::{
diff --git a/sdk/core/examples/account.rs b/sdk/core/examples/account.rs
index 16a9e2d8a9..5e9456f4b0 100644
--- a/sdk/core/examples/account.rs
+++ b/sdk/core/examples/account.rs
@@ -1,6 +1,6 @@
 use multiversx_sdk::{
-    blockchain::{GatewayProxy, DEVNET_GATEWAY},
     data::address::Address,
+    gateway::{GatewayProxy, DEVNET_GATEWAY},
 };
 
 #[tokio::main]
diff --git a/sdk/core/examples/account_storage.rs b/sdk/core/examples/account_storage.rs
index c081e67e58..7693c26e08 100644
--- a/sdk/core/examples/account_storage.rs
+++ b/sdk/core/examples/account_storage.rs
@@ -1,6 +1,6 @@
 use multiversx_sdk::{
-    blockchain::{GatewayProxy, DEVNET_GATEWAY},
     data::address::Address,
+    gateway::{GatewayProxy, DEVNET_GATEWAY},
 };
 
 #[tokio::main]
diff --git a/sdk/core/examples/get_esdt_tokens.rs b/sdk/core/examples/get_esdt_tokens.rs
index 5dc62b5098..fac424da27 100644
--- a/sdk/core/examples/get_esdt_tokens.rs
+++ b/sdk/core/examples/get_esdt_tokens.rs
@@ -1,6 +1,6 @@
 use multiversx_sdk::{
-    blockchain::{GatewayProxy, DEVNET_GATEWAY},
     data::address::Address,
+    gateway::{GatewayProxy, DEVNET_GATEWAY},
 };
 
 #[tokio::main]
diff --git a/sdk/core/examples/get_hyper_block_by_hash.rs b/sdk/core/examples/get_hyper_block_by_hash.rs
index b0f0d34a2d..1d7f969ce1 100644
--- a/sdk/core/examples/get_hyper_block_by_hash.rs
+++ b/sdk/core/examples/get_hyper_block_by_hash.rs
@@ -1,4 +1,4 @@
-use multiversx_sdk::blockchain::{GatewayProxy, DEVNET_GATEWAY};
+use multiversx_sdk::gateway::{GatewayProxy, DEVNET_GATEWAY};
 
 #[tokio::main]
 async fn main() {
diff --git a/sdk/core/examples/get_hyper_block_by_nonce.rs b/sdk/core/examples/get_hyper_block_by_nonce.rs
index e033b57156..575255d6c9 100644
--- a/sdk/core/examples/get_hyper_block_by_nonce.rs
+++ b/sdk/core/examples/get_hyper_block_by_nonce.rs
@@ -1,4 +1,4 @@
-use multiversx_sdk::blockchain::{GatewayProxy, DEVNET_GATEWAY};
+use multiversx_sdk::gateway::{GatewayProxy, DEVNET_GATEWAY};
 
 #[tokio::main]
 async fn main() {
diff --git a/sdk/core/examples/get_hyper_block_latest.rs b/sdk/core/examples/get_hyper_block_latest.rs
index 1ab8d51350..934358fdbf 100644
--- a/sdk/core/examples/get_hyper_block_latest.rs
+++ b/sdk/core/examples/get_hyper_block_latest.rs
@@ -1,4 +1,4 @@
-use multiversx_sdk::blockchain::{GatewayProxy, DEVNET_GATEWAY};
+use multiversx_sdk::gateway::{GatewayProxy, DEVNET_GATEWAY};
 
 #[tokio::main]
 async fn main() {
diff --git a/sdk/core/examples/get_network_config.rs b/sdk/core/examples/get_network_config.rs
index 1c9ada08c6..d53e0e7ce1 100644
--- a/sdk/core/examples/get_network_config.rs
+++ b/sdk/core/examples/get_network_config.rs
@@ -1,4 +1,4 @@
-use multiversx_sdk::blockchain::{GatewayProxy, DEVNET_GATEWAY};
+use multiversx_sdk::gateway::{GatewayProxy, DEVNET_GATEWAY};
 
 #[tokio::main]
 async fn main() {
diff --git a/sdk/core/examples/get_network_economics.rs b/sdk/core/examples/get_network_economics.rs
index 568c3b8378..bb0410c8f0 100644
--- a/sdk/core/examples/get_network_economics.rs
+++ b/sdk/core/examples/get_network_economics.rs
@@ -1,4 +1,4 @@
-use multiversx_sdk::blockchain::{GatewayProxy, DEVNET_GATEWAY};
+use multiversx_sdk::gateway::{GatewayProxy, DEVNET_GATEWAY};
 
 #[tokio::main]
 async fn main() {
diff --git a/sdk/core/examples/sign_tx.rs b/sdk/core/examples/sign_tx.rs
index e9e7da0225..aa3f977321 100644
--- a/sdk/core/examples/sign_tx.rs
+++ b/sdk/core/examples/sign_tx.rs
@@ -1,6 +1,6 @@
 use multiversx_sdk::{
-    blockchain::{GatewayProxy, DEVNET_GATEWAY},
     data::transaction::Transaction,
+    gateway::{GatewayProxy, DEVNET_GATEWAY},
     wallet::Wallet,
 };
 
diff --git a/sdk/core/examples/sign_txs.rs b/sdk/core/examples/sign_txs.rs
index 672cf9f08f..2860d528f7 100644
--- a/sdk/core/examples/sign_txs.rs
+++ b/sdk/core/examples/sign_txs.rs
@@ -1,6 +1,6 @@
 use multiversx_sdk::{
-    blockchain::{GatewayProxy, DEVNET_GATEWAY},
     data::transaction::Transaction,
+    gateway::{GatewayProxy, DEVNET_GATEWAY},
     wallet::Wallet,
 };
 
diff --git a/sdk/core/examples/tx_cost.rs b/sdk/core/examples/tx_cost.rs
index 0e05be8420..a982b130ec 100644
--- a/sdk/core/examples/tx_cost.rs
+++ b/sdk/core/examples/tx_cost.rs
@@ -1,6 +1,6 @@
 use multiversx_sdk::{
-    blockchain::{GatewayProxy, DEVNET_GATEWAY},
     data::{address::Address, transaction::Transaction},
+    gateway::{GatewayProxy, DEVNET_GATEWAY},
     utils::base64_encode,
 };
 
diff --git a/sdk/core/examples/tx_default_args.rs b/sdk/core/examples/tx_default_args.rs
index 45dd3b9473..01b91aa5a6 100644
--- a/sdk/core/examples/tx_default_args.rs
+++ b/sdk/core/examples/tx_default_args.rs
@@ -1,6 +1,6 @@
 use multiversx_sdk::{
-    blockchain::{GatewayProxy, DEVNET_GATEWAY},
     data::address::Address,
+    gateway::{GatewayProxy, DEVNET_GATEWAY},
 };
 
 #[tokio::main]
diff --git a/sdk/core/examples/tx_info.rs b/sdk/core/examples/tx_info.rs
index bfad3fb1ca..f7126daca9 100644
--- a/sdk/core/examples/tx_info.rs
+++ b/sdk/core/examples/tx_info.rs
@@ -1,4 +1,4 @@
-use multiversx_sdk::blockchain::{GatewayProxy, DEVNET_GATEWAY};
+use multiversx_sdk::gateway::{GatewayProxy, DEVNET_GATEWAY};
 
 #[tokio::main]
 async fn main() {
diff --git a/sdk/core/examples/vm_query.rs b/sdk/core/examples/vm_query.rs
index df7d3b43ee..d07f49b856 100644
--- a/sdk/core/examples/vm_query.rs
+++ b/sdk/core/examples/vm_query.rs
@@ -1,6 +1,6 @@
 use multiversx_sdk::{
-    blockchain::{GatewayProxy, DEVNET_GATEWAY},
     data::{address::Address, vm::VmValueRequest},
+    gateway::{GatewayProxy, DEVNET_GATEWAY},
     wallet::Wallet,
 };
 
diff --git a/sdk/core/src/blockchain.rs b/sdk/core/src/gateway.rs
similarity index 100%
rename from sdk/core/src/blockchain.rs
rename to sdk/core/src/gateway.rs
diff --git a/sdk/core/src/blockchain/gateway_account.rs b/sdk/core/src/gateway/gateway_account.rs
similarity index 100%
rename from sdk/core/src/blockchain/gateway_account.rs
rename to sdk/core/src/gateway/gateway_account.rs
diff --git a/sdk/core/src/blockchain/gateway_block.rs b/sdk/core/src/gateway/gateway_block.rs
similarity index 100%
rename from sdk/core/src/blockchain/gateway_block.rs
rename to sdk/core/src/gateway/gateway_block.rs
diff --git a/sdk/core/src/blockchain/gateway_network.rs b/sdk/core/src/gateway/gateway_network.rs
similarity index 100%
rename from sdk/core/src/blockchain/gateway_network.rs
rename to sdk/core/src/gateway/gateway_network.rs
diff --git a/sdk/core/src/blockchain/gateway_proxy.rs b/sdk/core/src/gateway/gateway_proxy.rs
similarity index 100%
rename from sdk/core/src/blockchain/gateway_proxy.rs
rename to sdk/core/src/gateway/gateway_proxy.rs
diff --git a/sdk/core/src/blockchain/gateway_tx.rs b/sdk/core/src/gateway/gateway_tx.rs
similarity index 100%
rename from sdk/core/src/blockchain/gateway_tx.rs
rename to sdk/core/src/gateway/gateway_tx.rs
diff --git a/sdk/core/src/blockchain/gateway_tx_retrieve.rs b/sdk/core/src/gateway/gateway_tx_retrieve.rs
similarity index 100%
rename from sdk/core/src/blockchain/gateway_tx_retrieve.rs
rename to sdk/core/src/gateway/gateway_tx_retrieve.rs
diff --git a/sdk/core/src/lib.rs b/sdk/core/src/lib.rs
index f37f2197e5..3a1db99fd7 100644
--- a/sdk/core/src/lib.rs
+++ b/sdk/core/src/lib.rs
@@ -1,5 +1,5 @@
-pub mod blockchain;
 pub mod crypto;
 pub mod data;
+pub mod gateway;
 pub mod utils;
 pub mod wallet;

From a2a2649ed9d5fde6ceff3d9d407c299da24023f9 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Thu, 30 May 2024 11:34:48 +0300
Subject: [PATCH 0958/1254] unified - contract_without_macros

---
 .../scenario/tests/contract_without_macros.rs | 500 ++++++++++++++----
 1 file changed, 407 insertions(+), 93 deletions(-)

diff --git a/framework/scenario/tests/contract_without_macros.rs b/framework/scenario/tests/contract_without_macros.rs
index 91ca8b2eba..1121e88fdd 100644
--- a/framework/scenario/tests/contract_without_macros.rs
+++ b/framework/scenario/tests/contract_without_macros.rs
@@ -7,7 +7,6 @@
 // and maintenance.
 
 #![allow(unused)]
-#![allow(deprecated)] // TODO: unified syntax
 
 use multiversx_sc::{
     contract_base::ProxyObjNew,
@@ -103,11 +102,116 @@ mod module_1 {
     }
 
     pub trait ProxyTrait: multiversx_sc::contract_base::ProxyObjBase + Sized {
+        #[allow(clippy::too_many_arguments)]
+        #[allow(clippy::type_complexity)]
         fn version(
             &mut self,
-        ) -> multiversx_sc::types::ContractCallNoPayment<Self::Api, BigInt<Self::Api>> {
-            let ___address___ = self.extract_address();
-            multiversx_sc::types::ContractCallNoPayment::new(___address___, "version")
+        ) -> multiversx_sc::types::Tx<
+            multiversx_sc::types::TxScEnv<Self::Api>,
+            (),
+            Self::To,
+            (),
+            (),
+            multiversx_sc::types::FunctionCall<Self::Api>,
+            multiversx_sc::types::OriginalResultMarker<BigInt<Self::Api>>,
+        > {
+            multiversx_sc::types::TxBaseWithEnv::new_tx_from_sc()
+                .to(self.extract_proxy_to())
+                .original_result()
+                .raw_call("version")
+        }
+    }
+}
+
+mod sampler_adder_proxy {
+    #![allow(dead_code)]
+    #![allow(clippy::all)]
+    use multiversx_sc::proxy_imports::*;
+    pub struct AdderProxy;
+    impl<Env, From, To, Gas> TxProxyTrait<Env, From, To, Gas> for AdderProxy
+    where
+        Env: TxEnv,
+        From: TxFrom<Env>,
+        To: TxTo<Env>,
+        Gas: TxGas<Env>,
+    {
+        type TxProxyMethods = AdderProxyMethods<Env, From, To, Gas>;
+        fn proxy_methods(self, tx: Tx<Env, From, To, (), Gas, (), ()>) -> Self::TxProxyMethods {
+            AdderProxyMethods { wrapped_tx: tx }
+        }
+    }
+    pub struct AdderProxyMethods<Env, From, To, Gas>
+    where
+        Env: TxEnv,
+        From: TxFrom<Env>,
+        To: TxTo<Env>,
+        Gas: TxGas<Env>,
+    {
+        wrapped_tx: Tx<Env, From, To, (), Gas, (), ()>,
+    }
+    #[rustfmt::skip]
+    impl<Env, From, Gas> AdderProxyMethods<Env, From, (), Gas>
+    where
+        Env: TxEnv,
+        Env::Api: VMApi,
+        From: TxFrom<Env>,
+        Gas: TxGas<Env>,
+    {
+        pub fn init<Arg0: ProxyArg<BigUint<Env::Api>>>(
+            self,
+            initial_value: Arg0,
+        ) -> TxTypedDeploy<Env, From, NotPayable, Gas, ()> {
+            self.wrapped_tx
+                .payment(NotPayable)
+                .raw_deploy()
+                .argument(&initial_value)
+                .original_result()
+        }
+    }
+    #[rustfmt::skip]
+    impl<Env, From, To, Gas> AdderProxyMethods<Env, From, To, Gas>
+    where
+        Env: TxEnv,
+        Env::Api: VMApi,
+        From: TxFrom<Env>,
+        To: TxTo<Env>,
+        Gas: TxGas<Env>,
+    {
+        pub fn upgrade<Arg0: ProxyArg<BigUint<Env::Api>>>(
+            self,
+            initial_value: Arg0,
+        ) -> TxTypedUpgrade<Env, From, To, NotPayable, Gas, ()> {
+            self.wrapped_tx
+                .payment(NotPayable)
+                .raw_upgrade()
+                .argument(&initial_value)
+                .original_result()
+        }
+    }
+    #[rustfmt::skip]
+    impl<Env, From, To, Gas> AdderProxyMethods<Env, From, To, Gas>
+    where
+        Env: TxEnv,
+        Env::Api: VMApi,
+        From: TxFrom<Env>,
+        To: TxTo<Env>,
+        Gas: TxGas<Env>,
+    {
+        pub fn sum(
+            self,
+        ) -> TxTypedCall<Env, From, To, NotPayable, Gas, BigUint<Env::Api>> {
+            self.wrapped_tx.payment(NotPayable).raw_call("getSum").original_result()
+        }
+        /// Add desired amount to the storage variable.
+        pub fn add<Arg0: ProxyArg<BigUint<Env::Api>>>(
+            self,
+            value: Arg0,
+        ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
+            self.wrapped_tx
+                .payment(NotPayable)
+                .raw_call("add")
+                .argument(&value)
+                .original_result()
         }
     }
 }
@@ -121,21 +225,25 @@ mod sample_adder {
     pub trait Adder:
         super::module_1::VersionModule + multiversx_sc::contract_base::ContractBase + Sized
     {
-        fn init(&self, initial_value: &BigInt<Self::Api>) {
-            self.set_sum(initial_value);
-        }
-        fn add(&self, value: BigInt<Self::Api>) {
-            let mut sum = self.get_sum();
-            sum.add_assign(value);
-            self.set_sum(&sum);
-        }
-        fn get_sum(&self) -> BigInt<Self::Api>;
-        fn set_sum(&self, sum: &BigInt<Self::Api>);
-        fn add_version(&self) {
-            self.add(self.version())
-        }
-        fn callback(&self);
-        fn callbacks(&self) -> self::CallbackProxyObj<Self::Api>;
+        #[allow(clippy::too_many_arguments)]
+        #[allow(clippy::type_complexity)]
+        fn init(&self, initial_value: multiversx_sc::types::BigUint<Self::Api>) {
+            self.sum().set(initial_value);
+        }
+        #[allow(clippy::too_many_arguments)]
+        #[allow(clippy::type_complexity)]
+        fn upgrade(&self, initial_value: multiversx_sc::types::BigUint<Self::Api>) {
+            self.init(initial_value);
+        }
+        /// Add desired amount to the storage variable.
+        #[allow(clippy::too_many_arguments)]
+        #[allow(clippy::type_complexity)]
+        fn add(&self, value: multiversx_sc::types::BigUint<Self::Api>) {
+            self.sum().update(|sum| *sum += value);
+        }
+        #[allow(clippy::too_many_arguments)]
+        #[allow(clippy::type_complexity)]
+        fn sum(&self) -> SingleValueMapper<Self::Api, multiversx_sc::types::BigUint<Self::Api>>;
     }
 
     /////////////////////////////////////////////////////////////////////////////////////////////////
@@ -149,17 +257,14 @@ mod sample_adder {
     where
         C: AutoImpl + super::module_1::AutoImpl,
     {
-        fn get_sum(&self) -> BigInt<Self::Api> {
-            let mut ___key___ = multiversx_sc::storage::StorageKey::<Self::Api>::new(&b"sum"[..]);
-            multiversx_sc::storage_get(multiversx_sc::types::ManagedRef::new(&___key___))
-        }
-        fn set_sum(&self, sum: &BigInt<Self::Api>) {
+        #[allow(clippy::too_many_arguments)]
+        #[allow(clippy::type_complexity)]
+        fn sum(&self) -> SingleValueMapper<Self::Api, multiversx_sc::types::BigUint<Self::Api>> {
             let mut ___key___ = multiversx_sc::storage::StorageKey::<Self::Api>::new(&b"sum"[..]);
-            multiversx_sc::storage_set(multiversx_sc::types::ManagedRef::new(&___key___), &sum);
-        }
-        fn callback(&self) {}
-        fn callbacks(&self) -> self::CallbackProxyObj<Self::Api> {
-            <self::CallbackProxyObj::<Self::Api> as multiversx_sc::contract_base::CallbackProxyObjBase>::new_cb_proxy_obj()
+            <SingleValueMapper<
+            Self::Api,
+            multiversx_sc::types::BigUint<Self::Api>,
+        > as multiversx_sc::storage::mappers::StorageMapper<Self::Api>>::new(___key___)
         }
     }
 
@@ -172,11 +277,11 @@ mod sample_adder {
         Adder + multiversx_sc::contract_base::ContractBase + super::module_1::EndpointWrappers
     {
         #[inline]
-        fn call_get_sum(&self) {
+        fn call_sum(&self) {
             <Self::Api as multiversx_sc::api::VMApi>::init_static();
             multiversx_sc::io::call_value_init::not_payable::<Self::Api>();
             let () = multiversx_sc::io::load_endpoint_args::<Self::Api, ()>(());
-            let result = self.get_sum();
+            let result = self.sum();
             multiversx_sc::io::finish_multi::<Self::Api, _>(&result);
         }
         #[inline]
@@ -185,9 +290,19 @@ mod sample_adder {
             multiversx_sc::io::call_value_init::not_payable::<Self::Api>();
             let (initial_value, ()) = multiversx_sc::io::load_endpoint_args::<
                 Self::Api,
-                (multiversx_sc::types::BigInt<Self::Api>, ()),
+                (multiversx_sc::types::BigUint<Self::Api>, ()),
             >(("initial_value", ()));
-            self.init(&initial_value);
+            self.init(initial_value);
+        }
+        #[inline]
+        fn call_upgrade(&self) {
+            <Self::Api as multiversx_sc::api::VMApi>::init_static();
+            multiversx_sc::io::call_value_init::not_payable::<Self::Api>();
+            let (initial_value, ()) = multiversx_sc::io::load_endpoint_args::<
+                Self::Api,
+                (multiversx_sc::types::BigUint<Self::Api>, ()),
+            >(("initial_value", ()));
+            self.upgrade(initial_value);
         }
         #[inline]
         fn call_add(&self) {
@@ -195,38 +310,55 @@ mod sample_adder {
             multiversx_sc::io::call_value_init::not_payable::<Self::Api>();
             let (value, ()) = multiversx_sc::io::load_endpoint_args::<
                 Self::Api,
-                (multiversx_sc::types::BigInt<Self::Api>, ()),
+                (multiversx_sc::types::BigUint<Self::Api>, ()),
             >(("value", ()));
             self.add(value);
         }
-
         fn call(&self, fn_name: &str) -> bool {
             if match fn_name {
                 "callBack" => {
-                    Adder::callback(self);
+                    self::EndpointWrappers::callback(self);
+                    return true;
+                },
+                "init"
+                    if <Self::Api as multiversx_sc::api::VMApi>::external_view_init_override() =>
+                {
+                    multiversx_sc::external_view_contract::external_view_contract_constructor::<
+                        Self::Api,
+                    >();
                     return true;
                 },
                 "getSum" => {
-                    self.call_get_sum();
+                    self.call_sum();
                     true
                 },
-                "init" => {
+                "init"
+                    if !<Self::Api as multiversx_sc::api::VMApi>::external_view_init_override() =>
+                {
                     self.call_init();
                     true
                 },
+                "upgrade" => {
+                    self.call_upgrade();
+                    true
+                },
                 "add" => {
                     self.call_add();
                     true
                 },
-                _other => false,
+                other => false,
             } {
                 return true;
             }
-            if super::module_1::EndpointWrappers::call(self, fn_name) {
-                return true;
-            }
             false
         }
+        fn callback_selector(
+            &self,
+            mut ___cb_closure___: multiversx_sc::types::CallbackClosureForDeser<Self::Api>,
+        ) -> multiversx_sc::types::CallbackSelectorResult<Self::Api> {
+            multiversx_sc::types::CallbackSelectorResult::NotProcessed(___cb_closure___)
+        }
+        fn callback(&self) {}
     }
 
     impl<A> EndpointWrappers for multiversx_sc::contract_base::UniversalContractObj<A> where
@@ -234,24 +366,224 @@ mod sample_adder {
     {
     }
 
+    pub struct AbiProvider {}
+    impl multiversx_sc::contract_base::ContractAbiProvider for AbiProvider {
+        type Api = multiversx_sc::api::uncallable::UncallableApi;
+        fn abi() -> multiversx_sc::abi::ContractAbi {
+            let mut contract_abi = multiversx_sc::abi::ContractAbi::new(
+                multiversx_sc::abi::BuildInfoAbi {
+                    contract_crate: multiversx_sc::abi::ContractCrateBuildAbi {
+                        name: "adder",
+                        version: "0.0.0",
+                        git_version: "",
+                    },
+                    framework: multiversx_sc::abi::FrameworkBuildAbi::create(),
+                },
+                &[
+                    "One of the simplest smart contracts possible,",
+                    "it holds a single variable in storage, which anyone can increment.",
+                ],
+                "Adder",
+                false,
+            );
+            let mut endpoint_abi = multiversx_sc::abi::EndpointAbi::new(
+                &[],
+                "getSum",
+                "sum",
+                false,
+                false,
+                multiversx_sc::abi::EndpointMutabilityAbi::Readonly,
+                multiversx_sc::abi::EndpointTypeAbi::Endpoint,
+                &[],
+                &[],
+                false,
+            );
+            endpoint_abi
+            .add_output::<
+                SingleValueMapper<Self::Api, multiversx_sc::types::BigUint<Self::Api>>,
+            >(&[]);
+            contract_abi
+            .add_type_descriptions::<
+                SingleValueMapper<Self::Api, multiversx_sc::types::BigUint<Self::Api>>,
+            >();
+            contract_abi.endpoints.push(endpoint_abi);
+            let mut endpoint_abi = multiversx_sc::abi::EndpointAbi::new(
+                &[],
+                "init",
+                "init",
+                false,
+                false,
+                multiversx_sc::abi::EndpointMutabilityAbi::Mutable,
+                multiversx_sc::abi::EndpointTypeAbi::Init,
+                &[],
+                &[],
+                false,
+            );
+            endpoint_abi.add_input::<multiversx_sc::types::BigUint<Self::Api>>("initial_value");
+            contract_abi.add_type_descriptions::<multiversx_sc::types::BigUint<Self::Api>>();
+            contract_abi.constructors.push(endpoint_abi);
+            let mut endpoint_abi = multiversx_sc::abi::EndpointAbi::new(
+                &[],
+                "upgrade",
+                "upgrade",
+                false,
+                false,
+                multiversx_sc::abi::EndpointMutabilityAbi::Mutable,
+                multiversx_sc::abi::EndpointTypeAbi::Upgrade,
+                &[],
+                &[],
+                false,
+            );
+            endpoint_abi.add_input::<multiversx_sc::types::BigUint<Self::Api>>("initial_value");
+            contract_abi.add_type_descriptions::<multiversx_sc::types::BigUint<Self::Api>>();
+            contract_abi.upgrade_constructors.push(endpoint_abi);
+            let mut endpoint_abi = multiversx_sc::abi::EndpointAbi::new(
+                &["Add desired amount to the storage variable."],
+                "add",
+                "add",
+                false,
+                false,
+                multiversx_sc::abi::EndpointMutabilityAbi::Mutable,
+                multiversx_sc::abi::EndpointTypeAbi::Endpoint,
+                &[],
+                &[],
+                false,
+            );
+            endpoint_abi.add_input::<multiversx_sc::types::BigUint<Self::Api>>("value");
+            contract_abi.add_type_descriptions::<multiversx_sc::types::BigUint<Self::Api>>();
+            contract_abi.endpoints.push(endpoint_abi);
+            contract_abi
+        }
+    }
+
+    #[allow(non_snake_case)]
+    pub mod endpoints {
+        use super::EndpointWrappers;
+        pub fn sum<A>()
+        where
+            A: multiversx_sc::api::VMApi,
+        {
+            super::EndpointWrappers::call_sum(
+                &multiversx_sc::contract_base::UniversalContractObj::<A>::new(),
+            );
+        }
+        pub fn init<A>()
+        where
+            A: multiversx_sc::api::VMApi,
+        {
+            super::EndpointWrappers::call_init(
+                &multiversx_sc::contract_base::UniversalContractObj::<A>::new(),
+            );
+        }
+        pub fn upgrade<A>()
+        where
+            A: multiversx_sc::api::VMApi,
+        {
+            super::EndpointWrappers::call_upgrade(
+                &multiversx_sc::contract_base::UniversalContractObj::<A>::new(),
+            );
+        }
+        pub fn add<A>()
+        where
+            A: multiversx_sc::api::VMApi,
+        {
+            super::EndpointWrappers::call_add(
+                &multiversx_sc::contract_base::UniversalContractObj::<A>::new(),
+            );
+        }
+        pub fn callBack<A>()
+        where
+            A: multiversx_sc::api::VMApi,
+        {
+            super::EndpointWrappers::callback(
+                &multiversx_sc::contract_base::UniversalContractObj::<A>::new(),
+            );
+        }
+    }
     pub trait ProxyTrait:
         multiversx_sc::contract_base::ProxyObjBase + super::module_1::ProxyTrait
     {
-        fn get_sum(
+        #[allow(clippy::too_many_arguments)]
+        #[allow(clippy::type_complexity)]
+        fn sum(
             &mut self,
-        ) -> multiversx_sc::types::ContractCallNoPayment<Self::Api, BigInt<Self::Api>> {
-            let ___address___ = self.extract_address();
-            multiversx_sc::types::ContractCallNoPayment::new(___address___, "get_sum")
-        }
-        fn add(
+        ) -> multiversx_sc::types::Tx<
+            multiversx_sc::types::TxScEnv<Self::Api>,
+            (),
+            Self::To,
+            (),
+            (),
+            multiversx_sc::types::FunctionCall<Self::Api>,
+            multiversx_sc::types::OriginalResultMarker<
+                SingleValueMapper<Self::Api, multiversx_sc::types::BigUint<Self::Api>>,
+            >,
+        > {
+            multiversx_sc::types::TxBaseWithEnv::new_tx_from_sc()
+                .to(self.extract_proxy_to())
+                .original_result()
+                .raw_call("getSum")
+        }
+        #[allow(clippy::too_many_arguments)]
+        #[allow(clippy::type_complexity)]
+        fn init<Arg0: multiversx_sc::types::ProxyArg<multiversx_sc::types::BigUint<Self::Api>>>(
             &mut self,
-            amount: &BigInt<Self::Api>,
-        ) -> multiversx_sc::types::ContractCallNoPayment<Self::Api, ()> {
-            let ___address___ = self.extract_address();
-            let mut ___contract_call___ =
-                multiversx_sc::types::ContractCallNoPayment::new(___address___, "add");
-            multiversx_sc::types::ContractCall::proxy_arg(&mut ___contract_call___, amount);
-            ___contract_call___
+            initial_value: Arg0,
+        ) -> multiversx_sc::types::Tx<
+            multiversx_sc::types::TxScEnv<Self::Api>,
+            (),
+            Self::To,
+            (),
+            (),
+            multiversx_sc::types::DeployCall<multiversx_sc::types::TxScEnv<Self::Api>, ()>,
+            multiversx_sc::types::OriginalResultMarker<()>,
+        > {
+            multiversx_sc::types::TxBaseWithEnv::new_tx_from_sc()
+                .raw_deploy()
+                .argument(&initial_value)
+                .original_result()
+                .to(self.extract_proxy_to())
+        }
+        #[allow(clippy::too_many_arguments)]
+        #[allow(clippy::type_complexity)]
+        fn upgrade<
+            Arg0: multiversx_sc::types::ProxyArg<multiversx_sc::types::BigUint<Self::Api>>,
+        >(
+            &mut self,
+            initial_value: Arg0,
+        ) -> multiversx_sc::types::Tx<
+            multiversx_sc::types::TxScEnv<Self::Api>,
+            (),
+            Self::To,
+            (),
+            (),
+            multiversx_sc::types::FunctionCall<Self::Api>,
+            multiversx_sc::types::OriginalResultMarker<()>,
+        > {
+            multiversx_sc::types::TxBaseWithEnv::new_tx_from_sc()
+                .to(self.extract_proxy_to())
+                .original_result()
+                .raw_call("upgrade")
+                .argument(&initial_value)
+        }
+        #[allow(clippy::too_many_arguments)]
+        #[allow(clippy::type_complexity)]
+        fn add<Arg0: multiversx_sc::types::ProxyArg<multiversx_sc::types::BigUint<Self::Api>>>(
+            &mut self,
+            value: Arg0,
+        ) -> multiversx_sc::types::Tx<
+            multiversx_sc::types::TxScEnv<Self::Api>,
+            (),
+            Self::To,
+            (),
+            (),
+            multiversx_sc::types::FunctionCall<Self::Api>,
+            multiversx_sc::types::OriginalResultMarker<()>,
+        > {
+            multiversx_sc::types::TxBaseWithEnv::new_tx_from_sc()
+                .to(self.extract_proxy_to())
+                .original_result()
+                .raw_call("add")
+                .argument(&value)
         }
     }
 
@@ -288,17 +620,21 @@ mod sample_adder {
         A: multiversx_sc::api::VMApi,
     {
         fn call(&self, fn_name: &str) -> bool {
-            EndpointWrappers::call(
-                &multiversx_sc::contract_base::UniversalContractObj::<A>::new(),
-                fn_name,
-            )
+            EndpointWrappers::call(self, fn_name)
         }
     }
 
+    pub fn contract_obj<A>() -> ContractObj<A>
+    where
+        A: multiversx_sc::api::VMApi,
+    {
+        ContractObj {
+            _phantom: core::marker::PhantomData,
+        }
+    }
     pub struct ContractBuilder;
-
-    impl multiversx_sc::contract_base::CallableContractBuilder for ContractBuilder {
-        fn new_contract_obj<A: multiversx_sc::api::VMApi>(
+    impl multiversx_sc::contract_base::CallableContractBuilder for self::ContractBuilder {
+        fn new_contract_obj<A: multiversx_sc::api::VMApi + Send + Sync>(
             &self,
         ) -> multiversx_sc::types::heap::Box<dyn multiversx_sc::contract_base::CallableContract>
         {
@@ -308,25 +644,6 @@ mod sample_adder {
         }
     }
 
-    pub struct AbiProvider {}
-
-    impl multiversx_sc::contract_base::ContractAbiProvider for AbiProvider {
-        type Api = multiversx_sc::api::uncallable::UncallableApi;
-
-        fn abi() -> multiversx_sc::abi::ContractAbi {
-            multiversx_sc::abi::ContractAbi::default()
-        }
-    }
-
-    pub fn contract_obj<A>() -> ContractObj<A>
-    where
-        A: multiversx_sc::api::VMApi,
-    {
-        ContractObj {
-            _phantom: core::marker::PhantomData,
-        }
-    }
-
     pub struct Proxy<A>
     where
         A: multiversx_sc::api::VMApi + 'static,
@@ -465,27 +782,24 @@ fn contract_without_macros_basic() {
 
     let adder = sample_adder::contract_obj::<SingleTxApi>();
 
-    adder.init(&BigInt::from(5));
-    assert_eq!(BigInt::from(5), adder.get_sum());
+    adder.init(multiversx_sc::types::BigUint::from(5u32));
+    assert_eq!(multiversx_sc::types::BigUint::from(5u32), adder.sum().get());
 
-    adder.add(BigInt::from(7));
-    assert_eq!(BigInt::from(12), adder.get_sum());
-
-    adder.add(BigInt::from(-1));
-    assert_eq!(BigInt::from(11), adder.get_sum());
+    adder.add(multiversx_sc::types::BigUint::from(7u32));
+    assert_eq!(
+        multiversx_sc::types::BigUint::from(12u32),
+        adder.sum().get()
+    );
 
     assert_eq!(BigInt::from(100), adder.version());
 
-    adder.add_version();
-    assert_eq!(BigInt::from(111), adder.get_sum());
-
     assert!(!adder.call("invalid_endpoint"));
 
-    assert!(adder.call("version"));
+    assert!(adder.call("getSum"));
 
     let mut own_proxy =
         sample_adder::Proxy::<StaticApi>::new_proxy_obj().contract(ManagedAddress::zero());
-    let _ = own_proxy.get_sum();
+    let _ = own_proxy.sum();
 
     let _ = multiversx_sc_meta_lib::abi_json::contract_abi::<sample_adder::AbiProvider>();
 }

From 74207bcb9250c9537eac2fae6f4a6e10b4a3f952 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Thu, 30 May 2024 11:35:11 +0300
Subject: [PATCH 0959/1254] cargo fmt

---
 framework/snippets/src/account_tool.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/framework/snippets/src/account_tool.rs b/framework/snippets/src/account_tool.rs
index db1f14b4af..70eaafdace 100644
--- a/framework/snippets/src/account_tool.rs
+++ b/framework/snippets/src/account_tool.rs
@@ -10,7 +10,7 @@ use multiversx_sdk::{
 use std::collections::{BTreeMap, HashMap};
 
 /// Called directly from CLI, from `sc-meta`.
-/// 
+///
 /// Retrieves an account data via the API,
 /// then formats it as a scenario set state step.
 pub async fn print_account_as_scenario_set_state(

From 9a1119c6f5388ea1d3b9d345075643238d8109fa Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Mon, 3 Jun 2024 14:11:39 +0300
Subject: [PATCH 0960/1254] print code report in mxsc.json

---
 framework/meta-lib/src/code_report_json.rs    | 30 ++++++++++
 .../src/contract/sc_config/wasm_build.rs      |  3 +-
 framework/meta-lib/src/lib.rs                 |  1 +
 framework/meta-lib/src/mxsc_file_json.rs      |  1 -
 framework/meta-lib/src/report_info_json.rs    | 12 ++--
 framework/meta-lib/src/tools.rs               |  1 +
 .../meta-lib/src/tools/report_creator.rs      | 10 ++++
 .../meta-lib/src/tools/wasm_extractor.rs      | 60 +++++++++++++++++--
 8 files changed, 105 insertions(+), 13 deletions(-)
 create mode 100644 framework/meta-lib/src/code_report_json.rs
 create mode 100644 framework/meta-lib/src/tools/report_creator.rs

diff --git a/framework/meta-lib/src/code_report_json.rs b/framework/meta-lib/src/code_report_json.rs
new file mode 100644
index 0000000000..a0b997bb6e
--- /dev/null
+++ b/framework/meta-lib/src/code_report_json.rs
@@ -0,0 +1,30 @@
+use serde::{Deserialize, Serialize};
+
+use crate::tools::report_creator::ReportCreator;
+
+#[derive(Serialize, Deserialize, Default)]
+#[serde(rename_all = "camelCase")]
+pub struct CodeReportJson {
+    #[serde(default)]
+    pub path: String,
+
+    #[serde(default)]
+    pub size: usize,
+
+    #[serde(default)]
+    pub has_allocator: bool,
+
+    #[serde(default)]
+    pub has_panic: String,
+}
+
+impl CodeReportJson {
+    pub fn new(report: &ReportCreator, size: usize) -> CodeReportJson {
+        CodeReportJson {
+            path: report.path.clone(),
+            size,
+            has_allocator: report.has_allocator,
+            has_panic: report.has_panic.clone(),
+        }
+    }
+}
diff --git a/framework/meta-lib/src/contract/sc_config/wasm_build.rs b/framework/meta-lib/src/contract/sc_config/wasm_build.rs
index d4b5f9d1de..5b318da9a0 100644
--- a/framework/meta-lib/src/contract/sc_config/wasm_build.rs
+++ b/framework/meta-lib/src/contract/sc_config/wasm_build.rs
@@ -95,11 +95,10 @@ impl ContractVariant {
         let mut abi = ContractAbiJson::from(&self.abi);
         let build_info = core::mem::take(&mut abi.build_info).unwrap();
         let ei_check_json = EiCheckJson::new(&self.settings.check_ei, wasm_info.ei_check);
-        let report = ReportInfoJson::new(&wasm_info, ei_check_json);
+        let report = ReportInfoJson::new(&wasm_info, ei_check_json, compiled_bytes.len());
         let mxsc_file_json = MxscFileJson {
             build_info,
             abi,
-            size: compiled_bytes.len(),
             code: hex::encode(compiled_bytes),
             report,
         };
diff --git a/framework/meta-lib/src/lib.rs b/framework/meta-lib/src/lib.rs
index ab24acae54..e33c2cfb7b 100644
--- a/framework/meta-lib/src/lib.rs
+++ b/framework/meta-lib/src/lib.rs
@@ -1,6 +1,7 @@
 pub mod abi_json;
 pub mod cargo_toml_contents;
 pub mod cli;
+mod code_report_json;
 pub mod contract;
 pub mod ei;
 pub mod ei_check_json;
diff --git a/framework/meta-lib/src/mxsc_file_json.rs b/framework/meta-lib/src/mxsc_file_json.rs
index 47cf44ca28..84a60d0afa 100644
--- a/framework/meta-lib/src/mxsc_file_json.rs
+++ b/framework/meta-lib/src/mxsc_file_json.rs
@@ -11,7 +11,6 @@ use crate::{
 pub struct MxscFileJson {
     pub build_info: BuildInfoAbiJson,
     pub abi: ContractAbiJson,
-    pub size: usize,
     pub code: String,
     pub report: ReportInfoJson,
 }
diff --git a/framework/meta-lib/src/report_info_json.rs b/framework/meta-lib/src/report_info_json.rs
index 3f0f5d7da5..3ebbda0690 100644
--- a/framework/meta-lib/src/report_info_json.rs
+++ b/framework/meta-lib/src/report_info_json.rs
@@ -1,6 +1,6 @@
 use serde::{Deserialize, Serialize};
 
-use crate::{ei_check_json::EiCheckJson, tools::WasmInfo};
+use crate::{code_report_json::CodeReportJson, ei_check_json::EiCheckJson, tools::WasmInfo};
 
 #[derive(Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
@@ -9,19 +9,19 @@ pub struct ReportInfoJson {
     #[serde(skip_serializing_if = "Vec::is_empty")]
     pub imports: Vec<String>,
 
-    #[serde(default)]
-    pub memory_allocation_error: bool,
-
     #[serde(default)]
     pub is_mem_grow: bool,
 
     #[serde(default)]
     #[serde(skip_serializing_if = "Option::is_none")]
     pub ei_check: Option<EiCheckJson>,
+
+    #[serde(default)]
+    pub code_report: CodeReportJson,
 }
 
 impl ReportInfoJson {
-    pub fn new(wasm_info: &WasmInfo, ei_check_info: Option<EiCheckJson>) -> Self {
+    pub fn new(wasm_info: &WasmInfo, ei_check_info: Option<EiCheckJson>, size: usize) -> Self {
         let ei_check = if wasm_info.imports.is_empty() {
             None
         } else {
@@ -30,9 +30,9 @@ impl ReportInfoJson {
 
         ReportInfoJson {
             imports: wasm_info.imports.iter().map(|i| i.to_string()).collect(),
-            memory_allocation_error: wasm_info.allocator_trigger,
             is_mem_grow: wasm_info.memory_grow_flag,
             ei_check,
+            code_report: CodeReportJson::new(&wasm_info.report, size),
         }
     }
 }
diff --git a/framework/meta-lib/src/tools.rs b/framework/meta-lib/src/tools.rs
index 5be426c21e..e0a8962d9b 100644
--- a/framework/meta-lib/src/tools.rs
+++ b/framework/meta-lib/src/tools.rs
@@ -1,5 +1,6 @@
 mod find_workspace;
 mod git_describe;
+pub(crate) mod report_creator;
 pub mod twiggy;
 mod wasm_extractor;
 mod wasm_opt;
diff --git a/framework/meta-lib/src/tools/report_creator.rs b/framework/meta-lib/src/tools/report_creator.rs
new file mode 100644
index 0000000000..37af10fa4e
--- /dev/null
+++ b/framework/meta-lib/src/tools/report_creator.rs
@@ -0,0 +1,10 @@
+pub const WITH_MESSAGE: &str = "with message";
+pub const WITHOUT_MESSAGE: &str = "without message";
+
+pub struct ReportCreator {
+    pub path: String,
+    pub has_allocator: bool,
+    pub has_panic: String,
+}
+
+impl ReportCreator {}
diff --git a/framework/meta-lib/src/tools/wasm_extractor.rs b/framework/meta-lib/src/tools/wasm_extractor.rs
index c8b9943190..50d5b78aff 100644
--- a/framework/meta-lib/src/tools/wasm_extractor.rs
+++ b/framework/meta-lib/src/tools/wasm_extractor.rs
@@ -6,14 +6,19 @@ use wasmparser::{
 
 use crate::ei::EIVersion;
 
+use super::report_creator::{ReportCreator, WITHOUT_MESSAGE, WITH_MESSAGE};
+
+const PANIC_WITH_MESSAGE: &[u8; 16] = b"panic occurred: ";
+const PANIC_WITHOUT_MESSAGE: &[u8; 14] = b"panic occurred";
 const ERROR_FAIL_ALLOCATOR: &[u8; 27] = b"memory allocation forbidden";
 const MEMORY_GROW_OPCODE: u8 = 0x40;
 
 pub struct WasmInfo {
     pub imports: Vec<String>,
-    pub allocator_trigger: bool,
     pub ei_check: bool,
     pub memory_grow_flag: bool,
+    pub has_format: bool,
+    pub report: ReportCreator,
 }
 
 impl WasmInfo {
@@ -25,11 +30,17 @@ impl WasmInfo {
         let wasm_data = fs::read(output_wasm_path)
             .expect("error occured while extracting information from .wasm: file not found");
 
-        populate_wasm_info(wasm_data, extract_imports_enabled, check_ei)
+        populate_wasm_info(
+            output_wasm_path.to_string(),
+            wasm_data,
+            extract_imports_enabled,
+            check_ei,
+        )
     }
 }
 
 fn populate_wasm_info(
+    path: String,
     wasm_data: Vec<u8>,
     extract_imports_enabled: bool,
     check_ei: &Option<EIVersion>,
@@ -38,6 +49,7 @@ fn populate_wasm_info(
     let mut allocator_trigger = false;
     let mut ei_check = false;
     let mut memory_grow_flag = false;
+    let mut has_panic = "none";
 
     let parser = Parser::new(0);
     for payload in parser.parse_all(&wasm_data) {
@@ -47,7 +59,12 @@ fn populate_wasm_info(
                 ei_check = is_ei_valid(imports.clone(), check_ei);
             },
             Payload::DataSection(data_section) => {
-                allocator_trigger = is_fail_allocator_triggered(data_section);
+                allocator_trigger = is_fail_allocator_triggered(data_section.clone());
+                if is_panic_with_message_triggered(data_section.clone()) {
+                    has_panic = WITH_MESSAGE;
+                } else if is_panic_without_message_triggered(data_section) {
+                    has_panic = WITHOUT_MESSAGE;
+                }
             },
             Payload::CodeSectionEntry(code_section) => {
                 memory_grow_flag = is_mem_grow(code_section);
@@ -56,11 +73,18 @@ fn populate_wasm_info(
         }
     }
 
+    let report = ReportCreator {
+        path,
+        has_allocator: allocator_trigger,
+        has_panic: has_panic.to_string(),
+    };
+
     Ok(WasmInfo {
         imports,
-        allocator_trigger,
         ei_check,
         memory_grow_flag,
+        has_format: true,
+        report,
     })
 }
 
@@ -85,6 +109,34 @@ fn is_fail_allocator_triggered(data_section: DataSectionReader) -> bool {
     false
 }
 
+fn is_panic_with_message_triggered(data_section: DataSectionReader) -> bool {
+    for data_fragment in data_section.into_iter().flatten() {
+        if data_fragment
+            .data
+            .windows(PANIC_WITH_MESSAGE.len())
+            .any(|data| data == PANIC_WITH_MESSAGE)
+        {
+            return true;
+        }
+    }
+
+    false
+}
+
+fn is_panic_without_message_triggered(data_section: DataSectionReader) -> bool {
+    for data_fragment in data_section.into_iter().flatten() {
+        if data_fragment
+            .data
+            .windows(PANIC_WITHOUT_MESSAGE.len())
+            .any(|data| data == PANIC_WITHOUT_MESSAGE)
+        {
+            return true;
+        }
+    }
+
+    false
+}
+
 pub fn extract_imports(
     import_section: ImportSectionReader,
     import_extraction_enabled: bool,

From 38c2e6aebf1626aed99202bb3af2a539ed504180 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Mon, 3 Jun 2024 14:27:15 +0300
Subject: [PATCH 0961/1254] missing imports: RustBigInt, DebugHandle

---
 framework/scenario/src/imports.rs                    | 3 ++-
 tools/rust-debugger/format-tests/src/format_tests.rs | 5 +----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/framework/scenario/src/imports.rs b/framework/scenario/src/imports.rs
index 9eac89fc70..98356c3020 100644
--- a/framework/scenario/src/imports.rs
+++ b/framework/scenario/src/imports.rs
@@ -3,12 +3,13 @@ pub use crate::multiversx_sc::imports::*;
 pub use crate::multiversx_sc::codec::test_util::*;
 
 pub use crate::{
-    api::{DebugApi, StaticApi},
+    api::{DebugApi, DebugHandle, StaticApi},
     assert_values_eq, bech32,
     facade::{
         expr::*, result_handlers::*, world_tx::*, ContractInfo, ScenarioWorld, WhiteboxContract,
     },
     managed_address, managed_biguint, managed_buffer, managed_token_id, num_bigint,
+    num_bigint::BigInt as RustBigInt,
     num_bigint::BigUint as RustBigUint,
     rust_biguint,
     scenario::{
diff --git a/tools/rust-debugger/format-tests/src/format_tests.rs b/tools/rust-debugger/format-tests/src/format_tests.rs
index 5df781b92b..2c72e4acda 100644
--- a/tools/rust-debugger/format-tests/src/format_tests.rs
+++ b/tools/rust-debugger/format-tests/src/format_tests.rs
@@ -7,10 +7,7 @@ use multiversx_sc::{
         ManagedType, ManagedVec, TokenIdentifier,
     },
 };
-use multiversx_sc_scenario::{
-    api::{DebugApi, DebugHandle},
-    num_bigint::{BigInt as RustBigInt, BigUint as RustBigUint},
-};
+use multiversx_sc_scenario::imports::*;
 
 macro_rules! push {
     ($list: ident, $name:ident, $expected: expr ) => {{

From 6fcfd3672d15369991daea8277ede641e95f3c57 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Mon, 3 Jun 2024 20:12:17 +0200
Subject: [PATCH 0962/1254] ln impl and test

---
 .../types/managed/wrapped/managed_decimal.rs  | 57 +++++++++++++
 .../scenario/tests/managed_decimal_test.rs    | 84 +++++++++++++++++++
 2 files changed, 141 insertions(+)

diff --git a/framework/base/src/types/managed/wrapped/managed_decimal.rs b/framework/base/src/types/managed/wrapped/managed_decimal.rs
index 89a7c47ca9..6e06bb3cfa 100644
--- a/framework/base/src/types/managed/wrapped/managed_decimal.rs
+++ b/framework/base/src/types/managed/wrapped/managed_decimal.rs
@@ -142,6 +142,45 @@ impl<M: ManagedTypeApi, D: Decimals> ManagedDecimal<M, D> {
             num_decimals,
         )
     }
+
+    // pub fn log<T: Decimals>(self, target_base: f64, precision: T) -> ManagedDecimal<M, T> {
+    //     let num_decimals = f64::from(precision.num_decimals() as u32);
+    //     let number = f64::from(self.data.to_u64().unwrap() as u32);
+
+    //     assert!(number >= 1f64 && target_base >= 1f64, "wrong input");
+
+    //     let precise = (number.log10() * num_decimals / target_base.log10())
+    //         .trunc()
+    //         .round() as u64;
+
+    //     ManagedDecimal::from_raw_units(BigUint::<M>::from(precise), precision)
+    // }
+
+    pub fn ln(self, decimals: D) -> ManagedDecimal<M, NumDecimals> {
+        // find the highest power of 2 less than or equal to self
+        let log2 = self.data.log2(); // most significant bit
+        let divisor = 1 << log2;
+        let x = self.to_big_float() / BigFloat::from(divisor); // normalize to [1.0, 2.0]
+
+        let ln_of_2 = BigFloat::from_frac(69314718i64, 1_000_000_000i64);
+        let first = BigFloat::from_frac(17417939i64, 10_000_000i64); // 1.7417939, 7 decimals
+        let second = BigFloat::from_frac(28212026i64, 10_000_000i64); // 2.8212026, 7 decimals
+        let third = BigFloat::from_frac(14699568i64, 10_000_000i64); // 1.4699568, 7 decimals
+        let fourth = BigFloat::from_frac(44717955i64, 1_000_000_000i64); // 0.44717955, 9 decimals
+        let fifth = BigFloat::from_frac(56570851i64, 1_000_000_000i64); // 0.056570851, 9 decimals
+
+        // approximating polynom for getting the result
+        let result =
+            (((fourth - fifth * x.clone()) * x.clone() - third) * x.clone() + second) * x - first;
+        let add_member = BigFloat::from_big_uint(&BigUint::from(log2)) * ln_of_2;
+        let final_result = result + add_member;
+
+        final_result.to_managed_decimal(decimals.num_decimals())
+    }
+
+    pub fn nth_root(self, _root: ManagedDecimal<M, D>, _precision: D) -> ManagedDecimal<M, D> {
+        todo!()
+    }
 }
 
 impl<M: ManagedTypeApi, const DECIMALS: NumDecimals> ManagedDecimal<M, ConstDecimals<DECIMALS>> {
@@ -339,6 +378,24 @@ where
     }
 }
 
+impl<M: ManagedTypeApi> Add<ManagedDecimal<M, NumDecimals>> for ManagedDecimal<M, NumDecimals> {
+    type Output = Self;
+
+    fn add(self, other: ManagedDecimal<M, NumDecimals>) -> Self::Output {
+        let scaled = other.rescale(self.scale());
+        ManagedDecimal::from_raw_units(&self.data + &scaled.data, scaled.decimals)
+    }
+}
+
+impl<M: ManagedTypeApi> Sub<ManagedDecimal<M, NumDecimals>> for ManagedDecimal<M, NumDecimals> {
+    type Output = Self;
+
+    fn sub(self, other: ManagedDecimal<M, NumDecimals>) -> Self::Output {
+        let scaled = other.rescale(self.scale());
+        ManagedDecimal::from_raw_units(&self.data - &scaled.data, scaled.decimals)
+    }
+}
+
 impl<M: ManagedTypeApi, D1: Decimals, D2: Decimals> PartialEq<ManagedDecimal<M, D2>>
     for ManagedDecimal<M, D1>
 {
diff --git a/framework/scenario/tests/managed_decimal_test.rs b/framework/scenario/tests/managed_decimal_test.rs
index cbe701c9cf..fa4d10fcba 100644
--- a/framework/scenario/tests/managed_decimal_test.rs
+++ b/framework/scenario/tests/managed_decimal_test.rs
@@ -124,3 +124,87 @@ fn test_encode_decode() {
 
     check_top_encode_decode(fixed_const, bytes);
 }
+
+#[test]
+fn test_managed_decimal_ln() {
+    let fixed =
+        ManagedDecimal::<StaticApi, NumDecimals>::from_raw_units(BigUint::from(23u64), 0usize);
+
+    let ln_fixed = fixed.ln(10usize); // precision of 10 decimal points
+
+    println!("{ln_fixed:?}");
+    assert_eq!(
+        ln_fixed,
+        ManagedDecimal::<StaticApi, NumDecimals>::from_raw_units(
+            BigUint::from(313549421u64),
+            10usize
+        )
+    );
+}
+
+// #[test]
+// fn test_managed_decimal_nth_root() {
+//     let fixed =
+//         ManagedDecimal::<StaticApi, NumDecimals>::from_raw_units(BigUint::from(567u64), 1usize);
+
+//     let fifth_root = fixed.clone().root(5f64, 100usize);
+//     let fifth_root_higher_prec = fixed.root(5f64, 100_000usize);
+
+//     assert_eq!(
+//         fifth_root,
+//         ManagedDecimal::<StaticApi, NumDecimals>::from_raw_units(BigUint::from(355u64), 100usize)
+//     );
+//     assert_eq!(
+//         fifth_root_higher_prec,
+//         ManagedDecimal::<StaticApi, NumDecimals>::from_raw_units(
+//             BigUint::from(355399u64),
+//             100_000usize
+//         )
+//     );
+
+//     let const_fixed: ManagedDecimal<StaticApi, ConstDecimals<2>> =
+//         ManagedDecimal::<StaticApi, ConstDecimals<2>>::const_decimals_from_raw(BigUint::from(
+//             876u64,
+//         ));
+
+//     let seventh_root_var = const_fixed.clone().root(7f64, 10_000usize);
+//     let seventh_root_const = const_fixed.root(7f64, ConstDecimals::<10_000>);
+
+//     assert_eq!(
+//         seventh_root_var,
+//         ManagedDecimal::<StaticApi, NumDecimals>::from_raw_units(
+//             BigUint::from(26324u64),
+//             10_000usize
+//         )
+//     );
+//     assert_eq!(
+//         seventh_root_const,
+//         ManagedDecimal::<StaticApi, ConstDecimals::<10_000>>::const_decimals_from_raw(
+//             BigUint::from(26324u64)
+//         )
+//     );
+// }
+
+// #[test]
+// fn test_managed_decimal_log_any_base() {
+//     let fixed = ManagedDecimal::from_raw_units(BigUint::from(10u64), 1usize);
+//     let log2_fixed = fixed.log(BigUint::from(2u64), 10_000usize);
+//     assert_eq!(
+//         log2_fixed,
+//         ManagedDecimal::<StaticApi, NumDecimals>::from_raw_units(
+//             BigUint::from(33219u64),
+//             10_000usize
+//         )
+//     );
+
+//     let fixed_const = ManagedDecimal::<StaticApi, ConstDecimals<1>>::const_decimals_from_raw(
+//         BigUint::from(10u64),
+//     );
+//     let log2_const = fixed_const.log(BigUint::from(2u64), ConstDecimals::<10_000>);
+//     assert_eq!(
+//         log2_const,
+//         ManagedDecimal::<StaticApi, ConstDecimals::<10_000>>::const_decimals_from_raw(
+//             BigUint::from(33219u64)
+//         )
+//     );
+// }

From 2037f7382e81282aa094902827ded9238bc57a78 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 4 Jun 2024 00:48:29 +0300
Subject: [PATCH 0963/1254] rustc version requirement

---
 framework/base/Cargo.toml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/framework/base/Cargo.toml b/framework/base/Cargo.toml
index 3e348fd6d0..003b63fd53 100644
--- a/framework/base/Cargo.toml
+++ b/framework/base/Cargo.toml
@@ -2,6 +2,7 @@
 name = "multiversx-sc"
 version = "0.50.3"
 edition = "2021"
+rust-version = "1.78"
 
 authors = ["Andrei Marinica <andrei.marinica@multiversx.com>", "MultiversX <contact@multiversx.com>"]
 license = "GPL-3.0-only"

From 35741c409d3fbe31147e348b90bb73120fd7d1f0 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 4 Jun 2024 01:36:49 +0300
Subject: [PATCH 0964/1254] alloc featureremoved from codec, clanup

---
 .../feature-tests/alloc-features/src/echo_alloc.rs    |  3 ---
 .../alloc-features/src/macro_features_legacy.rs       |  2 --
 data/codec/Cargo.toml                                 |  1 -
 data/codec/src/multi_types/mod.rs                     |  4 ----
 framework/base/Cargo.toml                             |  2 +-
 framework/base/src/abi/type_abi_impl_codec_multi.rs   |  2 --
 .../base/src/types/managed/basic/managed_buffer.rs    |  1 -
 .../types/managed/multi_value/multi_value_encoded.rs  | 10 +---------
 .../managed/multi_value/multi_value_managed_vec.rs    |  8 +++-----
 .../base/src/types/managed/wrapped/managed_address.rs | 11 -----------
 10 files changed, 5 insertions(+), 39 deletions(-)

diff --git a/contracts/feature-tests/alloc-features/src/echo_alloc.rs b/contracts/feature-tests/alloc-features/src/echo_alloc.rs
index 22e334c229..39f7b185c0 100644
--- a/contracts/feature-tests/alloc-features/src/echo_alloc.rs
+++ b/contracts/feature-tests/alloc-features/src/echo_alloc.rs
@@ -2,9 +2,6 @@ multiversx_sc::imports!();
 
 use crate::types::*;
 
-// String is not part of the standard imports because we want to discourage its use
-use multiversx_sc::types::String;
-
 /// Test serialization for heap-allocated types.
 #[multiversx_sc::module]
 pub trait EchoAllocTypes {
diff --git a/contracts/feature-tests/alloc-features/src/macro_features_legacy.rs b/contracts/feature-tests/alloc-features/src/macro_features_legacy.rs
index 0a33d06c05..d5e5f5ef77 100644
--- a/contracts/feature-tests/alloc-features/src/macro_features_legacy.rs
+++ b/contracts/feature-tests/alloc-features/src/macro_features_legacy.rs
@@ -2,8 +2,6 @@
 
 multiversx_sc::imports!();
 
-use multiversx_sc::types::String;
-
 /// Legacy, deprecated macros. Will b removed once they get removed.
 ///
 /// Error conversions should be moved to corresponding new formatter-based error tests.
diff --git a/data/codec/Cargo.toml b/data/codec/Cargo.toml
index d1acc107bf..7255a54012 100644
--- a/data/codec/Cargo.toml
+++ b/data/codec/Cargo.toml
@@ -15,7 +15,6 @@ categories = ["no-std", "wasm", "cryptography::cryptocurrencies", "development-t
 
 [features]
 derive = ["multiversx-sc-codec-derive"]
-alloc = []
 
 [dependencies.multiversx-sc-codec-derive]
 path = "../codec-derive"
diff --git a/data/codec/src/multi_types/mod.rs b/data/codec/src/multi_types/mod.rs
index 2bb9948b41..bf6a01ec61 100644
--- a/data/codec/src/multi_types/mod.rs
+++ b/data/codec/src/multi_types/mod.rs
@@ -3,14 +3,10 @@ mod multi_value_optional;
 mod multi_value_placeholder;
 mod multi_value_tuple;
 mod multi_value_unit;
-
-#[cfg(feature = "alloc")]
 mod multi_value_vec;
 
 pub use multi_value_ignore::IgnoreValue;
 pub use multi_value_optional::OptionalValue;
 pub use multi_value_placeholder::*;
 pub use multi_value_tuple::*;
-
-#[cfg(feature = "alloc")]
 pub use multi_value_vec::MultiValueVec;
diff --git a/framework/base/Cargo.toml b/framework/base/Cargo.toml
index 3e348fd6d0..f088a20640 100644
--- a/framework/base/Cargo.toml
+++ b/framework/base/Cargo.toml
@@ -18,7 +18,7 @@ all-features = true
 
 [features]
 num-bigint = ["multiversx-sc-codec/num-bigint"]
-alloc = ["multiversx-sc-codec/alloc"]
+alloc = []
 managed-buffer-builder-cached = []
 esdt-token-payment-legacy-decode = []
 
diff --git a/framework/base/src/abi/type_abi_impl_codec_multi.rs b/framework/base/src/abi/type_abi_impl_codec_multi.rs
index 7fcfa89ae5..a10755d3e8 100644
--- a/framework/base/src/abi/type_abi_impl_codec_multi.rs
+++ b/framework/base/src/abi/type_abi_impl_codec_multi.rs
@@ -5,7 +5,6 @@ use crate::{
     codec::multi_types::{IgnoreValue, OptionalValue},
 };
 
-#[cfg(feature = "alloc")]
 impl<T, U> TypeAbiFrom<crate::codec::multi_types::MultiValueVec<U>>
     for crate::codec::multi_types::MultiValueVec<T>
 where
@@ -13,7 +12,6 @@ where
 {
 }
 
-#[cfg(feature = "alloc")]
 impl<T: TypeAbi> TypeAbi for crate::codec::multi_types::MultiValueVec<T> {
     type Unmanaged = crate::codec::multi_types::MultiValueVec<T::Unmanaged>;
 
diff --git a/framework/base/src/types/managed/basic/managed_buffer.rs b/framework/base/src/types/managed/basic/managed_buffer.rs
index d232776b2e..de2dc63bb8 100644
--- a/framework/base/src/types/managed/basic/managed_buffer.rs
+++ b/framework/base/src/types/managed/basic/managed_buffer.rs
@@ -514,7 +514,6 @@ impl<M: ManagedTypeApi> core::fmt::Debug for ManagedBuffer<M> {
     }
 }
 
-#[cfg(feature = "alloc")]
 impl<M: ManagedTypeApi> core::fmt::Display for ManagedBuffer<M> {
     fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
         use crate::contract_base::ErrorHelper;
diff --git a/framework/base/src/types/managed/multi_value/multi_value_encoded.rs b/framework/base/src/types/managed/multi_value/multi_value_encoded.rs
index f06a6fcbdc..04dbde9357 100644
--- a/framework/base/src/types/managed/multi_value/multi_value_encoded.rs
+++ b/framework/base/src/types/managed/multi_value/multi_value_encoded.rs
@@ -1,5 +1,6 @@
 use unwrap_infallible::UnwrapInfallible;
 
+use crate::codec::multi_types::MultiValueVec;
 use crate::{
     abi::{TypeAbi, TypeAbiFrom, TypeDescriptionContainer, TypeName},
     api::{ErrorApi, ManagedTypeApi},
@@ -244,12 +245,8 @@ where
     M: ManagedTypeApi,
     T: TypeAbi,
 {
-    #[cfg(feature = "alloc")]
     type Unmanaged = MultiValueVec<T::Unmanaged>;
 
-    #[cfg(not(feature = "alloc"))]
-    type Unmanaged = Self;
-
     fn type_name() -> TypeName {
         crate::abi::type_name_variadic::<T>()
     }
@@ -267,10 +264,6 @@ where
     }
 }
 
-#[cfg(feature = "alloc")]
-use crate::codec::multi_types::MultiValueVec;
-
-#[cfg(feature = "alloc")]
 impl<M, T, U> TypeAbiFrom<MultiValueVec<T>> for MultiValueEncoded<M, U>
 where
     M: ManagedTypeApi + ErrorApi,
@@ -279,7 +272,6 @@ where
 {
 }
 
-#[cfg(feature = "alloc")]
 impl<M, T, U> TypeAbiFrom<MultiValueEncoded<M, T>> for MultiValueVec<U>
 where
     M: ManagedTypeApi + ErrorApi,
diff --git a/framework/base/src/types/managed/multi_value/multi_value_managed_vec.rs b/framework/base/src/types/managed/multi_value/multi_value_managed_vec.rs
index 0c1f094cb6..a168711af1 100644
--- a/framework/base/src/types/managed/multi_value/multi_value_managed_vec.rs
+++ b/framework/base/src/types/managed/multi_value/multi_value_managed_vec.rs
@@ -1,3 +1,5 @@
+use multiversx_sc_codec::multi_types::MultiValueVec;
+
 use crate::{
     abi::{TypeAbi, TypeAbiFrom, TypeDescriptionContainer, TypeName},
     api::ManagedTypeApi,
@@ -222,11 +224,7 @@ where
     M: ManagedTypeApi,
     T: ManagedVecItem,
 {
-    #[cfg(feature = "alloc")]
-    type Unmanaged = multiversx_sc_codec::multi_types::MultiValueVec<T::Unmanaged>;
-
-    #[cfg(not(feature = "alloc"))]
-    type Unmanaged = Self;
+    type Unmanaged = MultiValueVec<T::Unmanaged>;
 
     fn type_name() -> TypeName {
         crate::abi::type_name_variadic::<T>()
diff --git a/framework/base/src/types/managed/wrapped/managed_address.rs b/framework/base/src/types/managed/wrapped/managed_address.rs
index ca871a718b..a90482fb04 100644
--- a/framework/base/src/types/managed/wrapped/managed_address.rs
+++ b/framework/base/src/types/managed/wrapped/managed_address.rs
@@ -235,12 +235,8 @@ impl<M> TypeAbi for ManagedAddress<M>
 where
     M: ManagedTypeApi,
 {
-    #[cfg(feature = "alloc")]
     type Unmanaged = crate::types::heap::Address;
 
-    #[cfg(not(feature = "alloc"))]
-    type Unmanaged = Self;
-
     /// `"Address"` instead of `"array32<u8>"`.
     fn type_name() -> TypeName {
         Address::type_name()
@@ -274,14 +270,7 @@ impl<M: ManagedTypeApi> core::fmt::Debug for ManagedAddress<M> {
 
 impl<M> TypeAbiFrom<[u8; 32]> for ManagedAddress<M> where M: ManagedTypeApi {}
 
-#[cfg(feature = "alloc")]
 impl<M> TypeAbiFrom<Address> for ManagedAddress<M> where M: ManagedTypeApi {}
-
-#[cfg(feature = "alloc")]
 impl<M> TypeAbiFrom<&Address> for ManagedAddress<M> where M: ManagedTypeApi {}
-
-#[cfg(feature = "alloc")]
 impl<M> TypeAbiFrom<ManagedAddress<M>> for Address where M: ManagedTypeApi {}
-
-#[cfg(feature = "alloc")]
 impl<M> TypeAbiFrom<&ManagedAddress<M>> for Address where M: ManagedTypeApi {}

From 56ceb88750b2fd02af3839826b1c2278432ed805 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Tue, 4 Jun 2024 02:22:12 +0200
Subject: [PATCH 0965/1254] renamed interact-rs folder into interactor

---
 .../feature-tests/rust-snippets-generator-test/src/lib.rs     | 2 +-
 .../src/contract/generate_snippets/snippet_crate_gen.rs       | 4 ++--
 framework/meta-lib/src/contract/meta_config.rs                | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

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 bc52826ecd..0ea3aaea2b 100644
--- a/contracts/feature-tests/rust-snippets-generator-test/src/lib.rs
+++ b/contracts/feature-tests/rust-snippets-generator-test/src/lib.rs
@@ -11,7 +11,7 @@ multiversx_sc::derive_imports!();
 // cargo run snippets
 // Add --overwrite if you want to overwrite existing snippets
 
-// Additionally, we also have to update the interact-rs snippets manually to add relative paths:
+// Additionally, we also have to update the interactor snippets manually to add relative paths:
 // [dependencies.multiversx-sc-snippets]
 // version = "0.50.3"
 // path = "../../../../framework/snippets"
diff --git a/framework/meta-lib/src/contract/generate_snippets/snippet_crate_gen.rs b/framework/meta-lib/src/contract/generate_snippets/snippet_crate_gen.rs
index fc02e3f648..0b9d9485e1 100644
--- a/framework/meta-lib/src/contract/generate_snippets/snippet_crate_gen.rs
+++ b/framework/meta-lib/src/contract/generate_snippets/snippet_crate_gen.rs
@@ -9,9 +9,9 @@ use crate::version_history;
 static SNIPPETS_SOURCE_FILE_NAME: &str = "interactor_main.rs";
 static SC_CONFIG_PATH: &str = "../sc-config.toml";
 static FULL_PROXY_ENTRY: &str = r#"[[proxy]]
-path = "interact-rs/src/proxy.rs"
+path = "interactor/src/proxy.rs"
  "#;
-static PROXY_PATH: &str = "interact-rs/src/proxy.rs";
+static PROXY_PATH: &str = "interactor/src/proxy.rs";
 
 pub(crate) fn create_snippets_folder(snippets_folder_path: &str) {
     // returns error if folder already exists, so we ignore the result
diff --git a/framework/meta-lib/src/contract/meta_config.rs b/framework/meta-lib/src/contract/meta_config.rs
index e26a4f4e16..b69a11a16a 100644
--- a/framework/meta-lib/src/contract/meta_config.rs
+++ b/framework/meta-lib/src/contract/meta_config.rs
@@ -13,7 +13,7 @@ use super::{
 };
 
 const OUTPUT_RELATIVE_PATH: &str = "../output";
-const SNIPPETS_RELATIVE_PATH: &str = "../interact-rs";
+const SNIPPETS_RELATIVE_PATH: &str = "../interactor";
 const WASM_LIB_PATH: &str = "../wasm/src/lib.rs";
 const WASM_NO_MANAGED_EI: &str = "wasm-no-managed-ei";
 const WASM_NO_MANAGED_EI_LIB_PATH: &str = "../wasm-no-managed-ei/src/lib.rs";

From 72327d3571577196977c6e69315e9397102b47f3 Mon Sep 17 00:00:00 2001
From: Alin Cruceat <alyn_509@yahoo.com>
Date: Tue, 4 Jun 2024 10:07:43 +0300
Subject: [PATCH 0966/1254] ln alg decimals fix

---
 .../src/types/managed/wrapped/managed_decimal.rs | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/framework/base/src/types/managed/wrapped/managed_decimal.rs b/framework/base/src/types/managed/wrapped/managed_decimal.rs
index 6e06bb3cfa..290295e6f6 100644
--- a/framework/base/src/types/managed/wrapped/managed_decimal.rs
+++ b/framework/base/src/types/managed/wrapped/managed_decimal.rs
@@ -159,19 +159,19 @@ impl<M: ManagedTypeApi, D: Decimals> ManagedDecimal<M, D> {
     pub fn ln(self, decimals: D) -> ManagedDecimal<M, NumDecimals> {
         // find the highest power of 2 less than or equal to self
         let log2 = self.data.log2(); // most significant bit
-        let divisor = 1 << log2;
-        let x = self.to_big_float() / BigFloat::from(divisor); // normalize to [1.0, 2.0]
+        let divisor = BigFloat::from(1 << log2);
+        let x = self.to_big_float() / divisor; // normalize to [1.0, 2.0]
 
-        let ln_of_2 = BigFloat::from_frac(69314718i64, 1_000_000_000i64);
-        let first = BigFloat::from_frac(17417939i64, 10_000_000i64); // 1.7417939, 7 decimals
+        let ln_of_2 = BigFloat::from_frac(69314718i64, 100_000_000i64); // 0.69314718 8 decimals
+        let first = BigFloat::from_frac(-17417939i64, 10_000_000i64); // 1.7417939, 7 decimals
         let second = BigFloat::from_frac(28212026i64, 10_000_000i64); // 2.8212026, 7 decimals
-        let third = BigFloat::from_frac(14699568i64, 10_000_000i64); // 1.4699568, 7 decimals
-        let fourth = BigFloat::from_frac(44717955i64, 1_000_000_000i64); // 0.44717955, 9 decimals
-        let fifth = BigFloat::from_frac(56570851i64, 1_000_000_000i64); // 0.056570851, 9 decimals
+        let third = BigFloat::from_frac(-14699568i64, 10_000_000i64); // 1.4699568, 7 decimals
+        let fourth = BigFloat::from_frac(44717955i64, 100_000_000i64); // 0.44717955, 8 decimals
+        let fifth = BigFloat::from_frac(-56570851i64, 1_000_000_000i64); // 0.056570851, 9 decimals
 
         // approximating polynom for getting the result
         let result =
-            (((fourth - fifth * x.clone()) * x.clone() - third) * x.clone() + second) * x - first;
+            (((fourth + fifth * x.clone()) * x.clone() + third) * x.clone() + second) * x + first;
         let add_member = BigFloat::from_big_uint(&BigUint::from(log2)) * ln_of_2;
         let final_result = result + add_member;
 

From f9ea2705315583f41ef4453c8268b4dd8fb1ae6a Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Wed, 5 Jun 2024 12:35:11 +0200
Subject: [PATCH 0967/1254] test fix

---
 .../base/src/types/managed/wrapped/managed_decimal.rs     | 8 ++++----
 framework/scenario/tests/managed_decimal_test.rs          | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/framework/base/src/types/managed/wrapped/managed_decimal.rs b/framework/base/src/types/managed/wrapped/managed_decimal.rs
index 290295e6f6..df09c72f98 100644
--- a/framework/base/src/types/managed/wrapped/managed_decimal.rs
+++ b/framework/base/src/types/managed/wrapped/managed_decimal.rs
@@ -163,15 +163,15 @@ impl<M: ManagedTypeApi, D: Decimals> ManagedDecimal<M, D> {
         let x = self.to_big_float() / divisor; // normalize to [1.0, 2.0]
 
         let ln_of_2 = BigFloat::from_frac(69314718i64, 100_000_000i64); // 0.69314718 8 decimals
-        let first = BigFloat::from_frac(-17417939i64, 10_000_000i64); // 1.7417939, 7 decimals
+        let first = BigFloat::from_frac(17417939i64, 10_000_000i64); // 1.7417939, 7 decimals
         let second = BigFloat::from_frac(28212026i64, 10_000_000i64); // 2.8212026, 7 decimals
-        let third = BigFloat::from_frac(-14699568i64, 10_000_000i64); // 1.4699568, 7 decimals
+        let third = BigFloat::from_frac(14699568i64, 10_000_000i64); // 1.4699568, 7 decimals
         let fourth = BigFloat::from_frac(44717955i64, 100_000_000i64); // 0.44717955, 8 decimals
-        let fifth = BigFloat::from_frac(-56570851i64, 1_000_000_000i64); // 0.056570851, 9 decimals
+        let fifth = BigFloat::from_frac(56570851i64, 1_000_000_000i64); // 0.056570851, 9 decimals
 
         // approximating polynom for getting the result
         let result =
-            (((fourth + fifth * x.clone()) * x.clone() + third) * x.clone() + second) * x + first;
+            (((fourth - fifth * x.clone()) * x.clone() - third) * x.clone() + second) * x - first;
         let add_member = BigFloat::from_big_uint(&BigUint::from(log2)) * ln_of_2;
         let final_result = result + add_member;
 
diff --git a/framework/scenario/tests/managed_decimal_test.rs b/framework/scenario/tests/managed_decimal_test.rs
index fa4d10fcba..0c4128762d 100644
--- a/framework/scenario/tests/managed_decimal_test.rs
+++ b/framework/scenario/tests/managed_decimal_test.rs
@@ -136,7 +136,7 @@ fn test_managed_decimal_ln() {
     assert_eq!(
         ln_fixed,
         ManagedDecimal::<StaticApi, NumDecimals>::from_raw_units(
-            BigUint::from(313549421u64),
+            BigUint::from(31355146488u64),
             10usize
         )
     );

From 4cdfcb320d5f6a73e978a1817f4c3d72449c09c2 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 6 Jun 2024 15:28:12 +0300
Subject: [PATCH 0968/1254] sc 0.50.4

---
 CHANGELOG.md                                  |  4 +
 Cargo.lock                                    | 83 +++++++++----------
 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 +-
 .../Cargo.toml                                |  2 +-
 .../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     |  8 +-
 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 +-
 .../wasm-alloc-mem-fail/Cargo.toml            |  2 +-
 .../wasm-alloc-mem-leaking/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-legacy/Cargo.toml |  4 +-
 .../forwarder-legacy/meta/Cargo.toml          |  2 +-
 .../forwarder-legacy/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 +-
 .../exchange-features/Cargo.toml              |  4 +-
 .../exchange-features/meta/Cargo.toml         |  2 +-
 .../exchange-features/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 +-
 .../feature-tests/scenario-tester/Cargo.toml  |  4 +-
 .../scenario-tester/meta/Cargo.toml           |  2 +-
 .../scenario-tester/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 +-
 framework/base/Cargo.toml                     |  4 +-
 framework/derive/Cargo.toml                   |  2 +-
 framework/meta/Cargo.toml                     |  4 +-
 framework/meta/src/version_history.rs         |  3 +-
 framework/scenario/Cargo.toml                 |  6 +-
 framework/snippets/Cargo.toml                 |  4 +-
 framework/wasm-adapter/Cargo.toml             |  4 +-
 tools/mxpy-snippet-generator/Cargo.toml       |  2 +-
 tools/rust-debugger/format-tests/Cargo.toml   |  4 +-
 271 files changed, 430 insertions(+), 426 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fca5916f11..56cb8747b2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,6 +27,10 @@ They are:
 - `multiversx-sdk`, in short `sdk`, allows communication with the chain(s), 1 crate.
 
 
+## [sc 0.50.4] - 2024-06-06
+- Compiler version requirement (1.78).
+- Minor imports fix.
+
 ## [sc 0.50.3] - 2024-05-25
 - Dependency update and fix. There was an issue with the `zip` dependency in sc-meta.
 
diff --git a/Cargo.lock b/Cargo.lock
index 23fb4402a9..d3a7f23f04 100755
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -47,9 +47,9 @@ dependencies = [
 
 [[package]]
 name = "addr2line"
-version = "0.21.0"
+version = "0.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
+checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678"
 dependencies = [
  "gimli",
 ]
@@ -130,9 +130,9 @@ dependencies = [
 
 [[package]]
 name = "anstyle-query"
-version = "1.0.3"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a64c907d4e79225ac72e2a354c9ce84d50ebb4586dee56c82b3ee73004f537f5"
+checksum = "ad186efb764318d35165f1758e7dcef3b10628e26d41a44bc5550652e6804391"
 dependencies = [
  "windows-sys 0.52.0",
 ]
@@ -182,9 +182,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "backtrace"
-version = "0.3.71"
+version = "0.3.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d"
+checksum = "17c6a35df3749d2e8bb1b7b21a976d82b15548788d2735b9d82f329268f71a11"
 dependencies = [
  "addr2line",
  "cc",
@@ -1286,9 +1286,9 @@ dependencies = [
 
 [[package]]
 name = "gimli"
-version = "0.28.1"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
+checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd"
 
 [[package]]
 name = "globset"
@@ -1449,9 +1449,9 @@ dependencies = [
 
 [[package]]
 name = "hyper-util"
-version = "0.1.4"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d8d52be92d09acc2e01dddb7fde3ad983fc6489c7db4837e605bc3fca4cb63e"
+checksum = "7b875924a60b96e5d7b9ae7b066540b1dd1cbd90d1828f54c92e02a283351c56"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -1904,7 +1904,7 @@ checksum = "b59072fa0624b55ae5ae3fa6bfa91515bbeb4ac440214bc4a509e2c8806d6e9f"
 
 [[package]]
 name = "multiversx-price-aggregator-sc"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "arrayvec",
  "getrandom 0.2.15",
@@ -1925,7 +1925,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "bitflags 2.5.0",
  "hex-literal",
@@ -1957,7 +1957,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -1968,7 +1968,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-meta"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "clap",
  "colored",
@@ -1994,14 +1994,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-scenario"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "base64",
  "bech32",
@@ -2028,7 +2028,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-snippets"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "base64",
  "env_logger",
@@ -2042,7 +2042,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]
@@ -2073,7 +2073,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-wegld-swap-sc"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
  "multiversx-sc-modules",
@@ -2102,11 +2102,10 @@ dependencies = [
 
 [[package]]
 name = "native-tls"
-version = "0.2.11"
+version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e"
+checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466"
 dependencies = [
- "lazy_static",
  "libc",
  "log",
  "openssl",
@@ -2216,9 +2215,9 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.32.2"
+version = "0.35.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441"
+checksum = "b8ec7ab813848ba4522158d5517a6093db1ded27575b070f4177b8d12b41db5e"
 dependencies = [
  "memchr",
 ]
@@ -3006,18 +3005,18 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.202"
+version = "1.0.203"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "226b61a0d411b2ba5ff6d7f73a476ac4f8bb900373459cd00fab8512828ba395"
+checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.202"
+version = "1.0.203"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6048858004bcff69094cd972ed40a32500f153bd3be9f716b2eed2e8217c4838"
+checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3313,9 +3312,9 @@ dependencies = [
 
 [[package]]
 name = "tokio"
-version = "1.37.0"
+version = "1.38.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787"
+checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a"
 dependencies = [
  "backtrace",
  "bytes",
@@ -3332,9 +3331,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-macros"
-version = "2.2.0"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
+checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3366,9 +3365,9 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.8.13"
+version = "0.8.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4e43f8cc456c9704c851ae29c67e17ef65d2c30017c17a9765b89c382dc8bba"
+checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335"
 dependencies = [
  "indexmap",
  "serde",
@@ -3388,9 +3387,9 @@ dependencies = [
 
 [[package]]
 name = "toml_edit"
-version = "0.22.13"
+version = "0.22.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c127785850e8c20836d49732ae6abfa47616e60bf9d9f57c43c250361a9db96c"
+checksum = "f21c7aaf97f1bd9ca9d4f9e73b0a6c74bd5afef56f2bc931943a6e1c37e04e38"
 dependencies = [
  "indexmap",
  "serde",
@@ -3869,9 +3868,9 @@ checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0"
 
 [[package]]
 name = "winnow"
-version = "0.6.8"
+version = "0.6.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3c52e9c97a68071b23e836c9380edae937f17b9c4667bd021973efc689f618d"
+checksum = "56c52728401e1dc672a56e81e593e912aa54c78f40246869f78359a2bf24d29d"
 dependencies = [
  "memchr",
 ]
@@ -3908,9 +3907,9 @@ dependencies = [
 
 [[package]]
 name = "zeroize"
-version = "1.7.0"
+version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d"
+checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
 dependencies = [
  "zeroize_derive",
 ]
@@ -3928,9 +3927,9 @@ dependencies = [
 
 [[package]]
 name = "zip"
-version = "2.1.0"
+version = "2.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2568cd0f20e86cd9a7349fe05178f7bd22f22724678448ae5a9bac266df2689"
+checksum = "775a2b471036342aa69bc5a602bc889cb0a06cda00477d0c69566757d5553d39"
 dependencies = [
  "arbitrary",
  "crc32fast",
diff --git a/contracts/benchmarks/large-storage/Cargo.toml b/contracts/benchmarks/large-storage/Cargo.toml
index cf214259d5..a438b3e230 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.50.3"
+version = "0.50.4"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../framework/scenario"
diff --git a/contracts/benchmarks/large-storage/meta/Cargo.toml b/contracts/benchmarks/large-storage/meta/Cargo.toml
index cb6927c664..9bae2efa6a 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.50.3"
+version = "0.50.4"
 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 be44a1813e..a6ddfb6c17 100644
--- a/contracts/benchmarks/large-storage/wasm/Cargo.toml
+++ b/contracts/benchmarks/large-storage/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/mappers/benchmark-common/Cargo.toml b/contracts/benchmarks/mappers/benchmark-common/Cargo.toml
index b912617531..2cd7ae18ef 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.50.3"
+version = "0.50.4"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../../framework/scenario"
diff --git a/contracts/benchmarks/mappers/linked-list-repeat/Cargo.toml b/contracts/benchmarks/mappers/linked-list-repeat/Cargo.toml
index 087afd185e..1ad4f86d71 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.50.3"
+version = "0.50.4"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.3"
+version = "0.50.4"
 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 d79fe04af4..944b3ec0d2 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.50.3"
+version = "0.50.4"
 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 57ac205ace..92618b541f 100644
--- a/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/mappers/map-repeat/Cargo.toml b/contracts/benchmarks/mappers/map-repeat/Cargo.toml
index ecad093dd8..818d94f93b 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.50.3"
+version = "0.50.4"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../../framework/scenario"
diff --git a/contracts/benchmarks/mappers/map-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/map-repeat/meta/Cargo.toml
index e229b431a8..76ea0598d9 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.50.3"
+version = "0.50.4"
 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 377de005ec..6a5fb91832 100644
--- a/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/mappers/queue-repeat/Cargo.toml b/contracts/benchmarks/mappers/queue-repeat/Cargo.toml
index a1b4a04418..76aef59075 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.50.3"
+version = "0.50.4"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../../framework/scenario"
diff --git a/contracts/benchmarks/mappers/queue-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/queue-repeat/meta/Cargo.toml
index aa48694147..aaaf91bbdb 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.50.3"
+version = "0.50.4"
 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 9bea063fa5..91ef66ad0d 100644
--- a/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/mappers/set-repeat/Cargo.toml b/contracts/benchmarks/mappers/set-repeat/Cargo.toml
index e605ddc5be..c11a84a800 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.50.3"
+version = "0.50.4"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../../framework/scenario"
diff --git a/contracts/benchmarks/mappers/set-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/set-repeat/meta/Cargo.toml
index 64dec3d8e3..d72b5ff661 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.50.3"
+version = "0.50.4"
 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 4bd27ae74a..0a7be452b3 100644
--- a/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.3"
+version = "0.50.4"
 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 f61040bdf7..c28263956f 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.50.3"
+version = "0.50.4"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.3"
+version = "0.50.4"
 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 8e8cc8c0d3..9c345e0fb5 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.50.3"
+version = "0.50.4"
 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 9f42c4a6b8..b7a3d37098 100644
--- a/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/mappers/vec-repeat/Cargo.toml b/contracts/benchmarks/mappers/vec-repeat/Cargo.toml
index 37818e8a22..4299883a96 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.50.3"
+version = "0.50.4"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../../framework/scenario"
diff --git a/contracts/benchmarks/mappers/vec-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/vec-repeat/meta/Cargo.toml
index dfb197667d..5b65b1cf77 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.50.3"
+version = "0.50.4"
 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 5b21c4fb5c..835d1c29d7 100644
--- a/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/send-tx-repeat/Cargo.toml b/contracts/benchmarks/send-tx-repeat/Cargo.toml
index b32e5ba27a..e7069f7b0a 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.50.3"
+version = "0.50.4"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../framework/scenario"
diff --git a/contracts/benchmarks/send-tx-repeat/meta/Cargo.toml b/contracts/benchmarks/send-tx-repeat/meta/Cargo.toml
index b2994c7fa3..7db0a7cee5 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.50.3"
+version = "0.50.4"
 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 f02b983c3d..caae310174 100644
--- a/contracts/benchmarks/send-tx-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/send-tx-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/str-repeat/Cargo.toml b/contracts/benchmarks/str-repeat/Cargo.toml
index 52f8e11c18..c5a6913090 100644
--- a/contracts/benchmarks/str-repeat/Cargo.toml
+++ b/contracts/benchmarks/str-repeat/Cargo.toml
@@ -12,10 +12,10 @@ path = "src/str_repeat.rs"
 managed-buffer-builder-cached = ["multiversx-sc/managed-buffer-builder-cached"]
 
 [dependencies.multiversx-sc]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../framework/scenario"
diff --git a/contracts/benchmarks/str-repeat/meta/Cargo.toml b/contracts/benchmarks/str-repeat/meta/Cargo.toml
index a542954366..4bbfc0f373 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.50.3"
+version = "0.50.4"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.toml b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.toml
index 042b268ad4..86f96d3351 100644
--- a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.toml
+++ b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.toml b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.toml
index 9fdf4a5630..e73da84b5d 100644
--- a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.toml
+++ b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.toml
@@ -29,7 +29,7 @@ path = ".."
 features = ["managed-buffer-builder-cached"]
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/str-repeat/wasm/Cargo.toml b/contracts/benchmarks/str-repeat/wasm/Cargo.toml
index 892c42065e..1706b7dd1d 100644
--- a/contracts/benchmarks/str-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/str-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/core/price-aggregator/Cargo.toml b/contracts/core/price-aggregator/Cargo.toml
index e90571b170..341b043e12 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.50.3"
+version = "0.50.4"
 authors = [
     "Claudiu-Marcel Bruda <claudiu.bruda@multiversx.com>",
     "MultiversX <contact@multiversx.com>",
@@ -19,15 +19,15 @@ edition = "2021"
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../framework/scenario"
 
 [dependencies]
diff --git a/contracts/core/price-aggregator/meta/Cargo.toml b/contracts/core/price-aggregator/meta/Cargo.toml
index 3a7b67ebd7..d0f5edebad 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.50.3"
+version = "0.50.4"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.50.3"
+version = "0.50.4"
 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 115fc66661..dd7a9c841f 100644
--- a/contracts/core/price-aggregator/wasm/Cargo.toml
+++ b/contracts/core/price-aggregator/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/core/wegld-swap/Cargo.toml b/contracts/core/wegld-swap/Cargo.toml
index 458f7b19e2..b9be98a4e2 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.50.3"
+version = "0.50.4"
 
 authors = [
     "Dorin Iancu <dorin.iancu@multiversx.com>",
@@ -20,13 +20,13 @@ edition = "2021"
 path = "src/wegld.rs"
 
 [dependencies.multiversx-sc]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../framework/scenario"
diff --git a/contracts/core/wegld-swap/meta/Cargo.toml b/contracts/core/wegld-swap/meta/Cargo.toml
index 25c19fb675..6436eb1e24 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.50.3"
+version = "0.50.4"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.50.3"
+version = "0.50.4"
 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 edc984e5ea..5109b9988f 100644
--- a/contracts/core/wegld-swap/wasm/Cargo.toml
+++ b/contracts/core/wegld-swap/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/adder/Cargo.toml b/contracts/examples/adder/Cargo.toml
index f95bfef533..142fc32609 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.50.3"
+version = "0.50.4"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/adder/interact/Cargo.toml b/contracts/examples/adder/interact/Cargo.toml
index a8ba1a8577..dedfbb4a18 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.50.3"
+version = "0.50.4"
 path = "../../../../framework/snippets"
diff --git a/contracts/examples/adder/meta/Cargo.toml b/contracts/examples/adder/meta/Cargo.toml
index 7ccbfc2235..be7a5a093c 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.50.3"
+version = "0.50.4"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/examples/adder/wasm/Cargo.toml b/contracts/examples/adder/wasm/Cargo.toml
index 2ca9584c8b..465698e0aa 100644
--- a/contracts/examples/adder/wasm/Cargo.toml
+++ b/contracts/examples/adder/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/bonding-curve-contract/Cargo.toml b/contracts/examples/bonding-curve-contract/Cargo.toml
index 52578184f5..7c3ebbe29f 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.50.3"
+version = "0.50.4"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../framework/scenario"
 
diff --git a/contracts/examples/bonding-curve-contract/meta/Cargo.toml b/contracts/examples/bonding-curve-contract/meta/Cargo.toml
index 5eeb79e4f4..5e5581e415 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.50.3"
+version = "0.50.4"
 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 b0da11ce01..77f5b27c85 100644
--- a/contracts/examples/bonding-curve-contract/wasm/Cargo.toml
+++ b/contracts/examples/bonding-curve-contract/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/check-pause/Cargo.toml b/contracts/examples/check-pause/Cargo.toml
index 1a2334ea09..43e66382e7 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.50.3"
+version = "0.50.4"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../framework/scenario"
 
diff --git a/contracts/examples/check-pause/meta/Cargo.toml b/contracts/examples/check-pause/meta/Cargo.toml
index 84f5718962..c87e1a2b7b 100644
--- a/contracts/examples/check-pause/meta/Cargo.toml
+++ b/contracts/examples/check-pause/meta/Cargo.toml
@@ -9,6 +9,6 @@ authors = ["Alin Cruceat <alin.cruceat@multiversx.com>"]
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.50.3"
+version = "0.50.4"
 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 941fc29f67..aee45b8d33 100644
--- a/contracts/examples/check-pause/wasm/Cargo.toml
+++ b/contracts/examples/check-pause/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/crowdfunding-esdt/Cargo.toml b/contracts/examples/crowdfunding-esdt/Cargo.toml
index 51ab699206..9bdcaaf588 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.50.3"
+version = "0.50.4"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../framework/scenario"
 
 [dev-dependencies]
diff --git a/contracts/examples/crowdfunding-esdt/meta/Cargo.toml b/contracts/examples/crowdfunding-esdt/meta/Cargo.toml
index d169b02e56..a994e690c7 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.50.3"
+version = "0.50.4"
 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 fc9eedb465..4c30119726 100644
--- a/contracts/examples/crowdfunding-esdt/wasm/Cargo.toml
+++ b/contracts/examples/crowdfunding-esdt/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/crypto-bubbles/Cargo.toml b/contracts/examples/crypto-bubbles/Cargo.toml
index 5fbe867d85..d8de97487c 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.50.3"
+version = "0.50.4"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/crypto-bubbles/meta/Cargo.toml b/contracts/examples/crypto-bubbles/meta/Cargo.toml
index 0c89065fab..35c3f6f036 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.50.3"
+version = "0.50.4"
 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 451f424304..37eea22908 100644
--- a/contracts/examples/crypto-bubbles/wasm/Cargo.toml
+++ b/contracts/examples/crypto-bubbles/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.3"
+version = "0.50.4"
 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 5508f1bedc..9c1a455387 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.50.3"
+version = "0.50.4"
 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 1ae1c308f7..ec89abb4a8 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.50.3"
+version = "0.50.4"
 path = "../../../../../framework/base"
diff --git a/contracts/examples/crypto-kitties/kitty-auction/Cargo.toml b/contracts/examples/crypto-kitties/kitty-auction/Cargo.toml
index f71784afd8..899e3e9f61 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.50.3"
+version = "0.50.4"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.3"
+version = "0.50.4"
 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 907017a8c6..0b7b73ce87 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.50.3"
+version = "0.50.4"
 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 d177d0dd77..595e5fca76 100644
--- a/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.toml
+++ b/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.3"
+version = "0.50.4"
 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 ffdbd89068..120a15c446 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.50.3"
+version = "0.50.4"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.3"
+version = "0.50.4"
 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 ffc0ed059d..537dd987ef 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.50.3"
+version = "0.50.4"
 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 0579218716..865371e22a 100644
--- a/contracts/examples/crypto-kitties/kitty-genetic-alg/wasm/Cargo.toml
+++ b/contracts/examples/crypto-kitties/kitty-genetic-alg/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.3"
+version = "0.50.4"
 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 99c37e0334..90bf513862 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.50.3"
+version = "0.50.4"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.3"
+version = "0.50.4"
 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 d4a9dafff3..9dfa1ff5ab 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.50.3"
+version = "0.50.4"
 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 c84fc452ff..614482edd7 100644
--- a/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.toml
+++ b/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/crypto-zombies/Cargo.toml b/contracts/examples/crypto-zombies/Cargo.toml
index 9914391892..ba54d73abd 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.50.3"
+version = "0.50.4"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/crypto-zombies/meta/Cargo.toml b/contracts/examples/crypto-zombies/meta/Cargo.toml
index 5aafb98042..26a2c8f857 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.50.3"
+version = "0.50.4"
 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 5afd6abf09..1d65301f24 100644
--- a/contracts/examples/crypto-zombies/wasm/Cargo.toml
+++ b/contracts/examples/crypto-zombies/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/digital-cash/Cargo.toml b/contracts/examples/digital-cash/Cargo.toml
index aa8c6a03c6..368eabd925 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.50.3"
+version = "0.50.4"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/digital-cash/meta/Cargo.toml b/contracts/examples/digital-cash/meta/Cargo.toml
index 19f8f49b4c..5bb46c1ae6 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.50.3"
+version = "0.50.4"
 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 2d51de2b43..3a723f04a1 100644
--- a/contracts/examples/digital-cash/wasm/Cargo.toml
+++ b/contracts/examples/digital-cash/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/empty/Cargo.toml b/contracts/examples/empty/Cargo.toml
index 03eeadd1d2..f5eeaf67fd 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.50.3"
+version = "0.50.4"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../framework/scenario"
 
 [dev-dependencies]
diff --git a/contracts/examples/empty/meta/Cargo.toml b/contracts/examples/empty/meta/Cargo.toml
index cd3af23194..8ccc67a3a9 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.50.3"
+version = "0.50.4"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/examples/empty/wasm/Cargo.toml b/contracts/examples/empty/wasm/Cargo.toml
index 5f50f9dbf8..b78cd4d57d 100644
--- a/contracts/examples/empty/wasm/Cargo.toml
+++ b/contracts/examples/empty/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.3"
+version = "0.50.4"
 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 f15ee18079..edc06c11f5 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.50.3"
+version = "0.50.4"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.3"
+version = "0.50.4"
 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 0d33614504..cd8cd69832 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.50.3"
+version = "0.50.4"
 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 7c44a7328f..fc62669732 100644
--- a/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.toml
+++ b/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/factorial/Cargo.toml b/contracts/examples/factorial/Cargo.toml
index 9ebbe153e3..2e2ed7159f 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.50.3"
+version = "0.50.4"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/factorial/meta/Cargo.toml b/contracts/examples/factorial/meta/Cargo.toml
index d99b96bfde..b87f0de50d 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.50.3"
+version = "0.50.4"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/examples/factorial/wasm/Cargo.toml b/contracts/examples/factorial/wasm/Cargo.toml
index 497fe648d4..a374611642 100644
--- a/contracts/examples/factorial/wasm/Cargo.toml
+++ b/contracts/examples/factorial/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/fractional-nfts/Cargo.toml b/contracts/examples/fractional-nfts/Cargo.toml
index 4950e5405c..ad182123c7 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.50.3"
+version = "0.50.4"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/fractional-nfts/meta/Cargo.toml b/contracts/examples/fractional-nfts/meta/Cargo.toml
index d99acbe31d..d173ffff7f 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.50.3"
+version = "0.50.4"
 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 387fcc7ee4..556c7df822 100644
--- a/contracts/examples/fractional-nfts/wasm/Cargo.toml
+++ b/contracts/examples/fractional-nfts/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/lottery-esdt/Cargo.toml b/contracts/examples/lottery-esdt/Cargo.toml
index a54808e6ca..5d6df02def 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.50.3"
+version = "0.50.4"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/lottery-esdt/meta/Cargo.toml b/contracts/examples/lottery-esdt/meta/Cargo.toml
index 49563e9eff..8d9c8a8787 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.50.3"
+version = "0.50.4"
 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 543adef193..d1b158520a 100644
--- a/contracts/examples/lottery-esdt/wasm/Cargo.toml
+++ b/contracts/examples/lottery-esdt/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/multisig/Cargo.toml b/contracts/examples/multisig/Cargo.toml
index f3b84f9529..2d91c741fe 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.50.3"
+version = "0.50.4"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../framework/scenario"
 
 [dev-dependencies.adder]
@@ -27,7 +27,7 @@ path = "../adder"
 path = "../factorial"
 
 [dev-dependencies.multiversx-wegld-swap-sc]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../core/wegld-swap"
 
 [dev-dependencies]
diff --git a/contracts/examples/multisig/interact/Cargo.toml b/contracts/examples/multisig/interact/Cargo.toml
index 44c63436bc..fa44680c16 100644
--- a/contracts/examples/multisig/interact/Cargo.toml
+++ b/contracts/examples/multisig/interact/Cargo.toml
@@ -18,17 +18,17 @@ toml = "0.8.6"
 path = ".."
 
 [dependencies.multiversx-sc-modules]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../../contracts/modules"
 
 [dependencies.multiversx-sc-snippets]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../../framework/snippets"
 
 [dependencies.multiversx-sc-scenario]
-version = "=0.50.3"
+version = "=0.50.4"
 path = "../../../../framework/scenario"
 
 [dependencies.multiversx-sc]
-version = "=0.50.3"
+version = "=0.50.4"
 path = "../../../../framework/base"
diff --git a/contracts/examples/multisig/meta/Cargo.toml b/contracts/examples/multisig/meta/Cargo.toml
index 802117ccb1..9b6056d833 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.50.3"
+version = "0.50.4"
 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 eaa6458c9a..752306f96a 100644
--- a/contracts/examples/multisig/wasm-multisig-full/Cargo.toml
+++ b/contracts/examples/multisig/wasm-multisig-full/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.3"
+version = "0.50.4"
 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 5adc37f1d0..468f48c100 100644
--- a/contracts/examples/multisig/wasm-multisig-view/Cargo.toml
+++ b/contracts/examples/multisig/wasm-multisig-view/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/multisig/wasm/Cargo.toml b/contracts/examples/multisig/wasm/Cargo.toml
index 0b48d9b3a0..3d4e8cfd77 100644
--- a/contracts/examples/multisig/wasm/Cargo.toml
+++ b/contracts/examples/multisig/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/nft-minter/Cargo.toml b/contracts/examples/nft-minter/Cargo.toml
index e7d4b14ceb..62554ef450 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.50.3"
+version = "0.50.4"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/nft-minter/meta/Cargo.toml b/contracts/examples/nft-minter/meta/Cargo.toml
index b415b035e7..8985d3ad74 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.50.3"
+version = "0.50.4"
 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 d6e60df991..5965c90678 100644
--- a/contracts/examples/nft-minter/wasm/Cargo.toml
+++ b/contracts/examples/nft-minter/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/nft-storage-prepay/Cargo.toml b/contracts/examples/nft-storage-prepay/Cargo.toml
index 4777f46e2a..47fd92d064 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.50.3"
+version = "0.50.4"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/nft-storage-prepay/meta/Cargo.toml b/contracts/examples/nft-storage-prepay/meta/Cargo.toml
index 7bf64b93db..037c34da0b 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.50.3"
+version = "0.50.4"
 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 11c08b1fa7..5a0980418f 100644
--- a/contracts/examples/nft-storage-prepay/wasm/Cargo.toml
+++ b/contracts/examples/nft-storage-prepay/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/nft-subscription/Cargo.toml b/contracts/examples/nft-subscription/Cargo.toml
index 797f618a9f..da38fe3b12 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.50.3"
+version = "0.50.4"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/nft-subscription/meta/Cargo.toml b/contracts/examples/nft-subscription/meta/Cargo.toml
index 0f505d5751..6155e72f87 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.50.3"
+version = "0.50.4"
 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 f5fe109489..241598652b 100644
--- a/contracts/examples/nft-subscription/wasm/Cargo.toml
+++ b/contracts/examples/nft-subscription/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/order-book/factory/Cargo.toml b/contracts/examples/order-book/factory/Cargo.toml
index e77701abd6..09c8822929 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.50.3"
+version = "0.50.4"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../../framework/scenario"
 
diff --git a/contracts/examples/order-book/factory/meta/Cargo.toml b/contracts/examples/order-book/factory/meta/Cargo.toml
index 8644069281..17a91ae211 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.50.3"
+version = "0.50.4"
 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 78f1e1d508..051ebf3dec 100644
--- a/contracts/examples/order-book/factory/wasm/Cargo.toml
+++ b/contracts/examples/order-book/factory/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/order-book/pair/Cargo.toml b/contracts/examples/order-book/pair/Cargo.toml
index f416341dc0..1cc04ce186 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.50.3"
+version = "0.50.4"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../../framework/scenario"
diff --git a/contracts/examples/order-book/pair/meta/Cargo.toml b/contracts/examples/order-book/pair/meta/Cargo.toml
index e5478f1371..2874d843c4 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.50.3"
+version = "0.50.4"
 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 3d4b6ded0e..911d081092 100644
--- a/contracts/examples/order-book/pair/wasm/Cargo.toml
+++ b/contracts/examples/order-book/pair/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/ping-pong-egld/Cargo.toml b/contracts/examples/ping-pong-egld/Cargo.toml
index 31417a1261..2a00d65f96 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.50.3"
+version = "0.50.4"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../framework/scenario"
 
diff --git a/contracts/examples/ping-pong-egld/meta/Cargo.toml b/contracts/examples/ping-pong-egld/meta/Cargo.toml
index 17bdc63bf0..87eca647d0 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.50.3"
+version = "0.50.4"
 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 dcd7f18362..e101042e4d 100644
--- a/contracts/examples/ping-pong-egld/wasm/Cargo.toml
+++ b/contracts/examples/ping-pong-egld/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/proxy-pause/Cargo.toml b/contracts/examples/proxy-pause/Cargo.toml
index 68c8785786..b042d1273a 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.50.3"
+version = "0.50.4"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.3"
+version = "0.50.4"
 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 cf63a07410..eb28ab2c04 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.50.3"
+version = "0.50.4"
 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 2642fa32a2..88e4421510 100644
--- a/contracts/examples/proxy-pause/wasm/Cargo.toml
+++ b/contracts/examples/proxy-pause/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/rewards-distribution/Cargo.toml b/contracts/examples/rewards-distribution/Cargo.toml
index 3eb643c711..d861be61fd 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.50.3"
+version = "0.50.4"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/rewards-distribution/meta/Cargo.toml b/contracts/examples/rewards-distribution/meta/Cargo.toml
index 7f37104231..30027df147 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 <claudiu.bruda@multiversx.com>"]
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.50.3"
+version = "0.50.4"
 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 33b39a2c69..ed1eab029d 100644
--- a/contracts/examples/rewards-distribution/wasm/Cargo.toml
+++ b/contracts/examples/rewards-distribution/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/seed-nft-minter/Cargo.toml b/contracts/examples/seed-nft-minter/Cargo.toml
index 68a01761c4..86e17d137d 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.50.3"
+version = "0.50.4"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/seed-nft-minter/meta/Cargo.toml b/contracts/examples/seed-nft-minter/meta/Cargo.toml
index 070b77053a..f76f1ddfba 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 <claudiu.bruda@multiversx.com>"]
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.50.3"
+version = "0.50.4"
 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 3b76bf97e4..9b1f5fcf62 100644
--- a/contracts/examples/seed-nft-minter/wasm/Cargo.toml
+++ b/contracts/examples/seed-nft-minter/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/token-release/Cargo.toml b/contracts/examples/token-release/Cargo.toml
index 1cf88eb1e3..b2ce9c4716 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.50.3"
+version = "0.50.4"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../framework/scenario"
 
diff --git a/contracts/examples/token-release/meta/Cargo.toml b/contracts/examples/token-release/meta/Cargo.toml
index d0ae6ad19c..4f14d0b51c 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.50.3"
+version = "0.50.4"
 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 2a6ee31f04..70964e19f4 100644
--- a/contracts/examples/token-release/wasm/Cargo.toml
+++ b/contracts/examples/token-release/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/abi-tester/Cargo.toml b/contracts/feature-tests/abi-tester/Cargo.toml
index 29c5e03690..9d55d2bd0e 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.50.3"
+version = "0.50.4"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../framework/scenario"
 
 [dev-dependencies.multiversx-sc-meta]
-version = "0.50.3"
+version = "0.50.4"
 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 bfa2e266fb..52fb9f65c9 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.50.3"
+            "version": "0.50.4"
         }
     },
     "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 db14610738..262d4dc18f 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.50.3"
+            "version": "0.50.4"
         }
     },
     "docs": [
diff --git a/contracts/feature-tests/abi-tester/meta/Cargo.toml b/contracts/feature-tests/abi-tester/meta/Cargo.toml
index c5268926ac..5cf6cca278 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.50.3"
+version = "0.50.4"
 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 d7ac6245da..3b1718b92c 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.3"
+version = "0.50.4"
 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 074956883f..50283593aa 100644
--- a/contracts/feature-tests/abi-tester/wasm/Cargo.toml
+++ b/contracts/feature-tests/abi-tester/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/alloc-features/Cargo.toml b/contracts/feature-tests/alloc-features/Cargo.toml
index 0a892d5458..86fc7e1021 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.50.3"
+version = "0.50.4"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.3"
+version = "0.50.4"
 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 35b6fd942c..1cf78109d1 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.50.3"
+version = "0.50.4"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml
index 29e5037e2e..5a67cc39cd 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml
index 90d20b5f2b..be4aad4977 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/alloc-features/wasm/Cargo.toml b/contracts/feature-tests/alloc-features/wasm/Cargo.toml
index b1f92d6082..608a244aeb 100644
--- a/contracts/feature-tests/alloc-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/alloc-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/basic-features/Cargo.toml b/contracts/feature-tests/basic-features/Cargo.toml
index 5ce96ac53b..f42c86a39b 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.50.3"
+version = "0.50.4"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../framework/scenario"
 
 [dependencies.multiversx-sc-modules]
-version = "0.50.3"
+version = "0.50.4"
 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 ca15ae386e..e666e6f3cc 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.50.3"
+version = "0.50.4"
 path = "../../../../framework/snippets"
diff --git a/contracts/feature-tests/basic-features/meta/Cargo.toml b/contracts/feature-tests/basic-features/meta/Cargo.toml
index 69069e1feb..086d7182cd 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.50.3"
+version = "0.50.4"
 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 9b97339220..927502e074 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.3"
+version = "0.50.4"
 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 e216d4cd5f..b638757513 100644
--- a/contracts/feature-tests/basic-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/basic-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.3"
+version = "0.50.4"
 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 4f745603da..5829e43c85 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.50.3"
+version = "0.50.4"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.3"
+version = "0.50.4"
 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 066ce2ac49..4803a224ce 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.50.3"
+version = "0.50.4"
 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 37b666405d..fedf0401f1 100644
--- a/contracts/feature-tests/big-float-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/big-float-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/Cargo.toml b/contracts/feature-tests/composability/Cargo.toml
index 33f3dfe9c4..3cfd77770f 100644
--- a/contracts/feature-tests/composability/Cargo.toml
+++ b/contracts/feature-tests/composability/Cargo.toml
@@ -36,9 +36,9 @@ path = "recursive-caller"
 path = "vault"
 
 [dependencies.multiversx-sc]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.3"
+version = "0.50.4"
 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 1e74ef58f9..e52075dfe0 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.50.3"
+version = "0.50.4"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.3"
+version = "0.50.4"
 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 2b7cd159be..6994acf1d1 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.50.3"
+version = "0.50.4"
 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 2ee4f9c664..1814db86b9 100644
--- a/contracts/feature-tests/composability/builtin-func-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/builtin-func-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.3"
+version = "0.50.4"
 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 64af863597..b420ee3085 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.50.3"
+version = "0.50.4"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.3"
+version = "0.50.4"
 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 8b0d3678a2..632920111e 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
@@ -9,10 +9,10 @@ publish = false
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.3"
+version = "0.50.4"
 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 8137ae6bc0..3e0becca68 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.50.3"
+version = "0.50.4"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.50.3"
+version = "0.50.4"
 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 f045ce6899..4da1d86a1f 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.3"
+version = "0.50.4"
 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 5456487df0..418b1335d1 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.50.3"
+version = "0.50.4"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.3"
+version = "0.50.4"
 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 31a3fc7226..088bc306d9 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.50.3"
+version = "0.50.4"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.50.3"
+version = "0.50.4"
 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 950c3a44fc..4bd8f8eb2b 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.3"
+version = "0.50.4"
 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 c374d4135d..8f27b2f3d1 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.50.3"
+version = "0.50.4"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.3"
+version = "0.50.4"
 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 0f60e6e736..5ebbda8a14 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.50.3"
+version = "0.50.4"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.3"
+version = "0.50.4"
 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 d6707df771..dbfacdc852 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.50.3"
+version = "0.50.4"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.50.3"
+version = "0.50.4"
 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 601687a269..ab76fc599c 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.3"
+version = "0.50.4"
 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 311bb0c805..fb71cc9504 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
@@ -9,10 +9,10 @@ publish = false
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.3"
+version = "0.50.4"
 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 ba9d5a9793..12379c1e28 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.50.3"
+version = "0.50.4"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.50.3"
+version = "0.50.4"
 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 b06bd997cc..99a8155cfe 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/forwarder-legacy/Cargo.toml b/contracts/feature-tests/composability/forwarder-legacy/Cargo.toml
index b4b6c5a6e7..e5a78e79ee 100644
--- a/contracts/feature-tests/composability/forwarder-legacy/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-legacy/Cargo.toml
@@ -12,10 +12,10 @@ path = "src/forwarder_legacy_main.rs"
 path = "../vault"
 
 [dependencies.multiversx-sc]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../../framework/scenario"
 
diff --git a/contracts/feature-tests/composability/forwarder-legacy/meta/Cargo.toml b/contracts/feature-tests/composability/forwarder-legacy/meta/Cargo.toml
index 5b497ee37e..4b5ee75da1 100644
--- a/contracts/feature-tests/composability/forwarder-legacy/meta/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-legacy/meta/Cargo.toml
@@ -8,6 +8,6 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../../../framework/meta"
 default-features = false
diff --git a/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.toml b/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.toml
index 8102196a6c..31688377ac 100644
--- a/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.3"
+version = "0.50.4"
 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 130bba0ff3..17db486dbf 100644
--- a/contracts/feature-tests/composability/forwarder-queue/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-queue/Cargo.toml
@@ -9,14 +9,14 @@ publish = false
 path = "src/forwarder_queue.rs"
 
 [dependencies.multiversx-sc]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../../framework/wasm-adapter"
 optional = true
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.3"
+version = "0.50.4"
 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 e69a6aa677..d1081e134a 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.50.3"
+version = "0.50.4"
 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 4b1dbfe684..1ffcb17c85 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.3"
+version = "0.50.4"
 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 f8eec572f9..eaceb3aa35 100644
--- a/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.3"
+version = "0.50.4"
 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 1f7fa6175f..8199c71774 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.50.3"
+version = "0.50.4"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.3"
+version = "0.50.4"
 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 f9f45148b9..41e4f1938e 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.50.3"
+version = "0.50.4"
 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 64009abbe1..1559acbf5a 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.3"
+version = "0.50.4"
 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 84da48195a..7fa28cfabd 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.3"
+version = "0.50.4"
 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 410780a85a..7364214f4b 100644
--- a/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/forwarder/Cargo.toml b/contracts/feature-tests/composability/forwarder/Cargo.toml
index 9eb304af96..ef190e7e73 100644
--- a/contracts/feature-tests/composability/forwarder/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder/Cargo.toml
@@ -9,10 +9,10 @@ publish = false
 path = "src/forwarder_main.rs"
 
 [dependencies.multiversx-sc]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../../framework/scenario"
 
diff --git a/contracts/feature-tests/composability/forwarder/meta/Cargo.toml b/contracts/feature-tests/composability/forwarder/meta/Cargo.toml
index 5a5595041d..d8bb6d372b 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.50.3"
+version = "0.50.4"
 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 07085abea6..cb1ccceb73 100644
--- a/contracts/feature-tests/composability/forwarder/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/interact/Cargo.toml b/contracts/feature-tests/composability/interact/Cargo.toml
index a041e0518f..d71344ef3b 100644
--- a/contracts/feature-tests/composability/interact/Cargo.toml
+++ b/contracts/feature-tests/composability/interact/Cargo.toml
@@ -15,9 +15,9 @@ serde = { version = "1.0", features = ["derive"] }
 toml = "0.8.6"
 
 [dependencies.multiversx-sc]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-snippets]
-version = "0.50.3"
+version = "0.50.4"
 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 807849bb25..3ec7772e16 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.50.3"
+version = "0.50.4"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.3"
+version = "0.50.4"
 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 b02222f23e..93911c7b6e 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.50.3"
+version = "0.50.4"
 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 581b5e7680..732585443f 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.3"
+version = "0.50.4"
 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 f0685ebcf5..68c25d9d05 100644
--- a/contracts/feature-tests/composability/promises-features/Cargo.toml
+++ b/contracts/feature-tests/composability/promises-features/Cargo.toml
@@ -9,6 +9,6 @@ publish = false
 path = "src/promises_main.rs"
 
 [dependencies.multiversx-sc]
-version = "0.50.3"
+version = "0.50.4"
 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 aa797c1d3c..fd1de478a9 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.50.3"
+version = "0.50.4"
 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 39c93eb948..d148678dfc 100644
--- a/contracts/feature-tests/composability/promises-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/promises-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.3"
+version = "0.50.4"
 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 7668df8c3a..81fad1cad2 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.50.3"
+version = "0.50.4"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.3"
+version = "0.50.4"
 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 1062f90211..f092d5fee4 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.50.3"
+version = "0.50.4"
 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 fe0ad4ff4b..7c1fcdb073 100644
--- a/contracts/feature-tests/composability/proxy-test-first/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/proxy-test-first/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.3"
+version = "0.50.4"
 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 1170efad40..624d8357e2 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.50.3"
+version = "0.50.4"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.3"
+version = "0.50.4"
 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 171b710fdb..96fef0f445 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.50.3"
+version = "0.50.4"
 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 e5ca8d1b5e..ea050a1dcc 100644
--- a/contracts/feature-tests/composability/proxy-test-second/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/proxy-test-second/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.3"
+version = "0.50.4"
 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 08adf23128..3098724c47 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.50.3"
+version = "0.50.4"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.3"
+version = "0.50.4"
 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 6e2f89277d..1ff7565437 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.50.3"
+version = "0.50.4"
 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 ca36ea3c03..ea41ab4f8e 100644
--- a/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.3"
+version = "0.50.4"
 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 76b5d3b38d..70749f0ee7 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.50.3"
+version = "0.50.4"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.3"
+version = "0.50.4"
 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 f5c57b2cdb..c3a2700c25 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.50.3"
+version = "0.50.4"
 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 b29ca05253..7aa295e47e 100644
--- a/contracts/feature-tests/composability/transfer-role-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/transfer-role-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/vault/Cargo.toml b/contracts/feature-tests/composability/vault/Cargo.toml
index f014b6234a..4fb71102ec 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.50.3"
+version = "0.50.4"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../../framework/scenario"
diff --git a/contracts/feature-tests/composability/vault/meta/Cargo.toml b/contracts/feature-tests/composability/vault/meta/Cargo.toml
index b73741d773..698816c563 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.50.3"
+version = "0.50.4"
 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 bb85ed8ea8..7985e3c2ce 100644
--- a/contracts/feature-tests/composability/vault/wasm-vault-promises/Cargo.toml
+++ b/contracts/feature-tests/composability/vault/wasm-vault-promises/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.3"
+version = "0.50.4"
 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 f82dbd235a..78aa0cecc2 100644
--- a/contracts/feature-tests/composability/vault/wasm-vault-upgrade/Cargo.toml
+++ b/contracts/feature-tests/composability/vault/wasm-vault-upgrade/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.3"
+version = "0.50.4"
 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 2b5f929dee..8e98320af2 100644
--- a/contracts/feature-tests/composability/vault/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/vault/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.3"
+version = "0.50.4"
 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 95a77618de..70859a6bff 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.50.3"
+version = "0.50.4"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.3"
+version = "0.50.4"
 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 59c8411b91..93d0c3cc43 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.50.3"
+version = "0.50.4"
 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 0a8e753e0e..0417765ea5 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.3"
+version = "0.50.4"
 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 f27a097e68..6663594783 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.50.3"
+version = "0.50.4"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.3"
+version = "0.50.4"
 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 0d24dbe880..ec07218c50 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.50.3"
+version = "0.50.4"
 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 f2b91359bc..376d245a97 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.3"
+version = "0.50.4"
 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 314a2f79dc..23a4bec8cc 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.50.3"
+version = "0.50.4"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.3"
+version = "0.50.4"
 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 584fdff0ff..e688bc7dbd 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.50.3"
+version = "0.50.4"
 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 b1b50c674d..cacee4b198 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.3"
+version = "0.50.4"
 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 59c8698391..f6900d121c 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.50.3"
+version = "0.50.4"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.3"
+version = "0.50.4"
 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 dd43493c09..dacb7febda 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.50.3"
+version = "0.50.4"
 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 e2e1a7b1d9..fd06407ea9 100644
--- a/contracts/feature-tests/erc-style-contracts/erc1155/wasm/Cargo.toml
+++ b/contracts/feature-tests/erc-style-contracts/erc1155/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.3"
+version = "0.50.4"
 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 c41b75b3e8..e4847fe84e 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.50.3"
+version = "0.50.4"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.3"
+version = "0.50.4"
 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 82b34f245a..06b1fd5180 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.50.3"
+version = "0.50.4"
 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 de00855ee5..e1e9440bbb 100644
--- a/contracts/feature-tests/erc-style-contracts/erc20/wasm/Cargo.toml
+++ b/contracts/feature-tests/erc-style-contracts/erc20/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.3"
+version = "0.50.4"
 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 62e8bf18f1..46de472582 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.50.3"
+version = "0.50.4"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.3"
+version = "0.50.4"
 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 06b516c887..71a4aa8242 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.50.3"
+version = "0.50.4"
 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 4ee3302598..31e279d4dd 100644
--- a/contracts/feature-tests/erc-style-contracts/erc721/wasm/Cargo.toml
+++ b/contracts/feature-tests/erc-style-contracts/erc721/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.3"
+version = "0.50.4"
 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 eb84590bb5..29cd9198de 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.50.3"
+version = "0.50.4"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.3"
+version = "0.50.4"
 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 ee286f9601..cba1f534db 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.50.3"
+version = "0.50.4"
 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 3e7112f299..72ac23236f 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.3"
+version = "0.50.4"
 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 ca7c0ab46f..3719eab8f5 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.50.3"
+version = "0.50.4"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.3"
+version = "0.50.4"
 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 e2dc447421..4c1e10d495 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.50.3"
+version = "0.50.4"
 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 8a315ab804..6388cdb5e9 100644
--- a/contracts/feature-tests/esdt-system-sc-mock/wasm/Cargo.toml
+++ b/contracts/feature-tests/esdt-system-sc-mock/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/exchange-features/Cargo.toml b/contracts/feature-tests/exchange-features/Cargo.toml
index 0bf9de1dfd..00a1c32504 100644
--- a/contracts/feature-tests/exchange-features/Cargo.toml
+++ b/contracts/feature-tests/exchange-features/Cargo.toml
@@ -9,9 +9,9 @@ publish = false
 path = "src/exchange_features.rs"
 
 [dependencies.multiversx-sc]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../framework/scenario"
diff --git a/contracts/feature-tests/exchange-features/meta/Cargo.toml b/contracts/feature-tests/exchange-features/meta/Cargo.toml
index 898650a4fa..b9e4c2d636 100644
--- a/contracts/feature-tests/exchange-features/meta/Cargo.toml
+++ b/contracts/feature-tests/exchange-features/meta/Cargo.toml
@@ -8,6 +8,6 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/feature-tests/exchange-features/wasm/Cargo.toml b/contracts/feature-tests/exchange-features/wasm/Cargo.toml
index 7b49749410..3d58f61397 100644
--- a/contracts/feature-tests/exchange-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/exchange-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.3"
+version = "0.50.4"
 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 0f8546be61..c4dbd64346 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.50.3"
+version = "0.50.4"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.3"
+version = "0.50.4"
 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 829c46b31d..995bed01a1 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.50.3"
+version = "0.50.4"
 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 b79ce4c245..9bdbb397b1 100644
--- a/contracts/feature-tests/formatted-message-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/formatted-message-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.3"
+version = "0.50.4"
 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 f2fe3a1764..cacc836734 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.50.3"
+version = "0.50.4"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.3"
+version = "0.50.4"
 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 5ef8defae3..d949539f8c 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.50.3"
+version = "0.50.4"
 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 1af7c7cfad..94e135348c 100644
--- a/contracts/feature-tests/managed-map-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/managed-map-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.3"
+version = "0.50.4"
 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 0e4d48e950..e5344f6fa9 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.50.3"
+version = "0.50.4"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.3"
+version = "0.50.4"
 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 e7af5102d7..885bd1549d 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.50.3"
+version = "0.50.4"
 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 9903659f00..389e3aaef0 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.3"
+version = "0.50.4"
 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 e49c0fedb8..d53987ff31 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
@@ -29,7 +29,7 @@ path = ".."
 features = ["example_feature"]
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.3"
+version = "0.50.4"
 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 44eba572c2..d96c8a598b 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.3"
+version = "0.50.4"
 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 707671421d..128ca2f968 100644
--- a/contracts/feature-tests/multi-contract-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/multi-contract-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.3"
+version = "0.50.4"
 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 57a56fc096..4f13f68900 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.50.3"
+version = "0.50.4"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.3"
+version = "0.50.4"
 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 04aaf3d8e9..fe93edb29e 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.50.3"
+version = "0.50.4"
 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 c0637702a2..61fe0cd770 100644
--- a/contracts/feature-tests/panic-message-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/panic-message-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/payable-features/Cargo.toml b/contracts/feature-tests/payable-features/Cargo.toml
index 4ff90d96c7..0b5bec27fd 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.50.3"
+version = "0.50.4"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../framework/scenario"
diff --git a/contracts/feature-tests/payable-features/meta/Cargo.toml b/contracts/feature-tests/payable-features/meta/Cargo.toml
index 716e89d80e..84578286f1 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.50.3"
+version = "0.50.4"
 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 4a0ab8c226..e89c568803 100644
--- a/contracts/feature-tests/payable-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/payable-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.3"
+version = "0.50.4"
 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 ab4a00e191..415a09f0e2 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.50.3"
+version = "0.50.4"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.3"
+version = "0.50.4"
 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 342e1f9cf9..c29bdf9785 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.50.3"
+version = "0.50.4"
 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 8866c4ff38..3b610bd655 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.50.3"
+version = "0.50.4"
 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 bc52826ecd..82e9e7d66f 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.50.3"
+// version = "0.50.4"
 // 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 20df548937..3a70845756 100644
--- a/contracts/feature-tests/rust-snippets-generator-test/wasm/Cargo.toml
+++ b/contracts/feature-tests/rust-snippets-generator-test/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.3"
+version = "0.50.4"
 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 c5ccf87a73..c13903eb36 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.50.3"
+version = "0.50.4"
 path = "../../../framework/base"
 features = [ "alloc" ]
 
@@ -17,7 +17,7 @@ path = "../../examples/adder"
 path = "../../feature-tests/basic-features"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.3"
+version = "0.50.4"
 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 e257a89a34..e1e5140b62 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.50.3"
+version = "0.50.4"
 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 0c4593999f..112fee379f 100644
--- a/contracts/feature-tests/rust-testing-framework-tester/wasm/Cargo.toml
+++ b/contracts/feature-tests/rust-testing-framework-tester/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/scenario-tester/Cargo.toml b/contracts/feature-tests/scenario-tester/Cargo.toml
index 90be88892c..677f13066a 100644
--- a/contracts/feature-tests/scenario-tester/Cargo.toml
+++ b/contracts/feature-tests/scenario-tester/Cargo.toml
@@ -9,9 +9,9 @@ publish = false
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../framework/scenario"
diff --git a/contracts/feature-tests/scenario-tester/meta/Cargo.toml b/contracts/feature-tests/scenario-tester/meta/Cargo.toml
index d1bec14b1b..83125d946f 100644
--- a/contracts/feature-tests/scenario-tester/meta/Cargo.toml
+++ b/contracts/feature-tests/scenario-tester/meta/Cargo.toml
@@ -8,6 +8,6 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/feature-tests/scenario-tester/wasm/Cargo.toml b/contracts/feature-tests/scenario-tester/wasm/Cargo.toml
index 3076ca5055..9b6499dec4 100644
--- a/contracts/feature-tests/scenario-tester/wasm/Cargo.toml
+++ b/contracts/feature-tests/scenario-tester/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/use-module/Cargo.toml b/contracts/feature-tests/use-module/Cargo.toml
index dde118d42f..ffbd53a29b 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.50.3"
+version = "0.50.4"
 path = "../../../contracts/modules"
 
 [dependencies.multiversx-sc]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../framework/scenario"
 
 [dev-dependencies.multiversx-sc-meta]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../framework/meta"
diff --git a/contracts/feature-tests/use-module/meta/Cargo.toml b/contracts/feature-tests/use-module/meta/Cargo.toml
index 334b6a0311..cc92407a9c 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.50.3"
+version = "0.50.4"
 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 4d51a10d68..db9635f70d 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.50.3"
+version = "0.50.4"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.50.3"
+version = "0.50.4"
 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 24dba15f2a..7954d95e16 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.50.3"
+            "version": "0.50.4"
         }
     },
     "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 e2da01d9a4..790b6bb396 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.50.3"
+            "version": "0.50.4"
         }
     },
     "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 92190bcc04..29a065b6e5 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.3"
+version = "0.50.4"
 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 576a6fe2e9..e5e73604fc 100644
--- a/contracts/feature-tests/use-module/wasm/Cargo.toml
+++ b/contracts/feature-tests/use-module/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/modules/Cargo.toml b/contracts/modules/Cargo.toml
index 4eea34320e..c2bcbf859f 100644
--- a/contracts/modules/Cargo.toml
+++ b/contracts/modules/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-modules"
-version = "0.50.3"
+version = "0.50.4"
 edition = "2021"
 
 authors = ["MultiversX <contact@multiversx.com>"]
@@ -17,5 +17,5 @@ categories = ["no-std", "wasm", "cryptography::cryptocurrencies"]
 alloc = ["multiversx-sc/alloc"]
 
 [dependencies.multiversx-sc]
-version = "0.50.3"
+version = "0.50.4"
 path = "../../framework/base"
diff --git a/framework/base/Cargo.toml b/framework/base/Cargo.toml
index 003b63fd53..0c7f607a23 100644
--- a/framework/base/Cargo.toml
+++ b/framework/base/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc"
-version = "0.50.3"
+version = "0.50.4"
 edition = "2021"
 rust-version = "1.78"
 
@@ -30,7 +30,7 @@ num-traits = { version = "=0.2.19", default-features = false }
 unwrap-infallible = "0.1.5"
 
 [dependencies.multiversx-sc-derive]
-version = "=0.50.3"
+version = "=0.50.4"
 path = "../derive"
 
 [dependencies.multiversx-sc-codec]
diff --git a/framework/derive/Cargo.toml b/framework/derive/Cargo.toml
index ef10f1f2fa..a8db090c4e 100644
--- a/framework/derive/Cargo.toml
+++ b/framework/derive/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-derive"
-version = "0.50.3"
+version = "0.50.4"
 edition = "2021"
 
 authors = ["Andrei Marinica <andrei.marinica@multiversx.com>", "MultiversX <contact@multiversx.com>"]
diff --git a/framework/meta/Cargo.toml b/framework/meta/Cargo.toml
index 65ce0c9295..cab504fabe 100644
--- a/framework/meta/Cargo.toml
+++ b/framework/meta/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-meta"
-version = "0.50.3"
+version = "0.50.4"
 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.50.3"
+version = "=0.50.4"
 path = "../base"
 features = ["alloc", "num-bigint"]
 
diff --git a/framework/meta/src/version_history.rs b/framework/meta/src/version_history.rs
index 5734d10a0d..4082030a68 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.50.3);
+pub const LAST_VERSION: FrameworkVersion = framework_version!(0.50.4);
 
 /// Indicates where to stop with the upgrades.
 pub const LAST_UPGRADE_VERSION: FrameworkVersion = LAST_VERSION;
@@ -73,6 +73,7 @@ pub const VERSIONS: &[FrameworkVersion] = framework_versions![
     0.50.1,
     0.50.2,
     0.50.3,
+    0.50.4,
 ];
 
 #[rustfmt::skip]
diff --git a/framework/scenario/Cargo.toml b/framework/scenario/Cargo.toml
index 21ce6f5a20..4d534fd98a 100644
--- a/framework/scenario/Cargo.toml
+++ b/framework/scenario/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-scenario"
-version = "0.50.3"
+version = "0.50.4"
 edition = "2021"
 
 authors = [
@@ -41,12 +41,12 @@ path = "src/main.rs"
 run-go-tests = []
 
 [dependencies.multiversx-sc]
-version = "=0.50.3"
+version = "=0.50.4"
 features = ["alloc", "num-bigint"]
 path = "../base"
 
 [dependencies.multiversx-sc-meta]
-version = "=0.50.3"
+version = "=0.50.4"
 path = "../meta"
 
 [dependencies.multiversx-chain-scenario-format]
diff --git a/framework/snippets/Cargo.toml b/framework/snippets/Cargo.toml
index 49961c84de..26a689e559 100644
--- a/framework/snippets/Cargo.toml
+++ b/framework/snippets/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-snippets"
-version = "0.50.3"
+version = "0.50.4"
 edition = "2021"
 
 authors = ["MultiversX <contact@multiversx.com>"]
@@ -22,7 +22,7 @@ env_logger = "0.11"
 futures = "0.3"
 
 [dependencies.multiversx-sc-scenario]
-version = "=0.50.3"
+version = "=0.50.4"
 path = "../scenario"
 
 [dependencies.multiversx-sdk]
diff --git a/framework/wasm-adapter/Cargo.toml b/framework/wasm-adapter/Cargo.toml
index e988da7a8a..c23be2e41d 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.50.3"
+version = "0.50.4"
 edition = "2021"
 
 authors = [
@@ -22,5 +22,5 @@ categories = [
 ]
 
 [dependencies.multiversx-sc]
-version = "=0.50.3"
+version = "=0.50.4"
 path = "../base"
diff --git a/tools/mxpy-snippet-generator/Cargo.toml b/tools/mxpy-snippet-generator/Cargo.toml
index 42979fd0b1..f7451e2db7 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.50.3"
+version = "0.50.4"
 path = "../../framework/base"
 
 [dependencies]
diff --git a/tools/rust-debugger/format-tests/Cargo.toml b/tools/rust-debugger/format-tests/Cargo.toml
index 611b892909..3e822b0499 100644
--- a/tools/rust-debugger/format-tests/Cargo.toml
+++ b/tools/rust-debugger/format-tests/Cargo.toml
@@ -9,11 +9,11 @@ name = "format-tests"
 path = "src/format_tests.rs"
 
 [dependencies.multiversx-sc]
-version = "=0.50.3"
+version = "=0.50.4"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-scenario]
-version = "=0.50.3"
+version = "=0.50.4"
 path = "../../../framework/scenario"
 
 [dependencies.multiversx-chain-vm]

From f015b1ba2e4b50ac832c56ee5ddc0aed874cb4c3 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 6 Jun 2024 15:33:17 +0300
Subject: [PATCH 0969/1254] Cargo.lock update

---
 contracts/benchmarks/large-storage/wasm/Cargo.lock     |  6 +++---
 .../mappers/linked-list-repeat/wasm/Cargo.lock         |  6 +++---
 .../benchmarks/mappers/map-repeat/wasm/Cargo.lock      |  6 +++---
 .../benchmarks/mappers/queue-repeat/wasm/Cargo.lock    |  6 +++---
 .../benchmarks/mappers/set-repeat/wasm/Cargo.lock      |  6 +++---
 .../mappers/single-value-repeat/wasm/Cargo.lock        |  6 +++---
 .../benchmarks/mappers/vec-repeat/wasm/Cargo.lock      |  6 +++---
 contracts/benchmarks/send-tx-repeat/wasm/Cargo.lock    |  6 +++---
 .../wasm-str-repeat-mb-builder-basic/Cargo.lock        |  6 +++---
 .../wasm-str-repeat-mb-builder-cached/Cargo.lock       |  6 +++---
 contracts/benchmarks/str-repeat/wasm/Cargo.lock        |  6 +++---
 contracts/core/price-aggregator/wasm/Cargo.lock        | 10 +++++-----
 contracts/examples/adder/wasm/Cargo.lock               |  6 +++---
 .../examples/bonding-curve-contract/wasm/Cargo.lock    |  8 ++++----
 contracts/examples/check-pause/wasm/Cargo.lock         |  8 ++++----
 contracts/examples/crowdfunding-esdt/wasm/Cargo.lock   |  6 +++---
 contracts/examples/crypto-bubbles/wasm/Cargo.lock      |  6 +++---
 .../crypto-kitties/kitty-auction/wasm/Cargo.lock       |  6 +++---
 .../crypto-kitties/kitty-genetic-alg/wasm/Cargo.lock   |  6 +++---
 .../crypto-kitties/kitty-ownership/wasm/Cargo.lock     |  6 +++---
 contracts/examples/crypto-zombies/wasm/Cargo.lock      |  6 +++---
 contracts/examples/digital-cash/wasm/Cargo.lock        |  6 +++---
 contracts/examples/empty/wasm/Cargo.lock               |  6 +++---
 .../examples/esdt-transfer-with-fee/wasm/Cargo.lock    |  6 +++---
 contracts/examples/factorial/wasm/Cargo.lock           |  6 +++---
 contracts/examples/fractional-nfts/wasm/Cargo.lock     |  8 ++++----
 contracts/examples/lottery-esdt/wasm/Cargo.lock        |  6 +++---
 .../examples/multisig/wasm-multisig-full/Cargo.lock    |  8 ++++----
 .../examples/multisig/wasm-multisig-view/Cargo.lock    |  8 ++++----
 contracts/examples/multisig/wasm/Cargo.lock            |  8 ++++----
 contracts/examples/nft-minter/wasm/Cargo.lock          |  6 +++---
 contracts/examples/nft-storage-prepay/wasm/Cargo.lock  |  6 +++---
 contracts/examples/nft-subscription/wasm/Cargo.lock    |  8 ++++----
 contracts/examples/order-book/factory/wasm/Cargo.lock  |  6 +++---
 contracts/examples/order-book/pair/wasm/Cargo.lock     |  6 +++---
 contracts/examples/ping-pong-egld/wasm/Cargo.lock      |  6 +++---
 contracts/examples/proxy-pause/wasm/Cargo.lock         |  6 +++---
 .../examples/rewards-distribution/wasm/Cargo.lock      |  8 ++++----
 contracts/examples/seed-nft-minter/wasm/Cargo.lock     |  8 ++++----
 contracts/examples/token-release/wasm/Cargo.lock       |  6 +++---
 .../abi-tester/wasm-abi-tester-ev/Cargo.lock           |  6 +++---
 contracts/feature-tests/abi-tester/wasm/Cargo.lock     |  6 +++---
 .../alloc-features/wasm-alloc-mem-fail/Cargo.lock      |  6 +++---
 .../alloc-features/wasm-alloc-mem-leaking/Cargo.lock   |  6 +++---
 contracts/feature-tests/alloc-features/wasm/Cargo.lock |  6 +++---
 .../wasm-basic-features-storage-bytes/Cargo.lock       |  8 ++++----
 contracts/feature-tests/basic-features/wasm/Cargo.lock |  8 ++++----
 .../feature-tests/big-float-features/wasm/Cargo.lock   |  6 +++---
 .../builtin-func-features/wasm/Cargo.lock              |  6 +++---
 .../esdt-contract-pair/first-contract/wasm/Cargo.lock  |  6 +++---
 .../esdt-contract-pair/second-contract/wasm/Cargo.lock |  6 +++---
 .../child/wasm/Cargo.lock                              |  6 +++---
 .../parent/wasm/Cargo.lock                             |  6 +++---
 .../composability/forwarder-legacy/wasm/Cargo.lock     |  6 +++---
 .../wasm-forwarder-queue-promises/Cargo.lock           |  6 +++---
 .../composability/forwarder-queue/wasm/Cargo.lock      |  6 +++---
 .../wasm-forwarder-raw-init-async-call/Cargo.lock      |  6 +++---
 .../wasm-forwarder-raw-init-sync-call/Cargo.lock       |  6 +++---
 .../composability/forwarder-raw/wasm/Cargo.lock        |  6 +++---
 .../composability/forwarder/wasm/Cargo.lock            |  6 +++---
 .../composability/local-esdt-and-nft/wasm/Cargo.lock   |  6 +++---
 .../composability/promises-features/wasm/Cargo.lock    |  6 +++---
 .../composability/proxy-test-first/wasm/Cargo.lock     |  6 +++---
 .../composability/proxy-test-second/wasm/Cargo.lock    |  6 +++---
 .../composability/recursive-caller/wasm/Cargo.lock     |  6 +++---
 .../transfer-role-features/wasm/Cargo.lock             |  8 ++++----
 .../composability/vault/wasm-vault-promises/Cargo.lock |  6 +++---
 .../composability/vault/wasm-vault-upgrade/Cargo.lock  |  6 +++---
 .../feature-tests/composability/vault/wasm/Cargo.lock  |  6 +++---
 .../crowdfunding-erc20/wasm/Cargo.lock                 |  6 +++---
 .../erc1155-marketplace/wasm/Cargo.lock                |  6 +++---
 .../erc1155-user-mock/wasm/Cargo.lock                  |  6 +++---
 .../erc-style-contracts/erc1155/wasm/Cargo.lock        |  6 +++---
 .../erc-style-contracts/erc20/wasm/Cargo.lock          |  6 +++---
 .../erc-style-contracts/erc721/wasm/Cargo.lock         |  6 +++---
 .../erc-style-contracts/lottery-erc20/wasm/Cargo.lock  |  6 +++---
 .../feature-tests/esdt-system-sc-mock/wasm/Cargo.lock  |  6 +++---
 .../feature-tests/exchange-features/wasm/Cargo.lock    |  6 +++---
 .../formatted-message-features/wasm/Cargo.lock         |  6 +++---
 .../feature-tests/managed-map-features/wasm/Cargo.lock |  6 +++---
 .../wasm-multi-contract-alt-impl/Cargo.lock            |  6 +++---
 .../wasm-multi-contract-example-feature/Cargo.lock     |  6 +++---
 .../wasm-multi-contract-features-view/Cargo.lock       |  6 +++---
 .../multi-contract-features/wasm/Cargo.lock            |  6 +++---
 .../panic-message-features/wasm/Cargo.lock             |  6 +++---
 .../feature-tests/payable-features/wasm/Cargo.lock     |  6 +++---
 .../rust-snippets-generator-test/wasm/Cargo.lock       |  6 +++---
 .../rust-testing-framework-tester/wasm/Cargo.lock      |  6 +++---
 .../feature-tests/scenario-tester/wasm/Cargo.lock      |  6 +++---
 .../use-module/wasm-use-module-view/Cargo.lock         |  8 ++++----
 contracts/feature-tests/use-module/wasm/Cargo.lock     |  8 ++++----
 91 files changed, 289 insertions(+), 289 deletions(-)

diff --git a/contracts/benchmarks/large-storage/wasm/Cargo.lock b/contracts/benchmarks/large-storage/wasm/Cargo.lock
index cbc4f52165..6000f3b71a 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.50.3"
+version = "0.50.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.lock
index a7c0ef294b..8ce823d571 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.50.3"
+version = "0.50.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.lock
index b4efda6121..da3c30c0a5 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.50.3"
+version = "0.50.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.lock
index 0cea6bf94d..c2e5d02bcc 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.50.3"
+version = "0.50.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -78,7 +78,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -89,7 +89,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.lock
index e1fa1f01cd..89002bdea2 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.50.3"
+version = "0.50.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -78,7 +78,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -89,7 +89,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.lock
index 5a39b2d833..56b5e7e3c5 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.50.3"
+version = "0.50.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -78,7 +78,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -89,7 +89,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.lock
index 6addb7a28e..65bc362ee3 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.50.3"
+version = "0.50.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -78,7 +78,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -89,7 +89,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/send-tx-repeat/wasm/Cargo.lock b/contracts/benchmarks/send-tx-repeat/wasm/Cargo.lock
index 362f56acd6..047ac0d94e 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.50.3"
+version = "0.50.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.lock b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.lock
index 98f71f267e..e315dfdabc 100644
--- a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.lock
+++ b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.lock
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.lock b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.lock
index 37dd369183..4662dafebd 100644
--- a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.lock
+++ b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.lock
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/str-repeat/wasm/Cargo.lock b/contracts/benchmarks/str-repeat/wasm/Cargo.lock
index 5825dd6f10..41061c59d9 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.50.3"
+version = "0.50.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/core/price-aggregator/wasm/Cargo.lock b/contracts/core/price-aggregator/wasm/Cargo.lock
index f05dbe8ca8..00cfe895e1 100644
--- a/contracts/core/price-aggregator/wasm/Cargo.lock
+++ b/contracts/core/price-aggregator/wasm/Cargo.lock
@@ -86,7 +86,7 @@ checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
 
 [[package]]
 name = "multiversx-price-aggregator-sc"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "arrayvec",
  "getrandom",
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -136,7 +136,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -147,14 +147,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/adder/wasm/Cargo.lock b/contracts/examples/adder/wasm/Cargo.lock
index 2eaa0f5a3e..b181abbe01 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.50.3"
+version = "0.50.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/bonding-curve-contract/wasm/Cargo.lock b/contracts/examples/bonding-curve-contract/wasm/Cargo.lock
index 68ea29d2b0..1f2eda6959 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.50.3"
+version = "0.50.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/check-pause/wasm/Cargo.lock b/contracts/examples/check-pause/wasm/Cargo.lock
index 264fedbbf0..ac453734eb 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.50.3"
+version = "0.50.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crowdfunding-esdt/wasm/Cargo.lock b/contracts/examples/crowdfunding-esdt/wasm/Cargo.lock
index 2f4c595365..00c5596d94 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.50.3"
+version = "0.50.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crypto-bubbles/wasm/Cargo.lock b/contracts/examples/crypto-bubbles/wasm/Cargo.lock
index ac6ca1b14b..dacef30830 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.50.3"
+version = "0.50.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.lock b/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.lock
index 568debe608..82c5e1614e 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.50.3"
+version = "0.50.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -115,7 +115,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -126,7 +126,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]
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 f1106a069c..45678f6987 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.50.3"
+version = "0.50.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -96,7 +96,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -107,7 +107,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.lock b/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.lock
index 2109c57392..f09efa6c74 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.50.3"
+version = "0.50.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -106,7 +106,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -117,7 +117,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crypto-zombies/wasm/Cargo.lock b/contracts/examples/crypto-zombies/wasm/Cargo.lock
index f6e58e8520..e0e1ff25a3 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.50.3"
+version = "0.50.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/digital-cash/wasm/Cargo.lock b/contracts/examples/digital-cash/wasm/Cargo.lock
index 704a0b832f..f604055902 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.50.3"
+version = "0.50.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/empty/wasm/Cargo.lock b/contracts/examples/empty/wasm/Cargo.lock
index e25d3d7e82..b6665397e8 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.50.3"
+version = "0.50.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.lock b/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.lock
index c6c6875688..3784aa6d8d 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.50.3"
+version = "0.50.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/factorial/wasm/Cargo.lock b/contracts/examples/factorial/wasm/Cargo.lock
index 068bc65f8d..a00fa3b1a7 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.50.3"
+version = "0.50.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/fractional-nfts/wasm/Cargo.lock b/contracts/examples/fractional-nfts/wasm/Cargo.lock
index 68f96fa8e0..24039b2361 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.50.3"
+version = "0.50.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/lottery-esdt/wasm/Cargo.lock b/contracts/examples/lottery-esdt/wasm/Cargo.lock
index 071b76839d..07c1aac201 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.50.3"
+version = "0.50.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/multisig/wasm-multisig-full/Cargo.lock b/contracts/examples/multisig/wasm-multisig-full/Cargo.lock
index ddb406c3f0..045b2a94f0 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.50.3"
+version = "0.50.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/multisig/wasm-multisig-view/Cargo.lock b/contracts/examples/multisig/wasm-multisig-view/Cargo.lock
index 719bace565..71888d297c 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.50.3"
+version = "0.50.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/multisig/wasm/Cargo.lock b/contracts/examples/multisig/wasm/Cargo.lock
index c06110a7ae..0f2c4d39cc 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.50.3"
+version = "0.50.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/nft-minter/wasm/Cargo.lock b/contracts/examples/nft-minter/wasm/Cargo.lock
index 7c29b164a0..ed66ee32f5 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.50.3"
+version = "0.50.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/nft-storage-prepay/wasm/Cargo.lock b/contracts/examples/nft-storage-prepay/wasm/Cargo.lock
index e70d37fe32..25af9a8abd 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.50.3"
+version = "0.50.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/nft-subscription/wasm/Cargo.lock b/contracts/examples/nft-subscription/wasm/Cargo.lock
index f2144f6237..3c6dcb76fb 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.50.3"
+version = "0.50.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,14 +82,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/order-book/factory/wasm/Cargo.lock b/contracts/examples/order-book/factory/wasm/Cargo.lock
index 3e773acdf3..626ffc96ce 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.50.3"
+version = "0.50.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/order-book/pair/wasm/Cargo.lock b/contracts/examples/order-book/pair/wasm/Cargo.lock
index c2f75cfc9b..b7374deb9e 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.50.3"
+version = "0.50.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/ping-pong-egld/wasm/Cargo.lock b/contracts/examples/ping-pong-egld/wasm/Cargo.lock
index 4f18b598d6..a68f4a40cf 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.50.3"
+version = "0.50.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/proxy-pause/wasm/Cargo.lock b/contracts/examples/proxy-pause/wasm/Cargo.lock
index aa6b65e308..f75ba4b75c 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.50.3"
+version = "0.50.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/rewards-distribution/wasm/Cargo.lock b/contracts/examples/rewards-distribution/wasm/Cargo.lock
index 72eb898ad0..d7f6caf12e 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.50.3"
+version = "0.50.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,14 +82,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/seed-nft-minter/wasm/Cargo.lock b/contracts/examples/seed-nft-minter/wasm/Cargo.lock
index 91ebc13608..9b0ba10e02 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.50.3"
+version = "0.50.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,14 +82,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/token-release/wasm/Cargo.lock b/contracts/examples/token-release/wasm/Cargo.lock
index 382cdc8414..efa229facb 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.50.3"
+version = "0.50.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]
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 bac560f281..9811e04351 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.50.3"
+version = "0.50.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/abi-tester/wasm/Cargo.lock b/contracts/feature-tests/abi-tester/wasm/Cargo.lock
index d69bdd5bbd..f958aeb361 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.50.3"
+version = "0.50.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock
index acc0c96da5..a3a3fd1092 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.lock b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.lock
index 1d03996070..ec1c72a547 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.lock
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.lock
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/alloc-features/wasm/Cargo.lock b/contracts/feature-tests/alloc-features/wasm/Cargo.lock
index 9b6a2ac16a..0635781674 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.50.3"
+version = "0.50.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]
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 8a3c056b0d..68c3524a02 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.50.3"
+version = "0.50.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/basic-features/wasm/Cargo.lock b/contracts/feature-tests/basic-features/wasm/Cargo.lock
index e2f26179b1..aa49059092 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.50.3"
+version = "0.50.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/big-float-features/wasm/Cargo.lock b/contracts/feature-tests/big-float-features/wasm/Cargo.lock
index d694885d17..a010249068 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.50.3"
+version = "0.50.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]
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 c7c6efa6c9..9e654afbbe 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.50.3"
+version = "0.50.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]
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 334d6e5acc..3247d51cf4 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.50.3"
+version = "0.50.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]
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 98cb1a7ec8..01787dffb1 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.50.3"
+version = "0.50.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]
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 e5e29b685b..1a5e2302d7 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.50.3"
+version = "0.50.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]
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 5df8629850..517d1d235a 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
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.lock
index f0b4c69df9..260ea82b38 100644
--- a/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.lock
@@ -56,7 +56,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,7 +98,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]
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 b8ab6256c2..7164f97dfd 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
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock
index fe79f9145e..b55b75b2a3 100644
--- a/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]
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 8935e69d01..a4f4e61088 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.50.3"
+version = "0.50.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]
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 d0888c7ae9..ddc41d1351 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.50.3"
+version = "0.50.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.lock
index e889b2e95b..fa82af0875 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.50.3"
+version = "0.50.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock
index b7dd35fde6..add51bcafe 100755
--- a/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]
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 50003012b7..8e9274db11 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.50.3"
+version = "0.50.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/promises-features/wasm/Cargo.lock b/contracts/feature-tests/composability/promises-features/wasm/Cargo.lock
index 091176489b..44a2bf27d9 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.50.3"
+version = "0.50.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]
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 ccfd61e72c..a68f768f12 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.50.3"
+version = "0.50.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]
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 02a4ae8865..8394700322 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.50.3"
+version = "0.50.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.lock b/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.lock
index a363608b01..81d54ddccc 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.50.3"
+version = "0.50.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]
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 8999fc8883..51e07e354f 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.50.3"
+version = "0.50.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,14 +82,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]
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 57ea0b6085..e7cb820e34 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.50.3"
+version = "0.50.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]
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 33ce46111e..10dfae666b 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.50.3"
+version = "0.50.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/vault/wasm/Cargo.lock b/contracts/feature-tests/composability/vault/wasm/Cargo.lock
index f4b152850b..8ea1db5dbb 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.50.3"
+version = "0.50.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]
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 37ea735e09..04289c897e 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.50.3"
+version = "0.50.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]
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 b20203f2dd..704fe49f31 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.50.3"
+version = "0.50.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]
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 238df48aea..6dc79fd7d2 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.50.3"
+version = "0.50.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]
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 fb6988c95a..68a1c61fcf 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.50.3"
+version = "0.50.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]
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 93df2a8f3b..3c87c50df7 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.50.3"
+version = "0.50.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]
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 42158fbfd7..cc2b90e377 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.50.3"
+version = "0.50.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]
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 93af02f7fe..27f15abab0 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.50.3"
+version = "0.50.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]
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 c5ffbccbff..97d1903c90 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.50.3"
+version = "0.50.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/exchange-features/wasm/Cargo.lock b/contracts/feature-tests/exchange-features/wasm/Cargo.lock
index 6e84158ba7..140e4d3358 100644
--- a/contracts/feature-tests/exchange-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/exchange-features/wasm/Cargo.lock
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/formatted-message-features/wasm/Cargo.lock b/contracts/feature-tests/formatted-message-features/wasm/Cargo.lock
index 4f02ecead6..fec605f01c 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.50.3"
+version = "0.50.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/managed-map-features/wasm/Cargo.lock b/contracts/feature-tests/managed-map-features/wasm/Cargo.lock
index f7f3456541..bd12024f4a 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.50.3"
+version = "0.50.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]
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 677ad0bc84..9cef706d89 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.50.3"
+version = "0.50.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]
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 b9b3b9e611..744196c756 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.50.3"
+version = "0.50.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]
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 ed037e3548..3a894da6b1 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.50.3"
+version = "0.50.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/multi-contract-features/wasm/Cargo.lock b/contracts/feature-tests/multi-contract-features/wasm/Cargo.lock
index f16535f78e..5aac6475ea 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.50.3"
+version = "0.50.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/panic-message-features/wasm/Cargo.lock b/contracts/feature-tests/panic-message-features/wasm/Cargo.lock
index 6175f04a80..e8487472de 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.50.3"
+version = "0.50.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/payable-features/wasm/Cargo.lock b/contracts/feature-tests/payable-features/wasm/Cargo.lock
index 2d9af2cf8b..d7b52b3458 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.50.3"
+version = "0.50.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]
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 98d93dea6f..ce81832c8c 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.50.3"
+version = "0.50.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]
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 a03542b6d8..d535046fbc 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.50.3"
+version = "0.50.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/scenario-tester/wasm/Cargo.lock b/contracts/feature-tests/scenario-tester/wasm/Cargo.lock
index 7369ef2a5d..9394dac768 100755
--- a/contracts/feature-tests/scenario-tester/wasm/Cargo.lock
+++ b/contracts/feature-tests/scenario-tester/wasm/Cargo.lock
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]
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 f89966ed3a..5cf04148aa 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.50.3"
+version = "0.50.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,14 +82,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/use-module/wasm/Cargo.lock b/contracts/feature-tests/use-module/wasm/Cargo.lock
index d2ea103db8..644787746a 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.50.3"
+version = "0.50.4"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,14 +82,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.3"
+version = "0.50.4"
 dependencies = [
  "multiversx-sc",
 ]

From 7760c3c87df7c5044dc5368796394901cdf4f6e1 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Mon, 10 Jun 2024 13:43:12 +0300
Subject: [PATCH 0970/1254] generate custome proxy

---
 contracts/examples/multisig/sc-config.toml    |   5 +
 contracts/examples/multisig/src/multisig.rs   |   1 +
 .../examples/multisig/src/multisig_proxy.rs   | 114 ---------
 .../multisig/src/multisig_view_proxy.rs       | 220 ++++++++++++++++++
 .../multisig/tests/multisig_blackbox_test.rs  |  32 +--
 .../basic-features/sc-config.toml             |   5 +
 .../src/basic_features_proxy.rs               |   9 +
 .../multicontract.toml                        |   4 +-
 .../contract/generate_proxy/proxy_gen_main.rs |  38 +--
 .../generate_proxy/proxy_generator.rs         |   8 +-
 .../sc_config/contract_variant_builder.rs     | 117 ++++++++--
 .../src/contract/sc_config/sc_config_model.rs |   4 +-
 .../src/contract/sc_config/sc_config_proxy.rs |  18 +-
 13 files changed, 387 insertions(+), 188 deletions(-)
 create mode 100644 contracts/examples/multisig/src/multisig_view_proxy.rs

diff --git a/contracts/examples/multisig/sc-config.toml b/contracts/examples/multisig/sc-config.toml
index 79c3aeaa20..22ff09f5dd 100644
--- a/contracts/examples/multisig/sc-config.toml
+++ b/contracts/examples/multisig/sc-config.toml
@@ -17,3 +17,8 @@ add-labels = ["multisig-external-view"]
 
 [[proxy]]
 path = "src/multisig_proxy.rs"
+
+[[proxy]]
+path = "src/multisig_view_proxy.rs"
+add-unlabelled = false
+add-labels = ["multisig-external-view"]
diff --git a/contracts/examples/multisig/src/multisig.rs b/contracts/examples/multisig/src/multisig.rs
index 96d3d5cdfa..d1e177df02 100644
--- a/contracts/examples/multisig/src/multisig.rs
+++ b/contracts/examples/multisig/src/multisig.rs
@@ -6,6 +6,7 @@ pub mod multisig_perform;
 pub mod multisig_propose;
 pub mod multisig_proxy;
 pub mod multisig_state;
+pub mod multisig_view_proxy;
 pub mod user_role;
 
 use action::ActionFullInfo;
diff --git a/contracts/examples/multisig/src/multisig_proxy.rs b/contracts/examples/multisig/src/multisig_proxy.rs
index d3a3e32e0e..6e4b78df16 100644
--- a/contracts/examples/multisig/src/multisig_proxy.rs
+++ b/contracts/examples/multisig/src/multisig_proxy.rs
@@ -104,20 +104,6 @@ where
             .original_result()
     }
 
-    /// Iterates through all actions and retrieves those that are still pending. 
-    /// Serialized full action data: 
-    /// - the action id 
-    /// - the serialized action data 
-    /// - (number of signers followed by) list of signer addresses. 
-    pub fn get_pending_action_full_info(
-        self,
-    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, MultiValueEncoded<Env::Api, ActionFullInfo<Env::Api>>> {
-        self.wrapped_tx
-            .payment(NotPayable)
-            .raw_call("getPendingActionFullInfo")
-            .original_result()
-    }
-
     /// Returns `true` (`1`) if the user has signed the action. 
     /// Does not check whether or not the user is still a board member and the signature valid. 
     pub fn signed<
@@ -136,43 +122,6 @@ where
             .original_result()
     }
 
-    /// Indicates user rights. 
-    /// `0` = no rights, 
-    /// `1` = can propose, but not sign, 
-    /// `2` = can propose and sign. 
-    pub fn user_role<
-        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
-    >(
-        self,
-        user: Arg0,
-    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, UserRole> {
-        self.wrapped_tx
-            .payment(NotPayable)
-            .raw_call("userRole")
-            .argument(&user)
-            .original_result()
-    }
-
-    /// Lists all users that can sign actions. 
-    pub fn get_all_board_members(
-        self,
-    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, MultiValueEncoded<Env::Api, ManagedAddress<Env::Api>>> {
-        self.wrapped_tx
-            .payment(NotPayable)
-            .raw_call("getAllBoardMembers")
-            .original_result()
-    }
-
-    /// Lists all proposers that are not board members. 
-    pub fn get_all_proposers(
-        self,
-    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, MultiValueEncoded<Env::Api, ManagedAddress<Env::Api>>> {
-        self.wrapped_tx
-            .payment(NotPayable)
-            .raw_call("getAllProposers")
-            .original_result()
-    }
-
     /// Used by board members to sign actions. 
     pub fn sign<
         Arg0: ProxyArg<usize>,
@@ -261,69 +210,6 @@ where
             .original_result()
     }
 
-    /// Serialized action data of an action with index. 
-    pub fn get_action_data<
-        Arg0: ProxyArg<usize>,
-    >(
-        self,
-        action_id: Arg0,
-    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, Action<Env::Api>> {
-        self.wrapped_tx
-            .payment(NotPayable)
-            .raw_call("getActionData")
-            .argument(&action_id)
-            .original_result()
-    }
-
-    /// Gets addresses of all users who signed an action. 
-    /// Does not check if those users are still board members or not, 
-    /// so the result may contain invalid signers. 
-    pub fn get_action_signers<
-        Arg0: ProxyArg<usize>,
-    >(
-        self,
-        action_id: Arg0,
-    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ManagedVec<Env::Api, ManagedAddress<Env::Api>>> {
-        self.wrapped_tx
-            .payment(NotPayable)
-            .raw_call("getActionSigners")
-            .argument(&action_id)
-            .original_result()
-    }
-
-    /// Gets addresses of all users who signed an action and are still board members. 
-    /// All these signatures are currently valid. 
-    pub fn get_action_signer_count<
-        Arg0: ProxyArg<usize>,
-    >(
-        self,
-        action_id: Arg0,
-    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, usize> {
-        self.wrapped_tx
-            .payment(NotPayable)
-            .raw_call("getActionSignerCount")
-            .argument(&action_id)
-            .original_result()
-    }
-
-    /// It is possible for board members to lose their role. 
-    /// They are not automatically removed from all actions when doing so, 
-    /// therefore the contract needs to re-check every time when actions are performed. 
-    /// This function is used to validate the signers before performing an action. 
-    /// It also makes it easy to check before performing an action. 
-    pub fn get_action_valid_signer_count<
-        Arg0: ProxyArg<usize>,
-    >(
-        self,
-        action_id: Arg0,
-    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, usize> {
-        self.wrapped_tx
-            .payment(NotPayable)
-            .raw_call("getActionValidSignerCount")
-            .argument(&action_id)
-            .original_result()
-    }
-
     /// Initiates board member addition process. 
     /// Can also be used to promote a proposer to board member. 
     pub fn propose_add_board_member<
diff --git a/contracts/examples/multisig/src/multisig_view_proxy.rs b/contracts/examples/multisig/src/multisig_view_proxy.rs
new file mode 100644
index 0000000000..f17bdc4212
--- /dev/null
+++ b/contracts/examples/multisig/src/multisig_view_proxy.rs
@@ -0,0 +1,220 @@
+// Code generated by the multiversx-sc proxy generator. DO NOT EDIT.
+
+////////////////////////////////////////////////////
+////////////////// AUTO-GENERATED //////////////////
+////////////////////////////////////////////////////
+
+#![allow(dead_code)]
+#![allow(clippy::all)]
+
+use multiversx_sc::proxy_imports::*;
+
+pub struct MultisigProxy;
+
+impl<Env, From, To, Gas> TxProxyTrait<Env, From, To, Gas> for MultisigProxy
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    type TxProxyMethods = MultisigProxyMethods<Env, From, To, Gas>;
+
+    fn proxy_methods(self, tx: Tx<Env, From, To, (), Gas, (), ()>) -> Self::TxProxyMethods {
+        MultisigProxyMethods { wrapped_tx: tx }
+    }
+}
+
+pub struct MultisigProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    wrapped_tx: Tx<Env, From, To, (), Gas, (), ()>,
+}
+
+#[rustfmt::skip]
+impl<Env, From, To, Gas> MultisigProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    /// Iterates through all actions and retrieves those that are still pending. 
+    /// Serialized full action data: 
+    /// - the action id 
+    /// - the serialized action data 
+    /// - (number of signers followed by) list of signer addresses. 
+    pub fn get_pending_action_full_info(
+        self,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, MultiValueEncoded<Env::Api, ActionFullInfo<Env::Api>>> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("getPendingActionFullInfo")
+            .original_result()
+    }
+
+    /// Indicates user rights. 
+    /// `0` = no rights, 
+    /// `1` = can propose, but not sign, 
+    /// `2` = can propose and sign. 
+    pub fn user_role<
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
+    >(
+        self,
+        user: Arg0,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, UserRole> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("userRole")
+            .argument(&user)
+            .original_result()
+    }
+
+    /// Lists all users that can sign actions. 
+    pub fn get_all_board_members(
+        self,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, MultiValueEncoded<Env::Api, ManagedAddress<Env::Api>>> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("getAllBoardMembers")
+            .original_result()
+    }
+
+    /// Lists all proposers that are not board members. 
+    pub fn get_all_proposers(
+        self,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, MultiValueEncoded<Env::Api, ManagedAddress<Env::Api>>> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("getAllProposers")
+            .original_result()
+    }
+
+    /// Serialized action data of an action with index. 
+    pub fn get_action_data<
+        Arg0: ProxyArg<usize>,
+    >(
+        self,
+        action_id: Arg0,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, Action<Env::Api>> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("getActionData")
+            .argument(&action_id)
+            .original_result()
+    }
+
+    /// Gets addresses of all users who signed an action. 
+    /// Does not check if those users are still board members or not, 
+    /// so the result may contain invalid signers. 
+    pub fn get_action_signers<
+        Arg0: ProxyArg<usize>,
+    >(
+        self,
+        action_id: Arg0,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ManagedVec<Env::Api, ManagedAddress<Env::Api>>> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("getActionSigners")
+            .argument(&action_id)
+            .original_result()
+    }
+
+    /// Gets addresses of all users who signed an action and are still board members. 
+    /// All these signatures are currently valid. 
+    pub fn get_action_signer_count<
+        Arg0: ProxyArg<usize>,
+    >(
+        self,
+        action_id: Arg0,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, usize> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("getActionSignerCount")
+            .argument(&action_id)
+            .original_result()
+    }
+
+    /// It is possible for board members to lose their role. 
+    /// They are not automatically removed from all actions when doing so, 
+    /// therefore the contract needs to re-check every time when actions are performed. 
+    /// This function is used to validate the signers before performing an action. 
+    /// It also makes it easy to check before performing an action. 
+    pub fn get_action_valid_signer_count<
+        Arg0: ProxyArg<usize>,
+    >(
+        self,
+        action_id: Arg0,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, usize> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("getActionValidSignerCount")
+            .argument(&action_id)
+            .original_result()
+    }
+}
+
+#[type_abi]
+#[derive(TopEncode)]
+pub struct ActionFullInfo<Api>
+where
+    Api: ManagedTypeApi,
+{
+    pub action_id: usize,
+    pub action_data: Action<Api>,
+    pub signers: ManagedVec<Api, ManagedAddress<Api>>,
+}
+
+#[rustfmt::skip]
+#[type_abi]
+#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, Clone)]
+pub enum Action<Api>
+where
+    Api: ManagedTypeApi,
+{
+    Nothing,
+    AddBoardMember(ManagedAddress<Api>),
+    AddProposer(ManagedAddress<Api>),
+    RemoveUser(ManagedAddress<Api>),
+    ChangeQuorum(usize),
+    SendTransferExecute(CallActionData<Api>),
+    SendAsyncCall(CallActionData<Api>),
+    SCDeployFromSource {
+        amount: BigUint<Api>,
+        source: ManagedAddress<Api>,
+        code_metadata: CodeMetadata,
+        arguments: ManagedVec<Api, ManagedBuffer<Api>>,
+    },
+    SCUpgradeFromSource {
+        sc_address: ManagedAddress<Api>,
+        amount: BigUint<Api>,
+        source: ManagedAddress<Api>,
+        code_metadata: CodeMetadata,
+        arguments: ManagedVec<Api, ManagedBuffer<Api>>,
+    },
+}
+
+#[type_abi]
+#[derive(NestedEncode, NestedDecode, Clone)]
+pub struct CallActionData<Api>
+where
+    Api: ManagedTypeApi,
+{
+    pub to: ManagedAddress<Api>,
+    pub egld_amount: BigUint<Api>,
+    pub endpoint_name: ManagedBuffer<Api>,
+    pub arguments: ManagedVec<Api, ManagedBuffer<Api>>,
+}
+
+#[type_abi]
+#[derive(TopEncode, TopDecode)]
+pub enum UserRole {
+    None,
+    Proposer,
+    BoardMember,
+}
diff --git a/contracts/examples/multisig/tests/multisig_blackbox_test.rs b/contracts/examples/multisig/tests/multisig_blackbox_test.rs
index 083a6c6be6..e8067bb73a 100644
--- a/contracts/examples/multisig/tests/multisig_blackbox_test.rs
+++ b/contracts/examples/multisig/tests/multisig_blackbox_test.rs
@@ -2,7 +2,7 @@ use multiversx_sc::codec::top_encode_to_vec_u8_or_panic;
 use multiversx_sc_scenario::imports::*;
 
 use adder::adder_proxy;
-use multisig::multisig_proxy;
+use multisig::{multisig_proxy, multisig_view_proxy};
 use num_bigint::BigUint;
 
 const ADDER_ADDRESS: TestSCAddress = TestSCAddress::new("adder");
@@ -71,7 +71,7 @@ impl MultisigTestState {
         self.sign(action_id);
         self.perform(action_id);
 
-        self.expect_user_role(PROPOSER_ADDRESS, multisig_proxy::UserRole::Proposer);
+        self.expect_user_role(PROPOSER_ADDRESS, multisig_view_proxy::UserRole::Proposer);
 
         self
     }
@@ -232,12 +232,12 @@ impl MultisigTestState {
     fn expect_user_role(
         &mut self,
         user: TestAddress,
-        expected_user_role: multisig_proxy::UserRole,
+        expected_user_role: multisig_view_proxy::UserRole,
     ) {
         self.world
             .query()
             .to(MULTISIG_ADDRESS)
-            .typed(multisig_proxy::MultisigProxy)
+            .typed(multisig_view_proxy::MultisigProxy)
             .user_role(user)
             .returns(ExpectValue(expected_user_role))
             .run();
@@ -253,7 +253,7 @@ fn test_add_board_member() {
 
     state.world.account(new_board_member_expr).nonce(1);
 
-    state.expect_user_role(new_board_member_expr, multisig_proxy::UserRole::None);
+    state.expect_user_role(new_board_member_expr, multisig_view_proxy::UserRole::None);
 
     let action_id = state.propose_add_board_member(new_board_member_expr);
     state.sign(action_id);
@@ -261,12 +261,15 @@ fn test_add_board_member() {
 
     let expected_value = MultiValueVec::from(vec![BOARD_MEMBER_ADDRESS, new_board_member_expr]);
 
-    state.expect_user_role(new_board_member_expr, multisig_proxy::UserRole::BoardMember);
+    state.expect_user_role(
+        new_board_member_expr,
+        multisig_view_proxy::UserRole::BoardMember,
+    );
     state
         .world
         .query()
         .to(MULTISIG_ADDRESS)
-        .typed(multisig_proxy::MultisigProxy)
+        .typed(multisig_view_proxy::MultisigProxy)
         .get_all_board_members()
         .returns(ExpectValue(expected_value))
         .run()
@@ -281,7 +284,10 @@ fn test_add_proposer() {
 
     state.world.account(new_proposer_address_expr).nonce(1);
 
-    state.expect_user_role(new_proposer_address_expr, multisig_proxy::UserRole::None);
+    state.expect_user_role(
+        new_proposer_address_expr,
+        multisig_view_proxy::UserRole::None,
+    );
 
     let action_id = state.propose_add_proposer(new_proposer_address_expr);
     state.sign(action_id);
@@ -289,7 +295,7 @@ fn test_add_proposer() {
 
     state.expect_user_role(
         new_proposer_address_expr,
-        multisig_proxy::UserRole::Proposer,
+        multisig_view_proxy::UserRole::Proposer,
     );
 
     let expected_value = MultiValueVec::from(vec![PROPOSER_ADDRESS, new_proposer_address_expr]);
@@ -297,7 +303,7 @@ fn test_add_proposer() {
         .world
         .query()
         .to(MULTISIG_ADDRESS)
-        .typed(multisig_proxy::MultisigProxy)
+        .typed(multisig_view_proxy::MultisigProxy)
         .get_all_proposers()
         .returns(ExpectValue(expected_value))
         .run();
@@ -308,18 +314,18 @@ fn test_remove_proposer() {
     let mut state = MultisigTestState::new();
     state.deploy_multisig_contract();
 
-    state.expect_user_role(PROPOSER_ADDRESS, multisig_proxy::UserRole::Proposer);
+    state.expect_user_role(PROPOSER_ADDRESS, multisig_view_proxy::UserRole::Proposer);
 
     let action_id = state.propose_remove_user(PROPOSER_ADDRESS);
     state.sign(action_id);
     state.perform(action_id);
 
-    state.expect_user_role(PROPOSER_ADDRESS, multisig_proxy::UserRole::None);
+    state.expect_user_role(PROPOSER_ADDRESS, multisig_view_proxy::UserRole::None);
     state
         .world
         .query()
         .to(MULTISIG_ADDRESS)
-        .typed(multisig_proxy::MultisigProxy)
+        .typed(multisig_view_proxy::MultisigProxy)
         .get_all_proposers()
         .returns(ExpectValue(MultiValueVec::<Address>::new()))
         .run();
diff --git a/contracts/feature-tests/basic-features/sc-config.toml b/contracts/feature-tests/basic-features/sc-config.toml
index c870fda7cb..82698d1dab 100644
--- a/contracts/feature-tests/basic-features/sc-config.toml
+++ b/contracts/feature-tests/basic-features/sc-config.toml
@@ -8,3 +8,8 @@ overflow-checks = true # needed for overflow tests
 add-unlabelled = false
 add-endpoints = ["init", "load_bytes", "store_bytes"]
 kill_legacy_callback = true
+
+[[proxy]]
+path = "src/basic_features_proxy.rs"
+add-unlabelled = false
+add-endpoints = ["init", "store_bytes", "load_bytes", "returns_egld_decimal"]
diff --git a/contracts/feature-tests/basic-features/src/basic_features_proxy.rs b/contracts/feature-tests/basic-features/src/basic_features_proxy.rs
index 7131607d8c..469b2d3323 100644
--- a/contracts/feature-tests/basic-features/src/basic_features_proxy.rs
+++ b/contracts/feature-tests/basic-features/src/basic_features_proxy.rs
@@ -1,3 +1,12 @@
+// Code generated by the multiversx-sc proxy generator. DO NOT EDIT.
+
+////////////////////////////////////////////////////
+////////////////// AUTO-GENERATED //////////////////
+////////////////////////////////////////////////////
+
+#![allow(dead_code)]
+#![allow(clippy::all)]
+
 use multiversx_sc::proxy_imports::*;
 
 pub struct BasicFeaturesProxy;
diff --git a/contracts/feature-tests/multi-contract-features/multicontract.toml b/contracts/feature-tests/multi-contract-features/multicontract.toml
index dd9eaa5add..f06e039526 100644
--- a/contracts/feature-tests/multi-contract-features/multicontract.toml
+++ b/contracts/feature-tests/multi-contract-features/multicontract.toml
@@ -39,10 +39,10 @@ add-unlabelled = false
 add-labels = ["alt-impl"]
 
 [[proxy]]
-variant = "multi_contract_example_feature"
+variant = "multi-contract-example-feature"
 path = "src/multi_contract_example_feature_proxy.rs"
 
 
 [[proxy]]
-variant = "multi_contract_alt_impl"
+variant = "multi-contract-alt-impl"
 path = "src/multi_contract_alt_impl_proxy.rs"
diff --git a/framework/meta-lib/src/contract/generate_proxy/proxy_gen_main.rs b/framework/meta-lib/src/contract/generate_proxy/proxy_gen_main.rs
index d6c913a0e4..2179dddc40 100644
--- a/framework/meta-lib/src/contract/generate_proxy/proxy_gen_main.rs
+++ b/framework/meta-lib/src/contract/generate_proxy/proxy_gen_main.rs
@@ -1,8 +1,6 @@
 use colored::Colorize;
 use std::fs;
 
-use multiversx_sc::abi::ContractAbi;
-
 use crate::contract::sc_config::ProxyConfigSerde;
 
 use super::{
@@ -13,25 +11,21 @@ const PROXY_COMPARE_ERR_MSG: &str = "Contract has been modified and proxies have
 
 impl MetaConfig {
     pub fn generate_proxy(&mut self) {
-        let default_proxy = ProxyConfigSerde::new();
-        write_proxy_with_explicit_path(&default_proxy, self);
-        for proxy_config in self.sc_config.proxy_configs.clone() {
-            write_proxy_with_explicit_path(&proxy_config, self);
+        for proxy_config in &self.sc_config.proxy_configs {
+            write_proxy_with_explicit_path(proxy_config.0, self);
         }
     }
 
     pub fn compare_proxy(&mut self) {
-        for proxy_config in self.sc_config.proxy_configs.clone() {
-            compare_proxy_explicit_path(&proxy_config, self);
+        for proxy_config in &self.sc_config.proxy_configs {
+            compare_proxy_explicit_path(proxy_config.0, self);
         }
     }
 }
 
 fn compare_proxy_explicit_path(proxy_config: &ProxyConfigSerde, meta_config: &MetaConfig) {
-    let contract_abi = extract_contract_abi(proxy_config, meta_config);
     let mut temp = Vec::<u8>::new();
-    let mut proxy_generator =
-        ProxyGenerator::new(meta_config, &mut temp, proxy_config, contract_abi);
+    let mut proxy_generator = ProxyGenerator::new(meta_config, &mut temp, proxy_config);
     proxy_generator.write_proxy_to_file();
 
     let existent_proxy_path = format!("../{}", proxy_config.path);
@@ -44,27 +38,7 @@ fn compare_proxy_explicit_path(proxy_config: &ProxyConfigSerde, meta_config: &Me
 }
 
 fn write_proxy_with_explicit_path(proxy_config: &ProxyConfigSerde, meta_config: &MetaConfig) {
-    let contract_abi = extract_contract_abi(proxy_config, meta_config);
     let mut file = create_file(&proxy_config.path);
-    let mut proxy_generator =
-        ProxyGenerator::new(meta_config, &mut file, proxy_config, contract_abi);
+    let mut proxy_generator = ProxyGenerator::new(meta_config, &mut file, proxy_config);
     proxy_generator.write_proxy_to_file();
 }
-
-fn extract_contract_abi<'a>(
-    proxy_config: &'a ProxyConfigSerde,
-    meta_config: &'a MetaConfig,
-) -> &'a ContractAbi {
-    if proxy_config.variant.is_some() {
-        let variant = proxy_config.variant.as_ref().unwrap();
-        for contract_variant in &meta_config.sc_config.contracts {
-            if variant == &contract_variant.public_name_snake_case() {
-                return &contract_variant.abi;
-            }
-        }
-
-        panic!("No variant with name \"{}\" in multicontract", variant);
-    }
-
-    &meta_config.original_contract_abi
-}
diff --git a/framework/meta-lib/src/contract/generate_proxy/proxy_generator.rs b/framework/meta-lib/src/contract/generate_proxy/proxy_generator.rs
index d2e0b22036..b0a9267967 100644
--- a/framework/meta-lib/src/contract/generate_proxy/proxy_generator.rs
+++ b/framework/meta-lib/src/contract/generate_proxy/proxy_generator.rs
@@ -52,13 +52,17 @@ impl<'a> ProxyGenerator<'a> {
         meta_config: &'a MetaConfig,
         file: &'a mut dyn std::io::Write,
         proxy_config: &'a ProxyConfigSerde,
-        contract_abi: &'a ContractAbi,
     ) -> Self {
         Self {
             meta_config,
             file: Some(file),
             proxy_config,
-            contract_abi,
+            contract_abi: &meta_config
+                .sc_config
+                .proxy_configs
+                .get(proxy_config)
+                .unwrap()
+                .abi,
         }
     }
 
diff --git a/framework/meta-lib/src/contract/sc_config/contract_variant_builder.rs b/framework/meta-lib/src/contract/sc_config/contract_variant_builder.rs
index bb6a439245..2c9f37208d 100644
--- a/framework/meta-lib/src/contract/sc_config/contract_variant_builder.rs
+++ b/framework/meta-lib/src/contract/sc_config/contract_variant_builder.rs
@@ -1,3 +1,4 @@
+use core::panic;
 use multiversx_sc::abi::{ContractAbi, EndpointAbi};
 use std::{
     collections::{BTreeSet, HashMap, HashSet},
@@ -11,7 +12,7 @@ use super::{
     contract_variant_settings::{parse_allocator, parse_stack_size},
     sc_config_model::SC_CONFIG_FILE_NAMES,
     ContractVariant, ContractVariantProfile, ContractVariantSerde, ContractVariantSettings,
-    ScConfig, ScConfigSerde,
+    ProxyConfigSerde, ScConfig, ScConfigSerde,
 };
 
 /// Temporary structure, to help create instances of `ContractVariant`. Not publicly exposed.
@@ -253,40 +254,112 @@ fn validate_contract_variants(contracts: &[ContractVariant]) {
     }
 }
 
-impl ScConfig {
-    /// Assembles an `ContractVariantConfig` from a raw config object that was loaded via Serde.
-    ///
-    /// In most cases the config will be loaded from a .toml file, use `load_from_file` for that.
-    pub fn load_from_config(config: &ScConfigSerde, original_abi: &ContractAbi) -> Self {
-        let mut contract_builders: HashMap<String, ContractVariantBuilder> = config
-            .contracts
-            .iter()
-            .map(ContractVariantBuilder::map_from_config)
-            .collect();
+fn process_contracts(config: &ScConfigSerde, original_abi: &ContractAbi) -> Vec<ContractVariant> {
+    let mut contract_builders: HashMap<String, ContractVariantBuilder> = config
+        .contracts
+        .iter()
+        .map(ContractVariantBuilder::map_from_config)
+        .collect();
+
+    collect_and_process_endpoints(
+        &mut contract_builders,
+        original_abi,
+        &config.labels_for_contracts,
+    );
+
+    let mut contracts: Vec<ContractVariant> = contract_builders
+        .into_values()
+        .map(|builder| build_contract(builder, original_abi))
+        .collect();
+
+    if contracts.is_empty() {
+        contracts.push(ContractVariant::default_from_abi(original_abi));
+    }
+    set_main_contract_flag(&mut contracts, &config.settings.main);
+    validate_contract_variants(&contracts);
+
+    contracts
+}
+
+fn process_proxy_contracts(
+    config: &ScConfigSerde,
+    original_abi: &ContractAbi,
+) -> HashMap<ProxyConfigSerde, ContractVariant> {
+    let mut proxy_contracts = HashMap::new();
+
+    let main_contract = process_contracts(config, original_abi)
+        .into_iter()
+        .find(|contract| contract.main)
+        .unwrap();
+
+    proxy_contracts.insert(ProxyConfigSerde::new(), main_contract);
+
+    for proxy_config in &config.proxy {
+        let mut contract_builders = HashMap::new();
+
+        match &proxy_config.variant {
+            Some(variant) => {
+                let setting_contract = config
+                    .contracts
+                    .iter()
+                    .find(|setting| setting.0.eq(variant))
+                    .unwrap_or_else(|| panic!("No contact with this name"));
+                let (contract_id, mut contract_builder) =
+                    ContractVariantBuilder::map_from_config(setting_contract);
+                alter_builder_with_proxy_config(proxy_config, &mut contract_builder);
+
+                contract_builders = HashMap::from([(contract_id, contract_builder)]);
+            },
+            None => {
+                let mut contract_builder = ContractVariantBuilder::default();
+                alter_builder_with_proxy_config(proxy_config, &mut contract_builder);
+
+                contract_builders.insert(proxy_config.path.clone(), contract_builder);
+            },
+        }
+
         collect_and_process_endpoints(
             &mut contract_builders,
             original_abi,
             &config.labels_for_contracts,
         );
+        if let Some((_, builder)) = contract_builders.into_iter().next() {
+            let contract = build_contract(builder, original_abi);
 
-        let mut contracts: Vec<ContractVariant> = contract_builders
-            .into_values()
-            .map(|builder| build_contract(builder, original_abi))
-            .collect();
-        if contracts.is_empty() {
-            contracts.push(ContractVariant::default_from_abi(original_abi));
+            proxy_contracts.insert(proxy_config.clone(), contract);
         }
-        set_main_contract_flag(&mut contracts, &config.settings.main);
-        validate_contract_variants(&contracts);
+    }
+
+    proxy_contracts
+}
+
+impl ScConfig {
+    /// Assembles an `ContractVariantConfig` from a raw config object that was loaded via Serde.
+    ///
+    /// In most cases the config will be loaded from a .toml file, use `load_from_file` for that.
+    pub fn load_from_config(config: &ScConfigSerde, original_abi: &ContractAbi) -> Self {
         let default_contract_config_name = config.settings.main.clone().unwrap_or_default();
         ScConfig {
             default_contract_config_name,
-            contracts,
-            proxy_configs: config.proxy.clone(),
+            contracts: process_contracts(config, original_abi),
+            proxy_configs: process_proxy_contracts(config, original_abi),
         }
     }
 }
 
+fn alter_builder_with_proxy_config(
+    proxy_config: &ProxyConfigSerde,
+    contract_builder: &mut ContractVariantBuilder,
+) {
+    let default = ContractVariantBuilder::default();
+
+    contract_builder.add_unlabelled = proxy_config
+        .add_unlabelled
+        .unwrap_or(default.add_unlabelled);
+    contract_builder.add_endpoints = proxy_config.add_endpoints.iter().cloned().collect();
+    contract_builder.add_labels = proxy_config.add_labels.iter().cloned().collect();
+}
+
 fn collect_and_process_endpoints(
     contract_builders: &mut HashMap<String, ContractVariantBuilder>,
     original_abi: &ContractAbi,
@@ -315,7 +388,7 @@ impl ScConfig {
                 wasm_crate_name,
                 abi: original_abi.clone(),
             }],
-            proxy_configs: Vec::new(),
+            proxy_configs: HashMap::new(),
         }
     }
 
diff --git a/framework/meta-lib/src/contract/sc_config/sc_config_model.rs b/framework/meta-lib/src/contract/sc_config/sc_config_model.rs
index 076e91a2f7..813ff929ea 100644
--- a/framework/meta-lib/src/contract/sc_config/sc_config_model.rs
+++ b/framework/meta-lib/src/contract/sc_config/sc_config_model.rs
@@ -1,3 +1,5 @@
+use std::collections::HashMap;
+
 use super::{
     contract_variant_validate::validate_contract_variant, sc_config_proxy::ProxyConfigSerde,
     ContractVariant,
@@ -18,7 +20,7 @@ pub const SC_CONFIG_FILE_NAMES: &[&str] = &["sc-config.toml", "multicontract.tom
 pub struct ScConfig {
     pub default_contract_config_name: String,
     pub contracts: Vec<ContractVariant>,
-    pub proxy_configs: Vec<ProxyConfigSerde>,
+    pub proxy_configs: HashMap<ProxyConfigSerde, ContractVariant>,
 }
 
 impl ScConfig {
diff --git a/framework/meta-lib/src/contract/sc_config/sc_config_proxy.rs b/framework/meta-lib/src/contract/sc_config/sc_config_proxy.rs
index 88721fe6e7..ada8b230cc 100644
--- a/framework/meta-lib/src/contract/sc_config/sc_config_proxy.rs
+++ b/framework/meta-lib/src/contract/sc_config/sc_config_proxy.rs
@@ -2,7 +2,7 @@ use serde::Deserialize;
 
 const DEFAULT_PATH: &str = "/output/proxy.rs";
 
-#[derive(Deserialize, Default, Debug, Clone, PartialEq, Eq)]
+#[derive(Deserialize, Default, Debug, Clone, PartialEq, Eq, Hash)]
 #[serde(deny_unknown_fields)]
 pub struct ProxyConfigSerde {
     #[serde(default)]
@@ -18,6 +18,17 @@ pub struct ProxyConfigSerde {
 
     #[serde(default)]
     pub variant: Option<String>,
+
+    #[serde(rename = "add-unlabelled")]
+    pub add_unlabelled: Option<bool>,
+
+    #[serde(default)]
+    #[serde(rename = "add-labels")]
+    pub add_labels: Vec<String>,
+
+    #[serde(default)]
+    #[serde(rename = "add-endpoints")]
+    pub add_endpoints: Vec<String>,
 }
 
 impl ProxyConfigSerde {
@@ -27,11 +38,14 @@ impl ProxyConfigSerde {
             override_import: None,
             path_rename: None,
             variant: None,
+            add_unlabelled: None,
+            add_labels: Vec::new(),
+            add_endpoints: Vec::new(),
         }
     }
 }
 
-#[derive(Deserialize, Default, Debug, Clone, PartialEq, Eq)]
+#[derive(Deserialize, Default, Debug, Clone, PartialEq, Eq, Hash)]
 pub struct PathRename {
     #[serde(default)]
     pub from: String,

From 3912ebea195fc96c2bd653e5d6a74928370bf70a Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Mon, 10 Jun 2024 14:47:15 +0300
Subject: [PATCH 0971/1254] edit multicontract proxy

---
 .../feature-tests/multi-contract-features/multicontract.toml    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/contracts/feature-tests/multi-contract-features/multicontract.toml b/contracts/feature-tests/multi-contract-features/multicontract.toml
index f06e039526..92d196560c 100644
--- a/contracts/feature-tests/multi-contract-features/multicontract.toml
+++ b/contracts/feature-tests/multi-contract-features/multicontract.toml
@@ -46,3 +46,5 @@ path = "src/multi_contract_example_feature_proxy.rs"
 [[proxy]]
 variant = "multi-contract-alt-impl"
 path = "src/multi_contract_alt_impl_proxy.rs"
+add-unlabelled = false
+add-labels = ["alt-impl"]

From 27b371b44f98b87d5b6064c5b7e39546a3ae80d3 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Mon, 10 Jun 2024 14:57:15 +0300
Subject: [PATCH 0972/1254] fix compare proxy

---
 .../src/contract/generate_proxy/proxy_gen_main.rs  | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/framework/meta-lib/src/contract/generate_proxy/proxy_gen_main.rs b/framework/meta-lib/src/contract/generate_proxy/proxy_gen_main.rs
index 2179dddc40..30aab81b72 100644
--- a/framework/meta-lib/src/contract/generate_proxy/proxy_gen_main.rs
+++ b/framework/meta-lib/src/contract/generate_proxy/proxy_gen_main.rs
@@ -29,11 +29,17 @@ fn compare_proxy_explicit_path(proxy_config: &ProxyConfigSerde, meta_config: &Me
     proxy_generator.write_proxy_to_file();
 
     let existent_proxy_path = format!("../{}", proxy_config.path);
-    let existent_proxy = fs::read_to_string(existent_proxy_path).unwrap();
-    let newly_gen_proxy = String::from_utf8(temp).unwrap();
+    let existent_proxy = fs::read_to_string(existent_proxy_path);
 
-    if existent_proxy != newly_gen_proxy {
-        panic!("{}", PROXY_COMPARE_ERR_MSG.to_string().red());
+    match existent_proxy {
+        Ok(existent_proxy) => {
+            let newly_gen_proxy = String::from_utf8(temp).unwrap();
+
+            if existent_proxy != newly_gen_proxy {
+                panic!("{}", PROXY_COMPARE_ERR_MSG.to_string().red());
+            }
+        },
+        _ => return,
     }
 }
 

From 47e77d87bf2d40c8e570b35cbfa2ef952a91a9de Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Mon, 10 Jun 2024 16:33:49 +0300
Subject: [PATCH 0973/1254] fix clippy

---
 .../src/contract/generate_proxy/proxy_gen_main.rs | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/framework/meta-lib/src/contract/generate_proxy/proxy_gen_main.rs b/framework/meta-lib/src/contract/generate_proxy/proxy_gen_main.rs
index 30aab81b72..2533efda70 100644
--- a/framework/meta-lib/src/contract/generate_proxy/proxy_gen_main.rs
+++ b/framework/meta-lib/src/contract/generate_proxy/proxy_gen_main.rs
@@ -31,15 +31,12 @@ fn compare_proxy_explicit_path(proxy_config: &ProxyConfigSerde, meta_config: &Me
     let existent_proxy_path = format!("../{}", proxy_config.path);
     let existent_proxy = fs::read_to_string(existent_proxy_path);
 
-    match existent_proxy {
-        Ok(existent_proxy) => {
-            let newly_gen_proxy = String::from_utf8(temp).unwrap();
-
-            if existent_proxy != newly_gen_proxy {
-                panic!("{}", PROXY_COMPARE_ERR_MSG.to_string().red());
-            }
-        },
-        _ => return,
+    if let Ok(existent_proxy) = existent_proxy {
+        let newly_gen_proxy = String::from_utf8(temp).unwrap();
+
+        if existent_proxy != newly_gen_proxy {
+            panic!("{}", PROXY_COMPARE_ERR_MSG.to_string().red());
+        }
     }
 }
 

From ca2d88f9ce97182c230ccb56b1da9a19fea63707 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Mon, 10 Jun 2024 21:05:22 +0200
Subject: [PATCH 0974/1254] added macros, changed ln to use managed decimal
 instead of big float, added few extra impls

---
 .../types/managed/wrapped/managed_decimal.rs  | 309 ++++++++++++++----
 .../managed/wrapped/managed_decimal_macros.rs |  56 ++++
 .../scenario/tests/managed_decimal_test.rs    |  79 +++--
 3 files changed, 362 insertions(+), 82 deletions(-)

diff --git a/framework/base/src/types/managed/wrapped/managed_decimal.rs b/framework/base/src/types/managed/wrapped/managed_decimal.rs
index df09c72f98..a0e3349c8a 100644
--- a/framework/base/src/types/managed/wrapped/managed_decimal.rs
+++ b/framework/base/src/types/managed/wrapped/managed_decimal.rs
@@ -4,12 +4,14 @@ use crate::{
         const_handles, use_raw_handle, BigFloatApiImpl, BigIntApiImpl, ManagedTypeApi,
         StaticVarApiImpl,
     },
+    const_managed_decimal,
     types::{BigFloat, BigUint},
 };
 
 use multiversx_sc_codec::{
-    DecodeError, DecodeErrorHandler, EncodeErrorHandler, NestedDecode, NestedDecodeInput,
-    NestedEncode, NestedEncodeOutput, TopDecode, TopDecodeInput, TopEncode, TopEncodeOutput,
+    num_bigint::ToBigUint, DecodeError, DecodeErrorHandler, EncodeErrorHandler, NestedDecode,
+    NestedDecodeInput, NestedEncode, NestedEncodeOutput, TopDecode, TopDecodeInput, TopEncode,
+    TopEncodeOutput,
 };
 
 use core::{
@@ -94,7 +96,7 @@ impl<M: ManagedTypeApi, D: Decimals> ManagedDecimal<M, D> {
         self.decimals.num_decimals()
     }
 
-    pub fn rescale<T: Decimals>(self, scale_to: T) -> ManagedDecimal<M, T>
+    pub fn rescale<T: Decimals>(&self, scale_to: T) -> ManagedDecimal<M, T>
     where
         M: ManagedTypeApi,
     {
@@ -107,7 +109,7 @@ impl<M: ManagedTypeApi, D: Decimals> ManagedDecimal<M, D> {
                 let scaling_factor: &BigUint<M> = &delta_decimals.scaling_factor();
                 ManagedDecimal::from_raw_units(&self.data * scaling_factor, scale_to)
             },
-            Ordering::Equal => ManagedDecimal::from_raw_units(self.data, scale_to),
+            Ordering::Equal => ManagedDecimal::from_raw_units(self.data.clone(), scale_to),
             Ordering::Greater => {
                 let delta_decimals = from_num_decimals - scale_to_num_decimals;
                 let scaling_factor: &BigUint<M> = &delta_decimals.scaling_factor();
@@ -143,41 +145,6 @@ impl<M: ManagedTypeApi, D: Decimals> ManagedDecimal<M, D> {
         )
     }
 
-    // pub fn log<T: Decimals>(self, target_base: f64, precision: T) -> ManagedDecimal<M, T> {
-    //     let num_decimals = f64::from(precision.num_decimals() as u32);
-    //     let number = f64::from(self.data.to_u64().unwrap() as u32);
-
-    //     assert!(number >= 1f64 && target_base >= 1f64, "wrong input");
-
-    //     let precise = (number.log10() * num_decimals / target_base.log10())
-    //         .trunc()
-    //         .round() as u64;
-
-    //     ManagedDecimal::from_raw_units(BigUint::<M>::from(precise), precision)
-    // }
-
-    pub fn ln(self, decimals: D) -> ManagedDecimal<M, NumDecimals> {
-        // find the highest power of 2 less than or equal to self
-        let log2 = self.data.log2(); // most significant bit
-        let divisor = BigFloat::from(1 << log2);
-        let x = self.to_big_float() / divisor; // normalize to [1.0, 2.0]
-
-        let ln_of_2 = BigFloat::from_frac(69314718i64, 100_000_000i64); // 0.69314718 8 decimals
-        let first = BigFloat::from_frac(17417939i64, 10_000_000i64); // 1.7417939, 7 decimals
-        let second = BigFloat::from_frac(28212026i64, 10_000_000i64); // 2.8212026, 7 decimals
-        let third = BigFloat::from_frac(14699568i64, 10_000_000i64); // 1.4699568, 7 decimals
-        let fourth = BigFloat::from_frac(44717955i64, 100_000_000i64); // 0.44717955, 8 decimals
-        let fifth = BigFloat::from_frac(56570851i64, 1_000_000_000i64); // 0.056570851, 9 decimals
-
-        // approximating polynom for getting the result
-        let result =
-            (((fourth - fifth * x.clone()) * x.clone() - third) * x.clone() + second) * x - first;
-        let add_member = BigFloat::from_big_uint(&BigUint::from(log2)) * ln_of_2;
-        let final_result = result + add_member;
-
-        final_result.to_managed_decimal(decimals.num_decimals())
-    }
-
     pub fn nth_root(self, _root: ManagedDecimal<M, D>, _precision: D) -> ManagedDecimal<M, D> {
         todo!()
     }
@@ -190,6 +157,82 @@ impl<M: ManagedTypeApi, const DECIMALS: NumDecimals> ManagedDecimal<M, ConstDeci
             decimals: ConstDecimals,
         }
     }
+
+    // pub fn log(
+    //     &self,
+    //     target_base: &ManagedDecimal<M, D>,
+    //     precision: D,
+    // ) -> ManagedDecimal<M, NumDecimals> {
+    //     let num_decimals = precision.num_decimals();
+    //     // should verify >= 1
+    //     let one = ManagedDecimal::from_raw_units(BigUint::from(1u64), 0usize);
+    //     one.rescale(self.scale());
+    //     assert!(self >= &one, "wrong input for self");
+    //     one.rescale(target_base.scale());
+    //     assert!(target_base >= &one, "wrong input for target base");
+
+    //     self.ln(&precision)
+    //         * ManagedDecimal::from_raw_units(BigUint::from(num_decimals), num_decimals)
+    //         / target_base.ln(&precision)
+    //     //this should be done with precision
+    // }
+
+    pub fn ln<const PREC: usize>(
+        self,
+        precision: ConstDecimals<PREC>,
+    ) -> ManagedDecimal<M, ConstDecimals<PREC>> {
+        let num_decimals = BigUint::<M>::from(self.decimals.num_decimals());
+        // find the highest power of 2 less than or equal to self
+        let log2 = self.data.log2() - num_decimals.log2(); // most significant bit for the actual number
+        let divisor = 1 << log2;
+        let divisor_scaled = BigUint::<M>::from(divisor.to_biguint().unwrap())
+            * self.decimals.scaling_factor().clone_value();
+        let _normalized = self.data / divisor_scaled; // normalize to [1.0, 2.0]
+        let x_dec = const_managed_decimal!(_normalized);
+
+        // const values we need for the polynom
+        let ln_of_2_dec = ManagedDecimal::<M, ConstDecimals<8>>::const_decimals_from_raw(
+            BigUint::from(69314718u64),
+        ); // 0.69314718 8 decimals
+        let first_dec = ManagedDecimal::<M, ConstDecimals<7>>::const_decimals_from_raw(
+            BigUint::from(17417939u64),
+        ); // 1.7417939, 7 decimals
+        let second_dec = ManagedDecimal::<M, ConstDecimals<7>>::const_decimals_from_raw(
+            BigUint::from(28212026u64),
+        ); // 2.8212026, 7 decimals
+        let third_dec = ManagedDecimal::<M, ConstDecimals<7>>::const_decimals_from_raw(
+            BigUint::from(14699568u64),
+        ); // 1.4699568, 7 decimals
+        let fourth_dec = ManagedDecimal::<M, ConstDecimals<8>>::const_decimals_from_raw(
+            BigUint::from(44717955u64),
+        ); // 0.44717955, 8 decimals
+        let fifth_dec = ManagedDecimal::<M, ConstDecimals<9>>::const_decimals_from_raw(
+            BigUint::from(56570851u64),
+        ); // 0.056570851, 9 decimals
+
+        // rescale everything to precision
+        let x = x_dec.rescale(precision.clone());
+        let ln_of_2 = ln_of_2_dec.rescale(precision.clone());
+        let first = first_dec.rescale(precision.clone());
+        let second = second_dec.rescale(precision.clone());
+        let third = third_dec.rescale(precision.clone());
+        let fourth = fourth_dec.rescale(precision.clone());
+        let fifth = fifth_dec.rescale(precision.clone());
+
+        // approximating polynom to get the result
+        let result = (((fourth - fifth.mul_with_precision(x.clone(), precision.clone()))
+            .mul_with_precision(x.clone(), precision.clone())
+            - third)
+            .mul_with_precision(x.clone(), precision.clone())
+            + second)
+            .mul_with_precision(x, precision.clone())
+            - first;
+
+        let log_2 = const_managed_decimal!(log2);
+
+        let add_member = log_2.mul_with_precision(ln_of_2, precision.clone());
+        result + add_member
+    }
 }
 
 impl<M: ManagedTypeApi, const DECIMALS: NumDecimals> TopEncode
@@ -346,6 +389,24 @@ impl<M: ManagedTypeApi, const DECIMALS: NumDecimals> Sub<ManagedDecimal<M, Const
     }
 }
 
+impl<M: ManagedTypeApi> Add<ManagedDecimal<M, NumDecimals>> for ManagedDecimal<M, NumDecimals> {
+    type Output = Self;
+
+    fn add(self, other: ManagedDecimal<M, NumDecimals>) -> Self::Output {
+        let scaled = other.rescale(self.scale());
+        ManagedDecimal::from_raw_units(&self.data + &scaled.data, scaled.decimals)
+    }
+}
+
+impl<M: ManagedTypeApi> Sub<ManagedDecimal<M, NumDecimals>> for ManagedDecimal<M, NumDecimals> {
+    type Output = Self;
+
+    fn sub(self, other: ManagedDecimal<M, NumDecimals>) -> Self::Output {
+        let scaled = other.rescale(self.scale());
+        ManagedDecimal::from_raw_units(&self.data - &scaled.data, scaled.decimals)
+    }
+}
+
 impl<M: ManagedTypeApi, D1: Decimals, D2: Decimals> Mul<ManagedDecimal<M, D2>>
     for ManagedDecimal<M, D1>
 where
@@ -362,40 +423,153 @@ where
     }
 }
 
-impl<M: ManagedTypeApi, D1: Decimals, D2: Decimals> Div<ManagedDecimal<M, D2>>
+impl<M: ManagedTypeApi, D1: Decimals, D2: Decimals> MulToPrecision<M, D2>
     for ManagedDecimal<M, D1>
-where
-    D1: Sub<D2>,
-    <D1 as Sub<D2>>::Output: Decimals,
 {
-    type Output = ManagedDecimal<M, <D1 as Sub<D2>>::Output>;
-
-    fn div(self, other: ManagedDecimal<M, D2>) -> Self::Output {
+    fn mul_with_precision<T: Decimals>(
+        self,
+        other: ManagedDecimal<M, D2>,
+        precision: T,
+    ) -> ManagedDecimal<M, T> {
+        let scaled;
+        let new_data;
+        if self.decimals.num_decimals() >= other.decimals.num_decimals() {
+            scaled = other.rescale(self.scale());
+            new_data = self.data * scaled.data;
+        } else {
+            scaled = self.rescale(other.scale());
+            new_data = scaled.data * other.data;
+        }
         ManagedDecimal {
-            data: self.data / other.data,
-            decimals: self.decimals - other.decimals,
+            data: new_data,
+            decimals: precision,
         }
     }
 }
 
-impl<M: ManagedTypeApi> Add<ManagedDecimal<M, NumDecimals>> for ManagedDecimal<M, NumDecimals> {
+pub trait MulToPrecision<M: ManagedTypeApi, D: Decimals> {
+    fn mul_with_precision<T: Decimals>(
+        self,
+        other: ManagedDecimal<M, D>,
+        precision: T,
+    ) -> ManagedDecimal<M, T>;
+}
+
+impl<const DECIMALS: usize, M: ManagedTypeApi> Sub<ManagedDecimal<M, NumDecimals>>
+    for ManagedDecimal<M, ConstDecimals<DECIMALS>>
+{
+    type Output = ManagedDecimal<M, NumDecimals>;
+
+    fn sub(self, rhs: ManagedDecimal<M, NumDecimals>) -> Self::Output {
+        if DECIMALS >= rhs.decimals {
+            let scaled = rhs.rescale(self.scale());
+            ManagedDecimal {
+                data: self.data - scaled.data,
+                decimals: DECIMALS,
+            }
+        } else {
+            let scaled = self.rescale(rhs.scale());
+            ManagedDecimal {
+                data: scaled.data - rhs.data,
+                decimals: rhs.decimals,
+            }
+        }
+    }
+}
+
+impl<const DECIMALS: usize, M: ManagedTypeApi> Sub<ManagedDecimal<M, ConstDecimals<DECIMALS>>>
+    for ManagedDecimal<M, NumDecimals>
+{
+    type Output = Self;
+
+    fn sub(self, rhs: ManagedDecimal<M, ConstDecimals<DECIMALS>>) -> Self::Output {
+        if DECIMALS >= self.decimals {
+            let scaled = self.rescale(rhs.scale());
+            ManagedDecimal {
+                data: self.data - scaled.data,
+                decimals: DECIMALS,
+            }
+        } else {
+            let scaled = rhs.rescale(self.scale());
+            ManagedDecimal {
+                data: scaled.data - rhs.data,
+                decimals: self.decimals,
+            }
+        }
+    }
+}
+
+impl<const DECIMALS: usize, M: ManagedTypeApi> Add<ManagedDecimal<M, ConstDecimals<DECIMALS>>>
+    for ManagedDecimal<M, NumDecimals>
+{
     type Output = Self;
 
+    fn add(self, other: ManagedDecimal<M, ConstDecimals<DECIMALS>>) -> Self::Output {
+        if DECIMALS >= self.decimals {
+            let scaled = self.rescale(other.scale());
+            ManagedDecimal {
+                data: self.data + scaled.data,
+                decimals: DECIMALS,
+            }
+        } else {
+            let scaled = other.rescale(self.scale());
+            ManagedDecimal {
+                data: scaled.data + other.data,
+                decimals: self.decimals,
+            }
+        }
+    }
+}
+
+impl<const DECIMALS: usize, M: ManagedTypeApi> Add<ManagedDecimal<M, NumDecimals>>
+    for ManagedDecimal<M, ConstDecimals<DECIMALS>>
+{
+    type Output = ManagedDecimal<M, NumDecimals>;
+
     fn add(self, other: ManagedDecimal<M, NumDecimals>) -> Self::Output {
-        let scaled = other.rescale(self.scale());
-        ManagedDecimal::from_raw_units(&self.data + &scaled.data, scaled.decimals)
+        if DECIMALS >= other.decimals {
+            let scaled = other.rescale(self.scale());
+            ManagedDecimal {
+                data: self.data + scaled.data,
+                decimals: self.decimals.num_decimals(),
+            }
+        } else {
+            let scaled = self.rescale(other.scale());
+            ManagedDecimal {
+                data: scaled.data + other.data,
+                decimals: scaled.decimals,
+            }
+        }
     }
 }
 
-impl<M: ManagedTypeApi> Sub<ManagedDecimal<M, NumDecimals>> for ManagedDecimal<M, NumDecimals> {
+impl<M: ManagedTypeApi, D: Decimals> Div<NumDecimals> for ManagedDecimal<M, D> {
     type Output = Self;
 
-    fn sub(self, other: ManagedDecimal<M, NumDecimals>) -> Self::Output {
-        let scaled = other.rescale(self.scale());
-        ManagedDecimal::from_raw_units(&self.data - &scaled.data, scaled.decimals)
+    fn div(self, other: NumDecimals) -> Self::Output {
+        ManagedDecimal {
+            data: self.data / BigUint::from(other),
+            decimals: self.decimals,
+        }
     }
 }
 
+impl<M: ManagedTypeApi, D1: Decimals, D2: Decimals> Div<ManagedDecimal<M, D2>>
+    for ManagedDecimal<M, D1>
+where
+    D1: Sub<D2>,
+    <D1 as Sub<D2>>::Output: Decimals,
+{
+    type Output = ManagedDecimal<M, <D1 as Sub<D2>>::Output>;
+
+    // maybe rescale to highest first
+    fn div(self, other: ManagedDecimal<M, D2>) -> Self::Output {
+        ManagedDecimal {
+            data: self.data / other.data,
+            decimals: self.decimals - other.decimals,
+        }
+    }
+}
 impl<M: ManagedTypeApi, D1: Decimals, D2: Decimals> PartialEq<ManagedDecimal<M, D2>>
     for ManagedDecimal<M, D1>
 {
@@ -420,6 +594,31 @@ impl<M: ManagedTypeApi, D1: Decimals, D2: Decimals> PartialEq<ManagedDecimal<M,
     }
 }
 
+impl<M: ManagedTypeApi, D1: Decimals, D2: Decimals> PartialOrd<ManagedDecimal<M, D2>>
+    for ManagedDecimal<M, D1>
+{
+    fn partial_cmp(&self, other: &ManagedDecimal<M, D2>) -> Option<Ordering> {
+        match self
+            .decimals
+            .num_decimals()
+            .cmp(&other.decimals.num_decimals())
+        {
+            Ordering::Less => {
+                let diff_decimals = other.decimals.num_decimals() - self.decimals.num_decimals();
+                let scaling_factor: &BigUint<M> = &diff_decimals.scaling_factor();
+
+                Some((&self.data * scaling_factor).cmp(&other.data))
+            },
+            Ordering::Equal => Some((self.data).cmp(&other.data)),
+            Ordering::Greater => {
+                let diff_decimals = self.decimals.num_decimals() - other.decimals.num_decimals();
+                let scaling_factor: &BigUint<M> = &diff_decimals.scaling_factor();
+                Some((&other.data * scaling_factor).cmp(&self.data))
+            },
+        }
+    }
+}
+
 impl<M: ManagedTypeApi> TypeAbiFrom<Self> for ManagedDecimal<M, NumDecimals> {}
 
 impl<M: ManagedTypeApi> TypeAbi for ManagedDecimal<M, NumDecimals> {
diff --git a/framework/base/src/types/managed/wrapped/managed_decimal_macros.rs b/framework/base/src/types/managed/wrapped/managed_decimal_macros.rs
index ca6d8a3a3c..89693f73a6 100644
--- a/framework/base/src/types/managed/wrapped/managed_decimal_macros.rs
+++ b/framework/base/src/types/managed/wrapped/managed_decimal_macros.rs
@@ -1,6 +1,62 @@
 use crate::types::ConstDecimals;
 use core::ops::{Add, Sub};
 
+pub const fn count_decimals(s: &str) -> usize {
+    let bytes = s.as_bytes();
+    let mut count = 0;
+    let mut dot_found = false;
+
+    let mut i = 0;
+    while i < bytes.len() {
+        if dot_found {
+            count += 1;
+        }
+        if bytes[i] == b'.' {
+            dot_found = true;
+        }
+        i += 1;
+    }
+    count
+}
+
+pub const fn remove_dot(s: &str) -> u64 {
+    let bytes = s.as_bytes();
+    let mut result = 0;
+    let mut i = 0;
+
+    while i < bytes.len() {
+        if bytes[i] != b'.' {
+            result = result * 10 + (bytes[i] - b'0') as u64;
+        }
+        i += 1;
+    }
+    result
+}
+
+#[macro_export]
+macro_rules! const_managed_decimal {
+    ($val:expr) => {{
+        use $crate::types::managed::wrapped::managed_decimal_macros::{count_decimals, remove_dot};
+
+        const STR: &str = stringify!($val);
+        const DECIMALS: usize = count_decimals(STR);
+        const RAW: u64 = remove_dot(STR);
+        ManagedDecimal::<_, ConstDecimals<DECIMALS>>::const_decimals_from_raw(BigUint::from(RAW))
+    }};
+}
+
+#[macro_export]
+macro_rules! managed_decimal {
+    ($val:expr) => {{
+        use $crate::types::managed::wrapped::managed_decimal_macros::{count_decimals, remove_dot};
+
+        const STR: &str = stringify!($val);
+        const DECIMALS: usize = count_decimals(STR);
+        const RAW: u64 = remove_dot(STR);
+        ManagedDecimal::<_, NumDecimals>::from_raw_units(BigUint::from(RAW), DECIMALS)
+    }};
+}
+
 macro_rules! add_sub_const_decimals {
     ($dec1:expr, $dec2:expr, $result_add:expr, $result_sub:expr) => {
         impl Add<ConstDecimals<$dec2>> for ConstDecimals<$dec1> {
diff --git a/framework/scenario/tests/managed_decimal_test.rs b/framework/scenario/tests/managed_decimal_test.rs
index 0c4128762d..aa28b01b4a 100644
--- a/framework/scenario/tests/managed_decimal_test.rs
+++ b/framework/scenario/tests/managed_decimal_test.rs
@@ -127,21 +127,38 @@ fn test_encode_decode() {
 
 #[test]
 fn test_managed_decimal_ln() {
-    let fixed =
-        ManagedDecimal::<StaticApi, NumDecimals>::from_raw_units(BigUint::from(23u64), 0usize);
+    let fixed = ManagedDecimal::<StaticApi, ConstDecimals<0>>::const_decimals_from_raw(
+        BigUint::from(23u64),
+    );
 
-    let ln_fixed = fixed.ln(10usize); // precision of 10 decimal points
+    let ln_fixed = fixed.ln(ConstDecimals::<10>); // precision of 10 decimal points
 
     println!("{ln_fixed:?}");
     assert_eq!(
         ln_fixed,
-        ManagedDecimal::<StaticApi, NumDecimals>::from_raw_units(
-            BigUint::from(31355146488u64),
-            10usize
-        )
+        ManagedDecimal::<StaticApi, ConstDecimals<10>>::const_decimals_from_raw(BigUint::from(
+            31355146488u64
+        ),)
     );
 }
 
+// #[test]
+// fn test_managed_decimal_ln() {
+//     let fixed =
+//         ManagedDecimal::<StaticApi, NumDecimals>::from_raw_units(BigUint::from(23u64), 0usize);
+
+//     let ln_fixed = fixed.ln(&10usize); // precision of 10 decimal points
+
+//     println!("{ln_fixed:?}");
+//     assert_eq!(
+//         ln_fixed,
+//         ManagedDecimal::<StaticApi, NumDecimals>::from_raw_units(
+//             BigUint::from(31355146488u64),
+//             10usize
+//         )
+//     );
+// }
+
 // #[test]
 // fn test_managed_decimal_nth_root() {
 //     let fixed =
@@ -187,24 +204,32 @@ fn test_managed_decimal_ln() {
 
 // #[test]
 // fn test_managed_decimal_log_any_base() {
-//     let fixed = ManagedDecimal::from_raw_units(BigUint::from(10u64), 1usize);
-//     let log2_fixed = fixed.log(BigUint::from(2u64), 10_000usize);
-//     assert_eq!(
-//         log2_fixed,
-//         ManagedDecimal::<StaticApi, NumDecimals>::from_raw_units(
-//             BigUint::from(33219u64),
-//             10_000usize
-//         )
-//     );
-
-//     let fixed_const = ManagedDecimal::<StaticApi, ConstDecimals<1>>::const_decimals_from_raw(
-//         BigUint::from(10u64),
-//     );
-//     let log2_const = fixed_const.log(BigUint::from(2u64), ConstDecimals::<10_000>);
-//     assert_eq!(
-//         log2_const,
-//         ManagedDecimal::<StaticApi, ConstDecimals::<10_000>>::const_decimals_from_raw(
-//             BigUint::from(33219u64)
-//         )
-//     );
+// let fixed = ManagedDecimal::from_raw_units(BigUint::from(10000u64), 1usize);
+// let log2_fixed = fixed.log(
+//     &ManagedDecimal::from_raw_units(BigUint::from(2u64), 1usize),
+//     4usize,
+// );
+// assert_eq!(
+//     log2_fixed,
+//     ManagedDecimal::<StaticApi, NumDecimals>::from_raw_units(
+//         BigUint::from(33219u64),
+//         4usize
+//     )
+// );
+
+// let fixed_const = ManagedDecimal::<StaticApi, ConstDecimals<1>>::const_decimals_from_raw(
+//     BigUint::from(10u64),
+// );
+// let log2_const = fixed_const.log(
+//     &ManagedDecimal::<StaticApi, ConstDecimals<1>>::const_decimals_from_raw(BigUint::from(
+//         2u64,
+//     )),
+//     &ConstDecimals::<10_000>,
+// );
+// assert_eq!(
+//     log2_const,
+//     ManagedDecimal::<StaticApi, ConstDecimals::<10_000>>::const_decimals_from_raw(
+//         BigUint::from(33219u64)
+//     )
+// );
 // }

From de02d0c4eff6d97c7e9f2dcf7e23ab2e6d661251 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Tue, 11 Jun 2024 20:32:33 +0300
Subject: [PATCH 0975/1254] refactor - create proxy config

---
 .../contract/generate_proxy/proxy_gen_main.rs | 10 +--
 .../generate_proxy/proxy_generator.rs         | 81 +++++++++----------
 framework/meta-lib/src/contract/sc_config.rs  |  1 +
 .../sc_config/contract_variant_builder.rs     | 19 +++--
 .../src/contract/sc_config/proxy_config.rs    | 37 +++++++++
 .../src/contract/sc_config/sc_config_model.rs |  6 +-
 6 files changed, 93 insertions(+), 61 deletions(-)
 create mode 100644 framework/meta-lib/src/contract/sc_config/proxy_config.rs

diff --git a/framework/meta-lib/src/contract/generate_proxy/proxy_gen_main.rs b/framework/meta-lib/src/contract/generate_proxy/proxy_gen_main.rs
index 2533efda70..bcd425ae84 100644
--- a/framework/meta-lib/src/contract/generate_proxy/proxy_gen_main.rs
+++ b/framework/meta-lib/src/contract/generate_proxy/proxy_gen_main.rs
@@ -1,7 +1,7 @@
 use colored::Colorize;
 use std::fs;
 
-use crate::contract::sc_config::ProxyConfigSerde;
+use crate::contract::sc_config::proxy_config::ProxyConfig;
 
 use super::{
     super::meta_config::MetaConfig, proxy_crate_gen::create_file, proxy_generator::ProxyGenerator,
@@ -12,18 +12,18 @@ const PROXY_COMPARE_ERR_MSG: &str = "Contract has been modified and proxies have
 impl MetaConfig {
     pub fn generate_proxy(&mut self) {
         for proxy_config in &self.sc_config.proxy_configs {
-            write_proxy_with_explicit_path(proxy_config.0, self);
+            write_proxy_with_explicit_path(proxy_config, self);
         }
     }
 
     pub fn compare_proxy(&mut self) {
         for proxy_config in &self.sc_config.proxy_configs {
-            compare_proxy_explicit_path(proxy_config.0, self);
+            compare_proxy_explicit_path(proxy_config, self);
         }
     }
 }
 
-fn compare_proxy_explicit_path(proxy_config: &ProxyConfigSerde, meta_config: &MetaConfig) {
+fn compare_proxy_explicit_path(proxy_config: &ProxyConfig, meta_config: &MetaConfig) {
     let mut temp = Vec::<u8>::new();
     let mut proxy_generator = ProxyGenerator::new(meta_config, &mut temp, proxy_config);
     proxy_generator.write_proxy_to_file();
@@ -40,7 +40,7 @@ fn compare_proxy_explicit_path(proxy_config: &ProxyConfigSerde, meta_config: &Me
     }
 }
 
-fn write_proxy_with_explicit_path(proxy_config: &ProxyConfigSerde, meta_config: &MetaConfig) {
+fn write_proxy_with_explicit_path(proxy_config: &ProxyConfig, meta_config: &MetaConfig) {
     let mut file = create_file(&proxy_config.path);
     let mut proxy_generator = ProxyGenerator::new(meta_config, &mut file, proxy_config);
     proxy_generator.write_proxy_to_file();
diff --git a/framework/meta-lib/src/contract/generate_proxy/proxy_generator.rs b/framework/meta-lib/src/contract/generate_proxy/proxy_generator.rs
index b0a9267967..dbbc3f7bb0 100644
--- a/framework/meta-lib/src/contract/generate_proxy/proxy_generator.rs
+++ b/framework/meta-lib/src/contract/generate_proxy/proxy_generator.rs
@@ -1,11 +1,11 @@
 use std::fmt::Display;
 
 use multiversx_sc::abi::{
-    ContractAbi, EndpointAbi, EnumVariantDescription, InputAbi, OutputAbi, StructFieldDescription,
-    TypeContents, TypeDescription,
+    EndpointAbi, EnumVariantDescription, InputAbi, OutputAbi, StructFieldDescription, TypeContents,
+    TypeDescription,
 };
 
-use crate::contract::{meta_config::MetaConfig, sc_config::ProxyConfigSerde};
+use crate::contract::{meta_config::MetaConfig, sc_config::proxy_config::ProxyConfig};
 
 use super::proxy_process_type_name::{
     extract_paths, extract_struct_crate, process_rust_type, proxy_methods_type_name,
@@ -43,26 +43,19 @@ pub struct ProxyGenerator<'a> {
     #[allow(dead_code)]
     pub meta_config: &'a MetaConfig,
     pub file: Option<&'a mut dyn std::io::Write>,
-    pub proxy_config: &'a ProxyConfigSerde,
-    pub contract_abi: &'a ContractAbi,
+    pub proxy_config: &'a ProxyConfig,
 }
 
 impl<'a> ProxyGenerator<'a> {
     pub fn new(
         meta_config: &'a MetaConfig,
         file: &'a mut dyn std::io::Write,
-        proxy_config: &'a ProxyConfigSerde,
+        proxy_config: &'a ProxyConfig,
     ) -> Self {
         Self {
             meta_config,
             file: Some(file),
             proxy_config,
-            contract_abi: &meta_config
-                .sc_config
-                .proxy_configs
-                .get(proxy_config)
-                .unwrap()
-                .abi,
         }
     }
 
@@ -87,14 +80,17 @@ impl<'a> ProxyGenerator<'a> {
 
     fn write_header(&mut self) {
         self.writeln(PRELUDE);
-        match &self.proxy_config.override_import {
-            Some(override_import) => self.writeln(override_import),
-            None => self.writeln(IMPORTS),
+
+        if self.proxy_config.override_import.is_empty() {
+            self.writeln(IMPORTS);
+            return;
         }
+
+        self.writeln(self.proxy_config.override_import.to_owned());
     }
 
     fn write_tx_proxy_type_def(&mut self) {
-        let proxy_type_name = proxy_type_name(&self.contract_abi.name);
+        let proxy_type_name = proxy_type_name(&self.proxy_config.abi.name);
         self.writeln(format!(
             r#"
 pub struct {proxy_type_name};"#
@@ -102,8 +98,8 @@ pub struct {proxy_type_name};"#
     }
 
     fn write_impl_for_tx_proxy(&mut self) {
-        let proxy_type_name = proxy_type_name(&self.contract_abi.name);
-        let proxy_methods_type_name = proxy_methods_type_name(&self.contract_abi.name);
+        let proxy_type_name = proxy_type_name(&self.proxy_config.abi.name);
+        let proxy_methods_type_name = proxy_methods_type_name(&self.proxy_config.abi.name);
         self.writeln(format!(
             r#"
 impl<Env, From, To, Gas> TxProxyTrait<Env, From, To, Gas> for {proxy_type_name}
@@ -123,7 +119,7 @@ where
     }
 
     fn write_struct_tx_proxy_methods(&mut self) {
-        let proxy_methods_type_name = proxy_methods_type_name(&self.contract_abi.name);
+        let proxy_methods_type_name = proxy_methods_type_name(&self.proxy_config.abi.name);
         self.writeln(format!(
             r#"
 pub struct {proxy_methods_type_name}<Env, From, To, Gas>
@@ -139,22 +135,22 @@ where
     }
 
     fn write_content(&mut self) {
-        if !self.contract_abi.constructors.is_empty() {
+        if !self.proxy_config.abi.constructors.is_empty() {
             self.write_constructors();
         }
 
-        if !self.contract_abi.upgrade_constructors.is_empty() {
+        if !self.proxy_config.abi.upgrade_constructors.is_empty() {
             self.write_upgrades();
         }
 
-        if !self.contract_abi.endpoints.is_empty() {
+        if !self.proxy_config.abi.endpoints.is_empty() {
             self.write_endpoints();
         }
     }
 
     fn write_types(&mut self) {
-        for (_, type_description) in &self.contract_abi.type_descriptions.0 {
-            if self.contract_abi.get_crate_name_for_code()
+        for (_, type_description) in &self.proxy_config.abi.type_descriptions.0 {
+            if self.proxy_config.abi.get_crate_name_for_code()
                 != extract_struct_crate(type_description.names.rust.as_str())
             {
                 continue;
@@ -179,7 +175,7 @@ where
     }
 
     fn write_constructors(&mut self) {
-        let constructors: Vec<EndpointAbi> = self.contract_abi.constructors.clone();
+        let constructors: Vec<EndpointAbi> = self.proxy_config.abi.constructors.clone();
 
         self.write_header_impl_constructor();
         for (i, constructor_abi) in constructors.into_iter().enumerate() {
@@ -197,7 +193,8 @@ where
     fn write_upgrades(&mut self) {
         self.write_header_impl_upgrade();
         for (i, upgrade) in self
-            .contract_abi
+            .proxy_config
+            .abi
             .upgrade_constructors
             .clone()
             .into_iter()
@@ -215,7 +212,7 @@ where
     }
 
     fn write_endpoints(&mut self) {
-        let endpoints: Vec<EndpointAbi> = self.contract_abi.endpoints.clone();
+        let endpoints: Vec<EndpointAbi> = self.proxy_config.abi.endpoints.clone();
 
         self.write_header_impl_endpoints();
         for (i, endpoint_abi) in endpoints.into_iter().enumerate() {
@@ -231,7 +228,7 @@ where
     }
 
     fn write_header_impl_constructor(&mut self) {
-        let proxy_methods_type_name = proxy_methods_type_name(&self.contract_abi.name);
+        let proxy_methods_type_name = proxy_methods_type_name(&self.proxy_config.abi.name);
         self.writeln(format!(
             r#"
 #[rustfmt::skip]
@@ -246,7 +243,7 @@ where
     }
 
     fn write_header_impl_upgrade(&mut self) {
-        let proxy_methods_type_name = proxy_methods_type_name(&self.contract_abi.name);
+        let proxy_methods_type_name = proxy_methods_type_name(&self.proxy_config.abi.name);
         self.writeln(format!(
             r#"
 #[rustfmt::skip]
@@ -262,7 +259,7 @@ where
     }
 
     fn write_header_impl_endpoints(&mut self) {
-        let proxy_methods_type_name = proxy_methods_type_name(&self.contract_abi.name);
+        let proxy_methods_type_name = proxy_methods_type_name(&self.proxy_config.abi.name);
         self.writeln(format!(
             r#"
 #[rustfmt::skip]
@@ -580,12 +577,10 @@ where
     fn rename_path_with_custome_config(&self, processed_type: &str) -> String {
         let mut renamed_processed_type = processed_type.to_owned();
 
-        if let Some(paths_rename) = &self.proxy_config.path_rename {
-            for path_rename in paths_rename {
-                if processed_type.contains(&path_rename.from) {
-                    renamed_processed_type =
-                        renamed_processed_type.replace(&path_rename.from, &path_rename.to);
-                }
+        for path_rename in &self.proxy_config.path_rename {
+            if processed_type.contains(&path_rename.from) {
+                renamed_processed_type =
+                    renamed_processed_type.replace(&path_rename.from, &path_rename.to);
             }
         }
 
@@ -594,7 +589,7 @@ where
 
     fn process_paths(&self, paths: &Vec<String>) -> Vec<String> {
         let mut processed_paths: Vec<String> = Vec::new();
-        let crate_name = self.contract_abi.get_crate_name_for_code();
+        let crate_name = self.proxy_config.abi.get_crate_name_for_code();
 
         for path in paths {
             let type_rust_name = path.split("::").last().unwrap();
@@ -629,7 +624,7 @@ where
 pub mod tests {
     use multiversx_sc::abi::{BuildInfoAbi, ContractAbi, ContractCrateBuildAbi, FrameworkBuildAbi};
 
-    use crate::contract::{meta_config::MetaConfig, sc_config::ProxyConfigSerde};
+    use crate::contract::{meta_config::MetaConfig, sc_config::proxy_config::ProxyConfig};
 
     use super::ProxyGenerator;
 
@@ -645,12 +640,11 @@ pub mod tests {
         };
 
         let original_contract_abi = ContractAbi::new(build_info, &[""], "contract-crate", false);
-        let meta_config = MetaConfig::create(original_contract_abi, false);
+        let meta_config = MetaConfig::create(original_contract_abi.clone(), false);
         let mut proxy_generator = ProxyGenerator {
             meta_config: &meta_config,
             file: None,
-            proxy_config: &ProxyConfigSerde::new(),
-            contract_abi: &meta_config.original_contract_abi,
+            proxy_config: &ProxyConfig::new_with_default_path(original_contract_abi),
         };
 
         let cleaned_path_unsanitized = proxy_generator.clean_paths(
@@ -677,12 +671,11 @@ pub mod tests {
         };
 
         let original_contract_abi = ContractAbi::new(build_info, &[""], "contract-crate", false);
-        let meta_config = MetaConfig::create(original_contract_abi, false);
+        let meta_config = MetaConfig::create(original_contract_abi.clone(), false);
         let mut proxy_generator = ProxyGenerator {
             meta_config: &meta_config,
             file: None,
-            proxy_config: &ProxyConfigSerde::new(),
-            contract_abi: &meta_config.original_contract_abi,
+            proxy_config: &ProxyConfig::new_with_default_path(original_contract_abi),
         };
 
         let cleaned_path_sanitized = proxy_generator.clean_paths(
diff --git a/framework/meta-lib/src/contract/sc_config.rs b/framework/meta-lib/src/contract/sc_config.rs
index 2fac2e38eb..ff41a7655d 100644
--- a/framework/meta-lib/src/contract/sc_config.rs
+++ b/framework/meta-lib/src/contract/sc_config.rs
@@ -2,6 +2,7 @@ mod contract_variant;
 mod contract_variant_builder;
 mod contract_variant_settings;
 mod contract_variant_validate;
+pub mod proxy_config;
 mod sc_config_model;
 mod sc_config_proxy;
 mod sc_config_serde;
diff --git a/framework/meta-lib/src/contract/sc_config/contract_variant_builder.rs b/framework/meta-lib/src/contract/sc_config/contract_variant_builder.rs
index 2c9f37208d..8bf9793f39 100644
--- a/framework/meta-lib/src/contract/sc_config/contract_variant_builder.rs
+++ b/framework/meta-lib/src/contract/sc_config/contract_variant_builder.rs
@@ -10,6 +10,7 @@ use crate::ei::parse_check_ei;
 
 use super::{
     contract_variant_settings::{parse_allocator, parse_stack_size},
+    proxy_config::ProxyConfig,
     sc_config_model::SC_CONFIG_FILE_NAMES,
     ContractVariant, ContractVariantProfile, ContractVariantSerde, ContractVariantSettings,
     ProxyConfigSerde, ScConfig, ScConfigSerde,
@@ -281,18 +282,15 @@ fn process_contracts(config: &ScConfigSerde, original_abi: &ContractAbi) -> Vec<
     contracts
 }
 
-fn process_proxy_contracts(
-    config: &ScConfigSerde,
-    original_abi: &ContractAbi,
-) -> HashMap<ProxyConfigSerde, ContractVariant> {
-    let mut proxy_contracts = HashMap::new();
+fn process_proxy_contracts(config: &ScConfigSerde, original_abi: &ContractAbi) -> Vec<ProxyConfig> {
+    let mut proxy_contracts = Vec::new();
 
     let main_contract = process_contracts(config, original_abi)
         .into_iter()
         .find(|contract| contract.main)
         .unwrap();
 
-    proxy_contracts.insert(ProxyConfigSerde::new(), main_contract);
+    proxy_contracts.push(ProxyConfig::new_with_default_path(main_contract.abi));
 
     for proxy_config in &config.proxy {
         let mut contract_builders = HashMap::new();
@@ -326,7 +324,12 @@ fn process_proxy_contracts(
         if let Some((_, builder)) = contract_builders.into_iter().next() {
             let contract = build_contract(builder, original_abi);
 
-            proxy_contracts.insert(proxy_config.clone(), contract);
+            proxy_contracts.push(ProxyConfig::new(
+                proxy_config.path.to_owned(),
+                proxy_config.override_import.to_owned(),
+                proxy_config.path_rename.to_owned(),
+                contract.abi,
+            ));
         }
     }
 
@@ -388,7 +391,7 @@ impl ScConfig {
                 wasm_crate_name,
                 abi: original_abi.clone(),
             }],
-            proxy_configs: HashMap::new(),
+            proxy_configs: Vec::new(),
         }
     }
 
diff --git a/framework/meta-lib/src/contract/sc_config/proxy_config.rs b/framework/meta-lib/src/contract/sc_config/proxy_config.rs
new file mode 100644
index 0000000000..2097f50559
--- /dev/null
+++ b/framework/meta-lib/src/contract/sc_config/proxy_config.rs
@@ -0,0 +1,37 @@
+use multiversx_sc::abi::ContractAbi;
+
+use super::sc_config_proxy::PathRename;
+const DEFAULT_PATH: &str = "/output/proxy.rs";
+
+#[derive(Debug)]
+pub struct ProxyConfig {
+    pub path: String,
+    pub override_import: String,
+    pub path_rename: Vec<PathRename>,
+    pub abi: ContractAbi,
+}
+
+impl ProxyConfig {
+    pub fn new(
+        path: String,
+        override_imports: Option<String>,
+        path_rename: Option<Vec<PathRename>>,
+        abi: ContractAbi,
+    ) -> Self {
+        ProxyConfig {
+            path,
+            override_import: override_imports.unwrap_or_default(),
+            path_rename: path_rename.unwrap_or_default(),
+            abi,
+        }
+    }
+
+    pub fn new_with_default_path(abi: ContractAbi) -> Self {
+        ProxyConfig {
+            path: DEFAULT_PATH.to_string(),
+            override_import: String::new(),
+            path_rename: Vec::new(),
+            abi,
+        }
+    }
+}
diff --git a/framework/meta-lib/src/contract/sc_config/sc_config_model.rs b/framework/meta-lib/src/contract/sc_config/sc_config_model.rs
index 813ff929ea..8286abd5b9 100644
--- a/framework/meta-lib/src/contract/sc_config/sc_config_model.rs
+++ b/framework/meta-lib/src/contract/sc_config/sc_config_model.rs
@@ -1,7 +1,5 @@
-use std::collections::HashMap;
-
 use super::{
-    contract_variant_validate::validate_contract_variant, sc_config_proxy::ProxyConfigSerde,
+    contract_variant_validate::validate_contract_variant, proxy_config::ProxyConfig,
     ContractVariant,
 };
 
@@ -20,7 +18,7 @@ pub const SC_CONFIG_FILE_NAMES: &[&str] = &["sc-config.toml", "multicontract.tom
 pub struct ScConfig {
     pub default_contract_config_name: String,
     pub contracts: Vec<ContractVariant>,
-    pub proxy_configs: HashMap<ProxyConfigSerde, ContractVariant>,
+    pub proxy_configs: Vec<ProxyConfig>,
 }
 
 impl ScConfig {

From f2a34637cb771048e9e879584a048feb180388dd Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Wed, 12 Jun 2024 12:29:21 +0200
Subject: [PATCH 0976/1254] initial impl and test

---
 .../tests/big_float_scenario_rs_test.rs       | 13 +++++++++
 .../base/src/types/managed/basic/big_float.rs | 29 +++++++++++++++++--
 .../types/managed/wrapped/managed_decimal.rs  |  2 +-
 .../scenario/tests/managed_decimal_test.rs    |  4 +--
 4 files changed, 43 insertions(+), 5 deletions(-)

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 66ca09ab86..9aa3dc14dd 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
@@ -56,6 +56,19 @@ fn big_float_overflow_test_rs() {
     assert_eq!(forth, &BigUint::from(2184473079534488064u64));
 }
 
+#[test]
+fn big_float_ln_test_rs() {
+    let fixed = BigFloat::<StaticApi>::from_frac(23i64, 2i64);
+
+    let ln_fixed = fixed.ln(BigUint::from(10u64)); // precision of 10 decimal points
+
+    println!("{ln_fixed:?}");
+    assert_eq!(
+        ln_fixed,
+        BigFloat::from_frac(31355146488i64, 10_000_000_000i64)
+    );
+}
+
 #[test]
 fn big_float_new_from_big_int_rs() {
     world().run("scenarios/big_float_new_from_big_int.scen.json");
diff --git a/framework/base/src/types/managed/basic/big_float.rs b/framework/base/src/types/managed/basic/big_float.rs
index 934bd2c636..64c4515d4e 100644
--- a/framework/base/src/types/managed/basic/big_float.rs
+++ b/framework/base/src/types/managed/basic/big_float.rs
@@ -168,8 +168,33 @@ impl<M: ManagedTypeApi> BigFloat<M> {
         (self * denominator).trunc()
     }
 
-    pub fn to_managed_decimal<T: Decimals>(self, decimals: T) -> ManagedDecimal<M, T> {
-        ManagedDecimal::<M, T>::from_big_float(self, decimals)
+    pub fn to_managed_decimal<T: Decimals>(&self, decimals: T) -> ManagedDecimal<M, T> {
+        ManagedDecimal::<M, T>::from_big_float(&self, decimals)
+    }
+
+    pub fn ln(&self, precision: BigUint<M>) -> Self {
+        // find the highest power of 2 less than or equal to self
+        let mng_dec = self
+            .to_fixed_point(&BigFloat::from(precision))
+            .into_big_uint()
+            .unwrap_or_sc_panic("can't calculate ln for this number");
+
+        let log2 = mng_dec.log2(); // most significant bit
+        let divisor = BigFloat::from(1 << log2);
+        let x = self / &divisor; // normalize to [1.0, 2.0]
+
+        let ln_of_2 = BigFloat::from_frac(69314718i64, 100_000_000i64); // 0.69314718 8 decimals
+        let first = BigFloat::from_frac(17417939i64, 10_000_000i64); // 1.7417939, 7 decimals
+        let second = BigFloat::from_frac(28212026i64, 10_000_000i64); // 2.8212026, 7 decimals
+        let third = BigFloat::from_frac(14699568i64, 10_000_000i64); // 1.4699568, 7 decimals
+        let fourth = BigFloat::from_frac(44717955i64, 100_000_000i64); // 0.44717955, 8 decimals
+        let fifth = BigFloat::from_frac(56570851i64, 1_000_000_000i64); // 0.056570851, 9 decimals
+
+        // approximating polynom to get the result
+        let result =
+            (((fourth - fifth * x.clone()) * x.clone() - third) * x.clone() + second) * x - first;
+        let add_member = BigFloat::from_big_uint(&BigUint::from(log2)) * ln_of_2;
+        result + add_member
     }
 }
 
diff --git a/framework/base/src/types/managed/wrapped/managed_decimal.rs b/framework/base/src/types/managed/wrapped/managed_decimal.rs
index 89a7c47ca9..fb31e80e58 100644
--- a/framework/base/src/types/managed/wrapped/managed_decimal.rs
+++ b/framework/base/src/types/managed/wrapped/managed_decimal.rs
@@ -126,7 +126,7 @@ impl<M: ManagedTypeApi, D: Decimals> ManagedDecimal<M, D> {
     }
 
     pub fn from_big_float<T: Decimals>(
-        big_float: BigFloat<M>,
+        big_float: &BigFloat<M>,
         num_decimals: T,
     ) -> ManagedDecimal<M, T> {
         let scaling_factor: &BigUint<M> = &num_decimals.scaling_factor();
diff --git a/framework/scenario/tests/managed_decimal_test.rs b/framework/scenario/tests/managed_decimal_test.rs
index cbe701c9cf..ea862953e7 100644
--- a/framework/scenario/tests/managed_decimal_test.rs
+++ b/framework/scenario/tests/managed_decimal_test.rs
@@ -64,10 +64,10 @@ pub fn test_managed_decimal() {
 
     let float_1 = BigFloat::<StaticApi>::from_frac(3i64, 2i64);
     let fixed_float_1 = ManagedDecimal::<StaticApi, ConstDecimals<1>>::from_big_float(
-        float_1.clone(),
+        &float_1,
         ConstDecimals::<1>,
     );
-    let fixed_float_2 = ManagedDecimal::<StaticApi, NumDecimals>::from_big_float(float_1, 1usize);
+    let fixed_float_2 = ManagedDecimal::<StaticApi, NumDecimals>::from_big_float(&float_1, 1usize);
 
     assert_eq!(
         fixed_float_1,

From 8721d3c912946cddc21cef67ff073aa7890e9516 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Wed, 12 Jun 2024 14:52:05 +0300
Subject: [PATCH 0977/1254] update proxies

---
 .../feature-tests/abi-tester/src/abi_proxy.rs | 27 ---------
 .../forwarder/src/forwarder_main.rs           |  1 +
 .../forwarder/src/fwd_upgrade.rs              |  6 +-
 .../forwarder/src/vault_proxy.rs              | 38 ------------
 .../forwarder/src/vault_upgrade_proxy.rs      | 59 +++++++++++++++++++
 .../composability/interact/src/vault_proxy.rs | 38 ------------
 .../promises-features/src/vault_proxy.rs      | 38 ------------
 .../recursive-caller/src/vault_proxy.rs       | 38 ------------
 .../composability/vault/sc-config.toml        |  5 ++
 9 files changed, 68 insertions(+), 182 deletions(-)
 create mode 100644 contracts/feature-tests/composability/forwarder/src/vault_upgrade_proxy.rs

diff --git a/contracts/feature-tests/abi-tester/src/abi_proxy.rs b/contracts/feature-tests/abi-tester/src/abi_proxy.rs
index 2011970429..77604821e3 100644
--- a/contracts/feature-tests/abi-tester/src/abi_proxy.rs
+++ b/contracts/feature-tests/abi-tester/src/abi_proxy.rs
@@ -397,33 +397,6 @@ where
             .raw_call("payable_any_token")
             .original_result()
     }
-
-    pub fn external_view(
-        self,
-    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
-        self.wrapped_tx
-            .payment(NotPayable)
-            .raw_call("external_view")
-            .original_result()
-    }
-
-    pub fn label_a(
-        self,
-    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
-        self.wrapped_tx
-            .payment(NotPayable)
-            .raw_call("label_a")
-            .original_result()
-    }
-
-    pub fn label_b(
-        self,
-    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
-        self.wrapped_tx
-            .payment(NotPayable)
-            .raw_call("label_b")
-            .original_result()
-    }
 }
 
 #[type_abi]
diff --git a/contracts/feature-tests/composability/forwarder/src/forwarder_main.rs b/contracts/feature-tests/composability/forwarder/src/forwarder_main.rs
index cd2254587c..c6e9dcb443 100644
--- a/contracts/feature-tests/composability/forwarder/src/forwarder_main.rs
+++ b/contracts/feature-tests/composability/forwarder/src/forwarder_main.rs
@@ -14,6 +14,7 @@ pub mod fwd_sft;
 pub mod fwd_storage;
 pub mod fwd_upgrade;
 pub mod vault_proxy;
+pub mod vault_upgrade_proxy;
 
 multiversx_sc::imports!();
 
diff --git a/contracts/feature-tests/composability/forwarder/src/fwd_upgrade.rs b/contracts/feature-tests/composability/forwarder/src/fwd_upgrade.rs
index f4782821e0..11ef0b1a39 100644
--- a/contracts/feature-tests/composability/forwarder/src/fwd_upgrade.rs
+++ b/contracts/feature-tests/composability/forwarder/src/fwd_upgrade.rs
@@ -1,4 +1,4 @@
-use crate::vault_proxy;
+use crate::vault_upgrade_proxy;
 
 multiversx_sc::imports!();
 
@@ -13,7 +13,7 @@ pub trait UpgradeContractModule {
     ) {
         self.tx()
             .to(child_sc_address)
-            .typed(vault_proxy::VaultProxy)
+            .typed(vault_upgrade_proxy::VaultProxy)
             .upgrade(opt_arg)
             .code(new_code)
             .code_metadata(CodeMetadata::UPGRADEABLE)
@@ -29,7 +29,7 @@ pub trait UpgradeContractModule {
     ) {
         self.tx()
             .to(child_sc_address)
-            .typed(vault_proxy::VaultProxy)
+            .typed(vault_upgrade_proxy::VaultProxy)
             .upgrade(opt_arg)
             .code_metadata(CodeMetadata::UPGRADEABLE)
             .from_source(source_address)
diff --git a/contracts/feature-tests/composability/forwarder/src/vault_proxy.rs b/contracts/feature-tests/composability/forwarder/src/vault_proxy.rs
index 24e6f12e69..7f653bfa45 100644
--- a/contracts/feature-tests/composability/forwarder/src/vault_proxy.rs
+++ b/contracts/feature-tests/composability/forwarder/src/vault_proxy.rs
@@ -57,29 +57,6 @@ where
     }
 }
 
-#[rustfmt::skip]
-impl<Env, From, To, Gas> VaultProxyMethods<Env, From, To, Gas>
-where
-    Env: TxEnv,
-    Env::Api: VMApi,
-    From: TxFrom<Env>,
-    To: TxTo<Env>,
-    Gas: TxGas<Env>,
-{
-    pub fn upgrade<
-        Arg0: ProxyArg<OptionalValue<ManagedBuffer<Env::Api>>>,
-    >(
-        self,
-        opt_arg_to_echo: Arg0,
-    ) -> TxTypedUpgrade<Env, From, To, NotPayable, Gas, MultiValue2<&'static str, OptionalValue<ManagedBuffer<Env::Api>>>> {
-        self.wrapped_tx
-            .payment(NotPayable)
-            .raw_upgrade()
-            .argument(&opt_arg_to_echo)
-            .original_result()
-    }
-}
-
 #[rustfmt::skip]
 impl<Env, From, To, Gas> VaultProxyMethods<Env, From, To, Gas>
 where
@@ -174,21 +151,6 @@ where
             .original_result()
     }
 
-    pub fn retrieve_funds_promises<
-        Arg0: ProxyArg<OptionalValue<u64>>,
-        Arg1: ProxyArg<OptionalValue<BigUint<Env::Api>>>,
-    >(
-        self,
-        back_transfers: Arg0,
-        back_transfer_value: Arg1,
-    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
-        self.wrapped_tx
-            .raw_call("retrieve_funds_promises")
-            .argument(&back_transfers)
-            .argument(&back_transfer_value)
-            .original_result()
-    }
-
     pub fn retrieve_funds<
         Arg0: ProxyArg<EgldOrEsdtTokenIdentifier<Env::Api>>,
         Arg1: ProxyArg<u64>,
diff --git a/contracts/feature-tests/composability/forwarder/src/vault_upgrade_proxy.rs b/contracts/feature-tests/composability/forwarder/src/vault_upgrade_proxy.rs
new file mode 100644
index 0000000000..ee2a10a78f
--- /dev/null
+++ b/contracts/feature-tests/composability/forwarder/src/vault_upgrade_proxy.rs
@@ -0,0 +1,59 @@
+// Code generated by the multiversx-sc proxy generator. DO NOT EDIT.
+
+////////////////////////////////////////////////////
+////////////////// AUTO-GENERATED //////////////////
+////////////////////////////////////////////////////
+
+#![allow(dead_code)]
+#![allow(clippy::all)]
+
+use multiversx_sc::proxy_imports::*;
+
+pub struct VaultProxy;
+
+impl<Env, From, To, Gas> TxProxyTrait<Env, From, To, Gas> for VaultProxy
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    type TxProxyMethods = VaultProxyMethods<Env, From, To, Gas>;
+
+    fn proxy_methods(self, tx: Tx<Env, From, To, (), Gas, (), ()>) -> Self::TxProxyMethods {
+        VaultProxyMethods { wrapped_tx: tx }
+    }
+}
+
+pub struct VaultProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    wrapped_tx: Tx<Env, From, To, (), Gas, (), ()>,
+}
+
+#[rustfmt::skip]
+impl<Env, From, To, Gas> VaultProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn upgrade<
+        Arg0: ProxyArg<OptionalValue<ManagedBuffer<Env::Api>>>,
+    >(
+        self,
+        opt_arg_to_echo: Arg0,
+    ) -> TxTypedUpgrade<Env, From, To, NotPayable, Gas, MultiValue2<&'static str, OptionalValue<ManagedBuffer<Env::Api>>>> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_upgrade()
+            .argument(&opt_arg_to_echo)
+            .original_result()
+    }
+}
diff --git a/contracts/feature-tests/composability/interact/src/vault_proxy.rs b/contracts/feature-tests/composability/interact/src/vault_proxy.rs
index 24e6f12e69..7f653bfa45 100644
--- a/contracts/feature-tests/composability/interact/src/vault_proxy.rs
+++ b/contracts/feature-tests/composability/interact/src/vault_proxy.rs
@@ -57,29 +57,6 @@ where
     }
 }
 
-#[rustfmt::skip]
-impl<Env, From, To, Gas> VaultProxyMethods<Env, From, To, Gas>
-where
-    Env: TxEnv,
-    Env::Api: VMApi,
-    From: TxFrom<Env>,
-    To: TxTo<Env>,
-    Gas: TxGas<Env>,
-{
-    pub fn upgrade<
-        Arg0: ProxyArg<OptionalValue<ManagedBuffer<Env::Api>>>,
-    >(
-        self,
-        opt_arg_to_echo: Arg0,
-    ) -> TxTypedUpgrade<Env, From, To, NotPayable, Gas, MultiValue2<&'static str, OptionalValue<ManagedBuffer<Env::Api>>>> {
-        self.wrapped_tx
-            .payment(NotPayable)
-            .raw_upgrade()
-            .argument(&opt_arg_to_echo)
-            .original_result()
-    }
-}
-
 #[rustfmt::skip]
 impl<Env, From, To, Gas> VaultProxyMethods<Env, From, To, Gas>
 where
@@ -174,21 +151,6 @@ where
             .original_result()
     }
 
-    pub fn retrieve_funds_promises<
-        Arg0: ProxyArg<OptionalValue<u64>>,
-        Arg1: ProxyArg<OptionalValue<BigUint<Env::Api>>>,
-    >(
-        self,
-        back_transfers: Arg0,
-        back_transfer_value: Arg1,
-    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
-        self.wrapped_tx
-            .raw_call("retrieve_funds_promises")
-            .argument(&back_transfers)
-            .argument(&back_transfer_value)
-            .original_result()
-    }
-
     pub fn retrieve_funds<
         Arg0: ProxyArg<EgldOrEsdtTokenIdentifier<Env::Api>>,
         Arg1: ProxyArg<u64>,
diff --git a/contracts/feature-tests/composability/promises-features/src/vault_proxy.rs b/contracts/feature-tests/composability/promises-features/src/vault_proxy.rs
index 24e6f12e69..7f653bfa45 100644
--- a/contracts/feature-tests/composability/promises-features/src/vault_proxy.rs
+++ b/contracts/feature-tests/composability/promises-features/src/vault_proxy.rs
@@ -57,29 +57,6 @@ where
     }
 }
 
-#[rustfmt::skip]
-impl<Env, From, To, Gas> VaultProxyMethods<Env, From, To, Gas>
-where
-    Env: TxEnv,
-    Env::Api: VMApi,
-    From: TxFrom<Env>,
-    To: TxTo<Env>,
-    Gas: TxGas<Env>,
-{
-    pub fn upgrade<
-        Arg0: ProxyArg<OptionalValue<ManagedBuffer<Env::Api>>>,
-    >(
-        self,
-        opt_arg_to_echo: Arg0,
-    ) -> TxTypedUpgrade<Env, From, To, NotPayable, Gas, MultiValue2<&'static str, OptionalValue<ManagedBuffer<Env::Api>>>> {
-        self.wrapped_tx
-            .payment(NotPayable)
-            .raw_upgrade()
-            .argument(&opt_arg_to_echo)
-            .original_result()
-    }
-}
-
 #[rustfmt::skip]
 impl<Env, From, To, Gas> VaultProxyMethods<Env, From, To, Gas>
 where
@@ -174,21 +151,6 @@ where
             .original_result()
     }
 
-    pub fn retrieve_funds_promises<
-        Arg0: ProxyArg<OptionalValue<u64>>,
-        Arg1: ProxyArg<OptionalValue<BigUint<Env::Api>>>,
-    >(
-        self,
-        back_transfers: Arg0,
-        back_transfer_value: Arg1,
-    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
-        self.wrapped_tx
-            .raw_call("retrieve_funds_promises")
-            .argument(&back_transfers)
-            .argument(&back_transfer_value)
-            .original_result()
-    }
-
     pub fn retrieve_funds<
         Arg0: ProxyArg<EgldOrEsdtTokenIdentifier<Env::Api>>,
         Arg1: ProxyArg<u64>,
diff --git a/contracts/feature-tests/composability/recursive-caller/src/vault_proxy.rs b/contracts/feature-tests/composability/recursive-caller/src/vault_proxy.rs
index 24e6f12e69..7f653bfa45 100644
--- a/contracts/feature-tests/composability/recursive-caller/src/vault_proxy.rs
+++ b/contracts/feature-tests/composability/recursive-caller/src/vault_proxy.rs
@@ -57,29 +57,6 @@ where
     }
 }
 
-#[rustfmt::skip]
-impl<Env, From, To, Gas> VaultProxyMethods<Env, From, To, Gas>
-where
-    Env: TxEnv,
-    Env::Api: VMApi,
-    From: TxFrom<Env>,
-    To: TxTo<Env>,
-    Gas: TxGas<Env>,
-{
-    pub fn upgrade<
-        Arg0: ProxyArg<OptionalValue<ManagedBuffer<Env::Api>>>,
-    >(
-        self,
-        opt_arg_to_echo: Arg0,
-    ) -> TxTypedUpgrade<Env, From, To, NotPayable, Gas, MultiValue2<&'static str, OptionalValue<ManagedBuffer<Env::Api>>>> {
-        self.wrapped_tx
-            .payment(NotPayable)
-            .raw_upgrade()
-            .argument(&opt_arg_to_echo)
-            .original_result()
-    }
-}
-
 #[rustfmt::skip]
 impl<Env, From, To, Gas> VaultProxyMethods<Env, From, To, Gas>
 where
@@ -174,21 +151,6 @@ where
             .original_result()
     }
 
-    pub fn retrieve_funds_promises<
-        Arg0: ProxyArg<OptionalValue<u64>>,
-        Arg1: ProxyArg<OptionalValue<BigUint<Env::Api>>>,
-    >(
-        self,
-        back_transfers: Arg0,
-        back_transfer_value: Arg1,
-    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
-        self.wrapped_tx
-            .raw_call("retrieve_funds_promises")
-            .argument(&back_transfers)
-            .argument(&back_transfer_value)
-            .original_result()
-    }
-
     pub fn retrieve_funds<
         Arg0: ProxyArg<EgldOrEsdtTokenIdentifier<Env::Api>>,
         Arg1: ProxyArg<u64>,
diff --git a/contracts/feature-tests/composability/vault/sc-config.toml b/contracts/feature-tests/composability/vault/sc-config.toml
index 5a76bc3096..51d609dbbd 100644
--- a/contracts/feature-tests/composability/vault/sc-config.toml
+++ b/contracts/feature-tests/composability/vault/sc-config.toml
@@ -19,6 +19,11 @@ add-labels = ["upgrade"]
 [[proxy]]
 path = "../forwarder/src/vault_proxy.rs"
 
+[[proxy]]
+path = "../forwarder/src/vault_upgrade_proxy.rs"
+add-unlabelled = false
+add-labels = ["upgrade"]
+
 [[proxy]]
 path = "../promises-features/src/vault_proxy.rs"
 

From fada5b36dd01bb2a6266f356cd48e8230ee3b290 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 12 Jun 2024 18:32:39 +0300
Subject: [PATCH 0978/1254] ManagedDecimal - SCDisplay, Display, Debug

---
 .../types/managed/wrapped/managed_decimal.rs  | 33 +++++++++++++++++--
 .../scenario/tests/managed_decimal_test.rs    |  6 ++--
 2 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/framework/base/src/types/managed/wrapped/managed_decimal.rs b/framework/base/src/types/managed/wrapped/managed_decimal.rs
index fb31e80e58..2ca276ca9c 100644
--- a/framework/base/src/types/managed/wrapped/managed_decimal.rs
+++ b/framework/base/src/types/managed/wrapped/managed_decimal.rs
@@ -4,9 +4,11 @@ use crate::{
         const_handles, use_raw_handle, BigFloatApiImpl, BigIntApiImpl, ManagedTypeApi,
         StaticVarApiImpl,
     },
+    formatter::{FormatBuffer, FormatByteReceiver, SCDisplay},
     types::{BigFloat, BigUint},
 };
 
+use alloc::string::ToString;
 use multiversx_sc_codec::{
     DecodeError, DecodeErrorHandler, EncodeErrorHandler, NestedDecode, NestedDecodeInput,
     NestedEncode, NestedEncodeOutput, TopDecode, TopDecodeInput, TopEncode, TopEncodeOutput,
@@ -17,7 +19,7 @@ use core::{
     ops::{Add, Deref, Div, Mul, Sub},
 };
 
-use super::ManagedRef;
+use super::{ManagedBufferCachedBuilder, ManagedRef};
 
 fn scaling_factor<M: ManagedTypeApi>(
     num_decimals: NumDecimals,
@@ -71,7 +73,7 @@ impl<const DECIMALS: NumDecimals> Decimals for ConstDecimals<DECIMALS> {
     }
 }
 
-#[derive(Debug, Clone)]
+#[derive(Clone)]
 pub struct ManagedDecimal<M: ManagedTypeApi, D: Decimals> {
     data: BigUint<M>,
     decimals: D,
@@ -402,3 +404,30 @@ impl<M: ManagedTypeApi, const DECIMALS: NumDecimals> TypeAbi
         false
     }
 }
+impl<M: ManagedTypeApi, D: Decimals> SCDisplay for ManagedDecimal<M, D> {
+    fn fmt<F: FormatByteReceiver>(&self, f: &mut F) {
+        let sf = self.decimals.scaling_factor();
+        let temp = &self.data / sf.deref();
+        temp.fmt(f);
+        f.append_bytes(b".");
+        let temp = &self.data % sf.deref();
+        temp.fmt(f);
+    }
+}
+
+impl<M: ManagedTypeApi, D: Decimals> core::fmt::Display for ManagedDecimal<M, D> {
+    fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
+        let mut result = ManagedBufferCachedBuilder::<M>::new_from_slice(&[]);
+        result.append_display(self);
+        core::fmt::Display::fmt(&result.into_managed_buffer(), f)
+    }
+}
+
+impl<M: ManagedTypeApi, D: Decimals> core::fmt::Debug for ManagedDecimal<M, D> {
+    fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
+        f.debug_struct("ManagedDecimal")
+            .field("handle", &self.data.handle.clone())
+            .field("number", &self.to_string())
+            .finish()
+    }
+}
diff --git a/framework/scenario/tests/managed_decimal_test.rs b/framework/scenario/tests/managed_decimal_test.rs
index ea862953e7..ec7d29fd9d 100644
--- a/framework/scenario/tests/managed_decimal_test.rs
+++ b/framework/scenario/tests/managed_decimal_test.rs
@@ -63,10 +63,8 @@ pub fn test_managed_decimal() {
     );
 
     let float_1 = BigFloat::<StaticApi>::from_frac(3i64, 2i64);
-    let fixed_float_1 = ManagedDecimal::<StaticApi, ConstDecimals<1>>::from_big_float(
-        &float_1,
-        ConstDecimals::<1>,
-    );
+    let fixed_float_1 =
+        ManagedDecimal::<StaticApi, ConstDecimals<1>>::from_big_float(&float_1, ConstDecimals::<1>);
     let fixed_float_2 = ManagedDecimal::<StaticApi, NumDecimals>::from_big_float(&float_1, 1usize);
 
     assert_eq!(

From 20acd9ecdd649378733d5f82f356cae3dca96ba6 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 12 Jun 2024 18:33:28 +0300
Subject: [PATCH 0979/1254] BigFloat - ln fix

---
 .../tests/big_float_scenario_rs_test.rs       | 16 ++++----
 .../base/src/types/managed/basic/big_float.rs | 38 +++++++++++--------
 .../src/types/managed/basic/big_float_cmp.rs  |  7 ++++
 3 files changed, 36 insertions(+), 25 deletions(-)

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 9aa3dc14dd..3879706111 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
@@ -58,15 +58,13 @@ fn big_float_overflow_test_rs() {
 
 #[test]
 fn big_float_ln_test_rs() {
-    let fixed = BigFloat::<StaticApi>::from_frac(23i64, 2i64);
-
-    let ln_fixed = fixed.ln(BigUint::from(10u64)); // precision of 10 decimal points
-
-    println!("{ln_fixed:?}");
-    assert_eq!(
-        ln_fixed,
-        BigFloat::from_frac(31355146488i64, 10_000_000_000i64)
-    );
+    let x = BigFloat::<StaticApi>::from(23i64);
+    let ln_x = x.ln();
+    assert_eq!(ln_x.to_managed_decimal(9usize).to_string(), "3.135514648");
+    assert!(ln_x.is_close(
+        &BigFloat::from_frac(3135514648, 1_000_000_000), // 3.135514648
+        &BigFloat::from_frac(1, 1_000_000_000)
+    ));
 }
 
 #[test]
diff --git a/framework/base/src/types/managed/basic/big_float.rs b/framework/base/src/types/managed/basic/big_float.rs
index 64c4515d4e..4c363690aa 100644
--- a/framework/base/src/types/managed/basic/big_float.rs
+++ b/framework/base/src/types/managed/basic/big_float.rs
@@ -93,7 +93,6 @@ big_float_conv_num! {i16}
 big_float_conv_num! {i8}
 
 impl<M: ManagedTypeApi> BigFloat<M> {
-    #[inline]
     pub fn neg(&self) -> Self {
         let new_bf_handle: M::BigFloatHandle =
             use_raw_handle(M::static_var_api_impl().next_handle());
@@ -101,7 +100,13 @@ impl<M: ManagedTypeApi> BigFloat<M> {
         BigFloat::from_handle(new_bf_handle)
     }
 
-    #[inline]
+    pub fn abs(&self) -> Self {
+        let new_bf_handle: M::BigFloatHandle =
+            use_raw_handle(M::static_var_api_impl().next_handle());
+        M::managed_type_impl().bf_abs(new_bf_handle.clone(), self.handle.clone());
+        BigFloat::from_handle(new_bf_handle)
+    }
+
     pub fn from_big_uint(big_uint: &BigUint<M>) -> Self {
         let new_bf_handle: M::BigFloatHandle =
             use_raw_handle(M::static_var_api_impl().next_handle());
@@ -109,7 +114,6 @@ impl<M: ManagedTypeApi> BigFloat<M> {
         BigFloat::from_handle(new_bf_handle)
     }
 
-    #[inline]
     pub fn from_big_int(big_int: &BigInt<M>) -> Self {
         let new_bf_handle: M::BigFloatHandle =
             use_raw_handle(M::static_var_api_impl().next_handle());
@@ -169,31 +173,33 @@ impl<M: ManagedTypeApi> BigFloat<M> {
     }
 
     pub fn to_managed_decimal<T: Decimals>(&self, decimals: T) -> ManagedDecimal<M, T> {
-        ManagedDecimal::<M, T>::from_big_float(&self, decimals)
+        ManagedDecimal::<M, T>::from_big_float(self, decimals)
     }
 
-    pub fn ln(&self, precision: BigUint<M>) -> Self {
+    pub fn ln(&self) -> Self {
         // find the highest power of 2 less than or equal to self
-        let mng_dec = self
-            .to_fixed_point(&BigFloat::from(precision))
+        let trunc_val = self.trunc();
+        let trunc_val_unsigned = trunc_val
             .into_big_uint()
-            .unwrap_or_sc_panic("can't calculate ln for this number");
-
-        let log2 = mng_dec.log2(); // most significant bit
-        let divisor = BigFloat::from(1 << log2);
+            .unwrap_or_sc_panic("log argument must be positive");
+        let bit_log2 = trunc_val_unsigned.log2(); // aproximate, based on position of the most significant bit
+        let divisor = BigFloat::from(1 << bit_log2);
         let x = self / &divisor; // normalize to [1.0, 2.0]
 
+        debug_assert!(x >= 1);
+        debug_assert!(x <= 2);
+
         let ln_of_2 = BigFloat::from_frac(69314718i64, 100_000_000i64); // 0.69314718 8 decimals
-        let first = BigFloat::from_frac(17417939i64, 10_000_000i64); // 1.7417939, 7 decimals
+        let first = BigFloat::from_frac(-17417939i64, 10_000_000i64); // -1.7417939, 7 decimals
         let second = BigFloat::from_frac(28212026i64, 10_000_000i64); // 2.8212026, 7 decimals
-        let third = BigFloat::from_frac(14699568i64, 10_000_000i64); // 1.4699568, 7 decimals
+        let third = BigFloat::from_frac(-14699568i64, 10_000_000i64); // -1.4699568, 7 decimals
         let fourth = BigFloat::from_frac(44717955i64, 100_000_000i64); // 0.44717955, 8 decimals
-        let fifth = BigFloat::from_frac(56570851i64, 1_000_000_000i64); // 0.056570851, 9 decimals
+        let fifth = BigFloat::from_frac(-56570851i64, 1_000_000_000i64); // -0.056570851, 9 decimals
 
         // approximating polynom to get the result
         let result =
-            (((fourth - fifth * x.clone()) * x.clone() - third) * x.clone() + second) * x - first;
-        let add_member = BigFloat::from_big_uint(&BigUint::from(log2)) * ln_of_2;
+            (((fourth + fifth * x.clone()) * x.clone() + third) * x.clone() + second) * x + first;
+        let add_member = BigFloat::from_big_uint(&BigUint::from(bit_log2)) * ln_of_2;
         result + add_member
     }
 }
diff --git a/framework/base/src/types/managed/basic/big_float_cmp.rs b/framework/base/src/types/managed/basic/big_float_cmp.rs
index d3958667e6..2b342bdb76 100644
--- a/framework/base/src/types/managed/basic/big_float_cmp.rs
+++ b/framework/base/src/types/managed/basic/big_float_cmp.rs
@@ -4,6 +4,13 @@ use crate::api::{use_raw_handle, BigFloatApiImpl, ManagedTypeApi, StaticVarApiIm
 
 use super::{BigFloat, BigInt};
 
+impl<M: ManagedTypeApi> BigFloat<M> {
+    pub fn is_close(&self, other: &Self, abs_tolerance: &Self) -> bool {
+        // TODO: temp handles
+        &(self - other).abs() <= abs_tolerance
+    }
+}
+
 impl<M: ManagedTypeApi> PartialEq for BigFloat<M> {
     #[inline]
     fn eq(&self, other: &Self) -> bool {

From b86ac8e3b05d4c51ae493a0d1fe7e1a9eb0f28a1 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 12 Jun 2024 19:34:06 +0300
Subject: [PATCH 0980/1254] BigFloat - ln optimization

---
 .../base/src/types/managed/basic/big_float.rs | 24 ++++++++++---------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/framework/base/src/types/managed/basic/big_float.rs b/framework/base/src/types/managed/basic/big_float.rs
index 4c363690aa..c0a52c8eff 100644
--- a/framework/base/src/types/managed/basic/big_float.rs
+++ b/framework/base/src/types/managed/basic/big_float.rs
@@ -189,18 +189,20 @@ impl<M: ManagedTypeApi> BigFloat<M> {
         debug_assert!(x >= 1);
         debug_assert!(x <= 2);
 
+        let mut result = BigFloat::from_frac(-56570851i64, 1_000_000_000i64); // -0.056570851, 9 decimals;
+        result *= &x;
+        result += BigFloat::from_frac(44717955i64, 100_000_000i64); // 0.44717955, 8 decimals;
+        result *= &x;
+        result += BigFloat::from_frac(-14699568i64, 10_000_000i64); // -1.4699568, 7 decimals;
+        result *= &x;
+        result += BigFloat::from_frac(28212026i64, 10_000_000i64); // 2.8212026, 7 decimals;
+        result *= &x;
+        result += BigFloat::from_frac(-17417939i64, 10_000_000i64); // -1.7417939, 7 decimals;
+
         let ln_of_2 = BigFloat::from_frac(69314718i64, 100_000_000i64); // 0.69314718 8 decimals
-        let first = BigFloat::from_frac(-17417939i64, 10_000_000i64); // -1.7417939, 7 decimals
-        let second = BigFloat::from_frac(28212026i64, 10_000_000i64); // 2.8212026, 7 decimals
-        let third = BigFloat::from_frac(-14699568i64, 10_000_000i64); // -1.4699568, 7 decimals
-        let fourth = BigFloat::from_frac(44717955i64, 100_000_000i64); // 0.44717955, 8 decimals
-        let fifth = BigFloat::from_frac(-56570851i64, 1_000_000_000i64); // -0.056570851, 9 decimals
-
-        // approximating polynom to get the result
-        let result =
-            (((fourth + fifth * x.clone()) * x.clone() + third) * x.clone() + second) * x + first;
-        let add_member = BigFloat::from_big_uint(&BigUint::from(bit_log2)) * ln_of_2;
-        result + add_member
+        result += BigFloat::from(bit_log2 as i32) * ln_of_2;
+
+        result
     }
 }
 

From 0f0bff648fa21e4edd160a7188547ce9b02c5e58 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 13 Jun 2024 08:04:14 +0300
Subject: [PATCH 0981/1254] BigFloat - ln optimization

---
 .../base/src/types/managed/basic/big_float.rs      | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/framework/base/src/types/managed/basic/big_float.rs b/framework/base/src/types/managed/basic/big_float.rs
index c0a52c8eff..d618b7f1c7 100644
--- a/framework/base/src/types/managed/basic/big_float.rs
+++ b/framework/base/src/types/managed/basic/big_float.rs
@@ -189,17 +189,19 @@ impl<M: ManagedTypeApi> BigFloat<M> {
         debug_assert!(x >= 1);
         debug_assert!(x <= 2);
 
-        let mut result = BigFloat::from_frac(-56570851i64, 1_000_000_000i64); // -0.056570851, 9 decimals;
+        const DENOMINATOR: i64 = 1_000_000_000;
+
+        let mut result = BigFloat::from_frac(-56570851, DENOMINATOR); // -0.056570851
         result *= &x;
-        result += BigFloat::from_frac(44717955i64, 100_000_000i64); // 0.44717955, 8 decimals;
+        result += BigFloat::from_frac(447179550, DENOMINATOR); // 0.44717955
         result *= &x;
-        result += BigFloat::from_frac(-14699568i64, 10_000_000i64); // -1.4699568, 7 decimals;
+        result += BigFloat::from_frac(-1469956800, DENOMINATOR); // -1.4699568
         result *= &x;
-        result += BigFloat::from_frac(28212026i64, 10_000_000i64); // 2.8212026, 7 decimals;
+        result += BigFloat::from_frac(2821202600, DENOMINATOR); // 2.8212026
         result *= &x;
-        result += BigFloat::from_frac(-17417939i64, 10_000_000i64); // -1.7417939, 7 decimals;
+        result += BigFloat::from_frac(-1741793900, DENOMINATOR); // -1.7417939
 
-        let ln_of_2 = BigFloat::from_frac(69314718i64, 100_000_000i64); // 0.69314718 8 decimals
+        let ln_of_2 = BigFloat::from_frac(693147180, DENOMINATOR); // 0.69314718
         result += BigFloat::from(bit_log2 as i32) * ln_of_2;
 
         result

From 8540cc71eb284c6d959f5d75ead13a30f118b70a Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 13 Jun 2024 19:41:45 +0300
Subject: [PATCH 0982/1254] BigUint - ln

---
 .../basic-features/src/big_num_methods.rs     |  2 +-
 .../base/src/types/managed/basic/big_uint.rs  | 51 +++++++++++++++++--
 framework/scenario/tests/big_uint_test.rs     | 10 ++++
 3 files changed, 59 insertions(+), 4 deletions(-)
 create mode 100644 framework/scenario/tests/big_uint_test.rs

diff --git a/contracts/feature-tests/basic-features/src/big_num_methods.rs b/contracts/feature-tests/basic-features/src/big_num_methods.rs
index 086f89761b..c30b8cb56e 100644
--- a/contracts/feature-tests/basic-features/src/big_num_methods.rs
+++ b/contracts/feature-tests/basic-features/src/big_num_methods.rs
@@ -48,7 +48,7 @@ pub trait BigIntMethods {
     }
 
     #[endpoint]
-    fn biguint_overwrite_u64(&self, bu: BigUint, small: u64) -> BigUint {
+    fn biguint_overwrite_u64(&self, mut bu: BigUint, small: u64) -> BigUint {
         bu.overwrite_u64(small);
         bu
     }
diff --git a/framework/base/src/types/managed/basic/big_uint.rs b/framework/base/src/types/managed/basic/big_uint.rs
index 7f9f6bb17b..110a6b46d1 100644
--- a/framework/base/src/types/managed/basic/big_uint.rs
+++ b/framework/base/src/types/managed/basic/big_uint.rs
@@ -10,9 +10,12 @@ use crate::{
         DecodeErrorHandler, EncodeErrorHandler, NestedDecode, NestedDecodeInput, NestedEncode,
         NestedEncodeOutput, TopDecode, TopDecodeInput, TopEncode, TopEncodeOutput, TryStaticCast,
     },
+    contract_base::ErrorHelper,
     formatter::{hex_util::encode_bytes_as_hex, FormatBuffer, FormatByteReceiver, SCDisplay},
-    proxy_imports::ManagedRef,
-    types::{heap::BoxedBytes, ManagedBuffer, ManagedBufferCachedBuilder, ManagedType},
+    types::{
+        heap::BoxedBytes, ConstDecimals, Decimals, ManagedBuffer, ManagedBufferCachedBuilder,
+        ManagedDecimal, ManagedRef, ManagedType,
+    },
 };
 
 use super::cast_to_i64::cast_to_i64;
@@ -176,7 +179,7 @@ impl<M: ManagedTypeApi> BigUint<M> {
     }
 
     #[inline]
-    pub fn overwrite_u64(&self, value: u64) {
+    pub fn overwrite_u64(&mut self, value: u64) {
         Self::set_value(self.handle.clone(), value);
     }
 
@@ -236,6 +239,48 @@ impl<M: ManagedTypeApi> BigUint<M> {
         let api = M::managed_type_impl();
         api.bi_log2(self.handle.clone())
     }
+
+    pub fn ln(&self) -> ManagedDecimal<M, ConstDecimals<9>> {
+        let bit_log2 = self.log2(); // aproximate, based on position of the most significant bit
+        let scaling_factor_9 = ConstDecimals::<9>.scaling_factor();
+        let divisor = BigUint::from(1u64 << bit_log2);
+        let normalized = self * &*scaling_factor_9 / divisor;
+
+        let x = normalized
+            .to_u64()
+            .unwrap_or_else(|| ErrorHelper::<M>::signal_error_with_message("ln internal error"))
+            as i64;
+
+        const DENOMINATOR: i64 = 1_000_000_000;
+
+        // x normalized to [1.0, 2.0]
+        debug_assert!(x >= DENOMINATOR);
+        debug_assert!(x <= 2 * DENOMINATOR);
+
+        let mut result: i64 = -56570851; // -0.056570851
+        result *= x;
+        result /= DENOMINATOR;
+        result += 447179550; // 0.44717955
+        result *= x;
+        result /= DENOMINATOR;
+        result += -1469956800; // -1.4699568
+        result *= x;
+        result /= DENOMINATOR;
+        result += 2821202600; // 2.8212026
+        result *= x;
+        result /= DENOMINATOR;
+        result += -1741793900; // -1.7417939
+
+        const LN_OF_2_SCALE_9: i64 = 693147180; // 0.69314718
+        result += bit_log2 as i64 * LN_OF_2_SCALE_9;
+
+        debug_assert!(result > 0);
+
+        let mut result_bi = normalized; // reuse handle
+        result_bi.overwrite_u64(result as u64);
+
+        ManagedDecimal::const_decimals_from_raw(result_bi)
+    }
 }
 
 impl<M: ManagedTypeApi> Clone for BigUint<M> {
diff --git a/framework/scenario/tests/big_uint_test.rs b/framework/scenario/tests/big_uint_test.rs
new file mode 100644
index 0000000000..d31eba9346
--- /dev/null
+++ b/framework/scenario/tests/big_uint_test.rs
@@ -0,0 +1,10 @@
+use multiversx_sc::types::BigUint;
+use multiversx_sc_scenario::api::StaticApi;
+
+#[test]
+fn test_big_uint_ln() {
+    // ln(23) = 3.1354942159291497
+    let x = BigUint::<StaticApi>::from(23u32);
+    let ln_x = x.ln();
+    assert_eq!(ln_x.to_string(), "3.135514649"); // first 6 decimals are ok
+}

From f2648b76c668092f2604189addb3a6cf3c39d443 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 13 Jun 2024 20:04:49 +0300
Subject: [PATCH 0983/1254] BigUint - ln - exploration via tests

---
 framework/scenario/tests/big_uint_test.rs | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/framework/scenario/tests/big_uint_test.rs b/framework/scenario/tests/big_uint_test.rs
index d31eba9346..6c33032a36 100644
--- a/framework/scenario/tests/big_uint_test.rs
+++ b/framework/scenario/tests/big_uint_test.rs
@@ -1,10 +1,22 @@
 use multiversx_sc::types::BigUint;
 use multiversx_sc_scenario::api::StaticApi;
 
+fn assert_big_uint_ln(x: u32, ln_str: &str) {
+    let x = BigUint::<StaticApi>::from(x);
+    let ln_x = x.ln();
+    assert_eq!(ln_x.to_string(), ln_str);
+}
+
 #[test]
 fn test_big_uint_ln() {
-    // ln(23) = 3.1354942159291497
-    let x = BigUint::<StaticApi>::from(23u32);
-    let ln_x = x.ln();
-    assert_eq!(ln_x.to_string(), "3.135514649"); // first 6 decimals are ok
+    assert_big_uint_ln(23, "3.135514649"); // vs. 3.1354942159291497 first 6 decimals are ok
+
+    assert_big_uint_ln(1, "0.60599");
+    assert_big_uint_ln(2, "0.693207779"); // vs. 0.6931471805599453
+    assert_big_uint_ln(3, "1.98595430"); // vs. 1.0986122886681096
+    assert_big_uint_ln(4, "1.386354959"); // vs. 1.3862943611198906
+    assert_big_uint_ln(5, "1.609481340"); // vs. 1.6094379124341003
+    assert_big_uint_ln(6, "1.791742610"); // vs. 1.791759469228055
+
+    assert_big_uint_ln(1000, "6.907784913"); // vs. 6.907755278982137
 }

From c3f0731f2ed528c12b993cfcaee307d6f655569e Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Thu, 13 Jun 2024 19:12:54 +0200
Subject: [PATCH 0984/1254] added more tests

---
 .../scenarios/big_uint_log2.json              |  50 +++++++-
 .../scenarios/big_float_operators.scen.json   |  22 +++-
 .../src/big_float_operators.rs                |   4 +
 .../src/big_float_operators_wrapped.rs        |  10 ++
 .../tests/big_float_scenario_rs_test.rs       |  58 +---------
 .../base/src/types/managed/basic/big_float.rs |   4 +
 framework/scenario/tests/big_float_test.rs    | 107 ++++++++++++++++++
 7 files changed, 196 insertions(+), 59 deletions(-)
 create mode 100644 framework/scenario/tests/big_float_test.rs

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 18fea6a2c4..e4e6d5c974 100644
--- a/contracts/feature-tests/basic-features/scenarios/big_uint_log2.json
+++ b/contracts/feature-tests/basic-features/scenarios/big_uint_log2.json
@@ -42,6 +42,54 @@
                 "gas": "*",
                 "refund": "*"
             }
+        },
+        {
+            "step": "scCall",
+            "id": "log2 from 1",
+            "tx": {
+                "from": "address:an_account",
+                "to": "sc:basic-features",
+                "value": "0",
+                "function": "log2_big_uint",
+                "arguments": [
+                    "1"
+                ],
+                "gasLimit": "50,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": [
+                    "0"
+                ],
+                "status": "0",
+                "logs": "*",
+                "gas": "*",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "log2 from 0",
+            "tx": {
+                "from": "address:an_account",
+                "to": "sc:basic-features",
+                "value": "0",
+                "function": "log2_big_uint",
+                "arguments": [
+                    "0"
+                ],
+                "gasLimit": "50,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": [
+                    "0"
+                ],
+                "status": "0",
+                "logs": "*",
+                "gas": "*",
+                "refund": "*"
+            }
         }
     ]
-}
+}
\ No newline at end of file
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 30c020132b..3021715617 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
@@ -820,6 +820,26 @@
                     "-1"
                 ]
             }
+        },
+        {
+            "step": "scCall",
+            "id": "LnBigFloatRef - 1",
+            "tx": {
+                "from": "address:an_account",
+                "to": "sc:basic-features",
+                "function": "ln_big_float_ref_wrapped",
+                "arguments": [
+                    "23",
+                    "9"
+                ],
+                "gasLimit": "50,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": [
+                    "0x00000004bae4281800000009"
+                ]
+            }
         }
     ]
-}
+}
\ No newline at end of file
diff --git a/contracts/feature-tests/big-float-features/src/big_float_operators.rs b/contracts/feature-tests/big-float-features/src/big_float_operators.rs
index abf239b52a..fcad578694 100644
--- a/contracts/feature-tests/big-float-features/src/big_float_operators.rs
+++ b/contracts/feature-tests/big-float-features/src/big_float_operators.rs
@@ -85,4 +85,8 @@ pub trait BigFloatOperators {
         r /= b;
         r
     }
+    #[endpoint]
+    fn ln_big_float_ref(&self, a: &BigFloat) -> BigFloat {
+        a.ln()
+    }
 }
diff --git a/contracts/feature-tests/big-float-features/src/big_float_operators_wrapped.rs b/contracts/feature-tests/big-float-features/src/big_float_operators_wrapped.rs
index 74b6045d1c..14cf56510d 100644
--- a/contracts/feature-tests/big-float-features/src/big_float_operators_wrapped.rs
+++ b/contracts/feature-tests/big-float-features/src/big_float_operators_wrapped.rs
@@ -158,4 +158,14 @@ pub trait BigFloatWrappedOperators: big_float_operators::BigFloatOperators {
         let number = self.div_assign_big_float_ref(&BigFloat::from(a), &BigFloat::from(b));
         number.to_fixed_point(&BigFloat::from(fixed_point_denominator))
     }
+
+    #[endpoint]
+    fn ln_big_float_ref_wrapped(
+        &self,
+        a: BigInt,
+        precision: usize,
+    ) -> ManagedDecimal<Self::Api, usize> {
+        let number = self.ln_big_float_ref(&BigFloat::from(a));
+        number.to_managed_decimal(precision)
+    }
 }
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 3879706111..60a9d0ed35 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
@@ -1,5 +1,4 @@
-use multiversx_sc::types::{BigFloat, BigUint};
-use multiversx_sc_scenario::{api::StaticApi, *};
+use multiversx_sc_scenario::*;
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
@@ -12,61 +11,6 @@ fn world() -> ScenarioWorld {
     blockchain
 }
 
-#[test]
-fn big_float_overflow_test_rs() {
-    let exp = 1_080i32;
-
-    let first = BigFloat::<StaticApi>::from_sci(1_005, -3)
-        .pow(exp)
-        .to_fixed_point(&(100_000_000_000_000_000i64.into()))
-        .into_big_uint();
-
-    let second = BigFloat::<StaticApi>::from_sci(1_005, -3)
-        .pow(exp)
-        .to_fixed_point(&(10_000_000_000_000_000i64.into()))
-        .into_big_uint();
-
-    let third_float = BigFloat::<StaticApi>::from_sci(1_005, -3)
-        .pow(exp)
-        .to_managed_decimal(17usize);
-    let third = third_float.into_raw_units();
-
-    let forth_float = BigFloat::<StaticApi>::from_sci(1_005, -3)
-        .pow(exp)
-        .to_managed_decimal(16usize);
-    let forth = forth_float.into_raw_units();
-
-    assert_eq!(
-        first.unwrap_or_sc_panic("unwrap failed"),
-        /* overflow */
-        BigUint::from(9223372036854775807u64)
-    );
-
-    assert_eq!(
-        second.unwrap_or_sc_panic("unwrap failed"),
-        BigUint::from(2184473079534488064u64)
-    );
-
-    assert_eq!(
-        third,
-        /* overflow */
-        &BigUint::from(9223372036854775807u64)
-    );
-
-    assert_eq!(forth, &BigUint::from(2184473079534488064u64));
-}
-
-#[test]
-fn big_float_ln_test_rs() {
-    let x = BigFloat::<StaticApi>::from(23i64);
-    let ln_x = x.ln();
-    assert_eq!(ln_x.to_managed_decimal(9usize).to_string(), "3.135514648");
-    assert!(ln_x.is_close(
-        &BigFloat::from_frac(3135514648, 1_000_000_000), // 3.135514648
-        &BigFloat::from_frac(1, 1_000_000_000)
-    ));
-}
-
 #[test]
 fn big_float_new_from_big_int_rs() {
     world().run("scenarios/big_float_new_from_big_int.scen.json");
diff --git a/framework/base/src/types/managed/basic/big_float.rs b/framework/base/src/types/managed/basic/big_float.rs
index d618b7f1c7..bd45e5bccc 100644
--- a/framework/base/src/types/managed/basic/big_float.rs
+++ b/framework/base/src/types/managed/basic/big_float.rs
@@ -177,6 +177,10 @@ impl<M: ManagedTypeApi> BigFloat<M> {
     }
 
     pub fn ln(&self) -> Self {
+        if *self == BigFloat::from(1i64) {
+            return BigFloat::from(0i64);
+        }
+
         // find the highest power of 2 less than or equal to self
         let trunc_val = self.trunc();
         let trunc_val_unsigned = trunc_val
diff --git a/framework/scenario/tests/big_float_test.rs b/framework/scenario/tests/big_float_test.rs
new file mode 100644
index 0000000000..d5e0a16526
--- /dev/null
+++ b/framework/scenario/tests/big_float_test.rs
@@ -0,0 +1,107 @@
+use multiversx_sc::types::{BigFloat, BigUint};
+use multiversx_sc_scenario::api::StaticApi;
+
+#[test]
+fn big_float_overflow_test_rs() {
+    let exp = 1_080i32;
+
+    let first = BigFloat::<StaticApi>::from_sci(1_005, -3)
+        .pow(exp)
+        .to_fixed_point(&(100_000_000_000_000_000i64.into()))
+        .into_big_uint();
+
+    let second = BigFloat::<StaticApi>::from_sci(1_005, -3)
+        .pow(exp)
+        .to_fixed_point(&(10_000_000_000_000_000i64.into()))
+        .into_big_uint();
+
+    let third_float = BigFloat::<StaticApi>::from_sci(1_005, -3)
+        .pow(exp)
+        .to_managed_decimal(17usize);
+    let third = third_float.into_raw_units();
+
+    let forth_float = BigFloat::<StaticApi>::from_sci(1_005, -3)
+        .pow(exp)
+        .to_managed_decimal(16usize);
+    let forth = forth_float.into_raw_units();
+
+    assert_eq!(
+        first.unwrap_or_sc_panic("unwrap failed"),
+        /* overflow */
+        BigUint::from(9223372036854775807u64)
+    );
+
+    assert_eq!(
+        second.unwrap_or_sc_panic("unwrap failed"),
+        BigUint::from(2184473079534488064u64)
+    );
+
+    assert_eq!(
+        third,
+        /* overflow */
+        &BigUint::from(9223372036854775807u64)
+    );
+
+    assert_eq!(forth, &BigUint::from(2184473079534488064u64));
+}
+
+#[test]
+fn big_float_ln_test_rs() {
+    let x = BigFloat::<StaticApi>::from(23i64);
+    let ln_x = x.ln();
+    assert_eq!(ln_x.to_managed_decimal(9usize).to_string(), "3.135514648");
+    assert!(ln_x.is_close(
+        &BigFloat::from_frac(3135514648, 1_000_000_000), // 3.135514648
+        &BigFloat::from_frac(1, 1_000_000_000)
+    ));
+
+    let big = BigFloat::<StaticApi>::from(382747812i64);
+    let ln_big = big.ln();
+    assert_eq!(
+        ln_big.to_managed_decimal(9usize).to_string(),
+        "19.762913880"
+    );
+    assert!(ln_big.is_close(
+        &BigFloat::from_frac(19762913880, 1_000_000_000), // 19.762913880
+        &BigFloat::from_frac(1, 1_000_000_000)
+    ));
+
+    let biggest = BigFloat::<StaticApi>::from(999999999i64);
+    let ln_biggest = biggest.ln();
+    assert_eq!(
+        ln_biggest.to_managed_decimal(9usize).to_string(),
+        "20.723319778"
+    );
+    assert!(ln_biggest.is_close(
+        &BigFloat::from_frac(20723319778, 1_000_000_000), // 20.723319778
+        &BigFloat::from_frac(1, 1_000_000_000)
+    ));
+
+    let small = BigFloat::<StaticApi>::from_frac(3i64, 2i64);
+    let ln_small = small.ln();
+    assert_eq!(
+        ln_small.to_managed_decimal(9usize).to_string(),
+        "0.405448248"
+    );
+    assert!(ln_small.is_close(
+        &BigFloat::from_frac(405448248, 1_000_000_000), // 0.405448248
+        &BigFloat::from_frac(1, 1_000_000_000)
+    ));
+
+    let smallest = BigFloat::<StaticApi>::from(1i64);
+    let ln_smallest = smallest.ln();
+    assert_eq!(ln_smallest.to_managed_decimal(9usize).to_string(), "0.0");
+    assert!(ln_smallest.is_close(
+        &BigFloat::from(0i64), // 0.0
+        &BigFloat::from_frac(1, 100_000_000)
+    ));
+
+    // fails for now, accuracy is not great around 1.1
+    // let y = BigFloat::<StaticApi>::from_frac(11i64, 10i64);
+    // let ln_y = y.ln();
+    // assert_eq!(ln_y.to_managed_decimal(9usize).to_string(), "0.095310179");
+    // assert!(ln_y.is_close(
+    //     &BigFloat::from_frac(95310179, 1_000_000_000), // 0.095310179
+    //     &BigFloat::from_frac(1, 1_000_000_000)
+    // ));
+}

From 8ea2637434244d4c63321bc53a0da302aaccabec Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Thu, 13 Jun 2024 21:23:32 +0300
Subject: [PATCH 0985/1254] storage mapper from addr - add attribute, impl
 StorageMapperFromAddre for VecMapper

---
 contracts/examples/adder/file.rs              | 621 ++++++++++++++++++
 contracts/examples/adder/src/adder.rs         |   3 +
 framework/base/src/storage/mappers.rs         |   2 +-
 framework/base/src/storage/mappers/mapper.rs  |   9 +-
 .../base/src/storage/mappers/vec_mapper.rs    |  24 +-
 framework/derive/src/generate/auto_impl.rs    |   7 +-
 .../derive/src/generate/auto_impl_storage.rs  |  19 +
 framework/derive/src/model/method.rs          |   1 +
 .../derive/src/parse/attributes/attr_names.rs |   1 +
 .../src/parse/attributes/storage_attr.rs      |  14 +
 framework/derive/src/parse/auto_impl_parse.rs |  17 +-
 framework/derive/src/parse/method_parse.rs    |   4 +-
 12 files changed, 714 insertions(+), 8 deletions(-)
 create mode 100644 contracts/examples/adder/file.rs

diff --git a/contracts/examples/adder/file.rs b/contracts/examples/adder/file.rs
new file mode 100644
index 0000000000..95b197f724
--- /dev/null
+++ b/contracts/examples/adder/file.rs
@@ -0,0 +1,621 @@
+#![feature(prelude_import)]
+#![no_std]
+#[prelude_import]
+use core::prelude::rust_2021::*;
+#[macro_use]
+extern crate core;
+extern crate compiler_builtins as _;
+use multiversx_sc::imports::*;
+pub mod adder_proxy {
+    #![allow(dead_code)]
+    #![allow(clippy::all)]
+    use multiversx_sc::proxy_imports::*;
+    pub struct AdderProxy;
+    impl<Env, From, To, Gas> TxProxyTrait<Env, From, To, Gas> for AdderProxy
+    where
+        Env: TxEnv,
+        From: TxFrom<Env>,
+        To: TxTo<Env>,
+        Gas: TxGas<Env>,
+    {
+        type TxProxyMethods = AdderProxyMethods<Env, From, To, Gas>;
+        fn proxy_methods(
+            self,
+            tx: Tx<Env, From, To, (), Gas, (), ()>,
+        ) -> Self::TxProxyMethods {
+            AdderProxyMethods {
+                wrapped_tx: tx,
+            }
+        }
+    }
+    pub struct AdderProxyMethods<Env, From, To, Gas>
+    where
+        Env: TxEnv,
+        From: TxFrom<Env>,
+        To: TxTo<Env>,
+        Gas: TxGas<Env>,
+    {
+        wrapped_tx: Tx<Env, From, To, (), Gas, (), ()>,
+    }
+    #[rustfmt::skip]
+    impl<Env, From, Gas> AdderProxyMethods<Env, From, (), Gas>
+    where
+        Env: TxEnv,
+        Env::Api: VMApi,
+        From: TxFrom<Env>,
+        Gas: TxGas<Env>,
+    {
+        pub fn init<Arg0: ProxyArg<BigUint<Env::Api>>>(
+            self,
+            initial_value: Arg0,
+        ) -> TxTypedDeploy<Env, From, NotPayable, Gas, ()> {
+            self.wrapped_tx
+                .payment(NotPayable)
+                .raw_deploy()
+                .argument(&initial_value)
+                .original_result()
+        }
+    }
+    #[rustfmt::skip]
+    impl<Env, From, To, Gas> AdderProxyMethods<Env, From, To, Gas>
+    where
+        Env: TxEnv,
+        Env::Api: VMApi,
+        From: TxFrom<Env>,
+        To: TxTo<Env>,
+        Gas: TxGas<Env>,
+    {
+        pub fn upgrade<Arg0: ProxyArg<BigUint<Env::Api>>>(
+            self,
+            initial_value: Arg0,
+        ) -> TxTypedUpgrade<Env, From, To, NotPayable, Gas, ()> {
+            self.wrapped_tx
+                .payment(NotPayable)
+                .raw_upgrade()
+                .argument(&initial_value)
+                .original_result()
+        }
+    }
+    #[rustfmt::skip]
+    impl<Env, From, To, Gas> AdderProxyMethods<Env, From, To, Gas>
+    where
+        Env: TxEnv,
+        Env::Api: VMApi,
+        From: TxFrom<Env>,
+        To: TxTo<Env>,
+        Gas: TxGas<Env>,
+    {
+        pub fn sum(
+            self,
+        ) -> TxTypedCall<Env, From, To, NotPayable, Gas, BigUint<Env::Api>> {
+            self.wrapped_tx.payment(NotPayable).raw_call("getSum").original_result()
+        }
+        /// Add desired amount to the storage variable.
+        pub fn add<Arg0: ProxyArg<BigUint<Env::Api>>>(
+            self,
+            value: Arg0,
+        ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
+            self.wrapped_tx
+                .payment(NotPayable)
+                .raw_call("add")
+                .argument(&value)
+                .original_result()
+        }
+    }
+}
+/// One of the simplest smart contracts possible,
+/// it holds a single variable in storage, which anyone can increment.
+pub trait Adder: multiversx_sc::contract_base::ContractBase + Sized {
+    #[allow(clippy::too_many_arguments)]
+    #[allow(clippy::type_complexity)]
+    fn init(&self, initial_value: multiversx_sc::types::BigUint<Self::Api>) {
+        self.sum().set(initial_value);
+    }
+    #[allow(clippy::too_many_arguments)]
+    #[allow(clippy::type_complexity)]
+    fn upgrade(&self, initial_value: multiversx_sc::types::BigUint<Self::Api>) {
+        self.init(initial_value);
+    }
+    /// Add desired amount to the storage variable.
+    #[allow(clippy::too_many_arguments)]
+    #[allow(clippy::type_complexity)]
+    fn add(&self, value: multiversx_sc::types::BigUint<Self::Api>) {
+        self.sum().update(|sum| *sum += value);
+    }
+    #[allow(clippy::too_many_arguments)]
+    #[allow(clippy::type_complexity)]
+    fn sum(
+        &self,
+    ) -> SingleValueMapper<Self::Api, multiversx_sc::types::BigUint<Self::Api>>;
+    #[allow(clippy::too_many_arguments)]
+    #[allow(clippy::type_complexity)]
+    fn sum_with_address(
+        &self,
+        address: &multiversx_sc::types::ManagedAddress<Self::Api>,
+    ) -> SingleValueMapper<Self::Api, multiversx_sc::types::BigUint<Self::Api>>;
+}
+pub trait AutoImpl: multiversx_sc::contract_base::ContractBase {}
+impl<C> Adder for C
+where
+    C: AutoImpl,
+{
+    #[allow(clippy::too_many_arguments)]
+    #[allow(clippy::type_complexity)]
+    fn sum(
+        &self,
+    ) -> SingleValueMapper<Self::Api, multiversx_sc::types::BigUint<Self::Api>> {
+        let mut ___key___ = multiversx_sc::storage::StorageKey::<
+            Self::Api,
+        >::new(&b"sum"[..]);
+        <SingleValueMapper<
+            Self::Api,
+            multiversx_sc::types::BigUint<Self::Api>,
+        > as multiversx_sc::storage::mappers::StorageMapper<Self::Api>>::new(___key___)
+    }
+    #[allow(clippy::too_many_arguments)]
+    #[allow(clippy::type_complexity)]
+    fn sum_with_address(
+        &self,
+        address: &multiversx_sc::types::ManagedAddress<Self::Api>,
+    ) -> SingleValueMapper<Self::Api, multiversx_sc::types::BigUint<Self::Api>> {
+        let mut ___key___ = multiversx_sc::storage::StorageKey::<
+            Self::Api,
+        >::new(&b"sum"[..]);
+        <SingleValueMapper<
+            Self::Api,
+            multiversx_sc::types::BigUint<Self::Api>,
+        > as multiversx_sc::storage::mappers::StorageMapper<Self::Api>>::new(___key___)
+    }
+}
+impl<A> AutoImpl for multiversx_sc::contract_base::UniversalContractObj<A>
+where
+    A: multiversx_sc::api::VMApi,
+{}
+pub trait EndpointWrappers: multiversx_sc::contract_base::ContractBase + Adder {
+    #[inline]
+    fn call_sum(&self) {
+        <Self::Api as multiversx_sc::api::VMApi>::init_static();
+        multiversx_sc::io::call_value_init::not_payable::<Self::Api>();
+        let () = multiversx_sc::io::load_endpoint_args::<Self::Api, ()>(());
+        let result = self.sum();
+        multiversx_sc::io::finish_multi::<Self::Api, _>(&result);
+    }
+    #[inline]
+    fn call_init(&self) {
+        <Self::Api as multiversx_sc::api::VMApi>::init_static();
+        multiversx_sc::io::call_value_init::not_payable::<Self::Api>();
+        let (initial_value, ()) = multiversx_sc::io::load_endpoint_args::<
+            Self::Api,
+            (multiversx_sc::types::BigUint<Self::Api>, ()),
+        >(("initial_value", ()));
+        self.init(initial_value);
+    }
+    #[inline]
+    fn call_upgrade(&self) {
+        <Self::Api as multiversx_sc::api::VMApi>::init_static();
+        multiversx_sc::io::call_value_init::not_payable::<Self::Api>();
+        let (initial_value, ()) = multiversx_sc::io::load_endpoint_args::<
+            Self::Api,
+            (multiversx_sc::types::BigUint<Self::Api>, ()),
+        >(("initial_value", ()));
+        self.upgrade(initial_value);
+    }
+    #[inline]
+    fn call_add(&self) {
+        <Self::Api as multiversx_sc::api::VMApi>::init_static();
+        multiversx_sc::io::call_value_init::not_payable::<Self::Api>();
+        let (value, ()) = multiversx_sc::io::load_endpoint_args::<
+            Self::Api,
+            (multiversx_sc::types::BigUint<Self::Api>, ()),
+        >(("value", ()));
+        self.add(value);
+    }
+    fn call(&self, fn_name: &str) -> bool {
+        if match fn_name {
+            "callBack" => {
+                self::EndpointWrappers::callback(self);
+                return true;
+            }
+            "init" if <Self::Api as multiversx_sc::api::VMApi>::external_view_init_override() => {
+                multiversx_sc::external_view_contract::external_view_contract_constructor::<
+                    Self::Api,
+                >();
+                return true;
+            }
+            "getSum" => {
+                self.call_sum();
+                true
+            }
+            "init" if !<Self::Api as multiversx_sc::api::VMApi>::external_view_init_override() => {
+                self.call_init();
+                true
+            }
+            "upgrade" => {
+                self.call_upgrade();
+                true
+            }
+            "add" => {
+                self.call_add();
+                true
+            }
+            other => false,
+        } {
+            return true;
+        }
+        false
+    }
+    fn callback_selector(
+        &self,
+        mut ___cb_closure___: multiversx_sc::types::CallbackClosureForDeser<Self::Api>,
+    ) -> multiversx_sc::types::CallbackSelectorResult<Self::Api> {
+        multiversx_sc::types::CallbackSelectorResult::NotProcessed(___cb_closure___)
+    }
+    fn callback(&self) {}
+}
+impl<A> EndpointWrappers for multiversx_sc::contract_base::UniversalContractObj<A>
+where
+    A: multiversx_sc::api::VMApi,
+{}
+pub struct AbiProvider {}
+impl multiversx_sc::contract_base::ContractAbiProvider for AbiProvider {
+    type Api = multiversx_sc::api::uncallable::UncallableApi;
+    fn abi() -> multiversx_sc::abi::ContractAbi {
+        let mut contract_abi = multiversx_sc::abi::ContractAbi::new(
+            multiversx_sc::abi::BuildInfoAbi {
+                contract_crate: multiversx_sc::abi::ContractCrateBuildAbi {
+                    name: "adder",
+                    version: "0.0.0",
+                    git_version: "",
+                },
+                framework: multiversx_sc::abi::FrameworkBuildAbi::create(),
+            },
+            &[
+                "One of the simplest smart contracts possible,",
+                "it holds a single variable in storage, which anyone can increment.",
+            ],
+            "Adder",
+            false,
+        );
+        let mut endpoint_abi = multiversx_sc::abi::EndpointAbi::new(
+            &[],
+            "getSum",
+            "sum",
+            false,
+            false,
+            multiversx_sc::abi::EndpointMutabilityAbi::Readonly,
+            multiversx_sc::abi::EndpointTypeAbi::Endpoint,
+            &[],
+            &[],
+            false,
+        );
+        endpoint_abi
+            .add_output::<
+                SingleValueMapper<Self::Api, multiversx_sc::types::BigUint<Self::Api>>,
+            >(&[]);
+        contract_abi
+            .add_type_descriptions::<
+                SingleValueMapper<Self::Api, multiversx_sc::types::BigUint<Self::Api>>,
+            >();
+        contract_abi.endpoints.push(endpoint_abi);
+        let mut endpoint_abi = multiversx_sc::abi::EndpointAbi::new(
+            &[],
+            "init",
+            "init",
+            false,
+            false,
+            multiversx_sc::abi::EndpointMutabilityAbi::Mutable,
+            multiversx_sc::abi::EndpointTypeAbi::Init,
+            &[],
+            &[],
+            false,
+        );
+        endpoint_abi
+            .add_input::<multiversx_sc::types::BigUint<Self::Api>>("initial_value");
+        contract_abi.add_type_descriptions::<multiversx_sc::types::BigUint<Self::Api>>();
+        contract_abi.constructors.push(endpoint_abi);
+        let mut endpoint_abi = multiversx_sc::abi::EndpointAbi::new(
+            &[],
+            "upgrade",
+            "upgrade",
+            false,
+            false,
+            multiversx_sc::abi::EndpointMutabilityAbi::Mutable,
+            multiversx_sc::abi::EndpointTypeAbi::Upgrade,
+            &[],
+            &[],
+            false,
+        );
+        endpoint_abi
+            .add_input::<multiversx_sc::types::BigUint<Self::Api>>("initial_value");
+        contract_abi.add_type_descriptions::<multiversx_sc::types::BigUint<Self::Api>>();
+        contract_abi.upgrade_constructors.push(endpoint_abi);
+        let mut endpoint_abi = multiversx_sc::abi::EndpointAbi::new(
+            &["Add desired amount to the storage variable."],
+            "add",
+            "add",
+            false,
+            false,
+            multiversx_sc::abi::EndpointMutabilityAbi::Mutable,
+            multiversx_sc::abi::EndpointTypeAbi::Endpoint,
+            &[],
+            &[],
+            false,
+        );
+        endpoint_abi.add_input::<multiversx_sc::types::BigUint<Self::Api>>("value");
+        contract_abi.add_type_descriptions::<multiversx_sc::types::BigUint<Self::Api>>();
+        contract_abi.endpoints.push(endpoint_abi);
+        contract_abi
+    }
+}
+pub struct ContractObj<A>
+where
+    A: multiversx_sc::api::VMApi,
+{
+    _phantom: core::marker::PhantomData<A>,
+}
+impl<A> multiversx_sc::contract_base::ContractBase for ContractObj<A>
+where
+    A: multiversx_sc::api::VMApi,
+{
+    type Api = A;
+}
+impl<A> AutoImpl for ContractObj<A>
+where
+    A: multiversx_sc::api::VMApi,
+{}
+impl<A> EndpointWrappers for ContractObj<A>
+where
+    A: multiversx_sc::api::VMApi,
+{}
+impl<A> multiversx_sc::contract_base::CallableContract for ContractObj<A>
+where
+    A: multiversx_sc::api::VMApi + Send + Sync,
+{
+    fn call(&self, fn_name: &str) -> bool {
+        EndpointWrappers::call(self, fn_name)
+    }
+}
+pub fn contract_obj<A>() -> ContractObj<A>
+where
+    A: multiversx_sc::api::VMApi,
+{
+    ContractObj {
+        _phantom: core::marker::PhantomData,
+    }
+}
+pub struct ContractBuilder;
+impl multiversx_sc::contract_base::CallableContractBuilder for self::ContractBuilder {
+    fn new_contract_obj<A: multiversx_sc::api::VMApi + Send + Sync>(
+        &self,
+    ) -> multiversx_sc::types::heap::Box<
+        dyn multiversx_sc::contract_base::CallableContract,
+    > {
+        multiversx_sc::types::heap::Box::new(ContractObj::<A> {
+            _phantom: core::marker::PhantomData,
+        })
+    }
+}
+#[allow(non_snake_case)]
+pub mod endpoints {
+    use super::EndpointWrappers;
+    pub fn sum<A>()
+    where
+        A: multiversx_sc::api::VMApi,
+    {
+        super::EndpointWrappers::call_sum(
+            &multiversx_sc::contract_base::UniversalContractObj::<A>::new(),
+        );
+    }
+    pub fn init<A>()
+    where
+        A: multiversx_sc::api::VMApi,
+    {
+        super::EndpointWrappers::call_init(
+            &multiversx_sc::contract_base::UniversalContractObj::<A>::new(),
+        );
+    }
+    pub fn upgrade<A>()
+    where
+        A: multiversx_sc::api::VMApi,
+    {
+        super::EndpointWrappers::call_upgrade(
+            &multiversx_sc::contract_base::UniversalContractObj::<A>::new(),
+        );
+    }
+    pub fn add<A>()
+    where
+        A: multiversx_sc::api::VMApi,
+    {
+        super::EndpointWrappers::call_add(
+            &multiversx_sc::contract_base::UniversalContractObj::<A>::new(),
+        );
+    }
+    pub fn callBack<A>()
+    where
+        A: multiversx_sc::api::VMApi,
+    {
+        super::EndpointWrappers::callback(
+            &multiversx_sc::contract_base::UniversalContractObj::<A>::new(),
+        );
+    }
+}
+pub trait ProxyTrait: multiversx_sc::contract_base::ProxyObjBase + Sized {
+    #[allow(clippy::too_many_arguments)]
+    #[allow(clippy::type_complexity)]
+    fn sum(
+        &mut self,
+    ) -> multiversx_sc::types::Tx<
+        multiversx_sc::types::TxScEnv<Self::Api>,
+        (),
+        Self::To,
+        (),
+        (),
+        multiversx_sc::types::FunctionCall<Self::Api>,
+        multiversx_sc::types::OriginalResultMarker<
+            SingleValueMapper<Self::Api, multiversx_sc::types::BigUint<Self::Api>>,
+        >,
+    > {
+        multiversx_sc::types::TxBaseWithEnv::new_tx_from_sc()
+            .to(self.extract_proxy_to())
+            .original_result()
+            .raw_call("getSum")
+    }
+    #[allow(clippy::too_many_arguments)]
+    #[allow(clippy::type_complexity)]
+    fn init<
+        Arg0: multiversx_sc::types::ProxyArg<multiversx_sc::types::BigUint<Self::Api>>,
+    >(
+        &mut self,
+        initial_value: Arg0,
+    ) -> multiversx_sc::types::Tx<
+        multiversx_sc::types::TxScEnv<Self::Api>,
+        (),
+        Self::To,
+        (),
+        (),
+        multiversx_sc::types::DeployCall<multiversx_sc::types::TxScEnv<Self::Api>, ()>,
+        multiversx_sc::types::OriginalResultMarker<()>,
+    > {
+        multiversx_sc::types::TxBaseWithEnv::new_tx_from_sc()
+            .raw_deploy()
+            .argument(&initial_value)
+            .original_result()
+            .to(self.extract_proxy_to())
+    }
+    #[allow(clippy::too_many_arguments)]
+    #[allow(clippy::type_complexity)]
+    fn upgrade<
+        Arg0: multiversx_sc::types::ProxyArg<multiversx_sc::types::BigUint<Self::Api>>,
+    >(
+        &mut self,
+        initial_value: Arg0,
+    ) -> multiversx_sc::types::Tx<
+        multiversx_sc::types::TxScEnv<Self::Api>,
+        (),
+        Self::To,
+        (),
+        (),
+        multiversx_sc::types::FunctionCall<Self::Api>,
+        multiversx_sc::types::OriginalResultMarker<()>,
+    > {
+        multiversx_sc::types::TxBaseWithEnv::new_tx_from_sc()
+            .to(self.extract_proxy_to())
+            .original_result()
+            .raw_call("upgrade")
+            .argument(&initial_value)
+    }
+    #[allow(clippy::too_many_arguments)]
+    #[allow(clippy::type_complexity)]
+    fn add<
+        Arg0: multiversx_sc::types::ProxyArg<multiversx_sc::types::BigUint<Self::Api>>,
+    >(
+        &mut self,
+        value: Arg0,
+    ) -> multiversx_sc::types::Tx<
+        multiversx_sc::types::TxScEnv<Self::Api>,
+        (),
+        Self::To,
+        (),
+        (),
+        multiversx_sc::types::FunctionCall<Self::Api>,
+        multiversx_sc::types::OriginalResultMarker<()>,
+    > {
+        multiversx_sc::types::TxBaseWithEnv::new_tx_from_sc()
+            .to(self.extract_proxy_to())
+            .original_result()
+            .raw_call("add")
+            .argument(&value)
+    }
+}
+pub struct Proxy<A>
+where
+    A: multiversx_sc::api::VMApi + 'static,
+{
+    _phantom: core::marker::PhantomData<A>,
+}
+impl<A> multiversx_sc::contract_base::ProxyObjBase for Proxy<A>
+where
+    A: multiversx_sc::api::VMApi + 'static,
+{
+    type Api = A;
+    type To = ();
+    fn extract_opt_address(
+        &mut self,
+    ) -> multiversx_sc::types::ManagedOption<
+        Self::Api,
+        multiversx_sc::types::ManagedAddress<Self::Api>,
+    > {
+        multiversx_sc::types::ManagedOption::none()
+    }
+    fn extract_address(&mut self) -> multiversx_sc::types::ManagedAddress<Self::Api> {
+        multiversx_sc::api::ErrorApiImpl::signal_error(
+            &<A as multiversx_sc::api::ErrorApi>::error_api_impl(),
+            multiversx_sc::err_msg::RECIPIENT_ADDRESS_NOT_SET.as_bytes(),
+        )
+    }
+    fn extract_proxy_to(&mut self) -> Self::To {}
+}
+impl<A> multiversx_sc::contract_base::ProxyObjNew for Proxy<A>
+where
+    A: multiversx_sc::api::VMApi + 'static,
+{
+    type ProxyTo = ProxyTo<A>;
+    fn new_proxy_obj() -> Self {
+        Proxy {
+            _phantom: core::marker::PhantomData,
+        }
+    }
+    fn contract(
+        mut self,
+        address: multiversx_sc::types::ManagedAddress<Self::Api>,
+    ) -> Self::ProxyTo {
+        ProxyTo {
+            address: multiversx_sc::types::ManagedOption::some(address),
+        }
+    }
+}
+pub struct ProxyTo<A>
+where
+    A: multiversx_sc::api::VMApi + 'static,
+{
+    pub address: multiversx_sc::types::ManagedOption<
+        A,
+        multiversx_sc::types::ManagedAddress<A>,
+    >,
+}
+impl<A> multiversx_sc::contract_base::ProxyObjBase for ProxyTo<A>
+where
+    A: multiversx_sc::api::VMApi + 'static,
+{
+    type Api = A;
+    type To = multiversx_sc::types::ManagedAddress<A>;
+    fn extract_opt_address(
+        &mut self,
+    ) -> multiversx_sc::types::ManagedOption<
+        Self::Api,
+        multiversx_sc::types::ManagedAddress<Self::Api>,
+    > {
+        core::mem::replace(
+            &mut self.address,
+            multiversx_sc::types::ManagedOption::none(),
+        )
+    }
+    fn extract_address(&mut self) -> multiversx_sc::types::ManagedAddress<Self::Api> {
+        let address = core::mem::replace(
+            &mut self.address,
+            multiversx_sc::types::ManagedOption::none(),
+        );
+        address.unwrap_or_sc_panic(multiversx_sc::err_msg::RECIPIENT_ADDRESS_NOT_SET)
+    }
+    fn extract_proxy_to(&mut self) -> Self::To {
+        self.extract_address()
+    }
+}
+impl<A> ProxyTrait for Proxy<A>
+where
+    A: multiversx_sc::api::VMApi,
+{}
+impl<A> ProxyTrait for ProxyTo<A>
+where
+    A: multiversx_sc::api::VMApi,
+{}
diff --git a/contracts/examples/adder/src/adder.rs b/contracts/examples/adder/src/adder.rs
index 307f4112f5..3462576bc1 100644
--- a/contracts/examples/adder/src/adder.rs
+++ b/contracts/examples/adder/src/adder.rs
@@ -12,6 +12,9 @@ pub trait Adder {
     #[storage_mapper("sum")]
     fn sum(&self) -> SingleValueMapper<BigUint>;
 
+    #[storage_mapper_from_address("sum")]
+    fn sum_with_address(&self, address: &ManagedAddress) -> SingleValueMapper<BigUint>;
+
     #[init]
     fn init(&self, initial_value: BigUint) {
         self.sum().set(initial_value);
diff --git a/framework/base/src/storage/mappers.rs b/framework/base/src/storage/mappers.rs
index b6bac7f06b..da17fa711c 100644
--- a/framework/base/src/storage/mappers.rs
+++ b/framework/base/src/storage/mappers.rs
@@ -3,7 +3,7 @@ mod bi_di_mapper;
 mod linked_list_mapper;
 mod map_mapper;
 mod map_storage_mapper;
-mod mapper;
+pub mod mapper;
 mod ordered_binary_tree_mapper;
 mod queue_mapper;
 mod set_mapper;
diff --git a/framework/base/src/storage/mappers/mapper.rs b/framework/base/src/storage/mappers/mapper.rs
index 3e21ad548e..89aadb916b 100644
--- a/framework/base/src/storage/mappers/mapper.rs
+++ b/framework/base/src/storage/mappers/mapper.rs
@@ -1,4 +1,4 @@
-use crate::{api::StorageMapperApi, storage::StorageKey};
+use crate::{api::StorageMapperApi, storage::StorageKey, types::ManagedAddress};
 
 pub trait StorageMapper<SA>: 'static
 where
@@ -8,6 +8,13 @@ where
     fn new(base_key: StorageKey<SA>) -> Self;
 }
 
+pub trait StorageMapperFromAddress<SA>: StorageMapper<SA>
+where
+    SA: StorageMapperApi,
+{
+    fn new_from_address(address: ManagedAddress<SA>, base_key: StorageKey<SA>) -> Self;
+}
+
 pub trait StorageClearable {
     /// Clears all the entries owned by the storage.
     fn clear(&mut self);
diff --git a/framework/base/src/storage/mappers/vec_mapper.rs b/framework/base/src/storage/mappers/vec_mapper.rs
index de2eb55d82..dfca055720 100644
--- a/framework/base/src/storage/mappers/vec_mapper.rs
+++ b/framework/base/src/storage/mappers/vec_mapper.rs
@@ -1,4 +1,5 @@
 use super::{
+    mapper::StorageMapperFromAddress,
     set_mapper::{CurrentStorage, StorageAddress},
     StorageClearable, StorageMapper,
 };
@@ -56,12 +57,31 @@ where
     }
 }
 
-impl<SA, T> VecMapper<SA, T, ManagedAddress<SA>>
+impl<SA, T> StorageMapper<SA> for VecMapper<SA, T, ManagedAddress<SA>>
 where
     SA: StorageMapperApi,
     T: TopEncode + TopDecode,
 {
-    pub fn new_from_address(address: ManagedAddress<SA>, base_key: StorageKey<SA>) -> Self {
+    fn new(base_key: StorageKey<SA>) -> Self {
+        let mut len_key = base_key.clone();
+        len_key.append_bytes(LEN_SUFFIX);
+
+        VecMapper {
+            _phantom_api: PhantomData,
+            address: ManagedAddress::default(),
+            base_key,
+            len_key,
+            _phantom_item: PhantomData,
+        }
+    }
+}
+
+impl<SA, T> StorageMapperFromAddress<SA> for VecMapper<SA, T, ManagedAddress<SA>>
+where
+    SA: StorageMapperApi,
+    T: TopEncode + TopDecode,
+{
+    fn new_from_address(address: ManagedAddress<SA>, base_key: StorageKey<SA>) -> Self {
         let mut len_key = base_key.clone();
         len_key.append_bytes(LEN_SUFFIX);
 
diff --git a/framework/derive/src/generate/auto_impl.rs b/framework/derive/src/generate/auto_impl.rs
index 628a7af0e1..1d76e50e28 100644
--- a/framework/derive/src/generate/auto_impl.rs
+++ b/framework/derive/src/generate/auto_impl.rs
@@ -4,8 +4,8 @@ use super::{
     auto_impl_event::generate_event_impl,
     auto_impl_proxy::generate_proxy_getter_impl,
     auto_impl_storage::{
-        generate_clear_impl, generate_getter_impl, generate_is_empty_impl, generate_mapper_impl,
-        generate_setter_impl,
+        generate_clear_impl, generate_getter_impl, generate_is_empty_impl,
+        generate_mapper_from_address_impl, generate_mapper_impl, generate_setter_impl,
     },
 };
 
@@ -33,6 +33,9 @@ fn generate_auto_impl(m: &Method, auto_impl: &AutoImpl) -> proc_macro2::TokenStr
         AutoImpl::StorageGetter { identifier } => generate_getter_impl(m, identifier),
         AutoImpl::StorageSetter { identifier } => generate_setter_impl(m, identifier),
         AutoImpl::StorageMapper { identifier } => generate_mapper_impl(m, identifier),
+        AutoImpl::StorageMapperFromAddress { identifier } => {
+            generate_mapper_from_address_impl(m, identifier)
+        },
         AutoImpl::StorageIsEmpty { identifier } => generate_is_empty_impl(m, identifier),
         AutoImpl::StorageClear { identifier } => generate_clear_impl(m, identifier),
         AutoImpl::ProxyGetter => generate_proxy_getter_impl(m),
diff --git a/framework/derive/src/generate/auto_impl_storage.rs b/framework/derive/src/generate/auto_impl_storage.rs
index 94e7affa23..b2f481613a 100644
--- a/framework/derive/src/generate/auto_impl_storage.rs
+++ b/framework/derive/src/generate/auto_impl_storage.rs
@@ -82,6 +82,25 @@ pub fn generate_mapper_impl(m: &Method, identifier: &str) -> proc_macro2::TokenS
     }
 }
 
+pub fn generate_mapper_from_address_impl(m: &Method, identifier: &str) -> proc_macro2::TokenStream {
+    let msig = method_gen::generate_sig_with_attributes(m);
+    let key_snippet = generate_key_snippet(&m.method_args[1..], identifier);
+
+    match m.return_type.clone() {
+        syn::ReturnType::Default => panic!("getter from address should return some value"),
+        syn::ReturnType::Type(_, ty) => {
+            quote! {
+                #msig {
+                    #key_snippet
+                    <#ty as multiversx_sc::storage::mappers::StorageMapper<Self::Api>>::new(
+                        ___key___
+                    )
+                }
+            }
+        },
+    }
+}
+
 pub fn generate_is_empty_impl(m: &Method, identifier: &str) -> proc_macro2::TokenStream {
     let msig = method_gen::generate_sig_with_attributes(m);
     let key_snippet = generate_key_snippet(m.method_args.as_slice(), identifier);
diff --git a/framework/derive/src/model/method.rs b/framework/derive/src/model/method.rs
index 776e39dfaa..22acf8eb78 100644
--- a/framework/derive/src/model/method.rs
+++ b/framework/derive/src/model/method.rs
@@ -7,6 +7,7 @@ pub enum AutoImpl {
     StorageGetter { identifier: String },
     StorageSetter { identifier: String },
     StorageMapper { identifier: String },
+    StorageMapperFromAddress { identifier: String },
     StorageIsEmpty { identifier: String },
     StorageClear { identifier: String },
     ProxyGetter,
diff --git a/framework/derive/src/parse/attributes/attr_names.rs b/framework/derive/src/parse/attributes/attr_names.rs
index 8df56f06f6..29784fc1c3 100644
--- a/framework/derive/src/parse/attributes/attr_names.rs
+++ b/framework/derive/src/parse/attributes/attr_names.rs
@@ -21,6 +21,7 @@ pub(super) static ATTR_CALLBACK_CALL_RESULT: &str = "call_result";
 pub(super) static ATTR_STORAGE_GET: &str = "storage_get";
 pub(super) static ATTR_STORAGE_SET: &str = "storage_set";
 pub(super) static ATTR_STORAGE_MAPPER: &str = "storage_mapper";
+pub(super) static ATTR_STORAGE_MAPPER_FROM_ADDRESS: &str = "storage_mapper_from_address";
 pub(super) static ATTR_STORAGE_IS_EMPTY: &str = "storage_is_empty";
 pub(super) static ATTR_STORAGE_CLEAR: &str = "storage_clear";
 pub(super) static ATTR_PROXY: &str = "proxy";
diff --git a/framework/derive/src/parse/attributes/storage_attr.rs b/framework/derive/src/parse/attributes/storage_attr.rs
index 8a3e0d22c7..eebca83916 100644
--- a/framework/derive/src/parse/attributes/storage_attr.rs
+++ b/framework/derive/src/parse/attributes/storage_attr.rs
@@ -36,6 +36,20 @@ impl StorageMapperAttribute {
     }
 }
 
+pub struct StorageMapperFromAddressAttribute {
+    pub identifier: String,
+}
+
+impl StorageMapperFromAddressAttribute {
+    pub fn parse(attr: &syn::Attribute) -> Option<Self> {
+        is_attr_one_string_arg(attr, ATTR_STORAGE_MAPPER_FROM_ADDRESS).map(|arg_str| {
+            StorageMapperFromAddressAttribute {
+                identifier: arg_str,
+            }
+        })
+    }
+}
+
 pub struct StorageIsEmptyAttribute {
     pub identifier: String,
 }
diff --git a/framework/derive/src/parse/auto_impl_parse.rs b/framework/derive/src/parse/auto_impl_parse.rs
index 24002e2139..eb19cc83a3 100644
--- a/framework/derive/src/parse/auto_impl_parse.rs
+++ b/framework/derive/src/parse/auto_impl_parse.rs
@@ -5,10 +5,11 @@ use super::attributes::*;
 fn assert_no_other_auto_impl(method: &Method) {
     assert!(
         method.implementation.is_no_implementation(),
-        "Only one auto-implementation can be specified at one time. Auto-implementations are: {}{}{}{}{}{}{}{}",
+        "Only one auto-implementation can be specified at one time. Auto-implementations are: {}{}{}{}{}{}{}{}{}",
         "`#[storage_get]`, ",
         "`#[storage_set]`, ",
         "`#[storage_mapper]`, ",
+        "`#[storage_mapper_from_address]`, ",
         "`#[storage_is_empty]`, ",
         "`#[storage_clear]`, ",
         "`#[proxy]`, ",
@@ -72,6 +73,20 @@ pub fn process_storage_mapper_attribute(attr: &syn::Attribute, method: &mut Meth
         .is_some()
 }
 
+pub fn process_storage_mapper_from_address_attribute(
+    attr: &syn::Attribute,
+    method: &mut Method,
+) -> bool {
+    StorageMapperFromAddressAttribute::parse(attr)
+        .map(|storage_mapper_from_address| {
+            assert_no_other_auto_impl(&*method);
+            method.implementation = MethodImpl::Generated(AutoImpl::StorageMapperFromAddress {
+                identifier: storage_mapper_from_address.identifier,
+            });
+        })
+        .is_some()
+}
+
 pub fn process_storage_is_empty_attribute(attr: &syn::Attribute, method: &mut Method) -> bool {
     StorageIsEmptyAttribute::parse(attr)
         .map(|storage_is_empty| {
diff --git a/framework/derive/src/parse/method_parse.rs b/framework/derive/src/parse/method_parse.rs
index a8c8a111c7..481638068a 100644
--- a/framework/derive/src/parse/method_parse.rs
+++ b/framework/derive/src/parse/method_parse.rs
@@ -5,7 +5,8 @@ use super::{
     auto_impl_parse::{
         process_event_attribute, process_proxy_attribute, process_storage_clear_attribute,
         process_storage_get_attribute, process_storage_is_empty_attribute,
-        process_storage_mapper_attribute, process_storage_set_attribute,
+        process_storage_mapper_attribute, process_storage_mapper_from_address_attribute,
+        process_storage_set_attribute,
     },
     extract_method_args, process_allow_multiple_var_args_attribute, process_callback_attribute,
     process_callback_raw_attribute, process_endpoint_attribute, process_external_view_attribute,
@@ -127,6 +128,7 @@ fn process_attribute_second_pass(
         || process_storage_get_attribute(attr, method)
         || process_storage_set_attribute(attr, method)
         || process_storage_mapper_attribute(attr, method)
+        || process_storage_mapper_from_address_attribute(attr, method)
         || process_storage_is_empty_attribute(attr, method)
         || process_storage_clear_attribute(attr, method)
         || process_output_names_attribute(attr, method)

From 8ed23e78f66eb34b481f321ed51c3381ded71a98 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Fri, 14 Jun 2024 20:36:07 +0200
Subject: [PATCH 0986/1254] clippy

---
 contracts/feature-tests/big-float-features/wasm/src/lib.rs | 6 ++++--
 framework/base/src/types/managed/basic/big_float.rs        | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/contracts/feature-tests/big-float-features/wasm/src/lib.rs b/contracts/feature-tests/big-float-features/wasm/src/lib.rs
index 6ec41ff9e9..0993fe17ed 100644
--- a/contracts/feature-tests/big-float-features/wasm/src/lib.rs
+++ b/contracts/feature-tests/big-float-features/wasm/src/lib.rs
@@ -5,9 +5,9 @@
 ////////////////////////////////////////////////////
 
 // Init:                                 1
-// Endpoints:                           70
+// Endpoints:                           72
 // Async Callback (empty):               1
-// Total number of exported functions:  72
+// Total number of exported functions:  74
 
 #![no_std]
 
@@ -54,6 +54,7 @@ multiversx_sc_wasm_adapter::endpoints! {
         mul_assign_big_float_ref => mul_assign_big_float_ref
         div_assign_big_float => div_assign_big_float
         div_assign_big_float_ref => div_assign_big_float_ref
+        ln_big_float_ref => ln_big_float_ref
         new_from_parts_big_float_wrapped => new_from_parts_big_float_wrapped
         new_from_frac_big_float_wrapped => new_from_frac_big_float_wrapped
         new_from_sci_big_float_wrapped => new_from_sci_big_float_wrapped
@@ -88,6 +89,7 @@ multiversx_sc_wasm_adapter::endpoints! {
         mul_assign_big_float_ref_wrapped => mul_assign_big_float_ref_wrapped
         div_assign_big_float_wrapped => div_assign_big_float_wrapped
         div_assign_big_float_ref_wrapped => div_assign_big_float_ref_wrapped
+        ln_big_float_ref_wrapped => ln_big_float_ref_wrapped
     )
 }
 
diff --git a/framework/base/src/types/managed/basic/big_float.rs b/framework/base/src/types/managed/basic/big_float.rs
index bd45e5bccc..e0859e97e8 100644
--- a/framework/base/src/types/managed/basic/big_float.rs
+++ b/framework/base/src/types/managed/basic/big_float.rs
@@ -177,7 +177,7 @@ impl<M: ManagedTypeApi> BigFloat<M> {
     }
 
     pub fn ln(&self) -> Self {
-        if *self == BigFloat::from(1i64) {
+        if self == &BigFloat::from(1i64) {
             return BigFloat::from(0i64);
         }
 

From d88cc71ec5826039435faf8353fc6684f9c415a4 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Sat, 15 Jun 2024 01:45:59 +0300
Subject: [PATCH 0987/1254] storage mapper from addr - impl trait for all
 mappers and auto impl storage

---
 contracts/examples/adder/file.rs              | 621 ------------------
 contracts/examples/adder/src/adder.rs         |   5 +-
 framework/base/src/storage/mappers.rs         |   4 +-
 .../storage/mappers/address_to_id_mapper.rs   |  19 +-
 .../base/src/storage/mappers/bi_di_mapper.rs  |  28 +-
 .../src/storage/mappers/linked_list_mapper.rs |  21 +-
 .../base/src/storage/mappers/map_mapper.rs    |  23 +-
 .../src/storage/mappers/map_storage_mapper.rs |  22 +-
 .../base/src/storage/mappers/queue_mapper.rs  |  20 +-
 .../base/src/storage/mappers/set_mapper.rs    |  21 +-
 .../storage/mappers/single_value_mapper.rs    |  22 +-
 .../src/storage/mappers/unique_id_mapper.rs   |  19 +-
 .../storage/mappers/unordered_set_mapper.rs   |  21 +-
 .../base/src/storage/mappers/user_mapper.rs   |  19 +-
 .../base/src/storage/mappers/vec_mapper.rs    |   3 +-
 .../src/storage/mappers/whitelist_mapper.rs   |  20 +-
 .../derive/src/generate/auto_impl_storage.rs  |  10 +-
 .../scenario/tests/test_hash_set_mapper.rs    |   2 +-
 18 files changed, 235 insertions(+), 665 deletions(-)
 delete mode 100644 contracts/examples/adder/file.rs

diff --git a/contracts/examples/adder/file.rs b/contracts/examples/adder/file.rs
deleted file mode 100644
index 95b197f724..0000000000
--- a/contracts/examples/adder/file.rs
+++ /dev/null
@@ -1,621 +0,0 @@
-#![feature(prelude_import)]
-#![no_std]
-#[prelude_import]
-use core::prelude::rust_2021::*;
-#[macro_use]
-extern crate core;
-extern crate compiler_builtins as _;
-use multiversx_sc::imports::*;
-pub mod adder_proxy {
-    #![allow(dead_code)]
-    #![allow(clippy::all)]
-    use multiversx_sc::proxy_imports::*;
-    pub struct AdderProxy;
-    impl<Env, From, To, Gas> TxProxyTrait<Env, From, To, Gas> for AdderProxy
-    where
-        Env: TxEnv,
-        From: TxFrom<Env>,
-        To: TxTo<Env>,
-        Gas: TxGas<Env>,
-    {
-        type TxProxyMethods = AdderProxyMethods<Env, From, To, Gas>;
-        fn proxy_methods(
-            self,
-            tx: Tx<Env, From, To, (), Gas, (), ()>,
-        ) -> Self::TxProxyMethods {
-            AdderProxyMethods {
-                wrapped_tx: tx,
-            }
-        }
-    }
-    pub struct AdderProxyMethods<Env, From, To, Gas>
-    where
-        Env: TxEnv,
-        From: TxFrom<Env>,
-        To: TxTo<Env>,
-        Gas: TxGas<Env>,
-    {
-        wrapped_tx: Tx<Env, From, To, (), Gas, (), ()>,
-    }
-    #[rustfmt::skip]
-    impl<Env, From, Gas> AdderProxyMethods<Env, From, (), Gas>
-    where
-        Env: TxEnv,
-        Env::Api: VMApi,
-        From: TxFrom<Env>,
-        Gas: TxGas<Env>,
-    {
-        pub fn init<Arg0: ProxyArg<BigUint<Env::Api>>>(
-            self,
-            initial_value: Arg0,
-        ) -> TxTypedDeploy<Env, From, NotPayable, Gas, ()> {
-            self.wrapped_tx
-                .payment(NotPayable)
-                .raw_deploy()
-                .argument(&initial_value)
-                .original_result()
-        }
-    }
-    #[rustfmt::skip]
-    impl<Env, From, To, Gas> AdderProxyMethods<Env, From, To, Gas>
-    where
-        Env: TxEnv,
-        Env::Api: VMApi,
-        From: TxFrom<Env>,
-        To: TxTo<Env>,
-        Gas: TxGas<Env>,
-    {
-        pub fn upgrade<Arg0: ProxyArg<BigUint<Env::Api>>>(
-            self,
-            initial_value: Arg0,
-        ) -> TxTypedUpgrade<Env, From, To, NotPayable, Gas, ()> {
-            self.wrapped_tx
-                .payment(NotPayable)
-                .raw_upgrade()
-                .argument(&initial_value)
-                .original_result()
-        }
-    }
-    #[rustfmt::skip]
-    impl<Env, From, To, Gas> AdderProxyMethods<Env, From, To, Gas>
-    where
-        Env: TxEnv,
-        Env::Api: VMApi,
-        From: TxFrom<Env>,
-        To: TxTo<Env>,
-        Gas: TxGas<Env>,
-    {
-        pub fn sum(
-            self,
-        ) -> TxTypedCall<Env, From, To, NotPayable, Gas, BigUint<Env::Api>> {
-            self.wrapped_tx.payment(NotPayable).raw_call("getSum").original_result()
-        }
-        /// Add desired amount to the storage variable.
-        pub fn add<Arg0: ProxyArg<BigUint<Env::Api>>>(
-            self,
-            value: Arg0,
-        ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
-            self.wrapped_tx
-                .payment(NotPayable)
-                .raw_call("add")
-                .argument(&value)
-                .original_result()
-        }
-    }
-}
-/// One of the simplest smart contracts possible,
-/// it holds a single variable in storage, which anyone can increment.
-pub trait Adder: multiversx_sc::contract_base::ContractBase + Sized {
-    #[allow(clippy::too_many_arguments)]
-    #[allow(clippy::type_complexity)]
-    fn init(&self, initial_value: multiversx_sc::types::BigUint<Self::Api>) {
-        self.sum().set(initial_value);
-    }
-    #[allow(clippy::too_many_arguments)]
-    #[allow(clippy::type_complexity)]
-    fn upgrade(&self, initial_value: multiversx_sc::types::BigUint<Self::Api>) {
-        self.init(initial_value);
-    }
-    /// Add desired amount to the storage variable.
-    #[allow(clippy::too_many_arguments)]
-    #[allow(clippy::type_complexity)]
-    fn add(&self, value: multiversx_sc::types::BigUint<Self::Api>) {
-        self.sum().update(|sum| *sum += value);
-    }
-    #[allow(clippy::too_many_arguments)]
-    #[allow(clippy::type_complexity)]
-    fn sum(
-        &self,
-    ) -> SingleValueMapper<Self::Api, multiversx_sc::types::BigUint<Self::Api>>;
-    #[allow(clippy::too_many_arguments)]
-    #[allow(clippy::type_complexity)]
-    fn sum_with_address(
-        &self,
-        address: &multiversx_sc::types::ManagedAddress<Self::Api>,
-    ) -> SingleValueMapper<Self::Api, multiversx_sc::types::BigUint<Self::Api>>;
-}
-pub trait AutoImpl: multiversx_sc::contract_base::ContractBase {}
-impl<C> Adder for C
-where
-    C: AutoImpl,
-{
-    #[allow(clippy::too_many_arguments)]
-    #[allow(clippy::type_complexity)]
-    fn sum(
-        &self,
-    ) -> SingleValueMapper<Self::Api, multiversx_sc::types::BigUint<Self::Api>> {
-        let mut ___key___ = multiversx_sc::storage::StorageKey::<
-            Self::Api,
-        >::new(&b"sum"[..]);
-        <SingleValueMapper<
-            Self::Api,
-            multiversx_sc::types::BigUint<Self::Api>,
-        > as multiversx_sc::storage::mappers::StorageMapper<Self::Api>>::new(___key___)
-    }
-    #[allow(clippy::too_many_arguments)]
-    #[allow(clippy::type_complexity)]
-    fn sum_with_address(
-        &self,
-        address: &multiversx_sc::types::ManagedAddress<Self::Api>,
-    ) -> SingleValueMapper<Self::Api, multiversx_sc::types::BigUint<Self::Api>> {
-        let mut ___key___ = multiversx_sc::storage::StorageKey::<
-            Self::Api,
-        >::new(&b"sum"[..]);
-        <SingleValueMapper<
-            Self::Api,
-            multiversx_sc::types::BigUint<Self::Api>,
-        > as multiversx_sc::storage::mappers::StorageMapper<Self::Api>>::new(___key___)
-    }
-}
-impl<A> AutoImpl for multiversx_sc::contract_base::UniversalContractObj<A>
-where
-    A: multiversx_sc::api::VMApi,
-{}
-pub trait EndpointWrappers: multiversx_sc::contract_base::ContractBase + Adder {
-    #[inline]
-    fn call_sum(&self) {
-        <Self::Api as multiversx_sc::api::VMApi>::init_static();
-        multiversx_sc::io::call_value_init::not_payable::<Self::Api>();
-        let () = multiversx_sc::io::load_endpoint_args::<Self::Api, ()>(());
-        let result = self.sum();
-        multiversx_sc::io::finish_multi::<Self::Api, _>(&result);
-    }
-    #[inline]
-    fn call_init(&self) {
-        <Self::Api as multiversx_sc::api::VMApi>::init_static();
-        multiversx_sc::io::call_value_init::not_payable::<Self::Api>();
-        let (initial_value, ()) = multiversx_sc::io::load_endpoint_args::<
-            Self::Api,
-            (multiversx_sc::types::BigUint<Self::Api>, ()),
-        >(("initial_value", ()));
-        self.init(initial_value);
-    }
-    #[inline]
-    fn call_upgrade(&self) {
-        <Self::Api as multiversx_sc::api::VMApi>::init_static();
-        multiversx_sc::io::call_value_init::not_payable::<Self::Api>();
-        let (initial_value, ()) = multiversx_sc::io::load_endpoint_args::<
-            Self::Api,
-            (multiversx_sc::types::BigUint<Self::Api>, ()),
-        >(("initial_value", ()));
-        self.upgrade(initial_value);
-    }
-    #[inline]
-    fn call_add(&self) {
-        <Self::Api as multiversx_sc::api::VMApi>::init_static();
-        multiversx_sc::io::call_value_init::not_payable::<Self::Api>();
-        let (value, ()) = multiversx_sc::io::load_endpoint_args::<
-            Self::Api,
-            (multiversx_sc::types::BigUint<Self::Api>, ()),
-        >(("value", ()));
-        self.add(value);
-    }
-    fn call(&self, fn_name: &str) -> bool {
-        if match fn_name {
-            "callBack" => {
-                self::EndpointWrappers::callback(self);
-                return true;
-            }
-            "init" if <Self::Api as multiversx_sc::api::VMApi>::external_view_init_override() => {
-                multiversx_sc::external_view_contract::external_view_contract_constructor::<
-                    Self::Api,
-                >();
-                return true;
-            }
-            "getSum" => {
-                self.call_sum();
-                true
-            }
-            "init" if !<Self::Api as multiversx_sc::api::VMApi>::external_view_init_override() => {
-                self.call_init();
-                true
-            }
-            "upgrade" => {
-                self.call_upgrade();
-                true
-            }
-            "add" => {
-                self.call_add();
-                true
-            }
-            other => false,
-        } {
-            return true;
-        }
-        false
-    }
-    fn callback_selector(
-        &self,
-        mut ___cb_closure___: multiversx_sc::types::CallbackClosureForDeser<Self::Api>,
-    ) -> multiversx_sc::types::CallbackSelectorResult<Self::Api> {
-        multiversx_sc::types::CallbackSelectorResult::NotProcessed(___cb_closure___)
-    }
-    fn callback(&self) {}
-}
-impl<A> EndpointWrappers for multiversx_sc::contract_base::UniversalContractObj<A>
-where
-    A: multiversx_sc::api::VMApi,
-{}
-pub struct AbiProvider {}
-impl multiversx_sc::contract_base::ContractAbiProvider for AbiProvider {
-    type Api = multiversx_sc::api::uncallable::UncallableApi;
-    fn abi() -> multiversx_sc::abi::ContractAbi {
-        let mut contract_abi = multiversx_sc::abi::ContractAbi::new(
-            multiversx_sc::abi::BuildInfoAbi {
-                contract_crate: multiversx_sc::abi::ContractCrateBuildAbi {
-                    name: "adder",
-                    version: "0.0.0",
-                    git_version: "",
-                },
-                framework: multiversx_sc::abi::FrameworkBuildAbi::create(),
-            },
-            &[
-                "One of the simplest smart contracts possible,",
-                "it holds a single variable in storage, which anyone can increment.",
-            ],
-            "Adder",
-            false,
-        );
-        let mut endpoint_abi = multiversx_sc::abi::EndpointAbi::new(
-            &[],
-            "getSum",
-            "sum",
-            false,
-            false,
-            multiversx_sc::abi::EndpointMutabilityAbi::Readonly,
-            multiversx_sc::abi::EndpointTypeAbi::Endpoint,
-            &[],
-            &[],
-            false,
-        );
-        endpoint_abi
-            .add_output::<
-                SingleValueMapper<Self::Api, multiversx_sc::types::BigUint<Self::Api>>,
-            >(&[]);
-        contract_abi
-            .add_type_descriptions::<
-                SingleValueMapper<Self::Api, multiversx_sc::types::BigUint<Self::Api>>,
-            >();
-        contract_abi.endpoints.push(endpoint_abi);
-        let mut endpoint_abi = multiversx_sc::abi::EndpointAbi::new(
-            &[],
-            "init",
-            "init",
-            false,
-            false,
-            multiversx_sc::abi::EndpointMutabilityAbi::Mutable,
-            multiversx_sc::abi::EndpointTypeAbi::Init,
-            &[],
-            &[],
-            false,
-        );
-        endpoint_abi
-            .add_input::<multiversx_sc::types::BigUint<Self::Api>>("initial_value");
-        contract_abi.add_type_descriptions::<multiversx_sc::types::BigUint<Self::Api>>();
-        contract_abi.constructors.push(endpoint_abi);
-        let mut endpoint_abi = multiversx_sc::abi::EndpointAbi::new(
-            &[],
-            "upgrade",
-            "upgrade",
-            false,
-            false,
-            multiversx_sc::abi::EndpointMutabilityAbi::Mutable,
-            multiversx_sc::abi::EndpointTypeAbi::Upgrade,
-            &[],
-            &[],
-            false,
-        );
-        endpoint_abi
-            .add_input::<multiversx_sc::types::BigUint<Self::Api>>("initial_value");
-        contract_abi.add_type_descriptions::<multiversx_sc::types::BigUint<Self::Api>>();
-        contract_abi.upgrade_constructors.push(endpoint_abi);
-        let mut endpoint_abi = multiversx_sc::abi::EndpointAbi::new(
-            &["Add desired amount to the storage variable."],
-            "add",
-            "add",
-            false,
-            false,
-            multiversx_sc::abi::EndpointMutabilityAbi::Mutable,
-            multiversx_sc::abi::EndpointTypeAbi::Endpoint,
-            &[],
-            &[],
-            false,
-        );
-        endpoint_abi.add_input::<multiversx_sc::types::BigUint<Self::Api>>("value");
-        contract_abi.add_type_descriptions::<multiversx_sc::types::BigUint<Self::Api>>();
-        contract_abi.endpoints.push(endpoint_abi);
-        contract_abi
-    }
-}
-pub struct ContractObj<A>
-where
-    A: multiversx_sc::api::VMApi,
-{
-    _phantom: core::marker::PhantomData<A>,
-}
-impl<A> multiversx_sc::contract_base::ContractBase for ContractObj<A>
-where
-    A: multiversx_sc::api::VMApi,
-{
-    type Api = A;
-}
-impl<A> AutoImpl for ContractObj<A>
-where
-    A: multiversx_sc::api::VMApi,
-{}
-impl<A> EndpointWrappers for ContractObj<A>
-where
-    A: multiversx_sc::api::VMApi,
-{}
-impl<A> multiversx_sc::contract_base::CallableContract for ContractObj<A>
-where
-    A: multiversx_sc::api::VMApi + Send + Sync,
-{
-    fn call(&self, fn_name: &str) -> bool {
-        EndpointWrappers::call(self, fn_name)
-    }
-}
-pub fn contract_obj<A>() -> ContractObj<A>
-where
-    A: multiversx_sc::api::VMApi,
-{
-    ContractObj {
-        _phantom: core::marker::PhantomData,
-    }
-}
-pub struct ContractBuilder;
-impl multiversx_sc::contract_base::CallableContractBuilder for self::ContractBuilder {
-    fn new_contract_obj<A: multiversx_sc::api::VMApi + Send + Sync>(
-        &self,
-    ) -> multiversx_sc::types::heap::Box<
-        dyn multiversx_sc::contract_base::CallableContract,
-    > {
-        multiversx_sc::types::heap::Box::new(ContractObj::<A> {
-            _phantom: core::marker::PhantomData,
-        })
-    }
-}
-#[allow(non_snake_case)]
-pub mod endpoints {
-    use super::EndpointWrappers;
-    pub fn sum<A>()
-    where
-        A: multiversx_sc::api::VMApi,
-    {
-        super::EndpointWrappers::call_sum(
-            &multiversx_sc::contract_base::UniversalContractObj::<A>::new(),
-        );
-    }
-    pub fn init<A>()
-    where
-        A: multiversx_sc::api::VMApi,
-    {
-        super::EndpointWrappers::call_init(
-            &multiversx_sc::contract_base::UniversalContractObj::<A>::new(),
-        );
-    }
-    pub fn upgrade<A>()
-    where
-        A: multiversx_sc::api::VMApi,
-    {
-        super::EndpointWrappers::call_upgrade(
-            &multiversx_sc::contract_base::UniversalContractObj::<A>::new(),
-        );
-    }
-    pub fn add<A>()
-    where
-        A: multiversx_sc::api::VMApi,
-    {
-        super::EndpointWrappers::call_add(
-            &multiversx_sc::contract_base::UniversalContractObj::<A>::new(),
-        );
-    }
-    pub fn callBack<A>()
-    where
-        A: multiversx_sc::api::VMApi,
-    {
-        super::EndpointWrappers::callback(
-            &multiversx_sc::contract_base::UniversalContractObj::<A>::new(),
-        );
-    }
-}
-pub trait ProxyTrait: multiversx_sc::contract_base::ProxyObjBase + Sized {
-    #[allow(clippy::too_many_arguments)]
-    #[allow(clippy::type_complexity)]
-    fn sum(
-        &mut self,
-    ) -> multiversx_sc::types::Tx<
-        multiversx_sc::types::TxScEnv<Self::Api>,
-        (),
-        Self::To,
-        (),
-        (),
-        multiversx_sc::types::FunctionCall<Self::Api>,
-        multiversx_sc::types::OriginalResultMarker<
-            SingleValueMapper<Self::Api, multiversx_sc::types::BigUint<Self::Api>>,
-        >,
-    > {
-        multiversx_sc::types::TxBaseWithEnv::new_tx_from_sc()
-            .to(self.extract_proxy_to())
-            .original_result()
-            .raw_call("getSum")
-    }
-    #[allow(clippy::too_many_arguments)]
-    #[allow(clippy::type_complexity)]
-    fn init<
-        Arg0: multiversx_sc::types::ProxyArg<multiversx_sc::types::BigUint<Self::Api>>,
-    >(
-        &mut self,
-        initial_value: Arg0,
-    ) -> multiversx_sc::types::Tx<
-        multiversx_sc::types::TxScEnv<Self::Api>,
-        (),
-        Self::To,
-        (),
-        (),
-        multiversx_sc::types::DeployCall<multiversx_sc::types::TxScEnv<Self::Api>, ()>,
-        multiversx_sc::types::OriginalResultMarker<()>,
-    > {
-        multiversx_sc::types::TxBaseWithEnv::new_tx_from_sc()
-            .raw_deploy()
-            .argument(&initial_value)
-            .original_result()
-            .to(self.extract_proxy_to())
-    }
-    #[allow(clippy::too_many_arguments)]
-    #[allow(clippy::type_complexity)]
-    fn upgrade<
-        Arg0: multiversx_sc::types::ProxyArg<multiversx_sc::types::BigUint<Self::Api>>,
-    >(
-        &mut self,
-        initial_value: Arg0,
-    ) -> multiversx_sc::types::Tx<
-        multiversx_sc::types::TxScEnv<Self::Api>,
-        (),
-        Self::To,
-        (),
-        (),
-        multiversx_sc::types::FunctionCall<Self::Api>,
-        multiversx_sc::types::OriginalResultMarker<()>,
-    > {
-        multiversx_sc::types::TxBaseWithEnv::new_tx_from_sc()
-            .to(self.extract_proxy_to())
-            .original_result()
-            .raw_call("upgrade")
-            .argument(&initial_value)
-    }
-    #[allow(clippy::too_many_arguments)]
-    #[allow(clippy::type_complexity)]
-    fn add<
-        Arg0: multiversx_sc::types::ProxyArg<multiversx_sc::types::BigUint<Self::Api>>,
-    >(
-        &mut self,
-        value: Arg0,
-    ) -> multiversx_sc::types::Tx<
-        multiversx_sc::types::TxScEnv<Self::Api>,
-        (),
-        Self::To,
-        (),
-        (),
-        multiversx_sc::types::FunctionCall<Self::Api>,
-        multiversx_sc::types::OriginalResultMarker<()>,
-    > {
-        multiversx_sc::types::TxBaseWithEnv::new_tx_from_sc()
-            .to(self.extract_proxy_to())
-            .original_result()
-            .raw_call("add")
-            .argument(&value)
-    }
-}
-pub struct Proxy<A>
-where
-    A: multiversx_sc::api::VMApi + 'static,
-{
-    _phantom: core::marker::PhantomData<A>,
-}
-impl<A> multiversx_sc::contract_base::ProxyObjBase for Proxy<A>
-where
-    A: multiversx_sc::api::VMApi + 'static,
-{
-    type Api = A;
-    type To = ();
-    fn extract_opt_address(
-        &mut self,
-    ) -> multiversx_sc::types::ManagedOption<
-        Self::Api,
-        multiversx_sc::types::ManagedAddress<Self::Api>,
-    > {
-        multiversx_sc::types::ManagedOption::none()
-    }
-    fn extract_address(&mut self) -> multiversx_sc::types::ManagedAddress<Self::Api> {
-        multiversx_sc::api::ErrorApiImpl::signal_error(
-            &<A as multiversx_sc::api::ErrorApi>::error_api_impl(),
-            multiversx_sc::err_msg::RECIPIENT_ADDRESS_NOT_SET.as_bytes(),
-        )
-    }
-    fn extract_proxy_to(&mut self) -> Self::To {}
-}
-impl<A> multiversx_sc::contract_base::ProxyObjNew for Proxy<A>
-where
-    A: multiversx_sc::api::VMApi + 'static,
-{
-    type ProxyTo = ProxyTo<A>;
-    fn new_proxy_obj() -> Self {
-        Proxy {
-            _phantom: core::marker::PhantomData,
-        }
-    }
-    fn contract(
-        mut self,
-        address: multiversx_sc::types::ManagedAddress<Self::Api>,
-    ) -> Self::ProxyTo {
-        ProxyTo {
-            address: multiversx_sc::types::ManagedOption::some(address),
-        }
-    }
-}
-pub struct ProxyTo<A>
-where
-    A: multiversx_sc::api::VMApi + 'static,
-{
-    pub address: multiversx_sc::types::ManagedOption<
-        A,
-        multiversx_sc::types::ManagedAddress<A>,
-    >,
-}
-impl<A> multiversx_sc::contract_base::ProxyObjBase for ProxyTo<A>
-where
-    A: multiversx_sc::api::VMApi + 'static,
-{
-    type Api = A;
-    type To = multiversx_sc::types::ManagedAddress<A>;
-    fn extract_opt_address(
-        &mut self,
-    ) -> multiversx_sc::types::ManagedOption<
-        Self::Api,
-        multiversx_sc::types::ManagedAddress<Self::Api>,
-    > {
-        core::mem::replace(
-            &mut self.address,
-            multiversx_sc::types::ManagedOption::none(),
-        )
-    }
-    fn extract_address(&mut self) -> multiversx_sc::types::ManagedAddress<Self::Api> {
-        let address = core::mem::replace(
-            &mut self.address,
-            multiversx_sc::types::ManagedOption::none(),
-        );
-        address.unwrap_or_sc_panic(multiversx_sc::err_msg::RECIPIENT_ADDRESS_NOT_SET)
-    }
-    fn extract_proxy_to(&mut self) -> Self::To {
-        self.extract_address()
-    }
-}
-impl<A> ProxyTrait for Proxy<A>
-where
-    A: multiversx_sc::api::VMApi,
-{}
-impl<A> ProxyTrait for ProxyTo<A>
-where
-    A: multiversx_sc::api::VMApi,
-{}
diff --git a/contracts/examples/adder/src/adder.rs b/contracts/examples/adder/src/adder.rs
index 3462576bc1..fcbb188b84 100644
--- a/contracts/examples/adder/src/adder.rs
+++ b/contracts/examples/adder/src/adder.rs
@@ -13,7 +13,10 @@ pub trait Adder {
     fn sum(&self) -> SingleValueMapper<BigUint>;
 
     #[storage_mapper_from_address("sum")]
-    fn sum_with_address(&self, address: &ManagedAddress) -> SingleValueMapper<BigUint>;
+    fn sum_with_address(
+        &self,
+        address: &ManagedAddress,
+    ) -> SingleValueMapper<BigUint, ManagedAddress>;
 
     #[init]
     fn init(&self, initial_value: BigUint) {
diff --git a/framework/base/src/storage/mappers.rs b/framework/base/src/storage/mappers.rs
index da17fa711c..d04b26e3e2 100644
--- a/framework/base/src/storage/mappers.rs
+++ b/framework/base/src/storage/mappers.rs
@@ -3,7 +3,7 @@ mod bi_di_mapper;
 mod linked_list_mapper;
 mod map_mapper;
 mod map_storage_mapper;
-pub mod mapper;
+mod mapper;
 mod ordered_binary_tree_mapper;
 mod queue_mapper;
 mod set_mapper;
@@ -20,7 +20,7 @@ pub use bi_di_mapper::BiDiMapper;
 pub use linked_list_mapper::{LinkedListMapper, LinkedListNode};
 pub use map_mapper::MapMapper;
 pub use map_storage_mapper::MapStorageMapper;
-pub use mapper::{StorageClearable, StorageMapper};
+pub use mapper::{StorageClearable, StorageMapper, StorageMapperFromAddress};
 pub use ordered_binary_tree_mapper::{
     NodeId, OrderedBinaryTreeMapper, OrderedBinaryTreeNode, NULL_NODE_ID,
 };
diff --git a/framework/base/src/storage/mappers/address_to_id_mapper.rs b/framework/base/src/storage/mappers/address_to_id_mapper.rs
index da487fa415..49e67f88b2 100644
--- a/framework/base/src/storage/mappers/address_to_id_mapper.rs
+++ b/framework/base/src/storage/mappers/address_to_id_mapper.rs
@@ -2,7 +2,7 @@ use core::marker::PhantomData;
 
 use super::{
     set_mapper::{CurrentStorage, StorageAddress},
-    StorageMapper,
+    StorageMapper, StorageMapperFromAddress,
 };
 use crate::{
     api::{ErrorApiImpl, StorageMapperApi},
@@ -42,11 +42,24 @@ where
     }
 }
 
-impl<SA> AddressToIdMapper<SA, ManagedAddress<SA>>
+impl<SA> StorageMapper<SA> for AddressToIdMapper<SA, ManagedAddress<SA>>
 where
     SA: StorageMapperApi,
 {
-    pub fn new_from_address(address: ManagedAddress<SA>, base_key: StorageKey<SA>) -> Self {
+    fn new(base_key: StorageKey<SA>) -> Self {
+        AddressToIdMapper {
+            _phantom_api: PhantomData,
+            address: ManagedAddress::default(),
+            base_key,
+        }
+    }
+}
+
+impl<SA> StorageMapperFromAddress<SA> for AddressToIdMapper<SA, ManagedAddress<SA>>
+where
+    SA: StorageMapperApi,
+{
+    fn new_from_address(address: ManagedAddress<SA>, base_key: StorageKey<SA>) -> Self {
         AddressToIdMapper {
             _phantom_api: PhantomData,
             address,
diff --git a/framework/base/src/storage/mappers/bi_di_mapper.rs b/framework/base/src/storage/mappers/bi_di_mapper.rs
index c47f38474c..8164a25048 100644
--- a/framework/base/src/storage/mappers/bi_di_mapper.rs
+++ b/framework/base/src/storage/mappers/bi_di_mapper.rs
@@ -11,7 +11,7 @@ use crate::{
 
 use super::{
     set_mapper::{CurrentStorage, StorageAddress},
-    unordered_set_mapper, StorageMapper, UnorderedSetMapper,
+    unordered_set_mapper, StorageMapper, StorageMapperFromAddress, UnorderedSetMapper,
 };
 use crate::{
     abi::{TypeAbi, TypeDescriptionContainer, TypeName},
@@ -66,13 +66,35 @@ where
     }
 }
 
-impl<SA, K, V> BiDiMapper<SA, K, V, ManagedAddress<SA>>
+impl<SA, K, V> StorageMapper<SA> for BiDiMapper<SA, K, V, ManagedAddress<SA>>
 where
     SA: StorageMapperApi,
     K: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static + Default + PartialEq,
     V: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static + Default + PartialEq,
 {
-    pub fn new_from_address(address: ManagedAddress<SA>, base_key: StorageKey<SA>) -> Self {
+    fn new(base_key: StorageKey<SA>) -> Self {
+        let mut id_key = base_key.clone();
+        id_key.append_bytes(ID_SUFIX);
+
+        let mut value_key = base_key.clone();
+        value_key.append_bytes(VALUE_SUFIX);
+        BiDiMapper {
+            _phantom_api: PhantomData,
+            address: ManagedAddress::default(),
+            id_set_mapper: UnorderedSetMapper::<SA, K, ManagedAddress<SA>>::new(id_key),
+            value_set_mapper: UnorderedSetMapper::<SA, V, ManagedAddress<SA>>::new(value_key),
+            base_key,
+        }
+    }
+}
+
+impl<SA, K, V> StorageMapperFromAddress<SA> for BiDiMapper<SA, K, V, ManagedAddress<SA>>
+where
+    SA: StorageMapperApi,
+    K: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static + Default + PartialEq,
+    V: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static + Default + PartialEq,
+{
+    fn new_from_address(address: ManagedAddress<SA>, base_key: StorageKey<SA>) -> Self {
         let mut id_key = base_key.clone();
         id_key.append_bytes(ID_SUFIX);
 
diff --git a/framework/base/src/storage/mappers/linked_list_mapper.rs b/framework/base/src/storage/mappers/linked_list_mapper.rs
index fd65fdec91..8bde2bbcde 100644
--- a/framework/base/src/storage/mappers/linked_list_mapper.rs
+++ b/framework/base/src/storage/mappers/linked_list_mapper.rs
@@ -2,7 +2,7 @@ use core::marker::PhantomData;
 
 use super::{
     set_mapper::{CurrentStorage, StorageAddress},
-    StorageClearable, StorageMapper,
+    StorageClearable, StorageMapper, StorageMapperFromAddress,
 };
 use crate::{
     abi::{TypeAbi, TypeAbiFrom, TypeDescriptionContainer, TypeName},
@@ -118,12 +118,27 @@ where
     }
 }
 
-impl<SA, T> LinkedListMapper<SA, T, ManagedAddress<SA>>
+impl<SA, T> StorageMapper<SA> for LinkedListMapper<SA, T, ManagedAddress<SA>>
 where
     SA: StorageMapperApi,
     T: TopEncode + TopDecode + NestedEncode + NestedDecode + Clone,
 {
-    pub fn new_from_address(address: ManagedAddress<SA>, base_key: StorageKey<SA>) -> Self {
+    fn new(base_key: StorageKey<SA>) -> Self {
+        LinkedListMapper {
+            _phantom_api: PhantomData,
+            address: ManagedAddress::default(),
+            base_key,
+            _phantom_item: PhantomData,
+        }
+    }
+}
+
+impl<SA, T> StorageMapperFromAddress<SA> for LinkedListMapper<SA, T, ManagedAddress<SA>>
+where
+    SA: StorageMapperApi,
+    T: TopEncode + TopDecode + NestedEncode + NestedDecode + Clone,
+{
+    fn new_from_address(address: ManagedAddress<SA>, base_key: StorageKey<SA>) -> Self {
         LinkedListMapper {
             _phantom_api: PhantomData,
             address,
diff --git a/framework/base/src/storage/mappers/map_mapper.rs b/framework/base/src/storage/mappers/map_mapper.rs
index aa5d105b9e..a15919909a 100644
--- a/framework/base/src/storage/mappers/map_mapper.rs
+++ b/framework/base/src/storage/mappers/map_mapper.rs
@@ -2,7 +2,7 @@ use core::marker::PhantomData;
 
 use super::{
     set_mapper::{self, CurrentStorage, StorageAddress},
-    SetMapper, StorageClearable, StorageMapper,
+    SetMapper, StorageClearable, StorageMapper, StorageMapperFromAddress,
 };
 use crate::{
     abi::{TypeAbi, TypeAbiFrom, TypeDescriptionContainer, TypeName},
@@ -49,6 +49,23 @@ where
     }
 }
 
+impl<SA, K, V> StorageMapper<SA> for MapMapper<SA, K, V, ManagedAddress<SA>>
+where
+    SA: StorageMapperApi,
+    K: TopEncode + TopDecode + NestedEncode + NestedDecode,
+    V: TopEncode + TopDecode,
+{
+    fn new(base_key: StorageKey<SA>) -> Self {
+        MapMapper {
+            _phantom_api: PhantomData,
+            address: ManagedAddress::default(),
+            base_key: base_key.clone(),
+            keys_set: SetMapper::new(base_key),
+            _phantom_value: PhantomData,
+        }
+    }
+}
+
 impl<SA, K, V> StorageClearable for MapMapper<SA, K, V, CurrentStorage>
 where
     SA: StorageMapperApi,
@@ -99,13 +116,13 @@ where
     }
 }
 
-impl<SA, K, V> MapMapper<SA, K, V, ManagedAddress<SA>>
+impl<SA, K, V> StorageMapperFromAddress<SA> for MapMapper<SA, K, V, ManagedAddress<SA>>
 where
     SA: StorageMapperApi,
     K: TopEncode + TopDecode + NestedEncode + NestedDecode,
     V: TopEncode + TopDecode,
 {
-    pub fn new_from_address(address: ManagedAddress<SA>, base_key: StorageKey<SA>) -> Self {
+    fn new_from_address(address: ManagedAddress<SA>, base_key: StorageKey<SA>) -> Self {
         MapMapper {
             _phantom_api: PhantomData,
             address: address.clone(),
diff --git a/framework/base/src/storage/mappers/map_storage_mapper.rs b/framework/base/src/storage/mappers/map_storage_mapper.rs
index 5b101452b8..23a40eeaa0 100644
--- a/framework/base/src/storage/mappers/map_storage_mapper.rs
+++ b/framework/base/src/storage/mappers/map_storage_mapper.rs
@@ -2,7 +2,7 @@ use core::marker::PhantomData;
 
 use super::{
     set_mapper::{self, CurrentStorage, StorageAddress},
-    SetMapper, StorageClearable, StorageMapper,
+    SetMapper, StorageClearable, StorageMapper, StorageMapperFromAddress,
 };
 use crate::{
     api::StorageMapperApi,
@@ -44,6 +44,22 @@ where
     }
 }
 
+impl<SA, K, V> StorageMapper<SA> for MapStorageMapper<SA, K, V, ManagedAddress<SA>>
+where
+    SA: StorageMapperApi,
+    K: TopEncode + TopDecode + NestedEncode + NestedDecode,
+    V: StorageMapper<SA> + StorageClearable,
+{
+    fn new(base_key: StorageKey<SA>) -> Self {
+        Self {
+            _phantom_api: PhantomData,
+            base_key: base_key.clone(),
+            keys_set: SetMapper::new(base_key),
+            _phantom_value: PhantomData,
+        }
+    }
+}
+
 impl<SA, K, V> StorageClearable for MapStorageMapper<SA, K, V, CurrentStorage>
 where
     SA: StorageMapperApi,
@@ -87,13 +103,13 @@ where
     }
 }
 
-impl<SA, K, V> MapStorageMapper<SA, K, V, ManagedAddress<SA>>
+impl<SA, K, V> StorageMapperFromAddress<SA> for MapStorageMapper<SA, K, V, ManagedAddress<SA>>
 where
     SA: StorageMapperApi,
     K: TopEncode + TopDecode + NestedEncode + NestedDecode,
     V: StorageMapper<SA> + StorageClearable,
 {
-    pub fn new_from_address(address: ManagedAddress<SA>, base_key: StorageKey<SA>) -> Self {
+    fn new_from_address(address: ManagedAddress<SA>, base_key: StorageKey<SA>) -> Self {
         MapStorageMapper {
             _phantom_api: PhantomData,
             base_key: base_key.clone(),
diff --git a/framework/base/src/storage/mappers/queue_mapper.rs b/framework/base/src/storage/mappers/queue_mapper.rs
index ac65764c36..2a4d89e501 100644
--- a/framework/base/src/storage/mappers/queue_mapper.rs
+++ b/framework/base/src/storage/mappers/queue_mapper.rs
@@ -2,7 +2,7 @@ use core::marker::PhantomData;
 
 use super::{
     set_mapper::{CurrentStorage, StorageAddress},
-    StorageClearable, StorageMapper,
+    StorageClearable, StorageMapper, StorageMapperFromAddress,
 };
 use crate::{
     abi::{TypeAbi, TypeAbiFrom, TypeDescriptionContainer, TypeName},
@@ -91,6 +91,20 @@ where
         }
     }
 }
+impl<SA, T> StorageMapper<SA> for QueueMapper<SA, T, ManagedAddress<SA>>
+where
+    SA: StorageMapperApi,
+    T: TopEncode + TopDecode,
+{
+    fn new(base_key: StorageKey<SA>) -> Self {
+        QueueMapper {
+            _phantom_api: PhantomData,
+            address: ManagedAddress::default(),
+            base_key,
+            _phantom_item: PhantomData,
+        }
+    }
+}
 
 impl<SA, T> StorageClearable for QueueMapper<SA, T, CurrentStorage>
 where
@@ -271,12 +285,12 @@ where
     }
 }
 
-impl<SA, T> QueueMapper<SA, T, ManagedAddress<SA>>
+impl<SA, T> StorageMapperFromAddress<SA> for QueueMapper<SA, T, ManagedAddress<SA>>
 where
     SA: StorageMapperApi,
     T: TopEncode + TopDecode,
 {
-    pub fn new_from_address(address: ManagedAddress<SA>, base_key: StorageKey<SA>) -> Self {
+    fn new_from_address(address: ManagedAddress<SA>, base_key: StorageKey<SA>) -> Self {
         QueueMapper {
             _phantom_api: PhantomData::<SA>,
             address,
diff --git a/framework/base/src/storage/mappers/set_mapper.rs b/framework/base/src/storage/mappers/set_mapper.rs
index 2ab1deb4f2..07c5911e6e 100644
--- a/framework/base/src/storage/mappers/set_mapper.rs
+++ b/framework/base/src/storage/mappers/set_mapper.rs
@@ -3,7 +3,7 @@ use core::marker::PhantomData;
 use storage_get_from_address::storage_get_len_from_address;
 
 pub use super::queue_mapper::Iter;
-use super::{QueueMapper, StorageClearable, StorageMapper};
+use super::{QueueMapper, StorageClearable, StorageMapper, StorageMapperFromAddress};
 use crate::{
     abi::{TypeAbi, TypeAbiFrom, TypeDescriptionContainer, TypeName},
     api::StorageMapperApi,
@@ -82,6 +82,21 @@ where
     }
 }
 
+impl<SA, T> StorageMapper<SA> for SetMapper<SA, T, ManagedAddress<SA>>
+where
+    SA: StorageMapperApi,
+    T: TopEncode + TopDecode + NestedEncode + NestedDecode,
+{
+    fn new(base_key: StorageKey<SA>) -> Self {
+        SetMapper {
+            _phantom_api: PhantomData,
+            address: ManagedAddress::default(),
+            base_key: base_key.clone(),
+            queue_mapper: QueueMapper::new(base_key),
+        }
+    }
+}
+
 impl<SA, T> StorageClearable for SetMapper<SA, T, CurrentStorage>
 where
     SA: StorageMapperApi,
@@ -95,12 +110,12 @@ where
     }
 }
 
-impl<SA, T> SetMapper<SA, T, ManagedAddress<SA>>
+impl<SA, T> StorageMapperFromAddress<SA> for SetMapper<SA, T, ManagedAddress<SA>>
 where
     SA: StorageMapperApi,
     T: TopEncode + TopDecode + NestedEncode + NestedDecode,
 {
-    pub fn new_from_address(address: ManagedAddress<SA>, base_key: StorageKey<SA>) -> Self {
+    fn new_from_address(address: ManagedAddress<SA>, base_key: StorageKey<SA>) -> Self {
         SetMapper {
             _phantom_api: PhantomData,
             address: address.clone(),
diff --git a/framework/base/src/storage/mappers/single_value_mapper.rs b/framework/base/src/storage/mappers/single_value_mapper.rs
index 1f121250ff..71a5131d6d 100644
--- a/framework/base/src/storage/mappers/single_value_mapper.rs
+++ b/framework/base/src/storage/mappers/single_value_mapper.rs
@@ -2,7 +2,7 @@ use core::{borrow::Borrow, marker::PhantomData};
 
 use super::{
     set_mapper::{CurrentStorage, StorageAddress},
-    StorageMapper,
+    StorageMapper, StorageMapperFromAddress,
 };
 use crate::{
     abi::{TypeAbi, TypeAbiFrom, TypeDescriptionContainer, TypeName},
@@ -44,13 +44,29 @@ where
     }
 }
 
-impl<SA, T> SingleValueMapper<SA, T, ManagedAddress<SA>>
+impl<SA, T> StorageMapper<SA> for SingleValueMapper<SA, T, ManagedAddress<SA>>
 where
     SA: StorageMapperApi,
     T: TopEncode + TopDecode,
 {
     #[inline]
-    pub fn new_from_address(address: ManagedAddress<SA>, base_key: StorageKey<SA>) -> Self {
+    fn new(base_key: StorageKey<SA>) -> Self {
+        SingleValueMapper {
+            address: ManagedAddress::default(),
+            key: base_key,
+            _phantom_api: PhantomData,
+            _phantom_item: PhantomData,
+        }
+    }
+}
+
+impl<SA, T> StorageMapperFromAddress<SA> for SingleValueMapper<SA, T, ManagedAddress<SA>>
+where
+    SA: StorageMapperApi,
+    T: TopEncode + TopDecode,
+{
+    #[inline]
+    fn new_from_address(address: ManagedAddress<SA>, base_key: StorageKey<SA>) -> Self {
         SingleValueMapper {
             address,
             key: base_key,
diff --git a/framework/base/src/storage/mappers/unique_id_mapper.rs b/framework/base/src/storage/mappers/unique_id_mapper.rs
index 4ee1faa624..7395c6deed 100644
--- a/framework/base/src/storage/mappers/unique_id_mapper.rs
+++ b/framework/base/src/storage/mappers/unique_id_mapper.rs
@@ -8,7 +8,7 @@ use crate::{
 
 use super::{
     set_mapper::{CurrentStorage, StorageAddress},
-    StorageMapper, VecMapper,
+    StorageMapper, StorageMapperFromAddress, VecMapper,
 };
 use crate::{
     abi::{TypeAbi, TypeDescriptionContainer, TypeName},
@@ -47,11 +47,24 @@ where
     }
 }
 
-impl<SA> UniqueIdMapper<SA, ManagedAddress<SA>>
+impl<SA> StorageMapper<SA> for UniqueIdMapper<SA, ManagedAddress<SA>>
 where
     SA: StorageMapperApi,
 {
-    pub fn new_from_address(address: ManagedAddress<SA>, base_key: StorageKey<SA>) -> Self {
+    fn new(base_key: StorageKey<SA>) -> Self {
+        Self {
+            _address: ManagedAddress::default(),
+            base_key: base_key.clone(),
+            vec_mapper: VecMapper::new(base_key),
+        }
+    }
+}
+
+impl<SA> StorageMapperFromAddress<SA> for UniqueIdMapper<SA, ManagedAddress<SA>>
+where
+    SA: StorageMapperApi,
+{
+    fn new_from_address(address: ManagedAddress<SA>, base_key: StorageKey<SA>) -> Self {
         Self {
             _address: address.clone(),
             base_key: base_key.clone(),
diff --git a/framework/base/src/storage/mappers/unordered_set_mapper.rs b/framework/base/src/storage/mappers/unordered_set_mapper.rs
index 254e56c6b5..087d7832d5 100644
--- a/framework/base/src/storage/mappers/unordered_set_mapper.rs
+++ b/framework/base/src/storage/mappers/unordered_set_mapper.rs
@@ -3,7 +3,7 @@ use core::marker::PhantomData;
 pub use super::vec_mapper::Iter;
 use super::{
     set_mapper::{CurrentStorage, StorageAddress},
-    StorageClearable, StorageMapper, VecMapper,
+    StorageClearable, StorageMapper, StorageMapperFromAddress, VecMapper,
 };
 use crate::{
     abi::{TypeAbi, TypeAbiFrom, TypeDescriptionContainer, TypeName},
@@ -47,12 +47,27 @@ where
     }
 }
 
-impl<SA, T> UnorderedSetMapper<SA, T, ManagedAddress<SA>>
+impl<SA, T> StorageMapper<SA> for UnorderedSetMapper<SA, T, ManagedAddress<SA>>
 where
     SA: StorageMapperApi,
     T: TopEncode + TopDecode + NestedEncode + NestedDecode,
 {
-    pub fn new_from_address(address: ManagedAddress<SA>, base_key: StorageKey<SA>) -> Self {
+    fn new(base_key: StorageKey<SA>) -> Self {
+        UnorderedSetMapper {
+            _phantom_api: PhantomData,
+            address: ManagedAddress::default(),
+            base_key: base_key.clone(),
+            vec_mapper: VecMapper::<SA, T, ManagedAddress<SA>>::new(base_key),
+        }
+    }
+}
+
+impl<SA, T> StorageMapperFromAddress<SA> for UnorderedSetMapper<SA, T, ManagedAddress<SA>>
+where
+    SA: StorageMapperApi,
+    T: TopEncode + TopDecode + NestedEncode + NestedDecode,
+{
+    fn new_from_address(address: ManagedAddress<SA>, base_key: StorageKey<SA>) -> Self {
         UnorderedSetMapper {
             _phantom_api: PhantomData,
             address: address.clone(),
diff --git a/framework/base/src/storage/mappers/user_mapper.rs b/framework/base/src/storage/mappers/user_mapper.rs
index 52039da9d5..1260b81457 100644
--- a/framework/base/src/storage/mappers/user_mapper.rs
+++ b/framework/base/src/storage/mappers/user_mapper.rs
@@ -9,7 +9,7 @@ use crate::{
 
 use super::{
     set_mapper::{CurrentStorage, StorageAddress},
-    StorageMapper,
+    StorageMapper, StorageMapperFromAddress,
 };
 use crate::{
     abi::{TypeAbi, TypeName},
@@ -54,11 +54,24 @@ where
     }
 }
 
-impl<SA> UserMapper<SA, ManagedAddress<SA>>
+impl<SA> StorageMapper<SA> for UserMapper<SA, ManagedAddress<SA>>
 where
     SA: StorageMapperApi,
 {
-    pub fn new_from_address(address: ManagedAddress<SA>, base_key: StorageKey<SA>) -> Self {
+    fn new(base_key: StorageKey<SA>) -> Self {
+        UserMapper {
+            _phantom_api: PhantomData,
+            address: ManagedAddress::default(),
+            base_key,
+        }
+    }
+}
+
+impl<SA> StorageMapperFromAddress<SA> for UserMapper<SA, ManagedAddress<SA>>
+where
+    SA: StorageMapperApi,
+{
+    fn new_from_address(address: ManagedAddress<SA>, base_key: StorageKey<SA>) -> Self {
         UserMapper {
             _phantom_api: PhantomData,
             address,
diff --git a/framework/base/src/storage/mappers/vec_mapper.rs b/framework/base/src/storage/mappers/vec_mapper.rs
index dfca055720..32b515344c 100644
--- a/framework/base/src/storage/mappers/vec_mapper.rs
+++ b/framework/base/src/storage/mappers/vec_mapper.rs
@@ -1,7 +1,6 @@
 use super::{
-    mapper::StorageMapperFromAddress,
     set_mapper::{CurrentStorage, StorageAddress},
-    StorageClearable, StorageMapper,
+    StorageClearable, StorageMapper, StorageMapperFromAddress,
 };
 use crate::{
     abi::{TypeAbi, TypeAbiFrom, TypeDescriptionContainer, TypeName},
diff --git a/framework/base/src/storage/mappers/whitelist_mapper.rs b/framework/base/src/storage/mappers/whitelist_mapper.rs
index ac9ea7ea41..6adf686ea7 100644
--- a/framework/base/src/storage/mappers/whitelist_mapper.rs
+++ b/framework/base/src/storage/mappers/whitelist_mapper.rs
@@ -4,7 +4,7 @@ use multiversx_sc_codec::{TopDecode, TopEncode};
 
 use super::{
     set_mapper::{CurrentStorage, StorageAddress},
-    SingleValueMapper, StorageMapper,
+    SingleValueMapper, StorageMapper, StorageMapperFromAddress,
 };
 use crate::{
     api::{ErrorApiImpl, StorageMapperApi},
@@ -45,12 +45,26 @@ where
     }
 }
 
-impl<SA, T> WhitelistMapper<SA, T, ManagedAddress<SA>>
+impl<SA, T> StorageMapper<SA> for WhitelistMapper<SA, T, ManagedAddress<SA>>
+where
+    SA: StorageMapperApi,
+    T: NestedEncode + 'static,
+{
+    fn new(base_key: StorageKey<SA>) -> Self {
+        Self {
+            address: ManagedAddress::default(),
+            base_key,
+            _phantom: PhantomData,
+        }
+    }
+}
+
+impl<SA, T> StorageMapperFromAddress<SA> for WhitelistMapper<SA, T, ManagedAddress<SA>>
 where
     SA: StorageMapperApi,
     T: NestedEncode + 'static,
 {
-    pub fn new_from_address(address: ManagedAddress<SA>, base_key: StorageKey<SA>) -> Self {
+    fn new_from_address(address: ManagedAddress<SA>, base_key: StorageKey<SA>) -> Self {
         Self {
             address,
             base_key,
diff --git a/framework/derive/src/generate/auto_impl_storage.rs b/framework/derive/src/generate/auto_impl_storage.rs
index b2f481613a..d47ffc42d7 100644
--- a/framework/derive/src/generate/auto_impl_storage.rs
+++ b/framework/derive/src/generate/auto_impl_storage.rs
@@ -84,15 +84,21 @@ pub fn generate_mapper_impl(m: &Method, identifier: &str) -> proc_macro2::TokenS
 
 pub fn generate_mapper_from_address_impl(m: &Method, identifier: &str) -> proc_macro2::TokenStream {
     let msig = method_gen::generate_sig_with_attributes(m);
+    assert!(
+        !m.method_args.is_empty(),
+        "mapper from address must have at least one argument, for the value"
+    );
     let key_snippet = generate_key_snippet(&m.method_args[1..], identifier);
-
+    let address_arg = &m.method_args[0];
+    let address_pat = &address_arg.pat;
     match m.return_type.clone() {
         syn::ReturnType::Default => panic!("getter from address should return some value"),
         syn::ReturnType::Type(_, ty) => {
             quote! {
                 #msig {
                     #key_snippet
-                    <#ty as multiversx_sc::storage::mappers::StorageMapper<Self::Api>>::new(
+                    <#ty as multiversx_sc::storage::mappers::StorageMapperFromAddress<Self::Api>>::new_from_address(
+                        #address_pat.clone(),
                         ___key___
                     )
                 }
diff --git a/framework/scenario/tests/test_hash_set_mapper.rs b/framework/scenario/tests/test_hash_set_mapper.rs
index d52e50088a..44dcf395e2 100644
--- a/framework/scenario/tests/test_hash_set_mapper.rs
+++ b/framework/scenario/tests/test_hash_set_mapper.rs
@@ -1,6 +1,6 @@
 use multiversx_sc::{
     storage::{
-        mappers::{SetMapper, StorageClearable, StorageMapper},
+        mappers::{SetMapper, StorageClearable, StorageMapper, StorageMapperFromAddress},
         StorageKey,
     },
     types::ManagedAddress,

From 86acd253e01ca376ac7245e8dc790137ca917a5a Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Mon, 17 Jun 2024 11:47:55 +0300
Subject: [PATCH 0988/1254] storage mapper from address - replace in contracts

---
 contracts/examples/adder/src/adder.rs         |  6 --
 .../src/storage_mapper_get_at_address.rs      | 65 +++++++++----------
 .../src/storage_mapper_single.rs              | 16 ++---
 .../basic-features/src/storage_mapper_vec.rs  | 12 ++--
 .../src/storage_mapper_whitelist.rs           | 17 ++---
 5 files changed, 52 insertions(+), 64 deletions(-)

diff --git a/contracts/examples/adder/src/adder.rs b/contracts/examples/adder/src/adder.rs
index fcbb188b84..307f4112f5 100644
--- a/contracts/examples/adder/src/adder.rs
+++ b/contracts/examples/adder/src/adder.rs
@@ -12,12 +12,6 @@ pub trait Adder {
     #[storage_mapper("sum")]
     fn sum(&self) -> SingleValueMapper<BigUint>;
 
-    #[storage_mapper_from_address("sum")]
-    fn sum_with_address(
-        &self,
-        address: &ManagedAddress,
-    ) -> SingleValueMapper<BigUint, ManagedAddress>;
-
     #[init]
     fn init(&self, initial_value: BigUint) {
         self.sum().set(initial_value);
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 35ef02b905..10437e12b9 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,5 +1,3 @@
-use multiversx_sc::storage::StorageKey;
-
 multiversx_sc::imports!();
 multiversx_sc::derive_imports!();
 
@@ -17,89 +15,71 @@ pub trait StorageMapperGetAtAddress {
     #[endpoint]
     fn is_empty_at_address(&self) -> bool {
         let address = self.contract_address().get();
-        let mapper: SetMapper<u32, _> =
-            SetMapper::new_from_address(address, StorageKey::from("set_mapper"));
-        mapper.is_empty()
+        self.set_mapper_from_address(&address).is_empty()
     }
 
     #[endpoint]
     fn contains_at_address(&self, item: u32) -> bool {
         let address = self.contract_address().get();
-        let mapper: SetMapper<u32, _> =
-            SetMapper::new_from_address(address, StorageKey::from("set_mapper"));
-        mapper.contains(&item)
+        self.set_mapper_from_address(&address).contains(&item)
     }
 
     #[endpoint]
     fn len_at_address(&self) -> usize {
         let address = self.contract_address().get();
-        let mapper: SetMapper<u32, _> =
-            SetMapper::new_from_address(address, StorageKey::from("set_mapper"));
-        mapper.len()
+        self.set_mapper_from_address(&address).len()
     }
 
     #[endpoint]
     fn next_at_address(&self, item: u32) -> u32 {
         let address = self.contract_address().get();
-        let mapper: SetMapper<u32, _> =
-            SetMapper::new_from_address(address, StorageKey::from("set_mapper"));
-        mapper.next(&item).unwrap()
+        self.set_mapper_from_address(&address).next(&item).unwrap()
     }
 
     #[endpoint]
     fn previous_at_address(&self, item: u32) -> u32 {
         let address = self.contract_address().get();
-        let mapper: SetMapper<u32, _> =
-            SetMapper::new_from_address(address, StorageKey::from("set_mapper"));
-        mapper.previous(&item).unwrap()
+        self.set_mapper_from_address(&address)
+            .previous(&item)
+            .unwrap()
     }
 
     #[endpoint]
     fn front_at_address(&self) -> u32 {
         let address = self.contract_address().get();
-        let mapper: SetMapper<u32, _> =
-            SetMapper::new_from_address(address, StorageKey::from("set_mapper"));
-        mapper.front().unwrap()
+        self.set_mapper_from_address(&address).front().unwrap()
     }
 
     #[endpoint]
     fn back_at_address(&self) -> u32 {
         let address = self.contract_address().get();
-        let mapper: SetMapper<u32, _> =
-            SetMapper::new_from_address(address, StorageKey::from("set_mapper"));
-        mapper.back().unwrap()
+        self.set_mapper_from_address(&address).back().unwrap()
     }
 
     #[endpoint]
     fn keys_at_address(&self) -> ManagedVec<u32> {
         let address = self.contract_address().get();
-        let mapper: MapMapper<u32, u32, _> =
-            MapMapper::new_from_address(address, StorageKey::from("map_mapper"));
-        mapper.keys().collect()
+        self.map_mapper_from_address(&address).keys().collect()
     }
 
     #[endpoint]
     fn values_at_address(&self) -> ManagedVec<u32> {
         let address = self.contract_address().get();
-        let mapper: MapMapper<u32, u32, _> =
-            MapMapper::new_from_address(address, StorageKey::from("map_mapper"));
-        mapper.values().collect()
+        self.map_mapper_from_address(&address).values().collect()
     }
 
     #[endpoint]
     fn contains_unordered_at_address(&self, item: u32) -> bool {
         let address = self.contract_address().get();
-        let mapper: UnorderedSetMapper<u32, _> =
-            UnorderedSetMapper::new_from_address(address, StorageKey::from("unordered_set_mapper"));
-        mapper.contains(&item)
+        self.unordered_set_mapper_from_address(&address)
+            .contains(&item)
     }
 
     #[endpoint]
     fn get_by_index(&self, index: usize) -> u32 {
         let address = self.contract_address().get();
-        let mapper: UnorderedSetMapper<u32, _> =
-            UnorderedSetMapper::new_from_address(address, StorageKey::from("unordered_set_mapper"));
-        mapper.get_by_index(index)
+        self.unordered_set_mapper_from_address(&address)
+            .get_by_index(index)
     }
 
     /// Storage to be called. For testing, this contract is deployed twice,
@@ -107,12 +87,27 @@ pub trait StorageMapperGetAtAddress {
     #[storage_mapper("set_mapper")]
     fn set_mapper(&self) -> SetMapper<u32>;
 
+    #[storage_mapper_from_address("set_mapper")]
+    fn set_mapper_from_address(&self, address: &ManagedAddress) -> SetMapper<u32, ManagedAddress>;
+
     #[storage_mapper("map_mapper")]
     fn map_mapper(&self) -> MapMapper<u32, u32>;
 
+    #[storage_mapper_from_address("map_mapper")]
+    fn map_mapper_from_address(
+        &self,
+        address: &ManagedAddress,
+    ) -> MapMapper<u32, u32, ManagedAddress>;
+
     #[storage_mapper("unordered_set_mapper")]
     fn unordered_set_mapper(&self) -> UnorderedSetMapper<u32>;
 
+    #[storage_mapper_from_address("unordered_set_mapper")]
+    fn unordered_set_mapper_from_address(
+        &self,
+        address: &ManagedAddress,
+    ) -> UnorderedSetMapper<u32, ManagedAddress>;
+
     #[endpoint]
     fn fill_set_mapper(&self, value: u32) {
         for item in 1u32..=value {
diff --git a/contracts/feature-tests/basic-features/src/storage_mapper_single.rs b/contracts/feature-tests/basic-features/src/storage_mapper_single.rs
index f4604e3e73..0525798bc9 100644
--- a/contracts/feature-tests/basic-features/src/storage_mapper_single.rs
+++ b/contracts/feature-tests/basic-features/src/storage_mapper_single.rs
@@ -1,5 +1,3 @@
-use multiversx_sc::storage::StorageKey;
-
 multiversx_sc::imports!();
 
 /// Storage mapper test.
@@ -9,6 +7,12 @@ pub trait SingleValueMapperFeatures {
     #[storage_mapper("my_single_value_mapper")]
     fn map_my_single_value_mapper(&self) -> SingleValueMapper<BigInt>;
 
+    #[storage_mapper_from_address("my_single_value_mapper")]
+    fn map_my_single_value_mapper_from_address(
+        &self,
+        address: &ManagedAddress,
+    ) -> SingleValueMapper<BigUint, ManagedAddress>;
+
     #[endpoint]
     fn my_single_value_mapper_increment_1(&self, amount: BigInt) {
         let my_single_value_mapper = self.map_my_single_value_mapper();
@@ -55,12 +59,8 @@ pub trait SingleValueMapperFeatures {
 
     #[endpoint]
     fn is_empty_at_address_single_value_mapper(&self, address: ManagedAddress) -> bool {
-        let mapper: SingleValueMapper<Self::Api, BigInt, _> = SingleValueMapper::new_from_address(
-            address,
-            StorageKey::from("my_single_value_mapper"),
-        );
-
-        mapper.is_empty()
+        self.map_my_single_value_mapper_from_address(&address)
+            .is_empty()
     }
 
     #[endpoint]
diff --git a/contracts/feature-tests/basic-features/src/storage_mapper_vec.rs b/contracts/feature-tests/basic-features/src/storage_mapper_vec.rs
index e8854806cb..a05fc4fcd3 100644
--- a/contracts/feature-tests/basic-features/src/storage_mapper_vec.rs
+++ b/contracts/feature-tests/basic-features/src/storage_mapper_vec.rs
@@ -1,5 +1,3 @@
-use multiversx_sc::storage::StorageKey;
-
 multiversx_sc::imports!();
 
 /// Storage mapper test.
@@ -9,6 +7,9 @@ pub trait VecMapperFeatures {
     #[storage_mapper("vec_mapper")]
     fn vec_mapper(&self) -> VecMapper<u32>;
 
+    #[storage_mapper_from_address("vec_mapper")]
+    fn vec_mapper_from_address(&self, address: &ManagedAddress) -> VecMapper<u32, ManagedAddress>;
+
     #[endpoint]
     fn vec_mapper_push(&self, item: u32) {
         let mut vec_mapper = self.vec_mapper();
@@ -22,8 +23,7 @@ pub trait VecMapperFeatures {
 
     #[view]
     fn vec_mapper_get_at_address(&self, address: ManagedAddress, index: usize) -> u32 {
-        let mapper = VecMapper::new_from_address(address, StorageKey::from("vec_mapper"));
-        mapper.get(index)
+        self.vec_mapper_from_address(&address).get(index)
     }
 
     #[view]
@@ -33,8 +33,6 @@ pub trait VecMapperFeatures {
 
     #[view]
     fn vec_mapper_len_at_address(&self, address: ManagedAddress) -> usize {
-        let mapper: VecMapper<Self::Api, u32, _> =
-            VecMapper::new_from_address(address, StorageKey::from("vec_mapper"));
-        mapper.len()
+        self.vec_mapper_from_address(&address).len()
     }
 }
diff --git a/contracts/feature-tests/basic-features/src/storage_mapper_whitelist.rs b/contracts/feature-tests/basic-features/src/storage_mapper_whitelist.rs
index a02e706b91..bcdfb9573b 100644
--- a/contracts/feature-tests/basic-features/src/storage_mapper_whitelist.rs
+++ b/contracts/feature-tests/basic-features/src/storage_mapper_whitelist.rs
@@ -1,5 +1,3 @@
-use multiversx_sc::storage::StorageKey;
-
 multiversx_sc::imports!();
 
 #[multiversx_sc::module]
@@ -21,9 +19,7 @@ pub trait StorageMapperWhitelistFeatures {
 
     #[endpoint]
     fn check_contains_at_address(&self, address: ManagedAddress, item: ManagedBuffer) -> bool {
-        let mapper =
-            WhitelistMapper::new_from_address(address, StorageKey::from("whitelistMapper"));
-        mapper.contains(&item)
+        self.whitelist_mapper_from_address(&address).contains(&item)
     }
 
     #[endpoint]
@@ -33,11 +29,16 @@ pub trait StorageMapperWhitelistFeatures {
 
     #[endpoint]
     fn require_contains_at_address(&self, address: ManagedAddress, item: ManagedBuffer) {
-        let mapper =
-            WhitelistMapper::new_from_address(address, StorageKey::from("whitelistMapper"));
-        mapper.require_whitelisted(&item)
+        self.whitelist_mapper_from_address(&address)
+            .require_whitelisted(&item)
     }
 
     #[storage_mapper("whitelistMapper")]
     fn whitelist_mapper(&self) -> WhitelistMapper<ManagedBuffer>;
+
+    #[storage_mapper_from_address("whitelistMapper")]
+    fn whitelist_mapper_from_address(
+        &self,
+        address: &ManagedAddress,
+    ) -> WhitelistMapper<ManagedBuffer, ManagedAddress>;
 }

From 7f0c946fae2d2c125cb9f82f6252ed66dbec0dd4 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Mon, 17 Jun 2024 14:35:36 +0300
Subject: [PATCH 0989/1254] storage mapper from addr - untie
 StorageMapperFromAddress from StorageMapper

---
 .../src/storage_mapper_get_at_address.rs      | 28 +++++++++----------
 .../src/storage_mapper_single.rs              |  4 +--
 .../basic-features/src/storage_mapper_vec.rs  |  6 ++--
 .../src/storage_mapper_whitelist.rs           |  6 ++--
 .../storage/mappers/address_to_id_mapper.rs   | 13 ---------
 .../base/src/storage/mappers/bi_di_mapper.rs  | 22 ---------------
 .../src/storage/mappers/linked_list_mapper.rs | 15 ----------
 .../base/src/storage/mappers/map_mapper.rs    | 17 -----------
 .../src/storage/mappers/map_storage_mapper.rs | 16 -----------
 framework/base/src/storage/mappers/mapper.rs  |  4 ++-
 .../base/src/storage/mappers/queue_mapper.rs  | 14 ----------
 .../base/src/storage/mappers/set_mapper.rs    | 15 ----------
 .../storage/mappers/single_value_mapper.rs    | 16 -----------
 .../src/storage/mappers/unique_id_mapper.rs   | 13 ---------
 .../storage/mappers/unordered_set_mapper.rs   | 15 ----------
 .../base/src/storage/mappers/user_mapper.rs   | 13 ---------
 .../base/src/storage/mappers/vec_mapper.rs    | 19 -------------
 .../src/storage/mappers/whitelist_mapper.rs   | 14 ----------
 .../derive/src/generate/auto_impl_storage.rs  |  6 ++--
 19 files changed, 28 insertions(+), 228 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 10437e12b9..a3eff89cdb 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,31 +15,31 @@ pub trait StorageMapperGetAtAddress {
     #[endpoint]
     fn is_empty_at_address(&self) -> bool {
         let address = self.contract_address().get();
-        self.set_mapper_from_address(&address).is_empty()
+        self.set_mapper_from_address(address).is_empty()
     }
 
     #[endpoint]
     fn contains_at_address(&self, item: u32) -> bool {
         let address = self.contract_address().get();
-        self.set_mapper_from_address(&address).contains(&item)
+        self.set_mapper_from_address(address).contains(&item)
     }
 
     #[endpoint]
     fn len_at_address(&self) -> usize {
         let address = self.contract_address().get();
-        self.set_mapper_from_address(&address).len()
+        self.set_mapper_from_address(address).len()
     }
 
     #[endpoint]
     fn next_at_address(&self, item: u32) -> u32 {
         let address = self.contract_address().get();
-        self.set_mapper_from_address(&address).next(&item).unwrap()
+        self.set_mapper_from_address(address).next(&item).unwrap()
     }
 
     #[endpoint]
     fn previous_at_address(&self, item: u32) -> u32 {
         let address = self.contract_address().get();
-        self.set_mapper_from_address(&address)
+        self.set_mapper_from_address(address)
             .previous(&item)
             .unwrap()
     }
@@ -47,38 +47,38 @@ pub trait StorageMapperGetAtAddress {
     #[endpoint]
     fn front_at_address(&self) -> u32 {
         let address = self.contract_address().get();
-        self.set_mapper_from_address(&address).front().unwrap()
+        self.set_mapper_from_address(address).front().unwrap()
     }
 
     #[endpoint]
     fn back_at_address(&self) -> u32 {
         let address = self.contract_address().get();
-        self.set_mapper_from_address(&address).back().unwrap()
+        self.set_mapper_from_address(address).back().unwrap()
     }
 
     #[endpoint]
     fn keys_at_address(&self) -> ManagedVec<u32> {
         let address = self.contract_address().get();
-        self.map_mapper_from_address(&address).keys().collect()
+        self.map_mapper_from_address(address).keys().collect()
     }
 
     #[endpoint]
     fn values_at_address(&self) -> ManagedVec<u32> {
         let address = self.contract_address().get();
-        self.map_mapper_from_address(&address).values().collect()
+        self.map_mapper_from_address(address).values().collect()
     }
 
     #[endpoint]
     fn contains_unordered_at_address(&self, item: u32) -> bool {
         let address = self.contract_address().get();
-        self.unordered_set_mapper_from_address(&address)
+        self.unordered_set_mapper_from_address(address)
             .contains(&item)
     }
 
     #[endpoint]
     fn get_by_index(&self, index: usize) -> u32 {
         let address = self.contract_address().get();
-        self.unordered_set_mapper_from_address(&address)
+        self.unordered_set_mapper_from_address(address)
             .get_by_index(index)
     }
 
@@ -88,7 +88,7 @@ pub trait StorageMapperGetAtAddress {
     fn set_mapper(&self) -> SetMapper<u32>;
 
     #[storage_mapper_from_address("set_mapper")]
-    fn set_mapper_from_address(&self, address: &ManagedAddress) -> SetMapper<u32, ManagedAddress>;
+    fn set_mapper_from_address(&self, address: ManagedAddress) -> SetMapper<u32, ManagedAddress>;
 
     #[storage_mapper("map_mapper")]
     fn map_mapper(&self) -> MapMapper<u32, u32>;
@@ -96,7 +96,7 @@ pub trait StorageMapperGetAtAddress {
     #[storage_mapper_from_address("map_mapper")]
     fn map_mapper_from_address(
         &self,
-        address: &ManagedAddress,
+        address: ManagedAddress,
     ) -> MapMapper<u32, u32, ManagedAddress>;
 
     #[storage_mapper("unordered_set_mapper")]
@@ -105,7 +105,7 @@ pub trait StorageMapperGetAtAddress {
     #[storage_mapper_from_address("unordered_set_mapper")]
     fn unordered_set_mapper_from_address(
         &self,
-        address: &ManagedAddress,
+        address: ManagedAddress,
     ) -> UnorderedSetMapper<u32, ManagedAddress>;
 
     #[endpoint]
diff --git a/contracts/feature-tests/basic-features/src/storage_mapper_single.rs b/contracts/feature-tests/basic-features/src/storage_mapper_single.rs
index 0525798bc9..69ea1280c5 100644
--- a/contracts/feature-tests/basic-features/src/storage_mapper_single.rs
+++ b/contracts/feature-tests/basic-features/src/storage_mapper_single.rs
@@ -10,7 +10,7 @@ pub trait SingleValueMapperFeatures {
     #[storage_mapper_from_address("my_single_value_mapper")]
     fn map_my_single_value_mapper_from_address(
         &self,
-        address: &ManagedAddress,
+        address: ManagedAddress,
     ) -> SingleValueMapper<BigUint, ManagedAddress>;
 
     #[endpoint]
@@ -59,7 +59,7 @@ pub trait SingleValueMapperFeatures {
 
     #[endpoint]
     fn is_empty_at_address_single_value_mapper(&self, address: ManagedAddress) -> bool {
-        self.map_my_single_value_mapper_from_address(&address)
+        self.map_my_single_value_mapper_from_address(address)
             .is_empty()
     }
 
diff --git a/contracts/feature-tests/basic-features/src/storage_mapper_vec.rs b/contracts/feature-tests/basic-features/src/storage_mapper_vec.rs
index a05fc4fcd3..b6205789f8 100644
--- a/contracts/feature-tests/basic-features/src/storage_mapper_vec.rs
+++ b/contracts/feature-tests/basic-features/src/storage_mapper_vec.rs
@@ -8,7 +8,7 @@ pub trait VecMapperFeatures {
     fn vec_mapper(&self) -> VecMapper<u32>;
 
     #[storage_mapper_from_address("vec_mapper")]
-    fn vec_mapper_from_address(&self, address: &ManagedAddress) -> VecMapper<u32, ManagedAddress>;
+    fn vec_mapper_from_address(&self, address: ManagedAddress) -> VecMapper<u32, ManagedAddress>;
 
     #[endpoint]
     fn vec_mapper_push(&self, item: u32) {
@@ -23,7 +23,7 @@ pub trait VecMapperFeatures {
 
     #[view]
     fn vec_mapper_get_at_address(&self, address: ManagedAddress, index: usize) -> u32 {
-        self.vec_mapper_from_address(&address).get(index)
+        self.vec_mapper_from_address(address).get(index)
     }
 
     #[view]
@@ -33,6 +33,6 @@ pub trait VecMapperFeatures {
 
     #[view]
     fn vec_mapper_len_at_address(&self, address: ManagedAddress) -> usize {
-        self.vec_mapper_from_address(&address).len()
+        self.vec_mapper_from_address(address).len()
     }
 }
diff --git a/contracts/feature-tests/basic-features/src/storage_mapper_whitelist.rs b/contracts/feature-tests/basic-features/src/storage_mapper_whitelist.rs
index bcdfb9573b..ee9f255081 100644
--- a/contracts/feature-tests/basic-features/src/storage_mapper_whitelist.rs
+++ b/contracts/feature-tests/basic-features/src/storage_mapper_whitelist.rs
@@ -19,7 +19,7 @@ pub trait StorageMapperWhitelistFeatures {
 
     #[endpoint]
     fn check_contains_at_address(&self, address: ManagedAddress, item: ManagedBuffer) -> bool {
-        self.whitelist_mapper_from_address(&address).contains(&item)
+        self.whitelist_mapper_from_address(address).contains(&item)
     }
 
     #[endpoint]
@@ -29,7 +29,7 @@ pub trait StorageMapperWhitelistFeatures {
 
     #[endpoint]
     fn require_contains_at_address(&self, address: ManagedAddress, item: ManagedBuffer) {
-        self.whitelist_mapper_from_address(&address)
+        self.whitelist_mapper_from_address(address)
             .require_whitelisted(&item)
     }
 
@@ -39,6 +39,6 @@ pub trait StorageMapperWhitelistFeatures {
     #[storage_mapper_from_address("whitelistMapper")]
     fn whitelist_mapper_from_address(
         &self,
-        address: &ManagedAddress,
+        address: ManagedAddress,
     ) -> WhitelistMapper<ManagedBuffer, ManagedAddress>;
 }
diff --git a/framework/base/src/storage/mappers/address_to_id_mapper.rs b/framework/base/src/storage/mappers/address_to_id_mapper.rs
index 49e67f88b2..44c1237407 100644
--- a/framework/base/src/storage/mappers/address_to_id_mapper.rs
+++ b/framework/base/src/storage/mappers/address_to_id_mapper.rs
@@ -42,19 +42,6 @@ where
     }
 }
 
-impl<SA> StorageMapper<SA> for AddressToIdMapper<SA, ManagedAddress<SA>>
-where
-    SA: StorageMapperApi,
-{
-    fn new(base_key: StorageKey<SA>) -> Self {
-        AddressToIdMapper {
-            _phantom_api: PhantomData,
-            address: ManagedAddress::default(),
-            base_key,
-        }
-    }
-}
-
 impl<SA> StorageMapperFromAddress<SA> for AddressToIdMapper<SA, ManagedAddress<SA>>
 where
     SA: StorageMapperApi,
diff --git a/framework/base/src/storage/mappers/bi_di_mapper.rs b/framework/base/src/storage/mappers/bi_di_mapper.rs
index 8164a25048..ce0f24c159 100644
--- a/framework/base/src/storage/mappers/bi_di_mapper.rs
+++ b/framework/base/src/storage/mappers/bi_di_mapper.rs
@@ -66,28 +66,6 @@ where
     }
 }
 
-impl<SA, K, V> StorageMapper<SA> for BiDiMapper<SA, K, V, ManagedAddress<SA>>
-where
-    SA: StorageMapperApi,
-    K: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static + Default + PartialEq,
-    V: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static + Default + PartialEq,
-{
-    fn new(base_key: StorageKey<SA>) -> Self {
-        let mut id_key = base_key.clone();
-        id_key.append_bytes(ID_SUFIX);
-
-        let mut value_key = base_key.clone();
-        value_key.append_bytes(VALUE_SUFIX);
-        BiDiMapper {
-            _phantom_api: PhantomData,
-            address: ManagedAddress::default(),
-            id_set_mapper: UnorderedSetMapper::<SA, K, ManagedAddress<SA>>::new(id_key),
-            value_set_mapper: UnorderedSetMapper::<SA, V, ManagedAddress<SA>>::new(value_key),
-            base_key,
-        }
-    }
-}
-
 impl<SA, K, V> StorageMapperFromAddress<SA> for BiDiMapper<SA, K, V, ManagedAddress<SA>>
 where
     SA: StorageMapperApi,
diff --git a/framework/base/src/storage/mappers/linked_list_mapper.rs b/framework/base/src/storage/mappers/linked_list_mapper.rs
index 8bde2bbcde..a259467c29 100644
--- a/framework/base/src/storage/mappers/linked_list_mapper.rs
+++ b/framework/base/src/storage/mappers/linked_list_mapper.rs
@@ -118,21 +118,6 @@ where
     }
 }
 
-impl<SA, T> StorageMapper<SA> for LinkedListMapper<SA, T, ManagedAddress<SA>>
-where
-    SA: StorageMapperApi,
-    T: TopEncode + TopDecode + NestedEncode + NestedDecode + Clone,
-{
-    fn new(base_key: StorageKey<SA>) -> Self {
-        LinkedListMapper {
-            _phantom_api: PhantomData,
-            address: ManagedAddress::default(),
-            base_key,
-            _phantom_item: PhantomData,
-        }
-    }
-}
-
 impl<SA, T> StorageMapperFromAddress<SA> for LinkedListMapper<SA, T, ManagedAddress<SA>>
 where
     SA: StorageMapperApi,
diff --git a/framework/base/src/storage/mappers/map_mapper.rs b/framework/base/src/storage/mappers/map_mapper.rs
index a15919909a..0da042334a 100644
--- a/framework/base/src/storage/mappers/map_mapper.rs
+++ b/framework/base/src/storage/mappers/map_mapper.rs
@@ -49,23 +49,6 @@ where
     }
 }
 
-impl<SA, K, V> StorageMapper<SA> for MapMapper<SA, K, V, ManagedAddress<SA>>
-where
-    SA: StorageMapperApi,
-    K: TopEncode + TopDecode + NestedEncode + NestedDecode,
-    V: TopEncode + TopDecode,
-{
-    fn new(base_key: StorageKey<SA>) -> Self {
-        MapMapper {
-            _phantom_api: PhantomData,
-            address: ManagedAddress::default(),
-            base_key: base_key.clone(),
-            keys_set: SetMapper::new(base_key),
-            _phantom_value: PhantomData,
-        }
-    }
-}
-
 impl<SA, K, V> StorageClearable for MapMapper<SA, K, V, CurrentStorage>
 where
     SA: StorageMapperApi,
diff --git a/framework/base/src/storage/mappers/map_storage_mapper.rs b/framework/base/src/storage/mappers/map_storage_mapper.rs
index 23a40eeaa0..699a3bab36 100644
--- a/framework/base/src/storage/mappers/map_storage_mapper.rs
+++ b/framework/base/src/storage/mappers/map_storage_mapper.rs
@@ -44,22 +44,6 @@ where
     }
 }
 
-impl<SA, K, V> StorageMapper<SA> for MapStorageMapper<SA, K, V, ManagedAddress<SA>>
-where
-    SA: StorageMapperApi,
-    K: TopEncode + TopDecode + NestedEncode + NestedDecode,
-    V: StorageMapper<SA> + StorageClearable,
-{
-    fn new(base_key: StorageKey<SA>) -> Self {
-        Self {
-            _phantom_api: PhantomData,
-            base_key: base_key.clone(),
-            keys_set: SetMapper::new(base_key),
-            _phantom_value: PhantomData,
-        }
-    }
-}
-
 impl<SA, K, V> StorageClearable for MapStorageMapper<SA, K, V, CurrentStorage>
 where
     SA: StorageMapperApi,
diff --git a/framework/base/src/storage/mappers/mapper.rs b/framework/base/src/storage/mappers/mapper.rs
index 89aadb916b..89f9c80cd2 100644
--- a/framework/base/src/storage/mappers/mapper.rs
+++ b/framework/base/src/storage/mappers/mapper.rs
@@ -8,10 +8,12 @@ where
     fn new(base_key: StorageKey<SA>) -> Self;
 }
 
-pub trait StorageMapperFromAddress<SA>: StorageMapper<SA>
+pub trait StorageMapperFromAddress<SA>: 'static
 where
     SA: StorageMapperApi,
 {
+    /// Will be called automatically by the `#[storage_mapper_from_address]`
+    /// annotation generated code.
     fn new_from_address(address: ManagedAddress<SA>, base_key: StorageKey<SA>) -> Self;
 }
 
diff --git a/framework/base/src/storage/mappers/queue_mapper.rs b/framework/base/src/storage/mappers/queue_mapper.rs
index 2a4d89e501..9937736b01 100644
--- a/framework/base/src/storage/mappers/queue_mapper.rs
+++ b/framework/base/src/storage/mappers/queue_mapper.rs
@@ -91,20 +91,6 @@ where
         }
     }
 }
-impl<SA, T> StorageMapper<SA> for QueueMapper<SA, T, ManagedAddress<SA>>
-where
-    SA: StorageMapperApi,
-    T: TopEncode + TopDecode,
-{
-    fn new(base_key: StorageKey<SA>) -> Self {
-        QueueMapper {
-            _phantom_api: PhantomData,
-            address: ManagedAddress::default(),
-            base_key,
-            _phantom_item: PhantomData,
-        }
-    }
-}
 
 impl<SA, T> StorageClearable for QueueMapper<SA, T, CurrentStorage>
 where
diff --git a/framework/base/src/storage/mappers/set_mapper.rs b/framework/base/src/storage/mappers/set_mapper.rs
index 07c5911e6e..fbbb41ba3b 100644
--- a/framework/base/src/storage/mappers/set_mapper.rs
+++ b/framework/base/src/storage/mappers/set_mapper.rs
@@ -82,21 +82,6 @@ where
     }
 }
 
-impl<SA, T> StorageMapper<SA> for SetMapper<SA, T, ManagedAddress<SA>>
-where
-    SA: StorageMapperApi,
-    T: TopEncode + TopDecode + NestedEncode + NestedDecode,
-{
-    fn new(base_key: StorageKey<SA>) -> Self {
-        SetMapper {
-            _phantom_api: PhantomData,
-            address: ManagedAddress::default(),
-            base_key: base_key.clone(),
-            queue_mapper: QueueMapper::new(base_key),
-        }
-    }
-}
-
 impl<SA, T> StorageClearable for SetMapper<SA, T, CurrentStorage>
 where
     SA: StorageMapperApi,
diff --git a/framework/base/src/storage/mappers/single_value_mapper.rs b/framework/base/src/storage/mappers/single_value_mapper.rs
index 71a5131d6d..fa9448af69 100644
--- a/framework/base/src/storage/mappers/single_value_mapper.rs
+++ b/framework/base/src/storage/mappers/single_value_mapper.rs
@@ -44,22 +44,6 @@ where
     }
 }
 
-impl<SA, T> StorageMapper<SA> for SingleValueMapper<SA, T, ManagedAddress<SA>>
-where
-    SA: StorageMapperApi,
-    T: TopEncode + TopDecode,
-{
-    #[inline]
-    fn new(base_key: StorageKey<SA>) -> Self {
-        SingleValueMapper {
-            address: ManagedAddress::default(),
-            key: base_key,
-            _phantom_api: PhantomData,
-            _phantom_item: PhantomData,
-        }
-    }
-}
-
 impl<SA, T> StorageMapperFromAddress<SA> for SingleValueMapper<SA, T, ManagedAddress<SA>>
 where
     SA: StorageMapperApi,
diff --git a/framework/base/src/storage/mappers/unique_id_mapper.rs b/framework/base/src/storage/mappers/unique_id_mapper.rs
index 7395c6deed..a1789d695a 100644
--- a/framework/base/src/storage/mappers/unique_id_mapper.rs
+++ b/framework/base/src/storage/mappers/unique_id_mapper.rs
@@ -47,19 +47,6 @@ where
     }
 }
 
-impl<SA> StorageMapper<SA> for UniqueIdMapper<SA, ManagedAddress<SA>>
-where
-    SA: StorageMapperApi,
-{
-    fn new(base_key: StorageKey<SA>) -> Self {
-        Self {
-            _address: ManagedAddress::default(),
-            base_key: base_key.clone(),
-            vec_mapper: VecMapper::new(base_key),
-        }
-    }
-}
-
 impl<SA> StorageMapperFromAddress<SA> for UniqueIdMapper<SA, ManagedAddress<SA>>
 where
     SA: StorageMapperApi,
diff --git a/framework/base/src/storage/mappers/unordered_set_mapper.rs b/framework/base/src/storage/mappers/unordered_set_mapper.rs
index 087d7832d5..7b59a31897 100644
--- a/framework/base/src/storage/mappers/unordered_set_mapper.rs
+++ b/framework/base/src/storage/mappers/unordered_set_mapper.rs
@@ -47,21 +47,6 @@ where
     }
 }
 
-impl<SA, T> StorageMapper<SA> for UnorderedSetMapper<SA, T, ManagedAddress<SA>>
-where
-    SA: StorageMapperApi,
-    T: TopEncode + TopDecode + NestedEncode + NestedDecode,
-{
-    fn new(base_key: StorageKey<SA>) -> Self {
-        UnorderedSetMapper {
-            _phantom_api: PhantomData,
-            address: ManagedAddress::default(),
-            base_key: base_key.clone(),
-            vec_mapper: VecMapper::<SA, T, ManagedAddress<SA>>::new(base_key),
-        }
-    }
-}
-
 impl<SA, T> StorageMapperFromAddress<SA> for UnorderedSetMapper<SA, T, ManagedAddress<SA>>
 where
     SA: StorageMapperApi,
diff --git a/framework/base/src/storage/mappers/user_mapper.rs b/framework/base/src/storage/mappers/user_mapper.rs
index 1260b81457..8ed0db5fec 100644
--- a/framework/base/src/storage/mappers/user_mapper.rs
+++ b/framework/base/src/storage/mappers/user_mapper.rs
@@ -54,19 +54,6 @@ where
     }
 }
 
-impl<SA> StorageMapper<SA> for UserMapper<SA, ManagedAddress<SA>>
-where
-    SA: StorageMapperApi,
-{
-    fn new(base_key: StorageKey<SA>) -> Self {
-        UserMapper {
-            _phantom_api: PhantomData,
-            address: ManagedAddress::default(),
-            base_key,
-        }
-    }
-}
-
 impl<SA> StorageMapperFromAddress<SA> for UserMapper<SA, ManagedAddress<SA>>
 where
     SA: StorageMapperApi,
diff --git a/framework/base/src/storage/mappers/vec_mapper.rs b/framework/base/src/storage/mappers/vec_mapper.rs
index 32b515344c..65b4818a98 100644
--- a/framework/base/src/storage/mappers/vec_mapper.rs
+++ b/framework/base/src/storage/mappers/vec_mapper.rs
@@ -56,25 +56,6 @@ where
     }
 }
 
-impl<SA, T> StorageMapper<SA> for VecMapper<SA, T, ManagedAddress<SA>>
-where
-    SA: StorageMapperApi,
-    T: TopEncode + TopDecode,
-{
-    fn new(base_key: StorageKey<SA>) -> Self {
-        let mut len_key = base_key.clone();
-        len_key.append_bytes(LEN_SUFFIX);
-
-        VecMapper {
-            _phantom_api: PhantomData,
-            address: ManagedAddress::default(),
-            base_key,
-            len_key,
-            _phantom_item: PhantomData,
-        }
-    }
-}
-
 impl<SA, T> StorageMapperFromAddress<SA> for VecMapper<SA, T, ManagedAddress<SA>>
 where
     SA: StorageMapperApi,
diff --git a/framework/base/src/storage/mappers/whitelist_mapper.rs b/framework/base/src/storage/mappers/whitelist_mapper.rs
index 6adf686ea7..62111d2020 100644
--- a/framework/base/src/storage/mappers/whitelist_mapper.rs
+++ b/framework/base/src/storage/mappers/whitelist_mapper.rs
@@ -45,20 +45,6 @@ where
     }
 }
 
-impl<SA, T> StorageMapper<SA> for WhitelistMapper<SA, T, ManagedAddress<SA>>
-where
-    SA: StorageMapperApi,
-    T: NestedEncode + 'static,
-{
-    fn new(base_key: StorageKey<SA>) -> Self {
-        Self {
-            address: ManagedAddress::default(),
-            base_key,
-            _phantom: PhantomData,
-        }
-    }
-}
-
 impl<SA, T> StorageMapperFromAddress<SA> for WhitelistMapper<SA, T, ManagedAddress<SA>>
 where
     SA: StorageMapperApi,
diff --git a/framework/derive/src/generate/auto_impl_storage.rs b/framework/derive/src/generate/auto_impl_storage.rs
index d47ffc42d7..bb0c83d699 100644
--- a/framework/derive/src/generate/auto_impl_storage.rs
+++ b/framework/derive/src/generate/auto_impl_storage.rs
@@ -88,9 +88,9 @@ pub fn generate_mapper_from_address_impl(m: &Method, identifier: &str) -> proc_m
         !m.method_args.is_empty(),
         "mapper from address must have at least one argument, for the value"
     );
-    let key_snippet = generate_key_snippet(&m.method_args[1..], identifier);
     let address_arg = &m.method_args[0];
-    let address_pat = &address_arg.pat;
+    let address_pat = address_arg.pat.to_owned();
+    let key_snippet = generate_key_snippet(&m.method_args[1..], identifier);
     match m.return_type.clone() {
         syn::ReturnType::Default => panic!("getter from address should return some value"),
         syn::ReturnType::Type(_, ty) => {
@@ -98,7 +98,7 @@ pub fn generate_mapper_from_address_impl(m: &Method, identifier: &str) -> proc_m
                 #msig {
                     #key_snippet
                     <#ty as multiversx_sc::storage::mappers::StorageMapperFromAddress<Self::Api>>::new_from_address(
-                        #address_pat.clone(),
+                        #address_pat,
                         ___key___
                     )
                 }

From 449ef21ac6e73078fa710d1d879e5b9b22f4f089 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Mon, 17 Jun 2024 20:38:37 +0300
Subject: [PATCH 0990/1254] test fix

---
 contracts/feature-tests/abi-tester/src/abi_test_type.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/contracts/feature-tests/abi-tester/src/abi_test_type.rs b/contracts/feature-tests/abi-tester/src/abi_test_type.rs
index 2928e81c89..c70f1aec42 100644
--- a/contracts/feature-tests/abi-tester/src/abi_test_type.rs
+++ b/contracts/feature-tests/abi-tester/src/abi_test_type.rs
@@ -45,5 +45,6 @@ pub struct OnlyShowsUpInEsdtAttr {
 
 #[derive(TypeAbi)]
 pub struct ManagedDecimalWrapper<M: ManagedTypeApi> {
+    #[allow(dead_code)]
     pub field: ManagedDecimal<M, ConstDecimals<2>>,
 }

From 33870173709bbb92a2ba0c4bde0feac8dc946ffb Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Mon, 17 Jun 2024 20:46:53 +0300
Subject: [PATCH 0991/1254] copied plotters-wasm-demo to repo

---
 Cargo.lock                          | 959 +++++++++++++++++++++++++---
 Cargo.toml                          |   1 +
 tools/plotter/.gitignore            |   3 +
 tools/plotter/Cargo.toml            |  18 +
 tools/plotter/README.md             |  54 ++
 tools/plotter/src/func_plot.rs      |  31 +
 tools/plotter/src/lib.rs            |  58 ++
 tools/plotter/src/mandelbrot.rs     |  67 ++
 tools/plotter/src/plot3d.rs         |  42 ++
 tools/plotter/start-server.bat      |   8 +
 tools/plotter/start-server.sh       |  23 +
 tools/plotter/www/.gitignore        |   3 +
 tools/plotter/www/bootstrap.js      |  21 +
 tools/plotter/www/index.html        |  42 ++
 tools/plotter/www/index.js          | 103 +++
 tools/plotter/www/package.json      |  36 ++
 tools/plotter/www/style.css         |  55 ++
 tools/plotter/www/webpack.config.js |  14 +
 18 files changed, 1458 insertions(+), 80 deletions(-)
 create mode 100644 tools/plotter/.gitignore
 create mode 100644 tools/plotter/Cargo.toml
 create mode 100644 tools/plotter/README.md
 create mode 100644 tools/plotter/src/func_plot.rs
 create mode 100644 tools/plotter/src/lib.rs
 create mode 100644 tools/plotter/src/mandelbrot.rs
 create mode 100644 tools/plotter/src/plot3d.rs
 create mode 100644 tools/plotter/start-server.bat
 create mode 100755 tools/plotter/start-server.sh
 create mode 100644 tools/plotter/www/.gitignore
 create mode 100644 tools/plotter/www/bootstrap.js
 create mode 100644 tools/plotter/www/index.html
 create mode 100644 tools/plotter/www/index.js
 create mode 100644 tools/plotter/www/package.json
 create mode 100644 tools/plotter/www/style.css
 create mode 100644 tools/plotter/www/webpack.config.js

diff --git a/Cargo.lock b/Cargo.lock
index ec245b66b9..8cd3edc71d 100755
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -66,7 +66,7 @@ version = "0.8.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
 dependencies = [
- "cfg-if",
+ "cfg-if 1.0.0",
  "once_cell",
  "version_check",
  "zerocopy",
@@ -98,6 +98,21 @@ dependencies = [
  "multiversx-sc-meta-lib",
 ]
 
+[[package]]
+name = "android-tzdata"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
+
+[[package]]
+name = "android_system_properties"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "anstream"
 version = "0.6.14"
@@ -130,9 +145,9 @@ dependencies = [
 
 [[package]]
 name = "anstyle-query"
-version = "1.0.3"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a64c907d4e79225ac72e2a354c9ce84d50ebb4586dee56c82b3ee73004f537f5"
+checksum = "ad186efb764318d35165f1758e7dcef3b10628e26d41a44bc5550652e6804391"
 dependencies = [
  "windows-sys 0.52.0",
 ]
@@ -182,13 +197,13 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "backtrace"
-version = "0.3.72"
+version = "0.3.73"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17c6a35df3749d2e8bb1b7b21a976d82b15548788d2735b9d82f329268f71a11"
+checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a"
 dependencies = [
  "addr2line",
  "cc",
- "cfg-if",
+ "cfg-if 1.0.0",
  "libc",
  "miniz_oxide",
  "object",
@@ -370,6 +385,12 @@ version = "3.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
 
+[[package]]
+name = "bytemuck"
+version = "1.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78834c15cb5d5efe3452d58b1e8ba890dd62d21907f867f383358198e56ebca5"
+
 [[package]]
 name = "byteorder"
 version = "1.5.0"
@@ -384,9 +405,15 @@ checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9"
 
 [[package]]
 name = "cc"
-version = "1.0.98"
+version = "1.0.99"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96c51067fd44124faa7f870b4b1c969379ad32b2ba805aa959430ceaa384f695"
+
+[[package]]
+name = "cfg-if"
+version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f"
+checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
 
 [[package]]
 name = "cfg-if"
@@ -429,11 +456,25 @@ dependencies = [
  "multiversx-sc-meta-lib",
 ]
 
+[[package]]
+name = "chrono"
+version = "0.4.38"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401"
+dependencies = [
+ "android-tzdata",
+ "iana-time-zone",
+ "js-sys",
+ "num-traits",
+ "wasm-bindgen",
+ "windows-targets 0.52.5",
+]
+
 [[package]]
 name = "clap"
-version = "4.5.4"
+version = "4.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0"
+checksum = "5db83dced34638ad474f39f250d7fea9598bdd239eaced1bdf45d597da0f433f"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -441,9 +482,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.2"
+version = "4.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4"
+checksum = "f7e204572485eb3fbf28f871612191521df159bc3e15a9f5064c66dba3a8c05f"
 dependencies = [
  "anstream",
  "anstyle",
@@ -453,9 +494,9 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.5.4"
+version = "4.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64"
+checksum = "c780290ccf4fb26629baa7a1081e68ced113f1d3ec302fa5948f1c381ebf06c6"
 dependencies = [
  "heck",
  "proc-macro2",
@@ -465,9 +506,15 @@ dependencies = [
 
 [[package]]
 name = "clap_lex"
-version = "0.7.0"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4b82cf0babdbd58558212896d1a4272303a57bdb245c2bf1147185fb45640e70"
+
+[[package]]
+name = "color_quant"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce"
+checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
 
 [[package]]
 name = "colorchoice"
@@ -543,6 +590,42 @@ version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
 
+[[package]]
+name = "core-graphics"
+version = "0.23.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081"
+dependencies = [
+ "bitflags 1.3.2",
+ "core-foundation",
+ "core-graphics-types",
+ "foreign-types 0.5.0",
+ "libc",
+]
+
+[[package]]
+name = "core-graphics-types"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf"
+dependencies = [
+ "bitflags 1.3.2",
+ "core-foundation",
+ "libc",
+]
+
+[[package]]
+name = "core-text"
+version = "20.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c9d2790b5c08465d49f8dc05c8bcae9fea467855947db39b0f8145c091aaced5"
+dependencies = [
+ "core-foundation",
+ "core-graphics",
+ "foreign-types 0.5.0",
+ "libc",
+]
+
 [[package]]
 name = "cpufeatures"
 version = "0.2.12"
@@ -558,7 +641,7 @@ version = "1.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
 dependencies = [
- "cfg-if",
+ "cfg-if 1.0.0",
 ]
 
 [[package]]
@@ -664,6 +747,16 @@ dependencies = [
  "multiversx-sc-meta-lib",
 ]
 
+[[package]]
+name = "cstr"
+version = "0.2.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68523903c8ae5aacfa32a0d9ae60cadeb764e1da14ee0d26b1f3089f13a54636"
+dependencies = [
+ "proc-macro2",
+ "quote",
+]
+
 [[package]]
 name = "curve25519-dalek"
 version = "3.2.0"
@@ -724,6 +817,27 @@ dependencies = [
  "multiversx-sc-meta-lib",
 ]
 
+[[package]]
+name = "dirs-next"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1"
+dependencies = [
+ "cfg-if 1.0.0",
+ "dirs-sys-next",
+]
+
+[[package]]
+name = "dirs-sys-next"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d"
+dependencies = [
+ "libc",
+ "redox_users",
+ "winapi",
+]
+
 [[package]]
 name = "displaydoc"
 version = "0.2.4"
@@ -735,6 +849,27 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "dlib"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412"
+dependencies = [
+ "libloading",
+]
+
+[[package]]
+name = "dwrote"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "439a1c2ba5611ad3ed731280541d36d2e9c4ac5e7fb818a27b604bdc5a6aa65b"
+dependencies = [
+ "lazy_static",
+ "libc",
+ "winapi",
+ "wio",
+]
+
 [[package]]
 name = "ed25519"
 version = "1.5.3"
@@ -787,7 +922,7 @@ version = "0.8.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59"
 dependencies = [
- "cfg-if",
+ "cfg-if 1.0.0",
 ]
 
 [[package]]
@@ -1005,6 +1140,15 @@ version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a"
 
+[[package]]
+name = "fdeflate"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645"
+dependencies = [
+ "simd-adler32",
+]
+
 [[package]]
 name = "first-contract"
 version = "0.0.0"
@@ -1032,19 +1176,71 @@ dependencies = [
  "miniz_oxide",
 ]
 
+[[package]]
+name = "float-ord"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ce81f49ae8a0482e4c55ea62ebbd7e5a686af544c00b9d090bba3ff9be97b3d"
+
 [[package]]
 name = "fnv"
 version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
+[[package]]
+name = "font-kit"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2845a73bbd781e691ab7c2a028c579727cd254942e8ced57ff73e0eafd60de87"
+dependencies = [
+ "bitflags 2.5.0",
+ "byteorder",
+ "core-foundation",
+ "core-graphics",
+ "core-text",
+ "dirs-next",
+ "dwrote",
+ "float-ord",
+ "freetype-sys",
+ "lazy_static",
+ "libc",
+ "log",
+ "pathfinder_geometry",
+ "pathfinder_simd",
+ "walkdir",
+ "winapi",
+ "yeslogic-fontconfig-sys",
+]
+
 [[package]]
 name = "foreign-types"
 version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
 dependencies = [
- "foreign-types-shared",
+ "foreign-types-shared 0.1.1",
+]
+
+[[package]]
+name = "foreign-types"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965"
+dependencies = [
+ "foreign-types-macros",
+ "foreign-types-shared 0.3.1",
+]
+
+[[package]]
+name = "foreign-types-macros"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
 ]
 
 [[package]]
@@ -1053,6 +1249,12 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
 
+[[package]]
+name = "foreign-types-shared"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b"
+
 [[package]]
 name = "form_urlencoded"
 version = "1.2.1"
@@ -1161,6 +1363,17 @@ dependencies = [
  "multiversx-sc-meta-lib",
 ]
 
+[[package]]
+name = "freetype-sys"
+version = "0.20.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0e7edc5b9669349acfda99533e9e0bcf26a51862ab43b08ee7745c55d28eb134"
+dependencies = [
+ "cc",
+ "libc",
+ "pkg-config",
+]
+
 [[package]]
 name = "futures"
 version = "0.3.30"
@@ -1266,7 +1479,7 @@ version = "0.1.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
 dependencies = [
- "cfg-if",
+ "cfg-if 1.0.0",
  "libc",
  "wasi 0.9.0+wasi-snapshot-preview1",
 ]
@@ -1277,13 +1490,23 @@ version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
 dependencies = [
- "cfg-if",
+ "cfg-if 1.0.0",
  "js-sys",
  "libc",
  "wasi 0.11.0+wasi-snapshot-preview1",
  "wasm-bindgen",
 ]
 
+[[package]]
+name = "gif"
+version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045"
+dependencies = [
+ "color_quant",
+ "weezl",
+]
+
 [[package]]
 name = "gimli"
 version = "0.29.0"
@@ -1388,12 +1611,12 @@ dependencies = [
 
 [[package]]
 name = "http-body-util"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d"
+checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f"
 dependencies = [
  "bytes",
- "futures-core",
+ "futures-util",
  "http",
  "http-body",
  "pin-project-lite",
@@ -1401,9 +1624,9 @@ dependencies = [
 
 [[package]]
 name = "httparse"
-version = "1.8.0"
+version = "1.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904"
+checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9"
 
 [[package]]
 name = "humantime"
@@ -1431,6 +1654,23 @@ dependencies = [
  "want",
 ]
 
+[[package]]
+name = "hyper-rustls"
+version = "0.27.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155"
+dependencies = [
+ "futures-util",
+ "http",
+ "hyper",
+ "hyper-util",
+ "rustls",
+ "rustls-pki-types",
+ "tokio",
+ "tokio-rustls",
+ "tower-service",
+]
+
 [[package]]
 name = "hyper-tls"
 version = "0.6.0"
@@ -1467,14 +1707,157 @@ dependencies = [
  "tracing",
 ]
 
+[[package]]
+name = "iana-time-zone"
+version = "0.1.60"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141"
+dependencies = [
+ "android_system_properties",
+ "core-foundation-sys",
+ "iana-time-zone-haiku",
+ "js-sys",
+ "wasm-bindgen",
+ "windows-core",
+]
+
+[[package]]
+name = "iana-time-zone-haiku"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
+dependencies = [
+ "cc",
+]
+
+[[package]]
+name = "icu_collections"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526"
+dependencies = [
+ "displaydoc",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637"
+dependencies = [
+ "displaydoc",
+ "litemap",
+ "tinystr",
+ "writeable",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid_transform"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_locid_transform_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid_transform_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e"
+
+[[package]]
+name = "icu_normalizer"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_normalizer_data",
+ "icu_properties",
+ "icu_provider",
+ "smallvec",
+ "utf16_iter",
+ "utf8_iter",
+ "write16",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_normalizer_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516"
+
+[[package]]
+name = "icu_properties"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f8ac670d7422d7f76b32e17a5db556510825b29ec9154f235977c9caba61036"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_locid_transform",
+ "icu_properties_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_properties_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569"
+
+[[package]]
+name = "icu_provider"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_provider_macros",
+ "stable_deref_trait",
+ "tinystr",
+ "writeable",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_provider_macros"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "idna"
-version = "0.5.0"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
+checksum = "4716a3a0933a1d01c2f72450e89596eb51dd34ef3c211ccd875acdf1f8fe47ed"
 dependencies = [
- "unicode-bidi",
- "unicode-normalization",
+ "icu_normalizer",
+ "icu_properties",
+ "smallvec",
+ "utf8_iter",
 ]
 
 [[package]]
@@ -1493,6 +1876,20 @@ dependencies = [
  "winapi-util",
 ]
 
+[[package]]
+name = "image"
+version = "0.24.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d"
+dependencies = [
+ "bytemuck",
+ "byteorder",
+ "color_quant",
+ "jpeg-decoder",
+ "num-traits",
+ "png",
+]
+
 [[package]]
 name = "indexmap"
 version = "2.2.6"
@@ -1542,6 +1939,12 @@ version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
 
+[[package]]
+name = "jpeg-decoder"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0"
+
 [[package]]
 name = "js-sys"
 version = "0.3.69"
@@ -1646,10 +2049,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
-name = "libc"
-version = "0.2.155"
+name = "libc"
+version = "0.2.155"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
+
+[[package]]
+name = "libloading"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19"
+dependencies = [
+ "cfg-if 1.0.0",
+ "windows-targets 0.52.5",
+]
+
+[[package]]
+name = "libredox"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
+checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
+dependencies = [
+ "bitflags 2.5.0",
+ "libc",
+]
 
 [[package]]
 name = "linked-list-repeat"
@@ -1674,6 +2097,12 @@ version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
 
+[[package]]
+name = "litemap"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704"
+
 [[package]]
 name = "local-esdt-and-nft"
 version = "0.0.0"
@@ -1781,9 +2210,15 @@ dependencies = [
 
 [[package]]
 name = "memchr"
-version = "2.7.2"
+version = "2.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
+
+[[package]]
+name = "memory_units"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d"
+checksum = "8452105ba047068f40ff7093dd1d9da90898e63dd61736462e9cdda6a90ad3c3"
 
 [[package]]
 name = "mime"
@@ -1798,6 +2233,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae"
 dependencies = [
  "adler",
+ "simd-adler32",
 ]
 
 [[package]]
@@ -2234,9 +2670,9 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.35.0"
+version = "0.36.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8ec7ab813848ba4522158d5517a6093db1ded27575b070f4177b8d12b41db5e"
+checksum = "576dfe1fc8f9df304abb159d767a29d0476f7750fbf8aa7ad07816004a207434"
 dependencies = [
  "memchr",
 ]
@@ -2260,8 +2696,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f"
 dependencies = [
  "bitflags 2.5.0",
- "cfg-if",
- "foreign-types",
+ "cfg-if 1.0.0",
+ "foreign-types 0.3.2",
  "libc",
  "once_cell",
  "openssl-macros",
@@ -2370,7 +2806,7 @@ version = "0.9.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
 dependencies = [
- "cfg-if",
+ "cfg-if 1.0.0",
  "libc",
  "redox_syscall",
  "smallvec",
@@ -2383,6 +2819,25 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd"
 
+[[package]]
+name = "pathfinder_geometry"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b7b7e7b4ea703700ce73ebf128e1450eb69c3a8329199ffbfb9b2a0418e5ad3"
+dependencies = [
+ "log",
+ "pathfinder_simd",
+]
+
+[[package]]
+name = "pathfinder_simd"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ebf45976c56919841273f2a0fc684c28437e2f304e264557d9c72be5d5a718be"
+dependencies = [
+ "rustc_version",
+]
+
 [[package]]
 name = "payable-features"
 version = "0.0.0"
@@ -2482,6 +2937,77 @@ version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
 
+[[package]]
+name = "plotters"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a15b6eccb8484002195a3e44fe65a4ce8e93a625797a063735536fd59cb01cf3"
+dependencies = [
+ "chrono",
+ "font-kit",
+ "image",
+ "lazy_static",
+ "num-traits",
+ "pathfinder_geometry",
+ "plotters-backend",
+ "plotters-bitmap",
+ "plotters-svg",
+ "ttf-parser",
+ "wasm-bindgen",
+ "web-sys",
+]
+
+[[package]]
+name = "plotters-backend"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "414cec62c6634ae900ea1c56128dfe87cf63e7caece0852ec76aba307cebadb7"
+
+[[package]]
+name = "plotters-bitmap"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7e7f6fb8302456d7c264a94dada86f76d76e1a03e2294ee86ca7da92983b0a6"
+dependencies = [
+ "gif",
+ "image",
+ "plotters-backend",
+]
+
+[[package]]
+name = "plotters-canvas"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "498a82bf654581fa4df6c1bd73e56f8556bdeec5eca5a0989d170ca0728ccace"
+dependencies = [
+ "js-sys",
+ "plotters-backend",
+ "wasm-bindgen",
+ "web-sys",
+]
+
+[[package]]
+name = "plotters-svg"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "81b30686a7d9c3e010b84284bdd26a29f2138574f52f5eb6f794fc0ad924e705"
+dependencies = [
+ "plotters-backend",
+]
+
+[[package]]
+name = "png"
+version = "0.17.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1"
+dependencies = [
+ "bitflags 1.3.2",
+ "crc32fast",
+ "fdeflate",
+ "flate2",
+ "miniz_oxide",
+]
+
 [[package]]
 name = "ppv-lite86"
 version = "0.2.17"
@@ -2704,18 +3230,29 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.5.1"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e"
+checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd"
 dependencies = [
  "bitflags 2.5.0",
 ]
 
+[[package]]
+name = "redox_users"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891"
+dependencies = [
+ "getrandom 0.2.15",
+ "libredox",
+ "thiserror",
+]
+
 [[package]]
 name = "regex"
-version = "1.10.4"
+version = "1.10.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c"
+checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -2725,9 +3262,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.6"
+version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea"
+checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -2736,15 +3273,15 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.3"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56"
+checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
 
 [[package]]
 name = "reqwest"
-version = "0.12.4"
+version = "0.12.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10"
+checksum = "c7d6d2a27d57148378eb5e111173f4276ad26340ecc5c49a4a2152167a2d6a37"
 dependencies = [
  "base64",
  "bytes",
@@ -2757,6 +3294,7 @@ dependencies = [
  "http-body",
  "http-body-util",
  "hyper",
+ "hyper-rustls",
  "hyper-tls",
  "hyper-util",
  "ipnet",
@@ -2800,6 +3338,21 @@ dependencies = [
  "rewards-distribution",
 ]
 
+[[package]]
+name = "ring"
+version = "0.17.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d"
+dependencies = [
+ "cc",
+ "cfg-if 1.0.0",
+ "getrandom 0.2.15",
+ "libc",
+ "spin",
+ "untrusted",
+ "windows-sys 0.52.0",
+]
+
 [[package]]
 name = "ruplacer"
 version = "0.8.2"
@@ -2881,6 +3434,19 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
+[[package]]
+name = "rustls"
+version = "0.23.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05cff451f60db80f490f3c182b77c35260baace73209e9cdbbe526bfe3a4d402"
+dependencies = [
+ "once_cell",
+ "rustls-pki-types",
+ "rustls-webpki",
+ "subtle",
+ "zeroize",
+]
+
 [[package]]
 name = "rustls-pemfile"
 version = "2.1.2"
@@ -2897,6 +3463,17 @@ version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d"
 
+[[package]]
+name = "rustls-webpki"
+version = "0.102.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff448f7e92e913c4b7d4c6d8e4540a1724b319b4152b8aef6d4cf8339712b33e"
+dependencies = [
+ "ring",
+ "rustls-pki-types",
+ "untrusted",
+]
+
 [[package]]
 name = "ryu"
 version = "1.0.18"
@@ -3110,7 +3687,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800"
 dependencies = [
  "block-buffer 0.9.0",
- "cfg-if",
+ "cfg-if 1.0.0",
  "cpufeatures",
  "digest 0.9.0",
  "opaque-debug",
@@ -3122,7 +3699,7 @@ version = "0.10.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
 dependencies = [
- "cfg-if",
+ "cfg-if 1.0.0",
  "cpufeatures",
  "digest 0.10.7",
 ]
@@ -3200,6 +3777,18 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
+[[package]]
+name = "spin"
+version = "0.9.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
+
+[[package]]
+name = "stable_deref_trait"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
+
 [[package]]
 name = "str-repeat"
 version = "0.0.0"
@@ -3241,9 +3830,20 @@ dependencies = [
 
 [[package]]
 name = "sync_wrapper"
-version = "0.1.2"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394"
+
+[[package]]
+name = "synstructure"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160"
+checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
 
 [[package]]
 name = "system-configuration"
@@ -3272,7 +3872,7 @@ version = "3.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1"
 dependencies = [
- "cfg-if",
+ "cfg-if 1.0.0",
  "fastrand",
  "rustix",
  "windows-sys 0.52.0",
@@ -3298,6 +3898,16 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "tinystr"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f"
+dependencies = [
+ "displaydoc",
+ "zerovec",
+]
+
 [[package]]
 name = "tinyvec"
 version = "1.6.0"
@@ -3331,9 +3941,9 @@ dependencies = [
 
 [[package]]
 name = "tokio"
-version = "1.37.0"
+version = "1.38.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787"
+checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a"
 dependencies = [
  "backtrace",
  "bytes",
@@ -3350,9 +3960,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-macros"
-version = "2.2.0"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
+checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3369,6 +3979,17 @@ dependencies = [
  "tokio",
 ]
 
+[[package]]
+name = "tokio-rustls"
+version = "0.26.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4"
+dependencies = [
+ "rustls",
+ "rustls-pki-types",
+ "tokio",
+]
+
 [[package]]
 name = "tokio-util"
 version = "0.7.11"
@@ -3384,9 +4005,9 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.8.13"
+version = "0.8.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4e43f8cc456c9704c851ae29c67e17ef65d2c30017c17a9765b89c382dc8bba"
+checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335"
 dependencies = [
  "indexmap",
  "serde",
@@ -3406,9 +4027,9 @@ dependencies = [
 
 [[package]]
 name = "toml_edit"
-version = "0.22.13"
+version = "0.22.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c127785850e8c20836d49732ae6abfa47616e60bf9d9f57c43c250361a9db96c"
+checksum = "f21c7aaf97f1bd9ca9d4f9e73b0a6c74bd5afef56f2bc931943a6e1c37e04e38"
 dependencies = [
  "indexmap",
  "serde",
@@ -3488,16 +4109,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
 
 [[package]]
-name = "typenum"
-version = "1.17.0"
+name = "ttf-parser"
+version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
+checksum = "17f77d76d837a7830fe1d4f12b7b4ba4192c1888001c7164257e4bc6d21d96b4"
 
 [[package]]
-name = "unicode-bidi"
-version = "0.3.15"
+name = "typenum"
+version = "1.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
+checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
 
 [[package]]
 name = "unicode-ident"
@@ -3520,6 +4141,12 @@ version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
 
+[[package]]
+name = "untrusted"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
+
 [[package]]
 name = "unwrap-infallible"
 version = "0.1.5"
@@ -3528,9 +4155,9 @@ checksum = "151ac09978d3c2862c4e39b557f4eceee2cc72150bc4cb4f16abf061b6e381fb"
 
 [[package]]
 name = "url"
-version = "2.5.0"
+version = "2.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633"
+checksum = "f7c25da092f0a868cdf09e8674cd3b7ef3a7d92a24253e663a2fb85e2496de56"
 dependencies = [
  "form_urlencoded",
  "idna",
@@ -3555,11 +4182,23 @@ dependencies = [
  "use-module",
 ]
 
+[[package]]
+name = "utf16_iter"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246"
+
+[[package]]
+name = "utf8_iter"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
+
 [[package]]
 name = "utf8parse"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
+checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 
 [[package]]
 name = "vault"
@@ -3643,7 +4282,7 @@ version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"
 dependencies = [
- "cfg-if",
+ "cfg-if 1.0.0",
  "wasm-bindgen-macro",
 ]
 
@@ -3668,7 +4307,7 @@ version = "0.4.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0"
 dependencies = [
- "cfg-if",
+ "cfg-if 1.0.0",
  "js-sys",
  "wasm-bindgen",
  "web-sys",
@@ -3703,6 +4342,17 @@ version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
 
+[[package]]
+name = "wasm-demo"
+version = "0.1.0"
+dependencies = [
+ "plotters",
+ "plotters-canvas",
+ "wasm-bindgen",
+ "web-sys",
+ "wee_alloc",
+]
+
 [[package]]
 name = "wasmparser"
 version = "0.208.1"
@@ -3737,6 +4387,40 @@ dependencies = [
  "wasm-bindgen",
 ]
 
+[[package]]
+name = "wee_alloc"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dbb3b5a6b2bb17cb6ad44a2e68a43e8d2722c997da10e928665c72ec6c0a0b8e"
+dependencies = [
+ "cfg-if 0.1.10",
+ "libc",
+ "memory_units",
+ "winapi",
+]
+
+[[package]]
+name = "weezl"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082"
+
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
 [[package]]
 name = "winapi-util"
 version = "0.1.8"
@@ -3746,6 +4430,21 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
+[[package]]
+name = "windows-core"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
+dependencies = [
+ "windows-targets 0.52.5",
+]
+
 [[package]]
 name = "windows-sys"
 version = "0.48.0"
@@ -3887,9 +4586,9 @@ checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0"
 
 [[package]]
 name = "winnow"
-version = "0.6.9"
+version = "0.6.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86c949fede1d13936a99f14fafd3e76fd642b556dd2ce96287fbe2e0151bfac6"
+checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1"
 dependencies = [
  "memchr",
 ]
@@ -3900,10 +4599,67 @@ version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5"
 dependencies = [
- "cfg-if",
+ "cfg-if 1.0.0",
  "windows-sys 0.48.0",
 ]
 
+[[package]]
+name = "wio"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d129932f4644ac2396cb456385cbf9e63b5b30c6e8dc4820bdca4eb082037a5"
+dependencies = [
+ "winapi",
+]
+
+[[package]]
+name = "write16"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936"
+
+[[package]]
+name = "writeable"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
+
+[[package]]
+name = "yeslogic-fontconfig-sys"
+version = "5.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ffb6b23999a8b1a997bf47c7bb4d19ad4029c3327bb3386ebe0a5ff584b33c7a"
+dependencies = [
+ "cstr",
+ "dlib",
+ "once_cell",
+ "pkg-config",
+]
+
+[[package]]
+name = "yoke"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c5b1314b079b0930c31e3af543d8ee1757b1951ae1e1565ec704403a7240ca5"
+dependencies = [
+ "serde",
+ "stable_deref_trait",
+ "yoke-derive",
+ "zerofrom",
+]
+
+[[package]]
+name = "yoke-derive"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "synstructure",
+]
+
 [[package]]
 name = "zerocopy"
 version = "0.7.34"
@@ -3924,6 +4680,27 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "zerofrom"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91ec111ce797d0e0784a1116d0ddcdbea84322cd79e5d5ad173daeba4f93ab55"
+dependencies = [
+ "zerofrom-derive",
+]
+
+[[package]]
+name = "zerofrom-derive"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "synstructure",
+]
+
 [[package]]
 name = "zeroize"
 version = "1.8.1"
@@ -3944,11 +4721,33 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "zerovec"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb2cc8827d6c0994478a15c53f374f46fbd41bea663d809b14744bc42e6b109c"
+dependencies = [
+ "yoke",
+ "zerofrom",
+ "zerovec-derive",
+]
+
+[[package]]
+name = "zerovec-derive"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97cf56601ee5052b4417d90c8755c6683473c926039908196cf35d99f893ebe7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "zip"
-version = "2.1.1"
+version = "2.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1dd56a4d5921bc2f99947ac5b3abe5f510b1be7376fdc5e9fce4a23c6a93e87c"
+checksum = "775a2b471036342aa69bc5a602bc889cb0a06cda00477d0c69566757d5553d39"
 dependencies = [
  "arbitrary",
  "crc32fast",
diff --git a/Cargo.toml b/Cargo.toml
index 345b8670a5..5f94cec44e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -18,6 +18,7 @@ members = [
 
   "tools/mxpy-snippet-generator",
   "tools/payload-macro-generator",
+  "tools/plotter",
 
   "vm",
 
diff --git a/tools/plotter/.gitignore b/tools/plotter/.gitignore
new file mode 100644
index 0000000000..769dfbb4ba
--- /dev/null
+++ b/tools/plotter/.gitignore
@@ -0,0 +1,3 @@
+/target
+.*.sw*
+.vscode/*
diff --git a/tools/plotter/Cargo.toml b/tools/plotter/Cargo.toml
new file mode 100644
index 0000000000..f936cadd16
--- /dev/null
+++ b/tools/plotter/Cargo.toml
@@ -0,0 +1,18 @@
+[package]
+name = "wasm-demo"
+version = "0.1.0"
+authors = ["Hao Hou <haohou302@gmail.com>"]
+edition = "2018"
+
+[lib]
+crate-type=["cdylib"]
+
+[dependencies]
+plotters = "^0.3.2"
+wasm-bindgen = "0.2.78"
+wee_alloc = "0.4.5"
+web-sys = { version = "0.3.39", features = ["HtmlCanvasElement"] }
+plotters-canvas = "^0.3.0"
+
+[profile.release]
+lto = true
diff --git a/tools/plotter/README.md b/tools/plotter/README.md
new file mode 100644
index 0000000000..cfe2983da2
--- /dev/null
+++ b/tools/plotter/README.md
@@ -0,0 +1,54 @@
+# Example Project of Plotters + WASM
+
+This is a minimal project that uses Plotters in WASM application.
+
+- For more information about Plotters project, check our [core repository](https://github.com/plotters-rs/plotters).
+
+- This demo has been deployed at this [link](https://plotters-rs.github.io/wasm-demo/www/index.html).
+
+## Try this example locally
+
+To build the demo you need [wasm-pack](https://rustwasm.github.io/docs/book/game-of-life/setup.html).
+
+Then you can run it locally either using `npm` and `webpack-dev-server` or
+just with static web server.
+
+The following script will install needed software and run the server via `npm`.
+```
+./start-server.sh
+```
+
+For Windows users without Bash, `start-server.bat` can be used to
+launch the server.
+
+```
+start-server.bat
+```
+
+## Developing with NPM
+Please use [rust-wasm guide](https://rustwasm.github.io/docs/book/game-of-life/setup.html) for initial setup .
+Then you can run the demo locally using `npm`:
+```bash
+wasm-pack build
+cd www
+npm install
+npm start
+```
+
+This will start a dev server which will automatically reload your page
+whenever you change anything in `www` directory. To update `rust` code
+call `wasm-pack build` manually.
+
+## Developing without dependenices
+If you don't want to use `npm` here's how you can run the example
+using any web server. We are using rust [basic-http-server](https://github.com/brson/basic-http-server), but
+any web server will do.
+
+```bash
+# Install web server (instead you can use your local nginx for example)
+cargo install basic-http-server
+wasm-pack build --target web # Note `--target web`
+basic-http-server
+```
+
+Then open http://127.0.0.1:4000/www
diff --git a/tools/plotter/src/func_plot.rs b/tools/plotter/src/func_plot.rs
new file mode 100644
index 0000000000..054452f08b
--- /dev/null
+++ b/tools/plotter/src/func_plot.rs
@@ -0,0 +1,31 @@
+use crate::DrawResult;
+use plotters::prelude::*;
+use plotters_canvas::CanvasBackend;
+
+/// Draw power function f(x) = x^power.
+pub fn draw(canvas_id: &str, power: i32) -> DrawResult<impl Fn((i32, i32)) -> Option<(f32, f32)>> {
+    let backend = CanvasBackend::new(canvas_id).expect("cannot find canvas");
+    let root = backend.into_drawing_area();
+    let font: FontDesc = ("sans-serif", 20.0).into();
+
+    root.fill(&WHITE)?;
+
+    let mut chart = ChartBuilder::on(&root)
+        .margin(20u32)
+        .caption(format!("y=x^{}", power), font)
+        .x_label_area_size(30u32)
+        .y_label_area_size(30u32)
+        .build_cartesian_2d(-1f32..1f32, -1.2f32..1.2f32)?;
+
+    chart.configure_mesh().x_labels(3).y_labels(3).draw()?;
+
+    chart.draw_series(LineSeries::new(
+        (-50..=50)
+            .map(|x| x as f32 / 50.0)
+            .map(|x| (x, x.powf(power as f32))),
+        &RED,
+    ))?;
+
+    root.present()?;
+    return Ok(chart.into_coord_trans());
+}
diff --git a/tools/plotter/src/lib.rs b/tools/plotter/src/lib.rs
new file mode 100644
index 0000000000..99b270cb73
--- /dev/null
+++ b/tools/plotter/src/lib.rs
@@ -0,0 +1,58 @@
+use wasm_bindgen::prelude::*;
+use web_sys::HtmlCanvasElement;
+
+mod func_plot;
+mod mandelbrot;
+mod plot3d;
+
+#[global_allocator]
+static ALLOC: wee_alloc::WeeAlloc = wee_alloc::WeeAlloc::INIT;
+
+/// Type alias for the result of a drawing function.
+pub type DrawResult<T> = Result<T, Box<dyn std::error::Error>>;
+
+/// Type used on the JS side to convert screen coordinates to chart
+/// coordinates.
+#[wasm_bindgen]
+pub struct Chart {
+    convert: Box<dyn Fn((i32, i32)) -> Option<(f64, f64)>>,
+}
+
+/// Result of screen to chart coordinates conversion.
+#[wasm_bindgen]
+pub struct Point {
+    pub x: f64,
+    pub y: f64,
+}
+
+#[wasm_bindgen]
+impl Chart {
+    /// Draw provided power function on the canvas element using it's id.
+    /// Return `Chart` struct suitable for coordinate conversion.
+    pub fn power(canvas_id: &str, power: i32) -> Result<Chart, JsValue> {
+        let map_coord = func_plot::draw(canvas_id, power).map_err(|err| err.to_string())?;
+        Ok(Chart {
+            convert: Box::new(move |coord| map_coord(coord).map(|(x, y)| (x.into(), y.into()))),
+        })
+    }
+
+    /// Draw Mandelbrot set on the provided canvas element.
+    /// Return `Chart` struct suitable for coordinate conversion.
+    pub fn mandelbrot(canvas: HtmlCanvasElement) -> Result<Chart, JsValue> {
+        let map_coord = mandelbrot::draw(canvas).map_err(|err| err.to_string())?;
+        Ok(Chart {
+            convert: Box::new(map_coord),
+        })
+    }
+
+    pub fn plot3d(canvas: HtmlCanvasElement, pitch: f64, yaw: f64) -> Result<(), JsValue> {
+        plot3d::draw(canvas, pitch, yaw).map_err(|err| err.to_string())?;
+        Ok(())
+    }
+
+    /// This function can be used to convert screen coordinates to
+    /// chart coordinates.
+    pub fn coord(&self, x: i32, y: i32) -> Option<Point> {
+        (self.convert)((x, y)).map(|(x, y)| Point { x, y })
+    }
+}
diff --git a/tools/plotter/src/mandelbrot.rs b/tools/plotter/src/mandelbrot.rs
new file mode 100644
index 0000000000..6c6bc9ae8a
--- /dev/null
+++ b/tools/plotter/src/mandelbrot.rs
@@ -0,0 +1,67 @@
+use crate::DrawResult;
+use plotters::prelude::*;
+use plotters_canvas::CanvasBackend;
+use std::ops::Range;
+use web_sys::HtmlCanvasElement;
+
+/// Draw Mandelbrot set
+pub fn draw(element: HtmlCanvasElement) -> DrawResult<impl Fn((i32, i32)) -> Option<(f64, f64)>> {
+    let backend = CanvasBackend::with_canvas_object(element).unwrap();
+
+    let root = backend.into_drawing_area();
+    root.fill(&WHITE)?;
+
+    let mut chart = ChartBuilder::on(&root)
+        .margin(20)
+        .x_label_area_size(10)
+        .y_label_area_size(10)
+        .build_cartesian_2d(-2.1..0.6, -1.2..1.2)?;
+
+    chart
+        .configure_mesh()
+        .disable_x_mesh()
+        .disable_y_mesh()
+        .draw()?;
+
+    let plotting_area = chart.plotting_area();
+
+    let range = plotting_area.get_pixel_range();
+    let (pw, ph) = (range.0.end - range.0.start, range.1.end - range.1.start);
+    let (xr, yr) = (chart.x_range(), chart.y_range());
+
+    for (x, y, c) in mandelbrot_set(xr, yr, (pw as usize, ph as usize), 100) {
+        if c != 100 {
+            plotting_area.draw_pixel((x, y), &HSLColor(c as f64 / 100.0, 1.0, 0.5))?;
+        } else {
+            plotting_area.draw_pixel((x, y), &BLACK)?;
+        }
+    }
+
+    root.present()?;
+    return Ok(Box::new(chart.into_coord_trans()));
+}
+
+fn mandelbrot_set(
+    real: Range<f64>,
+    complex: Range<f64>,
+    samples: (usize, usize),
+    max_iter: usize,
+) -> impl Iterator<Item = (f64, f64, usize)> {
+    let step = (
+        (real.end - real.start) / samples.0 as f64,
+        (complex.end - complex.start) / samples.1 as f64,
+    );
+    return (0..(samples.0 * samples.1)).map(move |k| {
+        let c = (
+            real.start + step.0 * (k % samples.0) as f64,
+            complex.start + step.1 * (k / samples.0) as f64,
+        );
+        let mut z = (0.0, 0.0);
+        let mut cnt = 0;
+        while cnt < max_iter && z.0 * z.0 + z.1 * z.1 <= 1e10 {
+            z = (z.0 * z.0 - z.1 * z.1 + c.0, 2.0 * z.0 * z.1 + c.1);
+            cnt += 1;
+        }
+        return (c.0, c.1, cnt);
+    });
+}
diff --git a/tools/plotter/src/plot3d.rs b/tools/plotter/src/plot3d.rs
new file mode 100644
index 0000000000..06d0190d19
--- /dev/null
+++ b/tools/plotter/src/plot3d.rs
@@ -0,0 +1,42 @@
+use crate::DrawResult;
+use plotters::prelude::*;
+use plotters_canvas::CanvasBackend;
+use web_sys::HtmlCanvasElement;
+
+pub fn draw(canvas: HtmlCanvasElement, pitch: f64, yaw: f64) -> DrawResult<()> {
+    let area = CanvasBackend::with_canvas_object(canvas)
+        .unwrap()
+        .into_drawing_area();
+    area.fill(&WHITE)?;
+
+    let x_axis = (-3.0..3.0).step(0.1);
+    let z_axis = (-3.0..3.0).step(0.1);
+
+    let mut chart =
+        ChartBuilder::on(&area).build_cartesian_3d(x_axis.clone(), -3.0..3.0, z_axis.clone())?;
+
+    chart.with_projection(|mut pb| {
+        pb.yaw = yaw;
+        pb.pitch = pitch;
+        pb.scale = 0.7;
+        pb.into_matrix()
+    });
+
+    chart.configure_axes().draw()?;
+
+    chart.draw_series(
+        SurfaceSeries::xoz(x_axis.values(), z_axis.values(), |x:f64, z:f64| {
+            (x * x + z * z).cos()
+        })
+        .style(&BLUE.mix(0.2)),
+    )?;
+
+    chart.draw_series(LineSeries::new(
+        (-100..100)
+            .map(|y| y as f64 / 40.0)
+            .map(|y| ((y * 10.0).sin(), y, (y * 10.0).cos())),
+        &BLACK,
+    ))?;
+
+    Ok(())
+}
diff --git a/tools/plotter/start-server.bat b/tools/plotter/start-server.bat
new file mode 100644
index 0000000000..aee88705f2
--- /dev/null
+++ b/tools/plotter/start-server.bat
@@ -0,0 +1,8 @@
+if not exist "www\pkg" mkdir www\pkg
+rustup target add wasm32-unknown-unknown
+wasm-pack build --release
+if errorlevel 1 cargo install wasm-pack
+wasm-pack build --release
+cd www
+call npm install
+npm start
diff --git a/tools/plotter/start-server.sh b/tools/plotter/start-server.sh
new file mode 100755
index 0000000000..d8ba0e6562
--- /dev/null
+++ b/tools/plotter/start-server.sh
@@ -0,0 +1,23 @@
+#!/bin/bash
+set -e
+
+CONFIG=release
+mkdir -p www/pkg
+
+rustup target add wasm32-unknown-unknown
+
+if [ -z "$(cargo install --list | grep wasm-pack)" ]
+then
+	cargo install wasm-pack
+fi
+
+if [ "${CONFIG}" = "release" ]
+then
+    wasm-pack build
+else 
+    wasm-pack build --release
+fi
+
+cd www
+npm install
+npm start
diff --git a/tools/plotter/www/.gitignore b/tools/plotter/www/.gitignore
new file mode 100644
index 0000000000..16acd49d7f
--- /dev/null
+++ b/tools/plotter/www/.gitignore
@@ -0,0 +1,3 @@
+node_modules
+dist
+package-lock.json
diff --git a/tools/plotter/www/bootstrap.js b/tools/plotter/www/bootstrap.js
new file mode 100644
index 0000000000..bea8b6b67a
--- /dev/null
+++ b/tools/plotter/www/bootstrap.js
@@ -0,0 +1,21 @@
+init();
+
+async function init() {
+    if (typeof process == "object") {
+        // We run in the npm/webpack environment.
+        const [{Chart}, {main, setup}] = await Promise.all([
+            import("wasm-demo"),
+            import("./index.js"),
+        ]);
+        setup(Chart);
+        main();
+    } else {
+        const [{Chart, default: init}, {main, setup}] = await Promise.all([
+            import("../pkg/wasm_demo.js"),
+            import("./index.js"),
+        ]);
+        await init();
+        setup(Chart);
+        main();
+    }
+}
diff --git a/tools/plotter/www/index.html b/tools/plotter/www/index.html
new file mode 100644
index 0000000000..5256468042
--- /dev/null
+++ b/tools/plotter/www/index.html
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<html lang="en">
+    <head>
+	<meta charset="utf-8">
+        <meta name="viewport" content="width=device-width, initial-scale=1">
+	<title>Plotters WebAssembly Demo</title>
+	<link rel="stylesheet" href="./style.css">
+    </head>
+    <body>
+        <noscript>This page contains webassembly and javascript content, please enable javascript in your browser.</noscript>
+        <script src="./bootstrap.js"></script>
+	<main>
+	    <h1>Plotters WebAssembly Demo</h1>
+	    <div id="coord"></div>
+        <canvas id="canvas" width="600" height="400"></canvas>
+	    <div id="status">Loading WebAssembly...</div>
+	    <div id="control">
+			<label for="plot-type">Demo: </label>
+			<select id="plot-type">
+				<option value="0">Graph of y=1</option>
+				<option value="1">Graph of y=x</option>
+				<option value="2">Graph of y=x^2</option>
+				<option value="3">Graph of y=x^3</option>
+				<option value="4">Graph of y=x^4</option>
+				<option value="5">Graph of y=x^5</option>
+				<option value="mandelbrot">Mandelbrot Set</option>
+				<option value="3d-plot">3D Plot Demo</option>
+			</select>
+			<div id="3d-control" class="hide">
+				<label for="pitch">Pitch: </label> <input type="range" min="0" max="157" id="pitch" value="10"> <br/>
+				<label for="yaw">Yaw: </label> <input type="range" min="0" max="314" id="yaw" value="50">
+			</div>
+	    </div>
+	</main>
+	<footer>
+	    <a href="https://github.com/plotters-rs/plotters-wasm-demo" target="a">Source</a> |
+	    <a href="https://github.com/plotters-rs/plotters" target="a">Repo</a> |
+	    <a href="https://crates.io/crates/plotters" target="a">Crates</a> |
+	    <a href="https://docs.rs/plotters" target="a">Docs</a>
+	</footer>
+    </body>
+</html>
diff --git a/tools/plotter/www/index.js b/tools/plotter/www/index.js
new file mode 100644
index 0000000000..6cd4bd36f5
--- /dev/null
+++ b/tools/plotter/www/index.js
@@ -0,0 +1,103 @@
+// If you only use `npm` you can simply
+// import { Chart } from "wasm-demo" and remove `setup` call from `bootstrap.js`.
+class Chart {}
+
+const canvas = document.getElementById("canvas");
+const coord = document.getElementById("coord");
+const plotType = document.getElementById("plot-type");
+const pitch = document.getElementById("pitch");
+const yaw = document.getElementById("yaw");
+const control = document.getElementById("3d-control");
+const status = document.getElementById("status");
+
+let chart = null;
+
+/** Main entry point */
+export function main() {
+	let hash = location.hash.substr(1);
+	for(var i = 0; i < plotType.options.length; i++) {
+		if(hash == plotType.options[i].value) {
+			plotType.value = hash;
+		}
+	}
+    setupUI();
+    setupCanvas();
+}
+
+/** This function is used in `bootstrap.js` to setup imports. */
+export function setup(WasmChart) {
+    Chart = WasmChart;
+}
+
+/** Add event listeners. */
+function setupUI() {
+    status.innerText = "WebAssembly loaded!";
+    plotType.addEventListener("change", updatePlot);
+	yaw.addEventListener("change", updatePlot);
+	pitch.addEventListener("change", updatePlot);
+	yaw.addEventListener("input", updatePlot);
+	pitch.addEventListener("input", updatePlot);
+    window.addEventListener("resize", setupCanvas);
+    window.addEventListener("mousemove", onMouseMove);
+}
+
+/** Setup canvas to properly handle high DPI and redraw current plot. */
+function setupCanvas() {
+	const dpr = window.devicePixelRatio || 1.0;
+    const aspectRatio = canvas.width / canvas.height;
+    const size = canvas.parentNode.offsetWidth * 0.8;
+    canvas.style.width = size + "px";
+    canvas.style.height = size / aspectRatio + "px";
+    canvas.width = size;
+    canvas.height = size / aspectRatio;
+    updatePlot();
+}
+
+/** Update displayed coordinates. */
+function onMouseMove(event) {
+    if (chart) {
+		var text = "Mouse pointer is out of range";
+
+		if(event.target == canvas) {
+			let actualRect = canvas.getBoundingClientRect();
+			let logicX = event.offsetX * canvas.width / actualRect.width;
+			let logicY = event.offsetY * canvas.height / actualRect.height;
+			const point = chart.coord(logicX, logicY);
+			text = (point) 
+				? `(${point.x.toFixed(3)}, ${point.y.toFixed(3)})`
+				: text;
+		}
+        coord.innerText = text;
+    }
+}
+
+function updatePlot3d() {
+	let yaw_value = Number(yaw.value) / 100.0;
+	let pitch_value = Number(pitch.value) / 100.0;
+	Chart.plot3d(canvas, pitch_value, yaw_value);
+	coord.innerText = `Pitch:${pitch_value}, Yaw:${yaw_value}`
+}
+
+/** Redraw currently selected plot. */
+function updatePlot() {
+    const selected = plotType.selectedOptions[0];
+    status.innerText = `Rendering ${selected.innerText}...`;
+    chart = null;
+    const start = performance.now();
+	switch(selected.value) {
+		case "mandelbrot":
+			control.classList.add("hide");
+			chart = Chart.mandelbrot(canvas);
+			break;
+		case "3d-plot": 
+			control.classList.remove("hide");
+			updatePlot3d();
+			break;
+		default:
+			control.classList.add("hide");
+			chart = Chart.power("canvas", Number(selected.value))
+	}
+	
+    const end = performance.now();
+    status.innerText = `Rendered ${selected.innerText} in ${Math.ceil(end - start)}ms`;
+}
diff --git a/tools/plotter/www/package.json b/tools/plotter/www/package.json
new file mode 100644
index 0000000000..32a99f8aff
--- /dev/null
+++ b/tools/plotter/www/package.json
@@ -0,0 +1,36 @@
+{
+  "name": "plotters-wasm-demo",
+  "version": "0.1.0",
+  "description": "Plotters WASM Demo",
+  "main": "index.js",
+  "scripts": {
+    "build": "webpack --config webpack.config.js",
+    "start": "webpack-dev-server"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/38/plotters.git"
+  },
+  "keywords": [
+    "webassembly",
+    "wasm",
+    "rust",
+    "webpack",
+    "visualization"
+  ],
+  "author": "Plotters Developers",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/38/plotters/issues"
+  },
+  "homepage": "https://github.com/38/plotters",
+  "dependencies": {
+    "wasm-demo": "file:../pkg"
+  },
+  "devDependencies": {
+    "webpack": "^4.43.0",
+    "webpack-cli": "^3.3.11",
+    "webpack-dev-server": "^3.10.3",
+    "copy-webpack-plugin": "^5.0.0"
+  }
+}
diff --git a/tools/plotter/www/style.css b/tools/plotter/www/style.css
new file mode 100644
index 0000000000..404d385be6
--- /dev/null
+++ b/tools/plotter/www/style.css
@@ -0,0 +1,55 @@
+html, body, main {
+    width: 100%;
+    margin: 0;
+    padding: 0;
+}
+
+body {
+    margin: auto;
+    max-width: 800px;
+    display: flex;
+    flex-direction: column;
+}
+
+@media (max-width: 800px) {
+    body {
+        padding: 10px;
+        box-sizing: border-box;
+    }
+}
+
+main {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+}
+
+#coord, #status {
+    color: grey;
+    font-size: 10px;
+    height: 15px
+}
+
+#control {
+    margin-top: 1em;
+}
+
+#control label {
+    font-weight: bold;
+    margin-right: 1em;
+}
+
+#control select {
+    padding: 0.25em 0.5em;
+}
+
+footer {
+    margin-top: 2em;
+    font-size: 12px;
+    text-align: center;
+}
+
+.hide {
+	visibility: hidden;
+	height: 0px;
+}
diff --git a/tools/plotter/www/webpack.config.js b/tools/plotter/www/webpack.config.js
new file mode 100644
index 0000000000..80ad8142d2
--- /dev/null
+++ b/tools/plotter/www/webpack.config.js
@@ -0,0 +1,14 @@
+const CopyWebpackPlugin = require("copy-webpack-plugin");
+const path = require('path');
+
+module.exports = {
+  entry: "./bootstrap.js",
+  output: {
+    path: path.resolve(__dirname, "dist"),
+    filename: "bootstrap.js",
+  },
+  mode: "development",
+  plugins: [
+    new CopyWebpackPlugin(['index.html'])
+  ],
+};

From 2b1a0f6fa98608f1127a54eda76a33166db4139c Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Mon, 17 Jun 2024 21:33:45 +0300
Subject: [PATCH 0992/1254] plotters - logarithm stub

---
 tools/plotter/src/lib.rs       |  8 ++++++++
 tools/plotter/src/logarithm.rs | 31 +++++++++++++++++++++++++++++++
 tools/plotter/www/index.html   |  1 +
 tools/plotter/www/index.js     |  7 ++++++-
 4 files changed, 46 insertions(+), 1 deletion(-)
 create mode 100644 tools/plotter/src/logarithm.rs

diff --git a/tools/plotter/src/lib.rs b/tools/plotter/src/lib.rs
index 99b270cb73..37940ab944 100644
--- a/tools/plotter/src/lib.rs
+++ b/tools/plotter/src/lib.rs
@@ -4,6 +4,7 @@ use web_sys::HtmlCanvasElement;
 mod func_plot;
 mod mandelbrot;
 mod plot3d;
+mod logarithm;
 
 #[global_allocator]
 static ALLOC: wee_alloc::WeeAlloc = wee_alloc::WeeAlloc::INIT;
@@ -36,6 +37,13 @@ impl Chart {
         })
     }
 
+    pub fn logarithm(canvas_id: &str) -> Result<Chart, JsValue> {
+        let map_coord = logarithm::draw(canvas_id).map_err(|err| err.to_string())?;
+        Ok(Chart {
+            convert: Box::new(move |coord| map_coord(coord).map(|(x, y)| (x.into(), y.into()))),
+        })
+    }
+
     /// Draw Mandelbrot set on the provided canvas element.
     /// Return `Chart` struct suitable for coordinate conversion.
     pub fn mandelbrot(canvas: HtmlCanvasElement) -> Result<Chart, JsValue> {
diff --git a/tools/plotter/src/logarithm.rs b/tools/plotter/src/logarithm.rs
new file mode 100644
index 0000000000..797e67c1a8
--- /dev/null
+++ b/tools/plotter/src/logarithm.rs
@@ -0,0 +1,31 @@
+use crate::DrawResult;
+use plotters::prelude::*;
+use plotters_canvas::CanvasBackend;
+
+/// Draw power function f(x) = x^power.
+pub fn draw(canvas_id: &str) -> DrawResult<impl Fn((i32, i32)) -> Option<(f32, f32)>> {
+    let backend = CanvasBackend::new(canvas_id).expect("cannot find canvas");
+    let root = backend.into_drawing_area();
+    let font: FontDesc = ("sans-serif", 20.0).into();
+
+    root.fill(&WHITE)?;
+
+    let mut chart = ChartBuilder::on(&root)
+        .margin(20u32)
+        .caption(format!("y=ln(x)"), font)
+        .x_label_area_size(30u32)
+        .y_label_area_size(30u32)
+        .build_cartesian_2d(0f32..50f32, -10f32..10f32)?;
+
+    chart.configure_mesh().x_labels(3).y_labels(3).draw()?;
+
+    chart.draw_series(LineSeries::new(
+        (0..=500)
+            .map(|x| x as f32 / 10f32)
+            .map(|x| (x, x.ln())),
+        &RED,
+    ))?;
+
+    root.present()?;
+    return Ok(chart.into_coord_trans());
+}
diff --git a/tools/plotter/www/index.html b/tools/plotter/www/index.html
index 5256468042..826d3ac9ba 100644
--- a/tools/plotter/www/index.html
+++ b/tools/plotter/www/index.html
@@ -23,6 +23,7 @@ <h1>Plotters WebAssembly Demo</h1>
 				<option value="3">Graph of y=x^3</option>
 				<option value="4">Graph of y=x^4</option>
 				<option value="5">Graph of y=x^5</option>
+				<option value="logarithm">Logarithms</option>
 				<option value="mandelbrot">Mandelbrot Set</option>
 				<option value="3d-plot">3D Plot Demo</option>
 			</select>
diff --git a/tools/plotter/www/index.js b/tools/plotter/www/index.js
index 6cd4bd36f5..e84a500080 100644
--- a/tools/plotter/www/index.js
+++ b/tools/plotter/www/index.js
@@ -89,13 +89,18 @@ function updatePlot() {
 			control.classList.add("hide");
 			chart = Chart.mandelbrot(canvas);
 			break;
+		case "logarithm": 
+			control.classList.add("hide");
+			chart = Chart.logarithm("canvas");
+			break;
 		case "3d-plot": 
 			control.classList.remove("hide");
 			updatePlot3d();
 			break;
 		default:
 			control.classList.add("hide");
-			chart = Chart.power("canvas", Number(selected.value))
+			chart = Chart.power("canvas", Number(selected.value));
+			// chart = null;
 	}
 	
     const end = performance.now();

From 4ee2bb30feb984da3a86d3e181bc07bf3786eb8c Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Tue, 18 Jun 2024 04:53:59 +0200
Subject: [PATCH 0993/1254] reorg, separated impl in 2 new files, added add
 assign and sub assign impls, cleanup ln

---
 .../types/managed/wrapped/managed_decimal.rs  | 338 ++----------------
 .../managed/wrapped/managed_decimal_cmp.rs    |  55 +++
 .../managed/wrapped/managed_decimal_macros.rs |  19 +-
 .../wrapped/managed_decimal_operators.rs      | 238 ++++++++++++
 .../base/src/types/managed/wrapped/mod.rs     |   3 +
 .../scenario/tests/managed_decimal_test.rs    |   9 +
 6 files changed, 353 insertions(+), 309 deletions(-)
 create mode 100644 framework/base/src/types/managed/wrapped/managed_decimal_cmp.rs
 create mode 100644 framework/base/src/types/managed/wrapped/managed_decimal_operators.rs

diff --git a/framework/base/src/types/managed/wrapped/managed_decimal.rs b/framework/base/src/types/managed/wrapped/managed_decimal.rs
index a0e3349c8a..9b7872899e 100644
--- a/framework/base/src/types/managed/wrapped/managed_decimal.rs
+++ b/framework/base/src/types/managed/wrapped/managed_decimal.rs
@@ -4,7 +4,6 @@ use crate::{
         const_handles, use_raw_handle, BigFloatApiImpl, BigIntApiImpl, ManagedTypeApi,
         StaticVarApiImpl,
     },
-    const_managed_decimal,
     types::{BigFloat, BigUint},
 };
 
@@ -14,12 +13,9 @@ use multiversx_sc_codec::{
     TopEncodeOutput,
 };
 
-use core::{
-    cmp::Ordering,
-    ops::{Add, Deref, Div, Mul, Sub},
-};
+use core::{cmp::Ordering, ops::Deref};
 
-use super::ManagedRef;
+use super::{ManagedRef, MulToPrecision};
 
 fn scaling_factor<M: ManagedTypeApi>(
     num_decimals: NumDecimals,
@@ -75,8 +71,8 @@ impl<const DECIMALS: NumDecimals> Decimals for ConstDecimals<DECIMALS> {
 
 #[derive(Debug, Clone)]
 pub struct ManagedDecimal<M: ManagedTypeApi, D: Decimals> {
-    data: BigUint<M>,
-    decimals: D,
+    pub(crate) data: BigUint<M>,
+    pub(crate) decimals: D,
 }
 
 impl<M: ManagedTypeApi, D: Decimals> ManagedDecimal<M, D> {
@@ -181,57 +177,49 @@ impl<M: ManagedTypeApi, const DECIMALS: NumDecimals> ManagedDecimal<M, ConstDeci
         self,
         precision: ConstDecimals<PREC>,
     ) -> ManagedDecimal<M, ConstDecimals<PREC>> {
-        let num_decimals = BigUint::<M>::from(self.decimals.num_decimals());
+        let num_decimals = self.decimals.num_decimals() as u32;
         // find the highest power of 2 less than or equal to self
-        let log2 = self.data.log2() - num_decimals.log2(); // most significant bit for the actual number
+        let log2 = self.data.log2() - num_decimals * BigUint::<M>::from(10u64).log2(); // most significant bit for the actual number
         let divisor = 1 << log2;
         let divisor_scaled = BigUint::<M>::from(divisor.to_biguint().unwrap())
             * self.decimals.scaling_factor().clone_value();
         let _normalized = self.data / divisor_scaled; // normalize to [1.0, 2.0]
-        let x_dec = const_managed_decimal!(_normalized);
+        let x_dec = ManagedDecimal::<M, ConstDecimals<0>>::const_decimals_from_raw(_normalized);
+        let x = x_dec.rescale(precision.clone());
 
-        // const values we need for the polynom
-        let ln_of_2_dec = ManagedDecimal::<M, ConstDecimals<8>>::const_decimals_from_raw(
+        // approximating polynom to get the result
+        let mut result = ManagedDecimal::<M, ConstDecimals<9>>::const_decimals_from_raw(
+            BigUint::from(56570851u64), // 0.056570851, 9 decimals˝
+        )
+        .mul_with_precision(x.clone(), precision.clone());
+        result = ManagedDecimal::<M, ConstDecimals<8>>::const_decimals_from_raw(BigUint::from(
+            44717955u64, // 0.44717955, 8 decimals
+        ))
+        .rescale(precision.clone())
+            - result;
+        result = result.mul_with_precision(x.clone(), precision.clone());
+        result -= ManagedDecimal::<M, ConstDecimals<7>>::const_decimals_from_raw(BigUint::from(
+            14699568u64, // 1.4699568, 7 decimals
+        ))
+        .rescale(precision.clone());
+        result = result.mul_with_precision(x.clone(), precision.clone());
+        result += ManagedDecimal::<M, ConstDecimals<7>>::const_decimals_from_raw(BigUint::from(
+            28212026u64, // 2.8212026, 7 decimals
+        ))
+        .rescale(precision.clone());
+        result = result.mul_with_precision(x.clone(), precision.clone());
+        result -= ManagedDecimal::<M, ConstDecimals<7>>::const_decimals_from_raw(BigUint::from(
+            17417939u64, // 1.7417939, 7 decimals
+        ))
+        .rescale(precision.clone());
+
+        let log_2 =
+            ManagedDecimal::<M, ConstDecimals<0>>::const_decimals_from_raw(BigUint::from(log2));
+        let ln_of_2 = ManagedDecimal::<M, ConstDecimals<8>>::const_decimals_from_raw(
             BigUint::from(69314718u64),
         ); // 0.69314718 8 decimals
-        let first_dec = ManagedDecimal::<M, ConstDecimals<7>>::const_decimals_from_raw(
-            BigUint::from(17417939u64),
-        ); // 1.7417939, 7 decimals
-        let second_dec = ManagedDecimal::<M, ConstDecimals<7>>::const_decimals_from_raw(
-            BigUint::from(28212026u64),
-        ); // 2.8212026, 7 decimals
-        let third_dec = ManagedDecimal::<M, ConstDecimals<7>>::const_decimals_from_raw(
-            BigUint::from(14699568u64),
-        ); // 1.4699568, 7 decimals
-        let fourth_dec = ManagedDecimal::<M, ConstDecimals<8>>::const_decimals_from_raw(
-            BigUint::from(44717955u64),
-        ); // 0.44717955, 8 decimals
-        let fifth_dec = ManagedDecimal::<M, ConstDecimals<9>>::const_decimals_from_raw(
-            BigUint::from(56570851u64),
-        ); // 0.056570851, 9 decimals
-
-        // rescale everything to precision
-        let x = x_dec.rescale(precision.clone());
-        let ln_of_2 = ln_of_2_dec.rescale(precision.clone());
-        let first = first_dec.rescale(precision.clone());
-        let second = second_dec.rescale(precision.clone());
-        let third = third_dec.rescale(precision.clone());
-        let fourth = fourth_dec.rescale(precision.clone());
-        let fifth = fifth_dec.rescale(precision.clone());
 
-        // approximating polynom to get the result
-        let result = (((fourth - fifth.mul_with_precision(x.clone(), precision.clone()))
-            .mul_with_precision(x.clone(), precision.clone())
-            - third)
-            .mul_with_precision(x.clone(), precision.clone())
-            + second)
-            .mul_with_precision(x, precision.clone())
-            - first;
-
-        let log_2 = const_managed_decimal!(log2);
-
-        let add_member = log_2.mul_with_precision(ln_of_2, precision.clone());
-        result + add_member
+        result + log_2.mul_with_precision(ln_of_2, precision.clone())
     }
 }
 
@@ -369,256 +357,6 @@ impl<M: ManagedTypeApi, const DECIMALS: NumDecimals> From<BigUint<M>>
     }
 }
 
-impl<M: ManagedTypeApi, const DECIMALS: NumDecimals> Add<ManagedDecimal<M, ConstDecimals<DECIMALS>>>
-    for ManagedDecimal<M, ConstDecimals<DECIMALS>>
-{
-    type Output = Self;
-
-    fn add(self, other: ManagedDecimal<M, ConstDecimals<DECIMALS>>) -> Self::Output {
-        ManagedDecimal::const_decimals_from_raw(self.data + other.data)
-    }
-}
-
-impl<M: ManagedTypeApi, const DECIMALS: NumDecimals> Sub<ManagedDecimal<M, ConstDecimals<DECIMALS>>>
-    for ManagedDecimal<M, ConstDecimals<DECIMALS>>
-{
-    type Output = Self;
-
-    fn sub(self, other: ManagedDecimal<M, ConstDecimals<DECIMALS>>) -> Self::Output {
-        ManagedDecimal::const_decimals_from_raw(self.data - other.data)
-    }
-}
-
-impl<M: ManagedTypeApi> Add<ManagedDecimal<M, NumDecimals>> for ManagedDecimal<M, NumDecimals> {
-    type Output = Self;
-
-    fn add(self, other: ManagedDecimal<M, NumDecimals>) -> Self::Output {
-        let scaled = other.rescale(self.scale());
-        ManagedDecimal::from_raw_units(&self.data + &scaled.data, scaled.decimals)
-    }
-}
-
-impl<M: ManagedTypeApi> Sub<ManagedDecimal<M, NumDecimals>> for ManagedDecimal<M, NumDecimals> {
-    type Output = Self;
-
-    fn sub(self, other: ManagedDecimal<M, NumDecimals>) -> Self::Output {
-        let scaled = other.rescale(self.scale());
-        ManagedDecimal::from_raw_units(&self.data - &scaled.data, scaled.decimals)
-    }
-}
-
-impl<M: ManagedTypeApi, D1: Decimals, D2: Decimals> Mul<ManagedDecimal<M, D2>>
-    for ManagedDecimal<M, D1>
-where
-    D1: Add<D2>,
-    <D1 as Add<D2>>::Output: Decimals,
-{
-    type Output = ManagedDecimal<M, <D1 as Add<D2>>::Output>;
-
-    fn mul(self, other: ManagedDecimal<M, D2>) -> Self::Output {
-        ManagedDecimal {
-            data: self.data * other.data,
-            decimals: self.decimals + other.decimals,
-        }
-    }
-}
-
-impl<M: ManagedTypeApi, D1: Decimals, D2: Decimals> MulToPrecision<M, D2>
-    for ManagedDecimal<M, D1>
-{
-    fn mul_with_precision<T: Decimals>(
-        self,
-        other: ManagedDecimal<M, D2>,
-        precision: T,
-    ) -> ManagedDecimal<M, T> {
-        let scaled;
-        let new_data;
-        if self.decimals.num_decimals() >= other.decimals.num_decimals() {
-            scaled = other.rescale(self.scale());
-            new_data = self.data * scaled.data;
-        } else {
-            scaled = self.rescale(other.scale());
-            new_data = scaled.data * other.data;
-        }
-        ManagedDecimal {
-            data: new_data,
-            decimals: precision,
-        }
-    }
-}
-
-pub trait MulToPrecision<M: ManagedTypeApi, D: Decimals> {
-    fn mul_with_precision<T: Decimals>(
-        self,
-        other: ManagedDecimal<M, D>,
-        precision: T,
-    ) -> ManagedDecimal<M, T>;
-}
-
-impl<const DECIMALS: usize, M: ManagedTypeApi> Sub<ManagedDecimal<M, NumDecimals>>
-    for ManagedDecimal<M, ConstDecimals<DECIMALS>>
-{
-    type Output = ManagedDecimal<M, NumDecimals>;
-
-    fn sub(self, rhs: ManagedDecimal<M, NumDecimals>) -> Self::Output {
-        if DECIMALS >= rhs.decimals {
-            let scaled = rhs.rescale(self.scale());
-            ManagedDecimal {
-                data: self.data - scaled.data,
-                decimals: DECIMALS,
-            }
-        } else {
-            let scaled = self.rescale(rhs.scale());
-            ManagedDecimal {
-                data: scaled.data - rhs.data,
-                decimals: rhs.decimals,
-            }
-        }
-    }
-}
-
-impl<const DECIMALS: usize, M: ManagedTypeApi> Sub<ManagedDecimal<M, ConstDecimals<DECIMALS>>>
-    for ManagedDecimal<M, NumDecimals>
-{
-    type Output = Self;
-
-    fn sub(self, rhs: ManagedDecimal<M, ConstDecimals<DECIMALS>>) -> Self::Output {
-        if DECIMALS >= self.decimals {
-            let scaled = self.rescale(rhs.scale());
-            ManagedDecimal {
-                data: self.data - scaled.data,
-                decimals: DECIMALS,
-            }
-        } else {
-            let scaled = rhs.rescale(self.scale());
-            ManagedDecimal {
-                data: scaled.data - rhs.data,
-                decimals: self.decimals,
-            }
-        }
-    }
-}
-
-impl<const DECIMALS: usize, M: ManagedTypeApi> Add<ManagedDecimal<M, ConstDecimals<DECIMALS>>>
-    for ManagedDecimal<M, NumDecimals>
-{
-    type Output = Self;
-
-    fn add(self, other: ManagedDecimal<M, ConstDecimals<DECIMALS>>) -> Self::Output {
-        if DECIMALS >= self.decimals {
-            let scaled = self.rescale(other.scale());
-            ManagedDecimal {
-                data: self.data + scaled.data,
-                decimals: DECIMALS,
-            }
-        } else {
-            let scaled = other.rescale(self.scale());
-            ManagedDecimal {
-                data: scaled.data + other.data,
-                decimals: self.decimals,
-            }
-        }
-    }
-}
-
-impl<const DECIMALS: usize, M: ManagedTypeApi> Add<ManagedDecimal<M, NumDecimals>>
-    for ManagedDecimal<M, ConstDecimals<DECIMALS>>
-{
-    type Output = ManagedDecimal<M, NumDecimals>;
-
-    fn add(self, other: ManagedDecimal<M, NumDecimals>) -> Self::Output {
-        if DECIMALS >= other.decimals {
-            let scaled = other.rescale(self.scale());
-            ManagedDecimal {
-                data: self.data + scaled.data,
-                decimals: self.decimals.num_decimals(),
-            }
-        } else {
-            let scaled = self.rescale(other.scale());
-            ManagedDecimal {
-                data: scaled.data + other.data,
-                decimals: scaled.decimals,
-            }
-        }
-    }
-}
-
-impl<M: ManagedTypeApi, D: Decimals> Div<NumDecimals> for ManagedDecimal<M, D> {
-    type Output = Self;
-
-    fn div(self, other: NumDecimals) -> Self::Output {
-        ManagedDecimal {
-            data: self.data / BigUint::from(other),
-            decimals: self.decimals,
-        }
-    }
-}
-
-impl<M: ManagedTypeApi, D1: Decimals, D2: Decimals> Div<ManagedDecimal<M, D2>>
-    for ManagedDecimal<M, D1>
-where
-    D1: Sub<D2>,
-    <D1 as Sub<D2>>::Output: Decimals,
-{
-    type Output = ManagedDecimal<M, <D1 as Sub<D2>>::Output>;
-
-    // maybe rescale to highest first
-    fn div(self, other: ManagedDecimal<M, D2>) -> Self::Output {
-        ManagedDecimal {
-            data: self.data / other.data,
-            decimals: self.decimals - other.decimals,
-        }
-    }
-}
-impl<M: ManagedTypeApi, D1: Decimals, D2: Decimals> PartialEq<ManagedDecimal<M, D2>>
-    for ManagedDecimal<M, D1>
-{
-    fn eq(&self, other: &ManagedDecimal<M, D2>) -> bool {
-        match self
-            .decimals
-            .num_decimals()
-            .cmp(&other.decimals.num_decimals())
-        {
-            Ordering::Less => {
-                let diff_decimals = other.decimals.num_decimals() - self.decimals.num_decimals();
-                let scaling_factor: &BigUint<M> = &diff_decimals.scaling_factor();
-                &self.data * scaling_factor == other.data
-            },
-            Ordering::Equal => self.data == other.data,
-            Ordering::Greater => {
-                let diff_decimals = self.decimals.num_decimals() - other.decimals.num_decimals();
-                let scaling_factor: &BigUint<M> = &diff_decimals.scaling_factor();
-                &other.data * scaling_factor == self.data
-            },
-        }
-    }
-}
-
-impl<M: ManagedTypeApi, D1: Decimals, D2: Decimals> PartialOrd<ManagedDecimal<M, D2>>
-    for ManagedDecimal<M, D1>
-{
-    fn partial_cmp(&self, other: &ManagedDecimal<M, D2>) -> Option<Ordering> {
-        match self
-            .decimals
-            .num_decimals()
-            .cmp(&other.decimals.num_decimals())
-        {
-            Ordering::Less => {
-                let diff_decimals = other.decimals.num_decimals() - self.decimals.num_decimals();
-                let scaling_factor: &BigUint<M> = &diff_decimals.scaling_factor();
-
-                Some((&self.data * scaling_factor).cmp(&other.data))
-            },
-            Ordering::Equal => Some((self.data).cmp(&other.data)),
-            Ordering::Greater => {
-                let diff_decimals = self.decimals.num_decimals() - other.decimals.num_decimals();
-                let scaling_factor: &BigUint<M> = &diff_decimals.scaling_factor();
-                Some((&other.data * scaling_factor).cmp(&self.data))
-            },
-        }
-    }
-}
-
 impl<M: ManagedTypeApi> TypeAbiFrom<Self> for ManagedDecimal<M, NumDecimals> {}
 
 impl<M: ManagedTypeApi> TypeAbi for ManagedDecimal<M, NumDecimals> {
diff --git a/framework/base/src/types/managed/wrapped/managed_decimal_cmp.rs b/framework/base/src/types/managed/wrapped/managed_decimal_cmp.rs
new file mode 100644
index 0000000000..89a804aabd
--- /dev/null
+++ b/framework/base/src/types/managed/wrapped/managed_decimal_cmp.rs
@@ -0,0 +1,55 @@
+use core::cmp::Ordering;
+
+use crate::{
+    api::ManagedTypeApi,
+    types::{BigUint, Decimals, ManagedDecimal},
+};
+
+impl<M: ManagedTypeApi, D1: Decimals, D2: Decimals> PartialEq<ManagedDecimal<M, D2>>
+    for ManagedDecimal<M, D1>
+{
+    fn eq(&self, other: &ManagedDecimal<M, D2>) -> bool {
+        match self
+            .decimals
+            .num_decimals()
+            .cmp(&other.decimals.num_decimals())
+        {
+            Ordering::Less => {
+                let diff_decimals = other.decimals.num_decimals() - self.decimals.num_decimals();
+                let scaling_factor: &BigUint<M> = &diff_decimals.scaling_factor();
+                &self.data * scaling_factor == other.data
+            },
+            Ordering::Equal => self.data == other.data,
+            Ordering::Greater => {
+                let diff_decimals = self.decimals.num_decimals() - other.decimals.num_decimals();
+                let scaling_factor: &BigUint<M> = &diff_decimals.scaling_factor();
+                &other.data * scaling_factor == self.data
+            },
+        }
+    }
+}
+
+impl<M: ManagedTypeApi, D1: Decimals, D2: Decimals> PartialOrd<ManagedDecimal<M, D2>>
+    for ManagedDecimal<M, D1>
+{
+    fn partial_cmp(&self, other: &ManagedDecimal<M, D2>) -> Option<Ordering> {
+        match self
+            .decimals
+            .num_decimals()
+            .cmp(&other.decimals.num_decimals())
+        {
+            Ordering::Less => {
+                let diff_decimals = other.decimals.num_decimals() - self.decimals.num_decimals();
+                let scaling_factor: &BigUint<M> = &diff_decimals.scaling_factor();
+
+                Some((&self.data * scaling_factor).cmp(&other.data))
+            },
+            Ordering::Equal => Some((self.data).cmp(&other.data)),
+            Ordering::Greater => {
+                let diff_decimals = self.decimals.num_decimals() - other.decimals.num_decimals();
+                let scaling_factor: &BigUint<M> = &diff_decimals.scaling_factor();
+                Some((&other.data * scaling_factor).cmp(&self.data))
+            },
+        }
+    }
+}
diff --git a/framework/base/src/types/managed/wrapped/managed_decimal_macros.rs b/framework/base/src/types/managed/wrapped/managed_decimal_macros.rs
index 89693f73a6..c36cbe0a35 100644
--- a/framework/base/src/types/managed/wrapped/managed_decimal_macros.rs
+++ b/framework/base/src/types/managed/wrapped/managed_decimal_macros.rs
@@ -1,7 +1,7 @@
 use crate::types::ConstDecimals;
 use core::ops::{Add, Sub};
 
-pub const fn count_decimals(s: &str) -> usize {
+pub const fn _count_decimals(s: &str) -> usize {
     let bytes = s.as_bytes();
     let mut count = 0;
     let mut dot_found = false;
@@ -19,14 +19,15 @@ pub const fn count_decimals(s: &str) -> usize {
     count
 }
 
-pub const fn remove_dot(s: &str) -> u64 {
+pub const fn _remove_dot(s: &str) -> u64 {
     let bytes = s.as_bytes();
-    let mut result = 0;
+    let mut result = 0u64;
     let mut i = 0;
 
     while i < bytes.len() {
-        if bytes[i] != b'.' {
-            result = result * 10 + (bytes[i] - b'0') as u64;
+        let b = bytes[i];
+        if b != b'.' && b >= b'0' && b <= b'9' {
+            result = result * 10 + (b - b'0') as u64;
         }
         i += 1;
     }
@@ -39,8 +40,8 @@ macro_rules! const_managed_decimal {
         use $crate::types::managed::wrapped::managed_decimal_macros::{count_decimals, remove_dot};
 
         const STR: &str = stringify!($val);
-        const DECIMALS: usize = count_decimals(STR);
-        const RAW: u64 = remove_dot(STR);
+        const DECIMALS: usize = _count_decimals(STR);
+        const RAW: u64 = _remove_dot(STR);
         ManagedDecimal::<_, ConstDecimals<DECIMALS>>::const_decimals_from_raw(BigUint::from(RAW))
     }};
 }
@@ -51,8 +52,8 @@ macro_rules! managed_decimal {
         use $crate::types::managed::wrapped::managed_decimal_macros::{count_decimals, remove_dot};
 
         const STR: &str = stringify!($val);
-        const DECIMALS: usize = count_decimals(STR);
-        const RAW: u64 = remove_dot(STR);
+        const DECIMALS: usize = _count_decimals(STR);
+        const RAW: u64 = _remove_dot(STR);
         ManagedDecimal::<_, NumDecimals>::from_raw_units(BigUint::from(RAW), DECIMALS)
     }};
 }
diff --git a/framework/base/src/types/managed/wrapped/managed_decimal_operators.rs b/framework/base/src/types/managed/wrapped/managed_decimal_operators.rs
new file mode 100644
index 0000000000..18c577ef27
--- /dev/null
+++ b/framework/base/src/types/managed/wrapped/managed_decimal_operators.rs
@@ -0,0 +1,238 @@
+use crate::{
+    api::ManagedTypeApi,
+    types::{BigUint, ConstDecimals, Decimals, ManagedDecimal, NumDecimals},
+};
+
+use core::ops::{Add, AddAssign, Div, Mul, Sub, SubAssign};
+
+impl<M: ManagedTypeApi, const DECIMALS: NumDecimals> Add<ManagedDecimal<M, ConstDecimals<DECIMALS>>>
+    for ManagedDecimal<M, ConstDecimals<DECIMALS>>
+{
+    type Output = Self;
+
+    fn add(self, other: ManagedDecimal<M, ConstDecimals<DECIMALS>>) -> Self::Output {
+        ManagedDecimal::const_decimals_from_raw(self.data + other.data)
+    }
+}
+
+impl<M: ManagedTypeApi, const DECIMALS: NumDecimals> Sub<ManagedDecimal<M, ConstDecimals<DECIMALS>>>
+    for ManagedDecimal<M, ConstDecimals<DECIMALS>>
+{
+    type Output = Self;
+
+    fn sub(self, other: ManagedDecimal<M, ConstDecimals<DECIMALS>>) -> Self::Output {
+        ManagedDecimal::const_decimals_from_raw(self.data - other.data)
+    }
+}
+
+impl<M: ManagedTypeApi> Add<ManagedDecimal<M, NumDecimals>> for ManagedDecimal<M, NumDecimals> {
+    type Output = Self;
+
+    fn add(self, other: ManagedDecimal<M, NumDecimals>) -> Self::Output {
+        let scaled = other.rescale(self.scale());
+        ManagedDecimal::from_raw_units(&self.data + &scaled.data, scaled.decimals)
+    }
+}
+
+impl<M: ManagedTypeApi> Sub<ManagedDecimal<M, NumDecimals>> for ManagedDecimal<M, NumDecimals> {
+    type Output = Self;
+
+    fn sub(self, other: ManagedDecimal<M, NumDecimals>) -> Self::Output {
+        let scaled = other.rescale(self.scale());
+        ManagedDecimal::from_raw_units(&self.data - &scaled.data, scaled.decimals)
+    }
+}
+
+impl<M: ManagedTypeApi, D1: Decimals, D2: Decimals> Mul<ManagedDecimal<M, D2>>
+    for ManagedDecimal<M, D1>
+where
+    D1: Add<D2>,
+    <D1 as Add<D2>>::Output: Decimals,
+{
+    type Output = ManagedDecimal<M, <D1 as Add<D2>>::Output>;
+
+    fn mul(self, other: ManagedDecimal<M, D2>) -> Self::Output {
+        ManagedDecimal {
+            data: self.data * other.data,
+            decimals: self.decimals + other.decimals,
+        }
+    }
+}
+
+impl<M: ManagedTypeApi, D1: Decimals, D2: Decimals> MulToPrecision<M, D2>
+    for ManagedDecimal<M, D1>
+{
+    fn mul_with_precision<T: Decimals>(
+        self,
+        other: ManagedDecimal<M, D2>,
+        precision: T,
+    ) -> ManagedDecimal<M, T> {
+        let scaled;
+        let new_data;
+        if self.decimals.num_decimals() >= other.decimals.num_decimals() {
+            scaled = other.rescale(self.scale());
+            new_data = self.data * scaled.data;
+        } else {
+            scaled = self.rescale(other.scale());
+            new_data = scaled.data * other.data;
+        }
+        ManagedDecimal {
+            data: new_data,
+            decimals: precision,
+        }
+    }
+}
+
+pub trait MulToPrecision<M: ManagedTypeApi, D: Decimals> {
+    fn mul_with_precision<T: Decimals>(
+        self,
+        other: ManagedDecimal<M, D>,
+        precision: T,
+    ) -> ManagedDecimal<M, T>;
+}
+
+impl<const DECIMALS: usize, M: ManagedTypeApi> Sub<ManagedDecimal<M, NumDecimals>>
+    for ManagedDecimal<M, ConstDecimals<DECIMALS>>
+{
+    type Output = ManagedDecimal<M, NumDecimals>;
+
+    fn sub(self, rhs: ManagedDecimal<M, NumDecimals>) -> Self::Output {
+        if DECIMALS >= rhs.decimals {
+            let scaled = rhs.rescale(self.scale());
+            ManagedDecimal {
+                data: self.data - scaled.data,
+                decimals: DECIMALS,
+            }
+        } else {
+            let scaled = self.rescale(rhs.scale());
+            ManagedDecimal {
+                data: scaled.data - rhs.data,
+                decimals: rhs.decimals,
+            }
+        }
+    }
+}
+
+impl<const DECIMALS: usize, M: ManagedTypeApi> Sub<ManagedDecimal<M, ConstDecimals<DECIMALS>>>
+    for ManagedDecimal<M, NumDecimals>
+{
+    type Output = Self;
+
+    fn sub(self, rhs: ManagedDecimal<M, ConstDecimals<DECIMALS>>) -> Self::Output {
+        if DECIMALS >= self.decimals {
+            let scaled = self.rescale(rhs.scale());
+            ManagedDecimal {
+                data: self.data - scaled.data,
+                decimals: DECIMALS,
+            }
+        } else {
+            let scaled = rhs.rescale(self.scale());
+            ManagedDecimal {
+                data: scaled.data - rhs.data,
+                decimals: self.decimals,
+            }
+        }
+    }
+}
+
+impl<const DECIMALS: usize, M: ManagedTypeApi> Add<ManagedDecimal<M, ConstDecimals<DECIMALS>>>
+    for ManagedDecimal<M, NumDecimals>
+{
+    type Output = Self;
+
+    fn add(self, other: ManagedDecimal<M, ConstDecimals<DECIMALS>>) -> Self::Output {
+        if DECIMALS >= self.decimals {
+            let scaled = self.rescale(other.scale());
+            ManagedDecimal {
+                data: self.data + scaled.data,
+                decimals: DECIMALS,
+            }
+        } else {
+            let scaled = other.rescale(self.scale());
+            ManagedDecimal {
+                data: scaled.data + other.data,
+                decimals: self.decimals,
+            }
+        }
+    }
+}
+
+impl<const DECIMALS: usize, M: ManagedTypeApi> Add<ManagedDecimal<M, NumDecimals>>
+    for ManagedDecimal<M, ConstDecimals<DECIMALS>>
+{
+    type Output = ManagedDecimal<M, NumDecimals>;
+
+    fn add(self, other: ManagedDecimal<M, NumDecimals>) -> Self::Output {
+        if DECIMALS >= other.decimals {
+            let scaled = other.rescale(self.scale());
+            ManagedDecimal {
+                data: self.data + scaled.data,
+                decimals: self.decimals.num_decimals(),
+            }
+        } else {
+            let scaled = self.rescale(other.scale());
+            ManagedDecimal {
+                data: scaled.data + other.data,
+                decimals: scaled.decimals,
+            }
+        }
+    }
+}
+
+impl<M: ManagedTypeApi, D: Decimals> Div<NumDecimals> for ManagedDecimal<M, D> {
+    type Output = Self;
+
+    fn div(self, other: NumDecimals) -> Self::Output {
+        ManagedDecimal {
+            data: self.data / BigUint::from(other),
+            decimals: self.decimals,
+        }
+    }
+}
+
+impl<M: ManagedTypeApi, D1: Decimals, D2: Decimals> Div<ManagedDecimal<M, D2>>
+    for ManagedDecimal<M, D1>
+where
+    D1: Sub<D2>,
+    <D1 as Sub<D2>>::Output: Decimals,
+{
+    type Output = ManagedDecimal<M, <D1 as Sub<D2>>::Output>;
+
+    // maybe rescale to highest first
+    fn div(self, other: ManagedDecimal<M, D2>) -> Self::Output {
+        ManagedDecimal {
+            data: self.data / other.data,
+            decimals: self.decimals - other.decimals,
+        }
+    }
+}
+
+impl<M: ManagedTypeApi, const DECIMALS: usize> SubAssign
+    for ManagedDecimal<M, ConstDecimals<DECIMALS>>
+{
+    fn sub_assign(&mut self, rhs: Self) {
+        if DECIMALS >= rhs.decimals.num_decimals() {
+            let scaled = rhs.rescale(self.scale());
+            self.data -= scaled.data;
+        } else {
+            let scaled = self.rescale(rhs.scale());
+            self.data -= scaled.data;
+            self.decimals = rhs.decimals;
+        }
+    }
+}
+
+impl<M: ManagedTypeApi, const DECIMALS: usize> AddAssign
+    for ManagedDecimal<M, ConstDecimals<DECIMALS>>
+{
+    fn add_assign(&mut self, rhs: Self) {
+        if DECIMALS >= rhs.decimals.num_decimals() {
+            let scaled = rhs.rescale(self.scale());
+            self.data += scaled.data;
+        } else {
+            let scaled = self.rescale(rhs.scale());
+            self.data = scaled.data + rhs.data;
+            self.decimals = rhs.decimals;
+        }
+    }
+}
diff --git a/framework/base/src/types/managed/wrapped/mod.rs b/framework/base/src/types/managed/wrapped/mod.rs
index a07a604f0a..a85c86a6c9 100644
--- a/framework/base/src/types/managed/wrapped/mod.rs
+++ b/framework/base/src/types/managed/wrapped/mod.rs
@@ -8,7 +8,9 @@ mod esdt_token_payment;
 mod managed_address;
 mod managed_byte_array;
 mod managed_decimal;
+mod managed_decimal_cmp;
 mod managed_decimal_macros;
+mod managed_decimal_operators;
 mod managed_option;
 mod managed_ref;
 mod managed_vec;
@@ -34,6 +36,7 @@ pub use managed_address::ManagedAddress;
 pub(crate) use managed_byte_array::ManagedBufferSizeContext;
 pub use managed_byte_array::ManagedByteArray;
 pub use managed_decimal::{ConstDecimals, Decimals, ManagedDecimal, NumDecimals};
+pub use managed_decimal_operators::*;
 pub use managed_option::ManagedOption;
 pub use managed_ref::ManagedRef;
 pub use managed_vec::ManagedVec;
diff --git a/framework/scenario/tests/managed_decimal_test.rs b/framework/scenario/tests/managed_decimal_test.rs
index aa28b01b4a..e60af1d70f 100644
--- a/framework/scenario/tests/managed_decimal_test.rs
+++ b/framework/scenario/tests/managed_decimal_test.rs
@@ -81,6 +81,15 @@ pub fn test_managed_decimal() {
     );
 }
 
+// #[test]
+// fn test_managed_decimal_macros() {
+//     let three = const_managed_decimal!("1.654");
+//     assert_eq!(three.scale(), 3usize);
+
+//     let four = managed_decimal!("89632.2223");
+//     assert_eq!(four.scale(), 4usize);
+// }
+
 #[test]
 fn test_managed_decimal_conversion() {
     let fixed: ManagedDecimal<StaticApi, NumDecimals> =

From 6de200d4f4d96c96109d068dfd3109010cb3bec2 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Tue, 18 Jun 2024 05:46:39 +0200
Subject: [PATCH 0994/1254] proc macros in derive and tests

---
 .../managed/wrapped/managed_decimal_macros.rs | 57 -------------------
 .../src/format/managed_decimal_macro.rs       | 11 ++++
 framework/derive/src/format/mod.rs            |  2 +
 framework/derive/src/lib.rs                   | 48 ++++++++++++++++
 .../scenario/tests/managed_decimal_test.rs    | 28 ++++++---
 5 files changed, 82 insertions(+), 64 deletions(-)
 create mode 100644 framework/derive/src/format/managed_decimal_macro.rs

diff --git a/framework/base/src/types/managed/wrapped/managed_decimal_macros.rs b/framework/base/src/types/managed/wrapped/managed_decimal_macros.rs
index c36cbe0a35..ca6d8a3a3c 100644
--- a/framework/base/src/types/managed/wrapped/managed_decimal_macros.rs
+++ b/framework/base/src/types/managed/wrapped/managed_decimal_macros.rs
@@ -1,63 +1,6 @@
 use crate::types::ConstDecimals;
 use core::ops::{Add, Sub};
 
-pub const fn _count_decimals(s: &str) -> usize {
-    let bytes = s.as_bytes();
-    let mut count = 0;
-    let mut dot_found = false;
-
-    let mut i = 0;
-    while i < bytes.len() {
-        if dot_found {
-            count += 1;
-        }
-        if bytes[i] == b'.' {
-            dot_found = true;
-        }
-        i += 1;
-    }
-    count
-}
-
-pub const fn _remove_dot(s: &str) -> u64 {
-    let bytes = s.as_bytes();
-    let mut result = 0u64;
-    let mut i = 0;
-
-    while i < bytes.len() {
-        let b = bytes[i];
-        if b != b'.' && b >= b'0' && b <= b'9' {
-            result = result * 10 + (b - b'0') as u64;
-        }
-        i += 1;
-    }
-    result
-}
-
-#[macro_export]
-macro_rules! const_managed_decimal {
-    ($val:expr) => {{
-        use $crate::types::managed::wrapped::managed_decimal_macros::{count_decimals, remove_dot};
-
-        const STR: &str = stringify!($val);
-        const DECIMALS: usize = _count_decimals(STR);
-        const RAW: u64 = _remove_dot(STR);
-        ManagedDecimal::<_, ConstDecimals<DECIMALS>>::const_decimals_from_raw(BigUint::from(RAW))
-    }};
-}
-
-#[macro_export]
-macro_rules! managed_decimal {
-    ($val:expr) => {{
-        use $crate::types::managed::wrapped::managed_decimal_macros::{count_decimals, remove_dot};
-
-        const STR: &str = stringify!($val);
-        const DECIMALS: usize = _count_decimals(STR);
-        const RAW: u64 = _remove_dot(STR);
-        ManagedDecimal::<_, NumDecimals>::from_raw_units(BigUint::from(RAW), DECIMALS)
-    }};
-}
-
 macro_rules! add_sub_const_decimals {
     ($dec1:expr, $dec2:expr, $result_add:expr, $result_sub:expr) => {
         impl Add<ConstDecimals<$dec2>> for ConstDecimals<$dec1> {
diff --git a/framework/derive/src/format/managed_decimal_macro.rs b/framework/derive/src/format/managed_decimal_macro.rs
new file mode 100644
index 0000000000..c65adf56d5
--- /dev/null
+++ b/framework/derive/src/format/managed_decimal_macro.rs
@@ -0,0 +1,11 @@
+pub fn extract_number_data(input: syn::LitStr) -> (u64, usize) {
+    let value_str = input.value();
+
+    let parts: Vec<&str> = value_str.split('.').collect();
+    let raw_val = parts.join("");
+    let raw_int = raw_val.parse::<u64>().expect("Invalid integer value");
+
+    let decimals = if parts.len() > 1 { parts[1].len() } else { 0 };
+
+    (raw_int, decimals)
+}
diff --git a/framework/derive/src/format/mod.rs b/framework/derive/src/format/mod.rs
index a6d8e9c95c..555c0c356e 100644
--- a/framework/derive/src/format/mod.rs
+++ b/framework/derive/src/format/mod.rs
@@ -1,8 +1,10 @@
 mod format_args_macro;
 mod format_parts;
 mod format_tokenize;
+mod managed_decimal_macro;
 mod semver_tuple;
 
 pub use format_args_macro::*;
 pub use format_parts::*;
+pub use managed_decimal_macro::*;
 pub use semver_tuple::*;
diff --git a/framework/derive/src/lib.rs b/framework/derive/src/lib.rs
index 7f32bb2133..515aa3fc7d 100644
--- a/framework/derive/src/lib.rs
+++ b/framework/derive/src/lib.rs
@@ -73,3 +73,51 @@ pub fn format_receiver_args(input: proc_macro::TokenStream) -> proc_macro::Token
 pub fn semver_tuple(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
     format::semver_tuple(input.into()).into()
 }
+
+#[proc_macro]
+pub fn const_managed_decimal(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
+    let input = parse_macro_input!(input as syn::LitStr);
+    let (raw_int, decimals) = format::extract_number_data(input);
+
+    let expanded = quote! {
+        multiversx_sc::types::ManagedDecimal::<<Self as ContractBase>::Api, multiversx_sc::types::ConstDecimals<#decimals>>::const_decimals_from_raw(multiversx_sc::types::BigUint::from(#raw_int))
+    };
+
+    proc_macro::TokenStream::from(expanded)
+}
+
+#[proc_macro]
+pub fn managed_decimal(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
+    let input = parse_macro_input!(input as syn::LitStr);
+    let (raw_int, decimals) = format::extract_number_data(input);
+
+    let expanded = quote! {
+        multiversx_sc::types::ManagedDecimal::<<Self as ContractBase>::Api, usize>::from_raw_units(multiversx_sc::types::BigUint::from(#raw_int), #decimals)
+    };
+
+    proc_macro::TokenStream::from(expanded)
+}
+
+#[proc_macro]
+pub fn debug_const_managed_decimal(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
+    let input = parse_macro_input!(input as syn::LitStr);
+    let (raw_int, decimals) = format::extract_number_data(input);
+
+    let expanded = quote! {
+        multiversx_sc::types::ManagedDecimal::<multiversx_sc_scenario::imports::StaticApi, multiversx_sc::types::ConstDecimals<#decimals>>::const_decimals_from_raw(multiversx_sc::types::BigUint::from(#raw_int))
+    };
+
+    proc_macro::TokenStream::from(expanded)
+}
+
+#[proc_macro]
+pub fn debug_managed_decimal(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
+    let input = parse_macro_input!(input as syn::LitStr);
+    let (raw_int, decimals) = format::extract_number_data(input);
+
+    let expanded = quote! {
+        multiversx_sc::types::ManagedDecimal::<multiversx_sc_scenario::imports::StaticApi, usize>::from_raw_units(multiversx_sc::types::BigUint::from(#raw_int), #decimals)
+    };
+
+    proc_macro::TokenStream::from(expanded)
+}
diff --git a/framework/scenario/tests/managed_decimal_test.rs b/framework/scenario/tests/managed_decimal_test.rs
index e60af1d70f..04aa909b33 100644
--- a/framework/scenario/tests/managed_decimal_test.rs
+++ b/framework/scenario/tests/managed_decimal_test.rs
@@ -1,5 +1,6 @@
 use multiversx_sc::{
     codec::test_util::{check_dep_encode_decode, check_top_encode_decode},
+    derive::{debug_const_managed_decimal, debug_managed_decimal},
     types::{BigFloat, BigUint, ConstDecimals, ManagedDecimal, NumDecimals},
 };
 use multiversx_sc_scenario::api::StaticApi;
@@ -81,14 +82,27 @@ pub fn test_managed_decimal() {
     );
 }
 
-// #[test]
-// fn test_managed_decimal_macros() {
-//     let three = const_managed_decimal!("1.654");
-//     assert_eq!(three.scale(), 3usize);
+#[test]
+fn test_managed_decimal_macros() {
+    let small = debug_managed_decimal!("3.1");
+    assert_eq!(small.scale(), 1usize);
+    assert_eq!(small.into_raw_units(), &BigUint::from(31u64));
+    assert_eq!(&small.trunc(), &BigUint::from(3u64));
 
-//     let four = managed_decimal!("89632.2223");
-//     assert_eq!(four.scale(), 4usize);
-// }
+    let three = debug_const_managed_decimal!("1.654");
+    assert_eq!(three.scale(), 3usize);
+
+    let four = debug_managed_decimal!("89632.2223");
+    assert_eq!(four.scale(), 4usize);
+
+    let huge = debug_const_managed_decimal!("8723.283764652365232");
+    assert_eq!(huge.scale(), 15usize);
+    assert_eq!(
+        huge.into_raw_units(),
+        &BigUint::from(8723283764652365232u64)
+    );
+    assert_eq!(&huge.trunc(), &BigUint::from(8723u64));
+}
 
 #[test]
 fn test_managed_decimal_conversion() {

From 2746c230a79d001bc73e4217921d59d022f198d5 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Tue, 18 Jun 2024 05:59:57 +0200
Subject: [PATCH 0995/1254] build fix

---
 contracts/feature-tests/abi-tester/src/abi_test_type.rs  | 3 ++-
 .../base/src/types/managed/wrapped/managed_decimal.rs    | 9 ++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/contracts/feature-tests/abi-tester/src/abi_test_type.rs b/contracts/feature-tests/abi-tester/src/abi_test_type.rs
index 2928e81c89..f4a9219662 100644
--- a/contracts/feature-tests/abi-tester/src/abi_test_type.rs
+++ b/contracts/feature-tests/abi-tester/src/abi_test_type.rs
@@ -43,7 +43,8 @@ pub struct OnlyShowsUpInEsdtAttr {
     pub field: OnlyShowsUpAsNested10,
 }
 
-#[derive(TypeAbi)]
+#[type_abi]
 pub struct ManagedDecimalWrapper<M: ManagedTypeApi> {
+    #[allow(dead_code)]
     pub field: ManagedDecimal<M, ConstDecimals<2>>,
 }
diff --git a/framework/base/src/types/managed/wrapped/managed_decimal.rs b/framework/base/src/types/managed/wrapped/managed_decimal.rs
index 9b7872899e..0dd9b53d0c 100644
--- a/framework/base/src/types/managed/wrapped/managed_decimal.rs
+++ b/framework/base/src/types/managed/wrapped/managed_decimal.rs
@@ -8,9 +8,8 @@ use crate::{
 };
 
 use multiversx_sc_codec::{
-    num_bigint::ToBigUint, DecodeError, DecodeErrorHandler, EncodeErrorHandler, NestedDecode,
-    NestedDecodeInput, NestedEncode, NestedEncodeOutput, TopDecode, TopDecodeInput, TopEncode,
-    TopEncodeOutput,
+    DecodeError, DecodeErrorHandler, EncodeErrorHandler, NestedDecode, NestedDecodeInput,
+    NestedEncode, NestedEncodeOutput, TopDecode, TopDecodeInput, TopEncode, TopEncodeOutput,
 };
 
 use core::{cmp::Ordering, ops::Deref};
@@ -181,8 +180,8 @@ impl<M: ManagedTypeApi, const DECIMALS: NumDecimals> ManagedDecimal<M, ConstDeci
         // find the highest power of 2 less than or equal to self
         let log2 = self.data.log2() - num_decimals * BigUint::<M>::from(10u64).log2(); // most significant bit for the actual number
         let divisor = 1 << log2;
-        let divisor_scaled = BigUint::<M>::from(divisor.to_biguint().unwrap())
-            * self.decimals.scaling_factor().clone_value();
+        let divisor_scaled =
+            BigUint::<M>::from(divisor as u64) * self.decimals.scaling_factor().clone_value();
         let _normalized = self.data / divisor_scaled; // normalize to [1.0, 2.0]
         let x_dec = ManagedDecimal::<M, ConstDecimals<0>>::const_decimals_from_raw(_normalized);
         let x = x_dec.rescale(precision.clone());

From b3204563d030c63925ea97daa3f64bb0d7798e94 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 18 Jun 2024 09:10:03 +0300
Subject: [PATCH 0996/1254] plotters - cleanup

---
 tools/plotter/build-wasm.sh   | 18 ++++++++++++++++++
 tools/plotter/src/lib.rs      | 10 ----------
 tools/plotter/start-server.sh | 15 +--------------
 tools/plotter/www/index.html  |  1 -
 tools/plotter/www/index.js    |  4 ----
 5 files changed, 19 insertions(+), 29 deletions(-)
 create mode 100755 tools/plotter/build-wasm.sh

diff --git a/tools/plotter/build-wasm.sh b/tools/plotter/build-wasm.sh
new file mode 100755
index 0000000000..fc7fe6fb1b
--- /dev/null
+++ b/tools/plotter/build-wasm.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+set -e
+
+CONFIG=release
+
+rustup target add wasm32-unknown-unknown
+
+if [ -z "$(cargo install --list | grep wasm-pack)" ]
+then
+	cargo install wasm-pack
+fi
+
+if [ "${CONFIG}" = "release" ]
+then
+    wasm-pack build
+else 
+    wasm-pack build --release
+fi
diff --git a/tools/plotter/src/lib.rs b/tools/plotter/src/lib.rs
index 37940ab944..c703856617 100644
--- a/tools/plotter/src/lib.rs
+++ b/tools/plotter/src/lib.rs
@@ -2,7 +2,6 @@ use wasm_bindgen::prelude::*;
 use web_sys::HtmlCanvasElement;
 
 mod func_plot;
-mod mandelbrot;
 mod plot3d;
 mod logarithm;
 
@@ -44,15 +43,6 @@ impl Chart {
         })
     }
 
-    /// Draw Mandelbrot set on the provided canvas element.
-    /// Return `Chart` struct suitable for coordinate conversion.
-    pub fn mandelbrot(canvas: HtmlCanvasElement) -> Result<Chart, JsValue> {
-        let map_coord = mandelbrot::draw(canvas).map_err(|err| err.to_string())?;
-        Ok(Chart {
-            convert: Box::new(map_coord),
-        })
-    }
-
     pub fn plot3d(canvas: HtmlCanvasElement, pitch: f64, yaw: f64) -> Result<(), JsValue> {
         plot3d::draw(canvas, pitch, yaw).map_err(|err| err.to_string())?;
         Ok(())
diff --git a/tools/plotter/start-server.sh b/tools/plotter/start-server.sh
index d8ba0e6562..09641b1a03 100755
--- a/tools/plotter/start-server.sh
+++ b/tools/plotter/start-server.sh
@@ -1,22 +1,9 @@
 #!/bin/bash
 set -e
 
-CONFIG=release
 mkdir -p www/pkg
 
-rustup target add wasm32-unknown-unknown
-
-if [ -z "$(cargo install --list | grep wasm-pack)" ]
-then
-	cargo install wasm-pack
-fi
-
-if [ "${CONFIG}" = "release" ]
-then
-    wasm-pack build
-else 
-    wasm-pack build --release
-fi
+./build-wasm.sh
 
 cd www
 npm install
diff --git a/tools/plotter/www/index.html b/tools/plotter/www/index.html
index 826d3ac9ba..5a68c73ed3 100644
--- a/tools/plotter/www/index.html
+++ b/tools/plotter/www/index.html
@@ -24,7 +24,6 @@ <h1>Plotters WebAssembly Demo</h1>
 				<option value="4">Graph of y=x^4</option>
 				<option value="5">Graph of y=x^5</option>
 				<option value="logarithm">Logarithms</option>
-				<option value="mandelbrot">Mandelbrot Set</option>
 				<option value="3d-plot">3D Plot Demo</option>
 			</select>
 			<div id="3d-control" class="hide">
diff --git a/tools/plotter/www/index.js b/tools/plotter/www/index.js
index e84a500080..e6cae453c5 100644
--- a/tools/plotter/www/index.js
+++ b/tools/plotter/www/index.js
@@ -85,10 +85,6 @@ function updatePlot() {
     chart = null;
     const start = performance.now();
 	switch(selected.value) {
-		case "mandelbrot":
-			control.classList.add("hide");
-			chart = Chart.mandelbrot(canvas);
-			break;
 		case "logarithm": 
 			control.classList.add("hide");
 			chart = Chart.logarithm("canvas");

From c6d1357eef82a12928c5ea7d85527c565cd3e0d4 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 18 Jun 2024 14:10:20 +0300
Subject: [PATCH 0997/1254] plotters - basic logarithm

---
 tools/plotter/src/lib.rs        |  4 +-
 tools/plotter/src/logarithm.rs  | 19 ++++++----
 tools/plotter/src/mandelbrot.rs | 67 ---------------------------------
 tools/plotter/www/index.html    |  3 ++
 tools/plotter/www/index.js      | 18 +++++++--
 5 files changed, 31 insertions(+), 80 deletions(-)
 delete mode 100644 tools/plotter/src/mandelbrot.rs

diff --git a/tools/plotter/src/lib.rs b/tools/plotter/src/lib.rs
index c703856617..838fea4ab7 100644
--- a/tools/plotter/src/lib.rs
+++ b/tools/plotter/src/lib.rs
@@ -36,8 +36,8 @@ impl Chart {
         })
     }
 
-    pub fn logarithm(canvas_id: &str) -> Result<Chart, JsValue> {
-        let map_coord = logarithm::draw(canvas_id).map_err(|err| err.to_string())?;
+    pub fn logarithm(canvas: HtmlCanvasElement, max_x: f32) -> Result<Chart, JsValue> {
+        let map_coord = logarithm::draw(canvas, max_x).map_err(|err| err.to_string())?;
         Ok(Chart {
             convert: Box::new(move |coord| map_coord(coord).map(|(x, y)| (x.into(), y.into()))),
         })
diff --git a/tools/plotter/src/logarithm.rs b/tools/plotter/src/logarithm.rs
index 797e67c1a8..62dbfdad0a 100644
--- a/tools/plotter/src/logarithm.rs
+++ b/tools/plotter/src/logarithm.rs
@@ -1,27 +1,30 @@
 use crate::DrawResult;
 use plotters::prelude::*;
 use plotters_canvas::CanvasBackend;
+use web_sys::HtmlCanvasElement;
 
-/// Draw power function f(x) = x^power.
-pub fn draw(canvas_id: &str) -> DrawResult<impl Fn((i32, i32)) -> Option<(f32, f32)>> {
-    let backend = CanvasBackend::new(canvas_id).expect("cannot find canvas");
-    let root = backend.into_drawing_area();
+pub fn draw(canvas: HtmlCanvasElement, max_x: f32) -> DrawResult<impl Fn((i32, i32)) -> Option<(f32, f32)>> {
+    let root = CanvasBackend::with_canvas_object(canvas)
+        .unwrap()
+        .into_drawing_area();
+    
     let font: FontDesc = ("sans-serif", 20.0).into();
 
     root.fill(&WHITE)?;
 
     let mut chart = ChartBuilder::on(&root)
         .margin(20u32)
-        .caption(format!("y=ln(x)"), font)
+        .caption(format!("y=ln(x), x=1..{max_x}"), font)
         .x_label_area_size(30u32)
         .y_label_area_size(30u32)
-        .build_cartesian_2d(0f32..50f32, -10f32..10f32)?;
+        .build_cartesian_2d(0f32..max_x, -10f32..10f32)?;
 
     chart.configure_mesh().x_labels(3).y_labels(3).draw()?;
 
+    const RANGE_MAX: i32 = 1000;
     chart.draw_series(LineSeries::new(
-        (0..=500)
-            .map(|x| x as f32 / 10f32)
+        (0..=RANGE_MAX)
+            .map(|x| x as f32 * max_x / RANGE_MAX as f32)
             .map(|x| (x, x.ln())),
         &RED,
     ))?;
diff --git a/tools/plotter/src/mandelbrot.rs b/tools/plotter/src/mandelbrot.rs
deleted file mode 100644
index 6c6bc9ae8a..0000000000
--- a/tools/plotter/src/mandelbrot.rs
+++ /dev/null
@@ -1,67 +0,0 @@
-use crate::DrawResult;
-use plotters::prelude::*;
-use plotters_canvas::CanvasBackend;
-use std::ops::Range;
-use web_sys::HtmlCanvasElement;
-
-/// Draw Mandelbrot set
-pub fn draw(element: HtmlCanvasElement) -> DrawResult<impl Fn((i32, i32)) -> Option<(f64, f64)>> {
-    let backend = CanvasBackend::with_canvas_object(element).unwrap();
-
-    let root = backend.into_drawing_area();
-    root.fill(&WHITE)?;
-
-    let mut chart = ChartBuilder::on(&root)
-        .margin(20)
-        .x_label_area_size(10)
-        .y_label_area_size(10)
-        .build_cartesian_2d(-2.1..0.6, -1.2..1.2)?;
-
-    chart
-        .configure_mesh()
-        .disable_x_mesh()
-        .disable_y_mesh()
-        .draw()?;
-
-    let plotting_area = chart.plotting_area();
-
-    let range = plotting_area.get_pixel_range();
-    let (pw, ph) = (range.0.end - range.0.start, range.1.end - range.1.start);
-    let (xr, yr) = (chart.x_range(), chart.y_range());
-
-    for (x, y, c) in mandelbrot_set(xr, yr, (pw as usize, ph as usize), 100) {
-        if c != 100 {
-            plotting_area.draw_pixel((x, y), &HSLColor(c as f64 / 100.0, 1.0, 0.5))?;
-        } else {
-            plotting_area.draw_pixel((x, y), &BLACK)?;
-        }
-    }
-
-    root.present()?;
-    return Ok(Box::new(chart.into_coord_trans()));
-}
-
-fn mandelbrot_set(
-    real: Range<f64>,
-    complex: Range<f64>,
-    samples: (usize, usize),
-    max_iter: usize,
-) -> impl Iterator<Item = (f64, f64, usize)> {
-    let step = (
-        (real.end - real.start) / samples.0 as f64,
-        (complex.end - complex.start) / samples.1 as f64,
-    );
-    return (0..(samples.0 * samples.1)).map(move |k| {
-        let c = (
-            real.start + step.0 * (k % samples.0) as f64,
-            complex.start + step.1 * (k / samples.0) as f64,
-        );
-        let mut z = (0.0, 0.0);
-        let mut cnt = 0;
-        while cnt < max_iter && z.0 * z.0 + z.1 * z.1 <= 1e10 {
-            z = (z.0 * z.0 - z.1 * z.1 + c.0, 2.0 * z.0 * z.1 + c.1);
-            cnt += 1;
-        }
-        return (c.0, c.1, cnt);
-    });
-}
diff --git a/tools/plotter/www/index.html b/tools/plotter/www/index.html
index 5a68c73ed3..c463175603 100644
--- a/tools/plotter/www/index.html
+++ b/tools/plotter/www/index.html
@@ -30,6 +30,9 @@ <h1>Plotters WebAssembly Demo</h1>
 				<label for="pitch">Pitch: </label> <input type="range" min="0" max="157" id="pitch" value="10"> <br/>
 				<label for="yaw">Yaw: </label> <input type="range" min="0" max="314" id="yaw" value="50">
 			</div>
+			<div id="logControl" class="hide">
+				<label for="logMax">Max value: </label> <input id="logMax" type="range" min="1" max="100" value="10">
+			</div>
 	    </div>
 	</main>
 	<footer>
diff --git a/tools/plotter/www/index.js b/tools/plotter/www/index.js
index e6cae453c5..ac24813e59 100644
--- a/tools/plotter/www/index.js
+++ b/tools/plotter/www/index.js
@@ -7,7 +7,9 @@ const coord = document.getElementById("coord");
 const plotType = document.getElementById("plot-type");
 const pitch = document.getElementById("pitch");
 const yaw = document.getElementById("yaw");
+const logMax = document.getElementById("logMax");
 const control = document.getElementById("3d-control");
+const logControl = document.getElementById("logControl");
 const status = document.getElementById("status");
 
 let chart = null;
@@ -37,6 +39,7 @@ function setupUI() {
 	pitch.addEventListener("change", updatePlot);
 	yaw.addEventListener("input", updatePlot);
 	pitch.addEventListener("input", updatePlot);
+	logMax.addEventListener("input", updatePlot);
     window.addEventListener("resize", setupCanvas);
     window.addEventListener("mousemove", onMouseMove);
 }
@@ -78,6 +81,9 @@ function updatePlot3d() {
 	coord.innerText = `Pitch:${pitch_value}, Yaw:${yaw_value}`
 }
 
+function updateLogarithm() {
+}
+
 /** Redraw currently selected plot. */
 function updatePlot() {
     const selected = plotType.selectedOptions[0];
@@ -87,18 +93,24 @@ function updatePlot() {
 	switch(selected.value) {
 		case "logarithm": 
 			control.classList.add("hide");
-			chart = Chart.logarithm("canvas");
+			logControl.classList.remove("hide");
+			updateLogarithm();
+			let logMaxValue = Number(logMax.value);
+			status.innerText = `Updated log: ${logMaxValue}`
+			chart = Chart.logarithm(canvas, Number(logMaxValue));
+			coord.innerText = `Updated log: ${logMaxValue}`
 			break;
 		case "3d-plot": 
 			control.classList.remove("hide");
+			logControl.classList.add("hide");
 			updatePlot3d();
 			break;
 		default:
 			control.classList.add("hide");
+			logControl.classList.add("hide");
 			chart = Chart.power("canvas", Number(selected.value));
-			// chart = null;
 	}
 	
     const end = performance.now();
-    status.innerText = `Rendered ${selected.innerText} in ${Math.ceil(end - start)}ms`;
+    // status.innerText = `Rendered ${selected.innerText} in ${Math.ceil(end - start)}ms`;
 }

From b1750672429547bdc4902f8e6827401963e9251a Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 18 Jun 2024 15:33:01 +0300
Subject: [PATCH 0998/1254] ploters - 2nd line (log2)

---
 tools/plotter/src/logarithm.rs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/tools/plotter/src/logarithm.rs b/tools/plotter/src/logarithm.rs
index 62dbfdad0a..6e2453c2e0 100644
--- a/tools/plotter/src/logarithm.rs
+++ b/tools/plotter/src/logarithm.rs
@@ -29,6 +29,13 @@ pub fn draw(canvas: HtmlCanvasElement, max_x: f32) -> DrawResult<impl Fn((i32, i
         &RED,
     ))?;
 
+    chart.draw_series(LineSeries::new(
+        (0..=RANGE_MAX)
+            .map(|x| x as f32 * max_x / RANGE_MAX as f32)
+            .map(|x| (x, x.log2())),
+        &GREEN,
+    ))?;
+
     root.present()?;
     return Ok(chart.into_coord_trans());
 }

From 0bbede253c9e6d6b3909daf1a6a3b9cf356ed581 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 18 Jun 2024 18:12:31 +0300
Subject: [PATCH 0999/1254] removed multiversx-sdk dependency from
 multiversx-sc-scenario

---
 Cargo.lock                                    | 445 +++++++++++++++---
 framework/scenario/Cargo.toml                 |   4 -
 .../scenario/model/transaction/tx_response.rs |   5 -
 framework/snippets/src/network_response.rs    |  71 ++-
 .../tests/test_tx_multiple_sc_results.rs      |   6 +-
 sdk/core/src/data/transaction.rs              |   3 +-
 6 files changed, 417 insertions(+), 117 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ec245b66b9..3688019cce 100755
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -130,9 +130,9 @@ dependencies = [
 
 [[package]]
 name = "anstyle-query"
-version = "1.0.3"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a64c907d4e79225ac72e2a354c9ce84d50ebb4586dee56c82b3ee73004f537f5"
+checksum = "ad186efb764318d35165f1758e7dcef3b10628e26d41a44bc5550652e6804391"
 dependencies = [
  "windows-sys 0.52.0",
 ]
@@ -182,9 +182,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "backtrace"
-version = "0.3.72"
+version = "0.3.73"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17c6a35df3749d2e8bb1b7b21a976d82b15548788d2735b9d82f329268f71a11"
+checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a"
 dependencies = [
  "addr2line",
  "cc",
@@ -384,9 +384,9 @@ checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9"
 
 [[package]]
 name = "cc"
-version = "1.0.98"
+version = "1.0.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f"
+checksum = "96c51067fd44124faa7f870b4b1c969379ad32b2ba805aa959430ceaa384f695"
 
 [[package]]
 name = "cfg-if"
@@ -431,9 +431,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.4"
+version = "4.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0"
+checksum = "5db83dced34638ad474f39f250d7fea9598bdd239eaced1bdf45d597da0f433f"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -441,9 +441,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.2"
+version = "4.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4"
+checksum = "f7e204572485eb3fbf28f871612191521df159bc3e15a9f5064c66dba3a8c05f"
 dependencies = [
  "anstream",
  "anstyle",
@@ -453,9 +453,9 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.5.4"
+version = "4.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64"
+checksum = "c780290ccf4fb26629baa7a1081e68ced113f1d3ec302fa5948f1c381ebf06c6"
 dependencies = [
  "heck",
  "proc-macro2",
@@ -465,9 +465,9 @@ dependencies = [
 
 [[package]]
 name = "clap_lex"
-version = "0.7.0"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce"
+checksum = "4b82cf0babdbd58558212896d1a4272303a57bdb245c2bf1147185fb45640e70"
 
 [[package]]
 name = "colorchoice"
@@ -1388,12 +1388,12 @@ dependencies = [
 
 [[package]]
 name = "http-body-util"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d"
+checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f"
 dependencies = [
  "bytes",
- "futures-core",
+ "futures-util",
  "http",
  "http-body",
  "pin-project-lite",
@@ -1401,9 +1401,9 @@ dependencies = [
 
 [[package]]
 name = "httparse"
-version = "1.8.0"
+version = "1.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904"
+checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9"
 
 [[package]]
 name = "humantime"
@@ -1431,6 +1431,23 @@ dependencies = [
  "want",
 ]
 
+[[package]]
+name = "hyper-rustls"
+version = "0.27.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155"
+dependencies = [
+ "futures-util",
+ "http",
+ "hyper",
+ "hyper-util",
+ "rustls",
+ "rustls-pki-types",
+ "tokio",
+ "tokio-rustls",
+ "tower-service",
+]
+
 [[package]]
 name = "hyper-tls"
 version = "0.6.0"
@@ -1467,14 +1484,134 @@ dependencies = [
  "tracing",
 ]
 
+[[package]]
+name = "icu_collections"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526"
+dependencies = [
+ "displaydoc",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637"
+dependencies = [
+ "displaydoc",
+ "litemap",
+ "tinystr",
+ "writeable",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid_transform"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_locid_transform_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid_transform_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e"
+
+[[package]]
+name = "icu_normalizer"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_normalizer_data",
+ "icu_properties",
+ "icu_provider",
+ "smallvec",
+ "utf16_iter",
+ "utf8_iter",
+ "write16",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_normalizer_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516"
+
+[[package]]
+name = "icu_properties"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f8ac670d7422d7f76b32e17a5db556510825b29ec9154f235977c9caba61036"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_locid_transform",
+ "icu_properties_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_properties_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569"
+
+[[package]]
+name = "icu_provider"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_provider_macros",
+ "stable_deref_trait",
+ "tinystr",
+ "writeable",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_provider_macros"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "idna"
-version = "0.5.0"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
+checksum = "4716a3a0933a1d01c2f72450e89596eb51dd34ef3c211ccd875acdf1f8fe47ed"
 dependencies = [
- "unicode-bidi",
- "unicode-normalization",
+ "icu_normalizer",
+ "icu_properties",
+ "smallvec",
+ "utf8_iter",
 ]
 
 [[package]]
@@ -1674,6 +1811,12 @@ version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
 
+[[package]]
+name = "litemap"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704"
+
 [[package]]
 name = "local-esdt-and-nft"
 version = "0.0.0"
@@ -1781,9 +1924,9 @@ dependencies = [
 
 [[package]]
 name = "memchr"
-version = "2.7.2"
+version = "2.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d"
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
 
 [[package]]
 name = "mime"
@@ -1793,9 +1936,9 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
 
 [[package]]
 name = "miniz_oxide"
-version = "0.7.3"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae"
+checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
 dependencies = [
  "adler",
 ]
@@ -2031,7 +2174,6 @@ dependencies = [
  "multiversx-chain-vm-executor",
  "multiversx-sc",
  "multiversx-sc-meta-lib",
- "multiversx-sdk",
  "num-bigint",
  "num-traits",
  "pathdiff",
@@ -2234,9 +2376,9 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.35.0"
+version = "0.36.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8ec7ab813848ba4522158d5517a6093db1ded27575b070f4177b8d12b41db5e"
+checksum = "576dfe1fc8f9df304abb159d767a29d0476f7750fbf8aa7ad07816004a207434"
 dependencies = [
  "memchr",
 ]
@@ -2704,18 +2846,18 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.5.1"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e"
+checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd"
 dependencies = [
  "bitflags 2.5.0",
 ]
 
 [[package]]
 name = "regex"
-version = "1.10.4"
+version = "1.10.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c"
+checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -2725,9 +2867,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.6"
+version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea"
+checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -2736,15 +2878,15 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.3"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56"
+checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
 
 [[package]]
 name = "reqwest"
-version = "0.12.4"
+version = "0.12.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10"
+checksum = "c7d6d2a27d57148378eb5e111173f4276ad26340ecc5c49a4a2152167a2d6a37"
 dependencies = [
  "base64",
  "bytes",
@@ -2757,6 +2899,7 @@ dependencies = [
  "http-body",
  "http-body-util",
  "hyper",
+ "hyper-rustls",
  "hyper-tls",
  "hyper-util",
  "ipnet",
@@ -2800,6 +2943,21 @@ dependencies = [
  "rewards-distribution",
 ]
 
+[[package]]
+name = "ring"
+version = "0.17.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d"
+dependencies = [
+ "cc",
+ "cfg-if",
+ "getrandom 0.2.15",
+ "libc",
+ "spin",
+ "untrusted",
+ "windows-sys 0.52.0",
+]
+
 [[package]]
 name = "ruplacer"
 version = "0.8.2"
@@ -2881,6 +3039,19 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
+[[package]]
+name = "rustls"
+version = "0.23.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05cff451f60db80f490f3c182b77c35260baace73209e9cdbbe526bfe3a4d402"
+dependencies = [
+ "once_cell",
+ "rustls-pki-types",
+ "rustls-webpki",
+ "subtle",
+ "zeroize",
+]
+
 [[package]]
 name = "rustls-pemfile"
 version = "2.1.2"
@@ -2897,6 +3068,17 @@ version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d"
 
+[[package]]
+name = "rustls-webpki"
+version = "0.102.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff448f7e92e913c4b7d4c6d8e4540a1724b319b4152b8aef6d4cf8339712b33e"
+dependencies = [
+ "ring",
+ "rustls-pki-types",
+ "untrusted",
+]
+
 [[package]]
 name = "ryu"
 version = "1.0.18"
@@ -3200,6 +3382,18 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
+[[package]]
+name = "spin"
+version = "0.9.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
+
+[[package]]
+name = "stable_deref_trait"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
+
 [[package]]
 name = "str-repeat"
 version = "0.0.0"
@@ -3241,9 +3435,20 @@ dependencies = [
 
 [[package]]
 name = "sync_wrapper"
-version = "0.1.2"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160"
+checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394"
+
+[[package]]
+name = "synstructure"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
 
 [[package]]
 name = "system-configuration"
@@ -3298,6 +3503,16 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "tinystr"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f"
+dependencies = [
+ "displaydoc",
+ "zerovec",
+]
+
 [[package]]
 name = "tinyvec"
 version = "1.6.0"
@@ -3331,9 +3546,9 @@ dependencies = [
 
 [[package]]
 name = "tokio"
-version = "1.37.0"
+version = "1.38.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787"
+checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a"
 dependencies = [
  "backtrace",
  "bytes",
@@ -3350,9 +3565,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-macros"
-version = "2.2.0"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
+checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3369,6 +3584,17 @@ dependencies = [
  "tokio",
 ]
 
+[[package]]
+name = "tokio-rustls"
+version = "0.26.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4"
+dependencies = [
+ "rustls",
+ "rustls-pki-types",
+ "tokio",
+]
+
 [[package]]
 name = "tokio-util"
 version = "0.7.11"
@@ -3384,9 +3610,9 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.8.13"
+version = "0.8.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4e43f8cc456c9704c851ae29c67e17ef65d2c30017c17a9765b89c382dc8bba"
+checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335"
 dependencies = [
  "indexmap",
  "serde",
@@ -3406,9 +3632,9 @@ dependencies = [
 
 [[package]]
 name = "toml_edit"
-version = "0.22.13"
+version = "0.22.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c127785850e8c20836d49732ae6abfa47616e60bf9d9f57c43c250361a9db96c"
+checksum = "f21c7aaf97f1bd9ca9d4f9e73b0a6c74bd5afef56f2bc931943a6e1c37e04e38"
 dependencies = [
  "indexmap",
  "serde",
@@ -3493,12 +3719,6 @@ version = "1.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
 
-[[package]]
-name = "unicode-bidi"
-version = "0.3.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
-
 [[package]]
 name = "unicode-ident"
 version = "1.0.12"
@@ -3520,6 +3740,12 @@ version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
 
+[[package]]
+name = "untrusted"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
+
 [[package]]
 name = "unwrap-infallible"
 version = "0.1.5"
@@ -3528,9 +3754,9 @@ checksum = "151ac09978d3c2862c4e39b557f4eceee2cc72150bc4cb4f16abf061b6e381fb"
 
 [[package]]
 name = "url"
-version = "2.5.0"
+version = "2.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633"
+checksum = "f7c25da092f0a868cdf09e8674cd3b7ef3a7d92a24253e663a2fb85e2496de56"
 dependencies = [
  "form_urlencoded",
  "idna",
@@ -3555,11 +3781,23 @@ dependencies = [
  "use-module",
 ]
 
+[[package]]
+name = "utf16_iter"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246"
+
+[[package]]
+name = "utf8_iter"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
+
 [[package]]
 name = "utf8parse"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
+checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 
 [[package]]
 name = "vault"
@@ -3887,9 +4125,9 @@ checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0"
 
 [[package]]
 name = "winnow"
-version = "0.6.9"
+version = "0.6.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86c949fede1d13936a99f14fafd3e76fd642b556dd2ce96287fbe2e0151bfac6"
+checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1"
 dependencies = [
  "memchr",
 ]
@@ -3904,6 +4142,42 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
+[[package]]
+name = "write16"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936"
+
+[[package]]
+name = "writeable"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
+
+[[package]]
+name = "yoke"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c5b1314b079b0930c31e3af543d8ee1757b1951ae1e1565ec704403a7240ca5"
+dependencies = [
+ "serde",
+ "stable_deref_trait",
+ "yoke-derive",
+ "zerofrom",
+]
+
+[[package]]
+name = "yoke-derive"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "synstructure",
+]
+
 [[package]]
 name = "zerocopy"
 version = "0.7.34"
@@ -3924,6 +4198,27 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "zerofrom"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91ec111ce797d0e0784a1116d0ddcdbea84322cd79e5d5ad173daeba4f93ab55"
+dependencies = [
+ "zerofrom-derive",
+]
+
+[[package]]
+name = "zerofrom-derive"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "synstructure",
+]
+
 [[package]]
 name = "zeroize"
 version = "1.8.1"
@@ -3944,11 +4239,33 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "zerovec"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb2cc8827d6c0994478a15c53f374f46fbd41bea663d809b14744bc42e6b109c"
+dependencies = [
+ "yoke",
+ "zerofrom",
+ "zerovec-derive",
+]
+
+[[package]]
+name = "zerovec-derive"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97cf56601ee5052b4417d90c8755c6683473c926039908196cf35d99f893ebe7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "zip"
-version = "2.1.1"
+version = "2.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1dd56a4d5921bc2f99947ac5b3abe5f510b1be7376fdc5e9fce4a23c6a93e87c"
+checksum = "775a2b471036342aa69bc5a602bc889cb0a06cda00477d0c69566757d5553d39"
 dependencies = [
  "arbitrary",
  "crc32fast",
diff --git a/framework/scenario/Cargo.toml b/framework/scenario/Cargo.toml
index b41d274621..f8e7760dd7 100644
--- a/framework/scenario/Cargo.toml
+++ b/framework/scenario/Cargo.toml
@@ -55,7 +55,3 @@ version = "0.2.0"
 [dependencies.multiversx-chain-vm]
 version = "=0.8.4"
 path = "../../vm"
-
-[dependencies.multiversx-sdk]
-version = "=0.4.1"
-path = "../../sdk/core"
diff --git a/framework/scenario/src/scenario/model/transaction/tx_response.rs b/framework/scenario/src/scenario/model/transaction/tx_response.rs
index 46806b1183..fd9721721f 100644
--- a/framework/scenario/src/scenario/model/transaction/tx_response.rs
+++ b/framework/scenario/src/scenario/model/transaction/tx_response.rs
@@ -1,6 +1,5 @@
 use multiversx_chain_vm::tx_mock::TxResult;
 use multiversx_sc::types::Address;
-use multiversx_sdk::data::transaction::{ApiLogs, ApiSmartContractResult};
 
 use super::{Log, TxExpect, TxResponseStatus};
 
@@ -21,10 +20,6 @@ pub struct TxResponse {
     pub gas: u64,
     /// The refund of the transaction.
     pub refund: u64,
-    /// The smart contract results of the transaction.
-    pub api_scrs: Vec<ApiSmartContractResult>,
-    /// The api logs of the transaction.
-    pub api_logs: Option<ApiLogs>,
 }
 
 impl TxResponse {
diff --git a/framework/snippets/src/network_response.rs b/framework/snippets/src/network_response.rs
index f7f0b962df..e0d9ceea58 100644
--- a/framework/snippets/src/network_response.rs
+++ b/framework/snippets/src/network_response.rs
@@ -13,29 +13,21 @@ const LOG_IDENTIFIER_SIGNAL_ERROR: &str = "signalError";
 
 /// Creates a [`TxResponse`] from a [`TransactionOnNetwork`].
 pub fn parse_tx_response(tx: TransactionOnNetwork) -> TxResponse {
-    let mut response = TxResponse {
-        api_scrs: tx.smart_contract_results.unwrap_or_default(),
-        api_logs: tx.logs,
-        ..Default::default()
-    };
-
-    response.tx_error = process_signal_error(&response);
-    if !response.tx_error.is_success() {
-        return response;
+    let tx_error = process_signal_error(&tx);
+    if !tx_error.is_success() {
+        TxResponse {
+            tx_error,
+            ..Default::default()
+        };
     }
 
-    process(
-        &mut response,
-        tx.sender.to_bytes(),
-        tx.nonce,
-        tx.processing_type_on_destination,
-    );
-
+    let mut response = TxResponse::default();
+    process(&mut response, &tx);
     response
 }
 
-fn process_signal_error(tx_response: &TxResponse) -> TxResponseStatus {
-    if let Some(event) = find_log(tx_response, LOG_IDENTIFIER_SIGNAL_ERROR) {
+fn process_signal_error(tx: &TransactionOnNetwork) -> TxResponseStatus {
+    if let Some(event) = find_log(tx, LOG_IDENTIFIER_SIGNAL_ERROR) {
         let topics = event.topics.as_ref();
         if let Some(error) = process_topics_error(topics) {
             return TxResponseStatus::signal_error(&error);
@@ -49,34 +41,29 @@ fn process_signal_error(tx_response: &TxResponse) -> TxResponseStatus {
     TxResponseStatus::default()
 }
 
-fn process(
-    tx_response: &mut TxResponse,
-    sender_address: [u8; 32],
-    nonce: u64,
-    processing_type_on_destination: String,
-) {
-    process_out(tx_response);
+fn process(tx_response: &mut TxResponse, tx: &TransactionOnNetwork) {
+    process_out(tx_response, tx);
     process_new_deployed_address(
         tx_response,
-        sender_address,
-        nonce,
-        processing_type_on_destination,
+        tx.sender.to_bytes(),
+        tx.nonce,
+        tx.processing_type_on_destination.clone(),
     );
-    process_new_issued_token_identifier(tx_response);
+    process_new_issued_token_identifier(tx_response, tx);
 }
 
-fn process_out(tx_response: &mut TxResponse) {
-    let out_scr = tx_response.api_scrs.iter().find(is_out_scr);
+fn process_out(tx_response: &mut TxResponse, tx: &TransactionOnNetwork) {
+    let out_scr = tx.smart_contract_results.iter().find(is_out_scr);
 
     if let Some(out_scr) = out_scr {
         tx_response.out = decode_scr_data_or_panic(&out_scr.data);
-    } else if let Some(data) = process_out_from_log(tx_response) {
+    } else if let Some(data) = process_out_from_log(tx) {
         tx_response.out = data
     }
 }
 
-fn process_out_from_log(tx_response: &TxResponse) -> Option<Vec<Vec<u8>>> {
-    if let Some(logs) = &tx_response.api_logs {
+fn process_out_from_log(tx: &TransactionOnNetwork) -> Option<Vec<Vec<u8>>> {
+    if let Some(logs) = &tx.logs {
         logs.events.iter().rev().find_map(|event| {
             if event.identifier == "writeLog" {
                 if let Some(data) = &event.data {
@@ -123,14 +110,18 @@ fn process_new_deployed_address(
     tx_response.new_deployed_address = Some(Address::from(address));
 }
 
-fn process_new_issued_token_identifier(tx_response: &mut TxResponse) {
-    for scr in tx_response.api_scrs.iter() {
+fn process_new_issued_token_identifier(tx_response: &mut TxResponse, tx: &TransactionOnNetwork) {
+    // let api_scrs = tx
+    //     .smart_contract_results
+    //     .as_ref()
+    //     .expect("missing smart contract results");
+    for scr in tx.smart_contract_results.iter() {
         if scr.sender.to_bech32_string().unwrap() != ESDTSystemSCAddress.to_bech32_string() {
             continue;
         }
 
-        let Some(prev_tx) = tx_response
-            .api_scrs
+        let Some(prev_tx) = tx
+            .smart_contract_results
             .iter()
             .find(|e| e.hash == scr.prev_tx_hash)
         else {
@@ -177,8 +168,8 @@ fn process_new_issued_token_identifier(tx_response: &mut TxResponse) {
     }
 }
 
-fn find_log<'a>(tx_response: &'a TxResponse, log_identifier: &str) -> Option<&'a Events> {
-    if let Some(logs) = &tx_response.api_logs {
+fn find_log<'a>(tx: &'a TransactionOnNetwork, log_identifier: &str) -> Option<&'a Events> {
+    if let Some(logs) = &tx.logs {
         logs.events
             .iter()
             .find(|event| event.identifier == log_identifier)
diff --git a/framework/snippets/tests/test_tx_multiple_sc_results.rs b/framework/snippets/tests/test_tx_multiple_sc_results.rs
index 25e6fc477a..05d220fe8b 100644
--- a/framework/snippets/tests/test_tx_multiple_sc_results.rs
+++ b/framework/snippets/tests/test_tx_multiple_sc_results.rs
@@ -281,7 +281,7 @@ fn test_transaction_multiple_sc_results() {
         .data
         .unwrap()
         .transaction;
-    let tx_response = network_response::parse_tx_response(tx_on_network);
-    assert_eq!(tx_response.api_scrs.len(), 4usize);
-    assert!(is_out_scr(&tx_response.api_scrs.get(2).unwrap()));
+    assert_eq!(tx_on_network.smart_contract_results.len(), 4usize);
+    assert!(is_out_scr(&tx_on_network.smart_contract_results.get(2).unwrap()));
+    let _ = network_response::parse_tx_response(tx_on_network);
 }
diff --git a/sdk/core/src/data/transaction.rs b/sdk/core/src/data/transaction.rs
index ed0a51b8df..3ee2f25684 100644
--- a/sdk/core/src/data/transaction.rs
+++ b/sdk/core/src/data/transaction.rs
@@ -80,7 +80,8 @@ pub struct TransactionOnNetwork {
     pub status: String,
     pub hyperblock_nonce: Option<u64>,
     pub hyperblock_hash: Option<String>,
-    pub smart_contract_results: Option<Vec<ApiSmartContractResult>>,
+    #[serde(default)]
+    pub smart_contract_results: Vec<ApiSmartContractResult>,
     pub logs: Option<ApiLogs>,
 }
 

From 1b254608138d482eacdeffb8678aa030f3120f8e Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 18 Jun 2024 18:16:42 +0300
Subject: [PATCH 1000/1254] network response cleanup

---
 framework/snippets/src/network_response.rs | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/framework/snippets/src/network_response.rs b/framework/snippets/src/network_response.rs
index e0d9ceea58..2fb336a7f9 100644
--- a/framework/snippets/src/network_response.rs
+++ b/framework/snippets/src/network_response.rs
@@ -42,7 +42,7 @@ fn process_signal_error(tx: &TransactionOnNetwork) -> TxResponseStatus {
 }
 
 fn process(tx_response: &mut TxResponse, tx: &TransactionOnNetwork) {
-    process_out(tx_response, tx);
+    tx_response.out = process_out(tx);
     process_new_deployed_address(
         tx_response,
         tx.sender.to_bytes(),
@@ -52,13 +52,15 @@ fn process(tx_response: &mut TxResponse, tx: &TransactionOnNetwork) {
     process_new_issued_token_identifier(tx_response, tx);
 }
 
-fn process_out(tx_response: &mut TxResponse, tx: &TransactionOnNetwork) {
+fn process_out(tx: &TransactionOnNetwork) -> Vec<Vec<u8>> {
     let out_scr = tx.smart_contract_results.iter().find(is_out_scr);
 
     if let Some(out_scr) = out_scr {
-        tx_response.out = decode_scr_data_or_panic(&out_scr.data);
+        decode_scr_data_or_panic(&out_scr.data)
     } else if let Some(data) = process_out_from_log(tx) {
-        tx_response.out = data
+        data
+    } else {
+        Vec::new()
     }
 }
 

From 5a831f5c02e23671879df86f14c05848894273ac Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 18 Jun 2024 18:21:08 +0300
Subject: [PATCH 1001/1254] network response cleanup, clippy fix

---
 .../abi-tester/src/abi_test_type.rs              |  1 +
 framework/base/src/storage/mappers/vec_mapper.rs |  2 +-
 framework/snippets/src/network_response.rs       | 16 ++++++----------
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/contracts/feature-tests/abi-tester/src/abi_test_type.rs b/contracts/feature-tests/abi-tester/src/abi_test_type.rs
index 2928e81c89..c70f1aec42 100644
--- a/contracts/feature-tests/abi-tester/src/abi_test_type.rs
+++ b/contracts/feature-tests/abi-tester/src/abi_test_type.rs
@@ -45,5 +45,6 @@ pub struct OnlyShowsUpInEsdtAttr {
 
 #[derive(TypeAbi)]
 pub struct ManagedDecimalWrapper<M: ManagedTypeApi> {
+    #[allow(dead_code)]
     pub field: ManagedDecimal<M, ConstDecimals<2>>,
 }
diff --git a/framework/base/src/storage/mappers/vec_mapper.rs b/framework/base/src/storage/mappers/vec_mapper.rs
index de2eb55d82..9869130864 100644
--- a/framework/base/src/storage/mappers/vec_mapper.rs
+++ b/framework/base/src/storage/mappers/vec_mapper.rs
@@ -12,7 +12,7 @@ use crate::{
     storage::{storage_clear, storage_set, StorageKey},
     types::{ManagedAddress, ManagedType, MultiValueEncoded},
 };
-use core::{marker::PhantomData, usize};
+use core::marker::PhantomData;
 
 const ITEM_SUFFIX: &[u8] = b".item";
 const LEN_SUFFIX: &[u8] = b".len";
diff --git a/framework/snippets/src/network_response.rs b/framework/snippets/src/network_response.rs
index 2fb336a7f9..a41e880f25 100644
--- a/framework/snippets/src/network_response.rs
+++ b/framework/snippets/src/network_response.rs
@@ -15,7 +15,7 @@ const LOG_IDENTIFIER_SIGNAL_ERROR: &str = "signalError";
 pub fn parse_tx_response(tx: TransactionOnNetwork) -> TxResponse {
     let tx_error = process_signal_error(&tx);
     if !tx_error.is_success() {
-        TxResponse {
+        return TxResponse {
             tx_error,
             ..Default::default()
         };
@@ -43,8 +43,7 @@ fn process_signal_error(tx: &TransactionOnNetwork) -> TxResponseStatus {
 
 fn process(tx_response: &mut TxResponse, tx: &TransactionOnNetwork) {
     tx_response.out = process_out(tx);
-    process_new_deployed_address(
-        tx_response,
+    tx_response.new_deployed_address = process_new_deployed_address(
         tx.sender.to_bytes(),
         tx.nonce,
         tx.processing_type_on_destination.clone(),
@@ -57,10 +56,8 @@ fn process_out(tx: &TransactionOnNetwork) -> Vec<Vec<u8>> {
 
     if let Some(out_scr) = out_scr {
         decode_scr_data_or_panic(&out_scr.data)
-    } else if let Some(data) = process_out_from_log(tx) {
-        data
     } else {
-        Vec::new()
+        process_out_from_log(tx).unwrap_or_default()
     }
 }
 
@@ -86,13 +83,12 @@ fn process_out_from_log(tx: &TransactionOnNetwork) -> Option<Vec<Vec<u8>>> {
 }
 
 fn process_new_deployed_address(
-    tx_response: &mut TxResponse,
     sender_address_bytes: [u8; 32],
     nonce: u64,
     processing_type_on_destination: String,
-) {
+) -> Option<Address> {
     if processing_type_on_destination != SC_DEPLOY_PROCESSING_TYPE {
-        return;
+        return None;
     }
 
     let sender_nonce_bytes = nonce.to_le_bytes();
@@ -109,7 +105,7 @@ fn process_new_deployed_address(
     address[10..30].copy_from_slice(&address_keccak[10..30]);
     address[30..32].copy_from_slice(&sender_address_bytes[30..32]);
 
-    tx_response.new_deployed_address = Some(Address::from(address));
+    Some(Address::from(address))
 }
 
 fn process_new_issued_token_identifier(tx_response: &mut TxResponse, tx: &TransactionOnNetwork) {

From b6904bbe23c466a1c61fdc372de311c9d73afaea Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 18 Jun 2024 18:28:12 +0300
Subject: [PATCH 1002/1254] network response cleanup

---
 framework/snippets/src/network_response.rs      | 17 +++++------------
 .../tests/test_tx_multiple_sc_results.rs        |  4 +++-
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/framework/snippets/src/network_response.rs b/framework/snippets/src/network_response.rs
index a41e880f25..c2a2d79dea 100644
--- a/framework/snippets/src/network_response.rs
+++ b/framework/snippets/src/network_response.rs
@@ -43,11 +43,7 @@ fn process_signal_error(tx: &TransactionOnNetwork) -> TxResponseStatus {
 
 fn process(tx_response: &mut TxResponse, tx: &TransactionOnNetwork) {
     tx_response.out = process_out(tx);
-    tx_response.new_deployed_address = process_new_deployed_address(
-        tx.sender.to_bytes(),
-        tx.nonce,
-        tx.processing_type_on_destination.clone(),
-    );
+    tx_response.new_deployed_address = process_new_deployed_address(tx);
     process_new_issued_token_identifier(tx_response, tx);
 }
 
@@ -82,16 +78,13 @@ fn process_out_from_log(tx: &TransactionOnNetwork) -> Option<Vec<Vec<u8>>> {
     }
 }
 
-fn process_new_deployed_address(
-    sender_address_bytes: [u8; 32],
-    nonce: u64,
-    processing_type_on_destination: String,
-) -> Option<Address> {
-    if processing_type_on_destination != SC_DEPLOY_PROCESSING_TYPE {
+fn process_new_deployed_address(tx: &TransactionOnNetwork) -> Option<Address> {
+    if &tx.processing_type_on_destination != SC_DEPLOY_PROCESSING_TYPE {
         return None;
     }
 
-    let sender_nonce_bytes = nonce.to_le_bytes();
+    let sender_address_bytes = tx.sender.to_bytes();
+    let sender_nonce_bytes = tx.nonce.to_le_bytes();
     let mut bytes_to_hash: Vec<u8> = Vec::new();
     bytes_to_hash.extend_from_slice(&sender_address_bytes);
     bytes_to_hash.extend_from_slice(&sender_nonce_bytes);
diff --git a/framework/snippets/tests/test_tx_multiple_sc_results.rs b/framework/snippets/tests/test_tx_multiple_sc_results.rs
index 05d220fe8b..4fee781b7f 100644
--- a/framework/snippets/tests/test_tx_multiple_sc_results.rs
+++ b/framework/snippets/tests/test_tx_multiple_sc_results.rs
@@ -282,6 +282,8 @@ fn test_transaction_multiple_sc_results() {
         .unwrap()
         .transaction;
     assert_eq!(tx_on_network.smart_contract_results.len(), 4usize);
-    assert!(is_out_scr(&tx_on_network.smart_contract_results.get(2).unwrap()));
+    assert!(is_out_scr(
+        &tx_on_network.smart_contract_results.get(2).unwrap()
+    ));
     let _ = network_response::parse_tx_response(tx_on_network);
 }

From e72c67761b56463b9eda0d1bb73da78db53e0f7e Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 18 Jun 2024 18:36:09 +0300
Subject: [PATCH 1003/1254] network response cleanup

---
 framework/snippets/src/network_response.rs | 30 +++++-----------------
 1 file changed, 7 insertions(+), 23 deletions(-)

diff --git a/framework/snippets/src/network_response.rs b/framework/snippets/src/network_response.rs
index c2a2d79dea..83d47d6237 100644
--- a/framework/snippets/src/network_response.rs
+++ b/framework/snippets/src/network_response.rs
@@ -44,7 +44,7 @@ fn process_signal_error(tx: &TransactionOnNetwork) -> TxResponseStatus {
 fn process(tx_response: &mut TxResponse, tx: &TransactionOnNetwork) {
     tx_response.out = process_out(tx);
     tx_response.new_deployed_address = process_new_deployed_address(tx);
-    process_new_issued_token_identifier(tx_response, tx);
+    tx_response.new_issued_token_identifier = process_new_issued_token_identifier(tx);
 }
 
 fn process_out(tx: &TransactionOnNetwork) -> Vec<Vec<u8>> {
@@ -79,7 +79,7 @@ fn process_out_from_log(tx: &TransactionOnNetwork) -> Option<Vec<Vec<u8>>> {
 }
 
 fn process_new_deployed_address(tx: &TransactionOnNetwork) -> Option<Address> {
-    if &tx.processing_type_on_destination != SC_DEPLOY_PROCESSING_TYPE {
+    if tx.processing_type_on_destination != SC_DEPLOY_PROCESSING_TYPE {
         return None;
     }
 
@@ -101,11 +101,7 @@ fn process_new_deployed_address(tx: &TransactionOnNetwork) -> Option<Address> {
     Some(Address::from(address))
 }
 
-fn process_new_issued_token_identifier(tx_response: &mut TxResponse, tx: &TransactionOnNetwork) {
-    // let api_scrs = tx
-    //     .smart_contract_results
-    //     .as_ref()
-    //     .expect("missing smart contract results");
+fn process_new_issued_token_identifier(tx: &TransactionOnNetwork) -> Option<String> {
     for scr in tx.smart_contract_results.iter() {
         if scr.sender.to_bech32_string().unwrap() != ESDTSystemSCAddress.to_bech32_string() {
             continue;
@@ -137,26 +133,14 @@ fn process_new_issued_token_identifier(tx_response: &mut TxResponse, tx: &Transa
 
         if scr.data.starts_with("ESDTTransfer@") {
             let encoded_tid = scr.data.split('@').nth(1);
-            if encoded_tid.is_none() {
-                return;
-            }
-
-            tx_response.new_issued_token_identifier =
-                Some(String::from_utf8(hex::decode(encoded_tid.unwrap()).unwrap()).unwrap());
-
-            break;
+            return Some(String::from_utf8(hex::decode(encoded_tid?).unwrap()).unwrap());
         } else if scr.data.starts_with("@00@") {
             let encoded_tid = scr.data.split('@').nth(2);
-            if encoded_tid.is_none() {
-                return;
-            }
-
-            tx_response.new_issued_token_identifier =
-                Some(String::from_utf8(hex::decode(encoded_tid.unwrap()).unwrap()).unwrap());
-
-            break;
+            return Some(String::from_utf8(hex::decode(encoded_tid?).unwrap()).unwrap());
         }
     }
+
+    None
 }
 
 fn find_log<'a>(tx: &'a TransactionOnNetwork, log_identifier: &str) -> Option<&'a Events> {

From 0282f58c7a1f6139d41f939930443a2c7483517e Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 18 Jun 2024 18:39:39 +0300
Subject: [PATCH 1004/1254] network response cleanup

---
 framework/snippets/src/network_response.rs | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/framework/snippets/src/network_response.rs b/framework/snippets/src/network_response.rs
index 83d47d6237..d505e7a525 100644
--- a/framework/snippets/src/network_response.rs
+++ b/framework/snippets/src/network_response.rs
@@ -21,9 +21,7 @@ pub fn parse_tx_response(tx: TransactionOnNetwork) -> TxResponse {
         };
     }
 
-    let mut response = TxResponse::default();
-    process(&mut response, &tx);
-    response
+    process_success(&tx)
 }
 
 fn process_signal_error(tx: &TransactionOnNetwork) -> TxResponseStatus {
@@ -41,10 +39,13 @@ fn process_signal_error(tx: &TransactionOnNetwork) -> TxResponseStatus {
     TxResponseStatus::default()
 }
 
-fn process(tx_response: &mut TxResponse, tx: &TransactionOnNetwork) {
-    tx_response.out = process_out(tx);
-    tx_response.new_deployed_address = process_new_deployed_address(tx);
-    tx_response.new_issued_token_identifier = process_new_issued_token_identifier(tx);
+fn process_success(tx: &TransactionOnNetwork) -> TxResponse {
+    TxResponse {
+        out: process_out(tx),
+        new_deployed_address: process_new_deployed_address(tx),
+        new_issued_token_identifier: process_new_issued_token_identifier(tx),
+        ..Default::default()
+    }
 }
 
 fn process_out(tx: &TransactionOnNetwork) -> Vec<Vec<u8>> {

From ec6d9b2154ac6eacdd7c3d89616ff8110ce05873 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 18 Jun 2024 19:03:35 +0300
Subject: [PATCH 1005/1254] multiversx-sc-scenario deps cleanup

---
 framework/scenario/Cargo.toml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/framework/scenario/Cargo.toml b/framework/scenario/Cargo.toml
index f8e7760dd7..66ded9803e 100644
--- a/framework/scenario/Cargo.toml
+++ b/framework/scenario/Cargo.toml
@@ -29,8 +29,6 @@ serde_json = "1.0"
 pathdiff = "0.2.1"
 itertools = "0.12.0"
 colored = "2.0"
-clap = { version = "4.4.7", features = ["derive"] }
-tokio = { version = "1.24", features = ["full"] }
 unwrap-infallible = "0.1.5"
 
 [features]

From bf406bfeac109e911b1d04677608ecf1501cd964 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 18 Jun 2024 19:36:37 +0300
Subject: [PATCH 1006/1254] Rust VM compilable to wasm

---
 framework/scenario/Cargo.toml                |  2 ++
 tools/plotter/Cargo.toml                     |  9 +++++++++
 vm/Cargo.toml                                | 10 +++++++---
 vm/src/crypto_functions.rs                   |  9 ++++++++-
 vm/src/tx_mock.rs                            | 12 ++++++++++--
 vm/src/tx_mock/blockchain_rng.rs             |  2 +-
 vm/src/tx_mock/blockchain_rng_unsupported.rs | 14 ++++++++++++++
 7 files changed, 51 insertions(+), 7 deletions(-)
 create mode 100644 vm/src/tx_mock/blockchain_rng_unsupported.rs

diff --git a/framework/scenario/Cargo.toml b/framework/scenario/Cargo.toml
index 66ded9803e..00d7d6c2ad 100644
--- a/framework/scenario/Cargo.toml
+++ b/framework/scenario/Cargo.toml
@@ -32,6 +32,8 @@ colored = "2.0"
 unwrap-infallible = "0.1.5"
 
 [features]
+default = ["wasm-incopatible"]
+wasm-incopatible = ["multiversx-chain-vm/wasm-incopatible"]
 run-go-tests = []
 
 [dependencies.multiversx-sc]
diff --git a/tools/plotter/Cargo.toml b/tools/plotter/Cargo.toml
index f936cadd16..bd428ce3e2 100644
--- a/tools/plotter/Cargo.toml
+++ b/tools/plotter/Cargo.toml
@@ -16,3 +16,12 @@ plotters-canvas = "^0.3.0"
 
 [profile.release]
 lto = true
+
+[dependencies.multiversx-sc]
+version = "=0.50.3"
+path = "../../framework/base"
+
+[dependencies.multiversx-sc-scenario]
+version = "=0.50.3"
+path = "../../framework/scenario"
+default-features = false
diff --git a/vm/Cargo.toml b/vm/Cargo.toml
index 907308f94f..0158bd09fa 100644
--- a/vm/Cargo.toml
+++ b/vm/Cargo.toml
@@ -16,19 +16,23 @@ description = "MultiversX VM implementation and tooling"
 keywords = ["multiversx", "blockchain", "vm", "tools"]
 categories = ["cryptography::cryptocurrencies", "development-tools::debugging"]
 
+[features]
+# not supported when compiling to wasm
+wasm-incopatible = ["rand", "rand_seeder", "ed25519-dalek"]
+
 [dependencies]
 num-bigint = "0.4"
 num-traits = "0.2"
 hex = "0.4"
 sha2 = "0.10.6"
 sha3 = "0.10.6"
-rand = "0.8.5"
-rand_seeder = "0.2.2"
-ed25519-dalek = "1.0.1"
 itertools = "0.12.0"
 hex-literal = "=0.4.1"
 bitflags = "=2.5.0"
 colored = "2.1.0"
+rand = { version= "0.8.5", optional = true }
+rand_seeder = { version= "0.2.2", optional = true }
+ed25519-dalek = { version = "1.0.1" , optional = true }
 
 [dependencies.multiversx-chain-vm-executor]
 version = "0.2.0"
diff --git a/vm/src/crypto_functions.rs b/vm/src/crypto_functions.rs
index 647f657e10..9d61e9ccc9 100644
--- a/vm/src/crypto_functions.rs
+++ b/vm/src/crypto_functions.rs
@@ -1,4 +1,3 @@
-use ed25519_dalek::*;
 use sha2::Sha256;
 use sha3::{Digest, Keccak256};
 
@@ -17,7 +16,10 @@ pub fn keccak256(data: &[u8]) -> [u8; KECCAK256_RESULT_LEN] {
     hasher.finalize().into()
 }
 
+#[cfg(feature = "wasm-incopatible")]
 pub fn verify_ed25519(key: &[u8], message: &[u8], signature: &[u8]) -> bool {
+    use ed25519_dalek::*;
+
     let public = PublicKey::from_bytes(key);
     if public.is_err() {
         return false;
@@ -30,3 +32,8 @@ pub fn verify_ed25519(key: &[u8], message: &[u8], signature: &[u8]) -> bool {
 
     public.unwrap().verify(message, &sig.unwrap()).is_ok()
 }
+
+#[cfg(not(feature = "wasm-incopatible"))]
+pub fn verify_ed25519(_key: &[u8], _message: &[u8], _signature: &[u8]) -> bool {
+    panic!("verify_ed25519 not supported for wasm builds, feature `wasm-incopatible` needs to be enabled")
+}
diff --git a/vm/src/tx_mock.rs b/vm/src/tx_mock.rs
index d1da905113..bd508d569e 100644
--- a/vm/src/tx_mock.rs
+++ b/vm/src/tx_mock.rs
@@ -1,6 +1,5 @@
 #![allow(clippy::type_complexity)]
 
-mod blockchain_rng;
 mod blockchain_update;
 mod tx_async_call_data;
 mod tx_async_promise;
@@ -20,7 +19,6 @@ mod tx_panic;
 mod tx_result;
 mod tx_result_calls;
 
-pub use blockchain_rng::*;
 pub use blockchain_update::BlockchainUpdate;
 pub use tx_async_call_data::*;
 pub use tx_async_promise::*;
@@ -38,3 +36,13 @@ pub use tx_managed_types::*;
 pub use tx_panic::*;
 pub use tx_result::*;
 pub use tx_result_calls::*;
+
+#[cfg(feature = "wasm-incopatible")]
+mod blockchain_rng;
+#[cfg(feature = "wasm-incopatible")]
+pub use blockchain_rng::BlockchainRng;
+
+#[cfg(not(feature = "wasm-incopatible"))]
+mod blockchain_rng_unsupported;
+#[cfg(not(feature = "wasm-incopatible"))]
+pub use blockchain_rng_unsupported::BlockchainRng;
diff --git a/vm/src/tx_mock/blockchain_rng.rs b/vm/src/tx_mock/blockchain_rng.rs
index bbcfafee8d..b16e9e2062 100644
--- a/vm/src/tx_mock/blockchain_rng.rs
+++ b/vm/src/tx_mock/blockchain_rng.rs
@@ -31,7 +31,7 @@ impl BlockchainRng {
         }
     }
 
-    pub fn fill<T: Fill + ?Sized>(&mut self, dest: &mut T) {
+    fn fill<T: Fill + ?Sized>(&mut self, dest: &mut T) {
         self.rng.fill(dest);
     }
 
diff --git a/vm/src/tx_mock/blockchain_rng_unsupported.rs b/vm/src/tx_mock/blockchain_rng_unsupported.rs
new file mode 100644
index 0000000000..cc97bace3c
--- /dev/null
+++ b/vm/src/tx_mock/blockchain_rng_unsupported.rs
@@ -0,0 +1,14 @@
+use super::{TxCache, TxInput};
+
+#[derive(Debug)]
+pub struct BlockchainRng;
+
+impl BlockchainRng {
+    pub fn new(_tx_input: &TxInput, _tx_cache: &TxCache) -> Self {
+        panic!("BlockchainRng not supported for wasm builds, feature `wasm-incopatible` needs to be enabled")
+    }
+
+    pub fn next_bytes(&mut self, _length: usize) -> Vec<u8> {
+        panic!("BlockchainRng not supported for wasm builds, feature `wasm-incopatible` needs to be enabled")
+    }
+}

From 3598efbc3fd2fd3f7e9518263cc64aa661affde0 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 18 Jun 2024 20:38:39 +0300
Subject: [PATCH 1007/1254] plotters - ln from framework

---
 Cargo.lock                                    | 26 +++++++--------
 .../base/src/types/managed/basic/big_uint.rs  | 13 ++++++--
 .../types/managed/wrapped/managed_decimal.rs  |  4 +++
 tools/plotter/Cargo.toml                      |  3 +-
 tools/plotter/src/lib.rs                      |  4 ++-
 tools/plotter/src/logarithm.rs                | 33 ++++++++++++++++---
 tools/plotter/src/plot3d.rs                   |  2 +-
 tools/plotter/www/index.js                    |  8 +----
 vm/src/tx_mock/blockchain_rng_unsupported.rs  |  2 +-
 9 files changed, 64 insertions(+), 31 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b5db0b7851..c0df51b5a8 100755
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2457,7 +2457,6 @@ version = "0.50.3"
 dependencies = [
  "base64",
  "bech32",
- "clap",
  "colored",
  "hex",
  "itertools",
@@ -2473,7 +2472,6 @@ dependencies = [
  "serde",
  "serde_json",
  "sha2 0.10.8",
- "tokio",
  "unwrap-infallible",
 ]
 
@@ -3488,6 +3486,19 @@ dependencies = [
  "winapi-util",
 ]
 
+[[package]]
+name = "sc-plotter-wasm"
+version = "0.1.0"
+dependencies = [
+ "multiversx-sc",
+ "multiversx-sc-scenario",
+ "plotters",
+ "plotters-canvas",
+ "wasm-bindgen",
+ "web-sys",
+ "wee_alloc",
+]
+
 [[package]]
 name = "scenario-tester"
 version = "0.0.0"
@@ -4341,17 +4352,6 @@ version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
 
-[[package]]
-name = "wasm-demo"
-version = "0.1.0"
-dependencies = [
- "plotters",
- "plotters-canvas",
- "wasm-bindgen",
- "web-sys",
- "wee_alloc",
-]
-
 [[package]]
 name = "wasmparser"
 version = "0.208.1"
diff --git a/framework/base/src/types/managed/basic/big_uint.rs b/framework/base/src/types/managed/basic/big_uint.rs
index 110a6b46d1..2ad3fd6701 100644
--- a/framework/base/src/types/managed/basic/big_uint.rs
+++ b/framework/base/src/types/managed/basic/big_uint.rs
@@ -240,10 +240,17 @@ impl<M: ManagedTypeApi> BigUint<M> {
         api.bi_log2(self.handle.clone())
     }
 
-    pub fn ln(&self) -> ManagedDecimal<M, ConstDecimals<9>> {
+    /// Natural logarithm of a number.
+    ///
+    /// Returns `None` for 0.
+    pub fn ln(&self) -> Option<ManagedDecimal<M, ConstDecimals<9>>> {
+        if self == &0u32 {
+            return None;
+        }
+
         let bit_log2 = self.log2(); // aproximate, based on position of the most significant bit
         let scaling_factor_9 = ConstDecimals::<9>.scaling_factor();
-        let divisor = BigUint::from(1u64 << bit_log2);
+        let divisor = BigUint::from(1u64) << bit_log2 as usize;
         let normalized = self * &*scaling_factor_9 / divisor;
 
         let x = normalized
@@ -279,7 +286,7 @@ impl<M: ManagedTypeApi> BigUint<M> {
         let mut result_bi = normalized; // reuse handle
         result_bi.overwrite_u64(result as u64);
 
-        ManagedDecimal::const_decimals_from_raw(result_bi)
+        Some(ManagedDecimal::const_decimals_from_raw(result_bi))
     }
 }
 
diff --git a/framework/base/src/types/managed/wrapped/managed_decimal.rs b/framework/base/src/types/managed/wrapped/managed_decimal.rs
index 2ca276ca9c..1775a9e75c 100644
--- a/framework/base/src/types/managed/wrapped/managed_decimal.rs
+++ b/framework/base/src/types/managed/wrapped/managed_decimal.rs
@@ -96,6 +96,10 @@ impl<M: ManagedTypeApi, D: Decimals> ManagedDecimal<M, D> {
         self.decimals.num_decimals()
     }
 
+    pub fn scaling_factor(&self) -> ManagedRef<'static, M, BigUint<M>> {
+        self.decimals.scaling_factor()
+    }
+
     pub fn rescale<T: Decimals>(self, scale_to: T) -> ManagedDecimal<M, T>
     where
         M: ManagedTypeApi,
diff --git a/tools/plotter/Cargo.toml b/tools/plotter/Cargo.toml
index bd428ce3e2..9f116ae4a5 100644
--- a/tools/plotter/Cargo.toml
+++ b/tools/plotter/Cargo.toml
@@ -1,8 +1,9 @@
 [package]
-name = "wasm-demo"
+name = "sc-plotter-wasm"
 version = "0.1.0"
 authors = ["Hao Hou <haohou302@gmail.com>"]
 edition = "2018"
+publish = false
 
 [lib]
 crate-type=["cdylib"]
diff --git a/tools/plotter/src/lib.rs b/tools/plotter/src/lib.rs
index 838fea4ab7..0ab413c9db 100644
--- a/tools/plotter/src/lib.rs
+++ b/tools/plotter/src/lib.rs
@@ -1,9 +1,11 @@
+#![allow(clippy::type_complexity)]
+
 use wasm_bindgen::prelude::*;
 use web_sys::HtmlCanvasElement;
 
 mod func_plot;
+pub mod logarithm;
 mod plot3d;
-mod logarithm;
 
 #[global_allocator]
 static ALLOC: wee_alloc::WeeAlloc = wee_alloc::WeeAlloc::INIT;
diff --git a/tools/plotter/src/logarithm.rs b/tools/plotter/src/logarithm.rs
index 6e2453c2e0..f8cf4ab4cd 100644
--- a/tools/plotter/src/logarithm.rs
+++ b/tools/plotter/src/logarithm.rs
@@ -1,13 +1,18 @@
 use crate::DrawResult;
+use multiversx_sc::types::BigUint;
+use multiversx_sc_scenario::api::StaticApi;
 use plotters::prelude::*;
 use plotters_canvas::CanvasBackend;
 use web_sys::HtmlCanvasElement;
 
-pub fn draw(canvas: HtmlCanvasElement, max_x: f32) -> DrawResult<impl Fn((i32, i32)) -> Option<(f32, f32)>> {
+pub fn draw(
+    canvas: HtmlCanvasElement,
+    max_x: f32,
+) -> DrawResult<impl Fn((i32, i32)) -> Option<(f32, f32)>> {
     let root = CanvasBackend::with_canvas_object(canvas)
         .unwrap()
         .into_drawing_area();
-    
+
     let font: FontDesc = ("sans-serif", 20.0).into();
 
     root.fill(&WHITE)?;
@@ -17,7 +22,7 @@ pub fn draw(canvas: HtmlCanvasElement, max_x: f32) -> DrawResult<impl Fn((i32, i
         .caption(format!("y=ln(x), x=1..{max_x}"), font)
         .x_label_area_size(30u32)
         .y_label_area_size(30u32)
-        .build_cartesian_2d(0f32..max_x, -10f32..10f32)?;
+        .build_cartesian_2d(0f32..max_x, -1f32..5f32)?;
 
     chart.configure_mesh().x_labels(3).y_labels(3).draw()?;
 
@@ -32,10 +37,30 @@ pub fn draw(canvas: HtmlCanvasElement, max_x: f32) -> DrawResult<impl Fn((i32, i
     chart.draw_series(LineSeries::new(
         (0..=RANGE_MAX)
             .map(|x| x as f32 * max_x / RANGE_MAX as f32)
-            .map(|x| (x, x.log2())),
+            .map(|x| (x, sc_ln(x))),
         &GREEN,
     ))?;
 
     root.present()?;
     return Ok(chart.into_coord_trans());
 }
+
+pub fn sc_ln(x: f32) -> f32 {
+    let bu = BigUint::<StaticApi>::from(x as u32);
+    if let Some(ln_dec) = bu.ln() {
+        let ln_units = ln_dec.into_raw_units().to_u64().unwrap();
+        let ln_sf = ln_dec.scaling_factor().to_u64().unwrap();
+        (ln_units as f64 / ln_sf as f64) as f32
+    } else {
+        0.0
+    }
+}
+
+#[cfg(test)]
+mod test {
+    #[test]
+    fn sc_ln_test() {
+        let y = super::sc_ln(0.0);
+        println!("{y}");
+    }
+}
diff --git a/tools/plotter/src/plot3d.rs b/tools/plotter/src/plot3d.rs
index 06d0190d19..15cfa1b907 100644
--- a/tools/plotter/src/plot3d.rs
+++ b/tools/plotter/src/plot3d.rs
@@ -25,7 +25,7 @@ pub fn draw(canvas: HtmlCanvasElement, pitch: f64, yaw: f64) -> DrawResult<()> {
     chart.configure_axes().draw()?;
 
     chart.draw_series(
-        SurfaceSeries::xoz(x_axis.values(), z_axis.values(), |x:f64, z:f64| {
+        SurfaceSeries::xoz(x_axis.values(), z_axis.values(), |x: f64, z: f64| {
             (x * x + z * z).cos()
         })
         .style(&BLUE.mix(0.2)),
diff --git a/tools/plotter/www/index.js b/tools/plotter/www/index.js
index ac24813e59..5a50bbccd6 100644
--- a/tools/plotter/www/index.js
+++ b/tools/plotter/www/index.js
@@ -81,9 +81,6 @@ function updatePlot3d() {
 	coord.innerText = `Pitch:${pitch_value}, Yaw:${yaw_value}`
 }
 
-function updateLogarithm() {
-}
-
 /** Redraw currently selected plot. */
 function updatePlot() {
     const selected = plotType.selectedOptions[0];
@@ -94,11 +91,8 @@ function updatePlot() {
 		case "logarithm": 
 			control.classList.add("hide");
 			logControl.classList.remove("hide");
-			updateLogarithm();
 			let logMaxValue = Number(logMax.value);
-			status.innerText = `Updated log: ${logMaxValue}`
 			chart = Chart.logarithm(canvas, Number(logMaxValue));
-			coord.innerText = `Updated log: ${logMaxValue}`
 			break;
 		case "3d-plot": 
 			control.classList.remove("hide");
@@ -112,5 +106,5 @@ function updatePlot() {
 	}
 	
     const end = performance.now();
-    // status.innerText = `Rendered ${selected.innerText} in ${Math.ceil(end - start)}ms`;
+    status.innerText = `Rendered ${selected.innerText} in ${Math.ceil(end - start)}ms`;
 }
diff --git a/vm/src/tx_mock/blockchain_rng_unsupported.rs b/vm/src/tx_mock/blockchain_rng_unsupported.rs
index cc97bace3c..698be4ac11 100644
--- a/vm/src/tx_mock/blockchain_rng_unsupported.rs
+++ b/vm/src/tx_mock/blockchain_rng_unsupported.rs
@@ -5,7 +5,7 @@ pub struct BlockchainRng;
 
 impl BlockchainRng {
     pub fn new(_tx_input: &TxInput, _tx_cache: &TxCache) -> Self {
-        panic!("BlockchainRng not supported for wasm builds, feature `wasm-incopatible` needs to be enabled")
+        BlockchainRng
     }
 
     pub fn next_bytes(&mut self, _length: usize) -> Vec<u8> {

From 692e18e27e7cb3ff072736a6c4fa3d3006cfb685 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 18 Jun 2024 20:50:04 +0300
Subject: [PATCH 1008/1254] test fix

---
 framework/scenario/tests/big_uint_test.rs | 2 +-
 tools/plotter/src/logarithm.rs            | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/framework/scenario/tests/big_uint_test.rs b/framework/scenario/tests/big_uint_test.rs
index 6c33032a36..fae86ecd6d 100644
--- a/framework/scenario/tests/big_uint_test.rs
+++ b/framework/scenario/tests/big_uint_test.rs
@@ -4,7 +4,7 @@ use multiversx_sc_scenario::api::StaticApi;
 fn assert_big_uint_ln(x: u32, ln_str: &str) {
     let x = BigUint::<StaticApi>::from(x);
     let ln_x = x.ln();
-    assert_eq!(ln_x.to_string(), ln_str);
+    assert_eq!(ln_x.unwrap().to_string(), ln_str);
 }
 
 #[test]
diff --git a/tools/plotter/src/logarithm.rs b/tools/plotter/src/logarithm.rs
index f8cf4ab4cd..3ab69c1e06 100644
--- a/tools/plotter/src/logarithm.rs
+++ b/tools/plotter/src/logarithm.rs
@@ -60,7 +60,9 @@ pub fn sc_ln(x: f32) -> f32 {
 mod test {
     #[test]
     fn sc_ln_test() {
-        let y = super::sc_ln(0.0);
-        println!("{y}");
+        assert_eq!(super::sc_ln(0.0), 0.0);
+        assert!(super::sc_ln(1.0) > 0.0);
+        assert!(super::sc_ln(1.0) < 0.01);
+        assert!(super::sc_ln(2.0) > 0.6);
     }
 }

From 3875b572194c4b3fe324601c9f3c8e42755c1753 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 18 Jun 2024 23:47:49 +0300
Subject: [PATCH 1009/1254] plotters - logarithm error

---
 tools/plotter/src/lib.rs       |  9 ++++-
 tools/plotter/src/logarithm.rs | 35 ++++++++++++++++-
 tools/plotter/www/index.html   |  9 +++--
 tools/plotter/www/index.js     | 72 ++++++++++++++++++----------------
 4 files changed, 85 insertions(+), 40 deletions(-)

diff --git a/tools/plotter/src/lib.rs b/tools/plotter/src/lib.rs
index 0ab413c9db..3952eb1d91 100644
--- a/tools/plotter/src/lib.rs
+++ b/tools/plotter/src/lib.rs
@@ -39,7 +39,14 @@ impl Chart {
     }
 
     pub fn logarithm(canvas: HtmlCanvasElement, max_x: f32) -> Result<Chart, JsValue> {
-        let map_coord = logarithm::draw(canvas, max_x).map_err(|err| err.to_string())?;
+        let map_coord = logarithm::draw_logs(canvas, max_x).map_err(|err| err.to_string())?;
+        Ok(Chart {
+            convert: Box::new(move |coord| map_coord(coord).map(|(x, y)| (x.into(), y.into()))),
+        })
+    }
+
+    pub fn logarithm_error(canvas: HtmlCanvasElement, max_x: f32) -> Result<Chart, JsValue> {
+        let map_coord = logarithm::draw_error(canvas, max_x).map_err(|err| err.to_string())?;
         Ok(Chart {
             convert: Box::new(move |coord| map_coord(coord).map(|(x, y)| (x.into(), y.into()))),
         })
diff --git a/tools/plotter/src/logarithm.rs b/tools/plotter/src/logarithm.rs
index 3ab69c1e06..c157984c0c 100644
--- a/tools/plotter/src/logarithm.rs
+++ b/tools/plotter/src/logarithm.rs
@@ -5,7 +5,7 @@ use plotters::prelude::*;
 use plotters_canvas::CanvasBackend;
 use web_sys::HtmlCanvasElement;
 
-pub fn draw(
+pub fn draw_logs(
     canvas: HtmlCanvasElement,
     max_x: f32,
 ) -> DrawResult<impl Fn((i32, i32)) -> Option<(f32, f32)>> {
@@ -45,6 +45,39 @@ pub fn draw(
     return Ok(chart.into_coord_trans());
 }
 
+pub fn draw_error(
+    canvas: HtmlCanvasElement,
+    max_x: f32,
+) -> DrawResult<impl Fn((i32, i32)) -> Option<(f32, f32)>> {
+    let root = CanvasBackend::with_canvas_object(canvas)
+        .unwrap()
+        .into_drawing_area();
+
+    let font: FontDesc = ("sans-serif", 20.0).into();
+
+    root.fill(&WHITE)?;
+
+    let mut chart = ChartBuilder::on(&root)
+        .margin(20u32)
+        .caption(format!("y=logarithm error, x=1..{max_x}"), font)
+        .x_label_area_size(30u32)
+        .y_label_area_size(30u32)
+        .build_cartesian_2d(0f32..max_x, -0.5f32..0.5f32)?;
+
+    chart.configure_mesh().x_labels(3).y_labels(3).draw()?;
+
+    const RANGE_MAX: i32 = 1000;
+    chart.draw_series(LineSeries::new(
+        (0..=RANGE_MAX)
+            .map(|x| x as f32 * max_x / RANGE_MAX as f32)
+            .map(|x| (x, sc_ln(x) - x.ln())),
+        &RED,
+    ))?;
+
+    root.present()?;
+    return Ok(chart.into_coord_trans());
+}
+
 pub fn sc_ln(x: f32) -> f32 {
     let bu = BigUint::<StaticApi>::from(x as u32);
     if let Some(ln_dec) = bu.ln() {
diff --git a/tools/plotter/www/index.html b/tools/plotter/www/index.html
index c463175603..f188cc14b7 100644
--- a/tools/plotter/www/index.html
+++ b/tools/plotter/www/index.html
@@ -3,14 +3,14 @@
     <head>
 	<meta charset="utf-8">
         <meta name="viewport" content="width=device-width, initial-scale=1">
-	<title>Plotters WebAssembly Demo</title>
+	<title>MultiversX SC function plots</title>
 	<link rel="stylesheet" href="./style.css">
     </head>
     <body>
         <noscript>This page contains webassembly and javascript content, please enable javascript in your browser.</noscript>
         <script src="./bootstrap.js"></script>
 	<main>
-	    <h1>Plotters WebAssembly Demo</h1>
+	    <h1>MultiversX SC function plots</h1>
 	    <div id="coord"></div>
         <canvas id="canvas" width="600" height="400"></canvas>
 	    <div id="status">Loading WebAssembly...</div>
@@ -23,7 +23,8 @@ <h1>Plotters WebAssembly Demo</h1>
 				<option value="3">Graph of y=x^3</option>
 				<option value="4">Graph of y=x^4</option>
 				<option value="5">Graph of y=x^5</option>
-				<option value="logarithm">Logarithms</option>
+				<option value="logarithm">Logarithms (BigUint)</option>
+				<option value="logarithm-error">Logarithm (BigUint) Error</option>
 				<option value="3d-plot">3D Plot Demo</option>
 			</select>
 			<div id="3d-control" class="hide">
@@ -35,7 +36,7 @@ <h1>Plotters WebAssembly Demo</h1>
 			</div>
 	    </div>
 	</main>
-	<footer>
+	<footer class="hide">
 	    <a href="https://github.com/plotters-rs/plotters-wasm-demo" target="a">Source</a> |
 	    <a href="https://github.com/plotters-rs/plotters" target="a">Repo</a> |
 	    <a href="https://crates.io/crates/plotters" target="a">Crates</a> |
diff --git a/tools/plotter/www/index.js b/tools/plotter/www/index.js
index 5a50bbccd6..71c0e627c3 100644
--- a/tools/plotter/www/index.js
+++ b/tools/plotter/www/index.js
@@ -1,6 +1,6 @@
 // If you only use `npm` you can simply
 // import { Chart } from "wasm-demo" and remove `setup` call from `bootstrap.js`.
-class Chart {}
+class Chart { }
 
 const canvas = document.getElementById("canvas");
 const coord = document.getElementById("coord");
@@ -17,61 +17,61 @@ let chart = null;
 /** Main entry point */
 export function main() {
 	let hash = location.hash.substr(1);
-	for(var i = 0; i < plotType.options.length; i++) {
-		if(hash == plotType.options[i].value) {
+	for (var i = 0; i < plotType.options.length; i++) {
+		if (hash == plotType.options[i].value) {
 			plotType.value = hash;
 		}
 	}
-    setupUI();
-    setupCanvas();
+	setupUI();
+	setupCanvas();
 }
 
 /** This function is used in `bootstrap.js` to setup imports. */
 export function setup(WasmChart) {
-    Chart = WasmChart;
+	Chart = WasmChart;
 }
 
 /** Add event listeners. */
 function setupUI() {
-    status.innerText = "WebAssembly loaded!";
-    plotType.addEventListener("change", updatePlot);
+	status.innerText = "WebAssembly loaded!";
+	plotType.addEventListener("change", updatePlot);
 	yaw.addEventListener("change", updatePlot);
 	pitch.addEventListener("change", updatePlot);
 	yaw.addEventListener("input", updatePlot);
 	pitch.addEventListener("input", updatePlot);
 	logMax.addEventListener("input", updatePlot);
-    window.addEventListener("resize", setupCanvas);
-    window.addEventListener("mousemove", onMouseMove);
+	window.addEventListener("resize", setupCanvas);
+	window.addEventListener("mousemove", onMouseMove);
 }
 
 /** Setup canvas to properly handle high DPI and redraw current plot. */
 function setupCanvas() {
 	const dpr = window.devicePixelRatio || 1.0;
-    const aspectRatio = canvas.width / canvas.height;
-    const size = canvas.parentNode.offsetWidth * 0.8;
-    canvas.style.width = size + "px";
-    canvas.style.height = size / aspectRatio + "px";
-    canvas.width = size;
-    canvas.height = size / aspectRatio;
-    updatePlot();
+	const aspectRatio = canvas.width / canvas.height;
+	const size = canvas.parentNode.offsetWidth * 0.8;
+	canvas.style.width = size + "px";
+	canvas.style.height = size / aspectRatio + "px";
+	canvas.width = size;
+	canvas.height = size / aspectRatio;
+	updatePlot();
 }
 
 /** Update displayed coordinates. */
 function onMouseMove(event) {
-    if (chart) {
+	if (chart) {
 		var text = "Mouse pointer is out of range";
 
-		if(event.target == canvas) {
+		if (event.target == canvas) {
 			let actualRect = canvas.getBoundingClientRect();
 			let logicX = event.offsetX * canvas.width / actualRect.width;
 			let logicY = event.offsetY * canvas.height / actualRect.height;
 			const point = chart.coord(logicX, logicY);
-			text = (point) 
+			text = (point)
 				? `(${point.x.toFixed(3)}, ${point.y.toFixed(3)})`
 				: text;
 		}
-        coord.innerText = text;
-    }
+		coord.innerText = text;
+	}
 }
 
 function updatePlot3d() {
@@ -83,18 +83,22 @@ function updatePlot3d() {
 
 /** Redraw currently selected plot. */
 function updatePlot() {
-    const selected = plotType.selectedOptions[0];
-    status.innerText = `Rendering ${selected.innerText}...`;
-    chart = null;
-    const start = performance.now();
-	switch(selected.value) {
-		case "logarithm": 
+	const selected = plotType.selectedOptions[0];
+	status.innerText = `Rendering ${selected.innerText}...`;
+	chart = null;
+	const start = performance.now();
+	switch (selected.value) {
+		case "logarithm":
 			control.classList.add("hide");
 			logControl.classList.remove("hide");
-			let logMaxValue = Number(logMax.value);
-			chart = Chart.logarithm(canvas, Number(logMaxValue));
+			chart = Chart.logarithm(canvas, Number(logMax.value));
 			break;
-		case "3d-plot": 
+		case "logarithm-error":
+			control.classList.add("hide");
+			logControl.classList.remove("hide");
+			chart = Chart.logarithm_error(canvas, Number(logMax.value));
+			break;
+		case "3d-plot":
 			control.classList.remove("hide");
 			logControl.classList.add("hide");
 			updatePlot3d();
@@ -104,7 +108,7 @@ function updatePlot() {
 			logControl.classList.add("hide");
 			chart = Chart.power("canvas", Number(selected.value));
 	}
-	
-    const end = performance.now();
-    status.innerText = `Rendered ${selected.innerText} in ${Math.ceil(end - start)}ms`;
+
+	const end = performance.now();
+	status.innerText = `Rendered ${selected.innerText} in ${Math.ceil(end - start)}ms`;
 }

From e3441fb0cd9e182d83ce4b5a5ddcd4b5f659851a Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 19 Jun 2024 00:08:08 +0300
Subject: [PATCH 1010/1254] plotters - cleanup

---
 tools/plotter/src/func_plot.rs | 31 -------------------------
 tools/plotter/src/lib.rs       | 16 +------------
 tools/plotter/src/logarithm.rs | 14 ++++++------
 tools/plotter/src/plot3d.rs    | 42 ----------------------------------
 tools/plotter/www/index.html   | 11 ---------
 tools/plotter/www/index.js     | 23 -------------------
 6 files changed, 8 insertions(+), 129 deletions(-)
 delete mode 100644 tools/plotter/src/func_plot.rs
 delete mode 100644 tools/plotter/src/plot3d.rs

diff --git a/tools/plotter/src/func_plot.rs b/tools/plotter/src/func_plot.rs
deleted file mode 100644
index 054452f08b..0000000000
--- a/tools/plotter/src/func_plot.rs
+++ /dev/null
@@ -1,31 +0,0 @@
-use crate::DrawResult;
-use plotters::prelude::*;
-use plotters_canvas::CanvasBackend;
-
-/// Draw power function f(x) = x^power.
-pub fn draw(canvas_id: &str, power: i32) -> DrawResult<impl Fn((i32, i32)) -> Option<(f32, f32)>> {
-    let backend = CanvasBackend::new(canvas_id).expect("cannot find canvas");
-    let root = backend.into_drawing_area();
-    let font: FontDesc = ("sans-serif", 20.0).into();
-
-    root.fill(&WHITE)?;
-
-    let mut chart = ChartBuilder::on(&root)
-        .margin(20u32)
-        .caption(format!("y=x^{}", power), font)
-        .x_label_area_size(30u32)
-        .y_label_area_size(30u32)
-        .build_cartesian_2d(-1f32..1f32, -1.2f32..1.2f32)?;
-
-    chart.configure_mesh().x_labels(3).y_labels(3).draw()?;
-
-    chart.draw_series(LineSeries::new(
-        (-50..=50)
-            .map(|x| x as f32 / 50.0)
-            .map(|x| (x, x.powf(power as f32))),
-        &RED,
-    ))?;
-
-    root.present()?;
-    return Ok(chart.into_coord_trans());
-}
diff --git a/tools/plotter/src/lib.rs b/tools/plotter/src/lib.rs
index 3952eb1d91..2972f468fd 100644
--- a/tools/plotter/src/lib.rs
+++ b/tools/plotter/src/lib.rs
@@ -3,9 +3,7 @@
 use wasm_bindgen::prelude::*;
 use web_sys::HtmlCanvasElement;
 
-mod func_plot;
 pub mod logarithm;
-mod plot3d;
 
 #[global_allocator]
 static ALLOC: wee_alloc::WeeAlloc = wee_alloc::WeeAlloc::INIT;
@@ -29,15 +27,8 @@ pub struct Point {
 
 #[wasm_bindgen]
 impl Chart {
-    /// Draw provided power function on the canvas element using it's id.
+    /// Draw provided functions on the canvas.
     /// Return `Chart` struct suitable for coordinate conversion.
-    pub fn power(canvas_id: &str, power: i32) -> Result<Chart, JsValue> {
-        let map_coord = func_plot::draw(canvas_id, power).map_err(|err| err.to_string())?;
-        Ok(Chart {
-            convert: Box::new(move |coord| map_coord(coord).map(|(x, y)| (x.into(), y.into()))),
-        })
-    }
-
     pub fn logarithm(canvas: HtmlCanvasElement, max_x: f32) -> Result<Chart, JsValue> {
         let map_coord = logarithm::draw_logs(canvas, max_x).map_err(|err| err.to_string())?;
         Ok(Chart {
@@ -52,11 +43,6 @@ impl Chart {
         })
     }
 
-    pub fn plot3d(canvas: HtmlCanvasElement, pitch: f64, yaw: f64) -> Result<(), JsValue> {
-        plot3d::draw(canvas, pitch, yaw).map_err(|err| err.to_string())?;
-        Ok(())
-    }
-
     /// This function can be used to convert screen coordinates to
     /// chart coordinates.
     pub fn coord(&self, x: i32, y: i32) -> Option<Point> {
diff --git a/tools/plotter/src/logarithm.rs b/tools/plotter/src/logarithm.rs
index c157984c0c..2dfe20913f 100644
--- a/tools/plotter/src/logarithm.rs
+++ b/tools/plotter/src/logarithm.rs
@@ -37,7 +37,7 @@ pub fn draw_logs(
     chart.draw_series(LineSeries::new(
         (0..=RANGE_MAX)
             .map(|x| x as f32 * max_x / RANGE_MAX as f32)
-            .map(|x| (x, sc_ln(x))),
+            .map(|x| (x, big_uint_ln(x))),
         &GREEN,
     ))?;
 
@@ -70,7 +70,7 @@ pub fn draw_error(
     chart.draw_series(LineSeries::new(
         (0..=RANGE_MAX)
             .map(|x| x as f32 * max_x / RANGE_MAX as f32)
-            .map(|x| (x, sc_ln(x) - x.ln())),
+            .map(|x| (x, big_uint_ln(x) - x.ln())),
         &RED,
     ))?;
 
@@ -78,7 +78,7 @@ pub fn draw_error(
     return Ok(chart.into_coord_trans());
 }
 
-pub fn sc_ln(x: f32) -> f32 {
+fn big_uint_ln(x: f32) -> f32 {
     let bu = BigUint::<StaticApi>::from(x as u32);
     if let Some(ln_dec) = bu.ln() {
         let ln_units = ln_dec.into_raw_units().to_u64().unwrap();
@@ -93,9 +93,9 @@ pub fn sc_ln(x: f32) -> f32 {
 mod test {
     #[test]
     fn sc_ln_test() {
-        assert_eq!(super::sc_ln(0.0), 0.0);
-        assert!(super::sc_ln(1.0) > 0.0);
-        assert!(super::sc_ln(1.0) < 0.01);
-        assert!(super::sc_ln(2.0) > 0.6);
+        assert_eq!(super::big_uint_ln(0.0), 0.0);
+        assert!(super::big_uint_ln(1.0) > 0.0);
+        assert!(super::big_uint_ln(1.0) < 0.01);
+        assert!(super::big_uint_ln(2.0) > 0.6);
     }
 }
diff --git a/tools/plotter/src/plot3d.rs b/tools/plotter/src/plot3d.rs
deleted file mode 100644
index 15cfa1b907..0000000000
--- a/tools/plotter/src/plot3d.rs
+++ /dev/null
@@ -1,42 +0,0 @@
-use crate::DrawResult;
-use plotters::prelude::*;
-use plotters_canvas::CanvasBackend;
-use web_sys::HtmlCanvasElement;
-
-pub fn draw(canvas: HtmlCanvasElement, pitch: f64, yaw: f64) -> DrawResult<()> {
-    let area = CanvasBackend::with_canvas_object(canvas)
-        .unwrap()
-        .into_drawing_area();
-    area.fill(&WHITE)?;
-
-    let x_axis = (-3.0..3.0).step(0.1);
-    let z_axis = (-3.0..3.0).step(0.1);
-
-    let mut chart =
-        ChartBuilder::on(&area).build_cartesian_3d(x_axis.clone(), -3.0..3.0, z_axis.clone())?;
-
-    chart.with_projection(|mut pb| {
-        pb.yaw = yaw;
-        pb.pitch = pitch;
-        pb.scale = 0.7;
-        pb.into_matrix()
-    });
-
-    chart.configure_axes().draw()?;
-
-    chart.draw_series(
-        SurfaceSeries::xoz(x_axis.values(), z_axis.values(), |x: f64, z: f64| {
-            (x * x + z * z).cos()
-        })
-        .style(&BLUE.mix(0.2)),
-    )?;
-
-    chart.draw_series(LineSeries::new(
-        (-100..100)
-            .map(|y| y as f64 / 40.0)
-            .map(|y| ((y * 10.0).sin(), y, (y * 10.0).cos())),
-        &BLACK,
-    ))?;
-
-    Ok(())
-}
diff --git a/tools/plotter/www/index.html b/tools/plotter/www/index.html
index f188cc14b7..94054ef4d4 100644
--- a/tools/plotter/www/index.html
+++ b/tools/plotter/www/index.html
@@ -17,20 +17,9 @@ <h1>MultiversX SC function plots</h1>
 	    <div id="control">
 			<label for="plot-type">Demo: </label>
 			<select id="plot-type">
-				<option value="0">Graph of y=1</option>
-				<option value="1">Graph of y=x</option>
-				<option value="2">Graph of y=x^2</option>
-				<option value="3">Graph of y=x^3</option>
-				<option value="4">Graph of y=x^4</option>
-				<option value="5">Graph of y=x^5</option>
 				<option value="logarithm">Logarithms (BigUint)</option>
 				<option value="logarithm-error">Logarithm (BigUint) Error</option>
-				<option value="3d-plot">3D Plot Demo</option>
 			</select>
-			<div id="3d-control" class="hide">
-				<label for="pitch">Pitch: </label> <input type="range" min="0" max="157" id="pitch" value="10"> <br/>
-				<label for="yaw">Yaw: </label> <input type="range" min="0" max="314" id="yaw" value="50">
-			</div>
 			<div id="logControl" class="hide">
 				<label for="logMax">Max value: </label> <input id="logMax" type="range" min="1" max="100" value="10">
 			</div>
diff --git a/tools/plotter/www/index.js b/tools/plotter/www/index.js
index 71c0e627c3..478001eebc 100644
--- a/tools/plotter/www/index.js
+++ b/tools/plotter/www/index.js
@@ -5,10 +5,7 @@ class Chart { }
 const canvas = document.getElementById("canvas");
 const coord = document.getElementById("coord");
 const plotType = document.getElementById("plot-type");
-const pitch = document.getElementById("pitch");
-const yaw = document.getElementById("yaw");
 const logMax = document.getElementById("logMax");
-const control = document.getElementById("3d-control");
 const logControl = document.getElementById("logControl");
 const status = document.getElementById("status");
 
@@ -35,10 +32,6 @@ export function setup(WasmChart) {
 function setupUI() {
 	status.innerText = "WebAssembly loaded!";
 	plotType.addEventListener("change", updatePlot);
-	yaw.addEventListener("change", updatePlot);
-	pitch.addEventListener("change", updatePlot);
-	yaw.addEventListener("input", updatePlot);
-	pitch.addEventListener("input", updatePlot);
 	logMax.addEventListener("input", updatePlot);
 	window.addEventListener("resize", setupCanvas);
 	window.addEventListener("mousemove", onMouseMove);
@@ -74,13 +67,6 @@ function onMouseMove(event) {
 	}
 }
 
-function updatePlot3d() {
-	let yaw_value = Number(yaw.value) / 100.0;
-	let pitch_value = Number(pitch.value) / 100.0;
-	Chart.plot3d(canvas, pitch_value, yaw_value);
-	coord.innerText = `Pitch:${pitch_value}, Yaw:${yaw_value}`
-}
-
 /** Redraw currently selected plot. */
 function updatePlot() {
 	const selected = plotType.selectedOptions[0];
@@ -89,24 +75,15 @@ function updatePlot() {
 	const start = performance.now();
 	switch (selected.value) {
 		case "logarithm":
-			control.classList.add("hide");
 			logControl.classList.remove("hide");
 			chart = Chart.logarithm(canvas, Number(logMax.value));
 			break;
 		case "logarithm-error":
-			control.classList.add("hide");
 			logControl.classList.remove("hide");
 			chart = Chart.logarithm_error(canvas, Number(logMax.value));
 			break;
-		case "3d-plot":
-			control.classList.remove("hide");
-			logControl.classList.add("hide");
-			updatePlot3d();
-			break;
 		default:
-			control.classList.add("hide");
 			logControl.classList.add("hide");
-			chart = Chart.power("canvas", Number(selected.value));
 	}
 
 	const end = performance.now();

From d4d6e9ccb80afc7ccee8ad7d1ef9a9425e4e4f4f Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 19 Jun 2024 10:51:00 +0300
Subject: [PATCH 1011/1254] plotters - log error better baseline

---
 tools/plotter/src/logarithm.rs | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/tools/plotter/src/logarithm.rs b/tools/plotter/src/logarithm.rs
index 2dfe20913f..93765864d2 100644
--- a/tools/plotter/src/logarithm.rs
+++ b/tools/plotter/src/logarithm.rs
@@ -30,7 +30,7 @@ pub fn draw_logs(
     chart.draw_series(LineSeries::new(
         (0..=RANGE_MAX)
             .map(|x| x as f32 * max_x / RANGE_MAX as f32)
-            .map(|x| (x, x.ln())),
+            .map(|x| (x, int_ln_baseline(x))),
         &RED,
     ))?;
 
@@ -62,7 +62,7 @@ pub fn draw_error(
         .caption(format!("y=logarithm error, x=1..{max_x}"), font)
         .x_label_area_size(30u32)
         .y_label_area_size(30u32)
-        .build_cartesian_2d(0f32..max_x, -0.5f32..0.5f32)?;
+        .build_cartesian_2d(0f32..max_x, -0.0001f32..0.0001f32)?;
 
     chart.configure_mesh().x_labels(3).y_labels(3).draw()?;
 
@@ -70,7 +70,7 @@ pub fn draw_error(
     chart.draw_series(LineSeries::new(
         (0..=RANGE_MAX)
             .map(|x| x as f32 * max_x / RANGE_MAX as f32)
-            .map(|x| (x, big_uint_ln(x) - x.ln())),
+            .map(|x| (x, big_uint_ln(x) - int_ln_baseline(x))),
         &RED,
     ))?;
 
@@ -89,6 +89,15 @@ fn big_uint_ln(x: f32) -> f32 {
     }
 }
 
+fn int_ln_baseline(x: f32) -> f32 {
+    let floor = x.trunc();
+    if floor == 0.0 {
+        0.0
+    } else {
+        floor.ln()
+    }
+}
+
 #[cfg(test)]
 mod test {
     #[test]

From e3f443cc80811f64f7b9ef2407c3dc68dcf5f8fb Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 19 Jun 2024 14:22:39 +0300
Subject: [PATCH 1012/1254] BigUint ln optimization

---
 framework/base/src/types/managed/basic/big_uint.rs | 12 ++++++++++--
 tools/plotter/src/logarithm.rs                     |  2 +-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/framework/base/src/types/managed/basic/big_uint.rs b/framework/base/src/types/managed/basic/big_uint.rs
index 2ad3fd6701..4cd040b9e9 100644
--- a/framework/base/src/types/managed/basic/big_uint.rs
+++ b/framework/base/src/types/managed/basic/big_uint.rs
@@ -244,11 +244,12 @@ impl<M: ManagedTypeApi> BigUint<M> {
     ///
     /// Returns `None` for 0.
     pub fn ln(&self) -> Option<ManagedDecimal<M, ConstDecimals<9>>> {
-        if self == &0u32 {
+        let bit_log2 = self.log2(); // aproximate, based on position of the most significant bit
+        if bit_log2 == u32::MAX {
+            // means the input was zero, TODO: change log2 return type
             return None;
         }
 
-        let bit_log2 = self.log2(); // aproximate, based on position of the most significant bit
         let scaling_factor_9 = ConstDecimals::<9>.scaling_factor();
         let divisor = BigUint::from(1u64) << bit_log2 as usize;
         let normalized = self * &*scaling_factor_9 / divisor;
@@ -290,6 +291,13 @@ impl<M: ManagedTypeApi> BigUint<M> {
     }
 }
 
+// impl<M: ManagedTypeApi, D: Decimals>
+//      ManagedDecimal<M, D>
+// {
+//     pub fn ln(&self) -> Option<ManagedDecimal<M, ConstDecimals<9>>> {
+//     }
+// }
+
 impl<M: ManagedTypeApi> Clone for BigUint<M> {
     fn clone(&self) -> Self {
         let api = M::managed_type_impl();
diff --git a/tools/plotter/src/logarithm.rs b/tools/plotter/src/logarithm.rs
index 93765864d2..bcb57c02dc 100644
--- a/tools/plotter/src/logarithm.rs
+++ b/tools/plotter/src/logarithm.rs
@@ -61,7 +61,7 @@ pub fn draw_error(
         .margin(20u32)
         .caption(format!("y=logarithm error, x=1..{max_x}"), font)
         .x_label_area_size(30u32)
-        .y_label_area_size(30u32)
+        .y_label_area_size(50u32)
         .build_cartesian_2d(0f32..max_x, -0.0001f32..0.0001f32)?;
 
     chart.configure_mesh().x_labels(3).y_labels(3).draw()?;

From 6290dd06acb58661c0cc100cda198e2cd1a29440 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 19 Jun 2024 16:09:05 +0300
Subject: [PATCH 1013/1254] plotters - BigFloat logarithm, refactor

---
 .../base/src/types/managed/basic/big_float.rs |  51 ++++++---
 tools/plotter/src/lib.rs                      |  27 ++++-
 tools/plotter/src/logarithm_bf.rs             | 102 ++++++++++++++++++
 .../src/{logarithm.rs => logarithm_bu.rs}     |   4 +-
 tools/plotter/www/index.html                  |   6 +-
 tools/plotter/www/index.js                    |  16 ++-
 6 files changed, 179 insertions(+), 27 deletions(-)
 create mode 100644 tools/plotter/src/logarithm_bf.rs
 rename tools/plotter/src/{logarithm.rs => logarithm_bu.rs} (98%)

diff --git a/framework/base/src/types/managed/basic/big_float.rs b/framework/base/src/types/managed/basic/big_float.rs
index e0859e97e8..e3180cd077 100644
--- a/framework/base/src/types/managed/basic/big_float.rs
+++ b/framework/base/src/types/managed/basic/big_float.rs
@@ -14,6 +14,9 @@ use crate::codec::{
     NestedEncodeOutput, TopDecode, TopDecodeInput, TopEncode, TopEncodeOutput, TryStaticCast,
 };
 
+/// Denomiator used for initializing BigFloats from constants.
+const DENOMINATOR: i64 = 1_000_000_000;
+
 #[derive(Debug)]
 #[repr(transparent)]
 pub struct BigFloat<M: ManagedTypeApi> {
@@ -177,33 +180,53 @@ impl<M: ManagedTypeApi> BigFloat<M> {
     }
 
     pub fn ln(&self) -> Self {
-        if self == &BigFloat::from(1i64) {
-            return BigFloat::from(0i64);
+        let one = BigFloat::from(1i64);
+        match self.cmp(&one) {
+            core::cmp::Ordering::Less => {
+                let inv = &one / self;
+                debug_assert!(inv > one);
+                inv.ln_gt_one().neg()
+            },
+            core::cmp::Ordering::Equal => BigFloat::from(0i64),
+            core::cmp::Ordering::Greater => self.ln_gt_one(),
         }
+    }
+
+    /// Computes the natural logarithm for values between 1 and 2. Performs very poorly outside of this interval.
+    fn ln_between_one_and_two(&self) -> Self {
+        let mut result = BigFloat::from_frac(-56570851, DENOMINATOR); // -0.056570851
+        result *= self;
+        result += BigFloat::from_frac(447179550, DENOMINATOR); // 0.44717955
+        result *= self;
+        result += BigFloat::from_frac(-1469956800, DENOMINATOR); // -1.4699568
+        result *= self;
+        result += BigFloat::from_frac(2821202600, DENOMINATOR); // 2.8212026
+        result *= self;
+        result += BigFloat::from_frac(-1741793900, DENOMINATOR); // -1.7417939
+
+        result
+    }
 
+    /// Computes the natural logarithm for values > 1.
+    fn ln_gt_one(&self) -> Self {
         // find the highest power of 2 less than or equal to self
         let trunc_val = self.trunc();
         let trunc_val_unsigned = trunc_val
             .into_big_uint()
             .unwrap_or_sc_panic("log argument must be positive");
-        let bit_log2 = trunc_val_unsigned.log2(); // aproximate, based on position of the most significant bit
+        let bit_log2 = trunc_val_unsigned.log2(); // approximate, based on position of the most significant bit
+        if bit_log2 == u32::MAX {
+            // means the input was zero, TODO: change log2 return type
+            return BigFloat::from(0i64);
+            // return None;
+        }
         let divisor = BigFloat::from(1 << bit_log2);
         let x = self / &divisor; // normalize to [1.0, 2.0]
 
         debug_assert!(x >= 1);
         debug_assert!(x <= 2);
 
-        const DENOMINATOR: i64 = 1_000_000_000;
-
-        let mut result = BigFloat::from_frac(-56570851, DENOMINATOR); // -0.056570851
-        result *= &x;
-        result += BigFloat::from_frac(447179550, DENOMINATOR); // 0.44717955
-        result *= &x;
-        result += BigFloat::from_frac(-1469956800, DENOMINATOR); // -1.4699568
-        result *= &x;
-        result += BigFloat::from_frac(2821202600, DENOMINATOR); // 2.8212026
-        result *= &x;
-        result += BigFloat::from_frac(-1741793900, DENOMINATOR); // -1.7417939
+        let mut result = x.ln_between_one_and_two();
 
         let ln_of_2 = BigFloat::from_frac(693147180, DENOMINATOR); // 0.69314718
         result += BigFloat::from(bit_log2 as i32) * ln_of_2;
diff --git a/tools/plotter/src/lib.rs b/tools/plotter/src/lib.rs
index 2972f468fd..8b68884dfd 100644
--- a/tools/plotter/src/lib.rs
+++ b/tools/plotter/src/lib.rs
@@ -3,7 +3,8 @@
 use wasm_bindgen::prelude::*;
 use web_sys::HtmlCanvasElement;
 
-pub mod logarithm;
+pub mod logarithm_bf;
+pub mod logarithm_bu;
 
 #[global_allocator]
 static ALLOC: wee_alloc::WeeAlloc = wee_alloc::WeeAlloc::INIT;
@@ -29,15 +30,31 @@ pub struct Point {
 impl Chart {
     /// Draw provided functions on the canvas.
     /// Return `Chart` struct suitable for coordinate conversion.
-    pub fn logarithm(canvas: HtmlCanvasElement, max_x: f32) -> Result<Chart, JsValue> {
-        let map_coord = logarithm::draw_logs(canvas, max_x).map_err(|err| err.to_string())?;
+    pub fn ln_big_uint(canvas: HtmlCanvasElement, max_x: f32) -> Result<Chart, JsValue> {
+        let map_coord = logarithm_bu::draw_bu_logs(canvas, max_x).map_err(|err| err.to_string())?;
         Ok(Chart {
             convert: Box::new(move |coord| map_coord(coord).map(|(x, y)| (x.into(), y.into()))),
         })
     }
 
-    pub fn logarithm_error(canvas: HtmlCanvasElement, max_x: f32) -> Result<Chart, JsValue> {
-        let map_coord = logarithm::draw_error(canvas, max_x).map_err(|err| err.to_string())?;
+    pub fn ln_big_uint_error(canvas: HtmlCanvasElement, max_x: f32) -> Result<Chart, JsValue> {
+        let map_coord =
+            logarithm_bu::draw_bu_error(canvas, max_x).map_err(|err| err.to_string())?;
+        Ok(Chart {
+            convert: Box::new(move |coord| map_coord(coord).map(|(x, y)| (x.into(), y.into()))),
+        })
+    }
+
+    pub fn ln_big_float(canvas: HtmlCanvasElement, max_x: f32) -> Result<Chart, JsValue> {
+        let map_coord = logarithm_bf::draw_bf_logs(canvas, max_x).map_err(|err| err.to_string())?;
+        Ok(Chart {
+            convert: Box::new(move |coord| map_coord(coord).map(|(x, y)| (x.into(), y.into()))),
+        })
+    }
+
+    pub fn ln_big_float_error(canvas: HtmlCanvasElement, max_x: f32) -> Result<Chart, JsValue> {
+        let map_coord =
+            logarithm_bf::draw_bf_error(canvas, max_x).map_err(|err| err.to_string())?;
         Ok(Chart {
             convert: Box::new(move |coord| map_coord(coord).map(|(x, y)| (x.into(), y.into()))),
         })
diff --git a/tools/plotter/src/logarithm_bf.rs b/tools/plotter/src/logarithm_bf.rs
new file mode 100644
index 0000000000..8126f19c71
--- /dev/null
+++ b/tools/plotter/src/logarithm_bf.rs
@@ -0,0 +1,102 @@
+use crate::DrawResult;
+use multiversx_sc::types::BigFloat;
+use multiversx_sc_scenario::api::StaticApi;
+use plotters::prelude::*;
+use plotters_canvas::CanvasBackend;
+use web_sys::HtmlCanvasElement;
+
+pub fn draw_bf_logs(
+    canvas: HtmlCanvasElement,
+    max_x: f32,
+) -> DrawResult<impl Fn((i32, i32)) -> Option<(f32, f32)>> {
+    let root = CanvasBackend::with_canvas_object(canvas)
+        .unwrap()
+        .into_drawing_area();
+
+    let font: FontDesc = ("sans-serif", 20.0).into();
+
+    root.fill(&WHITE)?;
+
+    let mut chart = ChartBuilder::on(&root)
+        .margin(20u32)
+        .caption(format!("y=ln(x), x=1..{max_x}"), font)
+        .x_label_area_size(30u32)
+        .y_label_area_size(30u32)
+        .build_cartesian_2d(0f32..max_x, -5f32..5f32)?;
+
+    chart.configure_mesh().x_labels(3).y_labels(3).draw()?;
+
+    const RANGE_MAX: i32 = 1000;
+    chart.draw_series(LineSeries::new(
+        (0..=RANGE_MAX)
+            .map(|x| x as f32 * max_x / RANGE_MAX as f32)
+            .map(|x| (x, ln_baseline(x))),
+        &RED,
+    ))?;
+
+    chart.draw_series(LineSeries::new(
+        (0..=RANGE_MAX)
+            .map(|x| x as f32 * max_x / RANGE_MAX as f32)
+            .map(|x| (x, big_float_ln(x))),
+        &GREEN,
+    ))?;
+
+    root.present()?;
+    return Ok(chart.into_coord_trans());
+}
+
+pub fn draw_bf_error(
+    canvas: HtmlCanvasElement,
+    max_x: f32,
+) -> DrawResult<impl Fn((i32, i32)) -> Option<(f32, f32)>> {
+    let root = CanvasBackend::with_canvas_object(canvas)
+        .unwrap()
+        .into_drawing_area();
+
+    let font: FontDesc = ("sans-serif", 20.0).into();
+
+    root.fill(&WHITE)?;
+
+    let mut chart = ChartBuilder::on(&root)
+        .margin(20u32)
+        .caption(format!("y=logarithm error, x=1..{max_x}"), font)
+        .x_label_area_size(30u32)
+        .y_label_area_size(50u32)
+        .build_cartesian_2d(0f32..max_x, -0.0001f32..0.0001f32)?;
+
+    chart.configure_mesh().x_labels(3).y_labels(3).draw()?;
+
+    const RANGE_MAX: i32 = 1000;
+    chart.draw_series(LineSeries::new(
+        (0..=RANGE_MAX)
+            .map(|x| x as f32 * max_x / RANGE_MAX as f32)
+            .map(|x| (x, big_float_ln(x) - ln_baseline(x))),
+        &RED,
+    ))?;
+
+    root.present()?;
+    return Ok(chart.into_coord_trans());
+}
+
+fn big_float_ln(x: f32) -> f32 {
+    const PREC: i64 = 1_000_000;
+    let bf = BigFloat::<StaticApi>::from_frac((x * PREC as f32) as i64, PREC);
+    let ln_dec = bf.ln();
+    let ln_units = (ln_dec * PREC.into()).trunc().to_i64().unwrap();
+    (ln_units as f64 / PREC as f64) as f32
+}
+
+fn ln_baseline(x: f32) -> f32 {
+    x.ln()
+}
+
+// #[cfg(test)]
+// mod test {
+//     #[test]
+//     fn sc_ln_test() {
+//         assert_eq!(logarithm_bu::big_uint_ln(0.0), 0.0);
+//         assert!(logarithm_bu::big_uint_ln(1.0) > 0.0);
+//         assert!(logarithm_bu::big_uint_ln(1.0) < 0.01);
+//         assert!(logarithm_bu::big_uint_ln(2.0) > 0.6);
+//     }
+// }
diff --git a/tools/plotter/src/logarithm.rs b/tools/plotter/src/logarithm_bu.rs
similarity index 98%
rename from tools/plotter/src/logarithm.rs
rename to tools/plotter/src/logarithm_bu.rs
index bcb57c02dc..2488983d33 100644
--- a/tools/plotter/src/logarithm.rs
+++ b/tools/plotter/src/logarithm_bu.rs
@@ -5,7 +5,7 @@ use plotters::prelude::*;
 use plotters_canvas::CanvasBackend;
 use web_sys::HtmlCanvasElement;
 
-pub fn draw_logs(
+pub fn draw_bu_logs(
     canvas: HtmlCanvasElement,
     max_x: f32,
 ) -> DrawResult<impl Fn((i32, i32)) -> Option<(f32, f32)>> {
@@ -45,7 +45,7 @@ pub fn draw_logs(
     return Ok(chart.into_coord_trans());
 }
 
-pub fn draw_error(
+pub fn draw_bu_error(
     canvas: HtmlCanvasElement,
     max_x: f32,
 ) -> DrawResult<impl Fn((i32, i32)) -> Option<(f32, f32)>> {
diff --git a/tools/plotter/www/index.html b/tools/plotter/www/index.html
index 94054ef4d4..37e874280e 100644
--- a/tools/plotter/www/index.html
+++ b/tools/plotter/www/index.html
@@ -17,8 +17,10 @@ <h1>MultiversX SC function plots</h1>
 	    <div id="control">
 			<label for="plot-type">Demo: </label>
 			<select id="plot-type">
-				<option value="logarithm">Logarithms (BigUint)</option>
-				<option value="logarithm-error">Logarithm (BigUint) Error</option>
+				<option value="ln-bu">Logarithms (BigUint)</option>
+				<option value="ln-bu-error">Logarithm (BigUint) Error</option>
+				<option value="ln-bf">Logarithms (BigFloat)</option>
+				<option value="ln-bf-error">Logarithm (BigFloat) Error</option>
 			</select>
 			<div id="logControl" class="hide">
 				<label for="logMax">Max value: </label> <input id="logMax" type="range" min="1" max="100" value="10">
diff --git a/tools/plotter/www/index.js b/tools/plotter/www/index.js
index 478001eebc..f9dbafe4b1 100644
--- a/tools/plotter/www/index.js
+++ b/tools/plotter/www/index.js
@@ -74,13 +74,21 @@ function updatePlot() {
 	chart = null;
 	const start = performance.now();
 	switch (selected.value) {
-		case "logarithm":
+		case "ln-bu":
 			logControl.classList.remove("hide");
-			chart = Chart.logarithm(canvas, Number(logMax.value));
+			chart = Chart.ln_big_uint(canvas, Number(logMax.value));
 			break;
-		case "logarithm-error":
+		case "ln-bu-error":
 			logControl.classList.remove("hide");
-			chart = Chart.logarithm_error(canvas, Number(logMax.value));
+			chart = Chart.ln_big_uint_error(canvas, Number(logMax.value));
+			break;
+		case "ln-bf":
+			logControl.classList.remove("hide");
+			chart = Chart.ln_big_float(canvas, Number(logMax.value));
+			break;
+		case "ln-bf-error":
+			logControl.classList.remove("hide");
+			chart = Chart.ln_big_float_error(canvas, Number(logMax.value));
 			break;
 		default:
 			logControl.classList.add("hide");

From 423e5322ed58b0caf0dc41c56df44982ac4ac4f0 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 19 Jun 2024 16:35:56 +0300
Subject: [PATCH 1014/1254] BigFloat ln - fix for inputs <=0

---
 .../base/src/types/managed/basic/big_float.rs | 17 +++++++---
 tools/plotter/src/logarithm_bf.rs             | 31 +++++++++++--------
 tools/plotter/src/logarithm_bu.rs             |  2 +-
 .../vh_managed_types/vh_big_float.rs          | 10 +++---
 4 files changed, 38 insertions(+), 22 deletions(-)

diff --git a/framework/base/src/types/managed/basic/big_float.rs b/framework/base/src/types/managed/basic/big_float.rs
index e3180cd077..020d6dec0a 100644
--- a/framework/base/src/types/managed/basic/big_float.rs
+++ b/framework/base/src/types/managed/basic/big_float.rs
@@ -179,16 +179,25 @@ impl<M: ManagedTypeApi> BigFloat<M> {
         ManagedDecimal::<M, T>::from_big_float(self, decimals)
     }
 
-    pub fn ln(&self) -> Self {
+    /// Computes the natural logarithm of the current number.
+    /// 
+    /// The error is around +/- 0.00006, for all inputs.
+    /// 
+    /// Will return `None` for zero or negative numbers.
+    pub fn ln(&self) -> Option<Self> {
+        if self <= &0i64 {
+            return None;
+        }
+
         let one = BigFloat::from(1i64);
         match self.cmp(&one) {
             core::cmp::Ordering::Less => {
                 let inv = &one / self;
                 debug_assert!(inv > one);
-                inv.ln_gt_one().neg()
+                Some(inv.ln_gt_one().neg())
             },
-            core::cmp::Ordering::Equal => BigFloat::from(0i64),
-            core::cmp::Ordering::Greater => self.ln_gt_one(),
+            core::cmp::Ordering::Equal => Some(BigFloat::from(0i64)),
+            core::cmp::Ordering::Greater => Some(self.ln_gt_one()),
         }
     }
 
diff --git a/tools/plotter/src/logarithm_bf.rs b/tools/plotter/src/logarithm_bf.rs
index 8126f19c71..e3e70f57ec 100644
--- a/tools/plotter/src/logarithm_bf.rs
+++ b/tools/plotter/src/logarithm_bf.rs
@@ -81,22 +81,27 @@ pub fn draw_bf_error(
 fn big_float_ln(x: f32) -> f32 {
     const PREC: i64 = 1_000_000;
     let bf = BigFloat::<StaticApi>::from_frac((x * PREC as f32) as i64, PREC);
-    let ln_dec = bf.ln();
-    let ln_units = (ln_dec * PREC.into()).trunc().to_i64().unwrap();
-    (ln_units as f64 / PREC as f64) as f32
+    if let Some(ln_dec) = bf.ln() {
+        let ln_units = (ln_dec * PREC.into()).trunc().to_i64().unwrap();
+        (ln_units as f64 / PREC as f64) as f32
+    } else {
+        0.0
+    }
 }
 
 fn ln_baseline(x: f32) -> f32 {
     x.ln()
 }
 
-// #[cfg(test)]
-// mod test {
-//     #[test]
-//     fn sc_ln_test() {
-//         assert_eq!(logarithm_bu::big_uint_ln(0.0), 0.0);
-//         assert!(logarithm_bu::big_uint_ln(1.0) > 0.0);
-//         assert!(logarithm_bu::big_uint_ln(1.0) < 0.01);
-//         assert!(logarithm_bu::big_uint_ln(2.0) > 0.6);
-//     }
-// }
+#[cfg(test)]
+mod test {
+    #[test]
+    fn sc_ln_test() {
+        assert_eq!(super::big_float_ln(0.0), 0.0);
+        assert_eq!(super::big_float_ln(1.0), 0.0);
+        assert!(super::big_float_ln(0.5) < -0.693);
+        assert!(super::big_float_ln(0.5) > -0.694);
+        assert!(super::big_float_ln(1.0) < 0.01);
+        assert!(super::big_float_ln(2.0) > 0.6);
+    }
+}
diff --git a/tools/plotter/src/logarithm_bu.rs b/tools/plotter/src/logarithm_bu.rs
index 2488983d33..bd10efed86 100644
--- a/tools/plotter/src/logarithm_bu.rs
+++ b/tools/plotter/src/logarithm_bu.rs
@@ -103,7 +103,7 @@ mod test {
     #[test]
     fn sc_ln_test() {
         assert_eq!(super::big_uint_ln(0.0), 0.0);
-        assert!(super::big_uint_ln(1.0) > 0.0);
+        assert!(super::big_uint_ln(1.0) >= 0.0);
         assert!(super::big_uint_ln(1.0) < 0.01);
         assert!(super::big_uint_ln(2.0) > 0.6);
     }
diff --git a/vm/src/vm_hooks/vh_handler/vh_managed_types/vh_big_float.rs b/vm/src/vm_hooks/vh_handler/vh_managed_types/vh_big_float.rs
index 1e2410fc9c..4c2c06b49a 100644
--- a/vm/src/vm_hooks/vh_handler/vh_managed_types/vh_big_float.rs
+++ b/vm/src/vm_hooks/vh_handler/vh_managed_types/vh_big_float.rs
@@ -8,7 +8,7 @@ use core::{
     ops::{Add, Div, Mul, Neg, Sub},
 };
 use num_bigint::BigInt;
-use num_traits::ToPrimitive;
+use num_traits::{ToPrimitive, Zero};
 use std::convert::TryInto;
 
 macro_rules! binary_op_method {
@@ -115,16 +115,18 @@ pub trait VMHooksBigFloat: VMHooksHandlerSource + VMHooksError {
 
     fn bf_sign(&self, x: RawHandle) -> i32 {
         let bf = self.m_types_lock().bf_get_f64(x);
+        if bf.is_zero() {
+            return 0;
+        }
+
         if !bf.is_normal() {
             self.vm_error(vm_err_msg::NUMBER_IS_NOT_NORMAL)
         }
 
         if bf.is_sign_positive() {
             1
-        } else if bf.is_sign_negative() {
-            -1
         } else {
-            0
+            -1
         }
     }
 

From 80cc2904c6d77ed6c50569d8281a0928f1eceb8d Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 19 Jun 2024 18:43:00 +0300
Subject: [PATCH 1015/1254] fixed ManagedDecimal fmt & BigFloat tests

---
 .../src/big_float_operators.rs                |  1 +
 .../base/src/types/managed/basic/big_float.rs |  4 +-
 .../base/src/types/managed/basic/big_uint.rs  |  7 ---
 .../types/managed/wrapped/managed_decimal.rs  | 48 +++++++++++++++----
 framework/scenario/tests/big_float_test.rs    | 30 ++++++------
 framework/scenario/tests/big_uint_test.rs     |  4 +-
 6 files changed, 61 insertions(+), 33 deletions(-)

diff --git a/contracts/feature-tests/big-float-features/src/big_float_operators.rs b/contracts/feature-tests/big-float-features/src/big_float_operators.rs
index fcad578694..a5fae8a720 100644
--- a/contracts/feature-tests/big-float-features/src/big_float_operators.rs
+++ b/contracts/feature-tests/big-float-features/src/big_float_operators.rs
@@ -88,5 +88,6 @@ pub trait BigFloatOperators {
     #[endpoint]
     fn ln_big_float_ref(&self, a: &BigFloat) -> BigFloat {
         a.ln()
+            .unwrap_or_else(|| sc_panic!("log argument must pe strictly positive"))
     }
 }
diff --git a/framework/base/src/types/managed/basic/big_float.rs b/framework/base/src/types/managed/basic/big_float.rs
index 020d6dec0a..e7989eaaa4 100644
--- a/framework/base/src/types/managed/basic/big_float.rs
+++ b/framework/base/src/types/managed/basic/big_float.rs
@@ -180,9 +180,9 @@ impl<M: ManagedTypeApi> BigFloat<M> {
     }
 
     /// Computes the natural logarithm of the current number.
-    /// 
+    ///
     /// The error is around +/- 0.00006, for all inputs.
-    /// 
+    ///
     /// Will return `None` for zero or negative numbers.
     pub fn ln(&self) -> Option<Self> {
         if self <= &0i64 {
diff --git a/framework/base/src/types/managed/basic/big_uint.rs b/framework/base/src/types/managed/basic/big_uint.rs
index 4cd040b9e9..658697c2ec 100644
--- a/framework/base/src/types/managed/basic/big_uint.rs
+++ b/framework/base/src/types/managed/basic/big_uint.rs
@@ -291,13 +291,6 @@ impl<M: ManagedTypeApi> BigUint<M> {
     }
 }
 
-// impl<M: ManagedTypeApi, D: Decimals>
-//      ManagedDecimal<M, D>
-// {
-//     pub fn ln(&self) -> Option<ManagedDecimal<M, ConstDecimals<9>>> {
-//     }
-// }
-
 impl<M: ManagedTypeApi> Clone for BigUint<M> {
     fn clone(&self) -> Self {
         let api = M::managed_type_impl();
diff --git a/framework/base/src/types/managed/wrapped/managed_decimal.rs b/framework/base/src/types/managed/wrapped/managed_decimal.rs
index 1775a9e75c..dbe5c6b16d 100644
--- a/framework/base/src/types/managed/wrapped/managed_decimal.rs
+++ b/framework/base/src/types/managed/wrapped/managed_decimal.rs
@@ -1,10 +1,11 @@
 use crate::{
     abi::{TypeAbi, TypeAbiFrom, TypeName},
     api::{
-        const_handles, use_raw_handle, BigFloatApiImpl, BigIntApiImpl, ManagedTypeApi,
-        StaticVarApiImpl,
+        const_handles, use_raw_handle, BigFloatApiImpl, BigIntApiImpl, HandleConstraints,
+        ManagedBufferApiImpl, ManagedTypeApi, StaticVarApiImpl,
     },
     formatter::{FormatBuffer, FormatByteReceiver, SCDisplay},
+    proxy_imports::{ManagedBuffer, ManagedType},
     types::{BigFloat, BigUint},
 };
 
@@ -410,12 +411,43 @@ impl<M: ManagedTypeApi, const DECIMALS: NumDecimals> TypeAbi
 }
 impl<M: ManagedTypeApi, D: Decimals> SCDisplay for ManagedDecimal<M, D> {
     fn fmt<F: FormatByteReceiver>(&self, f: &mut F) {
-        let sf = self.decimals.scaling_factor();
-        let temp = &self.data / sf.deref();
-        temp.fmt(f);
-        f.append_bytes(b".");
-        let temp = &self.data % sf.deref();
-        temp.fmt(f);
+        let full_str_handle: M::ManagedBufferHandle =
+            use_raw_handle(const_handles::MBUF_TEMPORARY_1);
+        M::managed_type_impl().bi_to_string(self.data.handle.clone(), full_str_handle.clone());
+        let len = M::managed_type_impl().mb_len(full_str_handle.clone());
+        let nr_dec = self.decimals.num_decimals();
+
+        if len > nr_dec {
+            let temp_str_handle: M::ManagedBufferHandle =
+                use_raw_handle(const_handles::MBUF_TEMPORARY_2);
+            let _ = M::managed_type_impl().mb_copy_slice(
+                full_str_handle.clone(),
+                0,
+                len - nr_dec,
+                temp_str_handle.clone(),
+            );
+            f.append_managed_buffer(&ManagedBuffer::from_raw_handle(
+                temp_str_handle.get_raw_handle(),
+            ));
+            f.append_bytes(b".");
+            let _ = M::managed_type_impl().mb_copy_slice(
+                full_str_handle.clone(),
+                len - nr_dec,
+                nr_dec,
+                temp_str_handle.clone(),
+            );
+            f.append_managed_buffer(&ManagedBuffer::from_raw_handle(
+                temp_str_handle.get_raw_handle(),
+            ));
+        } else {
+            f.append_bytes(b"0.");
+            for _ in len..nr_dec {
+                f.append_bytes(b"0");
+            }
+            f.append_managed_buffer(&ManagedBuffer::from_raw_handle(
+                full_str_handle.get_raw_handle(),
+            ));
+        }
     }
 }
 
diff --git a/framework/scenario/tests/big_float_test.rs b/framework/scenario/tests/big_float_test.rs
index d5e0a16526..2b98cbae41 100644
--- a/framework/scenario/tests/big_float_test.rs
+++ b/framework/scenario/tests/big_float_test.rs
@@ -48,7 +48,7 @@ fn big_float_overflow_test_rs() {
 #[test]
 fn big_float_ln_test_rs() {
     let x = BigFloat::<StaticApi>::from(23i64);
-    let ln_x = x.ln();
+    let ln_x = x.ln().unwrap();
     assert_eq!(ln_x.to_managed_decimal(9usize).to_string(), "3.135514648");
     assert!(ln_x.is_close(
         &BigFloat::from_frac(3135514648, 1_000_000_000), // 3.135514648
@@ -56,7 +56,7 @@ fn big_float_ln_test_rs() {
     ));
 
     let big = BigFloat::<StaticApi>::from(382747812i64);
-    let ln_big = big.ln();
+    let ln_big = big.ln().unwrap();
     assert_eq!(
         ln_big.to_managed_decimal(9usize).to_string(),
         "19.762913880"
@@ -67,7 +67,7 @@ fn big_float_ln_test_rs() {
     ));
 
     let biggest = BigFloat::<StaticApi>::from(999999999i64);
-    let ln_biggest = biggest.ln();
+    let ln_biggest = biggest.ln().unwrap();
     assert_eq!(
         ln_biggest.to_managed_decimal(9usize).to_string(),
         "20.723319778"
@@ -78,7 +78,7 @@ fn big_float_ln_test_rs() {
     ));
 
     let small = BigFloat::<StaticApi>::from_frac(3i64, 2i64);
-    let ln_small = small.ln();
+    let ln_small = small.ln().unwrap();
     assert_eq!(
         ln_small.to_managed_decimal(9usize).to_string(),
         "0.405448248"
@@ -89,19 +89,21 @@ fn big_float_ln_test_rs() {
     ));
 
     let smallest = BigFloat::<StaticApi>::from(1i64);
-    let ln_smallest = smallest.ln();
-    assert_eq!(ln_smallest.to_managed_decimal(9usize).to_string(), "0.0");
+    let ln_smallest = smallest.ln().unwrap();
+    assert_eq!(
+        ln_smallest.to_managed_decimal(9usize).to_string(),
+        "0.000000000"
+    );
     assert!(ln_smallest.is_close(
         &BigFloat::from(0i64), // 0.0
         &BigFloat::from_frac(1, 100_000_000)
     ));
 
-    // fails for now, accuracy is not great around 1.1
-    // let y = BigFloat::<StaticApi>::from_frac(11i64, 10i64);
-    // let ln_y = y.ln();
-    // assert_eq!(ln_y.to_managed_decimal(9usize).to_string(), "0.095310179");
-    // assert!(ln_y.is_close(
-    //     &BigFloat::from_frac(95310179, 1_000_000_000), // 0.095310179
-    //     &BigFloat::from_frac(1, 1_000_000_000)
-    // ));
+    let y = BigFloat::<StaticApi>::from_frac(11i64, 10i64);
+    let ln_y = y.ln().unwrap();
+    assert_eq!(ln_y.to_managed_decimal(9usize).to_string(), "0.095251830");
+    assert!(ln_y.is_close(
+        &BigFloat::from_frac(95251830, 1_000_000_000), // 0.095310179
+        &BigFloat::from_frac(1, 1_000_000_000)
+    ));
 }
diff --git a/framework/scenario/tests/big_uint_test.rs b/framework/scenario/tests/big_uint_test.rs
index fae86ecd6d..60ad0ab78f 100644
--- a/framework/scenario/tests/big_uint_test.rs
+++ b/framework/scenario/tests/big_uint_test.rs
@@ -11,9 +11,9 @@ fn assert_big_uint_ln(x: u32, ln_str: &str) {
 fn test_big_uint_ln() {
     assert_big_uint_ln(23, "3.135514649"); // vs. 3.1354942159291497 first 6 decimals are ok
 
-    assert_big_uint_ln(1, "0.60599");
+    assert_big_uint_ln(1, "0.000060599");
     assert_big_uint_ln(2, "0.693207779"); // vs. 0.6931471805599453
-    assert_big_uint_ln(3, "1.98595430"); // vs. 1.0986122886681096
+    assert_big_uint_ln(3, "1.098595430"); // vs. 1.0986122886681096
     assert_big_uint_ln(4, "1.386354959"); // vs. 1.3862943611198906
     assert_big_uint_ln(5, "1.609481340"); // vs. 1.6094379124341003
     assert_big_uint_ln(6, "1.791742610"); // vs. 1.791759469228055

From 0e380600e18fd6edffde875087649277278312f1 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Thu, 20 Jun 2024 16:07:02 +0200
Subject: [PATCH 1016/1254] added storage key to deserialization error message
 at storage get

---
 .../contract_base/wrappers/storage_raw_wrapper.rs  |  7 +++++--
 framework/base/src/storage/storage_get.rs          | 14 ++++++++++----
 .../base/src/storage/storage_get_from_address.rs   |  3 ++-
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/framework/base/src/contract_base/wrappers/storage_raw_wrapper.rs b/framework/base/src/contract_base/wrappers/storage_raw_wrapper.rs
index 5a4992c36e..22318e524f 100644
--- a/framework/base/src/contract_base/wrappers/storage_raw_wrapper.rs
+++ b/framework/base/src/contract_base/wrappers/storage_raw_wrapper.rs
@@ -65,8 +65,11 @@ where
             result_buffer.get_handle(),
         );
 
-        V::top_decode_or_handle_err(result_buffer, StorageGetErrorHandler::<A>::default())
-            .unwrap_infallible()
+        V::top_decode_or_handle_err(
+            result_buffer,
+            StorageGetErrorHandler::<A>::new(key.get_raw_handle()),
+        )
+        .unwrap_infallible()
     }
 
     /// Write a serializable value to storage under the given key
diff --git a/framework/base/src/storage/storage_get.rs b/framework/base/src/storage/storage_get.rs
index 4fc8ee9259..91efe992b2 100644
--- a/framework/base/src/storage/storage_get.rs
+++ b/framework/base/src/storage/storage_get.rs
@@ -135,9 +135,10 @@ where
     T: TopDecode,
     A: StorageReadApi + ManagedTypeApi + ErrorApi,
 {
+    let handle = key.get_raw_handle();
     T::top_decode_or_handle_err(
         StorageGetInput::new(key),
-        StorageGetErrorHandler::<A>::default(),
+        StorageGetErrorHandler::<A>::new(handle),
     )
     .unwrap_infallible()
 }
@@ -161,17 +162,20 @@ where
     M: ManagedTypeApi + ErrorApi,
 {
     _phantom: PhantomData<M>,
+    key: i32,
 }
 
 impl<M> Copy for StorageGetErrorHandler<M> where M: ManagedTypeApi + ErrorApi {}
 
-impl<M> Default for StorageGetErrorHandler<M>
+impl<M> StorageGetErrorHandler<M>
 where
     M: ManagedTypeApi + ErrorApi,
 {
-    fn default() -> Self {
-        Self {
+    #[inline]
+    pub fn new(key: i32) -> Self {
+        StorageGetErrorHandler {
             _phantom: PhantomData,
+            key,
         }
     }
 }
@@ -186,6 +190,8 @@ where
         let mut message_buffer =
             ManagedBuffer::<M>::new_from_bytes(err_msg::STORAGE_DECODE_ERROR.as_bytes());
         message_buffer.append_bytes(err.message_bytes());
+        message_buffer.append_bytes(b"at key: ");
+        M::managed_type_impl().mb_append(message_buffer.get_handle(), self.key.into());
         M::error_api_impl().signal_error_from_buffer(message_buffer.get_handle())
     }
 }
diff --git a/framework/base/src/storage/storage_get_from_address.rs b/framework/base/src/storage/storage_get_from_address.rs
index 504e725724..6b6ca7e282 100644
--- a/framework/base/src/storage/storage_get_from_address.rs
+++ b/framework/base/src/storage/storage_get_from_address.rs
@@ -148,9 +148,10 @@ where
     T: TopDecode,
     A: StorageReadApi + ManagedTypeApi + ErrorApi,
 {
+    let handle = key.get_raw_handle();
     T::top_decode_or_handle_err(
         StorageGetFromAddressInput::new(addr, key),
-        StorageGetErrorHandler::<A>::default(),
+        StorageGetErrorHandler::<A>::new(handle),
     )
     .unwrap_infallible()
 }

From d8c479a2f3fc90733cda34e7e9ea760fee089c1f Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 21 Jun 2024 12:32:33 +0300
Subject: [PATCH 1017/1254] test address PartialEq implementation

---
 .../types/interaction/expr/test_address.rs    | 44 ++++++++++++++++++-
 .../types/interaction/expr/test_sc_address.rs | 39 +++++++++++++++-
 framework/scenario/tests/address_eq_test.rs   | 39 ++++++++++++++++
 3 files changed, 118 insertions(+), 4 deletions(-)
 create mode 100644 framework/scenario/tests/address_eq_test.rs

diff --git a/framework/base/src/types/interaction/expr/test_address.rs b/framework/base/src/types/interaction/expr/test_address.rs
index 88799c06d2..01d1dc819d 100644
--- a/framework/base/src/types/interaction/expr/test_address.rs
+++ b/framework/base/src/types/interaction/expr/test_address.rs
@@ -6,11 +6,13 @@ use crate::{
     abi::TypeAbiFrom,
     api::ManagedTypeApi,
     types::{
-        AnnotatedValue, ManagedAddress, ManagedBuffer, TxEnv, TxFrom, TxFromSpecified, TxTo,
-        TxToSpecified,
+        heap::Address, AnnotatedValue, ManagedAddress, ManagedBuffer, TxEnv, TxFrom,
+        TxFromSpecified, TxTo, TxToSpecified,
     },
 };
 
+use super::TestSCAddress;
+
 const ADDRESS_PREFIX: &str = "address:";
 
 /// Encodes a dummy address, to be used for tests.
@@ -40,12 +42,50 @@ impl<'a> TestAddress<'a> {
         result
     }
 
+    pub fn to_address(&self) -> Address {
+        self.eval_to_array().into()
+    }
+
+    pub fn to_managed_address<Api: ManagedTypeApi>(&self) -> ManagedAddress<Api> {
+        self.eval_to_array().into()
+    }
+
     #[cfg(feature = "alloc")]
     pub fn eval_to_expr(&self) -> alloc::string::String {
         alloc::format!("{ADDRESS_PREFIX}{}", self.name)
     }
 }
 
+impl<'a, 'b> PartialEq<TestSCAddress<'b>> for TestAddress<'a> {
+    fn eq(&self, other: &TestSCAddress) -> bool {
+        self.to_address() == other.to_address()
+    }
+}
+
+impl<'a> PartialEq<Address> for TestAddress<'a> {
+    fn eq(&self, other: &Address) -> bool {
+        &self.to_address() == other
+    }
+}
+
+impl<'a> PartialEq<TestAddress<'a>> for Address {
+    fn eq(&self, other: &TestAddress<'a>) -> bool {
+        self == &other.to_address()
+    }
+}
+
+impl<'a, Api: ManagedTypeApi> PartialEq<ManagedAddress<Api>> for TestAddress<'a> {
+    fn eq(&self, other: &ManagedAddress<Api>) -> bool {
+        self.to_address() == other.to_address()
+    }
+}
+
+impl<'a, Api: ManagedTypeApi> PartialEq<TestAddress<'a>> for ManagedAddress<Api> {
+    fn eq(&self, other: &TestAddress<'a>) -> bool {
+        self.to_address() == other.to_address()
+    }
+}
+
 impl<'a, Env> AnnotatedValue<Env, ManagedAddress<Env::Api>> for TestAddress<'a>
 where
     Env: TxEnv,
diff --git a/framework/base/src/types/interaction/expr/test_sc_address.rs b/framework/base/src/types/interaction/expr/test_sc_address.rs
index bf01de38bf..564157fb94 100644
--- a/framework/base/src/types/interaction/expr/test_sc_address.rs
+++ b/framework/base/src/types/interaction/expr/test_sc_address.rs
@@ -11,6 +11,8 @@ use crate::{
     },
 };
 
+use super::TestAddress;
+
 const SC_PREFIX: &str = "sc:";
 const VM_TYPE_LEN: usize = 2;
 const DEFAULT_VM_TYPE: &[u8] = &[5, 0];
@@ -48,8 +50,41 @@ where
 
 impl<'a> TestSCAddress<'a> {
     pub fn to_address(&self) -> Address {
-        let expr: [u8; 32] = self.eval_to_array();
-        expr.into()
+        self.eval_to_array().into()
+    }
+
+    pub fn to_managed_address<Api: ManagedTypeApi>(&self) -> ManagedAddress<Api> {
+        self.eval_to_array().into()
+    }
+}
+
+impl<'a, 'b> PartialEq<TestAddress<'b>> for TestSCAddress<'a> {
+    fn eq(&self, other: &TestAddress) -> bool {
+        self.to_address() == other.to_address()
+    }
+}
+
+impl<'a> PartialEq<Address> for TestSCAddress<'a> {
+    fn eq(&self, other: &Address) -> bool {
+        &self.to_address() == other
+    }
+}
+
+impl<'a> PartialEq<TestSCAddress<'a>> for Address {
+    fn eq(&self, other: &TestSCAddress<'a>) -> bool {
+        self == &other.to_address()
+    }
+}
+
+impl<'a, Api: ManagedTypeApi> PartialEq<ManagedAddress<Api>> for TestSCAddress<'a> {
+    fn eq(&self, other: &ManagedAddress<Api>) -> bool {
+        self.to_address() == other.to_address()
+    }
+}
+
+impl<'a, Api: ManagedTypeApi> PartialEq<TestSCAddress<'a>> for ManagedAddress<Api> {
+    fn eq(&self, other: &TestSCAddress<'a>) -> bool {
+        self.to_address() == other.to_address()
     }
 }
 
diff --git a/framework/scenario/tests/address_eq_test.rs b/framework/scenario/tests/address_eq_test.rs
new file mode 100644
index 0000000000..af78e6778b
--- /dev/null
+++ b/framework/scenario/tests/address_eq_test.rs
@@ -0,0 +1,39 @@
+use multiversx_sc::types::TestAddress;
+use multiversx_sc_scenario::api::StaticApi;
+
+const ALICE: TestAddress = TestAddress::new("alice");
+const SC_ADDR: TestAddress = TestAddress::new("sc");
+
+#[test]
+fn test_address_eq() {
+    let alice2 = TestAddress::new("alice");
+
+    assert_eq!(ALICE, alice2);
+    assert_eq!(ALICE, alice2.to_address());
+    assert_eq!(ALICE.to_address(), alice2);
+    assert_eq!(ALICE.to_address(), alice2.to_address());
+
+    assert_eq!(ALICE, alice2.to_managed_address::<StaticApi>());
+    assert_eq!(ALICE.to_managed_address::<StaticApi>(), alice2);
+    assert_eq!(
+        ALICE.to_managed_address::<StaticApi>(),
+        alice2.to_managed_address::<StaticApi>()
+    );
+}
+
+#[test]
+fn test_sc_address_eq() {
+    let sc2 = TestAddress::new("sc");
+
+    assert_eq!(SC_ADDR, sc2);
+    assert_eq!(SC_ADDR, sc2.to_address());
+    assert_eq!(SC_ADDR.to_address(), sc2);
+    assert_eq!(SC_ADDR.to_address(), sc2.to_address());
+
+    assert_eq!(SC_ADDR, sc2.to_managed_address::<StaticApi>());
+    assert_eq!(SC_ADDR.to_managed_address::<StaticApi>(), sc2);
+    assert_eq!(
+        SC_ADDR.to_managed_address::<StaticApi>(),
+        sc2.to_managed_address::<StaticApi>()
+    );
+}

From d5d9c64c514af827ee62d8857e370baed3b9321c Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Fri, 21 Jun 2024 13:40:04 +0300
Subject: [PATCH 1018/1254] storage_mapper_from_addr - test

---
 .../storage_mapper_get_at_address.scen.json   | 27 ++++++++++++++++++-
 .../src/storage_mapper_get_at_address.rs      | 14 ++++++++++
 .../basic-features/wasm/src/lib.rs            |  5 ++--
 3 files changed, 43 insertions(+), 3 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 3076c1e82b..0196df08ee 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
@@ -153,6 +153,29 @@
                 "refund": "*"
             }
         },
+        {
+            "step": "scCall",
+            "id": "len at address",
+            "tx": {
+                "from": "address:an_account",
+                "to": "sc:caller",
+                "function": "len_at_addresses",
+                "arguments": [
+                    "sc:to-be-called"
+                ],
+                "gasLimit": "50,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": [
+                    "0"
+                ],
+                "status": "",
+                "logs": "*",
+                "gas": "*",
+                "refund": "*"
+            }
+        },
         {
             "step": "scCall",
             "id": "next at address",
@@ -332,7 +355,9 @@
                 "from": "address:an_account",
                 "to": "sc:caller",
                 "function": "contains_unordered_at_address",
-                "arguments": ["5"],
+                "arguments": [
+                    "5"
+                ],
                 "gasLimit": "50,000,000",
                 "gasPrice": "0"
             },
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 a3eff89cdb..082e1f0ec7 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
@@ -18,6 +18,13 @@ pub trait StorageMapperGetAtAddress {
         self.set_mapper_from_address(address).is_empty()
     }
 
+    #[endpoint]
+    fn len_at_addresses(&self, address: ManagedAddress) -> usize {
+        let contract_address = self.contract_address().get();
+        self.set_mapper_from_address_with_keys(contract_address, address)
+            .len()
+    }
+
     #[endpoint]
     fn contains_at_address(&self, item: u32) -> bool {
         let address = self.contract_address().get();
@@ -90,6 +97,13 @@ pub trait StorageMapperGetAtAddress {
     #[storage_mapper_from_address("set_mapper")]
     fn set_mapper_from_address(&self, address: ManagedAddress) -> SetMapper<u32, ManagedAddress>;
 
+    #[storage_mapper_from_address("set_mapper")]
+    fn set_mapper_from_address_with_keys(
+        &self,
+        address1: ManagedAddress,
+        address2: ManagedAddress,
+    ) -> SetMapper<u32, ManagedAddress>;
+
     #[storage_mapper("map_mapper")]
     fn map_mapper(&self) -> MapMapper<u32, u32>;
 
diff --git a/contracts/feature-tests/basic-features/wasm/src/lib.rs b/contracts/feature-tests/basic-features/wasm/src/lib.rs
index 6dcb5c59be..3c600ab91e 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:                          389
+// Endpoints:                          390
 // Async Callback:                       1
-// Total number of exported functions: 391
+// Total number of exported functions: 392
 
 #![no_std]
 
@@ -394,6 +394,7 @@ 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
+        len_at_addresses => len_at_addresses
         contains_at_address => contains_at_address
         len_at_address => len_at_address
         next_at_address => next_at_address

From c150293cf5743a1364f839f7a8bcec1e874f9ff9 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Fri, 21 Jun 2024 18:13:57 +0300
Subject: [PATCH 1019/1254] test for singlevalue

---
 .../storage_mapper_get_at_address.scen.json   | 55 +++++++++++--------
 .../src/storage_mapper_get_at_address.rs      | 21 +++----
 2 files changed, 39 insertions(+), 37 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 0196df08ee..54274c62d9 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
@@ -15,6 +15,11 @@
                     "balance": "0",
                     "code": "mxsc:../output/basic-features.mxsc.json"
                 },
+                "sc:second-to-be-called": {
+                    "nonce": "0",
+                    "balance": "0",
+                    "code": "mxsc:../output/basic-features.mxsc.json"
+                },
                 "address:an_account": {
                     "nonce": "0",
                     "balance": "0"
@@ -63,6 +68,27 @@
                 "refund": "*"
             }
         },
+        {
+            "step": "scCall",
+            "id": "fill set mapper",
+            "tx": {
+                "from": "address:an_account",
+                "to": "sc:second-to-be-called",
+                "function": "fill_set_mapper",
+                "arguments": [
+                    "5"
+                ],
+                "gasLimit": "50,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": [],
+                "status": "",
+                "logs": "*",
+                "gas": "*",
+                "refund": "*"
+            }
+        },
         {
             "step": "checkState",
             "accounts": {
@@ -80,6 +106,12 @@
                     "storage": "*",
                     "code": "mxsc:../output/basic-features.mxsc.json"
                 },
+                "sc:second-to-be-called": {
+                    "nonce": "0",
+                    "balance": "0",
+                    "storage": "*",
+                    "code": "mxsc:../output/basic-features.mxsc.json"
+                },
                 "address:an_account": {
                     "nonce": "*",
                     "balance": "*",
@@ -153,29 +185,6 @@
                 "refund": "*"
             }
         },
-        {
-            "step": "scCall",
-            "id": "len at address",
-            "tx": {
-                "from": "address:an_account",
-                "to": "sc:caller",
-                "function": "len_at_addresses",
-                "arguments": [
-                    "sc:to-be-called"
-                ],
-                "gasLimit": "50,000,000",
-                "gasPrice": "0"
-            },
-            "expect": {
-                "out": [
-                    "0"
-                ],
-                "status": "",
-                "logs": "*",
-                "gas": "*",
-                "refund": "*"
-            }
-        },
         {
             "step": "scCall",
             "id": "next at address",
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 082e1f0ec7..229358ad61 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
@@ -7,6 +7,13 @@ pub trait StorageMapperGetAtAddress {
     #[storage_mapper("contract_address")]
     fn contract_address(&self) -> SingleValueMapper<ManagedAddress>;
 
+    #[storage_mapper_from_address("contract_address")]
+    fn set_single_value_from_address_with_keys(
+        &self,
+        address: ManagedAddress,
+        address2: ManagedAddress,
+    ) -> SingleValueMapper<ManagedAddress, ManagedAddress>;
+
     #[endpoint]
     fn set_contract_address(&self, address: ManagedAddress) {
         self.contract_address().set(address)
@@ -18,13 +25,6 @@ pub trait StorageMapperGetAtAddress {
         self.set_mapper_from_address(address).is_empty()
     }
 
-    #[endpoint]
-    fn len_at_addresses(&self, address: ManagedAddress) -> usize {
-        let contract_address = self.contract_address().get();
-        self.set_mapper_from_address_with_keys(contract_address, address)
-            .len()
-    }
-
     #[endpoint]
     fn contains_at_address(&self, item: u32) -> bool {
         let address = self.contract_address().get();
@@ -97,13 +97,6 @@ pub trait StorageMapperGetAtAddress {
     #[storage_mapper_from_address("set_mapper")]
     fn set_mapper_from_address(&self, address: ManagedAddress) -> SetMapper<u32, ManagedAddress>;
 
-    #[storage_mapper_from_address("set_mapper")]
-    fn set_mapper_from_address_with_keys(
-        &self,
-        address1: ManagedAddress,
-        address2: ManagedAddress,
-    ) -> SetMapper<u32, ManagedAddress>;
-
     #[storage_mapper("map_mapper")]
     fn map_mapper(&self) -> MapMapper<u32, u32>;
 

From 22533ddacbb417819b3ef39f601ee9b7995f6571 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 21 Jun 2024 18:32:02 +0300
Subject: [PATCH 1020/1254] basic features - UnorderedSetMapperFeatures was not
 included

---
 .../basic-features/src/basic_features_main.rs  |  2 ++
 .../src/storage_mapper_unordered_set.rs        | 18 +++++++++---------
 2 files changed, 11 insertions(+), 9 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 2f0cb9a830..d88ab8bad6 100644
--- a/contracts/feature-tests/basic-features/src/basic_features_main.rs
+++ b/contracts/feature-tests/basic-features/src/basic_features_main.rs
@@ -32,6 +32,7 @@ pub mod storage_mapper_set;
 pub mod storage_mapper_single;
 pub mod storage_mapper_token_attributes;
 pub mod storage_mapper_unique_id_mapper;
+pub mod storage_mapper_unordered_set;
 pub mod storage_mapper_vec;
 pub mod storage_mapper_whitelist;
 pub mod storage_raw_api_features;
@@ -71,6 +72,7 @@ pub trait BasicFeatures:
     + storage_mapper_fungible_token::FungibleTokenMapperFeatures
     + storage_mapper_non_fungible_token::NonFungibleTokenMapperFeatures
     + storage_mapper_unique_id_mapper::UniqueIdMapperFeatures
+    + storage_mapper_unordered_set::UnorderedSetMapperFeatures
     + struct_eq::StructEquals
     + small_num_overflow_test_ops::SmallIntOverflow
     + token_identifier_features::TokenIdentifierFeatures
diff --git a/contracts/feature-tests/basic-features/src/storage_mapper_unordered_set.rs b/contracts/feature-tests/basic-features/src/storage_mapper_unordered_set.rs
index de4e189a9b..9bca7f9378 100644
--- a/contracts/feature-tests/basic-features/src/storage_mapper_unordered_set.rs
+++ b/contracts/feature-tests/basic-features/src/storage_mapper_unordered_set.rs
@@ -4,24 +4,24 @@ multiversx_sc::imports!();
 #[multiversx_sc::module]
 pub trait UnorderedSetMapperFeatures {
     #[view]
-    #[storage_mapper("set_mapper")]
-    fn set_mapper(&self) -> UnorderedSetMapper<u32>;
+    #[storage_mapper("unordered_set_mapper")]
+    fn unordered_set_mapper(&self) -> UnorderedSetMapper<u32>;
 
     #[endpoint]
-    fn set_mapper_insert(&self, item: u32) -> bool {
-        let mut set_mapper = self.set_mapper();
+    fn unordered_set_mapper_insert(&self, item: u32) -> bool {
+        let mut set_mapper = self.unordered_set_mapper();
         set_mapper.insert(item)
     }
 
     #[endpoint]
-    fn set_mapper_contains(&self, item: u32) -> bool {
-        let set_mapper = self.set_mapper();
+    fn unordered_set_mapper_contains(&self, item: u32) -> bool {
+        let set_mapper = self.unordered_set_mapper();
         set_mapper.contains(&item)
     }
 
     #[endpoint]
-    fn set_mapper_remove(&self, item: u32) -> bool {
-        let mut set_mapper = self.set_mapper();
-        set_mapper.remove(&item)
+    fn unordered_set_mapper_remove(&self, item: u32) -> bool {
+        let mut set_mapper = self.unordered_set_mapper();
+        set_mapper.swap_remove(&item)
     }
 }

From dc35ccbf7d8009da23ba573d130d8ebcdd3908d0 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 21 Jun 2024 18:48:53 +0300
Subject: [PATCH 1021/1254] basic features - storage mapper + key + from
 address

---
 ..._mapper_get_at_address_extra_key.scen.json | 90 +++++++++++++++++++
 .../src/storage_mapper_get_at_address.rs      | 24 +++--
 .../src/storage_mapper_single.rs              |  8 ++
 .../tests/basic_features_scenario_go_test.rs  |  5 ++
 .../tests/basic_features_scenario_rs_test.rs  |  5 ++
 .../basic-features/wasm/src/lib.rs            | 11 ++-
 6 files changed, 133 insertions(+), 10 deletions(-)
 create mode 100644 contracts/feature-tests/basic-features/scenarios/storage_mapper_get_at_address_extra_key.scen.json

diff --git a/contracts/feature-tests/basic-features/scenarios/storage_mapper_get_at_address_extra_key.scen.json b/contracts/feature-tests/basic-features/scenarios/storage_mapper_get_at_address_extra_key.scen.json
new file mode 100644
index 0000000000..e124fd7e1a
--- /dev/null
+++ b/contracts/feature-tests/basic-features/scenarios/storage_mapper_get_at_address_extra_key.scen.json
@@ -0,0 +1,90 @@
+{
+    "name": "storage mapper get at address",
+    "gasSchedule": "v3",
+    "steps": [
+        {
+            "step": "setState",
+            "accounts": {
+                "sc:basic-features": {
+                    "nonce": "0",
+                    "balance": "0",
+                    "code": "mxsc:../output/basic-features.mxsc.json"
+                },
+                "sc:with-storage": {
+                    "nonce": "0",
+                    "balance": "0",
+                    "code": "mxsc:../output/basic-features.mxsc.json"
+                },
+                "address:an_account": {
+                    "nonce": "0",
+                    "balance": "0"
+                }
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "set single_value_with_keys",
+            "tx": {
+                "from": "address:an_account",
+                "to": "sc:with-storage",
+                "function": "set_single_value_mapper_with_key",
+                "arguments": [
+                    "5",
+                    "str:to-read"
+                ],
+                "gasLimit": "50,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": [],
+                "status": "",
+                "logs": "*",
+                "gas": "*",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scQuery",
+            "id": "check single_value_with_keys",
+            "tx": {
+                "to": "sc:basic-features",
+                "function": "get_value_from_address_with_keys",
+                "arguments": [
+                    "sc:with-storage",
+                    "5"
+                ]
+            },
+            "expect": {
+                "out": [
+                    "str:to-read"
+                ],
+                "status": "",
+                "logs": "*",
+                "gas": "*",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "checkState",
+            "accounts": {
+                "sc:basic-features": {
+                    "nonce": "0",
+                    "balance": "0",
+                    "code": "mxsc:../output/basic-features.mxsc.json"
+                },
+                "sc:with-storage": {
+                    "nonce": "0",
+                    "balance": "0",
+                    "storage": {
+                        "str:single_value_mapper_with_key|0x00000005": "str:to-read"
+                    },
+                    "code": "mxsc:../output/basic-features.mxsc.json"
+                },
+                "address:an_account": {
+                    "nonce": "*",
+                    "balance": "0"
+                }
+            }
+        }
+    ]
+}
\ 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 229358ad61..324df37021 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
@@ -7,13 +7,6 @@ pub trait StorageMapperGetAtAddress {
     #[storage_mapper("contract_address")]
     fn contract_address(&self) -> SingleValueMapper<ManagedAddress>;
 
-    #[storage_mapper_from_address("contract_address")]
-    fn set_single_value_from_address_with_keys(
-        &self,
-        address: ManagedAddress,
-        address2: ManagedAddress,
-    ) -> SingleValueMapper<ManagedAddress, ManagedAddress>;
-
     #[endpoint]
     fn set_contract_address(&self, address: ManagedAddress) {
         self.contract_address().set(address)
@@ -136,4 +129,21 @@ pub trait StorageMapperGetAtAddress {
             self.unordered_set_mapper().insert(item);
         }
     }
+
+    #[storage_mapper_from_address("single_value_mapper_with_key")]
+    fn single_value_from_address_with_keys(
+        &self,
+        address: ManagedAddress,
+        extra_key: usize,
+    ) -> SingleValueMapper<ManagedBuffer, ManagedAddress>;
+
+    #[view]
+    fn get_value_from_address_with_keys(
+        &self,
+        address: ManagedAddress,
+        extra_key: usize,
+    ) -> ManagedBuffer {
+        self.single_value_from_address_with_keys(address, extra_key)
+            .get()
+    }
 }
diff --git a/contracts/feature-tests/basic-features/src/storage_mapper_single.rs b/contracts/feature-tests/basic-features/src/storage_mapper_single.rs
index 69ea1280c5..f8e8228038 100644
--- a/contracts/feature-tests/basic-features/src/storage_mapper_single.rs
+++ b/contracts/feature-tests/basic-features/src/storage_mapper_single.rs
@@ -13,6 +13,9 @@ pub trait SingleValueMapperFeatures {
         address: ManagedAddress,
     ) -> SingleValueMapper<BigUint, ManagedAddress>;
 
+    #[storage_mapper("single_value_mapper_with_key")]
+    fn single_value_mapper_with_key(&self, extra_key: usize) -> SingleValueMapper<ManagedBuffer>;
+
     #[endpoint]
     fn my_single_value_mapper_increment_1(&self, amount: BigInt) {
         let my_single_value_mapper = self.map_my_single_value_mapper();
@@ -67,4 +70,9 @@ pub trait SingleValueMapperFeatures {
     fn raw_byte_length_single_value_mapper(&self) -> usize {
         self.map_my_single_value_mapper().raw_byte_length()
     }
+
+    #[endpoint]
+    fn set_single_value_mapper_with_key(&self, key: usize, value: ManagedBuffer) {
+        self.single_value_mapper_with_key(key).set(value);
+    }
 }
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 6ef518cf9f..a6fd3babc4 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
@@ -371,6 +371,11 @@ fn storage_mapper_get_at_address_go() {
     world().run("scenarios/storage_mapper_get_at_address.scen.json");
 }
 
+#[test]
+fn storage_mapper_get_at_address_extra_key_go() {
+    world().run("scenarios/storage_mapper_get_at_address_extra_key.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 48762ce617..836795516b 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
@@ -388,6 +388,11 @@ fn storage_mapper_get_at_address_rs() {
     world().run("scenarios/storage_mapper_get_at_address.scen.json");
 }
 
+#[test]
+fn storage_mapper_get_at_address_extra_key_rs() {
+    world().run("scenarios/storage_mapper_get_at_address_extra_key.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 3c600ab91e..2f1071712c 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:                          390
+// Endpoints:                          395
 // Async Callback:                       1
-// Total number of exported functions: 392
+// Total number of exported functions: 397
 
 #![no_std]
 
@@ -322,6 +322,7 @@ multiversx_sc_wasm_adapter::endpoints! {
         is_empty_single_value_mapper => is_empty_single_value_mapper
         is_empty_at_address_single_value_mapper => is_empty_at_address_single_value_mapper
         raw_byte_length_single_value_mapper => raw_byte_length_single_value_mapper
+        set_single_value_mapper_with_key => set_single_value_mapper_with_key
         vec_mapper => vec_mapper
         vec_mapper_push => vec_mapper_push
         vec_mapper_get => vec_mapper_get
@@ -366,6 +367,10 @@ multiversx_sc_wasm_adapter::endpoints! {
         unique_id_mapper_swap_remove => unique_id_mapper_swap_remove
         unique_id_mapper_set => unique_id_mapper_set
         unique_id_mapper => unique_id_mapper
+        unordered_set_mapper => unordered_set_mapper
+        unordered_set_mapper_insert => unordered_set_mapper_insert
+        unordered_set_mapper_contains => unordered_set_mapper_contains
+        unordered_set_mapper_remove => unordered_set_mapper_remove
         managed_struct_eq => managed_struct_eq
         no_overflow_usize => no_overflow_usize
         no_overflow_u8 => no_overflow_u8
@@ -394,7 +399,6 @@ 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
-        len_at_addresses => len_at_addresses
         contains_at_address => contains_at_address
         len_at_address => len_at_address
         next_at_address => next_at_address
@@ -408,6 +412,7 @@ multiversx_sc_wasm_adapter::endpoints! {
         fill_set_mapper => fill_set_mapper
         fill_map_mapper => fill_map_mapper
         fill_unordered_set_mapper => fill_unordered_set_mapper
+        get_value_from_address_with_keys => get_value_from_address_with_keys
     )
 }
 

From 319c3d84aa84d3ee9efcf285dc0e32bb558e5571 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 21 Jun 2024 18:49:54 +0300
Subject: [PATCH 1022/1254] clippy fix

---
 framework/base/src/storage/mappers/vec_mapper.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/framework/base/src/storage/mappers/vec_mapper.rs b/framework/base/src/storage/mappers/vec_mapper.rs
index 65b4818a98..80f8c6018a 100644
--- a/framework/base/src/storage/mappers/vec_mapper.rs
+++ b/framework/base/src/storage/mappers/vec_mapper.rs
@@ -12,7 +12,7 @@ use crate::{
     storage::{storage_clear, storage_set, StorageKey},
     types::{ManagedAddress, ManagedType, MultiValueEncoded},
 };
-use core::{marker::PhantomData, usize};
+use core::marker::PhantomData;
 
 const ITEM_SUFFIX: &[u8] = b".item";
 const LEN_SUFFIX: &[u8] = b".len";

From 8901b1bc753888ee5319eaef0b38ed02b789cb52 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Fri, 21 Jun 2024 19:48:17 +0300
Subject: [PATCH 1023/1254] cleanup mandos

---
 .../storage_mapper_get_at_address.scen.json   | 32 -------------------
 1 file changed, 32 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 54274c62d9..77ffdda1ee 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
@@ -15,11 +15,6 @@
                     "balance": "0",
                     "code": "mxsc:../output/basic-features.mxsc.json"
                 },
-                "sc:second-to-be-called": {
-                    "nonce": "0",
-                    "balance": "0",
-                    "code": "mxsc:../output/basic-features.mxsc.json"
-                },
                 "address:an_account": {
                     "nonce": "0",
                     "balance": "0"
@@ -68,27 +63,6 @@
                 "refund": "*"
             }
         },
-        {
-            "step": "scCall",
-            "id": "fill set mapper",
-            "tx": {
-                "from": "address:an_account",
-                "to": "sc:second-to-be-called",
-                "function": "fill_set_mapper",
-                "arguments": [
-                    "5"
-                ],
-                "gasLimit": "50,000,000",
-                "gasPrice": "0"
-            },
-            "expect": {
-                "out": [],
-                "status": "",
-                "logs": "*",
-                "gas": "*",
-                "refund": "*"
-            }
-        },
         {
             "step": "checkState",
             "accounts": {
@@ -106,12 +80,6 @@
                     "storage": "*",
                     "code": "mxsc:../output/basic-features.mxsc.json"
                 },
-                "sc:second-to-be-called": {
-                    "nonce": "0",
-                    "balance": "0",
-                    "storage": "*",
-                    "code": "mxsc:../output/basic-features.mxsc.json"
-                },
                 "address:an_account": {
                     "nonce": "*",
                     "balance": "*",

From 8258d6a4dd753b1827d368b1bb0466d21ab5b3bc Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 21 Jun 2024 20:24:32 +0300
Subject: [PATCH 1024/1254] sc 0.50.5

---
 CHANGELOG.md                                  |   4 +
 Cargo.lock                                    | 188 +++++++++++++-----
 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 +-
 .../Cargo.toml                                |   2 +-
 .../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     |   8 +-
 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 +-
 .../wasm-alloc-mem-fail/Cargo.toml            |   2 +-
 .../wasm-alloc-mem-leaking/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-legacy/Cargo.toml |   4 +-
 .../forwarder-legacy/meta/Cargo.toml          |   2 +-
 .../forwarder-legacy/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 +-
 .../exchange-features/Cargo.toml              |   4 +-
 .../exchange-features/meta/Cargo.toml         |   2 +-
 .../exchange-features/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 +-
 .../feature-tests/scenario-tester/Cargo.toml  |   4 +-
 .../scenario-tester/meta/Cargo.toml           |   2 +-
 .../scenario-tester/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 +-
 framework/base/Cargo.toml                     |   4 +-
 framework/derive/Cargo.toml                   |   2 +-
 framework/meta/Cargo.toml                     |   4 +-
 framework/meta/src/version_history.rs         |   3 +-
 framework/scenario/Cargo.toml                 |   6 +-
 framework/snippets/Cargo.toml                 |   4 +-
 framework/wasm-adapter/Cargo.toml             |   4 +-
 tools/mxpy-snippet-generator/Cargo.toml       |   2 +-
 tools/rust-debugger/format-tests/Cargo.toml   |   4 +-
 271 files changed, 523 insertions(+), 438 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 56cb8747b2..bd283ab659 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,6 +27,10 @@ They are:
 - `multiversx-sdk`, in short `sdk`, allows communication with the chain(s), 1 crate.
 
 
+## [sc 0.50.5] - 2024-06-21
+- `#[storage_mapper_from_address] annotation.
+- Added missing equality operator for test addresses (`TestAddress`, `TestSCAddress`).
+
 ## [sc 0.50.4] - 2024-06-06
 - Compiler version requirement (1.78).
 - Minor imports fix.
diff --git a/Cargo.lock b/Cargo.lock
index d3a7f23f04..b3ec8e3213 100755
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -182,9 +182,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "backtrace"
-version = "0.3.72"
+version = "0.3.73"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17c6a35df3749d2e8bb1b7b21a976d82b15548788d2735b9d82f329268f71a11"
+checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a"
 dependencies = [
  "addr2line",
  "cc",
@@ -384,9 +384,9 @@ checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9"
 
 [[package]]
 name = "cc"
-version = "1.0.98"
+version = "1.0.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f"
+checksum = "96c51067fd44124faa7f870b4b1c969379ad32b2ba805aa959430ceaa384f695"
 
 [[package]]
 name = "cfg-if"
@@ -431,9 +431,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.4"
+version = "4.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0"
+checksum = "5db83dced34638ad474f39f250d7fea9598bdd239eaced1bdf45d597da0f433f"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -441,9 +441,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.2"
+version = "4.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4"
+checksum = "f7e204572485eb3fbf28f871612191521df159bc3e15a9f5064c66dba3a8c05f"
 dependencies = [
  "anstream",
  "anstyle",
@@ -453,9 +453,9 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.5.4"
+version = "4.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64"
+checksum = "c780290ccf4fb26629baa7a1081e68ced113f1d3ec302fa5948f1c381ebf06c6"
 dependencies = [
  "heck",
  "proc-macro2",
@@ -465,9 +465,9 @@ dependencies = [
 
 [[package]]
 name = "clap_lex"
-version = "0.7.0"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce"
+checksum = "4b82cf0babdbd58558212896d1a4272303a57bdb245c2bf1147185fb45640e70"
 
 [[package]]
 name = "colorchoice"
@@ -726,9 +726,9 @@ dependencies = [
 
 [[package]]
 name = "displaydoc"
-version = "0.2.4"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d"
+checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1388,12 +1388,12 @@ dependencies = [
 
 [[package]]
 name = "http-body-util"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d"
+checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f"
 dependencies = [
  "bytes",
- "futures-core",
+ "futures-util",
  "http",
  "http-body",
  "pin-project-lite",
@@ -1401,9 +1401,9 @@ dependencies = [
 
 [[package]]
 name = "httparse"
-version = "1.8.0"
+version = "1.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904"
+checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9"
 
 [[package]]
 name = "humantime"
@@ -1431,6 +1431,23 @@ dependencies = [
  "want",
 ]
 
+[[package]]
+name = "hyper-rustls"
+version = "0.27.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155"
+dependencies = [
+ "futures-util",
+ "http",
+ "hyper",
+ "hyper-util",
+ "rustls",
+ "rustls-pki-types",
+ "tokio",
+ "tokio-rustls",
+ "tower-service",
+]
+
 [[package]]
 name = "hyper-tls"
 version = "0.6.0"
@@ -1781,9 +1798,9 @@ dependencies = [
 
 [[package]]
 name = "memchr"
-version = "2.7.2"
+version = "2.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d"
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
 
 [[package]]
 name = "mime"
@@ -1793,9 +1810,9 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
 
 [[package]]
 name = "miniz_oxide"
-version = "0.7.3"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae"
+checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
 dependencies = [
  "adler",
 ]
@@ -1904,7 +1921,7 @@ checksum = "b59072fa0624b55ae5ae3fa6bfa91515bbeb4ac440214bc4a509e2c8806d6e9f"
 
 [[package]]
 name = "multiversx-price-aggregator-sc"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "arrayvec",
  "getrandom 0.2.15",
@@ -1925,7 +1942,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "bitflags 2.5.0",
  "hex-literal",
@@ -1957,7 +1974,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -1968,7 +1985,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-meta"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "clap",
  "colored",
@@ -1994,14 +2011,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-scenario"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "base64",
  "bech32",
@@ -2028,7 +2045,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-snippets"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "base64",
  "env_logger",
@@ -2042,7 +2059,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]
@@ -2073,7 +2090,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-wegld-swap-sc"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
  "multiversx-sc-modules",
@@ -2215,9 +2232,9 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.35.0"
+version = "0.36.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8ec7ab813848ba4522158d5517a6093db1ded27575b070f4177b8d12b41db5e"
+checksum = "576dfe1fc8f9df304abb159d767a29d0476f7750fbf8aa7ad07816004a207434"
 dependencies = [
  "memchr",
 ]
@@ -2685,18 +2702,18 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.5.1"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e"
+checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd"
 dependencies = [
  "bitflags 2.5.0",
 ]
 
 [[package]]
 name = "regex"
-version = "1.10.4"
+version = "1.10.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c"
+checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -2706,9 +2723,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.6"
+version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea"
+checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -2717,15 +2734,15 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.3"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56"
+checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
 
 [[package]]
 name = "reqwest"
-version = "0.12.4"
+version = "0.12.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10"
+checksum = "c7d6d2a27d57148378eb5e111173f4276ad26340ecc5c49a4a2152167a2d6a37"
 dependencies = [
  "base64",
  "bytes",
@@ -2738,6 +2755,7 @@ dependencies = [
  "http-body",
  "http-body-util",
  "hyper",
+ "hyper-rustls",
  "hyper-tls",
  "hyper-util",
  "ipnet",
@@ -2781,6 +2799,21 @@ dependencies = [
  "rewards-distribution",
 ]
 
+[[package]]
+name = "ring"
+version = "0.17.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d"
+dependencies = [
+ "cc",
+ "cfg-if",
+ "getrandom 0.2.15",
+ "libc",
+ "spin",
+ "untrusted",
+ "windows-sys 0.52.0",
+]
+
 [[package]]
 name = "ruplacer"
 version = "0.8.2"
@@ -2862,6 +2895,19 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
+[[package]]
+name = "rustls"
+version = "0.23.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05cff451f60db80f490f3c182b77c35260baace73209e9cdbbe526bfe3a4d402"
+dependencies = [
+ "once_cell",
+ "rustls-pki-types",
+ "rustls-webpki",
+ "subtle",
+ "zeroize",
+]
+
 [[package]]
 name = "rustls-pemfile"
 version = "2.1.2"
@@ -2878,6 +2924,17 @@ version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d"
 
+[[package]]
+name = "rustls-webpki"
+version = "0.102.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff448f7e92e913c4b7d4c6d8e4540a1724b319b4152b8aef6d4cf8339712b33e"
+dependencies = [
+ "ring",
+ "rustls-pki-types",
+ "untrusted",
+]
+
 [[package]]
 name = "ryu"
 version = "1.0.18"
@@ -3181,6 +3238,12 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
+[[package]]
+name = "spin"
+version = "0.9.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
+
 [[package]]
 name = "str-repeat"
 version = "0.0.0"
@@ -3205,9 +3268,9 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
 
 [[package]]
 name = "subtle"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc"
+checksum = "0d0208408ba0c3df17ed26eb06992cb1a1268d41b2c0e12e65203fbe3972cee5"
 
 [[package]]
 name = "syn"
@@ -3222,9 +3285,9 @@ dependencies = [
 
 [[package]]
 name = "sync_wrapper"
-version = "0.1.2"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160"
+checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394"
 
 [[package]]
 name = "system-configuration"
@@ -3350,6 +3413,17 @@ dependencies = [
  "tokio",
 ]
 
+[[package]]
+name = "tokio-rustls"
+version = "0.26.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4"
+dependencies = [
+ "rustls",
+ "rustls-pki-types",
+ "tokio",
+]
+
 [[package]]
 name = "tokio-util"
 version = "0.7.11"
@@ -3501,6 +3575,12 @@ version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
 
+[[package]]
+name = "untrusted"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
+
 [[package]]
 name = "unwrap-infallible"
 version = "0.1.5"
@@ -3509,9 +3589,9 @@ checksum = "151ac09978d3c2862c4e39b557f4eceee2cc72150bc4cb4f16abf061b6e381fb"
 
 [[package]]
 name = "url"
-version = "2.5.0"
+version = "2.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633"
+checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c"
 dependencies = [
  "form_urlencoded",
  "idna",
@@ -3538,9 +3618,9 @@ dependencies = [
 
 [[package]]
 name = "utf8parse"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
+checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 
 [[package]]
 name = "vault"
@@ -3868,9 +3948,9 @@ checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0"
 
 [[package]]
 name = "winnow"
-version = "0.6.11"
+version = "0.6.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56c52728401e1dc672a56e81e593e912aa54c78f40246869f78359a2bf24d29d"
+checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1"
 dependencies = [
  "memchr",
 ]
diff --git a/contracts/benchmarks/large-storage/Cargo.toml b/contracts/benchmarks/large-storage/Cargo.toml
index a438b3e230..260c728ca1 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.50.4"
+version = "0.50.5"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../framework/scenario"
diff --git a/contracts/benchmarks/large-storage/meta/Cargo.toml b/contracts/benchmarks/large-storage/meta/Cargo.toml
index 9bae2efa6a..7bfeecd199 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.50.4"
+version = "0.50.5"
 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 a6ddfb6c17..78dcda66d6 100644
--- a/contracts/benchmarks/large-storage/wasm/Cargo.toml
+++ b/contracts/benchmarks/large-storage/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/mappers/benchmark-common/Cargo.toml b/contracts/benchmarks/mappers/benchmark-common/Cargo.toml
index 2cd7ae18ef..8d48420e58 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.50.4"
+version = "0.50.5"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../../framework/scenario"
diff --git a/contracts/benchmarks/mappers/linked-list-repeat/Cargo.toml b/contracts/benchmarks/mappers/linked-list-repeat/Cargo.toml
index 1ad4f86d71..ab5042632f 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.50.4"
+version = "0.50.5"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.4"
+version = "0.50.5"
 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 944b3ec0d2..abdc897fae 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.50.4"
+version = "0.50.5"
 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 92618b541f..2682632d00 100644
--- a/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/mappers/map-repeat/Cargo.toml b/contracts/benchmarks/mappers/map-repeat/Cargo.toml
index 818d94f93b..21ab3eafa3 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.50.4"
+version = "0.50.5"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../../framework/scenario"
diff --git a/contracts/benchmarks/mappers/map-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/map-repeat/meta/Cargo.toml
index 76ea0598d9..d296e76707 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.50.4"
+version = "0.50.5"
 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 6a5fb91832..910efa5cc0 100644
--- a/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/mappers/queue-repeat/Cargo.toml b/contracts/benchmarks/mappers/queue-repeat/Cargo.toml
index 76aef59075..2cd8803560 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.50.4"
+version = "0.50.5"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../../framework/scenario"
diff --git a/contracts/benchmarks/mappers/queue-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/queue-repeat/meta/Cargo.toml
index aaaf91bbdb..ba0d9d3a97 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.50.4"
+version = "0.50.5"
 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 91ef66ad0d..d1ab73028a 100644
--- a/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/mappers/set-repeat/Cargo.toml b/contracts/benchmarks/mappers/set-repeat/Cargo.toml
index c11a84a800..9977ea338e 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.50.4"
+version = "0.50.5"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../../framework/scenario"
diff --git a/contracts/benchmarks/mappers/set-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/set-repeat/meta/Cargo.toml
index d72b5ff661..a1cf5698be 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.50.4"
+version = "0.50.5"
 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 0a7be452b3..bbb6977a73 100644
--- a/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.4"
+version = "0.50.5"
 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 c28263956f..81d11546b9 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.50.4"
+version = "0.50.5"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.4"
+version = "0.50.5"
 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 9c345e0fb5..18b8b9ea4d 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.50.4"
+version = "0.50.5"
 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 b7a3d37098..f436dd4487 100644
--- a/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/mappers/vec-repeat/Cargo.toml b/contracts/benchmarks/mappers/vec-repeat/Cargo.toml
index 4299883a96..b04dc8c11f 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.50.4"
+version = "0.50.5"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../../framework/scenario"
diff --git a/contracts/benchmarks/mappers/vec-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/vec-repeat/meta/Cargo.toml
index 5b65b1cf77..c6eecd0a63 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.50.4"
+version = "0.50.5"
 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 835d1c29d7..f140eba36e 100644
--- a/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/send-tx-repeat/Cargo.toml b/contracts/benchmarks/send-tx-repeat/Cargo.toml
index e7069f7b0a..77fdfa4c46 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.50.4"
+version = "0.50.5"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../framework/scenario"
diff --git a/contracts/benchmarks/send-tx-repeat/meta/Cargo.toml b/contracts/benchmarks/send-tx-repeat/meta/Cargo.toml
index 7db0a7cee5..87f3dad9c8 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.50.4"
+version = "0.50.5"
 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 caae310174..0fc0259b7e 100644
--- a/contracts/benchmarks/send-tx-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/send-tx-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/str-repeat/Cargo.toml b/contracts/benchmarks/str-repeat/Cargo.toml
index c5a6913090..6924ad063a 100644
--- a/contracts/benchmarks/str-repeat/Cargo.toml
+++ b/contracts/benchmarks/str-repeat/Cargo.toml
@@ -12,10 +12,10 @@ path = "src/str_repeat.rs"
 managed-buffer-builder-cached = ["multiversx-sc/managed-buffer-builder-cached"]
 
 [dependencies.multiversx-sc]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../framework/scenario"
diff --git a/contracts/benchmarks/str-repeat/meta/Cargo.toml b/contracts/benchmarks/str-repeat/meta/Cargo.toml
index 4bbfc0f373..9e3ac46336 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.50.4"
+version = "0.50.5"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.toml b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.toml
index 86f96d3351..8878815bb7 100644
--- a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.toml
+++ b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.toml b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.toml
index e73da84b5d..4e809ec71d 100644
--- a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.toml
+++ b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.toml
@@ -29,7 +29,7 @@ path = ".."
 features = ["managed-buffer-builder-cached"]
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/str-repeat/wasm/Cargo.toml b/contracts/benchmarks/str-repeat/wasm/Cargo.toml
index 1706b7dd1d..f0b59c585c 100644
--- a/contracts/benchmarks/str-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/str-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/core/price-aggregator/Cargo.toml b/contracts/core/price-aggregator/Cargo.toml
index 341b043e12..9edd51fa8f 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.50.4"
+version = "0.50.5"
 authors = [
     "Claudiu-Marcel Bruda <claudiu.bruda@multiversx.com>",
     "MultiversX <contact@multiversx.com>",
@@ -19,15 +19,15 @@ edition = "2021"
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../framework/scenario"
 
 [dependencies]
diff --git a/contracts/core/price-aggregator/meta/Cargo.toml b/contracts/core/price-aggregator/meta/Cargo.toml
index d0f5edebad..b6ac37d294 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.50.4"
+version = "0.50.5"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.50.4"
+version = "0.50.5"
 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 dd7a9c841f..abf373f9db 100644
--- a/contracts/core/price-aggregator/wasm/Cargo.toml
+++ b/contracts/core/price-aggregator/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/core/wegld-swap/Cargo.toml b/contracts/core/wegld-swap/Cargo.toml
index b9be98a4e2..f39afe598d 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.50.4"
+version = "0.50.5"
 
 authors = [
     "Dorin Iancu <dorin.iancu@multiversx.com>",
@@ -20,13 +20,13 @@ edition = "2021"
 path = "src/wegld.rs"
 
 [dependencies.multiversx-sc]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../framework/scenario"
diff --git a/contracts/core/wegld-swap/meta/Cargo.toml b/contracts/core/wegld-swap/meta/Cargo.toml
index 6436eb1e24..9f6015f310 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.50.4"
+version = "0.50.5"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.50.4"
+version = "0.50.5"
 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 5109b9988f..665b59b1c8 100644
--- a/contracts/core/wegld-swap/wasm/Cargo.toml
+++ b/contracts/core/wegld-swap/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/adder/Cargo.toml b/contracts/examples/adder/Cargo.toml
index 142fc32609..4e21a9ffc4 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.50.4"
+version = "0.50.5"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/adder/interact/Cargo.toml b/contracts/examples/adder/interact/Cargo.toml
index dedfbb4a18..9bdcbbcee4 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.50.4"
+version = "0.50.5"
 path = "../../../../framework/snippets"
diff --git a/contracts/examples/adder/meta/Cargo.toml b/contracts/examples/adder/meta/Cargo.toml
index be7a5a093c..f276ef991e 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.50.4"
+version = "0.50.5"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/examples/adder/wasm/Cargo.toml b/contracts/examples/adder/wasm/Cargo.toml
index 465698e0aa..b252110679 100644
--- a/contracts/examples/adder/wasm/Cargo.toml
+++ b/contracts/examples/adder/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/bonding-curve-contract/Cargo.toml b/contracts/examples/bonding-curve-contract/Cargo.toml
index 7c3ebbe29f..561494f980 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.50.4"
+version = "0.50.5"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../framework/scenario"
 
diff --git a/contracts/examples/bonding-curve-contract/meta/Cargo.toml b/contracts/examples/bonding-curve-contract/meta/Cargo.toml
index 5e5581e415..3d586f9dfd 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.50.4"
+version = "0.50.5"
 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 77f5b27c85..d1b914ac07 100644
--- a/contracts/examples/bonding-curve-contract/wasm/Cargo.toml
+++ b/contracts/examples/bonding-curve-contract/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/check-pause/Cargo.toml b/contracts/examples/check-pause/Cargo.toml
index 43e66382e7..993972ef1e 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.50.4"
+version = "0.50.5"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../framework/scenario"
 
diff --git a/contracts/examples/check-pause/meta/Cargo.toml b/contracts/examples/check-pause/meta/Cargo.toml
index c87e1a2b7b..cc88c32d7f 100644
--- a/contracts/examples/check-pause/meta/Cargo.toml
+++ b/contracts/examples/check-pause/meta/Cargo.toml
@@ -9,6 +9,6 @@ authors = ["Alin Cruceat <alin.cruceat@multiversx.com>"]
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.50.4"
+version = "0.50.5"
 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 aee45b8d33..b697ccdd7b 100644
--- a/contracts/examples/check-pause/wasm/Cargo.toml
+++ b/contracts/examples/check-pause/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/crowdfunding-esdt/Cargo.toml b/contracts/examples/crowdfunding-esdt/Cargo.toml
index 9bdcaaf588..cbd5dc2b73 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.50.4"
+version = "0.50.5"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../framework/scenario"
 
 [dev-dependencies]
diff --git a/contracts/examples/crowdfunding-esdt/meta/Cargo.toml b/contracts/examples/crowdfunding-esdt/meta/Cargo.toml
index a994e690c7..90e6dba46d 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.50.4"
+version = "0.50.5"
 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 4c30119726..92aff884b8 100644
--- a/contracts/examples/crowdfunding-esdt/wasm/Cargo.toml
+++ b/contracts/examples/crowdfunding-esdt/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/crypto-bubbles/Cargo.toml b/contracts/examples/crypto-bubbles/Cargo.toml
index d8de97487c..7749baf65a 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.50.4"
+version = "0.50.5"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/crypto-bubbles/meta/Cargo.toml b/contracts/examples/crypto-bubbles/meta/Cargo.toml
index 35c3f6f036..2e6cefc353 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.50.4"
+version = "0.50.5"
 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 37eea22908..ee22e8dda9 100644
--- a/contracts/examples/crypto-bubbles/wasm/Cargo.toml
+++ b/contracts/examples/crypto-bubbles/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.4"
+version = "0.50.5"
 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 9c1a455387..4913d0fe45 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.50.4"
+version = "0.50.5"
 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 ec89abb4a8..4417764479 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.50.4"
+version = "0.50.5"
 path = "../../../../../framework/base"
diff --git a/contracts/examples/crypto-kitties/kitty-auction/Cargo.toml b/contracts/examples/crypto-kitties/kitty-auction/Cargo.toml
index 899e3e9f61..04c55d48ba 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.50.4"
+version = "0.50.5"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.4"
+version = "0.50.5"
 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 0b7b73ce87..c9a7383483 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.50.4"
+version = "0.50.5"
 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 595e5fca76..a7683bab77 100644
--- a/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.toml
+++ b/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.4"
+version = "0.50.5"
 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 120a15c446..e0c6946642 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.50.4"
+version = "0.50.5"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.4"
+version = "0.50.5"
 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 537dd987ef..f37d47cc16 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.50.4"
+version = "0.50.5"
 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 865371e22a..4c8da87908 100644
--- a/contracts/examples/crypto-kitties/kitty-genetic-alg/wasm/Cargo.toml
+++ b/contracts/examples/crypto-kitties/kitty-genetic-alg/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.4"
+version = "0.50.5"
 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 90bf513862..299c73867b 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.50.4"
+version = "0.50.5"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.4"
+version = "0.50.5"
 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 9dfa1ff5ab..63015f8c37 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.50.4"
+version = "0.50.5"
 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 614482edd7..de33ddb3eb 100644
--- a/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.toml
+++ b/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/crypto-zombies/Cargo.toml b/contracts/examples/crypto-zombies/Cargo.toml
index ba54d73abd..4dc208d00a 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.50.4"
+version = "0.50.5"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/crypto-zombies/meta/Cargo.toml b/contracts/examples/crypto-zombies/meta/Cargo.toml
index 26a2c8f857..35e0910007 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.50.4"
+version = "0.50.5"
 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 1d65301f24..c3d7148482 100644
--- a/contracts/examples/crypto-zombies/wasm/Cargo.toml
+++ b/contracts/examples/crypto-zombies/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/digital-cash/Cargo.toml b/contracts/examples/digital-cash/Cargo.toml
index 368eabd925..465db4b6b3 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.50.4"
+version = "0.50.5"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/digital-cash/meta/Cargo.toml b/contracts/examples/digital-cash/meta/Cargo.toml
index 5bb46c1ae6..4261b3fc2d 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.50.4"
+version = "0.50.5"
 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 3a723f04a1..55f314f33a 100644
--- a/contracts/examples/digital-cash/wasm/Cargo.toml
+++ b/contracts/examples/digital-cash/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/empty/Cargo.toml b/contracts/examples/empty/Cargo.toml
index f5eeaf67fd..467a4ab918 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.50.4"
+version = "0.50.5"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../framework/scenario"
 
 [dev-dependencies]
diff --git a/contracts/examples/empty/meta/Cargo.toml b/contracts/examples/empty/meta/Cargo.toml
index 8ccc67a3a9..ae89e5f8fa 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.50.4"
+version = "0.50.5"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/examples/empty/wasm/Cargo.toml b/contracts/examples/empty/wasm/Cargo.toml
index b78cd4d57d..7e378f7287 100644
--- a/contracts/examples/empty/wasm/Cargo.toml
+++ b/contracts/examples/empty/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.4"
+version = "0.50.5"
 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 edc06c11f5..58c2c0aa1b 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.50.4"
+version = "0.50.5"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.4"
+version = "0.50.5"
 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 cd8cd69832..ae5dc60723 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.50.4"
+version = "0.50.5"
 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 fc62669732..77968838c0 100644
--- a/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.toml
+++ b/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/factorial/Cargo.toml b/contracts/examples/factorial/Cargo.toml
index 2e2ed7159f..68471a570a 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.50.4"
+version = "0.50.5"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/factorial/meta/Cargo.toml b/contracts/examples/factorial/meta/Cargo.toml
index b87f0de50d..d90a440c18 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.50.4"
+version = "0.50.5"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/examples/factorial/wasm/Cargo.toml b/contracts/examples/factorial/wasm/Cargo.toml
index a374611642..e1977246dd 100644
--- a/contracts/examples/factorial/wasm/Cargo.toml
+++ b/contracts/examples/factorial/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/fractional-nfts/Cargo.toml b/contracts/examples/fractional-nfts/Cargo.toml
index ad182123c7..2e31cfea8c 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.50.4"
+version = "0.50.5"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/fractional-nfts/meta/Cargo.toml b/contracts/examples/fractional-nfts/meta/Cargo.toml
index d173ffff7f..e474dec987 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.50.4"
+version = "0.50.5"
 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 556c7df822..be56880737 100644
--- a/contracts/examples/fractional-nfts/wasm/Cargo.toml
+++ b/contracts/examples/fractional-nfts/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/lottery-esdt/Cargo.toml b/contracts/examples/lottery-esdt/Cargo.toml
index 5d6df02def..3990ec39a5 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.50.4"
+version = "0.50.5"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/lottery-esdt/meta/Cargo.toml b/contracts/examples/lottery-esdt/meta/Cargo.toml
index 8d9c8a8787..a755b5b6af 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.50.4"
+version = "0.50.5"
 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 d1b158520a..ccac818577 100644
--- a/contracts/examples/lottery-esdt/wasm/Cargo.toml
+++ b/contracts/examples/lottery-esdt/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/multisig/Cargo.toml b/contracts/examples/multisig/Cargo.toml
index 2d91c741fe..f067ee6748 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.50.4"
+version = "0.50.5"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../framework/scenario"
 
 [dev-dependencies.adder]
@@ -27,7 +27,7 @@ path = "../adder"
 path = "../factorial"
 
 [dev-dependencies.multiversx-wegld-swap-sc]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../core/wegld-swap"
 
 [dev-dependencies]
diff --git a/contracts/examples/multisig/interact/Cargo.toml b/contracts/examples/multisig/interact/Cargo.toml
index fa44680c16..e84bbcd707 100644
--- a/contracts/examples/multisig/interact/Cargo.toml
+++ b/contracts/examples/multisig/interact/Cargo.toml
@@ -18,17 +18,17 @@ toml = "0.8.6"
 path = ".."
 
 [dependencies.multiversx-sc-modules]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../../contracts/modules"
 
 [dependencies.multiversx-sc-snippets]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../../framework/snippets"
 
 [dependencies.multiversx-sc-scenario]
-version = "=0.50.4"
+version = "=0.50.5"
 path = "../../../../framework/scenario"
 
 [dependencies.multiversx-sc]
-version = "=0.50.4"
+version = "=0.50.5"
 path = "../../../../framework/base"
diff --git a/contracts/examples/multisig/meta/Cargo.toml b/contracts/examples/multisig/meta/Cargo.toml
index 9b6056d833..6a58bc0ac7 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.50.4"
+version = "0.50.5"
 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 752306f96a..5881af7848 100644
--- a/contracts/examples/multisig/wasm-multisig-full/Cargo.toml
+++ b/contracts/examples/multisig/wasm-multisig-full/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.4"
+version = "0.50.5"
 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 468f48c100..476c184ddf 100644
--- a/contracts/examples/multisig/wasm-multisig-view/Cargo.toml
+++ b/contracts/examples/multisig/wasm-multisig-view/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/multisig/wasm/Cargo.toml b/contracts/examples/multisig/wasm/Cargo.toml
index 3d4e8cfd77..c423915526 100644
--- a/contracts/examples/multisig/wasm/Cargo.toml
+++ b/contracts/examples/multisig/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/nft-minter/Cargo.toml b/contracts/examples/nft-minter/Cargo.toml
index 62554ef450..6c04f36322 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.50.4"
+version = "0.50.5"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/nft-minter/meta/Cargo.toml b/contracts/examples/nft-minter/meta/Cargo.toml
index 8985d3ad74..01b0cb9377 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.50.4"
+version = "0.50.5"
 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 5965c90678..50e383bdbc 100644
--- a/contracts/examples/nft-minter/wasm/Cargo.toml
+++ b/contracts/examples/nft-minter/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/nft-storage-prepay/Cargo.toml b/contracts/examples/nft-storage-prepay/Cargo.toml
index 47fd92d064..ceb3df21ee 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.50.4"
+version = "0.50.5"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/nft-storage-prepay/meta/Cargo.toml b/contracts/examples/nft-storage-prepay/meta/Cargo.toml
index 037c34da0b..1c022d6eb4 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.50.4"
+version = "0.50.5"
 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 5a0980418f..3c232de7dc 100644
--- a/contracts/examples/nft-storage-prepay/wasm/Cargo.toml
+++ b/contracts/examples/nft-storage-prepay/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/nft-subscription/Cargo.toml b/contracts/examples/nft-subscription/Cargo.toml
index da38fe3b12..5c75f3f81c 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.50.4"
+version = "0.50.5"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/nft-subscription/meta/Cargo.toml b/contracts/examples/nft-subscription/meta/Cargo.toml
index 6155e72f87..fb733c2f16 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.50.4"
+version = "0.50.5"
 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 241598652b..10c72479f7 100644
--- a/contracts/examples/nft-subscription/wasm/Cargo.toml
+++ b/contracts/examples/nft-subscription/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/order-book/factory/Cargo.toml b/contracts/examples/order-book/factory/Cargo.toml
index 09c8822929..44a0472d33 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.50.4"
+version = "0.50.5"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../../framework/scenario"
 
diff --git a/contracts/examples/order-book/factory/meta/Cargo.toml b/contracts/examples/order-book/factory/meta/Cargo.toml
index 17a91ae211..b0e6d641a2 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.50.4"
+version = "0.50.5"
 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 051ebf3dec..16d7fa61f1 100644
--- a/contracts/examples/order-book/factory/wasm/Cargo.toml
+++ b/contracts/examples/order-book/factory/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/order-book/pair/Cargo.toml b/contracts/examples/order-book/pair/Cargo.toml
index 1cc04ce186..947bca1dce 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.50.4"
+version = "0.50.5"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../../framework/scenario"
diff --git a/contracts/examples/order-book/pair/meta/Cargo.toml b/contracts/examples/order-book/pair/meta/Cargo.toml
index 2874d843c4..62356ef9d5 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.50.4"
+version = "0.50.5"
 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 911d081092..c1d347e403 100644
--- a/contracts/examples/order-book/pair/wasm/Cargo.toml
+++ b/contracts/examples/order-book/pair/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/ping-pong-egld/Cargo.toml b/contracts/examples/ping-pong-egld/Cargo.toml
index 2a00d65f96..8b730a6f23 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.50.4"
+version = "0.50.5"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../framework/scenario"
 
diff --git a/contracts/examples/ping-pong-egld/meta/Cargo.toml b/contracts/examples/ping-pong-egld/meta/Cargo.toml
index 87eca647d0..a69d0e7f45 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.50.4"
+version = "0.50.5"
 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 e101042e4d..41fa97c2c0 100644
--- a/contracts/examples/ping-pong-egld/wasm/Cargo.toml
+++ b/contracts/examples/ping-pong-egld/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/proxy-pause/Cargo.toml b/contracts/examples/proxy-pause/Cargo.toml
index b042d1273a..55004e58f4 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.50.4"
+version = "0.50.5"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.4"
+version = "0.50.5"
 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 eb28ab2c04..5ad019bf43 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.50.4"
+version = "0.50.5"
 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 88e4421510..85dc3d5aaa 100644
--- a/contracts/examples/proxy-pause/wasm/Cargo.toml
+++ b/contracts/examples/proxy-pause/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/rewards-distribution/Cargo.toml b/contracts/examples/rewards-distribution/Cargo.toml
index d861be61fd..f46147df4a 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.50.4"
+version = "0.50.5"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/rewards-distribution/meta/Cargo.toml b/contracts/examples/rewards-distribution/meta/Cargo.toml
index 30027df147..6e4cf1655c 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 <claudiu.bruda@multiversx.com>"]
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.50.4"
+version = "0.50.5"
 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 ed1eab029d..0aa00e1f18 100644
--- a/contracts/examples/rewards-distribution/wasm/Cargo.toml
+++ b/contracts/examples/rewards-distribution/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/seed-nft-minter/Cargo.toml b/contracts/examples/seed-nft-minter/Cargo.toml
index 86e17d137d..9e1be8a89a 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.50.4"
+version = "0.50.5"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/seed-nft-minter/meta/Cargo.toml b/contracts/examples/seed-nft-minter/meta/Cargo.toml
index f76f1ddfba..1eb420c985 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 <claudiu.bruda@multiversx.com>"]
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.50.4"
+version = "0.50.5"
 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 9b1f5fcf62..51439684b8 100644
--- a/contracts/examples/seed-nft-minter/wasm/Cargo.toml
+++ b/contracts/examples/seed-nft-minter/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/token-release/Cargo.toml b/contracts/examples/token-release/Cargo.toml
index b2ce9c4716..d767abeac2 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.50.4"
+version = "0.50.5"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../framework/scenario"
 
diff --git a/contracts/examples/token-release/meta/Cargo.toml b/contracts/examples/token-release/meta/Cargo.toml
index 4f14d0b51c..4ed87b3df6 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.50.4"
+version = "0.50.5"
 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 70964e19f4..7e92086048 100644
--- a/contracts/examples/token-release/wasm/Cargo.toml
+++ b/contracts/examples/token-release/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/abi-tester/Cargo.toml b/contracts/feature-tests/abi-tester/Cargo.toml
index 9d55d2bd0e..f6d30ca3d3 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.50.4"
+version = "0.50.5"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../framework/scenario"
 
 [dev-dependencies.multiversx-sc-meta]
-version = "0.50.4"
+version = "0.50.5"
 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 52fb9f65c9..c244099e66 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.50.4"
+            "version": "0.50.5"
         }
     },
     "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 262d4dc18f..ce1a262b87 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.50.4"
+            "version": "0.50.5"
         }
     },
     "docs": [
diff --git a/contracts/feature-tests/abi-tester/meta/Cargo.toml b/contracts/feature-tests/abi-tester/meta/Cargo.toml
index 5cf6cca278..bda8799234 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.50.4"
+version = "0.50.5"
 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 3b1718b92c..0176e28813 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.4"
+version = "0.50.5"
 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 50283593aa..10af2789be 100644
--- a/contracts/feature-tests/abi-tester/wasm/Cargo.toml
+++ b/contracts/feature-tests/abi-tester/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/alloc-features/Cargo.toml b/contracts/feature-tests/alloc-features/Cargo.toml
index 86fc7e1021..18950560b2 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.50.4"
+version = "0.50.5"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.4"
+version = "0.50.5"
 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 1cf78109d1..07f8633109 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.50.4"
+version = "0.50.5"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml
index 5a67cc39cd..e883eba340 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml
index be4aad4977..95ed88ee71 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/alloc-features/wasm/Cargo.toml b/contracts/feature-tests/alloc-features/wasm/Cargo.toml
index 608a244aeb..1661f80e6f 100644
--- a/contracts/feature-tests/alloc-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/alloc-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/basic-features/Cargo.toml b/contracts/feature-tests/basic-features/Cargo.toml
index f42c86a39b..443a757b77 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.50.4"
+version = "0.50.5"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../framework/scenario"
 
 [dependencies.multiversx-sc-modules]
-version = "0.50.4"
+version = "0.50.5"
 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 e666e6f3cc..0da4f0fb6a 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.50.4"
+version = "0.50.5"
 path = "../../../../framework/snippets"
diff --git a/contracts/feature-tests/basic-features/meta/Cargo.toml b/contracts/feature-tests/basic-features/meta/Cargo.toml
index 086d7182cd..c643371e15 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.50.4"
+version = "0.50.5"
 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 927502e074..6b0ec29012 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.4"
+version = "0.50.5"
 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 b638757513..5c6d1752c9 100644
--- a/contracts/feature-tests/basic-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/basic-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.4"
+version = "0.50.5"
 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 5829e43c85..921ff24261 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.50.4"
+version = "0.50.5"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.4"
+version = "0.50.5"
 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 4803a224ce..62de4db311 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.50.4"
+version = "0.50.5"
 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 fedf0401f1..4de9b9a8b1 100644
--- a/contracts/feature-tests/big-float-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/big-float-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/Cargo.toml b/contracts/feature-tests/composability/Cargo.toml
index 3cfd77770f..5e259fd0f2 100644
--- a/contracts/feature-tests/composability/Cargo.toml
+++ b/contracts/feature-tests/composability/Cargo.toml
@@ -36,9 +36,9 @@ path = "recursive-caller"
 path = "vault"
 
 [dependencies.multiversx-sc]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.4"
+version = "0.50.5"
 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 e52075dfe0..9aac9e8c3e 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.50.4"
+version = "0.50.5"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.4"
+version = "0.50.5"
 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 6994acf1d1..86754e4e7b 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.50.4"
+version = "0.50.5"
 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 1814db86b9..d711ad576e 100644
--- a/contracts/feature-tests/composability/builtin-func-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/builtin-func-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.4"
+version = "0.50.5"
 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 b420ee3085..6963d2669a 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.50.4"
+version = "0.50.5"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.4"
+version = "0.50.5"
 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 632920111e..da8719e486 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
@@ -9,10 +9,10 @@ publish = false
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.4"
+version = "0.50.5"
 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 3e0becca68..f85768427f 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.50.4"
+version = "0.50.5"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.50.4"
+version = "0.50.5"
 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 4da1d86a1f..42c0d5ec7e 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.4"
+version = "0.50.5"
 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 418b1335d1..ccc07e8ddc 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.50.4"
+version = "0.50.5"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.4"
+version = "0.50.5"
 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 088bc306d9..520dc1a10b 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.50.4"
+version = "0.50.5"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.50.4"
+version = "0.50.5"
 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 4bd8f8eb2b..6c98abf086 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.4"
+version = "0.50.5"
 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 8f27b2f3d1..847ed328c8 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.50.4"
+version = "0.50.5"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.4"
+version = "0.50.5"
 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 5ebbda8a14..77368a14f8 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.50.4"
+version = "0.50.5"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.4"
+version = "0.50.5"
 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 dbfacdc852..604474db20 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.50.4"
+version = "0.50.5"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.50.4"
+version = "0.50.5"
 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 ab76fc599c..f308297e07 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.4"
+version = "0.50.5"
 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 fb71cc9504..84d530aeae 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
@@ -9,10 +9,10 @@ publish = false
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.4"
+version = "0.50.5"
 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 12379c1e28..6548a2df6e 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.50.4"
+version = "0.50.5"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.50.4"
+version = "0.50.5"
 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 99a8155cfe..94bb422816 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/forwarder-legacy/Cargo.toml b/contracts/feature-tests/composability/forwarder-legacy/Cargo.toml
index e5a78e79ee..d077c39a13 100644
--- a/contracts/feature-tests/composability/forwarder-legacy/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-legacy/Cargo.toml
@@ -12,10 +12,10 @@ path = "src/forwarder_legacy_main.rs"
 path = "../vault"
 
 [dependencies.multiversx-sc]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../../framework/scenario"
 
diff --git a/contracts/feature-tests/composability/forwarder-legacy/meta/Cargo.toml b/contracts/feature-tests/composability/forwarder-legacy/meta/Cargo.toml
index 4b5ee75da1..03669bea49 100644
--- a/contracts/feature-tests/composability/forwarder-legacy/meta/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-legacy/meta/Cargo.toml
@@ -8,6 +8,6 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../../../framework/meta"
 default-features = false
diff --git a/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.toml b/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.toml
index 31688377ac..763ac243e9 100644
--- a/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.4"
+version = "0.50.5"
 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 17db486dbf..2b8ca60686 100644
--- a/contracts/feature-tests/composability/forwarder-queue/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-queue/Cargo.toml
@@ -9,14 +9,14 @@ publish = false
 path = "src/forwarder_queue.rs"
 
 [dependencies.multiversx-sc]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../../framework/wasm-adapter"
 optional = true
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.4"
+version = "0.50.5"
 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 d1081e134a..8f0d1e3d64 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.50.4"
+version = "0.50.5"
 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 1ffcb17c85..37205d0b8a 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.4"
+version = "0.50.5"
 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 eaceb3aa35..348d9610bd 100644
--- a/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.4"
+version = "0.50.5"
 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 8199c71774..085f892a4b 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.50.4"
+version = "0.50.5"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.4"
+version = "0.50.5"
 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 41e4f1938e..a1ba9f606f 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.50.4"
+version = "0.50.5"
 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 1559acbf5a..10cb5eb862 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.4"
+version = "0.50.5"
 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 7fa28cfabd..2093af29f3 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.4"
+version = "0.50.5"
 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 7364214f4b..3be401c5e6 100644
--- a/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/forwarder/Cargo.toml b/contracts/feature-tests/composability/forwarder/Cargo.toml
index ef190e7e73..31ca73bd87 100644
--- a/contracts/feature-tests/composability/forwarder/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder/Cargo.toml
@@ -9,10 +9,10 @@ publish = false
 path = "src/forwarder_main.rs"
 
 [dependencies.multiversx-sc]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../../framework/scenario"
 
diff --git a/contracts/feature-tests/composability/forwarder/meta/Cargo.toml b/contracts/feature-tests/composability/forwarder/meta/Cargo.toml
index d8bb6d372b..5d90d25f52 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.50.4"
+version = "0.50.5"
 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 cb1ccceb73..cb4fc5fa25 100644
--- a/contracts/feature-tests/composability/forwarder/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/interact/Cargo.toml b/contracts/feature-tests/composability/interact/Cargo.toml
index d71344ef3b..e276ae1e05 100644
--- a/contracts/feature-tests/composability/interact/Cargo.toml
+++ b/contracts/feature-tests/composability/interact/Cargo.toml
@@ -15,9 +15,9 @@ serde = { version = "1.0", features = ["derive"] }
 toml = "0.8.6"
 
 [dependencies.multiversx-sc]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-snippets]
-version = "0.50.4"
+version = "0.50.5"
 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 3ec7772e16..1d674bda26 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.50.4"
+version = "0.50.5"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.4"
+version = "0.50.5"
 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 93911c7b6e..06c04991cf 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.50.4"
+version = "0.50.5"
 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 732585443f..c565a29346 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.4"
+version = "0.50.5"
 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 68c25d9d05..d570b8f9af 100644
--- a/contracts/feature-tests/composability/promises-features/Cargo.toml
+++ b/contracts/feature-tests/composability/promises-features/Cargo.toml
@@ -9,6 +9,6 @@ publish = false
 path = "src/promises_main.rs"
 
 [dependencies.multiversx-sc]
-version = "0.50.4"
+version = "0.50.5"
 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 fd1de478a9..acaf4bbf6e 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.50.4"
+version = "0.50.5"
 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 d148678dfc..e0bbb766f4 100644
--- a/contracts/feature-tests/composability/promises-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/promises-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.4"
+version = "0.50.5"
 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 81fad1cad2..1751122360 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.50.4"
+version = "0.50.5"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.4"
+version = "0.50.5"
 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 f092d5fee4..afa60c8670 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.50.4"
+version = "0.50.5"
 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 7c1fcdb073..a97eb0ba4b 100644
--- a/contracts/feature-tests/composability/proxy-test-first/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/proxy-test-first/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.4"
+version = "0.50.5"
 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 624d8357e2..edfc5ccdd5 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.50.4"
+version = "0.50.5"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.4"
+version = "0.50.5"
 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 96fef0f445..55cfa7b0e3 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.50.4"
+version = "0.50.5"
 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 ea050a1dcc..86beebbabc 100644
--- a/contracts/feature-tests/composability/proxy-test-second/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/proxy-test-second/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.4"
+version = "0.50.5"
 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 3098724c47..9d33073f27 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.50.4"
+version = "0.50.5"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.4"
+version = "0.50.5"
 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 1ff7565437..441d9ca8f7 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.50.4"
+version = "0.50.5"
 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 ea41ab4f8e..7db6c2d320 100644
--- a/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.4"
+version = "0.50.5"
 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 70749f0ee7..778f77e431 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.50.4"
+version = "0.50.5"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.4"
+version = "0.50.5"
 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 c3a2700c25..b89fe3b3bb 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.50.4"
+version = "0.50.5"
 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 7aa295e47e..9fbe945af6 100644
--- a/contracts/feature-tests/composability/transfer-role-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/transfer-role-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/vault/Cargo.toml b/contracts/feature-tests/composability/vault/Cargo.toml
index 4fb71102ec..6d3f3c6453 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.50.4"
+version = "0.50.5"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../../framework/scenario"
diff --git a/contracts/feature-tests/composability/vault/meta/Cargo.toml b/contracts/feature-tests/composability/vault/meta/Cargo.toml
index 698816c563..a532252e68 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.50.4"
+version = "0.50.5"
 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 7985e3c2ce..35e5a9ad9d 100644
--- a/contracts/feature-tests/composability/vault/wasm-vault-promises/Cargo.toml
+++ b/contracts/feature-tests/composability/vault/wasm-vault-promises/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.4"
+version = "0.50.5"
 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 78aa0cecc2..359a7cef4a 100644
--- a/contracts/feature-tests/composability/vault/wasm-vault-upgrade/Cargo.toml
+++ b/contracts/feature-tests/composability/vault/wasm-vault-upgrade/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.4"
+version = "0.50.5"
 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 8e98320af2..fc0ede1620 100644
--- a/contracts/feature-tests/composability/vault/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/vault/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.4"
+version = "0.50.5"
 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 70859a6bff..6d17c6a61e 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.50.4"
+version = "0.50.5"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.4"
+version = "0.50.5"
 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 93d0c3cc43..4bc64de5d5 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.50.4"
+version = "0.50.5"
 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 0417765ea5..e0506b1287 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.4"
+version = "0.50.5"
 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 6663594783..c05bac1449 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.50.4"
+version = "0.50.5"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.4"
+version = "0.50.5"
 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 ec07218c50..9994ac7fd8 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.50.4"
+version = "0.50.5"
 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 376d245a97..788be22a80 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.4"
+version = "0.50.5"
 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 23a4bec8cc..3b9fdab55a 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.50.4"
+version = "0.50.5"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.4"
+version = "0.50.5"
 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 e688bc7dbd..a8a234a590 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.50.4"
+version = "0.50.5"
 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 cacee4b198..14e3497586 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.4"
+version = "0.50.5"
 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 f6900d121c..19afa1425a 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.50.4"
+version = "0.50.5"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.4"
+version = "0.50.5"
 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 dacb7febda..bd71fb249d 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.50.4"
+version = "0.50.5"
 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 fd06407ea9..761f27dce8 100644
--- a/contracts/feature-tests/erc-style-contracts/erc1155/wasm/Cargo.toml
+++ b/contracts/feature-tests/erc-style-contracts/erc1155/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.4"
+version = "0.50.5"
 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 e4847fe84e..a89fc67f45 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.50.4"
+version = "0.50.5"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.4"
+version = "0.50.5"
 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 06b1fd5180..2157e49298 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.50.4"
+version = "0.50.5"
 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 e1e9440bbb..820cff41b9 100644
--- a/contracts/feature-tests/erc-style-contracts/erc20/wasm/Cargo.toml
+++ b/contracts/feature-tests/erc-style-contracts/erc20/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.4"
+version = "0.50.5"
 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 46de472582..865eea0b4f 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.50.4"
+version = "0.50.5"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.4"
+version = "0.50.5"
 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 71a4aa8242..a4e0c8192b 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.50.4"
+version = "0.50.5"
 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 31e279d4dd..b9f08a8bbb 100644
--- a/contracts/feature-tests/erc-style-contracts/erc721/wasm/Cargo.toml
+++ b/contracts/feature-tests/erc-style-contracts/erc721/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.4"
+version = "0.50.5"
 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 29cd9198de..def5c09caa 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.50.4"
+version = "0.50.5"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.4"
+version = "0.50.5"
 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 cba1f534db..0d25d3f571 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.50.4"
+version = "0.50.5"
 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 72ac23236f..f24d2b8752 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.4"
+version = "0.50.5"
 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 3719eab8f5..490cf8b36d 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.50.4"
+version = "0.50.5"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.4"
+version = "0.50.5"
 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 4c1e10d495..e6a2771bde 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.50.4"
+version = "0.50.5"
 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 6388cdb5e9..2ab216bb6f 100644
--- a/contracts/feature-tests/esdt-system-sc-mock/wasm/Cargo.toml
+++ b/contracts/feature-tests/esdt-system-sc-mock/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/exchange-features/Cargo.toml b/contracts/feature-tests/exchange-features/Cargo.toml
index 00a1c32504..ee6b446d95 100644
--- a/contracts/feature-tests/exchange-features/Cargo.toml
+++ b/contracts/feature-tests/exchange-features/Cargo.toml
@@ -9,9 +9,9 @@ publish = false
 path = "src/exchange_features.rs"
 
 [dependencies.multiversx-sc]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../framework/scenario"
diff --git a/contracts/feature-tests/exchange-features/meta/Cargo.toml b/contracts/feature-tests/exchange-features/meta/Cargo.toml
index b9e4c2d636..dcdc40015c 100644
--- a/contracts/feature-tests/exchange-features/meta/Cargo.toml
+++ b/contracts/feature-tests/exchange-features/meta/Cargo.toml
@@ -8,6 +8,6 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/feature-tests/exchange-features/wasm/Cargo.toml b/contracts/feature-tests/exchange-features/wasm/Cargo.toml
index 3d58f61397..e718d3db73 100644
--- a/contracts/feature-tests/exchange-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/exchange-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.4"
+version = "0.50.5"
 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 c4dbd64346..68681c349d 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.50.4"
+version = "0.50.5"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.4"
+version = "0.50.5"
 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 995bed01a1..aa87010a0d 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.50.4"
+version = "0.50.5"
 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 9bdbb397b1..8fd1530950 100644
--- a/contracts/feature-tests/formatted-message-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/formatted-message-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.4"
+version = "0.50.5"
 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 cacc836734..026b87a338 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.50.4"
+version = "0.50.5"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.4"
+version = "0.50.5"
 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 d949539f8c..ff2a5f1422 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.50.4"
+version = "0.50.5"
 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 94e135348c..f1eb506dce 100644
--- a/contracts/feature-tests/managed-map-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/managed-map-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.4"
+version = "0.50.5"
 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 e5344f6fa9..16d506b682 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.50.4"
+version = "0.50.5"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.4"
+version = "0.50.5"
 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 885bd1549d..ed5298ad19 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.50.4"
+version = "0.50.5"
 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 389e3aaef0..83f51076c9 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.4"
+version = "0.50.5"
 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 d53987ff31..4389b312db 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
@@ -29,7 +29,7 @@ path = ".."
 features = ["example_feature"]
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.4"
+version = "0.50.5"
 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 d96c8a598b..0c5f20ba8f 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.4"
+version = "0.50.5"
 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 128ca2f968..ce2a108d20 100644
--- a/contracts/feature-tests/multi-contract-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/multi-contract-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.4"
+version = "0.50.5"
 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 4f13f68900..92803a2191 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.50.4"
+version = "0.50.5"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.4"
+version = "0.50.5"
 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 fe93edb29e..6b2519fc30 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.50.4"
+version = "0.50.5"
 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 61fe0cd770..066f59f968 100644
--- a/contracts/feature-tests/panic-message-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/panic-message-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/payable-features/Cargo.toml b/contracts/feature-tests/payable-features/Cargo.toml
index 0b5bec27fd..0e6ed8d19c 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.50.4"
+version = "0.50.5"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../framework/scenario"
diff --git a/contracts/feature-tests/payable-features/meta/Cargo.toml b/contracts/feature-tests/payable-features/meta/Cargo.toml
index 84578286f1..fe86bb14a3 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.50.4"
+version = "0.50.5"
 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 e89c568803..659025df0b 100644
--- a/contracts/feature-tests/payable-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/payable-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.4"
+version = "0.50.5"
 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 415a09f0e2..d21de02dd1 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.50.4"
+version = "0.50.5"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.4"
+version = "0.50.5"
 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 c29bdf9785..37c04408ea 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.50.4"
+version = "0.50.5"
 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 3b610bd655..717c8510f9 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.50.4"
+version = "0.50.5"
 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 82e9e7d66f..d60e4f8ed3 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.50.4"
+// version = "0.50.5"
 // 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 3a70845756..d8f43946d2 100644
--- a/contracts/feature-tests/rust-snippets-generator-test/wasm/Cargo.toml
+++ b/contracts/feature-tests/rust-snippets-generator-test/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.4"
+version = "0.50.5"
 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 c13903eb36..75d8fa4643 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.50.4"
+version = "0.50.5"
 path = "../../../framework/base"
 features = [ "alloc" ]
 
@@ -17,7 +17,7 @@ path = "../../examples/adder"
 path = "../../feature-tests/basic-features"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.4"
+version = "0.50.5"
 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 e1e5140b62..5d0a7b998e 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.50.4"
+version = "0.50.5"
 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 112fee379f..e3a2bf4a14 100644
--- a/contracts/feature-tests/rust-testing-framework-tester/wasm/Cargo.toml
+++ b/contracts/feature-tests/rust-testing-framework-tester/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/scenario-tester/Cargo.toml b/contracts/feature-tests/scenario-tester/Cargo.toml
index 677f13066a..43497ac936 100644
--- a/contracts/feature-tests/scenario-tester/Cargo.toml
+++ b/contracts/feature-tests/scenario-tester/Cargo.toml
@@ -9,9 +9,9 @@ publish = false
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../framework/scenario"
diff --git a/contracts/feature-tests/scenario-tester/meta/Cargo.toml b/contracts/feature-tests/scenario-tester/meta/Cargo.toml
index 83125d946f..5824568ed9 100644
--- a/contracts/feature-tests/scenario-tester/meta/Cargo.toml
+++ b/contracts/feature-tests/scenario-tester/meta/Cargo.toml
@@ -8,6 +8,6 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/feature-tests/scenario-tester/wasm/Cargo.toml b/contracts/feature-tests/scenario-tester/wasm/Cargo.toml
index 9b6499dec4..80b8296af6 100644
--- a/contracts/feature-tests/scenario-tester/wasm/Cargo.toml
+++ b/contracts/feature-tests/scenario-tester/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/use-module/Cargo.toml b/contracts/feature-tests/use-module/Cargo.toml
index ffbd53a29b..22bf41d993 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.50.4"
+version = "0.50.5"
 path = "../../../contracts/modules"
 
 [dependencies.multiversx-sc]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../framework/scenario"
 
 [dev-dependencies.multiversx-sc-meta]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../framework/meta"
diff --git a/contracts/feature-tests/use-module/meta/Cargo.toml b/contracts/feature-tests/use-module/meta/Cargo.toml
index cc92407a9c..4d59041f8d 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.50.4"
+version = "0.50.5"
 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 db9635f70d..5a91c89feb 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.50.4"
+version = "0.50.5"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.50.4"
+version = "0.50.5"
 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 7954d95e16..1d45144bb7 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.50.4"
+            "version": "0.50.5"
         }
     },
     "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 790b6bb396..e2dfdbefb9 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.50.4"
+            "version": "0.50.5"
         }
     },
     "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 29a065b6e5..f44d5cf870 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.4"
+version = "0.50.5"
 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 e5e73604fc..88dee8d70d 100644
--- a/contracts/feature-tests/use-module/wasm/Cargo.toml
+++ b/contracts/feature-tests/use-module/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/modules/Cargo.toml b/contracts/modules/Cargo.toml
index c2bcbf859f..f610d09504 100644
--- a/contracts/modules/Cargo.toml
+++ b/contracts/modules/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-modules"
-version = "0.50.4"
+version = "0.50.5"
 edition = "2021"
 
 authors = ["MultiversX <contact@multiversx.com>"]
@@ -17,5 +17,5 @@ categories = ["no-std", "wasm", "cryptography::cryptocurrencies"]
 alloc = ["multiversx-sc/alloc"]
 
 [dependencies.multiversx-sc]
-version = "0.50.4"
+version = "0.50.5"
 path = "../../framework/base"
diff --git a/framework/base/Cargo.toml b/framework/base/Cargo.toml
index 0c7f607a23..189b015bd4 100644
--- a/framework/base/Cargo.toml
+++ b/framework/base/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc"
-version = "0.50.4"
+version = "0.50.5"
 edition = "2021"
 rust-version = "1.78"
 
@@ -30,7 +30,7 @@ num-traits = { version = "=0.2.19", default-features = false }
 unwrap-infallible = "0.1.5"
 
 [dependencies.multiversx-sc-derive]
-version = "=0.50.4"
+version = "=0.50.5"
 path = "../derive"
 
 [dependencies.multiversx-sc-codec]
diff --git a/framework/derive/Cargo.toml b/framework/derive/Cargo.toml
index a8db090c4e..32da6f13f4 100644
--- a/framework/derive/Cargo.toml
+++ b/framework/derive/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-derive"
-version = "0.50.4"
+version = "0.50.5"
 edition = "2021"
 
 authors = ["Andrei Marinica <andrei.marinica@multiversx.com>", "MultiversX <contact@multiversx.com>"]
diff --git a/framework/meta/Cargo.toml b/framework/meta/Cargo.toml
index cab504fabe..31b1ec399f 100644
--- a/framework/meta/Cargo.toml
+++ b/framework/meta/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-meta"
-version = "0.50.4"
+version = "0.50.5"
 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.50.4"
+version = "=0.50.5"
 path = "../base"
 features = ["alloc", "num-bigint"]
 
diff --git a/framework/meta/src/version_history.rs b/framework/meta/src/version_history.rs
index 4082030a68..7c4ec06304 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.50.4);
+pub const LAST_VERSION: FrameworkVersion = framework_version!(0.50.5);
 
 /// Indicates where to stop with the upgrades.
 pub const LAST_UPGRADE_VERSION: FrameworkVersion = LAST_VERSION;
@@ -74,6 +74,7 @@ pub const VERSIONS: &[FrameworkVersion] = framework_versions![
     0.50.2,
     0.50.3,
     0.50.4,
+    0.50.5,
 ];
 
 #[rustfmt::skip]
diff --git a/framework/scenario/Cargo.toml b/framework/scenario/Cargo.toml
index 4d534fd98a..3f7475b79b 100644
--- a/framework/scenario/Cargo.toml
+++ b/framework/scenario/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-scenario"
-version = "0.50.4"
+version = "0.50.5"
 edition = "2021"
 
 authors = [
@@ -41,12 +41,12 @@ path = "src/main.rs"
 run-go-tests = []
 
 [dependencies.multiversx-sc]
-version = "=0.50.4"
+version = "=0.50.5"
 features = ["alloc", "num-bigint"]
 path = "../base"
 
 [dependencies.multiversx-sc-meta]
-version = "=0.50.4"
+version = "=0.50.5"
 path = "../meta"
 
 [dependencies.multiversx-chain-scenario-format]
diff --git a/framework/snippets/Cargo.toml b/framework/snippets/Cargo.toml
index 26a689e559..0c0d39c190 100644
--- a/framework/snippets/Cargo.toml
+++ b/framework/snippets/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-snippets"
-version = "0.50.4"
+version = "0.50.5"
 edition = "2021"
 
 authors = ["MultiversX <contact@multiversx.com>"]
@@ -22,7 +22,7 @@ env_logger = "0.11"
 futures = "0.3"
 
 [dependencies.multiversx-sc-scenario]
-version = "=0.50.4"
+version = "=0.50.5"
 path = "../scenario"
 
 [dependencies.multiversx-sdk]
diff --git a/framework/wasm-adapter/Cargo.toml b/framework/wasm-adapter/Cargo.toml
index c23be2e41d..474395bb4b 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.50.4"
+version = "0.50.5"
 edition = "2021"
 
 authors = [
@@ -22,5 +22,5 @@ categories = [
 ]
 
 [dependencies.multiversx-sc]
-version = "=0.50.4"
+version = "=0.50.5"
 path = "../base"
diff --git a/tools/mxpy-snippet-generator/Cargo.toml b/tools/mxpy-snippet-generator/Cargo.toml
index f7451e2db7..3c21ed263d 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.50.4"
+version = "0.50.5"
 path = "../../framework/base"
 
 [dependencies]
diff --git a/tools/rust-debugger/format-tests/Cargo.toml b/tools/rust-debugger/format-tests/Cargo.toml
index 3e822b0499..13d00d9d2a 100644
--- a/tools/rust-debugger/format-tests/Cargo.toml
+++ b/tools/rust-debugger/format-tests/Cargo.toml
@@ -9,11 +9,11 @@ name = "format-tests"
 path = "src/format_tests.rs"
 
 [dependencies.multiversx-sc]
-version = "=0.50.4"
+version = "=0.50.5"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-scenario]
-version = "=0.50.4"
+version = "=0.50.5"
 path = "../../../framework/scenario"
 
 [dependencies.multiversx-chain-vm]

From 0b43491644e0a633f194e1eff96a4b6c5c2dfb47 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 21 Jun 2024 20:42:29 +0300
Subject: [PATCH 1025/1254] Cargo.lock update

---
 contracts/benchmarks/large-storage/wasm/Cargo.lock     |  6 +++---
 .../mappers/linked-list-repeat/wasm/Cargo.lock         |  6 +++---
 .../benchmarks/mappers/map-repeat/wasm/Cargo.lock      |  6 +++---
 .../benchmarks/mappers/queue-repeat/wasm/Cargo.lock    |  6 +++---
 .../benchmarks/mappers/set-repeat/wasm/Cargo.lock      |  6 +++---
 .../mappers/single-value-repeat/wasm/Cargo.lock        |  6 +++---
 .../benchmarks/mappers/vec-repeat/wasm/Cargo.lock      |  6 +++---
 contracts/benchmarks/send-tx-repeat/wasm/Cargo.lock    |  6 +++---
 .../wasm-str-repeat-mb-builder-basic/Cargo.lock        |  6 +++---
 .../wasm-str-repeat-mb-builder-cached/Cargo.lock       |  6 +++---
 contracts/benchmarks/str-repeat/wasm/Cargo.lock        |  6 +++---
 contracts/core/price-aggregator/wasm/Cargo.lock        | 10 +++++-----
 contracts/examples/adder/wasm/Cargo.lock               |  6 +++---
 .../examples/bonding-curve-contract/wasm/Cargo.lock    |  8 ++++----
 contracts/examples/check-pause/wasm/Cargo.lock         |  8 ++++----
 contracts/examples/crowdfunding-esdt/wasm/Cargo.lock   |  6 +++---
 contracts/examples/crypto-bubbles/wasm/Cargo.lock      |  6 +++---
 .../crypto-kitties/kitty-auction/wasm/Cargo.lock       |  6 +++---
 .../crypto-kitties/kitty-genetic-alg/wasm/Cargo.lock   |  6 +++---
 .../crypto-kitties/kitty-ownership/wasm/Cargo.lock     |  6 +++---
 contracts/examples/crypto-zombies/wasm/Cargo.lock      |  6 +++---
 contracts/examples/digital-cash/wasm/Cargo.lock        |  6 +++---
 contracts/examples/empty/wasm/Cargo.lock               |  6 +++---
 .../examples/esdt-transfer-with-fee/wasm/Cargo.lock    |  6 +++---
 contracts/examples/factorial/wasm/Cargo.lock           |  6 +++---
 contracts/examples/fractional-nfts/wasm/Cargo.lock     |  8 ++++----
 contracts/examples/lottery-esdt/wasm/Cargo.lock        |  6 +++---
 .../examples/multisig/wasm-multisig-full/Cargo.lock    |  8 ++++----
 .../examples/multisig/wasm-multisig-view/Cargo.lock    |  8 ++++----
 contracts/examples/multisig/wasm/Cargo.lock            |  8 ++++----
 contracts/examples/nft-minter/wasm/Cargo.lock          |  6 +++---
 contracts/examples/nft-storage-prepay/wasm/Cargo.lock  |  6 +++---
 contracts/examples/nft-subscription/wasm/Cargo.lock    |  8 ++++----
 contracts/examples/order-book/factory/wasm/Cargo.lock  |  6 +++---
 contracts/examples/order-book/pair/wasm/Cargo.lock     |  6 +++---
 contracts/examples/ping-pong-egld/wasm/Cargo.lock      |  6 +++---
 contracts/examples/proxy-pause/wasm/Cargo.lock         |  6 +++---
 .../examples/rewards-distribution/wasm/Cargo.lock      |  8 ++++----
 contracts/examples/seed-nft-minter/wasm/Cargo.lock     |  8 ++++----
 contracts/examples/token-release/wasm/Cargo.lock       |  6 +++---
 .../abi-tester/wasm-abi-tester-ev/Cargo.lock           |  6 +++---
 contracts/feature-tests/abi-tester/wasm/Cargo.lock     |  6 +++---
 .../alloc-features/wasm-alloc-mem-fail/Cargo.lock      |  6 +++---
 .../alloc-features/wasm-alloc-mem-leaking/Cargo.lock   |  6 +++---
 contracts/feature-tests/alloc-features/wasm/Cargo.lock |  6 +++---
 .../wasm-basic-features-storage-bytes/Cargo.lock       |  8 ++++----
 contracts/feature-tests/basic-features/wasm/Cargo.lock |  8 ++++----
 .../feature-tests/big-float-features/wasm/Cargo.lock   |  6 +++---
 .../builtin-func-features/wasm/Cargo.lock              |  6 +++---
 .../esdt-contract-pair/first-contract/wasm/Cargo.lock  |  6 +++---
 .../esdt-contract-pair/second-contract/wasm/Cargo.lock |  6 +++---
 .../child/wasm/Cargo.lock                              |  6 +++---
 .../parent/wasm/Cargo.lock                             |  6 +++---
 .../composability/forwarder-legacy/wasm/Cargo.lock     |  6 +++---
 .../wasm-forwarder-queue-promises/Cargo.lock           |  6 +++---
 .../composability/forwarder-queue/wasm/Cargo.lock      |  6 +++---
 .../wasm-forwarder-raw-init-async-call/Cargo.lock      |  6 +++---
 .../wasm-forwarder-raw-init-sync-call/Cargo.lock       |  6 +++---
 .../composability/forwarder-raw/wasm/Cargo.lock        |  6 +++---
 .../composability/forwarder/wasm/Cargo.lock            |  6 +++---
 .../composability/local-esdt-and-nft/wasm/Cargo.lock   |  6 +++---
 .../composability/promises-features/wasm/Cargo.lock    |  6 +++---
 .../composability/proxy-test-first/wasm/Cargo.lock     |  6 +++---
 .../composability/proxy-test-second/wasm/Cargo.lock    |  6 +++---
 .../composability/recursive-caller/wasm/Cargo.lock     |  6 +++---
 .../transfer-role-features/wasm/Cargo.lock             |  8 ++++----
 .../composability/vault/wasm-vault-promises/Cargo.lock |  6 +++---
 .../composability/vault/wasm-vault-upgrade/Cargo.lock  |  6 +++---
 .../feature-tests/composability/vault/wasm/Cargo.lock  |  6 +++---
 .../crowdfunding-erc20/wasm/Cargo.lock                 |  6 +++---
 .../erc1155-marketplace/wasm/Cargo.lock                |  6 +++---
 .../erc1155-user-mock/wasm/Cargo.lock                  |  6 +++---
 .../erc-style-contracts/erc1155/wasm/Cargo.lock        |  6 +++---
 .../erc-style-contracts/erc20/wasm/Cargo.lock          |  6 +++---
 .../erc-style-contracts/erc721/wasm/Cargo.lock         |  6 +++---
 .../erc-style-contracts/lottery-erc20/wasm/Cargo.lock  |  6 +++---
 .../feature-tests/esdt-system-sc-mock/wasm/Cargo.lock  |  6 +++---
 .../feature-tests/exchange-features/wasm/Cargo.lock    |  6 +++---
 .../formatted-message-features/wasm/Cargo.lock         |  6 +++---
 .../feature-tests/managed-map-features/wasm/Cargo.lock |  6 +++---
 .../wasm-multi-contract-alt-impl/Cargo.lock            |  6 +++---
 .../wasm-multi-contract-example-feature/Cargo.lock     |  6 +++---
 .../wasm-multi-contract-features-view/Cargo.lock       |  6 +++---
 .../multi-contract-features/wasm/Cargo.lock            |  6 +++---
 .../panic-message-features/wasm/Cargo.lock             |  6 +++---
 .../feature-tests/payable-features/wasm/Cargo.lock     |  6 +++---
 .../rust-snippets-generator-test/wasm/Cargo.lock       |  6 +++---
 .../rust-testing-framework-tester/wasm/Cargo.lock      |  6 +++---
 .../feature-tests/scenario-tester/wasm/Cargo.lock      |  6 +++---
 .../use-module/wasm-use-module-view/Cargo.lock         |  8 ++++----
 contracts/feature-tests/use-module/wasm/Cargo.lock     |  8 ++++----
 91 files changed, 289 insertions(+), 289 deletions(-)

diff --git a/contracts/benchmarks/large-storage/wasm/Cargo.lock b/contracts/benchmarks/large-storage/wasm/Cargo.lock
index 6000f3b71a..7a67810d1e 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.50.4"
+version = "0.50.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.lock
index 8ce823d571..6032ec957a 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.50.4"
+version = "0.50.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.lock
index da3c30c0a5..23ded79e96 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.50.4"
+version = "0.50.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.lock
index c2e5d02bcc..e6e3af570f 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.50.4"
+version = "0.50.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -78,7 +78,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -89,7 +89,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.lock
index 89002bdea2..9edc3ab085 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.50.4"
+version = "0.50.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -78,7 +78,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -89,7 +89,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.lock
index 56b5e7e3c5..6a28af4cca 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.50.4"
+version = "0.50.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -78,7 +78,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -89,7 +89,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.lock
index 65bc362ee3..4460a4b144 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.50.4"
+version = "0.50.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -78,7 +78,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -89,7 +89,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/send-tx-repeat/wasm/Cargo.lock b/contracts/benchmarks/send-tx-repeat/wasm/Cargo.lock
index 047ac0d94e..7b258362e5 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.50.4"
+version = "0.50.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.lock b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.lock
index e315dfdabc..4a0f941016 100644
--- a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.lock
+++ b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.lock
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.lock b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.lock
index 4662dafebd..efb95c7fb7 100644
--- a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.lock
+++ b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.lock
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/str-repeat/wasm/Cargo.lock b/contracts/benchmarks/str-repeat/wasm/Cargo.lock
index 41061c59d9..e4c08a1e4d 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.50.4"
+version = "0.50.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/core/price-aggregator/wasm/Cargo.lock b/contracts/core/price-aggregator/wasm/Cargo.lock
index 00cfe895e1..001b1b17a4 100644
--- a/contracts/core/price-aggregator/wasm/Cargo.lock
+++ b/contracts/core/price-aggregator/wasm/Cargo.lock
@@ -86,7 +86,7 @@ checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
 
 [[package]]
 name = "multiversx-price-aggregator-sc"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "arrayvec",
  "getrandom",
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -136,7 +136,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -147,14 +147,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/adder/wasm/Cargo.lock b/contracts/examples/adder/wasm/Cargo.lock
index b181abbe01..f6e7f73c4a 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.50.4"
+version = "0.50.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/bonding-curve-contract/wasm/Cargo.lock b/contracts/examples/bonding-curve-contract/wasm/Cargo.lock
index 1f2eda6959..3a0c0c7cd2 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.50.4"
+version = "0.50.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/check-pause/wasm/Cargo.lock b/contracts/examples/check-pause/wasm/Cargo.lock
index ac453734eb..7a37f5a566 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.50.4"
+version = "0.50.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crowdfunding-esdt/wasm/Cargo.lock b/contracts/examples/crowdfunding-esdt/wasm/Cargo.lock
index 00c5596d94..a2332640ef 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.50.4"
+version = "0.50.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crypto-bubbles/wasm/Cargo.lock b/contracts/examples/crypto-bubbles/wasm/Cargo.lock
index dacef30830..e4ff2e0726 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.50.4"
+version = "0.50.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.lock b/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.lock
index 82c5e1614e..1089304ac0 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.50.4"
+version = "0.50.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -115,7 +115,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -126,7 +126,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]
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 45678f6987..ff0ef0cd95 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.50.4"
+version = "0.50.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -96,7 +96,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -107,7 +107,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.lock b/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.lock
index f09efa6c74..6c9d74482f 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.50.4"
+version = "0.50.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -106,7 +106,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -117,7 +117,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crypto-zombies/wasm/Cargo.lock b/contracts/examples/crypto-zombies/wasm/Cargo.lock
index e0e1ff25a3..2acc59e790 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.50.4"
+version = "0.50.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/digital-cash/wasm/Cargo.lock b/contracts/examples/digital-cash/wasm/Cargo.lock
index f604055902..057c5d1cfa 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.50.4"
+version = "0.50.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/empty/wasm/Cargo.lock b/contracts/examples/empty/wasm/Cargo.lock
index b6665397e8..0a05127c19 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.50.4"
+version = "0.50.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.lock b/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.lock
index 3784aa6d8d..6b2278b1a7 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.50.4"
+version = "0.50.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/factorial/wasm/Cargo.lock b/contracts/examples/factorial/wasm/Cargo.lock
index a00fa3b1a7..b79c81ed6d 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.50.4"
+version = "0.50.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/fractional-nfts/wasm/Cargo.lock b/contracts/examples/fractional-nfts/wasm/Cargo.lock
index 24039b2361..2dd77b0f82 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.50.4"
+version = "0.50.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/lottery-esdt/wasm/Cargo.lock b/contracts/examples/lottery-esdt/wasm/Cargo.lock
index 07c1aac201..2b33daa3b2 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.50.4"
+version = "0.50.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/multisig/wasm-multisig-full/Cargo.lock b/contracts/examples/multisig/wasm-multisig-full/Cargo.lock
index 045b2a94f0..3fac67208d 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.50.4"
+version = "0.50.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/multisig/wasm-multisig-view/Cargo.lock b/contracts/examples/multisig/wasm-multisig-view/Cargo.lock
index 71888d297c..3d5d98ce90 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.50.4"
+version = "0.50.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/multisig/wasm/Cargo.lock b/contracts/examples/multisig/wasm/Cargo.lock
index 0f2c4d39cc..792e34c60c 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.50.4"
+version = "0.50.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/nft-minter/wasm/Cargo.lock b/contracts/examples/nft-minter/wasm/Cargo.lock
index ed66ee32f5..01e57e8821 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.50.4"
+version = "0.50.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/nft-storage-prepay/wasm/Cargo.lock b/contracts/examples/nft-storage-prepay/wasm/Cargo.lock
index 25af9a8abd..9e6867aa92 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.50.4"
+version = "0.50.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/nft-subscription/wasm/Cargo.lock b/contracts/examples/nft-subscription/wasm/Cargo.lock
index 3c6dcb76fb..0b86829f8a 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.50.4"
+version = "0.50.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,14 +82,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/order-book/factory/wasm/Cargo.lock b/contracts/examples/order-book/factory/wasm/Cargo.lock
index 626ffc96ce..5f07fef9b1 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.50.4"
+version = "0.50.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/order-book/pair/wasm/Cargo.lock b/contracts/examples/order-book/pair/wasm/Cargo.lock
index b7374deb9e..bb5a827b6e 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.50.4"
+version = "0.50.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/ping-pong-egld/wasm/Cargo.lock b/contracts/examples/ping-pong-egld/wasm/Cargo.lock
index a68f4a40cf..511344ae0a 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.50.4"
+version = "0.50.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/proxy-pause/wasm/Cargo.lock b/contracts/examples/proxy-pause/wasm/Cargo.lock
index f75ba4b75c..59900d3a3e 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.50.4"
+version = "0.50.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/rewards-distribution/wasm/Cargo.lock b/contracts/examples/rewards-distribution/wasm/Cargo.lock
index d7f6caf12e..28d437e6d8 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.50.4"
+version = "0.50.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,14 +82,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/seed-nft-minter/wasm/Cargo.lock b/contracts/examples/seed-nft-minter/wasm/Cargo.lock
index 9b0ba10e02..c5c87e9f40 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.50.4"
+version = "0.50.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,14 +82,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/token-release/wasm/Cargo.lock b/contracts/examples/token-release/wasm/Cargo.lock
index efa229facb..7cc1472fc1 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.50.4"
+version = "0.50.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]
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 9811e04351..ae6ad2a2e2 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.50.4"
+version = "0.50.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/abi-tester/wasm/Cargo.lock b/contracts/feature-tests/abi-tester/wasm/Cargo.lock
index f958aeb361..e537658a36 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.50.4"
+version = "0.50.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock
index a3a3fd1092..f2546d45fa 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.lock b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.lock
index ec1c72a547..61d0643013 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.lock
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.lock
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/alloc-features/wasm/Cargo.lock b/contracts/feature-tests/alloc-features/wasm/Cargo.lock
index 0635781674..eb38f68e2c 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.50.4"
+version = "0.50.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]
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 68c3524a02..f05d0b1e78 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.50.4"
+version = "0.50.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/basic-features/wasm/Cargo.lock b/contracts/feature-tests/basic-features/wasm/Cargo.lock
index aa49059092..16abdbfaeb 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.50.4"
+version = "0.50.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/big-float-features/wasm/Cargo.lock b/contracts/feature-tests/big-float-features/wasm/Cargo.lock
index a010249068..8b6c45a4bc 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.50.4"
+version = "0.50.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]
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 9e654afbbe..412234d22f 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.50.4"
+version = "0.50.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]
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 3247d51cf4..22c0c57039 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.50.4"
+version = "0.50.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]
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 01787dffb1..fa62b4133c 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.50.4"
+version = "0.50.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]
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 1a5e2302d7..d34ff3e1c2 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.50.4"
+version = "0.50.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]
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 517d1d235a..98575898bf 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
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.lock
index 260ea82b38..bde38d363c 100644
--- a/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.lock
@@ -56,7 +56,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,7 +98,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]
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 7164f97dfd..2b0d43ba0e 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
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock
index b55b75b2a3..9b032feec0 100644
--- a/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]
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 a4f4e61088..37bd9e00a6 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.50.4"
+version = "0.50.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]
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 ddc41d1351..873b244299 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.50.4"
+version = "0.50.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.lock
index fa82af0875..0e93dcf09c 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.50.4"
+version = "0.50.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock
index add51bcafe..29e387f07b 100755
--- a/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]
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 8e9274db11..dce37bc941 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.50.4"
+version = "0.50.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/promises-features/wasm/Cargo.lock b/contracts/feature-tests/composability/promises-features/wasm/Cargo.lock
index 44a2bf27d9..8e8c0154fe 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.50.4"
+version = "0.50.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]
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 a68f768f12..24cf03f26e 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.50.4"
+version = "0.50.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]
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 8394700322..fed72a083d 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.50.4"
+version = "0.50.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.lock b/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.lock
index 81d54ddccc..ceff9a9720 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.50.4"
+version = "0.50.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]
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 51e07e354f..4404579b7c 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.50.4"
+version = "0.50.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,14 +82,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]
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 e7cb820e34..03a29bf426 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.50.4"
+version = "0.50.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]
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 10dfae666b..70a9be9256 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.50.4"
+version = "0.50.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/vault/wasm/Cargo.lock b/contracts/feature-tests/composability/vault/wasm/Cargo.lock
index 8ea1db5dbb..f896924ad7 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.50.4"
+version = "0.50.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]
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 04289c897e..a01dc14994 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.50.4"
+version = "0.50.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]
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 704fe49f31..566446f2b6 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.50.4"
+version = "0.50.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]
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 6dc79fd7d2..20325df876 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.50.4"
+version = "0.50.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]
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 68a1c61fcf..2217fefddd 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.50.4"
+version = "0.50.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]
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 3c87c50df7..c34b662eed 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.50.4"
+version = "0.50.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]
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 cc2b90e377..4dce677344 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.50.4"
+version = "0.50.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]
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 27f15abab0..66a2849de3 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.50.4"
+version = "0.50.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]
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 97d1903c90..1f31ae0e27 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.50.4"
+version = "0.50.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/exchange-features/wasm/Cargo.lock b/contracts/feature-tests/exchange-features/wasm/Cargo.lock
index 140e4d3358..3c03efcd5f 100644
--- a/contracts/feature-tests/exchange-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/exchange-features/wasm/Cargo.lock
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/formatted-message-features/wasm/Cargo.lock b/contracts/feature-tests/formatted-message-features/wasm/Cargo.lock
index fec605f01c..6867ed3ae0 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.50.4"
+version = "0.50.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/managed-map-features/wasm/Cargo.lock b/contracts/feature-tests/managed-map-features/wasm/Cargo.lock
index bd12024f4a..3bf6d32c5c 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.50.4"
+version = "0.50.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]
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 9cef706d89..6ece98b397 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.50.4"
+version = "0.50.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]
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 744196c756..9c46e3d4fb 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.50.4"
+version = "0.50.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]
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 3a894da6b1..48c36b2dac 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.50.4"
+version = "0.50.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/multi-contract-features/wasm/Cargo.lock b/contracts/feature-tests/multi-contract-features/wasm/Cargo.lock
index 5aac6475ea..eafea4b50f 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.50.4"
+version = "0.50.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/panic-message-features/wasm/Cargo.lock b/contracts/feature-tests/panic-message-features/wasm/Cargo.lock
index e8487472de..59dcf44411 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.50.4"
+version = "0.50.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/payable-features/wasm/Cargo.lock b/contracts/feature-tests/payable-features/wasm/Cargo.lock
index d7b52b3458..da6911995a 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.50.4"
+version = "0.50.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]
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 ce81832c8c..8fd3cbf4c2 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.50.4"
+version = "0.50.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]
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 d535046fbc..af79633a19 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.50.4"
+version = "0.50.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/scenario-tester/wasm/Cargo.lock b/contracts/feature-tests/scenario-tester/wasm/Cargo.lock
index 9394dac768..f65dbf0ca7 100755
--- a/contracts/feature-tests/scenario-tester/wasm/Cargo.lock
+++ b/contracts/feature-tests/scenario-tester/wasm/Cargo.lock
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]
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 5cf04148aa..cda84b2b55 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.50.4"
+version = "0.50.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,14 +82,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/use-module/wasm/Cargo.lock b/contracts/feature-tests/use-module/wasm/Cargo.lock
index 644787746a..d74c1deb38 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.50.4"
+version = "0.50.5"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,14 +82,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.4"
+version = "0.50.5"
 dependencies = [
  "multiversx-sc",
 ]

From 6253b4a08a8987bec13879ee4e4b8be0b3e24d7e Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Sun, 23 Jun 2024 02:06:12 +0300
Subject: [PATCH 1026/1254] logarithm refactor

---
 framework/base/src/types.rs                   |  1 +
 .../base/src/types/managed/basic/big_uint.rs  | 24 ++-----------
 framework/base/src/types/math_util.rs         |  1 +
 .../base/src/types/math_util/logarithm_i64.rs | 36 +++++++++++++++++++
 4 files changed, 40 insertions(+), 22 deletions(-)
 create mode 100644 framework/base/src/types/math_util.rs
 create mode 100644 framework/base/src/types/math_util/logarithm_i64.rs

diff --git a/framework/base/src/types.rs b/framework/base/src/types.rs
index caa4a5a2d3..23d94214ba 100644
--- a/framework/base/src/types.rs
+++ b/framework/base/src/types.rs
@@ -4,6 +4,7 @@ pub mod heap;
 mod interaction;
 mod io;
 mod managed;
+pub(crate) mod math_util;
 mod static_buffer;
 
 pub use crypto::*;
diff --git a/framework/base/src/types/managed/basic/big_uint.rs b/framework/base/src/types/managed/basic/big_uint.rs
index 658697c2ec..77d16a6e4c 100644
--- a/framework/base/src/types/managed/basic/big_uint.rs
+++ b/framework/base/src/types/managed/basic/big_uint.rs
@@ -259,28 +259,8 @@ impl<M: ManagedTypeApi> BigUint<M> {
             .unwrap_or_else(|| ErrorHelper::<M>::signal_error_with_message("ln internal error"))
             as i64;
 
-        const DENOMINATOR: i64 = 1_000_000_000;
-
-        // x normalized to [1.0, 2.0]
-        debug_assert!(x >= DENOMINATOR);
-        debug_assert!(x <= 2 * DENOMINATOR);
-
-        let mut result: i64 = -56570851; // -0.056570851
-        result *= x;
-        result /= DENOMINATOR;
-        result += 447179550; // 0.44717955
-        result *= x;
-        result /= DENOMINATOR;
-        result += -1469956800; // -1.4699568
-        result *= x;
-        result /= DENOMINATOR;
-        result += 2821202600; // 2.8212026
-        result *= x;
-        result /= DENOMINATOR;
-        result += -1741793900; // -1.7417939
-
-        const LN_OF_2_SCALE_9: i64 = 693147180; // 0.69314718
-        result += bit_log2 as i64 * LN_OF_2_SCALE_9;
+        let result =
+            crate::types::math_util::logarithm_i64::ln_from_bits_and_normalized(bit_log2, x);
 
         debug_assert!(result > 0);
 
diff --git a/framework/base/src/types/math_util.rs b/framework/base/src/types/math_util.rs
new file mode 100644
index 0000000000..9322ee93ac
--- /dev/null
+++ b/framework/base/src/types/math_util.rs
@@ -0,0 +1 @@
+pub mod logarithm_i64;
diff --git a/framework/base/src/types/math_util/logarithm_i64.rs b/framework/base/src/types/math_util/logarithm_i64.rs
new file mode 100644
index 0000000000..0e2d54fa18
--- /dev/null
+++ b/framework/base/src/types/math_util/logarithm_i64.rs
@@ -0,0 +1,36 @@
+const DENOMINATOR: i64 = 1_000_000_000;
+
+const LN_OF_2_SCALE_9: I64Decimal9 = 693147180; // 0.69314718
+
+/// Indicates that a number is interpreted as a decimal number with 9 decimals.
+pub type I64Decimal9 = i64;
+
+fn ln_polynomial(x: I64Decimal9) -> I64Decimal9 {
+    // x normalized to [1.0, 2.0]
+    debug_assert!(x >= DENOMINATOR);
+    debug_assert!(x <= 2 * DENOMINATOR);
+
+    let mut result: i64 = -56570851; // -0.056570851
+    result *= x;
+    result /= DENOMINATOR;
+    result += 447179550; // 0.44717955
+    result *= x;
+    result /= DENOMINATOR;
+    result += -1469956800; // -1.4699568
+    result *= x;
+    result /= DENOMINATOR;
+    result += 2821202600; // 2.8212026
+    result *= x;
+    result /= DENOMINATOR;
+    result += -1741793900; // -1.7417939
+
+    result
+}
+
+pub fn ln_from_bits_and_normalized(bit_log2: u32, x: I64Decimal9) -> I64Decimal9 {
+    let mut result = ln_polynomial(x);
+
+    result += bit_log2 as i64 * LN_OF_2_SCALE_9;
+
+    result
+}

From 3820924611d09a074de054c3bb48ebc3ede1fad8 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Sun, 23 Jun 2024 02:18:50 +0300
Subject: [PATCH 1027/1254] managed decimal reorg

---
 .../src/types/managed/wrapped/managed_decimal.rs | 16 +++++++++++++++-
 .../{ => managed_decimal}/managed_decimal_cmp.rs |  0
 .../managed_decimal_macros.rs                    |  0
 .../managed_decimal_operators.rs                 |  0
 framework/base/src/types/managed/wrapped/mod.rs  |  4 ----
 5 files changed, 15 insertions(+), 5 deletions(-)
 rename framework/base/src/types/managed/wrapped/{ => managed_decimal}/managed_decimal_cmp.rs (100%)
 rename framework/base/src/types/managed/wrapped/{ => managed_decimal}/managed_decimal_macros.rs (100%)
 rename framework/base/src/types/managed/wrapped/{ => managed_decimal}/managed_decimal_operators.rs (100%)

diff --git a/framework/base/src/types/managed/wrapped/managed_decimal.rs b/framework/base/src/types/managed/wrapped/managed_decimal.rs
index 40fbb6ba5d..785e2694b9 100644
--- a/framework/base/src/types/managed/wrapped/managed_decimal.rs
+++ b/framework/base/src/types/managed/wrapped/managed_decimal.rs
@@ -1,3 +1,9 @@
+mod managed_decimal_cmp;
+mod managed_decimal_macros;
+mod managed_decimal_operators;
+
+pub use managed_decimal_operators::MulToPrecision;
+
 use crate::{
     abi::{TypeAbi, TypeAbiFrom, TypeName},
     api::{
@@ -17,7 +23,7 @@ use multiversx_sc_codec::{
 
 use core::{cmp::Ordering, ops::Deref};
 
-use super::{ManagedBufferCachedBuilder, ManagedRef, MulToPrecision};
+use super::{ManagedBufferCachedBuilder, ManagedRef};
 
 fn scaling_factor<M: ManagedTypeApi>(
     num_decimals: NumDecimals,
@@ -160,6 +166,14 @@ impl<M: ManagedTypeApi, const DECIMALS: NumDecimals> ManagedDecimal<M, ConstDeci
         }
     }
 
+    /// Natural logarithm of a number.
+    ///
+    /// Returns `None` for 0.
+    // pub fn ln(&self) -> Option<ManagedDecimal<M, ConstDecimals<9>>> {
+    //     let data_ln = self.data.ln()?;
+
+    // }
+
     // pub fn log(
     //     &self,
     //     target_base: &ManagedDecimal<M, D>,
diff --git a/framework/base/src/types/managed/wrapped/managed_decimal_cmp.rs b/framework/base/src/types/managed/wrapped/managed_decimal/managed_decimal_cmp.rs
similarity index 100%
rename from framework/base/src/types/managed/wrapped/managed_decimal_cmp.rs
rename to framework/base/src/types/managed/wrapped/managed_decimal/managed_decimal_cmp.rs
diff --git a/framework/base/src/types/managed/wrapped/managed_decimal_macros.rs b/framework/base/src/types/managed/wrapped/managed_decimal/managed_decimal_macros.rs
similarity index 100%
rename from framework/base/src/types/managed/wrapped/managed_decimal_macros.rs
rename to framework/base/src/types/managed/wrapped/managed_decimal/managed_decimal_macros.rs
diff --git a/framework/base/src/types/managed/wrapped/managed_decimal_operators.rs b/framework/base/src/types/managed/wrapped/managed_decimal/managed_decimal_operators.rs
similarity index 100%
rename from framework/base/src/types/managed/wrapped/managed_decimal_operators.rs
rename to framework/base/src/types/managed/wrapped/managed_decimal/managed_decimal_operators.rs
diff --git a/framework/base/src/types/managed/wrapped/mod.rs b/framework/base/src/types/managed/wrapped/mod.rs
index a85c86a6c9..72f1f6d5cf 100644
--- a/framework/base/src/types/managed/wrapped/mod.rs
+++ b/framework/base/src/types/managed/wrapped/mod.rs
@@ -8,9 +8,6 @@ mod esdt_token_payment;
 mod managed_address;
 mod managed_byte_array;
 mod managed_decimal;
-mod managed_decimal_cmp;
-mod managed_decimal_macros;
-mod managed_decimal_operators;
 mod managed_option;
 mod managed_ref;
 mod managed_vec;
@@ -36,7 +33,6 @@ pub use managed_address::ManagedAddress;
 pub(crate) use managed_byte_array::ManagedBufferSizeContext;
 pub use managed_byte_array::ManagedByteArray;
 pub use managed_decimal::{ConstDecimals, Decimals, ManagedDecimal, NumDecimals};
-pub use managed_decimal_operators::*;
 pub use managed_option::ManagedOption;
 pub use managed_ref::ManagedRef;
 pub use managed_vec::ManagedVec;

From 3e422427a7e9d32eaa1c24bef14d5345730def8a Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Sun, 23 Jun 2024 02:29:24 +0300
Subject: [PATCH 1028/1254] managed decimal reorg

---
 .../types/managed/wrapped/managed_decimal.rs  | 56 +------------------
 .../wrapped/managed_decimal/decimals.rs       | 56 +++++++++++++++++++
 2 files changed, 59 insertions(+), 53 deletions(-)
 create mode 100644 framework/base/src/types/managed/wrapped/managed_decimal/decimals.rs

diff --git a/framework/base/src/types/managed/wrapped/managed_decimal.rs b/framework/base/src/types/managed/wrapped/managed_decimal.rs
index 785e2694b9..6ea4c2bfd2 100644
--- a/framework/base/src/types/managed/wrapped/managed_decimal.rs
+++ b/framework/base/src/types/managed/wrapped/managed_decimal.rs
@@ -1,14 +1,16 @@
+mod decimals;
 mod managed_decimal_cmp;
 mod managed_decimal_macros;
 mod managed_decimal_operators;
 
+pub use decimals::{ConstDecimals, Decimals, NumDecimals};
 pub use managed_decimal_operators::MulToPrecision;
 
 use crate::{
     abi::{TypeAbi, TypeAbiFrom, TypeName},
     api::{
         const_handles, use_raw_handle, BigFloatApiImpl, BigIntApiImpl, HandleConstraints,
-        ManagedBufferApiImpl, ManagedTypeApi, StaticVarApiImpl,
+        ManagedBufferApiImpl, ManagedTypeApi,
     },
     formatter::{FormatBuffer, FormatByteReceiver, SCDisplay},
     proxy_imports::{ManagedBuffer, ManagedType},
@@ -25,58 +27,6 @@ use core::{cmp::Ordering, ops::Deref};
 
 use super::{ManagedBufferCachedBuilder, ManagedRef};
 
-fn scaling_factor<M: ManagedTypeApi>(
-    num_decimals: NumDecimals,
-) -> ManagedRef<'static, M, BigUint<M>> {
-    let handle: M::BigIntHandle =
-        use_raw_handle(const_handles::get_scaling_factor_handle(num_decimals));
-
-    if !M::static_var_api_impl().is_scaling_factor_cached(num_decimals) {
-        cache_scaling_factor::<M>(handle.clone(), num_decimals);
-        M::static_var_api_impl().set_scaling_factor_cached(num_decimals);
-    }
-
-    unsafe { ManagedRef::<'static, M, BigUint<M>>::wrap_handle(handle) }
-}
-
-fn cache_scaling_factor<M: ManagedTypeApi>(handle: M::BigIntHandle, num_decimals: NumDecimals) {
-    let temp1: M::BigIntHandle = use_raw_handle(const_handles::BIG_INT_TEMPORARY_1);
-    let temp2: M::BigIntHandle = use_raw_handle(const_handles::BIG_INT_TEMPORARY_2);
-    let api = M::managed_type_impl();
-    api.bi_set_int64(temp1.clone(), 10);
-    api.bi_set_int64(temp2.clone(), num_decimals as i64);
-    api.bi_pow(handle, temp1, temp2);
-}
-
-pub trait Decimals {
-    fn num_decimals(&self) -> NumDecimals;
-
-    fn scaling_factor<M: ManagedTypeApi>(&self) -> ManagedRef<'static, M, BigUint<M>> {
-        scaling_factor(self.num_decimals())
-    }
-}
-
-impl Decimals for NumDecimals {
-    fn num_decimals(&self) -> NumDecimals {
-        *self
-    }
-}
-
-pub type NumDecimals = usize;
-
-#[derive(Clone, Debug)]
-pub struct ConstDecimals<const DECIMALS: NumDecimals>;
-
-impl<const DECIMALS: NumDecimals> Decimals for ConstDecimals<DECIMALS> {
-    fn num_decimals(&self) -> NumDecimals {
-        DECIMALS
-    }
-
-    fn scaling_factor<M: ManagedTypeApi>(&self) -> ManagedRef<'static, M, BigUint<M>> {
-        scaling_factor(self.num_decimals())
-    }
-}
-
 #[derive(Clone)]
 pub struct ManagedDecimal<M: ManagedTypeApi, D: Decimals> {
     pub(crate) data: BigUint<M>,
diff --git a/framework/base/src/types/managed/wrapped/managed_decimal/decimals.rs b/framework/base/src/types/managed/wrapped/managed_decimal/decimals.rs
new file mode 100644
index 0000000000..2026b4b260
--- /dev/null
+++ b/framework/base/src/types/managed/wrapped/managed_decimal/decimals.rs
@@ -0,0 +1,56 @@
+use crate::{
+    api::{const_handles, use_raw_handle, BigIntApiImpl, ManagedTypeApi, StaticVarApiImpl},
+    types::{BigUint, ManagedRef},
+};
+
+pub type NumDecimals = usize;
+
+pub trait Decimals {
+    fn num_decimals(&self) -> NumDecimals;
+
+    fn scaling_factor<M: ManagedTypeApi>(&self) -> ManagedRef<'static, M, BigUint<M>> {
+        scaling_factor(self.num_decimals())
+    }
+}
+
+impl Decimals for NumDecimals {
+    fn num_decimals(&self) -> NumDecimals {
+        *self
+    }
+}
+
+#[derive(Clone, Debug)]
+pub struct ConstDecimals<const DECIMALS: NumDecimals>;
+
+impl<const DECIMALS: NumDecimals> Decimals for ConstDecimals<DECIMALS> {
+    fn num_decimals(&self) -> NumDecimals {
+        DECIMALS
+    }
+
+    fn scaling_factor<M: ManagedTypeApi>(&self) -> ManagedRef<'static, M, BigUint<M>> {
+        scaling_factor(self.num_decimals())
+    }
+}
+
+fn scaling_factor<M: ManagedTypeApi>(
+    num_decimals: NumDecimals,
+) -> ManagedRef<'static, M, BigUint<M>> {
+    let handle: M::BigIntHandle =
+        use_raw_handle(const_handles::get_scaling_factor_handle(num_decimals));
+
+    if !M::static_var_api_impl().is_scaling_factor_cached(num_decimals) {
+        cache_scaling_factor::<M>(handle.clone(), num_decimals);
+        M::static_var_api_impl().set_scaling_factor_cached(num_decimals);
+    }
+
+    unsafe { ManagedRef::<'static, M, BigUint<M>>::wrap_handle(handle) }
+}
+
+fn cache_scaling_factor<M: ManagedTypeApi>(handle: M::BigIntHandle, num_decimals: NumDecimals) {
+    let temp1: M::BigIntHandle = use_raw_handle(const_handles::BIG_INT_TEMPORARY_1);
+    let temp2: M::BigIntHandle = use_raw_handle(const_handles::BIG_INT_TEMPORARY_2);
+    let api = M::managed_type_impl();
+    api.bi_set_int64(temp1.clone(), 10);
+    api.bi_set_int64(temp2.clone(), num_decimals as i64);
+    api.bi_pow(handle, temp1, temp2);
+}

From 8cca4a90d916aadd1650a6e5e8863b4df7da48a7 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Mon, 24 Jun 2024 03:17:24 +0300
Subject: [PATCH 1029/1254] managed decimal ln - basic impl

---
 .../base/src/types/managed/basic/big_uint.rs  |   4 +-
 .../types/managed/wrapped/managed_decimal.rs  |  43 +++++--
 .../base/src/types/math_util/logarithm_i64.rs |  13 ++-
 tools/plotter/src/lib.rs                      |  16 +++
 tools/plotter/src/logarithm_md.rs             | 109 ++++++++++++++++++
 tools/plotter/www/index.html                  |   2 +
 tools/plotter/www/index.js                    |   8 ++
 7 files changed, 178 insertions(+), 17 deletions(-)
 create mode 100644 tools/plotter/src/logarithm_md.rs

diff --git a/framework/base/src/types/managed/basic/big_uint.rs b/framework/base/src/types/managed/basic/big_uint.rs
index 77d16a6e4c..2a5b7db746 100644
--- a/framework/base/src/types/managed/basic/big_uint.rs
+++ b/framework/base/src/types/managed/basic/big_uint.rs
@@ -259,8 +259,8 @@ impl<M: ManagedTypeApi> BigUint<M> {
             .unwrap_or_else(|| ErrorHelper::<M>::signal_error_with_message("ln internal error"))
             as i64;
 
-        let result =
-            crate::types::math_util::logarithm_i64::ln_from_bits_and_normalized(bit_log2, x);
+        let mut result = crate::types::math_util::logarithm_i64::ln_polynomial(x);
+        crate::types::math_util::logarithm_i64::ln_add_bit_log2(&mut result, bit_log2);
 
         debug_assert!(result > 0);
 
diff --git a/framework/base/src/types/managed/wrapped/managed_decimal.rs b/framework/base/src/types/managed/wrapped/managed_decimal.rs
index 6ea4c2bfd2..e794769e94 100644
--- a/framework/base/src/types/managed/wrapped/managed_decimal.rs
+++ b/framework/base/src/types/managed/wrapped/managed_decimal.rs
@@ -12,6 +12,7 @@ use crate::{
         const_handles, use_raw_handle, BigFloatApiImpl, BigIntApiImpl, HandleConstraints,
         ManagedBufferApiImpl, ManagedTypeApi,
     },
+    contract_base::ErrorHelper,
     formatter::{FormatBuffer, FormatByteReceiver, SCDisplay},
     proxy_imports::{ManagedBuffer, ManagedType},
     types::{BigFloat, BigUint},
@@ -106,6 +107,38 @@ impl<M: ManagedTypeApi, D: Decimals> ManagedDecimal<M, D> {
     pub fn nth_root(self, _root: ManagedDecimal<M, D>, _precision: D) -> ManagedDecimal<M, D> {
         todo!()
     }
+
+    /// Natural logarithm of a number.
+    ///
+    /// Returns `None` for 0.
+    ///
+    /// TODO: TEMP impl.
+    pub fn ln(&self) -> Option<i64> {
+        let bit_log2 = self.data.log2(); // aproximate, based on position of the most significant bit
+        if bit_log2 == u32::MAX {
+            // means the input was zero, TODO: change log2 return type
+            return None;
+        }
+
+        let scaling_factor_9 = ConstDecimals::<9>.scaling_factor();
+        let divisor = BigUint::from(1u64) << bit_log2 as usize;
+        let normalized = &self.data * &*scaling_factor_9 / divisor;
+
+        let x = normalized
+            .to_u64()
+            .unwrap_or_else(|| ErrorHelper::<M>::signal_error_with_message("ln internal error"))
+            as i64;
+
+        let mut result = crate::types::math_util::logarithm_i64::ln_polynomial(x);
+        crate::types::math_util::logarithm_i64::ln_add_bit_log2(&mut result, bit_log2);
+
+        debug_assert!(result > 0);
+
+        crate::types::math_util::logarithm_i64::ln_sub_decimals(&mut result, self.decimals.num_decimals());
+
+        Some(result)
+    }
+
 }
 
 impl<M: ManagedTypeApi, const DECIMALS: NumDecimals> ManagedDecimal<M, ConstDecimals<DECIMALS>> {
@@ -116,14 +149,6 @@ impl<M: ManagedTypeApi, const DECIMALS: NumDecimals> ManagedDecimal<M, ConstDeci
         }
     }
 
-    /// Natural logarithm of a number.
-    ///
-    /// Returns `None` for 0.
-    // pub fn ln(&self) -> Option<ManagedDecimal<M, ConstDecimals<9>>> {
-    //     let data_ln = self.data.ln()?;
-
-    // }
-
     // pub fn log(
     //     &self,
     //     target_base: &ManagedDecimal<M, D>,
@@ -143,7 +168,7 @@ impl<M: ManagedTypeApi, const DECIMALS: NumDecimals> ManagedDecimal<M, ConstDeci
     //     //this should be done with precision
     // }
 
-    pub fn ln<const PREC: usize>(
+    pub fn ln_temp<const PREC: usize>(
         self,
         precision: ConstDecimals<PREC>,
     ) -> ManagedDecimal<M, ConstDecimals<PREC>> {
diff --git a/framework/base/src/types/math_util/logarithm_i64.rs b/framework/base/src/types/math_util/logarithm_i64.rs
index 0e2d54fa18..dc3ff85c3c 100644
--- a/framework/base/src/types/math_util/logarithm_i64.rs
+++ b/framework/base/src/types/math_util/logarithm_i64.rs
@@ -1,11 +1,12 @@
 const DENOMINATOR: i64 = 1_000_000_000;
 
 const LN_OF_2_SCALE_9: I64Decimal9 = 693147180; // 0.69314718
+const LN_OF_10_SCALE_9: I64Decimal9 = 2302585093; // 2.3025850929940456840...
 
 /// Indicates that a number is interpreted as a decimal number with 9 decimals.
 pub type I64Decimal9 = i64;
 
-fn ln_polynomial(x: I64Decimal9) -> I64Decimal9 {
+pub fn ln_polynomial(x: I64Decimal9) -> I64Decimal9 {
     // x normalized to [1.0, 2.0]
     debug_assert!(x >= DENOMINATOR);
     debug_assert!(x <= 2 * DENOMINATOR);
@@ -27,10 +28,10 @@ fn ln_polynomial(x: I64Decimal9) -> I64Decimal9 {
     result
 }
 
-pub fn ln_from_bits_and_normalized(bit_log2: u32, x: I64Decimal9) -> I64Decimal9 {
-    let mut result = ln_polynomial(x);
-
-    result += bit_log2 as i64 * LN_OF_2_SCALE_9;
+pub fn ln_add_bit_log2(result: &mut I64Decimal9, bit_log2: u32) {
+    *result += bit_log2 as i64 * LN_OF_2_SCALE_9;
+}
 
-    result
+pub fn ln_sub_decimals(result: &mut I64Decimal9, num_decimals: usize) {
+    *result -= num_decimals as i64 * LN_OF_10_SCALE_9;
 }
diff --git a/tools/plotter/src/lib.rs b/tools/plotter/src/lib.rs
index 8b68884dfd..f57dde6e33 100644
--- a/tools/plotter/src/lib.rs
+++ b/tools/plotter/src/lib.rs
@@ -5,6 +5,7 @@ use web_sys::HtmlCanvasElement;
 
 pub mod logarithm_bf;
 pub mod logarithm_bu;
+pub mod logarithm_md;
 
 #[global_allocator]
 static ALLOC: wee_alloc::WeeAlloc = wee_alloc::WeeAlloc::INIT;
@@ -45,6 +46,21 @@ impl Chart {
         })
     }
 
+    pub fn ln_managed_decimal(canvas: HtmlCanvasElement, max_x: f32) -> Result<Chart, JsValue> {
+        let map_coord = logarithm_md::draw_md_logs(canvas, max_x).map_err(|err| err.to_string())?;
+        Ok(Chart {
+            convert: Box::new(move |coord| map_coord(coord).map(|(x, y)| (x.into(), y.into()))),
+        })
+    }
+
+    pub fn ln_managed_decimal_error(canvas: HtmlCanvasElement, max_x: f32) -> Result<Chart, JsValue> {
+        let map_coord =
+            logarithm_md::draw_md_error(canvas, max_x).map_err(|err| err.to_string())?;
+        Ok(Chart {
+            convert: Box::new(move |coord| map_coord(coord).map(|(x, y)| (x.into(), y.into()))),
+        })
+    }
+
     pub fn ln_big_float(canvas: HtmlCanvasElement, max_x: f32) -> Result<Chart, JsValue> {
         let map_coord = logarithm_bf::draw_bf_logs(canvas, max_x).map_err(|err| err.to_string())?;
         Ok(Chart {
diff --git a/tools/plotter/src/logarithm_md.rs b/tools/plotter/src/logarithm_md.rs
new file mode 100644
index 0000000000..d7ca5d9cdd
--- /dev/null
+++ b/tools/plotter/src/logarithm_md.rs
@@ -0,0 +1,109 @@
+use crate::DrawResult;
+use multiversx_sc::types::{BigUint, ConstDecimals, ManagedDecimal};
+use multiversx_sc_scenario::api::StaticApi;
+use plotters::prelude::*;
+use plotters_canvas::CanvasBackend;
+use web_sys::HtmlCanvasElement;
+
+pub fn draw_md_logs(
+    canvas: HtmlCanvasElement,
+    max_x: f32,
+) -> DrawResult<impl Fn((i32, i32)) -> Option<(f32, f32)>> {
+    let root = CanvasBackend::with_canvas_object(canvas)
+        .unwrap()
+        .into_drawing_area();
+
+    let font: FontDesc = ("sans-serif", 20.0).into();
+
+    root.fill(&WHITE)?;
+
+    let mut chart = ChartBuilder::on(&root)
+        .margin(20u32)
+        .caption(format!("y=ln(x), x=1..{max_x}"), font)
+        .x_label_area_size(30u32)
+        .y_label_area_size(30u32)
+        .build_cartesian_2d(0f32..max_x, -1f32..5f32)?;
+
+    chart.configure_mesh().x_labels(3).y_labels(3).draw()?;
+
+    const RANGE_MAX: i32 = 1000;
+    chart.draw_series(LineSeries::new(
+        (0..=RANGE_MAX)
+            .map(|x| x as f32 * max_x / RANGE_MAX as f32)
+            .map(|x| (x, ln_baseline(x))),
+        &RED,
+    ))?;
+
+    chart.draw_series(LineSeries::new(
+        (0..=RANGE_MAX)
+            .map(|x| x as f32 * max_x / RANGE_MAX as f32)
+            .map(|x| (x, managed_decimal_ln(x))),
+        &GREEN,
+    ))?;
+
+    root.present()?;
+    return Ok(chart.into_coord_trans());
+}
+
+pub fn draw_md_error(
+    canvas: HtmlCanvasElement,
+    max_x: f32,
+) -> DrawResult<impl Fn((i32, i32)) -> Option<(f32, f32)>> {
+    let root = CanvasBackend::with_canvas_object(canvas)
+        .unwrap()
+        .into_drawing_area();
+
+    let font: FontDesc = ("sans-serif", 20.0).into();
+
+    root.fill(&WHITE)?;
+
+    let mut chart = ChartBuilder::on(&root)
+        .margin(20u32)
+        .caption(format!("y=logarithm error, x=1..{max_x}"), font)
+        .x_label_area_size(30u32)
+        .y_label_area_size(50u32)
+        .build_cartesian_2d(0f32..max_x, -0.0001f32..0.0001f32)?;
+
+    chart.configure_mesh().x_labels(3).y_labels(3).draw()?;
+
+    const RANGE_MAX: i32 = 1000;
+    chart.draw_series(LineSeries::new(
+        (0..=RANGE_MAX)
+            .map(|x| x as f32 * max_x / RANGE_MAX as f32)
+            .map(|x| (x, managed_decimal_ln(x) - ln_baseline(x))),
+        &RED,
+    ))?;
+
+    root.present()?;
+    return Ok(chart.into_coord_trans());
+}
+
+fn managed_decimal_ln(x: f32) -> f32 {
+    let bu = BigUint::<StaticApi>::from((x * 1_000_000_000.0) as u64);
+    let dec = ManagedDecimal::<StaticApi, ConstDecimals<9>>::const_decimals_from_raw(bu);
+    if let Some(ln_dec) = dec.ln() {
+        //     let ln_units = ln_dec;
+        //     let ln_sf = ln_dec.scaling_factor().to_u64().unwrap();
+        //     (ln_units as f64 / ln_sf as f64) as f32
+        (ln_dec as f64 / 1_000_000_000f64) as f32
+    } else {
+        0.0
+    }
+}
+
+fn ln_baseline(x: f32) -> f32 {
+    x.ln()
+}
+
+#[cfg(test)]
+mod test {
+    #[test]
+    fn sc_ln_test() {
+        assert_eq!(super::managed_decimal_ln(0.0), 0.0);
+        println!("{}", super::managed_decimal_ln(1.0));
+        println!("{}", super::managed_decimal_ln(2.0));
+        // assert!(super::big_uint_ln(1.0) >= 0.0);
+        // assert!(super::big_uint_ln(1.0) < 0.01);
+        // assert!(super::big_uint_ln(2.0) > 0.6);
+    }
+}
diff --git a/tools/plotter/www/index.html b/tools/plotter/www/index.html
index 37e874280e..e2066b6068 100644
--- a/tools/plotter/www/index.html
+++ b/tools/plotter/www/index.html
@@ -19,6 +19,8 @@ <h1>MultiversX SC function plots</h1>
 			<select id="plot-type">
 				<option value="ln-bu">Logarithms (BigUint)</option>
 				<option value="ln-bu-error">Logarithm (BigUint) Error</option>
+				<option value="ln-dec">Logarithms (ManagedDecimal)</option>
+				<option value="ln-dec-error">Logarithm (ManagedDecimal) Error</option>
 				<option value="ln-bf">Logarithms (BigFloat)</option>
 				<option value="ln-bf-error">Logarithm (BigFloat) Error</option>
 			</select>
diff --git a/tools/plotter/www/index.js b/tools/plotter/www/index.js
index f9dbafe4b1..edb8168fd9 100644
--- a/tools/plotter/www/index.js
+++ b/tools/plotter/www/index.js
@@ -82,6 +82,14 @@ function updatePlot() {
 			logControl.classList.remove("hide");
 			chart = Chart.ln_big_uint_error(canvas, Number(logMax.value));
 			break;
+		case "ln-dec":
+			logControl.classList.remove("hide");
+			chart = Chart.ln_managed_decimal(canvas, Number(logMax.value));
+			break;
+		case "ln-dec-error":
+			logControl.classList.remove("hide");
+			chart = Chart.ln_managed_decimal_error(canvas, Number(logMax.value));
+			break;
 		case "ln-bf":
 			logControl.classList.remove("hide");
 			chart = Chart.ln_big_float(canvas, Number(logMax.value));

From 982a83cc52d3f5af6d13072b57c2a947d2b7fda4 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 25 Jun 2024 17:49:34 +0300
Subject: [PATCH 1030/1254] BigUint wraps BigInt object

---
 framework/base/src/io/finish.rs               |  2 +-
 .../base/src/types/managed/basic/big_float.rs |  2 +-
 .../base/src/types/managed/basic/big_int.rs   |  4 +-
 .../base/src/types/managed/basic/big_uint.rs  | 36 +++++----
 .../src/types/managed/basic/big_uint_cmp.rs   |  4 +-
 .../types/managed/basic/big_uint_operators.rs | 74 +++++++++++--------
 .../src/types/managed/basic/elliptic_curve.rs | 42 ++++++-----
 .../types/managed/wrapped/managed_decimal.rs  |  4 +-
 8 files changed, 98 insertions(+), 70 deletions(-)

diff --git a/framework/base/src/io/finish.rs b/framework/base/src/io/finish.rs
index 45e9f6c13d..518686d074 100644
--- a/framework/base/src/io/finish.rs
+++ b/framework/base/src/io/finish.rs
@@ -86,7 +86,7 @@ where
             FA::finish_api_impl().finish_managed_buffer_raw(managed_buffer.handle.clone());
             Ok(())
         } else if let Some(big_uint) = value.try_cast_ref::<BigUint<FA>>() {
-            FA::finish_api_impl().finish_big_uint_raw(big_uint.handle.clone());
+            FA::finish_api_impl().finish_big_uint_raw(big_uint.data.handle.clone());
             Ok(())
         } else if let Some(big_int) = value.try_cast_ref::<BigInt<FA>>() {
             FA::finish_api_impl().finish_big_int_raw(big_int.handle.clone());
diff --git a/framework/base/src/types/managed/basic/big_float.rs b/framework/base/src/types/managed/basic/big_float.rs
index e7989eaaa4..1fd7df4a45 100644
--- a/framework/base/src/types/managed/basic/big_float.rs
+++ b/framework/base/src/types/managed/basic/big_float.rs
@@ -113,7 +113,7 @@ impl<M: ManagedTypeApi> BigFloat<M> {
     pub fn from_big_uint(big_uint: &BigUint<M>) -> Self {
         let new_bf_handle: M::BigFloatHandle =
             use_raw_handle(M::static_var_api_impl().next_handle());
-        M::managed_type_impl().bf_set_bi(new_bf_handle.clone(), big_uint.handle.clone());
+        M::managed_type_impl().bf_set_bi(new_bf_handle.clone(), big_uint.data.handle.clone());
         BigFloat::from_handle(new_bf_handle)
     }
 
diff --git a/framework/base/src/types/managed/basic/big_int.rs b/framework/base/src/types/managed/basic/big_int.rs
index 7f84593f2b..bbc0f3a512 100644
--- a/framework/base/src/types/managed/basic/big_int.rs
+++ b/framework/base/src/types/managed/basic/big_int.rs
@@ -217,9 +217,9 @@ impl<M: ManagedTypeApi> BigInt<M> {
     pub fn from_biguint(sign: Sign, unsigned: BigUint<M>) -> Self {
         let api = M::managed_type_impl();
         if sign.is_minus() {
-            api.bi_neg(unsigned.handle.clone(), unsigned.handle.clone());
+            api.bi_neg(unsigned.data.handle.clone(), unsigned.data.handle.clone());
         }
-        BigInt::from_handle(unsigned.handle)
+        BigInt::from_handle(unsigned.data.handle)
     }
 
     /// Returns the sign of the `BigInt` as a `Sign`.
diff --git a/framework/base/src/types/managed/basic/big_uint.rs b/framework/base/src/types/managed/basic/big_uint.rs
index 658697c2ec..937e6544b5 100644
--- a/framework/base/src/types/managed/basic/big_uint.rs
+++ b/framework/base/src/types/managed/basic/big_uint.rs
@@ -18,22 +18,24 @@ use crate::{
     },
 };
 
-use super::cast_to_i64::cast_to_i64;
+use super::{cast_to_i64::cast_to_i64, BigInt};
 
 #[repr(transparent)]
 pub struct BigUint<M: ManagedTypeApi> {
-    pub(crate) handle: M::BigIntHandle,
+    pub(crate) data: BigInt<M>,
 }
 
 impl<M: ManagedTypeApi> ManagedType<M> for BigUint<M> {
     type OwnHandle = M::BigIntHandle;
 
     fn from_handle(handle: M::BigIntHandle) -> Self {
-        BigUint { handle }
+        BigUint {
+            data: BigInt::from_handle(handle),
+        }
     }
 
     fn get_handle(&self) -> M::BigIntHandle {
-        self.handle.clone()
+        self.data.handle.clone()
     }
 
     fn transmute_from_handle_ref(handle_ref: &M::BigIntHandle) -> &Self {
@@ -175,12 +177,12 @@ impl<M: ManagedTypeApi> BigUint<M> {
     #[inline]
     pub fn to_u64(&self) -> Option<u64> {
         let api = M::managed_type_impl();
-        api.bi_to_i64(self.handle.clone()).map(|bi| bi as u64)
+        api.bi_to_i64(self.data.handle.clone()).map(|bi| bi as u64)
     }
 
     #[inline]
     pub fn overwrite_u64(&mut self, value: u64) {
-        Self::set_value(self.handle.clone(), value);
+        Self::set_value(self.data.handle.clone(), value);
     }
 
     #[inline]
@@ -195,7 +197,8 @@ impl<M: ManagedTypeApi> BigUint<M> {
     #[inline]
     pub fn to_bytes_be(&self) -> BoxedBytes {
         let mb_handle: M::ManagedBufferHandle = use_raw_handle(const_handles::MBUF_TEMPORARY_1);
-        M::managed_type_impl().mb_from_big_int_unsigned(self.handle.clone(), mb_handle.clone());
+        M::managed_type_impl()
+            .mb_from_big_int_unsigned(self.data.handle.clone(), mb_handle.clone());
         M::managed_type_impl().mb_to_boxed_bytes(mb_handle)
     }
 
@@ -211,7 +214,8 @@ impl<M: ManagedTypeApi> BigUint<M> {
     pub fn to_bytes_be_buffer(&self) -> ManagedBuffer<M> {
         let mb_handle: M::ManagedBufferHandle =
             use_raw_handle(M::static_var_api_impl().next_handle());
-        M::managed_type_impl().mb_from_big_int_unsigned(self.handle.clone(), mb_handle.clone());
+        M::managed_type_impl()
+            .mb_from_big_int_unsigned(self.data.handle.clone(), mb_handle.clone());
         ManagedBuffer::from_handle(mb_handle)
     }
 }
@@ -222,7 +226,7 @@ impl<M: ManagedTypeApi> BigUint<M> {
     pub fn sqrt(&self) -> Self {
         let api = M::managed_type_impl();
         let result_handle: M::BigIntHandle = use_raw_handle(M::static_var_api_impl().next_handle());
-        api.bi_sqrt(result_handle.clone(), self.handle.clone());
+        api.bi_sqrt(result_handle.clone(), self.data.handle.clone());
         BigUint::from_handle(result_handle)
     }
 
@@ -230,14 +234,18 @@ impl<M: ManagedTypeApi> BigUint<M> {
     pub fn pow(&self, exp: u32) -> Self {
         let result_handle: M::BigIntHandle = use_raw_handle(M::static_var_api_impl().next_handle());
         let big_int_temp_1 = BigUint::<M>::make_temp(const_handles::BIG_INT_TEMPORARY_1, exp);
-        M::managed_type_impl().bi_pow(result_handle.clone(), self.handle.clone(), big_int_temp_1);
+        M::managed_type_impl().bi_pow(
+            result_handle.clone(),
+            self.data.handle.clone(),
+            big_int_temp_1,
+        );
         BigUint::from_handle(result_handle)
     }
 
     #[inline]
     pub fn log2(&self) -> u32 {
         let api = M::managed_type_impl();
-        api.bi_log2(self.handle.clone())
+        api.bi_log2(self.data.handle.clone())
     }
 
     /// Natural logarithm of a number.
@@ -299,7 +307,7 @@ impl<M: ManagedTypeApi> Clone for BigUint<M> {
         api.bi_add(
             clone_handle.clone(),
             clone_handle.clone(),
-            self.handle.clone(),
+            self.data.handle.clone(),
         );
         BigUint::from_handle(clone_handle)
     }
@@ -366,7 +374,7 @@ impl<M: ManagedTypeApi> TopDecode for BigUint<M> {
 impl<M: ManagedTypeApi> SCDisplay for BigUint<M> {
     fn fmt<F: FormatByteReceiver>(&self, f: &mut F) {
         let str_handle: M::ManagedBufferHandle = use_raw_handle(const_handles::MBUF_TEMPORARY_1);
-        M::managed_type_impl().bi_to_string(self.handle.clone(), str_handle.clone());
+        M::managed_type_impl().bi_to_string(self.data.handle.clone(), str_handle.clone());
         f.append_managed_buffer(&ManagedBuffer::from_handle(
             str_handle.cast_or_signal_error::<M, _>(),
         ));
@@ -385,7 +393,7 @@ impl<M: ManagedTypeApi> BigUint<M> {
 impl<M: ManagedTypeApi> core::fmt::Debug for BigUint<M> {
     fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
         f.debug_struct("BigUint")
-            .field("handle", &self.handle.clone())
+            .field("handle", &self.data.handle.clone())
             .field(
                 "hex-value-be",
                 &encode_bytes_as_hex(self.to_bytes_be().as_slice()),
diff --git a/framework/base/src/types/managed/basic/big_uint_cmp.rs b/framework/base/src/types/managed/basic/big_uint_cmp.rs
index 14441221bf..0db2108043 100644
--- a/framework/base/src/types/managed/basic/big_uint_cmp.rs
+++ b/framework/base/src/types/managed/basic/big_uint_cmp.rs
@@ -9,7 +9,7 @@ impl<M: ManagedTypeApi> PartialEq for BigUint<M> {
     #[inline]
     fn eq(&self, other: &Self) -> bool {
         M::managed_type_impl()
-            .bi_cmp(self.handle.clone(), other.handle.clone())
+            .bi_cmp(self.data.handle.clone(), other.data.handle.clone())
             .is_eq()
     }
 }
@@ -26,7 +26,7 @@ impl<M: ManagedTypeApi> PartialOrd for BigUint<M> {
 impl<M: ManagedTypeApi> Ord for BigUint<M> {
     #[inline]
     fn cmp(&self, other: &Self) -> Ordering {
-        M::managed_type_impl().bi_cmp(self.handle.clone(), other.handle.clone())
+        M::managed_type_impl().bi_cmp(self.data.handle.clone(), other.data.handle.clone())
     }
 }
 
diff --git a/framework/base/src/types/managed/basic/big_uint_operators.rs b/framework/base/src/types/managed/basic/big_uint_operators.rs
index 885ccb4588..306c3650f5 100644
--- a/framework/base/src/types/managed/basic/big_uint_operators.rs
+++ b/framework/base/src/types/managed/basic/big_uint_operators.rs
@@ -14,11 +14,11 @@ macro_rules! binary_operator {
 
             fn $method(self, other: BigUint<M>) -> BigUint<M> {
                 M::managed_type_impl().$api_func(
-                    self.handle.clone(),
-                    self.handle.clone(),
-                    other.handle.clone(),
+                    self.data.handle.clone(),
+                    self.data.handle.clone(),
+                    other.data.handle.clone(),
                 );
-                BigUint::from_handle(self.handle.clone())
+                BigUint::from_handle(self.data.handle.clone())
             }
         }
 
@@ -30,8 +30,8 @@ macro_rules! binary_operator {
                     use_raw_handle(M::static_var_api_impl().next_handle());
                 M::managed_type_impl().$api_func(
                     result_handle.clone(),
-                    self.handle.clone(),
-                    other.handle.clone(),
+                    self.data.handle.clone(),
+                    other.data.handle.clone(),
                 );
                 BigUint::from_handle(result_handle)
             }
@@ -42,11 +42,11 @@ macro_rules! binary_operator {
 
             fn $method(self, other: &BigUint<M>) -> BigUint<M> {
                 M::managed_type_impl().$api_func(
-                    self.handle.clone(),
-                    self.handle.clone(),
-                    other.handle.clone(),
+                    self.data.handle.clone(),
+                    self.data.handle.clone(),
+                    other.data.handle.clone(),
                 );
-                BigUint::from_handle(self.handle.clone())
+                BigUint::from_handle(self.data.handle.clone())
             }
         }
 
@@ -56,11 +56,11 @@ macro_rules! binary_operator {
             fn $method(self, other: u32) -> BigUint<M> {
                 let big_int_temp_1 = Self::make_temp(const_handles::BIG_INT_TEMPORARY_1, other);
                 M::managed_type_impl().$api_func(
-                    self.handle.clone(),
-                    self.handle.clone(),
+                    self.data.handle.clone(),
+                    self.data.handle.clone(),
                     big_int_temp_1,
                 );
-                BigUint::from_handle(self.handle.clone())
+                BigUint::from_handle(self.data.handle.clone())
             }
         }
 
@@ -74,7 +74,7 @@ macro_rules! binary_operator {
                     use_raw_handle(M::static_var_api_impl().next_handle());
                 M::managed_type_impl().$api_func(
                     result_handle.clone(),
-                    self.handle.clone(),
+                    self.data.handle.clone(),
                     big_int_temp_1,
                 );
                 BigUint::from_handle(result_handle)
@@ -87,11 +87,11 @@ macro_rules! binary_operator {
             fn $method(self, other: u64) -> BigUint<M> {
                 let big_int_temp_1 = Self::make_temp(const_handles::BIG_INT_TEMPORARY_1, other);
                 M::managed_type_impl().$api_func(
-                    self.handle.clone(),
-                    self.handle.clone(),
+                    self.data.handle.clone(),
+                    self.data.handle.clone(),
                     big_int_temp_1,
                 );
-                BigUint::from_handle(self.handle.clone())
+                BigUint::from_handle(self.data.handle.clone())
             }
         }
 
@@ -105,7 +105,7 @@ macro_rules! binary_operator {
                     use_raw_handle(M::static_var_api_impl().next_handle());
                 M::managed_type_impl().$api_func(
                     result_handle.clone(),
-                    self.handle.clone(),
+                    self.data.handle.clone(),
                     big_int_temp_1,
                 );
                 BigUint::from_handle(result_handle)
@@ -129,9 +129,9 @@ macro_rules! binary_assign_operator {
             #[inline]
             fn $method(&mut self, other: Self) {
                 M::managed_type_impl().$api_func(
-                    self.handle.clone(),
-                    self.handle.clone(),
-                    other.handle.clone(),
+                    self.data.handle.clone(),
+                    self.data.handle.clone(),
+                    other.data.handle.clone(),
                 );
             }
         }
@@ -140,9 +140,9 @@ macro_rules! binary_assign_operator {
             #[inline]
             fn $method(&mut self, other: &BigUint<M>) {
                 M::managed_type_impl().$api_func(
-                    self.handle.clone(),
-                    self.handle.clone(),
-                    other.handle.clone(),
+                    self.data.handle.clone(),
+                    self.data.handle.clone(),
+                    other.data.handle.clone(),
                 );
             }
         }
@@ -151,8 +151,8 @@ macro_rules! binary_assign_operator {
             fn $method(&mut self, other: u32) {
                 let big_int_temp_1 = Self::make_temp(const_handles::BIG_INT_TEMPORARY_1, other);
                 M::managed_type_impl().$api_func(
-                    self.handle.clone(),
-                    self.handle.clone(),
+                    self.data.handle.clone(),
+                    self.data.handle.clone(),
                     big_int_temp_1,
                 );
             }
@@ -162,8 +162,8 @@ macro_rules! binary_assign_operator {
             fn $method(&mut self, other: u64) {
                 let big_int_temp_1 = Self::make_temp(const_handles::BIG_INT_TEMPORARY_1, other);
                 M::managed_type_impl().$api_func(
-                    self.handle.clone(),
-                    self.handle.clone(),
+                    self.data.handle.clone(),
+                    self.data.handle.clone(),
                     big_int_temp_1,
                 );
             }
@@ -187,7 +187,11 @@ macro_rules! shift_traits {
 
             #[inline]
             fn $method(self, rhs: usize) -> BigUint<M> {
-                M::managed_type_impl().$api_func(self.handle.clone(), self.handle.clone(), rhs);
+                M::managed_type_impl().$api_func(
+                    self.data.handle.clone(),
+                    self.data.handle.clone(),
+                    rhs,
+                );
                 self
             }
         }
@@ -198,7 +202,11 @@ macro_rules! shift_traits {
             fn $method(self, rhs: usize) -> BigUint<M> {
                 let result_handle: M::BigIntHandle =
                     use_raw_handle(M::static_var_api_impl().next_handle());
-                M::managed_type_impl().$api_func(result_handle.clone(), self.handle.clone(), rhs);
+                M::managed_type_impl().$api_func(
+                    result_handle.clone(),
+                    self.data.handle.clone(),
+                    rhs,
+                );
                 BigUint::from_handle(result_handle)
             }
         }
@@ -213,7 +221,11 @@ macro_rules! shift_assign_traits {
         impl<M: ManagedTypeApi> $shift_assign_trait<usize> for BigUint<M> {
             #[inline]
             fn $method(&mut self, rhs: usize) {
-                M::managed_type_impl().$api_func(self.handle.clone(), self.handle.clone(), rhs);
+                M::managed_type_impl().$api_func(
+                    self.data.handle.clone(),
+                    self.data.handle.clone(),
+                    rhs,
+                );
             }
         }
     };
diff --git a/framework/base/src/types/managed/basic/elliptic_curve.rs b/framework/base/src/types/managed/basic/elliptic_curve.rs
index 8c6d66990f..11d9b36426 100644
--- a/framework/base/src/types/managed/basic/elliptic_curve.rs
+++ b/framework/base/src/types/managed/basic/elliptic_curve.rs
@@ -118,10 +118,10 @@ impl<M: ManagedTypeApi> EllipticCurve<M> {
             x_result_handle.clone(),
             y_result_handle.clone(),
             self.handle.clone(),
-            x_first_point.handle,
-            y_first_point.handle,
-            x_second_point.handle,
-            y_second_point.handle,
+            x_first_point.data.handle,
+            y_first_point.data.handle,
+            x_second_point.data.handle,
+            y_second_point.data.handle,
         );
         (
             BigUint::from_handle(x_result_handle),
@@ -137,8 +137,8 @@ impl<M: ManagedTypeApi> EllipticCurve<M> {
             x_result_handle.clone(),
             y_result_handle.clone(),
             self.handle.clone(),
-            x_point.handle,
-            y_point.handle,
+            x_point.data.handle,
+            y_point.data.handle,
         );
         (
             BigUint::from_handle(x_result_handle),
@@ -148,7 +148,11 @@ impl<M: ManagedTypeApi> EllipticCurve<M> {
 
     pub fn is_on_curve(&self, x_point: BigUint<M>, y_point: BigUint<M>) -> bool {
         let api = M::managed_type_impl();
-        api.ec_is_on_curve(self.handle.clone(), x_point.handle, y_point.handle)
+        api.ec_is_on_curve(
+            self.handle.clone(),
+            x_point.data.handle,
+            y_point.data.handle,
+        )
     }
 
     #[deprecated(since = "0.41.0", note = "Please use method `scalar_mult` instead.")]
@@ -165,8 +169,8 @@ impl<M: ManagedTypeApi> EllipticCurve<M> {
             x_result_handle.clone(),
             y_result_handle.clone(),
             self.handle.clone(),
-            x_point.handle,
-            y_point.handle,
+            x_point.data.handle,
+            y_point.data.handle,
             data,
         );
         (
@@ -188,8 +192,8 @@ impl<M: ManagedTypeApi> EllipticCurve<M> {
             x_result_handle.clone(),
             y_result_handle.clone(),
             self.handle.clone(),
-            x_point.handle,
-            y_point.handle,
+            x_point.data.handle,
+            y_point.data.handle,
             data.get_handle(),
         );
         (
@@ -242,7 +246,7 @@ impl<M: ManagedTypeApi> EllipticCurve<M> {
         y_pair: BigUint<M>,
     ) -> crate::types::heap::BoxedBytes {
         let api = M::managed_type_impl();
-        api.ec_marshal_legacy(self.handle.clone(), x_pair.handle, y_pair.handle)
+        api.ec_marshal_legacy(self.handle.clone(), x_pair.data.handle, y_pair.data.handle)
     }
 
     pub fn marshal(&self, x_pair: BigUint<M>, y_pair: BigUint<M>) -> ManagedBuffer<M> {
@@ -250,8 +254,8 @@ impl<M: ManagedTypeApi> EllipticCurve<M> {
             use_raw_handle(M::static_var_api_impl().next_handle());
         M::managed_type_impl().ec_marshal(
             self.handle.clone(),
-            x_pair.handle,
-            y_pair.handle,
+            x_pair.data.handle,
+            y_pair.data.handle,
             result_handle.clone(),
         );
         ManagedBuffer::from_handle(result_handle)
@@ -268,7 +272,11 @@ impl<M: ManagedTypeApi> EllipticCurve<M> {
         y_pair: BigUint<M>,
     ) -> crate::types::heap::BoxedBytes {
         let api = M::managed_type_impl();
-        api.ec_marshal_compressed_legacy(self.handle.clone(), x_pair.handle, y_pair.handle)
+        api.ec_marshal_compressed_legacy(
+            self.handle.clone(),
+            x_pair.data.handle,
+            y_pair.data.handle,
+        )
     }
 
     pub fn marshal_compressed(&self, x_pair: BigUint<M>, y_pair: BigUint<M>) -> ManagedBuffer<M> {
@@ -276,8 +284,8 @@ impl<M: ManagedTypeApi> EllipticCurve<M> {
             use_raw_handle(M::static_var_api_impl().next_handle());
         M::managed_type_impl().ec_marshal_compressed(
             self.handle.clone(),
-            x_pair.handle,
-            y_pair.handle,
+            x_pair.data.handle,
+            y_pair.data.handle,
             result_handle.clone(),
         );
         ManagedBuffer::from_handle(result_handle)
diff --git a/framework/base/src/types/managed/wrapped/managed_decimal.rs b/framework/base/src/types/managed/wrapped/managed_decimal.rs
index dbe5c6b16d..f3cfb14dcd 100644
--- a/framework/base/src/types/managed/wrapped/managed_decimal.rs
+++ b/framework/base/src/types/managed/wrapped/managed_decimal.rs
@@ -413,7 +413,7 @@ impl<M: ManagedTypeApi, D: Decimals> SCDisplay for ManagedDecimal<M, D> {
     fn fmt<F: FormatByteReceiver>(&self, f: &mut F) {
         let full_str_handle: M::ManagedBufferHandle =
             use_raw_handle(const_handles::MBUF_TEMPORARY_1);
-        M::managed_type_impl().bi_to_string(self.data.handle.clone(), full_str_handle.clone());
+        M::managed_type_impl().bi_to_string(self.data.data.handle.clone(), full_str_handle.clone());
         let len = M::managed_type_impl().mb_len(full_str_handle.clone());
         let nr_dec = self.decimals.num_decimals();
 
@@ -462,7 +462,7 @@ impl<M: ManagedTypeApi, D: Decimals> core::fmt::Display for ManagedDecimal<M, D>
 impl<M: ManagedTypeApi, D: Decimals> core::fmt::Debug for ManagedDecimal<M, D> {
     fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
         f.debug_struct("ManagedDecimal")
-            .field("handle", &self.data.handle.clone())
+            .field("handle", &self.data.data.handle.clone())
             .field("number", &self.to_string())
             .finish()
     }

From 44503fbe4150c53861fb18fbafa0f329c94bdee3 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 25 Jun 2024 18:07:07 +0300
Subject: [PATCH 1031/1254] BigUint moved to wrapped types

---
 .../src/types/managed/basic/big_int_cmp.rs    | 31 ++++++++++++-------
 .../src/types/managed/basic/big_num_cmp.rs    | 13 ++------
 framework/base/src/types/managed/basic/mod.rs |  6 +---
 .../managed/{basic => wrapped}/big_uint.rs    |  8 ++---
 .../{basic => wrapped}/big_uint_cmp.rs        |  7 +++--
 .../{basic => wrapped}/big_uint_operators.rs  |  0
 .../base/src/types/managed/wrapped/mod.rs     |  4 +++
 7 files changed, 34 insertions(+), 35 deletions(-)
 rename framework/base/src/types/managed/{basic => wrapped}/big_uint.rs (97%)
 rename framework/base/src/types/managed/{basic => wrapped}/big_uint_cmp.rs (88%)
 rename framework/base/src/types/managed/{basic => wrapped}/big_uint_operators.rs (100%)

diff --git a/framework/base/src/types/managed/basic/big_int_cmp.rs b/framework/base/src/types/managed/basic/big_int_cmp.rs
index 094bc4bc26..3cad2af277 100644
--- a/framework/base/src/types/managed/basic/big_int_cmp.rs
+++ b/framework/base/src/types/managed/basic/big_int_cmp.rs
@@ -29,16 +29,25 @@ impl<M: ManagedTypeApi> Ord for BigInt<M> {
     }
 }
 
-impl<M: ManagedTypeApi> PartialEq<i64> for BigInt<M> {
-    #[inline]
-    fn eq(&self, other: &i64) -> bool {
-        cmp_i64(self, *other).is_eq()
-    }
+macro_rules! partial_eq_and_ord {
+    ($small_int_type:ident) => {
+        impl<M: ManagedTypeApi> PartialEq<$small_int_type> for BigInt<M> {
+            #[inline]
+            fn eq(&self, other: &$small_int_type) -> bool {
+                cmp_i64(self, *other as i64).is_eq()
+            }
+        }
+
+        impl<M: ManagedTypeApi> PartialOrd<$small_int_type> for BigInt<M> {
+            #[inline]
+            fn partial_cmp(&self, other: &$small_int_type) -> Option<Ordering> {
+                Some(cmp_i64(self, *other as i64))
+            }
+        }
+    };
 }
 
-impl<M: ManagedTypeApi> PartialOrd<i64> for BigInt<M> {
-    #[inline]
-    fn partial_cmp(&self, other: &i64) -> Option<Ordering> {
-        Some(cmp_i64(self, *other))
-    }
-}
+partial_eq_and_ord! {i32}
+partial_eq_and_ord! {i64}
+partial_eq_and_ord! {u32}
+partial_eq_and_ord! {u64}
diff --git a/framework/base/src/types/managed/basic/big_num_cmp.rs b/framework/base/src/types/managed/basic/big_num_cmp.rs
index 346b6cca6d..7793ea3e00 100644
--- a/framework/base/src/types/managed/basic/big_num_cmp.rs
+++ b/framework/base/src/types/managed/basic/big_num_cmp.rs
@@ -1,11 +1,11 @@
-use core::{cmp::Ordering, convert::TryInto};
+use core::cmp::Ordering;
 
 use crate::{
     api::{const_handles, BigIntApiImpl, ManagedTypeApi},
     types::ManagedType,
 };
 
-use super::{cast_to_i64::cast_to_i64, BigInt};
+use super::BigInt;
 
 pub(crate) fn cmp_i64<M, B>(bi: &B, other: i64) -> Ordering
 where
@@ -24,12 +24,3 @@ where
         api.bi_cmp(bi.get_handle(), big_int_temp_1)
     }
 }
-
-pub(crate) fn cmp_conv_i64<M, B, T>(bi: &B, other: T) -> Ordering
-where
-    M: ManagedTypeApi,
-    B: ManagedType<M, OwnHandle = M::BigIntHandle>,
-    T: TryInto<i64>,
-{
-    cmp_i64(bi, cast_to_i64::<M, _>(other))
-}
diff --git a/framework/base/src/types/managed/basic/mod.rs b/framework/base/src/types/managed/basic/mod.rs
index 124fd1df55..ef10f15b5e 100644
--- a/framework/base/src/types/managed/basic/mod.rs
+++ b/framework/base/src/types/managed/basic/mod.rs
@@ -6,10 +6,7 @@ mod big_int_cmp;
 mod big_int_operators;
 mod big_int_sign;
 mod big_num_cmp;
-mod big_uint;
-mod big_uint_cmp;
-mod big_uint_operators;
-mod cast_to_i64;
+pub(crate) mod cast_to_i64;
 mod elliptic_curve;
 mod managed_buffer;
 mod managed_map;
@@ -17,7 +14,6 @@ mod managed_map;
 pub use big_float::BigFloat;
 pub use big_int::BigInt;
 pub use big_int_sign::Sign;
-pub use big_uint::BigUint;
 pub use elliptic_curve::{EllipticCurve, EllipticCurveComponents};
 pub use managed_buffer::ManagedBuffer;
 pub use managed_map::ManagedMap;
diff --git a/framework/base/src/types/managed/basic/big_uint.rs b/framework/base/src/types/managed/wrapped/big_uint.rs
similarity index 97%
rename from framework/base/src/types/managed/basic/big_uint.rs
rename to framework/base/src/types/managed/wrapped/big_uint.rs
index 937e6544b5..7abff39086 100644
--- a/framework/base/src/types/managed/basic/big_uint.rs
+++ b/framework/base/src/types/managed/wrapped/big_uint.rs
@@ -13,13 +13,11 @@ use crate::{
     contract_base::ErrorHelper,
     formatter::{hex_util::encode_bytes_as_hex, FormatBuffer, FormatByteReceiver, SCDisplay},
     types::{
-        heap::BoxedBytes, ConstDecimals, Decimals, ManagedBuffer, ManagedBufferCachedBuilder,
-        ManagedDecimal, ManagedRef, ManagedType,
+        heap::BoxedBytes, BigInt, ConstDecimals, Decimals, ManagedBuffer,
+        ManagedBufferCachedBuilder, ManagedDecimal, ManagedRef, ManagedType,
     },
 };
 
-use super::{cast_to_i64::cast_to_i64, BigInt};
-
 #[repr(transparent)]
 pub struct BigUint<M: ManagedTypeApi> {
     pub(crate) data: BigInt<M>,
@@ -68,7 +66,7 @@ impl<M: ManagedTypeApi> BigUint<M> {
     where
         T: TryInto<i64> + num_traits::Unsigned,
     {
-        M::managed_type_impl().bi_set_int64(handle, cast_to_i64::<M, _>(value));
+        BigInt::<M>::set_value(handle, value);
     }
 
     pub(crate) fn new_from_num<T>(value: T) -> Self
diff --git a/framework/base/src/types/managed/basic/big_uint_cmp.rs b/framework/base/src/types/managed/wrapped/big_uint_cmp.rs
similarity index 88%
rename from framework/base/src/types/managed/basic/big_uint_cmp.rs
rename to framework/base/src/types/managed/wrapped/big_uint_cmp.rs
index 0db2108043..f8627a3ba1 100644
--- a/framework/base/src/types/managed/basic/big_uint_cmp.rs
+++ b/framework/base/src/types/managed/wrapped/big_uint_cmp.rs
@@ -1,8 +1,9 @@
-use crate::types::managed::basic::big_num_cmp::cmp_conv_i64;
 use core::cmp::Ordering;
 
 use crate::api::{BigIntApiImpl, ManagedTypeApi};
 
+use crate::types::cast_to_i64::cast_to_i64;
+
 use super::BigUint;
 
 impl<M: ManagedTypeApi> PartialEq for BigUint<M> {
@@ -35,14 +36,14 @@ macro_rules! partial_eq_and_ord {
         impl<M: ManagedTypeApi> PartialEq<$small_int_type> for BigUint<M> {
             #[inline]
             fn eq(&self, other: &$small_int_type) -> bool {
-                cmp_conv_i64(self, *other).is_eq()
+                self.data.eq(&cast_to_i64::<M, _>(*other))
             }
         }
 
         impl<M: ManagedTypeApi> PartialOrd<$small_int_type> for BigUint<M> {
             #[inline]
             fn partial_cmp(&self, other: &$small_int_type) -> Option<Ordering> {
-                Some(cmp_conv_i64(self, *other))
+                self.data.partial_cmp(&cast_to_i64::<M, _>(*other))
             }
         }
     };
diff --git a/framework/base/src/types/managed/basic/big_uint_operators.rs b/framework/base/src/types/managed/wrapped/big_uint_operators.rs
similarity index 100%
rename from framework/base/src/types/managed/basic/big_uint_operators.rs
rename to framework/base/src/types/managed/wrapped/big_uint_operators.rs
diff --git a/framework/base/src/types/managed/wrapped/mod.rs b/framework/base/src/types/managed/wrapped/mod.rs
index a07a604f0a..1954e5ffa9 100644
--- a/framework/base/src/types/managed/wrapped/mod.rs
+++ b/framework/base/src/types/managed/wrapped/mod.rs
@@ -1,3 +1,6 @@
+mod big_uint;
+mod big_uint_cmp;
+mod big_uint_operators;
 mod builder;
 mod egld_or_esdt_token_identifier;
 mod egld_or_esdt_token_payment;
@@ -23,6 +26,7 @@ mod randomness_source;
 mod token_identifier;
 mod traits;
 
+pub use big_uint::BigUint;
 pub use builder::*;
 pub use egld_or_esdt_token_identifier::EgldOrEsdtTokenIdentifier;
 pub use egld_or_esdt_token_payment::{EgldOrEsdtTokenPayment, EgldOrEsdtTokenPaymentRefs};

From b762f60b9f2f001031040451a4effda991f2cc24 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 25 Jun 2024 19:56:12 +0300
Subject: [PATCH 1032/1254] BigUint fixed lldb formatter

---
 .../multiversx_sc_lldb_pretty_printers.py         | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/tools/rust-debugger/pretty-printers/multiversx_sc_lldb_pretty_printers.py b/tools/rust-debugger/pretty-printers/multiversx_sc_lldb_pretty_printers.py
index 31bf1a7724..a0459c773a 100644
--- a/tools/rust-debugger/pretty-printers/multiversx_sc_lldb_pretty_printers.py
+++ b/tools/rust-debugger/pretty-printers/multiversx_sc_lldb_pretty_printers.py
@@ -19,13 +19,13 @@
 MOD_PATH = "multiversx_sc::types::managed::basic"
 
 BIG_INT_TYPE = f"{MOD_PATH}::big_int::BigInt<{DEBUG_API_TYPE}>"
-BIG_UINT_TYPE = f"{MOD_PATH}::big_uint::BigUint<{DEBUG_API_TYPE}>"
 BIG_FLOAT_TYPE = f"{MOD_PATH}::big_float::BigFloat<{DEBUG_API_TYPE}>"
 MANAGED_BUFFER_TYPE = f"{MOD_PATH}::managed_buffer::ManagedBuffer<{DEBUG_API_TYPE}>"
 
 # 3. SC wasm - Managed wrapped types
 MOD_PATH = "multiversx_sc::types::managed::wrapped"
 
+BIG_UINT_TYPE = f"{MOD_PATH}::big_uint::BigUint<{DEBUG_API_TYPE}>"
 TOKEN_IDENTIFIER_TYPE = f"{MOD_PATH}::token_identifier::TokenIdentifier<{DEBUG_API_TYPE}>"
 MANAGED_ADDRESS_TYPE = f"{MOD_PATH}::managed_address::ManagedAddress<{DEBUG_API_TYPE}>"
 MANAGED_BYTE_ARRAY_TYPE = f"{MOD_PATH}::managed_byte_array::ManagedByteArray<{DEBUG_API_TYPE}, {ANY_NUMBER}>"
@@ -320,6 +320,17 @@ def value_summary(self, buffer: lldb.value, context: lldb.value, type_info: lldb
         return format_buffer_hex(buffer)
 
 
+class BigUint(PlainManagedVecItem, ManagedType):
+    def map_picker(self) -> Callable:
+        return pick_big_int
+    
+    def lookup(self, big_uint: lldb.value) -> lldb.value:
+        return big_uint.data
+
+    def value_summary(self, big_uint: lldb.value, context: lldb.value, type_info: lldb.SBType) -> str:
+        return big_uint.sbvalue.GetSummary()
+
+
 class TokenIdentifier(PlainManagedVecItem, ManagedType):
     def lookup(self, token_identifier: lldb.value) -> lldb.value:
         return token_identifier.buffer
@@ -462,10 +473,10 @@ def summary(self, optional_value: lldb.value) -> str:
     (NUM_BIG_UINT_TYPE, NumBigUint),
     # 2. SC wasm - Managed basic types
     (BIG_INT_TYPE, BigInt),
-    (BIG_UINT_TYPE, BigInt),
     (BIG_FLOAT_TYPE, BigFloat),
     (MANAGED_BUFFER_TYPE, ManagedBuffer),
     # 3. SC wasm - Managed wrapped types
+    (BIG_UINT_TYPE, BigUint),
     (TOKEN_IDENTIFIER_TYPE, TokenIdentifier),
     (MANAGED_ADDRESS_TYPE, ManagedAddress),
     (MANAGED_BYTE_ARRAY_TYPE, ManagedByteArray),

From cbebcb145e550f504bc7280ccec3bad59fb4b166 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 25 Jun 2024 20:15:26 +0300
Subject: [PATCH 1033/1254] BigUint renamed value

---
 framework/base/src/io/finish.rs               |  2 +-
 .../base/src/types/managed/basic/big_float.rs |  2 +-
 .../base/src/types/managed/basic/big_int.rs   |  4 +-
 .../src/types/managed/basic/elliptic_curve.rs | 42 ++++++------
 .../src/types/managed/wrapped/big_uint.rs     | 26 ++++----
 .../src/types/managed/wrapped/big_uint_cmp.rs |  8 +--
 .../managed/wrapped/big_uint_operators.rs     | 66 +++++++++----------
 .../types/managed/wrapped/managed_decimal.rs  |  5 +-
 .../multiversx_sc_lldb_pretty_printers.py     |  2 +-
 9 files changed, 81 insertions(+), 76 deletions(-)

diff --git a/framework/base/src/io/finish.rs b/framework/base/src/io/finish.rs
index 518686d074..69bf879b1d 100644
--- a/framework/base/src/io/finish.rs
+++ b/framework/base/src/io/finish.rs
@@ -86,7 +86,7 @@ where
             FA::finish_api_impl().finish_managed_buffer_raw(managed_buffer.handle.clone());
             Ok(())
         } else if let Some(big_uint) = value.try_cast_ref::<BigUint<FA>>() {
-            FA::finish_api_impl().finish_big_uint_raw(big_uint.data.handle.clone());
+            FA::finish_api_impl().finish_big_uint_raw(big_uint.value.handle.clone());
             Ok(())
         } else if let Some(big_int) = value.try_cast_ref::<BigInt<FA>>() {
             FA::finish_api_impl().finish_big_int_raw(big_int.handle.clone());
diff --git a/framework/base/src/types/managed/basic/big_float.rs b/framework/base/src/types/managed/basic/big_float.rs
index 1fd7df4a45..b4c4d0ed39 100644
--- a/framework/base/src/types/managed/basic/big_float.rs
+++ b/framework/base/src/types/managed/basic/big_float.rs
@@ -113,7 +113,7 @@ impl<M: ManagedTypeApi> BigFloat<M> {
     pub fn from_big_uint(big_uint: &BigUint<M>) -> Self {
         let new_bf_handle: M::BigFloatHandle =
             use_raw_handle(M::static_var_api_impl().next_handle());
-        M::managed_type_impl().bf_set_bi(new_bf_handle.clone(), big_uint.data.handle.clone());
+        M::managed_type_impl().bf_set_bi(new_bf_handle.clone(), big_uint.value.handle.clone());
         BigFloat::from_handle(new_bf_handle)
     }
 
diff --git a/framework/base/src/types/managed/basic/big_int.rs b/framework/base/src/types/managed/basic/big_int.rs
index bbc0f3a512..b837eaa108 100644
--- a/framework/base/src/types/managed/basic/big_int.rs
+++ b/framework/base/src/types/managed/basic/big_int.rs
@@ -217,9 +217,9 @@ impl<M: ManagedTypeApi> BigInt<M> {
     pub fn from_biguint(sign: Sign, unsigned: BigUint<M>) -> Self {
         let api = M::managed_type_impl();
         if sign.is_minus() {
-            api.bi_neg(unsigned.data.handle.clone(), unsigned.data.handle.clone());
+            api.bi_neg(unsigned.value.handle.clone(), unsigned.value.handle.clone());
         }
-        BigInt::from_handle(unsigned.data.handle)
+        BigInt::from_handle(unsigned.value.handle)
     }
 
     /// Returns the sign of the `BigInt` as a `Sign`.
diff --git a/framework/base/src/types/managed/basic/elliptic_curve.rs b/framework/base/src/types/managed/basic/elliptic_curve.rs
index 11d9b36426..99189d06c5 100644
--- a/framework/base/src/types/managed/basic/elliptic_curve.rs
+++ b/framework/base/src/types/managed/basic/elliptic_curve.rs
@@ -118,10 +118,10 @@ impl<M: ManagedTypeApi> EllipticCurve<M> {
             x_result_handle.clone(),
             y_result_handle.clone(),
             self.handle.clone(),
-            x_first_point.data.handle,
-            y_first_point.data.handle,
-            x_second_point.data.handle,
-            y_second_point.data.handle,
+            x_first_point.value.handle,
+            y_first_point.value.handle,
+            x_second_point.value.handle,
+            y_second_point.value.handle,
         );
         (
             BigUint::from_handle(x_result_handle),
@@ -137,8 +137,8 @@ impl<M: ManagedTypeApi> EllipticCurve<M> {
             x_result_handle.clone(),
             y_result_handle.clone(),
             self.handle.clone(),
-            x_point.data.handle,
-            y_point.data.handle,
+            x_point.value.handle,
+            y_point.value.handle,
         );
         (
             BigUint::from_handle(x_result_handle),
@@ -150,8 +150,8 @@ impl<M: ManagedTypeApi> EllipticCurve<M> {
         let api = M::managed_type_impl();
         api.ec_is_on_curve(
             self.handle.clone(),
-            x_point.data.handle,
-            y_point.data.handle,
+            x_point.value.handle,
+            y_point.value.handle,
         )
     }
 
@@ -169,8 +169,8 @@ impl<M: ManagedTypeApi> EllipticCurve<M> {
             x_result_handle.clone(),
             y_result_handle.clone(),
             self.handle.clone(),
-            x_point.data.handle,
-            y_point.data.handle,
+            x_point.value.handle,
+            y_point.value.handle,
             data,
         );
         (
@@ -192,8 +192,8 @@ impl<M: ManagedTypeApi> EllipticCurve<M> {
             x_result_handle.clone(),
             y_result_handle.clone(),
             self.handle.clone(),
-            x_point.data.handle,
-            y_point.data.handle,
+            x_point.value.handle,
+            y_point.value.handle,
             data.get_handle(),
         );
         (
@@ -246,7 +246,11 @@ impl<M: ManagedTypeApi> EllipticCurve<M> {
         y_pair: BigUint<M>,
     ) -> crate::types::heap::BoxedBytes {
         let api = M::managed_type_impl();
-        api.ec_marshal_legacy(self.handle.clone(), x_pair.data.handle, y_pair.data.handle)
+        api.ec_marshal_legacy(
+            self.handle.clone(),
+            x_pair.value.handle,
+            y_pair.value.handle,
+        )
     }
 
     pub fn marshal(&self, x_pair: BigUint<M>, y_pair: BigUint<M>) -> ManagedBuffer<M> {
@@ -254,8 +258,8 @@ impl<M: ManagedTypeApi> EllipticCurve<M> {
             use_raw_handle(M::static_var_api_impl().next_handle());
         M::managed_type_impl().ec_marshal(
             self.handle.clone(),
-            x_pair.data.handle,
-            y_pair.data.handle,
+            x_pair.value.handle,
+            y_pair.value.handle,
             result_handle.clone(),
         );
         ManagedBuffer::from_handle(result_handle)
@@ -274,8 +278,8 @@ impl<M: ManagedTypeApi> EllipticCurve<M> {
         let api = M::managed_type_impl();
         api.ec_marshal_compressed_legacy(
             self.handle.clone(),
-            x_pair.data.handle,
-            y_pair.data.handle,
+            x_pair.value.handle,
+            y_pair.value.handle,
         )
     }
 
@@ -284,8 +288,8 @@ impl<M: ManagedTypeApi> EllipticCurve<M> {
             use_raw_handle(M::static_var_api_impl().next_handle());
         M::managed_type_impl().ec_marshal_compressed(
             self.handle.clone(),
-            x_pair.data.handle,
-            y_pair.data.handle,
+            x_pair.value.handle,
+            y_pair.value.handle,
             result_handle.clone(),
         );
         ManagedBuffer::from_handle(result_handle)
diff --git a/framework/base/src/types/managed/wrapped/big_uint.rs b/framework/base/src/types/managed/wrapped/big_uint.rs
index 7abff39086..2444bf84c3 100644
--- a/framework/base/src/types/managed/wrapped/big_uint.rs
+++ b/framework/base/src/types/managed/wrapped/big_uint.rs
@@ -20,7 +20,7 @@ use crate::{
 
 #[repr(transparent)]
 pub struct BigUint<M: ManagedTypeApi> {
-    pub(crate) data: BigInt<M>,
+    pub(crate) value: BigInt<M>,
 }
 
 impl<M: ManagedTypeApi> ManagedType<M> for BigUint<M> {
@@ -28,12 +28,12 @@ impl<M: ManagedTypeApi> ManagedType<M> for BigUint<M> {
 
     fn from_handle(handle: M::BigIntHandle) -> Self {
         BigUint {
-            data: BigInt::from_handle(handle),
+            value: BigInt::from_handle(handle),
         }
     }
 
     fn get_handle(&self) -> M::BigIntHandle {
-        self.data.handle.clone()
+        self.value.handle.clone()
     }
 
     fn transmute_from_handle_ref(handle_ref: &M::BigIntHandle) -> &Self {
@@ -175,12 +175,12 @@ impl<M: ManagedTypeApi> BigUint<M> {
     #[inline]
     pub fn to_u64(&self) -> Option<u64> {
         let api = M::managed_type_impl();
-        api.bi_to_i64(self.data.handle.clone()).map(|bi| bi as u64)
+        api.bi_to_i64(self.value.handle.clone()).map(|bi| bi as u64)
     }
 
     #[inline]
     pub fn overwrite_u64(&mut self, value: u64) {
-        Self::set_value(self.data.handle.clone(), value);
+        Self::set_value(self.value.handle.clone(), value);
     }
 
     #[inline]
@@ -196,7 +196,7 @@ impl<M: ManagedTypeApi> BigUint<M> {
     pub fn to_bytes_be(&self) -> BoxedBytes {
         let mb_handle: M::ManagedBufferHandle = use_raw_handle(const_handles::MBUF_TEMPORARY_1);
         M::managed_type_impl()
-            .mb_from_big_int_unsigned(self.data.handle.clone(), mb_handle.clone());
+            .mb_from_big_int_unsigned(self.value.handle.clone(), mb_handle.clone());
         M::managed_type_impl().mb_to_boxed_bytes(mb_handle)
     }
 
@@ -213,7 +213,7 @@ impl<M: ManagedTypeApi> BigUint<M> {
         let mb_handle: M::ManagedBufferHandle =
             use_raw_handle(M::static_var_api_impl().next_handle());
         M::managed_type_impl()
-            .mb_from_big_int_unsigned(self.data.handle.clone(), mb_handle.clone());
+            .mb_from_big_int_unsigned(self.value.handle.clone(), mb_handle.clone());
         ManagedBuffer::from_handle(mb_handle)
     }
 }
@@ -224,7 +224,7 @@ impl<M: ManagedTypeApi> BigUint<M> {
     pub fn sqrt(&self) -> Self {
         let api = M::managed_type_impl();
         let result_handle: M::BigIntHandle = use_raw_handle(M::static_var_api_impl().next_handle());
-        api.bi_sqrt(result_handle.clone(), self.data.handle.clone());
+        api.bi_sqrt(result_handle.clone(), self.value.handle.clone());
         BigUint::from_handle(result_handle)
     }
 
@@ -234,7 +234,7 @@ impl<M: ManagedTypeApi> BigUint<M> {
         let big_int_temp_1 = BigUint::<M>::make_temp(const_handles::BIG_INT_TEMPORARY_1, exp);
         M::managed_type_impl().bi_pow(
             result_handle.clone(),
-            self.data.handle.clone(),
+            self.value.handle.clone(),
             big_int_temp_1,
         );
         BigUint::from_handle(result_handle)
@@ -243,7 +243,7 @@ impl<M: ManagedTypeApi> BigUint<M> {
     #[inline]
     pub fn log2(&self) -> u32 {
         let api = M::managed_type_impl();
-        api.bi_log2(self.data.handle.clone())
+        api.bi_log2(self.value.handle.clone())
     }
 
     /// Natural logarithm of a number.
@@ -305,7 +305,7 @@ impl<M: ManagedTypeApi> Clone for BigUint<M> {
         api.bi_add(
             clone_handle.clone(),
             clone_handle.clone(),
-            self.data.handle.clone(),
+            self.value.handle.clone(),
         );
         BigUint::from_handle(clone_handle)
     }
@@ -372,7 +372,7 @@ impl<M: ManagedTypeApi> TopDecode for BigUint<M> {
 impl<M: ManagedTypeApi> SCDisplay for BigUint<M> {
     fn fmt<F: FormatByteReceiver>(&self, f: &mut F) {
         let str_handle: M::ManagedBufferHandle = use_raw_handle(const_handles::MBUF_TEMPORARY_1);
-        M::managed_type_impl().bi_to_string(self.data.handle.clone(), str_handle.clone());
+        M::managed_type_impl().bi_to_string(self.value.handle.clone(), str_handle.clone());
         f.append_managed_buffer(&ManagedBuffer::from_handle(
             str_handle.cast_or_signal_error::<M, _>(),
         ));
@@ -391,7 +391,7 @@ impl<M: ManagedTypeApi> BigUint<M> {
 impl<M: ManagedTypeApi> core::fmt::Debug for BigUint<M> {
     fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
         f.debug_struct("BigUint")
-            .field("handle", &self.data.handle.clone())
+            .field("handle", &self.value.handle.clone())
             .field(
                 "hex-value-be",
                 &encode_bytes_as_hex(self.to_bytes_be().as_slice()),
diff --git a/framework/base/src/types/managed/wrapped/big_uint_cmp.rs b/framework/base/src/types/managed/wrapped/big_uint_cmp.rs
index f8627a3ba1..45e9e5ed95 100644
--- a/framework/base/src/types/managed/wrapped/big_uint_cmp.rs
+++ b/framework/base/src/types/managed/wrapped/big_uint_cmp.rs
@@ -10,7 +10,7 @@ impl<M: ManagedTypeApi> PartialEq for BigUint<M> {
     #[inline]
     fn eq(&self, other: &Self) -> bool {
         M::managed_type_impl()
-            .bi_cmp(self.data.handle.clone(), other.data.handle.clone())
+            .bi_cmp(self.value.handle.clone(), other.value.handle.clone())
             .is_eq()
     }
 }
@@ -27,7 +27,7 @@ impl<M: ManagedTypeApi> PartialOrd for BigUint<M> {
 impl<M: ManagedTypeApi> Ord for BigUint<M> {
     #[inline]
     fn cmp(&self, other: &Self) -> Ordering {
-        M::managed_type_impl().bi_cmp(self.data.handle.clone(), other.data.handle.clone())
+        M::managed_type_impl().bi_cmp(self.value.handle.clone(), other.value.handle.clone())
     }
 }
 
@@ -36,14 +36,14 @@ macro_rules! partial_eq_and_ord {
         impl<M: ManagedTypeApi> PartialEq<$small_int_type> for BigUint<M> {
             #[inline]
             fn eq(&self, other: &$small_int_type) -> bool {
-                self.data.eq(&cast_to_i64::<M, _>(*other))
+                self.value.eq(&cast_to_i64::<M, _>(*other))
             }
         }
 
         impl<M: ManagedTypeApi> PartialOrd<$small_int_type> for BigUint<M> {
             #[inline]
             fn partial_cmp(&self, other: &$small_int_type) -> Option<Ordering> {
-                self.data.partial_cmp(&cast_to_i64::<M, _>(*other))
+                self.value.partial_cmp(&cast_to_i64::<M, _>(*other))
             }
         }
     };
diff --git a/framework/base/src/types/managed/wrapped/big_uint_operators.rs b/framework/base/src/types/managed/wrapped/big_uint_operators.rs
index 306c3650f5..934079eef7 100644
--- a/framework/base/src/types/managed/wrapped/big_uint_operators.rs
+++ b/framework/base/src/types/managed/wrapped/big_uint_operators.rs
@@ -14,11 +14,11 @@ macro_rules! binary_operator {
 
             fn $method(self, other: BigUint<M>) -> BigUint<M> {
                 M::managed_type_impl().$api_func(
-                    self.data.handle.clone(),
-                    self.data.handle.clone(),
-                    other.data.handle.clone(),
+                    self.value.handle.clone(),
+                    self.value.handle.clone(),
+                    other.value.handle.clone(),
                 );
-                BigUint::from_handle(self.data.handle.clone())
+                BigUint::from_handle(self.value.handle.clone())
             }
         }
 
@@ -30,8 +30,8 @@ macro_rules! binary_operator {
                     use_raw_handle(M::static_var_api_impl().next_handle());
                 M::managed_type_impl().$api_func(
                     result_handle.clone(),
-                    self.data.handle.clone(),
-                    other.data.handle.clone(),
+                    self.value.handle.clone(),
+                    other.value.handle.clone(),
                 );
                 BigUint::from_handle(result_handle)
             }
@@ -42,11 +42,11 @@ macro_rules! binary_operator {
 
             fn $method(self, other: &BigUint<M>) -> BigUint<M> {
                 M::managed_type_impl().$api_func(
-                    self.data.handle.clone(),
-                    self.data.handle.clone(),
-                    other.data.handle.clone(),
+                    self.value.handle.clone(),
+                    self.value.handle.clone(),
+                    other.value.handle.clone(),
                 );
-                BigUint::from_handle(self.data.handle.clone())
+                BigUint::from_handle(self.value.handle.clone())
             }
         }
 
@@ -56,11 +56,11 @@ macro_rules! binary_operator {
             fn $method(self, other: u32) -> BigUint<M> {
                 let big_int_temp_1 = Self::make_temp(const_handles::BIG_INT_TEMPORARY_1, other);
                 M::managed_type_impl().$api_func(
-                    self.data.handle.clone(),
-                    self.data.handle.clone(),
+                    self.value.handle.clone(),
+                    self.value.handle.clone(),
                     big_int_temp_1,
                 );
-                BigUint::from_handle(self.data.handle.clone())
+                BigUint::from_handle(self.value.handle.clone())
             }
         }
 
@@ -74,7 +74,7 @@ macro_rules! binary_operator {
                     use_raw_handle(M::static_var_api_impl().next_handle());
                 M::managed_type_impl().$api_func(
                     result_handle.clone(),
-                    self.data.handle.clone(),
+                    self.value.handle.clone(),
                     big_int_temp_1,
                 );
                 BigUint::from_handle(result_handle)
@@ -87,11 +87,11 @@ macro_rules! binary_operator {
             fn $method(self, other: u64) -> BigUint<M> {
                 let big_int_temp_1 = Self::make_temp(const_handles::BIG_INT_TEMPORARY_1, other);
                 M::managed_type_impl().$api_func(
-                    self.data.handle.clone(),
-                    self.data.handle.clone(),
+                    self.value.handle.clone(),
+                    self.value.handle.clone(),
                     big_int_temp_1,
                 );
-                BigUint::from_handle(self.data.handle.clone())
+                BigUint::from_handle(self.value.handle.clone())
             }
         }
 
@@ -105,7 +105,7 @@ macro_rules! binary_operator {
                     use_raw_handle(M::static_var_api_impl().next_handle());
                 M::managed_type_impl().$api_func(
                     result_handle.clone(),
-                    self.data.handle.clone(),
+                    self.value.handle.clone(),
                     big_int_temp_1,
                 );
                 BigUint::from_handle(result_handle)
@@ -129,9 +129,9 @@ macro_rules! binary_assign_operator {
             #[inline]
             fn $method(&mut self, other: Self) {
                 M::managed_type_impl().$api_func(
-                    self.data.handle.clone(),
-                    self.data.handle.clone(),
-                    other.data.handle.clone(),
+                    self.value.handle.clone(),
+                    self.value.handle.clone(),
+                    other.value.handle.clone(),
                 );
             }
         }
@@ -140,9 +140,9 @@ macro_rules! binary_assign_operator {
             #[inline]
             fn $method(&mut self, other: &BigUint<M>) {
                 M::managed_type_impl().$api_func(
-                    self.data.handle.clone(),
-                    self.data.handle.clone(),
-                    other.data.handle.clone(),
+                    self.value.handle.clone(),
+                    self.value.handle.clone(),
+                    other.value.handle.clone(),
                 );
             }
         }
@@ -151,8 +151,8 @@ macro_rules! binary_assign_operator {
             fn $method(&mut self, other: u32) {
                 let big_int_temp_1 = Self::make_temp(const_handles::BIG_INT_TEMPORARY_1, other);
                 M::managed_type_impl().$api_func(
-                    self.data.handle.clone(),
-                    self.data.handle.clone(),
+                    self.value.handle.clone(),
+                    self.value.handle.clone(),
                     big_int_temp_1,
                 );
             }
@@ -162,8 +162,8 @@ macro_rules! binary_assign_operator {
             fn $method(&mut self, other: u64) {
                 let big_int_temp_1 = Self::make_temp(const_handles::BIG_INT_TEMPORARY_1, other);
                 M::managed_type_impl().$api_func(
-                    self.data.handle.clone(),
-                    self.data.handle.clone(),
+                    self.value.handle.clone(),
+                    self.value.handle.clone(),
                     big_int_temp_1,
                 );
             }
@@ -188,8 +188,8 @@ macro_rules! shift_traits {
             #[inline]
             fn $method(self, rhs: usize) -> BigUint<M> {
                 M::managed_type_impl().$api_func(
-                    self.data.handle.clone(),
-                    self.data.handle.clone(),
+                    self.value.handle.clone(),
+                    self.value.handle.clone(),
                     rhs,
                 );
                 self
@@ -204,7 +204,7 @@ macro_rules! shift_traits {
                     use_raw_handle(M::static_var_api_impl().next_handle());
                 M::managed_type_impl().$api_func(
                     result_handle.clone(),
-                    self.data.handle.clone(),
+                    self.value.handle.clone(),
                     rhs,
                 );
                 BigUint::from_handle(result_handle)
@@ -222,8 +222,8 @@ macro_rules! shift_assign_traits {
             #[inline]
             fn $method(&mut self, rhs: usize) {
                 M::managed_type_impl().$api_func(
-                    self.data.handle.clone(),
-                    self.data.handle.clone(),
+                    self.value.handle.clone(),
+                    self.value.handle.clone(),
                     rhs,
                 );
             }
diff --git a/framework/base/src/types/managed/wrapped/managed_decimal.rs b/framework/base/src/types/managed/wrapped/managed_decimal.rs
index f3cfb14dcd..79c29f94ef 100644
--- a/framework/base/src/types/managed/wrapped/managed_decimal.rs
+++ b/framework/base/src/types/managed/wrapped/managed_decimal.rs
@@ -413,7 +413,8 @@ impl<M: ManagedTypeApi, D: Decimals> SCDisplay for ManagedDecimal<M, D> {
     fn fmt<F: FormatByteReceiver>(&self, f: &mut F) {
         let full_str_handle: M::ManagedBufferHandle =
             use_raw_handle(const_handles::MBUF_TEMPORARY_1);
-        M::managed_type_impl().bi_to_string(self.data.data.handle.clone(), full_str_handle.clone());
+        M::managed_type_impl()
+            .bi_to_string(self.data.value.handle.clone(), full_str_handle.clone());
         let len = M::managed_type_impl().mb_len(full_str_handle.clone());
         let nr_dec = self.decimals.num_decimals();
 
@@ -462,7 +463,7 @@ impl<M: ManagedTypeApi, D: Decimals> core::fmt::Display for ManagedDecimal<M, D>
 impl<M: ManagedTypeApi, D: Decimals> core::fmt::Debug for ManagedDecimal<M, D> {
     fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
         f.debug_struct("ManagedDecimal")
-            .field("handle", &self.data.data.handle.clone())
+            .field("handle", &self.data.value.handle.clone())
             .field("number", &self.to_string())
             .finish()
     }
diff --git a/tools/rust-debugger/pretty-printers/multiversx_sc_lldb_pretty_printers.py b/tools/rust-debugger/pretty-printers/multiversx_sc_lldb_pretty_printers.py
index a0459c773a..1232201e28 100644
--- a/tools/rust-debugger/pretty-printers/multiversx_sc_lldb_pretty_printers.py
+++ b/tools/rust-debugger/pretty-printers/multiversx_sc_lldb_pretty_printers.py
@@ -325,7 +325,7 @@ def map_picker(self) -> Callable:
         return pick_big_int
     
     def lookup(self, big_uint: lldb.value) -> lldb.value:
-        return big_uint.data
+        return big_uint.value
 
     def value_summary(self, big_uint: lldb.value, context: lldb.value, type_info: lldb.SBType) -> str:
         return big_uint.sbvalue.GetSummary()

From ff2644e9de4b77b23d1bb37ed31405a45fe58b8a Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 25 Jun 2024 20:30:32 +0300
Subject: [PATCH 1034/1254] handle conversion fix

---
 framework/base/src/storage/storage_get.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/framework/base/src/storage/storage_get.rs b/framework/base/src/storage/storage_get.rs
index 91efe992b2..d15142809b 100644
--- a/framework/base/src/storage/storage_get.rs
+++ b/framework/base/src/storage/storage_get.rs
@@ -2,8 +2,8 @@ use core::{convert::Infallible, marker::PhantomData};
 
 use crate::{
     api::{
-        const_handles, use_raw_handle, ErrorApi, ErrorApiImpl, ManagedBufferApiImpl,
-        ManagedTypeApi, StaticVarApiImpl, StorageReadApi, StorageReadApiImpl,
+        const_handles, use_raw_handle, ErrorApi, ErrorApiImpl, HandleConstraints,
+        ManagedBufferApiImpl, ManagedTypeApi, StaticVarApiImpl, StorageReadApi, StorageReadApiImpl,
     },
     codec::*,
     err_msg,
@@ -135,7 +135,7 @@ where
     T: TopDecode,
     A: StorageReadApi + ManagedTypeApi + ErrorApi,
 {
-    let handle = key.get_raw_handle();
+    let handle = key.get_handle().get_raw_handle_unchecked();
     T::top_decode_or_handle_err(
         StorageGetInput::new(key),
         StorageGetErrorHandler::<A>::new(handle),

From c3813a6366c27b1aee840dc70d4bf418891aa330 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Wed, 26 Jun 2024 12:20:38 +0200
Subject: [PATCH 1035/1254] test fix and small error message adjustment

---
 .../scenarios/stress_submit_test.scen.json    | 726 ++++++++++++------
 .../scenarios/storage_opt_address.scen.json   |   2 +-
 .../scenarios/codec_err.scen.json             |   2 +-
 .../scenarios/storage_i64_bad.scen.json       |   2 +-
 .../storage_opt_managed_addr.scen.json        |   2 +-
 .../scenarios/storage_u64_bad.scen.json       |   2 +-
 .../scenarios/storage_usize_bad.scen.json     |   2 +-
 .../scenarios/test_esdt_generation.scen.json  |  24 -
 .../wrappers/storage_raw_wrapper.rs           |   3 +-
 framework/base/src/err_msg.rs                 |   3 +-
 framework/base/src/storage/storage_get.rs     |   6 +-
 .../src/storage/storage_get_from_address.rs   |   5 +-
 12 files changed, 503 insertions(+), 276 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 e2b19c9966..b7355d9bb0 100644
--- a/contracts/core/price-aggregator/scenarios/stress_submit_test.scen.json
+++ b/contracts/core/price-aggregator/scenarios/stress_submit_test.scen.json
@@ -1,221 +1,471 @@
 {
     "steps": [
+        {
+            "step": "setState",
+            "accounts": {
+                "address:owner": {
+                    "nonce": "1"
+                }
+            },
+            "newAddresses": [
+                {
+                    "creatorAddress": "address:owner",
+                    "creatorNonce": "1",
+                    "newAddress": "sc:price-aggregator"
+                }
+            ],
+            "currentBlockInfo": {
+                "blockTimestamp": "100"
+            }
+        },
         {
             "step": "setState",
             "accounts": {
                 "address:oracle1": {
                     "nonce": "1",
                     "balance": "20"
-                },
+                }
+            }
+        },
+        {
+            "step": "setState",
+            "accounts": {
+                "address:oracle2": {
+                    "nonce": "1",
+                    "balance": "20"
+                }
+            }
+        },
+        {
+            "step": "setState",
+            "accounts": {
+                "address:oracle3": {
+                    "nonce": "1",
+                    "balance": "20"
+                }
+            }
+        },
+        {
+            "step": "setState",
+            "accounts": {
+                "address:oracle4": {
+                    "nonce": "1",
+                    "balance": "20"
+                }
+            }
+        },
+        {
+            "step": "setState",
+            "accounts": {
+                "address:oracle5": {
+                    "nonce": "1",
+                    "balance": "20"
+                }
+            }
+        },
+        {
+            "step": "setState",
+            "accounts": {
+                "address:oracle6": {
+                    "nonce": "1",
+                    "balance": "20"
+                }
+            }
+        },
+        {
+            "step": "setState",
+            "accounts": {
+                "address:oracle7": {
+                    "nonce": "1",
+                    "balance": "20"
+                }
+            }
+        },
+        {
+            "step": "setState",
+            "accounts": {
+                "address:oracle8": {
+                    "nonce": "1",
+                    "balance": "20"
+                }
+            }
+        },
+        {
+            "step": "setState",
+            "accounts": {
+                "address:oracle9": {
+                    "nonce": "1",
+                    "balance": "20"
+                }
+            }
+        },
+        {
+            "step": "setState",
+            "accounts": {
                 "address:oracle10": {
                     "nonce": "1",
                     "balance": "20"
-                },
+                }
+            }
+        },
+        {
+            "step": "setState",
+            "accounts": {
                 "address:oracle11": {
                     "nonce": "1",
                     "balance": "20"
-                },
+                }
+            }
+        },
+        {
+            "step": "setState",
+            "accounts": {
                 "address:oracle12": {
                     "nonce": "1",
                     "balance": "20"
-                },
+                }
+            }
+        },
+        {
+            "step": "setState",
+            "accounts": {
                 "address:oracle13": {
                     "nonce": "1",
                     "balance": "20"
-                },
+                }
+            }
+        },
+        {
+            "step": "setState",
+            "accounts": {
                 "address:oracle14": {
                     "nonce": "1",
                     "balance": "20"
-                },
+                }
+            }
+        },
+        {
+            "step": "setState",
+            "accounts": {
                 "address:oracle15": {
                     "nonce": "1",
                     "balance": "20"
-                },
+                }
+            }
+        },
+        {
+            "step": "setState",
+            "accounts": {
                 "address:oracle16": {
                     "nonce": "1",
                     "balance": "20"
-                },
+                }
+            }
+        },
+        {
+            "step": "setState",
+            "accounts": {
                 "address:oracle17": {
                     "nonce": "1",
                     "balance": "20"
-                },
+                }
+            }
+        },
+        {
+            "step": "setState",
+            "accounts": {
                 "address:oracle18": {
                     "nonce": "1",
                     "balance": "20"
-                },
+                }
+            }
+        },
+        {
+            "step": "setState",
+            "accounts": {
                 "address:oracle19": {
                     "nonce": "1",
                     "balance": "20"
-                },
-                "address:oracle2": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
+                }
+            }
+        },
+        {
+            "step": "setState",
+            "accounts": {
                 "address:oracle20": {
                     "nonce": "1",
                     "balance": "20"
-                },
+                }
+            }
+        },
+        {
+            "step": "setState",
+            "accounts": {
                 "address:oracle21": {
                     "nonce": "1",
                     "balance": "20"
-                },
+                }
+            }
+        },
+        {
+            "step": "setState",
+            "accounts": {
                 "address:oracle22": {
                     "nonce": "1",
                     "balance": "20"
-                },
+                }
+            }
+        },
+        {
+            "step": "setState",
+            "accounts": {
                 "address:oracle23": {
                     "nonce": "1",
                     "balance": "20"
-                },
+                }
+            }
+        },
+        {
+            "step": "setState",
+            "accounts": {
                 "address:oracle24": {
                     "nonce": "1",
                     "balance": "20"
-                },
+                }
+            }
+        },
+        {
+            "step": "setState",
+            "accounts": {
                 "address:oracle25": {
                     "nonce": "1",
                     "balance": "20"
-                },
+                }
+            }
+        },
+        {
+            "step": "setState",
+            "accounts": {
                 "address:oracle26": {
                     "nonce": "1",
                     "balance": "20"
-                },
+                }
+            }
+        },
+        {
+            "step": "setState",
+            "accounts": {
                 "address:oracle27": {
                     "nonce": "1",
                     "balance": "20"
-                },
+                }
+            }
+        },
+        {
+            "step": "setState",
+            "accounts": {
                 "address:oracle28": {
                     "nonce": "1",
                     "balance": "20"
-                },
+                }
+            }
+        },
+        {
+            "step": "setState",
+            "accounts": {
                 "address:oracle29": {
                     "nonce": "1",
                     "balance": "20"
-                },
-                "address:oracle3": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
+                }
+            }
+        },
+        {
+            "step": "setState",
+            "accounts": {
                 "address:oracle30": {
                     "nonce": "1",
                     "balance": "20"
-                },
+                }
+            }
+        },
+        {
+            "step": "setState",
+            "accounts": {
                 "address:oracle31": {
                     "nonce": "1",
                     "balance": "20"
-                },
+                }
+            }
+        },
+        {
+            "step": "setState",
+            "accounts": {
                 "address:oracle32": {
                     "nonce": "1",
                     "balance": "20"
-                },
+                }
+            }
+        },
+        {
+            "step": "setState",
+            "accounts": {
                 "address:oracle33": {
                     "nonce": "1",
                     "balance": "20"
-                },
+                }
+            }
+        },
+        {
+            "step": "setState",
+            "accounts": {
                 "address:oracle34": {
                     "nonce": "1",
                     "balance": "20"
-                },
+                }
+            }
+        },
+        {
+            "step": "setState",
+            "accounts": {
                 "address:oracle35": {
                     "nonce": "1",
                     "balance": "20"
-                },
+                }
+            }
+        },
+        {
+            "step": "setState",
+            "accounts": {
                 "address:oracle36": {
                     "nonce": "1",
                     "balance": "20"
-                },
+                }
+            }
+        },
+        {
+            "step": "setState",
+            "accounts": {
                 "address:oracle37": {
                     "nonce": "1",
                     "balance": "20"
-                },
+                }
+            }
+        },
+        {
+            "step": "setState",
+            "accounts": {
                 "address:oracle38": {
                     "nonce": "1",
                     "balance": "20"
-                },
+                }
+            }
+        },
+        {
+            "step": "setState",
+            "accounts": {
                 "address:oracle39": {
                     "nonce": "1",
                     "balance": "20"
-                },
-                "address:oracle4": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
+                }
+            }
+        },
+        {
+            "step": "setState",
+            "accounts": {
                 "address:oracle40": {
                     "nonce": "1",
                     "balance": "20"
-                },
+                }
+            }
+        },
+        {
+            "step": "setState",
+            "accounts": {
                 "address:oracle41": {
                     "nonce": "1",
                     "balance": "20"
-                },
+                }
+            }
+        },
+        {
+            "step": "setState",
+            "accounts": {
                 "address:oracle42": {
                     "nonce": "1",
                     "balance": "20"
-                },
+                }
+            }
+        },
+        {
+            "step": "setState",
+            "accounts": {
                 "address:oracle43": {
                     "nonce": "1",
                     "balance": "20"
-                },
+                }
+            }
+        },
+        {
+            "step": "setState",
+            "accounts": {
                 "address:oracle44": {
                     "nonce": "1",
                     "balance": "20"
-                },
+                }
+            }
+        },
+        {
+            "step": "setState",
+            "accounts": {
                 "address:oracle45": {
                     "nonce": "1",
                     "balance": "20"
-                },
+                }
+            }
+        },
+        {
+            "step": "setState",
+            "accounts": {
                 "address:oracle46": {
                     "nonce": "1",
                     "balance": "20"
-                },
+                }
+            }
+        },
+        {
+            "step": "setState",
+            "accounts": {
                 "address:oracle47": {
                     "nonce": "1",
                     "balance": "20"
-                },
+                }
+            }
+        },
+        {
+            "step": "setState",
+            "accounts": {
                 "address:oracle48": {
                     "nonce": "1",
                     "balance": "20"
-                },
+                }
+            }
+        },
+        {
+            "step": "setState",
+            "accounts": {
                 "address:oracle49": {
                     "nonce": "1",
                     "balance": "20"
-                },
-                "address:oracle5": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
+                }
+            }
+        },
+        {
+            "step": "setState",
+            "accounts": {
                 "address:oracle50": {
                     "nonce": "1",
                     "balance": "20"
-                },
-                "address:oracle6": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle7": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle8": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:oracle9": {
-                    "nonce": "1",
-                    "balance": "20"
-                },
-                "address:owner": {
-                    "nonce": "1"
                 }
-            },
-            "newAddresses": [
-                {
-                    "creatorAddress": "address:owner",
-                    "creatorNonce": "1",
-                    "newAddress": "sc:price-aggregator"
-                }
-            ],
-            "currentBlockInfo": {
-                "blockTimestamp": "100"
             }
         },
         {
@@ -281,7 +531,7 @@
                     "0x6f7261636c6534395f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
                     "0x6f7261636c6535305f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f"
                 ],
-                "gasLimit": "120,000,000"
+                "gasLimit": "120000000"
             },
             "expect": {
                 "out": [],
@@ -297,7 +547,7 @@
                 "egldValue": "20",
                 "function": "stake",
                 "arguments": [],
-                "gasLimit": "5,000,000"
+                "gasLimit": "5000000"
             },
             "expect": {
                 "out": [],
@@ -313,7 +563,7 @@
                 "egldValue": "20",
                 "function": "stake",
                 "arguments": [],
-                "gasLimit": "5,000,000"
+                "gasLimit": "5000000"
             },
             "expect": {
                 "out": [],
@@ -329,7 +579,7 @@
                 "egldValue": "20",
                 "function": "stake",
                 "arguments": [],
-                "gasLimit": "5,000,000"
+                "gasLimit": "5000000"
             },
             "expect": {
                 "out": [],
@@ -345,7 +595,7 @@
                 "egldValue": "20",
                 "function": "stake",
                 "arguments": [],
-                "gasLimit": "5,000,000"
+                "gasLimit": "5000000"
             },
             "expect": {
                 "out": [],
@@ -361,7 +611,7 @@
                 "egldValue": "20",
                 "function": "stake",
                 "arguments": [],
-                "gasLimit": "5,000,000"
+                "gasLimit": "5000000"
             },
             "expect": {
                 "out": [],
@@ -377,7 +627,7 @@
                 "egldValue": "20",
                 "function": "stake",
                 "arguments": [],
-                "gasLimit": "5,000,000"
+                "gasLimit": "5000000"
             },
             "expect": {
                 "out": [],
@@ -393,7 +643,7 @@
                 "egldValue": "20",
                 "function": "stake",
                 "arguments": [],
-                "gasLimit": "5,000,000"
+                "gasLimit": "5000000"
             },
             "expect": {
                 "out": [],
@@ -409,7 +659,7 @@
                 "egldValue": "20",
                 "function": "stake",
                 "arguments": [],
-                "gasLimit": "5,000,000"
+                "gasLimit": "5000000"
             },
             "expect": {
                 "out": [],
@@ -425,7 +675,7 @@
                 "egldValue": "20",
                 "function": "stake",
                 "arguments": [],
-                "gasLimit": "5,000,000"
+                "gasLimit": "5000000"
             },
             "expect": {
                 "out": [],
@@ -441,7 +691,7 @@
                 "egldValue": "20",
                 "function": "stake",
                 "arguments": [],
-                "gasLimit": "5,000,000"
+                "gasLimit": "5000000"
             },
             "expect": {
                 "out": [],
@@ -457,7 +707,7 @@
                 "egldValue": "20",
                 "function": "stake",
                 "arguments": [],
-                "gasLimit": "5,000,000"
+                "gasLimit": "5000000"
             },
             "expect": {
                 "out": [],
@@ -473,7 +723,7 @@
                 "egldValue": "20",
                 "function": "stake",
                 "arguments": [],
-                "gasLimit": "5,000,000"
+                "gasLimit": "5000000"
             },
             "expect": {
                 "out": [],
@@ -489,7 +739,7 @@
                 "egldValue": "20",
                 "function": "stake",
                 "arguments": [],
-                "gasLimit": "5,000,000"
+                "gasLimit": "5000000"
             },
             "expect": {
                 "out": [],
@@ -505,7 +755,7 @@
                 "egldValue": "20",
                 "function": "stake",
                 "arguments": [],
-                "gasLimit": "5,000,000"
+                "gasLimit": "5000000"
             },
             "expect": {
                 "out": [],
@@ -521,7 +771,7 @@
                 "egldValue": "20",
                 "function": "stake",
                 "arguments": [],
-                "gasLimit": "5,000,000"
+                "gasLimit": "5000000"
             },
             "expect": {
                 "out": [],
@@ -537,7 +787,7 @@
                 "egldValue": "20",
                 "function": "stake",
                 "arguments": [],
-                "gasLimit": "5,000,000"
+                "gasLimit": "5000000"
             },
             "expect": {
                 "out": [],
@@ -553,7 +803,7 @@
                 "egldValue": "20",
                 "function": "stake",
                 "arguments": [],
-                "gasLimit": "5,000,000"
+                "gasLimit": "5000000"
             },
             "expect": {
                 "out": [],
@@ -569,7 +819,7 @@
                 "egldValue": "20",
                 "function": "stake",
                 "arguments": [],
-                "gasLimit": "5,000,000"
+                "gasLimit": "5000000"
             },
             "expect": {
                 "out": [],
@@ -585,7 +835,7 @@
                 "egldValue": "20",
                 "function": "stake",
                 "arguments": [],
-                "gasLimit": "5,000,000"
+                "gasLimit": "5000000"
             },
             "expect": {
                 "out": [],
@@ -601,7 +851,7 @@
                 "egldValue": "20",
                 "function": "stake",
                 "arguments": [],
-                "gasLimit": "5,000,000"
+                "gasLimit": "5000000"
             },
             "expect": {
                 "out": [],
@@ -617,7 +867,7 @@
                 "egldValue": "20",
                 "function": "stake",
                 "arguments": [],
-                "gasLimit": "5,000,000"
+                "gasLimit": "5000000"
             },
             "expect": {
                 "out": [],
@@ -633,7 +883,7 @@
                 "egldValue": "20",
                 "function": "stake",
                 "arguments": [],
-                "gasLimit": "5,000,000"
+                "gasLimit": "5000000"
             },
             "expect": {
                 "out": [],
@@ -649,7 +899,7 @@
                 "egldValue": "20",
                 "function": "stake",
                 "arguments": [],
-                "gasLimit": "5,000,000"
+                "gasLimit": "5000000"
             },
             "expect": {
                 "out": [],
@@ -665,7 +915,7 @@
                 "egldValue": "20",
                 "function": "stake",
                 "arguments": [],
-                "gasLimit": "5,000,000"
+                "gasLimit": "5000000"
             },
             "expect": {
                 "out": [],
@@ -681,7 +931,7 @@
                 "egldValue": "20",
                 "function": "stake",
                 "arguments": [],
-                "gasLimit": "5,000,000"
+                "gasLimit": "5000000"
             },
             "expect": {
                 "out": [],
@@ -697,7 +947,7 @@
                 "egldValue": "20",
                 "function": "stake",
                 "arguments": [],
-                "gasLimit": "5,000,000"
+                "gasLimit": "5000000"
             },
             "expect": {
                 "out": [],
@@ -713,7 +963,7 @@
                 "egldValue": "20",
                 "function": "stake",
                 "arguments": [],
-                "gasLimit": "5,000,000"
+                "gasLimit": "5000000"
             },
             "expect": {
                 "out": [],
@@ -729,7 +979,7 @@
                 "egldValue": "20",
                 "function": "stake",
                 "arguments": [],
-                "gasLimit": "5,000,000"
+                "gasLimit": "5000000"
             },
             "expect": {
                 "out": [],
@@ -745,7 +995,7 @@
                 "egldValue": "20",
                 "function": "stake",
                 "arguments": [],
-                "gasLimit": "5,000,000"
+                "gasLimit": "5000000"
             },
             "expect": {
                 "out": [],
@@ -761,7 +1011,7 @@
                 "egldValue": "20",
                 "function": "stake",
                 "arguments": [],
-                "gasLimit": "5,000,000"
+                "gasLimit": "5000000"
             },
             "expect": {
                 "out": [],
@@ -777,7 +1027,7 @@
                 "egldValue": "20",
                 "function": "stake",
                 "arguments": [],
-                "gasLimit": "5,000,000"
+                "gasLimit": "5000000"
             },
             "expect": {
                 "out": [],
@@ -793,7 +1043,7 @@
                 "egldValue": "20",
                 "function": "stake",
                 "arguments": [],
-                "gasLimit": "5,000,000"
+                "gasLimit": "5000000"
             },
             "expect": {
                 "out": [],
@@ -809,7 +1059,7 @@
                 "egldValue": "20",
                 "function": "stake",
                 "arguments": [],
-                "gasLimit": "5,000,000"
+                "gasLimit": "5000000"
             },
             "expect": {
                 "out": [],
@@ -825,7 +1075,7 @@
                 "egldValue": "20",
                 "function": "stake",
                 "arguments": [],
-                "gasLimit": "5,000,000"
+                "gasLimit": "5000000"
             },
             "expect": {
                 "out": [],
@@ -841,7 +1091,7 @@
                 "egldValue": "20",
                 "function": "stake",
                 "arguments": [],
-                "gasLimit": "5,000,000"
+                "gasLimit": "5000000"
             },
             "expect": {
                 "out": [],
@@ -857,7 +1107,7 @@
                 "egldValue": "20",
                 "function": "stake",
                 "arguments": [],
-                "gasLimit": "5,000,000"
+                "gasLimit": "5000000"
             },
             "expect": {
                 "out": [],
@@ -873,7 +1123,7 @@
                 "egldValue": "20",
                 "function": "stake",
                 "arguments": [],
-                "gasLimit": "5,000,000"
+                "gasLimit": "5000000"
             },
             "expect": {
                 "out": [],
@@ -889,7 +1139,7 @@
                 "egldValue": "20",
                 "function": "stake",
                 "arguments": [],
-                "gasLimit": "5,000,000"
+                "gasLimit": "5000000"
             },
             "expect": {
                 "out": [],
@@ -905,7 +1155,7 @@
                 "egldValue": "20",
                 "function": "stake",
                 "arguments": [],
-                "gasLimit": "5,000,000"
+                "gasLimit": "5000000"
             },
             "expect": {
                 "out": [],
@@ -921,7 +1171,7 @@
                 "egldValue": "20",
                 "function": "stake",
                 "arguments": [],
-                "gasLimit": "5,000,000"
+                "gasLimit": "5000000"
             },
             "expect": {
                 "out": [],
@@ -937,7 +1187,7 @@
                 "egldValue": "20",
                 "function": "stake",
                 "arguments": [],
-                "gasLimit": "5,000,000"
+                "gasLimit": "5000000"
             },
             "expect": {
                 "out": [],
@@ -953,7 +1203,7 @@
                 "egldValue": "20",
                 "function": "stake",
                 "arguments": [],
-                "gasLimit": "5,000,000"
+                "gasLimit": "5000000"
             },
             "expect": {
                 "out": [],
@@ -969,7 +1219,7 @@
                 "egldValue": "20",
                 "function": "stake",
                 "arguments": [],
-                "gasLimit": "5,000,000"
+                "gasLimit": "5000000"
             },
             "expect": {
                 "out": [],
@@ -985,7 +1235,7 @@
                 "egldValue": "20",
                 "function": "stake",
                 "arguments": [],
-                "gasLimit": "5,000,000"
+                "gasLimit": "5000000"
             },
             "expect": {
                 "out": [],
@@ -1001,7 +1251,7 @@
                 "egldValue": "20",
                 "function": "stake",
                 "arguments": [],
-                "gasLimit": "5,000,000"
+                "gasLimit": "5000000"
             },
             "expect": {
                 "out": [],
@@ -1017,7 +1267,7 @@
                 "egldValue": "20",
                 "function": "stake",
                 "arguments": [],
-                "gasLimit": "5,000,000"
+                "gasLimit": "5000000"
             },
             "expect": {
                 "out": [],
@@ -1033,7 +1283,7 @@
                 "egldValue": "20",
                 "function": "stake",
                 "arguments": [],
-                "gasLimit": "5,000,000"
+                "gasLimit": "5000000"
             },
             "expect": {
                 "out": [],
@@ -1049,7 +1299,7 @@
                 "egldValue": "20",
                 "function": "stake",
                 "arguments": [],
-                "gasLimit": "5,000,000"
+                "gasLimit": "5000000"
             },
             "expect": {
                 "out": [],
@@ -1065,7 +1315,7 @@
                 "egldValue": "20",
                 "function": "stake",
                 "arguments": [],
-                "gasLimit": "5,000,000"
+                "gasLimit": "5000000"
             },
             "expect": {
                 "out": [],
@@ -1081,7 +1331,7 @@
                 "egldValue": "20",
                 "function": "stake",
                 "arguments": [],
-                "gasLimit": "5,000,000"
+                "gasLimit": "5000000"
             },
             "expect": {
                 "out": [],
@@ -1115,7 +1365,7 @@
                 "to": "sc:price-aggregator",
                 "function": "unpause",
                 "arguments": [],
-                "gasLimit": "5,000,000"
+                "gasLimit": "5000000"
             },
             "expect": {
                 "out": [],
@@ -1133,10 +1383,10 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x5f",
-                    "0xd7fd71920be3e621",
+                    "0x39cc54ac5bccf253",
                     "0x"
                 ],
-                "gasLimit": "7,000,000"
+                "gasLimit": "7000000"
             },
             "expect": {
                 "out": [],
@@ -1154,10 +1404,10 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x5a032236cff2ff06",
+                    "0xad15c7e3640a9a45",
                     "0x"
                 ],
-                "gasLimit": "7,000,000"
+                "gasLimit": "7000000"
             },
             "expect": {
                 "out": [],
@@ -1175,10 +1425,10 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x2e874347688dffa1",
+                    "0x48b730532690eb9d",
                     "0x"
                 ],
-                "gasLimit": "7,000,000"
+                "gasLimit": "7000000"
             },
             "expect": {
                 "out": [],
@@ -1196,10 +1446,10 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x4c94033d5e15a73a",
+                    "0xb1580519ab86f89d",
                     "0x"
                 ],
-                "gasLimit": "7,000,000"
+                "gasLimit": "7000000"
             },
             "expect": {
                 "out": [],
@@ -1217,10 +1467,10 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x2bd5b88173750be6",
+                    "0xe84c8277b9268830",
                     "0x"
                 ],
-                "gasLimit": "7,000,000"
+                "gasLimit": "7000000"
             },
             "expect": {
                 "out": [],
@@ -1238,10 +1488,10 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xe4cb406e5f95d9d7",
+                    "0x4186a02ea588d794",
                     "0x"
                 ],
-                "gasLimit": "7,000,000"
+                "gasLimit": "7000000"
             },
             "expect": {
                 "out": [],
@@ -1259,10 +1509,10 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xfd4dd723ed0b256e",
+                    "0xa02844057524284f",
                     "0x"
                 ],
-                "gasLimit": "7,000,000"
+                "gasLimit": "7000000"
             },
             "expect": {
                 "out": [],
@@ -1280,10 +1530,10 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x66b6bfe973064cfd",
+                    "0x5649e4f1f063c7",
                     "0x"
                 ],
-                "gasLimit": "7,000,000"
+                "gasLimit": "7000000"
             },
             "expect": {
                 "out": [],
@@ -1301,10 +1551,10 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xbc6a51b940c5c479",
+                    "0x989609eab19ae73e",
                     "0x"
                 ],
-                "gasLimit": "7,000,000"
+                "gasLimit": "7000000"
             },
             "expect": {
                 "out": [],
@@ -1322,10 +1572,10 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x47ca1962093887df",
+                    "0x8acdafb19db56c6a",
                     "0x"
                 ],
-                "gasLimit": "7,000,000"
+                "gasLimit": "7000000"
             },
             "expect": {
                 "out": [],
@@ -1343,10 +1593,10 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xa9657f2b7c255e3c",
+                    "0x0bcc000dbabcac9a",
                     "0x"
                 ],
-                "gasLimit": "7,000,000"
+                "gasLimit": "7000000"
             },
             "expect": {
                 "out": [],
@@ -1364,10 +1614,10 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xadaf4aaa5e63f2e5",
+                    "0x8a66d435d52a6d03",
                     "0x"
                 ],
-                "gasLimit": "7,000,000"
+                "gasLimit": "7000000"
             },
             "expect": {
                 "out": [],
@@ -1385,10 +1635,10 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x153a1384b3d68656",
+                    "0x4bbb4cbf15005933",
                     "0x"
                 ],
-                "gasLimit": "7,000,000"
+                "gasLimit": "7000000"
             },
             "expect": {
                 "out": [],
@@ -1406,10 +1656,10 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x4ba5dda59b2ba4e9",
+                    "0x958966c4d4fdd3fc",
                     "0x"
                 ],
-                "gasLimit": "7,000,000"
+                "gasLimit": "7000000"
             },
             "expect": {
                 "out": [],
@@ -1427,10 +1677,10 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x973e0d62157afb51",
+                    "0x79a8a90448a9425f",
                     "0x"
                 ],
-                "gasLimit": "7,000,000"
+                "gasLimit": "7000000"
             },
             "expect": {
                 "out": [],
@@ -1448,10 +1698,10 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xe18cb77b44399b45",
+                    "0x2ddf6189613bf0b3",
                     "0x"
                 ],
-                "gasLimit": "7,000,000"
+                "gasLimit": "7000000"
             },
             "expect": {
                 "out": [],
@@ -1469,10 +1719,10 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x30a1ed7ed6069074",
+                    "0x91f975bb55acd96e",
                     "0x"
                 ],
-                "gasLimit": "7,000,000"
+                "gasLimit": "7000000"
             },
             "expect": {
                 "out": [],
@@ -1490,10 +1740,10 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xfbd288d325739548",
+                    "0xb8af8386d32407df",
                     "0x"
                 ],
-                "gasLimit": "7,000,000"
+                "gasLimit": "7000000"
             },
             "expect": {
                 "out": [],
@@ -1511,10 +1761,10 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x83ad3ad74745e6f5",
+                    "0x8208321468b7d110",
                     "0x"
                 ],
-                "gasLimit": "7,000,000"
+                "gasLimit": "7000000"
             },
             "expect": {
                 "out": [],
@@ -1532,10 +1782,10 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x0cc85234d5ea00b2",
+                    "0x301fb3f9d762dd21",
                     "0x"
                 ],
-                "gasLimit": "7,000,000"
+                "gasLimit": "7000000"
             },
             "expect": {
                 "out": [],
@@ -1553,10 +1803,10 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x8dae036c75e9a62c",
+                    "0x03d586d728e16c5d",
                     "0x"
                 ],
-                "gasLimit": "7,000,000"
+                "gasLimit": "7000000"
             },
             "expect": {
                 "out": [],
@@ -1574,10 +1824,10 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x31549118c983eaa0",
+                    "0x78b007f730262c92",
                     "0x"
                 ],
-                "gasLimit": "7,000,000"
+                "gasLimit": "7000000"
             },
             "expect": {
                 "out": [],
@@ -1595,10 +1845,10 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x8228096b6388b4bd",
+                    "0x3a6d82cd1852798e",
                     "0x"
                 ],
-                "gasLimit": "7,000,000"
+                "gasLimit": "7000000"
             },
             "expect": {
                 "out": [],
@@ -1616,10 +1866,10 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x2dc8b16251c44710",
+                    "0x9a55108257d7a256",
                     "0x"
                 ],
-                "gasLimit": "7,000,000"
+                "gasLimit": "7000000"
             },
             "expect": {
                 "out": [],
@@ -1637,10 +1887,10 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xbc66b6f85858d98c",
+                    "0xf3155692bc66519e",
                     "0x"
                 ],
-                "gasLimit": "7,000,000"
+                "gasLimit": "7000000"
             },
             "expect": {
                 "out": [],
@@ -1658,10 +1908,10 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x2937c9b0c1073c0b",
+                    "0x6283af7b2e296346",
                     "0x"
                 ],
-                "gasLimit": "7,000,000"
+                "gasLimit": "7000000"
             },
             "expect": {
                 "out": [],
@@ -1679,10 +1929,10 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xa2b7bd06214aabc4",
+                    "0x99d40cc696258cf6",
                     "0x"
                 ],
-                "gasLimit": "7,000,000"
+                "gasLimit": "7000000"
             },
             "expect": {
                 "out": [],
@@ -1700,10 +1950,10 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x61ae8ac001144476",
+                    "0x310d050fec04654e",
                     "0x"
                 ],
-                "gasLimit": "7,000,000"
+                "gasLimit": "7000000"
             },
             "expect": {
                 "out": [],
@@ -1721,10 +1971,10 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x5f6de265c643495f",
+                    "0x34a0e15c72dcba46",
                     "0x"
                 ],
-                "gasLimit": "7,000,000"
+                "gasLimit": "7000000"
             },
             "expect": {
                 "out": [],
@@ -1742,10 +1992,10 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x67430307e2f864f0",
+                    "0x24fa6ffe3a1279d0",
                     "0x"
                 ],
-                "gasLimit": "7,000,000"
+                "gasLimit": "7000000"
             },
             "expect": {
                 "out": [],
@@ -1763,10 +2013,10 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x7de010a49d52cd3f",
+                    "0x7e78d934d8cbe914",
                     "0x"
                 ],
-                "gasLimit": "7,000,000"
+                "gasLimit": "7000000"
             },
             "expect": {
                 "out": [],
@@ -1784,10 +2034,10 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xb27799264f3b84ec",
+                    "0xcab5f81fa7ed76c5",
                     "0x"
                 ],
-                "gasLimit": "7,000,000"
+                "gasLimit": "7000000"
             },
             "expect": {
                 "out": [],
@@ -1805,10 +2055,10 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x53d7a1ade83e0f2e",
+                    "0xa1c11f307f475407",
                     "0x"
                 ],
-                "gasLimit": "7,000,000"
+                "gasLimit": "7000000"
             },
             "expect": {
                 "out": [],
@@ -1826,10 +2076,10 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x2ec40e01673b8ad7",
+                    "0x3d31969d1151c04f",
                     "0x"
                 ],
-                "gasLimit": "7,000,000"
+                "gasLimit": "7000000"
             },
             "expect": {
                 "out": [],
@@ -1847,10 +2097,10 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xfb616537f76f8ffb",
+                    "0x70e5ba8e10447c0f",
                     "0x"
                 ],
-                "gasLimit": "7,000,000"
+                "gasLimit": "7000000"
             },
             "expect": {
                 "out": [],
@@ -1868,10 +2118,10 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x387268d229f4ec9a",
+                    "0x5878482af735946f",
                     "0x"
                 ],
-                "gasLimit": "7,000,000"
+                "gasLimit": "7000000"
             },
             "expect": {
                 "out": [],
@@ -1889,10 +2139,10 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xdea0f1c84325ea3a",
+                    "0x774e57e5529d626e",
                     "0x"
                 ],
-                "gasLimit": "7,000,000"
+                "gasLimit": "7000000"
             },
             "expect": {
                 "out": [],
@@ -1910,10 +2160,10 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x12eb7cb637de6e86",
+                    "0x7951f44d98cad889",
                     "0x"
                 ],
-                "gasLimit": "7,000,000"
+                "gasLimit": "7000000"
             },
             "expect": {
                 "out": [],
@@ -1931,10 +2181,10 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x5f6b1784511d622d",
+                    "0x20e57ce554e6a0c8",
                     "0x"
                 ],
-                "gasLimit": "7,000,000"
+                "gasLimit": "7000000"
             },
             "expect": {
                 "out": [],
@@ -1952,10 +2202,10 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x1a41106366209d8d",
+                    "0x431ead02eae57c1e",
                     "0x"
                 ],
-                "gasLimit": "7,000,000"
+                "gasLimit": "7000000"
             },
             "expect": {
                 "out": [],
@@ -1973,10 +2223,10 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x2324bca02526fec9",
+                    "0x319b554fd55857a4",
                     "0x"
                 ],
-                "gasLimit": "7,000,000"
+                "gasLimit": "7000000"
             },
             "expect": {
                 "out": [],
@@ -1994,10 +2244,10 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xccf33fc47ef34300",
+                    "0xc3ee962102e52707",
                     "0x"
                 ],
-                "gasLimit": "7,000,000"
+                "gasLimit": "7000000"
             },
             "expect": {
                 "out": [],
@@ -2015,10 +2265,10 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xebfab26bff9c74a3",
+                    "0x23cdd9ee77b71dc4",
                     "0x"
                 ],
-                "gasLimit": "7,000,000"
+                "gasLimit": "7000000"
             },
             "expect": {
                 "out": [],
@@ -2036,10 +2286,10 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x116a45e410db659b",
+                    "0x9c12effd58d699f2",
                     "0x"
                 ],
-                "gasLimit": "7,000,000"
+                "gasLimit": "7000000"
             },
             "expect": {
                 "out": [],
@@ -2057,10 +2307,10 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xc9bddc2b06ba1f1e",
+                    "0xfa52a17507278e24",
                     "0x"
                 ],
-                "gasLimit": "7,000,000"
+                "gasLimit": "7000000"
             },
             "expect": {
                 "out": [],
@@ -2078,10 +2328,10 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xde7473b9bfdfe96c",
+                    "0x60910991c926dfed",
                     "0x"
                 ],
-                "gasLimit": "7,000,000"
+                "gasLimit": "7000000"
             },
             "expect": {
                 "out": [],
@@ -2099,10 +2349,10 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x91c2ff3a5c73267e",
+                    "0x159f8fabfe3eb103",
                     "0x"
                 ],
-                "gasLimit": "7,000,000"
+                "gasLimit": "7000000"
             },
             "expect": {
                 "out": [],
@@ -2120,10 +2370,10 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x95bb44dffc62bb47",
+                    "0x68e16aea50a1bb9f",
                     "0x"
                 ],
-                "gasLimit": "7,000,000"
+                "gasLimit": "7000000"
             },
             "expect": {
                 "out": [],
@@ -2141,10 +2391,10 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0x2f28d194b7659f9f",
+                    "0xb32212a8fecba6a0",
                     "0x"
                 ],
-                "gasLimit": "7,000,000"
+                "gasLimit": "7000000"
             },
             "expect": {
                 "out": [],
@@ -2162,10 +2412,10 @@
                     "0x45474c44",
                     "0x55534443",
                     "0x64",
-                    "0xc1bd397146f3353e",
+                    "0x51b503b1e0af13b6",
                     "0x"
                 ],
-                "gasLimit": "7,000,000"
+                "gasLimit": "7000000"
             },
             "expect": {
                 "out": [],
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 ac580ba522..da423aa5dc 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
@@ -36,7 +36,7 @@
             "expect": {
                 "out": [],
                 "status": "4",
-                "message": "str:storage decode error: input too long",
+                "message": "str:storage decode error (key: opt_addr): input too long",
                 "logs": "*",
                 "gas": "*",
                 "refund": "*"
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 4951776ea2..025d91127f 100644
--- a/contracts/feature-tests/basic-features/scenarios/codec_err.scen.json
+++ b/contracts/feature-tests/basic-features/scenarios/codec_err.scen.json
@@ -53,7 +53,7 @@
             "expect": {
                 "out": [],
                 "status": "4",
-                "message": "str:storage decode error: deliberate top decode error"
+                "message": "str:storage decode error (key: load_with_value_err): deliberate top decode error"
             }
         },
         {
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 d46e1a783a..6fb3ab0c59 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
@@ -33,7 +33,7 @@
             "expect": {
                 "out": [],
                 "status": "*",
-                "message": "str:storage decode error: argument out of range",
+                "message": "str:storage decode error (key: i64): argument out of range",
                 "logs": "*",
                 "gas": "*",
                 "refund": "*"
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 352c818b2a..81f66436e9 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
@@ -36,7 +36,7 @@
             "expect": {
                 "out": [],
                 "status": "4",
-                "message": "str:storage decode error: input too long",
+                "message": "str:storage decode error (key: opt_addr): input too long",
                 "logs": "*",
                 "gas": "*",
                 "refund": "*"
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 4bceff73de..c7597fd010 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
@@ -33,7 +33,7 @@
             "expect": {
                 "out": [],
                 "status": "4",
-                "message": "str:storage decode error: input too long",
+                "message": "str:storage decode error (key: u64): input too long",
                 "logs": "*",
                 "gas": "*",
                 "refund": "*"
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 677f74a60b..e74cc2ca90 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
@@ -33,7 +33,7 @@
             "expect": {
                 "out": [],
                 "status": "4",
-                "message": "str:storage decode error: input too long",
+                "message": "str:storage decode error (key: usize): input too long",
                 "logs": "*",
                 "gas": "*",
                 "refund": "*"
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 558a14c743..3370d3b55c 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
@@ -9,30 +9,6 @@
                 }
             }
         },
-        {
-            "step": "setState",
-            "accounts": {
-                "0x00000000000000006c8fc18b8e9f8e20089714856ee233b3902a591d0d5f2925": {
-                    "nonce": "0",
-                    "balance": "0",
-                    "esdt": {
-                        "str:COOL-123456": {
-                            "instances": [
-                                {
-                                    "nonce": "0",
-                                    "balance": "1000",
-                                    "royalties": "0",
-                                    "attributes": "0x"
-                                }
-                            ]
-                        }
-                    },
-                    "code": "file:../output/rust-testing-framework-tester.wasm",
-                    "codeMetadata": "0x0506",
-                    "developerRewards": "0"
-                }
-            }
-        },
         {
             "step": "checkState",
             "accounts": {
diff --git a/framework/base/src/contract_base/wrappers/storage_raw_wrapper.rs b/framework/base/src/contract_base/wrappers/storage_raw_wrapper.rs
index 22318e524f..7417d6ca52 100644
--- a/framework/base/src/contract_base/wrappers/storage_raw_wrapper.rs
+++ b/framework/base/src/contract_base/wrappers/storage_raw_wrapper.rs
@@ -2,6 +2,7 @@ use core::marker::PhantomData;
 
 use unwrap_infallible::UnwrapInfallible;
 
+use crate::api::HandleConstraints;
 use crate::codec::{TopDecode, TopEncode};
 
 use crate::{
@@ -67,7 +68,7 @@ where
 
         V::top_decode_or_handle_err(
             result_buffer,
-            StorageGetErrorHandler::<A>::new(key.get_raw_handle()),
+            StorageGetErrorHandler::<A>::new(key.get_handle().get_raw_handle_unchecked()),
         )
         .unwrap_infallible()
     }
diff --git a/framework/base/src/err_msg.rs b/framework/base/src/err_msg.rs
index f24878517b..13f9ca135a 100644
--- a/framework/base/src/err_msg.rs
+++ b/framework/base/src/err_msg.rs
@@ -22,7 +22,8 @@ pub const ARG_BAD_LENGTH_32: &str = "argument has wrong length: 32 bytes expecte
 pub const ARG_DECODE_ERROR_1: &str = "argument decode error (";
 pub const ARG_DECODE_ERROR_2: &str = "): ";
 pub const STORAGE_VALUE_OUT_OF_RANGE: &str = "storage value out of range";
-pub const STORAGE_DECODE_ERROR: &str = "storage decode error: ";
+pub const STORAGE_DECODE_ERROR_1: &str = "storage decode error (key: ";
+pub const STORAGE_DECODE_ERROR_2: &str = "): ";
 pub const STORAGE_ENCODE_ERROR: &str = "storage encode error: ";
 pub const STORAGE_KEY_ENCODE_ERROR: &str = "storage key encode error: ";
 pub const STORAGE_VALUE_EXCEEDS_BUFFER: &str = "storage value exceeds buffer";
diff --git a/framework/base/src/storage/storage_get.rs b/framework/base/src/storage/storage_get.rs
index d15142809b..85107896dd 100644
--- a/framework/base/src/storage/storage_get.rs
+++ b/framework/base/src/storage/storage_get.rs
@@ -188,10 +188,10 @@ where
 
     fn handle_error(&self, err: DecodeError) -> Self::HandledErr {
         let mut message_buffer =
-            ManagedBuffer::<M>::new_from_bytes(err_msg::STORAGE_DECODE_ERROR.as_bytes());
-        message_buffer.append_bytes(err.message_bytes());
-        message_buffer.append_bytes(b"at key: ");
+            ManagedBuffer::<M>::new_from_bytes(err_msg::STORAGE_DECODE_ERROR_1.as_bytes());
         M::managed_type_impl().mb_append(message_buffer.get_handle(), self.key.into());
+        message_buffer.append_bytes(err_msg::STORAGE_DECODE_ERROR_2.as_bytes());
+        message_buffer.append_bytes(err.message_bytes());
         M::error_api_impl().signal_error_from_buffer(message_buffer.get_handle())
     }
 }
diff --git a/framework/base/src/storage/storage_get_from_address.rs b/framework/base/src/storage/storage_get_from_address.rs
index 6b6ca7e282..972d803751 100644
--- a/framework/base/src/storage/storage_get_from_address.rs
+++ b/framework/base/src/storage/storage_get_from_address.rs
@@ -1,7 +1,6 @@
 use crate::{
     api::{
-        const_handles, use_raw_handle, ErrorApi, ManagedBufferApiImpl, ManagedTypeApi,
-        StaticVarApiImpl, StorageReadApi, StorageReadApiImpl,
+        const_handles, use_raw_handle, ErrorApi, HandleConstraints, ManagedBufferApiImpl, ManagedTypeApi, StaticVarApiImpl, StorageReadApi, StorageReadApiImpl
     },
     codec::*,
     types::{
@@ -148,7 +147,7 @@ where
     T: TopDecode,
     A: StorageReadApi + ManagedTypeApi + ErrorApi,
 {
-    let handle = key.get_raw_handle();
+    let handle = key.get_handle().get_raw_handle_unchecked();
     T::top_decode_or_handle_err(
         StorageGetFromAddressInput::new(addr, key),
         StorageGetErrorHandler::<A>::new(handle),

From 7a6b4ee4ed0624c461a3e96a186514586baf4272 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Wed, 26 Jun 2024 13:10:09 +0200
Subject: [PATCH 1036/1254] initial impl and quick test in adder

---
 .../adder/interact/src/basic_interact.rs      | 41 ++++++++
 .../adder/interact/src/basic_interact_cli.rs  |  9 ++
 framework/snippets/src/interactor_tx.rs       |  1 +
 .../interactor_tx/interactor_exec_upgrade.rs  | 96 +++++++++++++++++++
 4 files changed, 147 insertions(+)
 create mode 100644 framework/snippets/src/interactor_tx/interactor_exec_upgrade.rs

diff --git a/contracts/examples/adder/interact/src/basic_interact.rs b/contracts/examples/adder/interact/src/basic_interact.rs
index ee11ac5844..5534f33926 100644
--- a/contracts/examples/adder/interact/src/basic_interact.rs
+++ b/contracts/examples/adder/interact/src/basic_interact.rs
@@ -34,6 +34,9 @@ async fn main() {
         Some(basic_interact_cli::InteractCliCommand::Sum) => {
             basic_interact.print_sum().await;
         },
+        Some(basic_interact_cli::InteractCliCommand::Upgrade(args)) => {
+            basic_interact.upgrade(args.value).await
+        },
         None => {},
     }
 }
@@ -166,4 +169,42 @@ impl AdderInteract {
 
         println!("sum: {sum}");
     }
+
+    async fn upgrade(&mut self, new_value: u32) {
+        let response = self
+            .interactor
+            .tx()
+            .from(&self.wallet_address)
+            .typed(adder_proxy::AdderProxy)
+            .upgrade(new_value)
+            .code(&self.adder_code)
+            .returns(ReturnsResultUnmanaged)
+            .prepare_async()
+            .run()
+            .await;
+
+        let sum = self
+            .interactor
+            .query()
+            .to(self.state.current_adder_address())
+            .typed(adder_proxy::AdderProxy)
+            .sum()
+            .returns(ReturnsResultUnmanaged)
+            .prepare_async()
+            .run()
+            .await;
+        assert_eq!(sum, RustBigUint::from(new_value));
+
+        println!("response: {response:?}");
+    }
 }
+
+// #[tokio::test]
+// async fn test() {
+//     let mut basic_interact = AdderInteract::init().await;
+
+//     basic_interact.deploy().await;
+//     basic_interact.add(1u64).await;
+
+//     basic_interact.upgrade(7u32).await;
+// }
diff --git a/contracts/examples/adder/interact/src/basic_interact_cli.rs b/contracts/examples/adder/interact/src/basic_interact_cli.rs
index 8818c1bb60..d765130847 100644
--- a/contracts/examples/adder/interact/src/basic_interact_cli.rs
+++ b/contracts/examples/adder/interact/src/basic_interact_cli.rs
@@ -22,6 +22,8 @@ pub enum InteractCliCommand {
     MultiDeploy(MultiDeployArgs),
     #[command(name = "sum", about = "Print sum")]
     Sum,
+    #[command(name = "upgrade", about = "Upgrade contract")]
+    Upgrade(UpgradeArgs),
 }
 
 #[derive(Default, Clone, PartialEq, Eq, Debug, Args)]
@@ -31,6 +33,13 @@ pub struct AddArgs {
     pub value: u64,
 }
 
+#[derive(Default, Clone, PartialEq, Eq, Debug, Args)]
+pub struct UpgradeArgs {
+    /// The value to add
+    #[arg(short = 'v', long = "value", verbatim_doc_comment)]
+    pub value: u32,
+}
+
 #[derive(Default, Clone, PartialEq, Eq, Debug, Args)]
 pub struct MultiDeployArgs {
     /// The number of contracts to deploy
diff --git a/framework/snippets/src/interactor_tx.rs b/framework/snippets/src/interactor_tx.rs
index df84381dd8..43ff7b8652 100644
--- a/framework/snippets/src/interactor_tx.rs
+++ b/framework/snippets/src/interactor_tx.rs
@@ -9,6 +9,7 @@ mod interactor_prepare_async;
 mod interactor_query_call;
 mod interactor_query_env;
 mod interactor_query_step;
+mod interactor_exec_upgrade;
 
 pub use interactor_exec_env::InteractorEnvExec;
 pub use interactor_exec_step::InteractorExecStep;
diff --git a/framework/snippets/src/interactor_tx/interactor_exec_upgrade.rs b/framework/snippets/src/interactor_tx/interactor_exec_upgrade.rs
new file mode 100644
index 0000000000..359992bb3e
--- /dev/null
+++ b/framework/snippets/src/interactor_tx/interactor_exec_upgrade.rs
@@ -0,0 +1,96 @@
+use multiversx_sc_scenario::{
+    imports::{NotPayable, ScCallStep, TxToSpecified, UpgradeCall},
+    multiversx_sc::{
+        tuple_util::NestedTupleFlatten,
+        types::{
+            Code, DeployCall, RHListExec, Tx, TxBaseWithEnv, TxCodeValue, TxFromSpecified, TxGas,
+            TxPayment,
+        },
+    },
+    scenario::tx_to_step::{address_annotated, StepWrapper, TxToStep},
+    scenario_model::{ScDeployStep, TxResponse},
+    ScenarioTxEnvData,
+};
+
+use crate::Interactor;
+
+use super::{InteractorEnvExec, InteractorExecStep, InteractorPrepareAsync};
+
+impl<'w, From, Gas, CodeValue, RH> InteractorPrepareAsync
+    for Tx<
+        InteractorEnvExec<'w>,
+        From,
+        (),
+        NotPayable,
+        Gas,
+        UpgradeCall<InteractorEnvExec<'w>, Code<CodeValue>>,
+        RH,
+    >
+where
+    From: TxFromSpecified<InteractorEnvExec<'w>>,
+    Gas: TxGas<InteractorEnvExec<'w>>,
+    CodeValue: TxCodeValue<InteractorEnvExec<'w>>,
+    RH: RHListExec<TxResponse, InteractorEnvExec<'w>>,
+    RH::ListReturns: NestedTupleFlatten,
+{
+    type Exec = InteractorExecStep<'w, ScCallStep, RH>;
+
+    fn prepare_async(self) -> Self::Exec {
+        InteractorExecStep {
+            step_wrapper: self.tx_to_step(),
+        }
+    }
+}
+
+impl<'w, From, Gas, RH, CodeValue> TxToStep<InteractorEnvExec<'w>, RH>
+    for Tx<
+        InteractorEnvExec<'w>,
+        From,
+        (),
+        NotPayable,
+        Gas,
+        UpgradeCall<InteractorEnvExec<'w>, Code<CodeValue>>,
+        RH,
+    >
+where
+    From: TxFromSpecified<InteractorEnvExec<'w>>,
+    Gas: TxGas<InteractorEnvExec<'w>>,
+    CodeValue: TxCodeValue<InteractorEnvExec<'w>>,
+    RH: RHListExec<TxResponse, InteractorEnvExec<'w>>,
+    RH::ListReturns: NestedTupleFlatten,
+{
+    type Step = ScCallStep;
+
+    fn tx_to_step(self) -> StepWrapper<InteractorEnvExec<'w>, Self::Step, RH> {
+        let mut step = tx_to_sc_call_upgrade_step(&self.env, self.from, self.gas, self.data);
+        step.expect = Some(self.result_handler.list_tx_expect());
+
+        StepWrapper {
+            env: self.env,
+            step,
+            result_handler: self.result_handler,
+        }
+    }
+}
+
+pub fn tx_to_sc_call_upgrade_step<'a, 'w: 'a, From, Gas, CodeValue>(
+    env: &'a InteractorEnvExec<'w>,
+    from: From,
+    gas: Gas,
+    data: UpgradeCall<InteractorEnvExec<'w>, Code<CodeValue>>,
+) -> ScCallStep
+where
+    From: TxFromSpecified<InteractorEnvExec<'w>>,
+    Gas: TxGas<InteractorEnvExec<'w>>,
+    CodeValue: TxCodeValue<InteractorEnvExec<'w>>,
+{
+    let mut step = ScCallStep::new()
+        .from(address_annotated(env, &from))
+        .function("upgrade")
+        .gas_limit(gas.gas_value(env));
+    for arg in data.arg_buffer.iter_buffers() {
+        step.tx.arguments.push(arg.to_vec().into());
+    }
+
+    step
+}

From 6d5082b77a253af1cc9daf924508bf3d447dc69e Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 26 Jun 2024 17:26:33 +0300
Subject: [PATCH 1037/1254] ManagedDecimalSigned - initial implementation

---
 .../src/types/managed/wrapped/big_uint.rs     |   4 +
 .../types/managed/wrapped/managed_decimal.rs  |  57 +--
 .../managed_decimal/managed_decimal_signed.rs | 342 ++++++++++++++++++
 .../base/src/types/managed/wrapped/mod.rs     |   4 +-
 .../scenario/tests/managed_decimal_test.rs    |  28 +-
 5 files changed, 375 insertions(+), 60 deletions(-)
 create mode 100644 framework/base/src/types/managed/wrapped/managed_decimal/managed_decimal_signed.rs

diff --git a/framework/base/src/types/managed/wrapped/big_uint.rs b/framework/base/src/types/managed/wrapped/big_uint.rs
index 80d25db0a0..33f523d83d 100644
--- a/framework/base/src/types/managed/wrapped/big_uint.rs
+++ b/framework/base/src/types/managed/wrapped/big_uint.rs
@@ -86,6 +86,10 @@ impl<M: ManagedTypeApi> BigUint<M> {
         Self::set_value(temp.clone(), value);
         temp
     }
+
+    pub fn as_big_int(&self) -> &BigInt<M> {
+        &self.value
+    }
 }
 
 macro_rules! big_uint_conv_num {
diff --git a/framework/base/src/types/managed/wrapped/managed_decimal.rs b/framework/base/src/types/managed/wrapped/managed_decimal.rs
index 7fe2efbfe0..67ca11cb4e 100644
--- a/framework/base/src/types/managed/wrapped/managed_decimal.rs
+++ b/framework/base/src/types/managed/wrapped/managed_decimal.rs
@@ -2,19 +2,17 @@ mod decimals;
 mod managed_decimal_cmp;
 mod managed_decimal_macros;
 mod managed_decimal_operators;
+mod managed_decimal_signed;
 
 pub use decimals::{ConstDecimals, Decimals, NumDecimals};
 pub use managed_decimal_operators::MulToPrecision;
+pub use managed_decimal_signed::ManagedDecimalSigned;
 
 use crate::{
     abi::{TypeAbi, TypeAbiFrom, TypeName},
-    api::{
-        const_handles, use_raw_handle, BigFloatApiImpl, BigIntApiImpl, HandleConstraints,
-        ManagedBufferApiImpl, ManagedTypeApi,
-    },
+    api::{const_handles, use_raw_handle, BigFloatApiImpl, ManagedTypeApi},
     contract_base::ErrorHelper,
     formatter::{FormatBuffer, FormatByteReceiver, SCDisplay},
-    proxy_imports::{ManagedBuffer, ManagedType},
     types::{BigFloat, BigUint},
 };
 
@@ -134,11 +132,13 @@ impl<M: ManagedTypeApi, D: Decimals> ManagedDecimal<M, D> {
 
         debug_assert!(result > 0);
 
-        crate::types::math_util::logarithm_i64::ln_sub_decimals(&mut result, self.decimals.num_decimals());
+        crate::types::math_util::logarithm_i64::ln_sub_decimals(
+            &mut result,
+            self.decimals.num_decimals(),
+        );
 
         Some(result)
     }
-
 }
 
 impl<M: ManagedTypeApi, const DECIMALS: NumDecimals> ManagedDecimal<M, ConstDecimals<DECIMALS>> {
@@ -393,44 +393,11 @@ impl<M: ManagedTypeApi, const DECIMALS: NumDecimals> TypeAbi
 }
 impl<M: ManagedTypeApi, D: Decimals> SCDisplay for ManagedDecimal<M, D> {
     fn fmt<F: FormatByteReceiver>(&self, f: &mut F) {
-        let full_str_handle: M::ManagedBufferHandle =
-            use_raw_handle(const_handles::MBUF_TEMPORARY_1);
-        M::managed_type_impl()
-            .bi_to_string(self.data.value.handle.clone(), full_str_handle.clone());
-        let len = M::managed_type_impl().mb_len(full_str_handle.clone());
-        let nr_dec = self.decimals.num_decimals();
-
-        if len > nr_dec {
-            let temp_str_handle: M::ManagedBufferHandle =
-                use_raw_handle(const_handles::MBUF_TEMPORARY_2);
-            let _ = M::managed_type_impl().mb_copy_slice(
-                full_str_handle.clone(),
-                0,
-                len - nr_dec,
-                temp_str_handle.clone(),
-            );
-            f.append_managed_buffer(&ManagedBuffer::from_raw_handle(
-                temp_str_handle.get_raw_handle(),
-            ));
-            f.append_bytes(b".");
-            let _ = M::managed_type_impl().mb_copy_slice(
-                full_str_handle.clone(),
-                len - nr_dec,
-                nr_dec,
-                temp_str_handle.clone(),
-            );
-            f.append_managed_buffer(&ManagedBuffer::from_raw_handle(
-                temp_str_handle.get_raw_handle(),
-            ));
-        } else {
-            f.append_bytes(b"0.");
-            for _ in len..nr_dec {
-                f.append_bytes(b"0");
-            }
-            f.append_managed_buffer(&ManagedBuffer::from_raw_handle(
-                full_str_handle.get_raw_handle(),
-            ));
-        }
+        managed_decimal_signed::managed_decimal_fmt(
+            &self.data.value,
+            self.decimals.num_decimals(),
+            f,
+        );
     }
 }
 
diff --git a/framework/base/src/types/managed/wrapped/managed_decimal/managed_decimal_signed.rs b/framework/base/src/types/managed/wrapped/managed_decimal/managed_decimal_signed.rs
new file mode 100644
index 0000000000..8673b57680
--- /dev/null
+++ b/framework/base/src/types/managed/wrapped/managed_decimal/managed_decimal_signed.rs
@@ -0,0 +1,342 @@
+use crate::{
+    abi::{TypeAbi, TypeAbiFrom, TypeName},
+    api::{
+        const_handles, use_raw_handle, BigFloatApiImpl, BigIntApiImpl, HandleConstraints,
+        ManagedBufferApiImpl, ManagedTypeApi,
+    },
+    formatter::{FormatBuffer, FormatByteReceiver, SCDisplay},
+    types::{BigFloat, BigInt, BigUint, ManagedBuffer, ManagedType},
+};
+
+use alloc::string::ToString;
+use multiversx_sc_codec::{
+    DecodeError, DecodeErrorHandler, EncodeErrorHandler, NestedDecode, NestedDecodeInput,
+    NestedEncode, NestedEncodeOutput, TopDecode, TopDecodeInput, TopEncode, TopEncodeOutput,
+};
+
+use core::{cmp::Ordering, ops::Deref};
+
+use super::decimals::{ConstDecimals, Decimals, NumDecimals};
+use super::{ManagedBufferCachedBuilder, ManagedRef};
+
+#[derive(Clone)]
+pub struct ManagedDecimalSigned<M: ManagedTypeApi, D: Decimals> {
+    pub(crate) data: BigInt<M>,
+    pub(crate) decimals: D,
+}
+
+impl<M: ManagedTypeApi, D: Decimals> ManagedDecimalSigned<M, D> {
+    pub fn trunc(&self) -> BigInt<M> {
+        &self.data / self.decimals.scaling_factor().deref()
+    }
+
+    pub fn into_raw_units(&self) -> &BigInt<M> {
+        &self.data
+    }
+
+    pub fn from_raw_units(data: BigInt<M>, decimals: D) -> Self {
+        ManagedDecimalSigned { data, decimals }
+    }
+
+    pub fn scale(&self) -> usize {
+        self.decimals.num_decimals()
+    }
+
+    pub fn scaling_factor(&self) -> ManagedRef<'static, M, BigUint<M>> {
+        self.decimals.scaling_factor()
+    }
+
+    pub fn rescale<T: Decimals>(&self, scale_to: T) -> ManagedDecimalSigned<M, T>
+    where
+        M: ManagedTypeApi,
+    {
+        let from_num_decimals = self.decimals.num_decimals();
+        let scale_to_num_decimals = scale_to.num_decimals();
+
+        match from_num_decimals.cmp(&scale_to_num_decimals) {
+            Ordering::Less => {
+                let delta_decimals = scale_to_num_decimals - from_num_decimals;
+                let scaling_factor: &BigUint<M> = &delta_decimals.scaling_factor();
+                ManagedDecimalSigned::from_raw_units(&self.data * scaling_factor, scale_to)
+            },
+            Ordering::Equal => ManagedDecimalSigned::from_raw_units(self.data.clone(), scale_to),
+            Ordering::Greater => {
+                let delta_decimals = from_num_decimals - scale_to_num_decimals;
+                let scaling_factor: &BigUint<M> = &delta_decimals.scaling_factor();
+                ManagedDecimalSigned::from_raw_units(&self.data * scaling_factor, scale_to)
+            },
+        }
+    }
+
+    pub fn to_big_float(&self) -> BigFloat<M> {
+        let result = BigFloat::from_big_int(&self.data);
+        let temp_handle: M::BigFloatHandle = use_raw_handle(const_handles::BIG_FLOAT_TEMPORARY);
+        let denominator = self.decimals.scaling_factor::<M>();
+        M::managed_type_impl().bf_set_bi(temp_handle.clone(), denominator.handle);
+        M::managed_type_impl().bf_div(result.handle.clone(), result.handle.clone(), temp_handle);
+        result
+    }
+
+    pub fn from_big_float<T: Decimals>(
+        big_float: &BigFloat<M>,
+        num_decimals: T,
+    ) -> ManagedDecimalSigned<M, T> {
+        let scaling_factor: &BigUint<M> = &num_decimals.scaling_factor();
+        let magnitude = big_float.magnitude();
+
+        let scaled = &BigFloat::from(scaling_factor) * &magnitude;
+        let fixed_big_int = scaled.trunc();
+
+        ManagedDecimalSigned::from_raw_units(fixed_big_int, num_decimals)
+    }
+}
+
+impl<M: ManagedTypeApi, const DECIMALS: NumDecimals>
+    ManagedDecimalSigned<M, ConstDecimals<DECIMALS>>
+{
+    pub fn const_decimals_from_raw(data: BigInt<M>) -> Self {
+        ManagedDecimalSigned {
+            data,
+            decimals: ConstDecimals,
+        }
+    }
+}
+
+impl<M: ManagedTypeApi, const DECIMALS: NumDecimals> TopEncode
+    for ManagedDecimalSigned<M, ConstDecimals<DECIMALS>>
+{
+    #[inline]
+    fn top_encode_or_handle_err<O, H>(&self, output: O, h: H) -> Result<(), H::HandledErr>
+    where
+        O: TopEncodeOutput,
+        H: EncodeErrorHandler,
+    {
+        self.data.top_encode_or_handle_err(output, h)
+    }
+}
+
+impl<M: ManagedTypeApi, const DECIMALS: NumDecimals> TopDecode
+    for ManagedDecimalSigned<M, ConstDecimals<DECIMALS>>
+{
+    #[inline]
+    fn top_decode_or_handle_err<I, H>(input: I, h: H) -> Result<Self, H::HandledErr>
+    where
+        I: TopDecodeInput,
+        H: DecodeErrorHandler,
+    {
+        Ok(ManagedDecimalSigned::const_decimals_from_raw(
+            BigInt::top_decode_or_handle_err(input, h)?,
+        ))
+    }
+}
+
+impl<M: ManagedTypeApi, const DECIMALS: NumDecimals> NestedEncode
+    for ManagedDecimalSigned<M, ConstDecimals<DECIMALS>>
+{
+    #[inline]
+    fn dep_encode_or_handle_err<O, H>(&self, dest: &mut O, h: H) -> Result<(), H::HandledErr>
+    where
+        O: NestedEncodeOutput,
+        H: EncodeErrorHandler,
+    {
+        NestedEncode::dep_encode_or_handle_err(&self.data, dest, h)?;
+
+        Result::Ok(())
+    }
+}
+
+impl<M: ManagedTypeApi, const DECIMALS: NumDecimals> NestedDecode
+    for ManagedDecimalSigned<M, ConstDecimals<DECIMALS>>
+{
+    #[inline]
+    fn dep_decode_or_handle_err<I, H>(input: &mut I, h: H) -> Result<Self, H::HandledErr>
+    where
+        I: NestedDecodeInput,
+        H: DecodeErrorHandler,
+    {
+        Result::Ok(ManagedDecimalSigned::const_decimals_from_raw(
+            <BigInt<M> as NestedDecode>::dep_decode_or_handle_err(input, h)?,
+        ))
+    }
+}
+
+impl<M: ManagedTypeApi> NestedEncode for ManagedDecimalSigned<M, NumDecimals> {
+    fn dep_encode_or_handle_err<O, H>(&self, dest: &mut O, h: H) -> Result<(), H::HandledErr>
+    where
+        O: NestedEncodeOutput,
+        H: EncodeErrorHandler,
+    {
+        NestedEncode::dep_encode_or_handle_err(&self.data, dest, h)?;
+        NestedEncode::dep_encode_or_handle_err(&self.decimals, dest, h)?;
+
+        Result::Ok(())
+    }
+}
+
+impl<M: ManagedTypeApi> TopEncode for ManagedDecimalSigned<M, NumDecimals> {
+    #[inline]
+    fn top_encode_or_handle_err<O, H>(&self, output: O, h: H) -> Result<(), H::HandledErr>
+    where
+        O: TopEncodeOutput,
+        H: EncodeErrorHandler,
+    {
+        let mut buffer = output.start_nested_encode();
+        let dest = &mut buffer;
+        NestedEncode::dep_encode_or_handle_err(&self.data, dest, h)?;
+        NestedEncode::dep_encode_or_handle_err(&self.decimals, dest, h)?;
+
+        output.finalize_nested_encode(buffer);
+        Result::Ok(())
+    }
+}
+
+impl<M: ManagedTypeApi> NestedDecode for ManagedDecimalSigned<M, NumDecimals> {
+    #[inline]
+    fn dep_decode_or_handle_err<I, H>(input: &mut I, h: H) -> Result<Self, H::HandledErr>
+    where
+        I: NestedDecodeInput,
+        H: DecodeErrorHandler,
+    {
+        Result::Ok(ManagedDecimalSigned::from_raw_units(
+            <BigInt<M> as NestedDecode>::dep_decode_or_handle_err(input, h)?,
+            <NumDecimals as NestedDecode>::dep_decode_or_handle_err(input, h)?,
+        ))
+    }
+}
+
+impl<M: ManagedTypeApi> TopDecode for ManagedDecimalSigned<M, NumDecimals> {
+    #[inline]
+    fn top_decode_or_handle_err<I, H>(top_input: I, h: H) -> Result<Self, H::HandledErr>
+    where
+        I: TopDecodeInput,
+        H: DecodeErrorHandler,
+    {
+        let mut nested_buffer = top_input.into_nested_buffer();
+        let result = ManagedDecimalSigned::from_raw_units(
+            <BigInt<M> as NestedDecode>::dep_decode_or_handle_err(&mut nested_buffer, h)?,
+            <NumDecimals as NestedDecode>::dep_decode_or_handle_err(&mut nested_buffer, h)?,
+        );
+        if !NestedDecodeInput::is_depleted(&nested_buffer) {
+            return Result::Err(h.handle_error(DecodeError::INPUT_TOO_LONG));
+        }
+        Result::Ok(result)
+    }
+}
+
+impl<M: ManagedTypeApi, const DECIMALS: NumDecimals> From<BigInt<M>>
+    for ManagedDecimalSigned<M, ConstDecimals<DECIMALS>>
+{
+    fn from(mut value: BigInt<M>) -> Self {
+        let decimals = ConstDecimals;
+        value *= decimals.scaling_factor().deref().as_big_int();
+        ManagedDecimalSigned {
+            data: value,
+            decimals,
+        }
+    }
+}
+
+impl<M: ManagedTypeApi> TypeAbiFrom<Self> for ManagedDecimalSigned<M, NumDecimals> {}
+
+impl<M: ManagedTypeApi> TypeAbi for ManagedDecimalSigned<M, NumDecimals> {
+    type Unmanaged = Self;
+
+    fn type_name() -> TypeName {
+        TypeName::from("ManagedDecimalSigned<usize>")
+    }
+
+    fn is_variadic() -> bool {
+        false
+    }
+}
+
+impl<M: ManagedTypeApi, const DECIMALS: NumDecimals> TypeAbiFrom<Self>
+    for ManagedDecimalSigned<M, ConstDecimals<DECIMALS>>
+{
+}
+
+impl<M: ManagedTypeApi, const DECIMALS: NumDecimals> TypeAbi
+    for ManagedDecimalSigned<M, ConstDecimals<DECIMALS>>
+{
+    type Unmanaged = Self;
+
+    fn type_name() -> TypeName {
+        TypeName::from(alloc::format!("ManagedDecimalSigned<{}>", DECIMALS))
+    }
+
+    fn type_name_rust() -> TypeName {
+        TypeName::from(alloc::format!(
+            "ManagedDecimalSigned<$API, ConstDecimals<{}>>",
+            DECIMALS
+        ))
+    }
+
+    fn is_variadic() -> bool {
+        false
+    }
+}
+
+pub(super) fn managed_decimal_fmt<M: ManagedTypeApi, F: FormatByteReceiver>(
+    value: &BigInt<M>,
+    num_dec: NumDecimals,
+    f: &mut F,
+) {
+    let full_str_handle: M::ManagedBufferHandle = use_raw_handle(const_handles::MBUF_TEMPORARY_1);
+    M::managed_type_impl().bi_to_string(value.handle.clone(), full_str_handle.clone());
+    let len = M::managed_type_impl().mb_len(full_str_handle.clone());
+
+    if len > num_dec {
+        let temp_str_handle: M::ManagedBufferHandle =
+            use_raw_handle(const_handles::MBUF_TEMPORARY_2);
+        let _ = M::managed_type_impl().mb_copy_slice(
+            full_str_handle.clone(),
+            0,
+            len - num_dec,
+            temp_str_handle.clone(),
+        );
+        f.append_managed_buffer(&ManagedBuffer::from_raw_handle(
+            temp_str_handle.get_raw_handle(),
+        ));
+        f.append_bytes(b".");
+        let _ = M::managed_type_impl().mb_copy_slice(
+            full_str_handle.clone(),
+            len - num_dec,
+            num_dec,
+            temp_str_handle.clone(),
+        );
+        f.append_managed_buffer(&ManagedBuffer::from_raw_handle(
+            temp_str_handle.get_raw_handle(),
+        ));
+    } else {
+        f.append_bytes(b"0.");
+        for _ in len..num_dec {
+            f.append_bytes(b"0");
+        }
+        f.append_managed_buffer(&ManagedBuffer::from_raw_handle(
+            full_str_handle.get_raw_handle(),
+        ));
+    }
+}
+
+impl<M: ManagedTypeApi, D: Decimals> SCDisplay for ManagedDecimalSigned<M, D> {
+    fn fmt<F: FormatByteReceiver>(&self, f: &mut F) {
+        managed_decimal_fmt(&self.data, self.decimals.num_decimals(), f);
+    }
+}
+
+impl<M: ManagedTypeApi, D: Decimals> core::fmt::Display for ManagedDecimalSigned<M, D> {
+    fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
+        let mut result = ManagedBufferCachedBuilder::<M>::new_from_slice(&[]);
+        result.append_display(self);
+        core::fmt::Display::fmt(&result.into_managed_buffer(), f)
+    }
+}
+
+impl<M: ManagedTypeApi, D: Decimals> core::fmt::Debug for ManagedDecimalSigned<M, D> {
+    fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
+        f.debug_struct("ManagedDecimalSigned")
+            .field("handle", &self.data.handle.clone())
+            .field("number", &self.to_string())
+            .finish()
+    }
+}
diff --git a/framework/base/src/types/managed/wrapped/mod.rs b/framework/base/src/types/managed/wrapped/mod.rs
index 185cfd5d7d..3a45b7c151 100644
--- a/framework/base/src/types/managed/wrapped/mod.rs
+++ b/framework/base/src/types/managed/wrapped/mod.rs
@@ -36,7 +36,9 @@ pub use esdt_token_payment::{EsdtTokenPayment, EsdtTokenPaymentRefs, MultiEsdtPa
 pub use managed_address::ManagedAddress;
 pub(crate) use managed_byte_array::ManagedBufferSizeContext;
 pub use managed_byte_array::ManagedByteArray;
-pub use managed_decimal::{ConstDecimals, Decimals, ManagedDecimal, NumDecimals};
+pub use managed_decimal::{
+    ConstDecimals, Decimals, ManagedDecimal, ManagedDecimalSigned, NumDecimals,
+};
 pub use managed_option::ManagedOption;
 pub use managed_ref::ManagedRef;
 pub use managed_vec::ManagedVec;
diff --git a/framework/scenario/tests/managed_decimal_test.rs b/framework/scenario/tests/managed_decimal_test.rs
index ce02758e34..cc475ef6e4 100644
--- a/framework/scenario/tests/managed_decimal_test.rs
+++ b/framework/scenario/tests/managed_decimal_test.rs
@@ -146,22 +146,22 @@ fn test_encode_decode() {
     check_top_encode_decode(fixed_const, bytes);
 }
 
-#[test]
-fn test_managed_decimal_ln() {
-    let fixed = ManagedDecimal::<StaticApi, ConstDecimals<0>>::const_decimals_from_raw(
-        BigUint::from(23u64),
-    );
+// #[test]
+// fn test_managed_decimal_ln() {
+//     let fixed = ManagedDecimal::<StaticApi, ConstDecimals<0>>::const_decimals_from_raw(
+//         BigUint::from(23u64),
+//     );
 
-    let ln_fixed = fixed.ln(ConstDecimals::<10>); // precision of 10 decimal points
+//     let ln_fixed = fixed.ln(ConstDecimals::<10>); // precision of 10 decimal points
 
-    println!("{ln_fixed:?}");
-    assert_eq!(
-        ln_fixed,
-        ManagedDecimal::<StaticApi, ConstDecimals<10>>::const_decimals_from_raw(BigUint::from(
-            31355146488u64
-        ),)
-    );
-}
+//     println!("{ln_fixed:?}");
+//     assert_eq!(
+//         ln_fixed,
+//         ManagedDecimal::<StaticApi, ConstDecimals<10>>::const_decimals_from_raw(BigUint::from(
+//             31355146488u64
+//         ),)
+//     );
+// }
 
 // #[test]
 // fn test_managed_decimal_ln() {

From 7b87b9043f40ddb42f8d5bd2aa8de92848e2f753 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 27 Jun 2024 14:36:03 +0300
Subject: [PATCH 1038/1254] ManagedDecimal operators refactor

---
 .../types/managed/wrapped/managed_decimal.rs  |  34 ++-
 .../managed_decimal/managed_decimal_op_add.rs |  78 ++++++
 .../managed_decimal/managed_decimal_op_div.rs |  52 ++++
 .../managed_decimal/managed_decimal_op_mul.rs |  54 ++++
 .../managed_decimal/managed_decimal_op_sub.rs |  78 ++++++
 .../managed_decimal_operators.rs              | 238 ------------------
 tools/plotter/src/lib.rs                      |   5 +-
 7 files changed, 290 insertions(+), 249 deletions(-)
 create mode 100644 framework/base/src/types/managed/wrapped/managed_decimal/managed_decimal_op_add.rs
 create mode 100644 framework/base/src/types/managed/wrapped/managed_decimal/managed_decimal_op_div.rs
 create mode 100644 framework/base/src/types/managed/wrapped/managed_decimal/managed_decimal_op_mul.rs
 create mode 100644 framework/base/src/types/managed/wrapped/managed_decimal/managed_decimal_op_sub.rs
 delete mode 100644 framework/base/src/types/managed/wrapped/managed_decimal/managed_decimal_operators.rs

diff --git a/framework/base/src/types/managed/wrapped/managed_decimal.rs b/framework/base/src/types/managed/wrapped/managed_decimal.rs
index 67ca11cb4e..6cd167c7e6 100644
--- a/framework/base/src/types/managed/wrapped/managed_decimal.rs
+++ b/framework/base/src/types/managed/wrapped/managed_decimal.rs
@@ -1,11 +1,13 @@
 mod decimals;
 mod managed_decimal_cmp;
 mod managed_decimal_macros;
-mod managed_decimal_operators;
+mod managed_decimal_op_add;
+mod managed_decimal_op_div;
+mod managed_decimal_op_mul;
+mod managed_decimal_op_sub;
 mod managed_decimal_signed;
 
 pub use decimals::{ConstDecimals, Decimals, NumDecimals};
-pub use managed_decimal_operators::MulToPrecision;
 pub use managed_decimal_signed::ManagedDecimalSigned;
 
 use crate::{
@@ -53,28 +55,32 @@ impl<M: ManagedTypeApi, D: Decimals> ManagedDecimal<M, D> {
         self.decimals.scaling_factor()
     }
 
-    pub fn rescale<T: Decimals>(&self, scale_to: T) -> ManagedDecimal<M, T>
-    where
-        M: ManagedTypeApi,
-    {
+    pub(crate) fn rescale_data(&self, scale_to_num_decimals: NumDecimals) -> BigUint<M> {
         let from_num_decimals = self.decimals.num_decimals();
-        let scale_to_num_decimals = scale_to.num_decimals();
 
         match from_num_decimals.cmp(&scale_to_num_decimals) {
             Ordering::Less => {
                 let delta_decimals = scale_to_num_decimals - from_num_decimals;
                 let scaling_factor: &BigUint<M> = &delta_decimals.scaling_factor();
-                ManagedDecimal::from_raw_units(&self.data * scaling_factor, scale_to)
+                &self.data * scaling_factor
             },
-            Ordering::Equal => ManagedDecimal::from_raw_units(self.data.clone(), scale_to),
+            Ordering::Equal => self.data.clone(),
             Ordering::Greater => {
                 let delta_decimals = from_num_decimals - scale_to_num_decimals;
                 let scaling_factor: &BigUint<M> = &delta_decimals.scaling_factor();
-                ManagedDecimal::from_raw_units(&self.data * scaling_factor, scale_to)
+                &self.data * scaling_factor
             },
         }
     }
 
+    pub fn rescale<T: Decimals>(&self, scale_to: T) -> ManagedDecimal<M, T>
+    where
+        M: ManagedTypeApi,
+    {
+        let scale_to_num_decimals = scale_to.num_decimals();
+        ManagedDecimal::from_raw_units(self.rescale_data(scale_to_num_decimals), scale_to)
+    }
+
     pub fn to_big_float(&self) -> BigFloat<M> {
         let result = BigFloat::from_big_uint(&self.data);
         let temp_handle: M::BigFloatHandle = use_raw_handle(const_handles::BIG_FLOAT_TEMPORARY);
@@ -149,6 +155,14 @@ impl<M: ManagedTypeApi, const DECIMALS: NumDecimals> ManagedDecimal<M, ConstDeci
         }
     }
 
+    /// Converts from constant (compile-time) number of decimals to a variable number of decimals.
+    pub fn into_var_decimals(self) -> ManagedDecimal<M, NumDecimals> {
+        ManagedDecimal {
+            data: self.data,
+            decimals: DECIMALS,
+        }
+    }
+
     // pub fn log(
     //     &self,
     //     target_base: &ManagedDecimal<M, D>,
diff --git a/framework/base/src/types/managed/wrapped/managed_decimal/managed_decimal_op_add.rs b/framework/base/src/types/managed/wrapped/managed_decimal/managed_decimal_op_add.rs
new file mode 100644
index 0000000000..5129a18dee
--- /dev/null
+++ b/framework/base/src/types/managed/wrapped/managed_decimal/managed_decimal_op_add.rs
@@ -0,0 +1,78 @@
+use crate::{
+    api::ManagedTypeApi,
+    types::{ConstDecimals, Decimals, ManagedDecimal, NumDecimals},
+};
+
+use core::ops::{Add, AddAssign};
+
+impl<M: ManagedTypeApi, D1: Decimals, D2: Decimals> AddAssign<&ManagedDecimal<M, D2>>
+    for ManagedDecimal<M, D1>
+{
+    fn add_assign(&mut self, rhs: &ManagedDecimal<M, D2>) {
+        let scaled_data = rhs.rescale_data(self.scale().num_decimals());
+        self.data += scaled_data;
+    }
+}
+
+impl<M: ManagedTypeApi, D1: Decimals, D2: Decimals> AddAssign<ManagedDecimal<M, D2>>
+    for ManagedDecimal<M, D1>
+{
+    #[inline]
+    fn add_assign(&mut self, rhs: ManagedDecimal<M, D2>) {
+        self.add_assign(&rhs);
+    }
+}
+
+// const + const
+impl<M: ManagedTypeApi, const DECIMALS: NumDecimals> Add<ManagedDecimal<M, ConstDecimals<DECIMALS>>>
+    for ManagedDecimal<M, ConstDecimals<DECIMALS>>
+{
+    type Output = Self;
+
+    fn add(mut self, rhs: ManagedDecimal<M, ConstDecimals<DECIMALS>>) -> Self::Output {
+        self.data += rhs.data;
+        self
+    }
+}
+
+// var + var
+impl<M: ManagedTypeApi> Add<ManagedDecimal<M, NumDecimals>> for ManagedDecimal<M, NumDecimals> {
+    type Output = Self;
+
+    fn add(mut self, rhs: ManagedDecimal<M, NumDecimals>) -> Self::Output {
+        match self.decimals.cmp(&rhs.decimals) {
+            core::cmp::Ordering::Less => {
+                self = self.rescale(rhs.decimals);
+                self.data += rhs.data;
+            },
+            core::cmp::Ordering::Equal => self.data += rhs.data,
+            core::cmp::Ordering::Greater => {
+                let rhs_data = rhs.rescale_data(self.decimals);
+                self.data += rhs_data;
+            },
+        }
+        self
+    }
+}
+
+// var + const
+impl<const DECIMALS: usize, M: ManagedTypeApi> Add<ManagedDecimal<M, ConstDecimals<DECIMALS>>>
+    for ManagedDecimal<M, NumDecimals>
+{
+    type Output = ManagedDecimal<M, NumDecimals>;
+
+    fn add(self, rhs: ManagedDecimal<M, ConstDecimals<DECIMALS>>) -> Self::Output {
+        self + rhs.into_var_decimals()
+    }
+}
+
+// const + var
+impl<const DECIMALS: usize, M: ManagedTypeApi> Add<ManagedDecimal<M, NumDecimals>>
+    for ManagedDecimal<M, ConstDecimals<DECIMALS>>
+{
+    type Output = ManagedDecimal<M, NumDecimals>;
+
+    fn add(self, rhs: ManagedDecimal<M, NumDecimals>) -> Self::Output {
+        self.into_var_decimals() + rhs
+    }
+}
diff --git a/framework/base/src/types/managed/wrapped/managed_decimal/managed_decimal_op_div.rs b/framework/base/src/types/managed/wrapped/managed_decimal/managed_decimal_op_div.rs
new file mode 100644
index 0000000000..d68901c90e
--- /dev/null
+++ b/framework/base/src/types/managed/wrapped/managed_decimal/managed_decimal_op_div.rs
@@ -0,0 +1,52 @@
+use crate::{
+    api::ManagedTypeApi,
+    types::{BigUint, Decimals, ManagedDecimal, NumDecimals},
+};
+
+use core::ops::{Deref, Div, DivAssign, Sub};
+
+impl<M: ManagedTypeApi, D1: Decimals, D2: Decimals> DivAssign<&ManagedDecimal<M, D2>>
+    for ManagedDecimal<M, D1>
+{
+    fn div_assign(&mut self, rhs: &ManagedDecimal<M, D2>) {
+        self.data *= rhs.scaling_factor().deref();
+        self.data /= &rhs.data;
+    }
+}
+
+impl<M: ManagedTypeApi, D1: Decimals, D2: Decimals> DivAssign<ManagedDecimal<M, D2>>
+    for ManagedDecimal<M, D1>
+{
+    #[inline]
+    fn div_assign(&mut self, rhs: ManagedDecimal<M, D2>) {
+        self.div_assign(&rhs);
+    }
+}
+
+impl<M: ManagedTypeApi, D: Decimals> Div<NumDecimals> for ManagedDecimal<M, D> {
+    type Output = Self;
+
+    fn div(self, other: NumDecimals) -> Self::Output {
+        ManagedDecimal {
+            data: self.data / BigUint::from(other),
+            decimals: self.decimals,
+        }
+    }
+}
+
+impl<M: ManagedTypeApi, D1: Decimals, D2: Decimals> Div<ManagedDecimal<M, D2>>
+    for ManagedDecimal<M, D1>
+where
+    D1: Sub<D2>,
+    <D1 as Sub<D2>>::Output: Decimals,
+{
+    type Output = ManagedDecimal<M, <D1 as Sub<D2>>::Output>;
+
+    // maybe rescale to highest first
+    fn div(self, other: ManagedDecimal<M, D2>) -> Self::Output {
+        ManagedDecimal {
+            data: self.data / other.data,
+            decimals: self.decimals - other.decimals,
+        }
+    }
+}
diff --git a/framework/base/src/types/managed/wrapped/managed_decimal/managed_decimal_op_mul.rs b/framework/base/src/types/managed/wrapped/managed_decimal/managed_decimal_op_mul.rs
new file mode 100644
index 0000000000..758b57e3b2
--- /dev/null
+++ b/framework/base/src/types/managed/wrapped/managed_decimal/managed_decimal_op_mul.rs
@@ -0,0 +1,54 @@
+use crate::{
+    api::ManagedTypeApi,
+    types::{Decimals, ManagedDecimal},
+};
+
+use core::ops::{Add, Deref, Mul, MulAssign};
+
+impl<M: ManagedTypeApi, D1: Decimals, D2: Decimals> MulAssign<&ManagedDecimal<M, D2>>
+    for ManagedDecimal<M, D1>
+{
+    fn mul_assign(&mut self, rhs: &ManagedDecimal<M, D2>) {
+        self.data *= &rhs.data;
+        self.data /= rhs.scaling_factor().deref();
+    }
+}
+
+impl<M: ManagedTypeApi, D1: Decimals, D2: Decimals> MulAssign<ManagedDecimal<M, D2>>
+    for ManagedDecimal<M, D1>
+{
+    #[inline]
+    fn mul_assign(&mut self, rhs: ManagedDecimal<M, D2>) {
+        self.mul_assign(&rhs);
+    }
+}
+
+impl<M: ManagedTypeApi, D1: Decimals, D2: Decimals> Mul<ManagedDecimal<M, D2>>
+    for ManagedDecimal<M, D1>
+where
+    D1: Add<D2>,
+    <D1 as Add<D2>>::Output: Decimals,
+{
+    type Output = ManagedDecimal<M, <D1 as Add<D2>>::Output>;
+
+    fn mul(self, other: ManagedDecimal<M, D2>) -> Self::Output {
+        ManagedDecimal {
+            data: self.data * other.data,
+            decimals: self.decimals + other.decimals,
+        }
+    }
+}
+
+impl<M: ManagedTypeApi, D1: Decimals> ManagedDecimal<M, D1> {
+    pub fn mul_with_precision<D2: Decimals, T: Decimals>(
+        self,
+        other: ManagedDecimal<M, D2>,
+        precision: T,
+    ) -> ManagedDecimal<M, T> {
+        let result = ManagedDecimal {
+            data: self.data * other.data,
+            decimals: self.decimals.num_decimals() + other.decimals.num_decimals(),
+        };
+        result.rescale(precision)
+    }
+}
diff --git a/framework/base/src/types/managed/wrapped/managed_decimal/managed_decimal_op_sub.rs b/framework/base/src/types/managed/wrapped/managed_decimal/managed_decimal_op_sub.rs
new file mode 100644
index 0000000000..76dbe1b2b2
--- /dev/null
+++ b/framework/base/src/types/managed/wrapped/managed_decimal/managed_decimal_op_sub.rs
@@ -0,0 +1,78 @@
+use crate::{
+    api::ManagedTypeApi,
+    types::{ConstDecimals, Decimals, ManagedDecimal, NumDecimals},
+};
+
+use core::ops::{Sub, SubAssign};
+
+impl<M: ManagedTypeApi, D1: Decimals, D2: Decimals> SubAssign<&ManagedDecimal<M, D2>>
+    for ManagedDecimal<M, D1>
+{
+    fn sub_assign(&mut self, rhs: &ManagedDecimal<M, D2>) {
+        let scaled_data = rhs.rescale_data(self.scale().num_decimals());
+        self.data -= scaled_data;
+    }
+}
+
+impl<M: ManagedTypeApi, D1: Decimals, D2: Decimals> SubAssign<ManagedDecimal<M, D2>>
+    for ManagedDecimal<M, D1>
+{
+    #[inline]
+    fn sub_assign(&mut self, rhs: ManagedDecimal<M, D2>) {
+        self.sub_assign(&rhs);
+    }
+}
+
+// const + const
+impl<M: ManagedTypeApi, const DECIMALS: NumDecimals> Sub<ManagedDecimal<M, ConstDecimals<DECIMALS>>>
+    for ManagedDecimal<M, ConstDecimals<DECIMALS>>
+{
+    type Output = Self;
+
+    fn sub(mut self, rhs: ManagedDecimal<M, ConstDecimals<DECIMALS>>) -> Self::Output {
+        self.data -= rhs.data;
+        self
+    }
+}
+
+// var + var
+impl<M: ManagedTypeApi> Sub<ManagedDecimal<M, NumDecimals>> for ManagedDecimal<M, NumDecimals> {
+    type Output = Self;
+
+    fn sub(mut self, rhs: ManagedDecimal<M, NumDecimals>) -> Self::Output {
+        match self.decimals.cmp(&rhs.decimals) {
+            core::cmp::Ordering::Less => {
+                self = self.rescale(rhs.decimals);
+                self.data -= rhs.data;
+            },
+            core::cmp::Ordering::Equal => self.data -= rhs.data,
+            core::cmp::Ordering::Greater => {
+                let rhs_data = rhs.rescale_data(self.decimals);
+                self.data -= rhs_data;
+            },
+        }
+        self
+    }
+}
+
+// var + const
+impl<const DECIMALS: usize, M: ManagedTypeApi> Sub<ManagedDecimal<M, ConstDecimals<DECIMALS>>>
+    for ManagedDecimal<M, NumDecimals>
+{
+    type Output = ManagedDecimal<M, NumDecimals>;
+
+    fn sub(self, rhs: ManagedDecimal<M, ConstDecimals<DECIMALS>>) -> Self::Output {
+        self - rhs.into_var_decimals()
+    }
+}
+
+// const + var
+impl<const DECIMALS: usize, M: ManagedTypeApi> Sub<ManagedDecimal<M, NumDecimals>>
+    for ManagedDecimal<M, ConstDecimals<DECIMALS>>
+{
+    type Output = ManagedDecimal<M, NumDecimals>;
+
+    fn sub(self, rhs: ManagedDecimal<M, NumDecimals>) -> Self::Output {
+        self.into_var_decimals() - rhs
+    }
+}
diff --git a/framework/base/src/types/managed/wrapped/managed_decimal/managed_decimal_operators.rs b/framework/base/src/types/managed/wrapped/managed_decimal/managed_decimal_operators.rs
deleted file mode 100644
index 18c577ef27..0000000000
--- a/framework/base/src/types/managed/wrapped/managed_decimal/managed_decimal_operators.rs
+++ /dev/null
@@ -1,238 +0,0 @@
-use crate::{
-    api::ManagedTypeApi,
-    types::{BigUint, ConstDecimals, Decimals, ManagedDecimal, NumDecimals},
-};
-
-use core::ops::{Add, AddAssign, Div, Mul, Sub, SubAssign};
-
-impl<M: ManagedTypeApi, const DECIMALS: NumDecimals> Add<ManagedDecimal<M, ConstDecimals<DECIMALS>>>
-    for ManagedDecimal<M, ConstDecimals<DECIMALS>>
-{
-    type Output = Self;
-
-    fn add(self, other: ManagedDecimal<M, ConstDecimals<DECIMALS>>) -> Self::Output {
-        ManagedDecimal::const_decimals_from_raw(self.data + other.data)
-    }
-}
-
-impl<M: ManagedTypeApi, const DECIMALS: NumDecimals> Sub<ManagedDecimal<M, ConstDecimals<DECIMALS>>>
-    for ManagedDecimal<M, ConstDecimals<DECIMALS>>
-{
-    type Output = Self;
-
-    fn sub(self, other: ManagedDecimal<M, ConstDecimals<DECIMALS>>) -> Self::Output {
-        ManagedDecimal::const_decimals_from_raw(self.data - other.data)
-    }
-}
-
-impl<M: ManagedTypeApi> Add<ManagedDecimal<M, NumDecimals>> for ManagedDecimal<M, NumDecimals> {
-    type Output = Self;
-
-    fn add(self, other: ManagedDecimal<M, NumDecimals>) -> Self::Output {
-        let scaled = other.rescale(self.scale());
-        ManagedDecimal::from_raw_units(&self.data + &scaled.data, scaled.decimals)
-    }
-}
-
-impl<M: ManagedTypeApi> Sub<ManagedDecimal<M, NumDecimals>> for ManagedDecimal<M, NumDecimals> {
-    type Output = Self;
-
-    fn sub(self, other: ManagedDecimal<M, NumDecimals>) -> Self::Output {
-        let scaled = other.rescale(self.scale());
-        ManagedDecimal::from_raw_units(&self.data - &scaled.data, scaled.decimals)
-    }
-}
-
-impl<M: ManagedTypeApi, D1: Decimals, D2: Decimals> Mul<ManagedDecimal<M, D2>>
-    for ManagedDecimal<M, D1>
-where
-    D1: Add<D2>,
-    <D1 as Add<D2>>::Output: Decimals,
-{
-    type Output = ManagedDecimal<M, <D1 as Add<D2>>::Output>;
-
-    fn mul(self, other: ManagedDecimal<M, D2>) -> Self::Output {
-        ManagedDecimal {
-            data: self.data * other.data,
-            decimals: self.decimals + other.decimals,
-        }
-    }
-}
-
-impl<M: ManagedTypeApi, D1: Decimals, D2: Decimals> MulToPrecision<M, D2>
-    for ManagedDecimal<M, D1>
-{
-    fn mul_with_precision<T: Decimals>(
-        self,
-        other: ManagedDecimal<M, D2>,
-        precision: T,
-    ) -> ManagedDecimal<M, T> {
-        let scaled;
-        let new_data;
-        if self.decimals.num_decimals() >= other.decimals.num_decimals() {
-            scaled = other.rescale(self.scale());
-            new_data = self.data * scaled.data;
-        } else {
-            scaled = self.rescale(other.scale());
-            new_data = scaled.data * other.data;
-        }
-        ManagedDecimal {
-            data: new_data,
-            decimals: precision,
-        }
-    }
-}
-
-pub trait MulToPrecision<M: ManagedTypeApi, D: Decimals> {
-    fn mul_with_precision<T: Decimals>(
-        self,
-        other: ManagedDecimal<M, D>,
-        precision: T,
-    ) -> ManagedDecimal<M, T>;
-}
-
-impl<const DECIMALS: usize, M: ManagedTypeApi> Sub<ManagedDecimal<M, NumDecimals>>
-    for ManagedDecimal<M, ConstDecimals<DECIMALS>>
-{
-    type Output = ManagedDecimal<M, NumDecimals>;
-
-    fn sub(self, rhs: ManagedDecimal<M, NumDecimals>) -> Self::Output {
-        if DECIMALS >= rhs.decimals {
-            let scaled = rhs.rescale(self.scale());
-            ManagedDecimal {
-                data: self.data - scaled.data,
-                decimals: DECIMALS,
-            }
-        } else {
-            let scaled = self.rescale(rhs.scale());
-            ManagedDecimal {
-                data: scaled.data - rhs.data,
-                decimals: rhs.decimals,
-            }
-        }
-    }
-}
-
-impl<const DECIMALS: usize, M: ManagedTypeApi> Sub<ManagedDecimal<M, ConstDecimals<DECIMALS>>>
-    for ManagedDecimal<M, NumDecimals>
-{
-    type Output = Self;
-
-    fn sub(self, rhs: ManagedDecimal<M, ConstDecimals<DECIMALS>>) -> Self::Output {
-        if DECIMALS >= self.decimals {
-            let scaled = self.rescale(rhs.scale());
-            ManagedDecimal {
-                data: self.data - scaled.data,
-                decimals: DECIMALS,
-            }
-        } else {
-            let scaled = rhs.rescale(self.scale());
-            ManagedDecimal {
-                data: scaled.data - rhs.data,
-                decimals: self.decimals,
-            }
-        }
-    }
-}
-
-impl<const DECIMALS: usize, M: ManagedTypeApi> Add<ManagedDecimal<M, ConstDecimals<DECIMALS>>>
-    for ManagedDecimal<M, NumDecimals>
-{
-    type Output = Self;
-
-    fn add(self, other: ManagedDecimal<M, ConstDecimals<DECIMALS>>) -> Self::Output {
-        if DECIMALS >= self.decimals {
-            let scaled = self.rescale(other.scale());
-            ManagedDecimal {
-                data: self.data + scaled.data,
-                decimals: DECIMALS,
-            }
-        } else {
-            let scaled = other.rescale(self.scale());
-            ManagedDecimal {
-                data: scaled.data + other.data,
-                decimals: self.decimals,
-            }
-        }
-    }
-}
-
-impl<const DECIMALS: usize, M: ManagedTypeApi> Add<ManagedDecimal<M, NumDecimals>>
-    for ManagedDecimal<M, ConstDecimals<DECIMALS>>
-{
-    type Output = ManagedDecimal<M, NumDecimals>;
-
-    fn add(self, other: ManagedDecimal<M, NumDecimals>) -> Self::Output {
-        if DECIMALS >= other.decimals {
-            let scaled = other.rescale(self.scale());
-            ManagedDecimal {
-                data: self.data + scaled.data,
-                decimals: self.decimals.num_decimals(),
-            }
-        } else {
-            let scaled = self.rescale(other.scale());
-            ManagedDecimal {
-                data: scaled.data + other.data,
-                decimals: scaled.decimals,
-            }
-        }
-    }
-}
-
-impl<M: ManagedTypeApi, D: Decimals> Div<NumDecimals> for ManagedDecimal<M, D> {
-    type Output = Self;
-
-    fn div(self, other: NumDecimals) -> Self::Output {
-        ManagedDecimal {
-            data: self.data / BigUint::from(other),
-            decimals: self.decimals,
-        }
-    }
-}
-
-impl<M: ManagedTypeApi, D1: Decimals, D2: Decimals> Div<ManagedDecimal<M, D2>>
-    for ManagedDecimal<M, D1>
-where
-    D1: Sub<D2>,
-    <D1 as Sub<D2>>::Output: Decimals,
-{
-    type Output = ManagedDecimal<M, <D1 as Sub<D2>>::Output>;
-
-    // maybe rescale to highest first
-    fn div(self, other: ManagedDecimal<M, D2>) -> Self::Output {
-        ManagedDecimal {
-            data: self.data / other.data,
-            decimals: self.decimals - other.decimals,
-        }
-    }
-}
-
-impl<M: ManagedTypeApi, const DECIMALS: usize> SubAssign
-    for ManagedDecimal<M, ConstDecimals<DECIMALS>>
-{
-    fn sub_assign(&mut self, rhs: Self) {
-        if DECIMALS >= rhs.decimals.num_decimals() {
-            let scaled = rhs.rescale(self.scale());
-            self.data -= scaled.data;
-        } else {
-            let scaled = self.rescale(rhs.scale());
-            self.data -= scaled.data;
-            self.decimals = rhs.decimals;
-        }
-    }
-}
-
-impl<M: ManagedTypeApi, const DECIMALS: usize> AddAssign
-    for ManagedDecimal<M, ConstDecimals<DECIMALS>>
-{
-    fn add_assign(&mut self, rhs: Self) {
-        if DECIMALS >= rhs.decimals.num_decimals() {
-            let scaled = rhs.rescale(self.scale());
-            self.data += scaled.data;
-        } else {
-            let scaled = self.rescale(rhs.scale());
-            self.data = scaled.data + rhs.data;
-            self.decimals = rhs.decimals;
-        }
-    }
-}
diff --git a/tools/plotter/src/lib.rs b/tools/plotter/src/lib.rs
index f57dde6e33..2bd3d55445 100644
--- a/tools/plotter/src/lib.rs
+++ b/tools/plotter/src/lib.rs
@@ -53,7 +53,10 @@ impl Chart {
         })
     }
 
-    pub fn ln_managed_decimal_error(canvas: HtmlCanvasElement, max_x: f32) -> Result<Chart, JsValue> {
+    pub fn ln_managed_decimal_error(
+        canvas: HtmlCanvasElement,
+        max_x: f32,
+    ) -> Result<Chart, JsValue> {
         let map_coord =
             logarithm_md::draw_md_error(canvas, max_x).map_err(|err| err.to_string())?;
         Ok(Chart {

From 4f69193fd9d3f4e3b9e09944c4d38a2c98a76305 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 27 Jun 2024 17:34:58 +0300
Subject: [PATCH 1039/1254] ManagedDecimalSigned operators

---
 .../types/managed/wrapped/managed_decimal.rs  |  4 +
 .../managed_decimal_op_add_signed.rs          | 81 +++++++++++++++++++
 .../managed_decimal/managed_decimal_op_div.rs |  1 -
 .../managed_decimal_op_div_signed.rs          | 51 ++++++++++++
 .../managed_decimal_op_mul_signed.rs          | 54 +++++++++++++
 .../managed_decimal_op_sub_signed.rs          | 81 +++++++++++++++++++
 .../managed_decimal/managed_decimal_signed.rs | 28 +++++--
 7 files changed, 291 insertions(+), 9 deletions(-)
 create mode 100644 framework/base/src/types/managed/wrapped/managed_decimal/managed_decimal_op_add_signed.rs
 create mode 100644 framework/base/src/types/managed/wrapped/managed_decimal/managed_decimal_op_div_signed.rs
 create mode 100644 framework/base/src/types/managed/wrapped/managed_decimal/managed_decimal_op_mul_signed.rs
 create mode 100644 framework/base/src/types/managed/wrapped/managed_decimal/managed_decimal_op_sub_signed.rs

diff --git a/framework/base/src/types/managed/wrapped/managed_decimal.rs b/framework/base/src/types/managed/wrapped/managed_decimal.rs
index 6cd167c7e6..232e43cb52 100644
--- a/framework/base/src/types/managed/wrapped/managed_decimal.rs
+++ b/framework/base/src/types/managed/wrapped/managed_decimal.rs
@@ -2,9 +2,13 @@ mod decimals;
 mod managed_decimal_cmp;
 mod managed_decimal_macros;
 mod managed_decimal_op_add;
+mod managed_decimal_op_add_signed;
 mod managed_decimal_op_div;
+mod managed_decimal_op_div_signed;
 mod managed_decimal_op_mul;
+mod managed_decimal_op_mul_signed;
 mod managed_decimal_op_sub;
+mod managed_decimal_op_sub_signed;
 mod managed_decimal_signed;
 
 pub use decimals::{ConstDecimals, Decimals, NumDecimals};
diff --git a/framework/base/src/types/managed/wrapped/managed_decimal/managed_decimal_op_add_signed.rs b/framework/base/src/types/managed/wrapped/managed_decimal/managed_decimal_op_add_signed.rs
new file mode 100644
index 0000000000..20247e3c38
--- /dev/null
+++ b/framework/base/src/types/managed/wrapped/managed_decimal/managed_decimal_op_add_signed.rs
@@ -0,0 +1,81 @@
+use crate::{
+    api::ManagedTypeApi,
+    types::{ConstDecimals, Decimals, ManagedDecimalSigned, NumDecimals},
+};
+
+use core::ops::{Add, AddAssign};
+
+impl<M: ManagedTypeApi, D1: Decimals, D2: Decimals> AddAssign<&ManagedDecimalSigned<M, D2>>
+    for ManagedDecimalSigned<M, D1>
+{
+    fn add_assign(&mut self, rhs: &ManagedDecimalSigned<M, D2>) {
+        let scaled_data = rhs.rescale_data(self.scale().num_decimals());
+        self.data += scaled_data;
+    }
+}
+
+impl<M: ManagedTypeApi, D1: Decimals, D2: Decimals> AddAssign<ManagedDecimalSigned<M, D2>>
+    for ManagedDecimalSigned<M, D1>
+{
+    #[inline]
+    fn add_assign(&mut self, rhs: ManagedDecimalSigned<M, D2>) {
+        self.add_assign(&rhs);
+    }
+}
+
+// const + const
+impl<M: ManagedTypeApi, const DECIMALS: NumDecimals>
+    Add<ManagedDecimalSigned<M, ConstDecimals<DECIMALS>>>
+    for ManagedDecimalSigned<M, ConstDecimals<DECIMALS>>
+{
+    type Output = Self;
+
+    fn add(mut self, rhs: ManagedDecimalSigned<M, ConstDecimals<DECIMALS>>) -> Self::Output {
+        self.data += rhs.data;
+        self
+    }
+}
+
+// var + var
+impl<M: ManagedTypeApi> Add<ManagedDecimalSigned<M, NumDecimals>>
+    for ManagedDecimalSigned<M, NumDecimals>
+{
+    type Output = Self;
+
+    fn add(mut self, rhs: ManagedDecimalSigned<M, NumDecimals>) -> Self::Output {
+        match self.decimals.cmp(&rhs.decimals) {
+            core::cmp::Ordering::Less => {
+                self = self.rescale(rhs.decimals);
+                self.data += rhs.data;
+            },
+            core::cmp::Ordering::Equal => self.data += rhs.data,
+            core::cmp::Ordering::Greater => {
+                let rhs_data = rhs.rescale_data(self.decimals);
+                self.data += rhs_data;
+            },
+        }
+        self
+    }
+}
+
+// var + const
+impl<const DECIMALS: usize, M: ManagedTypeApi> Add<ManagedDecimalSigned<M, ConstDecimals<DECIMALS>>>
+    for ManagedDecimalSigned<M, NumDecimals>
+{
+    type Output = ManagedDecimalSigned<M, NumDecimals>;
+
+    fn add(self, rhs: ManagedDecimalSigned<M, ConstDecimals<DECIMALS>>) -> Self::Output {
+        self + rhs.into_var_decimals()
+    }
+}
+
+// const + var
+impl<const DECIMALS: usize, M: ManagedTypeApi> Add<ManagedDecimalSigned<M, NumDecimals>>
+    for ManagedDecimalSigned<M, ConstDecimals<DECIMALS>>
+{
+    type Output = ManagedDecimalSigned<M, NumDecimals>;
+
+    fn add(self, rhs: ManagedDecimalSigned<M, NumDecimals>) -> Self::Output {
+        self.into_var_decimals() + rhs
+    }
+}
diff --git a/framework/base/src/types/managed/wrapped/managed_decimal/managed_decimal_op_div.rs b/framework/base/src/types/managed/wrapped/managed_decimal/managed_decimal_op_div.rs
index d68901c90e..50870dc9f4 100644
--- a/framework/base/src/types/managed/wrapped/managed_decimal/managed_decimal_op_div.rs
+++ b/framework/base/src/types/managed/wrapped/managed_decimal/managed_decimal_op_div.rs
@@ -42,7 +42,6 @@ where
 {
     type Output = ManagedDecimal<M, <D1 as Sub<D2>>::Output>;
 
-    // maybe rescale to highest first
     fn div(self, other: ManagedDecimal<M, D2>) -> Self::Output {
         ManagedDecimal {
             data: self.data / other.data,
diff --git a/framework/base/src/types/managed/wrapped/managed_decimal/managed_decimal_op_div_signed.rs b/framework/base/src/types/managed/wrapped/managed_decimal/managed_decimal_op_div_signed.rs
new file mode 100644
index 0000000000..c5c5b21775
--- /dev/null
+++ b/framework/base/src/types/managed/wrapped/managed_decimal/managed_decimal_op_div_signed.rs
@@ -0,0 +1,51 @@
+use crate::{
+    api::ManagedTypeApi,
+    types::{BigUint, Decimals, ManagedDecimalSigned, NumDecimals},
+};
+
+use core::ops::{Div, DivAssign, Sub};
+
+impl<M: ManagedTypeApi, D1: Decimals, D2: Decimals> DivAssign<&ManagedDecimalSigned<M, D2>>
+    for ManagedDecimalSigned<M, D1>
+{
+    fn div_assign(&mut self, rhs: &ManagedDecimalSigned<M, D2>) {
+        self.data *= rhs.scaling_factor().as_big_int();
+        self.data /= &rhs.data;
+    }
+}
+
+impl<M: ManagedTypeApi, D1: Decimals, D2: Decimals> DivAssign<ManagedDecimalSigned<M, D2>>
+    for ManagedDecimalSigned<M, D1>
+{
+    #[inline]
+    fn div_assign(&mut self, rhs: ManagedDecimalSigned<M, D2>) {
+        self.div_assign(&rhs);
+    }
+}
+
+impl<M: ManagedTypeApi, D: Decimals> Div<NumDecimals> for ManagedDecimalSigned<M, D> {
+    type Output = Self;
+
+    fn div(self, other: NumDecimals) -> Self::Output {
+        ManagedDecimalSigned {
+            data: self.data / BigUint::from(other),
+            decimals: self.decimals,
+        }
+    }
+}
+
+impl<M: ManagedTypeApi, D1: Decimals, D2: Decimals> Div<ManagedDecimalSigned<M, D2>>
+    for ManagedDecimalSigned<M, D1>
+where
+    D1: Sub<D2>,
+    <D1 as Sub<D2>>::Output: Decimals,
+{
+    type Output = ManagedDecimalSigned<M, <D1 as Sub<D2>>::Output>;
+
+    fn div(self, other: ManagedDecimalSigned<M, D2>) -> Self::Output {
+        ManagedDecimalSigned {
+            data: self.data / other.data,
+            decimals: self.decimals - other.decimals,
+        }
+    }
+}
diff --git a/framework/base/src/types/managed/wrapped/managed_decimal/managed_decimal_op_mul_signed.rs b/framework/base/src/types/managed/wrapped/managed_decimal/managed_decimal_op_mul_signed.rs
new file mode 100644
index 0000000000..be8a3f7145
--- /dev/null
+++ b/framework/base/src/types/managed/wrapped/managed_decimal/managed_decimal_op_mul_signed.rs
@@ -0,0 +1,54 @@
+use crate::{
+    api::ManagedTypeApi,
+    types::{Decimals, ManagedDecimalSigned},
+};
+
+use core::ops::{Add, Mul, MulAssign};
+
+impl<M: ManagedTypeApi, D1: Decimals, D2: Decimals> MulAssign<&ManagedDecimalSigned<M, D2>>
+    for ManagedDecimalSigned<M, D1>
+{
+    fn mul_assign(&mut self, rhs: &ManagedDecimalSigned<M, D2>) {
+        self.data *= &rhs.data;
+        self.data /= rhs.scaling_factor().as_big_int();
+    }
+}
+
+impl<M: ManagedTypeApi, D1: Decimals, D2: Decimals> MulAssign<ManagedDecimalSigned<M, D2>>
+    for ManagedDecimalSigned<M, D1>
+{
+    #[inline]
+    fn mul_assign(&mut self, rhs: ManagedDecimalSigned<M, D2>) {
+        self.mul_assign(&rhs);
+    }
+}
+
+impl<M: ManagedTypeApi, D1: Decimals, D2: Decimals> Mul<ManagedDecimalSigned<M, D2>>
+    for ManagedDecimalSigned<M, D1>
+where
+    D1: Add<D2>,
+    <D1 as Add<D2>>::Output: Decimals,
+{
+    type Output = ManagedDecimalSigned<M, <D1 as Add<D2>>::Output>;
+
+    fn mul(self, other: ManagedDecimalSigned<M, D2>) -> Self::Output {
+        ManagedDecimalSigned {
+            data: self.data * other.data,
+            decimals: self.decimals + other.decimals,
+        }
+    }
+}
+
+impl<M: ManagedTypeApi, D1: Decimals> ManagedDecimalSigned<M, D1> {
+    pub fn mul_with_precision<D2: Decimals, T: Decimals>(
+        self,
+        other: ManagedDecimalSigned<M, D2>,
+        precision: T,
+    ) -> ManagedDecimalSigned<M, T> {
+        let result = ManagedDecimalSigned {
+            data: self.data * other.data,
+            decimals: self.decimals.num_decimals() + other.decimals.num_decimals(),
+        };
+        result.rescale(precision)
+    }
+}
diff --git a/framework/base/src/types/managed/wrapped/managed_decimal/managed_decimal_op_sub_signed.rs b/framework/base/src/types/managed/wrapped/managed_decimal/managed_decimal_op_sub_signed.rs
new file mode 100644
index 0000000000..14ad72e1c1
--- /dev/null
+++ b/framework/base/src/types/managed/wrapped/managed_decimal/managed_decimal_op_sub_signed.rs
@@ -0,0 +1,81 @@
+use crate::{
+    api::ManagedTypeApi,
+    types::{ConstDecimals, Decimals, ManagedDecimalSigned, NumDecimals},
+};
+
+use core::ops::{Sub, SubAssign};
+
+impl<M: ManagedTypeApi, D1: Decimals, D2: Decimals> SubAssign<&ManagedDecimalSigned<M, D2>>
+    for ManagedDecimalSigned<M, D1>
+{
+    fn sub_assign(&mut self, rhs: &ManagedDecimalSigned<M, D2>) {
+        let scaled_data = rhs.rescale_data(self.scale().num_decimals());
+        self.data -= scaled_data;
+    }
+}
+
+impl<M: ManagedTypeApi, D1: Decimals, D2: Decimals> SubAssign<ManagedDecimalSigned<M, D2>>
+    for ManagedDecimalSigned<M, D1>
+{
+    #[inline]
+    fn sub_assign(&mut self, rhs: ManagedDecimalSigned<M, D2>) {
+        self.sub_assign(&rhs);
+    }
+}
+
+// const + const
+impl<M: ManagedTypeApi, const DECIMALS: NumDecimals>
+    Sub<ManagedDecimalSigned<M, ConstDecimals<DECIMALS>>>
+    for ManagedDecimalSigned<M, ConstDecimals<DECIMALS>>
+{
+    type Output = Self;
+
+    fn sub(mut self, rhs: ManagedDecimalSigned<M, ConstDecimals<DECIMALS>>) -> Self::Output {
+        self.data -= rhs.data;
+        self
+    }
+}
+
+// var + var
+impl<M: ManagedTypeApi> Sub<ManagedDecimalSigned<M, NumDecimals>>
+    for ManagedDecimalSigned<M, NumDecimals>
+{
+    type Output = Self;
+
+    fn sub(mut self, rhs: ManagedDecimalSigned<M, NumDecimals>) -> Self::Output {
+        match self.decimals.cmp(&rhs.decimals) {
+            core::cmp::Ordering::Less => {
+                self = self.rescale(rhs.decimals);
+                self.data -= rhs.data;
+            },
+            core::cmp::Ordering::Equal => self.data -= rhs.data,
+            core::cmp::Ordering::Greater => {
+                let rhs_data = rhs.rescale_data(self.decimals);
+                self.data -= rhs_data;
+            },
+        }
+        self
+    }
+}
+
+// var + const
+impl<const DECIMALS: usize, M: ManagedTypeApi> Sub<ManagedDecimalSigned<M, ConstDecimals<DECIMALS>>>
+    for ManagedDecimalSigned<M, NumDecimals>
+{
+    type Output = ManagedDecimalSigned<M, NumDecimals>;
+
+    fn sub(self, rhs: ManagedDecimalSigned<M, ConstDecimals<DECIMALS>>) -> Self::Output {
+        self - rhs.into_var_decimals()
+    }
+}
+
+// const + var
+impl<const DECIMALS: usize, M: ManagedTypeApi> Sub<ManagedDecimalSigned<M, NumDecimals>>
+    for ManagedDecimalSigned<M, ConstDecimals<DECIMALS>>
+{
+    type Output = ManagedDecimalSigned<M, NumDecimals>;
+
+    fn sub(self, rhs: ManagedDecimalSigned<M, NumDecimals>) -> Self::Output {
+        self.into_var_decimals() - rhs
+    }
+}
diff --git a/framework/base/src/types/managed/wrapped/managed_decimal/managed_decimal_signed.rs b/framework/base/src/types/managed/wrapped/managed_decimal/managed_decimal_signed.rs
index 8673b57680..a412ae9705 100644
--- a/framework/base/src/types/managed/wrapped/managed_decimal/managed_decimal_signed.rs
+++ b/framework/base/src/types/managed/wrapped/managed_decimal/managed_decimal_signed.rs
@@ -46,28 +46,32 @@ impl<M: ManagedTypeApi, D: Decimals> ManagedDecimalSigned<M, D> {
         self.decimals.scaling_factor()
     }
 
-    pub fn rescale<T: Decimals>(&self, scale_to: T) -> ManagedDecimalSigned<M, T>
-    where
-        M: ManagedTypeApi,
-    {
+    pub(crate) fn rescale_data(&self, scale_to_num_decimals: NumDecimals) -> BigInt<M> {
         let from_num_decimals = self.decimals.num_decimals();
-        let scale_to_num_decimals = scale_to.num_decimals();
 
         match from_num_decimals.cmp(&scale_to_num_decimals) {
             Ordering::Less => {
                 let delta_decimals = scale_to_num_decimals - from_num_decimals;
                 let scaling_factor: &BigUint<M> = &delta_decimals.scaling_factor();
-                ManagedDecimalSigned::from_raw_units(&self.data * scaling_factor, scale_to)
+                &self.data * &scaling_factor.value
             },
-            Ordering::Equal => ManagedDecimalSigned::from_raw_units(self.data.clone(), scale_to),
+            Ordering::Equal => self.data.clone(),
             Ordering::Greater => {
                 let delta_decimals = from_num_decimals - scale_to_num_decimals;
                 let scaling_factor: &BigUint<M> = &delta_decimals.scaling_factor();
-                ManagedDecimalSigned::from_raw_units(&self.data * scaling_factor, scale_to)
+                &self.data * &scaling_factor.value
             },
         }
     }
 
+    pub fn rescale<T: Decimals>(&self, scale_to: T) -> ManagedDecimalSigned<M, T>
+    where
+        M: ManagedTypeApi,
+    {
+        let scale_to_num_decimals = scale_to.num_decimals();
+        ManagedDecimalSigned::from_raw_units(self.rescale_data(scale_to_num_decimals), scale_to)
+    }
+
     pub fn to_big_float(&self) -> BigFloat<M> {
         let result = BigFloat::from_big_int(&self.data);
         let temp_handle: M::BigFloatHandle = use_raw_handle(const_handles::BIG_FLOAT_TEMPORARY);
@@ -100,6 +104,14 @@ impl<M: ManagedTypeApi, const DECIMALS: NumDecimals>
             decimals: ConstDecimals,
         }
     }
+
+    /// Converts from constant (compile-time) number of decimals to a variable number of decimals.
+    pub fn into_var_decimals(self) -> ManagedDecimalSigned<M, NumDecimals> {
+        ManagedDecimalSigned {
+            data: self.data,
+            decimals: DECIMALS,
+        }
+    }
 }
 
 impl<M: ManagedTypeApi, const DECIMALS: NumDecimals> TopEncode

From f4e0024a38a0c46053df5b6c91c58c8b705430f6 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 27 Jun 2024 17:40:33 +0300
Subject: [PATCH 1040/1254] ManagedDecimal - moved ln

---
 .../types/managed/wrapped/managed_decimal.rs  | 108 +---------------
 .../managed_decimal/managed_decimal_ln.rs     | 117 ++++++++++++++++++
 2 files changed, 118 insertions(+), 107 deletions(-)
 create mode 100644 framework/base/src/types/managed/wrapped/managed_decimal/managed_decimal_ln.rs

diff --git a/framework/base/src/types/managed/wrapped/managed_decimal.rs b/framework/base/src/types/managed/wrapped/managed_decimal.rs
index 232e43cb52..73e03858b0 100644
--- a/framework/base/src/types/managed/wrapped/managed_decimal.rs
+++ b/framework/base/src/types/managed/wrapped/managed_decimal.rs
@@ -1,5 +1,6 @@
 mod decimals;
 mod managed_decimal_cmp;
+mod managed_decimal_ln;
 mod managed_decimal_macros;
 mod managed_decimal_op_add;
 mod managed_decimal_op_add_signed;
@@ -17,7 +18,6 @@ pub use managed_decimal_signed::ManagedDecimalSigned;
 use crate::{
     abi::{TypeAbi, TypeAbiFrom, TypeName},
     api::{const_handles, use_raw_handle, BigFloatApiImpl, ManagedTypeApi},
-    contract_base::ErrorHelper,
     formatter::{FormatBuffer, FormatByteReceiver, SCDisplay},
     types::{BigFloat, BigUint},
 };
@@ -111,44 +111,6 @@ impl<M: ManagedTypeApi, D: Decimals> ManagedDecimal<M, D> {
             num_decimals,
         )
     }
-
-    pub fn nth_root(self, _root: ManagedDecimal<M, D>, _precision: D) -> ManagedDecimal<M, D> {
-        todo!()
-    }
-
-    /// Natural logarithm of a number.
-    ///
-    /// Returns `None` for 0.
-    ///
-    /// TODO: TEMP impl.
-    pub fn ln(&self) -> Option<i64> {
-        let bit_log2 = self.data.log2(); // aproximate, based on position of the most significant bit
-        if bit_log2 == u32::MAX {
-            // means the input was zero, TODO: change log2 return type
-            return None;
-        }
-
-        let scaling_factor_9 = ConstDecimals::<9>.scaling_factor();
-        let divisor = BigUint::from(1u64) << bit_log2 as usize;
-        let normalized = &self.data * &*scaling_factor_9 / divisor;
-
-        let x = normalized
-            .to_u64()
-            .unwrap_or_else(|| ErrorHelper::<M>::signal_error_with_message("ln internal error"))
-            as i64;
-
-        let mut result = crate::types::math_util::logarithm_i64::ln_polynomial(x);
-        crate::types::math_util::logarithm_i64::ln_add_bit_log2(&mut result, bit_log2);
-
-        debug_assert!(result > 0);
-
-        crate::types::math_util::logarithm_i64::ln_sub_decimals(
-            &mut result,
-            self.decimals.num_decimals(),
-        );
-
-        Some(result)
-    }
 }
 
 impl<M: ManagedTypeApi, const DECIMALS: NumDecimals> ManagedDecimal<M, ConstDecimals<DECIMALS>> {
@@ -166,74 +128,6 @@ impl<M: ManagedTypeApi, const DECIMALS: NumDecimals> ManagedDecimal<M, ConstDeci
             decimals: DECIMALS,
         }
     }
-
-    // pub fn log(
-    //     &self,
-    //     target_base: &ManagedDecimal<M, D>,
-    //     precision: D,
-    // ) -> ManagedDecimal<M, NumDecimals> {
-    //     let num_decimals = precision.num_decimals();
-    //     // should verify >= 1
-    //     let one = ManagedDecimal::from_raw_units(BigUint::from(1u64), 0usize);
-    //     one.rescale(self.scale());
-    //     assert!(self >= &one, "wrong input for self");
-    //     one.rescale(target_base.scale());
-    //     assert!(target_base >= &one, "wrong input for target base");
-
-    //     self.ln(&precision)
-    //         * ManagedDecimal::from_raw_units(BigUint::from(num_decimals), num_decimals)
-    //         / target_base.ln(&precision)
-    //     //this should be done with precision
-    // }
-
-    pub fn ln_temp<const PREC: usize>(
-        self,
-        precision: ConstDecimals<PREC>,
-    ) -> ManagedDecimal<M, ConstDecimals<PREC>> {
-        let num_decimals = self.decimals.num_decimals() as u32;
-        // find the highest power of 2 less than or equal to self
-        let log2 = self.data.log2() - num_decimals * BigUint::<M>::from(10u64).log2(); // most significant bit for the actual number
-        let divisor = 1 << log2;
-        let divisor_scaled =
-            BigUint::<M>::from(divisor as u64) * self.decimals.scaling_factor().clone_value();
-        let _normalized = self.data / divisor_scaled; // normalize to [1.0, 2.0]
-        let x_dec = ManagedDecimal::<M, ConstDecimals<0>>::const_decimals_from_raw(_normalized);
-        let x = x_dec.rescale(precision.clone());
-
-        // approximating polynom to get the result
-        let mut result = ManagedDecimal::<M, ConstDecimals<9>>::const_decimals_from_raw(
-            BigUint::from(56570851u64), // 0.056570851, 9 decimals˝
-        )
-        .mul_with_precision(x.clone(), precision.clone());
-        result = ManagedDecimal::<M, ConstDecimals<8>>::const_decimals_from_raw(BigUint::from(
-            44717955u64, // 0.44717955, 8 decimals
-        ))
-        .rescale(precision.clone())
-            - result;
-        result = result.mul_with_precision(x.clone(), precision.clone());
-        result -= ManagedDecimal::<M, ConstDecimals<7>>::const_decimals_from_raw(BigUint::from(
-            14699568u64, // 1.4699568, 7 decimals
-        ))
-        .rescale(precision.clone());
-        result = result.mul_with_precision(x.clone(), precision.clone());
-        result += ManagedDecimal::<M, ConstDecimals<7>>::const_decimals_from_raw(BigUint::from(
-            28212026u64, // 2.8212026, 7 decimals
-        ))
-        .rescale(precision.clone());
-        result = result.mul_with_precision(x.clone(), precision.clone());
-        result -= ManagedDecimal::<M, ConstDecimals<7>>::const_decimals_from_raw(BigUint::from(
-            17417939u64, // 1.7417939, 7 decimals
-        ))
-        .rescale(precision.clone());
-
-        let log_2 =
-            ManagedDecimal::<M, ConstDecimals<0>>::const_decimals_from_raw(BigUint::from(log2));
-        let ln_of_2 = ManagedDecimal::<M, ConstDecimals<8>>::const_decimals_from_raw(
-            BigUint::from(69314718u64),
-        ); // 0.69314718 8 decimals
-
-        result + log_2.mul_with_precision(ln_of_2, precision.clone())
-    }
 }
 
 impl<M: ManagedTypeApi, const DECIMALS: NumDecimals> TopEncode
diff --git a/framework/base/src/types/managed/wrapped/managed_decimal/managed_decimal_ln.rs b/framework/base/src/types/managed/wrapped/managed_decimal/managed_decimal_ln.rs
new file mode 100644
index 0000000000..94173fd5d2
--- /dev/null
+++ b/framework/base/src/types/managed/wrapped/managed_decimal/managed_decimal_ln.rs
@@ -0,0 +1,117 @@
+pub use super::decimals::{ConstDecimals, Decimals, NumDecimals};
+pub use super::managed_decimal_signed::ManagedDecimalSigned;
+use super::ManagedDecimal;
+
+use crate::{
+    abi::{TypeAbi, TypeAbiFrom, TypeName},
+    api::{const_handles, use_raw_handle, BigFloatApiImpl, ManagedTypeApi},
+    contract_base::ErrorHelper,
+    formatter::{FormatBuffer, FormatByteReceiver, SCDisplay},
+    types::{BigFloat, BigUint},
+};
+
+impl<M: ManagedTypeApi, D: Decimals> ManagedDecimal<M, D> {
+    /// Natural logarithm of a number.
+    ///
+    /// Returns `None` for 0.
+    ///
+    /// TODO: TEMP impl.
+    pub fn ln(&self) -> Option<i64> {
+        let bit_log2 = self.data.log2(); // aproximate, based on position of the most significant bit
+        if bit_log2 == u32::MAX {
+            // means the input was zero, TODO: change log2 return type
+            return None;
+        }
+
+        let scaling_factor_9 = ConstDecimals::<9>.scaling_factor();
+        let divisor = BigUint::from(1u64) << bit_log2 as usize;
+        let normalized = &self.data * &*scaling_factor_9 / divisor;
+
+        let x = normalized
+            .to_u64()
+            .unwrap_or_else(|| ErrorHelper::<M>::signal_error_with_message("ln internal error"))
+            as i64;
+
+        let mut result = crate::types::math_util::logarithm_i64::ln_polynomial(x);
+        crate::types::math_util::logarithm_i64::ln_add_bit_log2(&mut result, bit_log2);
+
+        debug_assert!(result > 0);
+
+        crate::types::math_util::logarithm_i64::ln_sub_decimals(
+            &mut result,
+            self.decimals.num_decimals(),
+        );
+
+        Some(result)
+    }
+}
+
+impl<M: ManagedTypeApi, const DECIMALS: NumDecimals> ManagedDecimal<M, ConstDecimals<DECIMALS>> {
+    // pub fn log(
+    //     &self,
+    //     target_base: &ManagedDecimal<M, D>,
+    //     precision: D,
+    // ) -> ManagedDecimal<M, NumDecimals> {
+    //     let num_decimals = precision.num_decimals();
+    //     // should verify >= 1
+    //     let one = ManagedDecimal::from_raw_units(BigUint::from(1u64), 0usize);
+    //     one.rescale(self.scale());
+    //     assert!(self >= &one, "wrong input for self");
+    //     one.rescale(target_base.scale());
+    //     assert!(target_base >= &one, "wrong input for target base");
+
+    //     self.ln(&precision)
+    //         * ManagedDecimal::from_raw_units(BigUint::from(num_decimals), num_decimals)
+    //         / target_base.ln(&precision)
+    //     //this should be done with precision
+    // }
+
+    pub fn ln_temp<const PREC: usize>(
+        self,
+        precision: ConstDecimals<PREC>,
+    ) -> ManagedDecimal<M, ConstDecimals<PREC>> {
+        let num_decimals = self.decimals.num_decimals() as u32;
+        // find the highest power of 2 less than or equal to self
+        let log2 = self.data.log2() - num_decimals * BigUint::<M>::from(10u64).log2(); // most significant bit for the actual number
+        let divisor = 1 << log2;
+        let divisor_scaled =
+            BigUint::<M>::from(divisor as u64) * self.decimals.scaling_factor().clone_value();
+        let _normalized = self.data / divisor_scaled; // normalize to [1.0, 2.0]
+        let x_dec = ManagedDecimal::<M, ConstDecimals<0>>::const_decimals_from_raw(_normalized);
+        let x = x_dec.rescale(precision.clone());
+
+        // approximating polynom to get the result
+        let mut result = ManagedDecimal::<M, ConstDecimals<9>>::const_decimals_from_raw(
+            BigUint::from(56570851u64), // 0.056570851, 9 decimals˝
+        )
+        .mul_with_precision(x.clone(), precision.clone());
+        result = ManagedDecimal::<M, ConstDecimals<8>>::const_decimals_from_raw(BigUint::from(
+            44717955u64, // 0.44717955, 8 decimals
+        ))
+        .rescale(precision.clone())
+            - result;
+        result = result.mul_with_precision(x.clone(), precision.clone());
+        result -= ManagedDecimal::<M, ConstDecimals<7>>::const_decimals_from_raw(BigUint::from(
+            14699568u64, // 1.4699568, 7 decimals
+        ))
+        .rescale(precision.clone());
+        result = result.mul_with_precision(x.clone(), precision.clone());
+        result += ManagedDecimal::<M, ConstDecimals<7>>::const_decimals_from_raw(BigUint::from(
+            28212026u64, // 2.8212026, 7 decimals
+        ))
+        .rescale(precision.clone());
+        result = result.mul_with_precision(x.clone(), precision.clone());
+        result -= ManagedDecimal::<M, ConstDecimals<7>>::const_decimals_from_raw(BigUint::from(
+            17417939u64, // 1.7417939, 7 decimals
+        ))
+        .rescale(precision.clone());
+
+        let log_2 =
+            ManagedDecimal::<M, ConstDecimals<0>>::const_decimals_from_raw(BigUint::from(log2));
+        let ln_of_2 = ManagedDecimal::<M, ConstDecimals<8>>::const_decimals_from_raw(
+            BigUint::from(69314718u64),
+        ); // 0.69314718 8 decimals
+
+        result + log_2.mul_with_precision(ln_of_2, precision.clone())
+    }
+}

From 137861ff128a21f92c3e332e1a576a9e19444c2c Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 28 Jun 2024 02:30:03 +0300
Subject: [PATCH 1041/1254] ManagedBuffer - ln cleanup, conversions

---
 .../src/big_float_operators_wrapped.rs        |   2 +-
 framework/base/src/err_msg.rs                 |   1 +
 .../base/src/types/managed/basic/big_float.rs |  37 ++++-
 .../base/src/types/managed/basic/big_int.rs   |  28 +++-
 .../src/types/managed/wrapped/big_uint.rs     |   4 +
 .../types/managed/wrapped/managed_decimal.rs  |  56 +++----
 .../managed_decimal/managed_decimal_ln.rs     | 152 ++++++------------
 .../managed_decimal/managed_decimal_signed.rs | 118 ++++++++++----
 tools/plotter/src/logarithm_bf.rs             |   7 +-
 tools/plotter/src/logarithm_bu.rs             |   4 +-
 tools/plotter/src/logarithm_md.rs             |  10 +-
 11 files changed, 225 insertions(+), 194 deletions(-)

diff --git a/contracts/feature-tests/big-float-features/src/big_float_operators_wrapped.rs b/contracts/feature-tests/big-float-features/src/big_float_operators_wrapped.rs
index 14cf56510d..f44ca95e5b 100644
--- a/contracts/feature-tests/big-float-features/src/big_float_operators_wrapped.rs
+++ b/contracts/feature-tests/big-float-features/src/big_float_operators_wrapped.rs
@@ -164,7 +164,7 @@ pub trait BigFloatWrappedOperators: big_float_operators::BigFloatOperators {
         &self,
         a: BigInt,
         precision: usize,
-    ) -> ManagedDecimal<Self::Api, usize> {
+    ) -> ManagedDecimalSigned<Self::Api, usize> {
         let number = self.ln_big_float_ref(&BigFloat::from(a));
         number.to_managed_decimal(precision)
     }
diff --git a/framework/base/src/err_msg.rs b/framework/base/src/err_msg.rs
index f24878517b..7432a5b5c5 100644
--- a/framework/base/src/err_msg.rs
+++ b/framework/base/src/err_msg.rs
@@ -38,6 +38,7 @@ pub const VALUE_EXCEEDS_SLICE: &str = "value exceeds target slice";
 pub const CAST_TO_I64_ERROR: &str = "cast to i64 error";
 pub const BIG_UINT_EXCEEDS_SLICE: &str = "big uint as_bytes exceed target slice";
 pub const BIG_UINT_SUB_NEGATIVE: &str = "cannot subtract because result would be negative";
+pub const BIG_UINT_NEGATIVE: &str = "cannot convert to unsigned, number is negative";
 
 pub const DESERIALIZATION_INVALID_BYTE: &str = "call data deserialization error: not a valid byte";
 pub const DESERIALIZATION_NOT_32_BYTES: &str =
diff --git a/framework/base/src/types/managed/basic/big_float.rs b/framework/base/src/types/managed/basic/big_float.rs
index b4c4d0ed39..a3d6cdc4b5 100644
--- a/framework/base/src/types/managed/basic/big_float.rs
+++ b/framework/base/src/types/managed/basic/big_float.rs
@@ -5,7 +5,8 @@ use crate::{
     api::{
         use_raw_handle, BigFloatApiImpl, ManagedTypeApi, ManagedTypeApiImpl, Sign, StaticVarApiImpl,
     },
-    types::{BigInt, BigUint, Decimals, ManagedDecimal, ManagedType},
+    contract_base::ErrorHelper,
+    types::{BigInt, BigUint, Decimals, ManagedDecimalSigned, ManagedType},
 };
 use alloc::string::String;
 
@@ -175,8 +176,8 @@ impl<M: ManagedTypeApi> BigFloat<M> {
         (self * denominator).trunc()
     }
 
-    pub fn to_managed_decimal<T: Decimals>(&self, decimals: T) -> ManagedDecimal<M, T> {
-        ManagedDecimal::<M, T>::from_big_float(self, decimals)
+    pub fn to_managed_decimal<T: Decimals>(&self, decimals: T) -> ManagedDecimalSigned<M, T> {
+        ManagedDecimalSigned::<M, T>::from_big_float(self, decimals)
     }
 
     /// Computes the natural logarithm of the current number.
@@ -242,9 +243,7 @@ impl<M: ManagedTypeApi> BigFloat<M> {
 
         result
     }
-}
 
-impl<M: ManagedTypeApi> BigFloat<M> {
     #[inline]
     pub fn zero() -> Self {
         BigFloat::from_handle(M::managed_type_impl().bf_new_zero())
@@ -304,6 +303,34 @@ impl<M: ManagedTypeApi> BigFloat<M> {
     }
 }
 
+impl<M: ManagedTypeApi> From<f64> for BigFloat<M> {
+    fn from(x: f64) -> Self {
+        const PREC: i64 = 1_000_000_000;
+        Self::from_frac((x * PREC as f64) as i64, PREC)
+    }
+}
+
+impl<M: ManagedTypeApi> From<f32> for BigFloat<M> {
+    fn from(x: f32) -> Self {
+        Self::from(x as f64)
+    }
+}
+
+impl<M: ManagedTypeApi> BigFloat<M> {
+    /// Warning: cannot be used in contracts. It is only meant to simplify certain tests.
+    ///
+    /// It might also not be optimal with respect to precision.
+    pub fn to_f64(&self) -> f64 {
+        const PREC: i64 = 1_000_000_000;
+        let mut rescaled = Self::from(PREC);
+        rescaled *= self;
+        let ln_units = rescaled.trunc().to_i64().unwrap_or_else(|| {
+            ErrorHelper::<M>::signal_error_with_message("BigFloat out of precision range")
+        });
+        ln_units as f64 / PREC as f64
+    }
+}
+
 impl<M: ManagedTypeApi> Clone for BigFloat<M> {
     fn clone(&self) -> Self {
         let new_handle: M::BigFloatHandle = use_raw_handle(M::static_var_api_impl().next_handle());
diff --git a/framework/base/src/types/managed/basic/big_int.rs b/framework/base/src/types/managed/basic/big_int.rs
index b837eaa108..9e6d932835 100644
--- a/framework/base/src/types/managed/basic/big_int.rs
+++ b/framework/base/src/types/managed/basic/big_int.rs
@@ -3,13 +3,14 @@ use core::{convert::TryInto, marker::PhantomData};
 use crate::{
     abi::{TypeAbiFrom, TypeName},
     api::{
-        const_handles, use_raw_handle, BigIntApiImpl, HandleConstraints, ManagedBufferApiImpl,
-        ManagedTypeApi, ManagedTypeApiImpl, RawHandle, StaticVarApiImpl,
+        const_handles, use_raw_handle, BigIntApiImpl, ErrorApiImpl, HandleConstraints,
+        ManagedBufferApiImpl, ManagedTypeApi, ManagedTypeApiImpl, RawHandle, StaticVarApiImpl,
     },
     codec::{
         DecodeErrorHandler, EncodeErrorHandler, NestedDecode, NestedDecodeInput, NestedEncode,
         NestedEncodeOutput, TopDecode, TopDecodeInput, TopEncode, TopEncodeOutput, TryStaticCast,
     },
+    err_msg,
     formatter::{hex_util::encode_bytes_as_hex, FormatByteReceiver, SCDisplay},
     types::{heap::BoxedBytes, BigUint, ManagedBuffer, ManagedOption, ManagedType, Sign},
 };
@@ -246,14 +247,35 @@ impl<M: ManagedTypeApi> BigInt<M> {
         (self.sign(), self.magnitude())
     }
 
+    /// Converts to an unsigned `BigUint`, without performing any checks.
+    ///
+    /// # Safety
+    ///
+    /// If the number is negative, undefined behavior might occur further down the execution.
+    pub unsafe fn into_big_uint_unchecked(self) -> BigUint<M> {
+        BigUint::from_handle(self.handle)
+    }
+
     /// Converts this `BigInt` into a `BigUint`, if it's not negative.
     pub fn into_big_uint(self) -> ManagedOption<M, BigUint<M>> {
         if let Sign::Minus = self.sign() {
             ManagedOption::none()
         } else {
-            ManagedOption::some(BigUint::from_handle(self.handle))
+            ManagedOption::some(unsafe { self.into_big_uint_unchecked() })
         }
     }
+
+    fn check_non_negative(&self) {
+        if M::managed_type_impl().bi_sign(self.handle.clone()) == crate::api::Sign::Minus {
+            M::error_api_impl().signal_error(err_msg::BIG_UINT_SUB_NEGATIVE.as_bytes());
+        }
+    }
+
+    /// Converts to an unsigned `BigUint`. Stops execution if number is negative.
+    pub fn into_big_uint_or_fail(self) -> BigUint<M> {
+        self.check_non_negative();
+        unsafe { self.into_big_uint_unchecked() }
+    }
 }
 
 impl<M: ManagedTypeApi> TryStaticCast for BigInt<M> {}
diff --git a/framework/base/src/types/managed/wrapped/big_uint.rs b/framework/base/src/types/managed/wrapped/big_uint.rs
index 33f523d83d..609af7b961 100644
--- a/framework/base/src/types/managed/wrapped/big_uint.rs
+++ b/framework/base/src/types/managed/wrapped/big_uint.rs
@@ -90,6 +90,10 @@ impl<M: ManagedTypeApi> BigUint<M> {
     pub fn as_big_int(&self) -> &BigInt<M> {
         &self.value
     }
+
+    pub fn into_big_int(self) -> BigInt<M> {
+        self.value
+    }
 }
 
 macro_rules! big_uint_conv_num {
diff --git a/framework/base/src/types/managed/wrapped/managed_decimal.rs b/framework/base/src/types/managed/wrapped/managed_decimal.rs
index 73e03858b0..819e7dabf2 100644
--- a/framework/base/src/types/managed/wrapped/managed_decimal.rs
+++ b/framework/base/src/types/managed/wrapped/managed_decimal.rs
@@ -17,9 +17,9 @@ pub use managed_decimal_signed::ManagedDecimalSigned;
 
 use crate::{
     abi::{TypeAbi, TypeAbiFrom, TypeName},
-    api::{const_handles, use_raw_handle, BigFloatApiImpl, ManagedTypeApi},
+    api::ManagedTypeApi,
     formatter::{FormatBuffer, FormatByteReceiver, SCDisplay},
-    types::{BigFloat, BigUint},
+    types::BigUint,
 };
 
 use alloc::string::ToString;
@@ -85,31 +85,24 @@ impl<M: ManagedTypeApi, D: Decimals> ManagedDecimal<M, D> {
         ManagedDecimal::from_raw_units(self.rescale_data(scale_to_num_decimals), scale_to)
     }
 
-    pub fn to_big_float(&self) -> BigFloat<M> {
-        let result = BigFloat::from_big_uint(&self.data);
-        let temp_handle: M::BigFloatHandle = use_raw_handle(const_handles::BIG_FLOAT_TEMPORARY);
-        let denominator = self.decimals.scaling_factor::<M>();
-        M::managed_type_impl().bf_set_bi(temp_handle.clone(), denominator.handle);
-        M::managed_type_impl().bf_div(result.handle.clone(), result.handle.clone(), temp_handle);
-        result
+    pub fn into_signed(self) -> ManagedDecimalSigned<M, D> {
+        ManagedDecimalSigned {
+            data: self.data.into_big_int(),
+            decimals: self.decimals,
+        }
     }
+}
 
-    pub fn from_big_float<T: Decimals>(
-        big_float: &BigFloat<M>,
-        num_decimals: T,
-    ) -> ManagedDecimal<M, T> {
-        let scaling_factor: &BigUint<M> = &num_decimals.scaling_factor();
-        let magnitude = big_float.magnitude();
-
-        let scaled = &BigFloat::from(scaling_factor) * &magnitude;
-        let fixed_big_int = scaled.trunc();
-
-        ManagedDecimal::from_raw_units(
-            fixed_big_int
-                .into_big_uint()
-                .unwrap_or_sc_panic("failed to cast BigInt to BigUint"),
-            num_decimals,
-        )
+impl<M: ManagedTypeApi, const DECIMALS: NumDecimals> From<BigUint<M>>
+    for ManagedDecimal<M, ConstDecimals<DECIMALS>>
+{
+    fn from(mut value: BigUint<M>) -> Self {
+        let decimals = ConstDecimals;
+        value *= decimals.scaling_factor().deref();
+        ManagedDecimal {
+            data: value,
+            decimals,
+        }
     }
 }
 
@@ -251,19 +244,6 @@ impl<M: ManagedTypeApi> TopDecode for ManagedDecimal<M, NumDecimals> {
     }
 }
 
-impl<M: ManagedTypeApi, const DECIMALS: NumDecimals> From<BigUint<M>>
-    for ManagedDecimal<M, ConstDecimals<DECIMALS>>
-{
-    fn from(mut value: BigUint<M>) -> Self {
-        let decimals = ConstDecimals;
-        value *= decimals.scaling_factor().deref();
-        ManagedDecimal {
-            data: value,
-            decimals,
-        }
-    }
-}
-
 impl<M: ManagedTypeApi> TypeAbiFrom<Self> for ManagedDecimal<M, NumDecimals> {}
 
 impl<M: ManagedTypeApi> TypeAbi for ManagedDecimal<M, NumDecimals> {
diff --git a/framework/base/src/types/managed/wrapped/managed_decimal/managed_decimal_ln.rs b/framework/base/src/types/managed/wrapped/managed_decimal/managed_decimal_ln.rs
index 94173fd5d2..ea0ed5ec39 100644
--- a/framework/base/src/types/managed/wrapped/managed_decimal/managed_decimal_ln.rs
+++ b/framework/base/src/types/managed/wrapped/managed_decimal/managed_decimal_ln.rs
@@ -1,117 +1,69 @@
-pub use super::decimals::{ConstDecimals, Decimals, NumDecimals};
-pub use super::managed_decimal_signed::ManagedDecimalSigned;
-use super::ManagedDecimal;
+use super::decimals::{ConstDecimals, Decimals};
+use super::ManagedDecimalSigned;
+use super::{ManagedDecimal, NumDecimals};
 
+use crate::proxy_imports::ManagedType;
 use crate::{
-    abi::{TypeAbi, TypeAbiFrom, TypeName},
-    api::{const_handles, use_raw_handle, BigFloatApiImpl, ManagedTypeApi},
+    api::ManagedTypeApi,
     contract_base::ErrorHelper,
-    formatter::{FormatBuffer, FormatByteReceiver, SCDisplay},
-    types::{BigFloat, BigUint},
+    types::{BigInt, BigUint, Sign},
 };
 
-impl<M: ManagedTypeApi, D: Decimals> ManagedDecimal<M, D> {
-    /// Natural logarithm of a number.
-    ///
-    /// Returns `None` for 0.
-    ///
-    /// TODO: TEMP impl.
-    pub fn ln(&self) -> Option<i64> {
-        let bit_log2 = self.data.log2(); // aproximate, based on position of the most significant bit
-        if bit_log2 == u32::MAX {
-            // means the input was zero, TODO: change log2 return type
-            return None;
-        }
+fn compute_ln<M: ManagedTypeApi>(
+    data: &BigUint<M>,
+    num_decimals: NumDecimals,
+) -> Option<ManagedDecimalSigned<M, ConstDecimals<9>>> {
+    let bit_log2 = data.log2(); // aproximate, based on position of the most significant bit
+    if bit_log2 == u32::MAX {
+        // means the input was zero, TODO: change log2 return type
+        return None;
+    }
 
-        let scaling_factor_9 = ConstDecimals::<9>.scaling_factor();
-        let divisor = BigUint::from(1u64) << bit_log2 as usize;
-        let normalized = &self.data * &*scaling_factor_9 / divisor;
+    let scaling_factor_9 = ConstDecimals::<9>.scaling_factor();
+    let divisor = BigUint::from(1u64) << bit_log2 as usize;
+    let normalized = data * &*scaling_factor_9 / divisor;
 
-        let x = normalized
-            .to_u64()
-            .unwrap_or_else(|| ErrorHelper::<M>::signal_error_with_message("ln internal error"))
-            as i64;
+    let x = normalized
+        .to_u64()
+        .unwrap_or_else(|| ErrorHelper::<M>::signal_error_with_message("ln internal error"))
+        as i64;
 
-        let mut result = crate::types::math_util::logarithm_i64::ln_polynomial(x);
-        crate::types::math_util::logarithm_i64::ln_add_bit_log2(&mut result, bit_log2);
+    let mut result = crate::types::math_util::logarithm_i64::ln_polynomial(x);
+    crate::types::math_util::logarithm_i64::ln_add_bit_log2(&mut result, bit_log2);
 
-        debug_assert!(result > 0);
+    debug_assert!(result > 0);
 
-        crate::types::math_util::logarithm_i64::ln_sub_decimals(
-            &mut result,
-            self.decimals.num_decimals(),
-        );
+    crate::types::math_util::logarithm_i64::ln_sub_decimals(&mut result, num_decimals);
 
-        Some(result)
-    }
+    Some(ManagedDecimalSigned::from_raw_units(
+        BigInt::from(result),
+        ConstDecimals,
+    ))
 }
 
-impl<M: ManagedTypeApi, const DECIMALS: NumDecimals> ManagedDecimal<M, ConstDecimals<DECIMALS>> {
-    // pub fn log(
-    //     &self,
-    //     target_base: &ManagedDecimal<M, D>,
-    //     precision: D,
-    // ) -> ManagedDecimal<M, NumDecimals> {
-    //     let num_decimals = precision.num_decimals();
-    //     // should verify >= 1
-    //     let one = ManagedDecimal::from_raw_units(BigUint::from(1u64), 0usize);
-    //     one.rescale(self.scale());
-    //     assert!(self >= &one, "wrong input for self");
-    //     one.rescale(target_base.scale());
-    //     assert!(target_base >= &one, "wrong input for target base");
-
-    //     self.ln(&precision)
-    //         * ManagedDecimal::from_raw_units(BigUint::from(num_decimals), num_decimals)
-    //         / target_base.ln(&precision)
-    //     //this should be done with precision
-    // }
-
-    pub fn ln_temp<const PREC: usize>(
-        self,
-        precision: ConstDecimals<PREC>,
-    ) -> ManagedDecimal<M, ConstDecimals<PREC>> {
-        let num_decimals = self.decimals.num_decimals() as u32;
-        // find the highest power of 2 less than or equal to self
-        let log2 = self.data.log2() - num_decimals * BigUint::<M>::from(10u64).log2(); // most significant bit for the actual number
-        let divisor = 1 << log2;
-        let divisor_scaled =
-            BigUint::<M>::from(divisor as u64) * self.decimals.scaling_factor().clone_value();
-        let _normalized = self.data / divisor_scaled; // normalize to [1.0, 2.0]
-        let x_dec = ManagedDecimal::<M, ConstDecimals<0>>::const_decimals_from_raw(_normalized);
-        let x = x_dec.rescale(precision.clone());
-
-        // approximating polynom to get the result
-        let mut result = ManagedDecimal::<M, ConstDecimals<9>>::const_decimals_from_raw(
-            BigUint::from(56570851u64), // 0.056570851, 9 decimals˝
-        )
-        .mul_with_precision(x.clone(), precision.clone());
-        result = ManagedDecimal::<M, ConstDecimals<8>>::const_decimals_from_raw(BigUint::from(
-            44717955u64, // 0.44717955, 8 decimals
-        ))
-        .rescale(precision.clone())
-            - result;
-        result = result.mul_with_precision(x.clone(), precision.clone());
-        result -= ManagedDecimal::<M, ConstDecimals<7>>::const_decimals_from_raw(BigUint::from(
-            14699568u64, // 1.4699568, 7 decimals
-        ))
-        .rescale(precision.clone());
-        result = result.mul_with_precision(x.clone(), precision.clone());
-        result += ManagedDecimal::<M, ConstDecimals<7>>::const_decimals_from_raw(BigUint::from(
-            28212026u64, // 2.8212026, 7 decimals
-        ))
-        .rescale(precision.clone());
-        result = result.mul_with_precision(x.clone(), precision.clone());
-        result -= ManagedDecimal::<M, ConstDecimals<7>>::const_decimals_from_raw(BigUint::from(
-            17417939u64, // 1.7417939, 7 decimals
-        ))
-        .rescale(precision.clone());
+impl<M: ManagedTypeApi, D: Decimals> ManagedDecimal<M, D> {
+    /// Natural logarithm of a number.
+    ///
+    /// Returns `None` for 0.
+    ///
+    /// Even though 9 decimals are returned, only around 6 decimals are actually useful.
+    pub fn ln(&self) -> Option<ManagedDecimalSigned<M, ConstDecimals<9>>> {
+        compute_ln(&self.data, self.decimals.num_decimals())
+    }
+}
 
-        let log_2 =
-            ManagedDecimal::<M, ConstDecimals<0>>::const_decimals_from_raw(BigUint::from(log2));
-        let ln_of_2 = ManagedDecimal::<M, ConstDecimals<8>>::const_decimals_from_raw(
-            BigUint::from(69314718u64),
-        ); // 0.69314718 8 decimals
+impl<M: ManagedTypeApi, D: Decimals> ManagedDecimalSigned<M, D> {
+    /// Natural logarithm of a number.
+    ///
+    /// Returns `None` for 0.
+    ///
+    /// Even though 9 decimals are returned, only around 6 decimals are actually useful.
+    pub fn ln(&self) -> Option<ManagedDecimalSigned<M, ConstDecimals<9>>> {
+        if self.sign() != Sign::Plus {
+            return None;
+        }
 
-        result + log_2.mul_with_precision(ln_of_2, precision.clone())
+        let bu = BigUint::from_handle(self.data.handle.clone());
+        compute_ln(&bu, self.decimals.num_decimals())
     }
 }
diff --git a/framework/base/src/types/managed/wrapped/managed_decimal/managed_decimal_signed.rs b/framework/base/src/types/managed/wrapped/managed_decimal/managed_decimal_signed.rs
index a412ae9705..9f7bba18c2 100644
--- a/framework/base/src/types/managed/wrapped/managed_decimal/managed_decimal_signed.rs
+++ b/framework/base/src/types/managed/wrapped/managed_decimal/managed_decimal_signed.rs
@@ -5,7 +5,7 @@ use crate::{
         ManagedBufferApiImpl, ManagedTypeApi,
     },
     formatter::{FormatBuffer, FormatByteReceiver, SCDisplay},
-    types::{BigFloat, BigInt, BigUint, ManagedBuffer, ManagedType},
+    types::{BigFloat, BigInt, BigUint, ManagedBuffer, ManagedType, Sign},
 };
 
 use alloc::string::ToString;
@@ -16,7 +16,10 @@ use multiversx_sc_codec::{
 
 use core::{cmp::Ordering, ops::Deref};
 
-use super::decimals::{ConstDecimals, Decimals, NumDecimals};
+use super::{
+    decimals::{ConstDecimals, Decimals, NumDecimals},
+    ManagedDecimal,
+};
 use super::{ManagedBufferCachedBuilder, ManagedRef};
 
 #[derive(Clone)]
@@ -64,14 +67,64 @@ impl<M: ManagedTypeApi, D: Decimals> ManagedDecimalSigned<M, D> {
         }
     }
 
-    pub fn rescale<T: Decimals>(&self, scale_to: T) -> ManagedDecimalSigned<M, T>
-    where
-        M: ManagedTypeApi,
-    {
+    pub fn rescale<T: Decimals>(&self, scale_to: T) -> ManagedDecimalSigned<M, T> {
         let scale_to_num_decimals = scale_to.num_decimals();
         ManagedDecimalSigned::from_raw_units(self.rescale_data(scale_to_num_decimals), scale_to)
     }
 
+    pub fn into_unsigned_or_fail(self) -> ManagedDecimal<M, D> {
+        ManagedDecimal {
+            data: self.data.into_big_uint_or_fail(),
+            decimals: self.decimals,
+        }
+    }
+
+    pub fn sign(&self) -> Sign {
+        self.data.sign()
+    }
+}
+
+impl<M: ManagedTypeApi, const DECIMALS: NumDecimals>
+    ManagedDecimalSigned<M, ConstDecimals<DECIMALS>>
+{
+    pub fn const_decimals_from_raw(data: BigInt<M>) -> Self {
+        ManagedDecimalSigned {
+            data,
+            decimals: ConstDecimals,
+        }
+    }
+
+    /// Converts from constant (compile-time) number of decimals to a variable number of decimals.
+    pub fn into_var_decimals(self) -> ManagedDecimalSigned<M, NumDecimals> {
+        ManagedDecimalSigned {
+            data: self.data,
+            decimals: DECIMALS,
+        }
+    }
+}
+
+impl<M: ManagedTypeApi, const DECIMALS: NumDecimals> From<BigInt<M>>
+    for ManagedDecimalSigned<M, ConstDecimals<DECIMALS>>
+{
+    fn from(mut value: BigInt<M>) -> Self {
+        let decimals = ConstDecimals;
+        value *= decimals.scaling_factor().as_big_int();
+        ManagedDecimalSigned {
+            data: value,
+            decimals,
+        }
+    }
+}
+
+impl<M: ManagedTypeApi, const DECIMALS: NumDecimals> From<i64>
+    for ManagedDecimalSigned<M, ConstDecimals<DECIMALS>>
+{
+    fn from(value: i64) -> Self {
+        Self::from(BigInt::from(value))
+    }
+}
+
+impl<M: ManagedTypeApi, D: Decimals> ManagedDecimalSigned<M, D> {
     pub fn to_big_float(&self) -> BigFloat<M> {
         let result = BigFloat::from_big_int(&self.data);
         let temp_handle: M::BigFloatHandle = use_raw_handle(const_handles::BIG_FLOAT_TEMPORARY);
@@ -95,22 +148,36 @@ impl<M: ManagedTypeApi, D: Decimals> ManagedDecimalSigned<M, D> {
     }
 }
 
-impl<M: ManagedTypeApi, const DECIMALS: NumDecimals>
-    ManagedDecimalSigned<M, ConstDecimals<DECIMALS>>
+impl<M: ManagedTypeApi, const DECIMALS: NumDecimals> From<&BigFloat<M>>
+    for ManagedDecimalSigned<M, ConstDecimals<DECIMALS>>
 {
-    pub fn const_decimals_from_raw(data: BigInt<M>) -> Self {
-        ManagedDecimalSigned {
-            data,
-            decimals: ConstDecimals,
-        }
+    fn from(value: &BigFloat<M>) -> Self {
+        Self::from_big_float(value, ConstDecimals)
     }
+}
 
-    /// Converts from constant (compile-time) number of decimals to a variable number of decimals.
-    pub fn into_var_decimals(self) -> ManagedDecimalSigned<M, NumDecimals> {
-        ManagedDecimalSigned {
-            data: self.data,
-            decimals: DECIMALS,
-        }
+impl<M: ManagedTypeApi, const DECIMALS: NumDecimals> From<BigFloat<M>>
+    for ManagedDecimalSigned<M, ConstDecimals<DECIMALS>>
+{
+    #[inline]
+    fn from(value: BigFloat<M>) -> Self {
+        Self::from(&value)
+    }
+}
+
+impl<M: ManagedTypeApi, const DECIMALS: NumDecimals> From<f64>
+    for ManagedDecimalSigned<M, ConstDecimals<DECIMALS>>
+{
+    fn from(x: f64) -> Self {
+        Self::from(BigFloat::from(x))
+    }
+}
+
+impl<M: ManagedTypeApi, const DECIMALS: NumDecimals> From<f32>
+    for ManagedDecimalSigned<M, ConstDecimals<DECIMALS>>
+{
+    fn from(x: f32) -> Self {
+        Self::from(x as f64)
     }
 }
 
@@ -235,19 +302,6 @@ impl<M: ManagedTypeApi> TopDecode for ManagedDecimalSigned<M, NumDecimals> {
     }
 }
 
-impl<M: ManagedTypeApi, const DECIMALS: NumDecimals> From<BigInt<M>>
-    for ManagedDecimalSigned<M, ConstDecimals<DECIMALS>>
-{
-    fn from(mut value: BigInt<M>) -> Self {
-        let decimals = ConstDecimals;
-        value *= decimals.scaling_factor().deref().as_big_int();
-        ManagedDecimalSigned {
-            data: value,
-            decimals,
-        }
-    }
-}
-
 impl<M: ManagedTypeApi> TypeAbiFrom<Self> for ManagedDecimalSigned<M, NumDecimals> {}
 
 impl<M: ManagedTypeApi> TypeAbi for ManagedDecimalSigned<M, NumDecimals> {
diff --git a/tools/plotter/src/logarithm_bf.rs b/tools/plotter/src/logarithm_bf.rs
index e3e70f57ec..0958c22a6d 100644
--- a/tools/plotter/src/logarithm_bf.rs
+++ b/tools/plotter/src/logarithm_bf.rs
@@ -79,11 +79,8 @@ pub fn draw_bf_error(
 }
 
 fn big_float_ln(x: f32) -> f32 {
-    const PREC: i64 = 1_000_000;
-    let bf = BigFloat::<StaticApi>::from_frac((x * PREC as f32) as i64, PREC);
-    if let Some(ln_dec) = bf.ln() {
-        let ln_units = (ln_dec * PREC.into()).trunc().to_i64().unwrap();
-        (ln_units as f64 / PREC as f64) as f32
+    if let Some(ln) = BigFloat::<StaticApi>::from(x).ln() {
+        ln.to_f64() as f32
     } else {
         0.0
     }
diff --git a/tools/plotter/src/logarithm_bu.rs b/tools/plotter/src/logarithm_bu.rs
index bd10efed86..c452d14a16 100644
--- a/tools/plotter/src/logarithm_bu.rs
+++ b/tools/plotter/src/logarithm_bu.rs
@@ -81,9 +81,7 @@ pub fn draw_bu_error(
 fn big_uint_ln(x: f32) -> f32 {
     let bu = BigUint::<StaticApi>::from(x as u32);
     if let Some(ln_dec) = bu.ln() {
-        let ln_units = ln_dec.into_raw_units().to_u64().unwrap();
-        let ln_sf = ln_dec.scaling_factor().to_u64().unwrap();
-        (ln_units as f64 / ln_sf as f64) as f32
+        ln_dec.into_signed().to_big_float().to_f64() as f32
     } else {
         0.0
     }
diff --git a/tools/plotter/src/logarithm_md.rs b/tools/plotter/src/logarithm_md.rs
index d7ca5d9cdd..ef634840a1 100644
--- a/tools/plotter/src/logarithm_md.rs
+++ b/tools/plotter/src/logarithm_md.rs
@@ -1,5 +1,5 @@
 use crate::DrawResult;
-use multiversx_sc::types::{BigUint, ConstDecimals, ManagedDecimal};
+use multiversx_sc::types::{ConstDecimals, ManagedDecimalSigned};
 use multiversx_sc_scenario::api::StaticApi;
 use plotters::prelude::*;
 use plotters_canvas::CanvasBackend;
@@ -79,13 +79,9 @@ pub fn draw_md_error(
 }
 
 fn managed_decimal_ln(x: f32) -> f32 {
-    let bu = BigUint::<StaticApi>::from((x * 1_000_000_000.0) as u64);
-    let dec = ManagedDecimal::<StaticApi, ConstDecimals<9>>::const_decimals_from_raw(bu);
+    let dec = ManagedDecimalSigned::<StaticApi, ConstDecimals<9>>::from(x);
     if let Some(ln_dec) = dec.ln() {
-        //     let ln_units = ln_dec;
-        //     let ln_sf = ln_dec.scaling_factor().to_u64().unwrap();
-        //     (ln_units as f64 / ln_sf as f64) as f32
-        (ln_dec as f64 / 1_000_000_000f64) as f32
+        ln_dec.to_big_float().to_f64() as f32
     } else {
         0.0
     }

From 15aff5b2e8a23b7cb52724dc6989502fc86627c8 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 28 Jun 2024 09:54:04 +0300
Subject: [PATCH 1042/1254] BigUint log2_floor refactor, test fixes

---
 .../basic-features/src/big_num_methods.rs     |  4 +-
 .../base/src/api/managed_types/big_int_api.rs |  2 +-
 .../api/uncallable/big_int_api_uncallable.rs  |  2 +-
 .../base/src/types/managed/basic/big_float.rs | 15 ++---
 .../src/types/managed/wrapped/big_uint.rs     | 27 ++++++---
 .../types/managed/wrapped/managed_decimal.rs  |  1 +
 .../managed_decimal_cmp_signed.rs             | 55 +++++++++++++++++++
 .../managed_decimal/managed_decimal_ln.rs     | 12 ++--
 .../managed_decimal/managed_decimal_signed.rs |  3 +
 .../api/managed_type_api_vh/big_int_api_vh.rs |  4 +-
 framework/scenario/tests/big_float_test.rs    |  6 +-
 .../scenario/tests/managed_decimal_test.rs    | 23 +++++---
 .../src/api/managed_types/big_int_api_node.rs |  4 +-
 13 files changed, 117 insertions(+), 41 deletions(-)
 create mode 100644 framework/base/src/types/managed/wrapped/managed_decimal/managed_decimal_cmp_signed.rs

diff --git a/contracts/feature-tests/basic-features/src/big_num_methods.rs b/contracts/feature-tests/basic-features/src/big_num_methods.rs
index c30b8cb56e..25d83b21fb 100644
--- a/contracts/feature-tests/basic-features/src/big_num_methods.rs
+++ b/contracts/feature-tests/basic-features/src/big_num_methods.rs
@@ -14,12 +14,12 @@ pub trait BigIntMethods {
 
     #[endpoint]
     fn log2_big_uint(&self, a: BigUint) -> u32 {
-        a.log2()
+        a.log2_floor().unwrap_or_default()
     }
 
     #[endpoint]
     fn log2_big_uint_ref(&self, a: &BigUint) -> u32 {
-        a.log2()
+        a.log2_floor().unwrap_or_default()
     }
 
     #[endpoint]
diff --git a/framework/base/src/api/managed_types/big_int_api.rs b/framework/base/src/api/managed_types/big_int_api.rs
index 13ce620d78..2baee82ef7 100644
--- a/framework/base/src/api/managed_types/big_int_api.rs
+++ b/framework/base/src/api/managed_types/big_int_api.rs
@@ -52,7 +52,7 @@ pub trait BigIntApiImpl: HandleTypeInfo + ErrorApi {
 
     fn bi_sqrt(&self, dest: Self::BigIntHandle, x: Self::BigIntHandle);
     fn bi_pow(&self, dest: Self::BigIntHandle, x: Self::BigIntHandle, y: Self::BigIntHandle);
-    fn bi_log2(&self, x: Self::BigIntHandle) -> u32;
+    fn bi_log2(&self, x: Self::BigIntHandle) -> i32;
 
     fn bi_and(&self, dest: Self::BigIntHandle, x: Self::BigIntHandle, y: Self::BigIntHandle);
     fn bi_or(&self, dest: Self::BigIntHandle, x: Self::BigIntHandle, y: Self::BigIntHandle);
diff --git a/framework/base/src/api/uncallable/big_int_api_uncallable.rs b/framework/base/src/api/uncallable/big_int_api_uncallable.rs
index 46b997926d..9615633f3b 100644
--- a/framework/base/src/api/uncallable/big_int_api_uncallable.rs
+++ b/framework/base/src/api/uncallable/big_int_api_uncallable.rs
@@ -59,7 +59,7 @@ impl BigIntApiImpl for super::UncallableApi {
         unreachable!()
     }
 
-    fn bi_log2(&self, _x: Self::BigIntHandle) -> u32 {
+    fn bi_log2(&self, _x: Self::BigIntHandle) -> i32 {
         unreachable!()
     }
 
diff --git a/framework/base/src/types/managed/basic/big_float.rs b/framework/base/src/types/managed/basic/big_float.rs
index a3d6cdc4b5..17f866e39f 100644
--- a/framework/base/src/types/managed/basic/big_float.rs
+++ b/framework/base/src/types/managed/basic/big_float.rs
@@ -224,13 +224,14 @@ impl<M: ManagedTypeApi> BigFloat<M> {
         let trunc_val_unsigned = trunc_val
             .into_big_uint()
             .unwrap_or_sc_panic("log argument must be positive");
-        let bit_log2 = trunc_val_unsigned.log2(); // approximate, based on position of the most significant bit
-        if bit_log2 == u32::MAX {
-            // means the input was zero, TODO: change log2 return type
+
+        // start with aproximation, based on position of the most significant bit
+        let Some(log2_floor) = trunc_val_unsigned.log2_floor() else {
+            // means the input was zero, practically unreachable
             return BigFloat::from(0i64);
-            // return None;
-        }
-        let divisor = BigFloat::from(1 << bit_log2);
+        };
+
+        let divisor = BigFloat::from(1 << log2_floor);
         let x = self / &divisor; // normalize to [1.0, 2.0]
 
         debug_assert!(x >= 1);
@@ -239,7 +240,7 @@ impl<M: ManagedTypeApi> BigFloat<M> {
         let mut result = x.ln_between_one_and_two();
 
         let ln_of_2 = BigFloat::from_frac(693147180, DENOMINATOR); // 0.69314718
-        result += BigFloat::from(bit_log2 as i32) * ln_of_2;
+        result += BigFloat::from(log2_floor as i32) * ln_of_2;
 
         result
     }
diff --git a/framework/base/src/types/managed/wrapped/big_uint.rs b/framework/base/src/types/managed/wrapped/big_uint.rs
index 609af7b961..615d790480 100644
--- a/framework/base/src/types/managed/wrapped/big_uint.rs
+++ b/framework/base/src/types/managed/wrapped/big_uint.rs
@@ -248,24 +248,35 @@ impl<M: ManagedTypeApi> BigUint<M> {
         BigUint::from_handle(result_handle)
     }
 
+    /// The whole part of the base-2 logarithm.
+    ///
+    /// Obtained by counting the significant bits.
+    /// More specifically, the log2 floor is the position of the most significant bit minus one.
+    ///
+    /// Will return `None` for the number zero (the logarithm in this case would approach -inf).
     #[inline]
-    pub fn log2(&self) -> u32 {
+    pub fn log2_floor(&self) -> Option<u32> {
         let api = M::managed_type_impl();
-        api.bi_log2(self.value.handle.clone())
+        let result = api.bi_log2(self.value.handle.clone());
+        if result < 0 {
+            None
+        } else {
+            Some(result as u32)
+        }
     }
 
     /// Natural logarithm of a number.
     ///
     /// Returns `None` for 0.
     pub fn ln(&self) -> Option<ManagedDecimal<M, ConstDecimals<9>>> {
-        let bit_log2 = self.log2(); // aproximate, based on position of the most significant bit
-        if bit_log2 == u32::MAX {
-            // means the input was zero, TODO: change log2 return type
+        // start with aproximation, based on position of the most significant bit
+        let Some(log2_floor) = self.log2_floor() else {
+            // means the input was zero
             return None;
-        }
+        };
 
         let scaling_factor_9 = ConstDecimals::<9>.scaling_factor();
-        let divisor = BigUint::from(1u64) << bit_log2 as usize;
+        let divisor = BigUint::from(1u64) << log2_floor as usize;
         let normalized = self * &*scaling_factor_9 / divisor;
 
         let x = normalized
@@ -274,7 +285,7 @@ impl<M: ManagedTypeApi> BigUint<M> {
             as i64;
 
         let mut result = crate::types::math_util::logarithm_i64::ln_polynomial(x);
-        crate::types::math_util::logarithm_i64::ln_add_bit_log2(&mut result, bit_log2);
+        crate::types::math_util::logarithm_i64::ln_add_bit_log2(&mut result, log2_floor);
 
         debug_assert!(result > 0);
 
diff --git a/framework/base/src/types/managed/wrapped/managed_decimal.rs b/framework/base/src/types/managed/wrapped/managed_decimal.rs
index 819e7dabf2..824fd184d3 100644
--- a/framework/base/src/types/managed/wrapped/managed_decimal.rs
+++ b/framework/base/src/types/managed/wrapped/managed_decimal.rs
@@ -1,5 +1,6 @@
 mod decimals;
 mod managed_decimal_cmp;
+mod managed_decimal_cmp_signed;
 mod managed_decimal_ln;
 mod managed_decimal_macros;
 mod managed_decimal_op_add;
diff --git a/framework/base/src/types/managed/wrapped/managed_decimal/managed_decimal_cmp_signed.rs b/framework/base/src/types/managed/wrapped/managed_decimal/managed_decimal_cmp_signed.rs
new file mode 100644
index 0000000000..9f407c5235
--- /dev/null
+++ b/framework/base/src/types/managed/wrapped/managed_decimal/managed_decimal_cmp_signed.rs
@@ -0,0 +1,55 @@
+use core::cmp::Ordering;
+
+use crate::{
+    api::ManagedTypeApi,
+    types::{BigUint, Decimals, ManagedDecimalSigned},
+};
+
+impl<M: ManagedTypeApi, D1: Decimals, D2: Decimals> PartialEq<ManagedDecimalSigned<M, D2>>
+    for ManagedDecimalSigned<M, D1>
+{
+    fn eq(&self, other: &ManagedDecimalSigned<M, D2>) -> bool {
+        match self
+            .decimals
+            .num_decimals()
+            .cmp(&other.decimals.num_decimals())
+        {
+            Ordering::Less => {
+                let diff_decimals = other.decimals.num_decimals() - self.decimals.num_decimals();
+                let scaling_factor: &BigUint<M> = &diff_decimals.scaling_factor();
+                &self.data * scaling_factor == other.data
+            },
+            Ordering::Equal => self.data == other.data,
+            Ordering::Greater => {
+                let diff_decimals = self.decimals.num_decimals() - other.decimals.num_decimals();
+                let scaling_factor: &BigUint<M> = &diff_decimals.scaling_factor();
+                &other.data * scaling_factor == self.data
+            },
+        }
+    }
+}
+
+impl<M: ManagedTypeApi, D1: Decimals, D2: Decimals> PartialOrd<ManagedDecimalSigned<M, D2>>
+    for ManagedDecimalSigned<M, D1>
+{
+    fn partial_cmp(&self, other: &ManagedDecimalSigned<M, D2>) -> Option<Ordering> {
+        match self
+            .decimals
+            .num_decimals()
+            .cmp(&other.decimals.num_decimals())
+        {
+            Ordering::Less => {
+                let diff_decimals = other.decimals.num_decimals() - self.decimals.num_decimals();
+                let scaling_factor: &BigUint<M> = &diff_decimals.scaling_factor();
+
+                Some((&self.data * scaling_factor).cmp(&other.data))
+            },
+            Ordering::Equal => Some((self.data).cmp(&other.data)),
+            Ordering::Greater => {
+                let diff_decimals = self.decimals.num_decimals() - other.decimals.num_decimals();
+                let scaling_factor: &BigUint<M> = &diff_decimals.scaling_factor();
+                Some((&other.data * scaling_factor).cmp(&self.data))
+            },
+        }
+    }
+}
diff --git a/framework/base/src/types/managed/wrapped/managed_decimal/managed_decimal_ln.rs b/framework/base/src/types/managed/wrapped/managed_decimal/managed_decimal_ln.rs
index ea0ed5ec39..231441091d 100644
--- a/framework/base/src/types/managed/wrapped/managed_decimal/managed_decimal_ln.rs
+++ b/framework/base/src/types/managed/wrapped/managed_decimal/managed_decimal_ln.rs
@@ -13,14 +13,14 @@ fn compute_ln<M: ManagedTypeApi>(
     data: &BigUint<M>,
     num_decimals: NumDecimals,
 ) -> Option<ManagedDecimalSigned<M, ConstDecimals<9>>> {
-    let bit_log2 = data.log2(); // aproximate, based on position of the most significant bit
-    if bit_log2 == u32::MAX {
-        // means the input was zero, TODO: change log2 return type
+    // start with aproximation, based on position of the most significant bit
+    let Some(log2_floor) = data.log2_floor() else {
+        // means the input was zero
         return None;
-    }
+    };
 
     let scaling_factor_9 = ConstDecimals::<9>.scaling_factor();
-    let divisor = BigUint::from(1u64) << bit_log2 as usize;
+    let divisor = BigUint::from(1u64) << log2_floor as usize;
     let normalized = data * &*scaling_factor_9 / divisor;
 
     let x = normalized
@@ -29,7 +29,7 @@ fn compute_ln<M: ManagedTypeApi>(
         as i64;
 
     let mut result = crate::types::math_util::logarithm_i64::ln_polynomial(x);
-    crate::types::math_util::logarithm_i64::ln_add_bit_log2(&mut result, bit_log2);
+    crate::types::math_util::logarithm_i64::ln_add_bit_log2(&mut result, log2_floor);
 
     debug_assert!(result > 0);
 
diff --git a/framework/base/src/types/managed/wrapped/managed_decimal/managed_decimal_signed.rs b/framework/base/src/types/managed/wrapped/managed_decimal/managed_decimal_signed.rs
index 9f7bba18c2..20f81b1244 100644
--- a/framework/base/src/types/managed/wrapped/managed_decimal/managed_decimal_signed.rs
+++ b/framework/base/src/types/managed/wrapped/managed_decimal/managed_decimal_signed.rs
@@ -22,6 +22,9 @@ use super::{
 };
 use super::{ManagedBufferCachedBuilder, ManagedRef};
 
+/// Fixed-point decimal numbers that accept either a constant or variable number of decimals.
+///
+/// Unlike for `ManagedDecimal`, ngative numbers are also allowed.
 #[derive(Clone)]
 pub struct ManagedDecimalSigned<M: ManagedTypeApi, D: Decimals> {
     pub(crate) data: BigInt<M>,
diff --git a/framework/scenario/src/api/managed_type_api_vh/big_int_api_vh.rs b/framework/scenario/src/api/managed_type_api_vh/big_int_api_vh.rs
index ebe9ca6e71..621115dc62 100644
--- a/framework/scenario/src/api/managed_type_api_vh/big_int_api_vh.rs
+++ b/framework/scenario/src/api/managed_type_api_vh/big_int_api_vh.rs
@@ -88,8 +88,8 @@ impl<VHB: VMHooksApiBackend> BigIntApiImpl for VMHooksApi<VHB> {
     unary_op_method! {bi_sqrt, big_int_sqrt}
     binary_op_method! {bi_pow, big_int_pow}
 
-    fn bi_log2(&self, x: Self::BigIntHandle) -> u32 {
-        self.with_vm_hooks_ctx_1(&x, |vh| vh.big_int_log2(x.get_raw_handle_unchecked())) as u32
+    fn bi_log2(&self, x: Self::BigIntHandle) -> i32 {
+        self.with_vm_hooks_ctx_1(&x, |vh| vh.big_int_log2(x.get_raw_handle_unchecked()))
     }
 
     binary_op_method! {bi_and, big_int_and}
diff --git a/framework/scenario/tests/big_float_test.rs b/framework/scenario/tests/big_float_test.rs
index 2b98cbae41..e29e5858b9 100644
--- a/framework/scenario/tests/big_float_test.rs
+++ b/framework/scenario/tests/big_float_test.rs
@@ -1,4 +1,4 @@
-use multiversx_sc::types::{BigFloat, BigUint};
+use multiversx_sc::types::{BigFloat, BigInt, BigUint};
 use multiversx_sc_scenario::api::StaticApi;
 
 #[test]
@@ -39,10 +39,10 @@ fn big_float_overflow_test_rs() {
     assert_eq!(
         third,
         /* overflow */
-        &BigUint::from(9223372036854775807u64)
+        &BigInt::from(9223372036854775807i64)
     );
 
-    assert_eq!(forth, &BigUint::from(2184473079534488064u64));
+    assert_eq!(forth, &BigInt::from(2184473079534488064i64));
 }
 
 #[test]
diff --git a/framework/scenario/tests/managed_decimal_test.rs b/framework/scenario/tests/managed_decimal_test.rs
index cc475ef6e4..e02e56cf95 100644
--- a/framework/scenario/tests/managed_decimal_test.rs
+++ b/framework/scenario/tests/managed_decimal_test.rs
@@ -1,7 +1,9 @@
 use multiversx_sc::{
     codec::test_util::{check_dep_encode_decode, check_top_encode_decode},
     derive::{debug_const_managed_decimal, debug_managed_decimal},
-    types::{BigFloat, BigUint, ConstDecimals, ManagedDecimal, NumDecimals},
+    types::{
+        BigFloat, BigInt, BigUint, ConstDecimals, ManagedDecimal, ManagedDecimalSigned, NumDecimals,
+    },
 };
 use multiversx_sc_scenario::api::StaticApi;
 
@@ -64,19 +66,22 @@ pub fn test_managed_decimal() {
     );
 
     let float_1 = BigFloat::<StaticApi>::from_frac(3i64, 2i64);
-    let fixed_float_1 =
-        ManagedDecimal::<StaticApi, ConstDecimals<1>>::from_big_float(&float_1, ConstDecimals::<1>);
-    let fixed_float_2 = ManagedDecimal::<StaticApi, NumDecimals>::from_big_float(&float_1, 1usize);
+    let fixed_float_1 = ManagedDecimalSigned::<StaticApi, ConstDecimals<1>>::from_big_float(
+        &float_1,
+        ConstDecimals::<1>,
+    );
+    let fixed_float_2 =
+        ManagedDecimalSigned::<StaticApi, NumDecimals>::from_big_float(&float_1, 1usize);
 
     assert_eq!(
         fixed_float_1,
-        ManagedDecimal::<StaticApi, ConstDecimals<1>>::const_decimals_from_raw(BigUint::from(
-            15u64
+        ManagedDecimalSigned::<StaticApi, ConstDecimals<1>>::const_decimals_from_raw(BigInt::from(
+            15
         ))
     );
     assert_eq!(
         fixed_float_2,
-        ManagedDecimal::<StaticApi, NumDecimals>::from_raw_units(BigUint::from(15u64), 1usize)
+        ManagedDecimalSigned::<StaticApi, NumDecimals>::from_raw_units(BigInt::from(15), 1usize)
     );
 }
 
@@ -104,8 +109,8 @@ fn test_managed_decimal_macros() {
 
 #[test]
 fn test_managed_decimal_conversion() {
-    let fixed: ManagedDecimal<StaticApi, NumDecimals> =
-        ManagedDecimal::from_raw_units(BigUint::from(123456789123456789u64), 15usize); //123,45....
+    let fixed: ManagedDecimalSigned<StaticApi, NumDecimals> =
+        ManagedDecimalSigned::from_raw_units(BigInt::from(123456789123456789i64), 15usize); //123,45....
 
     let float_coresp = fixed.to_big_float();
 
diff --git a/framework/wasm-adapter/src/api/managed_types/big_int_api_node.rs b/framework/wasm-adapter/src/api/managed_types/big_int_api_node.rs
index d09020f5d6..267db172c0 100644
--- a/framework/wasm-adapter/src/api/managed_types/big_int_api_node.rs
+++ b/framework/wasm-adapter/src/api/managed_types/big_int_api_node.rs
@@ -109,8 +109,8 @@ impl BigIntApiImpl for crate::api::VmApiImpl {
     unary_op_wrapper! {bi_sqrt, bigIntSqrt}
     binary_op_wrapper! {bi_pow, bigIntPow}
 
-    fn bi_log2(&self, x: Self::BigIntHandle) -> u32 {
-        unsafe { bigIntLog2(x) as u32 }
+    fn bi_log2(&self, x: Self::BigIntHandle) -> i32 {
+        unsafe { bigIntLog2(x) }
     }
 
     binary_op_wrapper! {bi_and, bigIntAnd}

From 292867d2fcdfdd8d068efa2573fe0b9fac854a03 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 28 Jun 2024 10:11:08 +0300
Subject: [PATCH 1043/1254] test fix

---
 .../big-float-features/scenarios/big_float_operators.scen.json  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 3021715617..df136adf69 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
@@ -837,7 +837,7 @@
             },
             "expect": {
                 "out": [
-                    "0x00000004bae4281800000009"
+                    "0x0000000500bae4281800000009"
                 ]
             }
         }

From b1d0ff82a5c9209c08fa2d6ff2597467a6821fdc Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 28 Jun 2024 11:14:58 +0300
Subject: [PATCH 1044/1254] Managed Decimal into signed cleanup

---
 framework/base/src/err_msg.rs                   |  2 +-
 .../base/src/types/managed/basic/big_int.rs     | 17 ++---------------
 .../managed_decimal/managed_decimal_signed.rs   |  6 +++++-
 3 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/framework/base/src/err_msg.rs b/framework/base/src/err_msg.rs
index 7432a5b5c5..babfce244e 100644
--- a/framework/base/src/err_msg.rs
+++ b/framework/base/src/err_msg.rs
@@ -38,7 +38,7 @@ pub const VALUE_EXCEEDS_SLICE: &str = "value exceeds target slice";
 pub const CAST_TO_I64_ERROR: &str = "cast to i64 error";
 pub const BIG_UINT_EXCEEDS_SLICE: &str = "big uint as_bytes exceed target slice";
 pub const BIG_UINT_SUB_NEGATIVE: &str = "cannot subtract because result would be negative";
-pub const BIG_UINT_NEGATIVE: &str = "cannot convert to unsigned, number is negative";
+pub const UNSIGNED_NEGATIVE: &str = "cannot convert to unsigned, number is negative";
 
 pub const DESERIALIZATION_INVALID_BYTE: &str = "call data deserialization error: not a valid byte";
 pub const DESERIALIZATION_NOT_32_BYTES: &str =
diff --git a/framework/base/src/types/managed/basic/big_int.rs b/framework/base/src/types/managed/basic/big_int.rs
index 9e6d932835..c705511f56 100644
--- a/framework/base/src/types/managed/basic/big_int.rs
+++ b/framework/base/src/types/managed/basic/big_int.rs
@@ -3,14 +3,13 @@ use core::{convert::TryInto, marker::PhantomData};
 use crate::{
     abi::{TypeAbiFrom, TypeName},
     api::{
-        const_handles, use_raw_handle, BigIntApiImpl, ErrorApiImpl, HandleConstraints,
-        ManagedBufferApiImpl, ManagedTypeApi, ManagedTypeApiImpl, RawHandle, StaticVarApiImpl,
+        const_handles, use_raw_handle, BigIntApiImpl, HandleConstraints, ManagedBufferApiImpl,
+        ManagedTypeApi, ManagedTypeApiImpl, RawHandle, StaticVarApiImpl,
     },
     codec::{
         DecodeErrorHandler, EncodeErrorHandler, NestedDecode, NestedDecodeInput, NestedEncode,
         NestedEncodeOutput, TopDecode, TopDecodeInput, TopEncode, TopEncodeOutput, TryStaticCast,
     },
-    err_msg,
     formatter::{hex_util::encode_bytes_as_hex, FormatByteReceiver, SCDisplay},
     types::{heap::BoxedBytes, BigUint, ManagedBuffer, ManagedOption, ManagedType, Sign},
 };
@@ -264,18 +263,6 @@ impl<M: ManagedTypeApi> BigInt<M> {
             ManagedOption::some(unsafe { self.into_big_uint_unchecked() })
         }
     }
-
-    fn check_non_negative(&self) {
-        if M::managed_type_impl().bi_sign(self.handle.clone()) == crate::api::Sign::Minus {
-            M::error_api_impl().signal_error(err_msg::BIG_UINT_SUB_NEGATIVE.as_bytes());
-        }
-    }
-
-    /// Converts to an unsigned `BigUint`. Stops execution if number is negative.
-    pub fn into_big_uint_or_fail(self) -> BigUint<M> {
-        self.check_non_negative();
-        unsafe { self.into_big_uint_unchecked() }
-    }
 }
 
 impl<M: ManagedTypeApi> TryStaticCast for BigInt<M> {}
diff --git a/framework/base/src/types/managed/wrapped/managed_decimal/managed_decimal_signed.rs b/framework/base/src/types/managed/wrapped/managed_decimal/managed_decimal_signed.rs
index 20f81b1244..42fdce30ea 100644
--- a/framework/base/src/types/managed/wrapped/managed_decimal/managed_decimal_signed.rs
+++ b/framework/base/src/types/managed/wrapped/managed_decimal/managed_decimal_signed.rs
@@ -4,6 +4,7 @@ use crate::{
         const_handles, use_raw_handle, BigFloatApiImpl, BigIntApiImpl, HandleConstraints,
         ManagedBufferApiImpl, ManagedTypeApi,
     },
+    err_msg,
     formatter::{FormatBuffer, FormatByteReceiver, SCDisplay},
     types::{BigFloat, BigInt, BigUint, ManagedBuffer, ManagedType, Sign},
 };
@@ -77,7 +78,10 @@ impl<M: ManagedTypeApi, D: Decimals> ManagedDecimalSigned<M, D> {
 
     pub fn into_unsigned_or_fail(self) -> ManagedDecimal<M, D> {
         ManagedDecimal {
-            data: self.data.into_big_uint_or_fail(),
+            data: self
+                .data
+                .into_big_uint()
+                .unwrap_or_sc_panic(err_msg::UNSIGNED_NEGATIVE),
             decimals: self.decimals,
         }
     }

From faa371a90bed36267b0f6a9ea1fb1074e3c066a5 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 28 Jun 2024 11:54:40 +0300
Subject: [PATCH 1045/1254] rust docs

---
 .../base/src/types/managed/wrapped/managed_decimal.rs      | 4 ++++
 .../src/types/managed/wrapped/managed_decimal/decimals.rs  | 7 +++++++
 2 files changed, 11 insertions(+)

diff --git a/framework/base/src/types/managed/wrapped/managed_decimal.rs b/framework/base/src/types/managed/wrapped/managed_decimal.rs
index 824fd184d3..3aad67af44 100644
--- a/framework/base/src/types/managed/wrapped/managed_decimal.rs
+++ b/framework/base/src/types/managed/wrapped/managed_decimal.rs
@@ -33,6 +33,10 @@ use core::{cmp::Ordering, ops::Deref};
 
 use super::{ManagedBufferCachedBuilder, ManagedRef};
 
+/// Fixed-point decimal numbers that accept either a constant or variable number of decimals.
+///
+/// Negative numbers are not allowed. It is especially designed for denominated token amounts.
+/// If negative numbers are needed, use `ManagedDecimalSigned` instead.
 #[derive(Clone)]
 pub struct ManagedDecimal<M: ManagedTypeApi, D: Decimals> {
     pub(crate) data: BigUint<M>,
diff --git a/framework/base/src/types/managed/wrapped/managed_decimal/decimals.rs b/framework/base/src/types/managed/wrapped/managed_decimal/decimals.rs
index 2026b4b260..9b6fba216d 100644
--- a/framework/base/src/types/managed/wrapped/managed_decimal/decimals.rs
+++ b/framework/base/src/types/managed/wrapped/managed_decimal/decimals.rs
@@ -3,11 +3,15 @@ use crate::{
     types::{BigUint, ManagedRef},
 };
 
+/// Decimals are represented as usize. This type is also used as variable decimals.
 pub type NumDecimals = usize;
 
+/// Implemented by all decimal types usable in `ManagedDecimal`.
 pub trait Decimals {
+    /// Number of decimals as variable.
     fn num_decimals(&self) -> NumDecimals;
 
+    /// 10^num_decimals, represented as a `BigUint`.
     fn scaling_factor<M: ManagedTypeApi>(&self) -> ManagedRef<'static, M, BigUint<M>> {
         scaling_factor(self.num_decimals())
     }
@@ -19,6 +23,9 @@ impl Decimals for NumDecimals {
     }
 }
 
+/// Zero-sized constant number of decimals.
+///
+/// Ideal if the number of decimals is known at compile time.
 #[derive(Clone, Debug)]
 pub struct ConstDecimals<const DECIMALS: NumDecimals>;
 

From a35a8c3338093a8df137a756c808b0d764218583 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 28 Jun 2024 12:09:02 +0300
Subject: [PATCH 1046/1254] cleaned up some inlines

---
 framework/base/src/types/managed/wrapped/managed_decimal.rs | 6 ------
 .../wrapped/managed_decimal/managed_decimal_signed.rs       | 6 ------
 2 files changed, 12 deletions(-)

diff --git a/framework/base/src/types/managed/wrapped/managed_decimal.rs b/framework/base/src/types/managed/wrapped/managed_decimal.rs
index 3aad67af44..1d225784a5 100644
--- a/framework/base/src/types/managed/wrapped/managed_decimal.rs
+++ b/framework/base/src/types/managed/wrapped/managed_decimal.rs
@@ -144,7 +144,6 @@ impl<M: ManagedTypeApi, const DECIMALS: NumDecimals> TopEncode
 impl<M: ManagedTypeApi, const DECIMALS: NumDecimals> TopDecode
     for ManagedDecimal<M, ConstDecimals<DECIMALS>>
 {
-    #[inline]
     fn top_decode_or_handle_err<I, H>(input: I, h: H) -> Result<Self, H::HandledErr>
     where
         I: TopDecodeInput,
@@ -159,7 +158,6 @@ impl<M: ManagedTypeApi, const DECIMALS: NumDecimals> TopDecode
 impl<M: ManagedTypeApi, const DECIMALS: NumDecimals> NestedEncode
     for ManagedDecimal<M, ConstDecimals<DECIMALS>>
 {
-    #[inline]
     fn dep_encode_or_handle_err<O, H>(&self, dest: &mut O, h: H) -> Result<(), H::HandledErr>
     where
         O: NestedEncodeOutput,
@@ -174,7 +172,6 @@ impl<M: ManagedTypeApi, const DECIMALS: NumDecimals> NestedEncode
 impl<M: ManagedTypeApi, const DECIMALS: NumDecimals> NestedDecode
     for ManagedDecimal<M, ConstDecimals<DECIMALS>>
 {
-    #[inline]
     fn dep_decode_or_handle_err<I, H>(input: &mut I, h: H) -> Result<Self, H::HandledErr>
     where
         I: NestedDecodeInput,
@@ -200,7 +197,6 @@ impl<M: ManagedTypeApi> NestedEncode for ManagedDecimal<M, NumDecimals> {
 }
 
 impl<M: ManagedTypeApi> TopEncode for ManagedDecimal<M, NumDecimals> {
-    #[inline]
     fn top_encode_or_handle_err<O, H>(&self, output: O, h: H) -> Result<(), H::HandledErr>
     where
         O: TopEncodeOutput,
@@ -217,7 +213,6 @@ impl<M: ManagedTypeApi> TopEncode for ManagedDecimal<M, NumDecimals> {
 }
 
 impl<M: ManagedTypeApi> NestedDecode for ManagedDecimal<M, NumDecimals> {
-    #[inline]
     fn dep_decode_or_handle_err<I, H>(input: &mut I, h: H) -> Result<Self, H::HandledErr>
     where
         I: NestedDecodeInput,
@@ -231,7 +226,6 @@ impl<M: ManagedTypeApi> NestedDecode for ManagedDecimal<M, NumDecimals> {
 }
 
 impl<M: ManagedTypeApi> TopDecode for ManagedDecimal<M, NumDecimals> {
-    #[inline]
     fn top_decode_or_handle_err<I, H>(top_input: I, h: H) -> Result<Self, H::HandledErr>
     where
         I: TopDecodeInput,
diff --git a/framework/base/src/types/managed/wrapped/managed_decimal/managed_decimal_signed.rs b/framework/base/src/types/managed/wrapped/managed_decimal/managed_decimal_signed.rs
index 42fdce30ea..bb2e574a0c 100644
--- a/framework/base/src/types/managed/wrapped/managed_decimal/managed_decimal_signed.rs
+++ b/framework/base/src/types/managed/wrapped/managed_decimal/managed_decimal_signed.rs
@@ -204,7 +204,6 @@ impl<M: ManagedTypeApi, const DECIMALS: NumDecimals> TopEncode
 impl<M: ManagedTypeApi, const DECIMALS: NumDecimals> TopDecode
     for ManagedDecimalSigned<M, ConstDecimals<DECIMALS>>
 {
-    #[inline]
     fn top_decode_or_handle_err<I, H>(input: I, h: H) -> Result<Self, H::HandledErr>
     where
         I: TopDecodeInput,
@@ -219,7 +218,6 @@ impl<M: ManagedTypeApi, const DECIMALS: NumDecimals> TopDecode
 impl<M: ManagedTypeApi, const DECIMALS: NumDecimals> NestedEncode
     for ManagedDecimalSigned<M, ConstDecimals<DECIMALS>>
 {
-    #[inline]
     fn dep_encode_or_handle_err<O, H>(&self, dest: &mut O, h: H) -> Result<(), H::HandledErr>
     where
         O: NestedEncodeOutput,
@@ -234,7 +232,6 @@ impl<M: ManagedTypeApi, const DECIMALS: NumDecimals> NestedEncode
 impl<M: ManagedTypeApi, const DECIMALS: NumDecimals> NestedDecode
     for ManagedDecimalSigned<M, ConstDecimals<DECIMALS>>
 {
-    #[inline]
     fn dep_decode_or_handle_err<I, H>(input: &mut I, h: H) -> Result<Self, H::HandledErr>
     where
         I: NestedDecodeInput,
@@ -260,7 +257,6 @@ impl<M: ManagedTypeApi> NestedEncode for ManagedDecimalSigned<M, NumDecimals> {
 }
 
 impl<M: ManagedTypeApi> TopEncode for ManagedDecimalSigned<M, NumDecimals> {
-    #[inline]
     fn top_encode_or_handle_err<O, H>(&self, output: O, h: H) -> Result<(), H::HandledErr>
     where
         O: TopEncodeOutput,
@@ -277,7 +273,6 @@ impl<M: ManagedTypeApi> TopEncode for ManagedDecimalSigned<M, NumDecimals> {
 }
 
 impl<M: ManagedTypeApi> NestedDecode for ManagedDecimalSigned<M, NumDecimals> {
-    #[inline]
     fn dep_decode_or_handle_err<I, H>(input: &mut I, h: H) -> Result<Self, H::HandledErr>
     where
         I: NestedDecodeInput,
@@ -291,7 +286,6 @@ impl<M: ManagedTypeApi> NestedDecode for ManagedDecimalSigned<M, NumDecimals> {
 }
 
 impl<M: ManagedTypeApi> TopDecode for ManagedDecimalSigned<M, NumDecimals> {
-    #[inline]
     fn top_decode_or_handle_err<I, H>(top_input: I, h: H) -> Result<Self, H::HandledErr>
     where
         I: TopDecodeInput,

From bcba29e71ca54b770603f2c82ccf429b5276b411 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Fri, 28 Jun 2024 12:43:09 +0200
Subject: [PATCH 1047/1254] test fix

---
 .../scenarios/test_esdt_generation.scen.json  | 24 +++++++++++++++++++
 .../tests/tester_whitebox_legacy_test.rs      |  1 +
 2 files changed, 25 insertions(+)

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 3370d3b55c..d211c85067 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
@@ -9,6 +9,30 @@
                 }
             }
         },
+        {
+            "step": "setState",
+            "accounts": {
+                "0x00000000000000006c8fc18b8e9f8e20089714856ee233b3902a591d0d5f2925": {
+                    "nonce": "1",
+                    "balance": "0",
+                    "esdt": {
+                        "str:COOL-123456": {
+                            "instances": [
+                                {
+                                    "nonce": "0",
+                                    "balance": "1000",
+                                    "royalties": "0",
+                                    "attributes": "0x"
+                                }
+                            ]
+                        }
+                    },
+                    "code": "file:../output/rust-testing-framework-tester.wasm",
+                    "codeMetadata": "0x0506",
+                    "developerRewards": "0"
+                }
+            }
+        },
         {
             "step": "checkState",
             "accounts": {
diff --git a/contracts/feature-tests/rust-testing-framework-tester/tests/tester_whitebox_legacy_test.rs b/contracts/feature-tests/rust-testing-framework-tester/tests/tester_whitebox_legacy_test.rs
index 3ca8162259..a502523505 100644
--- a/contracts/feature-tests/rust-testing-framework-tester/tests/tester_whitebox_legacy_test.rs
+++ b/contracts/feature-tests/rust-testing-framework-tester/tests/tester_whitebox_legacy_test.rs
@@ -294,6 +294,7 @@ fn test_esdt_balance() {
         })
         .assert_ok();
 
+    wrapper.add_mandos_set_account(sc_wrapper.address_ref());
     wrapper.add_mandos_check_account(sc_wrapper.address_ref());
     wrapper.write_mandos_output(TEST_ESDT_OUTPUT_PATH);
 }

From c49ecaa8efa97ac02093d258304ba28a394e7cf5 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Fri, 28 Jun 2024 16:07:19 +0200
Subject: [PATCH 1048/1254] ignored old tests

---
 .../tests/rust_testing_framework_tester_scenario_go_test.rs    | 3 +++
 .../tests/rust_testing_framework_tester_scenario_rs_test.rs    | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/contracts/feature-tests/rust-testing-framework-tester/tests/rust_testing_framework_tester_scenario_go_test.rs b/contracts/feature-tests/rust-testing-framework-tester/tests/rust_testing_framework_tester_scenario_go_test.rs
index 76adbba8ce..ec1d6b3799 100644
--- a/contracts/feature-tests/rust-testing-framework-tester/tests/rust_testing_framework_tester_scenario_go_test.rs
+++ b/contracts/feature-tests/rust-testing-framework-tester/tests/rust_testing_framework_tester_scenario_go_test.rs
@@ -5,16 +5,19 @@ fn world() -> ScenarioWorld {
 }
 
 #[test]
+#[ignore]
 fn test_go() {
     world().run("scenarios/test.scen.json");
 }
 
 #[test]
+#[ignore]
 fn test_esdt_generation_go() {
     world().run("scenarios/test_esdt_generation.scen.json");
 }
 
 #[test]
+#[ignore]
 fn test_multiple_sc_go() {
     world().run("scenarios/test_multiple_sc.scen.json");
 }
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 40aaa7f4fe..e5bfcc2def 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
@@ -10,16 +10,19 @@ fn world() -> ScenarioWorld {
 }
 
 #[test]
+#[ignore]
 fn test_rs() {
     world().run("scenarios/test.scen.json");
 }
 
 #[test]
+#[ignore]
 fn test_esdt_generation_rs() {
     world().run("scenarios/test_esdt_generation.scen.json");
 }
 
 #[test]
+#[ignore]
 fn test_multiple_sc_rs() {
     world().run("scenarios/test_multiple_sc.scen.json");
 }

From c0e73fabeb28e51977c40cc94d5c505731d72994 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Mon, 1 Jul 2024 13:48:22 +0200
Subject: [PATCH 1049/1254] test for ln

---
 .../scenario/tests/managed_decimal_test.rs    | 133 ++++++++++--------
 1 file changed, 77 insertions(+), 56 deletions(-)

diff --git a/framework/scenario/tests/managed_decimal_test.rs b/framework/scenario/tests/managed_decimal_test.rs
index e02e56cf95..19da8bed78 100644
--- a/framework/scenario/tests/managed_decimal_test.rs
+++ b/framework/scenario/tests/managed_decimal_test.rs
@@ -151,38 +151,91 @@ fn test_encode_decode() {
     check_top_encode_decode(fixed_const, bytes);
 }
 
-// #[test]
-// fn test_managed_decimal_ln() {
-//     let fixed = ManagedDecimal::<StaticApi, ConstDecimals<0>>::const_decimals_from_raw(
-//         BigUint::from(23u64),
-//     );
+#[test]
+fn test_managed_decimal_ln() {
+    let fixed =
+        ManagedDecimal::<StaticApi, NumDecimals>::from_raw_units(BigUint::from(23u64), 0usize);
+    let ln_fixed = fixed.ln().unwrap(); // precision of 9 decimal points
 
-//     let ln_fixed = fixed.ln(ConstDecimals::<10>); // precision of 10 decimal points
+    assert_eq!(ln_fixed.to_string(), "3.135514649");
 
-//     println!("{ln_fixed:?}");
-//     assert_eq!(
-//         ln_fixed,
-//         ManagedDecimal::<StaticApi, ConstDecimals<10>>::const_decimals_from_raw(BigUint::from(
-//             31355146488u64
-//         ),)
-//     );
-// }
+    let const_dec = ManagedDecimal::<StaticApi, ConstDecimals<0>>::const_decimals_from_raw(
+        BigUint::from(29299837u64),
+    );
+    let ln_const = const_dec.ln().unwrap();
+
+    assert_eq!(ln_const.to_string(), "17.193072541");
+
+    let small =
+        ManagedDecimal::<StaticApi, ConstDecimals<1>>::const_decimals_from_raw(BigUint::from(1u64)); // 0.1
+    let ln_small = small.ln().unwrap();
+
+    assert_eq!(ln_small.to_string(), "-2.302524494");
+
+    let v_small =
+        ManagedDecimal::<StaticApi, ConstDecimals<2>>::const_decimals_from_raw(BigUint::from(1u64));
+    // 0.01
+    let ln_v_small = v_small.ln().unwrap();
+
+    assert_eq!(ln_v_small.to_string(), "-4.605109587");
+
+    let smallest =
+        ManagedDecimal::<StaticApi, ConstDecimals<6>>::const_decimals_from_raw(BigUint::from(1u64));
+    // 0.000001
+    let ln_smallest = smallest.ln().unwrap();
+
+    assert_eq!(ln_smallest.to_string(), "-13.815449959");
+
+    let frac = ManagedDecimal::<StaticApi, ConstDecimals<2>>::const_decimals_from_raw(
+        BigUint::from(322u64),
+    );
+    // 3.22
+    let ln_frac = frac.ln().unwrap();
+
+    assert_eq!(ln_frac.to_string(), "1.169428520");
+
+    let frac =
+        ManagedDecimal::<StaticApi, NumDecimals>::from_raw_units(BigUint::from(288221u64), 3usize);
+    // 288.221
+    let ln_frac = frac.ln().unwrap();
+
+    assert_eq!(ln_frac.to_string(), "5.663669039");
+}
 
 // #[test]
-// fn test_managed_decimal_ln() {
+// fn test_managed_decimal_log2() {
 //     let fixed =
-//         ManagedDecimal::<StaticApi, NumDecimals>::from_raw_units(BigUint::from(23u64), 0usize);
+//         ManagedDecimal::<StaticApi, NumDecimals>::from_raw_units(BigUint::from(5u64), 0usize);
+//     let ln_fixed = fixed.log2().unwrap();
 
-//     let ln_fixed = fixed.ln(&10usize); // precision of 10 decimal points
+//     assert_eq!(ln_fixed.to_string(), "3.135514649");
 
-//     println!("{ln_fixed:?}");
-//     assert_eq!(
-//         ln_fixed,
-//         ManagedDecimal::<StaticApi, NumDecimals>::from_raw_units(
-//             BigUint::from(31355146488u64),
-//             10usize
-//         )
+//     let const_dec = ManagedDecimal::<StaticApi, ConstDecimals<0>>::const_decimals_from_raw(
+//         BigUint::from(29299837u64),
 //     );
+//     let ln_const = const_dec.log2().unwrap();
+
+//     assert_eq!(ln_const.to_string(), "17.193072541");
+
+//     let small =
+//         ManagedDecimal::<StaticApi, ConstDecimals<1>>::const_decimals_from_raw(BigUint::from(1u64)); // 0.1
+//     let ln_small = small.log2().unwrap();
+
+//     assert_eq!(ln_small.to_string(), "-2.302524494");
+
+//     let v_small =
+//         ManagedDecimal::<StaticApi, ConstDecimals<2>>::const_decimals_from_raw(BigUint::from(1u64));
+//     // 0.01
+//     let ln_v_small = v_small.log2().unwrap();
+
+//     assert_eq!(ln_v_small.to_string(), "-4.605109587");
+
+//     let smallest =
+//         ManagedDecimal::<StaticApi, ConstDecimals<6>>::const_decimals_from_raw(BigUint::from(1u64));
+//     // 0.000001
+//     let ln_smallest = smallest.log2().unwrap();
+
+//     assert_eq!(ln_smallest.to_string(), "-13.815510557");
 // }
 
 // #[test]
@@ -227,35 +280,3 @@ fn test_encode_decode() {
 //         )
 //     );
 // }
-
-// #[test]
-// fn test_managed_decimal_log_any_base() {
-// let fixed = ManagedDecimal::from_raw_units(BigUint::from(10000u64), 1usize);
-// let log2_fixed = fixed.log(
-//     &ManagedDecimal::from_raw_units(BigUint::from(2u64), 1usize),
-//     4usize,
-// );
-// assert_eq!(
-//     log2_fixed,
-//     ManagedDecimal::<StaticApi, NumDecimals>::from_raw_units(
-//         BigUint::from(33219u64),
-//         4usize
-//     )
-// );
-
-// let fixed_const = ManagedDecimal::<StaticApi, ConstDecimals<1>>::const_decimals_from_raw(
-//     BigUint::from(10u64),
-// );
-// let log2_const = fixed_const.log(
-//     &ManagedDecimal::<StaticApi, ConstDecimals<1>>::const_decimals_from_raw(BigUint::from(
-//         2u64,
-//     )),
-//     &ConstDecimals::<10_000>,
-// );
-// assert_eq!(
-//     log2_const,
-//     ManagedDecimal::<StaticApi, ConstDecimals::<10_000>>::const_decimals_from_raw(
-//         BigUint::from(33219u64)
-//     )
-// );
-// }

From 5c94a8d0e5aa3a8a4c9b8fad697ad211ce470ff9 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Mon, 1 Jul 2024 18:10:07 +0300
Subject: [PATCH 1050/1254] arithmetic op - managed decimal signed

---
 .../scenario/tests/managed_decimal_test.rs    | 188 +++++++++++++++---
 1 file changed, 162 insertions(+), 26 deletions(-)

diff --git a/framework/scenario/tests/managed_decimal_test.rs b/framework/scenario/tests/managed_decimal_test.rs
index 19da8bed78..eaaf305b67 100644
--- a/framework/scenario/tests/managed_decimal_test.rs
+++ b/framework/scenario/tests/managed_decimal_test.rs
@@ -1,6 +1,5 @@
 use multiversx_sc::{
     codec::test_util::{check_dep_encode_decode, check_top_encode_decode},
-    derive::{debug_const_managed_decimal, debug_managed_decimal},
     types::{
         BigFloat, BigInt, BigUint, ConstDecimals, ManagedDecimal, ManagedDecimalSigned, NumDecimals,
     },
@@ -86,43 +85,180 @@ pub fn test_managed_decimal() {
 }
 
 #[test]
-fn test_managed_decimal_macros() {
-    let small = debug_managed_decimal!("3.1");
-    assert_eq!(small.scale(), 1usize);
-    assert_eq!(small.into_raw_units(), &BigUint::from(31u64));
-    assert_eq!(&small.trunc(), &BigUint::from(3u64));
+pub fn test_addition_managed_decimal_signed() {
+    let fixed_1 = ManagedDecimalSigned::<StaticApi, ConstDecimals<2>>::from(BigInt::from(1i64));
+    let fixed_2 = ManagedDecimalSigned::<StaticApi, ConstDecimals<2>>::from(BigInt::from(3i64));
+    let fixed_3 = ManagedDecimalSigned::<StaticApi, ConstDecimals<2>>::from(BigInt::from(-5i64));
+    let fixed_4 = ManagedDecimalSigned::<StaticApi, ConstDecimals<2>>::from(BigInt::from(-2i64));
 
-    let three = debug_const_managed_decimal!("1.654");
-    assert_eq!(three.scale(), 3usize);
+    let addition_1 = fixed_1.clone() + fixed_2.clone();
+    assert_eq!(
+        addition_1,
+        ManagedDecimalSigned::<StaticApi, ConstDecimals<2>>::from(BigInt::from(4i64))
+    );
+    assert_eq!(addition_1.into_raw_units(), &BigInt::from(400i64));
+    assert_eq!(addition_1.trunc(), BigInt::from(4i64));
 
-    let four = debug_managed_decimal!("89632.2223");
-    assert_eq!(four.scale(), 4usize);
+    let addition_2 = fixed_1.clone() + fixed_3.clone();
+    assert_eq!(
+        addition_2,
+        ManagedDecimalSigned::<StaticApi, ConstDecimals<2>>::from(BigInt::from(-4i64))
+    );
+    assert_eq!(addition_2.into_raw_units(), &BigInt::from(-400i64));
+    assert_eq!(addition_2.trunc(), BigInt::from(-4i64));
 
-    let huge = debug_const_managed_decimal!("8723.283764652365232");
-    assert_eq!(huge.scale(), 15usize);
+    let addition_3 = fixed_3.clone() + fixed_4.clone();
     assert_eq!(
-        huge.into_raw_units(),
-        &BigUint::from(8723283764652365232u64)
+        addition_3,
+        ManagedDecimalSigned::<StaticApi, ConstDecimals<2>>::from(BigInt::from(-7i64))
     );
-    assert_eq!(&huge.trunc(), &BigUint::from(8723u64));
+    assert_eq!(addition_3.into_raw_units(), &BigInt::from(-700i64));
+    assert_eq!(addition_3.trunc(), BigInt::from(-7i64));
+
+    let addition_4 = fixed_4.clone() + fixed_2.clone();
+    assert_eq!(
+        addition_4,
+        ManagedDecimalSigned::<StaticApi, ConstDecimals<2>>::from(BigInt::from(1i64))
+    );
+    assert_eq!(addition_4.into_raw_units(), &BigInt::from(100i64));
+    assert_eq!(addition_4.trunc(), BigInt::from(1i64));
 }
 
 #[test]
-fn test_managed_decimal_conversion() {
-    let fixed: ManagedDecimalSigned<StaticApi, NumDecimals> =
-        ManagedDecimalSigned::from_raw_units(BigInt::from(123456789123456789i64), 15usize); //123,45....
+pub fn test_substraction_managed_decimal_signed() {
+    let fixed_1 = ManagedDecimalSigned::<StaticApi, ConstDecimals<2>>::from(BigInt::from(1i64));
+    let fixed_2 = ManagedDecimalSigned::<StaticApi, ConstDecimals<2>>::from(BigInt::from(3i64));
+    let fixed_3 = ManagedDecimalSigned::<StaticApi, ConstDecimals<2>>::from(BigInt::from(-5i64));
+    let fixed_4 = ManagedDecimalSigned::<StaticApi, ConstDecimals<2>>::from(BigInt::from(-2i64));
 
-    let float_coresp = fixed.to_big_float();
+    let substraction_1 = fixed_2.clone() - fixed_1.clone();
+    assert_eq!(
+        substraction_1,
+        ManagedDecimalSigned::<StaticApi, ConstDecimals<2>>::from(BigInt::from(2i64))
+    );
+    assert_eq!(substraction_1.into_raw_units(), &BigInt::from(200i64));
+    assert_eq!(substraction_1.trunc(), BigInt::from(2i64));
 
-    // hook not available yet, uncomment when available
-    // assert_eq!(
-    //     float_coresp.to_buffer(),
-    //     ManagedBuffer::from("123.456789123456789")
-    // );
+    let substraction_2 = fixed_1.clone() - fixed_2.clone();
+    assert_eq!(
+        substraction_2,
+        ManagedDecimalSigned::<StaticApi, ConstDecimals<2>>::from(BigInt::from(-2i64))
+    );
+    assert_eq!(substraction_2.into_raw_units(), &BigInt::from(-200i64));
+    assert_eq!(substraction_2.trunc(), BigInt::from(-2i64));
+
+    let substraction_3 = substraction_2 - fixed_3.clone();
+    assert_eq!(
+        substraction_3,
+        ManagedDecimalSigned::<StaticApi, ConstDecimals<2>>::from(BigInt::from(3i64))
+    );
+    assert_eq!(substraction_3.into_raw_units(), &BigInt::from(300i64));
+    assert_eq!(substraction_3.trunc(), BigInt::from(3i64));
 
+    let substraction_4 = fixed_3.clone() - fixed_4.clone();
     assert_eq!(
-        float_coresp,
-        BigFloat::from_frac(123456789123456789i64, 1_000_000_000_000_000i64)
+        substraction_4,
+        ManagedDecimalSigned::<StaticApi, ConstDecimals<2>>::from(BigInt::from(-3i64))
+    );
+    assert_eq!(substraction_4.into_raw_units(), &BigInt::from(-300i64));
+    assert_eq!(substraction_4.trunc(), BigInt::from(-3i64));
+}
+
+#[test]
+pub fn test_multiplication_managed_decimal_signed() {
+    let fixed_1 = ManagedDecimalSigned::<StaticApi, ConstDecimals<2>>::from(BigInt::from(1i64));
+    let fixed_2 = ManagedDecimalSigned::<StaticApi, ConstDecimals<2>>::from(BigInt::from(3i64));
+    let fixed_3 = ManagedDecimalSigned::<StaticApi, ConstDecimals<2>>::from(BigInt::from(-5i64));
+    let fixed_4 = ManagedDecimalSigned::<StaticApi, ConstDecimals<2>>::from(BigInt::from(-2i64));
+
+    let multiplication_1 = fixed_1.clone() * fixed_2.clone();
+    assert_eq!(
+        multiplication_1,
+        ManagedDecimalSigned::<StaticApi, ConstDecimals<6>>::from(BigInt::from(3i64))
+    );
+
+    let multiplication_2 = fixed_3.clone() * fixed_2.clone();
+    assert_eq!(
+        multiplication_2,
+        ManagedDecimalSigned::<StaticApi, ConstDecimals<6>>::from(BigInt::from(-15i64))
+    );
+
+    let multiplication_2 = fixed_3.clone() * fixed_4.clone();
+    assert_eq!(
+        multiplication_2,
+        ManagedDecimalSigned::<StaticApi, ConstDecimals<6>>::from(BigInt::from(10i64))
+    );
+}
+
+#[test]
+pub fn test_devision_managed_decimal_signed() {
+    let fixed_1 = ManagedDecimalSigned::<StaticApi, ConstDecimals<2>>::from(BigInt::from(6i64));
+    let fixed_2 = ManagedDecimalSigned::<StaticApi, ConstDecimals<2>>::from(BigInt::from(2i64));
+    let fixed_3 = ManagedDecimalSigned::<StaticApi, ConstDecimals<2>>::from(BigInt::from(-8i64));
+    let fixed_4 = ManagedDecimalSigned::<StaticApi, ConstDecimals<2>>::from(BigInt::from(-2i64));
+
+    let division_1 = fixed_1.clone() / fixed_2;
+    assert_eq!(
+        division_1,
+        ManagedDecimalSigned::<StaticApi, ConstDecimals<2>>::from(BigInt::from(3i64))
+    );
+
+    let division_2 = fixed_1 / fixed_4.clone();
+    assert_eq!(
+        division_2,
+        ManagedDecimalSigned::<StaticApi, ConstDecimals<2>>::from(BigInt::from(-3i64))
+    );
+
+    let division_3 = fixed_3 / fixed_4;
+    assert_eq!(
+        division_3,
+        ManagedDecimalSigned::<StaticApi, ConstDecimals<2>>::from(BigInt::from(4i64))
+    );
+}
+
+#[test]
+pub fn test_rescale_managed_decimal_signed() {
+    let fixed_1: ManagedDecimalSigned<StaticApi, NumDecimals> =
+        ManagedDecimalSigned::from_raw_units(BigInt::from(-10000i64), 2usize);
+
+    let fixed_2 = fixed_1.rescale(3usize);
+    assert_eq!(
+        fixed_2,
+        ManagedDecimalSigned::from_raw_units(BigInt::from(-100000000i64), 6usize)
+    );
+
+    let fixed_3: ManagedDecimalSigned<StaticApi, ConstDecimals<2>> =
+        ManagedDecimalSigned::from(BigInt::from(-1500i64));
+    let fixed_4 = fixed_3.rescale(ConstDecimals::<8>);
+    assert_eq!(fixed_4.into_raw_units(), &BigInt::from(-150000000000i64));
+
+    let fixed_5: ManagedDecimalSigned<StaticApi, NumDecimals> =
+        ManagedDecimalSigned::from_raw_units(BigInt::from(-5i64), 5usize);
+    let fixed_6 = fixed_5.rescale(ConstDecimals::<3>);
+    assert_eq!(
+        fixed_6,
+        ManagedDecimalSigned::<StaticApi, ConstDecimals<3>>::const_decimals_from_raw(BigInt::from(
+            -500i64
+        ))
+    );
+
+    let float_1 = BigFloat::<StaticApi>::from_frac(-3i64, 2i64);
+    let fixed_float_1 = ManagedDecimalSigned::<StaticApi, ConstDecimals<1>>::from_big_float(
+        &float_1,
+        ConstDecimals::<1>,
+    );
+    let fixed_float_2 =
+        ManagedDecimalSigned::<StaticApi, NumDecimals>::from_big_float(&float_1, 1usize);
+
+    assert_eq!(
+        fixed_float_1,
+        ManagedDecimalSigned::<StaticApi, ConstDecimals<1>>::const_decimals_from_raw(BigInt::from(
+            -15
+        ))
+    );
+    assert_eq!(
+        fixed_float_2,
+        ManagedDecimalSigned::<StaticApi, NumDecimals>::from_raw_units(BigInt::from(-15), 1usize)
     );
 }
 

From df7f9d86604ce68e9362ec35978987ec4b03c417 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 2 Jul 2024 03:47:23 +0300
Subject: [PATCH 1051/1254] interactor - proper error when code is missing

---
 .../scenario/src/facade/world_tx/scenario_tx_env.rs  | 12 +++++-------
 .../src/interactor_tx/interactor_prepare_async.rs    |  4 ++--
 sdk/scenario-format/src/interpret_trait.rs           |  2 +-
 .../src/value_interpreter/vm_identifier.rs           |  2 +-
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/framework/scenario/src/facade/world_tx/scenario_tx_env.rs b/framework/scenario/src/facade/world_tx/scenario_tx_env.rs
index 91aa212fc3..339ed9b38b 100644
--- a/framework/scenario/src/facade/world_tx/scenario_tx_env.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_tx_env.rs
@@ -1,5 +1,3 @@
-use std::path::PathBuf;
-
 use multiversx_chain_scenario_format::interpret_trait::InterpreterContext;
 use multiversx_sc::types::{ManagedAddress, ManagedBuffer, TxEnv, H256};
 
@@ -13,7 +11,7 @@ pub trait ScenarioTxEnv: TxEnv {
 /// The actual data required to run a scenario locally. This is the minimal environment needed to run txs.
 #[derive(Default, Debug, Clone)]
 pub struct ScenarioTxEnvData {
-    pub context_path: PathBuf,
+    pub interpreter_context: InterpreterContext,
     pub tx_hash: Option<H256>,
 }
 
@@ -37,9 +35,7 @@ impl TxEnv for ScenarioTxEnvData {
 
 impl ScenarioTxEnvData {
     pub fn interpreter_context(&self) -> InterpreterContext {
-        InterpreterContext::default()
-            .with_dir(self.context_path.clone())
-            .with_allowed_missing_files()
+        self.interpreter_context.clone()
     }
 }
 
@@ -52,7 +48,9 @@ impl ScenarioTxEnv for ScenarioTxEnvData {
 impl ScenarioWorld {
     pub(crate) fn new_env_data(&self) -> ScenarioTxEnvData {
         ScenarioTxEnvData {
-            context_path: self.current_dir.clone(),
+            interpreter_context: InterpreterContext::new()
+                .with_dir(self.current_dir.clone())
+                .with_allowed_missing_files(),
             tx_hash: None,
         }
     }
diff --git a/framework/snippets/src/interactor_tx/interactor_prepare_async.rs b/framework/snippets/src/interactor_tx/interactor_prepare_async.rs
index 43ca7c403c..073641f811 100644
--- a/framework/snippets/src/interactor_tx/interactor_prepare_async.rs
+++ b/framework/snippets/src/interactor_tx/interactor_prepare_async.rs
@@ -1,11 +1,11 @@
-use multiversx_sc_scenario::ScenarioTxEnvData;
+use multiversx_sc_scenario::{imports::InterpreterContext, ScenarioTxEnvData};
 
 use crate::Interactor;
 
 impl Interactor {
     pub(crate) fn new_env_data(&self) -> ScenarioTxEnvData {
         ScenarioTxEnvData {
-            context_path: self.current_dir.clone(),
+            interpreter_context: InterpreterContext::new().with_dir(self.current_dir.clone()),
             tx_hash: None,
         }
     }
diff --git a/sdk/scenario-format/src/interpret_trait.rs b/sdk/scenario-format/src/interpret_trait.rs
index a89bb1bbbe..306349661f 100644
--- a/sdk/scenario-format/src/interpret_trait.rs
+++ b/sdk/scenario-format/src/interpret_trait.rs
@@ -2,7 +2,7 @@ use std::path::PathBuf;
 
 use crate::value_interpreter::VMIdentifier;
 
-#[derive(Default, Clone)]
+#[derive(Default, Clone, Debug)]
 pub struct InterpreterContext {
     pub context_path: PathBuf,
     pub vm_type: VMIdentifier,
diff --git a/sdk/scenario-format/src/value_interpreter/vm_identifier.rs b/sdk/scenario-format/src/value_interpreter/vm_identifier.rs
index 33eb933ef1..8c46cc9673 100644
--- a/sdk/scenario-format/src/value_interpreter/vm_identifier.rs
+++ b/sdk/scenario-format/src/value_interpreter/vm_identifier.rs
@@ -1,6 +1,6 @@
 pub const VM_TYPE_LENGTH: usize = 2;
 
-#[derive(Clone, Copy)]
+#[derive(Clone, Copy, Debug)]
 pub struct VMIdentifier {
     pub vm_type: [u8; VM_TYPE_LENGTH],
 }

From 967e501f9a67bf6dacebd6d2eae1f59b985a3b36 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 2 Jul 2024 03:48:46 +0300
Subject: [PATCH 1052/1254] adder interactor code path cleanup

---
 .../examples/adder/interact/src/basic_interact.rs    | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/contracts/examples/adder/interact/src/basic_interact.rs b/contracts/examples/adder/interact/src/basic_interact.rs
index ee11ac5844..7e0d250f74 100644
--- a/contracts/examples/adder/interact/src/basic_interact.rs
+++ b/contracts/examples/adder/interact/src/basic_interact.rs
@@ -11,6 +11,8 @@ use multiversx_sc_snippets::imports::*;
 
 const INTERACTOR_SCENARIO_TRACE_PATH: &str = "interactor_trace.scen.json";
 
+const ADDER_CODE_PATH: MxscPath = MxscPath::new("../output/adder.mxsc.json");
+
 #[tokio::main]
 async fn main() {
     env_logger::init();
@@ -42,7 +44,6 @@ async fn main() {
 struct AdderInteract {
     interactor: Interactor,
     wallet_address: Bech32Address,
-    adder_code: BytesValue,
     state: State,
 }
 
@@ -54,15 +55,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(),
-        );
 
         Self {
             interactor,
             wallet_address: wallet_address.into(),
-            adder_code,
             state: State::load_state(),
         }
     }
@@ -84,7 +80,7 @@ impl AdderInteract {
             .from(&self.wallet_address)
             .typed(adder_proxy::AdderProxy)
             .init(0u32)
-            .code(&self.adder_code)
+            .code(ADDER_CODE_PATH)
             .returns(ReturnsNewBech32Address)
             .prepare_async()
             .run()
@@ -109,7 +105,7 @@ impl AdderInteract {
                 tx.from(&self.wallet_address)
                     .typed(adder_proxy::AdderProxy)
                     .init(0u32)
-                    .code(&self.adder_code)
+                    .code(ADDER_CODE_PATH)
                     .gas(NumExpr("70,000,000"))
                     .returns(ReturnsNewBech32Address)
             });

From 0075097cd535e9beed57575baa0b192ece0d46c9 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Tue, 2 Jul 2024 13:05:06 +0300
Subject: [PATCH 1053/1254] fixed from_big_float conversion

---
 .../src/big_float_operators_wrapped.rs        |  2 +-
 .../base/src/types/managed/basic/big_float.rs |  2 +-
 .../managed_decimal/managed_decimal_signed.rs |  3 +-
 framework/scenario/tests/big_float_test.rs    | 16 +++----
 .../scenario/tests/managed_decimal_test.rs    | 42 +++++++++++++++++++
 5 files changed, 53 insertions(+), 12 deletions(-)

diff --git a/contracts/feature-tests/big-float-features/src/big_float_operators_wrapped.rs b/contracts/feature-tests/big-float-features/src/big_float_operators_wrapped.rs
index f44ca95e5b..67276f259c 100644
--- a/contracts/feature-tests/big-float-features/src/big_float_operators_wrapped.rs
+++ b/contracts/feature-tests/big-float-features/src/big_float_operators_wrapped.rs
@@ -166,6 +166,6 @@ pub trait BigFloatWrappedOperators: big_float_operators::BigFloatOperators {
         precision: usize,
     ) -> ManagedDecimalSigned<Self::Api, usize> {
         let number = self.ln_big_float_ref(&BigFloat::from(a));
-        number.to_managed_decimal(precision)
+        number.to_managed_decimal_signed(precision)
     }
 }
diff --git a/framework/base/src/types/managed/basic/big_float.rs b/framework/base/src/types/managed/basic/big_float.rs
index 17f866e39f..ad24469d55 100644
--- a/framework/base/src/types/managed/basic/big_float.rs
+++ b/framework/base/src/types/managed/basic/big_float.rs
@@ -176,7 +176,7 @@ impl<M: ManagedTypeApi> BigFloat<M> {
         (self * denominator).trunc()
     }
 
-    pub fn to_managed_decimal<T: Decimals>(&self, decimals: T) -> ManagedDecimalSigned<M, T> {
+    pub fn to_managed_decimal_signed<T: Decimals>(&self, decimals: T) -> ManagedDecimalSigned<M, T> {
         ManagedDecimalSigned::<M, T>::from_big_float(self, decimals)
     }
 
diff --git a/framework/base/src/types/managed/wrapped/managed_decimal/managed_decimal_signed.rs b/framework/base/src/types/managed/wrapped/managed_decimal/managed_decimal_signed.rs
index bb2e574a0c..6f73fb3d47 100644
--- a/framework/base/src/types/managed/wrapped/managed_decimal/managed_decimal_signed.rs
+++ b/framework/base/src/types/managed/wrapped/managed_decimal/managed_decimal_signed.rs
@@ -146,9 +146,8 @@ impl<M: ManagedTypeApi, D: Decimals> ManagedDecimalSigned<M, D> {
         num_decimals: T,
     ) -> ManagedDecimalSigned<M, T> {
         let scaling_factor: &BigUint<M> = &num_decimals.scaling_factor();
-        let magnitude = big_float.magnitude();
 
-        let scaled = &BigFloat::from(scaling_factor) * &magnitude;
+        let scaled = &BigFloat::from(scaling_factor) * &big_float;
         let fixed_big_int = scaled.trunc();
 
         ManagedDecimalSigned::from_raw_units(fixed_big_int, num_decimals)
diff --git a/framework/scenario/tests/big_float_test.rs b/framework/scenario/tests/big_float_test.rs
index e29e5858b9..b3044a1ab5 100644
--- a/framework/scenario/tests/big_float_test.rs
+++ b/framework/scenario/tests/big_float_test.rs
@@ -17,12 +17,12 @@ fn big_float_overflow_test_rs() {
 
     let third_float = BigFloat::<StaticApi>::from_sci(1_005, -3)
         .pow(exp)
-        .to_managed_decimal(17usize);
+        .to_managed_decimal_signed(17usize);
     let third = third_float.into_raw_units();
 
     let forth_float = BigFloat::<StaticApi>::from_sci(1_005, -3)
         .pow(exp)
-        .to_managed_decimal(16usize);
+        .to_managed_decimal_signed(16usize);
     let forth = forth_float.into_raw_units();
 
     assert_eq!(
@@ -49,7 +49,7 @@ fn big_float_overflow_test_rs() {
 fn big_float_ln_test_rs() {
     let x = BigFloat::<StaticApi>::from(23i64);
     let ln_x = x.ln().unwrap();
-    assert_eq!(ln_x.to_managed_decimal(9usize).to_string(), "3.135514648");
+    assert_eq!(ln_x.to_managed_decimal_signed(9usize).to_string(), "3.135514648");
     assert!(ln_x.is_close(
         &BigFloat::from_frac(3135514648, 1_000_000_000), // 3.135514648
         &BigFloat::from_frac(1, 1_000_000_000)
@@ -58,7 +58,7 @@ fn big_float_ln_test_rs() {
     let big = BigFloat::<StaticApi>::from(382747812i64);
     let ln_big = big.ln().unwrap();
     assert_eq!(
-        ln_big.to_managed_decimal(9usize).to_string(),
+        ln_big.to_managed_decimal_signed(9usize).to_string(),
         "19.762913880"
     );
     assert!(ln_big.is_close(
@@ -69,7 +69,7 @@ fn big_float_ln_test_rs() {
     let biggest = BigFloat::<StaticApi>::from(999999999i64);
     let ln_biggest = biggest.ln().unwrap();
     assert_eq!(
-        ln_biggest.to_managed_decimal(9usize).to_string(),
+        ln_biggest.to_managed_decimal_signed(9usize).to_string(),
         "20.723319778"
     );
     assert!(ln_biggest.is_close(
@@ -80,7 +80,7 @@ fn big_float_ln_test_rs() {
     let small = BigFloat::<StaticApi>::from_frac(3i64, 2i64);
     let ln_small = small.ln().unwrap();
     assert_eq!(
-        ln_small.to_managed_decimal(9usize).to_string(),
+        ln_small.to_managed_decimal_signed(9usize).to_string(),
         "0.405448248"
     );
     assert!(ln_small.is_close(
@@ -91,7 +91,7 @@ fn big_float_ln_test_rs() {
     let smallest = BigFloat::<StaticApi>::from(1i64);
     let ln_smallest = smallest.ln().unwrap();
     assert_eq!(
-        ln_smallest.to_managed_decimal(9usize).to_string(),
+        ln_smallest.to_managed_decimal_signed(9usize).to_string(),
         "0.000000000"
     );
     assert!(ln_smallest.is_close(
@@ -101,7 +101,7 @@ fn big_float_ln_test_rs() {
 
     let y = BigFloat::<StaticApi>::from_frac(11i64, 10i64);
     let ln_y = y.ln().unwrap();
-    assert_eq!(ln_y.to_managed_decimal(9usize).to_string(), "0.095251830");
+    assert_eq!(ln_y.to_managed_decimal_signed(9usize).to_string(), "0.095251830");
     assert!(ln_y.is_close(
         &BigFloat::from_frac(95251830, 1_000_000_000), // 0.095310179
         &BigFloat::from_frac(1, 1_000_000_000)
diff --git a/framework/scenario/tests/managed_decimal_test.rs b/framework/scenario/tests/managed_decimal_test.rs
index eaaf305b67..e92bacc202 100644
--- a/framework/scenario/tests/managed_decimal_test.rs
+++ b/framework/scenario/tests/managed_decimal_test.rs
@@ -1,5 +1,6 @@
 use multiversx_sc::{
     codec::test_util::{check_dep_encode_decode, check_top_encode_decode},
+    derive::{debug_const_managed_decimal, debug_managed_decimal},
     types::{
         BigFloat, BigInt, BigUint, ConstDecimals, ManagedDecimal, ManagedDecimalSigned, NumDecimals,
     },
@@ -84,6 +85,47 @@ pub fn test_managed_decimal() {
     );
 }
 
+#[test]
+fn test_managed_decimal_macros() {
+    let small = debug_managed_decimal!("3.1");
+    assert_eq!(small.scale(), 1usize);
+    assert_eq!(small.into_raw_units(), &BigUint::from(31u64));
+    assert_eq!(&small.trunc(), &BigUint::from(3u64));
+
+    let three = debug_const_managed_decimal!("1.654");
+    assert_eq!(three.scale(), 3usize);
+
+    let four = debug_managed_decimal!("89632.2223");
+    assert_eq!(four.scale(), 4usize);
+
+    let huge = debug_const_managed_decimal!("8723.283764652365232");
+    assert_eq!(huge.scale(), 15usize);
+    assert_eq!(
+        huge.into_raw_units(),
+        &BigUint::from(8723283764652365232u64)
+    );
+    assert_eq!(&huge.trunc(), &BigUint::from(8723u64));
+}
+
+#[test]
+fn test_managed_decimal_conversion() {
+    let fixed: ManagedDecimalSigned<StaticApi, NumDecimals> =
+        ManagedDecimalSigned::from_raw_units(BigInt::from(123456789123456789i64), 15usize);
+    //123,45....
+    let float_coresp = fixed.to_big_float();
+
+    // hook not available yet, uncomment when available
+    // assert_eq!(
+    //     float_coresp.to_buffer(),
+    //     ManagedBuffer::from("123.456789123456789")
+    // );
+
+    assert_eq!(
+        float_coresp,
+        BigFloat::from_frac(123456789123456789i64, 1_000_000_000_000_000i64),
+    );
+}
+
 #[test]
 pub fn test_addition_managed_decimal_signed() {
     let fixed_1 = ManagedDecimalSigned::<StaticApi, ConstDecimals<2>>::from(BigInt::from(1i64));

From 5ae858ac1432a6a3edf1fe40fb4e7d048f55771c Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Tue, 2 Jul 2024 13:13:24 +0300
Subject: [PATCH 1054/1254] fix clippy + cargo fmt

---
 framework/base/src/types/managed/basic/big_float.rs    |  5 ++++-
 .../wrapped/managed_decimal/managed_decimal_signed.rs  |  2 +-
 framework/scenario/tests/big_float_test.rs             | 10 ++++++++--
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/framework/base/src/types/managed/basic/big_float.rs b/framework/base/src/types/managed/basic/big_float.rs
index ad24469d55..54850a1672 100644
--- a/framework/base/src/types/managed/basic/big_float.rs
+++ b/framework/base/src/types/managed/basic/big_float.rs
@@ -176,7 +176,10 @@ impl<M: ManagedTypeApi> BigFloat<M> {
         (self * denominator).trunc()
     }
 
-    pub fn to_managed_decimal_signed<T: Decimals>(&self, decimals: T) -> ManagedDecimalSigned<M, T> {
+    pub fn to_managed_decimal_signed<T: Decimals>(
+        &self,
+        decimals: T,
+    ) -> ManagedDecimalSigned<M, T> {
         ManagedDecimalSigned::<M, T>::from_big_float(self, decimals)
     }
 
diff --git a/framework/base/src/types/managed/wrapped/managed_decimal/managed_decimal_signed.rs b/framework/base/src/types/managed/wrapped/managed_decimal/managed_decimal_signed.rs
index 6f73fb3d47..c8ee403f37 100644
--- a/framework/base/src/types/managed/wrapped/managed_decimal/managed_decimal_signed.rs
+++ b/framework/base/src/types/managed/wrapped/managed_decimal/managed_decimal_signed.rs
@@ -147,7 +147,7 @@ impl<M: ManagedTypeApi, D: Decimals> ManagedDecimalSigned<M, D> {
     ) -> ManagedDecimalSigned<M, T> {
         let scaling_factor: &BigUint<M> = &num_decimals.scaling_factor();
 
-        let scaled = &BigFloat::from(scaling_factor) * &big_float;
+        let scaled = &BigFloat::from(scaling_factor) * big_float;
         let fixed_big_int = scaled.trunc();
 
         ManagedDecimalSigned::from_raw_units(fixed_big_int, num_decimals)
diff --git a/framework/scenario/tests/big_float_test.rs b/framework/scenario/tests/big_float_test.rs
index b3044a1ab5..d103f45208 100644
--- a/framework/scenario/tests/big_float_test.rs
+++ b/framework/scenario/tests/big_float_test.rs
@@ -49,7 +49,10 @@ fn big_float_overflow_test_rs() {
 fn big_float_ln_test_rs() {
     let x = BigFloat::<StaticApi>::from(23i64);
     let ln_x = x.ln().unwrap();
-    assert_eq!(ln_x.to_managed_decimal_signed(9usize).to_string(), "3.135514648");
+    assert_eq!(
+        ln_x.to_managed_decimal_signed(9usize).to_string(),
+        "3.135514648"
+    );
     assert!(ln_x.is_close(
         &BigFloat::from_frac(3135514648, 1_000_000_000), // 3.135514648
         &BigFloat::from_frac(1, 1_000_000_000)
@@ -101,7 +104,10 @@ fn big_float_ln_test_rs() {
 
     let y = BigFloat::<StaticApi>::from_frac(11i64, 10i64);
     let ln_y = y.ln().unwrap();
-    assert_eq!(ln_y.to_managed_decimal_signed(9usize).to_string(), "0.095251830");
+    assert_eq!(
+        ln_y.to_managed_decimal_signed(9usize).to_string(),
+        "0.095251830"
+    );
     assert!(ln_y.is_close(
         &BigFloat::from_frac(95251830, 1_000_000_000), // 0.095310179
         &BigFloat::from_frac(1, 1_000_000_000)

From 6cff650772df1f61caf43b8260fdc41208359336 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Tue, 2 Jul 2024 15:17:34 +0200
Subject: [PATCH 1055/1254] precision test

---
 framework/scenario/tests/managed_decimal_test.rs | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/framework/scenario/tests/managed_decimal_test.rs b/framework/scenario/tests/managed_decimal_test.rs
index 19da8bed78..a30290f27b 100644
--- a/framework/scenario/tests/managed_decimal_test.rs
+++ b/framework/scenario/tests/managed_decimal_test.rs
@@ -200,6 +200,15 @@ fn test_managed_decimal_ln() {
     let ln_frac = frac.ln().unwrap();
 
     assert_eq!(ln_frac.to_string(), "5.663669039");
+
+    let frac = ManagedDecimal::<StaticApi, NumDecimals>::from_raw_units(
+        BigUint::from(288211000000u64),
+        9usize,
+    );
+    // 288.211000000
+    let ln_frac = frac.ln().unwrap();
+
+    assert_eq!(ln_frac.to_string(), "5.663649649");
 }
 
 // #[test]

From 7d6e9e98290b5e36d4863eb79a7ad4aff26cf231 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Tue, 2 Jul 2024 15:21:19 +0200
Subject: [PATCH 1056/1254] upgrade fn gen in sc-meta snippets

---
 .../generate_snippets/snippet_sc_functions_gen.rs        | 4 ++++
 .../contract/generate_snippets/snippet_template_gen.rs   | 9 +++++++++
 2 files changed, 13 insertions(+)

diff --git a/framework/meta-lib/src/contract/generate_snippets/snippet_sc_functions_gen.rs b/framework/meta-lib/src/contract/generate_snippets/snippet_sc_functions_gen.rs
index 09d6aa7660..cb67ddc0e3 100644
--- a/framework/meta-lib/src/contract/generate_snippets/snippet_sc_functions_gen.rs
+++ b/framework/meta-lib/src/contract/generate_snippets/snippet_sc_functions_gen.rs
@@ -35,6 +35,10 @@ pub(crate) fn write_interact_struct_impl(
 
     write_deploy_method_impl(file, &abi.constructors[0], &abi.name);
 
+    for upgrade_abi in &abi.upgrade_constructors {
+        write_endpoint_impl(file, upgrade_abi, &abi.name);
+    }
+
     for endpoint_abi in &abi.endpoints {
         write_endpoint_impl(file, endpoint_abi, &abi.name);
     }
diff --git a/framework/meta-lib/src/contract/generate_snippets/snippet_template_gen.rs b/framework/meta-lib/src/contract/generate_snippets/snippet_template_gen.rs
index 7223f1d6c4..bcad2efcc3 100644
--- a/framework/meta-lib/src/contract/generate_snippets/snippet_template_gen.rs
+++ b/framework/meta-lib/src/contract/generate_snippets/snippet_template_gen.rs
@@ -55,6 +55,15 @@ async fn main() {{
     // all contracts have a deploy snippet
     writeln!(file, r#"        "deploy" => interact.deploy().await,"#).unwrap();
 
+    for upgrade_endpoint in &abi.upgrade_constructors {
+        writeln!(
+            file,
+            r#"        "{}" => interact.{}().await,"#,
+            upgrade_endpoint.name, upgrade_endpoint.rust_method_name
+        )
+        .unwrap();
+    }
+
     for endpoint in &abi.endpoints {
         writeln!(
             file,

From 58065be2ade4ac38507ee7436fd65657e33acc5b Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 28 Jun 2024 15:11:32 +0300
Subject: [PATCH 1057/1254] ManagedDecimal log2 implementation

---
 .../types/managed/wrapped/managed_decimal.rs  |   2 +-
 ...mal_ln.rs => managed_decimal_logarithm.rs} |  55 +++++++++
 .../base/src/types/math_util/logarithm_i64.rs |  17 +++
 tools/plotter/src/lib.rs                      |  43 +++++--
 ...ogarithm_bf.rs => plotter_ln_big_float.rs} |   4 +-
 ...logarithm_bu.rs => plotter_ln_big_uint.rs} |   4 +-
 ...hm_md.rs => plotter_ln_managed_decimal.rs} |   6 +-
 .../src/plotter_log2_managed_decimal.rs       | 116 ++++++++++++++++++
 tools/plotter/www/index.html                  |  14 ++-
 tools/plotter/www/index.js                    |   8 ++
 10 files changed, 245 insertions(+), 24 deletions(-)
 rename framework/base/src/types/managed/wrapped/managed_decimal/{managed_decimal_ln.rs => managed_decimal_logarithm.rs} (54%)
 rename tools/plotter/src/{logarithm_bf.rs => plotter_ln_big_float.rs} (98%)
 rename tools/plotter/src/{logarithm_bu.rs => plotter_ln_big_uint.rs} (98%)
 rename tools/plotter/src/{logarithm_md.rs => plotter_ln_managed_decimal.rs} (96%)
 create mode 100644 tools/plotter/src/plotter_log2_managed_decimal.rs

diff --git a/framework/base/src/types/managed/wrapped/managed_decimal.rs b/framework/base/src/types/managed/wrapped/managed_decimal.rs
index 1d225784a5..d5811031d9 100644
--- a/framework/base/src/types/managed/wrapped/managed_decimal.rs
+++ b/framework/base/src/types/managed/wrapped/managed_decimal.rs
@@ -1,7 +1,7 @@
 mod decimals;
 mod managed_decimal_cmp;
 mod managed_decimal_cmp_signed;
-mod managed_decimal_ln;
+mod managed_decimal_logarithm;
 mod managed_decimal_macros;
 mod managed_decimal_op_add;
 mod managed_decimal_op_add_signed;
diff --git a/framework/base/src/types/managed/wrapped/managed_decimal/managed_decimal_ln.rs b/framework/base/src/types/managed/wrapped/managed_decimal/managed_decimal_logarithm.rs
similarity index 54%
rename from framework/base/src/types/managed/wrapped/managed_decimal/managed_decimal_ln.rs
rename to framework/base/src/types/managed/wrapped/managed_decimal/managed_decimal_logarithm.rs
index 231441091d..41f173a50a 100644
--- a/framework/base/src/types/managed/wrapped/managed_decimal/managed_decimal_ln.rs
+++ b/framework/base/src/types/managed/wrapped/managed_decimal/managed_decimal_logarithm.rs
@@ -41,6 +41,38 @@ fn compute_ln<M: ManagedTypeApi>(
     ))
 }
 
+fn compute_log2<M: ManagedTypeApi>(
+    data: &BigUint<M>,
+    num_decimals: NumDecimals,
+) -> Option<ManagedDecimalSigned<M, ConstDecimals<9>>> {
+    // start with aproximation, based on position of the most significant bit
+    let Some(log2_floor) = data.log2_floor() else {
+        // means the input was zero
+        return None;
+    };
+
+    let scaling_factor_9 = ConstDecimals::<9>.scaling_factor();
+    let divisor = BigUint::from(1u64) << log2_floor as usize;
+    let normalized = data * &*scaling_factor_9 / divisor;
+
+    let x = normalized
+        .to_u64()
+        .unwrap_or_else(|| ErrorHelper::<M>::signal_error_with_message("log2 internal error"))
+        as i64;
+
+    let mut result = crate::types::math_util::logarithm_i64::log2_polynomial(x);
+    crate::types::math_util::logarithm_i64::log2_add_bit_log2(&mut result, log2_floor);
+
+    debug_assert!(result > 0);
+
+    crate::types::math_util::logarithm_i64::log2_sub_decimals(&mut result, num_decimals);
+
+    Some(ManagedDecimalSigned::from_raw_units(
+        BigInt::from(result),
+        ConstDecimals,
+    ))
+}
+
 impl<M: ManagedTypeApi, D: Decimals> ManagedDecimal<M, D> {
     /// Natural logarithm of a number.
     ///
@@ -50,6 +82,15 @@ impl<M: ManagedTypeApi, D: Decimals> ManagedDecimal<M, D> {
     pub fn ln(&self) -> Option<ManagedDecimalSigned<M, ConstDecimals<9>>> {
         compute_ln(&self.data, self.decimals.num_decimals())
     }
+
+    /// Base 2 logarithm of a number.
+    ///
+    /// Returns `None` for 0.
+    ///
+    /// Even though 9 decimals are returned, only around 6 decimals are actually useful.
+    pub fn log2(&self) -> Option<ManagedDecimalSigned<M, ConstDecimals<9>>> {
+        compute_log2(&self.data, self.decimals.num_decimals())
+    }
 }
 
 impl<M: ManagedTypeApi, D: Decimals> ManagedDecimalSigned<M, D> {
@@ -66,4 +107,18 @@ impl<M: ManagedTypeApi, D: Decimals> ManagedDecimalSigned<M, D> {
         let bu = BigUint::from_handle(self.data.handle.clone());
         compute_ln(&bu, self.decimals.num_decimals())
     }
+
+    /// Base 2 logarithm of a number.
+    ///
+    /// Returns `None` for 0.
+    ///
+    /// Even though 9 decimals are returned, only around 6 decimals are actually useful.
+    pub fn log2(&self) -> Option<ManagedDecimalSigned<M, ConstDecimals<9>>> {
+        if self.sign() != Sign::Plus {
+            return None;
+        }
+
+        let bu = BigUint::from_handle(self.data.handle.clone());
+        compute_log2(&bu, self.decimals.num_decimals())
+    }
 }
diff --git a/framework/base/src/types/math_util/logarithm_i64.rs b/framework/base/src/types/math_util/logarithm_i64.rs
index dc3ff85c3c..02056dade2 100644
--- a/framework/base/src/types/math_util/logarithm_i64.rs
+++ b/framework/base/src/types/math_util/logarithm_i64.rs
@@ -2,10 +2,14 @@ const DENOMINATOR: i64 = 1_000_000_000;
 
 const LN_OF_2_SCALE_9: I64Decimal9 = 693147180; // 0.69314718
 const LN_OF_10_SCALE_9: I64Decimal9 = 2302585093; // 2.3025850929940456840...
+const LOG2_OF_10_SCALE_9: I64Decimal9 = 3321928095; // 3.3219280948873623478...
 
 /// Indicates that a number is interpreted as a decimal number with 9 decimals.
 pub type I64Decimal9 = i64;
 
+/// Approximates the logarithm between 1 and 2 with a polynomial.
+///
+/// The polynomial is: `-1.7417939 + (2.8212026 + (-1.4699568 + (0.44717955 - 0.056570851 * x) * x) * x) * x`
 pub fn ln_polynomial(x: I64Decimal9) -> I64Decimal9 {
     // x normalized to [1.0, 2.0]
     debug_assert!(x >= DENOMINATOR);
@@ -28,10 +32,23 @@ pub fn ln_polynomial(x: I64Decimal9) -> I64Decimal9 {
     result
 }
 
+// log2(x) = ln(x) / ln(2)
+pub fn log2_polynomial(x: I64Decimal9) -> I64Decimal9 {
+    ln_polynomial(x) * DENOMINATOR / LN_OF_2_SCALE_9
+}
+
 pub fn ln_add_bit_log2(result: &mut I64Decimal9, bit_log2: u32) {
     *result += bit_log2 as i64 * LN_OF_2_SCALE_9;
 }
 
+pub fn log2_add_bit_log2(result: &mut I64Decimal9, bit_log2: u32) {
+    *result += bit_log2 as i64 * DENOMINATOR;
+}
+
 pub fn ln_sub_decimals(result: &mut I64Decimal9, num_decimals: usize) {
     *result -= num_decimals as i64 * LN_OF_10_SCALE_9;
 }
+
+pub fn log2_sub_decimals(result: &mut I64Decimal9, num_decimals: usize) {
+    *result -= num_decimals as i64 * LOG2_OF_10_SCALE_9;
+}
diff --git a/tools/plotter/src/lib.rs b/tools/plotter/src/lib.rs
index 2bd3d55445..429c0b8509 100644
--- a/tools/plotter/src/lib.rs
+++ b/tools/plotter/src/lib.rs
@@ -3,9 +3,10 @@
 use wasm_bindgen::prelude::*;
 use web_sys::HtmlCanvasElement;
 
-pub mod logarithm_bf;
-pub mod logarithm_bu;
-pub mod logarithm_md;
+pub mod plotter_ln_big_float;
+pub mod plotter_ln_big_uint;
+pub mod plotter_ln_managed_decimal;
+mod plotter_log2_managed_decimal;
 
 #[global_allocator]
 static ALLOC: wee_alloc::WeeAlloc = wee_alloc::WeeAlloc::INIT;
@@ -32,7 +33,8 @@ impl Chart {
     /// Draw provided functions on the canvas.
     /// Return `Chart` struct suitable for coordinate conversion.
     pub fn ln_big_uint(canvas: HtmlCanvasElement, max_x: f32) -> Result<Chart, JsValue> {
-        let map_coord = logarithm_bu::draw_bu_logs(canvas, max_x).map_err(|err| err.to_string())?;
+        let map_coord =
+            plotter_ln_big_uint::draw_bu_ln(canvas, max_x).map_err(|err| err.to_string())?;
         Ok(Chart {
             convert: Box::new(move |coord| map_coord(coord).map(|(x, y)| (x.into(), y.into()))),
         })
@@ -40,14 +42,15 @@ impl Chart {
 
     pub fn ln_big_uint_error(canvas: HtmlCanvasElement, max_x: f32) -> Result<Chart, JsValue> {
         let map_coord =
-            logarithm_bu::draw_bu_error(canvas, max_x).map_err(|err| err.to_string())?;
+            plotter_ln_big_uint::draw_bu_ln_error(canvas, max_x).map_err(|err| err.to_string())?;
         Ok(Chart {
             convert: Box::new(move |coord| map_coord(coord).map(|(x, y)| (x.into(), y.into()))),
         })
     }
 
     pub fn ln_managed_decimal(canvas: HtmlCanvasElement, max_x: f32) -> Result<Chart, JsValue> {
-        let map_coord = logarithm_md::draw_md_logs(canvas, max_x).map_err(|err| err.to_string())?;
+        let map_coord =
+            plotter_ln_managed_decimal::draw_md_ln(canvas, max_x).map_err(|err| err.to_string())?;
         Ok(Chart {
             convert: Box::new(move |coord| map_coord(coord).map(|(x, y)| (x.into(), y.into()))),
         })
@@ -57,15 +60,35 @@ impl Chart {
         canvas: HtmlCanvasElement,
         max_x: f32,
     ) -> Result<Chart, JsValue> {
-        let map_coord =
-            logarithm_md::draw_md_error(canvas, max_x).map_err(|err| err.to_string())?;
+        let map_coord = plotter_ln_managed_decimal::draw_md_ln_error(canvas, max_x)
+            .map_err(|err| err.to_string())?;
+        Ok(Chart {
+            convert: Box::new(move |coord| map_coord(coord).map(|(x, y)| (x.into(), y.into()))),
+        })
+    }
+
+    pub fn log2_managed_decimal(canvas: HtmlCanvasElement, max_x: f32) -> Result<Chart, JsValue> {
+        let map_coord = plotter_log2_managed_decimal::draw_md_log2(canvas, max_x)
+            .map_err(|err| err.to_string())?;
+        Ok(Chart {
+            convert: Box::new(move |coord| map_coord(coord).map(|(x, y)| (x.into(), y.into()))),
+        })
+    }
+
+    pub fn log2_managed_decimal_error(
+        canvas: HtmlCanvasElement,
+        max_x: f32,
+    ) -> Result<Chart, JsValue> {
+        let map_coord = plotter_log2_managed_decimal::draw_md_log2_error(canvas, max_x)
+            .map_err(|err| err.to_string())?;
         Ok(Chart {
             convert: Box::new(move |coord| map_coord(coord).map(|(x, y)| (x.into(), y.into()))),
         })
     }
 
     pub fn ln_big_float(canvas: HtmlCanvasElement, max_x: f32) -> Result<Chart, JsValue> {
-        let map_coord = logarithm_bf::draw_bf_logs(canvas, max_x).map_err(|err| err.to_string())?;
+        let map_coord =
+            plotter_ln_big_float::draw_bf_ln(canvas, max_x).map_err(|err| err.to_string())?;
         Ok(Chart {
             convert: Box::new(move |coord| map_coord(coord).map(|(x, y)| (x.into(), y.into()))),
         })
@@ -73,7 +96,7 @@ impl Chart {
 
     pub fn ln_big_float_error(canvas: HtmlCanvasElement, max_x: f32) -> Result<Chart, JsValue> {
         let map_coord =
-            logarithm_bf::draw_bf_error(canvas, max_x).map_err(|err| err.to_string())?;
+            plotter_ln_big_float::draw_bf_ln_error(canvas, max_x).map_err(|err| err.to_string())?;
         Ok(Chart {
             convert: Box::new(move |coord| map_coord(coord).map(|(x, y)| (x.into(), y.into()))),
         })
diff --git a/tools/plotter/src/logarithm_bf.rs b/tools/plotter/src/plotter_ln_big_float.rs
similarity index 98%
rename from tools/plotter/src/logarithm_bf.rs
rename to tools/plotter/src/plotter_ln_big_float.rs
index 0958c22a6d..bc3bc195ce 100644
--- a/tools/plotter/src/logarithm_bf.rs
+++ b/tools/plotter/src/plotter_ln_big_float.rs
@@ -5,7 +5,7 @@ use plotters::prelude::*;
 use plotters_canvas::CanvasBackend;
 use web_sys::HtmlCanvasElement;
 
-pub fn draw_bf_logs(
+pub fn draw_bf_ln(
     canvas: HtmlCanvasElement,
     max_x: f32,
 ) -> DrawResult<impl Fn((i32, i32)) -> Option<(f32, f32)>> {
@@ -45,7 +45,7 @@ pub fn draw_bf_logs(
     return Ok(chart.into_coord_trans());
 }
 
-pub fn draw_bf_error(
+pub fn draw_bf_ln_error(
     canvas: HtmlCanvasElement,
     max_x: f32,
 ) -> DrawResult<impl Fn((i32, i32)) -> Option<(f32, f32)>> {
diff --git a/tools/plotter/src/logarithm_bu.rs b/tools/plotter/src/plotter_ln_big_uint.rs
similarity index 98%
rename from tools/plotter/src/logarithm_bu.rs
rename to tools/plotter/src/plotter_ln_big_uint.rs
index c452d14a16..ee1025c400 100644
--- a/tools/plotter/src/logarithm_bu.rs
+++ b/tools/plotter/src/plotter_ln_big_uint.rs
@@ -5,7 +5,7 @@ use plotters::prelude::*;
 use plotters_canvas::CanvasBackend;
 use web_sys::HtmlCanvasElement;
 
-pub fn draw_bu_logs(
+pub fn draw_bu_ln(
     canvas: HtmlCanvasElement,
     max_x: f32,
 ) -> DrawResult<impl Fn((i32, i32)) -> Option<(f32, f32)>> {
@@ -45,7 +45,7 @@ pub fn draw_bu_logs(
     return Ok(chart.into_coord_trans());
 }
 
-pub fn draw_bu_error(
+pub fn draw_bu_ln_error(
     canvas: HtmlCanvasElement,
     max_x: f32,
 ) -> DrawResult<impl Fn((i32, i32)) -> Option<(f32, f32)>> {
diff --git a/tools/plotter/src/logarithm_md.rs b/tools/plotter/src/plotter_ln_managed_decimal.rs
similarity index 96%
rename from tools/plotter/src/logarithm_md.rs
rename to tools/plotter/src/plotter_ln_managed_decimal.rs
index ef634840a1..58eccd9f65 100644
--- a/tools/plotter/src/logarithm_md.rs
+++ b/tools/plotter/src/plotter_ln_managed_decimal.rs
@@ -5,7 +5,7 @@ use plotters::prelude::*;
 use plotters_canvas::CanvasBackend;
 use web_sys::HtmlCanvasElement;
 
-pub fn draw_md_logs(
+pub fn draw_md_ln(
     canvas: HtmlCanvasElement,
     max_x: f32,
 ) -> DrawResult<impl Fn((i32, i32)) -> Option<(f32, f32)>> {
@@ -22,7 +22,7 @@ pub fn draw_md_logs(
         .caption(format!("y=ln(x), x=1..{max_x}"), font)
         .x_label_area_size(30u32)
         .y_label_area_size(30u32)
-        .build_cartesian_2d(0f32..max_x, -1f32..5f32)?;
+        .build_cartesian_2d(0f32..max_x, -5f32..5f32)?;
 
     chart.configure_mesh().x_labels(3).y_labels(3).draw()?;
 
@@ -45,7 +45,7 @@ pub fn draw_md_logs(
     return Ok(chart.into_coord_trans());
 }
 
-pub fn draw_md_error(
+pub fn draw_md_ln_error(
     canvas: HtmlCanvasElement,
     max_x: f32,
 ) -> DrawResult<impl Fn((i32, i32)) -> Option<(f32, f32)>> {
diff --git a/tools/plotter/src/plotter_log2_managed_decimal.rs b/tools/plotter/src/plotter_log2_managed_decimal.rs
new file mode 100644
index 0000000000..eb87883bc8
--- /dev/null
+++ b/tools/plotter/src/plotter_log2_managed_decimal.rs
@@ -0,0 +1,116 @@
+use crate::DrawResult;
+use multiversx_sc::types::{ConstDecimals, ManagedDecimalSigned};
+use multiversx_sc_scenario::api::StaticApi;
+use plotters::prelude::*;
+use plotters_canvas::CanvasBackend;
+use web_sys::HtmlCanvasElement;
+
+pub fn draw_md_log2(
+    canvas: HtmlCanvasElement,
+    max_x: f32,
+) -> DrawResult<impl Fn((i32, i32)) -> Option<(f32, f32)>> {
+    let root = CanvasBackend::with_canvas_object(canvas)
+        .unwrap()
+        .into_drawing_area();
+
+    let font: FontDesc = ("sans-serif", 20.0).into();
+
+    root.fill(&WHITE)?;
+
+    let mut chart = ChartBuilder::on(&root)
+        .margin(20u32)
+        .caption(format!("y=log2(x), x=1..{max_x}"), font)
+        .x_label_area_size(30u32)
+        .y_label_area_size(30u32)
+        .build_cartesian_2d(0f32..max_x, -5f32..5f32)?;
+
+    chart.configure_mesh().x_labels(3).y_labels(3).draw()?;
+
+    const RANGE_MAX: i32 = 1000;
+    chart.draw_series(LineSeries::new(
+        (0..=RANGE_MAX)
+            .map(|x| x as f32 * max_x / RANGE_MAX as f32)
+            .map(|x| (x, log2_baseline(x))),
+        &RED,
+    ))?;
+
+    chart.draw_series(LineSeries::new(
+        (0..=RANGE_MAX)
+            .map(|x| x as f32 * max_x / RANGE_MAX as f32)
+            .map(|x| (x, x.ln())),
+        &YELLOW,
+    ))?;
+
+    chart.draw_series(LineSeries::new(
+        (0..=RANGE_MAX)
+            .map(|x| x as f32 * max_x / RANGE_MAX as f32)
+            .map(|x| (x, managed_decimal_log2(x))),
+        &GREEN,
+    ))?;
+
+    root.present()?;
+    return Ok(chart.into_coord_trans());
+}
+
+pub fn draw_md_log2_error(
+    canvas: HtmlCanvasElement,
+    max_x: f32,
+) -> DrawResult<impl Fn((i32, i32)) -> Option<(f32, f32)>> {
+    let root = CanvasBackend::with_canvas_object(canvas)
+        .unwrap()
+        .into_drawing_area();
+
+    let font: FontDesc = ("sans-serif", 20.0).into();
+
+    root.fill(&WHITE)?;
+
+    let mut chart = ChartBuilder::on(&root)
+        .margin(20u32)
+        .caption(format!("y=logarithm error, x=1..{max_x}"), font)
+        .x_label_area_size(30u32)
+        .y_label_area_size(50u32)
+        .build_cartesian_2d(0f32..max_x, -0.0001f32..0.0001f32)?;
+
+    chart.configure_mesh().x_labels(3).y_labels(3).draw()?;
+
+    const RANGE_MAX: i32 = 1000;
+    chart.draw_series(LineSeries::new(
+        (0..=RANGE_MAX)
+            .map(|x| x as f32 * max_x / RANGE_MAX as f32)
+            .map(|x| (x, managed_decimal_log2(x) - log2_baseline(x))),
+        &RED,
+    ))?;
+
+    root.present()?;
+    return Ok(chart.into_coord_trans());
+}
+
+fn managed_decimal_log2(x: f32) -> f32 {
+    let dec = ManagedDecimalSigned::<StaticApi, ConstDecimals<9>>::from(x);
+    if let Some(ln_dec) = dec.log2() {
+        ln_dec.to_big_float().to_f64() as f32
+    } else {
+        0.0
+    }
+}
+
+fn log2_baseline(x: f32) -> f32 {
+    x.log2()
+}
+
+#[cfg(test)]
+mod test {
+    #[test]
+    fn sc_log2_test() {
+        assert_eq!(super::managed_decimal_log2(0.0), 0.0);
+        println!("{}", super::managed_decimal_log2(1.0));
+        println!("{}", super::managed_decimal_log2(2.0));
+        println!("{}", super::managed_decimal_log2(3.0));
+        println!("{}", super::managed_decimal_log2(4.0));
+        println!("{}", super::managed_decimal_log2(5.0));
+        println!("{}", super::managed_decimal_log2(200.0));
+        // assert!(super::big_uint_ln(1.0) >= 0.0);
+        // assert!(super::big_uint_ln(1.0) < 0.01);
+        // assert!(super::big_uint_ln(2.0) > 0.6);
+    }
+}
diff --git a/tools/plotter/www/index.html b/tools/plotter/www/index.html
index e2066b6068..b7785a1347 100644
--- a/tools/plotter/www/index.html
+++ b/tools/plotter/www/index.html
@@ -17,12 +17,14 @@ <h1>MultiversX SC function plots</h1>
 	    <div id="control">
 			<label for="plot-type">Demo: </label>
 			<select id="plot-type">
-				<option value="ln-bu">Logarithms (BigUint)</option>
-				<option value="ln-bu-error">Logarithm (BigUint) Error</option>
-				<option value="ln-dec">Logarithms (ManagedDecimal)</option>
-				<option value="ln-dec-error">Logarithm (ManagedDecimal) Error</option>
-				<option value="ln-bf">Logarithms (BigFloat)</option>
-				<option value="ln-bf-error">Logarithm (BigFloat) Error</option>
+				<option value="ln-bu">ln (BigUint)</option>
+				<option value="ln-bu-error">ln (BigUint) Error</option>
+				<option value="ln-dec">ln (ManagedDecimal)</option>
+				<option value="ln-dec-error">ln (ManagedDecimal) Error</option>
+				<option value="log2-dec">log2 (ManagedDecimal)</option>
+				<option value="log2-dec-error">log2 (ManagedDecimal) Error</option>
+				<option value="ln-bf">ln (BigFloat)</option>
+				<option value="ln-bf-error">ln (BigFloat) Error</option>
 			</select>
 			<div id="logControl" class="hide">
 				<label for="logMax">Max value: </label> <input id="logMax" type="range" min="1" max="100" value="10">
diff --git a/tools/plotter/www/index.js b/tools/plotter/www/index.js
index edb8168fd9..e5c3e2085c 100644
--- a/tools/plotter/www/index.js
+++ b/tools/plotter/www/index.js
@@ -90,6 +90,14 @@ function updatePlot() {
 			logControl.classList.remove("hide");
 			chart = Chart.ln_managed_decimal_error(canvas, Number(logMax.value));
 			break;
+		case "log2-dec":
+			logControl.classList.remove("hide");
+			chart = Chart.log2_managed_decimal(canvas, Number(logMax.value));
+			break;
+		case "log2-dec-error":
+			logControl.classList.remove("hide");
+			chart = Chart.log2_managed_decimal_error(canvas, Number(logMax.value));
+			break;
 		case "ln-bf":
 			logControl.classList.remove("hide");
 			chart = Chart.ln_big_float(canvas, Number(logMax.value));

From 030c22f3315a4956d5f9119a8bfc02dbdd641ee6 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 28 Jun 2024 15:26:38 +0300
Subject: [PATCH 1058/1254] ManagedDecimal log2 optimization

---
 .../base/src/types/math_util/logarithm_i64.rs | 24 ++++++++++++++++---
 .../src/plotter_log2_managed_decimal.rs       |  7 ------
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/framework/base/src/types/math_util/logarithm_i64.rs b/framework/base/src/types/math_util/logarithm_i64.rs
index 02056dade2..240e3b310d 100644
--- a/framework/base/src/types/math_util/logarithm_i64.rs
+++ b/framework/base/src/types/math_util/logarithm_i64.rs
@@ -9,7 +9,7 @@ pub type I64Decimal9 = i64;
 
 /// Approximates the logarithm between 1 and 2 with a polynomial.
 ///
-/// The polynomial is: `-1.7417939 + (2.8212026 + (-1.4699568 + (0.44717955 - 0.056570851 * x) * x) * x) * x`
+/// The polynomial is: `-1.7417939 + x * (2.8212026 + (-1.4699568 + (0.44717955 - 0.056570851 * x) * x) * x)`
 pub fn ln_polynomial(x: I64Decimal9) -> I64Decimal9 {
     // x normalized to [1.0, 2.0]
     debug_assert!(x >= DENOMINATOR);
@@ -32,9 +32,27 @@ pub fn ln_polynomial(x: I64Decimal9) -> I64Decimal9 {
     result
 }
 
-// log2(x) = ln(x) / ln(2)
+/// Just took the coeficients from ln and dividem them all by ln(2).
 pub fn log2_polynomial(x: I64Decimal9) -> I64Decimal9 {
-    ln_polynomial(x) * DENOMINATOR / LN_OF_2_SCALE_9
+    // x normalized to [1.0, 2.0]
+    debug_assert!(x >= DENOMINATOR);
+    debug_assert!(x <= 2 * DENOMINATOR);
+
+    let mut result: i64 = -81614486; // -0.08161448626
+    result *= x;
+    result /= DENOMINATOR;
+    result += 645143719; // 0.645143719
+    result *= x;
+    result /= DENOMINATOR;
+    result += -2120699387; // -2.120699387
+    result *= x;
+    result /= DENOMINATOR;
+    result += 4070135003; //  4.070135003
+    result *= x;
+    result /= DENOMINATOR;
+    result += -2512877423; // -2.512877423
+
+    result
 }
 
 pub fn ln_add_bit_log2(result: &mut I64Decimal9, bit_log2: u32) {
diff --git a/tools/plotter/src/plotter_log2_managed_decimal.rs b/tools/plotter/src/plotter_log2_managed_decimal.rs
index eb87883bc8..a5e7315fe5 100644
--- a/tools/plotter/src/plotter_log2_managed_decimal.rs
+++ b/tools/plotter/src/plotter_log2_managed_decimal.rs
@@ -34,13 +34,6 @@ pub fn draw_md_log2(
         &RED,
     ))?;
 
-    chart.draw_series(LineSeries::new(
-        (0..=RANGE_MAX)
-            .map(|x| x as f32 * max_x / RANGE_MAX as f32)
-            .map(|x| (x, x.ln())),
-        &YELLOW,
-    ))?;
-
     chart.draw_series(LineSeries::new(
         (0..=RANGE_MAX)
             .map(|x| x as f32 * max_x / RANGE_MAX as f32)

From a8ca499f644a8e911194e135040dacb67884669c Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Wed, 3 Jul 2024 22:49:04 +0200
Subject: [PATCH 1059/1254] attribute parsing fixes

---
 .../src/storage/storage_get_from_address.rs   |  3 ++-
 .../src/parse/attributes/payable_attr.rs      | 20 ++++++++++++++
 framework/derive/src/parse/attributes/util.rs | 26 ++++++++++++++++---
 3 files changed, 45 insertions(+), 4 deletions(-)

diff --git a/framework/base/src/storage/storage_get_from_address.rs b/framework/base/src/storage/storage_get_from_address.rs
index 972d803751..2b40987bd3 100644
--- a/framework/base/src/storage/storage_get_from_address.rs
+++ b/framework/base/src/storage/storage_get_from_address.rs
@@ -1,6 +1,7 @@
 use crate::{
     api::{
-        const_handles, use_raw_handle, ErrorApi, HandleConstraints, ManagedBufferApiImpl, ManagedTypeApi, StaticVarApiImpl, StorageReadApi, StorageReadApiImpl
+        const_handles, use_raw_handle, ErrorApi, HandleConstraints, ManagedBufferApiImpl,
+        ManagedTypeApi, StaticVarApiImpl, StorageReadApi, StorageReadApiImpl,
     },
     codec::*,
     types::{
diff --git a/framework/derive/src/parse/attributes/payable_attr.rs b/framework/derive/src/parse/attributes/payable_attr.rs
index 194c4d19b5..e22bcb1e4e 100644
--- a/framework/derive/src/parse/attributes/payable_attr.rs
+++ b/framework/derive/src/parse/attributes/payable_attr.rs
@@ -36,6 +36,26 @@ fn extract_token_identifier(attr: &syn::Attribute) -> Option<String> {
                         !clean.is_empty(),
                         "ticker can not be empty. attribute needs 1 string argument: Replace with #[payable(\"*\")] or #[payable(\"EGLD\")"
                     );
+
+                    assert!(
+                        !clean
+                            .chars()
+                            .next()
+                            .is_some_and(|s|
+                                s.is_numeric()
+                            ),
+                        "argument can not be a number"
+                    );
+
+                    if clean
+                    .chars()
+                    .next()
+                    .is_some_and(|s|
+                        s == '*'
+                    ) {
+                        assert!(clean.len() == 1usize, "attribute needs 1 string argument: \"*\", \"EGLD\" or token identifier");
+                    }
+
                     clean
                 },
                 Some(_) => panic!("expected a string as argument"),
diff --git a/framework/derive/src/parse/attributes/util.rs b/framework/derive/src/parse/attributes/util.rs
index 586bc1030f..6779f33183 100644
--- a/framework/derive/src/parse/attributes/util.rs
+++ b/framework/derive/src/parse/attributes/util.rs
@@ -4,7 +4,7 @@ pub(super) fn is_attribute_with_no_args(attr: &syn::Attribute, name: &str) -> bo
     if let Some(first_seg) = attr.path().segments.first() {
         if first_seg.ident == name {
             assert!(
-                attr.path().segments.len() == 1,
+                attr.meta.require_path_only().is_ok(),
                 "no arguments allowed for attribute `{name}`"
             );
             return true;
@@ -103,11 +103,31 @@ pub(super) fn attr_one_string_arg(attr: &syn::Attribute) -> String {
             let mut iter = list.tokens.into_iter();
             let arg_token_tree = match iter.next() {
                 Some(proc_macro2::TokenTree::Literal(literal)) => {
+                    let clean = literal
+                        .to_string()
+                        .trim_matches('\"')
+                        .trim_matches('"')
+                        .trim()
+                        .to_string();
+
+                    assert!(
+                        !clean.chars().next().is_some_and(|s| s.is_numeric()),
+                        "argument can not be a number"
+                    );
+
+                    assert!(
+                        !clean
+                            .chars()
+                            .next()
+                            .is_some_and(|s| s.is_ascii_punctuation()),
+                        "argument can not start with punctuation"
+                    );
+
                     assert!(
-                        !literal.to_string().trim_matches('"').trim().is_empty(),
+                        !clean.is_empty(),
                         "the argument can not be an empty string or whitespace"
                     );
-                    literal.to_string().trim_matches('\"').to_string()
+                    clean
                 },
                 Some(_) => {
                     panic!("unexpected attribute argument tokens: attribute has to be a string")

From 34126d627c60482c82a904a01e9b77480a0b5386 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Wed, 3 Jul 2024 23:05:06 +0200
Subject: [PATCH 1060/1254] gas limit in tx

---
 .../contract/generate_snippets/snippet_sc_functions_gen.rs    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/framework/meta-lib/src/contract/generate_snippets/snippet_sc_functions_gen.rs b/framework/meta-lib/src/contract/generate_snippets/snippet_sc_functions_gen.rs
index cb67ddc0e3..49e3e92123 100644
--- a/framework/meta-lib/src/contract/generate_snippets/snippet_sc_functions_gen.rs
+++ b/framework/meta-lib/src/contract/generate_snippets/snippet_sc_functions_gen.rs
@@ -4,6 +4,8 @@ use multiversx_sc::abi::{ContractAbi, EndpointAbi, EndpointMutabilityAbi, InputA
 
 use super::{snippet_gen_common::write_newline, snippet_type_map::map_abi_type_to_rust_type};
 
+const DEFAULT_GAS: &str = "30,000,000";
+
 pub(crate) fn write_interact_struct_impl(
     file: &mut File,
     abi: &ContractAbi,
@@ -58,6 +60,7 @@ fn write_deploy_method_impl(file: &mut File, init_abi: &EndpointAbi, name: &Stri
             .interactor
             .tx()
             .from(&self.wallet_address)
+            .gas(NumExpr("{DEFAULT_GAS}"))
             .typed(proxy::{})
             .init({})
             .code(&self.contract_code)
@@ -174,6 +177,7 @@ fn write_contract_call(file: &mut File, endpoint_abi: &EndpointAbi, name: &Strin
             .tx()
             .from(&self.wallet_address)
             .to(self.state.current_address())
+            .gas(NumExpr("{DEFAULT_GAS}"))
             .typed(proxy::{}Proxy)
             .{}({}){}
             .returns(ReturnsResultUnmanaged)

From f56b00fbc0fe23756b51966349d69fb4a07661f5 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Thu, 4 Jul 2024 00:16:31 +0200
Subject: [PATCH 1061/1254] build fix

---
 .../examples/adder/interact/src/basic_interact.rs     | 11 +++++++----
 .../examples/adder/interact/src/basic_interact_cli.rs |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/contracts/examples/adder/interact/src/basic_interact.rs b/contracts/examples/adder/interact/src/basic_interact.rs
index 23f3e7d77e..e97f858594 100644
--- a/contracts/examples/adder/interact/src/basic_interact.rs
+++ b/contracts/examples/adder/interact/src/basic_interact.rs
@@ -81,6 +81,7 @@ impl AdderInteract {
             .interactor
             .tx()
             .from(&self.wallet_address)
+            .gas(NumExpr("30,000,000"))
             .typed(adder_proxy::AdderProxy)
             .init(0u32)
             .code(ADDER_CODE_PATH)
@@ -137,11 +138,12 @@ impl AdderInteract {
             .await;
     }
 
-    async fn add(&mut self, value: u64) {
+    async fn add(&mut self, value: u32) {
         self.interactor
             .tx()
             .from(&self.wallet_address)
             .to(self.state.current_adder_address())
+            .gas(NumExpr("30,000,000"))
             .typed(adder_proxy::AdderProxy)
             .add(value)
             .prepare_async()
@@ -171,9 +173,10 @@ impl AdderInteract {
             .interactor
             .tx()
             .from(&self.wallet_address)
+            .gas(NumExpr("30,000,000"))
             .typed(adder_proxy::AdderProxy)
-            .upgrade(new_value)
-            .code(&self.adder_code)
+            .upgrade(BigUint::from(new_value))
+            .code(ADDER_CODE_PATH)
             .returns(ReturnsResultUnmanaged)
             .prepare_async()
             .run()
@@ -200,7 +203,7 @@ impl AdderInteract {
 //     let mut basic_interact = AdderInteract::init().await;
 
 //     basic_interact.deploy().await;
-//     basic_interact.add(1u64).await;
+//     basic_interact.add(1u32).await;
 
 //     basic_interact.upgrade(7u32).await;
 // }
diff --git a/contracts/examples/adder/interact/src/basic_interact_cli.rs b/contracts/examples/adder/interact/src/basic_interact_cli.rs
index d765130847..cfa0c3155f 100644
--- a/contracts/examples/adder/interact/src/basic_interact_cli.rs
+++ b/contracts/examples/adder/interact/src/basic_interact_cli.rs
@@ -30,7 +30,7 @@ pub enum InteractCliCommand {
 pub struct AddArgs {
     /// The value to add
     #[arg(short = 'v', long = "value", verbatim_doc_comment)]
-    pub value: u64,
+    pub value: u32,
 }
 
 #[derive(Default, Clone, PartialEq, Eq, Debug, Args)]

From 3b2b4c804cb38bc8fe22db0f2f5a46f99d1386c7 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Thu, 4 Jul 2024 01:00:09 +0200
Subject: [PATCH 1062/1254] tests for log2

---
 .../scenario/tests/managed_decimal_test.rs    | 82 +++++++++++++------
 1 file changed, 56 insertions(+), 26 deletions(-)

diff --git a/framework/scenario/tests/managed_decimal_test.rs b/framework/scenario/tests/managed_decimal_test.rs
index a7133644a1..70a0e09904 100644
--- a/framework/scenario/tests/managed_decimal_test.rs
+++ b/framework/scenario/tests/managed_decimal_test.rs
@@ -389,41 +389,71 @@ fn test_managed_decimal_ln() {
     assert_eq!(ln_frac.to_string(), "5.663649649");
 }
 
-// #[test]
-// fn test_managed_decimal_log2() {
-//     let fixed =
-//         ManagedDecimal::<StaticApi, NumDecimals>::from_raw_units(BigUint::from(5u64), 0usize);
-//     let ln_fixed = fixed.log2().unwrap();
+#[test]
+fn test_managed_decimal_log2() {
+    let fixed =
+        ManagedDecimal::<StaticApi, NumDecimals>::from_raw_units(BigUint::from(5u64), 0usize);
+    let log2_fixed = fixed.log2().unwrap();
 
-//     assert_eq!(ln_fixed.to_string(), "3.135514649");
+    assert_eq!(log2_fixed.to_string(), "2.321990749");
 
-//     let const_dec = ManagedDecimal::<StaticApi, ConstDecimals<0>>::const_decimals_from_raw(
-//         BigUint::from(29299837u64),
-//     );
-//     let ln_const = const_dec.log2().unwrap();
+    let const_dec = ManagedDecimal::<StaticApi, ConstDecimals<0>>::const_decimals_from_raw(
+        BigUint::from(29299837u64),
+    );
+    let log2_const = const_dec.log2().unwrap();
 
-//     assert_eq!(ln_const.to_string(), "17.193072541");
+    assert_eq!(log2_const.to_string(), "24.804360510");
 
-//     let small =
-//         ManagedDecimal::<StaticApi, ConstDecimals<1>>::const_decimals_from_raw(BigUint::from(1u64)); // 0.1
-//     let ln_small = small.log2().unwrap();
+    let small =
+        ManagedDecimal::<StaticApi, ConstDecimals<1>>::const_decimals_from_raw(BigUint::from(1u64)); // 0.1
+    let log2_small = small.log2().unwrap();
 
-//     assert_eq!(ln_small.to_string(), "-2.302524494");
+    assert_eq!(log2_small.to_string(), "-3.321840669");
 
-//     let v_small =
-//         ManagedDecimal::<StaticApi, ConstDecimals<2>>::const_decimals_from_raw(BigUint::from(1u64));
-//     // 0.01
-//     let ln_v_small = v_small.log2().unwrap();
+    let v_small =
+        ManagedDecimal::<StaticApi, ConstDecimals<2>>::const_decimals_from_raw(BigUint::from(1u64));
+    // 0.01
+    let log2_v_small = v_small.log2().unwrap();
 
-//     assert_eq!(ln_v_small.to_string(), "-4.605109587");
+    assert_eq!(log2_v_small.to_string(), "-6.643768764");
 
-//     let smallest =
-//         ManagedDecimal::<StaticApi, ConstDecimals<6>>::const_decimals_from_raw(BigUint::from(1u64));
-//     // 0.000001
-//     let ln_smallest = smallest.log2().unwrap();
+    let smallest =
+        ManagedDecimal::<StaticApi, ConstDecimals<6>>::const_decimals_from_raw(BigUint::from(1u64));
+    // 0.000001
+    let log2_smallest = smallest.log2().unwrap();
 
-//     assert_eq!(ln_smallest.to_string(), "-13.815510557");
-// }
+    assert_eq!(log2_smallest.to_string(), "-19.931481144");
+
+    let frac =
+        ManagedDecimal::<StaticApi, NumDecimals>::from_raw_units(BigUint::from(1872u64), 2usize); //18.72
+    let log2_frac = frac.log2().unwrap();
+
+    assert_eq!(log2_frac.to_string(), "4.226560385");
+
+    let b_frac = ManagedDecimal::<StaticApi, NumDecimals>::from_raw_units(
+        BigUint::from(39874291763u64),
+        7usize,
+    ); //3987.4291763
+    let log2_b_frac = b_frac.log2().unwrap();
+
+    assert_eq!(log2_b_frac.to_string(), "11.961212882");
+
+    let normal_prec_frac =
+        ManagedDecimal::<StaticApi, NumDecimals>::from_raw_units(BigUint::from(453211u64), 3usize);
+    // 453.211
+    let log2_np_frac = normal_prec_frac.log2().unwrap();
+
+    assert_eq!(log2_np_frac.to_string(), "8.823994915");
+
+    let high_prec_frac = ManagedDecimal::<StaticApi, NumDecimals>::from_raw_units(
+        BigUint::from(453211000000u64),
+        9usize,
+    );
+    // 453.211000000
+    let log2_hp_frac = high_prec_frac.log2().unwrap();
+
+    assert_eq!(log2_hp_frac.to_string(), "8.823953218");
+}
 
 // #[test]
 // fn test_managed_decimal_nth_root() {

From 8eea61e511e0ed6bcd232eb5bc53b07c8098efc8 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 4 Jul 2024 20:54:15 +0300
Subject: [PATCH 1063/1254] cleanup

---
 .../scenario/tests/managed_decimal_test.rs    | 43 -------------------
 1 file changed, 43 deletions(-)

diff --git a/framework/scenario/tests/managed_decimal_test.rs b/framework/scenario/tests/managed_decimal_test.rs
index 70a0e09904..96cfcbf182 100644
--- a/framework/scenario/tests/managed_decimal_test.rs
+++ b/framework/scenario/tests/managed_decimal_test.rs
@@ -454,46 +454,3 @@ fn test_managed_decimal_log2() {
 
     assert_eq!(log2_hp_frac.to_string(), "8.823953218");
 }
-
-// #[test]
-// fn test_managed_decimal_nth_root() {
-//     let fixed =
-//         ManagedDecimal::<StaticApi, NumDecimals>::from_raw_units(BigUint::from(567u64), 1usize);
-
-//     let fifth_root = fixed.clone().root(5f64, 100usize);
-//     let fifth_root_higher_prec = fixed.root(5f64, 100_000usize);
-
-//     assert_eq!(
-//         fifth_root,
-//         ManagedDecimal::<StaticApi, NumDecimals>::from_raw_units(BigUint::from(355u64), 100usize)
-//     );
-//     assert_eq!(
-//         fifth_root_higher_prec,
-//         ManagedDecimal::<StaticApi, NumDecimals>::from_raw_units(
-//             BigUint::from(355399u64),
-//             100_000usize
-//         )
-//     );
-
-//     let const_fixed: ManagedDecimal<StaticApi, ConstDecimals<2>> =
-//         ManagedDecimal::<StaticApi, ConstDecimals<2>>::const_decimals_from_raw(BigUint::from(
-//             876u64,
-//         ));
-
-//     let seventh_root_var = const_fixed.clone().root(7f64, 10_000usize);
-//     let seventh_root_const = const_fixed.root(7f64, ConstDecimals::<10_000>);
-
-//     assert_eq!(
-//         seventh_root_var,
-//         ManagedDecimal::<StaticApi, NumDecimals>::from_raw_units(
-//             BigUint::from(26324u64),
-//             10_000usize
-//         )
-//     );
-//     assert_eq!(
-//         seventh_root_const,
-//         ManagedDecimal::<StaticApi, ConstDecimals::<10_000>>::const_decimals_from_raw(
-//             BigUint::from(26324u64)
-//         )
-//     );
-// }

From 5a6a5e8ed2124d9c27882ba976fcffffdaf9dd43 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 4 Jul 2024 21:04:45 +0300
Subject: [PATCH 1064/1254] big_float_ln mandos split

---
 .../scenarios/big_float_ln.scen.json          | 39 +++++++++++++++++++
 .../scenarios/big_float_operators.scen.json   | 20 ----------
 .../tests/big_float_scenario_go_test.rs       |  5 +++
 .../tests/big_float_scenario_rs_test.rs       |  5 +++
 4 files changed, 49 insertions(+), 20 deletions(-)
 create mode 100644 contracts/feature-tests/big-float-features/scenarios/big_float_ln.scen.json

diff --git a/contracts/feature-tests/big-float-features/scenarios/big_float_ln.scen.json b/contracts/feature-tests/big-float-features/scenarios/big_float_ln.scen.json
new file mode 100644
index 0000000000..9d7076be97
--- /dev/null
+++ b/contracts/feature-tests/big-float-features/scenarios/big_float_ln.scen.json
@@ -0,0 +1,39 @@
+{
+    "gasSchedule": "v3",
+    "steps": [
+        {
+            "step": "setState",
+            "accounts": {
+                "sc:basic-features": {
+                    "nonce": "0",
+                    "balance": "0",
+                    "code": "mxsc:../output/big-float-features.mxsc.json"
+                },
+                "address:an_account": {
+                    "nonce": "0",
+                    "balance": "100000000000"
+                }
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "LnBigFloatRef - 1",
+            "tx": {
+                "from": "address:an_account",
+                "to": "sc:basic-features",
+                "function": "ln_big_float_ref_wrapped",
+                "arguments": [
+                    "23",
+                    "9"
+                ],
+                "gasLimit": "50,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": [
+                    "0x0000000500bae4281800000009"
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
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 df136adf69..91c3128c8f 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
@@ -820,26 +820,6 @@
                     "-1"
                 ]
             }
-        },
-        {
-            "step": "scCall",
-            "id": "LnBigFloatRef - 1",
-            "tx": {
-                "from": "address:an_account",
-                "to": "sc:basic-features",
-                "function": "ln_big_float_ref_wrapped",
-                "arguments": [
-                    "23",
-                    "9"
-                ],
-                "gasLimit": "50,000,000",
-                "gasPrice": "0"
-            },
-            "expect": {
-                "out": [
-                    "0x0000000500bae4281800000009"
-                ]
-            }
         }
     ]
 }
\ No newline at end of file
diff --git a/contracts/feature-tests/big-float-features/tests/big_float_scenario_go_test.rs b/contracts/feature-tests/big-float-features/tests/big_float_scenario_go_test.rs
index bdfc6a1045..1cedeaa2f7 100644
--- a/contracts/feature-tests/big-float-features/tests/big_float_scenario_go_test.rs
+++ b/contracts/feature-tests/big-float-features/tests/big_float_scenario_go_test.rs
@@ -4,6 +4,11 @@ fn world() -> ScenarioWorld {
     ScenarioWorld::vm_go()
 }
 
+#[test]
+fn big_float_ln_go() {
+    world().run("scenarios/big_float_ln.scen.json");
+}
+
 #[test]
 fn big_float_new_from_big_int_go() {
     world().run("scenarios/big_float_new_from_big_int.scen.json");
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 60a9d0ed35..34bed93c83 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
@@ -11,6 +11,11 @@ fn world() -> ScenarioWorld {
     blockchain
 }
 
+#[test]
+fn big_float_ln_rs() {
+    world().run("scenarios/big_float_ln.scen.json");
+}
+
 #[test]
 fn big_float_new_from_big_int_rs() {
     world().run("scenarios/big_float_new_from_big_int.scen.json");

From b4e18825bb7383f830391bdad0ed633093b117e9 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 4 Jul 2024 21:17:49 +0300
Subject: [PATCH 1065/1254] big float features ln refactor

---
 .../big-float-features/src/big_float_main.rs  |  2 ++
 .../src/big_float_operators.rs                |  5 -----
 .../src/big_float_operators_ln.rs             | 20 +++++++++++++++++++
 .../src/big_float_operators_wrapped.rs        | 10 ----------
 4 files changed, 22 insertions(+), 15 deletions(-)
 create mode 100644 contracts/feature-tests/big-float-features/src/big_float_operators_ln.rs

diff --git a/contracts/feature-tests/big-float-features/src/big_float_main.rs b/contracts/feature-tests/big-float-features/src/big_float_main.rs
index 17b83d0e57..53d2617406 100644
--- a/contracts/feature-tests/big-float-features/src/big_float_main.rs
+++ b/contracts/feature-tests/big-float-features/src/big_float_main.rs
@@ -5,6 +5,7 @@ multiversx_sc::imports!();
 pub mod big_float_methods;
 pub mod big_float_methods_wrapped;
 pub mod big_float_operators;
+pub mod big_float_operators_ln;
 pub mod big_float_operators_wrapped;
 
 #[multiversx_sc::contract]
@@ -12,6 +13,7 @@ pub trait BigFloatFeatures:
     big_float_methods::BigFloatMethods
     + big_float_operators::BigFloatOperators
     + big_float_methods_wrapped::BigFloatWrappedMethods
+    + big_float_operators_ln::BigFloatWrappedLn
     + big_float_operators_wrapped::BigFloatWrappedOperators
 {
     #[init]
diff --git a/contracts/feature-tests/big-float-features/src/big_float_operators.rs b/contracts/feature-tests/big-float-features/src/big_float_operators.rs
index a5fae8a720..abf239b52a 100644
--- a/contracts/feature-tests/big-float-features/src/big_float_operators.rs
+++ b/contracts/feature-tests/big-float-features/src/big_float_operators.rs
@@ -85,9 +85,4 @@ pub trait BigFloatOperators {
         r /= b;
         r
     }
-    #[endpoint]
-    fn ln_big_float_ref(&self, a: &BigFloat) -> BigFloat {
-        a.ln()
-            .unwrap_or_else(|| sc_panic!("log argument must pe strictly positive"))
-    }
 }
diff --git a/contracts/feature-tests/big-float-features/src/big_float_operators_ln.rs b/contracts/feature-tests/big-float-features/src/big_float_operators_ln.rs
new file mode 100644
index 0000000000..1998a09b06
--- /dev/null
+++ b/contracts/feature-tests/big-float-features/src/big_float_operators_ln.rs
@@ -0,0 +1,20 @@
+multiversx_sc::imports!();
+
+#[multiversx_sc::module]
+pub trait BigFloatWrappedLn {
+    #[endpoint]
+    fn ln_big_float_ref(&self, a: &BigFloat) -> BigFloat {
+        a.ln()
+            .unwrap_or_else(|| sc_panic!("log argument must pe strictly positive"))
+    }
+
+    #[endpoint]
+    fn ln_big_float_ref_wrapped(
+        &self,
+        a: BigInt,
+        precision: usize,
+    ) -> ManagedDecimalSigned<Self::Api, usize> {
+        let number = self.ln_big_float_ref(&BigFloat::from(a));
+        number.to_managed_decimal_signed(precision)
+    }
+}
diff --git a/contracts/feature-tests/big-float-features/src/big_float_operators_wrapped.rs b/contracts/feature-tests/big-float-features/src/big_float_operators_wrapped.rs
index 67276f259c..74b6045d1c 100644
--- a/contracts/feature-tests/big-float-features/src/big_float_operators_wrapped.rs
+++ b/contracts/feature-tests/big-float-features/src/big_float_operators_wrapped.rs
@@ -158,14 +158,4 @@ pub trait BigFloatWrappedOperators: big_float_operators::BigFloatOperators {
         let number = self.div_assign_big_float_ref(&BigFloat::from(a), &BigFloat::from(b));
         number.to_fixed_point(&BigFloat::from(fixed_point_denominator))
     }
-
-    #[endpoint]
-    fn ln_big_float_ref_wrapped(
-        &self,
-        a: BigInt,
-        precision: usize,
-    ) -> ManagedDecimalSigned<Self::Api, usize> {
-        let number = self.ln_big_float_ref(&BigFloat::from(a));
-        number.to_managed_decimal_signed(precision)
-    }
 }

From fa61b20249e280101e41362477260d3c8b3e8722 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 4 Jul 2024 21:21:46 +0300
Subject: [PATCH 1066/1254] big float features ln test

---
 .../scenarios/big_float_ln.scen.json          | 27 ++++++++++++++++---
 .../src/big_float_operators_ln.rs             | 11 +++++++-
 .../big-float-features/wasm/src/lib.rs        |  9 ++++---
 3 files changed, 39 insertions(+), 8 deletions(-)

diff --git a/contracts/feature-tests/big-float-features/scenarios/big_float_ln.scen.json b/contracts/feature-tests/big-float-features/scenarios/big_float_ln.scen.json
index 9d7076be97..cf44ddb9d9 100644
--- a/contracts/feature-tests/big-float-features/scenarios/big_float_ln.scen.json
+++ b/contracts/feature-tests/big-float-features/scenarios/big_float_ln.scen.json
@@ -17,11 +17,32 @@
         },
         {
             "step": "scCall",
-            "id": "LnBigFloatRef - 1",
+            "id": "ln_big_float_precision_9(23)", 
+            "comment": "ln(23) = 3.135514648 (9 decimals)",
             "tx": {
                 "from": "address:an_account",
                 "to": "sc:basic-features",
-                "function": "ln_big_float_ref_wrapped",
+                "function": "ln_big_float_precision_9",
+                "arguments": [
+                    "23"
+                ],
+                "gasLimit": "50,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": [
+                    "+3135514648"
+                ]
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "ln_big_float_any_precision(23, 9)", 
+            "comment": "ln(23) = 3.135514648 (9 decimals)",
+            "tx": {
+                "from": "address:an_account",
+                "to": "sc:basic-features",
+                "function": "ln_big_float_any_precision",
                 "arguments": [
                     "23",
                     "9"
@@ -31,7 +52,7 @@
             },
             "expect": {
                 "out": [
-                    "0x0000000500bae4281800000009"
+                    "u32:5|+3135514648|u32:9"
                 ]
             }
         }
diff --git a/contracts/feature-tests/big-float-features/src/big_float_operators_ln.rs b/contracts/feature-tests/big-float-features/src/big_float_operators_ln.rs
index 1998a09b06..7831724475 100644
--- a/contracts/feature-tests/big-float-features/src/big_float_operators_ln.rs
+++ b/contracts/feature-tests/big-float-features/src/big_float_operators_ln.rs
@@ -9,7 +9,16 @@ pub trait BigFloatWrappedLn {
     }
 
     #[endpoint]
-    fn ln_big_float_ref_wrapped(
+    fn ln_big_float_precision_9(
+        &self,
+        a: BigInt,
+    ) -> ManagedDecimalSigned<Self::Api, ConstDecimals<9>> {
+        let number = self.ln_big_float_ref(&BigFloat::from(a));
+        number.to_managed_decimal_signed(ConstDecimals)
+    }
+
+    #[endpoint]
+    fn ln_big_float_any_precision(
         &self,
         a: BigInt,
         precision: usize,
diff --git a/contracts/feature-tests/big-float-features/wasm/src/lib.rs b/contracts/feature-tests/big-float-features/wasm/src/lib.rs
index 0993fe17ed..de85d10ea0 100644
--- a/contracts/feature-tests/big-float-features/wasm/src/lib.rs
+++ b/contracts/feature-tests/big-float-features/wasm/src/lib.rs
@@ -5,9 +5,9 @@
 ////////////////////////////////////////////////////
 
 // Init:                                 1
-// Endpoints:                           72
+// Endpoints:                           73
 // Async Callback (empty):               1
-// Total number of exported functions:  74
+// Total number of exported functions:  75
 
 #![no_std]
 
@@ -54,7 +54,6 @@ multiversx_sc_wasm_adapter::endpoints! {
         mul_assign_big_float_ref => mul_assign_big_float_ref
         div_assign_big_float => div_assign_big_float
         div_assign_big_float_ref => div_assign_big_float_ref
-        ln_big_float_ref => ln_big_float_ref
         new_from_parts_big_float_wrapped => new_from_parts_big_float_wrapped
         new_from_frac_big_float_wrapped => new_from_frac_big_float_wrapped
         new_from_sci_big_float_wrapped => new_from_sci_big_float_wrapped
@@ -73,6 +72,9 @@ multiversx_sc_wasm_adapter::endpoints! {
         pow_big_float_ref_wrapped => pow_big_float_ref_wrapped
         big_float_zero_wrapped => big_float_zero_wrapped
         big_float_neg_wrapped => big_float_neg_wrapped
+        ln_big_float_ref => ln_big_float_ref
+        ln_big_float_precision_9 => ln_big_float_precision_9
+        ln_big_float_any_precision => ln_big_float_any_precision
         add_big_float_wrapped => add_big_float_wrapped
         add_big_float_ref_wrapped => add_big_float_ref_wrapped
         sub_big_float_wrapped => sub_big_float_wrapped
@@ -89,7 +91,6 @@ multiversx_sc_wasm_adapter::endpoints! {
         mul_assign_big_float_ref_wrapped => mul_assign_big_float_ref_wrapped
         div_assign_big_float_wrapped => div_assign_big_float_wrapped
         div_assign_big_float_ref_wrapped => div_assign_big_float_ref_wrapped
-        ln_big_float_ref_wrapped => ln_big_float_ref_wrapped
     )
 }
 

From 92fb23b6d433290ce456da641abd50067b7dc204 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 4 Jul 2024 21:36:01 +0300
Subject: [PATCH 1067/1254] big float features ln mandos gas

---
 .../big-float-features/scenarios/big_float_ln.scen.json      | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/contracts/feature-tests/big-float-features/scenarios/big_float_ln.scen.json b/contracts/feature-tests/big-float-features/scenarios/big_float_ln.scen.json
index cf44ddb9d9..21e7b4a3c9 100644
--- a/contracts/feature-tests/big-float-features/scenarios/big_float_ln.scen.json
+++ b/contracts/feature-tests/big-float-features/scenarios/big_float_ln.scen.json
@@ -1,5 +1,4 @@
 {
-    "gasSchedule": "v3",
     "steps": [
         {
             "step": "setState",
@@ -26,7 +25,7 @@
                 "arguments": [
                     "23"
                 ],
-                "gasLimit": "50,000,000",
+                "gasLimit": "2,000,000",
                 "gasPrice": "0"
             },
             "expect": {
@@ -47,7 +46,7 @@
                     "23",
                     "9"
                 ],
-                "gasLimit": "50,000,000",
+                "gasLimit": "2,000,000",
                 "gasPrice": "0"
             },
             "expect": {

From 681dd2ef21a170fdee263db22db05fdb3888e77a Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Thu, 4 Jul 2024 21:04:36 +0200
Subject: [PATCH 1068/1254] upgrade transaction fixes

---
 .../adder/interact/src/basic_interact.rs      |  2 ++
 .../interactor_tx/interactor_exec_upgrade.rs  | 27 ++++++++++++-------
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/contracts/examples/adder/interact/src/basic_interact.rs b/contracts/examples/adder/interact/src/basic_interact.rs
index e97f858594..3dde87303e 100644
--- a/contracts/examples/adder/interact/src/basic_interact.rs
+++ b/contracts/examples/adder/interact/src/basic_interact.rs
@@ -85,6 +85,7 @@ impl AdderInteract {
             .typed(adder_proxy::AdderProxy)
             .init(0u32)
             .code(ADDER_CODE_PATH)
+            .code_metadata(CodeMetadata::UPGRADEABLE)
             .returns(ReturnsNewBech32Address)
             .prepare_async()
             .run()
@@ -173,6 +174,7 @@ impl AdderInteract {
             .interactor
             .tx()
             .from(&self.wallet_address)
+            .to(self.state.current_adder_address())
             .gas(NumExpr("30,000,000"))
             .typed(adder_proxy::AdderProxy)
             .upgrade(BigUint::from(new_value))
diff --git a/framework/snippets/src/interactor_tx/interactor_exec_upgrade.rs b/framework/snippets/src/interactor_tx/interactor_exec_upgrade.rs
index 359992bb3e..af68999830 100644
--- a/framework/snippets/src/interactor_tx/interactor_exec_upgrade.rs
+++ b/framework/snippets/src/interactor_tx/interactor_exec_upgrade.rs
@@ -7,7 +7,7 @@ use multiversx_sc_scenario::{
             TxPayment,
         },
     },
-    scenario::tx_to_step::{address_annotated, StepWrapper, TxToStep},
+    scenario::tx_to_step::{address_annotated, code_annotated, StepWrapper, TxToStep},
     scenario_model::{ScDeployStep, TxResponse},
     ScenarioTxEnvData,
 };
@@ -16,11 +16,11 @@ use crate::Interactor;
 
 use super::{InteractorEnvExec, InteractorExecStep, InteractorPrepareAsync};
 
-impl<'w, From, Gas, CodeValue, RH> InteractorPrepareAsync
+impl<'w, From, To, Gas, CodeValue, RH> InteractorPrepareAsync
     for Tx<
         InteractorEnvExec<'w>,
         From,
-        (),
+        To,
         NotPayable,
         Gas,
         UpgradeCall<InteractorEnvExec<'w>, Code<CodeValue>>,
@@ -28,6 +28,7 @@ impl<'w, From, Gas, CodeValue, RH> InteractorPrepareAsync
     >
 where
     From: TxFromSpecified<InteractorEnvExec<'w>>,
+    To: TxToSpecified<InteractorEnvExec<'w>>,
     Gas: TxGas<InteractorEnvExec<'w>>,
     CodeValue: TxCodeValue<InteractorEnvExec<'w>>,
     RH: RHListExec<TxResponse, InteractorEnvExec<'w>>,
@@ -42,11 +43,11 @@ where
     }
 }
 
-impl<'w, From, Gas, RH, CodeValue> TxToStep<InteractorEnvExec<'w>, RH>
+impl<'w, From, To, Gas, RH, CodeValue> TxToStep<InteractorEnvExec<'w>, RH>
     for Tx<
         InteractorEnvExec<'w>,
         From,
-        (),
+        To,
         NotPayable,
         Gas,
         UpgradeCall<InteractorEnvExec<'w>, Code<CodeValue>>,
@@ -54,6 +55,7 @@ impl<'w, From, Gas, RH, CodeValue> TxToStep<InteractorEnvExec<'w>, RH>
     >
 where
     From: TxFromSpecified<InteractorEnvExec<'w>>,
+    To: TxToSpecified<InteractorEnvExec<'w>>,
     Gas: TxGas<InteractorEnvExec<'w>>,
     CodeValue: TxCodeValue<InteractorEnvExec<'w>>,
     RH: RHListExec<TxResponse, InteractorEnvExec<'w>>,
@@ -62,7 +64,8 @@ where
     type Step = ScCallStep;
 
     fn tx_to_step(self) -> StepWrapper<InteractorEnvExec<'w>, Self::Step, RH> {
-        let mut step = tx_to_sc_call_upgrade_step(&self.env, self.from, self.gas, self.data);
+        let mut step =
+            tx_to_sc_call_upgrade_step(&self.env, self.from, self.to, self.gas, self.data);
         step.expect = Some(self.result_handler.list_tx_expect());
 
         StepWrapper {
@@ -73,21 +76,27 @@ where
     }
 }
 
-pub fn tx_to_sc_call_upgrade_step<'a, 'w: 'a, From, Gas, CodeValue>(
+pub fn tx_to_sc_call_upgrade_step<'a, 'w: 'a, From, To, Gas, CodeValue>(
     env: &'a InteractorEnvExec<'w>,
     from: From,
+    to: To,
     gas: Gas,
     data: UpgradeCall<InteractorEnvExec<'w>, Code<CodeValue>>,
 ) -> ScCallStep
 where
     From: TxFromSpecified<InteractorEnvExec<'w>>,
+    To: TxToSpecified<InteractorEnvExec<'w>>,
     Gas: TxGas<InteractorEnvExec<'w>>,
     CodeValue: TxCodeValue<InteractorEnvExec<'w>>,
 {
     let mut step = ScCallStep::new()
         .from(address_annotated(env, &from))
-        .function("upgrade")
-        .gas_limit(gas.gas_value(env));
+        .to(address_annotated(env, &to))
+        .gas_limit(gas.gas_value(env))
+        .function("upgradeContract")
+        .argument(code_annotated(env, data.code_source))
+        .argument(data.code_metadata.to_byte_array().to_vec());
+
     for arg in data.arg_buffer.iter_buffers() {
         step.tx.arguments.push(arg.to_vec().into());
     }

From 817cf1692a81fc5699a8214d7b7079e2ea3b2da5 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Thu, 4 Jul 2024 22:21:19 +0200
Subject: [PATCH 1069/1254] added code metadata in the upgrade function

---
 contracts/examples/adder/interact/src/basic_interact.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/contracts/examples/adder/interact/src/basic_interact.rs b/contracts/examples/adder/interact/src/basic_interact.rs
index 3dde87303e..0cd16f686a 100644
--- a/contracts/examples/adder/interact/src/basic_interact.rs
+++ b/contracts/examples/adder/interact/src/basic_interact.rs
@@ -178,6 +178,7 @@ impl AdderInteract {
             .gas(NumExpr("30,000,000"))
             .typed(adder_proxy::AdderProxy)
             .upgrade(BigUint::from(new_value))
+            .code_metadata(CodeMetadata::UPGRADEABLE)
             .code(ADDER_CODE_PATH)
             .returns(ReturnsResultUnmanaged)
             .prepare_async()

From c1c68cd186ff3b551e3784f67c51dd0034ae1cbf Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 5 Jul 2024 10:05:15 +0300
Subject: [PATCH 1070/1254] pltter in own workspace

---
 Cargo.lock               | 517 ++-------------------------------------
 Cargo.toml               |   2 +-
 tools/plotter/Cargo.toml |   3 +
 3 files changed, 21 insertions(+), 501 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index c0df51b5a8..d443583a18 100755
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -66,7 +66,7 @@ version = "0.8.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "once_cell",
  "version_check",
  "zerocopy",
@@ -98,21 +98,6 @@ dependencies = [
  "multiversx-sc-meta-lib",
 ]
 
-[[package]]
-name = "android-tzdata"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
-
-[[package]]
-name = "android_system_properties"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "anstream"
 version = "0.6.14"
@@ -203,7 +188,7 @@ checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a"
 dependencies = [
  "addr2line",
  "cc",
- "cfg-if 1.0.0",
+ "cfg-if",
  "libc",
  "miniz_oxide",
  "object",
@@ -385,12 +370,6 @@ version = "3.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
 
-[[package]]
-name = "bytemuck"
-version = "1.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78834c15cb5d5efe3452d58b1e8ba890dd62d21907f867f383358198e56ebca5"
-
 [[package]]
 name = "byteorder"
 version = "1.5.0"
@@ -409,12 +388,6 @@ version = "1.0.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "96c51067fd44124faa7f870b4b1c969379ad32b2ba805aa959430ceaa384f695"
 
-[[package]]
-name = "cfg-if"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
-
 [[package]]
 name = "cfg-if"
 version = "1.0.0"
@@ -456,20 +429,6 @@ dependencies = [
  "multiversx-sc-meta-lib",
 ]
 
-[[package]]
-name = "chrono"
-version = "0.4.38"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401"
-dependencies = [
- "android-tzdata",
- "iana-time-zone",
- "js-sys",
- "num-traits",
- "wasm-bindgen",
- "windows-targets 0.52.5",
-]
-
 [[package]]
 name = "clap"
 version = "4.5.7"
@@ -510,12 +469,6 @@ version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4b82cf0babdbd58558212896d1a4272303a57bdb245c2bf1147185fb45640e70"
 
-[[package]]
-name = "color_quant"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
-
 [[package]]
 name = "colorchoice"
 version = "1.0.1"
@@ -590,42 +543,6 @@ version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
 
-[[package]]
-name = "core-graphics"
-version = "0.23.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081"
-dependencies = [
- "bitflags 1.3.2",
- "core-foundation",
- "core-graphics-types",
- "foreign-types 0.5.0",
- "libc",
-]
-
-[[package]]
-name = "core-graphics-types"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf"
-dependencies = [
- "bitflags 1.3.2",
- "core-foundation",
- "libc",
-]
-
-[[package]]
-name = "core-text"
-version = "20.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9d2790b5c08465d49f8dc05c8bcae9fea467855947db39b0f8145c091aaced5"
-dependencies = [
- "core-foundation",
- "core-graphics",
- "foreign-types 0.5.0",
- "libc",
-]
-
 [[package]]
 name = "cpufeatures"
 version = "0.2.12"
@@ -641,7 +558,7 @@ version = "1.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
 ]
 
 [[package]]
@@ -747,16 +664,6 @@ dependencies = [
  "multiversx-sc-meta-lib",
 ]
 
-[[package]]
-name = "cstr"
-version = "0.2.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68523903c8ae5aacfa32a0d9ae60cadeb764e1da14ee0d26b1f3089f13a54636"
-dependencies = [
- "proc-macro2",
- "quote",
-]
-
 [[package]]
 name = "curve25519-dalek"
 version = "3.2.0"
@@ -817,27 +724,6 @@ dependencies = [
  "multiversx-sc-meta-lib",
 ]
 
-[[package]]
-name = "dirs-next"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1"
-dependencies = [
- "cfg-if 1.0.0",
- "dirs-sys-next",
-]
-
-[[package]]
-name = "dirs-sys-next"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d"
-dependencies = [
- "libc",
- "redox_users",
- "winapi",
-]
-
 [[package]]
 name = "displaydoc"
 version = "0.2.4"
@@ -849,27 +735,6 @@ dependencies = [
  "syn",
 ]
 
-[[package]]
-name = "dlib"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412"
-dependencies = [
- "libloading",
-]
-
-[[package]]
-name = "dwrote"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "439a1c2ba5611ad3ed731280541d36d2e9c4ac5e7fb818a27b604bdc5a6aa65b"
-dependencies = [
- "lazy_static",
- "libc",
- "winapi",
- "wio",
-]
-
 [[package]]
 name = "ed25519"
 version = "1.5.3"
@@ -922,7 +787,7 @@ version = "0.8.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
 ]
 
 [[package]]
@@ -1140,15 +1005,6 @@ version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a"
 
-[[package]]
-name = "fdeflate"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645"
-dependencies = [
- "simd-adler32",
-]
-
 [[package]]
 name = "first-contract"
 version = "0.0.0"
@@ -1176,71 +1032,19 @@ dependencies = [
  "miniz_oxide",
 ]
 
-[[package]]
-name = "float-ord"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ce81f49ae8a0482e4c55ea62ebbd7e5a686af544c00b9d090bba3ff9be97b3d"
-
 [[package]]
 name = "fnv"
 version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
-[[package]]
-name = "font-kit"
-version = "0.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2845a73bbd781e691ab7c2a028c579727cd254942e8ced57ff73e0eafd60de87"
-dependencies = [
- "bitflags 2.5.0",
- "byteorder",
- "core-foundation",
- "core-graphics",
- "core-text",
- "dirs-next",
- "dwrote",
- "float-ord",
- "freetype-sys",
- "lazy_static",
- "libc",
- "log",
- "pathfinder_geometry",
- "pathfinder_simd",
- "walkdir",
- "winapi",
- "yeslogic-fontconfig-sys",
-]
-
 [[package]]
 name = "foreign-types"
 version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
 dependencies = [
- "foreign-types-shared 0.1.1",
-]
-
-[[package]]
-name = "foreign-types"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965"
-dependencies = [
- "foreign-types-macros",
- "foreign-types-shared 0.3.1",
-]
-
-[[package]]
-name = "foreign-types-macros"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
+ "foreign-types-shared",
 ]
 
 [[package]]
@@ -1249,12 +1053,6 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
 
-[[package]]
-name = "foreign-types-shared"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b"
-
 [[package]]
 name = "form_urlencoded"
 version = "1.2.1"
@@ -1363,17 +1161,6 @@ dependencies = [
  "multiversx-sc-meta-lib",
 ]
 
-[[package]]
-name = "freetype-sys"
-version = "0.20.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e7edc5b9669349acfda99533e9e0bcf26a51862ab43b08ee7745c55d28eb134"
-dependencies = [
- "cc",
- "libc",
- "pkg-config",
-]
-
 [[package]]
 name = "futures"
 version = "0.3.30"
@@ -1479,7 +1266,7 @@ version = "0.1.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "libc",
  "wasi 0.9.0+wasi-snapshot-preview1",
 ]
@@ -1490,23 +1277,13 @@ version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "js-sys",
  "libc",
  "wasi 0.11.0+wasi-snapshot-preview1",
  "wasm-bindgen",
 ]
 
-[[package]]
-name = "gif"
-version = "0.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045"
-dependencies = [
- "color_quant",
- "weezl",
-]
-
 [[package]]
 name = "gimli"
 version = "0.29.0"
@@ -1707,29 +1484,6 @@ dependencies = [
  "tracing",
 ]
 
-[[package]]
-name = "iana-time-zone"
-version = "0.1.60"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141"
-dependencies = [
- "android_system_properties",
- "core-foundation-sys",
- "iana-time-zone-haiku",
- "js-sys",
- "wasm-bindgen",
- "windows-core",
-]
-
-[[package]]
-name = "iana-time-zone-haiku"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
-dependencies = [
- "cc",
-]
-
 [[package]]
 name = "icu_collections"
 version = "1.5.0"
@@ -1876,20 +1630,6 @@ dependencies = [
  "winapi-util",
 ]
 
-[[package]]
-name = "image"
-version = "0.24.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d"
-dependencies = [
- "bytemuck",
- "byteorder",
- "color_quant",
- "jpeg-decoder",
- "num-traits",
- "png",
-]
-
 [[package]]
 name = "indexmap"
 version = "2.2.6"
@@ -1939,12 +1679,6 @@ version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
 
-[[package]]
-name = "jpeg-decoder"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0"
-
 [[package]]
 name = "js-sys"
 version = "0.3.69"
@@ -2054,26 +1788,6 @@ version = "0.2.155"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
 
-[[package]]
-name = "libloading"
-version = "0.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19"
-dependencies = [
- "cfg-if 1.0.0",
- "windows-targets 0.52.5",
-]
-
-[[package]]
-name = "libredox"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
-dependencies = [
- "bitflags 2.5.0",
- "libc",
-]
-
 [[package]]
 name = "linked-list-repeat"
 version = "0.0.0"
@@ -2214,12 +1928,6 @@ version = "2.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
 
-[[package]]
-name = "memory_units"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8452105ba047068f40ff7093dd1d9da90898e63dd61736462e9cdda6a90ad3c3"
-
 [[package]]
 name = "mime"
 version = "0.3.17"
@@ -2233,7 +1941,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
 dependencies = [
  "adler",
- "simd-adler32",
 ]
 
 [[package]]
@@ -2693,8 +2400,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f"
 dependencies = [
  "bitflags 2.5.0",
- "cfg-if 1.0.0",
- "foreign-types 0.3.2",
+ "cfg-if",
+ "foreign-types",
  "libc",
  "once_cell",
  "openssl-macros",
@@ -2803,7 +2510,7 @@ version = "0.9.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "libc",
  "redox_syscall",
  "smallvec",
@@ -2816,25 +2523,6 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd"
 
-[[package]]
-name = "pathfinder_geometry"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b7b7e7b4ea703700ce73ebf128e1450eb69c3a8329199ffbfb9b2a0418e5ad3"
-dependencies = [
- "log",
- "pathfinder_simd",
-]
-
-[[package]]
-name = "pathfinder_simd"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ebf45976c56919841273f2a0fc684c28437e2f304e264557d9c72be5d5a718be"
-dependencies = [
- "rustc_version",
-]
-
 [[package]]
 name = "payable-features"
 version = "0.0.0"
@@ -2934,77 +2622,6 @@ version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
 
-[[package]]
-name = "plotters"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a15b6eccb8484002195a3e44fe65a4ce8e93a625797a063735536fd59cb01cf3"
-dependencies = [
- "chrono",
- "font-kit",
- "image",
- "lazy_static",
- "num-traits",
- "pathfinder_geometry",
- "plotters-backend",
- "plotters-bitmap",
- "plotters-svg",
- "ttf-parser",
- "wasm-bindgen",
- "web-sys",
-]
-
-[[package]]
-name = "plotters-backend"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "414cec62c6634ae900ea1c56128dfe87cf63e7caece0852ec76aba307cebadb7"
-
-[[package]]
-name = "plotters-bitmap"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7e7f6fb8302456d7c264a94dada86f76d76e1a03e2294ee86ca7da92983b0a6"
-dependencies = [
- "gif",
- "image",
- "plotters-backend",
-]
-
-[[package]]
-name = "plotters-canvas"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "498a82bf654581fa4df6c1bd73e56f8556bdeec5eca5a0989d170ca0728ccace"
-dependencies = [
- "js-sys",
- "plotters-backend",
- "wasm-bindgen",
- "web-sys",
-]
-
-[[package]]
-name = "plotters-svg"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81b30686a7d9c3e010b84284bdd26a29f2138574f52f5eb6f794fc0ad924e705"
-dependencies = [
- "plotters-backend",
-]
-
-[[package]]
-name = "png"
-version = "0.17.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1"
-dependencies = [
- "bitflags 1.3.2",
- "crc32fast",
- "fdeflate",
- "flate2",
- "miniz_oxide",
-]
-
 [[package]]
 name = "ppv-lite86"
 version = "0.2.17"
@@ -3234,17 +2851,6 @@ dependencies = [
  "bitflags 2.5.0",
 ]
 
-[[package]]
-name = "redox_users"
-version = "0.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891"
-dependencies = [
- "getrandom 0.2.15",
- "libredox",
- "thiserror",
-]
-
 [[package]]
 name = "regex"
 version = "1.10.5"
@@ -3342,7 +2948,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d"
 dependencies = [
  "cc",
- "cfg-if 1.0.0",
+ "cfg-if",
  "getrandom 0.2.15",
  "libc",
  "spin",
@@ -3486,19 +3092,6 @@ dependencies = [
  "winapi-util",
 ]
 
-[[package]]
-name = "sc-plotter-wasm"
-version = "0.1.0"
-dependencies = [
- "multiversx-sc",
- "multiversx-sc-scenario",
- "plotters",
- "plotters-canvas",
- "wasm-bindgen",
- "web-sys",
- "wee_alloc",
-]
-
 [[package]]
 name = "scenario-tester"
 version = "0.0.0"
@@ -3697,7 +3290,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800"
 dependencies = [
  "block-buffer 0.9.0",
- "cfg-if 1.0.0",
+ "cfg-if",
  "cpufeatures",
  "digest 0.9.0",
  "opaque-debug",
@@ -3709,7 +3302,7 @@ version = "0.10.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "cpufeatures",
  "digest 0.10.7",
 ]
@@ -3882,7 +3475,7 @@ version = "3.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "fastrand",
  "rustix",
  "windows-sys 0.52.0",
@@ -4118,12 +3711,6 @@ version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
 
-[[package]]
-name = "ttf-parser"
-version = "0.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17f77d76d837a7830fe1d4f12b7b4ba4192c1888001c7164257e4bc6d21d96b4"
-
 [[package]]
 name = "typenum"
 version = "1.17.0"
@@ -4292,7 +3879,7 @@ version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "wasm-bindgen-macro",
 ]
 
@@ -4317,7 +3904,7 @@ version = "0.4.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "js-sys",
  "wasm-bindgen",
  "web-sys",
@@ -4386,40 +3973,6 @@ dependencies = [
  "wasm-bindgen",
 ]
 
-[[package]]
-name = "wee_alloc"
-version = "0.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbb3b5a6b2bb17cb6ad44a2e68a43e8d2722c997da10e928665c72ec6c0a0b8e"
-dependencies = [
- "cfg-if 0.1.10",
- "libc",
- "memory_units",
- "winapi",
-]
-
-[[package]]
-name = "weezl"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082"
-
-[[package]]
-name = "winapi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
-dependencies = [
- "winapi-i686-pc-windows-gnu",
- "winapi-x86_64-pc-windows-gnu",
-]
-
-[[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-
 [[package]]
 name = "winapi-util"
 version = "0.1.8"
@@ -4429,21 +3982,6 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
-[[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-
-[[package]]
-name = "windows-core"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
-dependencies = [
- "windows-targets 0.52.5",
-]
-
 [[package]]
 name = "windows-sys"
 version = "0.48.0"
@@ -4598,19 +4136,10 @@ version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "windows-sys 0.48.0",
 ]
 
-[[package]]
-name = "wio"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d129932f4644ac2396cb456385cbf9e63b5b30c6e8dc4820bdca4eb082037a5"
-dependencies = [
- "winapi",
-]
-
 [[package]]
 name = "write16"
 version = "1.0.0"
@@ -4623,18 +4152,6 @@ version = "0.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
 
-[[package]]
-name = "yeslogic-fontconfig-sys"
-version = "5.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffb6b23999a8b1a997bf47c7bb4d19ad4029c3327bb3386ebe0a5ff584b33c7a"
-dependencies = [
- "cstr",
- "dlib",
- "once_cell",
- "pkg-config",
-]
-
 [[package]]
 name = "yoke"
 version = "0.7.4"
diff --git a/Cargo.toml b/Cargo.toml
index 5f94cec44e..2f599c6e03 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -18,7 +18,7 @@ members = [
 
   "tools/mxpy-snippet-generator",
   "tools/payload-macro-generator",
-  "tools/plotter",
+  # "tools/plotter",
 
   "vm",
 
diff --git a/tools/plotter/Cargo.toml b/tools/plotter/Cargo.toml
index 9f116ae4a5..4b56960585 100644
--- a/tools/plotter/Cargo.toml
+++ b/tools/plotter/Cargo.toml
@@ -26,3 +26,6 @@ path = "../../framework/base"
 version = "=0.50.3"
 path = "../../framework/scenario"
 default-features = false
+
+[workspace]
+members = ["."]

From 4dd354ab8bf3a9197b4e93d27d1f057790bccb5a Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 5 Jul 2024 10:57:52 +0300
Subject: [PATCH 1071/1254] temporarily removed diagnostic::on_unimplemented

---
 framework/base/Cargo.toml                              |  1 -
 .../src/types/interaction/tx_data/tx_code_source.rs    | 10 ----------
 framework/base/src/types/interaction/tx_from.rs        |  5 -----
 framework/base/src/types/interaction/tx_gas.rs         |  5 -----
 framework/base/src/types/interaction/tx_payment.rs     |  5 -----
 .../tx_result_handler_list_item.rs                     |  5 -----
 framework/base/src/types/interaction/tx_to.rs          |  5 -----
 7 files changed, 36 deletions(-)

diff --git a/framework/base/Cargo.toml b/framework/base/Cargo.toml
index 189b015bd4..292d04ddf7 100644
--- a/framework/base/Cargo.toml
+++ b/framework/base/Cargo.toml
@@ -2,7 +2,6 @@
 name = "multiversx-sc"
 version = "0.50.5"
 edition = "2021"
-rust-version = "1.78"
 
 authors = ["Andrei Marinica <andrei.marinica@multiversx.com>", "MultiversX <contact@multiversx.com>"]
 license = "GPL-3.0-only"
diff --git a/framework/base/src/types/interaction/tx_data/tx_code_source.rs b/framework/base/src/types/interaction/tx_data/tx_code_source.rs
index 0d3c180e16..e7bb0817ea 100644
--- a/framework/base/src/types/interaction/tx_data/tx_code_source.rs
+++ b/framework/base/src/types/interaction/tx_data/tx_code_source.rs
@@ -14,11 +14,6 @@ where
 {
 }
 
-#[diagnostic::on_unimplemented(
-    message = "Type `{Self}` cannot be used as code (does not implement `TxCodeValue<{Env}>`)",
-    label = "not a valid smart contract byte code",
-    note = "there are multiple ways to specify SC byte code, but `{Self}` is not one of them"
-)]
 pub trait TxCodeValue<Env>: AnnotatedValue<Env, ManagedBuffer<Env::Api>>
 where
     Env: TxEnv,
@@ -44,11 +39,6 @@ where
 {
 }
 
-#[diagnostic::on_unimplemented(
-    message = "Type `{Self}` cannot be used as code source value (does not implement `TxFromSourceValue<{Env}>`)",
-    label = "not an address from where to copy the code",
-    note = "there are multiple ways to specify a code source address, but `{Self}` is not one of them"
-)]
 pub trait TxFromSourceValue<Env>: AnnotatedValue<Env, ManagedAddress<Env::Api>>
 where
     Env: TxEnv,
diff --git a/framework/base/src/types/interaction/tx_from.rs b/framework/base/src/types/interaction/tx_from.rs
index 674796e64f..ff5dd73b88 100644
--- a/framework/base/src/types/interaction/tx_from.rs
+++ b/framework/base/src/types/interaction/tx_from.rs
@@ -13,11 +13,6 @@ where
 /// Marks the non-empty sender of a transaction.
 ///
 /// Enforces the reciipent to be explicitly specified.
-#[diagnostic::on_unimplemented(
-    message = "Type `{Self}` cannot be used as a sender value (does not implement `TxFromSpecified<{Env}>`)",
-    label = "sender needs to be explicit",
-    note = "there are multiple ways to specify the sender value for a transaction, but `{Self}` is not one of them"
-)]
 pub trait TxFromSpecified<Env>:
     TxFrom<Env> + AnnotatedValue<Env, ManagedAddress<Env::Api>>
 where
diff --git a/framework/base/src/types/interaction/tx_gas.rs b/framework/base/src/types/interaction/tx_gas.rs
index 2e03cc1470..098eafdd2c 100644
--- a/framework/base/src/types/interaction/tx_gas.rs
+++ b/framework/base/src/types/interaction/tx_gas.rs
@@ -33,11 +33,6 @@ where
     }
 }
 
-#[diagnostic::on_unimplemented(
-    message = "Type `{Self}` cannot be used as gas value (does not implement `TxGasValue<{Env}>`)",
-    label = "not a valid value for gas",
-    note = "there are multiple ways to specify the gas value for a transaction, but `{Self}` is not one of them"
-)]
 pub trait TxGasValue<Env>: AnnotatedValue<Env, u64>
 where
     Env: TxEnv,
diff --git a/framework/base/src/types/interaction/tx_payment.rs b/framework/base/src/types/interaction/tx_payment.rs
index c5bcc10637..5abb38c6ee 100644
--- a/framework/base/src/types/interaction/tx_payment.rs
+++ b/framework/base/src/types/interaction/tx_payment.rs
@@ -24,11 +24,6 @@ use crate::{
 use super::{AnnotatedValue, FunctionCall, TxEnv, TxFrom, TxToSpecified};
 
 /// Describes a payment that is part of a transaction.
-#[diagnostic::on_unimplemented(
-    message = "Type `{Self}` cannot be used as payment (does not implement `TxPayment<{Env}>`)",
-    label = "not a valid payment type",
-    note = "there are multiple ways to specify the transaction payment, but `{Self}` is not one of them"
-)]
 pub trait TxPayment<Env>
 where
     Env: TxEnv,
diff --git a/framework/base/src/types/interaction/tx_result_handler_list/tx_result_handler_list_item.rs b/framework/base/src/types/interaction/tx_result_handler_list/tx_result_handler_list_item.rs
index 9ca98bac65..54e1d0cfa3 100644
--- a/framework/base/src/types/interaction/tx_result_handler_list/tx_result_handler_list_item.rs
+++ b/framework/base/src/types/interaction/tx_result_handler_list/tx_result_handler_list_item.rs
@@ -3,11 +3,6 @@ use crate::types::TxEnv;
 /// Result handler list item.
 ///
 /// It acts as a result handler that produces a single result.
-#[diagnostic::on_unimplemented(
-    message = "Type `{Self}` cannot be used as a decoder result handler (does not implement `RHListItem<{Env}>`)",
-    label = "not a valid decoder result handler",
-    note = "there are multiple ways to specify the result handling, but `{Self}` is not one of them"
-)]
 pub trait RHListItem<Env, Original>
 where
     Env: TxEnv,
diff --git a/framework/base/src/types/interaction/tx_to.rs b/framework/base/src/types/interaction/tx_to.rs
index 41d5d4ce39..18530bc1ee 100644
--- a/framework/base/src/types/interaction/tx_to.rs
+++ b/framework/base/src/types/interaction/tx_to.rs
@@ -14,11 +14,6 @@ impl<Env> TxTo<Env> for () where Env: TxEnv {}
 /// Marks the non-empty recipient of a transaction.
 ///
 /// Enforces the recipient to be explicitly specified.
-#[diagnostic::on_unimplemented(
-    message = "Type `{Self}` cannot be used as recipient value (does not implement `TxToSpecified<{Env}>`)",
-    label = "recipient needs to be explicit",
-    note = "there are multiple ways to specify the recipient value for a transaction, but `{Self}` is not one of them"
-)]
 pub trait TxToSpecified<Env>: TxTo<Env> + AnnotatedValue<Env, ManagedAddress<Env::Api>>
 where
     Env: TxEnv,

From fcd63054359ef984c0bcbff470ddd0cad7d07555 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 5 Jul 2024 11:45:12 +0300
Subject: [PATCH 1072/1254] sc 0.50.6

---
 CHANGELOG.md                                  |   3 +
 Cargo.lock                                    | 136 +++++++++---------
 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 +-
 .../Cargo.toml                                |   2 +-
 .../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     |   8 +-
 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 +-
 .../wasm-alloc-mem-fail/Cargo.toml            |   2 +-
 .../wasm-alloc-mem-leaking/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-legacy/Cargo.toml |   4 +-
 .../forwarder-legacy/meta/Cargo.toml          |   2 +-
 .../forwarder-legacy/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 +-
 .../exchange-features/Cargo.toml              |   4 +-
 .../exchange-features/meta/Cargo.toml         |   2 +-
 .../exchange-features/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 +-
 .../feature-tests/scenario-tester/Cargo.toml  |   4 +-
 .../scenario-tester/meta/Cargo.toml           |   2 +-
 .../scenario-tester/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 +-
 framework/base/Cargo.toml                     |   4 +-
 framework/derive/Cargo.toml                   |   2 +-
 framework/meta/Cargo.toml                     |   4 +-
 framework/meta/src/version_history.rs         |   3 +-
 framework/scenario/Cargo.toml                 |   6 +-
 framework/snippets/Cargo.toml                 |   4 +-
 framework/wasm-adapter/Cargo.toml             |   4 +-
 tools/mxpy-snippet-generator/Cargo.toml       |   2 +-
 tools/rust-debugger/format-tests/Cargo.toml   |   4 +-
 271 files changed, 456 insertions(+), 452 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bd283ab659..6b7627eab1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,6 +27,9 @@ They are:
 - `multiversx-sdk`, in short `sdk`, allows communication with the chain(s), 1 crate.
 
 
+## [sc 0.50.6] - 2024-07-05
+- Temporarily removed dependency to rustc 1.78, to ease transition from older versions. Will be re-enabled in 0.51.0.
+
 ## [sc 0.50.5] - 2024-06-21
 - `#[storage_mapper_from_address] annotation.
 - Added missing equality operator for test addresses (`TestAddress`, `TestSCAddress`).
diff --git a/Cargo.lock b/Cargo.lock
index b3ec8e3213..61507d81aa 100755
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -384,9 +384,9 @@ checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9"
 
 [[package]]
 name = "cc"
-version = "1.0.99"
+version = "1.0.104"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96c51067fd44124faa7f870b4b1c969379ad32b2ba805aa959430ceaa384f695"
+checksum = "74b6a57f98764a267ff415d50a25e6e166f3831a5071af4995296ea97d210490"
 
 [[package]]
 name = "cfg-if"
@@ -431,9 +431,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.7"
+version = "4.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5db83dced34638ad474f39f250d7fea9598bdd239eaced1bdf45d597da0f433f"
+checksum = "84b3edb18336f4df585bc9aa31dd99c036dfa5dc5e9a2939a722a188f3a8970d"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -441,9 +441,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.7"
+version = "4.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7e204572485eb3fbf28f871612191521df159bc3e15a9f5064c66dba3a8c05f"
+checksum = "c1c09dd5ada6c6c78075d6fd0da3f90d8080651e2d6cc8eb2f1aaa4034ced708"
 dependencies = [
  "anstream",
  "anstyle",
@@ -453,9 +453,9 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.5.5"
+version = "4.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c780290ccf4fb26629baa7a1081e68ced113f1d3ec302fa5948f1c381ebf06c6"
+checksum = "2bac35c6dafb060fd4d275d9a4ffae97917c13a6327903a8be2153cd964f7085"
 dependencies = [
  "heck",
  "proc-macro2",
@@ -760,9 +760,9 @@ dependencies = [
 
 [[package]]
 name = "either"
-version = "1.12.0"
+version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b"
+checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
 
 [[package]]
 name = "empty"
@@ -1413,9 +1413,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
 
 [[package]]
 name = "hyper"
-version = "1.3.1"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe575dd17d0862a9a33781c8c4696a55c320909004a67a00fb286ba8b1bc496d"
+checksum = "c4fe55fb7a772d59a5ff1dfbff4fe0258d19b89fec4b233e75d35d5d2316badc"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -1466,9 +1466,9 @@ dependencies = [
 
 [[package]]
 name = "hyper-util"
-version = "0.1.5"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b875924a60b96e5d7b9ae7b066540b1dd1cbd90d1828f54c92e02a283351c56"
+checksum = "3ab92f4f49ee4fb4f997c784b7a2e0fa70050211e0b6a287f898c3c9785ca956"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -1658,9 +1658,9 @@ dependencies = [
 
 [[package]]
 name = "lazy_static"
-version = "1.4.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
 [[package]]
 name = "libc"
@@ -1725,9 +1725,9 @@ checksum = "9374ef4228402d4b7e403e5838cb880d9ee663314b0a900d5a6aabf0c213552e"
 
 [[package]]
 name = "log"
-version = "0.4.21"
+version = "0.4.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
+checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
 
 [[package]]
 name = "lottery-erc20"
@@ -1921,7 +1921,7 @@ checksum = "b59072fa0624b55ae5ae3fa6bfa91515bbeb4ac440214bc4a509e2c8806d6e9f"
 
 [[package]]
 name = "multiversx-price-aggregator-sc"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "arrayvec",
  "getrandom 0.2.15",
@@ -1942,7 +1942,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "bitflags 2.5.0",
  "hex-literal",
@@ -1974,7 +1974,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -1985,7 +1985,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-meta"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "clap",
  "colored",
@@ -2011,14 +2011,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-scenario"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "base64",
  "bech32",
@@ -2045,7 +2045,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-snippets"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "base64",
  "env_logger",
@@ -2059,7 +2059,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]
@@ -2090,7 +2090,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-wegld-swap-sc"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
  "multiversx-sc-modules",
@@ -2232,9 +2232,9 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.36.0"
+version = "0.36.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "576dfe1fc8f9df304abb159d767a29d0476f7750fbf8aa7ad07816004a207434"
+checksum = "081b846d1d56ddfc18fdf1a922e4f6e07a11768ea1b92dec44e42b72712ccfce"
 dependencies = [
  "memchr",
 ]
@@ -2372,7 +2372,7 @@ dependencies = [
  "libc",
  "redox_syscall",
  "smallvec",
- "windows-targets 0.52.5",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -2926,9 +2926,9 @@ checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d"
 
 [[package]]
 name = "rustls-webpki"
-version = "0.102.4"
+version = "0.102.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff448f7e92e913c4b7d4c6d8e4540a1724b319b4152b8aef6d4cf8339712b33e"
+checksum = "f9a6fccd794a42c2c105b513a2f62bc3fd8f3ba57a4593677ceb0bd035164d78"
 dependencies = [
  "ring",
  "rustls-pki-types",
@@ -3082,9 +3082,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.117"
+version = "1.0.120"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3"
+checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5"
 dependencies = [
  "indexmap",
  "itoa",
@@ -3268,9 +3268,9 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
 
 [[package]]
 name = "subtle"
-version = "2.6.0"
+version = "2.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d0208408ba0c3df17ed26eb06992cb1a1268d41b2c0e12e65203fbe3972cee5"
+checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
 
 [[package]]
 name = "syn"
@@ -3344,9 +3344,9 @@ dependencies = [
 
 [[package]]
 name = "tinyvec"
-version = "1.6.0"
+version = "1.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
+checksum = "c55115c6fbe2d2bef26eb09ad74bde02d8255476fc0c7b515ef09fbb35742d82"
 dependencies = [
  "tinyvec_macros",
 ]
@@ -3822,7 +3822,7 @@ version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
 dependencies = [
- "windows-targets 0.52.5",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -3842,18 +3842,18 @@ dependencies = [
 
 [[package]]
 name = "windows-targets"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
 dependencies = [
- "windows_aarch64_gnullvm 0.52.5",
- "windows_aarch64_msvc 0.52.5",
- "windows_i686_gnu 0.52.5",
+ "windows_aarch64_gnullvm 0.52.6",
+ "windows_aarch64_msvc 0.52.6",
+ "windows_i686_gnu 0.52.6",
  "windows_i686_gnullvm",
- "windows_i686_msvc 0.52.5",
- "windows_x86_64_gnu 0.52.5",
- "windows_x86_64_gnullvm 0.52.5",
- "windows_x86_64_msvc 0.52.5",
+ "windows_i686_msvc 0.52.6",
+ "windows_x86_64_gnu 0.52.6",
+ "windows_x86_64_gnullvm 0.52.6",
+ "windows_x86_64_msvc 0.52.6",
 ]
 
 [[package]]
@@ -3864,9 +3864,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
 
 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
 
 [[package]]
 name = "windows_aarch64_msvc"
@@ -3876,9 +3876,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
 
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
 
 [[package]]
 name = "windows_i686_gnu"
@@ -3888,15 +3888,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
 
 [[package]]
 name = "windows_i686_gnullvm"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
 
 [[package]]
 name = "windows_i686_msvc"
@@ -3906,9 +3906,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
 
 [[package]]
 name = "windows_x86_64_gnu"
@@ -3918,9 +3918,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
@@ -3930,9 +3930,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
 
 [[package]]
 name = "windows_x86_64_msvc"
@@ -3942,9 +3942,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
 name = "winnow"
@@ -3967,18 +3967,18 @@ dependencies = [
 
 [[package]]
 name = "zerocopy"
-version = "0.7.34"
+version = "0.7.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087"
+checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.34"
+version = "0.7.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b"
+checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/benchmarks/large-storage/Cargo.toml b/contracts/benchmarks/large-storage/Cargo.toml
index 260c728ca1..b61355706a 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.50.5"
+version = "0.50.6"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../framework/scenario"
diff --git a/contracts/benchmarks/large-storage/meta/Cargo.toml b/contracts/benchmarks/large-storage/meta/Cargo.toml
index 7bfeecd199..1b78348715 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.50.5"
+version = "0.50.6"
 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 78dcda66d6..2411aa17f0 100644
--- a/contracts/benchmarks/large-storage/wasm/Cargo.toml
+++ b/contracts/benchmarks/large-storage/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/mappers/benchmark-common/Cargo.toml b/contracts/benchmarks/mappers/benchmark-common/Cargo.toml
index 8d48420e58..230c99c2de 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.50.5"
+version = "0.50.6"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../../framework/scenario"
diff --git a/contracts/benchmarks/mappers/linked-list-repeat/Cargo.toml b/contracts/benchmarks/mappers/linked-list-repeat/Cargo.toml
index ab5042632f..1a6dada56e 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.50.5"
+version = "0.50.6"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.5"
+version = "0.50.6"
 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 abdc897fae..aa9da099a2 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.50.5"
+version = "0.50.6"
 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 2682632d00..b2c3609541 100644
--- a/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/mappers/map-repeat/Cargo.toml b/contracts/benchmarks/mappers/map-repeat/Cargo.toml
index 21ab3eafa3..fe2ded4f49 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.50.5"
+version = "0.50.6"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../../framework/scenario"
diff --git a/contracts/benchmarks/mappers/map-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/map-repeat/meta/Cargo.toml
index d296e76707..6c9f2a80c2 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.50.5"
+version = "0.50.6"
 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 910efa5cc0..e50fca0ff4 100644
--- a/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/mappers/queue-repeat/Cargo.toml b/contracts/benchmarks/mappers/queue-repeat/Cargo.toml
index 2cd8803560..0ca9c8c38a 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.50.5"
+version = "0.50.6"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../../framework/scenario"
diff --git a/contracts/benchmarks/mappers/queue-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/queue-repeat/meta/Cargo.toml
index ba0d9d3a97..e541320dfe 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.50.5"
+version = "0.50.6"
 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 d1ab73028a..4402caaa1c 100644
--- a/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/mappers/set-repeat/Cargo.toml b/contracts/benchmarks/mappers/set-repeat/Cargo.toml
index 9977ea338e..67be7c3d17 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.50.5"
+version = "0.50.6"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../../framework/scenario"
diff --git a/contracts/benchmarks/mappers/set-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/set-repeat/meta/Cargo.toml
index a1cf5698be..a3c961b21d 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.50.5"
+version = "0.50.6"
 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 bbb6977a73..5f733bc413 100644
--- a/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.5"
+version = "0.50.6"
 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 81d11546b9..b3b60d0dc0 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.50.5"
+version = "0.50.6"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.5"
+version = "0.50.6"
 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 18b8b9ea4d..1543cee0da 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.50.5"
+version = "0.50.6"
 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 f436dd4487..e98febbc0d 100644
--- a/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/mappers/vec-repeat/Cargo.toml b/contracts/benchmarks/mappers/vec-repeat/Cargo.toml
index b04dc8c11f..ce692cf64e 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.50.5"
+version = "0.50.6"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../../framework/scenario"
diff --git a/contracts/benchmarks/mappers/vec-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/vec-repeat/meta/Cargo.toml
index c6eecd0a63..8a282eab0f 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.50.5"
+version = "0.50.6"
 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 f140eba36e..26e402d30d 100644
--- a/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/send-tx-repeat/Cargo.toml b/contracts/benchmarks/send-tx-repeat/Cargo.toml
index 77fdfa4c46..173d78f8f1 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.50.5"
+version = "0.50.6"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../framework/scenario"
diff --git a/contracts/benchmarks/send-tx-repeat/meta/Cargo.toml b/contracts/benchmarks/send-tx-repeat/meta/Cargo.toml
index 87f3dad9c8..a9cea535c8 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.50.5"
+version = "0.50.6"
 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 0fc0259b7e..250fce0426 100644
--- a/contracts/benchmarks/send-tx-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/send-tx-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/str-repeat/Cargo.toml b/contracts/benchmarks/str-repeat/Cargo.toml
index 6924ad063a..ffee493d15 100644
--- a/contracts/benchmarks/str-repeat/Cargo.toml
+++ b/contracts/benchmarks/str-repeat/Cargo.toml
@@ -12,10 +12,10 @@ path = "src/str_repeat.rs"
 managed-buffer-builder-cached = ["multiversx-sc/managed-buffer-builder-cached"]
 
 [dependencies.multiversx-sc]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../framework/scenario"
diff --git a/contracts/benchmarks/str-repeat/meta/Cargo.toml b/contracts/benchmarks/str-repeat/meta/Cargo.toml
index 9e3ac46336..359c88135e 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.50.5"
+version = "0.50.6"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.toml b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.toml
index 8878815bb7..102ba73457 100644
--- a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.toml
+++ b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.toml b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.toml
index 4e809ec71d..102b794e6d 100644
--- a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.toml
+++ b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.toml
@@ -29,7 +29,7 @@ path = ".."
 features = ["managed-buffer-builder-cached"]
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/str-repeat/wasm/Cargo.toml b/contracts/benchmarks/str-repeat/wasm/Cargo.toml
index f0b59c585c..330c8beb60 100644
--- a/contracts/benchmarks/str-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/str-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/core/price-aggregator/Cargo.toml b/contracts/core/price-aggregator/Cargo.toml
index 9edd51fa8f..b09f4fa780 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.50.5"
+version = "0.50.6"
 authors = [
     "Claudiu-Marcel Bruda <claudiu.bruda@multiversx.com>",
     "MultiversX <contact@multiversx.com>",
@@ -19,15 +19,15 @@ edition = "2021"
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../framework/scenario"
 
 [dependencies]
diff --git a/contracts/core/price-aggregator/meta/Cargo.toml b/contracts/core/price-aggregator/meta/Cargo.toml
index b6ac37d294..0e410aec9b 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.50.5"
+version = "0.50.6"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.50.5"
+version = "0.50.6"
 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 abf373f9db..2455ba2a56 100644
--- a/contracts/core/price-aggregator/wasm/Cargo.toml
+++ b/contracts/core/price-aggregator/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/core/wegld-swap/Cargo.toml b/contracts/core/wegld-swap/Cargo.toml
index f39afe598d..f45c68fa12 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.50.5"
+version = "0.50.6"
 
 authors = [
     "Dorin Iancu <dorin.iancu@multiversx.com>",
@@ -20,13 +20,13 @@ edition = "2021"
 path = "src/wegld.rs"
 
 [dependencies.multiversx-sc]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../framework/scenario"
diff --git a/contracts/core/wegld-swap/meta/Cargo.toml b/contracts/core/wegld-swap/meta/Cargo.toml
index 9f6015f310..2741b8e953 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.50.5"
+version = "0.50.6"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.50.5"
+version = "0.50.6"
 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 665b59b1c8..d626884667 100644
--- a/contracts/core/wegld-swap/wasm/Cargo.toml
+++ b/contracts/core/wegld-swap/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/adder/Cargo.toml b/contracts/examples/adder/Cargo.toml
index 4e21a9ffc4..e7e9a22564 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.50.5"
+version = "0.50.6"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/adder/interact/Cargo.toml b/contracts/examples/adder/interact/Cargo.toml
index 9bdcbbcee4..def9e93066 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.50.5"
+version = "0.50.6"
 path = "../../../../framework/snippets"
diff --git a/contracts/examples/adder/meta/Cargo.toml b/contracts/examples/adder/meta/Cargo.toml
index f276ef991e..e40df6c9fb 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.50.5"
+version = "0.50.6"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/examples/adder/wasm/Cargo.toml b/contracts/examples/adder/wasm/Cargo.toml
index b252110679..5d2939b513 100644
--- a/contracts/examples/adder/wasm/Cargo.toml
+++ b/contracts/examples/adder/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/bonding-curve-contract/Cargo.toml b/contracts/examples/bonding-curve-contract/Cargo.toml
index 561494f980..02a443d780 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.50.5"
+version = "0.50.6"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../framework/scenario"
 
diff --git a/contracts/examples/bonding-curve-contract/meta/Cargo.toml b/contracts/examples/bonding-curve-contract/meta/Cargo.toml
index 3d586f9dfd..eacb6f5332 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.50.5"
+version = "0.50.6"
 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 d1b914ac07..ec9b4afa75 100644
--- a/contracts/examples/bonding-curve-contract/wasm/Cargo.toml
+++ b/contracts/examples/bonding-curve-contract/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/check-pause/Cargo.toml b/contracts/examples/check-pause/Cargo.toml
index 993972ef1e..3df76f516d 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.50.5"
+version = "0.50.6"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../framework/scenario"
 
diff --git a/contracts/examples/check-pause/meta/Cargo.toml b/contracts/examples/check-pause/meta/Cargo.toml
index cc88c32d7f..0dca72e300 100644
--- a/contracts/examples/check-pause/meta/Cargo.toml
+++ b/contracts/examples/check-pause/meta/Cargo.toml
@@ -9,6 +9,6 @@ authors = ["Alin Cruceat <alin.cruceat@multiversx.com>"]
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.50.5"
+version = "0.50.6"
 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 b697ccdd7b..ea78829187 100644
--- a/contracts/examples/check-pause/wasm/Cargo.toml
+++ b/contracts/examples/check-pause/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/crowdfunding-esdt/Cargo.toml b/contracts/examples/crowdfunding-esdt/Cargo.toml
index cbd5dc2b73..e954b0b6ee 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.50.5"
+version = "0.50.6"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../framework/scenario"
 
 [dev-dependencies]
diff --git a/contracts/examples/crowdfunding-esdt/meta/Cargo.toml b/contracts/examples/crowdfunding-esdt/meta/Cargo.toml
index 90e6dba46d..7db6b02507 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.50.5"
+version = "0.50.6"
 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 92aff884b8..0bc40b59d6 100644
--- a/contracts/examples/crowdfunding-esdt/wasm/Cargo.toml
+++ b/contracts/examples/crowdfunding-esdt/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/crypto-bubbles/Cargo.toml b/contracts/examples/crypto-bubbles/Cargo.toml
index 7749baf65a..170301e4a4 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.50.5"
+version = "0.50.6"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/crypto-bubbles/meta/Cargo.toml b/contracts/examples/crypto-bubbles/meta/Cargo.toml
index 2e6cefc353..51367f23e3 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.50.5"
+version = "0.50.6"
 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 ee22e8dda9..adccb93d05 100644
--- a/contracts/examples/crypto-bubbles/wasm/Cargo.toml
+++ b/contracts/examples/crypto-bubbles/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.5"
+version = "0.50.6"
 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 4913d0fe45..93d5d84c3b 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.50.5"
+version = "0.50.6"
 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 4417764479..1f1fc458fc 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.50.5"
+version = "0.50.6"
 path = "../../../../../framework/base"
diff --git a/contracts/examples/crypto-kitties/kitty-auction/Cargo.toml b/contracts/examples/crypto-kitties/kitty-auction/Cargo.toml
index 04c55d48ba..b708b3beb4 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.50.5"
+version = "0.50.6"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.5"
+version = "0.50.6"
 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 c9a7383483..9ccadb06cc 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.50.5"
+version = "0.50.6"
 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 a7683bab77..02fe4f63f9 100644
--- a/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.toml
+++ b/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.5"
+version = "0.50.6"
 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 e0c6946642..551ba6423d 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.50.5"
+version = "0.50.6"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.5"
+version = "0.50.6"
 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 f37d47cc16..6600744346 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.50.5"
+version = "0.50.6"
 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 4c8da87908..b2d1a79c4b 100644
--- a/contracts/examples/crypto-kitties/kitty-genetic-alg/wasm/Cargo.toml
+++ b/contracts/examples/crypto-kitties/kitty-genetic-alg/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.5"
+version = "0.50.6"
 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 299c73867b..716b6d90a7 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.50.5"
+version = "0.50.6"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.5"
+version = "0.50.6"
 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 63015f8c37..320b13c248 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.50.5"
+version = "0.50.6"
 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 de33ddb3eb..47b863149a 100644
--- a/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.toml
+++ b/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/crypto-zombies/Cargo.toml b/contracts/examples/crypto-zombies/Cargo.toml
index 4dc208d00a..174566ef13 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.50.5"
+version = "0.50.6"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/crypto-zombies/meta/Cargo.toml b/contracts/examples/crypto-zombies/meta/Cargo.toml
index 35e0910007..cee975b8fa 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.50.5"
+version = "0.50.6"
 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 c3d7148482..74b87ed668 100644
--- a/contracts/examples/crypto-zombies/wasm/Cargo.toml
+++ b/contracts/examples/crypto-zombies/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/digital-cash/Cargo.toml b/contracts/examples/digital-cash/Cargo.toml
index 465db4b6b3..189feac172 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.50.5"
+version = "0.50.6"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/digital-cash/meta/Cargo.toml b/contracts/examples/digital-cash/meta/Cargo.toml
index 4261b3fc2d..fa4e8e8d4a 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.50.5"
+version = "0.50.6"
 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 55f314f33a..0139e2d002 100644
--- a/contracts/examples/digital-cash/wasm/Cargo.toml
+++ b/contracts/examples/digital-cash/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/empty/Cargo.toml b/contracts/examples/empty/Cargo.toml
index 467a4ab918..c13a9a55d3 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.50.5"
+version = "0.50.6"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../framework/scenario"
 
 [dev-dependencies]
diff --git a/contracts/examples/empty/meta/Cargo.toml b/contracts/examples/empty/meta/Cargo.toml
index ae89e5f8fa..92e4e9ee70 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.50.5"
+version = "0.50.6"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/examples/empty/wasm/Cargo.toml b/contracts/examples/empty/wasm/Cargo.toml
index 7e378f7287..2428b526f7 100644
--- a/contracts/examples/empty/wasm/Cargo.toml
+++ b/contracts/examples/empty/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.5"
+version = "0.50.6"
 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 58c2c0aa1b..1b9d6568ec 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.50.5"
+version = "0.50.6"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.5"
+version = "0.50.6"
 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 ae5dc60723..66839c1a9b 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.50.5"
+version = "0.50.6"
 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 77968838c0..be6bef8aa2 100644
--- a/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.toml
+++ b/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/factorial/Cargo.toml b/contracts/examples/factorial/Cargo.toml
index 68471a570a..e6c9899d91 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.50.5"
+version = "0.50.6"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/factorial/meta/Cargo.toml b/contracts/examples/factorial/meta/Cargo.toml
index d90a440c18..ec1d61ba9c 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.50.5"
+version = "0.50.6"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/examples/factorial/wasm/Cargo.toml b/contracts/examples/factorial/wasm/Cargo.toml
index e1977246dd..5d22f02e59 100644
--- a/contracts/examples/factorial/wasm/Cargo.toml
+++ b/contracts/examples/factorial/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/fractional-nfts/Cargo.toml b/contracts/examples/fractional-nfts/Cargo.toml
index 2e31cfea8c..7fb92da072 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.50.5"
+version = "0.50.6"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/fractional-nfts/meta/Cargo.toml b/contracts/examples/fractional-nfts/meta/Cargo.toml
index e474dec987..d570216a0b 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.50.5"
+version = "0.50.6"
 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 be56880737..46e92f7a96 100644
--- a/contracts/examples/fractional-nfts/wasm/Cargo.toml
+++ b/contracts/examples/fractional-nfts/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/lottery-esdt/Cargo.toml b/contracts/examples/lottery-esdt/Cargo.toml
index 3990ec39a5..c4c0f0c384 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.50.5"
+version = "0.50.6"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/lottery-esdt/meta/Cargo.toml b/contracts/examples/lottery-esdt/meta/Cargo.toml
index a755b5b6af..e7011f4ad0 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.50.5"
+version = "0.50.6"
 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 ccac818577..fdfe935446 100644
--- a/contracts/examples/lottery-esdt/wasm/Cargo.toml
+++ b/contracts/examples/lottery-esdt/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/multisig/Cargo.toml b/contracts/examples/multisig/Cargo.toml
index f067ee6748..e4eb35a4cc 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.50.5"
+version = "0.50.6"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../framework/scenario"
 
 [dev-dependencies.adder]
@@ -27,7 +27,7 @@ path = "../adder"
 path = "../factorial"
 
 [dev-dependencies.multiversx-wegld-swap-sc]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../core/wegld-swap"
 
 [dev-dependencies]
diff --git a/contracts/examples/multisig/interact/Cargo.toml b/contracts/examples/multisig/interact/Cargo.toml
index e84bbcd707..b7a6b387a4 100644
--- a/contracts/examples/multisig/interact/Cargo.toml
+++ b/contracts/examples/multisig/interact/Cargo.toml
@@ -18,17 +18,17 @@ toml = "0.8.6"
 path = ".."
 
 [dependencies.multiversx-sc-modules]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../../contracts/modules"
 
 [dependencies.multiversx-sc-snippets]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../../framework/snippets"
 
 [dependencies.multiversx-sc-scenario]
-version = "=0.50.5"
+version = "=0.50.6"
 path = "../../../../framework/scenario"
 
 [dependencies.multiversx-sc]
-version = "=0.50.5"
+version = "=0.50.6"
 path = "../../../../framework/base"
diff --git a/contracts/examples/multisig/meta/Cargo.toml b/contracts/examples/multisig/meta/Cargo.toml
index 6a58bc0ac7..3350d04c2d 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.50.5"
+version = "0.50.6"
 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 5881af7848..66f19593ac 100644
--- a/contracts/examples/multisig/wasm-multisig-full/Cargo.toml
+++ b/contracts/examples/multisig/wasm-multisig-full/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.5"
+version = "0.50.6"
 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 476c184ddf..918240759c 100644
--- a/contracts/examples/multisig/wasm-multisig-view/Cargo.toml
+++ b/contracts/examples/multisig/wasm-multisig-view/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/multisig/wasm/Cargo.toml b/contracts/examples/multisig/wasm/Cargo.toml
index c423915526..20765ecc0f 100644
--- a/contracts/examples/multisig/wasm/Cargo.toml
+++ b/contracts/examples/multisig/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/nft-minter/Cargo.toml b/contracts/examples/nft-minter/Cargo.toml
index 6c04f36322..aab52700a3 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.50.5"
+version = "0.50.6"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/nft-minter/meta/Cargo.toml b/contracts/examples/nft-minter/meta/Cargo.toml
index 01b0cb9377..d40b0e840b 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.50.5"
+version = "0.50.6"
 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 50e383bdbc..918eb3183c 100644
--- a/contracts/examples/nft-minter/wasm/Cargo.toml
+++ b/contracts/examples/nft-minter/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/nft-storage-prepay/Cargo.toml b/contracts/examples/nft-storage-prepay/Cargo.toml
index ceb3df21ee..2989326ad3 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.50.5"
+version = "0.50.6"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/nft-storage-prepay/meta/Cargo.toml b/contracts/examples/nft-storage-prepay/meta/Cargo.toml
index 1c022d6eb4..bbe46c0eb6 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.50.5"
+version = "0.50.6"
 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 3c232de7dc..775e5fa571 100644
--- a/contracts/examples/nft-storage-prepay/wasm/Cargo.toml
+++ b/contracts/examples/nft-storage-prepay/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/nft-subscription/Cargo.toml b/contracts/examples/nft-subscription/Cargo.toml
index 5c75f3f81c..774063b3d8 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.50.5"
+version = "0.50.6"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/nft-subscription/meta/Cargo.toml b/contracts/examples/nft-subscription/meta/Cargo.toml
index fb733c2f16..db4e60d637 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.50.5"
+version = "0.50.6"
 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 10c72479f7..dd07eb12a8 100644
--- a/contracts/examples/nft-subscription/wasm/Cargo.toml
+++ b/contracts/examples/nft-subscription/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/order-book/factory/Cargo.toml b/contracts/examples/order-book/factory/Cargo.toml
index 44a0472d33..d0a0f5c42b 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.50.5"
+version = "0.50.6"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../../framework/scenario"
 
diff --git a/contracts/examples/order-book/factory/meta/Cargo.toml b/contracts/examples/order-book/factory/meta/Cargo.toml
index b0e6d641a2..566933cd26 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.50.5"
+version = "0.50.6"
 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 16d7fa61f1..ea3726fb82 100644
--- a/contracts/examples/order-book/factory/wasm/Cargo.toml
+++ b/contracts/examples/order-book/factory/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/order-book/pair/Cargo.toml b/contracts/examples/order-book/pair/Cargo.toml
index 947bca1dce..9345ef7eef 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.50.5"
+version = "0.50.6"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../../framework/scenario"
diff --git a/contracts/examples/order-book/pair/meta/Cargo.toml b/contracts/examples/order-book/pair/meta/Cargo.toml
index 62356ef9d5..a0f90d214f 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.50.5"
+version = "0.50.6"
 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 c1d347e403..08a0b3e6e9 100644
--- a/contracts/examples/order-book/pair/wasm/Cargo.toml
+++ b/contracts/examples/order-book/pair/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/ping-pong-egld/Cargo.toml b/contracts/examples/ping-pong-egld/Cargo.toml
index 8b730a6f23..b9db322eaa 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.50.5"
+version = "0.50.6"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../framework/scenario"
 
diff --git a/contracts/examples/ping-pong-egld/meta/Cargo.toml b/contracts/examples/ping-pong-egld/meta/Cargo.toml
index a69d0e7f45..e6b099c0d0 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.50.5"
+version = "0.50.6"
 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 41fa97c2c0..2a2bf1d852 100644
--- a/contracts/examples/ping-pong-egld/wasm/Cargo.toml
+++ b/contracts/examples/ping-pong-egld/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/proxy-pause/Cargo.toml b/contracts/examples/proxy-pause/Cargo.toml
index 55004e58f4..0dd395e1ba 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.50.5"
+version = "0.50.6"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.5"
+version = "0.50.6"
 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 5ad019bf43..3a19871b29 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.50.5"
+version = "0.50.6"
 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 85dc3d5aaa..5a660c1354 100644
--- a/contracts/examples/proxy-pause/wasm/Cargo.toml
+++ b/contracts/examples/proxy-pause/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/rewards-distribution/Cargo.toml b/contracts/examples/rewards-distribution/Cargo.toml
index f46147df4a..ee751a1ce0 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.50.5"
+version = "0.50.6"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/rewards-distribution/meta/Cargo.toml b/contracts/examples/rewards-distribution/meta/Cargo.toml
index 6e4cf1655c..85fa75f5f0 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 <claudiu.bruda@multiversx.com>"]
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.50.5"
+version = "0.50.6"
 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 0aa00e1f18..2bd9f68a79 100644
--- a/contracts/examples/rewards-distribution/wasm/Cargo.toml
+++ b/contracts/examples/rewards-distribution/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/seed-nft-minter/Cargo.toml b/contracts/examples/seed-nft-minter/Cargo.toml
index 9e1be8a89a..d7b2b6244d 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.50.5"
+version = "0.50.6"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/seed-nft-minter/meta/Cargo.toml b/contracts/examples/seed-nft-minter/meta/Cargo.toml
index 1eb420c985..0670cf0652 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 <claudiu.bruda@multiversx.com>"]
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.50.5"
+version = "0.50.6"
 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 51439684b8..c9dab345aa 100644
--- a/contracts/examples/seed-nft-minter/wasm/Cargo.toml
+++ b/contracts/examples/seed-nft-minter/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/token-release/Cargo.toml b/contracts/examples/token-release/Cargo.toml
index d767abeac2..4832426d4c 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.50.5"
+version = "0.50.6"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../framework/scenario"
 
diff --git a/contracts/examples/token-release/meta/Cargo.toml b/contracts/examples/token-release/meta/Cargo.toml
index 4ed87b3df6..b02832c82a 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.50.5"
+version = "0.50.6"
 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 7e92086048..d5721237bc 100644
--- a/contracts/examples/token-release/wasm/Cargo.toml
+++ b/contracts/examples/token-release/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/abi-tester/Cargo.toml b/contracts/feature-tests/abi-tester/Cargo.toml
index f6d30ca3d3..3361de41bc 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.50.5"
+version = "0.50.6"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../framework/scenario"
 
 [dev-dependencies.multiversx-sc-meta]
-version = "0.50.5"
+version = "0.50.6"
 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 c244099e66..99c69cf57b 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.50.5"
+            "version": "0.50.6"
         }
     },
     "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 ce1a262b87..b6f5235973 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.50.5"
+            "version": "0.50.6"
         }
     },
     "docs": [
diff --git a/contracts/feature-tests/abi-tester/meta/Cargo.toml b/contracts/feature-tests/abi-tester/meta/Cargo.toml
index bda8799234..0259f6785c 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.50.5"
+version = "0.50.6"
 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 0176e28813..ba4c9b488f 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.5"
+version = "0.50.6"
 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 10af2789be..ca10008106 100644
--- a/contracts/feature-tests/abi-tester/wasm/Cargo.toml
+++ b/contracts/feature-tests/abi-tester/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/alloc-features/Cargo.toml b/contracts/feature-tests/alloc-features/Cargo.toml
index 18950560b2..e36480c31b 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.50.5"
+version = "0.50.6"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.5"
+version = "0.50.6"
 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 07f8633109..309c0058c3 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.50.5"
+version = "0.50.6"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml
index e883eba340..d8ff7762df 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml
index 95ed88ee71..8dfe19f885 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/alloc-features/wasm/Cargo.toml b/contracts/feature-tests/alloc-features/wasm/Cargo.toml
index 1661f80e6f..a30f707bdb 100644
--- a/contracts/feature-tests/alloc-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/alloc-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/basic-features/Cargo.toml b/contracts/feature-tests/basic-features/Cargo.toml
index 443a757b77..44d46d2064 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.50.5"
+version = "0.50.6"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../framework/scenario"
 
 [dependencies.multiversx-sc-modules]
-version = "0.50.5"
+version = "0.50.6"
 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 0da4f0fb6a..5290f2b709 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.50.5"
+version = "0.50.6"
 path = "../../../../framework/snippets"
diff --git a/contracts/feature-tests/basic-features/meta/Cargo.toml b/contracts/feature-tests/basic-features/meta/Cargo.toml
index c643371e15..de7261852b 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.50.5"
+version = "0.50.6"
 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 6b0ec29012..753669477d 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.5"
+version = "0.50.6"
 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 5c6d1752c9..9719ed0f04 100644
--- a/contracts/feature-tests/basic-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/basic-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.5"
+version = "0.50.6"
 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 921ff24261..bacc579184 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.50.5"
+version = "0.50.6"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.5"
+version = "0.50.6"
 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 62de4db311..2ada52472c 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.50.5"
+version = "0.50.6"
 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 4de9b9a8b1..fbecceb248 100644
--- a/contracts/feature-tests/big-float-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/big-float-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/Cargo.toml b/contracts/feature-tests/composability/Cargo.toml
index 5e259fd0f2..3882a8429d 100644
--- a/contracts/feature-tests/composability/Cargo.toml
+++ b/contracts/feature-tests/composability/Cargo.toml
@@ -36,9 +36,9 @@ path = "recursive-caller"
 path = "vault"
 
 [dependencies.multiversx-sc]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.5"
+version = "0.50.6"
 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 9aac9e8c3e..e62a666bd4 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.50.5"
+version = "0.50.6"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.5"
+version = "0.50.6"
 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 86754e4e7b..49010d9d4c 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.50.5"
+version = "0.50.6"
 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 d711ad576e..bd20a6a4f1 100644
--- a/contracts/feature-tests/composability/builtin-func-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/builtin-func-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.5"
+version = "0.50.6"
 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 6963d2669a..0aabff9001 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.50.5"
+version = "0.50.6"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.5"
+version = "0.50.6"
 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 da8719e486..a0b322f7e8 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
@@ -9,10 +9,10 @@ publish = false
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.5"
+version = "0.50.6"
 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 f85768427f..03556efd01 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.50.5"
+version = "0.50.6"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.50.5"
+version = "0.50.6"
 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 42c0d5ec7e..31ebb1341a 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.5"
+version = "0.50.6"
 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 ccc07e8ddc..87a04cbeb6 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.50.5"
+version = "0.50.6"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.5"
+version = "0.50.6"
 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 520dc1a10b..65b804eda2 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.50.5"
+version = "0.50.6"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.50.5"
+version = "0.50.6"
 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 6c98abf086..aa7c96606d 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.5"
+version = "0.50.6"
 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 847ed328c8..21ceb2b63f 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.50.5"
+version = "0.50.6"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.5"
+version = "0.50.6"
 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 77368a14f8..eb5deee9e0 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.50.5"
+version = "0.50.6"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.5"
+version = "0.50.6"
 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 604474db20..da008ccb11 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.50.5"
+version = "0.50.6"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.50.5"
+version = "0.50.6"
 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 f308297e07..ee1416370c 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.5"
+version = "0.50.6"
 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 84d530aeae..1dadad3776 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
@@ -9,10 +9,10 @@ publish = false
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.5"
+version = "0.50.6"
 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 6548a2df6e..67076e6054 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.50.5"
+version = "0.50.6"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.50.5"
+version = "0.50.6"
 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 94bb422816..496c7e8ef7 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/forwarder-legacy/Cargo.toml b/contracts/feature-tests/composability/forwarder-legacy/Cargo.toml
index d077c39a13..d9e4eca6fc 100644
--- a/contracts/feature-tests/composability/forwarder-legacy/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-legacy/Cargo.toml
@@ -12,10 +12,10 @@ path = "src/forwarder_legacy_main.rs"
 path = "../vault"
 
 [dependencies.multiversx-sc]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../../framework/scenario"
 
diff --git a/contracts/feature-tests/composability/forwarder-legacy/meta/Cargo.toml b/contracts/feature-tests/composability/forwarder-legacy/meta/Cargo.toml
index 03669bea49..0cca16d001 100644
--- a/contracts/feature-tests/composability/forwarder-legacy/meta/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-legacy/meta/Cargo.toml
@@ -8,6 +8,6 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../../../framework/meta"
 default-features = false
diff --git a/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.toml b/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.toml
index 763ac243e9..d7a959ebd9 100644
--- a/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.5"
+version = "0.50.6"
 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 2b8ca60686..b57a669afa 100644
--- a/contracts/feature-tests/composability/forwarder-queue/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-queue/Cargo.toml
@@ -9,14 +9,14 @@ publish = false
 path = "src/forwarder_queue.rs"
 
 [dependencies.multiversx-sc]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../../framework/wasm-adapter"
 optional = true
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.5"
+version = "0.50.6"
 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 8f0d1e3d64..94db6740b5 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.50.5"
+version = "0.50.6"
 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 37205d0b8a..9723c204f4 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.5"
+version = "0.50.6"
 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 348d9610bd..43bbb13fe8 100644
--- a/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.5"
+version = "0.50.6"
 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 085f892a4b..c74fa65243 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.50.5"
+version = "0.50.6"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.5"
+version = "0.50.6"
 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 a1ba9f606f..8aa6537d72 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.50.5"
+version = "0.50.6"
 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 10cb5eb862..500bb35d64 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.5"
+version = "0.50.6"
 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 2093af29f3..908d1518c9 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.5"
+version = "0.50.6"
 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 3be401c5e6..10d61f7ae7 100644
--- a/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/forwarder/Cargo.toml b/contracts/feature-tests/composability/forwarder/Cargo.toml
index 31ca73bd87..fda35825d7 100644
--- a/contracts/feature-tests/composability/forwarder/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder/Cargo.toml
@@ -9,10 +9,10 @@ publish = false
 path = "src/forwarder_main.rs"
 
 [dependencies.multiversx-sc]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../../framework/scenario"
 
diff --git a/contracts/feature-tests/composability/forwarder/meta/Cargo.toml b/contracts/feature-tests/composability/forwarder/meta/Cargo.toml
index 5d90d25f52..8715cc80d5 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.50.5"
+version = "0.50.6"
 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 cb4fc5fa25..f4efab0a86 100644
--- a/contracts/feature-tests/composability/forwarder/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/interact/Cargo.toml b/contracts/feature-tests/composability/interact/Cargo.toml
index e276ae1e05..defbf0952f 100644
--- a/contracts/feature-tests/composability/interact/Cargo.toml
+++ b/contracts/feature-tests/composability/interact/Cargo.toml
@@ -15,9 +15,9 @@ serde = { version = "1.0", features = ["derive"] }
 toml = "0.8.6"
 
 [dependencies.multiversx-sc]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-snippets]
-version = "0.50.5"
+version = "0.50.6"
 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 1d674bda26..5473aa5ee2 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.50.5"
+version = "0.50.6"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.5"
+version = "0.50.6"
 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 06c04991cf..4505a29d1f 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.50.5"
+version = "0.50.6"
 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 c565a29346..0f9058dc80 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.5"
+version = "0.50.6"
 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 d570b8f9af..e1c4986253 100644
--- a/contracts/feature-tests/composability/promises-features/Cargo.toml
+++ b/contracts/feature-tests/composability/promises-features/Cargo.toml
@@ -9,6 +9,6 @@ publish = false
 path = "src/promises_main.rs"
 
 [dependencies.multiversx-sc]
-version = "0.50.5"
+version = "0.50.6"
 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 acaf4bbf6e..05e8424dfb 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.50.5"
+version = "0.50.6"
 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 e0bbb766f4..c4589e19ab 100644
--- a/contracts/feature-tests/composability/promises-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/promises-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.5"
+version = "0.50.6"
 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 1751122360..6fbc500384 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.50.5"
+version = "0.50.6"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.5"
+version = "0.50.6"
 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 afa60c8670..9fd4ec1f22 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.50.5"
+version = "0.50.6"
 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 a97eb0ba4b..5e17aba862 100644
--- a/contracts/feature-tests/composability/proxy-test-first/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/proxy-test-first/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.5"
+version = "0.50.6"
 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 edfc5ccdd5..537af734c1 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.50.5"
+version = "0.50.6"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.5"
+version = "0.50.6"
 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 55cfa7b0e3..e3089599da 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.50.5"
+version = "0.50.6"
 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 86beebbabc..3122966e86 100644
--- a/contracts/feature-tests/composability/proxy-test-second/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/proxy-test-second/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.5"
+version = "0.50.6"
 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 9d33073f27..8e93742f1b 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.50.5"
+version = "0.50.6"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.5"
+version = "0.50.6"
 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 441d9ca8f7..43b775da38 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.50.5"
+version = "0.50.6"
 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 7db6c2d320..1ba21060c2 100644
--- a/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.5"
+version = "0.50.6"
 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 778f77e431..54997cd753 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.50.5"
+version = "0.50.6"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.5"
+version = "0.50.6"
 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 b89fe3b3bb..323c480284 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.50.5"
+version = "0.50.6"
 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 9fbe945af6..3b898dfb79 100644
--- a/contracts/feature-tests/composability/transfer-role-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/transfer-role-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/vault/Cargo.toml b/contracts/feature-tests/composability/vault/Cargo.toml
index 6d3f3c6453..e043732ff7 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.50.5"
+version = "0.50.6"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../../framework/scenario"
diff --git a/contracts/feature-tests/composability/vault/meta/Cargo.toml b/contracts/feature-tests/composability/vault/meta/Cargo.toml
index a532252e68..4a29ebaeaa 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.50.5"
+version = "0.50.6"
 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 35e5a9ad9d..f43fac98c9 100644
--- a/contracts/feature-tests/composability/vault/wasm-vault-promises/Cargo.toml
+++ b/contracts/feature-tests/composability/vault/wasm-vault-promises/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.5"
+version = "0.50.6"
 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 359a7cef4a..3bc79611c1 100644
--- a/contracts/feature-tests/composability/vault/wasm-vault-upgrade/Cargo.toml
+++ b/contracts/feature-tests/composability/vault/wasm-vault-upgrade/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.5"
+version = "0.50.6"
 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 fc0ede1620..3dd16446e5 100644
--- a/contracts/feature-tests/composability/vault/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/vault/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.5"
+version = "0.50.6"
 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 6d17c6a61e..6e307c9718 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.50.5"
+version = "0.50.6"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.5"
+version = "0.50.6"
 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 4bc64de5d5..439c823726 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.50.5"
+version = "0.50.6"
 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 e0506b1287..b262b82dae 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.5"
+version = "0.50.6"
 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 c05bac1449..7589eb2fb7 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.50.5"
+version = "0.50.6"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.5"
+version = "0.50.6"
 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 9994ac7fd8..54cc3181c6 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.50.5"
+version = "0.50.6"
 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 788be22a80..f294490326 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.5"
+version = "0.50.6"
 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 3b9fdab55a..a0d126dfa2 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.50.5"
+version = "0.50.6"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.5"
+version = "0.50.6"
 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 a8a234a590..a61f1c4f5e 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.50.5"
+version = "0.50.6"
 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 14e3497586..77ec82cfd5 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.5"
+version = "0.50.6"
 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 19afa1425a..36d20825b9 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.50.5"
+version = "0.50.6"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.5"
+version = "0.50.6"
 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 bd71fb249d..4c3387e696 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.50.5"
+version = "0.50.6"
 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 761f27dce8..7d971dddf8 100644
--- a/contracts/feature-tests/erc-style-contracts/erc1155/wasm/Cargo.toml
+++ b/contracts/feature-tests/erc-style-contracts/erc1155/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.5"
+version = "0.50.6"
 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 a89fc67f45..10ce57d7ab 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.50.5"
+version = "0.50.6"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.5"
+version = "0.50.6"
 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 2157e49298..c2bbcbab18 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.50.5"
+version = "0.50.6"
 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 820cff41b9..993ab87496 100644
--- a/contracts/feature-tests/erc-style-contracts/erc20/wasm/Cargo.toml
+++ b/contracts/feature-tests/erc-style-contracts/erc20/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.5"
+version = "0.50.6"
 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 865eea0b4f..a3ec2527b8 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.50.5"
+version = "0.50.6"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.5"
+version = "0.50.6"
 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 a4e0c8192b..4c104ba3df 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.50.5"
+version = "0.50.6"
 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 b9f08a8bbb..cc5a48fbde 100644
--- a/contracts/feature-tests/erc-style-contracts/erc721/wasm/Cargo.toml
+++ b/contracts/feature-tests/erc-style-contracts/erc721/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.5"
+version = "0.50.6"
 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 def5c09caa..da3e44e1b0 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.50.5"
+version = "0.50.6"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.5"
+version = "0.50.6"
 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 0d25d3f571..29b5147e47 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.50.5"
+version = "0.50.6"
 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 f24d2b8752..ead344d5b4 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.5"
+version = "0.50.6"
 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 490cf8b36d..c5283e8edb 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.50.5"
+version = "0.50.6"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.5"
+version = "0.50.6"
 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 e6a2771bde..4a13c9fd47 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.50.5"
+version = "0.50.6"
 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 2ab216bb6f..2c878298cf 100644
--- a/contracts/feature-tests/esdt-system-sc-mock/wasm/Cargo.toml
+++ b/contracts/feature-tests/esdt-system-sc-mock/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/exchange-features/Cargo.toml b/contracts/feature-tests/exchange-features/Cargo.toml
index ee6b446d95..743fcf7f03 100644
--- a/contracts/feature-tests/exchange-features/Cargo.toml
+++ b/contracts/feature-tests/exchange-features/Cargo.toml
@@ -9,9 +9,9 @@ publish = false
 path = "src/exchange_features.rs"
 
 [dependencies.multiversx-sc]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../framework/scenario"
diff --git a/contracts/feature-tests/exchange-features/meta/Cargo.toml b/contracts/feature-tests/exchange-features/meta/Cargo.toml
index dcdc40015c..5c147446e1 100644
--- a/contracts/feature-tests/exchange-features/meta/Cargo.toml
+++ b/contracts/feature-tests/exchange-features/meta/Cargo.toml
@@ -8,6 +8,6 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/feature-tests/exchange-features/wasm/Cargo.toml b/contracts/feature-tests/exchange-features/wasm/Cargo.toml
index e718d3db73..ae5b8f41a9 100644
--- a/contracts/feature-tests/exchange-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/exchange-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.5"
+version = "0.50.6"
 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 68681c349d..56bed07a83 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.50.5"
+version = "0.50.6"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.5"
+version = "0.50.6"
 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 aa87010a0d..8e74985ea8 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.50.5"
+version = "0.50.6"
 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 8fd1530950..49fd41b021 100644
--- a/contracts/feature-tests/formatted-message-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/formatted-message-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.5"
+version = "0.50.6"
 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 026b87a338..1d7fa26b33 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.50.5"
+version = "0.50.6"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.5"
+version = "0.50.6"
 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 ff2a5f1422..66923712bd 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.50.5"
+version = "0.50.6"
 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 f1eb506dce..4262504d98 100644
--- a/contracts/feature-tests/managed-map-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/managed-map-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.5"
+version = "0.50.6"
 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 16d506b682..a16a03cffc 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.50.5"
+version = "0.50.6"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.5"
+version = "0.50.6"
 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 ed5298ad19..dfeac8e7af 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.50.5"
+version = "0.50.6"
 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 83f51076c9..909bb16df8 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.5"
+version = "0.50.6"
 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 4389b312db..5d30c9acc7 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
@@ -29,7 +29,7 @@ path = ".."
 features = ["example_feature"]
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.5"
+version = "0.50.6"
 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 0c5f20ba8f..8c518bf416 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.5"
+version = "0.50.6"
 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 ce2a108d20..e6a906567e 100644
--- a/contracts/feature-tests/multi-contract-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/multi-contract-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.5"
+version = "0.50.6"
 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 92803a2191..c2de83e44b 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.50.5"
+version = "0.50.6"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.5"
+version = "0.50.6"
 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 6b2519fc30..8ebf1f27dd 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.50.5"
+version = "0.50.6"
 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 066f59f968..3955b00e76 100644
--- a/contracts/feature-tests/panic-message-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/panic-message-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/payable-features/Cargo.toml b/contracts/feature-tests/payable-features/Cargo.toml
index 0e6ed8d19c..8e837a4ed0 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.50.5"
+version = "0.50.6"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../framework/scenario"
diff --git a/contracts/feature-tests/payable-features/meta/Cargo.toml b/contracts/feature-tests/payable-features/meta/Cargo.toml
index fe86bb14a3..9d05c10a1c 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.50.5"
+version = "0.50.6"
 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 659025df0b..c159e453a0 100644
--- a/contracts/feature-tests/payable-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/payable-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.5"
+version = "0.50.6"
 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 d21de02dd1..56d2158684 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.50.5"
+version = "0.50.6"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.5"
+version = "0.50.6"
 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 37c04408ea..dce667e29a 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.50.5"
+version = "0.50.6"
 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 717c8510f9..62184cf516 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.50.5"
+version = "0.50.6"
 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 d60e4f8ed3..4b7143f4eb 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.50.5"
+// version = "0.50.6"
 // 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 d8f43946d2..c7b11471be 100644
--- a/contracts/feature-tests/rust-snippets-generator-test/wasm/Cargo.toml
+++ b/contracts/feature-tests/rust-snippets-generator-test/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.5"
+version = "0.50.6"
 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 75d8fa4643..250a4898db 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.50.5"
+version = "0.50.6"
 path = "../../../framework/base"
 features = [ "alloc" ]
 
@@ -17,7 +17,7 @@ path = "../../examples/adder"
 path = "../../feature-tests/basic-features"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.5"
+version = "0.50.6"
 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 5d0a7b998e..6ef23a25f8 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.50.5"
+version = "0.50.6"
 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 e3a2bf4a14..533e345a18 100644
--- a/contracts/feature-tests/rust-testing-framework-tester/wasm/Cargo.toml
+++ b/contracts/feature-tests/rust-testing-framework-tester/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/scenario-tester/Cargo.toml b/contracts/feature-tests/scenario-tester/Cargo.toml
index 43497ac936..fd87e332c5 100644
--- a/contracts/feature-tests/scenario-tester/Cargo.toml
+++ b/contracts/feature-tests/scenario-tester/Cargo.toml
@@ -9,9 +9,9 @@ publish = false
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../framework/scenario"
diff --git a/contracts/feature-tests/scenario-tester/meta/Cargo.toml b/contracts/feature-tests/scenario-tester/meta/Cargo.toml
index 5824568ed9..eddb46841a 100644
--- a/contracts/feature-tests/scenario-tester/meta/Cargo.toml
+++ b/contracts/feature-tests/scenario-tester/meta/Cargo.toml
@@ -8,6 +8,6 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../../framework/meta"
 default-features = false
diff --git a/contracts/feature-tests/scenario-tester/wasm/Cargo.toml b/contracts/feature-tests/scenario-tester/wasm/Cargo.toml
index 80b8296af6..9b4bac5c8b 100644
--- a/contracts/feature-tests/scenario-tester/wasm/Cargo.toml
+++ b/contracts/feature-tests/scenario-tester/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/use-module/Cargo.toml b/contracts/feature-tests/use-module/Cargo.toml
index 22bf41d993..bfea22934c 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.50.5"
+version = "0.50.6"
 path = "../../../contracts/modules"
 
 [dependencies.multiversx-sc]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../framework/scenario"
 
 [dev-dependencies.multiversx-sc-meta]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../framework/meta"
diff --git a/contracts/feature-tests/use-module/meta/Cargo.toml b/contracts/feature-tests/use-module/meta/Cargo.toml
index 4d59041f8d..a6637c8111 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.50.5"
+version = "0.50.6"
 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 5a91c89feb..10c6658a56 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.50.5"
+version = "0.50.6"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-meta]
-version = "0.50.5"
+version = "0.50.6"
 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 1d45144bb7..baea672ec8 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.50.5"
+            "version": "0.50.6"
         }
     },
     "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 e2dfdbefb9..4d8a88c54e 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.50.5"
+            "version": "0.50.6"
         }
     },
     "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 f44d5cf870..0297976f0f 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.5"
+version = "0.50.6"
 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 88dee8d70d..16baa5f65c 100644
--- a/contracts/feature-tests/use-module/wasm/Cargo.toml
+++ b/contracts/feature-tests/use-module/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/modules/Cargo.toml b/contracts/modules/Cargo.toml
index f610d09504..a6fe820a6d 100644
--- a/contracts/modules/Cargo.toml
+++ b/contracts/modules/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-modules"
-version = "0.50.5"
+version = "0.50.6"
 edition = "2021"
 
 authors = ["MultiversX <contact@multiversx.com>"]
@@ -17,5 +17,5 @@ categories = ["no-std", "wasm", "cryptography::cryptocurrencies"]
 alloc = ["multiversx-sc/alloc"]
 
 [dependencies.multiversx-sc]
-version = "0.50.5"
+version = "0.50.6"
 path = "../../framework/base"
diff --git a/framework/base/Cargo.toml b/framework/base/Cargo.toml
index 292d04ddf7..4f30ab179e 100644
--- a/framework/base/Cargo.toml
+++ b/framework/base/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc"
-version = "0.50.5"
+version = "0.50.6"
 edition = "2021"
 
 authors = ["Andrei Marinica <andrei.marinica@multiversx.com>", "MultiversX <contact@multiversx.com>"]
@@ -29,7 +29,7 @@ num-traits = { version = "=0.2.19", default-features = false }
 unwrap-infallible = "0.1.5"
 
 [dependencies.multiversx-sc-derive]
-version = "=0.50.5"
+version = "=0.50.6"
 path = "../derive"
 
 [dependencies.multiversx-sc-codec]
diff --git a/framework/derive/Cargo.toml b/framework/derive/Cargo.toml
index 32da6f13f4..e04ed62c74 100644
--- a/framework/derive/Cargo.toml
+++ b/framework/derive/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-derive"
-version = "0.50.5"
+version = "0.50.6"
 edition = "2021"
 
 authors = ["Andrei Marinica <andrei.marinica@multiversx.com>", "MultiversX <contact@multiversx.com>"]
diff --git a/framework/meta/Cargo.toml b/framework/meta/Cargo.toml
index 31b1ec399f..344a70d399 100644
--- a/framework/meta/Cargo.toml
+++ b/framework/meta/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-meta"
-version = "0.50.5"
+version = "0.50.6"
 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.50.5"
+version = "=0.50.6"
 path = "../base"
 features = ["alloc", "num-bigint"]
 
diff --git a/framework/meta/src/version_history.rs b/framework/meta/src/version_history.rs
index 7c4ec06304..8e4a7af1f5 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.50.5);
+pub const LAST_VERSION: FrameworkVersion = framework_version!(0.50.6);
 
 /// Indicates where to stop with the upgrades.
 pub const LAST_UPGRADE_VERSION: FrameworkVersion = LAST_VERSION;
@@ -75,6 +75,7 @@ pub const VERSIONS: &[FrameworkVersion] = framework_versions![
     0.50.3,
     0.50.4,
     0.50.5,
+    0.50.6,
 ];
 
 #[rustfmt::skip]
diff --git a/framework/scenario/Cargo.toml b/framework/scenario/Cargo.toml
index 3f7475b79b..9d2af3ab29 100644
--- a/framework/scenario/Cargo.toml
+++ b/framework/scenario/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-scenario"
-version = "0.50.5"
+version = "0.50.6"
 edition = "2021"
 
 authors = [
@@ -41,12 +41,12 @@ path = "src/main.rs"
 run-go-tests = []
 
 [dependencies.multiversx-sc]
-version = "=0.50.5"
+version = "=0.50.6"
 features = ["alloc", "num-bigint"]
 path = "../base"
 
 [dependencies.multiversx-sc-meta]
-version = "=0.50.5"
+version = "=0.50.6"
 path = "../meta"
 
 [dependencies.multiversx-chain-scenario-format]
diff --git a/framework/snippets/Cargo.toml b/framework/snippets/Cargo.toml
index 0c0d39c190..a815ec0c32 100644
--- a/framework/snippets/Cargo.toml
+++ b/framework/snippets/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-snippets"
-version = "0.50.5"
+version = "0.50.6"
 edition = "2021"
 
 authors = ["MultiversX <contact@multiversx.com>"]
@@ -22,7 +22,7 @@ env_logger = "0.11"
 futures = "0.3"
 
 [dependencies.multiversx-sc-scenario]
-version = "=0.50.5"
+version = "=0.50.6"
 path = "../scenario"
 
 [dependencies.multiversx-sdk]
diff --git a/framework/wasm-adapter/Cargo.toml b/framework/wasm-adapter/Cargo.toml
index 474395bb4b..7f1c189b5a 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.50.5"
+version = "0.50.6"
 edition = "2021"
 
 authors = [
@@ -22,5 +22,5 @@ categories = [
 ]
 
 [dependencies.multiversx-sc]
-version = "=0.50.5"
+version = "=0.50.6"
 path = "../base"
diff --git a/tools/mxpy-snippet-generator/Cargo.toml b/tools/mxpy-snippet-generator/Cargo.toml
index 3c21ed263d..b561878546 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.50.5"
+version = "0.50.6"
 path = "../../framework/base"
 
 [dependencies]
diff --git a/tools/rust-debugger/format-tests/Cargo.toml b/tools/rust-debugger/format-tests/Cargo.toml
index 13d00d9d2a..34fb81fdfd 100644
--- a/tools/rust-debugger/format-tests/Cargo.toml
+++ b/tools/rust-debugger/format-tests/Cargo.toml
@@ -9,11 +9,11 @@ name = "format-tests"
 path = "src/format_tests.rs"
 
 [dependencies.multiversx-sc]
-version = "=0.50.5"
+version = "=0.50.6"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-scenario]
-version = "=0.50.5"
+version = "=0.50.6"
 path = "../../../framework/scenario"
 
 [dependencies.multiversx-chain-vm]

From f7d20c1d04cb1d5f84dfbe004e4f483a3600cf16 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 5 Jul 2024 12:06:08 +0300
Subject: [PATCH 1073/1254] Cargo.lock update

---
 contracts/benchmarks/large-storage/wasm/Cargo.lock |  6 +++---
 .../mappers/linked-list-repeat/wasm/Cargo.lock     |  6 +++---
 .../benchmarks/mappers/map-repeat/wasm/Cargo.lock  |  6 +++---
 .../mappers/queue-repeat/wasm/Cargo.lock           |  6 +++---
 .../benchmarks/mappers/set-repeat/wasm/Cargo.lock  |  6 +++---
 .../mappers/single-value-repeat/wasm/Cargo.lock    |  6 +++---
 .../benchmarks/mappers/vec-repeat/wasm/Cargo.lock  |  6 +++---
 .../benchmarks/send-tx-repeat/wasm/Cargo.lock      |  6 +++---
 .../wasm-str-repeat-mb-builder-basic/Cargo.lock    |  6 +++---
 .../wasm-str-repeat-mb-builder-cached/Cargo.lock   |  6 +++---
 contracts/benchmarks/str-repeat/wasm/Cargo.lock    |  6 +++---
 contracts/core/price-aggregator/wasm/Cargo.lock    | 14 +++++++-------
 contracts/examples/adder/wasm/Cargo.lock           |  6 +++---
 .../bonding-curve-contract/wasm/Cargo.lock         |  8 ++++----
 contracts/examples/check-pause/wasm/Cargo.lock     |  8 ++++----
 .../examples/crowdfunding-esdt/wasm/Cargo.lock     |  6 +++---
 contracts/examples/crypto-bubbles/wasm/Cargo.lock  |  6 +++---
 .../crypto-kitties/kitty-auction/wasm/Cargo.lock   |  6 +++---
 .../kitty-genetic-alg/wasm/Cargo.lock              |  6 +++---
 .../crypto-kitties/kitty-ownership/wasm/Cargo.lock |  6 +++---
 contracts/examples/crypto-zombies/wasm/Cargo.lock  |  6 +++---
 contracts/examples/digital-cash/wasm/Cargo.lock    |  6 +++---
 contracts/examples/empty/wasm/Cargo.lock           |  6 +++---
 .../esdt-transfer-with-fee/wasm/Cargo.lock         |  6 +++---
 contracts/examples/factorial/wasm/Cargo.lock       |  6 +++---
 contracts/examples/fractional-nfts/wasm/Cargo.lock |  8 ++++----
 contracts/examples/lottery-esdt/wasm/Cargo.lock    |  6 +++---
 .../multisig/wasm-multisig-full/Cargo.lock         |  8 ++++----
 .../multisig/wasm-multisig-view/Cargo.lock         |  8 ++++----
 contracts/examples/multisig/wasm/Cargo.lock        |  8 ++++----
 contracts/examples/nft-minter/wasm/Cargo.lock      |  6 +++---
 .../examples/nft-storage-prepay/wasm/Cargo.lock    |  6 +++---
 .../examples/nft-subscription/wasm/Cargo.lock      |  8 ++++----
 .../examples/order-book/factory/wasm/Cargo.lock    |  6 +++---
 contracts/examples/order-book/pair/wasm/Cargo.lock |  6 +++---
 contracts/examples/ping-pong-egld/wasm/Cargo.lock  |  6 +++---
 contracts/examples/proxy-pause/wasm/Cargo.lock     |  6 +++---
 .../examples/rewards-distribution/wasm/Cargo.lock  |  8 ++++----
 contracts/examples/seed-nft-minter/wasm/Cargo.lock |  8 ++++----
 contracts/examples/token-release/wasm/Cargo.lock   |  6 +++---
 .../abi-tester/wasm-abi-tester-ev/Cargo.lock       |  6 +++---
 contracts/feature-tests/abi-tester/wasm/Cargo.lock |  6 +++---
 .../alloc-features/wasm-alloc-mem-fail/Cargo.lock  |  6 +++---
 .../wasm-alloc-mem-leaking/Cargo.lock              |  6 +++---
 .../feature-tests/alloc-features/wasm/Cargo.lock   |  6 +++---
 .../wasm-basic-features-storage-bytes/Cargo.lock   |  8 ++++----
 .../feature-tests/basic-features/wasm/Cargo.lock   |  8 ++++----
 .../big-float-features/wasm/Cargo.lock             |  6 +++---
 .../builtin-func-features/wasm/Cargo.lock          |  6 +++---
 .../first-contract/wasm/Cargo.lock                 |  6 +++---
 .../second-contract/wasm/Cargo.lock                |  6 +++---
 .../child/wasm/Cargo.lock                          |  6 +++---
 .../parent/wasm/Cargo.lock                         |  6 +++---
 .../composability/forwarder-legacy/wasm/Cargo.lock |  6 +++---
 .../wasm-forwarder-queue-promises/Cargo.lock       |  6 +++---
 .../composability/forwarder-queue/wasm/Cargo.lock  |  6 +++---
 .../wasm-forwarder-raw-init-async-call/Cargo.lock  |  6 +++---
 .../wasm-forwarder-raw-init-sync-call/Cargo.lock   |  6 +++---
 .../composability/forwarder-raw/wasm/Cargo.lock    |  6 +++---
 .../composability/forwarder/wasm/Cargo.lock        |  6 +++---
 .../local-esdt-and-nft/wasm/Cargo.lock             |  6 +++---
 .../promises-features/wasm/Cargo.lock              |  6 +++---
 .../composability/proxy-test-first/wasm/Cargo.lock |  6 +++---
 .../proxy-test-second/wasm/Cargo.lock              |  6 +++---
 .../composability/recursive-caller/wasm/Cargo.lock |  6 +++---
 .../transfer-role-features/wasm/Cargo.lock         |  8 ++++----
 .../vault/wasm-vault-promises/Cargo.lock           |  6 +++---
 .../vault/wasm-vault-upgrade/Cargo.lock            |  6 +++---
 .../composability/vault/wasm/Cargo.lock            |  6 +++---
 .../crowdfunding-erc20/wasm/Cargo.lock             |  6 +++---
 .../erc1155-marketplace/wasm/Cargo.lock            |  6 +++---
 .../erc1155-user-mock/wasm/Cargo.lock              |  6 +++---
 .../erc-style-contracts/erc1155/wasm/Cargo.lock    |  6 +++---
 .../erc-style-contracts/erc20/wasm/Cargo.lock      |  6 +++---
 .../erc-style-contracts/erc721/wasm/Cargo.lock     |  6 +++---
 .../lottery-erc20/wasm/Cargo.lock                  |  6 +++---
 .../esdt-system-sc-mock/wasm/Cargo.lock            |  6 +++---
 .../exchange-features/wasm/Cargo.lock              |  6 +++---
 .../formatted-message-features/wasm/Cargo.lock     |  6 +++---
 .../managed-map-features/wasm/Cargo.lock           |  6 +++---
 .../wasm-multi-contract-alt-impl/Cargo.lock        |  6 +++---
 .../wasm-multi-contract-example-feature/Cargo.lock |  6 +++---
 .../wasm-multi-contract-features-view/Cargo.lock   |  6 +++---
 .../multi-contract-features/wasm/Cargo.lock        |  6 +++---
 .../panic-message-features/wasm/Cargo.lock         |  6 +++---
 .../feature-tests/payable-features/wasm/Cargo.lock |  6 +++---
 .../rust-snippets-generator-test/wasm/Cargo.lock   |  6 +++---
 .../rust-testing-framework-tester/wasm/Cargo.lock  |  6 +++---
 .../feature-tests/scenario-tester/wasm/Cargo.lock  |  6 +++---
 .../use-module/wasm-use-module-view/Cargo.lock     |  8 ++++----
 contracts/feature-tests/use-module/wasm/Cargo.lock |  8 ++++----
 91 files changed, 291 insertions(+), 291 deletions(-)

diff --git a/contracts/benchmarks/large-storage/wasm/Cargo.lock b/contracts/benchmarks/large-storage/wasm/Cargo.lock
index 7a67810d1e..9ca0545dae 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.50.5"
+version = "0.50.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.lock
index 6032ec957a..d5cd8bd35b 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.50.5"
+version = "0.50.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.lock
index 23ded79e96..1d10e11eea 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.50.5"
+version = "0.50.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.lock
index e6e3af570f..bb353c06a1 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.50.5"
+version = "0.50.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -78,7 +78,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -89,7 +89,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.lock
index 9edc3ab085..00a390f240 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.50.5"
+version = "0.50.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -78,7 +78,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -89,7 +89,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.lock
index 6a28af4cca..91935bdbc0 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.50.5"
+version = "0.50.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -78,7 +78,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -89,7 +89,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.lock
index 4460a4b144..63279898a4 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.50.5"
+version = "0.50.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -78,7 +78,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -89,7 +89,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/send-tx-repeat/wasm/Cargo.lock b/contracts/benchmarks/send-tx-repeat/wasm/Cargo.lock
index 7b258362e5..39a814932c 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.50.5"
+version = "0.50.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.lock b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.lock
index 4a0f941016..4ea96de7da 100644
--- a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.lock
+++ b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.lock
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.lock b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.lock
index efb95c7fb7..cc8d4eb0e4 100644
--- a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.lock
+++ b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.lock
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/str-repeat/wasm/Cargo.lock b/contracts/benchmarks/str-repeat/wasm/Cargo.lock
index e4c08a1e4d..295f5d348c 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.50.5"
+version = "0.50.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/core/price-aggregator/wasm/Cargo.lock b/contracts/core/price-aggregator/wasm/Cargo.lock
index 001b1b17a4..722433bff8 100644
--- a/contracts/core/price-aggregator/wasm/Cargo.lock
+++ b/contracts/core/price-aggregator/wasm/Cargo.lock
@@ -80,13 +80,13 @@ checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
 
 [[package]]
 name = "log"
-version = "0.4.21"
+version = "0.4.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
+checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
 
 [[package]]
 name = "multiversx-price-aggregator-sc"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "arrayvec",
  "getrandom",
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -136,7 +136,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -147,14 +147,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/adder/wasm/Cargo.lock b/contracts/examples/adder/wasm/Cargo.lock
index f6e7f73c4a..1177aa1bc4 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.50.5"
+version = "0.50.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/bonding-curve-contract/wasm/Cargo.lock b/contracts/examples/bonding-curve-contract/wasm/Cargo.lock
index 3a0c0c7cd2..aad952f5ec 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.50.5"
+version = "0.50.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/check-pause/wasm/Cargo.lock b/contracts/examples/check-pause/wasm/Cargo.lock
index 7a37f5a566..1cc526313d 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.50.5"
+version = "0.50.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crowdfunding-esdt/wasm/Cargo.lock b/contracts/examples/crowdfunding-esdt/wasm/Cargo.lock
index a2332640ef..f133e26dd5 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.50.5"
+version = "0.50.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crypto-bubbles/wasm/Cargo.lock b/contracts/examples/crypto-bubbles/wasm/Cargo.lock
index e4ff2e0726..63e782bc3b 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.50.5"
+version = "0.50.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.lock b/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.lock
index 1089304ac0..daa881396b 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.50.5"
+version = "0.50.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -115,7 +115,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -126,7 +126,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]
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 ff0ef0cd95..8ce60e5e52 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.50.5"
+version = "0.50.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -96,7 +96,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -107,7 +107,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.lock b/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.lock
index 6c9d74482f..cf394b76f1 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.50.5"
+version = "0.50.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -106,7 +106,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -117,7 +117,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crypto-zombies/wasm/Cargo.lock b/contracts/examples/crypto-zombies/wasm/Cargo.lock
index 2acc59e790..c1d6526c25 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.50.5"
+version = "0.50.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/digital-cash/wasm/Cargo.lock b/contracts/examples/digital-cash/wasm/Cargo.lock
index 057c5d1cfa..43103eaada 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.50.5"
+version = "0.50.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/empty/wasm/Cargo.lock b/contracts/examples/empty/wasm/Cargo.lock
index 0a05127c19..3f7b503127 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.50.5"
+version = "0.50.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.lock b/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.lock
index 6b2278b1a7..13027cdb43 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.50.5"
+version = "0.50.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/factorial/wasm/Cargo.lock b/contracts/examples/factorial/wasm/Cargo.lock
index b79c81ed6d..bd758465a3 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.50.5"
+version = "0.50.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/fractional-nfts/wasm/Cargo.lock b/contracts/examples/fractional-nfts/wasm/Cargo.lock
index 2dd77b0f82..5eada6a444 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.50.5"
+version = "0.50.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/lottery-esdt/wasm/Cargo.lock b/contracts/examples/lottery-esdt/wasm/Cargo.lock
index 2b33daa3b2..2d72f8b581 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.50.5"
+version = "0.50.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/multisig/wasm-multisig-full/Cargo.lock b/contracts/examples/multisig/wasm-multisig-full/Cargo.lock
index 3fac67208d..e3dbde1888 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.50.5"
+version = "0.50.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/multisig/wasm-multisig-view/Cargo.lock b/contracts/examples/multisig/wasm-multisig-view/Cargo.lock
index 3d5d98ce90..2e48b673bf 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.50.5"
+version = "0.50.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/multisig/wasm/Cargo.lock b/contracts/examples/multisig/wasm/Cargo.lock
index 792e34c60c..1218b59805 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.50.5"
+version = "0.50.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/nft-minter/wasm/Cargo.lock b/contracts/examples/nft-minter/wasm/Cargo.lock
index 01e57e8821..7024923baa 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.50.5"
+version = "0.50.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/nft-storage-prepay/wasm/Cargo.lock b/contracts/examples/nft-storage-prepay/wasm/Cargo.lock
index 9e6867aa92..8b63cdf9d3 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.50.5"
+version = "0.50.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/nft-subscription/wasm/Cargo.lock b/contracts/examples/nft-subscription/wasm/Cargo.lock
index 0b86829f8a..6a78865157 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.50.5"
+version = "0.50.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,14 +82,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/order-book/factory/wasm/Cargo.lock b/contracts/examples/order-book/factory/wasm/Cargo.lock
index 5f07fef9b1..8988f022d3 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.50.5"
+version = "0.50.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/order-book/pair/wasm/Cargo.lock b/contracts/examples/order-book/pair/wasm/Cargo.lock
index bb5a827b6e..3c2f37d5b0 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.50.5"
+version = "0.50.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/ping-pong-egld/wasm/Cargo.lock b/contracts/examples/ping-pong-egld/wasm/Cargo.lock
index 511344ae0a..16d5e25b56 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.50.5"
+version = "0.50.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/proxy-pause/wasm/Cargo.lock b/contracts/examples/proxy-pause/wasm/Cargo.lock
index 59900d3a3e..1f5edb48d3 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.50.5"
+version = "0.50.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/rewards-distribution/wasm/Cargo.lock b/contracts/examples/rewards-distribution/wasm/Cargo.lock
index 28d437e6d8..b50d00c35a 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.50.5"
+version = "0.50.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,14 +82,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/seed-nft-minter/wasm/Cargo.lock b/contracts/examples/seed-nft-minter/wasm/Cargo.lock
index c5c87e9f40..7a99f7dd8c 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.50.5"
+version = "0.50.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,14 +82,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/token-release/wasm/Cargo.lock b/contracts/examples/token-release/wasm/Cargo.lock
index 7cc1472fc1..7c4c5358b8 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.50.5"
+version = "0.50.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]
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 ae6ad2a2e2..75e716d195 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.50.5"
+version = "0.50.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/abi-tester/wasm/Cargo.lock b/contracts/feature-tests/abi-tester/wasm/Cargo.lock
index e537658a36..6cf3df7044 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.50.5"
+version = "0.50.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock
index f2546d45fa..1ce256d961 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.lock b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.lock
index 61d0643013..593edef94a 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.lock
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.lock
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/alloc-features/wasm/Cargo.lock b/contracts/feature-tests/alloc-features/wasm/Cargo.lock
index eb38f68e2c..c77934e414 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.50.5"
+version = "0.50.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]
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 f05d0b1e78..a0faa3488f 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.50.5"
+version = "0.50.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/basic-features/wasm/Cargo.lock b/contracts/feature-tests/basic-features/wasm/Cargo.lock
index 16abdbfaeb..fa17ce5189 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.50.5"
+version = "0.50.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/big-float-features/wasm/Cargo.lock b/contracts/feature-tests/big-float-features/wasm/Cargo.lock
index 8b6c45a4bc..0f0c0ddd7b 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.50.5"
+version = "0.50.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]
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 412234d22f..bcf327785a 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.50.5"
+version = "0.50.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]
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 22c0c57039..79d22a97f4 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.50.5"
+version = "0.50.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]
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 fa62b4133c..8901457d1e 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.50.5"
+version = "0.50.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]
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 d34ff3e1c2..c1a31c8ed0 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.50.5"
+version = "0.50.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]
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 98575898bf..fba80e73ec 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
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.lock
index bde38d363c..882a83339c 100644
--- a/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.lock
@@ -56,7 +56,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,7 +98,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]
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 2b0d43ba0e..655f6397b7 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
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock
index 9b032feec0..611771a9b3 100644
--- a/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]
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 37bd9e00a6..5acdf03e16 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.50.5"
+version = "0.50.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]
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 873b244299..c1f1d7042a 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.50.5"
+version = "0.50.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.lock
index 0e93dcf09c..f365e2e90b 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.50.5"
+version = "0.50.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock
index 29e387f07b..1e931ea534 100755
--- a/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]
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 dce37bc941..908b4e5abe 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.50.5"
+version = "0.50.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/promises-features/wasm/Cargo.lock b/contracts/feature-tests/composability/promises-features/wasm/Cargo.lock
index 8e8c0154fe..b7d88ab90c 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.50.5"
+version = "0.50.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]
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 24cf03f26e..c60e6bb7d7 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.50.5"
+version = "0.50.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]
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 fed72a083d..d3e1876cea 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.50.5"
+version = "0.50.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.lock b/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.lock
index ceff9a9720..0ecf2d2dd8 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.50.5"
+version = "0.50.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]
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 4404579b7c..898a433e81 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.50.5"
+version = "0.50.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,14 +82,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]
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 03a29bf426..4880f5c281 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.50.5"
+version = "0.50.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]
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 70a9be9256..3955e47aa1 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.50.5"
+version = "0.50.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/vault/wasm/Cargo.lock b/contracts/feature-tests/composability/vault/wasm/Cargo.lock
index f896924ad7..aa84d3ca7a 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.50.5"
+version = "0.50.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]
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 a01dc14994..8665521441 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.50.5"
+version = "0.50.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]
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 566446f2b6..1edb77bb81 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.50.5"
+version = "0.50.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]
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 20325df876..4972c698b2 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.50.5"
+version = "0.50.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]
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 2217fefddd..b91ab2b173 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.50.5"
+version = "0.50.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]
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 c34b662eed..95bf4b7ca5 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.50.5"
+version = "0.50.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]
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 4dce677344..8daf3f3af0 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.50.5"
+version = "0.50.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]
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 66a2849de3..a7e7a4e91c 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.50.5"
+version = "0.50.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]
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 1f31ae0e27..23249eff42 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.50.5"
+version = "0.50.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/exchange-features/wasm/Cargo.lock b/contracts/feature-tests/exchange-features/wasm/Cargo.lock
index 3c03efcd5f..9dcdd5a6ab 100644
--- a/contracts/feature-tests/exchange-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/exchange-features/wasm/Cargo.lock
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/formatted-message-features/wasm/Cargo.lock b/contracts/feature-tests/formatted-message-features/wasm/Cargo.lock
index 6867ed3ae0..945b1342fc 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.50.5"
+version = "0.50.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/managed-map-features/wasm/Cargo.lock b/contracts/feature-tests/managed-map-features/wasm/Cargo.lock
index 3bf6d32c5c..1a68ca3854 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.50.5"
+version = "0.50.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]
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 6ece98b397..0804e13a3b 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.50.5"
+version = "0.50.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]
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 9c46e3d4fb..79c3362970 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.50.5"
+version = "0.50.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]
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 48c36b2dac..cdbe7e46a2 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.50.5"
+version = "0.50.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/multi-contract-features/wasm/Cargo.lock b/contracts/feature-tests/multi-contract-features/wasm/Cargo.lock
index eafea4b50f..ade536b33b 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.50.5"
+version = "0.50.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/panic-message-features/wasm/Cargo.lock b/contracts/feature-tests/panic-message-features/wasm/Cargo.lock
index 59dcf44411..28e51b1602 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.50.5"
+version = "0.50.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/payable-features/wasm/Cargo.lock b/contracts/feature-tests/payable-features/wasm/Cargo.lock
index da6911995a..ce9b839041 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.50.5"
+version = "0.50.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]
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 8fd3cbf4c2..da5769e9ec 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.50.5"
+version = "0.50.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]
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 af79633a19..6905bd95f9 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.50.5"
+version = "0.50.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/scenario-tester/wasm/Cargo.lock b/contracts/feature-tests/scenario-tester/wasm/Cargo.lock
index f65dbf0ca7..7e9f9f3507 100755
--- a/contracts/feature-tests/scenario-tester/wasm/Cargo.lock
+++ b/contracts/feature-tests/scenario-tester/wasm/Cargo.lock
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]
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 cda84b2b55..34beaae97c 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.50.5"
+version = "0.50.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,14 +82,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/use-module/wasm/Cargo.lock b/contracts/feature-tests/use-module/wasm/Cargo.lock
index d74c1deb38..8c41f5ffd5 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.50.5"
+version = "0.50.6"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,14 +82,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.5"
+version = "0.50.6"
 dependencies = [
  "multiversx-sc",
 ]

From 4a5707dce9056e8f17629c1be204af2656cf7924 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 5 Jul 2024 12:52:38 +0300
Subject: [PATCH 1074/1254] Reintroduced diagnostic::on_unimplemented & rustc
 1.78 dependency

---
 framework/base/Cargo.toml                              |  1 +
 .../src/types/interaction/tx_data/tx_code_source.rs    | 10 ++++++++++
 framework/base/src/types/interaction/tx_from.rs        |  5 +++++
 framework/base/src/types/interaction/tx_gas.rs         |  5 +++++
 framework/base/src/types/interaction/tx_payment.rs     |  5 +++++
 .../tx_result_handler_list_item.rs                     |  5 +++++
 framework/base/src/types/interaction/tx_to.rs          |  5 +++++
 7 files changed, 36 insertions(+)

diff --git a/framework/base/Cargo.toml b/framework/base/Cargo.toml
index d8cb7d3306..936efff1be 100644
--- a/framework/base/Cargo.toml
+++ b/framework/base/Cargo.toml
@@ -2,6 +2,7 @@
 name = "multiversx-sc"
 version = "0.50.6"
 edition = "2021"
+rust-version = "1.78"
 
 authors = ["Andrei Marinica <andrei.marinica@multiversx.com>", "MultiversX <contact@multiversx.com>"]
 license = "GPL-3.0-only"
diff --git a/framework/base/src/types/interaction/tx_data/tx_code_source.rs b/framework/base/src/types/interaction/tx_data/tx_code_source.rs
index e7bb0817ea..0d3c180e16 100644
--- a/framework/base/src/types/interaction/tx_data/tx_code_source.rs
+++ b/framework/base/src/types/interaction/tx_data/tx_code_source.rs
@@ -14,6 +14,11 @@ where
 {
 }
 
+#[diagnostic::on_unimplemented(
+    message = "Type `{Self}` cannot be used as code (does not implement `TxCodeValue<{Env}>`)",
+    label = "not a valid smart contract byte code",
+    note = "there are multiple ways to specify SC byte code, but `{Self}` is not one of them"
+)]
 pub trait TxCodeValue<Env>: AnnotatedValue<Env, ManagedBuffer<Env::Api>>
 where
     Env: TxEnv,
@@ -39,6 +44,11 @@ where
 {
 }
 
+#[diagnostic::on_unimplemented(
+    message = "Type `{Self}` cannot be used as code source value (does not implement `TxFromSourceValue<{Env}>`)",
+    label = "not an address from where to copy the code",
+    note = "there are multiple ways to specify a code source address, but `{Self}` is not one of them"
+)]
 pub trait TxFromSourceValue<Env>: AnnotatedValue<Env, ManagedAddress<Env::Api>>
 where
     Env: TxEnv,
diff --git a/framework/base/src/types/interaction/tx_from.rs b/framework/base/src/types/interaction/tx_from.rs
index ff5dd73b88..674796e64f 100644
--- a/framework/base/src/types/interaction/tx_from.rs
+++ b/framework/base/src/types/interaction/tx_from.rs
@@ -13,6 +13,11 @@ where
 /// Marks the non-empty sender of a transaction.
 ///
 /// Enforces the reciipent to be explicitly specified.
+#[diagnostic::on_unimplemented(
+    message = "Type `{Self}` cannot be used as a sender value (does not implement `TxFromSpecified<{Env}>`)",
+    label = "sender needs to be explicit",
+    note = "there are multiple ways to specify the sender value for a transaction, but `{Self}` is not one of them"
+)]
 pub trait TxFromSpecified<Env>:
     TxFrom<Env> + AnnotatedValue<Env, ManagedAddress<Env::Api>>
 where
diff --git a/framework/base/src/types/interaction/tx_gas.rs b/framework/base/src/types/interaction/tx_gas.rs
index 098eafdd2c..2e03cc1470 100644
--- a/framework/base/src/types/interaction/tx_gas.rs
+++ b/framework/base/src/types/interaction/tx_gas.rs
@@ -33,6 +33,11 @@ where
     }
 }
 
+#[diagnostic::on_unimplemented(
+    message = "Type `{Self}` cannot be used as gas value (does not implement `TxGasValue<{Env}>`)",
+    label = "not a valid value for gas",
+    note = "there are multiple ways to specify the gas value for a transaction, but `{Self}` is not one of them"
+)]
 pub trait TxGasValue<Env>: AnnotatedValue<Env, u64>
 where
     Env: TxEnv,
diff --git a/framework/base/src/types/interaction/tx_payment.rs b/framework/base/src/types/interaction/tx_payment.rs
index 5abb38c6ee..c5bcc10637 100644
--- a/framework/base/src/types/interaction/tx_payment.rs
+++ b/framework/base/src/types/interaction/tx_payment.rs
@@ -24,6 +24,11 @@ use crate::{
 use super::{AnnotatedValue, FunctionCall, TxEnv, TxFrom, TxToSpecified};
 
 /// Describes a payment that is part of a transaction.
+#[diagnostic::on_unimplemented(
+    message = "Type `{Self}` cannot be used as payment (does not implement `TxPayment<{Env}>`)",
+    label = "not a valid payment type",
+    note = "there are multiple ways to specify the transaction payment, but `{Self}` is not one of them"
+)]
 pub trait TxPayment<Env>
 where
     Env: TxEnv,
diff --git a/framework/base/src/types/interaction/tx_result_handler_list/tx_result_handler_list_item.rs b/framework/base/src/types/interaction/tx_result_handler_list/tx_result_handler_list_item.rs
index 54e1d0cfa3..9ca98bac65 100644
--- a/framework/base/src/types/interaction/tx_result_handler_list/tx_result_handler_list_item.rs
+++ b/framework/base/src/types/interaction/tx_result_handler_list/tx_result_handler_list_item.rs
@@ -3,6 +3,11 @@ use crate::types::TxEnv;
 /// Result handler list item.
 ///
 /// It acts as a result handler that produces a single result.
+#[diagnostic::on_unimplemented(
+    message = "Type `{Self}` cannot be used as a decoder result handler (does not implement `RHListItem<{Env}>`)",
+    label = "not a valid decoder result handler",
+    note = "there are multiple ways to specify the result handling, but `{Self}` is not one of them"
+)]
 pub trait RHListItem<Env, Original>
 where
     Env: TxEnv,
diff --git a/framework/base/src/types/interaction/tx_to.rs b/framework/base/src/types/interaction/tx_to.rs
index 18530bc1ee..41d5d4ce39 100644
--- a/framework/base/src/types/interaction/tx_to.rs
+++ b/framework/base/src/types/interaction/tx_to.rs
@@ -14,6 +14,11 @@ impl<Env> TxTo<Env> for () where Env: TxEnv {}
 /// Marks the non-empty recipient of a transaction.
 ///
 /// Enforces the recipient to be explicitly specified.
+#[diagnostic::on_unimplemented(
+    message = "Type `{Self}` cannot be used as recipient value (does not implement `TxToSpecified<{Env}>`)",
+    label = "recipient needs to be explicit",
+    note = "there are multiple ways to specify the recipient value for a transaction, but `{Self}` is not one of them"
+)]
 pub trait TxToSpecified<Env>: TxTo<Env> + AnnotatedValue<Env, ManagedAddress<Env::Api>>
 where
     Env: TxEnv,

From cc305f6134d0af17b4e96e6ee5432ad586f7dae5 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 5 Jul 2024 14:09:31 +0300
Subject: [PATCH 1075/1254] dependency update

---
 Cargo.lock                    | 52 +++++++++++++++++++++--------------
 data/codec-derive/Cargo.toml  |  4 +--
 data/codec/Cargo.toml         |  2 +-
 framework/base/Cargo.toml     |  2 +-
 framework/derive/Cargo.toml   |  4 +--
 framework/meta-lib/Cargo.toml |  4 +--
 framework/scenario/Cargo.toml |  2 +-
 sdk/core/Cargo.toml           |  2 +-
 vm/Cargo.toml                 |  4 +--
 9 files changed, 43 insertions(+), 33 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 317e3a21fb..197cbe4d1c 100755
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -299,9 +299,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "block-buffer"
@@ -1546,9 +1546,9 @@ checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800"
 
 [[package]]
 name = "itertools"
-version = "0.12.1"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
+checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186"
 dependencies = [
  "either",
 ]
@@ -1898,7 +1898,7 @@ dependencies = [
 name = "multiversx-chain-vm"
 version = "0.8.4"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "colored",
  "ed25519-dalek",
  "hex",
@@ -1944,7 +1944,7 @@ dependencies = [
 name = "multiversx-sc"
 version = "0.50.6"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "hex-literal",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
@@ -2210,9 +2210,9 @@ dependencies = [
 
 [[package]]
 name = "num-bigint"
-version = "0.4.5"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c165a9ab64cf766f73521c0dd2cfdff64f488b8f0b3e621face3462d3db536d7"
+checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9"
 dependencies = [
  "num-integer",
  "num-traits",
@@ -2273,7 +2273,7 @@ version = "0.10.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "cfg-if",
  "foreign-types",
  "libc",
@@ -2504,9 +2504,9 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.82"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
@@ -2722,7 +2722,7 @@ version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
 ]
 
 [[package]]
@@ -2904,7 +2904,7 @@ version = "0.38.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "errno",
  "libc",
  "linux-raw-sys",
@@ -3020,7 +3020,7 @@ version = "2.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "core-foundation",
  "core-foundation-sys",
  "libc",
@@ -3290,9 +3290,9 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
 
 [[package]]
 name = "syn"
-version = "2.0.61"
+version = "2.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3338,6 +3338,15 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
+[[package]]
+name = "termcolor"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755"
+dependencies = [
+ "winapi-util",
+]
+
 [[package]]
 name = "thiserror"
 version = "1.0.61"
@@ -3782,12 +3791,12 @@ checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
 
 [[package]]
 name = "wasmparser"
-version = "0.208.1"
+version = "0.212.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd921789c9dcc495f589cb37d200155dee65b4a4beeb853323b5e24e0a5f9c58"
+checksum = "8d28bc49ba1e5c5b61ffa7a2eace10820443c4b7d1c0b144109261d14570fdf8"
 dependencies = [
  "ahash",
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "hashbrown",
  "indexmap",
  "semver",
@@ -3796,11 +3805,12 @@ dependencies = [
 
 [[package]]
 name = "wasmprinter"
-version = "0.208.1"
+version = "0.212.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0700bdace4821e6c694617938500ae9999946df464bb13219c16570f8b6f202f"
+checksum = "dfac65326cc561112af88c3028f6dfdb140acff67ede33a8e86be2dc6b8956f7"
 dependencies = [
  "anyhow",
+ "termcolor",
  "wasmparser",
 ]
 
diff --git a/data/codec-derive/Cargo.toml b/data/codec-derive/Cargo.toml
index 574b7dcb2c..83d95c8c7e 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.82"
+proc-macro2 = "=1.0.86"
 quote = "=1.0.36"
-syn = "=2.0.61"
+syn = "=2.0.68"
 hex = "=0.4.3"
diff --git a/data/codec/Cargo.toml b/data/codec/Cargo.toml
index 7255a54012..15992eead2 100644
--- a/data/codec/Cargo.toml
+++ b/data/codec/Cargo.toml
@@ -23,7 +23,7 @@ optional = true
 
 [dependencies]
 arrayvec = { version = "=0.7.4", default-features = false }
-num-bigint = { version = "=0.4.5", optional = true } # can only be used in std contexts
+num-bigint = { version = "0.4", optional = true } # can only be used in std contexts
 unwrap-infallible = "0.1.5"
 
 [dev-dependencies.multiversx-sc-codec-derive]
diff --git a/framework/base/Cargo.toml b/framework/base/Cargo.toml
index 936efff1be..c1e56226cd 100644
--- a/framework/base/Cargo.toml
+++ b/framework/base/Cargo.toml
@@ -25,7 +25,7 @@ esdt-token-payment-legacy-decode = []
 
 [dependencies]
 hex-literal = "=0.4.1"
-bitflags = "=2.5.0"
+bitflags = "=2.6.0"
 num-traits = { version = "=0.2.19", default-features = false }
 unwrap-infallible = "0.1.5"
 
diff --git a/framework/derive/Cargo.toml b/framework/derive/Cargo.toml
index e04ed62c74..3e5cde70ca 100644
--- a/framework/derive/Cargo.toml
+++ b/framework/derive/Cargo.toml
@@ -14,9 +14,9 @@ keywords = ["multiversx", "blockchain", "contract"]
 categories = ["cryptography::cryptocurrencies", "development-tools::procedural-macro-helpers"]
 
 [dependencies]
-proc-macro2 = "=1.0.82"
+proc-macro2 = "=1.0.86"
 quote = "=1.0.36"
-syn = "=2.0.61"
+syn = "=2.0.68"
 hex = "=0.4.3"
 radix_trie = "=0.2.1"
 
diff --git a/framework/meta-lib/Cargo.toml b/framework/meta-lib/Cargo.toml
index 6ca749601d..6f8e49fec3 100644
--- a/framework/meta-lib/Cargo.toml
+++ b/framework/meta-lib/Cargo.toml
@@ -26,8 +26,8 @@ colored = "2.0"
 lazy_static = "1.4.0"
 convert_case = "0.6.0"
 hex = "0.4"
-wasmparser = "0.208"
-wasmprinter = "0.208"
+wasmparser = "0.212"
+wasmprinter = "0.212"
 semver = "1.0.20"
 
 [dependencies.multiversx-sc]
diff --git a/framework/scenario/Cargo.toml b/framework/scenario/Cargo.toml
index da24efe0d2..58bb79a2ac 100644
--- a/framework/scenario/Cargo.toml
+++ b/framework/scenario/Cargo.toml
@@ -27,7 +27,7 @@ sha2 = "0.10.6"
 serde = "1.0"
 serde_json = "1.0"
 pathdiff = "0.2.1"
-itertools = "0.12.0"
+itertools = "0.13.0"
 colored = "2.0"
 unwrap-infallible = "0.1.5"
 
diff --git a/sdk/core/Cargo.toml b/sdk/core/Cargo.toml
index c8bf3c75fb..3e01ff4d98 100644
--- a/sdk/core/Cargo.toml
+++ b/sdk/core/Cargo.toml
@@ -32,6 +32,6 @@ base64 = "0.22"
 pbkdf2 = { version = "0.12.2", default-features = false }
 zeroize = "1.4.2"
 bech32 = "0.9"
-itertools = "0.12.0"
+itertools = "0.13.0"
 pem = "3.0.2"
 log = "0.4.17"
diff --git a/vm/Cargo.toml b/vm/Cargo.toml
index 0158bd09fa..933b29a4f9 100644
--- a/vm/Cargo.toml
+++ b/vm/Cargo.toml
@@ -26,9 +26,9 @@ num-traits = "0.2"
 hex = "0.4"
 sha2 = "0.10.6"
 sha3 = "0.10.6"
-itertools = "0.12.0"
+itertools = "0.13.0"
 hex-literal = "=0.4.1"
-bitflags = "=2.5.0"
+bitflags = "=2.6.0"
 colored = "2.1.0"
 rand = { version= "0.8.5", optional = true }
 rand_seeder = { version= "0.2.2", optional = true }

From f2cb2dcfbbeb557a8ae770be73348fbab565573d Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Fri, 5 Jul 2024 13:11:56 +0200
Subject: [PATCH 1076/1254] ignored test

---
 .../examples/adder/interact/src/basic_interact.rs | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/contracts/examples/adder/interact/src/basic_interact.rs b/contracts/examples/adder/interact/src/basic_interact.rs
index 0cd16f686a..dbac430d2a 100644
--- a/contracts/examples/adder/interact/src/basic_interact.rs
+++ b/contracts/examples/adder/interact/src/basic_interact.rs
@@ -201,12 +201,13 @@ impl AdderInteract {
     }
 }
 
-// #[tokio::test]
-// async fn test() {
-//     let mut basic_interact = AdderInteract::init().await;
+#[tokio::test]
+#[ignore = "run on demand"]
+async fn test() {
+    let mut basic_interact = AdderInteract::init().await;
 
-//     basic_interact.deploy().await;
-//     basic_interact.add(1u32).await;
+    basic_interact.deploy().await;
+    basic_interact.add(1u32).await;
 
-//     basic_interact.upgrade(7u32).await;
-// }
+    basic_interact.upgrade(7u32).await;
+}

From 3e5f2528e1e57673b39e3e4850275428e1c0571e Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Fri, 5 Jul 2024 13:41:20 +0200
Subject: [PATCH 1077/1254] fix after review, small refactor

---
 .../src/parse/attributes/payable_attr.rs      | 14 +++-------
 framework/derive/src/parse/attributes/util.rs | 28 +++++++++++--------
 2 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/framework/derive/src/parse/attributes/payable_attr.rs b/framework/derive/src/parse/attributes/payable_attr.rs
index e22bcb1e4e..73293719d0 100644
--- a/framework/derive/src/parse/attributes/payable_attr.rs
+++ b/framework/derive/src/parse/attributes/payable_attr.rs
@@ -1,3 +1,5 @@
+use crate::parse::attributes::util::{clean_string, is_first_char_numeric};
+
 use super::attr_names::*;
 
 pub struct PayableAttribute {
@@ -31,21 +33,13 @@ fn extract_token_identifier(attr: &syn::Attribute) -> Option<String> {
             let mut iter = list.tokens.into_iter();
             let ticker = match iter.next() {
                 Some(proc_macro2::TokenTree::Literal(literal)) => {
-                    let clean = literal.to_string().trim_matches('\"').trim().to_string();
+                    let clean = clean_string(literal.to_string());
                     assert!(
                         !clean.is_empty(),
                         "ticker can not be empty. attribute needs 1 string argument: Replace with #[payable(\"*\")] or #[payable(\"EGLD\")"
                     );
 
-                    assert!(
-                        !clean
-                            .chars()
-                            .next()
-                            .is_some_and(|s|
-                                s.is_numeric()
-                            ),
-                        "argument can not be a number"
-                    );
+                    assert!(!is_first_char_numeric(&clean), "argument can not be a number");
 
                     if clean
                     .chars()
diff --git a/framework/derive/src/parse/attributes/util.rs b/framework/derive/src/parse/attributes/util.rs
index 6779f33183..4b38ea6cf4 100644
--- a/framework/derive/src/parse/attributes/util.rs
+++ b/framework/derive/src/parse/attributes/util.rs
@@ -37,7 +37,7 @@ pub(super) fn get_attribute_with_one_type_arg(
                         },
                     };
 
-                    let ticker = first_literal.trim_matches('\"').to_string();
+                    let ticker = clean_string(first_literal);
 
                     let _ = match iter.next() {
                         Some(proc_macro2::TokenTree::Punct(punct)) => punct,
@@ -103,23 +103,15 @@ pub(super) fn attr_one_string_arg(attr: &syn::Attribute) -> String {
             let mut iter = list.tokens.into_iter();
             let arg_token_tree = match iter.next() {
                 Some(proc_macro2::TokenTree::Literal(literal)) => {
-                    let clean = literal
-                        .to_string()
-                        .trim_matches('\"')
-                        .trim_matches('"')
-                        .trim()
-                        .to_string();
+                    let clean = clean_string(literal.to_string());
 
                     assert!(
-                        !clean.chars().next().is_some_and(|s| s.is_numeric()),
+                        !is_first_char_numeric(&clean),
                         "argument can not be a number"
                     );
 
                     assert!(
-                        !clean
-                            .chars()
-                            .next()
-                            .is_some_and(|s| s.is_ascii_punctuation()),
+                        !is_first_char_punctuation(&clean),
                         "argument can not start with punctuation"
                     );
 
@@ -214,3 +206,15 @@ pub(super) fn is_attr_with_one_opt_token_tree_arg(
         None
     }
 }
+
+pub fn clean_string(s: String) -> String {
+    s.trim_matches('\"').trim_matches('"').trim().to_string()
+}
+
+pub fn is_first_char_numeric(s: &str) -> bool {
+    s.chars().next().is_some_and(|s| s.is_numeric())
+}
+
+pub fn is_first_char_punctuation(s: &str) -> bool {
+    s.chars().next().is_some_and(|s| s.is_ascii_punctuation())
+}

From 8060910604901de7a56c4f70687e95d3000208f5 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Fri, 5 Jul 2024 14:55:58 +0200
Subject: [PATCH 1078/1254] scenarios for ln and log2

---
 .../scenarios/managed_decimal.scen.json       | 84 +++++++++++++++++++
 .../src/managed_decimal_features.rs           | 26 +++++-
 .../basic-features/wasm/src/lib.rs            |  9 +-
 3 files changed, 116 insertions(+), 3 deletions(-)

diff --git a/contracts/feature-tests/basic-features/scenarios/managed_decimal.scen.json b/contracts/feature-tests/basic-features/scenarios/managed_decimal.scen.json
index e19612ae29..be2678e9f5 100644
--- a/contracts/feature-tests/basic-features/scenarios/managed_decimal.scen.json
+++ b/contracts/feature-tests/basic-features/scenarios/managed_decimal.scen.json
@@ -141,6 +141,90 @@
                 "gas": "*",
                 "refund": "*"
             }
+        },
+        {
+            "step": "scCall",
+            "id": "6",
+            "tx": {
+                "from": "address:an_account",
+                "to": "sc:basic-features",
+                "function": "managed_decimal_ln",
+                "arguments": [],
+                "gasLimit": "1,000,000,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": [
+                    "0x0161cb95d7"
+                ],
+                "status": "",
+                "message": "*",
+                "gas": "*",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "7",
+            "tx": {
+                "from": "address:an_account",
+                "to": "sc:basic-features",
+                "function": "managed_decimal_ln_high_prec",
+                "arguments": [],
+                "gasLimit": "1,000,000,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": [
+                    "0x0161cc16aa"
+                ],
+                "status": "",
+                "message": "*",
+                "gas": "*",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "8",
+            "tx": {
+                "from": "address:an_account",
+                "to": "sc:basic-features",
+                "function": "managed_decimal_log2",
+                "arguments": [],
+                "gasLimit": "1,000,000,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": [
+                    "0x01cf26a72a"
+                ],
+                "status": "",
+                "message": "*",
+                "gas": "*",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "9",
+            "tx": {
+                "from": "address:an_account",
+                "to": "sc:basic-features",
+                "function": "managed_decimal_log2_high_prec",
+                "arguments": [],
+                "gasLimit": "1,000,000,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": [
+                    "0x01cf26abaf"
+                ],
+                "status": "",
+                "message": "*",
+                "gas": "*",
+                "refund": "*"
+            }
         }
     ]
 }
\ No newline at end of file
diff --git a/contracts/feature-tests/basic-features/src/managed_decimal_features.rs b/contracts/feature-tests/basic-features/src/managed_decimal_features.rs
index 6952b9e6e1..39365fd9cc 100644
--- a/contracts/feature-tests/basic-features/src/managed_decimal_features.rs
+++ b/contracts/feature-tests/basic-features/src/managed_decimal_features.rs
@@ -1,4 +1,4 @@
-multiversx_sc::imports!();
+use multiversx_sc::imports::*;
 
 #[multiversx_sc::module]
 pub trait ManagedDecimalFeatures {
@@ -40,4 +40,28 @@ pub trait ManagedDecimalFeatures {
         let dec = ManagedDecimal::from_raw_units(BigUint::from(12345u64), 2usize);
         dec.into_raw_units().clone()
     }
+
+    #[endpoint]
+    fn managed_decimal_ln(&self) -> ManagedDecimalSigned<Self::Api, ConstDecimals<9>> {
+        let dec = ManagedDecimal::from_raw_units(BigUint::from(378298u64), 3usize);
+        dec.ln().unwrap()
+    }
+
+    #[endpoint]
+    fn managed_decimal_ln_high_prec(&self) -> ManagedDecimalSigned<Self::Api, ConstDecimals<9>> {
+        let dec = ManagedDecimal::from_raw_units(BigUint::from(378298000000u64), 9usize);
+        dec.ln().unwrap()
+    }
+
+    #[endpoint]
+    fn managed_decimal_log2(&self) -> ManagedDecimalSigned<Self::Api, ConstDecimals<9>> {
+        let dec = ManagedDecimal::from_raw_units(BigUint::from(218345u64), 3usize);
+        dec.log2().unwrap()
+    }
+
+    #[endpoint]
+    fn managed_decimal_log2_high_prec(&self) -> ManagedDecimalSigned<Self::Api, ConstDecimals<9>> {
+        let dec = ManagedDecimal::from_raw_units(BigUint::from(218345000000u64), 9usize);
+        dec.log2().unwrap()
+    }
 }
diff --git a/contracts/feature-tests/basic-features/wasm/src/lib.rs b/contracts/feature-tests/basic-features/wasm/src/lib.rs
index 2e8b12f92a..7f3dfdb2b3 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:                          395
+// Endpoints:                          405
 // Async Callback:                       1
-// Total number of exported functions: 397
+// Total number of exported functions: 407
 
 #![no_std]
 
@@ -413,11 +413,16 @@ multiversx_sc_wasm_adapter::endpoints! {
         fill_set_mapper => fill_set_mapper
         fill_map_mapper => fill_map_mapper
         fill_unordered_set_mapper => fill_unordered_set_mapper
+        get_value_from_address_with_keys => get_value_from_address_with_keys
         managed_decimal_addition => managed_decimal_addition
         managed_decimal_subtraction => managed_decimal_subtraction
         managed_decimal_eq => managed_decimal_eq
         managed_decimal_trunc => managed_decimal_trunc
         managed_decimal_into_raw_units => managed_decimal_into_raw_units
+        managed_decimal_ln => managed_decimal_ln
+        managed_decimal_ln_high_prec => managed_decimal_ln_high_prec
+        managed_decimal_log2 => managed_decimal_log2
+        managed_decimal_log2_high_prec => managed_decimal_log2_high_prec
     )
 }
 

From d78c7720a96557e5c49c0f53114ff0a786622b55 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Sat, 6 Jul 2024 01:49:42 +0300
Subject: [PATCH 1079/1254] managed decimal logarithm scenario refactor

---
 .../scenarios/managed_decimal.scen.json       |  84 -------------
 .../managed_decimal_logarithm.scen.json       | 110 ++++++++++++++++++
 .../src/managed_decimal_features.rs           |  28 ++---
 .../basic-features/wasm/src/lib.rs            |   6 +-
 4 files changed, 122 insertions(+), 106 deletions(-)
 create mode 100644 contracts/feature-tests/basic-features/scenarios/managed_decimal_logarithm.scen.json

diff --git a/contracts/feature-tests/basic-features/scenarios/managed_decimal.scen.json b/contracts/feature-tests/basic-features/scenarios/managed_decimal.scen.json
index be2678e9f5..e19612ae29 100644
--- a/contracts/feature-tests/basic-features/scenarios/managed_decimal.scen.json
+++ b/contracts/feature-tests/basic-features/scenarios/managed_decimal.scen.json
@@ -141,90 +141,6 @@
                 "gas": "*",
                 "refund": "*"
             }
-        },
-        {
-            "step": "scCall",
-            "id": "6",
-            "tx": {
-                "from": "address:an_account",
-                "to": "sc:basic-features",
-                "function": "managed_decimal_ln",
-                "arguments": [],
-                "gasLimit": "1,000,000,000,000",
-                "gasPrice": "0"
-            },
-            "expect": {
-                "out": [
-                    "0x0161cb95d7"
-                ],
-                "status": "",
-                "message": "*",
-                "gas": "*",
-                "refund": "*"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "7",
-            "tx": {
-                "from": "address:an_account",
-                "to": "sc:basic-features",
-                "function": "managed_decimal_ln_high_prec",
-                "arguments": [],
-                "gasLimit": "1,000,000,000,000",
-                "gasPrice": "0"
-            },
-            "expect": {
-                "out": [
-                    "0x0161cc16aa"
-                ],
-                "status": "",
-                "message": "*",
-                "gas": "*",
-                "refund": "*"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "8",
-            "tx": {
-                "from": "address:an_account",
-                "to": "sc:basic-features",
-                "function": "managed_decimal_log2",
-                "arguments": [],
-                "gasLimit": "1,000,000,000,000",
-                "gasPrice": "0"
-            },
-            "expect": {
-                "out": [
-                    "0x01cf26a72a"
-                ],
-                "status": "",
-                "message": "*",
-                "gas": "*",
-                "refund": "*"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "9",
-            "tx": {
-                "from": "address:an_account",
-                "to": "sc:basic-features",
-                "function": "managed_decimal_log2_high_prec",
-                "arguments": [],
-                "gasLimit": "1,000,000,000,000",
-                "gasPrice": "0"
-            },
-            "expect": {
-                "out": [
-                    "0x01cf26abaf"
-                ],
-                "status": "",
-                "message": "*",
-                "gas": "*",
-                "refund": "*"
-            }
         }
     ]
 }
\ No newline at end of file
diff --git a/contracts/feature-tests/basic-features/scenarios/managed_decimal_logarithm.scen.json b/contracts/feature-tests/basic-features/scenarios/managed_decimal_logarithm.scen.json
new file mode 100644
index 0000000000..da54f8ccec
--- /dev/null
+++ b/contracts/feature-tests/basic-features/scenarios/managed_decimal_logarithm.scen.json
@@ -0,0 +1,110 @@
+{
+    "steps": [
+        {
+            "step": "setState",
+            "accounts": {
+                "sc:basic-features": {
+                    "nonce": "0",
+                    "balance": "0",
+                    "code": "mxsc:../output/basic-features.mxsc.json"
+                },
+                "address:an_account": {
+                    "nonce": "0",
+                    "balance": "0"
+                }
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "managed_decimal_ln(23)",
+            "tx": {
+                "from": "address:an_account",
+                "to": "sc:basic-features",
+                "function": "managed_decimal_ln",
+                "arguments": [
+                    "23,000000000"
+                ],
+                "gasLimit": "9,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": [
+                    "+3,135553845"
+                ],
+                "status": "",
+                "message": "*",
+                "gas": "*",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "managed_decimal_ln(378,298)",
+            "tx": {
+                "from": "address:an_account",
+                "to": "sc:basic-features",
+                "function": "managed_decimal_ln",
+                "arguments": [
+                    "378,298000000"
+                ],
+                "gasLimit": "1,000,000,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": [
+                    "0x0161cc16aa"
+                ],
+                "status": "",
+                "message": "*",
+                "gas": "*",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "managed_decimal_log2(23)",
+            "tx": {
+                "from": "address:an_account",
+                "to": "sc:basic-features",
+                "function": "managed_decimal_log2",
+                "arguments": [
+                    "23,000000000"
+                ],
+                "gasLimit": "1,000,000,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": [
+                    "4,523648008"
+                ],
+                "status": "",
+                "message": "*",
+                "gas": "*",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "managed_decimal_log2(218,345)",
+            "tx": {
+                "from": "address:an_account",
+                "to": "sc:basic-features",
+                "function": "managed_decimal_log2",
+                "arguments": [
+                    "218,345000000"
+                ],
+                "gasLimit": "1,000,000,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": [
+                    "7,770385327"
+                ],
+                "status": "",
+                "message": "*",
+                "gas": "*",
+                "refund": "*"
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/contracts/feature-tests/basic-features/src/managed_decimal_features.rs b/contracts/feature-tests/basic-features/src/managed_decimal_features.rs
index 39365fd9cc..556641cdc9 100644
--- a/contracts/feature-tests/basic-features/src/managed_decimal_features.rs
+++ b/contracts/feature-tests/basic-features/src/managed_decimal_features.rs
@@ -42,26 +42,18 @@ pub trait ManagedDecimalFeatures {
     }
 
     #[endpoint]
-    fn managed_decimal_ln(&self) -> ManagedDecimalSigned<Self::Api, ConstDecimals<9>> {
-        let dec = ManagedDecimal::from_raw_units(BigUint::from(378298u64), 3usize);
-        dec.ln().unwrap()
-    }
-
-    #[endpoint]
-    fn managed_decimal_ln_high_prec(&self) -> ManagedDecimalSigned<Self::Api, ConstDecimals<9>> {
-        let dec = ManagedDecimal::from_raw_units(BigUint::from(378298000000u64), 9usize);
-        dec.ln().unwrap()
-    }
-
-    #[endpoint]
-    fn managed_decimal_log2(&self) -> ManagedDecimalSigned<Self::Api, ConstDecimals<9>> {
-        let dec = ManagedDecimal::from_raw_units(BigUint::from(218345u64), 3usize);
-        dec.log2().unwrap()
+    fn managed_decimal_ln(
+        &self,
+        x: ManagedDecimal<Self::Api, ConstDecimals<9>>,
+    ) -> ManagedDecimalSigned<Self::Api, ConstDecimals<9>> {
+        x.ln().unwrap_or_else(|| sc_panic!("cannot be zero"))
     }
 
     #[endpoint]
-    fn managed_decimal_log2_high_prec(&self) -> ManagedDecimalSigned<Self::Api, ConstDecimals<9>> {
-        let dec = ManagedDecimal::from_raw_units(BigUint::from(218345000000u64), 9usize);
-        dec.log2().unwrap()
+    fn managed_decimal_log2(
+        &self,
+        x: ManagedDecimal<Self::Api, ConstDecimals<9>>,
+    ) -> ManagedDecimalSigned<Self::Api, ConstDecimals<9>> {
+        x.log2().unwrap_or_else(|| sc_panic!("cannot be zero"))
     }
 }
diff --git a/contracts/feature-tests/basic-features/wasm/src/lib.rs b/contracts/feature-tests/basic-features/wasm/src/lib.rs
index 7f3dfdb2b3..887b75bcd5 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:                          405
+// Endpoints:                          403
 // Async Callback:                       1
-// Total number of exported functions: 407
+// Total number of exported functions: 405
 
 #![no_std]
 
@@ -420,9 +420,7 @@ multiversx_sc_wasm_adapter::endpoints! {
         managed_decimal_trunc => managed_decimal_trunc
         managed_decimal_into_raw_units => managed_decimal_into_raw_units
         managed_decimal_ln => managed_decimal_ln
-        managed_decimal_ln_high_prec => managed_decimal_ln_high_prec
         managed_decimal_log2 => managed_decimal_log2
-        managed_decimal_log2_high_prec => managed_decimal_log2_high_prec
     )
 }
 

From d7c01c8127dfef45df4e3d926a60d9b9a02a42da Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Sat, 6 Jul 2024 02:29:30 +0300
Subject: [PATCH 1080/1254] test update

---
 .../tests/basic_features_scenario_go_test.rs           | 10 ++++++++++
 .../tests/basic_features_scenario_rs_test.rs           | 10 ++++++++++
 2 files changed, 20 insertions(+)

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 a6fd3babc4..9c39d06ae5 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
@@ -250,6 +250,16 @@ fn managed_buffer_set_random_go() {
     world().run("scenarios/managed_buffer_set_random.scen.json");
 }
 
+#[test]
+fn managed_decimal_go() {
+    world().run("scenarios/managed_decimal.scen.json");
+}
+
+#[test]
+fn managed_decimal_logarithm_go() {
+    world().run("scenarios/managed_decimal_logarithm.scen.json");
+}
+
 #[test]
 fn managed_vec_address_push_go() {
     world().run("scenarios/managed_vec_address_push.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 836795516b..f35c4779e6 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
@@ -265,6 +265,16 @@ fn managed_buffer_set_random_rs() {
     world().run("scenarios/managed_buffer_set_random.scen.json");
 }
 
+#[test]
+fn managed_decimal_rs() {
+    world().run("scenarios/managed_decimal.scen.json");
+}
+
+#[test]
+fn managed_decimal_logarithm_rs() {
+    world().run("scenarios/managed_decimal_logarithm.scen.json");
+}
+
 #[test]
 fn managed_vec_address_push_rs() {
     world().run("scenarios/managed_vec_address_push.scen.json");

From 76d706b0d90b99787eeafdcb08fde6e65ef453f3 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Sat, 6 Jul 2024 02:47:35 +0300
Subject: [PATCH 1081/1254] unified syntax - sync_call_readonly + NotPayable
 fix

---
 .../composability/forwarder-raw/src/forwarder_raw_sync.rs    | 1 +
 framework/base/src/types/interaction/tx_exec/tx_exec_sync.rs | 5 +++--
 framework/snippets/src/interactor_tx.rs                      | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/contracts/feature-tests/composability/forwarder-raw/src/forwarder_raw_sync.rs b/contracts/feature-tests/composability/forwarder-raw/src/forwarder_raw_sync.rs
index 799ce0cb83..07a095ed9d 100644
--- a/contracts/feature-tests/composability/forwarder-raw/src/forwarder_raw_sync.rs
+++ b/contracts/feature-tests/composability/forwarder-raw/src/forwarder_raw_sync.rs
@@ -101,6 +101,7 @@ pub trait ForwarderRawSync: super::forwarder_raw_common::ForwarderRawCommon {
             .gas(half_gas)
             .raw_call(endpoint_name)
             .arguments_raw(args.to_arg_buffer())
+            .payment(NotPayable) // `()` and `NotPayable` both work
             .returns(ReturnsRawResult)
             .sync_call_readonly();
 
diff --git a/framework/base/src/types/interaction/tx_exec/tx_exec_sync.rs b/framework/base/src/types/interaction/tx_exec/tx_exec_sync.rs
index 4ab9c29759..5059a424aa 100644
--- a/framework/base/src/types/interaction/tx_exec/tx_exec_sync.rs
+++ b/framework/base/src/types/interaction/tx_exec/tx_exec_sync.rs
@@ -6,7 +6,7 @@ use crate::{
     tuple_util::NestedTupleFlatten,
     types::{
         decode_result, BackTransfers, ManagedBuffer, ManagedVec, OriginalResultMarker, RHListExec,
-        Tx, TxDataFunctionCall, TxGas, TxPayment, TxScEnv, TxToSpecified,
+        Tx, TxDataFunctionCall, TxGas, TxNoPayment, TxPayment, TxScEnv, TxToSpecified,
     },
 };
 
@@ -93,10 +93,11 @@ where
     }
 }
 
-impl<Api, To, Gas, FC, RH> Tx<TxScEnv<Api>, (), To, (), Gas, FC, RH>
+impl<Api, To, Payment, Gas, FC, RH> Tx<TxScEnv<Api>, (), To, Payment, Gas, FC, RH>
 where
     Api: CallTypeApi,
     To: TxToSpecified<TxScEnv<Api>>,
+    Payment: TxNoPayment<TxScEnv<Api>>,
     Gas: TxGas<TxScEnv<Api>>,
     FC: TxDataFunctionCall<TxScEnv<Api>>,
     RH: RHListExec<SyncCallRawResult<Api>, TxScEnv<Api>>,
diff --git a/framework/snippets/src/interactor_tx.rs b/framework/snippets/src/interactor_tx.rs
index 43ff7b8652..1075cc533f 100644
--- a/framework/snippets/src/interactor_tx.rs
+++ b/framework/snippets/src/interactor_tx.rs
@@ -5,11 +5,11 @@ mod interactor_exec_deploy;
 mod interactor_exec_env;
 mod interactor_exec_step;
 mod interactor_exec_transf;
+mod interactor_exec_upgrade;
 mod interactor_prepare_async;
 mod interactor_query_call;
 mod interactor_query_env;
 mod interactor_query_step;
-mod interactor_exec_upgrade;
 
 pub use interactor_exec_env::InteractorEnvExec;
 pub use interactor_exec_step::InteractorExecStep;

From d17a1edf094c9697d37f0205452fd298b4619117 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Sat, 6 Jul 2024 03:34:41 +0300
Subject: [PATCH 1082/1254] sc 0.51.0, codec 0.20.0, vm 0.9.0, sdk 0.5.0,
 scenario-format 0.22.3

---
 CHANGELOG.md                                  | 30 ++++++++++++++++
 Cargo.lock                                    | 34 +++++++++----------
 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 +-
 .../Cargo.toml                                |  2 +-
 .../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.lock      | 22 ++++++------
 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     |  8 ++---
 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 +-
 .../wasm-alloc-mem-fail/Cargo.toml            |  2 +-
 .../wasm-alloc-mem-leaking/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-legacy/Cargo.toml |  4 +--
 .../forwarder-legacy/meta/Cargo.toml          |  2 +-
 .../forwarder-legacy/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 +-
 .../exchange-features/Cargo.toml              |  4 +--
 .../exchange-features/meta/Cargo.toml         |  2 +-
 .../exchange-features/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 +-
 .../feature-tests/scenario-tester/Cargo.toml  |  4 +--
 .../scenario-tester/meta/Cargo.toml           |  2 +-
 .../scenario-tester/wasm/Cargo.toml           |  2 +-
 contracts/feature-tests/use-module/Cargo.toml |  8 ++---
 .../feature-tests/use-module/meta/Cargo.toml  |  2 +-
 .../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-lib/Cargo.toml                 |  4 +--
 framework/meta-lib/src/version_history.rs     |  2 +-
 framework/meta/Cargo.toml                     |  8 ++---
 framework/scenario/Cargo.toml                 | 10 +++---
 framework/snippets/Cargo.toml                 |  8 ++---
 framework/wasm-adapter/Cargo.toml             |  4 +--
 sdk/core/Cargo.toml                           |  2 +-
 sdk/scenario-format/Cargo.toml                |  2 +-
 tools/mxpy-snippet-generator/Cargo.toml       |  2 +-
 tools/plotter/Cargo.toml                      |  4 +--
 tools/rust-debugger/format-tests/Cargo.toml   |  6 ++--
 vm/Cargo.toml                                 |  2 +-
 278 files changed, 459 insertions(+), 429 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6b7627eab1..f9784661f8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,6 +26,36 @@ 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.51.0, codec 0.20.0, vm 0.9.0, sdk 0.5.0, scenario-format 0.22.3] - 2024-07-06
+- Major refactoring of `multiversx-sc-meta`
+	- Crate `multiversx-sc-meta` split in 2:
+		1. `multiversx-sc-meta` remains the standalone tool. For backwards compatibility, it can still be used in contract meta crates, but a warning will be issued.
+		2. `multiversx-sc-meta-lib` is the contract-only library to contract meta crates.
+	- The refactoring came with few code changes, but dependencies were disentangled and cleaned up.
+	- Account retrieval tool was merged into `sc-meta` standalone. Previously little known feature, it enables downloading the full state of an account and formatting it as a mandos set state step. Very useful for generating tests and investigating state.
+	- `multiversx-sdk` was also refactored, especially the gateway proxy.
+- A new code report is available in the `.mxsc.json` build output. The report analyzes the wasm code after build and always offers the following information:
+	- `imports`: what VM hooks are used;
+	- `eiCheck`: if the used imports comply with the environment interface (EI, allowed VM hooks);
+	- `hasAllocator`: is it allocates on the heap;
+	- `hasPanic`: whether it produces Rust panics and formats error messages using the standard Rust formatter (a source of code bloat).
+- `ManagedDecimal` and `ManagedDecimalSigned`:
+	- New types that encapulate a managed `BigUint` and `BigInt` respectively, but treat them as base 10 fixed point rational numbers.
+	- Two flavors are allowed: the number of decimals is known at compile time (e.g. EGLD always has 18 decimals), or only at runtime.
+		- Type `ConstDecimals` is able to resolve conversions at compile time, reducing code size and making encoding and decoding easier, since the number of decimals does not need to be encoded.
+		- Regular `usize` number of decimals is resolved at runtime.
+	- All basic arithmetic operations are implemented for these types, just like for the big integers.
+- Implemented logarithms:
+	- Natural logarithm `ln` for `ManagedDecimal`, `BigFloat`, and `BigInt`.
+	- Base 2 logarithm `log2` for `ManagedDecimal`.
+	- Precision is about 5 decimals, largely irrespective of input.
+	- The operation is cheap, `ln` costs 44980 gas for managed decimals and 153772 for big floats, largely irrespective of input.
+- Smart contract code on the front-end:
+	- Framework and contract code, together with the Rust VM as a backend, can now be compiled to WebAssembly for front-end, using `wasm-bindgen`.
+	- A few incompatible Rust VM features needed to be made optional for this to work.
+- Reverted changes in `sc 0.50.6` (`diagnostic::on_unimplemented` & rustc 1.78 dependency).
+- Bugfix: `sync_call_readonly` can now be used with proxies.
+
 
 ## [sc 0.50.6] - 2024-07-05
 - Temporarily removed dependency to rustc 1.78, to ease transition from older versions. Will be re-enabled in 0.51.0.
diff --git a/Cargo.lock b/Cargo.lock
index 197cbe4d1c..f32827e4cd 100755
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1883,7 +1883,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-chain-scenario-format"
-version = "0.22.2"
+version = "0.22.3"
 dependencies = [
  "bech32",
  "hex",
@@ -1896,7 +1896,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-chain-vm"
-version = "0.8.4"
+version = "0.9.0"
 dependencies = [
  "bitflags 2.6.0",
  "colored",
@@ -1921,7 +1921,7 @@ checksum = "b59072fa0624b55ae5ae3fa6bfa91515bbeb4ac440214bc4a509e2c8806d6e9f"
 
 [[package]]
 name = "multiversx-price-aggregator-sc"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "arrayvec",
  "getrandom 0.2.15",
@@ -1942,7 +1942,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "bitflags 2.6.0",
  "hex-literal",
@@ -1954,7 +1954,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -1964,7 +1964,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -1974,7 +1974,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -1985,7 +1985,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-meta"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "clap",
  "colored",
@@ -2008,7 +2008,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-meta-lib"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "clap",
  "colored",
@@ -2027,14 +2027,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-scenario"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "base64",
  "bech32",
@@ -2058,7 +2058,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-snippets"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "base64",
  "env_logger",
@@ -2074,14 +2074,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sdk"
-version = "0.4.1"
+version = "0.5.0"
 dependencies = [
  "anyhow",
  "base64",
@@ -2106,7 +2106,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-wegld-swap-sc"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
  "multiversx-sc-modules",
@@ -3369,9 +3369,9 @@ dependencies = [
 
 [[package]]
 name = "tinyvec"
-version = "1.6.1"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c55115c6fbe2d2bef26eb09ad74bde02d8255476fc0c7b515ef09fbb35742d82"
+checksum = "ce6b6a2fb3a985e99cebfaefa9faa3024743da73304ca1c683a36429613d3d22"
 dependencies = [
  "tinyvec_macros",
 ]
diff --git a/contracts/benchmarks/large-storage/Cargo.toml b/contracts/benchmarks/large-storage/Cargo.toml
index b61355706a..c74fd5fa5a 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.50.6"
+version = "0.51.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../framework/scenario"
diff --git a/contracts/benchmarks/large-storage/meta/Cargo.toml b/contracts/benchmarks/large-storage/meta/Cargo.toml
index 9651a60153..dcaabe6ce8 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-lib]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/benchmarks/large-storage/wasm/Cargo.toml b/contracts/benchmarks/large-storage/wasm/Cargo.toml
index 2411aa17f0..54c4ddba1e 100644
--- a/contracts/benchmarks/large-storage/wasm/Cargo.toml
+++ b/contracts/benchmarks/large-storage/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.6"
+version = "0.51.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 230c99c2de..21a20306ac 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.50.6"
+version = "0.51.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.6"
+version = "0.51.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 1a6dada56e..85e90230e3 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.50.6"
+version = "0.51.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.6"
+version = "0.51.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 87b76ccb54..3d1020c0a0 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-lib]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../../framework/meta-lib"
 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 b2c3609541..442dc2d7a6 100644
--- a/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.6"
+version = "0.51.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 fe2ded4f49..b0265f45f1 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.50.6"
+version = "0.51.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.6"
+version = "0.51.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 58867905b1..59f8760108 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-lib]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.toml b/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.toml
index e50fca0ff4..4fd2dc49d0 100644
--- a/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.6"
+version = "0.51.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 0ca9c8c38a..3083c7973b 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.50.6"
+version = "0.51.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.6"
+version = "0.51.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 5e32d098cc..7bcf5d546b 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-lib]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.toml b/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.toml
index 4402caaa1c..4a7b9b2c99 100644
--- a/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.6"
+version = "0.51.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 67be7c3d17..b4052987e8 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.50.6"
+version = "0.51.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.6"
+version = "0.51.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 b2e29d7cd9..1d6f2ce061 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-lib]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.toml b/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.toml
index 5f733bc413..003bb28d9c 100644
--- a/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.6"
+version = "0.51.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 b3b60d0dc0..16f6322644 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.50.6"
+version = "0.51.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.6"
+version = "0.51.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 e737b8d2ef..7d45e51b64 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-lib]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../../framework/meta-lib"
 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 e98febbc0d..f69fd76aab 100644
--- a/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.6"
+version = "0.51.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 ce692cf64e..0036dfa75a 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.50.6"
+version = "0.51.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.6"
+version = "0.51.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 1a463fddc6..fc95f6f5d4 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-lib]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.toml b/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.toml
index 26e402d30d..802353823b 100644
--- a/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.6"
+version = "0.51.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 173d78f8f1..00f4d09b01 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.50.6"
+version = "0.51.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.6"
+version = "0.51.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 2ca8ba7891..e04dbe95f0 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-lib]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/benchmarks/send-tx-repeat/wasm/Cargo.toml b/contracts/benchmarks/send-tx-repeat/wasm/Cargo.toml
index 250fce0426..5059d3b610 100644
--- a/contracts/benchmarks/send-tx-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/send-tx-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/str-repeat/Cargo.toml b/contracts/benchmarks/str-repeat/Cargo.toml
index ffee493d15..11450e3e82 100644
--- a/contracts/benchmarks/str-repeat/Cargo.toml
+++ b/contracts/benchmarks/str-repeat/Cargo.toml
@@ -12,10 +12,10 @@ path = "src/str_repeat.rs"
 managed-buffer-builder-cached = ["multiversx-sc/managed-buffer-builder-cached"]
 
 [dependencies.multiversx-sc]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../framework/scenario"
diff --git a/contracts/benchmarks/str-repeat/meta/Cargo.toml b/contracts/benchmarks/str-repeat/meta/Cargo.toml
index a8b6653d00..024eda533c 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-lib]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.toml b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.toml
index 102ba73457..a502c7a5a3 100644
--- a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.toml
+++ b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.toml b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.toml
index 102b794e6d..fe23c9c146 100644
--- a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.toml
+++ b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.toml
@@ -29,7 +29,7 @@ path = ".."
 features = ["managed-buffer-builder-cached"]
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/str-repeat/wasm/Cargo.toml b/contracts/benchmarks/str-repeat/wasm/Cargo.toml
index 330c8beb60..858b73b5a0 100644
--- a/contracts/benchmarks/str-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/str-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/core/price-aggregator/Cargo.toml b/contracts/core/price-aggregator/Cargo.toml
index b09f4fa780..1bbda8b47a 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.50.6"
+version = "0.51.0"
 authors = [
     "Claudiu-Marcel Bruda <claudiu.bruda@multiversx.com>",
     "MultiversX <contact@multiversx.com>",
@@ -19,15 +19,15 @@ edition = "2021"
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../framework/scenario"
 
 [dependencies]
diff --git a/contracts/core/price-aggregator/meta/Cargo.toml b/contracts/core/price-aggregator/meta/Cargo.toml
index 68a2a6f68a..36559f956d 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.50.6"
+version = "0.51.0"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-meta-lib]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/core/price-aggregator/wasm/Cargo.toml b/contracts/core/price-aggregator/wasm/Cargo.toml
index 2455ba2a56..ddbe9a31aa 100644
--- a/contracts/core/price-aggregator/wasm/Cargo.toml
+++ b/contracts/core/price-aggregator/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/core/wegld-swap/Cargo.toml b/contracts/core/wegld-swap/Cargo.toml
index f45c68fa12..dcb090dc55 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.50.6"
+version = "0.51.0"
 
 authors = [
     "Dorin Iancu <dorin.iancu@multiversx.com>",
@@ -20,13 +20,13 @@ edition = "2021"
 path = "src/wegld.rs"
 
 [dependencies.multiversx-sc]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../framework/scenario"
diff --git a/contracts/core/wegld-swap/meta/Cargo.toml b/contracts/core/wegld-swap/meta/Cargo.toml
index 7122b534c2..0d630ff8ed 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.50.6"
+version = "0.51.0"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-meta-lib]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/core/wegld-swap/wasm/Cargo.toml b/contracts/core/wegld-swap/wasm/Cargo.toml
index d626884667..31fa617add 100644
--- a/contracts/core/wegld-swap/wasm/Cargo.toml
+++ b/contracts/core/wegld-swap/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/adder/Cargo.toml b/contracts/examples/adder/Cargo.toml
index e7e9a22564..fc453469c2 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.50.6"
+version = "0.51.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/adder/interact/Cargo.toml b/contracts/examples/adder/interact/Cargo.toml
index def9e93066..30e4ca5771 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.50.6"
+version = "0.51.0"
 path = "../../../../framework/snippets"
diff --git a/contracts/examples/adder/meta/Cargo.toml b/contracts/examples/adder/meta/Cargo.toml
index 56f72b66aa..df21028219 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-lib]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/adder/wasm/Cargo.lock b/contracts/examples/adder/wasm/Cargo.lock
index 1177aa1bc4..88019497dd 100755
--- a/contracts/examples/adder/wasm/Cargo.lock
+++ b/contracts/examples/adder/wasm/Cargo.lock
@@ -31,9 +31,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "endian-type"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -122,9 +122,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.82"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.61"
+version = "2.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/adder/wasm/Cargo.toml b/contracts/examples/adder/wasm/Cargo.toml
index 5d2939b513..f9191800d4 100644
--- a/contracts/examples/adder/wasm/Cargo.toml
+++ b/contracts/examples/adder/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.6"
+version = "0.51.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 02a443d780..2367d81601 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.50.6"
+version = "0.51.0"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.6"
+version = "0.51.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 0b063af8b2..31ad6ebacc 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-lib]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/bonding-curve-contract/wasm/Cargo.toml b/contracts/examples/bonding-curve-contract/wasm/Cargo.toml
index ec9b4afa75..745c600b80 100644
--- a/contracts/examples/bonding-curve-contract/wasm/Cargo.toml
+++ b/contracts/examples/bonding-curve-contract/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/check-pause/Cargo.toml b/contracts/examples/check-pause/Cargo.toml
index 3df76f516d..bf42811fe1 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.50.6"
+version = "0.51.0"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../framework/scenario"
 
diff --git a/contracts/examples/check-pause/meta/Cargo.toml b/contracts/examples/check-pause/meta/Cargo.toml
index 149d618113..dff75d7999 100644
--- a/contracts/examples/check-pause/meta/Cargo.toml
+++ b/contracts/examples/check-pause/meta/Cargo.toml
@@ -9,6 +9,6 @@ authors = ["Alin Cruceat <alin.cruceat@multiversx.com>"]
 path = ".."
 
 [dependencies.multiversx-sc-meta-lib]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/check-pause/wasm/Cargo.toml b/contracts/examples/check-pause/wasm/Cargo.toml
index ea78829187..b5785e7cb5 100644
--- a/contracts/examples/check-pause/wasm/Cargo.toml
+++ b/contracts/examples/check-pause/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/crowdfunding-esdt/Cargo.toml b/contracts/examples/crowdfunding-esdt/Cargo.toml
index e954b0b6ee..821a06cd3d 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.50.6"
+version = "0.51.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.6"
+version = "0.51.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 6c76ff12bc..ecf8dbba83 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-lib]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/crowdfunding-esdt/wasm/Cargo.toml b/contracts/examples/crowdfunding-esdt/wasm/Cargo.toml
index 0bc40b59d6..265c88bfdf 100644
--- a/contracts/examples/crowdfunding-esdt/wasm/Cargo.toml
+++ b/contracts/examples/crowdfunding-esdt/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/crypto-bubbles/Cargo.toml b/contracts/examples/crypto-bubbles/Cargo.toml
index 170301e4a4..675874ad90 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.50.6"
+version = "0.51.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/crypto-bubbles/meta/Cargo.toml b/contracts/examples/crypto-bubbles/meta/Cargo.toml
index 2bb1edf020..854958c28b 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-lib]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/crypto-bubbles/wasm/Cargo.toml b/contracts/examples/crypto-bubbles/wasm/Cargo.toml
index adccb93d05..2c8669df64 100644
--- a/contracts/examples/crypto-bubbles/wasm/Cargo.toml
+++ b/contracts/examples/crypto-bubbles/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.6"
+version = "0.51.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 93d5d84c3b..8b2e101e28 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.50.6"
+version = "0.51.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 1f1fc458fc..9dbf99179c 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.50.6"
+version = "0.51.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 b708b3beb4..a91c764a70 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.50.6"
+version = "0.51.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.6"
+version = "0.51.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 44272dc165..7513efeb45 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-lib]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../../framework/meta-lib"
 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 02fe4f63f9..053be99771 100644
--- a/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.toml
+++ b/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.6"
+version = "0.51.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 551ba6423d..10d61a714d 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.50.6"
+version = "0.51.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.6"
+version = "0.51.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 b3e4f872df..4e9a713a35 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-lib]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../../framework/meta-lib"
 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 b2d1a79c4b..3354f9d938 100644
--- a/contracts/examples/crypto-kitties/kitty-genetic-alg/wasm/Cargo.toml
+++ b/contracts/examples/crypto-kitties/kitty-genetic-alg/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.6"
+version = "0.51.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 716b6d90a7..5b0b1a6a35 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.50.6"
+version = "0.51.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.6"
+version = "0.51.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 686e76b0da..8cd3f2d0cb 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-lib]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../../framework/meta-lib"
 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 47b863149a..412e6ba835 100644
--- a/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.toml
+++ b/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/crypto-zombies/Cargo.toml b/contracts/examples/crypto-zombies/Cargo.toml
index 174566ef13..35d8ac9038 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.50.6"
+version = "0.51.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/crypto-zombies/meta/Cargo.toml b/contracts/examples/crypto-zombies/meta/Cargo.toml
index c1a4c8cfec..53807156b9 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-lib]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/crypto-zombies/wasm/Cargo.toml b/contracts/examples/crypto-zombies/wasm/Cargo.toml
index 74b87ed668..789007e3c3 100644
--- a/contracts/examples/crypto-zombies/wasm/Cargo.toml
+++ b/contracts/examples/crypto-zombies/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/digital-cash/Cargo.toml b/contracts/examples/digital-cash/Cargo.toml
index 189feac172..f1ae3d7447 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.50.6"
+version = "0.51.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/digital-cash/meta/Cargo.toml b/contracts/examples/digital-cash/meta/Cargo.toml
index 4fde8a00a2..9287524d7d 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-lib]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/digital-cash/wasm/Cargo.toml b/contracts/examples/digital-cash/wasm/Cargo.toml
index 0139e2d002..a8c53cd517 100644
--- a/contracts/examples/digital-cash/wasm/Cargo.toml
+++ b/contracts/examples/digital-cash/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/empty/Cargo.toml b/contracts/examples/empty/Cargo.toml
index c13a9a55d3..68b53214dd 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.50.6"
+version = "0.51.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../framework/scenario"
 
 [dev-dependencies]
diff --git a/contracts/examples/empty/meta/Cargo.toml b/contracts/examples/empty/meta/Cargo.toml
index c8b4b47011..357dac071d 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-lib]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/empty/wasm/Cargo.toml b/contracts/examples/empty/wasm/Cargo.toml
index 2428b526f7..faf5c39f96 100644
--- a/contracts/examples/empty/wasm/Cargo.toml
+++ b/contracts/examples/empty/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.6"
+version = "0.51.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 1b9d6568ec..f6f7f8f1ac 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.50.6"
+version = "0.51.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.6"
+version = "0.51.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 32f89a822d..49427d53c2 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-lib]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../framework/meta-lib"
 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 be6bef8aa2..163fab699f 100644
--- a/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.toml
+++ b/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/factorial/Cargo.toml b/contracts/examples/factorial/Cargo.toml
index e6c9899d91..a63dbd491f 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.50.6"
+version = "0.51.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/factorial/meta/Cargo.toml b/contracts/examples/factorial/meta/Cargo.toml
index 835124502e..ec8e1b9858 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-lib]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/factorial/wasm/Cargo.toml b/contracts/examples/factorial/wasm/Cargo.toml
index 5d22f02e59..25b516b170 100644
--- a/contracts/examples/factorial/wasm/Cargo.toml
+++ b/contracts/examples/factorial/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/fractional-nfts/Cargo.toml b/contracts/examples/fractional-nfts/Cargo.toml
index 7fb92da072..2fa0160e30 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.50.6"
+version = "0.51.0"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/fractional-nfts/meta/Cargo.toml b/contracts/examples/fractional-nfts/meta/Cargo.toml
index 05f6fe484b..969244317c 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-lib]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/fractional-nfts/wasm/Cargo.toml b/contracts/examples/fractional-nfts/wasm/Cargo.toml
index 46e92f7a96..f10e9ba751 100644
--- a/contracts/examples/fractional-nfts/wasm/Cargo.toml
+++ b/contracts/examples/fractional-nfts/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/lottery-esdt/Cargo.toml b/contracts/examples/lottery-esdt/Cargo.toml
index c4c0f0c384..90925b8041 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.50.6"
+version = "0.51.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/lottery-esdt/meta/Cargo.toml b/contracts/examples/lottery-esdt/meta/Cargo.toml
index 875324aa17..eee91e577d 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-lib]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/lottery-esdt/wasm/Cargo.toml b/contracts/examples/lottery-esdt/wasm/Cargo.toml
index fdfe935446..63f2445f12 100644
--- a/contracts/examples/lottery-esdt/wasm/Cargo.toml
+++ b/contracts/examples/lottery-esdt/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/multisig/Cargo.toml b/contracts/examples/multisig/Cargo.toml
index e4eb35a4cc..7cde30f366 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.50.6"
+version = "0.51.0"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../framework/scenario"
 
 [dev-dependencies.adder]
@@ -27,7 +27,7 @@ path = "../adder"
 path = "../factorial"
 
 [dev-dependencies.multiversx-wegld-swap-sc]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../core/wegld-swap"
 
 [dev-dependencies]
diff --git a/contracts/examples/multisig/interact/Cargo.toml b/contracts/examples/multisig/interact/Cargo.toml
index b7a6b387a4..862f59a38e 100644
--- a/contracts/examples/multisig/interact/Cargo.toml
+++ b/contracts/examples/multisig/interact/Cargo.toml
@@ -18,17 +18,17 @@ toml = "0.8.6"
 path = ".."
 
 [dependencies.multiversx-sc-modules]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../contracts/modules"
 
 [dependencies.multiversx-sc-snippets]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../framework/snippets"
 
 [dependencies.multiversx-sc-scenario]
-version = "=0.50.6"
+version = "=0.51.0"
 path = "../../../../framework/scenario"
 
 [dependencies.multiversx-sc]
-version = "=0.50.6"
+version = "=0.51.0"
 path = "../../../../framework/base"
diff --git a/contracts/examples/multisig/meta/Cargo.toml b/contracts/examples/multisig/meta/Cargo.toml
index 0010c005fb..df98ad305f 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-lib]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/multisig/wasm-multisig-full/Cargo.toml b/contracts/examples/multisig/wasm-multisig-full/Cargo.toml
index 66f19593ac..8d079a5805 100644
--- a/contracts/examples/multisig/wasm-multisig-full/Cargo.toml
+++ b/contracts/examples/multisig/wasm-multisig-full/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.6"
+version = "0.51.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 918240759c..1251ddfaee 100644
--- a/contracts/examples/multisig/wasm-multisig-view/Cargo.toml
+++ b/contracts/examples/multisig/wasm-multisig-view/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/multisig/wasm/Cargo.toml b/contracts/examples/multisig/wasm/Cargo.toml
index 20765ecc0f..6b26d8ebd2 100644
--- a/contracts/examples/multisig/wasm/Cargo.toml
+++ b/contracts/examples/multisig/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/nft-minter/Cargo.toml b/contracts/examples/nft-minter/Cargo.toml
index aab52700a3..45ba3468fa 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.50.6"
+version = "0.51.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/nft-minter/meta/Cargo.toml b/contracts/examples/nft-minter/meta/Cargo.toml
index e8f8c6eace..84fb058fd5 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-lib]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/nft-minter/wasm/Cargo.toml b/contracts/examples/nft-minter/wasm/Cargo.toml
index 918eb3183c..f2b1430495 100644
--- a/contracts/examples/nft-minter/wasm/Cargo.toml
+++ b/contracts/examples/nft-minter/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.6"
+version = "0.51.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 2989326ad3..d1b10a28fb 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.50.6"
+version = "0.51.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.6"
+version = "0.51.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 e07670409a..d7111058c2 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-lib]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/nft-storage-prepay/wasm/Cargo.toml b/contracts/examples/nft-storage-prepay/wasm/Cargo.toml
index 775e5fa571..74be8e7dad 100644
--- a/contracts/examples/nft-storage-prepay/wasm/Cargo.toml
+++ b/contracts/examples/nft-storage-prepay/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/nft-subscription/Cargo.toml b/contracts/examples/nft-subscription/Cargo.toml
index 774063b3d8..9f02249382 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.50.6"
+version = "0.51.0"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/nft-subscription/meta/Cargo.toml b/contracts/examples/nft-subscription/meta/Cargo.toml
index 5d9b9e62bc..3d7b33ef67 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-lib]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/nft-subscription/wasm/Cargo.toml b/contracts/examples/nft-subscription/wasm/Cargo.toml
index dd07eb12a8..82afc30d12 100644
--- a/contracts/examples/nft-subscription/wasm/Cargo.toml
+++ b/contracts/examples/nft-subscription/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.6"
+version = "0.51.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 d0a0f5c42b..a13f3f3f34 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.50.6"
+version = "0.51.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.6"
+version = "0.51.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 4dd5aec904..22986df76c 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-lib]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/order-book/factory/wasm/Cargo.toml b/contracts/examples/order-book/factory/wasm/Cargo.toml
index ea3726fb82..47b1d4a548 100644
--- a/contracts/examples/order-book/factory/wasm/Cargo.toml
+++ b/contracts/examples/order-book/factory/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.6"
+version = "0.51.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 9345ef7eef..aef6925e36 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.50.6"
+version = "0.51.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.6"
+version = "0.51.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 feb1d6e85c..0d5667ef4f 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-lib]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/order-book/pair/wasm/Cargo.toml b/contracts/examples/order-book/pair/wasm/Cargo.toml
index 08a0b3e6e9..3a80f47c2b 100644
--- a/contracts/examples/order-book/pair/wasm/Cargo.toml
+++ b/contracts/examples/order-book/pair/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.6"
+version = "0.51.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 b9db322eaa..d08f9aa0f2 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.50.6"
+version = "0.51.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.6"
+version = "0.51.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 1fac2255a9..06c394e2a3 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-lib]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/ping-pong-egld/wasm/Cargo.toml b/contracts/examples/ping-pong-egld/wasm/Cargo.toml
index 2a2bf1d852..0b5a5b95e6 100644
--- a/contracts/examples/ping-pong-egld/wasm/Cargo.toml
+++ b/contracts/examples/ping-pong-egld/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/proxy-pause/Cargo.toml b/contracts/examples/proxy-pause/Cargo.toml
index 0dd395e1ba..c0d794b738 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.50.6"
+version = "0.51.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.6"
+version = "0.51.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 79964ce3d0..b2263e01ef 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-lib]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/proxy-pause/wasm/Cargo.toml b/contracts/examples/proxy-pause/wasm/Cargo.toml
index 5a660c1354..18be8e8f26 100644
--- a/contracts/examples/proxy-pause/wasm/Cargo.toml
+++ b/contracts/examples/proxy-pause/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/rewards-distribution/Cargo.toml b/contracts/examples/rewards-distribution/Cargo.toml
index ee751a1ce0..8baf387fdb 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.50.6"
+version = "0.51.0"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/rewards-distribution/meta/Cargo.toml b/contracts/examples/rewards-distribution/meta/Cargo.toml
index 5cfffb47d8..be7f278c25 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 <claudiu.bruda@multiversx.com>"]
 path = ".."
 
 [dependencies.multiversx-sc-meta-lib]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/rewards-distribution/wasm/Cargo.toml b/contracts/examples/rewards-distribution/wasm/Cargo.toml
index 2bd9f68a79..13f3cd87ce 100644
--- a/contracts/examples/rewards-distribution/wasm/Cargo.toml
+++ b/contracts/examples/rewards-distribution/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.6"
+version = "0.51.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 d7b2b6244d..0b8941ae05 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.50.6"
+version = "0.51.0"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.6"
+version = "0.51.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 ba45a21210..39f59bb1de 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 <claudiu.bruda@multiversx.com>"]
 path = ".."
 
 [dependencies.multiversx-sc-meta-lib]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/seed-nft-minter/wasm/Cargo.toml b/contracts/examples/seed-nft-minter/wasm/Cargo.toml
index c9dab345aa..71850c58f6 100644
--- a/contracts/examples/seed-nft-minter/wasm/Cargo.toml
+++ b/contracts/examples/seed-nft-minter/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/token-release/Cargo.toml b/contracts/examples/token-release/Cargo.toml
index 4832426d4c..375fc928f9 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.50.6"
+version = "0.51.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../framework/scenario"
 
diff --git a/contracts/examples/token-release/meta/Cargo.toml b/contracts/examples/token-release/meta/Cargo.toml
index e6769ec06f..22060731af 100644
--- a/contracts/examples/token-release/meta/Cargo.toml
+++ b/contracts/examples/token-release/meta/Cargo.toml
@@ -10,6 +10,6 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta-lib]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/token-release/wasm/Cargo.toml b/contracts/examples/token-release/wasm/Cargo.toml
index d5721237bc..2299f810dd 100644
--- a/contracts/examples/token-release/wasm/Cargo.toml
+++ b/contracts/examples/token-release/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.6"
+version = "0.51.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 4709010b27..54f047a779 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.50.6"
+version = "0.51.0"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../framework/scenario"
 
 [dev-dependencies.multiversx-sc-meta-lib]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../framework/meta-lib"
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 f158347a5a..9671cfc18c 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.50.6"
+            "version": "0.51.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 753247791c..4a7a440c12 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.50.6"
+            "version": "0.51.0"
         }
     },
     "docs": [
diff --git a/contracts/feature-tests/abi-tester/meta/Cargo.toml b/contracts/feature-tests/abi-tester/meta/Cargo.toml
index 833182f474..49682d7d34 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-lib]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../framework/meta-lib"
 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 ba4c9b488f..81f0522f07 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.6"
+version = "0.51.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 ca10008106..74893a5efb 100644
--- a/contracts/feature-tests/abi-tester/wasm/Cargo.toml
+++ b/contracts/feature-tests/abi-tester/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.6"
+version = "0.51.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 e36480c31b..384fc5867b 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.50.6"
+version = "0.51.0"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.6"
+version = "0.51.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 2dca1ffd71..f63dd88442 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-lib]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml
index d8ff7762df..64a4a24340 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml
index 8dfe19f885..f0309588b9 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/alloc-features/wasm/Cargo.toml b/contracts/feature-tests/alloc-features/wasm/Cargo.toml
index a30f707bdb..d3d69828e8 100644
--- a/contracts/feature-tests/alloc-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/alloc-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.6"
+version = "0.51.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 44d46d2064..834530f60d 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.50.6"
+version = "0.51.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../framework/scenario"
 
 [dependencies.multiversx-sc-modules]
-version = "0.50.6"
+version = "0.51.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 5290f2b709..a688cdcc1d 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.50.6"
+version = "0.51.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 b2fb371be1..1a899c03e0 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-lib]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../framework/meta-lib"
 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 753669477d..3a1b65988d 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.6"
+version = "0.51.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 9719ed0f04..8f64c7cb27 100644
--- a/contracts/feature-tests/basic-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/basic-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.6"
+version = "0.51.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 bacc579184..f78e707d58 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.50.6"
+version = "0.51.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.6"
+version = "0.51.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 4b8bac3e0a..cca1a50cb5 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-lib]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../framework/meta-lib"
 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 fbecceb248..99e49c3687 100644
--- a/contracts/feature-tests/big-float-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/big-float-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/Cargo.toml b/contracts/feature-tests/composability/Cargo.toml
index 3882a8429d..b69be0c099 100644
--- a/contracts/feature-tests/composability/Cargo.toml
+++ b/contracts/feature-tests/composability/Cargo.toml
@@ -36,9 +36,9 @@ path = "recursive-caller"
 path = "vault"
 
 [dependencies.multiversx-sc]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.6"
+version = "0.51.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 e62a666bd4..4f524bf026 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.50.6"
+version = "0.51.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.6"
+version = "0.51.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 27843755a9..77c05981f6 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-lib]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../../framework/meta-lib"
 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 bd20a6a4f1..678b4d3c5a 100644
--- a/contracts/feature-tests/composability/builtin-func-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/builtin-func-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.6"
+version = "0.51.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 0aabff9001..6954198863 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.50.6"
+version = "0.51.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.6"
+version = "0.51.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 a0b322f7e8..f66cd8d319 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
@@ -9,10 +9,10 @@ publish = false
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.6"
+version = "0.51.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 988a749e52..4b97108a0a 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.50.6"
+version = "0.51.0"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta-lib]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../../../framework/meta-lib"
 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 31ebb1341a..a17b274991 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.6"
+version = "0.51.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 87a04cbeb6..32642881cc 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.50.6"
+version = "0.51.0"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.6"
+version = "0.51.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 41fd3c6ade..303908cd50 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.50.6"
+version = "0.51.0"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta-lib]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../../../framework/meta-lib"
 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 aa7c96606d..2037212cf7 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.6"
+version = "0.51.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 21ceb2b63f..122ea204c9 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.50.6"
+version = "0.51.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.6"
+version = "0.51.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 eb5deee9e0..97b8cbeacb 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.50.6"
+version = "0.51.0"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.6"
+version = "0.51.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 d6c0b67de0..95f01a7593 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.50.6"
+version = "0.51.0"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta-lib]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../../../framework/meta-lib"
 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 ee1416370c..069a296ced 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.6"
+version = "0.51.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 1dadad3776..0d3666cf62 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
@@ -9,10 +9,10 @@ publish = false
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.6"
+version = "0.51.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 0dfe695c84..240a0100a6 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.50.6"
+version = "0.51.0"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta-lib]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../../../framework/meta-lib"
 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 496c7e8ef7..a040179ae2 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/forwarder-legacy/Cargo.toml b/contracts/feature-tests/composability/forwarder-legacy/Cargo.toml
index d9e4eca6fc..bee140793b 100644
--- a/contracts/feature-tests/composability/forwarder-legacy/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-legacy/Cargo.toml
@@ -12,10 +12,10 @@ path = "src/forwarder_legacy_main.rs"
 path = "../vault"
 
 [dependencies.multiversx-sc]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../framework/scenario"
 
diff --git a/contracts/feature-tests/composability/forwarder-legacy/meta/Cargo.toml b/contracts/feature-tests/composability/forwarder-legacy/meta/Cargo.toml
index 5fde6d6b62..68523610e8 100644
--- a/contracts/feature-tests/composability/forwarder-legacy/meta/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-legacy/meta/Cargo.toml
@@ -8,6 +8,6 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta-lib]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.toml b/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.toml
index d7a959ebd9..4658ed0647 100644
--- a/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.6"
+version = "0.51.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 b57a669afa..497b7084c1 100644
--- a/contracts/feature-tests/composability/forwarder-queue/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-queue/Cargo.toml
@@ -9,14 +9,14 @@ publish = false
 path = "src/forwarder_queue.rs"
 
 [dependencies.multiversx-sc]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../framework/wasm-adapter"
 optional = true
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.6"
+version = "0.51.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 3f2e855d74..e02905599b 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-lib]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../../framework/meta-lib"
 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 9723c204f4..74e1f3ed96 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.6"
+version = "0.51.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 43bbb13fe8..8b7df4dbb5 100644
--- a/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.6"
+version = "0.51.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 c74fa65243..5c43737f92 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.50.6"
+version = "0.51.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.6"
+version = "0.51.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 610460f934..069d62803f 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-lib]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../../framework/meta-lib"
 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 500bb35d64..a081c46545 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.6"
+version = "0.51.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 908d1518c9..86ca073c84 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.6"
+version = "0.51.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 10d61f7ae7..a1e4d5806c 100644
--- a/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.6"
+version = "0.51.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 fda35825d7..6a8dee46d8 100644
--- a/contracts/feature-tests/composability/forwarder/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder/Cargo.toml
@@ -9,10 +9,10 @@ publish = false
 path = "src/forwarder_main.rs"
 
 [dependencies.multiversx-sc]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.6"
+version = "0.51.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 c6d69561a0..8e0d675590 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-lib]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/feature-tests/composability/forwarder/wasm/Cargo.toml b/contracts/feature-tests/composability/forwarder/wasm/Cargo.toml
index f4efab0a86..cc147ac28b 100644
--- a/contracts/feature-tests/composability/forwarder/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.6"
+version = "0.51.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 defbf0952f..85b4839b23 100644
--- a/contracts/feature-tests/composability/interact/Cargo.toml
+++ b/contracts/feature-tests/composability/interact/Cargo.toml
@@ -15,9 +15,9 @@ serde = { version = "1.0", features = ["derive"] }
 toml = "0.8.6"
 
 [dependencies.multiversx-sc]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-snippets]
-version = "0.50.6"
+version = "0.51.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 5473aa5ee2..3950858466 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.50.6"
+version = "0.51.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.6"
+version = "0.51.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 ed4c56a289..7e6a707589 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-lib]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../../framework/meta-lib"
 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 0f9058dc80..99d415e06d 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.6"
+version = "0.51.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 e1c4986253..2d14571e5d 100644
--- a/contracts/feature-tests/composability/promises-features/Cargo.toml
+++ b/contracts/feature-tests/composability/promises-features/Cargo.toml
@@ -9,6 +9,6 @@ publish = false
 path = "src/promises_main.rs"
 
 [dependencies.multiversx-sc]
-version = "0.50.6"
+version = "0.51.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 87127331bb..aaeda772e8 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-lib]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../../framework/meta-lib"
 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 c4589e19ab..b248087c61 100644
--- a/contracts/feature-tests/composability/promises-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/promises-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.6"
+version = "0.51.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 6fbc500384..37c4acd4fc 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.50.6"
+version = "0.51.0"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.6"
+version = "0.51.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 0f33f56e86..dbd5af8e24 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-lib]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../../framework/meta-lib"
 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 5e17aba862..1d77b9f173 100644
--- a/contracts/feature-tests/composability/proxy-test-first/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/proxy-test-first/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.6"
+version = "0.51.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 537af734c1..cfa90ae398 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.50.6"
+version = "0.51.0"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.6"
+version = "0.51.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 39f24fdff8..b75e2c7da7 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-lib]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../../framework/meta-lib"
 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 3122966e86..a5eb59d241 100644
--- a/contracts/feature-tests/composability/proxy-test-second/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/proxy-test-second/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.6"
+version = "0.51.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 8e93742f1b..46aa5fc403 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.50.6"
+version = "0.51.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.6"
+version = "0.51.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 b075a3eaf4..64b33e65c8 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-lib]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../../framework/meta-lib"
 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 1ba21060c2..1164620014 100644
--- a/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.6"
+version = "0.51.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 54997cd753..56acfdb34f 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.50.6"
+version = "0.51.0"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.6"
+version = "0.51.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 6fac7aa8b0..2d7408d75b 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-lib]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../../framework/meta-lib"
 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 3b898dfb79..6a3cacb33b 100644
--- a/contracts/feature-tests/composability/transfer-role-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/transfer-role-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.6"
+version = "0.51.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 e043732ff7..175de64ca6 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.50.6"
+version = "0.51.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.6"
+version = "0.51.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 a00cd18281..9e3dcca798 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-lib]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../../framework/meta-lib"
 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 f43fac98c9..42d8a8b025 100644
--- a/contracts/feature-tests/composability/vault/wasm-vault-promises/Cargo.toml
+++ b/contracts/feature-tests/composability/vault/wasm-vault-promises/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.6"
+version = "0.51.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 3bc79611c1..37e333b0f8 100644
--- a/contracts/feature-tests/composability/vault/wasm-vault-upgrade/Cargo.toml
+++ b/contracts/feature-tests/composability/vault/wasm-vault-upgrade/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.6"
+version = "0.51.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 3dd16446e5..9705891e30 100644
--- a/contracts/feature-tests/composability/vault/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/vault/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.6"
+version = "0.51.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 6e307c9718..9a6e0bb54d 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.50.6"
+version = "0.51.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.6"
+version = "0.51.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 9cf6d6d3af..0965083960 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-lib]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../../framework/meta-lib"
 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 b262b82dae..9c21976d16 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.6"
+version = "0.51.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 7589eb2fb7..7c3317c71d 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.50.6"
+version = "0.51.0"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.6"
+version = "0.51.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 c78a2eca8b..6f0e5df7de 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-lib]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../../framework/meta-lib"
 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 f294490326..d8c6141dc0 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.6"
+version = "0.51.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 a0d126dfa2..463fad6bdb 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.50.6"
+version = "0.51.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.6"
+version = "0.51.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 b8e7864b23..d1726f8b19 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-lib]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../../framework/meta-lib"
 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 77ec82cfd5..a99d518dd2 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.6"
+version = "0.51.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 36d20825b9..ad4ddd64f8 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.50.6"
+version = "0.51.0"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.6"
+version = "0.51.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 7774eef59f..23b6cb4769 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-lib]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../../framework/meta-lib"
 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 7d971dddf8..0273ef819d 100644
--- a/contracts/feature-tests/erc-style-contracts/erc1155/wasm/Cargo.toml
+++ b/contracts/feature-tests/erc-style-contracts/erc1155/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.6"
+version = "0.51.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 10ce57d7ab..854c36d9b6 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.50.6"
+version = "0.51.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.6"
+version = "0.51.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 dc0f587b6f..2e59227df8 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-lib]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../../framework/meta-lib"
 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 993ab87496..2e4406cce5 100644
--- a/contracts/feature-tests/erc-style-contracts/erc20/wasm/Cargo.toml
+++ b/contracts/feature-tests/erc-style-contracts/erc20/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.6"
+version = "0.51.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 a3ec2527b8..e96c4ae32d 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.50.6"
+version = "0.51.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.6"
+version = "0.51.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 d972742398..532bf886fe 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-lib]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../../framework/meta-lib"
 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 cc5a48fbde..71e3b63007 100644
--- a/contracts/feature-tests/erc-style-contracts/erc721/wasm/Cargo.toml
+++ b/contracts/feature-tests/erc-style-contracts/erc721/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.6"
+version = "0.51.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 da3e44e1b0..6df41657df 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.50.6"
+version = "0.51.0"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.6"
+version = "0.51.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 c097b8e0b7..4088857e54 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-lib]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../../framework/meta-lib"
 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 ead344d5b4..0ee84f3e03 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.6"
+version = "0.51.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 c5283e8edb..597c0e7690 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.50.6"
+version = "0.51.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.6"
+version = "0.51.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 418cff3925..ea578daf93 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-lib]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../framework/meta-lib"
 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 2c878298cf..c6854d533f 100644
--- a/contracts/feature-tests/esdt-system-sc-mock/wasm/Cargo.toml
+++ b/contracts/feature-tests/esdt-system-sc-mock/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/exchange-features/Cargo.toml b/contracts/feature-tests/exchange-features/Cargo.toml
index 743fcf7f03..f4ccbbd9b2 100644
--- a/contracts/feature-tests/exchange-features/Cargo.toml
+++ b/contracts/feature-tests/exchange-features/Cargo.toml
@@ -9,9 +9,9 @@ publish = false
 path = "src/exchange_features.rs"
 
 [dependencies.multiversx-sc]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../framework/scenario"
diff --git a/contracts/feature-tests/exchange-features/meta/Cargo.toml b/contracts/feature-tests/exchange-features/meta/Cargo.toml
index 65cac3b204..b3bd5f180f 100644
--- a/contracts/feature-tests/exchange-features/meta/Cargo.toml
+++ b/contracts/feature-tests/exchange-features/meta/Cargo.toml
@@ -8,6 +8,6 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta-lib]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/feature-tests/exchange-features/wasm/Cargo.toml b/contracts/feature-tests/exchange-features/wasm/Cargo.toml
index ae5b8f41a9..b59aeec8a7 100644
--- a/contracts/feature-tests/exchange-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/exchange-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.6"
+version = "0.51.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 56bed07a83..d1494e4b43 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.50.6"
+version = "0.51.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.6"
+version = "0.51.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 d61d003846..13b941701d 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-lib]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../framework/meta-lib"
 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 49fd41b021..1c3d09ec68 100644
--- a/contracts/feature-tests/formatted-message-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/formatted-message-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.6"
+version = "0.51.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 1d7fa26b33..88a386f0bc 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.50.6"
+version = "0.51.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.6"
+version = "0.51.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 319534a20c..9fee7a2786 100644
--- a/contracts/feature-tests/managed-map-features/meta/Cargo.toml
+++ b/contracts/feature-tests/managed-map-features/meta/Cargo.toml
@@ -9,6 +9,6 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta-lib]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../framework/meta-lib"
 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 4262504d98..a4d93cb396 100644
--- a/contracts/feature-tests/managed-map-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/managed-map-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.6"
+version = "0.51.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 a16a03cffc..0386e89334 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.50.6"
+version = "0.51.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.6"
+version = "0.51.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 6140830e06..95f1937518 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-lib]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../framework/meta-lib"
 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 909bb16df8..dba0a0db3e 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.6"
+version = "0.51.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 5d30c9acc7..7f368e2af6 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
@@ -29,7 +29,7 @@ path = ".."
 features = ["example_feature"]
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.6"
+version = "0.51.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 8c518bf416..05518af856 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.6"
+version = "0.51.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 e6a906567e..0185609641 100644
--- a/contracts/feature-tests/multi-contract-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/multi-contract-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.6"
+version = "0.51.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 c2de83e44b..272c2b10b0 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.50.6"
+version = "0.51.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.6"
+version = "0.51.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 0945c50c26..e14a355466 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-lib]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../framework/meta-lib"
 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 3955b00e76..73edd1e1d8 100644
--- a/contracts/feature-tests/panic-message-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/panic-message-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.6"
+version = "0.51.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 8e837a4ed0..98c70f2e5c 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.50.6"
+version = "0.51.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.6"
+version = "0.51.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 d1f578cda1..4d14213fe9 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-lib]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/feature-tests/payable-features/wasm/Cargo.toml b/contracts/feature-tests/payable-features/wasm/Cargo.toml
index c159e453a0..8c8eb30df5 100644
--- a/contracts/feature-tests/payable-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/payable-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.6"
+version = "0.51.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 56d2158684..af8c9b990c 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.50.6"
+version = "0.51.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.6"
+version = "0.51.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 dce667e29a..31c8f7cdc0 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.50.6"
+version = "0.51.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 5699d7e5f9..6e5a84f262 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-lib]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../framework/meta-lib"
 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 beda6cdff3..92c30712ad 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 interactor snippets manually to add relative paths:
 // [dependencies.multiversx-sc-snippets]
-// version = "0.50.6"
+// version = "0.51.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 c7b11471be..1df19dbcd4 100644
--- a/contracts/feature-tests/rust-snippets-generator-test/wasm/Cargo.toml
+++ b/contracts/feature-tests/rust-snippets-generator-test/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.6"
+version = "0.51.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 250a4898db..7b7080c1a8 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.50.6"
+version = "0.51.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.50.6"
+version = "0.51.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 b4de6463b8..f71dab5d37 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-lib]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../framework/meta-lib"
 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 533e345a18..49319a4367 100644
--- a/contracts/feature-tests/rust-testing-framework-tester/wasm/Cargo.toml
+++ b/contracts/feature-tests/rust-testing-framework-tester/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/scenario-tester/Cargo.toml b/contracts/feature-tests/scenario-tester/Cargo.toml
index fd87e332c5..f9db83e843 100644
--- a/contracts/feature-tests/scenario-tester/Cargo.toml
+++ b/contracts/feature-tests/scenario-tester/Cargo.toml
@@ -9,9 +9,9 @@ publish = false
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../framework/scenario"
diff --git a/contracts/feature-tests/scenario-tester/meta/Cargo.toml b/contracts/feature-tests/scenario-tester/meta/Cargo.toml
index 3a35b67517..4df5f9cdbe 100644
--- a/contracts/feature-tests/scenario-tester/meta/Cargo.toml
+++ b/contracts/feature-tests/scenario-tester/meta/Cargo.toml
@@ -8,6 +8,6 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta-lib]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/feature-tests/scenario-tester/wasm/Cargo.toml b/contracts/feature-tests/scenario-tester/wasm/Cargo.toml
index 9b4bac5c8b..329a68dfc5 100644
--- a/contracts/feature-tests/scenario-tester/wasm/Cargo.toml
+++ b/contracts/feature-tests/scenario-tester/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.6"
+version = "0.51.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 02bec7fcc8..83e3426269 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.50.6"
+version = "0.51.0"
 path = "../../../contracts/modules"
 
 [dependencies.multiversx-sc]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../framework/scenario"
 
 [dev-dependencies.multiversx-sc-meta-lib]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../framework/meta-lib"
diff --git a/contracts/feature-tests/use-module/meta/Cargo.toml b/contracts/feature-tests/use-module/meta/Cargo.toml
index 66922e1c75..ee26346944 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-lib]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../framework/meta-lib"
 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 baea672ec8..25385d393b 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.50.6"
+            "version": "0.51.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 4d8a88c54e..25db13bb97 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.50.6"
+            "version": "0.51.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 0297976f0f..ded11a349e 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.6"
+version = "0.51.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 16baa5f65c..ceffec4031 100644
--- a/contracts/feature-tests/use-module/wasm/Cargo.toml
+++ b/contracts/feature-tests/use-module/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/modules/Cargo.toml b/contracts/modules/Cargo.toml
index a6fe820a6d..b63a183fde 100644
--- a/contracts/modules/Cargo.toml
+++ b/contracts/modules/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-modules"
-version = "0.50.6"
+version = "0.51.0"
 edition = "2021"
 
 authors = ["MultiversX <contact@multiversx.com>"]
@@ -17,5 +17,5 @@ categories = ["no-std", "wasm", "cryptography::cryptocurrencies"]
 alloc = ["multiversx-sc/alloc"]
 
 [dependencies.multiversx-sc]
-version = "0.50.6"
+version = "0.51.0"
 path = "../../framework/base"
diff --git a/data/codec-derive/Cargo.toml b/data/codec-derive/Cargo.toml
index 83d95c8c7e..6405168a03 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.19.0"
+version = "0.20.0"
 edition = "2021"
 
 authors = ["dorin.iancu <dorin.iancu@multiversx.com>", "Andrei Marinica <andrei.marinica@multiversx.com>", "MultiversX <contact@multiversx.com>"]
diff --git a/data/codec/Cargo.toml b/data/codec/Cargo.toml
index 15992eead2..88f3516d50 100644
--- a/data/codec/Cargo.toml
+++ b/data/codec/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-codec"
-version = "0.19.0"
+version = "0.20.0"
 edition = "2021"
 
 authors = ["Andrei Marinica <andrei.marinica@multiversx.com>", "MultiversX <contact@multiversx.com>"]
@@ -18,7 +18,7 @@ derive = ["multiversx-sc-codec-derive"]
 
 [dependencies.multiversx-sc-codec-derive]
 path = "../codec-derive"
-version = "=0.19.0"
+version = "=0.20.0"
 optional = true
 
 [dependencies]
@@ -28,4 +28,4 @@ unwrap-infallible = "0.1.5"
 
 [dev-dependencies.multiversx-sc-codec-derive]
 path = "../codec-derive"
-version = "=0.19.0"
+version = "=0.20.0"
diff --git a/framework/base/Cargo.toml b/framework/base/Cargo.toml
index c1e56226cd..0d2e725988 100644
--- a/framework/base/Cargo.toml
+++ b/framework/base/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc"
-version = "0.50.6"
+version = "0.51.0"
 edition = "2021"
 rust-version = "1.78"
 
@@ -30,10 +30,10 @@ num-traits = { version = "=0.2.19", default-features = false }
 unwrap-infallible = "0.1.5"
 
 [dependencies.multiversx-sc-derive]
-version = "=0.50.6"
+version = "=0.51.0"
 path = "../derive"
 
 [dependencies.multiversx-sc-codec]
-version = "=0.19.0"
+version = "=0.20.0"
 path = "../../data/codec"
 features = ["derive"]
diff --git a/framework/derive/Cargo.toml b/framework/derive/Cargo.toml
index 3e5cde70ca..fbd00553d8 100644
--- a/framework/derive/Cargo.toml
+++ b/framework/derive/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-derive"
-version = "0.50.6"
+version = "0.51.0"
 edition = "2021"
 
 authors = ["Andrei Marinica <andrei.marinica@multiversx.com>", "MultiversX <contact@multiversx.com>"]
diff --git a/framework/meta-lib/Cargo.toml b/framework/meta-lib/Cargo.toml
index 6f8e49fec3..507620af1b 100644
--- a/framework/meta-lib/Cargo.toml
+++ b/framework/meta-lib/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-meta-lib"
-version = "0.50.6"
+version = "0.51.0"
 edition = "2021"
 
 authors = [
@@ -31,6 +31,6 @@ wasmprinter = "0.212"
 semver = "1.0.20"
 
 [dependencies.multiversx-sc]
-version = "=0.50.6"
+version = "=0.51.0"
 path = "../base"
 features = ["alloc", "num-bigint"]
diff --git a/framework/meta-lib/src/version_history.rs b/framework/meta-lib/src/version_history.rs
index 201374d83d..3faeca3878 100644
--- a/framework/meta-lib/src/version_history.rs
+++ b/framework/meta-lib/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.50.6);
+pub const LAST_VERSION: FrameworkVersion = framework_version!(0.51.0);
 
 /// Indicates where to stop with the upgrades.
 pub const LAST_UPGRADE_VERSION: FrameworkVersion = LAST_VERSION;
diff --git a/framework/meta/Cargo.toml b/framework/meta/Cargo.toml
index 1511f00a06..11976c47be 100644
--- a/framework/meta/Cargo.toml
+++ b/framework/meta/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-meta"
-version = "0.50.6"
+version = "0.51.0"
 edition = "2021"
 
 authors = [
@@ -41,14 +41,14 @@ pathdiff = "0.2.1"
 common-path = "1.0.0" 
 
 [dependencies.multiversx-sc-meta-lib]
-version = "=0.50.6"
+version = "=0.51.0"
 path = "../meta-lib"
 
 [dependencies.multiversx-sc]
-version = "=0.50.6"
+version = "=0.51.0"
 path = "../base"
 features = ["alloc", "num-bigint"]
 
 [dependencies.multiversx-sc-snippets]
-version = "=0.50.6"
+version = "=0.51.0"
 path = "../snippets"
diff --git a/framework/scenario/Cargo.toml b/framework/scenario/Cargo.toml
index 58bb79a2ac..41059c4427 100644
--- a/framework/scenario/Cargo.toml
+++ b/framework/scenario/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-scenario"
-version = "0.50.6"
+version = "0.51.0"
 edition = "2021"
 
 authors = [
@@ -37,21 +37,21 @@ wasm-incopatible = ["multiversx-chain-vm/wasm-incopatible"]
 run-go-tests = []
 
 [dependencies.multiversx-sc]
-version = "=0.50.6"
+version = "=0.51.0"
 features = ["alloc", "num-bigint"]
 path = "../base"
 
 [dependencies.multiversx-sc-meta-lib]
-version = "=0.50.6"
+version = "=0.51.0"
 path = "../meta-lib"
 
 [dependencies.multiversx-chain-scenario-format]
-version = "0.22.2"
+version = "0.22.3"
 path = "../../sdk/scenario-format"
 
 [dependencies.multiversx-chain-vm-executor]
 version = "0.2.0"
 
 [dependencies.multiversx-chain-vm]
-version = "=0.8.4"
+version = "=0.9.0"
 path = "../../vm"
diff --git a/framework/snippets/Cargo.toml b/framework/snippets/Cargo.toml
index 9543d85d71..c67e6e46e8 100644
--- a/framework/snippets/Cargo.toml
+++ b/framework/snippets/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-snippets"
-version = "0.50.6"
+version = "0.51.0"
 edition = "2021"
 
 authors = ["MultiversX <contact@multiversx.com>"]
@@ -22,15 +22,15 @@ env_logger = "0.11"
 futures = "0.3"
 
 [dependencies.multiversx-sc-scenario]
-version = "=0.50.6"
+version = "=0.51.0"
 path = "../scenario"
 
 [dependencies.multiversx-chain-scenario-format]
-version = "0.22.2"
+version = "0.22.3"
 path = "../../sdk/scenario-format"
 
 [dependencies.multiversx-sdk]
-version = "=0.4.1"
+version = "=0.5.0"
 path = "../../sdk/core"
 
 [dev-dependencies]
diff --git a/framework/wasm-adapter/Cargo.toml b/framework/wasm-adapter/Cargo.toml
index 7f1c189b5a..33bbf54a0d 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.50.6"
+version = "0.51.0"
 edition = "2021"
 
 authors = [
@@ -22,5 +22,5 @@ categories = [
 ]
 
 [dependencies.multiversx-sc]
-version = "=0.50.6"
+version = "=0.51.0"
 path = "../base"
diff --git a/sdk/core/Cargo.toml b/sdk/core/Cargo.toml
index 3e01ff4d98..463b4ce130 100644
--- a/sdk/core/Cargo.toml
+++ b/sdk/core/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sdk"
-version = "0.4.1"
+version = "0.5.0"
 edition = "2021"
 
 authors = [
diff --git a/sdk/scenario-format/Cargo.toml b/sdk/scenario-format/Cargo.toml
index 08c131e9a1..b66e3403ce 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.2"
+version = "0.22.3"
 edition = "2021"
 
 authors = ["Andrei Marinica <andrei.marinica@multiversx.com>", "MultiversX <contact@multiversx.com>"]
diff --git a/tools/mxpy-snippet-generator/Cargo.toml b/tools/mxpy-snippet-generator/Cargo.toml
index b561878546..c60220d601 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.50.6"
+version = "0.51.0"
 path = "../../framework/base"
 
 [dependencies]
diff --git a/tools/plotter/Cargo.toml b/tools/plotter/Cargo.toml
index 93b1c1ad64..24d5218599 100644
--- a/tools/plotter/Cargo.toml
+++ b/tools/plotter/Cargo.toml
@@ -19,11 +19,11 @@ plotters-canvas = "^0.3.0"
 lto = true
 
 [dependencies.multiversx-sc]
-version = "=0.50.6"
+version = "=0.51.0"
 path = "../../framework/base"
 
 [dependencies.multiversx-sc-scenario]
-version = "=0.50.6"
+version = "=0.51.0"
 path = "../../framework/scenario"
 default-features = false
 
diff --git a/tools/rust-debugger/format-tests/Cargo.toml b/tools/rust-debugger/format-tests/Cargo.toml
index 34fb81fdfd..4bacc707c9 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.50.6"
+version = "=0.51.0"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-scenario]
-version = "=0.50.6"
+version = "=0.51.0"
 path = "../../../framework/scenario"
 
 [dependencies.multiversx-chain-vm]
-version = "=0.8.4"
+version = "=0.9.0"
 path = "../../../vm"
 
 [dev-dependencies]
diff --git a/vm/Cargo.toml b/vm/Cargo.toml
index 933b29a4f9..baf8ec3894 100644
--- a/vm/Cargo.toml
+++ b/vm/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-chain-vm"
-version = "0.8.4"
+version = "0.9.0"
 edition = "2021"
 
 authors = [

From b887cf10487711c201c9bd3f0f6886960ebd8a65 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Sat, 6 Jul 2024 16:47:40 +0300
Subject: [PATCH 1083/1254] Cargo.lock update

---
 .../benchmarks/large-storage/wasm/Cargo.lock  | 22 ++++++++--------
 .../linked-list-repeat/wasm/Cargo.lock        | 22 ++++++++--------
 .../mappers/map-repeat/wasm/Cargo.lock        | 22 ++++++++--------
 .../mappers/queue-repeat/wasm/Cargo.lock      | 22 ++++++++--------
 .../mappers/set-repeat/wasm/Cargo.lock        | 22 ++++++++--------
 .../single-value-repeat/wasm/Cargo.lock       | 22 ++++++++--------
 .../mappers/vec-repeat/wasm/Cargo.lock        | 22 ++++++++--------
 .../benchmarks/send-tx-repeat/wasm/Cargo.lock | 22 ++++++++--------
 .../Cargo.lock                                | 22 ++++++++--------
 .../Cargo.lock                                | 22 ++++++++--------
 .../benchmarks/str-repeat/wasm/Cargo.lock     | 22 ++++++++--------
 .../core/price-aggregator/wasm/Cargo.lock     | 26 +++++++++----------
 .../bonding-curve-contract/wasm/Cargo.lock    | 24 ++++++++---------
 .../examples/check-pause/wasm/Cargo.lock      | 24 ++++++++---------
 .../crowdfunding-esdt/wasm/Cargo.lock         | 22 ++++++++--------
 .../examples/crypto-bubbles/wasm/Cargo.lock   | 22 ++++++++--------
 .../kitty-auction/wasm/Cargo.lock             | 22 ++++++++--------
 .../kitty-genetic-alg/wasm/Cargo.lock         | 22 ++++++++--------
 .../kitty-ownership/wasm/Cargo.lock           | 22 ++++++++--------
 .../examples/crypto-zombies/wasm/Cargo.lock   | 22 ++++++++--------
 .../examples/digital-cash/wasm/Cargo.lock     | 22 ++++++++--------
 contracts/examples/empty/wasm/Cargo.lock      | 22 ++++++++--------
 .../esdt-transfer-with-fee/wasm/Cargo.lock    | 22 ++++++++--------
 contracts/examples/factorial/wasm/Cargo.lock  | 22 ++++++++--------
 .../examples/fractional-nfts/wasm/Cargo.lock  | 24 ++++++++---------
 .../examples/lottery-esdt/wasm/Cargo.lock     | 22 ++++++++--------
 .../multisig/wasm-multisig-full/Cargo.lock    | 24 ++++++++---------
 .../multisig/wasm-multisig-view/Cargo.lock    | 24 ++++++++---------
 contracts/examples/multisig/wasm/Cargo.lock   | 24 ++++++++---------
 contracts/examples/nft-minter/wasm/Cargo.lock | 22 ++++++++--------
 .../nft-storage-prepay/wasm/Cargo.lock        | 22 ++++++++--------
 .../examples/nft-subscription/wasm/Cargo.lock | 24 ++++++++---------
 .../order-book/factory/wasm/Cargo.lock        | 22 ++++++++--------
 .../examples/order-book/pair/wasm/Cargo.lock  | 22 ++++++++--------
 .../examples/ping-pong-egld/wasm/Cargo.lock   | 22 ++++++++--------
 .../examples/proxy-pause/wasm/Cargo.lock      | 22 ++++++++--------
 .../rewards-distribution/wasm/Cargo.lock      | 24 ++++++++---------
 .../examples/seed-nft-minter/wasm/Cargo.lock  | 24 ++++++++---------
 .../examples/token-release/wasm/Cargo.lock    | 22 ++++++++--------
 .../abi-tester/wasm-abi-tester-ev/Cargo.lock  | 22 ++++++++--------
 .../feature-tests/abi-tester/wasm/Cargo.lock  | 22 ++++++++--------
 .../wasm-alloc-mem-fail/Cargo.lock            | 22 ++++++++--------
 .../wasm-alloc-mem-leaking/Cargo.lock         | 22 ++++++++--------
 .../alloc-features/wasm/Cargo.lock            | 22 ++++++++--------
 .../Cargo.lock                                | 24 ++++++++---------
 .../basic-features/wasm/Cargo.lock            | 24 ++++++++---------
 .../big-float-features/wasm/Cargo.lock        | 22 ++++++++--------
 .../builtin-func-features/wasm/Cargo.lock     | 22 ++++++++--------
 .../first-contract/wasm/Cargo.lock            | 22 ++++++++--------
 .../second-contract/wasm/Cargo.lock           | 22 ++++++++--------
 .../child/wasm/Cargo.lock                     | 22 ++++++++--------
 .../parent/wasm/Cargo.lock                    | 22 ++++++++--------
 .../forwarder-legacy/wasm/Cargo.lock          | 22 ++++++++--------
 .../wasm-forwarder-queue-promises/Cargo.lock  | 22 ++++++++--------
 .../forwarder-queue/wasm/Cargo.lock           | 22 ++++++++--------
 .../Cargo.lock                                | 22 ++++++++--------
 .../Cargo.lock                                | 22 ++++++++--------
 .../forwarder-raw/wasm/Cargo.lock             | 22 ++++++++--------
 .../composability/forwarder/wasm/Cargo.lock   | 22 ++++++++--------
 .../local-esdt-and-nft/wasm/Cargo.lock        | 22 ++++++++--------
 .../promises-features/wasm/Cargo.lock         | 22 ++++++++--------
 .../proxy-test-first/wasm/Cargo.lock          | 22 ++++++++--------
 .../proxy-test-second/wasm/Cargo.lock         | 22 ++++++++--------
 .../recursive-caller/wasm/Cargo.lock          | 22 ++++++++--------
 .../transfer-role-features/wasm/Cargo.lock    | 24 ++++++++---------
 .../vault/wasm-vault-promises/Cargo.lock      | 22 ++++++++--------
 .../vault/wasm-vault-upgrade/Cargo.lock       | 22 ++++++++--------
 .../composability/vault/wasm/Cargo.lock       | 22 ++++++++--------
 .../crowdfunding-erc20/wasm/Cargo.lock        | 22 ++++++++--------
 .../erc1155-marketplace/wasm/Cargo.lock       | 22 ++++++++--------
 .../erc1155-user-mock/wasm/Cargo.lock         | 22 ++++++++--------
 .../erc1155/wasm/Cargo.lock                   | 22 ++++++++--------
 .../erc-style-contracts/erc20/wasm/Cargo.lock | 22 ++++++++--------
 .../erc721/wasm/Cargo.lock                    | 22 ++++++++--------
 .../lottery-erc20/wasm/Cargo.lock             | 22 ++++++++--------
 .../esdt-system-sc-mock/wasm/Cargo.lock       | 22 ++++++++--------
 .../exchange-features/wasm/Cargo.lock         | 22 ++++++++--------
 .../wasm/Cargo.lock                           | 22 ++++++++--------
 .../managed-map-features/wasm/Cargo.lock      | 22 ++++++++--------
 .../wasm-multi-contract-alt-impl/Cargo.lock   | 22 ++++++++--------
 .../Cargo.lock                                | 22 ++++++++--------
 .../Cargo.lock                                | 22 ++++++++--------
 .../multi-contract-features/wasm/Cargo.lock   | 22 ++++++++--------
 .../panic-message-features/wasm/Cargo.lock    | 22 ++++++++--------
 .../payable-features/wasm/Cargo.lock          | 22 ++++++++--------
 .../wasm/Cargo.lock                           | 22 ++++++++--------
 .../wasm/Cargo.lock                           | 22 ++++++++--------
 .../scenario-tester/wasm/Cargo.lock           | 22 ++++++++--------
 .../wasm-use-module-view/Cargo.lock           | 24 ++++++++---------
 .../feature-tests/use-module/wasm/Cargo.lock  | 24 ++++++++---------
 90 files changed, 1006 insertions(+), 1006 deletions(-)

diff --git a/contracts/benchmarks/large-storage/wasm/Cargo.lock b/contracts/benchmarks/large-storage/wasm/Cargo.lock
index 9ca0545dae..04c0a1ab96 100755
--- a/contracts/benchmarks/large-storage/wasm/Cargo.lock
+++ b/contracts/benchmarks/large-storage/wasm/Cargo.lock
@@ -16,9 +16,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "endian-type"
@@ -55,7 +55,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -122,9 +122,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.82"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.61"
+version = "2.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.lock
index d5cd8bd35b..45dede59e4 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.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "endian-type"
@@ -63,7 +63,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -75,7 +75,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -130,9 +130,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.82"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
@@ -164,9 +164,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.61"
+version = "2.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.lock
index 1d10e11eea..fa6c130fa2 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.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "endian-type"
@@ -63,7 +63,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -75,7 +75,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -130,9 +130,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.82"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
@@ -164,9 +164,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.61"
+version = "2.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.lock
index bb353c06a1..197e07354d 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.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "endian-type"
@@ -47,7 +47,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -59,7 +59,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -68,7 +68,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -78,7 +78,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -89,7 +89,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -114,9 +114,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.82"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
@@ -164,9 +164,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.61"
+version = "2.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.lock
index 00a390f240..ed7f385f98 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.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "endian-type"
@@ -47,7 +47,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -59,7 +59,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -68,7 +68,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -78,7 +78,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -89,7 +89,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -114,9 +114,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.82"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
@@ -164,9 +164,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.61"
+version = "2.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.lock
index 91935bdbc0..84c12b4ca9 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.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "endian-type"
@@ -47,7 +47,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -59,7 +59,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -68,7 +68,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -78,7 +78,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -89,7 +89,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -114,9 +114,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.82"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
@@ -164,9 +164,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.61"
+version = "2.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.lock
index 63279898a4..863e56d32f 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.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "endian-type"
@@ -47,7 +47,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -59,7 +59,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -68,7 +68,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -78,7 +78,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -89,7 +89,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -114,9 +114,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.82"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
@@ -148,9 +148,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.61"
+version = "2.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/benchmarks/send-tx-repeat/wasm/Cargo.lock b/contracts/benchmarks/send-tx-repeat/wasm/Cargo.lock
index 39a814932c..5ee4f7f305 100755
--- a/contracts/benchmarks/send-tx-repeat/wasm/Cargo.lock
+++ b/contracts/benchmarks/send-tx-repeat/wasm/Cargo.lock
@@ -16,9 +16,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "endian-type"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -107,9 +107,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.82"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.61"
+version = "2.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.lock b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.lock
index 4ea96de7da..226cbdbc24 100644
--- a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.lock
+++ b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.lock
@@ -16,9 +16,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "endian-type"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -107,9 +107,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.82"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
@@ -156,9 +156,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.61"
+version = "2.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.lock b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.lock
index cc8d4eb0e4..d8a992b6dc 100644
--- a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.lock
+++ b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.lock
@@ -16,9 +16,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "endian-type"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -107,9 +107,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.82"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
@@ -156,9 +156,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.61"
+version = "2.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/benchmarks/str-repeat/wasm/Cargo.lock b/contracts/benchmarks/str-repeat/wasm/Cargo.lock
index 295f5d348c..468d04c7ff 100755
--- a/contracts/benchmarks/str-repeat/wasm/Cargo.lock
+++ b/contracts/benchmarks/str-repeat/wasm/Cargo.lock
@@ -16,9 +16,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "endian-type"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -107,9 +107,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.82"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
@@ -156,9 +156,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.61"
+version = "2.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/core/price-aggregator/wasm/Cargo.lock b/contracts/core/price-aggregator/wasm/Cargo.lock
index 722433bff8..0abf58f758 100644
--- a/contracts/core/price-aggregator/wasm/Cargo.lock
+++ b/contracts/core/price-aggregator/wasm/Cargo.lock
@@ -16,9 +16,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "bumpalo"
@@ -86,7 +86,7 @@ checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
 
 [[package]]
 name = "multiversx-price-aggregator-sc"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "arrayvec",
  "getrandom",
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -117,7 +117,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -126,7 +126,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -136,7 +136,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -147,14 +147,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -191,9 +191,9 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.82"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
@@ -255,9 +255,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.61"
+version = "2.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/bonding-curve-contract/wasm/Cargo.lock b/contracts/examples/bonding-curve-contract/wasm/Cargo.lock
index aad952f5ec..f37db4aef6 100644
--- a/contracts/examples/bonding-curve-contract/wasm/Cargo.lock
+++ b/contracts/examples/bonding-curve-contract/wasm/Cargo.lock
@@ -16,9 +16,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "bonding-curve-contract"
@@ -56,7 +56,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -68,7 +68,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -77,7 +77,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -130,9 +130,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.82"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
@@ -164,9 +164,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.61"
+version = "2.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/check-pause/wasm/Cargo.lock b/contracts/examples/check-pause/wasm/Cargo.lock
index 1cc526313d..ee4df1a324 100644
--- a/contracts/examples/check-pause/wasm/Cargo.lock
+++ b/contracts/examples/check-pause/wasm/Cargo.lock
@@ -16,9 +16,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "check-pause"
@@ -56,7 +56,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -68,7 +68,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -77,7 +77,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -130,9 +130,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.82"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
@@ -164,9 +164,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.61"
+version = "2.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/crowdfunding-esdt/wasm/Cargo.lock b/contracts/examples/crowdfunding-esdt/wasm/Cargo.lock
index f133e26dd5..fdbb3a83f8 100644
--- a/contracts/examples/crowdfunding-esdt/wasm/Cargo.lock
+++ b/contracts/examples/crowdfunding-esdt/wasm/Cargo.lock
@@ -16,9 +16,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "crowdfunding-esdt"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -122,9 +122,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.82"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.61"
+version = "2.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/crypto-bubbles/wasm/Cargo.lock b/contracts/examples/crypto-bubbles/wasm/Cargo.lock
index 63e782bc3b..a84293799e 100755
--- a/contracts/examples/crypto-bubbles/wasm/Cargo.lock
+++ b/contracts/examples/crypto-bubbles/wasm/Cargo.lock
@@ -16,9 +16,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "crypto-bubbles"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -122,9 +122,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.82"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.61"
+version = "2.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.lock b/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.lock
index daa881396b..4170dba9b3 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 = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "endian-type"
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -96,7 +96,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -115,7 +115,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -126,7 +126,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -151,9 +151,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.82"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
@@ -192,9 +192,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.61"
+version = "2.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
 dependencies = [
  "proc-macro2",
  "quote",
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 8ce60e5e52..77261e0d12 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 = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "endian-type"
@@ -65,7 +65,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -77,7 +77,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,7 +96,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -107,7 +107,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -132,9 +132,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.82"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
@@ -173,9 +173,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.61"
+version = "2.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.lock b/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.lock
index cf394b76f1..60ea8ac088 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 = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "endian-type"
@@ -75,7 +75,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -96,7 +96,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -106,7 +106,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -117,7 +117,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -142,9 +142,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.82"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
@@ -183,9 +183,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.61"
+version = "2.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/crypto-zombies/wasm/Cargo.lock b/contracts/examples/crypto-zombies/wasm/Cargo.lock
index c1d6526c25..5d7e68b664 100755
--- a/contracts/examples/crypto-zombies/wasm/Cargo.lock
+++ b/contracts/examples/crypto-zombies/wasm/Cargo.lock
@@ -16,9 +16,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "crypto-zombies"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -122,9 +122,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.82"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.61"
+version = "2.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/digital-cash/wasm/Cargo.lock b/contracts/examples/digital-cash/wasm/Cargo.lock
index 43103eaada..d613419e19 100644
--- a/contracts/examples/digital-cash/wasm/Cargo.lock
+++ b/contracts/examples/digital-cash/wasm/Cargo.lock
@@ -16,9 +16,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "digital-cash"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -122,9 +122,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.82"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.61"
+version = "2.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/empty/wasm/Cargo.lock b/contracts/examples/empty/wasm/Cargo.lock
index 3f7b503127..89dc50a770 100755
--- a/contracts/examples/empty/wasm/Cargo.lock
+++ b/contracts/examples/empty/wasm/Cargo.lock
@@ -16,9 +16,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "empty"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -122,9 +122,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.82"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.61"
+version = "2.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.lock b/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.lock
index 13027cdb43..de07396ec5 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 = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "endian-type"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -122,9 +122,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.82"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.61"
+version = "2.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/factorial/wasm/Cargo.lock b/contracts/examples/factorial/wasm/Cargo.lock
index bd758465a3..5b63c44805 100755
--- a/contracts/examples/factorial/wasm/Cargo.lock
+++ b/contracts/examples/factorial/wasm/Cargo.lock
@@ -16,9 +16,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "endian-type"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -122,9 +122,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.82"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.61"
+version = "2.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/fractional-nfts/wasm/Cargo.lock b/contracts/examples/fractional-nfts/wasm/Cargo.lock
index 5eada6a444..188aab45ed 100644
--- a/contracts/examples/fractional-nfts/wasm/Cargo.lock
+++ b/contracts/examples/fractional-nfts/wasm/Cargo.lock
@@ -16,9 +16,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "endian-type"
@@ -56,7 +56,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -68,7 +68,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -77,7 +77,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -130,9 +130,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.82"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
@@ -164,9 +164,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.61"
+version = "2.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/lottery-esdt/wasm/Cargo.lock b/contracts/examples/lottery-esdt/wasm/Cargo.lock
index 2d72f8b581..e1f6bb22e8 100755
--- a/contracts/examples/lottery-esdt/wasm/Cargo.lock
+++ b/contracts/examples/lottery-esdt/wasm/Cargo.lock
@@ -16,9 +16,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "endian-type"
@@ -55,7 +55,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -122,9 +122,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.82"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.61"
+version = "2.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/multisig/wasm-multisig-full/Cargo.lock b/contracts/examples/multisig/wasm-multisig-full/Cargo.lock
index e3dbde1888..5294ec6930 100644
--- a/contracts/examples/multisig/wasm-multisig-full/Cargo.lock
+++ b/contracts/examples/multisig/wasm-multisig-full/Cargo.lock
@@ -16,9 +16,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "endian-type"
@@ -56,7 +56,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -68,7 +68,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -77,7 +77,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -130,9 +130,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.82"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
@@ -164,9 +164,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.61"
+version = "2.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/multisig/wasm-multisig-view/Cargo.lock b/contracts/examples/multisig/wasm-multisig-view/Cargo.lock
index 2e48b673bf..53c0e6e23c 100644
--- a/contracts/examples/multisig/wasm-multisig-view/Cargo.lock
+++ b/contracts/examples/multisig/wasm-multisig-view/Cargo.lock
@@ -16,9 +16,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "endian-type"
@@ -56,7 +56,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -68,7 +68,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -77,7 +77,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -130,9 +130,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.82"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
@@ -164,9 +164,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.61"
+version = "2.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/multisig/wasm/Cargo.lock b/contracts/examples/multisig/wasm/Cargo.lock
index 1218b59805..87d78445bc 100755
--- a/contracts/examples/multisig/wasm/Cargo.lock
+++ b/contracts/examples/multisig/wasm/Cargo.lock
@@ -16,9 +16,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "endian-type"
@@ -56,7 +56,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -68,7 +68,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -77,7 +77,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -130,9 +130,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.82"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
@@ -164,9 +164,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.61"
+version = "2.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/nft-minter/wasm/Cargo.lock b/contracts/examples/nft-minter/wasm/Cargo.lock
index 7024923baa..eb85d2109f 100644
--- a/contracts/examples/nft-minter/wasm/Cargo.lock
+++ b/contracts/examples/nft-minter/wasm/Cargo.lock
@@ -16,9 +16,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "endian-type"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -122,9 +122,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.82"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.61"
+version = "2.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/nft-storage-prepay/wasm/Cargo.lock b/contracts/examples/nft-storage-prepay/wasm/Cargo.lock
index 8b63cdf9d3..9d129d80cb 100755
--- a/contracts/examples/nft-storage-prepay/wasm/Cargo.lock
+++ b/contracts/examples/nft-storage-prepay/wasm/Cargo.lock
@@ -16,9 +16,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "endian-type"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -122,9 +122,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.82"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.61"
+version = "2.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/nft-subscription/wasm/Cargo.lock b/contracts/examples/nft-subscription/wasm/Cargo.lock
index 6a78865157..cb826d735c 100644
--- a/contracts/examples/nft-subscription/wasm/Cargo.lock
+++ b/contracts/examples/nft-subscription/wasm/Cargo.lock
@@ -16,9 +16,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "endian-type"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,14 +82,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -130,9 +130,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.82"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
@@ -164,9 +164,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.61"
+version = "2.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/order-book/factory/wasm/Cargo.lock b/contracts/examples/order-book/factory/wasm/Cargo.lock
index 8988f022d3..4c79ffa7d7 100644
--- a/contracts/examples/order-book/factory/wasm/Cargo.lock
+++ b/contracts/examples/order-book/factory/wasm/Cargo.lock
@@ -16,9 +16,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "endian-type"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -122,9 +122,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.82"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.61"
+version = "2.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/order-book/pair/wasm/Cargo.lock b/contracts/examples/order-book/pair/wasm/Cargo.lock
index 3c2f37d5b0..6c98fb09a3 100644
--- a/contracts/examples/order-book/pair/wasm/Cargo.lock
+++ b/contracts/examples/order-book/pair/wasm/Cargo.lock
@@ -16,9 +16,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "endian-type"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -122,9 +122,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.82"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.61"
+version = "2.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/ping-pong-egld/wasm/Cargo.lock b/contracts/examples/ping-pong-egld/wasm/Cargo.lock
index 16d5e25b56..cda45c2288 100755
--- a/contracts/examples/ping-pong-egld/wasm/Cargo.lock
+++ b/contracts/examples/ping-pong-egld/wasm/Cargo.lock
@@ -16,9 +16,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "endian-type"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -122,9 +122,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.82"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.61"
+version = "2.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/proxy-pause/wasm/Cargo.lock b/contracts/examples/proxy-pause/wasm/Cargo.lock
index 1f5edb48d3..3a3056e317 100644
--- a/contracts/examples/proxy-pause/wasm/Cargo.lock
+++ b/contracts/examples/proxy-pause/wasm/Cargo.lock
@@ -16,9 +16,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "endian-type"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -107,9 +107,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.82"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.61"
+version = "2.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/rewards-distribution/wasm/Cargo.lock b/contracts/examples/rewards-distribution/wasm/Cargo.lock
index b50d00c35a..d3f04201c2 100644
--- a/contracts/examples/rewards-distribution/wasm/Cargo.lock
+++ b/contracts/examples/rewards-distribution/wasm/Cargo.lock
@@ -16,9 +16,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "endian-type"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,14 +82,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -114,9 +114,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.82"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
@@ -164,9 +164,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.61"
+version = "2.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/seed-nft-minter/wasm/Cargo.lock b/contracts/examples/seed-nft-minter/wasm/Cargo.lock
index 7a99f7dd8c..369fcb743d 100644
--- a/contracts/examples/seed-nft-minter/wasm/Cargo.lock
+++ b/contracts/examples/seed-nft-minter/wasm/Cargo.lock
@@ -16,9 +16,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "endian-type"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,14 +82,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -114,9 +114,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.82"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
@@ -164,9 +164,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.61"
+version = "2.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/token-release/wasm/Cargo.lock b/contracts/examples/token-release/wasm/Cargo.lock
index 7c4c5358b8..5914e7f005 100644
--- a/contracts/examples/token-release/wasm/Cargo.lock
+++ b/contracts/examples/token-release/wasm/Cargo.lock
@@ -16,9 +16,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "endian-type"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -107,9 +107,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.82"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
@@ -141,9 +141,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.61"
+version = "2.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
 dependencies = [
  "proc-macro2",
  "quote",
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 75e716d195..d66aa4dbb2 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 = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "endian-type"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -122,9 +122,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.82"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.61"
+version = "2.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/feature-tests/abi-tester/wasm/Cargo.lock b/contracts/feature-tests/abi-tester/wasm/Cargo.lock
index 6cf3df7044..b8863b44cd 100755
--- a/contracts/feature-tests/abi-tester/wasm/Cargo.lock
+++ b/contracts/feature-tests/abi-tester/wasm/Cargo.lock
@@ -31,9 +31,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "endian-type"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -122,9 +122,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.82"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.61"
+version = "2.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock
index 1ce256d961..eb3581ce3d 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock
@@ -31,9 +31,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "endian-type"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -122,9 +122,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.82"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.61"
+version = "2.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.lock b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.lock
index 593edef94a..be94662981 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.lock
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.lock
@@ -31,9 +31,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "endian-type"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -122,9 +122,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.82"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.61"
+version = "2.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/feature-tests/alloc-features/wasm/Cargo.lock b/contracts/feature-tests/alloc-features/wasm/Cargo.lock
index c77934e414..95719e393d 100644
--- a/contracts/feature-tests/alloc-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/alloc-features/wasm/Cargo.lock
@@ -31,9 +31,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "endian-type"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -122,9 +122,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.82"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.61"
+version = "2.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
 dependencies = [
  "proc-macro2",
  "quote",
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 a0faa3488f..70a4eb7447 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.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "endian-type"
@@ -56,7 +56,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -68,7 +68,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -77,7 +77,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -130,9 +130,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.82"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
@@ -164,9 +164,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.61"
+version = "2.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/feature-tests/basic-features/wasm/Cargo.lock b/contracts/feature-tests/basic-features/wasm/Cargo.lock
index fa17ce5189..15cb1a5de8 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.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "endian-type"
@@ -56,7 +56,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -68,7 +68,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -77,7 +77,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -130,9 +130,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.82"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
@@ -164,9 +164,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.61"
+version = "2.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/feature-tests/big-float-features/wasm/Cargo.lock b/contracts/feature-tests/big-float-features/wasm/Cargo.lock
index 0f0c0ddd7b..42ca27ee50 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.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "endian-type"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -122,9 +122,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.82"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.61"
+version = "2.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
 dependencies = [
  "proc-macro2",
  "quote",
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 bcf327785a..42990a7441 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 = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "builtin-func-features"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -122,9 +122,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.82"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.61"
+version = "2.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
 dependencies = [
  "proc-macro2",
  "quote",
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 79d22a97f4..2706ab3150 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 = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "endian-type"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -122,9 +122,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.82"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.61"
+version = "2.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
 dependencies = [
  "proc-macro2",
  "quote",
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 8901457d1e..79848c23ce 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 = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "endian-type"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -107,9 +107,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.82"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.61"
+version = "2.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
 dependencies = [
  "proc-macro2",
  "quote",
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 c1a31c8ed0..375ad2cf7e 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 = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "child"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -122,9 +122,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.82"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.61"
+version = "2.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
 dependencies = [
  "proc-macro2",
  "quote",
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 fba80e73ec..3c108fc749 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 = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "endian-type"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -122,9 +122,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.82"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.61"
+version = "2.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.lock
index 882a83339c..8cd7e8f3e0 100644
--- a/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.lock
@@ -16,9 +16,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "endian-type"
@@ -56,7 +56,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -68,7 +68,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -77,7 +77,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,7 +98,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -123,9 +123,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.82"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
@@ -157,9 +157,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.61"
+version = "2.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
 dependencies = [
  "proc-macro2",
  "quote",
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 655f6397b7..c11a1da90f 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 = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "endian-type"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -122,9 +122,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.82"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.61"
+version = "2.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock
index 611771a9b3..6ee4ab7525 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 = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "endian-type"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -122,9 +122,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.82"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.61"
+version = "2.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
 dependencies = [
  "proc-macro2",
  "quote",
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 5acdf03e16..dd0a6d2a6d 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 = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "endian-type"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -122,9 +122,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.82"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.61"
+version = "2.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
 dependencies = [
  "proc-macro2",
  "quote",
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 c1f1d7042a..3567ed295d 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 = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "endian-type"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -122,9 +122,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.82"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.61"
+version = "2.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.lock
index f365e2e90b..19063f5333 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 = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "endian-type"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -122,9 +122,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.82"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.61"
+version = "2.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock
index 1e931ea534..16039f2d73 100755
--- a/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock
@@ -16,9 +16,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "endian-type"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -122,9 +122,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.82"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.61"
+version = "2.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
 dependencies = [
  "proc-macro2",
  "quote",
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 908b4e5abe..fa1286595b 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 = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "endian-type"
@@ -55,7 +55,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -122,9 +122,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.82"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.61"
+version = "2.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/feature-tests/composability/promises-features/wasm/Cargo.lock b/contracts/feature-tests/composability/promises-features/wasm/Cargo.lock
index b7d88ab90c..7356da305c 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 = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "endian-type"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -107,9 +107,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.82"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.61"
+version = "2.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
 dependencies = [
  "proc-macro2",
  "quote",
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 c60e6bb7d7..67c59d01d1 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 = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "endian-type"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -107,9 +107,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.82"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
@@ -157,9 +157,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.61"
+version = "2.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
 dependencies = [
  "proc-macro2",
  "quote",
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 d3e1876cea..39f12ba527 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 = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "endian-type"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -107,9 +107,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.82"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.61"
+version = "2.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.lock b/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.lock
index 0ecf2d2dd8..9072eb09b5 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 = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "endian-type"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -107,9 +107,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.82"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
@@ -157,9 +157,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.61"
+version = "2.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
 dependencies = [
  "proc-macro2",
  "quote",
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 898a433e81..d3d4e5240c 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 = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "endian-type"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,14 +82,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -114,9 +114,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.82"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
@@ -148,9 +148,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.61"
+version = "2.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
 dependencies = [
  "proc-macro2",
  "quote",
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 4880f5c281..07a2d01add 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 = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "endian-type"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -107,9 +107,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.82"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
@@ -141,9 +141,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.61"
+version = "2.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
 dependencies = [
  "proc-macro2",
  "quote",
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 3955e47aa1..dfed80941a 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 = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "endian-type"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -107,9 +107,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.82"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
@@ -141,9 +141,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.61"
+version = "2.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/feature-tests/composability/vault/wasm/Cargo.lock b/contracts/feature-tests/composability/vault/wasm/Cargo.lock
index aa84d3ca7a..44b9f8d3c4 100755
--- a/contracts/feature-tests/composability/vault/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/vault/wasm/Cargo.lock
@@ -16,9 +16,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "endian-type"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -107,9 +107,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.82"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
@@ -141,9 +141,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.61"
+version = "2.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
 dependencies = [
  "proc-macro2",
  "quote",
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 8665521441..98489db791 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 = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "crowdfunding-erc20"
@@ -63,7 +63,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -75,7 +75,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -130,9 +130,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.82"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
@@ -164,9 +164,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.61"
+version = "2.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
 dependencies = [
  "proc-macro2",
  "quote",
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 1edb77bb81..0ee3b0097c 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 = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "endian-type"
@@ -63,7 +63,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -75,7 +75,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -130,9 +130,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.82"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
@@ -164,9 +164,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.61"
+version = "2.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
 dependencies = [
  "proc-macro2",
  "quote",
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 4972c698b2..80bad896fc 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 = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "endian-type"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -122,9 +122,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.82"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.61"
+version = "2.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
 dependencies = [
  "proc-macro2",
  "quote",
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 b91ab2b173..6f9fc769fd 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 = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "endian-type"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -122,9 +122,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.82"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.61"
+version = "2.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
 dependencies = [
  "proc-macro2",
  "quote",
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 95bf4b7ca5..56d6101c2b 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 = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "endian-type"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -122,9 +122,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.82"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.61"
+version = "2.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
 dependencies = [
  "proc-macro2",
  "quote",
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 8daf3f3af0..a99467e0f4 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 = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "endian-type"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -122,9 +122,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.82"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.61"
+version = "2.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
 dependencies = [
  "proc-macro2",
  "quote",
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 a7e7a4e91c..c4adc248e5 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 = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "endian-type"
@@ -63,7 +63,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -75,7 +75,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -130,9 +130,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.82"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
@@ -164,9 +164,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.61"
+version = "2.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
 dependencies = [
  "proc-macro2",
  "quote",
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 23249eff42..70813f1d02 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 = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "endian-type"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -122,9 +122,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.82"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.61"
+version = "2.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/feature-tests/exchange-features/wasm/Cargo.lock b/contracts/feature-tests/exchange-features/wasm/Cargo.lock
index 9dcdd5a6ab..510f366e20 100644
--- a/contracts/feature-tests/exchange-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/exchange-features/wasm/Cargo.lock
@@ -16,9 +16,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "endian-type"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -122,9 +122,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.82"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.61"
+version = "2.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/feature-tests/formatted-message-features/wasm/Cargo.lock b/contracts/feature-tests/formatted-message-features/wasm/Cargo.lock
index 945b1342fc..4c040b80af 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 = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "endian-type"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -122,9 +122,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.82"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.61"
+version = "2.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/feature-tests/managed-map-features/wasm/Cargo.lock b/contracts/feature-tests/managed-map-features/wasm/Cargo.lock
index 1a68ca3854..b435355ac5 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 = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "endian-type"
@@ -55,7 +55,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -122,9 +122,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.82"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.61"
+version = "2.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
 dependencies = [
  "proc-macro2",
  "quote",
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 0804e13a3b..d7f54eb5d8 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 = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "endian-type"
@@ -55,7 +55,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -122,9 +122,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.82"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.61"
+version = "2.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
 dependencies = [
  "proc-macro2",
  "quote",
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 79c3362970..5e0aa67166 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 = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "endian-type"
@@ -55,7 +55,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -122,9 +122,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.82"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.61"
+version = "2.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
 dependencies = [
  "proc-macro2",
  "quote",
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 cdbe7e46a2..8edf445178 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 = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "endian-type"
@@ -55,7 +55,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -122,9 +122,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.82"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.61"
+version = "2.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/feature-tests/multi-contract-features/wasm/Cargo.lock b/contracts/feature-tests/multi-contract-features/wasm/Cargo.lock
index ade536b33b..ec2051f9e8 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 = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "endian-type"
@@ -55,7 +55,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -122,9 +122,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.82"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.61"
+version = "2.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/feature-tests/panic-message-features/wasm/Cargo.lock b/contracts/feature-tests/panic-message-features/wasm/Cargo.lock
index 28e51b1602..f4837bcaab 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 = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "endian-type"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -122,9 +122,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.82"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.61"
+version = "2.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/feature-tests/payable-features/wasm/Cargo.lock b/contracts/feature-tests/payable-features/wasm/Cargo.lock
index ce9b839041..47b5b75407 100755
--- a/contracts/feature-tests/payable-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/payable-features/wasm/Cargo.lock
@@ -16,9 +16,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "endian-type"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -122,9 +122,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.82"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.61"
+version = "2.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
 dependencies = [
  "proc-macro2",
  "quote",
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 da5769e9ec..9493bebe96 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 = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "endian-type"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -107,9 +107,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.82"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.61"
+version = "2.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
 dependencies = [
  "proc-macro2",
  "quote",
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 6905bd95f9..14081cd744 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 = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "endian-type"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -107,9 +107,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.82"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.61"
+version = "2.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/feature-tests/scenario-tester/wasm/Cargo.lock b/contracts/feature-tests/scenario-tester/wasm/Cargo.lock
index 7e9f9f3507..389c7801b3 100755
--- a/contracts/feature-tests/scenario-tester/wasm/Cargo.lock
+++ b/contracts/feature-tests/scenario-tester/wasm/Cargo.lock
@@ -16,9 +16,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "endian-type"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -107,9 +107,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.82"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.61"
+version = "2.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
 dependencies = [
  "proc-macro2",
  "quote",
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 34beaae97c..f7b35ad945 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 = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "endian-type"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,14 +82,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -114,9 +114,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.82"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
@@ -148,9 +148,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.61"
+version = "2.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/feature-tests/use-module/wasm/Cargo.lock b/contracts/feature-tests/use-module/wasm/Cargo.lock
index 8c41f5ffd5..cea515df68 100644
--- a/contracts/feature-tests/use-module/wasm/Cargo.lock
+++ b/contracts/feature-tests/use-module/wasm/Cargo.lock
@@ -16,9 +16,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "endian-type"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.19.0"
+version = "0.20.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,14 +82,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.50.6"
+version = "0.51.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -114,9 +114,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.82"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
@@ -148,9 +148,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.61"
+version = "2.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
 dependencies = [
  "proc-macro2",
  "quote",

From c4608cc1da4d1a3837b4dcb49aad80014ad53f2d Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Sat, 6 Jul 2024 16:56:16 +0300
Subject: [PATCH 1084/1254] publish script fix

---
 publish.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/publish.sh b/publish.sh
index 78d97da4a3..ddda3e9762 100755
--- a/publish.sh
+++ b/publish.sh
@@ -30,7 +30,7 @@
 #
 # 6. Make sure that the contract upgrade tool is still sound.
 # At the very least add the new version to `VERSIONS` and change `DEFAULT_LAST_VERSION` in 
-# `/home/andreim/multiversx/rs/mx-sdk-rs/framework/meta/src/sc_upgrade/upgrade_versions.rs`
+# `/home/andreim/multiversx/rs/mx-sdk-rs/framework/meta/src/sc_upgrade/upgrade_versions.rs`+
 # 
 # 7. Run this script, `./publish.sh`.
 # You can comment out the crates you are not publishing. The script will stop otherwise when it cannot publish them.
@@ -87,7 +87,7 @@ cd framework/base
 cargo publish || return 1
 cd ../..
 
-cd framework/meta
+cd framework/meta-lib
 cargo publish || return 1
 cd ../..
 
@@ -99,6 +99,10 @@ cd framework/snippets
 cargo publish || return 1
 cd ../..
 
+cd framework/meta
+cargo publish || return 1
+cd ../..
+
 cd framework/wasm-adapter
 cargo publish || return 1
 cd ../..

From 9c46e465e12d22254e217e59b4dd9928eb6af058 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Sat, 6 Jul 2024 17:35:48 +0300
Subject: [PATCH 1085/1254] plotter cleanup

---
 tools/plotter/Cargo.toml | 10 ++++++----
 tools/plotter/src/lib.rs |  3 ---
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/tools/plotter/Cargo.toml b/tools/plotter/Cargo.toml
index 24d5218599..3491f5f029 100644
--- a/tools/plotter/Cargo.toml
+++ b/tools/plotter/Cargo.toml
@@ -1,8 +1,11 @@
 [package]
 name = "sc-plotter-wasm"
-version = "0.1.0"
-authors = ["Hao Hou <haohou302@gmail.com>"]
-edition = "2018"
+version = "0.0.0"
+authors = ["MultiversX <contact@multiversx.com>"]
+license = "GPL-3.0-only"
+repository = "https://github.com/multiversx/mx-sdk-rs"
+description = "Web app for displaying function graphs from the framework"
+edition = "2021"
 publish = false
 
 [lib]
@@ -11,7 +14,6 @@ crate-type=["cdylib"]
 [dependencies]
 plotters = "^0.3.2"
 wasm-bindgen = "0.2.78"
-wee_alloc = "0.4.5"
 web-sys = { version = "0.3.39", features = ["HtmlCanvasElement"] }
 plotters-canvas = "^0.3.0"
 
diff --git a/tools/plotter/src/lib.rs b/tools/plotter/src/lib.rs
index 429c0b8509..0e444acc13 100644
--- a/tools/plotter/src/lib.rs
+++ b/tools/plotter/src/lib.rs
@@ -8,9 +8,6 @@ pub mod plotter_ln_big_uint;
 pub mod plotter_ln_managed_decimal;
 mod plotter_log2_managed_decimal;
 
-#[global_allocator]
-static ALLOC: wee_alloc::WeeAlloc = wee_alloc::WeeAlloc::INIT;
-
 /// Type alias for the result of a drawing function.
 pub type DrawResult<T> = Result<T, Box<dyn std::error::Error>>;
 

From 932bb8697450d5e741f0ccc820b74474e3bc7b3f Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Sat, 6 Jul 2024 17:49:40 +0300
Subject: [PATCH 1086/1254] sc-meta upgrade bugfix

---
 framework/meta/src/folder_structure/relevant_directory.rs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/framework/meta/src/folder_structure/relevant_directory.rs b/framework/meta/src/folder_structure/relevant_directory.rs
index 95a7a3610b..be0c4ce0ac 100644
--- a/framework/meta/src/folder_structure/relevant_directory.rs
+++ b/framework/meta/src/folder_structure/relevant_directory.rs
@@ -12,7 +12,9 @@ use super::version_req::VersionReq;
 pub const FRAMEWORK_CRATE_NAMES: &[&str] = &[
     "multiversx-sc",
     "multiversx-sc-meta",
+    "multiversx-sc-meta-lib",
     "multiversx-sc-scenario",
+    "multiversx-sc-snippets",
     "multiversx-sc-wasm-adapter",
     "multiversx-sc-modules",
     "elrond-wasm",

From 8ab05d3287f6b95ddf1966db36b63b0fd60e977f Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Sat, 6 Jul 2024 17:52:47 +0300
Subject: [PATCH 1087/1254] sc 0.51.1

---
 CHANGELOG.md                                  |  3 +++
 Cargo.lock                                    | 20 +++++++++----------
 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 +-
 .../Cargo.toml                                |  2 +-
 .../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     |  8 ++++----
 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 +-
 .../wasm-alloc-mem-fail/Cargo.toml            |  2 +-
 .../wasm-alloc-mem-leaking/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-legacy/Cargo.toml |  4 ++--
 .../forwarder-legacy/meta/Cargo.toml          |  2 +-
 .../forwarder-legacy/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 +-
 .../exchange-features/Cargo.toml              |  4 ++--
 .../exchange-features/meta/Cargo.toml         |  2 +-
 .../exchange-features/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 +-
 .../feature-tests/scenario-tester/Cargo.toml  |  4 ++--
 .../scenario-tester/meta/Cargo.toml           |  2 +-
 .../scenario-tester/wasm/Cargo.toml           |  2 +-
 contracts/feature-tests/use-module/Cargo.toml |  8 ++++----
 .../feature-tests/use-module/meta/Cargo.toml  |  2 +-
 .../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 ++--
 framework/base/Cargo.toml                     |  4 ++--
 framework/derive/Cargo.toml                   |  2 +-
 framework/meta-lib/Cargo.toml                 |  4 ++--
 framework/meta-lib/src/version_history.rs     |  5 +++--
 framework/meta/Cargo.toml                     |  8 ++++----
 framework/scenario/Cargo.toml                 |  6 +++---
 framework/snippets/Cargo.toml                 |  4 ++--
 framework/wasm-adapter/Cargo.toml             |  4 ++--
 tools/mxpy-snippet-generator/Cargo.toml       |  2 +-
 tools/plotter/Cargo.toml                      |  4 ++--
 tools/rust-debugger/format-tests/Cargo.toml   |  4 ++--
 272 files changed, 403 insertions(+), 399 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f9784661f8..6bc6cc4850 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,6 +26,9 @@ 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.51.1]
+- `sc-meta upgrade` bugfix.
+
 ## [sc 0.51.0, codec 0.20.0, vm 0.9.0, sdk 0.5.0, scenario-format 0.22.3] - 2024-07-06
 - Major refactoring of `multiversx-sc-meta`
 	- Crate `multiversx-sc-meta` split in 2:
diff --git a/Cargo.lock b/Cargo.lock
index f32827e4cd..815470d026 100755
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1921,7 +1921,7 @@ checksum = "b59072fa0624b55ae5ae3fa6bfa91515bbeb4ac440214bc4a509e2c8806d6e9f"
 
 [[package]]
 name = "multiversx-price-aggregator-sc"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "arrayvec",
  "getrandom 0.2.15",
@@ -1942,7 +1942,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "bitflags 2.6.0",
  "hex-literal",
@@ -1974,7 +1974,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -1985,7 +1985,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-meta"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "clap",
  "colored",
@@ -2008,7 +2008,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-meta-lib"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "clap",
  "colored",
@@ -2027,14 +2027,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-scenario"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "base64",
  "bech32",
@@ -2058,7 +2058,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-snippets"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "base64",
  "env_logger",
@@ -2074,7 +2074,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -2106,7 +2106,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-wegld-swap-sc"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
  "multiversx-sc-modules",
diff --git a/contracts/benchmarks/large-storage/Cargo.toml b/contracts/benchmarks/large-storage/Cargo.toml
index c74fd5fa5a..f1e1b7b64e 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.51.0"
+version = "0.51.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../framework/scenario"
diff --git a/contracts/benchmarks/large-storage/meta/Cargo.toml b/contracts/benchmarks/large-storage/meta/Cargo.toml
index dcaabe6ce8..a6a8d9e7aa 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-lib]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/benchmarks/large-storage/wasm/Cargo.toml b/contracts/benchmarks/large-storage/wasm/Cargo.toml
index 54c4ddba1e..c481293914 100644
--- a/contracts/benchmarks/large-storage/wasm/Cargo.toml
+++ b/contracts/benchmarks/large-storage/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.0"
+version = "0.51.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 21a20306ac..e3fcca37fc 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.51.0"
+version = "0.51.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.0"
+version = "0.51.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 85e90230e3..1f18cd76d5 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.51.0"
+version = "0.51.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.0"
+version = "0.51.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 3d1020c0a0..ab3f7debd9 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-lib]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../../framework/meta-lib"
 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 442dc2d7a6..7e1c03fd7c 100644
--- a/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.0"
+version = "0.51.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 b0265f45f1..530bd65318 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.51.0"
+version = "0.51.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.0"
+version = "0.51.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 59f8760108..b723dc821a 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-lib]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.toml b/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.toml
index 4fd2dc49d0..f6bd495169 100644
--- a/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.0"
+version = "0.51.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 3083c7973b..674e0d5032 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.51.0"
+version = "0.51.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.0"
+version = "0.51.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 7bcf5d546b..61b83fa4ea 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-lib]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.toml b/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.toml
index 4a7b9b2c99..4a40181bb3 100644
--- a/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.0"
+version = "0.51.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 b4052987e8..9b1c9851aa 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.51.0"
+version = "0.51.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.0"
+version = "0.51.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 1d6f2ce061..a5f334cbcc 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-lib]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.toml b/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.toml
index 003bb28d9c..80b6514c8e 100644
--- a/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.0"
+version = "0.51.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 16f6322644..42c91c2682 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.51.0"
+version = "0.51.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.0"
+version = "0.51.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 7d45e51b64..883187759a 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-lib]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../../framework/meta-lib"
 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 f69fd76aab..d2bf4ef9d7 100644
--- a/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.0"
+version = "0.51.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 0036dfa75a..636d2f04b9 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.51.0"
+version = "0.51.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.0"
+version = "0.51.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 fc95f6f5d4..33c72948de 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-lib]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.toml b/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.toml
index 802353823b..f1fdaee1f8 100644
--- a/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.0"
+version = "0.51.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 00f4d09b01..fc5b8026b9 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.51.0"
+version = "0.51.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.0"
+version = "0.51.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 e04dbe95f0..482926723c 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-lib]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/benchmarks/send-tx-repeat/wasm/Cargo.toml b/contracts/benchmarks/send-tx-repeat/wasm/Cargo.toml
index 5059d3b610..5fd9d6efee 100644
--- a/contracts/benchmarks/send-tx-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/send-tx-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/str-repeat/Cargo.toml b/contracts/benchmarks/str-repeat/Cargo.toml
index 11450e3e82..be9ea096bb 100644
--- a/contracts/benchmarks/str-repeat/Cargo.toml
+++ b/contracts/benchmarks/str-repeat/Cargo.toml
@@ -12,10 +12,10 @@ path = "src/str_repeat.rs"
 managed-buffer-builder-cached = ["multiversx-sc/managed-buffer-builder-cached"]
 
 [dependencies.multiversx-sc]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../framework/scenario"
diff --git a/contracts/benchmarks/str-repeat/meta/Cargo.toml b/contracts/benchmarks/str-repeat/meta/Cargo.toml
index 024eda533c..99e41cff30 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-lib]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.toml b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.toml
index a502c7a5a3..84b2816ed0 100644
--- a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.toml
+++ b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.toml b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.toml
index fe23c9c146..880de0fd63 100644
--- a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.toml
+++ b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.toml
@@ -29,7 +29,7 @@ path = ".."
 features = ["managed-buffer-builder-cached"]
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/str-repeat/wasm/Cargo.toml b/contracts/benchmarks/str-repeat/wasm/Cargo.toml
index 858b73b5a0..7a887af1de 100644
--- a/contracts/benchmarks/str-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/str-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/core/price-aggregator/Cargo.toml b/contracts/core/price-aggregator/Cargo.toml
index 1bbda8b47a..2d9856ad84 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.51.0"
+version = "0.51.1"
 authors = [
     "Claudiu-Marcel Bruda <claudiu.bruda@multiversx.com>",
     "MultiversX <contact@multiversx.com>",
@@ -19,15 +19,15 @@ edition = "2021"
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../framework/scenario"
 
 [dependencies]
diff --git a/contracts/core/price-aggregator/meta/Cargo.toml b/contracts/core/price-aggregator/meta/Cargo.toml
index 36559f956d..df8b0fd27d 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.51.0"
+version = "0.51.1"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-meta-lib]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/core/price-aggregator/wasm/Cargo.toml b/contracts/core/price-aggregator/wasm/Cargo.toml
index ddbe9a31aa..bd3972ce4b 100644
--- a/contracts/core/price-aggregator/wasm/Cargo.toml
+++ b/contracts/core/price-aggregator/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/core/wegld-swap/Cargo.toml b/contracts/core/wegld-swap/Cargo.toml
index dcb090dc55..da24ab3218 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.51.0"
+version = "0.51.1"
 
 authors = [
     "Dorin Iancu <dorin.iancu@multiversx.com>",
@@ -20,13 +20,13 @@ edition = "2021"
 path = "src/wegld.rs"
 
 [dependencies.multiversx-sc]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../framework/scenario"
diff --git a/contracts/core/wegld-swap/meta/Cargo.toml b/contracts/core/wegld-swap/meta/Cargo.toml
index 0d630ff8ed..5412bdceca 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.51.0"
+version = "0.51.1"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-meta-lib]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/core/wegld-swap/wasm/Cargo.toml b/contracts/core/wegld-swap/wasm/Cargo.toml
index 31fa617add..36108d6fbe 100644
--- a/contracts/core/wegld-swap/wasm/Cargo.toml
+++ b/contracts/core/wegld-swap/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/adder/Cargo.toml b/contracts/examples/adder/Cargo.toml
index fc453469c2..0f3fdd5743 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.51.0"
+version = "0.51.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/adder/interact/Cargo.toml b/contracts/examples/adder/interact/Cargo.toml
index 30e4ca5771..e862b03ba6 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.51.0"
+version = "0.51.1"
 path = "../../../../framework/snippets"
diff --git a/contracts/examples/adder/meta/Cargo.toml b/contracts/examples/adder/meta/Cargo.toml
index df21028219..b847ab37dc 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-lib]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/adder/wasm/Cargo.toml b/contracts/examples/adder/wasm/Cargo.toml
index f9191800d4..5ee83722de 100644
--- a/contracts/examples/adder/wasm/Cargo.toml
+++ b/contracts/examples/adder/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.0"
+version = "0.51.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 2367d81601..983e393373 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.51.0"
+version = "0.51.1"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.0"
+version = "0.51.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 31ad6ebacc..a0de3197f2 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-lib]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/bonding-curve-contract/wasm/Cargo.toml b/contracts/examples/bonding-curve-contract/wasm/Cargo.toml
index 745c600b80..341cb263d2 100644
--- a/contracts/examples/bonding-curve-contract/wasm/Cargo.toml
+++ b/contracts/examples/bonding-curve-contract/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/check-pause/Cargo.toml b/contracts/examples/check-pause/Cargo.toml
index bf42811fe1..30c5dd163e 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.51.0"
+version = "0.51.1"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../framework/scenario"
 
diff --git a/contracts/examples/check-pause/meta/Cargo.toml b/contracts/examples/check-pause/meta/Cargo.toml
index dff75d7999..7e379211bd 100644
--- a/contracts/examples/check-pause/meta/Cargo.toml
+++ b/contracts/examples/check-pause/meta/Cargo.toml
@@ -9,6 +9,6 @@ authors = ["Alin Cruceat <alin.cruceat@multiversx.com>"]
 path = ".."
 
 [dependencies.multiversx-sc-meta-lib]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/check-pause/wasm/Cargo.toml b/contracts/examples/check-pause/wasm/Cargo.toml
index b5785e7cb5..796acc533b 100644
--- a/contracts/examples/check-pause/wasm/Cargo.toml
+++ b/contracts/examples/check-pause/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/crowdfunding-esdt/Cargo.toml b/contracts/examples/crowdfunding-esdt/Cargo.toml
index 821a06cd3d..3b873fb7b5 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.51.0"
+version = "0.51.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.0"
+version = "0.51.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 ecf8dbba83..53c8fc854c 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-lib]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/crowdfunding-esdt/wasm/Cargo.toml b/contracts/examples/crowdfunding-esdt/wasm/Cargo.toml
index 265c88bfdf..d1a35db239 100644
--- a/contracts/examples/crowdfunding-esdt/wasm/Cargo.toml
+++ b/contracts/examples/crowdfunding-esdt/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/crypto-bubbles/Cargo.toml b/contracts/examples/crypto-bubbles/Cargo.toml
index 675874ad90..428963a491 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.51.0"
+version = "0.51.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/crypto-bubbles/meta/Cargo.toml b/contracts/examples/crypto-bubbles/meta/Cargo.toml
index 854958c28b..b07f462d78 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-lib]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/crypto-bubbles/wasm/Cargo.toml b/contracts/examples/crypto-bubbles/wasm/Cargo.toml
index 2c8669df64..d94fe29e5d 100644
--- a/contracts/examples/crypto-bubbles/wasm/Cargo.toml
+++ b/contracts/examples/crypto-bubbles/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.0"
+version = "0.51.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 8b2e101e28..7fb6db9cc4 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.51.0"
+version = "0.51.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 9dbf99179c..4223338861 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.51.0"
+version = "0.51.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 a91c764a70..a245b2db45 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.51.0"
+version = "0.51.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.0"
+version = "0.51.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 7513efeb45..816c4b0017 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-lib]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../../framework/meta-lib"
 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 053be99771..d9190f9070 100644
--- a/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.toml
+++ b/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.0"
+version = "0.51.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 10d61a714d..11026a4a53 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.51.0"
+version = "0.51.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.0"
+version = "0.51.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 4e9a713a35..2c2522d4d8 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-lib]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../../framework/meta-lib"
 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 3354f9d938..40314286d2 100644
--- a/contracts/examples/crypto-kitties/kitty-genetic-alg/wasm/Cargo.toml
+++ b/contracts/examples/crypto-kitties/kitty-genetic-alg/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.0"
+version = "0.51.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 5b0b1a6a35..21d0dd821c 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.51.0"
+version = "0.51.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.0"
+version = "0.51.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 8cd3f2d0cb..6d520d49fd 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-lib]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../../framework/meta-lib"
 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 412e6ba835..cc5ccbff7f 100644
--- a/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.toml
+++ b/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/crypto-zombies/Cargo.toml b/contracts/examples/crypto-zombies/Cargo.toml
index 35d8ac9038..0c92cf2ecb 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.51.0"
+version = "0.51.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/crypto-zombies/meta/Cargo.toml b/contracts/examples/crypto-zombies/meta/Cargo.toml
index 53807156b9..fc8143293e 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-lib]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/crypto-zombies/wasm/Cargo.toml b/contracts/examples/crypto-zombies/wasm/Cargo.toml
index 789007e3c3..2d7958f446 100644
--- a/contracts/examples/crypto-zombies/wasm/Cargo.toml
+++ b/contracts/examples/crypto-zombies/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/digital-cash/Cargo.toml b/contracts/examples/digital-cash/Cargo.toml
index f1ae3d7447..4c62a66396 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.51.0"
+version = "0.51.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/digital-cash/meta/Cargo.toml b/contracts/examples/digital-cash/meta/Cargo.toml
index 9287524d7d..4b0f9128c5 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-lib]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/digital-cash/wasm/Cargo.toml b/contracts/examples/digital-cash/wasm/Cargo.toml
index a8c53cd517..e368089244 100644
--- a/contracts/examples/digital-cash/wasm/Cargo.toml
+++ b/contracts/examples/digital-cash/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/empty/Cargo.toml b/contracts/examples/empty/Cargo.toml
index 68b53214dd..cd673f0026 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.51.0"
+version = "0.51.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../framework/scenario"
 
 [dev-dependencies]
diff --git a/contracts/examples/empty/meta/Cargo.toml b/contracts/examples/empty/meta/Cargo.toml
index 357dac071d..8c1f6f6727 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-lib]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/empty/wasm/Cargo.toml b/contracts/examples/empty/wasm/Cargo.toml
index faf5c39f96..634af62941 100644
--- a/contracts/examples/empty/wasm/Cargo.toml
+++ b/contracts/examples/empty/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.0"
+version = "0.51.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 f6f7f8f1ac..ae690d99ef 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.51.0"
+version = "0.51.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.0"
+version = "0.51.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 49427d53c2..42c1c9316e 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-lib]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../framework/meta-lib"
 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 163fab699f..4a6acde6f2 100644
--- a/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.toml
+++ b/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/factorial/Cargo.toml b/contracts/examples/factorial/Cargo.toml
index a63dbd491f..5f513f24bf 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.51.0"
+version = "0.51.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/factorial/meta/Cargo.toml b/contracts/examples/factorial/meta/Cargo.toml
index ec8e1b9858..396aeccadf 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-lib]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/factorial/wasm/Cargo.toml b/contracts/examples/factorial/wasm/Cargo.toml
index 25b516b170..30f15689b4 100644
--- a/contracts/examples/factorial/wasm/Cargo.toml
+++ b/contracts/examples/factorial/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/fractional-nfts/Cargo.toml b/contracts/examples/fractional-nfts/Cargo.toml
index 2fa0160e30..200b624a33 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.51.0"
+version = "0.51.1"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/fractional-nfts/meta/Cargo.toml b/contracts/examples/fractional-nfts/meta/Cargo.toml
index 969244317c..e8c3c6ade9 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-lib]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/fractional-nfts/wasm/Cargo.toml b/contracts/examples/fractional-nfts/wasm/Cargo.toml
index f10e9ba751..7e767d0182 100644
--- a/contracts/examples/fractional-nfts/wasm/Cargo.toml
+++ b/contracts/examples/fractional-nfts/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/lottery-esdt/Cargo.toml b/contracts/examples/lottery-esdt/Cargo.toml
index 90925b8041..448dd11f8f 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.51.0"
+version = "0.51.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/lottery-esdt/meta/Cargo.toml b/contracts/examples/lottery-esdt/meta/Cargo.toml
index eee91e577d..4c5428a1b5 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-lib]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/lottery-esdt/wasm/Cargo.toml b/contracts/examples/lottery-esdt/wasm/Cargo.toml
index 63f2445f12..4e433cdaec 100644
--- a/contracts/examples/lottery-esdt/wasm/Cargo.toml
+++ b/contracts/examples/lottery-esdt/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/multisig/Cargo.toml b/contracts/examples/multisig/Cargo.toml
index 7cde30f366..f6aa80b3ae 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.51.0"
+version = "0.51.1"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../framework/scenario"
 
 [dev-dependencies.adder]
@@ -27,7 +27,7 @@ path = "../adder"
 path = "../factorial"
 
 [dev-dependencies.multiversx-wegld-swap-sc]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../core/wegld-swap"
 
 [dev-dependencies]
diff --git a/contracts/examples/multisig/interact/Cargo.toml b/contracts/examples/multisig/interact/Cargo.toml
index 862f59a38e..acc0bf34ae 100644
--- a/contracts/examples/multisig/interact/Cargo.toml
+++ b/contracts/examples/multisig/interact/Cargo.toml
@@ -18,17 +18,17 @@ toml = "0.8.6"
 path = ".."
 
 [dependencies.multiversx-sc-modules]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../contracts/modules"
 
 [dependencies.multiversx-sc-snippets]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../framework/snippets"
 
 [dependencies.multiversx-sc-scenario]
-version = "=0.51.0"
+version = "=0.51.1"
 path = "../../../../framework/scenario"
 
 [dependencies.multiversx-sc]
-version = "=0.51.0"
+version = "=0.51.1"
 path = "../../../../framework/base"
diff --git a/contracts/examples/multisig/meta/Cargo.toml b/contracts/examples/multisig/meta/Cargo.toml
index df98ad305f..0f38bf905b 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-lib]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/multisig/wasm-multisig-full/Cargo.toml b/contracts/examples/multisig/wasm-multisig-full/Cargo.toml
index 8d079a5805..c6edfe4418 100644
--- a/contracts/examples/multisig/wasm-multisig-full/Cargo.toml
+++ b/contracts/examples/multisig/wasm-multisig-full/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.0"
+version = "0.51.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 1251ddfaee..a62263192b 100644
--- a/contracts/examples/multisig/wasm-multisig-view/Cargo.toml
+++ b/contracts/examples/multisig/wasm-multisig-view/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/multisig/wasm/Cargo.toml b/contracts/examples/multisig/wasm/Cargo.toml
index 6b26d8ebd2..ecaaf8c44f 100644
--- a/contracts/examples/multisig/wasm/Cargo.toml
+++ b/contracts/examples/multisig/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/nft-minter/Cargo.toml b/contracts/examples/nft-minter/Cargo.toml
index 45ba3468fa..5eec7fa050 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.51.0"
+version = "0.51.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/nft-minter/meta/Cargo.toml b/contracts/examples/nft-minter/meta/Cargo.toml
index 84fb058fd5..9afe18081b 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-lib]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/nft-minter/wasm/Cargo.toml b/contracts/examples/nft-minter/wasm/Cargo.toml
index f2b1430495..c32dac7eeb 100644
--- a/contracts/examples/nft-minter/wasm/Cargo.toml
+++ b/contracts/examples/nft-minter/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.0"
+version = "0.51.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 d1b10a28fb..13ad075a6e 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.51.0"
+version = "0.51.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.0"
+version = "0.51.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 d7111058c2..fe604f7747 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-lib]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/nft-storage-prepay/wasm/Cargo.toml b/contracts/examples/nft-storage-prepay/wasm/Cargo.toml
index 74be8e7dad..a220344bba 100644
--- a/contracts/examples/nft-storage-prepay/wasm/Cargo.toml
+++ b/contracts/examples/nft-storage-prepay/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/nft-subscription/Cargo.toml b/contracts/examples/nft-subscription/Cargo.toml
index 9f02249382..2b205ad97e 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.51.0"
+version = "0.51.1"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/nft-subscription/meta/Cargo.toml b/contracts/examples/nft-subscription/meta/Cargo.toml
index 3d7b33ef67..592e8effc1 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-lib]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/nft-subscription/wasm/Cargo.toml b/contracts/examples/nft-subscription/wasm/Cargo.toml
index 82afc30d12..310c1bdaa0 100644
--- a/contracts/examples/nft-subscription/wasm/Cargo.toml
+++ b/contracts/examples/nft-subscription/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.0"
+version = "0.51.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 a13f3f3f34..d6d16fbf04 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.51.0"
+version = "0.51.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.0"
+version = "0.51.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 22986df76c..0b5af8112f 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-lib]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/order-book/factory/wasm/Cargo.toml b/contracts/examples/order-book/factory/wasm/Cargo.toml
index 47b1d4a548..bf4fd9c0d7 100644
--- a/contracts/examples/order-book/factory/wasm/Cargo.toml
+++ b/contracts/examples/order-book/factory/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.0"
+version = "0.51.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 aef6925e36..9342a1c1dd 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.51.0"
+version = "0.51.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.0"
+version = "0.51.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 0d5667ef4f..85d9ddda80 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-lib]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/order-book/pair/wasm/Cargo.toml b/contracts/examples/order-book/pair/wasm/Cargo.toml
index 3a80f47c2b..d4bb4cf0bb 100644
--- a/contracts/examples/order-book/pair/wasm/Cargo.toml
+++ b/contracts/examples/order-book/pair/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.0"
+version = "0.51.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 d08f9aa0f2..2e3375af52 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.51.0"
+version = "0.51.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.0"
+version = "0.51.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 06c394e2a3..67146b70af 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-lib]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/ping-pong-egld/wasm/Cargo.toml b/contracts/examples/ping-pong-egld/wasm/Cargo.toml
index 0b5a5b95e6..83687c3d59 100644
--- a/contracts/examples/ping-pong-egld/wasm/Cargo.toml
+++ b/contracts/examples/ping-pong-egld/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/proxy-pause/Cargo.toml b/contracts/examples/proxy-pause/Cargo.toml
index c0d794b738..246ee5b4a7 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.51.0"
+version = "0.51.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.0"
+version = "0.51.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 b2263e01ef..9bca86a46c 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-lib]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/proxy-pause/wasm/Cargo.toml b/contracts/examples/proxy-pause/wasm/Cargo.toml
index 18be8e8f26..8c994c7c14 100644
--- a/contracts/examples/proxy-pause/wasm/Cargo.toml
+++ b/contracts/examples/proxy-pause/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/rewards-distribution/Cargo.toml b/contracts/examples/rewards-distribution/Cargo.toml
index 8baf387fdb..fddde77717 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.51.0"
+version = "0.51.1"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/rewards-distribution/meta/Cargo.toml b/contracts/examples/rewards-distribution/meta/Cargo.toml
index be7f278c25..b1e22b9dfb 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 <claudiu.bruda@multiversx.com>"]
 path = ".."
 
 [dependencies.multiversx-sc-meta-lib]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/rewards-distribution/wasm/Cargo.toml b/contracts/examples/rewards-distribution/wasm/Cargo.toml
index 13f3cd87ce..2b3fac1179 100644
--- a/contracts/examples/rewards-distribution/wasm/Cargo.toml
+++ b/contracts/examples/rewards-distribution/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.0"
+version = "0.51.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 0b8941ae05..53876394da 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.51.0"
+version = "0.51.1"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.0"
+version = "0.51.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 39f59bb1de..5a8074c0db 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 <claudiu.bruda@multiversx.com>"]
 path = ".."
 
 [dependencies.multiversx-sc-meta-lib]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/seed-nft-minter/wasm/Cargo.toml b/contracts/examples/seed-nft-minter/wasm/Cargo.toml
index 71850c58f6..340ba97094 100644
--- a/contracts/examples/seed-nft-minter/wasm/Cargo.toml
+++ b/contracts/examples/seed-nft-minter/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/token-release/Cargo.toml b/contracts/examples/token-release/Cargo.toml
index 375fc928f9..c1ba1df21b 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.51.0"
+version = "0.51.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../framework/scenario"
 
diff --git a/contracts/examples/token-release/meta/Cargo.toml b/contracts/examples/token-release/meta/Cargo.toml
index 22060731af..84ac14c44e 100644
--- a/contracts/examples/token-release/meta/Cargo.toml
+++ b/contracts/examples/token-release/meta/Cargo.toml
@@ -10,6 +10,6 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta-lib]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/token-release/wasm/Cargo.toml b/contracts/examples/token-release/wasm/Cargo.toml
index 2299f810dd..7319a42fd4 100644
--- a/contracts/examples/token-release/wasm/Cargo.toml
+++ b/contracts/examples/token-release/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.0"
+version = "0.51.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 54f047a779..027dfac08b 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.51.0"
+version = "0.51.1"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../framework/scenario"
 
 [dev-dependencies.multiversx-sc-meta-lib]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../framework/meta-lib"
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 9671cfc18c..6ae05ee649 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.51.0"
+            "version": "0.51.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 4a7a440c12..42a3f8ce11 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.51.0"
+            "version": "0.51.1"
         }
     },
     "docs": [
diff --git a/contracts/feature-tests/abi-tester/meta/Cargo.toml b/contracts/feature-tests/abi-tester/meta/Cargo.toml
index 49682d7d34..c3c57257c9 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-lib]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../framework/meta-lib"
 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 81f0522f07..fd92c08155 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.0"
+version = "0.51.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 74893a5efb..d971ff25af 100644
--- a/contracts/feature-tests/abi-tester/wasm/Cargo.toml
+++ b/contracts/feature-tests/abi-tester/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.0"
+version = "0.51.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 384fc5867b..2fb244e98a 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.51.0"
+version = "0.51.1"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.0"
+version = "0.51.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 f63dd88442..37bd572058 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-lib]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml
index 64a4a24340..31a01bbbf8 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml
index f0309588b9..108f7716ec 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/alloc-features/wasm/Cargo.toml b/contracts/feature-tests/alloc-features/wasm/Cargo.toml
index d3d69828e8..76acffc2a6 100644
--- a/contracts/feature-tests/alloc-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/alloc-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.0"
+version = "0.51.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 834530f60d..04715b2402 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.51.0"
+version = "0.51.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../framework/scenario"
 
 [dependencies.multiversx-sc-modules]
-version = "0.51.0"
+version = "0.51.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 a688cdcc1d..6dc1db1562 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.51.0"
+version = "0.51.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 1a899c03e0..9c5d8b6082 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-lib]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../framework/meta-lib"
 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 3a1b65988d..403f96a7b2 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.0"
+version = "0.51.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 8f64c7cb27..6dd1bf05c6 100644
--- a/contracts/feature-tests/basic-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/basic-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.0"
+version = "0.51.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 f78e707d58..00a7a2c024 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.51.0"
+version = "0.51.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.0"
+version = "0.51.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 cca1a50cb5..d674c3c06f 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-lib]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../framework/meta-lib"
 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 99e49c3687..8ffb40d870 100644
--- a/contracts/feature-tests/big-float-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/big-float-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/Cargo.toml b/contracts/feature-tests/composability/Cargo.toml
index b69be0c099..cf54680441 100644
--- a/contracts/feature-tests/composability/Cargo.toml
+++ b/contracts/feature-tests/composability/Cargo.toml
@@ -36,9 +36,9 @@ path = "recursive-caller"
 path = "vault"
 
 [dependencies.multiversx-sc]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.0"
+version = "0.51.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 4f524bf026..8197eaf6da 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.51.0"
+version = "0.51.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.0"
+version = "0.51.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 77c05981f6..da228a5cdc 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-lib]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../../framework/meta-lib"
 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 678b4d3c5a..d9f4c711d6 100644
--- a/contracts/feature-tests/composability/builtin-func-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/builtin-func-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.0"
+version = "0.51.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 6954198863..fd0984c4e9 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.51.0"
+version = "0.51.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.0"
+version = "0.51.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 f66cd8d319..2bccace19f 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
@@ -9,10 +9,10 @@ publish = false
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.0"
+version = "0.51.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 4b97108a0a..705aaa8741 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.51.0"
+version = "0.51.1"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta-lib]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../../../framework/meta-lib"
 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 a17b274991..2025e3c0d1 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.0"
+version = "0.51.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 32642881cc..cde9d812c6 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.51.0"
+version = "0.51.1"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.0"
+version = "0.51.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 303908cd50..02c4e2ba98 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.51.0"
+version = "0.51.1"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta-lib]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../../../framework/meta-lib"
 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 2037212cf7..b6b8673282 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.0"
+version = "0.51.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 122ea204c9..61311f8dfe 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.51.0"
+version = "0.51.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.0"
+version = "0.51.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 97b8cbeacb..f051a74c0d 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.51.0"
+version = "0.51.1"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.0"
+version = "0.51.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 95f01a7593..eed44cf899 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.51.0"
+version = "0.51.1"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta-lib]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../../../framework/meta-lib"
 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 069a296ced..8e7920ec51 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.0"
+version = "0.51.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 0d3666cf62..1a0ab6e062 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
@@ -9,10 +9,10 @@ publish = false
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.0"
+version = "0.51.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 240a0100a6..d08583a589 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.51.0"
+version = "0.51.1"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta-lib]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../../../framework/meta-lib"
 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 a040179ae2..f8ca6184d9 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/forwarder-legacy/Cargo.toml b/contracts/feature-tests/composability/forwarder-legacy/Cargo.toml
index bee140793b..de02f008fd 100644
--- a/contracts/feature-tests/composability/forwarder-legacy/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-legacy/Cargo.toml
@@ -12,10 +12,10 @@ path = "src/forwarder_legacy_main.rs"
 path = "../vault"
 
 [dependencies.multiversx-sc]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../framework/scenario"
 
diff --git a/contracts/feature-tests/composability/forwarder-legacy/meta/Cargo.toml b/contracts/feature-tests/composability/forwarder-legacy/meta/Cargo.toml
index 68523610e8..0331d157c9 100644
--- a/contracts/feature-tests/composability/forwarder-legacy/meta/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-legacy/meta/Cargo.toml
@@ -8,6 +8,6 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta-lib]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.toml b/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.toml
index 4658ed0647..8d927291bb 100644
--- a/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.0"
+version = "0.51.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 497b7084c1..3c88f7daab 100644
--- a/contracts/feature-tests/composability/forwarder-queue/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-queue/Cargo.toml
@@ -9,14 +9,14 @@ publish = false
 path = "src/forwarder_queue.rs"
 
 [dependencies.multiversx-sc]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../framework/wasm-adapter"
 optional = true
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.0"
+version = "0.51.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 e02905599b..015a37c837 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-lib]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../../framework/meta-lib"
 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 74e1f3ed96..92f834e35b 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.0"
+version = "0.51.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 8b7df4dbb5..b2f289a628 100644
--- a/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.0"
+version = "0.51.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 5c43737f92..8b34b15bea 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.51.0"
+version = "0.51.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.0"
+version = "0.51.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 069d62803f..e2687540d1 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-lib]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../../framework/meta-lib"
 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 a081c46545..bf42a8c4a5 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.0"
+version = "0.51.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 86ca073c84..65ac4f76de 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.0"
+version = "0.51.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 a1e4d5806c..ab8a1eca27 100644
--- a/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.0"
+version = "0.51.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 6a8dee46d8..1930eb86ee 100644
--- a/contracts/feature-tests/composability/forwarder/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder/Cargo.toml
@@ -9,10 +9,10 @@ publish = false
 path = "src/forwarder_main.rs"
 
 [dependencies.multiversx-sc]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.0"
+version = "0.51.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 8e0d675590..0d47b8c79e 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-lib]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/feature-tests/composability/forwarder/wasm/Cargo.toml b/contracts/feature-tests/composability/forwarder/wasm/Cargo.toml
index cc147ac28b..ecb44f6b93 100644
--- a/contracts/feature-tests/composability/forwarder/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.0"
+version = "0.51.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 85b4839b23..df0d2772c4 100644
--- a/contracts/feature-tests/composability/interact/Cargo.toml
+++ b/contracts/feature-tests/composability/interact/Cargo.toml
@@ -15,9 +15,9 @@ serde = { version = "1.0", features = ["derive"] }
 toml = "0.8.6"
 
 [dependencies.multiversx-sc]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-snippets]
-version = "0.51.0"
+version = "0.51.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 3950858466..c2ca2ebd1a 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.51.0"
+version = "0.51.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.0"
+version = "0.51.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 7e6a707589..21bf169d03 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-lib]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../../framework/meta-lib"
 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 99d415e06d..08d7eee0b1 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.0"
+version = "0.51.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 2d14571e5d..4e862160d3 100644
--- a/contracts/feature-tests/composability/promises-features/Cargo.toml
+++ b/contracts/feature-tests/composability/promises-features/Cargo.toml
@@ -9,6 +9,6 @@ publish = false
 path = "src/promises_main.rs"
 
 [dependencies.multiversx-sc]
-version = "0.51.0"
+version = "0.51.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 aaeda772e8..ab4f449253 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-lib]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../../framework/meta-lib"
 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 b248087c61..95a2739d3e 100644
--- a/contracts/feature-tests/composability/promises-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/promises-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.0"
+version = "0.51.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 37c4acd4fc..60990553f4 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.51.0"
+version = "0.51.1"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.0"
+version = "0.51.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 dbd5af8e24..1424708155 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-lib]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../../framework/meta-lib"
 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 1d77b9f173..7c83b88a91 100644
--- a/contracts/feature-tests/composability/proxy-test-first/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/proxy-test-first/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.0"
+version = "0.51.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 cfa90ae398..a0fa15bb39 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.51.0"
+version = "0.51.1"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.0"
+version = "0.51.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 b75e2c7da7..e70b819767 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-lib]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../../framework/meta-lib"
 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 a5eb59d241..d086a8f40f 100644
--- a/contracts/feature-tests/composability/proxy-test-second/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/proxy-test-second/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.0"
+version = "0.51.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 46aa5fc403..9c1f720a02 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.51.0"
+version = "0.51.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.0"
+version = "0.51.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 64b33e65c8..6a526b4065 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-lib]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../../framework/meta-lib"
 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 1164620014..fea5980e94 100644
--- a/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.0"
+version = "0.51.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 56acfdb34f..b5a381b7bf 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.51.0"
+version = "0.51.1"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.0"
+version = "0.51.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 2d7408d75b..0e7fd744cd 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-lib]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../../framework/meta-lib"
 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 6a3cacb33b..2b9a0f63d3 100644
--- a/contracts/feature-tests/composability/transfer-role-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/transfer-role-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.0"
+version = "0.51.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 175de64ca6..631911bf9d 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.51.0"
+version = "0.51.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.0"
+version = "0.51.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 9e3dcca798..98d4726b18 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-lib]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../../framework/meta-lib"
 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 42d8a8b025..1900fb66bc 100644
--- a/contracts/feature-tests/composability/vault/wasm-vault-promises/Cargo.toml
+++ b/contracts/feature-tests/composability/vault/wasm-vault-promises/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.0"
+version = "0.51.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 37e333b0f8..dbdc855064 100644
--- a/contracts/feature-tests/composability/vault/wasm-vault-upgrade/Cargo.toml
+++ b/contracts/feature-tests/composability/vault/wasm-vault-upgrade/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.0"
+version = "0.51.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 9705891e30..b6ca2d35ac 100644
--- a/contracts/feature-tests/composability/vault/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/vault/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.0"
+version = "0.51.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 9a6e0bb54d..3c8467ece6 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.51.0"
+version = "0.51.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.0"
+version = "0.51.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 0965083960..714f87b95d 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-lib]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../../framework/meta-lib"
 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 9c21976d16..575a8031d5 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.0"
+version = "0.51.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 7c3317c71d..7c4a9ffa5d 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.51.0"
+version = "0.51.1"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.0"
+version = "0.51.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 6f0e5df7de..7e6b6af16d 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-lib]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../../framework/meta-lib"
 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 d8c6141dc0..383b85384d 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.0"
+version = "0.51.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 463fad6bdb..584fab3261 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.51.0"
+version = "0.51.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.0"
+version = "0.51.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 d1726f8b19..c75ffef383 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-lib]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../../framework/meta-lib"
 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 a99d518dd2..4701295f46 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.0"
+version = "0.51.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 ad4ddd64f8..a0219ac17d 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.51.0"
+version = "0.51.1"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.0"
+version = "0.51.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 23b6cb4769..0255b41b48 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-lib]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../../framework/meta-lib"
 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 0273ef819d..28ec5470df 100644
--- a/contracts/feature-tests/erc-style-contracts/erc1155/wasm/Cargo.toml
+++ b/contracts/feature-tests/erc-style-contracts/erc1155/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.0"
+version = "0.51.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 854c36d9b6..4f06ebc730 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.51.0"
+version = "0.51.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.0"
+version = "0.51.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 2e59227df8..2342302dcd 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-lib]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../../framework/meta-lib"
 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 2e4406cce5..a0171c46ae 100644
--- a/contracts/feature-tests/erc-style-contracts/erc20/wasm/Cargo.toml
+++ b/contracts/feature-tests/erc-style-contracts/erc20/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.0"
+version = "0.51.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 e96c4ae32d..ff4794f20d 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.51.0"
+version = "0.51.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.0"
+version = "0.51.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 532bf886fe..7fa687ce05 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-lib]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../../framework/meta-lib"
 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 71e3b63007..896bb4b513 100644
--- a/contracts/feature-tests/erc-style-contracts/erc721/wasm/Cargo.toml
+++ b/contracts/feature-tests/erc-style-contracts/erc721/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.0"
+version = "0.51.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 6df41657df..208dcb0b9b 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.51.0"
+version = "0.51.1"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.0"
+version = "0.51.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 4088857e54..f59e93231a 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-lib]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../../framework/meta-lib"
 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 0ee84f3e03..e5ba4a68f4 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.0"
+version = "0.51.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 597c0e7690..e01b4dbd8c 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.51.0"
+version = "0.51.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.0"
+version = "0.51.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 ea578daf93..96ff4abc99 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-lib]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../framework/meta-lib"
 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 c6854d533f..7c365584aa 100644
--- a/contracts/feature-tests/esdt-system-sc-mock/wasm/Cargo.toml
+++ b/contracts/feature-tests/esdt-system-sc-mock/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/exchange-features/Cargo.toml b/contracts/feature-tests/exchange-features/Cargo.toml
index f4ccbbd9b2..516478a7e8 100644
--- a/contracts/feature-tests/exchange-features/Cargo.toml
+++ b/contracts/feature-tests/exchange-features/Cargo.toml
@@ -9,9 +9,9 @@ publish = false
 path = "src/exchange_features.rs"
 
 [dependencies.multiversx-sc]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../framework/scenario"
diff --git a/contracts/feature-tests/exchange-features/meta/Cargo.toml b/contracts/feature-tests/exchange-features/meta/Cargo.toml
index b3bd5f180f..a9710c9ce0 100644
--- a/contracts/feature-tests/exchange-features/meta/Cargo.toml
+++ b/contracts/feature-tests/exchange-features/meta/Cargo.toml
@@ -8,6 +8,6 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta-lib]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/feature-tests/exchange-features/wasm/Cargo.toml b/contracts/feature-tests/exchange-features/wasm/Cargo.toml
index b59aeec8a7..34f85546f2 100644
--- a/contracts/feature-tests/exchange-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/exchange-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.0"
+version = "0.51.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 d1494e4b43..ae3b5535bd 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.51.0"
+version = "0.51.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.0"
+version = "0.51.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 13b941701d..65a87a025c 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-lib]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../framework/meta-lib"
 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 1c3d09ec68..33c4f5c1ef 100644
--- a/contracts/feature-tests/formatted-message-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/formatted-message-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.0"
+version = "0.51.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 88a386f0bc..5aff14387a 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.51.0"
+version = "0.51.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.0"
+version = "0.51.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 9fee7a2786..139586e372 100644
--- a/contracts/feature-tests/managed-map-features/meta/Cargo.toml
+++ b/contracts/feature-tests/managed-map-features/meta/Cargo.toml
@@ -9,6 +9,6 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta-lib]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../framework/meta-lib"
 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 a4d93cb396..33365ece0e 100644
--- a/contracts/feature-tests/managed-map-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/managed-map-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.0"
+version = "0.51.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 0386e89334..f41a171611 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.51.0"
+version = "0.51.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.0"
+version = "0.51.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 95f1937518..c9fe2270e0 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-lib]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../framework/meta-lib"
 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 dba0a0db3e..4e642bc0b9 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.0"
+version = "0.51.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 7f368e2af6..967c66df5b 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
@@ -29,7 +29,7 @@ path = ".."
 features = ["example_feature"]
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.0"
+version = "0.51.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 05518af856..2f3e9dd146 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.0"
+version = "0.51.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 0185609641..fb58d28f14 100644
--- a/contracts/feature-tests/multi-contract-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/multi-contract-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.0"
+version = "0.51.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 272c2b10b0..c4cb6c2c06 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.51.0"
+version = "0.51.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.0"
+version = "0.51.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 e14a355466..a4cb376679 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-lib]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../framework/meta-lib"
 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 73edd1e1d8..5324f83a9b 100644
--- a/contracts/feature-tests/panic-message-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/panic-message-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.0"
+version = "0.51.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 98c70f2e5c..a24d50e80d 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.51.0"
+version = "0.51.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.0"
+version = "0.51.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 4d14213fe9..f0a206cee2 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-lib]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/feature-tests/payable-features/wasm/Cargo.toml b/contracts/feature-tests/payable-features/wasm/Cargo.toml
index 8c8eb30df5..21b2072b7c 100644
--- a/contracts/feature-tests/payable-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/payable-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.0"
+version = "0.51.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 af8c9b990c..8d242d0e31 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.51.0"
+version = "0.51.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.0"
+version = "0.51.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 31c8f7cdc0..036a714c83 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.51.0"
+version = "0.51.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 6e5a84f262..b290e9d57d 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-lib]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../framework/meta-lib"
 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 92c30712ad..c5febca410 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 interactor snippets manually to add relative paths:
 // [dependencies.multiversx-sc-snippets]
-// version = "0.51.0"
+// version = "0.51.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 1df19dbcd4..0247b7869d 100644
--- a/contracts/feature-tests/rust-snippets-generator-test/wasm/Cargo.toml
+++ b/contracts/feature-tests/rust-snippets-generator-test/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.0"
+version = "0.51.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 7b7080c1a8..28a6da23b1 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.51.0"
+version = "0.51.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.51.0"
+version = "0.51.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 f71dab5d37..d2a49226e1 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-lib]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../framework/meta-lib"
 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 49319a4367..ba9651a53d 100644
--- a/contracts/feature-tests/rust-testing-framework-tester/wasm/Cargo.toml
+++ b/contracts/feature-tests/rust-testing-framework-tester/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/scenario-tester/Cargo.toml b/contracts/feature-tests/scenario-tester/Cargo.toml
index f9db83e843..7fd5cda7d5 100644
--- a/contracts/feature-tests/scenario-tester/Cargo.toml
+++ b/contracts/feature-tests/scenario-tester/Cargo.toml
@@ -9,9 +9,9 @@ publish = false
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../framework/scenario"
diff --git a/contracts/feature-tests/scenario-tester/meta/Cargo.toml b/contracts/feature-tests/scenario-tester/meta/Cargo.toml
index 4df5f9cdbe..3209371e04 100644
--- a/contracts/feature-tests/scenario-tester/meta/Cargo.toml
+++ b/contracts/feature-tests/scenario-tester/meta/Cargo.toml
@@ -8,6 +8,6 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta-lib]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/feature-tests/scenario-tester/wasm/Cargo.toml b/contracts/feature-tests/scenario-tester/wasm/Cargo.toml
index 329a68dfc5..ab4c5b5871 100644
--- a/contracts/feature-tests/scenario-tester/wasm/Cargo.toml
+++ b/contracts/feature-tests/scenario-tester/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.0"
+version = "0.51.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 83e3426269..38db8b86c2 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.51.0"
+version = "0.51.1"
 path = "../../../contracts/modules"
 
 [dependencies.multiversx-sc]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../framework/scenario"
 
 [dev-dependencies.multiversx-sc-meta-lib]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../framework/meta-lib"
diff --git a/contracts/feature-tests/use-module/meta/Cargo.toml b/contracts/feature-tests/use-module/meta/Cargo.toml
index ee26346944..fce4cb0dca 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-lib]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../framework/meta-lib"
 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 25385d393b..79ae1aeba2 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.51.0"
+            "version": "0.51.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 25db13bb97..d2481bb18c 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.51.0"
+            "version": "0.51.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 ded11a349e..bbceea054f 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.0"
+version = "0.51.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 ceffec4031..01344d8430 100644
--- a/contracts/feature-tests/use-module/wasm/Cargo.toml
+++ b/contracts/feature-tests/use-module/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/modules/Cargo.toml b/contracts/modules/Cargo.toml
index b63a183fde..47f47da038 100644
--- a/contracts/modules/Cargo.toml
+++ b/contracts/modules/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-modules"
-version = "0.51.0"
+version = "0.51.1"
 edition = "2021"
 
 authors = ["MultiversX <contact@multiversx.com>"]
@@ -17,5 +17,5 @@ categories = ["no-std", "wasm", "cryptography::cryptocurrencies"]
 alloc = ["multiversx-sc/alloc"]
 
 [dependencies.multiversx-sc]
-version = "0.51.0"
+version = "0.51.1"
 path = "../../framework/base"
diff --git a/framework/base/Cargo.toml b/framework/base/Cargo.toml
index 0d2e725988..a53034d882 100644
--- a/framework/base/Cargo.toml
+++ b/framework/base/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc"
-version = "0.51.0"
+version = "0.51.1"
 edition = "2021"
 rust-version = "1.78"
 
@@ -30,7 +30,7 @@ num-traits = { version = "=0.2.19", default-features = false }
 unwrap-infallible = "0.1.5"
 
 [dependencies.multiversx-sc-derive]
-version = "=0.51.0"
+version = "=0.51.1"
 path = "../derive"
 
 [dependencies.multiversx-sc-codec]
diff --git a/framework/derive/Cargo.toml b/framework/derive/Cargo.toml
index fbd00553d8..8614624e7c 100644
--- a/framework/derive/Cargo.toml
+++ b/framework/derive/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-derive"
-version = "0.51.0"
+version = "0.51.1"
 edition = "2021"
 
 authors = ["Andrei Marinica <andrei.marinica@multiversx.com>", "MultiversX <contact@multiversx.com>"]
diff --git a/framework/meta-lib/Cargo.toml b/framework/meta-lib/Cargo.toml
index 507620af1b..6515883af0 100644
--- a/framework/meta-lib/Cargo.toml
+++ b/framework/meta-lib/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-meta-lib"
-version = "0.51.0"
+version = "0.51.1"
 edition = "2021"
 
 authors = [
@@ -31,6 +31,6 @@ wasmprinter = "0.212"
 semver = "1.0.20"
 
 [dependencies.multiversx-sc]
-version = "=0.51.0"
+version = "=0.51.1"
 path = "../base"
 features = ["alloc", "num-bigint"]
diff --git a/framework/meta-lib/src/version_history.rs b/framework/meta-lib/src/version_history.rs
index 3faeca3878..bfdaf6bf2b 100644
--- a/framework/meta-lib/src/version_history.rs
+++ b/framework/meta-lib/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.51.0);
+pub const LAST_VERSION: FrameworkVersion = framework_version!(0.51.1);
 
 /// Indicates where to stop with the upgrades.
 pub const LAST_UPGRADE_VERSION: FrameworkVersion = LAST_VERSION;
@@ -77,6 +77,7 @@ pub const VERSIONS: &[FrameworkVersion] = framework_versions![
     0.50.5,
     0.50.6,
     0.51.0,
+    0.51.1,
 ];
 
 #[rustfmt::skip]
@@ -101,7 +102,7 @@ pub const CHECK_AFTER_UPGRADE_TO: &[FrameworkVersion] = framework_versions![
     0.47.0,
     0.49.0,
     0.50.6,
-    0.51.0,
+    0.51.1,
 ];
 
 pub const LOWER_VERSION_WITH_TEMPLATE_TAG: FrameworkVersion = framework_version!(0.43.0);
diff --git a/framework/meta/Cargo.toml b/framework/meta/Cargo.toml
index 11976c47be..36e91de06d 100644
--- a/framework/meta/Cargo.toml
+++ b/framework/meta/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-meta"
-version = "0.51.0"
+version = "0.51.1"
 edition = "2021"
 
 authors = [
@@ -41,14 +41,14 @@ pathdiff = "0.2.1"
 common-path = "1.0.0" 
 
 [dependencies.multiversx-sc-meta-lib]
-version = "=0.51.0"
+version = "=0.51.1"
 path = "../meta-lib"
 
 [dependencies.multiversx-sc]
-version = "=0.51.0"
+version = "=0.51.1"
 path = "../base"
 features = ["alloc", "num-bigint"]
 
 [dependencies.multiversx-sc-snippets]
-version = "=0.51.0"
+version = "=0.51.1"
 path = "../snippets"
diff --git a/framework/scenario/Cargo.toml b/framework/scenario/Cargo.toml
index 41059c4427..e58e6d9255 100644
--- a/framework/scenario/Cargo.toml
+++ b/framework/scenario/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-scenario"
-version = "0.51.0"
+version = "0.51.1"
 edition = "2021"
 
 authors = [
@@ -37,12 +37,12 @@ wasm-incopatible = ["multiversx-chain-vm/wasm-incopatible"]
 run-go-tests = []
 
 [dependencies.multiversx-sc]
-version = "=0.51.0"
+version = "=0.51.1"
 features = ["alloc", "num-bigint"]
 path = "../base"
 
 [dependencies.multiversx-sc-meta-lib]
-version = "=0.51.0"
+version = "=0.51.1"
 path = "../meta-lib"
 
 [dependencies.multiversx-chain-scenario-format]
diff --git a/framework/snippets/Cargo.toml b/framework/snippets/Cargo.toml
index c67e6e46e8..d5a9f46dea 100644
--- a/framework/snippets/Cargo.toml
+++ b/framework/snippets/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-snippets"
-version = "0.51.0"
+version = "0.51.1"
 edition = "2021"
 
 authors = ["MultiversX <contact@multiversx.com>"]
@@ -22,7 +22,7 @@ env_logger = "0.11"
 futures = "0.3"
 
 [dependencies.multiversx-sc-scenario]
-version = "=0.51.0"
+version = "=0.51.1"
 path = "../scenario"
 
 [dependencies.multiversx-chain-scenario-format]
diff --git a/framework/wasm-adapter/Cargo.toml b/framework/wasm-adapter/Cargo.toml
index 33bbf54a0d..818e195f8c 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.51.0"
+version = "0.51.1"
 edition = "2021"
 
 authors = [
@@ -22,5 +22,5 @@ categories = [
 ]
 
 [dependencies.multiversx-sc]
-version = "=0.51.0"
+version = "=0.51.1"
 path = "../base"
diff --git a/tools/mxpy-snippet-generator/Cargo.toml b/tools/mxpy-snippet-generator/Cargo.toml
index c60220d601..95b4de29fb 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.51.0"
+version = "0.51.1"
 path = "../../framework/base"
 
 [dependencies]
diff --git a/tools/plotter/Cargo.toml b/tools/plotter/Cargo.toml
index 3491f5f029..0374e0184b 100644
--- a/tools/plotter/Cargo.toml
+++ b/tools/plotter/Cargo.toml
@@ -21,11 +21,11 @@ plotters-canvas = "^0.3.0"
 lto = true
 
 [dependencies.multiversx-sc]
-version = "=0.51.0"
+version = "=0.51.1"
 path = "../../framework/base"
 
 [dependencies.multiversx-sc-scenario]
-version = "=0.51.0"
+version = "=0.51.1"
 path = "../../framework/scenario"
 default-features = false
 
diff --git a/tools/rust-debugger/format-tests/Cargo.toml b/tools/rust-debugger/format-tests/Cargo.toml
index 4bacc707c9..2f070058da 100644
--- a/tools/rust-debugger/format-tests/Cargo.toml
+++ b/tools/rust-debugger/format-tests/Cargo.toml
@@ -9,11 +9,11 @@ name = "format-tests"
 path = "src/format_tests.rs"
 
 [dependencies.multiversx-sc]
-version = "=0.51.0"
+version = "=0.51.1"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-scenario]
-version = "=0.51.0"
+version = "=0.51.1"
 path = "../../../framework/scenario"
 
 [dependencies.multiversx-chain-vm]

From 4a4dfae7dd8aac58e08cb21b7196834ab1bd5bef Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Sat, 6 Jul 2024 18:22:34 +0300
Subject: [PATCH 1088/1254] Cargo.lock

---
 contracts/benchmarks/large-storage/wasm/Cargo.lock     |  6 +++---
 .../mappers/linked-list-repeat/wasm/Cargo.lock         |  6 +++---
 .../benchmarks/mappers/map-repeat/wasm/Cargo.lock      |  6 +++---
 .../benchmarks/mappers/queue-repeat/wasm/Cargo.lock    |  6 +++---
 .../benchmarks/mappers/set-repeat/wasm/Cargo.lock      |  6 +++---
 .../mappers/single-value-repeat/wasm/Cargo.lock        |  6 +++---
 .../benchmarks/mappers/vec-repeat/wasm/Cargo.lock      |  6 +++---
 contracts/benchmarks/send-tx-repeat/wasm/Cargo.lock    |  6 +++---
 .../wasm-str-repeat-mb-builder-basic/Cargo.lock        |  6 +++---
 .../wasm-str-repeat-mb-builder-cached/Cargo.lock       |  6 +++---
 contracts/benchmarks/str-repeat/wasm/Cargo.lock        |  6 +++---
 contracts/core/price-aggregator/wasm/Cargo.lock        | 10 +++++-----
 contracts/examples/adder/wasm/Cargo.lock               |  6 +++---
 .../examples/bonding-curve-contract/wasm/Cargo.lock    |  8 ++++----
 contracts/examples/check-pause/wasm/Cargo.lock         |  8 ++++----
 contracts/examples/crowdfunding-esdt/wasm/Cargo.lock   |  6 +++---
 contracts/examples/crypto-bubbles/wasm/Cargo.lock      |  6 +++---
 .../crypto-kitties/kitty-auction/wasm/Cargo.lock       |  6 +++---
 .../crypto-kitties/kitty-genetic-alg/wasm/Cargo.lock   |  6 +++---
 .../crypto-kitties/kitty-ownership/wasm/Cargo.lock     |  6 +++---
 contracts/examples/crypto-zombies/wasm/Cargo.lock      |  6 +++---
 contracts/examples/digital-cash/wasm/Cargo.lock        |  6 +++---
 contracts/examples/empty/wasm/Cargo.lock               |  6 +++---
 .../examples/esdt-transfer-with-fee/wasm/Cargo.lock    |  6 +++---
 contracts/examples/factorial/wasm/Cargo.lock           |  6 +++---
 contracts/examples/fractional-nfts/wasm/Cargo.lock     |  8 ++++----
 contracts/examples/lottery-esdt/wasm/Cargo.lock        |  6 +++---
 .../examples/multisig/wasm-multisig-full/Cargo.lock    |  8 ++++----
 .../examples/multisig/wasm-multisig-view/Cargo.lock    |  8 ++++----
 contracts/examples/multisig/wasm/Cargo.lock            |  8 ++++----
 contracts/examples/nft-minter/wasm/Cargo.lock          |  6 +++---
 contracts/examples/nft-storage-prepay/wasm/Cargo.lock  |  6 +++---
 contracts/examples/nft-subscription/wasm/Cargo.lock    |  8 ++++----
 contracts/examples/order-book/factory/wasm/Cargo.lock  |  6 +++---
 contracts/examples/order-book/pair/wasm/Cargo.lock     |  6 +++---
 contracts/examples/ping-pong-egld/wasm/Cargo.lock      |  6 +++---
 contracts/examples/proxy-pause/wasm/Cargo.lock         |  6 +++---
 .../examples/rewards-distribution/wasm/Cargo.lock      |  8 ++++----
 contracts/examples/seed-nft-minter/wasm/Cargo.lock     |  8 ++++----
 contracts/examples/token-release/wasm/Cargo.lock       |  6 +++---
 .../abi-tester/wasm-abi-tester-ev/Cargo.lock           |  6 +++---
 contracts/feature-tests/abi-tester/wasm/Cargo.lock     |  6 +++---
 .../alloc-features/wasm-alloc-mem-fail/Cargo.lock      |  6 +++---
 .../alloc-features/wasm-alloc-mem-leaking/Cargo.lock   |  6 +++---
 contracts/feature-tests/alloc-features/wasm/Cargo.lock |  6 +++---
 .../wasm-basic-features-storage-bytes/Cargo.lock       |  8 ++++----
 contracts/feature-tests/basic-features/wasm/Cargo.lock |  8 ++++----
 .../feature-tests/big-float-features/wasm/Cargo.lock   |  6 +++---
 .../builtin-func-features/wasm/Cargo.lock              |  6 +++---
 .../esdt-contract-pair/first-contract/wasm/Cargo.lock  |  6 +++---
 .../esdt-contract-pair/second-contract/wasm/Cargo.lock |  6 +++---
 .../child/wasm/Cargo.lock                              |  6 +++---
 .../parent/wasm/Cargo.lock                             |  6 +++---
 .../composability/forwarder-legacy/wasm/Cargo.lock     |  6 +++---
 .../wasm-forwarder-queue-promises/Cargo.lock           |  6 +++---
 .../composability/forwarder-queue/wasm/Cargo.lock      |  6 +++---
 .../wasm-forwarder-raw-init-async-call/Cargo.lock      |  6 +++---
 .../wasm-forwarder-raw-init-sync-call/Cargo.lock       |  6 +++---
 .../composability/forwarder-raw/wasm/Cargo.lock        |  6 +++---
 .../composability/forwarder/wasm/Cargo.lock            |  6 +++---
 .../composability/local-esdt-and-nft/wasm/Cargo.lock   |  6 +++---
 .../composability/promises-features/wasm/Cargo.lock    |  6 +++---
 .../composability/proxy-test-first/wasm/Cargo.lock     |  6 +++---
 .../composability/proxy-test-second/wasm/Cargo.lock    |  6 +++---
 .../composability/recursive-caller/wasm/Cargo.lock     |  6 +++---
 .../transfer-role-features/wasm/Cargo.lock             |  8 ++++----
 .../composability/vault/wasm-vault-promises/Cargo.lock |  6 +++---
 .../composability/vault/wasm-vault-upgrade/Cargo.lock  |  6 +++---
 .../feature-tests/composability/vault/wasm/Cargo.lock  |  6 +++---
 .../crowdfunding-erc20/wasm/Cargo.lock                 |  6 +++---
 .../erc1155-marketplace/wasm/Cargo.lock                |  6 +++---
 .../erc1155-user-mock/wasm/Cargo.lock                  |  6 +++---
 .../erc-style-contracts/erc1155/wasm/Cargo.lock        |  6 +++---
 .../erc-style-contracts/erc20/wasm/Cargo.lock          |  6 +++---
 .../erc-style-contracts/erc721/wasm/Cargo.lock         |  6 +++---
 .../erc-style-contracts/lottery-erc20/wasm/Cargo.lock  |  6 +++---
 .../feature-tests/esdt-system-sc-mock/wasm/Cargo.lock  |  6 +++---
 .../feature-tests/exchange-features/wasm/Cargo.lock    |  6 +++---
 .../formatted-message-features/wasm/Cargo.lock         |  6 +++---
 .../feature-tests/managed-map-features/wasm/Cargo.lock |  6 +++---
 .../wasm-multi-contract-alt-impl/Cargo.lock            |  6 +++---
 .../wasm-multi-contract-example-feature/Cargo.lock     |  6 +++---
 .../wasm-multi-contract-features-view/Cargo.lock       |  6 +++---
 .../multi-contract-features/wasm/Cargo.lock            |  6 +++---
 .../panic-message-features/wasm/Cargo.lock             |  6 +++---
 .../feature-tests/payable-features/wasm/Cargo.lock     |  6 +++---
 .../rust-snippets-generator-test/wasm/Cargo.lock       |  6 +++---
 .../rust-testing-framework-tester/wasm/Cargo.lock      |  6 +++---
 .../feature-tests/scenario-tester/wasm/Cargo.lock      |  6 +++---
 .../use-module/wasm-use-module-view/Cargo.lock         |  8 ++++----
 contracts/feature-tests/use-module/wasm/Cargo.lock     |  8 ++++----
 91 files changed, 289 insertions(+), 289 deletions(-)

diff --git a/contracts/benchmarks/large-storage/wasm/Cargo.lock b/contracts/benchmarks/large-storage/wasm/Cargo.lock
index 04c0a1ab96..289ec8cd46 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.51.0"
+version = "0.51.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.lock
index 45dede59e4..c5198ccc73 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.51.0"
+version = "0.51.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.lock
index fa6c130fa2..af149a9b16 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.51.0"
+version = "0.51.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.lock
index 197e07354d..149c26607d 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.51.0"
+version = "0.51.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -78,7 +78,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -89,7 +89,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.lock
index ed7f385f98..17ba237632 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.51.0"
+version = "0.51.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -78,7 +78,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -89,7 +89,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.lock
index 84c12b4ca9..28d2099883 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.51.0"
+version = "0.51.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -78,7 +78,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -89,7 +89,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.lock
index 863e56d32f..5266d763ec 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.51.0"
+version = "0.51.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -78,7 +78,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -89,7 +89,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/send-tx-repeat/wasm/Cargo.lock b/contracts/benchmarks/send-tx-repeat/wasm/Cargo.lock
index 5ee4f7f305..b001662f23 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.51.0"
+version = "0.51.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.lock b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.lock
index 226cbdbc24..7364f1bf68 100644
--- a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.lock
+++ b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.lock
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.lock b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.lock
index d8a992b6dc..c26f218b0e 100644
--- a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.lock
+++ b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.lock
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/str-repeat/wasm/Cargo.lock b/contracts/benchmarks/str-repeat/wasm/Cargo.lock
index 468d04c7ff..fa214167b3 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.51.0"
+version = "0.51.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/core/price-aggregator/wasm/Cargo.lock b/contracts/core/price-aggregator/wasm/Cargo.lock
index 0abf58f758..83b9347247 100644
--- a/contracts/core/price-aggregator/wasm/Cargo.lock
+++ b/contracts/core/price-aggregator/wasm/Cargo.lock
@@ -86,7 +86,7 @@ checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
 
 [[package]]
 name = "multiversx-price-aggregator-sc"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "arrayvec",
  "getrandom",
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -136,7 +136,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -147,14 +147,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/adder/wasm/Cargo.lock b/contracts/examples/adder/wasm/Cargo.lock
index 88019497dd..c044098158 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.51.0"
+version = "0.51.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/bonding-curve-contract/wasm/Cargo.lock b/contracts/examples/bonding-curve-contract/wasm/Cargo.lock
index f37db4aef6..72019eb4d6 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.51.0"
+version = "0.51.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/check-pause/wasm/Cargo.lock b/contracts/examples/check-pause/wasm/Cargo.lock
index ee4df1a324..65d730f928 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.51.0"
+version = "0.51.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crowdfunding-esdt/wasm/Cargo.lock b/contracts/examples/crowdfunding-esdt/wasm/Cargo.lock
index fdbb3a83f8..e9b1cc12e6 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.51.0"
+version = "0.51.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crypto-bubbles/wasm/Cargo.lock b/contracts/examples/crypto-bubbles/wasm/Cargo.lock
index a84293799e..e8d054972a 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.51.0"
+version = "0.51.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.lock b/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.lock
index 4170dba9b3..d94014f05b 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.51.0"
+version = "0.51.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -115,7 +115,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -126,7 +126,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]
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 77261e0d12..e24409f268 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.51.0"
+version = "0.51.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -96,7 +96,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -107,7 +107,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.lock b/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.lock
index 60ea8ac088..95f512b3ba 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.51.0"
+version = "0.51.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -106,7 +106,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -117,7 +117,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crypto-zombies/wasm/Cargo.lock b/contracts/examples/crypto-zombies/wasm/Cargo.lock
index 5d7e68b664..2f7faf40a1 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.51.0"
+version = "0.51.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/digital-cash/wasm/Cargo.lock b/contracts/examples/digital-cash/wasm/Cargo.lock
index d613419e19..8f41169038 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.51.0"
+version = "0.51.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/empty/wasm/Cargo.lock b/contracts/examples/empty/wasm/Cargo.lock
index 89dc50a770..7cd912320b 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.51.0"
+version = "0.51.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.lock b/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.lock
index de07396ec5..dc97b10736 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.51.0"
+version = "0.51.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/factorial/wasm/Cargo.lock b/contracts/examples/factorial/wasm/Cargo.lock
index 5b63c44805..fd2f46732e 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.51.0"
+version = "0.51.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/fractional-nfts/wasm/Cargo.lock b/contracts/examples/fractional-nfts/wasm/Cargo.lock
index 188aab45ed..95c1776157 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.51.0"
+version = "0.51.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/lottery-esdt/wasm/Cargo.lock b/contracts/examples/lottery-esdt/wasm/Cargo.lock
index e1f6bb22e8..99996e1c51 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.51.0"
+version = "0.51.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/multisig/wasm-multisig-full/Cargo.lock b/contracts/examples/multisig/wasm-multisig-full/Cargo.lock
index 5294ec6930..fe4cb87bcd 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.51.0"
+version = "0.51.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/multisig/wasm-multisig-view/Cargo.lock b/contracts/examples/multisig/wasm-multisig-view/Cargo.lock
index 53c0e6e23c..509b478684 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.51.0"
+version = "0.51.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/multisig/wasm/Cargo.lock b/contracts/examples/multisig/wasm/Cargo.lock
index 87d78445bc..ea949b64f6 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.51.0"
+version = "0.51.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/nft-minter/wasm/Cargo.lock b/contracts/examples/nft-minter/wasm/Cargo.lock
index eb85d2109f..616b5aed2e 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.51.0"
+version = "0.51.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/nft-storage-prepay/wasm/Cargo.lock b/contracts/examples/nft-storage-prepay/wasm/Cargo.lock
index 9d129d80cb..e876048d71 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.51.0"
+version = "0.51.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/nft-subscription/wasm/Cargo.lock b/contracts/examples/nft-subscription/wasm/Cargo.lock
index cb826d735c..e9f75e7859 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.51.0"
+version = "0.51.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,14 +82,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/order-book/factory/wasm/Cargo.lock b/contracts/examples/order-book/factory/wasm/Cargo.lock
index 4c79ffa7d7..b8dc4385d2 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.51.0"
+version = "0.51.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/order-book/pair/wasm/Cargo.lock b/contracts/examples/order-book/pair/wasm/Cargo.lock
index 6c98fb09a3..c1a86a1be9 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.51.0"
+version = "0.51.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/ping-pong-egld/wasm/Cargo.lock b/contracts/examples/ping-pong-egld/wasm/Cargo.lock
index cda45c2288..085e3662e3 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.51.0"
+version = "0.51.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/proxy-pause/wasm/Cargo.lock b/contracts/examples/proxy-pause/wasm/Cargo.lock
index 3a3056e317..d33e8125d2 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.51.0"
+version = "0.51.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/rewards-distribution/wasm/Cargo.lock b/contracts/examples/rewards-distribution/wasm/Cargo.lock
index d3f04201c2..990bc12932 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.51.0"
+version = "0.51.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,14 +82,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/seed-nft-minter/wasm/Cargo.lock b/contracts/examples/seed-nft-minter/wasm/Cargo.lock
index 369fcb743d..3c8deb8654 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.51.0"
+version = "0.51.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,14 +82,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/token-release/wasm/Cargo.lock b/contracts/examples/token-release/wasm/Cargo.lock
index 5914e7f005..cd23f828b3 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.51.0"
+version = "0.51.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]
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 d66aa4dbb2..2c9d65190d 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.51.0"
+version = "0.51.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/abi-tester/wasm/Cargo.lock b/contracts/feature-tests/abi-tester/wasm/Cargo.lock
index b8863b44cd..4a3e94486a 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.51.0"
+version = "0.51.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock
index eb3581ce3d..2104e47dde 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.lock b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.lock
index be94662981..bb33f7394d 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.lock
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.lock
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/alloc-features/wasm/Cargo.lock b/contracts/feature-tests/alloc-features/wasm/Cargo.lock
index 95719e393d..d9238591c2 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.51.0"
+version = "0.51.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]
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 70a4eb7447..d3ab9a5d9f 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.51.0"
+version = "0.51.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/basic-features/wasm/Cargo.lock b/contracts/feature-tests/basic-features/wasm/Cargo.lock
index 15cb1a5de8..8b9658c1b8 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.51.0"
+version = "0.51.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/big-float-features/wasm/Cargo.lock b/contracts/feature-tests/big-float-features/wasm/Cargo.lock
index 42ca27ee50..6f51586dd7 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.51.0"
+version = "0.51.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]
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 42990a7441..a2279cf230 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.51.0"
+version = "0.51.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]
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 2706ab3150..e1d31441ff 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.51.0"
+version = "0.51.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]
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 79848c23ce..a8c1ad081e 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.51.0"
+version = "0.51.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]
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 375ad2cf7e..85f858f40f 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.51.0"
+version = "0.51.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]
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 3c108fc749..282d1eff69 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
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.lock
index 8cd7e8f3e0..3bf098bca1 100644
--- a/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.lock
@@ -56,7 +56,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,7 +98,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]
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 c11a1da90f..f165aec8b9 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
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock
index 6ee4ab7525..159fb90778 100644
--- a/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]
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 dd0a6d2a6d..d07f3bf3ba 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.51.0"
+version = "0.51.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]
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 3567ed295d..9c91d7fbf3 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.51.0"
+version = "0.51.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.lock
index 19063f5333..ddc103714b 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.51.0"
+version = "0.51.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock
index 16039f2d73..67933f7341 100755
--- a/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]
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 fa1286595b..2c0fd72625 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.51.0"
+version = "0.51.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/promises-features/wasm/Cargo.lock b/contracts/feature-tests/composability/promises-features/wasm/Cargo.lock
index 7356da305c..65b8badeb6 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.51.0"
+version = "0.51.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]
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 67c59d01d1..80ec4f9ee4 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.51.0"
+version = "0.51.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]
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 39f12ba527..56e1500a4e 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.51.0"
+version = "0.51.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.lock b/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.lock
index 9072eb09b5..2e8687c2e2 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.51.0"
+version = "0.51.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]
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 d3d4e5240c..9d65ed4026 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.51.0"
+version = "0.51.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,14 +82,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]
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 07a2d01add..0d531dee23 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.51.0"
+version = "0.51.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]
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 dfed80941a..2805363f4e 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.51.0"
+version = "0.51.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/vault/wasm/Cargo.lock b/contracts/feature-tests/composability/vault/wasm/Cargo.lock
index 44b9f8d3c4..4b3f047c95 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.51.0"
+version = "0.51.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]
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 98489db791..6422530890 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.51.0"
+version = "0.51.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]
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 0ee3b0097c..f628973543 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.51.0"
+version = "0.51.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]
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 80bad896fc..7ad900bd33 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.51.0"
+version = "0.51.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]
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 6f9fc769fd..50872d1aa9 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.51.0"
+version = "0.51.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]
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 56d6101c2b..a4e54dee49 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.51.0"
+version = "0.51.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]
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 a99467e0f4..dcfbd36b0e 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.51.0"
+version = "0.51.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]
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 c4adc248e5..4345aeb947 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.51.0"
+version = "0.51.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]
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 70813f1d02..5846723bb3 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.51.0"
+version = "0.51.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/exchange-features/wasm/Cargo.lock b/contracts/feature-tests/exchange-features/wasm/Cargo.lock
index 510f366e20..970cab4843 100644
--- a/contracts/feature-tests/exchange-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/exchange-features/wasm/Cargo.lock
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/formatted-message-features/wasm/Cargo.lock b/contracts/feature-tests/formatted-message-features/wasm/Cargo.lock
index 4c040b80af..0463be1978 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.51.0"
+version = "0.51.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/managed-map-features/wasm/Cargo.lock b/contracts/feature-tests/managed-map-features/wasm/Cargo.lock
index b435355ac5..9e49dfafd7 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.51.0"
+version = "0.51.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]
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 d7f54eb5d8..21f706b50e 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.51.0"
+version = "0.51.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]
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 5e0aa67166..bdd3a17f27 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.51.0"
+version = "0.51.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]
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 8edf445178..554574a747 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.51.0"
+version = "0.51.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/multi-contract-features/wasm/Cargo.lock b/contracts/feature-tests/multi-contract-features/wasm/Cargo.lock
index ec2051f9e8..8368cdc345 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.51.0"
+version = "0.51.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/panic-message-features/wasm/Cargo.lock b/contracts/feature-tests/panic-message-features/wasm/Cargo.lock
index f4837bcaab..50da0b16d9 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.51.0"
+version = "0.51.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/payable-features/wasm/Cargo.lock b/contracts/feature-tests/payable-features/wasm/Cargo.lock
index 47b5b75407..0a0ca7dabc 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.51.0"
+version = "0.51.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]
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 9493bebe96..d4abc87eb8 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.51.0"
+version = "0.51.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]
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 14081cd744..c2371fcea1 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.51.0"
+version = "0.51.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/scenario-tester/wasm/Cargo.lock b/contracts/feature-tests/scenario-tester/wasm/Cargo.lock
index 389c7801b3..9bbf0343b2 100755
--- a/contracts/feature-tests/scenario-tester/wasm/Cargo.lock
+++ b/contracts/feature-tests/scenario-tester/wasm/Cargo.lock
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]
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 f7b35ad945..d0f497c038 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.51.0"
+version = "0.51.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,14 +82,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/use-module/wasm/Cargo.lock b/contracts/feature-tests/use-module/wasm/Cargo.lock
index cea515df68..cf397eb361 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.51.0"
+version = "0.51.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,14 +82,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.0"
+version = "0.51.1"
 dependencies = [
  "multiversx-sc",
 ]

From a5d1650db21abb54f74686ad3fa4b28a5c2a2195 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Mon, 8 Jul 2024 03:05:22 +0300
Subject: [PATCH 1089/1254] changelog fix

---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6bc6cc4850..16cf669c27 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,10 +9,11 @@ The `mx-sdk-rs` repo contains many crates, grouped into several families. Crates
 For brevity, the changelog will only mention a short version of their name.
 
 They are:
-- `multiversx-sc`, in short `sc`, the smart contract framework, 6 crates + 3 for contracts/modules:
+- `multiversx-sc`, in short `sc`, the smart contract framework, 7 crates + 3 for contracts/modules:
 	- `multiversx-sc`
     - `multiversx-sc-derive`
     - `multiversx-sc-meta`
+    - `multiversx-sc-meta-lib`
     - `multiversx-sc-scenario`
     - `multiversx-sc-snippets`
     - `multiversx-sc-wasm-adapter`

From 2706b9d232ed086fcffef566c1174b0ef51ae803 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Thu, 11 Jul 2024 17:49:50 +0300
Subject: [PATCH 1090/1254] fix hexa and binary print for bytes in sc_print!

---
 framework/base/src/formatter/formatter_impl_bytes.rs | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/framework/base/src/formatter/formatter_impl_bytes.rs b/framework/base/src/formatter/formatter_impl_bytes.rs
index 6fb525bb86..ca3f2f0b41 100644
--- a/framework/base/src/formatter/formatter_impl_bytes.rs
+++ b/framework/base/src/formatter/formatter_impl_bytes.rs
@@ -1,4 +1,7 @@
-use super::{FormatByteReceiver, SCBinary, SCDisplay, SCLowerHex};
+use super::{
+    hex_util::{byte_to_binary_digits, encode_bytes_as_hex},
+    FormatByteReceiver, SCBinary, SCDisplay, SCLowerHex,
+};
 
 impl SCDisplay for &[u8] {
     fn fmt<F: FormatByteReceiver>(&self, f: &mut F) {
@@ -8,12 +11,14 @@ impl SCDisplay for &[u8] {
 
 impl SCLowerHex for &[u8] {
     fn fmt<F: FormatByteReceiver>(&self, f: &mut F) {
-        f.append_bytes(self);
+        f.append_bytes(encode_bytes_as_hex(self).as_bytes());
     }
 }
 
 impl SCBinary for &[u8] {
     fn fmt<F: FormatByteReceiver>(&self, f: &mut F) {
-        f.append_bytes(self);
+        for b in self.iter() {
+            f.append_bytes(&byte_to_binary_digits(*b));
+        }
     }
 }

From 865040c8408c4d0aa4b8103e97322688dc8bc91a Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Fri, 12 Jul 2024 03:29:42 +0200
Subject: [PATCH 1091/1254] impl tries

---
 .../adder/tests/adder_whitebox_test.rs        |  46 ++++++-
 framework/scenario/src/facade/world_tx.rs     |   2 +
 .../facade/world_tx/scenario_tx_whitebox.rs   | 117 ++++++++++++++++++
 3 files changed, 164 insertions(+), 1 deletion(-)
 create mode 100644 framework/scenario/src/facade/world_tx/scenario_tx_whitebox.rs

diff --git a/contracts/examples/adder/tests/adder_whitebox_test.rs b/contracts/examples/adder/tests/adder_whitebox_test.rs
index 9e7abe4a51..54610cbbad 100644
--- a/contracts/examples/adder/tests/adder_whitebox_test.rs
+++ b/contracts/examples/adder/tests/adder_whitebox_test.rs
@@ -2,11 +2,14 @@ use adder::*;
 use multiversx_sc_scenario::imports::*;
 
 const ADDER_PATH_EXPR: &str = "mxsc:output/adder.mxsc.json";
+const OWNER: TestAddress = TestAddress::new("owner");
+const ADDER_ADDRESS: TestSCAddress = TestSCAddress::new("adder");
+const CODE_PATH: MxscPath = MxscPath::new("mxsc:output/adder.mxsc.json");
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
 
-    blockchain.register_contract("mxsc:output/adder.mxsc.json", adder::ContractBuilder);
+    blockchain.register_contract(CODE_PATH, adder::ContractBuilder);
     blockchain
 }
 
@@ -47,3 +50,44 @@ fn adder_whitebox() {
                 ),
         );
 }
+
+#[test]
+fn adder_whitebox_unified() {
+    let mut world = world();
+
+    world.account(OWNER).nonce(1);
+
+    let _new_address = world
+        .tx()
+        .from(OWNER)
+        .raw_deploy()
+        .code(CODE_PATH)
+        .new_address(ADDER_ADDRESS)
+        .with_result(ExpectError(0, "ok"))
+        .returns(ReturnsNewBech32Address)
+        .whitebox(adder::contract_obj::<StaticApi>(), |sc| {
+            sc.init(5u32.into());
+        });
+
+    world
+        .tx()
+        .from(OWNER)
+        .to(ADDER_ADDRESS)
+        .raw_call("")
+        .returns(ExpectError(0u64, "ok"))
+        .whitebox(adder::contract_obj::<StaticApi>(), |sc| {
+            sc.add(5u32.into());
+        });
+
+    let _raw_response = world
+        .query()
+        .to(ADDER_ADDRESS)
+        .raw_call("")
+        .returns(ReturnsRawResult)
+        .whitebox(adder::contract_obj::<StaticApi>(), |sc| {
+            let sum = sc.sum().get();
+            assert_eq!(sum, BigUint::from(10u64));
+        });
+
+    assert_eq!(new_address, ADDER_ADDRESS);
+}
diff --git a/framework/scenario/src/facade/world_tx.rs b/framework/scenario/src/facade/world_tx.rs
index a2d7373a42..d052614297 100644
--- a/framework/scenario/src/facade/world_tx.rs
+++ b/framework/scenario/src/facade/world_tx.rs
@@ -5,7 +5,9 @@ mod scenario_query_call;
 mod scenario_rh_impl;
 mod scenario_set_state;
 mod scenario_tx_env;
+mod scenario_tx_whitebox;
 
 pub use scenario_exec_call::ScenarioEnvExec;
 pub use scenario_query_call::ScenarioEnvQuery;
 pub use scenario_tx_env::{ScenarioTxEnv, ScenarioTxEnvData, ScenarioTxRun};
+pub use scenario_tx_whitebox::ScenarioTxWhitebox;
diff --git a/framework/scenario/src/facade/world_tx/scenario_tx_whitebox.rs b/framework/scenario/src/facade/world_tx/scenario_tx_whitebox.rs
new file mode 100644
index 0000000000..933af47cc5
--- /dev/null
+++ b/framework/scenario/src/facade/world_tx/scenario_tx_whitebox.rs
@@ -0,0 +1,117 @@
+use crate::scenario::tx_to_step::TxToQueryStep;
+use crate::ScenarioEnvQuery;
+use crate::{
+    imports::StaticApi,
+    scenario::{run_vm::ScenarioVMRunner, tx_to_step::TxToStep},
+    scenario_model::TxResponse,
+    ScenarioEnvExec,
+};
+use multiversx_sc::{
+    tuple_util::NestedTupleFlatten,
+    types::{
+        Code, DeployCall, FunctionCall, RHListExec, Tx, TxCodeValue, TxFromSpecified, TxNoPayment,
+        TxPayment, TxToSpecified,
+    },
+};
+
+pub trait ScenarioTxWhitebox {
+    type Returns;
+    fn whitebox<ContractObj, F: FnOnce(ContractObj)>(
+        self,
+        contract_obj: ContractObj,
+        f: F,
+    ) -> Self::Returns;
+}
+
+pub struct ContractObj<A>
+where
+    A: multiversx_sc::api::VMApi,
+{
+    _phantom: core::marker::PhantomData<A>,
+}
+
+impl<'w, From, Payment, CodeValue, RH> ScenarioTxWhitebox
+    for Tx<
+        ScenarioEnvExec<'w>,
+        From,
+        (),
+        Payment,
+        (),
+        DeployCall<ScenarioEnvExec<'w>, Code<CodeValue>>,
+        RH,
+    >
+where
+    From: TxFromSpecified<ScenarioEnvExec<'w>>,
+    Payment: TxNoPayment<ScenarioEnvExec<'w>>,
+    CodeValue: TxCodeValue<ScenarioEnvExec<'w>>,
+    RH: RHListExec<TxResponse, ScenarioEnvExec<'w>>,
+    RH::ListReturns: NestedTupleFlatten,
+{
+    type Returns = <RH::ListReturns as NestedTupleFlatten>::Unpacked;
+
+    fn whitebox<ContractObj, F: FnOnce(ContractObj)>(
+        self,
+        contract_obj: ContractObj,
+        f: F,
+    ) -> Self::Returns {
+        let step_wrapper = self.tx_to_step();
+
+        let mut scenario_vm_runner = ScenarioVMRunner::new();
+        let (_new_addr, _tx_result) =
+            scenario_vm_runner.perform_sc_deploy_lambda(&step_wrapper.step, || f(contract_obj));
+
+        step_wrapper.process_result()
+    }
+}
+
+impl<'w, From, To, Payment, RH> ScenarioTxWhitebox
+    for Tx<ScenarioEnvExec<'w>, From, To, Payment, (), FunctionCall<StaticApi>, RH>
+where
+    From: TxFromSpecified<ScenarioEnvExec<'w>>,
+    To: TxToSpecified<ScenarioEnvExec<'w>>,
+    Payment: TxPayment<ScenarioEnvExec<'w>>,
+    RH: RHListExec<TxResponse, ScenarioEnvExec<'w>>,
+    RH::ListReturns: NestedTupleFlatten,
+{
+    type Returns = <RH::ListReturns as NestedTupleFlatten>::Unpacked;
+
+    fn whitebox<ContractObj, F: FnOnce(ContractObj)>(
+        self,
+        contract_obj: ContractObj,
+        f: F,
+    ) -> Self::Returns {
+        let step_wrapper = self.tx_to_step();
+        let _tx_result = self
+            .env
+            .world
+            .get_mut_debugger_backend()
+            .vm_runner
+            .perform_sc_call_lambda(&step_wrapper.step, || f(contract_obj));
+
+        step_wrapper.process_result()
+    }
+}
+
+impl<'w, To, Payment, RH> ScenarioTxWhitebox
+    for Tx<ScenarioEnvQuery<'w>, (), To, Payment, (), FunctionCall<StaticApi>, RH>
+where
+    To: TxToSpecified<ScenarioEnvQuery<'w>>,
+    Payment: TxNoPayment<ScenarioEnvQuery<'w>>,
+    RH: RHListExec<TxResponse, ScenarioEnvQuery<'w>>,
+    RH::ListReturns: NestedTupleFlatten,
+{
+    type Returns = <RH::ListReturns as NestedTupleFlatten>::Unpacked;
+
+    fn whitebox<ContractObj, F: FnOnce(ContractObj)>(
+        self,
+        contract_obj: ContractObj,
+        f: F,
+    ) -> Self::Returns {
+        let step_wrapper = self.tx_to_query_step();
+
+        let mut scenario_vm_runner = ScenarioVMRunner::new();
+        let _tx_result =
+            scenario_vm_runner.perform_sc_query_lambda(&step_wrapper.step, || f(contract_obj));
+        step_wrapper.process_result()
+    }
+}

From fa2bf8b3f649a2eaa9e0de84d7e68b4d8d61731d Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Fri, 12 Jul 2024 12:23:00 +0300
Subject: [PATCH 1092/1254] add tests

---
 .../src/formatted_message_features.rs           | 17 ++++++++++++++++-
 .../tests/msg_test.rs                           |  9 +++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/contracts/feature-tests/formatted-message-features/src/formatted_message_features.rs b/contracts/feature-tests/formatted-message-features/src/formatted_message_features.rs
index 9ecdf8e302..820e27d553 100644
--- a/contracts/feature-tests/formatted-message-features/src/formatted_message_features.rs
+++ b/contracts/feature-tests/formatted-message-features/src/formatted_message_features.rs
@@ -1,6 +1,6 @@
 #![no_std]
 
-multiversx_sc::imports!();
+use multiversx_sc::imports::*;
 
 #[multiversx_sc::contract]
 pub trait FormattedMessageFeatures {
@@ -72,6 +72,21 @@ pub trait FormattedMessageFeatures {
         sc_print!("Printing x: {:c}", x);
     }
 
+    #[endpoint]
+    fn print_message_bytes(&self, x: &[u8]) {
+        sc_print!("Printing x: {}", x,);
+    }
+
+    #[endpoint]
+    fn print_message_hex_bytes(&self, x: &[u8]) {
+        sc_print!("Printing x: {:x}", x,);
+    }
+
+    #[endpoint]
+    fn print_message_binary_bytes(&self, x: &[u8]) {
+        sc_print!("Printing x: {:b}", x);
+    }
+
     #[endpoint]
     fn format_message_one_part(&self) -> ManagedBuffer {
         let message = sc_format!("Test");
diff --git a/contracts/feature-tests/formatted-message-features/tests/msg_test.rs b/contracts/feature-tests/formatted-message-features/tests/msg_test.rs
index 10bb5579f7..3c1e6903db 100644
--- a/contracts/feature-tests/formatted-message-features/tests/msg_test.rs
+++ b/contracts/feature-tests/formatted-message-features/tests/msg_test.rs
@@ -22,6 +22,9 @@ fn test_print_ascii() {
 
     fmf.print_message(i32::MIN);
     check_printed_and_clear("Printing x: -2147483648");
+
+    fmf.print_message_bytes(b"MVX");
+    check_printed_and_clear("Printing x: MVX");
 }
 
 #[test]
@@ -39,6 +42,9 @@ fn test_print_binary() {
 
     fmf.print_message_binary(u32::MAX);
     check_printed_and_clear("Printing x: 11111111111111111111111111111111");
+
+    fmf.print_message_binary_bytes(b"MVX");
+    check_printed_and_clear("Printing x: 010011010101011001011000");
 }
 
 #[test]
@@ -59,6 +65,9 @@ fn test_print_hex() {
 
     fmf.print_message_hex(i32::MIN);
     check_printed_and_clear("Printing x: 80000000");
+
+    fmf.print_message_hex_bytes(b"MVX");
+    check_printed_and_clear("Printing x: 4d5658");
 }
 
 #[test]

From 55eb412698120d7173100e33b246a019d0906e43 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Fri, 12 Jul 2024 13:50:56 +0300
Subject: [PATCH 1093/1254] change endpoints module name

---
 framework/derive/src/generate/endpoints_mod_gen.rs  |  4 ++--
 framework/scenario/tests/contract_without_macros.rs |  2 +-
 framework/wasm-adapter/src/wasm_macros.rs           | 13 +++++++------
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/framework/derive/src/generate/endpoints_mod_gen.rs b/framework/derive/src/generate/endpoints_mod_gen.rs
index b32a7ce9a8..4bba840a90 100644
--- a/framework/derive/src/generate/endpoints_mod_gen.rs
+++ b/framework/derive/src/generate/endpoints_mod_gen.rs
@@ -15,7 +15,7 @@ pub fn generate_endpoints_mod(
             let module_path = &supertrait.module_path;
             let endpoints_alias = generate_endpoints_mod_alias(index);
             quote! {
-                pub use #module_path endpoints as #endpoints_alias;
+                pub use #module_path __wasm__endpoints__ as #endpoints_alias;
             }
         })
         .collect();
@@ -49,7 +49,7 @@ pub fn generate_endpoints_mod(
         #(#endpoint_aliases_decl)*
 
         #[allow(non_snake_case)]
-        pub mod endpoints {
+        pub mod __wasm__endpoints__ {
             use super::EndpointWrappers;
 
             #(#endpoint_aliases_use)*
diff --git a/framework/scenario/tests/contract_without_macros.rs b/framework/scenario/tests/contract_without_macros.rs
index 1121e88fdd..a08f1a4bbd 100644
--- a/framework/scenario/tests/contract_without_macros.rs
+++ b/framework/scenario/tests/contract_without_macros.rs
@@ -457,7 +457,7 @@ mod sample_adder {
     }
 
     #[allow(non_snake_case)]
-    pub mod endpoints {
+    pub mod __wasm__endpoints__ {
         use super::EndpointWrappers;
         pub fn sum<A>()
         where
diff --git a/framework/wasm-adapter/src/wasm_macros.rs b/framework/wasm-adapter/src/wasm_macros.rs
index 0d2ae296a3..200b3abd00 100644
--- a/framework/wasm-adapter/src/wasm_macros.rs
+++ b/framework/wasm-adapter/src/wasm_macros.rs
@@ -46,14 +46,14 @@ macro_rules! endpoints_old {
     ($mod_name:ident ( $($endpoint_name:ident)* ) ) => {
         #[no_mangle]
         fn init() {
-            $mod_name::endpoints::init::<multiversx_sc_wasm_adapter::api::VmApiImpl>();
+            $mod_name::__wasm__endpoints__::init::<multiversx_sc_wasm_adapter::api::VmApiImpl>();
         }
 
         $(
             #[allow(non_snake_case)]
             #[no_mangle]
             fn $endpoint_name() {
-                $mod_name::endpoints::$endpoint_name::<multiversx_sc_wasm_adapter::api::VmApiImpl>();
+                $mod_name::__wasm__endpoints__::$endpoint_name::<multiversx_sc_wasm_adapter::api::VmApiImpl>();
             }
         )*
     };
@@ -66,7 +66,7 @@ macro_rules! endpoints {
             #[allow(non_snake_case)]
             #[no_mangle]
             fn $endpoint_name() {
-                $mod_name::endpoints::$method_name::<multiversx_sc_wasm_adapter::api::VmApiImpl>();
+                $mod_name::__wasm__endpoints__::$method_name::<multiversx_sc_wasm_adapter::api::VmApiImpl>();
             }
         )*
     };
@@ -79,7 +79,7 @@ macro_rules! external_view_endpoints {
             #[allow(non_snake_case)]
             #[no_mangle]
             fn $endpoint_name() {
-                $mod_name::endpoints::$method_name::<multiversx_sc_wasm_adapter::multiversx_sc::api::ExternalViewApi<multiversx_sc_wasm_adapter::api::VmApiImpl>>();
+                $mod_name::__wasm__endpoints__::$method_name::<multiversx_sc_wasm_adapter::multiversx_sc::api::ExternalViewApi<multiversx_sc_wasm_adapter::api::VmApiImpl>>();
             }
         )*
     };
@@ -97,7 +97,7 @@ macro_rules! external_view_endpoints_old {
             #[allow(non_snake_case)]
             #[no_mangle]
             fn $endpoint_name() {
-                $mod_name::endpoints::$endpoint_name::<multiversx_sc_wasm_adapter::multiversx_sc::api::ExternalViewApi<multiversx_sc_wasm_adapter::api::VmApiImpl>>();
+                $mod_name::__wasm__endpoints__::$endpoint_name::<multiversx_sc_wasm_adapter::multiversx_sc::api::ExternalViewApi<multiversx_sc_wasm_adapter::api::VmApiImpl>>();
             }
         )*
     };
@@ -119,7 +119,8 @@ macro_rules! async_callback {
         #[allow(non_snake_case)]
         #[no_mangle]
         fn callBack() {
-            $mod_name::endpoints::callBack::<multiversx_sc_wasm_adapter::api::VmApiImpl>();
+            $mod_name::__wasm__endpoints__::callBack::<multiversx_sc_wasm_adapter::api::VmApiImpl>(
+            );
         }
     };
 }

From dbdb627f41e35c2c4ae18f9d552060c8d748c2e7 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Fri, 12 Jul 2024 17:53:41 +0200
Subject: [PATCH 1094/1254] fix debugger backend issue

---
 .../adder/tests/adder_whitebox_test.rs        |  4 +--
 .../facade/world_tx/scenario_tx_whitebox.rs   | 34 ++++++++-----------
 2 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/contracts/examples/adder/tests/adder_whitebox_test.rs b/contracts/examples/adder/tests/adder_whitebox_test.rs
index 54610cbbad..92f13a2bb3 100644
--- a/contracts/examples/adder/tests/adder_whitebox_test.rs
+++ b/contracts/examples/adder/tests/adder_whitebox_test.rs
@@ -69,6 +69,8 @@ fn adder_whitebox_unified() {
             sc.init(5u32.into());
         });
 
+    assert_eq!(_new_address, ADDER_ADDRESS.to_address().into());
+
     world
         .tx()
         .from(OWNER)
@@ -88,6 +90,4 @@ fn adder_whitebox_unified() {
             let sum = sc.sum().get();
             assert_eq!(sum, BigUint::from(10u64));
         });
-
-    assert_eq!(new_address, ADDER_ADDRESS);
 }
diff --git a/framework/scenario/src/facade/world_tx/scenario_tx_whitebox.rs b/framework/scenario/src/facade/world_tx/scenario_tx_whitebox.rs
index 933af47cc5..0d9040a2ee 100644
--- a/framework/scenario/src/facade/world_tx/scenario_tx_whitebox.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_tx_whitebox.rs
@@ -1,10 +1,7 @@
 use crate::scenario::tx_to_step::TxToQueryStep;
 use crate::ScenarioEnvQuery;
 use crate::{
-    imports::StaticApi,
-    scenario::{run_vm::ScenarioVMRunner, tx_to_step::TxToStep},
-    scenario_model::TxResponse,
-    ScenarioEnvExec,
+    imports::StaticApi, scenario::tx_to_step::TxToStep, scenario_model::TxResponse, ScenarioEnvExec,
 };
 use multiversx_sc::{
     tuple_util::NestedTupleFlatten,
@@ -23,13 +20,6 @@ pub trait ScenarioTxWhitebox {
     ) -> Self::Returns;
 }
 
-pub struct ContractObj<A>
-where
-    A: multiversx_sc::api::VMApi,
-{
-    _phantom: core::marker::PhantomData<A>,
-}
-
 impl<'w, From, Payment, CodeValue, RH> ScenarioTxWhitebox
     for Tx<
         ScenarioEnvExec<'w>,
@@ -55,10 +45,12 @@ where
         f: F,
     ) -> Self::Returns {
         let step_wrapper = self.tx_to_step();
-
-        let mut scenario_vm_runner = ScenarioVMRunner::new();
-        let (_new_addr, _tx_result) =
-            scenario_vm_runner.perform_sc_deploy_lambda(&step_wrapper.step, || f(contract_obj));
+        let (_new_addr, _tx_result) = step_wrapper
+            .env
+            .world
+            .get_mut_debugger_backend()
+            .vm_runner
+            .perform_sc_deploy_lambda(&step_wrapper.step, || f(contract_obj));
 
         step_wrapper.process_result()
     }
@@ -81,7 +73,7 @@ where
         f: F,
     ) -> Self::Returns {
         let step_wrapper = self.tx_to_step();
-        let _tx_result = self
+        let _tx_result = step_wrapper
             .env
             .world
             .get_mut_debugger_backend()
@@ -109,9 +101,13 @@ where
     ) -> Self::Returns {
         let step_wrapper = self.tx_to_query_step();
 
-        let mut scenario_vm_runner = ScenarioVMRunner::new();
-        let _tx_result =
-            scenario_vm_runner.perform_sc_query_lambda(&step_wrapper.step, || f(contract_obj));
+        let _tx_result = step_wrapper
+            .env
+            .world
+            .get_mut_debugger_backend()
+            .vm_runner
+            .perform_sc_query_lambda(&step_wrapper.step, || f(contract_obj));
+
         step_wrapper.process_result()
     }
 }

From ea2b5a02908c111e563bf8f214c7e2d684cccef8 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 12 Jul 2024 19:23:01 +0300
Subject: [PATCH 1095/1254] formatted-message-features alloc fix

---
 .../feature-tests/formatted-message-features/Cargo.toml  | 1 +
 .../formatted-message-features/sc-config.toml            | 5 +++++
 .../formatted-message-features/wasm/src/lib.rs           | 9 ++++++---
 3 files changed, 12 insertions(+), 3 deletions(-)
 create mode 100644 contracts/feature-tests/formatted-message-features/sc-config.toml

diff --git a/contracts/feature-tests/formatted-message-features/Cargo.toml b/contracts/feature-tests/formatted-message-features/Cargo.toml
index ae3b5535bd..362869a552 100644
--- a/contracts/feature-tests/formatted-message-features/Cargo.toml
+++ b/contracts/feature-tests/formatted-message-features/Cargo.toml
@@ -11,6 +11,7 @@ path = "src/formatted_message_features.rs"
 [dependencies.multiversx-sc]
 version = "0.51.1"
 path = "../../../framework/base"
+features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
 version = "0.51.1"
diff --git a/contracts/feature-tests/formatted-message-features/sc-config.toml b/contracts/feature-tests/formatted-message-features/sc-config.toml
new file mode 100644
index 0000000000..2c3cbd9828
--- /dev/null
+++ b/contracts/feature-tests/formatted-message-features/sc-config.toml
@@ -0,0 +1,5 @@
+[settings]
+main = "formatted-message-features"
+
+[contracts.formatted-message-features]
+allocator = "static64k"
diff --git a/contracts/feature-tests/formatted-message-features/wasm/src/lib.rs b/contracts/feature-tests/formatted-message-features/wasm/src/lib.rs
index 34c6f81e59..c0b17c159f 100644
--- a/contracts/feature-tests/formatted-message-features/wasm/src/lib.rs
+++ b/contracts/feature-tests/formatted-message-features/wasm/src/lib.rs
@@ -5,13 +5,13 @@
 ////////////////////////////////////////////////////
 
 // Init:                                 1
-// Endpoints:                           16
+// Endpoints:                           19
 // Async Callback (empty):               1
-// Total number of exported functions:  18
+// Total number of exported functions:  21
 
 #![no_std]
 
-multiversx_sc_wasm_adapter::allocator!();
+multiversx_sc_wasm_adapter::allocator!(static64k);
 multiversx_sc_wasm_adapter::panic_handler!();
 
 multiversx_sc_wasm_adapter::endpoints! {
@@ -28,6 +28,9 @@ multiversx_sc_wasm_adapter::endpoints! {
         print_message_hex => print_message_hex
         print_message_binary => print_message_binary
         print_message_codec => print_message_codec
+        print_message_bytes => print_message_bytes
+        print_message_hex_bytes => print_message_hex_bytes
+        print_message_binary_bytes => print_message_binary_bytes
         format_message_one_part => format_message_one_part
         format_message_multiple_parts => format_message_multiple_parts
         format_message_big_int => format_message_big_int

From dfb43b9c4a222ebae7977de7ef21de3a6d03e31c Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Fri, 12 Jul 2024 20:24:20 +0200
Subject: [PATCH 1096/1254] changed contract obj api

---
 contracts/examples/adder/tests/adder_whitebox_test.rs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/contracts/examples/adder/tests/adder_whitebox_test.rs b/contracts/examples/adder/tests/adder_whitebox_test.rs
index 92f13a2bb3..726e1ab18a 100644
--- a/contracts/examples/adder/tests/adder_whitebox_test.rs
+++ b/contracts/examples/adder/tests/adder_whitebox_test.rs
@@ -65,8 +65,8 @@ fn adder_whitebox_unified() {
         .new_address(ADDER_ADDRESS)
         .with_result(ExpectError(0, "ok"))
         .returns(ReturnsNewBech32Address)
-        .whitebox(adder::contract_obj::<StaticApi>(), |sc| {
-            sc.init(5u32.into());
+        .whitebox(adder::contract_obj::<DebugApi>(), |sc| {
+            sc.init(BigUint::from(5u64));
         });
 
     assert_eq!(_new_address, ADDER_ADDRESS.to_address().into());
@@ -77,8 +77,8 @@ fn adder_whitebox_unified() {
         .to(ADDER_ADDRESS)
         .raw_call("")
         .returns(ExpectError(0u64, "ok"))
-        .whitebox(adder::contract_obj::<StaticApi>(), |sc| {
-            sc.add(5u32.into());
+        .whitebox(adder::contract_obj::<DebugApi>(), |sc| {
+            sc.add(BigUint::from(5u64));
         });
 
     let _raw_response = world
@@ -86,7 +86,7 @@ fn adder_whitebox_unified() {
         .to(ADDER_ADDRESS)
         .raw_call("")
         .returns(ReturnsRawResult)
-        .whitebox(adder::contract_obj::<StaticApi>(), |sc| {
+        .whitebox(adder::contract_obj::<DebugApi>(), |sc| {
             let sum = sc.sum().get();
             assert_eq!(sum, BigUint::from(10u64));
         });

From c54c46441f6bb8a82eeeb01e6361620e5846419a Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Tue, 16 Jul 2024 15:55:21 +0200
Subject: [PATCH 1097/1254] added support for custom structs and small upgrade
 and import fixes

---
 .../snippet_sc_functions_gen.rs               | 35 ++++++-
 .../generate_snippets/snippet_template_gen.rs |  2 +-
 .../generate_snippets/snippet_type_map.rs     | 97 +++++++++++++------
 3 files changed, 104 insertions(+), 30 deletions(-)

diff --git a/framework/meta-lib/src/contract/generate_snippets/snippet_sc_functions_gen.rs b/framework/meta-lib/src/contract/generate_snippets/snippet_sc_functions_gen.rs
index 49e3e92123..94f3489a03 100644
--- a/framework/meta-lib/src/contract/generate_snippets/snippet_sc_functions_gen.rs
+++ b/framework/meta-lib/src/contract/generate_snippets/snippet_sc_functions_gen.rs
@@ -38,7 +38,7 @@ pub(crate) fn write_interact_struct_impl(
     write_deploy_method_impl(file, &abi.constructors[0], &abi.name);
 
     for upgrade_abi in &abi.upgrade_constructors {
-        write_endpoint_impl(file, upgrade_abi, &abi.name);
+        write_upgrade_endpoint_impl(file, upgrade_abi, &abi.name);
     }
 
     for endpoint_abi in &abi.endpoints {
@@ -83,6 +83,39 @@ fn write_deploy_method_impl(file: &mut File, init_abi: &EndpointAbi, name: &Stri
     write_newline(file);
 }
 
+fn write_upgrade_endpoint_impl(file: &mut File, upgrade_abi: &EndpointAbi, name: &String) {
+    write_method_declaration(file, "upgrade");
+    write_endpoint_args_declaration(file, &upgrade_abi.inputs);
+    let proxy_name = format!("{}Proxy", name);
+
+    writeln!(
+        file,
+        r#"        let response = self
+            .interactor
+            .tx()
+            .to(self.state.current_address())
+            .from(&self.wallet_address)
+            .gas(NumExpr("{DEFAULT_GAS}"))
+            .typed(proxy::{})
+            .upgrade({})
+            .code(&self.contract_code)
+            .code_metadata(CodeMetadata::UPGRADEABLE)
+            .returns(ReturnsNewAddress)
+            .prepare_async()
+            .run()
+            .await;
+
+        println!("Result: {{response:?}}");"#,
+        proxy_name,
+        endpoint_args_when_called(upgrade_abi.inputs.as_slice()),
+    )
+    .unwrap();
+
+    // close method block brackets
+    writeln!(file, "    }}").unwrap();
+    write_newline(file);
+}
+
 fn write_endpoint_impl(file: &mut File, endpoint_abi: &EndpointAbi, name: &String) {
     write_method_declaration(file, &endpoint_abi.rust_method_name);
     write_payments_declaration(file, &endpoint_abi.payable_in_tokens);
diff --git a/framework/meta-lib/src/contract/generate_snippets/snippet_template_gen.rs b/framework/meta-lib/src/contract/generate_snippets/snippet_template_gen.rs
index bcad2efcc3..a7e7a41f1d 100644
--- a/framework/meta-lib/src/contract/generate_snippets/snippet_template_gen.rs
+++ b/framework/meta-lib/src/contract/generate_snippets/snippet_template_gen.rs
@@ -28,7 +28,7 @@ use std::{{
 pub(crate) fn write_snippet_constants(file: &mut File) {
     writeln!(
         file,
-        "const GATEWAY: &str = sdk::blockchain::DEVNET_GATEWAY;
+        "const GATEWAY: &str = sdk::gateway::DEVNET_GATEWAY;
 const STATE_FILE: &str = \"state.toml\";
 "
     )
diff --git a/framework/meta-lib/src/contract/generate_snippets/snippet_type_map.rs b/framework/meta-lib/src/contract/generate_snippets/snippet_type_map.rs
index 1a0adb3423..e48794ba27 100644
--- a/framework/meta-lib/src/contract/generate_snippets/snippet_type_map.rs
+++ b/framework/meta-lib/src/contract/generate_snippets/snippet_type_map.rs
@@ -5,7 +5,7 @@ const INNER_TYPE_END: char = '>';
 pub static STATIC_API_SUFFIX: &str = "<StaticApi>";
 pub static PLACEHOLDER_INPUT_TYPE_NAME: &str = "PlaceholderInput";
 
-#[derive(Clone, Default)]
+#[derive(Clone, Default, Debug)]
 pub struct RustTypeString {
     type_name: String,          // used for return types
     default_value_expr: String, // used for arguments
@@ -14,11 +14,7 @@ pub struct RustTypeString {
 
 impl RustTypeString {
     pub fn get_default_value_expr(&self) -> &str {
-        if !self.contains_custom_types {
-            &self.default_value_expr
-        } else {
-            PLACEHOLDER_INPUT_TYPE_NAME
-        }
+        &self.default_value_expr
     }
 }
 
@@ -184,7 +180,9 @@ pub fn handle_abi_type(type_string: &mut RustTypeString, abi_type_str: String) {
     match abi_type {
         AbiType::UserDefined(user_type) => {
             // most user-defined types contain managed types
-            type_string.type_name += &(user_type + STATIC_API_SUFFIX);
+            type_string.type_name += &format!("{}{}", user_type, STATIC_API_SUFFIX);
+            type_string.default_value_expr +=
+                &format!("{}::{}::default()", user_type, STATIC_API_SUFFIX);
             type_string.contains_custom_types = true;
         },
         AbiType::Basic(basic_type) => {
@@ -204,12 +202,24 @@ pub fn handle_abi_type(type_string: &mut RustTypeString, abi_type_str: String) {
 
 fn handle_variadic_type(type_string: &mut RustTypeString, inner_types: String) {
     type_string.type_name += "MultiValueVec<";
-    type_string.default_value_expr += "MultiValueVec::from(vec![";
+    let mut inner_type_string = RustTypeString::default();
 
-    handle_abi_type(type_string, inner_types);
+    handle_abi_type(&mut inner_type_string, inner_types);
 
+    type_string.type_name += &inner_type_string.type_name;
     type_string.type_name += ">";
-    type_string.default_value_expr += "])";
+
+    if inner_type_string.contains_custom_types {
+        type_string.default_value_expr += "MultiValueVec::<";
+        type_string.default_value_expr += &inner_type_string.type_name;
+        type_string.default_value_expr += ">::new()";
+    } else {
+        type_string.default_value_expr += "MultiValueVec::from(vec![";
+        type_string.default_value_expr += &inner_type_string.default_value_expr;
+        type_string.default_value_expr += "])";
+    }
+
+    type_string.contains_custom_types |= inner_type_string.contains_custom_types;
 }
 
 fn handle_optional_type(type_string: &mut RustTypeString, inner_types: String) {
@@ -224,40 +234,71 @@ fn handle_optional_type(type_string: &mut RustTypeString, inner_types: String) {
 
 fn handle_multi_type(type_string: &mut RustTypeString, inner_types: String) {
     let multi_type_end_index = inner_types.find(INNER_TYPE_END).unwrap();
-    let mut inner_multi_types: Vec<&str> = inner_types[..multi_type_end_index].split(',').collect();
+    let inner_multi_types: Vec<&str> = inner_types[..multi_type_end_index].split(',').collect();
     let inner_multi_types_len = inner_multi_types.len();
 
-    type_string.type_name += "MultiValue";
-    type_string.type_name += &inner_multi_types_len.to_string();
-    type_string.type_name += "<";
+    // "MultiValueN::<types>::from((x, y, z))"
+    let mut type_name_parts = Vec::new();
+    let mut default_value_expr_parts = Vec::new();
+    let mut contains_custom_types = false;
 
-    // "MultiValueN::from((x, y, z))"
-    type_string.default_value_expr += "MultiValue";
-    type_string.default_value_expr += &inner_multi_types_len.to_string();
-    type_string.default_value_expr += "::from((";
-
-    for (i, multi_type) in inner_multi_types.iter_mut().enumerate() {
+    for (i, multi_type) in inner_multi_types.iter().enumerate() {
         let trimmed = multi_type.trim();
-        handle_abi_type(type_string, trimmed.to_string());
+        let mut inner_type_string = RustTypeString::default();
+
+        handle_abi_type(&mut inner_type_string, trimmed.to_string());
+
+        type_name_parts.push(inner_type_string.type_name.clone());
+
+        if inner_type_string.contains_custom_types {
+            contains_custom_types = true
+        }
+        default_value_expr_parts.push(inner_type_string.default_value_expr);
 
         if i < inner_multi_types_len - 1 {
-            type_string.type_name += ", ";
-            type_string.default_value_expr += ", ";
+            default_value_expr_parts.push(", ".to_string());
         }
     }
 
-    type_string.type_name += ">";
-    type_string.default_value_expr += "))";
+    // construct the type name
+    let type_name = format!(
+        "MultiValue{}::<{}>",
+        inner_multi_types_len,
+        type_name_parts.join(", ")
+    );
+
+    // construct the default value expression
+    let default_value_expr = format!(
+        "{}::from(({}))",
+        type_name,
+        default_value_expr_parts.join("")
+    );
+
+    type_string.type_name = type_name;
+    type_string.default_value_expr = default_value_expr;
+    type_string.contains_custom_types |= contains_custom_types;
 }
 
 fn handle_list_type(type_string: &mut RustTypeString, inner_types: String) {
     type_string.type_name += "ManagedVec<StaticApi, ";
-    type_string.default_value_expr += "ManagedVec::from_single_item(";
+    let mut inner_type_string = RustTypeString::default();
 
-    handle_abi_type(type_string, inner_types);
+    handle_abi_type(&mut inner_type_string, inner_types);
 
+    type_string.type_name += &inner_type_string.type_name;
     type_string.type_name += ">";
-    type_string.default_value_expr += ")";
+
+    if inner_type_string.contains_custom_types {
+        type_string.default_value_expr += "ManagedVec::<StaticApi, ";
+        type_string.default_value_expr += &inner_type_string.type_name;
+        type_string.default_value_expr += ">::new()";
+    } else {
+        type_string.default_value_expr += "ManagedVec::from_single_item(";
+        type_string.default_value_expr += &inner_type_string.default_value_expr;
+        type_string.default_value_expr += ")";
+    }
+
+    type_string.contains_custom_types |= inner_type_string.contains_custom_types;
 }
 
 fn handle_array_type(type_string: &mut RustTypeString, array_size: String, inner_types: String) {

From 1cdf5edc79603f08305ba3306d626da7a5bdfa62 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Wed, 17 Jul 2024 12:45:49 +0300
Subject: [PATCH 1098/1254] cli report code - needs to work for multi .wasm
 contracts

---
 framework/meta-lib/src/lib.rs                 |  6 +-
 framework/meta/src/cli/cli_args_standalone.rs | 18 ++++-
 framework/meta/src/cli/cli_standalone_main.rs |  5 ++
 framework/meta/src/cmd.rs                     |  1 +
 framework/meta/src/cmd/code_report.rs         | 16 ++++
 .../meta/src/cmd/code_report/code_report.rs   | 81 +++++++++++++++++++
 .../src/cmd/code_report/render_code_report.rs | 32 ++++++++
 framework/meta/src/cmd/test_coverage.rs       |  6 +-
 framework/meta/src/cmd/test_coverage/run.rs   |  8 +-
 9 files changed, 160 insertions(+), 13 deletions(-)
 create mode 100644 framework/meta/src/cmd/code_report.rs
 create mode 100644 framework/meta/src/cmd/code_report/code_report.rs
 create mode 100644 framework/meta/src/cmd/code_report/render_code_report.rs

diff --git a/framework/meta-lib/src/lib.rs b/framework/meta-lib/src/lib.rs
index e33c2cfb7b..61125711ca 100644
--- a/framework/meta-lib/src/lib.rs
+++ b/framework/meta-lib/src/lib.rs
@@ -1,14 +1,14 @@
 pub mod abi_json;
 pub mod cargo_toml_contents;
 pub mod cli;
-mod code_report_json;
+pub mod code_report_json;
 pub mod contract;
 pub mod ei;
 pub mod ei_check_json;
 pub mod esdt_attr_file_json;
-mod mxsc_file_json;
+pub mod mxsc_file_json;
 pub mod print_util;
-mod report_info_json;
+pub mod report_info_json;
 pub mod tools;
 pub mod version;
 pub mod version_history;
diff --git a/framework/meta/src/cli/cli_args_standalone.rs b/framework/meta/src/cli/cli_args_standalone.rs
index e66c83deb4..463faf68a0 100644
--- a/framework/meta/src/cli/cli_args_standalone.rs
+++ b/framework/meta/src/cli/cli_args_standalone.rs
@@ -65,6 +65,9 @@ pub enum StandaloneCliAction {
     #[command(name = "test-coverage", about = "Run test coverage and output report")]
     TestCoverage(TestCoverageArgs),
 
+    #[command(name = "code-report", about = "Generate code report")]
+    CodeReportGen(CodeReportArgs),
+
     #[command(
         about = "Generates a scenario test initialized with real data fetched from the blockchain."
     )]
@@ -115,7 +118,7 @@ pub struct TestArgs {
 }
 
 #[derive(Default, Clone, PartialEq, Eq, Debug, ValueEnum)]
-pub enum TestCoverageOutputFormat {
+pub enum OutputFormat {
     /// Markdown pretty-print summary
     #[default]
     Markdown,
@@ -132,13 +135,24 @@ pub struct TestCoverageArgs {
 
     /// Output format
     #[arg(short, long, verbatim_doc_comment)]
-    pub format: Option<TestCoverageOutputFormat>,
+    pub format: Option<OutputFormat>,
 
     /// Ignore files by path patterns
     #[arg(short = 'i', long = "ignore-filename-regex", verbatim_doc_comment)]
     pub ignore_filename_regex: Vec<String>,
 }
 
+#[derive(Default, Clone, PartialEq, Eq, Debug, Args)]
+pub struct CodeReportArgs {
+    /// Output file path
+    #[arg(short, long, verbatim_doc_comment)]
+    pub path: Option<String>,
+
+    /// Output format
+    #[arg(short, long, verbatim_doc_comment)]
+    pub format: Option<OutputFormat>,
+}
+
 #[derive(Default, Clone, PartialEq, Eq, Debug, Args)]
 pub struct AllArgs {
     #[command(subcommand)]
diff --git a/framework/meta/src/cli/cli_standalone_main.rs b/framework/meta/src/cli/cli_standalone_main.rs
index 6c8c6a67b0..a33bc659d2 100644
--- a/framework/meta/src/cli/cli_standalone_main.rs
+++ b/framework/meta/src/cli/cli_standalone_main.rs
@@ -3,6 +3,7 @@ use crate::cmd::retrieve_address::retrieve_address;
 use clap::Parser;
 
 use crate::cmd::all::call_all_meta;
+use crate::cmd::code_report::code_report;
 use crate::cmd::info::call_info;
 use crate::cmd::install::install;
 use crate::cmd::local_deps::local_deps;
@@ -10,6 +11,7 @@ use crate::cmd::scen_test_gen::test_gen_tool;
 use crate::cmd::template::{create_contract, print_template_names};
 use crate::cmd::test::test;
 use crate::cmd::test_coverage::test_coverage;
+
 use crate::cmd::upgrade::upgrade_sc;
 
 /// Entry point in the program when calling it as a standalone tool.
@@ -35,6 +37,9 @@ pub async fn cli_main_standalone() {
         Some(StandaloneCliAction::TestCoverage(args)) => {
             test_coverage(args);
         },
+        Some(StandaloneCliAction::CodeReportGen(args)) => {
+            code_report(args);
+        },
         Some(StandaloneCliAction::Account(args)) => {
             retrieve_address(args).await;
         },
diff --git a/framework/meta/src/cmd.rs b/framework/meta/src/cmd.rs
index a588f90162..2a3ebe65cd 100644
--- a/framework/meta/src/cmd.rs
+++ b/framework/meta/src/cmd.rs
@@ -1,4 +1,5 @@
 pub mod all;
+pub mod code_report;
 pub mod info;
 pub mod install;
 pub mod local_deps;
diff --git a/framework/meta/src/cmd/code_report.rs b/framework/meta/src/cmd/code_report.rs
new file mode 100644
index 0000000000..c059b176bc
--- /dev/null
+++ b/framework/meta/src/cmd/code_report.rs
@@ -0,0 +1,16 @@
+pub mod code_report;
+pub mod render_code_report;
+
+use code_report::run_code_report;
+
+use crate::cli::CodeReportArgs;
+
+pub fn code_report(args: &CodeReportArgs) {
+    let path = if let Some(some_path) = &args.path {
+        some_path.as_str()
+    } else {
+        "./"
+    };
+
+    run_code_report(path);
+}
diff --git a/framework/meta/src/cmd/code_report/code_report.rs b/framework/meta/src/cmd/code_report/code_report.rs
new file mode 100644
index 0000000000..8a6151bd6e
--- /dev/null
+++ b/framework/meta/src/cmd/code_report/code_report.rs
@@ -0,0 +1,81 @@
+use std::{fs::File, path::PathBuf, process::Command};
+
+use crate::folder_structure::RelevantDirectories;
+
+use multiversx_sc_meta_lib::{
+    self, code_report_json::CodeReportJson, mxsc_file_json::MxscFileJson,
+};
+
+use super::render_code_report::render_report;
+
+pub fn run_code_report(
+    path: &str,
+    // output_path: &str,
+    // output_format: &OutputFormat,
+) {
+    let directors = RelevantDirectories::find_all(path, &["".to_owned()]);
+
+    let reports = extract_report(directors);
+    let mut output = String::new();
+    render_report(&mut output, &reports);
+
+    println!("{output}");
+}
+
+fn build_contract(path: &PathBuf) {
+    Command::new("sc-meta")
+        .arg("all")
+        .arg("build")
+        .arg("--path")
+        .arg(path)
+        .output()
+        .expect(&format!(
+            "Failed to build the contract for path: {}",
+            path.display()
+        ));
+}
+
+fn clean_contract(path: &PathBuf) {
+    Command::new("sc-meta")
+        .arg("all")
+        .arg("clean")
+        .arg("--path")
+        .arg(path)
+        .output()
+        .expect(&format!(
+            "Failed to clean the contract for path: {}",
+            path.display()
+        ));
+}
+
+fn extract_report(directors: RelevantDirectories) -> Vec<CodeReportJson> {
+    let mut reports: Vec<CodeReportJson> = Vec::new();
+
+    for director in directors.iter() {
+        build_contract(&director.path);
+
+        // find only one wasm file
+
+        let contract_name = director.path.to_str().unwrap().split("/").last().unwrap();
+        println!(">> {contract_name}");
+
+        let mxsc_path = format!(
+            "{}/output/{contract_name}.mxsc.json",
+            director.path.display()
+        );
+        let mxsc_file = File::open(mxsc_path);
+
+        match mxsc_file {
+            Ok(f) => {
+                let data: MxscFileJson = serde_json::from_reader(f).unwrap();
+
+                reports.push(data.report.code_report);
+
+                clean_contract(&director.path);
+            },
+            Err(_) => continue,
+        }
+    }
+
+    reports
+}
diff --git a/framework/meta/src/cmd/code_report/render_code_report.rs b/framework/meta/src/cmd/code_report/render_code_report.rs
new file mode 100644
index 0000000000..6b06d7c465
--- /dev/null
+++ b/framework/meta/src/cmd/code_report/render_code_report.rs
@@ -0,0 +1,32 @@
+use std::fmt::Write;
+
+use multiversx_sc_meta_lib::code_report_json::CodeReportJson;
+
+fn writeln_output_str<S: AsRef<str>>(output: &mut String, input: S) {
+    output.write_str(&format!("{}\n", input.as_ref())).ok();
+}
+
+pub fn render_report(output: &mut String, reports: &Vec<CodeReportJson>) {
+    render_header(output);
+    render_reports(output, reports);
+}
+
+fn render_header(output: &mut String) {
+    writeln_output_str(output, "| Path                                                         |                                     size |                  has-allocator |                     has-format |");
+    writeln_output_str(output, "| :-- | --: | --: | --: |");
+}
+
+fn render_reports(output: &mut String, reports: &Vec<CodeReportJson>) {
+    for report in reports {
+        writeln_output_str(
+            output,
+            format!(
+                "|  - {} | {} | {} | {} |",
+                report.path.split("/").last().expect("no output path"),
+                report.size,
+                report.has_allocator,
+                report.has_panic
+            ),
+        );
+    }
+}
diff --git a/framework/meta/src/cmd/test_coverage.rs b/framework/meta/src/cmd/test_coverage.rs
index 363fcc9372..0ece2454fb 100644
--- a/framework/meta/src/cmd/test_coverage.rs
+++ b/framework/meta/src/cmd/test_coverage.rs
@@ -6,7 +6,7 @@ mod run;
 mod util;
 
 use crate::{
-    cli::{TestCoverageArgs, TestCoverageOutputFormat},
+    cli::{OutputFormat, TestCoverageArgs},
     cmd::test_coverage::{cargo::get_workspace_root, run::run_test_coverage},
 };
 use std::process;
@@ -16,9 +16,7 @@ pub fn test_coverage(args: &TestCoverageArgs) {
     if let Err(err) = run_test_coverage(
         &root_path,
         &args.output,
-        args.format
-            .as_ref()
-            .unwrap_or(&TestCoverageOutputFormat::default()),
+        args.format.as_ref().unwrap_or(&OutputFormat::default()),
         &args.ignore_filename_regex,
     ) {
         eprintln!("{}", err);
diff --git a/framework/meta/src/cmd/test_coverage/run.rs b/framework/meta/src/cmd/test_coverage/run.rs
index edb165824b..687d404009 100644
--- a/framework/meta/src/cmd/test_coverage/run.rs
+++ b/framework/meta/src/cmd/test_coverage/run.rs
@@ -1,7 +1,7 @@
 use std::fs;
 
 use crate::{
-    cli::TestCoverageOutputFormat,
+    cli::OutputFormat,
     cmd::test_coverage::{
         cargo::{get_instrumented_test_binaries_paths, run_instrumented_tests},
         error::TestCoverageError,
@@ -16,7 +16,7 @@ use crate::{
 pub fn run_test_coverage(
     root_path: &str,
     output_path: &str,
-    output_format: &TestCoverageOutputFormat,
+    output_format: &OutputFormat,
     ignore_filename_regex: &[String],
 ) -> Result<(), TestCoverageError> {
     ensure_dependencies_in_path()?;
@@ -43,10 +43,10 @@ pub fn run_test_coverage(
     let mut output = String::new();
 
     match output_format {
-        TestCoverageOutputFormat::Markdown => {
+        OutputFormat::Markdown => {
             render_coverage(&mut output, &coverage, root_path);
         },
-        TestCoverageOutputFormat::Json => {
+        OutputFormat::Json => {
             output = serde_json::to_string_pretty(&coverage).unwrap();
         },
     };

From c9ea2aebb20078c041d86bcfa6150a1533840e04 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Wed, 17 Jul 2024 18:42:50 +0300
Subject: [PATCH 1099/1254] cli report code - multi .wasm report fix

---
 .../meta/src/cmd/code_report/code_report.rs   | 57 +++++++++++--------
 .../src/cmd/code_report/render_code_report.rs |  4 +-
 2 files changed, 34 insertions(+), 27 deletions(-)

diff --git a/framework/meta/src/cmd/code_report/code_report.rs b/framework/meta/src/cmd/code_report/code_report.rs
index 8a6151bd6e..57ac6f857e 100644
--- a/framework/meta/src/cmd/code_report/code_report.rs
+++ b/framework/meta/src/cmd/code_report/code_report.rs
@@ -1,4 +1,8 @@
-use std::{fs::File, path::PathBuf, process::Command};
+use std::{
+    fs::{read_dir, File},
+    path::PathBuf,
+    process::Command,
+};
 
 use crate::folder_structure::RelevantDirectories;
 
@@ -29,10 +33,7 @@ fn build_contract(path: &PathBuf) {
         .arg("--path")
         .arg(path)
         .output()
-        .expect(&format!(
-            "Failed to build the contract for path: {}",
-            path.display()
-        ));
+        .unwrap_or_else(|_| panic!("Failed to build the contract for path: {}", path.display()));
 }
 
 fn clean_contract(path: &PathBuf) {
@@ -42,10 +43,7 @@ fn clean_contract(path: &PathBuf) {
         .arg("--path")
         .arg(path)
         .output()
-        .expect(&format!(
-            "Failed to clean the contract for path: {}",
-            path.display()
-        ));
+        .unwrap_or_else(|_| panic!("Failed to clean the contract for path: {}", path.display()));
 }
 
 fn extract_report(directors: RelevantDirectories) -> Vec<CodeReportJson> {
@@ -54,28 +52,37 @@ fn extract_report(directors: RelevantDirectories) -> Vec<CodeReportJson> {
     for director in directors.iter() {
         build_contract(&director.path);
 
-        // find only one wasm file
+        let output_path: PathBuf = director.path.join("output");
 
-        let contract_name = director.path.to_str().unwrap().split("/").last().unwrap();
-        println!(">> {contract_name}");
+        extract_reports(&output_path, &mut reports);
 
-        let mxsc_path = format!(
-            "{}/output/{contract_name}.mxsc.json",
-            director.path.display()
-        );
-        let mxsc_file = File::open(mxsc_path);
+        clean_contract(&director.path);
+    }
 
-        match mxsc_file {
-            Ok(f) => {
-                let data: MxscFileJson = serde_json::from_reader(f).unwrap();
+    reports
+}
 
-                reports.push(data.report.code_report);
+fn find_mxsc_files(path: &PathBuf) -> Vec<PathBuf> {
+    if !path.is_dir() {
+        return vec![];
+    }
 
-                clean_contract(&director.path);
-            },
-            Err(_) => continue,
+    let mut mxsc_files = Vec::new();
+    for entry in read_dir(path).unwrap() {
+        let file_path = entry.unwrap().path();
+        if file_path.to_str().unwrap().ends_with(".mxsc.json") {
+            mxsc_files.push(file_path);
         }
     }
 
-    reports
+    mxsc_files
+}
+
+fn extract_reports(path: &PathBuf, reports: &mut Vec<CodeReportJson>) {
+    for mxsc_path in find_mxsc_files(path) {
+        let mxsc_file =
+            File::open(mxsc_path).unwrap_or_else(|_| panic!("Failed to open mxsc file"));
+        let data: MxscFileJson = serde_json::from_reader(mxsc_file).unwrap();
+        reports.push(data.report.code_report);
+    }
 }
diff --git a/framework/meta/src/cmd/code_report/render_code_report.rs b/framework/meta/src/cmd/code_report/render_code_report.rs
index 6b06d7c465..e69466337b 100644
--- a/framework/meta/src/cmd/code_report/render_code_report.rs
+++ b/framework/meta/src/cmd/code_report/render_code_report.rs
@@ -21,8 +21,8 @@ fn render_reports(output: &mut String, reports: &Vec<CodeReportJson>) {
         writeln_output_str(
             output,
             format!(
-                "|  - {} | {} | {} | {} |",
-                report.path.split("/").last().expect("no output path"),
+                "| {} | {} | {} | {} |",
+                report.path.split('/').last().expect("no output path"),
                 report.size,
                 report.has_allocator,
                 report.has_panic

From 356ac5ee2c81519916f6c9aebdca5f340efa75ea Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Wed, 17 Jul 2024 20:25:54 +0300
Subject: [PATCH 1100/1254] cli report code - generate markdown

---
 framework/meta/src/cli/cli_args_standalone.rs |  7 ++-
 framework/meta/src/cmd/code_report.rs         |  8 ++-
 .../meta/src/cmd/code_report/code_report.rs   | 61 +++++++++++--------
 3 files changed, 48 insertions(+), 28 deletions(-)

diff --git a/framework/meta/src/cli/cli_args_standalone.rs b/framework/meta/src/cli/cli_args_standalone.rs
index 463faf68a0..bff415423e 100644
--- a/framework/meta/src/cli/cli_args_standalone.rs
+++ b/framework/meta/src/cli/cli_args_standalone.rs
@@ -144,10 +144,15 @@ pub struct TestCoverageArgs {
 
 #[derive(Default, Clone, PartialEq, Eq, Debug, Args)]
 pub struct CodeReportArgs {
-    /// Output file path
+    /// Target directory where to generate code report.
+    /// Will be current directory if not specified.
     #[arg(short, long, verbatim_doc_comment)]
     pub path: Option<String>,
 
+    /// Output file path
+    #[arg(short, long, verbatim_doc_comment)]
+    pub output: String,
+
     /// Output format
     #[arg(short, long, verbatim_doc_comment)]
     pub format: Option<OutputFormat>,
diff --git a/framework/meta/src/cmd/code_report.rs b/framework/meta/src/cmd/code_report.rs
index c059b176bc..1a879d4604 100644
--- a/framework/meta/src/cmd/code_report.rs
+++ b/framework/meta/src/cmd/code_report.rs
@@ -3,7 +3,7 @@ pub mod render_code_report;
 
 use code_report::run_code_report;
 
-use crate::cli::CodeReportArgs;
+use crate::cli::{CodeReportArgs, OutputFormat};
 
 pub fn code_report(args: &CodeReportArgs) {
     let path = if let Some(some_path) = &args.path {
@@ -12,5 +12,9 @@ pub fn code_report(args: &CodeReportArgs) {
         "./"
     };
 
-    run_code_report(path);
+    run_code_report(
+        path,
+        &args.output,
+        args.format.as_ref().unwrap_or(&OutputFormat::default()),
+    );
 }
diff --git a/framework/meta/src/cmd/code_report/code_report.rs b/framework/meta/src/cmd/code_report/code_report.rs
index 57ac6f857e..801c40d7f2 100644
--- a/framework/meta/src/cmd/code_report/code_report.rs
+++ b/framework/meta/src/cmd/code_report/code_report.rs
@@ -1,10 +1,10 @@
 use std::{
-    fs::{read_dir, File},
+    fs::{self, read_dir, File},
     path::PathBuf,
     process::Command,
 };
 
-use crate::folder_structure::RelevantDirectories;
+use crate::{cli::OutputFormat, folder_structure::RelevantDirectories};
 
 use multiversx_sc_meta_lib::{
     self, code_report_json::CodeReportJson, mxsc_file_json::MxscFileJson,
@@ -12,18 +12,45 @@ use multiversx_sc_meta_lib::{
 
 use super::render_code_report::render_report;
 
-pub fn run_code_report(
-    path: &str,
-    // output_path: &str,
-    // output_format: &OutputFormat,
-) {
+pub fn run_code_report(path: &str, output_path: &str, output_format: &OutputFormat) {
     let directors = RelevantDirectories::find_all(path, &["".to_owned()]);
 
     let reports = extract_report(directors);
     let mut output = String::new();
-    render_report(&mut output, &reports);
 
-    println!("{output}");
+    match output_format {
+        OutputFormat::Markdown => {
+            render_report(&mut output, &reports);
+        },
+        OutputFormat::Json => {
+            for report in reports {
+                output.insert_str(
+                    output.len(),
+                    &serde_json::to_string_pretty(&report).unwrap(),
+                );
+            }
+        },
+    };
+
+    let Ok(_) = fs::write(output_path, output) else {
+        return;
+    };
+}
+
+fn extract_report(directors: RelevantDirectories) -> Vec<CodeReportJson> {
+    let mut reports: Vec<CodeReportJson> = Vec::new();
+
+    for director in directors.iter() {
+        build_contract(&director.path);
+
+        let output_path: PathBuf = director.path.join("output");
+
+        extract_reports(&output_path, &mut reports);
+
+        clean_contract(&director.path);
+    }
+
+    reports
 }
 
 fn build_contract(path: &PathBuf) {
@@ -46,22 +73,6 @@ fn clean_contract(path: &PathBuf) {
         .unwrap_or_else(|_| panic!("Failed to clean the contract for path: {}", path.display()));
 }
 
-fn extract_report(directors: RelevantDirectories) -> Vec<CodeReportJson> {
-    let mut reports: Vec<CodeReportJson> = Vec::new();
-
-    for director in directors.iter() {
-        build_contract(&director.path);
-
-        let output_path: PathBuf = director.path.join("output");
-
-        extract_reports(&output_path, &mut reports);
-
-        clean_contract(&director.path);
-    }
-
-    reports
-}
-
 fn find_mxsc_files(path: &PathBuf) -> Vec<PathBuf> {
     if !path.is_dir() {
         return vec![];

From ccccc4b9a66d06f89d3a47867ee7fbd1df64b4c3 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 18 Jul 2024 13:34:24 +0300
Subject: [PATCH 1101/1254] interactor Wallet in imports

---
 framework/snippets/src/imports.rs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/framework/snippets/src/imports.rs b/framework/snippets/src/imports.rs
index f2b0e6a5f9..d416955e4c 100644
--- a/framework/snippets/src/imports.rs
+++ b/framework/snippets/src/imports.rs
@@ -4,5 +4,7 @@ pub use crate::{
     dns_address_for_name, test_wallets, Interactor, InteractorPrepareAsync, StepBuffer,
 };
 
+pub use multiversx_sdk::wallet::Wallet;
+
 pub use env_logger;
 pub use tokio;

From 1ec9f6b9988b4dee80b87551304b0789f03334e3 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 18 Jul 2024 13:34:41 +0300
Subject: [PATCH 1102/1254] adder interactor - pem example

---
 contracts/examples/adder/interact/.gitignore     |  1 +
 .../examples/adder/interact/adder-owner.pem      |  5 +++++
 .../adder/interact/src/basic_interact.rs         | 16 ++++++++++++----
 3 files changed, 18 insertions(+), 4 deletions(-)
 create mode 100644 contracts/examples/adder/interact/adder-owner.pem

diff --git a/contracts/examples/adder/interact/.gitignore b/contracts/examples/adder/interact/.gitignore
index ea1b920080..b2630809de 100644
--- a/contracts/examples/adder/interact/.gitignore
+++ b/contracts/examples/adder/interact/.gitignore
@@ -1,5 +1,6 @@
 # Pem files are used for interactions, but shouldn't be committed
 *.pem
+!adder-owner.pem
 
 # Temporary storage of deployed contract address, so we can preserve the context between executions.
 state.toml
diff --git a/contracts/examples/adder/interact/adder-owner.pem b/contracts/examples/adder/interact/adder-owner.pem
new file mode 100644
index 0000000000..66f04c2160
--- /dev/null
+++ b/contracts/examples/adder/interact/adder-owner.pem
@@ -0,0 +1,5 @@
+-----BEGIN PRIVATE KEY for erd1s0a83vp2wmsvgphplkn8amkn8tnfd777zlut3e2lazgdzdu6z46qpgx3vz-----
+MWIyYTQ3ZmIzMzcxODUxZTE3Njk5N2M0NTNmZDY1ODFkM2U5NjlhYmM1ODMzMTI0
+MjNkYzAyNGI3YzZlNmVlNjgzZmE3OGIwMmE3NmUwYzQwNmUxZmRhNjdlZWVkMzNh
+ZTY5NmZiZGUxN2Y4YjhlNTVmZTg5MGQxMzc5YTE1NzQ=
+-----END PRIVATE KEY for erd1s0a83vp2wmsvgphplkn8amkn8tnfd777zlut3e2lazgdzdu6z46qpgx3vz-----
\ No newline at end of file
diff --git a/contracts/examples/adder/interact/src/basic_interact.rs b/contracts/examples/adder/interact/src/basic_interact.rs
index dbac430d2a..f518c54752 100644
--- a/contracts/examples/adder/interact/src/basic_interact.rs
+++ b/contracts/examples/adder/interact/src/basic_interact.rs
@@ -46,6 +46,7 @@ async fn main() {
 #[allow(unused)]
 struct AdderInteract {
     interactor: Interactor,
+    adder_owner_address: Bech32Address,
     wallet_address: Bech32Address,
     state: State,
 }
@@ -57,10 +58,14 @@ impl AdderInteract {
             .await
             .with_tracer(INTERACTOR_SCENARIO_TRACE_PATH)
             .await;
+
+        let adder_owner_address =
+            interactor.register_wallet(Wallet::from_pem_file("adder-owner.pem").unwrap());
         let wallet_address = interactor.register_wallet(test_wallets::mike());
 
         Self {
             interactor,
+            adder_owner_address: adder_owner_address.into(),
             wallet_address: wallet_address.into(),
             state: State::load_state(),
         }
@@ -68,6 +73,9 @@ impl AdderInteract {
 
     async fn set_state(&mut self) {
         println!("wallet address: {}", self.wallet_address);
+        self.interactor
+            .retrieve_account(&self.adder_owner_address)
+            .await;
         self.interactor.retrieve_account(&self.wallet_address).await;
     }
 
@@ -80,8 +88,8 @@ impl AdderInteract {
         let new_address = self
             .interactor
             .tx()
-            .from(&self.wallet_address)
-            .gas(NumExpr("30,000,000"))
+            .from(&self.adder_owner_address)
+            .gas(3_000_000)
             .typed(adder_proxy::AdderProxy)
             .init(0u32)
             .code(ADDER_CODE_PATH)
@@ -144,7 +152,7 @@ impl AdderInteract {
             .tx()
             .from(&self.wallet_address)
             .to(self.state.current_adder_address())
-            .gas(NumExpr("30,000,000"))
+            .gas(3_000_000)
             .typed(adder_proxy::AdderProxy)
             .add(value)
             .prepare_async()
@@ -175,7 +183,7 @@ impl AdderInteract {
             .tx()
             .from(&self.wallet_address)
             .to(self.state.current_adder_address())
-            .gas(NumExpr("30,000,000"))
+            .gas(3_000_000)
             .typed(adder_proxy::AdderProxy)
             .upgrade(BigUint::from(new_value))
             .code_metadata(CodeMetadata::UPGRADEABLE)

From 1000791c5931642ce69bb18b455ee82ddcd513ac Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 18 Jul 2024 14:00:46 +0300
Subject: [PATCH 1103/1254] adder interactor - multi add

---
 .../adder/interact/src/basic_interact.rs      | 36 +++++++++++++++----
 .../adder/interact/src/basic_interact_cli.rs  | 12 ++++---
 2 files changed, 38 insertions(+), 10 deletions(-)

diff --git a/contracts/examples/adder/interact/src/basic_interact.rs b/contracts/examples/adder/interact/src/basic_interact.rs
index f518c54752..262eb13631 100644
--- a/contracts/examples/adder/interact/src/basic_interact.rs
+++ b/contracts/examples/adder/interact/src/basic_interact.rs
@@ -22,7 +22,11 @@ async fn main() {
     let cli = basic_interact_cli::InteractCli::parse();
     match &cli.command {
         Some(basic_interact_cli::InteractCliCommand::Add(args)) => {
-            basic_interact.add(args.value).await;
+            if args.count == 1 {
+                basic_interact.add(args.value).await;
+            } else {
+                basic_interact.multi_add(args.value, args.count).await;
+            }
         },
         Some(basic_interact_cli::InteractCliCommand::Deploy) => {
             basic_interact.deploy().await;
@@ -31,7 +35,7 @@ async fn main() {
             basic_interact.feed_contract_egld().await;
         },
         Some(basic_interact_cli::InteractCliCommand::MultiDeploy(args)) => {
-            basic_interact.multi_deploy(&args.count).await;
+            basic_interact.multi_deploy(args.count).await;
         },
         Some(basic_interact_cli::InteractCliCommand::Sum) => {
             basic_interact.print_sum().await;
@@ -103,8 +107,8 @@ impl AdderInteract {
         self.state.set_adder_address(new_address);
     }
 
-    async fn multi_deploy(&mut self, count: &u8) {
-        if *count == 0 {
+    async fn multi_deploy(&mut self, count: usize) {
+        if count == 0 {
             println!("count must be greater than 0");
             return;
         }
@@ -113,13 +117,13 @@ impl AdderInteract {
         println!("deploying {count} contracts...");
 
         let mut buffer = self.interactor.homogenous_call_buffer();
-        for _ in 0..*count {
+        for _ in 0..count {
             buffer.push_tx(|tx| {
                 tx.from(&self.wallet_address)
                     .typed(adder_proxy::AdderProxy)
                     .init(0u32)
                     .code(ADDER_CODE_PATH)
-                    .gas(NumExpr("70,000,000"))
+                    .gas(3_000_000)
                     .returns(ReturnsNewBech32Address)
             });
         }
@@ -136,6 +140,26 @@ impl AdderInteract {
         }
     }
 
+    async fn multi_add(&mut self, value: u32, count: usize) {
+        self.set_state().await;
+        println!("calling contract {count} times...");
+
+        let mut buffer = self.interactor.homogenous_call_buffer();
+        for _ in 0..count {
+            buffer.push_tx(|tx| {
+                tx.from(&self.wallet_address)
+                    .to(self.state.current_adder_address())
+                    .typed(adder_proxy::AdderProxy)
+                    .add(value)
+                    .gas(3_000_000)
+            });
+        }
+
+        let _ = buffer.run().await;
+
+        println!("successfully performed add {count} times");
+    }
+
     async fn feed_contract_egld(&mut self) {
         self.interactor
             .tx()
diff --git a/contracts/examples/adder/interact/src/basic_interact_cli.rs b/contracts/examples/adder/interact/src/basic_interact_cli.rs
index cfa0c3155f..6766981802 100644
--- a/contracts/examples/adder/interact/src/basic_interact_cli.rs
+++ b/contracts/examples/adder/interact/src/basic_interact_cli.rs
@@ -29,20 +29,24 @@ pub enum InteractCliCommand {
 #[derive(Default, Clone, PartialEq, Eq, Debug, Args)]
 pub struct AddArgs {
     /// The value to add
-    #[arg(short = 'v', long = "value", verbatim_doc_comment)]
+    #[arg(short = 'v', long = "value")]
     pub value: u32,
+
+    /// Repeat this number of times
+    #[arg(short = 'c', long = "count", default_value = "1")]
+    pub count: usize,
 }
 
 #[derive(Default, Clone, PartialEq, Eq, Debug, Args)]
 pub struct UpgradeArgs {
     /// The value to add
-    #[arg(short = 'v', long = "value", verbatim_doc_comment)]
+    #[arg(short = 'v', long = "value")]
     pub value: u32,
 }
 
 #[derive(Default, Clone, PartialEq, Eq, Debug, Args)]
 pub struct MultiDeployArgs {
     /// The number of contracts to deploy
-    #[arg(short = 'c', long = "count", verbatim_doc_comment)]
-    pub count: u8,
+    #[arg(short = 'c', long = "count")]
+    pub count: usize,
 }

From 6f94f55d57f47adcf4517c8ad5842b1b359bd14f Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Thu, 18 Jul 2024 16:53:02 +0300
Subject: [PATCH 1104/1254] gas limit u64 instead of NumExpr

---
 .../generate_snippets/snippet_sc_functions_gen.rs         | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/framework/meta-lib/src/contract/generate_snippets/snippet_sc_functions_gen.rs b/framework/meta-lib/src/contract/generate_snippets/snippet_sc_functions_gen.rs
index 94f3489a03..d450decd82 100644
--- a/framework/meta-lib/src/contract/generate_snippets/snippet_sc_functions_gen.rs
+++ b/framework/meta-lib/src/contract/generate_snippets/snippet_sc_functions_gen.rs
@@ -4,7 +4,7 @@ use multiversx_sc::abi::{ContractAbi, EndpointAbi, EndpointMutabilityAbi, InputA
 
 use super::{snippet_gen_common::write_newline, snippet_type_map::map_abi_type_to_rust_type};
 
-const DEFAULT_GAS: &str = "30,000,000";
+const DEFAULT_GAS: &str = "30_000_000u64";
 
 pub(crate) fn write_interact_struct_impl(
     file: &mut File,
@@ -60,7 +60,7 @@ fn write_deploy_method_impl(file: &mut File, init_abi: &EndpointAbi, name: &Stri
             .interactor
             .tx()
             .from(&self.wallet_address)
-            .gas(NumExpr("{DEFAULT_GAS}"))
+            .gas({DEFAULT_GAS})
             .typed(proxy::{})
             .init({})
             .code(&self.contract_code)
@@ -95,7 +95,7 @@ fn write_upgrade_endpoint_impl(file: &mut File, upgrade_abi: &EndpointAbi, name:
             .tx()
             .to(self.state.current_address())
             .from(&self.wallet_address)
-            .gas(NumExpr("{DEFAULT_GAS}"))
+            .gas({DEFAULT_GAS})
             .typed(proxy::{})
             .upgrade({})
             .code(&self.contract_code)
@@ -210,7 +210,7 @@ fn write_contract_call(file: &mut File, endpoint_abi: &EndpointAbi, name: &Strin
             .tx()
             .from(&self.wallet_address)
             .to(self.state.current_address())
-            .gas(NumExpr("{DEFAULT_GAS}"))
+            .gas({DEFAULT_GAS})
             .typed(proxy::{}Proxy)
             .{}({}){}
             .returns(ReturnsResultUnmanaged)

From 5e8956ec7c3a7e4817a1724f3327352e2918465f Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Fri, 19 Jul 2024 23:24:46 +0300
Subject: [PATCH 1105/1254] cli code report - compare .md files

---
 contracts/benchmarks/report.json              |   1 +
 framework/meta/src/cli/cli_args_standalone.rs |   6 +-
 framework/meta/src/cmd/code_report.rs         |   5 +-
 .../meta/src/cmd/code_report/code_report.rs   |  11 +-
 .../src/cmd/code_report/render_code_report.rs | 161 +++++++++++++++++-
 out.md                                        |  94 ++++++++++
 sdk/core/src/gateway/gateway_proxy.rs         |   2 +-
 7 files changed, 265 insertions(+), 15 deletions(-)
 create mode 100644 contracts/benchmarks/report.json
 create mode 100644 out.md

diff --git a/contracts/benchmarks/report.json b/contracts/benchmarks/report.json
new file mode 100644
index 0000000000..bb94c6b60a
--- /dev/null
+++ b/contracts/benchmarks/report.json
@@ -0,0 +1 @@
+[{"path":"../output/send-tx-repeat.wasm","size":901,"hasAllocator":false,"hasPanic":"none"},{"path":"../output/large-storage.wasm","size":2164,"hasAllocator":false,"hasPanic":"without message"},{"path":"../output/map-repeat.wasm","size":7234,"hasAllocator":false,"hasPanic":"without message"},{"path":"../output/queue-repeat.wasm","size":5853,"hasAllocator":false,"hasPanic":"without message"},{"path":"../output/set-repeat.wasm","size":7013,"hasAllocator":false,"hasPanic":"without message"},{"path":"../output/single-value-repeat.wasm","size":4440,"hasAllocator":false,"hasPanic":"without message"},{"path":"../output/linked-list-repeat.wasm","size":6681,"hasAllocator":true,"hasPanic":"without message"},{"path":"../output/vec-repeat.wasm","size":5231,"hasAllocator":false,"hasPanic":"without message"},{"path":"../output/str-repeat.wasm","size":2389,"hasAllocator":false,"hasPanic":"without message"},{"path":"../output/str-repeat-mb-builder-cached.wasm","size":1139,"hasAllocator":false,"hasPanic":"without message"},{"path":"../output/str-repeat-mb-builder-basic.wasm","size":759,"hasAllocator":false,"hasPanic":"none"}]
\ No newline at end of file
diff --git a/framework/meta/src/cli/cli_args_standalone.rs b/framework/meta/src/cli/cli_args_standalone.rs
index bff415423e..453b136432 100644
--- a/framework/meta/src/cli/cli_args_standalone.rs
+++ b/framework/meta/src/cli/cli_args_standalone.rs
@@ -151,11 +151,15 @@ pub struct CodeReportArgs {
 
     /// Output file path
     #[arg(short, long, verbatim_doc_comment)]
-    pub output: String,
+    pub output: Option<String>,
 
     /// Output format
     #[arg(short, long, verbatim_doc_comment)]
     pub format: Option<OutputFormat>,
+
+    /// Compare
+    #[arg(short, long, verbatim_doc_comment)]
+    pub compare: Option<String>,
 }
 
 #[derive(Default, Clone, PartialEq, Eq, Debug, Args)]
diff --git a/framework/meta/src/cmd/code_report.rs b/framework/meta/src/cmd/code_report.rs
index 1a879d4604..a10efc78dc 100644
--- a/framework/meta/src/cmd/code_report.rs
+++ b/framework/meta/src/cmd/code_report.rs
@@ -6,7 +6,7 @@ use code_report::run_code_report;
 use crate::cli::{CodeReportArgs, OutputFormat};
 
 pub fn code_report(args: &CodeReportArgs) {
-    let path = if let Some(some_path) = &args.path {
+    let path: &str = if let Some(some_path) = &args.path {
         some_path.as_str()
     } else {
         "./"
@@ -14,7 +14,8 @@ pub fn code_report(args: &CodeReportArgs) {
 
     run_code_report(
         path,
-        &args.output,
+        args.output.as_ref().unwrap_or(&"./report.md".to_string()),
         args.format.as_ref().unwrap_or(&OutputFormat::default()),
+        &args.compare.clone().unwrap_or(String::new()),
     );
 }
diff --git a/framework/meta/src/cmd/code_report/code_report.rs b/framework/meta/src/cmd/code_report/code_report.rs
index 801c40d7f2..3c2fce2c6b 100644
--- a/framework/meta/src/cmd/code_report/code_report.rs
+++ b/framework/meta/src/cmd/code_report/code_report.rs
@@ -12,7 +12,7 @@ use multiversx_sc_meta_lib::{
 
 use super::render_code_report::render_report;
 
-pub fn run_code_report(path: &str, output_path: &str, output_format: &OutputFormat) {
+pub fn run_code_report(path: &str, output_path: &str, output_format: &OutputFormat, compare: &str) {
     let directors = RelevantDirectories::find_all(path, &["".to_owned()]);
 
     let reports = extract_report(directors);
@@ -20,15 +20,10 @@ pub fn run_code_report(path: &str, output_path: &str, output_format: &OutputForm
 
     match output_format {
         OutputFormat::Markdown => {
-            render_report(&mut output, &reports);
+            render_report(&mut output, &reports, compare);
         },
         OutputFormat::Json => {
-            for report in reports {
-                output.insert_str(
-                    output.len(),
-                    &serde_json::to_string_pretty(&report).unwrap(),
-                );
-            }
+            output = serde_json::to_string(&reports).unwrap();
         },
     };
 
diff --git a/framework/meta/src/cmd/code_report/render_code_report.rs b/framework/meta/src/cmd/code_report/render_code_report.rs
index e69466337b..46bd1a52fc 100644
--- a/framework/meta/src/cmd/code_report/render_code_report.rs
+++ b/framework/meta/src/cmd/code_report/render_code_report.rs
@@ -1,4 +1,8 @@
-use std::fmt::Write;
+use std::{
+    fmt::Write,
+    fs::File,
+    io::{BufRead, BufReader},
+};
 
 use multiversx_sc_meta_lib::code_report_json::CodeReportJson;
 
@@ -6,9 +10,14 @@ fn writeln_output_str<S: AsRef<str>>(output: &mut String, input: S) {
     output.write_str(&format!("{}\n", input.as_ref())).ok();
 }
 
-pub fn render_report(output: &mut String, reports: &Vec<CodeReportJson>) {
+pub fn render_report(output: &mut String, reports: &Vec<CodeReportJson>, compared_path_file: &str) {
     render_header(output);
-    render_reports(output, reports);
+
+    if compared_path_file.is_empty() {
+        render_reports(output, reports);
+    } else {
+        render_and_compare(output, reports, compared_path_file);
+    }
 }
 
 fn render_header(output: &mut String) {
@@ -30,3 +39,149 @@ fn render_reports(output: &mut String, reports: &Vec<CodeReportJson>) {
         );
     }
 }
+
+fn render_and_compare(
+    output: &mut String,
+    reports: &Vec<CodeReportJson>,
+    compared_path_file: &str,
+) {
+    let compared_file = File::open(compared_path_file).unwrap_or_else(|_| {
+        panic!(
+            "Failed to open compared file at path: {}",
+            compared_path_file
+        )
+    });
+
+    let mut compared_reports = Vec::new();
+    if compared_path_file.ends_with("md") {
+        compared_reports = parse_into_code_report_json(compared_file);
+    } else {
+    }
+
+    for report in reports.iter() {
+        let path: String = report
+            .path
+            .split('/')
+            .last()
+            .expect("no output path")
+            .to_owned();
+        if compared_reports.is_empty() {
+            writeln_output_str(
+                output,
+                format!(
+                    "| {} | {} | {} | {} |",
+                    path, report.size, report.has_allocator, report.has_panic
+                ),
+            );
+            continue;
+        }
+
+        if let Some(compared_report) = find_report_by_path(&compared_reports, &path) {
+            print_compared_output(output, report, compared_report);
+        }
+    }
+}
+
+fn parse_into_code_report_json(compared_file: File) -> Vec<CodeReportJson> {
+    let reader = BufReader::new(compared_file);
+
+    let mut lines = reader.lines().skip(2);
+
+    let mut compared_reports: Vec<CodeReportJson> = Vec::new();
+
+    while let Some(line) = lines.next() {
+        match line {
+            Ok(l) => {
+                let columns: Vec<String> = l
+                    .split('|')
+                    .map(|s| s.trim().to_string())
+                    .filter(|s| !s.is_empty())
+                    .collect();
+
+                if columns.len() == 4 {
+                    compared_reports.push(CodeReportJson {
+                        path: columns[0].to_owned(),
+                        size: columns[1].parse::<usize>().unwrap(),
+                        has_allocator: columns[2].parse::<bool>().unwrap(),
+                        has_panic: columns[3].to_owned(),
+                    })
+                }
+            },
+            Err(_) => return compared_reports,
+        }
+    }
+
+    compared_reports
+}
+
+fn find_report_by_path<'a>(
+    reports: &'a Vec<CodeReportJson>,
+    contract_path: &'a String,
+) -> Option<&'a CodeReportJson> {
+    for report in reports {
+        if report.path == *contract_path {
+            return Some(report);
+        }
+    }
+
+    None
+}
+
+fn print_compared_output(
+    output: &mut String,
+    report: &CodeReportJson,
+    compared_report: &CodeReportJson,
+) {
+    let mut size_report;
+    if report.size == compared_report.size {
+        size_report = format!("{}", report.size);
+    } else {
+        size_report = format!("{} :arrow-right: {}", compared_report.size, report.size);
+        if report.size > compared_report.size {
+            size_report = format!("{size_report} :red-circle:");
+        } else if report.size < compared_report.size {
+            size_report = format!("{size_report} :green-circle:");
+        }
+    }
+
+    let mut has_allocator_report;
+    if report.has_allocator == compared_report.has_allocator {
+        has_allocator_report = format!("{}", report.has_allocator);
+    } else {
+        has_allocator_report = format!(
+            "{} :arrow-right: {}",
+            compared_report.has_allocator, report.has_allocator
+        );
+
+        if !report.has_allocator {
+            has_allocator_report = format!("{has_allocator_report} :green-circle:");
+        } else {
+            has_allocator_report = format!("{has_allocator_report} :red-circle:");
+        }
+    }
+
+    let mut has_panic_report;
+    if report.has_panic == compared_report.has_panic {
+        has_panic_report = format!("{}", report.has_allocator);
+    } else {
+        has_panic_report = format!(
+            "{} :arrow-right: {}",
+            compared_report.has_panic, report.has_panic
+        );
+
+        if report.has_panic == "none" {
+            has_panic_report = format!("{has_panic_report} :green-circle:");
+        }
+    }
+
+    writeln_output_str(
+        output,
+        format!(
+            "| {} | {} | {} | {} |",
+            report.path.split('/').last().expect("no output path"),
+            size_report,
+            has_allocator_report,
+            has_panic_report
+        ),
+    );
+}
diff --git a/out.md b/out.md
new file mode 100644
index 0000000000..ad609f4877
--- /dev/null
+++ b/out.md
@@ -0,0 +1,94 @@
+| Path                                                         |                                     size |                  has-allocator |                     has-format |
+| :-- | --: | --: | --: |
+| token-release.wasm | 7776 | false | without message |
+| adder.wasm | 696 | false | none |
+| order-book-pair.wasm | 13780 | false | without message |
+| order-book-factory.wasm | 3771 | false | without message |
+| nft-storage-prepay.wasm | 2295 | false | none |
+| multisig.wasm | 14145 | false | without message |
+| multisig-full.wasm | 15672 | false | without message |
+| multisig-view.wasm | 6248 | false | without message |
+| bonding-curve-contract.wasm | 14735 | false | without message |
+| seed-nft-minter.wasm | 15118 | false | without message |
+| rewards-distribution.wasm | 10220 | false | without message |
+| crypto-bubbles.wasm | 2347 | false | none |
+| kitty-auction.wasm | 10065 | false | without message |
+| kitty-genetic-alg.wasm | 3147 | false | without message |
+| kitty-ownership.wasm | 12731 | false | without message |
+| nft-subscription.wasm | 8793 | false | without message |
+| proxy-pause.wasm | 4627 | false | without message |
+| lottery-esdt.wasm | 10989 | false | without message |
+| esdt-transfer-with-fee.wasm | 7779 | false | without message |
+| check-pause.wasm | 1228 | false | none |
+| factorial.wasm | 576 | false | none |
+| digital-cash.wasm | 10047 | false | without message |
+| crypto-zombies.wasm | 10304 | false | without message |
+| nft-minter.wasm | 10028 | false | without message |
+| empty.wasm | 241 | false | none |
+| fractional-nfts.wasm | 8447 | false | without message |
+| crowdfunding-esdt.wasm | 3988 | false | none |
+| ping-pong-egld.wasm | 6032 | false | without message |
+| send-tx-repeat.wasm | 901 | false | none |
+| large-storage.wasm | 2164 | false | without message |
+| map-repeat.wasm | 7234 | false | without message |
+| queue-repeat.wasm | 5853 | false | without message |
+| set-repeat.wasm | 7013 | false | without message |
+| single-value-repeat.wasm | 4440 | false | without message |
+| linked-list-repeat.wasm | 6681 | true | without message |
+| vec-repeat.wasm | 5231 | false | without message |
+| str-repeat.wasm | 2389 | false | without message |
+| str-repeat-mb-builder-cached.wasm | 1139 | false | without message |
+| str-repeat-mb-builder-basic.wasm | 759 | false | none |
+| big-float-features.wasm | 6468 | false | without message |
+| erc20.wasm | 2133 | false | none |
+| erc721.wasm | 2578 | false | none |
+| lottery-erc20.wasm | 12814 | false | without message |
+| erc1155-marketplace.wasm | 11172 | false | without message |
+| crowdfunding-erc20.wasm | 5331 | false | without message |
+| erc1155-user-mock.wasm | 1360 | false | without message |
+| erc1155.wasm | 12197 | false | without message |
+| scenario-tester.wasm | 1114 | false | none |
+| managed-map-features.wasm | 1315 | false | none |
+| use-module-view.wasm | 733 | false | none |
+| use-module.wasm | 33452 | false | without message |
+| rust-snippets-generator-test.wasm | 4979 | false | without message |
+| basic-features.wasm | 65181 | false | without message |
+| basic-features-storage-bytes.wasm | 538 | false | none |
+| payable-features.wasm | 4396 | false | without message |
+| promises-features.wasm | 12926 | false | without message |
+| vault-promises.wasm | 8523 | false | without message |
+| vault-upgrade.wasm | 700 | false | none |
+| vault.wasm | 7826 | false | without message |
+| first-contract.wasm | 3086 | false | without message |
+| second-contract.wasm | 1355 | false | none |
+| forwarder-legacy.wasm | 32330 | false | without message |
+| proxy-test-second.wasm | 2105 | false | without message |
+| recursive-caller.wasm | 5466 | false | without message |
+| forwarder-queue-promises.wasm | 13096 | false | without message |
+| forwarder-queue.wasm | 12181 | false | without message |
+| forwarder.wasm | 32687 | false | without message |
+| builtin-func-features.wasm | 1101 | false | none |
+| local-esdt-and-nft.wasm | 12071 | false | without message |
+| forwarder-raw.wasm | 15309 | false | without message |
+| forwarder-raw-init-sync-call.wasm | 3332 | false | none |
+| forwarder-raw-init-async-call.wasm | 3062 | false | none |
+| parent.wasm | 1678 | false | none |
+| child.wasm | 4057 | false | without message |
+| transfer-role-features.wasm | 8775 | false | without message |
+| proxy-test-first.wasm | 6031 | false | without message |
+| exchange-features.wasm | 1577 | false | none |
+| alloc-features.wasm | 16748 | false | without message |
+| alloc-mem-leaking.wasm | 16857 | false | without message |
+| alloc-mem-fail.wasm | 16682 | true | without message |
+| abi-tester.wasm | 7182 | true | without message |
+| abi-tester-ev.wasm | 757 | false | none |
+| panic-message-features.wasm | 12875 | false | with message |
+| formatted-message-features.wasm | 3470 | false | without message |
+| multi-contract-features.wasm | 678 | false | none |
+| multi-contract-alt-impl.wasm | 360 | false | none |
+| multi-contract-example-feature.wasm | 677 | false | none |
+| multi-contract-features-view.wasm | 1115 | false | none |
+| rust-testing-framework-tester.wasm | 8602 | false | without message |
+| esdt-system-sc-mock.wasm | 3799 | false | none |
+| multiversx-wegld-swap-sc.wasm | 3557 | false | without message |
+| multiversx-price-aggregator-sc.wasm | 19327 | false | without message |
diff --git a/sdk/core/src/gateway/gateway_proxy.rs b/sdk/core/src/gateway/gateway_proxy.rs
index 47925cd79f..fb3ec42436 100644
--- a/sdk/core/src/gateway/gateway_proxy.rs
+++ b/sdk/core/src/gateway/gateway_proxy.rs
@@ -18,4 +18,4 @@ impl GatewayProxy {
     pub(crate) fn get_endpoint(&self, endpoint: &str) -> String {
         format!("{}/{}", self.proxy_url, endpoint)
     }
-}
+} //http://api-multiversx.com/

From 02a8a64f84553f1c3055c09104c9f699ca74c450 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Fri, 19 Jul 2024 23:42:26 +0300
Subject: [PATCH 1106/1254] cli code report - cargo clippy

---
 framework/meta/src/cmd/code_report.rs         |  6 +--
 .../{code_report.rs => generate_report.rs}    |  0
 .../src/cmd/code_report/render_code_report.rs | 48 +++++++++----------
 3 files changed, 25 insertions(+), 29 deletions(-)
 rename framework/meta/src/cmd/code_report/{code_report.rs => generate_report.rs} (100%)

diff --git a/framework/meta/src/cmd/code_report.rs b/framework/meta/src/cmd/code_report.rs
index a10efc78dc..26b0a15a34 100644
--- a/framework/meta/src/cmd/code_report.rs
+++ b/framework/meta/src/cmd/code_report.rs
@@ -1,7 +1,7 @@
-pub mod code_report;
+pub mod generate_report;
 pub mod render_code_report;
 
-use code_report::run_code_report;
+use generate_report::run_code_report;
 
 use crate::cli::{CodeReportArgs, OutputFormat};
 
@@ -16,6 +16,6 @@ pub fn code_report(args: &CodeReportArgs) {
         path,
         args.output.as_ref().unwrap_or(&"./report.md".to_string()),
         args.format.as_ref().unwrap_or(&OutputFormat::default()),
-        &args.compare.clone().unwrap_or(String::new()),
+        &args.compare.clone().unwrap_or_default(),
     );
 }
diff --git a/framework/meta/src/cmd/code_report/code_report.rs b/framework/meta/src/cmd/code_report/generate_report.rs
similarity index 100%
rename from framework/meta/src/cmd/code_report/code_report.rs
rename to framework/meta/src/cmd/code_report/generate_report.rs
diff --git a/framework/meta/src/cmd/code_report/render_code_report.rs b/framework/meta/src/cmd/code_report/render_code_report.rs
index 46bd1a52fc..6d5c2763cd 100644
--- a/framework/meta/src/cmd/code_report/render_code_report.rs
+++ b/framework/meta/src/cmd/code_report/render_code_report.rs
@@ -40,11 +40,7 @@ fn render_reports(output: &mut String, reports: &Vec<CodeReportJson>) {
     }
 }
 
-fn render_and_compare(
-    output: &mut String,
-    reports: &Vec<CodeReportJson>,
-    compared_path_file: &str,
-) {
+fn render_and_compare(output: &mut String, reports: &[CodeReportJson], compared_path_file: &str) {
     let compared_file = File::open(compared_path_file).unwrap_or_else(|_| {
         panic!(
             "Failed to open compared file at path: {}",
@@ -85,11 +81,11 @@ fn render_and_compare(
 fn parse_into_code_report_json(compared_file: File) -> Vec<CodeReportJson> {
     let reader = BufReader::new(compared_file);
 
-    let mut lines = reader.lines().skip(2);
+    let lines = reader.lines().skip(2);
 
     let mut compared_reports: Vec<CodeReportJson> = Vec::new();
 
-    while let Some(line) = lines.next() {
+    for line in lines {
         match line {
             Ok(l) => {
                 let columns: Vec<String> = l
@@ -115,16 +111,10 @@ fn parse_into_code_report_json(compared_file: File) -> Vec<CodeReportJson> {
 }
 
 fn find_report_by_path<'a>(
-    reports: &'a Vec<CodeReportJson>,
+    reports: &'a [CodeReportJson],
     contract_path: &'a String,
 ) -> Option<&'a CodeReportJson> {
-    for report in reports {
-        if report.path == *contract_path {
-            return Some(report);
-        }
-    }
-
-    None
+    reports.iter().find(|&report| report.path == *contract_path)
 }
 
 fn print_compared_output(
@@ -132,17 +122,23 @@ fn print_compared_output(
     report: &CodeReportJson,
     compared_report: &CodeReportJson,
 ) {
-    let mut size_report;
-    if report.size == compared_report.size {
-        size_report = format!("{}", report.size);
-    } else {
-        size_report = format!("{} :arrow-right: {}", compared_report.size, report.size);
-        if report.size > compared_report.size {
-            size_report = format!("{size_report} :red-circle:");
-        } else if report.size < compared_report.size {
-            size_report = format!("{size_report} :green-circle:");
-        }
-    }
+    let size_report = match report.size.cmp(&compared_report.size) {
+        std::cmp::Ordering::Greater => {
+            format!(
+                "{} :arrow-right: {} :red-circle:",
+                compared_report.size, report.size
+            )
+        },
+        std::cmp::Ordering::Less => {
+            format!(
+                "{} :arrow-right: {} :green-circle:",
+                compared_report.size, report.size
+            )
+        },
+        std::cmp::Ordering::Equal => {
+            format!("{}", report.size)
+        },
+    };
 
     let mut has_allocator_report;
     if report.has_allocator == compared_report.has_allocator {

From b0a2d1165addc944be1d9162403e9130f3b65875 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Sat, 20 Jul 2024 18:25:24 +0300
Subject: [PATCH 1107/1254] cli code report - impl changes, integrate in a
 structure

---
 contracts/benchmarks/report.json              |   1 -
 framework/meta/src/cli/cli_args_standalone.rs |   6 +-
 framework/meta/src/cmd/code_report.rs         |   5 +-
 framework/meta/src/cmd/code_report/compare.rs |  87 ++++++
 .../src/cmd/code_report/generate_report.rs    |  22 +-
 .../src/cmd/code_report/render_code_report.rs | 261 +++++++-----------
 out.md                                        |  94 -------
 7 files changed, 211 insertions(+), 265 deletions(-)
 delete mode 100644 contracts/benchmarks/report.json
 create mode 100644 framework/meta/src/cmd/code_report/compare.rs
 delete mode 100644 out.md

diff --git a/contracts/benchmarks/report.json b/contracts/benchmarks/report.json
deleted file mode 100644
index bb94c6b60a..0000000000
--- a/contracts/benchmarks/report.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"path":"../output/send-tx-repeat.wasm","size":901,"hasAllocator":false,"hasPanic":"none"},{"path":"../output/large-storage.wasm","size":2164,"hasAllocator":false,"hasPanic":"without message"},{"path":"../output/map-repeat.wasm","size":7234,"hasAllocator":false,"hasPanic":"without message"},{"path":"../output/queue-repeat.wasm","size":5853,"hasAllocator":false,"hasPanic":"without message"},{"path":"../output/set-repeat.wasm","size":7013,"hasAllocator":false,"hasPanic":"without message"},{"path":"../output/single-value-repeat.wasm","size":4440,"hasAllocator":false,"hasPanic":"without message"},{"path":"../output/linked-list-repeat.wasm","size":6681,"hasAllocator":true,"hasPanic":"without message"},{"path":"../output/vec-repeat.wasm","size":5231,"hasAllocator":false,"hasPanic":"without message"},{"path":"../output/str-repeat.wasm","size":2389,"hasAllocator":false,"hasPanic":"without message"},{"path":"../output/str-repeat-mb-builder-cached.wasm","size":1139,"hasAllocator":false,"hasPanic":"without message"},{"path":"../output/str-repeat-mb-builder-basic.wasm","size":759,"hasAllocator":false,"hasPanic":"none"}]
\ No newline at end of file
diff --git a/framework/meta/src/cli/cli_args_standalone.rs b/framework/meta/src/cli/cli_args_standalone.rs
index 453b136432..9bb5aad9fc 100644
--- a/framework/meta/src/cli/cli_args_standalone.rs
+++ b/framework/meta/src/cli/cli_args_standalone.rs
@@ -151,15 +151,15 @@ pub struct CodeReportArgs {
 
     /// Output file path
     #[arg(short, long, verbatim_doc_comment)]
-    pub output: Option<String>,
+    pub output: PathBuf,
 
     /// Output format
     #[arg(short, long, verbatim_doc_comment)]
     pub format: Option<OutputFormat>,
 
-    /// Compare
+    /// Compare two reports. Output available only for Markdown format
     #[arg(short, long, verbatim_doc_comment)]
-    pub compare: Option<String>,
+    pub compare: Option<PathBuf>,
 }
 
 #[derive(Default, Clone, PartialEq, Eq, Debug, Args)]
diff --git a/framework/meta/src/cmd/code_report.rs b/framework/meta/src/cmd/code_report.rs
index 26b0a15a34..f3c8ff8cbe 100644
--- a/framework/meta/src/cmd/code_report.rs
+++ b/framework/meta/src/cmd/code_report.rs
@@ -1,3 +1,4 @@
+pub mod compare;
 pub mod generate_report;
 pub mod render_code_report;
 
@@ -14,8 +15,8 @@ pub fn code_report(args: &CodeReportArgs) {
 
     run_code_report(
         path,
-        args.output.as_ref().unwrap_or(&"./report.md".to_string()),
+        args.output.to_str().unwrap(),
         args.format.as_ref().unwrap_or(&OutputFormat::default()),
-        &args.compare.clone().unwrap_or_default(),
+        args.compare.clone().unwrap_or_default().to_str().unwrap(),
     );
 }
diff --git a/framework/meta/src/cmd/code_report/compare.rs b/framework/meta/src/cmd/code_report/compare.rs
new file mode 100644
index 0000000000..98a72676cf
--- /dev/null
+++ b/framework/meta/src/cmd/code_report/compare.rs
@@ -0,0 +1,87 @@
+use std::io::BufRead;
+
+use multiversx_sc_meta_lib::code_report_json::CodeReportJson;
+
+pub(crate) fn parse_into_code_report_json(
+    compared_file_reader: &mut dyn BufRead,
+) -> Vec<CodeReportJson> {
+    let lines = compared_file_reader.lines().skip(2);
+
+    let mut compared_reports: Vec<CodeReportJson> = Vec::new();
+
+    for line in lines {
+        match line {
+            Ok(l) => {
+                let columns: Vec<String> = l
+                    .split('|')
+                    .map(|s| s.trim().to_string())
+                    .filter(|s| !s.is_empty())
+                    .collect();
+
+                if columns.len() == 4 {
+                    compared_reports.push(CodeReportJson {
+                        path: columns[0]
+                            .split('/')
+                            .last()
+                            .unwrap_or_else(|| &columns[0])
+                            .to_owned(),
+                        size: columns[1].parse::<usize>().unwrap(),
+                        has_allocator: columns[2].parse::<bool>().unwrap(),
+                        has_panic: columns[3].to_owned(),
+                    })
+                }
+            },
+            Err(_) => return compared_reports,
+        }
+    }
+
+    compared_reports
+}
+
+pub(crate) fn size_status_after_comparing(size: usize, compared_size: usize) -> String {
+    match size.cmp(&compared_size) {
+        std::cmp::Ordering::Greater => {
+            format!("{} :arrow-right: {} :red-circle:", compared_size, size)
+        },
+        std::cmp::Ordering::Less => {
+            format!("{} :arrow-right: {} :green-circle:", compared_size, size)
+        },
+        std::cmp::Ordering::Equal => {
+            format!("{}", size)
+        },
+    }
+}
+
+pub(crate) fn allocator_status_after_comparing(
+    has_allocator: bool,
+    compared_has_allocator: bool,
+) -> String {
+    if compared_has_allocator == has_allocator {
+        return format!("{}", has_allocator);
+    }
+
+    let allocator_status = format!("{} :arrow-right: {}", compared_has_allocator, has_allocator);
+
+    if !has_allocator {
+        format!("{allocator_status} :green-circle:")
+    } else {
+        format!("{allocator_status} :red-circle:")
+    }
+}
+
+pub(crate) fn panic_status_after_comparing(
+    has_panic: &String,
+    compared_has_panic: &String,
+) -> String {
+    if has_panic == compared_has_panic {
+        return has_panic.to_string();
+    }
+
+    let panic_status = format!("{} :arrow-right: {}", compared_has_panic, has_panic);
+
+    if has_panic == "none" {
+        return format!("{panic_status} :green-circle:");
+    }
+
+    panic_status
+}
diff --git a/framework/meta/src/cmd/code_report/generate_report.rs b/framework/meta/src/cmd/code_report/generate_report.rs
index 3c2fce2c6b..d921a21327 100644
--- a/framework/meta/src/cmd/code_report/generate_report.rs
+++ b/framework/meta/src/cmd/code_report/generate_report.rs
@@ -1,5 +1,6 @@
 use std::{
-    fs::{self, read_dir, File},
+    fs::{read_dir, File},
+    io::Write,
     path::PathBuf,
     process::Command,
 };
@@ -10,26 +11,25 @@ use multiversx_sc_meta_lib::{
     self, code_report_json::CodeReportJson, mxsc_file_json::MxscFileJson,
 };
 
-use super::render_code_report::render_report;
+use super::render_code_report::CodeReportRender;
 
 pub fn run_code_report(path: &str, output_path: &str, output_format: &OutputFormat, compare: &str) {
     let directors = RelevantDirectories::find_all(path, &["".to_owned()]);
 
     let reports = extract_report(directors);
-    let mut output = String::new();
+
+    let mut file = create_file(output_path);
 
     match output_format {
         OutputFormat::Markdown => {
-            render_report(&mut output, &reports, compare);
+            let mut render_code_report = CodeReportRender::new(&mut file, compare, &reports);
+            render_code_report.render_report();
         },
         OutputFormat::Json => {
-            output = serde_json::to_string(&reports).unwrap();
+            let json_output = serde_json::to_string(&reports).unwrap();
+            file.write_all(json_output.as_bytes()).unwrap();
         },
     };
-
-    let Ok(_) = fs::write(output_path, output) else {
-        return;
-    };
 }
 
 fn extract_report(directors: RelevantDirectories) -> Vec<CodeReportJson> {
@@ -92,3 +92,7 @@ fn extract_reports(path: &PathBuf, reports: &mut Vec<CodeReportJson>) {
         reports.push(data.report.code_report);
     }
 }
+
+fn create_file(file_path: &str) -> File {
+    File::create(file_path).expect("could not write report file")
+}
diff --git a/framework/meta/src/cmd/code_report/render_code_report.rs b/framework/meta/src/cmd/code_report/render_code_report.rs
index 6d5c2763cd..a34c1be3d0 100644
--- a/framework/meta/src/cmd/code_report/render_code_report.rs
+++ b/framework/meta/src/cmd/code_report/render_code_report.rs
@@ -1,183 +1,132 @@
-use std::{
-    fmt::Write,
-    fs::File,
-    io::{BufRead, BufReader},
-};
-
-use multiversx_sc_meta_lib::code_report_json::CodeReportJson;
+use core::panic;
+use std::{fmt::Display, fs::File, io::BufReader};
 
-fn writeln_output_str<S: AsRef<str>>(output: &mut String, input: S) {
-    output.write_str(&format!("{}\n", input.as_ref())).ok();
+pub struct CodeReportRender<'a> {
+    pub file: Option<&'a mut dyn std::io::Write>,
+    pub compared_path_file: &'a str,
+    pub reports: &'a [CodeReportJson],
 }
 
-pub fn render_report(output: &mut String, reports: &Vec<CodeReportJson>, compared_path_file: &str) {
-    render_header(output);
+use multiversx_sc_meta_lib::code_report_json::CodeReportJson;
 
-    if compared_path_file.is_empty() {
-        render_reports(output, reports);
-    } else {
-        render_and_compare(output, reports, compared_path_file);
+use super::compare::{
+    allocator_status_after_comparing, panic_status_after_comparing, parse_into_code_report_json,
+    size_status_after_comparing,
+};
+
+impl<'a> CodeReportRender<'a> {
+    pub fn new(
+        file: &'a mut dyn std::io::Write,
+        compared_path_file: &'a str,
+        reports: &'a [CodeReportJson],
+    ) -> Self {
+        Self {
+            file: Some(file),
+            compared_path_file,
+            reports,
+        }
     }
-}
 
-fn render_header(output: &mut String) {
-    writeln_output_str(output, "| Path                                                         |                                     size |                  has-allocator |                     has-format |");
-    writeln_output_str(output, "| :-- | --: | --: | --: |");
-}
+    pub fn render_report(&mut self) {
+        self.render_header();
 
-fn render_reports(output: &mut String, reports: &Vec<CodeReportJson>) {
-    for report in reports {
-        writeln_output_str(
-            output,
-            format!(
-                "| {} | {} | {} | {} |",
-                report.path.split('/').last().expect("no output path"),
-                report.size,
-                report.has_allocator,
-                report.has_panic
-            ),
-        );
+        if self.compared_path_file.is_empty() {
+            self.render_reports();
+        } else {
+            self.render_reports_and_compare();
+        }
     }
-}
 
-fn render_and_compare(output: &mut String, reports: &[CodeReportJson], compared_path_file: &str) {
-    let compared_file = File::open(compared_path_file).unwrap_or_else(|_| {
-        panic!(
-            "Failed to open compared file at path: {}",
-            compared_path_file
-        )
-    });
-
-    let mut compared_reports = Vec::new();
-    if compared_path_file.ends_with("md") {
-        compared_reports = parse_into_code_report_json(compared_file);
-    } else {
+    fn writeln(&mut self, s: impl Display) {
+        let file = self.file.as_mut().unwrap();
+        file.write_all(s.to_string().as_bytes()).unwrap();
+        file.write_all(b"\n").unwrap();
     }
 
-    for report in reports.iter() {
-        let path: String = report
-            .path
-            .split('/')
-            .last()
-            .expect("no output path")
-            .to_owned();
-        if compared_reports.is_empty() {
-            writeln_output_str(
-                output,
-                format!(
-                    "| {} | {} | {} | {} |",
-                    path, report.size, report.has_allocator, report.has_panic
-                ),
-            );
-            continue;
-        }
+    fn write_report_for_contract(
+        &mut self,
+        path: &String,
+        size: &String,
+        has_allocator: &String,
+        has_panic: &String,
+    ) {
+        self.writeln(format!(
+            "| {} | {} | {} | {} |",
+            path.split('/').last().unwrap_or_else(|| path),
+            size,
+            has_allocator,
+            has_panic
+        ));
+    }
 
-        if let Some(compared_report) = find_report_by_path(&compared_reports, &path) {
-            print_compared_output(output, report, compared_report);
+    fn render_header(&mut self) {
+        if !self.compared_path_file.is_empty() {
+            self.writeln(format!(
+                "Contract comparison with {}",
+                self.compared_path_file
+            ))
         }
+
+        self.writeln("| Path                                                         |                                     size |                  has-allocator |                     has-format |");
+        self.writeln("| :-- | --: | --: | --: |");
     }
-}
 
-fn parse_into_code_report_json(compared_file: File) -> Vec<CodeReportJson> {
-    let reader = BufReader::new(compared_file);
-
-    let lines = reader.lines().skip(2);
-
-    let mut compared_reports: Vec<CodeReportJson> = Vec::new();
-
-    for line in lines {
-        match line {
-            Ok(l) => {
-                let columns: Vec<String> = l
-                    .split('|')
-                    .map(|s| s.trim().to_string())
-                    .filter(|s| !s.is_empty())
-                    .collect();
-
-                if columns.len() == 4 {
-                    compared_reports.push(CodeReportJson {
-                        path: columns[0].to_owned(),
-                        size: columns[1].parse::<usize>().unwrap(),
-                        has_allocator: columns[2].parse::<bool>().unwrap(),
-                        has_panic: columns[3].to_owned(),
-                    })
-                }
-            },
-            Err(_) => return compared_reports,
+    fn render_reports(&mut self) {
+        for report in self.reports {
+            self.write_report_for_contract(
+                &report.path,
+                &report.size.to_string(),
+                &report.has_allocator.to_string(),
+                &report.has_panic,
+            );
         }
     }
 
-    compared_reports
-}
-
-fn find_report_by_path<'a>(
-    reports: &'a [CodeReportJson],
-    contract_path: &'a String,
-) -> Option<&'a CodeReportJson> {
-    reports.iter().find(|&report| report.path == *contract_path)
-}
-
-fn print_compared_output(
-    output: &mut String,
-    report: &CodeReportJson,
-    compared_report: &CodeReportJson,
-) {
-    let size_report = match report.size.cmp(&compared_report.size) {
-        std::cmp::Ordering::Greater => {
-            format!(
-                "{} :arrow-right: {} :red-circle:",
-                compared_report.size, report.size
-            )
-        },
-        std::cmp::Ordering::Less => {
-            format!(
-                "{} :arrow-right: {} :green-circle:",
-                compared_report.size, report.size
+    fn render_reports_and_compare(&mut self) {
+        let compared_file = File::open(self.compared_path_file).unwrap_or_else(|_| {
+            panic!(
+                "Failed to open compared file at path: {}",
+                self.compared_path_file
             )
-        },
-        std::cmp::Ordering::Equal => {
-            format!("{}", report.size)
-        },
-    };
-
-    let mut has_allocator_report;
-    if report.has_allocator == compared_report.has_allocator {
-        has_allocator_report = format!("{}", report.has_allocator);
-    } else {
-        has_allocator_report = format!(
-            "{} :arrow-right: {}",
-            compared_report.has_allocator, report.has_allocator
-        );
+        });
+        let mut compared_file_reader = BufReader::new(compared_file);
 
-        if !report.has_allocator {
-            has_allocator_report = format!("{has_allocator_report} :green-circle:");
+        let compared_reports = if self.compared_path_file.ends_with("md") {
+            // this is only one time compare. Decide weather to exist or not
+            parse_into_code_report_json(&mut compared_file_reader)
         } else {
-            has_allocator_report = format!("{has_allocator_report} :red-circle:");
+            serde_json::from_reader(compared_file_reader)
+                .unwrap_or_else(|_| panic!("Cannot deserialize into code report structure."))
+        };
+
+        for report in self.reports.iter() {
+            if let Some(compared_report) = compared_reports.iter().find(|cr| {
+                cr.path
+                    == report
+                        .path
+                        .split('/')
+                        .last()
+                        .unwrap_or_else(|| &report.path)
+            }) {
+                self.print_compared_output(report, compared_report);
+            }
         }
     }
 
-    let mut has_panic_report;
-    if report.has_panic == compared_report.has_panic {
-        has_panic_report = format!("{}", report.has_allocator);
-    } else {
-        has_panic_report = format!(
-            "{} :arrow-right: {}",
-            compared_report.has_panic, report.has_panic
-        );
+    fn print_compared_output(&mut self, report: &CodeReportJson, compared_report: &CodeReportJson) {
+        let size_report = size_status_after_comparing(report.size, compared_report.size);
 
-        if report.has_panic == "none" {
-            has_panic_report = format!("{has_panic_report} :green-circle:");
-        }
-    }
+        let has_allocator_report =
+            allocator_status_after_comparing(report.has_allocator, compared_report.has_allocator);
 
-    writeln_output_str(
-        output,
-        format!(
-            "| {} | {} | {} | {} |",
-            report.path.split('/').last().expect("no output path"),
-            size_report,
-            has_allocator_report,
-            has_panic_report
-        ),
-    );
+        let has_panic_report =
+            panic_status_after_comparing(&report.has_panic, &compared_report.has_panic);
+
+        self.write_report_for_contract(
+            &report.path,
+            &size_report,
+            &has_allocator_report,
+            &has_panic_report,
+        );
+    }
 }
diff --git a/out.md b/out.md
deleted file mode 100644
index ad609f4877..0000000000
--- a/out.md
+++ /dev/null
@@ -1,94 +0,0 @@
-| Path                                                         |                                     size |                  has-allocator |                     has-format |
-| :-- | --: | --: | --: |
-| token-release.wasm | 7776 | false | without message |
-| adder.wasm | 696 | false | none |
-| order-book-pair.wasm | 13780 | false | without message |
-| order-book-factory.wasm | 3771 | false | without message |
-| nft-storage-prepay.wasm | 2295 | false | none |
-| multisig.wasm | 14145 | false | without message |
-| multisig-full.wasm | 15672 | false | without message |
-| multisig-view.wasm | 6248 | false | without message |
-| bonding-curve-contract.wasm | 14735 | false | without message |
-| seed-nft-minter.wasm | 15118 | false | without message |
-| rewards-distribution.wasm | 10220 | false | without message |
-| crypto-bubbles.wasm | 2347 | false | none |
-| kitty-auction.wasm | 10065 | false | without message |
-| kitty-genetic-alg.wasm | 3147 | false | without message |
-| kitty-ownership.wasm | 12731 | false | without message |
-| nft-subscription.wasm | 8793 | false | without message |
-| proxy-pause.wasm | 4627 | false | without message |
-| lottery-esdt.wasm | 10989 | false | without message |
-| esdt-transfer-with-fee.wasm | 7779 | false | without message |
-| check-pause.wasm | 1228 | false | none |
-| factorial.wasm | 576 | false | none |
-| digital-cash.wasm | 10047 | false | without message |
-| crypto-zombies.wasm | 10304 | false | without message |
-| nft-minter.wasm | 10028 | false | without message |
-| empty.wasm | 241 | false | none |
-| fractional-nfts.wasm | 8447 | false | without message |
-| crowdfunding-esdt.wasm | 3988 | false | none |
-| ping-pong-egld.wasm | 6032 | false | without message |
-| send-tx-repeat.wasm | 901 | false | none |
-| large-storage.wasm | 2164 | false | without message |
-| map-repeat.wasm | 7234 | false | without message |
-| queue-repeat.wasm | 5853 | false | without message |
-| set-repeat.wasm | 7013 | false | without message |
-| single-value-repeat.wasm | 4440 | false | without message |
-| linked-list-repeat.wasm | 6681 | true | without message |
-| vec-repeat.wasm | 5231 | false | without message |
-| str-repeat.wasm | 2389 | false | without message |
-| str-repeat-mb-builder-cached.wasm | 1139 | false | without message |
-| str-repeat-mb-builder-basic.wasm | 759 | false | none |
-| big-float-features.wasm | 6468 | false | without message |
-| erc20.wasm | 2133 | false | none |
-| erc721.wasm | 2578 | false | none |
-| lottery-erc20.wasm | 12814 | false | without message |
-| erc1155-marketplace.wasm | 11172 | false | without message |
-| crowdfunding-erc20.wasm | 5331 | false | without message |
-| erc1155-user-mock.wasm | 1360 | false | without message |
-| erc1155.wasm | 12197 | false | without message |
-| scenario-tester.wasm | 1114 | false | none |
-| managed-map-features.wasm | 1315 | false | none |
-| use-module-view.wasm | 733 | false | none |
-| use-module.wasm | 33452 | false | without message |
-| rust-snippets-generator-test.wasm | 4979 | false | without message |
-| basic-features.wasm | 65181 | false | without message |
-| basic-features-storage-bytes.wasm | 538 | false | none |
-| payable-features.wasm | 4396 | false | without message |
-| promises-features.wasm | 12926 | false | without message |
-| vault-promises.wasm | 8523 | false | without message |
-| vault-upgrade.wasm | 700 | false | none |
-| vault.wasm | 7826 | false | without message |
-| first-contract.wasm | 3086 | false | without message |
-| second-contract.wasm | 1355 | false | none |
-| forwarder-legacy.wasm | 32330 | false | without message |
-| proxy-test-second.wasm | 2105 | false | without message |
-| recursive-caller.wasm | 5466 | false | without message |
-| forwarder-queue-promises.wasm | 13096 | false | without message |
-| forwarder-queue.wasm | 12181 | false | without message |
-| forwarder.wasm | 32687 | false | without message |
-| builtin-func-features.wasm | 1101 | false | none |
-| local-esdt-and-nft.wasm | 12071 | false | without message |
-| forwarder-raw.wasm | 15309 | false | without message |
-| forwarder-raw-init-sync-call.wasm | 3332 | false | none |
-| forwarder-raw-init-async-call.wasm | 3062 | false | none |
-| parent.wasm | 1678 | false | none |
-| child.wasm | 4057 | false | without message |
-| transfer-role-features.wasm | 8775 | false | without message |
-| proxy-test-first.wasm | 6031 | false | without message |
-| exchange-features.wasm | 1577 | false | none |
-| alloc-features.wasm | 16748 | false | without message |
-| alloc-mem-leaking.wasm | 16857 | false | without message |
-| alloc-mem-fail.wasm | 16682 | true | without message |
-| abi-tester.wasm | 7182 | true | without message |
-| abi-tester-ev.wasm | 757 | false | none |
-| panic-message-features.wasm | 12875 | false | with message |
-| formatted-message-features.wasm | 3470 | false | without message |
-| multi-contract-features.wasm | 678 | false | none |
-| multi-contract-alt-impl.wasm | 360 | false | none |
-| multi-contract-example-feature.wasm | 677 | false | none |
-| multi-contract-features-view.wasm | 1115 | false | none |
-| rust-testing-framework-tester.wasm | 8602 | false | without message |
-| esdt-system-sc-mock.wasm | 3799 | false | none |
-| multiversx-wegld-swap-sc.wasm | 3557 | false | without message |
-| multiversx-price-aggregator-sc.wasm | 19327 | false | without message |

From 8cd1aebb0a820922c2cb9e9357be10915cd5432a Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Sat, 20 Jul 2024 18:31:48 +0300
Subject: [PATCH 1108/1254] cli code report - cleanup

---
 sdk/core/src/gateway/gateway_proxy.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sdk/core/src/gateway/gateway_proxy.rs b/sdk/core/src/gateway/gateway_proxy.rs
index fb3ec42436..47925cd79f 100644
--- a/sdk/core/src/gateway/gateway_proxy.rs
+++ b/sdk/core/src/gateway/gateway_proxy.rs
@@ -18,4 +18,4 @@ impl GatewayProxy {
     pub(crate) fn get_endpoint(&self, endpoint: &str) -> String {
         format!("{}/{}", self.proxy_url, endpoint)
     }
-} //http://api-multiversx.com/
+}

From 88dd0be67d98415ea3a3465f490b0d6d6b37297c Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Sat, 20 Jul 2024 18:43:38 +0300
Subject: [PATCH 1109/1254] cli code report - fix commented line

---
 framework/meta/src/cmd/code_report/render_code_report.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/framework/meta/src/cmd/code_report/render_code_report.rs b/framework/meta/src/cmd/code_report/render_code_report.rs
index a34c1be3d0..e15ebe42ad 100644
--- a/framework/meta/src/cmd/code_report/render_code_report.rs
+++ b/framework/meta/src/cmd/code_report/render_code_report.rs
@@ -92,7 +92,7 @@ impl<'a> CodeReportRender<'a> {
         let mut compared_file_reader = BufReader::new(compared_file);
 
         let compared_reports = if self.compared_path_file.ends_with("md") {
-            // this is only one time compare. Decide weather to exist or not
+            // TODO this is only one time compared. Decide whether to exist or not
             parse_into_code_report_json(&mut compared_file_reader)
         } else {
             serde_json::from_reader(compared_file_reader)

From 3ea894fde6059b5273c7f3f874807c57de82a987 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Fri, 26 Jul 2024 12:40:24 +0300
Subject: [PATCH 1110/1254] code report - sanitize paths

---
 framework/meta/src/cmd/code_report/compare.rs      |  6 +-----
 .../meta/src/cmd/code_report/generate_report.rs    | 14 ++++++++++++++
 .../meta/src/cmd/code_report/render_code_report.rs | 10 ++--------
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/framework/meta/src/cmd/code_report/compare.rs b/framework/meta/src/cmd/code_report/compare.rs
index 98a72676cf..c21aae953e 100644
--- a/framework/meta/src/cmd/code_report/compare.rs
+++ b/framework/meta/src/cmd/code_report/compare.rs
@@ -20,11 +20,7 @@ pub(crate) fn parse_into_code_report_json(
 
                 if columns.len() == 4 {
                     compared_reports.push(CodeReportJson {
-                        path: columns[0]
-                            .split('/')
-                            .last()
-                            .unwrap_or_else(|| &columns[0])
-                            .to_owned(),
+                        path: columns[0].to_owned(),
                         size: columns[1].parse::<usize>().unwrap(),
                         has_allocator: columns[2].parse::<bool>().unwrap(),
                         has_panic: columns[3].to_owned(),
diff --git a/framework/meta/src/cmd/code_report/generate_report.rs b/framework/meta/src/cmd/code_report/generate_report.rs
index d921a21327..c92ae712ab 100644
--- a/framework/meta/src/cmd/code_report/generate_report.rs
+++ b/framework/meta/src/cmd/code_report/generate_report.rs
@@ -42,6 +42,8 @@ fn extract_report(directors: RelevantDirectories) -> Vec<CodeReportJson> {
 
         extract_reports(&output_path, &mut reports);
 
+        sanitize_output_path_from_report(&mut reports);
+
         clean_contract(&director.path);
     }
 
@@ -96,3 +98,15 @@ fn extract_reports(path: &PathBuf, reports: &mut Vec<CodeReportJson>) {
 fn create_file(file_path: &str) -> File {
     File::create(file_path).expect("could not write report file")
 }
+
+fn sanitize_output_path_from_report(reports: &mut Vec<CodeReportJson>) {
+    for report in reports {
+        let new_path = report
+            .path
+            .split('/')
+            .last()
+            .unwrap_or_else(|| &report.path);
+
+        report.path = new_path.to_owned();
+    }
+}
diff --git a/framework/meta/src/cmd/code_report/render_code_report.rs b/framework/meta/src/cmd/code_report/render_code_report.rs
index e15ebe42ad..7b87a29493 100644
--- a/framework/meta/src/cmd/code_report/render_code_report.rs
+++ b/framework/meta/src/cmd/code_report/render_code_report.rs
@@ -100,14 +100,8 @@ impl<'a> CodeReportRender<'a> {
         };
 
         for report in self.reports.iter() {
-            if let Some(compared_report) = compared_reports.iter().find(|cr| {
-                cr.path
-                    == report
-                        .path
-                        .split('/')
-                        .last()
-                        .unwrap_or_else(|| &report.path)
-            }) {
+            if let Some(compared_report) = compared_reports.iter().find(|cr| cr.path == report.path)
+            {
                 self.print_compared_output(report, compared_report);
             }
         }

From 4577bbe64b4fd0ae29f54c3400d0b22076c5d890 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Fri, 26 Jul 2024 12:55:02 +0300
Subject: [PATCH 1111/1254] code report - test github actions

---
 .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 dc0bcc8596..686ab495dd 100644
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -14,7 +14,7 @@ permissions:
 jobs:
   contracts:
     name: Contracts
-    uses: multiversx/mx-sc-actions/.github/workflows/contracts.yml@v3.1.0
+    uses: multiversx/mx-sc-actions/.github/workflows/contracts.yml@dcb4ee50efcb83709d5af181232f4380d931eeae
     with:
       rust-toolchain: stable
       path-to-sc-meta: framework/meta

From 6a74ae22de4f75e3048427f51b2cc691570cd777 Mon Sep 17 00:00:00 2001
From: Laurentiu Ciobanu <laurentiu.ciobanu@multiversx.com>
Date: Fri, 26 Jul 2024 10:34:20 +0000
Subject: [PATCH 1112/1254] update sc-actions version

---
 .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 686ab495dd..33cce9444b 100644
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -14,7 +14,7 @@ permissions:
 jobs:
   contracts:
     name: Contracts
-    uses: multiversx/mx-sc-actions/.github/workflows/contracts.yml@dcb4ee50efcb83709d5af181232f4380d931eeae
+    uses: multiversx/mx-sc-actions/.github/workflows/contracts.yml@f9483a0648e49620f3145a806924ff716c2445fb
     with:
       rust-toolchain: stable
       path-to-sc-meta: framework/meta

From 25e59a9c440cecea826845c8f13bc3ec553e3eb6 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Mon, 29 Jul 2024 14:01:16 +0300
Subject: [PATCH 1113/1254] EI versions 1.4 and 1.5

---
 framework/meta-lib/src/ei.rs            |   4 +
 framework/meta-lib/src/ei/ei_1_3.rs     |   3 +-
 framework/meta-lib/src/ei/ei_1_4.rs     | 270 +++++++++++++++++++++++
 framework/meta-lib/src/ei/ei_1_5.rs     | 278 ++++++++++++++++++++++++
 framework/meta-lib/src/ei/ei_version.rs |  14 +-
 framework/meta-lib/tests/ei_test.rs     |  30 +++
 6 files changed, 597 insertions(+), 2 deletions(-)
 create mode 100644 framework/meta-lib/src/ei/ei_1_4.rs
 create mode 100644 framework/meta-lib/src/ei/ei_1_5.rs

diff --git a/framework/meta-lib/src/ei.rs b/framework/meta-lib/src/ei.rs
index 77b84b2aba..7f58c2ad1e 100644
--- a/framework/meta-lib/src/ei.rs
+++ b/framework/meta-lib/src/ei.rs
@@ -2,10 +2,14 @@ mod ei_1_0;
 mod ei_1_1;
 mod ei_1_2;
 mod ei_1_3;
+mod ei_1_4;
+mod ei_1_5;
 mod ei_version;
 
 pub use ei_1_0::EI_1_0_NAMES;
 pub use ei_1_1::EI_1_1_NAMES;
 pub use ei_1_2::EI_1_2_NAMES;
 pub use ei_1_3::EI_1_3_NAMES;
+pub use ei_1_4::EI_1_4_NAMES;
+pub use ei_1_5::EI_1_5_NAMES;
 pub use ei_version::{parse_check_ei, EIVersion};
diff --git a/framework/meta-lib/src/ei/ei_1_3.rs b/framework/meta-lib/src/ei/ei_1_3.rs
index ae360d5fce..210776f3c4 100644
--- a/framework/meta-lib/src/ei/ei_1_3.rs
+++ b/framework/meta-lib/src/ei/ei_1_3.rs
@@ -4,7 +4,8 @@
 // !!!!!!!!!!!!!!!!!!!!!! AUTO-GENERATED FILE !!!!!!!!!!!!!!!!!!!!!!
 // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-/// VM Hooks version planned to be released with VM 1.5 in Q2 2023.
+/// VM Hooks version released in January 2024:
+/// https://multiversx.com/release/release-sirius-v1-6-7
 ///
 /// It adds the new async call functionality (promises).
 ///
diff --git a/framework/meta-lib/src/ei/ei_1_4.rs b/framework/meta-lib/src/ei/ei_1_4.rs
new file mode 100644
index 0000000000..9c4df8fc07
--- /dev/null
+++ b/framework/meta-lib/src/ei/ei_1_4.rs
@@ -0,0 +1,270 @@
+// Code generated by vmhooks generator. DO NOT EDIT.
+
+// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+// !!!!!!!!!!!!!!!!!!!!!! AUTO-GENERATED FILE !!!!!!!!!!!!!!!!!!!!!!
+// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+pub const EI_1_4_NAMES: &[&str] = &[
+    "getGasLeft",
+    "getSCAddress",
+    "getOwnerAddress",
+    "getShardOfAddress",
+    "isSmartContract",
+    "signalError",
+    "getExternalBalance",
+    "getBlockHash",
+    "getESDTBalance",
+    "getESDTNFTNameLength",
+    "getESDTNFTAttributeLength",
+    "getESDTNFTURILength",
+    "getESDTTokenData",
+    "getESDTLocalRoles",
+    "validateTokenIdentifier",
+    "transferValue",
+    "transferValueExecute",
+    "transferESDTExecute",
+    "transferESDTNFTExecute",
+    "multiTransferESDTNFTExecute",
+    "createAsyncCall",
+    "setAsyncContextCallback",
+    "upgradeContract",
+    "upgradeFromSourceContract",
+    "deleteContract",
+    "asyncCall",
+    "getArgumentLength",
+    "getArgument",
+    "getFunction",
+    "getNumArguments",
+    "storageStore",
+    "storageLoadLength",
+    "storageLoadFromAddress",
+    "storageLoad",
+    "setStorageLock",
+    "getStorageLock",
+    "isStorageLocked",
+    "clearStorageLock",
+    "getCaller",
+    "checkNoPayment",
+    "getCallValue",
+    "getESDTValue",
+    "getESDTValueByIndex",
+    "getESDTTokenName",
+    "getESDTTokenNameByIndex",
+    "getESDTTokenNonce",
+    "getESDTTokenNonceByIndex",
+    "getCurrentESDTNFTNonce",
+    "getESDTTokenType",
+    "getESDTTokenTypeByIndex",
+    "getNumESDTTransfers",
+    "getCallValueTokenName",
+    "getCallValueTokenNameByIndex",
+    "isReservedFunctionName",
+    "writeLog",
+    "writeEventLog",
+    "getBlockTimestamp",
+    "getBlockNonce",
+    "getBlockRound",
+    "getBlockEpoch",
+    "getBlockRandomSeed",
+    "getStateRootHash",
+    "getPrevBlockTimestamp",
+    "getPrevBlockNonce",
+    "getPrevBlockRound",
+    "getPrevBlockEpoch",
+    "getPrevBlockRandomSeed",
+    "finish",
+    "executeOnSameContext",
+    "executeOnDestContext",
+    "executeReadOnly",
+    "createContract",
+    "deployFromSourceContract",
+    "getNumReturnData",
+    "getReturnDataSize",
+    "getReturnData",
+    "cleanReturnData",
+    "deleteFromReturnData",
+    "getOriginalTxHash",
+    "getCurrentTxHash",
+    "getPrevTxHash",
+    "managedSCAddress",
+    "managedOwnerAddress",
+    "managedCaller",
+    "managedGetOriginalCallerAddr",
+    "managedGetRelayerAddr",
+    "managedSignalError",
+    "managedWriteLog",
+    "managedGetOriginalTxHash",
+    "managedGetStateRootHash",
+    "managedGetBlockRandomSeed",
+    "managedGetPrevBlockRandomSeed",
+    "managedGetReturnData",
+    "managedGetMultiESDTCallValue",
+    "managedGetBackTransfers",
+    "managedGetESDTBalance",
+    "managedGetESDTTokenData",
+    "managedAsyncCall",
+    "managedCreateAsyncCall",
+    "managedGetCallbackClosure",
+    "managedUpgradeFromSourceContract",
+    "managedUpgradeContract",
+    "managedDeleteContract",
+    "managedDeployFromSourceContract",
+    "managedCreateContract",
+    "managedExecuteReadOnly",
+    "managedExecuteOnSameContext",
+    "managedExecuteOnDestContext",
+    "managedMultiTransferESDTNFTExecute",
+    "managedMultiTransferESDTNFTExecuteByUser",
+    "managedTransferValueExecute",
+    "managedIsESDTFrozen",
+    "managedIsESDTLimitedTransfer",
+    "managedIsESDTPaused",
+    "managedBufferToHex",
+    "managedGetCodeMetadata",
+    "managedIsBuiltinFunction",
+    "bigFloatNewFromParts",
+    "bigFloatNewFromFrac",
+    "bigFloatNewFromSci",
+    "bigFloatAdd",
+    "bigFloatSub",
+    "bigFloatMul",
+    "bigFloatDiv",
+    "bigFloatNeg",
+    "bigFloatClone",
+    "bigFloatCmp",
+    "bigFloatAbs",
+    "bigFloatSign",
+    "bigFloatSqrt",
+    "bigFloatPow",
+    "bigFloatFloor",
+    "bigFloatCeil",
+    "bigFloatTruncate",
+    "bigFloatSetInt64",
+    "bigFloatIsInt",
+    "bigFloatSetBigInt",
+    "bigFloatGetConstPi",
+    "bigFloatGetConstE",
+    "bigIntGetUnsignedArgument",
+    "bigIntGetSignedArgument",
+    "bigIntStorageStoreUnsigned",
+    "bigIntStorageLoadUnsigned",
+    "bigIntGetCallValue",
+    "bigIntGetESDTCallValue",
+    "bigIntGetESDTCallValueByIndex",
+    "bigIntGetExternalBalance",
+    "bigIntGetESDTExternalBalance",
+    "bigIntNew",
+    "bigIntUnsignedByteLength",
+    "bigIntSignedByteLength",
+    "bigIntGetUnsignedBytes",
+    "bigIntGetSignedBytes",
+    "bigIntSetUnsignedBytes",
+    "bigIntSetSignedBytes",
+    "bigIntIsInt64",
+    "bigIntGetInt64",
+    "bigIntSetInt64",
+    "bigIntAdd",
+    "bigIntSub",
+    "bigIntMul",
+    "bigIntTDiv",
+    "bigIntTMod",
+    "bigIntEDiv",
+    "bigIntEMod",
+    "bigIntSqrt",
+    "bigIntPow",
+    "bigIntLog2",
+    "bigIntAbs",
+    "bigIntNeg",
+    "bigIntSign",
+    "bigIntCmp",
+    "bigIntNot",
+    "bigIntAnd",
+    "bigIntOr",
+    "bigIntXor",
+    "bigIntShr",
+    "bigIntShl",
+    "bigIntFinishUnsigned",
+    "bigIntFinishSigned",
+    "bigIntToString",
+    "mBufferNew",
+    "mBufferNewFromBytes",
+    "mBufferGetLength",
+    "mBufferGetBytes",
+    "mBufferGetByteSlice",
+    "mBufferCopyByteSlice",
+    "mBufferEq",
+    "mBufferSetBytes",
+    "mBufferSetByteSlice",
+    "mBufferAppend",
+    "mBufferAppendBytes",
+    "mBufferToBigIntUnsigned",
+    "mBufferToBigIntSigned",
+    "mBufferFromBigIntUnsigned",
+    "mBufferFromBigIntSigned",
+    "mBufferToBigFloat",
+    "mBufferFromBigFloat",
+    "mBufferStorageStore",
+    "mBufferStorageLoad",
+    "mBufferStorageLoadFromAddress",
+    "mBufferGetArgument",
+    "mBufferFinish",
+    "mBufferSetRandom",
+    "managedMapNew",
+    "managedMapPut",
+    "managedMapGet",
+    "managedMapRemove",
+    "managedMapContains",
+    "smallIntGetUnsignedArgument",
+    "smallIntGetSignedArgument",
+    "smallIntFinishUnsigned",
+    "smallIntFinishSigned",
+    "smallIntStorageStoreUnsigned",
+    "smallIntStorageStoreSigned",
+    "smallIntStorageLoadUnsigned",
+    "smallIntStorageLoadSigned",
+    "int64getArgument",
+    "int64finish",
+    "int64storageStore",
+    "int64storageLoad",
+    "sha256",
+    "managedSha256",
+    "keccak256",
+    "managedKeccak256",
+    "ripemd160",
+    "managedRipemd160",
+    "verifyBLS",
+    "managedVerifyBLS",
+    "verifyEd25519",
+    "managedVerifyEd25519",
+    "verifyCustomSecp256k1",
+    "managedVerifyCustomSecp256k1",
+    "verifySecp256k1",
+    "managedVerifySecp256k1",
+    "encodeSecp256k1DerSignature",
+    "managedEncodeSecp256k1DerSignature",
+    "addEC",
+    "doubleEC",
+    "isOnCurveEC",
+    "scalarBaseMultEC",
+    "managedScalarBaseMultEC",
+    "scalarMultEC",
+    "managedScalarMultEC",
+    "marshalEC",
+    "managedMarshalEC",
+    "marshalCompressedEC",
+    "managedMarshalCompressedEC",
+    "unmarshalEC",
+    "managedUnmarshalEC",
+    "unmarshalCompressedEC",
+    "managedUnmarshalCompressedEC",
+    "generateKeyEC",
+    "managedGenerateKeyEC",
+    "createEC",
+    "managedCreateEC",
+    "getCurveLengthEC",
+    "getPrivKeyByteLengthEC",
+    "ellipticCurveGetValues",
+    "managedVerifySecp256r1",
+    "managedVerifyBLSSignatureShare",
+    "managedVerifyBLSAggregatedSignature",
+];
diff --git a/framework/meta-lib/src/ei/ei_1_5.rs b/framework/meta-lib/src/ei/ei_1_5.rs
new file mode 100644
index 0000000000..1ad9b654db
--- /dev/null
+++ b/framework/meta-lib/src/ei/ei_1_5.rs
@@ -0,0 +1,278 @@
+// Code generated by vmhooks generator. DO NOT EDIT.
+
+// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+// !!!!!!!!!!!!!!!!!!!!!! AUTO-GENERATED FILE !!!!!!!!!!!!!!!!!!!!!!
+// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+pub const EI_1_5_NAMES: &[&str] = &[
+    "getGasLeft",
+    "getSCAddress",
+    "getOwnerAddress",
+    "getShardOfAddress",
+    "isSmartContract",
+    "signalError",
+    "getExternalBalance",
+    "getBlockHash",
+    "getESDTBalance",
+    "getESDTNFTNameLength",
+    "getESDTNFTAttributeLength",
+    "getESDTNFTURILength",
+    "getESDTTokenData",
+    "getESDTLocalRoles",
+    "validateTokenIdentifier",
+    "transferValue",
+    "transferValueExecute",
+    "transferESDTExecute",
+    "transferESDTNFTExecute",
+    "multiTransferESDTNFTExecute",
+    "createAsyncCall",
+    "setAsyncContextCallback",
+    "upgradeContract",
+    "upgradeFromSourceContract",
+    "deleteContract",
+    "asyncCall",
+    "getArgumentLength",
+    "getArgument",
+    "getFunction",
+    "getNumArguments",
+    "storageStore",
+    "storageLoadLength",
+    "storageLoadFromAddress",
+    "storageLoad",
+    "setStorageLock",
+    "getStorageLock",
+    "isStorageLocked",
+    "clearStorageLock",
+    "getCaller",
+    "checkNoPayment",
+    "getCallValue",
+    "getESDTValue",
+    "getESDTValueByIndex",
+    "getESDTTokenName",
+    "getESDTTokenNameByIndex",
+    "getESDTTokenNonce",
+    "getESDTTokenNonceByIndex",
+    "getCurrentESDTNFTNonce",
+    "getESDTTokenType",
+    "getESDTTokenTypeByIndex",
+    "getNumESDTTransfers",
+    "getCallValueTokenName",
+    "getCallValueTokenNameByIndex",
+    "isReservedFunctionName",
+    "writeLog",
+    "writeEventLog",
+    "getBlockTimestamp",
+    "getBlockNonce",
+    "getBlockRound",
+    "getBlockEpoch",
+    "getBlockRandomSeed",
+    "getStateRootHash",
+    "getPrevBlockTimestamp",
+    "getPrevBlockNonce",
+    "getPrevBlockRound",
+    "getPrevBlockEpoch",
+    "getPrevBlockRandomSeed",
+    "getRoundTime",
+    "epochStartBlockTimeStamp",
+    "epochStartBlockNonce",
+    "epochStartBlockRound",
+    "finish",
+    "executeOnSameContext",
+    "executeOnDestContext",
+    "executeReadOnly",
+    "createContract",
+    "deployFromSourceContract",
+    "getNumReturnData",
+    "getReturnDataSize",
+    "getReturnData",
+    "cleanReturnData",
+    "deleteFromReturnData",
+    "getOriginalTxHash",
+    "getCurrentTxHash",
+    "getPrevTxHash",
+    "managedSCAddress",
+    "managedOwnerAddress",
+    "managedCaller",
+    "managedGetOriginalCallerAddr",
+    "managedGetRelayerAddr",
+    "managedSignalError",
+    "managedWriteLog",
+    "managedGetOriginalTxHash",
+    "managedGetStateRootHash",
+    "managedGetBlockRandomSeed",
+    "managedGetPrevBlockRandomSeed",
+    "managedGetReturnData",
+    "managedGetMultiESDTCallValue",
+    "managedGetBackTransfers",
+    "managedGetESDTBalance",
+    "managedGetESDTTokenData",
+    "managedAsyncCall",
+    "managedCreateAsyncCall",
+    "managedGetCallbackClosure",
+    "managedUpgradeFromSourceContract",
+    "managedUpgradeContract",
+    "managedDeleteContract",
+    "managedDeployFromSourceContract",
+    "managedCreateContract",
+    "managedExecuteReadOnly",
+    "managedExecuteOnSameContext",
+    "managedExecuteOnDestContext",
+    "managedMultiTransferESDTNFTExecute",
+    "managedMultiTransferESDTNFTExecuteByUser",
+    "managedTransferValueExecute",
+    "managedIsESDTFrozen",
+    "managedIsESDTLimitedTransfer",
+    "managedIsESDTPaused",
+    "managedBufferToHex",
+    "managedGetCodeMetadata",
+    "managedIsBuiltinFunction",
+    "bigFloatNewFromParts",
+    "bigFloatNewFromFrac",
+    "bigFloatNewFromSci",
+    "bigFloatAdd",
+    "bigFloatSub",
+    "bigFloatMul",
+    "bigFloatDiv",
+    "bigFloatNeg",
+    "bigFloatClone",
+    "bigFloatCmp",
+    "bigFloatAbs",
+    "bigFloatSign",
+    "bigFloatSqrt",
+    "bigFloatPow",
+    "bigFloatFloor",
+    "bigFloatCeil",
+    "bigFloatTruncate",
+    "bigFloatSetInt64",
+    "bigFloatIsInt",
+    "bigFloatSetBigInt",
+    "bigFloatGetConstPi",
+    "bigFloatGetConstE",
+    "bigIntGetUnsignedArgument",
+    "bigIntGetSignedArgument",
+    "bigIntStorageStoreUnsigned",
+    "bigIntStorageLoadUnsigned",
+    "bigIntGetCallValue",
+    "bigIntGetESDTCallValue",
+    "bigIntGetESDTCallValueByIndex",
+    "bigIntGetExternalBalance",
+    "bigIntGetESDTExternalBalance",
+    "bigIntNew",
+    "bigIntUnsignedByteLength",
+    "bigIntSignedByteLength",
+    "bigIntGetUnsignedBytes",
+    "bigIntGetSignedBytes",
+    "bigIntSetUnsignedBytes",
+    "bigIntSetSignedBytes",
+    "bigIntIsInt64",
+    "bigIntGetInt64",
+    "bigIntSetInt64",
+    "bigIntAdd",
+    "bigIntSub",
+    "bigIntMul",
+    "bigIntTDiv",
+    "bigIntTMod",
+    "bigIntEDiv",
+    "bigIntEMod",
+    "bigIntSqrt",
+    "bigIntPow",
+    "bigIntLog2",
+    "bigIntAbs",
+    "bigIntNeg",
+    "bigIntSign",
+    "bigIntCmp",
+    "bigIntNot",
+    "bigIntAnd",
+    "bigIntOr",
+    "bigIntXor",
+    "bigIntShr",
+    "bigIntShl",
+    "bigIntFinishUnsigned",
+    "bigIntFinishSigned",
+    "bigIntToString",
+    "mBufferNew",
+    "mBufferNewFromBytes",
+    "mBufferGetLength",
+    "mBufferGetBytes",
+    "mBufferGetByteSlice",
+    "mBufferCopyByteSlice",
+    "mBufferEq",
+    "mBufferSetBytes",
+    "mBufferSetByteSlice",
+    "mBufferAppend",
+    "mBufferAppendBytes",
+    "mBufferToBigIntUnsigned",
+    "mBufferToBigIntSigned",
+    "mBufferFromBigIntUnsigned",
+    "mBufferFromBigIntSigned",
+    "mBufferToSmallIntUnsigned",
+    "mBufferToSmallIntSigned",
+    "mBufferFromSmallIntUnsigned",
+    "mBufferFromSmallIntSigned",
+    "mBufferToBigFloat",
+    "mBufferFromBigFloat",
+    "mBufferStorageStore",
+    "mBufferStorageLoad",
+    "mBufferStorageLoadFromAddress",
+    "mBufferGetArgument",
+    "mBufferFinish",
+    "mBufferSetRandom",
+    "managedMapNew",
+    "managedMapPut",
+    "managedMapGet",
+    "managedMapRemove",
+    "managedMapContains",
+    "smallIntGetUnsignedArgument",
+    "smallIntGetSignedArgument",
+    "smallIntFinishUnsigned",
+    "smallIntFinishSigned",
+    "smallIntStorageStoreUnsigned",
+    "smallIntStorageStoreSigned",
+    "smallIntStorageLoadUnsigned",
+    "smallIntStorageLoadSigned",
+    "int64getArgument",
+    "int64finish",
+    "int64storageStore",
+    "int64storageLoad",
+    "sha256",
+    "managedSha256",
+    "keccak256",
+    "managedKeccak256",
+    "ripemd160",
+    "managedRipemd160",
+    "verifyBLS",
+    "managedVerifyBLS",
+    "verifyEd25519",
+    "managedVerifyEd25519",
+    "verifyCustomSecp256k1",
+    "managedVerifyCustomSecp256k1",
+    "verifySecp256k1",
+    "managedVerifySecp256k1",
+    "encodeSecp256k1DerSignature",
+    "managedEncodeSecp256k1DerSignature",
+    "addEC",
+    "doubleEC",
+    "isOnCurveEC",
+    "scalarBaseMultEC",
+    "managedScalarBaseMultEC",
+    "scalarMultEC",
+    "managedScalarMultEC",
+    "marshalEC",
+    "managedMarshalEC",
+    "marshalCompressedEC",
+    "managedMarshalCompressedEC",
+    "unmarshalEC",
+    "managedUnmarshalEC",
+    "unmarshalCompressedEC",
+    "managedUnmarshalCompressedEC",
+    "generateKeyEC",
+    "managedGenerateKeyEC",
+    "createEC",
+    "managedCreateEC",
+    "getCurveLengthEC",
+    "getPrivKeyByteLengthEC",
+    "ellipticCurveGetValues",
+    "managedVerifySecp256r1",
+    "managedVerifyBLSSignatureShare",
+    "managedVerifyBLSAggregatedSignature",
+];
diff --git a/framework/meta-lib/src/ei/ei_version.rs b/framework/meta-lib/src/ei/ei_version.rs
index e1b9f345e7..6ba2444a6e 100644
--- a/framework/meta-lib/src/ei/ei_version.rs
+++ b/framework/meta-lib/src/ei/ei_version.rs
@@ -23,11 +23,17 @@ pub enum EIVersion {
     /// - some managed ESDT properties.
     V1_2,
 
-    /// Latest VM Hooks version, released with VM 1.5 in January 2024.
+    /// Latest VM Hooks version, released with VM 1.5 in January 2024: https://multiversx.com/release/release-sirius-v1-6-7
     ///
     /// It adds the new async call functionality (promises).
     #[default]
     V1_3,
+
+    /// Version to be released to mainnet in August 2024.
+    V1_4,
+
+    /// Version planned for Q3 2024.
+    V1_5,
 }
 
 impl EIVersion {
@@ -37,6 +43,8 @@ impl EIVersion {
             "1.1" => Some(EIVersion::V1_1),
             "1.2" => Some(EIVersion::V1_2),
             "1.3" => Some(EIVersion::V1_3),
+            "1.4" => Some(EIVersion::V1_4),
+            "1.5" => Some(EIVersion::V1_5),
             _ => None,
         }
     }
@@ -47,6 +55,8 @@ impl EIVersion {
             EIVersion::V1_1 => "1.1",
             EIVersion::V1_2 => "1.2",
             EIVersion::V1_3 => "1.3",
+            EIVersion::V1_4 => "1.4",
+            EIVersion::V1_5 => "1.5",
         }
     }
 
@@ -56,6 +66,8 @@ impl EIVersion {
             EIVersion::V1_1 => super::EI_1_1_NAMES,
             EIVersion::V1_2 => super::EI_1_2_NAMES,
             EIVersion::V1_3 => super::EI_1_3_NAMES,
+            EIVersion::V1_4 => super::EI_1_4_NAMES,
+            EIVersion::V1_5 => super::EI_1_5_NAMES,
         }
     }
 
diff --git a/framework/meta-lib/tests/ei_test.rs b/framework/meta-lib/tests/ei_test.rs
index 2a1bdb06bb..04b6502eb6 100644
--- a/framework/meta-lib/tests/ei_test.rs
+++ b/framework/meta-lib/tests/ei_test.rs
@@ -74,6 +74,26 @@ pub const EI_1_3_ADDED_NAMES: &[&str] = &[
     "managedIsBuiltinFunction",
 ];
 
+pub const EI_1_4_ADDED_NAMES: &[&str] = &[
+    "managedGetOriginalCallerAddr",
+    "managedGetRelayerAddr",
+    "managedMultiTransferESDTNFTExecuteByUser",
+    "managedVerifySecp256r1",
+    "managedVerifyBLSSignatureShare",
+    "managedVerifyBLSAggregatedSignature",
+];
+
+pub const EI_1_5_ADDED_NAMES: &[&str] = &[
+    "getRoundTime",
+    "epochStartBlockTimeStamp",
+    "epochStartBlockNonce",
+    "epochStartBlockRound",
+    "mBufferToSmallIntUnsigned",
+    "mBufferToSmallIntSigned",
+    "mBufferFromSmallIntUnsigned",
+    "mBufferFromSmallIntSigned",
+];
+
 fn list_to_set<'a>(list: &[&'a str]) -> HashSet<&'a str> {
     let mut set = HashSet::new();
     for &item in list {
@@ -109,3 +129,13 @@ fn test_added_names_ei_1_2() {
 fn test_added_names_ei_1_3() {
     test_added_names(ei::EI_1_2_NAMES, EI_1_3_ADDED_NAMES, ei::EI_1_3_NAMES);
 }
+
+#[test]
+fn test_added_names_ei_1_4() {
+    test_added_names(ei::EI_1_3_NAMES, EI_1_4_ADDED_NAMES, ei::EI_1_4_NAMES);
+}
+
+#[test]
+fn test_added_names_ei_1_5() {
+    test_added_names(ei::EI_1_4_NAMES, EI_1_5_ADDED_NAMES, ei::EI_1_5_NAMES);
+}

From 2b70cc65ccc1e37fb174acd108922f9392fe9067 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Mon, 29 Jul 2024 14:28:43 +0300
Subject: [PATCH 1114/1254] test fix

---
 framework/meta-lib/tests/ei_test.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/framework/meta-lib/tests/ei_test.rs b/framework/meta-lib/tests/ei_test.rs
index 04b6502eb6..78df88fe3e 100644
--- a/framework/meta-lib/tests/ei_test.rs
+++ b/framework/meta-lib/tests/ei_test.rs
@@ -75,6 +75,7 @@ pub const EI_1_3_ADDED_NAMES: &[&str] = &[
 ];
 
 pub const EI_1_4_ADDED_NAMES: &[&str] = &[
+    "isReservedFunctionName",
     "managedGetOriginalCallerAddr",
     "managedGetRelayerAddr",
     "managedMultiTransferESDTNFTExecuteByUser",

From 04fd89823cd0f0a693a1582a66a2ae03f930a8b9 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Tue, 30 Jul 2024 18:14:57 +0300
Subject: [PATCH 1115/1254] basic implementation encode/decode for new type

---
 framework/base/src/io/arg_de_input.rs         |   4 +-
 .../managed_buffer_nested_de_input.rs         |   7 +-
 .../managed_buffer_nested_en_output.rs        |   7 +-
 .../codec_util/managed_buffer_top_de_input.rs |   7 +-
 .../managed_buffer_top_en_output.rs           |   7 +-
 .../wrapped/builder/managed_buffer_builder.rs |   4 +-
 .../managed/wrapped/managed_nested_buffer.rs  | 228 ++++++++++++++++++
 .../base/src/types/managed/wrapped/mod.rs     |   2 +
 8 files changed, 255 insertions(+), 11 deletions(-)
 create mode 100644 framework/base/src/types/managed/wrapped/managed_nested_buffer.rs

diff --git a/framework/base/src/io/arg_de_input.rs b/framework/base/src/io/arg_de_input.rs
index 98faef2899..5c553c3fdd 100644
--- a/framework/base/src/io/arg_de_input.rs
+++ b/framework/base/src/io/arg_de_input.rs
@@ -9,7 +9,8 @@ use crate::{
         try_execute_then_cast, DecodeError, DecodeErrorHandler, TopDecodeInput, TryStaticCast,
     },
     types::{
-        heap::Box, BigInt, BigUint, ManagedBuffer, ManagedBufferNestedDecodeInput, ManagedType,
+        heap::Box, BigInt, BigUint, ManagedBuffer, ManagedBufferNestedDecodeInput,
+        ManagedNestedBuffer, ManagedType,
     },
 };
 
@@ -126,6 +127,7 @@ where
         T::type_eq::<ManagedBuffer<AA>>()
             || T::type_eq::<BigUint<AA>>()
             || T::type_eq::<BigInt<AA>>()
+            || T::type_eq::<ManagedNestedBuffer<AA>>()
     }
 
     #[inline]
diff --git a/framework/base/src/types/managed/codec_util/managed_buffer_nested_de_input.rs b/framework/base/src/types/managed/codec_util/managed_buffer_nested_de_input.rs
index 982100dcc8..ce0bb0bbeb 100644
--- a/framework/base/src/types/managed/codec_util/managed_buffer_nested_de_input.rs
+++ b/framework/base/src/types/managed/codec_util/managed_buffer_nested_de_input.rs
@@ -9,7 +9,7 @@ use crate::{
     api::ManagedTypeApi,
     types::{
         managed::{preloaded_managed_buffer::PreloadedManagedBuffer, ManagedBufferSizeContext},
-        BigInt, BigUint, ManagedBuffer,
+        BigInt, BigUint, ManagedBuffer, ManagedNestedBuffer,
     },
 };
 
@@ -106,7 +106,10 @@ where
     }
 
     fn supports_specialized_type<T: TryStaticCast>() -> bool {
-        T::type_eq::<ManagedBuffer<M>>() || T::type_eq::<BigUint<M>>() || T::type_eq::<BigInt<M>>()
+        T::type_eq::<ManagedBuffer<M>>()
+            || T::type_eq::<ManagedNestedBuffer<M>>()
+            || T::type_eq::<BigUint<M>>()
+            || T::type_eq::<BigInt<M>>()
     }
 
     fn read_specialized<T, C, H>(&mut self, context: C, h: H) -> Result<T, H::HandledErr>
diff --git a/framework/base/src/types/managed/codec_util/managed_buffer_nested_en_output.rs b/framework/base/src/types/managed/codec_util/managed_buffer_nested_en_output.rs
index 3bf8345f2d..e2fff43b16 100644
--- a/framework/base/src/types/managed/codec_util/managed_buffer_nested_en_output.rs
+++ b/framework/base/src/types/managed/codec_util/managed_buffer_nested_en_output.rs
@@ -2,7 +2,7 @@ use crate::codec::{EncodeError, EncodeErrorHandler, NestedEncodeOutput, TryStati
 
 use crate::{
     api::ManagedTypeApi,
-    types::{BigInt, BigUint, ManagedBuffer},
+    types::{BigInt, BigUint, ManagedBuffer, ManagedNestedBuffer},
 };
 
 impl<M: ManagedTypeApi> NestedEncodeOutput for ManagedBuffer<M> {
@@ -12,7 +12,10 @@ impl<M: ManagedTypeApi> NestedEncodeOutput for ManagedBuffer<M> {
 
     #[inline]
     fn supports_specialized_type<T: TryStaticCast>() -> bool {
-        T::type_eq::<ManagedBuffer<M>>() || T::type_eq::<BigUint<M>>() || T::type_eq::<BigInt<M>>()
+        T::type_eq::<ManagedBuffer<M>>()
+            || T::type_eq::<ManagedNestedBuffer<M>>()
+            || T::type_eq::<BigUint<M>>()
+            || T::type_eq::<BigInt<M>>()
     }
 
     #[inline]
diff --git a/framework/base/src/types/managed/codec_util/managed_buffer_top_de_input.rs b/framework/base/src/types/managed/codec_util/managed_buffer_top_de_input.rs
index fb091781a2..9ffef973d7 100644
--- a/framework/base/src/types/managed/codec_util/managed_buffer_top_de_input.rs
+++ b/framework/base/src/types/managed/codec_util/managed_buffer_top_de_input.rs
@@ -7,7 +7,7 @@ use crate::{
         try_execute_then_cast, DecodeError, DecodeErrorHandler, TopDecodeInput, TryStaticCast,
     },
     err_msg,
-    types::{BigInt, BigUint, ManagedBuffer},
+    types::{BigInt, BigUint, ManagedBuffer, ManagedNestedBuffer},
 };
 use alloc::boxed::Box;
 
@@ -78,7 +78,10 @@ where
 
     #[inline]
     fn supports_specialized_type<T: TryStaticCast>() -> bool {
-        T::type_eq::<ManagedBuffer<M>>() || T::type_eq::<BigUint<M>>() || T::type_eq::<BigInt<M>>()
+        T::type_eq::<ManagedBuffer<M>>()
+            || T::type_eq::<ManagedNestedBuffer<M>>()
+            || T::type_eq::<BigUint<M>>()
+            || T::type_eq::<BigInt<M>>()
     }
 
     #[inline]
diff --git a/framework/base/src/types/managed/codec_util/managed_buffer_top_en_output.rs b/framework/base/src/types/managed/codec_util/managed_buffer_top_en_output.rs
index 21ce396cf1..93d856640f 100644
--- a/framework/base/src/types/managed/codec_util/managed_buffer_top_en_output.rs
+++ b/framework/base/src/types/managed/codec_util/managed_buffer_top_en_output.rs
@@ -2,7 +2,7 @@ use crate::codec::{EncodeError, EncodeErrorHandler, TopEncodeOutput, TryStaticCa
 
 use crate::{
     api::ManagedTypeApi,
-    types::{BigInt, BigUint, ManagedBuffer},
+    types::{BigInt, BigUint, ManagedBuffer, ManagedNestedBuffer},
 };
 
 impl<M: ManagedTypeApi> TopEncodeOutput for &mut ManagedBuffer<M> {
@@ -14,7 +14,10 @@ impl<M: ManagedTypeApi> TopEncodeOutput for &mut ManagedBuffer<M> {
 
     #[inline]
     fn supports_specialized_type<T: TryStaticCast>() -> bool {
-        T::type_eq::<ManagedBuffer<M>>() || T::type_eq::<BigUint<M>>() || T::type_eq::<BigInt<M>>()
+        T::type_eq::<ManagedBuffer<M>>()
+            || T::type_eq::<ManagedNestedBuffer<M>>()
+            || T::type_eq::<BigUint<M>>()
+            || T::type_eq::<BigInt<M>>()
     }
 
     #[inline]
diff --git a/framework/base/src/types/managed/wrapped/builder/managed_buffer_builder.rs b/framework/base/src/types/managed/wrapped/builder/managed_buffer_builder.rs
index b65aa8e0e0..c4c2d47b6a 100644
--- a/framework/base/src/types/managed/wrapped/builder/managed_buffer_builder.rs
+++ b/framework/base/src/types/managed/wrapped/builder/managed_buffer_builder.rs
@@ -8,7 +8,7 @@ use crate::{
         hex_util::{byte_to_binary_digits, byte_to_hex_digits},
         FormatBuffer, FormatByteReceiver, SCBinary, SCCodec, SCDisplay, SCLowerHex,
     },
-    types::ManagedBuffer,
+    types::{ManagedBuffer, ManagedNestedBuffer},
 };
 
 use super::{ManagedBufferBuilderImpl, ManagedBufferImplDefault};
@@ -107,7 +107,7 @@ where
 
     #[inline]
     fn supports_specialized_type<T: TryStaticCast>() -> bool {
-        T::type_eq::<ManagedBuffer<M>>()
+        T::type_eq::<ManagedBuffer<M>>() || T::type_eq::<ManagedNestedBuffer<M>>()
     }
 
     #[inline]
diff --git a/framework/base/src/types/managed/wrapped/managed_nested_buffer.rs b/framework/base/src/types/managed/wrapped/managed_nested_buffer.rs
new file mode 100644
index 0000000000..497b70b6fa
--- /dev/null
+++ b/framework/base/src/types/managed/wrapped/managed_nested_buffer.rs
@@ -0,0 +1,228 @@
+use crate::api::ManagedTypeApi;
+use crate::types::{BigInt, BigUint, BoxedBytes, ManagedBuffer};
+use multiversx_sc_codec::{
+    try_execute_then_cast, DecodeError, DecodeErrorHandler, EncodeError, EncodeErrorHandler,
+    NestedDecode, NestedDecodeInput, NestedEncode, NestedEncodeOutput, TopDecode, TopDecodeInput,
+    TopEncode, TopEncodeOutput, TryStaticCast,
+};
+
+/// A wrapper over a ManagedBuffer with different decode properties. It reads until the end of the buffer.
+#[repr(transparent)]
+pub struct ManagedNestedBuffer<M: ManagedTypeApi> {
+    pub(crate) buffer: ManagedBuffer<M>,
+}
+
+impl<M: ManagedTypeApi> ManagedNestedBuffer<M> {
+    #[inline]
+    pub fn new_from_bytes(bytes: &[u8]) -> Self {
+        Self {
+            buffer: ManagedBuffer::new_from_bytes(bytes),
+        }
+    }
+
+    #[inline]
+    pub fn new_from_buf(buf: ManagedBuffer<M>) -> Self {
+        Self { buffer: buf }
+    }
+
+    fn read_nested_managed_buffer<C, H>(
+        &mut self,
+        context: C,
+        h: H,
+    ) -> Result<ManagedNestedBuffer<M>, H::HandledErr>
+    where
+        C: TryStaticCast,
+        H: DecodeErrorHandler,
+    {
+        self.read_and_flush_managed_buffer(context, h)
+    }
+
+    fn read_and_flush_managed_buffer<C, H>(
+        &mut self,
+        context: C,
+        _h: H,
+    ) -> Result<ManagedNestedBuffer<M>, H::HandledErr>
+    where
+        C: TryStaticCast,
+        H: DecodeErrorHandler,
+    {
+        let mut result_managed_buf = ManagedBuffer::new();
+        while let Some(buffer) = context.try_cast_ref::<ManagedBuffer<M>>() {
+            // read until end
+            result_managed_buf.append(&buffer)
+        }
+
+        Ok(ManagedNestedBuffer::from(result_managed_buf))
+    }
+}
+
+impl<M> From<ManagedBuffer<M>> for ManagedNestedBuffer<M>
+where
+    M: ManagedTypeApi,
+{
+    #[inline]
+    fn from(buf: ManagedBuffer<M>) -> Self {
+        Self::new_from_buf(buf)
+    }
+}
+
+impl<M: ManagedTypeApi> TryStaticCast for ManagedNestedBuffer<M> {}
+
+impl<M: ManagedTypeApi> TopEncode for ManagedNestedBuffer<M> {
+    #[inline]
+    fn top_encode_or_handle_err<O, H>(&self, output: O, h: H) -> Result<(), H::HandledErr>
+    where
+        O: TopEncodeOutput,
+        H: EncodeErrorHandler,
+    {
+        if O::supports_specialized_type::<Self>() {
+            output.set_specialized(self, h)
+        } else {
+            output.set_slice_u8(self.buffer.to_boxed_bytes().as_slice());
+            Ok(())
+        }
+    }
+}
+
+impl<M: ManagedTypeApi> TopDecode for ManagedNestedBuffer<M> {
+    fn top_decode_or_handle_err<I, H>(input: I, h: H) -> Result<Self, H::HandledErr>
+    where
+        I: TopDecodeInput,
+        H: DecodeErrorHandler,
+    {
+        if I::supports_specialized_type::<Self>() {
+            input.into_specialized(h)
+        } else {
+            Ok(ManagedNestedBuffer::new_from_bytes(
+                &input.into_boxed_slice_u8(),
+            ))
+        }
+    }
+}
+
+impl<M: ManagedTypeApi> NestedDecode for ManagedNestedBuffer<M> {
+    fn dep_decode_or_handle_err<I, H>(input: &mut I, h: H) -> Result<Self, H::HandledErr>
+    where
+        I: NestedDecodeInput,
+        H: DecodeErrorHandler,
+    {
+        if I::supports_specialized_type::<Self>() {
+            input.read_specialized((), h)
+        } else {
+            let boxed_bytes = BoxedBytes::dep_decode_or_handle_err(input, h)?;
+            Ok(Self::new_from_bytes(boxed_bytes.as_slice()))
+        }
+    }
+}
+
+impl<M: ManagedTypeApi> NestedEncode for ManagedNestedBuffer<M> {
+    fn dep_encode_or_handle_err<O, H>(&self, dest: &mut O, h: H) -> Result<(), H::HandledErr>
+    where
+        O: NestedEncodeOutput,
+        H: EncodeErrorHandler,
+    {
+        if O::supports_specialized_type::<Self>() {
+            let len_bytes = (self.buffer.len() as u32).to_be_bytes();
+            dest.write(&len_bytes[..]);
+            dest.push_specialized((), self, h)
+        } else {
+            self.buffer
+                .to_boxed_bytes()
+                .dep_encode_or_handle_err(dest, h)
+        }
+    }
+}
+
+impl<M: ManagedTypeApi> NestedDecodeInput for ManagedNestedBuffer<M> {
+    fn is_depleted(&self) -> bool {
+        self.remaining_len() == 0
+    }
+
+    fn supports_specialized_type<T: TryStaticCast>() -> bool {
+        T::type_eq::<ManagedBuffer<M>>()
+            || T::type_eq::<BigUint<M>>()
+            || T::type_eq::<BigInt<M>>()
+            || T::type_eq::<ManagedNestedBuffer<M>>()
+    }
+
+    fn read_specialized<T, C, H>(&mut self, context: C, h: H) -> Result<T, H::HandledErr>
+    where
+        T: TryStaticCast,
+        C: TryStaticCast,
+        H: DecodeErrorHandler,
+    {
+        if let Some(result) = try_execute_then_cast(|| self.read_nested_managed_buffer(context, h))
+        {
+            result
+        } else {
+            Err(h.handle_error(DecodeError::UNSUPPORTED_OPERATION))
+        }
+    }
+
+    //default
+    fn read_byte<H>(&mut self, h: H) -> Result<u8, H::HandledErr>
+    where
+        H: DecodeErrorHandler,
+    {
+        let mut buf = [0u8];
+        self.read_into(&mut buf[..], h)?;
+        Ok(buf[0])
+    }
+
+    fn remaining_len(&self) -> usize {
+        todo!()
+    }
+
+    fn peek_into<H>(&mut self, _into: &mut [u8], _h: H) -> Result<(), H::HandledErr>
+    where
+        H: DecodeErrorHandler,
+    {
+        todo!()
+    }
+
+    fn read_into<H>(&mut self, _into: &mut [u8], _h: H) -> Result<(), H::HandledErr>
+    where
+        H: DecodeErrorHandler,
+    {
+        todo!()
+    }
+}
+
+impl<M: ManagedTypeApi> NestedEncodeOutput for ManagedNestedBuffer<M> {
+    fn push_byte(&mut self, byte: u8) {
+        self.write(&[byte]);
+    }
+
+    fn supports_specialized_type<T: TryStaticCast>() -> bool {
+        T::type_eq::<ManagedBuffer<M>>()
+            || T::type_eq::<BigUint<M>>()
+            || T::type_eq::<BigInt<M>>()
+            || T::type_eq::<ManagedNestedBuffer<M>>()
+    }
+
+    fn push_specialized<T, C, H>(
+        &mut self,
+        _context: C,
+        value: &T,
+        h: H,
+    ) -> Result<(), H::HandledErr>
+    where
+        T: TryStaticCast,
+        C: TryStaticCast,
+        H: EncodeErrorHandler,
+    {
+        if let Some(managed_buffer) = value.try_cast_ref::<ManagedNestedBuffer<M>>() {
+            self.buffer.append(&managed_buffer.buffer);
+            Ok(())
+        } else if let Some(managed_buffer) = value.try_cast_ref::<ManagedBuffer<M>>() {
+            self.buffer.append(managed_buffer);
+            Ok(())
+        } else {
+            Err(h.handle_error(EncodeError::UNSUPPORTED_OPERATION))
+        }
+    }
+
+    fn write(&mut self, bytes: &[u8]) {
+        self.buffer.append_bytes(bytes);
+    }
+}
diff --git a/framework/base/src/types/managed/wrapped/mod.rs b/framework/base/src/types/managed/wrapped/mod.rs
index 3a45b7c151..b035ab3074 100644
--- a/framework/base/src/types/managed/wrapped/mod.rs
+++ b/framework/base/src/types/managed/wrapped/mod.rs
@@ -11,6 +11,7 @@ mod esdt_token_payment;
 mod managed_address;
 mod managed_byte_array;
 mod managed_decimal;
+mod managed_nested_buffer;
 mod managed_option;
 mod managed_ref;
 mod managed_vec;
@@ -39,6 +40,7 @@ pub use managed_byte_array::ManagedByteArray;
 pub use managed_decimal::{
     ConstDecimals, Decimals, ManagedDecimal, ManagedDecimalSigned, NumDecimals,
 };
+pub use managed_nested_buffer::*;
 pub use managed_option::ManagedOption;
 pub use managed_ref::ManagedRef;
 pub use managed_vec::ManagedVec;

From 34c41f292f55d417a39267061866e534efac1137 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 30 Jul 2024 19:20:30 +0300
Subject: [PATCH 1116/1254] ManagedBufferReadToEnd - clean implementation

---
 framework/base/src/io/arg_de_input.rs         |   4 +-
 .../managed_buffer_nested_de_input.rs         |  18 +-
 .../managed_buffer_nested_en_output.rs        |   4 +-
 .../codec_util/managed_buffer_top_de_input.rs |   4 +-
 .../managed_buffer_top_en_output.rs           |   4 +-
 .../wrapped/builder/managed_buffer_builder.rs |   4 +-
 .../wrapped/managed_buffer_read_to_end.rs     |  59 +++++
 .../managed/wrapped/managed_nested_buffer.rs  | 228 ------------------
 .../base/src/types/managed/wrapped/mod.rs     |   4 +-
 9 files changed, 87 insertions(+), 242 deletions(-)
 create mode 100644 framework/base/src/types/managed/wrapped/managed_buffer_read_to_end.rs
 delete mode 100644 framework/base/src/types/managed/wrapped/managed_nested_buffer.rs

diff --git a/framework/base/src/io/arg_de_input.rs b/framework/base/src/io/arg_de_input.rs
index 5c553c3fdd..d1052430f3 100644
--- a/framework/base/src/io/arg_de_input.rs
+++ b/framework/base/src/io/arg_de_input.rs
@@ -10,7 +10,7 @@ use crate::{
     },
     types::{
         heap::Box, BigInt, BigUint, ManagedBuffer, ManagedBufferNestedDecodeInput,
-        ManagedNestedBuffer, ManagedType,
+        ManagedBufferReadToEnd, ManagedType,
     },
 };
 
@@ -127,7 +127,7 @@ where
         T::type_eq::<ManagedBuffer<AA>>()
             || T::type_eq::<BigUint<AA>>()
             || T::type_eq::<BigInt<AA>>()
-            || T::type_eq::<ManagedNestedBuffer<AA>>()
+            || T::type_eq::<ManagedBufferReadToEnd<AA>>()
     }
 
     #[inline]
diff --git a/framework/base/src/types/managed/codec_util/managed_buffer_nested_de_input.rs b/framework/base/src/types/managed/codec_util/managed_buffer_nested_de_input.rs
index ce0bb0bbeb..7752e6f5f0 100644
--- a/framework/base/src/types/managed/codec_util/managed_buffer_nested_de_input.rs
+++ b/framework/base/src/types/managed/codec_util/managed_buffer_nested_de_input.rs
@@ -9,7 +9,7 @@ use crate::{
     api::ManagedTypeApi,
     types::{
         managed::{preloaded_managed_buffer::PreloadedManagedBuffer, ManagedBufferSizeContext},
-        BigInt, BigUint, ManagedBuffer, ManagedNestedBuffer,
+        BigInt, BigUint, ManagedBuffer, ManagedBufferReadToEnd,
     },
 };
 
@@ -77,6 +77,18 @@ where
             &self.read_managed_buffer(h)?,
         ))
     }
+
+    fn read_managed_buffer_to_end<H>(
+        &mut self,
+        h: H,
+    ) -> Result<ManagedBufferReadToEnd<M>, H::HandledErr>
+    where
+        H: DecodeErrorHandler,
+    {
+        Ok(ManagedBufferReadToEnd::from(
+            self.read_managed_buffer_of_size(self.remaining_len(), h)?,
+        ))
+    }
 }
 
 impl<M> NestedDecodeInput for ManagedBufferNestedDecodeInput<M>
@@ -107,7 +119,7 @@ where
 
     fn supports_specialized_type<T: TryStaticCast>() -> bool {
         T::type_eq::<ManagedBuffer<M>>()
-            || T::type_eq::<ManagedNestedBuffer<M>>()
+            || T::type_eq::<ManagedBufferReadToEnd<M>>()
             || T::type_eq::<BigUint<M>>()
             || T::type_eq::<BigInt<M>>()
     }
@@ -126,6 +138,8 @@ where
             }
         }) {
             result
+        } else if let Some(result) = try_execute_then_cast(|| self.read_managed_buffer_to_end(h)) {
+            result
         } else if let Some(result) = try_execute_then_cast(|| self.read_big_uint(h)) {
             result
         } else if let Some(result) = try_execute_then_cast(|| self.read_big_int(h)) {
diff --git a/framework/base/src/types/managed/codec_util/managed_buffer_nested_en_output.rs b/framework/base/src/types/managed/codec_util/managed_buffer_nested_en_output.rs
index e2fff43b16..9a97167ac3 100644
--- a/framework/base/src/types/managed/codec_util/managed_buffer_nested_en_output.rs
+++ b/framework/base/src/types/managed/codec_util/managed_buffer_nested_en_output.rs
@@ -2,7 +2,7 @@ use crate::codec::{EncodeError, EncodeErrorHandler, NestedEncodeOutput, TryStati
 
 use crate::{
     api::ManagedTypeApi,
-    types::{BigInt, BigUint, ManagedBuffer, ManagedNestedBuffer},
+    types::{BigInt, BigUint, ManagedBuffer, ManagedBufferReadToEnd},
 };
 
 impl<M: ManagedTypeApi> NestedEncodeOutput for ManagedBuffer<M> {
@@ -13,7 +13,7 @@ impl<M: ManagedTypeApi> NestedEncodeOutput for ManagedBuffer<M> {
     #[inline]
     fn supports_specialized_type<T: TryStaticCast>() -> bool {
         T::type_eq::<ManagedBuffer<M>>()
-            || T::type_eq::<ManagedNestedBuffer<M>>()
+            || T::type_eq::<ManagedBufferReadToEnd<M>>()
             || T::type_eq::<BigUint<M>>()
             || T::type_eq::<BigInt<M>>()
     }
diff --git a/framework/base/src/types/managed/codec_util/managed_buffer_top_de_input.rs b/framework/base/src/types/managed/codec_util/managed_buffer_top_de_input.rs
index 9ffef973d7..09b0c2f23c 100644
--- a/framework/base/src/types/managed/codec_util/managed_buffer_top_de_input.rs
+++ b/framework/base/src/types/managed/codec_util/managed_buffer_top_de_input.rs
@@ -7,7 +7,7 @@ use crate::{
         try_execute_then_cast, DecodeError, DecodeErrorHandler, TopDecodeInput, TryStaticCast,
     },
     err_msg,
-    types::{BigInt, BigUint, ManagedBuffer, ManagedNestedBuffer},
+    types::{BigInt, BigUint, ManagedBuffer, ManagedBufferReadToEnd},
 };
 use alloc::boxed::Box;
 
@@ -79,7 +79,7 @@ where
     #[inline]
     fn supports_specialized_type<T: TryStaticCast>() -> bool {
         T::type_eq::<ManagedBuffer<M>>()
-            || T::type_eq::<ManagedNestedBuffer<M>>()
+            || T::type_eq::<ManagedBufferReadToEnd<M>>()
             || T::type_eq::<BigUint<M>>()
             || T::type_eq::<BigInt<M>>()
     }
diff --git a/framework/base/src/types/managed/codec_util/managed_buffer_top_en_output.rs b/framework/base/src/types/managed/codec_util/managed_buffer_top_en_output.rs
index 93d856640f..8117855a03 100644
--- a/framework/base/src/types/managed/codec_util/managed_buffer_top_en_output.rs
+++ b/framework/base/src/types/managed/codec_util/managed_buffer_top_en_output.rs
@@ -2,7 +2,7 @@ use crate::codec::{EncodeError, EncodeErrorHandler, TopEncodeOutput, TryStaticCa
 
 use crate::{
     api::ManagedTypeApi,
-    types::{BigInt, BigUint, ManagedBuffer, ManagedNestedBuffer},
+    types::{BigInt, BigUint, ManagedBuffer, ManagedBufferReadToEnd},
 };
 
 impl<M: ManagedTypeApi> TopEncodeOutput for &mut ManagedBuffer<M> {
@@ -15,7 +15,7 @@ impl<M: ManagedTypeApi> TopEncodeOutput for &mut ManagedBuffer<M> {
     #[inline]
     fn supports_specialized_type<T: TryStaticCast>() -> bool {
         T::type_eq::<ManagedBuffer<M>>()
-            || T::type_eq::<ManagedNestedBuffer<M>>()
+            || T::type_eq::<ManagedBufferReadToEnd<M>>()
             || T::type_eq::<BigUint<M>>()
             || T::type_eq::<BigInt<M>>()
     }
diff --git a/framework/base/src/types/managed/wrapped/builder/managed_buffer_builder.rs b/framework/base/src/types/managed/wrapped/builder/managed_buffer_builder.rs
index c4c2d47b6a..41379fe0bb 100644
--- a/framework/base/src/types/managed/wrapped/builder/managed_buffer_builder.rs
+++ b/framework/base/src/types/managed/wrapped/builder/managed_buffer_builder.rs
@@ -8,7 +8,7 @@ use crate::{
         hex_util::{byte_to_binary_digits, byte_to_hex_digits},
         FormatBuffer, FormatByteReceiver, SCBinary, SCCodec, SCDisplay, SCLowerHex,
     },
-    types::{ManagedBuffer, ManagedNestedBuffer},
+    types::{ManagedBuffer, ManagedBufferReadToEnd},
 };
 
 use super::{ManagedBufferBuilderImpl, ManagedBufferImplDefault};
@@ -107,7 +107,7 @@ where
 
     #[inline]
     fn supports_specialized_type<T: TryStaticCast>() -> bool {
-        T::type_eq::<ManagedBuffer<M>>() || T::type_eq::<ManagedNestedBuffer<M>>()
+        T::type_eq::<ManagedBuffer<M>>() || T::type_eq::<ManagedBufferReadToEnd<M>>()
     }
 
     #[inline]
diff --git a/framework/base/src/types/managed/wrapped/managed_buffer_read_to_end.rs b/framework/base/src/types/managed/wrapped/managed_buffer_read_to_end.rs
new file mode 100644
index 0000000000..df8b1f063d
--- /dev/null
+++ b/framework/base/src/types/managed/wrapped/managed_buffer_read_to_end.rs
@@ -0,0 +1,59 @@
+use crate::api::ManagedTypeApi;
+use crate::types::ManagedBuffer;
+use multiversx_sc_codec::{
+    DecodeError, DecodeErrorHandler, EncodeError, EncodeErrorHandler, NestedDecode,
+    NestedDecodeInput, NestedEncode, NestedEncodeOutput, TryStaticCast,
+};
+
+/// A wrapper over a ManagedBuffer with different decode properties. It reads until the end of the buffer.
+#[repr(transparent)]
+pub struct ManagedBufferReadToEnd<M: ManagedTypeApi> {
+    pub(crate) buffer: ManagedBuffer<M>,
+}
+
+impl<M: ManagedTypeApi> ManagedBufferReadToEnd<M> {
+    #[inline]
+    pub fn new_from_buf(buf: ManagedBuffer<M>) -> Self {
+        Self { buffer: buf }
+    }
+}
+
+impl<M> From<ManagedBuffer<M>> for ManagedBufferReadToEnd<M>
+where
+    M: ManagedTypeApi,
+{
+    #[inline]
+    fn from(buf: ManagedBuffer<M>) -> Self {
+        Self::new_from_buf(buf)
+    }
+}
+
+impl<M: ManagedTypeApi> TryStaticCast for ManagedBufferReadToEnd<M> {}
+
+impl<M: ManagedTypeApi> NestedDecode for ManagedBufferReadToEnd<M> {
+    fn dep_decode_or_handle_err<I, H>(input: &mut I, h: H) -> Result<Self, H::HandledErr>
+    where
+        I: NestedDecodeInput,
+        H: DecodeErrorHandler,
+    {
+        if I::supports_specialized_type::<Self>() {
+            input.read_specialized((), h)
+        } else {
+            Err(h.handle_error(DecodeError::UNSUPPORTED_OPERATION))
+        }
+    }
+}
+
+impl<M: ManagedTypeApi> NestedEncode for ManagedBufferReadToEnd<M> {
+    fn dep_encode_or_handle_err<O, H>(&self, dest: &mut O, h: H) -> Result<(), H::HandledErr>
+    where
+        O: NestedEncodeOutput,
+        H: EncodeErrorHandler,
+    {
+        if O::supports_specialized_type::<Self>() {
+            dest.push_specialized((), self, h)
+        } else {
+            Err(h.handle_error(EncodeError::UNSUPPORTED_OPERATION))
+        }
+    }
+}
diff --git a/framework/base/src/types/managed/wrapped/managed_nested_buffer.rs b/framework/base/src/types/managed/wrapped/managed_nested_buffer.rs
deleted file mode 100644
index 497b70b6fa..0000000000
--- a/framework/base/src/types/managed/wrapped/managed_nested_buffer.rs
+++ /dev/null
@@ -1,228 +0,0 @@
-use crate::api::ManagedTypeApi;
-use crate::types::{BigInt, BigUint, BoxedBytes, ManagedBuffer};
-use multiversx_sc_codec::{
-    try_execute_then_cast, DecodeError, DecodeErrorHandler, EncodeError, EncodeErrorHandler,
-    NestedDecode, NestedDecodeInput, NestedEncode, NestedEncodeOutput, TopDecode, TopDecodeInput,
-    TopEncode, TopEncodeOutput, TryStaticCast,
-};
-
-/// A wrapper over a ManagedBuffer with different decode properties. It reads until the end of the buffer.
-#[repr(transparent)]
-pub struct ManagedNestedBuffer<M: ManagedTypeApi> {
-    pub(crate) buffer: ManagedBuffer<M>,
-}
-
-impl<M: ManagedTypeApi> ManagedNestedBuffer<M> {
-    #[inline]
-    pub fn new_from_bytes(bytes: &[u8]) -> Self {
-        Self {
-            buffer: ManagedBuffer::new_from_bytes(bytes),
-        }
-    }
-
-    #[inline]
-    pub fn new_from_buf(buf: ManagedBuffer<M>) -> Self {
-        Self { buffer: buf }
-    }
-
-    fn read_nested_managed_buffer<C, H>(
-        &mut self,
-        context: C,
-        h: H,
-    ) -> Result<ManagedNestedBuffer<M>, H::HandledErr>
-    where
-        C: TryStaticCast,
-        H: DecodeErrorHandler,
-    {
-        self.read_and_flush_managed_buffer(context, h)
-    }
-
-    fn read_and_flush_managed_buffer<C, H>(
-        &mut self,
-        context: C,
-        _h: H,
-    ) -> Result<ManagedNestedBuffer<M>, H::HandledErr>
-    where
-        C: TryStaticCast,
-        H: DecodeErrorHandler,
-    {
-        let mut result_managed_buf = ManagedBuffer::new();
-        while let Some(buffer) = context.try_cast_ref::<ManagedBuffer<M>>() {
-            // read until end
-            result_managed_buf.append(&buffer)
-        }
-
-        Ok(ManagedNestedBuffer::from(result_managed_buf))
-    }
-}
-
-impl<M> From<ManagedBuffer<M>> for ManagedNestedBuffer<M>
-where
-    M: ManagedTypeApi,
-{
-    #[inline]
-    fn from(buf: ManagedBuffer<M>) -> Self {
-        Self::new_from_buf(buf)
-    }
-}
-
-impl<M: ManagedTypeApi> TryStaticCast for ManagedNestedBuffer<M> {}
-
-impl<M: ManagedTypeApi> TopEncode for ManagedNestedBuffer<M> {
-    #[inline]
-    fn top_encode_or_handle_err<O, H>(&self, output: O, h: H) -> Result<(), H::HandledErr>
-    where
-        O: TopEncodeOutput,
-        H: EncodeErrorHandler,
-    {
-        if O::supports_specialized_type::<Self>() {
-            output.set_specialized(self, h)
-        } else {
-            output.set_slice_u8(self.buffer.to_boxed_bytes().as_slice());
-            Ok(())
-        }
-    }
-}
-
-impl<M: ManagedTypeApi> TopDecode for ManagedNestedBuffer<M> {
-    fn top_decode_or_handle_err<I, H>(input: I, h: H) -> Result<Self, H::HandledErr>
-    where
-        I: TopDecodeInput,
-        H: DecodeErrorHandler,
-    {
-        if I::supports_specialized_type::<Self>() {
-            input.into_specialized(h)
-        } else {
-            Ok(ManagedNestedBuffer::new_from_bytes(
-                &input.into_boxed_slice_u8(),
-            ))
-        }
-    }
-}
-
-impl<M: ManagedTypeApi> NestedDecode for ManagedNestedBuffer<M> {
-    fn dep_decode_or_handle_err<I, H>(input: &mut I, h: H) -> Result<Self, H::HandledErr>
-    where
-        I: NestedDecodeInput,
-        H: DecodeErrorHandler,
-    {
-        if I::supports_specialized_type::<Self>() {
-            input.read_specialized((), h)
-        } else {
-            let boxed_bytes = BoxedBytes::dep_decode_or_handle_err(input, h)?;
-            Ok(Self::new_from_bytes(boxed_bytes.as_slice()))
-        }
-    }
-}
-
-impl<M: ManagedTypeApi> NestedEncode for ManagedNestedBuffer<M> {
-    fn dep_encode_or_handle_err<O, H>(&self, dest: &mut O, h: H) -> Result<(), H::HandledErr>
-    where
-        O: NestedEncodeOutput,
-        H: EncodeErrorHandler,
-    {
-        if O::supports_specialized_type::<Self>() {
-            let len_bytes = (self.buffer.len() as u32).to_be_bytes();
-            dest.write(&len_bytes[..]);
-            dest.push_specialized((), self, h)
-        } else {
-            self.buffer
-                .to_boxed_bytes()
-                .dep_encode_or_handle_err(dest, h)
-        }
-    }
-}
-
-impl<M: ManagedTypeApi> NestedDecodeInput for ManagedNestedBuffer<M> {
-    fn is_depleted(&self) -> bool {
-        self.remaining_len() == 0
-    }
-
-    fn supports_specialized_type<T: TryStaticCast>() -> bool {
-        T::type_eq::<ManagedBuffer<M>>()
-            || T::type_eq::<BigUint<M>>()
-            || T::type_eq::<BigInt<M>>()
-            || T::type_eq::<ManagedNestedBuffer<M>>()
-    }
-
-    fn read_specialized<T, C, H>(&mut self, context: C, h: H) -> Result<T, H::HandledErr>
-    where
-        T: TryStaticCast,
-        C: TryStaticCast,
-        H: DecodeErrorHandler,
-    {
-        if let Some(result) = try_execute_then_cast(|| self.read_nested_managed_buffer(context, h))
-        {
-            result
-        } else {
-            Err(h.handle_error(DecodeError::UNSUPPORTED_OPERATION))
-        }
-    }
-
-    //default
-    fn read_byte<H>(&mut self, h: H) -> Result<u8, H::HandledErr>
-    where
-        H: DecodeErrorHandler,
-    {
-        let mut buf = [0u8];
-        self.read_into(&mut buf[..], h)?;
-        Ok(buf[0])
-    }
-
-    fn remaining_len(&self) -> usize {
-        todo!()
-    }
-
-    fn peek_into<H>(&mut self, _into: &mut [u8], _h: H) -> Result<(), H::HandledErr>
-    where
-        H: DecodeErrorHandler,
-    {
-        todo!()
-    }
-
-    fn read_into<H>(&mut self, _into: &mut [u8], _h: H) -> Result<(), H::HandledErr>
-    where
-        H: DecodeErrorHandler,
-    {
-        todo!()
-    }
-}
-
-impl<M: ManagedTypeApi> NestedEncodeOutput for ManagedNestedBuffer<M> {
-    fn push_byte(&mut self, byte: u8) {
-        self.write(&[byte]);
-    }
-
-    fn supports_specialized_type<T: TryStaticCast>() -> bool {
-        T::type_eq::<ManagedBuffer<M>>()
-            || T::type_eq::<BigUint<M>>()
-            || T::type_eq::<BigInt<M>>()
-            || T::type_eq::<ManagedNestedBuffer<M>>()
-    }
-
-    fn push_specialized<T, C, H>(
-        &mut self,
-        _context: C,
-        value: &T,
-        h: H,
-    ) -> Result<(), H::HandledErr>
-    where
-        T: TryStaticCast,
-        C: TryStaticCast,
-        H: EncodeErrorHandler,
-    {
-        if let Some(managed_buffer) = value.try_cast_ref::<ManagedNestedBuffer<M>>() {
-            self.buffer.append(&managed_buffer.buffer);
-            Ok(())
-        } else if let Some(managed_buffer) = value.try_cast_ref::<ManagedBuffer<M>>() {
-            self.buffer.append(managed_buffer);
-            Ok(())
-        } else {
-            Err(h.handle_error(EncodeError::UNSUPPORTED_OPERATION))
-        }
-    }
-
-    fn write(&mut self, bytes: &[u8]) {
-        self.buffer.append_bytes(bytes);
-    }
-}
diff --git a/framework/base/src/types/managed/wrapped/mod.rs b/framework/base/src/types/managed/wrapped/mod.rs
index b035ab3074..99ff3d0516 100644
--- a/framework/base/src/types/managed/wrapped/mod.rs
+++ b/framework/base/src/types/managed/wrapped/mod.rs
@@ -11,7 +11,7 @@ mod esdt_token_payment;
 mod managed_address;
 mod managed_byte_array;
 mod managed_decimal;
-mod managed_nested_buffer;
+mod managed_buffer_read_to_end;
 mod managed_option;
 mod managed_ref;
 mod managed_vec;
@@ -40,7 +40,7 @@ pub use managed_byte_array::ManagedByteArray;
 pub use managed_decimal::{
     ConstDecimals, Decimals, ManagedDecimal, ManagedDecimalSigned, NumDecimals,
 };
-pub use managed_nested_buffer::*;
+pub use managed_buffer_read_to_end::*;
 pub use managed_option::ManagedOption;
 pub use managed_ref::ManagedRef;
 pub use managed_vec::ManagedVec;

From e28747c4baf3ca6dfabaaa426281fb1e743c0f3b Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 30 Jul 2024 19:51:19 +0300
Subject: [PATCH 1117/1254] ManagedBufferReadToEnd - test

---
 .../wrapped/managed_buffer_read_to_end.rs     |  3 +-
 .../tests/managed_buffer_read_to_end_test.rs  | 41 +++++++++++++++++++
 2 files changed, 43 insertions(+), 1 deletion(-)
 create mode 100644 framework/scenario/tests/managed_buffer_read_to_end_test.rs

diff --git a/framework/base/src/types/managed/wrapped/managed_buffer_read_to_end.rs b/framework/base/src/types/managed/wrapped/managed_buffer_read_to_end.rs
index df8b1f063d..3d5666d1bf 100644
--- a/framework/base/src/types/managed/wrapped/managed_buffer_read_to_end.rs
+++ b/framework/base/src/types/managed/wrapped/managed_buffer_read_to_end.rs
@@ -7,6 +7,7 @@ use multiversx_sc_codec::{
 
 /// A wrapper over a ManagedBuffer with different decode properties. It reads until the end of the buffer.
 #[repr(transparent)]
+#[derive(Clone)]
 pub struct ManagedBufferReadToEnd<M: ManagedTypeApi> {
     pub(crate) buffer: ManagedBuffer<M>,
 }
@@ -51,7 +52,7 @@ impl<M: ManagedTypeApi> NestedEncode for ManagedBufferReadToEnd<M> {
         H: EncodeErrorHandler,
     {
         if O::supports_specialized_type::<Self>() {
-            dest.push_specialized((), self, h)
+            dest.push_specialized((), &self.buffer, h)
         } else {
             Err(h.handle_error(EncodeError::UNSUPPORTED_OPERATION))
         }
diff --git a/framework/scenario/tests/managed_buffer_read_to_end_test.rs b/framework/scenario/tests/managed_buffer_read_to_end_test.rs
new file mode 100644
index 0000000000..c8ca605c28
--- /dev/null
+++ b/framework/scenario/tests/managed_buffer_read_to_end_test.rs
@@ -0,0 +1,41 @@
+use multiversx_sc::{
+    api::ManagedTypeApi,
+    codec::{
+        self,
+        derive::{NestedDecode, NestedEncode, TopDecode, TopEncode},
+    },
+    contract_base::ManagedSerializer,
+    derive::ManagedVecItem,
+    types::{
+        BigUint, EsdtTokenPayment, ManagedBuffer, ManagedBufferReadToEnd, ManagedByteArray,
+        ManagedType, TokenIdentifier,
+    },
+};
+use multiversx_sc_scenario::api::StaticApi;
+
+#[derive(TopDecode, TopEncode, Clone)]
+pub struct CallData<M: ManagedTypeApi> {
+    pub endpoint: ManagedBuffer<M>,
+    pub gas_limit: u64,
+    pub data: ManagedBufferReadToEnd<M>,
+}
+
+#[test]
+fn read_To_end_codec_test() {
+    let cd: CallData<_> = CallData::<StaticApi> {
+        endpoint: ManagedBuffer::from("abc"),
+        gas_limit: 0x100_0000,
+        data: ManagedBuffer::from("ddd").into(),
+    };
+
+    #[rustfmt::skip]
+    let expected = &[
+        /* endpoint length */ 0, 0, 0, 3, 
+        /* endpoint contents */ b'a', b'b', b'c',
+        /* gas limit */ 0, 0, 0, 0, 1, 0, 0, 0,
+        /* data */ b'd', b'd', b'd',
+    ];
+
+    let encoded = ManagedSerializer::<StaticApi>::new().top_encode_to_managed_buffer(&cd);
+    assert_eq!(encoded.to_boxed_bytes().as_slice(), expected.as_slice());
+}

From 365f4ae9bd45c08eafb0093aba33adf5b7a1e1cc Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Tue, 30 Jul 2024 20:18:37 +0300
Subject: [PATCH 1118/1254] added decode test

---
 .../wrapped/managed_buffer_read_to_end.rs        | 12 +++++++++++-
 framework/base/src/types/managed/wrapped/mod.rs  |  4 ++--
 .../tests/managed_buffer_read_to_end_test.rs     | 16 ++++++++--------
 3 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/framework/base/src/types/managed/wrapped/managed_buffer_read_to_end.rs b/framework/base/src/types/managed/wrapped/managed_buffer_read_to_end.rs
index 3d5666d1bf..d5b31d006b 100644
--- a/framework/base/src/types/managed/wrapped/managed_buffer_read_to_end.rs
+++ b/framework/base/src/types/managed/wrapped/managed_buffer_read_to_end.rs
@@ -7,7 +7,7 @@ use multiversx_sc_codec::{
 
 /// A wrapper over a ManagedBuffer with different decode properties. It reads until the end of the buffer.
 #[repr(transparent)]
-#[derive(Clone)]
+#[derive(Clone, Debug)]
 pub struct ManagedBufferReadToEnd<M: ManagedTypeApi> {
     pub(crate) buffer: ManagedBuffer<M>,
 }
@@ -19,6 +19,16 @@ impl<M: ManagedTypeApi> ManagedBufferReadToEnd<M> {
     }
 }
 
+impl<M: ManagedTypeApi> PartialEq for ManagedBufferReadToEnd<M> {
+    fn eq(&self, other: &Self) -> bool {
+        self.buffer == other.buffer
+    }
+
+    fn ne(&self, other: &Self) -> bool {
+        !self.eq(other)
+    }
+}
+
 impl<M> From<ManagedBuffer<M>> for ManagedBufferReadToEnd<M>
 where
     M: ManagedTypeApi,
diff --git a/framework/base/src/types/managed/wrapped/mod.rs b/framework/base/src/types/managed/wrapped/mod.rs
index 99ff3d0516..1874dc48b0 100644
--- a/framework/base/src/types/managed/wrapped/mod.rs
+++ b/framework/base/src/types/managed/wrapped/mod.rs
@@ -9,9 +9,9 @@ mod encoded_managed_vec_item;
 mod esdt_token_data;
 mod esdt_token_payment;
 mod managed_address;
+mod managed_buffer_read_to_end;
 mod managed_byte_array;
 mod managed_decimal;
-mod managed_buffer_read_to_end;
 mod managed_option;
 mod managed_ref;
 mod managed_vec;
@@ -35,12 +35,12 @@ pub(crate) use encoded_managed_vec_item::EncodedManagedVecItem;
 pub use esdt_token_data::EsdtTokenData;
 pub use esdt_token_payment::{EsdtTokenPayment, EsdtTokenPaymentRefs, MultiEsdtPayment};
 pub use managed_address::ManagedAddress;
+pub use managed_buffer_read_to_end::*;
 pub(crate) use managed_byte_array::ManagedBufferSizeContext;
 pub use managed_byte_array::ManagedByteArray;
 pub use managed_decimal::{
     ConstDecimals, Decimals, ManagedDecimal, ManagedDecimalSigned, NumDecimals,
 };
-pub use managed_buffer_read_to_end::*;
 pub use managed_option::ManagedOption;
 pub use managed_ref::ManagedRef;
 pub use managed_vec::ManagedVec;
diff --git a/framework/scenario/tests/managed_buffer_read_to_end_test.rs b/framework/scenario/tests/managed_buffer_read_to_end_test.rs
index c8ca605c28..3d2349e1e4 100644
--- a/framework/scenario/tests/managed_buffer_read_to_end_test.rs
+++ b/framework/scenario/tests/managed_buffer_read_to_end_test.rs
@@ -2,18 +2,14 @@ use multiversx_sc::{
     api::ManagedTypeApi,
     codec::{
         self,
-        derive::{NestedDecode, NestedEncode, TopDecode, TopEncode},
+        derive::{TopDecode, TopEncode},
     },
     contract_base::ManagedSerializer,
-    derive::ManagedVecItem,
-    types::{
-        BigUint, EsdtTokenPayment, ManagedBuffer, ManagedBufferReadToEnd, ManagedByteArray,
-        ManagedType, TokenIdentifier,
-    },
+    types::{ManagedBuffer, ManagedBufferReadToEnd},
 };
 use multiversx_sc_scenario::api::StaticApi;
 
-#[derive(TopDecode, TopEncode, Clone)]
+#[derive(TopDecode, TopEncode, Clone, PartialEq, Debug)]
 pub struct CallData<M: ManagedTypeApi> {
     pub endpoint: ManagedBuffer<M>,
     pub gas_limit: u64,
@@ -21,7 +17,7 @@ pub struct CallData<M: ManagedTypeApi> {
 }
 
 #[test]
-fn read_To_end_codec_test() {
+fn read_to_end_codec_test() {
     let cd: CallData<_> = CallData::<StaticApi> {
         endpoint: ManagedBuffer::from("abc"),
         gas_limit: 0x100_0000,
@@ -38,4 +34,8 @@ fn read_To_end_codec_test() {
 
     let encoded = ManagedSerializer::<StaticApi>::new().top_encode_to_managed_buffer(&cd);
     assert_eq!(encoded.to_boxed_bytes().as_slice(), expected.as_slice());
+
+    let decoded: CallData<StaticApi> =
+        ManagedSerializer::<StaticApi>::new().top_decode_from_managed_buffer(&encoded);
+    assert_eq!(decoded, cd);
 }

From 1a8bd94762ee5198ef01b0611523726dc8240053 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Tue, 30 Jul 2024 20:21:14 +0300
Subject: [PATCH 1119/1254] clippy

---
 .../src/types/managed/wrapped/managed_buffer_read_to_end.rs   | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/framework/base/src/types/managed/wrapped/managed_buffer_read_to_end.rs b/framework/base/src/types/managed/wrapped/managed_buffer_read_to_end.rs
index d5b31d006b..a6ec890a19 100644
--- a/framework/base/src/types/managed/wrapped/managed_buffer_read_to_end.rs
+++ b/framework/base/src/types/managed/wrapped/managed_buffer_read_to_end.rs
@@ -23,10 +23,6 @@ impl<M: ManagedTypeApi> PartialEq for ManagedBufferReadToEnd<M> {
     fn eq(&self, other: &Self) -> bool {
         self.buffer == other.buffer
     }
-
-    fn ne(&self, other: &Self) -> bool {
-        !self.eq(other)
-    }
 }
 
 impl<M> From<ManagedBuffer<M>> for ManagedBufferReadToEnd<M>

From 6e5b26b27eb1dad61a5a392a1015b5375115aa52 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 31 Jul 2024 03:49:32 +0300
Subject: [PATCH 1120/1254] ManagedBufferReadToEnd - cleanup

---
 framework/base/src/io/arg_de_input.rs                     | 4 +---
 .../managed/codec_util/managed_buffer_nested_en_output.rs | 8 +-------
 .../managed/codec_util/managed_buffer_top_de_input.rs     | 7 ++-----
 .../managed/codec_util/managed_buffer_top_en_output.rs    | 7 ++-----
 .../managed/wrapped/builder/managed_buffer_builder.rs     | 4 ++--
 .../types/managed/wrapped/managed_buffer_read_to_end.rs   | 2 +-
 6 files changed, 9 insertions(+), 23 deletions(-)

diff --git a/framework/base/src/io/arg_de_input.rs b/framework/base/src/io/arg_de_input.rs
index d1052430f3..98faef2899 100644
--- a/framework/base/src/io/arg_de_input.rs
+++ b/framework/base/src/io/arg_de_input.rs
@@ -9,8 +9,7 @@ use crate::{
         try_execute_then_cast, DecodeError, DecodeErrorHandler, TopDecodeInput, TryStaticCast,
     },
     types::{
-        heap::Box, BigInt, BigUint, ManagedBuffer, ManagedBufferNestedDecodeInput,
-        ManagedBufferReadToEnd, ManagedType,
+        heap::Box, BigInt, BigUint, ManagedBuffer, ManagedBufferNestedDecodeInput, ManagedType,
     },
 };
 
@@ -127,7 +126,6 @@ where
         T::type_eq::<ManagedBuffer<AA>>()
             || T::type_eq::<BigUint<AA>>()
             || T::type_eq::<BigInt<AA>>()
-            || T::type_eq::<ManagedBufferReadToEnd<AA>>()
     }
 
     #[inline]
diff --git a/framework/base/src/types/managed/codec_util/managed_buffer_nested_en_output.rs b/framework/base/src/types/managed/codec_util/managed_buffer_nested_en_output.rs
index 9a97167ac3..57e2349a78 100644
--- a/framework/base/src/types/managed/codec_util/managed_buffer_nested_en_output.rs
+++ b/framework/base/src/types/managed/codec_util/managed_buffer_nested_en_output.rs
@@ -1,9 +1,6 @@
 use crate::codec::{EncodeError, EncodeErrorHandler, NestedEncodeOutput, TryStaticCast};
 
-use crate::{
-    api::ManagedTypeApi,
-    types::{BigInt, BigUint, ManagedBuffer, ManagedBufferReadToEnd},
-};
+use crate::{api::ManagedTypeApi, types::ManagedBuffer};
 
 impl<M: ManagedTypeApi> NestedEncodeOutput for ManagedBuffer<M> {
     fn write(&mut self, bytes: &[u8]) {
@@ -13,9 +10,6 @@ impl<M: ManagedTypeApi> NestedEncodeOutput for ManagedBuffer<M> {
     #[inline]
     fn supports_specialized_type<T: TryStaticCast>() -> bool {
         T::type_eq::<ManagedBuffer<M>>()
-            || T::type_eq::<ManagedBufferReadToEnd<M>>()
-            || T::type_eq::<BigUint<M>>()
-            || T::type_eq::<BigInt<M>>()
     }
 
     #[inline]
diff --git a/framework/base/src/types/managed/codec_util/managed_buffer_top_de_input.rs b/framework/base/src/types/managed/codec_util/managed_buffer_top_de_input.rs
index 09b0c2f23c..fb091781a2 100644
--- a/framework/base/src/types/managed/codec_util/managed_buffer_top_de_input.rs
+++ b/framework/base/src/types/managed/codec_util/managed_buffer_top_de_input.rs
@@ -7,7 +7,7 @@ use crate::{
         try_execute_then_cast, DecodeError, DecodeErrorHandler, TopDecodeInput, TryStaticCast,
     },
     err_msg,
-    types::{BigInt, BigUint, ManagedBuffer, ManagedBufferReadToEnd},
+    types::{BigInt, BigUint, ManagedBuffer},
 };
 use alloc::boxed::Box;
 
@@ -78,10 +78,7 @@ where
 
     #[inline]
     fn supports_specialized_type<T: TryStaticCast>() -> bool {
-        T::type_eq::<ManagedBuffer<M>>()
-            || T::type_eq::<ManagedBufferReadToEnd<M>>()
-            || T::type_eq::<BigUint<M>>()
-            || T::type_eq::<BigInt<M>>()
+        T::type_eq::<ManagedBuffer<M>>() || T::type_eq::<BigUint<M>>() || T::type_eq::<BigInt<M>>()
     }
 
     #[inline]
diff --git a/framework/base/src/types/managed/codec_util/managed_buffer_top_en_output.rs b/framework/base/src/types/managed/codec_util/managed_buffer_top_en_output.rs
index 8117855a03..21ce396cf1 100644
--- a/framework/base/src/types/managed/codec_util/managed_buffer_top_en_output.rs
+++ b/framework/base/src/types/managed/codec_util/managed_buffer_top_en_output.rs
@@ -2,7 +2,7 @@ use crate::codec::{EncodeError, EncodeErrorHandler, TopEncodeOutput, TryStaticCa
 
 use crate::{
     api::ManagedTypeApi,
-    types::{BigInt, BigUint, ManagedBuffer, ManagedBufferReadToEnd},
+    types::{BigInt, BigUint, ManagedBuffer},
 };
 
 impl<M: ManagedTypeApi> TopEncodeOutput for &mut ManagedBuffer<M> {
@@ -14,10 +14,7 @@ impl<M: ManagedTypeApi> TopEncodeOutput for &mut ManagedBuffer<M> {
 
     #[inline]
     fn supports_specialized_type<T: TryStaticCast>() -> bool {
-        T::type_eq::<ManagedBuffer<M>>()
-            || T::type_eq::<ManagedBufferReadToEnd<M>>()
-            || T::type_eq::<BigUint<M>>()
-            || T::type_eq::<BigInt<M>>()
+        T::type_eq::<ManagedBuffer<M>>() || T::type_eq::<BigUint<M>>() || T::type_eq::<BigInt<M>>()
     }
 
     #[inline]
diff --git a/framework/base/src/types/managed/wrapped/builder/managed_buffer_builder.rs b/framework/base/src/types/managed/wrapped/builder/managed_buffer_builder.rs
index 41379fe0bb..b65aa8e0e0 100644
--- a/framework/base/src/types/managed/wrapped/builder/managed_buffer_builder.rs
+++ b/framework/base/src/types/managed/wrapped/builder/managed_buffer_builder.rs
@@ -8,7 +8,7 @@ use crate::{
         hex_util::{byte_to_binary_digits, byte_to_hex_digits},
         FormatBuffer, FormatByteReceiver, SCBinary, SCCodec, SCDisplay, SCLowerHex,
     },
-    types::{ManagedBuffer, ManagedBufferReadToEnd},
+    types::ManagedBuffer,
 };
 
 use super::{ManagedBufferBuilderImpl, ManagedBufferImplDefault};
@@ -107,7 +107,7 @@ where
 
     #[inline]
     fn supports_specialized_type<T: TryStaticCast>() -> bool {
-        T::type_eq::<ManagedBuffer<M>>() || T::type_eq::<ManagedBufferReadToEnd<M>>()
+        T::type_eq::<ManagedBuffer<M>>()
     }
 
     #[inline]
diff --git a/framework/base/src/types/managed/wrapped/managed_buffer_read_to_end.rs b/framework/base/src/types/managed/wrapped/managed_buffer_read_to_end.rs
index a6ec890a19..2ed09b59bd 100644
--- a/framework/base/src/types/managed/wrapped/managed_buffer_read_to_end.rs
+++ b/framework/base/src/types/managed/wrapped/managed_buffer_read_to_end.rs
@@ -57,7 +57,7 @@ impl<M: ManagedTypeApi> NestedEncode for ManagedBufferReadToEnd<M> {
         O: NestedEncodeOutput,
         H: EncodeErrorHandler,
     {
-        if O::supports_specialized_type::<Self>() {
+        if O::supports_specialized_type::<ManagedBuffer<M>>() {
             dest.push_specialized((), &self.buffer, h)
         } else {
             Err(h.handle_error(EncodeError::UNSUPPORTED_OPERATION))

From 0b02e9fcc69da2c74c5b14cd235f4e5efb4bd61d Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 31 Jul 2024 04:01:36 +0300
Subject: [PATCH 1121/1254] dependency upgrades

---
 data/codec-derive/Cargo.toml  | 2 +-
 framework/derive/Cargo.toml   | 2 +-
 framework/meta-lib/Cargo.toml | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/data/codec-derive/Cargo.toml b/data/codec-derive/Cargo.toml
index 6405168a03..ff6171c589 100644
--- a/data/codec-derive/Cargo.toml
+++ b/data/codec-derive/Cargo.toml
@@ -23,5 +23,5 @@ default = ["syn/full", "syn/parsing", "syn/extra-traits"]
 [dependencies]
 proc-macro2 = "=1.0.86"
 quote = "=1.0.36"
-syn = "=2.0.68"
+syn = "=2.0.72"
 hex = "=0.4.3"
diff --git a/framework/derive/Cargo.toml b/framework/derive/Cargo.toml
index 8614624e7c..310e34493f 100644
--- a/framework/derive/Cargo.toml
+++ b/framework/derive/Cargo.toml
@@ -16,7 +16,7 @@ categories = ["cryptography::cryptocurrencies", "development-tools::procedural-m
 [dependencies]
 proc-macro2 = "=1.0.86"
 quote = "=1.0.36"
-syn = "=2.0.68"
+syn = "=2.0.72"
 hex = "=0.4.3"
 radix_trie = "=0.2.1"
 
diff --git a/framework/meta-lib/Cargo.toml b/framework/meta-lib/Cargo.toml
index 6515883af0..2b3eec32b8 100644
--- a/framework/meta-lib/Cargo.toml
+++ b/framework/meta-lib/Cargo.toml
@@ -26,8 +26,8 @@ colored = "2.0"
 lazy_static = "1.4.0"
 convert_case = "0.6.0"
 hex = "0.4"
-wasmparser = "0.212"
-wasmprinter = "0.212"
+wasmparser = "0.214"
+wasmprinter = "0.214"
 semver = "1.0.20"
 
 [dependencies.multiversx-sc]

From f41acc847d8e9261b7a64a6c36611abfcf2034d8 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 31 Jul 2024 04:03:15 +0300
Subject: [PATCH 1122/1254] sc 0.52.0

---
 CHANGELOG.md                                  |   5 +
 Cargo.lock                                    | 226 +++++++++---------
 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 +-
 .../Cargo.toml                                |   2 +-
 .../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     |   8 +-
 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 +-
 .../wasm-alloc-mem-fail/Cargo.toml            |   2 +-
 .../wasm-alloc-mem-leaking/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-legacy/Cargo.toml |   4 +-
 .../forwarder-legacy/meta/Cargo.toml          |   2 +-
 .../forwarder-legacy/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 +-
 .../exchange-features/Cargo.toml              |   4 +-
 .../exchange-features/meta/Cargo.toml         |   2 +-
 .../exchange-features/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 +-
 .../feature-tests/scenario-tester/Cargo.toml  |   4 +-
 .../scenario-tester/meta/Cargo.toml           |   2 +-
 .../scenario-tester/wasm/Cargo.toml           |   2 +-
 contracts/feature-tests/use-module/Cargo.toml |   8 +-
 .../feature-tests/use-module/meta/Cargo.toml  |   2 +-
 .../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 +-
 framework/base/Cargo.toml                     |   4 +-
 framework/derive/Cargo.toml                   |   2 +-
 framework/meta-lib/Cargo.toml                 |   4 +-
 framework/meta-lib/src/version_history.rs     |   4 +-
 framework/meta/Cargo.toml                     |   8 +-
 framework/scenario/Cargo.toml                 |   6 +-
 framework/snippets/Cargo.toml                 |   4 +-
 framework/wasm-adapter/Cargo.toml             |   4 +-
 tools/mxpy-snippet-generator/Cargo.toml       |   2 +-
 tools/plotter/Cargo.toml                      |   4 +-
 tools/rust-debugger/format-tests/Cargo.toml   |   4 +-
 272 files changed, 506 insertions(+), 503 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 16cf669c27..b339c277f0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,6 +27,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.52.0] - 2024-07-31
+- ManagedBufferReadToEnd type, which flushed a nested data buffer.
+- Fixed hex and binary formatters for byte slices.
+- Added EI 1.4 and 1.5 configs.
+
 ## [sc 0.51.1]
 - `sc-meta upgrade` bugfix.
 
diff --git a/Cargo.lock b/Cargo.lock
index 815470d026..de73f9ff5e 100755
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -100,9 +100,9 @@ dependencies = [
 
 [[package]]
 name = "anstream"
-version = "0.6.14"
+version = "0.6.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b"
+checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526"
 dependencies = [
  "anstyle",
  "anstyle-parse",
@@ -115,33 +115,33 @@ dependencies = [
 
 [[package]]
 name = "anstyle"
-version = "1.0.7"
+version = "1.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b"
+checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1"
 
 [[package]]
 name = "anstyle-parse"
-version = "0.2.4"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4"
+checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb"
 dependencies = [
  "utf8parse",
 ]
 
 [[package]]
 name = "anstyle-query"
-version = "1.1.0"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad186efb764318d35165f1758e7dcef3b10628e26d41a44bc5550652e6804391"
+checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a"
 dependencies = [
  "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "anstyle-wincon"
-version = "3.0.3"
+version = "3.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19"
+checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8"
 dependencies = [
  "anstyle",
  "windows-sys 0.52.0",
@@ -340,9 +340,9 @@ dependencies = [
 
 [[package]]
 name = "bstr"
-version = "1.9.1"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706"
+checksum = "40723b8fb387abc38f4f4a37c09073622e41dd12327033091ef8950659e6dc0c"
 dependencies = [
  "memchr",
  "serde",
@@ -378,15 +378,15 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "bytes"
-version = "1.6.0"
+version = "1.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9"
+checksum = "a12916984aab3fa6e39d655a33e09c0071eb36d6ab3aea5c2d78551f1df6d952"
 
 [[package]]
 name = "cc"
-version = "1.0.104"
+version = "1.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74b6a57f98764a267ff415d50a25e6e166f3831a5071af4995296ea97d210490"
+checksum = "26a5c3fd7bfa1ce3897a3a3501d362b2d87b7f2583ebcb4a949ec25911025cbc"
 
 [[package]]
 name = "cfg-if"
@@ -431,9 +431,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.8"
+version = "4.5.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84b3edb18336f4df585bc9aa31dd99c036dfa5dc5e9a2939a722a188f3a8970d"
+checksum = "35723e6a11662c2afb578bcf0b88bf6ea8e21282a953428f240574fcc3a2b5b3"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -441,9 +441,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.8"
+version = "4.5.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1c09dd5ada6c6c78075d6fd0da3f90d8080651e2d6cc8eb2f1aaa4034ced708"
+checksum = "49eb96cbfa7cfa35017b7cd548c75b14c3118c98b423041d70562665e07fb0fa"
 dependencies = [
  "anstream",
  "anstyle",
@@ -453,9 +453,9 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.5.8"
+version = "4.5.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bac35c6dafb060fd4d275d9a4ffae97917c13a6327903a8be2153cd964f7085"
+checksum = "5d029b67f89d30bbb547c89fd5161293c0aec155fc691d7924b64550662db93e"
 dependencies = [
  "heck",
  "proc-macro2",
@@ -465,15 +465,15 @@ dependencies = [
 
 [[package]]
 name = "clap_lex"
-version = "0.7.1"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b82cf0babdbd58558212896d1a4272303a57bdb245c2bf1147185fb45640e70"
+checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97"
 
 [[package]]
 name = "colorchoice"
-version = "1.0.1"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422"
+checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0"
 
 [[package]]
 name = "colored"
@@ -798,9 +798,9 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "env_filter"
-version = "0.1.0"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea"
+checksum = "4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab"
 dependencies = [
  "log",
  "regex",
@@ -808,9 +808,9 @@ dependencies = [
 
 [[package]]
 name = "env_logger"
-version = "0.11.3"
+version = "0.11.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9"
+checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d"
 dependencies = [
  "anstream",
  "anstyle",
@@ -1378,9 +1378,9 @@ dependencies = [
 
 [[package]]
 name = "http-body"
-version = "1.0.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643"
+checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184"
 dependencies = [
  "bytes",
  "http",
@@ -1413,9 +1413,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
 
 [[package]]
 name = "hyper"
-version = "1.4.0"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4fe55fb7a772d59a5ff1dfbff4fe0258d19b89fec4b233e75d35d5d2316badc"
+checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -1540,9 +1540,9 @@ checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3"
 
 [[package]]
 name = "is_terminal_polyfill"
-version = "1.70.0"
+version = "1.70.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800"
+checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
 
 [[package]]
 name = "itertools"
@@ -1819,13 +1819,14 @@ dependencies = [
 
 [[package]]
 name = "mio"
-version = "0.8.11"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
+checksum = "4569e456d394deccd22ce1c1913e6ea0e54519f577285001215d33557431afe4"
 dependencies = [
+ "hermit-abi",
  "libc",
  "wasi 0.11.0+wasi-snapshot-preview1",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -1921,7 +1922,7 @@ checksum = "b59072fa0624b55ae5ae3fa6bfa91515bbeb4ac440214bc4a509e2c8806d6e9f"
 
 [[package]]
 name = "multiversx-price-aggregator-sc"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "arrayvec",
  "getrandom 0.2.15",
@@ -1942,7 +1943,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "bitflags 2.6.0",
  "hex-literal",
@@ -1974,7 +1975,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -1985,7 +1986,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-meta"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "clap",
  "colored",
@@ -2008,7 +2009,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-meta-lib"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "clap",
  "colored",
@@ -2027,14 +2028,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-scenario"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "base64",
  "bech32",
@@ -2058,7 +2059,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-snippets"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "base64",
  "env_logger",
@@ -2074,7 +2075,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -2106,7 +2107,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-wegld-swap-sc"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
  "multiversx-sc-modules",
@@ -2236,21 +2237,11 @@ dependencies = [
  "autocfg",
 ]
 
-[[package]]
-name = "num_cpus"
-version = "1.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
-dependencies = [
- "hermit-abi",
- "libc",
-]
-
 [[package]]
 name = "object"
-version = "0.36.1"
+version = "0.36.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "081b846d1d56ddfc18fdf1a922e4f6e07a11768ea1b92dec44e42b72712ccfce"
+checksum = "3f203fa8daa7bb185f760ae12bd8e097f63d17041dcdcaf675ac54cdf863170e"
 dependencies = [
  "memchr",
 ]
@@ -2269,9 +2260,9 @@ checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381"
 
 [[package]]
 name = "openssl"
-version = "0.10.64"
+version = "0.10.66"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f"
+checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1"
 dependencies = [
  "bitflags 2.6.0",
  "cfg-if",
@@ -2301,9 +2292,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.102"
+version = "0.9.103"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2"
+checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6"
 dependencies = [
  "cc",
  "libc",
@@ -2498,9 +2489,13 @@ checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
 
 [[package]]
 name = "ppv-lite86"
-version = "0.2.17"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
+checksum = "2288c0e17cc8d342c712bb43a257a80ebffce59cdb33d5000d8348f3ec02528b"
+dependencies = [
+ "zerocopy",
+ "zerocopy-derive",
+]
 
 [[package]]
 name = "proc-macro2"
@@ -2718,9 +2713,9 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.5.2"
+version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd"
+checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4"
 dependencies = [
  "bitflags 2.6.0",
 ]
@@ -2913,9 +2908,9 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.23.10"
+version = "0.23.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05cff451f60db80f490f3c182b77c35260baace73209e9cdbbe526bfe3a4d402"
+checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044"
 dependencies = [
  "once_cell",
  "rustls-pki-types",
@@ -2942,9 +2937,9 @@ checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d"
 
 [[package]]
 name = "rustls-webpki"
-version = "0.102.5"
+version = "0.102.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9a6fccd794a42c2c105b513a2f62bc3fd8f3ba57a4593677ceb0bd035164d78"
+checksum = "8e6b52d4fda176fd835fdc55a835d4a89b8499cad995885a21149d5ad62f852e"
 dependencies = [
  "ring",
  "rustls-pki-types",
@@ -3016,9 +3011,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework"
-version = "2.11.0"
+version = "2.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0"
+checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
 dependencies = [
  "bitflags 2.6.0",
  "core-foundation",
@@ -3029,9 +3024,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework-sys"
-version = "2.11.0"
+version = "2.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7"
+checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -3078,18 +3073,18 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.203"
+version = "1.0.204"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094"
+checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.203"
+version = "1.0.204"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba"
+checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3098,12 +3093,13 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.120"
+version = "1.0.121"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5"
+checksum = "4ab380d7d9f22ef3f21ad3e6c1ebe8e4fc7a2000ccba2e4d71fc96f15b2cb609"
 dependencies = [
  "indexmap",
  "itoa",
+ "memchr",
  "ryu",
  "serde",
 ]
@@ -3121,9 +3117,9 @@ dependencies = [
 
 [[package]]
 name = "serde_spanned"
-version = "0.6.6"
+version = "0.6.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0"
+checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d"
 dependencies = [
  "serde",
 ]
@@ -3290,9 +3286,9 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3349,18 +3345,18 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.61"
+version = "1.0.63"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709"
+checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.61"
+version = "1.0.63"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533"
+checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3369,9 +3365,9 @@ dependencies = [
 
 [[package]]
 name = "tinyvec"
-version = "1.7.0"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce6b6a2fb3a985e99cebfaefa9faa3024743da73304ca1c683a36429613d3d22"
+checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938"
 dependencies = [
  "tinyvec_macros",
 ]
@@ -3400,28 +3396,27 @@ dependencies = [
 
 [[package]]
 name = "tokio"
-version = "1.38.0"
+version = "1.39.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a"
+checksum = "daa4fb1bc778bd6f04cbfc4bb2d06a7396a8f299dc33ea1900cedaa316f467b1"
 dependencies = [
  "backtrace",
  "bytes",
  "libc",
  "mio",
- "num_cpus",
  "parking_lot",
  "pin-project-lite",
  "signal-hook-registry",
  "socket2",
  "tokio-macros",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "tokio-macros"
-version = "2.3.0"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a"
+checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3464,9 +3459,9 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.8.14"
+version = "0.8.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335"
+checksum = "7a44eede9b727419af8095cb2d72fab15487a541f54647ad4414b34096ee4631"
 dependencies = [
  "indexmap",
  "serde",
@@ -3477,18 +3472,18 @@ dependencies = [
 
 [[package]]
 name = "toml_datetime"
-version = "0.6.6"
+version = "0.6.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf"
+checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "toml_edit"
-version = "0.22.14"
+version = "0.22.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f21c7aaf97f1bd9ca9d4f9e73b0a6c74bd5afef56f2bc931943a6e1c37e04e38"
+checksum = "1490595c74d930da779e944f5ba2ecdf538af67df1a9848cbd156af43c1b7cf0"
 dependencies = [
  "indexmap",
  "serde",
@@ -3688,9 +3683,9 @@ dependencies = [
 
 [[package]]
 name = "version_check"
-version = "0.9.4"
+version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
 
 [[package]]
 name = "walkdir"
@@ -3791,9 +3786,9 @@ checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
 
 [[package]]
 name = "wasmparser"
-version = "0.212.0"
+version = "0.214.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d28bc49ba1e5c5b61ffa7a2eace10820443c4b7d1c0b144109261d14570fdf8"
+checksum = "5309c1090e3e84dad0d382f42064e9933fdaedb87e468cc239f0eabea73ddcb6"
 dependencies = [
  "ahash",
  "bitflags 2.6.0",
@@ -3805,9 +3800,9 @@ dependencies = [
 
 [[package]]
 name = "wasmprinter"
-version = "0.212.0"
+version = "0.214.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfac65326cc561112af88c3028f6dfdb140acff67ede33a8e86be2dc6b8956f7"
+checksum = "58d4f2b3f7bd2ba10f99e03f885ff90d5db3455e163bccecebbbf60406bd8980"
 dependencies = [
  "anyhow",
  "termcolor",
@@ -3974,9 +3969,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
 name = "winnow"
-version = "0.6.13"
+version = "0.6.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1"
+checksum = "b480ae9340fc261e6be3e95a1ba86d54ae3f9171132a73ce8d4bbaf68339507c"
 dependencies = [
  "memchr",
 ]
@@ -3997,6 +3992,7 @@ version = "0.7.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
 dependencies = [
+ "byteorder",
  "zerocopy-derive",
 ]
 
@@ -4033,9 +4029,9 @@ dependencies = [
 
 [[package]]
 name = "zip"
-version = "2.1.3"
+version = "2.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "775a2b471036342aa69bc5a602bc889cb0a06cda00477d0c69566757d5553d39"
+checksum = "b895748a3ebcb69b9d38dcfdf21760859a4b0d0b0015277640c2ef4c69640e6f"
 dependencies = [
  "arbitrary",
  "crc32fast",
diff --git a/contracts/benchmarks/large-storage/Cargo.toml b/contracts/benchmarks/large-storage/Cargo.toml
index f1e1b7b64e..fddf6f7abc 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.51.1"
+version = "0.52.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../framework/scenario"
diff --git a/contracts/benchmarks/large-storage/meta/Cargo.toml b/contracts/benchmarks/large-storage/meta/Cargo.toml
index a6a8d9e7aa..dd6ef5b1fa 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-lib]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/benchmarks/large-storage/wasm/Cargo.toml b/contracts/benchmarks/large-storage/wasm/Cargo.toml
index c481293914..73746b63e4 100644
--- a/contracts/benchmarks/large-storage/wasm/Cargo.toml
+++ b/contracts/benchmarks/large-storage/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.1"
+version = "0.52.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 e3fcca37fc..129ee0358c 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.51.1"
+version = "0.52.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.52.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 1f18cd76d5..0805dc7774 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.51.1"
+version = "0.52.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.52.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 ab3f7debd9..e772d3b454 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-lib]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../../framework/meta-lib"
 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 7e1c03fd7c..753337c091 100644
--- a/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.1"
+version = "0.52.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 530bd65318..0df2134e7d 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.51.1"
+version = "0.52.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.52.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 b723dc821a..09111a3ee0 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-lib]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.toml b/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.toml
index f6bd495169..cae847529d 100644
--- a/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.1"
+version = "0.52.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 674e0d5032..c491e54cb7 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.51.1"
+version = "0.52.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.52.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 61b83fa4ea..0ebedbd8e8 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-lib]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.toml b/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.toml
index 4a40181bb3..ccb1ff184d 100644
--- a/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.1"
+version = "0.52.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 9b1c9851aa..14a28959c2 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.51.1"
+version = "0.52.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.52.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 a5f334cbcc..4dd6653fbb 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-lib]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.toml b/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.toml
index 80b6514c8e..7e4ff0f014 100644
--- a/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.1"
+version = "0.52.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 42c91c2682..26d1201c24 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.51.1"
+version = "0.52.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.52.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 883187759a..e957db6de1 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-lib]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../../framework/meta-lib"
 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 d2bf4ef9d7..1e0bc759ea 100644
--- a/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.1"
+version = "0.52.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 636d2f04b9..2591a990b2 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.51.1"
+version = "0.52.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.52.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 33c72948de..d902aaa678 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-lib]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.toml b/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.toml
index f1fdaee1f8..f6dc9a263e 100644
--- a/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.1"
+version = "0.52.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 fc5b8026b9..8336b1fba0 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.51.1"
+version = "0.52.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.52.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 482926723c..0ae4a19bc9 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-lib]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/benchmarks/send-tx-repeat/wasm/Cargo.toml b/contracts/benchmarks/send-tx-repeat/wasm/Cargo.toml
index 5fd9d6efee..bde390795f 100644
--- a/contracts/benchmarks/send-tx-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/send-tx-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/str-repeat/Cargo.toml b/contracts/benchmarks/str-repeat/Cargo.toml
index be9ea096bb..fd3f5c2587 100644
--- a/contracts/benchmarks/str-repeat/Cargo.toml
+++ b/contracts/benchmarks/str-repeat/Cargo.toml
@@ -12,10 +12,10 @@ path = "src/str_repeat.rs"
 managed-buffer-builder-cached = ["multiversx-sc/managed-buffer-builder-cached"]
 
 [dependencies.multiversx-sc]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../framework/scenario"
diff --git a/contracts/benchmarks/str-repeat/meta/Cargo.toml b/contracts/benchmarks/str-repeat/meta/Cargo.toml
index 99e41cff30..48a6f97df9 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-lib]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.toml b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.toml
index 84b2816ed0..9f0da95f02 100644
--- a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.toml
+++ b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.toml b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.toml
index 880de0fd63..f8867f85f8 100644
--- a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.toml
+++ b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.toml
@@ -29,7 +29,7 @@ path = ".."
 features = ["managed-buffer-builder-cached"]
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/str-repeat/wasm/Cargo.toml b/contracts/benchmarks/str-repeat/wasm/Cargo.toml
index 7a887af1de..8adeee7c0e 100644
--- a/contracts/benchmarks/str-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/str-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/core/price-aggregator/Cargo.toml b/contracts/core/price-aggregator/Cargo.toml
index 2d9856ad84..9193921708 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.51.1"
+version = "0.52.0"
 authors = [
     "Claudiu-Marcel Bruda <claudiu.bruda@multiversx.com>",
     "MultiversX <contact@multiversx.com>",
@@ -19,15 +19,15 @@ edition = "2021"
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../framework/scenario"
 
 [dependencies]
diff --git a/contracts/core/price-aggregator/meta/Cargo.toml b/contracts/core/price-aggregator/meta/Cargo.toml
index df8b0fd27d..87539ba847 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.51.1"
+version = "0.52.0"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-meta-lib]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/core/price-aggregator/wasm/Cargo.toml b/contracts/core/price-aggregator/wasm/Cargo.toml
index bd3972ce4b..9450ef3bdd 100644
--- a/contracts/core/price-aggregator/wasm/Cargo.toml
+++ b/contracts/core/price-aggregator/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/core/wegld-swap/Cargo.toml b/contracts/core/wegld-swap/Cargo.toml
index da24ab3218..707342be5d 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.51.1"
+version = "0.52.0"
 
 authors = [
     "Dorin Iancu <dorin.iancu@multiversx.com>",
@@ -20,13 +20,13 @@ edition = "2021"
 path = "src/wegld.rs"
 
 [dependencies.multiversx-sc]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../framework/scenario"
diff --git a/contracts/core/wegld-swap/meta/Cargo.toml b/contracts/core/wegld-swap/meta/Cargo.toml
index 5412bdceca..bc385cccb3 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.51.1"
+version = "0.52.0"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-meta-lib]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/core/wegld-swap/wasm/Cargo.toml b/contracts/core/wegld-swap/wasm/Cargo.toml
index 36108d6fbe..0954123440 100644
--- a/contracts/core/wegld-swap/wasm/Cargo.toml
+++ b/contracts/core/wegld-swap/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/adder/Cargo.toml b/contracts/examples/adder/Cargo.toml
index 0f3fdd5743..29bc4d8d39 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.51.1"
+version = "0.52.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/adder/interact/Cargo.toml b/contracts/examples/adder/interact/Cargo.toml
index e862b03ba6..e78df43f7d 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.51.1"
+version = "0.52.0"
 path = "../../../../framework/snippets"
diff --git a/contracts/examples/adder/meta/Cargo.toml b/contracts/examples/adder/meta/Cargo.toml
index b847ab37dc..99f881de67 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-lib]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/adder/wasm/Cargo.toml b/contracts/examples/adder/wasm/Cargo.toml
index 5ee83722de..25af5fd80e 100644
--- a/contracts/examples/adder/wasm/Cargo.toml
+++ b/contracts/examples/adder/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.1"
+version = "0.52.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 983e393373..16fa7a8d62 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.51.1"
+version = "0.52.0"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.52.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 a0de3197f2..bdc45bf146 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-lib]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/bonding-curve-contract/wasm/Cargo.toml b/contracts/examples/bonding-curve-contract/wasm/Cargo.toml
index 341cb263d2..d58ad48a39 100644
--- a/contracts/examples/bonding-curve-contract/wasm/Cargo.toml
+++ b/contracts/examples/bonding-curve-contract/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/check-pause/Cargo.toml b/contracts/examples/check-pause/Cargo.toml
index 30c5dd163e..726e9fd228 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.51.1"
+version = "0.52.0"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../framework/scenario"
 
diff --git a/contracts/examples/check-pause/meta/Cargo.toml b/contracts/examples/check-pause/meta/Cargo.toml
index 7e379211bd..368e7f52a9 100644
--- a/contracts/examples/check-pause/meta/Cargo.toml
+++ b/contracts/examples/check-pause/meta/Cargo.toml
@@ -9,6 +9,6 @@ authors = ["Alin Cruceat <alin.cruceat@multiversx.com>"]
 path = ".."
 
 [dependencies.multiversx-sc-meta-lib]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/check-pause/wasm/Cargo.toml b/contracts/examples/check-pause/wasm/Cargo.toml
index 796acc533b..582543413a 100644
--- a/contracts/examples/check-pause/wasm/Cargo.toml
+++ b/contracts/examples/check-pause/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/crowdfunding-esdt/Cargo.toml b/contracts/examples/crowdfunding-esdt/Cargo.toml
index 3b873fb7b5..c4f4199e20 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.51.1"
+version = "0.52.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.52.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 53c8fc854c..1accf0e825 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-lib]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/crowdfunding-esdt/wasm/Cargo.toml b/contracts/examples/crowdfunding-esdt/wasm/Cargo.toml
index d1a35db239..5c8669ec12 100644
--- a/contracts/examples/crowdfunding-esdt/wasm/Cargo.toml
+++ b/contracts/examples/crowdfunding-esdt/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/crypto-bubbles/Cargo.toml b/contracts/examples/crypto-bubbles/Cargo.toml
index 428963a491..8819a8e5f5 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.51.1"
+version = "0.52.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/crypto-bubbles/meta/Cargo.toml b/contracts/examples/crypto-bubbles/meta/Cargo.toml
index b07f462d78..64b4f2637f 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-lib]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/crypto-bubbles/wasm/Cargo.toml b/contracts/examples/crypto-bubbles/wasm/Cargo.toml
index d94fe29e5d..6e5a736d0c 100644
--- a/contracts/examples/crypto-bubbles/wasm/Cargo.toml
+++ b/contracts/examples/crypto-bubbles/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.1"
+version = "0.52.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 7fb6db9cc4..8d985257f2 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.51.1"
+version = "0.52.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 4223338861..f8cb8fd989 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.51.1"
+version = "0.52.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 a245b2db45..d9377bb9b3 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.51.1"
+version = "0.52.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.52.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 816c4b0017..be50ac254b 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-lib]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../../framework/meta-lib"
 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 d9190f9070..3eef131e90 100644
--- a/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.toml
+++ b/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.1"
+version = "0.52.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 11026a4a53..0cf085bcbe 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.51.1"
+version = "0.52.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.52.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 2c2522d4d8..b261e646f7 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-lib]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../../framework/meta-lib"
 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 40314286d2..4e38aa02a6 100644
--- a/contracts/examples/crypto-kitties/kitty-genetic-alg/wasm/Cargo.toml
+++ b/contracts/examples/crypto-kitties/kitty-genetic-alg/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.1"
+version = "0.52.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 21d0dd821c..2f7a217626 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.51.1"
+version = "0.52.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.52.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 6d520d49fd..7c73257434 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-lib]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../../framework/meta-lib"
 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 cc5ccbff7f..538276dd60 100644
--- a/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.toml
+++ b/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/crypto-zombies/Cargo.toml b/contracts/examples/crypto-zombies/Cargo.toml
index 0c92cf2ecb..39639f55d1 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.51.1"
+version = "0.52.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/crypto-zombies/meta/Cargo.toml b/contracts/examples/crypto-zombies/meta/Cargo.toml
index fc8143293e..555331e0cd 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-lib]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/crypto-zombies/wasm/Cargo.toml b/contracts/examples/crypto-zombies/wasm/Cargo.toml
index 2d7958f446..074309dfc9 100644
--- a/contracts/examples/crypto-zombies/wasm/Cargo.toml
+++ b/contracts/examples/crypto-zombies/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/digital-cash/Cargo.toml b/contracts/examples/digital-cash/Cargo.toml
index 4c62a66396..acf383a168 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.51.1"
+version = "0.52.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/digital-cash/meta/Cargo.toml b/contracts/examples/digital-cash/meta/Cargo.toml
index 4b0f9128c5..1905461ec3 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-lib]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/digital-cash/wasm/Cargo.toml b/contracts/examples/digital-cash/wasm/Cargo.toml
index e368089244..a8c2ed8790 100644
--- a/contracts/examples/digital-cash/wasm/Cargo.toml
+++ b/contracts/examples/digital-cash/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/empty/Cargo.toml b/contracts/examples/empty/Cargo.toml
index cd673f0026..11f9f42dc3 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.51.1"
+version = "0.52.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../framework/scenario"
 
 [dev-dependencies]
diff --git a/contracts/examples/empty/meta/Cargo.toml b/contracts/examples/empty/meta/Cargo.toml
index 8c1f6f6727..02272b87f9 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-lib]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/empty/wasm/Cargo.toml b/contracts/examples/empty/wasm/Cargo.toml
index 634af62941..0f5f878348 100644
--- a/contracts/examples/empty/wasm/Cargo.toml
+++ b/contracts/examples/empty/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.1"
+version = "0.52.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 ae690d99ef..9edd792729 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.51.1"
+version = "0.52.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.52.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 42c1c9316e..2270548c70 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-lib]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../framework/meta-lib"
 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 4a6acde6f2..f960a47d48 100644
--- a/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.toml
+++ b/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/factorial/Cargo.toml b/contracts/examples/factorial/Cargo.toml
index 5f513f24bf..5f74d1f416 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.51.1"
+version = "0.52.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/factorial/meta/Cargo.toml b/contracts/examples/factorial/meta/Cargo.toml
index 396aeccadf..6cd9657308 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-lib]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/factorial/wasm/Cargo.toml b/contracts/examples/factorial/wasm/Cargo.toml
index 30f15689b4..b6dcf2f75e 100644
--- a/contracts/examples/factorial/wasm/Cargo.toml
+++ b/contracts/examples/factorial/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/fractional-nfts/Cargo.toml b/contracts/examples/fractional-nfts/Cargo.toml
index 200b624a33..3621183b61 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.51.1"
+version = "0.52.0"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/fractional-nfts/meta/Cargo.toml b/contracts/examples/fractional-nfts/meta/Cargo.toml
index e8c3c6ade9..e3eeefad7d 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-lib]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/fractional-nfts/wasm/Cargo.toml b/contracts/examples/fractional-nfts/wasm/Cargo.toml
index 7e767d0182..6ff27e873d 100644
--- a/contracts/examples/fractional-nfts/wasm/Cargo.toml
+++ b/contracts/examples/fractional-nfts/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/lottery-esdt/Cargo.toml b/contracts/examples/lottery-esdt/Cargo.toml
index 448dd11f8f..78060a4491 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.51.1"
+version = "0.52.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/lottery-esdt/meta/Cargo.toml b/contracts/examples/lottery-esdt/meta/Cargo.toml
index 4c5428a1b5..5f81485ed4 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-lib]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/lottery-esdt/wasm/Cargo.toml b/contracts/examples/lottery-esdt/wasm/Cargo.toml
index 4e433cdaec..c43b04ebd5 100644
--- a/contracts/examples/lottery-esdt/wasm/Cargo.toml
+++ b/contracts/examples/lottery-esdt/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/multisig/Cargo.toml b/contracts/examples/multisig/Cargo.toml
index f6aa80b3ae..187c927350 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.51.1"
+version = "0.52.0"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../framework/scenario"
 
 [dev-dependencies.adder]
@@ -27,7 +27,7 @@ path = "../adder"
 path = "../factorial"
 
 [dev-dependencies.multiversx-wegld-swap-sc]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../core/wegld-swap"
 
 [dev-dependencies]
diff --git a/contracts/examples/multisig/interact/Cargo.toml b/contracts/examples/multisig/interact/Cargo.toml
index acc0bf34ae..12641d03f3 100644
--- a/contracts/examples/multisig/interact/Cargo.toml
+++ b/contracts/examples/multisig/interact/Cargo.toml
@@ -18,17 +18,17 @@ toml = "0.8.6"
 path = ".."
 
 [dependencies.multiversx-sc-modules]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../contracts/modules"
 
 [dependencies.multiversx-sc-snippets]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../framework/snippets"
 
 [dependencies.multiversx-sc-scenario]
-version = "=0.51.1"
+version = "=0.52.0"
 path = "../../../../framework/scenario"
 
 [dependencies.multiversx-sc]
-version = "=0.51.1"
+version = "=0.52.0"
 path = "../../../../framework/base"
diff --git a/contracts/examples/multisig/meta/Cargo.toml b/contracts/examples/multisig/meta/Cargo.toml
index 0f38bf905b..02bd70a542 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-lib]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/multisig/wasm-multisig-full/Cargo.toml b/contracts/examples/multisig/wasm-multisig-full/Cargo.toml
index c6edfe4418..85fbfb2d9e 100644
--- a/contracts/examples/multisig/wasm-multisig-full/Cargo.toml
+++ b/contracts/examples/multisig/wasm-multisig-full/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.1"
+version = "0.52.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 a62263192b..64b2fb634a 100644
--- a/contracts/examples/multisig/wasm-multisig-view/Cargo.toml
+++ b/contracts/examples/multisig/wasm-multisig-view/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/multisig/wasm/Cargo.toml b/contracts/examples/multisig/wasm/Cargo.toml
index ecaaf8c44f..44df4c6007 100644
--- a/contracts/examples/multisig/wasm/Cargo.toml
+++ b/contracts/examples/multisig/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/nft-minter/Cargo.toml b/contracts/examples/nft-minter/Cargo.toml
index 5eec7fa050..c80c31797f 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.51.1"
+version = "0.52.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/nft-minter/meta/Cargo.toml b/contracts/examples/nft-minter/meta/Cargo.toml
index 9afe18081b..781044aab1 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-lib]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/nft-minter/wasm/Cargo.toml b/contracts/examples/nft-minter/wasm/Cargo.toml
index c32dac7eeb..c6b8402c61 100644
--- a/contracts/examples/nft-minter/wasm/Cargo.toml
+++ b/contracts/examples/nft-minter/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.1"
+version = "0.52.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 13ad075a6e..1a800f5cc5 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.51.1"
+version = "0.52.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.52.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 fe604f7747..684eced18f 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-lib]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/nft-storage-prepay/wasm/Cargo.toml b/contracts/examples/nft-storage-prepay/wasm/Cargo.toml
index a220344bba..29e41f59ce 100644
--- a/contracts/examples/nft-storage-prepay/wasm/Cargo.toml
+++ b/contracts/examples/nft-storage-prepay/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/nft-subscription/Cargo.toml b/contracts/examples/nft-subscription/Cargo.toml
index 2b205ad97e..a04d156d90 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.51.1"
+version = "0.52.0"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/nft-subscription/meta/Cargo.toml b/contracts/examples/nft-subscription/meta/Cargo.toml
index 592e8effc1..2693d37fa1 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-lib]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/nft-subscription/wasm/Cargo.toml b/contracts/examples/nft-subscription/wasm/Cargo.toml
index 310c1bdaa0..288b6e031f 100644
--- a/contracts/examples/nft-subscription/wasm/Cargo.toml
+++ b/contracts/examples/nft-subscription/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.1"
+version = "0.52.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 d6d16fbf04..5d1e43bf6d 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.51.1"
+version = "0.52.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.52.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 0b5af8112f..9b47144cd8 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-lib]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/order-book/factory/wasm/Cargo.toml b/contracts/examples/order-book/factory/wasm/Cargo.toml
index bf4fd9c0d7..b91e3d1e09 100644
--- a/contracts/examples/order-book/factory/wasm/Cargo.toml
+++ b/contracts/examples/order-book/factory/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.1"
+version = "0.52.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 9342a1c1dd..18f0ce482f 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.51.1"
+version = "0.52.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.52.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 85d9ddda80..837ea7a500 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-lib]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/order-book/pair/wasm/Cargo.toml b/contracts/examples/order-book/pair/wasm/Cargo.toml
index d4bb4cf0bb..7f6ae5bf96 100644
--- a/contracts/examples/order-book/pair/wasm/Cargo.toml
+++ b/contracts/examples/order-book/pair/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.1"
+version = "0.52.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 2e3375af52..9a489b4145 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.51.1"
+version = "0.52.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.52.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 67146b70af..02c0b5f43b 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-lib]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/ping-pong-egld/wasm/Cargo.toml b/contracts/examples/ping-pong-egld/wasm/Cargo.toml
index 83687c3d59..718923ef02 100644
--- a/contracts/examples/ping-pong-egld/wasm/Cargo.toml
+++ b/contracts/examples/ping-pong-egld/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/proxy-pause/Cargo.toml b/contracts/examples/proxy-pause/Cargo.toml
index 246ee5b4a7..a86e27b284 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.51.1"
+version = "0.52.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.52.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 9bca86a46c..8e74fc0ba0 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-lib]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/proxy-pause/wasm/Cargo.toml b/contracts/examples/proxy-pause/wasm/Cargo.toml
index 8c994c7c14..ac0240d970 100644
--- a/contracts/examples/proxy-pause/wasm/Cargo.toml
+++ b/contracts/examples/proxy-pause/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/rewards-distribution/Cargo.toml b/contracts/examples/rewards-distribution/Cargo.toml
index fddde77717..ead9b9be54 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.51.1"
+version = "0.52.0"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/rewards-distribution/meta/Cargo.toml b/contracts/examples/rewards-distribution/meta/Cargo.toml
index b1e22b9dfb..e2c4466f33 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 <claudiu.bruda@multiversx.com>"]
 path = ".."
 
 [dependencies.multiversx-sc-meta-lib]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/rewards-distribution/wasm/Cargo.toml b/contracts/examples/rewards-distribution/wasm/Cargo.toml
index 2b3fac1179..7416ebc9c6 100644
--- a/contracts/examples/rewards-distribution/wasm/Cargo.toml
+++ b/contracts/examples/rewards-distribution/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.1"
+version = "0.52.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 53876394da..f1c4ab892c 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.51.1"
+version = "0.52.0"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.52.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 5a8074c0db..fb7c0fdcbf 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 <claudiu.bruda@multiversx.com>"]
 path = ".."
 
 [dependencies.multiversx-sc-meta-lib]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/seed-nft-minter/wasm/Cargo.toml b/contracts/examples/seed-nft-minter/wasm/Cargo.toml
index 340ba97094..89fa288ca2 100644
--- a/contracts/examples/seed-nft-minter/wasm/Cargo.toml
+++ b/contracts/examples/seed-nft-minter/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/token-release/Cargo.toml b/contracts/examples/token-release/Cargo.toml
index c1ba1df21b..45af2cf918 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.51.1"
+version = "0.52.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../framework/scenario"
 
diff --git a/contracts/examples/token-release/meta/Cargo.toml b/contracts/examples/token-release/meta/Cargo.toml
index 84ac14c44e..41bdaaaa69 100644
--- a/contracts/examples/token-release/meta/Cargo.toml
+++ b/contracts/examples/token-release/meta/Cargo.toml
@@ -10,6 +10,6 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta-lib]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/token-release/wasm/Cargo.toml b/contracts/examples/token-release/wasm/Cargo.toml
index 7319a42fd4..ee03c1952a 100644
--- a/contracts/examples/token-release/wasm/Cargo.toml
+++ b/contracts/examples/token-release/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.1"
+version = "0.52.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 027dfac08b..6e14603a27 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.51.1"
+version = "0.52.0"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../framework/scenario"
 
 [dev-dependencies.multiversx-sc-meta-lib]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../framework/meta-lib"
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 6ae05ee649..19072c847e 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.51.1"
+            "version": "0.52.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 42a3f8ce11..b7d0e0f619 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.51.1"
+            "version": "0.52.0"
         }
     },
     "docs": [
diff --git a/contracts/feature-tests/abi-tester/meta/Cargo.toml b/contracts/feature-tests/abi-tester/meta/Cargo.toml
index c3c57257c9..1a7be71e8d 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-lib]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../framework/meta-lib"
 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 fd92c08155..58a5075727 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.1"
+version = "0.52.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 d971ff25af..e3094e0ba9 100644
--- a/contracts/feature-tests/abi-tester/wasm/Cargo.toml
+++ b/contracts/feature-tests/abi-tester/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.1"
+version = "0.52.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 2fb244e98a..bd733f162d 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.51.1"
+version = "0.52.0"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.52.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 37bd572058..2d70556266 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-lib]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml
index 31a01bbbf8..4f2c5a4014 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml
index 108f7716ec..f6832cea1d 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/alloc-features/wasm/Cargo.toml b/contracts/feature-tests/alloc-features/wasm/Cargo.toml
index 76acffc2a6..1a7ab69c3a 100644
--- a/contracts/feature-tests/alloc-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/alloc-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.1"
+version = "0.52.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 04715b2402..213ec3ec95 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.51.1"
+version = "0.52.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../framework/scenario"
 
 [dependencies.multiversx-sc-modules]
-version = "0.51.1"
+version = "0.52.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 6dc1db1562..789824298a 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.51.1"
+version = "0.52.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 9c5d8b6082..2cb0cd5912 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-lib]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../framework/meta-lib"
 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 403f96a7b2..abe3974bea 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.1"
+version = "0.52.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 6dd1bf05c6..83ac70576b 100644
--- a/contracts/feature-tests/basic-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/basic-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.1"
+version = "0.52.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 00a7a2c024..3ad10b1859 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.51.1"
+version = "0.52.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.52.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 d674c3c06f..11a67e11cf 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-lib]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../framework/meta-lib"
 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 8ffb40d870..af1c3b78e2 100644
--- a/contracts/feature-tests/big-float-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/big-float-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/Cargo.toml b/contracts/feature-tests/composability/Cargo.toml
index cf54680441..de603f177b 100644
--- a/contracts/feature-tests/composability/Cargo.toml
+++ b/contracts/feature-tests/composability/Cargo.toml
@@ -36,9 +36,9 @@ path = "recursive-caller"
 path = "vault"
 
 [dependencies.multiversx-sc]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.52.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 8197eaf6da..4074d2e587 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.51.1"
+version = "0.52.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.52.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 da228a5cdc..4c9772b37f 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-lib]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../../framework/meta-lib"
 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 d9f4c711d6..a1b147f290 100644
--- a/contracts/feature-tests/composability/builtin-func-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/builtin-func-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.1"
+version = "0.52.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 fd0984c4e9..17c3120de2 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.51.1"
+version = "0.52.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.52.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 2bccace19f..bcd53d2516 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
@@ -9,10 +9,10 @@ publish = false
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.52.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 705aaa8741..fe16c71c96 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.51.1"
+version = "0.52.0"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta-lib]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../../../framework/meta-lib"
 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 2025e3c0d1..6b28e6c4bf 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.1"
+version = "0.52.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 cde9d812c6..7f81e58260 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.51.1"
+version = "0.52.0"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.52.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 02c4e2ba98..81f571052f 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.51.1"
+version = "0.52.0"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta-lib]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../../../framework/meta-lib"
 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 b6b8673282..b4271b3e36 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.1"
+version = "0.52.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 61311f8dfe..45304dbaa1 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.51.1"
+version = "0.52.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.52.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 f051a74c0d..6d7cb8d371 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.51.1"
+version = "0.52.0"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.52.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 eed44cf899..7315d313c1 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.51.1"
+version = "0.52.0"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta-lib]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../../../framework/meta-lib"
 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 8e7920ec51..87cb8ad1a6 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.1"
+version = "0.52.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 1a0ab6e062..fafb4b054c 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
@@ -9,10 +9,10 @@ publish = false
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.52.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 d08583a589..5a5efb7210 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.51.1"
+version = "0.52.0"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta-lib]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../../../framework/meta-lib"
 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 f8ca6184d9..c7a5c1bc4a 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/forwarder-legacy/Cargo.toml b/contracts/feature-tests/composability/forwarder-legacy/Cargo.toml
index de02f008fd..70d8e09629 100644
--- a/contracts/feature-tests/composability/forwarder-legacy/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-legacy/Cargo.toml
@@ -12,10 +12,10 @@ path = "src/forwarder_legacy_main.rs"
 path = "../vault"
 
 [dependencies.multiversx-sc]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../framework/scenario"
 
diff --git a/contracts/feature-tests/composability/forwarder-legacy/meta/Cargo.toml b/contracts/feature-tests/composability/forwarder-legacy/meta/Cargo.toml
index 0331d157c9..7611edf68d 100644
--- a/contracts/feature-tests/composability/forwarder-legacy/meta/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-legacy/meta/Cargo.toml
@@ -8,6 +8,6 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta-lib]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.toml b/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.toml
index 8d927291bb..d62651ee7f 100644
--- a/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.1"
+version = "0.52.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 3c88f7daab..82e62cab62 100644
--- a/contracts/feature-tests/composability/forwarder-queue/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-queue/Cargo.toml
@@ -9,14 +9,14 @@ publish = false
 path = "src/forwarder_queue.rs"
 
 [dependencies.multiversx-sc]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../framework/wasm-adapter"
 optional = true
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.52.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 015a37c837..0d75c72199 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-lib]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../../framework/meta-lib"
 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 92f834e35b..c020fcfbed 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.1"
+version = "0.52.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 b2f289a628..dc8b463f06 100644
--- a/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.1"
+version = "0.52.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 8b34b15bea..a63ef79bbb 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.51.1"
+version = "0.52.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.52.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 e2687540d1..6541d16139 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-lib]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../../framework/meta-lib"
 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 bf42a8c4a5..e70d7fa581 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.1"
+version = "0.52.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 65ac4f76de..4883f0ef0e 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.1"
+version = "0.52.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 ab8a1eca27..49f30ae376 100644
--- a/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.1"
+version = "0.52.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 1930eb86ee..c874545939 100644
--- a/contracts/feature-tests/composability/forwarder/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder/Cargo.toml
@@ -9,10 +9,10 @@ publish = false
 path = "src/forwarder_main.rs"
 
 [dependencies.multiversx-sc]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.52.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 0d47b8c79e..7e8d3fdf88 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-lib]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/feature-tests/composability/forwarder/wasm/Cargo.toml b/contracts/feature-tests/composability/forwarder/wasm/Cargo.toml
index ecb44f6b93..adcf23cfcd 100644
--- a/contracts/feature-tests/composability/forwarder/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.1"
+version = "0.52.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 df0d2772c4..4a386a6d7d 100644
--- a/contracts/feature-tests/composability/interact/Cargo.toml
+++ b/contracts/feature-tests/composability/interact/Cargo.toml
@@ -15,9 +15,9 @@ serde = { version = "1.0", features = ["derive"] }
 toml = "0.8.6"
 
 [dependencies.multiversx-sc]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-snippets]
-version = "0.51.1"
+version = "0.52.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 c2ca2ebd1a..3363350b12 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.51.1"
+version = "0.52.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.52.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 21bf169d03..2214d1350d 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-lib]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../../framework/meta-lib"
 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 08d7eee0b1..2b804470c2 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.1"
+version = "0.52.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 4e862160d3..52e9aec884 100644
--- a/contracts/feature-tests/composability/promises-features/Cargo.toml
+++ b/contracts/feature-tests/composability/promises-features/Cargo.toml
@@ -9,6 +9,6 @@ publish = false
 path = "src/promises_main.rs"
 
 [dependencies.multiversx-sc]
-version = "0.51.1"
+version = "0.52.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 ab4f449253..2e36c651c8 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-lib]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../../framework/meta-lib"
 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 95a2739d3e..191e972c7b 100644
--- a/contracts/feature-tests/composability/promises-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/promises-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.1"
+version = "0.52.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 60990553f4..1c46df3ac6 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.51.1"
+version = "0.52.0"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.52.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 1424708155..a93776977e 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-lib]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../../framework/meta-lib"
 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 7c83b88a91..446eb0bedc 100644
--- a/contracts/feature-tests/composability/proxy-test-first/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/proxy-test-first/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.1"
+version = "0.52.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 a0fa15bb39..bc295d3297 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.51.1"
+version = "0.52.0"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.52.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 e70b819767..f955f176ce 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-lib]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../../framework/meta-lib"
 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 d086a8f40f..8ff737c5ee 100644
--- a/contracts/feature-tests/composability/proxy-test-second/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/proxy-test-second/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.1"
+version = "0.52.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 9c1f720a02..eb0f7934fa 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.51.1"
+version = "0.52.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.52.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 6a526b4065..71d4306d42 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-lib]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../../framework/meta-lib"
 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 fea5980e94..f5a15affbd 100644
--- a/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.1"
+version = "0.52.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 b5a381b7bf..5c805ecbc5 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.51.1"
+version = "0.52.0"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.52.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 0e7fd744cd..2dfb98d28c 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-lib]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../../framework/meta-lib"
 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 2b9a0f63d3..87514202ff 100644
--- a/contracts/feature-tests/composability/transfer-role-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/transfer-role-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.1"
+version = "0.52.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 631911bf9d..2d51abc6c5 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.51.1"
+version = "0.52.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.52.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 98d4726b18..bf432cb19d 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-lib]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../../framework/meta-lib"
 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 1900fb66bc..a79092fa6a 100644
--- a/contracts/feature-tests/composability/vault/wasm-vault-promises/Cargo.toml
+++ b/contracts/feature-tests/composability/vault/wasm-vault-promises/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.1"
+version = "0.52.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 dbdc855064..3bd6a9fce7 100644
--- a/contracts/feature-tests/composability/vault/wasm-vault-upgrade/Cargo.toml
+++ b/contracts/feature-tests/composability/vault/wasm-vault-upgrade/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.1"
+version = "0.52.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 b6ca2d35ac..db86506250 100644
--- a/contracts/feature-tests/composability/vault/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/vault/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.1"
+version = "0.52.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 3c8467ece6..2a1a6d2598 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.51.1"
+version = "0.52.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.52.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 714f87b95d..74d077defe 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-lib]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../../framework/meta-lib"
 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 575a8031d5..87f7dff175 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.1"
+version = "0.52.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 7c4a9ffa5d..0a14a0b019 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.51.1"
+version = "0.52.0"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.52.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 7e6b6af16d..9119dd08ff 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-lib]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../../framework/meta-lib"
 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 383b85384d..5953614023 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.1"
+version = "0.52.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 584fab3261..7e60018216 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.51.1"
+version = "0.52.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.52.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 c75ffef383..dca4ffd565 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-lib]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../../framework/meta-lib"
 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 4701295f46..9524374aeb 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.1"
+version = "0.52.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 a0219ac17d..f9ab8f5f9a 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.51.1"
+version = "0.52.0"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.52.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 0255b41b48..b5b2158ec3 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-lib]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../../framework/meta-lib"
 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 28ec5470df..450183ab27 100644
--- a/contracts/feature-tests/erc-style-contracts/erc1155/wasm/Cargo.toml
+++ b/contracts/feature-tests/erc-style-contracts/erc1155/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.1"
+version = "0.52.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 4f06ebc730..2286771fba 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.51.1"
+version = "0.52.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.52.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 2342302dcd..98967edd48 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-lib]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../../framework/meta-lib"
 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 a0171c46ae..383299a413 100644
--- a/contracts/feature-tests/erc-style-contracts/erc20/wasm/Cargo.toml
+++ b/contracts/feature-tests/erc-style-contracts/erc20/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.1"
+version = "0.52.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 ff4794f20d..46c0ad035e 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.51.1"
+version = "0.52.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.52.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 7fa687ce05..e7f0d21423 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-lib]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../../framework/meta-lib"
 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 896bb4b513..032959248a 100644
--- a/contracts/feature-tests/erc-style-contracts/erc721/wasm/Cargo.toml
+++ b/contracts/feature-tests/erc-style-contracts/erc721/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.1"
+version = "0.52.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 208dcb0b9b..94064f5f23 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.51.1"
+version = "0.52.0"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.52.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 f59e93231a..f96d3dbbc7 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-lib]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../../framework/meta-lib"
 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 e5ba4a68f4..6f0633687c 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.1"
+version = "0.52.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 e01b4dbd8c..a5d69eba2e 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.51.1"
+version = "0.52.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.52.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 96ff4abc99..c8d41bfd9c 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-lib]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../framework/meta-lib"
 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 7c365584aa..a9a1203c2c 100644
--- a/contracts/feature-tests/esdt-system-sc-mock/wasm/Cargo.toml
+++ b/contracts/feature-tests/esdt-system-sc-mock/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/exchange-features/Cargo.toml b/contracts/feature-tests/exchange-features/Cargo.toml
index 516478a7e8..6bc267c2e8 100644
--- a/contracts/feature-tests/exchange-features/Cargo.toml
+++ b/contracts/feature-tests/exchange-features/Cargo.toml
@@ -9,9 +9,9 @@ publish = false
 path = "src/exchange_features.rs"
 
 [dependencies.multiversx-sc]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../framework/scenario"
diff --git a/contracts/feature-tests/exchange-features/meta/Cargo.toml b/contracts/feature-tests/exchange-features/meta/Cargo.toml
index a9710c9ce0..a855193b7b 100644
--- a/contracts/feature-tests/exchange-features/meta/Cargo.toml
+++ b/contracts/feature-tests/exchange-features/meta/Cargo.toml
@@ -8,6 +8,6 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta-lib]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/feature-tests/exchange-features/wasm/Cargo.toml b/contracts/feature-tests/exchange-features/wasm/Cargo.toml
index 34f85546f2..021ef1d292 100644
--- a/contracts/feature-tests/exchange-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/exchange-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.1"
+version = "0.52.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 362869a552..76846c296c 100644
--- a/contracts/feature-tests/formatted-message-features/Cargo.toml
+++ b/contracts/feature-tests/formatted-message-features/Cargo.toml
@@ -9,10 +9,10 @@ publish = false
 path = "src/formatted_message_features.rs"
 
 [dependencies.multiversx-sc]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.52.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 65a87a025c..39da625ffa 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-lib]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../framework/meta-lib"
 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 33c4f5c1ef..4d0fc9fda1 100644
--- a/contracts/feature-tests/formatted-message-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/formatted-message-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.1"
+version = "0.52.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 5aff14387a..0373e27d84 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.51.1"
+version = "0.52.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.52.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 139586e372..3850516d64 100644
--- a/contracts/feature-tests/managed-map-features/meta/Cargo.toml
+++ b/contracts/feature-tests/managed-map-features/meta/Cargo.toml
@@ -9,6 +9,6 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta-lib]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../framework/meta-lib"
 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 33365ece0e..47d8d8264d 100644
--- a/contracts/feature-tests/managed-map-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/managed-map-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.1"
+version = "0.52.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 f41a171611..7215eb406a 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.51.1"
+version = "0.52.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.52.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 c9fe2270e0..08d3c7d7c2 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-lib]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../framework/meta-lib"
 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 4e642bc0b9..a7456e3951 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.1"
+version = "0.52.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 967c66df5b..7e9db2a397 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
@@ -29,7 +29,7 @@ path = ".."
 features = ["example_feature"]
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.1"
+version = "0.52.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 2f3e9dd146..97ae3cbfeb 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.1"
+version = "0.52.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 fb58d28f14..0f863e1d3d 100644
--- a/contracts/feature-tests/multi-contract-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/multi-contract-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.1"
+version = "0.52.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 c4cb6c2c06..de98ce2305 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.51.1"
+version = "0.52.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.52.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 a4cb376679..cb0350dc12 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-lib]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../framework/meta-lib"
 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 5324f83a9b..16f2a95811 100644
--- a/contracts/feature-tests/panic-message-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/panic-message-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.1"
+version = "0.52.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 a24d50e80d..d8d722cbf9 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.51.1"
+version = "0.52.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.52.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 f0a206cee2..f43f518751 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-lib]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/feature-tests/payable-features/wasm/Cargo.toml b/contracts/feature-tests/payable-features/wasm/Cargo.toml
index 21b2072b7c..bba86c72a0 100644
--- a/contracts/feature-tests/payable-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/payable-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.1"
+version = "0.52.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 8d242d0e31..cd147e6ddd 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.51.1"
+version = "0.52.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.52.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 036a714c83..5cfc33b1b8 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.51.1"
+version = "0.52.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 b290e9d57d..8c917ae632 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-lib]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../framework/meta-lib"
 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 c5febca410..36c8594df0 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 interactor snippets manually to add relative paths:
 // [dependencies.multiversx-sc-snippets]
-// version = "0.51.1"
+// version = "0.52.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 0247b7869d..f486a7b597 100644
--- a/contracts/feature-tests/rust-snippets-generator-test/wasm/Cargo.toml
+++ b/contracts/feature-tests/rust-snippets-generator-test/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.1"
+version = "0.52.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 28a6da23b1..ae70e0cb08 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.51.1"
+version = "0.52.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.51.1"
+version = "0.52.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 d2a49226e1..d6964c152e 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-lib]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../framework/meta-lib"
 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 ba9651a53d..892cab19b7 100644
--- a/contracts/feature-tests/rust-testing-framework-tester/wasm/Cargo.toml
+++ b/contracts/feature-tests/rust-testing-framework-tester/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/scenario-tester/Cargo.toml b/contracts/feature-tests/scenario-tester/Cargo.toml
index 7fd5cda7d5..d5658a0753 100644
--- a/contracts/feature-tests/scenario-tester/Cargo.toml
+++ b/contracts/feature-tests/scenario-tester/Cargo.toml
@@ -9,9 +9,9 @@ publish = false
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../framework/scenario"
diff --git a/contracts/feature-tests/scenario-tester/meta/Cargo.toml b/contracts/feature-tests/scenario-tester/meta/Cargo.toml
index 3209371e04..1dffc57626 100644
--- a/contracts/feature-tests/scenario-tester/meta/Cargo.toml
+++ b/contracts/feature-tests/scenario-tester/meta/Cargo.toml
@@ -8,6 +8,6 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta-lib]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/feature-tests/scenario-tester/wasm/Cargo.toml b/contracts/feature-tests/scenario-tester/wasm/Cargo.toml
index ab4c5b5871..3c412f0530 100644
--- a/contracts/feature-tests/scenario-tester/wasm/Cargo.toml
+++ b/contracts/feature-tests/scenario-tester/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.1"
+version = "0.52.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 38db8b86c2..7278d09837 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.51.1"
+version = "0.52.0"
 path = "../../../contracts/modules"
 
 [dependencies.multiversx-sc]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../framework/scenario"
 
 [dev-dependencies.multiversx-sc-meta-lib]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../framework/meta-lib"
diff --git a/contracts/feature-tests/use-module/meta/Cargo.toml b/contracts/feature-tests/use-module/meta/Cargo.toml
index fce4cb0dca..d72e3c1436 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-lib]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../framework/meta-lib"
 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 79ae1aeba2..5f4031c3c0 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.51.1"
+            "version": "0.52.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 d2481bb18c..ff95b12009 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.51.1"
+            "version": "0.52.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 bbceea054f..128b3787f7 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.1"
+version = "0.52.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 01344d8430..907f57bf35 100644
--- a/contracts/feature-tests/use-module/wasm/Cargo.toml
+++ b/contracts/feature-tests/use-module/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/modules/Cargo.toml b/contracts/modules/Cargo.toml
index 47f47da038..9f9d8392e2 100644
--- a/contracts/modules/Cargo.toml
+++ b/contracts/modules/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-modules"
-version = "0.51.1"
+version = "0.52.0"
 edition = "2021"
 
 authors = ["MultiversX <contact@multiversx.com>"]
@@ -17,5 +17,5 @@ categories = ["no-std", "wasm", "cryptography::cryptocurrencies"]
 alloc = ["multiversx-sc/alloc"]
 
 [dependencies.multiversx-sc]
-version = "0.51.1"
+version = "0.52.0"
 path = "../../framework/base"
diff --git a/framework/base/Cargo.toml b/framework/base/Cargo.toml
index a53034d882..74d6e501ca 100644
--- a/framework/base/Cargo.toml
+++ b/framework/base/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc"
-version = "0.51.1"
+version = "0.52.0"
 edition = "2021"
 rust-version = "1.78"
 
@@ -30,7 +30,7 @@ num-traits = { version = "=0.2.19", default-features = false }
 unwrap-infallible = "0.1.5"
 
 [dependencies.multiversx-sc-derive]
-version = "=0.51.1"
+version = "=0.52.0"
 path = "../derive"
 
 [dependencies.multiversx-sc-codec]
diff --git a/framework/derive/Cargo.toml b/framework/derive/Cargo.toml
index 310e34493f..5aaaa10d67 100644
--- a/framework/derive/Cargo.toml
+++ b/framework/derive/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.52.0"
 edition = "2021"
 
 authors = ["Andrei Marinica <andrei.marinica@multiversx.com>", "MultiversX <contact@multiversx.com>"]
diff --git a/framework/meta-lib/Cargo.toml b/framework/meta-lib/Cargo.toml
index 2b3eec32b8..0e221c55d9 100644
--- a/framework/meta-lib/Cargo.toml
+++ b/framework/meta-lib/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-meta-lib"
-version = "0.51.1"
+version = "0.52.0"
 edition = "2021"
 
 authors = [
@@ -31,6 +31,6 @@ wasmprinter = "0.214"
 semver = "1.0.20"
 
 [dependencies.multiversx-sc]
-version = "=0.51.1"
+version = "=0.52.0"
 path = "../base"
 features = ["alloc", "num-bigint"]
diff --git a/framework/meta-lib/src/version_history.rs b/framework/meta-lib/src/version_history.rs
index bfdaf6bf2b..8979b7371c 100644
--- a/framework/meta-lib/src/version_history.rs
+++ b/framework/meta-lib/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.51.1);
+pub const LAST_VERSION: FrameworkVersion = framework_version!(0.52.0);
 
 /// Indicates where to stop with the upgrades.
 pub const LAST_UPGRADE_VERSION: FrameworkVersion = LAST_VERSION;
@@ -78,6 +78,7 @@ pub const VERSIONS: &[FrameworkVersion] = framework_versions![
     0.50.6,
     0.51.0,
     0.51.1,
+    0.52.0,
 ];
 
 #[rustfmt::skip]
@@ -103,6 +104,7 @@ pub const CHECK_AFTER_UPGRADE_TO: &[FrameworkVersion] = framework_versions![
     0.49.0,
     0.50.6,
     0.51.1,
+    0.52.0,
 ];
 
 pub const LOWER_VERSION_WITH_TEMPLATE_TAG: FrameworkVersion = framework_version!(0.43.0);
diff --git a/framework/meta/Cargo.toml b/framework/meta/Cargo.toml
index 36e91de06d..e0627fb13f 100644
--- a/framework/meta/Cargo.toml
+++ b/framework/meta/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-meta"
-version = "0.51.1"
+version = "0.52.0"
 edition = "2021"
 
 authors = [
@@ -41,14 +41,14 @@ pathdiff = "0.2.1"
 common-path = "1.0.0" 
 
 [dependencies.multiversx-sc-meta-lib]
-version = "=0.51.1"
+version = "=0.52.0"
 path = "../meta-lib"
 
 [dependencies.multiversx-sc]
-version = "=0.51.1"
+version = "=0.52.0"
 path = "../base"
 features = ["alloc", "num-bigint"]
 
 [dependencies.multiversx-sc-snippets]
-version = "=0.51.1"
+version = "=0.52.0"
 path = "../snippets"
diff --git a/framework/scenario/Cargo.toml b/framework/scenario/Cargo.toml
index e58e6d9255..5e08d04bd6 100644
--- a/framework/scenario/Cargo.toml
+++ b/framework/scenario/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-scenario"
-version = "0.51.1"
+version = "0.52.0"
 edition = "2021"
 
 authors = [
@@ -37,12 +37,12 @@ wasm-incopatible = ["multiversx-chain-vm/wasm-incopatible"]
 run-go-tests = []
 
 [dependencies.multiversx-sc]
-version = "=0.51.1"
+version = "=0.52.0"
 features = ["alloc", "num-bigint"]
 path = "../base"
 
 [dependencies.multiversx-sc-meta-lib]
-version = "=0.51.1"
+version = "=0.52.0"
 path = "../meta-lib"
 
 [dependencies.multiversx-chain-scenario-format]
diff --git a/framework/snippets/Cargo.toml b/framework/snippets/Cargo.toml
index d5a9f46dea..79ba90907c 100644
--- a/framework/snippets/Cargo.toml
+++ b/framework/snippets/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-snippets"
-version = "0.51.1"
+version = "0.52.0"
 edition = "2021"
 
 authors = ["MultiversX <contact@multiversx.com>"]
@@ -22,7 +22,7 @@ env_logger = "0.11"
 futures = "0.3"
 
 [dependencies.multiversx-sc-scenario]
-version = "=0.51.1"
+version = "=0.52.0"
 path = "../scenario"
 
 [dependencies.multiversx-chain-scenario-format]
diff --git a/framework/wasm-adapter/Cargo.toml b/framework/wasm-adapter/Cargo.toml
index 818e195f8c..ed63f7b665 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.51.1"
+version = "0.52.0"
 edition = "2021"
 
 authors = [
@@ -22,5 +22,5 @@ categories = [
 ]
 
 [dependencies.multiversx-sc]
-version = "=0.51.1"
+version = "=0.52.0"
 path = "../base"
diff --git a/tools/mxpy-snippet-generator/Cargo.toml b/tools/mxpy-snippet-generator/Cargo.toml
index 95b4de29fb..0019aed48f 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.51.1"
+version = "0.52.0"
 path = "../../framework/base"
 
 [dependencies]
diff --git a/tools/plotter/Cargo.toml b/tools/plotter/Cargo.toml
index 0374e0184b..beec742f27 100644
--- a/tools/plotter/Cargo.toml
+++ b/tools/plotter/Cargo.toml
@@ -21,11 +21,11 @@ plotters-canvas = "^0.3.0"
 lto = true
 
 [dependencies.multiversx-sc]
-version = "=0.51.1"
+version = "=0.52.0"
 path = "../../framework/base"
 
 [dependencies.multiversx-sc-scenario]
-version = "=0.51.1"
+version = "=0.52.0"
 path = "../../framework/scenario"
 default-features = false
 
diff --git a/tools/rust-debugger/format-tests/Cargo.toml b/tools/rust-debugger/format-tests/Cargo.toml
index 2f070058da..4d167562e2 100644
--- a/tools/rust-debugger/format-tests/Cargo.toml
+++ b/tools/rust-debugger/format-tests/Cargo.toml
@@ -9,11 +9,11 @@ name = "format-tests"
 path = "src/format_tests.rs"
 
 [dependencies.multiversx-sc]
-version = "=0.51.1"
+version = "=0.52.0"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-scenario]
-version = "=0.51.1"
+version = "=0.52.0"
 path = "../../../framework/scenario"
 
 [dependencies.multiversx-chain-vm]

From 70455fa0310379194439e69380614e26528994e9 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 31 Jul 2024 04:36:35 +0300
Subject: [PATCH 1123/1254] sc 0.52.0, codec 0.20.1 (update)

---
 CHANGELOG.md                 | 3 ++-
 Cargo.lock                   | 4 ++--
 data/codec-derive/Cargo.toml | 2 +-
 data/codec/Cargo.toml        | 6 +++---
 framework/base/Cargo.toml    | 2 +-
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b339c277f0..f4ed1d0a6a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,10 +27,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.52.0] - 2024-07-31
+## [sc 0.52.0, codec 0.20.1] - 2024-07-31
 - ManagedBufferReadToEnd type, which flushed a nested data buffer.
 - Fixed hex and binary formatters for byte slices.
 - Added EI 1.4 and 1.5 configs.
+- Dependency upgrades.
 
 ## [sc 0.51.1]
 - `sc-meta upgrade` bugfix.
diff --git a/Cargo.lock b/Cargo.lock
index de73f9ff5e..bae100d986 100755
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1955,7 +1955,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -1965,7 +1965,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "hex",
  "proc-macro2",
diff --git a/data/codec-derive/Cargo.toml b/data/codec-derive/Cargo.toml
index ff6171c589..934b041232 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.20.0"
+version = "0.20.1"
 edition = "2021"
 
 authors = ["dorin.iancu <dorin.iancu@multiversx.com>", "Andrei Marinica <andrei.marinica@multiversx.com>", "MultiversX <contact@multiversx.com>"]
diff --git a/data/codec/Cargo.toml b/data/codec/Cargo.toml
index 88f3516d50..b09697b84c 100644
--- a/data/codec/Cargo.toml
+++ b/data/codec/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.20.1"
 edition = "2021"
 
 authors = ["Andrei Marinica <andrei.marinica@multiversx.com>", "MultiversX <contact@multiversx.com>"]
@@ -18,7 +18,7 @@ derive = ["multiversx-sc-codec-derive"]
 
 [dependencies.multiversx-sc-codec-derive]
 path = "../codec-derive"
-version = "=0.20.0"
+version = "=0.20.1"
 optional = true
 
 [dependencies]
@@ -28,4 +28,4 @@ unwrap-infallible = "0.1.5"
 
 [dev-dependencies.multiversx-sc-codec-derive]
 path = "../codec-derive"
-version = "=0.20.0"
+version = "=0.20.1"
diff --git a/framework/base/Cargo.toml b/framework/base/Cargo.toml
index 74d6e501ca..5e9077dc0c 100644
--- a/framework/base/Cargo.toml
+++ b/framework/base/Cargo.toml
@@ -34,6 +34,6 @@ version = "=0.52.0"
 path = "../derive"
 
 [dependencies.multiversx-sc-codec]
-version = "=0.20.0"
+version = "=0.20.1"
 path = "../../data/codec"
 features = ["derive"]

From 2148c69a2c4d902f59491907aedabd0c084c9b70 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 31 Jul 2024 04:43:18 +0300
Subject: [PATCH 1124/1254] Cargo.lock

---
 .../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 ++---
 .../Cargo.lock                                | 14 ++---
 .../Cargo.lock                                | 14 ++---
 .../benchmarks/str-repeat/wasm/Cargo.lock     | 14 ++---
 .../core/price-aggregator/wasm/Cargo.lock     | 53 +++++++++++++++----
 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 ++---
 .../wasm-alloc-mem-fail/Cargo.lock            | 14 ++---
 .../wasm-alloc-mem-leaking/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 ++---
 .../forwarder-legacy/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 ++---
 .../exchange-features/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 ++---
 .../scenario-tester/wasm/Cargo.lock           | 14 ++---
 .../wasm-use-module-view/Cargo.lock           | 16 +++---
 .../feature-tests/use-module/wasm/Cargo.lock  | 16 +++---
 91 files changed, 686 insertions(+), 655 deletions(-)

diff --git a/contracts/benchmarks/large-storage/wasm/Cargo.lock b/contracts/benchmarks/large-storage/wasm/Cargo.lock
index 289ec8cd46..458de101db 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.51.1"
+version = "0.52.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.lock
index c5198ccc73..5e8f7fa292 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.51.1"
+version = "0.52.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -75,7 +75,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -164,9 +164,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.lock
index af149a9b16..93839923fa 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.51.1"
+version = "0.52.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -75,7 +75,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -164,9 +164,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.lock
index 149c26607d..aea740a330 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.51.1"
+version = "0.52.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -59,7 +59,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -68,7 +68,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -78,7 +78,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -89,7 +89,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -164,9 +164,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.lock
index 17ba237632..fcd79cd3e3 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.51.1"
+version = "0.52.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -59,7 +59,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -68,7 +68,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -78,7 +78,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -89,7 +89,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -164,9 +164,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.lock
index 28d2099883..b0b5999b39 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.51.1"
+version = "0.52.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -59,7 +59,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -68,7 +68,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -78,7 +78,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -89,7 +89,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -164,9 +164,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.lock
index 5266d763ec..8150fffd50 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.51.1"
+version = "0.52.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -59,7 +59,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -68,7 +68,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -78,7 +78,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -89,7 +89,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -148,9 +148,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/benchmarks/send-tx-repeat/wasm/Cargo.lock b/contracts/benchmarks/send-tx-repeat/wasm/Cargo.lock
index b001662f23..200c0d19e9 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.51.1"
+version = "0.52.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.lock b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.lock
index 7364f1bf68..6dda9f4dcb 100644
--- a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.lock
+++ b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.lock
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -156,9 +156,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.lock b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.lock
index c26f218b0e..460b5a03ce 100644
--- a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.lock
+++ b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.lock
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -156,9 +156,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/benchmarks/str-repeat/wasm/Cargo.lock b/contracts/benchmarks/str-repeat/wasm/Cargo.lock
index fa214167b3..aa15e4ee53 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.51.1"
+version = "0.52.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -156,9 +156,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/core/price-aggregator/wasm/Cargo.lock b/contracts/core/price-aggregator/wasm/Cargo.lock
index 83b9347247..7dd8dc74c0 100644
--- a/contracts/core/price-aggregator/wasm/Cargo.lock
+++ b/contracts/core/price-aggregator/wasm/Cargo.lock
@@ -26,6 +26,12 @@ version = "3.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
 
+[[package]]
+name = "byteorder"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
+
 [[package]]
 name = "cfg-if"
 version = "1.0.0"
@@ -86,7 +92,7 @@ checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
 
 [[package]]
 name = "multiversx-price-aggregator-sc"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "arrayvec",
  "getrandom",
@@ -105,7 +111,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -117,7 +123,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -126,7 +132,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -136,7 +142,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -147,14 +153,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -185,9 +191,13 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "ppv-lite86"
-version = "0.2.17"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
+checksum = "2288c0e17cc8d342c712bb43a257a80ebffce59cdb33d5000d8348f3ec02528b"
+dependencies = [
+ "zerocopy",
+ "zerocopy-derive",
+]
 
 [[package]]
 name = "proc-macro2"
@@ -255,9 +265,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -335,3 +345,24 @@ name = "wasm-bindgen-shared"
 version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
+
+[[package]]
+name = "zerocopy"
+version = "0.7.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
+dependencies = [
+ "byteorder",
+ "zerocopy-derive",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.7.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
diff --git a/contracts/examples/adder/wasm/Cargo.lock b/contracts/examples/adder/wasm/Cargo.lock
index c044098158..1c38724ae9 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.51.1"
+version = "0.52.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/bonding-curve-contract/wasm/Cargo.lock b/contracts/examples/bonding-curve-contract/wasm/Cargo.lock
index 72019eb4d6..ec876aa701 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.51.1"
+version = "0.52.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -68,7 +68,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -77,7 +77,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -164,9 +164,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/check-pause/wasm/Cargo.lock b/contracts/examples/check-pause/wasm/Cargo.lock
index 65d730f928..8ee464bb47 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.51.1"
+version = "0.52.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -68,7 +68,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -77,7 +77,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -164,9 +164,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/crowdfunding-esdt/wasm/Cargo.lock b/contracts/examples/crowdfunding-esdt/wasm/Cargo.lock
index e9b1cc12e6..9e470e5f95 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.51.1"
+version = "0.52.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/crypto-bubbles/wasm/Cargo.lock b/contracts/examples/crypto-bubbles/wasm/Cargo.lock
index e8d054972a..250573c46d 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.51.1"
+version = "0.52.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.lock b/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.lock
index d94014f05b..ba1713182b 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.51.1"
+version = "0.52.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -96,7 +96,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -115,7 +115,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -126,7 +126,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -192,9 +192,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
 dependencies = [
  "proc-macro2",
  "quote",
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 e24409f268..a2abd3c986 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.51.1"
+version = "0.52.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -77,7 +77,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,7 +96,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -107,7 +107,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -173,9 +173,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.lock b/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.lock
index 95f512b3ba..eb610a2f29 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.51.1"
+version = "0.52.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -96,7 +96,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -106,7 +106,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -117,7 +117,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -183,9 +183,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/crypto-zombies/wasm/Cargo.lock b/contracts/examples/crypto-zombies/wasm/Cargo.lock
index 2f7faf40a1..a21fb50f00 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.51.1"
+version = "0.52.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/digital-cash/wasm/Cargo.lock b/contracts/examples/digital-cash/wasm/Cargo.lock
index 8f41169038..26206743c0 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.51.1"
+version = "0.52.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/empty/wasm/Cargo.lock b/contracts/examples/empty/wasm/Cargo.lock
index 7cd912320b..6944878cc3 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.51.1"
+version = "0.52.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.lock b/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.lock
index dc97b10736..f56929b9a5 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.51.1"
+version = "0.52.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/factorial/wasm/Cargo.lock b/contracts/examples/factorial/wasm/Cargo.lock
index fd2f46732e..5874ae5190 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.51.1"
+version = "0.52.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/fractional-nfts/wasm/Cargo.lock b/contracts/examples/fractional-nfts/wasm/Cargo.lock
index 95c1776157..7ebfb15a58 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.51.1"
+version = "0.52.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -68,7 +68,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -77,7 +77,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -164,9 +164,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/lottery-esdt/wasm/Cargo.lock b/contracts/examples/lottery-esdt/wasm/Cargo.lock
index 99996e1c51..cc4c0d4416 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.51.1"
+version = "0.52.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/multisig/wasm-multisig-full/Cargo.lock b/contracts/examples/multisig/wasm-multisig-full/Cargo.lock
index fe4cb87bcd..953711db60 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.51.1"
+version = "0.52.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -68,7 +68,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -77,7 +77,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -164,9 +164,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/multisig/wasm-multisig-view/Cargo.lock b/contracts/examples/multisig/wasm-multisig-view/Cargo.lock
index 509b478684..fa39ba76df 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.51.1"
+version = "0.52.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -68,7 +68,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -77,7 +77,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -164,9 +164,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/multisig/wasm/Cargo.lock b/contracts/examples/multisig/wasm/Cargo.lock
index ea949b64f6..72def41f92 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.51.1"
+version = "0.52.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -68,7 +68,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -77,7 +77,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -164,9 +164,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/nft-minter/wasm/Cargo.lock b/contracts/examples/nft-minter/wasm/Cargo.lock
index 616b5aed2e..c8d9d672b0 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.51.1"
+version = "0.52.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/nft-storage-prepay/wasm/Cargo.lock b/contracts/examples/nft-storage-prepay/wasm/Cargo.lock
index e876048d71..5d89401b2a 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.51.1"
+version = "0.52.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/nft-subscription/wasm/Cargo.lock b/contracts/examples/nft-subscription/wasm/Cargo.lock
index e9f75e7859..c851d546e4 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.51.1"
+version = "0.52.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,14 +82,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -164,9 +164,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/order-book/factory/wasm/Cargo.lock b/contracts/examples/order-book/factory/wasm/Cargo.lock
index b8dc4385d2..b436396257 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.51.1"
+version = "0.52.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/order-book/pair/wasm/Cargo.lock b/contracts/examples/order-book/pair/wasm/Cargo.lock
index c1a86a1be9..f9599aa5a7 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.51.1"
+version = "0.52.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/ping-pong-egld/wasm/Cargo.lock b/contracts/examples/ping-pong-egld/wasm/Cargo.lock
index 085e3662e3..7737e8ff94 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.51.1"
+version = "0.52.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/proxy-pause/wasm/Cargo.lock b/contracts/examples/proxy-pause/wasm/Cargo.lock
index d33e8125d2..b3561860c9 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.51.1"
+version = "0.52.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/rewards-distribution/wasm/Cargo.lock b/contracts/examples/rewards-distribution/wasm/Cargo.lock
index 990bc12932..4980d212da 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.51.1"
+version = "0.52.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,14 +82,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -164,9 +164,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/seed-nft-minter/wasm/Cargo.lock b/contracts/examples/seed-nft-minter/wasm/Cargo.lock
index 3c8deb8654..2f2fa309b1 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.51.1"
+version = "0.52.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,14 +82,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -164,9 +164,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/token-release/wasm/Cargo.lock b/contracts/examples/token-release/wasm/Cargo.lock
index cd23f828b3..9f43d94e3f 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.51.1"
+version = "0.52.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -141,9 +141,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
 dependencies = [
  "proc-macro2",
  "quote",
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 2c9d65190d..28cfd14d29 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.51.1"
+version = "0.52.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/feature-tests/abi-tester/wasm/Cargo.lock b/contracts/feature-tests/abi-tester/wasm/Cargo.lock
index 4a3e94486a..39bc19cf1c 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.51.1"
+version = "0.52.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock
index 2104e47dde..c35576e8c3 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.lock b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.lock
index bb33f7394d..89c9a99e7c 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.lock
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.lock
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/feature-tests/alloc-features/wasm/Cargo.lock b/contracts/feature-tests/alloc-features/wasm/Cargo.lock
index d9238591c2..8ab16c5724 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.51.1"
+version = "0.52.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
 dependencies = [
  "proc-macro2",
  "quote",
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 d3ab9a5d9f..274bf622ea 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.51.1"
+version = "0.52.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -68,7 +68,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -77,7 +77,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -164,9 +164,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/feature-tests/basic-features/wasm/Cargo.lock b/contracts/feature-tests/basic-features/wasm/Cargo.lock
index 8b9658c1b8..df0959cf55 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.51.1"
+version = "0.52.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -68,7 +68,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -77,7 +77,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -164,9 +164,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/feature-tests/big-float-features/wasm/Cargo.lock b/contracts/feature-tests/big-float-features/wasm/Cargo.lock
index 6f51586dd7..ded548ebdc 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.51.1"
+version = "0.52.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
 dependencies = [
  "proc-macro2",
  "quote",
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 a2279cf230..52f4d68ce4 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.51.1"
+version = "0.52.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
 dependencies = [
  "proc-macro2",
  "quote",
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 e1d31441ff..e169cdf8bb 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.51.1"
+version = "0.52.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
 dependencies = [
  "proc-macro2",
  "quote",
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 a8c1ad081e..a1ce767b56 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.51.1"
+version = "0.52.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
 dependencies = [
  "proc-macro2",
  "quote",
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 85f858f40f..499c329c89 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.51.1"
+version = "0.52.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
 dependencies = [
  "proc-macro2",
  "quote",
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 282d1eff69..f1e1af89b4 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
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.lock
index 3bf098bca1..384253d98a 100644
--- a/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.lock
@@ -56,7 +56,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -68,7 +68,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -77,7 +77,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,7 +98,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -157,9 +157,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
 dependencies = [
  "proc-macro2",
  "quote",
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 f165aec8b9..64bddb816b 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
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock
index 159fb90778..112c24f014 100644
--- a/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
 dependencies = [
  "proc-macro2",
  "quote",
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 d07f3bf3ba..75271f4ffc 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.51.1"
+version = "0.52.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
 dependencies = [
  "proc-macro2",
  "quote",
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 9c91d7fbf3..b07d381b79 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.51.1"
+version = "0.52.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.lock
index ddc103714b..849651e5d9 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.51.1"
+version = "0.52.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock
index 67933f7341..1506d61cd1 100755
--- a/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
 dependencies = [
  "proc-macro2",
  "quote",
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 2c0fd72625..a5085a77ba 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.51.1"
+version = "0.52.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/feature-tests/composability/promises-features/wasm/Cargo.lock b/contracts/feature-tests/composability/promises-features/wasm/Cargo.lock
index 65b8badeb6..4be375d876 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.51.1"
+version = "0.52.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
 dependencies = [
  "proc-macro2",
  "quote",
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 80ec4f9ee4..83371c0c20 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.51.1"
+version = "0.52.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -157,9 +157,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
 dependencies = [
  "proc-macro2",
  "quote",
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 56e1500a4e..f867682e4e 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.51.1"
+version = "0.52.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.lock b/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.lock
index 2e8687c2e2..e87f78e175 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.51.1"
+version = "0.52.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -157,9 +157,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
 dependencies = [
  "proc-macro2",
  "quote",
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 9d65ed4026..b757e9cfb4 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.51.1"
+version = "0.52.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,14 +82,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -148,9 +148,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
 dependencies = [
  "proc-macro2",
  "quote",
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 0d531dee23..7275d6cea5 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.51.1"
+version = "0.52.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -141,9 +141,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
 dependencies = [
  "proc-macro2",
  "quote",
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 2805363f4e..ddf8ee37f7 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.51.1"
+version = "0.52.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -141,9 +141,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/feature-tests/composability/vault/wasm/Cargo.lock b/contracts/feature-tests/composability/vault/wasm/Cargo.lock
index 4b3f047c95..82a885d24d 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.51.1"
+version = "0.52.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -141,9 +141,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
 dependencies = [
  "proc-macro2",
  "quote",
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 6422530890..ef7a1802cb 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.51.1"
+version = "0.52.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -75,7 +75,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -164,9 +164,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
 dependencies = [
  "proc-macro2",
  "quote",
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 f628973543..7e6cdad4bc 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.51.1"
+version = "0.52.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -75,7 +75,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -164,9 +164,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
 dependencies = [
  "proc-macro2",
  "quote",
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 7ad900bd33..c4e99faf95 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.51.1"
+version = "0.52.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
 dependencies = [
  "proc-macro2",
  "quote",
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 50872d1aa9..44007d75b6 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.51.1"
+version = "0.52.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
 dependencies = [
  "proc-macro2",
  "quote",
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 a4e54dee49..fcc250e38a 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.51.1"
+version = "0.52.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
 dependencies = [
  "proc-macro2",
  "quote",
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 dcfbd36b0e..7e3ae781dc 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.51.1"
+version = "0.52.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
 dependencies = [
  "proc-macro2",
  "quote",
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 4345aeb947..7191b009f1 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.51.1"
+version = "0.52.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -75,7 +75,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -164,9 +164,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
 dependencies = [
  "proc-macro2",
  "quote",
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 5846723bb3..22715ca334 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.51.1"
+version = "0.52.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/feature-tests/exchange-features/wasm/Cargo.lock b/contracts/feature-tests/exchange-features/wasm/Cargo.lock
index 970cab4843..25ae8022fc 100644
--- a/contracts/feature-tests/exchange-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/exchange-features/wasm/Cargo.lock
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/feature-tests/formatted-message-features/wasm/Cargo.lock b/contracts/feature-tests/formatted-message-features/wasm/Cargo.lock
index 0463be1978..6f699f64d4 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.51.1"
+version = "0.52.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/feature-tests/managed-map-features/wasm/Cargo.lock b/contracts/feature-tests/managed-map-features/wasm/Cargo.lock
index 9e49dfafd7..feb1e599bd 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.51.1"
+version = "0.52.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
 dependencies = [
  "proc-macro2",
  "quote",
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 21f706b50e..bc36a0c15a 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.51.1"
+version = "0.52.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
 dependencies = [
  "proc-macro2",
  "quote",
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 bdd3a17f27..ac17bbcfe3 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.51.1"
+version = "0.52.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
 dependencies = [
  "proc-macro2",
  "quote",
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 554574a747..10f44b2a2f 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.51.1"
+version = "0.52.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/feature-tests/multi-contract-features/wasm/Cargo.lock b/contracts/feature-tests/multi-contract-features/wasm/Cargo.lock
index 8368cdc345..06a5c24833 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.51.1"
+version = "0.52.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/feature-tests/panic-message-features/wasm/Cargo.lock b/contracts/feature-tests/panic-message-features/wasm/Cargo.lock
index 50da0b16d9..8383ed6eab 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.51.1"
+version = "0.52.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/feature-tests/payable-features/wasm/Cargo.lock b/contracts/feature-tests/payable-features/wasm/Cargo.lock
index 0a0ca7dabc..e71ebd5d51 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.51.1"
+version = "0.52.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
 dependencies = [
  "proc-macro2",
  "quote",
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 d4abc87eb8..31c4101ced 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.51.1"
+version = "0.52.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
 dependencies = [
  "proc-macro2",
  "quote",
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 c2371fcea1..74933a4957 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.51.1"
+version = "0.52.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/feature-tests/scenario-tester/wasm/Cargo.lock b/contracts/feature-tests/scenario-tester/wasm/Cargo.lock
index 9bbf0343b2..b253d7a0bd 100755
--- a/contracts/feature-tests/scenario-tester/wasm/Cargo.lock
+++ b/contracts/feature-tests/scenario-tester/wasm/Cargo.lock
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
 dependencies = [
  "proc-macro2",
  "quote",
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 d0f497c038..b9a61fa90e 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.51.1"
+version = "0.52.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,14 +82,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -148,9 +148,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/feature-tests/use-module/wasm/Cargo.lock b/contracts/feature-tests/use-module/wasm/Cargo.lock
index cf397eb361..b59dc6b200 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.51.1"
+version = "0.52.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,14 +82,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.52.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -148,9 +148,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
 dependencies = [
  "proc-macro2",
  "quote",

From e136f657a090fb1f3cabf61a10cf223a27a8309a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Costin=20Caraba=C8=99?= <costin.carabas@gmail.com>
Date: Wed, 31 Jul 2024 14:26:09 +0300
Subject: [PATCH 1125/1254] Implement TypeAbi for ManagedBufferReadToEnd

---
 .../wrapped/managed_buffer_read_to_end.rs      | 18 +++++++++++++++++-
 .../tests/managed_buffer_read_to_end_test.rs   |  2 ++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/framework/base/src/types/managed/wrapped/managed_buffer_read_to_end.rs b/framework/base/src/types/managed/wrapped/managed_buffer_read_to_end.rs
index 2ed09b59bd..d0d4a3e308 100644
--- a/framework/base/src/types/managed/wrapped/managed_buffer_read_to_end.rs
+++ b/framework/base/src/types/managed/wrapped/managed_buffer_read_to_end.rs
@@ -1,5 +1,6 @@
-use crate::api::ManagedTypeApi;
+use crate::abi::{TypeAbi, TypeName};
 use crate::types::ManagedBuffer;
+use crate::{abi::TypeAbiFrom, api::ManagedTypeApi};
 use multiversx_sc_codec::{
     DecodeError, DecodeErrorHandler, EncodeError, EncodeErrorHandler, NestedDecode,
     NestedDecodeInput, NestedEncode, NestedEncodeOutput, TryStaticCast,
@@ -35,6 +36,21 @@ where
     }
 }
 
+impl<M> TypeAbiFrom<Self> for ManagedBufferReadToEnd<M> where M: ManagedTypeApi {}
+impl<M> TypeAbiFrom<&Self> for ManagedBufferReadToEnd<M> where M: ManagedTypeApi {}
+
+impl<M: ManagedTypeApi> TypeAbi for ManagedBufferReadToEnd<M> {
+    type Unmanaged = multiversx_sc_codec::Vec<u8>;
+
+    fn type_name() -> TypeName {
+        "bytes".into()
+    }
+
+    fn type_name_rust() -> TypeName {
+        "ManagedBufferReadToEnd<$API>".into()
+    }
+}
+
 impl<M: ManagedTypeApi> TryStaticCast for ManagedBufferReadToEnd<M> {}
 
 impl<M: ManagedTypeApi> NestedDecode for ManagedBufferReadToEnd<M> {
diff --git a/framework/scenario/tests/managed_buffer_read_to_end_test.rs b/framework/scenario/tests/managed_buffer_read_to_end_test.rs
index 3d2349e1e4..0ac2d65794 100644
--- a/framework/scenario/tests/managed_buffer_read_to_end_test.rs
+++ b/framework/scenario/tests/managed_buffer_read_to_end_test.rs
@@ -5,10 +5,12 @@ use multiversx_sc::{
         derive::{TopDecode, TopEncode},
     },
     contract_base::ManagedSerializer,
+    derive::type_abi,
     types::{ManagedBuffer, ManagedBufferReadToEnd},
 };
 use multiversx_sc_scenario::api::StaticApi;
 
+#[type_abi]
 #[derive(TopDecode, TopEncode, Clone, PartialEq, Debug)]
 pub struct CallData<M: ManagedTypeApi> {
     pub endpoint: ManagedBuffer<M>,

From 9fcff173bfd490f1e66576b40766aae0dab967e9 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 31 Jul 2024 15:51:36 +0300
Subject: [PATCH 1126/1254] ManagedBufferReadToEnd in abi-tester

---
 .../abi_tester_expected_main.abi.json         | 31 +++++++++++++++++++
 .../abi_tester_expected_view.abi.json         | 20 ++++++++++++
 .../feature-tests/abi-tester/src/abi_proxy.rs | 24 ++++++++++++++
 .../abi-tester/src/abi_test_type.rs           | 11 ++++++-
 .../abi-tester/src/abi_tester.rs              |  7 +++++
 .../feature-tests/abi-tester/wasm/src/lib.rs  |  5 +--
 .../wrapped/managed_buffer_read_to_end.rs     |  2 +-
 7 files changed, 96 insertions(+), 4 deletions(-)

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 19072c847e..eb9df529d2 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
@@ -389,6 +389,17 @@
                 }
             ]
         },
+        {
+            "name": "takes_object_with_managed_buffer_read_to_end",
+            "mutability": "readonly",
+            "inputs": [
+                {
+                    "name": "_arg",
+                    "type": "AbiWithManagedBufferReadToEnd"
+                }
+            ],
+            "outputs": []
+        },
         {
             "name": "payable_egld",
             "mutability": "mutable",
@@ -608,6 +619,26 @@
                 }
             ]
         },
+        "AbiWithManagedBufferReadToEnd": {
+            "type": "struct",
+            "docs": [
+                "Its only purpose is to test that the ABI generator works fine."
+            ],
+            "fields": [
+                {
+                    "name": "endpoint",
+                    "type": "bytes"
+                },
+                {
+                    "name": "gas",
+                    "type": "u64"
+                },
+                {
+                    "name": "flush",
+                    "type": "bytes-read-to-end"
+                }
+            ]
+        },
         "EsdtLocalRole": {
             "type": "enum",
             "variants": [
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 b7d0e0f619..ced74ed1aa 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
@@ -259,6 +259,26 @@
                 }
             ]
         },
+        "AbiWithManagedBufferReadToEnd": {
+            "type": "struct",
+            "docs": [
+                "Its only purpose is to test that the ABI generator works fine."
+            ],
+            "fields": [
+                {
+                    "name": "endpoint",
+                    "type": "bytes"
+                },
+                {
+                    "name": "gas",
+                    "type": "u64"
+                },
+                {
+                    "name": "flush",
+                    "type": "bytes-read-to-end"
+                }
+            ]
+        },
         "EsdtLocalRole": {
             "type": "enum",
             "variants": [
diff --git a/contracts/feature-tests/abi-tester/src/abi_proxy.rs b/contracts/feature-tests/abi-tester/src/abi_proxy.rs
index 77604821e3..cc62957853 100644
--- a/contracts/feature-tests/abi-tester/src/abi_proxy.rs
+++ b/contracts/feature-tests/abi-tester/src/abi_proxy.rs
@@ -374,6 +374,19 @@ where
             .original_result()
     }
 
+    pub fn takes_object_with_managed_buffer_read_to_end<
+        Arg0: ProxyArg<AbiWithManagedBufferReadToEnd<Env::Api>>,
+    >(
+        self,
+        _arg: Arg0,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("takes_object_with_managed_buffer_read_to_end")
+            .argument(&_arg)
+            .original_result()
+    }
+
     pub fn payable_egld(
         self,
     ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
@@ -518,6 +531,17 @@ pub struct OnlyShowsUpAsNestedInSlice {}
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct OnlyShowsUpAsNestedInOption {}
 
+#[type_abi]
+#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
+pub struct AbiWithManagedBufferReadToEnd<Api>
+where
+    Api: ManagedTypeApi,
+{
+    pub endpoint: ManagedBuffer<Api>,
+    pub gas: u64,
+    pub flush: ManagedBufferReadToEnd<Api>,
+}
+
 #[type_abi]
 #[derive(TopEncode, TopDecode)]
 pub struct OnlyShowsUpInEsdtAttr {
diff --git a/contracts/feature-tests/abi-tester/src/abi_test_type.rs b/contracts/feature-tests/abi-tester/src/abi_test_type.rs
index f4a9219662..fe5d3246d1 100644
--- a/contracts/feature-tests/abi-tester/src/abi_test_type.rs
+++ b/contracts/feature-tests/abi-tester/src/abi_test_type.rs
@@ -1,7 +1,7 @@
 use crate::only_nested::*;
 use multiversx_sc::{
     api::ManagedTypeApi,
-    types::{BigUint, Box, ConstDecimals, ManagedBuffer, ManagedDecimal},
+    types::{BigUint, Box, ConstDecimals, ManagedBuffer, ManagedBufferReadToEnd, ManagedDecimal},
 };
 multiversx_sc::derive_imports!();
 
@@ -48,3 +48,12 @@ pub struct ManagedDecimalWrapper<M: ManagedTypeApi> {
     #[allow(dead_code)]
     pub field: ManagedDecimal<M, ConstDecimals<2>>,
 }
+
+/// Its only purpose is to test that the ABI generator works fine.
+#[type_abi]
+#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
+pub struct AbiWithManagedBufferReadToEnd<M: ManagedTypeApi> {
+    pub endpoint: ManagedBuffer<M>,
+    pub gas: u64,
+    pub flush: ManagedBufferReadToEnd<M>,
+}
diff --git a/contracts/feature-tests/abi-tester/src/abi_tester.rs b/contracts/feature-tests/abi-tester/src/abi_tester.rs
index 6848f0d237..58f81bccac 100644
--- a/contracts/feature-tests/abi-tester/src/abi_tester.rs
+++ b/contracts/feature-tests/abi-tester/src/abi_tester.rs
@@ -172,6 +172,13 @@ pub trait AbiTester {
         OperationCompletionStatus::Completed
     }
 
+    #[view]
+    fn takes_object_with_managed_buffer_read_to_end(
+        &self,
+        _arg: AbiWithManagedBufferReadToEnd<Self::Api>,
+    ) {
+    }
+
     #[endpoint]
     #[payable("EGLD")]
     fn payable_egld(&self) {}
diff --git a/contracts/feature-tests/abi-tester/wasm/src/lib.rs b/contracts/feature-tests/abi-tester/wasm/src/lib.rs
index dcfd861dd0..96d934bfa2 100644
--- a/contracts/feature-tests/abi-tester/wasm/src/lib.rs
+++ b/contracts/feature-tests/abi-tester/wasm/src/lib.rs
@@ -6,9 +6,9 @@
 
 // Init:                                 1
 // Upgrade:                              1
-// Endpoints:                           28
+// Endpoints:                           29
 // Async Callback (empty):               1
-// Total number of exported functions:  31
+// Total number of exported functions:  32
 
 #![no_std]
 
@@ -45,6 +45,7 @@ multiversx_sc_wasm_adapter::endpoints! {
         item_for_slice => item_for_slice
         item_for_option => item_for_option
         operation_completion_status => operation_completion_status
+        takes_object_with_managed_buffer_read_to_end => takes_object_with_managed_buffer_read_to_end
         payable_egld => payable_egld
         payable_some_token => payable_some_token
         payable_any_token => payable_any_token
diff --git a/framework/base/src/types/managed/wrapped/managed_buffer_read_to_end.rs b/framework/base/src/types/managed/wrapped/managed_buffer_read_to_end.rs
index d0d4a3e308..fbc05b13d9 100644
--- a/framework/base/src/types/managed/wrapped/managed_buffer_read_to_end.rs
+++ b/framework/base/src/types/managed/wrapped/managed_buffer_read_to_end.rs
@@ -43,7 +43,7 @@ impl<M: ManagedTypeApi> TypeAbi for ManagedBufferReadToEnd<M> {
     type Unmanaged = multiversx_sc_codec::Vec<u8>;
 
     fn type_name() -> TypeName {
-        "bytes".into()
+        "bytes-read-to-end".into()
     }
 
     fn type_name_rust() -> TypeName {

From 459d40afe823c1a4c1b47c09fc7ec4f2ea7eeb82 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 31 Jul 2024 15:57:31 +0300
Subject: [PATCH 1127/1254] sc 0.52.1

---
 CHANGELOG.md                                  |  4 ++++
 Cargo.lock                                    | 20 +++++++++----------
 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 +-
 .../Cargo.toml                                |  2 +-
 .../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     |  8 ++++----
 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 +-
 .../wasm-alloc-mem-fail/Cargo.toml            |  2 +-
 .../wasm-alloc-mem-leaking/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-legacy/Cargo.toml |  4 ++--
 .../forwarder-legacy/meta/Cargo.toml          |  2 +-
 .../forwarder-legacy/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 +-
 .../exchange-features/Cargo.toml              |  4 ++--
 .../exchange-features/meta/Cargo.toml         |  2 +-
 .../exchange-features/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 +-
 .../feature-tests/scenario-tester/Cargo.toml  |  4 ++--
 .../scenario-tester/meta/Cargo.toml           |  2 +-
 .../scenario-tester/wasm/Cargo.toml           |  2 +-
 contracts/feature-tests/use-module/Cargo.toml |  8 ++++----
 .../feature-tests/use-module/meta/Cargo.toml  |  2 +-
 .../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 ++--
 framework/base/Cargo.toml                     |  4 ++--
 framework/derive/Cargo.toml                   |  2 +-
 framework/meta-lib/Cargo.toml                 |  4 ++--
 framework/meta-lib/src/version_history.rs     |  5 +++--
 framework/meta/Cargo.toml                     |  8 ++++----
 framework/scenario/Cargo.toml                 |  6 +++---
 framework/snippets/Cargo.toml                 |  4 ++--
 framework/wasm-adapter/Cargo.toml             |  4 ++--
 tools/mxpy-snippet-generator/Cargo.toml       |  2 +-
 tools/plotter/Cargo.toml                      |  4 ++--
 tools/rust-debugger/format-tests/Cargo.toml   |  4 ++--
 272 files changed, 404 insertions(+), 399 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f4ed1d0a6a..fdd5fca4df 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,6 +27,10 @@ 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.52.1] - 2024-07-31
+- `ManagedBufferReadToEnd` `TypeAbi` implementation.
+
 ## [sc 0.52.0, codec 0.20.1] - 2024-07-31
 - ManagedBufferReadToEnd type, which flushed a nested data buffer.
 - Fixed hex and binary formatters for byte slices.
diff --git a/Cargo.lock b/Cargo.lock
index bae100d986..83dedbb874 100755
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1922,7 +1922,7 @@ checksum = "b59072fa0624b55ae5ae3fa6bfa91515bbeb4ac440214bc4a509e2c8806d6e9f"
 
 [[package]]
 name = "multiversx-price-aggregator-sc"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "arrayvec",
  "getrandom 0.2.15",
@@ -1943,7 +1943,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "bitflags 2.6.0",
  "hex-literal",
@@ -1975,7 +1975,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -1986,7 +1986,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-meta"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "clap",
  "colored",
@@ -2009,7 +2009,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-meta-lib"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "clap",
  "colored",
@@ -2028,14 +2028,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-scenario"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "base64",
  "bech32",
@@ -2059,7 +2059,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-snippets"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "base64",
  "env_logger",
@@ -2075,7 +2075,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -2107,7 +2107,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-wegld-swap-sc"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
  "multiversx-sc-modules",
diff --git a/contracts/benchmarks/large-storage/Cargo.toml b/contracts/benchmarks/large-storage/Cargo.toml
index fddf6f7abc..a551092b1c 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.52.0"
+version = "0.52.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../framework/scenario"
diff --git a/contracts/benchmarks/large-storage/meta/Cargo.toml b/contracts/benchmarks/large-storage/meta/Cargo.toml
index dd6ef5b1fa..1ff58f414a 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-lib]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/benchmarks/large-storage/wasm/Cargo.toml b/contracts/benchmarks/large-storage/wasm/Cargo.toml
index 73746b63e4..556c0358e1 100644
--- a/contracts/benchmarks/large-storage/wasm/Cargo.toml
+++ b/contracts/benchmarks/large-storage/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.0"
+version = "0.52.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 129ee0358c..96b3f9973a 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.52.0"
+version = "0.52.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.0"
+version = "0.52.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 0805dc7774..e3f9bfc130 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.52.0"
+version = "0.52.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.0"
+version = "0.52.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 e772d3b454..ae06dcb955 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-lib]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../../framework/meta-lib"
 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 753337c091..ad487a47e5 100644
--- a/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.0"
+version = "0.52.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 0df2134e7d..8f8a46287d 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.52.0"
+version = "0.52.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.0"
+version = "0.52.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 09111a3ee0..7db1b7a45d 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-lib]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.toml b/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.toml
index cae847529d..c60c1f529f 100644
--- a/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.0"
+version = "0.52.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 c491e54cb7..ee8e9b007e 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.52.0"
+version = "0.52.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.0"
+version = "0.52.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 0ebedbd8e8..904ddf183c 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-lib]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.toml b/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.toml
index ccb1ff184d..166abb2958 100644
--- a/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.0"
+version = "0.52.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 14a28959c2..72f2bc6958 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.52.0"
+version = "0.52.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.0"
+version = "0.52.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 4dd6653fbb..25d4d4dc83 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-lib]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.toml b/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.toml
index 7e4ff0f014..0a6cf17843 100644
--- a/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.0"
+version = "0.52.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 26d1201c24..897f0413a8 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.52.0"
+version = "0.52.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.0"
+version = "0.52.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 e957db6de1..17d4837336 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-lib]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../../framework/meta-lib"
 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 1e0bc759ea..9a4f85428d 100644
--- a/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.0"
+version = "0.52.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 2591a990b2..2368b7ca78 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.52.0"
+version = "0.52.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.0"
+version = "0.52.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 d902aaa678..e40208c341 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-lib]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.toml b/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.toml
index f6dc9a263e..70adcea690 100644
--- a/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.0"
+version = "0.52.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 8336b1fba0..5ec5e3d447 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.52.0"
+version = "0.52.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.0"
+version = "0.52.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 0ae4a19bc9..6746ead5fc 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-lib]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/benchmarks/send-tx-repeat/wasm/Cargo.toml b/contracts/benchmarks/send-tx-repeat/wasm/Cargo.toml
index bde390795f..c4dd91f8b6 100644
--- a/contracts/benchmarks/send-tx-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/send-tx-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/str-repeat/Cargo.toml b/contracts/benchmarks/str-repeat/Cargo.toml
index fd3f5c2587..ead63134c0 100644
--- a/contracts/benchmarks/str-repeat/Cargo.toml
+++ b/contracts/benchmarks/str-repeat/Cargo.toml
@@ -12,10 +12,10 @@ path = "src/str_repeat.rs"
 managed-buffer-builder-cached = ["multiversx-sc/managed-buffer-builder-cached"]
 
 [dependencies.multiversx-sc]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../framework/scenario"
diff --git a/contracts/benchmarks/str-repeat/meta/Cargo.toml b/contracts/benchmarks/str-repeat/meta/Cargo.toml
index 48a6f97df9..18d6240e1d 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-lib]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.toml b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.toml
index 9f0da95f02..93c5549f8c 100644
--- a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.toml
+++ b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.toml b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.toml
index f8867f85f8..f73fcb4359 100644
--- a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.toml
+++ b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.toml
@@ -29,7 +29,7 @@ path = ".."
 features = ["managed-buffer-builder-cached"]
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/str-repeat/wasm/Cargo.toml b/contracts/benchmarks/str-repeat/wasm/Cargo.toml
index 8adeee7c0e..7039e5fdbc 100644
--- a/contracts/benchmarks/str-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/str-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/core/price-aggregator/Cargo.toml b/contracts/core/price-aggregator/Cargo.toml
index 9193921708..06106c22b2 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.52.0"
+version = "0.52.1"
 authors = [
     "Claudiu-Marcel Bruda <claudiu.bruda@multiversx.com>",
     "MultiversX <contact@multiversx.com>",
@@ -19,15 +19,15 @@ edition = "2021"
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../framework/scenario"
 
 [dependencies]
diff --git a/contracts/core/price-aggregator/meta/Cargo.toml b/contracts/core/price-aggregator/meta/Cargo.toml
index 87539ba847..fc2a8476e4 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.52.0"
+version = "0.52.1"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-meta-lib]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/core/price-aggregator/wasm/Cargo.toml b/contracts/core/price-aggregator/wasm/Cargo.toml
index 9450ef3bdd..e21c844e02 100644
--- a/contracts/core/price-aggregator/wasm/Cargo.toml
+++ b/contracts/core/price-aggregator/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/core/wegld-swap/Cargo.toml b/contracts/core/wegld-swap/Cargo.toml
index 707342be5d..56419a8d1a 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.52.0"
+version = "0.52.1"
 
 authors = [
     "Dorin Iancu <dorin.iancu@multiversx.com>",
@@ -20,13 +20,13 @@ edition = "2021"
 path = "src/wegld.rs"
 
 [dependencies.multiversx-sc]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../framework/scenario"
diff --git a/contracts/core/wegld-swap/meta/Cargo.toml b/contracts/core/wegld-swap/meta/Cargo.toml
index bc385cccb3..6aa6dcf0b5 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.52.0"
+version = "0.52.1"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-meta-lib]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/core/wegld-swap/wasm/Cargo.toml b/contracts/core/wegld-swap/wasm/Cargo.toml
index 0954123440..3a706f9a2b 100644
--- a/contracts/core/wegld-swap/wasm/Cargo.toml
+++ b/contracts/core/wegld-swap/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/adder/Cargo.toml b/contracts/examples/adder/Cargo.toml
index 29bc4d8d39..84218b9080 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.52.0"
+version = "0.52.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/adder/interact/Cargo.toml b/contracts/examples/adder/interact/Cargo.toml
index e78df43f7d..c7d9e183e7 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.52.0"
+version = "0.52.1"
 path = "../../../../framework/snippets"
diff --git a/contracts/examples/adder/meta/Cargo.toml b/contracts/examples/adder/meta/Cargo.toml
index 99f881de67..4240e1d6dc 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-lib]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/adder/wasm/Cargo.toml b/contracts/examples/adder/wasm/Cargo.toml
index 25af5fd80e..fe50147b0e 100644
--- a/contracts/examples/adder/wasm/Cargo.toml
+++ b/contracts/examples/adder/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.0"
+version = "0.52.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 16fa7a8d62..2669028063 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.52.0"
+version = "0.52.1"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.0"
+version = "0.52.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 bdc45bf146..fb5f4a2130 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-lib]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/bonding-curve-contract/wasm/Cargo.toml b/contracts/examples/bonding-curve-contract/wasm/Cargo.toml
index d58ad48a39..7dfa4f968a 100644
--- a/contracts/examples/bonding-curve-contract/wasm/Cargo.toml
+++ b/contracts/examples/bonding-curve-contract/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/check-pause/Cargo.toml b/contracts/examples/check-pause/Cargo.toml
index 726e9fd228..527ef6e4dc 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.52.0"
+version = "0.52.1"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../framework/scenario"
 
diff --git a/contracts/examples/check-pause/meta/Cargo.toml b/contracts/examples/check-pause/meta/Cargo.toml
index 368e7f52a9..d3e92ba3bb 100644
--- a/contracts/examples/check-pause/meta/Cargo.toml
+++ b/contracts/examples/check-pause/meta/Cargo.toml
@@ -9,6 +9,6 @@ authors = ["Alin Cruceat <alin.cruceat@multiversx.com>"]
 path = ".."
 
 [dependencies.multiversx-sc-meta-lib]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/check-pause/wasm/Cargo.toml b/contracts/examples/check-pause/wasm/Cargo.toml
index 582543413a..5538dcdbf7 100644
--- a/contracts/examples/check-pause/wasm/Cargo.toml
+++ b/contracts/examples/check-pause/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/crowdfunding-esdt/Cargo.toml b/contracts/examples/crowdfunding-esdt/Cargo.toml
index c4f4199e20..1f45351c34 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.52.0"
+version = "0.52.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.0"
+version = "0.52.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 1accf0e825..1174c5bc91 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-lib]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/crowdfunding-esdt/wasm/Cargo.toml b/contracts/examples/crowdfunding-esdt/wasm/Cargo.toml
index 5c8669ec12..a2523105b5 100644
--- a/contracts/examples/crowdfunding-esdt/wasm/Cargo.toml
+++ b/contracts/examples/crowdfunding-esdt/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/crypto-bubbles/Cargo.toml b/contracts/examples/crypto-bubbles/Cargo.toml
index 8819a8e5f5..2ebf8d1cd3 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.52.0"
+version = "0.52.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/crypto-bubbles/meta/Cargo.toml b/contracts/examples/crypto-bubbles/meta/Cargo.toml
index 64b4f2637f..603486d1a0 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-lib]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/crypto-bubbles/wasm/Cargo.toml b/contracts/examples/crypto-bubbles/wasm/Cargo.toml
index 6e5a736d0c..5da98812c1 100644
--- a/contracts/examples/crypto-bubbles/wasm/Cargo.toml
+++ b/contracts/examples/crypto-bubbles/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.0"
+version = "0.52.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 8d985257f2..90a54826ad 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.52.0"
+version = "0.52.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 f8cb8fd989..75599b8d20 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.52.0"
+version = "0.52.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 d9377bb9b3..a3b9ee4248 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.52.0"
+version = "0.52.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.0"
+version = "0.52.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 be50ac254b..5a3de3ed81 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-lib]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../../framework/meta-lib"
 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 3eef131e90..9ae6205ce9 100644
--- a/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.toml
+++ b/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.0"
+version = "0.52.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 0cf085bcbe..853bf67f79 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.52.0"
+version = "0.52.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.0"
+version = "0.52.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 b261e646f7..1bc76b796e 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-lib]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../../framework/meta-lib"
 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 4e38aa02a6..4d7b9e5d10 100644
--- a/contracts/examples/crypto-kitties/kitty-genetic-alg/wasm/Cargo.toml
+++ b/contracts/examples/crypto-kitties/kitty-genetic-alg/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.0"
+version = "0.52.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 2f7a217626..539b7fcf5a 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.52.0"
+version = "0.52.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.0"
+version = "0.52.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 7c73257434..0de6a0b88d 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-lib]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../../framework/meta-lib"
 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 538276dd60..7d6defc5b6 100644
--- a/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.toml
+++ b/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/crypto-zombies/Cargo.toml b/contracts/examples/crypto-zombies/Cargo.toml
index 39639f55d1..543d2a300a 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.52.0"
+version = "0.52.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/crypto-zombies/meta/Cargo.toml b/contracts/examples/crypto-zombies/meta/Cargo.toml
index 555331e0cd..189f74a8ae 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-lib]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/crypto-zombies/wasm/Cargo.toml b/contracts/examples/crypto-zombies/wasm/Cargo.toml
index 074309dfc9..dec5d4a38b 100644
--- a/contracts/examples/crypto-zombies/wasm/Cargo.toml
+++ b/contracts/examples/crypto-zombies/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/digital-cash/Cargo.toml b/contracts/examples/digital-cash/Cargo.toml
index acf383a168..a7905eb7c4 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.52.0"
+version = "0.52.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/digital-cash/meta/Cargo.toml b/contracts/examples/digital-cash/meta/Cargo.toml
index 1905461ec3..c4898cde06 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-lib]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/digital-cash/wasm/Cargo.toml b/contracts/examples/digital-cash/wasm/Cargo.toml
index a8c2ed8790..bf5f0240a8 100644
--- a/contracts/examples/digital-cash/wasm/Cargo.toml
+++ b/contracts/examples/digital-cash/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/empty/Cargo.toml b/contracts/examples/empty/Cargo.toml
index 11f9f42dc3..3a1e812aab 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.52.0"
+version = "0.52.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../framework/scenario"
 
 [dev-dependencies]
diff --git a/contracts/examples/empty/meta/Cargo.toml b/contracts/examples/empty/meta/Cargo.toml
index 02272b87f9..9b7b91bac5 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-lib]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/empty/wasm/Cargo.toml b/contracts/examples/empty/wasm/Cargo.toml
index 0f5f878348..fbfe00ac26 100644
--- a/contracts/examples/empty/wasm/Cargo.toml
+++ b/contracts/examples/empty/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.0"
+version = "0.52.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 9edd792729..fb8c592377 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.52.0"
+version = "0.52.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.0"
+version = "0.52.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 2270548c70..5dcff99072 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-lib]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../framework/meta-lib"
 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 f960a47d48..8ba6c588d2 100644
--- a/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.toml
+++ b/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/factorial/Cargo.toml b/contracts/examples/factorial/Cargo.toml
index 5f74d1f416..a395a66b5b 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.52.0"
+version = "0.52.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/factorial/meta/Cargo.toml b/contracts/examples/factorial/meta/Cargo.toml
index 6cd9657308..0b28c3970c 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-lib]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/factorial/wasm/Cargo.toml b/contracts/examples/factorial/wasm/Cargo.toml
index b6dcf2f75e..c7da76377f 100644
--- a/contracts/examples/factorial/wasm/Cargo.toml
+++ b/contracts/examples/factorial/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/fractional-nfts/Cargo.toml b/contracts/examples/fractional-nfts/Cargo.toml
index 3621183b61..012bdced15 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.52.0"
+version = "0.52.1"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/fractional-nfts/meta/Cargo.toml b/contracts/examples/fractional-nfts/meta/Cargo.toml
index e3eeefad7d..8438f7339b 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-lib]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/fractional-nfts/wasm/Cargo.toml b/contracts/examples/fractional-nfts/wasm/Cargo.toml
index 6ff27e873d..a0fdb6782f 100644
--- a/contracts/examples/fractional-nfts/wasm/Cargo.toml
+++ b/contracts/examples/fractional-nfts/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/lottery-esdt/Cargo.toml b/contracts/examples/lottery-esdt/Cargo.toml
index 78060a4491..9054366a9c 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.52.0"
+version = "0.52.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/lottery-esdt/meta/Cargo.toml b/contracts/examples/lottery-esdt/meta/Cargo.toml
index 5f81485ed4..28ba515da3 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-lib]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/lottery-esdt/wasm/Cargo.toml b/contracts/examples/lottery-esdt/wasm/Cargo.toml
index c43b04ebd5..5b300ddc15 100644
--- a/contracts/examples/lottery-esdt/wasm/Cargo.toml
+++ b/contracts/examples/lottery-esdt/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/multisig/Cargo.toml b/contracts/examples/multisig/Cargo.toml
index 187c927350..63e26c21f5 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.52.0"
+version = "0.52.1"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../framework/scenario"
 
 [dev-dependencies.adder]
@@ -27,7 +27,7 @@ path = "../adder"
 path = "../factorial"
 
 [dev-dependencies.multiversx-wegld-swap-sc]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../core/wegld-swap"
 
 [dev-dependencies]
diff --git a/contracts/examples/multisig/interact/Cargo.toml b/contracts/examples/multisig/interact/Cargo.toml
index 12641d03f3..dc2d290adf 100644
--- a/contracts/examples/multisig/interact/Cargo.toml
+++ b/contracts/examples/multisig/interact/Cargo.toml
@@ -18,17 +18,17 @@ toml = "0.8.6"
 path = ".."
 
 [dependencies.multiversx-sc-modules]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../contracts/modules"
 
 [dependencies.multiversx-sc-snippets]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../framework/snippets"
 
 [dependencies.multiversx-sc-scenario]
-version = "=0.52.0"
+version = "=0.52.1"
 path = "../../../../framework/scenario"
 
 [dependencies.multiversx-sc]
-version = "=0.52.0"
+version = "=0.52.1"
 path = "../../../../framework/base"
diff --git a/contracts/examples/multisig/meta/Cargo.toml b/contracts/examples/multisig/meta/Cargo.toml
index 02bd70a542..f1b5d506c2 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-lib]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/multisig/wasm-multisig-full/Cargo.toml b/contracts/examples/multisig/wasm-multisig-full/Cargo.toml
index 85fbfb2d9e..050915f2b8 100644
--- a/contracts/examples/multisig/wasm-multisig-full/Cargo.toml
+++ b/contracts/examples/multisig/wasm-multisig-full/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.0"
+version = "0.52.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 64b2fb634a..f55430f6f5 100644
--- a/contracts/examples/multisig/wasm-multisig-view/Cargo.toml
+++ b/contracts/examples/multisig/wasm-multisig-view/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/multisig/wasm/Cargo.toml b/contracts/examples/multisig/wasm/Cargo.toml
index 44df4c6007..edba1dc5b9 100644
--- a/contracts/examples/multisig/wasm/Cargo.toml
+++ b/contracts/examples/multisig/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/nft-minter/Cargo.toml b/contracts/examples/nft-minter/Cargo.toml
index c80c31797f..91e47f3bac 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.52.0"
+version = "0.52.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/nft-minter/meta/Cargo.toml b/contracts/examples/nft-minter/meta/Cargo.toml
index 781044aab1..a0bf920aa3 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-lib]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/nft-minter/wasm/Cargo.toml b/contracts/examples/nft-minter/wasm/Cargo.toml
index c6b8402c61..2ece5c0804 100644
--- a/contracts/examples/nft-minter/wasm/Cargo.toml
+++ b/contracts/examples/nft-minter/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.0"
+version = "0.52.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 1a800f5cc5..1dd4d27afd 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.52.0"
+version = "0.52.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.0"
+version = "0.52.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 684eced18f..3c71f366b6 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-lib]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/nft-storage-prepay/wasm/Cargo.toml b/contracts/examples/nft-storage-prepay/wasm/Cargo.toml
index 29e41f59ce..a02a740ecf 100644
--- a/contracts/examples/nft-storage-prepay/wasm/Cargo.toml
+++ b/contracts/examples/nft-storage-prepay/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/nft-subscription/Cargo.toml b/contracts/examples/nft-subscription/Cargo.toml
index a04d156d90..e935dfd603 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.52.0"
+version = "0.52.1"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/nft-subscription/meta/Cargo.toml b/contracts/examples/nft-subscription/meta/Cargo.toml
index 2693d37fa1..2048aaa7a7 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-lib]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/nft-subscription/wasm/Cargo.toml b/contracts/examples/nft-subscription/wasm/Cargo.toml
index 288b6e031f..a598c8e278 100644
--- a/contracts/examples/nft-subscription/wasm/Cargo.toml
+++ b/contracts/examples/nft-subscription/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.0"
+version = "0.52.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 5d1e43bf6d..4107ab2f65 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.52.0"
+version = "0.52.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.0"
+version = "0.52.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 9b47144cd8..9e32cdcf7a 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-lib]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/order-book/factory/wasm/Cargo.toml b/contracts/examples/order-book/factory/wasm/Cargo.toml
index b91e3d1e09..5c65babe0e 100644
--- a/contracts/examples/order-book/factory/wasm/Cargo.toml
+++ b/contracts/examples/order-book/factory/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.0"
+version = "0.52.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 18f0ce482f..1b920593f2 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.52.0"
+version = "0.52.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.0"
+version = "0.52.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 837ea7a500..679459199e 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-lib]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/order-book/pair/wasm/Cargo.toml b/contracts/examples/order-book/pair/wasm/Cargo.toml
index 7f6ae5bf96..55661522bf 100644
--- a/contracts/examples/order-book/pair/wasm/Cargo.toml
+++ b/contracts/examples/order-book/pair/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.0"
+version = "0.52.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 9a489b4145..1f7f71b9dd 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.52.0"
+version = "0.52.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.0"
+version = "0.52.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 02c0b5f43b..a63efa6737 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-lib]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/ping-pong-egld/wasm/Cargo.toml b/contracts/examples/ping-pong-egld/wasm/Cargo.toml
index 718923ef02..9f0fb17d1a 100644
--- a/contracts/examples/ping-pong-egld/wasm/Cargo.toml
+++ b/contracts/examples/ping-pong-egld/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/proxy-pause/Cargo.toml b/contracts/examples/proxy-pause/Cargo.toml
index a86e27b284..6745933b6a 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.52.0"
+version = "0.52.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.0"
+version = "0.52.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 8e74fc0ba0..7f735643c2 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-lib]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/proxy-pause/wasm/Cargo.toml b/contracts/examples/proxy-pause/wasm/Cargo.toml
index ac0240d970..23417ab180 100644
--- a/contracts/examples/proxy-pause/wasm/Cargo.toml
+++ b/contracts/examples/proxy-pause/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/rewards-distribution/Cargo.toml b/contracts/examples/rewards-distribution/Cargo.toml
index ead9b9be54..a3c05e3a03 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.52.0"
+version = "0.52.1"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/rewards-distribution/meta/Cargo.toml b/contracts/examples/rewards-distribution/meta/Cargo.toml
index e2c4466f33..2d6e2b9309 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 <claudiu.bruda@multiversx.com>"]
 path = ".."
 
 [dependencies.multiversx-sc-meta-lib]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/rewards-distribution/wasm/Cargo.toml b/contracts/examples/rewards-distribution/wasm/Cargo.toml
index 7416ebc9c6..2e131edf80 100644
--- a/contracts/examples/rewards-distribution/wasm/Cargo.toml
+++ b/contracts/examples/rewards-distribution/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.0"
+version = "0.52.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 f1c4ab892c..1a83a6158b 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.52.0"
+version = "0.52.1"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.0"
+version = "0.52.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 fb7c0fdcbf..9d5cd541b8 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 <claudiu.bruda@multiversx.com>"]
 path = ".."
 
 [dependencies.multiversx-sc-meta-lib]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/seed-nft-minter/wasm/Cargo.toml b/contracts/examples/seed-nft-minter/wasm/Cargo.toml
index 89fa288ca2..17b6186dca 100644
--- a/contracts/examples/seed-nft-minter/wasm/Cargo.toml
+++ b/contracts/examples/seed-nft-minter/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/token-release/Cargo.toml b/contracts/examples/token-release/Cargo.toml
index 45af2cf918..9a86bb92bb 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.52.0"
+version = "0.52.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../framework/scenario"
 
diff --git a/contracts/examples/token-release/meta/Cargo.toml b/contracts/examples/token-release/meta/Cargo.toml
index 41bdaaaa69..b1cc88db49 100644
--- a/contracts/examples/token-release/meta/Cargo.toml
+++ b/contracts/examples/token-release/meta/Cargo.toml
@@ -10,6 +10,6 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta-lib]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/token-release/wasm/Cargo.toml b/contracts/examples/token-release/wasm/Cargo.toml
index ee03c1952a..981f9ad6e7 100644
--- a/contracts/examples/token-release/wasm/Cargo.toml
+++ b/contracts/examples/token-release/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.0"
+version = "0.52.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 6e14603a27..7b54468c47 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.52.0"
+version = "0.52.1"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../framework/scenario"
 
 [dev-dependencies.multiversx-sc-meta-lib]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../framework/meta-lib"
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 eb9df529d2..661ec87542 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.52.0"
+            "version": "0.52.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 ced74ed1aa..2218b3c58d 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.52.0"
+            "version": "0.52.1"
         }
     },
     "docs": [
diff --git a/contracts/feature-tests/abi-tester/meta/Cargo.toml b/contracts/feature-tests/abi-tester/meta/Cargo.toml
index 1a7be71e8d..e93502a7cb 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-lib]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../framework/meta-lib"
 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 58a5075727..d904fbe0ae 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.0"
+version = "0.52.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 e3094e0ba9..f97261a856 100644
--- a/contracts/feature-tests/abi-tester/wasm/Cargo.toml
+++ b/contracts/feature-tests/abi-tester/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.0"
+version = "0.52.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 bd733f162d..efddec2826 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.52.0"
+version = "0.52.1"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.0"
+version = "0.52.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 2d70556266..210fb8c4e4 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-lib]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml
index 4f2c5a4014..31fb8c1a1f 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml
index f6832cea1d..8b1cf90123 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/alloc-features/wasm/Cargo.toml b/contracts/feature-tests/alloc-features/wasm/Cargo.toml
index 1a7ab69c3a..0f269d9164 100644
--- a/contracts/feature-tests/alloc-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/alloc-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.0"
+version = "0.52.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 213ec3ec95..03c5ca66f4 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.52.0"
+version = "0.52.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../framework/scenario"
 
 [dependencies.multiversx-sc-modules]
-version = "0.52.0"
+version = "0.52.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 789824298a..2b58eab7c7 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.52.0"
+version = "0.52.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 2cb0cd5912..818bda70a8 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-lib]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../framework/meta-lib"
 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 abe3974bea..970ee9e1bf 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.0"
+version = "0.52.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 83ac70576b..a825b4c15a 100644
--- a/contracts/feature-tests/basic-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/basic-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.0"
+version = "0.52.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 3ad10b1859..decc6d7286 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.52.0"
+version = "0.52.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.0"
+version = "0.52.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 11a67e11cf..14003826fc 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-lib]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../framework/meta-lib"
 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 af1c3b78e2..b141d8c61e 100644
--- a/contracts/feature-tests/big-float-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/big-float-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/Cargo.toml b/contracts/feature-tests/composability/Cargo.toml
index de603f177b..28eeb0c393 100644
--- a/contracts/feature-tests/composability/Cargo.toml
+++ b/contracts/feature-tests/composability/Cargo.toml
@@ -36,9 +36,9 @@ path = "recursive-caller"
 path = "vault"
 
 [dependencies.multiversx-sc]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.0"
+version = "0.52.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 4074d2e587..19a5a114c5 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.52.0"
+version = "0.52.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.0"
+version = "0.52.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 4c9772b37f..959713a581 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-lib]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../../framework/meta-lib"
 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 a1b147f290..e678af5a97 100644
--- a/contracts/feature-tests/composability/builtin-func-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/builtin-func-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.0"
+version = "0.52.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 17c3120de2..f80f55eba0 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.52.0"
+version = "0.52.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.0"
+version = "0.52.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 bcd53d2516..97c7574545 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
@@ -9,10 +9,10 @@ publish = false
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.0"
+version = "0.52.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 fe16c71c96..014a8591c0 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.52.0"
+version = "0.52.1"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta-lib]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../../../framework/meta-lib"
 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 6b28e6c4bf..0e57f18a7c 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.0"
+version = "0.52.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 7f81e58260..e2c9dae45a 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.52.0"
+version = "0.52.1"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.0"
+version = "0.52.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 81f571052f..824ea353ed 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.52.0"
+version = "0.52.1"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta-lib]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../../../framework/meta-lib"
 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 b4271b3e36..aaa0ea57b9 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.0"
+version = "0.52.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 45304dbaa1..8beb86caaa 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.52.0"
+version = "0.52.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.0"
+version = "0.52.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 6d7cb8d371..a5789c6d35 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.52.0"
+version = "0.52.1"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.0"
+version = "0.52.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 7315d313c1..8d393d5b01 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.52.0"
+version = "0.52.1"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta-lib]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../../../framework/meta-lib"
 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 87cb8ad1a6..782409174c 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.0"
+version = "0.52.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 fafb4b054c..bcde8f4d83 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
@@ -9,10 +9,10 @@ publish = false
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.0"
+version = "0.52.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 5a5efb7210..a347b90b47 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.52.0"
+version = "0.52.1"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta-lib]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../../../framework/meta-lib"
 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 c7a5c1bc4a..ffc2f7f5f3 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/forwarder-legacy/Cargo.toml b/contracts/feature-tests/composability/forwarder-legacy/Cargo.toml
index 70d8e09629..32892440a7 100644
--- a/contracts/feature-tests/composability/forwarder-legacy/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-legacy/Cargo.toml
@@ -12,10 +12,10 @@ path = "src/forwarder_legacy_main.rs"
 path = "../vault"
 
 [dependencies.multiversx-sc]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../framework/scenario"
 
diff --git a/contracts/feature-tests/composability/forwarder-legacy/meta/Cargo.toml b/contracts/feature-tests/composability/forwarder-legacy/meta/Cargo.toml
index 7611edf68d..c2fba98bb6 100644
--- a/contracts/feature-tests/composability/forwarder-legacy/meta/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-legacy/meta/Cargo.toml
@@ -8,6 +8,6 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta-lib]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.toml b/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.toml
index d62651ee7f..04331c0141 100644
--- a/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.0"
+version = "0.52.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 82e62cab62..3ca7eec9d7 100644
--- a/contracts/feature-tests/composability/forwarder-queue/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-queue/Cargo.toml
@@ -9,14 +9,14 @@ publish = false
 path = "src/forwarder_queue.rs"
 
 [dependencies.multiversx-sc]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../framework/wasm-adapter"
 optional = true
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.0"
+version = "0.52.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 0d75c72199..f1c379079e 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-lib]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../../framework/meta-lib"
 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 c020fcfbed..116ee7330c 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.0"
+version = "0.52.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 dc8b463f06..b4c5434d49 100644
--- a/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.0"
+version = "0.52.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 a63ef79bbb..7f8d16fe8e 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.52.0"
+version = "0.52.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.0"
+version = "0.52.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 6541d16139..1b27181f7d 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-lib]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../../framework/meta-lib"
 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 e70d7fa581..cd97f0b49d 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.0"
+version = "0.52.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 4883f0ef0e..e67b76e238 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.0"
+version = "0.52.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 49f30ae376..c13c0f938f 100644
--- a/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.0"
+version = "0.52.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 c874545939..3eb502fbfc 100644
--- a/contracts/feature-tests/composability/forwarder/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder/Cargo.toml
@@ -9,10 +9,10 @@ publish = false
 path = "src/forwarder_main.rs"
 
 [dependencies.multiversx-sc]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.0"
+version = "0.52.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 7e8d3fdf88..667a03a002 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-lib]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/feature-tests/composability/forwarder/wasm/Cargo.toml b/contracts/feature-tests/composability/forwarder/wasm/Cargo.toml
index adcf23cfcd..a29367f2a3 100644
--- a/contracts/feature-tests/composability/forwarder/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.0"
+version = "0.52.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 4a386a6d7d..c77853a2b8 100644
--- a/contracts/feature-tests/composability/interact/Cargo.toml
+++ b/contracts/feature-tests/composability/interact/Cargo.toml
@@ -15,9 +15,9 @@ serde = { version = "1.0", features = ["derive"] }
 toml = "0.8.6"
 
 [dependencies.multiversx-sc]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-snippets]
-version = "0.52.0"
+version = "0.52.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 3363350b12..22e95922e9 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.52.0"
+version = "0.52.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.0"
+version = "0.52.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 2214d1350d..126b9a4a55 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-lib]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../../framework/meta-lib"
 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 2b804470c2..8ff3fe6cb3 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.0"
+version = "0.52.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 52e9aec884..96b5017afc 100644
--- a/contracts/feature-tests/composability/promises-features/Cargo.toml
+++ b/contracts/feature-tests/composability/promises-features/Cargo.toml
@@ -9,6 +9,6 @@ publish = false
 path = "src/promises_main.rs"
 
 [dependencies.multiversx-sc]
-version = "0.52.0"
+version = "0.52.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 2e36c651c8..beb803c600 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-lib]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../../framework/meta-lib"
 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 191e972c7b..2bdc54c776 100644
--- a/contracts/feature-tests/composability/promises-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/promises-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.0"
+version = "0.52.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 1c46df3ac6..4012311cfa 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.52.0"
+version = "0.52.1"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.0"
+version = "0.52.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 a93776977e..4319512a54 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-lib]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../../framework/meta-lib"
 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 446eb0bedc..b3dc53d9f9 100644
--- a/contracts/feature-tests/composability/proxy-test-first/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/proxy-test-first/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.0"
+version = "0.52.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 bc295d3297..ec321b37f3 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.52.0"
+version = "0.52.1"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.0"
+version = "0.52.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 f955f176ce..5aa3b7344e 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-lib]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../../framework/meta-lib"
 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 8ff737c5ee..9ff9fc9b57 100644
--- a/contracts/feature-tests/composability/proxy-test-second/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/proxy-test-second/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.0"
+version = "0.52.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 eb0f7934fa..08fe322a5f 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.52.0"
+version = "0.52.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.0"
+version = "0.52.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 71d4306d42..0efbef85a6 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-lib]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../../framework/meta-lib"
 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 f5a15affbd..0b3e319e9d 100644
--- a/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.0"
+version = "0.52.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 5c805ecbc5..253559bbf7 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.52.0"
+version = "0.52.1"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.0"
+version = "0.52.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 2dfb98d28c..47919f39e4 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-lib]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../../framework/meta-lib"
 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 87514202ff..1eceba7868 100644
--- a/contracts/feature-tests/composability/transfer-role-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/transfer-role-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.0"
+version = "0.52.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 2d51abc6c5..b4b12641e9 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.52.0"
+version = "0.52.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.0"
+version = "0.52.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 bf432cb19d..c1b51b62a8 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-lib]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../../framework/meta-lib"
 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 a79092fa6a..914ca47106 100644
--- a/contracts/feature-tests/composability/vault/wasm-vault-promises/Cargo.toml
+++ b/contracts/feature-tests/composability/vault/wasm-vault-promises/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.0"
+version = "0.52.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 3bd6a9fce7..45eb7c297f 100644
--- a/contracts/feature-tests/composability/vault/wasm-vault-upgrade/Cargo.toml
+++ b/contracts/feature-tests/composability/vault/wasm-vault-upgrade/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.0"
+version = "0.52.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 db86506250..a25f730677 100644
--- a/contracts/feature-tests/composability/vault/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/vault/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.0"
+version = "0.52.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 2a1a6d2598..bb4e0e4100 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.52.0"
+version = "0.52.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.0"
+version = "0.52.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 74d077defe..7dfe198a34 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-lib]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../../framework/meta-lib"
 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 87f7dff175..e17af52c85 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.0"
+version = "0.52.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 0a14a0b019..c8f7af3f33 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.52.0"
+version = "0.52.1"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.0"
+version = "0.52.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 9119dd08ff..dcd1552ee0 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-lib]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../../framework/meta-lib"
 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 5953614023..05ceef6b85 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.0"
+version = "0.52.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 7e60018216..5b0678237a 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.52.0"
+version = "0.52.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.0"
+version = "0.52.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 dca4ffd565..802055402c 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-lib]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../../framework/meta-lib"
 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 9524374aeb..6311cdd32c 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.0"
+version = "0.52.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 f9ab8f5f9a..b9e6f8b0e4 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.52.0"
+version = "0.52.1"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.0"
+version = "0.52.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 b5b2158ec3..dea5aa95f7 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-lib]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../../framework/meta-lib"
 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 450183ab27..fb2c316a42 100644
--- a/contracts/feature-tests/erc-style-contracts/erc1155/wasm/Cargo.toml
+++ b/contracts/feature-tests/erc-style-contracts/erc1155/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.0"
+version = "0.52.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 2286771fba..6db39778c9 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.52.0"
+version = "0.52.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.0"
+version = "0.52.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 98967edd48..5c0d8a34ed 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-lib]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../../framework/meta-lib"
 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 383299a413..8beb3da568 100644
--- a/contracts/feature-tests/erc-style-contracts/erc20/wasm/Cargo.toml
+++ b/contracts/feature-tests/erc-style-contracts/erc20/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.0"
+version = "0.52.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 46c0ad035e..92d76a2f98 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.52.0"
+version = "0.52.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.0"
+version = "0.52.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 e7f0d21423..70a16cb21f 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-lib]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../../framework/meta-lib"
 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 032959248a..b2f719af6f 100644
--- a/contracts/feature-tests/erc-style-contracts/erc721/wasm/Cargo.toml
+++ b/contracts/feature-tests/erc-style-contracts/erc721/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.0"
+version = "0.52.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 94064f5f23..176352b4c1 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.52.0"
+version = "0.52.1"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.0"
+version = "0.52.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 f96d3dbbc7..0249fa4328 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-lib]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../../framework/meta-lib"
 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 6f0633687c..ec4f623865 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.0"
+version = "0.52.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 a5d69eba2e..cb5e2997d4 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.52.0"
+version = "0.52.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.0"
+version = "0.52.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 c8d41bfd9c..4a5afd1fda 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-lib]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../framework/meta-lib"
 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 a9a1203c2c..4fef0aaf8b 100644
--- a/contracts/feature-tests/esdt-system-sc-mock/wasm/Cargo.toml
+++ b/contracts/feature-tests/esdt-system-sc-mock/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/exchange-features/Cargo.toml b/contracts/feature-tests/exchange-features/Cargo.toml
index 6bc267c2e8..456d181c74 100644
--- a/contracts/feature-tests/exchange-features/Cargo.toml
+++ b/contracts/feature-tests/exchange-features/Cargo.toml
@@ -9,9 +9,9 @@ publish = false
 path = "src/exchange_features.rs"
 
 [dependencies.multiversx-sc]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../framework/scenario"
diff --git a/contracts/feature-tests/exchange-features/meta/Cargo.toml b/contracts/feature-tests/exchange-features/meta/Cargo.toml
index a855193b7b..25b1e1c5b1 100644
--- a/contracts/feature-tests/exchange-features/meta/Cargo.toml
+++ b/contracts/feature-tests/exchange-features/meta/Cargo.toml
@@ -8,6 +8,6 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta-lib]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/feature-tests/exchange-features/wasm/Cargo.toml b/contracts/feature-tests/exchange-features/wasm/Cargo.toml
index 021ef1d292..4ae6e72c74 100644
--- a/contracts/feature-tests/exchange-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/exchange-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.0"
+version = "0.52.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 76846c296c..3cd1ec4502 100644
--- a/contracts/feature-tests/formatted-message-features/Cargo.toml
+++ b/contracts/feature-tests/formatted-message-features/Cargo.toml
@@ -9,10 +9,10 @@ publish = false
 path = "src/formatted_message_features.rs"
 
 [dependencies.multiversx-sc]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.0"
+version = "0.52.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 39da625ffa..9c0d80968e 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-lib]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../framework/meta-lib"
 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 4d0fc9fda1..ae58e167ed 100644
--- a/contracts/feature-tests/formatted-message-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/formatted-message-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.0"
+version = "0.52.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 0373e27d84..75e82fcfff 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.52.0"
+version = "0.52.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.0"
+version = "0.52.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 3850516d64..09fe607401 100644
--- a/contracts/feature-tests/managed-map-features/meta/Cargo.toml
+++ b/contracts/feature-tests/managed-map-features/meta/Cargo.toml
@@ -9,6 +9,6 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta-lib]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../framework/meta-lib"
 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 47d8d8264d..852bcaff2e 100644
--- a/contracts/feature-tests/managed-map-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/managed-map-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.0"
+version = "0.52.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 7215eb406a..338215b5a9 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.52.0"
+version = "0.52.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.0"
+version = "0.52.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 08d3c7d7c2..6f71d8bb0f 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-lib]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../framework/meta-lib"
 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 a7456e3951..dd017b46d4 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.0"
+version = "0.52.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 7e9db2a397..009c9dd232 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
@@ -29,7 +29,7 @@ path = ".."
 features = ["example_feature"]
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.0"
+version = "0.52.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 97ae3cbfeb..8531f4f20b 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.0"
+version = "0.52.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 0f863e1d3d..344725ab9d 100644
--- a/contracts/feature-tests/multi-contract-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/multi-contract-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.0"
+version = "0.52.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 de98ce2305..62a148c713 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.52.0"
+version = "0.52.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.0"
+version = "0.52.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 cb0350dc12..8f0a4041f4 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-lib]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../framework/meta-lib"
 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 16f2a95811..6ef4f91bfb 100644
--- a/contracts/feature-tests/panic-message-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/panic-message-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.0"
+version = "0.52.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 d8d722cbf9..5a97808792 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.52.0"
+version = "0.52.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.0"
+version = "0.52.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 f43f518751..4545718099 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-lib]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/feature-tests/payable-features/wasm/Cargo.toml b/contracts/feature-tests/payable-features/wasm/Cargo.toml
index bba86c72a0..c7aef64426 100644
--- a/contracts/feature-tests/payable-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/payable-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.0"
+version = "0.52.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 cd147e6ddd..018c630a32 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.52.0"
+version = "0.52.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.0"
+version = "0.52.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 5cfc33b1b8..938e35baf4 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.52.0"
+version = "0.52.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 8c917ae632..cc07056251 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-lib]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../framework/meta-lib"
 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 36c8594df0..e4a412dce3 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 interactor snippets manually to add relative paths:
 // [dependencies.multiversx-sc-snippets]
-// version = "0.52.0"
+// version = "0.52.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 f486a7b597..4f6d1c6938 100644
--- a/contracts/feature-tests/rust-snippets-generator-test/wasm/Cargo.toml
+++ b/contracts/feature-tests/rust-snippets-generator-test/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.0"
+version = "0.52.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 ae70e0cb08..b258cc8461 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.52.0"
+version = "0.52.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.52.0"
+version = "0.52.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 d6964c152e..ad1d66cd87 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-lib]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../framework/meta-lib"
 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 892cab19b7..4af69ce15c 100644
--- a/contracts/feature-tests/rust-testing-framework-tester/wasm/Cargo.toml
+++ b/contracts/feature-tests/rust-testing-framework-tester/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/scenario-tester/Cargo.toml b/contracts/feature-tests/scenario-tester/Cargo.toml
index d5658a0753..377ba16298 100644
--- a/contracts/feature-tests/scenario-tester/Cargo.toml
+++ b/contracts/feature-tests/scenario-tester/Cargo.toml
@@ -9,9 +9,9 @@ publish = false
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../framework/scenario"
diff --git a/contracts/feature-tests/scenario-tester/meta/Cargo.toml b/contracts/feature-tests/scenario-tester/meta/Cargo.toml
index 1dffc57626..145f6279b0 100644
--- a/contracts/feature-tests/scenario-tester/meta/Cargo.toml
+++ b/contracts/feature-tests/scenario-tester/meta/Cargo.toml
@@ -8,6 +8,6 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta-lib]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/feature-tests/scenario-tester/wasm/Cargo.toml b/contracts/feature-tests/scenario-tester/wasm/Cargo.toml
index 3c412f0530..6272be13f5 100644
--- a/contracts/feature-tests/scenario-tester/wasm/Cargo.toml
+++ b/contracts/feature-tests/scenario-tester/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.0"
+version = "0.52.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 7278d09837..e5bf2fe46e 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.52.0"
+version = "0.52.1"
 path = "../../../contracts/modules"
 
 [dependencies.multiversx-sc]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../framework/scenario"
 
 [dev-dependencies.multiversx-sc-meta-lib]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../framework/meta-lib"
diff --git a/contracts/feature-tests/use-module/meta/Cargo.toml b/contracts/feature-tests/use-module/meta/Cargo.toml
index d72e3c1436..8de9c8ec68 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-lib]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../framework/meta-lib"
 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 5f4031c3c0..50088b6a48 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.52.0"
+            "version": "0.52.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 ff95b12009..6531a9de77 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.52.0"
+            "version": "0.52.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 128b3787f7..1d31463062 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.0"
+version = "0.52.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 907f57bf35..039b026dc8 100644
--- a/contracts/feature-tests/use-module/wasm/Cargo.toml
+++ b/contracts/feature-tests/use-module/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/modules/Cargo.toml b/contracts/modules/Cargo.toml
index 9f9d8392e2..dc933cf2fa 100644
--- a/contracts/modules/Cargo.toml
+++ b/contracts/modules/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-modules"
-version = "0.52.0"
+version = "0.52.1"
 edition = "2021"
 
 authors = ["MultiversX <contact@multiversx.com>"]
@@ -17,5 +17,5 @@ categories = ["no-std", "wasm", "cryptography::cryptocurrencies"]
 alloc = ["multiversx-sc/alloc"]
 
 [dependencies.multiversx-sc]
-version = "0.52.0"
+version = "0.52.1"
 path = "../../framework/base"
diff --git a/framework/base/Cargo.toml b/framework/base/Cargo.toml
index 5e9077dc0c..8d2599161c 100644
--- a/framework/base/Cargo.toml
+++ b/framework/base/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc"
-version = "0.52.0"
+version = "0.52.1"
 edition = "2021"
 rust-version = "1.78"
 
@@ -30,7 +30,7 @@ num-traits = { version = "=0.2.19", default-features = false }
 unwrap-infallible = "0.1.5"
 
 [dependencies.multiversx-sc-derive]
-version = "=0.52.0"
+version = "=0.52.1"
 path = "../derive"
 
 [dependencies.multiversx-sc-codec]
diff --git a/framework/derive/Cargo.toml b/framework/derive/Cargo.toml
index 5aaaa10d67..7922c44b39 100644
--- a/framework/derive/Cargo.toml
+++ b/framework/derive/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-derive"
-version = "0.52.0"
+version = "0.52.1"
 edition = "2021"
 
 authors = ["Andrei Marinica <andrei.marinica@multiversx.com>", "MultiversX <contact@multiversx.com>"]
diff --git a/framework/meta-lib/Cargo.toml b/framework/meta-lib/Cargo.toml
index 0e221c55d9..373cf21631 100644
--- a/framework/meta-lib/Cargo.toml
+++ b/framework/meta-lib/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-meta-lib"
-version = "0.52.0"
+version = "0.52.1"
 edition = "2021"
 
 authors = [
@@ -31,6 +31,6 @@ wasmprinter = "0.214"
 semver = "1.0.20"
 
 [dependencies.multiversx-sc]
-version = "=0.52.0"
+version = "=0.52.1"
 path = "../base"
 features = ["alloc", "num-bigint"]
diff --git a/framework/meta-lib/src/version_history.rs b/framework/meta-lib/src/version_history.rs
index 8979b7371c..b742abb97c 100644
--- a/framework/meta-lib/src/version_history.rs
+++ b/framework/meta-lib/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.52.0);
+pub const LAST_VERSION: FrameworkVersion = framework_version!(0.52.1);
 
 /// Indicates where to stop with the upgrades.
 pub const LAST_UPGRADE_VERSION: FrameworkVersion = LAST_VERSION;
@@ -79,6 +79,7 @@ pub const VERSIONS: &[FrameworkVersion] = framework_versions![
     0.51.0,
     0.51.1,
     0.52.0,
+    0.52.1,
 ];
 
 #[rustfmt::skip]
@@ -104,7 +105,7 @@ pub const CHECK_AFTER_UPGRADE_TO: &[FrameworkVersion] = framework_versions![
     0.49.0,
     0.50.6,
     0.51.1,
-    0.52.0,
+    0.52.1,
 ];
 
 pub const LOWER_VERSION_WITH_TEMPLATE_TAG: FrameworkVersion = framework_version!(0.43.0);
diff --git a/framework/meta/Cargo.toml b/framework/meta/Cargo.toml
index e0627fb13f..36f3ac274e 100644
--- a/framework/meta/Cargo.toml
+++ b/framework/meta/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-meta"
-version = "0.52.0"
+version = "0.52.1"
 edition = "2021"
 
 authors = [
@@ -41,14 +41,14 @@ pathdiff = "0.2.1"
 common-path = "1.0.0" 
 
 [dependencies.multiversx-sc-meta-lib]
-version = "=0.52.0"
+version = "=0.52.1"
 path = "../meta-lib"
 
 [dependencies.multiversx-sc]
-version = "=0.52.0"
+version = "=0.52.1"
 path = "../base"
 features = ["alloc", "num-bigint"]
 
 [dependencies.multiversx-sc-snippets]
-version = "=0.52.0"
+version = "=0.52.1"
 path = "../snippets"
diff --git a/framework/scenario/Cargo.toml b/framework/scenario/Cargo.toml
index 5e08d04bd6..d6b2164ccf 100644
--- a/framework/scenario/Cargo.toml
+++ b/framework/scenario/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-scenario"
-version = "0.52.0"
+version = "0.52.1"
 edition = "2021"
 
 authors = [
@@ -37,12 +37,12 @@ wasm-incopatible = ["multiversx-chain-vm/wasm-incopatible"]
 run-go-tests = []
 
 [dependencies.multiversx-sc]
-version = "=0.52.0"
+version = "=0.52.1"
 features = ["alloc", "num-bigint"]
 path = "../base"
 
 [dependencies.multiversx-sc-meta-lib]
-version = "=0.52.0"
+version = "=0.52.1"
 path = "../meta-lib"
 
 [dependencies.multiversx-chain-scenario-format]
diff --git a/framework/snippets/Cargo.toml b/framework/snippets/Cargo.toml
index 79ba90907c..c02526794e 100644
--- a/framework/snippets/Cargo.toml
+++ b/framework/snippets/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-snippets"
-version = "0.52.0"
+version = "0.52.1"
 edition = "2021"
 
 authors = ["MultiversX <contact@multiversx.com>"]
@@ -22,7 +22,7 @@ env_logger = "0.11"
 futures = "0.3"
 
 [dependencies.multiversx-sc-scenario]
-version = "=0.52.0"
+version = "=0.52.1"
 path = "../scenario"
 
 [dependencies.multiversx-chain-scenario-format]
diff --git a/framework/wasm-adapter/Cargo.toml b/framework/wasm-adapter/Cargo.toml
index ed63f7b665..048ab71ba7 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.52.0"
+version = "0.52.1"
 edition = "2021"
 
 authors = [
@@ -22,5 +22,5 @@ categories = [
 ]
 
 [dependencies.multiversx-sc]
-version = "=0.52.0"
+version = "=0.52.1"
 path = "../base"
diff --git a/tools/mxpy-snippet-generator/Cargo.toml b/tools/mxpy-snippet-generator/Cargo.toml
index 0019aed48f..9a468cd137 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.52.0"
+version = "0.52.1"
 path = "../../framework/base"
 
 [dependencies]
diff --git a/tools/plotter/Cargo.toml b/tools/plotter/Cargo.toml
index beec742f27..75f589ecee 100644
--- a/tools/plotter/Cargo.toml
+++ b/tools/plotter/Cargo.toml
@@ -21,11 +21,11 @@ plotters-canvas = "^0.3.0"
 lto = true
 
 [dependencies.multiversx-sc]
-version = "=0.52.0"
+version = "=0.52.1"
 path = "../../framework/base"
 
 [dependencies.multiversx-sc-scenario]
-version = "=0.52.0"
+version = "=0.52.1"
 path = "../../framework/scenario"
 default-features = false
 
diff --git a/tools/rust-debugger/format-tests/Cargo.toml b/tools/rust-debugger/format-tests/Cargo.toml
index 4d167562e2..c2ef36d718 100644
--- a/tools/rust-debugger/format-tests/Cargo.toml
+++ b/tools/rust-debugger/format-tests/Cargo.toml
@@ -9,11 +9,11 @@ name = "format-tests"
 path = "src/format_tests.rs"
 
 [dependencies.multiversx-sc]
-version = "=0.52.0"
+version = "=0.52.1"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-scenario]
-version = "=0.52.0"
+version = "=0.52.1"
 path = "../../../framework/scenario"
 
 [dependencies.multiversx-chain-vm]

From 49bc839acb697782568b48f982ebb85e34283695 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 31 Jul 2024 16:14:12 +0300
Subject: [PATCH 1128/1254] Cargo.lock update

---
 contracts/benchmarks/large-storage/wasm/Cargo.lock     |  6 +++---
 .../mappers/linked-list-repeat/wasm/Cargo.lock         |  6 +++---
 .../benchmarks/mappers/map-repeat/wasm/Cargo.lock      |  6 +++---
 .../benchmarks/mappers/queue-repeat/wasm/Cargo.lock    |  6 +++---
 .../benchmarks/mappers/set-repeat/wasm/Cargo.lock      |  6 +++---
 .../mappers/single-value-repeat/wasm/Cargo.lock        |  6 +++---
 .../benchmarks/mappers/vec-repeat/wasm/Cargo.lock      |  6 +++---
 contracts/benchmarks/send-tx-repeat/wasm/Cargo.lock    |  6 +++---
 .../wasm-str-repeat-mb-builder-basic/Cargo.lock        |  6 +++---
 .../wasm-str-repeat-mb-builder-cached/Cargo.lock       |  6 +++---
 contracts/benchmarks/str-repeat/wasm/Cargo.lock        |  6 +++---
 contracts/core/price-aggregator/wasm/Cargo.lock        | 10 +++++-----
 contracts/examples/adder/wasm/Cargo.lock               |  6 +++---
 .../examples/bonding-curve-contract/wasm/Cargo.lock    |  8 ++++----
 contracts/examples/check-pause/wasm/Cargo.lock         |  8 ++++----
 contracts/examples/crowdfunding-esdt/wasm/Cargo.lock   |  6 +++---
 contracts/examples/crypto-bubbles/wasm/Cargo.lock      |  6 +++---
 .../crypto-kitties/kitty-auction/wasm/Cargo.lock       |  6 +++---
 .../crypto-kitties/kitty-genetic-alg/wasm/Cargo.lock   |  6 +++---
 .../crypto-kitties/kitty-ownership/wasm/Cargo.lock     |  6 +++---
 contracts/examples/crypto-zombies/wasm/Cargo.lock      |  6 +++---
 contracts/examples/digital-cash/wasm/Cargo.lock        |  6 +++---
 contracts/examples/empty/wasm/Cargo.lock               |  6 +++---
 .../examples/esdt-transfer-with-fee/wasm/Cargo.lock    |  6 +++---
 contracts/examples/factorial/wasm/Cargo.lock           |  6 +++---
 contracts/examples/fractional-nfts/wasm/Cargo.lock     |  8 ++++----
 contracts/examples/lottery-esdt/wasm/Cargo.lock        |  6 +++---
 .../examples/multisig/wasm-multisig-full/Cargo.lock    |  8 ++++----
 .../examples/multisig/wasm-multisig-view/Cargo.lock    |  8 ++++----
 contracts/examples/multisig/wasm/Cargo.lock            |  8 ++++----
 contracts/examples/nft-minter/wasm/Cargo.lock          |  6 +++---
 contracts/examples/nft-storage-prepay/wasm/Cargo.lock  |  6 +++---
 contracts/examples/nft-subscription/wasm/Cargo.lock    |  8 ++++----
 contracts/examples/order-book/factory/wasm/Cargo.lock  |  6 +++---
 contracts/examples/order-book/pair/wasm/Cargo.lock     |  6 +++---
 contracts/examples/ping-pong-egld/wasm/Cargo.lock      |  6 +++---
 contracts/examples/proxy-pause/wasm/Cargo.lock         |  6 +++---
 .../examples/rewards-distribution/wasm/Cargo.lock      |  8 ++++----
 contracts/examples/seed-nft-minter/wasm/Cargo.lock     |  8 ++++----
 contracts/examples/token-release/wasm/Cargo.lock       |  6 +++---
 .../abi-tester/wasm-abi-tester-ev/Cargo.lock           |  6 +++---
 contracts/feature-tests/abi-tester/wasm/Cargo.lock     |  6 +++---
 .../alloc-features/wasm-alloc-mem-fail/Cargo.lock      |  6 +++---
 .../alloc-features/wasm-alloc-mem-leaking/Cargo.lock   |  6 +++---
 contracts/feature-tests/alloc-features/wasm/Cargo.lock |  6 +++---
 .../wasm-basic-features-storage-bytes/Cargo.lock       |  8 ++++----
 contracts/feature-tests/basic-features/wasm/Cargo.lock |  8 ++++----
 .../feature-tests/big-float-features/wasm/Cargo.lock   |  6 +++---
 .../builtin-func-features/wasm/Cargo.lock              |  6 +++---
 .../esdt-contract-pair/first-contract/wasm/Cargo.lock  |  6 +++---
 .../esdt-contract-pair/second-contract/wasm/Cargo.lock |  6 +++---
 .../child/wasm/Cargo.lock                              |  6 +++---
 .../parent/wasm/Cargo.lock                             |  6 +++---
 .../composability/forwarder-legacy/wasm/Cargo.lock     |  6 +++---
 .../wasm-forwarder-queue-promises/Cargo.lock           |  6 +++---
 .../composability/forwarder-queue/wasm/Cargo.lock      |  6 +++---
 .../wasm-forwarder-raw-init-async-call/Cargo.lock      |  6 +++---
 .../wasm-forwarder-raw-init-sync-call/Cargo.lock       |  6 +++---
 .../composability/forwarder-raw/wasm/Cargo.lock        |  6 +++---
 .../composability/forwarder/wasm/Cargo.lock            |  6 +++---
 .../composability/local-esdt-and-nft/wasm/Cargo.lock   |  6 +++---
 .../composability/promises-features/wasm/Cargo.lock    |  6 +++---
 .../composability/proxy-test-first/wasm/Cargo.lock     |  6 +++---
 .../composability/proxy-test-second/wasm/Cargo.lock    |  6 +++---
 .../composability/recursive-caller/wasm/Cargo.lock     |  6 +++---
 .../transfer-role-features/wasm/Cargo.lock             |  8 ++++----
 .../composability/vault/wasm-vault-promises/Cargo.lock |  6 +++---
 .../composability/vault/wasm-vault-upgrade/Cargo.lock  |  6 +++---
 .../feature-tests/composability/vault/wasm/Cargo.lock  |  6 +++---
 .../crowdfunding-erc20/wasm/Cargo.lock                 |  6 +++---
 .../erc1155-marketplace/wasm/Cargo.lock                |  6 +++---
 .../erc1155-user-mock/wasm/Cargo.lock                  |  6 +++---
 .../erc-style-contracts/erc1155/wasm/Cargo.lock        |  6 +++---
 .../erc-style-contracts/erc20/wasm/Cargo.lock          |  6 +++---
 .../erc-style-contracts/erc721/wasm/Cargo.lock         |  6 +++---
 .../erc-style-contracts/lottery-erc20/wasm/Cargo.lock  |  6 +++---
 .../feature-tests/esdt-system-sc-mock/wasm/Cargo.lock  |  6 +++---
 .../feature-tests/exchange-features/wasm/Cargo.lock    |  6 +++---
 .../formatted-message-features/wasm/Cargo.lock         |  6 +++---
 .../feature-tests/managed-map-features/wasm/Cargo.lock |  6 +++---
 .../wasm-multi-contract-alt-impl/Cargo.lock            |  6 +++---
 .../wasm-multi-contract-example-feature/Cargo.lock     |  6 +++---
 .../wasm-multi-contract-features-view/Cargo.lock       |  6 +++---
 .../multi-contract-features/wasm/Cargo.lock            |  6 +++---
 .../panic-message-features/wasm/Cargo.lock             |  6 +++---
 .../feature-tests/payable-features/wasm/Cargo.lock     |  6 +++---
 .../rust-snippets-generator-test/wasm/Cargo.lock       |  6 +++---
 .../rust-testing-framework-tester/wasm/Cargo.lock      |  6 +++---
 .../feature-tests/scenario-tester/wasm/Cargo.lock      |  6 +++---
 .../use-module/wasm-use-module-view/Cargo.lock         |  8 ++++----
 contracts/feature-tests/use-module/wasm/Cargo.lock     |  8 ++++----
 91 files changed, 289 insertions(+), 289 deletions(-)

diff --git a/contracts/benchmarks/large-storage/wasm/Cargo.lock b/contracts/benchmarks/large-storage/wasm/Cargo.lock
index 458de101db..56350ff699 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.52.0"
+version = "0.52.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.lock
index 5e8f7fa292..665dd3d8b1 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.52.0"
+version = "0.52.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.lock
index 93839923fa..e0eb16ccd1 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.52.0"
+version = "0.52.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.lock
index aea740a330..ac21fec5bd 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.52.0"
+version = "0.52.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -78,7 +78,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -89,7 +89,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.lock
index fcd79cd3e3..2cd62ce507 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.52.0"
+version = "0.52.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -78,7 +78,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -89,7 +89,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.lock
index b0b5999b39..9a73b81df9 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.52.0"
+version = "0.52.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -78,7 +78,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -89,7 +89,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.lock
index 8150fffd50..1f9db6a3ab 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.52.0"
+version = "0.52.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -78,7 +78,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -89,7 +89,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/send-tx-repeat/wasm/Cargo.lock b/contracts/benchmarks/send-tx-repeat/wasm/Cargo.lock
index 200c0d19e9..045cacffe0 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.52.0"
+version = "0.52.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.lock b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.lock
index 6dda9f4dcb..ea0c0ed633 100644
--- a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.lock
+++ b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.lock
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.lock b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.lock
index 460b5a03ce..b9dd728779 100644
--- a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.lock
+++ b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.lock
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/str-repeat/wasm/Cargo.lock b/contracts/benchmarks/str-repeat/wasm/Cargo.lock
index aa15e4ee53..761e578c72 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.52.0"
+version = "0.52.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/core/price-aggregator/wasm/Cargo.lock b/contracts/core/price-aggregator/wasm/Cargo.lock
index 7dd8dc74c0..f40f512f73 100644
--- a/contracts/core/price-aggregator/wasm/Cargo.lock
+++ b/contracts/core/price-aggregator/wasm/Cargo.lock
@@ -92,7 +92,7 @@ checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
 
 [[package]]
 name = "multiversx-price-aggregator-sc"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "arrayvec",
  "getrandom",
@@ -111,7 +111,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -142,7 +142,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -153,14 +153,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/adder/wasm/Cargo.lock b/contracts/examples/adder/wasm/Cargo.lock
index 1c38724ae9..946352eb46 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.52.0"
+version = "0.52.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/bonding-curve-contract/wasm/Cargo.lock b/contracts/examples/bonding-curve-contract/wasm/Cargo.lock
index ec876aa701..1636d17c7a 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.52.0"
+version = "0.52.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/check-pause/wasm/Cargo.lock b/contracts/examples/check-pause/wasm/Cargo.lock
index 8ee464bb47..f2785f3ead 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.52.0"
+version = "0.52.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crowdfunding-esdt/wasm/Cargo.lock b/contracts/examples/crowdfunding-esdt/wasm/Cargo.lock
index 9e470e5f95..c8b11257b2 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.52.0"
+version = "0.52.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crypto-bubbles/wasm/Cargo.lock b/contracts/examples/crypto-bubbles/wasm/Cargo.lock
index 250573c46d..0fbdd93ae5 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.52.0"
+version = "0.52.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.lock b/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.lock
index ba1713182b..002becfb0e 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.52.0"
+version = "0.52.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -115,7 +115,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -126,7 +126,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]
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 a2abd3c986..2104390f8a 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.52.0"
+version = "0.52.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -96,7 +96,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -107,7 +107,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.lock b/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.lock
index eb610a2f29..8fddf88108 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.52.0"
+version = "0.52.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -106,7 +106,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -117,7 +117,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crypto-zombies/wasm/Cargo.lock b/contracts/examples/crypto-zombies/wasm/Cargo.lock
index a21fb50f00..37b007b5a4 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.52.0"
+version = "0.52.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/digital-cash/wasm/Cargo.lock b/contracts/examples/digital-cash/wasm/Cargo.lock
index 26206743c0..1fcf091b38 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.52.0"
+version = "0.52.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/empty/wasm/Cargo.lock b/contracts/examples/empty/wasm/Cargo.lock
index 6944878cc3..f294c37261 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.52.0"
+version = "0.52.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.lock b/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.lock
index f56929b9a5..5f7f41d9f3 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.52.0"
+version = "0.52.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/factorial/wasm/Cargo.lock b/contracts/examples/factorial/wasm/Cargo.lock
index 5874ae5190..a40d179566 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.52.0"
+version = "0.52.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/fractional-nfts/wasm/Cargo.lock b/contracts/examples/fractional-nfts/wasm/Cargo.lock
index 7ebfb15a58..35ae058167 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.52.0"
+version = "0.52.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/lottery-esdt/wasm/Cargo.lock b/contracts/examples/lottery-esdt/wasm/Cargo.lock
index cc4c0d4416..1d71a02053 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.52.0"
+version = "0.52.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/multisig/wasm-multisig-full/Cargo.lock b/contracts/examples/multisig/wasm-multisig-full/Cargo.lock
index 953711db60..2e356c78ee 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.52.0"
+version = "0.52.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/multisig/wasm-multisig-view/Cargo.lock b/contracts/examples/multisig/wasm-multisig-view/Cargo.lock
index fa39ba76df..cd4e98675f 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.52.0"
+version = "0.52.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/multisig/wasm/Cargo.lock b/contracts/examples/multisig/wasm/Cargo.lock
index 72def41f92..afbd7083ca 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.52.0"
+version = "0.52.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/nft-minter/wasm/Cargo.lock b/contracts/examples/nft-minter/wasm/Cargo.lock
index c8d9d672b0..6c38a9e212 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.52.0"
+version = "0.52.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/nft-storage-prepay/wasm/Cargo.lock b/contracts/examples/nft-storage-prepay/wasm/Cargo.lock
index 5d89401b2a..fd2627d8c9 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.52.0"
+version = "0.52.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/nft-subscription/wasm/Cargo.lock b/contracts/examples/nft-subscription/wasm/Cargo.lock
index c851d546e4..44f7ce6417 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.52.0"
+version = "0.52.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,14 +82,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/order-book/factory/wasm/Cargo.lock b/contracts/examples/order-book/factory/wasm/Cargo.lock
index b436396257..6ba57f1a60 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.52.0"
+version = "0.52.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/order-book/pair/wasm/Cargo.lock b/contracts/examples/order-book/pair/wasm/Cargo.lock
index f9599aa5a7..015c6ef56e 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.52.0"
+version = "0.52.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/ping-pong-egld/wasm/Cargo.lock b/contracts/examples/ping-pong-egld/wasm/Cargo.lock
index 7737e8ff94..77adfda3cc 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.52.0"
+version = "0.52.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/proxy-pause/wasm/Cargo.lock b/contracts/examples/proxy-pause/wasm/Cargo.lock
index b3561860c9..f329b2c547 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.52.0"
+version = "0.52.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/rewards-distribution/wasm/Cargo.lock b/contracts/examples/rewards-distribution/wasm/Cargo.lock
index 4980d212da..acfdbbbf9e 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.52.0"
+version = "0.52.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,14 +82,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/seed-nft-minter/wasm/Cargo.lock b/contracts/examples/seed-nft-minter/wasm/Cargo.lock
index 2f2fa309b1..c227d25b27 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.52.0"
+version = "0.52.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,14 +82,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/token-release/wasm/Cargo.lock b/contracts/examples/token-release/wasm/Cargo.lock
index 9f43d94e3f..dfd978d40e 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.52.0"
+version = "0.52.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]
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 28cfd14d29..a399527594 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.52.0"
+version = "0.52.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/abi-tester/wasm/Cargo.lock b/contracts/feature-tests/abi-tester/wasm/Cargo.lock
index 39bc19cf1c..a26b59d8cb 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.52.0"
+version = "0.52.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock
index c35576e8c3..0e7436a86a 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.lock b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.lock
index 89c9a99e7c..029ebb4530 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.lock
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.lock
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/alloc-features/wasm/Cargo.lock b/contracts/feature-tests/alloc-features/wasm/Cargo.lock
index 8ab16c5724..a2ae5854be 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.52.0"
+version = "0.52.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]
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 274bf622ea..fd5a7277d4 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.52.0"
+version = "0.52.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/basic-features/wasm/Cargo.lock b/contracts/feature-tests/basic-features/wasm/Cargo.lock
index df0959cf55..25259895ed 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.52.0"
+version = "0.52.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/big-float-features/wasm/Cargo.lock b/contracts/feature-tests/big-float-features/wasm/Cargo.lock
index ded548ebdc..e7ce81e1dc 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.52.0"
+version = "0.52.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]
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 52f4d68ce4..de65a13806 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.52.0"
+version = "0.52.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]
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 e169cdf8bb..cb5a571f71 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.52.0"
+version = "0.52.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]
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 a1ce767b56..e5a3d44d23 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.52.0"
+version = "0.52.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]
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 499c329c89..b8f722e254 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.52.0"
+version = "0.52.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]
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 f1e1af89b4..115186a8d9 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
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.lock
index 384253d98a..d37ce7e513 100644
--- a/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.lock
@@ -56,7 +56,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,7 +98,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]
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 64bddb816b..aedaa4c668 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
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock
index 112c24f014..2eb6928dc0 100644
--- a/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]
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 75271f4ffc..474ff81149 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.52.0"
+version = "0.52.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]
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 b07d381b79..4fa1a3609a 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.52.0"
+version = "0.52.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.lock
index 849651e5d9..556c737769 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.52.0"
+version = "0.52.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock
index 1506d61cd1..21b2398ee5 100755
--- a/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]
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 a5085a77ba..616e9c5111 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.52.0"
+version = "0.52.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/promises-features/wasm/Cargo.lock b/contracts/feature-tests/composability/promises-features/wasm/Cargo.lock
index 4be375d876..f673204086 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.52.0"
+version = "0.52.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]
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 83371c0c20..f9952ec71a 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.52.0"
+version = "0.52.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]
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 f867682e4e..6b60935819 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.52.0"
+version = "0.52.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.lock b/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.lock
index e87f78e175..071d130fc2 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.52.0"
+version = "0.52.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]
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 b757e9cfb4..13556a3def 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.52.0"
+version = "0.52.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,14 +82,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]
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 7275d6cea5..4dfcc18490 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.52.0"
+version = "0.52.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]
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 ddf8ee37f7..ff03f63f81 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.52.0"
+version = "0.52.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/vault/wasm/Cargo.lock b/contracts/feature-tests/composability/vault/wasm/Cargo.lock
index 82a885d24d..e3b6e48c1f 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.52.0"
+version = "0.52.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]
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 ef7a1802cb..d158150cde 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.52.0"
+version = "0.52.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]
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 7e6cdad4bc..c9e275ec0c 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.52.0"
+version = "0.52.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]
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 c4e99faf95..ecfe0b87e8 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.52.0"
+version = "0.52.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]
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 44007d75b6..532b8c1abc 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.52.0"
+version = "0.52.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]
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 fcc250e38a..cc49de7312 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.52.0"
+version = "0.52.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]
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 7e3ae781dc..6965152e8e 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.52.0"
+version = "0.52.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]
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 7191b009f1..6ea6ac3682 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.52.0"
+version = "0.52.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]
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 22715ca334..29b727b9cb 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.52.0"
+version = "0.52.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/exchange-features/wasm/Cargo.lock b/contracts/feature-tests/exchange-features/wasm/Cargo.lock
index 25ae8022fc..a4db412ba4 100644
--- a/contracts/feature-tests/exchange-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/exchange-features/wasm/Cargo.lock
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/formatted-message-features/wasm/Cargo.lock b/contracts/feature-tests/formatted-message-features/wasm/Cargo.lock
index 6f699f64d4..e4e4b0c413 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.52.0"
+version = "0.52.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/managed-map-features/wasm/Cargo.lock b/contracts/feature-tests/managed-map-features/wasm/Cargo.lock
index feb1e599bd..0a8c2ddc9e 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.52.0"
+version = "0.52.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]
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 bc36a0c15a..556d610330 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.52.0"
+version = "0.52.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]
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 ac17bbcfe3..f06095dbd4 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.52.0"
+version = "0.52.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]
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 10f44b2a2f..13f4df22aa 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.52.0"
+version = "0.52.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/multi-contract-features/wasm/Cargo.lock b/contracts/feature-tests/multi-contract-features/wasm/Cargo.lock
index 06a5c24833..60f9f14d9d 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.52.0"
+version = "0.52.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/panic-message-features/wasm/Cargo.lock b/contracts/feature-tests/panic-message-features/wasm/Cargo.lock
index 8383ed6eab..693e13d66f 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.52.0"
+version = "0.52.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/payable-features/wasm/Cargo.lock b/contracts/feature-tests/payable-features/wasm/Cargo.lock
index e71ebd5d51..54ad03c403 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.52.0"
+version = "0.52.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]
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 31c4101ced..e35a608276 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.52.0"
+version = "0.52.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]
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 74933a4957..846b17c8b6 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.52.0"
+version = "0.52.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/scenario-tester/wasm/Cargo.lock b/contracts/feature-tests/scenario-tester/wasm/Cargo.lock
index b253d7a0bd..6ed812416e 100755
--- a/contracts/feature-tests/scenario-tester/wasm/Cargo.lock
+++ b/contracts/feature-tests/scenario-tester/wasm/Cargo.lock
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]
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 b9a61fa90e..6962e9674a 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.52.0"
+version = "0.52.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,14 +82,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/use-module/wasm/Cargo.lock b/contracts/feature-tests/use-module/wasm/Cargo.lock
index b59dc6b200..bfa23a373d 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.52.0"
+version = "0.52.1"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,14 +82,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.0"
+version = "0.52.1"
 dependencies = [
  "multiversx-sc",
 ]

From 3fc34101fb85f911cde6825815431145af2a8d9e Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Wed, 31 Jul 2024 16:46:13 +0300
Subject: [PATCH 1129/1254] return new node id on insert element

---
 .../src/storage/mappers/ordered_binary_tree_mapper.rs     | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/framework/base/src/storage/mappers/ordered_binary_tree_mapper.rs b/framework/base/src/storage/mappers/ordered_binary_tree_mapper.rs
index 064e90551c..2425c59049 100644
--- a/framework/base/src/storage/mappers/ordered_binary_tree_mapper.rs
+++ b/framework/base/src/storage/mappers/ordered_binary_tree_mapper.rs
@@ -232,7 +232,7 @@ where
         opt_predecessor
     }
 
-    pub fn insert_element(&mut self, new_data: T) {
+    pub fn insert_element(&mut self, new_data: T) -> u64 {
         let new_node_id = self.get_and_increment_last_id();
         let mut new_node = OrderedBinaryTreeNode::new(new_node_id, new_data);
 
@@ -243,7 +243,7 @@ where
 
             let current_node = unsafe { opt_current_node.unwrap_unchecked() };
             if new_node.data == current_node.data {
-                return;
+                return 0u64;
             }
 
             if new_node.data < current_node.data {
@@ -266,7 +266,7 @@ where
             let root_key = self.build_root_key();
             storage_set(root_key.as_ref(), &new_node);
 
-            return;
+            return 0u64;
         }
 
         let mut new_node_parent = unsafe { opt_new_node_parent.unwrap_unchecked() };
@@ -278,6 +278,8 @@ where
 
         self.set_item(new_node_id, &new_node);
         self.set_item(new_node_parent.current_node_id, &new_node_parent);
+
+        new_node_id
     }
 
     pub fn delete_node(&mut self, data: T) {

From ad1d7994bbacbf1da0d088b19064ed79a99e7f57 Mon Sep 17 00:00:00 2001
From: Alin Cruceat <alyn_509@yahoo.com>
Date: Wed, 31 Jul 2024 18:09:05 +0300
Subject: [PATCH 1130/1254] ManagedBufferReadToEnd to ManagedBuffer

---
 .../abi-tester/abi_tester_expected_main.abi.json          | 8 ++++++--
 contracts/feature-tests/abi-tester/src/abi_tester.rs      | 5 +++--
 .../types/managed/wrapped/managed_buffer_read_to_end.rs   | 5 +++++
 3 files changed, 14 insertions(+), 4 deletions(-)

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 eb9df529d2..fd461106ee 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
@@ -394,11 +394,15 @@
             "mutability": "readonly",
             "inputs": [
                 {
-                    "name": "_arg",
+                    "name": "arg",
                     "type": "AbiWithManagedBufferReadToEnd"
                 }
             ],
-            "outputs": []
+            "outputs": [
+                {
+                    "type": "bytes"
+                }
+            ]
         },
         {
             "name": "payable_egld",
diff --git a/contracts/feature-tests/abi-tester/src/abi_tester.rs b/contracts/feature-tests/abi-tester/src/abi_tester.rs
index 58f81bccac..de54b21046 100644
--- a/contracts/feature-tests/abi-tester/src/abi_tester.rs
+++ b/contracts/feature-tests/abi-tester/src/abi_tester.rs
@@ -175,8 +175,9 @@ pub trait AbiTester {
     #[view]
     fn takes_object_with_managed_buffer_read_to_end(
         &self,
-        _arg: AbiWithManagedBufferReadToEnd<Self::Api>,
-    ) {
+        arg: AbiWithManagedBufferReadToEnd<Self::Api>,
+    ) -> ManagedBuffer {
+        arg.flush.to_managed_buffer()
     }
 
     #[endpoint]
diff --git a/framework/base/src/types/managed/wrapped/managed_buffer_read_to_end.rs b/framework/base/src/types/managed/wrapped/managed_buffer_read_to_end.rs
index fbc05b13d9..ac767ffbe4 100644
--- a/framework/base/src/types/managed/wrapped/managed_buffer_read_to_end.rs
+++ b/framework/base/src/types/managed/wrapped/managed_buffer_read_to_end.rs
@@ -18,6 +18,11 @@ impl<M: ManagedTypeApi> ManagedBufferReadToEnd<M> {
     pub fn new_from_buf(buf: ManagedBuffer<M>) -> Self {
         Self { buffer: buf }
     }
+
+    #[inline]
+    pub fn to_managed_buffer(&self) -> ManagedBuffer<M> {
+        self.buffer.clone()
+    }
 }
 
 impl<M: ManagedTypeApi> PartialEq for ManagedBufferReadToEnd<M> {

From 96ceb0e8b551085d21b5835382a3dfe23e0f68df Mon Sep 17 00:00:00 2001
From: Alin Cruceat <alyn_509@yahoo.com>
Date: Wed, 31 Jul 2024 18:23:49 +0300
Subject: [PATCH 1131/1254] regen proxy

---
 contracts/feature-tests/abi-tester/src/abi_proxy.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/contracts/feature-tests/abi-tester/src/abi_proxy.rs b/contracts/feature-tests/abi-tester/src/abi_proxy.rs
index cc62957853..c13a4a4e2d 100644
--- a/contracts/feature-tests/abi-tester/src/abi_proxy.rs
+++ b/contracts/feature-tests/abi-tester/src/abi_proxy.rs
@@ -378,12 +378,12 @@ where
         Arg0: ProxyArg<AbiWithManagedBufferReadToEnd<Env::Api>>,
     >(
         self,
-        _arg: Arg0,
-    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
+        arg: Arg0,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ManagedBuffer<Env::Api>> {
         self.wrapped_tx
             .payment(NotPayable)
             .raw_call("takes_object_with_managed_buffer_read_to_end")
-            .argument(&_arg)
+            .argument(&arg)
             .original_result()
     }
 

From e84a75568cf3796b4e0e57e0a5f2579e959a7a2d Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 1 Aug 2024 13:33:26 +0300
Subject: [PATCH 1132/1254] ManagedBufferReadToEnd to ManagedBuffer cleanup

---
 contracts/feature-tests/abi-tester/src/abi_tester.rs     | 2 +-
 .../types/managed/wrapped/managed_buffer_read_to_end.rs  | 9 +++++++--
 .../scenario/tests/managed_buffer_read_to_end_test.rs    | 9 +++++++++
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/contracts/feature-tests/abi-tester/src/abi_tester.rs b/contracts/feature-tests/abi-tester/src/abi_tester.rs
index de54b21046..f5ce735a8c 100644
--- a/contracts/feature-tests/abi-tester/src/abi_tester.rs
+++ b/contracts/feature-tests/abi-tester/src/abi_tester.rs
@@ -177,7 +177,7 @@ pub trait AbiTester {
         &self,
         arg: AbiWithManagedBufferReadToEnd<Self::Api>,
     ) -> ManagedBuffer {
-        arg.flush.to_managed_buffer()
+        arg.flush.into_managed_buffer()
     }
 
     #[endpoint]
diff --git a/framework/base/src/types/managed/wrapped/managed_buffer_read_to_end.rs b/framework/base/src/types/managed/wrapped/managed_buffer_read_to_end.rs
index ac767ffbe4..e722d9e9f6 100644
--- a/framework/base/src/types/managed/wrapped/managed_buffer_read_to_end.rs
+++ b/framework/base/src/types/managed/wrapped/managed_buffer_read_to_end.rs
@@ -20,8 +20,13 @@ impl<M: ManagedTypeApi> ManagedBufferReadToEnd<M> {
     }
 
     #[inline]
-    pub fn to_managed_buffer(&self) -> ManagedBuffer<M> {
-        self.buffer.clone()
+    pub fn as_managed_buffer(&self) -> &ManagedBuffer<M> {
+        &self.buffer
+    }
+
+    #[inline]
+    pub fn into_managed_buffer(self) -> ManagedBuffer<M> {
+        self.buffer
     }
 }
 
diff --git a/framework/scenario/tests/managed_buffer_read_to_end_test.rs b/framework/scenario/tests/managed_buffer_read_to_end_test.rs
index 0ac2d65794..fca0451d7c 100644
--- a/framework/scenario/tests/managed_buffer_read_to_end_test.rs
+++ b/framework/scenario/tests/managed_buffer_read_to_end_test.rs
@@ -40,4 +40,13 @@ fn read_to_end_codec_test() {
     let decoded: CallData<StaticApi> =
         ManagedSerializer::<StaticApi>::new().top_decode_from_managed_buffer(&encoded);
     assert_eq!(decoded, cd);
+
+    assert_eq!(
+        decoded.data.as_managed_buffer(),
+        &ManagedBuffer::from("ddd")
+    );
+    assert_eq!(
+        decoded.data.into_managed_buffer(),
+        ManagedBuffer::from("ddd")
+    );
 }

From 3faf9a6c62d03a506e6d08521ee0b15362731ec0 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 1 Aug 2024 13:37:39 +0300
Subject: [PATCH 1133/1254] sc 0.52.2

---
 CHANGELOG.md                                              | 3 +++
 contracts/benchmarks/large-storage/Cargo.toml             | 4 ++--
 contracts/benchmarks/large-storage/meta/Cargo.toml        | 2 +-
 contracts/benchmarks/large-storage/wasm/Cargo.toml        | 2 +-
 contracts/benchmarks/mappers/benchmark-common/Cargo.toml  | 4 ++--
 .../benchmarks/mappers/linked-list-repeat/Cargo.toml      | 4 ++--
 .../benchmarks/mappers/linked-list-repeat/meta/Cargo.toml | 2 +-
 .../benchmarks/mappers/linked-list-repeat/wasm/Cargo.toml | 2 +-
 contracts/benchmarks/mappers/map-repeat/Cargo.toml        | 4 ++--
 contracts/benchmarks/mappers/map-repeat/meta/Cargo.toml   | 2 +-
 contracts/benchmarks/mappers/map-repeat/wasm/Cargo.toml   | 2 +-
 contracts/benchmarks/mappers/queue-repeat/Cargo.toml      | 4 ++--
 contracts/benchmarks/mappers/queue-repeat/meta/Cargo.toml | 2 +-
 contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.toml | 2 +-
 contracts/benchmarks/mappers/set-repeat/Cargo.toml        | 4 ++--
 contracts/benchmarks/mappers/set-repeat/meta/Cargo.toml   | 2 +-
 contracts/benchmarks/mappers/set-repeat/wasm/Cargo.toml   | 2 +-
 .../benchmarks/mappers/single-value-repeat/Cargo.toml     | 4 ++--
 .../mappers/single-value-repeat/meta/Cargo.toml           | 2 +-
 .../mappers/single-value-repeat/wasm/Cargo.toml           | 2 +-
 contracts/benchmarks/mappers/vec-repeat/Cargo.toml        | 4 ++--
 contracts/benchmarks/mappers/vec-repeat/meta/Cargo.toml   | 2 +-
 contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.toml   | 2 +-
 contracts/benchmarks/send-tx-repeat/Cargo.toml            | 4 ++--
 contracts/benchmarks/send-tx-repeat/meta/Cargo.toml       | 2 +-
 contracts/benchmarks/send-tx-repeat/wasm/Cargo.toml       | 2 +-
 contracts/benchmarks/str-repeat/Cargo.toml                | 4 ++--
 contracts/benchmarks/str-repeat/meta/Cargo.toml           | 2 +-
 .../wasm-str-repeat-mb-builder-basic/Cargo.toml           | 2 +-
 .../wasm-str-repeat-mb-builder-cached/Cargo.toml          | 2 +-
 contracts/benchmarks/str-repeat/wasm/Cargo.toml           | 2 +-
 contracts/core/price-aggregator/Cargo.toml                | 8 ++++----
 contracts/core/price-aggregator/meta/Cargo.toml           | 4 ++--
 contracts/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 +-
 contracts/examples/bonding-curve-contract/Cargo.toml      | 6 +++---
 contracts/examples/bonding-curve-contract/meta/Cargo.toml | 2 +-
 contracts/examples/bonding-curve-contract/wasm/Cargo.toml | 2 +-
 contracts/examples/check-pause/Cargo.toml                 | 6 +++---
 contracts/examples/check-pause/meta/Cargo.toml            | 2 +-
 contracts/examples/check-pause/wasm/Cargo.toml            | 2 +-
 contracts/examples/crowdfunding-esdt/Cargo.toml           | 4 ++--
 contracts/examples/crowdfunding-esdt/meta/Cargo.toml      | 2 +-
 contracts/examples/crowdfunding-esdt/wasm/Cargo.toml      | 2 +-
 contracts/examples/crypto-bubbles/Cargo.toml              | 4 ++--
 contracts/examples/crypto-bubbles/meta/Cargo.toml         | 2 +-
 contracts/examples/crypto-bubbles/wasm/Cargo.toml         | 2 +-
 contracts/examples/crypto-kitties/common/kitty/Cargo.toml | 2 +-
 .../examples/crypto-kitties/common/random/Cargo.toml      | 2 +-
 .../examples/crypto-kitties/kitty-auction/Cargo.toml      | 4 ++--
 .../examples/crypto-kitties/kitty-auction/meta/Cargo.toml | 2 +-
 .../examples/crypto-kitties/kitty-auction/wasm/Cargo.toml | 2 +-
 .../examples/crypto-kitties/kitty-genetic-alg/Cargo.toml  | 4 ++--
 .../crypto-kitties/kitty-genetic-alg/meta/Cargo.toml      | 2 +-
 .../crypto-kitties/kitty-genetic-alg/wasm/Cargo.toml      | 2 +-
 .../examples/crypto-kitties/kitty-ownership/Cargo.toml    | 4 ++--
 .../crypto-kitties/kitty-ownership/meta/Cargo.toml        | 2 +-
 .../crypto-kitties/kitty-ownership/wasm/Cargo.toml        | 2 +-
 contracts/examples/crypto-zombies/Cargo.toml              | 4 ++--
 contracts/examples/crypto-zombies/meta/Cargo.toml         | 2 +-
 contracts/examples/crypto-zombies/wasm/Cargo.toml         | 2 +-
 contracts/examples/digital-cash/Cargo.toml                | 4 ++--
 contracts/examples/digital-cash/meta/Cargo.toml           | 2 +-
 contracts/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 +-
 contracts/examples/esdt-transfer-with-fee/Cargo.toml      | 4 ++--
 contracts/examples/esdt-transfer-with-fee/meta/Cargo.toml | 2 +-
 contracts/examples/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 +++---
 contracts/examples/fractional-nfts/meta/Cargo.toml        | 2 +-
 contracts/examples/fractional-nfts/wasm/Cargo.toml        | 2 +-
 contracts/examples/lottery-esdt/Cargo.toml                | 4 ++--
 contracts/examples/lottery-esdt/meta/Cargo.toml           | 2 +-
 contracts/examples/lottery-esdt/wasm/Cargo.toml           | 2 +-
 contracts/examples/multisig/Cargo.toml                    | 8 ++++----
 contracts/examples/multisig/interact/Cargo.toml           | 8 ++++----
 contracts/examples/multisig/meta/Cargo.toml               | 2 +-
 contracts/examples/multisig/wasm-multisig-full/Cargo.toml | 2 +-
 contracts/examples/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 +-
 contracts/examples/nft-storage-prepay/Cargo.toml          | 4 ++--
 contracts/examples/nft-storage-prepay/meta/Cargo.toml     | 2 +-
 contracts/examples/nft-storage-prepay/wasm/Cargo.toml     | 2 +-
 contracts/examples/nft-subscription/Cargo.toml            | 6 +++---
 contracts/examples/nft-subscription/meta/Cargo.toml       | 2 +-
 contracts/examples/nft-subscription/wasm/Cargo.toml       | 2 +-
 contracts/examples/order-book/factory/Cargo.toml          | 4 ++--
 contracts/examples/order-book/factory/meta/Cargo.toml     | 2 +-
 contracts/examples/order-book/factory/wasm/Cargo.toml     | 2 +-
 contracts/examples/order-book/pair/Cargo.toml             | 4 ++--
 contracts/examples/order-book/pair/meta/Cargo.toml        | 2 +-
 contracts/examples/order-book/pair/wasm/Cargo.toml        | 2 +-
 contracts/examples/ping-pong-egld/Cargo.toml              | 4 ++--
 contracts/examples/ping-pong-egld/meta/Cargo.toml         | 2 +-
 contracts/examples/ping-pong-egld/wasm/Cargo.toml         | 2 +-
 contracts/examples/proxy-pause/Cargo.toml                 | 4 ++--
 contracts/examples/proxy-pause/meta/Cargo.toml            | 2 +-
 contracts/examples/proxy-pause/wasm/Cargo.toml            | 2 +-
 contracts/examples/rewards-distribution/Cargo.toml        | 6 +++---
 contracts/examples/rewards-distribution/meta/Cargo.toml   | 2 +-
 contracts/examples/rewards-distribution/wasm/Cargo.toml   | 2 +-
 contracts/examples/seed-nft-minter/Cargo.toml             | 6 +++---
 contracts/examples/seed-nft-minter/meta/Cargo.toml        | 2 +-
 contracts/examples/seed-nft-minter/wasm/Cargo.toml        | 2 +-
 contracts/examples/token-release/Cargo.toml               | 4 ++--
 contracts/examples/token-release/meta/Cargo.toml          | 2 +-
 contracts/examples/token-release/wasm/Cargo.toml          | 2 +-
 contracts/feature-tests/abi-tester/Cargo.toml             | 6 +++---
 .../abi-tester/abi_tester_expected_main.abi.json          | 2 +-
 .../abi-tester/abi_tester_expected_view.abi.json          | 2 +-
 contracts/feature-tests/abi-tester/meta/Cargo.toml        | 2 +-
 .../abi-tester/wasm-abi-tester-ev/Cargo.toml              | 2 +-
 contracts/feature-tests/abi-tester/wasm/Cargo.toml        | 2 +-
 contracts/feature-tests/alloc-features/Cargo.toml         | 4 ++--
 contracts/feature-tests/alloc-features/meta/Cargo.toml    | 2 +-
 .../alloc-features/wasm-alloc-mem-fail/Cargo.toml         | 2 +-
 .../alloc-features/wasm-alloc-mem-leaking/Cargo.toml      | 2 +-
 contracts/feature-tests/alloc-features/wasm/Cargo.toml    | 2 +-
 contracts/feature-tests/basic-features/Cargo.toml         | 6 +++---
 .../feature-tests/basic-features/interact/Cargo.toml      | 2 +-
 contracts/feature-tests/basic-features/meta/Cargo.toml    | 2 +-
 .../wasm-basic-features-storage-bytes/Cargo.toml          | 2 +-
 contracts/feature-tests/basic-features/wasm/Cargo.toml    | 2 +-
 contracts/feature-tests/big-float-features/Cargo.toml     | 4 ++--
 .../feature-tests/big-float-features/meta/Cargo.toml      | 2 +-
 .../feature-tests/big-float-features/wasm/Cargo.toml      | 2 +-
 contracts/feature-tests/composability/Cargo.toml          | 4 ++--
 .../composability/builtin-func-features/Cargo.toml        | 4 ++--
 .../composability/builtin-func-features/meta/Cargo.toml   | 2 +-
 .../composability/builtin-func-features/wasm/Cargo.toml   | 2 +-
 .../composability/esdt-contract-pair/Cargo.toml           | 4 ++--
 .../esdt-contract-pair/first-contract/Cargo.toml          | 4 ++--
 .../esdt-contract-pair/first-contract/meta/Cargo.toml     | 4 ++--
 .../esdt-contract-pair/first-contract/wasm/Cargo.toml     | 2 +-
 .../esdt-contract-pair/second-contract/Cargo.toml         | 4 ++--
 .../esdt-contract-pair/second-contract/meta/Cargo.toml    | 4 ++--
 .../esdt-contract-pair/second-contract/wasm/Cargo.toml    | 2 +-
 .../execute-on-dest-esdt-issue-callback/Cargo.toml        | 4 ++--
 .../execute-on-dest-esdt-issue-callback/child/Cargo.toml  | 4 ++--
 .../child/meta/Cargo.toml                                 | 4 ++--
 .../child/wasm/Cargo.toml                                 | 2 +-
 .../execute-on-dest-esdt-issue-callback/parent/Cargo.toml | 4 ++--
 .../parent/meta/Cargo.toml                                | 4 ++--
 .../parent/wasm/Cargo.toml                                | 2 +-
 .../composability/forwarder-legacy/Cargo.toml             | 4 ++--
 .../composability/forwarder-legacy/meta/Cargo.toml        | 2 +-
 .../composability/forwarder-legacy/wasm/Cargo.toml        | 2 +-
 .../composability/forwarder-queue/Cargo.toml              | 6 +++---
 .../composability/forwarder-queue/meta/Cargo.toml         | 2 +-
 .../wasm-forwarder-queue-promises/Cargo.toml              | 2 +-
 .../composability/forwarder-queue/wasm/Cargo.toml         | 2 +-
 .../feature-tests/composability/forwarder-raw/Cargo.toml  | 4 ++--
 .../composability/forwarder-raw/meta/Cargo.toml           | 2 +-
 .../wasm-forwarder-raw-init-async-call/Cargo.toml         | 2 +-
 .../wasm-forwarder-raw-init-sync-call/Cargo.toml          | 2 +-
 .../composability/forwarder-raw/wasm/Cargo.toml           | 2 +-
 .../feature-tests/composability/forwarder/Cargo.toml      | 4 ++--
 .../feature-tests/composability/forwarder/meta/Cargo.toml | 2 +-
 .../feature-tests/composability/forwarder/wasm/Cargo.toml | 2 +-
 contracts/feature-tests/composability/interact/Cargo.toml | 4 ++--
 .../composability/local-esdt-and-nft/Cargo.toml           | 4 ++--
 .../composability/local-esdt-and-nft/meta/Cargo.toml      | 2 +-
 .../composability/local-esdt-and-nft/wasm/Cargo.toml      | 2 +-
 .../composability/promises-features/Cargo.toml            | 2 +-
 .../composability/promises-features/meta/Cargo.toml       | 2 +-
 .../composability/promises-features/wasm/Cargo.toml       | 2 +-
 .../composability/proxy-test-first/Cargo.toml             | 4 ++--
 .../composability/proxy-test-first/meta/Cargo.toml        | 2 +-
 .../composability/proxy-test-first/wasm/Cargo.toml        | 2 +-
 .../composability/proxy-test-second/Cargo.toml            | 4 ++--
 .../composability/proxy-test-second/meta/Cargo.toml       | 2 +-
 .../composability/proxy-test-second/wasm/Cargo.toml       | 2 +-
 .../composability/recursive-caller/Cargo.toml             | 4 ++--
 .../composability/recursive-caller/meta/Cargo.toml        | 2 +-
 .../composability/recursive-caller/wasm/Cargo.toml        | 2 +-
 .../composability/transfer-role-features/Cargo.toml       | 6 +++---
 .../composability/transfer-role-features/meta/Cargo.toml  | 2 +-
 .../composability/transfer-role-features/wasm/Cargo.toml  | 2 +-
 contracts/feature-tests/composability/vault/Cargo.toml    | 4 ++--
 .../feature-tests/composability/vault/meta/Cargo.toml     | 2 +-
 .../composability/vault/wasm-vault-promises/Cargo.toml    | 2 +-
 .../composability/vault/wasm-vault-upgrade/Cargo.toml     | 2 +-
 .../feature-tests/composability/vault/wasm/Cargo.toml     | 2 +-
 .../erc-style-contracts/crowdfunding-erc20/Cargo.toml     | 4 ++--
 .../crowdfunding-erc20/meta/Cargo.toml                    | 2 +-
 .../crowdfunding-erc20/wasm/Cargo.toml                    | 2 +-
 .../erc-style-contracts/erc1155-marketplace/Cargo.toml    | 4 ++--
 .../erc1155-marketplace/meta/Cargo.toml                   | 2 +-
 .../erc1155-marketplace/wasm/Cargo.toml                   | 2 +-
 .../erc-style-contracts/erc1155-user-mock/Cargo.toml      | 4 ++--
 .../erc-style-contracts/erc1155-user-mock/meta/Cargo.toml | 2 +-
 .../erc-style-contracts/erc1155-user-mock/wasm/Cargo.toml | 2 +-
 .../feature-tests/erc-style-contracts/erc1155/Cargo.toml  | 4 ++--
 .../erc-style-contracts/erc1155/meta/Cargo.toml           | 2 +-
 .../erc-style-contracts/erc1155/wasm/Cargo.toml           | 2 +-
 .../feature-tests/erc-style-contracts/erc20/Cargo.toml    | 4 ++--
 .../erc-style-contracts/erc20/meta/Cargo.toml             | 2 +-
 .../erc-style-contracts/erc20/wasm/Cargo.toml             | 2 +-
 .../feature-tests/erc-style-contracts/erc721/Cargo.toml   | 4 ++--
 .../erc-style-contracts/erc721/meta/Cargo.toml            | 2 +-
 .../erc-style-contracts/erc721/wasm/Cargo.toml            | 2 +-
 .../erc-style-contracts/lottery-erc20/Cargo.toml          | 4 ++--
 .../erc-style-contracts/lottery-erc20/meta/Cargo.toml     | 2 +-
 .../erc-style-contracts/lottery-erc20/wasm/Cargo.toml     | 2 +-
 contracts/feature-tests/esdt-system-sc-mock/Cargo.toml    | 4 ++--
 .../feature-tests/esdt-system-sc-mock/meta/Cargo.toml     | 2 +-
 .../feature-tests/esdt-system-sc-mock/wasm/Cargo.toml     | 2 +-
 contracts/feature-tests/exchange-features/Cargo.toml      | 4 ++--
 contracts/feature-tests/exchange-features/meta/Cargo.toml | 2 +-
 contracts/feature-tests/exchange-features/wasm/Cargo.toml | 2 +-
 .../feature-tests/formatted-message-features/Cargo.toml   | 4 ++--
 .../formatted-message-features/meta/Cargo.toml            | 2 +-
 .../formatted-message-features/wasm/Cargo.toml            | 2 +-
 contracts/feature-tests/managed-map-features/Cargo.toml   | 4 ++--
 .../feature-tests/managed-map-features/meta/Cargo.toml    | 2 +-
 .../feature-tests/managed-map-features/wasm/Cargo.toml    | 2 +-
 .../feature-tests/multi-contract-features/Cargo.toml      | 4 ++--
 .../feature-tests/multi-contract-features/meta/Cargo.toml | 2 +-
 .../wasm-multi-contract-alt-impl/Cargo.toml               | 2 +-
 .../wasm-multi-contract-example-feature/Cargo.toml        | 2 +-
 .../wasm-multi-contract-features-view/Cargo.toml          | 2 +-
 .../feature-tests/multi-contract-features/wasm/Cargo.toml | 2 +-
 contracts/feature-tests/panic-message-features/Cargo.toml | 4 ++--
 .../feature-tests/panic-message-features/meta/Cargo.toml  | 2 +-
 .../feature-tests/panic-message-features/wasm/Cargo.toml  | 2 +-
 contracts/feature-tests/payable-features/Cargo.toml       | 4 ++--
 contracts/feature-tests/payable-features/meta/Cargo.toml  | 2 +-
 contracts/feature-tests/payable-features/wasm/Cargo.toml  | 2 +-
 .../feature-tests/rust-snippets-generator-test/Cargo.toml | 4 ++--
 .../rust-snippets-generator-test/interact-rs/Cargo.toml   | 2 +-
 .../rust-snippets-generator-test/meta/Cargo.toml          | 2 +-
 .../feature-tests/rust-snippets-generator-test/src/lib.rs | 2 +-
 .../rust-snippets-generator-test/wasm/Cargo.toml          | 2 +-
 .../rust-testing-framework-tester/Cargo.toml              | 4 ++--
 .../rust-testing-framework-tester/meta/Cargo.toml         | 2 +-
 .../rust-testing-framework-tester/wasm/Cargo.toml         | 2 +-
 contracts/feature-tests/scenario-tester/Cargo.toml        | 4 ++--
 contracts/feature-tests/scenario-tester/meta/Cargo.toml   | 2 +-
 contracts/feature-tests/scenario-tester/wasm/Cargo.toml   | 2 +-
 contracts/feature-tests/use-module/Cargo.toml             | 8 ++++----
 contracts/feature-tests/use-module/meta/Cargo.toml        | 2 +-
 .../use-module/use_module_expected_main.abi.json          | 2 +-
 .../use-module/use_module_expected_view.abi.json          | 2 +-
 .../use-module/wasm-use-module-view/Cargo.toml            | 2 +-
 contracts/feature-tests/use-module/wasm/Cargo.toml        | 2 +-
 contracts/modules/Cargo.toml                              | 4 ++--
 framework/base/Cargo.toml                                 | 4 ++--
 framework/derive/Cargo.toml                               | 2 +-
 framework/meta-lib/Cargo.toml                             | 4 ++--
 framework/meta-lib/src/version_history.rs                 | 5 +++--
 framework/meta/Cargo.toml                                 | 8 ++++----
 framework/scenario/Cargo.toml                             | 6 +++---
 framework/snippets/Cargo.toml                             | 4 ++--
 framework/wasm-adapter/Cargo.toml                         | 4 ++--
 tools/mxpy-snippet-generator/Cargo.toml                   | 2 +-
 tools/plotter/Cargo.toml                                  | 4 ++--
 tools/rust-debugger/format-tests/Cargo.toml               | 4 ++--
 271 files changed, 393 insertions(+), 389 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fdd5fca4df..82b9c17761 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -28,6 +28,9 @@ They are:
 - `multiversx-sdk`, in short `sdk`, allows communication with the chain(s), 1 crate.
 
 
+## [sc 0.52.2] - 2024-08-01
+- `ManagedBufferReadToEnd` extract data methods.
+
 ## [sc 0.52.1] - 2024-07-31
 - `ManagedBufferReadToEnd` `TypeAbi` implementation.
 
diff --git a/contracts/benchmarks/large-storage/Cargo.toml b/contracts/benchmarks/large-storage/Cargo.toml
index a551092b1c..54e0d3cb9d 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.52.1"
+version = "0.52.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../framework/scenario"
diff --git a/contracts/benchmarks/large-storage/meta/Cargo.toml b/contracts/benchmarks/large-storage/meta/Cargo.toml
index 1ff58f414a..538f11b829 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-lib]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/benchmarks/large-storage/wasm/Cargo.toml b/contracts/benchmarks/large-storage/wasm/Cargo.toml
index 556c0358e1..5945a304a9 100644
--- a/contracts/benchmarks/large-storage/wasm/Cargo.toml
+++ b/contracts/benchmarks/large-storage/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/mappers/benchmark-common/Cargo.toml b/contracts/benchmarks/mappers/benchmark-common/Cargo.toml
index 96b3f9973a..8122000aeb 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.52.1"
+version = "0.52.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../framework/scenario"
diff --git a/contracts/benchmarks/mappers/linked-list-repeat/Cargo.toml b/contracts/benchmarks/mappers/linked-list-repeat/Cargo.toml
index e3f9bfc130..959b92b9a6 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.52.1"
+version = "0.52.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.1"
+version = "0.52.2"
 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 ae06dcb955..7f860546fc 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-lib]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../../framework/meta-lib"
 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 ad487a47e5..e483b43680 100644
--- a/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/mappers/map-repeat/Cargo.toml b/contracts/benchmarks/mappers/map-repeat/Cargo.toml
index 8f8a46287d..d703898641 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.52.1"
+version = "0.52.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../framework/scenario"
diff --git a/contracts/benchmarks/mappers/map-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/map-repeat/meta/Cargo.toml
index 7db1b7a45d..b517c7848a 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-lib]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.toml b/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.toml
index c60c1f529f..5e6b5fe2ca 100644
--- a/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/mappers/queue-repeat/Cargo.toml b/contracts/benchmarks/mappers/queue-repeat/Cargo.toml
index ee8e9b007e..98d6ec4454 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.52.1"
+version = "0.52.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../framework/scenario"
diff --git a/contracts/benchmarks/mappers/queue-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/queue-repeat/meta/Cargo.toml
index 904ddf183c..5e40a7533f 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-lib]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.toml b/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.toml
index 166abb2958..f515ac1024 100644
--- a/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/mappers/set-repeat/Cargo.toml b/contracts/benchmarks/mappers/set-repeat/Cargo.toml
index 72f2bc6958..b998ba445f 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.52.1"
+version = "0.52.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../framework/scenario"
diff --git a/contracts/benchmarks/mappers/set-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/set-repeat/meta/Cargo.toml
index 25d4d4dc83..cb1fa0daed 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-lib]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.toml b/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.toml
index 0a6cf17843..243dee6072 100644
--- a/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.1"
+version = "0.52.2"
 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 897f0413a8..9b08be171c 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.52.1"
+version = "0.52.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.1"
+version = "0.52.2"
 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 17d4837336..2a38c75248 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-lib]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../../framework/meta-lib"
 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 9a4f85428d..634ac1eae9 100644
--- a/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/mappers/vec-repeat/Cargo.toml b/contracts/benchmarks/mappers/vec-repeat/Cargo.toml
index 2368b7ca78..c014a7ad6c 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.52.1"
+version = "0.52.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../framework/scenario"
diff --git a/contracts/benchmarks/mappers/vec-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/vec-repeat/meta/Cargo.toml
index e40208c341..ca4eda8179 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-lib]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.toml b/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.toml
index 70adcea690..3c3b673bb4 100644
--- a/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/send-tx-repeat/Cargo.toml b/contracts/benchmarks/send-tx-repeat/Cargo.toml
index 5ec5e3d447..f6babc000e 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.52.1"
+version = "0.52.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../framework/scenario"
diff --git a/contracts/benchmarks/send-tx-repeat/meta/Cargo.toml b/contracts/benchmarks/send-tx-repeat/meta/Cargo.toml
index 6746ead5fc..6f1ddb62cf 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-lib]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/benchmarks/send-tx-repeat/wasm/Cargo.toml b/contracts/benchmarks/send-tx-repeat/wasm/Cargo.toml
index c4dd91f8b6..5b3d2423fb 100644
--- a/contracts/benchmarks/send-tx-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/send-tx-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/str-repeat/Cargo.toml b/contracts/benchmarks/str-repeat/Cargo.toml
index ead63134c0..45d31a551f 100644
--- a/contracts/benchmarks/str-repeat/Cargo.toml
+++ b/contracts/benchmarks/str-repeat/Cargo.toml
@@ -12,10 +12,10 @@ path = "src/str_repeat.rs"
 managed-buffer-builder-cached = ["multiversx-sc/managed-buffer-builder-cached"]
 
 [dependencies.multiversx-sc]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../framework/scenario"
diff --git a/contracts/benchmarks/str-repeat/meta/Cargo.toml b/contracts/benchmarks/str-repeat/meta/Cargo.toml
index 18d6240e1d..2be7ced557 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-lib]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.toml b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.toml
index 93c5549f8c..1b43410721 100644
--- a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.toml
+++ b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.toml b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.toml
index f73fcb4359..47406bde77 100644
--- a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.toml
+++ b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.toml
@@ -29,7 +29,7 @@ path = ".."
 features = ["managed-buffer-builder-cached"]
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/str-repeat/wasm/Cargo.toml b/contracts/benchmarks/str-repeat/wasm/Cargo.toml
index 7039e5fdbc..4b7518e883 100644
--- a/contracts/benchmarks/str-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/str-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/core/price-aggregator/Cargo.toml b/contracts/core/price-aggregator/Cargo.toml
index 06106c22b2..6bf4650d12 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.52.1"
+version = "0.52.2"
 authors = [
     "Claudiu-Marcel Bruda <claudiu.bruda@multiversx.com>",
     "MultiversX <contact@multiversx.com>",
@@ -19,15 +19,15 @@ edition = "2021"
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../framework/scenario"
 
 [dependencies]
diff --git a/contracts/core/price-aggregator/meta/Cargo.toml b/contracts/core/price-aggregator/meta/Cargo.toml
index fc2a8476e4..f85406d220 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.52.1"
+version = "0.52.2"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-meta-lib]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/core/price-aggregator/wasm/Cargo.toml b/contracts/core/price-aggregator/wasm/Cargo.toml
index e21c844e02..3c0d8b1a32 100644
--- a/contracts/core/price-aggregator/wasm/Cargo.toml
+++ b/contracts/core/price-aggregator/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/core/wegld-swap/Cargo.toml b/contracts/core/wegld-swap/Cargo.toml
index 56419a8d1a..ce3bf4776e 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.52.1"
+version = "0.52.2"
 
 authors = [
     "Dorin Iancu <dorin.iancu@multiversx.com>",
@@ -20,13 +20,13 @@ edition = "2021"
 path = "src/wegld.rs"
 
 [dependencies.multiversx-sc]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../framework/scenario"
diff --git a/contracts/core/wegld-swap/meta/Cargo.toml b/contracts/core/wegld-swap/meta/Cargo.toml
index 6aa6dcf0b5..b5515c7129 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.52.1"
+version = "0.52.2"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-meta-lib]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/core/wegld-swap/wasm/Cargo.toml b/contracts/core/wegld-swap/wasm/Cargo.toml
index 3a706f9a2b..a968d4df3c 100644
--- a/contracts/core/wegld-swap/wasm/Cargo.toml
+++ b/contracts/core/wegld-swap/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/adder/Cargo.toml b/contracts/examples/adder/Cargo.toml
index 84218b9080..11d4f8013a 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.52.1"
+version = "0.52.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/adder/interact/Cargo.toml b/contracts/examples/adder/interact/Cargo.toml
index c7d9e183e7..ea6555785c 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.52.1"
+version = "0.52.2"
 path = "../../../../framework/snippets"
diff --git a/contracts/examples/adder/meta/Cargo.toml b/contracts/examples/adder/meta/Cargo.toml
index 4240e1d6dc..1ffc2bff90 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-lib]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/adder/wasm/Cargo.toml b/contracts/examples/adder/wasm/Cargo.toml
index fe50147b0e..89583f1aa9 100644
--- a/contracts/examples/adder/wasm/Cargo.toml
+++ b/contracts/examples/adder/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/bonding-curve-contract/Cargo.toml b/contracts/examples/bonding-curve-contract/Cargo.toml
index 2669028063..5ca78102c9 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.52.1"
+version = "0.52.2"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../framework/scenario"
 
diff --git a/contracts/examples/bonding-curve-contract/meta/Cargo.toml b/contracts/examples/bonding-curve-contract/meta/Cargo.toml
index fb5f4a2130..8ef0ee29d9 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-lib]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/bonding-curve-contract/wasm/Cargo.toml b/contracts/examples/bonding-curve-contract/wasm/Cargo.toml
index 7dfa4f968a..e5e31daba4 100644
--- a/contracts/examples/bonding-curve-contract/wasm/Cargo.toml
+++ b/contracts/examples/bonding-curve-contract/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/check-pause/Cargo.toml b/contracts/examples/check-pause/Cargo.toml
index 527ef6e4dc..ef312bb3d3 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.52.1"
+version = "0.52.2"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../framework/scenario"
 
diff --git a/contracts/examples/check-pause/meta/Cargo.toml b/contracts/examples/check-pause/meta/Cargo.toml
index d3e92ba3bb..62e573697d 100644
--- a/contracts/examples/check-pause/meta/Cargo.toml
+++ b/contracts/examples/check-pause/meta/Cargo.toml
@@ -9,6 +9,6 @@ authors = ["Alin Cruceat <alin.cruceat@multiversx.com>"]
 path = ".."
 
 [dependencies.multiversx-sc-meta-lib]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/check-pause/wasm/Cargo.toml b/contracts/examples/check-pause/wasm/Cargo.toml
index 5538dcdbf7..3680800096 100644
--- a/contracts/examples/check-pause/wasm/Cargo.toml
+++ b/contracts/examples/check-pause/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/crowdfunding-esdt/Cargo.toml b/contracts/examples/crowdfunding-esdt/Cargo.toml
index 1f45351c34..6b5ba09dd6 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.52.1"
+version = "0.52.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../framework/scenario"
 
 [dev-dependencies]
diff --git a/contracts/examples/crowdfunding-esdt/meta/Cargo.toml b/contracts/examples/crowdfunding-esdt/meta/Cargo.toml
index 1174c5bc91..469288cf47 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-lib]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/crowdfunding-esdt/wasm/Cargo.toml b/contracts/examples/crowdfunding-esdt/wasm/Cargo.toml
index a2523105b5..a67bd898da 100644
--- a/contracts/examples/crowdfunding-esdt/wasm/Cargo.toml
+++ b/contracts/examples/crowdfunding-esdt/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/crypto-bubbles/Cargo.toml b/contracts/examples/crypto-bubbles/Cargo.toml
index 2ebf8d1cd3..9cbaa8c100 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.52.1"
+version = "0.52.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/crypto-bubbles/meta/Cargo.toml b/contracts/examples/crypto-bubbles/meta/Cargo.toml
index 603486d1a0..b39b32a121 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-lib]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/crypto-bubbles/wasm/Cargo.toml b/contracts/examples/crypto-bubbles/wasm/Cargo.toml
index 5da98812c1..afc726cd13 100644
--- a/contracts/examples/crypto-bubbles/wasm/Cargo.toml
+++ b/contracts/examples/crypto-bubbles/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.1"
+version = "0.52.2"
 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 90a54826ad..581313f154 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.52.1"
+version = "0.52.2"
 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 75599b8d20..a80a82d007 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.52.1"
+version = "0.52.2"
 path = "../../../../../framework/base"
diff --git a/contracts/examples/crypto-kitties/kitty-auction/Cargo.toml b/contracts/examples/crypto-kitties/kitty-auction/Cargo.toml
index a3b9ee4248..63770d9786 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.52.1"
+version = "0.52.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.1"
+version = "0.52.2"
 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 5a3de3ed81..70a7521d89 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-lib]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../../framework/meta-lib"
 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 9ae6205ce9..1c54bbe392 100644
--- a/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.toml
+++ b/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.1"
+version = "0.52.2"
 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 853bf67f79..f538fb7308 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.52.1"
+version = "0.52.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.1"
+version = "0.52.2"
 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 1bc76b796e..49fb4f4abe 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-lib]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../../framework/meta-lib"
 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 4d7b9e5d10..18a1d48309 100644
--- a/contracts/examples/crypto-kitties/kitty-genetic-alg/wasm/Cargo.toml
+++ b/contracts/examples/crypto-kitties/kitty-genetic-alg/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.1"
+version = "0.52.2"
 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 539b7fcf5a..8643b0db9c 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.52.1"
+version = "0.52.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.1"
+version = "0.52.2"
 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 0de6a0b88d..7d0fcf0f34 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-lib]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../../framework/meta-lib"
 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 7d6defc5b6..26cfce32e2 100644
--- a/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.toml
+++ b/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/crypto-zombies/Cargo.toml b/contracts/examples/crypto-zombies/Cargo.toml
index 543d2a300a..7a3cc6eb17 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.52.1"
+version = "0.52.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/crypto-zombies/meta/Cargo.toml b/contracts/examples/crypto-zombies/meta/Cargo.toml
index 189f74a8ae..8b4fda4451 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-lib]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/crypto-zombies/wasm/Cargo.toml b/contracts/examples/crypto-zombies/wasm/Cargo.toml
index dec5d4a38b..3bf05b30af 100644
--- a/contracts/examples/crypto-zombies/wasm/Cargo.toml
+++ b/contracts/examples/crypto-zombies/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/digital-cash/Cargo.toml b/contracts/examples/digital-cash/Cargo.toml
index a7905eb7c4..ca69bc0a9e 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.52.1"
+version = "0.52.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/digital-cash/meta/Cargo.toml b/contracts/examples/digital-cash/meta/Cargo.toml
index c4898cde06..4f9a5ddc6f 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-lib]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/digital-cash/wasm/Cargo.toml b/contracts/examples/digital-cash/wasm/Cargo.toml
index bf5f0240a8..6738ec1176 100644
--- a/contracts/examples/digital-cash/wasm/Cargo.toml
+++ b/contracts/examples/digital-cash/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/empty/Cargo.toml b/contracts/examples/empty/Cargo.toml
index 3a1e812aab..7bff0b67f7 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.52.1"
+version = "0.52.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../framework/scenario"
 
 [dev-dependencies]
diff --git a/contracts/examples/empty/meta/Cargo.toml b/contracts/examples/empty/meta/Cargo.toml
index 9b7b91bac5..2c8d517f01 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-lib]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/empty/wasm/Cargo.toml b/contracts/examples/empty/wasm/Cargo.toml
index fbfe00ac26..56cdf9b66a 100644
--- a/contracts/examples/empty/wasm/Cargo.toml
+++ b/contracts/examples/empty/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.1"
+version = "0.52.2"
 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 fb8c592377..30a44358e0 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.52.1"
+version = "0.52.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.1"
+version = "0.52.2"
 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 5dcff99072..6cb236231f 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-lib]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../framework/meta-lib"
 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 8ba6c588d2..a5689a93e0 100644
--- a/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.toml
+++ b/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/factorial/Cargo.toml b/contracts/examples/factorial/Cargo.toml
index a395a66b5b..19b9d57831 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.52.1"
+version = "0.52.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/factorial/meta/Cargo.toml b/contracts/examples/factorial/meta/Cargo.toml
index 0b28c3970c..a845e0c02c 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-lib]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/factorial/wasm/Cargo.toml b/contracts/examples/factorial/wasm/Cargo.toml
index c7da76377f..9ba8e26326 100644
--- a/contracts/examples/factorial/wasm/Cargo.toml
+++ b/contracts/examples/factorial/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/fractional-nfts/Cargo.toml b/contracts/examples/fractional-nfts/Cargo.toml
index 012bdced15..add4cbba30 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.52.1"
+version = "0.52.2"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/fractional-nfts/meta/Cargo.toml b/contracts/examples/fractional-nfts/meta/Cargo.toml
index 8438f7339b..2cafe6a873 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-lib]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/fractional-nfts/wasm/Cargo.toml b/contracts/examples/fractional-nfts/wasm/Cargo.toml
index a0fdb6782f..b324cf1275 100644
--- a/contracts/examples/fractional-nfts/wasm/Cargo.toml
+++ b/contracts/examples/fractional-nfts/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/lottery-esdt/Cargo.toml b/contracts/examples/lottery-esdt/Cargo.toml
index 9054366a9c..4b2940da48 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.52.1"
+version = "0.52.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/lottery-esdt/meta/Cargo.toml b/contracts/examples/lottery-esdt/meta/Cargo.toml
index 28ba515da3..f705e15855 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-lib]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/lottery-esdt/wasm/Cargo.toml b/contracts/examples/lottery-esdt/wasm/Cargo.toml
index 5b300ddc15..4aa2621048 100644
--- a/contracts/examples/lottery-esdt/wasm/Cargo.toml
+++ b/contracts/examples/lottery-esdt/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/multisig/Cargo.toml b/contracts/examples/multisig/Cargo.toml
index 63e26c21f5..8a34f15882 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.52.1"
+version = "0.52.2"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../framework/scenario"
 
 [dev-dependencies.adder]
@@ -27,7 +27,7 @@ path = "../adder"
 path = "../factorial"
 
 [dev-dependencies.multiversx-wegld-swap-sc]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../core/wegld-swap"
 
 [dev-dependencies]
diff --git a/contracts/examples/multisig/interact/Cargo.toml b/contracts/examples/multisig/interact/Cargo.toml
index dc2d290adf..463441fa67 100644
--- a/contracts/examples/multisig/interact/Cargo.toml
+++ b/contracts/examples/multisig/interact/Cargo.toml
@@ -18,17 +18,17 @@ toml = "0.8.6"
 path = ".."
 
 [dependencies.multiversx-sc-modules]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../contracts/modules"
 
 [dependencies.multiversx-sc-snippets]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../framework/snippets"
 
 [dependencies.multiversx-sc-scenario]
-version = "=0.52.1"
+version = "=0.52.2"
 path = "../../../../framework/scenario"
 
 [dependencies.multiversx-sc]
-version = "=0.52.1"
+version = "=0.52.2"
 path = "../../../../framework/base"
diff --git a/contracts/examples/multisig/meta/Cargo.toml b/contracts/examples/multisig/meta/Cargo.toml
index f1b5d506c2..7948efaeb1 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-lib]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/multisig/wasm-multisig-full/Cargo.toml b/contracts/examples/multisig/wasm-multisig-full/Cargo.toml
index 050915f2b8..708a316940 100644
--- a/contracts/examples/multisig/wasm-multisig-full/Cargo.toml
+++ b/contracts/examples/multisig/wasm-multisig-full/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.1"
+version = "0.52.2"
 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 f55430f6f5..be797fe883 100644
--- a/contracts/examples/multisig/wasm-multisig-view/Cargo.toml
+++ b/contracts/examples/multisig/wasm-multisig-view/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/multisig/wasm/Cargo.toml b/contracts/examples/multisig/wasm/Cargo.toml
index edba1dc5b9..79a78ed396 100644
--- a/contracts/examples/multisig/wasm/Cargo.toml
+++ b/contracts/examples/multisig/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/nft-minter/Cargo.toml b/contracts/examples/nft-minter/Cargo.toml
index 91e47f3bac..45fc474c7b 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.52.1"
+version = "0.52.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/nft-minter/meta/Cargo.toml b/contracts/examples/nft-minter/meta/Cargo.toml
index a0bf920aa3..3d6e9b7d2b 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-lib]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/nft-minter/wasm/Cargo.toml b/contracts/examples/nft-minter/wasm/Cargo.toml
index 2ece5c0804..aa89e7c966 100644
--- a/contracts/examples/nft-minter/wasm/Cargo.toml
+++ b/contracts/examples/nft-minter/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/nft-storage-prepay/Cargo.toml b/contracts/examples/nft-storage-prepay/Cargo.toml
index 1dd4d27afd..d94c3af574 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.52.1"
+version = "0.52.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/nft-storage-prepay/meta/Cargo.toml b/contracts/examples/nft-storage-prepay/meta/Cargo.toml
index 3c71f366b6..cfb91cd8c2 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-lib]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/nft-storage-prepay/wasm/Cargo.toml b/contracts/examples/nft-storage-prepay/wasm/Cargo.toml
index a02a740ecf..f0407d29d2 100644
--- a/contracts/examples/nft-storage-prepay/wasm/Cargo.toml
+++ b/contracts/examples/nft-storage-prepay/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/nft-subscription/Cargo.toml b/contracts/examples/nft-subscription/Cargo.toml
index e935dfd603..9cf9320b46 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.52.1"
+version = "0.52.2"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/nft-subscription/meta/Cargo.toml b/contracts/examples/nft-subscription/meta/Cargo.toml
index 2048aaa7a7..9c2cd62564 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-lib]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/nft-subscription/wasm/Cargo.toml b/contracts/examples/nft-subscription/wasm/Cargo.toml
index a598c8e278..03a88cd8a9 100644
--- a/contracts/examples/nft-subscription/wasm/Cargo.toml
+++ b/contracts/examples/nft-subscription/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/order-book/factory/Cargo.toml b/contracts/examples/order-book/factory/Cargo.toml
index 4107ab2f65..2ed8fe0d7a 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.52.1"
+version = "0.52.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../framework/scenario"
 
diff --git a/contracts/examples/order-book/factory/meta/Cargo.toml b/contracts/examples/order-book/factory/meta/Cargo.toml
index 9e32cdcf7a..c5dc6b8e37 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-lib]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/order-book/factory/wasm/Cargo.toml b/contracts/examples/order-book/factory/wasm/Cargo.toml
index 5c65babe0e..fbd6ecf910 100644
--- a/contracts/examples/order-book/factory/wasm/Cargo.toml
+++ b/contracts/examples/order-book/factory/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/order-book/pair/Cargo.toml b/contracts/examples/order-book/pair/Cargo.toml
index 1b920593f2..e0e4db8c63 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.52.1"
+version = "0.52.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../framework/scenario"
diff --git a/contracts/examples/order-book/pair/meta/Cargo.toml b/contracts/examples/order-book/pair/meta/Cargo.toml
index 679459199e..ba31c704e1 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-lib]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/order-book/pair/wasm/Cargo.toml b/contracts/examples/order-book/pair/wasm/Cargo.toml
index 55661522bf..d8febed97d 100644
--- a/contracts/examples/order-book/pair/wasm/Cargo.toml
+++ b/contracts/examples/order-book/pair/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/ping-pong-egld/Cargo.toml b/contracts/examples/ping-pong-egld/Cargo.toml
index 1f7f71b9dd..8a2315de1c 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.52.1"
+version = "0.52.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../framework/scenario"
 
diff --git a/contracts/examples/ping-pong-egld/meta/Cargo.toml b/contracts/examples/ping-pong-egld/meta/Cargo.toml
index a63efa6737..ba5c6d6a05 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-lib]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/ping-pong-egld/wasm/Cargo.toml b/contracts/examples/ping-pong-egld/wasm/Cargo.toml
index 9f0fb17d1a..bc63b7ba75 100644
--- a/contracts/examples/ping-pong-egld/wasm/Cargo.toml
+++ b/contracts/examples/ping-pong-egld/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/proxy-pause/Cargo.toml b/contracts/examples/proxy-pause/Cargo.toml
index 6745933b6a..8350ab3be6 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.52.1"
+version = "0.52.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.1"
+version = "0.52.2"
 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 7f735643c2..9025617cd7 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-lib]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/proxy-pause/wasm/Cargo.toml b/contracts/examples/proxy-pause/wasm/Cargo.toml
index 23417ab180..ff37b3ffbb 100644
--- a/contracts/examples/proxy-pause/wasm/Cargo.toml
+++ b/contracts/examples/proxy-pause/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/rewards-distribution/Cargo.toml b/contracts/examples/rewards-distribution/Cargo.toml
index a3c05e3a03..c27457a62c 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.52.1"
+version = "0.52.2"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/rewards-distribution/meta/Cargo.toml b/contracts/examples/rewards-distribution/meta/Cargo.toml
index 2d6e2b9309..9332821b2e 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 <claudiu.bruda@multiversx.com>"]
 path = ".."
 
 [dependencies.multiversx-sc-meta-lib]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/rewards-distribution/wasm/Cargo.toml b/contracts/examples/rewards-distribution/wasm/Cargo.toml
index 2e131edf80..427f126478 100644
--- a/contracts/examples/rewards-distribution/wasm/Cargo.toml
+++ b/contracts/examples/rewards-distribution/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/seed-nft-minter/Cargo.toml b/contracts/examples/seed-nft-minter/Cargo.toml
index 1a83a6158b..b7fa1e390c 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.52.1"
+version = "0.52.2"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/seed-nft-minter/meta/Cargo.toml b/contracts/examples/seed-nft-minter/meta/Cargo.toml
index 9d5cd541b8..59d7e6dd8a 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 <claudiu.bruda@multiversx.com>"]
 path = ".."
 
 [dependencies.multiversx-sc-meta-lib]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/seed-nft-minter/wasm/Cargo.toml b/contracts/examples/seed-nft-minter/wasm/Cargo.toml
index 17b6186dca..46e92220d5 100644
--- a/contracts/examples/seed-nft-minter/wasm/Cargo.toml
+++ b/contracts/examples/seed-nft-minter/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/token-release/Cargo.toml b/contracts/examples/token-release/Cargo.toml
index 9a86bb92bb..1507ada7a7 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.52.1"
+version = "0.52.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../framework/scenario"
 
diff --git a/contracts/examples/token-release/meta/Cargo.toml b/contracts/examples/token-release/meta/Cargo.toml
index b1cc88db49..000af50e1b 100644
--- a/contracts/examples/token-release/meta/Cargo.toml
+++ b/contracts/examples/token-release/meta/Cargo.toml
@@ -10,6 +10,6 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta-lib]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/token-release/wasm/Cargo.toml b/contracts/examples/token-release/wasm/Cargo.toml
index 981f9ad6e7..ed024a26be 100644
--- a/contracts/examples/token-release/wasm/Cargo.toml
+++ b/contracts/examples/token-release/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/abi-tester/Cargo.toml b/contracts/feature-tests/abi-tester/Cargo.toml
index 7b54468c47..8bef4f4711 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.52.1"
+version = "0.52.2"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../framework/scenario"
 
 [dev-dependencies.multiversx-sc-meta-lib]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../framework/meta-lib"
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 934e0e51c2..2f4367a3e9 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.52.1"
+            "version": "0.52.2"
         }
     },
     "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 2218b3c58d..914ea92d18 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.52.1"
+            "version": "0.52.2"
         }
     },
     "docs": [
diff --git a/contracts/feature-tests/abi-tester/meta/Cargo.toml b/contracts/feature-tests/abi-tester/meta/Cargo.toml
index e93502a7cb..5057ddc40f 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-lib]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../framework/meta-lib"
 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 d904fbe0ae..eed4343efc 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.1"
+version = "0.52.2"
 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 f97261a856..4681e04d7c 100644
--- a/contracts/feature-tests/abi-tester/wasm/Cargo.toml
+++ b/contracts/feature-tests/abi-tester/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/alloc-features/Cargo.toml b/contracts/feature-tests/alloc-features/Cargo.toml
index efddec2826..86cd0cdd62 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.52.1"
+version = "0.52.2"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.1"
+version = "0.52.2"
 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 210fb8c4e4..16d413dc43 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-lib]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml
index 31fb8c1a1f..a904b7a1cd 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml
index 8b1cf90123..a77a4da265 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/alloc-features/wasm/Cargo.toml b/contracts/feature-tests/alloc-features/wasm/Cargo.toml
index 0f269d9164..1dd53698a9 100644
--- a/contracts/feature-tests/alloc-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/alloc-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/basic-features/Cargo.toml b/contracts/feature-tests/basic-features/Cargo.toml
index 03c5ca66f4..1544bde85d 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.52.1"
+version = "0.52.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../framework/scenario"
 
 [dependencies.multiversx-sc-modules]
-version = "0.52.1"
+version = "0.52.2"
 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 2b58eab7c7..c9dbb1bec3 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.52.1"
+version = "0.52.2"
 path = "../../../../framework/snippets"
diff --git a/contracts/feature-tests/basic-features/meta/Cargo.toml b/contracts/feature-tests/basic-features/meta/Cargo.toml
index 818bda70a8..64abacebe1 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-lib]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../framework/meta-lib"
 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 970ee9e1bf..8314c7876f 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.1"
+version = "0.52.2"
 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 a825b4c15a..07c7754cfa 100644
--- a/contracts/feature-tests/basic-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/basic-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.1"
+version = "0.52.2"
 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 decc6d7286..2911393cd8 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.52.1"
+version = "0.52.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.1"
+version = "0.52.2"
 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 14003826fc..e78c5555c4 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-lib]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../framework/meta-lib"
 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 b141d8c61e..3105015fd1 100644
--- a/contracts/feature-tests/big-float-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/big-float-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/Cargo.toml b/contracts/feature-tests/composability/Cargo.toml
index 28eeb0c393..805658dbd5 100644
--- a/contracts/feature-tests/composability/Cargo.toml
+++ b/contracts/feature-tests/composability/Cargo.toml
@@ -36,9 +36,9 @@ path = "recursive-caller"
 path = "vault"
 
 [dependencies.multiversx-sc]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.1"
+version = "0.52.2"
 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 19a5a114c5..4fc5463080 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.52.1"
+version = "0.52.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.1"
+version = "0.52.2"
 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 959713a581..b5a2b45e17 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-lib]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../../framework/meta-lib"
 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 e678af5a97..2318ae6bca 100644
--- a/contracts/feature-tests/composability/builtin-func-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/builtin-func-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.1"
+version = "0.52.2"
 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 f80f55eba0..9cff8d8d2e 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.52.1"
+version = "0.52.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.1"
+version = "0.52.2"
 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 97c7574545..e6324563ff 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
@@ -9,10 +9,10 @@ publish = false
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.1"
+version = "0.52.2"
 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 014a8591c0..595beb438c 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.52.1"
+version = "0.52.2"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta-lib]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../../../framework/meta-lib"
 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 0e57f18a7c..11b27ec15d 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.1"
+version = "0.52.2"
 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 e2c9dae45a..92be32a56d 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.52.1"
+version = "0.52.2"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.1"
+version = "0.52.2"
 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 824ea353ed..9c5e5647de 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.52.1"
+version = "0.52.2"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta-lib]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../../../framework/meta-lib"
 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 aaa0ea57b9..0a0f2284f1 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.1"
+version = "0.52.2"
 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 8beb86caaa..7e16667da8 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.52.1"
+version = "0.52.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.1"
+version = "0.52.2"
 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 a5789c6d35..d220866917 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.52.1"
+version = "0.52.2"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.1"
+version = "0.52.2"
 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 8d393d5b01..71c4048f20 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.52.1"
+version = "0.52.2"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta-lib]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../../../framework/meta-lib"
 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 782409174c..8fdff2da82 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.1"
+version = "0.52.2"
 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 bcde8f4d83..567e678b1a 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
@@ -9,10 +9,10 @@ publish = false
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.1"
+version = "0.52.2"
 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 a347b90b47..b84a0a48ee 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.52.1"
+version = "0.52.2"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta-lib]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../../../framework/meta-lib"
 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 ffc2f7f5f3..6e717d9709 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/forwarder-legacy/Cargo.toml b/contracts/feature-tests/composability/forwarder-legacy/Cargo.toml
index 32892440a7..d538c2da79 100644
--- a/contracts/feature-tests/composability/forwarder-legacy/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-legacy/Cargo.toml
@@ -12,10 +12,10 @@ path = "src/forwarder_legacy_main.rs"
 path = "../vault"
 
 [dependencies.multiversx-sc]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../framework/scenario"
 
diff --git a/contracts/feature-tests/composability/forwarder-legacy/meta/Cargo.toml b/contracts/feature-tests/composability/forwarder-legacy/meta/Cargo.toml
index c2fba98bb6..746bf261fd 100644
--- a/contracts/feature-tests/composability/forwarder-legacy/meta/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-legacy/meta/Cargo.toml
@@ -8,6 +8,6 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta-lib]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.toml b/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.toml
index 04331c0141..db40a9d0f0 100644
--- a/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.1"
+version = "0.52.2"
 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 3ca7eec9d7..a73f5111f1 100644
--- a/contracts/feature-tests/composability/forwarder-queue/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-queue/Cargo.toml
@@ -9,14 +9,14 @@ publish = false
 path = "src/forwarder_queue.rs"
 
 [dependencies.multiversx-sc]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../framework/wasm-adapter"
 optional = true
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.1"
+version = "0.52.2"
 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 f1c379079e..d73021b274 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-lib]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../../framework/meta-lib"
 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 116ee7330c..780a6d313b 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.1"
+version = "0.52.2"
 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 b4c5434d49..6f5da38bfd 100644
--- a/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.1"
+version = "0.52.2"
 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 7f8d16fe8e..60b0a4d17a 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.52.1"
+version = "0.52.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.1"
+version = "0.52.2"
 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 1b27181f7d..5be146bbb1 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-lib]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../../framework/meta-lib"
 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 cd97f0b49d..552037af02 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.1"
+version = "0.52.2"
 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 e67b76e238..8bb52fabb3 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.1"
+version = "0.52.2"
 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 c13c0f938f..21776b66c6 100644
--- a/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/forwarder/Cargo.toml b/contracts/feature-tests/composability/forwarder/Cargo.toml
index 3eb502fbfc..1bff4c1e01 100644
--- a/contracts/feature-tests/composability/forwarder/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder/Cargo.toml
@@ -9,10 +9,10 @@ publish = false
 path = "src/forwarder_main.rs"
 
 [dependencies.multiversx-sc]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../framework/scenario"
 
diff --git a/contracts/feature-tests/composability/forwarder/meta/Cargo.toml b/contracts/feature-tests/composability/forwarder/meta/Cargo.toml
index 667a03a002..c728a3c04b 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-lib]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/feature-tests/composability/forwarder/wasm/Cargo.toml b/contracts/feature-tests/composability/forwarder/wasm/Cargo.toml
index a29367f2a3..0ac744f54d 100644
--- a/contracts/feature-tests/composability/forwarder/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/interact/Cargo.toml b/contracts/feature-tests/composability/interact/Cargo.toml
index c77853a2b8..faed62ca6b 100644
--- a/contracts/feature-tests/composability/interact/Cargo.toml
+++ b/contracts/feature-tests/composability/interact/Cargo.toml
@@ -15,9 +15,9 @@ serde = { version = "1.0", features = ["derive"] }
 toml = "0.8.6"
 
 [dependencies.multiversx-sc]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-snippets]
-version = "0.52.1"
+version = "0.52.2"
 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 22e95922e9..d5193e8637 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.52.1"
+version = "0.52.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.1"
+version = "0.52.2"
 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 126b9a4a55..536ba4c373 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-lib]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../../framework/meta-lib"
 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 8ff3fe6cb3..b8ce92dc84 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.1"
+version = "0.52.2"
 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 96b5017afc..fc6dcfe6d2 100644
--- a/contracts/feature-tests/composability/promises-features/Cargo.toml
+++ b/contracts/feature-tests/composability/promises-features/Cargo.toml
@@ -9,6 +9,6 @@ publish = false
 path = "src/promises_main.rs"
 
 [dependencies.multiversx-sc]
-version = "0.52.1"
+version = "0.52.2"
 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 beb803c600..29a1496629 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-lib]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../../framework/meta-lib"
 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 2bdc54c776..ce571f9626 100644
--- a/contracts/feature-tests/composability/promises-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/promises-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.1"
+version = "0.52.2"
 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 4012311cfa..36617a7ed4 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.52.1"
+version = "0.52.2"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.1"
+version = "0.52.2"
 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 4319512a54..d95ce78dff 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-lib]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../../framework/meta-lib"
 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 b3dc53d9f9..e016f98a03 100644
--- a/contracts/feature-tests/composability/proxy-test-first/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/proxy-test-first/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.1"
+version = "0.52.2"
 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 ec321b37f3..8254f2ffc9 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.52.1"
+version = "0.52.2"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.1"
+version = "0.52.2"
 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 5aa3b7344e..2daf454434 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-lib]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../../framework/meta-lib"
 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 9ff9fc9b57..94d9a86be9 100644
--- a/contracts/feature-tests/composability/proxy-test-second/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/proxy-test-second/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.1"
+version = "0.52.2"
 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 08fe322a5f..0b6a8b8116 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.52.1"
+version = "0.52.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.1"
+version = "0.52.2"
 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 0efbef85a6..5d9fe1bc7a 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-lib]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../../framework/meta-lib"
 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 0b3e319e9d..8ef6930475 100644
--- a/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.1"
+version = "0.52.2"
 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 253559bbf7..f9e9a6787a 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.52.1"
+version = "0.52.2"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.1"
+version = "0.52.2"
 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 47919f39e4..9435d8e2d3 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-lib]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../../framework/meta-lib"
 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 1eceba7868..9c1f7b0b97 100644
--- a/contracts/feature-tests/composability/transfer-role-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/transfer-role-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/vault/Cargo.toml b/contracts/feature-tests/composability/vault/Cargo.toml
index b4b12641e9..d7bb36c005 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.52.1"
+version = "0.52.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../framework/scenario"
diff --git a/contracts/feature-tests/composability/vault/meta/Cargo.toml b/contracts/feature-tests/composability/vault/meta/Cargo.toml
index c1b51b62a8..6f024136c2 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-lib]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../../framework/meta-lib"
 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 914ca47106..c0ef08d11b 100644
--- a/contracts/feature-tests/composability/vault/wasm-vault-promises/Cargo.toml
+++ b/contracts/feature-tests/composability/vault/wasm-vault-promises/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.1"
+version = "0.52.2"
 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 45eb7c297f..c67350aa89 100644
--- a/contracts/feature-tests/composability/vault/wasm-vault-upgrade/Cargo.toml
+++ b/contracts/feature-tests/composability/vault/wasm-vault-upgrade/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.1"
+version = "0.52.2"
 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 a25f730677..8410e704de 100644
--- a/contracts/feature-tests/composability/vault/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/vault/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.1"
+version = "0.52.2"
 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 bb4e0e4100..2846f866dc 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.52.1"
+version = "0.52.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.1"
+version = "0.52.2"
 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 7dfe198a34..7e0bd1f38e 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-lib]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../../framework/meta-lib"
 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 e17af52c85..70de15e206 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.1"
+version = "0.52.2"
 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 c8f7af3f33..bd5491b461 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.52.1"
+version = "0.52.2"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.1"
+version = "0.52.2"
 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 dcd1552ee0..95d623c39f 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-lib]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../../framework/meta-lib"
 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 05ceef6b85..8a1d467c38 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.1"
+version = "0.52.2"
 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 5b0678237a..4ed1f34c30 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.52.1"
+version = "0.52.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.1"
+version = "0.52.2"
 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 802055402c..ba173ed7ab 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-lib]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../../framework/meta-lib"
 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 6311cdd32c..b40b887b61 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.1"
+version = "0.52.2"
 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 b9e6f8b0e4..f6259b552f 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.52.1"
+version = "0.52.2"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.1"
+version = "0.52.2"
 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 dea5aa95f7..12a69aeac9 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-lib]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../../framework/meta-lib"
 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 fb2c316a42..9caba8c647 100644
--- a/contracts/feature-tests/erc-style-contracts/erc1155/wasm/Cargo.toml
+++ b/contracts/feature-tests/erc-style-contracts/erc1155/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.1"
+version = "0.52.2"
 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 6db39778c9..8b43cf6ec5 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.52.1"
+version = "0.52.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.1"
+version = "0.52.2"
 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 5c0d8a34ed..de4d132a00 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-lib]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../../framework/meta-lib"
 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 8beb3da568..ff639df5ff 100644
--- a/contracts/feature-tests/erc-style-contracts/erc20/wasm/Cargo.toml
+++ b/contracts/feature-tests/erc-style-contracts/erc20/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.1"
+version = "0.52.2"
 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 92d76a2f98..4dc3f6f35a 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.52.1"
+version = "0.52.2"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.1"
+version = "0.52.2"
 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 70a16cb21f..af3ad1de87 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-lib]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../../framework/meta-lib"
 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 b2f719af6f..2e1a740d0f 100644
--- a/contracts/feature-tests/erc-style-contracts/erc721/wasm/Cargo.toml
+++ b/contracts/feature-tests/erc-style-contracts/erc721/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.1"
+version = "0.52.2"
 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 176352b4c1..6e71c0cfb5 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.52.1"
+version = "0.52.2"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.1"
+version = "0.52.2"
 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 0249fa4328..f32a3abc00 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-lib]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../../framework/meta-lib"
 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 ec4f623865..e0a33fdab9 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.1"
+version = "0.52.2"
 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 cb5e2997d4..48c37d9b6d 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.52.1"
+version = "0.52.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.1"
+version = "0.52.2"
 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 4a5afd1fda..9fa417d11e 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-lib]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../framework/meta-lib"
 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 4fef0aaf8b..0db1b21d92 100644
--- a/contracts/feature-tests/esdt-system-sc-mock/wasm/Cargo.toml
+++ b/contracts/feature-tests/esdt-system-sc-mock/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/exchange-features/Cargo.toml b/contracts/feature-tests/exchange-features/Cargo.toml
index 456d181c74..86b8e11be3 100644
--- a/contracts/feature-tests/exchange-features/Cargo.toml
+++ b/contracts/feature-tests/exchange-features/Cargo.toml
@@ -9,9 +9,9 @@ publish = false
 path = "src/exchange_features.rs"
 
 [dependencies.multiversx-sc]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../framework/scenario"
diff --git a/contracts/feature-tests/exchange-features/meta/Cargo.toml b/contracts/feature-tests/exchange-features/meta/Cargo.toml
index 25b1e1c5b1..da8cb703f6 100644
--- a/contracts/feature-tests/exchange-features/meta/Cargo.toml
+++ b/contracts/feature-tests/exchange-features/meta/Cargo.toml
@@ -8,6 +8,6 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta-lib]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/feature-tests/exchange-features/wasm/Cargo.toml b/contracts/feature-tests/exchange-features/wasm/Cargo.toml
index 4ae6e72c74..81c0d21eca 100644
--- a/contracts/feature-tests/exchange-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/exchange-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.1"
+version = "0.52.2"
 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 3cd1ec4502..c103c5d986 100644
--- a/contracts/feature-tests/formatted-message-features/Cargo.toml
+++ b/contracts/feature-tests/formatted-message-features/Cargo.toml
@@ -9,10 +9,10 @@ publish = false
 path = "src/formatted_message_features.rs"
 
 [dependencies.multiversx-sc]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.1"
+version = "0.52.2"
 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 9c0d80968e..182cc5c8cf 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-lib]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../framework/meta-lib"
 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 ae58e167ed..5a393086c4 100644
--- a/contracts/feature-tests/formatted-message-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/formatted-message-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.1"
+version = "0.52.2"
 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 75e82fcfff..4262d0dbf3 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.52.1"
+version = "0.52.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.1"
+version = "0.52.2"
 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 09fe607401..90fe0f5bb3 100644
--- a/contracts/feature-tests/managed-map-features/meta/Cargo.toml
+++ b/contracts/feature-tests/managed-map-features/meta/Cargo.toml
@@ -9,6 +9,6 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta-lib]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../framework/meta-lib"
 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 852bcaff2e..8faf947836 100644
--- a/contracts/feature-tests/managed-map-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/managed-map-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.1"
+version = "0.52.2"
 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 338215b5a9..e1f5926358 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.52.1"
+version = "0.52.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.1"
+version = "0.52.2"
 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 6f71d8bb0f..34447e3eef 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-lib]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../framework/meta-lib"
 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 dd017b46d4..036d74f5bb 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.1"
+version = "0.52.2"
 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 009c9dd232..ece916eaf5 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
@@ -29,7 +29,7 @@ path = ".."
 features = ["example_feature"]
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.1"
+version = "0.52.2"
 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 8531f4f20b..f2da929bd7 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.1"
+version = "0.52.2"
 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 344725ab9d..60b0e3bcb0 100644
--- a/contracts/feature-tests/multi-contract-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/multi-contract-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.1"
+version = "0.52.2"
 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 62a148c713..4a72726cc3 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.52.1"
+version = "0.52.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.1"
+version = "0.52.2"
 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 8f0a4041f4..a72f56ec83 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-lib]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../framework/meta-lib"
 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 6ef4f91bfb..e5b2e0aa76 100644
--- a/contracts/feature-tests/panic-message-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/panic-message-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/payable-features/Cargo.toml b/contracts/feature-tests/payable-features/Cargo.toml
index 5a97808792..2c522c95a9 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.52.1"
+version = "0.52.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../framework/scenario"
diff --git a/contracts/feature-tests/payable-features/meta/Cargo.toml b/contracts/feature-tests/payable-features/meta/Cargo.toml
index 4545718099..a0ce40a843 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-lib]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/feature-tests/payable-features/wasm/Cargo.toml b/contracts/feature-tests/payable-features/wasm/Cargo.toml
index c7aef64426..1737794398 100644
--- a/contracts/feature-tests/payable-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/payable-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.1"
+version = "0.52.2"
 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 018c630a32..30adfcf978 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.52.1"
+version = "0.52.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.1"
+version = "0.52.2"
 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 938e35baf4..f4b43e7ccc 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.52.1"
+version = "0.52.2"
 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 cc07056251..58f1979579 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-lib]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../framework/meta-lib"
 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 e4a412dce3..145ec26571 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 interactor snippets manually to add relative paths:
 // [dependencies.multiversx-sc-snippets]
-// version = "0.52.1"
+// version = "0.52.2"
 // 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 4f6d1c6938..89c2dac05e 100644
--- a/contracts/feature-tests/rust-snippets-generator-test/wasm/Cargo.toml
+++ b/contracts/feature-tests/rust-snippets-generator-test/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.1"
+version = "0.52.2"
 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 b258cc8461..d0165f54da 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.52.1"
+version = "0.52.2"
 path = "../../../framework/base"
 features = [ "alloc" ]
 
@@ -17,7 +17,7 @@ path = "../../examples/adder"
 path = "../../feature-tests/basic-features"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.1"
+version = "0.52.2"
 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 ad1d66cd87..6de3147b7e 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-lib]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../framework/meta-lib"
 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 4af69ce15c..078d6c6334 100644
--- a/contracts/feature-tests/rust-testing-framework-tester/wasm/Cargo.toml
+++ b/contracts/feature-tests/rust-testing-framework-tester/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/scenario-tester/Cargo.toml b/contracts/feature-tests/scenario-tester/Cargo.toml
index 377ba16298..c36e757b7c 100644
--- a/contracts/feature-tests/scenario-tester/Cargo.toml
+++ b/contracts/feature-tests/scenario-tester/Cargo.toml
@@ -9,9 +9,9 @@ publish = false
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../framework/scenario"
diff --git a/contracts/feature-tests/scenario-tester/meta/Cargo.toml b/contracts/feature-tests/scenario-tester/meta/Cargo.toml
index 145f6279b0..f8ab73f49b 100644
--- a/contracts/feature-tests/scenario-tester/meta/Cargo.toml
+++ b/contracts/feature-tests/scenario-tester/meta/Cargo.toml
@@ -8,6 +8,6 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta-lib]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/feature-tests/scenario-tester/wasm/Cargo.toml b/contracts/feature-tests/scenario-tester/wasm/Cargo.toml
index 6272be13f5..ba98e5baf5 100644
--- a/contracts/feature-tests/scenario-tester/wasm/Cargo.toml
+++ b/contracts/feature-tests/scenario-tester/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/use-module/Cargo.toml b/contracts/feature-tests/use-module/Cargo.toml
index e5bf2fe46e..d563904a25 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.52.1"
+version = "0.52.2"
 path = "../../../contracts/modules"
 
 [dependencies.multiversx-sc]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../framework/scenario"
 
 [dev-dependencies.multiversx-sc-meta-lib]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../framework/meta-lib"
diff --git a/contracts/feature-tests/use-module/meta/Cargo.toml b/contracts/feature-tests/use-module/meta/Cargo.toml
index 8de9c8ec68..a0a57558bf 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-lib]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../framework/meta-lib"
 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 50088b6a48..e8eac7ffbc 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.52.1"
+            "version": "0.52.2"
         }
     },
     "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 6531a9de77..3bd3819f58 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.52.1"
+            "version": "0.52.2"
         }
     },
     "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 1d31463062..d62745269b 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.1"
+version = "0.52.2"
 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 039b026dc8..589d8979b9 100644
--- a/contracts/feature-tests/use-module/wasm/Cargo.toml
+++ b/contracts/feature-tests/use-module/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/modules/Cargo.toml b/contracts/modules/Cargo.toml
index dc933cf2fa..34411ed767 100644
--- a/contracts/modules/Cargo.toml
+++ b/contracts/modules/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-modules"
-version = "0.52.1"
+version = "0.52.2"
 edition = "2021"
 
 authors = ["MultiversX <contact@multiversx.com>"]
@@ -17,5 +17,5 @@ categories = ["no-std", "wasm", "cryptography::cryptocurrencies"]
 alloc = ["multiversx-sc/alloc"]
 
 [dependencies.multiversx-sc]
-version = "0.52.1"
+version = "0.52.2"
 path = "../../framework/base"
diff --git a/framework/base/Cargo.toml b/framework/base/Cargo.toml
index 8d2599161c..044945f36f 100644
--- a/framework/base/Cargo.toml
+++ b/framework/base/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc"
-version = "0.52.1"
+version = "0.52.2"
 edition = "2021"
 rust-version = "1.78"
 
@@ -30,7 +30,7 @@ num-traits = { version = "=0.2.19", default-features = false }
 unwrap-infallible = "0.1.5"
 
 [dependencies.multiversx-sc-derive]
-version = "=0.52.1"
+version = "=0.52.2"
 path = "../derive"
 
 [dependencies.multiversx-sc-codec]
diff --git a/framework/derive/Cargo.toml b/framework/derive/Cargo.toml
index 7922c44b39..cce5e028d6 100644
--- a/framework/derive/Cargo.toml
+++ b/framework/derive/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-derive"
-version = "0.52.1"
+version = "0.52.2"
 edition = "2021"
 
 authors = ["Andrei Marinica <andrei.marinica@multiversx.com>", "MultiversX <contact@multiversx.com>"]
diff --git a/framework/meta-lib/Cargo.toml b/framework/meta-lib/Cargo.toml
index 373cf21631..e3ce6e877f 100644
--- a/framework/meta-lib/Cargo.toml
+++ b/framework/meta-lib/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-meta-lib"
-version = "0.52.1"
+version = "0.52.2"
 edition = "2021"
 
 authors = [
@@ -31,6 +31,6 @@ wasmprinter = "0.214"
 semver = "1.0.20"
 
 [dependencies.multiversx-sc]
-version = "=0.52.1"
+version = "=0.52.2"
 path = "../base"
 features = ["alloc", "num-bigint"]
diff --git a/framework/meta-lib/src/version_history.rs b/framework/meta-lib/src/version_history.rs
index b742abb97c..bc208c1f7c 100644
--- a/framework/meta-lib/src/version_history.rs
+++ b/framework/meta-lib/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.52.1);
+pub const LAST_VERSION: FrameworkVersion = framework_version!(0.52.2);
 
 /// Indicates where to stop with the upgrades.
 pub const LAST_UPGRADE_VERSION: FrameworkVersion = LAST_VERSION;
@@ -80,6 +80,7 @@ pub const VERSIONS: &[FrameworkVersion] = framework_versions![
     0.51.1,
     0.52.0,
     0.52.1,
+    0.52.2,
 ];
 
 #[rustfmt::skip]
@@ -105,7 +106,7 @@ pub const CHECK_AFTER_UPGRADE_TO: &[FrameworkVersion] = framework_versions![
     0.49.0,
     0.50.6,
     0.51.1,
-    0.52.1,
+    0.52.2,
 ];
 
 pub const LOWER_VERSION_WITH_TEMPLATE_TAG: FrameworkVersion = framework_version!(0.43.0);
diff --git a/framework/meta/Cargo.toml b/framework/meta/Cargo.toml
index 36f3ac274e..cc704469db 100644
--- a/framework/meta/Cargo.toml
+++ b/framework/meta/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-meta"
-version = "0.52.1"
+version = "0.52.2"
 edition = "2021"
 
 authors = [
@@ -41,14 +41,14 @@ pathdiff = "0.2.1"
 common-path = "1.0.0" 
 
 [dependencies.multiversx-sc-meta-lib]
-version = "=0.52.1"
+version = "=0.52.2"
 path = "../meta-lib"
 
 [dependencies.multiversx-sc]
-version = "=0.52.1"
+version = "=0.52.2"
 path = "../base"
 features = ["alloc", "num-bigint"]
 
 [dependencies.multiversx-sc-snippets]
-version = "=0.52.1"
+version = "=0.52.2"
 path = "../snippets"
diff --git a/framework/scenario/Cargo.toml b/framework/scenario/Cargo.toml
index d6b2164ccf..27d2c7121e 100644
--- a/framework/scenario/Cargo.toml
+++ b/framework/scenario/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-scenario"
-version = "0.52.1"
+version = "0.52.2"
 edition = "2021"
 
 authors = [
@@ -37,12 +37,12 @@ wasm-incopatible = ["multiversx-chain-vm/wasm-incopatible"]
 run-go-tests = []
 
 [dependencies.multiversx-sc]
-version = "=0.52.1"
+version = "=0.52.2"
 features = ["alloc", "num-bigint"]
 path = "../base"
 
 [dependencies.multiversx-sc-meta-lib]
-version = "=0.52.1"
+version = "=0.52.2"
 path = "../meta-lib"
 
 [dependencies.multiversx-chain-scenario-format]
diff --git a/framework/snippets/Cargo.toml b/framework/snippets/Cargo.toml
index c02526794e..f175c85e75 100644
--- a/framework/snippets/Cargo.toml
+++ b/framework/snippets/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-snippets"
-version = "0.52.1"
+version = "0.52.2"
 edition = "2021"
 
 authors = ["MultiversX <contact@multiversx.com>"]
@@ -22,7 +22,7 @@ env_logger = "0.11"
 futures = "0.3"
 
 [dependencies.multiversx-sc-scenario]
-version = "=0.52.1"
+version = "=0.52.2"
 path = "../scenario"
 
 [dependencies.multiversx-chain-scenario-format]
diff --git a/framework/wasm-adapter/Cargo.toml b/framework/wasm-adapter/Cargo.toml
index 048ab71ba7..c532879911 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.52.1"
+version = "0.52.2"
 edition = "2021"
 
 authors = [
@@ -22,5 +22,5 @@ categories = [
 ]
 
 [dependencies.multiversx-sc]
-version = "=0.52.1"
+version = "=0.52.2"
 path = "../base"
diff --git a/tools/mxpy-snippet-generator/Cargo.toml b/tools/mxpy-snippet-generator/Cargo.toml
index 9a468cd137..b17460fe01 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.52.1"
+version = "0.52.2"
 path = "../../framework/base"
 
 [dependencies]
diff --git a/tools/plotter/Cargo.toml b/tools/plotter/Cargo.toml
index 75f589ecee..4219c837d5 100644
--- a/tools/plotter/Cargo.toml
+++ b/tools/plotter/Cargo.toml
@@ -21,11 +21,11 @@ plotters-canvas = "^0.3.0"
 lto = true
 
 [dependencies.multiversx-sc]
-version = "=0.52.1"
+version = "=0.52.2"
 path = "../../framework/base"
 
 [dependencies.multiversx-sc-scenario]
-version = "=0.52.1"
+version = "=0.52.2"
 path = "../../framework/scenario"
 default-features = false
 
diff --git a/tools/rust-debugger/format-tests/Cargo.toml b/tools/rust-debugger/format-tests/Cargo.toml
index c2ef36d718..00fc25a88b 100644
--- a/tools/rust-debugger/format-tests/Cargo.toml
+++ b/tools/rust-debugger/format-tests/Cargo.toml
@@ -9,11 +9,11 @@ name = "format-tests"
 path = "src/format_tests.rs"
 
 [dependencies.multiversx-sc]
-version = "=0.52.1"
+version = "=0.52.2"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-scenario]
-version = "=0.52.1"
+version = "=0.52.2"
 path = "../../../framework/scenario"
 
 [dependencies.multiversx-chain-vm]

From f7093b0235a4592c9b964647b960d17eb19fa384 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 1 Aug 2024 14:15:13 +0300
Subject: [PATCH 1134/1254] Cargo.lock update

---
 Cargo.lock                                    | 20 ++++++++--------
 .../benchmarks/large-storage/wasm/Cargo.lock  |  6 ++---
 .../linked-list-repeat/wasm/Cargo.lock        |  6 ++---
 .../mappers/map-repeat/wasm/Cargo.lock        |  6 ++---
 .../mappers/queue-repeat/wasm/Cargo.lock      |  6 ++---
 .../mappers/set-repeat/wasm/Cargo.lock        |  6 ++---
 .../single-value-repeat/wasm/Cargo.lock       |  6 ++---
 .../mappers/vec-repeat/wasm/Cargo.lock        |  6 ++---
 .../benchmarks/send-tx-repeat/wasm/Cargo.lock |  6 ++---
 .../Cargo.lock                                |  6 ++---
 .../Cargo.lock                                |  6 ++---
 .../benchmarks/str-repeat/wasm/Cargo.lock     |  6 ++---
 .../core/price-aggregator/wasm/Cargo.lock     | 23 +++++++++----------
 contracts/examples/adder/wasm/Cargo.lock      |  6 ++---
 .../bonding-curve-contract/wasm/Cargo.lock    |  8 +++----
 .../examples/check-pause/wasm/Cargo.lock      |  8 +++----
 .../crowdfunding-esdt/wasm/Cargo.lock         |  6 ++---
 .../examples/crypto-bubbles/wasm/Cargo.lock   |  6 ++---
 .../kitty-auction/wasm/Cargo.lock             |  6 ++---
 .../kitty-genetic-alg/wasm/Cargo.lock         |  6 ++---
 .../kitty-ownership/wasm/Cargo.lock           |  6 ++---
 .../examples/crypto-zombies/wasm/Cargo.lock   |  6 ++---
 .../examples/digital-cash/wasm/Cargo.lock     |  6 ++---
 contracts/examples/empty/wasm/Cargo.lock      |  6 ++---
 .../esdt-transfer-with-fee/wasm/Cargo.lock    |  6 ++---
 contracts/examples/factorial/wasm/Cargo.lock  |  6 ++---
 .../examples/fractional-nfts/wasm/Cargo.lock  |  8 +++----
 .../examples/lottery-esdt/wasm/Cargo.lock     |  6 ++---
 .../multisig/wasm-multisig-full/Cargo.lock    |  8 +++----
 .../multisig/wasm-multisig-view/Cargo.lock    |  8 +++----
 contracts/examples/multisig/wasm/Cargo.lock   |  8 +++----
 contracts/examples/nft-minter/wasm/Cargo.lock |  6 ++---
 .../nft-storage-prepay/wasm/Cargo.lock        |  6 ++---
 .../examples/nft-subscription/wasm/Cargo.lock |  8 +++----
 .../order-book/factory/wasm/Cargo.lock        |  6 ++---
 .../examples/order-book/pair/wasm/Cargo.lock  |  6 ++---
 .../examples/ping-pong-egld/wasm/Cargo.lock   |  6 ++---
 .../examples/proxy-pause/wasm/Cargo.lock      |  6 ++---
 .../rewards-distribution/wasm/Cargo.lock      |  8 +++----
 .../examples/seed-nft-minter/wasm/Cargo.lock  |  8 +++----
 .../examples/token-release/wasm/Cargo.lock    |  6 ++---
 .../abi-tester/wasm-abi-tester-ev/Cargo.lock  |  6 ++---
 .../feature-tests/abi-tester/wasm/Cargo.lock  |  6 ++---
 .../wasm-alloc-mem-fail/Cargo.lock            |  6 ++---
 .../wasm-alloc-mem-leaking/Cargo.lock         |  6 ++---
 .../alloc-features/wasm/Cargo.lock            |  6 ++---
 .../Cargo.lock                                |  8 +++----
 .../basic-features/wasm/Cargo.lock            |  8 +++----
 .../big-float-features/wasm/Cargo.lock        |  6 ++---
 .../builtin-func-features/wasm/Cargo.lock     |  6 ++---
 .../first-contract/wasm/Cargo.lock            |  6 ++---
 .../second-contract/wasm/Cargo.lock           |  6 ++---
 .../child/wasm/Cargo.lock                     |  6 ++---
 .../parent/wasm/Cargo.lock                    |  6 ++---
 .../forwarder-legacy/wasm/Cargo.lock          |  6 ++---
 .../wasm-forwarder-queue-promises/Cargo.lock  |  6 ++---
 .../forwarder-queue/wasm/Cargo.lock           |  6 ++---
 .../Cargo.lock                                |  6 ++---
 .../Cargo.lock                                |  6 ++---
 .../forwarder-raw/wasm/Cargo.lock             |  6 ++---
 .../composability/forwarder/wasm/Cargo.lock   |  6 ++---
 .../local-esdt-and-nft/wasm/Cargo.lock        |  6 ++---
 .../promises-features/wasm/Cargo.lock         |  6 ++---
 .../proxy-test-first/wasm/Cargo.lock          |  6 ++---
 .../proxy-test-second/wasm/Cargo.lock         |  6 ++---
 .../recursive-caller/wasm/Cargo.lock          |  6 ++---
 .../transfer-role-features/wasm/Cargo.lock    |  8 +++----
 .../vault/wasm-vault-promises/Cargo.lock      |  6 ++---
 .../vault/wasm-vault-upgrade/Cargo.lock       |  6 ++---
 .../composability/vault/wasm/Cargo.lock       |  6 ++---
 .../crowdfunding-erc20/wasm/Cargo.lock        |  6 ++---
 .../erc1155-marketplace/wasm/Cargo.lock       |  6 ++---
 .../erc1155-user-mock/wasm/Cargo.lock         |  6 ++---
 .../erc1155/wasm/Cargo.lock                   |  6 ++---
 .../erc-style-contracts/erc20/wasm/Cargo.lock |  6 ++---
 .../erc721/wasm/Cargo.lock                    |  6 ++---
 .../lottery-erc20/wasm/Cargo.lock             |  6 ++---
 .../esdt-system-sc-mock/wasm/Cargo.lock       |  6 ++---
 .../exchange-features/wasm/Cargo.lock         |  6 ++---
 .../wasm/Cargo.lock                           |  6 ++---
 .../managed-map-features/wasm/Cargo.lock      |  6 ++---
 .../wasm-multi-contract-alt-impl/Cargo.lock   |  6 ++---
 .../Cargo.lock                                |  6 ++---
 .../Cargo.lock                                |  6 ++---
 .../multi-contract-features/wasm/Cargo.lock   |  6 ++---
 .../panic-message-features/wasm/Cargo.lock    |  6 ++---
 .../payable-features/wasm/Cargo.lock          |  6 ++---
 .../wasm/Cargo.lock                           |  6 ++---
 .../wasm/Cargo.lock                           |  6 ++---
 .../scenario-tester/wasm/Cargo.lock           |  6 ++---
 .../wasm-use-module-view/Cargo.lock           |  8 +++----
 .../feature-tests/use-module/wasm/Cargo.lock  |  8 +++----
 92 files changed, 305 insertions(+), 306 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 83dedbb874..c927ea1f04 100755
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1922,7 +1922,7 @@ checksum = "b59072fa0624b55ae5ae3fa6bfa91515bbeb4ac440214bc4a509e2c8806d6e9f"
 
 [[package]]
 name = "multiversx-price-aggregator-sc"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "arrayvec",
  "getrandom 0.2.15",
@@ -1943,7 +1943,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "bitflags 2.6.0",
  "hex-literal",
@@ -1975,7 +1975,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -1986,7 +1986,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-meta"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "clap",
  "colored",
@@ -2009,7 +2009,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-meta-lib"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "clap",
  "colored",
@@ -2028,14 +2028,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-scenario"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "base64",
  "bech32",
@@ -2059,7 +2059,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-snippets"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "base64",
  "env_logger",
@@ -2075,7 +2075,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]
@@ -2107,7 +2107,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-wegld-swap-sc"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
  "multiversx-sc-modules",
diff --git a/contracts/benchmarks/large-storage/wasm/Cargo.lock b/contracts/benchmarks/large-storage/wasm/Cargo.lock
index 56350ff699..449b6dfb48 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.52.1"
+version = "0.52.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.lock
index 665dd3d8b1..0edbdd240a 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.52.1"
+version = "0.52.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.lock
index e0eb16ccd1..e3fb4e2948 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.52.1"
+version = "0.52.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.lock
index ac21fec5bd..d88c7d307a 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.52.1"
+version = "0.52.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -78,7 +78,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -89,7 +89,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.lock
index 2cd62ce507..2dd38cb324 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.52.1"
+version = "0.52.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -78,7 +78,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -89,7 +89,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.lock
index 9a73b81df9..8d58d89f01 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.52.1"
+version = "0.52.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -78,7 +78,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -89,7 +89,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.lock
index 1f9db6a3ab..10cc2393d9 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.52.1"
+version = "0.52.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -78,7 +78,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -89,7 +89,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/send-tx-repeat/wasm/Cargo.lock b/contracts/benchmarks/send-tx-repeat/wasm/Cargo.lock
index 045cacffe0..a227e095cf 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.52.1"
+version = "0.52.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.lock b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.lock
index ea0c0ed633..34cd051db9 100644
--- a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.lock
+++ b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.lock
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.lock b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.lock
index b9dd728779..36e9a1fdac 100644
--- a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.lock
+++ b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.lock
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/str-repeat/wasm/Cargo.lock b/contracts/benchmarks/str-repeat/wasm/Cargo.lock
index 761e578c72..9d1f70d166 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.52.1"
+version = "0.52.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/core/price-aggregator/wasm/Cargo.lock b/contracts/core/price-aggregator/wasm/Cargo.lock
index f40f512f73..a1b1649662 100644
--- a/contracts/core/price-aggregator/wasm/Cargo.lock
+++ b/contracts/core/price-aggregator/wasm/Cargo.lock
@@ -92,7 +92,7 @@ checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
 
 [[package]]
 name = "multiversx-price-aggregator-sc"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "arrayvec",
  "getrandom",
@@ -111,7 +111,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -142,7 +142,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -153,14 +153,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]
@@ -191,12 +191,11 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "ppv-lite86"
-version = "0.2.19"
+version = "0.2.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2288c0e17cc8d342c712bb43a257a80ebffce59cdb33d5000d8348f3ec02528b"
+checksum = "dee4364d9f3b902ef14fab8a1ddffb783a1cb6b4bba3bfc1fa3922732c7de97f"
 dependencies = [
  "zerocopy",
- "zerocopy-derive",
 ]
 
 [[package]]
@@ -348,9 +347,9 @@ checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.35"
+version = "0.6.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
+checksum = "854e949ac82d619ee9a14c66a1b674ac730422372ccb759ce0c39cabcf2bf8e6"
 dependencies = [
  "byteorder",
  "zerocopy-derive",
@@ -358,9 +357,9 @@ dependencies = [
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.35"
+version = "0.6.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
+checksum = "125139de3f6b9d625c39e2efdd73d41bdac468ccd556556440e322be0e1bbd91"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/adder/wasm/Cargo.lock b/contracts/examples/adder/wasm/Cargo.lock
index 946352eb46..c187c9a06f 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.52.1"
+version = "0.52.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/bonding-curve-contract/wasm/Cargo.lock b/contracts/examples/bonding-curve-contract/wasm/Cargo.lock
index 1636d17c7a..94fb75c2b6 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.52.1"
+version = "0.52.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/check-pause/wasm/Cargo.lock b/contracts/examples/check-pause/wasm/Cargo.lock
index f2785f3ead..ee6f604c34 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.52.1"
+version = "0.52.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crowdfunding-esdt/wasm/Cargo.lock b/contracts/examples/crowdfunding-esdt/wasm/Cargo.lock
index c8b11257b2..4eb1488211 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.52.1"
+version = "0.52.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crypto-bubbles/wasm/Cargo.lock b/contracts/examples/crypto-bubbles/wasm/Cargo.lock
index 0fbdd93ae5..a94d019514 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.52.1"
+version = "0.52.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.lock b/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.lock
index 002becfb0e..1ae787b3ac 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.52.1"
+version = "0.52.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -115,7 +115,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -126,7 +126,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]
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 2104390f8a..1c5800e2ec 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.52.1"
+version = "0.52.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -96,7 +96,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -107,7 +107,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.lock b/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.lock
index 8fddf88108..db1fae4ae1 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.52.1"
+version = "0.52.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -106,7 +106,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -117,7 +117,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crypto-zombies/wasm/Cargo.lock b/contracts/examples/crypto-zombies/wasm/Cargo.lock
index 37b007b5a4..2c87c07a0f 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.52.1"
+version = "0.52.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/digital-cash/wasm/Cargo.lock b/contracts/examples/digital-cash/wasm/Cargo.lock
index 1fcf091b38..17c99c6752 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.52.1"
+version = "0.52.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/empty/wasm/Cargo.lock b/contracts/examples/empty/wasm/Cargo.lock
index f294c37261..6e73dc1892 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.52.1"
+version = "0.52.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.lock b/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.lock
index 5f7f41d9f3..187733dc05 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.52.1"
+version = "0.52.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/factorial/wasm/Cargo.lock b/contracts/examples/factorial/wasm/Cargo.lock
index a40d179566..453dcf405c 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.52.1"
+version = "0.52.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/fractional-nfts/wasm/Cargo.lock b/contracts/examples/fractional-nfts/wasm/Cargo.lock
index 35ae058167..485f20c3c2 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.52.1"
+version = "0.52.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/lottery-esdt/wasm/Cargo.lock b/contracts/examples/lottery-esdt/wasm/Cargo.lock
index 1d71a02053..65058e2e27 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.52.1"
+version = "0.52.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/multisig/wasm-multisig-full/Cargo.lock b/contracts/examples/multisig/wasm-multisig-full/Cargo.lock
index 2e356c78ee..a2f13403bb 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.52.1"
+version = "0.52.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/multisig/wasm-multisig-view/Cargo.lock b/contracts/examples/multisig/wasm-multisig-view/Cargo.lock
index cd4e98675f..c3370c15ef 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.52.1"
+version = "0.52.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/multisig/wasm/Cargo.lock b/contracts/examples/multisig/wasm/Cargo.lock
index afbd7083ca..0d6b36c408 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.52.1"
+version = "0.52.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/nft-minter/wasm/Cargo.lock b/contracts/examples/nft-minter/wasm/Cargo.lock
index 6c38a9e212..63e92fa046 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.52.1"
+version = "0.52.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/nft-storage-prepay/wasm/Cargo.lock b/contracts/examples/nft-storage-prepay/wasm/Cargo.lock
index fd2627d8c9..9f591ffb45 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.52.1"
+version = "0.52.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/nft-subscription/wasm/Cargo.lock b/contracts/examples/nft-subscription/wasm/Cargo.lock
index 44f7ce6417..ec1493054f 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.52.1"
+version = "0.52.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,14 +82,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/order-book/factory/wasm/Cargo.lock b/contracts/examples/order-book/factory/wasm/Cargo.lock
index 6ba57f1a60..a0e45cb258 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.52.1"
+version = "0.52.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/order-book/pair/wasm/Cargo.lock b/contracts/examples/order-book/pair/wasm/Cargo.lock
index 015c6ef56e..68ac30a9c9 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.52.1"
+version = "0.52.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/ping-pong-egld/wasm/Cargo.lock b/contracts/examples/ping-pong-egld/wasm/Cargo.lock
index 77adfda3cc..1f27339e0c 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.52.1"
+version = "0.52.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/proxy-pause/wasm/Cargo.lock b/contracts/examples/proxy-pause/wasm/Cargo.lock
index f329b2c547..4f1eb9e532 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.52.1"
+version = "0.52.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/rewards-distribution/wasm/Cargo.lock b/contracts/examples/rewards-distribution/wasm/Cargo.lock
index acfdbbbf9e..1913e967da 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.52.1"
+version = "0.52.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,14 +82,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/seed-nft-minter/wasm/Cargo.lock b/contracts/examples/seed-nft-minter/wasm/Cargo.lock
index c227d25b27..0e775da157 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.52.1"
+version = "0.52.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,14 +82,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/token-release/wasm/Cargo.lock b/contracts/examples/token-release/wasm/Cargo.lock
index dfd978d40e..c8d76d28ea 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.52.1"
+version = "0.52.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]
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 a399527594..1ecb634c9a 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.52.1"
+version = "0.52.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/abi-tester/wasm/Cargo.lock b/contracts/feature-tests/abi-tester/wasm/Cargo.lock
index a26b59d8cb..dc26daf22f 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.52.1"
+version = "0.52.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock
index 0e7436a86a..cea20c07dc 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.lock b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.lock
index 029ebb4530..abbe9b7563 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.lock
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.lock
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/alloc-features/wasm/Cargo.lock b/contracts/feature-tests/alloc-features/wasm/Cargo.lock
index a2ae5854be..3a8da98bfd 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.52.1"
+version = "0.52.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]
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 fd5a7277d4..572127e27e 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.52.1"
+version = "0.52.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/basic-features/wasm/Cargo.lock b/contracts/feature-tests/basic-features/wasm/Cargo.lock
index 25259895ed..106b3ef55b 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.52.1"
+version = "0.52.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/big-float-features/wasm/Cargo.lock b/contracts/feature-tests/big-float-features/wasm/Cargo.lock
index e7ce81e1dc..fdf2a7d086 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.52.1"
+version = "0.52.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]
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 de65a13806..4b6393ccb2 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.52.1"
+version = "0.52.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]
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 cb5a571f71..f623c2fdc1 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.52.1"
+version = "0.52.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]
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 e5a3d44d23..38d2a36510 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.52.1"
+version = "0.52.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]
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 b8f722e254..3fe9a669d1 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.52.1"
+version = "0.52.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]
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 115186a8d9..b560dc89f3 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
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.lock
index d37ce7e513..156c114ea6 100644
--- a/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.lock
@@ -56,7 +56,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,7 +98,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]
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 aedaa4c668..c9334300a8 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
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock
index 2eb6928dc0..bcb3cada4d 100644
--- a/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]
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 474ff81149..85af6e71f1 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.52.1"
+version = "0.52.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]
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 4fa1a3609a..2ac228399f 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.52.1"
+version = "0.52.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.lock
index 556c737769..5ca0e96523 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.52.1"
+version = "0.52.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock
index 21b2398ee5..c54974aaeb 100755
--- a/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]
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 616e9c5111..3215990729 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.52.1"
+version = "0.52.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/promises-features/wasm/Cargo.lock b/contracts/feature-tests/composability/promises-features/wasm/Cargo.lock
index f673204086..8308a8b80a 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.52.1"
+version = "0.52.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]
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 f9952ec71a..def169576d 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.52.1"
+version = "0.52.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]
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 6b60935819..caa9b9fb97 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.52.1"
+version = "0.52.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.lock b/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.lock
index 071d130fc2..7dc7db6e62 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.52.1"
+version = "0.52.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]
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 13556a3def..c7774469a2 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.52.1"
+version = "0.52.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,14 +82,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]
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 4dfcc18490..dd3b852765 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.52.1"
+version = "0.52.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]
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 ff03f63f81..a63473ae73 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.52.1"
+version = "0.52.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/vault/wasm/Cargo.lock b/contracts/feature-tests/composability/vault/wasm/Cargo.lock
index e3b6e48c1f..03574bc948 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.52.1"
+version = "0.52.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]
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 d158150cde..42cdca0fac 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.52.1"
+version = "0.52.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]
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 c9e275ec0c..cc8364d80c 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.52.1"
+version = "0.52.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]
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 ecfe0b87e8..f047d506a7 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.52.1"
+version = "0.52.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]
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 532b8c1abc..7c58a339e8 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.52.1"
+version = "0.52.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]
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 cc49de7312..2829741448 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.52.1"
+version = "0.52.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]
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 6965152e8e..e4e8d5de92 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.52.1"
+version = "0.52.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]
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 6ea6ac3682..714c2b0666 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.52.1"
+version = "0.52.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]
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 29b727b9cb..81f0a6cec0 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.52.1"
+version = "0.52.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/exchange-features/wasm/Cargo.lock b/contracts/feature-tests/exchange-features/wasm/Cargo.lock
index a4db412ba4..75dc897817 100644
--- a/contracts/feature-tests/exchange-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/exchange-features/wasm/Cargo.lock
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/formatted-message-features/wasm/Cargo.lock b/contracts/feature-tests/formatted-message-features/wasm/Cargo.lock
index e4e4b0c413..3b78c2ee54 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.52.1"
+version = "0.52.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/managed-map-features/wasm/Cargo.lock b/contracts/feature-tests/managed-map-features/wasm/Cargo.lock
index 0a8c2ddc9e..2dba82dc16 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.52.1"
+version = "0.52.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]
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 556d610330..12089a449f 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.52.1"
+version = "0.52.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]
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 f06095dbd4..2fbd2df685 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.52.1"
+version = "0.52.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]
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 13f4df22aa..ca3b1ac55b 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.52.1"
+version = "0.52.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/multi-contract-features/wasm/Cargo.lock b/contracts/feature-tests/multi-contract-features/wasm/Cargo.lock
index 60f9f14d9d..9bfb7d5c88 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.52.1"
+version = "0.52.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/panic-message-features/wasm/Cargo.lock b/contracts/feature-tests/panic-message-features/wasm/Cargo.lock
index 693e13d66f..88d117f8ea 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.52.1"
+version = "0.52.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/payable-features/wasm/Cargo.lock b/contracts/feature-tests/payable-features/wasm/Cargo.lock
index 54ad03c403..51f023f66b 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.52.1"
+version = "0.52.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]
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 e35a608276..b447344f07 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.52.1"
+version = "0.52.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]
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 846b17c8b6..c98a04a7fa 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.52.1"
+version = "0.52.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/scenario-tester/wasm/Cargo.lock b/contracts/feature-tests/scenario-tester/wasm/Cargo.lock
index 6ed812416e..deecef9b4f 100755
--- a/contracts/feature-tests/scenario-tester/wasm/Cargo.lock
+++ b/contracts/feature-tests/scenario-tester/wasm/Cargo.lock
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]
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 6962e9674a..475dbf117f 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.52.1"
+version = "0.52.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,14 +82,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/use-module/wasm/Cargo.lock b/contracts/feature-tests/use-module/wasm/Cargo.lock
index bfa23a373d..9f8b1286ca 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.52.1"
+version = "0.52.2"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,14 +82,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.1"
+version = "0.52.2"
 dependencies = [
  "multiversx-sc",
 ]

From cdabc38e2cc9ee19373bb45b208403f0c8738eed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Costin=20Caraba=C8=99?= <costin.carabas@gmail.com>
Date: Fri, 2 Aug 2024 10:25:14 +0300
Subject: [PATCH 1135/1254] Add events for PauseModule

---
 contracts/modules/src/pause.rs | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/contracts/modules/src/pause.rs b/contracts/modules/src/pause.rs
index a02be8b5cc..0532663800 100644
--- a/contracts/modules/src/pause.rs
+++ b/contracts/modules/src/pause.rs
@@ -30,14 +30,14 @@ pub trait PauseModule {
     #[endpoint(pause)]
     fn pause_endpoint(&self) {
         self.set_paused(true);
-        // TODO: event
+        self.pause_event();
     }
 
     #[only_owner]
     #[endpoint(unpause)]
     fn unpause_endpoint(&self) {
         self.set_paused(false);
-        // TODO: event
+        self.unpause_event();
     }
 
     fn require_paused(&self) {
@@ -48,6 +48,12 @@ pub trait PauseModule {
         require!(self.not_paused(), "Contract is paused");
     }
 
+    #[event("pause_contract")]
+    fn pause_event(&self);
+
+    #[event("unpause_contract")]
+    fn unpause_event(&self);
+
     #[view(isPaused)]
     #[storage_mapper("pause_module:paused")]
     fn paused_status(&self) -> SingleValueMapper<bool>;

From e204d6cea96601b146d80da124b2c045996a8422 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Fri, 2 Aug 2024 11:57:50 +0300
Subject: [PATCH 1136/1254] test fix

---
 .../use-module/scenarios/use_module_pause.scen.json       | 4 ++--
 .../use-module/use_module_expected_main.abi.json          | 8 ++++++++
 .../use-module/use_module_expected_view.abi.json          | 8 ++++++++
 3 files changed, 18 insertions(+), 2 deletions(-)

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 c96bb34cc9..b4332feb84 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
@@ -70,7 +70,7 @@
             "expect": {
                 "out": [],
                 "status": "",
-                "logs": [],
+                "logs": "*",
                 "gas": "*",
                 "refund": "*"
             }
@@ -110,7 +110,7 @@
             "expect": {
                 "out": [],
                 "status": "",
-                "logs": [],
+                "logs": "*",
                 "gas": "*",
                 "refund": "*"
             }
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 e8eac7ffbc..c0abbb0107 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
@@ -1000,6 +1000,14 @@
                     "type": "EsdtTokenPayment"
                 }
             ]
+        },
+        {
+            "identifier": "pause_contract",
+            "inputs": []
+        },
+        {
+            "identifier": "unpause_contract",
+            "inputs": []
         }
     ],
     "esdtAttributes": [
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 3bd3819f58..f99cdfb731 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
@@ -244,6 +244,14 @@
                     "type": "EsdtTokenPayment"
                 }
             ]
+        },
+        {
+            "identifier": "pause_contract",
+            "inputs": []
+        },
+        {
+            "identifier": "unpause_contract",
+            "inputs": []
         }
     ],
     "esdtAttributes": [

From 31a15e667439d0313c0c7811a8aab0fafbe91bc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Costin=20Caraba=C8=99?= <costin.carabas@gmail.com>
Date: Mon, 5 Aug 2024 14:39:42 +0300
Subject: [PATCH 1137/1254] PauseModule: events snake_case to camelCase

---
 contracts/modules/src/pause.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/contracts/modules/src/pause.rs b/contracts/modules/src/pause.rs
index 0532663800..db877a0d56 100644
--- a/contracts/modules/src/pause.rs
+++ b/contracts/modules/src/pause.rs
@@ -48,10 +48,10 @@ pub trait PauseModule {
         require!(self.not_paused(), "Contract is paused");
     }
 
-    #[event("pause_contract")]
+    #[event("pauseContract")]
     fn pause_event(&self);
 
-    #[event("unpause_contract")]
+    #[event("unpauseContract")]
     fn unpause_event(&self);
 
     #[view(isPaused)]

From 919451d8f6f2dbfba59a0145d60a8517caa7114c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Costin=20Caraba=C8=99?= <costin.carabas@gmail.com>
Date: Mon, 5 Aug 2024 15:19:19 +0300
Subject: [PATCH 1138/1254] use-module: Fix use_module_abi_generated_ok test

---
 .../use-module/scenarios/use_module_pause.scen.json           | 2 +-
 .../use-module/use_module_expected_main.abi.json              | 4 ++--
 .../use-module/use_module_expected_view.abi.json              | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

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 b4332feb84..bd8a21bc44 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
@@ -137,4 +137,4 @@
             }
         }
     ]
-}
+}
\ No newline at end of file
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 c0abbb0107..8dab13be57 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
@@ -1002,11 +1002,11 @@
             ]
         },
         {
-            "identifier": "pause_contract",
+            "identifier": "pauseContract",
             "inputs": []
         },
         {
-            "identifier": "unpause_contract",
+            "identifier": "unpauseContract",
             "inputs": []
         }
     ],
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 f99cdfb731..9b117b8be7 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
@@ -246,11 +246,11 @@
             ]
         },
         {
-            "identifier": "pause_contract",
+            "identifier": "pauseContract",
             "inputs": []
         },
         {
-            "identifier": "unpause_contract",
+            "identifier": "unpauseContract",
             "inputs": []
         }
     ],

From 42fcac512e2481a12e124b898ef4d95f18bd241f Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Mon, 29 Jul 2024 19:54:25 +0300
Subject: [PATCH 1139/1254] cli code report - compare impl changed

---
 .github/workflows/actions.yml                 |    2 +-
 framework/meta/src/cli/cli_args_standalone.rs |    5 +-
 framework/meta/src/cmd/code_report.rs         |    6 +-
 framework/meta/src/cmd/code_report/compare.rs |    4 +-
 .../src/cmd/code_report/generate_report.rs    |   44 +-
 .../src/cmd/code_report/render_code_report.rs |    7 -
 to_compared_report.json                       | 2555 +++++++++++++++++
 7 files changed, 2598 insertions(+), 25 deletions(-)
 create mode 100644 to_compared_report.json

diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
index 33cce9444b..c0917d3746 100644
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -14,7 +14,7 @@ permissions:
 jobs:
   contracts:
     name: Contracts
-    uses: multiversx/mx-sc-actions/.github/workflows/contracts.yml@f9483a0648e49620f3145a806924ff716c2445fb
+    uses: multiversx/mx-sc-actions/.github/workflows/contracts.yml@3ccc32c6283f3e7106b324b742d10aae28827c15
     with:
       rust-toolchain: stable
       path-to-sc-meta: framework/meta
diff --git a/framework/meta/src/cli/cli_args_standalone.rs b/framework/meta/src/cli/cli_args_standalone.rs
index 9bb5aad9fc..1cdde75cdd 100644
--- a/framework/meta/src/cli/cli_args_standalone.rs
+++ b/framework/meta/src/cli/cli_args_standalone.rs
@@ -157,9 +157,10 @@ pub struct CodeReportArgs {
     #[arg(short, long, verbatim_doc_comment)]
     pub format: Option<OutputFormat>,
 
-    /// Compare two reports. Output available only for Markdown format
+    /// Compares 2 reports in JSON format and the output is printed in Markdown format.
+    /// If one argument with JSON format is given then it compares with itself.
     #[arg(short, long, verbatim_doc_comment)]
-    pub compare: Option<PathBuf>,
+    pub compare: Vec<PathBuf>,
 }
 
 #[derive(Default, Clone, PartialEq, Eq, Debug, Args)]
diff --git a/framework/meta/src/cmd/code_report.rs b/framework/meta/src/cmd/code_report.rs
index f3c8ff8cbe..8e34fd37bd 100644
--- a/framework/meta/src/cmd/code_report.rs
+++ b/framework/meta/src/cmd/code_report.rs
@@ -17,6 +17,10 @@ pub fn code_report(args: &CodeReportArgs) {
         path,
         args.output.to_str().unwrap(),
         args.format.as_ref().unwrap_or(&OutputFormat::default()),
-        args.compare.clone().unwrap_or_default().to_str().unwrap(),
+        args.compare
+            .clone()
+            .into_iter()
+            .map(|path| path.to_string_lossy().into_owned())
+            .collect(),
     );
 }
diff --git a/framework/meta/src/cmd/code_report/compare.rs b/framework/meta/src/cmd/code_report/compare.rs
index c21aae953e..06b6ea9a4b 100644
--- a/framework/meta/src/cmd/code_report/compare.rs
+++ b/framework/meta/src/cmd/code_report/compare.rs
@@ -37,10 +37,10 @@ pub(crate) fn parse_into_code_report_json(
 pub(crate) fn size_status_after_comparing(size: usize, compared_size: usize) -> String {
     match size.cmp(&compared_size) {
         std::cmp::Ordering::Greater => {
-            format!("{} :arrow-right: {} :red-circle:", compared_size, size)
+            format!("{} :arrow_right: {} :red_circle:", compared_size, size)
         },
         std::cmp::Ordering::Less => {
-            format!("{} :arrow-right: {} :green-circle:", compared_size, size)
+            format!("{} :arrow_right: {} :green_circle:", compared_size, size)
         },
         std::cmp::Ordering::Equal => {
             format!("{}", size)
diff --git a/framework/meta/src/cmd/code_report/generate_report.rs b/framework/meta/src/cmd/code_report/generate_report.rs
index c92ae712ab..bb7baccde6 100644
--- a/framework/meta/src/cmd/code_report/generate_report.rs
+++ b/framework/meta/src/cmd/code_report/generate_report.rs
@@ -1,6 +1,6 @@
 use std::{
     fs::{read_dir, File},
-    io::Write,
+    io::{BufReader, Write},
     path::PathBuf,
     process::Command,
 };
@@ -13,16 +13,31 @@ use multiversx_sc_meta_lib::{
 
 use super::render_code_report::CodeReportRender;
 
-pub fn run_code_report(path: &str, output_path: &str, output_format: &OutputFormat, compare: &str) {
-    let directors = RelevantDirectories::find_all(path, &["".to_owned()]);
+pub fn run_code_report(
+    path: &str,
+    output_path: &str,
+    output_format: &OutputFormat,
+    compare: Vec<String>,
+) {
+    let reports = if compare.is_empty() {
+        generate_new_report(path)
+    } else {
+        let file = File::open(&compare[0]).expect("file not found");
+        let reader = BufReader::new(file);
+
+        serde_json::from_reader(reader).expect("Cannot deserialize")
+    };
 
-    let reports = extract_report(directors);
+    let mut compared_to = String::new();
+    if compare.len() == 2 {
+        compare[1].clone_into(&mut compared_to);
+    }
 
     let mut file = create_file(output_path);
 
     match output_format {
         OutputFormat::Markdown => {
-            let mut render_code_report = CodeReportRender::new(&mut file, compare, &reports);
+            let mut render_code_report = CodeReportRender::new(&mut file, &compared_to, &reports);
             render_code_report.render_report();
         },
         OutputFormat::Json => {
@@ -32,6 +47,12 @@ pub fn run_code_report(path: &str, output_path: &str, output_format: &OutputForm
     };
 }
 
+fn generate_new_report(path: &str) -> Vec<CodeReportJson> {
+    let directors = RelevantDirectories::find_all(path, &["".to_owned()]);
+
+    extract_report(directors)
+}
+
 fn extract_report(directors: RelevantDirectories) -> Vec<CodeReportJson> {
     let mut reports: Vec<CodeReportJson> = Vec::new();
 
@@ -99,14 +120,13 @@ fn create_file(file_path: &str) -> File {
     File::create(file_path).expect("could not write report file")
 }
 
-fn sanitize_output_path_from_report(reports: &mut Vec<CodeReportJson>) {
-    for report in reports {
-        let new_path = report
+fn sanitize_output_path_from_report(reports: &mut [CodeReportJson]) {
+    reports.iter_mut().for_each(|report| {
+        report.path = report
             .path
             .split('/')
             .last()
-            .unwrap_or_else(|| &report.path);
-
-        report.path = new_path.to_owned();
-    }
+            .unwrap_or(&report.path)
+            .to_string();
+    })
 }
diff --git a/framework/meta/src/cmd/code_report/render_code_report.rs b/framework/meta/src/cmd/code_report/render_code_report.rs
index 7b87a29493..6f4a66618c 100644
--- a/framework/meta/src/cmd/code_report/render_code_report.rs
+++ b/framework/meta/src/cmd/code_report/render_code_report.rs
@@ -60,13 +60,6 @@ impl<'a> CodeReportRender<'a> {
     }
 
     fn render_header(&mut self) {
-        if !self.compared_path_file.is_empty() {
-            self.writeln(format!(
-                "Contract comparison with {}",
-                self.compared_path_file
-            ))
-        }
-
         self.writeln("| Path                                                         |                                     size |                  has-allocator |                     has-format |");
         self.writeln("| :-- | --: | --: | --: |");
     }
diff --git a/to_compared_report.json b/to_compared_report.json
new file mode 100644
index 0000000000..8f66650dff
--- /dev/null
+++ b/to_compared_report.json
@@ -0,0 +1,2555 @@
+{
+    "features": [
+        "size",
+        "has-allocator",
+        "has-format"
+    ],
+    "folders": [
+        {
+            "root_path": "mx-sdk-rs/contracts/benchmarks",
+            "projects": [
+                {
+                    "project_path": "large-storage",
+                    "wasm_reports": [
+                        {
+                            "wasm_name": "large-storage.wasm",
+                            "extracted_features": [
+                                {
+                                    "feature_name": "size",
+                                    "results": [
+                                        "2160"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-allocator",
+                                    "results": [
+                                        "False"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-format",
+                                    "results": [
+                                        "False"
+                                    ]
+                                }
+                            ]
+                        }
+                    ]
+                },
+                {
+                    "project_path": "send-tx-repeat",
+                    "wasm_reports": [
+                        {
+                            "wasm_name": "send-tx-repeat.wasm",
+                            "extracted_features": [
+                                {
+                                    "feature_name": "size",
+                                    "results": [
+                                        "899"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-allocator",
+                                    "results": [
+                                        "False"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-format",
+                                    "results": [
+                                        "False"
+                                    ]
+                                }
+                            ]
+                        }
+                    ]
+                },
+                {
+                    "project_path": "str-repeat",
+                    "wasm_reports": [
+                        {
+                            "wasm_name": "str-repeat.wasm",
+                            "extracted_features": [
+                                {
+                                    "feature_name": "size",
+                                    "results": [
+                                        "2326"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-allocator",
+                                    "results": [
+                                        "False"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-format",
+                                    "results": [
+                                        "False"
+                                    ]
+                                }
+                            ]
+                        },
+                        {
+                            "wasm_name": "str-repeat-mb-builder-basic.wasm",
+                            "extracted_features": [
+                                {
+                                    "feature_name": "size",
+                                    "results": [
+                                        "754"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-allocator",
+                                    "results": [
+                                        "False"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-format",
+                                    "results": [
+                                        "False"
+                                    ]
+                                }
+                            ]
+                        },
+                        {
+                            "wasm_name": "str-repeat-mb-builder-cached.wasm",
+                            "extracted_features": [
+                                {
+                                    "feature_name": "size",
+                                    "results": [
+                                        "1134"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-allocator",
+                                    "results": [
+                                        "False"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-format",
+                                    "results": [
+                                        "False"
+                                    ]
+                                }
+                            ]
+                        }
+                    ]
+                }
+            ]
+        },
+        {
+            "root_path": "mx-sdk-rs/contracts/benchmarks/mappers",
+            "projects": [
+                {
+                    "project_path": "linked-list-repeat",
+                    "wasm_reports": [
+                        {
+                            "wasm_name": "linked-list-repeat.wasm",
+                            "extracted_features": [
+                                {
+                                    "feature_name": "size",
+                                    "results": [
+                                        "6473"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-allocator",
+                                    "results": [
+                                        "False"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-format",
+                                    "results": [
+                                        "False"
+                                    ]
+                                }
+                            ]
+                        }
+                    ]
+                },
+                {
+                    "project_path": "map-repeat",
+                    "wasm_reports": [
+                        {
+                            "wasm_name": "map-repeat.wasm",
+                            "extracted_features": [
+                                {
+                                    "feature_name": "size",
+                                    "results": [
+                                        "7178"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-allocator",
+                                    "results": [
+                                        "False"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-format",
+                                    "results": [
+                                        "False"
+                                    ]
+                                }
+                            ]
+                        }
+                    ]
+                },
+                {
+                    "project_path": "queue-repeat",
+                    "wasm_reports": [
+                        {
+                            "wasm_name": "queue-repeat.wasm",
+                            "extracted_features": [
+                                {
+                                    "feature_name": "size",
+                                    "results": [
+                                        "5789"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-allocator",
+                                    "results": [
+                                        "False"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-format",
+                                    "results": [
+                                        "False"
+                                    ]
+                                }
+                            ]
+                        }
+                    ]
+                },
+                {
+                    "project_path": "set-repeat",
+                    "wasm_reports": [
+                        {
+                            "wasm_name": "set-repeat.wasm",
+                            "extracted_features": [
+                                {
+                                    "feature_name": "size",
+                                    "results": [
+                                        "6943"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-allocator",
+                                    "results": [
+                                        "False"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-format",
+                                    "results": [
+                                        "False"
+                                    ]
+                                }
+                            ]
+                        }
+                    ]
+                },
+                {
+                    "project_path": "single-value-repeat",
+                    "wasm_reports": [
+                        {
+                            "wasm_name": "single-value-repeat.wasm",
+                            "extracted_features": [
+                                {
+                                    "feature_name": "size",
+                                    "results": [
+                                        "4435"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-allocator",
+                                    "results": [
+                                        "False"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-format",
+                                    "results": [
+                                        "False"
+                                    ]
+                                }
+                            ]
+                        }
+                    ]
+                },
+                {
+                    "project_path": "vec-repeat",
+                    "wasm_reports": [
+                        {
+                            "wasm_name": "vec-repeat.wasm",
+                            "extracted_features": [
+                                {
+                                    "feature_name": "size",
+                                    "results": [
+                                        "5223"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-allocator",
+                                    "results": [
+                                        "False"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-format",
+                                    "results": [
+                                        "False"
+                                    ]
+                                }
+                            ]
+                        }
+                    ]
+                }
+            ]
+        },
+        {
+            "root_path": "mx-sdk-rs/contracts/core",
+            "projects": [
+                {
+                    "project_path": "price-aggregator",
+                    "wasm_reports": [
+                        {
+                            "wasm_name": "multiversx-price-aggregator-sc.wasm",
+                            "extracted_features": [
+                                {
+                                    "feature_name": "size",
+                                    "results": [
+                                        "19314"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-allocator",
+                                    "results": [
+                                        "False"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-format",
+                                    "results": [
+                                        "False"
+                                    ]
+                                }
+                            ]
+                        }
+                    ]
+                },
+                {
+                    "project_path": "wegld-swap",
+                    "wasm_reports": [
+                        {
+                            "wasm_name": "multiversx-wegld-swap-sc.wasm",
+                            "extracted_features": [
+                                {
+                                    "feature_name": "size",
+                                    "results": [
+                                        "3550"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-allocator",
+                                    "results": [
+                                        "False"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-format",
+                                    "results": [
+                                        "False"
+                                    ]
+                                }
+                            ]
+                        }
+                    ]
+                }
+            ]
+        },
+        {
+            "root_path": "mx-sdk-rs/contracts/examples",
+            "projects": [
+                {
+                    "project_path": "adder",
+                    "wasm_reports": [
+                        {
+                            "wasm_name": "adder.wasm",
+                            "extracted_features": [
+                                {
+                                    "feature_name": "size",
+                                    "results": [
+                                        "696"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-allocator",
+                                    "results": [
+                                        "False"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-format",
+                                    "results": [
+                                        "False"
+                                    ]
+                                }
+                            ]
+                        }
+                    ]
+                },
+                {
+                    "project_path": "bonding-curve-contract",
+                    "wasm_reports": [
+                        {
+                            "wasm_name": "bonding-curve-contract.wasm",
+                            "extracted_features": [
+                                {
+                                    "feature_name": "size",
+                                    "results": [
+                                        "14725"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-allocator",
+                                    "results": [
+                                        "False"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-format",
+                                    "results": [
+                                        "False"
+                                    ]
+                                }
+                            ]
+                        }
+                    ]
+                },
+                {
+                    "project_path": "check-pause",
+                    "wasm_reports": [
+                        {
+                            "wasm_name": "check-pause.wasm",
+                            "extracted_features": [
+                                {
+                                    "feature_name": "size",
+                                    "results": [
+                                        "1228"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-allocator",
+                                    "results": [
+                                        "False"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-format",
+                                    "results": [
+                                        "False"
+                                    ]
+                                }
+                            ]
+                        }
+                    ]
+                },
+                {
+                    "project_path": "crowdfunding-esdt",
+                    "wasm_reports": [
+                        {
+                            "wasm_name": "crowdfunding-esdt.wasm",
+                            "extracted_features": [
+                                {
+                                    "feature_name": "size",
+                                    "results": [
+                                        "3984"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-allocator",
+                                    "results": [
+                                        "False"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-format",
+                                    "results": [
+                                        "False"
+                                    ]
+                                }
+                            ]
+                        }
+                    ]
+                },
+                {
+                    "project_path": "crypto-bubbles",
+                    "wasm_reports": [
+                        {
+                            "wasm_name": "crypto-bubbles.wasm",
+                            "extracted_features": [
+                                {
+                                    "feature_name": "size",
+                                    "results": [
+                                        "2345"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-allocator",
+                                    "results": [
+                                        "False"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-format",
+                                    "results": [
+                                        "False"
+                                    ]
+                                }
+                            ]
+                        }
+                    ]
+                },
+                {
+                    "project_path": "crypto-zombies",
+                    "wasm_reports": [
+                        {
+                            "wasm_name": "crypto-zombies.wasm",
+                            "extracted_features": [
+                                {
+                                    "feature_name": "size",
+                                    "results": [
+                                        "10296"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-allocator",
+                                    "results": [
+                                        "False"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-format",
+                                    "results": [
+                                        "False"
+                                    ]
+                                }
+                            ]
+                        }
+                    ]
+                },
+                {
+                    "project_path": "digital-cash",
+                    "wasm_reports": [
+                        {
+                            "wasm_name": "digital-cash.wasm",
+                            "extracted_features": [
+                                {
+                                    "feature_name": "size",
+                                    "results": [
+                                        "10039"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-allocator",
+                                    "results": [
+                                        "False"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-format",
+                                    "results": [
+                                        "False"
+                                    ]
+                                }
+                            ]
+                        }
+                    ]
+                },
+                {
+                    "project_path": "empty",
+                    "wasm_reports": [
+                        {
+                            "wasm_name": "empty.wasm",
+                            "extracted_features": [
+                                {
+                                    "feature_name": "size",
+                                    "results": [
+                                        "241"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-allocator",
+                                    "results": [
+                                        "False"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-format",
+                                    "results": [
+                                        "False"
+                                    ]
+                                }
+                            ]
+                        }
+                    ]
+                },
+                {
+                    "project_path": "esdt-transfer-with-fee",
+                    "wasm_reports": [
+                        {
+                            "wasm_name": "esdt-transfer-with-fee.wasm",
+                            "extracted_features": [
+                                {
+                                    "feature_name": "size",
+                                    "results": [
+                                        "7764"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-allocator",
+                                    "results": [
+                                        "False"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-format",
+                                    "results": [
+                                        "False"
+                                    ]
+                                }
+                            ]
+                        }
+                    ]
+                },
+                {
+                    "project_path": "factorial",
+                    "wasm_reports": [
+                        {
+                            "wasm_name": "factorial.wasm",
+                            "extracted_features": [
+                                {
+                                    "feature_name": "size",
+                                    "results": [
+                                        "576"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-allocator",
+                                    "results": [
+                                        "False"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-format",
+                                    "results": [
+                                        "False"
+                                    ]
+                                }
+                            ]
+                        }
+                    ]
+                },
+                {
+                    "project_path": "fractional-nfts",
+                    "wasm_reports": [
+                        {
+                            "wasm_name": "fractional-nfts.wasm",
+                            "extracted_features": [
+                                {
+                                    "feature_name": "size",
+                                    "results": [
+                                        "8440"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-allocator",
+                                    "results": [
+                                        "False"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-format",
+                                    "results": [
+                                        "False"
+                                    ]
+                                }
+                            ]
+                        }
+                    ]
+                },
+                {
+                    "project_path": "lottery-esdt",
+                    "wasm_reports": [
+                        {
+                            "wasm_name": "lottery-esdt.wasm",
+                            "extracted_features": [
+                                {
+                                    "feature_name": "size",
+                                    "results": [
+                                        "10978"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-allocator",
+                                    "results": [
+                                        "False"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-format",
+                                    "results": [
+                                        "False"
+                                    ]
+                                }
+                            ]
+                        }
+                    ]
+                },
+                {
+                    "project_path": "multisig",
+                    "wasm_reports": [
+                        {
+                            "wasm_name": "multisig.wasm",
+                            "extracted_features": [
+                                {
+                                    "feature_name": "size",
+                                    "results": [
+                                        "14223"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-allocator",
+                                    "results": [
+                                        "False"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-format",
+                                    "results": [
+                                        "False"
+                                    ]
+                                }
+                            ]
+                        },
+                        {
+                            "wasm_name": "multisig-full.wasm",
+                            "extracted_features": [
+                                {
+                                    "feature_name": "size",
+                                    "results": [
+                                        "15812"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-allocator",
+                                    "results": [
+                                        "False"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-format",
+                                    "results": [
+                                        "False"
+                                    ]
+                                }
+                            ]
+                        },
+                        {
+                            "wasm_name": "multisig-view.wasm",
+                            "extracted_features": [
+                                {
+                                    "feature_name": "size",
+                                    "results": [
+                                        "6241"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-allocator",
+                                    "results": [
+                                        "False"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-format",
+                                    "results": [
+                                        "False"
+                                    ]
+                                }
+                            ]
+                        }
+                    ]
+                },
+                {
+                    "project_path": "nft-minter",
+                    "wasm_reports": [
+                        {
+                            "wasm_name": "nft-minter.wasm",
+                            "extracted_features": [
+                                {
+                                    "feature_name": "size",
+                                    "results": [
+                                        "10018"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-allocator",
+                                    "results": [
+                                        "False"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-format",
+                                    "results": [
+                                        "False"
+                                    ]
+                                }
+                            ]
+                        }
+                    ]
+                },
+                {
+                    "project_path": "nft-storage-prepay",
+                    "wasm_reports": [
+                        {
+                            "wasm_name": "nft-storage-prepay.wasm",
+                            "extracted_features": [
+                                {
+                                    "feature_name": "size",
+                                    "results": [
+                                        "2290"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-allocator",
+                                    "results": [
+                                        "False"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-format",
+                                    "results": [
+                                        "False"
+                                    ]
+                                }
+                            ]
+                        }
+                    ]
+                },
+                {
+                    "project_path": "nft-subscription",
+                    "wasm_reports": [
+                        {
+                            "wasm_name": "nft-subscription.wasm",
+                            "extracted_features": [
+                                {
+                                    "feature_name": "size",
+                                    "results": [
+                                        "8782"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-allocator",
+                                    "results": [
+                                        "False"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-format",
+                                    "results": [
+                                        "False"
+                                    ]
+                                }
+                            ]
+                        }
+                    ]
+                },
+                {
+                    "project_path": "ping-pong-egld",
+                    "wasm_reports": [
+                        {
+                            "wasm_name": "ping-pong-egld.wasm",
+                            "extracted_features": [
+                                {
+                                    "feature_name": "size",
+                                    "results": [
+                                        "6021"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-allocator",
+                                    "results": [
+                                        "False"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-format",
+                                    "results": [
+                                        "False"
+                                    ]
+                                }
+                            ]
+                        }
+                    ]
+                },
+                {
+                    "project_path": "proxy-pause",
+                    "wasm_reports": [
+                        {
+                            "wasm_name": "proxy-pause.wasm",
+                            "extracted_features": [
+                                {
+                                    "feature_name": "size",
+                                    "results": [
+                                        "4616"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-allocator",
+                                    "results": [
+                                        "False"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-format",
+                                    "results": [
+                                        "False"
+                                    ]
+                                }
+                            ]
+                        }
+                    ]
+                },
+                {
+                    "project_path": "rewards-distribution",
+                    "wasm_reports": [
+                        {
+                            "wasm_name": "rewards-distribution.wasm",
+                            "extracted_features": [
+                                {
+                                    "feature_name": "size",
+                                    "results": [
+                                        "10227"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-allocator",
+                                    "results": [
+                                        "False"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-format",
+                                    "results": [
+                                        "False"
+                                    ]
+                                }
+                            ]
+                        }
+                    ]
+                },
+                {
+                    "project_path": "seed-nft-minter",
+                    "wasm_reports": [
+                        {
+                            "wasm_name": "seed-nft-minter.wasm",
+                            "extracted_features": [
+                                {
+                                    "feature_name": "size",
+                                    "results": [
+                                        "15106"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-allocator",
+                                    "results": [
+                                        "False"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-format",
+                                    "results": [
+                                        "False"
+                                    ]
+                                }
+                            ]
+                        }
+                    ]
+                },
+                {
+                    "project_path": "token-release",
+                    "wasm_reports": [
+                        {
+                            "wasm_name": "token-release.wasm",
+                            "extracted_features": [
+                                {
+                                    "feature_name": "size",
+                                    "results": [
+                                        "7767"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-allocator",
+                                    "results": [
+                                        "False"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-format",
+                                    "results": [
+                                        "False"
+                                    ]
+                                }
+                            ]
+                        }
+                    ]
+                }
+            ]
+        },
+        {
+            "root_path": "mx-sdk-rs/contracts/examples/crypto-kitties",
+            "projects": [
+                {
+                    "project_path": "kitty-auction",
+                    "wasm_reports": [
+                        {
+                            "wasm_name": "kitty-auction.wasm",
+                            "extracted_features": [
+                                {
+                                    "feature_name": "size",
+                                    "results": [
+                                        "10054"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-allocator",
+                                    "results": [
+                                        "False"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-format",
+                                    "results": [
+                                        "False"
+                                    ]
+                                }
+                            ]
+                        }
+                    ]
+                },
+                {
+                    "project_path": "kitty-genetic-alg",
+                    "wasm_reports": [
+                        {
+                            "wasm_name": "kitty-genetic-alg.wasm",
+                            "extracted_features": [
+                                {
+                                    "feature_name": "size",
+                                    "results": [
+                                        "3143"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-allocator",
+                                    "results": [
+                                        "False"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-format",
+                                    "results": [
+                                        "False"
+                                    ]
+                                }
+                            ]
+                        }
+                    ]
+                },
+                {
+                    "project_path": "kitty-ownership",
+                    "wasm_reports": [
+                        {
+                            "wasm_name": "kitty-ownership.wasm",
+                            "extracted_features": [
+                                {
+                                    "feature_name": "size",
+                                    "results": [
+                                        "12723"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-allocator",
+                                    "results": [
+                                        "False"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-format",
+                                    "results": [
+                                        "False"
+                                    ]
+                                }
+                            ]
+                        }
+                    ]
+                }
+            ]
+        },
+        {
+            "root_path": "mx-sdk-rs/contracts/examples/order-book",
+            "projects": [
+                {
+                    "project_path": "factory",
+                    "wasm_reports": [
+                        {
+                            "wasm_name": "order-book-factory.wasm",
+                            "extracted_features": [
+                                {
+                                    "feature_name": "size",
+                                    "results": [
+                                        "3760"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-allocator",
+                                    "results": [
+                                        "False"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-format",
+                                    "results": [
+                                        "False"
+                                    ]
+                                }
+                            ]
+                        }
+                    ]
+                },
+                {
+                    "project_path": "pair",
+                    "wasm_reports": [
+                        {
+                            "wasm_name": "order-book-pair.wasm",
+                            "extracted_features": [
+                                {
+                                    "feature_name": "size",
+                                    "results": [
+                                        "13778"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-allocator",
+                                    "results": [
+                                        "False"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-format",
+                                    "results": [
+                                        "False"
+                                    ]
+                                }
+                            ]
+                        }
+                    ]
+                }
+            ]
+        },
+        {
+            "root_path": "mx-sdk-rs/contracts/feature-tests",
+            "projects": [
+                {
+                    "project_path": "abi-tester",
+                    "wasm_reports": [
+                        {
+                            "wasm_name": "abi-tester.wasm",
+                            "extracted_features": [
+                                {
+                                    "feature_name": "size",
+                                    "results": [
+                                        "7128"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-allocator",
+                                    "results": [
+                                        "False"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-format",
+                                    "results": [
+                                        "False"
+                                    ]
+                                }
+                            ]
+                        },
+                        {
+                            "wasm_name": "abi-tester-ev.wasm",
+                            "extracted_features": [
+                                {
+                                    "feature_name": "size",
+                                    "results": [
+                                        "757"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-allocator",
+                                    "results": [
+                                        "False"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-format",
+                                    "results": [
+                                        "False"
+                                    ]
+                                }
+                            ]
+                        }
+                    ]
+                },
+                {
+                    "project_path": "alloc-features",
+                    "wasm_reports": [
+                        {
+                            "wasm_name": "alloc-features.wasm",
+                            "extracted_features": [
+                                {
+                                    "feature_name": "size",
+                                    "results": [
+                                        "16468"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-allocator",
+                                    "results": [
+                                        "False"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-format",
+                                    "results": [
+                                        "False"
+                                    ]
+                                }
+                            ]
+                        },
+                        {
+                            "wasm_name": "alloc-mem-fail.wasm",
+                            "extracted_features": [
+                                {
+                                    "feature_name": "size",
+                                    "results": [
+                                        "16421"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-allocator",
+                                    "results": [
+                                        "False"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-format",
+                                    "results": [
+                                        "False"
+                                    ]
+                                }
+                            ]
+                        },
+                        {
+                            "wasm_name": "alloc-mem-leaking.wasm",
+                            "extracted_features": [
+                                {
+                                    "feature_name": "size",
+                                    "results": [
+                                        "16580"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-allocator",
+                                    "results": [
+                                        "False"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-format",
+                                    "results": [
+                                        "False"
+                                    ]
+                                }
+                            ]
+                        }
+                    ]
+                },
+                {
+                    "project_path": "basic-features",
+                    "wasm_reports": [
+                        {
+                            "wasm_name": "basic-features.wasm",
+                            "extracted_features": [
+                                {
+                                    "feature_name": "size",
+                                    "results": [
+                                        "64827"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-allocator",
+                                    "results": [
+                                        "False"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-format",
+                                    "results": [
+                                        "False"
+                                    ]
+                                }
+                            ]
+                        },
+                        {
+                            "wasm_name": "basic-features-storage-bytes.wasm",
+                            "extracted_features": [
+                                {
+                                    "feature_name": "size",
+                                    "results": [
+                                        "538"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-allocator",
+                                    "results": [
+                                        "False"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-format",
+                                    "results": [
+                                        "False"
+                                    ]
+                                }
+                            ]
+                        }
+                    ]
+                },
+                {
+                    "project_path": "big-float-features",
+                    "wasm_reports": [
+                        {
+                            "wasm_name": "big-float-features.wasm",
+                            "extracted_features": [
+                                {
+                                    "feature_name": "size",
+                                    "results": [
+                                        "6463"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-allocator",
+                                    "results": [
+                                        "False"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-format",
+                                    "results": [
+                                        "False"
+                                    ]
+                                }
+                            ]
+                        }
+                    ]
+                },
+                {
+                    "project_path": "esdt-system-sc-mock",
+                    "wasm_reports": [
+                        {
+                            "wasm_name": "esdt-system-sc-mock.wasm",
+                            "extracted_features": [
+                                {
+                                    "feature_name": "size",
+                                    "results": [
+                                        "3794"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-allocator",
+                                    "results": [
+                                        "False"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-format",
+                                    "results": [
+                                        "False"
+                                    ]
+                                }
+                            ]
+                        }
+                    ]
+                },
+                {
+                    "project_path": "exchange-features",
+                    "wasm_reports": [
+                        {
+                            "wasm_name": "exchange-features.wasm",
+                            "extracted_features": [
+                                {
+                                    "feature_name": "size",
+                                    "results": [
+                                        "1575"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-allocator",
+                                    "results": [
+                                        "False"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-format",
+                                    "results": [
+                                        "False"
+                                    ]
+                                }
+                            ]
+                        }
+                    ]
+                },
+                {
+                    "project_path": "formatted-message-features",
+                    "wasm_reports": [
+                        {
+                            "wasm_name": "formatted-message-features.wasm",
+                            "extracted_features": [
+                                {
+                                    "feature_name": "size",
+                                    "results": [
+                                        "3462"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-allocator",
+                                    "results": [
+                                        "False"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-format",
+                                    "results": [
+                                        "False"
+                                    ]
+                                }
+                            ]
+                        }
+                    ]
+                },
+                {
+                    "project_path": "managed-map-features",
+                    "wasm_reports": [
+                        {
+                            "wasm_name": "managed-map-features.wasm",
+                            "extracted_features": [
+                                {
+                                    "feature_name": "size",
+                                    "results": [
+                                        "1315"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-allocator",
+                                    "results": [
+                                        "False"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-format",
+                                    "results": [
+                                        "False"
+                                    ]
+                                }
+                            ]
+                        }
+                    ]
+                },
+                {
+                    "project_path": "multi-contract-features",
+                    "wasm_reports": [
+                        {
+                            "wasm_name": "multi-contract-alt-impl.wasm",
+                            "extracted_features": [
+                                {
+                                    "feature_name": "size",
+                                    "results": [
+                                        "360"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-allocator",
+                                    "results": [
+                                        "False"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-format",
+                                    "results": [
+                                        "False"
+                                    ]
+                                }
+                            ]
+                        },
+                        {
+                            "wasm_name": "multi-contract-example-feature.wasm",
+                            "extracted_features": [
+                                {
+                                    "feature_name": "size",
+                                    "results": [
+                                        "677"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-allocator",
+                                    "results": [
+                                        "False"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-format",
+                                    "results": [
+                                        "False"
+                                    ]
+                                }
+                            ]
+                        },
+                        {
+                            "wasm_name": "multi-contract-features.wasm",
+                            "extracted_features": [
+                                {
+                                    "feature_name": "size",
+                                    "results": [
+                                        "678"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-allocator",
+                                    "results": [
+                                        "False"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-format",
+                                    "results": [
+                                        "False"
+                                    ]
+                                }
+                            ]
+                        },
+                        {
+                            "wasm_name": "multi-contract-features-view.wasm",
+                            "extracted_features": [
+                                {
+                                    "feature_name": "size",
+                                    "results": [
+                                        "1115"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-allocator",
+                                    "results": [
+                                        "False"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-format",
+                                    "results": [
+                                        "False"
+                                    ]
+                                }
+                            ]
+                        }
+                    ]
+                },
+                {
+                    "project_path": "panic-message-features",
+                    "wasm_reports": [
+                        {
+                            "wasm_name": "panic-message-features.wasm",
+                            "extracted_features": [
+                                {
+                                    "feature_name": "size",
+                                    "results": [
+                                        "12613"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-allocator",
+                                    "results": [
+                                        "False"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-format",
+                                    "results": [
+                                        "True"
+                                    ]
+                                }
+                            ]
+                        }
+                    ]
+                },
+                {
+                    "project_path": "payable-features",
+                    "wasm_reports": [
+                        {
+                            "wasm_name": "payable-features.wasm",
+                            "extracted_features": [
+                                {
+                                    "feature_name": "size",
+                                    "results": [
+                                        "4368"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-allocator",
+                                    "results": [
+                                        "False"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-format",
+                                    "results": [
+                                        "False"
+                                    ]
+                                }
+                            ]
+                        }
+                    ]
+                },
+                {
+                    "project_path": "rust-snippets-generator-test",
+                    "wasm_reports": [
+                        {
+                            "wasm_name": "rust-snippets-generator-test.wasm",
+                            "extracted_features": [
+                                {
+                                    "feature_name": "size",
+                                    "results": [
+                                        "4971"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-allocator",
+                                    "results": [
+                                        "False"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-format",
+                                    "results": [
+                                        "False"
+                                    ]
+                                }
+                            ]
+                        }
+                    ]
+                },
+                {
+                    "project_path": "rust-testing-framework-tester",
+                    "wasm_reports": [
+                        {
+                            "wasm_name": "rust-testing-framework-tester.wasm",
+                            "extracted_features": [
+                                {
+                                    "feature_name": "size",
+                                    "results": [
+                                        "8596"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-allocator",
+                                    "results": [
+                                        "False"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-format",
+                                    "results": [
+                                        "False"
+                                    ]
+                                }
+                            ]
+                        }
+                    ]
+                },
+                {
+                    "project_path": "scenario-tester",
+                    "wasm_reports": [
+                        {
+                            "wasm_name": "scenario-tester.wasm",
+                            "extracted_features": [
+                                {
+                                    "feature_name": "size",
+                                    "results": [
+                                        "1114"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-allocator",
+                                    "results": [
+                                        "False"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-format",
+                                    "results": [
+                                        "False"
+                                    ]
+                                }
+                            ]
+                        }
+                    ]
+                },
+                {
+                    "project_path": "use-module",
+                    "wasm_reports": [
+                        {
+                            "wasm_name": "use-module.wasm",
+                            "extracted_features": [
+                                {
+                                    "feature_name": "size",
+                                    "results": [
+                                        "33392"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-allocator",
+                                    "results": [
+                                        "False"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-format",
+                                    "results": [
+                                        "True"
+                                    ]
+                                }
+                            ]
+                        },
+                        {
+                            "wasm_name": "use-module-view.wasm",
+                            "extracted_features": [
+                                {
+                                    "feature_name": "size",
+                                    "results": [
+                                        "733"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-allocator",
+                                    "results": [
+                                        "False"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-format",
+                                    "results": [
+                                        "False"
+                                    ]
+                                }
+                            ]
+                        }
+                    ]
+                }
+            ]
+        },
+        {
+            "root_path": "mx-sdk-rs/contracts/feature-tests/composability",
+            "projects": [
+                {
+                    "project_path": "builtin-func-features",
+                    "wasm_reports": [
+                        {
+                            "wasm_name": "builtin-func-features.wasm",
+                            "extracted_features": [
+                                {
+                                    "feature_name": "size",
+                                    "results": [
+                                        "1099"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-allocator",
+                                    "results": [
+                                        "False"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-format",
+                                    "results": [
+                                        "False"
+                                    ]
+                                }
+                            ]
+                        }
+                    ]
+                },
+                {
+                    "project_path": "forwarder",
+                    "wasm_reports": [
+                        {
+                            "wasm_name": "forwarder.wasm",
+                            "extracted_features": [
+                                {
+                                    "feature_name": "size",
+                                    "results": [
+                                        "32628"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-allocator",
+                                    "results": [
+                                        "False"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-format",
+                                    "results": [
+                                        "False"
+                                    ]
+                                }
+                            ]
+                        }
+                    ]
+                },
+                {
+                    "project_path": "forwarder-legacy",
+                    "wasm_reports": [
+                        {
+                            "wasm_name": "forwarder-legacy.wasm",
+                            "extracted_features": [
+                                {
+                                    "feature_name": "size",
+                                    "results": [
+                                        "32296"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-allocator",
+                                    "results": [
+                                        "False"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-format",
+                                    "results": [
+                                        "False"
+                                    ]
+                                }
+                            ]
+                        }
+                    ]
+                },
+                {
+                    "project_path": "forwarder-queue",
+                    "wasm_reports": [
+                        {
+                            "wasm_name": "forwarder-queue.wasm",
+                            "extracted_features": [
+                                {
+                                    "feature_name": "size",
+                                    "results": [
+                                        "12091"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-allocator",
+                                    "results": [
+                                        "False"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-format",
+                                    "results": [
+                                        "False"
+                                    ]
+                                }
+                            ]
+                        },
+                        {
+                            "wasm_name": "forwarder-queue-promises.wasm",
+                            "extracted_features": [
+                                {
+                                    "feature_name": "size",
+                                    "results": [
+                                        "13004"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-allocator",
+                                    "results": [
+                                        "False"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-format",
+                                    "results": [
+                                        "False"
+                                    ]
+                                }
+                            ]
+                        }
+                    ]
+                },
+                {
+                    "project_path": "forwarder-raw",
+                    "wasm_reports": [
+                        {
+                            "wasm_name": "forwarder-raw.wasm",
+                            "extracted_features": [
+                                {
+                                    "feature_name": "size",
+                                    "results": [
+                                        "15261"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-allocator",
+                                    "results": [
+                                        "False"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-format",
+                                    "results": [
+                                        "False"
+                                    ]
+                                }
+                            ]
+                        },
+                        {
+                            "wasm_name": "forwarder-raw-init-async-call.wasm",
+                            "extracted_features": [
+                                {
+                                    "feature_name": "size",
+                                    "results": [
+                                        "3058"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-allocator",
+                                    "results": [
+                                        "False"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-format",
+                                    "results": [
+                                        "False"
+                                    ]
+                                }
+                            ]
+                        },
+                        {
+                            "wasm_name": "forwarder-raw-init-sync-call.wasm",
+                            "extracted_features": [
+                                {
+                                    "feature_name": "size",
+                                    "results": [
+                                        "3328"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-allocator",
+                                    "results": [
+                                        "False"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-format",
+                                    "results": [
+                                        "False"
+                                    ]
+                                }
+                            ]
+                        }
+                    ]
+                },
+                {
+                    "project_path": "local-esdt-and-nft",
+                    "wasm_reports": [
+                        {
+                            "wasm_name": "local-esdt-and-nft.wasm",
+                            "extracted_features": [
+                                {
+                                    "feature_name": "size",
+                                    "results": [
+                                        "12016"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-allocator",
+                                    "results": [
+                                        "False"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-format",
+                                    "results": [
+                                        "False"
+                                    ]
+                                }
+                            ]
+                        }
+                    ]
+                },
+                {
+                    "project_path": "promises-features",
+                    "wasm_reports": [
+                        {
+                            "wasm_name": "promises-features.wasm",
+                            "extracted_features": [
+                                {
+                                    "feature_name": "size",
+                                    "results": [
+                                        "12885"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-allocator",
+                                    "results": [
+                                        "False"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-format",
+                                    "results": [
+                                        "False"
+                                    ]
+                                }
+                            ]
+                        }
+                    ]
+                },
+                {
+                    "project_path": "proxy-test-first",
+                    "wasm_reports": [
+                        {
+                            "wasm_name": "proxy-test-first.wasm",
+                            "extracted_features": [
+                                {
+                                    "feature_name": "size",
+                                    "results": [
+                                        "6024"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-allocator",
+                                    "results": [
+                                        "False"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-format",
+                                    "results": [
+                                        "False"
+                                    ]
+                                }
+                            ]
+                        }
+                    ]
+                },
+                {
+                    "project_path": "proxy-test-second",
+                    "wasm_reports": [
+                        {
+                            "wasm_name": "proxy-test-second.wasm",
+                            "extracted_features": [
+                                {
+                                    "feature_name": "size",
+                                    "results": [
+                                        "2112"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-allocator",
+                                    "results": [
+                                        "False"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-format",
+                                    "results": [
+                                        "False"
+                                    ]
+                                }
+                            ]
+                        }
+                    ]
+                },
+                {
+                    "project_path": "recursive-caller",
+                    "wasm_reports": [
+                        {
+                            "wasm_name": "recursive-caller.wasm",
+                            "extracted_features": [
+                                {
+                                    "feature_name": "size",
+                                    "results": [
+                                        "5459"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-allocator",
+                                    "results": [
+                                        "False"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-format",
+                                    "results": [
+                                        "False"
+                                    ]
+                                }
+                            ]
+                        }
+                    ]
+                },
+                {
+                    "project_path": "transfer-role-features",
+                    "wasm_reports": [
+                        {
+                            "wasm_name": "transfer-role-features.wasm",
+                            "extracted_features": [
+                                {
+                                    "feature_name": "size",
+                                    "results": [
+                                        "8758"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-allocator",
+                                    "results": [
+                                        "False"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-format",
+                                    "results": [
+                                        "False"
+                                    ]
+                                }
+                            ]
+                        }
+                    ]
+                },
+                {
+                    "project_path": "vault",
+                    "wasm_reports": [
+                        {
+                            "wasm_name": "vault.wasm",
+                            "extracted_features": [
+                                {
+                                    "feature_name": "size",
+                                    "results": [
+                                        "7821"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-allocator",
+                                    "results": [
+                                        "False"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-format",
+                                    "results": [
+                                        "False"
+                                    ]
+                                }
+                            ]
+                        },
+                        {
+                            "wasm_name": "vault-promises.wasm",
+                            "extracted_features": [
+                                {
+                                    "feature_name": "size",
+                                    "results": [
+                                        "8514"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-allocator",
+                                    "results": [
+                                        "False"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-format",
+                                    "results": [
+                                        "False"
+                                    ]
+                                }
+                            ]
+                        },
+                        {
+                            "wasm_name": "vault-upgrade.wasm",
+                            "extracted_features": [
+                                {
+                                    "feature_name": "size",
+                                    "results": [
+                                        "697"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-allocator",
+                                    "results": [
+                                        "False"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-format",
+                                    "results": [
+                                        "False"
+                                    ]
+                                }
+                            ]
+                        }
+                    ]
+                }
+            ]
+        },
+        {
+            "root_path": "mx-sdk-rs/contracts/feature-tests/composability/esdt-contract-pair",
+            "projects": [
+                {
+                    "project_path": "first-contract",
+                    "wasm_reports": [
+                        {
+                            "wasm_name": "first-contract.wasm",
+                            "extracted_features": [
+                                {
+                                    "feature_name": "size",
+                                    "results": [
+                                        "3083"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-allocator",
+                                    "results": [
+                                        "False"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-format",
+                                    "results": [
+                                        "False"
+                                    ]
+                                }
+                            ]
+                        }
+                    ]
+                },
+                {
+                    "project_path": "second-contract",
+                    "wasm_reports": [
+                        {
+                            "wasm_name": "second-contract.wasm",
+                            "extracted_features": [
+                                {
+                                    "feature_name": "size",
+                                    "results": [
+                                        "1355"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-allocator",
+                                    "results": [
+                                        "False"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-format",
+                                    "results": [
+                                        "False"
+                                    ]
+                                }
+                            ]
+                        }
+                    ]
+                }
+            ]
+        },
+        {
+            "root_path": "mx-sdk-rs/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback",
+            "projects": [
+                {
+                    "project_path": "child",
+                    "wasm_reports": [
+                        {
+                            "wasm_name": "child.wasm",
+                            "extracted_features": [
+                                {
+                                    "feature_name": "size",
+                                    "results": [
+                                        "4051"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-allocator",
+                                    "results": [
+                                        "False"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-format",
+                                    "results": [
+                                        "False"
+                                    ]
+                                }
+                            ]
+                        }
+                    ]
+                },
+                {
+                    "project_path": "parent",
+                    "wasm_reports": [
+                        {
+                            "wasm_name": "parent.wasm",
+                            "extracted_features": [
+                                {
+                                    "feature_name": "size",
+                                    "results": [
+                                        "1673"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-allocator",
+                                    "results": [
+                                        "False"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-format",
+                                    "results": [
+                                        "False"
+                                    ]
+                                }
+                            ]
+                        }
+                    ]
+                }
+            ]
+        },
+        {
+            "root_path": "mx-sdk-rs/contracts/feature-tests/erc-style-contracts",
+            "projects": [
+                {
+                    "project_path": "crowdfunding-erc20",
+                    "wasm_reports": [
+                        {
+                            "wasm_name": "crowdfunding-erc20.wasm",
+                            "extracted_features": [
+                                {
+                                    "feature_name": "size",
+                                    "results": [
+                                        "5323"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-allocator",
+                                    "results": [
+                                        "False"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-format",
+                                    "results": [
+                                        "False"
+                                    ]
+                                }
+                            ]
+                        }
+                    ]
+                },
+                {
+                    "project_path": "erc1155",
+                    "wasm_reports": [
+                        {
+                            "wasm_name": "erc1155.wasm",
+                            "extracted_features": [
+                                {
+                                    "feature_name": "size",
+                                    "results": [
+                                        "12180"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-allocator",
+                                    "results": [
+                                        "False"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-format",
+                                    "results": [
+                                        "False"
+                                    ]
+                                }
+                            ]
+                        }
+                    ]
+                },
+                {
+                    "project_path": "erc1155-marketplace",
+                    "wasm_reports": [
+                        {
+                            "wasm_name": "erc1155-marketplace.wasm",
+                            "extracted_features": [
+                                {
+                                    "feature_name": "size",
+                                    "results": [
+                                        "11144"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-allocator",
+                                    "results": [
+                                        "False"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-format",
+                                    "results": [
+                                        "False"
+                                    ]
+                                }
+                            ]
+                        }
+                    ]
+                },
+                {
+                    "project_path": "erc1155-user-mock",
+                    "wasm_reports": [
+                        {
+                            "wasm_name": "erc1155-user-mock.wasm",
+                            "extracted_features": [
+                                {
+                                    "feature_name": "size",
+                                    "results": [
+                                        "1358"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-allocator",
+                                    "results": [
+                                        "False"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-format",
+                                    "results": [
+                                        "False"
+                                    ]
+                                }
+                            ]
+                        }
+                    ]
+                },
+                {
+                    "project_path": "erc20",
+                    "wasm_reports": [
+                        {
+                            "wasm_name": "erc20.wasm",
+                            "extracted_features": [
+                                {
+                                    "feature_name": "size",
+                                    "results": [
+                                        "2130"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-allocator",
+                                    "results": [
+                                        "False"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-format",
+                                    "results": [
+                                        "False"
+                                    ]
+                                }
+                            ]
+                        }
+                    ]
+                },
+                {
+                    "project_path": "erc721",
+                    "wasm_reports": [
+                        {
+                            "wasm_name": "erc721.wasm",
+                            "extracted_features": [
+                                {
+                                    "feature_name": "size",
+                                    "results": [
+                                        "2573"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-allocator",
+                                    "results": [
+                                        "False"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-format",
+                                    "results": [
+                                        "False"
+                                    ]
+                                }
+                            ]
+                        }
+                    ]
+                },
+                {
+                    "project_path": "lottery-erc20",
+                    "wasm_reports": [
+                        {
+                            "wasm_name": "lottery-erc20.wasm",
+                            "extracted_features": [
+                                {
+                                    "feature_name": "size",
+                                    "results": [
+                                        "12764"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-allocator",
+                                    "results": [
+                                        "False"
+                                    ]
+                                },
+                                {
+                                    "feature_name": "has-format",
+                                    "results": [
+                                        "False"
+                                    ]
+                                }
+                            ]
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file

From 3c1b1b9a3824a17348ed8acfdbc97cb7a8427758 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Mon, 5 Aug 2024 16:10:19 +0300
Subject: [PATCH 1140/1254] code report cli - cleanup

---
 .../src/cmd/code_report/render_code_report.rs |    8 +-
 to_compared_report.json                       | 2555 -----------------
 2 files changed, 6 insertions(+), 2557 deletions(-)
 delete mode 100644 to_compared_report.json

diff --git a/framework/meta/src/cmd/code_report/render_code_report.rs b/framework/meta/src/cmd/code_report/render_code_report.rs
index 6f4a66618c..b176aa374a 100644
--- a/framework/meta/src/cmd/code_report/render_code_report.rs
+++ b/framework/meta/src/cmd/code_report/render_code_report.rs
@@ -88,8 +88,12 @@ impl<'a> CodeReportRender<'a> {
             // TODO this is only one time compared. Decide whether to exist or not
             parse_into_code_report_json(&mut compared_file_reader)
         } else {
-            serde_json::from_reader(compared_file_reader)
-                .unwrap_or_else(|_| panic!("Cannot deserialize into code report structure."))
+            serde_json::from_reader(compared_file_reader).unwrap_or_else(|_| {
+                self.render_reports();
+                self.writeln(":warning: Could not compare the 2 versions because the deserialization process into the code report structure failed. :warning:");
+                
+                Vec::new()
+            })
         };
 
         for report in self.reports.iter() {
diff --git a/to_compared_report.json b/to_compared_report.json
deleted file mode 100644
index 8f66650dff..0000000000
--- a/to_compared_report.json
+++ /dev/null
@@ -1,2555 +0,0 @@
-{
-    "features": [
-        "size",
-        "has-allocator",
-        "has-format"
-    ],
-    "folders": [
-        {
-            "root_path": "mx-sdk-rs/contracts/benchmarks",
-            "projects": [
-                {
-                    "project_path": "large-storage",
-                    "wasm_reports": [
-                        {
-                            "wasm_name": "large-storage.wasm",
-                            "extracted_features": [
-                                {
-                                    "feature_name": "size",
-                                    "results": [
-                                        "2160"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-allocator",
-                                    "results": [
-                                        "False"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-format",
-                                    "results": [
-                                        "False"
-                                    ]
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "project_path": "send-tx-repeat",
-                    "wasm_reports": [
-                        {
-                            "wasm_name": "send-tx-repeat.wasm",
-                            "extracted_features": [
-                                {
-                                    "feature_name": "size",
-                                    "results": [
-                                        "899"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-allocator",
-                                    "results": [
-                                        "False"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-format",
-                                    "results": [
-                                        "False"
-                                    ]
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "project_path": "str-repeat",
-                    "wasm_reports": [
-                        {
-                            "wasm_name": "str-repeat.wasm",
-                            "extracted_features": [
-                                {
-                                    "feature_name": "size",
-                                    "results": [
-                                        "2326"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-allocator",
-                                    "results": [
-                                        "False"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-format",
-                                    "results": [
-                                        "False"
-                                    ]
-                                }
-                            ]
-                        },
-                        {
-                            "wasm_name": "str-repeat-mb-builder-basic.wasm",
-                            "extracted_features": [
-                                {
-                                    "feature_name": "size",
-                                    "results": [
-                                        "754"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-allocator",
-                                    "results": [
-                                        "False"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-format",
-                                    "results": [
-                                        "False"
-                                    ]
-                                }
-                            ]
-                        },
-                        {
-                            "wasm_name": "str-repeat-mb-builder-cached.wasm",
-                            "extracted_features": [
-                                {
-                                    "feature_name": "size",
-                                    "results": [
-                                        "1134"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-allocator",
-                                    "results": [
-                                        "False"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-format",
-                                    "results": [
-                                        "False"
-                                    ]
-                                }
-                            ]
-                        }
-                    ]
-                }
-            ]
-        },
-        {
-            "root_path": "mx-sdk-rs/contracts/benchmarks/mappers",
-            "projects": [
-                {
-                    "project_path": "linked-list-repeat",
-                    "wasm_reports": [
-                        {
-                            "wasm_name": "linked-list-repeat.wasm",
-                            "extracted_features": [
-                                {
-                                    "feature_name": "size",
-                                    "results": [
-                                        "6473"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-allocator",
-                                    "results": [
-                                        "False"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-format",
-                                    "results": [
-                                        "False"
-                                    ]
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "project_path": "map-repeat",
-                    "wasm_reports": [
-                        {
-                            "wasm_name": "map-repeat.wasm",
-                            "extracted_features": [
-                                {
-                                    "feature_name": "size",
-                                    "results": [
-                                        "7178"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-allocator",
-                                    "results": [
-                                        "False"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-format",
-                                    "results": [
-                                        "False"
-                                    ]
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "project_path": "queue-repeat",
-                    "wasm_reports": [
-                        {
-                            "wasm_name": "queue-repeat.wasm",
-                            "extracted_features": [
-                                {
-                                    "feature_name": "size",
-                                    "results": [
-                                        "5789"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-allocator",
-                                    "results": [
-                                        "False"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-format",
-                                    "results": [
-                                        "False"
-                                    ]
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "project_path": "set-repeat",
-                    "wasm_reports": [
-                        {
-                            "wasm_name": "set-repeat.wasm",
-                            "extracted_features": [
-                                {
-                                    "feature_name": "size",
-                                    "results": [
-                                        "6943"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-allocator",
-                                    "results": [
-                                        "False"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-format",
-                                    "results": [
-                                        "False"
-                                    ]
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "project_path": "single-value-repeat",
-                    "wasm_reports": [
-                        {
-                            "wasm_name": "single-value-repeat.wasm",
-                            "extracted_features": [
-                                {
-                                    "feature_name": "size",
-                                    "results": [
-                                        "4435"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-allocator",
-                                    "results": [
-                                        "False"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-format",
-                                    "results": [
-                                        "False"
-                                    ]
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "project_path": "vec-repeat",
-                    "wasm_reports": [
-                        {
-                            "wasm_name": "vec-repeat.wasm",
-                            "extracted_features": [
-                                {
-                                    "feature_name": "size",
-                                    "results": [
-                                        "5223"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-allocator",
-                                    "results": [
-                                        "False"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-format",
-                                    "results": [
-                                        "False"
-                                    ]
-                                }
-                            ]
-                        }
-                    ]
-                }
-            ]
-        },
-        {
-            "root_path": "mx-sdk-rs/contracts/core",
-            "projects": [
-                {
-                    "project_path": "price-aggregator",
-                    "wasm_reports": [
-                        {
-                            "wasm_name": "multiversx-price-aggregator-sc.wasm",
-                            "extracted_features": [
-                                {
-                                    "feature_name": "size",
-                                    "results": [
-                                        "19314"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-allocator",
-                                    "results": [
-                                        "False"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-format",
-                                    "results": [
-                                        "False"
-                                    ]
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "project_path": "wegld-swap",
-                    "wasm_reports": [
-                        {
-                            "wasm_name": "multiversx-wegld-swap-sc.wasm",
-                            "extracted_features": [
-                                {
-                                    "feature_name": "size",
-                                    "results": [
-                                        "3550"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-allocator",
-                                    "results": [
-                                        "False"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-format",
-                                    "results": [
-                                        "False"
-                                    ]
-                                }
-                            ]
-                        }
-                    ]
-                }
-            ]
-        },
-        {
-            "root_path": "mx-sdk-rs/contracts/examples",
-            "projects": [
-                {
-                    "project_path": "adder",
-                    "wasm_reports": [
-                        {
-                            "wasm_name": "adder.wasm",
-                            "extracted_features": [
-                                {
-                                    "feature_name": "size",
-                                    "results": [
-                                        "696"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-allocator",
-                                    "results": [
-                                        "False"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-format",
-                                    "results": [
-                                        "False"
-                                    ]
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "project_path": "bonding-curve-contract",
-                    "wasm_reports": [
-                        {
-                            "wasm_name": "bonding-curve-contract.wasm",
-                            "extracted_features": [
-                                {
-                                    "feature_name": "size",
-                                    "results": [
-                                        "14725"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-allocator",
-                                    "results": [
-                                        "False"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-format",
-                                    "results": [
-                                        "False"
-                                    ]
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "project_path": "check-pause",
-                    "wasm_reports": [
-                        {
-                            "wasm_name": "check-pause.wasm",
-                            "extracted_features": [
-                                {
-                                    "feature_name": "size",
-                                    "results": [
-                                        "1228"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-allocator",
-                                    "results": [
-                                        "False"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-format",
-                                    "results": [
-                                        "False"
-                                    ]
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "project_path": "crowdfunding-esdt",
-                    "wasm_reports": [
-                        {
-                            "wasm_name": "crowdfunding-esdt.wasm",
-                            "extracted_features": [
-                                {
-                                    "feature_name": "size",
-                                    "results": [
-                                        "3984"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-allocator",
-                                    "results": [
-                                        "False"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-format",
-                                    "results": [
-                                        "False"
-                                    ]
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "project_path": "crypto-bubbles",
-                    "wasm_reports": [
-                        {
-                            "wasm_name": "crypto-bubbles.wasm",
-                            "extracted_features": [
-                                {
-                                    "feature_name": "size",
-                                    "results": [
-                                        "2345"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-allocator",
-                                    "results": [
-                                        "False"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-format",
-                                    "results": [
-                                        "False"
-                                    ]
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "project_path": "crypto-zombies",
-                    "wasm_reports": [
-                        {
-                            "wasm_name": "crypto-zombies.wasm",
-                            "extracted_features": [
-                                {
-                                    "feature_name": "size",
-                                    "results": [
-                                        "10296"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-allocator",
-                                    "results": [
-                                        "False"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-format",
-                                    "results": [
-                                        "False"
-                                    ]
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "project_path": "digital-cash",
-                    "wasm_reports": [
-                        {
-                            "wasm_name": "digital-cash.wasm",
-                            "extracted_features": [
-                                {
-                                    "feature_name": "size",
-                                    "results": [
-                                        "10039"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-allocator",
-                                    "results": [
-                                        "False"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-format",
-                                    "results": [
-                                        "False"
-                                    ]
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "project_path": "empty",
-                    "wasm_reports": [
-                        {
-                            "wasm_name": "empty.wasm",
-                            "extracted_features": [
-                                {
-                                    "feature_name": "size",
-                                    "results": [
-                                        "241"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-allocator",
-                                    "results": [
-                                        "False"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-format",
-                                    "results": [
-                                        "False"
-                                    ]
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "project_path": "esdt-transfer-with-fee",
-                    "wasm_reports": [
-                        {
-                            "wasm_name": "esdt-transfer-with-fee.wasm",
-                            "extracted_features": [
-                                {
-                                    "feature_name": "size",
-                                    "results": [
-                                        "7764"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-allocator",
-                                    "results": [
-                                        "False"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-format",
-                                    "results": [
-                                        "False"
-                                    ]
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "project_path": "factorial",
-                    "wasm_reports": [
-                        {
-                            "wasm_name": "factorial.wasm",
-                            "extracted_features": [
-                                {
-                                    "feature_name": "size",
-                                    "results": [
-                                        "576"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-allocator",
-                                    "results": [
-                                        "False"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-format",
-                                    "results": [
-                                        "False"
-                                    ]
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "project_path": "fractional-nfts",
-                    "wasm_reports": [
-                        {
-                            "wasm_name": "fractional-nfts.wasm",
-                            "extracted_features": [
-                                {
-                                    "feature_name": "size",
-                                    "results": [
-                                        "8440"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-allocator",
-                                    "results": [
-                                        "False"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-format",
-                                    "results": [
-                                        "False"
-                                    ]
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "project_path": "lottery-esdt",
-                    "wasm_reports": [
-                        {
-                            "wasm_name": "lottery-esdt.wasm",
-                            "extracted_features": [
-                                {
-                                    "feature_name": "size",
-                                    "results": [
-                                        "10978"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-allocator",
-                                    "results": [
-                                        "False"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-format",
-                                    "results": [
-                                        "False"
-                                    ]
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "project_path": "multisig",
-                    "wasm_reports": [
-                        {
-                            "wasm_name": "multisig.wasm",
-                            "extracted_features": [
-                                {
-                                    "feature_name": "size",
-                                    "results": [
-                                        "14223"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-allocator",
-                                    "results": [
-                                        "False"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-format",
-                                    "results": [
-                                        "False"
-                                    ]
-                                }
-                            ]
-                        },
-                        {
-                            "wasm_name": "multisig-full.wasm",
-                            "extracted_features": [
-                                {
-                                    "feature_name": "size",
-                                    "results": [
-                                        "15812"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-allocator",
-                                    "results": [
-                                        "False"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-format",
-                                    "results": [
-                                        "False"
-                                    ]
-                                }
-                            ]
-                        },
-                        {
-                            "wasm_name": "multisig-view.wasm",
-                            "extracted_features": [
-                                {
-                                    "feature_name": "size",
-                                    "results": [
-                                        "6241"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-allocator",
-                                    "results": [
-                                        "False"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-format",
-                                    "results": [
-                                        "False"
-                                    ]
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "project_path": "nft-minter",
-                    "wasm_reports": [
-                        {
-                            "wasm_name": "nft-minter.wasm",
-                            "extracted_features": [
-                                {
-                                    "feature_name": "size",
-                                    "results": [
-                                        "10018"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-allocator",
-                                    "results": [
-                                        "False"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-format",
-                                    "results": [
-                                        "False"
-                                    ]
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "project_path": "nft-storage-prepay",
-                    "wasm_reports": [
-                        {
-                            "wasm_name": "nft-storage-prepay.wasm",
-                            "extracted_features": [
-                                {
-                                    "feature_name": "size",
-                                    "results": [
-                                        "2290"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-allocator",
-                                    "results": [
-                                        "False"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-format",
-                                    "results": [
-                                        "False"
-                                    ]
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "project_path": "nft-subscription",
-                    "wasm_reports": [
-                        {
-                            "wasm_name": "nft-subscription.wasm",
-                            "extracted_features": [
-                                {
-                                    "feature_name": "size",
-                                    "results": [
-                                        "8782"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-allocator",
-                                    "results": [
-                                        "False"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-format",
-                                    "results": [
-                                        "False"
-                                    ]
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "project_path": "ping-pong-egld",
-                    "wasm_reports": [
-                        {
-                            "wasm_name": "ping-pong-egld.wasm",
-                            "extracted_features": [
-                                {
-                                    "feature_name": "size",
-                                    "results": [
-                                        "6021"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-allocator",
-                                    "results": [
-                                        "False"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-format",
-                                    "results": [
-                                        "False"
-                                    ]
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "project_path": "proxy-pause",
-                    "wasm_reports": [
-                        {
-                            "wasm_name": "proxy-pause.wasm",
-                            "extracted_features": [
-                                {
-                                    "feature_name": "size",
-                                    "results": [
-                                        "4616"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-allocator",
-                                    "results": [
-                                        "False"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-format",
-                                    "results": [
-                                        "False"
-                                    ]
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "project_path": "rewards-distribution",
-                    "wasm_reports": [
-                        {
-                            "wasm_name": "rewards-distribution.wasm",
-                            "extracted_features": [
-                                {
-                                    "feature_name": "size",
-                                    "results": [
-                                        "10227"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-allocator",
-                                    "results": [
-                                        "False"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-format",
-                                    "results": [
-                                        "False"
-                                    ]
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "project_path": "seed-nft-minter",
-                    "wasm_reports": [
-                        {
-                            "wasm_name": "seed-nft-minter.wasm",
-                            "extracted_features": [
-                                {
-                                    "feature_name": "size",
-                                    "results": [
-                                        "15106"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-allocator",
-                                    "results": [
-                                        "False"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-format",
-                                    "results": [
-                                        "False"
-                                    ]
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "project_path": "token-release",
-                    "wasm_reports": [
-                        {
-                            "wasm_name": "token-release.wasm",
-                            "extracted_features": [
-                                {
-                                    "feature_name": "size",
-                                    "results": [
-                                        "7767"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-allocator",
-                                    "results": [
-                                        "False"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-format",
-                                    "results": [
-                                        "False"
-                                    ]
-                                }
-                            ]
-                        }
-                    ]
-                }
-            ]
-        },
-        {
-            "root_path": "mx-sdk-rs/contracts/examples/crypto-kitties",
-            "projects": [
-                {
-                    "project_path": "kitty-auction",
-                    "wasm_reports": [
-                        {
-                            "wasm_name": "kitty-auction.wasm",
-                            "extracted_features": [
-                                {
-                                    "feature_name": "size",
-                                    "results": [
-                                        "10054"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-allocator",
-                                    "results": [
-                                        "False"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-format",
-                                    "results": [
-                                        "False"
-                                    ]
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "project_path": "kitty-genetic-alg",
-                    "wasm_reports": [
-                        {
-                            "wasm_name": "kitty-genetic-alg.wasm",
-                            "extracted_features": [
-                                {
-                                    "feature_name": "size",
-                                    "results": [
-                                        "3143"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-allocator",
-                                    "results": [
-                                        "False"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-format",
-                                    "results": [
-                                        "False"
-                                    ]
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "project_path": "kitty-ownership",
-                    "wasm_reports": [
-                        {
-                            "wasm_name": "kitty-ownership.wasm",
-                            "extracted_features": [
-                                {
-                                    "feature_name": "size",
-                                    "results": [
-                                        "12723"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-allocator",
-                                    "results": [
-                                        "False"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-format",
-                                    "results": [
-                                        "False"
-                                    ]
-                                }
-                            ]
-                        }
-                    ]
-                }
-            ]
-        },
-        {
-            "root_path": "mx-sdk-rs/contracts/examples/order-book",
-            "projects": [
-                {
-                    "project_path": "factory",
-                    "wasm_reports": [
-                        {
-                            "wasm_name": "order-book-factory.wasm",
-                            "extracted_features": [
-                                {
-                                    "feature_name": "size",
-                                    "results": [
-                                        "3760"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-allocator",
-                                    "results": [
-                                        "False"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-format",
-                                    "results": [
-                                        "False"
-                                    ]
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "project_path": "pair",
-                    "wasm_reports": [
-                        {
-                            "wasm_name": "order-book-pair.wasm",
-                            "extracted_features": [
-                                {
-                                    "feature_name": "size",
-                                    "results": [
-                                        "13778"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-allocator",
-                                    "results": [
-                                        "False"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-format",
-                                    "results": [
-                                        "False"
-                                    ]
-                                }
-                            ]
-                        }
-                    ]
-                }
-            ]
-        },
-        {
-            "root_path": "mx-sdk-rs/contracts/feature-tests",
-            "projects": [
-                {
-                    "project_path": "abi-tester",
-                    "wasm_reports": [
-                        {
-                            "wasm_name": "abi-tester.wasm",
-                            "extracted_features": [
-                                {
-                                    "feature_name": "size",
-                                    "results": [
-                                        "7128"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-allocator",
-                                    "results": [
-                                        "False"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-format",
-                                    "results": [
-                                        "False"
-                                    ]
-                                }
-                            ]
-                        },
-                        {
-                            "wasm_name": "abi-tester-ev.wasm",
-                            "extracted_features": [
-                                {
-                                    "feature_name": "size",
-                                    "results": [
-                                        "757"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-allocator",
-                                    "results": [
-                                        "False"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-format",
-                                    "results": [
-                                        "False"
-                                    ]
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "project_path": "alloc-features",
-                    "wasm_reports": [
-                        {
-                            "wasm_name": "alloc-features.wasm",
-                            "extracted_features": [
-                                {
-                                    "feature_name": "size",
-                                    "results": [
-                                        "16468"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-allocator",
-                                    "results": [
-                                        "False"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-format",
-                                    "results": [
-                                        "False"
-                                    ]
-                                }
-                            ]
-                        },
-                        {
-                            "wasm_name": "alloc-mem-fail.wasm",
-                            "extracted_features": [
-                                {
-                                    "feature_name": "size",
-                                    "results": [
-                                        "16421"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-allocator",
-                                    "results": [
-                                        "False"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-format",
-                                    "results": [
-                                        "False"
-                                    ]
-                                }
-                            ]
-                        },
-                        {
-                            "wasm_name": "alloc-mem-leaking.wasm",
-                            "extracted_features": [
-                                {
-                                    "feature_name": "size",
-                                    "results": [
-                                        "16580"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-allocator",
-                                    "results": [
-                                        "False"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-format",
-                                    "results": [
-                                        "False"
-                                    ]
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "project_path": "basic-features",
-                    "wasm_reports": [
-                        {
-                            "wasm_name": "basic-features.wasm",
-                            "extracted_features": [
-                                {
-                                    "feature_name": "size",
-                                    "results": [
-                                        "64827"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-allocator",
-                                    "results": [
-                                        "False"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-format",
-                                    "results": [
-                                        "False"
-                                    ]
-                                }
-                            ]
-                        },
-                        {
-                            "wasm_name": "basic-features-storage-bytes.wasm",
-                            "extracted_features": [
-                                {
-                                    "feature_name": "size",
-                                    "results": [
-                                        "538"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-allocator",
-                                    "results": [
-                                        "False"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-format",
-                                    "results": [
-                                        "False"
-                                    ]
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "project_path": "big-float-features",
-                    "wasm_reports": [
-                        {
-                            "wasm_name": "big-float-features.wasm",
-                            "extracted_features": [
-                                {
-                                    "feature_name": "size",
-                                    "results": [
-                                        "6463"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-allocator",
-                                    "results": [
-                                        "False"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-format",
-                                    "results": [
-                                        "False"
-                                    ]
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "project_path": "esdt-system-sc-mock",
-                    "wasm_reports": [
-                        {
-                            "wasm_name": "esdt-system-sc-mock.wasm",
-                            "extracted_features": [
-                                {
-                                    "feature_name": "size",
-                                    "results": [
-                                        "3794"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-allocator",
-                                    "results": [
-                                        "False"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-format",
-                                    "results": [
-                                        "False"
-                                    ]
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "project_path": "exchange-features",
-                    "wasm_reports": [
-                        {
-                            "wasm_name": "exchange-features.wasm",
-                            "extracted_features": [
-                                {
-                                    "feature_name": "size",
-                                    "results": [
-                                        "1575"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-allocator",
-                                    "results": [
-                                        "False"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-format",
-                                    "results": [
-                                        "False"
-                                    ]
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "project_path": "formatted-message-features",
-                    "wasm_reports": [
-                        {
-                            "wasm_name": "formatted-message-features.wasm",
-                            "extracted_features": [
-                                {
-                                    "feature_name": "size",
-                                    "results": [
-                                        "3462"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-allocator",
-                                    "results": [
-                                        "False"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-format",
-                                    "results": [
-                                        "False"
-                                    ]
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "project_path": "managed-map-features",
-                    "wasm_reports": [
-                        {
-                            "wasm_name": "managed-map-features.wasm",
-                            "extracted_features": [
-                                {
-                                    "feature_name": "size",
-                                    "results": [
-                                        "1315"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-allocator",
-                                    "results": [
-                                        "False"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-format",
-                                    "results": [
-                                        "False"
-                                    ]
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "project_path": "multi-contract-features",
-                    "wasm_reports": [
-                        {
-                            "wasm_name": "multi-contract-alt-impl.wasm",
-                            "extracted_features": [
-                                {
-                                    "feature_name": "size",
-                                    "results": [
-                                        "360"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-allocator",
-                                    "results": [
-                                        "False"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-format",
-                                    "results": [
-                                        "False"
-                                    ]
-                                }
-                            ]
-                        },
-                        {
-                            "wasm_name": "multi-contract-example-feature.wasm",
-                            "extracted_features": [
-                                {
-                                    "feature_name": "size",
-                                    "results": [
-                                        "677"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-allocator",
-                                    "results": [
-                                        "False"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-format",
-                                    "results": [
-                                        "False"
-                                    ]
-                                }
-                            ]
-                        },
-                        {
-                            "wasm_name": "multi-contract-features.wasm",
-                            "extracted_features": [
-                                {
-                                    "feature_name": "size",
-                                    "results": [
-                                        "678"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-allocator",
-                                    "results": [
-                                        "False"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-format",
-                                    "results": [
-                                        "False"
-                                    ]
-                                }
-                            ]
-                        },
-                        {
-                            "wasm_name": "multi-contract-features-view.wasm",
-                            "extracted_features": [
-                                {
-                                    "feature_name": "size",
-                                    "results": [
-                                        "1115"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-allocator",
-                                    "results": [
-                                        "False"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-format",
-                                    "results": [
-                                        "False"
-                                    ]
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "project_path": "panic-message-features",
-                    "wasm_reports": [
-                        {
-                            "wasm_name": "panic-message-features.wasm",
-                            "extracted_features": [
-                                {
-                                    "feature_name": "size",
-                                    "results": [
-                                        "12613"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-allocator",
-                                    "results": [
-                                        "False"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-format",
-                                    "results": [
-                                        "True"
-                                    ]
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "project_path": "payable-features",
-                    "wasm_reports": [
-                        {
-                            "wasm_name": "payable-features.wasm",
-                            "extracted_features": [
-                                {
-                                    "feature_name": "size",
-                                    "results": [
-                                        "4368"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-allocator",
-                                    "results": [
-                                        "False"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-format",
-                                    "results": [
-                                        "False"
-                                    ]
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "project_path": "rust-snippets-generator-test",
-                    "wasm_reports": [
-                        {
-                            "wasm_name": "rust-snippets-generator-test.wasm",
-                            "extracted_features": [
-                                {
-                                    "feature_name": "size",
-                                    "results": [
-                                        "4971"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-allocator",
-                                    "results": [
-                                        "False"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-format",
-                                    "results": [
-                                        "False"
-                                    ]
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "project_path": "rust-testing-framework-tester",
-                    "wasm_reports": [
-                        {
-                            "wasm_name": "rust-testing-framework-tester.wasm",
-                            "extracted_features": [
-                                {
-                                    "feature_name": "size",
-                                    "results": [
-                                        "8596"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-allocator",
-                                    "results": [
-                                        "False"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-format",
-                                    "results": [
-                                        "False"
-                                    ]
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "project_path": "scenario-tester",
-                    "wasm_reports": [
-                        {
-                            "wasm_name": "scenario-tester.wasm",
-                            "extracted_features": [
-                                {
-                                    "feature_name": "size",
-                                    "results": [
-                                        "1114"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-allocator",
-                                    "results": [
-                                        "False"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-format",
-                                    "results": [
-                                        "False"
-                                    ]
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "project_path": "use-module",
-                    "wasm_reports": [
-                        {
-                            "wasm_name": "use-module.wasm",
-                            "extracted_features": [
-                                {
-                                    "feature_name": "size",
-                                    "results": [
-                                        "33392"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-allocator",
-                                    "results": [
-                                        "False"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-format",
-                                    "results": [
-                                        "True"
-                                    ]
-                                }
-                            ]
-                        },
-                        {
-                            "wasm_name": "use-module-view.wasm",
-                            "extracted_features": [
-                                {
-                                    "feature_name": "size",
-                                    "results": [
-                                        "733"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-allocator",
-                                    "results": [
-                                        "False"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-format",
-                                    "results": [
-                                        "False"
-                                    ]
-                                }
-                            ]
-                        }
-                    ]
-                }
-            ]
-        },
-        {
-            "root_path": "mx-sdk-rs/contracts/feature-tests/composability",
-            "projects": [
-                {
-                    "project_path": "builtin-func-features",
-                    "wasm_reports": [
-                        {
-                            "wasm_name": "builtin-func-features.wasm",
-                            "extracted_features": [
-                                {
-                                    "feature_name": "size",
-                                    "results": [
-                                        "1099"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-allocator",
-                                    "results": [
-                                        "False"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-format",
-                                    "results": [
-                                        "False"
-                                    ]
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "project_path": "forwarder",
-                    "wasm_reports": [
-                        {
-                            "wasm_name": "forwarder.wasm",
-                            "extracted_features": [
-                                {
-                                    "feature_name": "size",
-                                    "results": [
-                                        "32628"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-allocator",
-                                    "results": [
-                                        "False"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-format",
-                                    "results": [
-                                        "False"
-                                    ]
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "project_path": "forwarder-legacy",
-                    "wasm_reports": [
-                        {
-                            "wasm_name": "forwarder-legacy.wasm",
-                            "extracted_features": [
-                                {
-                                    "feature_name": "size",
-                                    "results": [
-                                        "32296"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-allocator",
-                                    "results": [
-                                        "False"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-format",
-                                    "results": [
-                                        "False"
-                                    ]
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "project_path": "forwarder-queue",
-                    "wasm_reports": [
-                        {
-                            "wasm_name": "forwarder-queue.wasm",
-                            "extracted_features": [
-                                {
-                                    "feature_name": "size",
-                                    "results": [
-                                        "12091"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-allocator",
-                                    "results": [
-                                        "False"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-format",
-                                    "results": [
-                                        "False"
-                                    ]
-                                }
-                            ]
-                        },
-                        {
-                            "wasm_name": "forwarder-queue-promises.wasm",
-                            "extracted_features": [
-                                {
-                                    "feature_name": "size",
-                                    "results": [
-                                        "13004"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-allocator",
-                                    "results": [
-                                        "False"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-format",
-                                    "results": [
-                                        "False"
-                                    ]
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "project_path": "forwarder-raw",
-                    "wasm_reports": [
-                        {
-                            "wasm_name": "forwarder-raw.wasm",
-                            "extracted_features": [
-                                {
-                                    "feature_name": "size",
-                                    "results": [
-                                        "15261"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-allocator",
-                                    "results": [
-                                        "False"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-format",
-                                    "results": [
-                                        "False"
-                                    ]
-                                }
-                            ]
-                        },
-                        {
-                            "wasm_name": "forwarder-raw-init-async-call.wasm",
-                            "extracted_features": [
-                                {
-                                    "feature_name": "size",
-                                    "results": [
-                                        "3058"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-allocator",
-                                    "results": [
-                                        "False"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-format",
-                                    "results": [
-                                        "False"
-                                    ]
-                                }
-                            ]
-                        },
-                        {
-                            "wasm_name": "forwarder-raw-init-sync-call.wasm",
-                            "extracted_features": [
-                                {
-                                    "feature_name": "size",
-                                    "results": [
-                                        "3328"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-allocator",
-                                    "results": [
-                                        "False"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-format",
-                                    "results": [
-                                        "False"
-                                    ]
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "project_path": "local-esdt-and-nft",
-                    "wasm_reports": [
-                        {
-                            "wasm_name": "local-esdt-and-nft.wasm",
-                            "extracted_features": [
-                                {
-                                    "feature_name": "size",
-                                    "results": [
-                                        "12016"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-allocator",
-                                    "results": [
-                                        "False"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-format",
-                                    "results": [
-                                        "False"
-                                    ]
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "project_path": "promises-features",
-                    "wasm_reports": [
-                        {
-                            "wasm_name": "promises-features.wasm",
-                            "extracted_features": [
-                                {
-                                    "feature_name": "size",
-                                    "results": [
-                                        "12885"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-allocator",
-                                    "results": [
-                                        "False"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-format",
-                                    "results": [
-                                        "False"
-                                    ]
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "project_path": "proxy-test-first",
-                    "wasm_reports": [
-                        {
-                            "wasm_name": "proxy-test-first.wasm",
-                            "extracted_features": [
-                                {
-                                    "feature_name": "size",
-                                    "results": [
-                                        "6024"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-allocator",
-                                    "results": [
-                                        "False"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-format",
-                                    "results": [
-                                        "False"
-                                    ]
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "project_path": "proxy-test-second",
-                    "wasm_reports": [
-                        {
-                            "wasm_name": "proxy-test-second.wasm",
-                            "extracted_features": [
-                                {
-                                    "feature_name": "size",
-                                    "results": [
-                                        "2112"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-allocator",
-                                    "results": [
-                                        "False"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-format",
-                                    "results": [
-                                        "False"
-                                    ]
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "project_path": "recursive-caller",
-                    "wasm_reports": [
-                        {
-                            "wasm_name": "recursive-caller.wasm",
-                            "extracted_features": [
-                                {
-                                    "feature_name": "size",
-                                    "results": [
-                                        "5459"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-allocator",
-                                    "results": [
-                                        "False"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-format",
-                                    "results": [
-                                        "False"
-                                    ]
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "project_path": "transfer-role-features",
-                    "wasm_reports": [
-                        {
-                            "wasm_name": "transfer-role-features.wasm",
-                            "extracted_features": [
-                                {
-                                    "feature_name": "size",
-                                    "results": [
-                                        "8758"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-allocator",
-                                    "results": [
-                                        "False"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-format",
-                                    "results": [
-                                        "False"
-                                    ]
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "project_path": "vault",
-                    "wasm_reports": [
-                        {
-                            "wasm_name": "vault.wasm",
-                            "extracted_features": [
-                                {
-                                    "feature_name": "size",
-                                    "results": [
-                                        "7821"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-allocator",
-                                    "results": [
-                                        "False"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-format",
-                                    "results": [
-                                        "False"
-                                    ]
-                                }
-                            ]
-                        },
-                        {
-                            "wasm_name": "vault-promises.wasm",
-                            "extracted_features": [
-                                {
-                                    "feature_name": "size",
-                                    "results": [
-                                        "8514"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-allocator",
-                                    "results": [
-                                        "False"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-format",
-                                    "results": [
-                                        "False"
-                                    ]
-                                }
-                            ]
-                        },
-                        {
-                            "wasm_name": "vault-upgrade.wasm",
-                            "extracted_features": [
-                                {
-                                    "feature_name": "size",
-                                    "results": [
-                                        "697"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-allocator",
-                                    "results": [
-                                        "False"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-format",
-                                    "results": [
-                                        "False"
-                                    ]
-                                }
-                            ]
-                        }
-                    ]
-                }
-            ]
-        },
-        {
-            "root_path": "mx-sdk-rs/contracts/feature-tests/composability/esdt-contract-pair",
-            "projects": [
-                {
-                    "project_path": "first-contract",
-                    "wasm_reports": [
-                        {
-                            "wasm_name": "first-contract.wasm",
-                            "extracted_features": [
-                                {
-                                    "feature_name": "size",
-                                    "results": [
-                                        "3083"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-allocator",
-                                    "results": [
-                                        "False"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-format",
-                                    "results": [
-                                        "False"
-                                    ]
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "project_path": "second-contract",
-                    "wasm_reports": [
-                        {
-                            "wasm_name": "second-contract.wasm",
-                            "extracted_features": [
-                                {
-                                    "feature_name": "size",
-                                    "results": [
-                                        "1355"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-allocator",
-                                    "results": [
-                                        "False"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-format",
-                                    "results": [
-                                        "False"
-                                    ]
-                                }
-                            ]
-                        }
-                    ]
-                }
-            ]
-        },
-        {
-            "root_path": "mx-sdk-rs/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback",
-            "projects": [
-                {
-                    "project_path": "child",
-                    "wasm_reports": [
-                        {
-                            "wasm_name": "child.wasm",
-                            "extracted_features": [
-                                {
-                                    "feature_name": "size",
-                                    "results": [
-                                        "4051"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-allocator",
-                                    "results": [
-                                        "False"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-format",
-                                    "results": [
-                                        "False"
-                                    ]
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "project_path": "parent",
-                    "wasm_reports": [
-                        {
-                            "wasm_name": "parent.wasm",
-                            "extracted_features": [
-                                {
-                                    "feature_name": "size",
-                                    "results": [
-                                        "1673"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-allocator",
-                                    "results": [
-                                        "False"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-format",
-                                    "results": [
-                                        "False"
-                                    ]
-                                }
-                            ]
-                        }
-                    ]
-                }
-            ]
-        },
-        {
-            "root_path": "mx-sdk-rs/contracts/feature-tests/erc-style-contracts",
-            "projects": [
-                {
-                    "project_path": "crowdfunding-erc20",
-                    "wasm_reports": [
-                        {
-                            "wasm_name": "crowdfunding-erc20.wasm",
-                            "extracted_features": [
-                                {
-                                    "feature_name": "size",
-                                    "results": [
-                                        "5323"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-allocator",
-                                    "results": [
-                                        "False"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-format",
-                                    "results": [
-                                        "False"
-                                    ]
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "project_path": "erc1155",
-                    "wasm_reports": [
-                        {
-                            "wasm_name": "erc1155.wasm",
-                            "extracted_features": [
-                                {
-                                    "feature_name": "size",
-                                    "results": [
-                                        "12180"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-allocator",
-                                    "results": [
-                                        "False"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-format",
-                                    "results": [
-                                        "False"
-                                    ]
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "project_path": "erc1155-marketplace",
-                    "wasm_reports": [
-                        {
-                            "wasm_name": "erc1155-marketplace.wasm",
-                            "extracted_features": [
-                                {
-                                    "feature_name": "size",
-                                    "results": [
-                                        "11144"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-allocator",
-                                    "results": [
-                                        "False"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-format",
-                                    "results": [
-                                        "False"
-                                    ]
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "project_path": "erc1155-user-mock",
-                    "wasm_reports": [
-                        {
-                            "wasm_name": "erc1155-user-mock.wasm",
-                            "extracted_features": [
-                                {
-                                    "feature_name": "size",
-                                    "results": [
-                                        "1358"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-allocator",
-                                    "results": [
-                                        "False"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-format",
-                                    "results": [
-                                        "False"
-                                    ]
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "project_path": "erc20",
-                    "wasm_reports": [
-                        {
-                            "wasm_name": "erc20.wasm",
-                            "extracted_features": [
-                                {
-                                    "feature_name": "size",
-                                    "results": [
-                                        "2130"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-allocator",
-                                    "results": [
-                                        "False"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-format",
-                                    "results": [
-                                        "False"
-                                    ]
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "project_path": "erc721",
-                    "wasm_reports": [
-                        {
-                            "wasm_name": "erc721.wasm",
-                            "extracted_features": [
-                                {
-                                    "feature_name": "size",
-                                    "results": [
-                                        "2573"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-allocator",
-                                    "results": [
-                                        "False"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-format",
-                                    "results": [
-                                        "False"
-                                    ]
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "project_path": "lottery-erc20",
-                    "wasm_reports": [
-                        {
-                            "wasm_name": "lottery-erc20.wasm",
-                            "extracted_features": [
-                                {
-                                    "feature_name": "size",
-                                    "results": [
-                                        "12764"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-allocator",
-                                    "results": [
-                                        "False"
-                                    ]
-                                },
-                                {
-                                    "feature_name": "has-format",
-                                    "results": [
-                                        "False"
-                                    ]
-                                }
-                            ]
-                        }
-                    ]
-                }
-            ]
-        }
-    ]
-}
\ No newline at end of file

From 7bd2b5774775b57eddd6776a508abded630bbfba Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Mon, 5 Aug 2024 17:17:18 +0300
Subject: [PATCH 1141/1254] cli code report - format error

---
 framework/meta/src/cmd/code_report/render_code_report.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/framework/meta/src/cmd/code_report/render_code_report.rs b/framework/meta/src/cmd/code_report/render_code_report.rs
index b176aa374a..54b0a5d9c9 100644
--- a/framework/meta/src/cmd/code_report/render_code_report.rs
+++ b/framework/meta/src/cmd/code_report/render_code_report.rs
@@ -90,7 +90,7 @@ impl<'a> CodeReportRender<'a> {
         } else {
             serde_json::from_reader(compared_file_reader).unwrap_or_else(|_| {
                 self.render_reports();
-                self.writeln(":warning: Could not compare the 2 versions because the deserialization process into the code report structure failed. :warning:");
+                self.writeln("\n:warning: Could not compare the 2 versions because the deserialization process into the code report structure failed. :warning:");
                 
                 Vec::new()
             })

From 826b7ce35afc45d3b9d24df95b13df248734b511 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Mon, 5 Aug 2024 17:44:46 +0300
Subject: [PATCH 1142/1254] cli code report - change action version

---
 .github/workflows/actions.yml |  2 +-
 reported.md                   | 96 +++++++++++++++++++++++++++++++++++
 2 files changed, 97 insertions(+), 1 deletion(-)
 create mode 100644 reported.md

diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
index c0917d3746..159dcd514b 100644
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -14,7 +14,7 @@ permissions:
 jobs:
   contracts:
     name: Contracts
-    uses: multiversx/mx-sc-actions/.github/workflows/contracts.yml@3ccc32c6283f3e7106b324b742d10aae28827c15
+    uses: multiversx/mx-sc-actions/.github/workflows/contracts.yml@c50a21fcb5a9d85f01990402db58979085d920b1
     with:
       rust-toolchain: stable
       path-to-sc-meta: framework/meta
diff --git a/reported.md b/reported.md
new file mode 100644
index 0000000000..f397b5b8e2
--- /dev/null
+++ b/reported.md
@@ -0,0 +1,96 @@
+| Path                                                         |                                     size |                  has-allocator |                     has-format |
+| :-- | --: | --: | --: |
+| token-release.wasm | 7776 | false | without message |
+| adder.wasm | 696 | false | none |
+| order-book-pair.wasm | 13786 | false | without message |
+| order-book-factory.wasm | 3771 | false | without message |
+| nft-storage-prepay.wasm | 2295 | false | none |
+| multisig.wasm | 14145 | false | without message |
+| multisig-full.wasm | 15672 | false | without message |
+| multisig-view.wasm | 6248 | false | without message |
+| bonding-curve-contract.wasm | 14735 | false | without message |
+| seed-nft-minter.wasm | 15118 | false | without message |
+| rewards-distribution.wasm | 10220 | false | without message |
+| crypto-bubbles.wasm | 2347 | false | none |
+| kitty-auction.wasm | 10065 | false | without message |
+| kitty-genetic-alg.wasm | 3147 | false | without message |
+| kitty-ownership.wasm | 12731 | false | without message |
+| nft-subscription.wasm | 8793 | false | without message |
+| proxy-pause.wasm | 4627 | false | without message |
+| lottery-esdt.wasm | 10989 | false | without message |
+| esdt-transfer-with-fee.wasm | 7779 | false | without message |
+| check-pause.wasm | 1228 | false | none |
+| factorial.wasm | 576 | false | none |
+| digital-cash.wasm | 10047 | false | without message |
+| crypto-zombies.wasm | 10304 | false | without message |
+| nft-minter.wasm | 10028 | false | without message |
+| empty.wasm | 241 | false | none |
+| fractional-nfts.wasm | 8447 | false | without message |
+| crowdfunding-esdt.wasm | 3988 | false | none |
+| ping-pong-egld.wasm | 6032 | false | without message |
+| send-tx-repeat.wasm | 901 | false | none |
+| large-storage.wasm | 2164 | false | without message |
+| map-repeat.wasm | 7234 | false | without message |
+| queue-repeat.wasm | 5853 | false | without message |
+| set-repeat.wasm | 7013 | false | without message |
+| single-value-repeat.wasm | 4440 | false | without message |
+| linked-list-repeat.wasm | 6681 | true | without message |
+| vec-repeat.wasm | 5231 | false | without message |
+| str-repeat.wasm | 2389 | false | without message |
+| str-repeat-mb-builder-cached.wasm | 1139 | false | without message |
+| str-repeat-mb-builder-basic.wasm | 759 | false | none |
+| big-float-features.wasm | 6468 | false | without message |
+| erc20.wasm | 2133 | false | none |
+| erc721.wasm | 2578 | false | none |
+| lottery-erc20.wasm | 12814 | false | without message |
+| erc1155-marketplace.wasm | 11172 | false | without message |
+| crowdfunding-erc20.wasm | 5331 | false | without message |
+| erc1155-user-mock.wasm | 1360 | false | without message |
+| erc1155.wasm | 12197 | false | without message |
+| scenario-tester.wasm | 1114 | false | none |
+| managed-map-features.wasm | 1315 | false | none |
+| use-module-view.wasm | 733 | false | none |
+| use-module.wasm | 33452 | false | without message |
+| rust-snippets-generator-test.wasm | 4979 | false | without message |
+| basic-features.wasm | 65181 | false | without message |
+| basic-features-storage-bytes.wasm | 538 | false | none |
+| payable-features.wasm | 4396 | false | without message |
+| promises-features.wasm | 12926 | false | without message |
+| vault-promises.wasm | 8523 | false | without message |
+| vault-upgrade.wasm | 700 | false | none |
+| vault.wasm | 7826 | false | without message |
+| first-contract.wasm | 3086 | false | without message |
+| second-contract.wasm | 1355 | false | none |
+| forwarder-legacy.wasm | 32330 | false | without message |
+| proxy-test-second.wasm | 2105 | false | without message |
+| recursive-caller.wasm | 5466 | false | without message |
+| forwarder-queue-promises.wasm | 13096 | false | without message |
+| forwarder-queue.wasm | 12181 | false | without message |
+| forwarder.wasm | 32687 | false | without message |
+| builtin-func-features.wasm | 1101 | false | none |
+| local-esdt-and-nft.wasm | 12071 | false | without message |
+| forwarder-raw.wasm | 15309 | false | without message |
+| forwarder-raw-init-sync-call.wasm | 3332 | false | none |
+| forwarder-raw-init-async-call.wasm | 3062 | false | none |
+| parent.wasm | 1678 | false | none |
+| child.wasm | 4057 | false | without message |
+| transfer-role-features.wasm | 8775 | false | without message |
+| proxy-test-first.wasm | 6031 | false | without message |
+| exchange-features.wasm | 1577 | false | none |
+| alloc-features.wasm | 16748 | false | without message |
+| alloc-mem-leaking.wasm | 16857 | false | without message |
+| alloc-mem-fail.wasm | 16682 | true | without message |
+| abi-tester.wasm | 7182 | true | without message |
+| abi-tester-ev.wasm | 757 | false | none |
+| panic-message-features.wasm | 12875 | false | with message |
+| formatted-message-features.wasm | 3470 | false | without message |
+| multi-contract-features.wasm | 678 | false | none |
+| multi-contract-alt-impl.wasm | 360 | false | none |
+| multi-contract-example-feature.wasm | 677 | false | none |
+| multi-contract-features-view.wasm | 1115 | false | none |
+| rust-testing-framework-tester.wasm | 8602 | false | without message |
+| esdt-system-sc-mock.wasm | 3799 | false | none |
+| multiversx-wegld-swap-sc.wasm | 3557 | false | without message |
+| multiversx-price-aggregator-sc.wasm | 19327 | false | without message |
+
+:warning: Could not compare the 2 versions because the deserialization process into the code report structure failed. :warning:

From c2f05f120c454e34b158457abc69c40ff2e5bf72 Mon Sep 17 00:00:00 2001
From: Alin Cruceat <alyn_509@yahoo.com>
Date: Tue, 6 Aug 2024 14:06:49 +0300
Subject: [PATCH 1143/1254] add author flag to sc-meta template + default

---
 framework/meta-lib/src/cargo_toml_contents.rs | 30 +++++++++++-
 framework/meta/src/cli/cli_args_standalone.rs |  5 ++
 .../meta/src/cmd/template/contract_creator.rs | 12 +++--
 .../src/cmd/template/template_adjuster.rs     | 22 +++++----
 framework/meta/tests/template_test.rs         | 48 ++++++++++++++-----
 5 files changed, 88 insertions(+), 29 deletions(-)

diff --git a/framework/meta-lib/src/cargo_toml_contents.rs b/framework/meta-lib/src/cargo_toml_contents.rs
index 49721f5cec..1ffc984dbf 100644
--- a/framework/meta-lib/src/cargo_toml_contents.rs
+++ b/framework/meta-lib/src/cargo_toml_contents.rs
@@ -10,6 +10,9 @@ use crate::contract::sc_config::ContractVariantProfile;
 
 pub const CARGO_TOML_DEPENDENCIES: &str = "dependencies";
 pub const CARGO_TOML_DEV_DEPENDENCIES: &str = "dev-dependencies";
+pub const PACKAGE: &str = "package";
+pub const AUTHORS: &str = "authors";
+const DEFAULT_AUTHOR: &str = "you";
 const AUTO_GENERATED: &str = "# Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 # ##########################################
@@ -69,7 +72,7 @@ impl CargoTomlContents {
 
     pub fn package_name(&self) -> String {
         self.toml_value
-            .get("package")
+            .get(PACKAGE)
             .expect("missing package in Cargo.toml")
             .get("name")
             .expect("missing package name in Cargo.toml")
@@ -80,7 +83,7 @@ impl CargoTomlContents {
 
     pub fn package_edition(&self) -> String {
         self.toml_value
-            .get("package")
+            .get(PACKAGE)
             .expect("missing package in Cargo.toml")
             .get("edition")
             .expect("missing package name in Cargo.toml")
@@ -158,6 +161,29 @@ impl CargoTomlContents {
         self.toml_value.get(CARGO_TOML_DEV_DEPENDENCIES).is_some()
     }
 
+    pub fn change_author(&mut self, authors: PathBuf) -> bool {
+        let package = self
+            .toml_value
+            .get_mut(PACKAGE)
+            .unwrap_or_else(|| panic!("no dependencies found in crate {}", self.path.display()))
+            .as_table_mut()
+            .expect("missing package in Cargo.toml");
+
+        package.remove(AUTHORS);
+
+        let mut author_as_str = authors
+            .into_os_string()
+            .into_string()
+            .unwrap_or(DEFAULT_AUTHOR.to_string());
+        if author_as_str.is_empty() {
+            author_as_str = DEFAULT_AUTHOR.to_string();
+        }
+        let new_authors = vec![toml::Value::String(author_as_str)];
+        package.insert(AUTHORS.to_owned(), toml::Value::Array(new_authors));
+
+        true
+    }
+
     pub fn dev_dependencies_mut(&mut self) -> &mut Table {
         self.toml_value
             .get_mut(CARGO_TOML_DEV_DEPENDENCIES)
diff --git a/framework/meta/src/cli/cli_args_standalone.rs b/framework/meta/src/cli/cli_args_standalone.rs
index e66c83deb4..d9d4ca5a4e 100644
--- a/framework/meta/src/cli/cli_args_standalone.rs
+++ b/framework/meta/src/cli/cli_args_standalone.rs
@@ -265,6 +265,11 @@ pub struct TemplateArgs {
     /// Will be current directory if not specified.
     #[arg(long, verbatim_doc_comment)]
     pub path: Option<PathBuf>,
+
+    /// The author of the contract is to receive.
+    /// If missing, the template author will be considered.
+    #[arg(long, verbatim_doc_comment)]
+    pub author: Option<PathBuf>,
 }
 
 impl CliArgsToRaw for TemplateArgs {
diff --git a/framework/meta/src/cmd/template/contract_creator.rs b/framework/meta/src/cmd/template/contract_creator.rs
index 65e45f4d47..cac4d9a7d0 100644
--- a/framework/meta/src/cmd/template/contract_creator.rs
+++ b/framework/meta/src/cmd/template/contract_creator.rs
@@ -1,3 +1,5 @@
+use std::path::PathBuf;
+
 use convert_case::{Case, Casing};
 
 use crate::{
@@ -20,7 +22,7 @@ pub fn create_contract(args: &TemplateArgs) {
 
     let creator = ContractCreator::new(&repo_temp_download, args.template.clone(), target, false);
 
-    creator.create_contract(version_tag);
+    creator.create_contract(version_tag, args.author.clone().unwrap_or_default());
 }
 
 fn target_from_args(args: &TemplateArgs) -> ContractCreatorTarget {
@@ -79,9 +81,9 @@ impl<'a> ContractCreator<'a> {
         }
     }
 
-    pub fn create_contract(&self, args_tag: FrameworkVersion) {
+    pub fn create_contract(&self, args_tag: FrameworkVersion, new_authors: PathBuf) {
         self.copy_template(args_tag.clone());
-        self.update_dependencies(args_tag);
+        self.update_dependencies(args_tag, new_authors);
         self.rename_template();
     }
 
@@ -90,8 +92,8 @@ impl<'a> ContractCreator<'a> {
             .copy_template(self.target.contract_dir(), args_tag);
     }
 
-    pub fn update_dependencies(&self, args_tag: FrameworkVersion) {
-        self.adjuster.update_dependencies(args_tag);
+    pub fn update_dependencies(&self, args_tag: FrameworkVersion, new_authors: PathBuf) {
+        self.adjuster.update_dependencies(args_tag, new_authors);
     }
 
     pub fn rename_template(&self) {
diff --git a/framework/meta/src/cmd/template/template_adjuster.rs b/framework/meta/src/cmd/template/template_adjuster.rs
index e1ac5ad827..332106735e 100644
--- a/framework/meta/src/cmd/template/template_adjuster.rs
+++ b/framework/meta/src/cmd/template/template_adjuster.rs
@@ -1,3 +1,5 @@
+use std::path::PathBuf;
+
 use super::{template_metadata::TemplateMetadata, ContractCreatorTarget};
 use crate::{
     cmd::upgrade::upgrade_common::{rename_files, replace_in_files},
@@ -22,14 +24,14 @@ pub struct TemplateAdjuster {
     pub keep_paths: bool,
 }
 impl TemplateAdjuster {
-    pub fn update_dependencies(&self, args_tag: FrameworkVersion) {
-        self.update_dependencies_root();
-        self.update_dependencies_meta();
-        self.update_dependencies_wasm(args_tag);
-        self.update_dependencies_interact();
+    pub fn update_dependencies(&self, args_tag: FrameworkVersion, new_authors: PathBuf) {
+        self.update_cargo_toml_root(new_authors.clone());
+        self.update_cargo_toml_meta();
+        self.update_cargo_toml_wasm(args_tag);
+        self.update_cargo_toml_interact(new_authors);
     }
 
-    fn update_dependencies_root(&self) {
+    fn update_cargo_toml_root(&self, new_authors: PathBuf) {
         let cargo_toml_path = self.target.contract_dir().join(ROOT_CARGO_TOML);
         let mut toml = CargoTomlContents::load_from_file(&cargo_toml_path);
 
@@ -43,10 +45,11 @@ impl TemplateAdjuster {
             toml.add_workspace(&[".", "meta"]);
         }
 
+        toml.change_author(new_authors);
         toml.save_to_file(&cargo_toml_path);
     }
 
-    fn update_dependencies_meta(&self) {
+    fn update_cargo_toml_meta(&self) {
         let cargo_toml_path = self.target.contract_dir().join(META_CARGO_TOML);
         let mut toml = CargoTomlContents::load_from_file(&cargo_toml_path);
 
@@ -57,7 +60,7 @@ impl TemplateAdjuster {
         toml.save_to_file(&cargo_toml_path);
     }
 
-    fn update_dependencies_wasm(&self, args_tag: FrameworkVersion) {
+    fn update_cargo_toml_wasm(&self, args_tag: FrameworkVersion) {
         if is_template_with_autogenerated_wasm(args_tag) {
             return;
         }
@@ -72,7 +75,7 @@ impl TemplateAdjuster {
         toml.save_to_file(&cargo_toml_path);
     }
 
-    fn update_dependencies_interact(&self) {
+    fn update_cargo_toml_interact(&self, new_authors: PathBuf) {
         if !self.metadata.has_interactor {
             return;
         }
@@ -84,6 +87,7 @@ impl TemplateAdjuster {
             remove_paths_from_deps(&mut toml, &[&self.metadata.name]);
         }
 
+        toml.change_author(new_authors);
         toml.save_to_file(&cargo_toml_path);
     }
 
diff --git a/framework/meta/tests/template_test.rs b/framework/meta/tests/template_test.rs
index 4b0fc0bc23..64f86a7751 100644
--- a/framework/meta/tests/template_test.rs
+++ b/framework/meta/tests/template_test.rs
@@ -1,4 +1,4 @@
-use std::{fs, process::Command};
+use std::{fs, path::PathBuf, process::Command};
 
 use convert_case::{Case, Casing};
 use multiversx_sc_meta::{
@@ -32,7 +32,12 @@ fn test_template_list() {
 #[test]
 #[cfg_attr(not(feature = "template-test-current"), ignore)]
 fn template_current_adder() {
-    template_test_current("adder", "examples", "new-adder");
+    template_test_current(
+        "adder",
+        "examples",
+        "new-adder",
+        "Alin Cruceat <alin.cruceat@multiversx.com>",
+    );
 
     cargo_check_interactor("examples", "new-adder");
 }
@@ -40,19 +45,19 @@ fn template_current_adder() {
 #[test]
 #[cfg_attr(not(feature = "template-test-current"), ignore)]
 fn template_current_crypto_zombies() {
-    template_test_current("crypto-zombies", "examples", "new-crypto-zombies");
+    template_test_current("crypto-zombies", "examples", "new-crypto-zombies", "");
 }
 
 #[test]
 #[cfg_attr(not(feature = "template-test-current"), ignore)]
 fn template_current_empty() {
-    template_test_current("empty", "examples", "new-empty");
+    template_test_current("empty", "examples", "new-empty", "");
 }
 
 #[test]
 #[cfg_attr(not(feature = "template-test-current"), ignore)]
 fn template_current_ping_pong_egld() {
-    template_test_current("ping-pong-egld", "examples", "new-ping-pong-egld");
+    template_test_current("ping-pong-egld", "examples", "new-ping-pong-egld", "");
 }
 
 #[test]
@@ -63,13 +68,13 @@ fn test_correct_naming() {
         "my-new-42-correct-empty"
     );
 
-    template_test_current("empty", "examples", "my1New2_3-correct_Empty");
+    template_test_current("empty", "examples", "my1New2_3-correct_Empty", "");
 }
 
 /// Recreates the folder structure in `contracts`, on the same level.
 /// This way, the relative paths are still valid in this case,
 /// and we can test the templates with the framework version of the current branch.
-fn template_test_current(template_name: &str, sub_path: &str, new_name: &str) {
+fn template_test_current(template_name: &str, sub_path: &str, new_name: &str, new_author: &str) {
     let workspace_path = find_current_workspace().unwrap();
     let target = ContractCreatorTarget {
         target_path: workspace_path.join(TEMPLATE_TEMP_DIR_NAME).join(sub_path),
@@ -80,13 +85,19 @@ fn template_test_current(template_name: &str, sub_path: &str, new_name: &str) {
 
     prepare_target_dir(&target);
 
+    let author;
+    if new_author.is_empty() {
+        author = PathBuf::new();
+    } else {
+        author = PathBuf::from(new_author);
+    }
     ContractCreator::new(
         &repo_source,
         template_name.to_string(),
         target.clone(),
         true,
     )
-    .create_contract(LAST_TEMPLATE_VERSION);
+    .create_contract(LAST_TEMPLATE_VERSION, author);
 
     if BUILD_CONTRACTS {
         build_contract(&target);
@@ -97,7 +108,11 @@ fn template_test_current(template_name: &str, sub_path: &str, new_name: &str) {
 #[test]
 #[cfg_attr(not(feature = "template-test-released"), ignore)]
 fn template_released_adder() {
-    template_test_released("adder", "released-adder");
+    template_test_released(
+        "adder",
+        "released-adder",
+        "Alin Cruceat <alin.cruceat@multiversx.com>",
+    );
 
     cargo_check_interactor("", "released-adder");
 }
@@ -105,13 +120,13 @@ fn template_released_adder() {
 #[test]
 #[cfg_attr(not(feature = "template-test-released"), ignore)]
 fn template_released_crypto_zombies() {
-    template_test_released("crypto-zombies", "released-crypto-zombies");
+    template_test_released("crypto-zombies", "released-crypto-zombies", "");
 }
 
 #[test]
 #[cfg_attr(not(feature = "template-test-released"), ignore)]
 fn template_released_empty() {
-    template_test_released("empty", "released-empty");
+    template_test_released("empty", "released-empty", "");
 }
 
 /// These tests fully replicate the templating process. They
@@ -119,7 +134,7 @@ fn template_released_empty() {
 /// - create proper contracts,
 /// - build the newly created contracts (to wasm)
 /// - run all tests (including Go scenarios) on them.
-fn template_test_released(template_name: &str, new_name: &str) {
+fn template_test_released(template_name: &str, new_name: &str, new_author: &str) {
     let workspace_path = find_current_workspace().unwrap();
     let target = ContractCreatorTarget {
         target_path: workspace_path.join(TEMPLATE_TEMP_DIR_NAME),
@@ -137,13 +152,20 @@ fn template_test_released(template_name: &str, new_name: &str) {
 
     prepare_target_dir(&target);
 
+    let author;
+    if new_author.is_empty() {
+        author = PathBuf::new();
+    } else {
+        author = PathBuf::from(new_author);
+    }
+
     ContractCreator::new(
         &repo_source,
         template_name.to_string(),
         target.clone(),
         false,
     )
-    .create_contract(LAST_TEMPLATE_VERSION);
+    .create_contract(LAST_TEMPLATE_VERSION, author);
 
     if BUILD_CONTRACTS {
         build_contract(&target);

From 5ffd9e4d41bc77357d7a2c44541195c59696b417 Mon Sep 17 00:00:00 2001
From: Alin Cruceat <alyn_509@yahoo.com>
Date: Tue, 6 Aug 2024 14:12:11 +0300
Subject: [PATCH 1144/1254] clippy

---
 framework/meta/tests/template_test.rs | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/framework/meta/tests/template_test.rs b/framework/meta/tests/template_test.rs
index 64f86a7751..1667225699 100644
--- a/framework/meta/tests/template_test.rs
+++ b/framework/meta/tests/template_test.rs
@@ -85,12 +85,12 @@ fn template_test_current(template_name: &str, sub_path: &str, new_name: &str, ne
 
     prepare_target_dir(&target);
 
-    let author;
-    if new_author.is_empty() {
-        author = PathBuf::new();
+    let author = if new_author.is_empty() {
+        PathBuf::new()
     } else {
-        author = PathBuf::from(new_author);
-    }
+        PathBuf::from(new_author)
+    };
+
     ContractCreator::new(
         &repo_source,
         template_name.to_string(),
@@ -152,12 +152,11 @@ fn template_test_released(template_name: &str, new_name: &str, new_author: &str)
 
     prepare_target_dir(&target);
 
-    let author;
-    if new_author.is_empty() {
-        author = PathBuf::new();
+    let author = if new_author.is_empty() {
+        PathBuf::new()
     } else {
-        author = PathBuf::from(new_author);
-    }
+        PathBuf::from(new_author)
+    };
 
     ContractCreator::new(
         &repo_source,

From c6d6e0260ad32290f4c5b7ffa379e1a14a31e1de Mon Sep 17 00:00:00 2001
From: Alin Cruceat <alyn_509@yahoo.com>
Date: Tue, 6 Aug 2024 15:08:18 +0300
Subject: [PATCH 1145/1254] fix after review

---
 framework/meta-lib/src/cargo_toml_contents.rs | 16 ++++-------
 framework/meta/src/cli/cli_args_standalone.rs |  4 +--
 .../meta/src/cmd/template/contract_creator.rs | 20 +++++++++-----
 .../src/cmd/template/template_adjuster.rs     | 27 +++++++++++++------
 framework/meta/tests/template_test.rs         | 14 +++++-----
 5 files changed, 48 insertions(+), 33 deletions(-)

diff --git a/framework/meta-lib/src/cargo_toml_contents.rs b/framework/meta-lib/src/cargo_toml_contents.rs
index 1ffc984dbf..ac6f851ba3 100644
--- a/framework/meta-lib/src/cargo_toml_contents.rs
+++ b/framework/meta-lib/src/cargo_toml_contents.rs
@@ -12,7 +12,6 @@ pub const CARGO_TOML_DEPENDENCIES: &str = "dependencies";
 pub const CARGO_TOML_DEV_DEPENDENCIES: &str = "dev-dependencies";
 pub const PACKAGE: &str = "package";
 pub const AUTHORS: &str = "authors";
-const DEFAULT_AUTHOR: &str = "you";
 const AUTO_GENERATED: &str = "# Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 # ##########################################
@@ -161,7 +160,7 @@ impl CargoTomlContents {
         self.toml_value.get(CARGO_TOML_DEV_DEPENDENCIES).is_some()
     }
 
-    pub fn change_author(&mut self, authors: PathBuf) -> bool {
+    pub fn change_author(&mut self, authors: String) -> bool {
         let package = self
             .toml_value
             .get_mut(PACKAGE)
@@ -171,15 +170,10 @@ impl CargoTomlContents {
 
         package.remove(AUTHORS);
 
-        let mut author_as_str = authors
-            .into_os_string()
-            .into_string()
-            .unwrap_or(DEFAULT_AUTHOR.to_string());
-        if author_as_str.is_empty() {
-            author_as_str = DEFAULT_AUTHOR.to_string();
-        }
-        let new_authors = vec![toml::Value::String(author_as_str)];
-        package.insert(AUTHORS.to_owned(), toml::Value::Array(new_authors));
+        package.insert(
+            AUTHORS.to_owned(),
+            toml::Value::Array(vec![toml::Value::String(authors)]),
+        );
 
         true
     }
diff --git a/framework/meta/src/cli/cli_args_standalone.rs b/framework/meta/src/cli/cli_args_standalone.rs
index d9d4ca5a4e..cda40bb307 100644
--- a/framework/meta/src/cli/cli_args_standalone.rs
+++ b/framework/meta/src/cli/cli_args_standalone.rs
@@ -266,8 +266,8 @@ pub struct TemplateArgs {
     #[arg(long, verbatim_doc_comment)]
     pub path: Option<PathBuf>,
 
-    /// The author of the contract is to receive.
-    /// If missing, the template author will be considered.
+    /// The author of the contract.
+    /// If missing, the default author will be considered.
     #[arg(long, verbatim_doc_comment)]
     pub author: Option<PathBuf>,
 }
diff --git a/framework/meta/src/cmd/template/contract_creator.rs b/framework/meta/src/cmd/template/contract_creator.rs
index cac4d9a7d0..6d25f00f2e 100644
--- a/framework/meta/src/cmd/template/contract_creator.rs
+++ b/framework/meta/src/cmd/template/contract_creator.rs
@@ -20,9 +20,15 @@ pub fn create_contract(args: &TemplateArgs) {
     let repo_temp_download = RepoSource::download_from_github(version, std::env::temp_dir());
     let target = target_from_args(args);
 
-    let creator = ContractCreator::new(&repo_temp_download, args.template.clone(), target, false);
+    let creator = ContractCreator::new(
+        &repo_temp_download,
+        args.template.clone(),
+        target,
+        false,
+        args.author.clone(),
+    );
 
-    creator.create_contract(version_tag, args.author.clone().unwrap_or_default());
+    creator.create_contract(version_tag);
 }
 
 fn target_from_args(args: &TemplateArgs) -> ContractCreatorTarget {
@@ -61,6 +67,7 @@ impl<'a> ContractCreator<'a> {
         template_name: String,
         target: ContractCreatorTarget,
         keep_paths: bool,
+        new_author: Option<PathBuf>,
     ) -> Self {
         let template_sources = template_sources(repo_source);
         let template_source = template_sources
@@ -77,13 +84,14 @@ impl<'a> ContractCreator<'a> {
                 metadata,
                 target,
                 keep_paths,
+                new_author,
             },
         }
     }
 
-    pub fn create_contract(&self, args_tag: FrameworkVersion, new_authors: PathBuf) {
+    pub fn create_contract(&self, args_tag: FrameworkVersion) {
         self.copy_template(args_tag.clone());
-        self.update_dependencies(args_tag, new_authors);
+        self.update_dependencies(args_tag);
         self.rename_template();
     }
 
@@ -92,8 +100,8 @@ impl<'a> ContractCreator<'a> {
             .copy_template(self.target.contract_dir(), args_tag);
     }
 
-    pub fn update_dependencies(&self, args_tag: FrameworkVersion, new_authors: PathBuf) {
-        self.adjuster.update_dependencies(args_tag, new_authors);
+    pub fn update_dependencies(&self, args_tag: FrameworkVersion) {
+        self.adjuster.update_cargo_toml_files(args_tag);
     }
 
     pub fn rename_template(&self) {
diff --git a/framework/meta/src/cmd/template/template_adjuster.rs b/framework/meta/src/cmd/template/template_adjuster.rs
index 332106735e..98bb3f4575 100644
--- a/framework/meta/src/cmd/template/template_adjuster.rs
+++ b/framework/meta/src/cmd/template/template_adjuster.rs
@@ -17,21 +17,33 @@ const ROOT_CARGO_TOML: &str = "./Cargo.toml";
 const META_CARGO_TOML: &str = "./meta/Cargo.toml";
 const WASM_CARGO_TOML: &str = "./wasm/Cargo.toml";
 const INTERACT_CARGO_TOML: &str = "./interact/Cargo.toml";
+const DEFAULT_AUTHOR: &str = "you";
 
 pub struct TemplateAdjuster {
     pub metadata: TemplateMetadata,
     pub target: ContractCreatorTarget,
     pub keep_paths: bool,
+    pub new_author: Option<PathBuf>,
 }
 impl TemplateAdjuster {
-    pub fn update_dependencies(&self, args_tag: FrameworkVersion, new_authors: PathBuf) {
-        self.update_cargo_toml_root(new_authors.clone());
+    pub fn update_cargo_toml_files(&self, args_tag: FrameworkVersion) {
+        let author_as_str = if self.new_author.is_none() {
+            DEFAULT_AUTHOR.to_string()
+        } else {
+            self.new_author
+                .clone()
+                .unwrap()
+                .into_os_string()
+                .into_string()
+                .unwrap_or(DEFAULT_AUTHOR.to_string())
+        };
+        self.update_cargo_toml_root(author_as_str.clone());
         self.update_cargo_toml_meta();
         self.update_cargo_toml_wasm(args_tag);
-        self.update_cargo_toml_interact(new_authors);
+        self.update_cargo_toml_interact(author_as_str);
     }
 
-    fn update_cargo_toml_root(&self, new_authors: PathBuf) {
+    fn update_cargo_toml_root(&self, author: String) {
         let cargo_toml_path = self.target.contract_dir().join(ROOT_CARGO_TOML);
         let mut toml = CargoTomlContents::load_from_file(&cargo_toml_path);
 
@@ -44,8 +56,7 @@ impl TemplateAdjuster {
         } else {
             toml.add_workspace(&[".", "meta"]);
         }
-
-        toml.change_author(new_authors);
+        toml.change_author(author);
         toml.save_to_file(&cargo_toml_path);
     }
 
@@ -75,7 +86,7 @@ impl TemplateAdjuster {
         toml.save_to_file(&cargo_toml_path);
     }
 
-    fn update_cargo_toml_interact(&self, new_authors: PathBuf) {
+    fn update_cargo_toml_interact(&self, author: String) {
         if !self.metadata.has_interactor {
             return;
         }
@@ -87,7 +98,7 @@ impl TemplateAdjuster {
             remove_paths_from_deps(&mut toml, &[&self.metadata.name]);
         }
 
-        toml.change_author(new_authors);
+        toml.change_author(author);
         toml.save_to_file(&cargo_toml_path);
     }
 
diff --git a/framework/meta/tests/template_test.rs b/framework/meta/tests/template_test.rs
index 1667225699..7898f88fc0 100644
--- a/framework/meta/tests/template_test.rs
+++ b/framework/meta/tests/template_test.rs
@@ -86,9 +86,9 @@ fn template_test_current(template_name: &str, sub_path: &str, new_name: &str, ne
     prepare_target_dir(&target);
 
     let author = if new_author.is_empty() {
-        PathBuf::new()
+        None
     } else {
-        PathBuf::from(new_author)
+        Some(PathBuf::from(new_author))
     };
 
     ContractCreator::new(
@@ -96,8 +96,9 @@ fn template_test_current(template_name: &str, sub_path: &str, new_name: &str, ne
         template_name.to_string(),
         target.clone(),
         true,
+        author,
     )
-    .create_contract(LAST_TEMPLATE_VERSION, author);
+    .create_contract(LAST_TEMPLATE_VERSION);
 
     if BUILD_CONTRACTS {
         build_contract(&target);
@@ -153,9 +154,9 @@ fn template_test_released(template_name: &str, new_name: &str, new_author: &str)
     prepare_target_dir(&target);
 
     let author = if new_author.is_empty() {
-        PathBuf::new()
+        None
     } else {
-        PathBuf::from(new_author)
+        Some(PathBuf::from(new_author))
     };
 
     ContractCreator::new(
@@ -163,8 +164,9 @@ fn template_test_released(template_name: &str, new_name: &str, new_author: &str)
         template_name.to_string(),
         target.clone(),
         false,
+        author,
     )
-    .create_contract(LAST_TEMPLATE_VERSION, author);
+    .create_contract(LAST_TEMPLATE_VERSION);
 
     if BUILD_CONTRACTS {
         build_contract(&target);

From 99aa76b9f1462a0752b9d9b736a02f6026fda05d Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Tue, 6 Aug 2024 15:09:03 +0300
Subject: [PATCH 1146/1254] sc 0.52.3

---
 CHANGELOG.md                                  |  2 ++
 Cargo.lock                                    | 20 +++++++++----------
 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 +-
 .../Cargo.toml                                |  2 +-
 .../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     |  8 ++++----
 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 +-
 .../wasm-alloc-mem-fail/Cargo.toml            |  2 +-
 .../wasm-alloc-mem-leaking/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-legacy/Cargo.toml |  4 ++--
 .../forwarder-legacy/meta/Cargo.toml          |  2 +-
 .../forwarder-legacy/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 +-
 .../exchange-features/Cargo.toml              |  4 ++--
 .../exchange-features/meta/Cargo.toml         |  2 +-
 .../exchange-features/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 +-
 .../feature-tests/scenario-tester/Cargo.toml  |  4 ++--
 .../scenario-tester/meta/Cargo.toml           |  2 +-
 .../scenario-tester/wasm/Cargo.toml           |  2 +-
 contracts/feature-tests/use-module/Cargo.toml |  8 ++++----
 .../feature-tests/use-module/meta/Cargo.toml  |  2 +-
 .../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 ++--
 framework/base/Cargo.toml                     |  4 ++--
 framework/derive/Cargo.toml                   |  2 +-
 framework/meta-lib/Cargo.toml                 |  4 ++--
 framework/meta-lib/src/version_history.rs     |  5 +++--
 framework/meta/Cargo.toml                     |  8 ++++----
 framework/scenario/Cargo.toml                 |  6 +++---
 framework/snippets/Cargo.toml                 |  4 ++--
 framework/wasm-adapter/Cargo.toml             |  4 ++--
 publish.sh                                    |  1 +
 tools/mxpy-snippet-generator/Cargo.toml       |  2 +-
 tools/plotter/Cargo.toml                      |  4 ++--
 tools/rust-debugger/format-tests/Cargo.toml   |  4 ++--
 273 files changed, 403 insertions(+), 399 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 82b9c17761..ede0ba5909 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,6 +27,8 @@ 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.52.3] - 2024-08-06
+- Pause module events.
 
 ## [sc 0.52.2] - 2024-08-01
 - `ManagedBufferReadToEnd` extract data methods.
diff --git a/Cargo.lock b/Cargo.lock
index c927ea1f04..abeb3c37e1 100755
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1922,7 +1922,7 @@ checksum = "b59072fa0624b55ae5ae3fa6bfa91515bbeb4ac440214bc4a509e2c8806d6e9f"
 
 [[package]]
 name = "multiversx-price-aggregator-sc"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "arrayvec",
  "getrandom 0.2.15",
@@ -1943,7 +1943,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "bitflags 2.6.0",
  "hex-literal",
@@ -1975,7 +1975,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -1986,7 +1986,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-meta"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "clap",
  "colored",
@@ -2009,7 +2009,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-meta-lib"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "clap",
  "colored",
@@ -2028,14 +2028,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-scenario"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "base64",
  "bech32",
@@ -2059,7 +2059,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-snippets"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "base64",
  "env_logger",
@@ -2075,7 +2075,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]
@@ -2107,7 +2107,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-wegld-swap-sc"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
  "multiversx-sc-modules",
diff --git a/contracts/benchmarks/large-storage/Cargo.toml b/contracts/benchmarks/large-storage/Cargo.toml
index 54e0d3cb9d..4492cbe0bb 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.52.2"
+version = "0.52.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../framework/scenario"
diff --git a/contracts/benchmarks/large-storage/meta/Cargo.toml b/contracts/benchmarks/large-storage/meta/Cargo.toml
index 538f11b829..9534a0160f 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-lib]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/benchmarks/large-storage/wasm/Cargo.toml b/contracts/benchmarks/large-storage/wasm/Cargo.toml
index 5945a304a9..61f3204a8a 100644
--- a/contracts/benchmarks/large-storage/wasm/Cargo.toml
+++ b/contracts/benchmarks/large-storage/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/mappers/benchmark-common/Cargo.toml b/contracts/benchmarks/mappers/benchmark-common/Cargo.toml
index 8122000aeb..862c5757bd 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.52.2"
+version = "0.52.3"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../framework/scenario"
diff --git a/contracts/benchmarks/mappers/linked-list-repeat/Cargo.toml b/contracts/benchmarks/mappers/linked-list-repeat/Cargo.toml
index 959b92b9a6..78457858f0 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.52.2"
+version = "0.52.3"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.2"
+version = "0.52.3"
 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 7f860546fc..fdc2402435 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-lib]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../../framework/meta-lib"
 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 e483b43680..92ddca0151 100644
--- a/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/mappers/map-repeat/Cargo.toml b/contracts/benchmarks/mappers/map-repeat/Cargo.toml
index d703898641..c3172a75ff 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.52.2"
+version = "0.52.3"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../framework/scenario"
diff --git a/contracts/benchmarks/mappers/map-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/map-repeat/meta/Cargo.toml
index b517c7848a..735c95bf23 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-lib]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.toml b/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.toml
index 5e6b5fe2ca..8843f76bb4 100644
--- a/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/mappers/queue-repeat/Cargo.toml b/contracts/benchmarks/mappers/queue-repeat/Cargo.toml
index 98d6ec4454..47a408d048 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.52.2"
+version = "0.52.3"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../framework/scenario"
diff --git a/contracts/benchmarks/mappers/queue-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/queue-repeat/meta/Cargo.toml
index 5e40a7533f..7cf8403ca8 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-lib]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.toml b/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.toml
index f515ac1024..7f918f8483 100644
--- a/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/mappers/set-repeat/Cargo.toml b/contracts/benchmarks/mappers/set-repeat/Cargo.toml
index b998ba445f..5f6eab8870 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.52.2"
+version = "0.52.3"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../framework/scenario"
diff --git a/contracts/benchmarks/mappers/set-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/set-repeat/meta/Cargo.toml
index cb1fa0daed..7ad364f955 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-lib]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.toml b/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.toml
index 243dee6072..0df7981d37 100644
--- a/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.2"
+version = "0.52.3"
 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 9b08be171c..0b6b3230bf 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.52.2"
+version = "0.52.3"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.2"
+version = "0.52.3"
 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 2a38c75248..e78974478d 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-lib]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../../framework/meta-lib"
 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 634ac1eae9..6ad1873bd2 100644
--- a/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/mappers/vec-repeat/Cargo.toml b/contracts/benchmarks/mappers/vec-repeat/Cargo.toml
index c014a7ad6c..a0487040be 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.52.2"
+version = "0.52.3"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../framework/scenario"
diff --git a/contracts/benchmarks/mappers/vec-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/vec-repeat/meta/Cargo.toml
index ca4eda8179..647c76ca4c 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-lib]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.toml b/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.toml
index 3c3b673bb4..fdcba4397d 100644
--- a/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/send-tx-repeat/Cargo.toml b/contracts/benchmarks/send-tx-repeat/Cargo.toml
index f6babc000e..8b1d819218 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.52.2"
+version = "0.52.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../framework/scenario"
diff --git a/contracts/benchmarks/send-tx-repeat/meta/Cargo.toml b/contracts/benchmarks/send-tx-repeat/meta/Cargo.toml
index 6f1ddb62cf..fcc58cd601 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-lib]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/benchmarks/send-tx-repeat/wasm/Cargo.toml b/contracts/benchmarks/send-tx-repeat/wasm/Cargo.toml
index 5b3d2423fb..4f875c4141 100644
--- a/contracts/benchmarks/send-tx-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/send-tx-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/str-repeat/Cargo.toml b/contracts/benchmarks/str-repeat/Cargo.toml
index 45d31a551f..674f3bd3e5 100644
--- a/contracts/benchmarks/str-repeat/Cargo.toml
+++ b/contracts/benchmarks/str-repeat/Cargo.toml
@@ -12,10 +12,10 @@ path = "src/str_repeat.rs"
 managed-buffer-builder-cached = ["multiversx-sc/managed-buffer-builder-cached"]
 
 [dependencies.multiversx-sc]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../framework/scenario"
diff --git a/contracts/benchmarks/str-repeat/meta/Cargo.toml b/contracts/benchmarks/str-repeat/meta/Cargo.toml
index 2be7ced557..5fdf241d60 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-lib]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.toml b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.toml
index 1b43410721..49341f9c56 100644
--- a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.toml
+++ b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.toml b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.toml
index 47406bde77..b18604cde3 100644
--- a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.toml
+++ b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.toml
@@ -29,7 +29,7 @@ path = ".."
 features = ["managed-buffer-builder-cached"]
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/str-repeat/wasm/Cargo.toml b/contracts/benchmarks/str-repeat/wasm/Cargo.toml
index 4b7518e883..969359eb55 100644
--- a/contracts/benchmarks/str-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/str-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/core/price-aggregator/Cargo.toml b/contracts/core/price-aggregator/Cargo.toml
index 6bf4650d12..d3637b98e3 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.52.2"
+version = "0.52.3"
 authors = [
     "Claudiu-Marcel Bruda <claudiu.bruda@multiversx.com>",
     "MultiversX <contact@multiversx.com>",
@@ -19,15 +19,15 @@ edition = "2021"
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../framework/scenario"
 
 [dependencies]
diff --git a/contracts/core/price-aggregator/meta/Cargo.toml b/contracts/core/price-aggregator/meta/Cargo.toml
index f85406d220..c382efe5b2 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.52.2"
+version = "0.52.3"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-meta-lib]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/core/price-aggregator/wasm/Cargo.toml b/contracts/core/price-aggregator/wasm/Cargo.toml
index 3c0d8b1a32..a007aef20b 100644
--- a/contracts/core/price-aggregator/wasm/Cargo.toml
+++ b/contracts/core/price-aggregator/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/core/wegld-swap/Cargo.toml b/contracts/core/wegld-swap/Cargo.toml
index ce3bf4776e..7d3dac0001 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.52.2"
+version = "0.52.3"
 
 authors = [
     "Dorin Iancu <dorin.iancu@multiversx.com>",
@@ -20,13 +20,13 @@ edition = "2021"
 path = "src/wegld.rs"
 
 [dependencies.multiversx-sc]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../framework/scenario"
diff --git a/contracts/core/wegld-swap/meta/Cargo.toml b/contracts/core/wegld-swap/meta/Cargo.toml
index b5515c7129..9c69ecf0c9 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.52.2"
+version = "0.52.3"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-meta-lib]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/core/wegld-swap/wasm/Cargo.toml b/contracts/core/wegld-swap/wasm/Cargo.toml
index a968d4df3c..500126a014 100644
--- a/contracts/core/wegld-swap/wasm/Cargo.toml
+++ b/contracts/core/wegld-swap/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/adder/Cargo.toml b/contracts/examples/adder/Cargo.toml
index 11d4f8013a..422164f2b7 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.52.2"
+version = "0.52.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/adder/interact/Cargo.toml b/contracts/examples/adder/interact/Cargo.toml
index ea6555785c..5a939f6bdb 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.52.2"
+version = "0.52.3"
 path = "../../../../framework/snippets"
diff --git a/contracts/examples/adder/meta/Cargo.toml b/contracts/examples/adder/meta/Cargo.toml
index 1ffc2bff90..9eb7270159 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-lib]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/adder/wasm/Cargo.toml b/contracts/examples/adder/wasm/Cargo.toml
index 89583f1aa9..a072b09a94 100644
--- a/contracts/examples/adder/wasm/Cargo.toml
+++ b/contracts/examples/adder/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/bonding-curve-contract/Cargo.toml b/contracts/examples/bonding-curve-contract/Cargo.toml
index 5ca78102c9..5c5a59d2d1 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.52.2"
+version = "0.52.3"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../framework/scenario"
 
diff --git a/contracts/examples/bonding-curve-contract/meta/Cargo.toml b/contracts/examples/bonding-curve-contract/meta/Cargo.toml
index 8ef0ee29d9..4e806f78b1 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-lib]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/bonding-curve-contract/wasm/Cargo.toml b/contracts/examples/bonding-curve-contract/wasm/Cargo.toml
index e5e31daba4..476d1c718b 100644
--- a/contracts/examples/bonding-curve-contract/wasm/Cargo.toml
+++ b/contracts/examples/bonding-curve-contract/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/check-pause/Cargo.toml b/contracts/examples/check-pause/Cargo.toml
index ef312bb3d3..09b5d89c3b 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.52.2"
+version = "0.52.3"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../framework/scenario"
 
diff --git a/contracts/examples/check-pause/meta/Cargo.toml b/contracts/examples/check-pause/meta/Cargo.toml
index 62e573697d..90569afe15 100644
--- a/contracts/examples/check-pause/meta/Cargo.toml
+++ b/contracts/examples/check-pause/meta/Cargo.toml
@@ -9,6 +9,6 @@ authors = ["Alin Cruceat <alin.cruceat@multiversx.com>"]
 path = ".."
 
 [dependencies.multiversx-sc-meta-lib]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/check-pause/wasm/Cargo.toml b/contracts/examples/check-pause/wasm/Cargo.toml
index 3680800096..ce7f99ba5b 100644
--- a/contracts/examples/check-pause/wasm/Cargo.toml
+++ b/contracts/examples/check-pause/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/crowdfunding-esdt/Cargo.toml b/contracts/examples/crowdfunding-esdt/Cargo.toml
index 6b5ba09dd6..eccf505d91 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.52.2"
+version = "0.52.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../framework/scenario"
 
 [dev-dependencies]
diff --git a/contracts/examples/crowdfunding-esdt/meta/Cargo.toml b/contracts/examples/crowdfunding-esdt/meta/Cargo.toml
index 469288cf47..b71b9d7c86 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-lib]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/crowdfunding-esdt/wasm/Cargo.toml b/contracts/examples/crowdfunding-esdt/wasm/Cargo.toml
index a67bd898da..223676b2eb 100644
--- a/contracts/examples/crowdfunding-esdt/wasm/Cargo.toml
+++ b/contracts/examples/crowdfunding-esdt/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/crypto-bubbles/Cargo.toml b/contracts/examples/crypto-bubbles/Cargo.toml
index 9cbaa8c100..47db96bb71 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.52.2"
+version = "0.52.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/crypto-bubbles/meta/Cargo.toml b/contracts/examples/crypto-bubbles/meta/Cargo.toml
index b39b32a121..99f20d50e7 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-lib]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/crypto-bubbles/wasm/Cargo.toml b/contracts/examples/crypto-bubbles/wasm/Cargo.toml
index afc726cd13..de5583ff1b 100644
--- a/contracts/examples/crypto-bubbles/wasm/Cargo.toml
+++ b/contracts/examples/crypto-bubbles/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.2"
+version = "0.52.3"
 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 581313f154..b66621069b 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.52.2"
+version = "0.52.3"
 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 a80a82d007..badff47740 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.52.2"
+version = "0.52.3"
 path = "../../../../../framework/base"
diff --git a/contracts/examples/crypto-kitties/kitty-auction/Cargo.toml b/contracts/examples/crypto-kitties/kitty-auction/Cargo.toml
index 63770d9786..11ab2f903b 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.52.2"
+version = "0.52.3"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.2"
+version = "0.52.3"
 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 70a7521d89..fa16c5bf67 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-lib]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../../framework/meta-lib"
 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 1c54bbe392..4bd5bb69bf 100644
--- a/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.toml
+++ b/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.2"
+version = "0.52.3"
 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 f538fb7308..4d1d1f7792 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.52.2"
+version = "0.52.3"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.2"
+version = "0.52.3"
 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 49fb4f4abe..340591c147 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-lib]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../../framework/meta-lib"
 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 18a1d48309..b015a92ce0 100644
--- a/contracts/examples/crypto-kitties/kitty-genetic-alg/wasm/Cargo.toml
+++ b/contracts/examples/crypto-kitties/kitty-genetic-alg/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.2"
+version = "0.52.3"
 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 8643b0db9c..264aca7a31 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.52.2"
+version = "0.52.3"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.2"
+version = "0.52.3"
 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 7d0fcf0f34..f7dfa86133 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-lib]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../../framework/meta-lib"
 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 26cfce32e2..b58851660c 100644
--- a/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.toml
+++ b/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/crypto-zombies/Cargo.toml b/contracts/examples/crypto-zombies/Cargo.toml
index 7a3cc6eb17..710aa5fa4e 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.52.2"
+version = "0.52.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/crypto-zombies/meta/Cargo.toml b/contracts/examples/crypto-zombies/meta/Cargo.toml
index 8b4fda4451..b667ef63a8 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-lib]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/crypto-zombies/wasm/Cargo.toml b/contracts/examples/crypto-zombies/wasm/Cargo.toml
index 3bf05b30af..57a1fe3ef8 100644
--- a/contracts/examples/crypto-zombies/wasm/Cargo.toml
+++ b/contracts/examples/crypto-zombies/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/digital-cash/Cargo.toml b/contracts/examples/digital-cash/Cargo.toml
index ca69bc0a9e..ed8e9d80b7 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.52.2"
+version = "0.52.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/digital-cash/meta/Cargo.toml b/contracts/examples/digital-cash/meta/Cargo.toml
index 4f9a5ddc6f..b28ad40b32 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-lib]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/digital-cash/wasm/Cargo.toml b/contracts/examples/digital-cash/wasm/Cargo.toml
index 6738ec1176..6e6cde52cc 100644
--- a/contracts/examples/digital-cash/wasm/Cargo.toml
+++ b/contracts/examples/digital-cash/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/empty/Cargo.toml b/contracts/examples/empty/Cargo.toml
index 7bff0b67f7..08e3d5343d 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.52.2"
+version = "0.52.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../framework/scenario"
 
 [dev-dependencies]
diff --git a/contracts/examples/empty/meta/Cargo.toml b/contracts/examples/empty/meta/Cargo.toml
index 2c8d517f01..b4824124e6 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-lib]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/empty/wasm/Cargo.toml b/contracts/examples/empty/wasm/Cargo.toml
index 56cdf9b66a..f260225b96 100644
--- a/contracts/examples/empty/wasm/Cargo.toml
+++ b/contracts/examples/empty/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.2"
+version = "0.52.3"
 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 30a44358e0..61e8d4dee2 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.52.2"
+version = "0.52.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.2"
+version = "0.52.3"
 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 6cb236231f..563ed0c0c3 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-lib]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../framework/meta-lib"
 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 a5689a93e0..46e12c2cee 100644
--- a/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.toml
+++ b/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/factorial/Cargo.toml b/contracts/examples/factorial/Cargo.toml
index 19b9d57831..dd260bf6a2 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.52.2"
+version = "0.52.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/factorial/meta/Cargo.toml b/contracts/examples/factorial/meta/Cargo.toml
index a845e0c02c..f99576dfcc 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-lib]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/factorial/wasm/Cargo.toml b/contracts/examples/factorial/wasm/Cargo.toml
index 9ba8e26326..500fc2bde3 100644
--- a/contracts/examples/factorial/wasm/Cargo.toml
+++ b/contracts/examples/factorial/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/fractional-nfts/Cargo.toml b/contracts/examples/fractional-nfts/Cargo.toml
index add4cbba30..a26370c168 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.52.2"
+version = "0.52.3"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/fractional-nfts/meta/Cargo.toml b/contracts/examples/fractional-nfts/meta/Cargo.toml
index 2cafe6a873..57b4b61417 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-lib]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/fractional-nfts/wasm/Cargo.toml b/contracts/examples/fractional-nfts/wasm/Cargo.toml
index b324cf1275..542529a4a0 100644
--- a/contracts/examples/fractional-nfts/wasm/Cargo.toml
+++ b/contracts/examples/fractional-nfts/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/lottery-esdt/Cargo.toml b/contracts/examples/lottery-esdt/Cargo.toml
index 4b2940da48..fc52a3472e 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.52.2"
+version = "0.52.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/lottery-esdt/meta/Cargo.toml b/contracts/examples/lottery-esdt/meta/Cargo.toml
index f705e15855..96b622ca4e 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-lib]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/lottery-esdt/wasm/Cargo.toml b/contracts/examples/lottery-esdt/wasm/Cargo.toml
index 4aa2621048..49888e43ef 100644
--- a/contracts/examples/lottery-esdt/wasm/Cargo.toml
+++ b/contracts/examples/lottery-esdt/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/multisig/Cargo.toml b/contracts/examples/multisig/Cargo.toml
index 8a34f15882..6b9bf4feaa 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.52.2"
+version = "0.52.3"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../framework/scenario"
 
 [dev-dependencies.adder]
@@ -27,7 +27,7 @@ path = "../adder"
 path = "../factorial"
 
 [dev-dependencies.multiversx-wegld-swap-sc]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../core/wegld-swap"
 
 [dev-dependencies]
diff --git a/contracts/examples/multisig/interact/Cargo.toml b/contracts/examples/multisig/interact/Cargo.toml
index 463441fa67..ec9184522d 100644
--- a/contracts/examples/multisig/interact/Cargo.toml
+++ b/contracts/examples/multisig/interact/Cargo.toml
@@ -18,17 +18,17 @@ toml = "0.8.6"
 path = ".."
 
 [dependencies.multiversx-sc-modules]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../contracts/modules"
 
 [dependencies.multiversx-sc-snippets]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../framework/snippets"
 
 [dependencies.multiversx-sc-scenario]
-version = "=0.52.2"
+version = "=0.52.3"
 path = "../../../../framework/scenario"
 
 [dependencies.multiversx-sc]
-version = "=0.52.2"
+version = "=0.52.3"
 path = "../../../../framework/base"
diff --git a/contracts/examples/multisig/meta/Cargo.toml b/contracts/examples/multisig/meta/Cargo.toml
index 7948efaeb1..33a79fe7e0 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-lib]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/multisig/wasm-multisig-full/Cargo.toml b/contracts/examples/multisig/wasm-multisig-full/Cargo.toml
index 708a316940..99726c26e4 100644
--- a/contracts/examples/multisig/wasm-multisig-full/Cargo.toml
+++ b/contracts/examples/multisig/wasm-multisig-full/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.2"
+version = "0.52.3"
 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 be797fe883..ef993d6bfd 100644
--- a/contracts/examples/multisig/wasm-multisig-view/Cargo.toml
+++ b/contracts/examples/multisig/wasm-multisig-view/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/multisig/wasm/Cargo.toml b/contracts/examples/multisig/wasm/Cargo.toml
index 79a78ed396..9401a96630 100644
--- a/contracts/examples/multisig/wasm/Cargo.toml
+++ b/contracts/examples/multisig/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/nft-minter/Cargo.toml b/contracts/examples/nft-minter/Cargo.toml
index 45fc474c7b..03b1551465 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.52.2"
+version = "0.52.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/nft-minter/meta/Cargo.toml b/contracts/examples/nft-minter/meta/Cargo.toml
index 3d6e9b7d2b..7263f932ad 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-lib]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/nft-minter/wasm/Cargo.toml b/contracts/examples/nft-minter/wasm/Cargo.toml
index aa89e7c966..95d1c79722 100644
--- a/contracts/examples/nft-minter/wasm/Cargo.toml
+++ b/contracts/examples/nft-minter/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/nft-storage-prepay/Cargo.toml b/contracts/examples/nft-storage-prepay/Cargo.toml
index d94c3af574..1bc7b29750 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.52.2"
+version = "0.52.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/nft-storage-prepay/meta/Cargo.toml b/contracts/examples/nft-storage-prepay/meta/Cargo.toml
index cfb91cd8c2..888ca8614d 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-lib]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/nft-storage-prepay/wasm/Cargo.toml b/contracts/examples/nft-storage-prepay/wasm/Cargo.toml
index f0407d29d2..2b1710ea5e 100644
--- a/contracts/examples/nft-storage-prepay/wasm/Cargo.toml
+++ b/contracts/examples/nft-storage-prepay/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/nft-subscription/Cargo.toml b/contracts/examples/nft-subscription/Cargo.toml
index 9cf9320b46..7e8fc35eb4 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.52.2"
+version = "0.52.3"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/nft-subscription/meta/Cargo.toml b/contracts/examples/nft-subscription/meta/Cargo.toml
index 9c2cd62564..8960c9deab 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-lib]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/nft-subscription/wasm/Cargo.toml b/contracts/examples/nft-subscription/wasm/Cargo.toml
index 03a88cd8a9..4dacd88394 100644
--- a/contracts/examples/nft-subscription/wasm/Cargo.toml
+++ b/contracts/examples/nft-subscription/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/order-book/factory/Cargo.toml b/contracts/examples/order-book/factory/Cargo.toml
index 2ed8fe0d7a..c236031782 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.52.2"
+version = "0.52.3"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../framework/scenario"
 
diff --git a/contracts/examples/order-book/factory/meta/Cargo.toml b/contracts/examples/order-book/factory/meta/Cargo.toml
index c5dc6b8e37..93edd21ce0 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-lib]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/order-book/factory/wasm/Cargo.toml b/contracts/examples/order-book/factory/wasm/Cargo.toml
index fbd6ecf910..c92ff1619a 100644
--- a/contracts/examples/order-book/factory/wasm/Cargo.toml
+++ b/contracts/examples/order-book/factory/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/order-book/pair/Cargo.toml b/contracts/examples/order-book/pair/Cargo.toml
index e0e4db8c63..77235329be 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.52.2"
+version = "0.52.3"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../framework/scenario"
diff --git a/contracts/examples/order-book/pair/meta/Cargo.toml b/contracts/examples/order-book/pair/meta/Cargo.toml
index ba31c704e1..9593fb54d7 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-lib]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/order-book/pair/wasm/Cargo.toml b/contracts/examples/order-book/pair/wasm/Cargo.toml
index d8febed97d..07722240a2 100644
--- a/contracts/examples/order-book/pair/wasm/Cargo.toml
+++ b/contracts/examples/order-book/pair/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/ping-pong-egld/Cargo.toml b/contracts/examples/ping-pong-egld/Cargo.toml
index 8a2315de1c..e9ca310f33 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.52.2"
+version = "0.52.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../framework/scenario"
 
diff --git a/contracts/examples/ping-pong-egld/meta/Cargo.toml b/contracts/examples/ping-pong-egld/meta/Cargo.toml
index ba5c6d6a05..e56d4f11a0 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-lib]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/ping-pong-egld/wasm/Cargo.toml b/contracts/examples/ping-pong-egld/wasm/Cargo.toml
index bc63b7ba75..3b9afa18e7 100644
--- a/contracts/examples/ping-pong-egld/wasm/Cargo.toml
+++ b/contracts/examples/ping-pong-egld/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/proxy-pause/Cargo.toml b/contracts/examples/proxy-pause/Cargo.toml
index 8350ab3be6..5160725d84 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.52.2"
+version = "0.52.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.2"
+version = "0.52.3"
 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 9025617cd7..51a75a5dca 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-lib]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/proxy-pause/wasm/Cargo.toml b/contracts/examples/proxy-pause/wasm/Cargo.toml
index ff37b3ffbb..cf6b1c4cc7 100644
--- a/contracts/examples/proxy-pause/wasm/Cargo.toml
+++ b/contracts/examples/proxy-pause/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/rewards-distribution/Cargo.toml b/contracts/examples/rewards-distribution/Cargo.toml
index c27457a62c..f67e765130 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.52.2"
+version = "0.52.3"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/rewards-distribution/meta/Cargo.toml b/contracts/examples/rewards-distribution/meta/Cargo.toml
index 9332821b2e..6988570c60 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 <claudiu.bruda@multiversx.com>"]
 path = ".."
 
 [dependencies.multiversx-sc-meta-lib]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/rewards-distribution/wasm/Cargo.toml b/contracts/examples/rewards-distribution/wasm/Cargo.toml
index 427f126478..9f8a8a633f 100644
--- a/contracts/examples/rewards-distribution/wasm/Cargo.toml
+++ b/contracts/examples/rewards-distribution/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/seed-nft-minter/Cargo.toml b/contracts/examples/seed-nft-minter/Cargo.toml
index b7fa1e390c..79578dd764 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.52.2"
+version = "0.52.3"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/seed-nft-minter/meta/Cargo.toml b/contracts/examples/seed-nft-minter/meta/Cargo.toml
index 59d7e6dd8a..aecbe0ce1f 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 <claudiu.bruda@multiversx.com>"]
 path = ".."
 
 [dependencies.multiversx-sc-meta-lib]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/seed-nft-minter/wasm/Cargo.toml b/contracts/examples/seed-nft-minter/wasm/Cargo.toml
index 46e92220d5..f3b3700943 100644
--- a/contracts/examples/seed-nft-minter/wasm/Cargo.toml
+++ b/contracts/examples/seed-nft-minter/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/token-release/Cargo.toml b/contracts/examples/token-release/Cargo.toml
index 1507ada7a7..351a77764e 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.52.2"
+version = "0.52.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../framework/scenario"
 
diff --git a/contracts/examples/token-release/meta/Cargo.toml b/contracts/examples/token-release/meta/Cargo.toml
index 000af50e1b..d5bf7bcb4c 100644
--- a/contracts/examples/token-release/meta/Cargo.toml
+++ b/contracts/examples/token-release/meta/Cargo.toml
@@ -10,6 +10,6 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta-lib]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/token-release/wasm/Cargo.toml b/contracts/examples/token-release/wasm/Cargo.toml
index ed024a26be..a1768d018f 100644
--- a/contracts/examples/token-release/wasm/Cargo.toml
+++ b/contracts/examples/token-release/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/abi-tester/Cargo.toml b/contracts/feature-tests/abi-tester/Cargo.toml
index 8bef4f4711..1af24eedac 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.52.2"
+version = "0.52.3"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../framework/scenario"
 
 [dev-dependencies.multiversx-sc-meta-lib]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../framework/meta-lib"
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 2f4367a3e9..5bd8629e80 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.52.2"
+            "version": "0.52.3"
         }
     },
     "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 914ea92d18..929d6aff37 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.52.2"
+            "version": "0.52.3"
         }
     },
     "docs": [
diff --git a/contracts/feature-tests/abi-tester/meta/Cargo.toml b/contracts/feature-tests/abi-tester/meta/Cargo.toml
index 5057ddc40f..e24dd146f5 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-lib]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../framework/meta-lib"
 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 eed4343efc..503a7215e3 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.2"
+version = "0.52.3"
 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 4681e04d7c..2ef8803dec 100644
--- a/contracts/feature-tests/abi-tester/wasm/Cargo.toml
+++ b/contracts/feature-tests/abi-tester/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/alloc-features/Cargo.toml b/contracts/feature-tests/alloc-features/Cargo.toml
index 86cd0cdd62..ab0692f076 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.52.2"
+version = "0.52.3"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.2"
+version = "0.52.3"
 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 16d413dc43..8ba824abfc 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-lib]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml
index a904b7a1cd..b29daa214f 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml
index a77a4da265..27c930350a 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/alloc-features/wasm/Cargo.toml b/contracts/feature-tests/alloc-features/wasm/Cargo.toml
index 1dd53698a9..82c0e882ce 100644
--- a/contracts/feature-tests/alloc-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/alloc-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/basic-features/Cargo.toml b/contracts/feature-tests/basic-features/Cargo.toml
index 1544bde85d..732990a5ed 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.52.2"
+version = "0.52.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../framework/scenario"
 
 [dependencies.multiversx-sc-modules]
-version = "0.52.2"
+version = "0.52.3"
 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 c9dbb1bec3..4479a539e0 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.52.2"
+version = "0.52.3"
 path = "../../../../framework/snippets"
diff --git a/contracts/feature-tests/basic-features/meta/Cargo.toml b/contracts/feature-tests/basic-features/meta/Cargo.toml
index 64abacebe1..8b2641a475 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-lib]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../framework/meta-lib"
 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 8314c7876f..8791c88ae0 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.2"
+version = "0.52.3"
 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 07c7754cfa..cfa2c0dcaf 100644
--- a/contracts/feature-tests/basic-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/basic-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.2"
+version = "0.52.3"
 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 2911393cd8..7a9fbbf6a5 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.52.2"
+version = "0.52.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.2"
+version = "0.52.3"
 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 e78c5555c4..b966e6e9f8 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-lib]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../framework/meta-lib"
 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 3105015fd1..21f190b2a3 100644
--- a/contracts/feature-tests/big-float-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/big-float-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/Cargo.toml b/contracts/feature-tests/composability/Cargo.toml
index 805658dbd5..94514ef894 100644
--- a/contracts/feature-tests/composability/Cargo.toml
+++ b/contracts/feature-tests/composability/Cargo.toml
@@ -36,9 +36,9 @@ path = "recursive-caller"
 path = "vault"
 
 [dependencies.multiversx-sc]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.2"
+version = "0.52.3"
 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 4fc5463080..94f4c93efc 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.52.2"
+version = "0.52.3"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.2"
+version = "0.52.3"
 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 b5a2b45e17..ab8471026a 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-lib]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../../framework/meta-lib"
 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 2318ae6bca..241edcf7d3 100644
--- a/contracts/feature-tests/composability/builtin-func-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/builtin-func-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.2"
+version = "0.52.3"
 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 9cff8d8d2e..3a5a5f79ab 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.52.2"
+version = "0.52.3"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.2"
+version = "0.52.3"
 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 e6324563ff..75ab9c1006 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
@@ -9,10 +9,10 @@ publish = false
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.2"
+version = "0.52.3"
 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 595beb438c..db735d40b4 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.52.2"
+version = "0.52.3"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta-lib]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../../../framework/meta-lib"
 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 11b27ec15d..507e80c896 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.2"
+version = "0.52.3"
 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 92be32a56d..d84c322857 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.52.2"
+version = "0.52.3"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.2"
+version = "0.52.3"
 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 9c5e5647de..e9a2feaf21 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.52.2"
+version = "0.52.3"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta-lib]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../../../framework/meta-lib"
 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 0a0f2284f1..258ca36d49 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.2"
+version = "0.52.3"
 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 7e16667da8..7488422afc 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.52.2"
+version = "0.52.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.2"
+version = "0.52.3"
 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 d220866917..ea63ae654f 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.52.2"
+version = "0.52.3"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.2"
+version = "0.52.3"
 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 71c4048f20..bc17e19772 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.52.2"
+version = "0.52.3"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta-lib]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../../../framework/meta-lib"
 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 8fdff2da82..6557b4da03 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.2"
+version = "0.52.3"
 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 567e678b1a..c0887b88c8 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
@@ -9,10 +9,10 @@ publish = false
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.2"
+version = "0.52.3"
 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 b84a0a48ee..6b3fd5643c 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.52.2"
+version = "0.52.3"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta-lib]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../../../framework/meta-lib"
 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 6e717d9709..402a1d01d6 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/forwarder-legacy/Cargo.toml b/contracts/feature-tests/composability/forwarder-legacy/Cargo.toml
index d538c2da79..e4937509b0 100644
--- a/contracts/feature-tests/composability/forwarder-legacy/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-legacy/Cargo.toml
@@ -12,10 +12,10 @@ path = "src/forwarder_legacy_main.rs"
 path = "../vault"
 
 [dependencies.multiversx-sc]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../framework/scenario"
 
diff --git a/contracts/feature-tests/composability/forwarder-legacy/meta/Cargo.toml b/contracts/feature-tests/composability/forwarder-legacy/meta/Cargo.toml
index 746bf261fd..1b1e8aed9a 100644
--- a/contracts/feature-tests/composability/forwarder-legacy/meta/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-legacy/meta/Cargo.toml
@@ -8,6 +8,6 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta-lib]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.toml b/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.toml
index db40a9d0f0..4a216ad9be 100644
--- a/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.2"
+version = "0.52.3"
 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 a73f5111f1..f93ec8f388 100644
--- a/contracts/feature-tests/composability/forwarder-queue/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-queue/Cargo.toml
@@ -9,14 +9,14 @@ publish = false
 path = "src/forwarder_queue.rs"
 
 [dependencies.multiversx-sc]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../framework/wasm-adapter"
 optional = true
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.2"
+version = "0.52.3"
 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 d73021b274..3830a54e4d 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-lib]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../../framework/meta-lib"
 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 780a6d313b..542e076e69 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.2"
+version = "0.52.3"
 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 6f5da38bfd..76c5b3ef97 100644
--- a/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.2"
+version = "0.52.3"
 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 60b0a4d17a..52849f46ab 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.52.2"
+version = "0.52.3"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.2"
+version = "0.52.3"
 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 5be146bbb1..28b9956956 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-lib]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../../framework/meta-lib"
 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 552037af02..7dc394f988 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.2"
+version = "0.52.3"
 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 8bb52fabb3..421efa4ae5 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.2"
+version = "0.52.3"
 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 21776b66c6..5010a5d9ed 100644
--- a/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/forwarder/Cargo.toml b/contracts/feature-tests/composability/forwarder/Cargo.toml
index 1bff4c1e01..811a67939e 100644
--- a/contracts/feature-tests/composability/forwarder/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder/Cargo.toml
@@ -9,10 +9,10 @@ publish = false
 path = "src/forwarder_main.rs"
 
 [dependencies.multiversx-sc]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../framework/scenario"
 
diff --git a/contracts/feature-tests/composability/forwarder/meta/Cargo.toml b/contracts/feature-tests/composability/forwarder/meta/Cargo.toml
index c728a3c04b..923f5cfbf7 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-lib]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/feature-tests/composability/forwarder/wasm/Cargo.toml b/contracts/feature-tests/composability/forwarder/wasm/Cargo.toml
index 0ac744f54d..86bea326c2 100644
--- a/contracts/feature-tests/composability/forwarder/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/interact/Cargo.toml b/contracts/feature-tests/composability/interact/Cargo.toml
index faed62ca6b..2d0f877380 100644
--- a/contracts/feature-tests/composability/interact/Cargo.toml
+++ b/contracts/feature-tests/composability/interact/Cargo.toml
@@ -15,9 +15,9 @@ serde = { version = "1.0", features = ["derive"] }
 toml = "0.8.6"
 
 [dependencies.multiversx-sc]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-snippets]
-version = "0.52.2"
+version = "0.52.3"
 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 d5193e8637..83c17ceec8 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.52.2"
+version = "0.52.3"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.2"
+version = "0.52.3"
 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 536ba4c373..d2f633718c 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-lib]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../../framework/meta-lib"
 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 b8ce92dc84..2f2d79b71e 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.2"
+version = "0.52.3"
 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 fc6dcfe6d2..f58518b9e4 100644
--- a/contracts/feature-tests/composability/promises-features/Cargo.toml
+++ b/contracts/feature-tests/composability/promises-features/Cargo.toml
@@ -9,6 +9,6 @@ publish = false
 path = "src/promises_main.rs"
 
 [dependencies.multiversx-sc]
-version = "0.52.2"
+version = "0.52.3"
 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 29a1496629..3f7d46cc26 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-lib]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../../framework/meta-lib"
 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 ce571f9626..e4a9958058 100644
--- a/contracts/feature-tests/composability/promises-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/promises-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.2"
+version = "0.52.3"
 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 36617a7ed4..d75d69b776 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.52.2"
+version = "0.52.3"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.2"
+version = "0.52.3"
 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 d95ce78dff..fea3ac9487 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-lib]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../../framework/meta-lib"
 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 e016f98a03..f7f34b06f0 100644
--- a/contracts/feature-tests/composability/proxy-test-first/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/proxy-test-first/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.2"
+version = "0.52.3"
 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 8254f2ffc9..9f4adce1cf 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.52.2"
+version = "0.52.3"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.2"
+version = "0.52.3"
 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 2daf454434..6753165f9f 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-lib]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../../framework/meta-lib"
 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 94d9a86be9..f7ffc1f9a3 100644
--- a/contracts/feature-tests/composability/proxy-test-second/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/proxy-test-second/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.2"
+version = "0.52.3"
 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 0b6a8b8116..405ecedf75 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.52.2"
+version = "0.52.3"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.2"
+version = "0.52.3"
 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 5d9fe1bc7a..a37eaf5aad 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-lib]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../../framework/meta-lib"
 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 8ef6930475..2e7d07948a 100644
--- a/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.2"
+version = "0.52.3"
 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 f9e9a6787a..f3c2d9555c 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.52.2"
+version = "0.52.3"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.2"
+version = "0.52.3"
 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 9435d8e2d3..64eeea59ae 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-lib]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../../framework/meta-lib"
 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 9c1f7b0b97..cfac48c054 100644
--- a/contracts/feature-tests/composability/transfer-role-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/transfer-role-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/vault/Cargo.toml b/contracts/feature-tests/composability/vault/Cargo.toml
index d7bb36c005..708f5ea4a0 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.52.2"
+version = "0.52.3"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../framework/scenario"
diff --git a/contracts/feature-tests/composability/vault/meta/Cargo.toml b/contracts/feature-tests/composability/vault/meta/Cargo.toml
index 6f024136c2..d8ff278d46 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-lib]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../../framework/meta-lib"
 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 c0ef08d11b..ef37bda448 100644
--- a/contracts/feature-tests/composability/vault/wasm-vault-promises/Cargo.toml
+++ b/contracts/feature-tests/composability/vault/wasm-vault-promises/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.2"
+version = "0.52.3"
 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 c67350aa89..5f40e51e51 100644
--- a/contracts/feature-tests/composability/vault/wasm-vault-upgrade/Cargo.toml
+++ b/contracts/feature-tests/composability/vault/wasm-vault-upgrade/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.2"
+version = "0.52.3"
 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 8410e704de..6c1c5e2837 100644
--- a/contracts/feature-tests/composability/vault/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/vault/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.2"
+version = "0.52.3"
 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 2846f866dc..cca7ce2d0b 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.52.2"
+version = "0.52.3"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.2"
+version = "0.52.3"
 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 7e0bd1f38e..fec279d491 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-lib]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../../framework/meta-lib"
 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 70de15e206..ef03e13d39 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.2"
+version = "0.52.3"
 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 bd5491b461..d71180915a 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.52.2"
+version = "0.52.3"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.2"
+version = "0.52.3"
 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 95d623c39f..3fa5e6d1c2 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-lib]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../../framework/meta-lib"
 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 8a1d467c38..c01a130e9b 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.2"
+version = "0.52.3"
 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 4ed1f34c30..3f5236767f 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.52.2"
+version = "0.52.3"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.2"
+version = "0.52.3"
 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 ba173ed7ab..3ee59c5155 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-lib]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../../framework/meta-lib"
 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 b40b887b61..40ffc08567 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.2"
+version = "0.52.3"
 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 f6259b552f..e2a7672029 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.52.2"
+version = "0.52.3"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.2"
+version = "0.52.3"
 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 12a69aeac9..ea073d9b18 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-lib]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../../framework/meta-lib"
 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 9caba8c647..d5890e4275 100644
--- a/contracts/feature-tests/erc-style-contracts/erc1155/wasm/Cargo.toml
+++ b/contracts/feature-tests/erc-style-contracts/erc1155/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.2"
+version = "0.52.3"
 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 8b43cf6ec5..81350acfaf 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.52.2"
+version = "0.52.3"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.2"
+version = "0.52.3"
 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 de4d132a00..b1af27d656 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-lib]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../../framework/meta-lib"
 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 ff639df5ff..6bdce84478 100644
--- a/contracts/feature-tests/erc-style-contracts/erc20/wasm/Cargo.toml
+++ b/contracts/feature-tests/erc-style-contracts/erc20/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.2"
+version = "0.52.3"
 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 4dc3f6f35a..2e0078fa6c 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.52.2"
+version = "0.52.3"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.2"
+version = "0.52.3"
 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 af3ad1de87..4ec8dd7f7e 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-lib]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../../framework/meta-lib"
 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 2e1a740d0f..192eec89d4 100644
--- a/contracts/feature-tests/erc-style-contracts/erc721/wasm/Cargo.toml
+++ b/contracts/feature-tests/erc-style-contracts/erc721/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.2"
+version = "0.52.3"
 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 6e71c0cfb5..8a8ade84f3 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.52.2"
+version = "0.52.3"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.2"
+version = "0.52.3"
 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 f32a3abc00..4f1f58e7dd 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-lib]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../../framework/meta-lib"
 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 e0a33fdab9..f9b260fe63 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.2"
+version = "0.52.3"
 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 48c37d9b6d..e05404fa10 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.52.2"
+version = "0.52.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.2"
+version = "0.52.3"
 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 9fa417d11e..88267a1571 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-lib]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../framework/meta-lib"
 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 0db1b21d92..06fee9a8c7 100644
--- a/contracts/feature-tests/esdt-system-sc-mock/wasm/Cargo.toml
+++ b/contracts/feature-tests/esdt-system-sc-mock/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/exchange-features/Cargo.toml b/contracts/feature-tests/exchange-features/Cargo.toml
index 86b8e11be3..cbdbdeb67d 100644
--- a/contracts/feature-tests/exchange-features/Cargo.toml
+++ b/contracts/feature-tests/exchange-features/Cargo.toml
@@ -9,9 +9,9 @@ publish = false
 path = "src/exchange_features.rs"
 
 [dependencies.multiversx-sc]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../framework/scenario"
diff --git a/contracts/feature-tests/exchange-features/meta/Cargo.toml b/contracts/feature-tests/exchange-features/meta/Cargo.toml
index da8cb703f6..0a31407adf 100644
--- a/contracts/feature-tests/exchange-features/meta/Cargo.toml
+++ b/contracts/feature-tests/exchange-features/meta/Cargo.toml
@@ -8,6 +8,6 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta-lib]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/feature-tests/exchange-features/wasm/Cargo.toml b/contracts/feature-tests/exchange-features/wasm/Cargo.toml
index 81c0d21eca..53d5b6510e 100644
--- a/contracts/feature-tests/exchange-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/exchange-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.2"
+version = "0.52.3"
 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 c103c5d986..78c61554eb 100644
--- a/contracts/feature-tests/formatted-message-features/Cargo.toml
+++ b/contracts/feature-tests/formatted-message-features/Cargo.toml
@@ -9,10 +9,10 @@ publish = false
 path = "src/formatted_message_features.rs"
 
 [dependencies.multiversx-sc]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.2"
+version = "0.52.3"
 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 182cc5c8cf..0921aa7edd 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-lib]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../framework/meta-lib"
 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 5a393086c4..fb6964e10e 100644
--- a/contracts/feature-tests/formatted-message-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/formatted-message-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.2"
+version = "0.52.3"
 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 4262d0dbf3..d0dc3c3fc1 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.52.2"
+version = "0.52.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.2"
+version = "0.52.3"
 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 90fe0f5bb3..ff34ad36d7 100644
--- a/contracts/feature-tests/managed-map-features/meta/Cargo.toml
+++ b/contracts/feature-tests/managed-map-features/meta/Cargo.toml
@@ -9,6 +9,6 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta-lib]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../framework/meta-lib"
 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 8faf947836..880012822c 100644
--- a/contracts/feature-tests/managed-map-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/managed-map-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.2"
+version = "0.52.3"
 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 e1f5926358..f67072623f 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.52.2"
+version = "0.52.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.2"
+version = "0.52.3"
 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 34447e3eef..bd9c8fa87a 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-lib]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../framework/meta-lib"
 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 036d74f5bb..20f9e0823b 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.2"
+version = "0.52.3"
 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 ece916eaf5..69049c38e3 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
@@ -29,7 +29,7 @@ path = ".."
 features = ["example_feature"]
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.2"
+version = "0.52.3"
 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 f2da929bd7..85fa29fd15 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.2"
+version = "0.52.3"
 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 60b0e3bcb0..dbca5a7806 100644
--- a/contracts/feature-tests/multi-contract-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/multi-contract-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.2"
+version = "0.52.3"
 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 4a72726cc3..2b435b2d94 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.52.2"
+version = "0.52.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.2"
+version = "0.52.3"
 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 a72f56ec83..f087723eaa 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-lib]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../framework/meta-lib"
 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 e5b2e0aa76..1ab2fdb4d6 100644
--- a/contracts/feature-tests/panic-message-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/panic-message-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/payable-features/Cargo.toml b/contracts/feature-tests/payable-features/Cargo.toml
index 2c522c95a9..1163a269dd 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.52.2"
+version = "0.52.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../framework/scenario"
diff --git a/contracts/feature-tests/payable-features/meta/Cargo.toml b/contracts/feature-tests/payable-features/meta/Cargo.toml
index a0ce40a843..0dda545db1 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-lib]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/feature-tests/payable-features/wasm/Cargo.toml b/contracts/feature-tests/payable-features/wasm/Cargo.toml
index 1737794398..245c54e249 100644
--- a/contracts/feature-tests/payable-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/payable-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.2"
+version = "0.52.3"
 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 30adfcf978..62e83fa2b1 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.52.2"
+version = "0.52.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.2"
+version = "0.52.3"
 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 f4b43e7ccc..5ad992c904 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.52.2"
+version = "0.52.3"
 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 58f1979579..b61454b659 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-lib]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../framework/meta-lib"
 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 145ec26571..bdd5201b77 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 interactor snippets manually to add relative paths:
 // [dependencies.multiversx-sc-snippets]
-// version = "0.52.2"
+// version = "0.52.3"
 // 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 89c2dac05e..02905e81f9 100644
--- a/contracts/feature-tests/rust-snippets-generator-test/wasm/Cargo.toml
+++ b/contracts/feature-tests/rust-snippets-generator-test/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.2"
+version = "0.52.3"
 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 d0165f54da..5706941832 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.52.2"
+version = "0.52.3"
 path = "../../../framework/base"
 features = [ "alloc" ]
 
@@ -17,7 +17,7 @@ path = "../../examples/adder"
 path = "../../feature-tests/basic-features"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.2"
+version = "0.52.3"
 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 6de3147b7e..8d015c0a1b 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-lib]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../framework/meta-lib"
 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 078d6c6334..ae33735008 100644
--- a/contracts/feature-tests/rust-testing-framework-tester/wasm/Cargo.toml
+++ b/contracts/feature-tests/rust-testing-framework-tester/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/scenario-tester/Cargo.toml b/contracts/feature-tests/scenario-tester/Cargo.toml
index c36e757b7c..e715da800c 100644
--- a/contracts/feature-tests/scenario-tester/Cargo.toml
+++ b/contracts/feature-tests/scenario-tester/Cargo.toml
@@ -9,9 +9,9 @@ publish = false
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../framework/scenario"
diff --git a/contracts/feature-tests/scenario-tester/meta/Cargo.toml b/contracts/feature-tests/scenario-tester/meta/Cargo.toml
index f8ab73f49b..31c185acfe 100644
--- a/contracts/feature-tests/scenario-tester/meta/Cargo.toml
+++ b/contracts/feature-tests/scenario-tester/meta/Cargo.toml
@@ -8,6 +8,6 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta-lib]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/feature-tests/scenario-tester/wasm/Cargo.toml b/contracts/feature-tests/scenario-tester/wasm/Cargo.toml
index ba98e5baf5..a30f19d77c 100644
--- a/contracts/feature-tests/scenario-tester/wasm/Cargo.toml
+++ b/contracts/feature-tests/scenario-tester/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/use-module/Cargo.toml b/contracts/feature-tests/use-module/Cargo.toml
index d563904a25..53d2c5903e 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.52.2"
+version = "0.52.3"
 path = "../../../contracts/modules"
 
 [dependencies.multiversx-sc]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../framework/scenario"
 
 [dev-dependencies.multiversx-sc-meta-lib]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../framework/meta-lib"
diff --git a/contracts/feature-tests/use-module/meta/Cargo.toml b/contracts/feature-tests/use-module/meta/Cargo.toml
index a0a57558bf..f01a7e3667 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-lib]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../framework/meta-lib"
 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 8dab13be57..17f02d7613 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.52.2"
+            "version": "0.52.3"
         }
     },
     "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 9b117b8be7..7f1d946785 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.52.2"
+            "version": "0.52.3"
         }
     },
     "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 d62745269b..3ab7138b0a 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.2"
+version = "0.52.3"
 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 589d8979b9..6c3caaf92a 100644
--- a/contracts/feature-tests/use-module/wasm/Cargo.toml
+++ b/contracts/feature-tests/use-module/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/modules/Cargo.toml b/contracts/modules/Cargo.toml
index 34411ed767..17d1ff6c90 100644
--- a/contracts/modules/Cargo.toml
+++ b/contracts/modules/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-modules"
-version = "0.52.2"
+version = "0.52.3"
 edition = "2021"
 
 authors = ["MultiversX <contact@multiversx.com>"]
@@ -17,5 +17,5 @@ categories = ["no-std", "wasm", "cryptography::cryptocurrencies"]
 alloc = ["multiversx-sc/alloc"]
 
 [dependencies.multiversx-sc]
-version = "0.52.2"
+version = "0.52.3"
 path = "../../framework/base"
diff --git a/framework/base/Cargo.toml b/framework/base/Cargo.toml
index 044945f36f..0184b001ee 100644
--- a/framework/base/Cargo.toml
+++ b/framework/base/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc"
-version = "0.52.2"
+version = "0.52.3"
 edition = "2021"
 rust-version = "1.78"
 
@@ -30,7 +30,7 @@ num-traits = { version = "=0.2.19", default-features = false }
 unwrap-infallible = "0.1.5"
 
 [dependencies.multiversx-sc-derive]
-version = "=0.52.2"
+version = "=0.52.3"
 path = "../derive"
 
 [dependencies.multiversx-sc-codec]
diff --git a/framework/derive/Cargo.toml b/framework/derive/Cargo.toml
index cce5e028d6..50f6ef6dd0 100644
--- a/framework/derive/Cargo.toml
+++ b/framework/derive/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-derive"
-version = "0.52.2"
+version = "0.52.3"
 edition = "2021"
 
 authors = ["Andrei Marinica <andrei.marinica@multiversx.com>", "MultiversX <contact@multiversx.com>"]
diff --git a/framework/meta-lib/Cargo.toml b/framework/meta-lib/Cargo.toml
index e3ce6e877f..f3149ee0c8 100644
--- a/framework/meta-lib/Cargo.toml
+++ b/framework/meta-lib/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-meta-lib"
-version = "0.52.2"
+version = "0.52.3"
 edition = "2021"
 
 authors = [
@@ -31,6 +31,6 @@ wasmprinter = "0.214"
 semver = "1.0.20"
 
 [dependencies.multiversx-sc]
-version = "=0.52.2"
+version = "=0.52.3"
 path = "../base"
 features = ["alloc", "num-bigint"]
diff --git a/framework/meta-lib/src/version_history.rs b/framework/meta-lib/src/version_history.rs
index bc208c1f7c..a906f000e8 100644
--- a/framework/meta-lib/src/version_history.rs
+++ b/framework/meta-lib/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.52.2);
+pub const LAST_VERSION: FrameworkVersion = framework_version!(0.52.3);
 
 /// Indicates where to stop with the upgrades.
 pub const LAST_UPGRADE_VERSION: FrameworkVersion = LAST_VERSION;
@@ -81,6 +81,7 @@ pub const VERSIONS: &[FrameworkVersion] = framework_versions![
     0.52.0,
     0.52.1,
     0.52.2,
+    0.52.3,
 ];
 
 #[rustfmt::skip]
@@ -106,7 +107,7 @@ pub const CHECK_AFTER_UPGRADE_TO: &[FrameworkVersion] = framework_versions![
     0.49.0,
     0.50.6,
     0.51.1,
-    0.52.2,
+    0.52.3,
 ];
 
 pub const LOWER_VERSION_WITH_TEMPLATE_TAG: FrameworkVersion = framework_version!(0.43.0);
diff --git a/framework/meta/Cargo.toml b/framework/meta/Cargo.toml
index cc704469db..bd6775ed1a 100644
--- a/framework/meta/Cargo.toml
+++ b/framework/meta/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-meta"
-version = "0.52.2"
+version = "0.52.3"
 edition = "2021"
 
 authors = [
@@ -41,14 +41,14 @@ pathdiff = "0.2.1"
 common-path = "1.0.0" 
 
 [dependencies.multiversx-sc-meta-lib]
-version = "=0.52.2"
+version = "=0.52.3"
 path = "../meta-lib"
 
 [dependencies.multiversx-sc]
-version = "=0.52.2"
+version = "=0.52.3"
 path = "../base"
 features = ["alloc", "num-bigint"]
 
 [dependencies.multiversx-sc-snippets]
-version = "=0.52.2"
+version = "=0.52.3"
 path = "../snippets"
diff --git a/framework/scenario/Cargo.toml b/framework/scenario/Cargo.toml
index 27d2c7121e..9cf7f2a553 100644
--- a/framework/scenario/Cargo.toml
+++ b/framework/scenario/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-scenario"
-version = "0.52.2"
+version = "0.52.3"
 edition = "2021"
 
 authors = [
@@ -37,12 +37,12 @@ wasm-incopatible = ["multiversx-chain-vm/wasm-incopatible"]
 run-go-tests = []
 
 [dependencies.multiversx-sc]
-version = "=0.52.2"
+version = "=0.52.3"
 features = ["alloc", "num-bigint"]
 path = "../base"
 
 [dependencies.multiversx-sc-meta-lib]
-version = "=0.52.2"
+version = "=0.52.3"
 path = "../meta-lib"
 
 [dependencies.multiversx-chain-scenario-format]
diff --git a/framework/snippets/Cargo.toml b/framework/snippets/Cargo.toml
index f175c85e75..a5eef34aee 100644
--- a/framework/snippets/Cargo.toml
+++ b/framework/snippets/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-snippets"
-version = "0.52.2"
+version = "0.52.3"
 edition = "2021"
 
 authors = ["MultiversX <contact@multiversx.com>"]
@@ -22,7 +22,7 @@ env_logger = "0.11"
 futures = "0.3"
 
 [dependencies.multiversx-sc-scenario]
-version = "=0.52.2"
+version = "=0.52.3"
 path = "../scenario"
 
 [dependencies.multiversx-chain-scenario-format]
diff --git a/framework/wasm-adapter/Cargo.toml b/framework/wasm-adapter/Cargo.toml
index c532879911..66bf290796 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.52.2"
+version = "0.52.3"
 edition = "2021"
 
 authors = [
@@ -22,5 +22,5 @@ categories = [
 ]
 
 [dependencies.multiversx-sc]
-version = "=0.52.2"
+version = "=0.52.3"
 path = "../base"
diff --git a/publish.sh b/publish.sh
index ddda3e9762..53a5e922af 100755
--- a/publish.sh
+++ b/publish.sh
@@ -19,6 +19,7 @@
 #
 # 2. Mass replace previous version -> new version.
 # Be careful to not accidentally replace some of the other dependencies we have.
+# Make sure to exclude files with extensions: *.lock, *.md, *.wat, *.txt, *.sh.
 #
 # 3. Write release name, date and description in `CHANGELOG.md`.
 #
diff --git a/tools/mxpy-snippet-generator/Cargo.toml b/tools/mxpy-snippet-generator/Cargo.toml
index b17460fe01..58236c7f78 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.52.2"
+version = "0.52.3"
 path = "../../framework/base"
 
 [dependencies]
diff --git a/tools/plotter/Cargo.toml b/tools/plotter/Cargo.toml
index 4219c837d5..e0e5491322 100644
--- a/tools/plotter/Cargo.toml
+++ b/tools/plotter/Cargo.toml
@@ -21,11 +21,11 @@ plotters-canvas = "^0.3.0"
 lto = true
 
 [dependencies.multiversx-sc]
-version = "=0.52.2"
+version = "=0.52.3"
 path = "../../framework/base"
 
 [dependencies.multiversx-sc-scenario]
-version = "=0.52.2"
+version = "=0.52.3"
 path = "../../framework/scenario"
 default-features = false
 
diff --git a/tools/rust-debugger/format-tests/Cargo.toml b/tools/rust-debugger/format-tests/Cargo.toml
index 00fc25a88b..fe84121ba5 100644
--- a/tools/rust-debugger/format-tests/Cargo.toml
+++ b/tools/rust-debugger/format-tests/Cargo.toml
@@ -9,11 +9,11 @@ name = "format-tests"
 path = "src/format_tests.rs"
 
 [dependencies.multiversx-sc]
-version = "=0.52.2"
+version = "=0.52.3"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-scenario]
-version = "=0.52.2"
+version = "=0.52.3"
 path = "../../../framework/scenario"
 
 [dependencies.multiversx-chain-vm]

From f7e81bfd0198830dd5e67eeb65964b05ff32c996 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Tue, 6 Aug 2024 16:08:50 +0300
Subject: [PATCH 1147/1254] Cargo.lock updates

---
 .../benchmarks/large-storage/wasm/Cargo.lock  |  6 ++---
 .../linked-list-repeat/wasm/Cargo.lock        |  6 ++---
 .../mappers/map-repeat/wasm/Cargo.lock        |  6 ++---
 .../mappers/queue-repeat/wasm/Cargo.lock      |  6 ++---
 .../mappers/set-repeat/wasm/Cargo.lock        |  6 ++---
 .../single-value-repeat/wasm/Cargo.lock       |  6 ++---
 .../mappers/vec-repeat/wasm/Cargo.lock        |  6 ++---
 .../benchmarks/send-tx-repeat/wasm/Cargo.lock |  6 ++---
 .../Cargo.lock                                |  6 ++---
 .../Cargo.lock                                |  6 ++---
 .../benchmarks/str-repeat/wasm/Cargo.lock     |  6 ++---
 .../core/price-aggregator/wasm/Cargo.lock     | 22 +++++++++----------
 contracts/examples/adder/wasm/Cargo.lock      |  6 ++---
 .../bonding-curve-contract/wasm/Cargo.lock    |  8 +++----
 .../examples/check-pause/wasm/Cargo.lock      |  8 +++----
 .../crowdfunding-esdt/wasm/Cargo.lock         |  6 ++---
 .../examples/crypto-bubbles/wasm/Cargo.lock   |  6 ++---
 .../kitty-auction/wasm/Cargo.lock             |  6 ++---
 .../kitty-genetic-alg/wasm/Cargo.lock         |  6 ++---
 .../kitty-ownership/wasm/Cargo.lock           |  6 ++---
 .../examples/crypto-zombies/wasm/Cargo.lock   |  6 ++---
 .../examples/digital-cash/wasm/Cargo.lock     |  6 ++---
 contracts/examples/empty/wasm/Cargo.lock      |  6 ++---
 .../esdt-transfer-with-fee/wasm/Cargo.lock    |  6 ++---
 contracts/examples/factorial/wasm/Cargo.lock  |  6 ++---
 .../examples/fractional-nfts/wasm/Cargo.lock  |  8 +++----
 .../examples/lottery-esdt/wasm/Cargo.lock     |  6 ++---
 .../multisig/wasm-multisig-full/Cargo.lock    |  8 +++----
 .../multisig/wasm-multisig-view/Cargo.lock    |  8 +++----
 contracts/examples/multisig/wasm/Cargo.lock   |  8 +++----
 contracts/examples/nft-minter/wasm/Cargo.lock |  6 ++---
 .../nft-storage-prepay/wasm/Cargo.lock        |  6 ++---
 .../examples/nft-subscription/wasm/Cargo.lock |  8 +++----
 .../order-book/factory/wasm/Cargo.lock        |  6 ++---
 .../examples/order-book/pair/wasm/Cargo.lock  |  6 ++---
 .../examples/ping-pong-egld/wasm/Cargo.lock   |  6 ++---
 .../examples/proxy-pause/wasm/Cargo.lock      |  6 ++---
 .../rewards-distribution/wasm/Cargo.lock      |  8 +++----
 .../examples/seed-nft-minter/wasm/Cargo.lock  |  8 +++----
 .../examples/token-release/wasm/Cargo.lock    |  6 ++---
 .../abi-tester/wasm-abi-tester-ev/Cargo.lock  |  6 ++---
 .../feature-tests/abi-tester/wasm/Cargo.lock  |  6 ++---
 .../wasm-alloc-mem-fail/Cargo.lock            |  6 ++---
 .../wasm-alloc-mem-leaking/Cargo.lock         |  6 ++---
 .../alloc-features/wasm/Cargo.lock            |  6 ++---
 .../Cargo.lock                                |  8 +++----
 .../basic-features/wasm/Cargo.lock            |  8 +++----
 .../big-float-features/wasm/Cargo.lock        |  6 ++---
 .../builtin-func-features/wasm/Cargo.lock     |  6 ++---
 .../first-contract/wasm/Cargo.lock            |  6 ++---
 .../second-contract/wasm/Cargo.lock           |  6 ++---
 .../child/wasm/Cargo.lock                     |  6 ++---
 .../parent/wasm/Cargo.lock                    |  6 ++---
 .../forwarder-legacy/wasm/Cargo.lock          |  6 ++---
 .../wasm-forwarder-queue-promises/Cargo.lock  |  6 ++---
 .../forwarder-queue/wasm/Cargo.lock           |  6 ++---
 .../Cargo.lock                                |  6 ++---
 .../Cargo.lock                                |  6 ++---
 .../forwarder-raw/wasm/Cargo.lock             |  6 ++---
 .../composability/forwarder/wasm/Cargo.lock   |  6 ++---
 .../local-esdt-and-nft/wasm/Cargo.lock        |  6 ++---
 .../promises-features/wasm/Cargo.lock         |  6 ++---
 .../proxy-test-first/wasm/Cargo.lock          |  6 ++---
 .../proxy-test-second/wasm/Cargo.lock         |  6 ++---
 .../recursive-caller/wasm/Cargo.lock          |  6 ++---
 .../transfer-role-features/wasm/Cargo.lock    |  8 +++----
 .../vault/wasm-vault-promises/Cargo.lock      |  6 ++---
 .../vault/wasm-vault-upgrade/Cargo.lock       |  6 ++---
 .../composability/vault/wasm/Cargo.lock       |  6 ++---
 .../crowdfunding-erc20/wasm/Cargo.lock        |  6 ++---
 .../erc1155-marketplace/wasm/Cargo.lock       |  6 ++---
 .../erc1155-user-mock/wasm/Cargo.lock         |  6 ++---
 .../erc1155/wasm/Cargo.lock                   |  6 ++---
 .../erc-style-contracts/erc20/wasm/Cargo.lock |  6 ++---
 .../erc721/wasm/Cargo.lock                    |  6 ++---
 .../lottery-erc20/wasm/Cargo.lock             |  6 ++---
 .../esdt-system-sc-mock/wasm/Cargo.lock       |  6 ++---
 .../exchange-features/wasm/Cargo.lock         |  6 ++---
 .../wasm/Cargo.lock                           |  6 ++---
 .../managed-map-features/wasm/Cargo.lock      |  6 ++---
 .../wasm-multi-contract-alt-impl/Cargo.lock   |  6 ++---
 .../Cargo.lock                                |  6 ++---
 .../Cargo.lock                                |  6 ++---
 .../multi-contract-features/wasm/Cargo.lock   |  6 ++---
 .../panic-message-features/wasm/Cargo.lock    |  6 ++---
 .../payable-features/wasm/Cargo.lock          |  6 ++---
 .../wasm/Cargo.lock                           |  6 ++---
 .../wasm/Cargo.lock                           |  6 ++---
 .../scenario-tester/wasm/Cargo.lock           |  6 ++---
 .../wasm-use-module-view/Cargo.lock           |  8 +++----
 .../feature-tests/use-module/wasm/Cargo.lock  |  8 +++----
 91 files changed, 295 insertions(+), 295 deletions(-)

diff --git a/contracts/benchmarks/large-storage/wasm/Cargo.lock b/contracts/benchmarks/large-storage/wasm/Cargo.lock
index 449b6dfb48..7d32682d74 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.52.2"
+version = "0.52.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.lock
index 0edbdd240a..e403b32e0b 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.52.2"
+version = "0.52.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.lock
index e3fb4e2948..e5f3839a32 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.52.2"
+version = "0.52.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.lock
index d88c7d307a..772bd3e7f0 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.52.2"
+version = "0.52.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -78,7 +78,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -89,7 +89,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.lock
index 2dd38cb324..dd3ac5de6e 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.52.2"
+version = "0.52.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -78,7 +78,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -89,7 +89,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.lock
index 8d58d89f01..41037c6f93 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.52.2"
+version = "0.52.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -78,7 +78,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -89,7 +89,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.lock
index 10cc2393d9..4563507c04 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.52.2"
+version = "0.52.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -78,7 +78,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -89,7 +89,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/send-tx-repeat/wasm/Cargo.lock b/contracts/benchmarks/send-tx-repeat/wasm/Cargo.lock
index a227e095cf..9e9370fc9d 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.52.2"
+version = "0.52.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.lock b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.lock
index 34cd051db9..ede7e7eb39 100644
--- a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.lock
+++ b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.lock
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.lock b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.lock
index 36e9a1fdac..5b3ae0a3c2 100644
--- a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.lock
+++ b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.lock
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/benchmarks/str-repeat/wasm/Cargo.lock b/contracts/benchmarks/str-repeat/wasm/Cargo.lock
index 9d1f70d166..25248e417d 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.52.2"
+version = "0.52.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/core/price-aggregator/wasm/Cargo.lock b/contracts/core/price-aggregator/wasm/Cargo.lock
index a1b1649662..abc4b08c51 100644
--- a/contracts/core/price-aggregator/wasm/Cargo.lock
+++ b/contracts/core/price-aggregator/wasm/Cargo.lock
@@ -92,7 +92,7 @@ checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
 
 [[package]]
 name = "multiversx-price-aggregator-sc"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "arrayvec",
  "getrandom",
@@ -111,7 +111,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -142,7 +142,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -153,14 +153,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]
@@ -191,9 +191,9 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "ppv-lite86"
-version = "0.2.18"
+version = "0.2.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dee4364d9f3b902ef14fab8a1ddffb783a1cb6b4bba3bfc1fa3922732c7de97f"
+checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04"
 dependencies = [
  "zerocopy",
 ]
@@ -347,9 +347,9 @@ checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
 
 [[package]]
 name = "zerocopy"
-version = "0.6.6"
+version = "0.7.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "854e949ac82d619ee9a14c66a1b674ac730422372ccb759ce0c39cabcf2bf8e6"
+checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
 dependencies = [
  "byteorder",
  "zerocopy-derive",
@@ -357,9 +357,9 @@ dependencies = [
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.6.6"
+version = "0.7.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "125139de3f6b9d625c39e2efdd73d41bdac468ccd556556440e322be0e1bbd91"
+checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/adder/wasm/Cargo.lock b/contracts/examples/adder/wasm/Cargo.lock
index c187c9a06f..f6d5d52130 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.52.2"
+version = "0.52.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/bonding-curve-contract/wasm/Cargo.lock b/contracts/examples/bonding-curve-contract/wasm/Cargo.lock
index 94fb75c2b6..28e1779440 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.52.2"
+version = "0.52.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/check-pause/wasm/Cargo.lock b/contracts/examples/check-pause/wasm/Cargo.lock
index ee6f604c34..e591595269 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.52.2"
+version = "0.52.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crowdfunding-esdt/wasm/Cargo.lock b/contracts/examples/crowdfunding-esdt/wasm/Cargo.lock
index 4eb1488211..050bfda0ad 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.52.2"
+version = "0.52.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crypto-bubbles/wasm/Cargo.lock b/contracts/examples/crypto-bubbles/wasm/Cargo.lock
index a94d019514..44635d1822 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.52.2"
+version = "0.52.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.lock b/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.lock
index 1ae787b3ac..a51a2f4131 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.52.2"
+version = "0.52.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -115,7 +115,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -126,7 +126,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]
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 1c5800e2ec..e2c12cd9cc 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.52.2"
+version = "0.52.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -96,7 +96,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -107,7 +107,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.lock b/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.lock
index db1fae4ae1..4c52ff4a93 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.52.2"
+version = "0.52.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -106,7 +106,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -117,7 +117,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/crypto-zombies/wasm/Cargo.lock b/contracts/examples/crypto-zombies/wasm/Cargo.lock
index 2c87c07a0f..1701f63971 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.52.2"
+version = "0.52.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/digital-cash/wasm/Cargo.lock b/contracts/examples/digital-cash/wasm/Cargo.lock
index 17c99c6752..656d5dbf2d 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.52.2"
+version = "0.52.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/empty/wasm/Cargo.lock b/contracts/examples/empty/wasm/Cargo.lock
index 6e73dc1892..a9695475ec 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.52.2"
+version = "0.52.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.lock b/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.lock
index 187733dc05..fdb57e5291 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.52.2"
+version = "0.52.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/factorial/wasm/Cargo.lock b/contracts/examples/factorial/wasm/Cargo.lock
index 453dcf405c..47ea775d59 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.52.2"
+version = "0.52.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/fractional-nfts/wasm/Cargo.lock b/contracts/examples/fractional-nfts/wasm/Cargo.lock
index 485f20c3c2..7bc9ae041f 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.52.2"
+version = "0.52.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/lottery-esdt/wasm/Cargo.lock b/contracts/examples/lottery-esdt/wasm/Cargo.lock
index 65058e2e27..45e4b6e1b9 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.52.2"
+version = "0.52.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/multisig/wasm-multisig-full/Cargo.lock b/contracts/examples/multisig/wasm-multisig-full/Cargo.lock
index a2f13403bb..7c2e872610 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.52.2"
+version = "0.52.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/multisig/wasm-multisig-view/Cargo.lock b/contracts/examples/multisig/wasm-multisig-view/Cargo.lock
index c3370c15ef..3c71e2d24d 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.52.2"
+version = "0.52.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/multisig/wasm/Cargo.lock b/contracts/examples/multisig/wasm/Cargo.lock
index 0d6b36c408..d305a4c7f9 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.52.2"
+version = "0.52.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/nft-minter/wasm/Cargo.lock b/contracts/examples/nft-minter/wasm/Cargo.lock
index 63e92fa046..d52497c4f9 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.52.2"
+version = "0.52.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/nft-storage-prepay/wasm/Cargo.lock b/contracts/examples/nft-storage-prepay/wasm/Cargo.lock
index 9f591ffb45..f7fc4d8d1e 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.52.2"
+version = "0.52.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/nft-subscription/wasm/Cargo.lock b/contracts/examples/nft-subscription/wasm/Cargo.lock
index ec1493054f..dcd42f265e 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.52.2"
+version = "0.52.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,14 +82,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/order-book/factory/wasm/Cargo.lock b/contracts/examples/order-book/factory/wasm/Cargo.lock
index a0e45cb258..ffee60fd78 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.52.2"
+version = "0.52.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/order-book/pair/wasm/Cargo.lock b/contracts/examples/order-book/pair/wasm/Cargo.lock
index 68ac30a9c9..b56aea2f0e 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.52.2"
+version = "0.52.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/ping-pong-egld/wasm/Cargo.lock b/contracts/examples/ping-pong-egld/wasm/Cargo.lock
index 1f27339e0c..5f781d51fe 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.52.2"
+version = "0.52.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/proxy-pause/wasm/Cargo.lock b/contracts/examples/proxy-pause/wasm/Cargo.lock
index 4f1eb9e532..41ae133c82 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.52.2"
+version = "0.52.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/rewards-distribution/wasm/Cargo.lock b/contracts/examples/rewards-distribution/wasm/Cargo.lock
index 1913e967da..6b3788cb13 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.52.2"
+version = "0.52.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,14 +82,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/seed-nft-minter/wasm/Cargo.lock b/contracts/examples/seed-nft-minter/wasm/Cargo.lock
index 0e775da157..7c70262097 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.52.2"
+version = "0.52.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,14 +82,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/examples/token-release/wasm/Cargo.lock b/contracts/examples/token-release/wasm/Cargo.lock
index c8d76d28ea..507943ce3c 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.52.2"
+version = "0.52.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]
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 1ecb634c9a..90ec4c9898 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.52.2"
+version = "0.52.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/abi-tester/wasm/Cargo.lock b/contracts/feature-tests/abi-tester/wasm/Cargo.lock
index dc26daf22f..2dae880107 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.52.2"
+version = "0.52.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock
index cea20c07dc..84fade15cc 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.lock b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.lock
index abbe9b7563..ff7f6cf88b 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.lock
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.lock
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/alloc-features/wasm/Cargo.lock b/contracts/feature-tests/alloc-features/wasm/Cargo.lock
index 3a8da98bfd..09bd4da933 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.52.2"
+version = "0.52.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]
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 572127e27e..a3e9ee3fd5 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.52.2"
+version = "0.52.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/basic-features/wasm/Cargo.lock b/contracts/feature-tests/basic-features/wasm/Cargo.lock
index 106b3ef55b..d09b3e010b 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.52.2"
+version = "0.52.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/big-float-features/wasm/Cargo.lock b/contracts/feature-tests/big-float-features/wasm/Cargo.lock
index fdf2a7d086..797bf246ef 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.52.2"
+version = "0.52.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]
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 4b6393ccb2..651d9e961a 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.52.2"
+version = "0.52.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]
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 f623c2fdc1..215a2b1f30 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.52.2"
+version = "0.52.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]
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 38d2a36510..ece4745ed1 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.52.2"
+version = "0.52.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]
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 3fe9a669d1..70aac4f32d 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.52.2"
+version = "0.52.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]
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 b560dc89f3..74383622b1 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
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.lock
index 156c114ea6..fec9eb2e22 100644
--- a/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.lock
@@ -56,7 +56,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,7 +98,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]
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 c9334300a8..9374da4ab5 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
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock
index bcb3cada4d..e118c93f1a 100644
--- a/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]
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 85af6e71f1..0b0052013d 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.52.2"
+version = "0.52.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]
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 2ac228399f..468a2e1533 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.52.2"
+version = "0.52.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.lock
index 5ca0e96523..008063808e 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.52.2"
+version = "0.52.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock
index c54974aaeb..449f2719cd 100755
--- a/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]
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 3215990729..b3da293bdd 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.52.2"
+version = "0.52.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/promises-features/wasm/Cargo.lock b/contracts/feature-tests/composability/promises-features/wasm/Cargo.lock
index 8308a8b80a..cc794fed5d 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.52.2"
+version = "0.52.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]
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 def169576d..cdb4518ec3 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.52.2"
+version = "0.52.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]
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 caa9b9fb97..6c4e6e88ae 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.52.2"
+version = "0.52.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.lock b/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.lock
index 7dc7db6e62..e690375317 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.52.2"
+version = "0.52.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]
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 c7774469a2..8c0b748e9c 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.52.2"
+version = "0.52.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,14 +82,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]
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 dd3b852765..8293653256 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.52.2"
+version = "0.52.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]
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 a63473ae73..9e7b4c96aa 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.52.2"
+version = "0.52.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/composability/vault/wasm/Cargo.lock b/contracts/feature-tests/composability/vault/wasm/Cargo.lock
index 03574bc948..487f3f3c5e 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.52.2"
+version = "0.52.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]
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 42cdca0fac..99d01294c9 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.52.2"
+version = "0.52.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]
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 cc8364d80c..40bcc4c73a 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.52.2"
+version = "0.52.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]
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 f047d506a7..a11bc7acd8 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.52.2"
+version = "0.52.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]
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 7c58a339e8..97d227ab52 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.52.2"
+version = "0.52.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]
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 2829741448..120fa61654 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.52.2"
+version = "0.52.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]
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 e4e8d5de92..1f15d311e2 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.52.2"
+version = "0.52.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]
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 714c2b0666..b3ab6d4fc0 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.52.2"
+version = "0.52.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]
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 81f0a6cec0..e4a4b32fdc 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.52.2"
+version = "0.52.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/exchange-features/wasm/Cargo.lock b/contracts/feature-tests/exchange-features/wasm/Cargo.lock
index 75dc897817..e3d0967e86 100644
--- a/contracts/feature-tests/exchange-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/exchange-features/wasm/Cargo.lock
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/formatted-message-features/wasm/Cargo.lock b/contracts/feature-tests/formatted-message-features/wasm/Cargo.lock
index 3b78c2ee54..df2b28cfba 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.52.2"
+version = "0.52.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/managed-map-features/wasm/Cargo.lock b/contracts/feature-tests/managed-map-features/wasm/Cargo.lock
index 2dba82dc16..ab630ec3ac 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.52.2"
+version = "0.52.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]
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 12089a449f..352a9bdce9 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.52.2"
+version = "0.52.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]
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 2fbd2df685..09b88c504b 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.52.2"
+version = "0.52.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]
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 ca3b1ac55b..f4497102e2 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.52.2"
+version = "0.52.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/multi-contract-features/wasm/Cargo.lock b/contracts/feature-tests/multi-contract-features/wasm/Cargo.lock
index 9bfb7d5c88..6331d66381 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.52.2"
+version = "0.52.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/panic-message-features/wasm/Cargo.lock b/contracts/feature-tests/panic-message-features/wasm/Cargo.lock
index 88d117f8ea..0dcf0d755e 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.52.2"
+version = "0.52.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/payable-features/wasm/Cargo.lock b/contracts/feature-tests/payable-features/wasm/Cargo.lock
index 51f023f66b..81cc7b1033 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.52.2"
+version = "0.52.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]
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 b447344f07..d78c02e631 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.52.2"
+version = "0.52.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]
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 c98a04a7fa..378234f233 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.52.2"
+version = "0.52.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/scenario-tester/wasm/Cargo.lock b/contracts/feature-tests/scenario-tester/wasm/Cargo.lock
index deecef9b4f..a32b98fbf4 100755
--- a/contracts/feature-tests/scenario-tester/wasm/Cargo.lock
+++ b/contracts/feature-tests/scenario-tester/wasm/Cargo.lock
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]
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 475dbf117f..466d0ad099 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.52.2"
+version = "0.52.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,14 +82,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]
diff --git a/contracts/feature-tests/use-module/wasm/Cargo.lock b/contracts/feature-tests/use-module/wasm/Cargo.lock
index 9f8b1286ca..35e4bcefdd 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.52.2"
+version = "0.52.3"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,14 +82,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.2"
+version = "0.52.3"
 dependencies = [
  "multiversx-sc",
 ]

From bf4204c475edcabb645517397ec2d9ab1a8cbfbd Mon Sep 17 00:00:00 2001
From: Alin Cruceat <alyn_509@yahoo.com>
Date: Tue, 6 Aug 2024 17:16:34 +0300
Subject: [PATCH 1148/1254] authos as string, not PathBuf

---
 framework/meta/src/cli/cli_args_standalone.rs        | 2 +-
 framework/meta/src/cmd/template/contract_creator.rs  | 4 +---
 framework/meta/src/cmd/template/template_adjuster.rs | 9 ++-------
 framework/meta/tests/template_test.rs                | 6 +++---
 4 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/framework/meta/src/cli/cli_args_standalone.rs b/framework/meta/src/cli/cli_args_standalone.rs
index cda40bb307..335afe41ea 100644
--- a/framework/meta/src/cli/cli_args_standalone.rs
+++ b/framework/meta/src/cli/cli_args_standalone.rs
@@ -269,7 +269,7 @@ pub struct TemplateArgs {
     /// The author of the contract.
     /// If missing, the default author will be considered.
     #[arg(long, verbatim_doc_comment)]
-    pub author: Option<PathBuf>,
+    pub author: Option<String>,
 }
 
 impl CliArgsToRaw for TemplateArgs {
diff --git a/framework/meta/src/cmd/template/contract_creator.rs b/framework/meta/src/cmd/template/contract_creator.rs
index 6d25f00f2e..8483f3c8f8 100644
--- a/framework/meta/src/cmd/template/contract_creator.rs
+++ b/framework/meta/src/cmd/template/contract_creator.rs
@@ -1,5 +1,3 @@
-use std::path::PathBuf;
-
 use convert_case::{Case, Casing};
 
 use crate::{
@@ -67,7 +65,7 @@ impl<'a> ContractCreator<'a> {
         template_name: String,
         target: ContractCreatorTarget,
         keep_paths: bool,
-        new_author: Option<PathBuf>,
+        new_author: Option<String>,
     ) -> Self {
         let template_sources = template_sources(repo_source);
         let template_source = template_sources
diff --git a/framework/meta/src/cmd/template/template_adjuster.rs b/framework/meta/src/cmd/template/template_adjuster.rs
index 98bb3f4575..161b80ee5f 100644
--- a/framework/meta/src/cmd/template/template_adjuster.rs
+++ b/framework/meta/src/cmd/template/template_adjuster.rs
@@ -1,5 +1,3 @@
-use std::path::PathBuf;
-
 use super::{template_metadata::TemplateMetadata, ContractCreatorTarget};
 use crate::{
     cmd::upgrade::upgrade_common::{rename_files, replace_in_files},
@@ -23,7 +21,7 @@ pub struct TemplateAdjuster {
     pub metadata: TemplateMetadata,
     pub target: ContractCreatorTarget,
     pub keep_paths: bool,
-    pub new_author: Option<PathBuf>,
+    pub new_author: Option<String>,
 }
 impl TemplateAdjuster {
     pub fn update_cargo_toml_files(&self, args_tag: FrameworkVersion) {
@@ -32,10 +30,7 @@ impl TemplateAdjuster {
         } else {
             self.new_author
                 .clone()
-                .unwrap()
-                .into_os_string()
-                .into_string()
-                .unwrap_or(DEFAULT_AUTHOR.to_string())
+                .unwrap_or_else(|| DEFAULT_AUTHOR.to_string())
         };
         self.update_cargo_toml_root(author_as_str.clone());
         self.update_cargo_toml_meta();
diff --git a/framework/meta/tests/template_test.rs b/framework/meta/tests/template_test.rs
index 7898f88fc0..764aae6f87 100644
--- a/framework/meta/tests/template_test.rs
+++ b/framework/meta/tests/template_test.rs
@@ -1,4 +1,4 @@
-use std::{fs, path::PathBuf, process::Command};
+use std::{fs, process::Command};
 
 use convert_case::{Case, Casing};
 use multiversx_sc_meta::{
@@ -88,7 +88,7 @@ fn template_test_current(template_name: &str, sub_path: &str, new_name: &str, ne
     let author = if new_author.is_empty() {
         None
     } else {
-        Some(PathBuf::from(new_author))
+        Some(new_author.to_string())
     };
 
     ContractCreator::new(
@@ -156,7 +156,7 @@ fn template_test_released(template_name: &str, new_name: &str, new_author: &str)
     let author = if new_author.is_empty() {
         None
     } else {
-        Some(PathBuf::from(new_author))
+        Some(new_author.to_string())
     };
 
     ContractCreator::new(

From 36a0918d77b2874a91054fae049c7545995c52fc Mon Sep 17 00:00:00 2001
From: Alin Cruceat <alyn_509@yahoo.com>
Date: Tue, 6 Aug 2024 17:21:34 +0300
Subject: [PATCH 1149/1254] minor fix

---
 framework/meta/src/cmd/template/template_adjuster.rs | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/framework/meta/src/cmd/template/template_adjuster.rs b/framework/meta/src/cmd/template/template_adjuster.rs
index 161b80ee5f..2e628a9266 100644
--- a/framework/meta/src/cmd/template/template_adjuster.rs
+++ b/framework/meta/src/cmd/template/template_adjuster.rs
@@ -25,13 +25,10 @@ pub struct TemplateAdjuster {
 }
 impl TemplateAdjuster {
     pub fn update_cargo_toml_files(&self, args_tag: FrameworkVersion) {
-        let author_as_str = if self.new_author.is_none() {
-            DEFAULT_AUTHOR.to_string()
-        } else {
-            self.new_author
-                .clone()
-                .unwrap_or_else(|| DEFAULT_AUTHOR.to_string())
-        };
+        let author_as_str = self
+            .new_author
+            .clone()
+            .unwrap_or_else(|| DEFAULT_AUTHOR.to_string());
         self.update_cargo_toml_root(author_as_str.clone());
         self.update_cargo_toml_meta();
         self.update_cargo_toml_wasm(args_tag);

From 9e961aea93e18430e3dc94010d9bbb3761c03cda Mon Sep 17 00:00:00 2001
From: Alin Cruceat <alyn_509@yahoo.com>
Date: Wed, 7 Aug 2024 10:35:21 +0300
Subject: [PATCH 1150/1254] VecMapper update with index

---
 framework/base/src/storage/mappers/vec_mapper.rs | 10 ++++++++++
 framework/scenario/tests/test_vec_mapper.rs      | 14 ++++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/framework/base/src/storage/mappers/vec_mapper.rs b/framework/base/src/storage/mappers/vec_mapper.rs
index 80f8c6018a..22b8763ece 100644
--- a/framework/base/src/storage/mappers/vec_mapper.rs
+++ b/framework/base/src/storage/mappers/vec_mapper.rs
@@ -209,6 +209,16 @@ where
         self.set_unchecked(index, item);
     }
 
+    /// 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.
+    pub fn update<R, F: FnOnce(&mut T) -> R>(&mut self, index: usize, f: F) -> R {
+        let mut value = self.get(index);
+        let result = f(&mut value);
+        self.set(index, &value);
+        result
+    }
+
     /// Keeping `set_unchecked` private on purpose, so developers don't write out of index limits by accident.
     fn set_unchecked(&self, index: usize, item: &T) {
         storage_set(self.item_key(index).as_ref(), item);
diff --git a/framework/scenario/tests/test_vec_mapper.rs b/framework/scenario/tests/test_vec_mapper.rs
index f7bc6587e4..92002fcc80 100644
--- a/framework/scenario/tests/test_vec_mapper.rs
+++ b/framework/scenario/tests/test_vec_mapper.rs
@@ -79,6 +79,20 @@ fn test_vec_swap_remove() {
     check_vec(&vect, vec![42, 45]);
 }
 
+#[test]
+fn test_vec_update() {
+    let mut vect = create_vec();
+
+    vect.extend_from_slice(&[42, 43, 44, 45, 46]);
+
+    assert_eq!(vect.len(), 5);
+    assert_eq!(vect.get(5), 46);
+    vect.update(5, |item| *item = 42);
+    assert_eq!(vect.len(), 5);
+    assert_eq!(vect.get(5), 42);
+    check_vec(&vect, vec![42, 43, 44, 45, 42]);
+}
+
 #[test]
 fn test_vec_iter_processing() {
     let mut vect = create_vec();

From 86a1508d8ddaa3ada262ef2140417d5df1f698d6 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Fri, 9 Aug 2024 15:13:15 +0300
Subject: [PATCH 1151/1254] cli code report - new report commands: compile,
 compare, convert

---
 framework/meta/src/cli/cli_args_standalone.rs |  59 +++++--
 framework/meta/src/cli/cli_standalone_main.rs |   4 +-
 framework/meta/src/cmd/code_report.rs         |  29 ++--
 framework/meta/src/cmd/code_report/compare.rs |  36 -----
 .../src/cmd/code_report/generate_report.rs    | 152 ++++++++++--------
 .../src/cmd/code_report/render_code_report.rs |  61 ++++---
 reported.md                                   |  96 -----------
 7 files changed, 179 insertions(+), 258 deletions(-)
 delete mode 100644 reported.md

diff --git a/framework/meta/src/cli/cli_args_standalone.rs b/framework/meta/src/cli/cli_args_standalone.rs
index 1cdde75cdd..d7d96dd0c8 100644
--- a/framework/meta/src/cli/cli_args_standalone.rs
+++ b/framework/meta/src/cli/cli_args_standalone.rs
@@ -65,7 +65,7 @@ pub enum StandaloneCliAction {
     #[command(name = "test-coverage", about = "Run test coverage and output report")]
     TestCoverage(TestCoverageArgs),
 
-    #[command(name = "code-report", about = "Generate code report")]
+    #[command(name = "report", about = "Generate code report")]
     CodeReportGen(CodeReportArgs),
 
     #[command(
@@ -142,25 +142,64 @@ pub struct TestCoverageArgs {
     pub ignore_filename_regex: Vec<String>,
 }
 
-#[derive(Default, Clone, PartialEq, Eq, Debug, Args)]
+#[derive(Clone, PartialEq, Eq, Debug, Args)]
 pub struct CodeReportArgs {
+    #[command(subcommand)]
+    pub command: CodeReportAction,
+}
+
+#[derive(Clone, PartialEq, Eq, Debug, Subcommand)]
+pub enum CodeReportAction {
+    #[command(name = "compile", about = "Generates the contract report.")]
+    Compile(CompileArgs),
+
+    #[command(name = "compare", about = "Compare two contract report.")]
+    Compare(CompareArgs),
+
+    #[command(
+        name = "convert",
+        about = "Converts a contract report to a Markdown file."
+    )]
+    Convert(ConvertArgs),
+}
+
+#[derive(Clone, PartialEq, Eq, Debug, Args)]
+pub struct CompileArgs {
     /// Target directory where to generate code report.
-    /// Will be current directory if not specified.
     #[arg(short, long, verbatim_doc_comment)]
-    pub path: Option<String>,
+    pub path: PathBuf,
 
-    /// Output file path
+    /// Path to the Markdown or JSON file where the report results will be written.
     #[arg(short, long, verbatim_doc_comment)]
     pub output: PathBuf,
+}
 
-    /// Output format
+#[derive(Clone, PartialEq, Eq, Debug, Args)]
+pub struct CompareArgs {
+    /// Path to the previous version of code report JSON file
+    /// that will be used for comparison.
     #[arg(short, long, verbatim_doc_comment)]
-    pub format: Option<OutputFormat>,
+    pub baseline: PathBuf,
 
-    /// Compares 2 reports in JSON format and the output is printed in Markdown format.
-    /// If one argument with JSON format is given then it compares with itself.
+    /// Path to the current version of the code report JSON file
+    /// that will be compared.
     #[arg(short, long, verbatim_doc_comment)]
-    pub compare: Vec<PathBuf>,
+    pub new: PathBuf,
+
+    /// Path to the Markdown file where the comparison results will be written.
+    #[arg(short, long, verbatim_doc_comment)]
+    pub output: PathBuf,
+}
+
+#[derive(Clone, PartialEq, Eq, Debug, Args)]
+pub struct ConvertArgs {
+    /// Path to the JSON report file that needs to be converted to Markdown format.
+    #[arg(short, long, verbatim_doc_comment)]
+    pub input: PathBuf,
+
+    /// Path to the Markdown file where the report results will be written.
+    #[arg(short, long, verbatim_doc_comment)]
+    pub output: PathBuf,
 }
 
 #[derive(Default, Clone, PartialEq, Eq, Debug, Args)]
diff --git a/framework/meta/src/cli/cli_standalone_main.rs b/framework/meta/src/cli/cli_standalone_main.rs
index a33bc659d2..9a8e065627 100644
--- a/framework/meta/src/cli/cli_standalone_main.rs
+++ b/framework/meta/src/cli/cli_standalone_main.rs
@@ -3,7 +3,7 @@ use crate::cmd::retrieve_address::retrieve_address;
 use clap::Parser;
 
 use crate::cmd::all::call_all_meta;
-use crate::cmd::code_report::code_report;
+use crate::cmd::code_report::report;
 use crate::cmd::info::call_info;
 use crate::cmd::install::install;
 use crate::cmd::local_deps::local_deps;
@@ -38,7 +38,7 @@ pub async fn cli_main_standalone() {
             test_coverage(args);
         },
         Some(StandaloneCliAction::CodeReportGen(args)) => {
-            code_report(args);
+            report(args);
         },
         Some(StandaloneCliAction::Account(args)) => {
             retrieve_address(args).await;
diff --git a/framework/meta/src/cmd/code_report.rs b/framework/meta/src/cmd/code_report.rs
index 8e34fd37bd..37e2617b9a 100644
--- a/framework/meta/src/cmd/code_report.rs
+++ b/framework/meta/src/cmd/code_report.rs
@@ -2,25 +2,14 @@ pub mod compare;
 pub mod generate_report;
 pub mod render_code_report;
 
-use generate_report::run_code_report;
+use generate_report::{compare_report, convert_report, create_report};
 
-use crate::cli::{CodeReportArgs, OutputFormat};
+use crate::cli::{CodeReportAction, CodeReportArgs};
 
-pub fn code_report(args: &CodeReportArgs) {
-    let path: &str = if let Some(some_path) = &args.path {
-        some_path.as_str()
-    } else {
-        "./"
-    };
-
-    run_code_report(
-        path,
-        args.output.to_str().unwrap(),
-        args.format.as_ref().unwrap_or(&OutputFormat::default()),
-        args.compare
-            .clone()
-            .into_iter()
-            .map(|path| path.to_string_lossy().into_owned())
-            .collect(),
-    );
-}
+pub fn report(args: &CodeReportArgs) {
+    match &args.command {
+        CodeReportAction::Compile(compile_args) => create_report(compile_args),
+        CodeReportAction::Compare(compare_args) => compare_report(compare_args),
+        CodeReportAction::Convert(convert_args) => convert_report(convert_args),
+    }
+}
\ No newline at end of file
diff --git a/framework/meta/src/cmd/code_report/compare.rs b/framework/meta/src/cmd/code_report/compare.rs
index 06b6ea9a4b..28c604962d 100644
--- a/framework/meta/src/cmd/code_report/compare.rs
+++ b/framework/meta/src/cmd/code_report/compare.rs
@@ -1,39 +1,3 @@
-use std::io::BufRead;
-
-use multiversx_sc_meta_lib::code_report_json::CodeReportJson;
-
-pub(crate) fn parse_into_code_report_json(
-    compared_file_reader: &mut dyn BufRead,
-) -> Vec<CodeReportJson> {
-    let lines = compared_file_reader.lines().skip(2);
-
-    let mut compared_reports: Vec<CodeReportJson> = Vec::new();
-
-    for line in lines {
-        match line {
-            Ok(l) => {
-                let columns: Vec<String> = l
-                    .split('|')
-                    .map(|s| s.trim().to_string())
-                    .filter(|s| !s.is_empty())
-                    .collect();
-
-                if columns.len() == 4 {
-                    compared_reports.push(CodeReportJson {
-                        path: columns[0].to_owned(),
-                        size: columns[1].parse::<usize>().unwrap(),
-                        has_allocator: columns[2].parse::<bool>().unwrap(),
-                        has_panic: columns[3].to_owned(),
-                    })
-                }
-            },
-            Err(_) => return compared_reports,
-        }
-    }
-
-    compared_reports
-}
-
 pub(crate) fn size_status_after_comparing(size: usize, compared_size: usize) -> String {
     match size.cmp(&compared_size) {
         std::cmp::Ordering::Greater => {
diff --git a/framework/meta/src/cmd/code_report/generate_report.rs b/framework/meta/src/cmd/code_report/generate_report.rs
index bb7baccde6..a27aed5fec 100644
--- a/framework/meta/src/cmd/code_report/generate_report.rs
+++ b/framework/meta/src/cmd/code_report/generate_report.rs
@@ -1,11 +1,13 @@
 use std::{
     fs::{read_dir, File},
     io::{BufReader, Write},
-    path::PathBuf,
-    process::Command,
+    path::{Path, PathBuf},
 };
 
-use crate::{cli::OutputFormat, folder_structure::RelevantDirectories};
+use crate::{
+    cli::{CompareArgs, CompileArgs, ConvertArgs},
+    folder_structure::RelevantDirectories,
+};
 
 use multiversx_sc_meta_lib::{
     self, code_report_json::CodeReportJson, mxsc_file_json::MxscFileJson,
@@ -13,82 +15,89 @@ use multiversx_sc_meta_lib::{
 
 use super::render_code_report::CodeReportRender;
 
-pub fn run_code_report(
-    path: &str,
-    output_path: &str,
-    output_format: &OutputFormat,
-    compare: Vec<String>,
-) {
-    let reports = if compare.is_empty() {
-        generate_new_report(path)
-    } else {
-        let file = File::open(&compare[0]).expect("file not found");
-        let reader = BufReader::new(file);
+const JSON: &str = ".json";
+const MD: &str = ".md";
 
-        serde_json::from_reader(reader).expect("Cannot deserialize")
-    };
+pub fn compare_report(compare_args: &CompareArgs) {
+    if !is_path_ends_with(&compare_args.output, MD) {
+        panic!("Compare output is available only for Markdown file extension.");
+    }
 
-    let mut compared_to = String::new();
-    if compare.len() == 2 {
-        compare[1].clone_into(&mut compared_to);
+    if !is_path_ends_with(&compare_args.baseline, JSON)
+        && !is_path_ends_with(&compare_args.new, JSON)
+    {
+        panic!("Compare baseline and new is available only for JSON file extension.");
     }
 
-    let mut file = create_file(output_path);
-
-    match output_format {
-        OutputFormat::Markdown => {
-            let mut render_code_report = CodeReportRender::new(&mut file, &compared_to, &reports);
-            render_code_report.render_report();
-        },
-        OutputFormat::Json => {
-            let json_output = serde_json::to_string(&reports).unwrap();
-            file.write_all(json_output.as_bytes()).unwrap();
-        },
+    let mut output_file = create_file(&compare_args.output);
+
+    let baseline_reports: Vec<CodeReportJson> = match File::open(&compare_args.baseline) {
+        Ok(_) => extract_reports_from_json(&compare_args.baseline),
+        Err(_) => vec![],
     };
-}
 
-fn generate_new_report(path: &str) -> Vec<CodeReportJson> {
-    let directors = RelevantDirectories::find_all(path, &["".to_owned()]);
+    let new_reports: Vec<CodeReportJson> = extract_reports_from_json(&compare_args.new);
 
-    extract_report(directors)
+    let mut render_code_report =
+        CodeReportRender::new(&mut output_file, &baseline_reports, &new_reports);
+    render_code_report.compare_reports();
 }
 
-fn extract_report(directors: RelevantDirectories) -> Vec<CodeReportJson> {
-    let mut reports: Vec<CodeReportJson> = Vec::new();
+pub fn convert_report(convert_args: &ConvertArgs) {
+    if !is_path_ends_with(&convert_args.output, MD) {
+        panic!("Conversion output is available only for Markdown file extension");
+    }
 
-    for director in directors.iter() {
-        build_contract(&director.path);
+    if !is_path_ends_with(&convert_args.input, JSON) {
+        panic!("Conversion available only from JSON file extension");
+    }
 
-        let output_path: PathBuf = director.path.join("output");
+    let mut output_file = create_file(&convert_args.output);
 
-        extract_reports(&output_path, &mut reports);
+    let reports: Vec<CodeReportJson> = extract_reports_from_json(&convert_args.input);
 
-        sanitize_output_path_from_report(&mut reports);
+    let mut convert_code_report = CodeReportRender::new_without_compare(&mut output_file, &reports);
 
-        clean_contract(&director.path);
+    convert_code_report.render_report();
+}
+
+pub fn create_report(compile_args: &CompileArgs) {
+    if !is_path_ends_with(&compile_args.output, JSON)
+        && !is_path_ends_with(&compile_args.output, MD)
+    {
+        panic!("Create report is available only for Markdown or JSON output file.")
     }
 
-    reports
+    let reports = generate_new_report(&compile_args.path);
+
+    let mut file = create_file(&compile_args.output);
+
+    if is_path_ends_with(&compile_args.output, MD) {
+        let mut render_code_report = CodeReportRender::new_without_compare(&mut file, &reports);
+        render_code_report.render_report();
+    } else {
+        let json_output = serde_json::to_string(&reports).unwrap();
+        file.write_all(json_output.as_bytes()).unwrap();
+    }
 }
 
-fn build_contract(path: &PathBuf) {
-    Command::new("sc-meta")
-        .arg("all")
-        .arg("build")
-        .arg("--path")
-        .arg(path)
-        .output()
-        .unwrap_or_else(|_| panic!("Failed to build the contract for path: {}", path.display()));
+fn generate_new_report(path: &PathBuf) -> Vec<CodeReportJson> {
+    let directors = RelevantDirectories::find_all(path, &["".to_owned()]);
+
+    assemble_report_vec(directors)
 }
 
-fn clean_contract(path: &PathBuf) {
-    Command::new("sc-meta")
-        .arg("all")
-        .arg("clean")
-        .arg("--path")
-        .arg(path)
-        .output()
-        .unwrap_or_else(|_| panic!("Failed to clean the contract for path: {}", path.display()));
+fn assemble_report_vec(directors: RelevantDirectories) -> Vec<CodeReportJson> {
+    let mut reports: Vec<CodeReportJson> = Vec::new();
+
+    for director in directors.iter() {
+        let output_path: PathBuf = director.path.join("output");
+
+        collect_reports(&output_path, &mut reports);
+        sanitize_output_path_from_report(&mut reports);
+    }
+
+    reports
 }
 
 fn find_mxsc_files(path: &PathBuf) -> Vec<PathBuf> {
@@ -107,16 +116,18 @@ fn find_mxsc_files(path: &PathBuf) -> Vec<PathBuf> {
     mxsc_files
 }
 
-fn extract_reports(path: &PathBuf, reports: &mut Vec<CodeReportJson>) {
+fn collect_reports(path: &PathBuf, reports: &mut Vec<CodeReportJson>) {
     for mxsc_path in find_mxsc_files(path) {
-        let mxsc_file =
-            File::open(mxsc_path).unwrap_or_else(|_| panic!("Failed to open mxsc file"));
+        let mxsc_file = match File::open(mxsc_path) {
+            Ok(file) => file,
+            Err(_) => continue,
+        };
         let data: MxscFileJson = serde_json::from_reader(mxsc_file).unwrap();
         reports.push(data.report.code_report);
     }
 }
 
-fn create_file(file_path: &str) -> File {
+fn create_file(file_path: &PathBuf) -> File {
     File::create(file_path).expect("could not write report file")
 }
 
@@ -130,3 +141,18 @@ fn sanitize_output_path_from_report(reports: &mut [CodeReportJson]) {
             .to_string();
     })
 }
+
+fn is_path_ends_with(path: &Path, extension: &str) -> bool {
+    path.to_path_buf()
+        .into_os_string()
+        .into_string()
+        .unwrap()
+        .ends_with(extension)
+}
+
+fn extract_reports_from_json(path: &PathBuf) -> Vec<CodeReportJson> {
+    let file = File::open(path).expect("file not found");
+    let reader = BufReader::new(file);
+
+    serde_json::from_reader(reader).expect("Cannot deserialize")
+}
diff --git a/framework/meta/src/cmd/code_report/render_code_report.rs b/framework/meta/src/cmd/code_report/render_code_report.rs
index 54b0a5d9c9..528374828c 100644
--- a/framework/meta/src/cmd/code_report/render_code_report.rs
+++ b/framework/meta/src/cmd/code_report/render_code_report.rs
@@ -1,28 +1,37 @@
-use core::panic;
-use std::{fmt::Display, fs::File, io::BufReader};
+use std::fmt::Display;
 
 pub struct CodeReportRender<'a> {
     pub file: Option<&'a mut dyn std::io::Write>,
-    pub compared_path_file: &'a str,
+    pub compared_reports: &'a [CodeReportJson],
     pub reports: &'a [CodeReportJson],
 }
 
 use multiversx_sc_meta_lib::code_report_json::CodeReportJson;
 
 use super::compare::{
-    allocator_status_after_comparing, panic_status_after_comparing, parse_into_code_report_json,
-    size_status_after_comparing,
+    allocator_status_after_comparing, panic_status_after_comparing, size_status_after_comparing,
 };
 
 impl<'a> CodeReportRender<'a> {
     pub fn new(
         file: &'a mut dyn std::io::Write,
-        compared_path_file: &'a str,
+        compared_reports: &'a [CodeReportJson],
         reports: &'a [CodeReportJson],
     ) -> Self {
         Self {
             file: Some(file),
-            compared_path_file,
+            compared_reports,
+            reports,
+        }
+    }
+
+    pub fn new_without_compare(
+        file: &'a mut dyn std::io::Write,
+        reports: &'a [CodeReportJson],
+    ) -> Self {
+        Self {
+            file: Some(file),
+            compared_reports: &[],
             reports,
         }
     }
@@ -30,10 +39,17 @@ impl<'a> CodeReportRender<'a> {
     pub fn render_report(&mut self) {
         self.render_header();
 
-        if self.compared_path_file.is_empty() {
+        self.render_reports();
+    }
+
+    pub fn compare_reports(&mut self) {
+        self.render_header();
+
+        if self.compared_reports.is_empty() {
             self.render_reports();
+            self.writeln("\n:warning: Could not compare the 2 versions because the baseline file was not found. :warning:");
         } else {
-            self.render_reports_and_compare();
+            self.render_report_and_compare();
         }
     }
 
@@ -75,29 +91,12 @@ impl<'a> CodeReportRender<'a> {
         }
     }
 
-    fn render_reports_and_compare(&mut self) {
-        let compared_file = File::open(self.compared_path_file).unwrap_or_else(|_| {
-            panic!(
-                "Failed to open compared file at path: {}",
-                self.compared_path_file
-            )
-        });
-        let mut compared_file_reader = BufReader::new(compared_file);
-
-        let compared_reports = if self.compared_path_file.ends_with("md") {
-            // TODO this is only one time compared. Decide whether to exist or not
-            parse_into_code_report_json(&mut compared_file_reader)
-        } else {
-            serde_json::from_reader(compared_file_reader).unwrap_or_else(|_| {
-                self.render_reports();
-                self.writeln("\n:warning: Could not compare the 2 versions because the deserialization process into the code report structure failed. :warning:");
-                
-                Vec::new()
-            })
-        };
-
+    fn render_report_and_compare(&mut self) {
         for report in self.reports.iter() {
-            if let Some(compared_report) = compared_reports.iter().find(|cr| cr.path == report.path)
+            if let Some(compared_report) = self
+                .compared_reports
+                .iter()
+                .find(|cr| cr.path == report.path)
             {
                 self.print_compared_output(report, compared_report);
             }
diff --git a/reported.md b/reported.md
deleted file mode 100644
index f397b5b8e2..0000000000
--- a/reported.md
+++ /dev/null
@@ -1,96 +0,0 @@
-| Path                                                         |                                     size |                  has-allocator |                     has-format |
-| :-- | --: | --: | --: |
-| token-release.wasm | 7776 | false | without message |
-| adder.wasm | 696 | false | none |
-| order-book-pair.wasm | 13786 | false | without message |
-| order-book-factory.wasm | 3771 | false | without message |
-| nft-storage-prepay.wasm | 2295 | false | none |
-| multisig.wasm | 14145 | false | without message |
-| multisig-full.wasm | 15672 | false | without message |
-| multisig-view.wasm | 6248 | false | without message |
-| bonding-curve-contract.wasm | 14735 | false | without message |
-| seed-nft-minter.wasm | 15118 | false | without message |
-| rewards-distribution.wasm | 10220 | false | without message |
-| crypto-bubbles.wasm | 2347 | false | none |
-| kitty-auction.wasm | 10065 | false | without message |
-| kitty-genetic-alg.wasm | 3147 | false | without message |
-| kitty-ownership.wasm | 12731 | false | without message |
-| nft-subscription.wasm | 8793 | false | without message |
-| proxy-pause.wasm | 4627 | false | without message |
-| lottery-esdt.wasm | 10989 | false | without message |
-| esdt-transfer-with-fee.wasm | 7779 | false | without message |
-| check-pause.wasm | 1228 | false | none |
-| factorial.wasm | 576 | false | none |
-| digital-cash.wasm | 10047 | false | without message |
-| crypto-zombies.wasm | 10304 | false | without message |
-| nft-minter.wasm | 10028 | false | without message |
-| empty.wasm | 241 | false | none |
-| fractional-nfts.wasm | 8447 | false | without message |
-| crowdfunding-esdt.wasm | 3988 | false | none |
-| ping-pong-egld.wasm | 6032 | false | without message |
-| send-tx-repeat.wasm | 901 | false | none |
-| large-storage.wasm | 2164 | false | without message |
-| map-repeat.wasm | 7234 | false | without message |
-| queue-repeat.wasm | 5853 | false | without message |
-| set-repeat.wasm | 7013 | false | without message |
-| single-value-repeat.wasm | 4440 | false | without message |
-| linked-list-repeat.wasm | 6681 | true | without message |
-| vec-repeat.wasm | 5231 | false | without message |
-| str-repeat.wasm | 2389 | false | without message |
-| str-repeat-mb-builder-cached.wasm | 1139 | false | without message |
-| str-repeat-mb-builder-basic.wasm | 759 | false | none |
-| big-float-features.wasm | 6468 | false | without message |
-| erc20.wasm | 2133 | false | none |
-| erc721.wasm | 2578 | false | none |
-| lottery-erc20.wasm | 12814 | false | without message |
-| erc1155-marketplace.wasm | 11172 | false | without message |
-| crowdfunding-erc20.wasm | 5331 | false | without message |
-| erc1155-user-mock.wasm | 1360 | false | without message |
-| erc1155.wasm | 12197 | false | without message |
-| scenario-tester.wasm | 1114 | false | none |
-| managed-map-features.wasm | 1315 | false | none |
-| use-module-view.wasm | 733 | false | none |
-| use-module.wasm | 33452 | false | without message |
-| rust-snippets-generator-test.wasm | 4979 | false | without message |
-| basic-features.wasm | 65181 | false | without message |
-| basic-features-storage-bytes.wasm | 538 | false | none |
-| payable-features.wasm | 4396 | false | without message |
-| promises-features.wasm | 12926 | false | without message |
-| vault-promises.wasm | 8523 | false | without message |
-| vault-upgrade.wasm | 700 | false | none |
-| vault.wasm | 7826 | false | without message |
-| first-contract.wasm | 3086 | false | without message |
-| second-contract.wasm | 1355 | false | none |
-| forwarder-legacy.wasm | 32330 | false | without message |
-| proxy-test-second.wasm | 2105 | false | without message |
-| recursive-caller.wasm | 5466 | false | without message |
-| forwarder-queue-promises.wasm | 13096 | false | without message |
-| forwarder-queue.wasm | 12181 | false | without message |
-| forwarder.wasm | 32687 | false | without message |
-| builtin-func-features.wasm | 1101 | false | none |
-| local-esdt-and-nft.wasm | 12071 | false | without message |
-| forwarder-raw.wasm | 15309 | false | without message |
-| forwarder-raw-init-sync-call.wasm | 3332 | false | none |
-| forwarder-raw-init-async-call.wasm | 3062 | false | none |
-| parent.wasm | 1678 | false | none |
-| child.wasm | 4057 | false | without message |
-| transfer-role-features.wasm | 8775 | false | without message |
-| proxy-test-first.wasm | 6031 | false | without message |
-| exchange-features.wasm | 1577 | false | none |
-| alloc-features.wasm | 16748 | false | without message |
-| alloc-mem-leaking.wasm | 16857 | false | without message |
-| alloc-mem-fail.wasm | 16682 | true | without message |
-| abi-tester.wasm | 7182 | true | without message |
-| abi-tester-ev.wasm | 757 | false | none |
-| panic-message-features.wasm | 12875 | false | with message |
-| formatted-message-features.wasm | 3470 | false | without message |
-| multi-contract-features.wasm | 678 | false | none |
-| multi-contract-alt-impl.wasm | 360 | false | none |
-| multi-contract-example-feature.wasm | 677 | false | none |
-| multi-contract-features-view.wasm | 1115 | false | none |
-| rust-testing-framework-tester.wasm | 8602 | false | without message |
-| esdt-system-sc-mock.wasm | 3799 | false | none |
-| multiversx-wegld-swap-sc.wasm | 3557 | false | without message |
-| multiversx-price-aggregator-sc.wasm | 19327 | false | without message |
-
-:warning: Could not compare the 2 versions because the deserialization process into the code report structure failed. :warning:

From 34c54af416a10be04080ded80a6491a225d3c604 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Fri, 9 Aug 2024 15:29:23 +0300
Subject: [PATCH 1152/1254] cli code report - change err message when baseline
 file not found

---
 .github/workflows/actions.yml                            | 2 +-
 framework/meta/src/cmd/code_report/render_code_report.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
index 159dcd514b..a730a1fb15 100644
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -14,7 +14,7 @@ permissions:
 jobs:
   contracts:
     name: Contracts
-    uses: multiversx/mx-sc-actions/.github/workflows/contracts.yml@c50a21fcb5a9d85f01990402db58979085d920b1
+    uses: multiversx/mx-sc-actions/.github/workflows/contracts.yml@8b4ea39b4291e43e221aa6d980f6e97b34c8e1e8
     with:
       rust-toolchain: stable
       path-to-sc-meta: framework/meta
diff --git a/framework/meta/src/cmd/code_report/render_code_report.rs b/framework/meta/src/cmd/code_report/render_code_report.rs
index 528374828c..e6edcfae8e 100644
--- a/framework/meta/src/cmd/code_report/render_code_report.rs
+++ b/framework/meta/src/cmd/code_report/render_code_report.rs
@@ -47,7 +47,7 @@ impl<'a> CodeReportRender<'a> {
 
         if self.compared_reports.is_empty() {
             self.render_reports();
-            self.writeln("\n:warning: Could not compare the 2 versions because the baseline file was not found. :warning:");
+            self.writeln("\n:warning: Could not download the report for the base branch. Displaying only the report for the current branch. :warning:");
         } else {
             self.render_report_and_compare();
         }

From c4631d852dbd9d72d41cb1893a4e1ff805b7d83e Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Fri, 9 Aug 2024 16:38:17 +0300
Subject: [PATCH 1153/1254] cli code report - add extra info to err

---
 framework/meta/src/cmd/code_report.rs                 | 2 +-
 framework/meta/src/cmd/code_report/generate_report.rs | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/framework/meta/src/cmd/code_report.rs b/framework/meta/src/cmd/code_report.rs
index 37e2617b9a..47e51948f0 100644
--- a/framework/meta/src/cmd/code_report.rs
+++ b/framework/meta/src/cmd/code_report.rs
@@ -12,4 +12,4 @@ pub fn report(args: &CodeReportArgs) {
         CodeReportAction::Compare(compare_args) => compare_report(compare_args),
         CodeReportAction::Convert(convert_args) => convert_report(convert_args),
     }
-}
\ No newline at end of file
+}
diff --git a/framework/meta/src/cmd/code_report/generate_report.rs b/framework/meta/src/cmd/code_report/generate_report.rs
index a27aed5fec..e03d5cbdb6 100644
--- a/framework/meta/src/cmd/code_report/generate_report.rs
+++ b/framework/meta/src/cmd/code_report/generate_report.rs
@@ -151,7 +151,8 @@ fn is_path_ends_with(path: &Path, extension: &str) -> bool {
 }
 
 fn extract_reports_from_json(path: &PathBuf) -> Vec<CodeReportJson> {
-    let file = File::open(path).expect("file not found");
+    let file =
+        File::open(path).unwrap_or_else(|_| panic!("file with path {} not found", path.display()));
     let reader = BufReader::new(file);
 
     serde_json::from_reader(reader).expect("Cannot deserialize")

From 723517d5761901cdcf58bf12e4887a9a843aa0c1 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Fri, 9 Aug 2024 17:13:08 +0300
Subject: [PATCH 1154/1254] cli code report - fix vector parsing err

---
 framework/meta/src/cmd/code_report/generate_report.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/framework/meta/src/cmd/code_report/generate_report.rs b/framework/meta/src/cmd/code_report/generate_report.rs
index e03d5cbdb6..b9c06b17ce 100644
--- a/framework/meta/src/cmd/code_report/generate_report.rs
+++ b/framework/meta/src/cmd/code_report/generate_report.rs
@@ -155,5 +155,5 @@ fn extract_reports_from_json(path: &PathBuf) -> Vec<CodeReportJson> {
         File::open(path).unwrap_or_else(|_| panic!("file with path {} not found", path.display()));
     let reader = BufReader::new(file);
 
-    serde_json::from_reader(reader).expect("Cannot deserialize")
+    serde_json::from_reader(reader).unwrap_or_else(|_| vec![])
 }

From b98c1f712b13678d69e9804ad4a4817b53356375 Mon Sep 17 00:00:00 2001
From: Andrei Vasilescu <vasilescuandrei24@gmail.com>
Date: Mon, 12 Aug 2024 15:50:43 +0300
Subject: [PATCH 1155/1254] pem wallet generation

---
 Cargo.lock                                    |  1 +
 framework/meta/Cargo.toml                     |  4 ++
 framework/meta/src/cli/cli_args_standalone.rs | 58 +++++++++++++++++++
 framework/meta/src/cli/cli_standalone_main.rs |  4 ++
 framework/meta/src/cmd.rs                     |  1 +
 framework/meta/src/cmd/wallet.rs              | 53 +++++++++++++++++
 6 files changed, 121 insertions(+)
 create mode 100644 framework/meta/src/cmd/wallet.rs

diff --git a/Cargo.lock b/Cargo.lock
index abeb3c37e1..4ae509e714 100755
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1996,6 +1996,7 @@ dependencies = [
  "multiversx-sc",
  "multiversx-sc-meta-lib",
  "multiversx-sc-snippets",
+ "multiversx-sdk",
  "pathdiff",
  "reqwest",
  "ruplacer",
diff --git a/framework/meta/Cargo.toml b/framework/meta/Cargo.toml
index bd6775ed1a..0aebe72194 100644
--- a/framework/meta/Cargo.toml
+++ b/framework/meta/Cargo.toml
@@ -52,3 +52,7 @@ features = ["alloc", "num-bigint"]
 [dependencies.multiversx-sc-snippets]
 version = "=0.52.3"
 path = "../snippets"
+
+[dependencies.multiversx-sdk]
+version = "=0.5.0"
+path = "../../sdk/core"
diff --git a/framework/meta/src/cli/cli_args_standalone.rs b/framework/meta/src/cli/cli_args_standalone.rs
index 335afe41ea..38857c6f9e 100644
--- a/framework/meta/src/cli/cli_args_standalone.rs
+++ b/framework/meta/src/cli/cli_args_standalone.rs
@@ -75,6 +75,12 @@ pub enum StandaloneCliAction {
         about = "Generates a report on the local depedencies of contract crates. Will explore indirect depdencies too."
     )]
     LocalDeps(LocalDepsArgs),
+
+    #[command(
+        name = "wallet",
+        about = "Generates a new wallet or performs actions on an existing wallet."
+    )]
+    Wallet(WalletArgs),
 }
 
 #[derive(Default, Clone, PartialEq, Eq, Debug, Args)]
@@ -348,3 +354,55 @@ pub struct AccountArgs {
     #[arg(long = "address", verbatim_doc_comment)]
     pub address: String,
 }
+
+#[derive(Clone, PartialEq, Eq, Debug, Subcommand)]
+pub enum WalletAction {
+    #[command(name = "new", about = "Creates a new wallet")]
+    New(WalletNewArgs),
+
+    #[command(name = "convert", about = "Converts a wallet")]
+    Convert(WalletConvertArgs),
+}
+
+#[derive(Default, Clone, PartialEq, Eq, Debug, ValueEnum)]
+pub enum WalletFormat {
+    #[default]
+    Pem,
+}
+
+#[derive(Default, Clone, PartialEq, Eq, Debug, ValueEnum)]
+pub enum WalletConvertFormat {
+    #[default]
+    Bech32,
+
+    Hex,
+}
+
+#[derive(Default, Clone, PartialEq, Eq, Debug, Parser)]
+#[command(propagate_version = true)]
+pub struct WalletArgs {
+    #[command(subcommand)]
+    pub command: Option<WalletAction>,
+}
+
+#[derive(Default, Clone, PartialEq, Eq, Debug, Args)]
+pub struct WalletNewArgs {
+    /// The type of wallet to create.
+    #[arg(long = "format", verbatim_doc_comment)]
+    pub wallet_format: Option<WalletFormat>,
+
+    /// The name of the wallet to create.
+    #[arg(long = "outfile", verbatim_doc_comment)]
+    pub outfile: Option<String>,
+    // #[arg(long = "address-hrp")]
+    // pub address_hrp: Option<String>,
+}
+
+#[derive(Default, Clone, PartialEq, Eq, Debug, Args)]
+pub struct WalletConvertArgs {
+    #[arg(long = "from", verbatim_doc_comment)]
+    pub from: Option<WalletConvertFormat>,
+
+    #[arg(long = "to", verbatim_doc_comment)]
+    pub to: Option<WalletConvertFormat>,
+}
diff --git a/framework/meta/src/cli/cli_standalone_main.rs b/framework/meta/src/cli/cli_standalone_main.rs
index 6c8c6a67b0..5100750abc 100644
--- a/framework/meta/src/cli/cli_standalone_main.rs
+++ b/framework/meta/src/cli/cli_standalone_main.rs
@@ -1,5 +1,6 @@
 use crate::cli::{StandaloneCliAction, StandaloneCliArgs};
 use crate::cmd::retrieve_address::retrieve_address;
+use crate::cmd::wallet::wallet;
 use clap::Parser;
 
 use crate::cmd::all::call_all_meta;
@@ -41,6 +42,9 @@ pub async fn cli_main_standalone() {
         Some(StandaloneCliAction::LocalDeps(args)) => {
             local_deps(args);
         },
+        Some(StandaloneCliAction::Wallet(args)) => {
+            wallet(args);
+        },
         None => {},
     }
 }
diff --git a/framework/meta/src/cmd.rs b/framework/meta/src/cmd.rs
index a588f90162..8053a2113e 100644
--- a/framework/meta/src/cmd.rs
+++ b/framework/meta/src/cmd.rs
@@ -9,3 +9,4 @@ pub mod template;
 pub mod test;
 pub mod test_coverage;
 pub mod upgrade;
+pub mod wallet;
diff --git a/framework/meta/src/cmd/wallet.rs b/framework/meta/src/cmd/wallet.rs
new file mode 100644
index 0000000000..4ad0a3f7d9
--- /dev/null
+++ b/framework/meta/src/cmd/wallet.rs
@@ -0,0 +1,53 @@
+use std::{fs::File, io::Write};
+
+use crate::cli::{WalletAction, WalletArgs, WalletConvertArgs, WalletFormat, WalletNewArgs};
+use multiversx_sdk::{data::address::Address, wallet::Wallet};
+
+pub fn wallet(args: &WalletArgs) {
+    let command = args
+        .command
+        .as_ref()
+        .expect("command expected after `wallet`");
+    match command {
+        WalletAction::New(new_args) => new(new_args),
+        WalletAction::Convert(convert_args) => convert(convert_args),
+    }
+}
+
+fn convert(convert_args: &WalletConvertArgs) {
+    todo!()
+}
+
+fn new(new_args: &WalletNewArgs) {
+    let format = new_args
+        .wallet_format
+        .as_ref()
+        .expect("wallet format is required");
+    let outfile = new_args.outfile.as_ref().expect("output file is required");
+
+    match format {
+        WalletFormat::Pem => {
+            let mnemonic = Wallet::generate_mnemonic();
+            let private_key = Wallet::get_private_key_from_mnemonic(mnemonic, 0u32, 0u32);
+            let pk_str: &str = &private_key.to_string();
+            let wallet = Wallet::from_private_key(pk_str).unwrap();
+            let address = wallet.address();
+
+            println!("Wallet address: {}", address);
+
+            generate_pem(&address, pk_str, outfile);
+        },
+    }
+}
+
+fn generate_pem(address: &Address, private_key: &str, outfile: &String) {
+    let pem_content = format!(
+        "-----BEGIN PRIVATE KEY for {}-----\n{}\n-----END PRIVATE KEY for {}-----",
+        address.to_bech32_string().unwrap(),
+        private_key,
+        address.to_bech32_string().unwrap()
+    );
+
+    let mut file = File::create(outfile).unwrap();
+    file.write_all(pem_content.as_bytes()).unwrap()
+}

From b530c1f6a712538be16e01c47a541e1c6cafd74d Mon Sep 17 00:00:00 2001
From: Andrei Vasilescu <vasilescuandrei24@gmail.com>
Date: Mon, 12 Aug 2024 18:52:33 +0300
Subject: [PATCH 1156/1254] [WIP] generated pem file

---
 Cargo.lock                                    | 19 +++--
 framework/meta/Cargo.toml                     |  1 +
 framework/meta/src/cli/cli_args_standalone.rs | 32 +++-----
 framework/meta/src/cmd/wallet.rs              | 77 +++++++++++++++++--
 4 files changed, 95 insertions(+), 34 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 4ae509e714..08f2acc6ae 100755
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -195,6 +195,12 @@ dependencies = [
  "rustc-demangle",
 ]
 
+[[package]]
+name = "base64"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
+
 [[package]]
 name = "base64"
 version = "0.22.1"
@@ -1988,6 +1994,7 @@ dependencies = [
 name = "multiversx-sc-meta"
 version = "0.52.3"
 dependencies = [
+ "base64 0.13.1",
  "clap",
  "colored",
  "common-path",
@@ -2038,7 +2045,7 @@ dependencies = [
 name = "multiversx-sc-scenario"
 version = "0.52.3"
 dependencies = [
- "base64",
+ "base64 0.22.1",
  "bech32",
  "colored",
  "hex",
@@ -2062,7 +2069,7 @@ dependencies = [
 name = "multiversx-sc-snippets"
 version = "0.52.3"
 dependencies = [
- "base64",
+ "base64 0.22.1",
  "env_logger",
  "futures",
  "hex",
@@ -2086,7 +2093,7 @@ name = "multiversx-sdk"
 version = "0.5.0"
 dependencies = [
  "anyhow",
- "base64",
+ "base64 0.22.1",
  "bech32",
  "bip39",
  "hex",
@@ -2424,7 +2431,7 @@ version = "3.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8e459365e590736a54c3fa561947c84837534b8e9af6fc5bf781307e82658fae"
 dependencies = [
- "base64",
+ "base64 0.22.1",
  "serde",
 ]
 
@@ -2756,7 +2763,7 @@ version = "0.12.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c7d6d2a27d57148378eb5e111173f4276ad26340ecc5c49a4a2152167a2d6a37"
 dependencies = [
- "base64",
+ "base64 0.22.1",
  "bytes",
  "encoding_rs",
  "futures-channel",
@@ -2926,7 +2933,7 @@ version = "2.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d"
 dependencies = [
- "base64",
+ "base64 0.22.1",
  "rustls-pki-types",
 ]
 
diff --git a/framework/meta/Cargo.toml b/framework/meta/Cargo.toml
index 0aebe72194..c59184d411 100644
--- a/framework/meta/Cargo.toml
+++ b/framework/meta/Cargo.toml
@@ -39,6 +39,7 @@ zip = { version = "2.1", features = ["deflate"], default-features = false }
 copy_dir =  "0.1.2" 
 pathdiff = "0.2.1" 
 common-path = "1.0.0" 
+base64 = "0.13"
 
 [dependencies.multiversx-sc-meta-lib]
 version = "=0.52.3"
diff --git a/framework/meta/src/cli/cli_args_standalone.rs b/framework/meta/src/cli/cli_args_standalone.rs
index 38857c6f9e..d670987338 100644
--- a/framework/meta/src/cli/cli_args_standalone.rs
+++ b/framework/meta/src/cli/cli_args_standalone.rs
@@ -364,20 +364,6 @@ pub enum WalletAction {
     Convert(WalletConvertArgs),
 }
 
-#[derive(Default, Clone, PartialEq, Eq, Debug, ValueEnum)]
-pub enum WalletFormat {
-    #[default]
-    Pem,
-}
-
-#[derive(Default, Clone, PartialEq, Eq, Debug, ValueEnum)]
-pub enum WalletConvertFormat {
-    #[default]
-    Bech32,
-
-    Hex,
-}
-
 #[derive(Default, Clone, PartialEq, Eq, Debug, Parser)]
 #[command(propagate_version = true)]
 pub struct WalletArgs {
@@ -389,20 +375,24 @@ pub struct WalletArgs {
 pub struct WalletNewArgs {
     /// The type of wallet to create.
     #[arg(long = "format", verbatim_doc_comment)]
-    pub wallet_format: Option<WalletFormat>,
+    pub wallet_format: Option<String>,
 
     /// The name of the wallet to create.
     #[arg(long = "outfile", verbatim_doc_comment)]
     pub outfile: Option<String>,
-    // #[arg(long = "address-hrp")]
-    // pub address_hrp: Option<String>,
 }
 
 #[derive(Default, Clone, PartialEq, Eq, Debug, Args)]
 pub struct WalletConvertArgs {
-    #[arg(long = "from", verbatim_doc_comment)]
-    pub from: Option<WalletConvertFormat>,
+    #[arg(long = "in-format", verbatim_doc_comment)]
+    pub from: Option<String>,
 
-    #[arg(long = "to", verbatim_doc_comment)]
-    pub to: Option<WalletConvertFormat>,
+    #[arg(long = "out-format", verbatim_doc_comment)]
+    pub to: Option<String>,
+
+    #[arg(long = "infile", verbatim_doc_comment)]
+    pub infile: Option<String>,
+
+    #[arg(long = "outfile", verbatim_doc_comment)]
+    pub outfile: Option<String>,
 }
diff --git a/framework/meta/src/cmd/wallet.rs b/framework/meta/src/cmd/wallet.rs
index 4ad0a3f7d9..b1fdddee9c 100644
--- a/framework/meta/src/cmd/wallet.rs
+++ b/framework/meta/src/cmd/wallet.rs
@@ -1,6 +1,12 @@
-use std::{fs::File, io::Write};
+use base64;
+use core::str;
+use std::{
+    fs::{self, File},
+    io::Write,
+};
 
-use crate::cli::{WalletAction, WalletArgs, WalletConvertArgs, WalletFormat, WalletNewArgs};
+use crate::cli::{WalletAction, WalletArgs, WalletConvertArgs, WalletNewArgs};
+use multiversx_sc_snippets::{hex, imports::Bech32Address};
 use multiversx_sdk::{data::address::Address, wallet::Wallet};
 
 pub fn wallet(args: &WalletArgs) {
@@ -15,7 +21,46 @@ pub fn wallet(args: &WalletArgs) {
 }
 
 fn convert(convert_args: &WalletConvertArgs) {
-    todo!()
+    let infile = convert_args
+        .infile
+        .as_ref()
+        .expect("input file is required");
+    let outfile = convert_args.outfile.as_ref();
+    let in_format = convert_args
+        .from
+        .as_ref()
+        .expect("input format is required");
+    let out_format = convert_args.to.as_ref().expect("output format is required");
+
+    let in_address = fs::read_to_string(infile).unwrap();
+    let mut out_addr: String = String::from("");
+
+    match (in_format.as_str(), out_format.as_str()) {
+        ("address-bech32", "address-hex") => {
+            out_addr = Bech32Address::from_bech32_string(in_address).to_hex();
+        },
+        ("address-hex", "address-bech32") => {
+            // out_addr = Bech32Address::from(in_address).to_bech32_string();
+            let bytes_from_hex: [u8; 64] = hex::decode(in_address).unwrap().try_into().unwrap();
+            out_addr = Bech32Address::from_bech32_string(
+                str::from_utf8(&bytes_from_hex).unwrap().to_string(),
+            )
+            .to_bech32_string();
+        },
+        _ => {
+            println!("Unsupported conversion");
+        },
+    }
+
+    match outfile {
+        Some(outfile) => {
+            let mut file = File::create(outfile).unwrap();
+            file.write_all(out_addr.as_bytes()).unwrap();
+        },
+        None => {
+            println!("{}", out_addr);
+        },
+    }
 }
 
 fn new(new_args: &WalletNewArgs) {
@@ -25,8 +70,8 @@ fn new(new_args: &WalletNewArgs) {
         .expect("wallet format is required");
     let outfile = new_args.outfile.as_ref().expect("output file is required");
 
-    match format {
-        WalletFormat::Pem => {
+    match format.as_str() {
+        "pem" => {
             let mnemonic = Wallet::generate_mnemonic();
             let private_key = Wallet::get_private_key_from_mnemonic(mnemonic, 0u32, 0u32);
             let pk_str: &str = &private_key.to_string();
@@ -37,14 +82,32 @@ fn new(new_args: &WalletNewArgs) {
 
             generate_pem(&address, pk_str, outfile);
         },
+        _ => {
+            println!("Unsupported wallet format");
+        },
     }
 }
 
 fn generate_pem(address: &Address, private_key: &str, outfile: &String) {
+    println!("{private_key}");
+    let private_key_hex_encoded = hex::encode(private_key.as_bytes());
+    println!("HEX {private_key_hex_encoded}");
+    // let priv_key_bytes = private_key_hex_encoded.as_bytes();
+    let private_key_base64 = base64::encode(&private_key_hex_encoded.as_bytes());
+    println!("B64 {private_key_base64}");
+
+    // Split the base64 string into 64-character lines
+    let formatted_key = private_key_base64
+        .as_bytes()
+        .chunks(64)
+        .map(|chunk| std::str::from_utf8(chunk).unwrap())
+        .collect::<Vec<&str>>()
+        .join("\n");
+
     let pem_content = format!(
-        "-----BEGIN PRIVATE KEY for {}-----\n{}\n-----END PRIVATE KEY for {}-----",
+        "-----BEGIN PRIVATE KEY for {}-----\n{}\n-----END PRIVATE KEY for {}-----\n",
         address.to_bech32_string().unwrap(),
-        private_key,
+        formatted_key,
         address.to_bech32_string().unwrap()
     );
 

From 8582152ca7bb718021dc6f387b5e17e12c0f6f6a Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Mon, 12 Aug 2024 19:01:01 +0300
Subject: [PATCH 1157/1254] cli code report - fix typo

---
 framework/meta/src/cli/cli_args_standalone.rs         |  2 +-
 framework/meta/src/cmd/code_report/generate_report.rs | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/framework/meta/src/cli/cli_args_standalone.rs b/framework/meta/src/cli/cli_args_standalone.rs
index b569c5fd32..0be68d805f 100644
--- a/framework/meta/src/cli/cli_args_standalone.rs
+++ b/framework/meta/src/cli/cli_args_standalone.rs
@@ -153,7 +153,7 @@ pub enum CodeReportAction {
     #[command(name = "compile", about = "Generates the contract report.")]
     Compile(CompileArgs),
 
-    #[command(name = "compare", about = "Compare two contract report.")]
+    #[command(name = "compare", about = "Compare two contract reports.")]
     Compare(CompareArgs),
 
     #[command(
diff --git a/framework/meta/src/cmd/code_report/generate_report.rs b/framework/meta/src/cmd/code_report/generate_report.rs
index b9c06b17ce..5c06b65295 100644
--- a/framework/meta/src/cmd/code_report/generate_report.rs
+++ b/framework/meta/src/cmd/code_report/generate_report.rs
@@ -20,13 +20,13 @@ const MD: &str = ".md";
 
 pub fn compare_report(compare_args: &CompareArgs) {
     if !is_path_ends_with(&compare_args.output, MD) {
-        panic!("Compare output is available only for Markdown file extension.");
+        panic!("Compare output is only available for Markdown file extension.");
     }
 
     if !is_path_ends_with(&compare_args.baseline, JSON)
         && !is_path_ends_with(&compare_args.new, JSON)
     {
-        panic!("Compare baseline and new is available only for JSON file extension.");
+        panic!("Compare baseline and new are only available for JSON file extension.");
     }
 
     let mut output_file = create_file(&compare_args.output);
@@ -45,11 +45,11 @@ pub fn compare_report(compare_args: &CompareArgs) {
 
 pub fn convert_report(convert_args: &ConvertArgs) {
     if !is_path_ends_with(&convert_args.output, MD) {
-        panic!("Conversion output is available only for Markdown file extension");
+        panic!("Conversion output is only available for Markdown file extension");
     }
 
     if !is_path_ends_with(&convert_args.input, JSON) {
-        panic!("Conversion available only from JSON file extension");
+        panic!("Conversion only available from JSON file extension");
     }
 
     let mut output_file = create_file(&convert_args.output);
@@ -65,7 +65,7 @@ pub fn create_report(compile_args: &CompileArgs) {
     if !is_path_ends_with(&compile_args.output, JSON)
         && !is_path_ends_with(&compile_args.output, MD)
     {
-        panic!("Create report is available only for Markdown or JSON output file.")
+        panic!("Create report is only available for Markdown or JSON output file.")
     }
 
     let reports = generate_new_report(&compile_args.path);

From d5be23d47cd28e9aae627899dc80d85302d2e5c6 Mon Sep 17 00:00:00 2001
From: Andrei Vasilescu <vasilescuandrei24@gmail.com>
Date: Tue, 13 Aug 2024 13:09:31 +0300
Subject: [PATCH 1158/1254] demo wallet creation & conversion

---
 framework/meta/src/cli/cli_args_standalone.rs |   4 +-
 framework/meta/src/cmd/wallet.rs              | 105 ++++++++++--------
 2 files changed, 59 insertions(+), 50 deletions(-)

diff --git a/framework/meta/src/cli/cli_args_standalone.rs b/framework/meta/src/cli/cli_args_standalone.rs
index d670987338..59cb0a4d86 100644
--- a/framework/meta/src/cli/cli_args_standalone.rs
+++ b/framework/meta/src/cli/cli_args_standalone.rs
@@ -385,10 +385,10 @@ pub struct WalletNewArgs {
 #[derive(Default, Clone, PartialEq, Eq, Debug, Args)]
 pub struct WalletConvertArgs {
     #[arg(long = "in-format", verbatim_doc_comment)]
-    pub from: Option<String>,
+    pub from: String,
 
     #[arg(long = "out-format", verbatim_doc_comment)]
-    pub to: Option<String>,
+    pub to: String,
 
     #[arg(long = "infile", verbatim_doc_comment)]
     pub infile: Option<String>,
diff --git a/framework/meta/src/cmd/wallet.rs b/framework/meta/src/cmd/wallet.rs
index b1fdddee9c..bdddf81b60 100644
--- a/framework/meta/src/cmd/wallet.rs
+++ b/framework/meta/src/cmd/wallet.rs
@@ -1,13 +1,14 @@
 use base64;
 use core::str;
+use multiversx_sc::types;
 use std::{
     fs::{self, File},
-    io::Write,
+    io::{self, Read, Write},
 };
 
 use crate::cli::{WalletAction, WalletArgs, WalletConvertArgs, WalletNewArgs};
 use multiversx_sc_snippets::{hex, imports::Bech32Address};
-use multiversx_sdk::{data::address::Address, wallet::Wallet};
+use multiversx_sdk::{crypto::public_key::PublicKey, data::address::Address, wallet::Wallet};
 
 pub fn wallet(args: &WalletArgs) {
     let command = args
@@ -21,31 +22,37 @@ pub fn wallet(args: &WalletArgs) {
 }
 
 fn convert(convert_args: &WalletConvertArgs) {
-    let infile = convert_args
-        .infile
-        .as_ref()
-        .expect("input file is required");
+    let infile = convert_args.infile.as_ref();
     let outfile = convert_args.outfile.as_ref();
-    let in_format = convert_args
-        .from
-        .as_ref()
-        .expect("input format is required");
-    let out_format = convert_args.to.as_ref().expect("output format is required");
+    let in_format = &convert_args.from;
+    let out_format = &convert_args.to;
+
+    let mut in_address = String::new();
+    let mut out_address: String = String::new();
+
+    match infile {
+        Some(file) => in_address = fs::read_to_string(file).unwrap(),
+        None => {
+            println!("Insert text below. Press 'Ctrl-D' (Linux / MacOS) or 'Ctrl-Z' (Windows) when done.");
+            _ = io::stdin().read_to_string(&mut in_address).unwrap()
+        },
+    }
 
-    let in_address = fs::read_to_string(infile).unwrap();
-    let mut out_addr: String = String::from("");
+    in_address = in_address.replace('\n', "");
 
     match (in_format.as_str(), out_format.as_str()) {
         ("address-bech32", "address-hex") => {
-            out_addr = Bech32Address::from_bech32_string(in_address).to_hex();
+            out_address = Bech32Address::from_bech32_string(in_address).to_hex();
         },
         ("address-hex", "address-bech32") => {
-            // out_addr = Bech32Address::from(in_address).to_bech32_string();
-            let bytes_from_hex: [u8; 64] = hex::decode(in_address).unwrap().try_into().unwrap();
-            out_addr = Bech32Address::from_bech32_string(
-                str::from_utf8(&bytes_from_hex).unwrap().to_string(),
-            )
-            .to_bech32_string();
+            let bytes_from_hex = hex::decode(in_address).unwrap();
+            let bytes_arr: [u8; 32] = bytes_from_hex.try_into().unwrap();
+
+            let addr = types::Address::from(&bytes_arr);
+            out_address = Bech32Address::from(addr).to_bech32_str().to_string();
+        },
+        ("", _) | (_, "") => {
+            println!("error: the following arguments are required: --in-format, --out-format");
         },
         _ => {
             println!("Unsupported conversion");
@@ -55,49 +62,51 @@ fn convert(convert_args: &WalletConvertArgs) {
     match outfile {
         Some(outfile) => {
             let mut file = File::create(outfile).unwrap();
-            file.write_all(out_addr.as_bytes()).unwrap();
+            out_address.push('\n');
+            file.write_all(out_address.as_bytes()).unwrap();
         },
         None => {
-            println!("{}", out_addr);
+            println!("{}", out_address);
         },
     }
 }
 
 fn new(new_args: &WalletNewArgs) {
-    let format = new_args
-        .wallet_format
-        .as_ref()
-        .expect("wallet format is required");
-    let outfile = new_args.outfile.as_ref().expect("output file is required");
+    let format = new_args.wallet_format.as_ref();
+    let outfile = new_args.outfile.as_ref();
+    let mnemonic = Wallet::generate_mnemonic();
+    println!("Mnemonic: {}", mnemonic);
 
-    match format.as_str() {
-        "pem" => {
-            let mnemonic = Wallet::generate_mnemonic();
-            let private_key = Wallet::get_private_key_from_mnemonic(mnemonic, 0u32, 0u32);
-            let pk_str: &str = &private_key.to_string();
-            let wallet = Wallet::from_private_key(pk_str).unwrap();
-            let address = wallet.address();
+    let private_key = Wallet::get_private_key_from_mnemonic(mnemonic, 0u32, 0u32);
+    let public_key = PublicKey::from(&private_key);
 
-            println!("Wallet address: {}", address);
+    let public_key_str: &str = &public_key.to_string();
+    let private_key_str: &str = &private_key.to_string();
 
-            generate_pem(&address, pk_str, outfile);
-        },
-        _ => {
-            println!("Unsupported wallet format");
-        },
+    let wallet = Wallet::from_private_key(private_key_str).unwrap();
+    let address = wallet.address();
+
+    println!("Wallet address: {}", address);
+
+    if let Some(f) = format {
+        match (f.as_str(), outfile) {
+            ("pem", Some(file)) => {
+                generate_pem(&address, private_key_str, public_key_str, file);
+            },
+            ("pem", None) => {
+                println!("Output file is required for PEM format");
+            },
+            _ => {},
+        }
     }
 }
 
-fn generate_pem(address: &Address, private_key: &str, outfile: &String) {
-    println!("{private_key}");
-    let private_key_hex_encoded = hex::encode(private_key.as_bytes());
-    println!("HEX {private_key_hex_encoded}");
-    // let priv_key_bytes = private_key_hex_encoded.as_bytes();
-    let private_key_base64 = base64::encode(&private_key_hex_encoded.as_bytes());
-    println!("B64 {private_key_base64}");
+fn generate_pem(address: &Address, private_key: &str, public_key: &str, outfile: &String) {
+    let concat_keys = format!("{}{}", private_key, public_key);
+    let concat_keys_b64 = base64::encode(concat_keys);
 
     // Split the base64 string into 64-character lines
-    let formatted_key = private_key_base64
+    let formatted_key = concat_keys_b64
         .as_bytes()
         .chunks(64)
         .map(|chunk| std::str::from_utf8(chunk).unwrap())

From 5c42c62fbbef972ccae819a7fac69e6d1cf7e46b Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Tue, 13 Aug 2024 14:08:15 +0300
Subject: [PATCH 1159/1254] cli code report - revert version of sc-actions

---
 .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 a730a1fb15..dc0bcc8596 100644
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -14,7 +14,7 @@ permissions:
 jobs:
   contracts:
     name: Contracts
-    uses: multiversx/mx-sc-actions/.github/workflows/contracts.yml@8b4ea39b4291e43e221aa6d980f6e97b34c8e1e8
+    uses: multiversx/mx-sc-actions/.github/workflows/contracts.yml@v3.1.0
     with:
       rust-toolchain: stable
       path-to-sc-meta: framework/meta

From 47ef8de7f75ed1c031b448d00579debefa2e0941 Mon Sep 17 00:00:00 2001
From: Andrei Vasilescu <vasilescuandrei24@gmail.com>
Date: Tue, 13 Aug 2024 17:03:47 +0300
Subject: [PATCH 1160/1254] added bech32 command and updated conversion

---
 framework/meta/Cargo.toml                     |   2 +-
 framework/meta/src/cli/cli_args_standalone.rs |  17 ++-
 framework/meta/src/cmd/wallet.rs              | 132 +++++++++++-------
 3 files changed, 101 insertions(+), 50 deletions(-)

diff --git a/framework/meta/Cargo.toml b/framework/meta/Cargo.toml
index c59184d411..63625c1746 100644
--- a/framework/meta/Cargo.toml
+++ b/framework/meta/Cargo.toml
@@ -39,7 +39,7 @@ zip = { version = "2.1", features = ["deflate"], default-features = false }
 copy_dir =  "0.1.2" 
 pathdiff = "0.2.1" 
 common-path = "1.0.0" 
-base64 = "0.13"
+bip39 = "2.0.0"
 
 [dependencies.multiversx-sc-meta-lib]
 version = "=0.52.3"
diff --git a/framework/meta/src/cli/cli_args_standalone.rs b/framework/meta/src/cli/cli_args_standalone.rs
index 59cb0a4d86..104feac18d 100644
--- a/framework/meta/src/cli/cli_args_standalone.rs
+++ b/framework/meta/src/cli/cli_args_standalone.rs
@@ -360,15 +360,20 @@ pub enum WalletAction {
     #[command(name = "new", about = "Creates a new wallet")]
     New(WalletNewArgs),
 
+    #[command(
+        name = "bech32",
+        about = "Encodes/decodes a bech32 address to/from hex"
+    )]
+    Bech32(WalletBech32Args),
     #[command(name = "convert", about = "Converts a wallet")]
     Convert(WalletConvertArgs),
 }
 
-#[derive(Default, Clone, PartialEq, Eq, Debug, Parser)]
+#[derive(Clone, PartialEq, Eq, Debug, Parser)]
 #[command(propagate_version = true)]
 pub struct WalletArgs {
     #[command(subcommand)]
-    pub command: Option<WalletAction>,
+    pub command: WalletAction,
 }
 
 #[derive(Default, Clone, PartialEq, Eq, Debug, Args)]
@@ -396,3 +401,11 @@ pub struct WalletConvertArgs {
     #[arg(long = "outfile", verbatim_doc_comment)]
     pub outfile: Option<String>,
 }
+
+#[derive(Default, Clone, PartialEq, Eq, Debug, Args)]
+pub struct WalletBech32Args {
+    #[arg(long = "encode", verbatim_doc_comment)]
+    pub hex_address: Option<String>,
+    #[arg(long = "decode", verbatim_doc_comment)]
+    pub bech32_address: Option<String>,
+}
diff --git a/framework/meta/src/cmd/wallet.rs b/framework/meta/src/cmd/wallet.rs
index bdddf81b60..7ed5ea58bb 100644
--- a/framework/meta/src/cmd/wallet.rs
+++ b/framework/meta/src/cmd/wallet.rs
@@ -1,4 +1,3 @@
-use base64;
 use core::str;
 use multiversx_sc::types;
 use std::{
@@ -6,17 +5,17 @@ use std::{
     io::{self, Read, Write},
 };
 
-use crate::cli::{WalletAction, WalletArgs, WalletConvertArgs, WalletNewArgs};
+use crate::cli::{WalletAction, WalletArgs, WalletBech32Args, WalletConvertArgs, WalletNewArgs};
+use bip39::Mnemonic;
 use multiversx_sc_snippets::{hex, imports::Bech32Address};
-use multiversx_sdk::{crypto::public_key::PublicKey, data::address::Address, wallet::Wallet};
-
+use multiversx_sdk::{
+    crypto::public_key::PublicKey, data::address::Address, utils::base64_encode, wallet::Wallet,
+};
 pub fn wallet(args: &WalletArgs) {
-    let command = args
-        .command
-        .as_ref()
-        .expect("command expected after `wallet`");
+    let command = &args.command;
     match command {
         WalletAction::New(new_args) => new(new_args),
+        WalletAction::Bech32(bech32_args) => bech32_conversion(bech32_args),
         WalletAction::Convert(convert_args) => convert(convert_args),
     }
 }
@@ -27,71 +26,105 @@ fn convert(convert_args: &WalletConvertArgs) {
     let in_format = &convert_args.from;
     let out_format = &convert_args.to;
 
-    let mut in_address = String::new();
-    let mut out_address: String = String::new();
-
-    match infile {
-        Some(file) => in_address = fs::read_to_string(file).unwrap(),
-        None => {
-            println!("Insert text below. Press 'Ctrl-D' (Linux / MacOS) or 'Ctrl-Z' (Windows) when done.");
-            _ = io::stdin().read_to_string(&mut in_address).unwrap()
-        },
-    }
-
-    in_address = in_address.replace('\n', "");
+    let mut mnemonic_str = String::new();
 
     match (in_format.as_str(), out_format.as_str()) {
-        ("address-bech32", "address-hex") => {
-            out_address = Bech32Address::from_bech32_string(in_address).to_hex();
-        },
-        ("address-hex", "address-bech32") => {
-            let bytes_from_hex = hex::decode(in_address).unwrap();
-            let bytes_arr: [u8; 32] = bytes_from_hex.try_into().unwrap();
-
-            let addr = types::Address::from(&bytes_arr);
-            out_address = Bech32Address::from(addr).to_bech32_str().to_string();
-        },
-        ("", _) | (_, "") => {
-            println!("error: the following arguments are required: --in-format, --out-format");
+        ("mnemonic", "pem") => match infile {
+            Some(file) => {
+                mnemonic_str = fs::read_to_string(file).unwrap();
+                mnemonic_str = mnemonic_str.replace('\n', "");
+            },
+            None => {
+                println!("Insert text below. Press 'Ctrl-D' (Linux / MacOS) or 'Ctrl-Z' (Windows) when done.");
+                _ = io::stdin().read_to_string(&mut mnemonic_str).unwrap()
+            },
         },
         _ => {
             println!("Unsupported conversion");
         },
     }
 
+    let mnemonic = Mnemonic::parse(mnemonic_str).unwrap();
+
+    let (private_key_str, public_key_str) = get_wallet_keys(mnemonic);
+    let address = get_wallet_address(private_key_str.as_str());
+
     match outfile {
         Some(outfile) => {
-            let mut file = File::create(outfile).unwrap();
-            out_address.push('\n');
-            file.write_all(out_address.as_bytes()).unwrap();
+            generate_pem(
+                &address,
+                private_key_str.as_str(),
+                public_key_str.as_str(),
+                outfile,
+            );
         },
         None => {
-            println!("{}", out_address);
+            let pem_content =
+                generate_pem_content(&address, private_key_str.as_str(), public_key_str.as_str());
+            print!("{}", pem_content);
         },
     }
 }
 
-fn new(new_args: &WalletNewArgs) {
-    let format = new_args.wallet_format.as_ref();
-    let outfile = new_args.outfile.as_ref();
-    let mnemonic = Wallet::generate_mnemonic();
-    println!("Mnemonic: {}", mnemonic);
+fn bech32_conversion(bech32_args: &WalletBech32Args) {
+    let encode_address = bech32_args.hex_address.as_ref();
+    let decode_address = bech32_args.bech32_address.as_ref();
+
+    match (encode_address, decode_address) {
+        (Some(hex), None) => {
+            let bytes_from_hex = hex::decode(hex).unwrap();
+            let bytes_arr: [u8; 32] = bytes_from_hex.try_into().unwrap();
 
+            let addr = types::Address::from(&bytes_arr);
+            let bech32_addr = Bech32Address::from(addr).to_bech32_str().to_string();
+            println!("{}", bech32_addr);
+        },
+        (None, Some(bech32)) => {
+            let hex_addr = Bech32Address::from_bech32_string(bech32.to_string()).to_hex();
+            println!("{}", hex_addr);
+        },
+        (Some(_), Some(_)) => {
+            println!("error: only one of --encode or --decode can be used in the same command");
+        },
+        _ => {},
+    }
+}
+
+fn get_wallet_keys(mnemonic: Mnemonic) -> (String, String) {
     let private_key = Wallet::get_private_key_from_mnemonic(mnemonic, 0u32, 0u32);
     let public_key = PublicKey::from(&private_key);
 
     let public_key_str: &str = &public_key.to_string();
     let private_key_str: &str = &private_key.to_string();
 
-    let wallet = Wallet::from_private_key(private_key_str).unwrap();
-    let address = wallet.address();
+    (private_key_str.to_string(), public_key_str.to_string())
+}
+
+fn get_wallet_address(private_key: &str) -> Address {
+    let wallet = Wallet::from_private_key(private_key).unwrap();
+    wallet.address()
+}
+
+fn new(new_args: &WalletNewArgs) {
+    let format = new_args.wallet_format.as_ref();
+    let outfile = new_args.outfile.as_ref();
+    let mnemonic = Wallet::generate_mnemonic();
+    println!("Mnemonic: {}", mnemonic);
+
+    let (private_key_str, public_key_str) = get_wallet_keys(mnemonic);
+    let address = get_wallet_address(private_key_str.as_str());
 
     println!("Wallet address: {}", address);
 
     if let Some(f) = format {
         match (f.as_str(), outfile) {
             ("pem", Some(file)) => {
-                generate_pem(&address, private_key_str, public_key_str, file);
+                generate_pem(
+                    &address,
+                    private_key_str.as_str(),
+                    public_key_str.as_str(),
+                    file,
+                );
             },
             ("pem", None) => {
                 println!("Output file is required for PEM format");
@@ -102,8 +135,14 @@ fn new(new_args: &WalletNewArgs) {
 }
 
 fn generate_pem(address: &Address, private_key: &str, public_key: &str, outfile: &String) {
+    let pem_content = generate_pem_content(address, private_key, public_key);
+    let mut file = File::create(outfile).unwrap();
+    file.write_all(pem_content.as_bytes()).unwrap()
+}
+
+fn generate_pem_content(address: &Address, private_key: &str, public_key: &str) -> String {
     let concat_keys = format!("{}{}", private_key, public_key);
-    let concat_keys_b64 = base64::encode(concat_keys);
+    let concat_keys_b64 = base64_encode(concat_keys);
 
     // Split the base64 string into 64-character lines
     let formatted_key = concat_keys_b64
@@ -120,6 +159,5 @@ fn generate_pem(address: &Address, private_key: &str, public_key: &str, outfile:
         address.to_bech32_string().unwrap()
     );
 
-    let mut file = File::create(outfile).unwrap();
-    file.write_all(pem_content.as_bytes()).unwrap()
+    pem_content
 }

From eba0141dee9f708136bf2560255decb736be56b4 Mon Sep 17 00:00:00 2001
From: Andrei Vasilescu <vasilescuandrei24@gmail.com>
Date: Tue, 13 Aug 2024 17:50:45 +0300
Subject: [PATCH 1161/1254] deleted unnecessary dependency

---
 framework/meta/Cargo.toml        | 4 ----
 framework/meta/src/cmd/wallet.rs | 4 ++--
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/framework/meta/Cargo.toml b/framework/meta/Cargo.toml
index 63625c1746..fba796a3d0 100644
--- a/framework/meta/Cargo.toml
+++ b/framework/meta/Cargo.toml
@@ -53,7 +53,3 @@ features = ["alloc", "num-bigint"]
 [dependencies.multiversx-sc-snippets]
 version = "=0.52.3"
 path = "../snippets"
-
-[dependencies.multiversx-sdk]
-version = "=0.5.0"
-path = "../../sdk/core"
diff --git a/framework/meta/src/cmd/wallet.rs b/framework/meta/src/cmd/wallet.rs
index 7ed5ea58bb..7fcf28899a 100644
--- a/framework/meta/src/cmd/wallet.rs
+++ b/framework/meta/src/cmd/wallet.rs
@@ -7,10 +7,10 @@ use std::{
 
 use crate::cli::{WalletAction, WalletArgs, WalletBech32Args, WalletConvertArgs, WalletNewArgs};
 use bip39::Mnemonic;
-use multiversx_sc_snippets::{hex, imports::Bech32Address};
-use multiversx_sdk::{
+use multiversx_sc_snippets::sdk::{
     crypto::public_key::PublicKey, data::address::Address, utils::base64_encode, wallet::Wallet,
 };
+use multiversx_sc_snippets::{hex, imports::Bech32Address};
 pub fn wallet(args: &WalletArgs) {
     let command = &args.command;
     match command {

From a483001be5dc472771410353520663b01d2acc67 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 13 Aug 2024 18:46:24 +0300
Subject: [PATCH 1162/1254] unified syntax - whitebox fix

---
 .../adder/tests/adder_whitebox_test.rs        | 10 ++--
 .../facade/world_tx/scenario_tx_whitebox.rs   | 53 +++++++++++++++----
 2 files changed, 48 insertions(+), 15 deletions(-)

diff --git a/contracts/examples/adder/tests/adder_whitebox_test.rs b/contracts/examples/adder/tests/adder_whitebox_test.rs
index 726e1ab18a..407f19440f 100644
--- a/contracts/examples/adder/tests/adder_whitebox_test.rs
+++ b/contracts/examples/adder/tests/adder_whitebox_test.rs
@@ -57,26 +57,24 @@ fn adder_whitebox_unified() {
 
     world.account(OWNER).nonce(1);
 
-    let _new_address = world
+    let new_address = world
         .tx()
         .from(OWNER)
         .raw_deploy()
         .code(CODE_PATH)
         .new_address(ADDER_ADDRESS)
-        .with_result(ExpectError(0, "ok"))
         .returns(ReturnsNewBech32Address)
         .whitebox(adder::contract_obj::<DebugApi>(), |sc| {
-            sc.init(BigUint::from(5u64));
+            sc.init(BigUint::from(3u64));
         });
 
-    assert_eq!(_new_address, ADDER_ADDRESS.to_address().into());
+    assert_eq!(new_address, ADDER_ADDRESS.to_address().into());
 
     world
         .tx()
         .from(OWNER)
         .to(ADDER_ADDRESS)
         .raw_call("")
-        .returns(ExpectError(0u64, "ok"))
         .whitebox(adder::contract_obj::<DebugApi>(), |sc| {
             sc.add(BigUint::from(5u64));
         });
@@ -88,6 +86,6 @@ fn adder_whitebox_unified() {
         .returns(ReturnsRawResult)
         .whitebox(adder::contract_obj::<DebugApi>(), |sc| {
             let sum = sc.sum().get();
-            assert_eq!(sum, BigUint::from(10u64));
+            assert_eq!(sum, BigUint::from(8u64));
         });
 }
diff --git a/framework/scenario/src/facade/world_tx/scenario_tx_whitebox.rs b/framework/scenario/src/facade/world_tx/scenario_tx_whitebox.rs
index 0d9040a2ee..406e109266 100644
--- a/framework/scenario/src/facade/world_tx/scenario_tx_whitebox.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_tx_whitebox.rs
@@ -1,8 +1,10 @@
+use crate::debug_executor::contract_instance_wrapped_execution;
 use crate::scenario::tx_to_step::TxToQueryStep;
 use crate::ScenarioEnvQuery;
 use crate::{
     imports::StaticApi, scenario::tx_to_step::TxToStep, scenario_model::TxResponse, ScenarioEnvExec,
 };
+use multiversx_chain_vm::tx_mock::TxFunctionName;
 use multiversx_sc::{
     tuple_util::NestedTupleFlatten,
     types::{
@@ -44,14 +46,22 @@ where
         contract_obj: ContractObj,
         f: F,
     ) -> Self::Returns {
-        let step_wrapper = self.tx_to_step();
-        let (_new_addr, _tx_result) = step_wrapper
+        let mut step_wrapper = self.tx_to_step();
+        let (new_address, tx_result) = step_wrapper
             .env
             .world
             .get_mut_debugger_backend()
             .vm_runner
-            .perform_sc_deploy_lambda(&step_wrapper.step, || f(contract_obj));
+            .perform_sc_deploy_lambda(&step_wrapper.step, || {
+                contract_instance_wrapped_execution(true, || {
+                    f(contract_obj);
+                    Ok(())
+                });
+            });
 
+        let mut response = TxResponse::from_tx_result(tx_result);
+        response.new_deployed_address = Some(new_address);
+        step_wrapper.step.save_response(response);
         step_wrapper.process_result()
     }
 }
@@ -72,14 +82,27 @@ where
         contract_obj: ContractObj,
         f: F,
     ) -> Self::Returns {
-        let step_wrapper = self.tx_to_step();
-        let _tx_result = step_wrapper
+        let mut step_wrapper = self.tx_to_step();
+
+        // no endpoint is called per se, but if it is empty, the VM thinks it is a simple transfer of value
+        if step_wrapper.step.tx.function.is_empty() {
+            step_wrapper.step.tx.function = TxFunctionName::WHITEBOX_CALL.to_string();
+        }
+
+        let tx_result = step_wrapper
             .env
             .world
             .get_mut_debugger_backend()
             .vm_runner
-            .perform_sc_call_lambda(&step_wrapper.step, || f(contract_obj));
+            .perform_sc_call_lambda(&step_wrapper.step, || {
+                contract_instance_wrapped_execution(true, || {
+                    f(contract_obj);
+                    Ok(())
+                });
+            });
 
+        let response = TxResponse::from_tx_result(tx_result);
+        step_wrapper.step.save_response(response);
         step_wrapper.process_result()
     }
 }
@@ -99,15 +122,27 @@ where
         contract_obj: ContractObj,
         f: F,
     ) -> Self::Returns {
-        let step_wrapper = self.tx_to_query_step();
+        let mut step_wrapper = self.tx_to_query_step();
+
+        // no endpoint is called per se, but if it is empty, the VM thinks it is a simple transfer of value
+        if step_wrapper.step.tx.function.is_empty() {
+            step_wrapper.step.tx.function = TxFunctionName::WHITEBOX_CALL.to_string();
+        }
 
-        let _tx_result = step_wrapper
+        let tx_result = step_wrapper
             .env
             .world
             .get_mut_debugger_backend()
             .vm_runner
-            .perform_sc_query_lambda(&step_wrapper.step, || f(contract_obj));
+            .perform_sc_query_lambda(&step_wrapper.step, || {
+                contract_instance_wrapped_execution(true, || {
+                    f(contract_obj);
+                    Ok(())
+                });
+            });
 
+        let response = TxResponse::from_tx_result(tx_result);
+        step_wrapper.step.save_response(response);
         step_wrapper.process_result()
     }
 }

From 9f922b899f5c8221517b57e0e656c9e74295f5c9 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 13 Aug 2024 19:59:54 +0300
Subject: [PATCH 1163/1254] unified syntax - whitebox contract_obj cleanup

---
 .../adder/tests/adder_whitebox_test.rs        |  6 +--
 .../facade/world_tx/scenario_tx_whitebox.rs   | 48 +++++++++++++------
 2 files changed, 36 insertions(+), 18 deletions(-)

diff --git a/contracts/examples/adder/tests/adder_whitebox_test.rs b/contracts/examples/adder/tests/adder_whitebox_test.rs
index 407f19440f..ee93c7d94b 100644
--- a/contracts/examples/adder/tests/adder_whitebox_test.rs
+++ b/contracts/examples/adder/tests/adder_whitebox_test.rs
@@ -64,7 +64,7 @@ fn adder_whitebox_unified() {
         .code(CODE_PATH)
         .new_address(ADDER_ADDRESS)
         .returns(ReturnsNewBech32Address)
-        .whitebox(adder::contract_obj::<DebugApi>(), |sc| {
+        .whitebox(adder::contract_obj, |sc| {
             sc.init(BigUint::from(3u64));
         });
 
@@ -75,7 +75,7 @@ fn adder_whitebox_unified() {
         .from(OWNER)
         .to(ADDER_ADDRESS)
         .raw_call("")
-        .whitebox(adder::contract_obj::<DebugApi>(), |sc| {
+        .whitebox(adder::contract_obj, |sc| {
             sc.add(BigUint::from(5u64));
         });
 
@@ -84,7 +84,7 @@ fn adder_whitebox_unified() {
         .to(ADDER_ADDRESS)
         .raw_call("")
         .returns(ReturnsRawResult)
-        .whitebox(adder::contract_obj::<DebugApi>(), |sc| {
+        .whitebox(adder::contract_obj, |sc| {
             let sum = sc.sum().get();
             assert_eq!(sum, BigUint::from(8u64));
         });
diff --git a/framework/scenario/src/facade/world_tx/scenario_tx_whitebox.rs b/framework/scenario/src/facade/world_tx/scenario_tx_whitebox.rs
index 406e109266..503cfa1d9c 100644
--- a/framework/scenario/src/facade/world_tx/scenario_tx_whitebox.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_tx_whitebox.rs
@@ -1,10 +1,11 @@
 use crate::debug_executor::contract_instance_wrapped_execution;
 use crate::scenario::tx_to_step::TxToQueryStep;
-use crate::ScenarioEnvQuery;
 use crate::{
     imports::StaticApi, scenario::tx_to_step::TxToStep, scenario_model::TxResponse, ScenarioEnvExec,
 };
+use crate::{DebugApi, ScenarioEnvQuery};
 use multiversx_chain_vm::tx_mock::TxFunctionName;
+use multiversx_sc::contract_base::ContractBase;
 use multiversx_sc::{
     tuple_util::NestedTupleFlatten,
     types::{
@@ -15,11 +16,10 @@ use multiversx_sc::{
 
 pub trait ScenarioTxWhitebox {
     type Returns;
-    fn whitebox<ContractObj, F: FnOnce(ContractObj)>(
-        self,
-        contract_obj: ContractObj,
-        f: F,
-    ) -> Self::Returns;
+    fn whitebox<ContractObj, F>(self, contract_obj: fn() -> ContractObj, f: F) -> Self::Returns
+    where
+        ContractObj: ContractBase<Api = DebugApi> + 'static,
+        F: FnOnce(ContractObj);
 }
 
 impl<'w, From, Payment, CodeValue, RH> ScenarioTxWhitebox
@@ -41,11 +41,17 @@ where
 {
     type Returns = <RH::ListReturns as NestedTupleFlatten>::Unpacked;
 
-    fn whitebox<ContractObj, F: FnOnce(ContractObj)>(
+    fn whitebox<ContractObj, F>(
         self,
-        contract_obj: ContractObj,
+        contract_obj_builder: fn() -> ContractObj,
         f: F,
-    ) -> Self::Returns {
+    ) -> Self::Returns
+    where
+        ContractObj: ContractBase<Api = DebugApi> + 'static,
+        F: FnOnce(ContractObj),
+    {
+        let contract_obj = contract_obj_builder();
+
         let mut step_wrapper = self.tx_to_step();
         let (new_address, tx_result) = step_wrapper
             .env
@@ -77,11 +83,17 @@ where
 {
     type Returns = <RH::ListReturns as NestedTupleFlatten>::Unpacked;
 
-    fn whitebox<ContractObj, F: FnOnce(ContractObj)>(
+    fn whitebox<ContractObj, F>(
         self,
-        contract_obj: ContractObj,
+        contract_obj_builder: fn() -> ContractObj,
         f: F,
-    ) -> Self::Returns {
+    ) -> Self::Returns
+    where
+        ContractObj: ContractBase<Api = DebugApi> + 'static,
+        F: FnOnce(ContractObj),
+    {
+        let contract_obj = contract_obj_builder();
+
         let mut step_wrapper = self.tx_to_step();
 
         // no endpoint is called per se, but if it is empty, the VM thinks it is a simple transfer of value
@@ -117,11 +129,17 @@ where
 {
     type Returns = <RH::ListReturns as NestedTupleFlatten>::Unpacked;
 
-    fn whitebox<ContractObj, F: FnOnce(ContractObj)>(
+    fn whitebox<ContractObj, F>(
         self,
-        contract_obj: ContractObj,
+        contract_obj_builder: fn() -> ContractObj,
         f: F,
-    ) -> Self::Returns {
+    ) -> Self::Returns
+    where
+        ContractObj: ContractBase<Api = DebugApi> + 'static,
+        F: FnOnce(ContractObj),
+    {
+        let contract_obj = contract_obj_builder();
+
         let mut step_wrapper = self.tx_to_query_step();
 
         // no endpoint is called per se, but if it is empty, the VM thinks it is a simple transfer of value

From 925ed7ed0f2674ab0dedbca8855f96740d119931 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 14 Aug 2024 17:01:01 +0300
Subject: [PATCH 1164/1254] substitution list: AddressToIdMapper

---
 .../basic-features/src/storage_mapper_address_to_id.rs          | 2 +-
 framework/derive/src/preprocessing/substitution_list.rs         | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/contracts/feature-tests/basic-features/src/storage_mapper_address_to_id.rs b/contracts/feature-tests/basic-features/src/storage_mapper_address_to_id.rs
index ff50875276..9bc0803fd3 100644
--- a/contracts/feature-tests/basic-features/src/storage_mapper_address_to_id.rs
+++ b/contracts/feature-tests/basic-features/src/storage_mapper_address_to_id.rs
@@ -43,5 +43,5 @@ pub trait AddressToIdMapperFeatures {
     }
 
     #[storage_mapper("address_ids")]
-    fn address_ids(&self) -> AddressToIdMapper<Self::Api>;
+    fn address_ids(&self) -> AddressToIdMapper;
 }
diff --git a/framework/derive/src/preprocessing/substitution_list.rs b/framework/derive/src/preprocessing/substitution_list.rs
index 62fdb11823..ec1b330239 100644
--- a/framework/derive/src/preprocessing/substitution_list.rs
+++ b/framework/derive/src/preprocessing/substitution_list.rs
@@ -109,6 +109,7 @@ fn add_storage_mappers(substitutions: &mut SubstitutionsMap) {
     add_storage_mapper_single_generic_arg(substitutions, &quote!(TokenAttributesMapper));
     add_storage_mapper_single_generic_arg(substitutions, &quote!(UniqueIdMapper));
     add_storage_mapper_single_generic_arg(substitutions, &quote!(UserMapper));
+    add_storage_mapper_single_generic_arg(substitutions, &quote!(AddressToIdMapper));
 
     add_storage_mapper(substitutions, &quote!(BiDiMapper));
     add_storage_mapper(substitutions, &quote!(LinkedListMapper));

From 5b00e03d6d27c5c50e1ebdcaf46861615c042ee9 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Wed, 14 Aug 2024 20:20:29 +0300
Subject: [PATCH 1165/1254] proxy gen - fix for non-configured proxy and
 ManagedOption type

---
 contracts/examples/lottery-esdt/src/lottery_info.rs        | 3 ++-
 contracts/examples/lottery-esdt/src/status.rs              | 3 ++-
 framework/base/src/types/managed/wrapped/managed_option.rs | 5 ++++-
 .../meta-lib/src/contract/generate_proxy/proxy_gen_main.rs | 7 +++++++
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/contracts/examples/lottery-esdt/src/lottery_info.rs b/contracts/examples/lottery-esdt/src/lottery_info.rs
index 869a3906a8..4ec2a6055f 100644
--- a/contracts/examples/lottery-esdt/src/lottery_info.rs
+++ b/contracts/examples/lottery-esdt/src/lottery_info.rs
@@ -5,7 +5,8 @@ use multiversx_sc::{
 
 use multiversx_sc::derive_imports::*;
 
-#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, TypeAbi)]
+#[type_abi]
+#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct LotteryInfo<M: ManagedTypeApi> {
     pub token_identifier: EgldOrEsdtTokenIdentifier<M>,
     pub ticket_price: BigUint<M>,
diff --git a/contracts/examples/lottery-esdt/src/status.rs b/contracts/examples/lottery-esdt/src/status.rs
index ba87b5bb84..6a932f2f70 100644
--- a/contracts/examples/lottery-esdt/src/status.rs
+++ b/contracts/examples/lottery-esdt/src/status.rs
@@ -1,6 +1,7 @@
 use multiversx_sc::derive_imports::*;
 
-#[derive(TopEncode, TopDecode, TypeAbi, PartialEq, Eq, Clone, Copy)]
+#[type_abi]
+#[derive(TopEncode, TopDecode, PartialEq, Eq, Clone, Copy)]
 pub enum Status {
     Inactive,
     Running,
diff --git a/framework/base/src/types/managed/wrapped/managed_option.rs b/framework/base/src/types/managed/wrapped/managed_option.rs
index ddedbbdb8d..eb17ae81e4 100644
--- a/framework/base/src/types/managed/wrapped/managed_option.rs
+++ b/framework/base/src/types/managed/wrapped/managed_option.rs
@@ -308,7 +308,10 @@ where
     }
 
     fn type_name_rust() -> TypeName {
-        Option::<T>::type_name_rust()
+        TypeName::from(alloc::format!(
+            "ManagedOption<$API, {}>",
+            T::type_name_rust()
+        ))
     }
 
     fn provide_type_descriptions<TDC: TypeDescriptionContainer>(accumulator: &mut TDC) {
diff --git a/framework/meta-lib/src/contract/generate_proxy/proxy_gen_main.rs b/framework/meta-lib/src/contract/generate_proxy/proxy_gen_main.rs
index bcd425ae84..44165b6c29 100644
--- a/framework/meta-lib/src/contract/generate_proxy/proxy_gen_main.rs
+++ b/framework/meta-lib/src/contract/generate_proxy/proxy_gen_main.rs
@@ -11,6 +11,13 @@ const PROXY_COMPARE_ERR_MSG: &str = "Contract has been modified and proxies have
 
 impl MetaConfig {
     pub fn generate_proxy(&mut self) {
+        if self.sc_config.proxy_configs.is_empty() {
+            let proxy_config_default =
+                ProxyConfig::new_with_default_path(self.original_contract_abi.clone());
+            write_proxy_with_explicit_path(&proxy_config_default, &self);
+            return;
+        }
+
         for proxy_config in &self.sc_config.proxy_configs {
             write_proxy_with_explicit_path(proxy_config, self);
         }

From 6bacb2904cb4d4125edf528e8fd796cab85b1f30 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Wed, 14 Aug 2024 20:28:45 +0300
Subject: [PATCH 1166/1254] proxy gen - clippy

---
 .../meta-lib/src/contract/generate_proxy/proxy_gen_main.rs      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/framework/meta-lib/src/contract/generate_proxy/proxy_gen_main.rs b/framework/meta-lib/src/contract/generate_proxy/proxy_gen_main.rs
index 44165b6c29..4977e41d30 100644
--- a/framework/meta-lib/src/contract/generate_proxy/proxy_gen_main.rs
+++ b/framework/meta-lib/src/contract/generate_proxy/proxy_gen_main.rs
@@ -14,7 +14,7 @@ impl MetaConfig {
         if self.sc_config.proxy_configs.is_empty() {
             let proxy_config_default =
                 ProxyConfig::new_with_default_path(self.original_contract_abi.clone());
-            write_proxy_with_explicit_path(&proxy_config_default, &self);
+            write_proxy_with_explicit_path(&proxy_config_default, self);
             return;
         }
 

From b9dd460f5704fc1faeb4bc0d45bbb20e9a4810d4 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Sun, 18 Aug 2024 23:40:15 +0300
Subject: [PATCH 1167/1254] unified syntax - whitebox impl for empty data

---
 .../adder/tests/adder_whitebox_test.rs        |  2 -
 .../facade/world_tx/scenario_tx_whitebox.rs   | 51 +++++++++++++++++++
 2 files changed, 51 insertions(+), 2 deletions(-)

diff --git a/contracts/examples/adder/tests/adder_whitebox_test.rs b/contracts/examples/adder/tests/adder_whitebox_test.rs
index ee93c7d94b..215f1647d2 100644
--- a/contracts/examples/adder/tests/adder_whitebox_test.rs
+++ b/contracts/examples/adder/tests/adder_whitebox_test.rs
@@ -74,7 +74,6 @@ fn adder_whitebox_unified() {
         .tx()
         .from(OWNER)
         .to(ADDER_ADDRESS)
-        .raw_call("")
         .whitebox(adder::contract_obj, |sc| {
             sc.add(BigUint::from(5u64));
         });
@@ -82,7 +81,6 @@ fn adder_whitebox_unified() {
     let _raw_response = world
         .query()
         .to(ADDER_ADDRESS)
-        .raw_call("")
         .returns(ReturnsRawResult)
         .whitebox(adder::contract_obj, |sc| {
             let sum = sc.sum().get();
diff --git a/framework/scenario/src/facade/world_tx/scenario_tx_whitebox.rs b/framework/scenario/src/facade/world_tx/scenario_tx_whitebox.rs
index 503cfa1d9c..62842a6e25 100644
--- a/framework/scenario/src/facade/world_tx/scenario_tx_whitebox.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_tx_whitebox.rs
@@ -16,6 +16,8 @@ use multiversx_sc::{
 
 pub trait ScenarioTxWhitebox {
     type Returns;
+
+    /// Runs a lambda function in the name of a smart contract, with the configured transaction context.
     fn whitebox<ContractObj, F>(self, contract_obj: fn() -> ContractObj, f: F) -> Self::Returns
     where
         ContractObj: ContractBase<Api = DebugApi> + 'static,
@@ -72,6 +74,31 @@ where
     }
 }
 
+impl<'w, From, To, Payment, RH> ScenarioTxWhitebox
+    for Tx<ScenarioEnvExec<'w>, From, To, Payment, (), (), RH>
+where
+    From: TxFromSpecified<ScenarioEnvExec<'w>>,
+    To: TxToSpecified<ScenarioEnvExec<'w>>,
+    Payment: TxPayment<ScenarioEnvExec<'w>>,
+    RH: RHListExec<TxResponse, ScenarioEnvExec<'w>>,
+    RH::ListReturns: NestedTupleFlatten,
+{
+    type Returns = <RH::ListReturns as NestedTupleFlatten>::Unpacked;
+
+    fn whitebox<ContractObj, F>(
+        self,
+        contract_obj_builder: fn() -> ContractObj,
+        f: F,
+    ) -> Self::Returns
+    where
+        ContractObj: ContractBase<Api = DebugApi> + 'static,
+        F: FnOnce(ContractObj),
+    {
+        self.raw_call(TxFunctionName::WHITEBOX_CALL.as_str())
+            .whitebox(contract_obj_builder, f)
+    }
+}
+
 impl<'w, From, To, Payment, RH> ScenarioTxWhitebox
     for Tx<ScenarioEnvExec<'w>, From, To, Payment, (), FunctionCall<StaticApi>, RH>
 where
@@ -119,6 +146,30 @@ where
     }
 }
 
+impl<'w, To, Payment, RH> ScenarioTxWhitebox
+    for Tx<ScenarioEnvQuery<'w>, (), To, Payment, (), (), RH>
+where
+    To: TxToSpecified<ScenarioEnvQuery<'w>>,
+    Payment: TxNoPayment<ScenarioEnvQuery<'w>>,
+    RH: RHListExec<TxResponse, ScenarioEnvQuery<'w>>,
+    RH::ListReturns: NestedTupleFlatten,
+{
+    type Returns = <RH::ListReturns as NestedTupleFlatten>::Unpacked;
+
+    fn whitebox<ContractObj, F>(
+        self,
+        contract_obj_builder: fn() -> ContractObj,
+        f: F,
+    ) -> Self::Returns
+    where
+        ContractObj: ContractBase<Api = DebugApi> + 'static,
+        F: FnOnce(ContractObj),
+    {
+        self.raw_call(TxFunctionName::WHITEBOX_CALL.as_str())
+            .whitebox(contract_obj_builder, f)
+    }
+}
+
 impl<'w, To, Payment, RH> ScenarioTxWhitebox
     for Tx<ScenarioEnvQuery<'w>, (), To, Payment, (), FunctionCall<StaticApi>, RH>
 where

From 0342c8a267a23ce6b869e1b1a26e722a969a7c51 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Mon, 19 Aug 2024 13:02:30 +0300
Subject: [PATCH 1168/1254] proxy gen - add test for ManagedOption type name

---
 .../sc-config.toml                            |   3 +
 .../src/dummy_module.rs                       |   2 -
 .../rust-testing-framework-tester/src/lib.rs  |  16 +-
 .../rust_testing_framework_tester_proxy.rs    | 408 ++++++++++++++++++
 .../tests/tester_blackbox_test.rs             | 117 ++---
 .../wasm/src/lib.rs                           |   5 +-
 6 files changed, 491 insertions(+), 60 deletions(-)
 create mode 100644 contracts/feature-tests/rust-testing-framework-tester/src/rust_testing_framework_tester_proxy.rs

diff --git a/contracts/feature-tests/rust-testing-framework-tester/sc-config.toml b/contracts/feature-tests/rust-testing-framework-tester/sc-config.toml
index 330cdda658..c33c94d1ab 100644
--- a/contracts/feature-tests/rust-testing-framework-tester/sc-config.toml
+++ b/contracts/feature-tests/rust-testing-framework-tester/sc-config.toml
@@ -4,3 +4,6 @@ main = "rust-testing-framework-tester"
 # the only purpose of this config is to specify the allocator
 [contracts.rust-testing-framework-tester]
 allocator = "static64k"
+
+[[proxy]]
+path = "src/rust_testing_framework_tester_proxy.rs"
diff --git a/contracts/feature-tests/rust-testing-framework-tester/src/dummy_module.rs b/contracts/feature-tests/rust-testing-framework-tester/src/dummy_module.rs
index 76721a8fc4..7db5c9379d 100644
--- a/contracts/feature-tests/rust-testing-framework-tester/src/dummy_module.rs
+++ b/contracts/feature-tests/rust-testing-framework-tester/src/dummy_module.rs
@@ -1,5 +1,3 @@
-multiversx_sc::imports!();
-
 #[multiversx_sc::module]
 pub trait DummyModule {
     fn some_function(&self) -> BigUint {
diff --git a/contracts/feature-tests/rust-testing-framework-tester/src/lib.rs b/contracts/feature-tests/rust-testing-framework-tester/src/lib.rs
index 4133f3f039..d40eac5613 100644
--- a/contracts/feature-tests/rust-testing-framework-tester/src/lib.rs
+++ b/contracts/feature-tests/rust-testing-framework-tester/src/lib.rs
@@ -1,11 +1,12 @@
 #![no_std]
 
-multiversx_sc::imports!();
-multiversx_sc::derive_imports!();
+use multiversx_sc::proxy_imports::*;
 
 pub mod dummy_module;
+pub mod rust_testing_framework_tester_proxy;
 
-#[derive(TopEncode, TopDecode, TypeAbi, Clone, Debug, PartialEq, Eq)]
+#[type_abi]
+#[derive(TopEncode, TopDecode, Clone, Debug, PartialEq, Eq)]
 pub struct NftDummyAttributes {
     pub creation_epoch: u64,
     pub cool_factor: u8,
@@ -228,6 +229,15 @@ pub trait RustTestingFrameworkTester: dummy_module::DummyModule {
         sc_panic!("Oh no!");
     }
 
+    /// Tests how is generated type name in proxy
+    #[endpoint]
+    fn type_managed_option(
+        &self,
+        managed_option: ManagedOption<BigUint>,
+    ) -> ManagedOption<BigUint> {
+        managed_option
+    }
+
     fn get_val(&self) -> BigUint {
         self.total_value().get()
     }
diff --git a/contracts/feature-tests/rust-testing-framework-tester/src/rust_testing_framework_tester_proxy.rs b/contracts/feature-tests/rust-testing-framework-tester/src/rust_testing_framework_tester_proxy.rs
new file mode 100644
index 0000000000..13cb9b49e5
--- /dev/null
+++ b/contracts/feature-tests/rust-testing-framework-tester/src/rust_testing_framework_tester_proxy.rs
@@ -0,0 +1,408 @@
+// Code generated by the multiversx-sc proxy generator. DO NOT EDIT.
+
+////////////////////////////////////////////////////
+////////////////// AUTO-GENERATED //////////////////
+////////////////////////////////////////////////////
+
+#![allow(dead_code)]
+#![allow(clippy::all)]
+
+use multiversx_sc::proxy_imports::*;
+
+pub struct RustTestingFrameworkTesterProxy;
+
+impl<Env, From, To, Gas> TxProxyTrait<Env, From, To, Gas> for RustTestingFrameworkTesterProxy
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    type TxProxyMethods = RustTestingFrameworkTesterProxyMethods<Env, From, To, Gas>;
+
+    fn proxy_methods(self, tx: Tx<Env, From, To, (), Gas, (), ()>) -> Self::TxProxyMethods {
+        RustTestingFrameworkTesterProxyMethods { wrapped_tx: tx }
+    }
+}
+
+pub struct RustTestingFrameworkTesterProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    wrapped_tx: Tx<Env, From, To, (), Gas, (), ()>,
+}
+
+#[rustfmt::skip]
+impl<Env, From, Gas> RustTestingFrameworkTesterProxyMethods<Env, From, (), Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn init(
+        self,
+    ) -> TxTypedDeploy<Env, From, NotPayable, Gas, ManagedBuffer<Env::Api>> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_deploy()
+            .original_result()
+    }
+}
+
+#[rustfmt::skip]
+impl<Env, From, To, Gas> RustTestingFrameworkTesterProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn sum<
+        Arg0: ProxyArg<BigUint<Env::Api>>,
+        Arg1: ProxyArg<BigUint<Env::Api>>,
+    >(
+        self,
+        first: Arg0,
+        second: Arg1,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, BigUint<Env::Api>> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("sum")
+            .argument(&first)
+            .argument(&second)
+            .original_result()
+    }
+
+    pub fn sum_sc_result<
+        Arg0: ProxyArg<BigUint<Env::Api>>,
+        Arg1: ProxyArg<BigUint<Env::Api>>,
+    >(
+        self,
+        first: Arg0,
+        second: Arg1,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, BigUint<Env::Api>> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("sum_sc_result")
+            .argument(&first)
+            .argument(&second)
+            .original_result()
+    }
+
+    pub fn get_caller_legacy(
+        self,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, Address> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("get_caller_legacy")
+            .original_result()
+    }
+
+    pub fn get_egld_balance(
+        self,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, BigUint<Env::Api>> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("get_egld_balance")
+            .original_result()
+    }
+
+    pub fn get_esdt_balance<
+        Arg0: ProxyArg<TokenIdentifier<Env::Api>>,
+        Arg1: ProxyArg<u64>,
+    >(
+        self,
+        token_id: Arg0,
+        nonce: Arg1,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, BigUint<Env::Api>> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("get_esdt_balance")
+            .argument(&token_id)
+            .argument(&nonce)
+            .original_result()
+    }
+
+    pub fn receive_egld(
+        self,
+    ) -> TxTypedCall<Env, From, To, (), Gas, BigUint<Env::Api>> {
+        self.wrapped_tx
+            .raw_call("receive_egld")
+            .original_result()
+    }
+
+    pub fn recieve_egld_half(
+        self,
+    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
+        self.wrapped_tx
+            .raw_call("recieve_egld_half")
+            .original_result()
+    }
+
+    pub fn receive_esdt(
+        self,
+    ) -> TxTypedCall<Env, From, To, (), Gas, (TokenIdentifier<Env::Api>, BigUint<Env::Api>)> {
+        self.wrapped_tx
+            .raw_call("receive_esdt")
+            .original_result()
+    }
+
+    pub fn reject_payment(
+        self,
+    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
+        self.wrapped_tx
+            .raw_call("reject_payment")
+            .original_result()
+    }
+
+    pub fn receive_esdt_half(
+        self,
+    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
+        self.wrapped_tx
+            .raw_call("receive_esdt_half")
+            .original_result()
+    }
+
+    pub fn receive_multi_esdt(
+        self,
+    ) -> TxTypedCall<Env, From, To, (), Gas, ManagedVec<Env::Api, EsdtTokenPayment<Env::Api>>> {
+        self.wrapped_tx
+            .raw_call("receive_multi_esdt")
+            .original_result()
+    }
+
+    pub fn send_nft<
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg1: ProxyArg<TokenIdentifier<Env::Api>>,
+        Arg2: ProxyArg<u64>,
+        Arg3: ProxyArg<BigUint<Env::Api>>,
+    >(
+        self,
+        to: Arg0,
+        token_id: Arg1,
+        nft_nonce: Arg2,
+        amount: Arg3,
+    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
+        self.wrapped_tx
+            .raw_call("send_nft")
+            .argument(&to)
+            .argument(&token_id)
+            .argument(&nft_nonce)
+            .argument(&amount)
+            .original_result()
+    }
+
+    pub fn mint_esdt<
+        Arg0: ProxyArg<TokenIdentifier<Env::Api>>,
+        Arg1: ProxyArg<u64>,
+        Arg2: ProxyArg<BigUint<Env::Api>>,
+    >(
+        self,
+        token_id: Arg0,
+        nonce: Arg1,
+        amount: Arg2,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("mint_esdt")
+            .argument(&token_id)
+            .argument(&nonce)
+            .argument(&amount)
+            .original_result()
+    }
+
+    pub fn burn_esdt<
+        Arg0: ProxyArg<TokenIdentifier<Env::Api>>,
+        Arg1: ProxyArg<u64>,
+        Arg2: ProxyArg<BigUint<Env::Api>>,
+    >(
+        self,
+        token_id: Arg0,
+        nonce: Arg1,
+        amount: Arg2,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("burn_esdt")
+            .argument(&token_id)
+            .argument(&nonce)
+            .argument(&amount)
+            .original_result()
+    }
+
+    pub fn create_nft<
+        Arg0: ProxyArg<TokenIdentifier<Env::Api>>,
+        Arg1: ProxyArg<BigUint<Env::Api>>,
+        Arg2: ProxyArg<NftDummyAttributes>,
+    >(
+        self,
+        token_id: Arg0,
+        amount: Arg1,
+        attributes: Arg2,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, u64> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("create_nft")
+            .argument(&token_id)
+            .argument(&amount)
+            .argument(&attributes)
+            .original_result()
+    }
+
+    pub fn get_block_epoch(
+        self,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, u64> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("get_block_epoch")
+            .original_result()
+    }
+
+    pub fn get_block_nonce(
+        self,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, u64> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("get_block_nonce")
+            .original_result()
+    }
+
+    pub fn get_block_timestamp(
+        self,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, u64> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("get_block_timestamp")
+            .original_result()
+    }
+
+    pub fn get_random_buffer_once<
+        Arg0: ProxyArg<usize>,
+    >(
+        self,
+        len: Arg0,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ManagedBuffer<Env::Api>> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("get_random_buffer_once")
+            .argument(&len)
+            .original_result()
+    }
+
+    pub fn get_random_buffer_twice<
+        Arg0: ProxyArg<usize>,
+        Arg1: ProxyArg<usize>,
+    >(
+        self,
+        len1: Arg0,
+        len2: Arg1,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, (ManagedBuffer<Env::Api>, ManagedBuffer<Env::Api>)> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("get_random_buffer_twice")
+            .argument(&len1)
+            .argument(&len2)
+            .original_result()
+    }
+
+    pub fn call_other_contract_execute_on_dest<
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
+    >(
+        self,
+        other_sc_address: Arg0,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, BigUint<Env::Api>> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("call_other_contract_execute_on_dest")
+            .argument(&other_sc_address)
+            .original_result()
+    }
+
+    pub fn call_other_contract_add_async_call<
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg1: ProxyArg<BigUint<Env::Api>>,
+    >(
+        self,
+        other_sc_address: Arg0,
+        value: Arg1,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("call_other_contract_add_async_call")
+            .argument(&other_sc_address)
+            .argument(&value)
+            .original_result()
+    }
+
+    pub fn get_total_value(
+        self,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, BigUint<Env::Api>> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("getTotalValue")
+            .original_result()
+    }
+
+    pub fn execute_on_dest_add_value<
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg1: ProxyArg<BigUint<Env::Api>>,
+    >(
+        self,
+        other_sc_address: Arg0,
+        value: Arg1,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("execute_on_dest_add_value")
+            .argument(&other_sc_address)
+            .argument(&value)
+            .original_result()
+    }
+
+    pub fn add<
+        Arg0: ProxyArg<BigUint<Env::Api>>,
+    >(
+        self,
+        value: Arg0,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("addValue")
+            .argument(&value)
+            .original_result()
+    }
+
+    pub fn panic(
+        self,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("panic")
+            .original_result()
+    }
+
+    pub fn type_managed_option<
+        Arg0: ProxyArg<ManagedOption<Env::Api, BigUint<Env::Api>>>,
+    >(
+        self,
+        managed_option: Arg0,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ManagedOption<Env::Api, BigUint<Env::Api>>> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("type_managed_option")
+            .argument(&managed_option)
+            .original_result()
+    }
+}
+
+#[type_abi]
+#[derive(TopEncode, TopDecode, Clone, Debug, PartialEq, Eq)]
+pub struct NftDummyAttributes {
+    pub creation_epoch: u64,
+    pub cool_factor: u8,
+}
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 afdabb5199..4ecb618355 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,76 +1,87 @@
 use multiversx_sc_scenario::imports::*;
 use rust_testing_framework_tester::*;
 
-const WASM_PATH_EXPR: &str = "mxsc:output/rust-testing-framework-tester.mxsc.json";
+const CODE_PATH: MxscPath = MxscPath::new("output/rust-testing-framework-tester.mxsc.json");
+const OWNER_ADDRESS: TestAddress = TestAddress::new("owner");
+const RUST_TESTING_FRAMEWORK_TESTER_ADDRESS: TestSCAddress =
+    TestSCAddress::new("rust-testing-framework-tester");
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
-    blockchain.register_contract(
-        WASM_PATH_EXPR,
-        rust_testing_framework_tester::ContractBuilder,
-    );
+    blockchain.register_contract(CODE_PATH, rust_testing_framework_tester::ContractBuilder);
     blockchain
 }
 
+fn deploy(world: &mut ScenarioWorld) -> (ManagedBuffer<StaticApi>, Address) {
+    world.account(OWNER_ADDRESS).new_address(
+        OWNER_ADDRESS,
+        0,
+        RUST_TESTING_FRAMEWORK_TESTER_ADDRESS,
+    );
+
+    world
+        .tx()
+        .from(OWNER_ADDRESS)
+        .typed(rust_testing_framework_tester_proxy::RustTestingFrameworkTesterProxy)
+        .init()
+        .code(CODE_PATH)
+        .returns(ReturnsResult)
+        .new_address(RUST_TESTING_FRAMEWORK_TESTER_ADDRESS)
+        .returns(ReturnsNewAddress)
+        .run()
+}
+
 #[test]
-#[allow(deprecated)]
 fn tester_deploy_test() {
     let mut world = world();
-    let code = world.code_expression(WASM_PATH_EXPR);
 
-    let owner_address = "address:owner";
-    let mut adder_contract =
-        ContractInfo::<rust_testing_framework_tester::Proxy<StaticApi>>::new("sc:contract");
+    world.start_trace();
 
-    world
-        .start_trace()
-        .set_state_step(
-            SetStateStep::new()
-                .put_account(owner_address, Account::new())
-                .new_address(owner_address, 0, &adder_contract),
-        )
-        .sc_deploy_use_result(
-            ScDeployStep::new()
-                .from(owner_address)
-                .code(code)
-                .call(adder_contract.init()),
-            |address, tr: TypedResponse<String>| {
-                assert_eq!(address, adder_contract.to_address());
-                assert_eq!(tr.result.unwrap(), "constructor-result");
-            },
-        )
-        .write_scenario_trace("scenarios/trace-deploy.scen.json");
+    let (returned_value, contract_address) = deploy(&mut world);
+
+    assert_eq!(returned_value.to_string(), "constructor-result");
+    assert_eq!(contract_address, RUST_TESTING_FRAMEWORK_TESTER_ADDRESS);
+
+    world.write_scenario_trace("scenarios/trace-deploy.scen.json");
+}
+
+#[test]
+fn tester_managed_option_test() {
+    let mut world = world();
+
+    world.start_trace();
+
+    let (_, contract_address) = deploy(&mut world);
+
+    let type_number: BigUint<StaticApi> = BigUint::zero();
+    let expected_type_managed_option: ManagedOption<StaticApi, BigUint<StaticApi>> =
+        ManagedOption::some(type_number);
+
+    let output = world
+        .tx()
+        .from(OWNER_ADDRESS)
+        .to(contract_address)
+        .typed(rust_testing_framework_tester_proxy::RustTestingFrameworkTesterProxy)
+        .type_managed_option(expected_type_managed_option.clone())
+        .returns(ReturnsResult)
+        .run();
+
+    assert_eq!(output, expected_type_managed_option);
+    world.write_scenario_trace("scenarios/trace-deploy.scen.json");
 }
 
 #[test]
-#[allow(deprecated)]
 fn tester_deploy_test_spawned_thread() {
     let handler = std::thread::spawn(|| {
         let mut world = world();
-        let code = world.code_expression(WASM_PATH_EXPR);
-
-        let owner_address = "address:owner";
-        let mut adder_contract =
-            ContractInfo::<rust_testing_framework_tester::Proxy<StaticApi>>::new("sc:contract");
-
-        world
-            .start_trace()
-            .set_state_step(
-                SetStateStep::new()
-                    .put_account(owner_address, Account::new())
-                    .new_address(owner_address, 0, &adder_contract),
-            )
-            .sc_deploy_use_result(
-                ScDeployStep::new()
-                    .from(owner_address)
-                    .code(code)
-                    .call(adder_contract.init()),
-                |address, tr: TypedResponse<String>| {
-                    assert_eq!(address, adder_contract.to_address());
-                    assert_eq!(tr.result.unwrap(), "constructor-result");
-                },
-            )
-            .write_scenario_trace("scenarios/trace-deploy.scen.json");
+
+        world.start_trace();
+        let (returned_value, contract_address) = deploy(&mut world);
+
+        assert_eq!(returned_value.to_string(), "constructor-result");
+        assert_eq!(contract_address, RUST_TESTING_FRAMEWORK_TESTER_ADDRESS);
+
+        world.write_scenario_trace("scenarios/trace-deploy.scen.json");
     });
 
     handler.join().unwrap();
diff --git a/contracts/feature-tests/rust-testing-framework-tester/wasm/src/lib.rs b/contracts/feature-tests/rust-testing-framework-tester/wasm/src/lib.rs
index 3943837d34..2c9fc57d28 100644
--- a/contracts/feature-tests/rust-testing-framework-tester/wasm/src/lib.rs
+++ b/contracts/feature-tests/rust-testing-framework-tester/wasm/src/lib.rs
@@ -5,9 +5,9 @@
 ////////////////////////////////////////////////////
 
 // Init:                                 1
-// Endpoints:                           26
+// Endpoints:                           27
 // Async Callback:                       1
-// Total number of exported functions:  28
+// Total number of exported functions:  29
 
 #![no_std]
 
@@ -44,6 +44,7 @@ multiversx_sc_wasm_adapter::endpoints! {
         execute_on_dest_add_value => execute_on_dest_add_value
         addValue => add
         panic => panic
+        type_managed_option => type_managed_option
     )
 }
 

From bcc1b2016f98797584810e020a70d2500126c3b1 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Mon, 19 Aug 2024 12:24:31 +0200
Subject: [PATCH 1169/1254] fetch transaction status from the process-status
 endpoint

---
 sdk/core/src/gateway/gateway_tx.rs          | 19 +++++++++++++++++++
 sdk/core/src/gateway/gateway_tx_retrieve.rs |  2 +-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/sdk/core/src/gateway/gateway_tx.rs b/sdk/core/src/gateway/gateway_tx.rs
index 47aa8b5a83..21312624ff 100644
--- a/sdk/core/src/gateway/gateway_tx.rs
+++ b/sdk/core/src/gateway/gateway_tx.rs
@@ -96,6 +96,25 @@ impl GatewayProxy {
         }
     }
 
+    // get_transaction_process_status retrieves a transaction's status from the network using process-status API
+    pub async fn get_transaction_process_status(&self, hash: &str) -> Result<String> {
+        let endpoint = format!("transaction/{hash}/process-status");
+        let endpoint = self.get_endpoint(endpoint.as_str());
+
+        let resp = self
+            .client
+            .get(endpoint)
+            .send()
+            .await?
+            .json::<TransactionStatus>()
+            .await?;
+
+        match resp.data {
+            None => Err(anyhow!("{}", resp.error)),
+            Some(b) => Ok(b.status),
+        }
+    }
+
     // get_default_transaction_arguments will prepare the transaction creation argument by querying the account's info
     pub async fn get_default_transaction_arguments(
         &self,
diff --git a/sdk/core/src/gateway/gateway_tx_retrieve.rs b/sdk/core/src/gateway/gateway_tx_retrieve.rs
index 821713f972..4d781b6118 100644
--- a/sdk/core/src/gateway/gateway_tx_retrieve.rs
+++ b/sdk/core/src/gateway/gateway_tx_retrieve.rs
@@ -16,7 +16,7 @@ impl GatewayProxy {
         let start_time = Instant::now();
 
         loop {
-            match self.get_transaction_status(&tx_hash).await {
+            match self.get_transaction_process_status(&tx_hash).await {
                 Ok(status) => {
                     // checks if transaction status is final
                     match status.as_str() {

From 581c4d41b88c075b2b120e4114d384e7be218b9e Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Mon, 19 Aug 2024 15:28:48 +0300
Subject: [PATCH 1170/1254] proxy gen - move test to basic-features

---
 .../basic-features/sc-config.toml             |  8 +++-
 .../src/basic_features_proxy.rs               | 14 +++++++
 .../basic-features/src/echo_managed.rs        |  8 +++-
 .../basic_features_managed_option_test.rs     | 41 +++++++++++++++++++
 .../basic-features/wasm/src/lib.rs            |  5 ++-
 .../rust-testing-framework-tester/src/lib.rs  |  9 ----
 .../rust_testing_framework_tester_proxy.rs    | 13 ------
 .../tests/tester_blackbox_test.rs             | 25 -----------
 .../wasm/src/lib.rs                           |  5 +--
 9 files changed, 74 insertions(+), 54 deletions(-)
 create mode 100644 contracts/feature-tests/basic-features/tests/basic_features_managed_option_test.rs

diff --git a/contracts/feature-tests/basic-features/sc-config.toml b/contracts/feature-tests/basic-features/sc-config.toml
index 82698d1dab..a2bf2ec189 100644
--- a/contracts/feature-tests/basic-features/sc-config.toml
+++ b/contracts/feature-tests/basic-features/sc-config.toml
@@ -12,4 +12,10 @@ kill_legacy_callback = true
 [[proxy]]
 path = "src/basic_features_proxy.rs"
 add-unlabelled = false
-add-endpoints = ["init", "store_bytes", "load_bytes", "returns_egld_decimal"]
+add-endpoints = [
+    "init",
+    "store_bytes",
+    "load_bytes",
+    "returns_egld_decimal",
+    "echo_managed_option",
+]
diff --git a/contracts/feature-tests/basic-features/src/basic_features_proxy.rs b/contracts/feature-tests/basic-features/src/basic_features_proxy.rs
index 469b2d3323..78e267f6bc 100644
--- a/contracts/feature-tests/basic-features/src/basic_features_proxy.rs
+++ b/contracts/feature-tests/basic-features/src/basic_features_proxy.rs
@@ -62,6 +62,20 @@ where
     To: TxTo<Env>,
     Gas: TxGas<Env>,
 {
+    /// This tests how is generated type name in proxy 
+    pub fn echo_managed_option<
+        Arg0: ProxyArg<ManagedOption<Env::Api, BigUint<Env::Api>>>,
+    >(
+        self,
+        mo: Arg0,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ManagedOption<Env::Api, BigUint<Env::Api>>> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("echo_managed_option")
+            .argument(&mo)
+            .original_result()
+    }
+
     pub fn load_bytes(
         self,
     ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ManagedBuffer<Env::Api>> {
diff --git a/contracts/feature-tests/basic-features/src/echo_managed.rs b/contracts/feature-tests/basic-features/src/echo_managed.rs
index 62ee33a7a7..17084a26c8 100644
--- a/contracts/feature-tests/basic-features/src/echo_managed.rs
+++ b/contracts/feature-tests/basic-features/src/echo_managed.rs
@@ -1,4 +1,4 @@
-multiversx_sc::imports!();
+use multiversx_sc::imports::*;
 
 /// Test endpoint argument and result serialization.
 #[multiversx_sc::module]
@@ -23,6 +23,12 @@ pub trait EchoManagedTypes {
         ma
     }
 
+    /// This tests how is generated type name in proxy
+    #[endpoint]
+    fn echo_managed_option(&self, mo: ManagedOption<BigUint>) -> ManagedOption<BigUint> {
+        mo
+    }
+
     /// This tests that nested serialization of big ints within unmanaged types works.
     #[endpoint]
     fn echo_big_int_managed_vec(&self, x: ManagedVec<BigInt>) -> ManagedVec<BigInt> {
diff --git a/contracts/feature-tests/basic-features/tests/basic_features_managed_option_test.rs b/contracts/feature-tests/basic-features/tests/basic_features_managed_option_test.rs
new file mode 100644
index 0000000000..38d5730c03
--- /dev/null
+++ b/contracts/feature-tests/basic-features/tests/basic_features_managed_option_test.rs
@@ -0,0 +1,41 @@
+use imports::{MxscPath, ReturnsResult, TestAddress, TestSCAddress};
+use multiversx_sc::types::{BigUint, ManagedOption};
+use multiversx_sc_scenario::{api::StaticApi, imports, ScenarioTxRun, ScenarioWorld};
+
+const OWNER_ADDRESS: TestAddress = TestAddress::new("owner");
+const BASIC_FEATURES_ADDRESS: TestSCAddress = TestSCAddress::new("basic-features");
+const BASIC_FEATURES_PATH: MxscPath = MxscPath::new("output/basic-features.mxsc.json");
+
+fn world() -> ScenarioWorld {
+    let mut blockchain = ScenarioWorld::new();
+
+    blockchain.register_contract(BASIC_FEATURES_PATH, basic_features::ContractBuilder);
+
+    blockchain.account(OWNER_ADDRESS).nonce(1);
+    blockchain
+        .account(BASIC_FEATURES_ADDRESS)
+        .nonce(1)
+        .code(BASIC_FEATURES_PATH);
+
+    blockchain
+}
+
+#[test]
+fn managed_option_test() {
+    let mut world = world();
+
+    let type_number: BigUint<StaticApi> = BigUint::zero();
+    let expected_type_managed_option: ManagedOption<StaticApi, BigUint<StaticApi>> =
+        ManagedOption::some(type_number);
+
+    let output = world
+        .tx()
+        .from(OWNER_ADDRESS)
+        .to(BASIC_FEATURES_ADDRESS)
+        .typed(basic_features::basic_features_proxy::BasicFeaturesProxy)
+        .echo_managed_option(expected_type_managed_option.clone())
+        .returns(ReturnsResult)
+        .run();
+
+    assert_eq!(output, expected_type_managed_option);
+}
diff --git a/contracts/feature-tests/basic-features/wasm/src/lib.rs b/contracts/feature-tests/basic-features/wasm/src/lib.rs
index 887b75bcd5..18cd29cd68 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:                          403
+// Endpoints:                          404
 // Async Callback:                       1
-// Total number of exported functions: 405
+// Total number of exported functions: 406
 
 #![no_std]
 
@@ -169,6 +169,7 @@ multiversx_sc_wasm_adapter::endpoints! {
         echo_big_int => echo_big_int
         echo_managed_buffer => echo_managed_buffer
         echo_managed_address => echo_managed_address
+        echo_managed_option => echo_managed_option
         echo_big_int_managed_vec => echo_big_int_managed_vec
         echo_big_int_tuple => echo_big_int_tuple
         echo_big_int_option => echo_big_int_option
diff --git a/contracts/feature-tests/rust-testing-framework-tester/src/lib.rs b/contracts/feature-tests/rust-testing-framework-tester/src/lib.rs
index d40eac5613..ad3766e123 100644
--- a/contracts/feature-tests/rust-testing-framework-tester/src/lib.rs
+++ b/contracts/feature-tests/rust-testing-framework-tester/src/lib.rs
@@ -229,15 +229,6 @@ pub trait RustTestingFrameworkTester: dummy_module::DummyModule {
         sc_panic!("Oh no!");
     }
 
-    /// Tests how is generated type name in proxy
-    #[endpoint]
-    fn type_managed_option(
-        &self,
-        managed_option: ManagedOption<BigUint>,
-    ) -> ManagedOption<BigUint> {
-        managed_option
-    }
-
     fn get_val(&self) -> BigUint {
         self.total_value().get()
     }
diff --git a/contracts/feature-tests/rust-testing-framework-tester/src/rust_testing_framework_tester_proxy.rs b/contracts/feature-tests/rust-testing-framework-tester/src/rust_testing_framework_tester_proxy.rs
index 13cb9b49e5..c2901b7b47 100644
--- a/contracts/feature-tests/rust-testing-framework-tester/src/rust_testing_framework_tester_proxy.rs
+++ b/contracts/feature-tests/rust-testing-framework-tester/src/rust_testing_framework_tester_proxy.rs
@@ -385,19 +385,6 @@ where
             .raw_call("panic")
             .original_result()
     }
-
-    pub fn type_managed_option<
-        Arg0: ProxyArg<ManagedOption<Env::Api, BigUint<Env::Api>>>,
-    >(
-        self,
-        managed_option: Arg0,
-    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ManagedOption<Env::Api, BigUint<Env::Api>>> {
-        self.wrapped_tx
-            .payment(NotPayable)
-            .raw_call("type_managed_option")
-            .argument(&managed_option)
-            .original_result()
-    }
 }
 
 #[type_abi]
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 4ecb618355..8c16b5bd9e 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
@@ -45,31 +45,6 @@ fn tester_deploy_test() {
     world.write_scenario_trace("scenarios/trace-deploy.scen.json");
 }
 
-#[test]
-fn tester_managed_option_test() {
-    let mut world = world();
-
-    world.start_trace();
-
-    let (_, contract_address) = deploy(&mut world);
-
-    let type_number: BigUint<StaticApi> = BigUint::zero();
-    let expected_type_managed_option: ManagedOption<StaticApi, BigUint<StaticApi>> =
-        ManagedOption::some(type_number);
-
-    let output = world
-        .tx()
-        .from(OWNER_ADDRESS)
-        .to(contract_address)
-        .typed(rust_testing_framework_tester_proxy::RustTestingFrameworkTesterProxy)
-        .type_managed_option(expected_type_managed_option.clone())
-        .returns(ReturnsResult)
-        .run();
-
-    assert_eq!(output, expected_type_managed_option);
-    world.write_scenario_trace("scenarios/trace-deploy.scen.json");
-}
-
 #[test]
 fn tester_deploy_test_spawned_thread() {
     let handler = std::thread::spawn(|| {
diff --git a/contracts/feature-tests/rust-testing-framework-tester/wasm/src/lib.rs b/contracts/feature-tests/rust-testing-framework-tester/wasm/src/lib.rs
index 2c9fc57d28..3943837d34 100644
--- a/contracts/feature-tests/rust-testing-framework-tester/wasm/src/lib.rs
+++ b/contracts/feature-tests/rust-testing-framework-tester/wasm/src/lib.rs
@@ -5,9 +5,9 @@
 ////////////////////////////////////////////////////
 
 // Init:                                 1
-// Endpoints:                           27
+// Endpoints:                           26
 // Async Callback:                       1
-// Total number of exported functions:  29
+// Total number of exported functions:  28
 
 #![no_std]
 
@@ -44,7 +44,6 @@ multiversx_sc_wasm_adapter::endpoints! {
         execute_on_dest_add_value => execute_on_dest_add_value
         addValue => add
         panic => panic
-        type_managed_option => type_managed_option
     )
 }
 

From d235aeb96d8752705c200ed5404db7af8473d0af Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Mon, 19 Aug 2024 17:17:21 +0300
Subject: [PATCH 1171/1254] proxy gen - revert rust-testing-framework-tester
 upgrade

---
 .../sc-config.toml                            |   3 -
 .../src/dummy_module.rs                       |   2 +
 .../rust-testing-framework-tester/src/lib.rs  |   7 +-
 .../rust_testing_framework_tester_proxy.rs    | 395 ------------------
 .../tests/tester_blackbox_test.rs             |  88 ++--
 5 files changed, 56 insertions(+), 439 deletions(-)
 delete mode 100644 contracts/feature-tests/rust-testing-framework-tester/src/rust_testing_framework_tester_proxy.rs

diff --git a/contracts/feature-tests/rust-testing-framework-tester/sc-config.toml b/contracts/feature-tests/rust-testing-framework-tester/sc-config.toml
index c33c94d1ab..330cdda658 100644
--- a/contracts/feature-tests/rust-testing-framework-tester/sc-config.toml
+++ b/contracts/feature-tests/rust-testing-framework-tester/sc-config.toml
@@ -4,6 +4,3 @@ main = "rust-testing-framework-tester"
 # the only purpose of this config is to specify the allocator
 [contracts.rust-testing-framework-tester]
 allocator = "static64k"
-
-[[proxy]]
-path = "src/rust_testing_framework_tester_proxy.rs"
diff --git a/contracts/feature-tests/rust-testing-framework-tester/src/dummy_module.rs b/contracts/feature-tests/rust-testing-framework-tester/src/dummy_module.rs
index 7db5c9379d..76721a8fc4 100644
--- a/contracts/feature-tests/rust-testing-framework-tester/src/dummy_module.rs
+++ b/contracts/feature-tests/rust-testing-framework-tester/src/dummy_module.rs
@@ -1,3 +1,5 @@
+multiversx_sc::imports!();
+
 #[multiversx_sc::module]
 pub trait DummyModule {
     fn some_function(&self) -> BigUint {
diff --git a/contracts/feature-tests/rust-testing-framework-tester/src/lib.rs b/contracts/feature-tests/rust-testing-framework-tester/src/lib.rs
index ad3766e123..4133f3f039 100644
--- a/contracts/feature-tests/rust-testing-framework-tester/src/lib.rs
+++ b/contracts/feature-tests/rust-testing-framework-tester/src/lib.rs
@@ -1,12 +1,11 @@
 #![no_std]
 
-use multiversx_sc::proxy_imports::*;
+multiversx_sc::imports!();
+multiversx_sc::derive_imports!();
 
 pub mod dummy_module;
-pub mod rust_testing_framework_tester_proxy;
 
-#[type_abi]
-#[derive(TopEncode, TopDecode, Clone, Debug, PartialEq, Eq)]
+#[derive(TopEncode, TopDecode, TypeAbi, Clone, Debug, PartialEq, Eq)]
 pub struct NftDummyAttributes {
     pub creation_epoch: u64,
     pub cool_factor: u8,
diff --git a/contracts/feature-tests/rust-testing-framework-tester/src/rust_testing_framework_tester_proxy.rs b/contracts/feature-tests/rust-testing-framework-tester/src/rust_testing_framework_tester_proxy.rs
deleted file mode 100644
index c2901b7b47..0000000000
--- a/contracts/feature-tests/rust-testing-framework-tester/src/rust_testing_framework_tester_proxy.rs
+++ /dev/null
@@ -1,395 +0,0 @@
-// Code generated by the multiversx-sc proxy generator. DO NOT EDIT.
-
-////////////////////////////////////////////////////
-////////////////// AUTO-GENERATED //////////////////
-////////////////////////////////////////////////////
-
-#![allow(dead_code)]
-#![allow(clippy::all)]
-
-use multiversx_sc::proxy_imports::*;
-
-pub struct RustTestingFrameworkTesterProxy;
-
-impl<Env, From, To, Gas> TxProxyTrait<Env, From, To, Gas> for RustTestingFrameworkTesterProxy
-where
-    Env: TxEnv,
-    From: TxFrom<Env>,
-    To: TxTo<Env>,
-    Gas: TxGas<Env>,
-{
-    type TxProxyMethods = RustTestingFrameworkTesterProxyMethods<Env, From, To, Gas>;
-
-    fn proxy_methods(self, tx: Tx<Env, From, To, (), Gas, (), ()>) -> Self::TxProxyMethods {
-        RustTestingFrameworkTesterProxyMethods { wrapped_tx: tx }
-    }
-}
-
-pub struct RustTestingFrameworkTesterProxyMethods<Env, From, To, Gas>
-where
-    Env: TxEnv,
-    From: TxFrom<Env>,
-    To: TxTo<Env>,
-    Gas: TxGas<Env>,
-{
-    wrapped_tx: Tx<Env, From, To, (), Gas, (), ()>,
-}
-
-#[rustfmt::skip]
-impl<Env, From, Gas> RustTestingFrameworkTesterProxyMethods<Env, From, (), Gas>
-where
-    Env: TxEnv,
-    Env::Api: VMApi,
-    From: TxFrom<Env>,
-    Gas: TxGas<Env>,
-{
-    pub fn init(
-        self,
-    ) -> TxTypedDeploy<Env, From, NotPayable, Gas, ManagedBuffer<Env::Api>> {
-        self.wrapped_tx
-            .payment(NotPayable)
-            .raw_deploy()
-            .original_result()
-    }
-}
-
-#[rustfmt::skip]
-impl<Env, From, To, Gas> RustTestingFrameworkTesterProxyMethods<Env, From, To, Gas>
-where
-    Env: TxEnv,
-    Env::Api: VMApi,
-    From: TxFrom<Env>,
-    To: TxTo<Env>,
-    Gas: TxGas<Env>,
-{
-    pub fn sum<
-        Arg0: ProxyArg<BigUint<Env::Api>>,
-        Arg1: ProxyArg<BigUint<Env::Api>>,
-    >(
-        self,
-        first: Arg0,
-        second: Arg1,
-    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, BigUint<Env::Api>> {
-        self.wrapped_tx
-            .payment(NotPayable)
-            .raw_call("sum")
-            .argument(&first)
-            .argument(&second)
-            .original_result()
-    }
-
-    pub fn sum_sc_result<
-        Arg0: ProxyArg<BigUint<Env::Api>>,
-        Arg1: ProxyArg<BigUint<Env::Api>>,
-    >(
-        self,
-        first: Arg0,
-        second: Arg1,
-    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, BigUint<Env::Api>> {
-        self.wrapped_tx
-            .payment(NotPayable)
-            .raw_call("sum_sc_result")
-            .argument(&first)
-            .argument(&second)
-            .original_result()
-    }
-
-    pub fn get_caller_legacy(
-        self,
-    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, Address> {
-        self.wrapped_tx
-            .payment(NotPayable)
-            .raw_call("get_caller_legacy")
-            .original_result()
-    }
-
-    pub fn get_egld_balance(
-        self,
-    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, BigUint<Env::Api>> {
-        self.wrapped_tx
-            .payment(NotPayable)
-            .raw_call("get_egld_balance")
-            .original_result()
-    }
-
-    pub fn get_esdt_balance<
-        Arg0: ProxyArg<TokenIdentifier<Env::Api>>,
-        Arg1: ProxyArg<u64>,
-    >(
-        self,
-        token_id: Arg0,
-        nonce: Arg1,
-    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, BigUint<Env::Api>> {
-        self.wrapped_tx
-            .payment(NotPayable)
-            .raw_call("get_esdt_balance")
-            .argument(&token_id)
-            .argument(&nonce)
-            .original_result()
-    }
-
-    pub fn receive_egld(
-        self,
-    ) -> TxTypedCall<Env, From, To, (), Gas, BigUint<Env::Api>> {
-        self.wrapped_tx
-            .raw_call("receive_egld")
-            .original_result()
-    }
-
-    pub fn recieve_egld_half(
-        self,
-    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
-        self.wrapped_tx
-            .raw_call("recieve_egld_half")
-            .original_result()
-    }
-
-    pub fn receive_esdt(
-        self,
-    ) -> TxTypedCall<Env, From, To, (), Gas, (TokenIdentifier<Env::Api>, BigUint<Env::Api>)> {
-        self.wrapped_tx
-            .raw_call("receive_esdt")
-            .original_result()
-    }
-
-    pub fn reject_payment(
-        self,
-    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
-        self.wrapped_tx
-            .raw_call("reject_payment")
-            .original_result()
-    }
-
-    pub fn receive_esdt_half(
-        self,
-    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
-        self.wrapped_tx
-            .raw_call("receive_esdt_half")
-            .original_result()
-    }
-
-    pub fn receive_multi_esdt(
-        self,
-    ) -> TxTypedCall<Env, From, To, (), Gas, ManagedVec<Env::Api, EsdtTokenPayment<Env::Api>>> {
-        self.wrapped_tx
-            .raw_call("receive_multi_esdt")
-            .original_result()
-    }
-
-    pub fn send_nft<
-        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
-        Arg1: ProxyArg<TokenIdentifier<Env::Api>>,
-        Arg2: ProxyArg<u64>,
-        Arg3: ProxyArg<BigUint<Env::Api>>,
-    >(
-        self,
-        to: Arg0,
-        token_id: Arg1,
-        nft_nonce: Arg2,
-        amount: Arg3,
-    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
-        self.wrapped_tx
-            .raw_call("send_nft")
-            .argument(&to)
-            .argument(&token_id)
-            .argument(&nft_nonce)
-            .argument(&amount)
-            .original_result()
-    }
-
-    pub fn mint_esdt<
-        Arg0: ProxyArg<TokenIdentifier<Env::Api>>,
-        Arg1: ProxyArg<u64>,
-        Arg2: ProxyArg<BigUint<Env::Api>>,
-    >(
-        self,
-        token_id: Arg0,
-        nonce: Arg1,
-        amount: Arg2,
-    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
-        self.wrapped_tx
-            .payment(NotPayable)
-            .raw_call("mint_esdt")
-            .argument(&token_id)
-            .argument(&nonce)
-            .argument(&amount)
-            .original_result()
-    }
-
-    pub fn burn_esdt<
-        Arg0: ProxyArg<TokenIdentifier<Env::Api>>,
-        Arg1: ProxyArg<u64>,
-        Arg2: ProxyArg<BigUint<Env::Api>>,
-    >(
-        self,
-        token_id: Arg0,
-        nonce: Arg1,
-        amount: Arg2,
-    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
-        self.wrapped_tx
-            .payment(NotPayable)
-            .raw_call("burn_esdt")
-            .argument(&token_id)
-            .argument(&nonce)
-            .argument(&amount)
-            .original_result()
-    }
-
-    pub fn create_nft<
-        Arg0: ProxyArg<TokenIdentifier<Env::Api>>,
-        Arg1: ProxyArg<BigUint<Env::Api>>,
-        Arg2: ProxyArg<NftDummyAttributes>,
-    >(
-        self,
-        token_id: Arg0,
-        amount: Arg1,
-        attributes: Arg2,
-    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, u64> {
-        self.wrapped_tx
-            .payment(NotPayable)
-            .raw_call("create_nft")
-            .argument(&token_id)
-            .argument(&amount)
-            .argument(&attributes)
-            .original_result()
-    }
-
-    pub fn get_block_epoch(
-        self,
-    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, u64> {
-        self.wrapped_tx
-            .payment(NotPayable)
-            .raw_call("get_block_epoch")
-            .original_result()
-    }
-
-    pub fn get_block_nonce(
-        self,
-    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, u64> {
-        self.wrapped_tx
-            .payment(NotPayable)
-            .raw_call("get_block_nonce")
-            .original_result()
-    }
-
-    pub fn get_block_timestamp(
-        self,
-    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, u64> {
-        self.wrapped_tx
-            .payment(NotPayable)
-            .raw_call("get_block_timestamp")
-            .original_result()
-    }
-
-    pub fn get_random_buffer_once<
-        Arg0: ProxyArg<usize>,
-    >(
-        self,
-        len: Arg0,
-    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ManagedBuffer<Env::Api>> {
-        self.wrapped_tx
-            .payment(NotPayable)
-            .raw_call("get_random_buffer_once")
-            .argument(&len)
-            .original_result()
-    }
-
-    pub fn get_random_buffer_twice<
-        Arg0: ProxyArg<usize>,
-        Arg1: ProxyArg<usize>,
-    >(
-        self,
-        len1: Arg0,
-        len2: Arg1,
-    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, (ManagedBuffer<Env::Api>, ManagedBuffer<Env::Api>)> {
-        self.wrapped_tx
-            .payment(NotPayable)
-            .raw_call("get_random_buffer_twice")
-            .argument(&len1)
-            .argument(&len2)
-            .original_result()
-    }
-
-    pub fn call_other_contract_execute_on_dest<
-        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
-    >(
-        self,
-        other_sc_address: Arg0,
-    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, BigUint<Env::Api>> {
-        self.wrapped_tx
-            .payment(NotPayable)
-            .raw_call("call_other_contract_execute_on_dest")
-            .argument(&other_sc_address)
-            .original_result()
-    }
-
-    pub fn call_other_contract_add_async_call<
-        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
-        Arg1: ProxyArg<BigUint<Env::Api>>,
-    >(
-        self,
-        other_sc_address: Arg0,
-        value: Arg1,
-    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
-        self.wrapped_tx
-            .payment(NotPayable)
-            .raw_call("call_other_contract_add_async_call")
-            .argument(&other_sc_address)
-            .argument(&value)
-            .original_result()
-    }
-
-    pub fn get_total_value(
-        self,
-    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, BigUint<Env::Api>> {
-        self.wrapped_tx
-            .payment(NotPayable)
-            .raw_call("getTotalValue")
-            .original_result()
-    }
-
-    pub fn execute_on_dest_add_value<
-        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
-        Arg1: ProxyArg<BigUint<Env::Api>>,
-    >(
-        self,
-        other_sc_address: Arg0,
-        value: Arg1,
-    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
-        self.wrapped_tx
-            .payment(NotPayable)
-            .raw_call("execute_on_dest_add_value")
-            .argument(&other_sc_address)
-            .argument(&value)
-            .original_result()
-    }
-
-    pub fn add<
-        Arg0: ProxyArg<BigUint<Env::Api>>,
-    >(
-        self,
-        value: Arg0,
-    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
-        self.wrapped_tx
-            .payment(NotPayable)
-            .raw_call("addValue")
-            .argument(&value)
-            .original_result()
-    }
-
-    pub fn panic(
-        self,
-    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
-        self.wrapped_tx
-            .payment(NotPayable)
-            .raw_call("panic")
-            .original_result()
-    }
-}
-
-#[type_abi]
-#[derive(TopEncode, TopDecode, Clone, Debug, PartialEq, Eq)]
-pub struct NftDummyAttributes {
-    pub creation_epoch: u64,
-    pub cool_factor: u8,
-}
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 8c16b5bd9e..afdabb5199 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,62 +1,76 @@
 use multiversx_sc_scenario::imports::*;
 use rust_testing_framework_tester::*;
 
-const CODE_PATH: MxscPath = MxscPath::new("output/rust-testing-framework-tester.mxsc.json");
-const OWNER_ADDRESS: TestAddress = TestAddress::new("owner");
-const RUST_TESTING_FRAMEWORK_TESTER_ADDRESS: TestSCAddress =
-    TestSCAddress::new("rust-testing-framework-tester");
+const WASM_PATH_EXPR: &str = "mxsc:output/rust-testing-framework-tester.mxsc.json";
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
-    blockchain.register_contract(CODE_PATH, rust_testing_framework_tester::ContractBuilder);
-    blockchain
-}
-
-fn deploy(world: &mut ScenarioWorld) -> (ManagedBuffer<StaticApi>, Address) {
-    world.account(OWNER_ADDRESS).new_address(
-        OWNER_ADDRESS,
-        0,
-        RUST_TESTING_FRAMEWORK_TESTER_ADDRESS,
+    blockchain.register_contract(
+        WASM_PATH_EXPR,
+        rust_testing_framework_tester::ContractBuilder,
     );
-
-    world
-        .tx()
-        .from(OWNER_ADDRESS)
-        .typed(rust_testing_framework_tester_proxy::RustTestingFrameworkTesterProxy)
-        .init()
-        .code(CODE_PATH)
-        .returns(ReturnsResult)
-        .new_address(RUST_TESTING_FRAMEWORK_TESTER_ADDRESS)
-        .returns(ReturnsNewAddress)
-        .run()
+    blockchain
 }
 
 #[test]
+#[allow(deprecated)]
 fn tester_deploy_test() {
     let mut world = world();
+    let code = world.code_expression(WASM_PATH_EXPR);
 
-    world.start_trace();
-
-    let (returned_value, contract_address) = deploy(&mut world);
-
-    assert_eq!(returned_value.to_string(), "constructor-result");
-    assert_eq!(contract_address, RUST_TESTING_FRAMEWORK_TESTER_ADDRESS);
+    let owner_address = "address:owner";
+    let mut adder_contract =
+        ContractInfo::<rust_testing_framework_tester::Proxy<StaticApi>>::new("sc:contract");
 
-    world.write_scenario_trace("scenarios/trace-deploy.scen.json");
+    world
+        .start_trace()
+        .set_state_step(
+            SetStateStep::new()
+                .put_account(owner_address, Account::new())
+                .new_address(owner_address, 0, &adder_contract),
+        )
+        .sc_deploy_use_result(
+            ScDeployStep::new()
+                .from(owner_address)
+                .code(code)
+                .call(adder_contract.init()),
+            |address, tr: TypedResponse<String>| {
+                assert_eq!(address, adder_contract.to_address());
+                assert_eq!(tr.result.unwrap(), "constructor-result");
+            },
+        )
+        .write_scenario_trace("scenarios/trace-deploy.scen.json");
 }
 
 #[test]
+#[allow(deprecated)]
 fn tester_deploy_test_spawned_thread() {
     let handler = std::thread::spawn(|| {
         let mut world = world();
+        let code = world.code_expression(WASM_PATH_EXPR);
 
-        world.start_trace();
-        let (returned_value, contract_address) = deploy(&mut world);
-
-        assert_eq!(returned_value.to_string(), "constructor-result");
-        assert_eq!(contract_address, RUST_TESTING_FRAMEWORK_TESTER_ADDRESS);
+        let owner_address = "address:owner";
+        let mut adder_contract =
+            ContractInfo::<rust_testing_framework_tester::Proxy<StaticApi>>::new("sc:contract");
 
-        world.write_scenario_trace("scenarios/trace-deploy.scen.json");
+        world
+            .start_trace()
+            .set_state_step(
+                SetStateStep::new()
+                    .put_account(owner_address, Account::new())
+                    .new_address(owner_address, 0, &adder_contract),
+            )
+            .sc_deploy_use_result(
+                ScDeployStep::new()
+                    .from(owner_address)
+                    .code(code)
+                    .call(adder_contract.init()),
+                |address, tr: TypedResponse<String>| {
+                    assert_eq!(address, adder_contract.to_address());
+                    assert_eq!(tr.result.unwrap(), "constructor-result");
+                },
+            )
+            .write_scenario_trace("scenarios/trace-deploy.scen.json");
     });
 
     handler.join().unwrap();

From 43a99d8c92286b2e3cfd04fafecf8131b2297005 Mon Sep 17 00:00:00 2001
From: Andrei Vasilescu <vasilescuandrei24@gmail.com>
Date: Wed, 14 Aug 2024 20:19:29 +0300
Subject: [PATCH 1172/1254] keystore signing done

---
 Cargo.lock                    | 100 +++++++++++++++++++++++++++----
 sdk/core/Cargo.toml           |   3 +
 sdk/core/src/data/keystore.rs |  35 +++++++++++
 sdk/core/src/data/mod.rs      |   1 +
 sdk/core/src/wallet.rs        | 110 ++++++++++++++++++++++++++++++++--
 5 files changed, 231 insertions(+), 18 deletions(-)
 create mode 100644 sdk/core/src/data/keystore.rs

diff --git a/Cargo.lock b/Cargo.lock
index 08f2acc6ae..f0558fc8b1 100755
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -60,6 +60,17 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
 
+[[package]]
+name = "aes"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0"
+dependencies = [
+ "cfg-if",
+ "cipher",
+ "cpufeatures",
+]
+
 [[package]]
 name = "ahash"
 version = "0.8.11"
@@ -197,15 +208,15 @@ dependencies = [
 
 [[package]]
 name = "base64"
-version = "0.13.1"
+version = "0.22.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
+checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
 
 [[package]]
-name = "base64"
-version = "0.22.1"
+name = "base64ct"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
+checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b"
 
 [[package]]
 name = "basic-features"
@@ -435,6 +446,16 @@ dependencies = [
  "multiversx-sc-meta-lib",
 ]
 
+[[package]]
+name = "cipher"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad"
+dependencies = [
+ "crypto-common",
+ "inout",
+]
+
 [[package]]
 name = "clap"
 version = "4.5.11"
@@ -670,6 +691,15 @@ dependencies = [
  "multiversx-sc-meta-lib",
 ]
 
+[[package]]
+name = "ctr"
+version = "0.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835"
+dependencies = [
+ "cipher",
+]
+
 [[package]]
 name = "curve25519-dalek"
 version = "3.2.0"
@@ -1527,6 +1557,15 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "inout"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5"
+dependencies = [
+ "generic-array",
+]
+
 [[package]]
 name = "interact"
 version = "0.0.0"
@@ -1994,7 +2033,7 @@ dependencies = [
 name = "multiversx-sc-meta"
 version = "0.52.3"
 dependencies = [
- "base64 0.13.1",
+ "bip39",
  "clap",
  "colored",
  "common-path",
@@ -2003,7 +2042,6 @@ dependencies = [
  "multiversx-sc",
  "multiversx-sc-meta-lib",
  "multiversx-sc-snippets",
- "multiversx-sdk",
  "pathdiff",
  "reqwest",
  "ruplacer",
@@ -2045,7 +2083,7 @@ dependencies = [
 name = "multiversx-sc-scenario"
 version = "0.52.3"
 dependencies = [
- "base64 0.22.1",
+ "base64",
  "bech32",
  "colored",
  "hex",
@@ -2069,7 +2107,7 @@ dependencies = [
 name = "multiversx-sc-snippets"
 version = "0.52.3"
 dependencies = [
- "base64 0.22.1",
+ "base64",
  "env_logger",
  "futures",
  "hex",
@@ -2092,10 +2130,12 @@ dependencies = [
 name = "multiversx-sdk"
 version = "0.5.0"
 dependencies = [
+ "aes",
  "anyhow",
- "base64 0.22.1",
+ "base64",
  "bech32",
  "bip39",
+ "ctr",
  "hex",
  "hmac",
  "itertools",
@@ -2104,6 +2144,7 @@ dependencies = [
  "pem",
  "rand 0.8.5",
  "reqwest",
+ "scrypt",
  "serde",
  "serde_json",
  "serde_repr",
@@ -2390,6 +2431,17 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
+[[package]]
+name = "password-hash"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "346f04948ba92c43e8469c1ee6736c7563d71012b17d40745260fe106aac2166"
+dependencies = [
+ "base64ct",
+ "rand_core 0.6.4",
+ "subtle",
+]
+
 [[package]]
 name = "pathdiff"
 version = "0.2.1"
@@ -2423,6 +2475,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2"
 dependencies = [
  "digest 0.10.7",
+ "hmac",
 ]
 
 [[package]]
@@ -2431,7 +2484,7 @@ version = "3.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8e459365e590736a54c3fa561947c84837534b8e9af6fc5bf781307e82658fae"
 dependencies = [
- "base64 0.22.1",
+ "base64",
  "serde",
 ]
 
@@ -2763,7 +2816,7 @@ version = "0.12.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c7d6d2a27d57148378eb5e111173f4276ad26340ecc5c49a4a2152167a2d6a37"
 dependencies = [
- "base64 0.22.1",
+ "base64",
  "bytes",
  "encoding_rs",
  "futures-channel",
@@ -2933,7 +2986,7 @@ version = "2.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d"
 dependencies = [
- "base64 0.22.1",
+ "base64",
  "rustls-pki-types",
 ]
 
@@ -2960,6 +3013,15 @@ version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
 
+[[package]]
+name = "salsa20"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97a22f5af31f73a954c10289c93e8a50cc23d971e80ee446f1f6f7137a088213"
+dependencies = [
+ "cipher",
+]
+
 [[package]]
 name = "same-file"
 version = "1.0.6"
@@ -3000,6 +3062,18 @@ version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
+[[package]]
+name = "scrypt"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0516a385866c09368f0b5bcd1caff3366aace790fcd46e2bb032697bb172fd1f"
+dependencies = [
+ "password-hash",
+ "pbkdf2",
+ "salsa20",
+ "sha2 0.10.8",
+]
+
 [[package]]
 name = "second-contract"
 version = "0.0.0"
diff --git a/sdk/core/Cargo.toml b/sdk/core/Cargo.toml
index 463b4ce130..32e170618f 100644
--- a/sdk/core/Cargo.toml
+++ b/sdk/core/Cargo.toml
@@ -35,3 +35,6 @@ bech32 = "0.9"
 itertools = "0.13.0"
 pem = "3.0.2"
 log = "0.4.17"
+scrypt = "0.11"
+aes = "0.8"
+ctr = "0.9.2"
\ No newline at end of file
diff --git a/sdk/core/src/data/keystore.rs b/sdk/core/src/data/keystore.rs
new file mode 100644
index 0000000000..fd3a618ce7
--- /dev/null
+++ b/sdk/core/src/data/keystore.rs
@@ -0,0 +1,35 @@
+use serde::{Deserialize, Serialize};
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct CryptoParams {
+    pub iv: String,
+}
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct KdfParams {
+    pub dklen: u32,
+    pub salt: String,
+    pub n: u32,
+    pub r: u32,
+    pub p: u32,
+}
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct Crypto {
+    pub ciphertext: String,
+    pub cipherparams: CryptoParams,
+    pub cipher: String,
+    pub kdf: String,
+    pub kdfparams: KdfParams,
+    pub mac: String,
+}
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct Keystore {
+    pub version: u32,
+    pub kind: String,
+    pub id: String,
+    pub address: String,
+    pub bech32: String,
+    pub crypto: Crypto,
+}
\ No newline at end of file
diff --git a/sdk/core/src/data/mod.rs b/sdk/core/src/data/mod.rs
index 797ec6e1ce..9a270211df 100644
--- a/sdk/core/src/data/mod.rs
+++ b/sdk/core/src/data/mod.rs
@@ -3,6 +3,7 @@ pub mod account_storage;
 pub mod address;
 pub mod esdt;
 pub mod hyperblock;
+pub mod keystore;
 pub mod network_config;
 pub mod network_economics;
 pub mod network_status;
diff --git a/sdk/core/src/wallet.rs b/sdk/core/src/wallet.rs
index ab1b0a2f37..0519c0413d 100644
--- a/sdk/core/src/wallet.rs
+++ b/sdk/core/src/wallet.rs
@@ -1,11 +1,19 @@
 extern crate rand;
 
+use std::{
+    fs::{self},
+    io::{self, Read},
+};
+
+use aes::{cipher::KeyIvInit, Aes128};
 use anyhow::Result;
 use bip39::{Language, Mnemonic};
+use ctr::{cipher::StreamCipher, Ctr128BE};
 use hmac::{Hmac, Mac};
 use pbkdf2::pbkdf2;
+use scrypt::{scrypt, Params};
 use serde_json::json;
-use sha2::{Digest, Sha512};
+use sha2::{Digest, Sha256, Sha512};
 use sha3::Keccak256;
 use zeroize::Zeroize;
 
@@ -14,19 +22,36 @@ use crate::{
         private_key::{PrivateKey, PRIVATE_KEY_LENGTH},
         public_key::PublicKey,
     },
-    data::{address::Address, transaction::Transaction},
+    data::{address::Address, keystore::Keystore, transaction::Transaction},
 };
 
 const EGLD_COIN_TYPE: u32 = 508;
 const HARDENED: u32 = 0x80000000;
+const CIPHER_ALGORITHM_AES_128_CTR: &str = "aes-128-ctr";
+const KDF_SCRYPT: &str = "scrypt";
 
-type HmacSha521 = Hmac<Sha512>;
+type HmacSha512 = Hmac<Sha512>;
+type HmacSha256 = Hmac<Sha256>;
 
 #[derive(Copy, Clone, Debug)]
 pub struct Wallet {
     priv_key: PrivateKey,
 }
 
+#[derive(Clone, Debug)]
+pub struct DecryptionParams {
+    pub derived_key_first_half: Vec<u8>,
+    pub iv: Vec<u8>,
+    pub ciphertext: Vec<u8>,
+}
+
+#[derive(Debug)]
+pub enum WalletError {
+    InvalidPassword,
+    InvalidKdf,
+    InvalidCipher,
+}
+
 impl Wallet {
     // GenerateMnemonic will generate a new mnemonic value using the bip39 implementation
     pub fn generate_mnemonic() -> Mnemonic {
@@ -63,7 +88,7 @@ impl Wallet {
         let hardened_child_padding: u8 = 0;
 
         let mut digest =
-            HmacSha521::new_from_slice(b"ed25519 seed").expect("HMAC can take key of any size");
+            HmacSha512::new_from_slice(b"ed25519 seed").expect("HMAC can take key of any size");
         digest.update(&seed);
         let intermediary: Vec<u8> = digest.finalize().into_bytes().into_iter().collect();
         let mut key = intermediary[..serialized_key_len].to_vec();
@@ -83,7 +108,7 @@ impl Wallet {
             buff.push(child_idx as u8);
 
             digest =
-                HmacSha521::new_from_slice(&chain_code).expect("HMAC can take key of any size");
+                HmacSha512::new_from_slice(&chain_code).expect("HMAC can take key of any size");
             digest.update(&buff);
             let intermediary: Vec<u8> = digest.finalize().into_bytes().into_iter().collect();
             key = intermediary[..serialized_key_len].to_vec();
@@ -111,6 +136,15 @@ impl Wallet {
         Ok(Self { priv_key: pri_key })
     }
 
+    pub fn from_keystore_secret(file_path: &str) -> Result<Self> {
+        let decyption_params = Self::validate_keystore_password(file_path).unwrap_or_else(|e| {
+            panic!("Error: {:?}", e);
+        });
+        let priv_key =
+            PrivateKey::from_hex_str(Self::decrypt_secret_key(decyption_params).as_str())?;
+        Ok(Self { priv_key })
+    }
+
     pub fn address(&self) -> Address {
         let public_key = PublicKey::from(&self.priv_key);
         Address::from(&public_key)
@@ -131,4 +165,70 @@ impl Wallet {
 
         self.priv_key.sign(tx_bytes)
     }
+
+    pub fn validate_keystore_password(path: &str) -> Result<DecryptionParams, WalletError> {
+        println!(
+            "Insert password. Press 'Ctrl-D' (Linux / MacOS) or 'Ctrl-Z' (Windows) when done."
+        );
+        let mut password = String::new();
+        io::stdin().read_to_string(&mut password).unwrap();
+        password = password.trim().to_string();
+
+        let json_body = fs::read_to_string(path).unwrap();
+        let keystore: Keystore = serde_json::from_str(&json_body).unwrap();
+        let ciphertext = hex::decode(&keystore.crypto.ciphertext).unwrap();
+
+        let cipher = &keystore.crypto.cipher;
+        if cipher != CIPHER_ALGORITHM_AES_128_CTR {
+            return Err(WalletError::InvalidCipher);
+        }
+
+        let iv = hex::decode(&keystore.crypto.cipherparams.iv).unwrap();
+        let salt = hex::decode(&keystore.crypto.kdfparams.salt).unwrap();
+        let json_mac = hex::decode(&keystore.crypto.mac).unwrap();
+
+        let kdf = &keystore.crypto.kdf;
+        if kdf != KDF_SCRYPT {
+            return Err(WalletError::InvalidKdf);
+        }
+        let n = keystore.crypto.kdfparams.n as f64;
+        let r = keystore.crypto.kdfparams.r as u64;
+        let p = keystore.crypto.kdfparams.p as u64;
+        let dklen = keystore.crypto.kdfparams.dklen as usize;
+
+        let params = Params::new(n.log2() as u8, r as u32, p as u32, dklen).unwrap();
+
+        let mut derived_key = vec![0u8; 32];
+        scrypt(password.as_bytes(), &salt, &params, &mut derived_key).unwrap();
+
+        let derived_key_first_half = derived_key[0..16].to_vec();
+        let derived_key_second_half = derived_key[16..32].to_vec();
+
+        let mut input_mac = HmacSha256::new_from_slice(&derived_key_second_half).unwrap();
+        input_mac.update(&ciphertext);
+        let computed_mac = input_mac.finalize().into_bytes();
+
+        if computed_mac.as_slice() == json_mac.as_slice() {
+            println!("Password is correct");
+            Ok(DecryptionParams {
+                derived_key_first_half,
+                iv,
+                ciphertext,
+            })
+        } else {
+            println!("Password is incorrect");
+            Err(WalletError::InvalidPassword)
+        }
+    }
+
+    pub fn decrypt_secret_key(decryption_params: DecryptionParams) -> String {
+        let mut cipher = Ctr128BE::<Aes128>::new(
+            decryption_params.derived_key_first_half.as_slice().into(),
+            decryption_params.iv.as_slice().into(),
+        );
+        let mut decrypted = decryption_params.ciphertext.to_vec();
+        cipher.apply_keystream(&mut decrypted);
+
+        hex::encode(decrypted).to_string()
+    }
 }

From 695f622fc4b3aaab4f3d66964ec51ce5d942dd46 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Mon, 19 Aug 2024 20:32:53 +0200
Subject: [PATCH 1173/1254] whitebox migration to unified for adder, scenario
 tester and staking module

---
 .../adder/tests/adder_whitebox_test.rs        |  39 --
 .../scenario-tester/tests/st_whitebox_test.rs |  64 +-
 .../tests/staking_module_whitebox_test.rs     | 659 ++++++++----------
 3 files changed, 321 insertions(+), 441 deletions(-)

diff --git a/contracts/examples/adder/tests/adder_whitebox_test.rs b/contracts/examples/adder/tests/adder_whitebox_test.rs
index 215f1647d2..c609b08302 100644
--- a/contracts/examples/adder/tests/adder_whitebox_test.rs
+++ b/contracts/examples/adder/tests/adder_whitebox_test.rs
@@ -1,7 +1,6 @@
 use adder::*;
 use multiversx_sc_scenario::imports::*;
 
-const ADDER_PATH_EXPR: &str = "mxsc:output/adder.mxsc.json";
 const OWNER: TestAddress = TestAddress::new("owner");
 const ADDER_ADDRESS: TestSCAddress = TestSCAddress::new("adder");
 const CODE_PATH: MxscPath = MxscPath::new("mxsc:output/adder.mxsc.json");
@@ -16,44 +15,6 @@ fn world() -> ScenarioWorld {
 #[test]
 fn adder_whitebox() {
     let mut world = world();
-    let adder_whitebox = WhiteboxContract::new("sc:adder", adder::contract_obj);
-    let adder_code = world.code_expression(ADDER_PATH_EXPR);
-
-    world
-        .set_state_step(
-            SetStateStep::new()
-                .put_account("address:owner", Account::new().nonce(1))
-                .new_address("address:owner", 1, "sc:adder"),
-        )
-        .whitebox_deploy(
-            &adder_whitebox,
-            ScDeployStep::new().from("address:owner").code(adder_code),
-            |sc| {
-                sc.init(5u32.into());
-            },
-        )
-        .whitebox_query(&adder_whitebox, |sc| {
-            let sum_value = sc.sum();
-            assert_eq!(sum_value.get(), 5u32);
-        })
-        .whitebox_call(
-            &adder_whitebox,
-            ScCallStep::new().from("address:owner"),
-            |sc| sc.add(3u32.into()),
-        )
-        .check_state_step(
-            CheckStateStep::new()
-                .put_account("address:owner", CheckAccount::new())
-                .put_account(
-                    "sc:adder",
-                    CheckAccount::new().check_storage("str:sum", "8"),
-                ),
-        );
-}
-
-#[test]
-fn adder_whitebox_unified() {
-    let mut world = world();
 
     world.account(OWNER).nonce(1);
 
diff --git a/contracts/feature-tests/scenario-tester/tests/st_whitebox_test.rs b/contracts/feature-tests/scenario-tester/tests/st_whitebox_test.rs
index a6318b1f7f..61dd6cdc2d 100644
--- a/contracts/feature-tests/scenario-tester/tests/st_whitebox_test.rs
+++ b/contracts/feature-tests/scenario-tester/tests/st_whitebox_test.rs
@@ -1,7 +1,9 @@
 use multiversx_sc_scenario::imports::*;
 use scenario_tester::*;
 
-const ADDER_PATH_EXPR: &str = "mxsc:output/scenario-tester.mxsc.json";
+const ST_PATH_EXPR: MxscPath = MxscPath::new("mxsc:output/scenario-tester.mxsc.json");
+const OWNER: TestAddress = TestAddress::new("owner");
+const SCENARIO_TESTER: TestSCAddress = TestSCAddress::new("scenario-tester");
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
@@ -16,37 +18,37 @@ fn world() -> ScenarioWorld {
 #[test]
 fn st_whitebox() {
     let mut world = world();
-    let st_whitebox = WhiteboxContract::new("sc:adder", scenario_tester::contract_obj);
-    let st_code = world.code_expression(ADDER_PATH_EXPR);
+
+    world.account(OWNER).nonce(1);
+
+    let new_address = world
+        .tx()
+        .from(OWNER)
+        .raw_deploy()
+        .code(ST_PATH_EXPR)
+        .new_address(SCENARIO_TESTER)
+        .returns(ReturnsNewBech32Address)
+        .whitebox(scenario_tester::contract_obj, |sc| {
+            sc.init(BigUint::from(5u64));
+        });
+
+    assert_eq!(new_address.to_address(), SCENARIO_TESTER.to_address());
 
     world
-        .set_state_step(
-            SetStateStep::new()
-                .put_account("address:owner", Account::new().nonce(1))
-                .new_address("address:owner", 1, "sc:adder"),
-        )
-        .whitebox_deploy(
-            &st_whitebox,
-            ScDeployStep::new().from("address:owner").code(st_code),
-            |sc| {
-                sc.init(5u32.into());
-            },
-        )
-        .whitebox_query(&st_whitebox, |sc| {
+        .query()
+        .to(SCENARIO_TESTER)
+        .whitebox(scenario_tester::contract_obj, |sc| {
             let sum_value = sc.sum();
-            assert_eq!(sum_value.get(), 5u32);
-        })
-        .whitebox_call(
-            &st_whitebox,
-            ScCallStep::new().from("address:owner"),
-            |sc| sc.add(3u32.into()),
-        )
-        .check_state_step(
-            CheckStateStep::new()
-                .put_account("address:owner", CheckAccount::new())
-                .put_account(
-                    "sc:adder",
-                    CheckAccount::new().check_storage("str:sum", "8"),
-                ),
-        );
+            assert_eq!(sum_value.get(), BigUint::from(5u32));
+        });
+
+    world
+        .tx()
+        .from(OWNER)
+        .to(SCENARIO_TESTER)
+        .whitebox(scenario_tester::contract_obj, |sc| sc.add(3u32.into()));
+
+    world
+        .check_account(SCENARIO_TESTER)
+        .check_storage("str:sum", "8");
 }
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 612fa725df..0f705ad131 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
@@ -1,23 +1,23 @@
 use multiversx_sc_modules::staking::StakingModule;
 use multiversx_sc_scenario::imports::*;
 
-const STAKING_TOKEN_ID_EXPR: &str = "str:STAKE-123456";
+const STAKING_TOKEN_ID_EXPR: TestTokenIdentifier = TestTokenIdentifier::new("STAKE-123456");
 const STAKING_TOKEN_ID: &[u8] = b"STAKE-123456";
 const INITIAL_BALANCE: u64 = 2_000_000;
 const REQUIRED_STAKE_AMOUNT: u64 = 1_000_000;
 const SLASH_AMOUNT: u64 = 600_000;
 const QUORUM: usize = 3;
 
-const OWNER_ADDRESS_EXPR: &str = "address:owner";
-const ALICE_ADDRESS_EXPR: &str = "address:alice";
-const BOB_ADDRESS_EXPR: &str = "address:bob";
-const CAROL_ADDRESS_EXPR: &str = "address:carol";
-const EVE_ADDRESS_EXPR: &str = "address:eve";
-const PAUL_ADDRESS_EXPR: &str = "address:paul";
-const SALLY_ADDRESS_EXPR: &str = "address:sally";
+const OWNER_ADDRESS: TestAddress = TestAddress::new("owner");
+const ALICE_ADDRESS: TestAddress = TestAddress::new("alice");
+const BOB_ADDRESS: TestAddress = TestAddress::new("bob");
+const CAROL_ADDRESS: TestAddress = TestAddress::new("carol");
+const EVE_ADDRESS: TestAddress = TestAddress::new("eve");
+const PAUL_ADDRESS: TestAddress = TestAddress::new("paul");
+const SALLY_ADDRESS: TestAddress = TestAddress::new("sally");
 
-const USE_MODULE_ADDRESS_EXPR: &str = "sc:use-module";
-const USE_MODULE_PATH_EXPR: &str = "mxsc:output/use-module.mxsc.json";
+const USE_MODULE_ADDRESS: TestSCAddress = TestSCAddress::new("use-module");
+const USE_MODULE_PATH_EXPR: MxscPath = MxscPath::new("mxsc:output/use-module.mxsc.json");
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
@@ -30,447 +30,364 @@ fn world() -> ScenarioWorld {
 fn test_staking_module() {
     let mut world = world();
 
-    world.set_state_step(
-        SetStateStep::new()
-            .put_account(OWNER_ADDRESS_EXPR, Account::new().nonce(1))
-            .new_address(OWNER_ADDRESS_EXPR, 1, USE_MODULE_ADDRESS_EXPR)
-            .put_account(
-                ALICE_ADDRESS_EXPR,
-                Account::new()
-                    .nonce(1)
-                    .esdt_balance(STAKING_TOKEN_ID_EXPR, INITIAL_BALANCE),
-            )
-            .put_account(
-                BOB_ADDRESS_EXPR,
-                Account::new()
-                    .nonce(1)
-                    .esdt_balance(STAKING_TOKEN_ID_EXPR, INITIAL_BALANCE),
-            )
-            .put_account(
-                CAROL_ADDRESS_EXPR,
-                Account::new()
-                    .nonce(1)
-                    .esdt_balance(STAKING_TOKEN_ID_EXPR, INITIAL_BALANCE),
-            )
-            .put_account(
-                EVE_ADDRESS_EXPR,
-                Account::new()
-                    .nonce(1)
-                    .esdt_balance(STAKING_TOKEN_ID_EXPR, INITIAL_BALANCE),
-            )
-            .put_account(
-                PAUL_ADDRESS_EXPR,
-                Account::new()
-                    .nonce(1)
-                    .esdt_balance(STAKING_TOKEN_ID_EXPR, INITIAL_BALANCE),
-            )
-            .put_account(
-                SALLY_ADDRESS_EXPR,
-                Account::new()
-                    .nonce(1)
-                    .esdt_balance(STAKING_TOKEN_ID_EXPR, INITIAL_BALANCE),
-            ),
-    );
+    world.account(OWNER_ADDRESS).nonce(1);
+    world
+        .account(ALICE_ADDRESS)
+        .nonce(1)
+        .esdt_balance(STAKING_TOKEN_ID_EXPR, INITIAL_BALANCE);
+    world
+        .account(BOB_ADDRESS)
+        .nonce(1)
+        .esdt_balance(STAKING_TOKEN_ID_EXPR, INITIAL_BALANCE);
+    world
+        .account(CAROL_ADDRESS)
+        .nonce(1)
+        .esdt_balance(STAKING_TOKEN_ID_EXPR, INITIAL_BALANCE);
+    world
+        .account(EVE_ADDRESS)
+        .nonce(1)
+        .esdt_balance(STAKING_TOKEN_ID_EXPR, INITIAL_BALANCE);
+    world
+        .account(PAUL_ADDRESS)
+        .nonce(1)
+        .esdt_balance(STAKING_TOKEN_ID_EXPR, INITIAL_BALANCE);
+    world
+        .account(SALLY_ADDRESS)
+        .nonce(1)
+        .esdt_balance(STAKING_TOKEN_ID_EXPR, INITIAL_BALANCE);
 
     // init
-    let use_module_whitebox =
-        WhiteboxContract::new(USE_MODULE_ADDRESS_EXPR, use_module::contract_obj);
-    let use_module_code = world.code_expression(USE_MODULE_PATH_EXPR);
-
-    world.whitebox_deploy(
-        &use_module_whitebox,
-        ScDeployStep::new()
-            .from(OWNER_ADDRESS_EXPR)
-            .code(use_module_code),
-        |sc| {
+    let new_address = world
+        .tx()
+        .from(OWNER_ADDRESS)
+        .raw_deploy()
+        .code(USE_MODULE_PATH_EXPR)
+        .new_address(USE_MODULE_ADDRESS)
+        .returns(ReturnsNewBech32Address)
+        .whitebox(use_module::contract_obj, |sc| {
             let mut whitelist = ManagedVec::new();
-            whitelist.push(managed_address!(&address_expr_to_address(
-                ALICE_ADDRESS_EXPR
-            )));
-            whitelist.push(managed_address!(&address_expr_to_address(BOB_ADDRESS_EXPR)));
-            whitelist.push(managed_address!(&address_expr_to_address(
-                CAROL_ADDRESS_EXPR
-            )));
-            whitelist.push(managed_address!(&address_expr_to_address(
-                PAUL_ADDRESS_EXPR
-            )));
-            whitelist.push(managed_address!(&address_expr_to_address(
-                SALLY_ADDRESS_EXPR
-            )));
+            whitelist.push(ALICE_ADDRESS.to_managed_address());
+            whitelist.push(BOB_ADDRESS.to_managed_address());
+            whitelist.push(CAROL_ADDRESS.to_managed_address());
+            whitelist.push(PAUL_ADDRESS.to_managed_address());
+            whitelist.push(SALLY_ADDRESS.to_managed_address());
 
             sc.init_staking_module(
-                &EgldOrEsdtTokenIdentifier::esdt(managed_token_id!(STAKING_TOKEN_ID)),
-                &managed_biguint!(REQUIRED_STAKE_AMOUNT),
-                &managed_biguint!(SLASH_AMOUNT),
+                &EgldOrEsdtTokenIdentifier::esdt(STAKING_TOKEN_ID),
+                &BigUint::from(REQUIRED_STAKE_AMOUNT),
+                &BigUint::from(SLASH_AMOUNT),
                 QUORUM,
                 &whitelist,
             );
-        },
-    );
+        });
+
+    assert_eq!(new_address.to_address(), USE_MODULE_ADDRESS.to_address());
 
     // try stake - not a board member
-    world.whitebox_call_check(
-        &use_module_whitebox,
-        ScCallStep::new()
-            .from(EVE_ADDRESS_EXPR)
-            .esdt_transfer(STAKING_TOKEN_ID, 0, REQUIRED_STAKE_AMOUNT)
-            .no_expect(),
-        |sc| sc.stake(),
-        |r| {
-            r.assert_user_error("Only whitelisted members can stake");
-        },
-    );
+    world
+        .tx()
+        .from(EVE_ADDRESS)
+        .to(USE_MODULE_ADDRESS)
+        .single_esdt(
+            &TokenIdentifier::from(STAKING_TOKEN_ID_EXPR),
+            0,
+            &BigUint::from(REQUIRED_STAKE_AMOUNT),
+        )
+        .returns(ExpectError(4u64, "Only whitelisted members can stake"))
+        .whitebox(use_module::contract_obj, |sc| {
+            sc.stake();
+        });
 
     // stake half and try unstake
-    world.whitebox_call(
-        &use_module_whitebox,
-        ScCallStep::new().from(ALICE_ADDRESS_EXPR).esdt_transfer(
-            STAKING_TOKEN_ID,
+    world
+        .tx()
+        .from(ALICE_ADDRESS)
+        .to(USE_MODULE_ADDRESS)
+        .single_esdt(
+            &TokenIdentifier::from(STAKING_TOKEN_ID_EXPR),
             0,
-            REQUIRED_STAKE_AMOUNT / 2,
-        ),
-        |sc| sc.stake(),
-    );
+            &BigUint::from(REQUIRED_STAKE_AMOUNT / 2),
+        )
+        .whitebox(use_module::contract_obj, |sc| {
+            sc.stake();
+        });
 
-    world.whitebox_call_check(
-        &use_module_whitebox,
-        ScCallStep::new().from(ALICE_ADDRESS_EXPR).no_expect(),
-        |sc| sc.unstake(managed_biguint!(REQUIRED_STAKE_AMOUNT / 4)),
-        |r| {
-            r.assert_user_error("Not enough stake");
-        },
-    );
+    world
+        .tx()
+        .from(ALICE_ADDRESS)
+        .to(USE_MODULE_ADDRESS)
+        .returns(ExpectError(4u64, "Not enough stake"))
+        .whitebox(use_module::contract_obj, |sc| {
+            sc.unstake(BigUint::from(REQUIRED_STAKE_AMOUNT / 4));
+        });
 
     // bob and carol stake
-    world.whitebox_call(
-        &use_module_whitebox,
-        ScCallStep::new().from(BOB_ADDRESS_EXPR).esdt_transfer(
-            STAKING_TOKEN_ID,
+    world
+        .tx()
+        .from(BOB_ADDRESS)
+        .to(USE_MODULE_ADDRESS)
+        .single_esdt(
+            &TokenIdentifier::from(STAKING_TOKEN_ID),
             0,
-            REQUIRED_STAKE_AMOUNT,
-        ),
-        |sc| sc.stake(),
-    );
-
-    world.whitebox_call(
-        &use_module_whitebox,
-        ScCallStep::new().from(CAROL_ADDRESS_EXPR).esdt_transfer(
-            STAKING_TOKEN_ID,
+            &BigUint::from(REQUIRED_STAKE_AMOUNT),
+        )
+        .whitebox(use_module::contract_obj, |sc| {
+            sc.stake();
+        });
+
+    world
+        .tx()
+        .from(CAROL_ADDRESS)
+        .to(USE_MODULE_ADDRESS)
+        .single_esdt(
+            &TokenIdentifier::from(STAKING_TOKEN_ID),
             0,
-            REQUIRED_STAKE_AMOUNT,
-        ),
-        |sc| sc.stake(),
-    );
-
-    world.whitebox_call(
-        &use_module_whitebox,
-        ScCallStep::new().from(PAUL_ADDRESS_EXPR).esdt_transfer(
-            STAKING_TOKEN_ID,
+            &BigUint::from(REQUIRED_STAKE_AMOUNT),
+        )
+        .whitebox(use_module::contract_obj, |sc| {
+            sc.stake();
+        });
+
+    world
+        .tx()
+        .from(PAUL_ADDRESS)
+        .to(USE_MODULE_ADDRESS)
+        .single_esdt(
+            &TokenIdentifier::from(STAKING_TOKEN_ID),
             0,
-            REQUIRED_STAKE_AMOUNT,
-        ),
-        |sc| sc.stake(),
-    );
-
-    world.whitebox_call(
-        &use_module_whitebox,
-        ScCallStep::new().from(SALLY_ADDRESS_EXPR).esdt_transfer(
-            STAKING_TOKEN_ID,
+            &BigUint::from(REQUIRED_STAKE_AMOUNT),
+        )
+        .whitebox(use_module::contract_obj, |sc| {
+            sc.stake();
+        });
+
+    world
+        .tx()
+        .from(SALLY_ADDRESS)
+        .to(USE_MODULE_ADDRESS)
+        .single_esdt(
+            &TokenIdentifier::from(STAKING_TOKEN_ID),
             0,
-            REQUIRED_STAKE_AMOUNT,
-        ),
-        |sc| sc.stake(),
-    );
+            &BigUint::from(REQUIRED_STAKE_AMOUNT),
+        )
+        .whitebox(use_module::contract_obj, |sc| {
+            sc.stake();
+        });
 
     // try vote slash, not enough stake
-    world.whitebox_call_check(
-        &use_module_whitebox,
-        ScCallStep::new().from(ALICE_ADDRESS_EXPR).no_expect(),
-        |sc| sc.vote_slash_member(managed_address!(&address_expr_to_address(BOB_ADDRESS_EXPR))),
-        |r| {
-            r.assert_user_error("Not enough stake");
-        },
-    );
+    world
+        .tx()
+        .from(ALICE_ADDRESS)
+        .to(USE_MODULE_ADDRESS)
+        .returns(ExpectError(4u64, "Not enough stake"))
+        .whitebox(use_module::contract_obj, |sc| {
+            sc.vote_slash_member(BOB_ADDRESS.to_managed_address());
+        });
 
     // try vote slash, slashed address not a board member
-    world.whitebox_call_check(
-        &use_module_whitebox,
-        ScCallStep::new().from(ALICE_ADDRESS_EXPR).no_expect(),
-        |sc| sc.vote_slash_member(managed_address!(&address_expr_to_address(EVE_ADDRESS_EXPR))),
-        |r| {
-            r.assert_user_error("Voted user is not a staked board member");
-        },
-    );
+    world
+        .tx()
+        .from(ALICE_ADDRESS)
+        .to(USE_MODULE_ADDRESS)
+        .returns(ExpectError(4u64, "Voted user is not a staked board member"))
+        .whitebox(use_module::contract_obj, |sc| {
+            sc.vote_slash_member(EVE_ADDRESS.to_managed_address());
+        });
 
     // alice stake over max amount and withdraw surplus
-    world.whitebox_call(
-        &use_module_whitebox,
-        ScCallStep::new().from(ALICE_ADDRESS_EXPR).esdt_transfer(
-            STAKING_TOKEN_ID,
+    world
+        .tx()
+        .from(ALICE_ADDRESS)
+        .to(USE_MODULE_ADDRESS)
+        .single_esdt(
+            &TokenIdentifier::from(STAKING_TOKEN_ID_EXPR),
             0,
-            REQUIRED_STAKE_AMOUNT,
-        ),
-        |sc| {
+            &BigUint::from(REQUIRED_STAKE_AMOUNT),
+        )
+        .whitebox(use_module::contract_obj, |sc| {
             sc.stake();
-            let alice_staked_amount = sc
-                .staked_amount(&managed_address!(&address_expr_to_address(
-                    ALICE_ADDRESS_EXPR
-                )))
-                .get();
-            assert_eq!(alice_staked_amount, managed_biguint!(1_500_000));
-        },
-    );
-
-    world.whitebox_call(
-        &use_module_whitebox,
-        ScCallStep::new().from(ALICE_ADDRESS_EXPR),
-        |sc| {
-            sc.unstake(managed_biguint!(500_000));
-
-            let alice_staked_amount = sc
-                .staked_amount(&managed_address!(&address_expr_to_address(
-                    ALICE_ADDRESS_EXPR
-                )))
-                .get();
-            assert_eq!(alice_staked_amount, managed_biguint!(1_000_000));
-        },
-    );
-
-    world.check_state_step(CheckStateStep::new().put_account(
-        ALICE_ADDRESS_EXPR,
-        CheckAccount::new().esdt_balance(STAKING_TOKEN_ID_EXPR, "1_000_000"),
-    ));
+            let alice_staked_amount = sc.staked_amount(&ALICE_ADDRESS.to_managed_address()).get();
+            assert_eq!(alice_staked_amount, BigUint::from(1_500_000u64));
+        });
+
+    world
+        .tx()
+        .from(ALICE_ADDRESS)
+        .to(USE_MODULE_ADDRESS)
+        .whitebox(use_module::contract_obj, |sc| {
+            sc.unstake(BigUint::from(500_000u64));
+            let alice_staked_amount = sc.staked_amount(&ALICE_ADDRESS.to_managed_address()).get();
+            assert_eq!(alice_staked_amount, BigUint::from(1_000_000u64));
+        });
+
+    world
+        .check_account(ALICE_ADDRESS)
+        .esdt_balance(STAKING_TOKEN_ID_EXPR, BigUint::from(1_000_000u64));
 
     // alice vote to slash bob
-    world.whitebox_call(
-        &use_module_whitebox,
-        ScCallStep::new().from(ALICE_ADDRESS_EXPR),
-        |sc| {
-            sc.vote_slash_member(managed_address!(&address_expr_to_address(BOB_ADDRESS_EXPR)));
 
+    world
+        .tx()
+        .from(ALICE_ADDRESS)
+        .to(USE_MODULE_ADDRESS)
+        .whitebox(use_module::contract_obj, |sc| {
+            sc.vote_slash_member(BOB_ADDRESS.to_managed_address());
             assert_eq!(
-                sc.slashing_proposal_voters(&managed_address!(&address_expr_to_address(
-                    BOB_ADDRESS_EXPR
-                )))
-                .len(),
+                sc.slashing_proposal_voters(&BOB_ADDRESS.to_managed_address())
+                    .len(),
                 1
             );
             assert!(sc
-                .slashing_proposal_voters(&managed_address!(&address_expr_to_address(
-                    BOB_ADDRESS_EXPR
-                )))
-                .contains(&managed_address!(&address_expr_to_address(
-                    ALICE_ADDRESS_EXPR
-                ))));
-        },
-    );
+                .slashing_proposal_voters(&BOB_ADDRESS.to_managed_address())
+                .contains(&ALICE_ADDRESS.to_managed_address()));
+        });
 
     // bob vote to slash alice
-    world.whitebox_call(
-        &use_module_whitebox,
-        ScCallStep::new().from(BOB_ADDRESS_EXPR),
-        |sc| {
-            sc.vote_slash_member(managed_address!(&address_expr_to_address(
-                ALICE_ADDRESS_EXPR
-            )));
-        },
-    );
+    world
+        .tx()
+        .from(BOB_ADDRESS)
+        .to(USE_MODULE_ADDRESS)
+        .whitebox(use_module::contract_obj, |sc| {
+            sc.vote_slash_member(ALICE_ADDRESS.to_managed_address());
+        });
 
     // try slash before quorum reached
-    world.whitebox_call_check(
-        &use_module_whitebox,
-        ScCallStep::new().from(BOB_ADDRESS_EXPR).no_expect(),
-        |sc| {
-            sc.slash_member(managed_address!(&address_expr_to_address(
-                ALICE_ADDRESS_EXPR
-            )));
-        },
-        |r| {
-            r.assert_user_error("Quorum not reached");
-        },
-    );
+    world
+        .tx()
+        .from(BOB_ADDRESS)
+        .to(USE_MODULE_ADDRESS)
+        .returns(ExpectError(4u64, "Quorum not reached"))
+        .whitebox(use_module::contract_obj, |sc| {
+            sc.slash_member(ALICE_ADDRESS.to_managed_address());
+        });
 
     // paul vote to slash alice
-    world.whitebox_call(
-        &use_module_whitebox,
-        ScCallStep::new().from(PAUL_ADDRESS_EXPR),
-        |sc| {
-            sc.vote_slash_member(managed_address!(&address_expr_to_address(
-                ALICE_ADDRESS_EXPR
-            )));
-        },
-    );
+    world
+        .tx()
+        .from(PAUL_ADDRESS)
+        .to(USE_MODULE_ADDRESS)
+        .whitebox(use_module::contract_obj, |sc| {
+            sc.vote_slash_member(ALICE_ADDRESS.to_managed_address());
+        });
 
     // sally vote to slash alice
-    world.whitebox_call(
-        &use_module_whitebox,
-        ScCallStep::new().from(SALLY_ADDRESS_EXPR),
-        |sc| {
-            sc.vote_slash_member(managed_address!(&address_expr_to_address(
-                ALICE_ADDRESS_EXPR
-            )));
-        },
-    );
+    world
+        .tx()
+        .from(SALLY_ADDRESS)
+        .to(USE_MODULE_ADDRESS)
+        .whitebox(use_module::contract_obj, |sc| {
+            sc.vote_slash_member(ALICE_ADDRESS.to_managed_address());
+        });
 
     // sally cancels vote to slash alice
-    world.whitebox_call(
-        &use_module_whitebox,
-        ScCallStep::new().from(SALLY_ADDRESS_EXPR),
-        |sc| {
-            sc.cancel_vote_slash_member(managed_address!(&address_expr_to_address(
-                ALICE_ADDRESS_EXPR
-            )));
-        },
-    );
+    world
+        .tx()
+        .from(SALLY_ADDRESS)
+        .to(USE_MODULE_ADDRESS)
+        .whitebox(use_module::contract_obj, |sc| {
+            sc.cancel_vote_slash_member(ALICE_ADDRESS.to_managed_address());
+        });
 
     // carol vote
-    world.whitebox_call(
-        &use_module_whitebox,
-        ScCallStep::new().from(CAROL_ADDRESS_EXPR),
-        |sc| {
-            sc.vote_slash_member(managed_address!(&address_expr_to_address(
-                ALICE_ADDRESS_EXPR
-            )));
+    world
+        .tx()
+        .from(CAROL_ADDRESS)
+        .to(USE_MODULE_ADDRESS)
+        .whitebox(use_module::contract_obj, |sc| {
+            sc.vote_slash_member(ALICE_ADDRESS.to_managed_address());
 
             assert_eq!(
-                sc.slashing_proposal_voters(&managed_address!(&address_expr_to_address(
-                    ALICE_ADDRESS_EXPR
-                )))
-                .len(),
+                sc.slashing_proposal_voters(&ALICE_ADDRESS.to_managed_address())
+                    .len(),
                 3
             );
             assert!(sc
-                .slashing_proposal_voters(&managed_address!(&address_expr_to_address(
-                    ALICE_ADDRESS_EXPR
-                )))
-                .contains(&managed_address!(&address_expr_to_address(
-                    BOB_ADDRESS_EXPR
-                ))));
+                .slashing_proposal_voters(&ALICE_ADDRESS.to_managed_address())
+                .contains(&BOB_ADDRESS.to_managed_address()));
             assert!(sc
-                .slashing_proposal_voters(&managed_address!(&address_expr_to_address(
-                    ALICE_ADDRESS_EXPR
-                )))
-                .contains(&managed_address!(&address_expr_to_address(
-                    CAROL_ADDRESS_EXPR
-                ))));
+                .slashing_proposal_voters(&ALICE_ADDRESS.to_managed_address())
+                .contains(&CAROL_ADDRESS.to_managed_address()));
             assert!(sc
-                .slashing_proposal_voters(&managed_address!(&address_expr_to_address(
-                    ALICE_ADDRESS_EXPR
-                )))
-                .contains(&managed_address!(&address_expr_to_address(
-                    PAUL_ADDRESS_EXPR
-                ))));
+                .slashing_proposal_voters(&ALICE_ADDRESS.to_managed_address())
+                .contains(&PAUL_ADDRESS.to_managed_address()));
             assert!(!sc
-                .slashing_proposal_voters(&managed_address!(&address_expr_to_address(
-                    ALICE_ADDRESS_EXPR
-                )))
-                .contains(&managed_address!(&address_expr_to_address(
-                    SALLY_ADDRESS_EXPR
-                ))));
-        },
-    );
+                .slashing_proposal_voters(&ALICE_ADDRESS.to_managed_address())
+                .contains(&SALLY_ADDRESS.to_managed_address()));
+        });
 
     // slash alice
-    world.whitebox_call(
-        &use_module_whitebox,
-        ScCallStep::new().from(BOB_ADDRESS_EXPR),
-        |sc| {
-            sc.slash_member(managed_address!(&address_expr_to_address(
-                ALICE_ADDRESS_EXPR
-            )));
+    world
+        .tx()
+        .from(BOB_ADDRESS)
+        .to(USE_MODULE_ADDRESS)
+        .whitebox(use_module::contract_obj, |sc| {
+            sc.slash_member(ALICE_ADDRESS.to_managed_address());
 
             assert_eq!(
-                sc.staked_amount(&managed_address!(&address_expr_to_address(
-                    ALICE_ADDRESS_EXPR
-                )))
-                .get(),
-                managed_biguint!(REQUIRED_STAKE_AMOUNT - SLASH_AMOUNT)
-            );
-            assert_eq!(
-                sc.total_slashed_amount().get(),
-                managed_biguint!(SLASH_AMOUNT)
+                sc.staked_amount(&ALICE_ADDRESS.to_managed_address()).get(),
+                BigUint::from(REQUIRED_STAKE_AMOUNT - SLASH_AMOUNT)
             );
+            assert_eq!(sc.total_slashed_amount().get(), BigUint::from(SLASH_AMOUNT));
             assert!(sc
-                .slashing_proposal_voters(&managed_address!(&address_expr_to_address(
-                    ALICE_ADDRESS_EXPR
-                )))
+                .slashing_proposal_voters(&ALICE_ADDRESS.to_managed_address())
                 .is_empty());
-        },
-    );
+        });
 
     // alice try vote after slash
-    world.whitebox_call_check(
-        &use_module_whitebox,
-        ScCallStep::new().from(ALICE_ADDRESS_EXPR).no_expect(),
-        |sc| {
-            sc.vote_slash_member(managed_address!(&address_expr_to_address(BOB_ADDRESS_EXPR)));
-        },
-        |r| {
-            r.assert_user_error("Not enough stake");
-        },
-    );
+    world
+        .tx()
+        .from(ALICE_ADDRESS)
+        .to(USE_MODULE_ADDRESS)
+        .returns(ExpectError(4u64, "Not enough stake"))
+        .whitebox(use_module::contract_obj, |sc| {
+            sc.vote_slash_member(BOB_ADDRESS.to_managed_address());
+        });
 
     // alice try unstake the remaining tokens
-    world.whitebox_call_check(
-        &use_module_whitebox,
-        ScCallStep::new().from(ALICE_ADDRESS_EXPR).no_expect(),
-        |sc| {
-            sc.unstake(managed_biguint!(400_000));
-        },
-        |r| {
-            r.assert_user_error("Not enough stake");
-        },
-    );
+    world
+        .tx()
+        .from(ALICE_ADDRESS)
+        .to(USE_MODULE_ADDRESS)
+        .returns(ExpectError(4u64, "Not enough stake"))
+        .whitebox(use_module::contract_obj, |sc| {
+            sc.unstake(BigUint::from(400_000u64));
+        });
 
     // alice remove from board members
-    world.whitebox_call(
-        &use_module_whitebox,
-        ScCallStep::new().from(OWNER_ADDRESS_EXPR),
-        |sc| {
+    world
+        .tx()
+        .from(OWNER_ADDRESS)
+        .to(USE_MODULE_ADDRESS)
+        .whitebox(use_module::contract_obj, |sc| {
             // check alice's votes before slash
             assert!(sc
-                .slashing_proposal_voters(&managed_address!(&address_expr_to_address(
-                    BOB_ADDRESS_EXPR
-                )))
-                .contains(&managed_address!(&address_expr_to_address(
-                    ALICE_ADDRESS_EXPR
-                ))));
+                .slashing_proposal_voters(&BOB_ADDRESS.to_managed_address())
+                .contains(&ALICE_ADDRESS.to_managed_address()));
 
-            sc.remove_board_member(&managed_address!(&address_expr_to_address(
-                ALICE_ADDRESS_EXPR
-            )));
+            sc.remove_board_member(&ALICE_ADDRESS.to_managed_address());
 
             assert_eq!(sc.user_whitelist().len(), 4);
             assert!(!sc
                 .user_whitelist()
-                .contains(&managed_address!(&address_expr_to_address(
-                    ALICE_ADDRESS_EXPR
-                ))));
+                .contains(&ALICE_ADDRESS.to_managed_address()));
 
             // alice's vote gets removed
             assert!(sc
-                .slashing_proposal_voters(&managed_address!(&address_expr_to_address(
-                    BOB_ADDRESS_EXPR
-                )))
+                .slashing_proposal_voters(&BOB_ADDRESS.to_managed_address())
                 .is_empty());
-        },
-    );
+        });
 
     // alice unstake ok
-    world.whitebox_call(
-        &use_module_whitebox,
-        ScCallStep::new().from(ALICE_ADDRESS_EXPR),
-        |sc| {
-            sc.unstake(managed_biguint!(400_000));
-        },
+    world
+        .tx()
+        .from(ALICE_ADDRESS)
+        .to(USE_MODULE_ADDRESS)
+        .whitebox(use_module::contract_obj, |sc| {
+            sc.unstake(BigUint::from(400_000u64));
+        });
+
+    world.check_account(ALICE_ADDRESS).esdt_balance(
+        TokenIdentifier::from(STAKING_TOKEN_ID_EXPR),
+        BigUint::from(INITIAL_BALANCE - SLASH_AMOUNT),
     );
-
-    world.check_state_step(CheckStateStep::new().put_account(
-        ALICE_ADDRESS_EXPR,
-        CheckAccount::new().esdt_balance(STAKING_TOKEN_ID_EXPR, INITIAL_BALANCE - SLASH_AMOUNT),
-    ));
-}
-
-fn address_expr_to_address(address_expr: &str) -> Address {
-    AddressValue::from(address_expr).to_address()
 }

From a8f137726086ac070135d01b1e81964deee12455 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Tue, 20 Aug 2024 09:09:06 +0300
Subject: [PATCH 1174/1254] upgrade blackbox rust_testing_framework_tester

---
 .../sc-config.toml                            |  5 ++
 .../src/dummy_module.rs                       |  2 -
 .../rust-testing-framework-tester/src/lib.rs  |  7 +-
 .../rust_testing_framework_tester_proxy.rs    | 61 +++++++++++++
 .../tests/tester_blackbox_test.rs             | 85 +++++++------------
 5 files changed, 99 insertions(+), 61 deletions(-)
 create mode 100644 contracts/feature-tests/rust-testing-framework-tester/src/rust_testing_framework_tester_proxy.rs

diff --git a/contracts/feature-tests/rust-testing-framework-tester/sc-config.toml b/contracts/feature-tests/rust-testing-framework-tester/sc-config.toml
index 330cdda658..b8c5b739dc 100644
--- a/contracts/feature-tests/rust-testing-framework-tester/sc-config.toml
+++ b/contracts/feature-tests/rust-testing-framework-tester/sc-config.toml
@@ -4,3 +4,8 @@ main = "rust-testing-framework-tester"
 # the only purpose of this config is to specify the allocator
 [contracts.rust-testing-framework-tester]
 allocator = "static64k"
+
+[[proxy]]
+path = "src/rust_testing_framework_tester_proxy.rs"
+add-unlabelled = false
+add-endpoints = ["init"]
diff --git a/contracts/feature-tests/rust-testing-framework-tester/src/dummy_module.rs b/contracts/feature-tests/rust-testing-framework-tester/src/dummy_module.rs
index 76721a8fc4..7db5c9379d 100644
--- a/contracts/feature-tests/rust-testing-framework-tester/src/dummy_module.rs
+++ b/contracts/feature-tests/rust-testing-framework-tester/src/dummy_module.rs
@@ -1,5 +1,3 @@
-multiversx_sc::imports!();
-
 #[multiversx_sc::module]
 pub trait DummyModule {
     fn some_function(&self) -> BigUint {
diff --git a/contracts/feature-tests/rust-testing-framework-tester/src/lib.rs b/contracts/feature-tests/rust-testing-framework-tester/src/lib.rs
index 4133f3f039..ad3766e123 100644
--- a/contracts/feature-tests/rust-testing-framework-tester/src/lib.rs
+++ b/contracts/feature-tests/rust-testing-framework-tester/src/lib.rs
@@ -1,11 +1,12 @@
 #![no_std]
 
-multiversx_sc::imports!();
-multiversx_sc::derive_imports!();
+use multiversx_sc::proxy_imports::*;
 
 pub mod dummy_module;
+pub mod rust_testing_framework_tester_proxy;
 
-#[derive(TopEncode, TopDecode, TypeAbi, Clone, Debug, PartialEq, Eq)]
+#[type_abi]
+#[derive(TopEncode, TopDecode, Clone, Debug, PartialEq, Eq)]
 pub struct NftDummyAttributes {
     pub creation_epoch: u64,
     pub cool_factor: u8,
diff --git a/contracts/feature-tests/rust-testing-framework-tester/src/rust_testing_framework_tester_proxy.rs b/contracts/feature-tests/rust-testing-framework-tester/src/rust_testing_framework_tester_proxy.rs
new file mode 100644
index 0000000000..6a42d7e5b3
--- /dev/null
+++ b/contracts/feature-tests/rust-testing-framework-tester/src/rust_testing_framework_tester_proxy.rs
@@ -0,0 +1,61 @@
+// Code generated by the multiversx-sc proxy generator. DO NOT EDIT.
+
+////////////////////////////////////////////////////
+////////////////// AUTO-GENERATED //////////////////
+////////////////////////////////////////////////////
+
+#![allow(dead_code)]
+#![allow(clippy::all)]
+
+use multiversx_sc::proxy_imports::*;
+
+pub struct RustTestingFrameworkTesterProxy;
+
+impl<Env, From, To, Gas> TxProxyTrait<Env, From, To, Gas> for RustTestingFrameworkTesterProxy
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    type TxProxyMethods = RustTestingFrameworkTesterProxyMethods<Env, From, To, Gas>;
+
+    fn proxy_methods(self, tx: Tx<Env, From, To, (), Gas, (), ()>) -> Self::TxProxyMethods {
+        RustTestingFrameworkTesterProxyMethods { wrapped_tx: tx }
+    }
+}
+
+pub struct RustTestingFrameworkTesterProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    wrapped_tx: Tx<Env, From, To, (), Gas, (), ()>,
+}
+
+#[rustfmt::skip]
+impl<Env, From, Gas> RustTestingFrameworkTesterProxyMethods<Env, From, (), Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn init(
+        self,
+    ) -> TxTypedDeploy<Env, From, NotPayable, Gas, ManagedBuffer<Env::Api>> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_deploy()
+            .original_result()
+    }
+}
+
+#[type_abi]
+#[derive(TopEncode, TopDecode, Clone, Debug, PartialEq, Eq)]
+pub struct NftDummyAttributes {
+    pub creation_epoch: u64,
+    pub cool_factor: u8,
+}
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 afdabb5199..fe4e7f5b77 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,77 +1,50 @@
 use multiversx_sc_scenario::imports::*;
 use rust_testing_framework_tester::*;
 
-const WASM_PATH_EXPR: &str = "mxsc:output/rust-testing-framework-tester.mxsc.json";
+const CODE_PATH: MxscPath = MxscPath::new("output/rust-testing-framework-tester.mxsc.json");
+const OWNER_ADDRESS: TestAddress = TestAddress::new("owner");
+const RUST_TESTING_FRAMEWORK_TESTER_ADDRESS: TestSCAddress =
+    TestSCAddress::new("rust-testing-framework-tester");
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
-    blockchain.register_contract(
-        WASM_PATH_EXPR,
-        rust_testing_framework_tester::ContractBuilder,
-    );
+    blockchain.register_contract(CODE_PATH, rust_testing_framework_tester::ContractBuilder);
+
     blockchain
 }
 
 #[test]
-#[allow(deprecated)]
 fn tester_deploy_test() {
     let mut world = world();
-    let code = world.code_expression(WASM_PATH_EXPR);
 
-    let owner_address = "address:owner";
-    let mut adder_contract =
-        ContractInfo::<rust_testing_framework_tester::Proxy<StaticApi>>::new("sc:contract");
+    world.start_trace();
+
+    world.account(OWNER_ADDRESS).new_address(
+        OWNER_ADDRESS,
+        0,
+        RUST_TESTING_FRAMEWORK_TESTER_ADDRESS,
+    );
 
-    world
-        .start_trace()
-        .set_state_step(
-            SetStateStep::new()
-                .put_account(owner_address, Account::new())
-                .new_address(owner_address, 0, &adder_contract),
-        )
-        .sc_deploy_use_result(
-            ScDeployStep::new()
-                .from(owner_address)
-                .code(code)
-                .call(adder_contract.init()),
-            |address, tr: TypedResponse<String>| {
-                assert_eq!(address, adder_contract.to_address());
-                assert_eq!(tr.result.unwrap(), "constructor-result");
-            },
-        )
-        .write_scenario_trace("scenarios/trace-deploy.scen.json");
+    let (returned_value, contract_address) = world
+        .tx()
+        .from(OWNER_ADDRESS)
+        .typed(rust_testing_framework_tester_proxy::RustTestingFrameworkTesterProxy)
+        .init()
+        .code(CODE_PATH)
+        .returns(ReturnsResult)
+        .new_address(RUST_TESTING_FRAMEWORK_TESTER_ADDRESS)
+        .returns(ReturnsNewAddress)
+        .run();
+
+    assert_eq!(returned_value.to_string(), "constructor-result");
+    assert_eq!(contract_address, RUST_TESTING_FRAMEWORK_TESTER_ADDRESS);
+
+    world.write_scenario_trace("scenarios/trace-deploy.scen.json");
 }
 
 #[test]
-#[allow(deprecated)]
 fn tester_deploy_test_spawned_thread() {
-    let handler = std::thread::spawn(|| {
-        let mut world = world();
-        let code = world.code_expression(WASM_PATH_EXPR);
-
-        let owner_address = "address:owner";
-        let mut adder_contract =
-            ContractInfo::<rust_testing_framework_tester::Proxy<StaticApi>>::new("sc:contract");
-
-        world
-            .start_trace()
-            .set_state_step(
-                SetStateStep::new()
-                    .put_account(owner_address, Account::new())
-                    .new_address(owner_address, 0, &adder_contract),
-            )
-            .sc_deploy_use_result(
-                ScDeployStep::new()
-                    .from(owner_address)
-                    .code(code)
-                    .call(adder_contract.init()),
-                |address, tr: TypedResponse<String>| {
-                    assert_eq!(address, adder_contract.to_address());
-                    assert_eq!(tr.result.unwrap(), "constructor-result");
-                },
-            )
-            .write_scenario_trace("scenarios/trace-deploy.scen.json");
-    });
+    let handler = std::thread::spawn(|| tester_deploy_test());
 
     handler.join().unwrap();
 }

From 2d508a9e0cba4535b550455bd4d555c040f6be57 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Tue, 20 Aug 2024 10:09:10 +0300
Subject: [PATCH 1175/1254] fix clippy

---
 .../rust-testing-framework-tester/tests/tester_blackbox_test.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 fe4e7f5b77..a426721718 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
@@ -44,7 +44,7 @@ fn tester_deploy_test() {
 
 #[test]
 fn tester_deploy_test_spawned_thread() {
-    let handler = std::thread::spawn(|| tester_deploy_test());
+    let handler = std::thread::spawn(tester_deploy_test);
 
     handler.join().unwrap();
 }

From 0490e8122b385d6b4e6ff8d5b3ed0c60cd711b0f Mon Sep 17 00:00:00 2001
From: Andrei Vasilescu <vasilescuandrei24@gmail.com>
Date: Tue, 20 Aug 2024 10:40:24 +0300
Subject: [PATCH 1176/1254] password prompt separated

---
 sdk/core/src/data/keystore.rs | 15 ++++++++++-
 sdk/core/src/wallet.rs        | 47 +++++++++++++++++++++--------------
 2 files changed, 42 insertions(+), 20 deletions(-)

diff --git a/sdk/core/src/data/keystore.rs b/sdk/core/src/data/keystore.rs
index fd3a618ce7..2564d70a2e 100644
--- a/sdk/core/src/data/keystore.rs
+++ b/sdk/core/src/data/keystore.rs
@@ -1,5 +1,11 @@
 use serde::{Deserialize, Serialize};
 
+#[derive(Debug)]
+pub enum WalletError {
+    InvalidPassword,
+    InvalidKdf,
+    InvalidCipher,
+}
 #[derive(Debug, Serialize, Deserialize)]
 pub struct CryptoParams {
     pub iv: String,
@@ -32,4 +38,11 @@ pub struct Keystore {
     pub address: String,
     pub bech32: String,
     pub crypto: Crypto,
-}
\ No newline at end of file
+}
+
+#[derive(Clone, Debug)]
+pub struct DecryptionParams {
+    pub derived_key_first_half: Vec<u8>,
+    pub iv: Vec<u8>,
+    pub ciphertext: Vec<u8>,
+}
diff --git a/sdk/core/src/wallet.rs b/sdk/core/src/wallet.rs
index 0519c0413d..b2856b74da 100644
--- a/sdk/core/src/wallet.rs
+++ b/sdk/core/src/wallet.rs
@@ -22,7 +22,11 @@ use crate::{
         private_key::{PrivateKey, PRIVATE_KEY_LENGTH},
         public_key::PublicKey,
     },
-    data::{address::Address, keystore::Keystore, transaction::Transaction},
+    data::{
+        address::Address,
+        keystore::{DecryptionParams, Keystore, WalletError},
+        transaction::Transaction,
+    },
 };
 
 const EGLD_COIN_TYPE: u32 = 508;
@@ -38,20 +42,6 @@ pub struct Wallet {
     priv_key: PrivateKey,
 }
 
-#[derive(Clone, Debug)]
-pub struct DecryptionParams {
-    pub derived_key_first_half: Vec<u8>,
-    pub iv: Vec<u8>,
-    pub ciphertext: Vec<u8>,
-}
-
-#[derive(Debug)]
-pub enum WalletError {
-    InvalidPassword,
-    InvalidKdf,
-    InvalidCipher,
-}
-
 impl Wallet {
     // GenerateMnemonic will generate a new mnemonic value using the bip39 implementation
     pub fn generate_mnemonic() -> Mnemonic {
@@ -137,14 +127,27 @@ impl Wallet {
     }
 
     pub fn from_keystore_secret(file_path: &str) -> Result<Self> {
-        let decyption_params = Self::validate_keystore_password(file_path).unwrap_or_else(|e| {
-            panic!("Error: {:?}", e);
-        });
+        let decyption_params =
+            Self::validate_keystore_password(file_path, Self::get_keystore_password())
+                .unwrap_or_else(|e| {
+                    panic!("Error: {:?}", e);
+                });
         let priv_key =
             PrivateKey::from_hex_str(Self::decrypt_secret_key(decyption_params).as_str())?;
         Ok(Self { priv_key })
     }
 
+    pub fn get_private_key_from_keystore_secret(file_path: &str) -> Result<PrivateKey> {
+        let decyption_params =
+            Self::validate_keystore_password(file_path, Self::get_keystore_password())
+                .unwrap_or_else(|e| {
+                    panic!("Error: {:?}", e);
+                });
+        let priv_key =
+            PrivateKey::from_hex_str(Self::decrypt_secret_key(decyption_params).as_str())?;
+        Ok(priv_key)
+    }
+
     pub fn address(&self) -> Address {
         let public_key = PublicKey::from(&self.priv_key);
         Address::from(&public_key)
@@ -166,14 +169,20 @@ impl Wallet {
         self.priv_key.sign(tx_bytes)
     }
 
-    pub fn validate_keystore_password(path: &str) -> Result<DecryptionParams, WalletError> {
+    fn get_keystore_password() -> String {
         println!(
             "Insert password. Press 'Ctrl-D' (Linux / MacOS) or 'Ctrl-Z' (Windows) when done."
         );
         let mut password = String::new();
         io::stdin().read_to_string(&mut password).unwrap();
         password = password.trim().to_string();
+        password
+    }
 
+    pub fn validate_keystore_password(
+        path: &str,
+        password: String,
+    ) -> Result<DecryptionParams, WalletError> {
         let json_body = fs::read_to_string(path).unwrap();
         let keystore: Keystore = serde_json::from_str(&json_body).unwrap();
         let ciphertext = hex::decode(&keystore.crypto.ciphertext).unwrap();

From c1b54c1d8c2b9e9683d84431623e0338d78cdbd8 Mon Sep 17 00:00:00 2001
From: JustEatAnApple <mblacioti@gmail.com>
Date: Wed, 21 Aug 2024 20:31:47 +0300
Subject: [PATCH 1177/1254] Keystore <-> Pem Sc-meta

---
 Cargo.lock                          |  10 ++
 framework/meta/src/cmd/wallet.rs    | 147 +++++++++++++++++-----------
 framework/meta/tests/wallet_test.rs |  91 +++++++++++++++++
 sdk/core/Cargo.toml                 |   3 +-
 sdk/core/src/data/keystore.rs       |   8 +-
 sdk/core/src/wallet.rs              | 137 +++++++++++++++++++++-----
 6 files changed, 316 insertions(+), 80 deletions(-)
 create mode 100644 framework/meta/tests/wallet_test.rs

diff --git a/Cargo.lock b/Cargo.lock
index f0558fc8b1..fecbf652fe 100755
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2151,6 +2151,7 @@ dependencies = [
  "sha2 0.10.8",
  "sha3",
  "tokio",
+ "uuid",
  "zeroize",
 ]
 
@@ -3724,6 +3725,15 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 
+[[package]]
+name = "uuid"
+version = "1.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314"
+dependencies = [
+ "getrandom 0.2.15",
+]
+
 [[package]]
 name = "vault"
 version = "0.0.0"
diff --git a/framework/meta/src/cmd/wallet.rs b/framework/meta/src/cmd/wallet.rs
index 7fcf28899a..ba8a9f6132 100644
--- a/framework/meta/src/cmd/wallet.rs
+++ b/framework/meta/src/cmd/wallet.rs
@@ -1,16 +1,16 @@
 use core::str;
-use multiversx_sc::types;
-use std::{
-    fs::{self, File},
-    io::{self, Read, Write},
-};
 
 use crate::cli::{WalletAction, WalletArgs, WalletBech32Args, WalletConvertArgs, WalletNewArgs};
-use bip39::Mnemonic;
+use multiversx_sc::types::{self};
 use multiversx_sc_snippets::sdk::{
     crypto::public_key::PublicKey, data::address::Address, utils::base64_encode, wallet::Wallet,
 };
 use multiversx_sc_snippets::{hex, imports::Bech32Address};
+use std::{
+    fs::{self, File},
+    io::{self, Read, Write},
+};
+
 pub fn wallet(args: &WalletArgs) {
     let command = &args.command;
     match command {
@@ -27,45 +27,92 @@ fn convert(convert_args: &WalletConvertArgs) {
     let out_format = &convert_args.to;
 
     let mut mnemonic_str = String::new();
+    let private_key_str: String;
+    let public_key_str: String;
 
     match (in_format.as_str(), out_format.as_str()) {
         ("mnemonic", "pem") => match infile {
             Some(file) => {
                 mnemonic_str = fs::read_to_string(file).unwrap();
-                mnemonic_str = mnemonic_str.replace('\n', "");
+                (private_key_str, public_key_str) = Wallet::get_wallet_keys_mnemonic(mnemonic_str);
+                write_resulted_pem(&public_key_str, &private_key_str, outfile);
             },
             None => {
                 println!("Insert text below. Press 'Ctrl-D' (Linux / MacOS) or 'Ctrl-Z' (Windows) when done.");
-                _ = io::stdin().read_to_string(&mut mnemonic_str).unwrap()
+                _ = io::stdin().read_to_string(&mut mnemonic_str).unwrap();
+                (private_key_str, public_key_str) = Wallet::get_wallet_keys_mnemonic(mnemonic_str);
+                write_resulted_pem(&public_key_str, &private_key_str, outfile);
+            },
+        },
+        ("keystore-secret", "pem") => match infile {
+            Some(file) => {
+                let private_key = Wallet::get_private_key_from_keystore_secret(
+                    file,
+                    &Wallet::get_keystore_password(),
+                )
+                .unwrap();
+                private_key_str = private_key.to_string();
+                let public_key = PublicKey::from(&private_key);
+                public_key_str = public_key.to_string();
+                write_resulted_pem(&public_key_str, &private_key_str, outfile);
+            },
+            None => {
+                panic!("Input file is required for keystore-secret format");
+            },
+        },
+        ("pem", "keystore-secret") => match infile {
+            Some(file) => {
+                let pem_decoded_keys = Wallet::get_pem_decoded_content(file);
+                (private_key_str, public_key_str) = Wallet::get_wallet_keys_pem(file);
+
+                let address = get_wallet_address(&private_key_str);
+                let hex_decoded_keys = hex::decode(pem_decoded_keys).unwrap();
+
+                let json_result = Wallet::encrypt_keystore(
+                    hex_decoded_keys.as_slice(),
+                    &address,
+                    &public_key_str,
+                    &Wallet::get_keystore_password(),
+                );
+                write_resulted_keystore(json_result, outfile);
+            },
+            None => {
+                panic!("Input file is required for pem format");
             },
         },
         _ => {
             println!("Unsupported conversion");
         },
     }
+}
 
-    let mnemonic = Mnemonic::parse(mnemonic_str).unwrap();
-
-    let (private_key_str, public_key_str) = get_wallet_keys(mnemonic);
-    let address = get_wallet_address(private_key_str.as_str());
-
+fn write_resulted_pem(public_key: &str, private_key: &str, outfile: Option<&String>) {
+    let address = get_wallet_address(private_key);
     match outfile {
         Some(outfile) => {
-            generate_pem(
-                &address,
-                private_key_str.as_str(),
-                public_key_str.as_str(),
-                outfile,
-            );
+            let pem_content = generate_pem_content(&address, private_key, public_key);
+            let mut file = File::create(outfile).unwrap();
+            file.write_all(pem_content.as_bytes()).unwrap();
         },
         None => {
-            let pem_content =
-                generate_pem_content(&address, private_key_str.as_str(), public_key_str.as_str());
+            let pem_content = generate_pem_content(&address, private_key, public_key);
             print!("{}", pem_content);
         },
     }
 }
 
+fn write_resulted_keystore(json_result: String, outfile: Option<&String>) {
+    match outfile {
+        Some(outfile) => {
+            let mut file = File::create(outfile).unwrap();
+            file.write_all(json_result.as_bytes()).unwrap();
+        },
+        None => {
+            println!("{}", json_result);
+        },
+    }
+}
+
 fn bech32_conversion(bech32_args: &WalletBech32Args) {
     let encode_address = bech32_args.hex_address.as_ref();
     let decode_address = bech32_args.bech32_address.as_ref();
@@ -90,57 +137,45 @@ fn bech32_conversion(bech32_args: &WalletBech32Args) {
     }
 }
 
-fn get_wallet_keys(mnemonic: Mnemonic) -> (String, String) {
-    let private_key = Wallet::get_private_key_from_mnemonic(mnemonic, 0u32, 0u32);
-    let public_key = PublicKey::from(&private_key);
-
-    let public_key_str: &str = &public_key.to_string();
-    let private_key_str: &str = &private_key.to_string();
-
-    (private_key_str.to_string(), public_key_str.to_string())
-}
-
 fn get_wallet_address(private_key: &str) -> Address {
     let wallet = Wallet::from_private_key(private_key).unwrap();
     wallet.address()
 }
 
 fn new(new_args: &WalletNewArgs) {
-    let format = new_args.wallet_format.as_ref();
-    let outfile = new_args.outfile.as_ref();
+    let format = new_args.wallet_format.as_deref();
+    let outfile = new_args.outfile.as_ref(); // Handle outfile as Option<&str> if it's an Option<String>
     let mnemonic = Wallet::generate_mnemonic();
     println!("Mnemonic: {}", mnemonic);
 
-    let (private_key_str, public_key_str) = get_wallet_keys(mnemonic);
+    let (private_key_str, public_key_str) = Wallet::get_wallet_keys_mnemonic(mnemonic.to_string());
     let address = get_wallet_address(private_key_str.as_str());
 
     println!("Wallet address: {}", address);
 
-    if let Some(f) = format {
-        match (f.as_str(), outfile) {
-            ("pem", Some(file)) => {
-                generate_pem(
-                    &address,
-                    private_key_str.as_str(),
-                    public_key_str.as_str(),
-                    file,
-                );
-            },
-            ("pem", None) => {
-                println!("Output file is required for PEM format");
-            },
-            _ => {},
-        }
+    match format {
+        Some("pem") => {
+            write_resulted_pem(public_key_str.as_str(), private_key_str.as_str(), outfile);
+        },
+        Some("keystore-secret") => {
+            let concatenated_keys = format!("{}{}", private_key_str, public_key_str);
+            let hex_decoded_keys = hex::decode(concatenated_keys).unwrap();
+            let json_result = Wallet::encrypt_keystore(
+                hex_decoded_keys.as_slice(),
+                &address,
+                &public_key_str,
+                &Wallet::get_keystore_password(),
+            );
+            write_resulted_keystore(json_result, outfile);
+        },
+        Some(_) => {
+            println!("Unsupported format");
+        },
+        None => {},
     }
 }
 
-fn generate_pem(address: &Address, private_key: &str, public_key: &str, outfile: &String) {
-    let pem_content = generate_pem_content(address, private_key, public_key);
-    let mut file = File::create(outfile).unwrap();
-    file.write_all(pem_content.as_bytes()).unwrap()
-}
-
-fn generate_pem_content(address: &Address, private_key: &str, public_key: &str) -> String {
+pub fn generate_pem_content(address: &Address, private_key: &str, public_key: &str) -> String {
     let concat_keys = format!("{}{}", private_key, public_key);
     let concat_keys_b64 = base64_encode(concat_keys);
 
diff --git a/framework/meta/tests/wallet_test.rs b/framework/meta/tests/wallet_test.rs
new file mode 100644
index 0000000000..ce1627ff64
--- /dev/null
+++ b/framework/meta/tests/wallet_test.rs
@@ -0,0 +1,91 @@
+use std::fs::{self, File};
+use std::io::Write;
+
+use multiversx_sc_meta::cmd::wallet::generate_pem_content;
+use multiversx_sc_snippets::sdk::{crypto::public_key::PublicKey, data::address::Address};
+use multiversx_sc_snippets::{hex, imports::Wallet};
+
+const ALICE_PEM_PATH: &str = "../snippets/src/test_wallets/alice.pem";
+const ALICE_KEYSTORE_PATH_TEST: &str = "alice.json";
+const ALICE_PEM_PATH_TEST: &str = "alice_test.pem";
+const KEYSTORE_PASSWORD: &str = "abcd";
+
+fn create_keystore_from_pem(file: &str) {
+    let pem_decoded_keys = Wallet::get_pem_decoded_content(file);
+    let (private_key_str, public_key_str) = Wallet::get_wallet_keys_pem(file);
+
+    let address = Wallet::from_private_key(&private_key_str)
+        .unwrap()
+        .address();
+    let hex_decoded_keys = hex::decode(pem_decoded_keys).unwrap();
+
+    let json_result = Wallet::encrypt_keystore(
+        hex_decoded_keys.as_slice(),
+        &address,
+        &public_key_str,
+        KEYSTORE_PASSWORD,
+    );
+
+    write_to_file(&json_result, ALICE_KEYSTORE_PATH_TEST);
+}
+
+fn write_to_file(content: &str, file: &str) {
+    let mut file = File::create(file).unwrap();
+    file.write_all(content.as_bytes()).unwrap();
+}
+
+fn create_keystore_file_from_scratch() -> Address {
+    let mnemonic = Wallet::generate_mnemonic();
+    let (private_key_str, public_key_str) = Wallet::get_wallet_keys_mnemonic(mnemonic.to_string());
+    let wallet = Wallet::from_private_key(&private_key_str).unwrap();
+    let address = wallet.address();
+
+    let concatenated_keys = format!("{}{}", private_key_str, public_key_str);
+    let hex_decoded_keys = hex::decode(concatenated_keys).unwrap();
+    let json_result = Wallet::encrypt_keystore(
+        hex_decoded_keys.as_slice(),
+        &address,
+        &public_key_str,
+        KEYSTORE_PASSWORD,
+    );
+    write_to_file(&json_result, ALICE_KEYSTORE_PATH_TEST);
+    address
+}
+
+#[test]
+fn test_wallet_convert_pem_to_keystore() {
+    create_keystore_from_pem(ALICE_PEM_PATH);
+    let (private_key_pem, _public_key_pem) = Wallet::get_wallet_keys_pem(ALICE_PEM_PATH);
+    assert_eq!(
+        Wallet::get_private_key_from_keystore_secret(ALICE_KEYSTORE_PATH_TEST, KEYSTORE_PASSWORD)
+            .unwrap()
+            .to_string(),
+        private_key_pem
+    );
+    fs::remove_file(ALICE_KEYSTORE_PATH_TEST).unwrap();
+}
+
+#[test]
+fn test_wallet_convert_keystore_to_pem() {
+    let address = create_keystore_file_from_scratch();
+
+    let private_key =
+        Wallet::get_private_key_from_keystore_secret(ALICE_KEYSTORE_PATH_TEST, KEYSTORE_PASSWORD)
+            .unwrap();
+    let private_key_str = private_key.to_string();
+    let public_key = PublicKey::from(&private_key);
+    let public_key_str = public_key.to_string();
+
+    let pem_content = generate_pem_content(&address, &private_key_str, &public_key_str);
+    write_to_file(&pem_content, ALICE_PEM_PATH_TEST);
+
+    assert_eq!(
+        Wallet::get_private_key_from_keystore_secret(ALICE_KEYSTORE_PATH_TEST, KEYSTORE_PASSWORD)
+            .unwrap()
+            .to_string(),
+        Wallet::get_wallet_keys_pem(ALICE_PEM_PATH_TEST).0
+    );
+
+    fs::remove_file(ALICE_PEM_PATH_TEST).unwrap();
+    fs::remove_file(ALICE_KEYSTORE_PATH_TEST).unwrap();
+}
diff --git a/sdk/core/Cargo.toml b/sdk/core/Cargo.toml
index 32e170618f..e84f8cd4cb 100644
--- a/sdk/core/Cargo.toml
+++ b/sdk/core/Cargo.toml
@@ -37,4 +37,5 @@ pem = "3.0.2"
 log = "0.4.17"
 scrypt = "0.11"
 aes = "0.8"
-ctr = "0.9.2"
\ No newline at end of file
+ctr = "0.9.2"
+uuid = {version = "1.10.0", features = ["v4"]}
\ No newline at end of file
diff --git a/sdk/core/src/data/keystore.rs b/sdk/core/src/data/keystore.rs
index 2564d70a2e..1b3c656ef1 100644
--- a/sdk/core/src/data/keystore.rs
+++ b/sdk/core/src/data/keystore.rs
@@ -1,5 +1,11 @@
 use serde::{Deserialize, Serialize};
 
+pub const KDF_N: u32 = 4096;
+pub const KDF_R: u32 = 8;
+pub const KDF_P: u32 = 1;
+pub const KDF_DKLEN: usize = 32;
+pub const KEYSTORE_VERSION: u32 = 4;
+
 #[derive(Debug)]
 pub enum WalletError {
     InvalidPassword,
@@ -44,5 +50,5 @@ pub struct Keystore {
 pub struct DecryptionParams {
     pub derived_key_first_half: Vec<u8>,
     pub iv: Vec<u8>,
-    pub ciphertext: Vec<u8>,
+    pub data: Vec<u8>,
 }
diff --git a/sdk/core/src/wallet.rs b/sdk/core/src/wallet.rs
index b2856b74da..bbf2c41a2c 100644
--- a/sdk/core/src/wallet.rs
+++ b/sdk/core/src/wallet.rs
@@ -1,5 +1,6 @@
 extern crate rand;
 
+use core::str;
 use std::{
     fs::{self},
     io::{self, Read},
@@ -11,6 +12,7 @@ use bip39::{Language, Mnemonic};
 use ctr::{cipher::StreamCipher, Ctr128BE};
 use hmac::{Hmac, Mac};
 use pbkdf2::pbkdf2;
+use rand::RngCore;
 use scrypt::{scrypt, Params};
 use serde_json::json;
 use sha2::{Digest, Sha256, Sha512};
@@ -22,13 +24,12 @@ use crate::{
         private_key::{PrivateKey, PRIVATE_KEY_LENGTH},
         public_key::PublicKey,
     },
-    data::{
-        address::Address,
-        keystore::{DecryptionParams, Keystore, WalletError},
-        transaction::Transaction,
-    },
+    data::{address::Address, keystore::*, transaction::Transaction},
+    utils::base64_decode,
 };
 
+use uuid::Uuid;
+
 const EGLD_COIN_TYPE: u32 = 508;
 const HARDENED: u32 = 0x80000000;
 const CIPHER_ALGORITHM_AES_128_CTR: &str = "aes-128-ctr";
@@ -79,6 +80,7 @@ impl Wallet {
 
         let mut digest =
             HmacSha512::new_from_slice(b"ed25519 seed").expect("HMAC can take key of any size");
+        HmacSha512::new_from_slice(b"ed25519 seed").expect("HMAC can take key of any size");
         digest.update(&seed);
         let intermediary: Vec<u8> = digest.finalize().into_bytes().into_iter().collect();
         let mut key = intermediary[..serialized_key_len].to_vec();
@@ -99,6 +101,7 @@ impl Wallet {
 
             digest =
                 HmacSha512::new_from_slice(&chain_code).expect("HMAC can take key of any size");
+            HmacSha512::new_from_slice(&chain_code).expect("HMAC can take key of any size");
             digest.update(&buff);
             let intermediary: Vec<u8> = digest.finalize().into_bytes().into_iter().collect();
             key = intermediary[..serialized_key_len].to_vec();
@@ -108,9 +111,20 @@ impl Wallet {
         PrivateKey::from_bytes(key.as_slice()).unwrap()
     }
 
+    pub fn get_wallet_keys_mnemonic(mnemonic_str: String) -> (String, String) {
+        let mnemonic = Mnemonic::parse(mnemonic_str.replace('\n', "")).unwrap();
+        let private_key = Self::get_private_key_from_mnemonic(mnemonic, 0u32, 0u32);
+        let public_key = PublicKey::from(&private_key);
+
+        let public_key_str: &str = &public_key.to_string();
+        let private_key_str: &str = &private_key.to_string();
+
+        (private_key_str.to_string(), public_key_str.to_string())
+    }
+
     pub fn from_private_key(priv_key: &str) -> Result<Self> {
-        let pri_key = PrivateKey::from_hex_str(priv_key)?;
-        Ok(Self { priv_key: pri_key })
+        let priv_key = PrivateKey::from_hex_str(priv_key)?;
+        Ok(Self { priv_key })
     }
 
     pub fn from_pem_file(file_path: &str) -> Result<Self> {
@@ -126,25 +140,45 @@ impl Wallet {
         Ok(Self { priv_key: pri_key })
     }
 
+    pub fn get_pem_decoded_content(file: &str) -> Vec<u8> {
+        let pem_content = fs::read_to_string(file).unwrap();
+        let lines: Vec<&str> = pem_content.split('\n').collect();
+        let pem_encoded_keys = format!("{}{}{}", lines[1], lines[2], lines[3]);
+        base64_decode(pem_encoded_keys)
+    }
+
+    pub fn get_wallet_keys_pem(file: &str) -> (String, String) {
+        let pem_decoded_keys = Self::get_pem_decoded_content(file);
+        let (private_key, public_key) = pem_decoded_keys.split_at(pem_decoded_keys.len() / 2);
+        let private_key_str = String::from_utf8(private_key.to_vec()).unwrap();
+        let public_key_str = String::from_utf8(public_key.to_vec()).unwrap();
+
+        (private_key_str, public_key_str)
+    }
+
     pub fn from_keystore_secret(file_path: &str) -> Result<Self> {
         let decyption_params =
             Self::validate_keystore_password(file_path, Self::get_keystore_password())
                 .unwrap_or_else(|e| {
                     panic!("Error: {:?}", e);
                 });
-        let priv_key =
-            PrivateKey::from_hex_str(Self::decrypt_secret_key(decyption_params).as_str())?;
+        let priv_key = PrivateKey::from_hex_str(
+            hex::encode(Self::decrypt_secret_key(decyption_params)).as_str(),
+        )?;
         Ok(Self { priv_key })
     }
 
-    pub fn get_private_key_from_keystore_secret(file_path: &str) -> Result<PrivateKey> {
-        let decyption_params =
-            Self::validate_keystore_password(file_path, Self::get_keystore_password())
-                .unwrap_or_else(|e| {
-                    panic!("Error: {:?}", e);
-                });
-        let priv_key =
-            PrivateKey::from_hex_str(Self::decrypt_secret_key(decyption_params).as_str())?;
+    pub fn get_private_key_from_keystore_secret(
+        file_path: &str,
+        password: &str,
+    ) -> Result<PrivateKey> {
+        let decyption_params = Self::validate_keystore_password(file_path, password.to_string())
+            .unwrap_or_else(|e| {
+                panic!("Error: {:?}", e);
+            });
+        let priv_key = PrivateKey::from_hex_str(
+            hex::encode(Self::decrypt_secret_key(decyption_params)).as_str(),
+        )?;
         Ok(priv_key)
     }
 
@@ -169,7 +203,7 @@ impl Wallet {
         self.priv_key.sign(tx_bytes)
     }
 
-    fn get_keystore_password() -> String {
+    pub fn get_keystore_password() -> String {
         println!(
             "Insert password. Press 'Ctrl-D' (Linux / MacOS) or 'Ctrl-Z' (Windows) when done."
         );
@@ -222,7 +256,7 @@ impl Wallet {
             Ok(DecryptionParams {
                 derived_key_first_half,
                 iv,
-                ciphertext,
+                data: ciphertext,
             })
         } else {
             println!("Password is incorrect");
@@ -230,14 +264,73 @@ impl Wallet {
         }
     }
 
-    pub fn decrypt_secret_key(decryption_params: DecryptionParams) -> String {
+    pub fn decrypt_secret_key(decryption_params: DecryptionParams) -> Vec<u8> {
         let mut cipher = Ctr128BE::<Aes128>::new(
             decryption_params.derived_key_first_half.as_slice().into(),
             decryption_params.iv.as_slice().into(),
         );
-        let mut decrypted = decryption_params.ciphertext.to_vec();
+        let mut decrypted = decryption_params.data.to_vec();
         cipher.apply_keystream(&mut decrypted);
 
-        hex::encode(decrypted).to_string()
+        decrypted
+    }
+
+    pub fn encrypt_keystore(
+        data: &[u8],
+        address: &Address,
+        public_key: &str,
+        password: &str,
+    ) -> String {
+        let params = Params::new((KDF_N as f64).log2() as u8, KDF_R, KDF_P, KDF_DKLEN).unwrap();
+        let mut rand_salt: [u8; 32] = [0u8; 32];
+        rand::thread_rng().fill_bytes(&mut rand_salt);
+        let salt_hex = hex::encode(rand_salt);
+
+        let mut rand_iv: [u8; 16] = [0u8; 16];
+        rand::thread_rng().fill_bytes(&mut rand_iv);
+        let iv_hex = hex::encode(rand_iv);
+
+        let mut derived_key = vec![0u8; 32];
+        scrypt(password.as_bytes(), &rand_salt, &params, &mut derived_key).unwrap();
+
+        let derived_key_first_half = derived_key[0..16].to_vec();
+        let derived_key_second_half = derived_key[16..32].to_vec();
+
+        let decryption_params = DecryptionParams {
+            derived_key_first_half,
+            iv: rand_iv.to_vec(),
+            data: data.to_vec(),
+        };
+
+        let ciphertext = Self::decrypt_secret_key(decryption_params);
+
+        let mut h = HmacSha256::new_from_slice(&derived_key_second_half).unwrap();
+        h.update(&ciphertext);
+        let mac = h.finalize().into_bytes();
+        let keystore = Keystore {
+            crypto: Crypto {
+                cipher: CIPHER_ALGORITHM_AES_128_CTR.to_string(),
+                cipherparams: CryptoParams { iv: iv_hex },
+                ciphertext: hex::encode(&ciphertext),
+                kdf: KDF_SCRYPT.to_string(),
+                kdfparams: KdfParams {
+                    salt: salt_hex,
+                    n: KDF_N,
+                    r: KDF_R,
+                    p: KDF_P,
+                    dklen: KDF_DKLEN as u32,
+                },
+                mac: hex::encode(mac),
+            },
+            id: Uuid::new_v4().to_string(),
+            version: KEYSTORE_VERSION,
+            kind: "secretKey".to_string(),
+            address: public_key.to_string(),
+            bech32: address.to_string(),
+        };
+
+        let mut keystore_json: String = serde_json::to_string_pretty(&keystore).unwrap();
+        keystore_json.push('\n');
+        keystore_json
     }
 }

From 59ef56038c4f7975091df2f363c9c91dad34cb9b Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Wed, 21 Aug 2024 22:49:00 +0200
Subject: [PATCH 1178/1254] whitebox migration for price aggregator, transfer
 role, gov module

---
 .../tests/price_aggregator_whitebox_test.rs   | 562 +++++++-------
 .../tests/transfer_role_whitebox_test.rs      | 230 +++---
 .../tests/gov_module_whitebox_test.rs         | 723 +++++++++---------
 3 files changed, 756 insertions(+), 759 deletions(-)

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 180301b610..46ce6f52c3 100644
--- a/contracts/core/price-aggregator/tests/price_aggregator_whitebox_test.rs
+++ b/contracts/core/price-aggregator/tests/price_aggregator_whitebox_test.rs
@@ -4,7 +4,7 @@ use multiversx_price_aggregator_sc::{
 };
 use multiversx_sc_modules::{
     pause::EndpointWrappers as PauseEndpointWrappers,
-    staking::EndpointWrappers as StakingEndpointWrappers,
+    staking::{EndpointWrappers as StakingEndpointWrappers, StakingModule},
 };
 use multiversx_sc_scenario::imports::*;
 
@@ -17,9 +17,10 @@ pub const STAKE_AMOUNT: u64 = 20;
 pub const SUBMISSION_COUNT: usize = 3;
 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 = "mxsc:output/multiversx-price-aggregator-sc.mxsc.json";
+const OWNER_ADDRESS: TestAddress = TestAddress::new("owner");
+const PRICE_AGGREGATOR_ADDRESS: TestSCAddress = TestSCAddress::new("price-aggregator");
+const PRICE_AGGREGATOR_PATH_EXPR: MxscPath =
+    MxscPath::new("mxsc:output/multiversx-price-aggregator-sc.mxsc.json");
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
@@ -35,31 +36,27 @@ fn world() -> ScenarioWorld {
 #[test]
 fn test_price_aggregator_submit() {
     let (mut world, oracles) = setup();
-    let price_aggregator_whitebox = WhiteboxContract::new(
-        PRICE_AGGREGATOR_ADDRESS_EXPR,
-        multiversx_price_aggregator_sc::contract_obj,
-    );
 
     // configure the number of decimals
-    world.whitebox_call(
-        &price_aggregator_whitebox,
-        ScCallStep::new().from(OWNER_ADDRESS_EXPR),
-        |sc| {
+    world
+        .tx()
+        .from(OWNER_ADDRESS)
+        .to(PRICE_AGGREGATOR_ADDRESS)
+        .whitebox(multiversx_price_aggregator_sc::contract_obj, |sc| {
             sc.set_pair_decimals(
                 managed_buffer!(EGLD_TICKER),
                 managed_buffer!(USD_TICKER),
                 DECIMALS,
             )
-        },
-    );
+        });
 
     // try submit while paused
-    world.whitebox_call_check(
-        &price_aggregator_whitebox,
-        ScCallStep::new()
-            .from(&oracles[0])
-            .expect(TxExpect::user_error("str:Contract is paused")),
-        |sc| {
+    world
+        .tx()
+        .from(&oracles[0])
+        .to(PRICE_AGGREGATOR_ADDRESS)
+        .returns(ExpectError(4u64, "Contract is paused"))
+        .whitebox(multiversx_price_aggregator_sc::contract_obj, |sc| {
             sc.submit(
                 managed_buffer!(EGLD_TICKER),
                 managed_buffer!(USD_TICKER),
@@ -67,22 +64,24 @@ fn test_price_aggregator_submit() {
                 managed_biguint!(100),
                 DECIMALS,
             )
-        },
-        |r| r.assert_user_error("Contract is paused"),
-    );
+        });
 
     // unpause
-    world.whitebox_call(
-        &price_aggregator_whitebox,
-        ScCallStep::new().from(OWNER_ADDRESS_EXPR),
-        |sc| sc.call_unpause_endpoint(),
-    );
+    world
+        .tx()
+        .from(OWNER_ADDRESS)
+        .to(PRICE_AGGREGATOR_ADDRESS)
+        .whitebox(multiversx_price_aggregator_sc::contract_obj, |sc| {
+            sc.call_unpause_endpoint();
+        });
 
     // submit first timestamp too old
-    world.whitebox_call_check(
-        &price_aggregator_whitebox,
-        ScCallStep::new().from(&oracles[0]).no_expect(),
-        |sc| {
+    world
+        .tx()
+        .from(&oracles[0])
+        .to(PRICE_AGGREGATOR_ADDRESS)
+        .returns(ExpectError(4u64, "First submission too old"))
+        .whitebox(multiversx_price_aggregator_sc::contract_obj, |sc| {
             sc.submit(
                 managed_buffer!(EGLD_TICKER),
                 managed_buffer!(USD_TICKER),
@@ -90,17 +89,14 @@ fn test_price_aggregator_submit() {
                 managed_biguint!(100),
                 DECIMALS,
             )
-        },
-        |r| {
-            r.assert_user_error("First submission too old");
-        },
-    );
+        });
 
     // submit ok
-    world.whitebox_call(
-        &price_aggregator_whitebox,
-        ScCallStep::new().from(&oracles[0]),
-        |sc| {
+    world
+        .tx()
+        .from(&oracles[0])
+        .to(PRICE_AGGREGATOR_ADDRESS)
+        .whitebox(multiversx_price_aggregator_sc::contract_obj, |sc| {
             sc.submit(
                 managed_buffer!(EGLD_TICKER),
                 managed_buffer!(USD_TICKER),
@@ -108,49 +104,50 @@ fn test_price_aggregator_submit() {
                 managed_biguint!(100),
                 DECIMALS,
             )
-        },
-    );
+        });
 
     let current_timestamp = 100;
-    world.whitebox_query(&price_aggregator_whitebox, |sc| {
-        let token_pair = TokenPair {
-            from: managed_buffer!(EGLD_TICKER),
-            to: managed_buffer!(USD_TICKER),
-        };
-        assert_eq!(
-            sc.first_submission_timestamp(&token_pair).get(),
-            current_timestamp
-        );
-        assert_eq!(
-            sc.last_submission_timestamp(&token_pair).get(),
-            current_timestamp
-        );
-
-        let submissions = sc.submissions().get(&token_pair).unwrap();
-        assert_eq!(submissions.len(), 1);
-        assert_eq!(
-            submissions
-                .get(&managed_address!(&oracles[0].to_address()))
-                .unwrap(),
-            managed_biguint!(100)
-        );
-
-        assert_eq!(
-            sc.oracle_status()
-                .get(&managed_address!(&oracles[0].to_address()))
-                .unwrap(),
-            OracleStatus {
-                total_submissions: 1,
-                accepted_submissions: 1
-            }
-        );
-    });
+    world.query().to(PRICE_AGGREGATOR_ADDRESS).whitebox(
+        multiversx_price_aggregator_sc::contract_obj,
+        |sc| {
+            let token_pair = TokenPair {
+                from: managed_buffer!(EGLD_TICKER),
+                to: managed_buffer!(USD_TICKER),
+            };
+            assert_eq!(
+                sc.first_submission_timestamp(&token_pair).get(),
+                current_timestamp
+            );
+            assert_eq!(
+                sc.last_submission_timestamp(&token_pair).get(),
+                current_timestamp
+            );
+
+            let submissions = sc.submissions().get(&token_pair).unwrap();
+            assert_eq!(submissions.len(), 1);
+            assert_eq!(
+                submissions.get(&ManagedAddress::from(&oracles[0])).unwrap(),
+                managed_biguint!(100)
+            );
+
+            assert_eq!(
+                sc.oracle_status()
+                    .get(&ManagedAddress::from(&oracles[0]))
+                    .unwrap(),
+                OracleStatus {
+                    total_submissions: 1,
+                    accepted_submissions: 1
+                }
+            );
+        },
+    );
 
     // first oracle submit again - submission not accepted
-    world.whitebox_call(
-        &price_aggregator_whitebox,
-        ScCallStep::new().from(&oracles[0]),
-        |sc| {
+    world
+        .tx()
+        .from(&oracles[0])
+        .to(PRICE_AGGREGATOR_ADDRESS)
+        .whitebox(multiversx_price_aggregator_sc::contract_obj, |sc| {
             sc.submit(
                 managed_buffer!(EGLD_TICKER),
                 managed_buffer!(USD_TICKER),
@@ -158,55 +155,56 @@ fn test_price_aggregator_submit() {
                 managed_biguint!(100),
                 DECIMALS,
             )
+        });
+
+    world.query().to(PRICE_AGGREGATOR_ADDRESS).whitebox(
+        multiversx_price_aggregator_sc::contract_obj,
+        |sc| {
+            assert_eq!(
+                sc.oracle_status()
+                    .get(&ManagedAddress::from(&oracles[0]))
+                    .unwrap(),
+                OracleStatus {
+                    total_submissions: 2,
+                    accepted_submissions: 1
+                }
+            );
         },
     );
-
-    world.whitebox_query(&price_aggregator_whitebox, |sc| {
-        assert_eq!(
-            sc.oracle_status()
-                .get(&managed_address!(&oracles[0].to_address()))
-                .unwrap(),
-            OracleStatus {
-                total_submissions: 2,
-                accepted_submissions: 1
-            }
-        );
-    });
 }
 
 #[test]
 fn test_price_aggregator_submit_round_ok() {
     let (mut world, oracles) = setup();
-    let price_aggregator_whitebox = WhiteboxContract::new(
-        PRICE_AGGREGATOR_ADDRESS_EXPR,
-        multiversx_price_aggregator_sc::contract_obj,
-    );
 
     // configure the number of decimals
-    world.whitebox_call(
-        &price_aggregator_whitebox,
-        ScCallStep::new().from(OWNER_ADDRESS_EXPR),
-        |sc| {
+    world
+        .tx()
+        .from(OWNER_ADDRESS)
+        .to(PRICE_AGGREGATOR_ADDRESS)
+        .whitebox(multiversx_price_aggregator_sc::contract_obj, |sc| {
             sc.set_pair_decimals(
                 managed_buffer!(EGLD_TICKER),
                 managed_buffer!(USD_TICKER),
                 DECIMALS,
             )
-        },
-    );
+        });
 
     // unpause
-    world.whitebox_call(
-        &price_aggregator_whitebox,
-        ScCallStep::new().from(OWNER_ADDRESS_EXPR),
-        |sc| sc.call_unpause_endpoint(),
-    );
+    world
+        .tx()
+        .from(OWNER_ADDRESS)
+        .to(PRICE_AGGREGATOR_ADDRESS)
+        .whitebox(multiversx_price_aggregator_sc::contract_obj, |sc| {
+            sc.call_unpause_endpoint();
+        });
 
     // submit first
-    world.whitebox_call(
-        &price_aggregator_whitebox,
-        ScCallStep::new().from(&oracles[0]),
-        |sc| {
+    world
+        .tx()
+        .from(&oracles[0])
+        .to(PRICE_AGGREGATOR_ADDRESS)
+        .whitebox(multiversx_price_aggregator_sc::contract_obj, |sc| {
             sc.submit(
                 managed_buffer!(EGLD_TICKER),
                 managed_buffer!(USD_TICKER),
@@ -214,17 +212,17 @@ fn test_price_aggregator_submit_round_ok() {
                 managed_biguint!(10_000),
                 DECIMALS,
             )
-        },
-    );
+        });
 
     let current_timestamp = 110;
-    world.set_state_step(SetStateStep::new().block_timestamp(current_timestamp));
+    world.current_block().block_timestamp(current_timestamp);
 
     // submit second
-    world.whitebox_call(
-        &price_aggregator_whitebox,
-        ScCallStep::new().from(&oracles[1]),
-        |sc| {
+    world
+        .tx()
+        .from(&oracles[1])
+        .to(PRICE_AGGREGATOR_ADDRESS)
+        .whitebox(multiversx_price_aggregator_sc::contract_obj, |sc| {
             sc.submit(
                 managed_buffer!(EGLD_TICKER),
                 managed_buffer!(USD_TICKER),
@@ -232,14 +230,14 @@ fn test_price_aggregator_submit_round_ok() {
                 managed_biguint!(11_000),
                 DECIMALS,
             )
-        },
-    );
+        });
 
     // submit third
-    world.whitebox_call(
-        &price_aggregator_whitebox,
-        ScCallStep::new().from(&oracles[2]),
-        |sc| {
+    world
+        .tx()
+        .from(&oracles[2])
+        .to(PRICE_AGGREGATOR_ADDRESS)
+        .whitebox(multiversx_price_aggregator_sc::contract_obj, |sc| {
             sc.submit(
                 managed_buffer!(EGLD_TICKER),
                 managed_buffer!(USD_TICKER),
@@ -247,72 +245,73 @@ fn test_price_aggregator_submit_round_ok() {
                 managed_biguint!(12_000),
                 DECIMALS,
             )
+        });
+
+    world.query().to(PRICE_AGGREGATOR_ADDRESS).whitebox(
+        multiversx_price_aggregator_sc::contract_obj,
+        |sc| {
+            let result =
+                sc.latest_price_feed(managed_buffer!(EGLD_TICKER), managed_buffer!(USD_TICKER));
+
+            let (round_id, from, to, timestamp, price, decimals) = result.into_tuple();
+            assert_eq!(round_id, 1);
+            assert_eq!(from, managed_buffer!(EGLD_TICKER));
+            assert_eq!(to, managed_buffer!(USD_TICKER));
+            assert_eq!(timestamp, current_timestamp);
+            assert_eq!(price, managed_biguint!(11_000));
+            assert_eq!(decimals, DECIMALS);
+
+            // submissions are deleted after round is created
+            let token_pair = TokenPair { from, to };
+            let submissions = sc.submissions().get(&token_pair).unwrap();
+            assert_eq!(submissions.len(), 0);
+
+            let rounds = sc.rounds().get(&token_pair).unwrap();
+            assert_eq!(rounds.len(), 1);
+            assert_eq!(
+                rounds.get(1),
+                TimestampedPrice {
+                    timestamp,
+                    price,
+                    decimals
+                }
+            );
         },
     );
-
-    world.whitebox_query(&price_aggregator_whitebox, |sc| {
-        let result =
-            sc.latest_price_feed(managed_buffer!(EGLD_TICKER), managed_buffer!(USD_TICKER));
-
-        let (round_id, from, to, timestamp, price, decimals) = result.into_tuple();
-        assert_eq!(round_id, 1);
-        assert_eq!(from, managed_buffer!(EGLD_TICKER));
-        assert_eq!(to, managed_buffer!(USD_TICKER));
-        assert_eq!(timestamp, current_timestamp);
-        assert_eq!(price, managed_biguint!(11_000));
-        assert_eq!(decimals, DECIMALS);
-
-        // submissions are deleted after round is created
-        let token_pair = TokenPair { from, to };
-        let submissions = sc.submissions().get(&token_pair).unwrap();
-        assert_eq!(submissions.len(), 0);
-
-        let rounds = sc.rounds().get(&token_pair).unwrap();
-        assert_eq!(rounds.len(), 1);
-        assert_eq!(
-            rounds.get(1),
-            TimestampedPrice {
-                timestamp,
-                price,
-                decimals
-            }
-        );
-    });
 }
 
 #[test]
 fn test_price_aggregator_discarded_round() {
     let (mut world, oracles) = setup();
-    let price_aggregator_whitebox = WhiteboxContract::new(
-        PRICE_AGGREGATOR_ADDRESS_EXPR,
-        multiversx_price_aggregator_sc::contract_obj,
-    );
 
     // configure the number of decimals
-    world.whitebox_call(
-        &price_aggregator_whitebox,
-        ScCallStep::new().from(OWNER_ADDRESS_EXPR),
-        |sc| {
+    world
+        .tx()
+        .from(OWNER_ADDRESS)
+        .to(PRICE_AGGREGATOR_ADDRESS)
+        .whitebox(multiversx_price_aggregator_sc::contract_obj, |sc| {
             sc.set_pair_decimals(
                 managed_buffer!(EGLD_TICKER),
                 managed_buffer!(USD_TICKER),
                 DECIMALS,
             )
-        },
-    );
+        });
 
     // unpause
-    world.whitebox_call(
-        &price_aggregator_whitebox,
-        ScCallStep::new().from(OWNER_ADDRESS_EXPR),
-        |sc| sc.call_unpause_endpoint(),
-    );
+    world
+        .tx()
+        .from(OWNER_ADDRESS)
+        .to(PRICE_AGGREGATOR_ADDRESS)
+        .whitebox(multiversx_price_aggregator_sc::contract_obj, |sc| {
+            sc.call_unpause_endpoint();
+        });
 
     // submit first
-    world.whitebox_call(
-        &price_aggregator_whitebox,
-        ScCallStep::new().from(&oracles[0]),
-        |sc| {
+    world
+        .tx()
+        .from(&oracles[0])
+        .to(PRICE_AGGREGATOR_ADDRESS)
+        .whitebox(multiversx_price_aggregator_sc::contract_obj, |sc| {
             sc.submit(
                 managed_buffer!(EGLD_TICKER),
                 managed_buffer!(USD_TICKER),
@@ -320,17 +319,17 @@ fn test_price_aggregator_discarded_round() {
                 managed_biguint!(10_000),
                 DECIMALS,
             )
-        },
-    );
+        });
 
     let current_timestamp = 100 + MAX_ROUND_DURATION_SECONDS + 1;
-    world.set_state_step(SetStateStep::new().block_timestamp(current_timestamp));
+    world.current_block().block_timestamp(current_timestamp);
 
     // submit second - this will discard the previous submission
-    world.whitebox_call(
-        &price_aggregator_whitebox,
-        ScCallStep::new().from(&oracles[1]),
-        |sc| {
+    world
+        .tx()
+        .from(&oracles[1])
+        .to(PRICE_AGGREGATOR_ADDRESS)
+        .whitebox(multiversx_price_aggregator_sc::contract_obj, |sc| {
             sc.submit(
                 managed_buffer!(EGLD_TICKER),
                 managed_buffer!(USD_TICKER),
@@ -338,77 +337,100 @@ fn test_price_aggregator_discarded_round() {
                 managed_biguint!(11_000),
                 DECIMALS,
             )
+        });
+
+    world.query().to(PRICE_AGGREGATOR_ADDRESS).whitebox(
+        multiversx_price_aggregator_sc::contract_obj,
+        |sc| {
+            let token_pair = TokenPair {
+                from: managed_buffer!(EGLD_TICKER),
+                to: managed_buffer!(USD_TICKER),
+            };
+            let submissions = sc.submissions().get(&token_pair).unwrap();
+            assert_eq!(submissions.len(), 1);
+            assert_eq!(
+                submissions.get(&managed_address!(&oracles[1])).unwrap(),
+                managed_biguint!(11_000)
+            );
         },
     );
-
-    world.whitebox_query(&price_aggregator_whitebox, |sc| {
-        let token_pair = TokenPair {
-            from: managed_buffer!(EGLD_TICKER),
-            to: managed_buffer!(USD_TICKER),
-        };
-        let submissions = sc.submissions().get(&token_pair).unwrap();
-        assert_eq!(submissions.len(), 1);
-        assert_eq!(
-            submissions
-                .get(&managed_address!(&oracles[1].to_address()))
-                .unwrap(),
-            managed_biguint!(11_000)
-        );
-    });
 }
 
 #[test]
 fn test_price_aggregator_slashing() {
     let (mut world, oracles) = setup();
-    let price_aggregator_whitebox = WhiteboxContract::new(
-        PRICE_AGGREGATOR_ADDRESS_EXPR,
-        multiversx_price_aggregator_sc::contract_obj,
-    );
 
-    // unpause
-    world.whitebox_call(
-        &price_aggregator_whitebox,
-        ScCallStep::new().from(OWNER_ADDRESS_EXPR),
-        |sc| sc.call_unpause_endpoint(),
-    );
-
-    world.whitebox_call(
-        &price_aggregator_whitebox,
-        ScCallStep::new()
-            .from(&oracles[0])
-            .argument(BytesValue::from(oracles[1].to_address().as_bytes())),
-        |sc| sc.call_vote_slash_member(),
-    );
-
-    world.whitebox_call(
-        &price_aggregator_whitebox,
-        ScCallStep::new()
-            .from(&oracles[2])
-            .argument(BytesValue::from(oracles[1].to_address().as_bytes())),
-        |sc| sc.call_vote_slash_member(),
-    );
+    // configure the number of decimals
+    world
+        .tx()
+        .from(OWNER_ADDRESS)
+        .to(PRICE_AGGREGATOR_ADDRESS)
+        .whitebox(multiversx_price_aggregator_sc::contract_obj, |sc| {
+            sc.set_pair_decimals(
+                managed_buffer!(EGLD_TICKER),
+                managed_buffer!(USD_TICKER),
+                DECIMALS,
+            )
+        });
 
-    world.whitebox_call(
-        &price_aggregator_whitebox,
-        ScCallStep::new()
-            .from(&oracles[3])
-            .argument(BytesValue::from(oracles[1].to_address().as_bytes())),
-        |sc| sc.call_vote_slash_member(),
+    // unpause
+    world
+        .tx()
+        .from(OWNER_ADDRESS)
+        .to(PRICE_AGGREGATOR_ADDRESS)
+        .whitebox(multiversx_price_aggregator_sc::contract_obj, |sc| {
+            sc.call_unpause_endpoint();
+        });
+
+    world
+        .tx()
+        .from(&oracles[0])
+        .to(PRICE_AGGREGATOR_ADDRESS)
+        .whitebox(multiversx_price_aggregator_sc::contract_obj, |sc| {
+            sc.vote_slash_member(ManagedAddress::from(&oracles[1]));
+        });
+
+    world
+        .tx()
+        .from(&oracles[2])
+        .to(PRICE_AGGREGATOR_ADDRESS)
+        .whitebox(multiversx_price_aggregator_sc::contract_obj, |sc| {
+            sc.vote_slash_member(ManagedAddress::from(&oracles[1]))
+        });
+
+    world
+        .tx()
+        .from(&oracles[3])
+        .to(PRICE_AGGREGATOR_ADDRESS)
+        .whitebox(multiversx_price_aggregator_sc::contract_obj, |sc| {
+            sc.vote_slash_member(ManagedAddress::from(&oracles[1]));
+        });
+
+    world.query().to(PRICE_AGGREGATOR_ADDRESS).whitebox(
+        multiversx_price_aggregator_sc::contract_obj,
+        |sc| {
+            let list = sc.slashing_proposal_voters(&ManagedAddress::from(&oracles[1]));
+            assert!(list.contains(&ManagedAddress::from(&oracles[0])));
+            assert!(list.contains(&ManagedAddress::from(&oracles[2])));
+            assert!(list.contains(&ManagedAddress::from(&oracles[3])));
+        },
     );
 
-    world.whitebox_call(
-        &price_aggregator_whitebox,
-        ScCallStep::new()
-            .from(&oracles[0])
-            .argument(BytesValue::from(oracles[1].to_address().as_bytes())),
-        |sc| sc.call_slash_member(),
-    );
+    world
+        .tx()
+        .from(&oracles[0])
+        .to(PRICE_AGGREGATOR_ADDRESS)
+        .whitebox(multiversx_price_aggregator_sc::contract_obj, |sc| {
+            sc.slash_member(ManagedAddress::from(&oracles[1]));
+        });
 
     // oracle 1 try submit after slashing
-    world.whitebox_call_check(
-        &price_aggregator_whitebox,
-        ScCallStep::new().from(&oracles[1]).no_expect(),
-        |sc| {
+    world
+        .tx()
+        .from(&oracles[1])
+        .to(PRICE_AGGREGATOR_ADDRESS)
+        .returns(ExpectError(4u64, "only oracles allowed"))
+        .whitebox(multiversx_price_aggregator_sc::contract_obj, |sc| {
             sc.submit(
                 managed_buffer!(EGLD_TICKER),
                 managed_buffer!(USD_TICKER),
@@ -416,49 +438,37 @@ fn test_price_aggregator_slashing() {
                 managed_biguint!(10_000),
                 DECIMALS,
             )
-        },
-        |r| {
-            r.assert_user_error("only oracles allowed");
-        },
-    );
+        });
 }
 
-fn setup() -> (ScenarioWorld, Vec<AddressValue>) {
+fn setup() -> (ScenarioWorld, Vec<Address>) {
     // setup
     let mut world = world();
-    let price_aggregator_whitebox = WhiteboxContract::new(
-        PRICE_AGGREGATOR_ADDRESS_EXPR,
-        multiversx_price_aggregator_sc::contract_obj,
-    );
-    let price_aggregator_code = world.code_expression(PRICE_AGGREGATOR_PATH_EXPR);
 
-    let mut set_state_step = SetStateStep::new()
-        .put_account(OWNER_ADDRESS_EXPR, Account::new().nonce(1))
-        .new_address(OWNER_ADDRESS_EXPR, 1, PRICE_AGGREGATOR_ADDRESS_EXPR)
-        .block_timestamp(100);
+    world.account(OWNER_ADDRESS).nonce(1);
+    world.current_block().block_timestamp(100);
 
     let mut oracles = Vec::new();
     for i in 1..=NR_ORACLES {
-        let oracle_address_expr = format!("address:oracle{i}");
-        let oracle_address = AddressValue::from(oracle_address_expr.as_str());
-
-        set_state_step = set_state_step.put_account(
-            oracle_address_expr.as_str(),
-            Account::new().nonce(1).balance(STAKE_AMOUNT),
-        );
-        oracles.push(oracle_address);
+        let oracle_address_expr = format!("oracle{i}");
+        let oracle_address = TestAddress::new(&oracle_address_expr);
+
+        world.account(oracle_address).nonce(1).balance(STAKE_AMOUNT);
+
+        oracles.push(oracle_address.to_address());
     }
 
     // init price aggregator
-    world.set_state_step(set_state_step).whitebox_deploy(
-        &price_aggregator_whitebox,
-        ScDeployStep::new()
-            .from(OWNER_ADDRESS_EXPR)
-            .code(price_aggregator_code),
-        |sc| {
+    world
+        .tx()
+        .from(OWNER_ADDRESS)
+        .raw_deploy()
+        .code(PRICE_AGGREGATOR_PATH_EXPR)
+        .new_address(PRICE_AGGREGATOR_ADDRESS)
+        .whitebox(multiversx_price_aggregator_sc::contract_obj, |sc| {
             let mut oracle_args = MultiValueEncoded::new();
             for oracle_address in &oracles {
-                oracle_args.push(managed_address!(&oracle_address.to_address()));
+                oracle_args.push(ManagedAddress::from(oracle_address));
             }
 
             sc.init(
@@ -469,17 +479,17 @@ fn setup() -> (ScenarioWorld, Vec<AddressValue>) {
                 SUBMISSION_COUNT,
                 oracle_args,
             )
-        },
-    );
+        });
 
     for oracle_address in &oracles {
-        world.whitebox_call(
-            &price_aggregator_whitebox,
-            ScCallStep::new()
-                .from(oracle_address)
-                .egld_value(STAKE_AMOUNT),
-            |sc| sc.call_stake(),
-        );
+        world
+            .tx()
+            .from(oracle_address)
+            .to(PRICE_AGGREGATOR_ADDRESS)
+            .egld(STAKE_AMOUNT)
+            .whitebox(multiversx_price_aggregator_sc::contract_obj, |sc| {
+                sc.call_stake();
+            });
     }
 
     (world, oracles)
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 adf9582982..130c2b237c 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
@@ -1,15 +1,17 @@
 use multiversx_sc_modules::transfer_role_proxy::TransferRoleProxyModule;
 use multiversx_sc_scenario::imports::*;
 use transfer_role_features::TransferRoleFeatures;
+use vault::Vault;
 
-const OWNER_ADDRESS_EXPR: &str = "address:owner";
-const USER_ADDRESS_EXPR: &str = "address:user";
+const OWNER_ADDRESS: TestAddress = TestAddress::new("owner");
+const USER_ADDRESS: TestAddress = TestAddress::new("user");
 
-const TRANSFER_ROLE_FEATURES_ADDRESS_EXPR: &str = "sc:transfer-role-features";
-const TRANSFER_ROLE_FEATURES_PATH_EXPR: &str = "mxsc:output/transfer-role-features.mxsc.json";
+const TRANSFER_ROLE_FEATURES_ADDRESS: TestSCAddress = TestSCAddress::new("transfer-role-features");
+const TRANSFER_ROLE_FEATURES_PATH_EXPR: MxscPath =
+    MxscPath::new("mxsc:output/transfer-role-features.mxsc.json");
 
-const TRANSFER_TOKEN_ID_EXPR: &str = "str:TRANSFER-123456";
-const TRANSFER_TOKEN_ID: &[u8] = b"TRANSFER-123456";
+const TRANSFER_TOKEN_ID: TestTokenIdentifier = TestTokenIdentifier::new("TRANSFER-123456");
+const TRANSFER_TOKEN_ID_EXPR: &[u8] = b"TRANSFER-123456";
 
 const ACCEPT_FUNDS_FUNC_NAME: &[u8] = b"accept_funds";
 const REJECT_FUNDS_FUNC_NAME: &[u8] = b"reject_funds";
@@ -27,175 +29,161 @@ fn world() -> ScenarioWorld {
 fn test_transfer_role() {
     let mut world = world();
 
-    world.set_state_step(
-        SetStateStep::new()
-            .put_account(OWNER_ADDRESS_EXPR, Account::new().nonce(1))
-            .new_address(OWNER_ADDRESS_EXPR, 1, TRANSFER_ROLE_FEATURES_ADDRESS_EXPR)
-            .put_account(
-                USER_ADDRESS_EXPR,
-                Account::new()
-                    .nonce(1)
-                    .esdt_balance(TRANSFER_TOKEN_ID_EXPR, 1_000u64),
-            ),
-    );
+    world.account(OWNER_ADDRESS).nonce(1);
+    world
+        .account(USER_ADDRESS)
+        .nonce(1)
+        .esdt_balance(TRANSFER_TOKEN_ID, BigUint::from(1_000u64));
 
     // vault
-    let vault_code = world.code_expression(VAULT_PATH_EXPR);
-
-    const VAULT_ADDRESS_EXPR: &str = "sc:vault";
-    const VAULT_PATH_EXPR: &str = "mxsc:../vault/output/vault.mxsc.json";
+    const VAULT_ADDRESS: TestSCAddress = TestSCAddress::new("vault");
+    const VAULT_PATH_EXPR: MxscPath = MxscPath::new("mxsc:../vault/output/vault.mxsc.json");
 
     world.register_contract(VAULT_PATH_EXPR, vault::ContractBuilder);
-    world.set_state_step(
-        SetStateStep::new()
-            .put_account(VAULT_ADDRESS_EXPR, Account::new().nonce(1).code(vault_code)),
-    );
-
-    let transfer_role_features_whitebox = WhiteboxContract::new(
-        TRANSFER_ROLE_FEATURES_ADDRESS_EXPR,
-        transfer_role_features::contract_obj,
-    );
-    let transfer_role_features_code = world.code_expression(TRANSFER_ROLE_FEATURES_PATH_EXPR);
+    world
+        .tx()
+        .from(OWNER_ADDRESS)
+        .raw_deploy()
+        .new_address(VAULT_ADDRESS)
+        .code(VAULT_PATH_EXPR)
+        .whitebox(vault::contract_obj, |sc| {
+            let _ = sc.init(OptionalValue::None);
+        });
 
     // init
-    world.whitebox_deploy(
-        &transfer_role_features_whitebox,
-        ScDeployStep::new()
-            .from(OWNER_ADDRESS_EXPR)
-            .code(transfer_role_features_code),
-        |sc| {
+    world
+        .tx()
+        .from(OWNER_ADDRESS)
+        .raw_deploy()
+        .new_address(TRANSFER_ROLE_FEATURES_ADDRESS)
+        .code(TRANSFER_ROLE_FEATURES_PATH_EXPR)
+        .whitebox(transfer_role_features::contract_obj, |sc| {
             let mut whitelist = MultiValueEncoded::new();
-            whitelist.push(managed_address!(&address_expr_to_address(
-                OWNER_ADDRESS_EXPR
-            )));
-            whitelist.push(managed_address!(&address_expr_to_address(
-                VAULT_ADDRESS_EXPR
-            )));
+            whitelist.push(OWNER_ADDRESS.to_managed_address());
+            whitelist.push(VAULT_ADDRESS.to_managed_address());
 
             sc.init(whitelist);
-        },
-    );
+        });
 
     // transfer to user - ok
-    world.whitebox_call(
-        &transfer_role_features_whitebox,
-        ScCallStep::new()
-            .from(USER_ADDRESS_EXPR)
-            .esdt_transfer(TRANSFER_TOKEN_ID, 0, "100"),
-        |sc| {
+    world
+        .tx()
+        .from(USER_ADDRESS)
+        .to(TRANSFER_ROLE_FEATURES_ADDRESS)
+        .single_esdt(
+            &TokenIdentifier::from(TRANSFER_TOKEN_ID),
+            0,
+            &BigUint::from(100u64),
+        )
+        .whitebox(transfer_role_features::contract_obj, |sc| {
             let payments = ManagedVec::from_single_item(EsdtTokenPayment::new(
-                managed_token_id!(TRANSFER_TOKEN_ID),
+                managed_token_id!(TRANSFER_TOKEN_ID_EXPR),
                 0,
                 managed_biguint!(100),
             ));
             sc.transfer_to_user(
-                managed_address!(&address_expr_to_address(USER_ADDRESS_EXPR)),
-                managed_address!(&address_expr_to_address(OWNER_ADDRESS_EXPR)),
+                USER_ADDRESS.to_managed_address(),
+                OWNER_ADDRESS.to_managed_address(),
                 &payments,
                 managed_buffer!(b"enjoy"),
             );
-        },
-    );
+        });
 
-    world.check_state_step(CheckStateStep::new().put_account(
-        USER_ADDRESS_EXPR,
-        CheckAccount::new().esdt_balance(TRANSFER_TOKEN_ID_EXPR, "900"),
-    ));
-    world.check_state_step(CheckStateStep::new().put_account(
-        OWNER_ADDRESS_EXPR,
-        CheckAccount::new().esdt_balance(TRANSFER_TOKEN_ID_EXPR, "100"),
-    ));
+    world
+        .check_account(USER_ADDRESS)
+        .esdt_balance(TRANSFER_TOKEN_ID, BigUint::from(900u64));
+    world
+        .check_account(OWNER_ADDRESS)
+        .esdt_balance(TRANSFER_TOKEN_ID, BigUint::from(100u64));
 
     // transfer to user - err, not whitelisted
-    world.whitebox_call_check(
-        &transfer_role_features_whitebox,
-        ScCallStep::new()
-            .from(USER_ADDRESS_EXPR)
-            .esdt_transfer(TRANSFER_TOKEN_ID, 0, "100")
-            .no_expect(),
-        |sc| {
+    world
+        .tx()
+        .from(USER_ADDRESS)
+        .to(TRANSFER_ROLE_FEATURES_ADDRESS)
+        .single_esdt(
+            &TokenIdentifier::from(TRANSFER_TOKEN_ID),
+            0,
+            &BigUint::from(100u64),
+        )
+        .returns(ExpectError(4u64, "Destination address not whitelisted"))
+        .whitebox(transfer_role_features::contract_obj, |sc| {
             let payments = ManagedVec::from_single_item(EsdtTokenPayment::new(
-                managed_token_id!(TRANSFER_TOKEN_ID),
+                managed_token_id!(TRANSFER_TOKEN_ID_EXPR),
                 0,
                 managed_biguint!(100),
             ));
             sc.transfer_to_user(
-                managed_address!(&address_expr_to_address(USER_ADDRESS_EXPR)),
+                USER_ADDRESS.to_managed_address(),
                 managed_address!(&Address::zero()),
                 &payments,
                 managed_buffer!(b"enjoy"),
             );
-        },
-        |r| {
-            r.assert_user_error("Destination address not whitelisted");
-        },
-    );
+        });
 
     // transfer to sc - ok
-    world.whitebox_call(
-        &transfer_role_features_whitebox,
-        ScCallStep::new()
-            .from(USER_ADDRESS_EXPR)
-            .esdt_transfer(TRANSFER_TOKEN_ID, 0, "100"),
-        |sc| {
+    world
+        .tx()
+        .from(USER_ADDRESS)
+        .to(TRANSFER_ROLE_FEATURES_ADDRESS)
+        .single_esdt(
+            &TokenIdentifier::from(TRANSFER_TOKEN_ID),
+            0,
+            &BigUint::from(100u64),
+        )
+        .whitebox(transfer_role_features::contract_obj, |sc| {
             let payments = ManagedVec::from_single_item(EsdtTokenPayment::new(
-                managed_token_id!(TRANSFER_TOKEN_ID),
+                managed_token_id!(TRANSFER_TOKEN_ID_EXPR),
                 0,
                 managed_biguint!(100),
             ));
             sc.transfer_to_contract_raw(
-                managed_address!(&address_expr_to_address(USER_ADDRESS_EXPR)),
-                managed_address!(&address_expr_to_address(VAULT_ADDRESS_EXPR)),
+                USER_ADDRESS.to_managed_address(),
+                VAULT_ADDRESS.to_managed_address(),
                 &payments,
                 managed_buffer!(ACCEPT_FUNDS_FUNC_NAME),
                 ManagedArgBuffer::new(),
                 None,
             );
-        },
-    );
+        });
 
-    world.check_state_step(CheckStateStep::new().put_account(
-        USER_ADDRESS_EXPR,
-        CheckAccount::new().esdt_balance(TRANSFER_TOKEN_ID_EXPR, "800"),
-    ));
-    world.check_state_step(CheckStateStep::new().put_account(
-        VAULT_ADDRESS_EXPR,
-        CheckAccount::new().esdt_balance(TRANSFER_TOKEN_ID_EXPR, "100"),
-    ));
+    world
+        .check_account(USER_ADDRESS)
+        .esdt_balance(TRANSFER_TOKEN_ID, BigUint::from(800u64));
+    world
+        .check_account(VAULT_ADDRESS)
+        .esdt_balance(TRANSFER_TOKEN_ID, BigUint::from(100u64));
 
     // transfer to sc - reject
-    world.whitebox_call(
-        &transfer_role_features_whitebox,
-        ScCallStep::new()
-            .from(USER_ADDRESS_EXPR)
-            .esdt_transfer(TRANSFER_TOKEN_ID, 0, "100"),
-        |sc| {
+    world
+        .tx()
+        .from(USER_ADDRESS)
+        .to(TRANSFER_ROLE_FEATURES_ADDRESS)
+        .single_esdt(
+            &TokenIdentifier::from(TRANSFER_TOKEN_ID),
+            0,
+            &BigUint::from(100u64),
+        )
+        .whitebox(transfer_role_features::contract_obj, |sc| {
             let payments = ManagedVec::from_single_item(EsdtTokenPayment::new(
-                managed_token_id!(TRANSFER_TOKEN_ID),
+                managed_token_id!(TRANSFER_TOKEN_ID_EXPR),
                 0,
                 managed_biguint!(100),
             ));
             sc.transfer_to_contract_raw(
-                managed_address!(&address_expr_to_address(USER_ADDRESS_EXPR)),
-                managed_address!(&address_expr_to_address(VAULT_ADDRESS_EXPR)),
+                USER_ADDRESS.to_managed_address(),
+                VAULT_ADDRESS.to_managed_address(),
                 &payments,
                 managed_buffer!(REJECT_FUNDS_FUNC_NAME),
                 ManagedArgBuffer::new(),
                 None,
             );
-        },
-    );
-
-    world.check_state_step(CheckStateStep::new().put_account(
-        USER_ADDRESS_EXPR,
-        CheckAccount::new().esdt_balance(TRANSFER_TOKEN_ID_EXPR, "800"),
-    ));
-    world.check_state_step(CheckStateStep::new().put_account(
-        VAULT_ADDRESS_EXPR,
-        CheckAccount::new().esdt_balance(TRANSFER_TOKEN_ID_EXPR, "100"),
-    ));
-}
-
-fn address_expr_to_address(address_expr: &str) -> Address {
-    AddressValue::from(address_expr).to_address()
+        });
+
+    world
+        .check_account(USER_ADDRESS)
+        .esdt_balance(TRANSFER_TOKEN_ID, BigUint::from(800u64));
+    world
+        .check_account(VAULT_ADDRESS)
+        .esdt_balance(TRANSFER_TOKEN_ID, BigUint::from(100u64));
 }
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 72b15aac66..288d3042f5 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
@@ -4,7 +4,7 @@ use multiversx_sc_modules::governance::{
 };
 use multiversx_sc_scenario::imports::*;
 
-const GOV_TOKEN_ID_EXPR: &str = "str:GOV-123456";
+const GOV_TOKEN_ID_EXPR: TestTokenIdentifier = TestTokenIdentifier::new("GOV-123456");
 const GOV_TOKEN_ID: &[u8] = b"GOV-123456";
 const QUORUM: u64 = 1_500;
 const MIN_BALANCE_PROPOSAL: u64 = 500;
@@ -15,13 +15,13 @@ const LOCKING_PERIOD_BLOCKS: u64 = 30;
 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 = "mxsc:output/use-module.mxsc.json";
+const USE_MODULE_ADDRESS: TestSCAddress = TestSCAddress::new("use-module");
+const USE_MODULE_PATH_EXPR: MxscPath = MxscPath::new("mxsc:output/use-module.mxsc.json");
 
-const OWNER_ADDRESS_EXPR: &str = "address:owner";
-const FIRST_USER_ADDRESS_EXPR: &str = "address:first-user";
-const SECOND_USER_ADDRESS_EXPR: &str = "address:second-user";
-const THIRD_USER_ADDRESS_EXPR: &str = "address:third-user";
+const OWNER_ADDRESS: TestAddress = TestAddress::new("owner");
+const FIRST_USER_ADDRESS: TestAddress = TestAddress::new("first-user");
+const SECOND_USER_ADDRESS: TestAddress = TestAddress::new("second-user");
+const THIRD_USER_ADDRESS: TestAddress = TestAddress::new("third-user");
 
 pub struct Payment {
     pub token: Vec<u8>,
@@ -39,58 +39,45 @@ fn world() -> ScenarioWorld {
 fn setup() -> ScenarioWorld {
     let mut world = world();
 
-    world.set_state_step(
-        SetStateStep::new()
-            .put_account(
-                OWNER_ADDRESS_EXPR,
-                Account::new()
-                    .nonce(1)
-                    .esdt_balance(GOV_TOKEN_ID_EXPR, INITIAL_GOV_TOKEN_BALANCE),
-            )
-            .new_address(OWNER_ADDRESS_EXPR, 1, USE_MODULE_ADDRESS_EXPR)
-            .put_account(
-                FIRST_USER_ADDRESS_EXPR,
-                Account::new()
-                    .nonce(1)
-                    .esdt_balance(GOV_TOKEN_ID_EXPR, INITIAL_GOV_TOKEN_BALANCE),
-            )
-            .put_account(
-                SECOND_USER_ADDRESS_EXPR,
-                Account::new()
-                    .nonce(1)
-                    .esdt_balance(GOV_TOKEN_ID_EXPR, INITIAL_GOV_TOKEN_BALANCE),
-            )
-            .put_account(
-                THIRD_USER_ADDRESS_EXPR,
-                Account::new()
-                    .nonce(1)
-                    .esdt_balance(GOV_TOKEN_ID_EXPR, INITIAL_GOV_TOKEN_BALANCE),
-            ),
-    );
+    world
+        .account(OWNER_ADDRESS)
+        .nonce(1)
+        .esdt_balance(GOV_TOKEN_ID_EXPR, INITIAL_GOV_TOKEN_BALANCE);
+    world
+        .account(FIRST_USER_ADDRESS)
+        .nonce(1)
+        .esdt_balance(GOV_TOKEN_ID_EXPR, INITIAL_GOV_TOKEN_BALANCE);
+    world
+        .account(SECOND_USER_ADDRESS)
+        .nonce(1)
+        .esdt_balance(GOV_TOKEN_ID_EXPR, INITIAL_GOV_TOKEN_BALANCE);
+    world
+        .account(THIRD_USER_ADDRESS)
+        .nonce(1)
+        .esdt_balance(GOV_TOKEN_ID_EXPR, INITIAL_GOV_TOKEN_BALANCE);
 
     // init
-    let use_module_whitebox =
-        WhiteboxContract::new(USE_MODULE_ADDRESS_EXPR, use_module::contract_obj);
-    let use_module_code = world.code_expression(USE_MODULE_PATH_EXPR);
-
-    world.whitebox_deploy(
-        &use_module_whitebox,
-        ScDeployStep::new()
-            .from(OWNER_ADDRESS_EXPR)
-            .code(use_module_code),
-        |sc| {
+    let new_address = world
+        .tx()
+        .from(OWNER_ADDRESS)
+        .raw_deploy()
+        .code(USE_MODULE_PATH_EXPR)
+        .new_address(USE_MODULE_ADDRESS)
+        .returns(ReturnsNewBech32Address)
+        .whitebox(use_module::contract_obj, |sc| {
             sc.init_governance_module(
-                managed_token_id!(GOV_TOKEN_ID),
-                managed_biguint!(QUORUM),
-                managed_biguint!(MIN_BALANCE_PROPOSAL),
+                TokenIdentifier::from(GOV_TOKEN_ID_EXPR),
+                BigUint::from(QUORUM),
+                BigUint::from(MIN_BALANCE_PROPOSAL),
                 VOTING_DELAY_BLOCKS,
                 VOTING_PERIOD_BLOCKS,
                 LOCKING_PERIOD_BLOCKS,
             );
-        },
-    );
+        });
 
-    world.set_state_step(SetStateStep::new().block_nonce(10));
+    assert_eq!(new_address.to_address(), USE_MODULE_ADDRESS.to_address());
+
+    world.current_block().block_nonce(10);
 
     world
 }
@@ -103,17 +90,18 @@ pub fn propose(
     endpoint_name: &[u8],
     args: Vec<Vec<u8>>,
 ) -> usize {
-    let use_module_whitebox =
-        WhiteboxContract::new(USE_MODULE_ADDRESS_EXPR, use_module::contract_obj);
-
     let mut proposal_id = 0;
 
-    world.whitebox_call(
-        &use_module_whitebox,
-        ScCallStep::new()
-            .from(proposer)
-            .esdt_transfer(GOV_TOKEN_ID, 0, gov_token_amount),
-        |sc| {
+    world
+        .tx()
+        .from(proposer)
+        .to(USE_MODULE_ADDRESS)
+        .single_esdt(
+            &TokenIdentifier::from(GOV_TOKEN_ID_EXPR),
+            0,
+            &BigUint::from(gov_token_amount),
+        )
+        .whitebox(use_module::contract_obj, |sc| {
             let mut args_managed = ManagedVec::new();
             for arg in args {
                 args_managed.push(managed_buffer!(&arg));
@@ -131,8 +119,7 @@ pub fn propose(
             );
 
             proposal_id = sc.propose(managed_buffer!(b"change quorum"), actions);
-        },
-    );
+        });
 
     proposal_id
 }
@@ -145,16 +132,14 @@ fn test_init() {
 #[test]
 fn test_change_gov_config() {
     let mut world = setup();
-    let use_module_whitebox =
-        WhiteboxContract::new(USE_MODULE_ADDRESS_EXPR, use_module::contract_obj);
 
     let mut current_block_nonce = 10;
 
     let proposal_id = propose(
         &mut world,
-        &address_expr_to_address(FIRST_USER_ADDRESS_EXPR),
+        &FIRST_USER_ADDRESS.to_address(),
         500,
-        &address_expr_to_address(USE_MODULE_ADDRESS_EXPR),
+        &USE_MODULE_ADDRESS.to_address(),
         b"changeQuorum",
         vec![1_000u64.to_be_bytes().to_vec()],
     );
@@ -162,209 +147,212 @@ fn test_change_gov_config() {
     assert_eq!(proposal_id, 1);
 
     // vote too early
-    world.whitebox_call_check(
-        &use_module_whitebox,
-        ScCallStep::new()
-            .from(SECOND_USER_ADDRESS_EXPR)
-            .esdt_transfer(GOV_TOKEN_ID, 0, "999")
-            .no_expect(),
-        |sc| {
+    world
+        .tx()
+        .from(SECOND_USER_ADDRESS)
+        .to(USE_MODULE_ADDRESS)
+        .single_esdt(
+            &TokenIdentifier::from(GOV_TOKEN_ID),
+            0,
+            &BigUint::from(999u64),
+        )
+        .returns(ExpectError(4u64, "Proposal is not active"))
+        .whitebox(use_module::contract_obj, |sc| {
             sc.vote(proposal_id, VoteType::UpVote);
-        },
-        |r| {
-            r.assert_user_error("Proposal is not active");
-        },
-    );
+        });
 
     current_block_nonce += VOTING_DELAY_BLOCKS;
-    world.set_state_step(SetStateStep::new().block_nonce(current_block_nonce));
-
-    world.whitebox_call(
-        &use_module_whitebox,
-        ScCallStep::new()
-            .from(SECOND_USER_ADDRESS_EXPR)
-            .esdt_transfer(GOV_TOKEN_ID, 0, "999"),
-        |sc| {
+    world.current_block().block_nonce(current_block_nonce);
+
+    world
+        .tx()
+        .from(SECOND_USER_ADDRESS)
+        .to(USE_MODULE_ADDRESS)
+        .single_esdt(
+            &TokenIdentifier::from(GOV_TOKEN_ID),
+            0,
+            &BigUint::from(999u64),
+        )
+        .whitebox(use_module::contract_obj, |sc| {
             sc.vote(proposal_id, VoteType::UpVote);
-        },
-    );
+        });
 
     // try execute before queue
-    world.whitebox_call_check(
-        &use_module_whitebox,
-        ScCallStep::new().from(FIRST_USER_ADDRESS_EXPR).no_expect(),
-        |sc| {
+    world
+        .tx()
+        .from(FIRST_USER_ADDRESS)
+        .to(USE_MODULE_ADDRESS)
+        .returns(ExpectError(4u64, "Can only execute queued proposals"))
+        .whitebox(use_module::contract_obj, |sc| {
             sc.execute(proposal_id);
-        },
-        |r| {
-            r.assert_user_error("Can only execute queued proposals");
-        },
-    );
+        });
 
     // try queue before voting ends
-    world.whitebox_call_check(
-        &use_module_whitebox,
-        ScCallStep::new().from(FIRST_USER_ADDRESS_EXPR).no_expect(),
-        |sc| {
+    world
+        .tx()
+        .from(FIRST_USER_ADDRESS)
+        .to(USE_MODULE_ADDRESS)
+        .returns(ExpectError(4u64, "Can only queue succeeded proposals"))
+        .whitebox(use_module::contract_obj, |sc| {
             sc.queue(proposal_id);
-        },
-        |r| {
-            r.assert_user_error("Can only queue succeeded proposals");
-        },
-    );
+        });
 
     current_block_nonce += VOTING_PERIOD_BLOCKS;
-    world.set_state_step(SetStateStep::new().block_nonce(current_block_nonce));
+    world.current_block().block_nonce(current_block_nonce);
 
     // try queue not enough votes
-    world.whitebox_call_check(
-        &use_module_whitebox,
-        ScCallStep::new().from(FIRST_USER_ADDRESS_EXPR).no_expect(),
-        |sc| {
+    world
+        .tx()
+        .from(FIRST_USER_ADDRESS)
+        .to(USE_MODULE_ADDRESS)
+        .returns(ExpectError(4u64, "Can only queue succeeded proposals"))
+        .whitebox(use_module::contract_obj, |sc| {
             sc.queue(proposal_id);
-        },
-        |r| {
-            r.assert_user_error("Can only queue succeeded proposals");
-        },
-    );
+        });
 
     // user 1 vote again
     current_block_nonce = 20;
-    world.set_state_step(SetStateStep::new().block_nonce(current_block_nonce));
-    world.whitebox_call(
-        &use_module_whitebox,
-        ScCallStep::new()
-            .from(FIRST_USER_ADDRESS_EXPR)
-            .esdt_transfer(GOV_TOKEN_ID, 0, "200"),
-        |sc| {
+    world.current_block().block_nonce(current_block_nonce);
+
+    world
+        .tx()
+        .from(FIRST_USER_ADDRESS)
+        .to(USE_MODULE_ADDRESS)
+        .single_esdt(
+            &TokenIdentifier::from(GOV_TOKEN_ID),
+            0,
+            &BigUint::from(200u64),
+        )
+        .whitebox(use_module::contract_obj, |sc| {
             sc.vote(proposal_id, VoteType::UpVote);
-        },
-    );
+        });
 
     // owner downvote
-    world.whitebox_call(
-        &use_module_whitebox,
-        ScCallStep::new()
-            .from(OWNER_ADDRESS_EXPR)
-            .esdt_transfer(GOV_TOKEN_ID, 0, "200"),
-        |sc| {
+    world
+        .tx()
+        .from(OWNER_ADDRESS)
+        .to(USE_MODULE_ADDRESS)
+        .single_esdt(
+            &TokenIdentifier::from(GOV_TOKEN_ID),
+            0,
+            &BigUint::from(200u64),
+        )
+        .whitebox(use_module::contract_obj, |sc| {
             sc.vote(proposal_id, VoteType::DownVote);
-        },
-    );
+        });
 
     // try queue too many downvotes
     current_block_nonce = 45;
-    world.set_state_step(SetStateStep::new().block_nonce(current_block_nonce));
-    world.whitebox_call_check(
-        &use_module_whitebox,
-        ScCallStep::new().from(FIRST_USER_ADDRESS_EXPR).no_expect(),
-        |sc| {
+    world.current_block().block_nonce(current_block_nonce);
+
+    world
+        .tx()
+        .from(FIRST_USER_ADDRESS)
+        .to(USE_MODULE_ADDRESS)
+        .returns(ExpectError(4u64, "Can only queue succeeded proposals"))
+        .whitebox(use_module::contract_obj, |sc| {
             sc.queue(proposal_id);
-        },
-        |r| {
-            r.assert_user_error("Can only queue succeeded proposals");
-        },
-    );
+        });
 
     // user 1 vote again
     current_block_nonce = 20;
-    world.set_state_step(SetStateStep::new().block_nonce(current_block_nonce));
-    world.whitebox_call_check(
-        &use_module_whitebox,
-        ScCallStep::new()
-            .from(FIRST_USER_ADDRESS_EXPR)
-            .esdt_transfer(GOV_TOKEN_ID, 0, "200")
-            .no_expect(),
-        |sc| {
+    world.current_block().block_nonce(current_block_nonce);
+
+    world
+        .tx()
+        .from(FIRST_USER_ADDRESS)
+        .to(USE_MODULE_ADDRESS)
+        .single_esdt(
+            &TokenIdentifier::from(GOV_TOKEN_ID),
+            0,
+            &BigUint::from(200u64),
+        )
+        .returns(ExpectError(4u64, "Already voted for this proposal"))
+        .whitebox(use_module::contract_obj, |sc| {
             sc.vote(proposal_id, VoteType::UpVote);
-        },
-        |r| {
-            r.assert_user_error("Already voted for this proposal");
-        },
-    );
+        });
 
     // user 3 vote again
-    world.whitebox_call(
-        &use_module_whitebox,
-        ScCallStep::new()
-            .from(THIRD_USER_ADDRESS_EXPR)
-            .esdt_transfer(GOV_TOKEN_ID, 0, "200"),
-        |sc| {
+    world
+        .tx()
+        .from(THIRD_USER_ADDRESS)
+        .to(USE_MODULE_ADDRESS)
+        .single_esdt(
+            &TokenIdentifier::from(GOV_TOKEN_ID),
+            0,
+            &BigUint::from(200u64),
+        )
+        .whitebox(use_module::contract_obj, |sc| {
             sc.vote(proposal_id, VoteType::UpVote);
-        },
-    );
+        });
 
     // queue ok
     current_block_nonce = 45;
-    world.set_state_step(SetStateStep::new().block_nonce(current_block_nonce));
-    world.whitebox_call(
-        &use_module_whitebox,
-        ScCallStep::new().from(FIRST_USER_ADDRESS_EXPR).no_expect(),
-        |sc| {
+    world.current_block().block_nonce(current_block_nonce);
+
+    world
+        .tx()
+        .from(FIRST_USER_ADDRESS)
+        .to(USE_MODULE_ADDRESS)
+        .whitebox(use_module::contract_obj, |sc| {
             sc.queue(proposal_id);
-        },
-    );
+        });
 
     // try execute too early
-    world.whitebox_call_check(
-        &use_module_whitebox,
-        ScCallStep::new().from(FIRST_USER_ADDRESS_EXPR).no_expect(),
-        |sc| {
-            sc.execute(proposal_id);
-        },
-        |r| {
-            r.assert_user_error("Proposal is in timelock status. Try again later");
-        },
-    );
+    world
+        .tx()
+        .from(FIRST_USER_ADDRESS)
+        .to(USE_MODULE_ADDRESS)
+        .returns(ExpectError(
+            4u64,
+            "Proposal is in timelock status. Try again later",
+        ))
+        .whitebox(use_module::contract_obj, |sc| sc.execute(proposal_id));
 
     // execute ok
     current_block_nonce += LOCKING_PERIOD_BLOCKS;
-    world.set_state_step(SetStateStep::new().block_nonce(current_block_nonce));
-    world.whitebox_call(
-        &use_module_whitebox,
-        ScCallStep::new().from(FIRST_USER_ADDRESS_EXPR).no_expect(),
-        |sc| {
-            sc.execute(proposal_id);
-        },
-    );
+    world.current_block().block_nonce(current_block_nonce);
+
+    world
+        .tx()
+        .from(FIRST_USER_ADDRESS)
+        .to(USE_MODULE_ADDRESS)
+        .whitebox(use_module::contract_obj, |sc| sc.execute(proposal_id));
 
     // after execution, quorum changed from 1_500 to the proposed 1_000
-    world.whitebox_query(&use_module_whitebox, |sc| {
-        assert_eq!(sc.quorum().get(), managed_biguint!(1_000));
-        assert!(sc.proposals().item_is_empty(1));
-    });
-
-    world.check_state_step(CheckStateStep::new().put_account(
-        FIRST_USER_ADDRESS_EXPR,
-        CheckAccount::new().esdt_balance(GOV_TOKEN_ID_EXPR, "300"),
-    ));
-    world.check_state_step(CheckStateStep::new().put_account(
-        SECOND_USER_ADDRESS_EXPR,
-        CheckAccount::new().esdt_balance(GOV_TOKEN_ID_EXPR, "1"),
-    ));
-    world.check_state_step(CheckStateStep::new().put_account(
-        THIRD_USER_ADDRESS_EXPR,
-        CheckAccount::new().esdt_balance(GOV_TOKEN_ID_EXPR, "800"),
-    ));
-    world.check_state_step(CheckStateStep::new().put_account(
-        OWNER_ADDRESS_EXPR,
-        CheckAccount::new().esdt_balance(GOV_TOKEN_ID_EXPR, "800"),
-    ));
+    world
+        .query()
+        .to(USE_MODULE_ADDRESS)
+        .whitebox(use_module::contract_obj, |sc| {
+            assert_eq!(sc.quorum().get(), managed_biguint!(1_000));
+            assert!(sc.proposals().item_is_empty(1));
+        });
+
+    world
+        .check_account(FIRST_USER_ADDRESS)
+        .esdt_balance(GOV_TOKEN_ID_EXPR, BigUint::from(300u64));
+    world
+        .check_account(SECOND_USER_ADDRESS)
+        .esdt_balance(GOV_TOKEN_ID_EXPR, BigUint::from(1u64));
+    world
+        .check_account(THIRD_USER_ADDRESS)
+        .esdt_balance(GOV_TOKEN_ID_EXPR, BigUint::from(800u64));
+    world
+        .check_account(OWNER_ADDRESS)
+        .esdt_balance(GOV_TOKEN_ID_EXPR, BigUint::from(800u64));
 }
 
 #[test]
 fn test_down_veto_gov_config() {
     let mut world = setup();
-    let use_module_whitebox =
-        WhiteboxContract::new(USE_MODULE_ADDRESS_EXPR, use_module::contract_obj);
 
     let mut current_block_nonce = 10;
 
     let proposal_id = propose(
         &mut world,
-        &address_expr_to_address(FIRST_USER_ADDRESS_EXPR),
+        &FIRST_USER_ADDRESS.to_address(),
         500,
-        &address_expr_to_address(USE_MODULE_ADDRESS_EXPR),
+        &USE_MODULE_ADDRESS.to_address(),
         b"changeQuorum",
         vec![1_000u64.to_be_bytes().to_vec()],
     );
@@ -372,81 +360,87 @@ fn test_down_veto_gov_config() {
     assert_eq!(proposal_id, 1);
 
     current_block_nonce += VOTING_DELAY_BLOCKS;
-    world.set_state_step(SetStateStep::new().block_nonce(current_block_nonce));
-
-    world.whitebox_call(
-        &use_module_whitebox,
-        ScCallStep::new()
-            .from(FIRST_USER_ADDRESS_EXPR)
-            .esdt_transfer(GOV_TOKEN_ID, 0, "300"),
-        |sc| {
+    world.current_block().block_nonce(current_block_nonce);
+
+    world
+        .tx()
+        .from(FIRST_USER_ADDRESS)
+        .to(USE_MODULE_ADDRESS)
+        .single_esdt(
+            &TokenIdentifier::from(GOV_TOKEN_ID),
+            0,
+            &BigUint::from(300u64),
+        )
+        .whitebox(use_module::contract_obj, |sc| {
             sc.vote(proposal_id, VoteType::UpVote);
-        },
-    );
+        });
 
     current_block_nonce = 20;
-    world.set_state_step(SetStateStep::new().block_nonce(current_block_nonce));
-    world.whitebox_call(
-        &use_module_whitebox,
-        ScCallStep::new()
-            .from(SECOND_USER_ADDRESS_EXPR)
-            .esdt_transfer(GOV_TOKEN_ID, 0, "200"),
-        |sc| {
+    world.current_block().block_nonce(current_block_nonce);
+
+    world
+        .tx()
+        .from(SECOND_USER_ADDRESS)
+        .to(USE_MODULE_ADDRESS)
+        .single_esdt(
+            &TokenIdentifier::from(GOV_TOKEN_ID),
+            0,
+            &BigUint::from(200u64),
+        )
+        .whitebox(use_module::contract_obj, |sc| {
             sc.vote(proposal_id, VoteType::UpVote);
-        },
-    );
+        });
 
-    world.whitebox_call(
-        &use_module_whitebox,
-        ScCallStep::new()
-            .from(THIRD_USER_ADDRESS_EXPR)
-            .esdt_transfer(GOV_TOKEN_ID, 0, "200"),
-        |sc| {
-            sc.vote(proposal_id, VoteType::DownVetoVote);
-        },
-    );
+    world
+        .tx()
+        .from(THIRD_USER_ADDRESS)
+        .to(USE_MODULE_ADDRESS)
+        .single_esdt(
+            &TokenIdentifier::from(GOV_TOKEN_ID),
+            0,
+            &BigUint::from(200u64),
+        )
+        .whitebox(use_module::contract_obj, |sc| {
+            sc.vote(proposal_id, VoteType::DownVetoVote)
+        });
 
     // Vote didn't succeed;
     current_block_nonce = 45;
-    world.set_state_step(SetStateStep::new().block_nonce(current_block_nonce));
-    world.whitebox_call_check(
-        &use_module_whitebox,
-        ScCallStep::new().from(FIRST_USER_ADDRESS_EXPR).no_expect(),
-        |sc| {
+    world.current_block().block_epoch(current_block_nonce);
+
+    world
+        .tx()
+        .from(FIRST_USER_ADDRESS)
+        .to(USE_MODULE_ADDRESS)
+        .returns(ExpectError(4u64, "Can only queue succeeded proposals"))
+        .whitebox(use_module::contract_obj, |sc| {
             sc.queue(proposal_id);
-        },
-        |r| {
-            r.assert_user_error("Can only queue succeeded proposals");
-        },
-    );
+        });
+
+    world
+        .check_account(FIRST_USER_ADDRESS)
+        .esdt_balance(GOV_TOKEN_ID_EXPR, BigUint::from(200u64));
 
-    world.check_state_step(CheckStateStep::new().put_account(
-        FIRST_USER_ADDRESS_EXPR,
-        CheckAccount::new().esdt_balance(GOV_TOKEN_ID_EXPR, "200"),
-    ));
-    world.check_state_step(CheckStateStep::new().put_account(
-        SECOND_USER_ADDRESS_EXPR,
-        CheckAccount::new().esdt_balance(GOV_TOKEN_ID_EXPR, "800"),
-    ));
-    world.check_state_step(CheckStateStep::new().put_account(
-        THIRD_USER_ADDRESS_EXPR,
-        CheckAccount::new().esdt_balance(GOV_TOKEN_ID_EXPR, "800"),
-    ));
+    world
+        .check_account(SECOND_USER_ADDRESS)
+        .esdt_balance(GOV_TOKEN_ID_EXPR, BigUint::from(800u64));
+
+    world
+        .check_account(THIRD_USER_ADDRESS)
+        .esdt_balance(GOV_TOKEN_ID_EXPR, BigUint::from(800u64));
 }
 
 #[test]
 fn test_abstain_vote_gov_config() {
     let mut world = setup();
-    let use_module_whitebox =
-        WhiteboxContract::new(USE_MODULE_ADDRESS_EXPR, use_module::contract_obj);
 
     let mut current_block_nonce = 10;
 
     let proposal_id = propose(
         &mut world,
-        &address_expr_to_address(FIRST_USER_ADDRESS_EXPR),
+        &FIRST_USER_ADDRESS.to_address(),
         500,
-        &address_expr_to_address(USE_MODULE_ADDRESS_EXPR),
+        &USE_MODULE_ADDRESS.to_address(),
         b"changeQuorum",
         vec![1_000u64.to_be_bytes().to_vec()],
     );
@@ -454,95 +448,105 @@ fn test_abstain_vote_gov_config() {
     assert_eq!(proposal_id, 1);
 
     current_block_nonce += VOTING_DELAY_BLOCKS;
-    world.set_state_step(SetStateStep::new().block_nonce(current_block_nonce));
-
-    world.whitebox_call(
-        &use_module_whitebox,
-        ScCallStep::new()
-            .from(FIRST_USER_ADDRESS_EXPR)
-            .esdt_transfer(GOV_TOKEN_ID, 0, "500"),
-        |sc| {
+    world.current_block().block_nonce(current_block_nonce);
+
+    world
+        .tx()
+        .from(FIRST_USER_ADDRESS)
+        .to(USE_MODULE_ADDRESS)
+        .single_esdt(
+            &TokenIdentifier::from(GOV_TOKEN_ID),
+            0,
+            &BigUint::from(500u64),
+        )
+        .whitebox(use_module::contract_obj, |sc| {
             sc.vote(proposal_id, VoteType::UpVote);
-        },
-    );
+        });
 
     current_block_nonce = 20;
-    world.set_state_step(SetStateStep::new().block_nonce(current_block_nonce));
-    world.whitebox_call(
-        &use_module_whitebox,
-        ScCallStep::new()
-            .from(SECOND_USER_ADDRESS_EXPR)
-            .esdt_transfer(GOV_TOKEN_ID, 0, "400"),
-        |sc| {
+    world.current_block().block_nonce(current_block_nonce);
+
+    world
+        .tx()
+        .from(SECOND_USER_ADDRESS)
+        .to(USE_MODULE_ADDRESS)
+        .single_esdt(
+            &TokenIdentifier::from(GOV_TOKEN_ID),
+            0,
+            &BigUint::from(400u64),
+        )
+        .whitebox(use_module::contract_obj, |sc| {
             sc.vote(proposal_id, VoteType::DownVote);
-        },
-    );
+        });
 
-    world.whitebox_call(
-        &use_module_whitebox,
-        ScCallStep::new()
-            .from(THIRD_USER_ADDRESS_EXPR)
-            .esdt_transfer(GOV_TOKEN_ID, 0, "600"),
-        |sc| {
+    world
+        .tx()
+        .from(THIRD_USER_ADDRESS)
+        .to(USE_MODULE_ADDRESS)
+        .single_esdt(
+            &TokenIdentifier::from(GOV_TOKEN_ID),
+            0,
+            &BigUint::from(600u64),
+        )
+        .whitebox(use_module::contract_obj, |sc| {
             sc.vote(proposal_id, VoteType::AbstainVote);
-        },
-    );
+        });
 
     // Vote didn't succeed;
     current_block_nonce = 45;
-    world.set_state_step(SetStateStep::new().block_nonce(current_block_nonce));
-    world.whitebox_call(
-        &use_module_whitebox,
-        ScCallStep::new().from(FIRST_USER_ADDRESS_EXPR).no_expect(),
-        |sc| {
+    world.current_block().block_nonce(current_block_nonce);
+
+    world
+        .tx()
+        .from(FIRST_USER_ADDRESS)
+        .to(USE_MODULE_ADDRESS)
+        .whitebox(use_module::contract_obj, |sc| {
             sc.queue(proposal_id);
-        },
-    );
+        });
 
     // execute ok
     current_block_nonce += LOCKING_PERIOD_BLOCKS;
-    world.set_state_step(SetStateStep::new().block_nonce(current_block_nonce));
-    world.whitebox_call(
-        &use_module_whitebox,
-        ScCallStep::new().from(FIRST_USER_ADDRESS_EXPR).no_expect(),
-        |sc| {
+    world.current_block().block_nonce(current_block_nonce);
+
+    world
+        .tx()
+        .from(FIRST_USER_ADDRESS)
+        .to(USE_MODULE_ADDRESS)
+        .whitebox(use_module::contract_obj, |sc| {
             sc.execute(proposal_id);
-        },
-    );
+        });
 
     // after execution, quorum changed from 1_500 to the proposed 1_000
-    world.whitebox_query(&use_module_whitebox, |sc| {
-        assert_eq!(sc.quorum().get(), managed_biguint!(1_000));
-        assert!(sc.proposals().item_is_empty(1));
-    });
-
-    world.check_state_step(CheckStateStep::new().put_account(
-        FIRST_USER_ADDRESS_EXPR,
-        CheckAccount::new().esdt_balance(GOV_TOKEN_ID_EXPR, "0"),
-    ));
-    world.check_state_step(CheckStateStep::new().put_account(
-        SECOND_USER_ADDRESS_EXPR,
-        CheckAccount::new().esdt_balance(GOV_TOKEN_ID_EXPR, "600"),
-    ));
-    world.check_state_step(CheckStateStep::new().put_account(
-        THIRD_USER_ADDRESS_EXPR,
-        CheckAccount::new().esdt_balance(GOV_TOKEN_ID_EXPR, "400"),
-    ));
+    world
+        .query()
+        .to(USE_MODULE_ADDRESS)
+        .whitebox(use_module::contract_obj, |sc| {
+            assert_eq!(sc.quorum().get(), managed_biguint!(1_000));
+            assert!(sc.proposals().item_is_empty(1));
+        });
+
+    world
+        .check_account(FIRST_USER_ADDRESS)
+        .esdt_balance(GOV_TOKEN_ID_EXPR, BigUint::zero());
+    world
+        .check_account(SECOND_USER_ADDRESS)
+        .esdt_balance(GOV_TOKEN_ID_EXPR, BigUint::from(600u64));
+    world
+        .check_account(THIRD_USER_ADDRESS)
+        .esdt_balance(GOV_TOKEN_ID_EXPR, BigUint::from(400u64));
 }
 
 #[test]
 fn test_gov_cancel_defeated_proposal() {
     let mut world = setup();
-    let use_module_whitebox =
-        WhiteboxContract::new(USE_MODULE_ADDRESS_EXPR, use_module::contract_obj);
 
     let mut current_block_nonce = 10;
 
     let proposal_id = propose(
         &mut world,
-        &address_expr_to_address(FIRST_USER_ADDRESS_EXPR),
+        &FIRST_USER_ADDRESS.to_address(),
         500,
-        &address_expr_to_address(USE_MODULE_ADDRESS_EXPR),
+        &USE_MODULE_ADDRESS.to_address(),
         b"changeQuorum",
         vec![1_000u64.to_be_bytes().to_vec()],
     );
@@ -550,42 +554,37 @@ fn test_gov_cancel_defeated_proposal() {
     assert_eq!(proposal_id, 1);
 
     current_block_nonce += VOTING_DELAY_BLOCKS;
-    world.set_state_step(SetStateStep::new().block_nonce(current_block_nonce));
-
-    world.whitebox_call(
-        &use_module_whitebox,
-        ScCallStep::new()
-            .from(SECOND_USER_ADDRESS_EXPR)
-            .esdt_transfer(GOV_TOKEN_ID, 0, "999"),
-        |sc| {
-            sc.vote(proposal_id, VoteType::DownVote);
-        },
-    );
+    world.current_block().block_nonce(current_block_nonce);
+
+    world
+        .tx()
+        .from(SECOND_USER_ADDRESS)
+        .to(USE_MODULE_ADDRESS)
+        .single_esdt(
+            &TokenIdentifier::from(GOV_TOKEN_ID),
+            0,
+            &BigUint::from(999u64),
+        )
+        .whitebox(use_module::contract_obj, |sc| {
+            sc.vote(proposal_id, VoteType::DownVote)
+        });
 
     // try cancel too early
-    world.whitebox_call_check(
-        &use_module_whitebox,
-        ScCallStep::new().from(SECOND_USER_ADDRESS_EXPR).no_expect(),
-        |sc| {
+    world
+        .tx()
+        .from(SECOND_USER_ADDRESS)
+        .to(USE_MODULE_ADDRESS)
+        .returns(ExpectError(4u64, "Action may not be cancelled"))
+        .whitebox(use_module::contract_obj, |sc| {
             sc.cancel(proposal_id);
-        },
-        |r| {
-            r.assert_user_error("Action may not be cancelled");
-        },
-    );
+        });
 
     current_block_nonce += VOTING_PERIOD_BLOCKS;
-    world.set_state_step(SetStateStep::new().block_nonce(current_block_nonce));
-
-    world.whitebox_call(
-        &use_module_whitebox,
-        ScCallStep::new().from(SECOND_USER_ADDRESS_EXPR).no_expect(),
-        |sc| {
-            sc.cancel(proposal_id);
-        },
-    );
-}
+    world.current_block().block_nonce(current_block_nonce);
 
-fn address_expr_to_address(address_expr: &str) -> Address {
-    AddressValue::from(address_expr).to_address()
+    world
+        .tx()
+        .from(SECOND_USER_ADDRESS)
+        .to(USE_MODULE_ADDRESS)
+        .whitebox(use_module::contract_obj, |sc| sc.cancel(proposal_id));
 }

From c00a93f34d44201e5a3585c10adb6f0c578c1f04 Mon Sep 17 00:00:00 2001
From: Andrei Vasilescu <vasilescuandrei24@gmail.com>
Date: Thu, 22 Aug 2024 11:07:37 +0300
Subject: [PATCH 1179/1254] fixed unittests + small refactors

---
 framework/meta/src/cmd/wallet.rs    | 28 +--------
 framework/meta/tests/wallet_test.rs | 91 -----------------------------
 sdk/core/src/wallet.rs              | 24 +++++++-
 sdk/core/tests/wallet_test.rs       | 68 +++++++++++++++++++++
 4 files changed, 94 insertions(+), 117 deletions(-)
 delete mode 100644 framework/meta/tests/wallet_test.rs

diff --git a/framework/meta/src/cmd/wallet.rs b/framework/meta/src/cmd/wallet.rs
index ba8a9f6132..b3833da517 100644
--- a/framework/meta/src/cmd/wallet.rs
+++ b/framework/meta/src/cmd/wallet.rs
@@ -3,7 +3,7 @@ use core::str;
 use crate::cli::{WalletAction, WalletArgs, WalletBech32Args, WalletConvertArgs, WalletNewArgs};
 use multiversx_sc::types::{self};
 use multiversx_sc_snippets::sdk::{
-    crypto::public_key::PublicKey, data::address::Address, utils::base64_encode, wallet::Wallet,
+    crypto::public_key::PublicKey, data::address::Address, wallet::Wallet,
 };
 use multiversx_sc_snippets::{hex, imports::Bech32Address};
 use std::{
@@ -90,12 +90,12 @@ fn write_resulted_pem(public_key: &str, private_key: &str, outfile: Option<&Stri
     let address = get_wallet_address(private_key);
     match outfile {
         Some(outfile) => {
-            let pem_content = generate_pem_content(&address, private_key, public_key);
+            let pem_content = Wallet::generate_pem_content(&address, private_key, public_key);
             let mut file = File::create(outfile).unwrap();
             file.write_all(pem_content.as_bytes()).unwrap();
         },
         None => {
-            let pem_content = generate_pem_content(&address, private_key, public_key);
+            let pem_content = Wallet::generate_pem_content(&address, private_key, public_key);
             print!("{}", pem_content);
         },
     }
@@ -174,25 +174,3 @@ fn new(new_args: &WalletNewArgs) {
         None => {},
     }
 }
-
-pub fn generate_pem_content(address: &Address, private_key: &str, public_key: &str) -> String {
-    let concat_keys = format!("{}{}", private_key, public_key);
-    let concat_keys_b64 = base64_encode(concat_keys);
-
-    // Split the base64 string into 64-character lines
-    let formatted_key = concat_keys_b64
-        .as_bytes()
-        .chunks(64)
-        .map(|chunk| std::str::from_utf8(chunk).unwrap())
-        .collect::<Vec<&str>>()
-        .join("\n");
-
-    let pem_content = format!(
-        "-----BEGIN PRIVATE KEY for {}-----\n{}\n-----END PRIVATE KEY for {}-----\n",
-        address.to_bech32_string().unwrap(),
-        formatted_key,
-        address.to_bech32_string().unwrap()
-    );
-
-    pem_content
-}
diff --git a/framework/meta/tests/wallet_test.rs b/framework/meta/tests/wallet_test.rs
deleted file mode 100644
index ce1627ff64..0000000000
--- a/framework/meta/tests/wallet_test.rs
+++ /dev/null
@@ -1,91 +0,0 @@
-use std::fs::{self, File};
-use std::io::Write;
-
-use multiversx_sc_meta::cmd::wallet::generate_pem_content;
-use multiversx_sc_snippets::sdk::{crypto::public_key::PublicKey, data::address::Address};
-use multiversx_sc_snippets::{hex, imports::Wallet};
-
-const ALICE_PEM_PATH: &str = "../snippets/src/test_wallets/alice.pem";
-const ALICE_KEYSTORE_PATH_TEST: &str = "alice.json";
-const ALICE_PEM_PATH_TEST: &str = "alice_test.pem";
-const KEYSTORE_PASSWORD: &str = "abcd";
-
-fn create_keystore_from_pem(file: &str) {
-    let pem_decoded_keys = Wallet::get_pem_decoded_content(file);
-    let (private_key_str, public_key_str) = Wallet::get_wallet_keys_pem(file);
-
-    let address = Wallet::from_private_key(&private_key_str)
-        .unwrap()
-        .address();
-    let hex_decoded_keys = hex::decode(pem_decoded_keys).unwrap();
-
-    let json_result = Wallet::encrypt_keystore(
-        hex_decoded_keys.as_slice(),
-        &address,
-        &public_key_str,
-        KEYSTORE_PASSWORD,
-    );
-
-    write_to_file(&json_result, ALICE_KEYSTORE_PATH_TEST);
-}
-
-fn write_to_file(content: &str, file: &str) {
-    let mut file = File::create(file).unwrap();
-    file.write_all(content.as_bytes()).unwrap();
-}
-
-fn create_keystore_file_from_scratch() -> Address {
-    let mnemonic = Wallet::generate_mnemonic();
-    let (private_key_str, public_key_str) = Wallet::get_wallet_keys_mnemonic(mnemonic.to_string());
-    let wallet = Wallet::from_private_key(&private_key_str).unwrap();
-    let address = wallet.address();
-
-    let concatenated_keys = format!("{}{}", private_key_str, public_key_str);
-    let hex_decoded_keys = hex::decode(concatenated_keys).unwrap();
-    let json_result = Wallet::encrypt_keystore(
-        hex_decoded_keys.as_slice(),
-        &address,
-        &public_key_str,
-        KEYSTORE_PASSWORD,
-    );
-    write_to_file(&json_result, ALICE_KEYSTORE_PATH_TEST);
-    address
-}
-
-#[test]
-fn test_wallet_convert_pem_to_keystore() {
-    create_keystore_from_pem(ALICE_PEM_PATH);
-    let (private_key_pem, _public_key_pem) = Wallet::get_wallet_keys_pem(ALICE_PEM_PATH);
-    assert_eq!(
-        Wallet::get_private_key_from_keystore_secret(ALICE_KEYSTORE_PATH_TEST, KEYSTORE_PASSWORD)
-            .unwrap()
-            .to_string(),
-        private_key_pem
-    );
-    fs::remove_file(ALICE_KEYSTORE_PATH_TEST).unwrap();
-}
-
-#[test]
-fn test_wallet_convert_keystore_to_pem() {
-    let address = create_keystore_file_from_scratch();
-
-    let private_key =
-        Wallet::get_private_key_from_keystore_secret(ALICE_KEYSTORE_PATH_TEST, KEYSTORE_PASSWORD)
-            .unwrap();
-    let private_key_str = private_key.to_string();
-    let public_key = PublicKey::from(&private_key);
-    let public_key_str = public_key.to_string();
-
-    let pem_content = generate_pem_content(&address, &private_key_str, &public_key_str);
-    write_to_file(&pem_content, ALICE_PEM_PATH_TEST);
-
-    assert_eq!(
-        Wallet::get_private_key_from_keystore_secret(ALICE_KEYSTORE_PATH_TEST, KEYSTORE_PASSWORD)
-            .unwrap()
-            .to_string(),
-        Wallet::get_wallet_keys_pem(ALICE_PEM_PATH_TEST).0
-    );
-
-    fs::remove_file(ALICE_PEM_PATH_TEST).unwrap();
-    fs::remove_file(ALICE_KEYSTORE_PATH_TEST).unwrap();
-}
diff --git a/sdk/core/src/wallet.rs b/sdk/core/src/wallet.rs
index bbf2c41a2c..bf1362a314 100644
--- a/sdk/core/src/wallet.rs
+++ b/sdk/core/src/wallet.rs
@@ -25,7 +25,7 @@ use crate::{
         public_key::PublicKey,
     },
     data::{address::Address, keystore::*, transaction::Transaction},
-    utils::base64_decode,
+    utils::*,
 };
 
 use uuid::Uuid;
@@ -333,4 +333,26 @@ impl Wallet {
         keystore_json.push('\n');
         keystore_json
     }
+
+    pub fn generate_pem_content(address: &Address, private_key: &str, public_key: &str) -> String {
+        let concat_keys = format!("{}{}", private_key, public_key);
+        let concat_keys_b64 = base64_encode(concat_keys);
+
+        // Split the base64 string into 64-character lines
+        let formatted_key = concat_keys_b64
+            .as_bytes()
+            .chunks(64)
+            .map(|chunk| std::str::from_utf8(chunk).unwrap())
+            .collect::<Vec<&str>>()
+            .join("\n");
+
+        let pem_content = format!(
+            "-----BEGIN PRIVATE KEY for {}-----\n{}\n-----END PRIVATE KEY for {}-----\n",
+            address.to_bech32_string().unwrap(),
+            formatted_key,
+            address.to_bech32_string().unwrap()
+        );
+
+        pem_content
+    }
 }
diff --git a/sdk/core/tests/wallet_test.rs b/sdk/core/tests/wallet_test.rs
index d076980084..4d523d57d5 100644
--- a/sdk/core/tests/wallet_test.rs
+++ b/sdk/core/tests/wallet_test.rs
@@ -1,6 +1,18 @@
 use bip39::Mnemonic;
 
 use multiversx_sdk::{crypto::public_key::PublicKey, data::address::Address, wallet::Wallet};
+use std::fs::{self, File};
+use std::io::Write;
+
+// use multiversx_sc_meta::cmd::wallet::generate_pem_content;
+// use multiversx_sc_snippets::{hex, imports::Wallet};
+
+const ALICE_PEM_PATH: &str = "tests/alice.pem";
+const ALICE_KEYSTORE_PATH_TEST: &str = "tests/alice.json";
+const ALICE_PEM_PATH_TEST: &str = "tests/alice_test.pem";
+const KEYSTORE_PASSWORD: &str = "abcd";
+const ALICE_PUBLIC_KEY: &str = "0139472eff6886771a982f3083da5d421f24c29181e63888228dc81ca60d69e1";
+const ALICE_PRIVATE_KEY: &str = "413f42575f7f26fad3317a778771212fdb80245850981e48b58a4f25e344e8f9";
 
 #[test]
 fn test_private_key_from_mnemonic() {
@@ -48,3 +60,59 @@ fn test_load_from_pem() {
         "erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th"
     );
 }
+
+fn write_to_file(content: &str, file: &str) {
+    let mut file = File::create(file).unwrap();
+    file.write_all(content.as_bytes()).unwrap();
+}
+
+fn create_keystore_file_from_scratch() -> Address {
+    let wallet = Wallet::from_private_key(ALICE_PRIVATE_KEY).unwrap();
+    let address = wallet.address();
+
+    let concatenated_keys = format!("{}{}", ALICE_PRIVATE_KEY, ALICE_PUBLIC_KEY);
+    let hex_decoded_keys = hex::decode(concatenated_keys).unwrap();
+    let json_result = Wallet::encrypt_keystore(
+        hex_decoded_keys.as_slice(),
+        &address,
+        ALICE_PUBLIC_KEY,
+        KEYSTORE_PASSWORD,
+    );
+    write_to_file(&json_result, ALICE_KEYSTORE_PATH_TEST);
+    address
+}
+
+#[test]
+fn test_wallet_convert_pem_to_keystore() {
+    let _ = create_keystore_file_from_scratch();
+    let (private_key_pem, _public_key_pem) = Wallet::get_wallet_keys_pem(ALICE_PEM_PATH);
+    assert_eq!(
+        Wallet::get_private_key_from_keystore_secret(ALICE_KEYSTORE_PATH_TEST, KEYSTORE_PASSWORD)
+            .unwrap()
+            .to_string(),
+        private_key_pem
+    );
+    fs::remove_file(ALICE_KEYSTORE_PATH_TEST).unwrap();
+}
+
+#[test]
+fn test_wallet_convert_keystore_to_pem() {
+    let address = create_keystore_file_from_scratch();
+
+    let private_key =
+        Wallet::get_private_key_from_keystore_secret(ALICE_KEYSTORE_PATH_TEST, KEYSTORE_PASSWORD)
+            .unwrap();
+    let private_key_str = private_key.to_string();
+    let public_key = PublicKey::from(&private_key);
+    let public_key_str = public_key.to_string();
+
+    let pem_content = Wallet::generate_pem_content(&address, &private_key_str, &public_key_str);
+    write_to_file(&pem_content, ALICE_PEM_PATH_TEST);
+    assert_eq!(
+        private_key_str,
+        Wallet::get_wallet_keys_pem(ALICE_PEM_PATH_TEST).0
+    );
+
+    fs::remove_file(ALICE_PEM_PATH_TEST).unwrap();
+    fs::remove_file(ALICE_KEYSTORE_PATH_TEST).unwrap();
+}

From dbca030977779beddf38332f0da6a2d256fd5f67 Mon Sep 17 00:00:00 2001
From: Andrei Vasilescu <vasilescuandrei24@gmail.com>
Date: Thu, 22 Aug 2024 11:30:31 +0300
Subject: [PATCH 1180/1254] tests fixed

---
 sdk/core/tests/wallet_test.rs | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/sdk/core/tests/wallet_test.rs b/sdk/core/tests/wallet_test.rs
index 4d523d57d5..103166e430 100644
--- a/sdk/core/tests/wallet_test.rs
+++ b/sdk/core/tests/wallet_test.rs
@@ -4,11 +4,9 @@ use multiversx_sdk::{crypto::public_key::PublicKey, data::address::Address, wall
 use std::fs::{self, File};
 use std::io::Write;
 
-// use multiversx_sc_meta::cmd::wallet::generate_pem_content;
-// use multiversx_sc_snippets::{hex, imports::Wallet};
-
 const ALICE_PEM_PATH: &str = "tests/alice.pem";
-const ALICE_KEYSTORE_PATH_TEST: &str = "tests/alice.json";
+const ALICE_KEYSTORE_PATH_TEST_1: &str = "tests/alice1.json";
+const ALICE_KEYSTORE_PATH_TEST_2: &str = "tests/alice2.json";
 const ALICE_PEM_PATH_TEST: &str = "tests/alice_test.pem";
 const KEYSTORE_PASSWORD: &str = "abcd";
 const ALICE_PUBLIC_KEY: &str = "0139472eff6886771a982f3083da5d421f24c29181e63888228dc81ca60d69e1";
@@ -66,7 +64,7 @@ fn write_to_file(content: &str, file: &str) {
     file.write_all(content.as_bytes()).unwrap();
 }
 
-fn create_keystore_file_from_scratch() -> Address {
+fn create_keystore_file_from_scratch(file: &str) -> Address {
     let wallet = Wallet::from_private_key(ALICE_PRIVATE_KEY).unwrap();
     let address = wallet.address();
 
@@ -78,29 +76,29 @@ fn create_keystore_file_from_scratch() -> Address {
         ALICE_PUBLIC_KEY,
         KEYSTORE_PASSWORD,
     );
-    write_to_file(&json_result, ALICE_KEYSTORE_PATH_TEST);
+    write_to_file(&json_result, file);
     address
 }
 
 #[test]
 fn test_wallet_convert_pem_to_keystore() {
-    let _ = create_keystore_file_from_scratch();
+    let _ = create_keystore_file_from_scratch(ALICE_KEYSTORE_PATH_TEST_1);
     let (private_key_pem, _public_key_pem) = Wallet::get_wallet_keys_pem(ALICE_PEM_PATH);
     assert_eq!(
-        Wallet::get_private_key_from_keystore_secret(ALICE_KEYSTORE_PATH_TEST, KEYSTORE_PASSWORD)
+        Wallet::get_private_key_from_keystore_secret(ALICE_KEYSTORE_PATH_TEST_1, KEYSTORE_PASSWORD)
             .unwrap()
             .to_string(),
         private_key_pem
     );
-    fs::remove_file(ALICE_KEYSTORE_PATH_TEST).unwrap();
+    fs::remove_file(ALICE_KEYSTORE_PATH_TEST_1).unwrap();
 }
 
 #[test]
 fn test_wallet_convert_keystore_to_pem() {
-    let address = create_keystore_file_from_scratch();
+    let address = create_keystore_file_from_scratch(ALICE_KEYSTORE_PATH_TEST_2);
 
     let private_key =
-        Wallet::get_private_key_from_keystore_secret(ALICE_KEYSTORE_PATH_TEST, KEYSTORE_PASSWORD)
+        Wallet::get_private_key_from_keystore_secret(ALICE_KEYSTORE_PATH_TEST_2, KEYSTORE_PASSWORD)
             .unwrap();
     let private_key_str = private_key.to_string();
     let public_key = PublicKey::from(&private_key);
@@ -114,5 +112,5 @@ fn test_wallet_convert_keystore_to_pem() {
     );
 
     fs::remove_file(ALICE_PEM_PATH_TEST).unwrap();
-    fs::remove_file(ALICE_KEYSTORE_PATH_TEST).unwrap();
+    fs::remove_file(ALICE_KEYSTORE_PATH_TEST_2).unwrap();
 }

From fe2ef22db0e59c5450b6ef7c9191ae124df634cc Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Thu, 22 Aug 2024 14:55:24 +0200
Subject: [PATCH 1181/1254] multisig whitebox migration

---
 .../multisig/tests/multisig_whitebox_test.rs  | 929 ++++++++----------
 1 file changed, 426 insertions(+), 503 deletions(-)

diff --git a/contracts/examples/multisig/tests/multisig_whitebox_test.rs b/contracts/examples/multisig/tests/multisig_whitebox_test.rs
index 904a03c7e0..5e1347d82b 100644
--- a/contracts/examples/multisig/tests/multisig_whitebox_test.rs
+++ b/contracts/examples/multisig/tests/multisig_whitebox_test.rs
@@ -10,11 +10,11 @@ use multisig::{
     user_role::UserRole, Multisig,
 };
 
-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 = "mxsc:output/multisig.mxsc.json";
+const OWNER_ADDRESS: TestAddress = TestAddress::new("owner");
+const PROPOSER_ADDRESS: TestAddress = TestAddress::new("proposer");
+const BOARD_MEMBER_ADDRESS: TestAddress = TestAddress::new("board-member");
+const MULTISIG_ADDRESS: TestSCAddress = TestSCAddress::new("multisig");
+const MULTISIG_PATH_EXPR: MxscPath = MxscPath::new("mxsc:output/multisig.mxsc.json");
 const QUORUM_SIZE: usize = 1;
 
 type RustBigUint = num_bigint::BigUint;
@@ -59,40 +59,28 @@ fn world() -> ScenarioWorld {
 fn setup() -> ScenarioWorld {
     // setup
     let mut world = world();
-    let multisig_whitebox = WhiteboxContract::new(MULTISIG_ADDRESS_EXPR, multisig::contract_obj);
-    let multisig_code = world.code_expression(MULTISIG_PATH_EXPR);
-
-    world.set_state_step(
-        SetStateStep::new()
-            .put_account(OWNER_ADDRESS_EXPR, Account::new().nonce(1))
-            .new_address(OWNER_ADDRESS_EXPR, 1, MULTISIG_ADDRESS_EXPR)
-            .put_account(
-                PROPOSER_ADDRESS_EXPR,
-                Account::new().nonce(1).balance(100_000_000u64),
-            )
-            .put_account(BOARD_MEMBER_ADDRESS_EXPR, Account::new().nonce(1)),
-    );
+
+    world.account(OWNER_ADDRESS).nonce(1);
+    world
+        .account(PROPOSER_ADDRESS)
+        .nonce(1)
+        .balance(100_000_000u64);
+    world.account(BOARD_MEMBER_ADDRESS).nonce(1);
 
     // init multisig
-    world.whitebox_deploy(
-        &multisig_whitebox,
-        ScDeployStep::new()
-            .from(OWNER_ADDRESS_EXPR)
-            .code(multisig_code),
-        |sc| {
+    world
+        .tx()
+        .from(OWNER_ADDRESS)
+        .raw_deploy()
+        .code(MULTISIG_PATH_EXPR)
+        .new_address(MULTISIG_ADDRESS)
+        .whitebox(multisig::contract_obj, |sc| {
             let mut board_members = ManagedVec::new();
-            board_members.push(managed_address!(&address_expr_to_address(
-                BOARD_MEMBER_ADDRESS_EXPR
-            )));
+            board_members.push(BOARD_MEMBER_ADDRESS.to_managed_address());
 
             sc.init(QUORUM_SIZE, board_members.into());
-            sc.change_user_role(
-                0,
-                managed_address!(&address_expr_to_address(PROPOSER_ADDRESS_EXPR)),
-                UserRole::Proposer,
-            );
-        },
-    );
+            sc.change_user_role(0, PROPOSER_ADDRESS.to_managed_address(), UserRole::Proposer);
+        });
 
     world
 }
@@ -119,70 +107,66 @@ fn call_propose(
 
     let mut action_id = 0;
 
-    let multisig_whitebox = WhiteboxContract::new(MULTISIG_ADDRESS_EXPR, multisig::contract_obj);
-
-    world.whitebox_call_check(
-        &multisig_whitebox,
-        ScCallStep::new()
-            .from(PROPOSER_ADDRESS_EXPR)
-            .egld_value(amount_rust_biguint)
-            .no_expect(),
-        |sc| {
-            action_id = match action {
-                ActionRaw::_Nothing => panic!("Invalid action"),
-                ActionRaw::AddBoardMember(addr) => {
-                    sc.propose_add_board_member(managed_address!(&addr))
+    let mut transaction = world
+        .tx()
+        .from(PROPOSER_ADDRESS)
+        .to(MULTISIG_ADDRESS)
+        .egld(BigUint::from(egld_amount));
+
+    let mut transaction_with_err = match expected_message {
+        Some(message) => transaction.returns(ExpectError(4u64, message)),
+        None => transaction.returns(ExpectError(0u64, "")),
+    };
+
+    transaction_with_err.whitebox(multisig::contract_obj, |sc| {
+        action_id = match action {
+            ActionRaw::_Nothing => panic!("Invalid action"),
+            ActionRaw::AddBoardMember(addr) => sc.propose_add_board_member(managed_address!(&addr)),
+            ActionRaw::AddProposer(addr) => sc.propose_add_proposer(managed_address!(&addr)),
+            ActionRaw::RemoveUser(addr) => sc.propose_remove_user(managed_address!(&addr)),
+            ActionRaw::ChangeQuorum(new_size) => sc.propose_change_quorum(new_size),
+            ActionRaw::SendTransferExecute(call_data) => sc.propose_transfer_execute(
+                managed_address!(&call_data.to),
+                call_data.egld_amount.into(),
+                FunctionCall {
+                    function_name: call_data.endpoint_name.into(),
+                    arg_buffer: call_data.arguments.into(),
                 },
-                ActionRaw::AddProposer(addr) => sc.propose_add_proposer(managed_address!(&addr)),
-                ActionRaw::RemoveUser(addr) => sc.propose_remove_user(managed_address!(&addr)),
-                ActionRaw::ChangeQuorum(new_size) => sc.propose_change_quorum(new_size),
-                ActionRaw::SendTransferExecute(call_data) => sc.propose_transfer_execute(
-                    managed_address!(&call_data.to),
-                    BigUint::from_bytes_be(&call_data.egld_amount.to_bytes_be()),
-                    FunctionCall {
-                        function_name: call_data.endpoint_name.into(),
-                        arg_buffer: call_data.arguments.into(),
-                    },
-                ),
-                ActionRaw::SendAsyncCall(call_data) => sc.propose_async_call(
-                    managed_address!(&call_data.to),
-                    BigUint::from_bytes_be(&call_data.egld_amount.to_bytes_be()),
-                    FunctionCall {
-                        function_name: call_data.endpoint_name.into(),
-                        arg_buffer: call_data.arguments.into(),
-                    },
-                ),
-                ActionRaw::SCDeployFromSource {
-                    amount,
-                    source,
-                    code_metadata,
-                    arguments,
-                } => sc.propose_sc_deploy_from_source(
-                    BigUint::from_bytes_be(&amount.to_bytes_be()),
-                    managed_address!(&source),
-                    code_metadata,
-                    boxed_bytes_vec_to_managed(arguments).into(),
-                ),
-                ActionRaw::SCUpgradeFromSource {
-                    sc_address,
-                    amount,
-                    source,
-                    code_metadata,
-                    arguments,
-                } => sc.propose_sc_upgrade_from_source(
-                    managed_address!(&sc_address),
-                    BigUint::from_bytes_be(&amount.to_bytes_be()),
-                    managed_address!(&source),
-                    code_metadata,
-                    boxed_bytes_vec_to_managed(arguments).into(),
-                ),
-            }
-        },
-        |r| match expected_message {
-            Some(msg) => r.assert_user_error(msg),
-            None => r.assert_ok(),
-        },
-    );
+            ),
+            ActionRaw::SendAsyncCall(call_data) => sc.propose_async_call(
+                managed_address!(&call_data.to),
+                call_data.egld_amount.into(),
+                FunctionCall {
+                    function_name: call_data.endpoint_name.into(),
+                    arg_buffer: call_data.arguments.into(),
+                },
+            ),
+            ActionRaw::SCDeployFromSource {
+                amount,
+                source,
+                code_metadata,
+                arguments,
+            } => sc.propose_sc_deploy_from_source(
+                amount.into(),
+                managed_address!(&source),
+                code_metadata,
+                boxed_bytes_vec_to_managed(arguments).into(),
+            ),
+            ActionRaw::SCUpgradeFromSource {
+                sc_address,
+                amount,
+                source,
+                code_metadata,
+                arguments,
+            } => sc.propose_sc_upgrade_from_source(
+                managed_address!(&sc_address),
+                amount.into(),
+                managed_address!(&source),
+                code_metadata,
+                boxed_bytes_vec_to_managed(arguments).into(),
+            ),
+        }
+    });
 
     action_id
 }
@@ -190,341 +174,300 @@ fn call_propose(
 #[test]
 fn test_add_board_member() {
     let mut world = setup();
-    let multisig_whitebox = WhiteboxContract::new(MULTISIG_ADDRESS_EXPR, multisig::contract_obj);
 
-    const NEW_BOARD_MEMBER_ADDRESS_EXPR: &str = "address:new-board-member";
-    world.set_state_step(
-        SetStateStep::new().put_account(NEW_BOARD_MEMBER_ADDRESS_EXPR, Account::new().nonce(1)),
-    );
+    const NEW_BOARD_MEMBER_ADDRESS: TestAddress = TestAddress::new("new-board-member");
+    world.account(NEW_BOARD_MEMBER_ADDRESS).nonce(1);
 
-    world.whitebox_query(&multisig_whitebox, |sc| {
-        // check role before
-        let user_role = sc.user_role(managed_address!(&address_expr_to_address(
-            NEW_BOARD_MEMBER_ADDRESS_EXPR
-        )));
-        assert_eq!(user_role, UserRole::None);
-    });
+    world
+        .query()
+        .to(MULTISIG_ADDRESS)
+        .whitebox(multisig::contract_obj, |sc| {
+            // check role before
+            let user_role = sc.user_role(NEW_BOARD_MEMBER_ADDRESS.to_managed_address());
+            assert_eq!(user_role, UserRole::None);
+        });
 
     let action_id = call_propose(
         &mut world,
-        ActionRaw::AddBoardMember(address_expr_to_address(NEW_BOARD_MEMBER_ADDRESS_EXPR)),
+        ActionRaw::AddBoardMember(NEW_BOARD_MEMBER_ADDRESS.to_address()),
         None,
     );
 
-    world.whitebox_call(
-        &multisig_whitebox,
-        ScCallStep::new().from(BOARD_MEMBER_ADDRESS_EXPR),
-        |sc| sc.sign(action_id),
-    );
+    world
+        .tx()
+        .from(BOARD_MEMBER_ADDRESS)
+        .to(MULTISIG_ADDRESS)
+        .whitebox(multisig::contract_obj, |sc| sc.sign(action_id));
 
-    world.whitebox_call(
-        &multisig_whitebox,
-        ScCallStep::new().from(BOARD_MEMBER_ADDRESS_EXPR),
-        |sc| {
+    world
+        .tx()
+        .from(BOARD_MEMBER_ADDRESS)
+        .to(MULTISIG_ADDRESS)
+        .whitebox(multisig::contract_obj, |sc| {
             let _ = sc.perform_action_endpoint(action_id);
-        },
-    );
+        });
 
-    world.whitebox_query(&multisig_whitebox, |sc| {
-        // check role after
-        let user_role = sc.user_role(managed_address!(&address_expr_to_address(
-            NEW_BOARD_MEMBER_ADDRESS_EXPR
-        )));
-        assert_eq!(user_role, UserRole::BoardMember);
-
-        let board_members = sc.get_all_board_members().to_vec();
-        assert_eq!(
-            (board_members.get(0).borrow() as &ManagedAddress<DebugApi>).clone(),
-            managed_address!(&address_expr_to_address(BOARD_MEMBER_ADDRESS_EXPR))
-        );
-        assert_eq!(
-            (board_members.get(1).borrow() as &ManagedAddress<DebugApi>).clone(),
-            managed_address!(&address_expr_to_address(NEW_BOARD_MEMBER_ADDRESS_EXPR))
-        );
-    });
+    world
+        .query()
+        .to(MULTISIG_ADDRESS)
+        .whitebox(multisig::contract_obj, |sc| {
+            // check role after
+            let user_role = sc.user_role(NEW_BOARD_MEMBER_ADDRESS.to_managed_address());
+            assert_eq!(user_role, UserRole::BoardMember);
+
+            let board_members = sc.get_all_board_members().to_vec();
+            assert_eq!(*board_members.get(0), BOARD_MEMBER_ADDRESS);
+            assert_eq!(*board_members.get(1), NEW_BOARD_MEMBER_ADDRESS);
+        });
 }
 
 #[test]
 fn test_add_proposer() {
     let mut world = setup();
-    let multisig_whitebox = WhiteboxContract::new(MULTISIG_ADDRESS_EXPR, multisig::contract_obj);
 
-    const NEW_PROPOSER_ADDRESS_EXPR: &str = "address:new-proposer";
-    world.set_state_step(
-        SetStateStep::new().put_account(NEW_PROPOSER_ADDRESS_EXPR, Account::new().nonce(1)),
-    );
+    const NEW_PROPOSER_ADDRESS: TestAddress = TestAddress::new("new-proposer");
+    world.account(NEW_PROPOSER_ADDRESS).nonce(1);
 
-    world.whitebox_query(&multisig_whitebox, |sc| {
-        // check role before
-        let user_role = sc.user_role(managed_address!(&address_expr_to_address(
-            NEW_PROPOSER_ADDRESS_EXPR
-        )));
-        assert_eq!(user_role, UserRole::None);
-    });
+    world
+        .query()
+        .to(MULTISIG_ADDRESS)
+        .whitebox(multisig::contract_obj, |sc| {
+            // check role before
+            let user_role = sc.user_role(NEW_PROPOSER_ADDRESS.to_managed_address());
+            assert_eq!(user_role, UserRole::None);
+        });
 
     let action_id = call_propose(
         &mut world,
-        ActionRaw::AddProposer(address_expr_to_address(NEW_PROPOSER_ADDRESS_EXPR)),
+        ActionRaw::AddProposer(NEW_PROPOSER_ADDRESS.to_address()),
         None,
     );
 
-    world.whitebox_call(
-        &multisig_whitebox,
-        ScCallStep::new().from(BOARD_MEMBER_ADDRESS_EXPR),
-        |sc| sc.sign(action_id),
-    );
+    world
+        .tx()
+        .from(BOARD_MEMBER_ADDRESS)
+        .to(MULTISIG_ADDRESS)
+        .whitebox(multisig::contract_obj, |sc| sc.sign(action_id));
 
-    world.whitebox_call(
-        &multisig_whitebox,
-        ScCallStep::new().from(BOARD_MEMBER_ADDRESS_EXPR),
-        |sc| {
+    world
+        .tx()
+        .from(BOARD_MEMBER_ADDRESS)
+        .to(MULTISIG_ADDRESS)
+        .whitebox(multisig::contract_obj, |sc| {
             let _ = sc.perform_action_endpoint(action_id);
-        },
-    );
+        });
 
-    world.whitebox_query(&multisig_whitebox, |sc| {
-        // check role after
-        let user_role = sc.user_role(managed_address!(&address_expr_to_address(
-            NEW_PROPOSER_ADDRESS_EXPR
-        )));
-        assert_eq!(user_role, UserRole::Proposer);
-
-        let proposers = sc.get_all_proposers().to_vec();
-        assert_eq!(
-            (proposers.get(0).borrow() as &ManagedAddress<DebugApi>).clone(),
-            managed_address!(&address_expr_to_address(PROPOSER_ADDRESS_EXPR))
-        );
-        assert_eq!(
-            (proposers.get(1).borrow() as &ManagedAddress<DebugApi>).clone(),
-            managed_address!(&address_expr_to_address(NEW_PROPOSER_ADDRESS_EXPR))
-        );
-    });
+    world
+        .query()
+        .to(MULTISIG_ADDRESS)
+        .whitebox(multisig::contract_obj, |sc| {
+            // check role after
+            let user_role = sc.user_role(NEW_PROPOSER_ADDRESS.to_managed_address());
+            assert_eq!(user_role, UserRole::Proposer);
+
+            let proposers = sc.get_all_proposers().to_vec();
+            assert_eq!(*proposers.get(0), PROPOSER_ADDRESS);
+            assert_eq!(*proposers.get(1), NEW_PROPOSER_ADDRESS);
+        });
 }
 
 #[test]
 fn test_remove_proposer() {
     let mut world = setup();
-    let multisig_whitebox = WhiteboxContract::new(MULTISIG_ADDRESS_EXPR, multisig::contract_obj);
-
-    world.whitebox_query(&multisig_whitebox, |sc| {
-        // check role before
-        let user_role = sc.user_role(managed_address!(&address_expr_to_address(
-            PROPOSER_ADDRESS_EXPR
-        )));
-        assert_eq!(user_role, UserRole::Proposer);
-    });
+
+    world
+        .query()
+        .to(MULTISIG_ADDRESS)
+        .whitebox(multisig::contract_obj, |sc| {
+            // check role before
+            let user_role = sc.user_role(PROPOSER_ADDRESS.to_managed_address());
+            assert_eq!(user_role, UserRole::Proposer);
+        });
 
     let action_id = call_propose(
         &mut world,
-        ActionRaw::RemoveUser(address_expr_to_address(PROPOSER_ADDRESS_EXPR)),
+        ActionRaw::RemoveUser(PROPOSER_ADDRESS.to_address()),
         None,
     );
 
-    world.whitebox_call(
-        &multisig_whitebox,
-        ScCallStep::new().from(BOARD_MEMBER_ADDRESS_EXPR),
-        |sc| sc.sign(action_id),
-    );
+    world
+        .tx()
+        .from(BOARD_MEMBER_ADDRESS)
+        .to(MULTISIG_ADDRESS)
+        .whitebox(multisig::contract_obj, |sc| sc.sign(action_id));
 
-    world.whitebox_call(
-        &multisig_whitebox,
-        ScCallStep::new().from(BOARD_MEMBER_ADDRESS_EXPR),
-        |sc| {
+    world
+        .tx()
+        .from(BOARD_MEMBER_ADDRESS)
+        .to(MULTISIG_ADDRESS)
+        .whitebox(multisig::contract_obj, |sc| {
             let _ = sc.perform_action_endpoint(action_id);
-        },
-    );
+        });
 
-    world.whitebox_query(&multisig_whitebox, |sc| {
-        // check role after
-        let user_role = sc.user_role(managed_address!(&address_expr_to_address(
-            PROPOSER_ADDRESS_EXPR
-        )));
-        assert_eq!(user_role, UserRole::None);
-
-        let proposers = sc.get_all_proposers().to_vec();
-        assert!(proposers.is_empty());
-    });
+    world
+        .query()
+        .to(MULTISIG_ADDRESS)
+        .whitebox(multisig::contract_obj, |sc| {
+            // check role after
+            let user_role = sc.user_role(PROPOSER_ADDRESS.to_managed_address());
+            assert_eq!(user_role, UserRole::None);
+
+            let proposers = sc.get_all_proposers();
+            assert!(proposers.is_empty());
+        });
 }
 
 #[test]
 fn test_try_remove_all_board_members() {
     let mut world = setup();
-    let multisig_whitebox = WhiteboxContract::new(MULTISIG_ADDRESS_EXPR, multisig::contract_obj);
 
     let action_id = call_propose(
         &mut world,
-        ActionRaw::RemoveUser(address_expr_to_address(BOARD_MEMBER_ADDRESS_EXPR)),
+        ActionRaw::RemoveUser(BOARD_MEMBER_ADDRESS.to_address()),
         None,
     );
 
-    world.whitebox_call(
-        &multisig_whitebox,
-        ScCallStep::new().from(BOARD_MEMBER_ADDRESS_EXPR),
-        |sc| sc.sign(action_id),
-    );
+    world
+        .tx()
+        .from(BOARD_MEMBER_ADDRESS)
+        .to(MULTISIG_ADDRESS)
+        .whitebox(multisig::contract_obj, |sc| sc.sign(action_id));
 
-    world.whitebox_call_check(
-        &multisig_whitebox,
-        ScCallStep::new()
-            .from(BOARD_MEMBER_ADDRESS_EXPR)
-            .no_expect(),
-        |sc| {
+    world
+        .tx()
+        .from(BOARD_MEMBER_ADDRESS)
+        .to(MULTISIG_ADDRESS)
+        .returns(ExpectError(4u64, "quorum cannot exceed board size"))
+        .whitebox(multisig::contract_obj, |sc| {
             let _ = sc.perform_action_endpoint(action_id);
-        },
-        |r| {
-            r.assert_user_error("quorum cannot exceed board size");
-        },
-    );
+        });
 }
 
 #[test]
 fn test_change_quorum() {
     let mut world = setup();
-    let multisig_whitebox = WhiteboxContract::new(MULTISIG_ADDRESS_EXPR, multisig::contract_obj);
 
     let new_quorum_size = 2;
 
     // try change quorum > board size
     let action_id = call_propose(&mut world, ActionRaw::ChangeQuorum(new_quorum_size), None);
 
-    world.whitebox_call(
-        &multisig_whitebox,
-        ScCallStep::new().from(BOARD_MEMBER_ADDRESS_EXPR),
-        |sc| sc.sign(action_id),
-    );
+    world
+        .tx()
+        .from(BOARD_MEMBER_ADDRESS)
+        .to(MULTISIG_ADDRESS)
+        .whitebox(multisig::contract_obj, |sc| sc.sign(action_id));
 
-    world.whitebox_call_check(
-        &multisig_whitebox,
-        ScCallStep::new()
-            .from(BOARD_MEMBER_ADDRESS_EXPR)
-            .no_expect(),
-        |sc| {
+    world
+        .tx()
+        .from(BOARD_MEMBER_ADDRESS)
+        .to(MULTISIG_ADDRESS)
+        .returns(ExpectError(4u64, "quorum cannot exceed board size"))
+        .whitebox(multisig::contract_obj, |sc| {
             let _ = sc.perform_action_endpoint(action_id);
-        },
-        |r| {
-            r.assert_user_error("quorum cannot exceed board size");
-        },
-    );
+        });
 
     // try discard before unsigning
-    world.whitebox_call_check(
-        &multisig_whitebox,
-        ScCallStep::new()
-            .from(BOARD_MEMBER_ADDRESS_EXPR)
-            .no_expect(),
-        |sc| {
-            sc.discard_action(action_id);
-        },
-        |r| {
-            r.assert_user_error("cannot discard action with valid signatures");
-        },
-    );
+    world
+        .tx()
+        .from(BOARD_MEMBER_ADDRESS)
+        .to(MULTISIG_ADDRESS)
+        .returns(ExpectError(
+            4u64,
+            "cannot discard action with valid signatures",
+        ))
+        .whitebox(multisig::contract_obj, |sc| sc.discard_action(action_id));
 
     // unsign and discard action
-    world.whitebox_call(
-        &multisig_whitebox,
-        ScCallStep::new().from(BOARD_MEMBER_ADDRESS_EXPR),
-        |sc| sc.unsign(action_id),
-    );
+    world
+        .tx()
+        .from(BOARD_MEMBER_ADDRESS)
+        .to(MULTISIG_ADDRESS)
+        .whitebox(multisig::contract_obj, |sc| sc.unsign(action_id));
 
-    world.whitebox_call(
-        &multisig_whitebox,
-        ScCallStep::new().from(BOARD_MEMBER_ADDRESS_EXPR),
-        |sc| {
-            sc.discard_action(action_id);
-        },
-    );
+    world
+        .tx()
+        .from(BOARD_MEMBER_ADDRESS)
+        .to(MULTISIG_ADDRESS)
+        .whitebox(multisig::contract_obj, |sc| sc.discard_action(action_id));
 
     // try sign discarded action
-    world.whitebox_call_check(
-        &multisig_whitebox,
-        ScCallStep::new()
-            .from(BOARD_MEMBER_ADDRESS_EXPR)
-            .no_expect(),
-        |sc| {
+    world
+        .tx()
+        .from(BOARD_MEMBER_ADDRESS)
+        .to(MULTISIG_ADDRESS)
+        .returns(ExpectError(4u64, "action does not exist"))
+        .whitebox(multisig::contract_obj, |sc| {
             sc.sign(action_id);
-        },
-        |r| {
-            r.assert_user_error("action does not exist");
-        },
-    );
+        });
 
     // add another board member
-    const NEW_BOARD_MEMBER_ADDRESS_EXPR: &str = "address:new-board-member";
-    world.set_state_step(
-        SetStateStep::new().put_account(NEW_BOARD_MEMBER_ADDRESS_EXPR, Account::new().nonce(1)),
-    );
+    const NEW_BOARD_MEMBER_ADDRESS: TestAddress = TestAddress::new("new-board-member");
+    world.account(NEW_BOARD_MEMBER_ADDRESS).nonce(1);
 
     let action_id = call_propose(
         &mut world,
-        ActionRaw::AddBoardMember(address_expr_to_address(NEW_BOARD_MEMBER_ADDRESS_EXPR)),
+        ActionRaw::AddBoardMember(NEW_BOARD_MEMBER_ADDRESS.to_address()),
         None,
     );
 
-    world.whitebox_call(
-        &multisig_whitebox,
-        ScCallStep::new().from(BOARD_MEMBER_ADDRESS_EXPR),
-        |sc| sc.sign(action_id),
-    );
+    world
+        .tx()
+        .from(BOARD_MEMBER_ADDRESS)
+        .to(MULTISIG_ADDRESS)
+        .whitebox(multisig::contract_obj, |sc| sc.sign(action_id));
 
-    world.whitebox_call(
-        &multisig_whitebox,
-        ScCallStep::new().from(BOARD_MEMBER_ADDRESS_EXPR),
-        |sc| {
+    world
+        .tx()
+        .from(BOARD_MEMBER_ADDRESS)
+        .to(MULTISIG_ADDRESS)
+        .whitebox(multisig::contract_obj, |sc| {
             let _ = sc.perform_action_endpoint(action_id);
-        },
-    );
+        });
 
     // change quorum to 2
     let action_id = call_propose(&mut world, ActionRaw::ChangeQuorum(new_quorum_size), None);
 
-    world.whitebox_call(
-        &multisig_whitebox,
-        ScCallStep::new().from(BOARD_MEMBER_ADDRESS_EXPR),
-        |sc| sc.sign(action_id),
-    );
+    world
+        .tx()
+        .from(BOARD_MEMBER_ADDRESS)
+        .to(MULTISIG_ADDRESS)
+        .whitebox(multisig::contract_obj, |sc| sc.sign(action_id));
 
-    world.whitebox_call(
-        &multisig_whitebox,
-        ScCallStep::new().from(BOARD_MEMBER_ADDRESS_EXPR),
-        |sc| {
+    world
+        .tx()
+        .from(BOARD_MEMBER_ADDRESS)
+        .to(MULTISIG_ADDRESS)
+        .whitebox(multisig::contract_obj, |sc| {
             let _ = sc.perform_action_endpoint(action_id);
-        },
-    );
+        });
 }
 
 #[test]
 fn test_transfer_execute_to_user() {
     let mut world = setup();
-    let multisig_whitebox = WhiteboxContract::new(MULTISIG_ADDRESS_EXPR, multisig::contract_obj);
 
-    const NEW_USER_ADDRESS_EXPR: &str = "address:new-user";
-    world.set_state_step(
-        SetStateStep::new().put_account(NEW_USER_ADDRESS_EXPR, Account::new().nonce(1)),
-    );
+    const NEW_USER_ADDRESS: TestAddress = TestAddress::new("new-user");
+    world.account(NEW_USER_ADDRESS).nonce(1);
 
     const EGLD_AMOUNT: u64 = 100;
 
-    world.whitebox_call(
-        &multisig_whitebox,
-        ScCallStep::new()
-            .from(PROPOSER_ADDRESS_EXPR)
-            .egld_value(EGLD_AMOUNT),
-        |sc| {
+    world
+        .tx()
+        .from(PROPOSER_ADDRESS)
+        .to(MULTISIG_ADDRESS)
+        .egld(EGLD_AMOUNT)
+        .whitebox(multisig::contract_obj, |sc| {
             sc.deposit();
-        },
-    );
+        });
 
-    world.check_state_step(CheckStateStep::new().put_account(
-        MULTISIG_ADDRESS_EXPR,
-        CheckAccount::new().balance(EGLD_AMOUNT.to_string().as_str()),
-    ));
+    world.check_account(MULTISIG_ADDRESS).balance(EGLD_AMOUNT);
 
     // failed attempt
     let action_id = call_propose(
         &mut world,
         ActionRaw::SendTransferExecute(CallActionDataRaw {
-            to: address_expr_to_address(NEW_USER_ADDRESS_EXPR),
+            to: NEW_USER_ADDRESS.to_address(),
             egld_amount: rust_biguint!(0),
             endpoint_name: BoxedBytes::empty(),
             arguments: Vec::new(),
@@ -536,7 +479,7 @@ fn test_transfer_execute_to_user() {
     let action_id = call_propose(
         &mut world,
         ActionRaw::SendTransferExecute(CallActionDataRaw {
-            to: address_expr_to_address(NEW_USER_ADDRESS_EXPR),
+            to: NEW_USER_ADDRESS.to_address(),
             egld_amount: rust_biguint!(EGLD_AMOUNT),
             endpoint_name: BoxedBytes::empty(),
             arguments: Vec::new(),
@@ -544,59 +487,48 @@ fn test_transfer_execute_to_user() {
         None,
     );
 
-    world.whitebox_call(
-        &multisig_whitebox,
-        ScCallStep::new().from(BOARD_MEMBER_ADDRESS_EXPR),
-        |sc| sc.sign(action_id),
-    );
+    world
+        .tx()
+        .from(BOARD_MEMBER_ADDRESS)
+        .to(MULTISIG_ADDRESS)
+        .whitebox(multisig::contract_obj, |sc| sc.sign(action_id));
 
-    world.whitebox_call(
-        &multisig_whitebox,
-        ScCallStep::new().from(BOARD_MEMBER_ADDRESS_EXPR),
-        |sc| {
+    world
+        .tx()
+        .from(BOARD_MEMBER_ADDRESS)
+        .to(MULTISIG_ADDRESS)
+        .whitebox(multisig::contract_obj, |sc| {
             let _ = sc.perform_action_endpoint(action_id);
-        },
-    );
+        });
 
-    world.check_state_step(CheckStateStep::new().put_account(
-        NEW_USER_ADDRESS_EXPR,
-        CheckAccount::new().balance(EGLD_AMOUNT.to_string().as_str()),
-    ));
+    world.check_account(NEW_USER_ADDRESS).balance(EGLD_AMOUNT);
 }
 
 #[test]
 fn test_transfer_execute_sc_all() {
     let mut world = setup();
-    let multisig_whitebox = WhiteboxContract::new(MULTISIG_ADDRESS_EXPR, multisig::contract_obj);
-
-    let adder_whitebox = WhiteboxContract::new(ADDER_ADDRESS_EXPR, adder::contract_obj);
-    let adder_code = world.code_expression(ADDER_PATH_EXPR);
 
-    const ADDER_OWNER_ADDRESS_EXPR: &str = "address:adder-owner";
-    const ADDER_ADDRESS_EXPR: &str = "sc:adder";
-    const ADDER_PATH_EXPR: &str = "mxsc:test-contracts/adder.mxsc.json";
+    const ADDER_OWNER_ADDRESS: TestAddress = TestAddress::new("adder-owner");
+    const ADDER_ADDRESS: TestSCAddress = TestSCAddress::new("adder");
+    const ADDER_PATH_EXPR: MxscPath = MxscPath::new("mxsc:test-contracts/adder.mxsc.json");
 
     world.register_contract(ADDER_PATH_EXPR, adder::ContractBuilder);
-    world.set_state_step(
-        SetStateStep::new()
-            .put_account(ADDER_OWNER_ADDRESS_EXPR, Account::new().nonce(1))
-            .new_address(ADDER_OWNER_ADDRESS_EXPR, 1, ADDER_ADDRESS_EXPR),
-    );
+    world.account(ADDER_OWNER_ADDRESS).nonce(1);
 
-    world.whitebox_deploy(
-        &adder_whitebox,
-        ScDeployStep::new()
-            .from(ADDER_OWNER_ADDRESS_EXPR)
-            .code(adder_code),
-        |sc| {
-            sc.init(managed_biguint!(5));
-        },
-    );
+    world
+        .tx()
+        .raw_deploy()
+        .from(ADDER_OWNER_ADDRESS)
+        .code(ADDER_PATH_EXPR)
+        .new_address(ADDER_ADDRESS)
+        .whitebox(adder::contract_obj, |sc| {
+            sc.init(BigUint::from(5u64));
+        });
 
     let action_id = call_propose(
         &mut world,
         ActionRaw::SendTransferExecute(CallActionDataRaw {
-            to: address_expr_to_address(ADDER_ADDRESS_EXPR),
+            to: ADDER_ADDRESS.to_address(),
             egld_amount: 0u64.into(),
             endpoint_name: BoxedBytes::from(&b"add"[..]),
             arguments: vec![BoxedBytes::from(&[5u8][..])],
@@ -604,60 +536,55 @@ fn test_transfer_execute_sc_all() {
         None,
     );
 
-    world.whitebox_call(
-        &multisig_whitebox,
-        ScCallStep::new().from(BOARD_MEMBER_ADDRESS_EXPR),
-        |sc| sc.sign(action_id),
-    );
+    world
+        .tx()
+        .from(BOARD_MEMBER_ADDRESS)
+        .to(MULTISIG_ADDRESS)
+        .whitebox(multisig::contract_obj, |sc| sc.sign(action_id));
 
-    world.whitebox_call(
-        &multisig_whitebox,
-        ScCallStep::new().from(BOARD_MEMBER_ADDRESS_EXPR),
-        |sc| {
+    world
+        .tx()
+        .from(BOARD_MEMBER_ADDRESS)
+        .to(MULTISIG_ADDRESS)
+        .whitebox(multisig::contract_obj, |sc| {
             let _ = sc.perform_action_endpoint(action_id);
-        },
-    );
+        });
 
-    world.whitebox_query(&adder_whitebox, |sc| {
-        let actual_sum = sc.sum().get();
-        let expected_sum = managed_biguint!(10);
-        assert_eq!(actual_sum, expected_sum);
-    });
+    world
+        .query()
+        .to(ADDER_ADDRESS)
+        .whitebox(adder::contract_obj, |sc| {
+            let actual_sum = sc.sum().get();
+            let expected_sum = managed_biguint!(10);
+            assert_eq!(actual_sum, expected_sum);
+        });
 }
 
 #[test]
 fn test_async_call_to_sc() {
     let mut world = setup();
-    let multisig_whitebox = WhiteboxContract::new(MULTISIG_ADDRESS_EXPR, multisig::contract_obj);
-
-    let adder_whitebox = WhiteboxContract::new(ADDER_ADDRESS_EXPR, adder::contract_obj);
-    let adder_code = world.code_expression(ADDER_PATH_EXPR);
 
-    const ADDER_OWNER_ADDRESS_EXPR: &str = "address:adder-owner";
-    const ADDER_ADDRESS_EXPR: &str = "sc:adder";
-    const ADDER_PATH_EXPR: &str = "mxsc:test-contracts/adder.mxsc.json";
+    const ADDER_OWNER_ADDRESS: TestAddress = TestAddress::new("adder-owner");
+    const ADDER_ADDRESS: TestSCAddress = TestSCAddress::new("adder");
+    const ADDER_PATH_EXPR: MxscPath = MxscPath::new("mxsc:test-contracts/adder.mxsc.json");
 
     world.register_contract(ADDER_PATH_EXPR, adder::ContractBuilder);
-    world.set_state_step(
-        SetStateStep::new()
-            .put_account(ADDER_OWNER_ADDRESS_EXPR, Account::new().nonce(1))
-            .new_address(ADDER_OWNER_ADDRESS_EXPR, 1, ADDER_ADDRESS_EXPR),
-    );
+    world.account(ADDER_OWNER_ADDRESS).nonce(1);
 
-    world.whitebox_deploy(
-        &adder_whitebox,
-        ScDeployStep::new()
-            .from(ADDER_OWNER_ADDRESS_EXPR)
-            .code(adder_code),
-        |sc| {
-            sc.init(managed_biguint!(5));
-        },
-    );
+    world
+        .tx()
+        .raw_deploy()
+        .from(ADDER_OWNER_ADDRESS)
+        .code(ADDER_PATH_EXPR)
+        .new_address(ADDER_ADDRESS)
+        .whitebox(adder::contract_obj, |sc| {
+            sc.init(BigUint::from(5u64));
+        });
 
     let action_id = call_propose(
         &mut world,
         ActionRaw::SendAsyncCall(CallActionDataRaw {
-            to: address_expr_to_address(ADDER_ADDRESS_EXPR),
+            to: ADDER_ADDRESS.to_address(),
             egld_amount: 0u64.into(),
             endpoint_name: BoxedBytes::from(&b"add"[..]),
             arguments: vec![BoxedBytes::from(&[5u8][..])],
@@ -665,93 +592,90 @@ fn test_async_call_to_sc() {
         None,
     );
 
-    world.whitebox_call(
-        &multisig_whitebox,
-        ScCallStep::new().from(BOARD_MEMBER_ADDRESS_EXPR),
-        |sc| sc.sign(action_id),
-    );
+    world
+        .tx()
+        .from(BOARD_MEMBER_ADDRESS)
+        .to(MULTISIG_ADDRESS)
+        .whitebox(multisig::contract_obj, |sc| sc.sign(action_id));
 
-    world.whitebox_call(
-        &multisig_whitebox,
-        ScCallStep::new().from(BOARD_MEMBER_ADDRESS_EXPR),
-        |sc| {
+    world
+        .tx()
+        .from(BOARD_MEMBER_ADDRESS)
+        .to(MULTISIG_ADDRESS)
+        .whitebox(multisig::contract_obj, |sc| {
             let _ = sc.perform_action_endpoint(action_id);
-        },
-    );
+        });
 
-    world.whitebox_query(&adder_whitebox, |sc| {
-        let actual_sum = sc.sum().get();
-        let expected_sum = managed_biguint!(10);
-        assert_eq!(actual_sum, expected_sum);
-    });
+    world
+        .query()
+        .to(ADDER_ADDRESS)
+        .whitebox(adder::contract_obj, |sc| {
+            let actual_sum = sc.sum().get();
+            let expected_sum = managed_biguint!(10);
+            assert_eq!(actual_sum, expected_sum);
+        });
 }
 
 #[test]
 fn test_deploy_and_upgrade_from_source() {
     let mut world = setup();
-    let multisig_whitebox = WhiteboxContract::new(MULTISIG_ADDRESS_EXPR, multisig::contract_obj);
+    const NEW_ADDER_ADDRESS: TestSCAddress = TestSCAddress::new("new-adder");
 
-    let adder_whitebox = WhiteboxContract::new(ADDER_ADDRESS_EXPR, adder::contract_obj);
-    let adder_code = world.code_expression(ADDER_PATH_EXPR);
-
-    let new_adder_whitebox = WhiteboxContract::new(NEW_ADDER_ADDRESS_EXPR, adder::contract_obj);
-
-    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 = "mxsc:test-contracts/adder.mxsc.json";
+    const ADDER_OWNER_ADDRESS: TestAddress = TestAddress::new("adder-owner");
+    const ADDER_ADDRESS: TestSCAddress = TestSCAddress::new("adder");
+    const ADDER_PATH_EXPR: MxscPath = MxscPath::new("mxsc:test-contracts/adder.mxsc.json");
 
     world.register_contract(ADDER_PATH_EXPR, adder::ContractBuilder);
-    world.set_state_step(
-        SetStateStep::new()
-            .put_account(ADDER_OWNER_ADDRESS_EXPR, Account::new().nonce(1))
-            .new_address(ADDER_OWNER_ADDRESS_EXPR, 1, ADDER_ADDRESS_EXPR)
-            .new_address(MULTISIG_ADDRESS_EXPR, 0, NEW_ADDER_ADDRESS_EXPR),
-    );
+    world.set_state_step(SetStateStep::new().new_address(
+        MULTISIG_ADDRESS.eval_to_expr().as_str(),
+        0,
+        NEW_ADDER_ADDRESS.eval_to_expr().as_str(),
+    ));
 
-    world.whitebox_deploy(
-        &adder_whitebox,
-        ScDeployStep::new()
-            .from(ADDER_OWNER_ADDRESS_EXPR)
-            .code(adder_code),
-        |sc| {
-            sc.init(managed_biguint!(5));
-        },
-    );
+    world.account(ADDER_OWNER_ADDRESS).nonce(1);
+
+    world
+        .tx()
+        .raw_deploy()
+        .from(ADDER_OWNER_ADDRESS)
+        .code(ADDER_PATH_EXPR)
+        .new_address(ADDER_ADDRESS)
+        .whitebox(adder::contract_obj, |sc| {
+            sc.init(BigUint::from(5u64));
+        });
 
     let action_id = call_propose(
         &mut world,
         ActionRaw::SCDeployFromSource {
             amount: 0u64.into(),
-            source: address_expr_to_address(ADDER_ADDRESS_EXPR),
+            source: ADDER_ADDRESS.to_address(),
             code_metadata: CodeMetadata::all(),
             arguments: vec![BoxedBytes::from(&[5u8][..])],
         },
         None,
     );
 
-    world.whitebox_call(
-        &multisig_whitebox,
-        ScCallStep::new().from(BOARD_MEMBER_ADDRESS_EXPR),
-        |sc| sc.sign(action_id),
-    );
+    world
+        .tx()
+        .from(BOARD_MEMBER_ADDRESS)
+        .to(MULTISIG_ADDRESS)
+        .whitebox(multisig::contract_obj, |sc| sc.sign(action_id));
 
-    let mut addr = Address::zero();
-    world.whitebox_call(
-        &multisig_whitebox,
-        ScCallStep::new().from(BOARD_MEMBER_ADDRESS_EXPR),
-        |sc| {
+    world
+        .tx()
+        .from(BOARD_MEMBER_ADDRESS)
+        .to(MULTISIG_ADDRESS)
+        .whitebox(multisig::contract_obj, |sc| {
             let opt_address = sc.perform_action_endpoint(action_id);
-            addr = opt_address.into_option().unwrap().to_address();
-        },
-    );
+            let addr = opt_address.into_option().unwrap().to_address();
 
-    assert_eq!(address_expr_to_address(NEW_ADDER_ADDRESS_EXPR), addr);
+            assert_eq!(NEW_ADDER_ADDRESS.to_address(), addr);
+        });
 
     let action_id = call_propose(
         &mut world,
         ActionRaw::SendTransferExecute(CallActionDataRaw {
-            to: address_expr_to_address(NEW_ADDER_ADDRESS_EXPR),
+            to: NEW_ADDER_ADDRESS.to_address(),
             egld_amount: 0u64.into(),
             endpoint_name: BoxedBytes::from(&b"add"[..]),
             arguments: vec![BoxedBytes::from(&[5u8][..])],
@@ -759,71 +683,70 @@ fn test_deploy_and_upgrade_from_source() {
         None,
     );
 
-    world.whitebox_call(
-        &multisig_whitebox,
-        ScCallStep::new().from(BOARD_MEMBER_ADDRESS_EXPR),
-        |sc| sc.sign(action_id),
-    );
+    world
+        .tx()
+        .from(BOARD_MEMBER_ADDRESS)
+        .to(MULTISIG_ADDRESS)
+        .whitebox(multisig::contract_obj, |sc| sc.sign(action_id));
 
-    world.whitebox_call(
-        &multisig_whitebox,
-        ScCallStep::new().from(BOARD_MEMBER_ADDRESS_EXPR),
-        |sc| {
+    world
+        .tx()
+        .from(BOARD_MEMBER_ADDRESS)
+        .to(MULTISIG_ADDRESS)
+        .whitebox(multisig::contract_obj, |sc| {
             let _ = sc.perform_action_endpoint(action_id);
-        },
-    );
+        });
 
-    world.whitebox_query(&new_adder_whitebox, |sc| {
-        let actual_sum = sc.sum().get();
-        let expected_sum = managed_biguint!(10);
-        assert_eq!(actual_sum, expected_sum);
-    });
-
-    let factorial_code = world.code_expression(FACTORIAL_PATH_EXPR);
+    world
+        .query()
+        .to(NEW_ADDER_ADDRESS)
+        .whitebox(adder::contract_obj, |sc| {
+            let actual_sum = sc.sum().get();
+            let expected_sum = managed_biguint!(10);
+            assert_eq!(actual_sum, expected_sum);
+        });
 
-    const FACTORIAL_ADDRESS_EXPR: &str = "sc:factorial";
-    const FACTORIAL_PATH_EXPR: &str = "mxsc:test-contracts/factorial.mxsc.json";
+    const FACTORIAL_ADDRESS: TestSCAddress = TestSCAddress::new("factorial");
+    const FACTORIAL_PATH_EXPR: MxscPath = MxscPath::new("mxsc:test-contracts/factorial.mxsc.json");
 
     world.register_contract(FACTORIAL_PATH_EXPR, factorial::ContractBuilder);
-    world.set_state_step(SetStateStep::new().put_account(
-        FACTORIAL_ADDRESS_EXPR,
-        Account::new().nonce(1).code(factorial_code.clone()),
-    ));
+    world
+        .tx()
+        .raw_deploy()
+        .from(OWNER_ADDRESS)
+        .code(FACTORIAL_PATH_EXPR)
+        .new_address(FACTORIAL_ADDRESS)
+        .whitebox(factorial::contract_obj, |sc| {
+            sc.init();
+        });
 
     let action_id = call_propose(
         &mut world,
         ActionRaw::SCUpgradeFromSource {
-            source: address_expr_to_address(FACTORIAL_ADDRESS_EXPR),
+            source: FACTORIAL_ADDRESS.to_address(),
             amount: 0u64.into(),
             code_metadata: CodeMetadata::all(),
             arguments: Vec::new(),
-            sc_address: address_expr_to_address(ADDER_ADDRESS_EXPR),
+            sc_address: ADDER_ADDRESS.to_address(),
         },
         None,
     );
 
-    world.whitebox_call(
-        &multisig_whitebox,
-        ScCallStep::new().from(BOARD_MEMBER_ADDRESS_EXPR),
-        |sc| sc.sign(action_id),
-    );
+    world
+        .tx()
+        .from(BOARD_MEMBER_ADDRESS)
+        .to(MULTISIG_ADDRESS)
+        .whitebox(multisig::contract_obj, |sc| sc.sign(action_id));
 
-    world.whitebox_call(
-        &multisig_whitebox,
-        ScCallStep::new().from(BOARD_MEMBER_ADDRESS_EXPR),
-        |sc| {
+    world
+        .tx()
+        .from(BOARD_MEMBER_ADDRESS)
+        .to(MULTISIG_ADDRESS)
+        .whitebox(multisig::contract_obj, |sc| {
             let _ = sc.perform_action_endpoint(action_id);
-        },
-    );
-
-    world.check_state_step(
-        CheckStateStep::new()
-            .put_account(ADDER_ADDRESS_EXPR, CheckAccount::new().code(factorial_code)),
-    );
-}
+        });
 
-fn address_expr_to_address(address_expr: &str) -> Address {
-    AddressValue::from(address_expr).to_address()
+    world.check_account(ADDER_ADDRESS).code(FACTORIAL_PATH_EXPR);
 }
 
 fn boxed_bytes_vec_to_managed<M: ManagedTypeApi>(

From 1de1b5b6f5981fbadf17b383689750f3a9838e9b Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Thu, 22 Aug 2024 15:23:04 +0200
Subject: [PATCH 1182/1254] impl new crypto opcodes

---
 framework/base/src/api/crypto_api.rs          | 21 +++++++++++
 .../api/uncallable/crypto_api_uncallable.rs   | 27 ++++++++++++++
 .../src/api/core_api_vh/crypto_api_vh.rs      | 27 ++++++++++++++
 .../wasm-adapter/src/api/crypto_api_node.rs   | 37 +++++++++++++++++++
 4 files changed, 112 insertions(+)

diff --git a/framework/base/src/api/crypto_api.rs b/framework/base/src/api/crypto_api.rs
index 3c5c374a87..235e44919a 100644
--- a/framework/base/src/api/crypto_api.rs
+++ b/framework/base/src/api/crypto_api.rs
@@ -76,4 +76,25 @@ pub trait CryptoApiImpl: ManagedTypeApiImpl {
         s: Self::ManagedBufferHandle,
         dest: Self::ManagedBufferHandle,
     );
+
+    fn verify_secp256r1_managed(
+        &self,
+        key: Self::ManagedBufferHandle,
+        message: Self::ManagedBufferHandle,
+        signature: Self::ManagedBufferHandle,
+    ) -> bool;
+
+    fn verify_bls_signature_share_managed(
+        &self,
+        key: Self::ManagedBufferHandle,
+        message: Self::ManagedBufferHandle,
+        signature: Self::ManagedBufferHandle,
+    ) -> bool;
+
+    fn verify_bls_aggregated_signature_managed(
+        &self,
+        key: Self::ManagedBufferHandle,
+        message: Self::ManagedBufferHandle,
+        signature: Self::ManagedBufferHandle,
+    ) -> bool;
 }
diff --git a/framework/base/src/api/uncallable/crypto_api_uncallable.rs b/framework/base/src/api/uncallable/crypto_api_uncallable.rs
index 59195618c9..bb42aa04bb 100644
--- a/framework/base/src/api/uncallable/crypto_api_uncallable.rs
+++ b/framework/base/src/api/uncallable/crypto_api_uncallable.rs
@@ -82,4 +82,31 @@ impl CryptoApiImpl for UncallableApi {
     ) {
         unreachable!()
     }
+
+    fn verify_secp256r1_managed(
+        &self,
+        _key: Self::ManagedBufferHandle,
+        _message: Self::ManagedBufferHandle,
+        _signature: Self::ManagedBufferHandle,
+    ) -> bool {
+        unreachable!()
+    }
+
+    fn verify_bls_signature_share_managed(
+        &self,
+        _key: Self::ManagedBufferHandle,
+        _message: Self::ManagedBufferHandle,
+        _signature: Self::ManagedBufferHandle,
+    ) -> bool {
+        unreachable!()
+    }
+
+    fn verify_bls_aggregated_signature_managed(
+        &self,
+        _key: Self::ManagedBufferHandle,
+        _message: Self::ManagedBufferHandle,
+        _signature: Self::ManagedBufferHandle,
+    ) -> bool {
+        unreachable!()
+    }
 }
diff --git a/framework/scenario/src/api/core_api_vh/crypto_api_vh.rs b/framework/scenario/src/api/core_api_vh/crypto_api_vh.rs
index f3789181e7..aa4c2dab94 100644
--- a/framework/scenario/src/api/core_api_vh/crypto_api_vh.rs
+++ b/framework/scenario/src/api/core_api_vh/crypto_api_vh.rs
@@ -99,4 +99,31 @@ impl<VHB: VMHooksApiBackend> CryptoApiImpl for VMHooksApi<VHB> {
     ) {
         panic!("encode_secp256k1_signature not implemented yet!")
     }
+
+    fn verify_secp256r1_managed(
+        &self,
+        _key: Self::ManagedBufferHandle,
+        _message: Self::ManagedBufferHandle,
+        _signature: Self::ManagedBufferHandle,
+    ) -> bool {
+        panic!("verify_secp256r1 not implemented yet!")
+    }
+
+    fn verify_bls_signature_share_managed(
+        &self,
+        _key: Self::ManagedBufferHandle,
+        _message: Self::ManagedBufferHandle,
+        _signature: Self::ManagedBufferHandle,
+    ) -> bool {
+        panic!("verify_bls_signature_share not implemented yet!")
+    }
+
+    fn verify_bls_aggregated_signature_managed(
+        &self,
+        _key: Self::ManagedBufferHandle,
+        _message: Self::ManagedBufferHandle,
+        _signature: Self::ManagedBufferHandle,
+    ) -> bool {
+        panic!("verify_bls_aggregated_signature not implemented yet!")
+    }
 }
diff --git a/framework/wasm-adapter/src/api/crypto_api_node.rs b/framework/wasm-adapter/src/api/crypto_api_node.rs
index eb16e25e6a..0cbe24fad5 100644
--- a/framework/wasm-adapter/src/api/crypto_api_node.rs
+++ b/framework/wasm-adapter/src/api/crypto_api_node.rs
@@ -25,6 +25,16 @@ extern "C" {
     ) -> i32;
 
     fn managedEncodeSecp256k1DerSignature(rHandle: i32, sHandle: i32, sigHandle: i32) -> i32;
+
+    fn managedVerifySecp256r1(keyHandle: i32, messageHandle: i32, sigHandle: i32) -> i32;
+
+    fn managedVerifyBLSSignatureShare(keyHandle: i32, messageHandle: i32, sigHandle: i32) -> i32;
+
+    fn managedVerifyBLSAggregatedSignature(
+        keyHandle: i32,
+        messageHandle: i32,
+        sigHandle: i32,
+    ) -> i32;
 }
 
 impl CryptoApi for VmApiImpl {
@@ -123,4 +133,31 @@ impl CryptoApiImpl for VmApiImpl {
             let _ = managedEncodeSecp256k1DerSignature(r, s, dest_sig_handle);
         }
     }
+
+    fn verify_secp256r1_managed(
+        &self,
+        key: Self::ManagedBufferHandle,
+        message: Self::ManagedBufferHandle,
+        signature: Self::ManagedBufferHandle,
+    ) -> bool {
+        unsafe { managedVerifySecp256r1(key, message, signature) == 0 }
+    }
+
+    fn verify_bls_signature_share_managed(
+        &self,
+        key: Self::ManagedBufferHandle,
+        message: Self::ManagedBufferHandle,
+        signature: Self::ManagedBufferHandle,
+    ) -> bool {
+        unsafe { managedVerifyBLSSignatureShare(key, message, signature) == 0 }
+    }
+
+    fn verify_bls_aggregated_signature_managed(
+        &self,
+        key: Self::ManagedBufferHandle,
+        message: Self::ManagedBufferHandle,
+        signature: Self::ManagedBufferHandle,
+    ) -> bool {
+        unsafe { managedVerifyBLSAggregatedSignature(key, message, signature) == 0 }
+    }
 }

From 9543e03aab14eeb01b2e72aec2b6454bae724a78 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Thu, 22 Aug 2024 16:30:59 +0200
Subject: [PATCH 1183/1254] added in crypto wrapper and test contract

---
 .../basic-features/sc-config.toml             |  3 ++
 .../basic-features/src/crypto_features.rs     | 30 ++++++++++++++
 .../basic-features/wasm/src/lib.rs            |  7 +++-
 .../contract_base/wrappers/crypto_wrapper.rs  | 39 +++++++++++++++++++
 4 files changed, 77 insertions(+), 2 deletions(-)

diff --git a/contracts/feature-tests/basic-features/sc-config.toml b/contracts/feature-tests/basic-features/sc-config.toml
index 82698d1dab..6b24db99b9 100644
--- a/contracts/feature-tests/basic-features/sc-config.toml
+++ b/contracts/feature-tests/basic-features/sc-config.toml
@@ -1,6 +1,9 @@
 [settings]
 main = "basic-features"
 
+[contracts.basic-features]
+ei = "1.4"
+
 [contracts.basic-features.profile]
 overflow-checks = true # needed for overflow tests
 
diff --git a/contracts/feature-tests/basic-features/src/crypto_features.rs b/contracts/feature-tests/basic-features/src/crypto_features.rs
index 56c543163c..2c08b850e5 100644
--- a/contracts/feature-tests/basic-features/src/crypto_features.rs
+++ b/contracts/feature-tests/basic-features/src/crypto_features.rs
@@ -64,4 +64,34 @@ pub trait CryptoFeatures {
     fn compute_secp256k1_der_signature(&self, r: ManagedBuffer, s: ManagedBuffer) -> ManagedBuffer {
         self.crypto().encode_secp256k1_der_signature(&r, &s)
     }
+
+    #[endpoint]
+    fn verify_secp256r1_signature(
+        &self,
+        key: ManagedBuffer,
+        message: ManagedBuffer,
+        signature: ManagedBuffer,
+    ) -> bool {
+        self.crypto().verify_secp256r1(&key, &message, &signature)
+    }
+    #[endpoint]
+    fn verify_bls_signature_share_managed(
+        &self,
+        key: ManagedBuffer,
+        message: ManagedBuffer,
+        signature: ManagedBuffer,
+    ) -> bool {
+        self.crypto()
+            .verify_bls_signature_share(&key, &message, &signature)
+    }
+    #[endpoint]
+    fn verify_bls_aggregated_signature_managed(
+        &self,
+        key: ManagedBuffer,
+        message: ManagedBuffer,
+        signature: ManagedBuffer,
+    ) -> bool {
+        self.crypto()
+            .verify_bls_aggregated_signature(&key, &message, &signature)
+    }
 }
diff --git a/contracts/feature-tests/basic-features/wasm/src/lib.rs b/contracts/feature-tests/basic-features/wasm/src/lib.rs
index 887b75bcd5..c602f6e198 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:                          403
+// Endpoints:                          406
 // Async Callback:                       1
-// Total number of exported functions: 405
+// Total number of exported functions: 408
 
 #![no_std]
 
@@ -145,6 +145,9 @@ multiversx_sc_wasm_adapter::endpoints! {
         verify_secp256k1_signature => verify_secp256k1_signature
         verify_custom_secp256k1_signature => verify_custom_secp256k1_signature
         compute_secp256k1_der_signature => compute_secp256k1_der_signature
+        verify_secp256r1_signature => verify_secp256r1_signature
+        verify_bls_signature_share_managed => verify_bls_signature_share_managed
+        verify_bls_aggregated_signature_managed => verify_bls_aggregated_signature_managed
         echo_u64 => echo_u64
         echo_i64 => echo_i64
         echo_i32 => echo_i32
diff --git a/framework/base/src/contract_base/wrappers/crypto_wrapper.rs b/framework/base/src/contract_base/wrappers/crypto_wrapper.rs
index c314899eaa..76b8fcd996 100644
--- a/framework/base/src/contract_base/wrappers/crypto_wrapper.rs
+++ b/framework/base/src/contract_base/wrappers/crypto_wrapper.rs
@@ -129,4 +129,43 @@ where
         );
         ManagedBuffer::from_handle(new_handle)
     }
+
+    pub fn verify_secp256r1(
+        &self,
+        key: &ManagedBuffer<A>,
+        message: &ManagedBuffer<A>,
+        signature: &ManagedBuffer<A>,
+    ) -> bool {
+        A::crypto_api_impl().verify_secp256r1_managed(
+            key.get_handle(),
+            message.get_handle(),
+            signature.get_handle(),
+        )
+    }
+
+    pub fn verify_bls_signature_share(
+        &self,
+        key: &ManagedBuffer<A>,
+        message: &ManagedBuffer<A>,
+        signature: &ManagedBuffer<A>,
+    ) -> bool {
+        A::crypto_api_impl().verify_bls_signature_share_managed(
+            key.get_handle(),
+            message.get_handle(),
+            signature.get_handle(),
+        )
+    }
+
+    pub fn verify_bls_aggregated_signature(
+        &self,
+        key: &ManagedBuffer<A>,
+        message: &ManagedBuffer<A>,
+        signature: &ManagedBuffer<A>,
+    ) -> bool {
+        A::crypto_api_impl().verify_bls_aggregated_signature_managed(
+            key.get_handle(),
+            message.get_handle(),
+            signature.get_handle(),
+        )
+    }
 }

From 38422b0d8a288b7417429f58932c59fe11eec018 Mon Sep 17 00:00:00 2001
From: Andrei Vasilescu <vasilescuandrei24@gmail.com>
Date: Thu, 22 Aug 2024 18:22:12 +0300
Subject: [PATCH 1184/1254] register token from interactor

---
 .../sys-func-calls/interact/.gitignore        |  9 ++
 .../sys-func-calls/interact/Cargo.toml        | 24 +++++
 .../sys-func-calls/interact/config.toml       |  1 +
 .../interact/src/basic_interact.rs            | 87 +++++++++++++++++++
 .../interact/src/basic_interact_cli.rs        | 45 ++++++++++
 .../interact/src/basic_interact_config.rs     | 26 ++++++
 .../interact/src/basic_interact_state.rs      | 50 +++++++++++
 7 files changed, 242 insertions(+)
 create mode 100644 tools/interactor-system-func-calls/sys-func-calls/interact/.gitignore
 create mode 100644 tools/interactor-system-func-calls/sys-func-calls/interact/Cargo.toml
 create mode 100644 tools/interactor-system-func-calls/sys-func-calls/interact/config.toml
 create mode 100644 tools/interactor-system-func-calls/sys-func-calls/interact/src/basic_interact.rs
 create mode 100644 tools/interactor-system-func-calls/sys-func-calls/interact/src/basic_interact_cli.rs
 create mode 100644 tools/interactor-system-func-calls/sys-func-calls/interact/src/basic_interact_config.rs
 create mode 100644 tools/interactor-system-func-calls/sys-func-calls/interact/src/basic_interact_state.rs

diff --git a/tools/interactor-system-func-calls/sys-func-calls/interact/.gitignore b/tools/interactor-system-func-calls/sys-func-calls/interact/.gitignore
new file mode 100644
index 0000000000..b2630809de
--- /dev/null
+++ b/tools/interactor-system-func-calls/sys-func-calls/interact/.gitignore
@@ -0,0 +1,9 @@
+# Pem files are used for interactions, but shouldn't be committed
+*.pem
+!adder-owner.pem
+
+# Temporary storage of deployed contract address, so we can preserve the context between executions.
+state.toml
+
+# Trace file of interactor tooling
+interactor_trace.scen.json
diff --git a/tools/interactor-system-func-calls/sys-func-calls/interact/Cargo.toml b/tools/interactor-system-func-calls/sys-func-calls/interact/Cargo.toml
new file mode 100644
index 0000000000..ce85dc57c1
--- /dev/null
+++ b/tools/interactor-system-func-calls/sys-func-calls/interact/Cargo.toml
@@ -0,0 +1,24 @@
+[[bin]]
+name = "basic-interact-sys-calls"
+path = "src/basic_interact.rs"
+
+[package]
+name = "basic-interact-sys-calls"
+version = "0.0.0"
+publish = false
+edition = "2021"
+authors = ["you"]
+
+[dependencies]
+toml = "0.8.6"
+
+[dependencies.clap]
+version = "4.4.7"
+features = ["derive"]
+
+[dependencies.serde]
+version = "1.0"
+features = ["derive"]
+
+[dependencies.multiversx-sc-snippets]
+version = "0.52.3"
diff --git a/tools/interactor-system-func-calls/sys-func-calls/interact/config.toml b/tools/interactor-system-func-calls/sys-func-calls/interact/config.toml
new file mode 100644
index 0000000000..61ac8dbf87
--- /dev/null
+++ b/tools/interactor-system-func-calls/sys-func-calls/interact/config.toml
@@ -0,0 +1 @@
+gateway = 'https://devnet-gateway.multiversx.com'
diff --git a/tools/interactor-system-func-calls/sys-func-calls/interact/src/basic_interact.rs b/tools/interactor-system-func-calls/sys-func-calls/interact/src/basic_interact.rs
new file mode 100644
index 0000000000..83f8d297fe
--- /dev/null
+++ b/tools/interactor-system-func-calls/sys-func-calls/interact/src/basic_interact.rs
@@ -0,0 +1,87 @@
+mod basic_interact_cli;
+mod basic_interact_config;
+mod basic_interact_state;
+
+use basic_interact_config::Config;
+use basic_interact_state::State;
+use clap::Parser;
+
+use multiversx_sc_snippets::imports::*;
+
+#[tokio::main]
+async fn main() {
+    env_logger::init();
+
+    let mut basic_interact = SysFuncCallsInteract::init().await;
+
+    let cli = basic_interact_cli::InteractCli::parse();
+    match &cli.command {
+        Some(basic_interact_cli::InteractCliCommand::Add(args)) => {},
+        Some(basic_interact_cli::InteractCliCommand::IssueToken(args)) => {
+            basic_interact
+                .issue_token(
+                    args.cost.clone(),
+                    &args.display_name,
+                    &args.ticker,
+                    EsdtTokenType::from(args.token_type),
+                    args.num_decimals,
+                )
+                .await;
+        },
+
+        None => {},
+    }
+}
+
+#[allow(unused)]
+struct SysFuncCallsInteract {
+    interactor: Interactor,
+    wallet_address: Bech32Address,
+    state: State,
+}
+
+impl SysFuncCallsInteract {
+    async fn init() -> Self {
+        let config = Config::load_config();
+        let mut interactor = Interactor::new(config.gateway()).await;
+
+        let wallet_address = interactor.register_wallet(test_wallets::alice());
+
+        Self {
+            interactor,
+            wallet_address: wallet_address.into(),
+            state: State::load_state(),
+        }
+    }
+
+    async fn set_state(&mut self) {
+        println!("wallet address: {}", self.wallet_address);
+        self.interactor.retrieve_account(&self.wallet_address).await;
+    }
+
+    async fn issue_token(
+        &mut self,
+        issue_cost: RustBigUint,
+        token_display_name: &str,
+        token_ticker: &str,
+        token_type: EsdtTokenType,
+        num_decimals: usize,
+    ) {
+        self.interactor
+            .tx()
+            .from(&self.wallet_address)
+            .to(ESDTSystemSCAddress.to_managed_address())
+            .gas(100_000_000u64)
+            .typed(ESDTSystemSCProxy)
+            .issue_and_set_all_roles(
+                issue_cost.into(),
+                token_display_name.into(),
+                token_ticker.into(),
+                token_type,
+                num_decimals,
+            )
+            .prepare_async()
+            .run()
+            .await;
+    }
+}
diff --git a/tools/interactor-system-func-calls/sys-func-calls/interact/src/basic_interact_cli.rs b/tools/interactor-system-func-calls/sys-func-calls/interact/src/basic_interact_cli.rs
new file mode 100644
index 0000000000..9c404c80e8
--- /dev/null
+++ b/tools/interactor-system-func-calls/sys-func-calls/interact/src/basic_interact_cli.rs
@@ -0,0 +1,45 @@
+use clap::{Args, Parser, Subcommand};
+use multiversx_sc_snippets::imports::{EsdtTokenType, RustBigUint};
+
+/// SysFuncCalls Interact CLI
+#[derive(Default, PartialEq, Eq, Debug, Parser)]
+#[command(version, about)]
+#[command(propagate_version = true)]
+pub struct InteractCli {
+    #[command(subcommand)]
+    pub command: Option<InteractCliCommand>,
+}
+
+/// SysFuncCalls Interact CLI Commands
+#[derive(Clone, PartialEq, Eq, Debug, Subcommand)]
+pub enum InteractCliCommand {
+    #[command(name = "add", about = "Add value")]
+    Add(AddArgs),
+    #[command(name = "issue-token", about = "Issue a token")]
+    IssueToken(IssueTokenArgs),
+}
+
+#[derive(Default, Clone, PartialEq, Eq, Debug, Args)]
+pub struct AddArgs {
+    /// The value to add
+    #[arg(short = 'v', long = "value")]
+    pub value: u32,
+
+    /// Repeat this number of times
+    #[arg(short = 'c', long = "count", default_value = "1")]
+    pub count: usize,
+}
+
+#[derive(Clone, Debug, PartialEq, Eq, Args)]
+pub struct IssueTokenArgs {
+    #[arg(short = 'c', long = "cost", default_value = "50000000000000000")]
+    pub cost: RustBigUint,
+    #[arg(short = 'd', long = "display-name")]
+    pub display_name: String,
+    #[arg(long = "token-ticker")]
+    pub ticker: String,
+    #[arg(long = "token-type")]
+    pub token_type: u8,
+    #[arg(long = "num-decimals")]
+    pub num_decimals: usize,
+}
diff --git a/tools/interactor-system-func-calls/sys-func-calls/interact/src/basic_interact_config.rs b/tools/interactor-system-func-calls/sys-func-calls/interact/src/basic_interact_config.rs
new file mode 100644
index 0000000000..f25b91a884
--- /dev/null
+++ b/tools/interactor-system-func-calls/sys-func-calls/interact/src/basic_interact_config.rs
@@ -0,0 +1,26 @@
+use serde::Deserialize;
+use std::io::Read;
+
+/// Config file
+const CONFIG_FILE: &str = "config.toml";
+
+/// SysFuncCalls Interact configuration
+#[derive(Debug, Deserialize)]
+pub struct Config {
+    gateway: String,
+}
+
+impl Config {
+    // Deserializes config from file
+    pub fn load_config() -> Self {
+        let mut file = std::fs::File::open(CONFIG_FILE).unwrap();
+        let mut content = String::new();
+        file.read_to_string(&mut content).unwrap();
+        toml::from_str(&content).unwrap()
+    }
+
+    // Returns the gateway
+    pub fn gateway(&self) -> &str {
+        &self.gateway
+    }
+}
diff --git a/tools/interactor-system-func-calls/sys-func-calls/interact/src/basic_interact_state.rs b/tools/interactor-system-func-calls/sys-func-calls/interact/src/basic_interact_state.rs
new file mode 100644
index 0000000000..41453e36fd
--- /dev/null
+++ b/tools/interactor-system-func-calls/sys-func-calls/interact/src/basic_interact_state.rs
@@ -0,0 +1,50 @@
+use multiversx_sc_snippets::imports::*;
+use serde::{Deserialize, Serialize};
+use std::{
+    io::{Read, Write},
+    path::Path,
+};
+
+/// State file
+const STATE_FILE: &str = "state.toml";
+
+/// Multisig Interact state
+#[derive(Debug, Default, Serialize, Deserialize)]
+pub struct State {
+    adder_address: Option<Bech32Address>,
+}
+
+impl State {
+    // Deserializes state from file
+    pub fn load_state() -> Self {
+        if Path::new(STATE_FILE).exists() {
+            let mut file = std::fs::File::open(STATE_FILE).unwrap();
+            let mut content = String::new();
+            file.read_to_string(&mut content).unwrap();
+            toml::from_str(&content).unwrap()
+        } else {
+            Self::default()
+        }
+    }
+
+    /// Sets the adder address
+    pub fn set_adder_address(&mut self, address: Bech32Address) {
+        self.adder_address = Some(address);
+    }
+
+    /// Returns the adder contract
+    pub fn current_adder_address(&self) -> &Bech32Address {
+        self.adder_address
+            .as_ref()
+            .expect("no known adder contract, deploy first")
+    }
+}
+
+impl Drop for State {
+    // Serializes state to file
+    fn drop(&mut self) {
+        let mut file = std::fs::File::create(STATE_FILE).unwrap();
+        file.write_all(toml::to_string(self).unwrap().as_bytes())
+            .unwrap();
+    }
+}

From 3fc082a04f42d54f7c9bebb764c9485266708221 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Thu, 22 Aug 2024 17:30:17 +0200
Subject: [PATCH 1185/1254] added tests

---
 .../scenarios/crypto_verify_bls.scen.json     |  52 +++++++-
 .../crypto_verify_secp256r1.scen.json         | 121 ++++++++++++++++++
 .../basic-features/src/crypto_features.rs     |   6 +-
 .../tests/basic_features_scenario_go_test.rs  |   5 +
 .../tests/basic_features_scenario_rs_test.rs  |   6 +
 .../basic-features/wasm/src/lib.rs            |   4 +-
 6 files changed, 189 insertions(+), 5 deletions(-)
 create mode 100644 contracts/feature-tests/basic-features/scenarios/crypto_verify_secp256r1.scen.json

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 ead18354dc..7b07232695 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
@@ -41,6 +41,56 @@
                 "gas": "*",
                 "refund": "*"
             }
+        },
+        {
+            "step": "scCall",
+            "id": "4",
+            "tx": {
+                "from": "address:an_account",
+                "to": "sc:basic-features",
+                "function": "verify_bls_signature_share",
+                "arguments": [
+                    "0xb5823f6e564251cc03ce7bad3da83e72576e92795d3500bba1acb30ec9a94dce87bb8aa794d67b2d61d15c33f28f6c0c23ba1dfcbf21e8f8b46286ff871afabac925303ddcaddce6254fcff6d3155797db40b3d3b5865e8fc0bd770b3d79b381",
+                    "0x6d65737361676520746f206265207369676e6564",
+                    "0xaf32a2ddf341c08d1eb7232f05dc34e4454155e676b58c40fddf9a036562ac2c01533d2d557cb49d73aa9d7a89744696"
+                ],
+                "gasLimit": "50,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": [
+                    "0x01"
+                ],
+                "status": "",
+                "logs": "*",
+                "gas": "*",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "5",
+            "tx": {
+                "from": "address:an_account",
+                "to": "sc:basic-features",
+                "function": "verify_bls_aggregated_signature",
+                "arguments": [
+                    "0xb5823f6e564251cc03ce7bad3da83e72576e92795d3500bba1acb30ec9a94dce87bb8aa794d67b2d61d15c33f28f6c0c23ba1dfcbf21e8f8b46286ff871afabac925303ddcaddce6254fcff6d3155797db40b3d3b5865e8fc0bd770b3d79b381",
+                    "0x6d65737361676520746f206265207369676e6564",
+                    "0xaf32a2ddf341c08d1eb7232f05dc34e4454155e676b58c40fddf9a036562ac2c01533d2d557cb49d73aa9d7a89744696"
+                ],
+                "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/scenarios/crypto_verify_secp256r1.scen.json b/contracts/feature-tests/basic-features/scenarios/crypto_verify_secp256r1.scen.json
new file mode 100644
index 0000000000..e87822db95
--- /dev/null
+++ b/contracts/feature-tests/basic-features/scenarios/crypto_verify_secp256r1.scen.json
@@ -0,0 +1,121 @@
+{
+    "name": "crypto",
+    "comment": "",
+    "gasSchedule": "v3",
+    "steps": [
+        {
+            "step": "setState",
+            "accounts": {
+                "sc:basic-features": {
+                    "nonce": "0",
+                    "balance": "0",
+                    "code": "mxsc:../output/basic-features.mxsc.json"
+                },
+                "address:an_account": {
+                    "nonce": "0",
+                    "balance": "0"
+                }
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "5 - compressed key",
+            "tx": {
+                "from": "address:an_account",
+                "to": "sc:basic-features",
+                "function": "verify_secp256r1_signature",
+                "arguments": [
+                    "0x02a673638cb9587cb68ea08dbef685c6f2d2a751a8b3c6f2a7e9a4999e6e4bfaf5",
+                    "0x6d65737361676520746f207369676e",
+                    "0x3045022100fab29dbcb623e7e96f44665f312b89ffdb9e4d2e2f53353236fbbcf57b2f49bf02203d6f9c63df8be43121042970a549a2d3baeca093fd37b726ddcc0924638409f5"
+                ],
+                "gasLimit": "50,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": [
+                    "0x01"
+                ],
+                "status": "",
+                "logs": "*",
+                "gas": "*",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "6 - uncompressed key",
+            "tx": {
+                "from": "address:an_account",
+                "to": "sc:basic-features",
+                "function": "verify_secp256r1_signature",
+                "arguments": [
+                    "0x04a673638cb9587cb68ea08dbef685c6f2d2a751a8b3c6f2a7e9a4999e6e4bfaf5ca1d22fe57c6103dbaac10cf15d15c0791cab8bb9a04f800e4d215276cb3e008",
+                    "0x6d65737361676520746f207369676e",
+                    "0x3045022100fab29dbcb623e7e96f44665f312b89ffdb9e4d2e2f53353236fbbcf57b2f49bf02203d6f9c63df8be43121042970a549a2d3baeca093fd37b726ddcc0924638409f5"
+                ],
+                "gasLimit": "50,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": [
+                    "0x01"
+                ],
+                "status": "",
+                "logs": "*",
+                "gas": "*",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "7 - encode key from r and s",
+            "tx": {
+                "from": "address:an_account",
+                "to": "sc:basic-features",
+                "function": "compute_secp256k1_der_signature",
+                "arguments": [
+                    "0x90f27b8b488db00b00606796d2987f6a5f59ae62ea05effe84fef5b8b0e54998",
+                    "0x4a691139ad57a3f0b906637673aa2f63d1f55cb1a69199d4009eea23ceaddc93"
+                ],
+                "gasLimit": "50,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": [
+                    "0x304502210090f27b8b488db00b00606796d2987f6a5f59ae62ea05effe84fef5b8b0e5499802204a691139ad57a3f0b906637673aa2f63d1f55cb1a69199d4009eea23ceaddc93"
+                ],
+                "status": "",
+                "logs": "*",
+                "gas": "*",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "8 - verify custom secp256k1",
+            "tx": {
+                "from": "address:an_account",
+                "to": "sc:basic-features",
+                "function": "verify_custom_secp256k1_signature",
+                "arguments": [
+                    "0x04e32df42865e97135acfb65f3bae71bdc86f4d49150ad6a440b6f15878109880a0a2b2667f7e725ceea70c673093bf67663e0312623c8e091b13cf2c0f11ef652",
+                    "0xce0677bb30baa8cf067c88db9811f4333d131bf8bcf12fe7065d211dce971008",
+                    "0x304502210090f27b8b488db00b00606796d2987f6a5f59ae62ea05effe84fef5b8b0e5499802204a691139ad57a3f0b906637673aa2f63d1f55cb1a69199d4009eea23ceaddc93",
+                    "0"
+                ],
+                "gasLimit": "50,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": [
+                    "0x01"
+                ],
+                "status": "",
+                "logs": "*",
+                "gas": "*",
+                "refund": "*"
+            }
+        }
+    ]
+}
diff --git a/contracts/feature-tests/basic-features/src/crypto_features.rs b/contracts/feature-tests/basic-features/src/crypto_features.rs
index 2c08b850e5..f66479026c 100644
--- a/contracts/feature-tests/basic-features/src/crypto_features.rs
+++ b/contracts/feature-tests/basic-features/src/crypto_features.rs
@@ -74,8 +74,9 @@ pub trait CryptoFeatures {
     ) -> bool {
         self.crypto().verify_secp256r1(&key, &message, &signature)
     }
+
     #[endpoint]
-    fn verify_bls_signature_share_managed(
+    fn verify_bls_signature_share(
         &self,
         key: ManagedBuffer,
         message: ManagedBuffer,
@@ -84,8 +85,9 @@ pub trait CryptoFeatures {
         self.crypto()
             .verify_bls_signature_share(&key, &message, &signature)
     }
+
     #[endpoint]
-    fn verify_bls_aggregated_signature_managed(
+    fn verify_bls_aggregated_signature(
         &self,
         key: ManagedBuffer,
         message: ManagedBuffer,
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 9c39d06ae5..f5a9a10726 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
@@ -94,6 +94,11 @@ fn crypto_verify_secp_256_k_1_go() {
     world().run("scenarios/crypto_verify_secp256k1.scen.json");
 }
 
+#[test]
+fn crypto_verify_secp_256_r_1_go() {
+    world().run("scenarios/crypto_verify_secp256r1.scen.json");
+}
+
 #[test]
 fn echo_array_u_8_go() {
     world().run("scenarios/echo_array_u8.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 f35c4779e6..95a617e20c 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
@@ -109,6 +109,12 @@ fn crypto_verify_secp_256_k_1_rs() {
     world().run("scenarios/crypto_verify_secp256k1.scen.json");
 }
 
+#[test]
+#[ignore]
+fn crypto_verify_secp_256_r_1_rs() {
+    world().run("scenarios/crypto_verify_secp256r1.scen.json");
+}
+
 #[test]
 fn echo_array_u_8_rs() {
     world().run("scenarios/echo_array_u8.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 c602f6e198..90986ec90b 100644
--- a/contracts/feature-tests/basic-features/wasm/src/lib.rs
+++ b/contracts/feature-tests/basic-features/wasm/src/lib.rs
@@ -146,8 +146,8 @@ multiversx_sc_wasm_adapter::endpoints! {
         verify_custom_secp256k1_signature => verify_custom_secp256k1_signature
         compute_secp256k1_der_signature => compute_secp256k1_der_signature
         verify_secp256r1_signature => verify_secp256r1_signature
-        verify_bls_signature_share_managed => verify_bls_signature_share_managed
-        verify_bls_aggregated_signature_managed => verify_bls_aggregated_signature_managed
+        verify_bls_signature_share => verify_bls_signature_share
+        verify_bls_aggregated_signature => verify_bls_aggregated_signature
         echo_u64 => echo_u64
         echo_i64 => echo_i64
         echo_i32 => echo_i32

From 6e59c53c981f86059622da9d4eba376f03e294f1 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Fri, 23 Aug 2024 15:33:53 +0200
Subject: [PATCH 1186/1254] created contract variant from new crypto endpoints

---
 .../basic-features/sc-config.toml             | 11 ++++++
 .../wasm-basic-features-crypto/Cargo.toml     | 35 +++++++++++++++++++
 .../wasm-basic-features-crypto/src/lib.rs     | 27 ++++++++++++++
 3 files changed, 73 insertions(+)
 create mode 100644 contracts/feature-tests/basic-features/wasm-basic-features-crypto/Cargo.toml
 create mode 100644 contracts/feature-tests/basic-features/wasm-basic-features-crypto/src/lib.rs

diff --git a/contracts/feature-tests/basic-features/sc-config.toml b/contracts/feature-tests/basic-features/sc-config.toml
index 6b24db99b9..b21719850f 100644
--- a/contracts/feature-tests/basic-features/sc-config.toml
+++ b/contracts/feature-tests/basic-features/sc-config.toml
@@ -12,6 +12,17 @@ add-unlabelled = false
 add-endpoints = ["init", "load_bytes", "store_bytes"]
 kill_legacy_callback = true
 
+[contracts.basic-features-crypto]
+ei = "1.4"
+add-unlabelled = false
+add-endpoints = [
+    "init",
+    "verify_secp256r1_signature",
+    "verify_bls_signature_share",
+    "verify_bls_aggregated_signature",
+]
+kill_legacy_callback = true
+
 [[proxy]]
 path = "src/basic_features_proxy.rs"
 add-unlabelled = false
diff --git a/contracts/feature-tests/basic-features/wasm-basic-features-crypto/Cargo.toml b/contracts/feature-tests/basic-features/wasm-basic-features-crypto/Cargo.toml
new file mode 100644
index 0000000000..46f40289e3
--- /dev/null
+++ b/contracts/feature-tests/basic-features/wasm-basic-features-crypto/Cargo.toml
@@ -0,0 +1,35 @@
+# Code generated by the multiversx-sc build system. DO NOT EDIT.
+
+# ##########################################
+# ############## AUTO-GENERATED #############
+# ##########################################
+
+[package]
+name = "basic-features-crypto-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
+
+[profile.dev]
+panic = "abort"
+
+[dependencies.basic-features]
+path = ".."
+
+[dependencies.multiversx-sc-wasm-adapter]
+version = "0.52.3"
+path = "../../../../framework/wasm-adapter"
+
+[workspace]
+members = ["."]
diff --git a/contracts/feature-tests/basic-features/wasm-basic-features-crypto/src/lib.rs b/contracts/feature-tests/basic-features/wasm-basic-features-crypto/src/lib.rs
new file mode 100644
index 0000000000..134138a65f
--- /dev/null
+++ b/contracts/feature-tests/basic-features/wasm-basic-features-crypto/src/lib.rs
@@ -0,0 +1,27 @@
+// Code generated by the multiversx-sc build system. DO NOT EDIT.
+
+////////////////////////////////////////////////////
+////////////////// AUTO-GENERATED //////////////////
+////////////////////////////////////////////////////
+
+// Init:                                 1
+// Endpoints:                            3
+// Async Callback (empty):               1
+// Total number of exported functions:   5
+
+#![no_std]
+
+multiversx_sc_wasm_adapter::allocator!();
+multiversx_sc_wasm_adapter::panic_handler!();
+
+multiversx_sc_wasm_adapter::endpoints! {
+    basic_features
+    (
+        init => init
+        verify_secp256r1_signature => verify_secp256r1_signature
+        verify_bls_signature_share => verify_bls_signature_share
+        verify_bls_aggregated_signature => verify_bls_aggregated_signature
+    )
+}
+
+multiversx_sc_wasm_adapter::async_callback_empty! {}

From 97c63ab5f81283313f99412902236d8320862a6a Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 23 Aug 2024 17:12:25 +0300
Subject: [PATCH 1187/1254] basic features sc-config fix

---
 .../basic-features/sc-config.toml             |   9 +-
 .../basic-features/src/crypto_features.rs     |   3 +
 .../wasm-basic-features-crypto/Cargo.lock     | 186 ++++++++++++++++++
 .../basic-features/wasm/src/lib.rs            |   7 +-
 4 files changed, 193 insertions(+), 12 deletions(-)
 create mode 100644 contracts/feature-tests/basic-features/wasm-basic-features-crypto/Cargo.lock

diff --git a/contracts/feature-tests/basic-features/sc-config.toml b/contracts/feature-tests/basic-features/sc-config.toml
index b21719850f..42c4880f67 100644
--- a/contracts/feature-tests/basic-features/sc-config.toml
+++ b/contracts/feature-tests/basic-features/sc-config.toml
@@ -2,7 +2,6 @@
 main = "basic-features"
 
 [contracts.basic-features]
-ei = "1.4"
 
 [contracts.basic-features.profile]
 overflow-checks = true # needed for overflow tests
@@ -15,12 +14,8 @@ kill_legacy_callback = true
 [contracts.basic-features-crypto]
 ei = "1.4"
 add-unlabelled = false
-add-endpoints = [
-    "init",
-    "verify_secp256r1_signature",
-    "verify_bls_signature_share",
-    "verify_bls_aggregated_signature",
-]
+add-endpoints = ["init"]
+add-labels = ["crypto-ei-1.4"]
 kill_legacy_callback = true
 
 [[proxy]]
diff --git a/contracts/feature-tests/basic-features/src/crypto_features.rs b/contracts/feature-tests/basic-features/src/crypto_features.rs
index f66479026c..4a9c7dbb6f 100644
--- a/contracts/feature-tests/basic-features/src/crypto_features.rs
+++ b/contracts/feature-tests/basic-features/src/crypto_features.rs
@@ -66,6 +66,7 @@ pub trait CryptoFeatures {
     }
 
     #[endpoint]
+    #[label("crypto-ei-1.4")]
     fn verify_secp256r1_signature(
         &self,
         key: ManagedBuffer,
@@ -76,6 +77,7 @@ pub trait CryptoFeatures {
     }
 
     #[endpoint]
+    #[label("crypto-ei-1.4")]
     fn verify_bls_signature_share(
         &self,
         key: ManagedBuffer,
@@ -87,6 +89,7 @@ pub trait CryptoFeatures {
     }
 
     #[endpoint]
+    #[label("crypto-ei-1.4")]
     fn verify_bls_aggregated_signature(
         &self,
         key: ManagedBuffer,
diff --git a/contracts/feature-tests/basic-features/wasm-basic-features-crypto/Cargo.lock b/contracts/feature-tests/basic-features/wasm-basic-features-crypto/Cargo.lock
new file mode 100644
index 0000000000..1666820785
--- /dev/null
+++ b/contracts/feature-tests/basic-features/wasm-basic-features-crypto/Cargo.lock
@@ -0,0 +1,186 @@
+# 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.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+
+[[package]]
+name = "basic-features"
+version = "0.0.0"
+dependencies = [
+ "multiversx-sc",
+ "multiversx-sc-modules",
+]
+
+[[package]]
+name = "basic-features-crypto-wasm"
+version = "0.0.0"
+dependencies = [
+ "basic-features",
+ "multiversx-sc-wasm-adapter",
+]
+
+[[package]]
+name = "bitflags"
+version = "2.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
+
+[[package]]
+name = "endian-type"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
+
+[[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.52.3"
+dependencies = [
+ "bitflags",
+ "hex-literal",
+ "multiversx-sc-codec",
+ "multiversx-sc-derive",
+ "num-traits",
+ "unwrap-infallible",
+]
+
+[[package]]
+name = "multiversx-sc-codec"
+version = "0.20.1"
+dependencies = [
+ "arrayvec",
+ "multiversx-sc-codec-derive",
+ "unwrap-infallible",
+]
+
+[[package]]
+name = "multiversx-sc-codec-derive"
+version = "0.20.1"
+dependencies = [
+ "hex",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "multiversx-sc-derive"
+version = "0.52.3"
+dependencies = [
+ "hex",
+ "proc-macro2",
+ "quote",
+ "radix_trie",
+ "syn",
+]
+
+[[package]]
+name = "multiversx-sc-modules"
+version = "0.52.3"
+dependencies = [
+ "multiversx-sc",
+]
+
+[[package]]
+name = "multiversx-sc-wasm-adapter"
+version = "0.52.3"
+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.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.86"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.36"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+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.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
+
+[[package]]
+name = "syn"
+version = "2.0.72"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+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"
+
+[[package]]
+name = "unwrap-infallible"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "151ac09978d3c2862c4e39b557f4eceee2cc72150bc4cb4f16abf061b6e381fb"
diff --git a/contracts/feature-tests/basic-features/wasm/src/lib.rs b/contracts/feature-tests/basic-features/wasm/src/lib.rs
index 90986ec90b..887b75bcd5 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:                          406
+// Endpoints:                          403
 // Async Callback:                       1
-// Total number of exported functions: 408
+// Total number of exported functions: 405
 
 #![no_std]
 
@@ -145,9 +145,6 @@ multiversx_sc_wasm_adapter::endpoints! {
         verify_secp256k1_signature => verify_secp256k1_signature
         verify_custom_secp256k1_signature => verify_custom_secp256k1_signature
         compute_secp256k1_der_signature => compute_secp256k1_der_signature
-        verify_secp256r1_signature => verify_secp256r1_signature
-        verify_bls_signature_share => verify_bls_signature_share
-        verify_bls_aggregated_signature => verify_bls_aggregated_signature
         echo_u64 => echo_u64
         echo_i64 => echo_i64
         echo_i32 => echo_i32

From e437447b3bd6806ad3989c2186052f5b6918393c Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Fri, 23 Aug 2024 18:52:52 +0200
Subject: [PATCH 1188/1254] test reorg

---
 .../scenarios/crypto_verify_bls.scen.json     | 50 ----------
 ..._verify_bls_aggregated_signature.scen.json | 71 ++++++++++++++
 .../crypto_verify_bls_share.scen.json         | 96 +++++++++++++++++++
 .../crypto_verify_secp256r1.scen.json         | 74 +++-----------
 .../tests/basic_features_scenario_go_test.rs  | 10 ++
 .../tests/basic_features_scenario_rs_test.rs  | 16 ++++
 6 files changed, 205 insertions(+), 112 deletions(-)
 create mode 100644 contracts/feature-tests/basic-features/scenarios/crypto_verify_bls_aggregated_signature.scen.json
 create mode 100644 contracts/feature-tests/basic-features/scenarios/crypto_verify_bls_share.scen.json

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 7b07232695..f5c6ef194c 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
@@ -41,56 +41,6 @@
                 "gas": "*",
                 "refund": "*"
             }
-        },
-        {
-            "step": "scCall",
-            "id": "4",
-            "tx": {
-                "from": "address:an_account",
-                "to": "sc:basic-features",
-                "function": "verify_bls_signature_share",
-                "arguments": [
-                    "0xb5823f6e564251cc03ce7bad3da83e72576e92795d3500bba1acb30ec9a94dce87bb8aa794d67b2d61d15c33f28f6c0c23ba1dfcbf21e8f8b46286ff871afabac925303ddcaddce6254fcff6d3155797db40b3d3b5865e8fc0bd770b3d79b381",
-                    "0x6d65737361676520746f206265207369676e6564",
-                    "0xaf32a2ddf341c08d1eb7232f05dc34e4454155e676b58c40fddf9a036562ac2c01533d2d557cb49d73aa9d7a89744696"
-                ],
-                "gasLimit": "50,000,000",
-                "gasPrice": "0"
-            },
-            "expect": {
-                "out": [
-                    "0x01"
-                ],
-                "status": "",
-                "logs": "*",
-                "gas": "*",
-                "refund": "*"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "5",
-            "tx": {
-                "from": "address:an_account",
-                "to": "sc:basic-features",
-                "function": "verify_bls_aggregated_signature",
-                "arguments": [
-                    "0xb5823f6e564251cc03ce7bad3da83e72576e92795d3500bba1acb30ec9a94dce87bb8aa794d67b2d61d15c33f28f6c0c23ba1dfcbf21e8f8b46286ff871afabac925303ddcaddce6254fcff6d3155797db40b3d3b5865e8fc0bd770b3d79b381",
-                    "0x6d65737361676520746f206265207369676e6564",
-                    "0xaf32a2ddf341c08d1eb7232f05dc34e4454155e676b58c40fddf9a036562ac2c01533d2d557cb49d73aa9d7a89744696"
-                ],
-                "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/scenarios/crypto_verify_bls_aggregated_signature.scen.json b/contracts/feature-tests/basic-features/scenarios/crypto_verify_bls_aggregated_signature.scen.json
new file mode 100644
index 0000000000..46617194c5
--- /dev/null
+++ b/contracts/feature-tests/basic-features/scenarios/crypto_verify_bls_aggregated_signature.scen.json
@@ -0,0 +1,71 @@
+{
+    "name": "crypto",
+    "comment": "does not currently work with scenarios-rs, because verify_bls function is not yet mocked",
+    "gasSchedule": "v3",
+    "steps": [
+        {
+            "step": "setState",
+            "accounts": {
+                "sc:basic-features-crypto": {
+                    "nonce": "0",
+                    "balance": "0",
+                    "code": "mxsc:../output/basic-features-crypto.mxsc.json"
+                },
+                "address:an_account": {
+                    "nonce": "0",
+                    "balance": "0"
+                }
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "1",
+            "tx": {
+                "from": "address:an_account",
+                "to": "sc:basic-features-crypto",
+                "function": "verify_bls_aggregated_signature",
+                "arguments": [
+                    "0x9cfb3532e21737e8f9eec99b04f000b27ec277d2477d881273ea07d3af96dc3e153878ed002bcd10e8320242caab49024b8c934b437b17e743b9706757f0e7b2e9fb28295d7f82af8875e0776ae8918c25206519b3f73dcbbd53cafeb5cec716",
+                    "0x6d65737361676530",
+                    "0x84737000b07fbce9b649449f9de6aae76347f5bb5eefcd017f53e874601ccf5f96c9b4ca5f85ea5f6ef6243c38c9ab99"
+                ],
+                "gasLimit": "50,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": [
+                    "0x01"
+                ],
+                "status": "",
+                "logs": "*",
+                "gas": "*",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "2",
+            "tx": {
+                "from": "address:an_account",
+                "to": "sc:basic-features-crypto",
+                "function": "verify_bls_aggregated_signature",
+                "arguments": [
+                    "0x9cfb3532e21737e8f9eec99b04f000b27ec277d2477d881273ea07d3af96dc3e153878ed002bcd10e8320242caab49024b8c934b437b17e743b9706757f0e7b2e9fb28295d7f82af8875e0776ae8918c25206519b3f73dcbbd53cafeb5cec716",
+                    "0x6d657373616765323133",
+                    "0x84737000b07fbce9b649449f9de6aae76347f5bb5eefcd017f53e874601ccf5f96c9b4ca5f85ea5f6ef6243c38c9ab99"
+                ],
+                "gasLimit": "50,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": [
+                    "0x00"
+                ],
+                "status": "",
+                "logs": "*",
+                "gas": "*",
+                "refund": "*"
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/contracts/feature-tests/basic-features/scenarios/crypto_verify_bls_share.scen.json b/contracts/feature-tests/basic-features/scenarios/crypto_verify_bls_share.scen.json
new file mode 100644
index 0000000000..046b015d86
--- /dev/null
+++ b/contracts/feature-tests/basic-features/scenarios/crypto_verify_bls_share.scen.json
@@ -0,0 +1,96 @@
+{
+    "name": "crypto",
+    "comment": "does not currently work with scenarios-rs, because verify_bls function is not yet mocked",
+    "gasSchedule": "v3",
+    "steps": [
+        {
+            "step": "setState",
+            "accounts": {
+                "sc:basic-features-crypto": {
+                    "nonce": "0",
+                    "balance": "0",
+                    "code": "mxsc:../output/basic-features-crypto.mxsc.json"
+                },
+                "address:an_account": {
+                    "nonce": "0",
+                    "balance": "0"
+                }
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "1",
+            "tx": {
+                "from": "address:an_account",
+                "to": "sc:basic-features-crypto",
+                "function": "verify_bls_signature_share",
+                "arguments": [
+                    "0x3e886a4c6e109a151f4105aee65a5192d150ef1fa68d3cd76964a0b086006dbe4324c989deb0e4416c6d6706db1b1910eb2732f08842fb4886067b9ed191109ac2188d76002d2e11da80a3f0ea89fee6b59c834cc478a6bd49cb8a193b1abb16",
+                    "0xe96bd0f36b70c5ccc0c4396343bd7d8255b8a526c55fa1e218511fafe6539b8e",
+                    "0x04725db195e37aa237cdbbda76270d4a229b6e7a3651104dc58c4349c0388e8546976fe54a04240530b99064e434c90f"
+                ],
+                "gasLimit": "50,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": [
+                    "0x01"
+                ],
+                "status": "",
+                "logs": "*",
+                "gas": "*",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "2",
+            "tx": {
+                "from": "address:an_account",
+                "to": "sc:basic-features-crypto",
+                "function": "verify_bls_signature_share",
+                "arguments": [
+                    "0x2c9a358953f61d34401d7ee4175eec105c476b18baacab371e2f47270035b539d84ad79ba587552b7e38802be00ff7148fc2a9c7a7034ff1e63ee24602ee952235ad14ca7d36e2be617fb2c99ed22a7a2729d86ae9fbb4df06f957ba07fec50e",
+                    "0x1e46d9cbb995e30b82485525c29f80ac78aca295a6e88a11c3df8f9a445494bb",
+                    "0xbe8c460db180d6254c712ead3aa81935bc9be15b919dd45cb152b3dece04762569778c5e70e7af03fa1c66409d4f4711"
+                ],
+                "gasLimit": "50,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": [
+                    "0x00"
+                ],
+                "status": "",
+                "logs": "*",
+                "gas": "*",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "2",
+            "tx": {
+                "from": "address:an_account",
+                "to": "sc:basic-features",
+                "function": "verify_bls_aggregated_signature",
+                "arguments": [
+                    "0xb5823f6e564251cc03ce7bad3da83e72576e92795d3500bba1acb30ec9a94dce87bb8aa794d67b2d61d15c33f28f6c0c23ba1dfcbf21e8f8b46286ff871afabac925303ddcaddce6254fcff6d3155797db40b3d3b5865e8fc0bd770b3d79b381",
+                    "0x6d65737361676520746f206265207369676e6564",
+                    "0xaf32a2ddf341c08d1eb7232f05dc34e4454155e676b58c40fddf9a036562ac2c01533d2d557cb49d73aa9d7a89744696"
+                ],
+                "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/scenarios/crypto_verify_secp256r1.scen.json b/contracts/feature-tests/basic-features/scenarios/crypto_verify_secp256r1.scen.json
index e87822db95..0de6016ef6 100644
--- a/contracts/feature-tests/basic-features/scenarios/crypto_verify_secp256r1.scen.json
+++ b/contracts/feature-tests/basic-features/scenarios/crypto_verify_secp256r1.scen.json
@@ -6,10 +6,10 @@
         {
             "step": "setState",
             "accounts": {
-                "sc:basic-features": {
+                "sc:basic-features-crypto": {
                     "nonce": "0",
                     "balance": "0",
-                    "code": "mxsc:../output/basic-features.mxsc.json"
+                    "code": "mxsc:../output/basic-features-crypto.mxsc.json"
                 },
                 "address:an_account": {
                     "nonce": "0",
@@ -19,15 +19,15 @@
         },
         {
             "step": "scCall",
-            "id": "5 - compressed key",
+            "id": "1",
             "tx": {
                 "from": "address:an_account",
-                "to": "sc:basic-features",
+                "to": "sc:basic-features-crypto",
                 "function": "verify_secp256r1_signature",
                 "arguments": [
-                    "0x02a673638cb9587cb68ea08dbef685c6f2d2a751a8b3c6f2a7e9a4999e6e4bfaf5",
-                    "0x6d65737361676520746f207369676e",
-                    "0x3045022100fab29dbcb623e7e96f44665f312b89ffdb9e4d2e2f53353236fbbcf57b2f49bf02203d6f9c63df8be43121042970a549a2d3baeca093fd37b726ddcc0924638409f5"
+                    "0x03e4d20902182b89cd5ed7984ebcf063f2fd2508d9f034e4109be487be9e2cf54d",
+                    "0xa607fab72e13d6b625942bd5c56cc32792c2c7c7f16053b2fb6d62dd9cf36fdacf9d5a8af3537eaf5eb93335b36cf8f1d6e5bb2dfffce9055a2608d5e1a5b839eacf36dd5dec6d2fa156133acf064cc26487d543873f3b3837a3c09b5f4cb509bbc6585d",
+                    "0xd5065c32582bf0bc8f96b34177cbf47f61d4705d64daaebff884693b6dd94afd50d3ac647aeb14d325c28bb00ab68b23280c1c480cac0e72b5a58176ac8cd1b9"
                 ],
                 "gasLimit": "50,000,000",
                 "gasPrice": "0"
@@ -44,14 +44,14 @@
         },
         {
             "step": "scCall",
-            "id": "6 - uncompressed key",
+            "id": "2",
             "tx": {
                 "from": "address:an_account",
-                "to": "sc:basic-features",
+                "to": "sc:basic-features-crypto",
                 "function": "verify_secp256r1_signature",
                 "arguments": [
                     "0x04a673638cb9587cb68ea08dbef685c6f2d2a751a8b3c6f2a7e9a4999e6e4bfaf5ca1d22fe57c6103dbaac10cf15d15c0791cab8bb9a04f800e4d215276cb3e008",
-                    "0x6d65737361676520746f207369676e",
+                    "0x00",
                     "0x3045022100fab29dbcb623e7e96f44665f312b89ffdb9e4d2e2f53353236fbbcf57b2f49bf02203d6f9c63df8be43121042970a549a2d3baeca093fd37b726ddcc0924638409f5"
                 ],
                 "gasLimit": "50,000,000",
@@ -59,57 +59,7 @@
             },
             "expect": {
                 "out": [
-                    "0x01"
-                ],
-                "status": "",
-                "logs": "*",
-                "gas": "*",
-                "refund": "*"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "7 - encode key from r and s",
-            "tx": {
-                "from": "address:an_account",
-                "to": "sc:basic-features",
-                "function": "compute_secp256k1_der_signature",
-                "arguments": [
-                    "0x90f27b8b488db00b00606796d2987f6a5f59ae62ea05effe84fef5b8b0e54998",
-                    "0x4a691139ad57a3f0b906637673aa2f63d1f55cb1a69199d4009eea23ceaddc93"
-                ],
-                "gasLimit": "50,000,000",
-                "gasPrice": "0"
-            },
-            "expect": {
-                "out": [
-                    "0x304502210090f27b8b488db00b00606796d2987f6a5f59ae62ea05effe84fef5b8b0e5499802204a691139ad57a3f0b906637673aa2f63d1f55cb1a69199d4009eea23ceaddc93"
-                ],
-                "status": "",
-                "logs": "*",
-                "gas": "*",
-                "refund": "*"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "8 - verify custom secp256k1",
-            "tx": {
-                "from": "address:an_account",
-                "to": "sc:basic-features",
-                "function": "verify_custom_secp256k1_signature",
-                "arguments": [
-                    "0x04e32df42865e97135acfb65f3bae71bdc86f4d49150ad6a440b6f15878109880a0a2b2667f7e725ceea70c673093bf67663e0312623c8e091b13cf2c0f11ef652",
-                    "0xce0677bb30baa8cf067c88db9811f4333d131bf8bcf12fe7065d211dce971008",
-                    "0x304502210090f27b8b488db00b00606796d2987f6a5f59ae62ea05effe84fef5b8b0e5499802204a691139ad57a3f0b906637673aa2f63d1f55cb1a69199d4009eea23ceaddc93",
-                    "0"
-                ],
-                "gasLimit": "50,000,000",
-                "gasPrice": "0"
-            },
-            "expect": {
-                "out": [
-                    "0x01"
+                    "0x00"
                 ],
                 "status": "",
                 "logs": "*",
@@ -118,4 +68,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 f5a9a10726..3a7a5dc515 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
@@ -84,6 +84,16 @@ fn crypto_verify_bls_go() {
     world().run("scenarios/crypto_verify_bls.scen.json");
 }
 
+#[test]
+fn crypto_verify_bls_share_go() {
+    world().run("scenarios/crypto_verify_bls_share.scen.json");
+}
+
+#[test]
+fn crypto_verify_bls_aggregated_go() {
+    world().run("scenarios/crypto_verify_bls_aggregated_signature.scen.json");
+}
+
 #[test]
 fn crypto_verify_ed_25519_go() {
     world().run("scenarios/crypto_verify_ed25519.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 95a617e20c..2689d7f3ec 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
@@ -11,6 +11,10 @@ fn world() -> ScenarioWorld {
         "mxsc:../esdt-system-sc-mock/output/esdt-system-sc-mock.mxsc.json",
         esdt_system_sc_mock::ContractBuilder,
     );
+    blockchain.register_contract(
+        "mxsc:output/basic-features-crypto.mxsc.json",
+        basic_features::ContractBuilder,
+    );
 
     blockchain
 }
@@ -98,6 +102,18 @@ fn crypto_verify_bls_rs() {
     world().run("scenarios/crypto_verify_bls.scen.json");
 }
 
+#[test]
+#[ignore]
+fn crypto_verify_bls_share_rs() {
+    world().run("scenarios/crypto_verify_bls_share.scen.json");
+}
+
+#[test]
+#[ignore]
+fn crypto_verify_bls_aggregated_rs() {
+    world().run("scenarios/crypto_verify_bls_aggregated_signature.scen.json");
+}
+
 #[test]
 fn crypto_verify_ed_25519_rs() {
     world().run("scenarios/crypto_verify_ed25519.scen.json");

From 93ebae93e5d6710b4fe0919eed9ef5f16c392ce5 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Sat, 24 Aug 2024 06:31:13 +0300
Subject: [PATCH 1189/1254] deprecated the older whitebox methods

---
 .../tests/st_whitebox_deprecated_test.rs      | 54 +++++++++++++++++++
 .../src/facade/scenario_world_whitebox.rs     | 26 +++++++++
 2 files changed, 80 insertions(+)
 create mode 100644 contracts/feature-tests/scenario-tester/tests/st_whitebox_deprecated_test.rs

diff --git a/contracts/feature-tests/scenario-tester/tests/st_whitebox_deprecated_test.rs b/contracts/feature-tests/scenario-tester/tests/st_whitebox_deprecated_test.rs
new file mode 100644
index 0000000000..e67fd8cacf
--- /dev/null
+++ b/contracts/feature-tests/scenario-tester/tests/st_whitebox_deprecated_test.rs
@@ -0,0 +1,54 @@
+#![allow(deprecated)]
+
+use multiversx_sc_scenario::imports::*;
+use scenario_tester::*;
+
+const ADDER_PATH_EXPR: &str = "mxsc:output/scenario-tester.mxsc.json";
+
+fn world() -> ScenarioWorld {
+    let mut blockchain = ScenarioWorld::new();
+
+    blockchain.register_contract(
+        "mxsc:output/scenario-tester.mxsc.json",
+        scenario_tester::ContractBuilder,
+    );
+    blockchain
+}
+
+#[test]
+fn st_whitebox() {
+    let mut world = world();
+    let st_whitebox = WhiteboxContract::new("sc:adder", scenario_tester::contract_obj);
+    let st_code = world.code_expression(ADDER_PATH_EXPR);
+
+    world
+        .set_state_step(
+            SetStateStep::new()
+                .put_account("address:owner", Account::new().nonce(1))
+                .new_address("address:owner", 1, "sc:adder"),
+        )
+        .whitebox_deploy(
+            &st_whitebox,
+            ScDeployStep::new().from("address:owner").code(st_code),
+            |sc| {
+                sc.init(5u32.into());
+            },
+        )
+        .whitebox_query(&st_whitebox, |sc| {
+            let sum_value = sc.sum();
+            assert_eq!(sum_value.get(), 5u32);
+        })
+        .whitebox_call(
+            &st_whitebox,
+            ScCallStep::new().from("address:owner"),
+            |sc| sc.add(3u32.into()),
+        )
+        .check_state_step(
+            CheckStateStep::new()
+                .put_account("address:owner", CheckAccount::new())
+                .put_account(
+                    "sc:adder",
+                    CheckAccount::new().check_storage("str:sum", "8"),
+                ),
+        );
+}
diff --git a/framework/scenario/src/facade/scenario_world_whitebox.rs b/framework/scenario/src/facade/scenario_world_whitebox.rs
index 32a148ad0a..542e0fe0b2 100644
--- a/framework/scenario/src/facade/scenario_world_whitebox.rs
+++ b/framework/scenario/src/facade/scenario_world_whitebox.rs
@@ -1,3 +1,5 @@
+#![allow(deprecated)]
+
 use multiversx_chain_vm::tx_mock::{TxFunctionName, TxResult};
 use multiversx_sc::contract_base::{CallableContract, ContractBase};
 
@@ -10,6 +12,10 @@ use crate::{
 use super::whitebox_contract::WhiteboxContract;
 
 impl ScenarioWorld {
+    #[deprecated(
+        since = "0.53.0",
+        note = "Please use method `whitebox`, as part of the unified transaction syntax."
+    )]
     pub fn whitebox_query<ContractObj, F>(
         &mut self,
         whitebox_contract: &WhiteboxContract<ContractObj>,
@@ -24,6 +30,10 @@ impl ScenarioWorld {
         })
     }
 
+    #[deprecated(
+        since = "0.53.0",
+        note = "Please use method `whitebox`, as part of the unified transaction syntax."
+    )]
     pub fn whitebox_query_check<ContractObj, F, C>(
         &mut self,
         whitebox_contract: &WhiteboxContract<ContractObj>,
@@ -50,6 +60,10 @@ impl ScenarioWorld {
         self
     }
 
+    #[deprecated(
+        since = "0.53.0",
+        note = "Please use method `whitebox`, as part of the unified transaction syntax."
+    )]
     pub fn whitebox_call<ContractObj, F>(
         &mut self,
         whitebox_contract: &WhiteboxContract<ContractObj>,
@@ -65,6 +79,10 @@ impl ScenarioWorld {
         })
     }
 
+    #[deprecated(
+        since = "0.53.0",
+        note = "Please use method `whitebox`, as part of the unified transaction syntax."
+    )]
     pub fn whitebox_call_check<ContractObj, F, C>(
         &mut self,
         whitebox_contract: &WhiteboxContract<ContractObj>,
@@ -99,6 +117,10 @@ impl ScenarioWorld {
         self
     }
 
+    #[deprecated(
+        since = "0.53.0",
+        note = "Please use method `whitebox`, as part of the unified transaction syntax."
+    )]
     pub fn whitebox_deploy<ContractObj, F>(
         &mut self,
         whitebox_contract: &WhiteboxContract<ContractObj>,
@@ -114,6 +136,10 @@ impl ScenarioWorld {
         })
     }
 
+    #[deprecated(
+        since = "0.53.0",
+        note = "Please use method `whitebox`, as part of the unified transaction syntax."
+    )]
     pub fn whitebox_deploy_check<ContractObj, F, C>(
         &mut self,
         whitebox_contract: &WhiteboxContract<ContractObj>,

From e9397b00cd56c1ebd677ef6a055063090a84b62f Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Sat, 24 Aug 2024 06:42:55 +0300
Subject: [PATCH 1190/1254] price aggregator whitebox migration

---
 .../tests/price_aggregator_blackbox_test.rs   | 51 +++++++++----------
 .../tests/price_aggregator_stress_blackbox.rs | 23 +++------
 2 files changed, 30 insertions(+), 44 deletions(-)

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 b0e1f54455..a312b0ca1f 100644
--- a/contracts/core/price-aggregator/tests/price_aggregator_blackbox_test.rs
+++ b/contracts/core/price-aggregator/tests/price_aggregator_blackbox_test.rs
@@ -1,6 +1,6 @@
 use multiversx_price_aggregator_sc::{
     price_aggregator_data::{OracleStatus, TimestampedPrice, TokenPair},
-    ContractObj, PriceAggregator, MAX_ROUND_DURATION_SECONDS,
+    PriceAggregator, MAX_ROUND_DURATION_SECONDS,
 };
 
 use multiversx_sc_scenario::imports::*;
@@ -35,7 +35,6 @@ fn world() -> ScenarioWorld {
 struct PriceAggregatorTestState {
     world: ScenarioWorld,
     oracles: Vec<AddressValue>,
-    price_aggregator_whitebox: WhiteboxContract<ContractObj<DebugApi>>,
 }
 
 impl PriceAggregatorTestState {
@@ -57,16 +56,7 @@ impl PriceAggregatorTestState {
             oracles.push(address_value);
         }
 
-        let price_aggregator_whitebox = WhiteboxContract::new(
-            PRICE_AGGREGATOR_ADDRESS,
-            multiversx_price_aggregator_sc::contract_obj,
-        );
-
-        Self {
-            world,
-            oracles,
-            price_aggregator_whitebox,
-        }
+        Self { world, oracles }
     }
 
     fn deploy(&mut self) -> &mut Self {
@@ -203,9 +193,10 @@ fn test_price_aggregator_submit() {
     state.submit(&state.oracles[0].clone(), 95, 100);
 
     let current_timestamp = 100;
-    state
-        .world
-        .whitebox_query(&state.price_aggregator_whitebox, |sc| {
+
+    state.world.query().to(PRICE_AGGREGATOR_ADDRESS).whitebox(
+        multiversx_price_aggregator_sc::contract_obj,
+        |sc| {
             let token_pair = TokenPair {
                 from: managed_buffer!(EGLD_TICKER),
                 to: managed_buffer!(USD_TICKER),
@@ -237,14 +228,15 @@ fn test_price_aggregator_submit() {
                     accepted_submissions: 1
                 }
             );
-        });
+        },
+    );
 
     // first oracle submit again - submission not accepted
     state.submit(&state.oracles[0].clone(), 95, 100);
 
-    state
-        .world
-        .whitebox_query(&state.price_aggregator_whitebox, |sc| {
+    state.world.query().to(PRICE_AGGREGATOR_ADDRESS).whitebox(
+        multiversx_price_aggregator_sc::contract_obj,
+        |sc| {
             assert_eq!(
                 sc.oracle_status()
                     .get(&managed_address!(&state.oracles[0].to_address()))
@@ -254,7 +246,8 @@ fn test_price_aggregator_submit() {
                     accepted_submissions: 1
                 }
             );
-        });
+        },
+    );
 }
 
 #[test]
@@ -283,9 +276,9 @@ fn test_price_aggregator_submit_round_ok() {
     // submit third
     state.submit(&state.oracles[2].clone(), 105, 12_000);
 
-    state
-        .world
-        .whitebox_query(&state.price_aggregator_whitebox, |sc| {
+    state.world.query().to(PRICE_AGGREGATOR_ADDRESS).whitebox(
+        multiversx_price_aggregator_sc::contract_obj,
+        |sc| {
             let result =
                 sc.latest_price_feed(managed_buffer!(EGLD_TICKER), managed_buffer!(USD_TICKER));
 
@@ -312,7 +305,8 @@ fn test_price_aggregator_submit_round_ok() {
                     decimals
                 }
             );
-        });
+        },
+    );
 }
 
 #[test]
@@ -338,9 +332,9 @@ fn test_price_aggregator_discarded_round() {
     // submit second - this will discard the previous submission
     state.submit(&state.oracles[1].clone(), current_timestamp - 1, 11_000);
 
-    state
-        .world
-        .whitebox_query(&state.price_aggregator_whitebox, |sc| {
+    state.world.query().to(PRICE_AGGREGATOR_ADDRESS).whitebox(
+        multiversx_price_aggregator_sc::contract_obj,
+        |sc| {
             let token_pair = TokenPair {
                 from: managed_buffer!(EGLD_TICKER),
                 to: managed_buffer!(USD_TICKER),
@@ -353,7 +347,8 @@ fn test_price_aggregator_discarded_round() {
                     .unwrap(),
                 managed_biguint!(11_000)
             );
-        });
+        },
+    );
 }
 
 #[test]
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 660bbf1dda..be457448b5 100644
--- a/contracts/core/price-aggregator/tests/price_aggregator_stress_blackbox.rs
+++ b/contracts/core/price-aggregator/tests/price_aggregator_stress_blackbox.rs
@@ -1,6 +1,6 @@
 use multiversx_price_aggregator_sc::{
     price_aggregator_data::{OracleStatus, TokenPair},
-    ContractObj, PriceAggregator,
+    PriceAggregator,
 };
 
 use multiversx_sc_scenario::imports::*;
@@ -34,7 +34,6 @@ fn world() -> ScenarioWorld {
 struct PriceAggregatorTestState {
     world: ScenarioWorld,
     oracles: Vec<AddressValue>,
-    price_aggregator_whitebox: WhiteboxContract<ContractObj<DebugApi>>,
 }
 
 impl PriceAggregatorTestState {
@@ -60,16 +59,7 @@ impl PriceAggregatorTestState {
             oracles.push(address_value);
         }
 
-        let price_aggregator_whitebox = WhiteboxContract::new(
-            PRICE_AGGREGATOR_ADDRESS,
-            multiversx_price_aggregator_sc::contract_obj,
-        );
-
-        Self {
-            world,
-            oracles,
-            price_aggregator_whitebox,
-        }
+        Self { world, oracles }
     }
 
     fn deploy(&mut self) -> &mut Self {
@@ -170,9 +160,9 @@ fn test_price_aggregator_submit() {
     }
 
     let current_timestamp = 100;
-    state
-        .world
-        .whitebox_query(&state.price_aggregator_whitebox, |sc| {
+    state.world.query().to(PRICE_AGGREGATOR_ADDRESS).whitebox(
+        multiversx_price_aggregator_sc::contract_obj,
+        |sc| {
             let blockchain_timestamp = sc.blockchain().get_block_timestamp();
 
             let token_pair = TokenPair {
@@ -207,7 +197,8 @@ fn test_price_aggregator_submit() {
                     }
                 );
             }
-        });
+        },
+    );
 
     // submit last that resets the round
     state.submit(

From c841e2a6eab8f390675abf4b21ec2b01461ddcba Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Sat, 24 Aug 2024 07:16:43 +0300
Subject: [PATCH 1191/1254] forwarder whitebox migration

---
 .../tests/forwarder_whitebox_legacy_test.rs   | 124 ++++++------------
 .../tests/forwarder_whitebox_test.rs          | 115 ++++++----------
 .../interaction/expr/test_token_identifier.rs |   4 +
 3 files changed, 89 insertions(+), 154 deletions(-)

diff --git a/contracts/feature-tests/composability/tests/forwarder_whitebox_legacy_test.rs b/contracts/feature-tests/composability/tests/forwarder_whitebox_legacy_test.rs
index 8766bfa174..f6cfb158f6 100644
--- a/contracts/feature-tests/composability/tests/forwarder_whitebox_legacy_test.rs
+++ b/contracts/feature-tests/composability/tests/forwarder_whitebox_legacy_test.rs
@@ -1,24 +1,16 @@
 use forwarder_legacy::fwd_nft_legacy::{Color, ForwarderNftModule};
-use multiversx_sc::{contract_base::ContractBase, types::Address};
-use multiversx_sc_scenario::{
-    managed_address, managed_biguint, managed_token_id,
-    scenario_model::{
-        Account, AddressValue, CheckAccount, CheckStateStep, ScCallStep, SetStateStep,
-    },
-    ScenarioWorld, WhiteboxContract,
-};
 
-const USER_ADDRESS_EXPR: &str = "address:user";
-const FORWARDER_ADDRESS_EXPR: &str = "sc:forwarder_legacy";
-const FORWARDER_PATH_EXPR: &str = "mxsc:output/forwarder_legacy.mxsc.json";
+use multiversx_sc_scenario::imports::*;
 
-const NFT_TOKEN_ID_EXPR: &str = "str:COOL-123456";
-const NFT_TOKEN_ID: &[u8] = b"COOL-123456";
+const USER_ADDRESS: TestAddress = TestAddress::new("user");
+const FORWARDER_ADDRESS: TestSCAddress = TestSCAddress::new("forwarder_legacy");
+const FORWARDER_PATH: MxscPath = MxscPath::new("output/forwarder_legacy.mxsc.json");
+const NFT_TOKEN_ID: TestTokenIdentifier = TestTokenIdentifier::new("COOL-123456");
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
 
-    blockchain.register_contract(FORWARDER_PATH_EXPR, forwarder_legacy::ContractBuilder);
+    blockchain.register_contract(FORWARDER_PATH, forwarder_legacy::ContractBuilder);
     blockchain
 }
 
@@ -26,57 +18,40 @@ fn world() -> ScenarioWorld {
 fn test_nft_update_attributes_and_send() {
     let mut world = world();
 
-    let forwarder_legacy_code = world.code_expression(FORWARDER_PATH_EXPR);
     let roles = vec![
         "ESDTRoleNFTCreate".to_string(),
         "ESDTRoleNFTUpdateAttributes".to_string(),
     ];
 
-    world.set_state_step(
-        SetStateStep::new()
-            .put_account(USER_ADDRESS_EXPR, Account::new().nonce(1))
-            .put_account(
-                FORWARDER_ADDRESS_EXPR,
-                Account::new()
-                    .nonce(1)
-                    .code(forwarder_legacy_code)
-                    .esdt_roles(NFT_TOKEN_ID_EXPR, roles),
-            ),
-    );
-
-    let forwarder_legacy_whitebox =
-        WhiteboxContract::new(FORWARDER_ADDRESS_EXPR, forwarder_legacy::contract_obj);
+    world.account(USER_ADDRESS).nonce(1);
+    world
+        .account(FORWARDER_ADDRESS)
+        .nonce(1)
+        .code(FORWARDER_PATH)
+        .esdt_roles(NFT_TOKEN_ID, roles);
 
     let original_attributes = Color { r: 0, g: 0, b: 0 };
 
-    world.whitebox_call(
-        &forwarder_legacy_whitebox,
-        ScCallStep::new().from(USER_ADDRESS_EXPR),
-        |sc| {
+    world
+        .tx()
+        .from(USER_ADDRESS)
+        .to(FORWARDER_ADDRESS)
+        .whitebox(forwarder_legacy::contract_obj, |sc| {
             sc.nft_create_compact(
-                managed_token_id!(NFT_TOKEN_ID),
+                NFT_TOKEN_ID.to_token_identifier(),
                 managed_biguint!(1),
                 original_attributes,
             );
 
-            sc.send().direct_esdt(
-                &managed_address!(&address_expr_to_address(USER_ADDRESS_EXPR)),
-                &managed_token_id!(NFT_TOKEN_ID),
-                1,
-                &managed_biguint!(1),
-            );
-        },
-    );
+            sc.tx()
+                .to(USER_ADDRESS)
+                .esdt((NFT_TOKEN_ID.to_token_identifier(), 1, 1u32.into()))
+                .transfer();
+        });
 
-    world.check_state_step(CheckStateStep::new().put_account(
-        USER_ADDRESS_EXPR,
-        CheckAccount::new().esdt_nft_balance_and_attributes(
-            NFT_TOKEN_ID_EXPR,
-            1,
-            "1",
-            Some(original_attributes),
-        ),
-    ));
+    world
+        .check_account(USER_ADDRESS)
+        .esdt_nft_balance_and_attributes(NFT_TOKEN_ID, 1, 1, original_attributes);
 
     let new_attributes = Color {
         r: 255,
@@ -84,34 +59,21 @@ fn test_nft_update_attributes_and_send() {
         b: 255,
     };
 
-    world.whitebox_call(
-        &forwarder_legacy_whitebox,
-        ScCallStep::new()
-            .from(USER_ADDRESS_EXPR)
-            .esdt_transfer(NFT_TOKEN_ID, 1, "1"),
-        |sc| {
-            sc.nft_update_attributes(managed_token_id!(NFT_TOKEN_ID), 1, new_attributes);
-
-            sc.send().direct_esdt(
-                &managed_address!(&address_expr_to_address(USER_ADDRESS_EXPR)),
-                &managed_token_id!(NFT_TOKEN_ID),
-                1,
-                &managed_biguint!(1),
-            );
-        },
-    );
-
-    world.check_state_step(CheckStateStep::new().put_account(
-        USER_ADDRESS_EXPR,
-        CheckAccount::new().esdt_nft_balance_and_attributes(
-            NFT_TOKEN_ID_EXPR,
-            1,
-            "1",
-            Some(new_attributes),
-        ),
-    ));
-}
-
-fn address_expr_to_address(address_expr: &str) -> Address {
-    AddressValue::from(address_expr).to_address()
+    world
+        .tx()
+        .from(USER_ADDRESS)
+        .to(FORWARDER_ADDRESS)
+        .single_esdt(&TokenIdentifier::from(NFT_TOKEN_ID), 1, &1u32.into())
+        .whitebox(forwarder_legacy::contract_obj, |sc| {
+            sc.nft_update_attributes(NFT_TOKEN_ID.to_token_identifier(), 1, new_attributes);
+
+            sc.tx()
+                .to(USER_ADDRESS)
+                .esdt((NFT_TOKEN_ID.to_token_identifier(), 1, 1u32.into()))
+                .transfer();
+        });
+
+    world
+        .check_account(USER_ADDRESS)
+        .esdt_nft_balance_and_attributes(NFT_TOKEN_ID, 1, 1, new_attributes);
 }
diff --git a/contracts/feature-tests/composability/tests/forwarder_whitebox_test.rs b/contracts/feature-tests/composability/tests/forwarder_whitebox_test.rs
index 1dbf3952f2..c861c561ef 100644
--- a/contracts/feature-tests/composability/tests/forwarder_whitebox_test.rs
+++ b/contracts/feature-tests/composability/tests/forwarder_whitebox_test.rs
@@ -1,17 +1,15 @@
 use forwarder::fwd_nft::{Color, ForwarderNftModule};
 use multiversx_sc_scenario::imports::*;
 
-const USER_ADDRESS_EXPR: &str = "address:user";
-const FORWARDER_ADDRESS_EXPR: &str = "sc:forwarder";
-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";
+const USER_ADDRESS: TestAddress = TestAddress::new("user");
+const FORWARDER_ADDRESS: TestSCAddress = TestSCAddress::new("forwarder");
+const FORWARDER_PATH: MxscPath = MxscPath::new("output/forwarder.mxsc.json");
+const NFT_TOKEN_ID: TestTokenIdentifier = TestTokenIdentifier::new("COOL-123456");
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
 
-    blockchain.register_contract(FORWARDER_PATH_EXPR, forwarder::ContractBuilder);
+    blockchain.register_contract(FORWARDER_PATH, forwarder::ContractBuilder);
     blockchain
 }
 
@@ -19,56 +17,40 @@ fn world() -> ScenarioWorld {
 fn test_nft_update_attributes_and_send() {
     let mut world = world();
 
-    let forwarder_code = world.code_expression(FORWARDER_PATH_EXPR);
     let roles = vec![
         "ESDTRoleNFTCreate".to_string(),
         "ESDTRoleNFTUpdateAttributes".to_string(),
     ];
 
-    world.set_state_step(
-        SetStateStep::new()
-            .put_account(USER_ADDRESS_EXPR, Account::new().nonce(1))
-            .put_account(
-                FORWARDER_ADDRESS_EXPR,
-                Account::new()
-                    .nonce(1)
-                    .code(forwarder_code)
-                    .esdt_roles(NFT_TOKEN_ID_EXPR, roles),
-            ),
-    );
-
-    let forwarder_whitebox = WhiteboxContract::new(FORWARDER_ADDRESS_EXPR, forwarder::contract_obj);
+    world.account(USER_ADDRESS).nonce(1);
+    world
+        .account(FORWARDER_ADDRESS)
+        .nonce(1)
+        .code(FORWARDER_PATH)
+        .esdt_roles(NFT_TOKEN_ID, roles);
 
     let original_attributes = Color { r: 0, g: 0, b: 0 };
 
-    world.whitebox_call(
-        &forwarder_whitebox,
-        ScCallStep::new().from(USER_ADDRESS_EXPR),
-        |sc| {
+    world
+        .tx()
+        .from(USER_ADDRESS)
+        .to(FORWARDER_ADDRESS)
+        .whitebox(forwarder::contract_obj, |sc| {
             sc.nft_create_compact(
-                managed_token_id!(NFT_TOKEN_ID),
+                NFT_TOKEN_ID.to_token_identifier(),
                 managed_biguint!(1),
                 original_attributes,
             );
 
-            sc.send().direct_esdt(
-                &managed_address!(&address_expr_to_address(USER_ADDRESS_EXPR)),
-                &managed_token_id!(NFT_TOKEN_ID),
-                1,
-                &managed_biguint!(1),
-            );
-        },
-    );
+            sc.tx()
+                .to(USER_ADDRESS)
+                .esdt((NFT_TOKEN_ID.to_token_identifier(), 1, 1u32.into()))
+                .transfer();
+        });
 
-    world.check_state_step(CheckStateStep::new().put_account(
-        USER_ADDRESS_EXPR,
-        CheckAccount::new().esdt_nft_balance_and_attributes(
-            NFT_TOKEN_ID_EXPR,
-            1,
-            "1",
-            Some(original_attributes),
-        ),
-    ));
+    world
+        .check_account(USER_ADDRESS)
+        .esdt_nft_balance_and_attributes(NFT_TOKEN_ID, 1, 1, original_attributes);
 
     let new_attributes = Color {
         r: 255,
@@ -76,34 +58,21 @@ fn test_nft_update_attributes_and_send() {
         b: 255,
     };
 
-    world.whitebox_call(
-        &forwarder_whitebox,
-        ScCallStep::new()
-            .from(USER_ADDRESS_EXPR)
-            .esdt_transfer(NFT_TOKEN_ID, 1, "1"),
-        |sc| {
-            sc.nft_update_attributes(managed_token_id!(NFT_TOKEN_ID), 1, new_attributes);
-
-            sc.send().direct_esdt(
-                &managed_address!(&address_expr_to_address(USER_ADDRESS_EXPR)),
-                &managed_token_id!(NFT_TOKEN_ID),
-                1,
-                &managed_biguint!(1),
-            );
-        },
-    );
-
-    world.check_state_step(CheckStateStep::new().put_account(
-        USER_ADDRESS_EXPR,
-        CheckAccount::new().esdt_nft_balance_and_attributes(
-            NFT_TOKEN_ID_EXPR,
-            1,
-            "1",
-            Some(new_attributes),
-        ),
-    ));
-}
-
-fn address_expr_to_address(address_expr: &str) -> Address {
-    AddressValue::from(address_expr).to_address()
+    world
+        .tx()
+        .from(USER_ADDRESS)
+        .to(FORWARDER_ADDRESS)
+        .single_esdt(&TokenIdentifier::from(NFT_TOKEN_ID), 1, &1u32.into())
+        .whitebox(forwarder::contract_obj, |sc| {
+            sc.nft_update_attributes(NFT_TOKEN_ID.to_token_identifier(), 1, new_attributes);
+
+            sc.tx()
+                .to(USER_ADDRESS)
+                .esdt((NFT_TOKEN_ID.to_token_identifier(), 1, 1u32.into()))
+                .transfer();
+        });
+
+    world
+        .check_account(USER_ADDRESS)
+        .esdt_nft_balance_and_attributes(NFT_TOKEN_ID, 1, 1, new_attributes);
 }
diff --git a/framework/base/src/types/interaction/expr/test_token_identifier.rs b/framework/base/src/types/interaction/expr/test_token_identifier.rs
index 47568b37ba..56d9a8bcd9 100644
--- a/framework/base/src/types/interaction/expr/test_token_identifier.rs
+++ b/framework/base/src/types/interaction/expr/test_token_identifier.rs
@@ -26,6 +26,10 @@ impl<'a> TestTokenIdentifier<'a> {
     pub fn eval_to_expr(&self) -> alloc::string::String {
         alloc::format!("{STR_PREFIX}{}", self.name)
     }
+
+    pub fn to_token_identifier<Api: ManagedTypeApi>(&self) -> TokenIdentifier<Api> {
+        self.name.into()
+    }
 }
 
 impl<'a, Env> AnnotatedValue<Env, TokenIdentifier<Env::Api>> for TestTokenIdentifier<'a>

From ed3af84375d436f5d320a05793257eca4daadb8e Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Sat, 24 Aug 2024 07:24:17 +0300
Subject: [PATCH 1192/1254] rewards distribution test migration

---
 .../rewards_distribution_integration_test.rs  | 26 +++++++------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/contracts/examples/rewards-distribution/tests/rewards_distribution_integration_test.rs b/contracts/examples/rewards-distribution/tests/rewards_distribution_integration_test.rs
index be3a4cb788..f9b64545bd 100644
--- a/contracts/examples/rewards-distribution/tests/rewards_distribution_integration_test.rs
+++ b/contracts/examples/rewards-distribution/tests/rewards_distribution_integration_test.rs
@@ -6,7 +6,7 @@ use multiversx_sc_scenario::imports::*;
 use std::iter::zip;
 
 use rewards_distribution::{
-    rewards_distribution_proxy, ContractObj, RewardsDistribution, DIVISION_SAFETY_CONSTANT,
+    rewards_distribution_proxy, RewardsDistribution, DIVISION_SAFETY_CONSTANT,
 };
 
 const ALICE_ADDRESS: TestAddress = TestAddress::new("alice");
@@ -31,7 +31,6 @@ fn world() -> ScenarioWorld {
 
 struct RewardsDistributionTestState {
     world: ScenarioWorld,
-    rewards_distribution_whitebox: WhiteboxContract<ContractObj<DebugApi>>,
 }
 
 impl RewardsDistributionTestState {
@@ -40,15 +39,7 @@ impl RewardsDistributionTestState {
 
         world.account(OWNER_ADDRESS).nonce(1);
 
-        let rewards_distribution_whitebox = WhiteboxContract::new(
-            REWARDS_DISTRIBUTION_ADDRESS,
-            rewards_distribution::contract_obj,
-        );
-
-        Self {
-            world,
-            rewards_distribution_whitebox,
-        }
+        Self { world }
     }
 
     fn deploy_seed_nft_minter_contract(&mut self) -> &mut Self {
@@ -110,10 +101,12 @@ fn test_compute_brackets() {
         .owner(OWNER_ADDRESS)
         .code(REWARDS_DISTRIBUTION_PATH);
 
-    state.world.whitebox_call(
-        &state.rewards_distribution_whitebox,
-        ScCallStep::new().from(OWNER_ADDRESS),
-        |sc| {
+    state
+        .world
+        .tx()
+        .from(OWNER_ADDRESS)
+        .to(REWARDS_DISTRIBUTION_ADDRESS)
+        .whitebox(rewards_distribution::contract_obj, |sc| {
             let brackets = utils::to_brackets(&[
                 (10, 2_000),
                 (90, 6_000),
@@ -140,8 +133,7 @@ fn test_compute_brackets() {
                 assert_eq!(computed.end_index, expected_end_index);
                 assert_eq!(computed.nft_reward_percent, expected_reward_percent);
             }
-        },
-    );
+        });
 }
 
 #[test]

From 6e2d67345fdba2bafb84790403d4dd6e0514e6b5 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Sat, 24 Aug 2024 07:24:31 +0300
Subject: [PATCH 1193/1254] allow deprecated

---
 .../use-module/tests/token_merge_module_whitebox_test.rs        | 2 ++
 1 file changed, 2 insertions(+)

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 803992d49b..5cc2180d01 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
@@ -1,3 +1,5 @@
+#![allow(deprecated)] // TODO: migrate to unified syntax at some point
+
 use multiversx_sc_scenario::imports::*;
 
 use multiversx_sc_modules::token_merge::{

From f9c8de7b6d373e544ed87257f91f4515a5ab5769 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Sat, 24 Aug 2024 08:17:54 +0300
Subject: [PATCH 1194/1254] TestTokenIdentifier

---
 .../tests/forwarder_whitebox_legacy_test.rs   |   2 +-
 .../tests/forwarder_whitebox_test.rs          |   2 +-
 .../tests/transfer_role_whitebox_test.rs      |  24 +---
 .../tests/gov_module_whitebox_test.rs         | 117 +++++-------------
 .../tests/staking_module_whitebox_test.rs     |  70 ++++-------
 .../interaction/expr/test_token_identifier.rs |   8 ++
 .../base/src/types/interaction/tx_payment.rs  |   2 +
 .../tx_payment/test_esdt_transfer.rs          |  69 +++++++++++
 8 files changed, 137 insertions(+), 157 deletions(-)
 create mode 100644 framework/base/src/types/interaction/tx_payment/test_esdt_transfer.rs

diff --git a/contracts/feature-tests/composability/tests/forwarder_whitebox_legacy_test.rs b/contracts/feature-tests/composability/tests/forwarder_whitebox_legacy_test.rs
index f6cfb158f6..88e945529a 100644
--- a/contracts/feature-tests/composability/tests/forwarder_whitebox_legacy_test.rs
+++ b/contracts/feature-tests/composability/tests/forwarder_whitebox_legacy_test.rs
@@ -63,7 +63,7 @@ fn test_nft_update_attributes_and_send() {
         .tx()
         .from(USER_ADDRESS)
         .to(FORWARDER_ADDRESS)
-        .single_esdt(&TokenIdentifier::from(NFT_TOKEN_ID), 1, &1u32.into())
+        .payment(TestEsdtTransfer(NFT_TOKEN_ID, 0, 1))
         .whitebox(forwarder_legacy::contract_obj, |sc| {
             sc.nft_update_attributes(NFT_TOKEN_ID.to_token_identifier(), 1, new_attributes);
 
diff --git a/contracts/feature-tests/composability/tests/forwarder_whitebox_test.rs b/contracts/feature-tests/composability/tests/forwarder_whitebox_test.rs
index c861c561ef..b33b7d98a8 100644
--- a/contracts/feature-tests/composability/tests/forwarder_whitebox_test.rs
+++ b/contracts/feature-tests/composability/tests/forwarder_whitebox_test.rs
@@ -62,7 +62,7 @@ fn test_nft_update_attributes_and_send() {
         .tx()
         .from(USER_ADDRESS)
         .to(FORWARDER_ADDRESS)
-        .single_esdt(&TokenIdentifier::from(NFT_TOKEN_ID), 1, &1u32.into())
+        .payment(TestEsdtTransfer(NFT_TOKEN_ID, 0, 1))
         .whitebox(forwarder::contract_obj, |sc| {
             sc.nft_update_attributes(NFT_TOKEN_ID.to_token_identifier(), 1, new_attributes);
 
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 130c2b237c..5ed03c38bc 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
@@ -70,11 +70,7 @@ fn test_transfer_role() {
         .tx()
         .from(USER_ADDRESS)
         .to(TRANSFER_ROLE_FEATURES_ADDRESS)
-        .single_esdt(
-            &TokenIdentifier::from(TRANSFER_TOKEN_ID),
-            0,
-            &BigUint::from(100u64),
-        )
+        .payment(TestEsdtTransfer(TRANSFER_TOKEN_ID, 0, 100))
         .whitebox(transfer_role_features::contract_obj, |sc| {
             let payments = ManagedVec::from_single_item(EsdtTokenPayment::new(
                 managed_token_id!(TRANSFER_TOKEN_ID_EXPR),
@@ -101,11 +97,7 @@ fn test_transfer_role() {
         .tx()
         .from(USER_ADDRESS)
         .to(TRANSFER_ROLE_FEATURES_ADDRESS)
-        .single_esdt(
-            &TokenIdentifier::from(TRANSFER_TOKEN_ID),
-            0,
-            &BigUint::from(100u64),
-        )
+        .payment(TestEsdtTransfer(TRANSFER_TOKEN_ID, 0, 100))
         .returns(ExpectError(4u64, "Destination address not whitelisted"))
         .whitebox(transfer_role_features::contract_obj, |sc| {
             let payments = ManagedVec::from_single_item(EsdtTokenPayment::new(
@@ -126,11 +118,7 @@ fn test_transfer_role() {
         .tx()
         .from(USER_ADDRESS)
         .to(TRANSFER_ROLE_FEATURES_ADDRESS)
-        .single_esdt(
-            &TokenIdentifier::from(TRANSFER_TOKEN_ID),
-            0,
-            &BigUint::from(100u64),
-        )
+        .payment(TestEsdtTransfer(TRANSFER_TOKEN_ID, 0, 100))
         .whitebox(transfer_role_features::contract_obj, |sc| {
             let payments = ManagedVec::from_single_item(EsdtTokenPayment::new(
                 managed_token_id!(TRANSFER_TOKEN_ID_EXPR),
@@ -159,11 +147,7 @@ fn test_transfer_role() {
         .tx()
         .from(USER_ADDRESS)
         .to(TRANSFER_ROLE_FEATURES_ADDRESS)
-        .single_esdt(
-            &TokenIdentifier::from(TRANSFER_TOKEN_ID),
-            0,
-            &BigUint::from(100u64),
-        )
+        .payment(TestEsdtTransfer(TRANSFER_TOKEN_ID, 0, 100))
         .whitebox(transfer_role_features::contract_obj, |sc| {
             let payments = ManagedVec::from_single_item(EsdtTokenPayment::new(
                 managed_token_id!(TRANSFER_TOKEN_ID_EXPR),
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 288d3042f5..800797024b 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
@@ -4,8 +4,7 @@ use multiversx_sc_modules::governance::{
 };
 use multiversx_sc_scenario::imports::*;
 
-const GOV_TOKEN_ID_EXPR: TestTokenIdentifier = TestTokenIdentifier::new("GOV-123456");
-const GOV_TOKEN_ID: &[u8] = b"GOV-123456";
+const GOV_TOKEN_ID: TestTokenIdentifier = TestTokenIdentifier::new("GOV-123456");
 const QUORUM: u64 = 1_500;
 const MIN_BALANCE_PROPOSAL: u64 = 500;
 const VOTING_DELAY_BLOCKS: u64 = 10;
@@ -42,19 +41,19 @@ fn setup() -> ScenarioWorld {
     world
         .account(OWNER_ADDRESS)
         .nonce(1)
-        .esdt_balance(GOV_TOKEN_ID_EXPR, INITIAL_GOV_TOKEN_BALANCE);
+        .esdt_balance(GOV_TOKEN_ID, INITIAL_GOV_TOKEN_BALANCE);
     world
         .account(FIRST_USER_ADDRESS)
         .nonce(1)
-        .esdt_balance(GOV_TOKEN_ID_EXPR, INITIAL_GOV_TOKEN_BALANCE);
+        .esdt_balance(GOV_TOKEN_ID, INITIAL_GOV_TOKEN_BALANCE);
     world
         .account(SECOND_USER_ADDRESS)
         .nonce(1)
-        .esdt_balance(GOV_TOKEN_ID_EXPR, INITIAL_GOV_TOKEN_BALANCE);
+        .esdt_balance(GOV_TOKEN_ID, INITIAL_GOV_TOKEN_BALANCE);
     world
         .account(THIRD_USER_ADDRESS)
         .nonce(1)
-        .esdt_balance(GOV_TOKEN_ID_EXPR, INITIAL_GOV_TOKEN_BALANCE);
+        .esdt_balance(GOV_TOKEN_ID, INITIAL_GOV_TOKEN_BALANCE);
 
     // init
     let new_address = world
@@ -66,7 +65,7 @@ fn setup() -> ScenarioWorld {
         .returns(ReturnsNewBech32Address)
         .whitebox(use_module::contract_obj, |sc| {
             sc.init_governance_module(
-                TokenIdentifier::from(GOV_TOKEN_ID_EXPR),
+                TokenIdentifier::from(GOV_TOKEN_ID),
                 BigUint::from(QUORUM),
                 BigUint::from(MIN_BALANCE_PROPOSAL),
                 VOTING_DELAY_BLOCKS,
@@ -96,11 +95,7 @@ pub fn propose(
         .tx()
         .from(proposer)
         .to(USE_MODULE_ADDRESS)
-        .single_esdt(
-            &TokenIdentifier::from(GOV_TOKEN_ID_EXPR),
-            0,
-            &BigUint::from(gov_token_amount),
-        )
+        .payment(TestEsdtTransfer(GOV_TOKEN_ID, 0, gov_token_amount))
         .whitebox(use_module::contract_obj, |sc| {
             let mut args_managed = ManagedVec::new();
             for arg in args {
@@ -151,11 +146,7 @@ fn test_change_gov_config() {
         .tx()
         .from(SECOND_USER_ADDRESS)
         .to(USE_MODULE_ADDRESS)
-        .single_esdt(
-            &TokenIdentifier::from(GOV_TOKEN_ID),
-            0,
-            &BigUint::from(999u64),
-        )
+        .payment(TestEsdtTransfer(GOV_TOKEN_ID, 0, 999))
         .returns(ExpectError(4u64, "Proposal is not active"))
         .whitebox(use_module::contract_obj, |sc| {
             sc.vote(proposal_id, VoteType::UpVote);
@@ -168,11 +159,7 @@ fn test_change_gov_config() {
         .tx()
         .from(SECOND_USER_ADDRESS)
         .to(USE_MODULE_ADDRESS)
-        .single_esdt(
-            &TokenIdentifier::from(GOV_TOKEN_ID),
-            0,
-            &BigUint::from(999u64),
-        )
+        .payment(TestEsdtTransfer(GOV_TOKEN_ID, 0, 999))
         .whitebox(use_module::contract_obj, |sc| {
             sc.vote(proposal_id, VoteType::UpVote);
         });
@@ -218,11 +205,7 @@ fn test_change_gov_config() {
         .tx()
         .from(FIRST_USER_ADDRESS)
         .to(USE_MODULE_ADDRESS)
-        .single_esdt(
-            &TokenIdentifier::from(GOV_TOKEN_ID),
-            0,
-            &BigUint::from(200u64),
-        )
+        .payment(TestEsdtTransfer(GOV_TOKEN_ID, 0, 200))
         .whitebox(use_module::contract_obj, |sc| {
             sc.vote(proposal_id, VoteType::UpVote);
         });
@@ -232,11 +215,7 @@ fn test_change_gov_config() {
         .tx()
         .from(OWNER_ADDRESS)
         .to(USE_MODULE_ADDRESS)
-        .single_esdt(
-            &TokenIdentifier::from(GOV_TOKEN_ID),
-            0,
-            &BigUint::from(200u64),
-        )
+        .payment(TestEsdtTransfer(GOV_TOKEN_ID, 0, 200))
         .whitebox(use_module::contract_obj, |sc| {
             sc.vote(proposal_id, VoteType::DownVote);
         });
@@ -262,11 +241,7 @@ fn test_change_gov_config() {
         .tx()
         .from(FIRST_USER_ADDRESS)
         .to(USE_MODULE_ADDRESS)
-        .single_esdt(
-            &TokenIdentifier::from(GOV_TOKEN_ID),
-            0,
-            &BigUint::from(200u64),
-        )
+        .payment(TestEsdtTransfer(GOV_TOKEN_ID, 0, 200))
         .returns(ExpectError(4u64, "Already voted for this proposal"))
         .whitebox(use_module::contract_obj, |sc| {
             sc.vote(proposal_id, VoteType::UpVote);
@@ -277,11 +252,7 @@ fn test_change_gov_config() {
         .tx()
         .from(THIRD_USER_ADDRESS)
         .to(USE_MODULE_ADDRESS)
-        .single_esdt(
-            &TokenIdentifier::from(GOV_TOKEN_ID),
-            0,
-            &BigUint::from(200u64),
-        )
+        .payment(TestEsdtTransfer(GOV_TOKEN_ID, 0, 200))
         .whitebox(use_module::contract_obj, |sc| {
             sc.vote(proposal_id, VoteType::UpVote);
         });
@@ -330,16 +301,16 @@ fn test_change_gov_config() {
 
     world
         .check_account(FIRST_USER_ADDRESS)
-        .esdt_balance(GOV_TOKEN_ID_EXPR, BigUint::from(300u64));
+        .esdt_balance(GOV_TOKEN_ID, BigUint::from(300u64));
     world
         .check_account(SECOND_USER_ADDRESS)
-        .esdt_balance(GOV_TOKEN_ID_EXPR, BigUint::from(1u64));
+        .esdt_balance(GOV_TOKEN_ID, BigUint::from(1u64));
     world
         .check_account(THIRD_USER_ADDRESS)
-        .esdt_balance(GOV_TOKEN_ID_EXPR, BigUint::from(800u64));
+        .esdt_balance(GOV_TOKEN_ID, BigUint::from(800u64));
     world
         .check_account(OWNER_ADDRESS)
-        .esdt_balance(GOV_TOKEN_ID_EXPR, BigUint::from(800u64));
+        .esdt_balance(GOV_TOKEN_ID, BigUint::from(800u64));
 }
 
 #[test]
@@ -366,11 +337,7 @@ fn test_down_veto_gov_config() {
         .tx()
         .from(FIRST_USER_ADDRESS)
         .to(USE_MODULE_ADDRESS)
-        .single_esdt(
-            &TokenIdentifier::from(GOV_TOKEN_ID),
-            0,
-            &BigUint::from(300u64),
-        )
+        .payment(TestEsdtTransfer(GOV_TOKEN_ID, 0, 300))
         .whitebox(use_module::contract_obj, |sc| {
             sc.vote(proposal_id, VoteType::UpVote);
         });
@@ -382,11 +349,7 @@ fn test_down_veto_gov_config() {
         .tx()
         .from(SECOND_USER_ADDRESS)
         .to(USE_MODULE_ADDRESS)
-        .single_esdt(
-            &TokenIdentifier::from(GOV_TOKEN_ID),
-            0,
-            &BigUint::from(200u64),
-        )
+        .payment(TestEsdtTransfer(GOV_TOKEN_ID, 0, 200))
         .whitebox(use_module::contract_obj, |sc| {
             sc.vote(proposal_id, VoteType::UpVote);
         });
@@ -395,11 +358,7 @@ fn test_down_veto_gov_config() {
         .tx()
         .from(THIRD_USER_ADDRESS)
         .to(USE_MODULE_ADDRESS)
-        .single_esdt(
-            &TokenIdentifier::from(GOV_TOKEN_ID),
-            0,
-            &BigUint::from(200u64),
-        )
+        .payment(TestEsdtTransfer(GOV_TOKEN_ID, 0, 200))
         .whitebox(use_module::contract_obj, |sc| {
             sc.vote(proposal_id, VoteType::DownVetoVote)
         });
@@ -419,15 +378,15 @@ fn test_down_veto_gov_config() {
 
     world
         .check_account(FIRST_USER_ADDRESS)
-        .esdt_balance(GOV_TOKEN_ID_EXPR, BigUint::from(200u64));
+        .esdt_balance(GOV_TOKEN_ID, BigUint::from(200u64));
 
     world
         .check_account(SECOND_USER_ADDRESS)
-        .esdt_balance(GOV_TOKEN_ID_EXPR, BigUint::from(800u64));
+        .esdt_balance(GOV_TOKEN_ID, BigUint::from(800u64));
 
     world
         .check_account(THIRD_USER_ADDRESS)
-        .esdt_balance(GOV_TOKEN_ID_EXPR, BigUint::from(800u64));
+        .esdt_balance(GOV_TOKEN_ID, BigUint::from(800u64));
 }
 
 #[test]
@@ -454,11 +413,7 @@ fn test_abstain_vote_gov_config() {
         .tx()
         .from(FIRST_USER_ADDRESS)
         .to(USE_MODULE_ADDRESS)
-        .single_esdt(
-            &TokenIdentifier::from(GOV_TOKEN_ID),
-            0,
-            &BigUint::from(500u64),
-        )
+        .payment(TestEsdtTransfer(GOV_TOKEN_ID, 0, 500))
         .whitebox(use_module::contract_obj, |sc| {
             sc.vote(proposal_id, VoteType::UpVote);
         });
@@ -470,11 +425,7 @@ fn test_abstain_vote_gov_config() {
         .tx()
         .from(SECOND_USER_ADDRESS)
         .to(USE_MODULE_ADDRESS)
-        .single_esdt(
-            &TokenIdentifier::from(GOV_TOKEN_ID),
-            0,
-            &BigUint::from(400u64),
-        )
+        .payment(TestEsdtTransfer(GOV_TOKEN_ID, 0, 400))
         .whitebox(use_module::contract_obj, |sc| {
             sc.vote(proposal_id, VoteType::DownVote);
         });
@@ -483,11 +434,7 @@ fn test_abstain_vote_gov_config() {
         .tx()
         .from(THIRD_USER_ADDRESS)
         .to(USE_MODULE_ADDRESS)
-        .single_esdt(
-            &TokenIdentifier::from(GOV_TOKEN_ID),
-            0,
-            &BigUint::from(600u64),
-        )
+        .payment(TestEsdtTransfer(GOV_TOKEN_ID, 0, 600))
         .whitebox(use_module::contract_obj, |sc| {
             sc.vote(proposal_id, VoteType::AbstainVote);
         });
@@ -527,13 +474,13 @@ fn test_abstain_vote_gov_config() {
 
     world
         .check_account(FIRST_USER_ADDRESS)
-        .esdt_balance(GOV_TOKEN_ID_EXPR, BigUint::zero());
+        .esdt_balance(GOV_TOKEN_ID, BigUint::zero());
     world
         .check_account(SECOND_USER_ADDRESS)
-        .esdt_balance(GOV_TOKEN_ID_EXPR, BigUint::from(600u64));
+        .esdt_balance(GOV_TOKEN_ID, BigUint::from(600u64));
     world
         .check_account(THIRD_USER_ADDRESS)
-        .esdt_balance(GOV_TOKEN_ID_EXPR, BigUint::from(400u64));
+        .esdt_balance(GOV_TOKEN_ID, BigUint::from(400u64));
 }
 
 #[test]
@@ -560,11 +507,7 @@ fn test_gov_cancel_defeated_proposal() {
         .tx()
         .from(SECOND_USER_ADDRESS)
         .to(USE_MODULE_ADDRESS)
-        .single_esdt(
-            &TokenIdentifier::from(GOV_TOKEN_ID),
-            0,
-            &BigUint::from(999u64),
-        )
+        .payment(TestEsdtTransfer(GOV_TOKEN_ID, 0, 999))
         .whitebox(use_module::contract_obj, |sc| {
             sc.vote(proposal_id, VoteType::DownVote)
         });
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 0f705ad131..643387b634 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
@@ -1,8 +1,7 @@
 use multiversx_sc_modules::staking::StakingModule;
 use multiversx_sc_scenario::imports::*;
 
-const STAKING_TOKEN_ID_EXPR: TestTokenIdentifier = TestTokenIdentifier::new("STAKE-123456");
-const STAKING_TOKEN_ID: &[u8] = b"STAKE-123456";
+const STAKING_TOKEN_ID: TestTokenIdentifier = TestTokenIdentifier::new("STAKE-123456");
 const INITIAL_BALANCE: u64 = 2_000_000;
 const REQUIRED_STAKE_AMOUNT: u64 = 1_000_000;
 const SLASH_AMOUNT: u64 = 600_000;
@@ -34,27 +33,27 @@ fn test_staking_module() {
     world
         .account(ALICE_ADDRESS)
         .nonce(1)
-        .esdt_balance(STAKING_TOKEN_ID_EXPR, INITIAL_BALANCE);
+        .esdt_balance(STAKING_TOKEN_ID, INITIAL_BALANCE);
     world
         .account(BOB_ADDRESS)
         .nonce(1)
-        .esdt_balance(STAKING_TOKEN_ID_EXPR, INITIAL_BALANCE);
+        .esdt_balance(STAKING_TOKEN_ID, INITIAL_BALANCE);
     world
         .account(CAROL_ADDRESS)
         .nonce(1)
-        .esdt_balance(STAKING_TOKEN_ID_EXPR, INITIAL_BALANCE);
+        .esdt_balance(STAKING_TOKEN_ID, INITIAL_BALANCE);
     world
         .account(EVE_ADDRESS)
         .nonce(1)
-        .esdt_balance(STAKING_TOKEN_ID_EXPR, INITIAL_BALANCE);
+        .esdt_balance(STAKING_TOKEN_ID, INITIAL_BALANCE);
     world
         .account(PAUL_ADDRESS)
         .nonce(1)
-        .esdt_balance(STAKING_TOKEN_ID_EXPR, INITIAL_BALANCE);
+        .esdt_balance(STAKING_TOKEN_ID, INITIAL_BALANCE);
     world
         .account(SALLY_ADDRESS)
         .nonce(1)
-        .esdt_balance(STAKING_TOKEN_ID_EXPR, INITIAL_BALANCE);
+        .esdt_balance(STAKING_TOKEN_ID, INITIAL_BALANCE);
 
     // init
     let new_address = world
@@ -73,7 +72,7 @@ fn test_staking_module() {
             whitelist.push(SALLY_ADDRESS.to_managed_address());
 
             sc.init_staking_module(
-                &EgldOrEsdtTokenIdentifier::esdt(STAKING_TOKEN_ID),
+                &EgldOrEsdtTokenIdentifier::esdt(STAKING_TOKEN_ID.to_token_identifier()),
                 &BigUint::from(REQUIRED_STAKE_AMOUNT),
                 &BigUint::from(SLASH_AMOUNT),
                 QUORUM,
@@ -88,11 +87,7 @@ fn test_staking_module() {
         .tx()
         .from(EVE_ADDRESS)
         .to(USE_MODULE_ADDRESS)
-        .single_esdt(
-            &TokenIdentifier::from(STAKING_TOKEN_ID_EXPR),
-            0,
-            &BigUint::from(REQUIRED_STAKE_AMOUNT),
-        )
+        .payment(TestEsdtTransfer(STAKING_TOKEN_ID, 0, REQUIRED_STAKE_AMOUNT))
         .returns(ExpectError(4u64, "Only whitelisted members can stake"))
         .whitebox(use_module::contract_obj, |sc| {
             sc.stake();
@@ -103,11 +98,11 @@ fn test_staking_module() {
         .tx()
         .from(ALICE_ADDRESS)
         .to(USE_MODULE_ADDRESS)
-        .single_esdt(
-            &TokenIdentifier::from(STAKING_TOKEN_ID_EXPR),
+        .payment(TestEsdtTransfer(
+            STAKING_TOKEN_ID,
             0,
-            &BigUint::from(REQUIRED_STAKE_AMOUNT / 2),
-        )
+            REQUIRED_STAKE_AMOUNT / 2,
+        ))
         .whitebox(use_module::contract_obj, |sc| {
             sc.stake();
         });
@@ -126,11 +121,7 @@ fn test_staking_module() {
         .tx()
         .from(BOB_ADDRESS)
         .to(USE_MODULE_ADDRESS)
-        .single_esdt(
-            &TokenIdentifier::from(STAKING_TOKEN_ID),
-            0,
-            &BigUint::from(REQUIRED_STAKE_AMOUNT),
-        )
+        .payment(TestEsdtTransfer(STAKING_TOKEN_ID, 0, REQUIRED_STAKE_AMOUNT))
         .whitebox(use_module::contract_obj, |sc| {
             sc.stake();
         });
@@ -139,11 +130,7 @@ fn test_staking_module() {
         .tx()
         .from(CAROL_ADDRESS)
         .to(USE_MODULE_ADDRESS)
-        .single_esdt(
-            &TokenIdentifier::from(STAKING_TOKEN_ID),
-            0,
-            &BigUint::from(REQUIRED_STAKE_AMOUNT),
-        )
+        .payment(TestEsdtTransfer(STAKING_TOKEN_ID, 0, REQUIRED_STAKE_AMOUNT))
         .whitebox(use_module::contract_obj, |sc| {
             sc.stake();
         });
@@ -152,11 +139,7 @@ fn test_staking_module() {
         .tx()
         .from(PAUL_ADDRESS)
         .to(USE_MODULE_ADDRESS)
-        .single_esdt(
-            &TokenIdentifier::from(STAKING_TOKEN_ID),
-            0,
-            &BigUint::from(REQUIRED_STAKE_AMOUNT),
-        )
+        .payment(TestEsdtTransfer(STAKING_TOKEN_ID, 0, REQUIRED_STAKE_AMOUNT))
         .whitebox(use_module::contract_obj, |sc| {
             sc.stake();
         });
@@ -165,11 +148,7 @@ fn test_staking_module() {
         .tx()
         .from(SALLY_ADDRESS)
         .to(USE_MODULE_ADDRESS)
-        .single_esdt(
-            &TokenIdentifier::from(STAKING_TOKEN_ID),
-            0,
-            &BigUint::from(REQUIRED_STAKE_AMOUNT),
-        )
+        .payment(TestEsdtTransfer(STAKING_TOKEN_ID, 0, REQUIRED_STAKE_AMOUNT))
         .whitebox(use_module::contract_obj, |sc| {
             sc.stake();
         });
@@ -199,11 +178,7 @@ fn test_staking_module() {
         .tx()
         .from(ALICE_ADDRESS)
         .to(USE_MODULE_ADDRESS)
-        .single_esdt(
-            &TokenIdentifier::from(STAKING_TOKEN_ID_EXPR),
-            0,
-            &BigUint::from(REQUIRED_STAKE_AMOUNT),
-        )
+        .payment(TestEsdtTransfer(STAKING_TOKEN_ID, 0, REQUIRED_STAKE_AMOUNT))
         .whitebox(use_module::contract_obj, |sc| {
             sc.stake();
             let alice_staked_amount = sc.staked_amount(&ALICE_ADDRESS.to_managed_address()).get();
@@ -222,7 +197,7 @@ fn test_staking_module() {
 
     world
         .check_account(ALICE_ADDRESS)
-        .esdt_balance(STAKING_TOKEN_ID_EXPR, BigUint::from(1_000_000u64));
+        .esdt_balance(STAKING_TOKEN_ID, BigUint::from(1_000_000u64));
 
     // alice vote to slash bob
 
@@ -386,8 +361,7 @@ fn test_staking_module() {
             sc.unstake(BigUint::from(400_000u64));
         });
 
-    world.check_account(ALICE_ADDRESS).esdt_balance(
-        TokenIdentifier::from(STAKING_TOKEN_ID_EXPR),
-        BigUint::from(INITIAL_BALANCE - SLASH_AMOUNT),
-    );
+    world
+        .check_account(ALICE_ADDRESS)
+        .esdt_balance(STAKING_TOKEN_ID, INITIAL_BALANCE - SLASH_AMOUNT);
 }
diff --git a/framework/base/src/types/interaction/expr/test_token_identifier.rs b/framework/base/src/types/interaction/expr/test_token_identifier.rs
index 56d9a8bcd9..68865d8fbc 100644
--- a/framework/base/src/types/interaction/expr/test_token_identifier.rs
+++ b/framework/base/src/types/interaction/expr/test_token_identifier.rs
@@ -30,6 +30,14 @@ impl<'a> TestTokenIdentifier<'a> {
     pub fn to_token_identifier<Api: ManagedTypeApi>(&self) -> TokenIdentifier<Api> {
         self.name.into()
     }
+
+    pub fn as_str(&self) -> &str {
+        self.name
+    }
+
+    pub fn as_bytes(&self) -> &[u8] {
+        self.name.as_bytes()
+    }
 }
 
 impl<'a, Env> AnnotatedValue<Env, TokenIdentifier<Env::Api>> for TestTokenIdentifier<'a>
diff --git a/framework/base/src/types/interaction/tx_payment.rs b/framework/base/src/types/interaction/tx_payment.rs
index c5bcc10637..bed41cc775 100644
--- a/framework/base/src/types/interaction/tx_payment.rs
+++ b/framework/base/src/types/interaction/tx_payment.rs
@@ -1,3 +1,4 @@
+mod test_esdt_transfer;
 mod tx_payment_egld;
 mod tx_payment_egld_or_esdt;
 mod tx_payment_egld_or_esdt_refs;
@@ -11,6 +12,7 @@ mod tx_payment_single_esdt;
 mod tx_payment_single_esdt_ref;
 mod tx_payment_single_esdt_triple;
 
+pub use test_esdt_transfer::TestEsdtTransfer;
 pub use tx_payment_egld::{Egld, EgldPayment};
 pub use tx_payment_egld_value::TxEgldValue;
 pub use tx_payment_multi_esdt::TxPaymentMultiEsdt;
diff --git a/framework/base/src/types/interaction/tx_payment/test_esdt_transfer.rs b/framework/base/src/types/interaction/tx_payment/test_esdt_transfer.rs
new file mode 100644
index 0000000000..99d00a219e
--- /dev/null
+++ b/framework/base/src/types/interaction/tx_payment/test_esdt_transfer.rs
@@ -0,0 +1,69 @@
+use crate::{
+    api::ManagedTypeApi,
+    types::{
+        BigUint, EsdtTokenPayment, FullPaymentData, FunctionCall, ManagedAddress,
+        TestTokenIdentifier, TxEnv, TxFrom, TxPayment, TxToSpecified,
+    },
+};
+
+/// Syntactic sugar for quickly writing ESDT transfers in tests.
+///
+/// The fields are:
+/// 1. token identifier, as TestTokenIdentifier
+/// 2. nonce
+/// 3. amount
+///
+/// The amount is represented as u64, since for most tests it is enough.
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub struct TestEsdtTransfer<'a>(pub TestTokenIdentifier<'a>, pub u64, pub u64);
+
+impl<'a, Api> From<TestEsdtTransfer<'a>> for EsdtTokenPayment<Api>
+where
+    Api: ManagedTypeApi,
+{
+    fn from(value: TestEsdtTransfer<'a>) -> Self {
+        EsdtTokenPayment::new(value.0.to_token_identifier(), value.1, value.2.into())
+    }
+}
+
+impl<'a, Env> TxPayment<Env> for TestEsdtTransfer<'a>
+where
+    Env: TxEnv,
+{
+    #[inline]
+    fn is_no_payment(&self, _env: &Env) -> bool {
+        self.2 == 0
+    }
+
+    #[inline]
+    fn perform_transfer_execute(
+        self,
+        env: &Env,
+        to: &ManagedAddress<Env::Api>,
+        gas_limit: u64,
+        fc: FunctionCall<Env::Api>,
+    ) {
+        EsdtTokenPayment::from(self).perform_transfer_execute(env, to, gas_limit, fc);
+    }
+
+    #[inline]
+    fn with_normalized<From, To, F, R>(
+        self,
+        env: &Env,
+        from: &From,
+        to: To,
+        fc: FunctionCall<Env::Api>,
+        f: F,
+    ) -> R
+    where
+        From: TxFrom<Env>,
+        To: TxToSpecified<Env>,
+        F: FnOnce(&ManagedAddress<Env::Api>, &BigUint<Env::Api>, FunctionCall<Env::Api>) -> R,
+    {
+        EsdtTokenPayment::from(self).with_normalized(env, from, to, fc, f)
+    }
+
+    fn into_full_payment_data(self, env: &Env) -> FullPaymentData<Env::Api> {
+        EsdtTokenPayment::from(self).into_full_payment_data(env)
+    }
+}

From dc1bcc14871fd59504a1fca5b74e7b53fd2b4b54 Mon Sep 17 00:00:00 2001
From: Andrei Vasilescu <vasilescuandrei24@gmail.com>
Date: Sat, 24 Aug 2024 14:22:04 +0300
Subject: [PATCH 1195/1254] added keystore signing interactor example + system
 SC func calls interactor

---
 Cargo.lock                                    | 296 +++++++++++-------
 Cargo.toml                                    |   2 +
 contracts/examples/adder/Cargo.toml           |   2 +-
 .../examples/adder/interactor/.gitignore      |   9 +
 .../examples/adder/interactor/Cargo.toml      |  29 ++
 .../examples/adder/interactor/alice.json      |  23 ++
 .../examples/adder/interactor/config.toml     |   1 +
 .../src/basic_interact.rs                     |  19 +-
 .../interactor/src/basic_interact_cli.rs      |  52 +++
 .../interactor/src/basic_interact_config.rs   |  26 ++
 .../interactor/src/basic_interact_state.rs    |  50 +++
 .../sys-func-calls/interact/Cargo.toml        |   3 +-
 .../interact/src/basic_interact.rs            | 125 ++++++--
 .../interact/src/basic_interact_cli.rs        |  39 ++-
 14 files changed, 514 insertions(+), 162 deletions(-)
 create mode 100644 contracts/examples/adder/interactor/.gitignore
 create mode 100644 contracts/examples/adder/interactor/Cargo.toml
 create mode 100644 contracts/examples/adder/interactor/alice.json
 create mode 100644 contracts/examples/adder/interactor/config.toml
 rename contracts/examples/adder/{interact => interactor}/src/basic_interact.rs (91%)
 create mode 100644 contracts/examples/adder/interactor/src/basic_interact_cli.rs
 create mode 100644 contracts/examples/adder/interactor/src/basic_interact_config.rs
 create mode 100644 contracts/examples/adder/interactor/src/basic_interact_state.rs

diff --git a/Cargo.lock b/Cargo.lock
index fecbf652fe..2c82a6092b 100755
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -60,6 +60,12 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
 
+[[package]]
+name = "adler2"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
+
 [[package]]
 name = "aes"
 version = "0.8.4"
@@ -201,7 +207,7 @@ dependencies = [
  "cc",
  "cfg-if",
  "libc",
- "miniz_oxide",
+ "miniz_oxide 0.7.4",
  "object",
  "rustc-demangle",
 ]
@@ -258,6 +264,27 @@ dependencies = [
  "toml",
 ]
 
+[[package]]
+name = "basic-interact-sys-calls"
+version = "0.0.0"
+dependencies = [
+ "clap",
+ "multiversx-sc-snippets",
+ "serde",
+ "toml",
+]
+
+[[package]]
+name = "basic-interactor"
+version = "0.0.0"
+dependencies = [
+ "adder",
+ "clap",
+ "multiversx-sc-snippets",
+ "serde",
+ "toml",
+]
+
 [[package]]
 name = "bech32"
 version = "0.9.1"
@@ -308,12 +335,6 @@ version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "90064b8dee6815a6470d60bad07bbbaee885c0e12d04177138fa3291a01b7bc4"
 
-[[package]]
-name = "bitflags"
-version = "1.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
-
 [[package]]
 name = "bitflags"
 version = "2.6.0"
@@ -395,15 +416,18 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "bytes"
-version = "1.6.1"
+version = "1.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a12916984aab3fa6e39d655a33e09c0071eb36d6ab3aea5c2d78551f1df6d952"
+checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50"
 
 [[package]]
 name = "cc"
-version = "1.1.7"
+version = "1.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26a5c3fd7bfa1ce3897a3a3501d362b2d87b7f2583ebcb4a949ec25911025cbc"
+checksum = "50d2eb3cd3d1bf4529e31c215ee6f93ec5a3d536d9f578f93d9d33ee19562932"
+dependencies = [
+ "shlex",
+]
 
 [[package]]
 name = "cfg-if"
@@ -458,9 +482,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.11"
+version = "4.5.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35723e6a11662c2afb578bcf0b88bf6ea8e21282a953428f240574fcc3a2b5b3"
+checksum = "ed6719fffa43d0d87e5fd8caeab59be1554fb028cd30edc88fc4369b17971019"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -468,9 +492,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.11"
+version = "4.5.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49eb96cbfa7cfa35017b7cd548c75b14c3118c98b423041d70562665e07fb0fa"
+checksum = "216aec2b177652e3846684cbfe25c9964d18ec45234f0f5da5157b207ed1aab6"
 dependencies = [
  "anstream",
  "anstyle",
@@ -480,9 +504,9 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.5.11"
+version = "4.5.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d029b67f89d30bbb547c89fd5161293c0aec155fc691d7924b64550662db93e"
+checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0"
 dependencies = [
  "heck",
  "proc-macro2",
@@ -566,15 +590,15 @@ dependencies = [
 
 [[package]]
 name = "core-foundation-sys"
-version = "0.8.6"
+version = "0.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
+checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
 
 [[package]]
 name = "cpufeatures"
-version = "0.2.12"
+version = "0.2.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504"
+checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad"
 dependencies = [
  "libc",
 ]
@@ -1060,12 +1084,12 @@ dependencies = [
 
 [[package]]
 name = "flate2"
-version = "1.0.30"
+version = "1.0.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae"
+checksum = "9c0596c1eac1f9e04ed902702e9878208b336edc9d6fddc8a48387349bab3666"
 dependencies = [
  "crc32fast",
- "miniz_oxide",
+ "miniz_oxide 0.8.0",
 ]
 
 [[package]]
@@ -1341,9 +1365,9 @@ dependencies = [
 
 [[package]]
 name = "h2"
-version = "0.4.5"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab"
+checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205"
 dependencies = [
  "atomic-waker",
  "bytes",
@@ -1502,9 +1526,9 @@ dependencies = [
 
 [[package]]
 name = "hyper-util"
-version = "0.1.6"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ab92f4f49ee4fb4f997c784b7a2e0fa70050211e0b6a287f898c3c9785ca956"
+checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -1548,9 +1572,9 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.2.6"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"
+checksum = "93ead53efc7ea8ed3cfb0c79fc8023fbb782a5432b52830b6518941cebe6505c"
 dependencies = [
  "equivalent",
  "hashbrown",
@@ -1606,9 +1630,9 @@ checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
 
 [[package]]
 name = "js-sys"
-version = "0.3.69"
+version = "0.3.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d"
+checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -1709,9 +1733,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
 [[package]]
 name = "libc"
-version = "0.2.155"
+version = "0.2.158"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
+checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439"
 
 [[package]]
 name = "linked-list-repeat"
@@ -1862,11 +1886,20 @@ dependencies = [
  "adler",
 ]
 
+[[package]]
+name = "miniz_oxide"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1"
+dependencies = [
+ "adler2",
+]
+
 [[package]]
 name = "mio"
-version = "1.0.1"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4569e456d394deccd22ce1c1913e6ea0e54519f577285001215d33557431afe4"
+checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec"
 dependencies = [
  "hermit-abi",
  "libc",
@@ -1944,7 +1977,7 @@ dependencies = [
 name = "multiversx-chain-vm"
 version = "0.9.0"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags",
  "colored",
  "ed25519-dalek",
  "hex",
@@ -1990,7 +2023,7 @@ dependencies = [
 name = "multiversx-sc"
 version = "0.52.3"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags",
  "hex-literal",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
@@ -2289,9 +2322,9 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.36.2"
+version = "0.36.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f203fa8daa7bb185f760ae12bd8e097f63d17041dcdcaf675ac54cdf863170e"
+checksum = "27b64972346851a39438c60b341ebc01bba47464ae329e55cf343eb93964efd9"
 dependencies = [
  "memchr",
 ]
@@ -2314,7 +2347,7 @@ version = "0.10.66"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags",
  "cfg-if",
  "foreign-types",
  "libc",
@@ -2551,12 +2584,11 @@ checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
 
 [[package]]
 name = "ppv-lite86"
-version = "0.2.19"
+version = "0.2.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2288c0e17cc8d342c712bb43a257a80ebffce59cdb33d5000d8348f3ec02528b"
+checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04"
 dependencies = [
  "zerocopy",
- "zerocopy-derive",
 ]
 
 [[package]]
@@ -2779,14 +2811,14 @@ version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags",
 ]
 
 [[package]]
 name = "regex"
-version = "1.10.5"
+version = "1.10.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f"
+checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -2813,9 +2845,9 @@ checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
 
 [[package]]
 name = "reqwest"
-version = "0.12.5"
+version = "0.12.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7d6d2a27d57148378eb5e111173f4276ad26340ecc5c49a4a2152167a2d6a37"
+checksum = "f8f4955649ef5c38cc7f9e8aa41761d48fb9677197daea9984dc54f56aad5e63"
 dependencies = [
  "base64",
  "bytes",
@@ -2852,7 +2884,7 @@ dependencies = [
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
- "winreg",
+ "windows-registry",
 ]
 
 [[package]]
@@ -2961,7 +2993,7 @@ version = "0.38.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags",
  "errno",
  "libc",
  "linux-raw-sys",
@@ -2983,9 +3015,9 @@ dependencies = [
 
 [[package]]
 name = "rustls-pemfile"
-version = "2.1.2"
+version = "2.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d"
+checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425"
 dependencies = [
  "base64",
  "rustls-pki-types",
@@ -2993,9 +3025,9 @@ dependencies = [
 
 [[package]]
 name = "rustls-pki-types"
-version = "1.7.0"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d"
+checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0"
 
 [[package]]
 name = "rustls-webpki"
@@ -3098,7 +3130,7 @@ version = "2.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags",
  "core-foundation",
  "core-foundation-sys",
  "libc",
@@ -3156,18 +3188,18 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.204"
+version = "1.0.208"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12"
+checksum = "cff085d2cb684faa248efb494c39b68e522822ac0de72ccf08109abde717cfb2"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.204"
+version = "1.0.208"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222"
+checksum = "24008e81ff7613ed8e5ba0cfaf24e2c2f1e5b8a0495711e44fcd4882fca62bcf"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3176,9 +3208,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.121"
+version = "1.0.125"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ab380d7d9f22ef3f21ad3e6c1ebe8e4fc7a2000ccba2e4d71fc96f15b2cb609"
+checksum = "83c8e735a073ccf5be70aa8066aa984eaf2fa000db6c8d0100ae605b366d31ed"
 dependencies = [
  "indexmap",
  "itoa",
@@ -3270,6 +3302,12 @@ dependencies = [
  "keccak",
 ]
 
+[[package]]
+name = "shlex"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
 [[package]]
 name = "signal-hook-registry"
 version = "1.4.2"
@@ -3383,23 +3421,26 @@ name = "sync_wrapper"
 version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394"
+dependencies = [
+ "futures-core",
+]
 
 [[package]]
 name = "system-configuration"
-version = "0.5.1"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7"
+checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags",
  "core-foundation",
  "system-configuration-sys",
 ]
 
 [[package]]
 name = "system-configuration-sys"
-version = "0.5.0"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9"
+checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -3407,14 +3448,15 @@ dependencies = [
 
 [[package]]
 name = "tempfile"
-version = "3.10.1"
+version = "3.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1"
+checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64"
 dependencies = [
  "cfg-if",
  "fastrand",
+ "once_cell",
  "rustix",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -3479,9 +3521,9 @@ dependencies = [
 
 [[package]]
 name = "tokio"
-version = "1.39.2"
+version = "1.39.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "daa4fb1bc778bd6f04cbfc4bb2d06a7396a8f299dc33ea1900cedaa316f467b1"
+checksum = "9babc99b9923bfa4804bd74722ff02c0381021eafa4db9949217e3be8e84fff5"
 dependencies = [
  "backtrace",
  "bytes",
@@ -3542,9 +3584,9 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.8.17"
+version = "0.8.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a44eede9b727419af8095cb2d72fab15487a541f54647ad4414b34096ee4631"
+checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e"
 dependencies = [
  "indexmap",
  "serde",
@@ -3564,9 +3606,9 @@ dependencies = [
 
 [[package]]
 name = "toml_edit"
-version = "0.22.18"
+version = "0.22.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1490595c74d930da779e944f5ba2ecdf538af67df1a9848cbd156af43c1b7cf0"
+checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d"
 dependencies = [
  "indexmap",
  "serde",
@@ -3592,15 +3634,15 @@ dependencies = [
 
 [[package]]
 name = "tower-layer"
-version = "0.3.2"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0"
+checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e"
 
 [[package]]
 name = "tower-service"
-version = "0.3.2"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
+checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
 
 [[package]]
 name = "tracing"
@@ -3812,19 +3854,20 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.92"
+version = "0.2.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"
+checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5"
 dependencies = [
  "cfg-if",
+ "once_cell",
  "wasm-bindgen-macro",
 ]
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.92"
+version = "0.2.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da"
+checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b"
 dependencies = [
  "bumpalo",
  "log",
@@ -3837,9 +3880,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.42"
+version = "0.4.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0"
+checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -3849,9 +3892,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.92"
+version = "0.2.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"
+checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -3859,9 +3902,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.92"
+version = "0.2.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
+checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3872,9 +3915,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.92"
+version = "0.2.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
+checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484"
 
 [[package]]
 name = "wasmparser"
@@ -3883,7 +3926,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5309c1090e3e84dad0d382f42064e9933fdaedb87e468cc239f0eabea73ddcb6"
 dependencies = [
  "ahash",
- "bitflags 2.6.0",
+ "bitflags",
  "hashbrown",
  "indexmap",
  "semver",
@@ -3903,9 +3946,9 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.69"
+version = "0.3.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef"
+checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -3913,11 +3956,41 @@ dependencies = [
 
 [[package]]
 name = "winapi-util"
-version = "0.1.8"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b"
+checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "windows-registry"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0"
+dependencies = [
+ "windows-result",
+ "windows-strings",
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-result"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e"
+dependencies = [
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-strings"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10"
+dependencies = [
+ "windows-result",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -3938,6 +4011,15 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
+[[package]]
+name = "windows-sys"
+version = "0.59.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+dependencies = [
+ "windows-targets 0.52.6",
+]
+
 [[package]]
 name = "windows-targets"
 version = "0.48.5"
@@ -4061,23 +4143,13 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
 name = "winnow"
-version = "0.6.16"
+version = "0.6.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b480ae9340fc261e6be3e95a1ba86d54ae3f9171132a73ce8d4bbaf68339507c"
+checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f"
 dependencies = [
  "memchr",
 ]
 
-[[package]]
-name = "winreg"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5"
-dependencies = [
- "cfg-if",
- "windows-sys 0.48.0",
-]
-
 [[package]]
 name = "zerocopy"
 version = "0.7.35"
@@ -4121,9 +4193,9 @@ dependencies = [
 
 [[package]]
 name = "zip"
-version = "2.1.5"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b895748a3ebcb69b9d38dcfdf21760859a4b0d0b0015277640c2ef4c69640e6f"
+checksum = "dc5e4288ea4057ae23afc69a4472434a87a2495cafce6632fd1c4ec9f5cf3494"
 dependencies = [
  "arbitrary",
  "crc32fast",
diff --git a/Cargo.toml b/Cargo.toml
index 2f599c6e03..1ac0063c0b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -19,6 +19,7 @@ members = [
   "tools/mxpy-snippet-generator",
   "tools/payload-macro-generator",
   # "tools/plotter",
+  "tools/interactor-system-func-calls/sys-func-calls/interact/",
 
   "vm",
 
@@ -52,6 +53,7 @@ members = [
   "contracts/examples/adder",
   "contracts/examples/adder/meta",
   "contracts/examples/adder/interact",
+  "contracts/examples/adder/interactor",
   "contracts/examples/esdt-transfer-with-fee",
   "contracts/examples/esdt-transfer-with-fee/meta",
   "contracts/examples/bonding-curve-contract",
diff --git a/contracts/examples/adder/Cargo.toml b/contracts/examples/adder/Cargo.toml
index 422164f2b7..ed73efa416 100644
--- a/contracts/examples/adder/Cargo.toml
+++ b/contracts/examples/adder/Cargo.toml
@@ -14,4 +14,4 @@ path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
 version = "0.52.3"
-path = "../../../framework/scenario"
+path = "../../../framework/scenario"
\ No newline at end of file
diff --git a/contracts/examples/adder/interactor/.gitignore b/contracts/examples/adder/interactor/.gitignore
new file mode 100644
index 0000000000..b2630809de
--- /dev/null
+++ b/contracts/examples/adder/interactor/.gitignore
@@ -0,0 +1,9 @@
+# Pem files are used for interactions, but shouldn't be committed
+*.pem
+!adder-owner.pem
+
+# Temporary storage of deployed contract address, so we can preserve the context between executions.
+state.toml
+
+# Trace file of interactor tooling
+interactor_trace.scen.json
diff --git a/contracts/examples/adder/interactor/Cargo.toml b/contracts/examples/adder/interactor/Cargo.toml
new file mode 100644
index 0000000000..40c6f1d6df
--- /dev/null
+++ b/contracts/examples/adder/interactor/Cargo.toml
@@ -0,0 +1,29 @@
+[[bin]]
+name = "basic-interactor"
+path = "src/basic_interact.rs"
+
+[package]
+name = "basic-interactor"
+version = "0.0.0"
+publish = false
+edition = "2021"
+authors = ["you"]
+
+[dependencies]
+toml = "0.8.6"
+
+[dependencies.clap]
+version = "4.4.7"
+features = ["derive"]
+
+[dependencies.serde]
+version = "1.0"
+features = ["derive"]
+
+[dependencies.adder]
+path = ".."
+
+[dependencies.multiversx-sc-snippets]
+version = "=0.52.3"
+path = "../../../../framework/snippets"
+
diff --git a/contracts/examples/adder/interactor/alice.json b/contracts/examples/adder/interactor/alice.json
new file mode 100644
index 0000000000..8f1a81514e
--- /dev/null
+++ b/contracts/examples/adder/interactor/alice.json
@@ -0,0 +1,23 @@
+{
+  "version": 4,
+  "kind": "secretKey",
+  "id": "f2c5e236-9039-46cd-8df5-1efcd9466ead",
+  "address": "0139472eff6886771a982f3083da5d421f24c29181e63888228dc81ca60d69e1",
+  "bech32": "erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th",
+  "crypto": {
+    "ciphertext": "45de5198c6c477725abc17d26c6b5fc88b1ff22a67a8c4784b297d426d351cf5c891a4c92d63e04cf23f602f660b7b606ed1c5293c85ff40216d9e53c9a07c23",
+    "cipherparams": {
+      "iv": "d6442fb1d4c49106152baeb3c539ed2c"
+    },
+    "cipher": "aes-128-ctr",
+    "kdf": "scrypt",
+    "kdfparams": {
+      "dklen": 32,
+      "salt": "dd69d88742b9d27a0438a4554d4180b070d9af224ea8ff8225fdf74c8e272adb",
+      "n": 4096,
+      "r": 8,
+      "p": 1
+    },
+    "mac": "b277984f71d0e9b4a6597911775c0ee6d598002645b29f22021e595c2725d204"
+  }
+}
diff --git a/contracts/examples/adder/interactor/config.toml b/contracts/examples/adder/interactor/config.toml
new file mode 100644
index 0000000000..61ac8dbf87
--- /dev/null
+++ b/contracts/examples/adder/interactor/config.toml
@@ -0,0 +1 @@
+gateway = 'https://devnet-gateway.multiversx.com'
diff --git a/contracts/examples/adder/interact/src/basic_interact.rs b/contracts/examples/adder/interactor/src/basic_interact.rs
similarity index 91%
rename from contracts/examples/adder/interact/src/basic_interact.rs
rename to contracts/examples/adder/interactor/src/basic_interact.rs
index 262eb13631..53eb860d52 100644
--- a/contracts/examples/adder/interact/src/basic_interact.rs
+++ b/contracts/examples/adder/interactor/src/basic_interact.rs
@@ -51,7 +51,6 @@ async fn main() {
 struct AdderInteract {
     interactor: Interactor,
     adder_owner_address: Bech32Address,
-    wallet_address: Bech32Address,
     state: State,
 }
 
@@ -63,24 +62,22 @@ impl AdderInteract {
             .with_tracer(INTERACTOR_SCENARIO_TRACE_PATH)
             .await;
 
+        // PASSWORD: "alice"
         let adder_owner_address =
-            interactor.register_wallet(Wallet::from_pem_file("adder-owner.pem").unwrap());
-        let wallet_address = interactor.register_wallet(test_wallets::mike());
+            interactor.register_wallet(Wallet::from_keystore_secret("alice.json").unwrap());
 
         Self {
             interactor,
             adder_owner_address: adder_owner_address.into(),
-            wallet_address: wallet_address.into(),
             state: State::load_state(),
         }
     }
 
     async fn set_state(&mut self) {
-        println!("wallet address: {}", self.wallet_address);
+        println!("wallet address: {}", self.adder_owner_address);
         self.interactor
             .retrieve_account(&self.adder_owner_address)
             .await;
-        self.interactor.retrieve_account(&self.wallet_address).await;
     }
 
     async fn deploy(&mut self) {
@@ -119,7 +116,7 @@ impl AdderInteract {
         let mut buffer = self.interactor.homogenous_call_buffer();
         for _ in 0..count {
             buffer.push_tx(|tx| {
-                tx.from(&self.wallet_address)
+                tx.from(&self.adder_owner_address)
                     .typed(adder_proxy::AdderProxy)
                     .init(0u32)
                     .code(ADDER_CODE_PATH)
@@ -147,7 +144,7 @@ impl AdderInteract {
         let mut buffer = self.interactor.homogenous_call_buffer();
         for _ in 0..count {
             buffer.push_tx(|tx| {
-                tx.from(&self.wallet_address)
+                tx.from(&self.adder_owner_address)
                     .to(self.state.current_adder_address())
                     .typed(adder_proxy::AdderProxy)
                     .add(value)
@@ -163,7 +160,7 @@ impl AdderInteract {
     async fn feed_contract_egld(&mut self) {
         self.interactor
             .tx()
-            .from(&self.wallet_address)
+            .from(&self.adder_owner_address)
             .to(self.state.current_adder_address())
             .egld(NumExpr("0,050000000000000000"))
             .prepare_async()
@@ -174,7 +171,7 @@ impl AdderInteract {
     async fn add(&mut self, value: u32) {
         self.interactor
             .tx()
-            .from(&self.wallet_address)
+            .from(&self.adder_owner_address)
             .to(self.state.current_adder_address())
             .gas(3_000_000)
             .typed(adder_proxy::AdderProxy)
@@ -205,7 +202,7 @@ impl AdderInteract {
         let response = self
             .interactor
             .tx()
-            .from(&self.wallet_address)
+            .from(&self.adder_owner_address)
             .to(self.state.current_adder_address())
             .gas(3_000_000)
             .typed(adder_proxy::AdderProxy)
diff --git a/contracts/examples/adder/interactor/src/basic_interact_cli.rs b/contracts/examples/adder/interactor/src/basic_interact_cli.rs
new file mode 100644
index 0000000000..6766981802
--- /dev/null
+++ b/contracts/examples/adder/interactor/src/basic_interact_cli.rs
@@ -0,0 +1,52 @@
+use clap::{Args, Parser, Subcommand};
+
+/// Adder Interact CLI
+#[derive(Default, PartialEq, Eq, Debug, Parser)]
+#[command(version, about)]
+#[command(propagate_version = true)]
+pub struct InteractCli {
+    #[command(subcommand)]
+    pub command: Option<InteractCliCommand>,
+}
+
+/// Adder Interact CLI Commands
+#[derive(Clone, PartialEq, Eq, Debug, Subcommand)]
+pub enum InteractCliCommand {
+    #[command(name = "add", about = "Add value")]
+    Add(AddArgs),
+    #[command(name = "deploy", about = "Deploy contract")]
+    Deploy,
+    #[command(name = "feed", about = "Feed contract EGLD")]
+    Feed,
+    #[command(name = "multi-deploy", about = "Multiple deploy contracts")]
+    MultiDeploy(MultiDeployArgs),
+    #[command(name = "sum", about = "Print sum")]
+    Sum,
+    #[command(name = "upgrade", about = "Upgrade contract")]
+    Upgrade(UpgradeArgs),
+}
+
+#[derive(Default, Clone, PartialEq, Eq, Debug, Args)]
+pub struct AddArgs {
+    /// The value to add
+    #[arg(short = 'v', long = "value")]
+    pub value: u32,
+
+    /// Repeat this number of times
+    #[arg(short = 'c', long = "count", default_value = "1")]
+    pub count: usize,
+}
+
+#[derive(Default, Clone, PartialEq, Eq, Debug, Args)]
+pub struct UpgradeArgs {
+    /// The value to add
+    #[arg(short = 'v', long = "value")]
+    pub value: u32,
+}
+
+#[derive(Default, Clone, PartialEq, Eq, Debug, Args)]
+pub struct MultiDeployArgs {
+    /// The number of contracts to deploy
+    #[arg(short = 'c', long = "count")]
+    pub count: usize,
+}
diff --git a/contracts/examples/adder/interactor/src/basic_interact_config.rs b/contracts/examples/adder/interactor/src/basic_interact_config.rs
new file mode 100644
index 0000000000..e17d0cbe65
--- /dev/null
+++ b/contracts/examples/adder/interactor/src/basic_interact_config.rs
@@ -0,0 +1,26 @@
+use serde::Deserialize;
+use std::io::Read;
+
+/// Config file
+const CONFIG_FILE: &str = "config.toml";
+
+/// Adder Interact configuration
+#[derive(Debug, Deserialize)]
+pub struct Config {
+    gateway: String,
+}
+
+impl Config {
+    // Deserializes config from file
+    pub fn load_config() -> Self {
+        let mut file = std::fs::File::open(CONFIG_FILE).unwrap();
+        let mut content = String::new();
+        file.read_to_string(&mut content).unwrap();
+        toml::from_str(&content).unwrap()
+    }
+
+    // Returns the gateway
+    pub fn gateway(&self) -> &str {
+        &self.gateway
+    }
+}
diff --git a/contracts/examples/adder/interactor/src/basic_interact_state.rs b/contracts/examples/adder/interactor/src/basic_interact_state.rs
new file mode 100644
index 0000000000..41453e36fd
--- /dev/null
+++ b/contracts/examples/adder/interactor/src/basic_interact_state.rs
@@ -0,0 +1,50 @@
+use multiversx_sc_snippets::imports::*;
+use serde::{Deserialize, Serialize};
+use std::{
+    io::{Read, Write},
+    path::Path,
+};
+
+/// State file
+const STATE_FILE: &str = "state.toml";
+
+/// Multisig Interact state
+#[derive(Debug, Default, Serialize, Deserialize)]
+pub struct State {
+    adder_address: Option<Bech32Address>,
+}
+
+impl State {
+    // Deserializes state from file
+    pub fn load_state() -> Self {
+        if Path::new(STATE_FILE).exists() {
+            let mut file = std::fs::File::open(STATE_FILE).unwrap();
+            let mut content = String::new();
+            file.read_to_string(&mut content).unwrap();
+            toml::from_str(&content).unwrap()
+        } else {
+            Self::default()
+        }
+    }
+
+    /// Sets the adder address
+    pub fn set_adder_address(&mut self, address: Bech32Address) {
+        self.adder_address = Some(address);
+    }
+
+    /// Returns the adder contract
+    pub fn current_adder_address(&self) -> &Bech32Address {
+        self.adder_address
+            .as_ref()
+            .expect("no known adder contract, deploy first")
+    }
+}
+
+impl Drop for State {
+    // Serializes state to file
+    fn drop(&mut self) {
+        let mut file = std::fs::File::create(STATE_FILE).unwrap();
+        file.write_all(toml::to_string(self).unwrap().as_bytes())
+            .unwrap();
+    }
+}
diff --git a/tools/interactor-system-func-calls/sys-func-calls/interact/Cargo.toml b/tools/interactor-system-func-calls/sys-func-calls/interact/Cargo.toml
index ce85dc57c1..837ff49d1c 100644
--- a/tools/interactor-system-func-calls/sys-func-calls/interact/Cargo.toml
+++ b/tools/interactor-system-func-calls/sys-func-calls/interact/Cargo.toml
@@ -21,4 +21,5 @@ version = "1.0"
 features = ["derive"]
 
 [dependencies.multiversx-sc-snippets]
-version = "0.52.3"
+version = "=0.52.3"
+path = "../../../../framework/snippets"
diff --git a/tools/interactor-system-func-calls/sys-func-calls/interact/src/basic_interact.rs b/tools/interactor-system-func-calls/sys-func-calls/interact/src/basic_interact.rs
index 83f8d297fe..ddc37f86f1 100644
--- a/tools/interactor-system-func-calls/sys-func-calls/interact/src/basic_interact.rs
+++ b/tools/interactor-system-func-calls/sys-func-calls/interact/src/basic_interact.rs
@@ -16,17 +16,30 @@ async fn main() {
 
     let cli = basic_interact_cli::InteractCli::parse();
     match &cli.command {
-        Some(basic_interact_cli::InteractCliCommand::Add(args)) => {},
         Some(basic_interact_cli::InteractCliCommand::IssueToken(args)) => {
-            basic_interact
-                .issue_token(
-                    args.cost.clone(),
-                    &args.display_name,
-                    &args.ticker,
-                    EsdtTokenType::from(args.token_type),
-                    args.num_decimals,
-                )
-                .await;
+            match EsdtTokenType::from(args.token_type) {
+                EsdtTokenType::Fungible => {
+                    basic_interact
+                        .issue_fungible_token(
+                            args.cost.clone(),
+                            &args.display_name,
+                            &args.ticker,
+                            args.num_decimals,
+                        )
+                        .await;
+                },
+                _ => {},
+            }
+        },
+        Some(basic_interact_cli::InteractCliCommand::Mint(args)) => {
+            basic_interact.mint_token(args.amount.clone()).await;
+        },
+        Some(basic_interact_cli::InteractCliCommand::SetRoles(args)) => {
+            // let parsed_args = SetRolesArgs::parse();
+            basic_interact.set_role(args.roles.clone()).await;
+        },
+        Some(basic_interact_cli::InteractCliCommand::Burn(args)) => {
+            basic_interact.burn_token(args.amount.clone()).await;
         },
 
         None => {},
@@ -38,6 +51,7 @@ struct SysFuncCallsInteract {
     interactor: Interactor,
     wallet_address: Bech32Address,
     state: State,
+    token_id: String,
 }
 
 impl SysFuncCallsInteract {
@@ -45,26 +59,22 @@ impl SysFuncCallsInteract {
         let config = Config::load_config();
         let mut interactor = Interactor::new(config.gateway()).await;
 
-        let wallet_address = interactor.register_wallet(test_wallets::alice());
+        let wallet_address =
+            interactor.register_wallet(Wallet::from_pem_file("wallet.pem").unwrap());
 
         Self {
             interactor,
             wallet_address: wallet_address.into(),
             state: State::load_state(),
+            token_id: String::new(),
         }
     }
 
-    async fn set_state(&mut self) {
-        println!("wallet address: {}", self.wallet_address);
-        self.interactor.retrieve_account(&self.wallet_address).await;
-    }
-
-    async fn issue_token(
+    async fn issue_fungible_token(
         &mut self,
         issue_cost: RustBigUint,
         token_display_name: &str,
         token_ticker: &str,
-        token_type: EsdtTokenType,
         num_decimals: usize,
     ) {
         self.interactor
@@ -73,12 +83,81 @@ impl SysFuncCallsInteract {
             .to(ESDTSystemSCAddress.to_managed_address())
             .gas(100_000_000u64)
             .typed(ESDTSystemSCProxy)
-            .issue_and_set_all_roles(
+            .issue_fungible(
                 issue_cost.into(),
-                token_display_name.into(),
-                token_ticker.into(),
-                token_type,
-                num_decimals,
+                &token_display_name.into(),
+                &token_ticker.into(),
+                &BigUint::from(100000000000000000000u128),
+                FungibleTokenProperties {
+                    num_decimals: num_decimals,
+                    can_freeze: true,
+                    can_wipe: true,
+                    can_pause: true,
+                    can_mint: true,
+                    can_burn: true,
+                    can_change_owner: true,
+                    can_upgrade: true,
+                    can_add_special_roles: true,
+                },
+            )
+            .prepare_async()
+            .run()
+            .await;
+
+        // self.interactor.query().to(&self.wallet_address).
+    }
+
+    async fn set_role(&mut self, roles: Vec<u16>) {
+        let wallet_address = &self.wallet_address.clone().into_address();
+        let converted_roles: Vec<EsdtLocalRole> =
+            roles.into_iter().map(|r| EsdtLocalRole::from(r)).collect();
+
+        println!("ROLES: {:?}", converted_roles);
+
+        self.interactor
+            .tx()
+            .from(&self.wallet_address)
+            .to(ESDTSystemSCAddress.to_managed_address())
+            .gas(100_000_000u64)
+            .typed(ESDTSystemSCProxy)
+            .set_special_roles::<std::vec::IntoIter<EsdtLocalRole>>(
+                &ManagedAddress::from_address(wallet_address),
+                &TokenIdentifier::from("AND-7d5237"),
+                converted_roles.into_iter(),
+            )
+            .prepare_async()
+            .run()
+            .await;
+    }
+
+    async fn mint_token(&mut self, amount: RustBigUint) {
+        self.interactor
+            .tx()
+            .from(&self.wallet_address)
+            .to(&self.wallet_address)
+            .gas(100_000_000u64)
+            .typed(UserBuiltinProxy)
+            .esdt_local_mint(
+                &TokenIdentifier::from("AND-7d5237"),
+                0,
+                &BigUint::from(amount),
+            )
+            .prepare_async()
+            .run()
+            .await;
+    }
+
+    async fn burn_token(&mut self, amount: RustBigUint) {
+        self.interactor
+            .tx()
+            .from(&self.wallet_address)
+            .to(&self.wallet_address)
+            .gas(100_000_000u64)
+            .typed(UserBuiltinProxy)
+            .esdt_local_burn(
+                &TokenIdentifier::from("AND-7d5237"),
+                0,
+                &BigUint::from(amount),
             )
             .prepare_async()
             .run()
diff --git a/tools/interactor-system-func-calls/sys-func-calls/interact/src/basic_interact_cli.rs b/tools/interactor-system-func-calls/sys-func-calls/interact/src/basic_interact_cli.rs
index 9c404c80e8..fe0597348d 100644
--- a/tools/interactor-system-func-calls/sys-func-calls/interact/src/basic_interact_cli.rs
+++ b/tools/interactor-system-func-calls/sys-func-calls/interact/src/basic_interact_cli.rs
@@ -1,5 +1,5 @@
 use clap::{Args, Parser, Subcommand};
-use multiversx_sc_snippets::imports::{EsdtTokenType, RustBigUint};
+use multiversx_sc_snippets::imports::RustBigUint;
 
 /// SysFuncCalls Interact CLI
 #[derive(Default, PartialEq, Eq, Debug, Parser)]
@@ -13,21 +13,14 @@ pub struct InteractCli {
 /// SysFuncCalls Interact CLI Commands
 #[derive(Clone, PartialEq, Eq, Debug, Subcommand)]
 pub enum InteractCliCommand {
-    #[command(name = "add", about = "Add value")]
-    Add(AddArgs),
     #[command(name = "issue-token", about = "Issue a token")]
     IssueToken(IssueTokenArgs),
-}
-
-#[derive(Default, Clone, PartialEq, Eq, Debug, Args)]
-pub struct AddArgs {
-    /// The value to add
-    #[arg(short = 'v', long = "value")]
-    pub value: u32,
-
-    /// Repeat this number of times
-    #[arg(short = 'c', long = "count", default_value = "1")]
-    pub count: usize,
+    #[command(name = "mint", about = "Mints fungible tokens")]
+    Mint(MintArgs),
+    #[command(name = "set-roles", about = "Set roles")]
+    SetRoles(SetRolesArgs),
+    #[command(name = "burn", about = "Burns fungible tokens")]
+    Burn(BurnArgs),
 }
 
 #[derive(Clone, Debug, PartialEq, Eq, Args)]
@@ -43,3 +36,21 @@ pub struct IssueTokenArgs {
     #[arg(long = "num-decimals")]
     pub num_decimals: usize,
 }
+
+#[derive(Clone, Debug, PartialEq, Eq, Args)]
+pub struct MintArgs {
+    #[arg(long = "amount")]
+    pub amount: RustBigUint,
+}
+
+#[derive(Clone, Debug, PartialEq, Eq, Parser)]
+pub struct SetRolesArgs {
+    #[arg(long = "roles", value_delimiter = ',')]
+    pub roles: Vec<u16>,
+}
+
+#[derive(Clone, Debug, PartialEq, Eq, Args)]
+pub struct BurnArgs {
+    #[arg(long = "amount")]
+    pub amount: RustBigUint,
+}

From 266b717dccf2f27bb311e3b53d740ba63bc866a6 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Mon, 26 Aug 2024 08:42:54 +0300
Subject: [PATCH 1196/1254] test fix

---
 .../composability/tests/forwarder_whitebox_legacy_test.rs       | 2 +-
 .../composability/tests/forwarder_whitebox_test.rs              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/contracts/feature-tests/composability/tests/forwarder_whitebox_legacy_test.rs b/contracts/feature-tests/composability/tests/forwarder_whitebox_legacy_test.rs
index 88e945529a..424c1508a4 100644
--- a/contracts/feature-tests/composability/tests/forwarder_whitebox_legacy_test.rs
+++ b/contracts/feature-tests/composability/tests/forwarder_whitebox_legacy_test.rs
@@ -63,7 +63,7 @@ fn test_nft_update_attributes_and_send() {
         .tx()
         .from(USER_ADDRESS)
         .to(FORWARDER_ADDRESS)
-        .payment(TestEsdtTransfer(NFT_TOKEN_ID, 0, 1))
+        .payment(TestEsdtTransfer(NFT_TOKEN_ID, 1, 1))
         .whitebox(forwarder_legacy::contract_obj, |sc| {
             sc.nft_update_attributes(NFT_TOKEN_ID.to_token_identifier(), 1, new_attributes);
 
diff --git a/contracts/feature-tests/composability/tests/forwarder_whitebox_test.rs b/contracts/feature-tests/composability/tests/forwarder_whitebox_test.rs
index b33b7d98a8..c6f2b54a78 100644
--- a/contracts/feature-tests/composability/tests/forwarder_whitebox_test.rs
+++ b/contracts/feature-tests/composability/tests/forwarder_whitebox_test.rs
@@ -62,7 +62,7 @@ fn test_nft_update_attributes_and_send() {
         .tx()
         .from(USER_ADDRESS)
         .to(FORWARDER_ADDRESS)
-        .payment(TestEsdtTransfer(NFT_TOKEN_ID, 0, 1))
+        .payment(TestEsdtTransfer(NFT_TOKEN_ID, 1, 1))
         .whitebox(forwarder::contract_obj, |sc| {
             sc.nft_update_attributes(NFT_TOKEN_ID.to_token_identifier(), 1, new_attributes);
 

From e21a5aea170f844b2f12ea2fa4f82f2a49735721 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Mon, 26 Aug 2024 08:46:12 +0300
Subject: [PATCH 1197/1254] clippy fix

---
 contracts/examples/nft-minter/src/nft_module.rs               | 2 +-
 .../composability/forwarder-legacy/src/fwd_esdt_legacy.rs     | 3 +--
 .../feature-tests/composability/forwarder/src/fwd_esdt.rs     | 3 +--
 .../feature-tests/composability/local-esdt-and-nft/src/lib.rs | 3 +--
 .../feature-tests/erc-style-contracts/erc1155/src/erc1155.rs  | 4 ++--
 .../feature-tests/rust-testing-framework-tester/src/lib.rs    | 2 +-
 framework/base/src/types/managed/wrapped/managed_vec_item.rs  | 1 +
 7 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/contracts/examples/nft-minter/src/nft_module.rs b/contracts/examples/nft-minter/src/nft_module.rs
index da97c0d171..66f50ea958 100644
--- a/contracts/examples/nft-minter/src/nft_module.rs
+++ b/contracts/examples/nft-minter/src/nft_module.rs
@@ -123,7 +123,7 @@ pub trait NftModule {
     ) {
         match result {
             ManagedAsyncCallResult::Ok(token_id) => {
-                self.nft_token_id().set(&token_id.unwrap_esdt());
+                self.nft_token_id().set(token_id.unwrap_esdt());
             },
             ManagedAsyncCallResult::Err(_) => {
                 let returned = self.call_value().egld_or_single_esdt();
diff --git a/contracts/feature-tests/composability/forwarder-legacy/src/fwd_esdt_legacy.rs b/contracts/feature-tests/composability/forwarder-legacy/src/fwd_esdt_legacy.rs
index b56db69bb8..6fa20793d8 100644
--- a/contracts/feature-tests/composability/forwarder-legacy/src/fwd_esdt_legacy.rs
+++ b/contracts/feature-tests/composability/forwarder-legacy/src/fwd_esdt_legacy.rs
@@ -128,8 +128,7 @@ pub trait ForwarderEsdtModule: fwd_storage_legacy::ForwarderStorageModule {
         // so we can get the token identifier and amount from the call data
         match result {
             ManagedAsyncCallResult::Ok(()) => {
-                self.last_issued_token()
-                    .set(&token_identifier.unwrap_esdt());
+                self.last_issued_token().set(token_identifier.unwrap_esdt());
                 self.last_error_message().clear();
             },
             ManagedAsyncCallResult::Err(message) => {
diff --git a/contracts/feature-tests/composability/forwarder/src/fwd_esdt.rs b/contracts/feature-tests/composability/forwarder/src/fwd_esdt.rs
index fcc3912ecc..a4dbaa28b1 100644
--- a/contracts/feature-tests/composability/forwarder/src/fwd_esdt.rs
+++ b/contracts/feature-tests/composability/forwarder/src/fwd_esdt.rs
@@ -132,8 +132,7 @@ pub trait ForwarderEsdtModule: fwd_storage::ForwarderStorageModule {
         // so we can get the token identifier and amount from the call data
         match result {
             ManagedAsyncCallResult::Ok(()) => {
-                self.last_issued_token()
-                    .set(&token_identifier.unwrap_esdt());
+                self.last_issued_token().set(token_identifier.unwrap_esdt());
                 self.last_error_message().clear();
             },
             ManagedAsyncCallResult::Err(message) => {
diff --git a/contracts/feature-tests/composability/local-esdt-and-nft/src/lib.rs b/contracts/feature-tests/composability/local-esdt-and-nft/src/lib.rs
index 55f0577795..0291d36131 100644
--- a/contracts/feature-tests/composability/local-esdt-and-nft/src/lib.rs
+++ b/contracts/feature-tests/composability/local-esdt-and-nft/src/lib.rs
@@ -276,8 +276,7 @@ pub trait LocalEsdtAndEsdtNft {
         // so we can get the token identifier and amount from the call data
         match result {
             ManagedAsyncCallResult::Ok(()) => {
-                self.last_issued_token()
-                    .set(&token_identifier.unwrap_esdt());
+                self.last_issued_token().set(token_identifier.unwrap_esdt());
                 self.last_error_message().clear();
             },
             ManagedAsyncCallResult::Err(message) => {
diff --git a/contracts/feature-tests/erc-style-contracts/erc1155/src/erc1155.rs b/contracts/feature-tests/erc-style-contracts/erc1155/src/erc1155.rs
index 725cff90de..b4d8acc941 100644
--- a/contracts/feature-tests/erc-style-contracts/erc1155/src/erc1155.rs
+++ b/contracts/feature-tests/erc-style-contracts/erc1155/src/erc1155.rs
@@ -160,7 +160,7 @@ pub trait Erc1155 {
             self.token_owner(type_id, nft_id).set(to);
         } else {
             self.token_owner(type_id, nft_id)
-                .set(&ManagedAddress::zero());
+                .set(ManagedAddress::zero());
         }
     }
 
@@ -320,7 +320,7 @@ pub trait Erc1155 {
         let amount = BigUint::from(1u32);
         self.decrease_balance(owner, type_id, &amount);
         self.token_owner(type_id, nft_id)
-            .set(&ManagedAddress::zero());
+            .set(ManagedAddress::zero());
     }
 
     /// Range is inclusive for both `start` and `end`
diff --git a/contracts/feature-tests/rust-testing-framework-tester/src/lib.rs b/contracts/feature-tests/rust-testing-framework-tester/src/lib.rs
index ad3766e123..ffc411dad0 100644
--- a/contracts/feature-tests/rust-testing-framework-tester/src/lib.rs
+++ b/contracts/feature-tests/rust-testing-framework-tester/src/lib.rs
@@ -21,7 +21,7 @@ pub struct StructWithManagedTypes<M: ManagedTypeApi> {
 pub trait RustTestingFrameworkTester: dummy_module::DummyModule {
     #[init]
     fn init(&self) -> ManagedBuffer {
-        self.total_value().set(&BigUint::from(1u32));
+        self.total_value().set(BigUint::from(1u32));
         b"constructor-result".into()
     }
 
diff --git a/framework/base/src/types/managed/wrapped/managed_vec_item.rs b/framework/base/src/types/managed/wrapped/managed_vec_item.rs
index 648635e143..9f21a13de4 100644
--- a/framework/base/src/types/managed/wrapped/managed_vec_item.rs
+++ b/framework/base/src/types/managed/wrapped/managed_vec_item.rs
@@ -31,6 +31,7 @@ pub trait ManagedVecItem: 'static {
     /// - For items with Copy semantics, it should be the type itself.
     /// - For managed types, ManagedRef does the job.
     /// - For any other types, `Self` is currently used, although this is technically unsafe.
+    ///
     /// TODO: wrap other types in readonly wrapper.
     type Ref<'a>: Borrow<Self>;
 

From d0c0231030e69302cb11ba2ae467b48c0fdd8061 Mon Sep 17 00:00:00 2001
From: Andrei Vasilescu <vasilescuandrei24@gmail.com>
Date: Mon, 26 Aug 2024 09:56:12 +0300
Subject: [PATCH 1198/1254] modified original interactor

---
 Cargo.lock                                    | 11 ----
 Cargo.toml                                    |  1 -
 .../adder/{interactor => interact}/alice.json |  0
 .../src/basic_interact.rs                     | 19 ++++---
 .../examples/adder/interactor/.gitignore      |  9 ----
 .../examples/adder/interactor/Cargo.toml      | 29 -----------
 .../examples/adder/interactor/config.toml     |  1 -
 .../interactor/src/basic_interact_cli.rs      | 52 -------------------
 .../interactor/src/basic_interact_config.rs   | 26 ----------
 .../interactor/src/basic_interact_state.rs    | 50 ------------------
 10 files changed, 12 insertions(+), 186 deletions(-)
 rename contracts/examples/adder/{interactor => interact}/alice.json (100%)
 rename contracts/examples/adder/{interactor => interact}/src/basic_interact.rs (92%)
 delete mode 100644 contracts/examples/adder/interactor/.gitignore
 delete mode 100644 contracts/examples/adder/interactor/Cargo.toml
 delete mode 100644 contracts/examples/adder/interactor/config.toml
 delete mode 100644 contracts/examples/adder/interactor/src/basic_interact_cli.rs
 delete mode 100644 contracts/examples/adder/interactor/src/basic_interact_config.rs
 delete mode 100644 contracts/examples/adder/interactor/src/basic_interact_state.rs

diff --git a/Cargo.lock b/Cargo.lock
index 2c82a6092b..126235e69e 100755
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -274,17 +274,6 @@ dependencies = [
  "toml",
 ]
 
-[[package]]
-name = "basic-interactor"
-version = "0.0.0"
-dependencies = [
- "adder",
- "clap",
- "multiversx-sc-snippets",
- "serde",
- "toml",
-]
-
 [[package]]
 name = "bech32"
 version = "0.9.1"
diff --git a/Cargo.toml b/Cargo.toml
index 1ac0063c0b..ba889c374d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -53,7 +53,6 @@ members = [
   "contracts/examples/adder",
   "contracts/examples/adder/meta",
   "contracts/examples/adder/interact",
-  "contracts/examples/adder/interactor",
   "contracts/examples/esdt-transfer-with-fee",
   "contracts/examples/esdt-transfer-with-fee/meta",
   "contracts/examples/bonding-curve-contract",
diff --git a/contracts/examples/adder/interactor/alice.json b/contracts/examples/adder/interact/alice.json
similarity index 100%
rename from contracts/examples/adder/interactor/alice.json
rename to contracts/examples/adder/interact/alice.json
diff --git a/contracts/examples/adder/interactor/src/basic_interact.rs b/contracts/examples/adder/interact/src/basic_interact.rs
similarity index 92%
rename from contracts/examples/adder/interactor/src/basic_interact.rs
rename to contracts/examples/adder/interact/src/basic_interact.rs
index 53eb860d52..2bff1fd441 100644
--- a/contracts/examples/adder/interactor/src/basic_interact.rs
+++ b/contracts/examples/adder/interact/src/basic_interact.rs
@@ -51,6 +51,7 @@ async fn main() {
 struct AdderInteract {
     interactor: Interactor,
     adder_owner_address: Bech32Address,
+    wallet_address: Bech32Address,
     state: State,
 }
 
@@ -62,22 +63,26 @@ impl AdderInteract {
             .with_tracer(INTERACTOR_SCENARIO_TRACE_PATH)
             .await;
 
-        // PASSWORD: "alice"
         let adder_owner_address =
+            interactor.register_wallet(Wallet::from_pem_file("adder-owner.pem").unwrap());
+        // PASSWORD: alice
+        let wallet_address =
             interactor.register_wallet(Wallet::from_keystore_secret("alice.json").unwrap());
 
         Self {
             interactor,
             adder_owner_address: adder_owner_address.into(),
+            wallet_address: wallet_address.into(),
             state: State::load_state(),
         }
     }
 
     async fn set_state(&mut self) {
-        println!("wallet address: {}", self.adder_owner_address);
+        println!("wallet address: {}", self.wallet_address);
         self.interactor
             .retrieve_account(&self.adder_owner_address)
             .await;
+        self.interactor.retrieve_account(&self.wallet_address).await;
     }
 
     async fn deploy(&mut self) {
@@ -116,7 +121,7 @@ impl AdderInteract {
         let mut buffer = self.interactor.homogenous_call_buffer();
         for _ in 0..count {
             buffer.push_tx(|tx| {
-                tx.from(&self.adder_owner_address)
+                tx.from(&self.wallet_address)
                     .typed(adder_proxy::AdderProxy)
                     .init(0u32)
                     .code(ADDER_CODE_PATH)
@@ -144,7 +149,7 @@ impl AdderInteract {
         let mut buffer = self.interactor.homogenous_call_buffer();
         for _ in 0..count {
             buffer.push_tx(|tx| {
-                tx.from(&self.adder_owner_address)
+                tx.from(&self.wallet_address)
                     .to(self.state.current_adder_address())
                     .typed(adder_proxy::AdderProxy)
                     .add(value)
@@ -160,7 +165,7 @@ impl AdderInteract {
     async fn feed_contract_egld(&mut self) {
         self.interactor
             .tx()
-            .from(&self.adder_owner_address)
+            .from(&self.wallet_address)
             .to(self.state.current_adder_address())
             .egld(NumExpr("0,050000000000000000"))
             .prepare_async()
@@ -171,7 +176,7 @@ impl AdderInteract {
     async fn add(&mut self, value: u32) {
         self.interactor
             .tx()
-            .from(&self.adder_owner_address)
+            .from(&self.wallet_address)
             .to(self.state.current_adder_address())
             .gas(3_000_000)
             .typed(adder_proxy::AdderProxy)
@@ -202,7 +207,7 @@ impl AdderInteract {
         let response = self
             .interactor
             .tx()
-            .from(&self.adder_owner_address)
+            .from(&self.wallet_address)
             .to(self.state.current_adder_address())
             .gas(3_000_000)
             .typed(adder_proxy::AdderProxy)
diff --git a/contracts/examples/adder/interactor/.gitignore b/contracts/examples/adder/interactor/.gitignore
deleted file mode 100644
index b2630809de..0000000000
--- a/contracts/examples/adder/interactor/.gitignore
+++ /dev/null
@@ -1,9 +0,0 @@
-# Pem files are used for interactions, but shouldn't be committed
-*.pem
-!adder-owner.pem
-
-# Temporary storage of deployed contract address, so we can preserve the context between executions.
-state.toml
-
-# Trace file of interactor tooling
-interactor_trace.scen.json
diff --git a/contracts/examples/adder/interactor/Cargo.toml b/contracts/examples/adder/interactor/Cargo.toml
deleted file mode 100644
index 40c6f1d6df..0000000000
--- a/contracts/examples/adder/interactor/Cargo.toml
+++ /dev/null
@@ -1,29 +0,0 @@
-[[bin]]
-name = "basic-interactor"
-path = "src/basic_interact.rs"
-
-[package]
-name = "basic-interactor"
-version = "0.0.0"
-publish = false
-edition = "2021"
-authors = ["you"]
-
-[dependencies]
-toml = "0.8.6"
-
-[dependencies.clap]
-version = "4.4.7"
-features = ["derive"]
-
-[dependencies.serde]
-version = "1.0"
-features = ["derive"]
-
-[dependencies.adder]
-path = ".."
-
-[dependencies.multiversx-sc-snippets]
-version = "=0.52.3"
-path = "../../../../framework/snippets"
-
diff --git a/contracts/examples/adder/interactor/config.toml b/contracts/examples/adder/interactor/config.toml
deleted file mode 100644
index 61ac8dbf87..0000000000
--- a/contracts/examples/adder/interactor/config.toml
+++ /dev/null
@@ -1 +0,0 @@
-gateway = 'https://devnet-gateway.multiversx.com'
diff --git a/contracts/examples/adder/interactor/src/basic_interact_cli.rs b/contracts/examples/adder/interactor/src/basic_interact_cli.rs
deleted file mode 100644
index 6766981802..0000000000
--- a/contracts/examples/adder/interactor/src/basic_interact_cli.rs
+++ /dev/null
@@ -1,52 +0,0 @@
-use clap::{Args, Parser, Subcommand};
-
-/// Adder Interact CLI
-#[derive(Default, PartialEq, Eq, Debug, Parser)]
-#[command(version, about)]
-#[command(propagate_version = true)]
-pub struct InteractCli {
-    #[command(subcommand)]
-    pub command: Option<InteractCliCommand>,
-}
-
-/// Adder Interact CLI Commands
-#[derive(Clone, PartialEq, Eq, Debug, Subcommand)]
-pub enum InteractCliCommand {
-    #[command(name = "add", about = "Add value")]
-    Add(AddArgs),
-    #[command(name = "deploy", about = "Deploy contract")]
-    Deploy,
-    #[command(name = "feed", about = "Feed contract EGLD")]
-    Feed,
-    #[command(name = "multi-deploy", about = "Multiple deploy contracts")]
-    MultiDeploy(MultiDeployArgs),
-    #[command(name = "sum", about = "Print sum")]
-    Sum,
-    #[command(name = "upgrade", about = "Upgrade contract")]
-    Upgrade(UpgradeArgs),
-}
-
-#[derive(Default, Clone, PartialEq, Eq, Debug, Args)]
-pub struct AddArgs {
-    /// The value to add
-    #[arg(short = 'v', long = "value")]
-    pub value: u32,
-
-    /// Repeat this number of times
-    #[arg(short = 'c', long = "count", default_value = "1")]
-    pub count: usize,
-}
-
-#[derive(Default, Clone, PartialEq, Eq, Debug, Args)]
-pub struct UpgradeArgs {
-    /// The value to add
-    #[arg(short = 'v', long = "value")]
-    pub value: u32,
-}
-
-#[derive(Default, Clone, PartialEq, Eq, Debug, Args)]
-pub struct MultiDeployArgs {
-    /// The number of contracts to deploy
-    #[arg(short = 'c', long = "count")]
-    pub count: usize,
-}
diff --git a/contracts/examples/adder/interactor/src/basic_interact_config.rs b/contracts/examples/adder/interactor/src/basic_interact_config.rs
deleted file mode 100644
index e17d0cbe65..0000000000
--- a/contracts/examples/adder/interactor/src/basic_interact_config.rs
+++ /dev/null
@@ -1,26 +0,0 @@
-use serde::Deserialize;
-use std::io::Read;
-
-/// Config file
-const CONFIG_FILE: &str = "config.toml";
-
-/// Adder Interact configuration
-#[derive(Debug, Deserialize)]
-pub struct Config {
-    gateway: String,
-}
-
-impl Config {
-    // Deserializes config from file
-    pub fn load_config() -> Self {
-        let mut file = std::fs::File::open(CONFIG_FILE).unwrap();
-        let mut content = String::new();
-        file.read_to_string(&mut content).unwrap();
-        toml::from_str(&content).unwrap()
-    }
-
-    // Returns the gateway
-    pub fn gateway(&self) -> &str {
-        &self.gateway
-    }
-}
diff --git a/contracts/examples/adder/interactor/src/basic_interact_state.rs b/contracts/examples/adder/interactor/src/basic_interact_state.rs
deleted file mode 100644
index 41453e36fd..0000000000
--- a/contracts/examples/adder/interactor/src/basic_interact_state.rs
+++ /dev/null
@@ -1,50 +0,0 @@
-use multiversx_sc_snippets::imports::*;
-use serde::{Deserialize, Serialize};
-use std::{
-    io::{Read, Write},
-    path::Path,
-};
-
-/// State file
-const STATE_FILE: &str = "state.toml";
-
-/// Multisig Interact state
-#[derive(Debug, Default, Serialize, Deserialize)]
-pub struct State {
-    adder_address: Option<Bech32Address>,
-}
-
-impl State {
-    // Deserializes state from file
-    pub fn load_state() -> Self {
-        if Path::new(STATE_FILE).exists() {
-            let mut file = std::fs::File::open(STATE_FILE).unwrap();
-            let mut content = String::new();
-            file.read_to_string(&mut content).unwrap();
-            toml::from_str(&content).unwrap()
-        } else {
-            Self::default()
-        }
-    }
-
-    /// Sets the adder address
-    pub fn set_adder_address(&mut self, address: Bech32Address) {
-        self.adder_address = Some(address);
-    }
-
-    /// Returns the adder contract
-    pub fn current_adder_address(&self) -> &Bech32Address {
-        self.adder_address
-            .as_ref()
-            .expect("no known adder contract, deploy first")
-    }
-}
-
-impl Drop for State {
-    // Serializes state to file
-    fn drop(&mut self) {
-        let mut file = std::fs::File::create(STATE_FILE).unwrap();
-        file.write_all(toml::to_string(self).unwrap().as_bytes())
-            .unwrap();
-    }
-}

From 30c251a83b376023d6501d1eb5c9997130eb3a5b Mon Sep 17 00:00:00 2001
From: Andrei Vasilescu <vasilescuandrei24@gmail.com>
Date: Mon, 26 Aug 2024 10:00:16 +0300
Subject: [PATCH 1199/1254] small refactor in from_keystore_secret function

---
 .../examples/adder/interact/src/basic_interact.rs     |  6 +++---
 sdk/core/src/wallet.rs                                | 11 +++++------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/contracts/examples/adder/interact/src/basic_interact.rs b/contracts/examples/adder/interact/src/basic_interact.rs
index 2bff1fd441..4765ec6fbe 100644
--- a/contracts/examples/adder/interact/src/basic_interact.rs
+++ b/contracts/examples/adder/interact/src/basic_interact.rs
@@ -65,9 +65,9 @@ impl AdderInteract {
 
         let adder_owner_address =
             interactor.register_wallet(Wallet::from_pem_file("adder-owner.pem").unwrap());
-        // PASSWORD: alice
-        let wallet_address =
-            interactor.register_wallet(Wallet::from_keystore_secret("alice.json").unwrap());
+        // PASSWORD: "alice"
+        let wallet_address = interactor
+            .register_wallet(Wallet::from_keystore_secret("alice.json", "alice").unwrap());
 
         Self {
             interactor,
diff --git a/sdk/core/src/wallet.rs b/sdk/core/src/wallet.rs
index bf1362a314..e197c13c02 100644
--- a/sdk/core/src/wallet.rs
+++ b/sdk/core/src/wallet.rs
@@ -156,12 +156,11 @@ impl Wallet {
         (private_key_str, public_key_str)
     }
 
-    pub fn from_keystore_secret(file_path: &str) -> Result<Self> {
-        let decyption_params =
-            Self::validate_keystore_password(file_path, Self::get_keystore_password())
-                .unwrap_or_else(|e| {
-                    panic!("Error: {:?}", e);
-                });
+    pub fn from_keystore_secret(file_path: &str, password: &str) -> Result<Self> {
+        let decyption_params = Self::validate_keystore_password(file_path, password.to_string())
+            .unwrap_or_else(|e| {
+                panic!("Error: {:?}", e);
+            });
         let priv_key = PrivateKey::from_hex_str(
             hex::encode(Self::decrypt_secret_key(decyption_params)).as_str(),
         )?;

From d0b70560592e5f34318710ada96e262702bb7a0c Mon Sep 17 00:00:00 2001
From: Andrei Vasilescu <vasilescuandrei24@gmail.com>
Date: Mon, 26 Aug 2024 12:05:07 +0300
Subject: [PATCH 1200/1254] added token ticker saving in interactor storage

---
 .../interact/src/basic_interact.rs            | 61 +++++++++++++------
 .../interact/src/basic_interact_state.rs      | 12 ----
 2 files changed, 43 insertions(+), 30 deletions(-)

diff --git a/tools/interactor-system-func-calls/sys-func-calls/interact/src/basic_interact.rs b/tools/interactor-system-func-calls/sys-func-calls/interact/src/basic_interact.rs
index ddc37f86f1..798d74159f 100644
--- a/tools/interactor-system-func-calls/sys-func-calls/interact/src/basic_interact.rs
+++ b/tools/interactor-system-func-calls/sys-func-calls/interact/src/basic_interact.rs
@@ -17,19 +17,15 @@ async fn main() {
     let cli = basic_interact_cli::InteractCli::parse();
     match &cli.command {
         Some(basic_interact_cli::InteractCliCommand::IssueToken(args)) => {
-            match EsdtTokenType::from(args.token_type) {
-                EsdtTokenType::Fungible => {
-                    basic_interact
-                        .issue_fungible_token(
-                            args.cost.clone(),
-                            &args.display_name,
-                            &args.ticker,
-                            args.num_decimals,
-                        )
-                        .await;
-                },
-                _ => {},
-            }
+            basic_interact
+                .issue_token(
+                    args.cost.clone(),
+                    &args.display_name,
+                    &args.ticker,
+                    args.num_decimals,
+                    args.token_type.into(),
+                )
+                .await;
         },
         Some(basic_interact_cli::InteractCliCommand::Mint(args)) => {
             basic_interact.mint_token(args.amount.clone()).await;
@@ -70,7 +66,7 @@ impl SysFuncCallsInteract {
         }
     }
 
-    async fn issue_fungible_token(
+    async fn _issue_fungible_token(
         &mut self,
         issue_cost: RustBigUint,
         token_display_name: &str,
@@ -103,8 +99,37 @@ impl SysFuncCallsInteract {
             .prepare_async()
             .run()
             .await;
+    }
+
+    async fn issue_token(
+        &mut self,
+        issue_cost: RustBigUint,
+        token_display_name: &str,
+        token_ticker: &str,
+        num_decimals: usize,
+        token_type: EsdtTokenType,
+    ) {
+        let token_id = self
+            .interactor
+            .tx()
+            .from(&self.wallet_address)
+            .to(ESDTSystemSCAddress.to_managed_address())
+            .gas(100_000_000u64)
+            .typed(ESDTSystemSCProxy)
+            .issue_and_set_all_roles(
+                issue_cost.into(),
+                token_display_name.into(),
+                token_ticker.into(),
+                token_type,
+                num_decimals,
+            )
+            .returns(ReturnsResultUnmanaged)
+            .prepare_async()
+            .run()
+            .await;
 
-        // self.interactor.query().to(&self.wallet_address).
+        println!("TOKEN ID: {:?}", token_id.to_string());
+        self.token_id = token_id.to_string();
     }
 
     async fn set_role(&mut self, roles: Vec<u16>) {
@@ -122,7 +147,7 @@ impl SysFuncCallsInteract {
             .typed(ESDTSystemSCProxy)
             .set_special_roles::<std::vec::IntoIter<EsdtLocalRole>>(
                 &ManagedAddress::from_address(wallet_address),
-                &TokenIdentifier::from("AND-7d5237"),
+                &TokenIdentifier::from(&self.token_id),
                 converted_roles.into_iter(),
             )
             .prepare_async()
@@ -138,7 +163,7 @@ impl SysFuncCallsInteract {
             .gas(100_000_000u64)
             .typed(UserBuiltinProxy)
             .esdt_local_mint(
-                &TokenIdentifier::from("AND-7d5237"),
+                &TokenIdentifier::from(&self.token_id),
                 0,
                 &BigUint::from(amount),
             )
@@ -155,7 +180,7 @@ impl SysFuncCallsInteract {
             .gas(100_000_000u64)
             .typed(UserBuiltinProxy)
             .esdt_local_burn(
-                &TokenIdentifier::from("AND-7d5237"),
+                &TokenIdentifier::from(&self.token_id),
                 0,
                 &BigUint::from(amount),
             )
diff --git a/tools/interactor-system-func-calls/sys-func-calls/interact/src/basic_interact_state.rs b/tools/interactor-system-func-calls/sys-func-calls/interact/src/basic_interact_state.rs
index 41453e36fd..459b6f0bf5 100644
--- a/tools/interactor-system-func-calls/sys-func-calls/interact/src/basic_interact_state.rs
+++ b/tools/interactor-system-func-calls/sys-func-calls/interact/src/basic_interact_state.rs
@@ -26,18 +26,6 @@ impl State {
             Self::default()
         }
     }
-
-    /// Sets the adder address
-    pub fn set_adder_address(&mut self, address: Bech32Address) {
-        self.adder_address = Some(address);
-    }
-
-    /// Returns the adder contract
-    pub fn current_adder_address(&self) -> &Bech32Address {
-        self.adder_address
-            .as_ref()
-            .expect("no known adder contract, deploy first")
-    }
 }
 
 impl Drop for State {

From 112120f1dbc39b182ecbcff268df80ef571a4746 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Mon, 26 Aug 2024 14:48:02 +0300
Subject: [PATCH 1201/1254] ed25519-dalek reverted downgrade

---
 Cargo.lock                 | 520 +++++++++++++++++++------------------
 vm/Cargo.toml              |   2 +-
 vm/src/crypto_functions.rs |  27 +-
 3 files changed, 281 insertions(+), 268 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index fecbf652fe..afd520f5eb 100755
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -60,6 +60,12 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
 
+[[package]]
+name = "adler2"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
+
 [[package]]
 name = "aes"
 version = "0.8.4"
@@ -201,7 +207,7 @@ dependencies = [
  "cc",
  "cfg-if",
  "libc",
- "miniz_oxide",
+ "miniz_oxide 0.7.4",
  "object",
  "rustc-demangle",
 ]
@@ -296,8 +302,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "93f2635620bf0b9d4576eb7bb9a38a55df78bd1205d26fa994b25911a69f212f"
 dependencies = [
  "bitcoin_hashes",
- "rand 0.8.5",
- "rand_core 0.6.4",
+ "rand",
+ "rand_core",
  "serde",
  "unicode-normalization",
 ]
@@ -308,27 +314,12 @@ version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "90064b8dee6815a6470d60bad07bbbaee885c0e12d04177138fa3291a01b7bc4"
 
-[[package]]
-name = "bitflags"
-version = "1.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
-
 [[package]]
 name = "bitflags"
 version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
-[[package]]
-name = "block-buffer"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4"
-dependencies = [
- "generic-array",
-]
-
 [[package]]
 name = "block-buffer"
 version = "0.10.4"
@@ -395,15 +386,18 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "bytes"
-version = "1.6.1"
+version = "1.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a12916984aab3fa6e39d655a33e09c0071eb36d6ab3aea5c2d78551f1df6d952"
+checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50"
 
 [[package]]
 name = "cc"
-version = "1.1.7"
+version = "1.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26a5c3fd7bfa1ce3897a3a3501d362b2d87b7f2583ebcb4a949ec25911025cbc"
+checksum = "50d2eb3cd3d1bf4529e31c215ee6f93ec5a3d536d9f578f93d9d33ee19562932"
+dependencies = [
+ "shlex",
+]
 
 [[package]]
 name = "cfg-if"
@@ -458,9 +452,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.11"
+version = "4.5.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35723e6a11662c2afb578bcf0b88bf6ea8e21282a953428f240574fcc3a2b5b3"
+checksum = "ed6719fffa43d0d87e5fd8caeab59be1554fb028cd30edc88fc4369b17971019"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -468,9 +462,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.11"
+version = "4.5.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49eb96cbfa7cfa35017b7cd548c75b14c3118c98b423041d70562665e07fb0fa"
+checksum = "216aec2b177652e3846684cbfe25c9964d18ec45234f0f5da5157b207ed1aab6"
 dependencies = [
  "anstream",
  "anstyle",
@@ -480,9 +474,9 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.5.11"
+version = "4.5.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d029b67f89d30bbb547c89fd5161293c0aec155fc691d7924b64550662db93e"
+checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0"
 dependencies = [
  "heck",
  "proc-macro2",
@@ -536,6 +530,12 @@ dependencies = [
  "vault",
 ]
 
+[[package]]
+name = "const-oid"
+version = "0.9.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8"
+
 [[package]]
 name = "convert_case"
 version = "0.6.0"
@@ -566,15 +566,15 @@ dependencies = [
 
 [[package]]
 name = "core-foundation-sys"
-version = "0.8.6"
+version = "0.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
+checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
 
 [[package]]
 name = "cpufeatures"
-version = "0.2.12"
+version = "0.2.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504"
+checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad"
 dependencies = [
  "libc",
 ]
@@ -702,22 +702,25 @@ dependencies = [
 
 [[package]]
 name = "curve25519-dalek"
-version = "3.2.0"
+version = "4.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b9fdf9972b2bd6af2d913799d9ebc165ea4d2e65878e329d9c6b372c4491b61"
+checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be"
 dependencies = [
- "byteorder",
- "digest 0.9.0",
- "rand_core 0.5.1",
+ "cfg-if",
+ "cpufeatures",
+ "curve25519-dalek-derive",
+ "digest",
+ "fiat-crypto",
+ "rustc_version",
  "subtle",
  "zeroize",
 ]
 
 [[package]]
-name = "derive_arbitrary"
-version = "1.3.2"
+name = "curve25519-dalek-derive"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611"
+checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -725,12 +728,24 @@ dependencies = [
 ]
 
 [[package]]
-name = "digest"
-version = "0.9.0"
+name = "der"
+version = "0.7.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066"
+checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0"
 dependencies = [
- "generic-array",
+ "const-oid",
+ "zeroize",
+]
+
+[[package]]
+name = "derive_arbitrary"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
 ]
 
 [[package]]
@@ -739,7 +754,7 @@ version = "0.10.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
 dependencies = [
- "block-buffer 0.10.4",
+ "block-buffer",
  "crypto-common",
  "subtle",
 ]
@@ -773,24 +788,25 @@ dependencies = [
 
 [[package]]
 name = "ed25519"
-version = "1.5.3"
+version = "2.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91cff35c70bba8a626e3185d8cd48cc11b5437e1a5bcd15b9b5fa3c64b6dfee7"
+checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53"
 dependencies = [
+ "pkcs8",
  "signature",
 ]
 
 [[package]]
 name = "ed25519-dalek"
-version = "1.0.1"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d"
+checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871"
 dependencies = [
  "curve25519-dalek",
  "ed25519",
- "rand 0.7.3",
  "serde",
- "sha2 0.9.9",
+ "sha2",
+ "subtle",
  "zeroize",
 ]
 
@@ -1037,9 +1053,15 @@ dependencies = [
 
 [[package]]
 name = "fastrand"
-version = "2.1.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a"
+checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6"
+
+[[package]]
+name = "fiat-crypto"
+version = "0.2.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d"
 
 [[package]]
 name = "first-contract"
@@ -1060,12 +1082,12 @@ dependencies = [
 
 [[package]]
 name = "flate2"
-version = "1.0.30"
+version = "1.0.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae"
+checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253"
 dependencies = [
  "crc32fast",
- "miniz_oxide",
+ "miniz_oxide 0.8.0",
 ]
 
 [[package]]
@@ -1296,17 +1318,6 @@ dependencies = [
  "version_check",
 ]
 
-[[package]]
-name = "getrandom"
-version = "0.1.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
-dependencies = [
- "cfg-if",
- "libc",
- "wasi 0.9.0+wasi-snapshot-preview1",
-]
-
 [[package]]
 name = "getrandom"
 version = "0.2.15"
@@ -1316,7 +1327,7 @@ dependencies = [
  "cfg-if",
  "js-sys",
  "libc",
- "wasi 0.11.0+wasi-snapshot-preview1",
+ "wasi",
  "wasm-bindgen",
 ]
 
@@ -1341,9 +1352,9 @@ dependencies = [
 
 [[package]]
 name = "h2"
-version = "0.4.5"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab"
+checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205"
 dependencies = [
  "atomic-waker",
  "bytes",
@@ -1398,7 +1409,7 @@ version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
 dependencies = [
- "digest 0.10.7",
+ "digest",
 ]
 
 [[package]]
@@ -1502,9 +1513,9 @@ dependencies = [
 
 [[package]]
 name = "hyper-util"
-version = "0.1.6"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ab92f4f49ee4fb4f997c784b7a2e0fa70050211e0b6a287f898c3c9785ca956"
+checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -1548,9 +1559,9 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.2.6"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"
+checksum = "93ead53efc7ea8ed3cfb0c79fc8023fbb782a5432b52830b6518941cebe6505c"
 dependencies = [
  "equivalent",
  "hashbrown",
@@ -1606,9 +1617,9 @@ checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
 
 [[package]]
 name = "js-sys"
-version = "0.3.69"
+version = "0.3.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d"
+checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -1709,9 +1720,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
 [[package]]
 name = "libc"
-version = "0.2.155"
+version = "0.2.158"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
+checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439"
 
 [[package]]
 name = "linked-list-repeat"
@@ -1862,15 +1873,24 @@ dependencies = [
  "adler",
 ]
 
+[[package]]
+name = "miniz_oxide"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1"
+dependencies = [
+ "adler2",
+]
+
 [[package]]
 name = "mio"
-version = "1.0.1"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4569e456d394deccd22ce1c1913e6ea0e54519f577285001215d33557431afe4"
+checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec"
 dependencies = [
  "hermit-abi",
  "libc",
- "wasi 0.11.0+wasi-snapshot-preview1",
+ "wasi",
  "windows-sys 0.52.0",
 ]
 
@@ -1944,7 +1964,7 @@ dependencies = [
 name = "multiversx-chain-vm"
 version = "0.9.0"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags",
  "colored",
  "ed25519-dalek",
  "hex",
@@ -1953,9 +1973,9 @@ dependencies = [
  "multiversx-chain-vm-executor",
  "num-bigint",
  "num-traits",
- "rand 0.8.5",
+ "rand",
  "rand_seeder",
- "sha2 0.10.8",
+ "sha2",
  "sha3",
 ]
 
@@ -1970,11 +1990,11 @@ name = "multiversx-price-aggregator-sc"
 version = "0.52.3"
 dependencies = [
  "arrayvec",
- "getrandom 0.2.15",
+ "getrandom",
  "multiversx-sc",
  "multiversx-sc-modules",
  "multiversx-sc-scenario",
- "rand 0.8.5",
+ "rand",
 ]
 
 [[package]]
@@ -1990,7 +2010,7 @@ dependencies = [
 name = "multiversx-sc"
 version = "0.52.3"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags",
  "hex-literal",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
@@ -2099,7 +2119,7 @@ dependencies = [
  "pathdiff",
  "serde",
  "serde_json",
- "sha2 0.10.8",
+ "sha2",
  "unwrap-infallible",
 ]
 
@@ -2142,13 +2162,13 @@ dependencies = [
  "log",
  "pbkdf2",
  "pem",
- "rand 0.8.5",
+ "rand",
  "reqwest",
  "scrypt",
  "serde",
  "serde_json",
  "serde_repr",
- "sha2 0.10.8",
+ "sha2",
  "sha3",
  "tokio",
  "uuid",
@@ -2289,9 +2309,9 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.36.2"
+version = "0.36.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f203fa8daa7bb185f760ae12bd8e097f63d17041dcdcaf675ac54cdf863170e"
+checksum = "27b64972346851a39438c60b341ebc01bba47464ae329e55cf343eb93964efd9"
 dependencies = [
  "memchr",
 ]
@@ -2302,19 +2322,13 @@ version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
-[[package]]
-name = "opaque-debug"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381"
-
 [[package]]
 name = "openssl"
 version = "0.10.66"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags",
  "cfg-if",
  "foreign-types",
  "libc",
@@ -2439,7 +2453,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "346f04948ba92c43e8469c1ee6736c7563d71012b17d40745260fe106aac2166"
 dependencies = [
  "base64ct",
- "rand_core 0.6.4",
+ "rand_core",
  "subtle",
 ]
 
@@ -2475,7 +2489,7 @@ version = "0.12.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2"
 dependencies = [
- "digest 0.10.7",
+ "digest",
  "hmac",
 ]
 
@@ -2543,6 +2557,16 @@ dependencies = [
  "ping-pong-egld",
 ]
 
+[[package]]
+name = "pkcs8"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7"
+dependencies = [
+ "der",
+ "spki",
+]
+
 [[package]]
 name = "pkg-config"
 version = "0.3.30"
@@ -2551,12 +2575,11 @@ checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
 
 [[package]]
 name = "ppv-lite86"
-version = "0.2.19"
+version = "0.2.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2288c0e17cc8d342c712bb43a257a80ebffce59cdb33d5000d8348f3ec02528b"
+checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04"
 dependencies = [
  "zerocopy",
- "zerocopy-derive",
 ]
 
 [[package]]
@@ -2669,19 +2692,6 @@ dependencies = [
  "nibble_vec",
 ]
 
-[[package]]
-name = "rand"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
-dependencies = [
- "getrandom 0.1.16",
- "libc",
- "rand_chacha 0.2.2",
- "rand_core 0.5.1",
- "rand_hc",
-]
-
 [[package]]
 name = "rand"
 version = "0.8.5"
@@ -2689,18 +2699,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
 dependencies = [
  "libc",
- "rand_chacha 0.3.1",
- "rand_core 0.6.4",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
-dependencies = [
- "ppv-lite86",
- "rand_core 0.5.1",
+ "rand_chacha",
+ "rand_core",
 ]
 
 [[package]]
@@ -2710,16 +2710,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
 dependencies = [
  "ppv-lite86",
- "rand_core 0.6.4",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
-dependencies = [
- "getrandom 0.1.16",
+ "rand_core",
 ]
 
 [[package]]
@@ -2728,16 +2719,7 @@ version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
 dependencies = [
- "getrandom 0.2.15",
-]
-
-[[package]]
-name = "rand_hc"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
-dependencies = [
- "rand_core 0.5.1",
+ "getrandom",
 ]
 
 [[package]]
@@ -2746,7 +2728,7 @@ version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cf2890aaef0aa82719a50e808de264f9484b74b442e1a3a0e5ee38243ac40bdb"
 dependencies = [
- "rand_core 0.6.4",
+ "rand_core",
 ]
 
 [[package]]
@@ -2779,14 +2761,14 @@ version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags",
 ]
 
 [[package]]
 name = "regex"
-version = "1.10.5"
+version = "1.10.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f"
+checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -2813,9 +2795,9 @@ checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
 
 [[package]]
 name = "reqwest"
-version = "0.12.5"
+version = "0.12.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7d6d2a27d57148378eb5e111173f4276ad26340ecc5c49a4a2152167a2d6a37"
+checksum = "f8f4955649ef5c38cc7f9e8aa41761d48fb9677197daea9984dc54f56aad5e63"
 dependencies = [
  "base64",
  "bytes",
@@ -2852,7 +2834,7 @@ dependencies = [
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
- "winreg",
+ "windows-registry",
 ]
 
 [[package]]
@@ -2880,7 +2862,7 @@ checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d"
 dependencies = [
  "cc",
  "cfg-if",
- "getrandom 0.2.15",
+ "getrandom",
  "libc",
  "spin",
  "untrusted",
@@ -2961,7 +2943,7 @@ version = "0.38.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags",
  "errno",
  "libc",
  "linux-raw-sys",
@@ -2983,9 +2965,9 @@ dependencies = [
 
 [[package]]
 name = "rustls-pemfile"
-version = "2.1.2"
+version = "2.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d"
+checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425"
 dependencies = [
  "base64",
  "rustls-pki-types",
@@ -2993,9 +2975,9 @@ dependencies = [
 
 [[package]]
 name = "rustls-pki-types"
-version = "1.7.0"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d"
+checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0"
 
 [[package]]
 name = "rustls-webpki"
@@ -3072,7 +3054,7 @@ dependencies = [
  "password-hash",
  "pbkdf2",
  "salsa20",
- "sha2 0.10.8",
+ "sha2",
 ]
 
 [[package]]
@@ -3098,7 +3080,7 @@ version = "2.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags",
  "core-foundation",
  "core-foundation-sys",
  "libc",
@@ -3156,18 +3138,18 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.204"
+version = "1.0.209"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12"
+checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.204"
+version = "1.0.209"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222"
+checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3176,9 +3158,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.121"
+version = "1.0.127"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ab380d7d9f22ef3f21ad3e6c1ebe8e4fc7a2000ccba2e4d71fc96f15b2cb609"
+checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad"
 dependencies = [
  "indexmap",
  "itoa",
@@ -3236,19 +3218,6 @@ dependencies = [
  "set-repeat",
 ]
 
-[[package]]
-name = "sha2"
-version = "0.9.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800"
-dependencies = [
- "block-buffer 0.9.0",
- "cfg-if",
- "cpufeatures",
- "digest 0.9.0",
- "opaque-debug",
-]
-
 [[package]]
 name = "sha2"
 version = "0.10.8"
@@ -3257,7 +3226,7 @@ checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
 dependencies = [
  "cfg-if",
  "cpufeatures",
- "digest 0.10.7",
+ "digest",
 ]
 
 [[package]]
@@ -3266,10 +3235,16 @@ version = "0.10.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60"
 dependencies = [
- "digest 0.10.7",
+ "digest",
  "keccak",
 ]
 
+[[package]]
+name = "shlex"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
 [[package]]
 name = "signal-hook-registry"
 version = "1.4.2"
@@ -3281,9 +3256,12 @@ dependencies = [
 
 [[package]]
 name = "signature"
-version = "1.6.4"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c"
+checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de"
+dependencies = [
+ "rand_core",
+]
 
 [[package]]
 name = "simd-adler32"
@@ -3339,6 +3317,16 @@ version = "0.9.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
 
+[[package]]
+name = "spki"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d"
+dependencies = [
+ "base64ct",
+ "der",
+]
+
 [[package]]
 name = "str-repeat"
 version = "0.0.0"
@@ -3383,23 +3371,26 @@ name = "sync_wrapper"
 version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394"
+dependencies = [
+ "futures-core",
+]
 
 [[package]]
 name = "system-configuration"
-version = "0.5.1"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7"
+checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags",
  "core-foundation",
  "system-configuration-sys",
 ]
 
 [[package]]
 name = "system-configuration-sys"
-version = "0.5.0"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9"
+checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -3407,14 +3398,15 @@ dependencies = [
 
 [[package]]
 name = "tempfile"
-version = "3.10.1"
+version = "3.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1"
+checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64"
 dependencies = [
  "cfg-if",
  "fastrand",
+ "once_cell",
  "rustix",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -3479,9 +3471,9 @@ dependencies = [
 
 [[package]]
 name = "tokio"
-version = "1.39.2"
+version = "1.39.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "daa4fb1bc778bd6f04cbfc4bb2d06a7396a8f299dc33ea1900cedaa316f467b1"
+checksum = "9babc99b9923bfa4804bd74722ff02c0381021eafa4db9949217e3be8e84fff5"
 dependencies = [
  "backtrace",
  "bytes",
@@ -3542,9 +3534,9 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.8.17"
+version = "0.8.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a44eede9b727419af8095cb2d72fab15487a541f54647ad4414b34096ee4631"
+checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e"
 dependencies = [
  "indexmap",
  "serde",
@@ -3564,9 +3556,9 @@ dependencies = [
 
 [[package]]
 name = "toml_edit"
-version = "0.22.18"
+version = "0.22.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1490595c74d930da779e944f5ba2ecdf538af67df1a9848cbd156af43c1b7cf0"
+checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d"
 dependencies = [
  "indexmap",
  "serde",
@@ -3592,15 +3584,15 @@ dependencies = [
 
 [[package]]
 name = "tower-layer"
-version = "0.3.2"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0"
+checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e"
 
 [[package]]
 name = "tower-service"
-version = "0.3.2"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
+checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
 
 [[package]]
 name = "tracing"
@@ -3731,7 +3723,7 @@ version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314"
 dependencies = [
- "getrandom 0.2.15",
+ "getrandom",
 ]
 
 [[package]]
@@ -3798,12 +3790,6 @@ dependencies = [
  "try-lock",
 ]
 
-[[package]]
-name = "wasi"
-version = "0.9.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
-
 [[package]]
 name = "wasi"
 version = "0.11.0+wasi-snapshot-preview1"
@@ -3812,19 +3798,20 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.92"
+version = "0.2.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"
+checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5"
 dependencies = [
  "cfg-if",
+ "once_cell",
  "wasm-bindgen-macro",
 ]
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.92"
+version = "0.2.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da"
+checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b"
 dependencies = [
  "bumpalo",
  "log",
@@ -3837,9 +3824,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.42"
+version = "0.4.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0"
+checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -3849,9 +3836,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.92"
+version = "0.2.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"
+checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -3859,9 +3846,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.92"
+version = "0.2.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
+checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3872,9 +3859,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.92"
+version = "0.2.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
+checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484"
 
 [[package]]
 name = "wasmparser"
@@ -3883,7 +3870,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5309c1090e3e84dad0d382f42064e9933fdaedb87e468cc239f0eabea73ddcb6"
 dependencies = [
  "ahash",
- "bitflags 2.6.0",
+ "bitflags",
  "hashbrown",
  "indexmap",
  "semver",
@@ -3903,9 +3890,9 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.69"
+version = "0.3.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef"
+checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -3913,11 +3900,41 @@ dependencies = [
 
 [[package]]
 name = "winapi-util"
-version = "0.1.8"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b"
+checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "windows-registry"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0"
+dependencies = [
+ "windows-result",
+ "windows-strings",
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-result"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e"
+dependencies = [
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-strings"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10"
+dependencies = [
+ "windows-result",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -3938,6 +3955,15 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
+[[package]]
+name = "windows-sys"
+version = "0.59.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+dependencies = [
+ "windows-targets 0.52.6",
+]
+
 [[package]]
 name = "windows-targets"
 version = "0.48.5"
@@ -4061,23 +4087,13 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
 name = "winnow"
-version = "0.6.16"
+version = "0.6.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b480ae9340fc261e6be3e95a1ba86d54ae3f9171132a73ce8d4bbaf68339507c"
+checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f"
 dependencies = [
  "memchr",
 ]
 
-[[package]]
-name = "winreg"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5"
-dependencies = [
- "cfg-if",
- "windows-sys 0.48.0",
-]
-
 [[package]]
 name = "zerocopy"
 version = "0.7.35"
@@ -4104,26 +4120,12 @@ name = "zeroize"
 version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
-dependencies = [
- "zeroize_derive",
-]
-
-[[package]]
-name = "zeroize_derive"
-version = "1.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
 
 [[package]]
 name = "zip"
-version = "2.1.5"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b895748a3ebcb69b9d38dcfdf21760859a4b0d0b0015277640c2ef4c69640e6f"
+checksum = "dc5e4288ea4057ae23afc69a4472434a87a2495cafce6632fd1c4ec9f5cf3494"
 dependencies = [
  "arbitrary",
  "crc32fast",
diff --git a/vm/Cargo.toml b/vm/Cargo.toml
index baf8ec3894..31bb9afcdf 100644
--- a/vm/Cargo.toml
+++ b/vm/Cargo.toml
@@ -32,7 +32,7 @@ bitflags = "=2.6.0"
 colored = "2.1.0"
 rand = { version= "0.8.5", optional = true }
 rand_seeder = { version= "0.2.2", optional = true }
-ed25519-dalek = { version = "1.0.1" , optional = true }
+ed25519-dalek = { version = "2.1.0" , optional = true }
 
 [dependencies.multiversx-chain-vm-executor]
 version = "0.2.0"
diff --git a/vm/src/crypto_functions.rs b/vm/src/crypto_functions.rs
index 9d61e9ccc9..fed81f654a 100644
--- a/vm/src/crypto_functions.rs
+++ b/vm/src/crypto_functions.rs
@@ -18,19 +18,30 @@ pub fn keccak256(data: &[u8]) -> [u8; KECCAK256_RESULT_LEN] {
 
 #[cfg(feature = "wasm-incopatible")]
 pub fn verify_ed25519(key: &[u8], message: &[u8], signature: &[u8]) -> bool {
-    use ed25519_dalek::*;
+    use ed25519_dalek::{Signature, VerifyingKey, Verifier};
 
-    let public = PublicKey::from_bytes(key);
-    if public.is_err() {
+    let key_32: [u8; 32] = if let Ok(key_32) = key.try_into() {
+        key_32
+    } else {
         return false;
-    }
+    };
+    let signature_64: [u8; 64] = if let Ok(signature_64) = signature.try_into() {
+        signature_64
+    } else {
+        return false;
+    };
 
-    let sig = Signature::from_bytes(signature);
-    if sig.is_err() {
+    let verifying_key_result = VerifyingKey::from_bytes(&key_32);
+    let verifying_key = if let Ok(verifying_key) = verifying_key_result {
+        verifying_key
+    } else {
         return false;
-    }
+    };
+
+    let sig = Signature::from_bytes(&signature_64);
 
-    public.unwrap().verify(message, &sig.unwrap()).is_ok()
+    let result = verifying_key.verify(message, &sig);
+    result.is_ok()
 }
 
 #[cfg(not(feature = "wasm-incopatible"))]

From 2a1327911f10710f6c9ed22a3a44e5e0ef67af03 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Mon, 26 Aug 2024 14:49:07 +0300
Subject: [PATCH 1202/1254] wasm-incompatible feature typo

---
 framework/scenario/Cargo.toml                | 4 ++--
 vm/Cargo.toml                                | 2 +-
 vm/src/crypto_functions.rs                   | 6 +++---
 vm/src/tx_mock.rs                            | 8 ++++----
 vm/src/tx_mock/blockchain_rng_unsupported.rs | 2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/framework/scenario/Cargo.toml b/framework/scenario/Cargo.toml
index 9cf7f2a553..0e13cb71dd 100644
--- a/framework/scenario/Cargo.toml
+++ b/framework/scenario/Cargo.toml
@@ -32,8 +32,8 @@ colored = "2.0"
 unwrap-infallible = "0.1.5"
 
 [features]
-default = ["wasm-incopatible"]
-wasm-incopatible = ["multiversx-chain-vm/wasm-incopatible"]
+default = ["wasm-incompatible"]
+wasm-incompatible = ["multiversx-chain-vm/wasm-incompatible"]
 run-go-tests = []
 
 [dependencies.multiversx-sc]
diff --git a/vm/Cargo.toml b/vm/Cargo.toml
index 31bb9afcdf..568c7e512c 100644
--- a/vm/Cargo.toml
+++ b/vm/Cargo.toml
@@ -18,7 +18,7 @@ categories = ["cryptography::cryptocurrencies", "development-tools::debugging"]
 
 [features]
 # not supported when compiling to wasm
-wasm-incopatible = ["rand", "rand_seeder", "ed25519-dalek"]
+wasm-incompatible = ["rand", "rand_seeder", "ed25519-dalek"]
 
 [dependencies]
 num-bigint = "0.4"
diff --git a/vm/src/crypto_functions.rs b/vm/src/crypto_functions.rs
index fed81f654a..a1277ceac5 100644
--- a/vm/src/crypto_functions.rs
+++ b/vm/src/crypto_functions.rs
@@ -16,7 +16,7 @@ pub fn keccak256(data: &[u8]) -> [u8; KECCAK256_RESULT_LEN] {
     hasher.finalize().into()
 }
 
-#[cfg(feature = "wasm-incopatible")]
+#[cfg(feature = "wasm-incompatible")]
 pub fn verify_ed25519(key: &[u8], message: &[u8], signature: &[u8]) -> bool {
     use ed25519_dalek::{Signature, VerifyingKey, Verifier};
 
@@ -44,7 +44,7 @@ pub fn verify_ed25519(key: &[u8], message: &[u8], signature: &[u8]) -> bool {
     result.is_ok()
 }
 
-#[cfg(not(feature = "wasm-incopatible"))]
+#[cfg(not(feature = "wasm-incompatible"))]
 pub fn verify_ed25519(_key: &[u8], _message: &[u8], _signature: &[u8]) -> bool {
-    panic!("verify_ed25519 not supported for wasm builds, feature `wasm-incopatible` needs to be enabled")
+    panic!("verify_ed25519 not supported for wasm builds, feature `wasm-incompatible` needs to be enabled")
 }
diff --git a/vm/src/tx_mock.rs b/vm/src/tx_mock.rs
index bd508d569e..ce63ddfe7a 100644
--- a/vm/src/tx_mock.rs
+++ b/vm/src/tx_mock.rs
@@ -37,12 +37,12 @@ pub use tx_panic::*;
 pub use tx_result::*;
 pub use tx_result_calls::*;
 
-#[cfg(feature = "wasm-incopatible")]
+#[cfg(feature = "wasm-incompatible")]
 mod blockchain_rng;
-#[cfg(feature = "wasm-incopatible")]
+#[cfg(feature = "wasm-incompatible")]
 pub use blockchain_rng::BlockchainRng;
 
-#[cfg(not(feature = "wasm-incopatible"))]
+#[cfg(not(feature = "wasm-incompatible"))]
 mod blockchain_rng_unsupported;
-#[cfg(not(feature = "wasm-incopatible"))]
+#[cfg(not(feature = "wasm-incompatible"))]
 pub use blockchain_rng_unsupported::BlockchainRng;
diff --git a/vm/src/tx_mock/blockchain_rng_unsupported.rs b/vm/src/tx_mock/blockchain_rng_unsupported.rs
index 698be4ac11..6339cbaffc 100644
--- a/vm/src/tx_mock/blockchain_rng_unsupported.rs
+++ b/vm/src/tx_mock/blockchain_rng_unsupported.rs
@@ -9,6 +9,6 @@ impl BlockchainRng {
     }
 
     pub fn next_bytes(&mut self, _length: usize) -> Vec<u8> {
-        panic!("BlockchainRng not supported for wasm builds, feature `wasm-incopatible` needs to be enabled")
+        panic!("BlockchainRng not supported for wasm builds, feature `wasm-incompatible` needs to be enabled")
     }
 }

From 12d3da51879b2cdf88aeea15e1ffc906c94d633c Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Mon, 26 Aug 2024 14:53:54 +0300
Subject: [PATCH 1203/1254] dependency upgrade

---
 Cargo.lock                    | 24 ++++++++++++------------
 data/codec-derive/Cargo.toml  |  4 ++--
 data/codec/Cargo.toml         |  2 +-
 framework/derive/Cargo.toml   |  4 ++--
 framework/meta-lib/Cargo.toml |  4 ++--
 vm/Cargo.toml                 |  2 +-
 6 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index afd520f5eb..b7fe71048c 100755
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -181,9 +181,9 @@ dependencies = [
 
 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "atomic-waker"
@@ -2675,9 +2675,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -2724,9 +2724,9 @@ dependencies = [
 
 [[package]]
 name = "rand_seeder"
-version = "0.2.3"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf2890aaef0aa82719a50e808de264f9484b74b442e1a3a0e5ee38243ac40bdb"
+checksum = "4a9febe641d2842ffc76ee962668a17578767c4e01735e4802b21ed9a24b2e4e"
 dependencies = [
  "rand_core",
 ]
@@ -3357,9 +3357,9 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
 
 [[package]]
 name = "syn"
-version = "2.0.72"
+version = "2.0.76"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+checksum = "578e081a14e0cefc3279b0472138c513f37b41a08d5a3cca9b6e4e8ceb6cd525"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3865,9 +3865,9 @@ checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484"
 
 [[package]]
 name = "wasmparser"
-version = "0.214.0"
+version = "0.216.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5309c1090e3e84dad0d382f42064e9933fdaedb87e468cc239f0eabea73ddcb6"
+checksum = "bcdee6bea3619d311fb4b299721e89a986c3470f804b6d534340e412589028e3"
 dependencies = [
  "ahash",
  "bitflags",
@@ -3879,9 +3879,9 @@ dependencies = [
 
 [[package]]
 name = "wasmprinter"
-version = "0.214.0"
+version = "0.216.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58d4f2b3f7bd2ba10f99e03f885ff90d5db3455e163bccecebbbf60406bd8980"
+checksum = "8f82916f3892e53620639217d6ec78fe15c678352a3fbf3f3745b6417d0bd70f"
 dependencies = [
  "anyhow",
  "termcolor",
diff --git a/data/codec-derive/Cargo.toml b/data/codec-derive/Cargo.toml
index 934b041232..707de3c33a 100644
--- a/data/codec-derive/Cargo.toml
+++ b/data/codec-derive/Cargo.toml
@@ -22,6 +22,6 @@ default = ["syn/full", "syn/parsing", "syn/extra-traits"]
 
 [dependencies]
 proc-macro2 = "=1.0.86"
-quote = "=1.0.36"
-syn = "=2.0.72"
+quote = "=1.0.37"
+syn = "=2.0.76"
 hex = "=0.4.3"
diff --git a/data/codec/Cargo.toml b/data/codec/Cargo.toml
index b09697b84c..be2e7f39f4 100644
--- a/data/codec/Cargo.toml
+++ b/data/codec/Cargo.toml
@@ -22,7 +22,7 @@ version = "=0.20.1"
 optional = true
 
 [dependencies]
-arrayvec = { version = "=0.7.4", default-features = false }
+arrayvec = { version = "=0.7.6", default-features = false }
 num-bigint = { version = "0.4", optional = true } # can only be used in std contexts
 unwrap-infallible = "0.1.5"
 
diff --git a/framework/derive/Cargo.toml b/framework/derive/Cargo.toml
index 50f6ef6dd0..d4246c314b 100644
--- a/framework/derive/Cargo.toml
+++ b/framework/derive/Cargo.toml
@@ -15,8 +15,8 @@ categories = ["cryptography::cryptocurrencies", "development-tools::procedural-m
 
 [dependencies]
 proc-macro2 = "=1.0.86"
-quote = "=1.0.36"
-syn = "=2.0.72"
+quote = "=1.0.37"
+syn = "=2.0.76"
 hex = "=0.4.3"
 radix_trie = "=0.2.1"
 
diff --git a/framework/meta-lib/Cargo.toml b/framework/meta-lib/Cargo.toml
index f3149ee0c8..484e9034cb 100644
--- a/framework/meta-lib/Cargo.toml
+++ b/framework/meta-lib/Cargo.toml
@@ -26,8 +26,8 @@ colored = "2.0"
 lazy_static = "1.4.0"
 convert_case = "0.6.0"
 hex = "0.4"
-wasmparser = "0.214"
-wasmprinter = "0.214"
+wasmparser = "0.216"
+wasmprinter = "0.216"
 semver = "1.0.20"
 
 [dependencies.multiversx-sc]
diff --git a/vm/Cargo.toml b/vm/Cargo.toml
index 568c7e512c..b823a5df66 100644
--- a/vm/Cargo.toml
+++ b/vm/Cargo.toml
@@ -31,7 +31,7 @@ hex-literal = "=0.4.1"
 bitflags = "=2.6.0"
 colored = "2.1.0"
 rand = { version= "0.8.5", optional = true }
-rand_seeder = { version= "0.2.2", optional = true }
+rand_seeder = { version= "0.3.0", optional = true }
 ed25519-dalek = { version = "2.1.0" , optional = true }
 
 [dependencies.multiversx-chain-vm-executor]

From 259aaf2ee02f6fc5483ace28190473279d468e99 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Mon, 26 Aug 2024 15:13:45 +0300
Subject: [PATCH 1204/1254] rand_seeder & ed25519-dalek no longer
 wasm-incompatible

---
 vm/Cargo.toml              | 6 +++---
 vm/src/crypto_functions.rs | 8 +-------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/vm/Cargo.toml b/vm/Cargo.toml
index b823a5df66..7e5349688d 100644
--- a/vm/Cargo.toml
+++ b/vm/Cargo.toml
@@ -18,7 +18,7 @@ categories = ["cryptography::cryptocurrencies", "development-tools::debugging"]
 
 [features]
 # not supported when compiling to wasm
-wasm-incompatible = ["rand", "rand_seeder", "ed25519-dalek"]
+wasm-incompatible = ["rand"]
 
 [dependencies]
 num-bigint = "0.4"
@@ -31,8 +31,8 @@ hex-literal = "=0.4.1"
 bitflags = "=2.6.0"
 colored = "2.1.0"
 rand = { version= "0.8.5", optional = true }
-rand_seeder = { version= "0.3.0", optional = true }
-ed25519-dalek = { version = "2.1.0" , optional = true }
+rand_seeder = "0.3.0"
+ed25519-dalek = "2.1.0"
 
 [dependencies.multiversx-chain-vm-executor]
 version = "0.2.0"
diff --git a/vm/src/crypto_functions.rs b/vm/src/crypto_functions.rs
index a1277ceac5..3dae63aad7 100644
--- a/vm/src/crypto_functions.rs
+++ b/vm/src/crypto_functions.rs
@@ -16,9 +16,8 @@ pub fn keccak256(data: &[u8]) -> [u8; KECCAK256_RESULT_LEN] {
     hasher.finalize().into()
 }
 
-#[cfg(feature = "wasm-incompatible")]
 pub fn verify_ed25519(key: &[u8], message: &[u8], signature: &[u8]) -> bool {
-    use ed25519_dalek::{Signature, VerifyingKey, Verifier};
+    use ed25519_dalek::{Signature, Verifier, VerifyingKey};
 
     let key_32: [u8; 32] = if let Ok(key_32) = key.try_into() {
         key_32
@@ -43,8 +42,3 @@ pub fn verify_ed25519(key: &[u8], message: &[u8], signature: &[u8]) -> bool {
     let result = verifying_key.verify(message, &sig);
     result.is_ok()
 }
-
-#[cfg(not(feature = "wasm-incompatible"))]
-pub fn verify_ed25519(_key: &[u8], _message: &[u8], _signature: &[u8]) -> bool {
-    panic!("verify_ed25519 not supported for wasm builds, feature `wasm-incompatible` needs to be enabled")
-}

From 91763211a17e083a3c1e06359f83b32c83eb30b6 Mon Sep 17 00:00:00 2001
From: Andrei Vasilescu <vasilescuandrei24@gmail.com>
Date: Mon, 26 Aug 2024 15:34:55 +0300
Subject: [PATCH 1205/1254] added more sys calls (SFTs/MetaESDTs)

---
 .../interact/src/basic_interact.rs            | 189 ++++++++++++++++--
 .../interact/src/basic_interact_cli.rs        |  89 ++++++++-
 2 files changed, 256 insertions(+), 22 deletions(-)

diff --git a/tools/interactor-system-func-calls/sys-func-calls/interact/src/basic_interact.rs b/tools/interactor-system-func-calls/sys-func-calls/interact/src/basic_interact.rs
index 798d74159f..1286264025 100644
--- a/tools/interactor-system-func-calls/sys-func-calls/interact/src/basic_interact.rs
+++ b/tools/interactor-system-func-calls/sys-func-calls/interact/src/basic_interact.rs
@@ -2,6 +2,7 @@ mod basic_interact_cli;
 mod basic_interact_config;
 mod basic_interact_state;
 
+use basic_interact_cli::NftDummyAttributes;
 use basic_interact_config::Config;
 use basic_interact_state::State;
 use clap::Parser;
@@ -28,14 +29,62 @@ async fn main() {
                 .await;
         },
         Some(basic_interact_cli::InteractCliCommand::Mint(args)) => {
-            basic_interact.mint_token(args.amount.clone()).await;
+            basic_interact
+                .mint_token(&args.token_id, args.amount.clone())
+                .await;
         },
         Some(basic_interact_cli::InteractCliCommand::SetRoles(args)) => {
             // let parsed_args = SetRolesArgs::parse();
-            basic_interact.set_role(args.roles.clone()).await;
+            basic_interact
+                .set_role(&args.token_id, args.roles.clone())
+                .await;
         },
         Some(basic_interact_cli::InteractCliCommand::Burn(args)) => {
-            basic_interact.burn_token(args.amount.clone()).await;
+            basic_interact
+                .burn_token(&args.token_id, args.amount.clone())
+                .await;
+        },
+        Some(basic_interact_cli::InteractCliCommand::IssueFungible(args)) => {
+            basic_interact
+                ._issue_fungible_token(
+                    args.cost.clone(),
+                    &args.display_name,
+                    &args.ticker,
+                    args.supply.clone(),
+                    args.num_decimals,
+                )
+                .await;
+        },
+        Some(basic_interact_cli::InteractCliCommand::IssueSft(args)) => {
+            basic_interact
+                .issue_semi_fungible_token(args.cost.clone(), &args.display_name, &args.ticker)
+                .await;
+        },
+        Some(basic_interact_cli::InteractCliCommand::MintSft(args)) => {
+            basic_interact
+                .mint_sft(
+                    &args.token_id,
+                    args.amount.clone(),
+                    &args.name,
+                    args.royalties.clone(),
+                    &args.hash,
+                )
+                .await;
+        },
+        Some(basic_interact_cli::InteractCliCommand::RegisterMetaEsdt(args)) => {
+            basic_interact
+                .register_meta_esdt(
+                    args.cost.clone(),
+                    &args.display_name,
+                    &args.ticker,
+                    args.num_decimals,
+                )
+                .await;
+        },
+        Some(basic_interact_cli::InteractCliCommand::ChangeSftMetaEsdt(args)) => {
+            basic_interact
+                .change_sft_meta_esdt(&args.token_id, args.num_decimals)
+                .await;
         },
 
         None => {},
@@ -47,7 +96,6 @@ struct SysFuncCallsInteract {
     interactor: Interactor,
     wallet_address: Bech32Address,
     state: State,
-    token_id: String,
 }
 
 impl SysFuncCallsInteract {
@@ -62,7 +110,6 @@ impl SysFuncCallsInteract {
             interactor,
             wallet_address: wallet_address.into(),
             state: State::load_state(),
-            token_id: String::new(),
         }
     }
 
@@ -71,6 +118,7 @@ impl SysFuncCallsInteract {
         issue_cost: RustBigUint,
         token_display_name: &str,
         token_ticker: &str,
+        initial_supply: RustBigUint,
         num_decimals: usize,
     ) {
         self.interactor
@@ -83,7 +131,7 @@ impl SysFuncCallsInteract {
                 issue_cost.into(),
                 &token_display_name.into(),
                 &token_ticker.into(),
-                &BigUint::from(100000000000000000000u128),
+                &initial_supply.into(),
                 FungibleTokenProperties {
                     num_decimals: num_decimals,
                     can_freeze: true,
@@ -101,6 +149,37 @@ impl SysFuncCallsInteract {
             .await;
     }
 
+    async fn issue_semi_fungible_token(
+        &mut self,
+        issue_cost: RustBigUint,
+        token_display_name: &str,
+        token_ticker: &str,
+    ) {
+        self.interactor
+            .tx()
+            .from(&self.wallet_address)
+            .to(ESDTSystemSCAddress.to_managed_address())
+            .gas(100_000_000u64)
+            .typed(ESDTSystemSCProxy)
+            .issue_semi_fungible(
+                issue_cost.into(),
+                &token_display_name.into(),
+                &token_ticker.into(),
+                SemiFungibleTokenProperties {
+                    can_freeze: true,
+                    can_wipe: true,
+                    can_pause: true,
+                    can_transfer_create_role: true,
+                    can_change_owner: true,
+                    can_upgrade: true,
+                    can_add_special_roles: true,
+                },
+            )
+            .prepare_async()
+            .run()
+            .await;
+    }
+
     async fn issue_token(
         &mut self,
         issue_cost: RustBigUint,
@@ -129,10 +208,9 @@ impl SysFuncCallsInteract {
             .await;
 
         println!("TOKEN ID: {:?}", token_id.to_string());
-        self.token_id = token_id.to_string();
     }
 
-    async fn set_role(&mut self, roles: Vec<u16>) {
+    async fn set_role(&mut self, token_id: &str, roles: Vec<u16>) {
         let wallet_address = &self.wallet_address.clone().into_address();
         let converted_roles: Vec<EsdtLocalRole> =
             roles.into_iter().map(|r| EsdtLocalRole::from(r)).collect();
@@ -147,7 +225,7 @@ impl SysFuncCallsInteract {
             .typed(ESDTSystemSCProxy)
             .set_special_roles::<std::vec::IntoIter<EsdtLocalRole>>(
                 &ManagedAddress::from_address(wallet_address),
-                &TokenIdentifier::from(&self.token_id),
+                &TokenIdentifier::from(token_id),
                 converted_roles.into_iter(),
             )
             .prepare_async()
@@ -155,35 +233,108 @@ impl SysFuncCallsInteract {
             .await;
     }
 
-    async fn mint_token(&mut self, amount: RustBigUint) {
+    async fn mint_sft(
+        &mut self,
+        token_id: &str,
+        amount: RustBigUint,
+        name: &str,
+        royalties: RustBigUint,
+        hash: &str,
+    ) {
         self.interactor
             .tx()
             .from(&self.wallet_address)
             .to(&self.wallet_address)
             .gas(100_000_000u64)
             .typed(UserBuiltinProxy)
-            .esdt_local_mint(
-                &TokenIdentifier::from(&self.token_id),
-                0,
+            .esdt_nft_create(
+                &TokenIdentifier::from(token_id),
                 &BigUint::from(amount),
+                &ManagedBuffer::from(name),
+                &royalties.into(),
+                &ManagedBuffer::from(hash),
+                &NftDummyAttributes {
+                    creation_epoch: 2104,
+                    cool_factor: 5,
+                },
+                &ManagedVec::new(),
+            )
+            .prepare_async()
+            .run()
+            .await;
+    }
+
+    async fn register_meta_esdt(
+        &mut self,
+        issue_cost: RustBigUint,
+        token_display_name: &str,
+        token_ticker: &str,
+        num_decimals: usize,
+    ) {
+        let meta_esdt = self
+            .interactor
+            .tx()
+            .from(&self.wallet_address)
+            .to(ESDTSystemSCAddress.to_managed_address())
+            .gas(100_000_000u64)
+            .typed(ESDTSystemSCProxy)
+            .register_meta_esdt(
+                issue_cost.into(),
+                &token_display_name.into(),
+                &token_ticker.into(),
+                MetaTokenProperties {
+                    num_decimals: num_decimals,
+                    can_freeze: true,
+                    can_wipe: true,
+                    can_transfer_create_role: true,
+                    can_change_owner: true,
+                    can_upgrade: true,
+                    can_pause: true,
+                    can_add_special_roles: true,
+                },
             )
+            .returns(ReturnsResultUnmanaged)
             .prepare_async()
             .run()
             .await;
+
+        println!("META ESDT: {:?}", meta_esdt.to_string());
     }
 
-    async fn burn_token(&mut self, amount: RustBigUint) {
+    async fn change_sft_meta_esdt(&mut self, token_id: &str, num_decimals: usize) {
+        self.interactor
+            .tx()
+            .from(&self.wallet_address)
+            .to(ESDTSystemSCAddress.to_managed_address())
+            .gas(100_000_000u64)
+            .typed(ESDTSystemSCProxy)
+            .change_sft_to_meta_esdt(&TokenIdentifier::from(token_id), num_decimals)
+            .prepare_async()
+            .run()
+            .await;
+    }
+
+    async fn mint_token(&mut self, token_id: &str, amount: RustBigUint) {
         self.interactor
             .tx()
             .from(&self.wallet_address)
             .to(&self.wallet_address)
             .gas(100_000_000u64)
             .typed(UserBuiltinProxy)
-            .esdt_local_burn(
-                &TokenIdentifier::from(&self.token_id),
-                0,
-                &BigUint::from(amount),
-            )
+            .esdt_local_mint(&TokenIdentifier::from(token_id), 0, &BigUint::from(amount))
+            .prepare_async()
+            .run()
+            .await;
+    }
+
+    async fn burn_token(&mut self, token_id: &str, amount: RustBigUint) {
+        self.interactor
+            .tx()
+            .from(&self.wallet_address)
+            .to(&self.wallet_address)
+            .gas(100_000_000u64)
+            .typed(UserBuiltinProxy)
+            .esdt_local_burn(&TokenIdentifier::from(token_id), 0, &BigUint::from(amount))
             .prepare_async()
             .run()
             .await;
diff --git a/tools/interactor-system-func-calls/sys-func-calls/interact/src/basic_interact_cli.rs b/tools/interactor-system-func-calls/sys-func-calls/interact/src/basic_interact_cli.rs
index fe0597348d..704006a557 100644
--- a/tools/interactor-system-func-calls/sys-func-calls/interact/src/basic_interact_cli.rs
+++ b/tools/interactor-system-func-calls/sys-func-calls/interact/src/basic_interact_cli.rs
@@ -1,5 +1,5 @@
 use clap::{Args, Parser, Subcommand};
-use multiversx_sc_snippets::imports::RustBigUint;
+use multiversx_sc_snippets::{imports::RustBigUint, multiversx_sc::proxy_imports::*};
 
 /// SysFuncCalls Interact CLI
 #[derive(Default, PartialEq, Eq, Debug, Parser)]
@@ -13,14 +13,27 @@ pub struct InteractCli {
 /// SysFuncCalls Interact CLI Commands
 #[derive(Clone, PartialEq, Eq, Debug, Subcommand)]
 pub enum InteractCliCommand {
-    #[command(name = "issue-token", about = "Issue a token")]
+    #[command(name = "issue-token", about = "Issues a token")]
     IssueToken(IssueTokenArgs),
     #[command(name = "mint", about = "Mints fungible tokens")]
     Mint(MintArgs),
-    #[command(name = "set-roles", about = "Set roles")]
+    #[command(name = "set-roles", about = "Sets roles")]
     SetRoles(SetRolesArgs),
     #[command(name = "burn", about = "Burns fungible tokens")]
     Burn(BurnArgs),
+    #[command(
+        name = "issue-fungible",
+        about = "Issues fungible tokens and sends them to your wallet"
+    )]
+    IssueFungible(IssueFungibleArgs),
+    #[command(name = "issue-sft", about = "Issues a SFT")]
+    IssueSft(IssueSftArgs),
+    #[command(name = "mint-sft", about = "Mints a SFT")]
+    MintSft(MintSFTArgs),
+    #[command(name = "register-meta-esdt", about = "Registers a meta ESDT")]
+    RegisterMetaEsdt(RegisterMetaEsdtArgs),
+    #[command(name = "change-sft-meta-esdt", about = "Changes a SFT to a Meta ESDT")]
+    ChangeSftMetaEsdt(ChangeSftMetaEsdtArgs),
 }
 
 #[derive(Clone, Debug, PartialEq, Eq, Args)]
@@ -39,18 +52,88 @@ pub struct IssueTokenArgs {
 
 #[derive(Clone, Debug, PartialEq, Eq, Args)]
 pub struct MintArgs {
+    #[arg(long = "token-id")]
+    pub token_id: String,
     #[arg(long = "amount")]
     pub amount: RustBigUint,
 }
 
 #[derive(Clone, Debug, PartialEq, Eq, Parser)]
 pub struct SetRolesArgs {
+    #[arg(long = "token-id")]
+    pub token_id: String,
     #[arg(long = "roles", value_delimiter = ',')]
     pub roles: Vec<u16>,
 }
 
 #[derive(Clone, Debug, PartialEq, Eq, Args)]
 pub struct BurnArgs {
+    #[arg(long = "token-id")]
+    pub token_id: String,
     #[arg(long = "amount")]
     pub amount: RustBigUint,
 }
+
+#[derive(Clone, Debug, PartialEq, Eq, Args)]
+pub struct IssueFungibleArgs {
+    #[arg(short = 'c', long = "cost", default_value = "50000000000000000")]
+    pub cost: RustBigUint,
+    #[arg(long = "display-name")]
+    pub display_name: String,
+    #[arg(long = "token-ticker")]
+    pub ticker: String,
+    #[arg(long = "num-decimals")]
+    pub num_decimals: usize,
+    #[arg(short = 's', long = "supply")]
+    pub supply: RustBigUint,
+}
+
+#[derive(Clone, Debug, PartialEq, Eq, Args)]
+pub struct IssueSftArgs {
+    #[arg(short = 'c', long = "cost", default_value = "50000000000000000")]
+    pub cost: RustBigUint,
+    #[arg(long = "display-name")]
+    pub display_name: String,
+    #[arg(long = "token-ticker")]
+    pub ticker: String,
+}
+
+#[derive(TopEncode, TopDecode, Clone, Debug, PartialEq, Eq)]
+pub struct NftDummyAttributes {
+    pub creation_epoch: u64,
+    pub cool_factor: u8,
+}
+
+#[derive(Clone, Debug, PartialEq, Eq, Args)]
+pub struct MintSFTArgs {
+    #[arg(long = "token-id")]
+    pub token_id: String,
+    #[arg(short = 'a', long = "amount")]
+    pub amount: RustBigUint,
+    #[arg(short = 'n', long = "name")]
+    pub name: String,
+    #[arg(short = 'r', long = "royalties")]
+    pub royalties: RustBigUint,
+    #[arg(long = "hash")]
+    pub hash: String,
+}
+
+#[derive(Clone, Debug, PartialEq, Eq, Args)]
+pub struct RegisterMetaEsdtArgs {
+    #[arg(short = 'c', long = "cost", default_value = "50000000000000000")]
+    pub cost: RustBigUint,
+    #[arg(long = "display-name")]
+    pub display_name: String,
+    #[arg(long = "token-ticker")]
+    pub ticker: String,
+    #[arg(long = "num-decimals")]
+    pub num_decimals: usize,
+}
+
+#[derive(Clone, Debug, PartialEq, Eq, Args)]
+pub struct ChangeSftMetaEsdtArgs {
+    #[arg(long = "token-id")]
+    pub token_id: String,
+    #[arg(long = "num-decimals")]
+    pub num_decimals: usize,
+}

From 82cd85aa89ab08e087cb0d18e17151a2f3f6f782 Mon Sep 17 00:00:00 2001
From: Andrei Vasilescu <vasilescuandrei24@gmail.com>
Date: Mon, 26 Aug 2024 16:38:51 +0300
Subject: [PATCH 1206/1254] updated bech32 crate v0.11

---
 Cargo.lock                                             | 4 ++--
 framework/scenario/Cargo.toml                          | 2 +-
 framework/scenario/src/bech32.rs                       | 9 ++++-----
 sdk/core/Cargo.toml                                    | 2 +-
 sdk/core/src/crypto/public_key.rs                      | 5 +++--
 sdk/core/src/data/address.rs                           | 8 ++++----
 sdk/scenario-format/Cargo.toml                         | 2 +-
 sdk/scenario-format/src/value_interpreter/functions.rs | 5 ++---
 tools/mxpy-snippet-generator/Cargo.toml                | 2 +-
 tools/mxpy-snippet-generator/src/helper_types.rs       | 4 +---
 10 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b7fe71048c..ac352c58c6 100755
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -266,9 +266,9 @@ dependencies = [
 
 [[package]]
 name = "bech32"
-version = "0.9.1"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d86b93f97252c47b41663388e6d155714a9d0c398b99f1005cbc5f978b29f445"
+checksum = "d965446196e3b7decd44aa7ee49e31d630118f90ef12f97900f262eb915c951d"
 
 [[package]]
 name = "benchmark-common"
diff --git a/framework/scenario/Cargo.toml b/framework/scenario/Cargo.toml
index 0e13cb71dd..796ab19bf0 100644
--- a/framework/scenario/Cargo.toml
+++ b/framework/scenario/Cargo.toml
@@ -21,7 +21,7 @@ base64 = "0.22"
 num-bigint = "0.4"
 num-traits = "0.2"
 hex = "0.4"
-bech32 = "0.9"
+bech32 = "0.11"
 log = "0.4.17"
 sha2 = "0.10.6"
 serde = "1.0"
diff --git a/framework/scenario/src/bech32.rs b/framework/scenario/src/bech32.rs
index aa224cee95..ef934cf225 100644
--- a/framework/scenario/src/bech32.rs
+++ b/framework/scenario/src/bech32.rs
@@ -1,10 +1,9 @@
-use bech32::{FromBase32, ToBase32, Variant};
+use bech32::{Bech32, Hrp};
 use multiversx_sc::types::heap::Address;
 
 pub fn decode(bech32_address: &str) -> Address {
-    let (_, dest_address_bytes_u5, _) = bech32::decode(bech32_address)
+    let (_hrp, dest_address_bytes) = bech32::decode(bech32_address)
         .unwrap_or_else(|err| panic!("bech32 decode error for {bech32_address}: {err}"));
-    let dest_address_bytes = Vec::<u8>::from_base32(&dest_address_bytes_u5).unwrap();
     if dest_address_bytes.len() != 32 {
         panic!("Invalid address length after decoding")
     }
@@ -13,6 +12,6 @@ pub fn decode(bech32_address: &str) -> Address {
 }
 
 pub fn encode(address: &Address) -> String {
-    bech32::encode("erd", address.as_bytes().to_base32(), Variant::Bech32)
-        .expect("bech32 encode error")
+    let hrp = Hrp::parse("erd").expect("invalid hrp");
+    bech32::encode::<Bech32>(hrp, address.as_bytes()).expect("bech32 encode error")
 }
diff --git a/sdk/core/Cargo.toml b/sdk/core/Cargo.toml
index e84f8cd4cb..2387e4cce8 100644
--- a/sdk/core/Cargo.toml
+++ b/sdk/core/Cargo.toml
@@ -31,7 +31,7 @@ hex = "0.4.3"
 base64 = "0.22"
 pbkdf2 = { version = "0.12.2", default-features = false }
 zeroize = "1.4.2"
-bech32 = "0.9"
+bech32 = "0.11"
 itertools = "0.13.0"
 pem = "3.0.2"
 log = "0.4.17"
diff --git a/sdk/core/src/crypto/public_key.rs b/sdk/core/src/crypto/public_key.rs
index 89b5211262..473a0388fe 100644
--- a/sdk/core/src/crypto/public_key.rs
+++ b/sdk/core/src/crypto/public_key.rs
@@ -2,7 +2,7 @@ use std::fmt::Display;
 
 use super::private_key::PrivateKey;
 use anyhow::Result;
-use bech32::{self, ToBase32, Variant};
+use bech32::{self, Bech32, Hrp};
 use serde::{
     de::{Deserialize, Deserializer},
     ser::{Serialize, Serializer},
@@ -23,7 +23,8 @@ impl PublicKey {
     }
 
     pub fn to_address(&self) -> Result<String> {
-        let address = bech32::encode("erd", self.0.to_base32(), Variant::Bech32)?;
+        let hrp = Hrp::parse("erd")?;
+        let address = bech32::encode::<Bech32>(hrp, &self.0)?;
         Ok(address)
     }
 
diff --git a/sdk/core/src/data/address.rs b/sdk/core/src/data/address.rs
index f8ac4212c3..49d92ea608 100644
--- a/sdk/core/src/data/address.rs
+++ b/sdk/core/src/data/address.rs
@@ -2,7 +2,7 @@ use std::fmt::{Debug, Display};
 
 use crate::crypto::public_key::PublicKey;
 use anyhow::Result;
-use bech32::{FromBase32, ToBase32, Variant};
+use bech32::{Bech32, Hrp};
 use serde::{
     de::{Deserialize, Deserializer},
     ser::{Serialize, Serializer},
@@ -21,8 +21,7 @@ impl Address {
     }
 
     pub fn from_bech32_string(bech32: &str) -> Result<Self> {
-        let (_, data, _) = bech32::decode(bech32)?;
-        let data = Vec::<u8>::from_base32(&data)?;
+        let (_hrp, data) = bech32::decode(bech32)?;
 
         let mut bits: [u8; 32] = [0u8; 32];
         bits.copy_from_slice(&data);
@@ -31,7 +30,8 @@ impl Address {
     }
 
     pub fn to_bech32_string(&self) -> Result<String> {
-        let address = bech32::encode("erd", self.0.to_base32(), Variant::Bech32)?;
+        let hrp = Hrp::parse("erd")?;
+        let address = bech32::encode::<Bech32>(hrp, &self.0)?;
         Ok(address)
     }
 
diff --git a/sdk/scenario-format/Cargo.toml b/sdk/scenario-format/Cargo.toml
index b66e3403ce..a79c6c31a7 100644
--- a/sdk/scenario-format/Cargo.toml
+++ b/sdk/scenario-format/Cargo.toml
@@ -20,4 +20,4 @@ num-bigint = "0.4"
 num-traits = "0.2"
 hex = "0.4"
 sha3 = "0.10.8"
-bech32 = "0.9.0"
+bech32 = "0.11.0"
diff --git a/sdk/scenario-format/src/value_interpreter/functions.rs b/sdk/scenario-format/src/value_interpreter/functions.rs
index 32895e84d7..b4ce547ad7 100644
--- a/sdk/scenario-format/src/value_interpreter/functions.rs
+++ b/sdk/scenario-format/src/value_interpreter/functions.rs
@@ -1,5 +1,4 @@
 use crate::value_interpreter::*;
-use bech32::FromBase32;
 use sha3::{Digest, Keccak256};
 
 pub const SC_ADDRESS_NUM_LEADING_ZEROS: usize = 8;
@@ -71,6 +70,6 @@ pub(crate) fn sc_address_expression(input: &str, vm_type: &VMIdentifier) -> Vec<
 }
 
 pub(crate) fn bech32(input: &str) -> Vec<u8> {
-    let (_, decoded, _) = bech32::decode(input).expect("bech32 decode error");
-    Vec::<u8>::from_base32(&decoded).expect("bech32 base64 decode error")
+    let (_hrp, decoded) = bech32::decode(input).expect("bech32 decode error");
+    decoded
 }
diff --git a/tools/mxpy-snippet-generator/Cargo.toml b/tools/mxpy-snippet-generator/Cargo.toml
index 58236c7f78..838f8a1dc2 100644
--- a/tools/mxpy-snippet-generator/Cargo.toml
+++ b/tools/mxpy-snippet-generator/Cargo.toml
@@ -14,7 +14,7 @@ version = "0.52.3"
 path = "../../framework/base"
 
 [dependencies]
-bech32 = "0.9"
+bech32 = "0.11"
 num-bigint = "0.4"
 num-traits = "0.2"
 hex = "0.4"
diff --git a/tools/mxpy-snippet-generator/src/helper_types.rs b/tools/mxpy-snippet-generator/src/helper_types.rs
index d2cb746a51..e012ef2cb6 100644
--- a/tools/mxpy-snippet-generator/src/helper_types.rs
+++ b/tools/mxpy-snippet-generator/src/helper_types.rs
@@ -1,4 +1,3 @@
-use bech32::FromBase32;
 use multiversx_sc::types::heap::Address;
 
 use crate::constants::*;
@@ -79,8 +78,7 @@ impl TransactionType {
 }
 
 pub fn bech32_to_bytes(bech32_address: &str) -> Address {
-    let (_, dest_address_bytes_u5, _) = bech32::decode(bech32_address).unwrap();
-    let dest_address_bytes = Vec::<u8>::from_base32(&dest_address_bytes_u5).unwrap();
+    let (_hrp, dest_address_bytes) = bech32::decode(bech32_address).unwrap();
     if dest_address_bytes.len() != ADDRESS_LEN {
         panic!("Invalid address length after decoding")
     }

From b49b9df02f096fcb8523f08add5c0bb425dbfa12 Mon Sep 17 00:00:00 2001
From: Andrei Vasilescu <vasilescuandrei24@gmail.com>
Date: Mon, 26 Aug 2024 18:25:53 +0300
Subject: [PATCH 1207/1254] added unset-roles

---
 .../interact/src/basic_interact.rs            | 33 ++++++++++++++++++-
 .../interact/src/basic_interact_cli.rs        | 12 +++++++
 2 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/tools/interactor-system-func-calls/sys-func-calls/interact/src/basic_interact.rs b/tools/interactor-system-func-calls/sys-func-calls/interact/src/basic_interact.rs
index 1286264025..95b103d1ee 100644
--- a/tools/interactor-system-func-calls/sys-func-calls/interact/src/basic_interact.rs
+++ b/tools/interactor-system-func-calls/sys-func-calls/interact/src/basic_interact.rs
@@ -7,7 +7,7 @@ use basic_interact_config::Config;
 use basic_interact_state::State;
 use clap::Parser;
 
-use multiversx_sc_snippets::imports::*;
+use multiversx_sc_snippets::{hex, imports::*};
 
 #[tokio::main]
 async fn main() {
@@ -86,6 +86,11 @@ async fn main() {
                 .change_sft_meta_esdt(&args.token_id, args.num_decimals)
                 .await;
         },
+        Some(basic_interact_cli::InteractCliCommand::UnsetRoles(args)) => {
+            basic_interact
+                .unset_roles(&args.address, &args.token_id, args.roles.clone())
+                .await;
+        },
 
         None => {},
     }
@@ -339,4 +344,30 @@ impl SysFuncCallsInteract {
             .run()
             .await;
     }
+
+    async fn unset_roles(&mut self, address: &str, token_id: &str, roles: Vec<u16>) {
+        let converted_roles: Vec<EsdtLocalRole> =
+            roles.into_iter().map(|r| EsdtLocalRole::from(r)).collect();
+
+        println!("ROLES: {:?}", converted_roles);
+
+        let bech32_addr = Bech32Address::from_bech32_string(address.to_string());
+        let addr = bech32_addr.to_address();
+        let managed_addr: ManagedAddress<StaticApi> = ManagedAddress::from_address(&addr);
+
+        self.interactor
+            .tx()
+            .from(&self.wallet_address)
+            .to(ESDTSystemSCAddress.to_managed_address())
+            .gas(100_000_000u64)
+            .typed(ESDTSystemSCProxy)
+            .unset_special_roles(
+                &managed_addr,
+                &TokenIdentifier::from(token_id),
+                converted_roles.into_iter(),
+            )
+            .prepare_async()
+            .run()
+            .await;
+    }
 }
diff --git a/tools/interactor-system-func-calls/sys-func-calls/interact/src/basic_interact_cli.rs b/tools/interactor-system-func-calls/sys-func-calls/interact/src/basic_interact_cli.rs
index 704006a557..d39c41dbda 100644
--- a/tools/interactor-system-func-calls/sys-func-calls/interact/src/basic_interact_cli.rs
+++ b/tools/interactor-system-func-calls/sys-func-calls/interact/src/basic_interact_cli.rs
@@ -34,6 +34,8 @@ pub enum InteractCliCommand {
     RegisterMetaEsdt(RegisterMetaEsdtArgs),
     #[command(name = "change-sft-meta-esdt", about = "Changes a SFT to a Meta ESDT")]
     ChangeSftMetaEsdt(ChangeSftMetaEsdtArgs),
+    #[command(name = "unset-roles", about = "Unsets the roles of a token")]
+    UnsetRoles(UnsetRolesArgs),
 }
 
 #[derive(Clone, Debug, PartialEq, Eq, Args)]
@@ -137,3 +139,13 @@ pub struct ChangeSftMetaEsdtArgs {
     #[arg(long = "num-decimals")]
     pub num_decimals: usize,
 }
+
+#[derive(Clone, Debug, PartialEq, Eq, Parser)]
+pub struct UnsetRolesArgs {
+    #[arg(short = 'a', long = "address")]
+    pub address: String,
+    #[arg(long = "token-id")]
+    pub token_id: String,
+    #[arg(long = "roles", value_delimiter = ',')]
+    pub roles: Vec<u16>,
+}

From 911900e5cbc76b1378a365a9703499f5361bd570 Mon Sep 17 00:00:00 2001
From: Andrei Vasilescu <vasilescuandrei24@gmail.com>
Date: Mon, 26 Aug 2024 18:42:24 +0300
Subject: [PATCH 1208/1254] added transfering ownership example for
 nft/sft/fungible

---
 .../interact/src/basic_interact.rs            | 54 +++++++++++++++++++
 .../interact/src/basic_interact_cli.rs        | 23 ++++++++
 2 files changed, 77 insertions(+)

diff --git a/tools/interactor-system-func-calls/sys-func-calls/interact/src/basic_interact.rs b/tools/interactor-system-func-calls/sys-func-calls/interact/src/basic_interact.rs
index 95b103d1ee..a1b3324d01 100644
--- a/tools/interactor-system-func-calls/sys-func-calls/interact/src/basic_interact.rs
+++ b/tools/interactor-system-func-calls/sys-func-calls/interact/src/basic_interact.rs
@@ -91,6 +91,16 @@ async fn main() {
                 .unset_roles(&args.address, &args.token_id, args.roles.clone())
                 .await;
         },
+        Some(basic_interact_cli::InteractCliCommand::TransferOwnership(args)) => {
+            basic_interact
+                .transfer_ownership(&args.token_id, &args.new_owner)
+                .await;
+        },
+        Some(basic_interact_cli::InteractCliCommand::TransferNftCreateRole(args)) => {
+            basic_interact
+                .transfer_nft_create_role(&args.token_id, &args.old_owner, &args.new_owner)
+                .await;
+        },
 
         None => {},
     }
@@ -370,4 +380,48 @@ impl SysFuncCallsInteract {
             .run()
             .await;
     }
+
+    async fn transfer_ownership(&mut self, token_id: &str, new_owner: &str) {
+        let bech32_addr = Bech32Address::from_bech32_string(new_owner.to_string());
+        let addr = bech32_addr.to_address();
+        let managed_addr: ManagedAddress<StaticApi> = ManagedAddress::from_address(&addr);
+
+        self.interactor
+            .tx()
+            .from(&self.wallet_address)
+            .to(ESDTSystemSCAddress.to_managed_address())
+            .gas(100_000_000u64)
+            .typed(ESDTSystemSCProxy)
+            .transfer_ownership(&TokenIdentifier::from(token_id), &managed_addr)
+            .prepare_async()
+            .run()
+            .await;
+    }
+
+    async fn transfer_nft_create_role(&mut self, token_id: &str, old_owner: &str, new_owner: &str) {
+        let bech32_addr_new_owner = Bech32Address::from_bech32_string(new_owner.to_string());
+        let addr_new_owner = bech32_addr_new_owner.to_address();
+        let managed_addr_new_owner: ManagedAddress<StaticApi> =
+            ManagedAddress::from_address(&addr_new_owner);
+
+        let bech32_addr_old_owner = Bech32Address::from_bech32_string(old_owner.to_string());
+        let addr_old_owner = bech32_addr_old_owner.to_address();
+        let managed_addr_old_owner: ManagedAddress<StaticApi> =
+            ManagedAddress::from_address(&addr_old_owner);
+
+        self.interactor
+            .tx()
+            .from(&self.wallet_address)
+            .to(ESDTSystemSCAddress.to_managed_address())
+            .gas(100_000_000u64)
+            .typed(ESDTSystemSCProxy)
+            .transfer_nft_create_role(
+                &TokenIdentifier::from(token_id),
+                &managed_addr_old_owner,
+                &managed_addr_new_owner,
+            )
+            .prepare_async()
+            .run()
+            .await;
+    }
 }
diff --git a/tools/interactor-system-func-calls/sys-func-calls/interact/src/basic_interact_cli.rs b/tools/interactor-system-func-calls/sys-func-calls/interact/src/basic_interact_cli.rs
index d39c41dbda..eaca398af6 100644
--- a/tools/interactor-system-func-calls/sys-func-calls/interact/src/basic_interact_cli.rs
+++ b/tools/interactor-system-func-calls/sys-func-calls/interact/src/basic_interact_cli.rs
@@ -36,6 +36,10 @@ pub enum InteractCliCommand {
     ChangeSftMetaEsdt(ChangeSftMetaEsdtArgs),
     #[command(name = "unset-roles", about = "Unsets the roles of a token")]
     UnsetRoles(UnsetRolesArgs),
+    #[command(name = "transfer-ownership", about = "Transfers ownership of a token")]
+    TransferOwnership(TransferOwnershipArgs),
+    #[command(name = "transfer-nft-create-role", about = "Transfers NFT create role")]
+    TransferNftCreateRole(TransferNftCreateRoleArgs),
 }
 
 #[derive(Clone, Debug, PartialEq, Eq, Args)]
@@ -149,3 +153,22 @@ pub struct UnsetRolesArgs {
     #[arg(long = "roles", value_delimiter = ',')]
     pub roles: Vec<u16>,
 }
+
+#[derive(Clone, Debug, PartialEq, Eq, Args)]
+pub struct TransferOwnershipArgs {
+    #[arg(long = "token-id")]
+    pub token_id: String,
+    #[arg(long = "new-owner")]
+    pub new_owner: String,
+}
+
+#[derive(Clone, Debug, PartialEq, Eq, Args)]
+
+pub struct TransferNftCreateRoleArgs {
+    #[arg(long = "token-id")]
+    pub token_id: String,
+    #[arg(long = "old-owner")]
+    pub old_owner: String,
+    #[arg(long = "new-owner")]
+    pub new_owner: String,
+}

From 29751a95fac290385b4dae232ba3222b3e51d03f Mon Sep 17 00:00:00 2001
From: JustEatAnApple <mblacioti@gmail.com>
Date: Mon, 26 Aug 2024 19:14:06 +0300
Subject: [PATCH 1209/1254] [WIP] Added more system func calls

---
 .../interact/src/basic_interact.rs            | 255 +++++++++++++++++-
 .../interact/src/basic_interact_cli.rs        |  91 +++++++
 2 files changed, 339 insertions(+), 7 deletions(-)

diff --git a/tools/interactor-system-func-calls/sys-func-calls/interact/src/basic_interact.rs b/tools/interactor-system-func-calls/sys-func-calls/interact/src/basic_interact.rs
index a1b3324d01..023875cd40 100644
--- a/tools/interactor-system-func-calls/sys-func-calls/interact/src/basic_interact.rs
+++ b/tools/interactor-system-func-calls/sys-func-calls/interact/src/basic_interact.rs
@@ -7,7 +7,7 @@ use basic_interact_config::Config;
 use basic_interact_state::State;
 use clap::Parser;
 
-use multiversx_sc_snippets::{hex, imports::*};
+use multiversx_sc_snippets::imports::*;
 
 #[tokio::main]
 async fn main() {
@@ -44,6 +44,58 @@ async fn main() {
                 .burn_token(&args.token_id, args.amount.clone())
                 .await;
         },
+        Some(basic_interact_cli::InteractCliCommand::PauseToken(args)) => {
+            basic_interact.pause_token(&args.token_id).await;
+        },
+        Some(basic_interact_cli::InteractCliCommand::UnpauseToken(args)) => {
+            basic_interact.unpause_token(&args.token_id).await;
+        },
+        Some(basic_interact_cli::InteractCliCommand::FreezeToken(args)) => {
+            basic_interact
+                .freeze_token(&args.token_id, &args.address)
+                .await;
+        },
+        Some(basic_interact_cli::InteractCliCommand::UnfreezeToken(args)) => {
+            basic_interact
+                .unfreeze_token(&args.token_id, &args.address)
+                .await;
+        },
+        Some(basic_interact_cli::InteractCliCommand::FreezeNFT(args)) => {
+            basic_interact
+                .freeze_nft(&args.token_id, args.nft_nonce, &args.address)
+                .await;
+        },
+        Some(basic_interact_cli::InteractCliCommand::UnfreezeNFT(args)) => {
+            basic_interact
+                .unfreeze_nft(&args.token_id, args.nft_nonce, &args.address)
+                .await;
+        },
+        Some(basic_interact_cli::InteractCliCommand::WipeToken(args)) => {
+            basic_interact
+                .wipe_token(&args.token_id, &args.address)
+                .await;
+        },
+        Some(basic_interact_cli::InteractCliCommand::WipeNFT(args)) => {
+            basic_interact
+                .wipe_nft(&args.token_id, args.nft_nonce, &args.address)
+                .await;
+        },
+        Some(basic_interact_cli::InteractCliCommand::IssueNFT(args)) => {
+            basic_interact
+                .issue_non_fungible_token(args.cost.clone(), &args.display_name, &args.ticker)
+                .await;
+        },
+        Some(basic_interact_cli::InteractCliCommand::CreateNFT(args)) => {
+            basic_interact
+                .create_nft(
+                    &args.token_id,
+                    args.amount.clone(),
+                    &args.name,
+                    args.royalties,
+                    &args.hash,
+                )
+                .await;
+        },
         Some(basic_interact_cli::InteractCliCommand::IssueFungible(args)) => {
             basic_interact
                 ._issue_fungible_token(
@@ -148,7 +200,7 @@ impl SysFuncCallsInteract {
                 &token_ticker.into(),
                 &initial_supply.into(),
                 FungibleTokenProperties {
-                    num_decimals: num_decimals,
+                    num_decimals,
                     can_freeze: true,
                     can_wipe: true,
                     can_pause: true,
@@ -164,6 +216,37 @@ impl SysFuncCallsInteract {
             .await;
     }
 
+    async fn issue_non_fungible_token(
+        &mut self,
+        issue_cost: RustBigUint,
+        token_display_name: &str,
+        token_ticker: &str,
+    ) {
+        self.interactor
+            .tx()
+            .from(&self.wallet_address)
+            .to(ESDTSystemSCAddress.to_managed_address())
+            .gas(100_000_000u64)
+            .typed(ESDTSystemSCProxy)
+            .issue_non_fungible(
+                issue_cost.into(),
+                &token_display_name.into(),
+                &token_ticker.into(),
+                NonFungibleTokenProperties {
+                    can_freeze: true,
+                    can_wipe: true,
+                    can_pause: true,
+                    can_transfer_create_role: true,
+                    can_change_owner: true,
+                    can_upgrade: true,
+                    can_add_special_roles: true,
+                },
+            )
+            .prepare_async()
+            .run()
+            .await;
+    }
+
     async fn issue_semi_fungible_token(
         &mut self,
         issue_cost: RustBigUint,
@@ -227,8 +310,7 @@ impl SysFuncCallsInteract {
 
     async fn set_role(&mut self, token_id: &str, roles: Vec<u16>) {
         let wallet_address = &self.wallet_address.clone().into_address();
-        let converted_roles: Vec<EsdtLocalRole> =
-            roles.into_iter().map(|r| EsdtLocalRole::from(r)).collect();
+        let converted_roles: Vec<EsdtLocalRole> = roles.into_iter().map(EsdtLocalRole::from).collect();
 
         println!("ROLES: {:?}", converted_roles);
 
@@ -298,7 +380,7 @@ impl SysFuncCallsInteract {
                 &token_display_name.into(),
                 &token_ticker.into(),
                 MetaTokenProperties {
-                    num_decimals: num_decimals,
+                    num_decimals,
                     can_freeze: true,
                     can_wipe: true,
                     can_transfer_create_role: true,
@@ -355,9 +437,168 @@ impl SysFuncCallsInteract {
             .await;
     }
 
+    async fn pause_token(&mut self, token_id: &str) {
+        self.interactor
+            .tx()
+            .from(&self.wallet_address)
+            .to(ESDTSystemSCAddress.to_managed_address())
+            .gas(100_000_000u64)
+            .typed(ESDTSystemSCProxy)
+            .pause(&TokenIdentifier::from(token_id))
+            .prepare_async()
+            .run()
+            .await;
+    }
+
+    async fn unpause_token(&mut self, token_id: &str) {
+        self.interactor
+            .tx()
+            .from(&self.wallet_address)
+            .to(ESDTSystemSCAddress.to_managed_address())
+            .gas(100_000_000u64)
+            .typed(ESDTSystemSCProxy)
+            .unpause(&TokenIdentifier::from(token_id))
+            .prepare_async()
+            .run()
+            .await;
+    }
+
+    async fn freeze_token(&mut self, token_id: &str, address: &str) {
+        let address = Bech32Address::from_bech32_string(address.to_string()).to_address();
+        let managed_address: ManagedAddress<StaticApi> = ManagedAddress::from_address(&address);
+        self.interactor
+            .tx()
+            .from(&self.wallet_address)
+            .to(ESDTSystemSCAddress.to_managed_address())
+            .gas(100_000_000u64)
+            .typed(ESDTSystemSCProxy)
+            .freeze(&TokenIdentifier::from(token_id), &managed_address)
+            .prepare_async()
+            .run()
+            .await;
+    }
+
+    async fn unfreeze_token(&mut self, token_id: &str, address: &str) {
+        let address = Bech32Address::from_bech32_string(address.to_string()).to_address();
+        let managed_address: ManagedAddress<StaticApi> = ManagedAddress::from_address(&address);
+        self.interactor
+            .tx()
+            .from(&self.wallet_address)
+            .to(ESDTSystemSCAddress.to_managed_address())
+            .gas(100_000_000u64)
+            .typed(ESDTSystemSCProxy)
+            .unfreeze(&TokenIdentifier::from(token_id), &managed_address)
+            .prepare_async()
+            .run()
+            .await;
+    }
+
+    async fn freeze_nft(&mut self, token_id: &str, nonce: u64, address: &str) {
+        let address = Bech32Address::from_bech32_string(address.to_string()).to_address();
+        let managed_address: ManagedAddress<StaticApi> = ManagedAddress::from_address(&address);
+        self.interactor
+            .tx()
+            .from(&self.wallet_address)
+            .to(ESDTSystemSCAddress.to_managed_address())
+            .gas(100_000_000u64)
+            .typed(ESDTSystemSCProxy)
+            .freeze_nft(
+                &TokenIdentifier::from(token_id),
+                nonce,
+                &managed_address,
+            )
+            .prepare_async()
+            .run()
+            .await;
+    }
+
+    async fn unfreeze_nft(&mut self, token_id: &str, nonce: u64, address: &str) {
+        let address = Bech32Address::from_bech32_string(address.to_string()).to_address();
+        let managed_address: ManagedAddress<StaticApi> = ManagedAddress::from_address(&address);
+        self.interactor
+            .tx()
+            .from(&self.wallet_address)
+            .to(ESDTSystemSCAddress.to_managed_address())
+            .gas(100_000_000u64)
+            .typed(ESDTSystemSCProxy)
+            .unfreeze_nft(
+                &TokenIdentifier::from(token_id),
+                nonce,
+                &managed_address,
+            )
+            .prepare_async()
+            .run()
+            .await;
+    }
+
+    async fn wipe_token(&mut self, token_id: &str, address: &str) {
+        let address = Bech32Address::from_bech32_string(address.to_string()).to_address();
+        let managed_address: ManagedAddress<StaticApi> = ManagedAddress::from_address(&address);
+        self.interactor
+            .tx()
+            .from(&self.wallet_address)
+            .to(&ESDTSystemSCAddress.to_managed_address())
+            .gas(100_000_000u64)
+            .typed(ESDTSystemSCProxy)
+            .wipe(&TokenIdentifier::from(token_id), &managed_address)
+            .prepare_async()
+            .run()
+            .await;
+    }
+
+    async fn wipe_nft(&mut self, token_id: &str, nonce: u64, address: &str) {
+        let address = Bech32Address::from_bech32_string(address.to_string()).to_address();
+        let managed_address: ManagedAddress<StaticApi> = ManagedAddress::from_address(&address);
+        self.interactor
+            .tx()
+            .from(&self.wallet_address)
+            .to(ESDTSystemSCAddress.to_managed_address())
+            .gas(100_000_000u64)
+            .typed(ESDTSystemSCProxy)
+            .wipe_nft(
+                &TokenIdentifier::from(token_id),
+                nonce,
+                &managed_address,
+            )
+            .prepare_async()
+            .run()
+            .await;
+    }
+
+    async fn create_nft(
+        &mut self,
+        token_id: &str,
+        amount: RustBigUint,
+        name: &str,
+        royalties: u64,
+        hash: &str,
+    ) {
+        self.interactor
+            .tx()
+            .from(&self.wallet_address)
+            .to(&self.wallet_address)
+            .gas(100_000_000u64)
+            .typed(UserBuiltinProxy)
+            .esdt_nft_create(
+                &TokenIdentifier::from(token_id),
+                &BigUint::from(amount),
+                &ManagedBuffer::from(name),
+                &BigUint::from(royalties),
+                &ManagedBuffer::from(hash),
+                &NftDummyAttributes {
+                    creation_epoch: 2104,
+                    cool_factor: 5,
+                },
+                &ManagedVec::new(),
+            )
+            .prepare_async()
+            .run()
+            .await;
+    }
+
     async fn unset_roles(&mut self, address: &str, token_id: &str, roles: Vec<u16>) {
-        let converted_roles: Vec<EsdtLocalRole> =
-            roles.into_iter().map(|r| EsdtLocalRole::from(r)).collect();
+        let converted_roles: Vec<EsdtLocalRole> = roles.into_iter().map(EsdtLocalRole::from).collect();
+
 
         println!("ROLES: {:?}", converted_roles);
 
diff --git a/tools/interactor-system-func-calls/sys-func-calls/interact/src/basic_interact_cli.rs b/tools/interactor-system-func-calls/sys-func-calls/interact/src/basic_interact_cli.rs
index eaca398af6..f740ff3d30 100644
--- a/tools/interactor-system-func-calls/sys-func-calls/interact/src/basic_interact_cli.rs
+++ b/tools/interactor-system-func-calls/sys-func-calls/interact/src/basic_interact_cli.rs
@@ -21,6 +21,26 @@ pub enum InteractCliCommand {
     SetRoles(SetRolesArgs),
     #[command(name = "burn", about = "Burns fungible tokens")]
     Burn(BurnArgs),
+    #[command(name = "pause-token", about = "Pauses a fungible token")]
+    PauseToken(PauseTokenArgs),
+    #[command(name = "unpause-token", about = "Unpauses a fungible token")]
+    UnpauseToken(PauseTokenArgs),
+    #[command(name = "freeze-token", about = "Freezes a fungible token for an address")]
+    FreezeToken(FreezeTokenArgs),
+    #[command(name = "unfreeze-token", about = "Unfreezes a fungible token for an address")]
+    UnfreezeToken(FreezeTokenArgs),
+    #[command(name = "freeze-nft", about = "Freezes a non-fungible token for an address")]
+    FreezeNFT(FreezeNFTArgs),
+    #[command(name = "unfreeze-nft", about = "Unfreezes a non-fungible token for an address")]
+    UnfreezeNFT(FreezeNFTArgs),
+    #[command(name = "wipe-token", about = "Wipes a fungible token for an address")]
+    WipeToken(WipeTokenArgs),
+    #[command(name = "wipe-nft", about = "Freezes a non-fungible token for an address")]
+    WipeNFT(WipeNFTArgs),
+    #[command(name = "issue-non-fungible-token", about = "Create a NFT Collection")]
+    IssueNFT(IssueNFTArgs),
+    #[command(name = "create-nft", about = "Issue a NFT")]
+    CreateNFT(CreateNFTArgs),
     #[command(
         name = "issue-fungible",
         about = "Issues fungible tokens and sends them to your wallet"
@@ -94,6 +114,16 @@ pub struct IssueFungibleArgs {
     pub supply: RustBigUint,
 }
 
+#[derive(Clone, Debug, PartialEq, Eq, Args)]
+pub struct IssueNFTArgs {
+    #[arg(short = 'c', long = "cost", default_value = "50000000000000000")]
+    pub cost: RustBigUint,
+    #[arg(short = 'd', long = "display-name")]
+    pub display_name: String,
+    #[arg(long = "token-ticker")]
+    pub ticker: String,
+}
+
 #[derive(Clone, Debug, PartialEq, Eq, Args)]
 pub struct IssueSftArgs {
     #[arg(short = 'c', long = "cost", default_value = "50000000000000000")]
@@ -172,3 +202,64 @@ pub struct TransferNftCreateRoleArgs {
     #[arg(long = "new-owner")]
     pub new_owner: String,
 }
+
+#[derive(Clone, Debug, PartialEq, Eq, Args)]
+pub struct PauseTokenArgs {
+    #[arg(long = "token-id", default_value = "")]
+    pub token_id: String,
+}
+
+#[derive(Clone, Debug, PartialEq, Eq, Args)]
+pub struct FreezeTokenArgs {
+    #[arg(long = "token-id", default_value = "")]
+    pub token_id: String,
+    #[arg(short = 'a', long = "address")]
+    pub address: String,
+}
+
+#[derive(Clone, Debug, PartialEq, Eq, Args)]
+pub struct FreezeNFTArgs {
+    #[arg(long = "token-id", default_value = "")]
+    pub token_id: String,
+    #[arg(long = "nonce")]
+    pub nft_nonce: u64,
+    #[arg(short = 'a', long = "address")]
+    pub address: String,
+}
+
+#[derive(Clone, Debug, PartialEq, Eq, Args)]
+pub struct WipeTokenArgs {
+    #[arg(long = "token-id", default_value = "")]
+    pub token_id: String,
+    #[arg(short = 'a', long = "address")]
+    pub address: String,
+}
+
+#[derive(Clone, Debug, PartialEq, Eq, Args)]
+pub struct WipeNFTArgs {
+    #[arg(long = "token-id", default_value = "")]
+    pub token_id: String,
+    #[arg(long = "nonce")]
+    pub nft_nonce: u64,
+    #[arg(short = 'a', long = "address")]
+    pub address: String,
+}
+
+#[derive(Clone, Debug, PartialEq, Eq, Args)]
+pub struct CreateNFTArgs {
+    // token amount name hash royalities attributes uris
+    #[arg(long = "token-id")]
+    pub token_id: String,
+    #[arg(short = 'a', long = "amount")]
+    pub amount: RustBigUint,
+    #[arg(short = 'n', long = "name")]
+    pub name: String,
+    #[arg(long = "hash")]
+    pub hash: String,
+    #[arg(short = 'r', long = "royalities")]
+    pub royalties: u64,
+    // #[long = "attributes")]
+    // pub attributes: String,
+    // #[arg(long = "uris")]
+    // pub uris: String,
+}

From 85e06df3496266cf457141df360f13617c4d68a7 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Mon, 26 Aug 2024 23:37:41 +0300
Subject: [PATCH 1210/1254] added esdt processing for transfer step in
 interactor

---
 .../src/scenario/tx_to_step/tx_to_step_transfer.rs        | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/framework/scenario/src/scenario/tx_to_step/tx_to_step_transfer.rs b/framework/scenario/src/scenario/tx_to_step/tx_to_step_transfer.rs
index d2bf9636c9..d2baa6bc6c 100644
--- a/framework/scenario/src/scenario/tx_to_step/tx_to_step_transfer.rs
+++ b/framework/scenario/src/scenario/tx_to_step/tx_to_step_transfer.rs
@@ -1,6 +1,6 @@
 use multiversx_sc::types::{Tx, TxEnv, TxFromSpecified, TxGas, TxPayment, TxToSpecified};
 
-use crate::scenario_model::TransferStep;
+use crate::{imports::TxESDT, scenario_model::TransferStep};
 
 use super::{address_annotated, gas_annotated, StepWrapper, TxToStep};
 
@@ -48,6 +48,12 @@ where
     let full_payment_data = payment.into_full_payment_data(env);
     if let Some(annotated_egld_payment) = full_payment_data.egld {
         step.tx.egld_value = annotated_egld_payment.into();
+    } else {
+        step.tx.esdt_value = full_payment_data
+            .multi_esdt
+            .iter()
+            .map(TxESDT::from)
+            .collect();
     }
 
     step

From a86a9d838a60ae201583962a0ca24271cfa04355 Mon Sep 17 00:00:00 2001
From: Andrei Vasilescu <vasilescuandrei24@gmail.com>
Date: Tue, 27 Aug 2024 10:51:01 +0300
Subject: [PATCH 1211/1254] system SC func calls interactor example done

---
 .../interact/src/basic_interact.rs            | 64 ++++++++++++-------
 .../interact/src/basic_interact_cli.rs        | 45 +++++++++----
 2 files changed, 71 insertions(+), 38 deletions(-)

diff --git a/tools/interactor-system-func-calls/sys-func-calls/interact/src/basic_interact.rs b/tools/interactor-system-func-calls/sys-func-calls/interact/src/basic_interact.rs
index 023875cd40..05c26126ff 100644
--- a/tools/interactor-system-func-calls/sys-func-calls/interact/src/basic_interact.rs
+++ b/tools/interactor-system-func-calls/sys-func-calls/interact/src/basic_interact.rs
@@ -34,7 +34,6 @@ async fn main() {
                 .await;
         },
         Some(basic_interact_cli::InteractCliCommand::SetRoles(args)) => {
-            // let parsed_args = SetRolesArgs::parse();
             basic_interact
                 .set_role(&args.token_id, args.roles.clone())
                 .await;
@@ -80,9 +79,9 @@ async fn main() {
                 .wipe_nft(&args.token_id, args.nft_nonce, &args.address)
                 .await;
         },
-        Some(basic_interact_cli::InteractCliCommand::IssueNFT(args)) => {
+        Some(basic_interact_cli::InteractCliCommand::IssueNFTCollection(args)) => {
             basic_interact
-                .issue_non_fungible_token(args.cost.clone(), &args.display_name, &args.ticker)
+                .issue_non_fungible_collection(args.cost.clone(), &args.display_name, &args.ticker)
                 .await;
         },
         Some(basic_interact_cli::InteractCliCommand::CreateNFT(args)) => {
@@ -153,6 +152,9 @@ async fn main() {
                 .transfer_nft_create_role(&args.token_id, &args.old_owner, &args.new_owner)
                 .await;
         },
+        Some(basic_interact_cli::InteractCliCommand::ControlChanges(args)) => {
+            basic_interact.control_changes(&args.token_id).await;
+        },
 
         None => {},
     }
@@ -170,8 +172,7 @@ impl SysFuncCallsInteract {
         let config = Config::load_config();
         let mut interactor = Interactor::new(config.gateway()).await;
 
-        let wallet_address =
-            interactor.register_wallet(Wallet::from_pem_file("wallet.pem").unwrap());
+        let wallet_address = interactor.register_wallet(test_wallets::alice());
 
         Self {
             interactor,
@@ -216,7 +217,7 @@ impl SysFuncCallsInteract {
             .await;
     }
 
-    async fn issue_non_fungible_token(
+    async fn issue_non_fungible_collection(
         &mut self,
         issue_cost: RustBigUint,
         token_display_name: &str,
@@ -310,7 +311,8 @@ impl SysFuncCallsInteract {
 
     async fn set_role(&mut self, token_id: &str, roles: Vec<u16>) {
         let wallet_address = &self.wallet_address.clone().into_address();
-        let converted_roles: Vec<EsdtLocalRole> = roles.into_iter().map(EsdtLocalRole::from).collect();
+        let converted_roles: Vec<EsdtLocalRole> =
+            roles.into_iter().map(EsdtLocalRole::from).collect();
 
         println!("ROLES: {:?}", converted_roles);
 
@@ -502,11 +504,7 @@ impl SysFuncCallsInteract {
             .to(ESDTSystemSCAddress.to_managed_address())
             .gas(100_000_000u64)
             .typed(ESDTSystemSCProxy)
-            .freeze_nft(
-                &TokenIdentifier::from(token_id),
-                nonce,
-                &managed_address,
-            )
+            .freeze_nft(&TokenIdentifier::from(token_id), nonce, &managed_address)
             .prepare_async()
             .run()
             .await;
@@ -521,11 +519,7 @@ impl SysFuncCallsInteract {
             .to(ESDTSystemSCAddress.to_managed_address())
             .gas(100_000_000u64)
             .typed(ESDTSystemSCProxy)
-            .unfreeze_nft(
-                &TokenIdentifier::from(token_id),
-                nonce,
-                &managed_address,
-            )
+            .unfreeze_nft(&TokenIdentifier::from(token_id), nonce, &managed_address)
             .prepare_async()
             .run()
             .await;
@@ -555,11 +549,7 @@ impl SysFuncCallsInteract {
             .to(ESDTSystemSCAddress.to_managed_address())
             .gas(100_000_000u64)
             .typed(ESDTSystemSCProxy)
-            .wipe_nft(
-                &TokenIdentifier::from(token_id),
-                nonce,
-                &managed_address,
-            )
+            .wipe_nft(&TokenIdentifier::from(token_id), nonce, &managed_address)
             .prepare_async()
             .run()
             .await;
@@ -597,8 +587,8 @@ impl SysFuncCallsInteract {
     }
 
     async fn unset_roles(&mut self, address: &str, token_id: &str, roles: Vec<u16>) {
-        let converted_roles: Vec<EsdtLocalRole> = roles.into_iter().map(EsdtLocalRole::from).collect();
-
+        let converted_roles: Vec<EsdtLocalRole> =
+            roles.into_iter().map(EsdtLocalRole::from).collect();
 
         println!("ROLES: {:?}", converted_roles);
 
@@ -665,4 +655,30 @@ impl SysFuncCallsInteract {
             .run()
             .await;
     }
+
+    async fn control_changes(&mut self, token_id: &str) {
+        self.interactor
+            .tx()
+            .from(&self.wallet_address)
+            .to(ESDTSystemSCAddress.to_managed_address())
+            .gas(100_000_000u64)
+            .typed(ESDTSystemSCProxy)
+            .control_changes(
+                &TokenIdentifier::from(token_id),
+                &TokenPropertyArguments {
+                    can_freeze: Some(true),
+                    can_wipe: Some(true),
+                    can_pause: Some(true),
+                    can_transfer_create_role: Some(true),
+                    can_mint: Some(true),
+                    can_burn: Some(true),
+                    can_change_owner: Some(true),
+                    can_upgrade: Some(true),
+                    can_add_special_roles: Some(true),
+                },
+            )
+            .prepare_async()
+            .run()
+            .await;
+    }
 }
diff --git a/tools/interactor-system-func-calls/sys-func-calls/interact/src/basic_interact_cli.rs b/tools/interactor-system-func-calls/sys-func-calls/interact/src/basic_interact_cli.rs
index f740ff3d30..3386feffff 100644
--- a/tools/interactor-system-func-calls/sys-func-calls/interact/src/basic_interact_cli.rs
+++ b/tools/interactor-system-func-calls/sys-func-calls/interact/src/basic_interact_cli.rs
@@ -25,20 +25,35 @@ pub enum InteractCliCommand {
     PauseToken(PauseTokenArgs),
     #[command(name = "unpause-token", about = "Unpauses a fungible token")]
     UnpauseToken(PauseTokenArgs),
-    #[command(name = "freeze-token", about = "Freezes a fungible token for an address")]
+    #[command(
+        name = "freeze-token",
+        about = "Freezes a fungible token for an address"
+    )]
     FreezeToken(FreezeTokenArgs),
-    #[command(name = "unfreeze-token", about = "Unfreezes a fungible token for an address")]
+    #[command(
+        name = "unfreeze-token",
+        about = "Unfreezes a fungible token for an address"
+    )]
     UnfreezeToken(FreezeTokenArgs),
-    #[command(name = "freeze-nft", about = "Freezes a non-fungible token for an address")]
+    #[command(
+        name = "freeze-nft",
+        about = "Freezes a non-fungible token for an address"
+    )]
     FreezeNFT(FreezeNFTArgs),
-    #[command(name = "unfreeze-nft", about = "Unfreezes a non-fungible token for an address")]
+    #[command(
+        name = "unfreeze-nft",
+        about = "Unfreezes a non-fungible token for an address"
+    )]
     UnfreezeNFT(FreezeNFTArgs),
     #[command(name = "wipe-token", about = "Wipes a fungible token for an address")]
     WipeToken(WipeTokenArgs),
-    #[command(name = "wipe-nft", about = "Freezes a non-fungible token for an address")]
+    #[command(
+        name = "wipe-nft",
+        about = "Freezes a non-fungible token for an address"
+    )]
     WipeNFT(WipeNFTArgs),
-    #[command(name = "issue-non-fungible-token", about = "Create a NFT Collection")]
-    IssueNFT(IssueNFTArgs),
+    #[command(name = "issue-nft-collection", about = "Create a NFT Collection")]
+    IssueNFTCollection(IssueNftCollectionArgs),
     #[command(name = "create-nft", about = "Issue a NFT")]
     CreateNFT(CreateNFTArgs),
     #[command(
@@ -60,6 +75,8 @@ pub enum InteractCliCommand {
     TransferOwnership(TransferOwnershipArgs),
     #[command(name = "transfer-nft-create-role", about = "Transfers NFT create role")]
     TransferNftCreateRole(TransferNftCreateRoleArgs),
+    #[command(name = "control-changes", about = "Controls changes")]
+    ControlChanges(ControlChangesArgs),
 }
 
 #[derive(Clone, Debug, PartialEq, Eq, Args)]
@@ -115,7 +132,7 @@ pub struct IssueFungibleArgs {
 }
 
 #[derive(Clone, Debug, PartialEq, Eq, Args)]
-pub struct IssueNFTArgs {
+pub struct IssueNftCollectionArgs {
     #[arg(short = 'c', long = "cost", default_value = "50000000000000000")]
     pub cost: RustBigUint,
     #[arg(short = 'd', long = "display-name")]
@@ -193,7 +210,6 @@ pub struct TransferOwnershipArgs {
 }
 
 #[derive(Clone, Debug, PartialEq, Eq, Args)]
-
 pub struct TransferNftCreateRoleArgs {
     #[arg(long = "token-id")]
     pub token_id: String,
@@ -247,7 +263,6 @@ pub struct WipeNFTArgs {
 
 #[derive(Clone, Debug, PartialEq, Eq, Args)]
 pub struct CreateNFTArgs {
-    // token amount name hash royalities attributes uris
     #[arg(long = "token-id")]
     pub token_id: String,
     #[arg(short = 'a', long = "amount")]
@@ -258,8 +273,10 @@ pub struct CreateNFTArgs {
     pub hash: String,
     #[arg(short = 'r', long = "royalities")]
     pub royalties: u64,
-    // #[long = "attributes")]
-    // pub attributes: String,
-    // #[arg(long = "uris")]
-    // pub uris: String,
+}
+
+#[derive(Clone, Debug, PartialEq, Eq, Args)]
+pub struct ControlChangesArgs {
+    #[arg(long = "token-id")]
+    pub token_id: String,
 }

From 48a41f93c7fd2afbe83c0158866d704a26ea01e7 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Tue, 27 Aug 2024 12:56:25 +0300
Subject: [PATCH 1212/1254] unified - whitebox token_merge

---
 .../tests/token_merge_module_whitebox_test.rs | 966 ++++++++----------
 1 file changed, 420 insertions(+), 546 deletions(-)

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 5cc2180d01..51cd7fa6df 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
@@ -1,5 +1,3 @@
-#![allow(deprecated)] // TODO: migrate to unified syntax at some point
-
 use multiversx_sc_scenario::imports::*;
 
 use multiversx_sc_modules::token_merge::{
@@ -7,18 +5,15 @@ use multiversx_sc_modules::token_merge::{
 };
 use use_module::token_merge_mod_impl::{CustomAttributes, TokenMergeModImpl};
 
-const OWNER_ADDRESS_EXPR: &str = "address:owner";
-const USER_ADDRESS_EXPR: &str = "address:user";
+const OWNER_ADDRESS_EXPR: TestAddress = TestAddress::new("owner");
+const USER_ADDRESS_EXPR: TestAddress = TestAddress::new("user");
 
-const USE_MODULE_ADDRESS_EXPR: &str = "sc:use-module";
-const USE_MODULE_PATH_EXPR: &str = "mxsc:output/use-module.mxsc.json";
+const USE_MODULE_ADDRESS_EXPR: TestSCAddress = TestSCAddress::new("use-module");
+const USE_MODULE_PATH_EXPR: MxscPath = MxscPath::new("mxsc:output/use-module.mxsc.json");
 
-const MERGED_TOKEN_ID_EXPR: &str = "str:MERGED-123456";
-const MERGED_TOKEN_ID: &[u8] = b"MERGED-123456";
-const NFT_TOKEN_ID_EXPR: &str = "str:NFT-123456";
-const NFT_TOKEN_ID: &[u8] = b"NFT-123456";
-const FUNGIBLE_TOKEN_ID_EXPR: &str = "str:FUN-123456";
-const FUNGIBLE_TOKEN_ID: &[u8] = b"FUN-123456";
+const MERGED_TOKEN_ID_EXPR: TestTokenIdentifier = TestTokenIdentifier::new("MERGED-123456");
+const NFT_TOKEN_ID_EXPR: TestTokenIdentifier = TestTokenIdentifier::new("NFT-123456");
+const FUNGIBLE_TOKEN_ID_EXPR: TestTokenIdentifier = TestTokenIdentifier::new("FUN-123456");
 
 const NFT_AMOUNT: u64 = 1;
 const FUNGIBLE_AMOUNT: u64 = 100;
@@ -43,561 +38,462 @@ fn world() -> ScenarioWorld {
 fn test_token_merge() {
     let mut world = world();
 
-    let use_module_whitebox =
-        WhiteboxContract::new(USE_MODULE_ADDRESS_EXPR, use_module::contract_obj);
-    let use_module_code = world.code_expression(USE_MODULE_PATH_EXPR);
-
     let roles = vec![
         "ESDTRoleNFTCreate".to_string(),
         "ESDTRoleNFTBurn".to_string(),
     ];
-
-    world.set_state_step(
-        SetStateStep::new()
-            .put_account(OWNER_ADDRESS_EXPR, Account::new().nonce(1))
-            .put_account(
-                USER_ADDRESS_EXPR,
-                Account::new()
-                    .nonce(1)
-                    .esdt_balance(FUNGIBLE_TOKEN_ID_EXPR, FUNGIBLE_AMOUNT)
-                    .esdt_nft_all_properties(
-                        NFT_TOKEN_ID_EXPR,
-                        FIRST_NFT_NONCE,
-                        NFT_AMOUNT,
-                        Some(FIRST_ATTRIBUTES),
-                        FIRST_ROYALTIES,
-                        None::<AddressValue>,
-                        None,
-                        Vec::from(FIRST_URIS),
-                    )
-                    .esdt_nft_all_properties(
-                        NFT_TOKEN_ID_EXPR,
-                        SECOND_NFT_NONCE,
-                        NFT_AMOUNT,
-                        Some(SECOND_ATTRIBUTES),
-                        SECOND_ROYALTIES,
-                        None::<AddressValue>,
-                        None,
-                        Vec::from(SECOND_URIS),
-                    ),
-            )
-            .put_account(
-                USE_MODULE_ADDRESS_EXPR,
-                Account::new()
-                    .nonce(1)
-                    .code(use_module_code)
-                    .owner(OWNER_ADDRESS_EXPR)
-                    .esdt_roles(MERGED_TOKEN_ID_EXPR, roles),
-            ),
-    );
-
-    world.whitebox_call(
-        &use_module_whitebox,
-        ScCallStep::new().from(OWNER_ADDRESS_EXPR),
-        |sc| {
+    let first_uris = FIRST_URIS
+        .iter()
+        .map(|first_uri| managed_buffer!(first_uri))
+        .collect();
+    let second_uris = SECOND_URIS
+        .iter()
+        .map(|second_uri| managed_buffer!(second_uri))
+        .collect();
+
+    world.account(OWNER_ADDRESS_EXPR).nonce(1);
+    world
+        .account(USER_ADDRESS_EXPR)
+        .nonce(1)
+        .esdt_balance(FUNGIBLE_TOKEN_ID_EXPR, FUNGIBLE_AMOUNT)
+        .esdt_nft_all_properties(
+            NFT_TOKEN_ID_EXPR,
+            FIRST_NFT_NONCE,
+            NFT_AMOUNT,
+            managed_buffer!(FIRST_ATTRIBUTES),
+            FIRST_ROYALTIES,
+            None::<Address>,
+            (),
+            first_uris,
+        )
+        .esdt_nft_all_properties(
+            NFT_TOKEN_ID_EXPR,
+            SECOND_NFT_NONCE,
+            NFT_AMOUNT,
+            managed_buffer!(SECOND_ATTRIBUTES),
+            SECOND_ROYALTIES,
+            None::<Address>,
+            (),
+            second_uris,
+        );
+
+    world
+        .account(USE_MODULE_ADDRESS_EXPR)
+        .nonce(1)
+        .code(USE_MODULE_PATH_EXPR)
+        .owner(OWNER_ADDRESS_EXPR)
+        .esdt_roles(MERGED_TOKEN_ID_EXPR, roles);
+
+    world
+        .tx()
+        .from(OWNER_ADDRESS_EXPR)
+        .to(USE_MODULE_ADDRESS_EXPR)
+        .whitebox(use_module::contract_obj, |sc| {
             sc.merged_token()
-                .set_token_id(managed_token_id!(MERGED_TOKEN_ID));
+                .set_token_id(MERGED_TOKEN_ID_EXPR.to_token_identifier());
             let _ = sc
                 .mergeable_tokens_whitelist()
-                .insert(managed_token_id!(NFT_TOKEN_ID));
+                .insert(NFT_TOKEN_ID_EXPR.to_token_identifier());
             let _ = sc
                 .mergeable_tokens_whitelist()
-                .insert(managed_token_id!(FUNGIBLE_TOKEN_ID));
-        },
-    );
+                .insert(FUNGIBLE_TOKEN_ID_EXPR.to_token_identifier());
+        });
 
     // merge two NFTs
     let nft_transfers = vec![
-        TxESDT {
-            esdt_token_identifier: NFT_TOKEN_ID.into(),
-            nonce: FIRST_NFT_NONCE.into(),
-            esdt_value: NFT_AMOUNT.into(),
-        },
-        TxESDT {
-            esdt_token_identifier: NFT_TOKEN_ID.into(),
-            nonce: SECOND_NFT_NONCE.into(),
-            esdt_value: NFT_AMOUNT.into(),
-        },
+        TestEsdtTransfer(NFT_TOKEN_ID_EXPR, FIRST_NFT_NONCE, NFT_AMOUNT),
+        TestEsdtTransfer(NFT_TOKEN_ID_EXPR, SECOND_NFT_NONCE, NFT_AMOUNT),
     ];
 
-    world.whitebox_call(
-        &use_module_whitebox,
-        ScCallStep::new()
-            .from(USER_ADDRESS_EXPR)
-            .multi_esdt_transfer(nft_transfers),
-        |sc| {
+    world
+        .tx()
+        .from(USER_ADDRESS_EXPR)
+        .to(USE_MODULE_ADDRESS_EXPR)
+        .multi_esdt(nft_transfers)
+        .whitebox(use_module::contract_obj, |sc| {
             let merged_token = sc.merge_tokens_endpoint();
             assert_eq!(
                 merged_token.token_identifier,
-                managed_token_id!(MERGED_TOKEN_ID)
+                MERGED_TOKEN_ID_EXPR.to_token_identifier()
             );
             assert_eq!(merged_token.token_nonce, 1);
             assert_eq!(merged_token.amount, managed_biguint!(NFT_AMOUNT));
 
             let merged_token_data = sc.blockchain().get_esdt_token_data(
-                &managed_address!(&address_expr_to_address(USER_ADDRESS_EXPR)),
-                &managed_token_id!(MERGED_TOKEN_ID),
+                &USER_ADDRESS_EXPR.to_managed_address(),
+                &MERGED_TOKEN_ID_EXPR.to_token_identifier(),
                 1,
             );
-            let mut expected_uri = ArrayVec::new();
-            expected_uri.push(EsdtTokenPayment::new(
-                managed_token_id!(NFT_TOKEN_ID),
-                FIRST_NFT_NONCE,
-                managed_biguint!(NFT_AMOUNT),
-            ));
-            expected_uri.push(EsdtTokenPayment::new(
-                managed_token_id!(NFT_TOKEN_ID),
-                SECOND_NFT_NONCE,
-                managed_biguint!(NFT_AMOUNT),
-            ));
+            let expected_uri = [
+                TestEsdtTransfer(NFT_TOKEN_ID_EXPR, FIRST_NFT_NONCE, NFT_AMOUNT),
+                TestEsdtTransfer(NFT_TOKEN_ID_EXPR, SECOND_NFT_NONCE, NFT_AMOUNT),
+            ];
 
             let actual_uri = MergedTokenInstances::decode_from_first_uri(&merged_token_data.uris);
-            assert_eq!(expected_uri, actual_uri.into_instances());
+
+            for (expected, uri) in expected_uri.iter().zip(actual_uri.into_instances()) {
+                let token_identifier_string = uri.token_identifier.to_string();
+                let actual_transfer = TestEsdtTransfer(
+                    TestTokenIdentifier::new(&token_identifier_string),
+                    uri.token_nonce,
+                    uri.amount.to_u64().unwrap(),
+                );
+
+                assert_eq!(expected, &actual_transfer);
+            }
 
             assert_eq!(
                 merged_token_data.royalties,
                 managed_biguint!(SECOND_ROYALTIES)
             );
-        },
-    );
-
-    world.check_state_step(CheckStateStep::new().put_account(
-        USER_ADDRESS_EXPR,
-        CheckAccount::new().esdt_nft_balance_and_attributes(
-            MERGED_TOKEN_ID_EXPR,
-            1,
-            NFT_AMOUNT,
-            Option::<&Empty>::None,
-        ),
-    ));
+        });
+
+    world
+        .check_account(USER_ADDRESS_EXPR)
+        .esdt_nft_balance_and_attributes(MERGED_TOKEN_ID_EXPR, 1, NFT_AMOUNT, &Empty);
 
-    world.check_state_step(CheckStateStep::new().put_account(
-        USE_MODULE_ADDRESS_EXPR,
-        CheckAccount::new().esdt_nft_balance_and_attributes(
+    world
+        .check_account(USE_MODULE_ADDRESS_EXPR)
+        .esdt_nft_balance_and_attributes(
             NFT_TOKEN_ID_EXPR,
             FIRST_NFT_NONCE,
             NFT_AMOUNT,
-            Some(FIRST_ATTRIBUTES),
-        ),
-    ));
+            FIRST_ATTRIBUTES,
+        );
 
-    world.check_state_step(CheckStateStep::new().put_account(
-        USE_MODULE_ADDRESS_EXPR,
-        CheckAccount::new().esdt_nft_balance_and_attributes(
+    world
+        .check_account(USE_MODULE_ADDRESS_EXPR)
+        .esdt_nft_balance_and_attributes(
             NFT_TOKEN_ID_EXPR,
             SECOND_NFT_NONCE,
             NFT_AMOUNT,
-            Some(SECOND_ATTRIBUTES),
-        ),
-    ));
+            SECOND_ATTRIBUTES,
+        );
 
     // split nfts
-    world.whitebox_call(
-        &use_module_whitebox,
-        ScCallStep::new().from(USER_ADDRESS_EXPR).esdt_transfer(
-            MERGED_TOKEN_ID_EXPR,
-            1,
-            NFT_AMOUNT,
-        ),
-        |sc| {
+    world
+        .tx()
+        .from(USER_ADDRESS_EXPR)
+        .to(USE_MODULE_ADDRESS_EXPR)
+        .payment(TestEsdtTransfer(MERGED_TOKEN_ID_EXPR, 1, NFT_AMOUNT))
+        .whitebox(use_module::contract_obj, |sc| {
             let output_tokens = sc.split_tokens_endpoint();
-            let mut expected_output_tokens = ManagedVec::new();
-            expected_output_tokens.push(EsdtTokenPayment::new(
-                managed_token_id!(NFT_TOKEN_ID),
-                FIRST_NFT_NONCE,
-                managed_biguint!(NFT_AMOUNT),
-            ));
-            expected_output_tokens.push(EsdtTokenPayment::new(
-                managed_token_id!(NFT_TOKEN_ID),
-                SECOND_NFT_NONCE,
-                managed_biguint!(NFT_AMOUNT),
-            ));
-            assert_eq!(output_tokens, expected_output_tokens);
-        },
-    );
-
-    world.check_state_step(CheckStateStep::new().put_account(
-        USER_ADDRESS_EXPR,
-        CheckAccount::new().esdt_nft_balance_and_attributes(
+            let expected_output_tokens = vec![
+                TestEsdtTransfer(NFT_TOKEN_ID_EXPR, FIRST_NFT_NONCE, NFT_AMOUNT),
+                TestEsdtTransfer(NFT_TOKEN_ID_EXPR, SECOND_NFT_NONCE, NFT_AMOUNT),
+            ];
+            assert_eq!(output_tokens, expected_output_tokens.into());
+        });
+
+    world
+        .check_account(USER_ADDRESS_EXPR)
+        .esdt_nft_balance_and_attributes(
             NFT_TOKEN_ID_EXPR,
             FIRST_NFT_NONCE,
             NFT_AMOUNT,
-            Some(FIRST_ATTRIBUTES),
-        ),
-    ));
+            FIRST_ATTRIBUTES,
+        );
 
-    world.check_state_step(CheckStateStep::new().put_account(
-        USER_ADDRESS_EXPR,
-        CheckAccount::new().esdt_nft_balance_and_attributes(
+    world
+        .check_account(USER_ADDRESS_EXPR)
+        .esdt_nft_balance_and_attributes(
             NFT_TOKEN_ID_EXPR,
             SECOND_NFT_NONCE,
             NFT_AMOUNT,
-            Some(SECOND_ATTRIBUTES),
-        ),
-    ));
+            SECOND_ATTRIBUTES,
+        );
 
     // merge the NFT with fungible
     let esdt_transfers = vec![
-        TxESDT {
-            esdt_token_identifier: NFT_TOKEN_ID.into(),
-            nonce: FIRST_NFT_NONCE.into(),
-            esdt_value: NFT_AMOUNT.into(),
-        },
-        TxESDT {
-            esdt_token_identifier: FUNGIBLE_TOKEN_ID.into(),
-            nonce: 0u64.into(),
-            esdt_value: FUNGIBLE_AMOUNT.into(),
-        },
+        TestEsdtTransfer(NFT_TOKEN_ID_EXPR, FIRST_NFT_NONCE, NFT_AMOUNT),
+        TestEsdtTransfer(FUNGIBLE_TOKEN_ID_EXPR, 0u64, FUNGIBLE_AMOUNT),
     ];
 
-    world.whitebox_call(
-        &use_module_whitebox,
-        ScCallStep::new()
-            .from(USER_ADDRESS_EXPR)
-            .multi_esdt_transfer(esdt_transfers),
-        |sc| {
+    world
+        .tx()
+        .from(USER_ADDRESS_EXPR)
+        .to(USE_MODULE_ADDRESS_EXPR)
+        .multi_esdt(esdt_transfers)
+        .whitebox(use_module::contract_obj, |sc| {
             let merged_token = sc.merge_tokens_endpoint();
             assert_eq!(
                 merged_token.token_identifier,
-                managed_token_id!(MERGED_TOKEN_ID)
+                MERGED_TOKEN_ID_EXPR.to_token_identifier()
             );
             assert_eq!(merged_token.token_nonce, 2);
             assert_eq!(merged_token.amount, managed_biguint!(NFT_AMOUNT));
 
             let merged_token_data = sc.blockchain().get_esdt_token_data(
-                &managed_address!(&address_expr_to_address(USER_ADDRESS_EXPR)),
-                &managed_token_id!(MERGED_TOKEN_ID),
+                &USER_ADDRESS_EXPR.to_managed_address(),
+                &MERGED_TOKEN_ID_EXPR.to_token_identifier(),
                 2,
             );
-            let mut expected_uri = ArrayVec::new();
-            expected_uri.push(EsdtTokenPayment::new(
-                managed_token_id!(NFT_TOKEN_ID),
-                FIRST_NFT_NONCE,
-                managed_biguint!(NFT_AMOUNT),
-            ));
-            expected_uri.push(EsdtTokenPayment::new(
-                managed_token_id!(FUNGIBLE_TOKEN_ID),
-                0,
-                managed_biguint!(FUNGIBLE_AMOUNT),
-            ));
+            let expected_uri = [
+                TestEsdtTransfer(NFT_TOKEN_ID_EXPR, FIRST_NFT_NONCE, NFT_AMOUNT),
+                TestEsdtTransfer(FUNGIBLE_TOKEN_ID_EXPR, 0, FUNGIBLE_AMOUNT),
+            ];
 
             let actual_uri = MergedTokenInstances::decode_from_first_uri(&merged_token_data.uris);
-            assert_eq!(expected_uri, actual_uri.into_instances());
+            for (expected, uri) in expected_uri.iter().zip(actual_uri.into_instances()) {
+                let token_identifier_string = uri.token_identifier.to_string();
+                let actual_transfer = TestEsdtTransfer(
+                    TestTokenIdentifier::new(&token_identifier_string),
+                    uri.token_nonce,
+                    uri.amount.to_u64().unwrap(),
+                );
+
+                assert_eq!(expected, &actual_transfer);
+            }
 
             assert_eq!(
                 merged_token_data.royalties,
                 managed_biguint!(FIRST_ROYALTIES)
             );
-        },
-    );
-
-    world.check_state_step(CheckStateStep::new().put_account(
-        USER_ADDRESS_EXPR,
-        CheckAccount::new().esdt_nft_balance_and_attributes(
-            MERGED_TOKEN_ID_EXPR,
-            2,
-            NFT_AMOUNT,
-            Option::<&Empty>::None,
-        ),
-    ));
+        });
+
+    world
+        .check_account(USER_ADDRESS_EXPR)
+        .esdt_nft_balance_and_attributes(MERGED_TOKEN_ID_EXPR, 2, NFT_AMOUNT, &Empty);
 
     // merge NFT with an already merged token
     let combined_transfers = vec![
-        TxESDT {
-            esdt_token_identifier: NFT_TOKEN_ID.into(),
-            nonce: SECOND_NFT_NONCE.into(),
-            esdt_value: NFT_AMOUNT.into(),
-        },
-        TxESDT {
-            esdt_token_identifier: MERGED_TOKEN_ID.into(),
-            nonce: 2u64.into(),
-            esdt_value: NFT_AMOUNT.into(),
-        },
+        TestEsdtTransfer(NFT_TOKEN_ID_EXPR, SECOND_NFT_NONCE, NFT_AMOUNT),
+        TestEsdtTransfer(MERGED_TOKEN_ID_EXPR, 2u64, NFT_AMOUNT),
     ];
 
-    world.whitebox_call(
-        &use_module_whitebox,
-        ScCallStep::new()
-            .from(USER_ADDRESS_EXPR)
-            .multi_esdt_transfer(combined_transfers),
-        |sc| {
+    world
+        .tx()
+        .from(USER_ADDRESS_EXPR)
+        .to(USE_MODULE_ADDRESS_EXPR)
+        .multi_esdt(combined_transfers)
+        .whitebox(use_module::contract_obj, |sc| {
             let merged_token = sc.merge_tokens_endpoint();
             assert_eq!(
                 merged_token.token_identifier,
-                managed_token_id!(MERGED_TOKEN_ID)
+                MERGED_TOKEN_ID_EXPR.to_token_identifier()
             );
             assert_eq!(merged_token.token_nonce, 3);
             assert_eq!(merged_token.amount, managed_biguint!(NFT_AMOUNT));
 
             let merged_token_data = sc.blockchain().get_esdt_token_data(
-                &managed_address!(&address_expr_to_address(USER_ADDRESS_EXPR)),
-                &managed_token_id!(MERGED_TOKEN_ID),
+                &USER_ADDRESS_EXPR.to_managed_address(),
+                &MERGED_TOKEN_ID_EXPR.into(),
                 3,
             );
-            let mut expected_uri = ArrayVec::new();
-            expected_uri.push(EsdtTokenPayment::new(
-                managed_token_id!(NFT_TOKEN_ID),
-                FIRST_NFT_NONCE,
-                managed_biguint!(NFT_AMOUNT),
-            ));
-            expected_uri.push(EsdtTokenPayment::new(
-                managed_token_id!(FUNGIBLE_TOKEN_ID),
-                0,
-                managed_biguint!(FUNGIBLE_AMOUNT),
-            ));
-            expected_uri.push(EsdtTokenPayment::new(
-                managed_token_id!(NFT_TOKEN_ID),
-                SECOND_NFT_NONCE,
-                managed_biguint!(NFT_AMOUNT),
-            ));
+            let expected_uri = [
+                TestEsdtTransfer(NFT_TOKEN_ID_EXPR, FIRST_NFT_NONCE, NFT_AMOUNT),
+                TestEsdtTransfer(FUNGIBLE_TOKEN_ID_EXPR, 0, FUNGIBLE_AMOUNT),
+                TestEsdtTransfer(NFT_TOKEN_ID_EXPR, SECOND_NFT_NONCE, NFT_AMOUNT),
+            ];
 
             let actual_uri = MergedTokenInstances::decode_from_first_uri(&merged_token_data.uris);
-            assert_eq!(expected_uri, actual_uri.into_instances());
+            for (expected, uri) in expected_uri.iter().zip(actual_uri.into_instances()) {
+                let token_identifier_string = uri.token_identifier.to_string();
+                let actual_transfer = TestEsdtTransfer(
+                    TestTokenIdentifier::new(&token_identifier_string),
+                    uri.token_nonce,
+                    uri.amount.to_u64().unwrap(),
+                );
+
+                assert_eq!(expected, &actual_transfer);
+            }
 
             assert_eq!(
                 merged_token_data.royalties,
                 managed_biguint!(SECOND_ROYALTIES)
             );
-        },
-    );
-
-    world.check_state_step(CheckStateStep::new().put_account(
-        USER_ADDRESS_EXPR,
-        CheckAccount::new().esdt_nft_balance_and_attributes(
-            MERGED_TOKEN_ID_EXPR,
-            3,
-            NFT_AMOUNT,
-            Option::<&Empty>::None,
-        ),
-    ));
-
-    world.whitebox_call(
-        &use_module_whitebox,
-        ScCallStep::new().from(USER_ADDRESS_EXPR).esdt_transfer(
-            MERGED_TOKEN_ID_EXPR,
-            3,
-            NFT_AMOUNT,
-        ),
-        |sc| {
+        });
+
+    world
+        .check_account(USER_ADDRESS_EXPR)
+        .esdt_nft_balance_and_attributes(MERGED_TOKEN_ID_EXPR, 3, NFT_AMOUNT, &Empty);
+
+    world
+        .tx()
+        .from(USER_ADDRESS_EXPR)
+        .to(USE_MODULE_ADDRESS_EXPR)
+        .payment(TestEsdtTransfer(MERGED_TOKEN_ID_EXPR, 3, NFT_AMOUNT))
+        .whitebox(use_module::contract_obj, |sc| {
             let output_tokens = sc.split_tokens_endpoint();
-            let mut expected_output_tokens = ManagedVec::new();
-            expected_output_tokens.push(EsdtTokenPayment::new(
-                managed_token_id!(NFT_TOKEN_ID),
-                FIRST_NFT_NONCE,
-                managed_biguint!(NFT_AMOUNT),
-            ));
-            expected_output_tokens.push(EsdtTokenPayment::new(
-                managed_token_id!(FUNGIBLE_TOKEN_ID),
-                0,
-                managed_biguint!(FUNGIBLE_AMOUNT),
-            ));
-            expected_output_tokens.push(EsdtTokenPayment::new(
-                managed_token_id!(NFT_TOKEN_ID),
-                SECOND_NFT_NONCE,
-                managed_biguint!(NFT_AMOUNT),
-            ));
-
-            assert_eq!(output_tokens, expected_output_tokens);
-        },
-    );
-
-    world.check_state_step(CheckStateStep::new().put_account(
-        USER_ADDRESS_EXPR,
-        CheckAccount::new().esdt_nft_balance_and_attributes(
+            let expected_output_tokens = vec![
+                TestEsdtTransfer(NFT_TOKEN_ID_EXPR, FIRST_NFT_NONCE, NFT_AMOUNT),
+                TestEsdtTransfer(FUNGIBLE_TOKEN_ID_EXPR, 0, FUNGIBLE_AMOUNT),
+                TestEsdtTransfer(NFT_TOKEN_ID_EXPR, SECOND_NFT_NONCE, NFT_AMOUNT),
+            ];
+
+            assert_eq!(output_tokens, expected_output_tokens.into());
+        });
+
+    world
+        .check_account(USER_ADDRESS_EXPR)
+        .esdt_nft_balance_and_attributes(
             NFT_TOKEN_ID_EXPR,
             FIRST_NFT_NONCE,
             NFT_AMOUNT,
-            Some(FIRST_ATTRIBUTES),
-        ),
-    ));
+            FIRST_ATTRIBUTES,
+        );
 
-    world.check_state_step(CheckStateStep::new().put_account(
-        USER_ADDRESS_EXPR,
-        CheckAccount::new().esdt_nft_balance_and_attributes(
+    world
+        .check_account(USER_ADDRESS_EXPR)
+        .esdt_nft_balance_and_attributes(
             NFT_TOKEN_ID_EXPR,
             SECOND_NFT_NONCE,
             NFT_AMOUNT,
-            Some(SECOND_ATTRIBUTES),
-        ),
-    ));
-
-    world.check_state_step(CheckStateStep::new().put_account(
-        USER_ADDRESS_EXPR,
-        CheckAccount::new().esdt_balance(FUNGIBLE_TOKEN_ID_EXPR, FUNGIBLE_AMOUNT),
-    ));
+            SECOND_ATTRIBUTES,
+        );
+
+    world
+        .check_account(USER_ADDRESS_EXPR)
+        .esdt_balance(FUNGIBLE_TOKEN_ID_EXPR, FUNGIBLE_AMOUNT);
 }
 
 #[test]
 fn test_partial_split() {
     let mut world = world();
 
-    let use_module_whitebox =
-        WhiteboxContract::new(USE_MODULE_ADDRESS_EXPR, use_module::contract_obj);
-    let use_module_code = world.code_expression(USE_MODULE_PATH_EXPR);
-
     let roles = vec![
         "ESDTRoleNFTCreate".to_string(),
         "ESDTRoleNFTBurn".to_string(),
     ];
-
-    world.set_state_step(
-        SetStateStep::new()
-            .put_account(OWNER_ADDRESS_EXPR, Account::new().nonce(1))
-            .put_account(
-                USER_ADDRESS_EXPR,
-                Account::new()
-                    .nonce(1)
-                    .esdt_balance(FUNGIBLE_TOKEN_ID_EXPR, FUNGIBLE_AMOUNT)
-                    .esdt_nft_all_properties(
-                        NFT_TOKEN_ID_EXPR,
-                        FIRST_NFT_NONCE,
-                        NFT_AMOUNT,
-                        Some(FIRST_ATTRIBUTES),
-                        FIRST_ROYALTIES,
-                        None::<AddressValue>,
-                        None,
-                        Vec::from(FIRST_URIS),
-                    )
-                    .esdt_nft_all_properties(
-                        NFT_TOKEN_ID_EXPR,
-                        SECOND_NFT_NONCE,
-                        NFT_AMOUNT,
-                        Some(SECOND_ATTRIBUTES),
-                        SECOND_ROYALTIES,
-                        None::<AddressValue>,
-                        None,
-                        Vec::from(SECOND_URIS),
-                    ),
-            )
-            .put_account(
-                USE_MODULE_ADDRESS_EXPR,
-                Account::new()
-                    .nonce(1)
-                    .code(use_module_code)
-                    .owner(OWNER_ADDRESS_EXPR)
-                    .esdt_roles(MERGED_TOKEN_ID_EXPR, roles),
-            ),
-    );
-
-    world.whitebox_call(
-        &use_module_whitebox,
-        ScCallStep::new().from(OWNER_ADDRESS_EXPR),
-        |sc| {
+    let first_uris = FIRST_URIS
+        .iter()
+        .map(|first_uri| managed_buffer!(first_uri))
+        .collect();
+    let second_uris = SECOND_URIS
+        .iter()
+        .map(|second_uri| managed_buffer!(second_uri))
+        .collect();
+
+    world.account(OWNER_ADDRESS_EXPR).nonce(1);
+    world
+        .account(USER_ADDRESS_EXPR)
+        .nonce(1)
+        .esdt_balance(FUNGIBLE_TOKEN_ID_EXPR, FUNGIBLE_AMOUNT)
+        .esdt_nft_all_properties(
+            NFT_TOKEN_ID_EXPR,
+            FIRST_NFT_NONCE,
+            NFT_AMOUNT,
+            managed_buffer!(FIRST_ATTRIBUTES),
+            FIRST_ROYALTIES,
+            None::<AddressValue>,
+            (),
+            first_uris,
+        )
+        .esdt_nft_all_properties(
+            NFT_TOKEN_ID_EXPR,
+            SECOND_NFT_NONCE,
+            NFT_AMOUNT,
+            managed_buffer!(SECOND_ATTRIBUTES),
+            SECOND_ROYALTIES,
+            None::<AddressValue>,
+            (),
+            second_uris,
+        );
+
+    world
+        .account(USE_MODULE_ADDRESS_EXPR)
+        .nonce(1)
+        .code(USE_MODULE_PATH_EXPR)
+        .owner(OWNER_ADDRESS_EXPR)
+        .esdt_roles(MERGED_TOKEN_ID_EXPR, roles);
+
+    world
+        .tx()
+        .from(OWNER_ADDRESS_EXPR)
+        .to(USE_MODULE_ADDRESS_EXPR)
+        .whitebox(use_module::contract_obj, |sc| {
             sc.merged_token()
-                .set_token_id(managed_token_id!(MERGED_TOKEN_ID));
-            let _ = sc
-                .mergeable_tokens_whitelist()
-                .insert(managed_token_id!(NFT_TOKEN_ID));
-            let _ = sc
-                .mergeable_tokens_whitelist()
-                .insert(managed_token_id!(FUNGIBLE_TOKEN_ID));
-        },
-    );
+                .set_token_id(MERGED_TOKEN_ID_EXPR.to_token_identifier());
+            sc.mergeable_tokens_whitelist()
+                .insert(NFT_TOKEN_ID_EXPR.to_token_identifier());
+            sc.mergeable_tokens_whitelist()
+                .insert(FUNGIBLE_TOKEN_ID_EXPR.to_token_identifier());
+        });
 
     // merge 2 NFTs and a fungible token
     let esdt_transfers = vec![
-        TxESDT {
-            esdt_token_identifier: NFT_TOKEN_ID.into(),
-            nonce: FIRST_NFT_NONCE.into(),
-            esdt_value: NFT_AMOUNT.into(),
-        },
-        TxESDT {
-            esdt_token_identifier: NFT_TOKEN_ID.into(),
-            nonce: SECOND_NFT_NONCE.into(),
-            esdt_value: NFT_AMOUNT.into(),
-        },
-        TxESDT {
-            esdt_token_identifier: FUNGIBLE_TOKEN_ID.into(),
-            nonce: 0u64.into(),
-            esdt_value: FUNGIBLE_AMOUNT.into(),
-        },
+        TestEsdtTransfer(NFT_TOKEN_ID_EXPR, FIRST_NFT_NONCE, NFT_AMOUNT),
+        TestEsdtTransfer(NFT_TOKEN_ID_EXPR, SECOND_NFT_NONCE, NFT_AMOUNT),
+        TestEsdtTransfer(FUNGIBLE_TOKEN_ID_EXPR, 0u64, FUNGIBLE_AMOUNT),
     ];
 
-    world.whitebox_call(
-        &use_module_whitebox,
-        ScCallStep::new()
-            .from(USER_ADDRESS_EXPR)
-            .multi_esdt_transfer(esdt_transfers),
-        |sc| {
+    world
+        .tx()
+        .from(USER_ADDRESS_EXPR)
+        .to(USE_MODULE_ADDRESS_EXPR)
+        .multi_esdt(esdt_transfers)
+        .whitebox(use_module::contract_obj, |sc| {
             let merged_token = sc.merge_tokens_endpoint();
             assert_eq!(
                 merged_token.token_identifier,
-                managed_token_id!(MERGED_TOKEN_ID)
+                MERGED_TOKEN_ID_EXPR.to_token_identifier()
             );
             assert_eq!(merged_token.token_nonce, 1);
             assert_eq!(merged_token.amount, managed_biguint!(NFT_AMOUNT));
 
             let merged_token_data = sc.blockchain().get_esdt_token_data(
-                &managed_address!(&address_expr_to_address(USER_ADDRESS_EXPR)),
-                &managed_token_id!(MERGED_TOKEN_ID),
+                &USER_ADDRESS_EXPR.to_managed_address(),
+                &MERGED_TOKEN_ID_EXPR.to_token_identifier(),
                 1,
             );
-            let mut expected_uri = ArrayVec::new();
-            expected_uri.push(EsdtTokenPayment::new(
-                managed_token_id!(NFT_TOKEN_ID),
-                FIRST_NFT_NONCE,
-                managed_biguint!(NFT_AMOUNT),
-            ));
-            expected_uri.push(EsdtTokenPayment::new(
-                managed_token_id!(NFT_TOKEN_ID),
-                SECOND_NFT_NONCE,
-                managed_biguint!(NFT_AMOUNT),
-            ));
-            expected_uri.push(EsdtTokenPayment::new(
-                managed_token_id!(FUNGIBLE_TOKEN_ID),
-                0,
-                managed_biguint!(FUNGIBLE_AMOUNT),
-            ));
+            let expected_uri = [
+                TestEsdtTransfer(NFT_TOKEN_ID_EXPR, FIRST_NFT_NONCE, NFT_AMOUNT),
+                TestEsdtTransfer(NFT_TOKEN_ID_EXPR, SECOND_NFT_NONCE, NFT_AMOUNT),
+                TestEsdtTransfer(FUNGIBLE_TOKEN_ID_EXPR, 0, FUNGIBLE_AMOUNT),
+            ];
 
             let actual_uri = MergedTokenInstances::decode_from_first_uri(&merged_token_data.uris);
-            assert_eq!(expected_uri, actual_uri.into_instances());
-        },
-    );
+            for (expected, uri) in expected_uri.iter().zip(actual_uri.into_instances()) {
+                let token_identifier_string = uri.token_identifier.to_string();
+                let actual_transfer = TestEsdtTransfer(
+                    TestTokenIdentifier::new(&token_identifier_string),
+                    uri.token_nonce,
+                    uri.amount.to_u64().unwrap(),
+                );
+
+                assert_eq!(expected, &actual_transfer);
+            }
+        });
 
     // split part of the fungible token
-    world.whitebox_call(
-        &use_module_whitebox,
-        ScCallStep::new().from(USER_ADDRESS_EXPR).esdt_transfer(
-            MERGED_TOKEN_ID_EXPR,
-            1,
-            NFT_AMOUNT,
-        ),
-        |sc| {
+    world
+        .tx()
+        .from(USER_ADDRESS_EXPR)
+        .to(USE_MODULE_ADDRESS_EXPR)
+        .payment(TestEsdtTransfer(MERGED_TOKEN_ID_EXPR, 1, NFT_AMOUNT))
+        .whitebox(use_module::contract_obj, |sc| {
             let mut tokens_to_remove = ManagedVec::new();
             tokens_to_remove.push(EsdtTokenPayment::new(
-                managed_token_id!(FUNGIBLE_TOKEN_ID),
+                FUNGIBLE_TOKEN_ID_EXPR.to_token_identifier(),
                 0,
                 managed_biguint!(40),
             ));
-            let output_payments = sc.split_token_partial_endpoint(tokens_to_remove);
 
+            let output_payments = sc.split_token_partial_endpoint(tokens_to_remove);
             let mut expected_output_payments = ManagedVec::new();
             expected_output_payments.push(EsdtTokenPayment::new(
-                managed_token_id!(FUNGIBLE_TOKEN_ID),
+                FUNGIBLE_TOKEN_ID_EXPR.to_token_identifier(),
                 0,
                 managed_biguint!(40),
             ));
             expected_output_payments.push(EsdtTokenPayment::new(
-                managed_token_id!(MERGED_TOKEN_ID),
+                MERGED_TOKEN_ID_EXPR.to_token_identifier(),
                 2,
                 managed_biguint!(NFT_AMOUNT),
             ));
             assert_eq!(output_payments, expected_output_payments);
-        },
-    );
+        });
 
     // fully remove instance
-    world.whitebox_call(
-        &use_module_whitebox,
-        ScCallStep::new().from(USER_ADDRESS_EXPR).esdt_transfer(
-            MERGED_TOKEN_ID_EXPR,
-            2,
-            NFT_AMOUNT,
-        ),
-        |sc| {
+    world
+        .tx()
+        .from(USER_ADDRESS_EXPR)
+        .to(USE_MODULE_ADDRESS_EXPR)
+        .payment(TestEsdtTransfer(MERGED_TOKEN_ID_EXPR, 2, NFT_AMOUNT))
+        .whitebox(use_module::contract_obj, |sc| {
             let mut tokens_to_remove = ManagedVec::new();
             tokens_to_remove.push(EsdtTokenPayment::new(
-                managed_token_id!(NFT_TOKEN_ID),
+                NFT_TOKEN_ID_EXPR.to_token_identifier(),
                 FIRST_NFT_NONCE,
                 managed_biguint!(NFT_AMOUNT),
             ));
@@ -605,12 +501,12 @@ fn test_partial_split() {
 
             let mut expected_output_payments = ManagedVec::new();
             expected_output_payments.push(EsdtTokenPayment::new(
-                managed_token_id!(NFT_TOKEN_ID),
+                NFT_TOKEN_ID_EXPR.to_token_identifier(),
                 FIRST_NFT_NONCE,
                 managed_biguint!(NFT_AMOUNT),
             ));
             expected_output_payments.push(EsdtTokenPayment::new(
-                managed_token_id!(MERGED_TOKEN_ID),
+                MERGED_TOKEN_ID_EXPR.to_token_identifier(),
                 3,
                 managed_biguint!(NFT_AMOUNT),
             ));
@@ -618,112 +514,102 @@ fn test_partial_split() {
 
             // check newest token attributes
             let merged_token_data = sc.blockchain().get_esdt_token_data(
-                &managed_address!(&address_expr_to_address(USER_ADDRESS_EXPR)),
-                &managed_token_id!(MERGED_TOKEN_ID),
+                &USER_ADDRESS_EXPR.to_managed_address(),
+                &MERGED_TOKEN_ID_EXPR.to_token_identifier(),
                 3,
             );
-            let mut expected_uri = ArrayVec::new();
-            expected_uri.push(EsdtTokenPayment::new(
-                managed_token_id!(NFT_TOKEN_ID),
-                SECOND_NFT_NONCE,
-                managed_biguint!(NFT_AMOUNT),
-            ));
-            expected_uri.push(EsdtTokenPayment::new(
-                managed_token_id!(FUNGIBLE_TOKEN_ID),
-                0,
-                managed_biguint!(FUNGIBLE_AMOUNT - 40),
-            ));
+            let expected_uri = [
+                TestEsdtTransfer(NFT_TOKEN_ID_EXPR, SECOND_NFT_NONCE, NFT_AMOUNT),
+                TestEsdtTransfer(FUNGIBLE_TOKEN_ID_EXPR, 0, FUNGIBLE_AMOUNT - 40),
+            ];
 
             let actual_uri = MergedTokenInstances::decode_from_first_uri(&merged_token_data.uris);
-            assert_eq!(expected_uri, actual_uri.into_instances());
+            for (expected, uri) in expected_uri.iter().zip(actual_uri.into_instances()) {
+                let token_identifier_string = uri.token_identifier.to_string();
+                let actual_transfer = TestEsdtTransfer(
+                    TestTokenIdentifier::new(&token_identifier_string),
+                    uri.token_nonce,
+                    uri.amount.to_u64().unwrap(),
+                );
+
+                assert_eq!(expected, &actual_transfer);
+            }
 
             assert_eq!(
                 merged_token_data.royalties,
                 managed_biguint!(SECOND_ROYALTIES)
             );
-        },
-    );
+        });
 }
 
 #[test]
 fn test_custom_attributes() {
     let mut world = world();
 
-    let use_module_whitebox =
-        WhiteboxContract::new(USE_MODULE_ADDRESS_EXPR, use_module::contract_obj);
-    let use_module_code = world.code_expression(USE_MODULE_PATH_EXPR);
-
     let roles = vec![
         "ESDTRoleNFTCreate".to_string(),
         "ESDTRoleNFTBurn".to_string(),
     ];
 
-    world.set_state_step(
-        SetStateStep::new()
-            .put_account(OWNER_ADDRESS_EXPR, Account::new().nonce(1))
-            .put_account(
-                USER_ADDRESS_EXPR,
-                Account::new()
-                    .nonce(1)
-                    .esdt_balance(FUNGIBLE_TOKEN_ID_EXPR, FUNGIBLE_AMOUNT)
-                    .esdt_nft_all_properties(
-                        NFT_TOKEN_ID_EXPR,
-                        FIRST_NFT_NONCE,
-                        NFT_AMOUNT,
-                        Some(FIRST_ATTRIBUTES),
-                        FIRST_ROYALTIES,
-                        None::<AddressValue>,
-                        None,
-                        Vec::from(FIRST_URIS),
-                    )
-                    .esdt_nft_all_properties(
-                        NFT_TOKEN_ID_EXPR,
-                        SECOND_NFT_NONCE,
-                        NFT_AMOUNT,
-                        Some(SECOND_ATTRIBUTES),
-                        SECOND_ROYALTIES,
-                        None::<AddressValue>,
-                        None,
-                        Vec::from(SECOND_URIS),
-                    ),
-            )
-            .put_account(
-                USE_MODULE_ADDRESS_EXPR,
-                Account::new()
-                    .nonce(1)
-                    .code(use_module_code)
-                    .owner(OWNER_ADDRESS_EXPR)
-                    .esdt_roles(MERGED_TOKEN_ID_EXPR, roles),
-            ),
-    );
-
-    world.whitebox_call(
-        &use_module_whitebox,
-        ScCallStep::new().from(OWNER_ADDRESS_EXPR),
-        |sc| {
+    let first_uris = FIRST_URIS
+        .iter()
+        .map(|first_uri| managed_buffer!(first_uri))
+        .collect();
+    let second_uris = SECOND_URIS
+        .iter()
+        .map(|second_uri| managed_buffer!(second_uri))
+        .collect();
+    world.account(OWNER_ADDRESS_EXPR).nonce(1);
+    world
+        .account(USER_ADDRESS_EXPR)
+        .nonce(1)
+        .esdt_balance(FUNGIBLE_TOKEN_ID_EXPR, FUNGIBLE_AMOUNT)
+        .esdt_nft_all_properties(
+            NFT_TOKEN_ID_EXPR,
+            FIRST_NFT_NONCE,
+            NFT_AMOUNT,
+            managed_buffer!(FIRST_ATTRIBUTES),
+            FIRST_ROYALTIES,
+            None::<AddressValue>,
+            (),
+            first_uris,
+        )
+        .esdt_nft_all_properties(
+            NFT_TOKEN_ID_EXPR,
+            SECOND_NFT_NONCE,
+            NFT_AMOUNT,
+            managed_buffer!(SECOND_ATTRIBUTES),
+            SECOND_ROYALTIES,
+            None::<AddressValue>,
+            (),
+            second_uris,
+        );
+    world
+        .account(USE_MODULE_ADDRESS_EXPR)
+        .nonce(1)
+        .code(USE_MODULE_PATH_EXPR)
+        .owner(OWNER_ADDRESS_EXPR)
+        .esdt_roles(MERGED_TOKEN_ID_EXPR, roles);
+
+    world
+        .tx()
+        .from(OWNER_ADDRESS_EXPR)
+        .to(USE_MODULE_ADDRESS_EXPR)
+        .whitebox(use_module::contract_obj, |sc| {
             sc.merged_token()
-                .set_token_id(managed_token_id!(MERGED_TOKEN_ID));
+                .set_token_id(MERGED_TOKEN_ID_EXPR.to_token_identifier());
             let _ = sc
                 .mergeable_tokens_whitelist()
-                .insert(managed_token_id!(NFT_TOKEN_ID));
+                .insert(NFT_TOKEN_ID_EXPR.to_token_identifier());
             let _ = sc
                 .mergeable_tokens_whitelist()
-                .insert(managed_token_id!(FUNGIBLE_TOKEN_ID));
-        },
-    );
+                .insert(FUNGIBLE_TOKEN_ID_EXPR.to_token_identifier());
+        });
 
     // merge two NFTs
     let nft_transfers = vec![
-        TxESDT {
-            esdt_token_identifier: NFT_TOKEN_ID.into(),
-            nonce: FIRST_NFT_NONCE.into(),
-            esdt_value: NFT_AMOUNT.into(),
-        },
-        TxESDT {
-            esdt_token_identifier: NFT_TOKEN_ID.into(),
-            nonce: SECOND_NFT_NONCE.into(),
-            esdt_value: NFT_AMOUNT.into(),
-        },
+        TestEsdtTransfer(NFT_TOKEN_ID_EXPR, FIRST_NFT_NONCE, NFT_AMOUNT),
+        TestEsdtTransfer(NFT_TOKEN_ID_EXPR, SECOND_NFT_NONCE, NFT_AMOUNT),
     ];
 
     let expected_attributes = CustomAttributes {
@@ -731,39 +617,41 @@ fn test_custom_attributes() {
         second: 10u64,
     };
 
-    world.whitebox_call(
-        &use_module_whitebox,
-        ScCallStep::new()
-            .from(USER_ADDRESS_EXPR)
-            .multi_esdt_transfer(nft_transfers),
-        |sc| {
+    world
+        .tx()
+        .from(USER_ADDRESS_EXPR)
+        .to(USE_MODULE_ADDRESS_EXPR)
+        .multi_esdt(nft_transfers)
+        .whitebox(use_module::contract_obj, |sc| {
             let merged_token = sc.merge_tokens_custom_attributes_endpoint();
             assert_eq!(
                 merged_token.token_identifier,
-                managed_token_id!(MERGED_TOKEN_ID)
+                MERGED_TOKEN_ID_EXPR.to_token_identifier()
             );
             assert_eq!(merged_token.token_nonce, 1);
             assert_eq!(merged_token.amount, managed_biguint!(NFT_AMOUNT));
 
             let merged_token_data = sc.blockchain().get_esdt_token_data(
-                &managed_address!(&address_expr_to_address(USER_ADDRESS_EXPR)),
-                &managed_token_id!(MERGED_TOKEN_ID),
+                &USER_ADDRESS_EXPR.to_managed_address(),
+                &MERGED_TOKEN_ID_EXPR.to_token_identifier(),
                 1,
             );
-            let mut expected_uri = ArrayVec::new();
-            expected_uri.push(EsdtTokenPayment::new(
-                managed_token_id!(NFT_TOKEN_ID),
-                FIRST_NFT_NONCE,
-                managed_biguint!(NFT_AMOUNT),
-            ));
-            expected_uri.push(EsdtTokenPayment::new(
-                managed_token_id!(NFT_TOKEN_ID),
-                SECOND_NFT_NONCE,
-                managed_biguint!(NFT_AMOUNT),
-            ));
+            let expected_uri = [
+                TestEsdtTransfer(NFT_TOKEN_ID_EXPR, FIRST_NFT_NONCE, NFT_AMOUNT),
+                TestEsdtTransfer(NFT_TOKEN_ID_EXPR, SECOND_NFT_NONCE, NFT_AMOUNT),
+            ];
 
             let actual_uri = MergedTokenInstances::decode_from_first_uri(&merged_token_data.uris);
-            assert_eq!(expected_uri, actual_uri.into_instances());
+            for (expected, uri) in expected_uri.iter().zip(actual_uri.into_instances()) {
+                let token_identifier_string = uri.token_identifier.to_string();
+                let actual_transfer = TestEsdtTransfer(
+                    TestTokenIdentifier::new(&token_identifier_string),
+                    uri.token_nonce,
+                    uri.amount.to_u64().unwrap(),
+                );
+
+                assert_eq!(expected, &actual_transfer);
+            }
 
             let actual_attributes: CustomAttributes = merged_token_data.decode_attributes();
             assert_eq!(expected_attributes, actual_attributes);
@@ -772,40 +660,26 @@ fn test_custom_attributes() {
                 merged_token_data.royalties,
                 managed_biguint!(SECOND_ROYALTIES)
             );
-        },
-    );
-
-    world.check_state_step(CheckStateStep::new().put_account(
-        USER_ADDRESS_EXPR,
-        CheckAccount::new().esdt_nft_balance_and_attributes(
-            MERGED_TOKEN_ID_EXPR,
-            1,
-            NFT_AMOUNT,
-            Some(top_encode_to_vec_u8_or_panic(&expected_attributes)),
-        ),
-    ));
+        });
+
+    world
+        .check_account(USER_ADDRESS_EXPR)
+        .esdt_nft_balance_and_attributes(MERGED_TOKEN_ID_EXPR, 1, NFT_AMOUNT, expected_attributes);
 
-    world.check_state_step(CheckStateStep::new().put_account(
-        USE_MODULE_ADDRESS_EXPR,
-        CheckAccount::new().esdt_nft_balance_and_attributes(
+    world
+        .check_account(USE_MODULE_ADDRESS_EXPR)
+        .esdt_nft_balance_and_attributes(
             NFT_TOKEN_ID_EXPR,
             FIRST_NFT_NONCE,
             NFT_AMOUNT,
-            Some(FIRST_ATTRIBUTES),
-        ),
-    ));
-
-    world.check_state_step(CheckStateStep::new().put_account(
-        USE_MODULE_ADDRESS_EXPR,
-        CheckAccount::new().esdt_nft_balance_and_attributes(
+            FIRST_ATTRIBUTES,
+        );
+    world
+        .check_account(USE_MODULE_ADDRESS_EXPR)
+        .esdt_nft_balance_and_attributes(
             NFT_TOKEN_ID_EXPR,
             SECOND_NFT_NONCE,
             NFT_AMOUNT,
-            Some(SECOND_ATTRIBUTES),
-        ),
-    ));
-}
-
-fn address_expr_to_address(address_expr: &str) -> Address {
-    AddressValue::from(address_expr).to_address()
+            SECOND_ATTRIBUTES,
+        );
 }

From e2daf814025e18ddb82d47e4eed652caf98111b8 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Tue, 27 Aug 2024 15:06:47 +0300
Subject: [PATCH 1213/1254] verify_bls_aggregated_signature test fix

---
 ..._verify_bls_aggregated_signature.scen.json | 37 ++++++++++++-------
 .../basic-features/src/crypto_features.rs     |  2 +-
 .../contract_base/wrappers/crypto_wrapper.rs  |  4 +-
 3 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/contracts/feature-tests/basic-features/scenarios/crypto_verify_bls_aggregated_signature.scen.json b/contracts/feature-tests/basic-features/scenarios/crypto_verify_bls_aggregated_signature.scen.json
index 46617194c5..d8e46f2389 100644
--- a/contracts/feature-tests/basic-features/scenarios/crypto_verify_bls_aggregated_signature.scen.json
+++ b/contracts/feature-tests/basic-features/scenarios/crypto_verify_bls_aggregated_signature.scen.json
@@ -19,22 +19,28 @@
         },
         {
             "step": "scCall",
-            "id": "1",
+            "id": "bls multi - ok",
             "tx": {
                 "from": "address:an_account",
                 "to": "sc:basic-features-crypto",
                 "function": "verify_bls_aggregated_signature",
                 "arguments": [
-                    "0x9cfb3532e21737e8f9eec99b04f000b27ec277d2477d881273ea07d3af96dc3e153878ed002bcd10e8320242caab49024b8c934b437b17e743b9706757f0e7b2e9fb28295d7f82af8875e0776ae8918c25206519b3f73dcbbd53cafeb5cec716",
-                    "0x6d65737361676530",
-                    "0x84737000b07fbce9b649449f9de6aae76347f5bb5eefcd017f53e874601ccf5f96c9b4ca5f85ea5f6ef6243c38c9ab99"
+                    [
+                        "nested:0x95f1d96b582f35294eb7dd4589b158e108e1d94cd0dd71ef16140e9b37126ec52dac6f57397f1e041acd7bb77df1d214f9f894e3b7fbf7abeaabc9fab8ff5c2ef05f9841322f301fdb900ac59479c334ac76a2d4ff992cd49bc9b530c25ee293",
+                        "nested:0x97aa2862418eb4ea74fddcb511eef9b771e07ff901e7e6abb35847a4bb81e58f189fc9bce4186c6129014fb43002300e959702ef4b9d0c32ebe4d795457095d65b5414efb36edbb8dc66d84a445a92472d4a31cedd4700d5ebb885eb11d3430b",
+                        "nested:0x37b73265936a2aaafe652a4dd451a1851c2dbbb32208604787479b31033e2a354615562ea2a5488f9134843362477a139050a0e798dd5ce0f01b35b8d473454ae99633aadde9237f84c87eb366144cca4de3d2cc6acc35e522a3294bf1186800",
+                        "nested:0xf46c10d114dcd3019dd4bcd4152fda678c56144eb177c67a6411213b86e206e4e56a9aad1eab0313b13031fda046d715ec4a02612b083dfae0d82a23b643e1a89756c0df3d65c27e87a9c1289628d1a8404f0668a3d87c7451ba1c78fc452693",
+                        "nested:0xaa0a97917df9240c537c89e873d7baa5ce1796e8fedfb23cf682b80fa19b8baae35af3754f9b8149985cb2a1fbda0f02c2942d2c99d9af556c9a5e90b8170e6a96379a45dd69351abfb814a16b5665abb7ddb8b096ee9f273de81845cda9728a"
+                    ],
+                    "str:message0",
+                    "0xae12858363e8caa5b398d3febdd7bc01bc2fae1fef8f486ff4d84a5f3342f2d38085904eb10b73c0879a45d23585ce8f"
                 ],
                 "gasLimit": "50,000,000",
                 "gasPrice": "0"
             },
             "expect": {
                 "out": [
-                    "0x01"
+                    "true"
                 ],
                 "status": "",
                 "logs": "*",
@@ -44,24 +50,29 @@
         },
         {
             "step": "scCall",
-            "id": "2",
+            "id": "bls multi - fail",
             "tx": {
                 "from": "address:an_account",
                 "to": "sc:basic-features-crypto",
                 "function": "verify_bls_aggregated_signature",
                 "arguments": [
-                    "0x9cfb3532e21737e8f9eec99b04f000b27ec277d2477d881273ea07d3af96dc3e153878ed002bcd10e8320242caab49024b8c934b437b17e743b9706757f0e7b2e9fb28295d7f82af8875e0776ae8918c25206519b3f73dcbbd53cafeb5cec716",
-                    "0x6d657373616765323133",
-                    "0x84737000b07fbce9b649449f9de6aae76347f5bb5eefcd017f53e874601ccf5f96c9b4ca5f85ea5f6ef6243c38c9ab99"
+                    [
+                        "nested:0x95f1d96b582f35294eb7dd4589b158e108e1d94cd0dd71ef16140e9b37126ec52dac6f57397f1e041acd7bb77df1d214f9f894e3b7fbf7abeaabc9fab8ff5c2ef05f9841322f301fdb900ac59479c334ac76a2d4ff992cd49bc9b530c25ee293",
+                        "nested:0x97aa2862418eb4ea74fddcb511eef9b771e07ff901e7e6abb35847a4bb81e58f189fc9bce4186c6129014fb43002300e959702ef4b9d0c32ebe4d795457095d65b5414efb36edbb8dc66d84a445a92472d4a31cedd4700d5ebb885eb11d3430b",
+                        "nested:0x37b73265936a2aaafe652a4dd451a1851c2dbbb32208604787479b31033e2a354615562ea2a5488f9134843362477a139050a0e798dd5ce0f01b35b8d473454ae99633aadde9237f84c87eb366144cca4de3d2cc6acc35e522a3294bf1186800",
+                        "nested:0xf46c10d114dcd3019dd4bcd4152fda678c56144eb177c67a6411213b86e206e4e56a9aad1eab0313b13031fda046d715ec4a02612b083dfae0d82a23b643e1a89756c0df3d65c27e87a9c1289628d1a8404f0668a3d87c7451ba1c78fc452693",
+                        "nested:0xaa0a97917df9240c537c89e873d7baa5ce1796e8fedfb23cf682b80fa19b8baae35af3754f9b8149985cb2a1fbda0f02c2942d2c99d9af556c9a5e90b8170e6a96379a45dd69351abfb814a16b5665abb7ddb8b096ee9f273de81845cda9728a"
+                    ],
+                    "str:message0",
+                    "0x0012858363e8caa5b398d3febdd7bc01bc2fae1fef8f486ff4d84a5f3342f2d38085904eb10b73c0879a45d23585ce8f"
                 ],
                 "gasLimit": "50,000,000",
                 "gasPrice": "0"
             },
             "expect": {
-                "out": [
-                    "0x00"
-                ],
-                "status": "",
+                "out": [],
+                "status": "10",
+                "message": "str:err blsSignatureDeserialize 0012858363e8caa5b398d3febdd7bc01bc2fae1fef8f486ff4d84a5f3342f2d38085904eb10b73c0879a45d23585ce8f",
                 "logs": "*",
                 "gas": "*",
                 "refund": "*"
diff --git a/contracts/feature-tests/basic-features/src/crypto_features.rs b/contracts/feature-tests/basic-features/src/crypto_features.rs
index 4a9c7dbb6f..8da0c83984 100644
--- a/contracts/feature-tests/basic-features/src/crypto_features.rs
+++ b/contracts/feature-tests/basic-features/src/crypto_features.rs
@@ -92,7 +92,7 @@ pub trait CryptoFeatures {
     #[label("crypto-ei-1.4")]
     fn verify_bls_aggregated_signature(
         &self,
-        key: ManagedBuffer,
+        key: ManagedVec<ManagedBuffer>,
         message: ManagedBuffer,
         signature: ManagedBuffer,
     ) -> bool {
diff --git a/framework/base/src/contract_base/wrappers/crypto_wrapper.rs b/framework/base/src/contract_base/wrappers/crypto_wrapper.rs
index 76b8fcd996..eb98f93a56 100644
--- a/framework/base/src/contract_base/wrappers/crypto_wrapper.rs
+++ b/framework/base/src/contract_base/wrappers/crypto_wrapper.rs
@@ -5,7 +5,7 @@ use crate::{
         use_raw_handle, CryptoApi, CryptoApiImpl, StaticVarApiImpl, KECCAK256_RESULT_LEN,
         SHA256_RESULT_LEN,
     },
-    types::{ManagedBuffer, ManagedByteArray, ManagedType, MessageHashType},
+    types::{ManagedBuffer, ManagedByteArray, ManagedType, ManagedVec, MessageHashType},
 };
 
 #[derive(Default)]
@@ -158,7 +158,7 @@ where
 
     pub fn verify_bls_aggregated_signature(
         &self,
-        key: &ManagedBuffer<A>,
+        key: &ManagedVec<A, ManagedBuffer<A>>,
         message: &ManagedBuffer<A>,
         signature: &ManagedBuffer<A>,
     ) -> bool {

From 29c5bec8ecacf5e7240ee4c0910ac5659f1345d7 Mon Sep 17 00:00:00 2001
From: Andrei Vasilescu <vasilescuandrei24@gmail.com>
Date: Tue, 27 Aug 2024 18:28:58 +0300
Subject: [PATCH 1214/1254] fixed ReturnsNewTokenIdentifier + sugestive prints
 in interactor functions

---
 framework/snippets/src/network_response.rs    | 23 ++++---
 .../interact/src/basic_interact.rs            | 66 ++++++++++++++-----
 .../interact/src/basic_interact_cli.rs        |  8 +--
 3 files changed, 68 insertions(+), 29 deletions(-)

diff --git a/framework/snippets/src/network_response.rs b/framework/snippets/src/network_response.rs
index d505e7a525..4d828e12c7 100644
--- a/framework/snippets/src/network_response.rs
+++ b/framework/snippets/src/network_response.rs
@@ -103,25 +103,31 @@ fn process_new_deployed_address(tx: &TransactionOnNetwork) -> Option<Address> {
 }
 
 fn process_new_issued_token_identifier(tx: &TransactionOnNetwork) -> Option<String> {
+    let original_tx_data = String::from_utf8(base64_decode(tx.data.as_ref().unwrap())).unwrap();
+
     for scr in tx.smart_contract_results.iter() {
         if scr.sender.to_bech32_string().unwrap() != ESDTSystemSCAddress.to_bech32_string() {
             continue;
         }
 
-        let Some(prev_tx) = tx
+        let prev_tx_data: &str = if let Some(prev_tx) = tx
             .smart_contract_results
             .iter()
             .find(|e| e.hash == scr.prev_tx_hash)
-        else {
+        {
+            prev_tx.data.as_ref()
+        } else if &scr.prev_tx_hash == tx.hash.as_ref().unwrap() {
+            &original_tx_data
+        } else {
             continue;
         };
 
-        let is_issue_fungible = prev_tx.data.starts_with("issue@");
-        let is_issue_semi_fungible = prev_tx.data.starts_with("issueSemiFungible@");
-        let is_issue_non_fungible = prev_tx.data.starts_with("issueNonFungible@");
-        let is_register_meta_esdt = prev_tx.data.starts_with("registerMetaESDT@");
+        let is_issue_fungible = prev_tx_data.starts_with("issue@");
+        let is_issue_semi_fungible = prev_tx_data.starts_with("issueSemiFungible@");
+        let is_issue_non_fungible = prev_tx_data.starts_with("issueNonFungible@");
+        let is_register_meta_esdt = prev_tx_data.starts_with("registerMetaESDT@");
         let is_register_and_set_all_roles_esdt =
-            prev_tx.data.starts_with("registerAndSetAllRoles@");
+            prev_tx_data.starts_with("registerAndSetAllRoles@");
 
         if !is_issue_fungible
             && !is_issue_semi_fungible
@@ -135,12 +141,11 @@ fn process_new_issued_token_identifier(tx: &TransactionOnNetwork) -> Option<Stri
         if scr.data.starts_with("ESDTTransfer@") {
             let encoded_tid = scr.data.split('@').nth(1);
             return Some(String::from_utf8(hex::decode(encoded_tid?).unwrap()).unwrap());
-        } else if scr.data.starts_with("@00@") {
+        } else if scr.data.starts_with("@00@") || scr.data.starts_with("@6f6b@") {
             let encoded_tid = scr.data.split('@').nth(2);
             return Some(String::from_utf8(hex::decode(encoded_tid?).unwrap()).unwrap());
         }
     }
-
     None
 }
 
diff --git a/tools/interactor-system-func-calls/sys-func-calls/interact/src/basic_interact.rs b/tools/interactor-system-func-calls/sys-func-calls/interact/src/basic_interact.rs
index 05c26126ff..b7cbb4ee3e 100644
--- a/tools/interactor-system-func-calls/sys-func-calls/interact/src/basic_interact.rs
+++ b/tools/interactor-system-func-calls/sys-func-calls/interact/src/basic_interact.rs
@@ -35,7 +35,7 @@ async fn main() {
         },
         Some(basic_interact_cli::InteractCliCommand::SetRoles(args)) => {
             basic_interact
-                .set_role(&args.token_id, args.roles.clone())
+                .set_roles(&args.token_id, args.roles.clone())
                 .await;
         },
         Some(basic_interact_cli::InteractCliCommand::Burn(args)) => {
@@ -97,7 +97,7 @@ async fn main() {
         },
         Some(basic_interact_cli::InteractCliCommand::IssueFungible(args)) => {
             basic_interact
-                ._issue_fungible_token(
+                .issue_fungible_token(
                     args.cost.clone(),
                     &args.display_name,
                     &args.ticker,
@@ -106,9 +106,9 @@ async fn main() {
                 )
                 .await;
         },
-        Some(basic_interact_cli::InteractCliCommand::IssueSft(args)) => {
+        Some(basic_interact_cli::InteractCliCommand::IssueSftCollection(args)) => {
             basic_interact
-                .issue_semi_fungible_token(args.cost.clone(), &args.display_name, &args.ticker)
+                .issue_semi_fungible_collection(args.cost.clone(), &args.display_name, &args.ticker)
                 .await;
         },
         Some(basic_interact_cli::InteractCliCommand::MintSft(args)) => {
@@ -181,7 +181,7 @@ impl SysFuncCallsInteract {
         }
     }
 
-    async fn _issue_fungible_token(
+    async fn issue_fungible_token(
         &mut self,
         issue_cost: RustBigUint,
         token_display_name: &str,
@@ -189,7 +189,9 @@ impl SysFuncCallsInteract {
         initial_supply: RustBigUint,
         num_decimals: usize,
     ) {
-        self.interactor
+        println!("Issuing fungible token...");
+        let res = self
+            .interactor
             .tx()
             .from(&self.wallet_address)
             .to(ESDTSystemSCAddress.to_managed_address())
@@ -212,9 +214,12 @@ impl SysFuncCallsInteract {
                     can_add_special_roles: true,
                 },
             )
+            .returns(ReturnsNewTokenIdentifier)
             .prepare_async()
             .run()
             .await;
+
+        println!("TOKEN ID: {:?}", res);
     }
 
     async fn issue_non_fungible_collection(
@@ -223,7 +228,9 @@ impl SysFuncCallsInteract {
         token_display_name: &str,
         token_ticker: &str,
     ) {
-        self.interactor
+        println!("Issuing NFT Collection...");
+        let nft_collection_id = self
+            .interactor
             .tx()
             .from(&self.wallet_address)
             .to(ESDTSystemSCAddress.to_managed_address())
@@ -243,18 +250,23 @@ impl SysFuncCallsInteract {
                     can_add_special_roles: true,
                 },
             )
+            .returns(ReturnsNewTokenIdentifier)
             .prepare_async()
             .run()
             .await;
+
+        println!("NFT Collection ID: {:?}", nft_collection_id);
     }
 
-    async fn issue_semi_fungible_token(
+    async fn issue_semi_fungible_collection(
         &mut self,
         issue_cost: RustBigUint,
         token_display_name: &str,
         token_ticker: &str,
     ) {
-        self.interactor
+        println!("Issuing SFT Collection...");
+        let sft_collection_id = self
+            .interactor
             .tx()
             .from(&self.wallet_address)
             .to(ESDTSystemSCAddress.to_managed_address())
@@ -274,9 +286,12 @@ impl SysFuncCallsInteract {
                     can_add_special_roles: true,
                 },
             )
+            .returns(ReturnsNewTokenIdentifier)
             .prepare_async()
             .run()
             .await;
+
+        println!("SFT Collection ID: {:?}", sft_collection_id);
     }
 
     async fn issue_token(
@@ -287,6 +302,9 @@ impl SysFuncCallsInteract {
         num_decimals: usize,
         token_type: EsdtTokenType,
     ) {
+        println!(
+            "Registering token... Don't forget to mint afterwards in order to receive the tokens!"
+        );
         let token_id = self
             .interactor
             .tx()
@@ -301,20 +319,20 @@ impl SysFuncCallsInteract {
                 token_type,
                 num_decimals,
             )
-            .returns(ReturnsResultUnmanaged)
+            .returns(ReturnsNewTokenIdentifier)
             .prepare_async()
             .run()
             .await;
 
-        println!("TOKEN ID: {:?}", token_id.to_string());
+        println!("TOKEN ID: {:?}", token_id);
     }
 
-    async fn set_role(&mut self, token_id: &str, roles: Vec<u16>) {
+    async fn set_roles(&mut self, token_id: &str, roles: Vec<u16>) {
         let wallet_address = &self.wallet_address.clone().into_address();
         let converted_roles: Vec<EsdtLocalRole> =
             roles.into_iter().map(EsdtLocalRole::from).collect();
 
-        println!("ROLES: {:?}", converted_roles);
+        println!("Setting the following roles: {:?}", converted_roles);
 
         self.interactor
             .tx()
@@ -370,6 +388,7 @@ impl SysFuncCallsInteract {
         token_ticker: &str,
         num_decimals: usize,
     ) {
+        println!("Registering meta ESDT... Don't forget to mint afterwards in order to receive the tokens!");
         let meta_esdt = self
             .interactor
             .tx()
@@ -392,15 +411,16 @@ impl SysFuncCallsInteract {
                     can_add_special_roles: true,
                 },
             )
-            .returns(ReturnsResultUnmanaged)
+            .returns(ReturnsNewTokenIdentifier)
             .prepare_async()
             .run()
             .await;
 
-        println!("META ESDT: {:?}", meta_esdt.to_string());
+        println!("Meta-ESDT ID: {:?}", meta_esdt);
     }
 
     async fn change_sft_meta_esdt(&mut self, token_id: &str, num_decimals: usize) {
+        println!("Changing SFT to Meta-ESDT...");
         self.interactor
             .tx()
             .from(&self.wallet_address)
@@ -414,6 +434,7 @@ impl SysFuncCallsInteract {
     }
 
     async fn mint_token(&mut self, token_id: &str, amount: RustBigUint) {
+        println!("Minting tokens...");
         self.interactor
             .tx()
             .from(&self.wallet_address)
@@ -427,6 +448,7 @@ impl SysFuncCallsInteract {
     }
 
     async fn burn_token(&mut self, token_id: &str, amount: RustBigUint) {
+        println!("Burning tokens...");
         self.interactor
             .tx()
             .from(&self.wallet_address)
@@ -440,6 +462,7 @@ impl SysFuncCallsInteract {
     }
 
     async fn pause_token(&mut self, token_id: &str) {
+        println!("Pausing token...");
         self.interactor
             .tx()
             .from(&self.wallet_address)
@@ -453,6 +476,7 @@ impl SysFuncCallsInteract {
     }
 
     async fn unpause_token(&mut self, token_id: &str) {
+        println!("Unpausing token...");
         self.interactor
             .tx()
             .from(&self.wallet_address)
@@ -466,6 +490,7 @@ impl SysFuncCallsInteract {
     }
 
     async fn freeze_token(&mut self, token_id: &str, address: &str) {
+        println!("Freezing token...");
         let address = Bech32Address::from_bech32_string(address.to_string()).to_address();
         let managed_address: ManagedAddress<StaticApi> = ManagedAddress::from_address(&address);
         self.interactor
@@ -481,6 +506,7 @@ impl SysFuncCallsInteract {
     }
 
     async fn unfreeze_token(&mut self, token_id: &str, address: &str) {
+        println!("Unfreezing token...");
         let address = Bech32Address::from_bech32_string(address.to_string()).to_address();
         let managed_address: ManagedAddress<StaticApi> = ManagedAddress::from_address(&address);
         self.interactor
@@ -496,6 +522,7 @@ impl SysFuncCallsInteract {
     }
 
     async fn freeze_nft(&mut self, token_id: &str, nonce: u64, address: &str) {
+        println!("Freezing NFT/SFT/Meta-ESDT...");
         let address = Bech32Address::from_bech32_string(address.to_string()).to_address();
         let managed_address: ManagedAddress<StaticApi> = ManagedAddress::from_address(&address);
         self.interactor
@@ -511,6 +538,7 @@ impl SysFuncCallsInteract {
     }
 
     async fn unfreeze_nft(&mut self, token_id: &str, nonce: u64, address: &str) {
+        println!("Unfreezing NFT/SFT/Meta-ESDT...");
         let address = Bech32Address::from_bech32_string(address.to_string()).to_address();
         let managed_address: ManagedAddress<StaticApi> = ManagedAddress::from_address(&address);
         self.interactor
@@ -526,6 +554,7 @@ impl SysFuncCallsInteract {
     }
 
     async fn wipe_token(&mut self, token_id: &str, address: &str) {
+        println!("Wiping token...");
         let address = Bech32Address::from_bech32_string(address.to_string()).to_address();
         let managed_address: ManagedAddress<StaticApi> = ManagedAddress::from_address(&address);
         self.interactor
@@ -541,6 +570,7 @@ impl SysFuncCallsInteract {
     }
 
     async fn wipe_nft(&mut self, token_id: &str, nonce: u64, address: &str) {
+        println!("Wiping NFT/SFT/Meta-ESDT...");
         let address = Bech32Address::from_bech32_string(address.to_string()).to_address();
         let managed_address: ManagedAddress<StaticApi> = ManagedAddress::from_address(&address);
         self.interactor
@@ -563,6 +593,7 @@ impl SysFuncCallsInteract {
         royalties: u64,
         hash: &str,
     ) {
+        println!("Minting NFT...");
         self.interactor
             .tx()
             .from(&self.wallet_address)
@@ -590,7 +621,7 @@ impl SysFuncCallsInteract {
         let converted_roles: Vec<EsdtLocalRole> =
             roles.into_iter().map(EsdtLocalRole::from).collect();
 
-        println!("ROLES: {:?}", converted_roles);
+        println!("Unsetting the following roles: {:?}", converted_roles);
 
         let bech32_addr = Bech32Address::from_bech32_string(address.to_string());
         let addr = bech32_addr.to_address();
@@ -613,6 +644,7 @@ impl SysFuncCallsInteract {
     }
 
     async fn transfer_ownership(&mut self, token_id: &str, new_owner: &str) {
+        println!("Transferring token ownership...");
         let bech32_addr = Bech32Address::from_bech32_string(new_owner.to_string());
         let addr = bech32_addr.to_address();
         let managed_addr: ManagedAddress<StaticApi> = ManagedAddress::from_address(&addr);
@@ -630,6 +662,7 @@ impl SysFuncCallsInteract {
     }
 
     async fn transfer_nft_create_role(&mut self, token_id: &str, old_owner: &str, new_owner: &str) {
+        println!("Transferring NFT create role...");
         let bech32_addr_new_owner = Bech32Address::from_bech32_string(new_owner.to_string());
         let addr_new_owner = bech32_addr_new_owner.to_address();
         let managed_addr_new_owner: ManagedAddress<StaticApi> =
@@ -657,6 +690,7 @@ impl SysFuncCallsInteract {
     }
 
     async fn control_changes(&mut self, token_id: &str) {
+        println!("Control changes");
         self.interactor
             .tx()
             .from(&self.wallet_address)
diff --git a/tools/interactor-system-func-calls/sys-func-calls/interact/src/basic_interact_cli.rs b/tools/interactor-system-func-calls/sys-func-calls/interact/src/basic_interact_cli.rs
index 3386feffff..5cb356b3d8 100644
--- a/tools/interactor-system-func-calls/sys-func-calls/interact/src/basic_interact_cli.rs
+++ b/tools/interactor-system-func-calls/sys-func-calls/interact/src/basic_interact_cli.rs
@@ -61,8 +61,8 @@ pub enum InteractCliCommand {
         about = "Issues fungible tokens and sends them to your wallet"
     )]
     IssueFungible(IssueFungibleArgs),
-    #[command(name = "issue-sft", about = "Issues a SFT")]
-    IssueSft(IssueSftArgs),
+    #[command(name = "issue-sft-collection", about = "Issues a SFT")]
+    IssueSftCollection(IssueSftArgs),
     #[command(name = "mint-sft", about = "Mints a SFT")]
     MintSft(MintSFTArgs),
     #[command(name = "register-meta-esdt", about = "Registers a meta ESDT")]
@@ -145,7 +145,7 @@ pub struct IssueNftCollectionArgs {
 pub struct IssueSftArgs {
     #[arg(short = 'c', long = "cost", default_value = "50000000000000000")]
     pub cost: RustBigUint,
-    #[arg(long = "display-name")]
+    #[arg(short = 'd', long = "display-name")]
     pub display_name: String,
     #[arg(long = "token-ticker")]
     pub ticker: String,
@@ -175,7 +175,7 @@ pub struct MintSFTArgs {
 pub struct RegisterMetaEsdtArgs {
     #[arg(short = 'c', long = "cost", default_value = "50000000000000000")]
     pub cost: RustBigUint,
-    #[arg(long = "display-name")]
+    #[arg(short = 'd', long = "display-name")]
     pub display_name: String,
     #[arg(long = "token-ticker")]
     pub ticker: String,

From b13757be1ab878b6c1320770855476bcc74a0d8e Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Wed, 28 Aug 2024 12:37:06 +0300
Subject: [PATCH 1215/1254] unified - compare expected_uri with serialized
 merged_token_data uri

---
 .../tests/token_merge_module_whitebox_test.rs | 176 +++++++++---------
 1 file changed, 88 insertions(+), 88 deletions(-)

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 51cd7fa6df..4b40f656c9 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
@@ -124,23 +124,21 @@ fn test_token_merge() {
                 &MERGED_TOKEN_ID_EXPR.to_token_identifier(),
                 1,
             );
-            let expected_uri = [
-                TestEsdtTransfer(NFT_TOKEN_ID_EXPR, FIRST_NFT_NONCE, NFT_AMOUNT),
-                TestEsdtTransfer(NFT_TOKEN_ID_EXPR, SECOND_NFT_NONCE, NFT_AMOUNT),
-            ];
+            let expected_uri = ArrayVec::from([
+                EsdtTokenPayment::new(
+                    NFT_TOKEN_ID_EXPR.to_token_identifier(),
+                    FIRST_NFT_NONCE,
+                    managed_biguint!(NFT_AMOUNT),
+                ),
+                EsdtTokenPayment::new(
+                    NFT_TOKEN_ID_EXPR.to_token_identifier(),
+                    SECOND_NFT_NONCE,
+                    managed_biguint!(NFT_AMOUNT),
+                ),
+            ]);
 
             let actual_uri = MergedTokenInstances::decode_from_first_uri(&merged_token_data.uris);
-
-            for (expected, uri) in expected_uri.iter().zip(actual_uri.into_instances()) {
-                let token_identifier_string = uri.token_identifier.to_string();
-                let actual_transfer = TestEsdtTransfer(
-                    TestTokenIdentifier::new(&token_identifier_string),
-                    uri.token_nonce,
-                    uri.amount.to_u64().unwrap(),
-                );
-
-                assert_eq!(expected, &actual_transfer);
-            }
+            assert_eq!(expected_uri, *actual_uri.into_instances());
 
             assert_eq!(
                 merged_token_data.royalties,
@@ -228,22 +226,21 @@ fn test_token_merge() {
                 &MERGED_TOKEN_ID_EXPR.to_token_identifier(),
                 2,
             );
-            let expected_uri = [
-                TestEsdtTransfer(NFT_TOKEN_ID_EXPR, FIRST_NFT_NONCE, NFT_AMOUNT),
-                TestEsdtTransfer(FUNGIBLE_TOKEN_ID_EXPR, 0, FUNGIBLE_AMOUNT),
-            ];
+            let expected_uri = ArrayVec::from([
+                EsdtTokenPayment::new(
+                    NFT_TOKEN_ID_EXPR.to_token_identifier(),
+                    FIRST_NFT_NONCE,
+                    managed_biguint!(NFT_AMOUNT),
+                ),
+                EsdtTokenPayment::new(
+                    FUNGIBLE_TOKEN_ID_EXPR.to_token_identifier(),
+                    0,
+                    managed_biguint!(FUNGIBLE_AMOUNT),
+                ),
+            ]);
 
             let actual_uri = MergedTokenInstances::decode_from_first_uri(&merged_token_data.uris);
-            for (expected, uri) in expected_uri.iter().zip(actual_uri.into_instances()) {
-                let token_identifier_string = uri.token_identifier.to_string();
-                let actual_transfer = TestEsdtTransfer(
-                    TestTokenIdentifier::new(&token_identifier_string),
-                    uri.token_nonce,
-                    uri.amount.to_u64().unwrap(),
-                );
-
-                assert_eq!(expected, &actual_transfer);
-            }
+            assert_eq!(expected_uri, *actual_uri.into_instances());
 
             assert_eq!(
                 merged_token_data.royalties,
@@ -280,23 +277,26 @@ fn test_token_merge() {
                 &MERGED_TOKEN_ID_EXPR.into(),
                 3,
             );
-            let expected_uri = [
-                TestEsdtTransfer(NFT_TOKEN_ID_EXPR, FIRST_NFT_NONCE, NFT_AMOUNT),
-                TestEsdtTransfer(FUNGIBLE_TOKEN_ID_EXPR, 0, FUNGIBLE_AMOUNT),
-                TestEsdtTransfer(NFT_TOKEN_ID_EXPR, SECOND_NFT_NONCE, NFT_AMOUNT),
-            ];
+            let expected_uri = ArrayVec::from([
+                EsdtTokenPayment::new(
+                    NFT_TOKEN_ID_EXPR.to_token_identifier(),
+                    FIRST_NFT_NONCE,
+                    managed_biguint!(NFT_AMOUNT),
+                ),
+                EsdtTokenPayment::new(
+                    FUNGIBLE_TOKEN_ID_EXPR.to_token_identifier(),
+                    0,
+                    managed_biguint!(FUNGIBLE_AMOUNT),
+                ),
+                EsdtTokenPayment::new(
+                    NFT_TOKEN_ID_EXPR.to_token_identifier(),
+                    SECOND_NFT_NONCE,
+                    managed_biguint!(NFT_AMOUNT),
+                ),
+            ]);
 
             let actual_uri = MergedTokenInstances::decode_from_first_uri(&merged_token_data.uris);
-            for (expected, uri) in expected_uri.iter().zip(actual_uri.into_instances()) {
-                let token_identifier_string = uri.token_identifier.to_string();
-                let actual_transfer = TestEsdtTransfer(
-                    TestTokenIdentifier::new(&token_identifier_string),
-                    uri.token_nonce,
-                    uri.amount.to_u64().unwrap(),
-                );
-
-                assert_eq!(expected, &actual_transfer);
-            }
+            assert_eq!(expected_uri, *actual_uri.into_instances());
 
             assert_eq!(
                 merged_token_data.royalties,
@@ -436,23 +436,26 @@ fn test_partial_split() {
                 &MERGED_TOKEN_ID_EXPR.to_token_identifier(),
                 1,
             );
-            let expected_uri = [
-                TestEsdtTransfer(NFT_TOKEN_ID_EXPR, FIRST_NFT_NONCE, NFT_AMOUNT),
-                TestEsdtTransfer(NFT_TOKEN_ID_EXPR, SECOND_NFT_NONCE, NFT_AMOUNT),
-                TestEsdtTransfer(FUNGIBLE_TOKEN_ID_EXPR, 0, FUNGIBLE_AMOUNT),
-            ];
+            let expected_uri = ArrayVec::from([
+                EsdtTokenPayment::new(
+                    NFT_TOKEN_ID_EXPR.to_token_identifier(),
+                    FIRST_NFT_NONCE,
+                    managed_biguint!(NFT_AMOUNT),
+                ),
+                EsdtTokenPayment::new(
+                    NFT_TOKEN_ID_EXPR.to_token_identifier(),
+                    SECOND_NFT_NONCE,
+                    managed_biguint!(NFT_AMOUNT),
+                ),
+                EsdtTokenPayment::new(
+                    FUNGIBLE_TOKEN_ID_EXPR.to_token_identifier(),
+                    0,
+                    managed_biguint!(FUNGIBLE_AMOUNT),
+                ),
+            ]);
 
             let actual_uri = MergedTokenInstances::decode_from_first_uri(&merged_token_data.uris);
-            for (expected, uri) in expected_uri.iter().zip(actual_uri.into_instances()) {
-                let token_identifier_string = uri.token_identifier.to_string();
-                let actual_transfer = TestEsdtTransfer(
-                    TestTokenIdentifier::new(&token_identifier_string),
-                    uri.token_nonce,
-                    uri.amount.to_u64().unwrap(),
-                );
-
-                assert_eq!(expected, &actual_transfer);
-            }
+            assert_eq!(expected_uri, *actual_uri.into_instances());
         });
 
     // split part of the fungible token
@@ -518,22 +521,21 @@ fn test_partial_split() {
                 &MERGED_TOKEN_ID_EXPR.to_token_identifier(),
                 3,
             );
-            let expected_uri = [
-                TestEsdtTransfer(NFT_TOKEN_ID_EXPR, SECOND_NFT_NONCE, NFT_AMOUNT),
-                TestEsdtTransfer(FUNGIBLE_TOKEN_ID_EXPR, 0, FUNGIBLE_AMOUNT - 40),
-            ];
+            let expected_uri = ArrayVec::from([
+                EsdtTokenPayment::new(
+                    NFT_TOKEN_ID_EXPR.to_token_identifier(),
+                    SECOND_NFT_NONCE,
+                    managed_biguint!(NFT_AMOUNT),
+                ),
+                EsdtTokenPayment::new(
+                    FUNGIBLE_TOKEN_ID_EXPR.to_token_identifier(),
+                    0,
+                    managed_biguint!(FUNGIBLE_AMOUNT - 40),
+                ),
+            ]);
 
             let actual_uri = MergedTokenInstances::decode_from_first_uri(&merged_token_data.uris);
-            for (expected, uri) in expected_uri.iter().zip(actual_uri.into_instances()) {
-                let token_identifier_string = uri.token_identifier.to_string();
-                let actual_transfer = TestEsdtTransfer(
-                    TestTokenIdentifier::new(&token_identifier_string),
-                    uri.token_nonce,
-                    uri.amount.to_u64().unwrap(),
-                );
-
-                assert_eq!(expected, &actual_transfer);
-            }
+            assert_eq!(expected_uri, *actual_uri.into_instances());
 
             assert_eq!(
                 merged_token_data.royalties,
@@ -636,22 +638,20 @@ fn test_custom_attributes() {
                 &MERGED_TOKEN_ID_EXPR.to_token_identifier(),
                 1,
             );
-            let expected_uri = [
-                TestEsdtTransfer(NFT_TOKEN_ID_EXPR, FIRST_NFT_NONCE, NFT_AMOUNT),
-                TestEsdtTransfer(NFT_TOKEN_ID_EXPR, SECOND_NFT_NONCE, NFT_AMOUNT),
-            ];
-
+            let expected_uri = ArrayVec::from([
+                EsdtTokenPayment::new(
+                    NFT_TOKEN_ID_EXPR.to_token_identifier(),
+                    FIRST_NFT_NONCE,
+                    managed_biguint!(NFT_AMOUNT),
+                ),
+                EsdtTokenPayment::new(
+                    NFT_TOKEN_ID_EXPR.to_token_identifier(),
+                    SECOND_NFT_NONCE,
+                    managed_biguint!(NFT_AMOUNT),
+                ),
+            ]);
             let actual_uri = MergedTokenInstances::decode_from_first_uri(&merged_token_data.uris);
-            for (expected, uri) in expected_uri.iter().zip(actual_uri.into_instances()) {
-                let token_identifier_string = uri.token_identifier.to_string();
-                let actual_transfer = TestEsdtTransfer(
-                    TestTokenIdentifier::new(&token_identifier_string),
-                    uri.token_nonce,
-                    uri.amount.to_u64().unwrap(),
-                );
-
-                assert_eq!(expected, &actual_transfer);
-            }
+            assert_eq!(expected_uri, *actual_uri.into_instances());
 
             let actual_attributes: CustomAttributes = merged_token_data.decode_attributes();
             assert_eq!(expected_attributes, actual_attributes);

From 3a1ee56d9bb907c4d462d1a83acbc2fd3eaf17ae Mon Sep 17 00:00:00 2001
From: JustEatAnApple <mblacioti@gmail.com>
Date: Wed, 28 Aug 2024 12:55:34 +0300
Subject: [PATCH 1216/1254] Modified the adder interactor example to work with
 keystore-signing

Co-authored-by: Andrei Vasilescu <vasilescuandrei24@gmail.com>
---
 contracts/examples/adder/interact/alice.json  | 23 +++++++++++++++++++
 .../adder/interact/src/basic_interact.rs      |  4 +++-
 sdk/core/src/wallet.rs                        | 11 ++++-----
 3 files changed, 31 insertions(+), 7 deletions(-)
 create mode 100644 contracts/examples/adder/interact/alice.json

diff --git a/contracts/examples/adder/interact/alice.json b/contracts/examples/adder/interact/alice.json
new file mode 100644
index 0000000000..8f1a81514e
--- /dev/null
+++ b/contracts/examples/adder/interact/alice.json
@@ -0,0 +1,23 @@
+{
+  "version": 4,
+  "kind": "secretKey",
+  "id": "f2c5e236-9039-46cd-8df5-1efcd9466ead",
+  "address": "0139472eff6886771a982f3083da5d421f24c29181e63888228dc81ca60d69e1",
+  "bech32": "erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th",
+  "crypto": {
+    "ciphertext": "45de5198c6c477725abc17d26c6b5fc88b1ff22a67a8c4784b297d426d351cf5c891a4c92d63e04cf23f602f660b7b606ed1c5293c85ff40216d9e53c9a07c23",
+    "cipherparams": {
+      "iv": "d6442fb1d4c49106152baeb3c539ed2c"
+    },
+    "cipher": "aes-128-ctr",
+    "kdf": "scrypt",
+    "kdfparams": {
+      "dklen": 32,
+      "salt": "dd69d88742b9d27a0438a4554d4180b070d9af224ea8ff8225fdf74c8e272adb",
+      "n": 4096,
+      "r": 8,
+      "p": 1
+    },
+    "mac": "b277984f71d0e9b4a6597911775c0ee6d598002645b29f22021e595c2725d204"
+  }
+}
diff --git a/contracts/examples/adder/interact/src/basic_interact.rs b/contracts/examples/adder/interact/src/basic_interact.rs
index 262eb13631..4765ec6fbe 100644
--- a/contracts/examples/adder/interact/src/basic_interact.rs
+++ b/contracts/examples/adder/interact/src/basic_interact.rs
@@ -65,7 +65,9 @@ impl AdderInteract {
 
         let adder_owner_address =
             interactor.register_wallet(Wallet::from_pem_file("adder-owner.pem").unwrap());
-        let wallet_address = interactor.register_wallet(test_wallets::mike());
+        // PASSWORD: "alice"
+        let wallet_address = interactor
+            .register_wallet(Wallet::from_keystore_secret("alice.json", "alice").unwrap());
 
         Self {
             interactor,
diff --git a/sdk/core/src/wallet.rs b/sdk/core/src/wallet.rs
index bf1362a314..e197c13c02 100644
--- a/sdk/core/src/wallet.rs
+++ b/sdk/core/src/wallet.rs
@@ -156,12 +156,11 @@ impl Wallet {
         (private_key_str, public_key_str)
     }
 
-    pub fn from_keystore_secret(file_path: &str) -> Result<Self> {
-        let decyption_params =
-            Self::validate_keystore_password(file_path, Self::get_keystore_password())
-                .unwrap_or_else(|e| {
-                    panic!("Error: {:?}", e);
-                });
+    pub fn from_keystore_secret(file_path: &str, password: &str) -> Result<Self> {
+        let decyption_params = Self::validate_keystore_password(file_path, password.to_string())
+            .unwrap_or_else(|e| {
+                panic!("Error: {:?}", e);
+            });
         let priv_key = PrivateKey::from_hex_str(
             hex::encode(Self::decrypt_secret_key(decyption_params)).as_str(),
         )?;

From 4928800dfe85e9d65c8aaf06f48edbffa441a931 Mon Sep 17 00:00:00 2001
From: JustEatAnApple <mblacioti@gmail.com>
Date: Wed, 28 Aug 2024 14:32:43 +0300
Subject: [PATCH 1217/1254] Password can now be passed either in terminal or as
 a string parameter

Co-authored-by: Andrei Vasilescu <vasilescuandrei24@gmail.com>
---
 contracts/examples/adder/interact/.gitignore  |  1 +
 .../adder/interact/src/basic_interact.rs      | 16 +++++++++----
 sdk/core/src/data/keystore.rs                 |  7 ++++++
 sdk/core/src/wallet.rs                        | 23 ++++++++++++++-----
 4 files changed, 36 insertions(+), 11 deletions(-)

diff --git a/contracts/examples/adder/interact/.gitignore b/contracts/examples/adder/interact/.gitignore
index b2630809de..336fa10df0 100644
--- a/contracts/examples/adder/interact/.gitignore
+++ b/contracts/examples/adder/interact/.gitignore
@@ -1,5 +1,6 @@
 # Pem files are used for interactions, but shouldn't be committed
 *.pem
+*.json
 !adder-owner.pem
 
 # Temporary storage of deployed contract address, so we can preserve the context between executions.
diff --git a/contracts/examples/adder/interact/src/basic_interact.rs b/contracts/examples/adder/interact/src/basic_interact.rs
index 4765ec6fbe..abcaec4c00 100644
--- a/contracts/examples/adder/interact/src/basic_interact.rs
+++ b/contracts/examples/adder/interact/src/basic_interact.rs
@@ -7,7 +7,7 @@ use basic_interact_config::Config;
 use basic_interact_state::State;
 use clap::Parser;
 
-use multiversx_sc_snippets::imports::*;
+use multiversx_sc_snippets::{imports::*, sdk::data::keystore::InsertPassword};
 
 const INTERACTOR_SCENARIO_TRACE_PATH: &str = "interactor_trace.scen.json";
 
@@ -66,8 +66,14 @@ impl AdderInteract {
         let adder_owner_address =
             interactor.register_wallet(Wallet::from_pem_file("adder-owner.pem").unwrap());
         // PASSWORD: "alice"
-        let wallet_address = interactor
-            .register_wallet(Wallet::from_keystore_secret("alice.json", "alice").unwrap());
+        // InsertPassword::Plaintext("alice".to_string()) || InsertPassword::StandardInput
+        let wallet_address = interactor.register_wallet(
+            Wallet::from_keystore_secret(
+                "alice.json",
+                InsertPassword::Plaintext("alice".to_string()),
+            )
+            .unwrap(),
+        );
 
         Self {
             interactor,
@@ -243,5 +249,5 @@ async fn test() {
     basic_interact.deploy().await;
     basic_interact.add(1u32).await;
 
-    basic_interact.upgrade(7u32).await;
-}
+    // basic_interact.upgrade(7u32).await;
+}
\ No newline at end of file
diff --git a/sdk/core/src/data/keystore.rs b/sdk/core/src/data/keystore.rs
index 1b3c656ef1..31e6b6538a 100644
--- a/sdk/core/src/data/keystore.rs
+++ b/sdk/core/src/data/keystore.rs
@@ -12,6 +12,13 @@ pub enum WalletError {
     InvalidKdf,
     InvalidCipher,
 }
+
+#[derive(Debug)]
+pub enum InsertPassword {
+    Plaintext(String),
+    StandardInput,
+}
+
 #[derive(Debug, Serialize, Deserialize)]
 pub struct CryptoParams {
     pub iv: String,
diff --git a/sdk/core/src/wallet.rs b/sdk/core/src/wallet.rs
index e197c13c02..df9b9dc43a 100644
--- a/sdk/core/src/wallet.rs
+++ b/sdk/core/src/wallet.rs
@@ -156,13 +156,24 @@ impl Wallet {
         (private_key_str, public_key_str)
     }
 
-    pub fn from_keystore_secret(file_path: &str, password: &str) -> Result<Self> {
-        let decyption_params = Self::validate_keystore_password(file_path, password.to_string())
-            .unwrap_or_else(|e| {
-                panic!("Error: {:?}", e);
-            });
+    pub fn from_keystore_secret(file_path: &str, insert_password: InsertPassword) -> Result<Self> {
+        let decryption_params = match insert_password {
+            InsertPassword::Plaintext(password) => {
+                Self::validate_keystore_password(file_path, password.to_string()).unwrap_or_else(
+                    |e| {
+                        panic!("Error: {:?}", e);
+                    },
+                )
+            },
+            InsertPassword::StandardInput => {
+                Self::validate_keystore_password(file_path, Self::get_keystore_password())
+                    .unwrap_or_else(|e| {
+                        panic!("Error: {:?}", e);
+                    })
+            },
+        };
         let priv_key = PrivateKey::from_hex_str(
-            hex::encode(Self::decrypt_secret_key(decyption_params)).as_str(),
+            hex::encode(Self::decrypt_secret_key(decryption_params)).as_str(),
         )?;
         Ok(Self { priv_key })
     }

From ca748ff88fc951a40d5a992f7e591d04750e43f6 Mon Sep 17 00:00:00 2001
From: JustEatAnApple <mblacioti@gmail.com>
Date: Wed, 28 Aug 2024 15:49:18 +0300
Subject: [PATCH 1218/1254] Decommented a line to showcase the upgrade failure

Co-authored-by: Andrei Vasilescu <vasilescuandrei24@gmail.com>
---
 contracts/examples/adder/interact/src/basic_interact.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contracts/examples/adder/interact/src/basic_interact.rs b/contracts/examples/adder/interact/src/basic_interact.rs
index abcaec4c00..0061b2a888 100644
--- a/contracts/examples/adder/interact/src/basic_interact.rs
+++ b/contracts/examples/adder/interact/src/basic_interact.rs
@@ -249,5 +249,5 @@ async fn test() {
     basic_interact.deploy().await;
     basic_interact.add(1u32).await;
 
-    // basic_interact.upgrade(7u32).await;
+    basic_interact.upgrade(7u32).await;
 }
\ No newline at end of file

From 6f41c77a4fb8f6796b86a5e28d46fe17e5a43e21 Mon Sep 17 00:00:00 2001
From: JustEatAnApple <mblacioti@gmail.com>
Date: Wed, 28 Aug 2024 16:55:32 +0300
Subject: [PATCH 1219/1254] Made the upgrade failure more clear

Co-authored-by: Andrei Vasilescu <vasilescuandrei24@gmail.com>
---
 .../adder/interact/src/basic_interact.rs      | 49 +++++++++++++++++--
 1 file changed, 45 insertions(+), 4 deletions(-)

diff --git a/contracts/examples/adder/interact/src/basic_interact.rs b/contracts/examples/adder/interact/src/basic_interact.rs
index 0061b2a888..a5e5fb4942 100644
--- a/contracts/examples/adder/interact/src/basic_interact.rs
+++ b/contracts/examples/adder/interact/src/basic_interact.rs
@@ -209,13 +209,43 @@ impl AdderInteract {
         println!("sum: {sum}");
     }
 
+    async fn fail_upgrade(&mut self, new_value: u32) {
+        self.interactor
+            .tx()
+            .from(&self.wallet_address)
+            .to(self.state.current_adder_address())
+            .gas(6_000_000)
+            .typed(adder_proxy::AdderProxy)
+            .upgrade(BigUint::from(new_value))
+            .code_metadata(CodeMetadata::UPGRADEABLE)
+            .code(ADDER_CODE_PATH)
+            .with_result(ExpectError(4, "upgrade is allowed only for owner"))
+            .prepare_async()
+            .run()
+            .await;
+
+        let sum = self
+            .interactor
+            .query()
+            .to(self.state.current_adder_address())
+            .typed(adder_proxy::AdderProxy)
+            .sum()
+            .returns(ReturnsResultUnmanaged)
+            .prepare_async()
+            .run()
+            .await;
+        assert_ne!(sum, RustBigUint::from(new_value));
+
+        println!("Upgrade failed: upgrade is allowed only for owner");
+    }
+
     async fn upgrade(&mut self, new_value: u32) {
         let response = self
             .interactor
             .tx()
-            .from(&self.wallet_address)
+            .from(&self.adder_owner_address)
             .to(self.state.current_adder_address())
-            .gas(3_000_000)
+            .gas(6_000_000)
             .typed(adder_proxy::AdderProxy)
             .upgrade(BigUint::from(new_value))
             .code_metadata(CodeMetadata::UPGRADEABLE)
@@ -243,11 +273,22 @@ impl AdderInteract {
 
 #[tokio::test]
 #[ignore = "run on demand"]
-async fn test() {
+async fn fail_upgrade_test() {
+    let mut basic_interact = AdderInteract::init().await;
+
+    basic_interact.deploy().await;
+    basic_interact.add(1u32).await;
+
+    basic_interact.fail_upgrade(7u32).await;
+}
+
+#[tokio::test]
+#[ignore = "run on demand"]
+async fn upgrade_test() {
     let mut basic_interact = AdderInteract::init().await;
 
     basic_interact.deploy().await;
     basic_interact.add(1u32).await;
 
     basic_interact.upgrade(7u32).await;
-}
\ No newline at end of file
+}

From 5933f501839958bf3ab083a7313adca5e737044f Mon Sep 17 00:00:00 2001
From: JustEatAnApple <mblacioti@gmail.com>
Date: Wed, 28 Aug 2024 16:57:57 +0300
Subject: [PATCH 1220/1254] Updated gas prices

Co-authored-by: Andrei Vasilescu <vasilescuandrei24@gmail.com>
---
 contracts/examples/adder/interact/src/basic_interact.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/contracts/examples/adder/interact/src/basic_interact.rs b/contracts/examples/adder/interact/src/basic_interact.rs
index a5e5fb4942..e1dc1b3dec 100644
--- a/contracts/examples/adder/interact/src/basic_interact.rs
+++ b/contracts/examples/adder/interact/src/basic_interact.rs
@@ -101,7 +101,7 @@ impl AdderInteract {
             .interactor
             .tx()
             .from(&self.adder_owner_address)
-            .gas(3_000_000)
+            .gas(6_000_000)
             .typed(adder_proxy::AdderProxy)
             .init(0u32)
             .code(ADDER_CODE_PATH)
@@ -131,7 +131,7 @@ impl AdderInteract {
                     .typed(adder_proxy::AdderProxy)
                     .init(0u32)
                     .code(ADDER_CODE_PATH)
-                    .gas(3_000_000)
+                    .gas(6_000_000)
                     .returns(ReturnsNewBech32Address)
             });
         }
@@ -159,7 +159,7 @@ impl AdderInteract {
                     .to(self.state.current_adder_address())
                     .typed(adder_proxy::AdderProxy)
                     .add(value)
-                    .gas(3_000_000)
+                    .gas(6_000_000)
             });
         }
 
@@ -184,7 +184,7 @@ impl AdderInteract {
             .tx()
             .from(&self.wallet_address)
             .to(self.state.current_adder_address())
-            .gas(3_000_000)
+            .gas(6_000_000)
             .typed(adder_proxy::AdderProxy)
             .add(value)
             .prepare_async()

From 804bf49ca0cc72c7053d7f21aa353d9209da2dbd Mon Sep 17 00:00:00 2001
From: Andrei Vasilescu <vasilescuandrei24@gmail.com>
Date: Wed, 28 Aug 2024 19:45:16 +0300
Subject: [PATCH 1221/1254] added README + small changes in interactor

---
 tools/interactor-system-func-calls/README.md  |  75 +++++++++
 .../interact/src/basic_interact.rs            | 158 +++++++++++-------
 .../interact/src/basic_interact_cli.rs        |   6 +-
 3 files changed, 182 insertions(+), 57 deletions(-)
 create mode 100644 tools/interactor-system-func-calls/README.md

diff --git a/tools/interactor-system-func-calls/README.md b/tools/interactor-system-func-calls/README.md
new file mode 100644
index 0000000000..18d1501cf7
--- /dev/null
+++ b/tools/interactor-system-func-calls/README.md
@@ -0,0 +1,75 @@
+# System SC function calls interactor
+
+Fungible Tokens docs: https://docs.multiversx.com/tokens/fungible-tokens/
+NFT/SFT/Meta-ESDT docs: https://docs.multiversx.com/tokens/nft-tokens/
+
+### Functions:
+
+- `issue_fungible_token`: Issues a fungible token, it registers the token and sends the initial supply to your wallet
+- `issue_non_fungible_collection`: Issues an NFT Collection
+- `issue_semi_fungible_collection`: Issues an SFT Collection
+- `issue_token`: Registers any kind of token (Fungible/NFT/SFT/Meta-ESDT) and sets all the roles for it. This function doesn't transfer any tokens to your wallet
+- `set_roles`: Sets the roles for your address over a specified token ID
+- `mint_sft`: Mints an SFT/Meta-ESDT corresponding to a collection
+- `register_meta_esdt`: Registers a Meta-ESDT token
+- `change_sft_meta_esdt`: Changes an SFT to a Meta-ESDT
+- `mint_token`: Mints a fungible token
+- `burn_token`: Burns a token
+- `pause_token`: Pauses all the transfers for a token
+- `unpause_token`: Reverse function of `pause_token`
+- `freeze_token`: Freezes a token for an address
+- `unfreeze_token`: Reverse function of `freeze_token`
+- `freeze_nft`: Freezes an NFT/SFT/Meta-ESDT token for an address
+- `unfreeze_nft`: Reverse function of `freeze_nft`
+- `wipe_token`: Wipes a token from an address
+- `wipe_nft`: Wipes an NFT/SFT/Meta-ESDT token from an address
+- `mint_nft`: Mints an NFT corresponding to a collection
+- `unset roles`: Unsets the roles for an address over a specified tokenID
+- `transfer_ownership`: Transfers the ownership of your token to another address
+- `transfer_nft_create_role`: Transfers the NFT Create role to a new address
+- `control_changes`: Sets/Unsets properties of a specified tokenID
+
+### How to use tips
+
+#### Token types for `issue_token` function
+
+For CLI use, insert one of the numbers below for the `token-type` parameter
+
+- 0 => `Fungible`
+- 1 => `NonFungible`
+- 2 => `SemiFungible`
+- 3 => `Meta`
+- any other number => `Invalid`
+
+#### Set/Unset roles
+
+Before trying to make any kind of interaction with a token (e.g. Mint, Burn, Transfer) you should set the neccessary roles, even if you are the owner of the token. For CLI use, insert one or more numbers from below for the `roles` parameter, each corresponding to a role, each separated by one comma `e.g. --roles 1,2,8`
+
+- 1 => `Mint`
+- 2 => `Burn`
+- 3 => `NftCreate`
+- 4 => `NftAddQuantity`
+- 5 => `NftBurn`
+- 6 => `NftAddUri`
+- 7 => `NftUpdateAttributes`
+- 8 => `Transfer`
+- any other number => `None`
+
+#### Issue fungible token
+
+- Method 1: `issue_fungible_token` (set the token properties inside the function)
+- Method 2: `issue_token`-> `set_roles` (**Mint** role needed for minting the tokens) -> `mint_token` to receive the tokens in your wallet
+
+#### Issue NFT Collection + Mint an NFT
+
+- `issue_non_fungible_collection`/`issue_token` -> `set_roles` (**NFTCreate** role needed for minting) -> Mint an NFT by calling `mint_nft`
+
+#### Issue SFT Collection
+
+- Issue Collection: `issue_semi_fungible_collection`/`issue_token` -> `set_roles` (**NFTCreate** role needed for minting) -> Mint the amount of SFTs wantes by calling `mint_sft`
+
+### Register a Meta-ESDT
+
+- `register_meta_esdt` -> `set_roles`(**NFTCreate**) -> `mint_sft` to mint the Meta-ESDT
+
+By using `set_roles`(**NFTAddQuantity**) -> `mint_token` you can add quantity to a Meta-ESDT/SFT with a specified nonce
diff --git a/tools/interactor-system-func-calls/sys-func-calls/interact/src/basic_interact.rs b/tools/interactor-system-func-calls/sys-func-calls/interact/src/basic_interact.rs
index b7cbb4ee3e..fb08fd587b 100644
--- a/tools/interactor-system-func-calls/sys-func-calls/interact/src/basic_interact.rs
+++ b/tools/interactor-system-func-calls/sys-func-calls/interact/src/basic_interact.rs
@@ -30,17 +30,24 @@ async fn main() {
         },
         Some(basic_interact_cli::InteractCliCommand::Mint(args)) => {
             basic_interact
-                .mint_token(&args.token_id, args.amount.clone())
+                .mint_token(&args.token_id, args.nonce, args.amount.clone())
                 .await;
         },
         Some(basic_interact_cli::InteractCliCommand::SetRoles(args)) => {
             basic_interact
-                .set_roles(&args.token_id, args.roles.clone())
+                .set_roles(
+                    &args.token_id,
+                    args.roles
+                        .clone()
+                        .into_iter()
+                        .map(EsdtLocalRole::from)
+                        .collect(),
+                )
                 .await;
         },
         Some(basic_interact_cli::InteractCliCommand::Burn(args)) => {
             basic_interact
-                .burn_token(&args.token_id, args.amount.clone())
+                .burn_token(&args.token_id, args.nonce, args.amount.clone())
                 .await;
         },
         Some(basic_interact_cli::InteractCliCommand::PauseToken(args)) => {
@@ -51,32 +58,53 @@ async fn main() {
         },
         Some(basic_interact_cli::InteractCliCommand::FreezeToken(args)) => {
             basic_interact
-                .freeze_token(&args.token_id, &args.address)
+                .freeze_token(
+                    &args.token_id,
+                    Bech32Address::from_bech32_string(args.address.clone()),
+                )
                 .await;
         },
         Some(basic_interact_cli::InteractCliCommand::UnfreezeToken(args)) => {
             basic_interact
-                .unfreeze_token(&args.token_id, &args.address)
+                .unfreeze_token(
+                    &args.token_id,
+                    Bech32Address::from_bech32_string(args.address.clone()),
+                )
                 .await;
         },
         Some(basic_interact_cli::InteractCliCommand::FreezeNFT(args)) => {
             basic_interact
-                .freeze_nft(&args.token_id, args.nft_nonce, &args.address)
+                .freeze_nft(
+                    &args.token_id,
+                    args.nft_nonce,
+                    Bech32Address::from_bech32_string(args.address.clone()),
+                )
                 .await;
         },
         Some(basic_interact_cli::InteractCliCommand::UnfreezeNFT(args)) => {
             basic_interact
-                .unfreeze_nft(&args.token_id, args.nft_nonce, &args.address)
+                .unfreeze_nft(
+                    &args.token_id,
+                    args.nft_nonce,
+                    Bech32Address::from_bech32_string(args.address.clone()),
+                )
                 .await;
         },
         Some(basic_interact_cli::InteractCliCommand::WipeToken(args)) => {
             basic_interact
-                .wipe_token(&args.token_id, &args.address)
+                .wipe_token(
+                    &args.token_id,
+                    Bech32Address::from_bech32_string(args.address.clone()),
+                )
                 .await;
         },
         Some(basic_interact_cli::InteractCliCommand::WipeNFT(args)) => {
             basic_interact
-                .wipe_nft(&args.token_id, args.nft_nonce, &args.address)
+                .wipe_nft(
+                    &args.token_id,
+                    args.nft_nonce,
+                    Bech32Address::from_bech32_string(args.address.clone()),
+                )
                 .await;
         },
         Some(basic_interact_cli::InteractCliCommand::IssueNFTCollection(args)) => {
@@ -86,7 +114,7 @@ async fn main() {
         },
         Some(basic_interact_cli::InteractCliCommand::CreateNFT(args)) => {
             basic_interact
-                .create_nft(
+                .mint_nft(
                     &args.token_id,
                     args.amount.clone(),
                     &args.name,
@@ -117,7 +145,7 @@ async fn main() {
                     &args.token_id,
                     args.amount.clone(),
                     &args.name,
-                    args.royalties.clone(),
+                    args.royalties,
                     &args.hash,
                 )
                 .await;
@@ -139,7 +167,15 @@ async fn main() {
         },
         Some(basic_interact_cli::InteractCliCommand::UnsetRoles(args)) => {
             basic_interact
-                .unset_roles(&args.address, &args.token_id, args.roles.clone())
+                .unset_roles(
+                    Bech32Address::from_bech32_string(args.address.clone()),
+                    &args.token_id,
+                    args.roles
+                        .clone()
+                        .into_iter()
+                        .map(EsdtLocalRole::from)
+                        .collect(),
+                )
                 .await;
         },
         Some(basic_interact_cli::InteractCliCommand::TransferOwnership(args)) => {
@@ -172,7 +208,8 @@ impl SysFuncCallsInteract {
         let config = Config::load_config();
         let mut interactor = Interactor::new(config.gateway()).await;
 
-        let wallet_address = interactor.register_wallet(test_wallets::alice());
+        let wallet_address =
+            interactor.register_wallet(Wallet::from_pem_file("wallet.pem").unwrap());
 
         Self {
             interactor,
@@ -302,9 +339,7 @@ impl SysFuncCallsInteract {
         num_decimals: usize,
         token_type: EsdtTokenType,
     ) {
-        println!(
-            "Registering token... Don't forget to mint afterwards in order to receive the tokens!"
-        );
+        println!("Registering token...");
         let token_id = self
             .interactor
             .tx()
@@ -327,12 +362,12 @@ impl SysFuncCallsInteract {
         println!("TOKEN ID: {:?}", token_id);
     }
 
-    async fn set_roles(&mut self, token_id: &str, roles: Vec<u16>) {
+    async fn set_roles(&mut self, token_id: &str, roles: Vec<EsdtLocalRole>) {
         let wallet_address = &self.wallet_address.clone().into_address();
-        let converted_roles: Vec<EsdtLocalRole> =
-            roles.into_iter().map(EsdtLocalRole::from).collect();
+        // let converted_roles: Vec<EsdtLocalRole> =
+        //     roles.into_iter().map(EsdtLocalRole::from).collect();
 
-        println!("Setting the following roles: {:?}", converted_roles);
+        println!("Setting the following roles: {:?}", roles);
 
         self.interactor
             .tx()
@@ -340,10 +375,10 @@ impl SysFuncCallsInteract {
             .to(ESDTSystemSCAddress.to_managed_address())
             .gas(100_000_000u64)
             .typed(ESDTSystemSCProxy)
-            .set_special_roles::<std::vec::IntoIter<EsdtLocalRole>>(
+            .set_special_roles(
                 &ManagedAddress::from_address(wallet_address),
                 &TokenIdentifier::from(token_id),
-                converted_roles.into_iter(),
+                roles.into_iter(),
             )
             .prepare_async()
             .run()
@@ -355,9 +390,11 @@ impl SysFuncCallsInteract {
         token_id: &str,
         amount: RustBigUint,
         name: &str,
-        royalties: RustBigUint,
+        royalties: u64,
         hash: &str,
     ) {
+        println!("Minting SFT...");
+
         self.interactor
             .tx()
             .from(&self.wallet_address)
@@ -388,7 +425,7 @@ impl SysFuncCallsInteract {
         token_ticker: &str,
         num_decimals: usize,
     ) {
-        println!("Registering meta ESDT... Don't forget to mint afterwards in order to receive the tokens!");
+        println!("Registering meta ESDT...");
         let meta_esdt = self
             .interactor
             .tx()
@@ -433,7 +470,7 @@ impl SysFuncCallsInteract {
             .await;
     }
 
-    async fn mint_token(&mut self, token_id: &str, amount: RustBigUint) {
+    async fn mint_token(&mut self, token_id: &str, nonce: u64, amount: RustBigUint) {
         println!("Minting tokens...");
         self.interactor
             .tx()
@@ -441,13 +478,17 @@ impl SysFuncCallsInteract {
             .to(&self.wallet_address)
             .gas(100_000_000u64)
             .typed(UserBuiltinProxy)
-            .esdt_local_mint(&TokenIdentifier::from(token_id), 0, &BigUint::from(amount))
+            .esdt_local_mint(
+                &TokenIdentifier::from(token_id),
+                nonce,
+                &BigUint::from(amount),
+            )
             .prepare_async()
             .run()
             .await;
     }
 
-    async fn burn_token(&mut self, token_id: &str, amount: RustBigUint) {
+    async fn burn_token(&mut self, token_id: &str, nonce: u64, amount: RustBigUint) {
         println!("Burning tokens...");
         self.interactor
             .tx()
@@ -455,7 +496,11 @@ impl SysFuncCallsInteract {
             .to(&self.wallet_address)
             .gas(100_000_000u64)
             .typed(UserBuiltinProxy)
-            .esdt_local_burn(&TokenIdentifier::from(token_id), 0, &BigUint::from(amount))
+            .esdt_local_burn(
+                &TokenIdentifier::from(token_id),
+                nonce,
+                &BigUint::from(amount),
+            )
             .prepare_async()
             .run()
             .await;
@@ -489,10 +534,10 @@ impl SysFuncCallsInteract {
             .await;
     }
 
-    async fn freeze_token(&mut self, token_id: &str, address: &str) {
+    async fn freeze_token(&mut self, token_id: &str, address: Bech32Address) {
         println!("Freezing token...");
-        let address = Bech32Address::from_bech32_string(address.to_string()).to_address();
-        let managed_address: ManagedAddress<StaticApi> = ManagedAddress::from_address(&address);
+        let managed_address: ManagedAddress<StaticApi> =
+            ManagedAddress::from_address(&address.to_address());
         self.interactor
             .tx()
             .from(&self.wallet_address)
@@ -505,10 +550,10 @@ impl SysFuncCallsInteract {
             .await;
     }
 
-    async fn unfreeze_token(&mut self, token_id: &str, address: &str) {
+    async fn unfreeze_token(&mut self, token_id: &str, address: Bech32Address) {
         println!("Unfreezing token...");
-        let address = Bech32Address::from_bech32_string(address.to_string()).to_address();
-        let managed_address: ManagedAddress<StaticApi> = ManagedAddress::from_address(&address);
+        let managed_address: ManagedAddress<StaticApi> =
+            ManagedAddress::from_address(&address.to_address());
         self.interactor
             .tx()
             .from(&self.wallet_address)
@@ -521,10 +566,10 @@ impl SysFuncCallsInteract {
             .await;
     }
 
-    async fn freeze_nft(&mut self, token_id: &str, nonce: u64, address: &str) {
+    async fn freeze_nft(&mut self, token_id: &str, nonce: u64, address: Bech32Address) {
         println!("Freezing NFT/SFT/Meta-ESDT...");
-        let address = Bech32Address::from_bech32_string(address.to_string()).to_address();
-        let managed_address: ManagedAddress<StaticApi> = ManagedAddress::from_address(&address);
+        let managed_address: ManagedAddress<StaticApi> =
+            ManagedAddress::from_address(&address.to_address());
         self.interactor
             .tx()
             .from(&self.wallet_address)
@@ -537,10 +582,10 @@ impl SysFuncCallsInteract {
             .await;
     }
 
-    async fn unfreeze_nft(&mut self, token_id: &str, nonce: u64, address: &str) {
+    async fn unfreeze_nft(&mut self, token_id: &str, nonce: u64, address: Bech32Address) {
         println!("Unfreezing NFT/SFT/Meta-ESDT...");
-        let address = Bech32Address::from_bech32_string(address.to_string()).to_address();
-        let managed_address: ManagedAddress<StaticApi> = ManagedAddress::from_address(&address);
+        let managed_address: ManagedAddress<StaticApi> =
+            ManagedAddress::from_address(&address.to_address());
         self.interactor
             .tx()
             .from(&self.wallet_address)
@@ -553,10 +598,10 @@ impl SysFuncCallsInteract {
             .await;
     }
 
-    async fn wipe_token(&mut self, token_id: &str, address: &str) {
+    async fn wipe_token(&mut self, token_id: &str, address: Bech32Address) {
         println!("Wiping token...");
-        let address = Bech32Address::from_bech32_string(address.to_string()).to_address();
-        let managed_address: ManagedAddress<StaticApi> = ManagedAddress::from_address(&address);
+        let managed_address: ManagedAddress<StaticApi> =
+            ManagedAddress::from_address(&address.to_address());
         self.interactor
             .tx()
             .from(&self.wallet_address)
@@ -569,10 +614,10 @@ impl SysFuncCallsInteract {
             .await;
     }
 
-    async fn wipe_nft(&mut self, token_id: &str, nonce: u64, address: &str) {
+    async fn wipe_nft(&mut self, token_id: &str, nonce: u64, address: Bech32Address) {
         println!("Wiping NFT/SFT/Meta-ESDT...");
-        let address = Bech32Address::from_bech32_string(address.to_string()).to_address();
-        let managed_address: ManagedAddress<StaticApi> = ManagedAddress::from_address(&address);
+        let managed_address: ManagedAddress<StaticApi> =
+            ManagedAddress::from_address(&address.to_address());
         self.interactor
             .tx()
             .from(&self.wallet_address)
@@ -585,7 +630,7 @@ impl SysFuncCallsInteract {
             .await;
     }
 
-    async fn create_nft(
+    async fn mint_nft(
         &mut self,
         token_id: &str,
         amount: RustBigUint,
@@ -617,15 +662,16 @@ impl SysFuncCallsInteract {
             .await;
     }
 
-    async fn unset_roles(&mut self, address: &str, token_id: &str, roles: Vec<u16>) {
-        let converted_roles: Vec<EsdtLocalRole> =
-            roles.into_iter().map(EsdtLocalRole::from).collect();
-
-        println!("Unsetting the following roles: {:?}", converted_roles);
+    async fn unset_roles(
+        &mut self,
+        address: Bech32Address,
+        token_id: &str,
+        roles: Vec<EsdtLocalRole>,
+    ) {
+        println!("Unsetting the following roles: {:?}", roles);
 
-        let bech32_addr = Bech32Address::from_bech32_string(address.to_string());
-        let addr = bech32_addr.to_address();
-        let managed_addr: ManagedAddress<StaticApi> = ManagedAddress::from_address(&addr);
+        let managed_addr: ManagedAddress<StaticApi> =
+            ManagedAddress::from_address(&address.to_address());
 
         self.interactor
             .tx()
@@ -636,7 +682,7 @@ impl SysFuncCallsInteract {
             .unset_special_roles(
                 &managed_addr,
                 &TokenIdentifier::from(token_id),
-                converted_roles.into_iter(),
+                roles.into_iter(),
             )
             .prepare_async()
             .run()
diff --git a/tools/interactor-system-func-calls/sys-func-calls/interact/src/basic_interact_cli.rs b/tools/interactor-system-func-calls/sys-func-calls/interact/src/basic_interact_cli.rs
index 5cb356b3d8..d498e11675 100644
--- a/tools/interactor-system-func-calls/sys-func-calls/interact/src/basic_interact_cli.rs
+++ b/tools/interactor-system-func-calls/sys-func-calls/interact/src/basic_interact_cli.rs
@@ -97,6 +97,8 @@ pub struct IssueTokenArgs {
 pub struct MintArgs {
     #[arg(long = "token-id")]
     pub token_id: String,
+    #[arg(short = 'n', long = "nonce")]
+    pub nonce: u64,
     #[arg(long = "amount")]
     pub amount: RustBigUint,
 }
@@ -113,6 +115,8 @@ pub struct SetRolesArgs {
 pub struct BurnArgs {
     #[arg(long = "token-id")]
     pub token_id: String,
+    #[arg(short = 'n', long = "nonce")]
+    pub nonce: u64,
     #[arg(long = "amount")]
     pub amount: RustBigUint,
 }
@@ -166,7 +170,7 @@ pub struct MintSFTArgs {
     #[arg(short = 'n', long = "name")]
     pub name: String,
     #[arg(short = 'r', long = "royalties")]
-    pub royalties: RustBigUint,
+    pub royalties: u64,
     #[arg(long = "hash")]
     pub hash: String,
 }

From 1f6f64449e3eba2c0014cd4b0a8d3f0fa73ad6b8 Mon Sep 17 00:00:00 2001
From: JustEatAnApple <mblacioti@gmail.com>
Date: Thu, 29 Aug 2024 09:47:45 +0300
Subject: [PATCH 1222/1254] Finished updating the adder example

Co-authored-by: Andrei Vasilescu <vasilescuandrei24@gmail.com>
---
 .../adder/interact/src/basic_interact.rs      | 71 ++++---------------
 1 file changed, 15 insertions(+), 56 deletions(-)

diff --git a/contracts/examples/adder/interact/src/basic_interact.rs b/contracts/examples/adder/interact/src/basic_interact.rs
index e1dc1b3dec..37e511b823 100644
--- a/contracts/examples/adder/interact/src/basic_interact.rs
+++ b/contracts/examples/adder/interact/src/basic_interact.rs
@@ -41,7 +41,8 @@ async fn main() {
             basic_interact.print_sum().await;
         },
         Some(basic_interact_cli::InteractCliCommand::Upgrade(args)) => {
-            basic_interact.upgrade(args.value).await
+            let owner_address = basic_interact.adder_owner_address.clone();
+            basic_interact.upgrade(args.value, owner_address, ExpectError(0, "")).await
         },
         None => {},
     }
@@ -209,63 +210,21 @@ impl AdderInteract {
         println!("sum: {sum}");
     }
 
-    async fn fail_upgrade(&mut self, new_value: u32) {
-        self.interactor
-            .tx()
-            .from(&self.wallet_address)
-            .to(self.state.current_adder_address())
-            .gas(6_000_000)
-            .typed(adder_proxy::AdderProxy)
-            .upgrade(BigUint::from(new_value))
-            .code_metadata(CodeMetadata::UPGRADEABLE)
-            .code(ADDER_CODE_PATH)
-            .with_result(ExpectError(4, "upgrade is allowed only for owner"))
-            .prepare_async()
-            .run()
-            .await;
-
-        let sum = self
-            .interactor
-            .query()
-            .to(self.state.current_adder_address())
-            .typed(adder_proxy::AdderProxy)
-            .sum()
-            .returns(ReturnsResultUnmanaged)
-            .prepare_async()
-            .run()
-            .await;
-        assert_ne!(sum, RustBigUint::from(new_value));
-
-        println!("Upgrade failed: upgrade is allowed only for owner");
-    }
-
-    async fn upgrade(&mut self, new_value: u32) {
+    async fn upgrade(&mut self, new_value: u32, sender: Bech32Address, expected_result: ExpectError<'_>) {
         let response = self
             .interactor
             .tx()
-            .from(&self.adder_owner_address)
+            .from(sender)
             .to(self.state.current_adder_address())
             .gas(6_000_000)
             .typed(adder_proxy::AdderProxy)
             .upgrade(BigUint::from(new_value))
             .code_metadata(CodeMetadata::UPGRADEABLE)
             .code(ADDER_CODE_PATH)
-            .returns(ReturnsResultUnmanaged)
-            .prepare_async()
-            .run()
-            .await;
-
-        let sum = self
-            .interactor
-            .query()
-            .to(self.state.current_adder_address())
-            .typed(adder_proxy::AdderProxy)
-            .sum()
-            .returns(ReturnsResultUnmanaged)
+            .returns(expected_result)
             .prepare_async()
             .run()
             .await;
-        assert_eq!(sum, RustBigUint::from(new_value));
 
         println!("response: {response:?}");
     }
@@ -273,22 +232,22 @@ impl AdderInteract {
 
 #[tokio::test]
 #[ignore = "run on demand"]
-async fn fail_upgrade_test() {
+async fn upgrade_test() {
     let mut basic_interact = AdderInteract::init().await;
 
     basic_interact.deploy().await;
     basic_interact.add(1u32).await;
 
-    basic_interact.fail_upgrade(7u32).await;
-}
+    // Sum will be 1
+    basic_interact.print_sum().await;
 
-#[tokio::test]
-#[ignore = "run on demand"]
-async fn upgrade_test() {
-    let mut basic_interact = AdderInteract::init().await;
+    basic_interact.upgrade(7u32, basic_interact.adder_owner_address.clone(), ExpectError(0, "")).await;
 
-    basic_interact.deploy().await;
-    basic_interact.add(1u32).await;
+    // Sum will be the updated value of 7
+    basic_interact.print_sum().await;
+
+    basic_interact.upgrade(10u32, basic_interact.wallet_address.clone(), ExpectError(4, "upgrade is allowed only for owner")).await;
 
-    basic_interact.upgrade(7u32).await;
+    // Sum will remain 7
+    basic_interact.print_sum().await;
 }

From 6e6c9e1ffc76b39204e2aeb89b4769b3cad7eca6 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 29 Aug 2024 10:40:17 +0300
Subject: [PATCH 1223/1254] ESDTSystemSCAddress in interactor

---
 .../markers/esdt_system_sc_address.rs         | 16 ++++----
 .../interact/src/basic_interact.rs            | 38 +++++++++----------
 2 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/framework/base/src/types/interaction/markers/esdt_system_sc_address.rs b/framework/base/src/types/interaction/markers/esdt_system_sc_address.rs
index b7b646ae16..e422553ca4 100644
--- a/framework/base/src/types/interaction/markers/esdt_system_sc_address.rs
+++ b/framework/base/src/types/interaction/markers/esdt_system_sc_address.rs
@@ -3,8 +3,8 @@ use multiversx_sc_codec::{EncodeErrorHandler, TopEncode, TopEncodeOutput};
 
 use crate::{
     abi::TypeAbiFrom,
-    api::{CallTypeApi, ManagedTypeApi},
-    types::{AnnotatedValue, ManagedAddress, ManagedBuffer, TxScEnv, TxTo, TxToSpecified},
+    api::ManagedTypeApi,
+    types::{AnnotatedValue, ManagedAddress, ManagedBuffer, TxEnv, TxTo, TxToSpecified},
 };
 
 /// Address of the system smart contract that manages ESDT.
@@ -35,21 +35,21 @@ impl ESDTSystemSCAddress {
     }
 }
 
-impl<Api> AnnotatedValue<TxScEnv<Api>, ManagedAddress<Api>> for ESDTSystemSCAddress
+impl<Env> AnnotatedValue<Env, ManagedAddress<Env::Api>> for ESDTSystemSCAddress
 where
-    Api: CallTypeApi,
+    Env: TxEnv,
 {
-    fn annotation(&self, _env: &TxScEnv<Api>) -> ManagedBuffer<Api> {
+    fn annotation(&self, _env: &Env) -> ManagedBuffer<Env::Api> {
         ManagedBuffer::from(SYSTEM_SC_ADDRESS_ANNOTATION)
     }
 
-    fn to_value(&self, _env: &TxScEnv<Api>) -> ManagedAddress<Api> {
+    fn to_value(&self, _env: &Env) -> ManagedAddress<Env::Api> {
         ESDTSystemSCAddress.to_managed_address()
     }
 }
 
-impl<Api> TxTo<TxScEnv<Api>> for ESDTSystemSCAddress where Api: CallTypeApi {}
-impl<Api> TxToSpecified<TxScEnv<Api>> for ESDTSystemSCAddress where Api: CallTypeApi {}
+impl<Env> TxTo<Env> for ESDTSystemSCAddress where Env: TxEnv {}
+impl<Env> TxToSpecified<Env> for ESDTSystemSCAddress where Env: TxEnv {}
 
 impl TopEncode for ESDTSystemSCAddress {
     fn top_encode_or_handle_err<O, H>(&self, output: O, h: H) -> Result<(), H::HandledErr>
diff --git a/tools/interactor-system-func-calls/sys-func-calls/interact/src/basic_interact.rs b/tools/interactor-system-func-calls/sys-func-calls/interact/src/basic_interact.rs
index fb08fd587b..33edf61b4b 100644
--- a/tools/interactor-system-func-calls/sys-func-calls/interact/src/basic_interact.rs
+++ b/tools/interactor-system-func-calls/sys-func-calls/interact/src/basic_interact.rs
@@ -231,7 +231,7 @@ impl SysFuncCallsInteract {
             .interactor
             .tx()
             .from(&self.wallet_address)
-            .to(ESDTSystemSCAddress.to_managed_address())
+            .to(ESDTSystemSCAddress)
             .gas(100_000_000u64)
             .typed(ESDTSystemSCProxy)
             .issue_fungible(
@@ -270,7 +270,7 @@ impl SysFuncCallsInteract {
             .interactor
             .tx()
             .from(&self.wallet_address)
-            .to(ESDTSystemSCAddress.to_managed_address())
+            .to(ESDTSystemSCAddress)
             .gas(100_000_000u64)
             .typed(ESDTSystemSCProxy)
             .issue_non_fungible(
@@ -306,7 +306,7 @@ impl SysFuncCallsInteract {
             .interactor
             .tx()
             .from(&self.wallet_address)
-            .to(ESDTSystemSCAddress.to_managed_address())
+            .to(ESDTSystemSCAddress)
             .gas(100_000_000u64)
             .typed(ESDTSystemSCProxy)
             .issue_semi_fungible(
@@ -344,7 +344,7 @@ impl SysFuncCallsInteract {
             .interactor
             .tx()
             .from(&self.wallet_address)
-            .to(ESDTSystemSCAddress.to_managed_address())
+            .to(ESDTSystemSCAddress)
             .gas(100_000_000u64)
             .typed(ESDTSystemSCProxy)
             .issue_and_set_all_roles(
@@ -372,7 +372,7 @@ impl SysFuncCallsInteract {
         self.interactor
             .tx()
             .from(&self.wallet_address)
-            .to(ESDTSystemSCAddress.to_managed_address())
+            .to(ESDTSystemSCAddress)
             .gas(100_000_000u64)
             .typed(ESDTSystemSCProxy)
             .set_special_roles(
@@ -430,7 +430,7 @@ impl SysFuncCallsInteract {
             .interactor
             .tx()
             .from(&self.wallet_address)
-            .to(ESDTSystemSCAddress.to_managed_address())
+            .to(ESDTSystemSCAddress)
             .gas(100_000_000u64)
             .typed(ESDTSystemSCProxy)
             .register_meta_esdt(
@@ -461,7 +461,7 @@ impl SysFuncCallsInteract {
         self.interactor
             .tx()
             .from(&self.wallet_address)
-            .to(ESDTSystemSCAddress.to_managed_address())
+            .to(ESDTSystemSCAddress)
             .gas(100_000_000u64)
             .typed(ESDTSystemSCProxy)
             .change_sft_to_meta_esdt(&TokenIdentifier::from(token_id), num_decimals)
@@ -511,7 +511,7 @@ impl SysFuncCallsInteract {
         self.interactor
             .tx()
             .from(&self.wallet_address)
-            .to(ESDTSystemSCAddress.to_managed_address())
+            .to(ESDTSystemSCAddress)
             .gas(100_000_000u64)
             .typed(ESDTSystemSCProxy)
             .pause(&TokenIdentifier::from(token_id))
@@ -525,7 +525,7 @@ impl SysFuncCallsInteract {
         self.interactor
             .tx()
             .from(&self.wallet_address)
-            .to(ESDTSystemSCAddress.to_managed_address())
+            .to(ESDTSystemSCAddress)
             .gas(100_000_000u64)
             .typed(ESDTSystemSCProxy)
             .unpause(&TokenIdentifier::from(token_id))
@@ -541,7 +541,7 @@ impl SysFuncCallsInteract {
         self.interactor
             .tx()
             .from(&self.wallet_address)
-            .to(ESDTSystemSCAddress.to_managed_address())
+            .to(ESDTSystemSCAddress)
             .gas(100_000_000u64)
             .typed(ESDTSystemSCProxy)
             .freeze(&TokenIdentifier::from(token_id), &managed_address)
@@ -557,7 +557,7 @@ impl SysFuncCallsInteract {
         self.interactor
             .tx()
             .from(&self.wallet_address)
-            .to(ESDTSystemSCAddress.to_managed_address())
+            .to(ESDTSystemSCAddress)
             .gas(100_000_000u64)
             .typed(ESDTSystemSCProxy)
             .unfreeze(&TokenIdentifier::from(token_id), &managed_address)
@@ -573,7 +573,7 @@ impl SysFuncCallsInteract {
         self.interactor
             .tx()
             .from(&self.wallet_address)
-            .to(ESDTSystemSCAddress.to_managed_address())
+            .to(ESDTSystemSCAddress)
             .gas(100_000_000u64)
             .typed(ESDTSystemSCProxy)
             .freeze_nft(&TokenIdentifier::from(token_id), nonce, &managed_address)
@@ -589,7 +589,7 @@ impl SysFuncCallsInteract {
         self.interactor
             .tx()
             .from(&self.wallet_address)
-            .to(ESDTSystemSCAddress.to_managed_address())
+            .to(ESDTSystemSCAddress)
             .gas(100_000_000u64)
             .typed(ESDTSystemSCProxy)
             .unfreeze_nft(&TokenIdentifier::from(token_id), nonce, &managed_address)
@@ -605,7 +605,7 @@ impl SysFuncCallsInteract {
         self.interactor
             .tx()
             .from(&self.wallet_address)
-            .to(&ESDTSystemSCAddress.to_managed_address())
+            .to(ESDTSystemSCAddress)
             .gas(100_000_000u64)
             .typed(ESDTSystemSCProxy)
             .wipe(&TokenIdentifier::from(token_id), &managed_address)
@@ -621,7 +621,7 @@ impl SysFuncCallsInteract {
         self.interactor
             .tx()
             .from(&self.wallet_address)
-            .to(ESDTSystemSCAddress.to_managed_address())
+            .to(ESDTSystemSCAddress)
             .gas(100_000_000u64)
             .typed(ESDTSystemSCProxy)
             .wipe_nft(&TokenIdentifier::from(token_id), nonce, &managed_address)
@@ -676,7 +676,7 @@ impl SysFuncCallsInteract {
         self.interactor
             .tx()
             .from(&self.wallet_address)
-            .to(ESDTSystemSCAddress.to_managed_address())
+            .to(ESDTSystemSCAddress)
             .gas(100_000_000u64)
             .typed(ESDTSystemSCProxy)
             .unset_special_roles(
@@ -698,7 +698,7 @@ impl SysFuncCallsInteract {
         self.interactor
             .tx()
             .from(&self.wallet_address)
-            .to(ESDTSystemSCAddress.to_managed_address())
+            .to(ESDTSystemSCAddress)
             .gas(100_000_000u64)
             .typed(ESDTSystemSCProxy)
             .transfer_ownership(&TokenIdentifier::from(token_id), &managed_addr)
@@ -722,7 +722,7 @@ impl SysFuncCallsInteract {
         self.interactor
             .tx()
             .from(&self.wallet_address)
-            .to(ESDTSystemSCAddress.to_managed_address())
+            .to(ESDTSystemSCAddress)
             .gas(100_000_000u64)
             .typed(ESDTSystemSCProxy)
             .transfer_nft_create_role(
@@ -740,7 +740,7 @@ impl SysFuncCallsInteract {
         self.interactor
             .tx()
             .from(&self.wallet_address)
-            .to(ESDTSystemSCAddress.to_managed_address())
+            .to(ESDTSystemSCAddress)
             .gas(100_000_000u64)
             .typed(ESDTSystemSCProxy)
             .control_changes(

From 1bf4b456acc1ce7727f6e82eece678fdf5e2620d Mon Sep 17 00:00:00 2001
From: Andrei Vasilescu <vasilescuandrei24@gmail.com>
Date: Thu, 29 Aug 2024 10:43:58 +0300
Subject: [PATCH 1224/1254] changed test wallet

---
 .../sys-func-calls/interact/src/basic_interact.rs              | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tools/interactor-system-func-calls/sys-func-calls/interact/src/basic_interact.rs b/tools/interactor-system-func-calls/sys-func-calls/interact/src/basic_interact.rs
index 33edf61b4b..57b1ebe1aa 100644
--- a/tools/interactor-system-func-calls/sys-func-calls/interact/src/basic_interact.rs
+++ b/tools/interactor-system-func-calls/sys-func-calls/interact/src/basic_interact.rs
@@ -208,8 +208,7 @@ impl SysFuncCallsInteract {
         let config = Config::load_config();
         let mut interactor = Interactor::new(config.gateway()).await;
 
-        let wallet_address =
-            interactor.register_wallet(Wallet::from_pem_file("wallet.pem").unwrap());
+        let wallet_address = interactor.register_wallet(test_wallets::alice());
 
         Self {
             interactor,

From 6dc98686a3dbca8979ec8b34ac87f2cc0fb0a5de Mon Sep 17 00:00:00 2001
From: Andrei Vasilescu <vasilescuandrei24@gmail.com>
Date: Thu, 29 Aug 2024 12:10:58 +0300
Subject: [PATCH 1225/1254] refactored upgrade code

---
 .../adder/interact/src/basic_interact.rs      | 83 ++++++++++++++-----
 1 file changed, 64 insertions(+), 19 deletions(-)

diff --git a/contracts/examples/adder/interact/src/basic_interact.rs b/contracts/examples/adder/interact/src/basic_interact.rs
index 37e511b823..93a00d4079 100644
--- a/contracts/examples/adder/interact/src/basic_interact.rs
+++ b/contracts/examples/adder/interact/src/basic_interact.rs
@@ -42,7 +42,9 @@ async fn main() {
         },
         Some(basic_interact_cli::InteractCliCommand::Upgrade(args)) => {
             let owner_address = basic_interact.adder_owner_address.clone();
-            basic_interact.upgrade(args.value, owner_address, ExpectError(0, "")).await
+            basic_interact
+                .upgrade(args.value, &owner_address, None)
+                .await
         },
         None => {},
     }
@@ -210,23 +212,59 @@ impl AdderInteract {
         println!("sum: {sum}");
     }
 
-    async fn upgrade(&mut self, new_value: u32, sender: Bech32Address, expected_result: ExpectError<'_>) {
-        let response = self
-            .interactor
-            .tx()
-            .from(sender)
-            .to(self.state.current_adder_address())
-            .gas(6_000_000)
-            .typed(adder_proxy::AdderProxy)
-            .upgrade(BigUint::from(new_value))
-            .code_metadata(CodeMetadata::UPGRADEABLE)
-            .code(ADDER_CODE_PATH)
-            .returns(expected_result)
-            .prepare_async()
-            .run()
-            .await;
+    async fn upgrade(
+        &mut self,
+        new_value: u32,
+        sender: &Bech32Address,
+        expected_result: Option<(u64, &str)>,
+    ) {
+        match expected_result {
+            Some((code, msg)) => {
+                let response = self
+                    .interactor
+                    .tx()
+                    .from(sender)
+                    .to(self.state.current_adder_address())
+                    .gas(6_000_000)
+                    .typed(adder_proxy::AdderProxy)
+                    .upgrade(BigUint::from(new_value))
+                    .code_metadata(CodeMetadata::UPGRADEABLE)
+                    .code(ADDER_CODE_PATH)
+                    .returns(ExpectError(code, msg))
+                    .prepare_async()
+                    .run()
+                    .await;
+
+                println!("response: {response:?}");
+            },
+            None => {
+                self.interactor
+                    .tx()
+                    .from(sender)
+                    .to(self.state.current_adder_address())
+                    .gas(6_000_000)
+                    .typed(adder_proxy::AdderProxy)
+                    .upgrade(BigUint::from(new_value))
+                    .code_metadata(CodeMetadata::UPGRADEABLE)
+                    .code(ADDER_CODE_PATH)
+                    .prepare_async()
+                    .run()
+                    .await;
 
-        println!("response: {response:?}");
+                let sum = self
+                    .interactor
+                    .query()
+                    .to(self.state.current_adder_address())
+                    .typed(adder_proxy::AdderProxy)
+                    .sum()
+                    .returns(ReturnsResultUnmanaged)
+                    .prepare_async()
+                    .run()
+                    .await;
+
+                assert_eq!(sum, RustBigUint::from(new_value));
+            },
+        }
     }
 }
 
@@ -234,6 +272,9 @@ impl AdderInteract {
 #[ignore = "run on demand"]
 async fn upgrade_test() {
     let mut basic_interact = AdderInteract::init().await;
+    let wallet_address = basic_interact.wallet_address.clone();
+    let adder_owner_address = basic_interact.adder_owner_address.clone();
+    let error_not_owner = (4, "upgrade is allowed only for owner");
 
     basic_interact.deploy().await;
     basic_interact.add(1u32).await;
@@ -241,12 +282,16 @@ async fn upgrade_test() {
     // Sum will be 1
     basic_interact.print_sum().await;
 
-    basic_interact.upgrade(7u32, basic_interact.adder_owner_address.clone(), ExpectError(0, "")).await;
+    basic_interact
+        .upgrade(7u32, &adder_owner_address, None)
+        .await;
 
     // Sum will be the updated value of 7
     basic_interact.print_sum().await;
 
-    basic_interact.upgrade(10u32, basic_interact.wallet_address.clone(), ExpectError(4, "upgrade is allowed only for owner")).await;
+    basic_interact
+        .upgrade(10u32, &wallet_address, Some(error_not_owner))
+        .await;
 
     // Sum will remain 7
     basic_interact.print_sum().await;

From 3e35a4539a5a40e381769e5be34eb466ac7b4b98 Mon Sep 17 00:00:00 2001
From: Andrei Vasilescu <vasilescuandrei24@gmail.com>
Date: Thu, 29 Aug 2024 12:45:35 +0300
Subject: [PATCH 1226/1254] refactored file system

Co-authored-by: Mihai Blacioti <mblacioti@gmail.com>
---
 Cargo.lock                                    | 20 +++----
 Cargo.toml                                    |  2 +-
 .../{sys-func-calls/interact => }/.gitignore  |  2 +-
 .../{sys-func-calls/interact => }/Cargo.toml  |  8 +--
 .../{sys-func-calls/interact => }/config.toml |  0
 .../system_sc_interact.rs}                    | 60 +++++++++----------
 .../system_sc_interact_cli.rs}                |  0
 .../system_sc_interact_config.rs}             |  2 +-
 .../system_sc_interact_state.rs}              |  0
 9 files changed, 47 insertions(+), 47 deletions(-)
 rename tools/interactor-system-func-calls/{sys-func-calls/interact => }/.gitignore (89%)
 rename tools/interactor-system-func-calls/{sys-func-calls/interact => }/Cargo.toml (68%)
 rename tools/interactor-system-func-calls/{sys-func-calls/interact => }/config.toml (100%)
 rename tools/interactor-system-func-calls/{sys-func-calls/interact/src/basic_interact.rs => src/system_sc_interact.rs} (91%)
 rename tools/interactor-system-func-calls/{sys-func-calls/interact/src/basic_interact_cli.rs => src/system_sc_interact_cli.rs} (100%)
 rename tools/interactor-system-func-calls/{sys-func-calls/interact/src/basic_interact_config.rs => src/system_sc_interact_config.rs} (92%)
 rename tools/interactor-system-func-calls/{sys-func-calls/interact/src/basic_interact_state.rs => src/system_sc_interact_state.rs} (100%)

diff --git a/Cargo.lock b/Cargo.lock
index 126235e69e..07022466f3 100755
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -264,16 +264,6 @@ dependencies = [
  "toml",
 ]
 
-[[package]]
-name = "basic-interact-sys-calls"
-version = "0.0.0"
-dependencies = [
- "clap",
- "multiversx-sc-snippets",
- "serde",
- "toml",
-]
-
 [[package]]
 name = "bech32"
 version = "0.9.1"
@@ -3435,6 +3425,16 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "system-sc-interact"
+version = "0.0.0"
+dependencies = [
+ "clap",
+ "multiversx-sc-snippets",
+ "serde",
+ "toml",
+]
+
 [[package]]
 name = "tempfile"
 version = "3.12.0"
diff --git a/Cargo.toml b/Cargo.toml
index ba889c374d..651456eebd 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -19,7 +19,7 @@ members = [
   "tools/mxpy-snippet-generator",
   "tools/payload-macro-generator",
   # "tools/plotter",
-  "tools/interactor-system-func-calls/sys-func-calls/interact/",
+  "tools/interactor-system-func-calls/",
 
   "vm",
 
diff --git a/tools/interactor-system-func-calls/sys-func-calls/interact/.gitignore b/tools/interactor-system-func-calls/.gitignore
similarity index 89%
rename from tools/interactor-system-func-calls/sys-func-calls/interact/.gitignore
rename to tools/interactor-system-func-calls/.gitignore
index b2630809de..ae87d15dcd 100644
--- a/tools/interactor-system-func-calls/sys-func-calls/interact/.gitignore
+++ b/tools/interactor-system-func-calls/.gitignore
@@ -6,4 +6,4 @@
 state.toml
 
 # Trace file of interactor tooling
-interactor_trace.scen.json
+interactor_trace.scen.json
\ No newline at end of file
diff --git a/tools/interactor-system-func-calls/sys-func-calls/interact/Cargo.toml b/tools/interactor-system-func-calls/Cargo.toml
similarity index 68%
rename from tools/interactor-system-func-calls/sys-func-calls/interact/Cargo.toml
rename to tools/interactor-system-func-calls/Cargo.toml
index 837ff49d1c..1cfd20f282 100644
--- a/tools/interactor-system-func-calls/sys-func-calls/interact/Cargo.toml
+++ b/tools/interactor-system-func-calls/Cargo.toml
@@ -1,9 +1,9 @@
 [[bin]]
-name = "basic-interact-sys-calls"
-path = "src/basic_interact.rs"
+name = "system-sc-interact"
+path = "src/system_sc_interact.rs"
 
 [package]
-name = "basic-interact-sys-calls"
+name = "system-sc-interact"
 version = "0.0.0"
 publish = false
 edition = "2021"
@@ -22,4 +22,4 @@ features = ["derive"]
 
 [dependencies.multiversx-sc-snippets]
 version = "=0.52.3"
-path = "../../../../framework/snippets"
+path = "../../framework/snippets"
diff --git a/tools/interactor-system-func-calls/sys-func-calls/interact/config.toml b/tools/interactor-system-func-calls/config.toml
similarity index 100%
rename from tools/interactor-system-func-calls/sys-func-calls/interact/config.toml
rename to tools/interactor-system-func-calls/config.toml
diff --git a/tools/interactor-system-func-calls/sys-func-calls/interact/src/basic_interact.rs b/tools/interactor-system-func-calls/src/system_sc_interact.rs
similarity index 91%
rename from tools/interactor-system-func-calls/sys-func-calls/interact/src/basic_interact.rs
rename to tools/interactor-system-func-calls/src/system_sc_interact.rs
index 57b1ebe1aa..c522384290 100644
--- a/tools/interactor-system-func-calls/sys-func-calls/interact/src/basic_interact.rs
+++ b/tools/interactor-system-func-calls/src/system_sc_interact.rs
@@ -1,11 +1,11 @@
-mod basic_interact_cli;
-mod basic_interact_config;
-mod basic_interact_state;
+mod system_sc_interact_cli;
+mod system_sc_interact_config;
+mod system_sc_interact_state;
 
-use basic_interact_cli::NftDummyAttributes;
-use basic_interact_config::Config;
-use basic_interact_state::State;
 use clap::Parser;
+use system_sc_interact_cli::NftDummyAttributes;
+use system_sc_interact_config::Config;
+use system_sc_interact_state::State;
 
 use multiversx_sc_snippets::imports::*;
 
@@ -15,9 +15,9 @@ async fn main() {
 
     let mut basic_interact = SysFuncCallsInteract::init().await;
 
-    let cli = basic_interact_cli::InteractCli::parse();
+    let cli = system_sc_interact_cli::InteractCli::parse();
     match &cli.command {
-        Some(basic_interact_cli::InteractCliCommand::IssueToken(args)) => {
+        Some(system_sc_interact_cli::InteractCliCommand::IssueToken(args)) => {
             basic_interact
                 .issue_token(
                     args.cost.clone(),
@@ -28,12 +28,12 @@ async fn main() {
                 )
                 .await;
         },
-        Some(basic_interact_cli::InteractCliCommand::Mint(args)) => {
+        Some(system_sc_interact_cli::InteractCliCommand::Mint(args)) => {
             basic_interact
                 .mint_token(&args.token_id, args.nonce, args.amount.clone())
                 .await;
         },
-        Some(basic_interact_cli::InteractCliCommand::SetRoles(args)) => {
+        Some(system_sc_interact_cli::InteractCliCommand::SetRoles(args)) => {
             basic_interact
                 .set_roles(
                     &args.token_id,
@@ -45,18 +45,18 @@ async fn main() {
                 )
                 .await;
         },
-        Some(basic_interact_cli::InteractCliCommand::Burn(args)) => {
+        Some(system_sc_interact_cli::InteractCliCommand::Burn(args)) => {
             basic_interact
                 .burn_token(&args.token_id, args.nonce, args.amount.clone())
                 .await;
         },
-        Some(basic_interact_cli::InteractCliCommand::PauseToken(args)) => {
+        Some(system_sc_interact_cli::InteractCliCommand::PauseToken(args)) => {
             basic_interact.pause_token(&args.token_id).await;
         },
-        Some(basic_interact_cli::InteractCliCommand::UnpauseToken(args)) => {
+        Some(system_sc_interact_cli::InteractCliCommand::UnpauseToken(args)) => {
             basic_interact.unpause_token(&args.token_id).await;
         },
-        Some(basic_interact_cli::InteractCliCommand::FreezeToken(args)) => {
+        Some(system_sc_interact_cli::InteractCliCommand::FreezeToken(args)) => {
             basic_interact
                 .freeze_token(
                     &args.token_id,
@@ -64,7 +64,7 @@ async fn main() {
                 )
                 .await;
         },
-        Some(basic_interact_cli::InteractCliCommand::UnfreezeToken(args)) => {
+        Some(system_sc_interact_cli::InteractCliCommand::UnfreezeToken(args)) => {
             basic_interact
                 .unfreeze_token(
                     &args.token_id,
@@ -72,7 +72,7 @@ async fn main() {
                 )
                 .await;
         },
-        Some(basic_interact_cli::InteractCliCommand::FreezeNFT(args)) => {
+        Some(system_sc_interact_cli::InteractCliCommand::FreezeNFT(args)) => {
             basic_interact
                 .freeze_nft(
                     &args.token_id,
@@ -81,7 +81,7 @@ async fn main() {
                 )
                 .await;
         },
-        Some(basic_interact_cli::InteractCliCommand::UnfreezeNFT(args)) => {
+        Some(system_sc_interact_cli::InteractCliCommand::UnfreezeNFT(args)) => {
             basic_interact
                 .unfreeze_nft(
                     &args.token_id,
@@ -90,7 +90,7 @@ async fn main() {
                 )
                 .await;
         },
-        Some(basic_interact_cli::InteractCliCommand::WipeToken(args)) => {
+        Some(system_sc_interact_cli::InteractCliCommand::WipeToken(args)) => {
             basic_interact
                 .wipe_token(
                     &args.token_id,
@@ -98,7 +98,7 @@ async fn main() {
                 )
                 .await;
         },
-        Some(basic_interact_cli::InteractCliCommand::WipeNFT(args)) => {
+        Some(system_sc_interact_cli::InteractCliCommand::WipeNFT(args)) => {
             basic_interact
                 .wipe_nft(
                     &args.token_id,
@@ -107,12 +107,12 @@ async fn main() {
                 )
                 .await;
         },
-        Some(basic_interact_cli::InteractCliCommand::IssueNFTCollection(args)) => {
+        Some(system_sc_interact_cli::InteractCliCommand::IssueNFTCollection(args)) => {
             basic_interact
                 .issue_non_fungible_collection(args.cost.clone(), &args.display_name, &args.ticker)
                 .await;
         },
-        Some(basic_interact_cli::InteractCliCommand::CreateNFT(args)) => {
+        Some(system_sc_interact_cli::InteractCliCommand::CreateNFT(args)) => {
             basic_interact
                 .mint_nft(
                     &args.token_id,
@@ -123,7 +123,7 @@ async fn main() {
                 )
                 .await;
         },
-        Some(basic_interact_cli::InteractCliCommand::IssueFungible(args)) => {
+        Some(system_sc_interact_cli::InteractCliCommand::IssueFungible(args)) => {
             basic_interact
                 .issue_fungible_token(
                     args.cost.clone(),
@@ -134,12 +134,12 @@ async fn main() {
                 )
                 .await;
         },
-        Some(basic_interact_cli::InteractCliCommand::IssueSftCollection(args)) => {
+        Some(system_sc_interact_cli::InteractCliCommand::IssueSftCollection(args)) => {
             basic_interact
                 .issue_semi_fungible_collection(args.cost.clone(), &args.display_name, &args.ticker)
                 .await;
         },
-        Some(basic_interact_cli::InteractCliCommand::MintSft(args)) => {
+        Some(system_sc_interact_cli::InteractCliCommand::MintSft(args)) => {
             basic_interact
                 .mint_sft(
                     &args.token_id,
@@ -150,7 +150,7 @@ async fn main() {
                 )
                 .await;
         },
-        Some(basic_interact_cli::InteractCliCommand::RegisterMetaEsdt(args)) => {
+        Some(system_sc_interact_cli::InteractCliCommand::RegisterMetaEsdt(args)) => {
             basic_interact
                 .register_meta_esdt(
                     args.cost.clone(),
@@ -160,12 +160,12 @@ async fn main() {
                 )
                 .await;
         },
-        Some(basic_interact_cli::InteractCliCommand::ChangeSftMetaEsdt(args)) => {
+        Some(system_sc_interact_cli::InteractCliCommand::ChangeSftMetaEsdt(args)) => {
             basic_interact
                 .change_sft_meta_esdt(&args.token_id, args.num_decimals)
                 .await;
         },
-        Some(basic_interact_cli::InteractCliCommand::UnsetRoles(args)) => {
+        Some(system_sc_interact_cli::InteractCliCommand::UnsetRoles(args)) => {
             basic_interact
                 .unset_roles(
                     Bech32Address::from_bech32_string(args.address.clone()),
@@ -178,17 +178,17 @@ async fn main() {
                 )
                 .await;
         },
-        Some(basic_interact_cli::InteractCliCommand::TransferOwnership(args)) => {
+        Some(system_sc_interact_cli::InteractCliCommand::TransferOwnership(args)) => {
             basic_interact
                 .transfer_ownership(&args.token_id, &args.new_owner)
                 .await;
         },
-        Some(basic_interact_cli::InteractCliCommand::TransferNftCreateRole(args)) => {
+        Some(system_sc_interact_cli::InteractCliCommand::TransferNftCreateRole(args)) => {
             basic_interact
                 .transfer_nft_create_role(&args.token_id, &args.old_owner, &args.new_owner)
                 .await;
         },
-        Some(basic_interact_cli::InteractCliCommand::ControlChanges(args)) => {
+        Some(system_sc_interact_cli::InteractCliCommand::ControlChanges(args)) => {
             basic_interact.control_changes(&args.token_id).await;
         },
 
diff --git a/tools/interactor-system-func-calls/sys-func-calls/interact/src/basic_interact_cli.rs b/tools/interactor-system-func-calls/src/system_sc_interact_cli.rs
similarity index 100%
rename from tools/interactor-system-func-calls/sys-func-calls/interact/src/basic_interact_cli.rs
rename to tools/interactor-system-func-calls/src/system_sc_interact_cli.rs
diff --git a/tools/interactor-system-func-calls/sys-func-calls/interact/src/basic_interact_config.rs b/tools/interactor-system-func-calls/src/system_sc_interact_config.rs
similarity index 92%
rename from tools/interactor-system-func-calls/sys-func-calls/interact/src/basic_interact_config.rs
rename to tools/interactor-system-func-calls/src/system_sc_interact_config.rs
index f25b91a884..4495f069b8 100644
--- a/tools/interactor-system-func-calls/sys-func-calls/interact/src/basic_interact_config.rs
+++ b/tools/interactor-system-func-calls/src/system_sc_interact_config.rs
@@ -2,7 +2,7 @@ use serde::Deserialize;
 use std::io::Read;
 
 /// Config file
-const CONFIG_FILE: &str = "config.toml";
+const CONFIG_FILE: &str = "../config.toml";
 
 /// SysFuncCalls Interact configuration
 #[derive(Debug, Deserialize)]
diff --git a/tools/interactor-system-func-calls/sys-func-calls/interact/src/basic_interact_state.rs b/tools/interactor-system-func-calls/src/system_sc_interact_state.rs
similarity index 100%
rename from tools/interactor-system-func-calls/sys-func-calls/interact/src/basic_interact_state.rs
rename to tools/interactor-system-func-calls/src/system_sc_interact_state.rs

From 1d7f49587f3066df32ba4218b8261591305f9080 Mon Sep 17 00:00:00 2001
From: Andrei Vasilescu <vasilescuandrei24@gmail.com>
Date: Thu, 29 Aug 2024 16:03:58 +0300
Subject: [PATCH 1227/1254] fixed returnsNewTokenIdentifier interactor

---
 framework/snippets/src/network_response.rs | 23 +++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/framework/snippets/src/network_response.rs b/framework/snippets/src/network_response.rs
index d505e7a525..4d828e12c7 100644
--- a/framework/snippets/src/network_response.rs
+++ b/framework/snippets/src/network_response.rs
@@ -103,25 +103,31 @@ fn process_new_deployed_address(tx: &TransactionOnNetwork) -> Option<Address> {
 }
 
 fn process_new_issued_token_identifier(tx: &TransactionOnNetwork) -> Option<String> {
+    let original_tx_data = String::from_utf8(base64_decode(tx.data.as_ref().unwrap())).unwrap();
+
     for scr in tx.smart_contract_results.iter() {
         if scr.sender.to_bech32_string().unwrap() != ESDTSystemSCAddress.to_bech32_string() {
             continue;
         }
 
-        let Some(prev_tx) = tx
+        let prev_tx_data: &str = if let Some(prev_tx) = tx
             .smart_contract_results
             .iter()
             .find(|e| e.hash == scr.prev_tx_hash)
-        else {
+        {
+            prev_tx.data.as_ref()
+        } else if &scr.prev_tx_hash == tx.hash.as_ref().unwrap() {
+            &original_tx_data
+        } else {
             continue;
         };
 
-        let is_issue_fungible = prev_tx.data.starts_with("issue@");
-        let is_issue_semi_fungible = prev_tx.data.starts_with("issueSemiFungible@");
-        let is_issue_non_fungible = prev_tx.data.starts_with("issueNonFungible@");
-        let is_register_meta_esdt = prev_tx.data.starts_with("registerMetaESDT@");
+        let is_issue_fungible = prev_tx_data.starts_with("issue@");
+        let is_issue_semi_fungible = prev_tx_data.starts_with("issueSemiFungible@");
+        let is_issue_non_fungible = prev_tx_data.starts_with("issueNonFungible@");
+        let is_register_meta_esdt = prev_tx_data.starts_with("registerMetaESDT@");
         let is_register_and_set_all_roles_esdt =
-            prev_tx.data.starts_with("registerAndSetAllRoles@");
+            prev_tx_data.starts_with("registerAndSetAllRoles@");
 
         if !is_issue_fungible
             && !is_issue_semi_fungible
@@ -135,12 +141,11 @@ fn process_new_issued_token_identifier(tx: &TransactionOnNetwork) -> Option<Stri
         if scr.data.starts_with("ESDTTransfer@") {
             let encoded_tid = scr.data.split('@').nth(1);
             return Some(String::from_utf8(hex::decode(encoded_tid?).unwrap()).unwrap());
-        } else if scr.data.starts_with("@00@") {
+        } else if scr.data.starts_with("@00@") || scr.data.starts_with("@6f6b@") {
             let encoded_tid = scr.data.split('@').nth(2);
             return Some(String::from_utf8(hex::decode(encoded_tid?).unwrap()).unwrap());
         }
     }
-
     None
 }
 

From cc48860294112dc1949c38c881cac83acb443126 Mon Sep 17 00:00:00 2001
From: Andrei Vasilescu <vasilescuandrei24@gmail.com>
Date: Thu, 29 Aug 2024 17:05:05 +0300
Subject: [PATCH 1228/1254] added fix for sc calls creating systemSC issues

---
 sdk/core/src/gateway/gateway_tx_retrieve.rs | 23 +++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/sdk/core/src/gateway/gateway_tx_retrieve.rs b/sdk/core/src/gateway/gateway_tx_retrieve.rs
index 821713f972..c5bbda6adf 100644
--- a/sdk/core/src/gateway/gateway_tx_retrieve.rs
+++ b/sdk/core/src/gateway/gateway_tx_retrieve.rs
@@ -14,6 +14,7 @@ impl GatewayProxy {
         let mut retries = 0;
         let mut backoff_delay = Duration::from_secs_f32(INITIAL_BACKOFF_DELAY);
         let start_time = Instant::now();
+        let mut issue_found = false;
 
         loop {
             match self.get_transaction_status(&tx_hash).await {
@@ -26,6 +27,20 @@ impl GatewayProxy {
                                 .get_transaction_info_with_results(&tx_hash)
                                 .await
                                 .unwrap();
+
+                            if transaction_info_with_results.smart_contract_results.len() > 0
+                                && issue_found == false
+                            {
+                                let first_scr =
+                                    &transaction_info_with_results.smart_contract_results[0];
+
+                                if GatewayProxy::is_issue_tx(&first_scr.data) {
+                                    issue_found = true;
+                                    tokio::time::sleep(Duration::from_secs(30)).await;
+                                    continue;
+                                }
+                            }
+
                             info!(
                                 "Transaction retrieved successfully, with status {}: {:#?}",
                                 status, transaction_info_with_results
@@ -60,4 +75,12 @@ impl GatewayProxy {
         );
         TransactionOnNetwork::default()
     }
+
+    fn is_issue_tx(data: &str) -> bool {
+        data.starts_with("issue@")
+            || data.starts_with("issueSemiFungible@")
+            || data.starts_with("issueNonFungible@")
+            || data.starts_with("registerMetaESDT@")
+            || data.starts_with("registerAndSetAllRoles@")
+    }
 }

From 044153613ea4dbedd53822b4ff0681e341b99ec0 Mon Sep 17 00:00:00 2001
From: Andrei Vasilescu <vasilescuandrei24@gmail.com>
Date: Thu, 29 Aug 2024 17:07:39 +0300
Subject: [PATCH 1229/1254] fixed clippy warnings

---
 sdk/core/src/gateway/gateway_tx_retrieve.rs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/sdk/core/src/gateway/gateway_tx_retrieve.rs b/sdk/core/src/gateway/gateway_tx_retrieve.rs
index c5bbda6adf..452d37b3e0 100644
--- a/sdk/core/src/gateway/gateway_tx_retrieve.rs
+++ b/sdk/core/src/gateway/gateway_tx_retrieve.rs
@@ -28,8 +28,10 @@ impl GatewayProxy {
                                 .await
                                 .unwrap();
 
-                            if transaction_info_with_results.smart_contract_results.len() > 0
-                                && issue_found == false
+                            if !transaction_info_with_results
+                                .smart_contract_results
+                                .is_empty()
+                                && !issue_found
                             {
                                 let first_scr =
                                     &transaction_info_with_results.smart_contract_results[0];

From 3e4654143905787a3e9989804b233bf2ad72c8d1 Mon Sep 17 00:00:00 2001
From: JustEatAnApple <mblacioti@gmail.com>
Date: Thu, 29 Aug 2024 17:08:59 +0300
Subject: [PATCH 1230/1254] Added requested changes for clarity

Co-authored-by: Andrei Vasilescu <vasilescuandrei24@gmail.com>
---
 contracts/examples/adder/interact/src/basic_interact.rs | 6 +++---
 framework/snippets/src/imports.rs                       | 5 ++++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/contracts/examples/adder/interact/src/basic_interact.rs b/contracts/examples/adder/interact/src/basic_interact.rs
index 93a00d4079..454060eb0d 100644
--- a/contracts/examples/adder/interact/src/basic_interact.rs
+++ b/contracts/examples/adder/interact/src/basic_interact.rs
@@ -7,7 +7,7 @@ use basic_interact_config::Config;
 use basic_interact_state::State;
 use clap::Parser;
 
-use multiversx_sc_snippets::{imports::*, sdk::data::keystore::InsertPassword};
+use multiversx_sc_snippets::imports::*;
 
 const INTERACTOR_SCENARIO_TRACE_PATH: &str = "interactor_trace.scen.json";
 
@@ -227,7 +227,7 @@ impl AdderInteract {
                     .to(self.state.current_adder_address())
                     .gas(6_000_000)
                     .typed(adder_proxy::AdderProxy)
-                    .upgrade(BigUint::from(new_value))
+                    .upgrade(new_value)
                     .code_metadata(CodeMetadata::UPGRADEABLE)
                     .code(ADDER_CODE_PATH)
                     .returns(ExpectError(code, msg))
@@ -244,7 +244,7 @@ impl AdderInteract {
                     .to(self.state.current_adder_address())
                     .gas(6_000_000)
                     .typed(adder_proxy::AdderProxy)
-                    .upgrade(BigUint::from(new_value))
+                    .upgrade(new_value)
                     .code_metadata(CodeMetadata::UPGRADEABLE)
                     .code(ADDER_CODE_PATH)
                     .prepare_async()
diff --git a/framework/snippets/src/imports.rs b/framework/snippets/src/imports.rs
index d416955e4c..a35e880c78 100644
--- a/framework/snippets/src/imports.rs
+++ b/framework/snippets/src/imports.rs
@@ -4,7 +4,10 @@ pub use crate::{
     dns_address_for_name, test_wallets, Interactor, InteractorPrepareAsync, StepBuffer,
 };
 
-pub use multiversx_sdk::wallet::Wallet;
+pub use multiversx_sdk::{
+    wallet::Wallet,
+    data::keystore::InsertPassword,
+};
 
 pub use env_logger;
 pub use tokio;

From bbaae29c6a18619ad58c3025438ea055043e4ed2 Mon Sep 17 00:00:00 2001
From: JustEatAnApple <mblacioti@gmail.com>
Date: Thu, 29 Aug 2024 18:01:49 +0300
Subject: [PATCH 1231/1254] Resolved changes requested

Co-authored-by: Andrei Vasilescu <vasilescuandrei24@gmail.com>
---
 .../src/system_sc_interact.rs                 | 112 +++++++++++-------
 .../src/system_sc_interact_cli.rs             |   4 +-
 2 files changed, 68 insertions(+), 48 deletions(-)

diff --git a/tools/interactor-system-func-calls/src/system_sc_interact.rs b/tools/interactor-system-func-calls/src/system_sc_interact.rs
index c522384290..bda87cd491 100644
--- a/tools/interactor-system-func-calls/src/system_sc_interact.rs
+++ b/tools/interactor-system-func-calls/src/system_sc_interact.rs
@@ -60,7 +60,7 @@ async fn main() {
             basic_interact
                 .freeze_token(
                     &args.token_id,
-                    Bech32Address::from_bech32_string(args.address.clone()),
+                    &Bech32Address::from_bech32_string(args.address.clone()),
                 )
                 .await;
         },
@@ -68,7 +68,7 @@ async fn main() {
             basic_interact
                 .unfreeze_token(
                     &args.token_id,
-                    Bech32Address::from_bech32_string(args.address.clone()),
+                    &Bech32Address::from_bech32_string(args.address.clone()),
                 )
                 .await;
         },
@@ -77,7 +77,7 @@ async fn main() {
                 .freeze_nft(
                     &args.token_id,
                     args.nft_nonce,
-                    Bech32Address::from_bech32_string(args.address.clone()),
+                    &Bech32Address::from_bech32_string(args.address.clone()),
                 )
                 .await;
         },
@@ -86,7 +86,7 @@ async fn main() {
                 .unfreeze_nft(
                     &args.token_id,
                     args.nft_nonce,
-                    Bech32Address::from_bech32_string(args.address.clone()),
+                    &Bech32Address::from_bech32_string(args.address.clone()),
                 )
                 .await;
         },
@@ -94,7 +94,7 @@ async fn main() {
             basic_interact
                 .wipe_token(
                     &args.token_id,
-                    Bech32Address::from_bech32_string(args.address.clone()),
+                    &Bech32Address::from_bech32_string(args.address.clone()),
                 )
                 .await;
         },
@@ -103,7 +103,7 @@ async fn main() {
                 .wipe_nft(
                     &args.token_id,
                     args.nft_nonce,
-                    Bech32Address::from_bech32_string(args.address.clone()),
+                    &Bech32Address::from_bech32_string(args.address.clone()),
                 )
                 .await;
         },
@@ -168,7 +168,7 @@ async fn main() {
         Some(system_sc_interact_cli::InteractCliCommand::UnsetRoles(args)) => {
             basic_interact
                 .unset_roles(
-                    Bech32Address::from_bech32_string(args.address.clone()),
+                    &Bech32Address::from_bech32_string(args.address.clone()),
                     &args.token_id,
                     args.roles
                         .clone()
@@ -180,12 +180,19 @@ async fn main() {
         },
         Some(system_sc_interact_cli::InteractCliCommand::TransferOwnership(args)) => {
             basic_interact
-                .transfer_ownership(&args.token_id, &args.new_owner)
+                .transfer_ownership(
+                    &args.token_id,
+                    &Bech32Address::from_bech32_string(args.new_owner.clone()),
+                )
                 .await;
         },
         Some(system_sc_interact_cli::InteractCliCommand::TransferNftCreateRole(args)) => {
             basic_interact
-                .transfer_nft_create_role(&args.token_id, &args.old_owner, &args.new_owner)
+                .transfer_nft_create_role(
+                    &args.token_id,
+                    &Bech32Address::from_bech32_string(args.old_owner.clone()),
+                    &Bech32Address::from_bech32_string(args.new_owner.clone()),
+                )
                 .await;
         },
         Some(system_sc_interact_cli::InteractCliCommand::ControlChanges(args)) => {
@@ -226,6 +233,7 @@ impl SysFuncCallsInteract {
         num_decimals: usize,
     ) {
         println!("Issuing fungible token...");
+
         let res = self
             .interactor
             .tx()
@@ -265,6 +273,7 @@ impl SysFuncCallsInteract {
         token_ticker: &str,
     ) {
         println!("Issuing NFT Collection...");
+
         let nft_collection_id = self
             .interactor
             .tx()
@@ -301,6 +310,7 @@ impl SysFuncCallsInteract {
         token_ticker: &str,
     ) {
         println!("Issuing SFT Collection...");
+
         let sft_collection_id = self
             .interactor
             .tx()
@@ -339,6 +349,7 @@ impl SysFuncCallsInteract {
         token_type: EsdtTokenType,
     ) {
         println!("Registering token...");
+
         let token_id = self
             .interactor
             .tx()
@@ -363,9 +374,6 @@ impl SysFuncCallsInteract {
 
     async fn set_roles(&mut self, token_id: &str, roles: Vec<EsdtLocalRole>) {
         let wallet_address = &self.wallet_address.clone().into_address();
-        // let converted_roles: Vec<EsdtLocalRole> =
-        //     roles.into_iter().map(EsdtLocalRole::from).collect();
-
         println!("Setting the following roles: {:?}", roles);
 
         self.interactor
@@ -425,6 +433,7 @@ impl SysFuncCallsInteract {
         num_decimals: usize,
     ) {
         println!("Registering meta ESDT...");
+
         let meta_esdt = self
             .interactor
             .tx()
@@ -457,6 +466,7 @@ impl SysFuncCallsInteract {
 
     async fn change_sft_meta_esdt(&mut self, token_id: &str, num_decimals: usize) {
         println!("Changing SFT to Meta-ESDT...");
+
         self.interactor
             .tx()
             .from(&self.wallet_address)
@@ -471,6 +481,7 @@ impl SysFuncCallsInteract {
 
     async fn mint_token(&mut self, token_id: &str, nonce: u64, amount: RustBigUint) {
         println!("Minting tokens...");
+
         self.interactor
             .tx()
             .from(&self.wallet_address)
@@ -489,6 +500,7 @@ impl SysFuncCallsInteract {
 
     async fn burn_token(&mut self, token_id: &str, nonce: u64, amount: RustBigUint) {
         println!("Burning tokens...");
+
         self.interactor
             .tx()
             .from(&self.wallet_address)
@@ -507,6 +519,7 @@ impl SysFuncCallsInteract {
 
     async fn pause_token(&mut self, token_id: &str) {
         println!("Pausing token...");
+
         self.interactor
             .tx()
             .from(&self.wallet_address)
@@ -521,6 +534,7 @@ impl SysFuncCallsInteract {
 
     async fn unpause_token(&mut self, token_id: &str) {
         println!("Unpausing token...");
+
         self.interactor
             .tx()
             .from(&self.wallet_address)
@@ -533,10 +547,11 @@ impl SysFuncCallsInteract {
             .await;
     }
 
-    async fn freeze_token(&mut self, token_id: &str, address: Bech32Address) {
-        println!("Freezing token...");
+    async fn freeze_token(&mut self, token_id: &str, address: &Bech32Address) {
         let managed_address: ManagedAddress<StaticApi> =
             ManagedAddress::from_address(&address.to_address());
+        println!("Freezing token...");
+
         self.interactor
             .tx()
             .from(&self.wallet_address)
@@ -549,10 +564,11 @@ impl SysFuncCallsInteract {
             .await;
     }
 
-    async fn unfreeze_token(&mut self, token_id: &str, address: Bech32Address) {
-        println!("Unfreezing token...");
+    async fn unfreeze_token(&mut self, token_id: &str, address: &Bech32Address) {
         let managed_address: ManagedAddress<StaticApi> =
             ManagedAddress::from_address(&address.to_address());
+        println!("Unfreezing token...");
+
         self.interactor
             .tx()
             .from(&self.wallet_address)
@@ -565,10 +581,11 @@ impl SysFuncCallsInteract {
             .await;
     }
 
-    async fn freeze_nft(&mut self, token_id: &str, nonce: u64, address: Bech32Address) {
-        println!("Freezing NFT/SFT/Meta-ESDT...");
+    async fn freeze_nft(&mut self, token_id: &str, nonce: u64, address: &Bech32Address) {
         let managed_address: ManagedAddress<StaticApi> =
             ManagedAddress::from_address(&address.to_address());
+        println!("Freezing NFT/SFT/Meta-ESDT...");
+
         self.interactor
             .tx()
             .from(&self.wallet_address)
@@ -581,10 +598,11 @@ impl SysFuncCallsInteract {
             .await;
     }
 
-    async fn unfreeze_nft(&mut self, token_id: &str, nonce: u64, address: Bech32Address) {
-        println!("Unfreezing NFT/SFT/Meta-ESDT...");
+    async fn unfreeze_nft(&mut self, token_id: &str, nonce: u64, address: &Bech32Address) {
         let managed_address: ManagedAddress<StaticApi> =
             ManagedAddress::from_address(&address.to_address());
+        println!("Unfreezing NFT/SFT/Meta-ESDT...");
+
         self.interactor
             .tx()
             .from(&self.wallet_address)
@@ -597,10 +615,11 @@ impl SysFuncCallsInteract {
             .await;
     }
 
-    async fn wipe_token(&mut self, token_id: &str, address: Bech32Address) {
-        println!("Wiping token...");
+    async fn wipe_token(&mut self, token_id: &str, address: &Bech32Address) {
         let managed_address: ManagedAddress<StaticApi> =
             ManagedAddress::from_address(&address.to_address());
+        println!("Wiping token...");
+
         self.interactor
             .tx()
             .from(&self.wallet_address)
@@ -613,10 +632,11 @@ impl SysFuncCallsInteract {
             .await;
     }
 
-    async fn wipe_nft(&mut self, token_id: &str, nonce: u64, address: Bech32Address) {
-        println!("Wiping NFT/SFT/Meta-ESDT...");
+    async fn wipe_nft(&mut self, token_id: &str, nonce: u64, address: &Bech32Address) {
         let managed_address: ManagedAddress<StaticApi> =
             ManagedAddress::from_address(&address.to_address());
+        println!("Wiping NFT/SFT/Meta-ESDT...");
+
         self.interactor
             .tx()
             .from(&self.wallet_address)
@@ -638,6 +658,7 @@ impl SysFuncCallsInteract {
         hash: &str,
     ) {
         println!("Minting NFT...");
+
         self.interactor
             .tx()
             .from(&self.wallet_address)
@@ -663,14 +684,13 @@ impl SysFuncCallsInteract {
 
     async fn unset_roles(
         &mut self,
-        address: Bech32Address,
+        address: &Bech32Address,
         token_id: &str,
         roles: Vec<EsdtLocalRole>,
     ) {
-        println!("Unsetting the following roles: {:?}", roles);
-
-        let managed_addr: ManagedAddress<StaticApi> =
+        let managed_address: ManagedAddress<StaticApi> =
             ManagedAddress::from_address(&address.to_address());
+        println!("Unsetting the following roles: {:?}", roles);
 
         self.interactor
             .tx()
@@ -679,7 +699,7 @@ impl SysFuncCallsInteract {
             .gas(100_000_000u64)
             .typed(ESDTSystemSCProxy)
             .unset_special_roles(
-                &managed_addr,
+                &managed_address,
                 &TokenIdentifier::from(token_id),
                 roles.into_iter(),
             )
@@ -688,11 +708,10 @@ impl SysFuncCallsInteract {
             .await;
     }
 
-    async fn transfer_ownership(&mut self, token_id: &str, new_owner: &str) {
+    async fn transfer_ownership(&mut self, token_id: &str, new_owner: &Bech32Address) {
+        let managed_new_owner: ManagedAddress<StaticApi> =
+            ManagedAddress::from_address(&new_owner.to_address());
         println!("Transferring token ownership...");
-        let bech32_addr = Bech32Address::from_bech32_string(new_owner.to_string());
-        let addr = bech32_addr.to_address();
-        let managed_addr: ManagedAddress<StaticApi> = ManagedAddress::from_address(&addr);
 
         self.interactor
             .tx()
@@ -700,23 +719,23 @@ impl SysFuncCallsInteract {
             .to(ESDTSystemSCAddress)
             .gas(100_000_000u64)
             .typed(ESDTSystemSCProxy)
-            .transfer_ownership(&TokenIdentifier::from(token_id), &managed_addr)
+            .transfer_ownership(&TokenIdentifier::from(token_id), &managed_new_owner)
             .prepare_async()
             .run()
             .await;
     }
 
-    async fn transfer_nft_create_role(&mut self, token_id: &str, old_owner: &str, new_owner: &str) {
+    async fn transfer_nft_create_role(
+        &mut self,
+        token_id: &str,
+        old_owner: &Bech32Address,
+        new_owner: &Bech32Address,
+    ) {
+        let managed_old_owner: ManagedAddress<StaticApi> =
+            ManagedAddress::from_address(&old_owner.to_address());
+        let managed_new_owner: ManagedAddress<StaticApi> =
+            ManagedAddress::from_address(&new_owner.to_address());
         println!("Transferring NFT create role...");
-        let bech32_addr_new_owner = Bech32Address::from_bech32_string(new_owner.to_string());
-        let addr_new_owner = bech32_addr_new_owner.to_address();
-        let managed_addr_new_owner: ManagedAddress<StaticApi> =
-            ManagedAddress::from_address(&addr_new_owner);
-
-        let bech32_addr_old_owner = Bech32Address::from_bech32_string(old_owner.to_string());
-        let addr_old_owner = bech32_addr_old_owner.to_address();
-        let managed_addr_old_owner: ManagedAddress<StaticApi> =
-            ManagedAddress::from_address(&addr_old_owner);
 
         self.interactor
             .tx()
@@ -726,8 +745,8 @@ impl SysFuncCallsInteract {
             .typed(ESDTSystemSCProxy)
             .transfer_nft_create_role(
                 &TokenIdentifier::from(token_id),
-                &managed_addr_old_owner,
-                &managed_addr_new_owner,
+                &managed_old_owner,
+                &managed_new_owner,
             )
             .prepare_async()
             .run()
@@ -736,6 +755,7 @@ impl SysFuncCallsInteract {
 
     async fn control_changes(&mut self, token_id: &str) {
         println!("Control changes");
+
         self.interactor
             .tx()
             .from(&self.wallet_address)
diff --git a/tools/interactor-system-func-calls/src/system_sc_interact_cli.rs b/tools/interactor-system-func-calls/src/system_sc_interact_cli.rs
index d498e11675..6e958fbdb3 100644
--- a/tools/interactor-system-func-calls/src/system_sc_interact_cli.rs
+++ b/tools/interactor-system-func-calls/src/system_sc_interact_cli.rs
@@ -1,5 +1,5 @@
 use clap::{Args, Parser, Subcommand};
-use multiversx_sc_snippets::{imports::RustBigUint, multiversx_sc::proxy_imports::*};
+use multiversx_sc_snippets::{imports::*, multiversx_sc::proxy_imports::*};
 
 /// SysFuncCalls Interact CLI
 #[derive(Default, PartialEq, Eq, Debug, Parser)]
@@ -155,7 +155,7 @@ pub struct IssueSftArgs {
     pub ticker: String,
 }
 
-#[derive(TopEncode, TopDecode, Clone, Debug, PartialEq, Eq)]
+#[derive(TopEncode, Clone, Debug, PartialEq, Eq)]
 pub struct NftDummyAttributes {
     pub creation_epoch: u64,
     pub cool_factor: u8,

From d31ffa7ecf04343ed6e913391dfabf8354f0572f Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 30 Aug 2024 11:37:13 +0300
Subject: [PATCH 1232/1254] crypto EI 1.4 tests ignored

---
 .../basic-features/tests/basic_features_scenario_go_test.rs    | 3 +++
 1 file changed, 3 insertions(+)

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 3a7a5dc515..58bee7c1da 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
@@ -85,11 +85,13 @@ fn crypto_verify_bls_go() {
 }
 
 #[test]
+#[ignore = "requires EI 1.4 in mx-scenario-go"]
 fn crypto_verify_bls_share_go() {
     world().run("scenarios/crypto_verify_bls_share.scen.json");
 }
 
 #[test]
+#[ignore = "requires EI 1.4 in mx-scenario-go"]
 fn crypto_verify_bls_aggregated_go() {
     world().run("scenarios/crypto_verify_bls_aggregated_signature.scen.json");
 }
@@ -105,6 +107,7 @@ fn crypto_verify_secp_256_k_1_go() {
 }
 
 #[test]
+#[ignore = "requires EI 1.4 in mx-scenario-go"]
 fn crypto_verify_secp_256_r_1_go() {
     world().run("scenarios/crypto_verify_secp256r1.scen.json");
 }

From 4517c25151fd0c0c69ea1a49be7052d449d4e7f0 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Fri, 30 Aug 2024 17:38:57 +0300
Subject: [PATCH 1233/1254] crypto_verify_secp256r1 test fix

---
 .../crypto_verify_secp256r1.scen.json         | 25 +++++++++----------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/contracts/feature-tests/basic-features/scenarios/crypto_verify_secp256r1.scen.json b/contracts/feature-tests/basic-features/scenarios/crypto_verify_secp256r1.scen.json
index 0de6016ef6..c1287b32d9 100644
--- a/contracts/feature-tests/basic-features/scenarios/crypto_verify_secp256r1.scen.json
+++ b/contracts/feature-tests/basic-features/scenarios/crypto_verify_secp256r1.scen.json
@@ -19,22 +19,22 @@
         },
         {
             "step": "scCall",
-            "id": "1",
+            "id": "secp256r1 - ok",
             "tx": {
                 "from": "address:an_account",
                 "to": "sc:basic-features-crypto",
                 "function": "verify_secp256r1_signature",
                 "arguments": [
-                    "0x03e4d20902182b89cd5ed7984ebcf063f2fd2508d9f034e4109be487be9e2cf54d",
-                    "0xa607fab72e13d6b625942bd5c56cc32792c2c7c7f16053b2fb6d62dd9cf36fdacf9d5a8af3537eaf5eb93335b36cf8f1d6e5bb2dfffce9055a2608d5e1a5b839eacf36dd5dec6d2fa156133acf064cc26487d543873f3b3837a3c09b5f4cb509bbc6585d",
-                    "0xd5065c32582bf0bc8f96b34177cbf47f61d4705d64daaebff884693b6dd94afd50d3ac647aeb14d325c28bb00ab68b23280c1c480cac0e72b5a58176ac8cd1b9"
+                    "0x02bc52274edebbef8878eacc4d1e0ed4fb213e5b0737389701ae8d59c403325720",
+                    "0xbf9facf48b2219db73b50c7ff59ceef2ada56632c71afc555d6bb4072d7634d1d9353acd53517ffb9a06935a89a6454fcaa40c69becf9f8029a271fd252ea55307d00d6e97a30719d48d6b7f993af24e9c54381cba02a113238eaee9d741cababeb21aaf",
+                    "0xc7877497444274267a4ea6f42deefde23a12e44f1ec1b437018e5c0e2834ce376dec1b81ebeacf5fbc6882e69af7cafad47bbb96cfb09e8d77d12afff7543052"
                 ],
                 "gasLimit": "50,000,000",
                 "gasPrice": "0"
             },
             "expect": {
                 "out": [
-                    "0x01"
+                    "true"
                 ],
                 "status": "",
                 "logs": "*",
@@ -44,24 +44,23 @@
         },
         {
             "step": "scCall",
-            "id": "2",
+            "id": "secp256r1 - fail",
             "tx": {
                 "from": "address:an_account",
                 "to": "sc:basic-features-crypto",
                 "function": "verify_secp256r1_signature",
                 "arguments": [
-                    "0x04a673638cb9587cb68ea08dbef685c6f2d2a751a8b3c6f2a7e9a4999e6e4bfaf5ca1d22fe57c6103dbaac10cf15d15c0791cab8bb9a04f800e4d215276cb3e008",
-                    "0x00",
-                    "0x3045022100fab29dbcb623e7e96f44665f312b89ffdb9e4d2e2f53353236fbbcf57b2f49bf02203d6f9c63df8be43121042970a549a2d3baeca093fd37b726ddcc0924638409f5"
+                    "0x02bc52274edebbef8878eacc4d1e0ed4fb213e5b0737389701ae8d59c403325720",
+                    "0xbf9facf48b2219db73b50c7ff59ceef2ada56632c71afc555d6bb4072d7634d1d9353acd53517ffb9a06935a89a6454fcaa40c69becf9f8029a271fd252ea55307d00d6e97a30719d48d6b7f993af24e9c54381cba02a113238eaee9d741cababeb21aaf",
+                    "0x00877497444274267a4ea6f42deefde23a12e44f1ec1b437018e5c0e2834ce376dec1b81ebeacf5fbc6882e69af7cafad47bbb96cfb09e8d77d12afff7543052"
                 ],
                 "gasLimit": "50,000,000",
                 "gasPrice": "0"
             },
             "expect": {
-                "out": [
-                    "0x00"
-                ],
-                "status": "",
+                "out": [],
+                "status": "10",
+                "message": "str:signature verification failed",
                 "logs": "*",
                 "gas": "*",
                 "refund": "*"

From f58b4f3fbcb8f87950a9be593a0f885e32f9de2b Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Sun, 1 Sep 2024 01:55:33 +0300
Subject: [PATCH 1234/1254] crypto_verify_bls_share test fix

---
 .../crypto_verify_bls_share.scen.json         | 44 ++++---------------
 1 file changed, 9 insertions(+), 35 deletions(-)

diff --git a/contracts/feature-tests/basic-features/scenarios/crypto_verify_bls_share.scen.json b/contracts/feature-tests/basic-features/scenarios/crypto_verify_bls_share.scen.json
index 046b015d86..6aa653a9cd 100644
--- a/contracts/feature-tests/basic-features/scenarios/crypto_verify_bls_share.scen.json
+++ b/contracts/feature-tests/basic-features/scenarios/crypto_verify_bls_share.scen.json
@@ -1,6 +1,6 @@
 {
     "name": "crypto",
-    "comment": "does not currently work with scenarios-rs, because verify_bls function is not yet mocked",
+    "comment": "does not currently work with scenarios-rs, because function is not yet mocked",
     "gasSchedule": "v3",
     "steps": [
         {
@@ -19,7 +19,7 @@
         },
         {
             "step": "scCall",
-            "id": "1",
+            "id": "verify_bls_signature_share - Ok",
             "tx": {
                 "from": "address:an_account",
                 "to": "sc:basic-features-crypto",
@@ -44,49 +44,23 @@
         },
         {
             "step": "scCall",
-            "id": "2",
+            "id": "verify_bls_signature_share - Fail",
             "tx": {
                 "from": "address:an_account",
                 "to": "sc:basic-features-crypto",
                 "function": "verify_bls_signature_share",
                 "arguments": [
-                    "0x2c9a358953f61d34401d7ee4175eec105c476b18baacab371e2f47270035b539d84ad79ba587552b7e38802be00ff7148fc2a9c7a7034ff1e63ee24602ee952235ad14ca7d36e2be617fb2c99ed22a7a2729d86ae9fbb4df06f957ba07fec50e",
-                    "0x1e46d9cbb995e30b82485525c29f80ac78aca295a6e88a11c3df8f9a445494bb",
-                    "0xbe8c460db180d6254c712ead3aa81935bc9be15b919dd45cb152b3dece04762569778c5e70e7af03fa1c66409d4f4711"
-                ],
-                "gasLimit": "50,000,000",
-                "gasPrice": "0"
-            },
-            "expect": {
-                "out": [
-                    "0x00"
-                ],
-                "status": "",
-                "logs": "*",
-                "gas": "*",
-                "refund": "*"
-            }
-        },
-        {
-            "step": "scCall",
-            "id": "2",
-            "tx": {
-                "from": "address:an_account",
-                "to": "sc:basic-features",
-                "function": "verify_bls_aggregated_signature",
-                "arguments": [
-                    "0xb5823f6e564251cc03ce7bad3da83e72576e92795d3500bba1acb30ec9a94dce87bb8aa794d67b2d61d15c33f28f6c0c23ba1dfcbf21e8f8b46286ff871afabac925303ddcaddce6254fcff6d3155797db40b3d3b5865e8fc0bd770b3d79b381",
-                    "0x6d65737361676520746f206265207369676e6564",
-                    "0xaf32a2ddf341c08d1eb7232f05dc34e4454155e676b58c40fddf9a036562ac2c01533d2d557cb49d73aa9d7a89744696"
+                    "0x3e886a4c6e109a151f4105aee65a5192d150ef1fa68d3cd76964a0b086006dbe4324c989deb0e4416c6d6706db1b1910eb2732f08842fb4886067b9ed191109ac2188d76002d2e11da80a3f0ea89fee6b59c834cc478a6bd49cb8a193b1abb16",
+                    "0xe96bd0f36b70c5ccc0c4396343bd7d8255b8a526c55fa1e218511fafe6539b8e",
+                    "0xff725db195e37aa237cdbbda76270d4a229b6e7a3651104dc58c4349c0388e8546976fe54a04240530b99064e434c90f"
                 ],
                 "gasLimit": "50,000,000",
                 "gasPrice": "0"
             },
             "expect": {
-                "out": [
-                    "0x01"
-                ],
-                "status": "",
+                "out": [],
+                "status": "10",
+                "message": "str:err blsSignatureDeserialize ff725db195e37aa237cdbbda76270d4a229b6e7a3651104dc58c4349c0388e8546976fe54a04240530b99064e434c90f",
                 "logs": "*",
                 "gas": "*",
                 "refund": "*"

From d31643cc848e6e4671031da9283841e9d79fde70 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Sun, 1 Sep 2024 02:33:54 +0300
Subject: [PATCH 1235/1254] crypto functions that fail directly no longer
 return bool

---
 .../scenarios/crypto_verify_bls.scen.json     | 32 ++++++++++++++++---
 ..._verify_bls_aggregated_signature.scen.json |  6 ++--
 .../crypto_verify_bls_share.scen.json         |  6 ++--
 .../crypto_verify_secp256r1.scen.json         |  7 ++--
 .../managed_decimal_logarithm.scen.json       |  2 +-
 .../basic-features/src/crypto_features.rs     |  8 ++---
 framework/base/src/api/crypto_api.rs          |  8 ++---
 .../api/uncallable/crypto_api_uncallable.rs   |  8 ++---
 .../contract_base/wrappers/crypto_wrapper.rs  | 25 +++++++++++----
 .../src/api/core_api_vh/crypto_api_vh.rs      |  8 ++---
 .../wasm-adapter/src/api/crypto_api_node.rs   | 24 +++++++++-----
 11 files changed, 84 insertions(+), 50 deletions(-)

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 f5c6ef194c..fc67a3745b 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
@@ -19,7 +19,7 @@
         },
         {
             "step": "scCall",
-            "id": "3",
+            "id": "verify_bls_signature - Ok",
             "tx": {
                 "from": "address:an_account",
                 "to": "sc:basic-features",
@@ -33,14 +33,36 @@
                 "gasPrice": "0"
             },
             "expect": {
-                "out": [
-                    "0x01"
-                ],
+                "out": [],
                 "status": "",
                 "logs": "*",
                 "gas": "*",
                 "refund": "*"
             }
+        },
+        {
+            "step": "scCall",
+            "id": "verify_bls_signature - Fail",
+            "tx": {
+                "from": "address:an_account",
+                "to": "sc:basic-features",
+                "function": "verify_bls_signature",
+                "arguments": [
+                    "0xb5823f6e564251cc03ce7bad3da83e72576e92795d3500bba1acb30ec9a94dce87bb8aa794d67b2d61d15c33f28f6c0c23ba1dfcbf21e8f8b46286ff871afabac925303ddcaddce6254fcff6d3155797db40b3d3b5865e8fc0bd770b3d79b381",
+                    "0x6d65737361676520746f206265207369676e6564",
+                    "0x0032a2ddf341c08d1eb7232f05dc34e4454155e676b58c40fddf9a036562ac2c01533d2d557cb49d73aa9d7a89744696"
+                ],
+                "gasLimit": "50,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": [],
+                "status": "10",
+                "message": "str:err blsSignatureDeserialize 0032a2ddf341c08d1eb7232f05dc34e4454155e676b58c40fddf9a036562ac2c01533d2d557cb49d73aa9d7a89744696",
+                "logs": "*",
+                "gas": "*",
+                "refund": "*"
+            }
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/contracts/feature-tests/basic-features/scenarios/crypto_verify_bls_aggregated_signature.scen.json b/contracts/feature-tests/basic-features/scenarios/crypto_verify_bls_aggregated_signature.scen.json
index d8e46f2389..546c0d4c9f 100644
--- a/contracts/feature-tests/basic-features/scenarios/crypto_verify_bls_aggregated_signature.scen.json
+++ b/contracts/feature-tests/basic-features/scenarios/crypto_verify_bls_aggregated_signature.scen.json
@@ -39,9 +39,7 @@
                 "gasPrice": "0"
             },
             "expect": {
-                "out": [
-                    "true"
-                ],
+                "out": [],
                 "status": "",
                 "logs": "*",
                 "gas": "*",
@@ -79,4 +77,4 @@
             }
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/contracts/feature-tests/basic-features/scenarios/crypto_verify_bls_share.scen.json b/contracts/feature-tests/basic-features/scenarios/crypto_verify_bls_share.scen.json
index 6aa653a9cd..fa7c21611b 100644
--- a/contracts/feature-tests/basic-features/scenarios/crypto_verify_bls_share.scen.json
+++ b/contracts/feature-tests/basic-features/scenarios/crypto_verify_bls_share.scen.json
@@ -33,9 +33,7 @@
                 "gasPrice": "0"
             },
             "expect": {
-                "out": [
-                    "0x01"
-                ],
+                "out": [],
                 "status": "",
                 "logs": "*",
                 "gas": "*",
@@ -67,4 +65,4 @@
             }
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/contracts/feature-tests/basic-features/scenarios/crypto_verify_secp256r1.scen.json b/contracts/feature-tests/basic-features/scenarios/crypto_verify_secp256r1.scen.json
index c1287b32d9..1c35b46271 100644
--- a/contracts/feature-tests/basic-features/scenarios/crypto_verify_secp256r1.scen.json
+++ b/contracts/feature-tests/basic-features/scenarios/crypto_verify_secp256r1.scen.json
@@ -1,6 +1,5 @@
 {
     "name": "crypto",
-    "comment": "",
     "gasSchedule": "v3",
     "steps": [
         {
@@ -33,9 +32,7 @@
                 "gasPrice": "0"
             },
             "expect": {
-                "out": [
-                    "true"
-                ],
+                "out": [],
                 "status": "",
                 "logs": "*",
                 "gas": "*",
@@ -67,4 +64,4 @@
             }
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/contracts/feature-tests/basic-features/scenarios/managed_decimal_logarithm.scen.json b/contracts/feature-tests/basic-features/scenarios/managed_decimal_logarithm.scen.json
index da54f8ccec..065e92988c 100644
--- a/contracts/feature-tests/basic-features/scenarios/managed_decimal_logarithm.scen.json
+++ b/contracts/feature-tests/basic-features/scenarios/managed_decimal_logarithm.scen.json
@@ -24,7 +24,7 @@
                 "arguments": [
                     "23,000000000"
                 ],
-                "gasLimit": "9,000,000",
+                "gasLimit": "25,000,000",
                 "gasPrice": "0"
             },
             "expect": {
diff --git a/contracts/feature-tests/basic-features/src/crypto_features.rs b/contracts/feature-tests/basic-features/src/crypto_features.rs
index 8da0c83984..0588146780 100644
--- a/contracts/feature-tests/basic-features/src/crypto_features.rs
+++ b/contracts/feature-tests/basic-features/src/crypto_features.rs
@@ -24,7 +24,7 @@ pub trait CryptoFeatures {
         key: ManagedBuffer,
         message: ManagedBuffer,
         signature: ManagedBuffer,
-    ) -> bool {
+    ) {
         self.crypto().verify_bls(&key, &message, &signature)
     }
 
@@ -72,7 +72,7 @@ pub trait CryptoFeatures {
         key: ManagedBuffer,
         message: ManagedBuffer,
         signature: ManagedBuffer,
-    ) -> bool {
+    ) {
         self.crypto().verify_secp256r1(&key, &message, &signature)
     }
 
@@ -83,7 +83,7 @@ pub trait CryptoFeatures {
         key: ManagedBuffer,
         message: ManagedBuffer,
         signature: ManagedBuffer,
-    ) -> bool {
+    ) {
         self.crypto()
             .verify_bls_signature_share(&key, &message, &signature)
     }
@@ -95,7 +95,7 @@ pub trait CryptoFeatures {
         key: ManagedVec<ManagedBuffer>,
         message: ManagedBuffer,
         signature: ManagedBuffer,
-    ) -> bool {
+    ) {
         self.crypto()
             .verify_bls_aggregated_signature(&key, &message, &signature)
     }
diff --git a/framework/base/src/api/crypto_api.rs b/framework/base/src/api/crypto_api.rs
index 235e44919a..f6eaf80fe4 100644
--- a/framework/base/src/api/crypto_api.rs
+++ b/framework/base/src/api/crypto_api.rs
@@ -44,7 +44,7 @@ pub trait CryptoApiImpl: ManagedTypeApiImpl {
         key: Self::ManagedBufferHandle,
         message: Self::ManagedBufferHandle,
         signature: Self::ManagedBufferHandle,
-    ) -> bool;
+    );
 
     fn verify_ed25519_managed(
         &self,
@@ -82,19 +82,19 @@ pub trait CryptoApiImpl: ManagedTypeApiImpl {
         key: Self::ManagedBufferHandle,
         message: Self::ManagedBufferHandle,
         signature: Self::ManagedBufferHandle,
-    ) -> bool;
+    );
 
     fn verify_bls_signature_share_managed(
         &self,
         key: Self::ManagedBufferHandle,
         message: Self::ManagedBufferHandle,
         signature: Self::ManagedBufferHandle,
-    ) -> bool;
+    );
 
     fn verify_bls_aggregated_signature_managed(
         &self,
         key: Self::ManagedBufferHandle,
         message: Self::ManagedBufferHandle,
         signature: Self::ManagedBufferHandle,
-    ) -> bool;
+    );
 }
diff --git a/framework/base/src/api/uncallable/crypto_api_uncallable.rs b/framework/base/src/api/uncallable/crypto_api_uncallable.rs
index bb42aa04bb..fe0547c5d7 100644
--- a/framework/base/src/api/uncallable/crypto_api_uncallable.rs
+++ b/framework/base/src/api/uncallable/crypto_api_uncallable.rs
@@ -42,7 +42,7 @@ impl CryptoApiImpl for UncallableApi {
         _key: Self::ManagedBufferHandle,
         _message: Self::ManagedBufferHandle,
         _signature: Self::ManagedBufferHandle,
-    ) -> bool {
+    ) {
         unreachable!()
     }
 
@@ -88,7 +88,7 @@ impl CryptoApiImpl for UncallableApi {
         _key: Self::ManagedBufferHandle,
         _message: Self::ManagedBufferHandle,
         _signature: Self::ManagedBufferHandle,
-    ) -> bool {
+    ) {
         unreachable!()
     }
 
@@ -97,7 +97,7 @@ impl CryptoApiImpl for UncallableApi {
         _key: Self::ManagedBufferHandle,
         _message: Self::ManagedBufferHandle,
         _signature: Self::ManagedBufferHandle,
-    ) -> bool {
+    ) {
         unreachable!()
     }
 
@@ -106,7 +106,7 @@ impl CryptoApiImpl for UncallableApi {
         _key: Self::ManagedBufferHandle,
         _message: Self::ManagedBufferHandle,
         _signature: Self::ManagedBufferHandle,
-    ) -> bool {
+    ) {
         unreachable!()
     }
 }
diff --git a/framework/base/src/contract_base/wrappers/crypto_wrapper.rs b/framework/base/src/contract_base/wrappers/crypto_wrapper.rs
index eb98f93a56..369cca1a63 100644
--- a/framework/base/src/contract_base/wrappers/crypto_wrapper.rs
+++ b/framework/base/src/contract_base/wrappers/crypto_wrapper.rs
@@ -61,7 +61,7 @@ where
         key: &ManagedBuffer<A>,
         message: &ManagedBuffer<A>,
         signature: &ManagedBuffer<A>,
-    ) -> bool {
+    ) {
         A::crypto_api_impl().verify_bls_managed(
             key.get_handle(),
             message.get_handle(),
@@ -69,7 +69,9 @@ where
         )
     }
 
-    /// Will crash if the verification fails.
+    /// Calls the Vm to verify ed25519 signature.
+    ///
+    /// Does not return result, will fail tx directly!
     ///
     /// The error comes straight form the VM, the message is "invalid signature".
     pub fn verify_ed25519(
@@ -130,12 +132,15 @@ where
         ManagedBuffer::from_handle(new_handle)
     }
 
+    /// Calls the Vm to verify secp256r1 signature.
+    ///
+    /// Does not return result, will fail tx directly!
     pub fn verify_secp256r1(
         &self,
         key: &ManagedBuffer<A>,
         message: &ManagedBuffer<A>,
         signature: &ManagedBuffer<A>,
-    ) -> bool {
+    ) {
         A::crypto_api_impl().verify_secp256r1_managed(
             key.get_handle(),
             message.get_handle(),
@@ -143,12 +148,15 @@ where
         )
     }
 
+    /// Calls the Vm to verify BLS signature share.
+    ///
+    /// Does not return result, will fail tx directly!
     pub fn verify_bls_signature_share(
         &self,
         key: &ManagedBuffer<A>,
         message: &ManagedBuffer<A>,
         signature: &ManagedBuffer<A>,
-    ) -> bool {
+    ) {
         A::crypto_api_impl().verify_bls_signature_share_managed(
             key.get_handle(),
             message.get_handle(),
@@ -156,14 +164,17 @@ where
         )
     }
 
+    /// Calls the Vm to verify BLS aggregated signature.
+    ///
+    /// Does not return result, will fail tx directly!
     pub fn verify_bls_aggregated_signature(
         &self,
-        key: &ManagedVec<A, ManagedBuffer<A>>,
+        keys: &ManagedVec<A, ManagedBuffer<A>>,
         message: &ManagedBuffer<A>,
         signature: &ManagedBuffer<A>,
-    ) -> bool {
+    ) {
         A::crypto_api_impl().verify_bls_aggregated_signature_managed(
-            key.get_handle(),
+            keys.get_handle(),
             message.get_handle(),
             signature.get_handle(),
         )
diff --git a/framework/scenario/src/api/core_api_vh/crypto_api_vh.rs b/framework/scenario/src/api/core_api_vh/crypto_api_vh.rs
index aa4c2dab94..305b3d6be9 100644
--- a/framework/scenario/src/api/core_api_vh/crypto_api_vh.rs
+++ b/framework/scenario/src/api/core_api_vh/crypto_api_vh.rs
@@ -53,7 +53,7 @@ impl<VHB: VMHooksApiBackend> CryptoApiImpl for VMHooksApi<VHB> {
         _key: Self::ManagedBufferHandle,
         _message: Self::ManagedBufferHandle,
         _signature: Self::ManagedBufferHandle,
-    ) -> bool {
+    ) {
         panic!("verify_bls not implemented yet!")
     }
 
@@ -105,7 +105,7 @@ impl<VHB: VMHooksApiBackend> CryptoApiImpl for VMHooksApi<VHB> {
         _key: Self::ManagedBufferHandle,
         _message: Self::ManagedBufferHandle,
         _signature: Self::ManagedBufferHandle,
-    ) -> bool {
+    ) {
         panic!("verify_secp256r1 not implemented yet!")
     }
 
@@ -114,7 +114,7 @@ impl<VHB: VMHooksApiBackend> CryptoApiImpl for VMHooksApi<VHB> {
         _key: Self::ManagedBufferHandle,
         _message: Self::ManagedBufferHandle,
         _signature: Self::ManagedBufferHandle,
-    ) -> bool {
+    ) {
         panic!("verify_bls_signature_share not implemented yet!")
     }
 
@@ -123,7 +123,7 @@ impl<VHB: VMHooksApiBackend> CryptoApiImpl for VMHooksApi<VHB> {
         _key: Self::ManagedBufferHandle,
         _message: Self::ManagedBufferHandle,
         _signature: Self::ManagedBufferHandle,
-    ) -> bool {
+    ) {
         panic!("verify_bls_aggregated_signature not implemented yet!")
     }
 }
diff --git a/framework/wasm-adapter/src/api/crypto_api_node.rs b/framework/wasm-adapter/src/api/crypto_api_node.rs
index 0cbe24fad5..df62b30df9 100644
--- a/framework/wasm-adapter/src/api/crypto_api_node.rs
+++ b/framework/wasm-adapter/src/api/crypto_api_node.rs
@@ -84,8 +84,10 @@ impl CryptoApiImpl for VmApiImpl {
         key: Self::ManagedBufferHandle,
         message: Self::ManagedBufferHandle,
         signature: Self::ManagedBufferHandle,
-    ) -> bool {
-        unsafe { managedVerifyBLS(key, message, signature) == 0 }
+    ) {
+        unsafe {
+            let _ = managedVerifyBLS(key, message, signature);
+        }
     }
 
     #[inline]
@@ -139,8 +141,10 @@ impl CryptoApiImpl for VmApiImpl {
         key: Self::ManagedBufferHandle,
         message: Self::ManagedBufferHandle,
         signature: Self::ManagedBufferHandle,
-    ) -> bool {
-        unsafe { managedVerifySecp256r1(key, message, signature) == 0 }
+    ) {
+        unsafe {
+            let _ = managedVerifySecp256r1(key, message, signature);
+        }
     }
 
     fn verify_bls_signature_share_managed(
@@ -148,8 +152,10 @@ impl CryptoApiImpl for VmApiImpl {
         key: Self::ManagedBufferHandle,
         message: Self::ManagedBufferHandle,
         signature: Self::ManagedBufferHandle,
-    ) -> bool {
-        unsafe { managedVerifyBLSSignatureShare(key, message, signature) == 0 }
+    ) {
+        unsafe {
+            let _ = managedVerifyBLSSignatureShare(key, message, signature);
+        }
     }
 
     fn verify_bls_aggregated_signature_managed(
@@ -157,7 +163,9 @@ impl CryptoApiImpl for VmApiImpl {
         key: Self::ManagedBufferHandle,
         message: Self::ManagedBufferHandle,
         signature: Self::ManagedBufferHandle,
-    ) -> bool {
-        unsafe { managedVerifyBLSAggregatedSignature(key, message, signature) == 0 }
+    ) {
+        unsafe {
+            let _ = managedVerifyBLSAggregatedSignature(key, message, signature);
+        }
     }
 }

From 0b43a3bafeb1e8dc3447e576291a66e23e77707b Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Sun, 1 Sep 2024 02:34:06 +0300
Subject: [PATCH 1236/1254] scenario fmt

---
 .../basic-features/scenarios/managed_decimal.scen.json          | 2 +-
 .../scenarios/managed_decimal_logarithm.scen.json               | 2 +-
 .../scenarios/storage_mapper_get_at_address.scen.json           | 2 +-
 .../scenarios/storage_mapper_get_at_address_extra_key.scen.json | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/contracts/feature-tests/basic-features/scenarios/managed_decimal.scen.json b/contracts/feature-tests/basic-features/scenarios/managed_decimal.scen.json
index e19612ae29..b723c07b6d 100644
--- a/contracts/feature-tests/basic-features/scenarios/managed_decimal.scen.json
+++ b/contracts/feature-tests/basic-features/scenarios/managed_decimal.scen.json
@@ -143,4 +143,4 @@
             }
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/contracts/feature-tests/basic-features/scenarios/managed_decimal_logarithm.scen.json b/contracts/feature-tests/basic-features/scenarios/managed_decimal_logarithm.scen.json
index 065e92988c..193517275c 100644
--- a/contracts/feature-tests/basic-features/scenarios/managed_decimal_logarithm.scen.json
+++ b/contracts/feature-tests/basic-features/scenarios/managed_decimal_logarithm.scen.json
@@ -107,4 +107,4 @@
             }
         }
     ]
-}
\ No newline at end of file
+}
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 77ffdda1ee..2a0ff501a8 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
@@ -372,4 +372,4 @@
             }
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/contracts/feature-tests/basic-features/scenarios/storage_mapper_get_at_address_extra_key.scen.json b/contracts/feature-tests/basic-features/scenarios/storage_mapper_get_at_address_extra_key.scen.json
index e124fd7e1a..d2802f41d2 100644
--- a/contracts/feature-tests/basic-features/scenarios/storage_mapper_get_at_address_extra_key.scen.json
+++ b/contracts/feature-tests/basic-features/scenarios/storage_mapper_get_at_address_extra_key.scen.json
@@ -87,4 +87,4 @@
             }
         }
     ]
-}
\ No newline at end of file
+}

From d3ee11573fe77956cf55f0b1ab58ccd25629413b Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Mon, 2 Sep 2024 12:26:32 +0300
Subject: [PATCH 1237/1254] plotter package fix

---
 tools/plotter/start-server.sh  | 2 --
 tools/plotter/www/bootstrap.js | 4 ++--
 tools/plotter/www/package.json | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/tools/plotter/start-server.sh b/tools/plotter/start-server.sh
index 09641b1a03..3a5698f05e 100755
--- a/tools/plotter/start-server.sh
+++ b/tools/plotter/start-server.sh
@@ -1,8 +1,6 @@
 #!/bin/bash
 set -e
 
-mkdir -p www/pkg
-
 ./build-wasm.sh
 
 cd www
diff --git a/tools/plotter/www/bootstrap.js b/tools/plotter/www/bootstrap.js
index bea8b6b67a..2520df8952 100644
--- a/tools/plotter/www/bootstrap.js
+++ b/tools/plotter/www/bootstrap.js
@@ -4,14 +4,14 @@ async function init() {
     if (typeof process == "object") {
         // We run in the npm/webpack environment.
         const [{Chart}, {main, setup}] = await Promise.all([
-            import("wasm-demo"),
+            import("sc-plotter-wasm"),
             import("./index.js"),
         ]);
         setup(Chart);
         main();
     } else {
         const [{Chart, default: init}, {main, setup}] = await Promise.all([
-            import("../pkg/wasm_demo.js"),
+            import("../pkg/sc_plotter_wasm.js"),
             import("./index.js"),
         ]);
         await init();
diff --git a/tools/plotter/www/package.json b/tools/plotter/www/package.json
index 32a99f8aff..87f6fd3412 100644
--- a/tools/plotter/www/package.json
+++ b/tools/plotter/www/package.json
@@ -25,7 +25,7 @@
   },
   "homepage": "https://github.com/38/plotters",
   "dependencies": {
-    "wasm-demo": "file:../pkg"
+    "sc-plotter-wasm": "file:../pkg"
   },
   "devDependencies": {
     "webpack": "^4.43.0",

From 141dfd5174365e17df5814b6447ebab70a81853d Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Mon, 2 Sep 2024 12:33:20 +0300
Subject: [PATCH 1238/1254] plotter CI

---
 .github/workflows/plotter-test.yml | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 .github/workflows/plotter-test.yml

diff --git a/.github/workflows/plotter-test.yml b/.github/workflows/plotter-test.yml
new file mode 100644
index 0000000000..d509759003
--- /dev/null
+++ b/.github/workflows/plotter-test.yml
@@ -0,0 +1,30 @@
+name: CI
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+
+permissions:
+  checks: write
+  pull-requests: write
+
+jobs:
+  template_test_current:
+    name: Plotter tests
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Install rust
+        uses: actions-rust-lang/setup-rust-toolchain@v1
+        with:
+          toolchain: stable
+          target: wasm32-unknown-unknown
+
+      - name: Run plotter tests
+        run: |
+          cd tools/plotter
+          cargo test

From e711f65f5f9a3e307cb1f614820d242c72842ba7 Mon Sep 17 00:00:00 2001
From: Andrei Vasilescu <vasilescuandrei24@gmail.com>
Date: Mon, 2 Sep 2024 12:40:58 +0300
Subject: [PATCH 1239/1254] Refactored system SC proxies

Co-authored-by: Mihai Blacioti <mblacioti@gmail.com>
---
 .../system_proxy/builtin_func_proxy.rs        |  45 ++--
 .../system_proxy/esdt_system_sc_proxy.rs      | 196 +++++++++-----
 .../src/system_sc_interact.rs                 | 246 ++++++++----------
 3 files changed, 265 insertions(+), 222 deletions(-)

diff --git a/framework/base/src/types/interaction/system_proxy/builtin_func_proxy.rs b/framework/base/src/types/interaction/system_proxy/builtin_func_proxy.rs
index 7b5e2fefb2..6e4978980a 100644
--- a/framework/base/src/types/interaction/system_proxy/builtin_func_proxy.rs
+++ b/framework/base/src/types/interaction/system_proxy/builtin_func_proxy.rs
@@ -82,11 +82,14 @@ where
             .original_result()
     }
 
-    pub fn esdt_local_burn(
+    pub fn esdt_local_burn<
+        Arg0: ProxyArg<TokenIdentifier<Env::Api>>,
+        Arg1: ProxyArg<BigUint<Env::Api>>,
+    >(
         self,
-        token: &TokenIdentifier<Env::Api>,
+        token: &Arg0,
         nonce: u64,
-        amount: &BigUint<Env::Api>,
+        amount: &Arg1,
     ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         if nonce == 0 {
             return self
@@ -107,11 +110,14 @@ where
             .original_result()
     }
 
-    pub fn esdt_local_mint(
+    pub fn esdt_local_mint<
+        Arg0: ProxyArg<TokenIdentifier<Env::Api>>,
+        Arg1: ProxyArg<BigUint<Env::Api>>,
+    >(
         self,
-        token: &TokenIdentifier<Env::Api>,
+        token: &Arg0,
         nonce: u64,
-        amount: &BigUint<Env::Api>,
+        amount: &Arg1,
     ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         if nonce == 0 {
             return self
@@ -131,9 +137,9 @@ where
             .original_result()
     }
 
-    pub fn nft_add_multiple_uri(
+    pub fn nft_add_multiple_uri<Arg0: ProxyArg<TokenIdentifier<Env::Api>>>(
         self,
-        token_id: &TokenIdentifier<Env::Api>,
+        token_id: &Arg0,
         nft_nonce: u64,
         new_uris: &ManagedVec<Env::Api, ManagedBuffer<Env::Api>>,
     ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
@@ -151,9 +157,9 @@ where
         tx.original_result()
     }
 
-    pub fn nft_update_attributes<T: TopEncode>(
+    pub fn nft_update_attributes<T: TopEncode, Arg0: ProxyArg<TokenIdentifier<Env::Api>>>(
         self,
-        token_id: &TokenIdentifier<Env::Api>,
+        token_id: &Arg0,
         nft_nonce: u64,
         new_attributes: &T,
     ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
@@ -167,13 +173,20 @@ where
     }
 
     #[allow(clippy::too_many_arguments)]
-    pub fn esdt_nft_create<T: TopEncode>(
+    pub fn esdt_nft_create<
+        T: TopEncode,
+        Arg0: ProxyArg<TokenIdentifier<Env::Api>>,
+        Arg1: ProxyArg<BigUint<Env::Api>>,
+        Arg2: ProxyArg<ManagedBuffer<Env::Api>>,
+        Arg3: ProxyArg<BigUint<Env::Api>>,
+        Arg4: ProxyArg<ManagedBuffer<Env::Api>>,
+    >(
         self,
-        token: &TokenIdentifier<Env::Api>,
-        amount: &BigUint<Env::Api>,
-        name: &ManagedBuffer<Env::Api>,
-        royalties: &BigUint<Env::Api>,
-        hash: &ManagedBuffer<Env::Api>,
+        token: &Arg0,
+        amount: &Arg1,
+        name: &Arg2,
+        royalties: &Arg3,
+        hash: &Arg4,
         attributes: &T,
         uris: &ManagedVec<Env::Api, ManagedBuffer<Env::Api>>,
     ) -> TxTypedCall<Env, From, To, NotPayable, Gas, u64> {
diff --git a/framework/base/src/types/interaction/system_proxy/esdt_system_sc_proxy.rs b/framework/base/src/types/interaction/system_proxy/esdt_system_sc_proxy.rs
index 50325ed78d..10730ff0fc 100644
--- a/framework/base/src/types/interaction/system_proxy/esdt_system_sc_proxy.rs
+++ b/framework/base/src/types/interaction/system_proxy/esdt_system_sc_proxy.rs
@@ -4,8 +4,8 @@ use crate::{
     api::CallTypeApi,
     types::{
         BigUint, EgldPayment, EsdtLocalRole, EsdtTokenType, FunctionCall, ManagedAddress,
-        ManagedBuffer, NotPayable, OriginalResultMarker, TokenIdentifier, Tx, TxEnv, TxFrom, TxGas,
-        TxProxyTrait, TxTo, TxTypedCall,
+        ManagedBuffer, NotPayable, OriginalResultMarker, ProxyArg, TokenIdentifier, Tx, TxEnv,
+        TxFrom, TxGas, TxProxyTrait, TxTo, TxTypedCall,
     },
 };
 
@@ -63,12 +63,16 @@ where
 {
     /// Produces a contract call to the ESDT system SC,
     /// which causes it to issue a new fungible ESDT token.
-    pub fn issue_fungible(
+    pub fn issue_fungible<
+        Arg0: ProxyArg<ManagedBuffer<Env::Api>>,
+        Arg1: ProxyArg<ManagedBuffer<Env::Api>>,
+        Arg2: ProxyArg<BigUint<Env::Api>>,
+    >(
         self,
         issue_cost: BigUint<Env::Api>,
-        token_display_name: &ManagedBuffer<Env::Api>,
-        token_ticker: &ManagedBuffer<Env::Api>,
-        initial_supply: &BigUint<Env::Api>,
+        token_display_name: &Arg0,
+        token_ticker: &Arg1,
+        initial_supply: &Arg2,
         properties: FungibleTokenProperties,
     ) -> IssueCall<Env, From, To, Gas> {
         self.issue(
@@ -94,20 +98,23 @@ where
 
     /// Produces a contract call to the ESDT system SC,
     /// which causes it to issue a new non-fungible ESDT token.
-    pub fn issue_non_fungible(
+    pub fn issue_non_fungible<
+        Arg0: ProxyArg<ManagedBuffer<Env::Api>>,
+        Arg1: ProxyArg<ManagedBuffer<Env::Api>>,
+    >(
         self,
         issue_cost: BigUint<Env::Api>,
-        token_display_name: &ManagedBuffer<Env::Api>,
-        token_ticker: &ManagedBuffer<Env::Api>,
+        token_display_name: &Arg0,
+        token_ticker: &Arg1,
         properties: NonFungibleTokenProperties,
     ) -> IssueCall<Env, From, To, Gas> {
-        let zero = BigUint::zero_ref();
+        let zero = &BigUint::zero();
         self.issue(
             issue_cost,
             EsdtTokenType::NonFungible,
             token_display_name,
             token_ticker,
-            &zero,
+            zero,
             TokenProperties {
                 num_decimals: 0,
                 can_freeze: properties.can_freeze,
@@ -125,11 +132,14 @@ where
 
     /// Produces a contract call to the ESDT system SC,
     /// which causes it to issue a new semi-fungible ESDT token.
-    pub fn issue_semi_fungible(
+    pub fn issue_semi_fungible<
+        Arg0: ProxyArg<ManagedBuffer<Env::Api>>,
+        Arg1: ProxyArg<ManagedBuffer<Env::Api>>,
+    >(
         self,
         issue_cost: BigUint<Env::Api>,
-        token_display_name: &ManagedBuffer<Env::Api>,
-        token_ticker: &ManagedBuffer<Env::Api>,
+        token_display_name: &Arg0,
+        token_ticker: &Arg1,
         properties: SemiFungibleTokenProperties,
     ) -> IssueCall<Env, From, To, Gas> {
         let zero = BigUint::zero();
@@ -156,20 +166,23 @@ where
 
     /// Produces a contract call to the ESDT system SC,
     /// which causes it to register a new Meta ESDT token.
-    pub fn register_meta_esdt(
+    pub fn register_meta_esdt<
+        Arg0: ProxyArg<ManagedBuffer<Env::Api>>,
+        Arg1: ProxyArg<ManagedBuffer<Env::Api>>,
+    >(
         self,
         issue_cost: BigUint<Env::Api>,
-        token_display_name: &ManagedBuffer<Env::Api>,
-        token_ticker: &ManagedBuffer<Env::Api>,
+        token_display_name: &Arg0,
+        token_ticker: &Arg1,
         properties: MetaTokenProperties,
     ) -> IssueCall<Env, From, To, Gas> {
-        let zero = BigUint::zero();
+        let zero = &BigUint::zero();
         self.issue(
             issue_cost,
             EsdtTokenType::Meta,
             token_display_name,
             token_ticker,
-            &zero,
+            zero,
             TokenProperties {
                 num_decimals: properties.num_decimals,
                 can_freeze: properties.can_freeze,
@@ -185,11 +198,14 @@ where
         )
     }
 
-    pub fn issue_and_set_all_roles(
+    pub fn issue_and_set_all_roles<
+        Arg0: ProxyArg<ManagedBuffer<Env::Api>>,
+        Arg1: ProxyArg<ManagedBuffer<Env::Api>>,
+    >(
         self,
         issue_cost: BigUint<Env::Api>,
-        token_display_name: ManagedBuffer<Env::Api>,
-        token_ticker: ManagedBuffer<Env::Api>,
+        token_display_name: Arg0,
+        token_ticker: Arg1,
         token_type: EsdtTokenType,
         num_decimals: usize,
     ) -> IssueCall<Env, From, To, Gas> {
@@ -212,13 +228,17 @@ where
     }
 
     /// Deduplicates code from all the possible issue functions
-    fn issue(
+    fn issue<
+        Arg0: ProxyArg<ManagedBuffer<Env::Api>>,
+        Arg1: ProxyArg<ManagedBuffer<Env::Api>>,
+        Arg2: ProxyArg<BigUint<Env::Api>>,
+    >(
         self,
         issue_cost: BigUint<Env::Api>,
         token_type: EsdtTokenType,
-        token_display_name: &ManagedBuffer<Env::Api>,
-        token_ticker: &ManagedBuffer<Env::Api>,
-        initial_supply: &BigUint<Env::Api>,
+        token_display_name: &Arg0,
+        token_ticker: &Arg1,
+        initial_supply: &Arg2,
         properties: TokenProperties,
     ) -> IssueCall<Env, From, To, Gas> {
         let endpoint_name = match token_type {
@@ -268,10 +288,10 @@ where
     /// Produces a contract call to the ESDT system SC,
     /// which causes it to mint more fungible ESDT tokens.
     /// It will fail if the SC is not the owner of the token.
-    pub fn mint(
+    pub fn mint<Arg0: ProxyArg<TokenIdentifier<Env::Api>>, Arg1: ProxyArg<BigUint<Env::Api>>>(
         self,
-        token_identifier: &TokenIdentifier<Env::Api>,
-        amount: &BigUint<Env::Api>,
+        token_identifier: &Arg0,
+        amount: &Arg1,
     ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
             .payment(NotPayable)
@@ -283,10 +303,10 @@ where
 
     /// Produces a contract call to the ESDT system SC,
     /// which causes it to burn fungible ESDT tokens owned by the SC.
-    pub fn burn(
+    pub fn burn<Arg0: ProxyArg<TokenIdentifier<Env::Api>>, Arg1: ProxyArg<BigUint<Env::Api>>>(
         self,
-        token_identifier: &TokenIdentifier<Env::Api>,
-        amount: &BigUint<Env::Api>,
+        token_identifier: &Arg0,
+        amount: &Arg1,
     ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
             .payment(NotPayable)
@@ -298,9 +318,9 @@ where
 
     /// The manager of an ESDT token may choose to suspend all transactions of the token,
     /// except minting, freezing/unfreezing and wiping.
-    pub fn pause(
+    pub fn pause<Arg0: ProxyArg<TokenIdentifier<Env::Api>>>(
         self,
-        token_identifier: &TokenIdentifier<Env::Api>,
+        token_identifier: &Arg0,
     ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
             .payment(NotPayable)
@@ -310,9 +330,9 @@ where
     }
 
     /// The reverse operation of `pause`.
-    pub fn unpause(
+    pub fn unpause<Arg0: ProxyArg<TokenIdentifier<Env::Api>>>(
         self,
-        token_identifier: &TokenIdentifier<Env::Api>,
+        token_identifier: &Arg0,
     ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
             .payment(NotPayable)
@@ -324,10 +344,13 @@ where
     /// The manager of an ESDT token may freeze the tokens held by a specific account.
     /// As a consequence, no tokens may be transferred to or from the frozen account.
     /// Freezing and unfreezing the tokens of an account are operations designed to help token managers to comply with regulations.
-    pub fn freeze(
+    pub fn freeze<
+        Arg0: ProxyArg<TokenIdentifier<Env::Api>>,
+        Arg1: ProxyArg<ManagedAddress<Env::Api>>,
+    >(
         self,
-        token_identifier: &TokenIdentifier<Env::Api>,
-        address: &ManagedAddress<Env::Api>,
+        token_identifier: &Arg0,
+        address: &Arg1,
     ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
             .payment(NotPayable)
@@ -338,10 +361,13 @@ where
     }
 
     /// The reverse operation of `freeze`, unfreezing, will allow further transfers to and from the account.
-    pub fn unfreeze(
+    pub fn unfreeze<
+        Arg0: ProxyArg<TokenIdentifier<Env::Api>>,
+        Arg1: ProxyArg<ManagedAddress<Env::Api>>,
+    >(
         self,
-        token_identifier: &TokenIdentifier<Env::Api>,
-        address: &ManagedAddress<Env::Api>,
+        token_identifier: &Arg0,
+        address: &Arg1,
     ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
             .payment(NotPayable)
@@ -355,10 +381,13 @@ where
     /// This operation is similar to burning the tokens, but the account must have been frozen beforehand,
     /// and it must be done by the token manager.
     /// Wiping the tokens of an account is an operation designed to help token managers to comply with regulations.
-    pub fn wipe(
+    pub fn wipe<
+        Arg0: ProxyArg<TokenIdentifier<Env::Api>>,
+        Arg1: ProxyArg<ManagedAddress<Env::Api>>,
+    >(
         self,
-        token_identifier: &TokenIdentifier<Env::Api>,
-        address: &ManagedAddress<Env::Api>,
+        token_identifier: &Arg0,
+        address: &Arg1,
     ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
             .payment(NotPayable)
@@ -371,11 +400,14 @@ where
     /// The manager of an ESDT token may freeze the NFT held by a specific Account.
     /// As a consequence, no NFT can be transferred to or from the frozen Account.
     /// Freezing and unfreezing a single NFT of an Account are operations designed to help token managers to comply with regulations.
-    pub fn freeze_nft(
+    pub fn freeze_nft<
+        Arg0: ProxyArg<TokenIdentifier<Env::Api>>,
+        Arg1: ProxyArg<ManagedAddress<Env::Api>>,
+    >(
         self,
-        token_identifier: &TokenIdentifier<Env::Api>,
+        token_identifier: &Arg0,
         nft_nonce: u64,
-        address: &ManagedAddress<Env::Api>,
+        address: &Arg1,
     ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
             .payment(NotPayable)
@@ -387,11 +419,14 @@ where
     }
 
     /// The reverse operation of `freeze`, unfreezing, will allow further transfers to and from the account.
-    pub fn unfreeze_nft(
+    pub fn unfreeze_nft<
+        Arg0: ProxyArg<TokenIdentifier<Env::Api>>,
+        Arg1: ProxyArg<ManagedAddress<Env::Api>>,
+    >(
         self,
-        token_identifier: &TokenIdentifier<Env::Api>,
+        token_identifier: &Arg0,
         nft_nonce: u64,
-        address: &ManagedAddress<Env::Api>,
+        address: &Arg1,
     ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
             .payment(NotPayable)
@@ -406,11 +441,14 @@ where
     /// This operation is similar to burning the quantity, but the Account must have been frozen beforehand,
     /// and it must be done by the token manager.
     /// Wiping the tokens of an Account is an operation designed to help token managers to comply with regulations.
-    pub fn wipe_nft(
+    pub fn wipe_nft<
+        Arg0: ProxyArg<TokenIdentifier<Env::Api>>,
+        Arg1: ProxyArg<ManagedAddress<Env::Api>>,
+    >(
         self,
-        token_identifier: &TokenIdentifier<Env::Api>,
+        token_identifier: &Arg0,
         nft_nonce: u64,
-        address: &ManagedAddress<Env::Api>,
+        address: &Arg1,
     ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
             .payment(NotPayable)
@@ -423,15 +461,15 @@ where
 
     /// This function converts an SFT to a metaESDT by adding decimals to its structure in the metachain ESDT System SC.
     /// This function as almost all in case of ESDT can be called only by the owner.
-    pub fn change_sft_to_meta_esdt(
+    pub fn change_sft_to_meta_esdt<Arg0: ProxyArg<TokenIdentifier<Env::Api>>>(
         self,
-        token_identifier: &TokenIdentifier<Env::Api>,
+        token_identifier: &Arg0,
         num_decimals: usize,
     ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
             .payment(NotPayable)
             .raw_call("changeSFTToMetaESDT")
-            .argument(&token_identifier)
+            .argument(token_identifier)
             .argument(&num_decimals)
             .original_result()
     }
@@ -440,10 +478,14 @@ where
     /// The metachain system SC will evaluate the arguments and call “ESDTSetRole@tokenId@listOfRoles” for the given address.
     /// This will be actually a cross shard call.
     /// This function as almost all in case of ESDT can be called only by the owner.
-    pub fn set_special_roles<RoleIter: Iterator<Item = EsdtLocalRole>>(
+    pub fn set_special_roles<
+        RoleIter: Iterator<Item = EsdtLocalRole>,
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg1: ProxyArg<TokenIdentifier<Env::Api>>,
+    >(
         self,
-        address: &ManagedAddress<Env::Api>,
-        token_identifier: &TokenIdentifier<Env::Api>,
+        address: &Arg0,
+        token_identifier: &Arg1,
         roles_iter: RoleIter,
     ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         let mut tx = self
@@ -465,10 +507,14 @@ where
     /// The metachain system SC will evaluate the arguments and call “ESDTUnsetRole@tokenId@listOfRoles” for the given address.
     /// This will be actually a cross shard call.
     /// This function as almost all in case of ESDT can be called only by the owner.
-    pub fn unset_special_roles<RoleIter: Iterator<Item = EsdtLocalRole>>(
+    pub fn unset_special_roles<
+        RoleIter: Iterator<Item = EsdtLocalRole>,
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg1: ProxyArg<TokenIdentifier<Env::Api>>,
+    >(
         self,
-        address: &ManagedAddress<Env::Api>,
-        token_identifier: &TokenIdentifier<Env::Api>,
+        address: &Arg0,
+        token_identifier: &Arg1,
         roles_iter: RoleIter,
     ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         let mut tx = self
@@ -486,10 +532,13 @@ where
         tx.original_result()
     }
 
-    pub fn transfer_ownership(
+    pub fn transfer_ownership<
+        Arg0: ProxyArg<TokenIdentifier<Env::Api>>,
+        Arg1: ProxyArg<ManagedAddress<Env::Api>>,
+    >(
         self,
-        token_identifier: &TokenIdentifier<Env::Api>,
-        new_owner: &ManagedAddress<Env::Api>,
+        token_identifier: &Arg0,
+        new_owner: &Arg1,
     ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
             .payment(NotPayable)
@@ -499,11 +548,14 @@ where
             .original_result()
     }
 
-    pub fn transfer_nft_create_role(
+    pub fn transfer_nft_create_role<
+        Arg0: ProxyArg<TokenIdentifier<Env::Api>>,
+        Arg1: ProxyArg<ManagedAddress<Env::Api>>,
+    >(
         self,
-        token_identifier: &TokenIdentifier<Env::Api>,
-        old_creator: &ManagedAddress<Env::Api>,
-        new_creator: &ManagedAddress<Env::Api>,
+        token_identifier: &Arg0,
+        old_creator: &Arg1,
+        new_creator: &Arg1,
     ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
             .payment(NotPayable)
@@ -514,9 +566,9 @@ where
             .original_result()
     }
 
-    pub fn control_changes(
+    pub fn control_changes<Arg0: ProxyArg<TokenIdentifier<Env::Api>>>(
         self,
-        token_identifier: &TokenIdentifier<Env::Api>,
+        token_identifier: &Arg0,
         property_arguments: &TokenPropertyArguments,
     ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         let mut tx = self
diff --git a/tools/interactor-system-func-calls/src/system_sc_interact.rs b/tools/interactor-system-func-calls/src/system_sc_interact.rs
index bda87cd491..0558eba3c1 100644
--- a/tools/interactor-system-func-calls/src/system_sc_interact.rs
+++ b/tools/interactor-system-func-calls/src/system_sc_interact.rs
@@ -21,8 +21,8 @@ async fn main() {
             basic_interact
                 .issue_token(
                     args.cost.clone(),
-                    &args.display_name,
-                    &args.ticker,
+                    args.display_name.as_bytes(),
+                    args.ticker.as_bytes(),
                     args.num_decimals,
                     args.token_type.into(),
                 )
@@ -30,13 +30,17 @@ async fn main() {
         },
         Some(system_sc_interact_cli::InteractCliCommand::Mint(args)) => {
             basic_interact
-                .mint_token(&args.token_id, args.nonce, args.amount.clone())
+                .mint_token(
+                    args.token_id.clone().as_bytes(),
+                    args.nonce,
+                    args.amount.clone(),
+                )
                 .await;
         },
         Some(system_sc_interact_cli::InteractCliCommand::SetRoles(args)) => {
             basic_interact
                 .set_roles(
-                    &args.token_id,
+                    args.token_id.as_bytes(),
                     args.roles
                         .clone()
                         .into_iter()
@@ -47,19 +51,19 @@ async fn main() {
         },
         Some(system_sc_interact_cli::InteractCliCommand::Burn(args)) => {
             basic_interact
-                .burn_token(&args.token_id, args.nonce, args.amount.clone())
+                .burn_token(args.token_id.as_bytes(), args.nonce, args.amount.clone())
                 .await;
         },
         Some(system_sc_interact_cli::InteractCliCommand::PauseToken(args)) => {
-            basic_interact.pause_token(&args.token_id).await;
+            basic_interact.pause_token(args.token_id.as_bytes()).await;
         },
         Some(system_sc_interact_cli::InteractCliCommand::UnpauseToken(args)) => {
-            basic_interact.unpause_token(&args.token_id).await;
+            basic_interact.unpause_token(args.token_id.as_bytes()).await;
         },
         Some(system_sc_interact_cli::InteractCliCommand::FreezeToken(args)) => {
             basic_interact
                 .freeze_token(
-                    &args.token_id,
+                    args.token_id.as_bytes(),
                     &Bech32Address::from_bech32_string(args.address.clone()),
                 )
                 .await;
@@ -67,7 +71,7 @@ async fn main() {
         Some(system_sc_interact_cli::InteractCliCommand::UnfreezeToken(args)) => {
             basic_interact
                 .unfreeze_token(
-                    &args.token_id,
+                    args.token_id.as_bytes(),
                     &Bech32Address::from_bech32_string(args.address.clone()),
                 )
                 .await;
@@ -75,7 +79,7 @@ async fn main() {
         Some(system_sc_interact_cli::InteractCliCommand::FreezeNFT(args)) => {
             basic_interact
                 .freeze_nft(
-                    &args.token_id,
+                    args.token_id.as_bytes(),
                     args.nft_nonce,
                     &Bech32Address::from_bech32_string(args.address.clone()),
                 )
@@ -84,7 +88,7 @@ async fn main() {
         Some(system_sc_interact_cli::InteractCliCommand::UnfreezeNFT(args)) => {
             basic_interact
                 .unfreeze_nft(
-                    &args.token_id,
+                    args.token_id.as_bytes(),
                     args.nft_nonce,
                     &Bech32Address::from_bech32_string(args.address.clone()),
                 )
@@ -93,7 +97,7 @@ async fn main() {
         Some(system_sc_interact_cli::InteractCliCommand::WipeToken(args)) => {
             basic_interact
                 .wipe_token(
-                    &args.token_id,
+                    args.token_id.as_bytes(),
                     &Bech32Address::from_bech32_string(args.address.clone()),
                 )
                 .await;
@@ -101,7 +105,7 @@ async fn main() {
         Some(system_sc_interact_cli::InteractCliCommand::WipeNFT(args)) => {
             basic_interact
                 .wipe_nft(
-                    &args.token_id,
+                    args.token_id.as_bytes(),
                     args.nft_nonce,
                     &Bech32Address::from_bech32_string(args.address.clone()),
                 )
@@ -109,17 +113,21 @@ async fn main() {
         },
         Some(system_sc_interact_cli::InteractCliCommand::IssueNFTCollection(args)) => {
             basic_interact
-                .issue_non_fungible_collection(args.cost.clone(), &args.display_name, &args.ticker)
+                .issue_non_fungible_collection(
+                    args.cost.clone(),
+                    args.display_name.as_bytes(),
+                    args.ticker.as_bytes(),
+                )
                 .await;
         },
         Some(system_sc_interact_cli::InteractCliCommand::CreateNFT(args)) => {
             basic_interact
                 .mint_nft(
-                    &args.token_id,
+                    args.token_id.as_bytes(),
                     args.amount.clone(),
-                    &args.name,
+                    args.name.as_bytes(),
                     args.royalties,
-                    &args.hash,
+                    args.hash.as_bytes(),
                 )
                 .await;
         },
@@ -127,8 +135,8 @@ async fn main() {
             basic_interact
                 .issue_fungible_token(
                     args.cost.clone(),
-                    &args.display_name,
-                    &args.ticker,
+                    args.display_name.as_bytes(),
+                    args.ticker.as_bytes(),
                     args.supply.clone(),
                     args.num_decimals,
                 )
@@ -136,17 +144,21 @@ async fn main() {
         },
         Some(system_sc_interact_cli::InteractCliCommand::IssueSftCollection(args)) => {
             basic_interact
-                .issue_semi_fungible_collection(args.cost.clone(), &args.display_name, &args.ticker)
+                .issue_semi_fungible_collection(
+                    args.cost.clone(),
+                    args.display_name.as_bytes(),
+                    args.ticker.as_bytes(),
+                )
                 .await;
         },
         Some(system_sc_interact_cli::InteractCliCommand::MintSft(args)) => {
             basic_interact
                 .mint_sft(
-                    &args.token_id,
+                    args.token_id.as_bytes(),
                     args.amount.clone(),
-                    &args.name,
+                    args.name.as_bytes(),
                     args.royalties,
-                    &args.hash,
+                    args.hash.as_bytes(),
                 )
                 .await;
         },
@@ -154,22 +166,22 @@ async fn main() {
             basic_interact
                 .register_meta_esdt(
                     args.cost.clone(),
-                    &args.display_name,
-                    &args.ticker,
+                    args.display_name.as_bytes(),
+                    args.ticker.as_bytes(),
                     args.num_decimals,
                 )
                 .await;
         },
         Some(system_sc_interact_cli::InteractCliCommand::ChangeSftMetaEsdt(args)) => {
             basic_interact
-                .change_sft_meta_esdt(&args.token_id, args.num_decimals)
+                .change_sft_meta_esdt(args.token_id.as_bytes(), args.num_decimals)
                 .await;
         },
         Some(system_sc_interact_cli::InteractCliCommand::UnsetRoles(args)) => {
             basic_interact
                 .unset_roles(
                     &Bech32Address::from_bech32_string(args.address.clone()),
-                    &args.token_id,
+                    args.token_id.as_bytes(),
                     args.roles
                         .clone()
                         .into_iter()
@@ -181,7 +193,7 @@ async fn main() {
         Some(system_sc_interact_cli::InteractCliCommand::TransferOwnership(args)) => {
             basic_interact
                 .transfer_ownership(
-                    &args.token_id,
+                    args.token_id.as_bytes(),
                     &Bech32Address::from_bech32_string(args.new_owner.clone()),
                 )
                 .await;
@@ -189,14 +201,16 @@ async fn main() {
         Some(system_sc_interact_cli::InteractCliCommand::TransferNftCreateRole(args)) => {
             basic_interact
                 .transfer_nft_create_role(
-                    &args.token_id,
+                    args.token_id.as_bytes(),
                     &Bech32Address::from_bech32_string(args.old_owner.clone()),
                     &Bech32Address::from_bech32_string(args.new_owner.clone()),
                 )
                 .await;
         },
         Some(system_sc_interact_cli::InteractCliCommand::ControlChanges(args)) => {
-            basic_interact.control_changes(&args.token_id).await;
+            basic_interact
+                .control_changes(args.token_id.as_bytes())
+                .await;
         },
 
         None => {},
@@ -227,8 +241,8 @@ impl SysFuncCallsInteract {
     async fn issue_fungible_token(
         &mut self,
         issue_cost: RustBigUint,
-        token_display_name: &str,
-        token_ticker: &str,
+        token_display_name: &[u8],
+        token_ticker: &[u8],
         initial_supply: RustBigUint,
         num_decimals: usize,
     ) {
@@ -243,9 +257,9 @@ impl SysFuncCallsInteract {
             .typed(ESDTSystemSCProxy)
             .issue_fungible(
                 issue_cost.into(),
-                &token_display_name.into(),
-                &token_ticker.into(),
-                &initial_supply.into(),
+                &token_display_name,
+                &token_ticker,
+                &initial_supply,
                 FungibleTokenProperties {
                     num_decimals,
                     can_freeze: true,
@@ -269,8 +283,8 @@ impl SysFuncCallsInteract {
     async fn issue_non_fungible_collection(
         &mut self,
         issue_cost: RustBigUint,
-        token_display_name: &str,
-        token_ticker: &str,
+        token_display_name: &[u8],
+        token_ticker: &[u8],
     ) {
         println!("Issuing NFT Collection...");
 
@@ -283,8 +297,8 @@ impl SysFuncCallsInteract {
             .typed(ESDTSystemSCProxy)
             .issue_non_fungible(
                 issue_cost.into(),
-                &token_display_name.into(),
-                &token_ticker.into(),
+                &token_display_name,
+                &token_ticker,
                 NonFungibleTokenProperties {
                     can_freeze: true,
                     can_wipe: true,
@@ -306,8 +320,8 @@ impl SysFuncCallsInteract {
     async fn issue_semi_fungible_collection(
         &mut self,
         issue_cost: RustBigUint,
-        token_display_name: &str,
-        token_ticker: &str,
+        token_display_name: &[u8],
+        token_ticker: &[u8],
     ) {
         println!("Issuing SFT Collection...");
 
@@ -320,8 +334,8 @@ impl SysFuncCallsInteract {
             .typed(ESDTSystemSCProxy)
             .issue_semi_fungible(
                 issue_cost.into(),
-                &token_display_name.into(),
-                &token_ticker.into(),
+                &token_display_name,
+                &token_ticker,
                 SemiFungibleTokenProperties {
                     can_freeze: true,
                     can_wipe: true,
@@ -343,8 +357,8 @@ impl SysFuncCallsInteract {
     async fn issue_token(
         &mut self,
         issue_cost: RustBigUint,
-        token_display_name: &str,
-        token_ticker: &str,
+        token_display_name: &[u8],
+        token_ticker: &[u8],
         num_decimals: usize,
         token_type: EsdtTokenType,
     ) {
@@ -359,8 +373,8 @@ impl SysFuncCallsInteract {
             .typed(ESDTSystemSCProxy)
             .issue_and_set_all_roles(
                 issue_cost.into(),
-                token_display_name.into(),
-                token_ticker.into(),
+                token_display_name,
+                token_ticker,
                 token_type,
                 num_decimals,
             )
@@ -372,7 +386,7 @@ impl SysFuncCallsInteract {
         println!("TOKEN ID: {:?}", token_id);
     }
 
-    async fn set_roles(&mut self, token_id: &str, roles: Vec<EsdtLocalRole>) {
+    async fn set_roles(&mut self, token_id: &[u8], roles: Vec<EsdtLocalRole>) {
         let wallet_address = &self.wallet_address.clone().into_address();
         println!("Setting the following roles: {:?}", roles);
 
@@ -394,11 +408,11 @@ impl SysFuncCallsInteract {
 
     async fn mint_sft(
         &mut self,
-        token_id: &str,
+        token_id: &[u8],
         amount: RustBigUint,
-        name: &str,
+        name: &[u8],
         royalties: u64,
-        hash: &str,
+        hash: &[u8],
     ) {
         println!("Minting SFT...");
 
@@ -409,11 +423,11 @@ impl SysFuncCallsInteract {
             .gas(100_000_000u64)
             .typed(UserBuiltinProxy)
             .esdt_nft_create(
-                &TokenIdentifier::from(token_id),
-                &BigUint::from(amount),
-                &ManagedBuffer::from(name),
-                &royalties.into(),
-                &ManagedBuffer::from(hash),
+                &token_id,
+                &amount,
+                &name,
+                &royalties,
+                &hash,
                 &NftDummyAttributes {
                     creation_epoch: 2104,
                     cool_factor: 5,
@@ -428,8 +442,8 @@ impl SysFuncCallsInteract {
     async fn register_meta_esdt(
         &mut self,
         issue_cost: RustBigUint,
-        token_display_name: &str,
-        token_ticker: &str,
+        token_display_name: &[u8],
+        token_ticker: &[u8],
         num_decimals: usize,
     ) {
         println!("Registering meta ESDT...");
@@ -443,8 +457,8 @@ impl SysFuncCallsInteract {
             .typed(ESDTSystemSCProxy)
             .register_meta_esdt(
                 issue_cost.into(),
-                &token_display_name.into(),
-                &token_ticker.into(),
+                &token_display_name,
+                &token_ticker,
                 MetaTokenProperties {
                     num_decimals,
                     can_freeze: true,
@@ -464,7 +478,7 @@ impl SysFuncCallsInteract {
         println!("Meta-ESDT ID: {:?}", meta_esdt);
     }
 
-    async fn change_sft_meta_esdt(&mut self, token_id: &str, num_decimals: usize) {
+    async fn change_sft_meta_esdt(&mut self, token_id: &[u8], num_decimals: usize) {
         println!("Changing SFT to Meta-ESDT...");
 
         self.interactor
@@ -473,13 +487,13 @@ impl SysFuncCallsInteract {
             .to(ESDTSystemSCAddress)
             .gas(100_000_000u64)
             .typed(ESDTSystemSCProxy)
-            .change_sft_to_meta_esdt(&TokenIdentifier::from(token_id), num_decimals)
+            .change_sft_to_meta_esdt(&token_id, num_decimals)
             .prepare_async()
             .run()
             .await;
     }
 
-    async fn mint_token(&mut self, token_id: &str, nonce: u64, amount: RustBigUint) {
+    async fn mint_token(&mut self, token_id: &[u8], nonce: u64, amount: RustBigUint) {
         println!("Minting tokens...");
 
         self.interactor
@@ -488,17 +502,13 @@ impl SysFuncCallsInteract {
             .to(&self.wallet_address)
             .gas(100_000_000u64)
             .typed(UserBuiltinProxy)
-            .esdt_local_mint(
-                &TokenIdentifier::from(token_id),
-                nonce,
-                &BigUint::from(amount),
-            )
+            .esdt_local_mint(&token_id, nonce, &amount)
             .prepare_async()
             .run()
             .await;
     }
 
-    async fn burn_token(&mut self, token_id: &str, nonce: u64, amount: RustBigUint) {
+    async fn burn_token(&mut self, token_id: &[u8], nonce: u64, amount: RustBigUint) {
         println!("Burning tokens...");
 
         self.interactor
@@ -507,17 +517,13 @@ impl SysFuncCallsInteract {
             .to(&self.wallet_address)
             .gas(100_000_000u64)
             .typed(UserBuiltinProxy)
-            .esdt_local_burn(
-                &TokenIdentifier::from(token_id),
-                nonce,
-                &BigUint::from(amount),
-            )
+            .esdt_local_burn(&token_id, nonce, &amount)
             .prepare_async()
             .run()
             .await;
     }
 
-    async fn pause_token(&mut self, token_id: &str) {
+    async fn pause_token(&mut self, token_id: &[u8]) {
         println!("Pausing token...");
 
         self.interactor
@@ -526,13 +532,13 @@ impl SysFuncCallsInteract {
             .to(ESDTSystemSCAddress)
             .gas(100_000_000u64)
             .typed(ESDTSystemSCProxy)
-            .pause(&TokenIdentifier::from(token_id))
+            .pause(&token_id)
             .prepare_async()
             .run()
             .await;
     }
 
-    async fn unpause_token(&mut self, token_id: &str) {
+    async fn unpause_token(&mut self, token_id: &[u8]) {
         println!("Unpausing token...");
 
         self.interactor
@@ -541,15 +547,13 @@ impl SysFuncCallsInteract {
             .to(ESDTSystemSCAddress)
             .gas(100_000_000u64)
             .typed(ESDTSystemSCProxy)
-            .unpause(&TokenIdentifier::from(token_id))
+            .unpause(&token_id)
             .prepare_async()
             .run()
             .await;
     }
 
-    async fn freeze_token(&mut self, token_id: &str, address: &Bech32Address) {
-        let managed_address: ManagedAddress<StaticApi> =
-            ManagedAddress::from_address(&address.to_address());
+    async fn freeze_token(&mut self, token_id: &[u8], address: &Bech32Address) {
         println!("Freezing token...");
 
         self.interactor
@@ -558,15 +562,13 @@ impl SysFuncCallsInteract {
             .to(ESDTSystemSCAddress)
             .gas(100_000_000u64)
             .typed(ESDTSystemSCProxy)
-            .freeze(&TokenIdentifier::from(token_id), &managed_address)
+            .freeze(&token_id, &address)
             .prepare_async()
             .run()
             .await;
     }
 
-    async fn unfreeze_token(&mut self, token_id: &str, address: &Bech32Address) {
-        let managed_address: ManagedAddress<StaticApi> =
-            ManagedAddress::from_address(&address.to_address());
+    async fn unfreeze_token(&mut self, token_id: &[u8], address: &Bech32Address) {
         println!("Unfreezing token...");
 
         self.interactor
@@ -575,15 +577,13 @@ impl SysFuncCallsInteract {
             .to(ESDTSystemSCAddress)
             .gas(100_000_000u64)
             .typed(ESDTSystemSCProxy)
-            .unfreeze(&TokenIdentifier::from(token_id), &managed_address)
+            .unfreeze(&token_id, &address)
             .prepare_async()
             .run()
             .await;
     }
 
-    async fn freeze_nft(&mut self, token_id: &str, nonce: u64, address: &Bech32Address) {
-        let managed_address: ManagedAddress<StaticApi> =
-            ManagedAddress::from_address(&address.to_address());
+    async fn freeze_nft(&mut self, token_id: &[u8], nonce: u64, address: &Bech32Address) {
         println!("Freezing NFT/SFT/Meta-ESDT...");
 
         self.interactor
@@ -592,15 +592,13 @@ impl SysFuncCallsInteract {
             .to(ESDTSystemSCAddress)
             .gas(100_000_000u64)
             .typed(ESDTSystemSCProxy)
-            .freeze_nft(&TokenIdentifier::from(token_id), nonce, &managed_address)
+            .freeze_nft(&token_id, nonce, &address)
             .prepare_async()
             .run()
             .await;
     }
 
-    async fn unfreeze_nft(&mut self, token_id: &str, nonce: u64, address: &Bech32Address) {
-        let managed_address: ManagedAddress<StaticApi> =
-            ManagedAddress::from_address(&address.to_address());
+    async fn unfreeze_nft(&mut self, token_id: &[u8], nonce: u64, address: &Bech32Address) {
         println!("Unfreezing NFT/SFT/Meta-ESDT...");
 
         self.interactor
@@ -609,15 +607,13 @@ impl SysFuncCallsInteract {
             .to(ESDTSystemSCAddress)
             .gas(100_000_000u64)
             .typed(ESDTSystemSCProxy)
-            .unfreeze_nft(&TokenIdentifier::from(token_id), nonce, &managed_address)
+            .unfreeze_nft(&token_id, nonce, &address)
             .prepare_async()
             .run()
             .await;
     }
 
-    async fn wipe_token(&mut self, token_id: &str, address: &Bech32Address) {
-        let managed_address: ManagedAddress<StaticApi> =
-            ManagedAddress::from_address(&address.to_address());
+    async fn wipe_token(&mut self, token_id: &[u8], address: &Bech32Address) {
         println!("Wiping token...");
 
         self.interactor
@@ -626,15 +622,13 @@ impl SysFuncCallsInteract {
             .to(ESDTSystemSCAddress)
             .gas(100_000_000u64)
             .typed(ESDTSystemSCProxy)
-            .wipe(&TokenIdentifier::from(token_id), &managed_address)
+            .wipe(&token_id, &address)
             .prepare_async()
             .run()
             .await;
     }
 
-    async fn wipe_nft(&mut self, token_id: &str, nonce: u64, address: &Bech32Address) {
-        let managed_address: ManagedAddress<StaticApi> =
-            ManagedAddress::from_address(&address.to_address());
+    async fn wipe_nft(&mut self, token_id: &[u8], nonce: u64, address: &Bech32Address) {
         println!("Wiping NFT/SFT/Meta-ESDT...");
 
         self.interactor
@@ -643,7 +637,7 @@ impl SysFuncCallsInteract {
             .to(ESDTSystemSCAddress)
             .gas(100_000_000u64)
             .typed(ESDTSystemSCProxy)
-            .wipe_nft(&TokenIdentifier::from(token_id), nonce, &managed_address)
+            .wipe_nft(&token_id, nonce, &address)
             .prepare_async()
             .run()
             .await;
@@ -651,11 +645,11 @@ impl SysFuncCallsInteract {
 
     async fn mint_nft(
         &mut self,
-        token_id: &str,
+        token_id: &[u8],
         amount: RustBigUint,
-        name: &str,
+        name: &[u8],
         royalties: u64,
-        hash: &str,
+        hash: &[u8],
     ) {
         println!("Minting NFT...");
 
@@ -666,11 +660,11 @@ impl SysFuncCallsInteract {
             .gas(100_000_000u64)
             .typed(UserBuiltinProxy)
             .esdt_nft_create(
-                &TokenIdentifier::from(token_id),
-                &BigUint::from(amount),
-                &ManagedBuffer::from(name),
-                &BigUint::from(royalties),
-                &ManagedBuffer::from(hash),
+                &token_id,
+                &amount,
+                &name,
+                &royalties,
+                &hash,
                 &NftDummyAttributes {
                     creation_epoch: 2104,
                     cool_factor: 5,
@@ -685,11 +679,9 @@ impl SysFuncCallsInteract {
     async fn unset_roles(
         &mut self,
         address: &Bech32Address,
-        token_id: &str,
+        token_id: &[u8],
         roles: Vec<EsdtLocalRole>,
     ) {
-        let managed_address: ManagedAddress<StaticApi> =
-            ManagedAddress::from_address(&address.to_address());
         println!("Unsetting the following roles: {:?}", roles);
 
         self.interactor
@@ -698,19 +690,13 @@ impl SysFuncCallsInteract {
             .to(ESDTSystemSCAddress)
             .gas(100_000_000u64)
             .typed(ESDTSystemSCProxy)
-            .unset_special_roles(
-                &managed_address,
-                &TokenIdentifier::from(token_id),
-                roles.into_iter(),
-            )
+            .unset_special_roles(&address, &token_id, roles.into_iter())
             .prepare_async()
             .run()
             .await;
     }
 
-    async fn transfer_ownership(&mut self, token_id: &str, new_owner: &Bech32Address) {
-        let managed_new_owner: ManagedAddress<StaticApi> =
-            ManagedAddress::from_address(&new_owner.to_address());
+    async fn transfer_ownership(&mut self, token_id: &[u8], new_owner: &Bech32Address) {
         println!("Transferring token ownership...");
 
         self.interactor
@@ -719,7 +705,7 @@ impl SysFuncCallsInteract {
             .to(ESDTSystemSCAddress)
             .gas(100_000_000u64)
             .typed(ESDTSystemSCProxy)
-            .transfer_ownership(&TokenIdentifier::from(token_id), &managed_new_owner)
+            .transfer_ownership(&token_id, &new_owner)
             .prepare_async()
             .run()
             .await;
@@ -727,14 +713,10 @@ impl SysFuncCallsInteract {
 
     async fn transfer_nft_create_role(
         &mut self,
-        token_id: &str,
+        token_id: &[u8],
         old_owner: &Bech32Address,
         new_owner: &Bech32Address,
     ) {
-        let managed_old_owner: ManagedAddress<StaticApi> =
-            ManagedAddress::from_address(&old_owner.to_address());
-        let managed_new_owner: ManagedAddress<StaticApi> =
-            ManagedAddress::from_address(&new_owner.to_address());
         println!("Transferring NFT create role...");
 
         self.interactor
@@ -743,17 +725,13 @@ impl SysFuncCallsInteract {
             .to(ESDTSystemSCAddress)
             .gas(100_000_000u64)
             .typed(ESDTSystemSCProxy)
-            .transfer_nft_create_role(
-                &TokenIdentifier::from(token_id),
-                &managed_old_owner,
-                &managed_new_owner,
-            )
+            .transfer_nft_create_role(&token_id, &old_owner, &new_owner)
             .prepare_async()
             .run()
             .await;
     }
 
-    async fn control_changes(&mut self, token_id: &str) {
+    async fn control_changes(&mut self, token_id: &[u8]) {
         println!("Control changes");
 
         self.interactor
@@ -763,7 +741,7 @@ impl SysFuncCallsInteract {
             .gas(100_000_000u64)
             .typed(ESDTSystemSCProxy)
             .control_changes(
-                &TokenIdentifier::from(token_id),
+                &token_id,
                 &TokenPropertyArguments {
                     can_freeze: Some(true),
                     can_wipe: Some(true),

From 55f1c40daf6b45cbe58837321e2987ad5ef074d7 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Mon, 2 Sep 2024 15:47:41 +0200
Subject: [PATCH 1240/1254] process status fixes, returnsLogs result handler

---
 .../scenario/src/facade/result_handlers.rs    |  2 +
 .../facade/result_handlers/returns_logs.rs    | 24 ++++++++
 sdk/core/src/data/transaction.rs              | 14 +++++
 sdk/core/src/gateway/gateway_tx.rs            | 23 +++++++-
 sdk/core/src/gateway/gateway_tx_retrieve.rs   | 58 +++++++++++--------
 5 files changed, 95 insertions(+), 26 deletions(-)
 create mode 100644 framework/scenario/src/facade/result_handlers/returns_logs.rs

diff --git a/framework/scenario/src/facade/result_handlers.rs b/framework/scenario/src/facade/result_handlers.rs
index 1893647b45..33b5b1a495 100644
--- a/framework/scenario/src/facade/result_handlers.rs
+++ b/framework/scenario/src/facade/result_handlers.rs
@@ -2,6 +2,7 @@ mod expect_error;
 mod expect_message;
 mod expect_status;
 mod expect_value;
+mod returns_logs;
 mod returns_message;
 mod returns_new_bech32_address;
 mod returns_new_token_identifier;
@@ -12,6 +13,7 @@ pub use expect_error::ExpectError;
 pub use expect_message::ExpectMessage;
 pub use expect_status::ExpectStatus;
 pub use expect_value::ExpectValue;
+pub use returns_logs::ReturnsLogs;
 pub use returns_message::ReturnsMessage;
 pub use returns_new_bech32_address::ReturnsNewBech32Address;
 pub use returns_new_token_identifier::ReturnsNewTokenIdentifier;
diff --git a/framework/scenario/src/facade/result_handlers/returns_logs.rs b/framework/scenario/src/facade/result_handlers/returns_logs.rs
new file mode 100644
index 0000000000..7aa4292fa2
--- /dev/null
+++ b/framework/scenario/src/facade/result_handlers/returns_logs.rs
@@ -0,0 +1,24 @@
+use multiversx_sc::types::RHListItemExec;
+
+use crate::{
+    multiversx_sc::types::{RHListItem, TxEnv},
+    scenario_model::{Log, TxResponse},
+};
+
+pub struct ReturnsLogs;
+
+impl<Env, Original> RHListItem<Env, Original> for ReturnsLogs
+where
+    Env: TxEnv,
+{
+    type Returns = Vec<Log>;
+}
+
+impl<Env, Original> RHListItemExec<TxResponse, Env, Original> for ReturnsLogs
+where
+    Env: TxEnv,
+{
+    fn item_process_result(self, raw_result: &TxResponse) -> Self::Returns {
+        raw_result.logs.clone()
+    }
+}
diff --git a/sdk/core/src/data/transaction.rs b/sdk/core/src/data/transaction.rs
index 3ee2f25684..561647776d 100644
--- a/sdk/core/src/data/transaction.rs
+++ b/sdk/core/src/data/transaction.rs
@@ -152,6 +152,20 @@ pub struct TransactionStatus {
     pub data: Option<TransactionStatusData>,
 }
 
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct TransactionProcessStatusData {
+    pub reason: String,
+    pub status: String,
+}
+
+// TransactionProcessStatus holds a transaction's status response from the network obtained through the process-status API
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct TransactionProcessStatus {
+    pub error: String,
+    pub code: String,
+    pub data: Option<TransactionProcessStatusData>,
+}
+
 // ArgCreateTransaction will hold the transaction fields
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct ArgCreateTransaction {
diff --git a/sdk/core/src/gateway/gateway_tx.rs b/sdk/core/src/gateway/gateway_tx.rs
index 47aa8b5a83..eaf9fed9d5 100644
--- a/sdk/core/src/gateway/gateway_tx.rs
+++ b/sdk/core/src/gateway/gateway_tx.rs
@@ -3,7 +3,8 @@ use crate::data::{
     network_config::NetworkConfig,
     transaction::{
         ArgCreateTransaction, ResponseTxCost, SendTransactionResponse, SendTransactionsResponse,
-        Transaction, TransactionInfo, TransactionOnNetwork, TransactionStatus, TxCostResponseData,
+        Transaction, TransactionInfo, TransactionOnNetwork, TransactionProcessStatus,
+        TransactionStatus, TxCostResponseData,
     },
     vm::{ResponseVmValue, VmValueRequest, VmValuesResponseData},
 };
@@ -96,6 +97,26 @@ impl GatewayProxy {
         }
     }
 
+    // get_transaction_process_status retrieves a transaction's status from the network using process-status API
+    pub async fn get_transaction_process_status(&self, hash: &str) -> Result<(String, String)> {
+        println!("transaction process status");
+        let endpoint = format!("transaction/{hash}/process-status");
+        let endpoint = self.get_endpoint(endpoint.as_str());
+
+        let resp = self
+            .client
+            .get(endpoint)
+            .send()
+            .await?
+            .json::<TransactionProcessStatus>()
+            .await?;
+
+        match resp.data {
+            None => Err(anyhow!("{}", resp.error)),
+            Some(b) => Ok((b.status, b.reason)),
+        }
+    }
+
     // get_default_transaction_arguments will prepare the transaction creation argument by querying the account's info
     pub async fn get_default_transaction_arguments(
         &self,
diff --git a/sdk/core/src/gateway/gateway_tx_retrieve.rs b/sdk/core/src/gateway/gateway_tx_retrieve.rs
index 452d37b3e0..18bc9c7136 100644
--- a/sdk/core/src/gateway/gateway_tx_retrieve.rs
+++ b/sdk/core/src/gateway/gateway_tx_retrieve.rs
@@ -14,41 +14,37 @@ impl GatewayProxy {
         let mut retries = 0;
         let mut backoff_delay = Duration::from_secs_f32(INITIAL_BACKOFF_DELAY);
         let start_time = Instant::now();
-        let mut issue_found = false;
 
         loop {
-            match self.get_transaction_status(&tx_hash).await {
-                Ok(status) => {
+            match self.get_transaction_process_status(&tx_hash).await {
+                Ok((status, reason)) => {
                     // checks if transaction status is final
                     match status.as_str() {
-                        "success" | "fail" => {
+                        "success" => {
                             // retrieve transaction info with results
                             let transaction_info_with_results = self
                                 .get_transaction_info_with_results(&tx_hash)
                                 .await
                                 .unwrap();
 
-                            if !transaction_info_with_results
-                                .smart_contract_results
-                                .is_empty()
-                                && !issue_found
-                            {
-                                let first_scr =
-                                    &transaction_info_with_results.smart_contract_results[0];
-
-                                if GatewayProxy::is_issue_tx(&first_scr.data) {
-                                    issue_found = true;
-                                    tokio::time::sleep(Duration::from_secs(30)).await;
-                                    continue;
-                                }
-                            }
-
                             info!(
                                 "Transaction retrieved successfully, with status {}: {:#?}",
                                 status, transaction_info_with_results
                             );
                             return transaction_info_with_results;
                         },
+                        "fail" => {
+                            let result = parse_reason(&reason);
+
+                            match result {
+                                Ok((code, err)) => {
+                                    panic!("Transaction failed. Code: {code}, message: {err}")
+                                },
+                                Err(err) => {
+                                    panic!("Reason parsing error for failed transaction: {err}")
+                                },
+                            }
+                        },
                         _ => {
                             continue;
                         },
@@ -77,12 +73,24 @@ impl GatewayProxy {
         );
         TransactionOnNetwork::default()
     }
+}
+
+pub fn parse_reason(reason: &str) -> Result<(u64, String), String> {
+    let parts: Vec<&str> = reason.split('@').collect();
 
-    fn is_issue_tx(data: &str) -> bool {
-        data.starts_with("issue@")
-            || data.starts_with("issueSemiFungible@")
-            || data.starts_with("issueNonFungible@")
-            || data.starts_with("registerMetaESDT@")
-            || data.starts_with("registerAndSetAllRoles@")
+    if parts.len() < 2 {
+        return Err("Invalid reason format".to_string());
     }
+
+    let error_code_hex = parts[1];
+    let error_message_hex = parts[2];
+
+    let error_code =
+        u64::from_str_radix(error_code_hex, 16).expect("Failed to decode error code as u64");
+
+    let error_message =
+        String::from_utf8(hex::decode(error_message_hex).expect("Failed to decode error message"))
+            .expect("Failed to decode error message as UTF-8");
+
+    Ok((error_code, error_message))
 }

From 1866c74b9cc16ba5cbb0e6277887ab68fa6051c7 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Mon, 2 Sep 2024 16:28:57 +0200
Subject: [PATCH 1241/1254] removed debug comment

---
 sdk/core/src/gateway/gateway_tx.rs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/sdk/core/src/gateway/gateway_tx.rs b/sdk/core/src/gateway/gateway_tx.rs
index eaf9fed9d5..88d9cd4ece 100644
--- a/sdk/core/src/gateway/gateway_tx.rs
+++ b/sdk/core/src/gateway/gateway_tx.rs
@@ -99,7 +99,6 @@ impl GatewayProxy {
 
     // get_transaction_process_status retrieves a transaction's status from the network using process-status API
     pub async fn get_transaction_process_status(&self, hash: &str) -> Result<(String, String)> {
-        println!("transaction process status");
         let endpoint = format!("transaction/{hash}/process-status");
         let endpoint = self.get_endpoint(endpoint.as_str());
 

From f34c9d0ea2036e985e36de5e2c71fcd7636ef711 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Mon, 2 Sep 2024 17:41:47 +0200
Subject: [PATCH 1242/1254] invalid transaction case

---
 sdk/core/src/gateway/gateway_tx_retrieve.rs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/sdk/core/src/gateway/gateway_tx_retrieve.rs b/sdk/core/src/gateway/gateway_tx_retrieve.rs
index 18bc9c7136..61ba080430 100644
--- a/sdk/core/src/gateway/gateway_tx_retrieve.rs
+++ b/sdk/core/src/gateway/gateway_tx_retrieve.rs
@@ -34,13 +34,21 @@ impl GatewayProxy {
                             return transaction_info_with_results;
                         },
                         "fail" => {
+                            // status failed and no reason means invalid transaction
+                            if reason.is_empty() {
+                                info!("Transaction failed. Invalid transaction: {tx_hash}");
+                                panic!("Transaction failed. Invalid transaction: {tx_hash}");
+                            }
+
                             let result = parse_reason(&reason);
 
                             match result {
                                 Ok((code, err)) => {
+                                    info!("Transaction failed. Code: {code}, message: {err}");
                                     panic!("Transaction failed. Code: {code}, message: {err}")
                                 },
                                 Err(err) => {
+                                    info!("Reason parsing error for failed transaction: {err}");
                                     panic!("Reason parsing error for failed transaction: {err}")
                                 },
                             }

From c4098643397a08db22e3b2ea31e0ecbbd8e1ecf2 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Tue, 3 Sep 2024 10:54:58 +0200
Subject: [PATCH 1243/1254] moved returnsLogs to a different PR

---
 .../scenario/src/facade/result_handlers.rs    |  2 --
 .../facade/result_handlers/returns_logs.rs    | 24 -------------------
 2 files changed, 26 deletions(-)
 delete mode 100644 framework/scenario/src/facade/result_handlers/returns_logs.rs

diff --git a/framework/scenario/src/facade/result_handlers.rs b/framework/scenario/src/facade/result_handlers.rs
index 33b5b1a495..1893647b45 100644
--- a/framework/scenario/src/facade/result_handlers.rs
+++ b/framework/scenario/src/facade/result_handlers.rs
@@ -2,7 +2,6 @@ mod expect_error;
 mod expect_message;
 mod expect_status;
 mod expect_value;
-mod returns_logs;
 mod returns_message;
 mod returns_new_bech32_address;
 mod returns_new_token_identifier;
@@ -13,7 +12,6 @@ pub use expect_error::ExpectError;
 pub use expect_message::ExpectMessage;
 pub use expect_status::ExpectStatus;
 pub use expect_value::ExpectValue;
-pub use returns_logs::ReturnsLogs;
 pub use returns_message::ReturnsMessage;
 pub use returns_new_bech32_address::ReturnsNewBech32Address;
 pub use returns_new_token_identifier::ReturnsNewTokenIdentifier;
diff --git a/framework/scenario/src/facade/result_handlers/returns_logs.rs b/framework/scenario/src/facade/result_handlers/returns_logs.rs
deleted file mode 100644
index 7aa4292fa2..0000000000
--- a/framework/scenario/src/facade/result_handlers/returns_logs.rs
+++ /dev/null
@@ -1,24 +0,0 @@
-use multiversx_sc::types::RHListItemExec;
-
-use crate::{
-    multiversx_sc::types::{RHListItem, TxEnv},
-    scenario_model::{Log, TxResponse},
-};
-
-pub struct ReturnsLogs;
-
-impl<Env, Original> RHListItem<Env, Original> for ReturnsLogs
-where
-    Env: TxEnv,
-{
-    type Returns = Vec<Log>;
-}
-
-impl<Env, Original> RHListItemExec<TxResponse, Env, Original> for ReturnsLogs
-where
-    Env: TxEnv,
-{
-    fn item_process_result(self, raw_result: &TxResponse) -> Self::Returns {
-        raw_result.logs.clone()
-    }
-}

From 5c5f1592affcf7bb5172ffac24dc171c016dc9d9 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Tue, 3 Sep 2024 10:59:40 +0200
Subject: [PATCH 1244/1254] result handler impl

---
 .../scenario/src/facade/result_handlers.rs    |  2 ++
 .../facade/result_handlers/returns_logs.rs    | 24 +++++++++++++++++++
 2 files changed, 26 insertions(+)
 create mode 100644 framework/scenario/src/facade/result_handlers/returns_logs.rs

diff --git a/framework/scenario/src/facade/result_handlers.rs b/framework/scenario/src/facade/result_handlers.rs
index 1893647b45..33b5b1a495 100644
--- a/framework/scenario/src/facade/result_handlers.rs
+++ b/framework/scenario/src/facade/result_handlers.rs
@@ -2,6 +2,7 @@ mod expect_error;
 mod expect_message;
 mod expect_status;
 mod expect_value;
+mod returns_logs;
 mod returns_message;
 mod returns_new_bech32_address;
 mod returns_new_token_identifier;
@@ -12,6 +13,7 @@ pub use expect_error::ExpectError;
 pub use expect_message::ExpectMessage;
 pub use expect_status::ExpectStatus;
 pub use expect_value::ExpectValue;
+pub use returns_logs::ReturnsLogs;
 pub use returns_message::ReturnsMessage;
 pub use returns_new_bech32_address::ReturnsNewBech32Address;
 pub use returns_new_token_identifier::ReturnsNewTokenIdentifier;
diff --git a/framework/scenario/src/facade/result_handlers/returns_logs.rs b/framework/scenario/src/facade/result_handlers/returns_logs.rs
new file mode 100644
index 0000000000..7aa4292fa2
--- /dev/null
+++ b/framework/scenario/src/facade/result_handlers/returns_logs.rs
@@ -0,0 +1,24 @@
+use multiversx_sc::types::RHListItemExec;
+
+use crate::{
+    multiversx_sc::types::{RHListItem, TxEnv},
+    scenario_model::{Log, TxResponse},
+};
+
+pub struct ReturnsLogs;
+
+impl<Env, Original> RHListItem<Env, Original> for ReturnsLogs
+where
+    Env: TxEnv,
+{
+    type Returns = Vec<Log>;
+}
+
+impl<Env, Original> RHListItemExec<TxResponse, Env, Original> for ReturnsLogs
+where
+    Env: TxEnv,
+{
+    fn item_process_result(self, raw_result: &TxResponse) -> Self::Returns {
+        raw_result.logs.clone()
+    }
+}

From f634c4c8cafa81ccf6bbae7df3acbc2f422c124b Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Tue, 3 Sep 2024 14:14:02 +0200
Subject: [PATCH 1245/1254] populate txResult logs with transactionFromNetwork

---
 .../src/scenario/model/transaction/log.rs     | 10 ++++------
 framework/snippets/src/network_response.rs    | 20 ++++++++++++++++++-
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/framework/scenario/src/scenario/model/transaction/log.rs b/framework/scenario/src/scenario/model/transaction/log.rs
index 27ebccfd08..4cb0f98be0 100644
--- a/framework/scenario/src/scenario/model/transaction/log.rs
+++ b/framework/scenario/src/scenario/model/transaction/log.rs
@@ -1,9 +1,7 @@
-use crate::scenario_model::BytesValue;
-
 #[derive(Debug, Clone)]
 pub struct Log {
-    pub address: BytesValue,
-    pub endpoint: BytesValue,
-    pub topics: Vec<BytesValue>,
-    pub data: BytesValue,
+    pub address: String,
+    pub endpoint: String,
+    pub topics: Vec<String>,
+    pub data: String,
 }
diff --git a/framework/snippets/src/network_response.rs b/framework/snippets/src/network_response.rs
index 4d828e12c7..ed4d5dd8ce 100644
--- a/framework/snippets/src/network_response.rs
+++ b/framework/snippets/src/network_response.rs
@@ -1,7 +1,7 @@
 use multiversx_sc_scenario::{
     imports::{Address, ESDTSystemSCAddress},
     multiversx_chain_vm::crypto_functions::keccak256,
-    scenario_model::{TxResponse, TxResponseStatus},
+    scenario_model::{Log, TxResponse, TxResponseStatus},
 };
 use multiversx_sdk::{
     data::transaction::{ApiSmartContractResult, Events, TransactionOnNetwork},
@@ -44,6 +44,7 @@ fn process_success(tx: &TransactionOnNetwork) -> TxResponse {
         out: process_out(tx),
         new_deployed_address: process_new_deployed_address(tx),
         new_issued_token_identifier: process_new_issued_token_identifier(tx),
+        logs: process_logs(tx),
         ..Default::default()
     }
 }
@@ -58,6 +59,23 @@ fn process_out(tx: &TransactionOnNetwork) -> Vec<Vec<u8>> {
     }
 }
 
+fn process_logs(tx: &TransactionOnNetwork) -> Vec<Log> {
+    if let Some(api_logs) = &tx.logs {
+        return api_logs
+            .events
+            .iter()
+            .map(|event| Log {
+                address: event.address.to_string(),
+                endpoint: event.identifier.clone(),
+                topics: event.topics.clone().unwrap_or_default(),
+                data: event.data.clone().unwrap_or_default(),
+            })
+            .collect::<Vec<Log>>();
+    }
+
+    Vec::new()
+}
+
 fn process_out_from_log(tx: &TransactionOnNetwork) -> Option<Vec<Vec<u8>>> {
     if let Some(logs) = &tx.logs {
         logs.events.iter().rev().find_map(|event| {

From 2659d239976b42ec540d261665bec4fb56f89d09 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Tue, 3 Sep 2024 16:47:56 +0200
Subject: [PATCH 1246/1254] added more tests for managed decimal var

---
 .../scenarios/managed_decimal.scen.json       | 88 ++++++++++++++++-
 .../managed_decimal_logarithm.scen.json       | 94 ++++++++++++++++++-
 .../src/managed_decimal_features.rs           | 43 +++++++++
 .../basic_features_managed_decimal_test.rs    |  5 +
 .../basic-features/wasm/src/lib.rs            |  9 +-
 framework/snippets/src/imports.rs             |  5 +-
 6 files changed, 236 insertions(+), 8 deletions(-)

diff --git a/contracts/feature-tests/basic-features/scenarios/managed_decimal.scen.json b/contracts/feature-tests/basic-features/scenarios/managed_decimal.scen.json
index b723c07b6d..e23747e4fb 100644
--- a/contracts/feature-tests/basic-features/scenarios/managed_decimal.scen.json
+++ b/contracts/feature-tests/basic-features/scenarios/managed_decimal.scen.json
@@ -141,6 +141,92 @@
                 "gas": "*",
                 "refund": "*"
             }
+        },
+        {
+            "step": "scCall",
+            "id": "6",
+            "tx": {
+                "from": "address:an_account",
+                "to": "sc:basic-features",
+                "function": "managed_decimal_addition_var",
+                "arguments": [
+                    "0x000000010400000002",
+                    "0x000000010500000002"
+                ],
+                "gasLimit": "1,000,000,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": [
+                    "0x000000010900000002"
+                ]
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "7",
+            "tx": {
+                "from": "address:an_account",
+                "to": "sc:basic-features",
+                "function": "managed_decimal_subtraction_var",
+                "arguments": [
+                    "0x000000010900000002",
+                    "0x000000010400000002"
+                ],
+                "gasLimit": "1,000,000,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": [
+                    "0x000000010500000002"
+                ]
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "8",
+            "tx": {
+                "from": "address:an_account",
+                "to": "sc:basic-features",
+                "function": "managed_decimal_subtraction_var",
+                "arguments": [
+                    "0x000000010200000002",
+                    "0x000000010800000002"
+                ],
+                "gasLimit": "1,000,000,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": [],
+                "status": "4",
+                "message": "str:cannot subtract because result would be negative",
+                "gas": "*",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "9",
+            "tx": {
+                "from": "address:an_account",
+                "to": "sc:basic-features",
+                "function": "managed_decimal_eq_var",
+                "arguments": [
+                    "0x000000010d00000002",
+                    "0x000000010d00000002"
+                ],
+                "gasLimit": "1,000,000,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": [
+                    "0x01"
+                ],
+                "status": "",
+                "message": "*",
+                "gas": "*",
+                "refund": "*"
+            }
         }
     ]
-}
+}
\ No newline at end of file
diff --git a/contracts/feature-tests/basic-features/scenarios/managed_decimal_logarithm.scen.json b/contracts/feature-tests/basic-features/scenarios/managed_decimal_logarithm.scen.json
index 193517275c..6ee41eaa4d 100644
--- a/contracts/feature-tests/basic-features/scenarios/managed_decimal_logarithm.scen.json
+++ b/contracts/feature-tests/basic-features/scenarios/managed_decimal_logarithm.scen.json
@@ -105,6 +105,98 @@
                 "gas": "*",
                 "refund": "*"
             }
+        },
+        {
+            "step": "scCall",
+            "id": "managed_decimal_log2_var(23)",
+            "tx": {
+                "from": "address:an_account",
+                "to": "sc:basic-features",
+                "function": "managed_decimal_log2_var",
+                "arguments": [
+                    "0x00000005055ae8260000000009"
+                ],
+                "gasLimit": "1,000,000,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": [
+                    "4,523648008"
+                ],
+                "status": "",
+                "message": "*",
+                "gas": "*",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "managed_decimal_ln_var(23)",
+            "tx": {
+                "from": "address:an_account",
+                "to": "sc:basic-features",
+                "function": "managed_decimal_ln_var",
+                "arguments": [
+                    "0x00000005055ae8260000000009"
+                ],
+                "gasLimit": "25,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": [
+                    "+3,135553845"
+                ],
+                "status": "",
+                "message": "*",
+                "gas": "*",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "managed_decimal_ln_var(378,298)",
+            "tx": {
+                "from": "address:an_account",
+                "to": "sc:basic-features",
+                "function": "managed_decimal_ln_var",
+                "arguments": [
+                    "0x00000005581451628000000009"
+                ],
+                "gasLimit": "1,000,000,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": [
+                    "0x0161cc16aa"
+                ],
+                "status": "",
+                "message": "*",
+                "gas": "*",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "managed_decimal_log2_var(218,345)",
+            "tx": {
+                "from": "address:an_account",
+                "to": "sc:basic-features",
+                "function": "managed_decimal_log2_var",
+                "arguments": [
+                    "0x0000000532d6604c4000000009"
+                ],
+                "gasLimit": "1,000,000,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": [
+                    "7,770385327"
+                ],
+                "status": "",
+                "message": "*",
+                "gas": "*",
+                "refund": "*"
+            }
         }
     ]
-}
+}
\ No newline at end of file
diff --git a/contracts/feature-tests/basic-features/src/managed_decimal_features.rs b/contracts/feature-tests/basic-features/src/managed_decimal_features.rs
index 556641cdc9..4bb3233c70 100644
--- a/contracts/feature-tests/basic-features/src/managed_decimal_features.rs
+++ b/contracts/feature-tests/basic-features/src/managed_decimal_features.rs
@@ -56,4 +56,47 @@ pub trait ManagedDecimalFeatures {
     ) -> ManagedDecimalSigned<Self::Api, ConstDecimals<9>> {
         x.log2().unwrap_or_else(|| sc_panic!("cannot be zero"))
     }
+
+    #[endpoint]
+    fn managed_decimal_addition_var(
+        &self,
+        first: ManagedDecimal<Self::Api, NumDecimals>,
+        second: ManagedDecimal<Self::Api, NumDecimals>,
+    ) -> ManagedDecimal<Self::Api, NumDecimals> {
+        first + second
+    }
+
+    #[endpoint]
+    fn managed_decimal_subtraction_var(
+        &self,
+        first: ManagedDecimal<Self::Api, NumDecimals>,
+        second: ManagedDecimal<Self::Api, NumDecimals>,
+    ) -> ManagedDecimal<Self::Api, NumDecimals> {
+        first - second
+    }
+
+    #[endpoint]
+    fn managed_decimal_eq_var(
+        &self,
+        first: ManagedDecimal<Self::Api, NumDecimals>,
+        second: ManagedDecimal<Self::Api, NumDecimals>,
+    ) -> bool {
+        first.eq(&second)
+    }
+
+    #[endpoint]
+    fn managed_decimal_ln_var(
+        &self,
+        x: ManagedDecimal<Self::Api, NumDecimals>,
+    ) -> ManagedDecimalSigned<Self::Api, ConstDecimals<9>> {
+        x.ln().unwrap_or_else(|| sc_panic!("cannot be zero"))
+    }
+
+    #[endpoint]
+    fn managed_decimal_log2_var(
+        &self,
+        x: ManagedDecimal<Self::Api, NumDecimals>,
+    ) -> ManagedDecimalSigned<Self::Api, ConstDecimals<9>> {
+        x.log2().unwrap_or_else(|| sc_panic!("cannot be zero"))
+    }
 }
diff --git a/contracts/feature-tests/basic-features/tests/basic_features_managed_decimal_test.rs b/contracts/feature-tests/basic-features/tests/basic_features_managed_decimal_test.rs
index d4257fe078..238e4f0f4e 100644
--- a/contracts/feature-tests/basic-features/tests/basic_features_managed_decimal_test.rs
+++ b/contracts/feature-tests/basic-features/tests/basic_features_managed_decimal_test.rs
@@ -13,3 +13,8 @@ fn world() -> ScenarioWorld {
 fn managed_decimal_test() {
     world().run("scenarios/managed_decimal.scen.json");
 }
+
+#[test]
+fn managed_decimal_logarithm_test() {
+    world().run("scenarios/managed_decimal_logarithm.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 887b75bcd5..7b988da222 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:                          403
+// Endpoints:                          408
 // Async Callback:                       1
-// Total number of exported functions: 405
+// Total number of exported functions: 410
 
 #![no_std]
 
@@ -421,6 +421,11 @@ multiversx_sc_wasm_adapter::endpoints! {
         managed_decimal_into_raw_units => managed_decimal_into_raw_units
         managed_decimal_ln => managed_decimal_ln
         managed_decimal_log2 => managed_decimal_log2
+        managed_decimal_addition_var => managed_decimal_addition_var
+        managed_decimal_subtraction_var => managed_decimal_subtraction_var
+        managed_decimal_eq_var => managed_decimal_eq_var
+        managed_decimal_ln_var => managed_decimal_ln_var
+        managed_decimal_log2_var => managed_decimal_log2_var
     )
 }
 
diff --git a/framework/snippets/src/imports.rs b/framework/snippets/src/imports.rs
index a35e880c78..a22c969887 100644
--- a/framework/snippets/src/imports.rs
+++ b/framework/snippets/src/imports.rs
@@ -4,10 +4,7 @@ pub use crate::{
     dns_address_for_name, test_wallets, Interactor, InteractorPrepareAsync, StepBuffer,
 };
 
-pub use multiversx_sdk::{
-    wallet::Wallet,
-    data::keystore::InsertPassword,
-};
+pub use multiversx_sdk::{data::keystore::InsertPassword, wallet::Wallet};
 
 pub use env_logger;
 pub use tokio;

From 6b1f314829d41b56011754e4bb1c636d96f0f7ff Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Tue, 3 Sep 2024 19:08:45 +0200
Subject: [PATCH 1247/1254] fix after review and tests

---
 .../tests/promises_feature_blackbox_test.rs   | 41 +++++++++++++++++++
 .../src/scenario/model/transaction/log.rs     |  8 ++--
 .../scenario/model/transaction/tx_response.rs | 10 +++++
 framework/snippets/src/network_response.rs    | 32 +++++++++++----
 sdk/core/src/data/transaction.rs              |  2 +-
 5 files changed, 81 insertions(+), 12 deletions(-)

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 4fd4f4d1cc..2eb20508f8 100644
--- a/contracts/feature-tests/composability/tests/promises_feature_blackbox_test.rs
+++ b/contracts/feature-tests/composability/tests/promises_feature_blackbox_test.rs
@@ -85,3 +85,44 @@ fn test_multi_call_back_transfers() {
         .check_account(PROMISES_FEATURE_ADDRESS)
         .esdt_balance(TOKEN_ID_EXPR, token_amount);
 }
+
+#[test]
+fn test_back_transfers_logs() {
+    let mut state = PromisesFeaturesTestState::new();
+    let token_amount = BigUint::from(1000u64);
+
+    let logs = state
+        .world
+        .tx()
+        .from(USER_ADDRESS)
+        .to(PROMISES_FEATURE_ADDRESS)
+        .typed(promises_feature_proxy::PromisesFeaturesProxy)
+        .forward_sync_retrieve_funds_bt(VAULT_ADDRESS, TOKEN_ID, 0u64, &token_amount)
+        .returns(ReturnsLogs)
+        .run();
+
+    assert!(!logs.is_empty() && !logs[0].topics.is_empty());
+    assert_eq!(logs[0].address, PROMISES_FEATURE_ADDRESS);
+    assert_eq!(logs[0].endpoint, "transferValueOnly");
+}
+
+#[test]
+fn test_multi_call_back_transfers_logs() {
+    let mut state = PromisesFeaturesTestState::new();
+    let token_amount = BigUint::from(1000u64);
+    let half_token_amount = token_amount.clone() / 2u64;
+
+    let logs = state
+        .world
+        .tx()
+        .from(USER_ADDRESS)
+        .to(PROMISES_FEATURE_ADDRESS)
+        .typed(promises_feature_proxy::PromisesFeaturesProxy)
+        .forward_sync_retrieve_funds_bt_twice(VAULT_ADDRESS, TOKEN_ID, 0u64, &half_token_amount)
+        .returns(ReturnsLogs)
+        .run();
+
+    assert!(!logs.is_empty() && !logs[0].topics.is_empty());
+    assert_eq!(logs[0].address, PROMISES_FEATURE_ADDRESS);
+    assert_eq!(logs[0].endpoint, "transferValueOnly");
+}
diff --git a/framework/scenario/src/scenario/model/transaction/log.rs b/framework/scenario/src/scenario/model/transaction/log.rs
index 4cb0f98be0..803c521bbf 100644
--- a/framework/scenario/src/scenario/model/transaction/log.rs
+++ b/framework/scenario/src/scenario/model/transaction/log.rs
@@ -1,7 +1,9 @@
+use multiversx_sc::types::Address;
+
 #[derive(Debug, Clone)]
 pub struct Log {
-    pub address: String,
+    pub address: Address,
     pub endpoint: String,
-    pub topics: Vec<String>,
-    pub data: String,
+    pub topics: Vec<Vec<u8>>,
+    pub data: Vec<Vec<u8>>,
 }
diff --git a/framework/scenario/src/scenario/model/transaction/tx_response.rs b/framework/scenario/src/scenario/model/transaction/tx_response.rs
index fd9721721f..8a7a5c4bf9 100644
--- a/framework/scenario/src/scenario/model/transaction/tx_response.rs
+++ b/framework/scenario/src/scenario/model/transaction/tx_response.rs
@@ -31,6 +31,16 @@ impl TxResponse {
                 status: tx_result.result_status,
                 message: tx_result.result_message,
             },
+            logs: tx_result
+                .result_logs
+                .iter()
+                .map(|tx_log| Log {
+                    address: Address::from_slice(tx_log.address.as_bytes()),
+                    endpoint: tx_log.endpoint.to_string(),
+                    topics: tx_log.topics.clone(),
+                    data: tx_log.data.clone(),
+                })
+                .collect(),
             ..Default::default()
         }
     }
diff --git a/framework/snippets/src/network_response.rs b/framework/snippets/src/network_response.rs
index ed4d5dd8ce..7d4e398396 100644
--- a/framework/snippets/src/network_response.rs
+++ b/framework/snippets/src/network_response.rs
@@ -65,10 +65,22 @@ fn process_logs(tx: &TransactionOnNetwork) -> Vec<Log> {
             .events
             .iter()
             .map(|event| Log {
-                address: event.address.to_string(),
+                address: Address::from_slice(&event.address.to_bytes()),
                 endpoint: event.identifier.clone(),
-                topics: event.topics.clone().unwrap_or_default(),
-                data: event.data.clone().unwrap_or_default(),
+                topics: event
+                    .topics
+                    .clone()
+                    .unwrap_or_default()
+                    .into_iter()
+                    .map(|s| s.into_bytes())
+                    .collect(),
+                data: event
+                    .data
+                    .clone()
+                    .unwrap_or_default()
+                    .into_iter()
+                    .map(|s| s.into_bytes())
+                    .collect(),
             })
             .collect::<Vec<Log>>();
     }
@@ -81,12 +93,16 @@ fn process_out_from_log(tx: &TransactionOnNetwork) -> Option<Vec<Vec<u8>>> {
         logs.events.iter().rev().find_map(|event| {
             if event.identifier == "writeLog" {
                 if let Some(data) = &event.data {
-                    let decoded_data = String::from_utf8(base64_decode(data)).unwrap();
-
-                    if decoded_data.starts_with('@') {
-                        let out = decode_scr_data_or_panic(decoded_data.as_str());
-                        return Some(out);
+                    let mut out = Vec::new();
+                    for data_member in data.iter() {
+                        let decoded_data = String::from_utf8(base64_decode(data_member)).unwrap();
+
+                        if decoded_data.starts_with('@') {
+                            let out_content = decode_scr_data_or_panic(decoded_data.as_str());
+                            out.extend(out_content);
+                        }
                     }
+                    return Some(out);
                 }
             }
 
diff --git a/sdk/core/src/data/transaction.rs b/sdk/core/src/data/transaction.rs
index 561647776d..bd93ff0fd7 100644
--- a/sdk/core/src/data/transaction.rs
+++ b/sdk/core/src/data/transaction.rs
@@ -92,7 +92,7 @@ pub struct Events {
     pub address: Address,
     pub identifier: String,
     pub topics: Option<Vec<String>>,
-    pub data: Option<String>,
+    pub data: Option<Vec<String>>,
 }
 
 // ApiLogs represents logs with changed fields' types in order to make it friendly for API's json

From ca3489a489427125716df3003ca3375e22038aa2 Mon Sep 17 00:00:00 2001
From: Mihai Calin Luca <mihaicalin.luca10@gmail.com>
Date: Tue, 3 Sep 2024 20:09:33 +0200
Subject: [PATCH 1248/1254] added support for object or vec as event data

---
 framework/snippets/src/network_response.rs | 71 ++++++++++++++--------
 sdk/core/src/data/transaction.rs           |  9 ++-
 2 files changed, 55 insertions(+), 25 deletions(-)

diff --git a/framework/snippets/src/network_response.rs b/framework/snippets/src/network_response.rs
index 7d4e398396..1210a97bdd 100644
--- a/framework/snippets/src/network_response.rs
+++ b/framework/snippets/src/network_response.rs
@@ -4,7 +4,7 @@ use multiversx_sc_scenario::{
     scenario_model::{Log, TxResponse, TxResponseStatus},
 };
 use multiversx_sdk::{
-    data::transaction::{ApiSmartContractResult, Events, TransactionOnNetwork},
+    data::transaction::{ApiSmartContractResult, Data, Events, TransactionOnNetwork},
     utils::base64_decode,
 };
 
@@ -67,20 +67,8 @@ fn process_logs(tx: &TransactionOnNetwork) -> Vec<Log> {
             .map(|event| Log {
                 address: Address::from_slice(&event.address.to_bytes()),
                 endpoint: event.identifier.clone(),
-                topics: event
-                    .topics
-                    .clone()
-                    .unwrap_or_default()
-                    .into_iter()
-                    .map(|s| s.into_bytes())
-                    .collect(),
-                data: event
-                    .data
-                    .clone()
-                    .unwrap_or_default()
-                    .into_iter()
-                    .map(|s| s.into_bytes())
-                    .collect(),
+                topics: extract_topics(event),
+                data: extract_data(event),
             })
             .collect::<Vec<Log>>();
     }
@@ -88,21 +76,56 @@ fn process_logs(tx: &TransactionOnNetwork) -> Vec<Log> {
     Vec::new()
 }
 
+fn extract_data(event: &Events) -> Vec<Vec<u8>> {
+    let mut out: Vec<Vec<u8>> = Vec::new();
+    if let Some(data) = event.data.clone() {
+        match data {
+            Data::String(string) => out.push(string.into_bytes()),
+            Data::Vec(vec) => return vec.into_iter().map(|s| s.into_bytes()).collect(),
+        }
+    }
+
+    out
+}
+
+fn extract_topics(event: &Events) -> Vec<Vec<u8>> {
+    event
+        .topics
+        .clone()
+        .unwrap_or_default()
+        .into_iter()
+        .map(|s| s.into_bytes())
+        .collect()
+}
+
 fn process_out_from_log(tx: &TransactionOnNetwork) -> Option<Vec<Vec<u8>>> {
     if let Some(logs) = &tx.logs {
         logs.events.iter().rev().find_map(|event| {
             if event.identifier == "writeLog" {
                 if let Some(data) = &event.data {
-                    let mut out = Vec::new();
-                    for data_member in data.iter() {
-                        let decoded_data = String::from_utf8(base64_decode(data_member)).unwrap();
-
-                        if decoded_data.starts_with('@') {
-                            let out_content = decode_scr_data_or_panic(decoded_data.as_str());
-                            out.extend(out_content);
-                        }
+                    match data {
+                        Data::String(string) => {
+                            let decoded_data = String::from_utf8(base64_decode(string)).unwrap();
+                            if decoded_data.starts_with('@') {
+                                let out = decode_scr_data_or_panic(&decoded_data);
+                                return Some(out);
+                            }
+                        },
+                        Data::Vec(vec) => {
+                            let mut out = Vec::new();
+                            for data_member in vec.iter() {
+                                let decoded_data =
+                                    String::from_utf8(base64_decode(data_member)).unwrap();
+
+                                if decoded_data.starts_with('@') {
+                                    let out_content =
+                                        decode_scr_data_or_panic(decoded_data.as_str());
+                                    out.extend(out_content);
+                                }
+                            }
+                            return Some(out);
+                        },
                     }
-                    return Some(out);
                 }
             }
 
diff --git a/sdk/core/src/data/transaction.rs b/sdk/core/src/data/transaction.rs
index bd93ff0fd7..5f98eb0438 100644
--- a/sdk/core/src/data/transaction.rs
+++ b/sdk/core/src/data/transaction.rs
@@ -92,7 +92,14 @@ pub struct Events {
     pub address: Address,
     pub identifier: String,
     pub topics: Option<Vec<String>>,
-    pub data: Option<Vec<String>>,
+    pub data: Option<Data>,
+}
+
+#[derive(Serialize, Deserialize, Debug, Clone)]
+#[serde(untagged)]
+pub enum Data {
+    String(String),
+    Vec(Vec<String>),
 }
 
 // ApiLogs represents logs with changed fields' types in order to make it friendly for API's json

From b9cdef7c2d736d7b876e210cf472bba1f276a3e1 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 4 Sep 2024 08:22:38 +0300
Subject: [PATCH 1249/1254] log data refactor

---
 framework/snippets/src/network_response.rs | 43 +++++++---------------
 sdk/core/src/data/transaction.rs           | 13 ++++++-
 2 files changed, 24 insertions(+), 32 deletions(-)

diff --git a/framework/snippets/src/network_response.rs b/framework/snippets/src/network_response.rs
index 1210a97bdd..ea10ade8f3 100644
--- a/framework/snippets/src/network_response.rs
+++ b/framework/snippets/src/network_response.rs
@@ -4,7 +4,7 @@ use multiversx_sc_scenario::{
     scenario_model::{Log, TxResponse, TxResponseStatus},
 };
 use multiversx_sdk::{
-    data::transaction::{ApiSmartContractResult, Data, Events, TransactionOnNetwork},
+    data::transaction::{ApiSmartContractResult, Events, TransactionOnNetwork},
     utils::base64_decode,
 };
 
@@ -78,13 +78,9 @@ fn process_logs(tx: &TransactionOnNetwork) -> Vec<Log> {
 
 fn extract_data(event: &Events) -> Vec<Vec<u8>> {
     let mut out: Vec<Vec<u8>> = Vec::new();
-    if let Some(data) = event.data.clone() {
-        match data {
-            Data::String(string) => out.push(string.into_bytes()),
-            Data::Vec(vec) => return vec.into_iter().map(|s| s.into_bytes()).collect(),
-        }
+    if let Some(data) = &event.data {
+        data.for_each(|data_field| out.push(data_field.clone().into_bytes()));
     }
-
     out
 }
 
@@ -103,29 +99,16 @@ fn process_out_from_log(tx: &TransactionOnNetwork) -> Option<Vec<Vec<u8>>> {
         logs.events.iter().rev().find_map(|event| {
             if event.identifier == "writeLog" {
                 if let Some(data) = &event.data {
-                    match data {
-                        Data::String(string) => {
-                            let decoded_data = String::from_utf8(base64_decode(string)).unwrap();
-                            if decoded_data.starts_with('@') {
-                                let out = decode_scr_data_or_panic(&decoded_data);
-                                return Some(out);
-                            }
-                        },
-                        Data::Vec(vec) => {
-                            let mut out = Vec::new();
-                            for data_member in vec.iter() {
-                                let decoded_data =
-                                    String::from_utf8(base64_decode(data_member)).unwrap();
-
-                                if decoded_data.starts_with('@') {
-                                    let out_content =
-                                        decode_scr_data_or_panic(decoded_data.as_str());
-                                    out.extend(out_content);
-                                }
-                            }
-                            return Some(out);
-                        },
-                    }
+                    let mut out = Vec::new();
+                    data.for_each(|data_member| {
+                        let decoded_data = String::from_utf8(base64_decode(data_member)).unwrap();
+
+                        if decoded_data.starts_with('@') {
+                            let out_content = decode_scr_data_or_panic(decoded_data.as_str());
+                            out.extend(out_content);
+                        }
+                    });
+                    return Some(out);
                 }
             }
 
diff --git a/sdk/core/src/data/transaction.rs b/sdk/core/src/data/transaction.rs
index 5f98eb0438..774c366dfa 100644
--- a/sdk/core/src/data/transaction.rs
+++ b/sdk/core/src/data/transaction.rs
@@ -92,16 +92,25 @@ pub struct Events {
     pub address: Address,
     pub identifier: String,
     pub topics: Option<Vec<String>>,
-    pub data: Option<Data>,
+    pub data: Option<LogData>,
 }
 
 #[derive(Serialize, Deserialize, Debug, Clone)]
 #[serde(untagged)]
-pub enum Data {
+pub enum LogData {
     String(String),
     Vec(Vec<String>),
 }
 
+impl LogData {
+    pub fn for_each<F: FnMut(&String)>(&self, mut f: F) {
+        match self {
+            LogData::String(s) => f(s),
+            LogData::Vec(v) => v.iter().for_each(f),
+        }
+    }
+}
+
 // ApiLogs represents logs with changed fields' types in order to make it friendly for API's json
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]

From 6ce2d1e4b1b64479abdad7fa0a11cc755f9d9dfa Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 4 Sep 2024 08:36:17 +0300
Subject: [PATCH 1250/1254] log data refactor

---
 framework/snippets/src/network_response.rs | 28 +++++----
 sdk/core/src/data/transaction.rs           | 67 +++++++++++++++++++++-
 2 files changed, 78 insertions(+), 17 deletions(-)

diff --git a/framework/snippets/src/network_response.rs b/framework/snippets/src/network_response.rs
index ea10ade8f3..0140dd839e 100644
--- a/framework/snippets/src/network_response.rs
+++ b/framework/snippets/src/network_response.rs
@@ -78,9 +78,9 @@ fn process_logs(tx: &TransactionOnNetwork) -> Vec<Log> {
 
 fn extract_data(event: &Events) -> Vec<Vec<u8>> {
     let mut out: Vec<Vec<u8>> = Vec::new();
-    if let Some(data) = &event.data {
-        data.for_each(|data_field| out.push(data_field.clone().into_bytes()));
-    }
+    event
+        .data
+        .for_each(|data_field| out.push(data_field.clone().into_bytes()));
     out
 }
 
@@ -98,18 +98,16 @@ fn process_out_from_log(tx: &TransactionOnNetwork) -> Option<Vec<Vec<u8>>> {
     if let Some(logs) = &tx.logs {
         logs.events.iter().rev().find_map(|event| {
             if event.identifier == "writeLog" {
-                if let Some(data) = &event.data {
-                    let mut out = Vec::new();
-                    data.for_each(|data_member| {
-                        let decoded_data = String::from_utf8(base64_decode(data_member)).unwrap();
-
-                        if decoded_data.starts_with('@') {
-                            let out_content = decode_scr_data_or_panic(decoded_data.as_str());
-                            out.extend(out_content);
-                        }
-                    });
-                    return Some(out);
-                }
+                let mut out = Vec::new();
+                event.data.for_each(|data_member| {
+                    let decoded_data = String::from_utf8(base64_decode(data_member)).unwrap();
+
+                    if decoded_data.starts_with('@') {
+                        let out_content = decode_scr_data_or_panic(decoded_data.as_str());
+                        out.extend(out_content);
+                    }
+                });
+                return Some(out);
             }
 
             None
diff --git a/sdk/core/src/data/transaction.rs b/sdk/core/src/data/transaction.rs
index 774c366dfa..664ea3a08e 100644
--- a/sdk/core/src/data/transaction.rs
+++ b/sdk/core/src/data/transaction.rs
@@ -92,12 +92,15 @@ pub struct Events {
     pub address: Address,
     pub identifier: String,
     pub topics: Option<Vec<String>>,
-    pub data: Option<LogData>,
+    #[serde(default)]
+    pub data: LogData,
 }
 
-#[derive(Serialize, Deserialize, Debug, Clone)]
+#[derive(Default, Serialize, Deserialize, Debug, Clone, PartialEq, Eq)]
 #[serde(untagged)]
 pub enum LogData {
+    #[default]
+    Empty,
     String(String),
     Vec(Vec<String>),
 }
@@ -105,6 +108,7 @@ pub enum LogData {
 impl LogData {
     pub fn for_each<F: FnMut(&String)>(&self, mut f: F) {
         match self {
+            LogData::Empty => {},
             LogData::String(s) => f(s),
             LogData::Vec(v) => v.iter().for_each(f),
         }
@@ -227,3 +231,62 @@ pub struct SendTransactionsResponse {
     pub code: String,
     pub data: Option<SendTransactionsResponseData>,
 }
+
+#[cfg(test)]
+mod test {
+    use super::*;
+
+    #[test]
+    fn parse_event_log_0() {
+        let data = r#"
+{
+    "address": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
+    "identifier": "completedTxEvent",
+    "topics": [],
+    "data": null,
+    "additionalData": null
+}
+        "#;
+
+        let event_log = serde_json::from_str::<Events>(data).unwrap();
+        assert_eq!(event_log.data, LogData::Empty);
+    }
+
+    #[test]
+    fn parse_event_log_1() {
+        let data = r#"
+{
+    "address": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
+    "identifier": "completedTxEvent",
+    "topics": [],
+    "data": "data-string",
+    "additionalData": null
+}
+        "#;
+
+        let event_log = serde_json::from_str::<Events>(data).unwrap();
+        assert_eq!(event_log.data, LogData::String("data-string".to_owned()));
+    }
+
+    #[test]
+    fn parse_event_log_2() {
+        let data = r#"
+{
+    "address": "erd1qqqqqqqqqqqqqpgq0628nau8zydgwu96fn8ksqklzhrggkcfq33sm4vmwv",
+    "identifier": "completedTxEvent",
+    "topics": [],
+    "data": [
+        "data1",
+        "data2"
+    ],
+    "additionalData": null
+}
+        "#;
+
+        let event_log = serde_json::from_str::<Events>(data).unwrap();
+        assert_eq!(
+            event_log.data,
+            LogData::Vec(vec!["data1".to_owned(), "data2".to_owned()])
+        );
+    }
+}

From d2d2d15fa5eacc8f9040ebbeb8e7e95d70804af7 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 4 Sep 2024 08:52:58 +0300
Subject: [PATCH 1251/1254] mandos refactor

---
 .../scenarios/managed_decimal.scen.json       | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/contracts/feature-tests/basic-features/scenarios/managed_decimal.scen.json b/contracts/feature-tests/basic-features/scenarios/managed_decimal.scen.json
index e23747e4fb..479b8931c3 100644
--- a/contracts/feature-tests/basic-features/scenarios/managed_decimal.scen.json
+++ b/contracts/feature-tests/basic-features/scenarios/managed_decimal.scen.json
@@ -150,15 +150,15 @@
                 "to": "sc:basic-features",
                 "function": "managed_decimal_addition_var",
                 "arguments": [
-                    "0x000000010400000002",
-                    "0x000000010500000002"
+                    "biguint:4|u32:2",
+                    "biguint:5|u32:2"
                 ],
                 "gasLimit": "1,000,000,000,000",
                 "gasPrice": "0"
             },
             "expect": {
                 "out": [
-                    "0x000000010900000002"
+                    "biguint:9|u32:2"
                 ]
             }
         },
@@ -170,15 +170,15 @@
                 "to": "sc:basic-features",
                 "function": "managed_decimal_subtraction_var",
                 "arguments": [
-                    "0x000000010900000002",
-                    "0x000000010400000002"
+                    "biguint:9|u32:2",
+                    "biguint:4|u32:2"
                 ],
                 "gasLimit": "1,000,000,000,000",
                 "gasPrice": "0"
             },
             "expect": {
                 "out": [
-                    "0x000000010500000002"
+                    "biguint:5|u32:2"
                 ]
             }
         },
@@ -190,8 +190,8 @@
                 "to": "sc:basic-features",
                 "function": "managed_decimal_subtraction_var",
                 "arguments": [
-                    "0x000000010200000002",
-                    "0x000000010800000002"
+                    "biguint:2|u32:2",
+                    "biguint:8|u32:2"
                 ],
                 "gasLimit": "1,000,000,000,000",
                 "gasPrice": "0"
@@ -212,15 +212,15 @@
                 "to": "sc:basic-features",
                 "function": "managed_decimal_eq_var",
                 "arguments": [
-                    "0x000000010d00000002",
-                    "0x000000010d00000002"
+                    "biguint:11|u32:2",
+                    "biguint:11|u32:2"
                 ],
                 "gasLimit": "1,000,000,000,000",
                 "gasPrice": "0"
             },
             "expect": {
                 "out": [
-                    "0x01"
+                    "true"
                 ],
                 "status": "",
                 "message": "*",

From 1aa35d69293d2109fd655260ab68f69601f5b43a Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Wed, 4 Sep 2024 09:39:56 +0300
Subject: [PATCH 1252/1254] dependency upgrade

---
 Cargo.lock                   | 32 ++++++++++++++++----------------
 data/codec-derive/Cargo.toml |  2 +-
 framework/derive/Cargo.toml  |  2 +-
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index bb45b11227..19a7d86bac 100755
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -392,9 +392,9 @@ checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50"
 
 [[package]]
 name = "cc"
-version = "1.1.14"
+version = "1.1.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50d2eb3cd3d1bf4529e31c215ee6f93ec5a3d536d9f578f93d9d33ee19562932"
+checksum = "57b6a275aa2903740dc87da01c62040406b8812552e97129a63ea8850a17c6e6"
 dependencies = [
  "shlex",
 ]
@@ -1559,9 +1559,9 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.4.0"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93ead53efc7ea8ed3cfb0c79fc8023fbb782a5432b52830b6518941cebe6505c"
+checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5"
 dependencies = [
  "equivalent",
  "hashbrown",
@@ -2309,9 +2309,9 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.36.3"
+version = "0.36.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "27b64972346851a39438c60b341ebc01bba47464ae329e55cf343eb93964efd9"
+checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a"
 dependencies = [
  "memchr",
 ]
@@ -2930,18 +2930,18 @@ checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
 
 [[package]]
 name = "rustc_version"
-version = "0.4.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
+checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92"
 dependencies = [
  "semver",
 ]
 
 [[package]]
 name = "rustix"
-version = "0.38.34"
+version = "0.38.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
+checksum = "a85d50532239da68e9addb745ba38ff4612a242c1c7ceea689c4bc7c2f43c36f"
 dependencies = [
  "bitflags",
  "errno",
@@ -2981,9 +2981,9 @@ checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0"
 
 [[package]]
 name = "rustls-webpki"
-version = "0.102.6"
+version = "0.102.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e6b52d4fda176fd835fdc55a835d4a89b8499cad995885a21149d5ad62f852e"
+checksum = "84678086bd54edf2b415183ed7a94d0efb049f1b646a33e22a36f3794be6ae56"
 dependencies = [
  "ring",
  "rustls-pki-types",
@@ -3357,9 +3357,9 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
 
 [[package]]
 name = "syn"
-version = "2.0.76"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "578e081a14e0cefc3279b0472138c513f37b41a08d5a3cca9b6e4e8ceb6cd525"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3481,9 +3481,9 @@ dependencies = [
 
 [[package]]
 name = "tokio"
-version = "1.39.3"
+version = "1.40.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9babc99b9923bfa4804bd74722ff02c0381021eafa4db9949217e3be8e84fff5"
+checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998"
 dependencies = [
  "backtrace",
  "bytes",
diff --git a/data/codec-derive/Cargo.toml b/data/codec-derive/Cargo.toml
index 707de3c33a..a738579380 100644
--- a/data/codec-derive/Cargo.toml
+++ b/data/codec-derive/Cargo.toml
@@ -23,5 +23,5 @@ default = ["syn/full", "syn/parsing", "syn/extra-traits"]
 [dependencies]
 proc-macro2 = "=1.0.86"
 quote = "=1.0.37"
-syn = "=2.0.76"
+syn = "=2.0.77"
 hex = "=0.4.3"
diff --git a/framework/derive/Cargo.toml b/framework/derive/Cargo.toml
index d4246c314b..111a7447c7 100644
--- a/framework/derive/Cargo.toml
+++ b/framework/derive/Cargo.toml
@@ -16,7 +16,7 @@ categories = ["cryptography::cryptocurrencies", "development-tools::procedural-m
 [dependencies]
 proc-macro2 = "=1.0.86"
 quote = "=1.0.37"
-syn = "=2.0.76"
+syn = "=2.0.77"
 hex = "=0.4.3"
 radix_trie = "=0.2.1"
 

From 846e8405993035733e81d1fab74aa23bb8a0e5f9 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Wed, 4 Sep 2024 11:04:04 +0300
Subject: [PATCH 1253/1254] sc 0.53.0 codec 0.21.0, vm 0.10.0, sdk 0.6.0,
 scenario-format 0.23.0

---
 CHANGELOG.md                                  | 22 ++++++++++++++
 Cargo.lock                                    | 30 +++++++++----------
 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 +-
 .../Cargo.toml                                |  2 +-
 .../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     |  8 ++---
 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 +-
 .../wasm-alloc-mem-fail/Cargo.toml            |  2 +-
 .../wasm-alloc-mem-leaking/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 +-
 .../wasm-basic-features-crypto/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-legacy/Cargo.toml |  4 +--
 .../forwarder-legacy/meta/Cargo.toml          |  2 +-
 .../forwarder-legacy/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 +-
 .../exchange-features/Cargo.toml              |  4 +--
 .../exchange-features/meta/Cargo.toml         |  2 +-
 .../exchange-features/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 +-
 .../feature-tests/scenario-tester/Cargo.toml  |  4 +--
 .../scenario-tester/meta/Cargo.toml           |  2 +-
 .../scenario-tester/wasm/Cargo.toml           |  2 +-
 contracts/feature-tests/use-module/Cargo.toml |  8 ++---
 .../feature-tests/use-module/meta/Cargo.toml  |  2 +-
 .../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-lib/Cargo.toml                 |  4 +--
 framework/meta-lib/src/version_history.rs     |  4 ++-
 framework/meta/Cargo.toml                     |  8 ++---
 framework/scenario/Cargo.toml                 | 10 +++----
 framework/snippets/Cargo.toml                 |  8 ++---
 framework/wasm-adapter/Cargo.toml             |  4 +--
 sdk/core/Cargo.toml                           |  2 +-
 sdk/scenario-format/Cargo.toml                |  2 +-
 tools/interactor-system-func-calls/Cargo.toml |  2 +-
 tools/mxpy-snippet-generator/Cargo.toml       |  2 +-
 tools/plotter/Cargo.toml                      |  4 +--
 tools/rust-debugger/format-tests/Cargo.toml   |  6 ++--
 vm/Cargo.toml                                 |  2 +-
 279 files changed, 442 insertions(+), 418 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ede0ba5909..91d7147f03 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,6 +27,28 @@ 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.53.0 codec 0.21.0, vm 0.10.0, sdk 0.6.0, scenario-format 0.23.0] - 2024-09-04
+- Unified syntax:
+  -  Whitebox testing;
+  -  Proxy fix for ManagedOption;
+  -  TestTokenIdentifier syntactic sugar.
+- New ResultHandler: `ReturnsLogs`.
+- Interactor: 
+  - Fix on API fetch process status;
+  - Fix on ReturnsNewTokenIdentifier edge cases solved;
+  - Fix on ESDTTransfer for transfer step;
+  - Support for Keystore + password.
+- Framework API support: EI 1.4 crypto functions.
+- `sc-meta`:
+  -  New `wallet` command: PEM and keystore generator and conversions;
+  -  New `report` command: 
+     -  Generate json or Markdown report based on size, path, allocator and panic messages;
+     -  Compare reports;
+     -  Convert reports.
+- VecMapper update with index.
+- Substitution list: AddressToIdMapper
+- Dependencies updated.
+
 ## [sc 0.52.3] - 2024-08-06
 - Pause module events.
 
diff --git a/Cargo.lock b/Cargo.lock
index 19a7d86bac..b865897548 100755
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1949,7 +1949,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-chain-scenario-format"
-version = "0.22.3"
+version = "0.23.0"
 dependencies = [
  "bech32",
  "hex",
@@ -1962,7 +1962,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-chain-vm"
-version = "0.9.0"
+version = "0.10.0"
 dependencies = [
  "bitflags",
  "colored",
@@ -1987,7 +1987,7 @@ checksum = "b59072fa0624b55ae5ae3fa6bfa91515bbeb4ac440214bc4a509e2c8806d6e9f"
 
 [[package]]
 name = "multiversx-price-aggregator-sc"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "arrayvec",
  "getrandom",
@@ -2008,7 +2008,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -2020,7 +2020,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -2030,7 +2030,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -2040,7 +2040,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -2051,7 +2051,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-meta"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "bip39",
  "clap",
@@ -2075,7 +2075,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-meta-lib"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "clap",
  "colored",
@@ -2094,14 +2094,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-scenario"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "base64",
  "bech32",
@@ -2125,7 +2125,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-snippets"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "base64",
  "env_logger",
@@ -2141,14 +2141,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sdk"
-version = "0.5.0"
+version = "0.6.0"
 dependencies = [
  "aes",
  "anyhow",
@@ -2177,7 +2177,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-wegld-swap-sc"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
  "multiversx-sc-modules",
diff --git a/contracts/benchmarks/large-storage/Cargo.toml b/contracts/benchmarks/large-storage/Cargo.toml
index 4492cbe0bb..e0f6f2a93e 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.52.3"
+version = "0.53.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../framework/scenario"
diff --git a/contracts/benchmarks/large-storage/meta/Cargo.toml b/contracts/benchmarks/large-storage/meta/Cargo.toml
index 9534a0160f..fed2155292 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-lib]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/benchmarks/large-storage/wasm/Cargo.toml b/contracts/benchmarks/large-storage/wasm/Cargo.toml
index 61f3204a8a..260910e50c 100644
--- a/contracts/benchmarks/large-storage/wasm/Cargo.toml
+++ b/contracts/benchmarks/large-storage/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.3"
+version = "0.53.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 862c5757bd..706e33d0cd 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.52.3"
+version = "0.53.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.3"
+version = "0.53.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 78457858f0..8b4de1b7fb 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.52.3"
+version = "0.53.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.3"
+version = "0.53.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 fdc2402435..507b72ffb7 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-lib]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../../framework/meta-lib"
 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 92ddca0151..8fa4ca056c 100644
--- a/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.3"
+version = "0.53.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 c3172a75ff..26810eab7e 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.52.3"
+version = "0.53.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.3"
+version = "0.53.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 735c95bf23..e9cce7a386 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-lib]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.toml b/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.toml
index 8843f76bb4..96a15d31d6 100644
--- a/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.3"
+version = "0.53.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 47a408d048..eda2f55f14 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.52.3"
+version = "0.53.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.3"
+version = "0.53.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 7cf8403ca8..5ebcac768f 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-lib]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.toml b/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.toml
index 7f918f8483..1651184bb8 100644
--- a/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.3"
+version = "0.53.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 5f6eab8870..03a56f0634 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.52.3"
+version = "0.53.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.3"
+version = "0.53.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 7ad364f955..8e2c40a509 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-lib]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.toml b/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.toml
index 0df7981d37..a40d131015 100644
--- a/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.3"
+version = "0.53.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 0b6b3230bf..f073d8c96b 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.52.3"
+version = "0.53.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.3"
+version = "0.53.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 e78974478d..0a8be35063 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-lib]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../../framework/meta-lib"
 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 6ad1873bd2..95c20ff1da 100644
--- a/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.3"
+version = "0.53.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 a0487040be..d6fe62204a 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.52.3"
+version = "0.53.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.3"
+version = "0.53.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 647c76ca4c..f8a721f619 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-lib]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.toml b/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.toml
index fdcba4397d..787966c724 100644
--- a/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.3"
+version = "0.53.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 8b1d819218..e1847ec686 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.52.3"
+version = "0.53.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.3"
+version = "0.53.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 fcc58cd601..f4449db7cf 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-lib]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/benchmarks/send-tx-repeat/wasm/Cargo.toml b/contracts/benchmarks/send-tx-repeat/wasm/Cargo.toml
index 4f875c4141..ab091ed470 100644
--- a/contracts/benchmarks/send-tx-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/send-tx-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/str-repeat/Cargo.toml b/contracts/benchmarks/str-repeat/Cargo.toml
index 674f3bd3e5..ce14422a61 100644
--- a/contracts/benchmarks/str-repeat/Cargo.toml
+++ b/contracts/benchmarks/str-repeat/Cargo.toml
@@ -12,10 +12,10 @@ path = "src/str_repeat.rs"
 managed-buffer-builder-cached = ["multiversx-sc/managed-buffer-builder-cached"]
 
 [dependencies.multiversx-sc]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../framework/scenario"
diff --git a/contracts/benchmarks/str-repeat/meta/Cargo.toml b/contracts/benchmarks/str-repeat/meta/Cargo.toml
index 5fdf241d60..57157e5a41 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-lib]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.toml b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.toml
index 49341f9c56..5a367d2a25 100644
--- a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.toml
+++ b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.toml b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.toml
index b18604cde3..9b036232c0 100644
--- a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.toml
+++ b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.toml
@@ -29,7 +29,7 @@ path = ".."
 features = ["managed-buffer-builder-cached"]
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/str-repeat/wasm/Cargo.toml b/contracts/benchmarks/str-repeat/wasm/Cargo.toml
index 969359eb55..eccba0bc08 100644
--- a/contracts/benchmarks/str-repeat/wasm/Cargo.toml
+++ b/contracts/benchmarks/str-repeat/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/core/price-aggregator/Cargo.toml b/contracts/core/price-aggregator/Cargo.toml
index d3637b98e3..9f8f036ea8 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.52.3"
+version = "0.53.0"
 authors = [
     "Claudiu-Marcel Bruda <claudiu.bruda@multiversx.com>",
     "MultiversX <contact@multiversx.com>",
@@ -19,15 +19,15 @@ edition = "2021"
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../framework/scenario"
 
 [dependencies]
diff --git a/contracts/core/price-aggregator/meta/Cargo.toml b/contracts/core/price-aggregator/meta/Cargo.toml
index c382efe5b2..1185345685 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.52.3"
+version = "0.53.0"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-meta-lib]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/core/price-aggregator/wasm/Cargo.toml b/contracts/core/price-aggregator/wasm/Cargo.toml
index a007aef20b..902a185621 100644
--- a/contracts/core/price-aggregator/wasm/Cargo.toml
+++ b/contracts/core/price-aggregator/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/core/wegld-swap/Cargo.toml b/contracts/core/wegld-swap/Cargo.toml
index 7d3dac0001..c7e75847e4 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.52.3"
+version = "0.53.0"
 
 authors = [
     "Dorin Iancu <dorin.iancu@multiversx.com>",
@@ -20,13 +20,13 @@ edition = "2021"
 path = "src/wegld.rs"
 
 [dependencies.multiversx-sc]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../framework/scenario"
diff --git a/contracts/core/wegld-swap/meta/Cargo.toml b/contracts/core/wegld-swap/meta/Cargo.toml
index 9c69ecf0c9..705431fb06 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.52.3"
+version = "0.53.0"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-meta-lib]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/core/wegld-swap/wasm/Cargo.toml b/contracts/core/wegld-swap/wasm/Cargo.toml
index 500126a014..e03cd9feb2 100644
--- a/contracts/core/wegld-swap/wasm/Cargo.toml
+++ b/contracts/core/wegld-swap/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/adder/Cargo.toml b/contracts/examples/adder/Cargo.toml
index ed73efa416..d2027938b2 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.52.3"
+version = "0.53.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../framework/scenario"
\ No newline at end of file
diff --git a/contracts/examples/adder/interact/Cargo.toml b/contracts/examples/adder/interact/Cargo.toml
index 5a939f6bdb..b9c18b391b 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.52.3"
+version = "0.53.0"
 path = "../../../../framework/snippets"
diff --git a/contracts/examples/adder/meta/Cargo.toml b/contracts/examples/adder/meta/Cargo.toml
index 9eb7270159..7113e2566f 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-lib]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/adder/wasm/Cargo.toml b/contracts/examples/adder/wasm/Cargo.toml
index a072b09a94..9eb819a0e9 100644
--- a/contracts/examples/adder/wasm/Cargo.toml
+++ b/contracts/examples/adder/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.3"
+version = "0.53.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 5c5a59d2d1..02c5fa9459 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.52.3"
+version = "0.53.0"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.3"
+version = "0.53.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 4e806f78b1..c8763270ce 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-lib]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/bonding-curve-contract/wasm/Cargo.toml b/contracts/examples/bonding-curve-contract/wasm/Cargo.toml
index 476d1c718b..baa6def885 100644
--- a/contracts/examples/bonding-curve-contract/wasm/Cargo.toml
+++ b/contracts/examples/bonding-curve-contract/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/check-pause/Cargo.toml b/contracts/examples/check-pause/Cargo.toml
index 09b5d89c3b..ca805cfd9f 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.52.3"
+version = "0.53.0"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../framework/scenario"
 
diff --git a/contracts/examples/check-pause/meta/Cargo.toml b/contracts/examples/check-pause/meta/Cargo.toml
index 90569afe15..9e3bd8d12f 100644
--- a/contracts/examples/check-pause/meta/Cargo.toml
+++ b/contracts/examples/check-pause/meta/Cargo.toml
@@ -9,6 +9,6 @@ authors = ["Alin Cruceat <alin.cruceat@multiversx.com>"]
 path = ".."
 
 [dependencies.multiversx-sc-meta-lib]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/check-pause/wasm/Cargo.toml b/contracts/examples/check-pause/wasm/Cargo.toml
index ce7f99ba5b..fbdd44a72b 100644
--- a/contracts/examples/check-pause/wasm/Cargo.toml
+++ b/contracts/examples/check-pause/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/crowdfunding-esdt/Cargo.toml b/contracts/examples/crowdfunding-esdt/Cargo.toml
index eccf505d91..e803967225 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.52.3"
+version = "0.53.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.3"
+version = "0.53.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 b71b9d7c86..cb3b9f3c75 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-lib]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/crowdfunding-esdt/wasm/Cargo.toml b/contracts/examples/crowdfunding-esdt/wasm/Cargo.toml
index 223676b2eb..e348761989 100644
--- a/contracts/examples/crowdfunding-esdt/wasm/Cargo.toml
+++ b/contracts/examples/crowdfunding-esdt/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/crypto-bubbles/Cargo.toml b/contracts/examples/crypto-bubbles/Cargo.toml
index 47db96bb71..bf23c6dcd9 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.52.3"
+version = "0.53.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/crypto-bubbles/meta/Cargo.toml b/contracts/examples/crypto-bubbles/meta/Cargo.toml
index 99f20d50e7..b16e54906e 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-lib]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/crypto-bubbles/wasm/Cargo.toml b/contracts/examples/crypto-bubbles/wasm/Cargo.toml
index de5583ff1b..bce34c10bd 100644
--- a/contracts/examples/crypto-bubbles/wasm/Cargo.toml
+++ b/contracts/examples/crypto-bubbles/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.3"
+version = "0.53.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 b66621069b..35970fba03 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.52.3"
+version = "0.53.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 badff47740..fa771af925 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.52.3"
+version = "0.53.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 11ab2f903b..377c0e15d3 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.52.3"
+version = "0.53.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.3"
+version = "0.53.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 fa16c5bf67..74bbbd6677 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-lib]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../../framework/meta-lib"
 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 4bd5bb69bf..3526a48644 100644
--- a/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.toml
+++ b/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.3"
+version = "0.53.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 4d1d1f7792..2ea3296283 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.52.3"
+version = "0.53.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.3"
+version = "0.53.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 340591c147..3deffa8b6c 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-lib]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../../framework/meta-lib"
 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 b015a92ce0..1ce273b242 100644
--- a/contracts/examples/crypto-kitties/kitty-genetic-alg/wasm/Cargo.toml
+++ b/contracts/examples/crypto-kitties/kitty-genetic-alg/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.3"
+version = "0.53.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 264aca7a31..83021af48b 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.52.3"
+version = "0.53.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.3"
+version = "0.53.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 f7dfa86133..4d1e67e66a 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-lib]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../../framework/meta-lib"
 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 b58851660c..60aa30b00a 100644
--- a/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.toml
+++ b/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/crypto-zombies/Cargo.toml b/contracts/examples/crypto-zombies/Cargo.toml
index 710aa5fa4e..4ef64950ba 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.52.3"
+version = "0.53.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/crypto-zombies/meta/Cargo.toml b/contracts/examples/crypto-zombies/meta/Cargo.toml
index b667ef63a8..f17443b66f 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-lib]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/crypto-zombies/wasm/Cargo.toml b/contracts/examples/crypto-zombies/wasm/Cargo.toml
index 57a1fe3ef8..8073db84b3 100644
--- a/contracts/examples/crypto-zombies/wasm/Cargo.toml
+++ b/contracts/examples/crypto-zombies/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/digital-cash/Cargo.toml b/contracts/examples/digital-cash/Cargo.toml
index ed8e9d80b7..67a03c685d 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.52.3"
+version = "0.53.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/digital-cash/meta/Cargo.toml b/contracts/examples/digital-cash/meta/Cargo.toml
index b28ad40b32..1e9dd45feb 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-lib]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/digital-cash/wasm/Cargo.toml b/contracts/examples/digital-cash/wasm/Cargo.toml
index 6e6cde52cc..efb1210508 100644
--- a/contracts/examples/digital-cash/wasm/Cargo.toml
+++ b/contracts/examples/digital-cash/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/empty/Cargo.toml b/contracts/examples/empty/Cargo.toml
index 08e3d5343d..741783f0e3 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.52.3"
+version = "0.53.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../framework/scenario"
 
 [dev-dependencies]
diff --git a/contracts/examples/empty/meta/Cargo.toml b/contracts/examples/empty/meta/Cargo.toml
index b4824124e6..f89d218375 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-lib]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/empty/wasm/Cargo.toml b/contracts/examples/empty/wasm/Cargo.toml
index f260225b96..b9c014aefc 100644
--- a/contracts/examples/empty/wasm/Cargo.toml
+++ b/contracts/examples/empty/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.3"
+version = "0.53.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 61e8d4dee2..dce8934c43 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.52.3"
+version = "0.53.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.3"
+version = "0.53.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 563ed0c0c3..37dd4e6a63 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-lib]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../framework/meta-lib"
 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 46e12c2cee..b5fb86309a 100644
--- a/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.toml
+++ b/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/factorial/Cargo.toml b/contracts/examples/factorial/Cargo.toml
index dd260bf6a2..9eb6bf090e 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.52.3"
+version = "0.53.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/factorial/meta/Cargo.toml b/contracts/examples/factorial/meta/Cargo.toml
index f99576dfcc..8471feaaef 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-lib]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/factorial/wasm/Cargo.toml b/contracts/examples/factorial/wasm/Cargo.toml
index 500fc2bde3..408adf31fc 100644
--- a/contracts/examples/factorial/wasm/Cargo.toml
+++ b/contracts/examples/factorial/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/fractional-nfts/Cargo.toml b/contracts/examples/fractional-nfts/Cargo.toml
index a26370c168..cd1a611e6c 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.52.3"
+version = "0.53.0"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/fractional-nfts/meta/Cargo.toml b/contracts/examples/fractional-nfts/meta/Cargo.toml
index 57b4b61417..99cd6705f3 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-lib]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/fractional-nfts/wasm/Cargo.toml b/contracts/examples/fractional-nfts/wasm/Cargo.toml
index 542529a4a0..aca01461f3 100644
--- a/contracts/examples/fractional-nfts/wasm/Cargo.toml
+++ b/contracts/examples/fractional-nfts/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/lottery-esdt/Cargo.toml b/contracts/examples/lottery-esdt/Cargo.toml
index fc52a3472e..7239b8ea00 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.52.3"
+version = "0.53.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/lottery-esdt/meta/Cargo.toml b/contracts/examples/lottery-esdt/meta/Cargo.toml
index 96b622ca4e..5a0cc21f7b 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-lib]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/lottery-esdt/wasm/Cargo.toml b/contracts/examples/lottery-esdt/wasm/Cargo.toml
index 49888e43ef..b5dc083865 100644
--- a/contracts/examples/lottery-esdt/wasm/Cargo.toml
+++ b/contracts/examples/lottery-esdt/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/multisig/Cargo.toml b/contracts/examples/multisig/Cargo.toml
index 6b9bf4feaa..0b3bc9301e 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.52.3"
+version = "0.53.0"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../framework/scenario"
 
 [dev-dependencies.adder]
@@ -27,7 +27,7 @@ path = "../adder"
 path = "../factorial"
 
 [dev-dependencies.multiversx-wegld-swap-sc]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../core/wegld-swap"
 
 [dev-dependencies]
diff --git a/contracts/examples/multisig/interact/Cargo.toml b/contracts/examples/multisig/interact/Cargo.toml
index ec9184522d..7d6914bd60 100644
--- a/contracts/examples/multisig/interact/Cargo.toml
+++ b/contracts/examples/multisig/interact/Cargo.toml
@@ -18,17 +18,17 @@ toml = "0.8.6"
 path = ".."
 
 [dependencies.multiversx-sc-modules]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../contracts/modules"
 
 [dependencies.multiversx-sc-snippets]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../framework/snippets"
 
 [dependencies.multiversx-sc-scenario]
-version = "=0.52.3"
+version = "=0.53.0"
 path = "../../../../framework/scenario"
 
 [dependencies.multiversx-sc]
-version = "=0.52.3"
+version = "=0.53.0"
 path = "../../../../framework/base"
diff --git a/contracts/examples/multisig/meta/Cargo.toml b/contracts/examples/multisig/meta/Cargo.toml
index 33a79fe7e0..4cc6ee464c 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-lib]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/multisig/wasm-multisig-full/Cargo.toml b/contracts/examples/multisig/wasm-multisig-full/Cargo.toml
index 99726c26e4..86facedf0f 100644
--- a/contracts/examples/multisig/wasm-multisig-full/Cargo.toml
+++ b/contracts/examples/multisig/wasm-multisig-full/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.3"
+version = "0.53.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 ef993d6bfd..e3bd48b6f4 100644
--- a/contracts/examples/multisig/wasm-multisig-view/Cargo.toml
+++ b/contracts/examples/multisig/wasm-multisig-view/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/multisig/wasm/Cargo.toml b/contracts/examples/multisig/wasm/Cargo.toml
index 9401a96630..03ae711446 100644
--- a/contracts/examples/multisig/wasm/Cargo.toml
+++ b/contracts/examples/multisig/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/nft-minter/Cargo.toml b/contracts/examples/nft-minter/Cargo.toml
index 03b1551465..2490922fb5 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.52.3"
+version = "0.53.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/nft-minter/meta/Cargo.toml b/contracts/examples/nft-minter/meta/Cargo.toml
index 7263f932ad..08f8dace58 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-lib]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/nft-minter/wasm/Cargo.toml b/contracts/examples/nft-minter/wasm/Cargo.toml
index 95d1c79722..8dc62e8b60 100644
--- a/contracts/examples/nft-minter/wasm/Cargo.toml
+++ b/contracts/examples/nft-minter/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.3"
+version = "0.53.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 1bc7b29750..d3dceaa538 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.52.3"
+version = "0.53.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.3"
+version = "0.53.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 888ca8614d..0271a13b9d 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-lib]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/nft-storage-prepay/wasm/Cargo.toml b/contracts/examples/nft-storage-prepay/wasm/Cargo.toml
index 2b1710ea5e..4a204d527b 100644
--- a/contracts/examples/nft-storage-prepay/wasm/Cargo.toml
+++ b/contracts/examples/nft-storage-prepay/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/nft-subscription/Cargo.toml b/contracts/examples/nft-subscription/Cargo.toml
index 7e8fc35eb4..b2c48529dc 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.52.3"
+version = "0.53.0"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/nft-subscription/meta/Cargo.toml b/contracts/examples/nft-subscription/meta/Cargo.toml
index 8960c9deab..4d01981805 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-lib]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/nft-subscription/wasm/Cargo.toml b/contracts/examples/nft-subscription/wasm/Cargo.toml
index 4dacd88394..1e0dc6a6c8 100644
--- a/contracts/examples/nft-subscription/wasm/Cargo.toml
+++ b/contracts/examples/nft-subscription/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.3"
+version = "0.53.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 c236031782..cd0e12daaf 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.52.3"
+version = "0.53.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.3"
+version = "0.53.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 93edd21ce0..ba8b635dee 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-lib]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/order-book/factory/wasm/Cargo.toml b/contracts/examples/order-book/factory/wasm/Cargo.toml
index c92ff1619a..3762fbfdf9 100644
--- a/contracts/examples/order-book/factory/wasm/Cargo.toml
+++ b/contracts/examples/order-book/factory/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.3"
+version = "0.53.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 77235329be..505715ebbc 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.52.3"
+version = "0.53.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.3"
+version = "0.53.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 9593fb54d7..217fb07ee4 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-lib]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/order-book/pair/wasm/Cargo.toml b/contracts/examples/order-book/pair/wasm/Cargo.toml
index 07722240a2..ae2c10d4d8 100644
--- a/contracts/examples/order-book/pair/wasm/Cargo.toml
+++ b/contracts/examples/order-book/pair/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.3"
+version = "0.53.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 e9ca310f33..787526a9ea 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.52.3"
+version = "0.53.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.3"
+version = "0.53.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 e56d4f11a0..71ff709c5f 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-lib]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/ping-pong-egld/wasm/Cargo.toml b/contracts/examples/ping-pong-egld/wasm/Cargo.toml
index 3b9afa18e7..7fad7880a3 100644
--- a/contracts/examples/ping-pong-egld/wasm/Cargo.toml
+++ b/contracts/examples/ping-pong-egld/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/proxy-pause/Cargo.toml b/contracts/examples/proxy-pause/Cargo.toml
index 5160725d84..4fbe63692b 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.52.3"
+version = "0.53.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.3"
+version = "0.53.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 51a75a5dca..0bd4f2c3c7 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-lib]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/proxy-pause/wasm/Cargo.toml b/contracts/examples/proxy-pause/wasm/Cargo.toml
index cf6b1c4cc7..dcb6fdeefb 100644
--- a/contracts/examples/proxy-pause/wasm/Cargo.toml
+++ b/contracts/examples/proxy-pause/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/rewards-distribution/Cargo.toml b/contracts/examples/rewards-distribution/Cargo.toml
index f67e765130..ce4d09995e 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.52.3"
+version = "0.53.0"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/rewards-distribution/meta/Cargo.toml b/contracts/examples/rewards-distribution/meta/Cargo.toml
index 6988570c60..99b1d29acf 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 <claudiu.bruda@multiversx.com>"]
 path = ".."
 
 [dependencies.multiversx-sc-meta-lib]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/rewards-distribution/wasm/Cargo.toml b/contracts/examples/rewards-distribution/wasm/Cargo.toml
index 9f8a8a633f..2273edf1c0 100644
--- a/contracts/examples/rewards-distribution/wasm/Cargo.toml
+++ b/contracts/examples/rewards-distribution/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.3"
+version = "0.53.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 79578dd764..c983de4a98 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.52.3"
+version = "0.53.0"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.3"
+version = "0.53.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 aecbe0ce1f..591c68f63c 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 <claudiu.bruda@multiversx.com>"]
 path = ".."
 
 [dependencies.multiversx-sc-meta-lib]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/seed-nft-minter/wasm/Cargo.toml b/contracts/examples/seed-nft-minter/wasm/Cargo.toml
index f3b3700943..dd696afd0a 100644
--- a/contracts/examples/seed-nft-minter/wasm/Cargo.toml
+++ b/contracts/examples/seed-nft-minter/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/token-release/Cargo.toml b/contracts/examples/token-release/Cargo.toml
index 351a77764e..6c54444762 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.52.3"
+version = "0.53.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../framework/scenario"
 
diff --git a/contracts/examples/token-release/meta/Cargo.toml b/contracts/examples/token-release/meta/Cargo.toml
index d5bf7bcb4c..82bd2039ca 100644
--- a/contracts/examples/token-release/meta/Cargo.toml
+++ b/contracts/examples/token-release/meta/Cargo.toml
@@ -10,6 +10,6 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta-lib]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/token-release/wasm/Cargo.toml b/contracts/examples/token-release/wasm/Cargo.toml
index a1768d018f..acb28e3e7c 100644
--- a/contracts/examples/token-release/wasm/Cargo.toml
+++ b/contracts/examples/token-release/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.3"
+version = "0.53.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 1af24eedac..818273469f 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.52.3"
+version = "0.53.0"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../framework/scenario"
 
 [dev-dependencies.multiversx-sc-meta-lib]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../framework/meta-lib"
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 5bd8629e80..a011b156ba 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.52.3"
+            "version": "0.53.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 929d6aff37..0719553ee0 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.52.3"
+            "version": "0.53.0"
         }
     },
     "docs": [
diff --git a/contracts/feature-tests/abi-tester/meta/Cargo.toml b/contracts/feature-tests/abi-tester/meta/Cargo.toml
index e24dd146f5..bc634e03fa 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-lib]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../framework/meta-lib"
 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 503a7215e3..c20d1e1904 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.3"
+version = "0.53.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 2ef8803dec..2275167c26 100644
--- a/contracts/feature-tests/abi-tester/wasm/Cargo.toml
+++ b/contracts/feature-tests/abi-tester/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.3"
+version = "0.53.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 ab0692f076..efb7e93a84 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.52.3"
+version = "0.53.0"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.3"
+version = "0.53.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 8ba824abfc..6683a757a0 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-lib]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml
index b29daa214f..69b3e410ec 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml
index 27c930350a..a1196dc641 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/alloc-features/wasm/Cargo.toml b/contracts/feature-tests/alloc-features/wasm/Cargo.toml
index 82c0e882ce..3757b931a8 100644
--- a/contracts/feature-tests/alloc-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/alloc-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.3"
+version = "0.53.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 732990a5ed..6a512e08db 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.52.3"
+version = "0.53.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../framework/scenario"
 
 [dependencies.multiversx-sc-modules]
-version = "0.52.3"
+version = "0.53.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 4479a539e0..69597ba7e3 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.52.3"
+version = "0.53.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 8b2641a475..77577df1da 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-lib]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/feature-tests/basic-features/wasm-basic-features-crypto/Cargo.toml b/contracts/feature-tests/basic-features/wasm-basic-features-crypto/Cargo.toml
index 46f40289e3..fcb4704fc4 100644
--- a/contracts/feature-tests/basic-features/wasm-basic-features-crypto/Cargo.toml
+++ b/contracts/feature-tests/basic-features/wasm-basic-features-crypto/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
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 8791c88ae0..2f0c5e0f6b 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.3"
+version = "0.53.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 cfa2c0dcaf..22ddc8a21d 100644
--- a/contracts/feature-tests/basic-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/basic-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.3"
+version = "0.53.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 7a9fbbf6a5..ccf656cc56 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.52.3"
+version = "0.53.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.3"
+version = "0.53.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 b966e6e9f8..55f63536c4 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-lib]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../framework/meta-lib"
 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 21f190b2a3..cde5b3fa3d 100644
--- a/contracts/feature-tests/big-float-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/big-float-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/Cargo.toml b/contracts/feature-tests/composability/Cargo.toml
index 94514ef894..8992c9bdae 100644
--- a/contracts/feature-tests/composability/Cargo.toml
+++ b/contracts/feature-tests/composability/Cargo.toml
@@ -36,9 +36,9 @@ path = "recursive-caller"
 path = "vault"
 
 [dependencies.multiversx-sc]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.3"
+version = "0.53.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 94f4c93efc..7b160a15c2 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.52.3"
+version = "0.53.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.3"
+version = "0.53.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 ab8471026a..e9c34fde3f 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-lib]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../../framework/meta-lib"
 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 241edcf7d3..0eb652185b 100644
--- a/contracts/feature-tests/composability/builtin-func-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/builtin-func-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.3"
+version = "0.53.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 3a5a5f79ab..9fd112249e 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.52.3"
+version = "0.53.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.3"
+version = "0.53.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 75ab9c1006..5aa639c1b2 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
@@ -9,10 +9,10 @@ publish = false
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.3"
+version = "0.53.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 db735d40b4..09a5973970 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.52.3"
+version = "0.53.0"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta-lib]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../../../framework/meta-lib"
 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 507e80c896..fa8c753791 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.3"
+version = "0.53.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 d84c322857..09d9cde1a9 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.52.3"
+version = "0.53.0"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.3"
+version = "0.53.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 e9a2feaf21..3319be901e 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.52.3"
+version = "0.53.0"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta-lib]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../../../framework/meta-lib"
 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 258ca36d49..2de10d221f 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.3"
+version = "0.53.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 7488422afc..99f974234e 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.52.3"
+version = "0.53.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.3"
+version = "0.53.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 ea63ae654f..5f3e162b21 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.52.3"
+version = "0.53.0"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.3"
+version = "0.53.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 bc17e19772..2bf4039778 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.52.3"
+version = "0.53.0"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta-lib]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../../../framework/meta-lib"
 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 6557b4da03..bb3671a1da 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.3"
+version = "0.53.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 c0887b88c8..4244fe6db2 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
@@ -9,10 +9,10 @@ publish = false
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.3"
+version = "0.53.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 6b3fd5643c..1f6538947c 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.52.3"
+version = "0.53.0"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta-lib]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../../../framework/meta-lib"
 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 402a1d01d6..f6a2a723be 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/forwarder-legacy/Cargo.toml b/contracts/feature-tests/composability/forwarder-legacy/Cargo.toml
index e4937509b0..03464fb77a 100644
--- a/contracts/feature-tests/composability/forwarder-legacy/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-legacy/Cargo.toml
@@ -12,10 +12,10 @@ path = "src/forwarder_legacy_main.rs"
 path = "../vault"
 
 [dependencies.multiversx-sc]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../framework/scenario"
 
diff --git a/contracts/feature-tests/composability/forwarder-legacy/meta/Cargo.toml b/contracts/feature-tests/composability/forwarder-legacy/meta/Cargo.toml
index 1b1e8aed9a..203f1cf2bc 100644
--- a/contracts/feature-tests/composability/forwarder-legacy/meta/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-legacy/meta/Cargo.toml
@@ -8,6 +8,6 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta-lib]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.toml b/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.toml
index 4a216ad9be..46f9f1c9b4 100644
--- a/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.3"
+version = "0.53.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 f93ec8f388..016d08c104 100644
--- a/contracts/feature-tests/composability/forwarder-queue/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-queue/Cargo.toml
@@ -9,14 +9,14 @@ publish = false
 path = "src/forwarder_queue.rs"
 
 [dependencies.multiversx-sc]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../framework/wasm-adapter"
 optional = true
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.3"
+version = "0.53.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 3830a54e4d..f31f2d43f9 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-lib]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../../framework/meta-lib"
 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 542e076e69..43eeeee811 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.3"
+version = "0.53.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 76c5b3ef97..b4a60f1948 100644
--- a/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.3"
+version = "0.53.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 52849f46ab..3449ee0fe5 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.52.3"
+version = "0.53.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.3"
+version = "0.53.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 28b9956956..a99e066803 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-lib]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../../framework/meta-lib"
 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 7dc394f988..2ddba1d010 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.3"
+version = "0.53.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 421efa4ae5..8790eaab01 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.3"
+version = "0.53.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 5010a5d9ed..70d30a4567 100644
--- a/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.3"
+version = "0.53.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 811a67939e..3623f1113a 100644
--- a/contracts/feature-tests/composability/forwarder/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder/Cargo.toml
@@ -9,10 +9,10 @@ publish = false
 path = "src/forwarder_main.rs"
 
 [dependencies.multiversx-sc]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.3"
+version = "0.53.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 923f5cfbf7..d8c2957670 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-lib]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/feature-tests/composability/forwarder/wasm/Cargo.toml b/contracts/feature-tests/composability/forwarder/wasm/Cargo.toml
index 86bea326c2..4c3ba91578 100644
--- a/contracts/feature-tests/composability/forwarder/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/forwarder/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.3"
+version = "0.53.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 2d0f877380..e06ae3c915 100644
--- a/contracts/feature-tests/composability/interact/Cargo.toml
+++ b/contracts/feature-tests/composability/interact/Cargo.toml
@@ -15,9 +15,9 @@ serde = { version = "1.0", features = ["derive"] }
 toml = "0.8.6"
 
 [dependencies.multiversx-sc]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-snippets]
-version = "0.52.3"
+version = "0.53.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 83c17ceec8..e63c0a4c07 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.52.3"
+version = "0.53.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.3"
+version = "0.53.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 d2f633718c..dfb650dd51 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-lib]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../../framework/meta-lib"
 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 2f2d79b71e..ab44b1e438 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.3"
+version = "0.53.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 f58518b9e4..810d51c4d5 100644
--- a/contracts/feature-tests/composability/promises-features/Cargo.toml
+++ b/contracts/feature-tests/composability/promises-features/Cargo.toml
@@ -9,6 +9,6 @@ publish = false
 path = "src/promises_main.rs"
 
 [dependencies.multiversx-sc]
-version = "0.52.3"
+version = "0.53.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 3f7d46cc26..58c533722b 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-lib]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../../framework/meta-lib"
 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 e4a9958058..087281836e 100644
--- a/contracts/feature-tests/composability/promises-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/promises-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.3"
+version = "0.53.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 d75d69b776..1979d318fb 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.52.3"
+version = "0.53.0"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.3"
+version = "0.53.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 fea3ac9487..9d6fa7bc28 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-lib]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../../framework/meta-lib"
 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 f7f34b06f0..303ee9acff 100644
--- a/contracts/feature-tests/composability/proxy-test-first/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/proxy-test-first/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.3"
+version = "0.53.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 9f4adce1cf..0e56e59713 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.52.3"
+version = "0.53.0"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.3"
+version = "0.53.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 6753165f9f..c8831c473b 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-lib]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../../framework/meta-lib"
 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 f7ffc1f9a3..b35f7667f0 100644
--- a/contracts/feature-tests/composability/proxy-test-second/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/proxy-test-second/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.3"
+version = "0.53.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 405ecedf75..70361935fe 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.52.3"
+version = "0.53.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.3"
+version = "0.53.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 a37eaf5aad..cb45e19721 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-lib]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../../framework/meta-lib"
 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 2e7d07948a..373cbbceab 100644
--- a/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.3"
+version = "0.53.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 f3c2d9555c..963ee4ba0f 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.52.3"
+version = "0.53.0"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.3"
+version = "0.53.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 64eeea59ae..21672e577a 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-lib]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../../framework/meta-lib"
 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 cfac48c054..4fc243f73c 100644
--- a/contracts/feature-tests/composability/transfer-role-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/transfer-role-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.3"
+version = "0.53.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 708f5ea4a0..ca5fda59a5 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.52.3"
+version = "0.53.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.3"
+version = "0.53.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 d8ff278d46..d74c9da9fa 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-lib]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../../framework/meta-lib"
 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 ef37bda448..d85cdbe112 100644
--- a/contracts/feature-tests/composability/vault/wasm-vault-promises/Cargo.toml
+++ b/contracts/feature-tests/composability/vault/wasm-vault-promises/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.3"
+version = "0.53.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 5f40e51e51..7dd3d6687b 100644
--- a/contracts/feature-tests/composability/vault/wasm-vault-upgrade/Cargo.toml
+++ b/contracts/feature-tests/composability/vault/wasm-vault-upgrade/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.3"
+version = "0.53.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 6c1c5e2837..e4a6c5b05d 100644
--- a/contracts/feature-tests/composability/vault/wasm/Cargo.toml
+++ b/contracts/feature-tests/composability/vault/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.3"
+version = "0.53.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 cca7ce2d0b..f9e78e05e2 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.52.3"
+version = "0.53.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.3"
+version = "0.53.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 fec279d491..2dbb219d93 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-lib]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../../framework/meta-lib"
 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 ef03e13d39..c20ff0f6e6 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.3"
+version = "0.53.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 d71180915a..dc44473149 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.52.3"
+version = "0.53.0"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.3"
+version = "0.53.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 3fa5e6d1c2..604e079437 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-lib]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../../framework/meta-lib"
 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 c01a130e9b..15d1f84e6f 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.3"
+version = "0.53.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 3f5236767f..6522717a20 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.52.3"
+version = "0.53.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.3"
+version = "0.53.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 3ee59c5155..32cc9884ce 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-lib]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../../framework/meta-lib"
 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 40ffc08567..a552d7182f 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.3"
+version = "0.53.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 e2a7672029..f08ff006d6 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.52.3"
+version = "0.53.0"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.3"
+version = "0.53.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 ea073d9b18..68f6c047bc 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-lib]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../../framework/meta-lib"
 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 d5890e4275..7f9da3c3f9 100644
--- a/contracts/feature-tests/erc-style-contracts/erc1155/wasm/Cargo.toml
+++ b/contracts/feature-tests/erc-style-contracts/erc1155/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.3"
+version = "0.53.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 81350acfaf..952974dc8c 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.52.3"
+version = "0.53.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.3"
+version = "0.53.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 b1af27d656..fe09bef84b 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-lib]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../../framework/meta-lib"
 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 6bdce84478..1204bda01d 100644
--- a/contracts/feature-tests/erc-style-contracts/erc20/wasm/Cargo.toml
+++ b/contracts/feature-tests/erc-style-contracts/erc20/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.3"
+version = "0.53.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 2e0078fa6c..8de13cc846 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.52.3"
+version = "0.53.0"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.3"
+version = "0.53.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 4ec8dd7f7e..efb6d7fa17 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-lib]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../../framework/meta-lib"
 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 192eec89d4..19556830d3 100644
--- a/contracts/feature-tests/erc-style-contracts/erc721/wasm/Cargo.toml
+++ b/contracts/feature-tests/erc-style-contracts/erc721/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.3"
+version = "0.53.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 8a8ade84f3..65d07485b1 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.52.3"
+version = "0.53.0"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.3"
+version = "0.53.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 4f1f58e7dd..6c8fa73739 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-lib]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../../framework/meta-lib"
 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 f9b260fe63..b41f8f30c4 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.3"
+version = "0.53.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 e05404fa10..7adf5bfa39 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.52.3"
+version = "0.53.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.3"
+version = "0.53.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 88267a1571..b58330106d 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-lib]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../framework/meta-lib"
 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 06fee9a8c7..7bdb57da33 100644
--- a/contracts/feature-tests/esdt-system-sc-mock/wasm/Cargo.toml
+++ b/contracts/feature-tests/esdt-system-sc-mock/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/exchange-features/Cargo.toml b/contracts/feature-tests/exchange-features/Cargo.toml
index cbdbdeb67d..c234568a77 100644
--- a/contracts/feature-tests/exchange-features/Cargo.toml
+++ b/contracts/feature-tests/exchange-features/Cargo.toml
@@ -9,9 +9,9 @@ publish = false
 path = "src/exchange_features.rs"
 
 [dependencies.multiversx-sc]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../framework/scenario"
diff --git a/contracts/feature-tests/exchange-features/meta/Cargo.toml b/contracts/feature-tests/exchange-features/meta/Cargo.toml
index 0a31407adf..47c06b5ab9 100644
--- a/contracts/feature-tests/exchange-features/meta/Cargo.toml
+++ b/contracts/feature-tests/exchange-features/meta/Cargo.toml
@@ -8,6 +8,6 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta-lib]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/feature-tests/exchange-features/wasm/Cargo.toml b/contracts/feature-tests/exchange-features/wasm/Cargo.toml
index 53d5b6510e..3f446a1fce 100644
--- a/contracts/feature-tests/exchange-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/exchange-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.3"
+version = "0.53.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 78c61554eb..c4ae7e688f 100644
--- a/contracts/feature-tests/formatted-message-features/Cargo.toml
+++ b/contracts/feature-tests/formatted-message-features/Cargo.toml
@@ -9,10 +9,10 @@ publish = false
 path = "src/formatted_message_features.rs"
 
 [dependencies.multiversx-sc]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.3"
+version = "0.53.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 0921aa7edd..aa270f41b2 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-lib]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../framework/meta-lib"
 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 fb6964e10e..d053ccbdb6 100644
--- a/contracts/feature-tests/formatted-message-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/formatted-message-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.3"
+version = "0.53.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 d0dc3c3fc1..1e15bebcd8 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.52.3"
+version = "0.53.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.3"
+version = "0.53.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 ff34ad36d7..96c85128b1 100644
--- a/contracts/feature-tests/managed-map-features/meta/Cargo.toml
+++ b/contracts/feature-tests/managed-map-features/meta/Cargo.toml
@@ -9,6 +9,6 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta-lib]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../framework/meta-lib"
 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 880012822c..fef494d8b5 100644
--- a/contracts/feature-tests/managed-map-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/managed-map-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.3"
+version = "0.53.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 f67072623f..21163afcb8 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.52.3"
+version = "0.53.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.3"
+version = "0.53.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 bd9c8fa87a..cdce31eb9a 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-lib]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../framework/meta-lib"
 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 20f9e0823b..2c8cdbdfa2 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.3"
+version = "0.53.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 69049c38e3..669e7e5fad 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
@@ -29,7 +29,7 @@ path = ".."
 features = ["example_feature"]
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.3"
+version = "0.53.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 85fa29fd15..5aa3aacb18 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.3"
+version = "0.53.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 dbca5a7806..97aa191f1c 100644
--- a/contracts/feature-tests/multi-contract-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/multi-contract-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.3"
+version = "0.53.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 2b435b2d94..ecbad46188 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.52.3"
+version = "0.53.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.3"
+version = "0.53.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 f087723eaa..7641f3072e 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-lib]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../framework/meta-lib"
 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 1ab2fdb4d6..a980084e13 100644
--- a/contracts/feature-tests/panic-message-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/panic-message-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.3"
+version = "0.53.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 1163a269dd..e5ec427dc5 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.52.3"
+version = "0.53.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.3"
+version = "0.53.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 0dda545db1..8504a5caa9 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-lib]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/feature-tests/payable-features/wasm/Cargo.toml b/contracts/feature-tests/payable-features/wasm/Cargo.toml
index 245c54e249..3edbcf28de 100644
--- a/contracts/feature-tests/payable-features/wasm/Cargo.toml
+++ b/contracts/feature-tests/payable-features/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.3"
+version = "0.53.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 62e83fa2b1..c0378047ba 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.52.3"
+version = "0.53.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.3"
+version = "0.53.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 5ad992c904..c5b78a0b39 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.52.3"
+version = "0.53.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 b61454b659..c7c55e7ae9 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-lib]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../framework/meta-lib"
 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 bdd5201b77..6319847030 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 interactor snippets manually to add relative paths:
 // [dependencies.multiversx-sc-snippets]
-// version = "0.52.3"
+// version = "0.53.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 02905e81f9..923f470fe5 100644
--- a/contracts/feature-tests/rust-snippets-generator-test/wasm/Cargo.toml
+++ b/contracts/feature-tests/rust-snippets-generator-test/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.3"
+version = "0.53.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 5706941832..a2d8bbd831 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.52.3"
+version = "0.53.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.52.3"
+version = "0.53.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 8d015c0a1b..be2765e077 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-lib]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../framework/meta-lib"
 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 ae33735008..111c090390 100644
--- a/contracts/feature-tests/rust-testing-framework-tester/wasm/Cargo.toml
+++ b/contracts/feature-tests/rust-testing-framework-tester/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/scenario-tester/Cargo.toml b/contracts/feature-tests/scenario-tester/Cargo.toml
index e715da800c..58f97682f3 100644
--- a/contracts/feature-tests/scenario-tester/Cargo.toml
+++ b/contracts/feature-tests/scenario-tester/Cargo.toml
@@ -9,9 +9,9 @@ publish = false
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../framework/scenario"
diff --git a/contracts/feature-tests/scenario-tester/meta/Cargo.toml b/contracts/feature-tests/scenario-tester/meta/Cargo.toml
index 31c185acfe..2c850459ec 100644
--- a/contracts/feature-tests/scenario-tester/meta/Cargo.toml
+++ b/contracts/feature-tests/scenario-tester/meta/Cargo.toml
@@ -8,6 +8,6 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta-lib]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/feature-tests/scenario-tester/wasm/Cargo.toml b/contracts/feature-tests/scenario-tester/wasm/Cargo.toml
index a30f19d77c..c6f1c3743c 100644
--- a/contracts/feature-tests/scenario-tester/wasm/Cargo.toml
+++ b/contracts/feature-tests/scenario-tester/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.3"
+version = "0.53.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 53d2c5903e..d32b9b8140 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.52.3"
+version = "0.53.0"
 path = "../../../contracts/modules"
 
 [dependencies.multiversx-sc]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../framework/scenario"
 
 [dev-dependencies.multiversx-sc-meta-lib]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../framework/meta-lib"
diff --git a/contracts/feature-tests/use-module/meta/Cargo.toml b/contracts/feature-tests/use-module/meta/Cargo.toml
index f01a7e3667..627498902b 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-lib]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../framework/meta-lib"
 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 17f02d7613..7a339475d8 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.52.3"
+            "version": "0.53.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 7f1d946785..66e7bf4817 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.52.3"
+            "version": "0.53.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 3ab7138b0a..67b031e181 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
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.3"
+version = "0.53.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 6c3caaf92a..c2540ab89c 100644
--- a/contracts/feature-tests/use-module/wasm/Cargo.toml
+++ b/contracts/feature-tests/use-module/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/modules/Cargo.toml b/contracts/modules/Cargo.toml
index 17d1ff6c90..cbe440e21e 100644
--- a/contracts/modules/Cargo.toml
+++ b/contracts/modules/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-modules"
-version = "0.52.3"
+version = "0.53.0"
 edition = "2021"
 
 authors = ["MultiversX <contact@multiversx.com>"]
@@ -17,5 +17,5 @@ categories = ["no-std", "wasm", "cryptography::cryptocurrencies"]
 alloc = ["multiversx-sc/alloc"]
 
 [dependencies.multiversx-sc]
-version = "0.52.3"
+version = "0.53.0"
 path = "../../framework/base"
diff --git a/data/codec-derive/Cargo.toml b/data/codec-derive/Cargo.toml
index a738579380..4b18e0d167 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.20.1"
+version = "0.21.0"
 edition = "2021"
 
 authors = ["dorin.iancu <dorin.iancu@multiversx.com>", "Andrei Marinica <andrei.marinica@multiversx.com>", "MultiversX <contact@multiversx.com>"]
diff --git a/data/codec/Cargo.toml b/data/codec/Cargo.toml
index be2e7f39f4..1bb9ceb0bd 100644
--- a/data/codec/Cargo.toml
+++ b/data/codec/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-codec"
-version = "0.20.1"
+version = "0.21.0"
 edition = "2021"
 
 authors = ["Andrei Marinica <andrei.marinica@multiversx.com>", "MultiversX <contact@multiversx.com>"]
@@ -18,7 +18,7 @@ derive = ["multiversx-sc-codec-derive"]
 
 [dependencies.multiversx-sc-codec-derive]
 path = "../codec-derive"
-version = "=0.20.1"
+version = "=0.21.0"
 optional = true
 
 [dependencies]
@@ -28,4 +28,4 @@ unwrap-infallible = "0.1.5"
 
 [dev-dependencies.multiversx-sc-codec-derive]
 path = "../codec-derive"
-version = "=0.20.1"
+version = "=0.21.0"
diff --git a/framework/base/Cargo.toml b/framework/base/Cargo.toml
index 0184b001ee..0402d16f81 100644
--- a/framework/base/Cargo.toml
+++ b/framework/base/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc"
-version = "0.52.3"
+version = "0.53.0"
 edition = "2021"
 rust-version = "1.78"
 
@@ -30,10 +30,10 @@ num-traits = { version = "=0.2.19", default-features = false }
 unwrap-infallible = "0.1.5"
 
 [dependencies.multiversx-sc-derive]
-version = "=0.52.3"
+version = "=0.53.0"
 path = "../derive"
 
 [dependencies.multiversx-sc-codec]
-version = "=0.20.1"
+version = "=0.21.0"
 path = "../../data/codec"
 features = ["derive"]
diff --git a/framework/derive/Cargo.toml b/framework/derive/Cargo.toml
index 111a7447c7..f33cc53196 100644
--- a/framework/derive/Cargo.toml
+++ b/framework/derive/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-derive"
-version = "0.52.3"
+version = "0.53.0"
 edition = "2021"
 
 authors = ["Andrei Marinica <andrei.marinica@multiversx.com>", "MultiversX <contact@multiversx.com>"]
diff --git a/framework/meta-lib/Cargo.toml b/framework/meta-lib/Cargo.toml
index 484e9034cb..8e9209fa9a 100644
--- a/framework/meta-lib/Cargo.toml
+++ b/framework/meta-lib/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-meta-lib"
-version = "0.52.3"
+version = "0.53.0"
 edition = "2021"
 
 authors = [
@@ -31,6 +31,6 @@ wasmprinter = "0.216"
 semver = "1.0.20"
 
 [dependencies.multiversx-sc]
-version = "=0.52.3"
+version = "=0.53.0"
 path = "../base"
 features = ["alloc", "num-bigint"]
diff --git a/framework/meta-lib/src/version_history.rs b/framework/meta-lib/src/version_history.rs
index a906f000e8..c7fab1162b 100644
--- a/framework/meta-lib/src/version_history.rs
+++ b/framework/meta-lib/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.52.3);
+pub const LAST_VERSION: FrameworkVersion = framework_version!(0.53.0);
 
 /// Indicates where to stop with the upgrades.
 pub const LAST_UPGRADE_VERSION: FrameworkVersion = LAST_VERSION;
@@ -82,6 +82,7 @@ pub const VERSIONS: &[FrameworkVersion] = framework_versions![
     0.52.1,
     0.52.2,
     0.52.3,
+    0.53.0,
 ];
 
 #[rustfmt::skip]
@@ -108,6 +109,7 @@ pub const CHECK_AFTER_UPGRADE_TO: &[FrameworkVersion] = framework_versions![
     0.50.6,
     0.51.1,
     0.52.3,
+    0.53.0,
 ];
 
 pub const LOWER_VERSION_WITH_TEMPLATE_TAG: FrameworkVersion = framework_version!(0.43.0);
diff --git a/framework/meta/Cargo.toml b/framework/meta/Cargo.toml
index fba796a3d0..0b7af9bb63 100644
--- a/framework/meta/Cargo.toml
+++ b/framework/meta/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-meta"
-version = "0.52.3"
+version = "0.53.0"
 edition = "2021"
 
 authors = [
@@ -42,14 +42,14 @@ common-path = "1.0.0"
 bip39 = "2.0.0"
 
 [dependencies.multiversx-sc-meta-lib]
-version = "=0.52.3"
+version = "=0.53.0"
 path = "../meta-lib"
 
 [dependencies.multiversx-sc]
-version = "=0.52.3"
+version = "=0.53.0"
 path = "../base"
 features = ["alloc", "num-bigint"]
 
 [dependencies.multiversx-sc-snippets]
-version = "=0.52.3"
+version = "=0.53.0"
 path = "../snippets"
diff --git a/framework/scenario/Cargo.toml b/framework/scenario/Cargo.toml
index 796ab19bf0..24eb8b918b 100644
--- a/framework/scenario/Cargo.toml
+++ b/framework/scenario/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-scenario"
-version = "0.52.3"
+version = "0.53.0"
 edition = "2021"
 
 authors = [
@@ -37,21 +37,21 @@ wasm-incompatible = ["multiversx-chain-vm/wasm-incompatible"]
 run-go-tests = []
 
 [dependencies.multiversx-sc]
-version = "=0.52.3"
+version = "=0.53.0"
 features = ["alloc", "num-bigint"]
 path = "../base"
 
 [dependencies.multiversx-sc-meta-lib]
-version = "=0.52.3"
+version = "=0.53.0"
 path = "../meta-lib"
 
 [dependencies.multiversx-chain-scenario-format]
-version = "0.22.3"
+version = "0.23.0"
 path = "../../sdk/scenario-format"
 
 [dependencies.multiversx-chain-vm-executor]
 version = "0.2.0"
 
 [dependencies.multiversx-chain-vm]
-version = "=0.9.0"
+version = "=0.10.0"
 path = "../../vm"
diff --git a/framework/snippets/Cargo.toml b/framework/snippets/Cargo.toml
index a5eef34aee..43ca798a69 100644
--- a/framework/snippets/Cargo.toml
+++ b/framework/snippets/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sc-snippets"
-version = "0.52.3"
+version = "0.53.0"
 edition = "2021"
 
 authors = ["MultiversX <contact@multiversx.com>"]
@@ -22,15 +22,15 @@ env_logger = "0.11"
 futures = "0.3"
 
 [dependencies.multiversx-sc-scenario]
-version = "=0.52.3"
+version = "=0.53.0"
 path = "../scenario"
 
 [dependencies.multiversx-chain-scenario-format]
-version = "0.22.3"
+version = "0.23.0"
 path = "../../sdk/scenario-format"
 
 [dependencies.multiversx-sdk]
-version = "=0.5.0"
+version = "=0.6.0"
 path = "../../sdk/core"
 
 [dev-dependencies]
diff --git a/framework/wasm-adapter/Cargo.toml b/framework/wasm-adapter/Cargo.toml
index 66bf290796..ada19fe7d3 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.52.3"
+version = "0.53.0"
 edition = "2021"
 
 authors = [
@@ -22,5 +22,5 @@ categories = [
 ]
 
 [dependencies.multiversx-sc]
-version = "=0.52.3"
+version = "=0.53.0"
 path = "../base"
diff --git a/sdk/core/Cargo.toml b/sdk/core/Cargo.toml
index 2387e4cce8..1dc7b129f5 100644
--- a/sdk/core/Cargo.toml
+++ b/sdk/core/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-sdk"
-version = "0.5.0"
+version = "0.6.0"
 edition = "2021"
 
 authors = [
diff --git a/sdk/scenario-format/Cargo.toml b/sdk/scenario-format/Cargo.toml
index a79c6c31a7..fd3892fe75 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.3"
+version = "0.23.0"
 edition = "2021"
 
 authors = ["Andrei Marinica <andrei.marinica@multiversx.com>", "MultiversX <contact@multiversx.com>"]
diff --git a/tools/interactor-system-func-calls/Cargo.toml b/tools/interactor-system-func-calls/Cargo.toml
index 1cfd20f282..e9522fccb8 100644
--- a/tools/interactor-system-func-calls/Cargo.toml
+++ b/tools/interactor-system-func-calls/Cargo.toml
@@ -21,5 +21,5 @@ version = "1.0"
 features = ["derive"]
 
 [dependencies.multiversx-sc-snippets]
-version = "=0.52.3"
+version = "=0.53.0"
 path = "../../framework/snippets"
diff --git a/tools/mxpy-snippet-generator/Cargo.toml b/tools/mxpy-snippet-generator/Cargo.toml
index 838f8a1dc2..bf43d776ac 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.52.3"
+version = "0.53.0"
 path = "../../framework/base"
 
 [dependencies]
diff --git a/tools/plotter/Cargo.toml b/tools/plotter/Cargo.toml
index e0e5491322..a3b31c38d4 100644
--- a/tools/plotter/Cargo.toml
+++ b/tools/plotter/Cargo.toml
@@ -21,11 +21,11 @@ plotters-canvas = "^0.3.0"
 lto = true
 
 [dependencies.multiversx-sc]
-version = "=0.52.3"
+version = "=0.53.0"
 path = "../../framework/base"
 
 [dependencies.multiversx-sc-scenario]
-version = "=0.52.3"
+version = "=0.53.0"
 path = "../../framework/scenario"
 default-features = false
 
diff --git a/tools/rust-debugger/format-tests/Cargo.toml b/tools/rust-debugger/format-tests/Cargo.toml
index fe84121ba5..8d08a0f8ad 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.52.3"
+version = "=0.53.0"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-scenario]
-version = "=0.52.3"
+version = "=0.53.0"
 path = "../../../framework/scenario"
 
 [dependencies.multiversx-chain-vm]
-version = "=0.9.0"
+version = "=0.10.0"
 path = "../../../vm"
 
 [dev-dependencies]
diff --git a/vm/Cargo.toml b/vm/Cargo.toml
index 7e5349688d..78c36567af 100644
--- a/vm/Cargo.toml
+++ b/vm/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-chain-vm"
-version = "0.9.0"
+version = "0.10.0"
 edition = "2021"
 
 authors = [

From 083012e7fa41ecccb0790dde57226c4b0a1fff91 Mon Sep 17 00:00:00 2001
From: BiancaIalangi <bianca.ialangi@multiversx.com>
Date: Wed, 4 Sep 2024 11:27:44 +0300
Subject: [PATCH 1254/1254] Cargo.lock update

---
 .../benchmarks/large-storage/wasm/Cargo.lock  | 22 ++++----
 .../linked-list-repeat/wasm/Cargo.lock        | 22 ++++----
 .../mappers/map-repeat/wasm/Cargo.lock        | 22 ++++----
 .../mappers/queue-repeat/wasm/Cargo.lock      | 22 ++++----
 .../mappers/set-repeat/wasm/Cargo.lock        | 22 ++++----
 .../single-value-repeat/wasm/Cargo.lock       | 22 ++++----
 .../mappers/vec-repeat/wasm/Cargo.lock        | 22 ++++----
 .../benchmarks/send-tx-repeat/wasm/Cargo.lock | 22 ++++----
 .../Cargo.lock                                | 22 ++++----
 .../Cargo.lock                                | 22 ++++----
 .../benchmarks/str-repeat/wasm/Cargo.lock     | 22 ++++----
 .../core/price-aggregator/wasm/Cargo.lock     | 55 ++++++++++---------
 contracts/examples/adder/wasm/Cargo.lock      | 22 ++++----
 .../bonding-curve-contract/wasm/Cargo.lock    | 24 ++++----
 .../examples/check-pause/wasm/Cargo.lock      | 24 ++++----
 .../crowdfunding-esdt/wasm/Cargo.lock         | 22 ++++----
 .../examples/crypto-bubbles/wasm/Cargo.lock   | 22 ++++----
 .../kitty-auction/wasm/Cargo.lock             | 22 ++++----
 .../kitty-genetic-alg/wasm/Cargo.lock         | 22 ++++----
 .../kitty-ownership/wasm/Cargo.lock           | 22 ++++----
 .../examples/crypto-zombies/wasm/Cargo.lock   | 22 ++++----
 .../examples/digital-cash/wasm/Cargo.lock     | 22 ++++----
 contracts/examples/empty/wasm/Cargo.lock      | 22 ++++----
 .../esdt-transfer-with-fee/wasm/Cargo.lock    | 22 ++++----
 contracts/examples/factorial/wasm/Cargo.lock  | 22 ++++----
 .../examples/fractional-nfts/wasm/Cargo.lock  | 24 ++++----
 .../examples/lottery-esdt/wasm/Cargo.lock     | 22 ++++----
 .../multisig/wasm-multisig-full/Cargo.lock    | 24 ++++----
 .../multisig/wasm-multisig-view/Cargo.lock    | 24 ++++----
 contracts/examples/multisig/wasm/Cargo.lock   | 24 ++++----
 contracts/examples/nft-minter/wasm/Cargo.lock | 22 ++++----
 .../nft-storage-prepay/wasm/Cargo.lock        | 22 ++++----
 .../examples/nft-subscription/wasm/Cargo.lock | 24 ++++----
 .../order-book/factory/wasm/Cargo.lock        | 22 ++++----
 .../examples/order-book/pair/wasm/Cargo.lock  | 22 ++++----
 .../examples/ping-pong-egld/wasm/Cargo.lock   | 22 ++++----
 .../examples/proxy-pause/wasm/Cargo.lock      | 22 ++++----
 .../rewards-distribution/wasm/Cargo.lock      | 24 ++++----
 .../examples/seed-nft-minter/wasm/Cargo.lock  | 24 ++++----
 .../examples/token-release/wasm/Cargo.lock    | 22 ++++----
 .../abi-tester/wasm-abi-tester-ev/Cargo.lock  | 22 ++++----
 .../feature-tests/abi-tester/wasm/Cargo.lock  | 22 ++++----
 .../wasm-alloc-mem-fail/Cargo.lock            | 22 ++++----
 .../wasm-alloc-mem-leaking/Cargo.lock         | 22 ++++----
 .../alloc-features/wasm/Cargo.lock            | 22 ++++----
 .../wasm-basic-features-crypto/Cargo.lock     | 24 ++++----
 .../Cargo.lock                                | 24 ++++----
 .../basic-features/wasm/Cargo.lock            | 24 ++++----
 .../basic-features/wasm/src/lib.rs            |  4 +-
 .../big-float-features/wasm/Cargo.lock        | 22 ++++----
 .../builtin-func-features/wasm/Cargo.lock     | 22 ++++----
 .../first-contract/wasm/Cargo.lock            | 22 ++++----
 .../second-contract/wasm/Cargo.lock           | 22 ++++----
 .../child/wasm/Cargo.lock                     | 22 ++++----
 .../parent/wasm/Cargo.lock                    | 22 ++++----
 .../forwarder-legacy/wasm/Cargo.lock          | 22 ++++----
 .../wasm-forwarder-queue-promises/Cargo.lock  | 22 ++++----
 .../forwarder-queue/wasm/Cargo.lock           | 22 ++++----
 .../Cargo.lock                                | 22 ++++----
 .../Cargo.lock                                | 22 ++++----
 .../forwarder-raw/wasm/Cargo.lock             | 22 ++++----
 .../composability/forwarder/wasm/Cargo.lock   | 22 ++++----
 .../local-esdt-and-nft/wasm/Cargo.lock        | 22 ++++----
 .../promises-features/wasm/Cargo.lock         | 22 ++++----
 .../proxy-test-first/wasm/Cargo.lock          | 22 ++++----
 .../proxy-test-second/wasm/Cargo.lock         | 22 ++++----
 .../recursive-caller/wasm/Cargo.lock          | 22 ++++----
 .../transfer-role-features/wasm/Cargo.lock    | 24 ++++----
 .../vault/wasm-vault-promises/Cargo.lock      | 22 ++++----
 .../vault/wasm-vault-upgrade/Cargo.lock       | 22 ++++----
 .../composability/vault/wasm/Cargo.lock       | 22 ++++----
 .../crowdfunding-erc20/wasm/Cargo.lock        | 22 ++++----
 .../erc1155-marketplace/wasm/Cargo.lock       | 22 ++++----
 .../erc1155-user-mock/wasm/Cargo.lock         | 22 ++++----
 .../erc1155/wasm/Cargo.lock                   | 22 ++++----
 .../erc-style-contracts/erc20/wasm/Cargo.lock | 22 ++++----
 .../erc721/wasm/Cargo.lock                    | 22 ++++----
 .../lottery-erc20/wasm/Cargo.lock             | 22 ++++----
 .../esdt-system-sc-mock/wasm/Cargo.lock       | 22 ++++----
 .../exchange-features/wasm/Cargo.lock         | 22 ++++----
 .../wasm/Cargo.lock                           | 22 ++++----
 .../managed-map-features/wasm/Cargo.lock      | 22 ++++----
 .../wasm-multi-contract-alt-impl/Cargo.lock   | 22 ++++----
 .../Cargo.lock                                | 22 ++++----
 .../Cargo.lock                                | 22 ++++----
 .../multi-contract-features/wasm/Cargo.lock   | 22 ++++----
 .../panic-message-features/wasm/Cargo.lock    | 22 ++++----
 .../payable-features/wasm/Cargo.lock          | 22 ++++----
 .../wasm/Cargo.lock                           | 22 ++++----
 .../wasm/Cargo.lock                           | 22 ++++----
 .../scenario-tester/wasm/Cargo.lock           | 22 ++++----
 .../wasm-use-module-view/Cargo.lock           | 24 ++++----
 .../feature-tests/use-module/wasm/Cargo.lock  | 24 ++++----
 93 files changed, 1046 insertions(+), 1045 deletions(-)

diff --git a/contracts/benchmarks/large-storage/wasm/Cargo.lock b/contracts/benchmarks/large-storage/wasm/Cargo.lock
index 7d32682d74..fc8782c35d 100755
--- a/contracts/benchmarks/large-storage/wasm/Cargo.lock
+++ b/contracts/benchmarks/large-storage/wasm/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "autocfg"
@@ -55,7 +55,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -131,9 +131,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.72"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.lock
index e403b32e0b..abf02603ec 100644
--- a/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.lock
+++ b/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "autocfg"
@@ -63,7 +63,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -75,7 +75,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -139,9 +139,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -164,9 +164,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.72"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.lock
index e5f3839a32..ff925fd99a 100644
--- a/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.lock
+++ b/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "autocfg"
@@ -63,7 +63,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -75,7 +75,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -139,9 +139,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -164,9 +164,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.72"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.lock
index 772bd3e7f0..ba14125dc1 100644
--- a/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.lock
+++ b/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "autocfg"
@@ -47,7 +47,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -59,7 +59,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -68,7 +68,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -78,7 +78,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -89,7 +89,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -139,9 +139,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -164,9 +164,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.72"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.lock
index dd3ac5de6e..3356ac1202 100644
--- a/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.lock
+++ b/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "autocfg"
@@ -47,7 +47,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -59,7 +59,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -68,7 +68,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -78,7 +78,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -89,7 +89,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -123,9 +123,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -164,9 +164,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.72"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.lock
index 41037c6f93..63c5909ab3 100644
--- a/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.lock
+++ b/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "autocfg"
@@ -47,7 +47,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -59,7 +59,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -68,7 +68,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -78,7 +78,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -89,7 +89,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -123,9 +123,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -164,9 +164,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.72"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.lock
index 4563507c04..fe7e401f8e 100644
--- a/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.lock
+++ b/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "autocfg"
@@ -47,7 +47,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -59,7 +59,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -68,7 +68,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -78,7 +78,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -89,7 +89,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -123,9 +123,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -148,9 +148,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.72"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/benchmarks/send-tx-repeat/wasm/Cargo.lock b/contracts/benchmarks/send-tx-repeat/wasm/Cargo.lock
index 9e9370fc9d..570969d132 100755
--- a/contracts/benchmarks/send-tx-repeat/wasm/Cargo.lock
+++ b/contracts/benchmarks/send-tx-repeat/wasm/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "autocfg"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -116,9 +116,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.72"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.lock b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.lock
index ede7e7eb39..1da0b6b0f2 100644
--- a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.lock
+++ b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "autocfg"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -116,9 +116,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.72"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.lock b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.lock
index 5b3ae0a3c2..9cf26ff656 100644
--- a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.lock
+++ b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "autocfg"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -116,9 +116,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.72"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/benchmarks/str-repeat/wasm/Cargo.lock b/contracts/benchmarks/str-repeat/wasm/Cargo.lock
index 25248e417d..f839148dc0 100755
--- a/contracts/benchmarks/str-repeat/wasm/Cargo.lock
+++ b/contracts/benchmarks/str-repeat/wasm/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "autocfg"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -116,9 +116,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.72"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/core/price-aggregator/wasm/Cargo.lock b/contracts/core/price-aggregator/wasm/Cargo.lock
index abc4b08c51..745a1d281d 100644
--- a/contracts/core/price-aggregator/wasm/Cargo.lock
+++ b/contracts/core/price-aggregator/wasm/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "autocfg"
@@ -71,18 +71,18 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "js-sys"
-version = "0.3.69"
+version = "0.3.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d"
+checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a"
 dependencies = [
  "wasm-bindgen",
 ]
 
 [[package]]
 name = "libc"
-version = "0.2.155"
+version = "0.2.158"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
+checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439"
 
 [[package]]
 name = "log"
@@ -92,7 +92,7 @@ checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
 
 [[package]]
 name = "multiversx-price-aggregator-sc"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "arrayvec",
  "getrandom",
@@ -111,7 +111,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -123,7 +123,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -132,7 +132,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -142,7 +142,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -153,14 +153,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -209,9 +209,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -264,9 +264,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.72"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -293,19 +293,20 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.92"
+version = "0.2.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"
+checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5"
 dependencies = [
  "cfg-if",
+ "once_cell",
  "wasm-bindgen-macro",
 ]
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.92"
+version = "0.2.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da"
+checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b"
 dependencies = [
  "bumpalo",
  "log",
@@ -318,9 +319,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.92"
+version = "0.2.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"
+checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -328,9 +329,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.92"
+version = "0.2.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
+checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -341,9 +342,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.92"
+version = "0.2.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
+checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484"
 
 [[package]]
 name = "zerocopy"
diff --git a/contracts/examples/adder/wasm/Cargo.lock b/contracts/examples/adder/wasm/Cargo.lock
index f6d5d52130..a83e0f4f08 100755
--- a/contracts/examples/adder/wasm/Cargo.lock
+++ b/contracts/examples/adder/wasm/Cargo.lock
@@ -19,9 +19,9 @@ dependencies = [
 
 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "autocfg"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -131,9 +131,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.72"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/bonding-curve-contract/wasm/Cargo.lock b/contracts/examples/bonding-curve-contract/wasm/Cargo.lock
index 28e1779440..ece227a9c0 100644
--- a/contracts/examples/bonding-curve-contract/wasm/Cargo.lock
+++ b/contracts/examples/bonding-curve-contract/wasm/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "autocfg"
@@ -56,7 +56,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -68,7 +68,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -77,7 +77,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -139,9 +139,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -164,9 +164,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.72"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/check-pause/wasm/Cargo.lock b/contracts/examples/check-pause/wasm/Cargo.lock
index e591595269..d25d2b3daa 100644
--- a/contracts/examples/check-pause/wasm/Cargo.lock
+++ b/contracts/examples/check-pause/wasm/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "autocfg"
@@ -56,7 +56,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -68,7 +68,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -77,7 +77,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -139,9 +139,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -164,9 +164,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.72"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/crowdfunding-esdt/wasm/Cargo.lock b/contracts/examples/crowdfunding-esdt/wasm/Cargo.lock
index 050bfda0ad..4f405ac8b5 100644
--- a/contracts/examples/crowdfunding-esdt/wasm/Cargo.lock
+++ b/contracts/examples/crowdfunding-esdt/wasm/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "autocfg"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -131,9 +131,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.72"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/crypto-bubbles/wasm/Cargo.lock b/contracts/examples/crypto-bubbles/wasm/Cargo.lock
index 44635d1822..73a4b219ec 100755
--- a/contracts/examples/crypto-bubbles/wasm/Cargo.lock
+++ b/contracts/examples/crypto-bubbles/wasm/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "autocfg"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -131,9 +131,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.72"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.lock b/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.lock
index a51a2f4131..73087aff8c 100755
--- a/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.lock
+++ b/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "autocfg"
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -96,7 +96,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -115,7 +115,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -126,7 +126,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -160,9 +160,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -192,9 +192,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.72"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
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 e2c12cd9cc..809b74b818 100755
--- a/contracts/examples/crypto-kitties/kitty-genetic-alg/wasm/Cargo.lock
+++ b/contracts/examples/crypto-kitties/kitty-genetic-alg/wasm/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "autocfg"
@@ -65,7 +65,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -77,7 +77,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,7 +96,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -107,7 +107,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -141,9 +141,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -173,9 +173,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.72"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.lock b/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.lock
index 4c52ff4a93..d00573ddbe 100755
--- a/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.lock
+++ b/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "autocfg"
@@ -75,7 +75,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -96,7 +96,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -106,7 +106,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -117,7 +117,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -151,9 +151,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -183,9 +183,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.72"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/crypto-zombies/wasm/Cargo.lock b/contracts/examples/crypto-zombies/wasm/Cargo.lock
index 1701f63971..639b402b18 100755
--- a/contracts/examples/crypto-zombies/wasm/Cargo.lock
+++ b/contracts/examples/crypto-zombies/wasm/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "autocfg"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -131,9 +131,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.72"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/digital-cash/wasm/Cargo.lock b/contracts/examples/digital-cash/wasm/Cargo.lock
index 656d5dbf2d..34a22b35a1 100644
--- a/contracts/examples/digital-cash/wasm/Cargo.lock
+++ b/contracts/examples/digital-cash/wasm/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "autocfg"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -131,9 +131,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.72"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/empty/wasm/Cargo.lock b/contracts/examples/empty/wasm/Cargo.lock
index a9695475ec..f154541f76 100755
--- a/contracts/examples/empty/wasm/Cargo.lock
+++ b/contracts/examples/empty/wasm/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "autocfg"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -131,9 +131,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.72"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.lock b/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.lock
index fdb57e5291..2783ad6bc8 100644
--- a/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.lock
+++ b/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "autocfg"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -131,9 +131,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.72"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/factorial/wasm/Cargo.lock b/contracts/examples/factorial/wasm/Cargo.lock
index 47ea775d59..132e4a6fd5 100755
--- a/contracts/examples/factorial/wasm/Cargo.lock
+++ b/contracts/examples/factorial/wasm/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "autocfg"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -131,9 +131,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.72"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/fractional-nfts/wasm/Cargo.lock b/contracts/examples/fractional-nfts/wasm/Cargo.lock
index 7bc9ae041f..37428b3918 100644
--- a/contracts/examples/fractional-nfts/wasm/Cargo.lock
+++ b/contracts/examples/fractional-nfts/wasm/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "autocfg"
@@ -56,7 +56,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -68,7 +68,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -77,7 +77,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -139,9 +139,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -164,9 +164,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.72"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/lottery-esdt/wasm/Cargo.lock b/contracts/examples/lottery-esdt/wasm/Cargo.lock
index 45e4b6e1b9..1793c18657 100755
--- a/contracts/examples/lottery-esdt/wasm/Cargo.lock
+++ b/contracts/examples/lottery-esdt/wasm/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "autocfg"
@@ -55,7 +55,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -131,9 +131,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.72"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/multisig/wasm-multisig-full/Cargo.lock b/contracts/examples/multisig/wasm-multisig-full/Cargo.lock
index 7c2e872610..9d07aa098f 100644
--- a/contracts/examples/multisig/wasm-multisig-full/Cargo.lock
+++ b/contracts/examples/multisig/wasm-multisig-full/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "autocfg"
@@ -56,7 +56,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -68,7 +68,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -77,7 +77,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -139,9 +139,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -164,9 +164,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.72"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/multisig/wasm-multisig-view/Cargo.lock b/contracts/examples/multisig/wasm-multisig-view/Cargo.lock
index 3c71e2d24d..0f6e03942e 100644
--- a/contracts/examples/multisig/wasm-multisig-view/Cargo.lock
+++ b/contracts/examples/multisig/wasm-multisig-view/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "autocfg"
@@ -56,7 +56,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -68,7 +68,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -77,7 +77,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -139,9 +139,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -164,9 +164,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.72"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/multisig/wasm/Cargo.lock b/contracts/examples/multisig/wasm/Cargo.lock
index d305a4c7f9..0e92d680d6 100755
--- a/contracts/examples/multisig/wasm/Cargo.lock
+++ b/contracts/examples/multisig/wasm/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "autocfg"
@@ -56,7 +56,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -68,7 +68,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -77,7 +77,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -139,9 +139,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -164,9 +164,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.72"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/nft-minter/wasm/Cargo.lock b/contracts/examples/nft-minter/wasm/Cargo.lock
index d52497c4f9..60fe9c66ed 100644
--- a/contracts/examples/nft-minter/wasm/Cargo.lock
+++ b/contracts/examples/nft-minter/wasm/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "autocfg"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -131,9 +131,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.72"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/nft-storage-prepay/wasm/Cargo.lock b/contracts/examples/nft-storage-prepay/wasm/Cargo.lock
index f7fc4d8d1e..029d5d42f5 100755
--- a/contracts/examples/nft-storage-prepay/wasm/Cargo.lock
+++ b/contracts/examples/nft-storage-prepay/wasm/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "autocfg"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -131,9 +131,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.72"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/nft-subscription/wasm/Cargo.lock b/contracts/examples/nft-subscription/wasm/Cargo.lock
index dcd42f265e..6e5fbb7c3f 100644
--- a/contracts/examples/nft-subscription/wasm/Cargo.lock
+++ b/contracts/examples/nft-subscription/wasm/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "autocfg"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,14 +82,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -139,9 +139,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -164,9 +164,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.72"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/order-book/factory/wasm/Cargo.lock b/contracts/examples/order-book/factory/wasm/Cargo.lock
index ffee60fd78..41a5615328 100644
--- a/contracts/examples/order-book/factory/wasm/Cargo.lock
+++ b/contracts/examples/order-book/factory/wasm/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "autocfg"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -131,9 +131,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.72"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/order-book/pair/wasm/Cargo.lock b/contracts/examples/order-book/pair/wasm/Cargo.lock
index b56aea2f0e..0a340293b6 100644
--- a/contracts/examples/order-book/pair/wasm/Cargo.lock
+++ b/contracts/examples/order-book/pair/wasm/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "autocfg"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -131,9 +131,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.72"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/ping-pong-egld/wasm/Cargo.lock b/contracts/examples/ping-pong-egld/wasm/Cargo.lock
index 5f781d51fe..538fba1557 100755
--- a/contracts/examples/ping-pong-egld/wasm/Cargo.lock
+++ b/contracts/examples/ping-pong-egld/wasm/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "autocfg"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -131,9 +131,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.72"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/proxy-pause/wasm/Cargo.lock b/contracts/examples/proxy-pause/wasm/Cargo.lock
index 41ae133c82..bfb8efe9bc 100644
--- a/contracts/examples/proxy-pause/wasm/Cargo.lock
+++ b/contracts/examples/proxy-pause/wasm/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "autocfg"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -131,9 +131,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.72"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/rewards-distribution/wasm/Cargo.lock b/contracts/examples/rewards-distribution/wasm/Cargo.lock
index 6b3788cb13..f2247ece99 100644
--- a/contracts/examples/rewards-distribution/wasm/Cargo.lock
+++ b/contracts/examples/rewards-distribution/wasm/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "autocfg"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,14 +82,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -123,9 +123,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -164,9 +164,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.72"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/seed-nft-minter/wasm/Cargo.lock b/contracts/examples/seed-nft-minter/wasm/Cargo.lock
index 7c70262097..1bb06b4df3 100644
--- a/contracts/examples/seed-nft-minter/wasm/Cargo.lock
+++ b/contracts/examples/seed-nft-minter/wasm/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "autocfg"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,14 +82,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -123,9 +123,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -164,9 +164,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.72"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/examples/token-release/wasm/Cargo.lock b/contracts/examples/token-release/wasm/Cargo.lock
index 507943ce3c..6c4f299bb7 100644
--- a/contracts/examples/token-release/wasm/Cargo.lock
+++ b/contracts/examples/token-release/wasm/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "autocfg"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -116,9 +116,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -141,9 +141,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.72"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
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 90ec4c9898..dec0b4181e 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
@@ -19,9 +19,9 @@ dependencies = [
 
 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "autocfg"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -131,9 +131,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.72"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/feature-tests/abi-tester/wasm/Cargo.lock b/contracts/feature-tests/abi-tester/wasm/Cargo.lock
index 2dae880107..7bb4039082 100755
--- a/contracts/feature-tests/abi-tester/wasm/Cargo.lock
+++ b/contracts/feature-tests/abi-tester/wasm/Cargo.lock
@@ -19,9 +19,9 @@ dependencies = [
 
 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "autocfg"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -131,9 +131,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.72"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock
index 84fade15cc..53444451ec 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock
@@ -19,9 +19,9 @@ dependencies = [
 
 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "autocfg"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -131,9 +131,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.72"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.lock b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.lock
index ff7f6cf88b..62cb854988 100644
--- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.lock
+++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.lock
@@ -19,9 +19,9 @@ dependencies = [
 
 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "autocfg"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -131,9 +131,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.72"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/feature-tests/alloc-features/wasm/Cargo.lock b/contracts/feature-tests/alloc-features/wasm/Cargo.lock
index 09bd4da933..67b914f300 100644
--- a/contracts/feature-tests/alloc-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/alloc-features/wasm/Cargo.lock
@@ -19,9 +19,9 @@ dependencies = [
 
 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "autocfg"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -131,9 +131,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.72"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/feature-tests/basic-features/wasm-basic-features-crypto/Cargo.lock b/contracts/feature-tests/basic-features/wasm-basic-features-crypto/Cargo.lock
index 1666820785..f906bd3d13 100644
--- a/contracts/feature-tests/basic-features/wasm-basic-features-crypto/Cargo.lock
+++ b/contracts/feature-tests/basic-features/wasm-basic-features-crypto/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "autocfg"
@@ -56,7 +56,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -68,7 +68,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -77,7 +77,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -139,9 +139,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -164,9 +164,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.72"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
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 a3e9ee3fd5..552b01b6ee 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
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "autocfg"
@@ -56,7 +56,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -68,7 +68,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -77,7 +77,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -139,9 +139,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -164,9 +164,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.72"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/feature-tests/basic-features/wasm/Cargo.lock b/contracts/feature-tests/basic-features/wasm/Cargo.lock
index d09b3e010b..11c5370dd3 100755
--- a/contracts/feature-tests/basic-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/basic-features/wasm/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "autocfg"
@@ -56,7 +56,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -68,7 +68,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -77,7 +77,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +98,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -139,9 +139,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -164,9 +164,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.72"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/feature-tests/basic-features/wasm/src/lib.rs b/contracts/feature-tests/basic-features/wasm/src/lib.rs
index b4501a4450..8658d897ed 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:                          408
+// Endpoints:                          409
 // Async Callback:                       1
-// Total number of exported functions: 410
+// Total number of exported functions: 411
 
 #![no_std]
 
diff --git a/contracts/feature-tests/big-float-features/wasm/Cargo.lock b/contracts/feature-tests/big-float-features/wasm/Cargo.lock
index 797bf246ef..9093b47c6d 100644
--- a/contracts/feature-tests/big-float-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/big-float-features/wasm/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "autocfg"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -131,9 +131,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.72"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
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 651d9e961a..77c2c0f81b 100644
--- a/contracts/feature-tests/composability/builtin-func-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/builtin-func-features/wasm/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "autocfg"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -131,9 +131,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.72"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
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 215a2b1f30..af8b4b654f 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
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "autocfg"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -131,9 +131,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.72"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
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 ece4745ed1..646ffc8125 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
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "autocfg"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -116,9 +116,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.72"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
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 70aac4f32d..d59caeeaec 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
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "autocfg"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -131,9 +131,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.72"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
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 74383622b1..db4a992a35 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
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "autocfg"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -131,9 +131,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.72"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.lock
index fec9eb2e22..4ae2239ba8 100644
--- a/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "autocfg"
@@ -56,7 +56,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -68,7 +68,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -77,7 +77,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,7 +98,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -132,9 +132,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -157,9 +157,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.72"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
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 9374da4ab5..86f74a34b9 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
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "autocfg"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -131,9 +131,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.72"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock
index e118c93f1a..c1aa312ebc 100644
--- a/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "autocfg"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -131,9 +131,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.72"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
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 0b0052013d..e9934c674e 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
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "autocfg"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -131,9 +131,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.72"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
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 468a2e1533..335c2050b1 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
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "autocfg"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -131,9 +131,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.72"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.lock
index 008063808e..c48f23611c 100755
--- a/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "autocfg"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -131,9 +131,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.72"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock
index 449f2719cd..a4b5837af2 100755
--- a/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "autocfg"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -131,9 +131,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.72"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
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 b3da293bdd..087e6f1f6a 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
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "autocfg"
@@ -55,7 +55,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -131,9 +131,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.72"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/feature-tests/composability/promises-features/wasm/Cargo.lock b/contracts/feature-tests/composability/promises-features/wasm/Cargo.lock
index cc794fed5d..7703e8cf36 100644
--- a/contracts/feature-tests/composability/promises-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/promises-features/wasm/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "autocfg"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -131,9 +131,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.72"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
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 cdb4518ec3..b6e5bb4386 100755
--- a/contracts/feature-tests/composability/proxy-test-first/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/proxy-test-first/wasm/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "autocfg"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -132,9 +132,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -157,9 +157,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.72"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
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 6c4e6e88ae..b989e3ae84 100755
--- a/contracts/feature-tests/composability/proxy-test-second/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/proxy-test-second/wasm/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "autocfg"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -131,9 +131,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.72"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.lock b/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.lock
index e690375317..1553be7c07 100755
--- a/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "autocfg"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -116,9 +116,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -157,9 +157,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.72"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
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 8c0b748e9c..cee8df1e37 100644
--- a/contracts/feature-tests/composability/transfer-role-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/transfer-role-features/wasm/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "autocfg"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,14 +82,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -123,9 +123,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -148,9 +148,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.72"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
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 8293653256..3e928b20c9 100644
--- a/contracts/feature-tests/composability/vault/wasm-vault-promises/Cargo.lock
+++ b/contracts/feature-tests/composability/vault/wasm-vault-promises/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "autocfg"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -116,9 +116,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -141,9 +141,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.72"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
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 9e7b4c96aa..2aa62e0c77 100644
--- a/contracts/feature-tests/composability/vault/wasm-vault-upgrade/Cargo.lock
+++ b/contracts/feature-tests/composability/vault/wasm-vault-upgrade/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "autocfg"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -116,9 +116,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -141,9 +141,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.72"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/feature-tests/composability/vault/wasm/Cargo.lock b/contracts/feature-tests/composability/vault/wasm/Cargo.lock
index 487f3f3c5e..648da833d6 100755
--- a/contracts/feature-tests/composability/vault/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/vault/wasm/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "autocfg"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -116,9 +116,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -141,9 +141,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.72"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
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 99d01294c9..cec66cccc8 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
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "autocfg"
@@ -63,7 +63,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -75,7 +75,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -139,9 +139,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -164,9 +164,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.72"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
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 40bcc4c73a..6fd99d6303 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
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "autocfg"
@@ -63,7 +63,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -75,7 +75,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -139,9 +139,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -164,9 +164,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.72"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
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 a11bc7acd8..7115285169 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
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "autocfg"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -131,9 +131,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.72"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
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 97d227ab52..aa024d408f 100644
--- a/contracts/feature-tests/erc-style-contracts/erc1155/wasm/Cargo.lock
+++ b/contracts/feature-tests/erc-style-contracts/erc1155/wasm/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "autocfg"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -131,9 +131,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.72"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
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 120fa61654..ada159d488 100644
--- a/contracts/feature-tests/erc-style-contracts/erc20/wasm/Cargo.lock
+++ b/contracts/feature-tests/erc-style-contracts/erc20/wasm/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "autocfg"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -131,9 +131,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.72"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
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 1f15d311e2..2ff486f4af 100644
--- a/contracts/feature-tests/erc-style-contracts/erc721/wasm/Cargo.lock
+++ b/contracts/feature-tests/erc-style-contracts/erc721/wasm/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "autocfg"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -131,9 +131,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.72"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
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 b3ab6d4fc0..e4d1c6b895 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
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "autocfg"
@@ -63,7 +63,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -75,7 +75,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -139,9 +139,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -164,9 +164,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.72"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
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 e4a4b32fdc..f84a770314 100644
--- a/contracts/feature-tests/esdt-system-sc-mock/wasm/Cargo.lock
+++ b/contracts/feature-tests/esdt-system-sc-mock/wasm/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "autocfg"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -131,9 +131,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.72"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/feature-tests/exchange-features/wasm/Cargo.lock b/contracts/feature-tests/exchange-features/wasm/Cargo.lock
index e3d0967e86..9025402dc7 100644
--- a/contracts/feature-tests/exchange-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/exchange-features/wasm/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "autocfg"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -131,9 +131,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.72"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/feature-tests/formatted-message-features/wasm/Cargo.lock b/contracts/feature-tests/formatted-message-features/wasm/Cargo.lock
index df2b28cfba..c17f9af661 100644
--- a/contracts/feature-tests/formatted-message-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/formatted-message-features/wasm/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "autocfg"
@@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -131,9 +131,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.72"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/feature-tests/managed-map-features/wasm/Cargo.lock b/contracts/feature-tests/managed-map-features/wasm/Cargo.lock
index ab630ec3ac..4e3cec3ca0 100644
--- a/contracts/feature-tests/managed-map-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/managed-map-features/wasm/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "autocfg"
@@ -55,7 +55,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -131,9 +131,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.72"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
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 352a9bdce9..407c038093 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
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "autocfg"
@@ -55,7 +55,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -131,9 +131,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.72"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
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 09b88c504b..d83c8f81ea 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
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "autocfg"
@@ -55,7 +55,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -131,9 +131,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.72"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
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 f4497102e2..30b5bd5bce 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
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "autocfg"
@@ -55,7 +55,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -131,9 +131,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.72"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/feature-tests/multi-contract-features/wasm/Cargo.lock b/contracts/feature-tests/multi-contract-features/wasm/Cargo.lock
index 6331d66381..315f2e6c65 100755
--- a/contracts/feature-tests/multi-contract-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/multi-contract-features/wasm/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "autocfg"
@@ -55,7 +55,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -131,9 +131,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.72"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/feature-tests/panic-message-features/wasm/Cargo.lock b/contracts/feature-tests/panic-message-features/wasm/Cargo.lock
index 0dcf0d755e..6f74adc48f 100755
--- a/contracts/feature-tests/panic-message-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/panic-message-features/wasm/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "autocfg"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -131,9 +131,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.72"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/feature-tests/payable-features/wasm/Cargo.lock b/contracts/feature-tests/payable-features/wasm/Cargo.lock
index 81cc7b1033..12cb395c24 100755
--- a/contracts/feature-tests/payable-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/payable-features/wasm/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "autocfg"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -131,9 +131,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.72"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
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 d78c02e631..64372db698 100644
--- a/contracts/feature-tests/rust-snippets-generator-test/wasm/Cargo.lock
+++ b/contracts/feature-tests/rust-snippets-generator-test/wasm/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "autocfg"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -116,9 +116,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.72"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
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 378234f233..e4fe0b45f2 100644
--- a/contracts/feature-tests/rust-testing-framework-tester/wasm/Cargo.lock
+++ b/contracts/feature-tests/rust-testing-framework-tester/wasm/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "autocfg"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -116,9 +116,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.72"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/feature-tests/scenario-tester/wasm/Cargo.lock b/contracts/feature-tests/scenario-tester/wasm/Cargo.lock
index a32b98fbf4..cb15a21d75 100755
--- a/contracts/feature-tests/scenario-tester/wasm/Cargo.lock
+++ b/contracts/feature-tests/scenario-tester/wasm/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "autocfg"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +82,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -116,9 +116,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -156,9 +156,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.72"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
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 466d0ad099..a124843123 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
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "autocfg"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,14 +82,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -123,9 +123,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -148,9 +148,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.72"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/feature-tests/use-module/wasm/Cargo.lock b/contracts/feature-tests/use-module/wasm/Cargo.lock
index 35e4bcefdd..9c7fadeec0 100644
--- a/contracts/feature-tests/use-module/wasm/Cargo.lock
+++ b/contracts/feature-tests/use-module/wasm/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "autocfg"
@@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "multiversx-sc"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "bitflags",
  "hex-literal",
@@ -52,7 +52,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,14 +82,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.52.3"
+version = "0.53.0"
 dependencies = [
  "multiversx-sc",
 ]
@@ -123,9 +123,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -148,9 +148,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.72"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",